diff --git a/.docker/dev/nginx/ssl.sh b/.docker/dev/nginx/ssl.sh
old mode 100644
new mode 100755
diff --git a/.docker/release/Dockerfile b/.docker/release/Dockerfile
index f1ba85139..0e6473191 100644
--- a/.docker/release/Dockerfile
+++ b/.docker/release/Dockerfile
@@ -1,48 +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:7.4-fpm-buster
+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/x86_64-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>/$UPLOAD_MAX_SIZE/g" /usr/local/etc/php-fpm.d/php-fpm.conf /etc/nginx/nginx.conf
 sed -i "s/<MEMORY_LIMIT>/$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 @@
+<?php
+define('APP_DATA_FOLDER_PATH', '/var/lib/snappymail/');
+?>
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 da48c375e..000000000
--- a/.docker/release/files/usr/local/include/application.ini
+++ /dev/null
@@ -1,305 +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 = ""
-
-; 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
-new_move_to_folder_button = 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_frame_options_header = "DENY"
-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"
-content_security_policy = ""
-csp_report = Off
-encrypt_cipher = "aes-256-cbc-hmac-sha1"
-
-[ssl]
-; Require verification of SSL certificate used.
-verify_certificate = Off
-
-; Allow self-signed certificates. Requires verify_certificate.
-allow_self_signed = On
-
-; 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
-client_cert = ""
-
-[capa]
-contacts = On
-quota = On
-search = On
-search_adv = On
-dangerous_actions = On
-message_actions = On
-attachments_actions = On
-
-[login]
-default_domain = ""
-
-; Allow language selection on webmail login screen
-allow_languages_on_login = On
-determine_user_language = On
-determine_user_domain = Off
-hide_submit_button = On
-login_lowercase = On
-
-; This option allows webmail to remember the logged in user
-; 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
-
-; List of enabled plugins
-enabled_list = ""
-
-[defaults]
-; Editor mode used by default (Plain, Html, HtmlForced or PlainForced)
-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
-
-; 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
-
-; Logs entire request only if error occured (php requred)
-write_on_error_only = Off
-
-; Logs entire request only if php error occured
-write_on_php_error_only = Off
-
-; Logs entire request only if request timeout (in seconds) occured.
-write_on_timeout_only = 0
-
-; Required for development purposes only.
-; Disabling this option is not recommended.
-hide_passwords = On
-time_zone = "UTC"
-session_filter = ""
-
-; 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
-
-; 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
-
-[labs]
-allow_prefetch = Off
-cache_system_data = On
-date_from_headers = On
-autocreate_system_folders = Off
-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_mobile_version_for_tablets = Off
-use_app_debug_css = Off
-use_imap_sort = On
-use_imap_force_selection = Off
-use_imap_thread = On
-use_imap_move = Off
-use_imap_expunge_all_on_delete = Off
-imap_forwarded_flag = "$Forwarded"
-imap_read_receipt_flag = "$ReadReceipt"
-imap_body_text_limit = 555000
-imap_message_list_fast_simple_search = On
-imap_message_list_count_limit_trigger = 0
-imap_message_list_date_filter = 0
-imap_message_list_permanent_filter = ""
-imap_message_all_headers = Off
-imap_large_thread_limit = 50
-imap_folder_list_limit = 200
-imap_show_login_alert = On
-imap_use_list_status = On
-imap_timeout = 300
-smtp_show_server_errors = Off
-smtp_timeout = 60
-sieve_auth_plain_initial = On
-sieve_allow_fileinto_inbox = Off
-sieve_timeout = 10
-sasl_allow_plain = On
-sasl_allow_scram_sha = Off
-sasl_allow_cram_md5 = Off
-mail_func_clear_headers = On
-mail_func_additional_parameters = Off
-favicon_status = On
-folders_spec_limit = 50
-curl_proxy = ""
-curl_proxy_auth = ""
-in_iframe = Off
-force_https = Off
-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
-detect_image_exif_orientation = On
-cookie_default_path = ""
-cookie_default_secure = Off
-check_new_messages = On
-replace_env_in_configuration = ""
-strict_html_parser = Off
-boundary_prefix = ""
-kolab_enabled = Off
-dev_email = ""
-dev_password = ""
-
-[version]
-current = "2.15.0"
-saved = "Fri, 04 Mar 2022 08:55:26 +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 80846798b..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: {
@@ -27,8 +27,6 @@ module.exports = {
 		'SquireUI': "readonly",
 		// node_modules/knockout but dev/External/ko.js is used
 		'ko': "readonly",
-		// dev/External/ifvisible.js
-		'ifvisible': "readonly",
 		// vendors/routes/
 		'hasher': "readonly",
 		'Crossroads': "readonly",
@@ -37,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 98e5ea01f..998692964 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -23,13 +23,16 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Desktop (please complete the following information):**
- - Browser [e.g. chromium 89, firefox 86, safari 14]
- - SnappyMail Version [e.g. 2.3.4]
+**Please complete the following information:**
+- Browser: [e.g. chromium 100, firefox 100, safari 14, mobile]
+- IMAP daemon: [e.g. courier, dovecot]
+- PHP version:
+- SnappyMail Version:
+- Mode: [e.g. standalone, nextcloud, cyberpanel, docker]
 
-**Mobile (please complete the following information):**
- - Browser [e.g. stock browser, chrome 87, firefox 86, safari 14]
- - SnappyMail Version [e.g. 2.3.4]
+**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 ae906552b..5f49d65d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,10 +12,12 @@
 /.docker/dev/mail/config
 /.docker/dev/nginx/ssl/*
 !/.docker/dev/nginx/ssl/.gitempty
+/.docker/release/snappymail-*.zip
 /dist
 /data
 /MULTIPLY
 /include.php
+/issues
 .idea/
 .env
 /test
@@ -23,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 0e6142e36..71041371a 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,7 +1,15 @@
+<FilesMatch "index\.php">
+	AcceptPathInfo On
+</FilesMatch>
+
 <IfModule mod_rewrite.c>
 	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]
 </IfModule>
 
 <IfModule mod_expires.c>
@@ -23,10 +31,9 @@
 #	Header set Cache-Control "public, max-age=31536000"
 #	Header set Content-Security-Policy "default-src 'self'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src 'self' data:; style-src 'self' 'unsafe-inline'"
 #	Header set Referrer-Policy "no-referrer"
-	Header set Strict-Transport-Security "max-age=31536000"
+#	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
new file mode 100644
index 000000000..d31a1b771
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,2422 @@
+## 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 `<div><br></div>`
+  [#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 <span> 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)
+- `<font>` 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 `<button>` in HTML message with innerHTML instead of remove
+  [#1125](https://github.com/the-djmaze/snappymail/issues/1125)
+- Mailvelope failed
+  [#1126](https://github.com/the-djmaze/snappymail/issues/1126)
+- Tabs labels row height
+- Selecting not yet existing filter throws error message instead of opening edit box
+  [#1104](https://github.com/the-djmaze/snappymail/issues/1104)
+- JavaScript Squire `node is null` error
+- Config/Application.php: array_rand(): Argument
+  [#1](https://github.com/the-djmaze/snappymail/issues/1) cannot be empty
+  [#1123](https://github.com/the-djmaze/snappymail/issues/1123)
+- Pressing Enter in Add Filter dialog results in "Leave page?" prompt
+  [#1112](https://github.com/the-djmaze/snappymail/issues/1112)
+- Issue with certain Amazon emails
+  [#1086](https://github.com/the-djmaze/snappymail/issues/1086)
+- HTML font 8px and 10px issue
+  [#1082](https://github.com/the-djmaze/snappymail/issues/1082)
+- Exception when executed on command line on the first-time
+  [#1085](https://github.com/the-djmaze/snappymail/issues/1085)
+- Folders missing pagination
+  [#1070](https://github.com/the-djmaze/snappymail/issues/1070)
+- Nextcloud WYSIWYG button style
+  [#1138](https://github.com/the-djmaze/snappymail/issues/1138)
+- Nextcloud .btn-group > .btn layout
+- Nextcloud Bulleted items do not show the bullets in the preview window.
+  [#1117](https://github.com/the-djmaze/snappymail/issues/1117)
+- Nextcloud Contacts integration
+  [#1083](https://github.com/the-djmaze/snappymail/issues/1083)
+
+
+## 2.27.3 – 2023-04-04
+
+### Added
+- Squire visualize some active buttons states
+- Hard coded string "Message body is empty"
+  [#1048](https://github.com/the-djmaze/snappymail/issues/1048)
+- Split SPAM label in user.json for directory and action
+  [#1065](https://github.com/the-djmaze/snappymail/issues/1065)
+- A solution for
+  [#1056](https://github.com/the-djmaze/snappymail/issues/1056) to support dates in different language/calendar
+- Log \nonexistent folder for
+  [#1008](https://github.com/the-djmaze/snappymail/issues/1008)
+
+### Changed
+- Cleanup some enums to consts
+- Workaround Upgrade with Nextcloud stuck in Maintenance mode
+  [#1046](https://github.com/the-djmaze/snappymail/issues/1046)
+- Use Actions()->decodeRawKey()
+- French language updated
+  [#1045](https://github.com/the-djmaze/snappymail/pull/1045) by @hguilbert
+- Sorting in folders not working
+  [#1022](https://github.com/the-djmaze/snappymail/issues/1022)
+- Allow saving draft with empty body
+  [#1052](https://github.com/the-djmaze/snappymail/issues/1052)
+
+### Fixed
+- GnuPG decrypt failed
+- Clear folder link should be hidden if "dangerous actions" is not active
+  [#1037](https://github.com/the-djmaze/snappymail/issues/1037)
+- 500 error generating preview with GD2
+  [#1009](https://github.com/the-djmaze/snappymail/issues/1009)
+- Text and Links Jumping While Writing
+  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
+- Odd annoying behaviour when copy/ pasting anything into an email and then attempting to edit it.
+  [#1054](https://github.com/the-djmaze/snappymail/issues/1054)
+- Check if $rImapLiteralStream is open resource and not closed
+- Save as eml to nextcloud not working anymore
+  [#1057](https://github.com/the-djmaze/snappymail/issues/1057)
+- AuthError and Call to a member function ImapConnectAndLogin() on null
+  [#1060](https://github.com/the-djmaze/snappymail/issues/1060)
+- Thread count missing/shown
+  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
+
+
+## 2.27.2 – 2023-03-22
+
+### Added
+- authentication with smtp freenet.de
+  [#1038](https://github.com/the-djmaze/snappymail/issues/1038)
+
+### Changed
+- SASL always base64 by default
+
+### Fixed
+- Cache issue with index
+  [#1024](https://github.com/the-djmaze/snappymail/issues/1024)
+
+
+## 2.27.1 – 2023-03-21
+
+### Changed
+- Improved attachmentIcon glyph coloring
+- Better design for .accountPlace text
+  [#1025](https://github.com/the-djmaze/snappymail/issues/1025)
+
+### Fixed
+- Reply is broken
+  [#1027](https://github.com/the-djmaze/snappymail/issues/1027)
+- Endless loop at login - Cannot assign array to property MailSo\Imap\Folder::$MAILBOXID
+  [#1032](https://github.com/the-djmaze/snappymail/issues/1032)
+
+
+## 2.27.0 – 2023-03-20
+
+### Added
+- Unique attachments.zip filename
+  [#992](https://github.com/the-djmaze/snappymail/issues/992)
+- Select next email after (re)move current
+  [#968](https://github.com/the-djmaze/snappymail/issues/968)
+
+### Changed
+- Improved FolderCollection handling
+- MODSEQ requires 64-bit int
+- Update russian language
+  [#994](https://github.com/the-djmaze/snappymail/pull/994) by @Akrobs
+- Don't make font bigger when screen > 1400px
+- Put top menu "accountPlace" inside top-system-dropdown-id
+- Put attachment controls inside attachmentsPlace
+- Show message toolbar on screens > 1400px
+  [#970](https://github.com/the-djmaze/snappymail/issues/970)
+- Chinese updated
+  [#1011](https://github.com/the-djmaze/snappymail/pull/1011) by @mayswind
+- Prevent folder/messages flags conflict by using the right name `attributes` for Folders
+- FolderInformation() use jsonSerialize()
+- Squire space handling on paste use `\u00A0` instead of `&nbsp;` for
+  [#1004](https://github.com/the-djmaze/snappymail/issues/1004)
+- Better line-height for QR code
+
+### Fixed
+- Composer src is null
+- Image in Signature disappears in Sent/Draft
+  [#932](https://github.com/the-djmaze/snappymail/issues/932)
+- Mail list is empty
+  [#998](https://github.com/the-djmaze/snappymail/issues/998)
+- Cache handling issues
+  [#1003](https://github.com/the-djmaze/snappymail/issues/1003)
+- No message notification popup when installed in sub-directory
+  [#1007](https://github.com/the-djmaze/snappymail/issues/1007)
+- ERROR: Undefined constant "MailSo\Log\Drivers\STDERR"
+  [#965](https://github.com/the-djmaze/snappymail/issues/965)
+- 'Location:' headers using proper '302 Found' header
+- Can't send email
+  [#1006](https://github.com/the-djmaze/snappymail/issues/1006)
+- Attachment preview
+  [#1005](https://github.com/the-djmaze/snappymail/issues/1005)
+- When decrypt message, subject was replaced empty
+
+### Removed
+- \MailSo\Imap\ImapClient::GetConnectedPort()
+
+### Nextcloud
+- CSS `--panel-bg-clr` was missing
+- SnappyMail Menu under Nextcloud top bar
+  [#1017](https://github.com/the-djmaze/snappymail/issues/1017)
+
+
+## 2.26.4 – 2023-02-24
+
+### Added
+- Add CSP frame-ancestors for
+  [#537](https://github.com/the-djmaze/snappymail/issues/537)
+
+### Changed
+- Reduce/simplify CSS footprint
+- Use the System/Browser font by default
+  [#988](https://github.com/the-djmaze/snappymail/pull/988) by @HeySora
+- Make layout fully responsive using matchMedia('(max-width: 799px)')
+- Move brotli and gzip compress option to application.ini
+- After page refreshes in background whilst editing a draft, the space bar stops working
+  [#860](https://github.com/the-djmaze/snappymail/issues/860)
+- Updated Portuguese
+  [#984](https://github.com/the-djmaze/snappymail/pull/984) by @ner00
+- Updated French
+  [#985](https://github.com/the-djmaze/snappymail/pull/985) by @hguilbert
+
+### Fixed
+- unset border-box for message body
+  [#990](https://github.com/the-djmaze/snappymail/issues/990)
+- Unread email count badge shows -1
+  [#989](https://github.com/the-djmaze/snappymail/issues/989)
+- unicode mailto: addresses not decoded
+- Unicode email/url address matching
+  [#955](https://github.com/the-djmaze/snappymail/issues/955)
+- Invalid Token if run in IFrame
+  [#537](https://github.com/the-djmaze/snappymail/issues/537)
+
+### Removed
+- rl.initData
+
+
+## 2.26.3 – 2023-02-21
+
+### Added
+- Translate "Are you sure you want to exit?"
+- stderr as Logger
+
+### Changed
+- Moved rl.fetch and rl.fetchJSON to boot.js so that AppData can be fetched as JSON
+- Many AppData properties to JavaScript camelCase
+- Cleanup Identity handling
+- Merge GnuPG and OpenPGP.js passphrases
+
+### Fixed
+- Notification enum conflicts with window.Notification
+- language selector didn't show current language in green
+- Threads indicator got lost with new message cache handling
+- messagesBodiesDom never cached previous messages
+- Nextcloud File picker doesn't insert multiple links
+  [#981](https://github.com/the-djmaze/snappymail/issues/981)
+- Call to protected method RainLoop\Enumerations\UploadError::getUserMessage()
+  [#982](https://github.com/the-djmaze/snappymail/issues/982)
+- Issue with the top logo and text of a certain e-mail
+  [#953](https://github.com/the-djmaze/snappymail/issues/953)
+- Facebook logo missing from emails sent out by it
+  [#954](https://github.com/the-djmaze/snappymail/issues/954)
+
+### Removed
+- Unused Squire code
+
+
+## 2.26.2 – 2023-02-17
+
+### Added
+- Remove CSS white-space from messages to prevent annoying side scrolling
+- Show error when trying to send empty message
+  [#974](https://github.com/the-djmaze/snappymail/issues/974)
+- max_sys_loadavg as setting
+  [#971](https://github.com/the-djmaze/snappymail/issues/971)
+
+### Changed
+- Speedup and improved cleanHtml() and cleanCSS() handling
+- Better handling of upload .eml files to a mailbox
+- Rename Folder Hash to ETag as it is the more obvious name
+- Moved AllowDraftAutosave option from Settings -> Security to Settings -> General -> Compose
+- SmtpClient->Connect() use $oSettings->Ehlo
+- Improved handling of `<style>` elements in messages
+- French updated by @hguilbert
+
+### Fixed
+- Remove SVG elements properly from messages
+  [#972](https://github.com/the-djmaze/snappymail/issues/972)
+- Sending large HTML messages slow/fail
+  [#962](https://github.com/the-djmaze/snappymail/issues/962)
+- Nextcloud login failed
+  [#969](https://github.com/the-djmaze/snappymail/issues/969)
+- DoMessageList() hash check was incorrect
+- "Move to folder" button overlays folder sidebar on mobile
+  [#961](https://github.com/the-djmaze/snappymail/issues/961)
+- Spanish translation SPAM and NOT SPAM strings are reversed
+  [#964](https://github.com/the-djmaze/snappymail/issues/964)
+- Can't open Thunderbird PGP keys from decrypted message
+  [#958](https://github.com/the-djmaze/snappymail/issues/958)
+- Can't close Sieve dialog
+  [#960](https://github.com/the-djmaze/snappymail/issues/960)
+
+
+## 2.26.1 – 2023-02-14
+
+### Added
+- Option to allow `<style>` in messages (beta)
+- Message in new tab/window was missing BCC
+
+### Changed
+- Don't clone message for viewing, so that there is instant interaction with messagelist item
+- emailArrayToStringLineHelper() now filters addresses without email address
+- Cleanup EmailModel and better email address parsing and handling
+- Workaround "server connection error"
+  [#936](https://github.com/the-djmaze/snappymail/issues/936)
+- Cleanup AbstractViewPopup handling
+- Italian translation
+  [#948](https://github.com/the-djmaze/snappymail/pull/948) by @lota
+- Replace Element.fromHTML() with createElement()
+
+### Fixed
+- New subfolder not visible
+  [#937](https://github.com/the-djmaze/snappymail/issues/937)
+- OpenPGP decrypted attachments `friendlySize` not a function
+- Message @media print was broken due to new `display:flex`
+- addressparser() didn't handle groups properly
+- middleclick in messages list failed when messagesDom not yet initialized
+- Cannot open messages that have an email address without an @ in the From header
+  [#950](https://github.com/the-djmaze/snappymail/issues/950)
+- CSS don't display:flex when `[hidden]`
+- Default theme handling by @Niveshkrishna
+
+
+## 2.26.0 – 2023-02-10
+
+### Added
+- Whitelist advanced SPF/DKIM/DMARC valid feature
+  [#938](https://github.com/the-djmaze/snappymail/issues/938)
+
+### Changed
+- \RainLoop\Providers\AddressBook\Utils functions param `Contact` changed to `VCard`
+
+### Fixed
+- Issue with themes and Chrome cache
+  [#188](https://github.com/the-djmaze/snappymail/issues/188)
+- Settings panel width due to display:flex
+  [#940](https://github.com/the-djmaze/snappymail/issues/940)
+- Not respecting default theme setting
+  [#941](https://github.com/the-djmaze/snappymail/issues/941)
+- Some files had 0755 instead of 0644
+- Some spacing between message "view images" buttons for
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+- Whitelist failed when empty or when using `:`
+  [#938](https://github.com/the-djmaze/snappymail/issues/938)
+- Cosmetics of the external images whitelist menu
+  [#939](https://github.com/the-djmaze/snappymail/issues/939)
+- PdoAddressBook ORDER BY deleted DESC to prevent sync and export issues
+- Undefined variable $items in upgrade.php
+- qq.com not supporting literal-string in search
+  [#836](https://github.com/the-djmaze/snappymail/issues/836)
+
+
+## 2.25.5 – 2023-02-09
+
+### Added
+- New dark themes
+  [#925](https://github.com/the-djmaze/snappymail/pull/925) by @TheCuteFoxxy
+- External images option 'Always when DKIM is valid' for
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+- Image whitelist menu on message for
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+
+### Changed
+- pt-PT translation by @ner00
+  [#917](https://github.com/the-djmaze/snappymail/issues/917) and
+  [#920](https://github.com/the-djmaze/snappymail/issues/920)
+- fr-FR translation by @hguilbert
+  [#919](https://github.com/the-djmaze/snappymail/issues/919)
+- Layout section rl-right now is `display: flex` and solves
+  [#928](https://github.com/the-djmaze/snappymail/issues/928)
+- Some Themes background to `cover`
+  [#918](https://github.com/the-djmaze/snappymail/issues/918)
+- Speedup cleanHtml() parser
+- Reduce memory usage on addressbook import
+
+### Fixed
+- Prevent loading loop between MessageList and FolderInformation requests
+- Admin -> Config layout
+- Inline images sometimes failed
+- Undefined index: cid
+  [#921](https://github.com/the-djmaze/snappymail/issues/921)
+- On upgrade prevent Apache access errors for
+  [#358](https://github.com/the-djmaze/snappymail/issues/358)
+- Import contacts as CSV is broken
+  [#931](https://github.com/the-djmaze/snappymail/issues/931)
+
+### Removed
+- Blockquote height calculator for
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+
+
+## 2.25.4 – 2023-02-06
+
+### Added
+- message maximum quoted text level for speed.
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+- LoveDark Theme
+  [#913](https://github.com/the-djmaze/snappymail/pull/913) by @TheCuteFoxxy
+
+### Changed
+- Moved pluginEnable() to \SnappyMail\Repository::enablePackage()
+- Updrate French language by @hguilbert
+- Cleanup material-design checkbox
+- Some style change for settings panels
+- Some MailMessageView styling
+- Disabled blockquotes height calculation for
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+- Enhance Add domain dialog
+  [#916](https://github.com/the-djmaze/snappymail/issues/916)
+
+### Fixed
+- Fixed arrows in thread view while scrolling
+  [#908](https://github.com/the-djmaze/snappymail/issues/908)
+- CSS btn-thin were too high
+- Whitelist to show images directly
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+- MailSo\Base\Http::GetHost(): Return value must be of type string
+  [#910](https://github.com/the-djmaze/snappymail/issues/910)
+- Nextcloud undefined variable $sUser
+  [#915](https://github.com/the-djmaze/snappymail/issues/915)
+- Hopefull improved styling for Firefox mobile fixes
+- Scroll display error
+  [#912](https://github.com/the-djmaze/snappymail/issues/912)
+- Autofocus was triggered when view resized
+- Better solution for Settings Page is bigger than the Account Page
+  [#897](https://github.com/the-djmaze/snappymail/issues/897)
+
+### Removed
+- $bUrlEncode as it was always false
+
+
+## 2.25.3 – 2023-02-03
+
+### Added
+- Make message collapse quotes optional
+  [#902](https://github.com/the-djmaze/snappymail/issues/902)
+
+### Changed
+- Improved loginErrorDelay to prevent timing attacks and default to 5 seconds
+- Moved message collapse quotes to HTML parser
+- Moved some application.ini settings to other sections
+- Moved source "/assets/*" to proper location in /snappymail/v/0.0.0/static/
+- Set checkMailInterval to 15 minutes by default (now that it is configurable)
+
+### Fixed
+- Prevent plugin property decrypt error
+  [#859](https://github.com/the-djmaze/snappymail/issues/859)
+- Index.html cache issue
+  [#891](https://github.com/the-djmaze/snappymail/issues/891)
+- Images whitelist regular expression failed
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+- Undefined index: ShowImages
+  [#901](https://github.com/the-djmaze/snappymail/issues/901)
+- Chrome shows LSep boxes in certain emails
+  [#900](https://github.com/the-djmaze/snappymail/issues/900)
+- Don't remember OpenPGP/GnuPGP key passphrase when it fails
+  [#840](https://github.com/the-djmaze/snappymail/issues/840)
+
+
+## 2.25.2 – 2023-02-02
+
+### Added
+- Refresh frequency of the mailboxes
+  [#486](https://github.com/the-djmaze/snappymail/issues/486)
+- Temporarily save password for private key during session
+  [#840](https://github.com/the-djmaze/snappymail/issues/840)
+- Upgrade from Rainloop, password not migrated
+  [#898](https://github.com/the-djmaze/snappymail/issues/898)
+- Whitelist to show images directly
+  [#201](https://github.com/the-djmaze/snappymail/issues/201)
+- HTML editor paste image makes it max 1024px width/height
+  [#262](https://github.com/the-djmaze/snappymail/issues/262)
+- SnappyMail\TAR::extractTo support the $files and $overwrite parameters
+
+### Changed
+- Issue with themes when Chrome crashes
+  [#188](https://github.com/the-djmaze/snappymail/issues/188)
+- /static/.htaccess as mentioned by @dbiczo in
+  [#895](https://github.com/the-djmaze/snappymail/issues/895)
+- Update nb-NO language
+  [#896](https://github.com/the-djmaze/snappymail/pull/896) by @master3395
+- \RainLoop\Utils::SetCookie() to \SnappyMail\Cookies::set()
+- Merge \MailSo\Base\Utils::RecRmDir() and \MailSo\Base\Utils::RecTimeDirRemove()
+
+### Fixed
+- Two issues with images being delivered via ProxyExternal
+  [#887](https://github.com/the-djmaze/snappymail/issues/887)
+- Multiple accounts conflicts when using multiple tabs
+  [#892](https://github.com/the-djmaze/snappymail/issues/892)
+- Spaces in attached file names are not preserved
+  [#893](https://github.com/the-djmaze/snappymail/issues/893)
+- Prevent empty area scroll on body
+
+### Removed
+- Floating HTML text formatting menu on mobile
+  [#828](https://github.com/the-djmaze/snappymail/issues/828)
+- Unused AUTH_SPEC_LOGOUT_TOKEN_KEY and AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY
+
+
+## 2.25.1 – 2023-01-30
+
+### Added
+- Support RFC 8689
+- Nextcloud move themes outside of app folder
+  [#875](https://github.com/the-djmaze/snappymail/issues/875)
+- Add check to unregister system addressbook
+  [#879](https://github.com/the-djmaze/snappymail/pull/879) by @akhil1508
+
+### Changed
+- material-design checkbox use hidden input for accessibility
+- Always subscribe to new folder by default
+- Merge NoScript, NoCookie and BadBrowser pages in Index.html
+- Cleanup translations. Also see https://snappymail.eu/translate.php
+
+### Fixed
+- PHP < 8.1 ini_set() only accepts strings when `declare(strict_types=1);` is used
+- Nextcloud also fix settings on upgrade
+- Nextcloud workaround upgrade OPCache issue
+  [#880](https://github.com/the-djmaze/snappymail/issues/880)
+- SMTP error while using PHP mail()
+  [#884](https://github.com/the-djmaze/snappymail/issues/884)
+- Cannot create folder
+  [#885](https://github.com/the-djmaze/snappymail/issues/885)
+- Image stretching when image hasd max-width
+  [#869](https://github.com/the-djmaze/snappymail/issues/869)
+
+
+## 2.25.0 – 2023-01-26
+
+### Changed
+- Right margin to folder search input wrapper
+  [#871](https://github.com/the-djmaze/snappymail/pull/871) by @codiflow
+- Almost all request params now use JavaScript camelCase instead of CamelCase
+- #rl-content to use flex for better layout control
+- Decode some Copernica link tracking
+- Cleanup some CSS and JS code
+- Better Sieve rainloop.user script handling
+- Improve MailSo\Imap\BodyStructure
+- Cleanup MIME part FileName handling
+
+### Fixed
+- CardDAV sync error - Request aborted
+  [#866](https://github.com/the-djmaze/snappymail/issues/866)
+- PDF not possible to be viewed in the browser
+  [#867](https://github.com/the-djmaze/snappymail/issues/867)
+- ZIP Files cannot be uploaded from Desktop to attachments (other files can be uploaded)
+  [#878](https://github.com/the-djmaze/snappymail/issues/878)
+- Mobile view issues with leftside menu
+- Default messageListItem border left color for dark mode
+- Nextcloud layout in ?admin
+- Nextcloud `_htaccess` to `.htaccess` failed
+
+### Removed
+- Some unused PHP functions
+
+## 2.24.6 – 2023-01-18
+
+### Added
+- Preparations for RFC 8689
+- Add admin setting for the contacts suggestions limit
+- A button to clear folder search input field
+  [#847](https://github.com/the-djmaze/snappymail/pull/847) by @codiflow
+- Preparations for custom SMTP credentials handling for
+  [#859](https://github.com/the-djmaze/snappymail/issues/859)
+  [#458](https://github.com/the-djmaze/snappymail/issues/458)
+  [#431](https://github.com/the-djmaze/snappymail/issues/431)
+  [#233](https://github.com/the-djmaze/snappymail/issues/233)
+
+### Changed
+- Display the time of emails, not just the size and date
+  [#843](https://github.com/the-djmaze/snappymail/issues/843)
+- Made thread number a bit wider
+  [#844](https://github.com/the-djmaze/snappymail/issues/844)
+- Improved contacts suggestions limit handling
+  [#849](https://github.com/the-djmaze/snappymail/issues/849)
+- 64-bit PHP was required
+  [#852](https://github.com/the-djmaze/snappymail/issues/852)
+- Update fr-FR translations
+  [#854](https://github.com/the-djmaze/snappymail/pull/854) by @dominiquefournier
+- Move createDomain & createDomainAlias buttons below table
+- Move some Nextcloud SnappyMailHelper code to new InstallStep
+- Cleanup messages cache handling
+- Improved visibility Admin Domain Test errors
+
+### Fixed
+- LiteSpeed does not disable compression although .htaccess says so
+  [#525](https://github.com/the-djmaze/snappymail/issues/525)
+  [#855](https://github.com/the-djmaze/snappymail/issues/855)
+- "Move to folder" functionality displays in desktop view when on mobile
+  [#858](https://github.com/the-djmaze/snappymail/issues/858)
+- matchAnyRule() Return value must be of type bool, none returned
+- Unknown CSP directive 'strict-dynamic' in Safari 13.1.2
+- Wrong timeStyle issue in Safari 13.1.2
+- Language SETTINGS_LABELS got lost
+- Nextcloud failed loading app data when path didn't end with /
+  [#864](https://github.com/the-djmaze/snappymail/issues/864)
+- Workaround Nextcloud session_start issue
+  [#813](https://github.com/the-djmaze/snappymail/issues/813)
+
+## 2.24.5 – 2023-01-12
+
+### Added
+- Support for search criterias ON, SENTON, SENTSINCE and SENTBEFORE
+- New 'forward as attachment' glyph
+- NC integration app metadata: add links to admin and dev docs
+  [#820](https://github.com/the-djmaze/snappymail/pull/820) by @p-bo
+- Clicking on messagelist grouped date/from searches on that date/from
+  [#815](https://github.com/the-djmaze/snappymail/issues/815)
+- Nextcloud Improved file picker layout
+  [#825](https://github.com/the-djmaze/snappymail/issues/825)
+
+### Changed
+- Move release.php to cli/release.php
+- Moved sort options "FROM" direct below "DATE" for better understanding
+- Added DAV path error to log for
+  [#822](https://github.com/the-djmaze/snappymail/issues/822)
+- Resolve layout issues by changing from `fixed` to `relative`
+  [#686](https://github.com/the-djmaze/snappymail/issues/686)
+- Cache handling of messagelist changed due to etag issues
+- Improve german and italian translation
+  [#846](https://github.com/the-djmaze/snappymail/pull/846) by @cm-schl
+
+### Fixed
+- Searching on Nextcloud search
+  [#787](https://github.com/the-djmaze/snappymail/issues/787)
+- Workaround another Nextcloud disallowed .htaccess
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
+- Compact display of folders in nextcloud
+  [#824](https://github.com/the-djmaze/snappymail/pull/824) by @makoehr
+- Admin -> Contacts PDO test failed when using different AddressBookInterface
+- KolabAddressBook errors
+- Forgot debug js/css setting change in Nextcloud
+- Typed property MailSo\Mail\MessageListParams::$sSearch must not be accessed before initialization
+- Unable to change font/text colour when composing message using Safari
+  [#826](https://github.com/the-djmaze/snappymail/issues/826)
+- auth_logging failed
+  [#489](https://github.com/the-djmaze/snappymail/issues/489)
+- Class "RainLoop\Actions\Notifications" not found
+  [#839](https://github.com/the-djmaze/snappymail/issues/839)
+
+### Removed
+- 'set-version' argument for release.php
+
+
+## 2.24.4 – 2022-12-30
+
+### Added
+- Check PHP_INT_SIZE if SnappyMail runs on 64bit
+
+### Changed
+- A lot of MessageList sorting improvements
+  [#796](https://github.com/the-djmaze/snappymail/issues/796)
+- On upgrade also update plugins in Nextcloud due to many misunderstandings and prevent invalid open issues
+- Moved application.ini labs.use_app_debug_* to debug.*
+
+### Fixed
+- Dutch translation for confusing message (threads vs grouped)
+- Workaround Nextcloud disallowed .htaccess
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
+- Searching on Nextcloud search failed
+  [#787](https://github.com/the-djmaze/snappymail/issues/787)
+
+
+## 2.24.3 – 2022-12-28
+
+### Changed
+- When sorting on FROM also sort on REVERSE DATE
+
+### Fixed
+- F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
+  [#800](https://github.com/the-djmaze/snappymail/issues/800)
+- Switching accounts does not work anymore with 2.24.2
+  [#802](https://github.com/the-djmaze/snappymail/issues/802)
+
+
+## 2.24.2 – 2022-12-27
+
+### Changed
+- Disable sorting when viewing message thread
+  [#445](https://github.com/the-djmaze/snappymail/issues/445)
+- Update Chinese translation
+  [#794](https://github.com/the-djmaze/snappymail/pull/794) by @mayswind
+- No need to call IMAP EXAMINE when current folder already SELECT
+- Thread view now has tree indentation
+
+### Fixed
+- Nextcloud failed on Integrity check
+  [#790](https://github.com/the-djmaze/snappymail/issues/790)
+- Deleting message fails with message "Cannot move message" on hMailServer
+  [#793](https://github.com/the-djmaze/snappymail/issues/793)
+- List messages per day feature is enabled by default and breaks sorting
+  [#796](https://github.com/the-djmaze/snappymail/issues/796)
+- Custom page login not working for first time due to smctoken security
+  [#798](https://github.com/the-djmaze/snappymail/issues/798)
+- Message list is always empty due to wrong implementation of RFC 8474
+  [#799](https://github.com/the-djmaze/snappymail/issues/799)
+
+
+## 2.24.1 – 2022-12-23
+
+### Changed
+- Intl.DateTimeFormat() into toLocaleString() for iOS < 14
+- Cleanup locale date/time handling
+- Make MessageList per day optional
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+
+### Fixed
+- Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization
+  [#792](https://github.com/the-djmaze/snappymail/issues/792)
+- Attachments in mails in 2.24 not loading in reply/forward
+  [#789](https://github.com/the-djmaze/snappymail/issues/789)
+- Rollback #280 due to complications
+  [#280](https://github.com/the-djmaze/snappymail/issues/280)
+
+
+## 2.24.0 – 2022-12-22
+
+### Added
+- Option to enable additional account unread messages count
+- Prevent godaddy click tracking
+- Dark theme use `color-scheme: dark;`
+- More imapsync.php CLI options and help
+
+### Changed
+- MessageList now grouped/split per day
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+- Account switcher still shown when allow_additional_accounts is set to Off
+  [#280](https://github.com/the-djmaze/snappymail/issues/280)
+- PHP classes use typed properties
+- Speedup Contacts Suggestions handling
+- Check SMTP SIZE
+  [#779](https://github.com/the-djmaze/snappymail/issues/779)
+
+### Fixed
+- Handle multiple DKIM signatures authentication results
+- Reload admin extensions on update
+- SieveClient quoted string parsing failed
+- Invalid Attachments (PDF)
+  [#466](https://github.com/the-djmaze/snappymail/issues/466)
+- Email HTML images rendering issue
+  [#564](https://github.com/the-djmaze/snappymail/issues/564)
+- "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
+  [#780](https://github.com/the-djmaze/snappymail/issues/780)
+
+### Removed
+- Some unused plugin hooks to improve Action handling speed
+
+
+## 2.23.1 – 2022-12-15
+
+### Changed
+- More JMAP RFC matching including role
+- Speedup fetch all Folders/mailboxes
+- Disable unused folder_list_limit
+- Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
+- SnappyMail\Imap\Sync now matches folders based on JMAP role
+- Added the new imapsync.php command line script for
+  [#744](https://github.com/the-djmaze/snappymail/issues/744)
+- Added manual setting for 12/24h clock
+  [#760](https://github.com/the-djmaze/snappymail/issues/760)
+- Add options to mark the message I'm viewing as unread and return to the inbox
+  [#766](https://github.com/the-djmaze/snappymail/issues/766)
+
+### Fixed
+- Extension menu shows only some available extensions
+  [#778](https://github.com/the-djmaze/snappymail/issues/778)
+- New solution for [#423](https://github.com/the-djmaze/snappymail/issues/423) due to [#774](https://github.com/the-djmaze/snappymail/issues/774)
+- Avatars extension error on smartphone
+  [#764](https://github.com/the-djmaze/snappymail/issues/764)
+- Don't fetch Unread count for main account
+- CSS .e-checkbox.material-design invisible on show/hide
+
+
+## 2.23.0 – 2022-12-08
+
+### Added
+- Show the number of unread mails on all mail addresses/accounts
+  [#437](https://github.com/the-djmaze/snappymail/issues/437)
+- Show OpenSSL version in Admin => About
+
+### Changed
+- Redirect to login page instead of "invalid token" popup
+  [#752](https://github.com/the-djmaze/snappymail/issues/752)
+- Make all dialogs fit in mobile view
+- Changed some Plugin hooks for better handling:
+	* json.action-pre-call => json.before-{actionname}
+	* json.action-post-call => json.after-{actionname}
+- Cleaner accounts list in systemdropdown
+- Multiple imapConnect handling for new import mail feature
+  [#744](https://github.com/the-djmaze/snappymail/issues/744)
+
+### Fixed
+- Loosing HTML signature in account identity under settings
+  [#750](https://github.com/the-djmaze/snappymail/issues/750)
+- Plugin configuration did not load anymore when type was SELECTION
+  [#753](https://github.com/the-djmaze/snappymail/pull/753) by @cm-schl
+- Nextcloud Default theme shows gray text on gray background
+  [#754](https://github.com/the-djmaze/snappymail/issues/754)
+- Only run JSON hooks when $sAction is set
+  [#755](https://github.com/the-djmaze/snappymail/issues/755)
+- Unsupported SASL mechanism OAUTHBEARER
+  [#756](https://github.com/the-djmaze/snappymail/issues/756)
+  [#758](https://github.com/the-djmaze/snappymail/issues/758)
+  [#759](https://github.com/the-djmaze/snappymail/issues/759)
+- border-box issue with .buttonCompose
+
+### Removed
+- Deprecate \RainLoop\Account->Login() and \RainLoop\Account->Password()
+
+
+## 2.22.7 – 2022-12-06
+
+### Changed
+- Scroll bar with the mobile version in "Advanced search" screen
+  [#712](https://github.com/the-djmaze/snappymail/issues/712)
+
+### Fixed
+- Undefined property: MailSo\Mail\FolderCollection::$capabilities
+- PHP 8.2 Creation of dynamic property is deprecated
+- Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
+  [#745](https://github.com/the-djmaze/snappymail/issues/745)
+  [#746](https://github.com/the-djmaze/snappymail/issues/746)
+  [#748](https://github.com/the-djmaze/snappymail/issues/748)
+- Admin domain test undefined matched domain should say email@example matched domain
+
+
+## 2.22.6 – 2022-12-05
+
+### Changed
+- Narrow MessageList wraps star icon
+  [#737](https://github.com/the-djmaze/snappymail/issues/737)
+- Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
+  [#745](https://github.com/the-djmaze/snappymail/issues/745)
+- No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
+- Update Chinese translation by @mayswind
+
+### Fixed
+- PluginProperty DefaultValue contained array while it should not
+  [#741](https://github.com/the-djmaze/snappymail/issues/741)
+
+### Removed
+- IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
+
+
+## 2.22.5 – 2022-12-02
+
+### Added
+- Support plugin minified .min.js and .min.css
+- ZIP Download multiple emails
+  [#717](https://github.com/the-djmaze/snappymail/issues/717)
+
+### Changed
+- Replaced some data-bind="click: function(){} with object functions to prevent eval()
+- Improved plugins hash when there are changes
+
+### Fixed
+- Settings Themes style due to border-box change
+- "Remember me" failed due to v2.22.4 Session token change
+  [#719](https://github.com/the-djmaze/snappymail/issues/719)
+  [#731](https://github.com/the-djmaze/snappymail/issues/731)
+
+### Removed
+- Vacation filter: Button to add recipients (+)
+  [#728](https://github.com/the-djmaze/snappymail/issues/728)
+
+
+## 2.22.4 – 2022-11-28
+
+### Changed
+- Contacts dialog layout using flex
+- Session token is related to the user agent string
+  [#713](https://github.com/the-djmaze/snappymail/issues/713)
+- Better browser cache handling for avatars plugin
+  [#714](https://github.com/the-djmaze/snappymail/issues/714)
+- Force HTML editor when set as default when replying to message
+  [#355](https://github.com/the-djmaze/snappymail/issues/355)
+
+### Fixed
+- Contact Error - object Object
+  [#716](https://github.com/the-djmaze/snappymail/issues/716)
+- Unable to move messages to different folder by drag and drop
+  [#710](https://github.com/the-djmaze/snappymail/issues/710)
+- v2.22.3 unknown error
+  [#709https://github.com/the-djmaze/snappymail/issues/709)
+
+
+## 2.22.3 – 2022-11-25
+
+### Added
+- application.ini config logs.path and cache.path to improve custom data structure.
+
+### Changed
+- Improved cPanel integration
+  [#697](https://github.com/the-djmaze/snappymail/issues/697)
+- Update to OpenPGP.js v5.5.0
+
+### Fixed
+- drag & drop folder expansion
+  [#707](https://github.com/the-djmaze/snappymail/issues/707)
+- Save selected messages as .eml in Nextcloud failed
+  [#704](https://github.com/the-djmaze/snappymail/issues/704)
+
+
+## 2.22.2 – 2022-11-24
+
+### Added
+- Support cPanel
+  [#697](https://github.com/the-djmaze/snappymail/issues/697)
+
+
+## 2.22.1 – 2022-11-23
+
+### Added
+- AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
+  [#115](https://github.com/the-djmaze/snappymail/issues/115)
+
+### Changed
+- All the attachment zone is not clickable, even if the cursor is a hand
+  [#691](https://github.com/the-djmaze/snappymail/issues/691)
+- Different approach for "update button duplicated in admin panel"
+  [#677](https://github.com/the-djmaze/snappymail/issues/677)
+- Better drag & drop solution for leftPanel
+
+### Fixed
+- The page does not change after batch deletion
+  [#684](https://github.com/the-djmaze/snappymail/issues/684)
+- Prevent domain uppercase issues found in
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+- Login invalid response: VXNlcm5hbWU6CG
+  [#693](https://github.com/the-djmaze/snappymail/issues/693)
+
+
+## 2.21.4 – 2022-11-22
+
+### Added
+- Added domain matcher test for
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+- Download all Attachments of selected Emails
+  [#361](https://github.com/the-djmaze/snappymail/issues/361)
+
+### Changed
+- Log current shortcuts scope for
+  [#690](https://github.com/the-djmaze/snappymail/issues/690)
+- CSS everything to be box-sizing: border-box;
+- Make messageview a bit larger so that it is the same height as the messagelist
+- Cleanup and rearrange some fontastic glyphs
+- Also show From email address by default
+  [#683](https://github.com/the-djmaze/snappymail/issues/683)
+
+### Fixed
+- Contact.display() returns [object Object]
+- When left panel disabled and drag messages, show it
+- Issue with admin domain connection type settings selectbox
+  [#689](https://github.com/the-djmaze/snappymail/issues/689)
+- Mobile View on cellphones: automatic scrolling not working near the visual keyboard
+  [#686](https://github.com/the-djmaze/snappymail/issues/686)
+- Unable to separate runtime from installation
+  [#685](https://github.com/the-djmaze/snappymail/issues/685)
+
+### Removed
+- Removed inline parameter of checkbox and select components
+
+
+## 2.21.3 – 2022-11-16
+
+### Added
+- Click on PGP KEY attachment opens "Import key" dialog
+
+### Changed
+- Increase visible reading area for small screens
+  [#672](https://github.com/the-djmaze/snappymail/issues/672)
+- Improved message spam score detailed view
+- Improved DAV connection logging
+
+### Fixed
+- Handling attachments MIME type / content-type
+- Message responsive resizing width/height of elements
+  [#678](https://github.com/the-djmaze/snappymail/issues/678)
+- Focus on textarea when creating a new plain text email
+  [#501](https://github.com/the-djmaze/snappymail/issues/501)
+- CardDav remove photos of my contacts when synchronizing
+  [#679](https://github.com/the-djmaze/snappymail/issues/679)
+
+### Removed
+- \MailSo\Mime\Enumerations\MimeType
+
+### Nextcloud
+- Use fontastic in Nextcloud Files selector dialog
+- Firefox < 98 dialogs
+  [#673](https://github.com/the-djmaze/snappymail/issues/673)
+
+## 2.21.2 – 2022-11-15
+
+### Added
+- Allow browser Spellchecker
+  [#574](https://github.com/the-djmaze/snappymail/issues/574)
+- Decode MIME charset of .EML attachments
+  [#662](https://github.com/the-djmaze/snappymail/issues/662)
+
+### Changed
+- Increase message visible text area
+  [#672](https://github.com/the-djmaze/snappymail/issues/672)
+- When copy/paste image use the raw data instead of clipboard HTML
+  [#654](https://github.com/the-djmaze/snappymail/issues/654)
+- When application.ini debug.enable is true, also debug js and css
+- JavaScript rl.setWindowTitle() renamed to rl.setTitle()
+
+### Removed
+- Message toggle fullscreen button which was only in mobile view
+
+### Nextcloud
+- Workaround Nextcloud calendar crashes
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+  [#661](https://github.com/the-djmaze/snappymail/issues/661)
+- Added share public/internal file link
+  [#569](https://github.com/the-djmaze/snappymail/issues/569)
+
+
+## 2.21.1 – 2022-11-13
+
+### Fixed
+- Crypt crashes when Sodium not installed
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+  [#657](https://github.com/the-djmaze/snappymail/issues/657)
+  [#663](https://github.com/the-djmaze/snappymail/issues/663)
+  [#664](https://github.com/the-djmaze/snappymail/issues/664)
+  [#668](https://github.com/the-djmaze/snappymail/issues/668)
+  [#669](https://github.com/the-djmaze/snappymail/issues/669)
+- Personalised favicon not working - default Snappymail favicon showing
+  [#665](https://github.com/the-djmaze/snappymail/issues/665)
+
+### Nextcloud
+- v23 ContentSecurityPolicy versions issue
+  [#666](https://github.com/the-djmaze/snappymail/issues/666)
+
+
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+- Light/Dark favicon.svg
+  [#643](https://github.com/the-djmaze/snappymail/issues/643)
+- Allow an account name/label
+  [#571](https://github.com/the-djmaze/snappymail/issues/571)
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen
+  [#638](https://github.com/the-djmaze/snappymail/issues/638)
+
+### Fixed
+- ldap-identities-plugin
+  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
+- OpenSSL v3 ciphers issue
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
+## 2.20.6 – 2022-11-08
+
+### Fixed
+- ?admin login failed
+  [#642](https://github.com/the-djmaze/snappymail/issues/642)
+- Resolve PHP 8.2 Creation of dynamic property is deprecated
+
+
+## 2.20.5 – 2022-11-08
+
+### Nextcloud
+- Improved workaround for Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.3 – 2022-11-07
+
+### Added
+- Throw decrypt errors
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+
+### Changed
+- Better multiple WYSIWYG registration system (not finished)
+- Better handling of admin token cookie
+
+### Fixed
+- Cookie “name” has been rejected because it is already expired.
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+- Content-Security-Policy 'strict-dynamic' was missing
+
+### Nextcloud
+- Better handling of Content-Security-Policy
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+- Nextcloud 23 Error Call to undefined method useStrictDynamic()
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+- Use snappymail icon as favicon-mask.svg instead default nextcloud logo
+  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+
+
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
+## 2.20.1 – 2022-11-04
+
+### Added
+- Added CSS --dialog-border-clr and --dialog-border-radius
+- Show lock (lock) glyph in messagelist for encrypted messages
+
+### Fixed
+- Decrypt failed when OpenPGP.js not loaded
+
+### Nextcloud
+- Now integrate with Nextcloud by default, but keep iframe option available
+- Better theme integration with Nextcloud
+- Use Nextcloud 18+ IEventDispatcher
+- Solve Nextcloud 25 CSS issues
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+- PutinICS does is not working for all calendar events
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+- Update readme
+  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
+
+
+## 2.20.0 – 2022-11-03
+
+### Added
+- Strip mailchimp tracking
+
+### Changed
+- Use some PHP typed properties
+- Move bootstrap @less variables to CSS var()
+- Improved theme styling
+
+### Fixed
+- CSS --dropdown-menu-background-color should be --dropdown-menu-bg-color
+
+### Nextcloud
+- Disable Nextcloud Impersonate check due to login/logout complications
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- Improved theme integration and be compatible with Breeze Dark
+
+
+## 2.19.7 – 2022-11-02
+
+### Added
+- Make it clear that you are on the admin panel login screen
+- Force PHP opcache_invalidate due to upgrade error reports "Missing version directory"
+
+### Fixed
+- Switching user (impersonate plugin) keeps old Email logged in
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- PGP Decryption / Encryption Failures
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+- Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+- Cannot access admin panel
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+- Wont show my emails
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+- Return type of MailSo\Base\StreamFilters\LineEndings::filter
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+- Create .pgp directory was missing
+
+### Security
+- Logger leaked some passwords
+
+## 2.19.6 – 2022-10-31
+
+### Added
+- Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
+- Filter scripts UI let user understand which filter is active
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+
+### Fixed
+- Method 'GetRequest' not found in \MailSo\Base\Http
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+
+### Changed
+- Base Domain setup enhancements
+- Cleanup MailSo MailClient using __call()
+- Domain settings handling and store as JSON instead of ini
+- Some JavaScript changes
+- When try to login IMAP/SMTP/SIEVE but STARTTLS is required, force STARTTLS
+- Embed admin panel into Nextcloud (with autologin, no need for separate login)
+- Don't set default_domain in Nextcloud when already set
+
+### Removed
+- Nextcloud dark mode, it is incomplete
+
+### Deprecated
+- nothing
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+- Light/Dark favicon.svg
+  [#643](https://github.com/the-djmaze/snappymail/issues/643)
+- Allow an account name/label
+  [#571](https://github.com/the-djmaze/snappymail/issues/571)
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen
+  [#638](https://github.com/the-djmaze/snappymail/issues/638)
+
+### Fixed
+- ldap-identities-plugin
+  [#647](https://github.com/the-djmaze/snappymail/pull/647) by @cm-schl
+- OpenSSL v3 ciphers issue
+  [#641](https://github.com/the-djmaze/snappymail/issues/641)
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
+## 2.20.6 – 2022-11-08
+
+### Fixed
+- ?admin login failed
+  [#642](https://github.com/the-djmaze/snappymail/issues/642)
+- Resolve PHP 8.2 Creation of dynamic property is deprecated
+
+
+## 2.20.5 – 2022-11-08
+
+### Nextcloud
+- Improved workaround for Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.3 – 2022-11-07
+
+### Added
+- Throw decrypt errors
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+
+### Changed
+- Better multiple WYSIWYG registration system (not finished)
+- Better handling of admin token cookie
+
+### Fixed
+- Cookie “name” has been rejected because it is already expired.
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+- Content-Security-Policy 'strict-dynamic' was missing
+
+### Nextcloud
+- Better handling of Content-Security-Policy
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+- Nextcloud 23 Error Call to undefined method useStrictDynamic()
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+- Use snappymail icon as favicon-mask.svg instead default nextcloud logo
+  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+
+
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
+## 2.20.1 – 2022-11-04
+
+### Added
+- Added CSS --dialog-border-clr and --dialog-border-radius
+- Show lock (lock) glyph in messagelist for encrypted messages
+
+### Fixed
+- Decrypt failed when OpenPGP.js not loaded
+
+### Nextcloud
+- Now integrate with Nextcloud by default, but keep iframe option available
+- Better theme integration with Nextcloud
+- Use Nextcloud 18+ IEventDispatcher
+- Solve Nextcloud 25 CSS issues
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+- PutinICS does is not working for all calendar events
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+- Update readme
+  [#617](https://github.com/the-djmaze/snappymail/pull/617) by @cm-schl
+
+
+## 2.20.0 – 2022-11-03
+
+### Added
+- Strip mailchimp tracking
+
+### Changed
+- Use some PHP typed properties
+- Move bootstrap @less variables to CSS var()
+- Improved theme styling
+
+### Fixed
+- CSS --dropdown-menu-background-color should be --dropdown-menu-bg-color
+
+### Nextcloud
+- Disable Nextcloud Impersonate check due to login/logout complications
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- Improved theme integration and be compatible with Breeze Dark
+
+
+## 2.19.7 – 2022-11-02
+
+### Added
+- Make it clear that you are on the admin panel login screen
+- Force PHP opcache_invalidate due to upgrade error reports "Missing version directory"
+
+### Fixed
+- Switching user (impersonate plugin) keeps old Email logged in
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- PGP Decryption / Encryption Failures
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+- Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+- Cannot access admin panel
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+- Wont show my emails
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+- Return type of MailSo\Base\StreamFilters\LineEndings::filter
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+- Create .pgp directory was missing
+
+### Security
+- Logger leaked some passwords
+
+## 2.19.6 – 2022-10-31
+
+### Added
+- Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
+- Filter scripts UI let user understand which filter is active
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+
+### Fixed
+- Method 'GetRequest' not found in \MailSo\Base\Http
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+
+### Changed
+- Base Domain setup enhancements
+- Cleanup MailSo MailClient using __call()
+- Domain settings handling and store as JSON instead of ini
+- Some JavaScript changes
+- When try to login IMAP/SMTP/SIEVE but STARTTLS is required, force STARTTLS
+- Embed admin panel into Nextcloud (with autologin, no need for separate login)
+- Don't set default_domain in Nextcloud when already set
+
+### Removed
+- Nextcloud dark mode, it is incomplete
+
+### Deprecated
+- nothing
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index db363fddd..95821f69d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -29,7 +29,7 @@
 **Editing HTML Template Files**
 
 1. Edit data/\_data_/\_default_/configs/application.ini
-2. Set 'cache_system_data' to Off
+2. Set `[cache] system_data` to Off
 
 **Release**
 
diff --git a/LICENSE b/LICENSE
index 2def0e883..dba13ed2d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -658,4 +658,4 @@ specific requirements.
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
+<http://www.gnu.org/licenses/>.
diff --git a/Makefile b/Makefile
index 22871b0e8..bc1bc3eab 100644
--- a/Makefile
+++ b/Makefile
@@ -61,8 +61,6 @@ rl-watch-js:
 
 rl-build:
 	@docker compose run --no-deps --rm node gulp all
-rl-build-pro:
-	@docker compose run --no-deps --rm node gulp all --pro
 
 yarn-install:
 	@docker compose run --no-deps --rm node yarn install
diff --git a/README.md b/README.md
index 9fa293fea..b9736d393 100644
--- a/README.md
+++ b/README.md
@@ -5,6 +5,10 @@
   <br>
   <h1>SnappyMail</h1>
   <br>
+
+[![github-actions](https://github.com/the-djmaze/snappymail/actions/workflows/docker.yml/badge.svg)](https://github.com/the-djmaze/snappymail/actions/workflows/docker.yml)
+[![docker-image-size](https://img.shields.io/docker/image-size/djmaze/snappymail/latest)](https://hub.docker.com/r/djmaze/snappymail/tags)
+
   <p>
     Simple, modern, lightweight &amp; fast web-based email client.
   </p>
@@ -26,7 +30,7 @@ For more information about the product, check [snappymail.eu](https://snappymail
 
 Information about installing the product, check the [wiki page](https://github.com/the-djmaze/snappymail/wiki/Installation-instructions).
 
-And don't forget to read the [RainLoop documentation](https://www.rainloop.net/docs/).
+And don't forget to read the whole [Wiki](https://github.com/the-djmaze/snappymail/wiki).
 
 ## License
 
@@ -34,19 +38,19 @@ And don't forget to read the [RainLoop documentation](https://www.rainloop.net/d
 **GNU AFFERO GENERAL PUBLIC LICENSE Version 3 (AGPL)**.
 http://www.gnu.org/licenses/agpl-3.0.html
 
-Copyright (c) 2020 - 2022 SnappyMail
-Copyright (c) 2013 - 2021 RainLoop
+Copyright (c) 2020 - 2024 SnappyMail
+Copyright (c) 2013 - 2022 RainLoop
 
 ## Modifications
 
 This fork of RainLoop has the following changes:
 
-* Privacy/GDPR friendly (no: Social, Gravatar, Facebook, Google, Twitter, DropBox, OwnCloud, X-Mailer)
+* Privacy/GDPR friendly (no: Social, Gravatar, Facebook, Google, Twitter, DropBox, X-Mailer)
 * Admin uses password_hash/password_verify
 * Auth failed attempts written to syslog
 * Added Fail2ban instructions
-* ES2018
-* PHP 7.3+ required
+* ES2020
+* PHP 7.4+ required
 * PHP mbstring extension required
 * PHP replaced pclZip with PharData and ZipArchive
 * Dark mode
@@ -57,11 +61,13 @@ This fork of RainLoop has the following changes:
 * Removed background video support
 * Removed Sentry (Application Monitoring and Error Tracking Software)
 * Removed Spyc yaml
+* Removed OwnCloud
 * Replaced gulp-uglify with gulp-terser
 * CRLF => LF line endings
 * Embed boot.js and boot.css into index.html
-* Ongoing removal of old JavaScript code (things are native these days)
-* Added modified [Squire](https://github.com/neilj/Squire) HTML editor as replacement for CKEditor
+* Removal of old JavaScript code (things are native these days)
+* Added modified [Squire](https://github.com/the-djmaze/Squire/tree/snappymail) HTML editor as replacement for CKEditor
+* Updated [Sabre/VObject](https://github.com/sabre-io/vobject)
 * Split Admin specific JavaScript code from User code
 * Split Sieve specific JavaScript code from User code
 * JSON reviver
@@ -77,12 +83,7 @@ This fork of RainLoop has the following changes:
 * Added [Fetch Metadata Request Headers](https://www.w3.org/TR/fetch-metadata/) checks
 * Reduced excessive DOM size
 * Support [Kolab groupware](https://kolab.org/)
-* Support IMAP RFC 2971 ID extension
-* Support IMAP RFC 5258 LIST-EXTENDED
-* Support IMAP RFC 5464 METADATA
-* Support IMAP RFC 5819 LIST-STATUS
-* Support IMAP RFC 7628 SASL OAUTHBEARER aka XOAUTH2
-* Support IMAP4rev2 RFC 9051
+* Support many more [IMAP RFC's](https://snappymail.eu/comparison#IMAP)
 * Support Sodium and OpenSSL for encryption
 * Much better PGP support
 
@@ -92,11 +93,11 @@ This fork of RainLoop has the following changes:
 This fork uses downsized/simplified versions of scripts and has no support for Internet Explorer nor Edge Legacy.
 Supported are:
 
-* Chrome 69+
-* Edge 79+
-* Firefox 69+
-* Opera 56+
-* Safari 12+
+* Chrome 80+
+* Edge 80+
+* Firefox 78+
+* Opera 67+
+* Safari 13.1+
 
 
 ### Removal of old JavaScript
@@ -104,10 +105,8 @@ Supported are:
 The result is faster and smaller download code (good for mobile networks).
 
 * Added dev/prototype.js for some additional features
-* boot.js without webpack overhead
 * Modified Jua.js to be without jQuery
 * Replaced Autolinker with simple https/email detection
-* Replaced ifvisible.js with simple drop-in replacement
 * Replaced momentToNode with proper HTML5 `<time>`
 * Replaced resize listeners with ResizeObserver
 * Replaced bootstrap.js with native drop-in replacement
@@ -118,6 +117,8 @@ The result is faster and smaller download code (good for mobile networks).
 * Replaced simplestatemanager with CSS @media
 * Replaced inputosaurus with own code
 * Replaced keymaster with own shortcuts handler
+* Replaced OpenPGP.js v2 with OpenPGP.js v5
+* Removed ifvisible.js
 * Removed pikaday
 * Removed underscore
 * Removed polyfills
@@ -135,32 +136,32 @@ The result is faster and smaller download code (good for mobile networks).
 * Removed ProgressJS
 
 
-RainLoop 1.15 vs SnappyMail
+RainLoop 1.17 vs SnappyMail
 
 |js/*           	|RainLoop 	|Snappy   	|
 |---------------	|--------:	|--------:	|
-|admin.js        	|2.158.025	|   80.642	|
-|app.js          	|4.215.733	|  405.812	|
-|boot.js         	|  672.433	|    2.155	|
-|libs.js         	|  647.679	|  196.921	|
-|sieve.js         	|        0	|   86.564	|
-|polyfills.js    	|  325.908	|        0	|
+|admin.js        	|2.170.153	|   84.925	|
+|app.js          	|4.207.787	|  447.263	|
+|boot.js         	|  868.735	|    4.343	|
+|libs.js         	|  658.812	|  233.728	|
+|sieve.js         	|        0	|   91.418	|
+|polyfills.js    	|  334.608	|        0	|
 |serviceworker.js	|        0	|      285	|
-|TOTAL           	|8.019.778	|  772.379	|
+|TOTAL           	|8.240.095	|  861.962	|
 
 |js/min/*       	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|------:	|--------:	|--------:	|
-|admin.min.js    	|  255.514	|   40.307	| 73.899	| 13.413	| 60.674  	| 11.994	|
-|app.min.js      	|  516.000	|  192.913	|140.430	| 62.027	|110.657  	| 53.180	|
-|boot.min.js     	|   66.456	|    1.301	| 22.553	|    798	| 20.043  	|    653	|
-|libs.min.js     	|  574.626	|   95.731	|177.280	| 35.371	|151.855  	| 31.664	|
-|sieve.min.js     	|        0	|   42.182	|      0	| 10.555	|      0  	|  9.510	|
-|polyfills.min.js	|   32.608	|        0	| 11.315	|      0	| 10.072  	|      0	|
-|TOTAL user      	|1.189.690	|  289.945	|351.061	| 98.196	|292.627  	| 85.497	|
-|TOTAL user+sieve	|1.189.690	|  332.127	|351.061	|108.751	|292.627  	| 95.007	|
-|TOTAL admin     	|  929.204	|  137.339	|285.047	| 49.582	|242.644  	| 44.311	|
+|admin.min.js    	|  256.831	|   41.719	| 73.606	| 14.022	| 60.877  	| 12.567	|
+|app.min.js      	|  515.367	|  202.101	|139.456	| 68.505	|110.485  	| 58.481	|
+|boot.min.js     	|   84.659	|    2.231	| 26.998	|  1.271	| 23.643  	|  1.067	|
+|libs.min.js     	|  584.772	|  110.646	|180.901	| 39.518	|155.182  	| 35.207	|
+|sieve.min.js     	|        0	|   45.504	|      0	| 11.131	|      0  	|  9.917	|
+|polyfills.min.js	|   32.837	|        0	| 11.406	|      0	| 10.175  	|      0	|
+|TOTAL user      	|1.217.635	|  314.978	|358.761	|109.294	|299.485  	| 94.755	|
+|TOTAL user+sieve	|1.217.635	|  360.482	|358.761	|120.425	|299.485  	|104.672	|
+|TOTAL admin     	|  959.099	|  154.596	|292.911	| 54.811	|249.877  	| 48.841	|
 
-For a user its around 70% smaller and faster than traditional RainLoop.
+For a user it is around 66% smaller and faster than traditional RainLoop.
 
 ### CSS changes
 
@@ -168,6 +169,7 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 * Themes work in mobile mode
 * Bugfix invalid/conflicting css rules
 * Use flexbox
+* Use border-box
 * Split app.css to have separate admin.css
 * Remove oldschool 'float'
 * Remove unused css
@@ -186,12 +188,12 @@ For a user its around 70% smaller and faster than traditional RainLoop.
 
 |css/*       	|RainLoop	|Snappy   	|RL gzip	|SM gzip	|SM brotli	|
 |------------	|-------:	|------:	|------:	|------:	|--------:	|
-|app.css     	| 340.334	| 80.708	| 46.959	| 16.708	| 14.388	|
-|app.min.css 	| 274.791	| 64.938	| 39.618	| 14.815	| 13.064	|
+|app.css     	| 340.331	| 85.073	| 46.946	| 17.792	| 15.210	|
+|app.min.css 	| 274.947	| 68.272	| 39.647	| 15.615	| 13.636	|
 |boot.css    	|       	|  1.326	|       	|    664	|    545	|
 |boot.min.css	|       	|  1.071	|       	|    590	|    474	|
-|admin.css    	|       	| 29.977	|       	|  6.795	|  5.900	|
-|admin.min.css	|       	| 24.101	|       	|  6.167	|  5.421	|
+|admin.css    	|       	| 30.880	|       	|  7.045	|  6.127	|
+|admin.min.css	|       	| 24.959	|       	|  6.368	|  5.615	|
 
 ### PGP
 RainLoop uses the old OpenPGP.js v2
@@ -205,7 +207,7 @@ See https://github.com/the-djmaze/openpgpjs for development
 
 |OpenPGP        	|RainLoop 	|Snappy   	|RL gzip	|SM gzip	|RL brotli	|SM brotli	|
 |---------------	|--------:	|--------:	|------:	|-------:	|--------:	|--------:	|
-|openpgp.min.js 	|  330.742	|  539.244	|102.388	| 166.997	| 84.241  	|  137.184	|
+|openpgp.min.js 	|  330.742	|  546.165	|102.388	| 169.207	| 84.241  	|  138.688	|
 |openpgp.worker 	|    1.499	|         	|    824	|        	|    695 	|        	|
 
 
@@ -215,7 +217,6 @@ The [Squire](https://github.com/neilj/Squire) implementation is not 100% compati
 Still TODO:
 
 * support for tables (really needed?!?)
-* support BIDI (really needed?!?)
 
 |       	| normal	| min    	| gzip  	| min gzip	|
 |--------	|-------:	|-------:	|------:	|--------:	|
@@ -223,5 +224,3 @@ Still TODO:
 |ckeditor	|       ?	| 520.035	|      ?	|  155.916	|
 
 CKEditor including the 7 asset requests (css,language,plugins,icons) is 633.46 KB / 180.47 KB (gzip).
-
-To use the old CKEditor, you must install the plugin.
diff --git a/SECURITY.md b/SECURITY.md
index 02ef3170f..11d1ddada 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -6,15 +6,15 @@ Currently due to the fast development only the latest version receives security
 
 | Version  | Supported |
 | -------- | --------- |
-| 2.13.x   | ✔         |
-| < 2.13.0 | ❌         |
+| 2.34.x   | ✔         |
+| < 2.34.0 | ❌         |
 
 ## Reporting a Vulnerability
 
 Please report security issues or vulnerabilities as an encrypted email to [security@snappymail.eu](mailto:security@snappymail.eu).
 Your report should be detailed enough with clear steps to reproduce and classify the found vulnerability.
 
-You can find the PGP public key below and on the major public keyservers like [pgp.key-server.io](https://pgp.key-server.io).
+You can find the PGP public key below and on the major public keyservers like [keys.openpgp.org](https://keys.openpgp.org).
 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Comment: Type: 255-bit EdDSA
@@ -36,5 +36,5 @@ YMXQVq4SJt7UpWABAORudfJxsBqCRKtPlZMgGTJLjcOkyFJ9C2Fx7DeN0J4I
 ## Publishing and Credits
 
 I will analyze and fix the reported issue as fast as possible.
-Together with the reporter I plan the disclosure of the found and fixed vulnerability.
+Together with the reporter, I plan the disclosure of the found and fixed vulnerability.
 Credits to the reporter are granted and can be included in all public communication if desired.
diff --git a/_include.php b/_include.php
index 9f16ed888..de1cc3ee0 100644
--- a/_include.php
+++ b/_include.php
@@ -4,16 +4,6 @@
 
 //header('Strict-Transport-Security: max-age=31536000');
 
-/**
- * Uncomment to use gzip compressed output
- */
-//define('USE_GZIP', 1);
-
-/**
- * Uncomment to use brotli compressed output
- */
-//define('USE_BROTLI', 1);
-
 /**
  * Uncomment to enable multiple domain installation.
  */
@@ -34,3 +24,8 @@
  * Additional configuration file name
  */
 //define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
+
+/**
+ * Also update extensions on upgrade
+ */
+//define('SNAPPYMAIL_UPDATE_PLUGINS', 1);
diff --git a/assets/.htaccess b/assets/.htaccess
deleted file mode 100644
index 2561259b1..000000000
--- a/assets/.htaccess
+++ /dev/null
@@ -1,50 +0,0 @@
-<IfModule mod_headers.c>
-	<IfModule mod_rewrite.c>
-		RewriteEngine On
-
-		RewriteCond %{HTTP:Accept-encoding} br
-		RewriteCond "%{REQUEST_FILENAME}\.br" -s
-		RewriteRule "^(.+\.js)$" "$1\.br" [L,T=application/javascript,QSA]
-
-		RewriteCond %{HTTP:Accept-encoding} gzip
-		RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-		RewriteRule "^(.+\.js)$" "$1\.gz" [L,T=application/javascript,QSA]
-
-		RewriteCond %{HTTP:Accept-encoding} br
-		RewriteCond "%{REQUEST_FILENAME}\.br" -s
-		RewriteRule "^(.+\.css)$" "$1\.br" [L,T=text/css,QSA]
-
-		RewriteCond %{HTTP:Accept-encoding} gzip
-		RewriteCond "%{REQUEST_FILENAME}\.gz" -s
-		RewriteRule "^(.+\.css)$" "$1\.gz" [L,T=text/css,QSA]
-
-		<FilesMatch "(\.js\.br|\.css\.br)$">
-			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
-		</FilesMatch>
-
-		<FilesMatch "(\.js\.gz|\.css\.gz)$">
-			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
-		</FilesMatch>
-
-		<FilesMatch "(\.js\.br|\.js\.gz)$">
-			Header set Content-Type "application/javascript; charset=utf-8"
-			ForceType application/javascript
-		</FilesMatch>
-		<FilesMatch "(\.css\.br|\.css\.gz)$">
-			Header set Content-Type "text/css; charset=utf-8"
-			ForceType text/css
-		</FilesMatch>
-	</IfModule>
-</IfModule>
diff --git a/assets/css/images/empty-contact.png b/assets/css/images/empty-contact.png
deleted file mode 100644
index b2f2071d1..000000000
Binary files a/assets/css/images/empty-contact.png and /dev/null differ
diff --git a/build/cpanel.php b/build/cpanel.php
new file mode 100755
index 000000000..d8280d9e4
--- /dev/null
+++ b/build/cpanel.php
@@ -0,0 +1,38 @@
+<?php
+echo "\x1b[33;1m === cPanel === \x1b[0m\n";
+
+$cpanel_destination = "{$destPath}snappymail-{$package->version}-cpanel.tar";
+
+@unlink($cpanel_destination);
+@unlink("{$cpanel_destination}.gz");
+
+$cpanel_tar = new PharData($cpanel_destination);
+
+$cpanel_tar->buildFromDirectory('./integrations/cpanel', "@integrations/cpanel/@");
+
+$cpanel_path = '/usr/local/cpanel/base/3rdparty/snappymail/';
+
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$newFile = str_replace('\\', '/', $file);
+		$cpanel_tar->addFile($file, "{$cpanel_path}{$newFile}");
+	}
+}
+
+$cpanel_tar->addFile('.htaccess', "{$cpanel_path}.htaccess");
+$cpanel_tar->addFile('README.md', "{$cpanel_path}README.md");
+$cpanel_tar->addFromString("{$cpanel_path}VERSION", $package->version);
+
+$index = file_get_contents('index.php');
+$index = str_replace('0.0.0', $package->version, $index);
+$cpanel_tar->addFromString("{$cpanel_path}index.php", $index);
+
+$data = file_get_contents('dev/serviceworker.js');
+$cpanel_tar->addFromString("{$cpanel_path}serviceworker.js", $data);
+
+$cpanel_tar->compress(Phar::GZ);
+unlink($cpanel_destination);
+$cpanel_destination .= '.gz';
+
+echo "{$cpanel_destination} created\n";
diff --git a/build/deb.php b/build/deb.php
index 6c1209292..714f659b8 100755
--- a/build/deb.php
+++ b/build/deb.php
@@ -24,7 +24,7 @@ mkdir($dir, 0755, true);
 copy('CODE_OF_CONDUCT.md', "{$dir}/CODE_OF_CONDUCT.md");
 copy('CONTRIBUTING.md', "{$dir}/CONTRIBUTING.md");
 copy('README.md', "{$dir}/README.md");
-copy('CODE_OF_CONDUCT.md', "{$dir}/CODE_OF_CONDUCT.md");
+//copy('CODE_OF_CONDUCT.md', "{$dir}/CODE_OF_CONDUCT.md");
 //usr/share/doc/snappymail/README.Debian
 //usr/share/doc/snappymail/changelog.Debian.gz
 //usr/share/doc/snappymail/copyright
diff --git a/build/deb/DEBIAN/postinst b/build/deb/DEBIAN/postinst
index 5c3c4b63b..6b46d6ccb 100755
--- a/build/deb/DEBIAN/postinst
+++ b/build/deb/DEBIAN/postinst
@@ -1,2 +1,3 @@
 #!/bin/sh
 chown -R www-data:www-data /var/lib/snappymail
+chown -R root:root /usr/share/snappymail/
diff --git a/build/nextcloud.php b/build/nextcloud.php
new file mode 100755
index 000000000..9970cd0f5
--- /dev/null
+++ b/build/nextcloud.php
@@ -0,0 +1,92 @@
+<?php
+echo "\x1b[33;1m === Nextcloud === \x1b[0m\n";
+
+$cert_dir = $_SERVER['HOME'].'/.nextcloud/certificates';
+
+$nc_destination = "{$destPath}snappymail-{$package->version}-nextcloud.tar";
+
+@unlink($nc_destination);
+@unlink("{$nc_destination}.gz");
+
+$nc_tar = new PharData($nc_destination);
+$hashes = [];
+
+file_put_contents(ROOT_DIR . '/integrations/nextcloud/snappymail/VERSION', $package->version);
+$file = ROOT_DIR . '/integrations/nextcloud/snappymail/appinfo/info.xml';
+file_put_contents($file, preg_replace('/<version>[^<]*</', "<version>{$package->version}<", file_get_contents($file)));
+
+$nc_tar->buildFromDirectory('./integrations/nextcloud', "@integrations/nextcloud/snappymail/@");
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('integrations/nextcloud/snappymail'));
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$name = str_replace('\\', '/', $file);
+		$name = str_replace('integrations/nextcloud/snappymail/', '', $name);
+		$hashes[$name] = hash_file('sha512', $file);
+	}
+}
+
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$newFile = str_replace('\\', '/', $file);
+		$newName = str_replace('/.htaccess', '/_htaccess', $newFile);
+		$nc_tar->addFile($file, "snappymail/app/{$newName}");
+		$hashes["app/{$newFile}"] = hash_file('sha512', $file);
+	}
+}
+
+/*
+$nc_tar->addFile('data/.htaccess');
+$nc_tar->addFromString('data/VERSION', $package->version);
+$nc_tar->addFile('data/README.md');
+$nc_tar->addFile('_include.php', 'snappymail/app/_include.php');
+*/
+$nc_tar->addFile('.htaccess', 'snappymail/app/_htaccess');
+$hashes['app/.htaccess'] = hash_file('sha512', '.htaccess');
+
+$index = file_get_contents('index.php');
+$index = str_replace('0.0.0', $package->version, $index);
+//$index = str_replace('snappymail/v/', '', $index);
+$nc_tar->addFromString('snappymail/app/index.php', $index);
+$hashes['app/index.php'] = hash('sha512', $index);
+
+$nc_tar->addFile('README.md', 'snappymail/app/README.md');
+$hashes['app/README.md'] = hash_file('sha512', 'README.md');
+
+$nc_tar->addFile('CHANGELOG.md', 'snappymail/CHANGELOG.md');
+$hashes['CHANGELOG.md'] = hash_file('sha512', 'CHANGELOG.md');
+
+$data = file_get_contents('dev/serviceworker.js');
+$nc_tar->addFromString('snappymail/app/serviceworker.js', $data);
+$hashes['app/serviceworker.js'] = hash('sha512', $data);
+
+spl_autoload_register(function($name){
+	$file = __DIR__ . '/' . str_replace('\\', '/', $name) . '.php';
+	require $file;
+});
+
+ksort($hashes);
+$cert = file_get_contents($cert_dir.'/snappymail.crt');
+$rsa = new \phpseclib\Crypt\RSA();
+$rsa->loadKey(file_get_contents($cert_dir.'/snappymail.key'));
+$x509 = new \phpseclib\File\X509();
+$x509->loadX509($cert);
+$x509->setPrivateKey($rsa);
+$rsa->setSignatureMode(\phpseclib\Crypt\RSA::SIGNATURE_PSS);
+$rsa->setMGFHash('sha512');
+$rsa->setSaltLength(0);
+$signature = $rsa->sign(json_encode($hashes));
+$nc_tar->addFromString('snappymail/appinfo/signature.json', json_encode([
+	'hashes' => $hashes,
+	'signature' => base64_encode($signature),
+	'certificate' => $cert
+], JSON_PRETTY_PRINT));
+
+$nc_tar->compress(Phar::GZ);
+unlink($nc_destination);
+$nc_destination .= '.gz';
+
+$signature = shell_exec("openssl dgst -sha512 -sign {$cert_dir}/snappymail.key {$nc_destination} | openssl base64");
+file_put_contents($nc_destination.'.sig', $signature);
+
+echo "{$nc_destination} created\n";
diff --git a/build/owncloud.php b/build/owncloud.php
new file mode 100755
index 000000000..5c422270d
--- /dev/null
+++ b/build/owncloud.php
@@ -0,0 +1,100 @@
+<?php
+echo "\x1b[33;1m === ownCloud === \x1b[0m\n";
+
+$cert_dir = false; // $_SERVER['HOME'].'/.owncloud/certificates';
+
+$nc_destination = "{$destPath}snappymail-{$package->version}-owncloud.tar";
+
+@unlink($nc_destination);
+@unlink("{$nc_destination}.gz");
+
+$nc_tar = new PharData($nc_destination);
+$hashes = [];
+
+file_put_contents(ROOT_DIR . '/integrations/owncloud/snappymail/VERSION', $package->version);
+$file = ROOT_DIR . '/integrations/owncloud/snappymail/appinfo/info.xml';
+file_put_contents($file, preg_replace('/<version>[^<]*</', "<version>{$package->version}<", file_get_contents($file)));
+
+$nc_tar->buildFromDirectory('./integrations/owncloud', "@integrations/owncloud/snappymail/@");
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('integrations/owncloud/snappymail'));
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$name = str_replace('\\', '/', $file);
+		$name = str_replace('integrations/owncloud/snappymail/', '', $name);
+		$hashes[$name] = hash_file('sha512', $file);
+	}
+}
+
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
+foreach ($files as $file) {
+	if (is_file($file)) {
+		$newFile = str_replace('\\', '/', $file);
+//		$newFile = str_replace("'snappymail/v/'.", '', $newFile);
+		$nc_tar->addFile($file, "snappymail/app/{$newFile}");
+		$hashes["app/{$newFile}"] = hash_file('sha512', $file);
+	}
+}
+$nc_tar->delete("snappymail/app/snappymail/v/{$package->version}/app/.htaccess");
+$nc_tar->addFile("snappymail/v/{$package->version}/app/.htaccess", "snappymail/app/snappymail/v/{$package->version}/app/_htaccess");
+$nc_tar->delete("snappymail/app/snappymail/v/{$package->version}/static/.htaccess");
+$nc_tar->addFile("snappymail/v/{$package->version}/static/.htaccess", "snappymail/app/snappymail/v/{$package->version}/static/_htaccess");
+
+/*
+$nc_tar->addFile('data/.htaccess');
+$nc_tar->addFromString('data/VERSION', $package->version);
+$nc_tar->addFile('data/README.md');
+$nc_tar->addFile('_include.php', 'snappymail/app/_include.php');
+*/
+$nc_tar->addFile('.htaccess', 'snappymail/app/_htaccess');
+$hashes['app/.htaccess'] = hash_file('sha512', '.htaccess');
+
+$index = file_get_contents('index.php');
+$index = str_replace('0.0.0', $package->version, $index);
+//$index = str_replace('snappymail/v/', '', $index);
+$nc_tar->addFromString('snappymail/app/index.php', $index);
+$hashes['app/index.php'] = hash('sha512', $index);
+
+$nc_tar->addFile('README.md', 'snappymail/app/README.md');
+$hashes['app/README.md'] = hash_file('sha512', 'README.md');
+
+$nc_tar->addFile('CHANGELOG.md', 'snappymail/CHANGELOG.md');
+$hashes['CHANGELOG.md'] = hash_file('sha512', 'CHANGELOG.md');
+
+$data = file_get_contents('dev/serviceworker.js');
+$nc_tar->addFromString('snappymail/app/serviceworker.js', $data);
+$hashes['app/serviceworker.js'] = hash('sha512', $data);
+
+if ($cert_dir) {
+	spl_autoload_register(function($name){
+		$file = __DIR__ . '/' . str_replace('\\', '/', $name) . '.php';
+		require $file;
+	});
+
+	ksort($hashes);
+	$cert = file_get_contents($cert_dir.'/snappymail.crt');
+	$rsa = new \phpseclib\Crypt\RSA();
+	$rsa->loadKey(file_get_contents($cert_dir.'/snappymail.key'));
+	$x509 = new \phpseclib\File\X509();
+	$x509->loadX509($cert);
+	$x509->setPrivateKey($rsa);
+	$rsa->setSignatureMode(\phpseclib\Crypt\RSA::SIGNATURE_PSS);
+	$rsa->setMGFHash('sha512');
+	$rsa->setSaltLength(0);
+	$signature = $rsa->sign(json_encode($hashes));
+	$nc_tar->addFromString('snappymail/appinfo/signature.json', json_encode([
+		'hashes' => $hashes,
+		'signature' => base64_encode($signature),
+		'certificate' => $cert
+	], JSON_PRETTY_PRINT));
+}
+
+$nc_tar->compress(Phar::GZ);
+unlink($nc_destination);
+$nc_destination .= '.gz';
+
+if ($cert_dir) {
+	$signature = shell_exec("openssl dgst -sha512 -sign {$cert_dir}/snappymail.key {$nc_destination} | openssl base64");
+	file_put_contents($nc_destination.'.sig', $signature);
+}
+
+echo "{$nc_destination} created\n";
diff --git a/build/phpseclib/Crypt/Hash.php b/build/phpseclib/Crypt/Hash.php
new file mode 100644
index 000000000..248b65ef7
--- /dev/null
+++ b/build/phpseclib/Crypt/Hash.php
@@ -0,0 +1,893 @@
+<?php
+
+/**
+ * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
+ *
+ * Uses hash() or mhash() if available and an internal implementation, otherwise.  Currently supports the following:
+ *
+ * md2, md5, md5-96, sha1, sha1-96, sha256, sha256-96, sha384, and sha512, sha512-96
+ *
+ * If {@link self::setKey() setKey()} is called, {@link self::hash() hash()} will return the HMAC as opposed to
+ * the hash.  If no valid algorithm is provided, sha1 will be used.
+ *
+ * PHP version 5
+ *
+ * {@internal The variable names are the same as those in
+ * {@link http://tools.ietf.org/html/rfc2104#section-2 RFC2104}.}}
+ *
+ * Here's a short example of how to use this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $hash = new \phpseclib\Crypt\Hash('sha1');
+ *
+ *    $hash->setKey('abcdefg');
+ *
+ *    echo base64_encode($hash->hash('abcdefg'));
+ * ?>
+ * </code>
+ *
+ * @category  Crypt
+ * @package   Hash
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Crypt;
+
+use phpseclib\Math\BigInteger;
+
+/**
+ * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
+ *
+ * @package Hash
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class Hash
+{
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\Hash::__construct()
+     */
+    /**
+     * Toggles the internal implementation
+     */
+    const MODE_INTERNAL = 1;
+    /**
+     * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
+     */
+    const MODE_MHASH = 2;
+    /**
+     * Toggles the hash() implementation, which works on PHP 5.1.2+.
+     */
+    const MODE_HASH = 3;
+    /**#@-*/
+
+    /**
+     * Hash Parameter
+     *
+     * @see self::setHash()
+     * @var int
+     * @access private
+     */
+    var $hashParam;
+
+    /**
+     * Byte-length of compression blocks / key (Internal HMAC)
+     *
+     * @see self::setAlgorithm()
+     * @var int
+     * @access private
+     */
+    var $b;
+
+    /**
+     * Byte-length of hash output (Internal HMAC)
+     *
+     * @see self::setHash()
+     * @var int
+     * @access private
+     */
+    var $l = false;
+
+    /**
+     * Hash Algorithm
+     *
+     * @see self::setHash()
+     * @var string
+     * @access private
+     */
+    var $hash;
+
+    /**
+     * Key
+     *
+     * @see self::setKey()
+     * @var string
+     * @access private
+     */
+    var $key = false;
+
+    /**
+     * Computed Key
+     *
+     * @see self::_computeKey()
+     * @var string
+     * @access private
+     */
+    var $computedKey = false;
+
+    /**
+     * Outer XOR (Internal HMAC)
+     *
+     * @see self::setKey()
+     * @var string
+     * @access private
+     */
+    var $opad;
+
+    /**
+     * Inner XOR (Internal HMAC)
+     *
+     * @see self::setKey()
+     * @var string
+     * @access private
+     */
+    var $ipad;
+
+    /**
+     * Engine
+     *
+     * @see self::setHash()
+     * @var string
+     * @access private
+     */
+    var $engine;
+
+    /**
+     * Default Constructor.
+     *
+     * @param string $hash
+     * @return \phpseclib\Crypt\Hash
+     * @access public
+     */
+    function __construct($hash = 'sha1')
+    {
+        if (!defined('CRYPT_HASH_MODE')) {
+            switch (true) {
+                case extension_loaded('hash'):
+                    define('CRYPT_HASH_MODE', self::MODE_HASH);
+                    break;
+                case extension_loaded('mhash'):
+                    define('CRYPT_HASH_MODE', self::MODE_MHASH);
+                    break;
+                default:
+                    define('CRYPT_HASH_MODE', self::MODE_INTERNAL);
+            }
+        }
+
+        $this->setHash($hash);
+    }
+
+    /**
+     * Sets the key for HMACs
+     *
+     * Keys can be of any length.
+     *
+     * @access public
+     * @param string $key
+     */
+    function setKey($key = false)
+    {
+        $this->key = $key;
+        $this->_computeKey();
+    }
+
+    /**
+     * Pre-compute the key used by the HMAC
+     *
+     * Quoting http://tools.ietf.org/html/rfc2104#section-2, "Applications that use keys longer than B bytes
+     * will first hash the key using H and then use the resultant L byte string as the actual key to HMAC."
+     *
+     * As documented in https://www.reddit.com/r/PHP/comments/9nct2l/symfonypolyfill_hash_pbkdf2_correct_fix_for/
+     * when doing an HMAC multiple times it's faster to compute the hash once instead of computing it during
+     * every call
+     *
+     * @access private
+     */
+    function _computeKey()
+    {
+        if ($this->key === false) {
+            $this->computedKey = false;
+            return;
+        }
+
+        if (strlen($this->key) <= $this->b) {
+            $this->computedKey = $this->key;
+            return;
+        }
+
+        switch ($this->engine) {
+            case self::MODE_MHASH:
+                $this->computedKey = mhash($this->hash, $this->key);
+                break;
+            case self::MODE_HASH:
+                $this->computedKey = hash($this->hash, $this->key, true);
+                break;
+            case self::MODE_INTERNAL:
+                $this->computedKey = call_user_func($this->hash, $this->key);
+        }
+    }
+
+    /**
+     * Gets the hash function.
+     *
+     * As set by the constructor or by the setHash() method.
+     *
+     * @access public
+     * @return string
+     */
+    function getHash()
+    {
+        return $this->hashParam;
+    }
+
+    /**
+     * Sets the hash function.
+     *
+     * @access public
+     * @param string $hash
+     */
+    function setHash($hash)
+    {
+        $this->hashParam = $hash = strtolower($hash);
+        switch ($hash) {
+            case 'md5-96':
+            case 'sha1-96':
+            case 'sha256-96':
+            case 'sha512-96':
+                $hash = substr($hash, 0, -3);
+                $this->l = 12; // 96 / 8 = 12
+                break;
+            case 'md2':
+            case 'md5':
+                $this->l = 16;
+                break;
+            case 'sha1':
+                $this->l = 20;
+                break;
+            case 'sha256':
+                $this->l = 32;
+                break;
+            case 'sha384':
+                $this->l = 48;
+                break;
+            case 'sha512':
+                $this->l = 64;
+        }
+
+        switch ($hash) {
+            case 'md2-96':
+            case 'md2':
+                $this->b = 16;
+            case 'md5-96':
+            case 'sha1-96':
+            case 'sha224-96':
+            case 'sha256-96':
+            case 'md2':
+            case 'md5':
+            case 'sha1':
+            case 'sha224':
+            case 'sha256':
+                $this->b = 64;
+                break;
+            default:
+                $this->b = 128;
+        }
+
+        switch ($hash) {
+            case 'md2':
+                $this->engine = CRYPT_HASH_MODE == self::MODE_HASH && in_array('md2', hash_algos()) ?
+                    self::MODE_HASH : self::MODE_INTERNAL;
+                break;
+            case 'sha384':
+            case 'sha512':
+                $this->engine = CRYPT_HASH_MODE == self::MODE_MHASH ? self::MODE_INTERNAL : CRYPT_HASH_MODE;
+                break;
+            default:
+                $this->engine = CRYPT_HASH_MODE;
+        }
+
+        switch ($this->engine) {
+            case self::MODE_MHASH:
+                switch ($hash) {
+                    case 'md5':
+                        $this->hash = MHASH_MD5;
+                        break;
+                    case 'sha256':
+                        $this->hash = MHASH_SHA256;
+                        break;
+                    case 'sha1':
+                    default:
+                        $this->hash = MHASH_SHA1;
+                }
+                $this->_computeKey(self::MODE_MHASH);
+                return;
+            case self::MODE_HASH:
+                switch ($hash) {
+                    case 'md5':
+                        $this->hash = 'md5';
+                        return;
+                    case 'md2':
+                    case 'sha256':
+                    case 'sha384':
+                    case 'sha512':
+                        $this->hash = $hash;
+                        return;
+                    case 'sha1':
+                    default:
+                        $this->hash = 'sha1';
+                }
+                $this->_computeKey(self::MODE_HASH);
+                return;
+        }
+
+        switch ($hash) {
+            case 'md2':
+                $this->hash = array($this, '_md2');
+                break;
+            case 'md5':
+                $this->hash = array($this, '_md5');
+                break;
+            case 'sha256':
+                $this->hash = array($this, '_sha256');
+                break;
+            case 'sha384':
+            case 'sha512':
+                $this->hash = array($this, '_sha512');
+                break;
+            case 'sha1':
+            default:
+                $this->hash = array($this, '_sha1');
+        }
+
+        $this->ipad = str_repeat(chr(0x36), $this->b);
+        $this->opad = str_repeat(chr(0x5C), $this->b);
+
+        $this->_computeKey(self::MODE_INTERNAL);
+    }
+
+    /**
+     * Compute the HMAC.
+     *
+     * @access public
+     * @param string $text
+     * @return string
+     */
+    function hash($text)
+    {
+        if (!empty($this->key) || is_string($this->key)) {
+            switch ($this->engine) {
+                case self::MODE_MHASH:
+                    $output = mhash($this->hash, $text, $this->computedKey);
+                    break;
+                case self::MODE_HASH:
+                    $output = hash_hmac($this->hash, $text, $this->computedKey, true);
+                    break;
+                case self::MODE_INTERNAL:
+                    $key    = str_pad($this->computedKey, $this->b, chr(0)); // step 1
+                    $temp   = $this->ipad ^ $key;                            // step 2
+                    $temp  .= $text;                                         // step 3
+                    $temp   = call_user_func($this->hash, $temp);            // step 4
+                    $output = $this->opad ^ $key;                            // step 5
+                    $output.= $temp;                                         // step 6
+                    $output = call_user_func($this->hash, $output);          // step 7
+            }
+        } else {
+            switch ($this->engine) {
+                case self::MODE_MHASH:
+                    $output = mhash($this->hash, $text);
+                    break;
+                case self::MODE_HASH:
+                    $output = hash($this->hash, $text, true);
+                    break;
+                case self::MODE_INTERNAL:
+                    $output = call_user_func($this->hash, $text);
+            }
+        }
+
+        return substr($output, 0, $this->l);
+    }
+
+    /**
+     * Returns the hash length (in bytes)
+     *
+     * @access public
+     * @return int
+     */
+    function getLength()
+    {
+        return $this->l;
+    }
+
+    /**
+     * Wrapper for MD5
+     *
+     * @access private
+     * @param string $m
+     */
+    function _md5($m)
+    {
+        return pack('H*', md5($m));
+    }
+
+    /**
+     * Wrapper for SHA1
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha1($m)
+    {
+        return pack('H*', sha1($m));
+    }
+
+    /**
+     * Pure-PHP implementation of MD2
+     *
+     * See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
+     *
+     * @access private
+     * @param string $m
+     */
+    function _md2($m)
+    {
+        static $s = array(
+             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
+             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
+             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
+            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
+            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
+            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
+             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
+            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
+            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
+            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
+             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
+             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
+            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
+            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
+              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
+            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
+            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
+             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+        );
+
+        // Step 1. Append Padding Bytes
+        $pad = 16 - (strlen($m) & 0xF);
+        $m.= str_repeat(chr($pad), $pad);
+
+        $length = strlen($m);
+
+        // Step 2. Append Checksum
+        $c = str_repeat(chr(0), 16);
+        $l = chr(0);
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
+                //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
+                // per <http://www.rfc-editor.org/errata_search.php?rfc=1319>, however, C[j] should be set to S[c xor L] xor C[j]
+                $c[$j] = chr($s[ord($m[$i + $j] ^ $l)] ^ ord($c[$j]));
+                $l = $c[$j];
+            }
+        }
+        $m.= $c;
+
+        $length+= 16;
+
+        // Step 3. Initialize MD Buffer
+        $x = str_repeat(chr(0), 48);
+
+        // Step 4. Process Message in 16-Byte Blocks
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                $x[$j + 16] = $m[$i + $j];
+                $x[$j + 32] = $x[$j + 16] ^ $x[$j];
+            }
+            $t = chr(0);
+            for ($j = 0; $j < 18; $j++) {
+                for ($k = 0; $k < 48; $k++) {
+                    $x[$k] = $t = $x[$k] ^ chr($s[ord($t)]);
+                    //$t = $x[$k] = $x[$k] ^ chr($s[ord($t)]);
+                }
+                $t = chr(ord($t) + $j);
+            }
+        }
+
+        // Step 5. Output
+        return substr($x, 0, 16);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA256
+     *
+     * See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha256($m)
+    {
+        if (extension_loaded('suhosin')) {
+            return pack('H*', sha256($m));
+        }
+
+        // Initialize variables
+        $hash = array(
+            0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+        );
+        // Initialize table of round constants
+        // (first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
+        static $k = array(
+            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+        );
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
+        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m.= pack('N2', 0, $length << 3);
+
+        // Process the message in successive 512-bit chunks
+        $chunks = str_split($m, 64);
+        foreach ($chunks as $chunk) {
+            $w = array();
+            for ($i = 0; $i < 16; $i++) {
+                extract(unpack('Ntemp', $this->_string_shift($chunk, 4)));
+                $w[] = $temp;
+            }
+
+            // Extend the sixteen 32-bit words into sixty-four 32-bit words
+            for ($i = 16; $i < 64; $i++) {
+                // @codingStandardsIgnoreStart
+                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
+                      $this->_rightRotate($w[$i - 15], 18) ^
+                      $this->_rightShift( $w[$i - 15],  3);
+                $s1 = $this->_rightRotate($w[$i - 2], 17) ^
+                      $this->_rightRotate($w[$i - 2], 19) ^
+                      $this->_rightShift( $w[$i - 2], 10);
+                // @codingStandardsIgnoreEnd
+                $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
+            }
+
+            // Initialize hash value for this chunk
+            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
+
+            // Main loop
+            for ($i = 0; $i < 64; $i++) {
+                $s0 = $this->_rightRotate($a,  2) ^
+                      $this->_rightRotate($a, 13) ^
+                      $this->_rightRotate($a, 22);
+                $maj = ($a & $b) ^
+                       ($a & $c) ^
+                       ($b & $c);
+                $t2 = $this->_add($s0, $maj);
+
+                $s1 = $this->_rightRotate($e,  6) ^
+                      $this->_rightRotate($e, 11) ^
+                      $this->_rightRotate($e, 25);
+                $ch = ($e & $f) ^
+                      ($this->_not($e) & $g);
+                $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
+
+                $h = $g;
+                $g = $f;
+                $f = $e;
+                $e = $this->_add($d, $t1);
+                $d = $c;
+                $c = $b;
+                $b = $a;
+                $a = $this->_add($t1, $t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = array(
+                $this->_add($hash[0], $a),
+                $this->_add($hash[1], $b),
+                $this->_add($hash[2], $c),
+                $this->_add($hash[3], $d),
+                $this->_add($hash[4], $e),
+                $this->_add($hash[5], $f),
+                $this->_add($hash[6], $g),
+                $this->_add($hash[7], $h)
+            );
+        }
+
+        // Produce the final hash value (big-endian)
+        return pack('N8', $hash[0], $hash[1], $hash[2], $hash[3], $hash[4], $hash[5], $hash[6], $hash[7]);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA384 and SHA512
+     *
+     * @access private
+     * @param string $m
+     */
+    function _sha512($m)
+    {
+        static $init384, $init512, $k;
+
+        if (!isset($k)) {
+            // Initialize variables
+            $init384 = array( // initial values for SHA384
+                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939',
+                '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
+            );
+            $init512 = array( // initial values for SHA512
+                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1',
+                '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
+            );
+
+            for ($i = 0; $i < 8; $i++) {
+                $init384[$i] = new BigInteger($init384[$i], 16);
+                $init384[$i]->setPrecision(64);
+                $init512[$i] = new BigInteger($init512[$i], 16);
+                $init512[$i]->setPrecision(64);
+            }
+
+            // Initialize table of round constants
+            // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
+            $k = array(
+                '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
+                '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
+                'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
+                '72be5d74f27b896f', '80deb1fe3b1696b1', '9bdc06a725c71235', 'c19bf174cf692694',
+                'e49b69c19ef14ad2', 'efbe4786384f25e3', '0fc19dc68b8cd5b5', '240ca1cc77ac9c65',
+                '2de92c6f592b0275', '4a7484aa6ea6e483', '5cb0a9dcbd41fbd4', '76f988da831153b5',
+                '983e5152ee66dfab', 'a831c66d2db43210', 'b00327c898fb213f', 'bf597fc7beef0ee4',
+                'c6e00bf33da88fc2', 'd5a79147930aa725', '06ca6351e003826f', '142929670a0e6e70',
+                '27b70a8546d22ffc', '2e1b21385c26c926', '4d2c6dfc5ac42aed', '53380d139d95b3df',
+                '650a73548baf63de', '766a0abb3c77b2a8', '81c2c92e47edaee6', '92722c851482353b',
+                'a2bfe8a14cf10364', 'a81a664bbc423001', 'c24b8b70d0f89791', 'c76c51a30654be30',
+                'd192e819d6ef5218', 'd69906245565a910', 'f40e35855771202a', '106aa07032bbd1b8',
+                '19a4c116b8d2d0c8', '1e376c085141ab53', '2748774cdf8eeb99', '34b0bcb5e19b48a8',
+                '391c0cb3c5c95a63', '4ed8aa4ae3418acb', '5b9cca4f7763e373', '682e6ff3d6b2b8a3',
+                '748f82ee5defb2fc', '78a5636f43172f60', '84c87814a1f0ab72', '8cc702081a6439ec',
+                '90befffa23631e28', 'a4506cebde82bde9', 'bef9a3f7b2c67915', 'c67178f2e372532b',
+                'ca273eceea26619c', 'd186b8c721c0c207', 'eada7dd6cde0eb1e', 'f57d4f7fee6ed178',
+                '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
+                '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
+                '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
+            );
+
+            for ($i = 0; $i < 80; $i++) {
+                $k[$i] = new BigInteger($k[$i], 16);
+            }
+        }
+
+        $hash = $this->l == 48 ? $init384 : $init512;
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
+        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m.= pack('N4', 0, 0, 0, $length << 3);
+
+        // Process the message in successive 1024-bit chunks
+        $chunks = str_split($m, 128);
+        foreach ($chunks as $chunk) {
+            $w = array();
+            for ($i = 0; $i < 16; $i++) {
+                $temp = new BigInteger($this->_string_shift($chunk, 8), 256);
+                $temp->setPrecision(64);
+                $w[] = $temp;
+            }
+
+            // Extend the sixteen 32-bit words into eighty 32-bit words
+            for ($i = 16; $i < 80; $i++) {
+                $temp = array(
+                          $w[$i - 15]->bitwise_rightRotate(1),
+                          $w[$i - 15]->bitwise_rightRotate(8),
+                          $w[$i - 15]->bitwise_rightShift(7)
+                );
+                $s0 = $temp[0]->bitwise_xor($temp[1]);
+                $s0 = $s0->bitwise_xor($temp[2]);
+                $temp = array(
+                          $w[$i - 2]->bitwise_rightRotate(19),
+                          $w[$i - 2]->bitwise_rightRotate(61),
+                          $w[$i - 2]->bitwise_rightShift(6)
+                );
+                $s1 = $temp[0]->bitwise_xor($temp[1]);
+                $s1 = $s1->bitwise_xor($temp[2]);
+                $w[$i] = $w[$i - 16]->copy();
+                $w[$i] = $w[$i]->add($s0);
+                $w[$i] = $w[$i]->add($w[$i - 7]);
+                $w[$i] = $w[$i]->add($s1);
+            }
+
+            // Initialize hash value for this chunk
+            $a = $hash[0]->copy();
+            $b = $hash[1]->copy();
+            $c = $hash[2]->copy();
+            $d = $hash[3]->copy();
+            $e = $hash[4]->copy();
+            $f = $hash[5]->copy();
+            $g = $hash[6]->copy();
+            $h = $hash[7]->copy();
+
+            // Main loop
+            for ($i = 0; $i < 80; $i++) {
+                $temp = array(
+                    $a->bitwise_rightRotate(28),
+                    $a->bitwise_rightRotate(34),
+                    $a->bitwise_rightRotate(39)
+                );
+                $s0 = $temp[0]->bitwise_xor($temp[1]);
+                $s0 = $s0->bitwise_xor($temp[2]);
+                $temp = array(
+                    $a->bitwise_and($b),
+                    $a->bitwise_and($c),
+                    $b->bitwise_and($c)
+                );
+                $maj = $temp[0]->bitwise_xor($temp[1]);
+                $maj = $maj->bitwise_xor($temp[2]);
+                $t2 = $s0->add($maj);
+
+                $temp = array(
+                    $e->bitwise_rightRotate(14),
+                    $e->bitwise_rightRotate(18),
+                    $e->bitwise_rightRotate(41)
+                );
+                $s1 = $temp[0]->bitwise_xor($temp[1]);
+                $s1 = $s1->bitwise_xor($temp[2]);
+                $temp = array(
+                    $e->bitwise_and($f),
+                    $g->bitwise_and($e->bitwise_not())
+                );
+                $ch = $temp[0]->bitwise_xor($temp[1]);
+                $t1 = $h->add($s1);
+                $t1 = $t1->add($ch);
+                $t1 = $t1->add($k[$i]);
+                $t1 = $t1->add($w[$i]);
+
+                $h = $g->copy();
+                $g = $f->copy();
+                $f = $e->copy();
+                $e = $d->add($t1);
+                $d = $c->copy();
+                $c = $b->copy();
+                $b = $a->copy();
+                $a = $t1->add($t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = array(
+                $hash[0]->add($a),
+                $hash[1]->add($b),
+                $hash[2]->add($c),
+                $hash[3]->add($d),
+                $hash[4]->add($e),
+                $hash[5]->add($f),
+                $hash[6]->add($g),
+                $hash[7]->add($h)
+            );
+        }
+
+        // Produce the final hash value (big-endian)
+        // (\phpseclib\Crypt\Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
+        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
+                $hash[4]->toBytes() . $hash[5]->toBytes();
+        if ($this->l != 48) {
+            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Right Rotate
+     *
+     * @access private
+     * @param int $int
+     * @param int $amt
+     * @see self::_sha256()
+     * @return int
+     */
+    function _rightRotate($int, $amt)
+    {
+        $invamt = 32 - $amt;
+        $mask = (1 << $invamt) - 1;
+        return (($int << $invamt) & 0xFFFFFFFF) | (($int >> $amt) & $mask);
+    }
+
+    /**
+     * Right Shift
+     *
+     * @access private
+     * @param int $int
+     * @param int $amt
+     * @see self::_sha256()
+     * @return int
+     */
+    function _rightShift($int, $amt)
+    {
+        $mask = (1 << (32 - $amt)) - 1;
+        return ($int >> $amt) & $mask;
+    }
+
+    /**
+     * Not
+     *
+     * @access private
+     * @param int $int
+     * @see self::_sha256()
+     * @return int
+     */
+    function _not($int)
+    {
+        return ~$int & 0xFFFFFFFF;
+    }
+
+    /**
+     * Add
+     *
+     * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
+     * possibility of overflow exists, care has to be taken.  BigInteger could be used but this should be faster.
+     *
+     * @return int
+     * @see self::_sha256()
+     * @access private
+     */
+    function _add()
+    {
+        static $mod;
+        if (!isset($mod)) {
+            $mod = pow(2, 32);
+        }
+
+        $result = 0;
+        $arguments = func_get_args();
+        foreach ($arguments as $argument) {
+            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
+        }
+
+        if ((php_uname('m') & "\xDF\xDF\xDF") != 'ARM') {
+            return fmod($result, $mod);
+        }
+
+        return (fmod($result, 0x80000000) & 0x7FFFFFFF) |
+            ((fmod(floor($result / 0x80000000), 2) & 1) << 31);
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+}
diff --git a/build/phpseclib/Crypt/RSA.php b/build/phpseclib/Crypt/RSA.php
new file mode 100644
index 000000000..e26fe41dd
--- /dev/null
+++ b/build/phpseclib/Crypt/RSA.php
@@ -0,0 +1,3265 @@
+<?php
+
+/**
+ * Pure-PHP PKCS#1 (v2.1) compliant implementation of RSA.
+ *
+ * PHP version 5
+ *
+ * Here's an example of how to encrypt and decrypt text with this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $rsa = new \phpseclib\Crypt\RSA();
+ *    extract($rsa->createKey());
+ *
+ *    $plaintext = 'terrafrost';
+ *
+ *    $rsa->loadKey($privatekey);
+ *    $ciphertext = $rsa->encrypt($plaintext);
+ *
+ *    $rsa->loadKey($publickey);
+ *    echo $rsa->decrypt($ciphertext);
+ * ?>
+ * </code>
+ *
+ * Here's an example of how to create signatures and verify signatures with this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    $rsa = new \phpseclib\Crypt\RSA();
+ *    extract($rsa->createKey());
+ *
+ *    $plaintext = 'terrafrost';
+ *
+ *    $rsa->loadKey($privatekey);
+ *    $signature = $rsa->sign($plaintext);
+ *
+ *    $rsa->loadKey($publickey);
+ *    echo $rsa->verify($plaintext, $signature) ? 'verified' : 'unverified';
+ * ?>
+ * </code>
+ *
+ * @category  Crypt
+ * @package   RSA
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2009 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Crypt;
+
+use phpseclib\Math\BigInteger;
+
+/**
+ * Pure-PHP PKCS#1 compliant implementation of RSA.
+ *
+ * @package RSA
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class RSA
+{
+    /**#@+
+     * @access public
+     * @see self::encrypt()
+     * @see self::decrypt()
+     */
+    /**
+     * Use {@link http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding Optimal Asymmetric Encryption Padding}
+     * (OAEP) for encryption / decryption.
+     *
+     * Uses sha1 by default.
+     *
+     * @see self::setHash()
+     * @see self::setMGFHash()
+     */
+    const ENCRYPTION_OAEP = 1;
+    /**
+     * Use PKCS#1 padding.
+     *
+     * Although self::ENCRYPTION_OAEP offers more security, including PKCS#1 padding is necessary for purposes of backwards
+     * compatibility with protocols (like SSH-1) written before OAEP's introduction.
+     */
+    const ENCRYPTION_PKCS1 = 2;
+    /**
+     * Do not use any padding
+     *
+     * Although this method is not recommended it can none-the-less sometimes be useful if you're trying to decrypt some legacy
+     * stuff, if you're trying to diagnose why an encrypted message isn't decrypting, etc.
+     */
+    const ENCRYPTION_NONE = 3;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see self::sign()
+     * @see self::verify()
+     * @see self::setHash()
+    */
+    /**
+     * Use the Probabilistic Signature Scheme for signing
+     *
+     * Uses sha1 by default.
+     *
+     * @see self::setSaltLength()
+     * @see self::setMGFHash()
+     */
+    const SIGNATURE_PSS = 1;
+    /**
+     * Use the PKCS#1 scheme by default.
+     *
+     * Although self::SIGNATURE_PSS offers more security, including PKCS#1 signing is necessary for purposes of backwards
+     * compatibility with protocols (like SSH-2) written before PSS's introduction.
+     */
+    const SIGNATURE_PKCS1 = 2;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\RSA::createKey()
+    */
+    /**
+     * ASN1 Integer
+     */
+    const ASN1_INTEGER = 2;
+    /**
+     * ASN1 Bit String
+     */
+    const ASN1_BITSTRING = 3;
+    /**
+     * ASN1 Octet String
+     */
+    const ASN1_OCTETSTRING = 4;
+    /**
+     * ASN1 Object Identifier
+     */
+    const ASN1_OBJECT = 6;
+    /**
+     * ASN1 Sequence (with the constucted bit set)
+     */
+    const ASN1_SEQUENCE = 48;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see \phpseclib\Crypt\RSA::__construct()
+    */
+    /**
+     * To use the pure-PHP implementation
+     */
+    const MODE_INTERNAL = 1;
+    /**
+     * To use the OpenSSL library
+     *
+     * (if enabled; otherwise, the internal implementation will be used)
+     */
+    const MODE_OPENSSL = 2;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\RSA::createKey()
+     * @see \phpseclib\Crypt\RSA::setPrivateKeyFormat()
+    */
+    /**
+     * PKCS#1 formatted private key
+     *
+     * Used by OpenSSH
+     */
+    const PRIVATE_FORMAT_PKCS1 = 0;
+    /**
+     * PuTTY formatted private key
+     */
+    const PRIVATE_FORMAT_PUTTY = 1;
+    /**
+     * XML formatted private key
+     */
+    const PRIVATE_FORMAT_XML = 2;
+    /**
+     * PKCS#8 formatted private key
+     */
+    const PRIVATE_FORMAT_PKCS8 = 8;
+    /**
+     * OpenSSH formatted private key
+     */
+    const PRIVATE_FORMAT_OPENSSH = 9;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\Crypt\RSA::createKey()
+     * @see \phpseclib\Crypt\RSA::setPublicKeyFormat()
+    */
+    /**
+     * Raw public key
+     *
+     * An array containing two \phpseclib\Math\BigInteger objects.
+     *
+     * The exponent can be indexed with any of the following:
+     *
+     * 0, e, exponent, publicExponent
+     *
+     * The modulus can be indexed with any of the following:
+     *
+     * 1, n, modulo, modulus
+     */
+    const PUBLIC_FORMAT_RAW = 3;
+    /**
+     * PKCS#1 formatted public key (raw)
+     *
+     * Used by File/X509.php
+     *
+     * Has the following header:
+     *
+     * -----BEGIN RSA PUBLIC KEY-----
+     *
+     * Analogous to ssh-keygen's pem format (as specified by -m)
+     */
+    const PUBLIC_FORMAT_PKCS1 = 4;
+    const PUBLIC_FORMAT_PKCS1_RAW = 4;
+    /**
+     * XML formatted public key
+     */
+    const PUBLIC_FORMAT_XML = 5;
+    /**
+     * OpenSSH formatted public key
+     *
+     * Place in $HOME/.ssh/authorized_keys
+     */
+    const PUBLIC_FORMAT_OPENSSH = 6;
+    /**
+     * PKCS#1 formatted public key (encapsulated)
+     *
+     * Used by PHP's openssl_public_encrypt() and openssl's rsautl (when -pubin is set)
+     *
+     * Has the following header:
+     *
+     * -----BEGIN PUBLIC KEY-----
+     *
+     * Analogous to ssh-keygen's pkcs8 format (as specified by -m). Although PKCS8
+     * is specific to private keys it's basically creating a DER-encoded wrapper
+     * for keys. This just extends that same concept to public keys (much like ssh-keygen)
+     */
+    const PUBLIC_FORMAT_PKCS8 = 7;
+    /**#@-*/
+
+    /**
+     * Precomputed Zero
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $zero;
+
+    /**
+     * Precomputed One
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $one;
+
+    /**
+     * Private Key Format
+     *
+     * @var int
+     * @access private
+     */
+    var $privateKeyFormat = self::PRIVATE_FORMAT_PKCS1;
+
+    /**
+     * Public Key Format
+     *
+     * @var int
+     * @access public
+     */
+    var $publicKeyFormat = self::PUBLIC_FORMAT_PKCS8;
+
+    /**
+     * Modulus (ie. n)
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $modulus;
+
+    /**
+     * Modulus length
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $k;
+
+    /**
+     * Exponent (ie. e or d)
+     *
+     * @var \phpseclib\Math\BigInteger
+     * @access private
+     */
+    var $exponent;
+
+    /**
+     * Primes for Chinese Remainder Theorem (ie. p and q)
+     *
+     * @var array
+     * @access private
+     */
+    var $primes;
+
+    /**
+     * Exponents for Chinese Remainder Theorem (ie. dP and dQ)
+     *
+     * @var array
+     * @access private
+     */
+    var $exponents;
+
+    /**
+     * Coefficients for Chinese Remainder Theorem (ie. qInv)
+     *
+     * @var array
+     * @access private
+     */
+    var $coefficients;
+
+    /**
+     * Hash name
+     *
+     * @var string
+     * @access private
+     */
+    var $hashName;
+
+    /**
+     * Hash function
+     *
+     * @var \phpseclib\Crypt\Hash
+     * @access private
+     */
+    var $hash;
+
+    /**
+     * Length of hash function output
+     *
+     * @var int
+     * @access private
+     */
+    var $hLen;
+
+    /**
+     * Length of salt
+     *
+     * @var int
+     * @access private
+     */
+    var $sLen;
+
+    /**
+     * Hash function for the Mask Generation Function
+     *
+     * @var \phpseclib\Crypt\Hash
+     * @access private
+     */
+    var $mgfHash;
+
+    /**
+     * Length of MGF hash function output
+     *
+     * @var int
+     * @access private
+     */
+    var $mgfHLen;
+
+    /**
+     * Encryption mode
+     *
+     * @var int
+     * @access private
+     */
+    var $encryptionMode = self::ENCRYPTION_OAEP;
+
+    /**
+     * Signature mode
+     *
+     * @var int
+     * @access private
+     */
+    var $signatureMode = self::SIGNATURE_PSS;
+
+    /**
+     * Public Exponent
+     *
+     * @var mixed
+     * @access private
+     */
+    var $publicExponent = false;
+
+    /**
+     * Password
+     *
+     * @var string
+     * @access private
+     */
+    var $password = false;
+
+    /**
+     * Components
+     *
+     * For use with parsing XML formatted keys.  PHP's XML Parser functions use utilized - instead of PHP's DOM functions -
+     * because PHP's XML Parser functions work on PHP4 whereas PHP's DOM functions - although surperior - don't.
+     *
+     * @see self::_start_element_handler()
+     * @var array
+     * @access private
+     */
+    var $components = array();
+
+    /**
+     * Current String
+     *
+     * For use with parsing XML formatted keys.
+     *
+     * @see self::_character_handler()
+     * @see self::_stop_element_handler()
+     * @var mixed
+     * @access private
+     */
+    var $current;
+
+    /**
+     * OpenSSL configuration file name.
+     *
+     * Set to null to use system configuration file.
+     * @see self::createKey()
+     * @var mixed
+     * @Access public
+     */
+    var $configFile;
+
+    /**
+     * Public key comment field.
+     *
+     * @var string
+     * @access private
+     */
+    var $comment = 'phpseclib-generated-key';
+
+    /**
+     * The constructor
+     *
+     * If you want to make use of the openssl extension, you'll need to set the mode manually, yourself.  The reason
+     * \phpseclib\Crypt\RSA doesn't do it is because OpenSSL doesn't fail gracefully.  openssl_pkey_new(), in particular, requires
+     * openssl.cnf be present somewhere and, unfortunately, the only real way to find out is too late.
+     *
+     * @return \phpseclib\Crypt\RSA
+     * @access public
+     */
+    function __construct()
+    {
+        $this->configFile = dirname(__FILE__) . '/../openssl.cnf';
+
+        if (!defined('CRYPT_RSA_MODE')) {
+            switch (true) {
+                // Math/BigInteger's openssl requirements are a little less stringent than Crypt/RSA's. in particular,
+                // Math/BigInteger doesn't require an openssl.cfg file whereas Crypt/RSA does. so if Math/BigInteger
+                // can't use OpenSSL it can be pretty trivially assumed, then, that Crypt/RSA can't either.
+                case defined('MATH_BIGINTEGER_OPENSSL_DISABLE'):
+                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+                    break;
+                case extension_loaded('openssl') && file_exists($this->configFile):
+                    // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
+                    $versions = array();
+
+                    // avoid generating errors (even with suppression) when phpinfo() is disabled (common in production systems)
+                    if (strpos(ini_get('disable_functions'), 'phpinfo') === false) {
+                        ob_start();
+                        @phpinfo();
+                        $content = ob_get_contents();
+                        ob_end_clean();
+
+                        preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
+
+                        if (!empty($matches[1])) {
+                            for ($i = 0; $i < count($matches[1]); $i++) {
+                                $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
+
+                                // Remove letter part in OpenSSL version
+                                if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
+                                    $versions[$matches[1][$i]] = $fullVersion;
+                                } else {
+                                    $versions[$matches[1][$i]] = $m[0];
+                                }
+                            }
+                        }
+                    }
+
+                    // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
+                    switch (true) {
+                        case !isset($versions['Header']):
+                        case !isset($versions['Library']):
+                        case $versions['Header'] == $versions['Library']:
+                        case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
+                            define('CRYPT_RSA_MODE', self::MODE_OPENSSL);
+                            break;
+                        default:
+                            define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+                            define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
+                    }
+                    break;
+                default:
+                    define('CRYPT_RSA_MODE', self::MODE_INTERNAL);
+            }
+        }
+
+        $this->zero = new BigInteger();
+        $this->one = new BigInteger(1);
+
+        $this->hash = new Hash('sha1');
+        $this->hLen = $this->hash->getLength();
+        $this->hashName = 'sha1';
+        $this->mgfHash = new Hash('sha1');
+        $this->mgfHLen = $this->mgfHash->getLength();
+    }
+
+    /**
+     * Create public / private key pair
+     *
+     * Returns an array with the following three elements:
+     *  - 'privatekey': The private key.
+     *  - 'publickey':  The public key.
+     *  - 'partialkey': A partially computed key (if the execution time exceeded $timeout).
+     *                  Will need to be passed back to \phpseclib\Crypt\RSA::createKey() as the third parameter for further processing.
+     *
+     * @access public
+     * @param int $bits
+     * @param int $timeout
+     * @param array $partial
+     */
+    function createKey($bits = 1024, $timeout = false, $partial = array())
+    {
+        if (!defined('CRYPT_RSA_EXPONENT')) {
+            // http://en.wikipedia.org/wiki/65537_%28number%29
+            define('CRYPT_RSA_EXPONENT', '65537');
+        }
+        // per <http://cseweb.ucsd.edu/~hovav/dist/survey.pdf#page=5>, this number ought not result in primes smaller
+        // than 256 bits. as a consequence if the key you're trying to create is 1024 bits and you've set CRYPT_RSA_SMALLEST_PRIME
+        // to 384 bits then you're going to get a 384 bit prime and a 640 bit prime (384 + 1024 % 384). at least if
+        // CRYPT_RSA_MODE is set to self::MODE_INTERNAL. if CRYPT_RSA_MODE is set to self::MODE_OPENSSL then
+        // CRYPT_RSA_SMALLEST_PRIME is ignored (ie. multi-prime RSA support is more intended as a way to speed up RSA key
+        // generation when there's a chance neither gmp nor OpenSSL are installed)
+        if (!defined('CRYPT_RSA_SMALLEST_PRIME')) {
+            define('CRYPT_RSA_SMALLEST_PRIME', 4096);
+        }
+
+        // OpenSSL uses 65537 as the exponent and requires RSA keys be 384 bits minimum
+        if (CRYPT_RSA_MODE == self::MODE_OPENSSL && $bits >= 384 && CRYPT_RSA_EXPONENT == 65537) {
+            $config = array();
+            if (isset($this->configFile)) {
+                $config['config'] = $this->configFile;
+            }
+            $rsa = openssl_pkey_new(array('private_key_bits' => $bits) + $config);
+            openssl_pkey_export($rsa, $privatekey, null, $config);
+            $publickey = openssl_pkey_get_details($rsa);
+            $publickey = $publickey['key'];
+
+            $privatekey = call_user_func_array(array($this, '_convertPrivateKey'), array_values($this->_parseKey($privatekey, self::PRIVATE_FORMAT_PKCS1)));
+            $publickey = call_user_func_array(array($this, '_convertPublicKey'), array_values($this->_parseKey($publickey, self::PUBLIC_FORMAT_PKCS1)));
+
+            // clear the buffer of error strings stemming from a minimalistic openssl.cnf
+            while (openssl_error_string() !== false) {
+            }
+
+            return array(
+                'privatekey' => $privatekey,
+                'publickey' => $publickey,
+                'partialkey' => false
+            );
+        }
+
+        static $e;
+        if (!isset($e)) {
+            $e = new BigInteger(CRYPT_RSA_EXPONENT);
+        }
+
+        extract($this->_generateMinMax($bits));
+        $absoluteMin = $min;
+        $temp = $bits >> 1; // divide by two to see how many bits P and Q would be
+        if ($temp > CRYPT_RSA_SMALLEST_PRIME) {
+            $num_primes = floor($bits / CRYPT_RSA_SMALLEST_PRIME);
+            $temp = CRYPT_RSA_SMALLEST_PRIME;
+        } else {
+            $num_primes = 2;
+        }
+        extract($this->_generateMinMax($temp + $bits % $temp));
+        $finalMax = $max;
+        extract($this->_generateMinMax($temp));
+
+        $generator = new BigInteger();
+
+        $n = $this->one->copy();
+        if (!empty($partial)) {
+            extract(unserialize($partial));
+        } else {
+            $exponents = $coefficients = $primes = array();
+            $lcm = array(
+                'top' => $this->one->copy(),
+                'bottom' => false
+            );
+        }
+
+        $start = time();
+        $i0 = count($primes) + 1;
+
+        do {
+            for ($i = $i0; $i <= $num_primes; $i++) {
+                if ($timeout !== false) {
+                    $timeout-= time() - $start;
+                    $start = time();
+                    if ($timeout <= 0) {
+                        return array(
+                            'privatekey' => '',
+                            'publickey'  => '',
+                            'partialkey' => serialize(array(
+                                'primes' => $primes,
+                                'coefficients' => $coefficients,
+                                'lcm' => $lcm,
+                                'exponents' => $exponents
+                            ))
+                        );
+                    }
+                }
+
+                if ($i == $num_primes) {
+                    list($min, $temp) = $absoluteMin->divide($n);
+                    if (!$temp->equals($this->zero)) {
+                        $min = $min->add($this->one); // ie. ceil()
+                    }
+                    $primes[$i] = $generator->randomPrime($min, $finalMax, $timeout);
+                } else {
+                    $primes[$i] = $generator->randomPrime($min, $max, $timeout);
+                }
+
+                if ($primes[$i] === false) { // if we've reached the timeout
+                    if (count($primes) > 1) {
+                        $partialkey = '';
+                    } else {
+                        array_pop($primes);
+                        $partialkey = serialize(array(
+                            'primes' => $primes,
+                            'coefficients' => $coefficients,
+                            'lcm' => $lcm,
+                            'exponents' => $exponents
+                        ));
+                    }
+
+                    return array(
+                        'privatekey' => '',
+                        'publickey'  => '',
+                        'partialkey' => $partialkey
+                    );
+                }
+
+                // the first coefficient is calculated differently from the rest
+                // ie. instead of being $primes[1]->modInverse($primes[2]), it's $primes[2]->modInverse($primes[1])
+                if ($i > 2) {
+                    $coefficients[$i] = $n->modInverse($primes[$i]);
+                }
+
+                $n = $n->multiply($primes[$i]);
+
+                $temp = $primes[$i]->subtract($this->one);
+
+                // textbook RSA implementations use Euler's totient function instead of the least common multiple.
+                // see http://en.wikipedia.org/wiki/Euler%27s_totient_function
+                $lcm['top'] = $lcm['top']->multiply($temp);
+                $lcm['bottom'] = $lcm['bottom'] === false ? $temp : $lcm['bottom']->gcd($temp);
+
+                $exponents[$i] = $e->modInverse($temp);
+            }
+
+            list($temp) = $lcm['top']->divide($lcm['bottom']);
+            $gcd = $temp->gcd($e);
+            $i0 = 1;
+        } while (!$gcd->equals($this->one));
+
+        $d = $e->modInverse($temp);
+
+        $coefficients[2] = $primes[2]->modInverse($primes[1]);
+
+        // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.2>:
+        // RSAPrivateKey ::= SEQUENCE {
+        //     version           Version,
+        //     modulus           INTEGER,  -- n
+        //     publicExponent    INTEGER,  -- e
+        //     privateExponent   INTEGER,  -- d
+        //     prime1            INTEGER,  -- p
+        //     prime2            INTEGER,  -- q
+        //     exponent1         INTEGER,  -- d mod (p-1)
+        //     exponent2         INTEGER,  -- d mod (q-1)
+        //     coefficient       INTEGER,  -- (inverse of q) mod p
+        //     otherPrimeInfos   OtherPrimeInfos OPTIONAL
+        // }
+
+        return array(
+            'privatekey' => $this->_convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients),
+            'publickey'  => $this->_convertPublicKey($n, $e),
+            'partialkey' => false
+        );
+    }
+
+    /**
+     * Convert a private key to the appropriate format.
+     *
+     * @access private
+     * @see self::setPrivateKeyFormat()
+     * @param Math_BigInteger $n
+     * @param Math_BigInteger $e
+     * @param Math_BigInteger $d
+     * @param array<int,Math_BigInteger> $primes
+     * @param array<int,Math_BigInteger> $exponents
+     * @param array<int,Math_BigInteger> $coefficients
+     * @return string
+     */
+    function _convertPrivateKey($n, $e, $d, $primes, $exponents, $coefficients)
+    {
+        $signed = $this->privateKeyFormat != self::PRIVATE_FORMAT_XML;
+        $num_primes = count($primes);
+        $raw = array(
+            'version' => $num_primes == 2 ? chr(0) : chr(1), // two-prime vs. multi
+            'modulus' => $n->toBytes($signed),
+            'publicExponent' => $e->toBytes($signed),
+            'privateExponent' => $d->toBytes($signed),
+            'prime1' => $primes[1]->toBytes($signed),
+            'prime2' => $primes[2]->toBytes($signed),
+            'exponent1' => $exponents[1]->toBytes($signed),
+            'exponent2' => $exponents[2]->toBytes($signed),
+            'coefficient' => $coefficients[2]->toBytes($signed)
+        );
+
+        // if the format in question does not support multi-prime rsa and multi-prime rsa was used,
+        // call _convertPublicKey() instead.
+        switch ($this->privateKeyFormat) {
+            case self::PRIVATE_FORMAT_XML:
+                if ($num_primes != 2) {
+                    return false;
+                }
+                return "<RSAKeyValue>\r\n" .
+                       '  <Modulus>' . base64_encode($raw['modulus']) . "</Modulus>\r\n" .
+                       '  <Exponent>' . base64_encode($raw['publicExponent']) . "</Exponent>\r\n" .
+                       '  <P>' . base64_encode($raw['prime1']) . "</P>\r\n" .
+                       '  <Q>' . base64_encode($raw['prime2']) . "</Q>\r\n" .
+                       '  <DP>' . base64_encode($raw['exponent1']) . "</DP>\r\n" .
+                       '  <DQ>' . base64_encode($raw['exponent2']) . "</DQ>\r\n" .
+                       '  <InverseQ>' . base64_encode($raw['coefficient']) . "</InverseQ>\r\n" .
+                       '  <D>' . base64_encode($raw['privateExponent']) . "</D>\r\n" .
+                       '</RSAKeyValue>';
+                break;
+            case self::PRIVATE_FORMAT_PUTTY:
+                if ($num_primes != 2) {
+                    return false;
+                }
+                $key = "PuTTY-User-Key-File-2: ssh-rsa\r\nEncryption: ";
+                $encryption = (!empty($this->password) || is_string($this->password)) ? 'aes256-cbc' : 'none';
+                $key.= $encryption;
+                $key.= "\r\nComment: " . $this->comment . "\r\n";
+                $public = pack(
+                    'Na*Na*Na*',
+                    strlen('ssh-rsa'),
+                    'ssh-rsa',
+                    strlen($raw['publicExponent']),
+                    $raw['publicExponent'],
+                    strlen($raw['modulus']),
+                    $raw['modulus']
+                );
+                $source = pack(
+                    'Na*Na*Na*Na*',
+                    strlen('ssh-rsa'),
+                    'ssh-rsa',
+                    strlen($encryption),
+                    $encryption,
+                    strlen($this->comment),
+                    $this->comment,
+                    strlen($public),
+                    $public
+                );
+                $public = base64_encode($public);
+                $key.= "Public-Lines: " . ((strlen($public) + 63) >> 6) . "\r\n";
+                $key.= chunk_split($public, 64);
+                $private = pack(
+                    'Na*Na*Na*Na*',
+                    strlen($raw['privateExponent']),
+                    $raw['privateExponent'],
+                    strlen($raw['prime1']),
+                    $raw['prime1'],
+                    strlen($raw['prime2']),
+                    $raw['prime2'],
+                    strlen($raw['coefficient']),
+                    $raw['coefficient']
+                );
+                if (empty($this->password) && !is_string($this->password)) {
+                    $source.= pack('Na*', strlen($private), $private);
+                    $hashkey = 'putty-private-key-file-mac-key';
+                } else {
+                    $private.= Random::string(16 - (strlen($private) & 15));
+                    $source.= pack('Na*', strlen($private), $private);
+                    $sequence = 0;
+                    $symkey = '';
+                    while (strlen($symkey) < 32) {
+                        $temp = pack('Na*', $sequence++, $this->password);
+                        $symkey.= pack('H*', sha1($temp));
+                    }
+                    $symkey = substr($symkey, 0, 32);
+                    $crypto = new AES();
+
+                    $crypto->setKey($symkey);
+                    $crypto->disablePadding();
+                    $private = $crypto->encrypt($private);
+                    $hashkey = 'putty-private-key-file-mac-key' . $this->password;
+                }
+
+                $private = base64_encode($private);
+                $key.= 'Private-Lines: ' . ((strlen($private) + 63) >> 6) . "\r\n";
+                $key.= chunk_split($private, 64);
+                $hash = new Hash('sha1');
+                $hash->setKey(pack('H*', sha1($hashkey)));
+                $key.= 'Private-MAC: ' . bin2hex($hash->hash($source)) . "\r\n";
+
+                return $key;
+            case self::PRIVATE_FORMAT_OPENSSH:
+                if ($num_primes != 2) {
+                    return false;
+                }
+                $publicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($raw['publicExponent']), $raw['publicExponent'], strlen($raw['modulus']), $raw['modulus']);
+                $privateKey = pack(
+                    'Na*Na*Na*Na*Na*Na*Na*',
+                    strlen('ssh-rsa'),
+                    'ssh-rsa',
+                    strlen($raw['modulus']),
+                    $raw['modulus'],
+                    strlen($raw['publicExponent']),
+                    $raw['publicExponent'],
+                    strlen($raw['privateExponent']),
+                    $raw['privateExponent'],
+                    strlen($raw['coefficient']),
+                    $raw['coefficient'],
+                    strlen($raw['prime1']),
+                    $raw['prime1'],
+                    strlen($raw['prime2']),
+                    $raw['prime2']
+                );
+                $checkint = Random::string(4);
+                $paddedKey = pack(
+                    'a*Na*',
+                    $checkint . $checkint . $privateKey,
+                    strlen($this->comment),
+                    $this->comment
+                );
+                $paddingLength = (7 * strlen($paddedKey)) % 8;
+                for ($i = 1; $i <= $paddingLength; $i++) {
+                    $paddedKey.= chr($i);
+                }
+                $key = pack(
+                    'Na*Na*Na*NNa*Na*',
+                    strlen('none'),
+                    'none',
+                    strlen('none'),
+                    'none',
+                    0,
+                    '',
+                    1,
+                    strlen($publicKey),
+                    $publicKey,
+                    strlen($paddedKey),
+                    $paddedKey
+                );
+                $key = "openssh-key-v1\0$key";
+
+                return "-----BEGIN OPENSSH PRIVATE KEY-----\r\n" .
+                       chunk_split(base64_encode($key), 70) .
+                       "-----END OPENSSH PRIVATE KEY-----";
+            default: // eg. self::PRIVATE_FORMAT_PKCS1
+                $components = array();
+                foreach ($raw as $name => $value) {
+                    $components[$name] = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($value)), $value);
+                }
+
+                $RSAPrivateKey = implode('', $components);
+
+                if ($num_primes > 2) {
+                    $OtherPrimeInfos = '';
+                    for ($i = 3; $i <= $num_primes; $i++) {
+                        // OtherPrimeInfos ::= SEQUENCE SIZE(1..MAX) OF OtherPrimeInfo
+                        //
+                        // OtherPrimeInfo ::= SEQUENCE {
+                        //     prime             INTEGER,  -- ri
+                        //     exponent          INTEGER,  -- di
+                        //     coefficient       INTEGER   -- ti
+                        // }
+                        $OtherPrimeInfo = pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($primes[$i]->toBytes(true))), $primes[$i]->toBytes(true));
+                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($exponents[$i]->toBytes(true))), $exponents[$i]->toBytes(true));
+                        $OtherPrimeInfo.= pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($coefficients[$i]->toBytes(true))), $coefficients[$i]->toBytes(true));
+                        $OtherPrimeInfos.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfo)), $OtherPrimeInfo);
+                    }
+                    $RSAPrivateKey.= pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($OtherPrimeInfos)), $OtherPrimeInfos);
+                }
+
+                $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+
+                if ($this->privateKeyFormat == self::PRIVATE_FORMAT_PKCS8) {
+                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+                    $RSAPrivateKey = pack(
+                        'Ca*a*Ca*a*',
+                        self::ASN1_INTEGER,
+                        "\01\00",
+                        $rsaOID,
+                        4,
+                        $this->_encodeLength(strlen($RSAPrivateKey)),
+                        $RSAPrivateKey
+                    );
+                    $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+                    if (!empty($this->password) || is_string($this->password)) {
+                        $salt = Random::string(8);
+                        $iterationCount = 2048;
+
+                        $crypto = new DES();
+                        $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+                        $RSAPrivateKey = $crypto->encrypt($RSAPrivateKey);
+
+                        $parameters = pack(
+                            'Ca*a*Ca*N',
+                            self::ASN1_OCTETSTRING,
+                            $this->_encodeLength(strlen($salt)),
+                            $salt,
+                            self::ASN1_INTEGER,
+                            $this->_encodeLength(4),
+                            $iterationCount
+                        );
+                        $pbeWithMD5AndDES_CBC = "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03";
+
+                        $encryptionAlgorithm = pack(
+                            'Ca*a*Ca*a*',
+                            self::ASN1_OBJECT,
+                            $this->_encodeLength(strlen($pbeWithMD5AndDES_CBC)),
+                            $pbeWithMD5AndDES_CBC,
+                            self::ASN1_SEQUENCE,
+                            $this->_encodeLength(strlen($parameters)),
+                            $parameters
+                        );
+
+                        $RSAPrivateKey = pack(
+                            'Ca*a*Ca*a*',
+                            self::ASN1_SEQUENCE,
+                            $this->_encodeLength(strlen($encryptionAlgorithm)),
+                            $encryptionAlgorithm,
+                            self::ASN1_OCTETSTRING,
+                            $this->_encodeLength(strlen($RSAPrivateKey)),
+                            $RSAPrivateKey
+                        );
+
+                        $RSAPrivateKey = pack('Ca*a*', self::ASN1_SEQUENCE, $this->_encodeLength(strlen($RSAPrivateKey)), $RSAPrivateKey);
+
+                        $RSAPrivateKey = "-----BEGIN ENCRYPTED PRIVATE KEY-----\r\n" .
+                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                         '-----END ENCRYPTED PRIVATE KEY-----';
+                    } else {
+                        $RSAPrivateKey = "-----BEGIN PRIVATE KEY-----\r\n" .
+                                         chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                         '-----END PRIVATE KEY-----';
+                    }
+                    return $RSAPrivateKey;
+                }
+
+                if (!empty($this->password) || is_string($this->password)) {
+                    $iv = Random::string(8);
+                    $symkey = pack('H*', md5($this->password . $iv)); // symkey is short for symmetric key
+                    $symkey.= substr(pack('H*', md5($symkey . $this->password . $iv)), 0, 8);
+                    $des = new TripleDES();
+                    $des->setKey($symkey);
+                    $des->setIV($iv);
+                    $iv = strtoupper(bin2hex($iv));
+                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
+                                     "Proc-Type: 4,ENCRYPTED\r\n" .
+                                     "DEK-Info: DES-EDE3-CBC,$iv\r\n" .
+                                     "\r\n" .
+                                     chunk_split(base64_encode($des->encrypt($RSAPrivateKey)), 64) .
+                                     '-----END RSA PRIVATE KEY-----';
+                } else {
+                    $RSAPrivateKey = "-----BEGIN RSA PRIVATE KEY-----\r\n" .
+                                     chunk_split(base64_encode($RSAPrivateKey), 64) .
+                                     '-----END RSA PRIVATE KEY-----';
+                }
+
+                return $RSAPrivateKey;
+        }
+    }
+
+    /**
+     * Convert a public key to the appropriate format
+     *
+     * @access private
+     * @see self::setPublicKeyFormat()
+     * @param Math_BigInteger $n
+     * @param Math_BigInteger $e
+     * @return string|array<string,Math_BigInteger>
+     */
+    function _convertPublicKey($n, $e)
+    {
+        $signed = $this->publicKeyFormat != self::PUBLIC_FORMAT_XML;
+
+        $modulus = $n->toBytes($signed);
+        $publicExponent = $e->toBytes($signed);
+
+        switch ($this->publicKeyFormat) {
+            case self::PUBLIC_FORMAT_RAW:
+                return array('e' => $e->copy(), 'n' => $n->copy());
+            case self::PUBLIC_FORMAT_XML:
+                return "<RSAKeyValue>\r\n" .
+                       '  <Modulus>' . base64_encode($modulus) . "</Modulus>\r\n" .
+                       '  <Exponent>' . base64_encode($publicExponent) . "</Exponent>\r\n" .
+                       '</RSAKeyValue>';
+                break;
+            case self::PUBLIC_FORMAT_OPENSSH:
+                // from <http://tools.ietf.org/html/rfc4253#page-15>:
+                // string    "ssh-rsa"
+                // mpint     e
+                // mpint     n
+                $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
+                $RSAPublicKey = 'ssh-rsa ' . base64_encode($RSAPublicKey) . ' ' . $this->comment;
+
+                return $RSAPublicKey;
+            default: // eg. self::PUBLIC_FORMAT_PKCS1_RAW or self::PUBLIC_FORMAT_PKCS1
+                // from <http://tools.ietf.org/html/rfc3447#appendix-A.1.1>:
+                // RSAPublicKey ::= SEQUENCE {
+                //     modulus           INTEGER,  -- n
+                //     publicExponent    INTEGER   -- e
+                // }
+                $components = array(
+                    'modulus' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($modulus)), $modulus),
+                    'publicExponent' => pack('Ca*a*', self::ASN1_INTEGER, $this->_encodeLength(strlen($publicExponent)), $publicExponent)
+                );
+
+                $RSAPublicKey = pack(
+                    'Ca*a*a*',
+                    self::ASN1_SEQUENCE,
+                    $this->_encodeLength(strlen($components['modulus']) + strlen($components['publicExponent'])),
+                    $components['modulus'],
+                    $components['publicExponent']
+                );
+
+                if ($this->publicKeyFormat == self::PUBLIC_FORMAT_PKCS1_RAW) {
+                    $RSAPublicKey = "-----BEGIN RSA PUBLIC KEY-----\r\n" .
+                                    chunk_split(base64_encode($RSAPublicKey), 64) .
+                                    '-----END RSA PUBLIC KEY-----';
+                } else {
+                    // sequence(oid(1.2.840.113549.1.1.1), null)) = rsaEncryption.
+                    $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+                    $RSAPublicKey = chr(0) . $RSAPublicKey;
+                    $RSAPublicKey = chr(3) . $this->_encodeLength(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+                    $RSAPublicKey = pack(
+                        'Ca*a*',
+                        self::ASN1_SEQUENCE,
+                        $this->_encodeLength(strlen($rsaOID . $RSAPublicKey)),
+                        $rsaOID . $RSAPublicKey
+                    );
+
+                    $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+                                     chunk_split(base64_encode($RSAPublicKey), 64) .
+                                     '-----END PUBLIC KEY-----';
+                }
+
+                return $RSAPublicKey;
+        }
+    }
+
+    /**
+     * Break a public or private key down into its constituant components
+     *
+     * @access private
+     * @see self::_convertPublicKey()
+     * @see self::_convertPrivateKey()
+     * @param string|array $key
+     * @param int $type
+     * @return array|bool
+     */
+    function _parseKey($key, $type)
+    {
+        if ($type != self::PUBLIC_FORMAT_RAW && !is_string($key)) {
+            return false;
+        }
+
+        switch ($type) {
+            case self::PUBLIC_FORMAT_RAW:
+                if (!is_array($key)) {
+                    return false;
+                }
+                $components = array();
+                switch (true) {
+                    case isset($key['e']):
+                        $components['publicExponent'] = $key['e']->copy();
+                        break;
+                    case isset($key['exponent']):
+                        $components['publicExponent'] = $key['exponent']->copy();
+                        break;
+                    case isset($key['publicExponent']):
+                        $components['publicExponent'] = $key['publicExponent']->copy();
+                        break;
+                    case isset($key[0]):
+                        $components['publicExponent'] = $key[0]->copy();
+                }
+                switch (true) {
+                    case isset($key['n']):
+                        $components['modulus'] = $key['n']->copy();
+                        break;
+                    case isset($key['modulo']):
+                        $components['modulus'] = $key['modulo']->copy();
+                        break;
+                    case isset($key['modulus']):
+                        $components['modulus'] = $key['modulus']->copy();
+                        break;
+                    case isset($key[1]):
+                        $components['modulus'] = $key[1]->copy();
+                }
+                return isset($components['modulus']) && isset($components['publicExponent']) ? $components : false;
+            case self::PRIVATE_FORMAT_PKCS1:
+            case self::PRIVATE_FORMAT_PKCS8:
+            case self::PUBLIC_FORMAT_PKCS1:
+                /* Although PKCS#1 proposes a format that public and private keys can use, encrypting them is
+                   "outside the scope" of PKCS#1.  PKCS#1 then refers you to PKCS#12 and PKCS#15 if you're wanting to
+                   protect private keys, however, that's not what OpenSSL* does.  OpenSSL protects private keys by adding
+                   two new "fields" to the key - DEK-Info and Proc-Type.  These fields are discussed here:
+
+                   http://tools.ietf.org/html/rfc1421#section-4.6.1.1
+                   http://tools.ietf.org/html/rfc1421#section-4.6.1.3
+
+                   DES-EDE3-CBC as an algorithm, however, is not discussed anywhere, near as I can tell.
+                   DES-CBC and DES-EDE are discussed in RFC1423, however, DES-EDE3-CBC isn't, nor is its key derivation
+                   function.  As is, the definitive authority on this encoding scheme isn't the IETF but rather OpenSSL's
+                   own implementation.  ie. the implementation *is* the standard and any bugs that may exist in that
+                   implementation are part of the standard, as well.
+
+                   * OpenSSL is the de facto standard.  It's utilized by OpenSSH and other projects */
+                if (preg_match('#DEK-Info: (.+),(.+)#', $key, $matches)) {
+                    $iv = pack('H*', trim($matches[2]));
+                    $symkey = pack('H*', md5($this->password . substr($iv, 0, 8))); // symkey is short for symmetric key
+                    $symkey.= pack('H*', md5($symkey . $this->password . substr($iv, 0, 8)));
+                    // remove the Proc-Type / DEK-Info sections as they're no longer needed
+                    $key = preg_replace('#^(?:Proc-Type|DEK-Info): .*#m', '', $key);
+                    $ciphertext = $this->_extractBER($key);
+                    if ($ciphertext === false) {
+                        $ciphertext = $key;
+                    }
+                    switch ($matches[1]) {
+                        case 'AES-256-CBC':
+                            $crypto = new AES();
+                            break;
+                        case 'AES-128-CBC':
+                            $symkey = substr($symkey, 0, 16);
+                            $crypto = new AES();
+                            break;
+                        case 'DES-EDE3-CFB':
+                            $crypto = new TripleDES(Base::MODE_CFB);
+                            break;
+                        case 'DES-EDE3-CBC':
+                            $symkey = substr($symkey, 0, 24);
+                            $crypto = new TripleDES();
+                            break;
+                        case 'DES-CBC':
+                            $crypto = new DES();
+                            break;
+                        default:
+                            return false;
+                    }
+                    $crypto->setKey($symkey);
+                    $crypto->setIV($iv);
+                    $decoded = $crypto->decrypt($ciphertext);
+                } else {
+                    $decoded = $this->_extractBER($key);
+                }
+
+                if ($decoded !== false) {
+                    $key = $decoded;
+                }
+
+                $components = array();
+
+                if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                    return false;
+                }
+                if ($this->_decodeLength($key) != strlen($key)) {
+                    return false;
+                }
+
+                $tag = ord($this->_string_shift($key));
+                /* intended for keys for which OpenSSL's asn1parse returns the following:
+
+                    0:d=0  hl=4 l= 631 cons: SEQUENCE
+                    4:d=1  hl=2 l=   1 prim:  INTEGER           :00
+                    7:d=1  hl=2 l=  13 cons:  SEQUENCE
+                    9:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
+                   20:d=2  hl=2 l=   0 prim:   NULL
+                   22:d=1  hl=4 l= 609 prim:  OCTET STRING
+
+                   ie. PKCS8 keys*/
+
+                if ($tag == self::ASN1_INTEGER && substr($key, 0, 3) == "\x01\x00\x30") {
+                    $this->_string_shift($key, 3);
+                    $tag = self::ASN1_SEQUENCE;
+                }
+
+                if ($tag == self::ASN1_SEQUENCE) {
+                    $temp = $this->_string_shift($key, $this->_decodeLength($key));
+                    if (ord($this->_string_shift($temp)) != self::ASN1_OBJECT) {
+                        return false;
+                    }
+                    $length = $this->_decodeLength($temp);
+                    switch ($this->_string_shift($temp, $length)) {
+                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x01\x01": // rsaEncryption
+                        case "\x2A\x86\x48\x86\xF7\x0D\x01\x01\x0A": // rsaPSS
+                            break;
+                        case "\x2a\x86\x48\x86\xf7\x0d\x01\x05\x03": // pbeWithMD5AndDES-CBC
+                            /*
+                               PBEParameter ::= SEQUENCE {
+                                   salt OCTET STRING (SIZE(8)),
+                                   iterationCount INTEGER }
+                            */
+                            if (ord($this->_string_shift($temp)) != self::ASN1_SEQUENCE) {
+                                return false;
+                            }
+                            if ($this->_decodeLength($temp) != strlen($temp)) {
+                                return false;
+                            }
+                            $this->_string_shift($temp); // assume it's an octet string
+                            $salt = $this->_string_shift($temp, $this->_decodeLength($temp));
+                            if (ord($this->_string_shift($temp)) != self::ASN1_INTEGER) {
+                                return false;
+                            }
+                            $this->_decodeLength($temp);
+                            list(, $iterationCount) = unpack('N', str_pad($temp, 4, chr(0), STR_PAD_LEFT));
+                            $this->_string_shift($key); // assume it's an octet string
+                            $length = $this->_decodeLength($key);
+                            if (strlen($key) != $length) {
+                                return false;
+                            }
+
+                            $crypto = new DES();
+                            $crypto->setPassword($this->password, 'pbkdf1', 'md5', $salt, $iterationCount);
+                            $key = $crypto->decrypt($key);
+                            if ($key === false) {
+                                return false;
+                            }
+                            return $this->_parseKey($key, self::PRIVATE_FORMAT_PKCS1);
+                        default:
+                            return false;
+                    }
+                    /* intended for keys for which OpenSSL's asn1parse returns the following:
+
+                        0:d=0  hl=4 l= 290 cons: SEQUENCE
+                        4:d=1  hl=2 l=  13 cons:  SEQUENCE
+                        6:d=2  hl=2 l=   9 prim:   OBJECT            :rsaEncryption
+                       17:d=2  hl=2 l=   0 prim:   NULL
+                       19:d=1  hl=4 l= 271 prim:  BIT STRING */
+                    $tag = ord($this->_string_shift($key)); // skip over the BIT STRING / OCTET STRING tag
+                    $this->_decodeLength($key); // skip over the BIT STRING / OCTET STRING length
+                    // "The initial octet shall encode, as an unsigned binary integer wtih bit 1 as the least significant bit, the number of
+                    //  unused bits in the final subsequent octet. The number shall be in the range zero to seven."
+                    //  -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf (section 8.6.2.2)
+                    if ($tag == self::ASN1_BITSTRING) {
+                        $this->_string_shift($key);
+                    }
+                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                        return false;
+                    }
+                    if ($this->_decodeLength($key) != strlen($key)) {
+                        return false;
+                    }
+                    $tag = ord($this->_string_shift($key));
+                }
+                if ($tag != self::ASN1_INTEGER) {
+                    return false;
+                }
+
+                $length = $this->_decodeLength($key);
+                $temp = $this->_string_shift($key, $length);
+                if (strlen($temp) != 1 || ord($temp) > 2) {
+                    $components['modulus'] = new BigInteger($temp, 256);
+                    $this->_string_shift($key); // skip over self::ASN1_INTEGER
+                    $length = $this->_decodeLength($key);
+                    $components[$type == self::PUBLIC_FORMAT_PKCS1 ? 'publicExponent' : 'privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+
+                    return $components;
+                }
+                if (ord($this->_string_shift($key)) != self::ASN1_INTEGER) {
+                    return false;
+                }
+                $length = $this->_decodeLength($key);
+                $components['modulus'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['publicExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['privateExponent'] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['primes'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['exponents'] = array(1 => new BigInteger($this->_string_shift($key, $length), 256));
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                $this->_string_shift($key);
+                $length = $this->_decodeLength($key);
+                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($key, $length), 256));
+
+                if (!empty($key)) {
+                    if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                        return false;
+                    }
+                    $this->_decodeLength($key);
+                    while (!empty($key)) {
+                        if (ord($this->_string_shift($key)) != self::ASN1_SEQUENCE) {
+                            return false;
+                        }
+                        $this->_decodeLength($key);
+                        $key = substr($key, 1);
+                        $length = $this->_decodeLength($key);
+                        $components['primes'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                        $this->_string_shift($key);
+                        $length = $this->_decodeLength($key);
+                        $components['exponents'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                        $this->_string_shift($key);
+                        $length = $this->_decodeLength($key);
+                        $components['coefficients'][] = new BigInteger($this->_string_shift($key, $length), 256);
+                    }
+                }
+
+                return $components;
+            case self::PUBLIC_FORMAT_OPENSSH:
+                $parts = explode(' ', $key, 3);
+
+                $key = isset($parts[1]) ? base64_decode($parts[1]) : false;
+                if ($key === false) {
+                    return false;
+                }
+
+                $comment = isset($parts[2]) ? $parts[2] : false;
+
+                $cleanup = substr($key, 0, 11) == "\0\0\0\7ssh-rsa";
+
+                if (strlen($key) <= 4) {
+                    return false;
+                }
+                extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                $publicExponent = new BigInteger($this->_string_shift($key, $length), -256);
+                if (strlen($key) <= 4) {
+                    return false;
+                }
+                extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                $modulus = new BigInteger($this->_string_shift($key, $length), -256);
+
+                if ($cleanup && strlen($key)) {
+                    if (strlen($key) <= 4) {
+                        return false;
+                    }
+                    extract(unpack('Nlength', $this->_string_shift($key, 4)));
+                    $realModulus = new BigInteger($this->_string_shift($key, $length), -256);
+                    return strlen($key) ? false : array(
+                        'modulus' => $realModulus,
+                        'publicExponent' => $modulus,
+                        'comment' => $comment
+                    );
+                } else {
+                    return strlen($key) ? false : array(
+                        'modulus' => $modulus,
+                        'publicExponent' => $publicExponent,
+                        'comment' => $comment
+                    );
+                }
+            // http://www.w3.org/TR/xmldsig-core/#sec-RSAKeyValue
+            // http://en.wikipedia.org/wiki/XML_Signature
+            case self::PRIVATE_FORMAT_XML:
+            case self::PUBLIC_FORMAT_XML:
+                $this->components = array();
+
+                $xml = xml_parser_create('UTF-8');
+                xml_set_object($xml, $this);
+                xml_set_element_handler($xml, '_start_element_handler', '_stop_element_handler');
+                xml_set_character_data_handler($xml, '_data_handler');
+                // add <xml></xml> to account for "dangling" tags like <BitStrength>...</BitStrength> that are sometimes added
+                if (!xml_parse($xml, '<xml>' . $key . '</xml>')) {
+                    xml_parser_free($xml);
+                    unset($xml);
+                    return false;
+                }
+
+                xml_parser_free($xml);
+                unset($xml);
+
+                return isset($this->components['modulus']) && isset($this->components['publicExponent']) ? $this->components : false;
+            // from PuTTY's SSHPUBK.C
+            case self::PRIVATE_FORMAT_PUTTY:
+                $components = array();
+                $key = preg_split('#\r\n|\r|\n#', $key);
+                $type = trim(preg_replace('#PuTTY-User-Key-File-2: (.+)#', '$1', $key[0]));
+                if ($type != 'ssh-rsa') {
+                    return false;
+                }
+                $encryption = trim(preg_replace('#Encryption: (.+)#', '$1', $key[1]));
+                $comment = trim(preg_replace('#Comment: (.+)#', '$1', $key[2]));
+
+                $publicLength = trim(preg_replace('#Public-Lines: (\d+)#', '$1', $key[3]));
+                $public = base64_decode(implode('', array_map('trim', array_slice($key, 4, $publicLength))));
+                $public = substr($public, 11);
+                extract(unpack('Nlength', $this->_string_shift($public, 4)));
+                $components['publicExponent'] = new BigInteger($this->_string_shift($public, $length), -256);
+                extract(unpack('Nlength', $this->_string_shift($public, 4)));
+                $components['modulus'] = new BigInteger($this->_string_shift($public, $length), -256);
+
+                $privateLength = trim(preg_replace('#Private-Lines: (\d+)#', '$1', $key[$publicLength + 4]));
+                $private = base64_decode(implode('', array_map('trim', array_slice($key, $publicLength + 5, $privateLength))));
+
+                switch ($encryption) {
+                    case 'aes256-cbc':
+                        $symkey = '';
+                        $sequence = 0;
+                        while (strlen($symkey) < 32) {
+                            $temp = pack('Na*', $sequence++, $this->password);
+                            $symkey.= pack('H*', sha1($temp));
+                        }
+                        $symkey = substr($symkey, 0, 32);
+                        $crypto = new AES();
+                }
+
+                if ($encryption != 'none') {
+                    $crypto->setKey($symkey);
+                    $crypto->disablePadding();
+                    $private = $crypto->decrypt($private);
+                    if ($private === false) {
+                        return false;
+                    }
+                }
+
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['privateExponent'] = new BigInteger($this->_string_shift($private, $length), -256);
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['primes'] = array(1 => new BigInteger($this->_string_shift($private, $length), -256));
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['primes'][] = new BigInteger($this->_string_shift($private, $length), -256);
+
+                $temp = $components['primes'][1]->subtract($this->one);
+                $components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
+                $temp = $components['primes'][2]->subtract($this->one);
+                $components['exponents'][] = $components['publicExponent']->modInverse($temp);
+
+                extract(unpack('Nlength', $this->_string_shift($private, 4)));
+                if (strlen($private) < $length) {
+                    return false;
+                }
+                $components['coefficients'] = array(2 => new BigInteger($this->_string_shift($private, $length), -256));
+
+                return $components;
+            case self::PRIVATE_FORMAT_OPENSSH:
+                $components = array();
+                $decoded = $this->_extractBER($key);
+                $magic = $this->_string_shift($decoded, 15);
+                if ($magic !== "openssh-key-v1\0") {
+                    return false;
+                }
+                $options = $this->_string_shift($decoded, 24);
+                // \0\0\0\4none = ciphername
+                // \0\0\0\4none = kdfname
+                // \0\0\0\0 = kdfoptions
+                // \0\0\0\1 = numkeys
+                if ($options != "\0\0\0\4none\0\0\0\4none\0\0\0\0\0\0\0\1") {
+                    return false;
+                }
+                extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
+                if (strlen($decoded) < $length) {
+                    return false;
+                }
+                $publicKey = $this->_string_shift($decoded, $length);
+                extract(unpack('Nlength', $this->_string_shift($decoded, 4)));
+                if (strlen($decoded) < $length) {
+                    return false;
+                }
+                $paddedKey = $this->_string_shift($decoded, $length);
+
+                if ($this->_string_shift($publicKey, 11) !== "\0\0\0\7ssh-rsa") {
+                    return false;
+                }
+
+                $checkint1 = $this->_string_shift($paddedKey, 4);
+                $checkint2 = $this->_string_shift($paddedKey, 4);
+                if (strlen($checkint1) != 4 || $checkint1 !== $checkint2) {
+                    return false;
+                }
+
+                if ($this->_string_shift($paddedKey, 11) !== "\0\0\0\7ssh-rsa") {
+                    return false;
+                }
+
+                $values = array(
+                    &$components['modulus'],
+                    &$components['publicExponent'],
+                    &$components['privateExponent'],
+                    &$components['coefficients'][2],
+                    &$components['primes'][1],
+                    &$components['primes'][2]
+                );
+
+                foreach ($values as &$value) {
+                    extract(unpack('Nlength', $this->_string_shift($paddedKey, 4)));
+                    if (strlen($paddedKey) < $length) {
+                        return false;
+                    }
+                    $value = new BigInteger($this->_string_shift($paddedKey, $length), -256);
+                }
+
+                extract(unpack('Nlength', $this->_string_shift($paddedKey, 4)));
+                if (strlen($paddedKey) < $length) {
+                    return false;
+                }
+                $components['comment'] = $this->_string_shift($decoded, $length);
+
+                $temp = $components['primes'][1]->subtract($this->one);
+                $components['exponents'] = array(1 => $components['publicExponent']->modInverse($temp));
+                $temp = $components['primes'][2]->subtract($this->one);
+                $components['exponents'][] = $components['publicExponent']->modInverse($temp);
+
+                return $components;
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns the key size
+     *
+     * More specifically, this returns the size of the modulo in bits.
+     *
+     * @access public
+     * @return int
+     */
+    function getSize()
+    {
+        return !isset($this->modulus) ? 0 : strlen($this->modulus->toBits());
+    }
+
+    /**
+     * Start Element Handler
+     *
+     * Called by xml_set_element_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $name
+     * @param array $attribs
+     */
+    function _start_element_handler($parser, $name, $attribs)
+    {
+        //$name = strtoupper($name);
+        switch ($name) {
+            case 'MODULUS':
+                $this->current = &$this->components['modulus'];
+                break;
+            case 'EXPONENT':
+                $this->current = &$this->components['publicExponent'];
+                break;
+            case 'P':
+                $this->current = &$this->components['primes'][1];
+                break;
+            case 'Q':
+                $this->current = &$this->components['primes'][2];
+                break;
+            case 'DP':
+                $this->current = &$this->components['exponents'][1];
+                break;
+            case 'DQ':
+                $this->current = &$this->components['exponents'][2];
+                break;
+            case 'INVERSEQ':
+                $this->current = &$this->components['coefficients'][2];
+                break;
+            case 'D':
+                $this->current = &$this->components['privateExponent'];
+        }
+        $this->current = '';
+    }
+
+    /**
+     * Stop Element Handler
+     *
+     * Called by xml_set_element_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $name
+     */
+    function _stop_element_handler($parser, $name)
+    {
+        if (isset($this->current)) {
+            $this->current = new BigInteger(base64_decode($this->current), 256);
+            unset($this->current);
+        }
+    }
+
+    /**
+     * Data Handler
+     *
+     * Called by xml_set_character_data_handler()
+     *
+     * @access private
+     * @param resource $parser
+     * @param string $data
+     */
+    function _data_handler($parser, $data)
+    {
+        if (!isset($this->current) || is_object($this->current)) {
+            return;
+        }
+        $this->current.= trim($data);
+    }
+
+    /**
+     * Loads a public or private key
+     *
+     * Returns true on success and false on failure (ie. an incorrect password was provided or the key was malformed)
+     *
+     * @access public
+     * @param string|RSA|array $key
+     * @param bool|int $type optional
+     * @return bool
+     */
+    function loadKey($key, $type = false)
+    {
+        if ($key instanceof RSA) {
+            $this->privateKeyFormat = $key->privateKeyFormat;
+            $this->publicKeyFormat = $key->publicKeyFormat;
+            $this->k = $key->k;
+            $this->hLen = $key->hLen;
+            $this->sLen = $key->sLen;
+            $this->mgfHLen = $key->mgfHLen;
+            $this->encryptionMode = $key->encryptionMode;
+            $this->signatureMode = $key->signatureMode;
+            $this->password = $key->password;
+            $this->configFile = $key->configFile;
+            $this->comment = $key->comment;
+
+            if (is_object($key->hash)) {
+                $this->hash = new Hash($key->hash->getHash());
+            }
+            if (is_object($key->mgfHash)) {
+                $this->mgfHash = new Hash($key->mgfHash->getHash());
+            }
+
+            if (is_object($key->modulus)) {
+                $this->modulus = $key->modulus->copy();
+            }
+            if (is_object($key->exponent)) {
+                $this->exponent = $key->exponent->copy();
+            }
+            if (is_object($key->publicExponent)) {
+                $this->publicExponent = $key->publicExponent->copy();
+            }
+
+            $this->primes = array();
+            $this->exponents = array();
+            $this->coefficients = array();
+
+            foreach ($this->primes as $prime) {
+                $this->primes[] = $prime->copy();
+            }
+            foreach ($this->exponents as $exponent) {
+                $this->exponents[] = $exponent->copy();
+            }
+            foreach ($this->coefficients as $coefficient) {
+                $this->coefficients[] = $coefficient->copy();
+            }
+
+            return true;
+        }
+
+        if ($type === false) {
+            $types = array(
+                self::PUBLIC_FORMAT_RAW,
+                self::PRIVATE_FORMAT_PKCS1,
+                self::PRIVATE_FORMAT_XML,
+                self::PRIVATE_FORMAT_PUTTY,
+                self::PUBLIC_FORMAT_OPENSSH,
+                self::PRIVATE_FORMAT_OPENSSH
+            );
+            foreach ($types as $type) {
+                $components = $this->_parseKey($key, $type);
+                if ($components !== false) {
+                    break;
+                }
+            }
+        } else {
+            $components = $this->_parseKey($key, $type);
+        }
+
+        if ($components === false) {
+            $this->comment = null;
+            $this->modulus = null;
+            $this->k = null;
+            $this->exponent = null;
+            $this->primes = null;
+            $this->exponents = null;
+            $this->coefficients = null;
+            $this->publicExponent = null;
+
+            return false;
+        }
+
+        if (isset($components['comment']) && $components['comment'] !== false) {
+            $this->comment = $components['comment'];
+        }
+        $this->modulus = $components['modulus'];
+        $this->k = strlen($this->modulus->toBytes());
+        $this->exponent = isset($components['privateExponent']) ? $components['privateExponent'] : $components['publicExponent'];
+        if (isset($components['primes'])) {
+            $this->primes = $components['primes'];
+            $this->exponents = $components['exponents'];
+            $this->coefficients = $components['coefficients'];
+            $this->publicExponent = $components['publicExponent'];
+        } else {
+            $this->primes = array();
+            $this->exponents = array();
+            $this->coefficients = array();
+            $this->publicExponent = false;
+        }
+
+        switch ($type) {
+            case self::PUBLIC_FORMAT_OPENSSH:
+            case self::PUBLIC_FORMAT_RAW:
+                $this->setPublicKey();
+                break;
+            case self::PRIVATE_FORMAT_PKCS1:
+                switch (true) {
+                    case strpos($key, '-BEGIN PUBLIC KEY-') !== false:
+                    case strpos($key, '-BEGIN RSA PUBLIC KEY-') !== false:
+                        $this->setPublicKey();
+                }
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets the password
+     *
+     * Private keys can be encrypted with a password.  To unset the password, pass in the empty string or false.
+     * Or rather, pass in $password such that empty($password) && !is_string($password) is true.
+     *
+     * @see self::createKey()
+     * @see self::loadKey()
+     * @access public
+     * @param string $password
+     */
+    function setPassword($password = false)
+    {
+        $this->password = $password;
+    }
+
+    /**
+     * Defines the public key
+     *
+     * Some private key formats define the public exponent and some don't.  Those that don't define it are problematic when
+     * used in certain contexts.  For example, in SSH-2, RSA authentication works by sending the public key along with a
+     * message signed by the private key to the server.  The SSH-2 server looks the public key up in an index of public keys
+     * and if it's present then proceeds to verify the signature.  Problem is, if your private key doesn't include the public
+     * exponent this won't work unless you manually add the public exponent. phpseclib tries to guess if the key being used
+     * is the public key but in the event that it guesses incorrectly you might still want to explicitly set the key as being
+     * public.
+     *
+     * Do note that when a new key is loaded the index will be cleared.
+     *
+     * Returns true on success, false on failure
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key optional
+     * @param int $type optional
+     * @return bool
+     */
+    function setPublicKey($key = false, $type = false)
+    {
+        // if a public key has already been loaded return false
+        if (!empty($this->publicExponent)) {
+            return false;
+        }
+
+        if ($key === false && !empty($this->modulus)) {
+            $this->publicExponent = $this->exponent;
+            return true;
+        }
+
+        if ($type === false) {
+            $types = array(
+                self::PUBLIC_FORMAT_RAW,
+                self::PUBLIC_FORMAT_PKCS1,
+                self::PUBLIC_FORMAT_XML,
+                self::PUBLIC_FORMAT_OPENSSH
+            );
+            foreach ($types as $type) {
+                $components = $this->_parseKey($key, $type);
+                if ($components !== false) {
+                    break;
+                }
+            }
+        } else {
+            $components = $this->_parseKey($key, $type);
+        }
+
+        if ($components === false) {
+            return false;
+        }
+
+        if (empty($this->modulus) || !$this->modulus->equals($components['modulus'])) {
+            $this->modulus = $components['modulus'];
+            $this->exponent = $this->publicExponent = $components['publicExponent'];
+            return true;
+        }
+
+        $this->publicExponent = $components['publicExponent'];
+
+        return true;
+    }
+
+    /**
+     * Defines the private key
+     *
+     * If phpseclib guessed a private key was a public key and loaded it as such it might be desirable to force
+     * phpseclib to treat the key as a private key. This function will do that.
+     *
+     * Do note that when a new key is loaded the index will be cleared.
+     *
+     * Returns true on success, false on failure
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param string $key optional
+     * @param int $type optional
+     * @return bool
+     */
+    function setPrivateKey($key = false, $type = false)
+    {
+        if ($key === false && !empty($this->publicExponent)) {
+            $this->publicExponent = false;
+            return true;
+        }
+
+        $rsa = new RSA();
+        if (!$rsa->loadKey($key, $type)) {
+            return false;
+        }
+        $rsa->publicExponent = false;
+
+        // don't overwrite the old key if the new key is invalid
+        $this->loadKey($rsa);
+        return true;
+    }
+
+    /**
+     * Returns the public key
+     *
+     * The public key is only returned under two circumstances - if the private key had the public key embedded within it
+     * or if the public key was set via setPublicKey().  If the currently loaded key is supposed to be the public key this
+     * function won't return it since this library, for the most part, doesn't distinguish between public and private keys.
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param int $type optional
+     */
+    function getPublicKey($type = self::PUBLIC_FORMAT_PKCS8)
+    {
+        if (empty($this->modulus) || empty($this->publicExponent)) {
+            return false;
+        }
+
+        $oldFormat = $this->publicKeyFormat;
+        $this->publicKeyFormat = $type;
+        $temp = $this->_convertPublicKey($this->modulus, $this->publicExponent);
+        $this->publicKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     * Returns the public key's fingerprint
+     *
+     * The public key's fingerprint is returned, which is equivalent to running `ssh-keygen -lf rsa.pub`. If there is
+     * no public key currently loaded, false is returned.
+     * Example output (md5): "c1:b1:30:29:d7:b8:de:6c:97:77:10:d7:46:41:63:87" (as specified by RFC 4716)
+     *
+     * @access public
+     * @param string $algorithm The hashing algorithm to be used. Valid options are 'md5' and 'sha256'. False is returned
+     * for invalid values.
+     * @return mixed
+     */
+    function getPublicKeyFingerprint($algorithm = 'md5')
+    {
+        if (empty($this->modulus) || empty($this->publicExponent)) {
+            return false;
+        }
+
+        $modulus = $this->modulus->toBytes(true);
+        $publicExponent = $this->publicExponent->toBytes(true);
+
+        $RSAPublicKey = pack('Na*Na*Na*', strlen('ssh-rsa'), 'ssh-rsa', strlen($publicExponent), $publicExponent, strlen($modulus), $modulus);
+
+        switch ($algorithm) {
+            case 'sha256':
+                $hash = new Hash('sha256');
+                $base = base64_encode($hash->hash($RSAPublicKey));
+                return substr($base, 0, strlen($base) - 1);
+            case 'md5':
+                return substr(chunk_split(md5($RSAPublicKey), 2, ':'), 0, -1);
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Returns the private key
+     *
+     * The private key is only returned if the currently loaded key contains the constituent prime numbers.
+     *
+     * @see self::getPublicKey()
+     * @access public
+     * @param int $type optional
+     * @return mixed
+     */
+    function getPrivateKey($type = self::PUBLIC_FORMAT_PKCS1)
+    {
+        if (empty($this->primes)) {
+            return false;
+        }
+
+        $oldFormat = $this->privateKeyFormat;
+        $this->privateKeyFormat = $type;
+        $temp = $this->_convertPrivateKey($this->modulus, $this->publicExponent, $this->exponent, $this->primes, $this->exponents, $this->coefficients);
+        $this->privateKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     * Returns a minimalistic private key
+     *
+     * Returns the private key without the prime number constituants.  Structurally identical to a public key that
+     * hasn't been set as the public key
+     *
+     * @see self::getPrivateKey()
+     * @access private
+     * @param int $mode optional
+     */
+    function _getPrivatePublicKey($mode = self::PUBLIC_FORMAT_PKCS8)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        $oldFormat = $this->publicKeyFormat;
+        $this->publicKeyFormat = $mode;
+        $temp = $this->_convertPublicKey($this->modulus, $this->exponent);
+        $this->publicKeyFormat = $oldFormat;
+        return $temp;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * @access public
+     * @return string
+     */
+    function __toString()
+    {
+        $key = $this->getPrivateKey($this->privateKeyFormat);
+        if ($key !== false) {
+            return $key;
+        }
+        $key = $this->_getPrivatePublicKey($this->publicKeyFormat);
+        return $key !== false ? $key : '';
+    }
+
+    /**
+     *  __clone() magic method
+     *
+     * @access public
+     * @return Crypt_RSA
+     */
+    function __clone()
+    {
+        $key = new RSA();
+        $key->loadKey($this);
+        return $key;
+    }
+
+    /**
+     * Generates the smallest and largest numbers requiring $bits bits
+     *
+     * @access private
+     * @param int $bits
+     * @return array
+     */
+    function _generateMinMax($bits)
+    {
+        $bytes = $bits >> 3;
+        $min = str_repeat(chr(0), $bytes);
+        $max = str_repeat(chr(0xFF), $bytes);
+        $msb = $bits & 7;
+        if ($msb) {
+            $min = chr(1 << ($msb - 1)) . $min;
+            $max = chr((1 << $msb) - 1) . $max;
+        } else {
+            $min[0] = chr(0x80);
+        }
+
+        return array(
+            'min' => new BigInteger($min, 256),
+            'max' => new BigInteger($max, 256)
+        );
+    }
+
+    /**
+     * DER-decode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @access private
+     * @param string $string
+     * @return int
+     */
+    function _decodeLength(&$string)
+    {
+        $length = ord($this->_string_shift($string));
+        if ($length & 0x80) { // definite length, long form
+            $length&= 0x7F;
+            $temp = $this->_string_shift($string, $length);
+            list(, $length) = unpack('N', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4));
+        }
+        return $length;
+    }
+
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @access private
+     * @param int $length
+     * @return string
+     */
+    function _encodeLength($length)
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * Determines the private key format
+     *
+     * @see self::createKey()
+     * @access public
+     * @param int $format
+     */
+    function setPrivateKeyFormat($format)
+    {
+        $this->privateKeyFormat = $format;
+    }
+
+    /**
+     * Determines the public key format
+     *
+     * @see self::createKey()
+     * @access public
+     * @param int $format
+     */
+    function setPublicKeyFormat($format)
+    {
+        $this->publicKeyFormat = $format;
+    }
+
+    /**
+     * Determines which hashing function should be used
+     *
+     * Used with signature production / verification and (if the encryption mode is self::ENCRYPTION_OAEP) encryption and
+     * decryption.  If $hash isn't supported, sha1 is used.
+     *
+     * @access public
+     * @param string $hash
+     */
+    function setHash($hash)
+    {
+        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch ($hash) {
+            case 'md2':
+            case 'md5':
+            case 'sha1':
+            case 'sha256':
+            case 'sha384':
+            case 'sha512':
+                $this->hash = new Hash($hash);
+                $this->hashName = $hash;
+                break;
+            default:
+                $this->hash = new Hash('sha1');
+                $this->hashName = 'sha1';
+        }
+        $this->hLen = $this->hash->getLength();
+    }
+
+    /**
+     * Determines which hashing function should be used for the mask generation function
+     *
+     * The mask generation function is used by self::ENCRYPTION_OAEP and self::SIGNATURE_PSS and although it's
+     * best if Hash and MGFHash are set to the same thing this is not a requirement.
+     *
+     * @access public
+     * @param string $hash
+     */
+    function setMGFHash($hash)
+    {
+        // \phpseclib\Crypt\Hash supports algorithms that PKCS#1 doesn't support.  md5-96 and sha1-96, for example.
+        switch ($hash) {
+            case 'md2':
+            case 'md5':
+            case 'sha1':
+            case 'sha256':
+            case 'sha384':
+            case 'sha512':
+                $this->mgfHash = new Hash($hash);
+                break;
+            default:
+                $this->mgfHash = new Hash('sha1');
+        }
+        $this->mgfHLen = $this->mgfHash->getLength();
+    }
+
+    /**
+     * Determines the salt length
+     *
+     * To quote from {@link http://tools.ietf.org/html/rfc3447#page-38 RFC3447#page-38}:
+     *
+     *    Typical salt lengths in octets are hLen (the length of the output
+     *    of the hash function Hash) and 0.
+     *
+     * @access public
+     * @param int $sLen
+     */
+    function setSaltLength($sLen)
+    {
+        $this->sLen = $sLen;
+    }
+
+    /**
+     * Integer-to-Octet-String primitive
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-4.1 RFC3447#section-4.1}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
+     * @param int $xLen
+     * @return string
+     */
+    function _i2osp($x, $xLen)
+    {
+        $x = $x->toBytes();
+        if (strlen($x) > $xLen) {
+            user_error('Integer too large');
+            return false;
+        }
+        return str_pad($x, $xLen, chr(0), STR_PAD_LEFT);
+    }
+
+    /**
+     * Octet-String-to-Integer primitive
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-4.2 RFC3447#section-4.2}.
+     *
+     * @access private
+     * @param int|string|resource $x
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _os2ip($x)
+    {
+        return new BigInteger($x, 256);
+    }
+
+    /**
+     * Exponentiate with or without Chinese Remainder Theorem
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.2}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _exponentiate($x)
+    {
+        switch (true) {
+            case empty($this->primes):
+            case $this->primes[1]->equals($this->zero):
+            case empty($this->coefficients):
+            case $this->coefficients[2]->equals($this->zero):
+            case empty($this->exponents):
+            case $this->exponents[1]->equals($this->zero):
+                return $x->modPow($this->exponent, $this->modulus);
+        }
+
+        $num_primes = count($this->primes);
+
+        if (defined('CRYPT_RSA_DISABLE_BLINDING')) {
+            $m_i = array(
+                1 => $x->modPow($this->exponents[1], $this->primes[1]),
+                2 => $x->modPow($this->exponents[2], $this->primes[2])
+            );
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            list(, $h) = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
+
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $x->modPow($this->exponents[$i], $this->primes[$i]);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                list(, $h) = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        } else {
+            $smallest = $this->primes[1];
+            for ($i = 2; $i <= $num_primes; $i++) {
+                if ($smallest->compare($this->primes[$i]) > 0) {
+                    $smallest = $this->primes[$i];
+                }
+            }
+
+            $one = new BigInteger(1);
+
+            $r = $one->random($one, $smallest->subtract($one));
+
+            $m_i = array(
+                1 => $this->_blind($x, $r, 1),
+                2 => $this->_blind($x, $r, 2)
+            );
+            $h = $m_i[1]->subtract($m_i[2]);
+            $h = $h->multiply($this->coefficients[2]);
+            list(, $h) = $h->divide($this->primes[1]);
+            $m = $m_i[2]->add($h->multiply($this->primes[2]));
+
+            $r = $this->primes[1];
+            for ($i = 3; $i <= $num_primes; $i++) {
+                $m_i = $this->_blind($x, $r, $i);
+
+                $r = $r->multiply($this->primes[$i - 1]);
+
+                $h = $m_i->subtract($m);
+                $h = $h->multiply($this->coefficients[$i]);
+                list(, $h) = $h->divide($this->primes[$i]);
+
+                $m = $m->add($r->multiply($h));
+            }
+        }
+
+        return $m;
+    }
+
+    /**
+     * Performs RSA Blinding
+     *
+     * Protects against timing attacks by employing RSA Blinding.
+     * Returns $x->modPow($this->exponents[$i], $this->primes[$i])
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $x
+     * @param \phpseclib\Math\BigInteger $r
+     * @param int $i
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _blind($x, $r, $i)
+    {
+        $x = $x->multiply($r->modPow($this->publicExponent, $this->primes[$i]));
+        $x = $x->modPow($this->exponents[$i], $this->primes[$i]);
+
+        $r = $r->modInverse($this->primes[$i]);
+        $x = $x->multiply($r);
+        list(, $x) = $x->divide($this->primes[$i]);
+
+        return $x;
+    }
+
+    /**
+     * Performs blinded RSA equality testing
+     *
+     * Protects against a particular type of timing attack described.
+     *
+     * See {@link http://codahale.com/a-lesson-in-timing-attacks/ A Lesson In Timing Attacks (or, Don't use MessageDigest.isEquals)}
+     *
+     * Thanks for the heads up singpolyma!
+     *
+     * @access private
+     * @param string $x
+     * @param string $y
+     * @return bool
+     */
+    function _equals($x, $y)
+    {
+        if (function_exists('hash_equals')) {
+            return hash_equals($x, $y);
+        }
+
+        if (strlen($x) != strlen($y)) {
+            return false;
+        }
+
+        $result = "\0";
+        $x^= $y;
+        for ($i = 0; $i < strlen($x); $i++) {
+            $result|= $x[$i];
+        }
+
+        return $result === "\0";
+    }
+
+    /**
+     * RSAEP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.1 RFC3447#section-5.1.1}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $m
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsaep($m)
+    {
+        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
+            user_error('Message representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($m);
+    }
+
+    /**
+     * RSADP
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.1.2 RFC3447#section-5.1.2}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $c
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsadp($c)
+    {
+        if ($c->compare($this->zero) < 0 || $c->compare($this->modulus) > 0) {
+            user_error('Ciphertext representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($c);
+    }
+
+    /**
+     * RSASP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.1 RFC3447#section-5.2.1}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $m
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsasp1($m)
+    {
+        if ($m->compare($this->zero) < 0 || $m->compare($this->modulus) > 0) {
+            user_error('Message representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($m);
+    }
+
+    /**
+     * RSAVP1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-5.2.2 RFC3447#section-5.2.2}.
+     *
+     * @access private
+     * @param \phpseclib\Math\BigInteger $s
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _rsavp1($s)
+    {
+        if ($s->compare($this->zero) < 0 || $s->compare($this->modulus) > 0) {
+            user_error('Signature representative out of range');
+            return false;
+        }
+        return $this->_exponentiate($s);
+    }
+
+    /**
+     * MGF1
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#appendix-B.2.1 RFC3447#appendix-B.2.1}.
+     *
+     * @access private
+     * @param string $mgfSeed
+     * @param int $maskLen
+     * @return string
+     */
+    function _mgf1($mgfSeed, $maskLen)
+    {
+        // if $maskLen would yield strings larger than 4GB, PKCS#1 suggests a "Mask too long" error be output.
+
+        $t = '';
+        $count = ceil($maskLen / $this->mgfHLen);
+        for ($i = 0; $i < $count; $i++) {
+            $c = pack('N', $i);
+            $t.= $this->mgfHash->hash($mgfSeed . $c);
+        }
+
+        return substr($t, 0, $maskLen);
+    }
+
+    /**
+     * RSAES-OAEP-ENCRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.1 RFC3447#section-7.1.1} and
+     * {http://en.wikipedia.org/wiki/Optimal_Asymmetric_Encryption_Padding OAES}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $l
+     * @return string
+     */
+    function _rsaes_oaep_encrypt($m, $l = '')
+    {
+        $mLen = strlen($m);
+
+        // Length checking
+
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if ($mLen > $this->k - 2 * $this->hLen - 2) {
+            user_error('Message too long');
+            return false;
+        }
+
+        // EME-OAEP encoding
+
+        $lHash = $this->hash->hash($l);
+        $ps = str_repeat(chr(0), $this->k - $mLen - 2 * $this->hLen - 2);
+        $db = $lHash . $ps . chr(1) . $m;
+        $seed = Random::string($this->hLen);
+        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
+        $maskedDB = $db ^ $dbMask;
+        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
+        $maskedSeed = $seed ^ $seedMask;
+        $em = chr(0) . $maskedSeed . $maskedDB;
+
+        // RSA encryption
+
+        $m = $this->_os2ip($em);
+        $c = $this->_rsaep($m);
+        $c = $this->_i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
+    }
+
+    /**
+     * RSAES-OAEP-DECRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.1.2 RFC3447#section-7.1.2}.  The fact that the error
+     * messages aren't distinguishable from one another hinders debugging, but, to quote from RFC3447#section-7.1.2:
+     *
+     *    Note.  Care must be taken to ensure that an opponent cannot
+     *    distinguish the different error conditions in Step 3.g, whether by
+     *    error message or timing, or, more generally, learn partial
+     *    information about the encoded message EM.  Otherwise an opponent may
+     *    be able to obtain useful information about the decryption of the
+     *    ciphertext C, leading to a chosen-ciphertext attack such as the one
+     *    observed by Manger [36].
+     *
+     * As for $l...  to quote from {@link http://tools.ietf.org/html/rfc3447#page-17 RFC3447#page-17}:
+     *
+     *    Both the encryption and the decryption operations of RSAES-OAEP take
+     *    the value of a label L as input.  In this version of PKCS #1, L is
+     *    the empty string; other uses of the label are outside the scope of
+     *    this document.
+     *
+     * @access private
+     * @param string $c
+     * @param string $l
+     * @return string
+     */
+    function _rsaes_oaep_decrypt($c, $l = '')
+    {
+        // Length checking
+
+        // if $l is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        if (strlen($c) != $this->k || $this->k < 2 * $this->hLen + 2) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        // RSA decryption
+
+        $c = $this->_os2ip($c);
+        $m = $this->_rsadp($c);
+        if ($m === false) {
+            user_error('Decryption error');
+            return false;
+        }
+        $em = $this->_i2osp($m, $this->k);
+
+        // EME-OAEP decoding
+
+        $lHash = $this->hash->hash($l);
+        $y = ord($em[0]);
+        $maskedSeed = substr($em, 1, $this->hLen);
+        $maskedDB = substr($em, $this->hLen + 1);
+        $seedMask = $this->_mgf1($maskedDB, $this->hLen);
+        $seed = $maskedSeed ^ $seedMask;
+        $dbMask = $this->_mgf1($seed, $this->k - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $lHash2 = substr($db, 0, $this->hLen);
+        $m = substr($db, $this->hLen);
+        $hashesMatch = $this->_equals($lHash, $lHash2);
+        $leadingZeros = 1;
+        $patternMatch = 0;
+        $offset = 0;
+        for ($i = 0; $i < strlen($m); $i++) {
+            $patternMatch|= $leadingZeros & ($m[$i] === "\1");
+            $leadingZeros&= $m[$i] === "\0";
+            $offset+= $patternMatch ? 0 : 1;
+        }
+
+        // we do | instead of || to avoid https://en.wikipedia.org/wiki/Short-circuit_evaluation
+        // to protect against timing attacks
+        if (!$hashesMatch | !$patternMatch) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        // Output the message M
+
+        return substr($m, $offset + 1);
+    }
+
+    /**
+     * Raw Encryption / Decryption
+     *
+     * Doesn't use padding and is not recommended.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _raw_encrypt($m)
+    {
+        $temp = $this->_os2ip($m);
+        $temp = $this->_rsaep($temp);
+        return  $this->_i2osp($temp, $this->k);
+    }
+
+    /**
+     * RSAES-PKCS1-V1_5-ENCRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.1 RFC3447#section-7.2.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsaes_pkcs1_v1_5_encrypt($m)
+    {
+        $mLen = strlen($m);
+
+        // Length checking
+
+        if ($mLen > $this->k - 11) {
+            user_error('Message too long');
+            return false;
+        }
+
+        // EME-PKCS1-v1_5 encoding
+
+        $psLen = $this->k - $mLen - 3;
+        $ps = '';
+        while (strlen($ps) != $psLen) {
+            $temp = Random::string($psLen - strlen($ps));
+            $temp = str_replace("\x00", '', $temp);
+            $ps.= $temp;
+        }
+        $type = 2;
+        // see the comments of _rsaes_pkcs1_v1_5_decrypt() to understand why this is being done
+        if (defined('CRYPT_RSA_PKCS15_COMPAT') && (!isset($this->publicExponent) || $this->exponent !== $this->publicExponent)) {
+            $type = 1;
+            // "The padding string PS shall consist of k-3-||D|| octets. ... for block type 01, they shall have value FF"
+            $ps = str_repeat("\xFF", $psLen);
+        }
+        $em = chr(0) . chr($type) . $ps . chr(0) . $m;
+
+        // RSA encryption
+        $m = $this->_os2ip($em);
+        $c = $this->_rsaep($m);
+        $c = $this->_i2osp($c, $this->k);
+
+        // Output the ciphertext C
+
+        return $c;
+    }
+
+    /**
+     * RSAES-PKCS1-V1_5-DECRYPT
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-7.2.2 RFC3447#section-7.2.2}.
+     *
+     * For compatibility purposes, this function departs slightly from the description given in RFC3447.
+     * The reason being that RFC2313#section-8.1 (PKCS#1 v1.5) states that ciphertext's encrypted by the
+     * private key should have the second byte set to either 0 or 1 and that ciphertext's encrypted by the
+     * public key should have the second byte set to 2.  In RFC3447 (PKCS#1 v2.1), the second byte is supposed
+     * to be 2 regardless of which key is used.  For compatibility purposes, we'll just check to make sure the
+     * second byte is 2 or less.  If it is, we'll accept the decrypted string as valid.
+     *
+     * As a consequence of this, a private key encrypted ciphertext produced with \phpseclib\Crypt\RSA may not decrypt
+     * with a strictly PKCS#1 v1.5 compliant RSA implementation.  Public key encrypted ciphertext's should but
+     * not private key encrypted ciphertext's.
+     *
+     * @access private
+     * @param string $c
+     * @return string
+     */
+    function _rsaes_pkcs1_v1_5_decrypt($c)
+    {
+        // Length checking
+
+        if (strlen($c) != $this->k) { // or if k < 11
+            user_error('Decryption error');
+            return false;
+        }
+
+        // RSA decryption
+
+        $c = $this->_os2ip($c);
+        $m = $this->_rsadp($c);
+
+        if ($m === false) {
+            user_error('Decryption error');
+            return false;
+        }
+        $em = $this->_i2osp($m, $this->k);
+
+        // EME-PKCS1-v1_5 decoding
+
+        if (ord($em[0]) != 0 || ord($em[1]) > 2) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        $ps = substr($em, 2, strpos($em, chr(0), 2) - 2);
+        $m = substr($em, strlen($ps) + 3);
+
+        if (strlen($ps) < 8) {
+            user_error('Decryption error');
+            return false;
+        }
+
+        // Output M
+
+        return $m;
+    }
+
+    /**
+     * EMSA-PSS-ENCODE
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.1 RFC3447#section-9.1.1}.
+     *
+     * @access private
+     * @param string $m
+     * @param int $emBits
+     */
+    function _emsa_pss_encode($m, $emBits)
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 1) >> 3; // ie. ceil($emBits / 8)
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            user_error('Encoding error');
+            return false;
+        }
+
+        $salt = Random::string($sLen);
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h = $this->hash->hash($m2);
+        $ps = str_repeat(chr(0), $emLen - $sLen - $this->hLen - 2);
+        $db = $ps . chr(1) . $salt;
+        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
+        $maskedDB = $db ^ $dbMask;
+        $maskedDB[0] = ~chr(0xFF << ($emBits & 7)) & $maskedDB[0];
+        $em = $maskedDB . $h . chr(0xBC);
+
+        return $em;
+    }
+
+    /**
+     * EMSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.1.2 RFC3447#section-9.1.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $em
+     * @param int $emBits
+     * @return string
+     */
+    function _emsa_pss_verify($m, $em, $emBits)
+    {
+        // if $m is larger than two million terrabytes and you're using sha1, PKCS#1 suggests a "Label too long" error
+        // be output.
+
+        $emLen = ($emBits + 7) >> 3; // ie. ceil($emBits / 8);
+        $sLen = $this->sLen !== null ? $this->sLen : $this->hLen;
+
+        $mHash = $this->hash->hash($m);
+        if ($emLen < $this->hLen + $sLen + 2) {
+            return false;
+        }
+
+        if ($em[strlen($em) - 1] != chr(0xBC)) {
+            return false;
+        }
+
+        $maskedDB = substr($em, 0, -$this->hLen - 1);
+        $h = substr($em, -$this->hLen - 1, $this->hLen);
+        $temp = chr(0xFF << ($emBits & 7));
+        if ((~$maskedDB[0] & $temp) != $temp) {
+            return false;
+        }
+        $dbMask = $this->_mgf1($h, $emLen - $this->hLen - 1);
+        $db = $maskedDB ^ $dbMask;
+        $db[0] = ~chr(0xFF << ($emBits & 7)) & $db[0];
+        $temp = $emLen - $this->hLen - $sLen - 2;
+        if (substr($db, 0, $temp) != str_repeat(chr(0), $temp) || ord($db[$temp]) != 1) {
+            return false;
+        }
+        $salt = substr($db, $temp + 1); // should be $sLen long
+        $m2 = "\0\0\0\0\0\0\0\0" . $mHash . $salt;
+        $h2 = $this->hash->hash($m2);
+        return $this->_equals($h, $h2);
+    }
+
+    /**
+     * RSASSA-PSS-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.1 RFC3447#section-8.1.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsassa_pss_sign($m)
+    {
+        // EMSA-PSS encoding
+
+        $em = $this->_emsa_pss_encode($m, 8 * $this->k - 1);
+
+        // RSA signature
+
+        $m = $this->_os2ip($em);
+        $s = $this->_rsasp1($m);
+        $s = $this->_i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * RSASSA-PSS-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.1.2 RFC3447#section-8.1.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $s
+     * @return string
+     */
+    function _rsassa_pss_verify($m, $s)
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // RSA verification
+
+        $modBits = strlen($this->modulus->toBits());
+
+        $s2 = $this->_os2ip($s);
+        $m2 = $this->_rsavp1($s2);
+        if ($m2 === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+        $em = $this->_i2osp($m2, $this->k);
+        if ($em === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // EMSA-PSS verification
+
+        return $this->_emsa_pss_verify($m, $em, $modBits - 1);
+    }
+
+    /**
+     * EMSA-PKCS1-V1_5-ENCODE
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-9.2 RFC3447#section-9.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param int $emLen
+     * @return string
+     */
+    function _emsa_pkcs1_v1_5_encode($m, $emLen)
+    {
+        $h = $this->hash->hash($m);
+        if ($h === false) {
+            return false;
+        }
+
+        // see http://tools.ietf.org/html/rfc3447#page-43
+        switch ($this->hashName) {
+            case 'md2':
+                $t = pack('H*', '3020300c06082a864886f70d020205000410');
+                break;
+            case 'md5':
+                $t = pack('H*', '3020300c06082a864886f70d020505000410');
+                break;
+            case 'sha1':
+                $t = pack('H*', '3021300906052b0e03021a05000414');
+                break;
+            case 'sha256':
+                $t = pack('H*', '3031300d060960864801650304020105000420');
+                break;
+            case 'sha384':
+                $t = pack('H*', '3041300d060960864801650304020205000430');
+                break;
+            case 'sha512':
+                $t = pack('H*', '3051300d060960864801650304020305000440');
+        }
+        $t.= $h;
+        $tLen = strlen($t);
+
+        if ($emLen < $tLen + 11) {
+            user_error('Intended encoded message length too short');
+            return false;
+        }
+
+        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
+
+        $em = "\0\1$ps\0$t";
+
+        return $em;
+    }
+
+    /**
+     * EMSA-PKCS1-V1_5-ENCODE (without NULL)
+     *
+     * Quoting https://tools.ietf.org/html/rfc8017#page-65,
+     *
+     * "The parameters field associated with id-sha1, id-sha224, id-sha256,
+     *  id-sha384, id-sha512, id-sha512/224, and id-sha512/256 should
+     *  generally be omitted, but if present, it shall have a value of type
+     *  NULL"
+     *
+     * @access private
+     * @param string $m
+     * @param int $emLen
+     * @return string
+     */
+    function _emsa_pkcs1_v1_5_encode_without_null($m, $emLen)
+    {
+        $h = $this->hash->hash($m);
+        if ($h === false) {
+            return false;
+        }
+
+        switch ($this->hashName) {
+            case 'sha1':
+                $t = pack('H*', '301f300706052b0e03021a0414');
+                break;
+            case 'sha256':
+                $t = pack('H*', '302f300b06096086480165030402010420');
+                break;
+            case 'sha384':
+                $t = pack('H*', '303f300b06096086480165030402020430');
+                break;
+            case 'sha512':
+                $t = pack('H*', '304f300b06096086480165030402030440');
+                break;
+            default:
+                return false;
+        }
+        $t.= $h;
+        $tLen = strlen($t);
+
+        if ($emLen < $tLen + 11) {
+            user_error('Intended encoded message length too short');
+            return false;
+        }
+
+        $ps = str_repeat(chr(0xFF), $emLen - $tLen - 3);
+
+        $em = "\0\1$ps\0$t";
+
+        return $em;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-SIGN
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.1 RFC3447#section-8.2.1}.
+     *
+     * @access private
+     * @param string $m
+     * @return string
+     */
+    function _rsassa_pkcs1_v1_5_sign($m)
+    {
+        // EMSA-PKCS1-v1_5 encoding
+
+        $em = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
+        if ($em === false) {
+            user_error('RSA modulus too short');
+            return false;
+        }
+
+        // RSA signature
+
+        $m = $this->_os2ip($em);
+        $s = $this->_rsasp1($m);
+        $s = $this->_i2osp($s, $this->k);
+
+        // Output the signature S
+
+        return $s;
+    }
+
+    /**
+     * RSASSA-PKCS1-V1_5-VERIFY
+     *
+     * See {@link http://tools.ietf.org/html/rfc3447#section-8.2.2 RFC3447#section-8.2.2}.
+     *
+     * @access private
+     * @param string $m
+     * @param string $s
+     * @return string
+     */
+    function _rsassa_pkcs1_v1_5_verify($m, $s)
+    {
+        // Length checking
+
+        if (strlen($s) != $this->k) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // RSA verification
+
+        $s = $this->_os2ip($s);
+        $m2 = $this->_rsavp1($s);
+        if ($m2 === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+        $em = $this->_i2osp($m2, $this->k);
+        if ($em === false) {
+            user_error('Invalid signature');
+            return false;
+        }
+
+        // EMSA-PKCS1-v1_5 encoding
+
+        $em2 = $this->_emsa_pkcs1_v1_5_encode($m, $this->k);
+        $em3 = $this->_emsa_pkcs1_v1_5_encode_without_null($m, $this->k);
+
+        if ($em2 === false && $em3 === false) {
+            user_error('RSA modulus too short');
+            return false;
+        }
+
+        // Compare
+
+        return ($em2 !== false && $this->_equals($em, $em2)) ||
+               ($em3 !== false && $this->_equals($em, $em3));
+    }
+
+    /**
+     * Set Encryption Mode
+     *
+     * Valid values include self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1.
+     *
+     * @access public
+     * @param int $mode
+     */
+    function setEncryptionMode($mode)
+    {
+        $this->encryptionMode = $mode;
+    }
+
+    /**
+     * Set Signature Mode
+     *
+     * Valid values include self::SIGNATURE_PSS and self::SIGNATURE_PKCS1
+     *
+     * @access public
+     * @param int $mode
+     */
+    function setSignatureMode($mode)
+    {
+        $this->signatureMode = $mode;
+    }
+
+    /**
+     * Set public key comment.
+     *
+     * @access public
+     * @param string $comment
+     */
+    function setComment($comment)
+    {
+        $this->comment = $comment;
+    }
+
+    /**
+     * Get public key comment.
+     *
+     * @access public
+     * @return string
+     */
+    function getComment()
+    {
+        return $this->comment;
+    }
+
+    /**
+     * Encryption
+     *
+     * Both self::ENCRYPTION_OAEP and self::ENCRYPTION_PKCS1 both place limits on how long $plaintext can be.
+     * If $plaintext exceeds those limits it will be broken up so that it does and the resultant ciphertext's will
+     * be concatenated together.
+     *
+     * @see self::decrypt()
+     * @access public
+     * @param string $plaintext
+     * @return string
+     */
+    function encrypt($plaintext)
+    {
+        switch ($this->encryptionMode) {
+            case self::ENCRYPTION_NONE:
+                $plaintext = str_split($plaintext, $this->k);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_raw_encrypt($m);
+                }
+                return $ciphertext;
+            case self::ENCRYPTION_PKCS1:
+                $length = $this->k - 11;
+                if ($length <= 0) {
+                    return false;
+                }
+
+                $plaintext = str_split($plaintext, $length);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_rsaes_pkcs1_v1_5_encrypt($m);
+                }
+                return $ciphertext;
+            //case self::ENCRYPTION_OAEP:
+            default:
+                $length = $this->k - 2 * $this->hLen - 2;
+                if ($length <= 0) {
+                    return false;
+                }
+
+                $plaintext = str_split($plaintext, $length);
+                $ciphertext = '';
+                foreach ($plaintext as $m) {
+                    $ciphertext.= $this->_rsaes_oaep_encrypt($m);
+                }
+                return $ciphertext;
+        }
+    }
+
+    /**
+     * Decryption
+     *
+     * @see self::encrypt()
+     * @access public
+     * @param string $ciphertext
+     * @return string
+     */
+    function decrypt($ciphertext)
+    {
+        if ($this->k <= 0) {
+            return false;
+        }
+
+        $ciphertext = str_split($ciphertext, $this->k);
+        $ciphertext[count($ciphertext) - 1] = str_pad($ciphertext[count($ciphertext) - 1], $this->k, chr(0), STR_PAD_LEFT);
+
+        $plaintext = '';
+
+        switch ($this->encryptionMode) {
+            case self::ENCRYPTION_NONE:
+                $decrypt = '_raw_encrypt';
+                break;
+            case self::ENCRYPTION_PKCS1:
+                $decrypt = '_rsaes_pkcs1_v1_5_decrypt';
+                break;
+            //case self::ENCRYPTION_OAEP:
+            default:
+                $decrypt = '_rsaes_oaep_decrypt';
+        }
+
+        foreach ($ciphertext as $c) {
+            $temp = $this->$decrypt($c);
+            if ($temp === false) {
+                return false;
+            }
+            $plaintext.= $temp;
+        }
+
+        return $plaintext;
+    }
+
+    /**
+     * Create a signature
+     *
+     * @see self::verify()
+     * @access public
+     * @param string $message
+     * @return string
+     */
+    function sign($message)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        switch ($this->signatureMode) {
+            case self::SIGNATURE_PKCS1:
+                return $this->_rsassa_pkcs1_v1_5_sign($message);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->_rsassa_pss_sign($message);
+        }
+    }
+
+    /**
+     * Verifies a signature
+     *
+     * @see self::sign()
+     * @access public
+     * @param string $message
+     * @param string $signature
+     * @return bool
+     */
+    function verify($message, $signature)
+    {
+        if (empty($this->modulus) || empty($this->exponent)) {
+            return false;
+        }
+
+        switch ($this->signatureMode) {
+            case self::SIGNATURE_PKCS1:
+                return $this->_rsassa_pkcs1_v1_5_verify($message, $signature);
+            //case self::SIGNATURE_PSS:
+            default:
+                return $this->_rsassa_pss_verify($message, $signature);
+        }
+    }
+
+    /**
+     * Extract raw BER from Base64 encoding
+     *
+     * @access private
+     * @param string $str
+     * @return string
+     */
+    function _extractBER($str)
+    {
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#-+[^-]+-+#', '', $temp);
+        // remove new lines
+        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
+    }
+}
diff --git a/build/phpseclib/Crypt/Random.php b/build/phpseclib/Crypt/Random.php
new file mode 100644
index 000000000..8f53eb319
--- /dev/null
+++ b/build/phpseclib/Crypt/Random.php
@@ -0,0 +1,277 @@
+<?php
+
+/**
+ * Random Number Generator
+ *
+ * PHP version 5
+ *
+ * Here's a short example of how to use this library:
+ * <code>
+ * <?php
+ *    include 'vendor/autoload.php';
+ *
+ *    echo bin2hex(\phpseclib\Crypt\Random::string(8));
+ * ?>
+ * </code>
+ *
+ * @category  Crypt
+ * @package   Random
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2007 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\Crypt;
+
+/**
+ * Pure-PHP Random Number Generator
+ *
+ * @package Random
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class Random
+{
+    /**
+     * Generate a random string.
+     *
+     * Although microoptimizations are generally discouraged as they impair readability this function is ripe with
+     * microoptimizations because this function has the potential of being called a huge number of times.
+     * eg. for RSA key generation.
+     *
+     * @param int $length
+     * @return string
+     */
+    static function string($length)
+    {
+        if (!$length) {
+            return '';
+        }
+
+        if (version_compare(PHP_VERSION, '7.0.0', '>=')) {
+            try {
+                return \random_bytes($length);
+            } catch (\Throwable $e) {
+                // If a sufficient source of randomness is unavailable, random_bytes() will throw an
+                // object that implements the Throwable interface (Exception, TypeError, Error).
+                // We don't actually need to do anything here. The string() method should just continue
+                // as normal. Note, however, that if we don't have a sufficient source of randomness for
+                // random_bytes(), most of the other calls here will fail too, so we'll end up using
+                // the PHP implementation.
+            }
+        }
+
+        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
+            // method 1. prior to PHP 5.3 this would call rand() on windows hence the function_exists('class_alias') call.
+            // ie. class_alias is a function that was introduced in PHP 5.3
+            if (extension_loaded('mcrypt') && function_exists('class_alias')) {
+                return @mcrypt_create_iv($length);
+            }
+            // method 2. openssl_random_pseudo_bytes was introduced in PHP 5.3.0 but prior to PHP 5.3.4 there was,
+            // to quote <http://php.net/ChangeLog-5.php#5.3.4>, "possible blocking behavior". as of 5.3.4
+            // openssl_random_pseudo_bytes and mcrypt_create_iv do the exact same thing on Windows. ie. they both
+            // call php_win32_get_random_bytes():
+            //
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/openssl/openssl.c#L5008
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1392
+            //
+            // php_win32_get_random_bytes() is defined thusly:
+            //
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/win32/winutil.c#L80
+            //
+            // we're calling it, all the same, in the off chance that the mcrypt extension is not available
+            if (extension_loaded('openssl') && version_compare(PHP_VERSION, '5.3.4', '>=')) {
+                return openssl_random_pseudo_bytes($length);
+            }
+        } else {
+            // method 1. the fastest
+            if (extension_loaded('openssl')) {
+                return openssl_random_pseudo_bytes($length);
+            }
+            // method 2
+            static $fp = true;
+            if ($fp === true) {
+                // warning's will be output unles the error suppression operator is used. errors such as
+                // "open_basedir restriction in effect", "Permission denied", "No such file or directory", etc.
+                $fp = @fopen('/dev/urandom', 'rb');
+            }
+            if ($fp !== true && $fp !== false) { // surprisingly faster than !is_bool() or is_resource()
+                $temp = fread($fp, $length);
+                if (strlen($temp) == $length) {
+                    return $temp;
+                }
+            }
+            // method 3. pretty much does the same thing as method 2 per the following url:
+            // https://github.com/php/php-src/blob/7014a0eb6d1611151a286c0ff4f2238f92c120d6/ext/mcrypt/mcrypt.c#L1391
+            // surprisingly slower than method 2. maybe that's because mcrypt_create_iv does a bunch of error checking that we're
+            // not doing. regardless, this'll only be called if this PHP script couldn't open /dev/urandom due to open_basedir
+            // restrictions or some such
+            if (extension_loaded('mcrypt')) {
+                return @mcrypt_create_iv($length, MCRYPT_DEV_URANDOM);
+            }
+        }
+        // at this point we have no choice but to use a pure-PHP CSPRNG
+
+        // cascade entropy across multiple PHP instances by fixing the session and collecting all
+        // environmental variables, including the previous session data and the current session
+        // data.
+        //
+        // mt_rand seeds itself by looking at the PID and the time, both of which are (relatively)
+        // easy to guess at. linux uses mouse clicks, keyboard timings, etc, as entropy sources, but
+        // PHP isn't low level to be able to use those as sources and on a web server there's not likely
+        // going to be a ton of keyboard or mouse action. web servers do have one thing that we can use
+        // however, a ton of people visiting the website. obviously you don't want to base your seeding
+        // soley on parameters a potential attacker sends but (1) not everything in $_SERVER is controlled
+        // by the user and (2) this isn't just looking at the data sent by the current user - it's based
+        // on the data sent by all users. one user requests the page and a hash of their info is saved.
+        // another user visits the page and the serialization of their data is utilized along with the
+        // server envirnment stuff and a hash of the previous http request data (which itself utilizes
+        // a hash of the session data before that). certainly an attacker should be assumed to have
+        // full control over his own http requests. he, however, is not going to have control over
+        // everyone's http requests.
+        static $crypto = false, $v;
+        if ($crypto === false) {
+            // save old session data
+            $old_session_id = session_id();
+            $old_use_cookies = ini_get('session.use_cookies');
+            $old_session_cache_limiter = session_cache_limiter();
+            $_OLD_SESSION = isset($_SESSION) ? $_SESSION : false;
+            if ($old_session_id != '') {
+                session_write_close();
+            }
+
+            session_id(1);
+            ini_set('session.use_cookies', 0);
+            session_cache_limiter('');
+            session_start();
+
+            $v = $seed = $_SESSION['seed'] = pack('H*', sha1(
+                (isset($_SERVER) ? phpseclib_safe_serialize($_SERVER) : '') .
+                (isset($_POST) ? phpseclib_safe_serialize($_POST) : '') .
+                (isset($_GET) ? phpseclib_safe_serialize($_GET) : '') .
+                (isset($_COOKIE) ? phpseclib_safe_serialize($_COOKIE) : '') .
+                phpseclib_safe_serialize($GLOBALS) .
+                phpseclib_safe_serialize($_SESSION) .
+                phpseclib_safe_serialize($_OLD_SESSION)
+            ));
+            if (!isset($_SESSION['count'])) {
+                $_SESSION['count'] = 0;
+            }
+            $_SESSION['count']++;
+
+            session_write_close();
+
+            // restore old session data
+            if ($old_session_id != '') {
+                session_id($old_session_id);
+                session_start();
+                ini_set('session.use_cookies', $old_use_cookies);
+                session_cache_limiter($old_session_cache_limiter);
+            } else {
+                if ($_OLD_SESSION !== false) {
+                    $_SESSION = $_OLD_SESSION;
+                    unset($_OLD_SESSION);
+                } else {
+                    unset($_SESSION);
+                }
+            }
+
+            // in SSH2 a shared secret and an exchange hash are generated through the key exchange process.
+            // the IV client to server is the hash of that "nonce" with the letter A and for the encryption key it's the letter C.
+            // if the hash doesn't produce enough a key or an IV that's long enough concat successive hashes of the
+            // original hash and the current hash. we'll be emulating that. for more info see the following URL:
+            //
+            // http://tools.ietf.org/html/rfc4253#section-7.2
+            //
+            // see the is_string($crypto) part for an example of how to expand the keys
+            $key = pack('H*', sha1($seed . 'A'));
+            $iv = pack('H*', sha1($seed . 'C'));
+
+            // ciphers are used as per the nist.gov link below. also, see this link:
+            //
+            // http://en.wikipedia.org/wiki/Cryptographically_secure_pseudorandom_number_generator#Designs_based_on_cryptographic_primitives
+            switch (true) {
+                case class_exists('\phpseclib\Crypt\AES'):
+                    $crypto = new AES(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\Twofish'):
+                    $crypto = new Twofish(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\Blowfish'):
+                    $crypto = new Blowfish(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\TripleDES'):
+                    $crypto = new TripleDES(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\DES'):
+                    $crypto = new DES(Base::MODE_CTR);
+                    break;
+                case class_exists('\phpseclib\Crypt\RC4'):
+                    $crypto = new RC4();
+                    break;
+                default:
+                    user_error(__CLASS__ . ' requires at least one symmetric cipher be loaded');
+                    return false;
+            }
+
+            $crypto->setKey($key);
+            $crypto->setIV($iv);
+            $crypto->enableContinuousBuffer();
+        }
+
+        //return $crypto->encrypt(str_repeat("\0", $length));
+
+        // the following is based off of ANSI X9.31:
+        //
+        // http://csrc.nist.gov/groups/STM/cavp/documents/rng/931rngext.pdf
+        //
+        // OpenSSL uses that same standard for it's random numbers:
+        //
+        // http://www.opensource.apple.com/source/OpenSSL/OpenSSL-38/openssl/fips-1.0/rand/fips_rand.c
+        // (do a search for "ANS X9.31 A.2.4")
+        $result = '';
+        while (strlen($result) < $length) {
+            $i = $crypto->encrypt(microtime()); // strlen(microtime()) == 21
+            $r = $crypto->encrypt($i ^ $v); // strlen($v) == 20
+            $v = $crypto->encrypt($r ^ $i); // strlen($r) == 20
+            $result.= $r;
+        }
+        return substr($result, 0, $length);
+    }
+}
+
+if (!function_exists('phpseclib_safe_serialize')) {
+    /**
+     * Safely serialize variables
+     *
+     * If a class has a private __sleep() method it'll give a fatal error on PHP 5.2 and earlier.
+     * PHP 5.3 will emit a warning.
+     *
+     * @param mixed $arr
+     * @access public
+     */
+    function phpseclib_safe_serialize(&$arr)
+    {
+        if (is_object($arr)) {
+            return '';
+        }
+        if (!is_array($arr)) {
+            return serialize($arr);
+        }
+        // prevent circular array recursion
+        if (isset($arr['__phpseclib_marker'])) {
+            return '';
+        }
+        $safearr = array();
+        $arr['__phpseclib_marker'] = true;
+        foreach (array_keys($arr) as $key) {
+            // do not recurse on the '__phpseclib_marker' key itself, for smaller memory usage
+            if ($key !== '__phpseclib_marker') {
+                $safearr[$key] = phpseclib_safe_serialize($arr[$key]);
+            }
+        }
+        unset($arr['__phpseclib_marker']);
+        return serialize($safearr);
+    }
+}
diff --git a/build/phpseclib/File/ANSI.php b/build/phpseclib/File/ANSI.php
new file mode 100644
index 000000000..b6874d357
--- /dev/null
+++ b/build/phpseclib/File/ANSI.php
@@ -0,0 +1,577 @@
+<?php
+
+/**
+ * Pure-PHP ANSI Decoder
+ *
+ * PHP version 5
+ *
+ * If you call read() in \phpseclib\Net\SSH2 you may get {@link http://en.wikipedia.org/wiki/ANSI_escape_code ANSI escape codes} back.
+ * They'd look like chr(0x1B) . '[00m' or whatever (0x1B = ESC).  They tell a
+ * {@link http://en.wikipedia.org/wiki/Terminal_emulator terminal emulator} how to format the characters, what
+ * color to display them in, etc. \phpseclib\File\ANSI is a {@link http://en.wikipedia.org/wiki/VT100 VT100} terminal emulator.
+ *
+ * @category  File
+ * @package   ANSI
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2012 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\File;
+
+/**
+ * Pure-PHP ANSI Decoder
+ *
+ * @package ANSI
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class ANSI
+{
+    /**
+     * Max Width
+     *
+     * @var int
+     * @access private
+     */
+    var $max_x;
+
+    /**
+     * Max Height
+     *
+     * @var int
+     * @access private
+     */
+    var $max_y;
+
+    /**
+     * Max History
+     *
+     * @var int
+     * @access private
+     */
+    var $max_history;
+
+    /**
+     * History
+     *
+     * @var array
+     * @access private
+     */
+    var $history;
+
+    /**
+     * History Attributes
+     *
+     * @var array
+     * @access private
+     */
+    var $history_attrs;
+
+    /**
+     * Current Column
+     *
+     * @var int
+     * @access private
+     */
+    var $x;
+
+    /**
+     * Current Row
+     *
+     * @var int
+     * @access private
+     */
+    var $y;
+
+    /**
+     * Old Column
+     *
+     * @var int
+     * @access private
+     */
+    var $old_x;
+
+    /**
+     * Old Row
+     *
+     * @var int
+     * @access private
+     */
+    var $old_y;
+
+    /**
+     * An empty attribute cell
+     *
+     * @var object
+     * @access private
+     */
+    var $base_attr_cell;
+
+    /**
+     * The current attribute cell
+     *
+     * @var object
+     * @access private
+     */
+    var $attr_cell;
+
+    /**
+     * An empty attribute row
+     *
+     * @var array
+     * @access private
+     */
+    var $attr_row;
+
+    /**
+     * The current screen text
+     *
+     * @var array
+     * @access private
+     */
+    var $screen;
+
+    /**
+     * The current screen attributes
+     *
+     * @var array
+     * @access private
+     */
+    var $attrs;
+
+    /**
+     * Current ANSI code
+     *
+     * @var string
+     * @access private
+     */
+    var $ansi;
+
+    /**
+     * Tokenization
+     *
+     * @var array
+     * @access private
+     */
+    var $tokenization;
+
+    /**
+     * Default Constructor.
+     *
+     * @return \phpseclib\File\ANSI
+     * @access public
+     */
+    function __construct()
+    {
+        $attr_cell = new \stdClass();
+        $attr_cell->bold = false;
+        $attr_cell->underline = false;
+        $attr_cell->blink = false;
+        $attr_cell->background = 'black';
+        $attr_cell->foreground = 'white';
+        $attr_cell->reverse = false;
+        $this->base_attr_cell = clone $attr_cell;
+        $this->attr_cell = clone $attr_cell;
+
+        $this->setHistory(200);
+        $this->setDimensions(80, 24);
+    }
+
+    /**
+     * Set terminal width and height
+     *
+     * Resets the screen as well
+     *
+     * @param int $x
+     * @param int $y
+     * @access public
+     */
+    function setDimensions($x, $y)
+    {
+        $this->max_x = $x - 1;
+        $this->max_y = $y - 1;
+        $this->x = $this->y = 0;
+        $this->history = $this->history_attrs = array();
+        $this->attr_row = array_fill(0, $this->max_x + 2, $this->base_attr_cell);
+        $this->screen = array_fill(0, $this->max_y + 1, '');
+        $this->attrs = array_fill(0, $this->max_y + 1, $this->attr_row);
+        $this->ansi = '';
+    }
+
+    /**
+     * Set the number of lines that should be logged past the terminal height
+     *
+     * @param int $history
+     * @access public
+     */
+    function setHistory($history)
+    {
+        $this->max_history = $history;
+    }
+
+    /**
+     * Load a string
+     *
+     * @param string $source
+     * @access public
+     */
+    function loadString($source)
+    {
+        $this->setDimensions($this->max_x + 1, $this->max_y + 1);
+        $this->appendString($source);
+    }
+
+    /**
+     * Appdend a string
+     *
+     * @param string $source
+     * @access public
+     */
+    function appendString($source)
+    {
+        $this->tokenization = array('');
+        for ($i = 0; $i < strlen($source); $i++) {
+            if (strlen($this->ansi)) {
+                $this->ansi.= $source[$i];
+                $chr = ord($source[$i]);
+                // http://en.wikipedia.org/wiki/ANSI_escape_code#Sequence_elements
+                // single character CSI's not currently supported
+                switch (true) {
+                    case $this->ansi == "\x1B=":
+                        $this->ansi = '';
+                        continue 2;
+                    case strlen($this->ansi) == 2 && $chr >= 64 && $chr <= 95 && $chr != ord('['):
+                    case strlen($this->ansi) > 2 && $chr >= 64 && $chr <= 126:
+                        break;
+                    default:
+                        continue 2;
+                }
+                $this->tokenization[] = $this->ansi;
+                $this->tokenization[] = '';
+                // http://ascii-table.com/ansi-escape-sequences-vt-100.php
+                switch ($this->ansi) {
+                    case "\x1B[H": // Move cursor to upper left corner
+                        $this->old_x = $this->x;
+                        $this->old_y = $this->y;
+                        $this->x = $this->y = 0;
+                        break;
+                    case "\x1B[J": // Clear screen from cursor down
+                        $this->history = array_merge($this->history, array_slice(array_splice($this->screen, $this->y + 1), 0, $this->old_y));
+                        $this->screen = array_merge($this->screen, array_fill($this->y, $this->max_y, ''));
+
+                        $this->history_attrs = array_merge($this->history_attrs, array_slice(array_splice($this->attrs, $this->y + 1), 0, $this->old_y));
+                        $this->attrs = array_merge($this->attrs, array_fill($this->y, $this->max_y, $this->attr_row));
+
+                        if (count($this->history) == $this->max_history) {
+                            array_shift($this->history);
+                            array_shift($this->history_attrs);
+                        }
+                    case "\x1B[K": // Clear screen from cursor right
+                        $this->screen[$this->y] = substr($this->screen[$this->y], 0, $this->x);
+
+                        array_splice($this->attrs[$this->y], $this->x + 1, $this->max_x - $this->x, array_fill($this->x, $this->max_x - ($this->x - 1), $this->base_attr_cell));
+                        break;
+                    case "\x1B[2K": // Clear entire line
+                        $this->screen[$this->y] = str_repeat(' ', $this->x);
+                        $this->attrs[$this->y] = $this->attr_row;
+                        break;
+                    case "\x1B[?1h": // set cursor key to application
+                    case "\x1B[?25h": // show the cursor
+                    case "\x1B(B": // set united states g0 character set
+                        break;
+                    case "\x1BE": // Move to next line
+                        $this->_newLine();
+                        $this->x = 0;
+                        break;
+                    default:
+                        switch (true) {
+                            case preg_match('#\x1B\[(\d+)B#', $this->ansi, $match): // Move cursor down n lines
+                                $this->old_y = $this->y;
+                                $this->y+= $match[1];
+                                break;
+                            case preg_match('#\x1B\[(\d+);(\d+)H#', $this->ansi, $match): // Move cursor to screen location v,h
+                                $this->old_x = $this->x;
+                                $this->old_y = $this->y;
+                                $this->x = $match[2] - 1;
+                                $this->y = $match[1] - 1;
+                                break;
+                            case preg_match('#\x1B\[(\d+)C#', $this->ansi, $match): // Move cursor right n lines
+                                $this->old_x = $this->x;
+                                $this->x+= $match[1];
+                                break;
+                            case preg_match('#\x1B\[(\d+)D#', $this->ansi, $match): // Move cursor left n lines
+                                $this->old_x = $this->x;
+                                $this->x-= $match[1];
+                                if ($this->x < 0) {
+                                    $this->x = 0;
+                                }
+                                break;
+                            case preg_match('#\x1B\[(\d+);(\d+)r#', $this->ansi, $match): // Set top and bottom lines of a window
+                                break;
+                            case preg_match('#\x1B\[(\d*(?:;\d*)*)m#', $this->ansi, $match): // character attributes
+                                $attr_cell = &$this->attr_cell;
+                                $mods = explode(';', $match[1]);
+                                foreach ($mods as $mod) {
+                                    switch ($mod) {
+                                        case '':
+                                        case '0': // Turn off character attributes
+                                            $attr_cell = clone $this->base_attr_cell;
+                                            break;
+                                        case '1': // Turn bold mode on
+                                            $attr_cell->bold = true;
+                                            break;
+                                        case '4': // Turn underline mode on
+                                            $attr_cell->underline = true;
+                                            break;
+                                        case '5': // Turn blinking mode on
+                                            $attr_cell->blink = true;
+                                            break;
+                                        case '7': // Turn reverse video on
+                                            $attr_cell->reverse = !$attr_cell->reverse;
+                                            $temp = $attr_cell->background;
+                                            $attr_cell->background = $attr_cell->foreground;
+                                            $attr_cell->foreground = $temp;
+                                            break;
+                                        default: // set colors
+                                            //$front = $attr_cell->reverse ? &$attr_cell->background : &$attr_cell->foreground;
+                                            $front = &$attr_cell->{ $attr_cell->reverse ? 'background' : 'foreground' };
+                                            //$back = $attr_cell->reverse ? &$attr_cell->foreground : &$attr_cell->background;
+                                            $back = &$attr_cell->{ $attr_cell->reverse ? 'foreground' : 'background' };
+                                            switch ($mod) {
+                                                // @codingStandardsIgnoreStart
+                                                case '30': $front = 'black'; break;
+                                                case '31': $front = 'red'; break;
+                                                case '32': $front = 'green'; break;
+                                                case '33': $front = 'yellow'; break;
+                                                case '34': $front = 'blue'; break;
+                                                case '35': $front = 'magenta'; break;
+                                                case '36': $front = 'cyan'; break;
+                                                case '37': $front = 'white'; break;
+
+                                                case '40': $back = 'black'; break;
+                                                case '41': $back = 'red'; break;
+                                                case '42': $back = 'green'; break;
+                                                case '43': $back = 'yellow'; break;
+                                                case '44': $back = 'blue'; break;
+                                                case '45': $back = 'magenta'; break;
+                                                case '46': $back = 'cyan'; break;
+                                                case '47': $back = 'white'; break;
+                                                // @codingStandardsIgnoreEnd
+
+                                                default:
+                                                    //user_error('Unsupported attribute: ' . $mod);
+                                                    $this->ansi = '';
+                                                    break 2;
+                                            }
+                                    }
+                                }
+                                break;
+                            default:
+                                //user_error("{$this->ansi} is unsupported\r\n");
+                        }
+                }
+                $this->ansi = '';
+                continue;
+            }
+
+            $this->tokenization[count($this->tokenization) - 1].= $source[$i];
+            switch ($source[$i]) {
+                case "\r":
+                    $this->x = 0;
+                    break;
+                case "\n":
+                    $this->_newLine();
+                    break;
+                case "\x08": // backspace
+                    if ($this->x) {
+                        $this->x--;
+                        $this->attrs[$this->y][$this->x] = clone $this->base_attr_cell;
+                        $this->screen[$this->y] = substr_replace(
+                            $this->screen[$this->y],
+                            $source[$i],
+                            $this->x,
+                            1
+                        );
+                    }
+                    break;
+                case "\x0F": // shift
+                    break;
+                case "\x1B": // start ANSI escape code
+                    $this->tokenization[count($this->tokenization) - 1] = substr($this->tokenization[count($this->tokenization) - 1], 0, -1);
+                    //if (!strlen($this->tokenization[count($this->tokenization) - 1])) {
+                    //    array_pop($this->tokenization);
+                    //}
+                    $this->ansi.= "\x1B";
+                    break;
+                default:
+                    $this->attrs[$this->y][$this->x] = clone $this->attr_cell;
+                    if ($this->x > strlen($this->screen[$this->y])) {
+                        $this->screen[$this->y] = str_repeat(' ', $this->x);
+                    }
+                    $this->screen[$this->y] = substr_replace(
+                        $this->screen[$this->y],
+                        $source[$i],
+                        $this->x,
+                        1
+                    );
+
+                    if ($this->x > $this->max_x) {
+                        $this->x = 0;
+                        $this->_newLine();
+                    } else {
+                        $this->x++;
+                    }
+            }
+        }
+    }
+
+    /**
+     * Add a new line
+     *
+     * Also update the $this->screen and $this->history buffers
+     *
+     * @access private
+     */
+    function _newLine()
+    {
+        //if ($this->y < $this->max_y) {
+        //    $this->y++;
+        //}
+
+        while ($this->y >= $this->max_y) {
+            $this->history = array_merge($this->history, array(array_shift($this->screen)));
+            $this->screen[] = '';
+
+            $this->history_attrs = array_merge($this->history_attrs, array(array_shift($this->attrs)));
+            $this->attrs[] = $this->attr_row;
+
+            if (count($this->history) >= $this->max_history) {
+                array_shift($this->history);
+                array_shift($this->history_attrs);
+            }
+
+            $this->y--;
+        }
+        $this->y++;
+    }
+
+    /**
+     * Returns the current coordinate without preformating
+     *
+     * @access private
+     * @return string
+     */
+    function _processCoordinate($last_attr, $cur_attr, $char)
+    {
+        $output = '';
+
+        if ($last_attr != $cur_attr) {
+            $close = $open = '';
+            if ($last_attr->foreground != $cur_attr->foreground) {
+                if ($cur_attr->foreground != 'white') {
+                    $open.= '<span style="color: ' . $cur_attr->foreground . '">';
+                }
+                if ($last_attr->foreground != 'white') {
+                    $close = '</span>' . $close;
+                }
+            }
+            if ($last_attr->background != $cur_attr->background) {
+                if ($cur_attr->background != 'black') {
+                    $open.= '<span style="background: ' . $cur_attr->background . '">';
+                }
+                if ($last_attr->background != 'black') {
+                    $close = '</span>' . $close;
+                }
+            }
+            if ($last_attr->bold != $cur_attr->bold) {
+                if ($cur_attr->bold) {
+                    $open.= '<b>';
+                } else {
+                    $close = '</b>' . $close;
+                }
+            }
+            if ($last_attr->underline != $cur_attr->underline) {
+                if ($cur_attr->underline) {
+                    $open.= '<u>';
+                } else {
+                    $close = '</u>' . $close;
+                }
+            }
+            if ($last_attr->blink != $cur_attr->blink) {
+                if ($cur_attr->blink) {
+                    $open.= '<blink>';
+                } else {
+                    $close = '</blink>' . $close;
+                }
+            }
+            $output.= $close . $open;
+        }
+
+        $output.= htmlspecialchars($char);
+
+        return $output;
+    }
+
+    /**
+     * Returns the current screen without preformating
+     *
+     * @access private
+     * @return string
+     */
+    function _getScreen()
+    {
+        $output = '';
+        $last_attr = $this->base_attr_cell;
+        for ($i = 0; $i <= $this->max_y; $i++) {
+            for ($j = 0; $j <= $this->max_x; $j++) {
+                $cur_attr = $this->attrs[$i][$j];
+                $output.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->screen[$i][$j]) ? $this->screen[$i][$j] : '');
+                $last_attr = $this->attrs[$i][$j];
+            }
+            $output.= "\r\n";
+        }
+        $output = substr($output, 0, -2);
+        // close any remaining open tags
+        $output.= $this->_processCoordinate($last_attr, $this->base_attr_cell, '');
+        return rtrim($output);
+    }
+
+    /**
+     * Returns the current screen
+     *
+     * @access public
+     * @return string
+     */
+    function getScreen()
+    {
+        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $this->_getScreen() . '</pre>';
+    }
+
+    /**
+     * Returns the current screen and the x previous lines
+     *
+     * @access public
+     * @return string
+     */
+    function getHistory()
+    {
+        $scrollback = '';
+        $last_attr = $this->base_attr_cell;
+        for ($i = 0; $i < count($this->history); $i++) {
+            for ($j = 0; $j <= $this->max_x + 1; $j++) {
+                $cur_attr = $this->history_attrs[$i][$j];
+                $scrollback.= $this->_processCoordinate($last_attr, $cur_attr, isset($this->history[$i][$j]) ? $this->history[$i][$j] : '');
+                $last_attr = $this->history_attrs[$i][$j];
+            }
+            $scrollback.= "\r\n";
+        }
+        $base_attr_cell = $this->base_attr_cell;
+        $this->base_attr_cell = $last_attr;
+        $scrollback.= $this->_getScreen();
+        $this->base_attr_cell = $base_attr_cell;
+
+        return '<pre width="' . ($this->max_x + 1) . '" style="color: white; background: black">' . $scrollback . '</span></pre>';
+    }
+}
diff --git a/build/phpseclib/File/ASN1.php b/build/phpseclib/File/ASN1.php
new file mode 100644
index 000000000..d1a7719f8
--- /dev/null
+++ b/build/phpseclib/File/ASN1.php
@@ -0,0 +1,1450 @@
+<?php
+
+/**
+ * Pure-PHP ASN.1 Parser
+ *
+ * PHP version 5
+ *
+ * ASN.1 provides the semantics for data encoded using various schemes.  The most commonly
+ * utilized scheme is DER or the "Distinguished Encoding Rules".  PEM's are base64 encoded
+ * DER blobs.
+ *
+ * \phpseclib\File\ASN1 decodes and encodes DER formatted messages and places them in a semantic context.
+ *
+ * Uses the 1988 ASN.1 syntax.
+ *
+ * @category  File
+ * @package   ASN1
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2012 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\File;
+
+use phpseclib\File\ASN1\Element;
+use phpseclib\Math\BigInteger;
+use DateTime;
+use DateTimeZone;
+
+/**
+ * Pure-PHP ASN.1 Parser
+ *
+ * @package ASN1
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class ASN1
+{
+    /**#@+
+     * Tag Classes
+     *
+     * @access private
+     * @link http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=12
+     */
+    const CLASS_UNIVERSAL        = 0;
+    const CLASS_APPLICATION      = 1;
+    const CLASS_CONTEXT_SPECIFIC = 2;
+    const CLASS_PRIVATE          = 3;
+    /**#@-*/
+
+    /**#@+
+     * Tag Classes
+     *
+     * @access private
+     * @link http://www.obj-sys.com/asn1tutorial/node124.html
+    */
+    const TYPE_BOOLEAN           = 1;
+    const TYPE_INTEGER           = 2;
+    const TYPE_BIT_STRING        = 3;
+    const TYPE_OCTET_STRING      = 4;
+    const TYPE_NULL              = 5;
+    const TYPE_OBJECT_IDENTIFIER = 6;
+    //const TYPE_OBJECT_DESCRIPTOR = 7;
+    //const TYPE_INSTANCE_OF       = 8; // EXTERNAL
+    const TYPE_REAL              = 9;
+    const TYPE_ENUMERATED        = 10;
+    //const TYPE_EMBEDDED          = 11;
+    const TYPE_UTF8_STRING       = 12;
+    //const TYPE_RELATIVE_OID      = 13;
+    const TYPE_SEQUENCE          = 16; // SEQUENCE OF
+    const TYPE_SET               = 17; // SET OF
+    /**#@-*/
+    /**#@+
+     * More Tag Classes
+     *
+     * @access private
+     * @link http://www.obj-sys.com/asn1tutorial/node10.html
+    */
+    const TYPE_NUMERIC_STRING   = 18;
+    const TYPE_PRINTABLE_STRING = 19;
+    const TYPE_TELETEX_STRING   = 20; // T61String
+    const TYPE_VIDEOTEX_STRING  = 21;
+    const TYPE_IA5_STRING       = 22;
+    const TYPE_UTC_TIME         = 23;
+    const TYPE_GENERALIZED_TIME = 24;
+    const TYPE_GRAPHIC_STRING   = 25;
+    const TYPE_VISIBLE_STRING   = 26; // ISO646String
+    const TYPE_GENERAL_STRING   = 27;
+    const TYPE_UNIVERSAL_STRING = 28;
+    //const TYPE_CHARACTER_STRING = 29;
+    const TYPE_BMP_STRING       = 30;
+    /**#@-*/
+
+    /**#@+
+     * Tag Aliases
+     *
+     * These tags are kinda place holders for other tags.
+     *
+     * @access private
+    */
+    const TYPE_CHOICE = -1;
+    const TYPE_ANY    = -2;
+    /**#@-*/
+
+    /**
+     * ASN.1 object identifier
+     *
+     * @var array
+     * @access private
+     * @link http://en.wikipedia.org/wiki/Object_identifier
+     */
+    var $oids = array();
+
+    /**
+     * Default date format
+     *
+     * @var string
+     * @access private
+     * @link http://php.net/class.datetime
+     */
+    var $format = 'D, d M Y H:i:s O';
+
+    /**
+     * Default date format
+     *
+     * @var array
+     * @access private
+     * @see self::setTimeFormat()
+     * @see self::asn1map()
+     * @link http://php.net/class.datetime
+     */
+    var $encoded;
+
+    /**
+     * Filters
+     *
+     * If the mapping type is self::TYPE_ANY what do we actually encode it as?
+     *
+     * @var array
+     * @access private
+     * @see self::_encode_der()
+     */
+    var $filters;
+
+    /**
+     * Type mapping table for the ANY type.
+     *
+     * Structured or unknown types are mapped to a \phpseclib\File\ASN1\Element.
+     * Unambiguous types get the direct mapping (int/real/bool).
+     * Others are mapped as a choice, with an extra indexing level.
+     *
+     * @var array
+     * @access public
+     */
+    var $ANYmap = array(
+        self::TYPE_BOOLEAN              => true,
+        self::TYPE_INTEGER              => true,
+        self::TYPE_BIT_STRING           => 'bitString',
+        self::TYPE_OCTET_STRING         => 'octetString',
+        self::TYPE_NULL                 => 'null',
+        self::TYPE_OBJECT_IDENTIFIER    => 'objectIdentifier',
+        self::TYPE_REAL                 => true,
+        self::TYPE_ENUMERATED           => 'enumerated',
+        self::TYPE_UTF8_STRING          => 'utf8String',
+        self::TYPE_NUMERIC_STRING       => 'numericString',
+        self::TYPE_PRINTABLE_STRING     => 'printableString',
+        self::TYPE_TELETEX_STRING       => 'teletexString',
+        self::TYPE_VIDEOTEX_STRING      => 'videotexString',
+        self::TYPE_IA5_STRING           => 'ia5String',
+        self::TYPE_UTC_TIME             => 'utcTime',
+        self::TYPE_GENERALIZED_TIME     => 'generalTime',
+        self::TYPE_GRAPHIC_STRING       => 'graphicString',
+        self::TYPE_VISIBLE_STRING       => 'visibleString',
+        self::TYPE_GENERAL_STRING       => 'generalString',
+        self::TYPE_UNIVERSAL_STRING     => 'universalString',
+        //self::TYPE_CHARACTER_STRING     => 'characterString',
+        self::TYPE_BMP_STRING           => 'bmpString'
+    );
+
+    /**
+     * String type to character size mapping table.
+     *
+     * Non-convertable types are absent from this table.
+     * size == 0 indicates variable length encoding.
+     *
+     * @var array
+     * @access public
+     */
+    var $stringTypeSize = array(
+        self::TYPE_UTF8_STRING      => 0,
+        self::TYPE_BMP_STRING       => 2,
+        self::TYPE_UNIVERSAL_STRING => 4,
+        self::TYPE_PRINTABLE_STRING => 1,
+        self::TYPE_TELETEX_STRING   => 1,
+        self::TYPE_IA5_STRING       => 1,
+        self::TYPE_VISIBLE_STRING   => 1,
+    );
+
+    /**
+     * Parse BER-encoding
+     *
+     * Serves a similar purpose to openssl's asn1parse
+     *
+     * @param string $encoded
+     * @return array
+     * @access public
+     */
+    function decodeBER($encoded)
+    {
+        if ($encoded instanceof Element) {
+            $encoded = $encoded->element;
+        }
+
+        $this->encoded = $encoded;
+        // encapsulate in an array for BC with the old decodeBER
+        return array($this->_decode_ber($encoded));
+    }
+
+    /**
+     * Parse BER-encoding (Helper function)
+     *
+     * Sometimes we want to get the BER encoding of a particular tag.  $start lets us do that without having to reencode.
+     * $encoded is passed by reference for the recursive calls done for self::TYPE_BIT_STRING and
+     * self::TYPE_OCTET_STRING. In those cases, the indefinite length is used.
+     *
+     * @param string $encoded
+     * @param int $start
+     * @param int $encoded_pos
+     * @return array
+     * @access private
+     */
+    function _decode_ber($encoded, $start = 0, $encoded_pos = 0)
+    {
+        $current = array('start' => $start);
+
+        $type = ord($encoded[$encoded_pos++]);
+        $startOffset = 1;
+
+        $constructed = ($type >> 5) & 1;
+
+        $tag = $type & 0x1F;
+        if ($tag == 0x1F) {
+            $tag = 0;
+            // process septets (since the eighth bit is ignored, it's not an octet)
+            do {
+                $temp = ord($encoded[$encoded_pos++]);
+                $startOffset++;
+                $loop = $temp >> 7;
+                $tag <<= 7;
+                $temp &= 0x7F;
+                // "bits 7 to 1 of the first subsequent octet shall not all be zero"
+                if ($startOffset == 2 && $temp == 0) {
+                    return false;
+                }
+                $tag |= $temp;
+            } while ($loop);
+        }
+
+        $start+= $startOffset;
+
+        // Length, as discussed in paragraph 8.1.3 of X.690-0207.pdf#page=13
+        $length = ord($encoded[$encoded_pos++]);
+        $start++;
+        if ($length == 0x80) { // indefinite length
+            // "[A sender shall] use the indefinite form (see 8.1.3.6) if the encoding is constructed and is not all
+            //  immediately available." -- paragraph 8.1.3.2.c
+            $length = strlen($encoded) - $encoded_pos;
+        } elseif ($length & 0x80) { // definite length, long form
+            // technically, the long form of the length can be represented by up to 126 octets (bytes), but we'll only
+            // support it up to four.
+            $length&= 0x7F;
+            $temp = substr($encoded, $encoded_pos, $length);
+            $encoded_pos += $length;
+            // tags of indefinte length don't really have a header length; this length includes the tag
+            $current+= array('headerlength' => $length + 2);
+            $start+= $length;
+            extract(unpack('Nlength', substr(str_pad($temp, 4, chr(0), STR_PAD_LEFT), -4)));
+        } else {
+            $current+= array('headerlength' => 2);
+        }
+
+        if ($length > (strlen($encoded) - $encoded_pos)) {
+            return false;
+        }
+
+        $content = substr($encoded, $encoded_pos, $length);
+        $content_pos = 0;
+
+        // at this point $length can be overwritten. it's only accurate for definite length things as is
+
+        /* Class is UNIVERSAL, APPLICATION, PRIVATE, or CONTEXT-SPECIFIC. The UNIVERSAL class is restricted to the ASN.1
+           built-in types. It defines an application-independent data type that must be distinguishable from all other
+           data types. The other three classes are user defined. The APPLICATION class distinguishes data types that
+           have a wide, scattered use within a particular presentation context. PRIVATE distinguishes data types within
+           a particular organization or country. CONTEXT-SPECIFIC distinguishes members of a sequence or set, the
+           alternatives of a CHOICE, or universally tagged set members. Only the class number appears in braces for this
+           data type; the term CONTEXT-SPECIFIC does not appear.
+
+             -- http://www.obj-sys.com/asn1tutorial/node12.html */
+        $class = ($type >> 6) & 3;
+        switch ($class) {
+            case self::CLASS_APPLICATION:
+            case self::CLASS_PRIVATE:
+            case self::CLASS_CONTEXT_SPECIFIC:
+                if (!$constructed) {
+                    return array(
+                        'type'     => $class,
+                        'constant' => $tag,
+                        'content'  => $content,
+                        'length'   => $length + $start - $current['start']
+                    );
+                }
+
+                $newcontent = array();
+                $remainingLength = $length;
+                while ($remainingLength > 0) {
+                    $temp = $this->_decode_ber($content, $start, $content_pos);
+                    if ($temp === false) {
+                        break;
+                    }
+                    $length = $temp['length'];
+                    // end-of-content octets - see paragraph 8.1.5
+                    if (substr($content, $content_pos + $length, 2) == "\0\0") {
+                        $length+= 2;
+                        $start+= $length;
+                        $newcontent[] = $temp;
+                        break;
+                    }
+                    $start+= $length;
+                    $remainingLength-= $length;
+                    $newcontent[] = $temp;
+                    $content_pos += $length;
+                }
+
+                return array(
+                    'type'     => $class,
+                    'constant' => $tag,
+                    // the array encapsulation is for BC with the old format
+                    'content'  => $newcontent,
+                    // the only time when $content['headerlength'] isn't defined is when the length is indefinite.
+                    // the absence of $content['headerlength'] is how we know if something is indefinite or not.
+                    // technically, it could be defined to be 2 and then another indicator could be used but whatever.
+                    'length'   => $start - $current['start']
+                ) + $current;
+        }
+
+        $current+= array('type' => $tag);
+
+        // decode UNIVERSAL tags
+        switch ($tag) {
+            case self::TYPE_BOOLEAN:
+                // "The contents octets shall consist of a single octet." -- paragraph 8.2.1
+                if ($constructed || strlen($content) != 1) {
+                    return false;
+                }
+                $current['content'] = (bool) ord($content[$content_pos]);
+                break;
+            case self::TYPE_INTEGER:
+            case self::TYPE_ENUMERATED:
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = new BigInteger(substr($content, $content_pos), -256);
+                break;
+            case self::TYPE_REAL: // not currently supported
+                return false;
+            case self::TYPE_BIT_STRING:
+                // The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
+                // the number of unused bits in the final subsequent octet. The number shall be in the range zero to
+                // seven.
+                if (!$constructed) {
+                    $current['content'] = substr($content, $content_pos);
+                } else {
+                    $temp = $this->_decode_ber($content, $start, $content_pos);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $length-= (strlen($content) - $content_pos);
+                    $last = count($temp) - 1;
+                    for ($i = 0; $i < $last; $i++) {
+                        // all subtags should be bit strings
+                        if ($temp[$i]['type'] != self::TYPE_BIT_STRING) {
+                            return false;
+                        }
+                        $current['content'].= substr($temp[$i]['content'], 1);
+                    }
+                    // all subtags should be bit strings
+                    if ($temp[$last]['type'] != self::TYPE_BIT_STRING) {
+                        return false;
+                    }
+                    $current['content'] = $temp[$last]['content'][0] . $current['content'] . substr($temp[$i]['content'], 1);
+                }
+                break;
+            case self::TYPE_OCTET_STRING:
+                if (!$constructed) {
+                    $current['content'] = substr($content, $content_pos);
+                } else {
+                    $current['content'] = '';
+                    $length = 0;
+                    while (substr($content, $content_pos, 2) != "\0\0") {
+                        $temp = $this->_decode_ber($content, $length + $start, $content_pos);
+                        if ($temp === false) {
+                            return false;
+                        }
+                        $content_pos += $temp['length'];
+                        // all subtags should be octet strings
+                        if ($temp['type'] != self::TYPE_OCTET_STRING) {
+                            return false;
+                        }
+                        $current['content'].= $temp['content'];
+                        $length+= $temp['length'];
+                    }
+                    if (substr($content, $content_pos, 2) == "\0\0") {
+                        $length+= 2; // +2 for the EOC
+                    }
+                }
+                break;
+            case self::TYPE_NULL:
+                // "The contents octets shall not contain any octets." -- paragraph 8.8.2
+                if ($constructed || strlen($content)) {
+                    return false;
+                }
+                break;
+            case self::TYPE_SEQUENCE:
+            case self::TYPE_SET:
+                if (!$constructed) {
+                    return false;
+                }
+                $offset = 0;
+                $current['content'] = array();
+                $content_len = strlen($content);
+                while ($content_pos < $content_len) {
+                    // if indefinite length construction was used and we have an end-of-content string next
+                    // see paragraphs 8.1.1.3, 8.1.3.2, 8.1.3.6, 8.1.5, and (for an example) 8.6.4.2
+                    if (!isset($current['headerlength']) && substr($content, $content_pos, 2) == "\0\0") {
+                        $length = $offset + 2; // +2 for the EOC
+                        break 2;
+                    }
+                    $temp = $this->_decode_ber($content, $start + $offset, $content_pos);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $content_pos += $temp['length'];
+                    $current['content'][] = $temp;
+                    $offset+= $temp['length'];
+                }
+                break;
+            case self::TYPE_OBJECT_IDENTIFIER:
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = $this->_decodeOID(substr($content, $content_pos));
+                if ($current['content'] === false) {
+                    return false;
+                }
+                break;
+            /* Each character string type shall be encoded as if it had been declared:
+               [UNIVERSAL x] IMPLICIT OCTET STRING
+
+                 -- X.690-0207.pdf#page=23 (paragraph 8.21.3)
+
+               Per that, we're not going to do any validation.  If there are any illegal characters in the string,
+               we don't really care */
+            case self::TYPE_NUMERIC_STRING:
+                // 0,1,2,3,4,5,6,7,8,9, and space
+            case self::TYPE_PRINTABLE_STRING:
+                // Upper and lower case letters, digits, space, apostrophe, left/right parenthesis, plus sign, comma,
+                // hyphen, full stop, solidus, colon, equal sign, question mark
+            case self::TYPE_TELETEX_STRING:
+                // The Teletex character set in CCITT's T61, space, and delete
+                // see http://en.wikipedia.org/wiki/Teletex#Character_sets
+            case self::TYPE_VIDEOTEX_STRING:
+                // The Videotex character set in CCITT's T.100 and T.101, space, and delete
+            case self::TYPE_VISIBLE_STRING:
+                // Printing character sets of international ASCII, and space
+            case self::TYPE_IA5_STRING:
+                // International Alphabet 5 (International ASCII)
+            case self::TYPE_GRAPHIC_STRING:
+                // All registered G sets, and space
+            case self::TYPE_GENERAL_STRING:
+                // All registered C and G sets, space and delete
+            case self::TYPE_UTF8_STRING:
+                // ????
+            case self::TYPE_BMP_STRING:
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = substr($content, $content_pos);
+                break;
+            case self::TYPE_UTC_TIME:
+            case self::TYPE_GENERALIZED_TIME:
+                if ($constructed) {
+                    return false;
+                }
+                $current['content'] = $this->_decodeTime(substr($content, $content_pos), $tag);
+                break;
+            default:
+                return false;
+        }
+
+        $start+= $length;
+
+        // ie. length is the length of the full TLV encoding - it's not just the length of the value
+        return $current + array('length' => $start - $current['start']);
+    }
+
+    /**
+     * ASN.1 Map
+     *
+     * Provides an ASN.1 semantic mapping ($mapping) from a parsed BER-encoding to a human readable format.
+     *
+     * "Special" mappings may be applied on a per tag-name basis via $special.
+     *
+     * @param array $decoded
+     * @param array $mapping
+     * @param array $special
+     * @return array
+     * @access public
+     */
+    function asn1map($decoded, $mapping, $special = array())
+    {
+        if (!is_array($decoded)) {
+            return false;
+        }
+
+        if (isset($mapping['explicit']) && is_array($decoded['content'])) {
+            $decoded = $decoded['content'][0];
+        }
+
+        switch (true) {
+            case $mapping['type'] == self::TYPE_ANY:
+                $intype = $decoded['type'];
+                if (isset($decoded['constant']) || !isset($this->ANYmap[$intype]) || (ord($this->encoded[$decoded['start']]) & 0x20)) {
+                    return new Element(substr($this->encoded, $decoded['start'], $decoded['length']));
+                }
+                $inmap = $this->ANYmap[$intype];
+                if (is_string($inmap)) {
+                    return array($inmap => $this->asn1map($decoded, array('type' => $intype) + $mapping, $special));
+                }
+                break;
+            case $mapping['type'] == self::TYPE_CHOICE:
+                foreach ($mapping['children'] as $key => $option) {
+                    switch (true) {
+                        case isset($option['constant']) && $option['constant'] == $decoded['constant']:
+                        case !isset($option['constant']) && $option['type'] == $decoded['type']:
+                            $value = $this->asn1map($decoded, $option, $special);
+                            break;
+                        case !isset($option['constant']) && $option['type'] == self::TYPE_CHOICE:
+                            $v = $this->asn1map($decoded, $option, $special);
+                            if (isset($v)) {
+                                $value = $v;
+                            }
+                    }
+                    if (isset($value)) {
+                        if (isset($special[$key])) {
+                            $value = call_user_func($special[$key], $value);
+                        }
+                        return array($key => $value);
+                    }
+                }
+                return null;
+            case isset($mapping['implicit']):
+            case isset($mapping['explicit']):
+            case $decoded['type'] == $mapping['type']:
+                break;
+            default:
+                // if $decoded['type'] and $mapping['type'] are both strings, but different types of strings,
+                // let it through
+                switch (true) {
+                    case $decoded['type'] < 18: // self::TYPE_NUMERIC_STRING == 18
+                    case $decoded['type'] > 30: // self::TYPE_BMP_STRING == 30
+                    case $mapping['type'] < 18:
+                    case $mapping['type'] > 30:
+                        return null;
+                }
+        }
+
+        if (isset($mapping['implicit'])) {
+            $decoded['type'] = $mapping['type'];
+        }
+
+        switch ($decoded['type']) {
+            case self::TYPE_SEQUENCE:
+                $map = array();
+
+                // ignore the min and max
+                if (isset($mapping['min']) && isset($mapping['max'])) {
+                    $child = $mapping['children'];
+                    foreach ($decoded['content'] as $content) {
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                            return null;
+                        }
+                    }
+
+                    return $map;
+                }
+
+                $n = count($decoded['content']);
+                $i = 0;
+
+                foreach ($mapping['children'] as $key => $child) {
+                    $maymatch = $i < $n; // Match only existing input.
+                    if ($maymatch) {
+                        $temp = $decoded['content'][$i];
+
+                        if ($child['type'] != self::TYPE_CHOICE) {
+                            // Get the mapping and input class & constant.
+                            $childClass = $tempClass = self::CLASS_UNIVERSAL;
+                            $constant = null;
+                            if (isset($temp['constant'])) {
+                                $tempClass = $temp['type'];
+                            }
+                            if (isset($child['class'])) {
+                                $childClass = $child['class'];
+                                $constant = $child['cast'];
+                            } elseif (isset($child['constant'])) {
+                                $childClass = self::CLASS_CONTEXT_SPECIFIC;
+                                $constant = $child['constant'];
+                            }
+
+                            if (isset($constant) && isset($temp['constant'])) {
+                                // Can only match if constants and class match.
+                                $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
+                            } else {
+                                // Can only match if no constant expected and type matches or is generic.
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
+                            }
+                        }
+                    }
+
+                    if ($maymatch) {
+                        // Attempt submapping.
+                        $candidate = $this->asn1map($temp, $child, $special);
+                        $maymatch = $candidate !== null;
+                    }
+
+                    if ($maymatch) {
+                        // Got the match: use it.
+                        if (isset($special[$key])) {
+                            $candidate = call_user_func($special[$key], $candidate);
+                        }
+                        $map[$key] = $candidate;
+                        $i++;
+                    } elseif (isset($child['default'])) {
+                        $map[$key] = $child['default']; // Use default.
+                    } elseif (!isset($child['optional'])) {
+                        return null; // Syntax error.
+                    }
+                }
+
+                // Fail mapping if all input items have not been consumed.
+                return $i < $n ? null: $map;
+
+            // the main diff between sets and sequences is the encapsulation of the foreach in another for loop
+            case self::TYPE_SET:
+                $map = array();
+
+                // ignore the min and max
+                if (isset($mapping['min']) && isset($mapping['max'])) {
+                    $child = $mapping['children'];
+                    foreach ($decoded['content'] as $content) {
+                        if (($map[] = $this->asn1map($content, $child, $special)) === null) {
+                            return null;
+                        }
+                    }
+
+                    return $map;
+                }
+
+                for ($i = 0; $i < count($decoded['content']); $i++) {
+                    $temp = $decoded['content'][$i];
+                    $tempClass = self::CLASS_UNIVERSAL;
+                    if (isset($temp['constant'])) {
+                        $tempClass = $temp['type'];
+                    }
+
+                    foreach ($mapping['children'] as $key => $child) {
+                        if (isset($map[$key])) {
+                            continue;
+                        }
+                        $maymatch = true;
+                        if ($child['type'] != self::TYPE_CHOICE) {
+                            $childClass = self::CLASS_UNIVERSAL;
+                            $constant = null;
+                            if (isset($child['class'])) {
+                                $childClass = $child['class'];
+                                $constant = $child['cast'];
+                            } elseif (isset($child['constant'])) {
+                                $childClass = self::CLASS_CONTEXT_SPECIFIC;
+                                $constant = $child['constant'];
+                            }
+
+                            if (isset($constant) && isset($temp['constant'])) {
+                                // Can only match if constants and class match.
+                                $maymatch = $constant == $temp['constant'] && $childClass == $tempClass;
+                            } else {
+                                // Can only match if no constant expected and type matches or is generic.
+                                $maymatch = !isset($child['constant']) && array_search($child['type'], array($temp['type'], self::TYPE_ANY, self::TYPE_CHOICE)) !== false;
+                            }
+                        }
+
+                        if ($maymatch) {
+                            // Attempt submapping.
+                            $candidate = $this->asn1map($temp, $child, $special);
+                            $maymatch = $candidate !== null;
+                        }
+
+                        if (!$maymatch) {
+                            break;
+                        }
+
+                        // Got the match: use it.
+                        if (isset($special[$key])) {
+                            $candidate = call_user_func($special[$key], $candidate);
+                        }
+                        $map[$key] = $candidate;
+                        break;
+                    }
+                }
+
+                foreach ($mapping['children'] as $key => $child) {
+                    if (!isset($map[$key])) {
+                        if (isset($child['default'])) {
+                            $map[$key] = $child['default'];
+                        } elseif (!isset($child['optional'])) {
+                            return null;
+                        }
+                    }
+                }
+                return $map;
+            case self::TYPE_OBJECT_IDENTIFIER:
+                return isset($this->oids[$decoded['content']]) ? $this->oids[$decoded['content']] : $decoded['content'];
+            case self::TYPE_UTC_TIME:
+            case self::TYPE_GENERALIZED_TIME:
+                // for explicitly tagged optional stuff
+                if (is_array($decoded['content'])) {
+                    $decoded['content'] = $decoded['content'][0]['content'];
+                }
+                // for implicitly tagged optional stuff
+                // in theory, doing isset($mapping['implicit']) would work but malformed certs do exist
+                // in the wild that OpenSSL decodes without issue so we'll support them as well
+                if (!is_object($decoded['content'])) {
+                    $decoded['content'] = $this->_decodeTime($decoded['content'], $decoded['type']);
+                }
+                return $decoded['content'] ? $decoded['content']->format($this->format) : false;
+            case self::TYPE_BIT_STRING:
+                if (isset($mapping['mapping'])) {
+                    $offset = ord($decoded['content'][0]);
+                    $size = (strlen($decoded['content']) - 1) * 8 - $offset;
+                    /*
+                       From X.680-0207.pdf#page=46 (21.7):
+
+                       "When a "NamedBitList" is used in defining a bitstring type ASN.1 encoding rules are free to add (or remove)
+                        arbitrarily any trailing 0 bits to (or from) values that are being encoded or decoded. Application designers should
+                        therefore ensure that different semantics are not associated with such values which differ only in the number of trailing
+                        0 bits."
+                    */
+                    $bits = count($mapping['mapping']) == $size ? array() : array_fill(0, count($mapping['mapping']) - $size, false);
+                    for ($i = strlen($decoded['content']) - 1; $i > 0; $i--) {
+                        $current = ord($decoded['content'][$i]);
+                        for ($j = $offset; $j < 8; $j++) {
+                            $bits[] = (bool) ($current & (1 << $j));
+                        }
+                        $offset = 0;
+                    }
+                    $values = array();
+                    $map = array_reverse($mapping['mapping']);
+                    foreach ($map as $i => $value) {
+                        if ($bits[$i]) {
+                            $values[] = $value;
+                        }
+                    }
+                    return $values;
+                }
+            case self::TYPE_OCTET_STRING:
+                return base64_encode($decoded['content']);
+            case self::TYPE_NULL:
+                return '';
+            case self::TYPE_BOOLEAN:
+                return $decoded['content'];
+            case self::TYPE_NUMERIC_STRING:
+            case self::TYPE_PRINTABLE_STRING:
+            case self::TYPE_TELETEX_STRING:
+            case self::TYPE_VIDEOTEX_STRING:
+            case self::TYPE_IA5_STRING:
+            case self::TYPE_GRAPHIC_STRING:
+            case self::TYPE_VISIBLE_STRING:
+            case self::TYPE_GENERAL_STRING:
+            case self::TYPE_UNIVERSAL_STRING:
+            case self::TYPE_UTF8_STRING:
+            case self::TYPE_BMP_STRING:
+                return $decoded['content'];
+            case self::TYPE_INTEGER:
+            case self::TYPE_ENUMERATED:
+                $temp = $decoded['content'];
+                if (isset($mapping['implicit'])) {
+                    $temp = new BigInteger($decoded['content'], -256);
+                }
+                if (isset($mapping['mapping'])) {
+                    $temp = (int) $temp->toString();
+                    return isset($mapping['mapping'][$temp]) ?
+                        $mapping['mapping'][$temp] :
+                        false;
+                }
+                return $temp;
+        }
+    }
+
+    /**
+     * ASN.1 Encode
+     *
+     * DER-encodes an ASN.1 semantic mapping ($mapping).  Some libraries would probably call this function
+     * an ASN.1 compiler.
+     *
+     * "Special" mappings can be applied via $special.
+     *
+     * @param string $source
+     * @param string $mapping
+     * @param array $special
+     * @return string
+     * @access public
+     */
+    function encodeDER($source, $mapping, $special = array())
+    {
+        $this->location = array();
+        return $this->_encode_der($source, $mapping, null, $special);
+    }
+
+    /**
+     * ASN.1 Encode (Helper function)
+     *
+     * @param string $source
+     * @param string $mapping
+     * @param int $idx
+     * @param array $special
+     * @return string
+     * @access private
+     */
+    function _encode_der($source, $mapping, $idx = null, $special = array())
+    {
+        if ($source instanceof Element) {
+            return $source->element;
+        }
+
+        // do not encode (implicitly optional) fields with value set to default
+        if (isset($mapping['default']) && $source === $mapping['default']) {
+            return '';
+        }
+
+        if (isset($idx)) {
+            if (isset($special[$idx])) {
+                $source = call_user_func($special[$idx], $source);
+            }
+            $this->location[] = $idx;
+        }
+
+        $tag = $mapping['type'];
+
+        switch ($tag) {
+            case self::TYPE_SET:    // Children order is not important, thus process in sequence.
+            case self::TYPE_SEQUENCE:
+                $tag|= 0x20; // set the constructed bit
+
+                // ignore the min and max
+                if (isset($mapping['min']) && isset($mapping['max'])) {
+                    $value = array();
+                    $child = $mapping['children'];
+
+                    foreach ($source as $content) {
+                        $temp = $this->_encode_der($content, $child, null, $special);
+                        if ($temp === false) {
+                            return false;
+                        }
+                        $value[]= $temp;
+                    }
+                    /* "The encodings of the component values of a set-of value shall appear in ascending order, the encodings being compared
+                        as octet strings with the shorter components being padded at their trailing end with 0-octets.
+                        NOTE - The padding octets are for comparison purposes only and do not appear in the encodings."
+
+                       -- sec 11.6 of http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf  */
+                    if ($mapping['type'] == self::TYPE_SET) {
+                        sort($value);
+                    }
+                    $value = implode('', $value);
+                    break;
+                }
+
+                $value = '';
+                foreach ($mapping['children'] as $key => $child) {
+                    if (!array_key_exists($key, $source)) {
+                        if (!isset($child['optional'])) {
+                            return false;
+                        }
+                        continue;
+                    }
+
+                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
+                    if ($temp === false) {
+                        return false;
+                    }
+
+                    // An empty child encoding means it has been optimized out.
+                    // Else we should have at least one tag byte.
+                    if ($temp === '') {
+                        continue;
+                    }
+
+                    // if isset($child['constant']) is true then isset($child['optional']) should be true as well
+                    if (isset($child['constant'])) {
+                        /*
+                           From X.680-0207.pdf#page=58 (30.6):
+
+                           "The tagging construction specifies explicit tagging if any of the following holds:
+                            ...
+                            c) the "Tag Type" alternative is used and the value of "TagDefault" for the module is IMPLICIT TAGS or
+                            AUTOMATIC TAGS, but the type defined by "Type" is an untagged choice type, an untagged open type, or
+                            an untagged "DummyReference" (see ITU-T Rec. X.683 | ISO/IEC 8824-4, 8.3)."
+                         */
+                        if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
+                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
+                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                        } else {
+                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
+                            $temp = $subtag . substr($temp, 1);
+                        }
+                    }
+                    $value.= $temp;
+                }
+                break;
+            case self::TYPE_CHOICE:
+                $temp = false;
+
+                foreach ($mapping['children'] as $key => $child) {
+                    if (!isset($source[$key])) {
+                        continue;
+                    }
+
+                    $temp = $this->_encode_der($source[$key], $child, $key, $special);
+                    if ($temp === false) {
+                        return false;
+                    }
+
+                    // An empty child encoding means it has been optimized out.
+                    // Else we should have at least one tag byte.
+                    if ($temp === '') {
+                        continue;
+                    }
+
+                    $tag = ord($temp[0]);
+
+                    // if isset($child['constant']) is true then isset($child['optional']) should be true as well
+                    if (isset($child['constant'])) {
+                        if (isset($child['explicit']) || $child['type'] == self::TYPE_CHOICE) {
+                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | 0x20 | $child['constant']);
+                            $temp = $subtag . $this->_encodeLength(strlen($temp)) . $temp;
+                        } else {
+                            $subtag = chr((self::CLASS_CONTEXT_SPECIFIC << 6) | (ord($temp[0]) & 0x20) | $child['constant']);
+                            $temp = $subtag . substr($temp, 1);
+                        }
+                    }
+                }
+
+                if (isset($idx)) {
+                    array_pop($this->location);
+                }
+
+                if ($temp && isset($mapping['cast'])) {
+                    $temp[0] = chr(($mapping['class'] << 6) | ($tag & 0x20) | $mapping['cast']);
+                }
+
+                return $temp;
+            case self::TYPE_INTEGER:
+            case self::TYPE_ENUMERATED:
+                if (!isset($mapping['mapping'])) {
+                    if (is_numeric($source)) {
+                        $source = new BigInteger($source);
+                    }
+                    $value = $source->toBytes(true);
+                } else {
+                    $value = array_search($source, $mapping['mapping']);
+                    if ($value === false) {
+                        return false;
+                    }
+                    $value = new BigInteger($value);
+                    $value = $value->toBytes(true);
+                }
+                if (!strlen($value)) {
+                    $value = chr(0);
+                }
+                break;
+            case self::TYPE_UTC_TIME:
+            case self::TYPE_GENERALIZED_TIME:
+                $format = $mapping['type'] == self::TYPE_UTC_TIME ? 'y' : 'Y';
+                $format.= 'mdHis';
+                // if $source does _not_ include timezone information within it then assume that the timezone is GMT
+                $date = new DateTime($source, new DateTimeZone('GMT'));
+                // if $source _does_ include timezone information within it then convert the time to GMT
+                $date->setTimezone(new DateTimeZone('GMT'));
+                $value = $date->format($format) . 'Z';
+                break;
+            case self::TYPE_BIT_STRING:
+                if (isset($mapping['mapping'])) {
+                    $bits = array_fill(0, count($mapping['mapping']), 0);
+                    $size = 0;
+                    for ($i = 0; $i < count($mapping['mapping']); $i++) {
+                        if (in_array($mapping['mapping'][$i], $source)) {
+                            $bits[$i] = 1;
+                            $size = $i;
+                        }
+                    }
+
+                    if (isset($mapping['min']) && $mapping['min'] >= 1 && $size < $mapping['min']) {
+                        $size = $mapping['min'] - 1;
+                    }
+
+                    $offset = 8 - (($size + 1) & 7);
+                    $offset = $offset !== 8 ? $offset : 0;
+
+                    $value = chr($offset);
+
+                    for ($i = $size + 1; $i < count($mapping['mapping']); $i++) {
+                        unset($bits[$i]);
+                    }
+
+                    $bits = implode('', array_pad($bits, $size + $offset + 1, 0));
+                    $bytes = explode(' ', rtrim(chunk_split($bits, 8, ' ')));
+                    foreach ($bytes as $byte) {
+                        $value.= chr(bindec($byte));
+                    }
+
+                    break;
+                }
+            case self::TYPE_OCTET_STRING:
+                /* The initial octet shall encode, as an unsigned binary integer with bit 1 as the least significant bit,
+                   the number of unused bits in the final subsequent octet. The number shall be in the range zero to seven.
+
+                   -- http://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=16 */
+                $value = base64_decode($source);
+                break;
+            case self::TYPE_OBJECT_IDENTIFIER:
+                $value = $this->_encodeOID($source);
+                break;
+            case self::TYPE_ANY:
+                $loc = $this->location;
+                if (isset($idx)) {
+                    array_pop($this->location);
+                }
+
+                switch (true) {
+                    case !isset($source):
+                        return $this->_encode_der(null, array('type' => self::TYPE_NULL) + $mapping, null, $special);
+                    case is_int($source):
+                    case $source instanceof BigInteger:
+                        return $this->_encode_der($source, array('type' => self::TYPE_INTEGER) + $mapping, null, $special);
+                    case is_float($source):
+                        return $this->_encode_der($source, array('type' => self::TYPE_REAL) + $mapping, null, $special);
+                    case is_bool($source):
+                        return $this->_encode_der($source, array('type' => self::TYPE_BOOLEAN) + $mapping, null, $special);
+                    case is_array($source) && count($source) == 1:
+                        $typename = implode('', array_keys($source));
+                        $outtype = array_search($typename, $this->ANYmap, true);
+                        if ($outtype !== false) {
+                            return $this->_encode_der($source[$typename], array('type' => $outtype) + $mapping, null, $special);
+                        }
+                }
+
+                $filters = $this->filters;
+                foreach ($loc as $part) {
+                    if (!isset($filters[$part])) {
+                        $filters = false;
+                        break;
+                    }
+                    $filters = $filters[$part];
+                }
+                if ($filters === false) {
+                    user_error('No filters defined for ' . implode('/', $loc));
+                    return false;
+                }
+                return $this->_encode_der($source, $filters + $mapping, null, $special);
+            case self::TYPE_NULL:
+                $value = '';
+                break;
+            case self::TYPE_NUMERIC_STRING:
+            case self::TYPE_TELETEX_STRING:
+            case self::TYPE_PRINTABLE_STRING:
+            case self::TYPE_UNIVERSAL_STRING:
+            case self::TYPE_UTF8_STRING:
+            case self::TYPE_BMP_STRING:
+            case self::TYPE_IA5_STRING:
+            case self::TYPE_VISIBLE_STRING:
+            case self::TYPE_VIDEOTEX_STRING:
+            case self::TYPE_GRAPHIC_STRING:
+            case self::TYPE_GENERAL_STRING:
+                $value = $source;
+                break;
+            case self::TYPE_BOOLEAN:
+                $value = $source ? "\xFF" : "\x00";
+                break;
+            default:
+                user_error('Mapping provides no type definition for ' . implode('/', $this->location));
+                return false;
+        }
+
+        if (isset($idx)) {
+            array_pop($this->location);
+        }
+
+        if (isset($mapping['cast'])) {
+            if (isset($mapping['explicit']) || $mapping['type'] == self::TYPE_CHOICE) {
+                $value = chr($tag) . $this->_encodeLength(strlen($value)) . $value;
+                $tag = ($mapping['class'] << 6) | 0x20 | $mapping['cast'];
+            } else {
+                $tag = ($mapping['class'] << 6) | (ord($temp[0]) & 0x20) | $mapping['cast'];
+            }
+        }
+
+        return chr($tag) . $this->_encodeLength(strlen($value)) . $value;
+    }
+
+    /**
+     * DER-encode the length
+     *
+     * DER supports lengths up to (2**8)**127, however, we'll only support lengths up to (2**8)**4.  See
+     * {@link http://itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#p=13 X.690 paragraph 8.1.3} for more information.
+     *
+     * @access private
+     * @param int $length
+     * @return string
+     */
+    function _encodeLength($length)
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+
+    /**
+     * BER-decode the OID
+     *
+     * Called by _decode_ber()
+     *
+     * @access private
+     * @param string $content
+     * @return string
+     */
+    function _decodeOID($content)
+    {
+        static $eighty;
+        if (!$eighty) {
+            $eighty = new BigInteger(80);
+        }
+
+        $oid = array();
+        $pos = 0;
+        $len = strlen($content);
+
+        if (ord($content[$len - 1]) & 0x80) {
+            return false;
+        }
+
+        $n = new BigInteger();
+        while ($pos < $len) {
+            $temp = ord($content[$pos++]);
+            $n = $n->bitwise_leftShift(7);
+            $n = $n->bitwise_or(new BigInteger($temp & 0x7F));
+            if (~$temp & 0x80) {
+                $oid[] = $n;
+                $n = new BigInteger();
+            }
+        }
+        $part1 = array_shift($oid);
+        $first = floor(ord($content[0]) / 40);
+        /*
+          "This packing of the first two object identifier components recognizes that only three values are allocated from the root
+           node, and at most 39 subsequent values from nodes reached by X = 0 and X = 1."
+
+          -- https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=22
+        */
+        if ($first <= 2) { // ie. 0 <= ord($content[0]) < 120 (0x78)
+            array_unshift($oid, ord($content[0]) % 40);
+            array_unshift($oid, $first);
+        } else {
+            array_unshift($oid, $part1->subtract($eighty));
+            array_unshift($oid, 2);
+        }
+
+        return implode('.', $oid);
+    }
+
+    /**
+     * DER-encode the OID
+     *
+     * Called by _encode_der()
+     *
+     * @access private
+     * @param string $source
+     * @return string
+     */
+    function _encodeOID($source)
+    {
+        static $mask, $zero, $forty;
+        if (!$mask) {
+            $mask = new BigInteger(0x7F);
+            $zero = new BigInteger();
+            $forty = new BigInteger(40);
+        }
+
+        $oid = preg_match('#(?:\d+\.)+#', $source) ? $source : array_search($source, $this->oids);
+        if ($oid === false) {
+            user_error('Invalid OID');
+            return false;
+        }
+        $parts = explode('.', $oid);
+        $part1 = array_shift($parts);
+        $part2 = array_shift($parts);
+
+        $first = new BigInteger($part1);
+        $first = $first->multiply($forty);
+        $first = $first->add(new BigInteger($part2));
+
+        array_unshift($parts, $first->toString());
+
+        $value = '';
+        foreach ($parts as $part) {
+            if (!$part) {
+                $temp = "\0";
+            } else {
+                $temp = '';
+                $part = new BigInteger($part);
+                while (!$part->equals($zero)) {
+                    $submask = $part->bitwise_and($mask);
+                    $submask->setPrecision(8);
+                    $temp = (chr(0x80) | $submask->toBytes()) . $temp;
+                    $part = $part->bitwise_rightShift(7);
+                }
+                $temp[strlen($temp) - 1] = $temp[strlen($temp) - 1] & chr(0x7F);
+            }
+            $value.= $temp;
+        }
+
+        return $value;
+    }
+
+    /**
+     * BER-decode the time
+     *
+     * Called by _decode_ber() and in the case of implicit tags asn1map().
+     *
+     * @access private
+     * @param string $content
+     * @param int $tag
+     * @return string
+     */
+    function _decodeTime($content, $tag)
+    {
+        /* UTCTime:
+           http://tools.ietf.org/html/rfc5280#section-4.1.2.5.1
+           http://www.obj-sys.com/asn1tutorial/node15.html
+
+           GeneralizedTime:
+           http://tools.ietf.org/html/rfc5280#section-4.1.2.5.2
+           http://www.obj-sys.com/asn1tutorial/node14.html */
+
+        $format = 'YmdHis';
+
+        if ($tag == self::TYPE_UTC_TIME) {
+            // https://www.itu.int/ITU-T/studygroups/com17/languages/X.690-0207.pdf#page=28 says "the seconds
+            // element shall always be present" but none-the-less I've seen X509 certs where it isn't and if the
+            // browsers parse it phpseclib ought to too
+            if (preg_match('#^(\d{10})(Z|[+-]\d{4})$#', $content, $matches)) {
+                $content = $matches[1] . '00' . $matches[2];
+            }
+            $prefix = substr($content, 0, 2) >= 50 ? '19' : '20';
+            $content = $prefix . $content;
+        } elseif (strpos($content, '.') !== false) {
+            $format.= '.u';
+        }
+
+        if ($content[strlen($content) - 1] == 'Z') {
+            $content = substr($content, 0, -1) . '+0000';
+        }
+
+        if (strpos($content, '-') !== false || strpos($content, '+') !== false) {
+            $format.= 'O';
+        }
+
+        // error supression isn't necessary as of PHP 7.0:
+        // http://php.net/manual/en/migration70.other-changes.php
+        return @DateTime::createFromFormat($format, $content);
+    }
+
+    /**
+     * Set the time format
+     *
+     * Sets the time / date format for asn1map().
+     *
+     * @access public
+     * @param string $format
+     */
+    function setTimeFormat($format)
+    {
+        $this->format = $format;
+    }
+
+    /**
+     * Load OIDs
+     *
+     * Load the relevant OIDs for a particular ASN.1 semantic mapping.
+     *
+     * @access public
+     * @param array $oids
+     */
+    function loadOIDs($oids)
+    {
+        $this->oids = $oids;
+    }
+
+    /**
+     * Load filters
+     *
+     * See \phpseclib\File\X509, etc, for an example.
+     *
+     * @access public
+     * @param array $filters
+     */
+    function loadFilters($filters)
+    {
+        $this->filters = $filters;
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param string $string
+     * @param int $index
+     * @return string
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * String type conversion
+     *
+     * This is a lazy conversion, dealing only with character size.
+     * No real conversion table is used.
+     *
+     * @param string $in
+     * @param int $from
+     * @param int $to
+     * @return string
+     * @access public
+     */
+    function convert($in, $from = self::TYPE_UTF8_STRING, $to = self::TYPE_UTF8_STRING)
+    {
+        if (!isset($this->stringTypeSize[$from]) || !isset($this->stringTypeSize[$to])) {
+            return false;
+        }
+        $insize = $this->stringTypeSize[$from];
+        $outsize = $this->stringTypeSize[$to];
+        $inlength = strlen($in);
+        $out = '';
+
+        for ($i = 0; $i < $inlength;) {
+            if ($inlength - $i < $insize) {
+                return false;
+            }
+
+            // Get an input character as a 32-bit value.
+            $c = ord($in[$i++]);
+            switch (true) {
+                case $insize == 4:
+                    $c = ($c << 8) | ord($in[$i++]);
+                    $c = ($c << 8) | ord($in[$i++]);
+                case $insize == 2:
+                    $c = ($c << 8) | ord($in[$i++]);
+                case $insize == 1:
+                    break;
+                case ($c & 0x80) == 0x00:
+                    break;
+                case ($c & 0x40) == 0x00:
+                    return false;
+                default:
+                    $bit = 6;
+                    do {
+                        if ($bit > 25 || $i >= $inlength || (ord($in[$i]) & 0xC0) != 0x80) {
+                            return false;
+                        }
+                        $c = ($c << 6) | (ord($in[$i++]) & 0x3F);
+                        $bit += 5;
+                        $mask = 1 << $bit;
+                    } while ($c & $bit);
+                    $c &= $mask - 1;
+                    break;
+            }
+
+            // Convert and append the character to output string.
+            $v = '';
+            switch (true) {
+                case $outsize == 4:
+                    $v .= chr($c & 0xFF);
+                    $c >>= 8;
+                    $v .= chr($c & 0xFF);
+                    $c >>= 8;
+                case $outsize == 2:
+                    $v .= chr($c & 0xFF);
+                    $c >>= 8;
+                case $outsize == 1:
+                    $v .= chr($c & 0xFF);
+                    $c >>= 8;
+                    if ($c) {
+                        return false;
+                    }
+                    break;
+                case ($c & 0x80000000) != 0:
+                    return false;
+                case $c >= 0x04000000:
+                    $v .= chr(0x80 | ($c & 0x3F));
+                    $c = ($c >> 6) | 0x04000000;
+                case $c >= 0x00200000:
+                    $v .= chr(0x80 | ($c & 0x3F));
+                    $c = ($c >> 6) | 0x00200000;
+                case $c >= 0x00010000:
+                    $v .= chr(0x80 | ($c & 0x3F));
+                    $c = ($c >> 6) | 0x00010000;
+                case $c >= 0x00000800:
+                    $v .= chr(0x80 | ($c & 0x3F));
+                    $c = ($c >> 6) | 0x00000800;
+                case $c >= 0x00000080:
+                    $v .= chr(0x80 | ($c & 0x3F));
+                    $c = ($c >> 6) | 0x000000C0;
+                default:
+                    $v .= chr($c);
+                    break;
+            }
+            $out .= strrev($v);
+        }
+        return $out;
+    }
+}
diff --git a/build/phpseclib/File/ASN1/Element.php b/build/phpseclib/File/ASN1/Element.php
new file mode 100644
index 000000000..68246e2b5
--- /dev/null
+++ b/build/phpseclib/File/ASN1/Element.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * Pure-PHP ASN.1 Parser
+ *
+ * PHP version 5
+ *
+ * @category  File
+ * @package   ASN1
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2012 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\File\ASN1;
+
+/**
+ * ASN.1 Element
+ *
+ * Bypass normal encoding rules in phpseclib\File\ASN1::encodeDER()
+ *
+ * @package ASN1
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class Element
+{
+    /**
+     * Raw element value
+     *
+     * @var string
+     * @access private
+     */
+    var $element;
+
+    /**
+     * Constructor
+     *
+     * @param string $encoded
+     * @return \phpseclib\File\ASN1\Element
+     * @access public
+     */
+    function __construct($encoded)
+    {
+        $this->element = $encoded;
+    }
+}
diff --git a/build/phpseclib/File/X509.php b/build/phpseclib/File/X509.php
new file mode 100644
index 000000000..fa3c0264e
--- /dev/null
+++ b/build/phpseclib/File/X509.php
@@ -0,0 +1,5097 @@
+<?php
+
+/**
+ * Pure-PHP X.509 Parser
+ *
+ * PHP version 5
+ *
+ * Encode and decode X.509 certificates.
+ *
+ * The extensions are from {@link http://tools.ietf.org/html/rfc5280 RFC5280} and
+ * {@link http://web.archive.org/web/19961027104704/http://www3.netscape.com/eng/security/cert-exts.html Netscape Certificate Extensions}.
+ *
+ * Note that loading an X.509 certificate and resaving it may invalidate the signature.  The reason being that the signature is based on a
+ * portion of the certificate that contains optional parameters with default values.  ie. if the parameter isn't there the default value is
+ * used.  Problem is, if the parameter is there and it just so happens to have the default value there are two ways that that parameter can
+ * be encoded.  It can be encoded explicitly or left out all together.  This would effect the signature value and thus may invalidate the
+ * the certificate all together unless the certificate is re-signed.
+ *
+ * @category  File
+ * @package   X509
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2012 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link      http://phpseclib.sourceforge.net
+ */
+
+namespace phpseclib\File;
+
+use phpseclib\Crypt\Hash;
+use phpseclib\Crypt\Random;
+use phpseclib\Crypt\RSA;
+use phpseclib\File\ASN1\Element;
+use phpseclib\Math\BigInteger;
+use DateTime;
+use DateTimeZone;
+
+/**
+ * Pure-PHP X.509 Parser
+ *
+ * @package X509
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class X509
+{
+    /**
+     * Flag to only accept signatures signed by certificate authorities
+     *
+     * Not really used anymore but retained all the same to suppress E_NOTICEs from old installs
+     *
+     * @access public
+     */
+    const VALIDATE_SIGNATURE_BY_CA = 1;
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\File\X509::getDN()
+    */
+    /**
+     * Return internal array representation
+     */
+    const DN_ARRAY = 0;
+    /**
+     * Return string
+     */
+    const DN_STRING = 1;
+    /**
+     * Return ASN.1 name string
+     */
+    const DN_ASN1 = 2;
+    /**
+     * Return OpenSSL compatible array
+     */
+    const DN_OPENSSL = 3;
+    /**
+     * Return canonical ASN.1 RDNs string
+     */
+    const DN_CANON = 4;
+    /**
+     * Return name hash for file indexing
+     */
+    const DN_HASH = 5;
+    /**#@-*/
+
+    /**#@+
+     * @access public
+     * @see \phpseclib\File\X509::saveX509()
+     * @see \phpseclib\File\X509::saveCSR()
+     * @see \phpseclib\File\X509::saveCRL()
+    */
+    /**
+     * Save as PEM
+     *
+     * ie. a base64-encoded PEM with a header and a footer
+     */
+    const FORMAT_PEM = 0;
+    /**
+     * Save as DER
+     */
+    const FORMAT_DER = 1;
+    /**
+     * Save as a SPKAC
+     *
+     * Only works on CSRs. Not currently supported.
+     */
+    const FORMAT_SPKAC = 2;
+    /**
+     * Auto-detect the format
+     *
+     * Used only by the load*() functions
+     */
+    const FORMAT_AUTO_DETECT = 3;
+    /**#@-*/
+
+    /**
+     * Attribute value disposition.
+     * If disposition is >= 0, this is the index of the target value.
+     */
+    const ATTR_ALL = -1; // All attribute values (array).
+    const ATTR_APPEND = -2; // Add a value.
+    const ATTR_REPLACE = -3; // Clear first, then add a value.
+
+    /**
+     * ASN.1 syntax for X.509 certificates
+     *
+     * @var array
+     * @access private
+     */
+    var $Certificate;
+
+    /**#@+
+     * ASN.1 syntax for various extensions
+     *
+     * @access private
+     */
+    var $DirectoryString;
+    var $PKCS9String;
+    var $AttributeValue;
+    var $Extensions;
+    var $KeyUsage;
+    var $ExtKeyUsageSyntax;
+    var $BasicConstraints;
+    var $KeyIdentifier;
+    var $CRLDistributionPoints;
+    var $AuthorityKeyIdentifier;
+    var $CertificatePolicies;
+    var $AuthorityInfoAccessSyntax;
+    var $SubjectAltName;
+    var $SubjectDirectoryAttributes;
+    var $PrivateKeyUsagePeriod;
+    var $IssuerAltName;
+    var $PolicyMappings;
+    var $NameConstraints;
+
+    var $CPSuri;
+    var $UserNotice;
+
+    var $netscape_cert_type;
+    var $netscape_comment;
+    var $netscape_ca_policy_url;
+
+    var $Name;
+    var $RelativeDistinguishedName;
+    var $CRLNumber;
+    var $CRLReason;
+    var $IssuingDistributionPoint;
+    var $InvalidityDate;
+    var $CertificateIssuer;
+    var $HoldInstructionCode;
+    var $SignedPublicKeyAndChallenge;
+    /**#@-*/
+
+    /**#@+
+     * ASN.1 syntax for various DN attributes
+     *
+     * @access private
+     */
+    var $PostalAddress;
+    /**#@-*/
+
+    /**
+     * ASN.1 syntax for Certificate Signing Requests (RFC2986)
+     *
+     * @var array
+     * @access private
+     */
+    var $CertificationRequest;
+
+    /**
+     * ASN.1 syntax for Certificate Revocation Lists (RFC5280)
+     *
+     * @var array
+     * @access private
+     */
+    var $CertificateList;
+
+    /**
+     * Distinguished Name
+     *
+     * @var array
+     * @access private
+     */
+    var $dn;
+
+    /**
+     * Public key
+     *
+     * @var string
+     * @access private
+     */
+    var $publicKey;
+
+    /**
+     * Private key
+     *
+     * @var string
+     * @access private
+     */
+    var $privateKey;
+
+    /**
+     * Object identifiers for X.509 certificates
+     *
+     * @var array
+     * @access private
+     * @link http://en.wikipedia.org/wiki/Object_identifier
+     */
+    var $oids;
+
+    /**
+     * The certificate authorities
+     *
+     * @var array
+     * @access private
+     */
+    var $CAs;
+
+    /**
+     * The currently loaded certificate
+     *
+     * @var array
+     * @access private
+     */
+    var $currentCert;
+
+    /**
+     * The signature subject
+     *
+     * There's no guarantee \phpseclib\File\X509 is going to re-encode an X.509 cert in the same way it was originally
+     * encoded so we take save the portion of the original cert that the signature would have made for.
+     *
+     * @var string
+     * @access private
+     */
+    var $signatureSubject;
+
+    /**
+     * Certificate Start Date
+     *
+     * @var string
+     * @access private
+     */
+    var $startDate;
+
+    /**
+     * Certificate End Date
+     *
+     * @var string
+     * @access private
+     */
+    var $endDate;
+
+    /**
+     * Serial Number
+     *
+     * @var string
+     * @access private
+     */
+    var $serialNumber;
+
+    /**
+     * Key Identifier
+     *
+     * See {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.1 RFC5280#section-4.2.1.1} and
+     * {@link http://tools.ietf.org/html/rfc5280#section-4.2.1.2 RFC5280#section-4.2.1.2}.
+     *
+     * @var string
+     * @access private
+     */
+    var $currentKeyIdentifier;
+
+    /**
+     * CA Flag
+     *
+     * @var bool
+     * @access private
+     */
+    var $caFlag = false;
+
+    /**
+     * SPKAC Challenge
+     *
+     * @var string
+     * @access private
+     */
+    var $challenge;
+
+    /**
+     * Recursion Limit
+     *
+     * @var int
+     * @access private
+     */
+    static $recur_limit = 5;
+
+    /**
+     * URL fetch flag
+     *
+     * @var bool
+     * @access private
+     */
+    static $disable_url_fetch = false;
+
+    /**
+     * Default Constructor.
+     *
+     * @return \phpseclib\File\X509
+     * @access public
+     */
+    function __construct()
+    {
+        // Explicitly Tagged Module, 1988 Syntax
+        // http://tools.ietf.org/html/rfc5280#appendix-A.1
+
+        $this->DirectoryString = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'teletexString'   => array('type' => ASN1::TYPE_TELETEX_STRING),
+                'printableString' => array('type' => ASN1::TYPE_PRINTABLE_STRING),
+                'universalString' => array('type' => ASN1::TYPE_UNIVERSAL_STRING),
+                'utf8String'      => array('type' => ASN1::TYPE_UTF8_STRING),
+                'bmpString'       => array('type' => ASN1::TYPE_BMP_STRING)
+            )
+        );
+
+        $this->PKCS9String = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'ia5String'       => array('type' => ASN1::TYPE_IA5_STRING),
+                'directoryString' => $this->DirectoryString
+            )
+        );
+
+        $this->AttributeValue = array('type' => ASN1::TYPE_ANY);
+
+        $AttributeType = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $AttributeTypeAndValue = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'type' => $AttributeType,
+                'value'=> $this->AttributeValue
+            )
+        );
+
+        /*
+        In practice, RDNs containing multiple name-value pairs (called "multivalued RDNs") are rare,
+        but they can be useful at times when either there is no unique attribute in the entry or you
+        want to ensure that the entry's DN contains some useful identifying information.
+
+        - https://www.opends.org/wiki/page/DefinitionRelativeDistinguishedName
+        */
+        $this->RelativeDistinguishedName = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AttributeTypeAndValue
+        );
+
+        // http://tools.ietf.org/html/rfc5280#section-4.1.2.4
+        $RDNSequence = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            // RDNSequence does not define a min or a max, which means it doesn't have one
+            'min'      => 0,
+            'max'      => -1,
+            'children' => $this->RelativeDistinguishedName
+        );
+
+        $this->Name = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'rdnSequence' => $RDNSequence
+            )
+        );
+
+        // http://tools.ietf.org/html/rfc5280#section-4.1.1.2
+        $AlgorithmIdentifier = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'algorithm'  => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'parameters' => array(
+                                    'type'     => ASN1::TYPE_ANY,
+                                    'optional' => true
+                                )
+            )
+        );
+
+        /*
+           A certificate using system MUST reject the certificate if it encounters
+           a critical extension it does not recognize; however, a non-critical
+           extension may be ignored if it is not recognized.
+
+           http://tools.ietf.org/html/rfc5280#section-4.2
+        */
+        $Extension = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'extnId'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'critical' => array(
+                                  'type'     => ASN1::TYPE_BOOLEAN,
+                                  'optional' => true,
+                                  'default'  => false
+                              ),
+                'extnValue' => array('type' => ASN1::TYPE_OCTET_STRING)
+            )
+        );
+
+        $this->Extensions = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            // technically, it's MAX, but we'll assume anything < 0 is MAX
+            'max'      => -1,
+            // if 'children' isn't an array then 'min' and 'max' must be defined
+            'children' => $Extension
+        );
+
+        $SubjectPublicKeyInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'algorithm'        => $AlgorithmIdentifier,
+                'subjectPublicKey' => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $UniqueIdentifier = array('type' => ASN1::TYPE_BIT_STRING);
+
+        $Time = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'utcTime'     => array('type' => ASN1::TYPE_UTC_TIME),
+                'generalTime' => array('type' => ASN1::TYPE_GENERALIZED_TIME)
+            )
+        );
+
+        // http://tools.ietf.org/html/rfc5280#section-4.1.2.5
+        $Validity = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'notBefore' => $Time,
+                'notAfter'  => $Time
+            )
+        );
+
+        $CertificateSerialNumber = array('type' => ASN1::TYPE_INTEGER);
+
+        $Version = array(
+            'type'    => ASN1::TYPE_INTEGER,
+            'mapping' => array('v1', 'v2', 'v3')
+        );
+
+        // assert($TBSCertificate['children']['signature'] == $Certificate['children']['signatureAlgorithm'])
+        $TBSCertificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                // technically, default implies optional, but we'll define it as being optional, none-the-less, just to
+                // reenforce that fact
+                'version'             => array(
+                                             'constant' => 0,
+                                             'optional' => true,
+                                             'explicit' => true,
+                                             'default'  => 'v1'
+                                         ) + $Version,
+                'serialNumber'         => $CertificateSerialNumber,
+                'signature'            => $AlgorithmIdentifier,
+                'issuer'               => $this->Name,
+                'validity'             => $Validity,
+                'subject'              => $this->Name,
+                'subjectPublicKeyInfo' => $SubjectPublicKeyInfo,
+                // implicit means that the T in the TLV structure is to be rewritten, regardless of the type
+                'issuerUniqueID'       => array(
+                                               'constant' => 1,
+                                               'optional' => true,
+                                               'implicit' => true
+                                           ) + $UniqueIdentifier,
+                'subjectUniqueID'       => array(
+                                               'constant' => 2,
+                                               'optional' => true,
+                                               'implicit' => true
+                                           ) + $UniqueIdentifier,
+                // <http://tools.ietf.org/html/rfc2459#page-74> doesn't use the EXPLICIT keyword but if
+                // it's not IMPLICIT, it's EXPLICIT
+                'extensions'            => array(
+                                               'constant' => 3,
+                                               'optional' => true,
+                                               'explicit' => true
+                                           ) + $this->Extensions
+            )
+        );
+
+        $this->Certificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'tbsCertificate'     => $TBSCertificate,
+                 'signatureAlgorithm' => $AlgorithmIdentifier,
+                 'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->KeyUsage = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'digitalSignature',
+                'nonRepudiation',
+                'keyEncipherment',
+                'dataEncipherment',
+                'keyAgreement',
+                'keyCertSign',
+                'cRLSign',
+                'encipherOnly',
+                'decipherOnly'
+            )
+        );
+
+        $this->BasicConstraints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'cA'                => array(
+                                                 'type'     => ASN1::TYPE_BOOLEAN,
+                                                 'optional' => true,
+                                                 'default'  => false
+                                       ),
+                'pathLenConstraint' => array(
+                                                 'type' => ASN1::TYPE_INTEGER,
+                                                 'optional' => true
+                                       )
+            )
+        );
+
+        $this->KeyIdentifier = array('type' => ASN1::TYPE_OCTET_STRING);
+
+        $OrganizationalUnitNames = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => 4, // ub-organizational-units
+            'children' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+        );
+
+        $PersonalName = array(
+            'type'     => ASN1::TYPE_SET,
+            'children' => array(
+                'surname'              => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 0,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'given-name'           => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 1,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'initials'             => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 2,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         ),
+                'generation-qualifier' => array(
+                                           'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                           'constant' => 3,
+                                           'optional' => true,
+                                           'implicit' => true
+                                         )
+            )
+        );
+
+        $NumericUserIdentifier = array('type' => ASN1::TYPE_NUMERIC_STRING);
+
+        $OrganizationName = array('type' => ASN1::TYPE_PRINTABLE_STRING);
+
+        $PrivateDomainName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $TerminalIdentifier = array('type' => ASN1::TYPE_PRINTABLE_STRING);
+
+        $NetworkAddress = array('type' => ASN1::TYPE_NUMERIC_STRING);
+
+        $AdministrationDomainName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
+            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
+            'class'    => ASN1::CLASS_APPLICATION,
+            'cast'     => 2,
+            'children' => array(
+                'numeric'   => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'printable' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $CountryName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            // if class isn't present it's assumed to be \phpseclib\File\ASN1::CLASS_UNIVERSAL or
+            // (if constant is present) \phpseclib\File\ASN1::CLASS_CONTEXT_SPECIFIC
+            'class'    => ASN1::CLASS_APPLICATION,
+            'cast'     => 1,
+            'children' => array(
+                'x121-dcc-code'        => array('type' => ASN1::TYPE_NUMERIC_STRING),
+                'iso-3166-alpha2-code' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $AnotherName = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'type-id' => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                 'value'   => array(
+                                  'type' => ASN1::TYPE_ANY,
+                                  'constant' => 0,
+                                  'optional' => true,
+                                  'explicit' => true
+                              )
+            )
+        );
+
+        $ExtensionAttribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'extension-attribute-type'  => array(
+                                                    'type' => ASN1::TYPE_PRINTABLE_STRING,
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ),
+                 'extension-attribute-value' => array(
+                                                    'type' => ASN1::TYPE_ANY,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                )
+            )
+        );
+
+        $ExtensionAttributes = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => 256, // ub-extension-attributes
+            'children' => $ExtensionAttribute
+        );
+
+        $BuiltInDomainDefinedAttribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'type'  => array('type' => ASN1::TYPE_PRINTABLE_STRING),
+                 'value' => array('type' => ASN1::TYPE_PRINTABLE_STRING)
+            )
+        );
+
+        $BuiltInDomainDefinedAttributes = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => 4, // ub-domain-defined-attributes
+            'children' => $BuiltInDomainDefinedAttribute
+        );
+
+        $BuiltInStandardAttributes =  array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'country-name'               => array('optional' => true) + $CountryName,
+                'administration-domain-name' => array('optional' => true) + $AdministrationDomainName,
+                'network-address'            => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $NetworkAddress,
+                'terminal-identifier'        => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $TerminalIdentifier,
+                'private-domain-name'        => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                               ) + $PrivateDomainName,
+                'organization-name'          => array(
+                                                 'constant' => 3,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $OrganizationName,
+                'numeric-user-identifier'    => array(
+                                                 'constant' => 4,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $NumericUserIdentifier,
+                'personal-name'              => array(
+                                                 'constant' => 5,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $PersonalName,
+                'organizational-unit-names'  => array(
+                                                 'constant' => 6,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $OrganizationalUnitNames
+            )
+        );
+
+        $ORAddress = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'built-in-standard-attributes'       => $BuiltInStandardAttributes,
+                 'built-in-domain-defined-attributes' => array('optional' => true) + $BuiltInDomainDefinedAttributes,
+                 'extension-attributes'               => array('optional' => true) + $ExtensionAttributes
+            )
+        );
+
+        $EDIPartyName = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                 'nameAssigner' => array(
+                                    'constant' => 0,
+                                    'optional' => true,
+                                    'implicit' => true
+                                ) + $this->DirectoryString,
+                 // partyName is technically required but \phpseclib\File\ASN1 doesn't currently support non-optional constants and
+                 // setting it to optional gets the job done in any event.
+                 'partyName'    => array(
+                                    'constant' => 1,
+                                    'optional' => true,
+                                    'implicit' => true
+                                ) + $this->DirectoryString
+            )
+        );
+
+        $GeneralName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'otherName'                 => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $AnotherName,
+                'rfc822Name'                => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'dNSName'                   => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'x400Address'               => array(
+                                                 'constant' => 3,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $ORAddress,
+                'directoryName'             => array(
+                                                 'constant' => 4,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                               ) + $this->Name,
+                'ediPartyName'              => array(
+                                                 'constant' => 5,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $EDIPartyName,
+                'uniformResourceIdentifier' => array(
+                                                 'type' => ASN1::TYPE_IA5_STRING,
+                                                 'constant' => 6,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'iPAddress'                 => array(
+                                                 'type' => ASN1::TYPE_OCTET_STRING,
+                                                 'constant' => 7,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ),
+                'registeredID'              => array(
+                                                 'type' => ASN1::TYPE_OBJECT_IDENTIFIER,
+                                                 'constant' => 8,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               )
+            )
+        );
+
+        $GeneralNames = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $GeneralName
+        );
+
+        $this->IssuerAltName = $GeneralNames;
+
+        $ReasonFlags = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'unused',
+                'keyCompromise',
+                'cACompromise',
+                'affiliationChanged',
+                'superseded',
+                'cessationOfOperation',
+                'certificateHold',
+                'privilegeWithdrawn',
+                'aACompromise'
+            )
+        );
+
+        $DistributionPointName = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'fullName'                => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $GeneralNames,
+                'nameRelativeToCRLIssuer' => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $this->RelativeDistinguishedName
+            )
+        );
+
+        $DistributionPoint = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'distributionPoint' => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'explicit' => true
+                                       ) + $DistributionPointName,
+                'reasons'           => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $ReasonFlags,
+                'cRLIssuer'         => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                       ) + $GeneralNames
+            )
+        );
+
+        $this->CRLDistributionPoints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $DistributionPoint
+        );
+
+        $this->AuthorityKeyIdentifier = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'keyIdentifier'             => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $this->KeyIdentifier,
+                'authorityCertIssuer'       => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $GeneralNames,
+                'authorityCertSerialNumber' => array(
+                                                 'constant' => 2,
+                                                 'optional' => true,
+                                                 'implicit' => true
+                                               ) + $CertificateSerialNumber
+            )
+        );
+
+        $PolicyQualifierId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PolicyQualifierInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'policyQualifierId' => $PolicyQualifierId,
+                'qualifier'         => array('type' => ASN1::TYPE_ANY)
+            )
+        );
+
+        $CertPolicyId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PolicyInformation = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'policyIdentifier' => $CertPolicyId,
+                'policyQualifiers' => array(
+                                          'type'     => ASN1::TYPE_SEQUENCE,
+                                          'min'      => 0,
+                                          'max'      => -1,
+                                          'optional' => true,
+                                          'children' => $PolicyQualifierInfo
+                                      )
+            )
+        );
+
+        $this->CertificatePolicies = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $PolicyInformation
+        );
+
+        $this->PolicyMappings = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => array(
+                              'type'     => ASN1::TYPE_SEQUENCE,
+                              'children' => array(
+                                  'issuerDomainPolicy' => $CertPolicyId,
+                                  'subjectDomainPolicy' => $CertPolicyId
+                              )
+                       )
+        );
+
+        $KeyPurposeId = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $this->ExtKeyUsageSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $KeyPurposeId
+        );
+
+        $AccessDescription = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'accessMethod'   => array('type' => ASN1::TYPE_OBJECT_IDENTIFIER),
+                'accessLocation' => $GeneralName
+            )
+        );
+
+        $this->AuthorityInfoAccessSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AccessDescription
+        );
+
+        $this->SubjectInfoAccessSyntax = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $AccessDescription
+        );
+
+        $this->SubjectAltName = $GeneralNames;
+
+        $this->PrivateKeyUsagePeriod = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'notBefore' => array(
+                                                 'constant' => 0,
+                                                 'optional' => true,
+                                                 'implicit' => true,
+                                                 'type' => ASN1::TYPE_GENERALIZED_TIME),
+                'notAfter'  => array(
+                                                 'constant' => 1,
+                                                 'optional' => true,
+                                                 'implicit' => true,
+                                                 'type' => ASN1::TYPE_GENERALIZED_TIME)
+            )
+        );
+
+        $BaseDistance = array('type' => ASN1::TYPE_INTEGER);
+
+        $GeneralSubtree = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'base'    => $GeneralName,
+                'minimum' => array(
+                                 'constant' => 0,
+                                 'optional' => true,
+                                 'implicit' => true,
+                                 'default' => new BigInteger(0)
+                             ) + $BaseDistance,
+                'maximum' => array(
+                                 'constant' => 1,
+                                 'optional' => true,
+                                 'implicit' => true,
+                             ) + $BaseDistance
+            )
+        );
+
+        $GeneralSubtrees = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $GeneralSubtree
+        );
+
+        $this->NameConstraints = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'permittedSubtrees' => array(
+                                           'constant' => 0,
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $GeneralSubtrees,
+                'excludedSubtrees'  => array(
+                                           'constant' => 1,
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $GeneralSubtrees
+            )
+        );
+
+        $this->CPSuri = array('type' => ASN1::TYPE_IA5_STRING);
+
+        $DisplayText = array(
+            'type'     => ASN1::TYPE_CHOICE,
+            'children' => array(
+                'ia5String'     => array('type' => ASN1::TYPE_IA5_STRING),
+                'visibleString' => array('type' => ASN1::TYPE_VISIBLE_STRING),
+                'bmpString'     => array('type' => ASN1::TYPE_BMP_STRING),
+                'utf8String'    => array('type' => ASN1::TYPE_UTF8_STRING)
+            )
+        );
+
+        $NoticeReference = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'organization'  => $DisplayText,
+                'noticeNumbers' => array(
+                                       'type'     => ASN1::TYPE_SEQUENCE,
+                                       'min'      => 1,
+                                       'max'      => 200,
+                                       'children' => array('type' => ASN1::TYPE_INTEGER)
+                                   )
+            )
+        );
+
+        $this->UserNotice = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'noticeRef' => array(
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $NoticeReference,
+                'explicitText'  => array(
+                                           'optional' => true,
+                                           'implicit' => true
+                                       ) + $DisplayText
+            )
+        );
+
+        // mapping is from <http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn3.html>
+        $this->netscape_cert_type = array(
+            'type'    => ASN1::TYPE_BIT_STRING,
+            'mapping' => array(
+                'SSLClient',
+                'SSLServer',
+                'Email',
+                'ObjectSigning',
+                'Reserved',
+                'SSLCA',
+                'EmailCA',
+                'ObjectSigningCA'
+            )
+        );
+
+        $this->netscape_comment = array('type' => ASN1::TYPE_IA5_STRING);
+        $this->netscape_ca_policy_url = array('type' => ASN1::TYPE_IA5_STRING);
+
+        // attribute is used in RFC2986 but we're using the RFC5280 definition
+
+        $Attribute = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'type' => $AttributeType,
+                'value'=> array(
+                              'type'     => ASN1::TYPE_SET,
+                              'min'      => 1,
+                              'max'      => -1,
+                              'children' => $this->AttributeValue
+                          )
+            )
+        );
+
+        $this->SubjectDirectoryAttributes = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $Attribute
+        );
+
+        // adapted from <http://tools.ietf.org/html/rfc2986>
+
+        $Attributes = array(
+            'type'     => ASN1::TYPE_SET,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $Attribute
+        );
+
+        $CertificationRequestInfo = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'version'       => array(
+                                       'type' => ASN1::TYPE_INTEGER,
+                                       'mapping' => array('v1')
+                                   ),
+                'subject'       => $this->Name,
+                'subjectPKInfo' => $SubjectPublicKeyInfo,
+                'attributes'    => array(
+                                       'constant' => 0,
+                                       'optional' => true,
+                                       'implicit' => true
+                                   ) + $Attributes,
+            )
+        );
+
+        $this->CertificationRequest = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'certificationRequestInfo' => $CertificationRequestInfo,
+                'signatureAlgorithm'       => $AlgorithmIdentifier,
+                'signature'                => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $RevokedCertificate = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                              'userCertificate'    => $CertificateSerialNumber,
+                              'revocationDate'     => $Time,
+                              'crlEntryExtensions' => array(
+                                                          'optional' => true
+                                                      ) + $this->Extensions
+                          )
+        );
+
+        $TBSCertList = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'version'             => array(
+                                             'optional' => true,
+                                             'default'  => 'v1'
+                                         ) + $Version,
+                'signature'           => $AlgorithmIdentifier,
+                'issuer'              => $this->Name,
+                'thisUpdate'          => $Time,
+                'nextUpdate'          => array(
+                                             'optional' => true
+                                         ) + $Time,
+                'revokedCertificates' => array(
+                                             'type'     => ASN1::TYPE_SEQUENCE,
+                                             'optional' => true,
+                                             'min'      => 0,
+                                             'max'      => -1,
+                                             'children' => $RevokedCertificate
+                                         ),
+                'crlExtensions'       => array(
+                                             'constant' => 0,
+                                             'optional' => true,
+                                             'explicit' => true
+                                         ) + $this->Extensions
+            )
+        );
+
+        $this->CertificateList = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'tbsCertList'        => $TBSCertList,
+                'signatureAlgorithm' => $AlgorithmIdentifier,
+                'signature'          => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->CRLNumber = array('type' => ASN1::TYPE_INTEGER);
+
+        $this->CRLReason = array('type' => ASN1::TYPE_ENUMERATED,
+           'mapping' => array(
+                            'unspecified',
+                            'keyCompromise',
+                            'cACompromise',
+                            'affiliationChanged',
+                            'superseded',
+                            'cessationOfOperation',
+                            'certificateHold',
+                            // Value 7 is not used.
+                            8 => 'removeFromCRL',
+                            'privilegeWithdrawn',
+                            'aACompromise'
+            )
+        );
+
+        $this->IssuingDistributionPoint = array('type' => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'distributionPoint'          => array(
+                                                    'constant' => 0,
+                                                    'optional' => true,
+                                                    'explicit' => true
+                                                ) + $DistributionPointName,
+                'onlyContainsUserCerts'      => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 1,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlyContainsCACerts'        => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 2,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlySomeReasons'           => array(
+                                                    'constant' => 3,
+                                                    'optional' => true,
+                                                    'implicit' => true
+                                                ) + $ReasonFlags,
+                'indirectCRL'               => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 4,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                ),
+                'onlyContainsAttributeCerts' => array(
+                                                    'type'     => ASN1::TYPE_BOOLEAN,
+                                                    'constant' => 5,
+                                                    'optional' => true,
+                                                    'default'  => false,
+                                                    'implicit' => true
+                                                )
+                          )
+        );
+
+        $this->InvalidityDate = array('type' => ASN1::TYPE_GENERALIZED_TIME);
+
+        $this->CertificateIssuer = $GeneralNames;
+
+        $this->HoldInstructionCode = array('type' => ASN1::TYPE_OBJECT_IDENTIFIER);
+
+        $PublicKeyAndChallenge = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'spki'      => $SubjectPublicKeyInfo,
+                'challenge' => array('type' => ASN1::TYPE_IA5_STRING)
+            )
+        );
+
+        $this->SignedPublicKeyAndChallenge = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'children' => array(
+                'publicKeyAndChallenge' => $PublicKeyAndChallenge,
+                'signatureAlgorithm'    => $AlgorithmIdentifier,
+                'signature'             => array('type' => ASN1::TYPE_BIT_STRING)
+            )
+        );
+
+        $this->PostalAddress = array(
+            'type'     => ASN1::TYPE_SEQUENCE,
+            'optional' => true,
+            'min'      => 1,
+            'max'      => -1,
+            'children' => $this->DirectoryString
+        );
+
+        // OIDs from RFC5280 and those RFCs mentioned in RFC5280#section-4.1.1.2
+        $this->oids = array(
+            '1.3.6.1.5.5.7' => 'id-pkix',
+            '1.3.6.1.5.5.7.1' => 'id-pe',
+            '1.3.6.1.5.5.7.2' => 'id-qt',
+            '1.3.6.1.5.5.7.3' => 'id-kp',
+            '1.3.6.1.5.5.7.48' => 'id-ad',
+            '1.3.6.1.5.5.7.2.1' => 'id-qt-cps',
+            '1.3.6.1.5.5.7.2.2' => 'id-qt-unotice',
+            '1.3.6.1.5.5.7.48.1' =>'id-ad-ocsp',
+            '1.3.6.1.5.5.7.48.2' => 'id-ad-caIssuers',
+            '1.3.6.1.5.5.7.48.3' => 'id-ad-timeStamping',
+            '1.3.6.1.5.5.7.48.5' => 'id-ad-caRepository',
+            '2.5.4' => 'id-at',
+            '2.5.4.41' => 'id-at-name',
+            '2.5.4.4' => 'id-at-surname',
+            '2.5.4.42' => 'id-at-givenName',
+            '2.5.4.43' => 'id-at-initials',
+            '2.5.4.44' => 'id-at-generationQualifier',
+            '2.5.4.3' => 'id-at-commonName',
+            '2.5.4.7' => 'id-at-localityName',
+            '2.5.4.8' => 'id-at-stateOrProvinceName',
+            '2.5.4.10' => 'id-at-organizationName',
+            '2.5.4.11' => 'id-at-organizationalUnitName',
+            '2.5.4.12' => 'id-at-title',
+            '2.5.4.13' => 'id-at-description',
+            '2.5.4.46' => 'id-at-dnQualifier',
+            '2.5.4.6' => 'id-at-countryName',
+            '2.5.4.5' => 'id-at-serialNumber',
+            '2.5.4.65' => 'id-at-pseudonym',
+            '2.5.4.17' => 'id-at-postalCode',
+            '2.5.4.9' => 'id-at-streetAddress',
+            '2.5.4.45' => 'id-at-uniqueIdentifier',
+            '2.5.4.72' => 'id-at-role',
+            '2.5.4.16' => 'id-at-postalAddress',
+
+            '0.9.2342.19200300.100.1.25' => 'id-domainComponent',
+            '1.2.840.113549.1.9' => 'pkcs-9',
+            '1.2.840.113549.1.9.1' => 'pkcs-9-at-emailAddress',
+            '2.5.29' => 'id-ce',
+            '2.5.29.35' => 'id-ce-authorityKeyIdentifier',
+            '2.5.29.14' => 'id-ce-subjectKeyIdentifier',
+            '2.5.29.15' => 'id-ce-keyUsage',
+            '2.5.29.16' => 'id-ce-privateKeyUsagePeriod',
+            '2.5.29.32' => 'id-ce-certificatePolicies',
+            '2.5.29.32.0' => 'anyPolicy',
+
+            '2.5.29.33' => 'id-ce-policyMappings',
+            '2.5.29.17' => 'id-ce-subjectAltName',
+            '2.5.29.18' => 'id-ce-issuerAltName',
+            '2.5.29.9' => 'id-ce-subjectDirectoryAttributes',
+            '2.5.29.19' => 'id-ce-basicConstraints',
+            '2.5.29.30' => 'id-ce-nameConstraints',
+            '2.5.29.36' => 'id-ce-policyConstraints',
+            '2.5.29.31' => 'id-ce-cRLDistributionPoints',
+            '2.5.29.37' => 'id-ce-extKeyUsage',
+            '2.5.29.37.0' => 'anyExtendedKeyUsage',
+            '1.3.6.1.5.5.7.3.1' => 'id-kp-serverAuth',
+            '1.3.6.1.5.5.7.3.2' => 'id-kp-clientAuth',
+            '1.3.6.1.5.5.7.3.3' => 'id-kp-codeSigning',
+            '1.3.6.1.5.5.7.3.4' => 'id-kp-emailProtection',
+            '1.3.6.1.5.5.7.3.8' => 'id-kp-timeStamping',
+            '1.3.6.1.5.5.7.3.9' => 'id-kp-OCSPSigning',
+            '2.5.29.54' => 'id-ce-inhibitAnyPolicy',
+            '2.5.29.46' => 'id-ce-freshestCRL',
+            '1.3.6.1.5.5.7.1.1' => 'id-pe-authorityInfoAccess',
+            '1.3.6.1.5.5.7.1.11' => 'id-pe-subjectInfoAccess',
+            '2.5.29.20' => 'id-ce-cRLNumber',
+            '2.5.29.28' => 'id-ce-issuingDistributionPoint',
+            '2.5.29.27' => 'id-ce-deltaCRLIndicator',
+            '2.5.29.21' => 'id-ce-cRLReasons',
+            '2.5.29.29' => 'id-ce-certificateIssuer',
+            '2.5.29.23' => 'id-ce-holdInstructionCode',
+            '1.2.840.10040.2' => 'holdInstruction',
+            '1.2.840.10040.2.1' => 'id-holdinstruction-none',
+            '1.2.840.10040.2.2' => 'id-holdinstruction-callissuer',
+            '1.2.840.10040.2.3' => 'id-holdinstruction-reject',
+            '2.5.29.24' => 'id-ce-invalidityDate',
+
+            '1.2.840.113549.2.2' => 'md2',
+            '1.2.840.113549.2.5' => 'md5',
+            '1.3.14.3.2.26' => 'id-sha1',
+            '1.2.840.10040.4.1' => 'id-dsa',
+            '1.2.840.10040.4.3' => 'id-dsa-with-sha1',
+            '1.2.840.113549.1.1' => 'pkcs-1',
+            '1.2.840.113549.1.1.1' => 'rsaEncryption',
+            '1.2.840.113549.1.1.2' => 'md2WithRSAEncryption',
+            '1.2.840.113549.1.1.4' => 'md5WithRSAEncryption',
+            '1.2.840.113549.1.1.5' => 'sha1WithRSAEncryption',
+            '1.2.840.10046.2.1' => 'dhpublicnumber',
+            '2.16.840.1.101.2.1.1.22' => 'id-keyExchangeAlgorithm',
+            '1.2.840.10045' => 'ansi-X9-62',
+            '1.2.840.10045.4' => 'id-ecSigType',
+            '1.2.840.10045.4.1' => 'ecdsa-with-SHA1',
+            '1.2.840.10045.1' => 'id-fieldType',
+            '1.2.840.10045.1.1' => 'prime-field',
+            '1.2.840.10045.1.2' => 'characteristic-two-field',
+            '1.2.840.10045.1.2.3' => 'id-characteristic-two-basis',
+            '1.2.840.10045.1.2.3.1' => 'gnBasis',
+            '1.2.840.10045.1.2.3.2' => 'tpBasis',
+            '1.2.840.10045.1.2.3.3' => 'ppBasis',
+            '1.2.840.10045.2' => 'id-publicKeyType',
+            '1.2.840.10045.2.1' => 'id-ecPublicKey',
+            '1.2.840.10045.3' => 'ellipticCurve',
+            '1.2.840.10045.3.0' => 'c-TwoCurve',
+            '1.2.840.10045.3.0.1' => 'c2pnb163v1',
+            '1.2.840.10045.3.0.2' => 'c2pnb163v2',
+            '1.2.840.10045.3.0.3' => 'c2pnb163v3',
+            '1.2.840.10045.3.0.4' => 'c2pnb176w1',
+            '1.2.840.10045.3.0.5' => 'c2pnb191v1',
+            '1.2.840.10045.3.0.6' => 'c2pnb191v2',
+            '1.2.840.10045.3.0.7' => 'c2pnb191v3',
+            '1.2.840.10045.3.0.8' => 'c2pnb191v4',
+            '1.2.840.10045.3.0.9' => 'c2pnb191v5',
+            '1.2.840.10045.3.0.10' => 'c2pnb208w1',
+            '1.2.840.10045.3.0.11' => 'c2pnb239v1',
+            '1.2.840.10045.3.0.12' => 'c2pnb239v2',
+            '1.2.840.10045.3.0.13' => 'c2pnb239v3',
+            '1.2.840.10045.3.0.14' => 'c2pnb239v4',
+            '1.2.840.10045.3.0.15' => 'c2pnb239v5',
+            '1.2.840.10045.3.0.16' => 'c2pnb272w1',
+            '1.2.840.10045.3.0.17' => 'c2pnb304w1',
+            '1.2.840.10045.3.0.18' => 'c2pnb359v1',
+            '1.2.840.10045.3.0.19' => 'c2pnb368w1',
+            '1.2.840.10045.3.0.20' => 'c2pnb431r1',
+            '1.2.840.10045.3.1' => 'primeCurve',
+            '1.2.840.10045.3.1.1' => 'prime192v1',
+            '1.2.840.10045.3.1.2' => 'prime192v2',
+            '1.2.840.10045.3.1.3' => 'prime192v3',
+            '1.2.840.10045.3.1.4' => 'prime239v1',
+            '1.2.840.10045.3.1.5' => 'prime239v2',
+            '1.2.840.10045.3.1.6' => 'prime239v3',
+            '1.2.840.10045.3.1.7' => 'prime256v1',
+            '1.2.840.113549.1.1.7' => 'id-RSAES-OAEP',
+            '1.2.840.113549.1.1.9' => 'id-pSpecified',
+            '1.2.840.113549.1.1.10' => 'id-RSASSA-PSS',
+            '1.2.840.113549.1.1.8' => 'id-mgf1',
+            '1.2.840.113549.1.1.14' => 'sha224WithRSAEncryption',
+            '1.2.840.113549.1.1.11' => 'sha256WithRSAEncryption',
+            '1.2.840.113549.1.1.12' => 'sha384WithRSAEncryption',
+            '1.2.840.113549.1.1.13' => 'sha512WithRSAEncryption',
+            '2.16.840.1.101.3.4.2.4' => 'id-sha224',
+            '2.16.840.1.101.3.4.2.1' => 'id-sha256',
+            '2.16.840.1.101.3.4.2.2' => 'id-sha384',
+            '2.16.840.1.101.3.4.2.3' => 'id-sha512',
+            '1.2.643.2.2.4' => 'id-GostR3411-94-with-GostR3410-94',
+            '1.2.643.2.2.3' => 'id-GostR3411-94-with-GostR3410-2001',
+            '1.2.643.2.2.20' => 'id-GostR3410-2001',
+            '1.2.643.2.2.19' => 'id-GostR3410-94',
+            // Netscape Object Identifiers from "Netscape Certificate Extensions"
+            '2.16.840.1.113730' => 'netscape',
+            '2.16.840.1.113730.1' => 'netscape-cert-extension',
+            '2.16.840.1.113730.1.1' => 'netscape-cert-type',
+            '2.16.840.1.113730.1.13' => 'netscape-comment',
+            '2.16.840.1.113730.1.8' => 'netscape-ca-policy-url',
+            // the following are X.509 extensions not supported by phpseclib
+            '1.3.6.1.5.5.7.1.12' => 'id-pe-logotype',
+            '1.2.840.113533.7.65.0' => 'entrustVersInfo',
+            '2.16.840.1.113733.1.6.9' => 'verisignPrivate',
+            // for Certificate Signing Requests
+            // see http://tools.ietf.org/html/rfc2985
+            '1.2.840.113549.1.9.2' => 'pkcs-9-at-unstructuredName', // PKCS #9 unstructured name
+            '1.2.840.113549.1.9.7' => 'pkcs-9-at-challengePassword', // Challenge password for certificate revocations
+            '1.2.840.113549.1.9.14' => 'pkcs-9-at-extensionRequest' // Certificate extension request
+        );
+    }
+
+    /**
+     * Load X.509 certificate
+     *
+     * Returns an associative array describing the X.509 cert or a false if the cert failed to load
+     *
+     * @param string $cert
+     * @param int $mode
+     * @access public
+     * @return mixed
+     */
+    function loadX509($cert, $mode = self::FORMAT_AUTO_DETECT)
+    {
+        if (is_array($cert) && isset($cert['tbsCertificate'])) {
+            unset($this->currentCert);
+            unset($this->currentKeyIdentifier);
+            $this->dn = $cert['tbsCertificate']['subject'];
+            if (!isset($this->dn)) {
+                return false;
+            }
+            $this->currentCert = $cert;
+
+            $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
+            $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
+
+            unset($this->signatureSubject);
+
+            return $cert;
+        }
+
+        $asn1 = new ASN1();
+
+        if ($mode != self::FORMAT_DER) {
+            $newcert = $this->_extractBER($cert);
+            if ($mode == self::FORMAT_PEM && $cert == $newcert) {
+                return false;
+            }
+            $cert = $newcert;
+        }
+
+        if ($cert === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($cert);
+
+        if (!empty($decoded)) {
+            $x509 = $asn1->asn1map($decoded[0], $this->Certificate);
+        }
+        if (!isset($x509) || $x509 === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $this->signatureSubject = substr($cert, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
+
+        if ($this->_isSubArrayValid($x509, 'tbsCertificate/extensions')) {
+            $this->_mapInExtensions($x509, 'tbsCertificate/extensions', $asn1);
+        }
+        $this->_mapInDNs($x509, 'tbsCertificate/issuer/rdnSequence', $asn1);
+        $this->_mapInDNs($x509, 'tbsCertificate/subject/rdnSequence', $asn1);
+
+        $key = &$x509['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'];
+        $key = $this->_reformatKey($x509['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'], $key);
+
+        $this->currentCert = $x509;
+        $this->dn = $x509['tbsCertificate']['subject'];
+
+        $currentKeyIdentifier = $this->getExtension('id-ce-subjectKeyIdentifier');
+        $this->currentKeyIdentifier = is_string($currentKeyIdentifier) ? $currentKeyIdentifier : null;
+
+        return $x509;
+    }
+
+    /**
+     * Save X.509 certificate
+     *
+     * @param array $cert
+     * @param int $format optional
+     * @access public
+     * @return string
+     */
+    function saveX509($cert, $format = self::FORMAT_PEM)
+    {
+        if (!is_array($cert) || !isset($cert['tbsCertificate'])) {
+            return false;
+        }
+
+        switch (true) {
+            // "case !$a: case !$b: break; default: whatever();" is the same thing as "if ($a && $b) whatever()"
+            case !($algorithm = $this->_subArray($cert, 'tbsCertificate/subjectPublicKeyInfo/algorithm/algorithm')):
+            case is_object($cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
+                break;
+            default:
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $cert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'])));
+                        /* "[For RSA keys] the parameters field MUST have ASN.1 type NULL for this algorithm identifier."
+                           -- https://tools.ietf.org/html/rfc3279#section-2.3.1
+
+                           given that and the fact that RSA keys appear ot be the only key type for which the parameters field can be blank,
+                           it seems like perhaps the ASN.1 description ought not say the parameters field is OPTIONAL, but whatever.
+                         */
+                        $cert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = null;
+                        // https://tools.ietf.org/html/rfc3279#section-2.2.1
+                        $cert['signatureAlgorithm']['parameters'] = null;
+                        $cert['tbsCertificate']['signature']['parameters'] = null;
+                }
+        }
+
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
+
+        $filters = array();
+        $type_utf8_string = array('type' => ASN1::TYPE_UTF8_STRING);
+        $filters['tbsCertificate']['signature']['parameters'] = $type_utf8_string;
+        $filters['tbsCertificate']['signature']['issuer']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['issuer']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['subject']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['parameters'] = $type_utf8_string;
+        $filters['signatureAlgorithm']['parameters'] = $type_utf8_string;
+        $filters['authorityCertIssuer']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+        //$filters['policyQualifiers']['qualifier'] = $type_utf8_string;
+        $filters['distributionPoint']['fullName']['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+        $filters['directoryName']['rdnSequence']['value'] = $type_utf8_string;
+
+        /* in the case of policyQualifiers/qualifier, the type has to be \phpseclib\File\ASN1::TYPE_IA5_STRING.
+           \phpseclib\File\ASN1::TYPE_PRINTABLE_STRING will cause OpenSSL's X.509 parser to spit out random
+           characters.
+         */
+        $filters['policyQualifiers']['qualifier']
+            = array('type' => ASN1::TYPE_IA5_STRING);
+
+        $asn1->loadFilters($filters);
+
+        $this->_mapOutExtensions($cert, 'tbsCertificate/extensions', $asn1);
+        $this->_mapOutDNs($cert, 'tbsCertificate/issuer/rdnSequence', $asn1);
+        $this->_mapOutDNs($cert, 'tbsCertificate/subject/rdnSequence', $asn1);
+
+        $cert = $asn1->encodeDER($cert, $this->Certificate);
+
+        switch ($format) {
+            case self::FORMAT_DER:
+                return $cert;
+            // case self::FORMAT_PEM:
+            default:
+                return "-----BEGIN CERTIFICATE-----\r\n" . chunk_split(base64_encode($cert), 64) . '-----END CERTIFICATE-----';
+        }
+    }
+
+    /**
+     * Map extension values from octet string to extension-specific internal
+     *   format.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapInExtensions(&$root, $path, $asn1)
+    {
+        $extensions = &$this->_subArrayUnchecked($root, $path);
+
+        if ($extensions) {
+            for ($i = 0; $i < count($extensions); $i++) {
+                $id = $extensions[$i]['extnId'];
+                $value = &$extensions[$i]['extnValue'];
+                $value = base64_decode($value);
+                $decoded = $asn1->decodeBER($value);
+                /* [extnValue] contains the DER encoding of an ASN.1 value
+                   corresponding to the extension type identified by extnID */
+                $map = $this->_getMapping($id);
+                if (!is_bool($map)) {
+                    $decoder = $id == 'id-ce-nameConstraints' ?
+                        array($this, '_decodeNameConstraintIP') :
+                        array($this, '_decodeIP');
+                    $mapped = $asn1->asn1map($decoded[0], $map, array('iPAddress' => $decoder));
+                    $value = $mapped === false ? $decoded[0] : $mapped;
+
+                    if ($id == 'id-ce-certificatePolicies') {
+                        for ($j = 0; $j < count($value); $j++) {
+                            if (!isset($value[$j]['policyQualifiers'])) {
+                                continue;
+                            }
+                            for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
+                                $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
+                                $map = $this->_getMapping($subid);
+                                $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
+                                if ($map !== false) {
+                                    $decoded = $asn1->decodeBER($subvalue);
+                                    $mapped = $asn1->asn1map($decoded[0], $map);
+                                    $subvalue = $mapped === false ? $decoded[0] : $mapped;
+                                }
+                            }
+                        }
+                    }
+                } else {
+                    $value = base64_encode($value);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map extension values from extension-specific internal format to
+     *   octet string.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapOutExtensions(&$root, $path, $asn1)
+    {
+        $extensions = &$this->_subArray($root, $path);
+
+        if (is_array($extensions)) {
+            $size = count($extensions);
+            for ($i = 0; $i < $size; $i++) {
+                if ($extensions[$i] instanceof Element) {
+                    continue;
+                }
+
+                $id = $extensions[$i]['extnId'];
+                $value = &$extensions[$i]['extnValue'];
+
+                switch ($id) {
+                    case 'id-ce-certificatePolicies':
+                        for ($j = 0; $j < count($value); $j++) {
+                            if (!isset($value[$j]['policyQualifiers'])) {
+                                continue;
+                            }
+                            for ($k = 0; $k < count($value[$j]['policyQualifiers']); $k++) {
+                                $subid = $value[$j]['policyQualifiers'][$k]['policyQualifierId'];
+                                $map = $this->_getMapping($subid);
+                                $subvalue = &$value[$j]['policyQualifiers'][$k]['qualifier'];
+                                if ($map !== false) {
+                                    // by default \phpseclib\File\ASN1 will try to render qualifier as a \phpseclib\File\ASN1::TYPE_IA5_STRING since it's
+                                    // actual type is \phpseclib\File\ASN1::TYPE_ANY
+                                    $subvalue = new Element($asn1->encodeDER($subvalue, $map));
+                                }
+                            }
+                        }
+                        break;
+                    case 'id-ce-authorityKeyIdentifier': // use 00 as the serial number instead of an empty string
+                        if (isset($value['authorityCertSerialNumber'])) {
+                            if ($value['authorityCertSerialNumber']->toBytes() == '') {
+                                $temp = chr((ASN1::CLASS_CONTEXT_SPECIFIC << 6) | 2) . "\1\0";
+                                $value['authorityCertSerialNumber'] = new Element($temp);
+                            }
+                        }
+                }
+
+                /* [extnValue] contains the DER encoding of an ASN.1 value
+                   corresponding to the extension type identified by extnID */
+                $map = $this->_getMapping($id);
+                if (is_bool($map)) {
+                    if (!$map) {
+                        user_error($id . ' is not a currently supported extension');
+                        unset($extensions[$i]);
+                    }
+                } else {
+                    $temp = $asn1->encodeDER($value, $map, array('iPAddress' => array($this, '_encodeIP')));
+                    $value = base64_encode($temp);
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attribute values from ANY type to attribute-specific internal
+     *   format.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapInAttributes(&$root, $path, $asn1)
+    {
+        $attributes = &$this->_subArray($root, $path);
+
+        if (is_array($attributes)) {
+            for ($i = 0; $i < count($attributes); $i++) {
+                $id = $attributes[$i]['type'];
+                /* $value contains the DER encoding of an ASN.1 value
+                   corresponding to the attribute type identified by type */
+                $map = $this->_getMapping($id);
+                if (is_array($attributes[$i]['value'])) {
+                    $values = &$attributes[$i]['value'];
+                    for ($j = 0; $j < count($values); $j++) {
+                        $value = $asn1->encodeDER($values[$j], $this->AttributeValue);
+                        $decoded = $asn1->decodeBER($value);
+                        if (!is_bool($map)) {
+                            $mapped = $asn1->asn1map($decoded[0], $map);
+                            if ($mapped !== false) {
+                                $values[$j] = $mapped;
+                            }
+                            if ($id == 'pkcs-9-at-extensionRequest' && $this->_isSubArrayValid($values, $j)) {
+                                $this->_mapInExtensions($values, $j, $asn1);
+                            }
+                        } elseif ($map) {
+                            $values[$j] = base64_encode($value);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Map attribute values from attribute-specific internal format to
+     *   ANY type.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapOutAttributes(&$root, $path, $asn1)
+    {
+        $attributes = &$this->_subArray($root, $path);
+
+        if (is_array($attributes)) {
+            $size = count($attributes);
+            for ($i = 0; $i < $size; $i++) {
+                /* [value] contains the DER encoding of an ASN.1 value
+                   corresponding to the attribute type identified by type */
+                $id = $attributes[$i]['type'];
+                $map = $this->_getMapping($id);
+                if ($map === false) {
+                    user_error($id . ' is not a currently supported attribute', E_USER_NOTICE);
+                    unset($attributes[$i]);
+                } elseif (is_array($attributes[$i]['value'])) {
+                    $values = &$attributes[$i]['value'];
+                    for ($j = 0; $j < count($values); $j++) {
+                        switch ($id) {
+                            case 'pkcs-9-at-extensionRequest':
+                                $this->_mapOutExtensions($values, $j, $asn1);
+                                break;
+                        }
+
+                        if (!is_bool($map)) {
+                            $temp = $asn1->encodeDER($values[$j], $map);
+                            $decoded = $asn1->decodeBER($temp);
+                            $values[$j] = $asn1->asn1map($decoded[0], $this->AttributeValue);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Map DN values from ANY type to DN-specific internal
+     *   format.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapInDNs(&$root, $path, $asn1)
+    {
+        $dns = &$this->_subArray($root, $path);
+
+        if (is_array($dns)) {
+            for ($i = 0; $i < count($dns); $i++) {
+                for ($j = 0; $j < count($dns[$i]); $j++) {
+                    $type = $dns[$i][$j]['type'];
+                    $value = &$dns[$i][$j]['value'];
+                    if (is_object($value) && $value instanceof Element) {
+                        $map = $this->_getMapping($type);
+                        if (!is_bool($map)) {
+                            $decoded = $asn1->decodeBER($value);
+                            $value = $asn1->asn1map($decoded[0], $map);
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Map DN values from DN-specific internal format to
+     *   ANY type.
+     *
+     * @param array $root (by reference)
+     * @param string $path
+     * @param object $asn1
+     * @access private
+     */
+    function _mapOutDNs(&$root, $path, $asn1)
+    {
+        $dns = &$this->_subArray($root, $path);
+
+        if (is_array($dns)) {
+            $size = count($dns);
+            for ($i = 0; $i < $size; $i++) {
+                for ($j = 0; $j < count($dns[$i]); $j++) {
+                    $type = $dns[$i][$j]['type'];
+                    $value = &$dns[$i][$j]['value'];
+                    if (is_object($value) && $value instanceof Element) {
+                        continue;
+                    }
+
+                    $map = $this->_getMapping($type);
+                    if (!is_bool($map)) {
+                        $value = new Element($asn1->encodeDER($value, $map));
+                    }
+                }
+            }
+        }
+    }
+
+    /**
+     * Associate an extension ID to an extension mapping
+     *
+     * @param string $extnId
+     * @access private
+     * @return mixed
+     */
+    function _getMapping($extnId)
+    {
+        if (!is_string($extnId)) { // eg. if it's a \phpseclib\File\ASN1\Element object
+            return true;
+        }
+
+        switch ($extnId) {
+            case 'id-ce-keyUsage':
+                return $this->KeyUsage;
+            case 'id-ce-basicConstraints':
+                return $this->BasicConstraints;
+            case 'id-ce-subjectKeyIdentifier':
+                return $this->KeyIdentifier;
+            case 'id-ce-cRLDistributionPoints':
+                return $this->CRLDistributionPoints;
+            case 'id-ce-authorityKeyIdentifier':
+                return $this->AuthorityKeyIdentifier;
+            case 'id-ce-certificatePolicies':
+                return $this->CertificatePolicies;
+            case 'id-ce-extKeyUsage':
+                return $this->ExtKeyUsageSyntax;
+            case 'id-pe-authorityInfoAccess':
+                return $this->AuthorityInfoAccessSyntax;
+            case 'id-pe-subjectInfoAccess':
+                return $this->SubjectInfoAccessSyntax;
+            case 'id-ce-subjectAltName':
+                return $this->SubjectAltName;
+            case 'id-ce-subjectDirectoryAttributes':
+                return $this->SubjectDirectoryAttributes;
+            case 'id-ce-privateKeyUsagePeriod':
+                return $this->PrivateKeyUsagePeriod;
+            case 'id-ce-issuerAltName':
+                return $this->IssuerAltName;
+            case 'id-ce-policyMappings':
+                return $this->PolicyMappings;
+            case 'id-ce-nameConstraints':
+                return $this->NameConstraints;
+
+            case 'netscape-cert-type':
+                return $this->netscape_cert_type;
+            case 'netscape-comment':
+                return $this->netscape_comment;
+            case 'netscape-ca-policy-url':
+                return $this->netscape_ca_policy_url;
+
+            // since id-qt-cps isn't a constructed type it will have already been decoded as a string by the time it gets
+            // back around to asn1map() and we don't want it decoded again.
+            //case 'id-qt-cps':
+            //    return $this->CPSuri;
+            case 'id-qt-unotice':
+                return $this->UserNotice;
+
+            // the following OIDs are unsupported but we don't want them to give notices when calling saveX509().
+            case 'id-pe-logotype': // http://www.ietf.org/rfc/rfc3709.txt
+            case 'entrustVersInfo':
+            // http://support.microsoft.com/kb/287547
+            case '1.3.6.1.4.1.311.20.2': // szOID_ENROLL_CERTTYPE_EXTENSION
+            case '1.3.6.1.4.1.311.21.1': // szOID_CERTSRV_CA_VERSION
+            // "SET Secure Electronic Transaction Specification"
+            // http://www.maithean.com/docs/set_bk3.pdf
+            case '2.23.42.7.0': // id-set-hashedRootKey
+            // "Certificate Transparency"
+            // https://tools.ietf.org/html/rfc6962
+            case '1.3.6.1.4.1.11129.2.4.2':
+            // "Qualified Certificate statements"
+            // https://tools.ietf.org/html/rfc3739#section-3.2.6
+            case '1.3.6.1.5.5.7.1.3':
+                return true;
+
+            // CSR attributes
+            case 'pkcs-9-at-unstructuredName':
+                return $this->PKCS9String;
+            case 'pkcs-9-at-challengePassword':
+                return $this->DirectoryString;
+            case 'pkcs-9-at-extensionRequest':
+                return $this->Extensions;
+
+            // CRL extensions.
+            case 'id-ce-cRLNumber':
+                return $this->CRLNumber;
+            case 'id-ce-deltaCRLIndicator':
+                return $this->CRLNumber;
+            case 'id-ce-issuingDistributionPoint':
+                return $this->IssuingDistributionPoint;
+            case 'id-ce-freshestCRL':
+                return $this->CRLDistributionPoints;
+            case 'id-ce-cRLReasons':
+                return $this->CRLReason;
+            case 'id-ce-invalidityDate':
+                return $this->InvalidityDate;
+            case 'id-ce-certificateIssuer':
+                return $this->CertificateIssuer;
+            case 'id-ce-holdInstructionCode':
+                return $this->HoldInstructionCode;
+            case 'id-at-postalAddress':
+                return $this->PostalAddress;
+        }
+
+        return false;
+    }
+
+    /**
+     * Load an X.509 certificate as a certificate authority
+     *
+     * @param string $cert
+     * @access public
+     * @return bool
+     */
+    function loadCA($cert)
+    {
+        $olddn = $this->dn;
+        $oldcert = $this->currentCert;
+        $oldsigsubj = $this->signatureSubject;
+        $oldkeyid = $this->currentKeyIdentifier;
+
+        $cert = $this->loadX509($cert);
+        if (!$cert) {
+            $this->dn = $olddn;
+            $this->currentCert = $oldcert;
+            $this->signatureSubject = $oldsigsubj;
+            $this->currentKeyIdentifier = $oldkeyid;
+
+            return false;
+        }
+
+        /* From RFC5280 "PKIX Certificate and CRL Profile":
+
+           If the keyUsage extension is present, then the subject public key
+           MUST NOT be used to verify signatures on certificates or CRLs unless
+           the corresponding keyCertSign or cRLSign bit is set. */
+        //$keyUsage = $this->getExtension('id-ce-keyUsage');
+        //if ($keyUsage && !in_array('keyCertSign', $keyUsage)) {
+        //    return false;
+        //}
+
+        /* From RFC5280 "PKIX Certificate and CRL Profile":
+
+           The cA boolean indicates whether the certified public key may be used
+           to verify certificate signatures.  If the cA boolean is not asserted,
+           then the keyCertSign bit in the key usage extension MUST NOT be
+           asserted.  If the basic constraints extension is not present in a
+           version 3 certificate, or the extension is present but the cA boolean
+           is not asserted, then the certified public key MUST NOT be used to
+           verify certificate signatures. */
+        //$basicConstraints = $this->getExtension('id-ce-basicConstraints');
+        //if (!$basicConstraints || !$basicConstraints['cA']) {
+        //    return false;
+        //}
+
+        $this->CAs[] = $cert;
+
+        $this->dn = $olddn;
+        $this->currentCert = $oldcert;
+        $this->signatureSubject = $oldsigsubj;
+
+        return true;
+    }
+
+    /**
+     * Validate an X.509 certificate against a URL
+     *
+     * From RFC2818 "HTTP over TLS":
+     *
+     * Matching is performed using the matching rules specified by
+     * [RFC2459].  If more than one identity of a given type is present in
+     * the certificate (e.g., more than one dNSName name, a match in any one
+     * of the set is considered acceptable.) Names may contain the wildcard
+     * character * which is considered to match any single domain name
+     * component or component fragment. E.g., *.a.com matches foo.a.com but
+     * not bar.foo.a.com. f*.com matches foo.com but not bar.com.
+     *
+     * @param string $url
+     * @access public
+     * @return bool
+     */
+    function validateURL($url)
+    {
+        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
+            return false;
+        }
+
+        $components = parse_url($url);
+        if (!isset($components['host'])) {
+            return false;
+        }
+
+        if ($names = $this->getExtension('id-ce-subjectAltName')) {
+            foreach ($names as $name) {
+                foreach ($name as $key => $value) {
+                    $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value);
+                    switch ($key) {
+                        case 'dNSName':
+                            /* From RFC2818 "HTTP over TLS":
+
+                               If a subjectAltName extension of type dNSName is present, that MUST
+                               be used as the identity. Otherwise, the (most specific) Common Name
+                               field in the Subject field of the certificate MUST be used. Although
+                               the use of the Common Name is existing practice, it is deprecated and
+                               Certification Authorities are encouraged to use the dNSName instead. */
+                            if (preg_match('#^' . $value . '$#', $components['host'])) {
+                                return true;
+                            }
+                            break;
+                        case 'iPAddress':
+                            /* From RFC2818 "HTTP over TLS":
+
+                               In some cases, the URI is specified as an IP address rather than a
+                               hostname. In this case, the iPAddress subjectAltName must be present
+                               in the certificate and must exactly match the IP in the URI. */
+                            if (preg_match('#(?:\d{1-3}\.){4}#', $components['host'] . '.') && preg_match('#^' . $value . '$#', $components['host'])) {
+                                return true;
+                            }
+                    }
+                }
+            }
+            return false;
+        }
+
+        if ($value = $this->getDNProp('id-at-commonName')) {
+            $value = str_replace(array('.', '*'), array('\.', '[^.]*'), $value[0]);
+            return preg_match('#^' . $value . '$#', $components['host']);
+        }
+
+        return false;
+    }
+
+    /**
+     * Validate a date
+     *
+     * If $date isn't defined it is assumed to be the current date.
+     *
+     * @param \DateTime|string $date optional
+     * @access public
+     */
+    function validateDate($date = null)
+    {
+        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
+            return false;
+        }
+
+        if (!isset($date)) {
+            $date = new DateTime(null, new DateTimeZone(@date_default_timezone_get()));
+        }
+
+        $notBefore = $this->currentCert['tbsCertificate']['validity']['notBefore'];
+        $notBefore = isset($notBefore['generalTime']) ? $notBefore['generalTime'] : $notBefore['utcTime'];
+
+        $notAfter = $this->currentCert['tbsCertificate']['validity']['notAfter'];
+        $notAfter = isset($notAfter['generalTime']) ? $notAfter['generalTime'] : $notAfter['utcTime'];
+
+        if (is_string($date)) {
+            $date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
+        }
+
+        $notBefore = new DateTime($notBefore, new DateTimeZone(@date_default_timezone_get()));
+        $notAfter = new DateTime($notAfter, new DateTimeZone(@date_default_timezone_get()));
+
+        switch (true) {
+            case $date < $notBefore:
+            case $date > $notAfter:
+                return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Fetches a URL
+     *
+     * @param string $url
+     * @access private
+     * @return bool|string
+     */
+    static function _fetchURL($url)
+    {
+        if (self::$disable_url_fetch) {
+            return false;
+        }
+
+        $parts = parse_url($url);
+        $data = '';
+        switch ($parts['scheme']) {
+            case 'http':
+                $fsock = @fsockopen($parts['host'], isset($parts['port']) ? $parts['port'] : 80);
+                if (!$fsock) {
+                    return false;
+                }
+                fputs($fsock, "GET $parts[path] HTTP/1.0\r\n");
+                fputs($fsock, "Host: $parts[host]\r\n\r\n");
+                $line = fgets($fsock, 1024);
+                if (strlen($line) < 3) {
+                    return false;
+                }
+                preg_match('#HTTP/1.\d (\d{3})#', $line, $temp);
+                if ($temp[1] != '200') {
+                    return false;
+                }
+
+                // skip the rest of the headers in the http response
+                while (!feof($fsock) && fgets($fsock, 1024) != "\r\n") {
+                }
+
+                while (!feof($fsock)) {
+                    $temp = fread($fsock, 1024);
+                    if ($temp === false) {
+                        return false;
+                    }
+                    $data.= $temp;
+                }
+
+                break;
+            //case 'ftp':
+            //case 'ldap':
+            //default:
+        }
+
+        return $data;
+    }
+
+    /**
+     * Validates an intermediate cert as identified via authority info access extension
+     *
+     * See https://tools.ietf.org/html/rfc4325 for more info
+     *
+     * @param bool $caonly
+     * @param int $count
+     * @access private
+     * @return bool
+     */
+    function _testForIntermediate($caonly, $count)
+    {
+        $opts = $this->getExtension('id-pe-authorityInfoAccess');
+        if (!is_array($opts)) {
+            return false;
+        }
+        foreach ($opts as $opt) {
+            if ($opt['accessMethod'] == 'id-ad-caIssuers') {
+                // accessLocation is a GeneralName. GeneralName fields support stuff like email addresses, IP addresses, LDAP,
+                // etc, but we're only supporting URI's. URI's and LDAP are the only thing https://tools.ietf.org/html/rfc4325
+                // discusses
+                if (isset($opt['accessLocation']['uniformResourceIdentifier'])) {
+                    $url = $opt['accessLocation']['uniformResourceIdentifier'];
+                    break;
+                }
+            }
+        }
+
+        if (!isset($url)) {
+            return false;
+        }
+
+        $cert = static::_fetchURL($url);
+        if (!is_string($cert)) {
+            return false;
+        }
+
+        $parent = new static();
+        $parent->CAs = $this->CAs;
+        /*
+         "Conforming applications that support HTTP or FTP for accessing
+          certificates MUST be able to accept .cer files and SHOULD be able
+          to accept .p7c files." -- https://tools.ietf.org/html/rfc4325
+
+         A .p7c file is 'a "certs-only" CMS message as specified in RFC 2797"
+
+         These are currently unsupported
+        */
+        if (!is_array($parent->loadX509($cert))) {
+            return false;
+        }
+
+        if (!$parent->_validateSignatureCountable($caonly, ++$count)) {
+            return false;
+        }
+
+        $this->CAs[] = $parent->currentCert;
+        //$this->loadCA($cert);
+
+        return true;
+    }
+
+    /**
+     * Validate a signature
+     *
+     * Works on X.509 certs, CSR's and CRL's.
+     * Returns true if the signature is verified, false if it is not correct or null on error
+     *
+     * By default returns false for self-signed certs. Call validateSignature(false) to make this support
+     * self-signed.
+     *
+     * The behavior of this function is inspired by {@link http://php.net/openssl-verify openssl_verify}.
+     *
+     * @param bool $caonly optional
+     * @access public
+     * @return mixed
+     */
+    function validateSignature($caonly = true)
+    {
+        return $this->_validateSignatureCountable($caonly, 0);
+    }
+
+    /**
+     * Validate a signature
+     *
+     * Performs said validation whilst keeping track of how many times validation method is called
+     *
+     * @param bool $caonly
+     * @param int $count
+     * @access private
+     * @return mixed
+     */
+    function _validateSignatureCountable($caonly, $count)
+    {
+        if (!is_array($this->currentCert) || !isset($this->signatureSubject)) {
+            return null;
+        }
+
+        if ($count == self::$recur_limit) {
+            return false;
+        }
+
+        /* TODO:
+           "emailAddress attribute values are not case-sensitive (e.g., "subscriber@example.com" is the same as "SUBSCRIBER@EXAMPLE.COM")."
+            -- http://tools.ietf.org/html/rfc5280#section-4.1.2.6
+
+           implement pathLenConstraint in the id-ce-basicConstraints extension */
+
+        switch (true) {
+            case isset($this->currentCert['tbsCertificate']):
+                // self-signed cert
+                switch (true) {
+                    case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $this->currentCert['tbsCertificate']['subject']:
+                    case defined('FILE_X509_IGNORE_TYPE') && $this->getIssuerDN(self::DN_STRING) === $this->getDN(self::DN_STRING):
+                        $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                        $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier');
+                        switch (true) {
+                            case !is_array($authorityKey):
+                            case !$subjectKeyID:
+                            case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                $signingCert = $this->currentCert; // working cert
+                        }
+                }
+
+                if (!empty($this->CAs)) {
+                    for ($i = 0; $i < count($this->CAs); $i++) {
+                        // even if the cert is a self-signed one we still want to see if it's a CA;
+                        // if not, we'll conditionally return an error
+                        $ca = $this->CAs[$i];
+                        switch (true) {
+                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']:
+                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertificate']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
+                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
+                                switch (true) {
+                                    case !is_array($authorityKey):
+                                    case !$subjectKeyID:
+                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
+                                            break 2; // serial mismatch - check other ca
+                                        }
+                                        $signingCert = $ca; // working cert
+                                        break 3;
+                                }
+                        }
+                    }
+                    if (count($this->CAs) == $i && $caonly) {
+                        return $this->_testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
+                    }
+                } elseif (!isset($signingCert) || $caonly) {
+                    return $this->_testForIntermediate($caonly, $count) && $this->validateSignature($caonly);
+                }
+                return $this->_validateSignature(
+                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
+                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
+                    $this->currentCert['signatureAlgorithm']['algorithm'],
+                    substr(base64_decode($this->currentCert['signature']), 1),
+                    $this->signatureSubject
+                );
+            case isset($this->currentCert['certificationRequestInfo']):
+                return $this->_validateSignature(
+                    $this->currentCert['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'],
+                    $this->currentCert['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'],
+                    $this->currentCert['signatureAlgorithm']['algorithm'],
+                    substr(base64_decode($this->currentCert['signature']), 1),
+                    $this->signatureSubject
+                );
+            case isset($this->currentCert['publicKeyAndChallenge']):
+                return $this->_validateSignature(
+                    $this->currentCert['publicKeyAndChallenge']['spki']['algorithm']['algorithm'],
+                    $this->currentCert['publicKeyAndChallenge']['spki']['subjectPublicKey'],
+                    $this->currentCert['signatureAlgorithm']['algorithm'],
+                    substr(base64_decode($this->currentCert['signature']), 1),
+                    $this->signatureSubject
+                );
+            case isset($this->currentCert['tbsCertList']):
+                if (!empty($this->CAs)) {
+                    for ($i = 0; $i < count($this->CAs); $i++) {
+                        $ca = $this->CAs[$i];
+                        switch (true) {
+                            case !defined('FILE_X509_IGNORE_TYPE') && $this->currentCert['tbsCertList']['issuer'] === $ca['tbsCertificate']['subject']:
+                            case defined('FILE_X509_IGNORE_TYPE') && $this->getDN(self::DN_STRING, $this->currentCert['tbsCertList']['issuer']) === $this->getDN(self::DN_STRING, $ca['tbsCertificate']['subject']):
+                                $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier');
+                                $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
+                                switch (true) {
+                                    case !is_array($authorityKey):
+                                    case !$subjectKeyID:
+                                    case isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                                        if (is_array($authorityKey) && isset($authorityKey['authorityCertSerialNumber']) && !$authorityKey['authorityCertSerialNumber']->equals($ca['tbsCertificate']['serialNumber'])) {
+                                            break 2; // serial mismatch - check other ca
+                                        }
+                                        $signingCert = $ca; // working cert
+                                        break 3;
+                                }
+                        }
+                    }
+                }
+                if (!isset($signingCert)) {
+                    return false;
+                }
+                return $this->_validateSignature(
+                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['algorithm']['algorithm'],
+                    $signingCert['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'],
+                    $this->currentCert['signatureAlgorithm']['algorithm'],
+                    substr(base64_decode($this->currentCert['signature']), 1),
+                    $this->signatureSubject
+                );
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Validates a signature
+     *
+     * Returns true if the signature is verified, false if it is not correct or null on error
+     *
+     * @param string $publicKeyAlgorithm
+     * @param string $publicKey
+     * @param string $signatureAlgorithm
+     * @param string $signature
+     * @param string $signatureSubject
+     * @access private
+     * @return int
+     */
+    function _validateSignature($publicKeyAlgorithm, $publicKey, $signatureAlgorithm, $signature, $signatureSubject)
+    {
+        switch ($publicKeyAlgorithm) {
+            case 'rsaEncryption':
+                $rsa = new RSA();
+                $rsa->loadKey($publicKey);
+
+                switch ($signatureAlgorithm) {
+                    case 'md2WithRSAEncryption':
+                    case 'md5WithRSAEncryption':
+                    case 'sha1WithRSAEncryption':
+                    case 'sha224WithRSAEncryption':
+                    case 'sha256WithRSAEncryption':
+                    case 'sha384WithRSAEncryption':
+                    case 'sha512WithRSAEncryption':
+                        $rsa->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
+                        $rsa->setSignatureMode(RSA::SIGNATURE_PKCS1);
+                        if (!@$rsa->verify($signatureSubject, $signature)) {
+                            return false;
+                        }
+                        break;
+                    default:
+                        return null;
+                }
+                break;
+            default:
+                return null;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets the recursion limit
+     *
+     * When validating a signature it may be necessary to download intermediate certs from URI's.
+     * An intermediate cert that linked to itself would result in an infinite loop so to prevent
+     * that we set a recursion limit. A negative number means that there is no recursion limit.
+     *
+     * @param int $count
+     * @access public
+     */
+    static function setRecurLimit($count)
+    {
+        self::$recur_limit = $count;
+    }
+
+    /**
+     * Prevents URIs from being automatically retrieved
+     *
+     * @access public
+     */
+    static function disableURLFetch()
+    {
+        self::$disable_url_fetch = true;
+    }
+
+    /**
+     * Allows URIs to be automatically retrieved
+     *
+     * @access public
+     */
+    static function enableURLFetch()
+    {
+        self::$disable_url_fetch = false;
+    }
+
+    /**
+     * Reformat public keys
+     *
+     * Reformats a public key to a format supported by phpseclib (if applicable)
+     *
+     * @param string $algorithm
+     * @param string $key
+     * @access private
+     * @return string
+     */
+    function _reformatKey($algorithm, $key)
+    {
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                return
+                    "-----BEGIN RSA PUBLIC KEY-----\r\n" .
+                    // subjectPublicKey is stored as a bit string in X.509 certs.  the first byte of a bit string represents how many bits
+                    // in the last byte should be ignored.  the following only supports non-zero stuff but as none of the X.509 certs Firefox
+                    // uses as a cert authority actually use a non-zero bit I think it's safe to assume that none do.
+                    chunk_split(base64_encode(substr(base64_decode($key), 1)), 64) .
+                    '-----END RSA PUBLIC KEY-----';
+            default:
+                return $key;
+        }
+    }
+
+    /**
+     * Decodes an IP address
+     *
+     * Takes in a base64 encoded "blob" and returns a human readable IP address
+     *
+     * @param string $ip
+     * @access private
+     * @return string
+     */
+    function _decodeIP($ip)
+    {
+        return inet_ntop(base64_decode($ip));
+    }
+
+    /**
+     * Decodes an IP address in a name constraints extension
+     *
+     * Takes in a base64 encoded "blob" and returns a human readable IP address / mask
+     *
+     * @param string $ip
+     * @access private
+     * @return array
+     */
+    function _decodeNameConstraintIP($ip)
+    {
+        $ip = base64_decode($ip);
+        $size = strlen($ip) >> 1;
+        $mask = substr($ip, $size);
+        $ip = substr($ip, 0, $size);
+        return array(inet_ntop($ip), inet_ntop($mask));
+    }
+
+    /**
+     * Encodes an IP address
+     *
+     * Takes a human readable IP address into a base64-encoded "blob"
+     *
+     * @param string|array $ip
+     * @access private
+     * @return string
+     */
+    function _encodeIP($ip)
+    {
+        return is_string($ip) ?
+            base64_encode(inet_pton($ip)) :
+            base64_encode(inet_pton($ip[0]) . inet_pton($ip[1]));
+    }
+
+    /**
+     * "Normalizes" a Distinguished Name property
+     *
+     * @param string $propName
+     * @access private
+     * @return mixed
+     */
+    function _translateDNProp($propName)
+    {
+        switch (strtolower($propName)) {
+            case 'id-at-countryname':
+            case 'countryname':
+            case 'c':
+                return 'id-at-countryName';
+            case 'id-at-organizationname':
+            case 'organizationname':
+            case 'o':
+                return 'id-at-organizationName';
+            case 'id-at-dnqualifier':
+            case 'dnqualifier':
+                return 'id-at-dnQualifier';
+            case 'id-at-commonname':
+            case 'commonname':
+            case 'cn':
+                return 'id-at-commonName';
+            case 'id-at-stateorprovincename':
+            case 'stateorprovincename':
+            case 'state':
+            case 'province':
+            case 'provincename':
+            case 'st':
+                return 'id-at-stateOrProvinceName';
+            case 'id-at-localityname':
+            case 'localityname':
+            case 'l':
+                return 'id-at-localityName';
+            case 'id-emailaddress':
+            case 'emailaddress':
+                return 'pkcs-9-at-emailAddress';
+            case 'id-at-serialnumber':
+            case 'serialnumber':
+                return 'id-at-serialNumber';
+            case 'id-at-postalcode':
+            case 'postalcode':
+                return 'id-at-postalCode';
+            case 'id-at-streetaddress':
+            case 'streetaddress':
+                return 'id-at-streetAddress';
+            case 'id-at-name':
+            case 'name':
+                return 'id-at-name';
+            case 'id-at-givenname':
+            case 'givenname':
+                return 'id-at-givenName';
+            case 'id-at-surname':
+            case 'surname':
+            case 'sn':
+                return 'id-at-surname';
+            case 'id-at-initials':
+            case 'initials':
+                return 'id-at-initials';
+            case 'id-at-generationqualifier':
+            case 'generationqualifier':
+                return 'id-at-generationQualifier';
+            case 'id-at-organizationalunitname':
+            case 'organizationalunitname':
+            case 'ou':
+                return 'id-at-organizationalUnitName';
+            case 'id-at-pseudonym':
+            case 'pseudonym':
+                return 'id-at-pseudonym';
+            case 'id-at-title':
+            case 'title':
+                return 'id-at-title';
+            case 'id-at-description':
+            case 'description':
+                return 'id-at-description';
+            case 'id-at-role':
+            case 'role':
+                return 'id-at-role';
+            case 'id-at-uniqueidentifier':
+            case 'uniqueidentifier':
+            case 'x500uniqueidentifier':
+                return 'id-at-uniqueIdentifier';
+            case 'postaladdress':
+            case 'id-at-postaladdress':
+                return 'id-at-postalAddress';
+            default:
+                return false;
+        }
+    }
+
+    /**
+     * Set a Distinguished Name property
+     *
+     * @param string $propName
+     * @param mixed $propValue
+     * @param string $type optional
+     * @access public
+     * @return bool
+     */
+    function setDNProp($propName, $propValue, $type = 'utf8String')
+    {
+        if (empty($this->dn)) {
+            $this->dn = array('rdnSequence' => array());
+        }
+
+        if (($propName = $this->_translateDNProp($propName)) === false) {
+            return false;
+        }
+
+        foreach ((array) $propValue as $v) {
+            if (!is_array($v) && isset($type)) {
+                $v = array($type => $v);
+            }
+            $this->dn['rdnSequence'][] = array(
+                array(
+                    'type' => $propName,
+                    'value'=> $v
+                )
+            );
+        }
+
+        return true;
+    }
+
+    /**
+     * Remove Distinguished Name properties
+     *
+     * @param string $propName
+     * @access public
+     */
+    function removeDNProp($propName)
+    {
+        if (empty($this->dn)) {
+            return;
+        }
+
+        if (($propName = $this->_translateDNProp($propName)) === false) {
+            return;
+        }
+
+        $dn = &$this->dn['rdnSequence'];
+        $size = count($dn);
+        for ($i = 0; $i < $size; $i++) {
+            if ($dn[$i][0]['type'] == $propName) {
+                unset($dn[$i]);
+            }
+        }
+
+        $dn = array_values($dn);
+        // fix for https://bugs.php.net/75433 affecting PHP 7.2
+        if (!isset($dn[0])) {
+            $dn = array_splice($dn, 0, 0);
+        }
+    }
+
+    /**
+     * Get Distinguished Name properties
+     *
+     * @param string $propName
+     * @param array $dn optional
+     * @param bool $withType optional
+     * @return mixed
+     * @access public
+     */
+    function getDNProp($propName, $dn = null, $withType = false)
+    {
+        if (!isset($dn)) {
+            $dn = $this->dn;
+        }
+
+        if (empty($dn)) {
+            return false;
+        }
+
+        if (($propName = $this->_translateDNProp($propName)) === false) {
+            return false;
+        }
+
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
+        $filters = array();
+        $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+        $asn1->loadFilters($filters);
+        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
+        $dn = $dn['rdnSequence'];
+        $result = array();
+        for ($i = 0; $i < count($dn); $i++) {
+            if ($dn[$i][0]['type'] == $propName) {
+                $v = $dn[$i][0]['value'];
+                if (!$withType) {
+                    if (is_array($v)) {
+                        foreach ($v as $type => $s) {
+                            $type = array_search($type, $asn1->ANYmap, true);
+                            if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                                $s = $asn1->convert($s, $type);
+                                if ($s !== false) {
+                                    $v = $s;
+                                    break;
+                                }
+                            }
+                        }
+                        if (is_array($v)) {
+                            $v = array_pop($v); // Always strip data type.
+                        }
+                    } elseif (is_object($v) && $v instanceof Element) {
+                        $map = $this->_getMapping($propName);
+                        if (!is_bool($map)) {
+                            $decoded = $asn1->decodeBER($v);
+                            $v = $asn1->asn1map($decoded[0], $map);
+                        }
+                    }
+                }
+                $result[] = $v;
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Set a Distinguished Name
+     *
+     * @param mixed $dn
+     * @param bool $merge optional
+     * @param string $type optional
+     * @access public
+     * @return bool
+     */
+    function setDN($dn, $merge = false, $type = 'utf8String')
+    {
+        if (!$merge) {
+            $this->dn = null;
+        }
+
+        if (is_array($dn)) {
+            if (isset($dn['rdnSequence'])) {
+                $this->dn = $dn; // No merge here.
+                return true;
+            }
+
+            // handles stuff generated by openssl_x509_parse()
+            foreach ($dn as $prop => $value) {
+                if (!$this->setDNProp($prop, $value, $type)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        // handles everything else
+        $results = preg_split('#((?:^|, *|/)(?:C=|O=|OU=|CN=|L=|ST=|SN=|postalCode=|streetAddress=|emailAddress=|serialNumber=|organizationalUnitName=|title=|description=|role=|x500UniqueIdentifier=|postalAddress=))#', $dn, -1, PREG_SPLIT_DELIM_CAPTURE);
+        for ($i = 1; $i < count($results); $i+=2) {
+            $prop = trim($results[$i], ', =/');
+            $value = $results[$i + 1];
+            if (!$this->setDNProp($prop, $value, $type)) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Get the Distinguished Name for a certificates subject
+     *
+     * @param mixed $format optional
+     * @param array $dn optional
+     * @access public
+     * @return bool
+     */
+    function getDN($format = self::DN_ARRAY, $dn = null)
+    {
+        if (!isset($dn)) {
+            $dn = isset($this->currentCert['tbsCertList']) ? $this->currentCert['tbsCertList']['issuer'] : $this->dn;
+        }
+
+        switch ((int) $format) {
+            case self::DN_ARRAY:
+                return $dn;
+            case self::DN_ASN1:
+                $asn1 = new ASN1();
+                $asn1->loadOIDs($this->oids);
+                $filters = array();
+                $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+                $asn1->loadFilters($filters);
+                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
+                return $asn1->encodeDER($dn, $this->Name);
+            case self::DN_CANON:
+                //  No SEQUENCE around RDNs and all string values normalized as
+                // trimmed lowercase UTF-8 with all spacing as one blank.
+                // constructed RDNs will not be canonicalized
+                $asn1 = new ASN1();
+                $asn1->loadOIDs($this->oids);
+                $filters = array();
+                $filters['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+                $asn1->loadFilters($filters);
+                $result = '';
+                $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
+                foreach ($dn['rdnSequence'] as $rdn) {
+                    foreach ($rdn as $i => $attr) {
+                        $attr = &$rdn[$i];
+                        if (is_array($attr['value'])) {
+                            foreach ($attr['value'] as $type => $v) {
+                                $type = array_search($type, $asn1->ANYmap, true);
+                                if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                                    $v = $asn1->convert($v, $type);
+                                    if ($v !== false) {
+                                        $v = preg_replace('/\s+/', ' ', $v);
+                                        $attr['value'] = strtolower(trim($v));
+                                        break;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    $result .= $asn1->encodeDER($rdn, $this->RelativeDistinguishedName);
+                }
+                return $result;
+            case self::DN_HASH:
+                $dn = $this->getDN(self::DN_CANON, $dn);
+                $hash = new Hash('sha1');
+                $hash = $hash->hash($dn);
+                extract(unpack('Vhash', $hash));
+                return strtolower(bin2hex(pack('N', $hash)));
+        }
+
+        // Default is to return a string.
+        $start = true;
+        $output = '';
+
+        $result = array();
+        $asn1 = new ASN1();
+        $asn1->loadOIDs($this->oids);
+        $filters = array();
+        $filters['rdnSequence']['value'] = array('type' => ASN1::TYPE_UTF8_STRING);
+        $asn1->loadFilters($filters);
+        $this->_mapOutDNs($dn, 'rdnSequence', $asn1);
+
+        foreach ($dn['rdnSequence'] as $field) {
+            $prop = $field[0]['type'];
+            $value = $field[0]['value'];
+
+            $delim = ', ';
+            switch ($prop) {
+                case 'id-at-countryName':
+                    $desc = 'C';
+                    break;
+                case 'id-at-stateOrProvinceName':
+                    $desc = 'ST';
+                    break;
+                case 'id-at-organizationName':
+                    $desc = 'O';
+                    break;
+                case 'id-at-organizationalUnitName':
+                    $desc = 'OU';
+                    break;
+                case 'id-at-commonName':
+                    $desc = 'CN';
+                    break;
+                case 'id-at-localityName':
+                    $desc = 'L';
+                    break;
+                case 'id-at-surname':
+                    $desc = 'SN';
+                    break;
+                case 'id-at-uniqueIdentifier':
+                    $delim = '/';
+                    $desc = 'x500UniqueIdentifier';
+                    break;
+                case 'id-at-postalAddress':
+                    $delim = '/';
+                    $desc = 'postalAddress';
+                    break;
+                default:
+                    $delim = '/';
+                    $desc = preg_replace('#.+-([^-]+)$#', '$1', $prop);
+            }
+
+            if (!$start) {
+                $output.= $delim;
+            }
+            if (is_array($value)) {
+                foreach ($value as $type => $v) {
+                    $type = array_search($type, $asn1->ANYmap, true);
+                    if ($type !== false && isset($asn1->stringTypeSize[$type])) {
+                        $v = $asn1->convert($v, $type);
+                        if ($v !== false) {
+                            $value = $v;
+                            break;
+                        }
+                    }
+                }
+                if (is_array($value)) {
+                    $value = array_pop($value); // Always strip data type.
+                }
+            } elseif (is_object($value) && $value instanceof Element) {
+                $callback = function ($x) {
+                    return "\x" . bin2hex($x[0]);
+                };
+                $value = strtoupper(preg_replace_callback('#[^\x20-\x7E]#', $callback, $value->element));
+            }
+            $output.= $desc . '=' . $value;
+            $result[$desc] = isset($result[$desc]) ?
+                array_merge((array) $result[$desc], array($value)) :
+                $value;
+            $start = false;
+        }
+
+        return $format == self::DN_OPENSSL ? $result : $output;
+    }
+
+    /**
+     * Get the Distinguished Name for a certificate/crl issuer
+     *
+     * @param int $format optional
+     * @access public
+     * @return mixed
+     */
+    function getIssuerDN($format = self::DN_ARRAY)
+    {
+        switch (true) {
+            case !isset($this->currentCert) || !is_array($this->currentCert):
+                break;
+            case isset($this->currentCert['tbsCertificate']):
+                return $this->getDN($format, $this->currentCert['tbsCertificate']['issuer']);
+            case isset($this->currentCert['tbsCertList']):
+                return $this->getDN($format, $this->currentCert['tbsCertList']['issuer']);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the Distinguished Name for a certificate/csr subject
+     * Alias of getDN()
+     *
+     * @param int $format optional
+     * @access public
+     * @return mixed
+     */
+    function getSubjectDN($format = self::DN_ARRAY)
+    {
+        switch (true) {
+            case !empty($this->dn):
+                return $this->getDN($format);
+            case !isset($this->currentCert) || !is_array($this->currentCert):
+                break;
+            case isset($this->currentCert['tbsCertificate']):
+                return $this->getDN($format, $this->currentCert['tbsCertificate']['subject']);
+            case isset($this->currentCert['certificationRequestInfo']):
+                return $this->getDN($format, $this->currentCert['certificationRequestInfo']['subject']);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get an individual Distinguished Name property for a certificate/crl issuer
+     *
+     * @param string $propName
+     * @param bool $withType optional
+     * @access public
+     * @return mixed
+     */
+    function getIssuerDNProp($propName, $withType = false)
+    {
+        switch (true) {
+            case !isset($this->currentCert) || !is_array($this->currentCert):
+                break;
+            case isset($this->currentCert['tbsCertificate']):
+                return $this->getDNProp($propName, $this->currentCert['tbsCertificate']['issuer'], $withType);
+            case isset($this->currentCert['tbsCertList']):
+                return $this->getDNProp($propName, $this->currentCert['tbsCertList']['issuer'], $withType);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get an individual Distinguished Name property for a certificate/csr subject
+     *
+     * @param string $propName
+     * @param bool $withType optional
+     * @access public
+     * @return mixed
+     */
+    function getSubjectDNProp($propName, $withType = false)
+    {
+        switch (true) {
+            case !empty($this->dn):
+                return $this->getDNProp($propName, null, $withType);
+            case !isset($this->currentCert) || !is_array($this->currentCert):
+                break;
+            case isset($this->currentCert['tbsCertificate']):
+                return $this->getDNProp($propName, $this->currentCert['tbsCertificate']['subject'], $withType);
+            case isset($this->currentCert['certificationRequestInfo']):
+                return $this->getDNProp($propName, $this->currentCert['certificationRequestInfo']['subject'], $withType);
+        }
+
+        return false;
+    }
+
+    /**
+     * Get the certificate chain for the current cert
+     *
+     * @access public
+     * @return mixed
+     */
+    function getChain()
+    {
+        $chain = array($this->currentCert);
+
+        if (!is_array($this->currentCert) || !isset($this->currentCert['tbsCertificate'])) {
+            return false;
+        }
+        if (empty($this->CAs)) {
+            return $chain;
+        }
+        while (true) {
+            $currentCert = $chain[count($chain) - 1];
+            for ($i = 0; $i < count($this->CAs); $i++) {
+                $ca = $this->CAs[$i];
+                if ($currentCert['tbsCertificate']['issuer'] === $ca['tbsCertificate']['subject']) {
+                    $authorityKey = $this->getExtension('id-ce-authorityKeyIdentifier', $currentCert);
+                    $subjectKeyID = $this->getExtension('id-ce-subjectKeyIdentifier', $ca);
+                    switch (true) {
+                        case !is_array($authorityKey):
+                        case is_array($authorityKey) && isset($authorityKey['keyIdentifier']) && $authorityKey['keyIdentifier'] === $subjectKeyID:
+                            if ($currentCert === $ca) {
+                                break 3;
+                            }
+                            $chain[] = $ca;
+                            break 2;
+                    }
+                }
+            }
+            if ($i == count($this->CAs)) {
+                break;
+            }
+        }
+        foreach ($chain as $key => $value) {
+            $chain[$key] = new X509();
+            $chain[$key]->loadX509($value);
+        }
+        return $chain;
+    }
+
+    /**
+     * Set public key
+     *
+     * Key needs to be a \phpseclib\Crypt\RSA object
+     *
+     * @param object $key
+     * @access public
+     * @return bool
+     */
+    function setPublicKey($key)
+    {
+        $key->setPublicKey();
+        $this->publicKey = $key;
+    }
+
+    /**
+     * Set private key
+     *
+     * Key needs to be a \phpseclib\Crypt\RSA object
+     *
+     * @param object $key
+     * @access public
+     */
+    function setPrivateKey($key)
+    {
+        $this->privateKey = $key;
+    }
+
+    /**
+     * Set challenge
+     *
+     * Used for SPKAC CSR's
+     *
+     * @param string $challenge
+     * @access public
+     */
+    function setChallenge($challenge)
+    {
+        $this->challenge = $challenge;
+    }
+
+    /**
+     * Gets the public key
+     *
+     * Returns a \phpseclib\Crypt\RSA object or a false.
+     *
+     * @access public
+     * @return mixed
+     */
+    function getPublicKey()
+    {
+        if (isset($this->publicKey)) {
+            return $this->publicKey;
+        }
+
+        if (isset($this->currentCert) && is_array($this->currentCert)) {
+            foreach (array('tbsCertificate/subjectPublicKeyInfo', 'certificationRequestInfo/subjectPKInfo') as $path) {
+                $keyinfo = $this->_subArray($this->currentCert, $path);
+                if (!empty($keyinfo)) {
+                    break;
+                }
+            }
+        }
+        if (empty($keyinfo)) {
+            return false;
+        }
+
+        $key = $keyinfo['subjectPublicKey'];
+
+        switch ($keyinfo['algorithm']['algorithm']) {
+            case 'rsaEncryption':
+                $publicKey = new RSA();
+                $publicKey->loadKey($key);
+                $publicKey->setPublicKey();
+                break;
+            default:
+                return false;
+        }
+
+        return $publicKey;
+    }
+
+    /**
+     * Load a Certificate Signing Request
+     *
+     * @param string|array $csr
+     * @param int $mode
+     * @access public
+     * @return mixed
+     */
+    function loadCSR($csr, $mode = self::FORMAT_AUTO_DETECT)
+    {
+        if (is_array($csr) && isset($csr['certificationRequestInfo'])) {
+            unset($this->currentCert);
+            unset($this->currentKeyIdentifier);
+            unset($this->signatureSubject);
+            $this->dn = $csr['certificationRequestInfo']['subject'];
+            if (!isset($this->dn)) {
+                return false;
+            }
+
+            $this->currentCert = $csr;
+            return $csr;
+        }
+
+        // see http://tools.ietf.org/html/rfc2986
+
+        $asn1 = new ASN1();
+
+        if ($mode != self::FORMAT_DER) {
+            $newcsr = $this->_extractBER($csr);
+            if ($mode == self::FORMAT_PEM && $csr == $newcsr) {
+                return false;
+            }
+            $csr = $newcsr;
+        }
+        $orig = $csr;
+
+        if ($csr === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($csr);
+
+        if (empty($decoded)) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $csr = $asn1->asn1map($decoded[0], $this->CertificationRequest);
+        if (!isset($csr) || $csr === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $this->_mapInAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
+        $this->_mapInDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
+
+        $this->dn = $csr['certificationRequestInfo']['subject'];
+
+        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
+
+        $algorithm = &$csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['algorithm'];
+        $key = &$csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'];
+        $key = $this->_reformatKey($algorithm, $key);
+
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                $this->publicKey = new RSA();
+                $this->publicKey->loadKey($key);
+                $this->publicKey->setPublicKey();
+                break;
+            default:
+                $this->publicKey = null;
+        }
+
+        $this->currentKeyIdentifier = null;
+        $this->currentCert = $csr;
+
+        return $csr;
+    }
+
+    /**
+     * Save CSR request
+     *
+     * @param array $csr
+     * @param int $format optional
+     * @access public
+     * @return string
+     */
+    function saveCSR($csr, $format = self::FORMAT_PEM)
+    {
+        if (!is_array($csr) || !isset($csr['certificationRequestInfo'])) {
+            return false;
+        }
+
+        switch (true) {
+            case !($algorithm = $this->_subArray($csr, 'certificationRequestInfo/subjectPKInfo/algorithm/algorithm')):
+            case is_object($csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
+                break;
+            default:
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $csr['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'])));
+                        $csr['certificationRequestInfo']['subjectPKInfo']['algorithm']['parameters'] = null;
+                        $csr['signatureAlgorithm']['parameters'] = null;
+                        $csr['certificationRequestInfo']['signature']['parameters'] = null;
+                }
+        }
+
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+
+        $filters = array();
+        $filters['certificationRequestInfo']['subject']['rdnSequence']['value']
+            = array('type' => ASN1::TYPE_UTF8_STRING);
+
+        $asn1->loadFilters($filters);
+
+        $this->_mapOutDNs($csr, 'certificationRequestInfo/subject/rdnSequence', $asn1);
+        $this->_mapOutAttributes($csr, 'certificationRequestInfo/attributes', $asn1);
+        $csr = $asn1->encodeDER($csr, $this->CertificationRequest);
+
+        switch ($format) {
+            case self::FORMAT_DER:
+                return $csr;
+            // case self::FORMAT_PEM:
+            default:
+                return "-----BEGIN CERTIFICATE REQUEST-----\r\n" . chunk_split(base64_encode($csr), 64) . '-----END CERTIFICATE REQUEST-----';
+        }
+    }
+
+    /**
+     * Load a SPKAC CSR
+     *
+     * SPKAC's are produced by the HTML5 keygen element:
+     *
+     * https://developer.mozilla.org/en-US/docs/HTML/Element/keygen
+     *
+     * @param string|array $spkac
+     * @access public
+     * @return mixed
+     */
+    function loadSPKAC($spkac)
+    {
+        if (is_array($spkac) && isset($spkac['publicKeyAndChallenge'])) {
+            unset($this->currentCert);
+            unset($this->currentKeyIdentifier);
+            unset($this->signatureSubject);
+            $this->currentCert = $spkac;
+            return $spkac;
+        }
+
+        // see http://www.w3.org/html/wg/drafts/html/master/forms.html#signedpublickeyandchallenge
+
+        $asn1 = new ASN1();
+
+        // OpenSSL produces SPKAC's that are preceded by the string SPKAC=
+        $temp = preg_replace('#(?:SPKAC=)|[ \r\n\\\]#', '', $spkac);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        if ($temp != false) {
+            $spkac = $temp;
+        }
+        $orig = $spkac;
+
+        if ($spkac === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($spkac);
+
+        if (empty($decoded)) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $spkac = $asn1->asn1map($decoded[0], $this->SignedPublicKeyAndChallenge);
+
+        if (!isset($spkac) || $spkac === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
+
+        $algorithm = &$spkac['publicKeyAndChallenge']['spki']['algorithm']['algorithm'];
+        $key = &$spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'];
+        $key = $this->_reformatKey($algorithm, $key);
+
+        switch ($algorithm) {
+            case 'rsaEncryption':
+                $this->publicKey = new RSA();
+                $this->publicKey->loadKey($key);
+                $this->publicKey->setPublicKey();
+                break;
+            default:
+                $this->publicKey = null;
+        }
+
+        $this->currentKeyIdentifier = null;
+        $this->currentCert = $spkac;
+
+        return $spkac;
+    }
+
+    /**
+     * Save a SPKAC CSR request
+     *
+     * @param string|array $spkac
+     * @param int $format optional
+     * @access public
+     * @return string
+     */
+    function saveSPKAC($spkac, $format = self::FORMAT_PEM)
+    {
+        if (!is_array($spkac) || !isset($spkac['publicKeyAndChallenge'])) {
+            return false;
+        }
+
+        $algorithm = $this->_subArray($spkac, 'publicKeyAndChallenge/spki/algorithm/algorithm');
+        switch (true) {
+            case !$algorithm:
+            case is_object($spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']):
+                break;
+            default:
+                switch ($algorithm) {
+                    case 'rsaEncryption':
+                        $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey']
+                            = base64_encode("\0" . base64_decode(preg_replace('#-.+-|[\r\n]#', '', $spkac['publicKeyAndChallenge']['spki']['subjectPublicKey'])));
+                }
+        }
+
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+        $spkac = $asn1->encodeDER($spkac, $this->SignedPublicKeyAndChallenge);
+
+        switch ($format) {
+            case self::FORMAT_DER:
+                return $spkac;
+            // case self::FORMAT_PEM:
+            default:
+                // OpenSSL's implementation of SPKAC requires the SPKAC be preceded by SPKAC= and since there are pretty much
+                // no other SPKAC decoders phpseclib will use that same format
+                return 'SPKAC=' . base64_encode($spkac);
+        }
+    }
+
+    /**
+     * Load a Certificate Revocation List
+     *
+     * @param string $crl
+     * @param int $mode
+     * @access public
+     * @return mixed
+     */
+    function loadCRL($crl, $mode = self::FORMAT_AUTO_DETECT)
+    {
+        if (is_array($crl) && isset($crl['tbsCertList'])) {
+            $this->currentCert = $crl;
+            unset($this->signatureSubject);
+            return $crl;
+        }
+
+        $asn1 = new ASN1();
+
+        if ($mode != self::FORMAT_DER) {
+            $newcrl = $this->_extractBER($crl);
+            if ($mode == self::FORMAT_PEM && $crl == $newcrl) {
+                return false;
+            }
+            $crl = $newcrl;
+        }
+        $orig = $crl;
+
+        if ($crl === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $asn1->loadOIDs($this->oids);
+        $decoded = $asn1->decodeBER($crl);
+
+        if (empty($decoded)) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $crl = $asn1->asn1map($decoded[0], $this->CertificateList);
+        if (!isset($crl) || $crl === false) {
+            $this->currentCert = false;
+            return false;
+        }
+
+        $this->signatureSubject = substr($orig, $decoded[0]['content'][0]['start'], $decoded[0]['content'][0]['length']);
+
+        $this->_mapInDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
+        if ($this->_isSubArrayValid($crl, 'tbsCertList/crlExtensions')) {
+            $this->_mapInExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
+        }
+        if ($this->_isSubArrayValid($crl, 'tbsCertList/revokedCertificates')) {
+            $rclist_ref = &$this->_subArrayUnchecked($crl, 'tbsCertList/revokedCertificates');
+            if ($rclist_ref) {
+                $rclist = $crl['tbsCertList']['revokedCertificates'];
+                foreach ($rclist as $i => $extension) {
+                    if ($this->_isSubArrayValid($rclist, "$i/crlEntryExtensions", $asn1)) {
+                        $this->_mapInExtensions($rclist_ref, "$i/crlEntryExtensions", $asn1);
+                    }
+                }
+            }
+        }
+
+        $this->currentKeyIdentifier = null;
+        $this->currentCert = $crl;
+
+        return $crl;
+    }
+
+    /**
+     * Save Certificate Revocation List.
+     *
+     * @param array $crl
+     * @param int $format optional
+     * @access public
+     * @return string
+     */
+    function saveCRL($crl, $format = self::FORMAT_PEM)
+    {
+        if (!is_array($crl) || !isset($crl['tbsCertList'])) {
+            return false;
+        }
+
+        $asn1 = new ASN1();
+
+        $asn1->loadOIDs($this->oids);
+
+        $filters = array();
+        $filters['tbsCertList']['issuer']['rdnSequence']['value']
+            = array('type' => ASN1::TYPE_UTF8_STRING);
+        $filters['tbsCertList']['signature']['parameters']
+            = array('type' => ASN1::TYPE_UTF8_STRING);
+        $filters['signatureAlgorithm']['parameters']
+            = array('type' => ASN1::TYPE_UTF8_STRING);
+
+        if (empty($crl['tbsCertList']['signature']['parameters'])) {
+            $filters['tbsCertList']['signature']['parameters']
+                = array('type' => ASN1::TYPE_NULL);
+        }
+
+        if (empty($crl['signatureAlgorithm']['parameters'])) {
+            $filters['signatureAlgorithm']['parameters']
+                = array('type' => ASN1::TYPE_NULL);
+        }
+
+        $asn1->loadFilters($filters);
+
+        $this->_mapOutDNs($crl, 'tbsCertList/issuer/rdnSequence', $asn1);
+        $this->_mapOutExtensions($crl, 'tbsCertList/crlExtensions', $asn1);
+        $rclist = &$this->_subArray($crl, 'tbsCertList/revokedCertificates');
+        if (is_array($rclist)) {
+            foreach ($rclist as $i => $extension) {
+                $this->_mapOutExtensions($rclist, "$i/crlEntryExtensions", $asn1);
+            }
+        }
+
+        $crl = $asn1->encodeDER($crl, $this->CertificateList);
+
+        switch ($format) {
+            case self::FORMAT_DER:
+                return $crl;
+            // case self::FORMAT_PEM:
+            default:
+                return "-----BEGIN X509 CRL-----\r\n" . chunk_split(base64_encode($crl), 64) . '-----END X509 CRL-----';
+        }
+    }
+
+    /**
+     * Helper function to build a time field according to RFC 3280 section
+     *  - 4.1.2.5 Validity
+     *  - 5.1.2.4 This Update
+     *  - 5.1.2.5 Next Update
+     *  - 5.1.2.6 Revoked Certificates
+     * by choosing utcTime iff year of date given is before 2050 and generalTime else.
+     *
+     * @param string $date in format date('D, d M Y H:i:s O')
+     * @access private
+     * @return array
+     */
+    function _timeField($date)
+    {
+        if ($date instanceof Element) {
+            return $date;
+        }
+        $dateObj = new DateTime($date, new DateTimeZone('GMT'));
+        $year = $dateObj->format('Y'); // the same way ASN1.php parses this
+        if ($year < 2050) {
+            return array('utcTime' => $date);
+        } else {
+            return array('generalTime' => $date);
+        }
+    }
+
+    /**
+     * Sign an X.509 certificate
+     *
+     * $issuer's private key needs to be loaded.
+     * $subject can be either an existing X.509 cert (if you want to resign it),
+     * a CSR or something with the DN and public key explicitly set.
+     *
+     * @param \phpseclib\File\X509 $issuer
+     * @param \phpseclib\File\X509 $subject
+     * @param string $signatureAlgorithm optional
+     * @access public
+     * @return mixed
+     */
+    function sign($issuer, $subject, $signatureAlgorithm = 'sha1WithRSAEncryption')
+    {
+        if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
+            return false;
+        }
+
+        if (isset($subject->publicKey) && !($subjectPublicKey = $subject->_formatSubjectPublicKey())) {
+            return false;
+        }
+
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+
+        if (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertificate'])) {
+            $this->currentCert = $subject->currentCert;
+            $this->currentCert['tbsCertificate']['signature']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+
+            if (!empty($this->startDate)) {
+                $this->currentCert['tbsCertificate']['validity']['notBefore'] = $this->_timeField($this->startDate);
+            }
+            if (!empty($this->endDate)) {
+                $this->currentCert['tbsCertificate']['validity']['notAfter'] = $this->_timeField($this->endDate);
+            }
+            if (!empty($this->serialNumber)) {
+                $this->currentCert['tbsCertificate']['serialNumber'] = $this->serialNumber;
+            }
+            if (!empty($subject->dn)) {
+                $this->currentCert['tbsCertificate']['subject'] = $subject->dn;
+            }
+            if (!empty($subject->publicKey)) {
+                $this->currentCert['tbsCertificate']['subjectPublicKeyInfo'] = $subjectPublicKey;
+            }
+            $this->removeExtension('id-ce-authorityKeyIdentifier');
+            if (isset($subject->domains)) {
+                $this->removeExtension('id-ce-subjectAltName');
+            }
+        } elseif (isset($subject->currentCert) && is_array($subject->currentCert) && isset($subject->currentCert['tbsCertList'])) {
+            return false;
+        } else {
+            if (!isset($subject->publicKey)) {
+                return false;
+            }
+
+            $startDate = new DateTime('now', new DateTimeZone(@date_default_timezone_get()));
+            $startDate = !empty($this->startDate) ? $this->startDate : $startDate->format('D, d M Y H:i:s O');
+
+            $endDate = new DateTime('+1 year', new DateTimeZone(@date_default_timezone_get()));
+            $endDate = !empty($this->endDate) ? $this->endDate : $endDate->format('D, d M Y H:i:s O');
+
+            /* "The serial number MUST be a positive integer"
+               "Conforming CAs MUST NOT use serialNumber values longer than 20 octets."
+                -- https://tools.ietf.org/html/rfc5280#section-4.1.2.2
+
+               for the integer to be positive the leading bit needs to be 0 hence the
+               application of a bitmap
+            */
+            $serialNumber = !empty($this->serialNumber) ?
+                $this->serialNumber :
+                new BigInteger(Random::string(20) & ("\x7F" . str_repeat("\xFF", 19)), 256);
+
+            $this->currentCert = array(
+                'tbsCertificate' =>
+                    array(
+                        'version' => 'v3',
+                        'serialNumber' => $serialNumber, // $this->setSerialNumber()
+                        'signature' => array('algorithm' => $signatureAlgorithm),
+                        'issuer' => false, // this is going to be overwritten later
+                        'validity' => array(
+                            'notBefore' => $this->_timeField($startDate), // $this->setStartDate()
+                            'notAfter' => $this->_timeField($endDate)   // $this->setEndDate()
+                        ),
+                        'subject' => $subject->dn,
+                        'subjectPublicKeyInfo' => $subjectPublicKey
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
+                    'signature'          => false // this is going to be overwritten later
+            );
+
+            // Copy extensions from CSR.
+            $csrexts = $subject->getAttribute('pkcs-9-at-extensionRequest', 0);
+
+            if (!empty($csrexts)) {
+                $this->currentCert['tbsCertificate']['extensions'] = $csrexts;
+            }
+        }
+
+        $this->currentCert['tbsCertificate']['issuer'] = $issuer->dn;
+
+        if (isset($issuer->currentKeyIdentifier)) {
+            $this->setExtension('id-ce-authorityKeyIdentifier', array(
+                    //'authorityCertIssuer' => array(
+                    //    array(
+                    //        'directoryName' => $issuer->dn
+                    //    )
+                    //),
+                    'keyIdentifier' => $issuer->currentKeyIdentifier
+                ));
+            //$extensions = &$this->currentCert['tbsCertificate']['extensions'];
+            //if (isset($issuer->serialNumber)) {
+            //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
+            //}
+            //unset($extensions);
+        }
+
+        if (isset($subject->currentKeyIdentifier)) {
+            $this->setExtension('id-ce-subjectKeyIdentifier', $subject->currentKeyIdentifier);
+        }
+
+        $altName = array();
+
+        if (isset($subject->domains) && count($subject->domains)) {
+            $altName = array_map(array('\phpseclib\File\X509', '_dnsName'), $subject->domains);
+        }
+
+        if (isset($subject->ipAddresses) && count($subject->ipAddresses)) {
+            // should an IP address appear as the CN if no domain name is specified? idk
+            //$ips = count($subject->domains) ? $subject->ipAddresses : array_slice($subject->ipAddresses, 1);
+            $ipAddresses = array();
+            foreach ($subject->ipAddresses as $ipAddress) {
+                $encoded = $subject->_ipAddress($ipAddress);
+                if ($encoded !== false) {
+                    $ipAddresses[] = $encoded;
+                }
+            }
+            if (count($ipAddresses)) {
+                $altName = array_merge($altName, $ipAddresses);
+            }
+        }
+
+        if (!empty($altName)) {
+            $this->setExtension('id-ce-subjectAltName', $altName);
+        }
+
+        if ($this->caFlag) {
+            $keyUsage = $this->getExtension('id-ce-keyUsage');
+            if (!$keyUsage) {
+                $keyUsage = array();
+            }
+
+            $this->setExtension(
+                'id-ce-keyUsage',
+                array_values(array_unique(array_merge($keyUsage, array('cRLSign', 'keyCertSign'))))
+            );
+
+            $basicConstraints = $this->getExtension('id-ce-basicConstraints');
+            if (!$basicConstraints) {
+                $basicConstraints = array();
+            }
+
+            $this->setExtension(
+                'id-ce-basicConstraints',
+                array_unique(array_merge(array('cA' => true), $basicConstraints)),
+                true
+            );
+
+            if (!isset($subject->currentKeyIdentifier)) {
+                $this->setExtension('id-ce-subjectKeyIdentifier', base64_encode($this->computeKeyIdentifier($this->currentCert)), false, false);
+            }
+        }
+
+        // resync $this->signatureSubject
+        // save $tbsCertificate in case there are any \phpseclib\File\ASN1\Element objects in it
+        $tbsCertificate = $this->currentCert['tbsCertificate'];
+        $this->loadX509($this->saveX509($this->currentCert));
+
+        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
+        $result['tbsCertificate'] = $tbsCertificate;
+
+        $this->currentCert = $currentCert;
+        $this->signatureSubject = $signatureSubject;
+
+        return $result;
+    }
+
+    /**
+     * Sign a CSR
+     *
+     * @access public
+     * @return mixed
+     */
+    function signCSR($signatureAlgorithm = 'sha1WithRSAEncryption')
+    {
+        if (!is_object($this->privateKey) || empty($this->dn)) {
+            return false;
+        }
+
+        $origPublicKey = $this->publicKey;
+        $class = get_class($this->privateKey);
+        $this->publicKey = new $class();
+        $this->publicKey->loadKey($this->privateKey->getPublicKey());
+        $this->publicKey->setPublicKey();
+        if (!($publicKey = $this->_formatSubjectPublicKey())) {
+            return false;
+        }
+        $this->publicKey = $origPublicKey;
+
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+
+        if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['certificationRequestInfo'])) {
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            if (!empty($this->dn)) {
+                $this->currentCert['certificationRequestInfo']['subject'] = $this->dn;
+            }
+            $this->currentCert['certificationRequestInfo']['subjectPKInfo'] = $publicKey;
+        } else {
+            $this->currentCert = array(
+                'certificationRequestInfo' =>
+                    array(
+                        'version' => 'v1',
+                        'subject' => $this->dn,
+                        'subjectPKInfo' => $publicKey
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
+                    'signature'          => false // this is going to be overwritten later
+            );
+        }
+
+        // resync $this->signatureSubject
+        // save $certificationRequestInfo in case there are any \phpseclib\File\ASN1\Element objects in it
+        $certificationRequestInfo = $this->currentCert['certificationRequestInfo'];
+        $this->loadCSR($this->saveCSR($this->currentCert));
+
+        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
+        $result['certificationRequestInfo'] = $certificationRequestInfo;
+
+        $this->currentCert = $currentCert;
+        $this->signatureSubject = $signatureSubject;
+
+        return $result;
+    }
+
+    /**
+     * Sign a SPKAC
+     *
+     * @access public
+     * @return mixed
+     */
+    function signSPKAC($signatureAlgorithm = 'sha1WithRSAEncryption')
+    {
+        if (!is_object($this->privateKey)) {
+            return false;
+        }
+
+        $origPublicKey = $this->publicKey;
+        $class = get_class($this->privateKey);
+        $this->publicKey = new $class();
+        $this->publicKey->loadKey($this->privateKey->getPublicKey());
+        $this->publicKey->setPublicKey();
+        $publicKey = $this->_formatSubjectPublicKey();
+        if (!$publicKey) {
+            return false;
+        }
+        $this->publicKey = $origPublicKey;
+
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject: null;
+
+        // re-signing a SPKAC seems silly but since everything else supports re-signing why not?
+        if (isset($this->currentCert) && is_array($this->currentCert) && isset($this->currentCert['publicKeyAndChallenge'])) {
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['publicKeyAndChallenge']['spki'] = $publicKey;
+            if (!empty($this->challenge)) {
+                // the bitwise AND ensures that the output is a valid IA5String
+                $this->currentCert['publicKeyAndChallenge']['challenge'] = $this->challenge & str_repeat("\x7F", strlen($this->challenge));
+            }
+        } else {
+            $this->currentCert = array(
+                'publicKeyAndChallenge' =>
+                    array(
+                        'spki' => $publicKey,
+                        // quoting <https://developer.mozilla.org/en-US/docs/Web/HTML/Element/keygen>,
+                        // "A challenge string that is submitted along with the public key. Defaults to an empty string if not specified."
+                        // both Firefox and OpenSSL ("openssl spkac -key private.key") behave this way
+                        // we could alternatively do this instead if we ignored the specs:
+                        // Random::string(8) & str_repeat("\x7F", 8)
+                        'challenge' => !empty($this->challenge) ? $this->challenge : ''
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
+                    'signature'          => false // this is going to be overwritten later
+            );
+        }
+
+        // resync $this->signatureSubject
+        // save $publicKeyAndChallenge in case there are any \phpseclib\File\ASN1\Element objects in it
+        $publicKeyAndChallenge = $this->currentCert['publicKeyAndChallenge'];
+        $this->loadSPKAC($this->saveSPKAC($this->currentCert));
+
+        $result = $this->_sign($this->privateKey, $signatureAlgorithm);
+        $result['publicKeyAndChallenge'] = $publicKeyAndChallenge;
+
+        $this->currentCert = $currentCert;
+        $this->signatureSubject = $signatureSubject;
+
+        return $result;
+    }
+
+    /**
+     * Sign a CRL
+     *
+     * $issuer's private key needs to be loaded.
+     *
+     * @param \phpseclib\File\X509 $issuer
+     * @param \phpseclib\File\X509 $crl
+     * @param string $signatureAlgorithm optional
+     * @access public
+     * @return mixed
+     */
+    function signCRL($issuer, $crl, $signatureAlgorithm = 'sha1WithRSAEncryption')
+    {
+        if (!is_object($issuer->privateKey) || empty($issuer->dn)) {
+            return false;
+        }
+
+        $currentCert = isset($this->currentCert) ? $this->currentCert : null;
+        $signatureSubject = isset($this->signatureSubject) ? $this->signatureSubject : null;
+
+        $thisUpdate = new DateTime('now', new DateTimeZone(@date_default_timezone_get()));
+        $thisUpdate = !empty($this->startDate) ? $this->startDate : $thisUpdate->format('D, d M Y H:i:s O');
+
+        if (isset($crl->currentCert) && is_array($crl->currentCert) && isset($crl->currentCert['tbsCertList'])) {
+            $this->currentCert = $crl->currentCert;
+            $this->currentCert['tbsCertList']['signature']['algorithm'] = $signatureAlgorithm;
+            $this->currentCert['signatureAlgorithm']['algorithm'] = $signatureAlgorithm;
+        } else {
+            $this->currentCert = array(
+                'tbsCertList' =>
+                    array(
+                        'version' => 'v2',
+                        'signature' => array('algorithm' => $signatureAlgorithm),
+                        'issuer' => false, // this is going to be overwritten later
+                        'thisUpdate' => $this->_timeField($thisUpdate) // $this->setStartDate()
+                    ),
+                    'signatureAlgorithm' => array('algorithm' => $signatureAlgorithm),
+                    'signature'          => false // this is going to be overwritten later
+            );
+        }
+
+        $tbsCertList = &$this->currentCert['tbsCertList'];
+        $tbsCertList['issuer'] = $issuer->dn;
+        $tbsCertList['thisUpdate'] = $this->_timeField($thisUpdate);
+
+        if (!empty($this->endDate)) {
+            $tbsCertList['nextUpdate'] = $this->_timeField($this->endDate); // $this->setEndDate()
+        } else {
+            unset($tbsCertList['nextUpdate']);
+        }
+
+        if (!empty($this->serialNumber)) {
+            $crlNumber = $this->serialNumber;
+        } else {
+            $crlNumber = $this->getExtension('id-ce-cRLNumber');
+            // "The CRL number is a non-critical CRL extension that conveys a
+            //  monotonically increasing sequence number for a given CRL scope and
+            //  CRL issuer.  This extension allows users to easily determine when a
+            //  particular CRL supersedes another CRL."
+            // -- https://tools.ietf.org/html/rfc5280#section-5.2.3
+            $crlNumber = $crlNumber !== false ? $crlNumber->add(new BigInteger(1)) : null;
+        }
+
+        $this->removeExtension('id-ce-authorityKeyIdentifier');
+        $this->removeExtension('id-ce-issuerAltName');
+
+        // Be sure version >= v2 if some extension found.
+        $version = isset($tbsCertList['version']) ? $tbsCertList['version'] : 0;
+        if (!$version) {
+            if (!empty($tbsCertList['crlExtensions'])) {
+                $version = 1; // v2.
+            } elseif (!empty($tbsCertList['revokedCertificates'])) {
+                foreach ($tbsCertList['revokedCertificates'] as $cert) {
+                    if (!empty($cert['crlEntryExtensions'])) {
+                        $version = 1; // v2.
+                    }
+                }
+            }
+
+            if ($version) {
+                $tbsCertList['version'] = $version;
+            }
+        }
+
+        // Store additional extensions.
+        if (!empty($tbsCertList['version'])) { // At least v2.
+            if (!empty($crlNumber)) {
+                $this->setExtension('id-ce-cRLNumber', $crlNumber);
+            }
+
+            if (isset($issuer->currentKeyIdentifier)) {
+                $this->setExtension('id-ce-authorityKeyIdentifier', array(
+                        //'authorityCertIssuer' => array(
+                        //    array(
+                        //        'directoryName' => $issuer->dn
+                        //    )
+                        //),
+                        'keyIdentifier' => $issuer->currentKeyIdentifier
+                    ));
+                //$extensions = &$tbsCertList['crlExtensions'];
+                //if (isset($issuer->serialNumber)) {
+                //    $extensions[count($extensions) - 1]['authorityCertSerialNumber'] = $issuer->serialNumber;
+                //}
+                //unset($extensions);
+            }
+
+            $issuerAltName = $this->getExtension('id-ce-subjectAltName', $issuer->currentCert);
+
+            if ($issuerAltName !== false) {
+                $this->setExtension('id-ce-issuerAltName', $issuerAltName);
+            }
+        }
+
+        if (empty($tbsCertList['revokedCertificates'])) {
+            unset($tbsCertList['revokedCertificates']);
+        }
+
+        unset($tbsCertList);
+
+        // resync $this->signatureSubject
+        // save $tbsCertList in case there are any \phpseclib\File\ASN1\Element objects in it
+        $tbsCertList = $this->currentCert['tbsCertList'];
+        $this->loadCRL($this->saveCRL($this->currentCert));
+
+        $result = $this->_sign($issuer->privateKey, $signatureAlgorithm);
+        $result['tbsCertList'] = $tbsCertList;
+
+        $this->currentCert = $currentCert;
+        $this->signatureSubject = $signatureSubject;
+
+        return $result;
+    }
+
+    /**
+     * X.509 certificate signing helper function.
+     *
+     * @param \phpseclib\File\X509 $key
+     * @param string $signatureAlgorithm
+     * @access public
+     * @return mixed
+     */
+    function _sign($key, $signatureAlgorithm)
+    {
+        if ($key instanceof RSA) {
+            switch ($signatureAlgorithm) {
+                case 'md2WithRSAEncryption':
+                case 'md5WithRSAEncryption':
+                case 'sha1WithRSAEncryption':
+                case 'sha224WithRSAEncryption':
+                case 'sha256WithRSAEncryption':
+                case 'sha384WithRSAEncryption':
+                case 'sha512WithRSAEncryption':
+                    $key->setHash(preg_replace('#WithRSAEncryption$#', '', $signatureAlgorithm));
+                    $key->setSignatureMode(RSA::SIGNATURE_PKCS1);
+
+                    $this->currentCert['signature'] = base64_encode("\0" . $key->sign($this->signatureSubject));
+                    return $this->currentCert;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set certificate start date
+     *
+     * @param string $date
+     * @access public
+     */
+    function setStartDate($date)
+    {
+        if (!is_object($date) || !is_a($date, 'DateTime')) {
+            $date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
+        }
+
+        $this->startDate = $date->format('D, d M Y H:i:s O');
+    }
+
+    /**
+     * Set certificate end date
+     *
+     * @param string $date
+     * @access public
+     */
+    function setEndDate($date)
+    {
+        /*
+          To indicate that a certificate has no well-defined expiration date,
+          the notAfter SHOULD be assigned the GeneralizedTime value of
+          99991231235959Z.
+
+          -- http://tools.ietf.org/html/rfc5280#section-4.1.2.5
+        */
+        if (strtolower($date) == 'lifetime') {
+            $temp = '99991231235959Z';
+            $asn1 = new ASN1();
+            $temp = chr(ASN1::TYPE_GENERALIZED_TIME) . $asn1->_encodeLength(strlen($temp)) . $temp;
+            $this->endDate = new Element($temp);
+        } else {
+            if (!is_object($date) || !is_a($date, 'DateTime')) {
+                $date = new DateTime($date, new DateTimeZone(@date_default_timezone_get()));
+            }
+
+            $this->endDate = $date->format('D, d M Y H:i:s O');
+        }
+    }
+
+    /**
+     * Set Serial Number
+     *
+     * @param string $serial
+     * @param int $base optional
+     * @access public
+     */
+    function setSerialNumber($serial, $base = -256)
+    {
+        $this->serialNumber = new BigInteger($serial, $base);
+    }
+
+    /**
+     * Turns the certificate into a certificate authority
+     *
+     * @access public
+     */
+    function makeCA()
+    {
+        $this->caFlag = true;
+    }
+
+    /**
+     * Check for validity of subarray
+     *
+     * This is intended for use in conjunction with _subArrayUnchecked(),
+     * implementing the checks included in _subArray() but without copying
+     * a potentially large array by passing its reference by-value to is_array().
+     *
+     * @param array $root
+     * @param string $path
+     * @return boolean
+     * @access private
+     */
+    function _isSubArrayValid($root, $path)
+    {
+        if (!is_array($root)) {
+            return false;
+        }
+
+        foreach (explode('/', $path) as $i) {
+            if (!is_array($root)) {
+                return false;
+            }
+
+            if (!isset($root[$i])) {
+                return true;
+            }
+
+            $root = $root[$i];
+        }
+
+        return true;
+    }
+
+    /**
+     * Get a reference to a subarray
+     *
+     * This variant of _subArray() does no is_array() checking,
+     * so $root should be checked with _isSubArrayValid() first.
+     *
+     * This is here for performance reasons:
+     * Passing a reference (i.e. $root) by-value (i.e. to is_array())
+     * creates a copy. If $root is an especially large array, this is expensive.
+     *
+     * @param array $root
+     * @param string $path  absolute path with / as component separator
+     * @param bool $create optional
+     * @access private
+     * @return array|false
+     */
+    function &_subArrayUnchecked(&$root, $path, $create = false)
+    {
+        $false = false;
+
+        foreach (explode('/', $path) as $i) {
+            if (!isset($root[$i])) {
+                if (!$create) {
+                    return $false;
+                }
+
+                $root[$i] = array();
+            }
+
+            $root = &$root[$i];
+        }
+
+        return $root;
+    }
+
+    /**
+     * Get a reference to a subarray
+     *
+     * @param array $root
+     * @param string $path  absolute path with / as component separator
+     * @param bool $create optional
+     * @access private
+     * @return array|false
+     */
+    function &_subArray(&$root, $path, $create = false)
+    {
+        $false = false;
+
+        if (!is_array($root)) {
+            return $false;
+        }
+
+        foreach (explode('/', $path) as $i) {
+            if (!is_array($root)) {
+                return $false;
+            }
+
+            if (!isset($root[$i])) {
+                if (!$create) {
+                    return $false;
+                }
+
+                $root[$i] = array();
+            }
+
+            $root = &$root[$i];
+        }
+
+        return $root;
+    }
+
+    /**
+     * Get a reference to an extension subarray
+     *
+     * @param array $root
+     * @param string $path optional absolute path with / as component separator
+     * @param bool $create optional
+     * @access private
+     * @return array|false
+     */
+    function &_extensions(&$root, $path = null, $create = false)
+    {
+        if (!isset($root)) {
+            $root = $this->currentCert;
+        }
+
+        switch (true) {
+            case !empty($path):
+            case !is_array($root):
+                break;
+            case isset($root['tbsCertificate']):
+                $path = 'tbsCertificate/extensions';
+                break;
+            case isset($root['tbsCertList']):
+                $path = 'tbsCertList/crlExtensions';
+                break;
+            case isset($root['certificationRequestInfo']):
+                $pth = 'certificationRequestInfo/attributes';
+                $attributes = &$this->_subArray($root, $pth, $create);
+
+                if (is_array($attributes)) {
+                    foreach ($attributes as $key => $value) {
+                        if ($value['type'] == 'pkcs-9-at-extensionRequest') {
+                            $path = "$pth/$key/value/0";
+                            break 2;
+                        }
+                    }
+                    if ($create) {
+                        $key = count($attributes);
+                        $attributes[] = array('type' => 'pkcs-9-at-extensionRequest', 'value' => array());
+                        $path = "$pth/$key/value/0";
+                    }
+                }
+                break;
+        }
+
+        $extensions = &$this->_subArray($root, $path, $create);
+
+        if (!is_array($extensions)) {
+            $false = false;
+            return $false;
+        }
+
+        return $extensions;
+    }
+
+    /**
+     * Remove an Extension
+     *
+     * @param string $id
+     * @param string $path optional
+     * @access private
+     * @return bool
+     */
+    function _removeExtension($id, $path = null)
+    {
+        $extensions = &$this->_extensions($this->currentCert, $path);
+
+        if (!is_array($extensions)) {
+            return false;
+        }
+
+        $result = false;
+        foreach ($extensions as $key => $value) {
+            if ($value['extnId'] == $id) {
+                unset($extensions[$key]);
+                $result = true;
+            }
+        }
+
+        $extensions = array_values($extensions);
+        // fix for https://bugs.php.net/75433 affecting PHP 7.2
+        if (!isset($extensions[0])) {
+            $extensions = array_splice($extensions, 0, 0);
+        }
+        return $result;
+    }
+
+    /**
+     * Get an Extension
+     *
+     * Returns the extension if it exists and false if not
+     *
+     * @param string $id
+     * @param array $cert optional
+     * @param string $path optional
+     * @access private
+     * @return mixed
+     */
+    function _getExtension($id, $cert = null, $path = null)
+    {
+        $extensions = $this->_extensions($cert, $path);
+
+        if (!is_array($extensions)) {
+            return false;
+        }
+
+        foreach ($extensions as $key => $value) {
+            if ($value['extnId'] == $id) {
+                return $value['extnValue'];
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a list of all extensions in use
+     *
+     * @param array $cert optional
+     * @param string $path optional
+     * @access private
+     * @return array
+     */
+    function _getExtensions($cert = null, $path = null)
+    {
+        $exts = $this->_extensions($cert, $path);
+        $extensions = array();
+
+        if (is_array($exts)) {
+            foreach ($exts as $extension) {
+                $extensions[] = $extension['extnId'];
+            }
+        }
+
+        return $extensions;
+    }
+
+    /**
+     * Set an Extension
+     *
+     * @param string $id
+     * @param mixed $value
+     * @param bool $critical optional
+     * @param bool $replace optional
+     * @param string $path optional
+     * @access private
+     * @return bool
+     */
+    function _setExtension($id, $value, $critical = false, $replace = true, $path = null)
+    {
+        $extensions = &$this->_extensions($this->currentCert, $path, true);
+
+        if (!is_array($extensions)) {
+            return false;
+        }
+
+        $newext = array('extnId'  => $id, 'critical' => $critical, 'extnValue' => $value);
+
+        foreach ($extensions as $key => $value) {
+            if ($value['extnId'] == $id) {
+                if (!$replace) {
+                    return false;
+                }
+
+                $extensions[$key] = $newext;
+                return true;
+            }
+        }
+
+        $extensions[] = $newext;
+        return true;
+    }
+
+    /**
+     * Remove a certificate, CSR or CRL Extension
+     *
+     * @param string $id
+     * @access public
+     * @return bool
+     */
+    function removeExtension($id)
+    {
+        return $this->_removeExtension($id);
+    }
+
+    /**
+     * Get a certificate, CSR or CRL Extension
+     *
+     * Returns the extension if it exists and false if not
+     *
+     * @param string $id
+     * @param array $cert optional
+     * @access public
+     * @return mixed
+     */
+    function getExtension($id, $cert = null)
+    {
+        return $this->_getExtension($id, $cert);
+    }
+
+    /**
+     * Returns a list of all extensions in use in certificate, CSR or CRL
+     *
+     * @param array $cert optional
+     * @access public
+     * @return array
+     */
+    function getExtensions($cert = null)
+    {
+        return $this->_getExtensions($cert);
+    }
+
+    /**
+     * Set a certificate, CSR or CRL Extension
+     *
+     * @param string $id
+     * @param mixed $value
+     * @param bool $critical optional
+     * @param bool $replace optional
+     * @access public
+     * @return bool
+     */
+    function setExtension($id, $value, $critical = false, $replace = true)
+    {
+        return $this->_setExtension($id, $value, $critical, $replace);
+    }
+
+    /**
+     * Remove a CSR attribute.
+     *
+     * @param string $id
+     * @param int $disposition optional
+     * @access public
+     * @return bool
+     */
+    function removeAttribute($id, $disposition = self::ATTR_ALL)
+    {
+        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes');
+
+        if (!is_array($attributes)) {
+            return false;
+        }
+
+        $result = false;
+        foreach ($attributes as $key => $attribute) {
+            if ($attribute['type'] == $id) {
+                $n = count($attribute['value']);
+                switch (true) {
+                    case $disposition == self::ATTR_APPEND:
+                    case $disposition == self::ATTR_REPLACE:
+                        return false;
+                    case $disposition >= $n:
+                        $disposition -= $n;
+                        break;
+                    case $disposition == self::ATTR_ALL:
+                    case $n == 1:
+                        unset($attributes[$key]);
+                        $result = true;
+                        break;
+                    default:
+                        unset($attributes[$key]['value'][$disposition]);
+                        $attributes[$key]['value'] = array_values($attributes[$key]['value']);
+                        $result = true;
+                        break;
+                }
+                if ($result && $disposition != self::ATTR_ALL) {
+                    break;
+                }
+            }
+        }
+
+        $attributes = array_values($attributes);
+        return $result;
+    }
+
+    /**
+     * Get a CSR attribute
+     *
+     * Returns the attribute if it exists and false if not
+     *
+     * @param string $id
+     * @param int $disposition optional
+     * @param array $csr optional
+     * @access public
+     * @return mixed
+     */
+    function getAttribute($id, $disposition = self::ATTR_ALL, $csr = null)
+    {
+        if (empty($csr)) {
+            $csr = $this->currentCert;
+        }
+
+        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
+
+        if (!is_array($attributes)) {
+            return false;
+        }
+
+        foreach ($attributes as $key => $attribute) {
+            if ($attribute['type'] == $id) {
+                $n = count($attribute['value']);
+                switch (true) {
+                    case $disposition == self::ATTR_APPEND:
+                    case $disposition == self::ATTR_REPLACE:
+                        return false;
+                    case $disposition == self::ATTR_ALL:
+                        return $attribute['value'];
+                    case $disposition >= $n:
+                        $disposition -= $n;
+                        break;
+                    default:
+                        return $attribute['value'][$disposition];
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a list of all CSR attributes in use
+     *
+     * @param array $csr optional
+     * @access public
+     * @return array
+     */
+    function getAttributes($csr = null)
+    {
+        if (empty($csr)) {
+            $csr = $this->currentCert;
+        }
+
+        $attributes = $this->_subArray($csr, 'certificationRequestInfo/attributes');
+        $attrs = array();
+
+        if (is_array($attributes)) {
+            foreach ($attributes as $attribute) {
+                $attrs[] = $attribute['type'];
+            }
+        }
+
+        return $attrs;
+    }
+
+    /**
+     * Set a CSR attribute
+     *
+     * @param string $id
+     * @param mixed $value
+     * @param bool $disposition optional
+     * @access public
+     * @return bool
+     */
+    function setAttribute($id, $value, $disposition = self::ATTR_ALL)
+    {
+        $attributes = &$this->_subArray($this->currentCert, 'certificationRequestInfo/attributes', true);
+
+        if (!is_array($attributes)) {
+            return false;
+        }
+
+        switch ($disposition) {
+            case self::ATTR_REPLACE:
+                $disposition = self::ATTR_APPEND;
+            case self::ATTR_ALL:
+                $this->removeAttribute($id);
+                break;
+        }
+
+        foreach ($attributes as $key => $attribute) {
+            if ($attribute['type'] == $id) {
+                $n = count($attribute['value']);
+                switch (true) {
+                    case $disposition == self::ATTR_APPEND:
+                        $last = $key;
+                        break;
+                    case $disposition >= $n:
+                        $disposition -= $n;
+                        break;
+                    default:
+                        $attributes[$key]['value'][$disposition] = $value;
+                        return true;
+                }
+            }
+        }
+
+        switch (true) {
+            case $disposition >= 0:
+                return false;
+            case isset($last):
+                $attributes[$last]['value'][] = $value;
+                break;
+            default:
+                $attributes[] = array('type' => $id, 'value' => $disposition == self::ATTR_ALL ? $value: array($value));
+                break;
+        }
+
+        return true;
+    }
+
+    /**
+     * Sets the subject key identifier
+     *
+     * This is used by the id-ce-authorityKeyIdentifier and the id-ce-subjectKeyIdentifier extensions.
+     *
+     * @param string $value
+     * @access public
+     */
+    function setKeyIdentifier($value)
+    {
+        if (empty($value)) {
+            unset($this->currentKeyIdentifier);
+        } else {
+            $this->currentKeyIdentifier = base64_encode($value);
+        }
+    }
+
+    /**
+     * Compute a public key identifier.
+     *
+     * Although key identifiers may be set to any unique value, this function
+     * computes key identifiers from public key according to the two
+     * recommended methods (4.2.1.2 RFC 3280).
+     * Highly polymorphic: try to accept all possible forms of key:
+     * - Key object
+     * - \phpseclib\File\X509 object with public or private key defined
+     * - Certificate or CSR array
+     * - \phpseclib\File\ASN1\Element object
+     * - PEM or DER string
+     *
+     * @param mixed $key optional
+     * @param int $method optional
+     * @access public
+     * @return string binary key identifier
+     */
+    function computeKeyIdentifier($key = null, $method = 1)
+    {
+        if (is_null($key)) {
+            $key = $this;
+        }
+
+        switch (true) {
+            case is_string($key):
+                break;
+            case is_array($key) && isset($key['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey']):
+                return $this->computeKeyIdentifier($key['tbsCertificate']['subjectPublicKeyInfo']['subjectPublicKey'], $method);
+            case is_array($key) && isset($key['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey']):
+                return $this->computeKeyIdentifier($key['certificationRequestInfo']['subjectPKInfo']['subjectPublicKey'], $method);
+            case !is_object($key):
+                return false;
+            case $key instanceof Element:
+                // Assume the element is a bitstring-packed key.
+                $asn1 = new ASN1();
+                $decoded = $asn1->decodeBER($key->element);
+                if (empty($decoded)) {
+                    return false;
+                }
+                $raw = $asn1->asn1map($decoded[0], array('type' => ASN1::TYPE_BIT_STRING));
+                if (empty($raw)) {
+                    return false;
+                }
+                $raw = base64_decode($raw);
+                // If the key is private, compute identifier from its corresponding public key.
+                $key = new RSA();
+                if (!$key->loadKey($raw)) {
+                    return false;   // Not an unencrypted RSA key.
+                }
+                if ($key->getPrivateKey() !== false) {  // If private.
+                    return $this->computeKeyIdentifier($key, $method);
+                }
+                $key = $raw;    // Is a public key.
+                break;
+            case $key instanceof X509:
+                if (isset($key->publicKey)) {
+                    return $this->computeKeyIdentifier($key->publicKey, $method);
+                }
+                if (isset($key->privateKey)) {
+                    return $this->computeKeyIdentifier($key->privateKey, $method);
+                }
+                if (isset($key->currentCert['tbsCertificate']) || isset($key->currentCert['certificationRequestInfo'])) {
+                    return $this->computeKeyIdentifier($key->currentCert, $method);
+                }
+                return false;
+            default: // Should be a key object (i.e.: \phpseclib\Crypt\RSA).
+                $key = $key->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1);
+                break;
+        }
+
+        // If in PEM format, convert to binary.
+        $key = $this->_extractBER($key);
+
+        // Now we have the key string: compute its sha-1 sum.
+        $hash = new Hash('sha1');
+        $hash = $hash->hash($key);
+
+        if ($method == 2) {
+            $hash = substr($hash, -8);
+            $hash[0] = chr((ord($hash[0]) & 0x0F) | 0x40);
+        }
+
+        return $hash;
+    }
+
+    /**
+     * Format a public key as appropriate
+     *
+     * @access private
+     * @return array
+     */
+    function _formatSubjectPublicKey()
+    {
+        if ($this->publicKey instanceof RSA) {
+            // the following two return statements do the same thing. i dunno.. i just prefer the later for some reason.
+            // the former is a good example of how to do fuzzing on the public key
+            //return new Element(base64_decode(preg_replace('#-.+-|[\r\n]#', '', $this->publicKey->getPublicKey())));
+            return array(
+                'algorithm' => array('algorithm' => 'rsaEncryption'),
+                'subjectPublicKey' => $this->publicKey->getPublicKey(RSA::PUBLIC_FORMAT_PKCS1)
+            );
+        }
+
+        return false;
+    }
+
+    /**
+     * Set the domain name's which the cert is to be valid for
+     *
+     * @access public
+     * @return array
+     */
+    function setDomain()
+    {
+        $this->domains = func_get_args();
+        $this->removeDNProp('id-at-commonName');
+        $this->setDNProp('id-at-commonName', $this->domains[0]);
+    }
+
+    /**
+     * Set the IP Addresses's which the cert is to be valid for
+     *
+     * @access public
+     */
+    function setIPAddress()
+    {
+        $this->ipAddresses = func_get_args();
+        /*
+        if (!isset($this->domains)) {
+            $this->removeDNProp('id-at-commonName');
+            $this->setDNProp('id-at-commonName', $this->ipAddresses[0]);
+        }
+        */
+    }
+
+    /**
+     * Helper function to build domain array
+     *
+     * @access private
+     * @param string $domain
+     * @return array
+     */
+    function _dnsName($domain)
+    {
+        return array('dNSName' => $domain);
+    }
+
+    /**
+     * Helper function to build IP Address array
+     *
+     * (IPv6 is not currently supported)
+     *
+     * @access private
+     * @param string $address
+     * @return array
+     */
+    function _iPAddress($address)
+    {
+        return array('iPAddress' => $address);
+    }
+
+    /**
+     * Get the index of a revoked certificate.
+     *
+     * @param array $rclist
+     * @param string $serial
+     * @param bool $create optional
+     * @access private
+     * @return int|false
+     */
+    function _revokedCertificate(&$rclist, $serial, $create = false)
+    {
+        $serial = new BigInteger($serial);
+
+        foreach ($rclist as $i => $rc) {
+            if (!($serial->compare($rc['userCertificate']))) {
+                return $i;
+            }
+        }
+
+        if (!$create) {
+            return false;
+        }
+
+        $i = count($rclist);
+        $revocationDate = new DateTime('now', new DateTimeZone(@date_default_timezone_get()));
+        $rclist[] = array('userCertificate' => $serial,
+                          'revocationDate'  => $this->_timeField($revocationDate->format('D, d M Y H:i:s O')));
+        return $i;
+    }
+
+    /**
+     * Revoke a certificate.
+     *
+     * @param string $serial
+     * @param string $date optional
+     * @access public
+     * @return bool
+     */
+    function revoke($serial, $date = null)
+    {
+        if (isset($this->currentCert['tbsCertList'])) {
+            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if ($this->_revokedCertificate($rclist, $serial) === false) { // If not yet revoked
+                    if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
+                        if (!empty($date)) {
+                            $rclist[$i]['revocationDate'] = $this->_timeField($date);
+                        }
+
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Unrevoke a certificate.
+     *
+     * @param string $serial
+     * @access public
+     * @return bool
+     */
+    function unrevoke($serial)
+    {
+        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                unset($rclist[$i]);
+                $rclist = array_values($rclist);
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a revoked certificate.
+     *
+     * @param string $serial
+     * @access public
+     * @return mixed
+     */
+    function getRevoked($serial)
+    {
+        if (is_array($rclist = $this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $rclist[$i];
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * List revoked certificates
+     *
+     * @param array $crl optional
+     * @access public
+     * @return array
+     */
+    function listRevoked($crl = null)
+    {
+        if (!isset($crl)) {
+            $crl = $this->currentCert;
+        }
+
+        if (!isset($crl['tbsCertList'])) {
+            return false;
+        }
+
+        $result = array();
+
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            foreach ($rclist as $rc) {
+                $result[] = $rc['userCertificate']->toString();
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Remove a Revoked Certificate Extension
+     *
+     * @param string $serial
+     * @param string $id
+     * @access public
+     * @return bool
+     */
+    function removeRevokedCertificateExtension($serial, $id)
+    {
+        if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_removeExtension($id, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Get a Revoked Certificate Extension
+     *
+     * Returns the extension if it exists and false if not
+     *
+     * @param string $serial
+     * @param string $id
+     * @param array $crl optional
+     * @access public
+     * @return mixed
+     */
+    function getRevokedCertificateExtension($serial, $id, $crl = null)
+    {
+        if (!isset($crl)) {
+            $crl = $this->currentCert;
+        }
+
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_getExtension($id, $crl,  "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Returns a list of all extensions in use for a given revoked certificate
+     *
+     * @param string $serial
+     * @param array $crl optional
+     * @access public
+     * @return array
+     */
+    function getRevokedCertificateExtensions($serial, $crl = null)
+    {
+        if (!isset($crl)) {
+            $crl = $this->currentCert;
+        }
+
+        if (is_array($rclist = $this->_subArray($crl, 'tbsCertList/revokedCertificates'))) {
+            if (($i = $this->_revokedCertificate($rclist, $serial)) !== false) {
+                return $this->_getExtensions($crl, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Set a Revoked Certificate Extension
+     *
+     * @param string $serial
+     * @param string $id
+     * @param mixed $value
+     * @param bool $critical optional
+     * @param bool $replace optional
+     * @access public
+     * @return bool
+     */
+    function setRevokedCertificateExtension($serial, $id, $value, $critical = false, $replace = true)
+    {
+        if (isset($this->currentCert['tbsCertList'])) {
+            if (is_array($rclist = &$this->_subArray($this->currentCert, 'tbsCertList/revokedCertificates', true))) {
+                if (($i = $this->_revokedCertificate($rclist, $serial, true)) !== false) {
+                    return $this->_setExtension($id, $value, $critical, $replace, "tbsCertList/revokedCertificates/$i/crlEntryExtensions");
+                }
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Extract raw BER from Base64 encoding
+     *
+     * @access private
+     * @param string $str
+     * @return string
+     */
+    function _extractBER($str)
+    {
+        /* X.509 certs are assumed to be base64 encoded but sometimes they'll have additional things in them
+         * above and beyond the ceritificate.
+         * ie. some may have the following preceding the -----BEGIN CERTIFICATE----- line:
+         *
+         * Bag Attributes
+         *     localKeyID: 01 00 00 00
+         * subject=/O=organization/OU=org unit/CN=common name
+         * issuer=/O=organization/CN=common name
+         */
+        if (strlen($str) > ini_get('pcre.backtrack_limit')) {
+            $temp = $str;
+        } else {
+            $temp = preg_replace('#.*?^-+[^-]+-+[\r\n ]*$#ms', '', $str, 1);
+            $temp = preg_replace('#-+END.*[\r\n ]*.*#ms', '', $temp, 1);
+        }
+        // remove new lines
+        $temp = str_replace(array("\r", "\n", ' '), '', $temp);
+        // remove the -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- stuff
+        $temp = preg_replace('#^-+[^-]+-+|-+[^-]+-+$#', '', $temp);
+        $temp = preg_match('#^[a-zA-Z\d/+]*={0,2}$#', $temp) ? base64_decode($temp) : false;
+        return $temp != false ? $temp : $str;
+    }
+
+    /**
+     * Returns the OID corresponding to a name
+     *
+     * What's returned in the associative array returned by loadX509() (or load*()) is either a name or an OID if
+     * no OID to name mapping is available. The problem with this is that what may be an unmapped OID in one version
+     * of phpseclib may not be unmapped in the next version, so apps that are looking at this OID may not be able
+     * to work from version to version.
+     *
+     * This method will return the OID if a name is passed to it and if no mapping is avialable it'll assume that
+     * what's being passed to it already is an OID and return that instead. A few examples.
+     *
+     * getOID('2.16.840.1.101.3.4.2.1') == '2.16.840.1.101.3.4.2.1'
+     * getOID('id-sha256') == '2.16.840.1.101.3.4.2.1'
+     * getOID('zzz') == 'zzz'
+     *
+     * @access public
+     * @return string
+     */
+    function getOID($name)
+    {
+        static $reverseMap;
+        if (!isset($reverseMap)) {
+            $reverseMap = array_flip($this->oids);
+        }
+        return isset($reverseMap[$name]) ? $reverseMap[$name] : $name;
+    }
+}
diff --git a/build/phpseclib/Math/BigInteger.php b/build/phpseclib/Math/BigInteger.php
new file mode 100644
index 000000000..fc24b9145
--- /dev/null
+++ b/build/phpseclib/Math/BigInteger.php
@@ -0,0 +1,3787 @@
+<?php
+
+/**
+ * Pure-PHP arbitrary precision integer arithmetic library.
+ *
+ * Supports base-2, base-10, base-16, and base-256 numbers.  Uses the GMP or BCMath extensions, if available,
+ * and an internal implementation, otherwise.
+ *
+ * PHP version 5
+ *
+ * {@internal (all DocBlock comments regarding implementation - such as the one that follows - refer to the
+ * {@link self::MODE_INTERNAL self::MODE_INTERNAL} mode)
+ *
+ * BigInteger uses base-2**26 to perform operations such as multiplication and division and
+ * base-2**52 (ie. two base 2**26 digits) to perform addition and subtraction.  Because the largest possible
+ * value when multiplying two base-2**26 numbers together is a base-2**52 number, double precision floating
+ * point numbers - numbers that should be supported on most hardware and whose significand is 53 bits - are
+ * used.  As a consequence, bitwise operators such as >> and << cannot be used, nor can the modulo operator %,
+ * which only supports integers.  Although this fact will slow this library down, the fact that such a high
+ * base is being used should more than compensate.
+ *
+ * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
+ * (new \phpseclib\Math\BigInteger(pow(2, 26)))->value = array(0, 1)
+ *
+ * Useful resources are as follows:
+ *
+ *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
+ *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
+ *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
+ *
+ * Here's an example of how to use this library:
+ * <code>
+ * <?php
+ *    $a = new \phpseclib\Math\BigInteger(2);
+ *    $b = new \phpseclib\Math\BigInteger(3);
+ *
+ *    $c = $a->add($b);
+ *
+ *    echo $c->toString(); // outputs 5
+ * ?>
+ * </code>
+ *
+ * @category  Math
+ * @package   BigInteger
+ * @author    Jim Wigginton <terrafrost@php.net>
+ * @copyright 2006 Jim Wigginton
+ * @license   http://www.opensource.org/licenses/mit-license.html  MIT License
+ */
+
+namespace phpseclib\Math;
+
+use phpseclib\Crypt\Random;
+
+/**
+ * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
+ * numbers.
+ *
+ * @package BigInteger
+ * @author  Jim Wigginton <terrafrost@php.net>
+ * @access  public
+ */
+class BigInteger
+{
+    /**#@+
+     * Reduction constants
+     *
+     * @access private
+     * @see BigInteger::_reduce()
+     */
+    /**
+     * @see BigInteger::_montgomery()
+     * @see BigInteger::_prepMontgomery()
+     */
+    const MONTGOMERY = 0;
+    /**
+     * @see BigInteger::_barrett()
+     */
+    const BARRETT = 1;
+    /**
+     * @see BigInteger::_mod2()
+     */
+    const POWEROF2 = 2;
+    /**
+     * @see BigInteger::_remainder()
+     */
+    const CLASSIC = 3;
+    /**
+     * @see BigInteger::__clone()
+     */
+    const NONE = 4;
+    /**#@-*/
+
+    /**#@+
+     * Array constants
+     *
+     * Rather than create a thousands and thousands of new BigInteger objects in repeated function calls to add() and
+     * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
+     *
+     * @access private
+    */
+    /**
+     * $result[self::VALUE] contains the value.
+     */
+    const VALUE = 0;
+    /**
+     * $result[self::SIGN] contains the sign.
+     */
+    const SIGN = 1;
+    /**#@-*/
+
+    /**#@+
+     * @access private
+     * @see BigInteger::_montgomery()
+     * @see BigInteger::_barrett()
+    */
+    /**
+     * Cache constants
+     *
+     * $cache[self::VARIABLE] tells us whether or not the cached data is still valid.
+     */
+    const VARIABLE = 0;
+    /**
+     * $cache[self::DATA] contains the cached data.
+     */
+    const DATA = 1;
+    /**#@-*/
+
+    /**#@+
+     * Mode constants.
+     *
+     * @access private
+     * @see BigInteger::__construct()
+    */
+    /**
+     * To use the pure-PHP implementation
+     */
+    const MODE_INTERNAL = 1;
+    /**
+     * To use the BCMath library
+     *
+     * (if enabled; otherwise, the internal implementation will be used)
+     */
+    const MODE_BCMATH = 2;
+    /**
+     * To use the GMP library
+     *
+     * (if present; otherwise, either the BCMath or the internal implementation will be used)
+     */
+    const MODE_GMP = 3;
+    /**#@-*/
+
+    /**
+     * Karatsuba Cutoff
+     *
+     * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
+     *
+     * @access private
+     */
+    const KARATSUBA_CUTOFF = 25;
+
+    /**#@+
+     * Static properties used by the pure-PHP implementation.
+     *
+     * @see __construct()
+     */
+    protected static $base;
+    protected static $baseFull;
+    protected static $maxDigit;
+    protected static $msb;
+
+    /**
+     * $max10 in greatest $max10Len satisfying
+     * $max10 = 10**$max10Len <= 2**$base.
+     */
+    protected static $max10;
+
+    /**
+     * $max10Len in greatest $max10Len satisfying
+     * $max10 = 10**$max10Len <= 2**$base.
+     */
+    protected static $max10Len;
+    protected static $maxDigit2;
+    /**#@-*/
+
+    /**
+     * Holds the BigInteger's value.
+     *
+     * @var array
+     * @access private
+     */
+    var $value;
+
+    /**
+     * Holds the BigInteger's magnitude.
+     *
+     * @var bool
+     * @access private
+     */
+    var $is_negative = false;
+
+    /**
+     * Precision
+     *
+     * @see self::setPrecision()
+     * @access private
+     */
+    var $precision = -1;
+
+    /**
+     * Precision Bitmask
+     *
+     * @see self::setPrecision()
+     * @access private
+     */
+    var $bitmask = false;
+
+    /**
+     * Mode independent value used for serialization.
+     *
+     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for
+     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
+     * however, $this->hex is only calculated when $this->__sleep() is called.
+     *
+     * @see self::__sleep()
+     * @see self::__wakeup()
+     * @var string
+     * @access private
+     */
+    var $hex;
+
+    /**
+     * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
+     *
+     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
+     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('0x32', 16); // 50 in base-16
+     *
+     *    echo $a->toString(); // outputs 50
+     * ?>
+     * </code>
+     *
+     * @param int|string|resource $x base-10 number or base-$base number if $base set.
+     * @param int $base
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function __construct($x = 0, $base = 10)
+    {
+        if (!defined('MATH_BIGINTEGER_MODE')) {
+            switch (true) {
+                case extension_loaded('gmp'):
+                    define('MATH_BIGINTEGER_MODE', self::MODE_GMP);
+                    break;
+                case extension_loaded('bcmath'):
+                    define('MATH_BIGINTEGER_MODE', self::MODE_BCMATH);
+                    break;
+                default:
+                    define('MATH_BIGINTEGER_MODE', self::MODE_INTERNAL);
+            }
+        }
+
+        if (extension_loaded('openssl') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            // some versions of XAMPP have mismatched versions of OpenSSL which causes it not to work
+            $versions = array();
+
+            // avoid generating errors (even with suppression) when phpinfo() is disabled (common in production systems)
+            if (strpos(ini_get('disable_functions'), 'phpinfo') === false) {
+                ob_start();
+                @phpinfo();
+                $content = ob_get_contents();
+                ob_end_clean();
+
+                preg_match_all('#OpenSSL (Header|Library) Version(.*)#im', $content, $matches);
+
+                if (!empty($matches[1])) {
+                    for ($i = 0; $i < count($matches[1]); $i++) {
+                        $fullVersion = trim(str_replace('=>', '', strip_tags($matches[2][$i])));
+
+                        // Remove letter part in OpenSSL version
+                        if (!preg_match('/(\d+\.\d+\.\d+)/i', $fullVersion, $m)) {
+                            $versions[$matches[1][$i]] = $fullVersion;
+                        } else {
+                            $versions[$matches[1][$i]] = $m[0];
+                        }
+                    }
+                }
+            }
+
+            // it doesn't appear that OpenSSL versions were reported upon until PHP 5.3+
+            switch (true) {
+                case !isset($versions['Header']):
+                case !isset($versions['Library']):
+                case $versions['Header'] == $versions['Library']:
+                case version_compare($versions['Header'], '1.0.0') >= 0 && version_compare($versions['Library'], '1.0.0') >= 0:
+                    define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
+                    break;
+                default:
+                    define('MATH_BIGINTEGER_OPENSSL_DISABLE', true);
+            }
+        }
+
+        if (!defined('PHP_INT_SIZE')) {
+            define('PHP_INT_SIZE', 4);
+        }
+
+        if (empty(self::$base) && MATH_BIGINTEGER_MODE == self::MODE_INTERNAL) {
+            switch (PHP_INT_SIZE) {
+                case 8: // use 64-bit integers if int size is 8 bytes
+                    self::$base      = 31;
+                    self::$baseFull  = 0x80000000;
+                    self::$maxDigit  = 0x7FFFFFFF;
+                    self::$msb       = 0x40000000;
+                    self::$max10     = 1000000000;
+                    self::$max10Len  = 9;
+                    self::$maxDigit2 = pow(2, 62);
+                    break;
+                //case 4: // use 64-bit floats if int size is 4 bytes
+                default:
+                    self::$base      = 26;
+                    self::$baseFull  = 0x4000000;
+                    self::$maxDigit  = 0x3FFFFFF;
+                    self::$msb       = 0x2000000;
+                    self::$max10     = 10000000;
+                    self::$max10Len  = 7;
+                    self::$maxDigit2 = pow(2, 52); // pow() prevents truncation
+            }
+        }
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                switch (true) {
+                    case is_resource($x) && get_resource_type($x) == 'GMP integer':
+                    // PHP 5.6 switched GMP from using resources to objects
+                    case $x instanceof \GMP:
+                        $this->value = $x;
+                        return;
+                }
+                $this->value = gmp_init(0);
+                break;
+            case self::MODE_BCMATH:
+                $this->value = '0';
+                break;
+            default:
+                $this->value = array();
+        }
+
+        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
+        // '0' is the only value like this per http://php.net/empty
+        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
+            return;
+        }
+
+        switch ($base) {
+            case -256:
+                if (ord($x[0]) & 0x80) {
+                    $x = ~$x;
+                    $this->is_negative = true;
+                }
+            case 256:
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $this->value = function_exists('gmp_import') ?
+                            gmp_import($x) :
+                            gmp_init('0x' . bin2hex($x));
+                        if ($this->is_negative) {
+                            $this->value = gmp_neg($this->value);
+                        }
+                        break;
+                    case self::MODE_BCMATH:
+                        // round $len to the nearest 4 (thanks, DavidMJ!)
+                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
+
+                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
+
+                        for ($i = 0; $i < $len; $i+= 4) {
+                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
+                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
+                        }
+
+                        if ($this->is_negative) {
+                            $this->value = '-' . $this->value;
+                        }
+
+                        break;
+                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
+                    default:
+                        while (strlen($x)) {
+                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, self::$base));
+                        }
+                }
+
+                if ($this->is_negative) {
+                    if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+                        $this->is_negative = false;
+                    }
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case 16:
+            case -16:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
+
+                $is_negative = false;
+                if ($base < 0 && hexdec($x[0]) >= 8) {
+                    $this->is_negative = $is_negative = true;
+                    $x = bin2hex(~pack('H*', $x));
+                }
+
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
+                        $this->value = gmp_init($temp);
+                        $this->is_negative = false;
+                        break;
+                    case self::MODE_BCMATH:
+                        $x = (strlen($x) & 1) ? '0' . $x : $x;
+                        $temp = new static(pack('H*', $x), 256);
+                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
+                        $this->is_negative = false;
+                        break;
+                    default:
+                        $x = (strlen($x) & 1) ? '0' . $x : $x;
+                        $temp = new static(pack('H*', $x), 256);
+                        $this->value = $temp->value;
+                }
+
+                if ($is_negative) {
+                    $temp = $this->add(new static('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case 10:
+            case -10:
+                // (?<!^)(?:-).*: find any -'s that aren't at the beginning and then any characters that follow that
+                // (?<=^|-)0*: find any 0's that are preceded by the start of the string or by a - (ie. octals)
+                // [^-0-9].*: find any non-numeric characters and then any characters that follow that
+                $x = preg_replace('#(?<!^)(?:-).*|(?<=^|-)0*|[^-0-9].*#', '', $x);
+                if (!strlen($x) || $x == '-') {
+                    $x = '0';
+                }
+
+                switch (MATH_BIGINTEGER_MODE) {
+                    case self::MODE_GMP:
+                        $this->value = gmp_init($x);
+                        break;
+                    case self::MODE_BCMATH:
+                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
+                        // results then doing it on '-1' does (modInverse does $x[0])
+                        $this->value = $x === '-' ? '0' : (string) $x;
+                        break;
+                    default:
+                        $temp = new static();
+
+                        $multiplier = new static();
+                        $multiplier->value = array(self::$max10);
+
+                        if ($x[0] == '-') {
+                            $this->is_negative = true;
+                            $x = substr($x, 1);
+                        }
+
+                        $x = str_pad($x, strlen($x) + ((self::$max10Len - 1) * strlen($x)) % self::$max10Len, 0, STR_PAD_LEFT);
+                        while (strlen($x)) {
+                            $temp = $temp->multiply($multiplier);
+                            $temp = $temp->add(new static($this->_int2bytes(substr($x, 0, self::$max10Len)), 256));
+                            $x = substr($x, self::$max10Len);
+                        }
+
+                        $this->value = $temp->value;
+                }
+                break;
+            case 2: // base-2 support originally implemented by Lluis Pamies - thanks!
+            case -2:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^([01]*).*#', '$1', $x);
+                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
+
+                $str = '0x';
+                while (strlen($x)) {
+                    $part = substr($x, 0, 4);
+                    $str.= dechex(bindec($part));
+                    $x = substr($x, 4);
+                }
+
+                if ($this->is_negative) {
+                    $str = '-' . $str;
+                }
+
+                $temp = new static($str, 8 * $base); // ie. either -16 or +16
+                $this->value = $temp->value;
+                $this->is_negative = $temp->is_negative;
+
+                break;
+            default:
+                // base not supported, so we'll let $this == 0
+        }
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toBytes(); // outputs chr(65)
+     * ?>
+     * </code>
+     *
+     * @param bool $twos_compliment
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
+     */
+    function toBytes($twos_compliment = false)
+    {
+        if ($twos_compliment) {
+            $comparison = $this->compare(new static());
+            if ($comparison == 0) {
+                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+            }
+
+            $temp = $comparison < 0 ? $this->add(new static(1)) : $this->copy();
+            $bytes = $temp->toBytes();
+
+            if (!strlen($bytes)) { // eg. if the number we're trying to convert is -1
+                $bytes = chr(0);
+            }
+
+            if ($this->precision <= 0 && (ord($bytes[0]) & 0x80)) {
+                $bytes = chr(0) . $bytes;
+            }
+
+            return $comparison < 0 ? ~$bytes : $bytes;
+        }
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                if (function_exists('gmp_export')) {
+                    $temp = gmp_export($this->value);
+                } else {
+                    $temp = gmp_strval(gmp_abs($this->value), 16);
+                    $temp = (strlen($temp) & 1) ? '0' . $temp : $temp;
+                    $temp = pack('H*', $temp);
+                }
+
+                return $this->precision > 0 ?
+                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($temp, chr(0));
+            case self::MODE_BCMATH:
+                if ($this->value === '0') {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                $value = '';
+                $current = $this->value;
+
+                if ($current[0] == '-') {
+                    $current = substr($current, 1);
+                }
+
+                while (bccomp($current, '0', 0) > 0) {
+                    $temp = bcmod($current, '16777216');
+                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
+                    $current = bcdiv($current, '16777216', 0);
+                }
+
+                return $this->precision > 0 ?
+                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($value, chr(0));
+        }
+
+        if (!count($this->value)) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
+
+        $temp = $this->copy();
+
+        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
+            $temp->_base256_lshift($result, self::$base);
+            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
+        }
+
+        return $this->precision > 0 ?
+            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
+            $result;
+    }
+
+    /**
+     * Converts a BigInteger to a hex string (eg. base-16)).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toHex(); // outputs '41'
+     * ?>
+     * </code>
+     *
+     * @param bool $twos_compliment
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
+     */
+    function toHex($twos_compliment = false)
+    {
+        return bin2hex($this->toBytes($twos_compliment));
+    }
+
+    /**
+     * Converts a BigInteger to a bit string (eg. base-2).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('65');
+     *
+     *    echo $a->toBits(); // outputs '1000001'
+     * ?>
+     * </code>
+     *
+     * @param bool $twos_compliment
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**2
+     */
+    function toBits($twos_compliment = false)
+    {
+        $hex = $this->toHex($twos_compliment);
+        $bits = '';
+        for ($i = strlen($hex) - 6, $start = strlen($hex) % 6; $i >= $start; $i-=6) {
+            $bits = str_pad(decbin(hexdec(substr($hex, $i, 6))), 24, '0', STR_PAD_LEFT) . $bits;
+        }
+        if ($start) { // hexdec('') == 0
+            $bits = str_pad(decbin(hexdec(substr($hex, 0, $start))), 8 * $start, '0', STR_PAD_LEFT) . $bits;
+        }
+        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
+
+        if ($twos_compliment && $this->compare(new static()) > 0 && $this->precision <= 0) {
+            return '0' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('50');
+     *
+     *    echo $a->toString(); // outputs 50
+     * ?>
+     * </code>
+     *
+     * @return string
+     * @access public
+     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
+     */
+    function toString()
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_strval($this->value);
+            case self::MODE_BCMATH:
+                if ($this->value === '0') {
+                    return '0';
+                }
+
+                return ltrim($this->value, '0');
+        }
+
+        if (!count($this->value)) {
+            return '0';
+        }
+
+        $temp = $this->copy();
+        $temp->bitmask = false;
+        $temp->is_negative = false;
+
+        $divisor = new static();
+        $divisor->value = array(self::$max10);
+        $result = '';
+        while (count($temp->value)) {
+            list($temp, $mod) = $temp->divide($divisor);
+            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', self::$max10Len, '0', STR_PAD_LEFT) . $result;
+        }
+        $result = ltrim($result, '0');
+        if (empty($result)) {
+            $result = '0';
+        }
+
+        if ($this->is_negative) {
+            $result = '-' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Copy an object
+     *
+     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
+     * that all objects are passed by value, when appropriate.  More information can be found here:
+     *
+     * {@link http://php.net/language.oop5.basic#51624}
+     *
+     * @access public
+     * @see self::__clone()
+     * @return \phpseclib\Math\BigInteger
+     */
+    function copy()
+    {
+        $temp = new static();
+        $temp->value = $this->value;
+        $temp->is_negative = $this->is_negative;
+        $temp->precision = $this->precision;
+        $temp->bitmask = $this->bitmask;
+        return $temp;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
+     * toString().
+     *
+     * @access public
+     * @internal Implemented per a suggestion by Techie-Michael - thanks!
+     */
+    function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * __clone() magic method
+     *
+     * Although you can call BigInteger::__toString() directly in PHP5, you cannot call BigInteger::__clone() directly
+     * in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
+     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and
+     * PHP5, call BigInteger::copy(), instead.
+     *
+     * @access public
+     * @see self::copy()
+     * @return \phpseclib\Math\BigInteger
+     */
+    function __clone()
+    {
+        return $this->copy();
+    }
+
+    /**
+     *  __sleep() magic method
+     *
+     * Will be called, automatically, when serialize() is called on a BigInteger object.
+     *
+     * @see self::__wakeup()
+     * @access public
+     */
+    function __sleep()
+    {
+        $this->hex = $this->toHex(true);
+        $vars = array('hex');
+        if ($this->precision > 0) {
+            $vars[] = 'precision';
+        }
+        return $vars;
+    }
+
+    /**
+     *  __wakeup() magic method
+     *
+     * Will be called, automatically, when unserialize() is called on a BigInteger object.
+     *
+     * @see self::__sleep()
+     * @access public
+     */
+    function __wakeup()
+    {
+        $temp = new static($this->hex, -16);
+        $this->value = $temp->value;
+        $this->is_negative = $temp->is_negative;
+        if ($this->precision > 0) {
+            // recalculate $this->bitmask
+            $this->setPrecision($this->precision);
+        }
+    }
+
+    /**
+     *  __debugInfo() magic method
+     *
+     * Will be called, automatically, when print_r() or var_dump() are called
+     *
+     * @access public
+     */
+    function __debugInfo()
+    {
+        $opts = array();
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $engine = 'gmp';
+                break;
+            case self::MODE_BCMATH:
+                $engine = 'bcmath';
+                break;
+            case self::MODE_INTERNAL:
+                $engine = 'internal';
+                $opts[] = PHP_INT_SIZE == 8 ? '64-bit' : '32-bit';
+        }
+        if (MATH_BIGINTEGER_MODE != self::MODE_GMP && defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            $opts[] = 'OpenSSL';
+        }
+        if (!empty($opts)) {
+            $engine.= ' (' . implode('.', $opts) . ')';
+        }
+        return array(
+            'value' => '0x' . $this->toHex(true),
+            'engine' => $engine
+        );
+    }
+
+    /**
+     * Adds two BigIntegers.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->add($b);
+     *
+     *    echo $c->toString(); // outputs 30
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Performs base-2**52 addition
+     */
+    function add($y)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_add($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcadd($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new static();
+        $result->value = $temp[self::VALUE];
+        $result->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs addition.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _add($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                self::VALUE => $y_value,
+                self::SIGN => $y_negative
+            );
+        } elseif ($y_size == 0) {
+            return array(
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative
+            );
+        }
+
+        // subtract, if appropriate
+        if ($x_negative != $y_negative) {
+            if ($x_value == $y_value) {
+                return array(
+                    self::VALUE => array(),
+                    self::SIGN => false
+                );
+            }
+
+            $temp = $this->_subtract($x_value, false, $y_value, false);
+            $temp[self::SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
+                                          $x_negative : $y_negative;
+
+            return $temp;
+        }
+
+        if ($x_size < $y_size) {
+            $size = $x_size;
+            $value = $y_value;
+        } else {
+            $size = $y_size;
+            $value = $x_value;
+        }
+
+        $value[count($value)] = 0; // just in case the carry adds an extra digit
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] + $y_value[$j] * self::$baseFull + $y_value[$i] + $carry;
+            $carry = $sum >= self::$maxDigit2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum - self::$maxDigit2 : $sum;
+
+            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $value[$i] = (int) ($sum - self::$baseFull * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
+            $value[$j] = $temp;
+        }
+
+        if ($j == $size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] + $y_value[$i] + $carry;
+            $carry = $sum >= self::$baseFull;
+            $value[$i] = $carry ? $sum - self::$baseFull : $sum;
+            ++$i; // ie. let $i = $j since we've just done $value[$i]
+        }
+
+        if ($carry) {
+            for (; $value[$i] == self::$maxDigit; ++$i) {
+                $value[$i] = 0;
+            }
+            ++$value[$i];
+        }
+
+        return array(
+            self::VALUE => $this->_trim($value),
+            self::SIGN => $x_negative
+        );
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->subtract($b);
+     *
+     *    echo $c->toString(); // outputs -10
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Performs base-2**52 subtraction
+     */
+    function subtract($y)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_sub($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcsub($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new static();
+        $result->value = $temp[self::VALUE];
+        $result->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs subtraction.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _subtract($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                self::VALUE => $y_value,
+                self::SIGN => !$y_negative
+            );
+        } elseif ($y_size == 0) {
+            return array(
+                self::VALUE => $x_value,
+                self::SIGN => $x_negative
+            );
+        }
+
+        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
+        if ($x_negative != $y_negative) {
+            $temp = $this->_add($x_value, false, $y_value, false);
+            $temp[self::SIGN] = $x_negative;
+
+            return $temp;
+        }
+
+        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
+
+        if (!$diff) {
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        // switch $x and $y around, if appropriate.
+        if ((!$x_negative && $diff < 0) || ($x_negative && $diff > 0)) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_negative = !$x_negative;
+
+            $x_size = count($x_value);
+            $y_size = count($y_value);
+        }
+
+        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * self::$baseFull + $x_value[$i] - $y_value[$j] * self::$baseFull - $y_value[$i] - $carry;
+            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum + self::$maxDigit2 : $sum;
+
+            $temp = self::$base === 26 ? intval($sum / 0x4000000) : ($sum >> 31);
+
+            $x_value[$i] = (int) ($sum - self::$baseFull * $temp);
+            $x_value[$j] = $temp;
+        }
+
+        if ($j == $y_size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] - $y_value[$i] - $carry;
+            $carry = $sum < 0;
+            $x_value[$i] = $carry ? $sum + self::$baseFull : $sum;
+            ++$i;
+        }
+
+        if ($carry) {
+            for (; !$x_value[$i]; ++$i) {
+                $x_value[$i] = self::$maxDigit;
+            }
+            --$x_value[$i];
+        }
+
+        return array(
+            self::VALUE => $this->_trim($x_value),
+            self::SIGN => $x_negative
+        );
+    }
+
+    /**
+     * Multiplies two BigIntegers
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    $c = $a->multiply($b);
+     *
+     *    echo $c->toString(); // outputs 200
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function multiply($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_mul($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $temp = new static();
+                $temp->value = bcmul($this->value, $x->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
+
+        $product = new static();
+        $product->value = $temp[self::VALUE];
+        $product->is_negative = $temp[self::SIGN];
+
+        return $this->_normalize($product);
+    }
+
+    /**
+     * Performs multiplication.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return array
+     * @access private
+     */
+    function _multiply($x_value, $x_negative, $y_value, $y_negative)
+    {
+        //if ( $x_value == $y_value ) {
+        //    return array(
+        //        self::VALUE => $this->_square($x_value),
+        //        self::SIGN => $x_sign != $y_value
+        //    );
+        //}
+
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        return array(
+            self::VALUE => min($x_length, $y_length) < 2 * self::KARATSUBA_CUTOFF ?
+                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
+                $this->_trim($this->_karatsuba($x_value, $y_value)),
+            self::SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Performs long multiplication on two BigIntegers
+     *
+     * Modeled after 'multiply' in MutableBigInteger.java.
+     *
+     * @param array $x_value
+     * @param array $y_value
+     * @return array
+     * @access private
+     */
+    function _regularMultiply($x_value, $y_value)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array();
+        }
+
+        if ($x_length < $y_length) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
+        }
+
+        $product_value[$j] = $carry;
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            $product_value[$k] = $carry;
+        }
+
+        return $product_value;
+    }
+
+    /**
+     * Performs Karatsuba multiplication on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
+     *
+     * @param array $x_value
+     * @param array $y_value
+     * @return array
+     * @access private
+     */
+    function _karatsuba($x_value, $y_value)
+    {
+        $m = min(count($x_value) >> 1, count($y_value) >> 1);
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return $this->_regularMultiply($x_value, $y_value);
+        }
+
+        $x1 = array_slice($x_value, $m);
+        $x0 = array_slice($x_value, 0, $m);
+        $y1 = array_slice($y_value, $m);
+        $y0 = array_slice($y_value, 0, $m);
+
+        $z2 = $this->_karatsuba($x1, $y1);
+        $z0 = $this->_karatsuba($x0, $y0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $temp = $this->_add($y1, false, $y0, false);
+        $z1 = $this->_karatsuba($z1[self::VALUE], $temp[self::VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xy = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xy = $this->_add($xy[self::VALUE], $xy[self::SIGN], $z0, false);
+
+        return $xy[self::VALUE];
+    }
+
+    /**
+     * Performs squaring
+     *
+     * @param array $x
+     * @return array
+     * @access private
+     */
+    function _square($x = false)
+    {
+        return count($x) < 2 * self::KARATSUBA_CUTOFF ?
+            $this->_trim($this->_baseSquare($x)) :
+            $this->_trim($this->_karatsubaSquare($x));
+    }
+
+    /**
+     * Performs traditional squaring on two BigIntegers
+     *
+     * Squaring can be done faster than multiplying a number by itself can be.  See
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
+     *
+     * @param array $value
+     * @return array
+     * @access private
+     */
+    function _baseSquare($value)
+    {
+        if (empty($value)) {
+            return array();
+        }
+        $square_value = $this->_array_repeat(0, 2 * count($value));
+
+        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
+            $i2 = $i << 1;
+
+            $temp = $square_value[$i2] + $value[$i] * $value[$i];
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $square_value[$i2] = (int) ($temp - self::$baseFull * $carry);
+
+            // note how we start from $i+1 instead of 0 as we do in multiplication.
+            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
+                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $square_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            // the following line can yield values larger 2**15.  at this point, PHP should switch
+            // over to floats.
+            $square_value[$i + $max_index + 1] = $carry;
+        }
+
+        return $square_value;
+    }
+
+    /**
+     * Performs Karatsuba "squaring" on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
+     *
+     * @param array $value
+     * @return array
+     * @access private
+     */
+    function _karatsubaSquare($value)
+    {
+        $m = count($value) >> 1;
+
+        if ($m < self::KARATSUBA_CUTOFF) {
+            return $this->_baseSquare($value);
+        }
+
+        $x1 = array_slice($value, $m);
+        $x0 = array_slice($value, 0, $m);
+
+        $z2 = $this->_karatsubaSquare($x1);
+        $z0 = $this->_karatsubaSquare($x0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $z1 = $this->_karatsubaSquare($z1[self::VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[self::VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[self::VALUE] = array_merge(array_fill(0, $m, 0), $z1[self::VALUE]);
+
+        $xx = $this->_add($z2, false, $z1[self::VALUE], $z1[self::SIGN]);
+        $xx = $this->_add($xx[self::VALUE], $xx[self::SIGN], $z0, false);
+
+        return $xx[self::VALUE];
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *
+     *    list($quotient, $remainder) = $a->divide($b);
+     *
+     *    echo $quotient->toString(); // outputs 0
+     *    echo "\r\n";
+     *    echo $remainder->toString(); // outputs 10
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return array
+     * @access public
+     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
+     */
+    function divide($y)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $quotient = new static();
+                $remainder = new static();
+
+                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
+
+                if (gmp_sign($remainder->value) < 0) {
+                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+            case self::MODE_BCMATH:
+                $quotient = new static();
+                $remainder = new static();
+
+                $quotient->value = bcdiv($this->value, $y->value, 0);
+                $remainder->value = bcmod($this->value, $y->value);
+
+                if ($remainder->value[0] == '-') {
+                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        if (count($y->value) == 1) {
+            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
+            $quotient = new static();
+            $remainder = new static();
+            $quotient->value = $q;
+            $remainder->value = array($r);
+            $quotient->is_negative = $this->is_negative != $y->is_negative;
+            return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        static $zero;
+        if (!isset($zero)) {
+            $zero = new static();
+        }
+
+        $x = $this->copy();
+        $y = $y->copy();
+
+        $x_sign = $x->is_negative;
+        $y_sign = $y->is_negative;
+
+        $x->is_negative = $y->is_negative = false;
+
+        $diff = $x->compare($y);
+
+        if (!$diff) {
+            $temp = new static();
+            $temp->value = array(1);
+            $temp->is_negative = $x_sign != $y_sign;
+            return array($this->_normalize($temp), $this->_normalize(new static()));
+        }
+
+        if ($diff < 0) {
+            // if $x is negative, "add" $y.
+            if ($x_sign) {
+                $x = $y->subtract($x);
+            }
+            return array($this->_normalize(new static()), $this->_normalize($x));
+        }
+
+        // normalize $x and $y as described in HAC 14.23 / 14.24
+        $msb = $y->value[count($y->value) - 1];
+        for ($shift = 0; !($msb & self::$msb); ++$shift) {
+            $msb <<= 1;
+        }
+        $x->_lshift($shift);
+        $y->_lshift($shift);
+        $y_value = &$y->value;
+
+        $x_max = count($x->value) - 1;
+        $y_max = count($y->value) - 1;
+
+        $quotient = new static();
+        $quotient_value = &$quotient->value;
+        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
+
+        static $temp, $lhs, $rhs;
+        if (!isset($temp)) {
+            $temp = new static();
+            $lhs =  new static();
+            $rhs =  new static();
+        }
+        $temp_value = &$temp->value;
+        $rhs_value =  &$rhs->value;
+
+        // $temp = $y << ($x_max - $y_max-1) in base 2**26
+        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
+
+        while ($x->compare($temp) >= 0) {
+            // calculate the "common residue"
+            ++$quotient_value[$x_max - $y_max];
+            $x = $x->subtract($temp);
+            $x_max = count($x->value) - 1;
+        }
+
+        for ($i = $x_max; $i >= $y_max + 1; --$i) {
+            $x_value = &$x->value;
+            $x_window = array(
+                isset($x_value[$i]) ? $x_value[$i] : 0,
+                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
+                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
+            );
+            $y_window = array(
+                $y_value[$y_max],
+                ($y_max > 0) ? $y_value[$y_max - 1] : 0
+            );
+
+            $q_index = $i - $y_max - 1;
+            if ($x_window[0] == $y_window[0]) {
+                $quotient_value[$q_index] = self::$maxDigit;
+            } else {
+                $quotient_value[$q_index] = $this->_safe_divide(
+                    $x_window[0] * self::$baseFull + $x_window[1],
+                    $y_window[0]
+                );
+            }
+
+            $temp_value = array($y_window[1], $y_window[0]);
+
+            $lhs->value = array($quotient_value[$q_index]);
+            $lhs = $lhs->multiply($temp);
+
+            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
+
+            while ($lhs->compare($rhs) > 0) {
+                --$quotient_value[$q_index];
+
+                $lhs->value = array($quotient_value[$q_index]);
+                $lhs = $lhs->multiply($temp);
+            }
+
+            $adjust = $this->_array_repeat(0, $q_index);
+            $temp_value = array($quotient_value[$q_index]);
+            $temp = $temp->multiply($y);
+            $temp_value = &$temp->value;
+            if (count($temp_value)) {
+                $temp_value = array_merge($adjust, $temp_value);
+            }
+
+            $x = $x->subtract($temp);
+
+            if ($x->compare($zero) < 0) {
+                $temp_value = array_merge($adjust, $y_value);
+                $x = $x->add($temp);
+
+                --$quotient_value[$q_index];
+            }
+
+            $x_max = count($x_value) - 1;
+        }
+
+        // unnormalize the remainder
+        $x->_rshift($shift);
+
+        $quotient->is_negative = $x_sign != $y_sign;
+
+        // calculate the "common residue", if appropriate
+        if ($x_sign) {
+            $y->_rshift($shift);
+            $x = $y->subtract($x);
+        }
+
+        return array($this->_normalize($quotient), $this->_normalize($x));
+    }
+
+    /**
+     * Divides a BigInteger by a regular integer
+     *
+     * abc / x = a00 / x + b0 / x + c / x
+     *
+     * @param array $dividend
+     * @param array $divisor
+     * @return array
+     * @access private
+     */
+    function _divide_digit($dividend, $divisor)
+    {
+        $carry = 0;
+        $result = array();
+
+        for ($i = count($dividend) - 1; $i >= 0; --$i) {
+            $temp = self::$baseFull * $carry + $dividend[$i];
+            $result[$i] = $this->_safe_divide($temp, $divisor);
+            $carry = (int) ($temp - $divisor * $result[$i]);
+        }
+
+        return array($result, $carry);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger('10');
+     *    $b = new \phpseclib\Math\BigInteger('20');
+     *    $c = new \phpseclib\Math\BigInteger('30');
+     *
+     *    $c = $a->modPow($b, $c);
+     *
+     *    echo $c->toString(); // outputs 10
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
+     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
+     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
+     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
+     *
+     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
+     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
+     *
+     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
+     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
+     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
+     *    the product of two odd numbers is odd), but what about when RSA isn't used?
+     *
+     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
+     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
+     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
+     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
+     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
+     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
+     */
+    function modPow($e, $n)
+    {
+        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
+
+        if ($e->compare(new static()) < 0) {
+            $e = $e->abs();
+
+            $temp = $this->modInverse($n);
+            if ($temp === false) {
+                return false;
+            }
+
+            return $this->_normalize($temp->modPow($e, $n));
+        }
+
+        if (MATH_BIGINTEGER_MODE == self::MODE_GMP) {
+            $temp = new static();
+            $temp->value = gmp_powm($this->value, $e->value, $n->value);
+
+            return $this->_normalize($temp);
+        }
+
+        if ($this->compare(new static()) < 0 || $this->compare($n) > 0) {
+            list(, $temp) = $this->divide($n);
+            return $temp->modPow($e, $n);
+        }
+
+        if (defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            $components = array(
+                'modulus' => $n->toBytes(true),
+                'publicExponent' => $e->toBytes(true)
+            );
+
+            $components = array(
+                'modulus' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['modulus'])), $components['modulus']),
+                'publicExponent' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['publicExponent'])), $components['publicExponent'])
+            );
+
+            $RSAPublicKey = pack(
+                'Ca*a*a*',
+                48,
+                $this->_encodeASN1Length(strlen($components['modulus']) + strlen($components['publicExponent'])),
+                $components['modulus'],
+                $components['publicExponent']
+            );
+
+            $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+            $RSAPublicKey = chr(0) . $RSAPublicKey;
+            $RSAPublicKey = chr(3) . $this->_encodeASN1Length(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+            $encapsulated = pack(
+                'Ca*a*',
+                48,
+                $this->_encodeASN1Length(strlen($rsaOID . $RSAPublicKey)),
+                $rsaOID . $RSAPublicKey
+            );
+
+            $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+                             chunk_split(base64_encode($encapsulated)) .
+                             '-----END PUBLIC KEY-----';
+
+            $plaintext = str_pad($this->toBytes(), strlen($n->toBytes(true)) - 1, "\0", STR_PAD_LEFT);
+
+            if (openssl_public_encrypt($plaintext, $result, $RSAPublicKey, OPENSSL_NO_PADDING)) {
+                return new static($result, 256);
+            }
+        }
+
+        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+            $temp = new static();
+            $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
+
+            return $this->_normalize($temp);
+        }
+
+        if (empty($e->value)) {
+            $temp = new static();
+            $temp->value = array(1);
+            return $this->_normalize($temp);
+        }
+
+        if ($e->value == array(1)) {
+            list(, $temp) = $this->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        if ($e->value == array(2)) {
+            $temp = new static();
+            $temp->value = $this->_square($this->value);
+            list(, $temp) = $temp->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        return $this->_normalize($this->_slidingWindow($e, $n, self::BARRETT));
+
+        // the following code, although not callable, can be run independently of the above code
+        // although the above code performed better in my benchmarks the following could might
+        // perform better under different circumstances. in lieu of deleting it it's just been
+        // made uncallable
+
+        // is the modulo odd?
+        if ($n->value[0] & 1) {
+            return $this->_normalize($this->_slidingWindow($e, $n, self::MONTGOMERY));
+        }
+        // if it's not, it's even
+
+        // find the lowest set bit (eg. the max pow of 2 that divides $n)
+        for ($i = 0; $i < count($n->value); ++$i) {
+            if ($n->value[$i]) {
+                $temp = decbin($n->value[$i]);
+                $j = strlen($temp) - strrpos($temp, '1') - 1;
+                $j+= 26 * $i;
+                break;
+            }
+        }
+        // at this point, 2^$j * $n/(2^$j) == $n
+
+        $mod1 = $n->copy();
+        $mod1->_rshift($j);
+        $mod2 = new static();
+        $mod2->value = array(1);
+        $mod2->_lshift($j);
+
+        $part1 = ($mod1->value != array(1)) ? $this->_slidingWindow($e, $mod1, self::MONTGOMERY) : new static();
+        $part2 = $this->_slidingWindow($e, $mod2, self::POWEROF2);
+
+        $y1 = $mod2->modInverse($mod1);
+        $y2 = $mod1->modInverse($mod2);
+
+        $result = $part1->multiply($mod2);
+        $result = $result->multiply($y1);
+
+        $temp = $part2->multiply($mod1);
+        $temp = $temp->multiply($y2);
+
+        $result = $result->add($temp);
+        list(, $result) = $result->divide($n);
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for modPow().
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function powMod($e, $n)
+    {
+        return $this->modPow($e, $n);
+    }
+
+    /**
+     * Sliding Window k-ary Modular Exponentiation
+     *
+     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
+     * however, this function performs a modular reduction after every multiplication and squaring operation.
+     * As such, this function has the same preconditions that the reductions being used do.
+     *
+     * @param \phpseclib\Math\BigInteger $e
+     * @param \phpseclib\Math\BigInteger $n
+     * @param int $mode
+     * @return \phpseclib\Math\BigInteger
+     * @access private
+     */
+    function _slidingWindow($e, $n, $mode)
+    {
+        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
+        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
+
+        $e_value = $e->value;
+        $e_length = count($e_value) - 1;
+        $e_bits = decbin($e_value[$e_length]);
+        for ($i = $e_length - 1; $i >= 0; --$i) {
+            $e_bits.= str_pad(decbin($e_value[$i]), self::$base, '0', STR_PAD_LEFT);
+        }
+
+        $e_length = strlen($e_bits);
+
+        // calculate the appropriate window size.
+        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
+        for ($i = 0, $window_size = 1; $i < count($window_ranges) && $e_length > $window_ranges[$i]; ++$window_size, ++$i) {
+        }
+
+        $n_value = $n->value;
+
+        // precompute $this^0 through $this^$window_size
+        $powers = array();
+        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
+        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
+
+        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
+        // in a 1.  ie. it's supposed to be odd.
+        $temp = 1 << ($window_size - 1);
+        for ($i = 1; $i < $temp; ++$i) {
+            $i2 = $i << 1;
+            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
+        }
+
+        $result = array(1);
+        $result = $this->_prepareReduce($result, $n_value, $mode);
+
+        for ($i = 0; $i < $e_length;) {
+            if (!$e_bits[$i]) {
+                $result = $this->_squareReduce($result, $n_value, $mode);
+                ++$i;
+            } else {
+                for ($j = $window_size - 1; $j > 0; --$j) {
+                    if (!empty($e_bits[$i + $j])) {
+                        break;
+                    }
+                }
+
+                // eg. the length of substr($e_bits, $i, $j + 1)
+                for ($k = 0; $k <= $j; ++$k) {
+                    $result = $this->_squareReduce($result, $n_value, $mode);
+                }
+
+                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
+
+                $i += $j + 1;
+            }
+        }
+
+        $temp = new static();
+        $temp->value = $this->_reduce($result, $n_value, $mode);
+
+        return $temp;
+    }
+
+    /**
+     * Modular reduction
+     *
+     * For most $modes this will return the remainder.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _reduce($x, $n, $mode)
+    {
+        switch ($mode) {
+            case self::MONTGOMERY:
+                return $this->_montgomery($x, $n);
+            case self::BARRETT:
+                return $this->_barrett($x, $n);
+            case self::POWEROF2:
+                $lhs = new static();
+                $lhs->value = $x;
+                $rhs = new static();
+                $rhs->value = $n;
+                return $x->_mod2($n);
+            case self::CLASSIC:
+                $lhs = new static();
+                $lhs->value = $x;
+                $rhs = new static();
+                $rhs->value = $n;
+                list(, $temp) = $lhs->divide($rhs);
+                return $temp->value;
+            case self::NONE:
+                return $x;
+            default:
+                // an invalid $mode was provided
+        }
+    }
+
+    /**
+     * Modular reduction preperation
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _prepareReduce($x, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_prepMontgomery($x, $n);
+        }
+        return $this->_reduce($x, $n, $mode);
+    }
+
+    /**
+     * Modular multiply
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $y
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _multiplyReduce($x, $y, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $y, $n);
+        }
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_reduce($temp[self::VALUE], $n, $mode);
+    }
+
+    /**
+     * Modular square
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @param int $mode
+     * @return array
+     */
+    function _squareReduce($x, $n, $mode)
+    {
+        if ($mode == self::MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $x, $n);
+        }
+        return $this->_reduce($this->_square($x), $n, $mode);
+    }
+
+    /**
+     * Modulos for Powers of Two
+     *
+     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
+     * we'll just use this function as a wrapper for doing that.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     */
+    function _mod2($n)
+    {
+        $temp = new static();
+        $temp->value = array(1);
+        return $this->bitwise_and($n->subtract($temp));
+    }
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
+     * so as not to require negative numbers (initially, this script didn't support negative numbers).
+     *
+     * Employs "folding", as described at
+     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
+     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     *
+     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
+     * usable on account of (1) its not using reasonable radix points as discussed in
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
+     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
+     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
+     * comments for details.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $n
+     * @param array $m
+     * @return array
+     */
+    function _barrett($n, $m)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        $m_length = count($m);
+
+        // if ($this->_compare($n, $this->_square($m)) >= 0) {
+        if (count($n) > 2 * $m_length) {
+            $lhs = new static();
+            $rhs = new static();
+            $lhs->value = $n;
+            $rhs->value = $m;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
+        if ($m_length < 5) {
+            return $this->_regularBarrett($n, $m);
+        }
+
+        // n = 2 * m.length
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+
+            $lhs = new static();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
+            $lhs_value[] = 1;
+            $rhs = new static();
+            $rhs->value = $m;
+
+            list($u, $m1) = $lhs->divide($rhs);
+            $u = $u->value;
+            $m1 = $m1->value;
+
+            $cache[self::DATA][] = array(
+                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
+                'm1'=> $m1 // m.length
+            );
+        } else {
+            extract($cache[self::DATA][$key]);
+        }
+
+        $cutoff = $m_length + ($m_length >> 1);
+        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
+        $msd = array_slice($n, $cutoff);    // m.length >> 1
+        $lsd = $this->_trim($lsd);
+        $temp = $this->_multiply($msd, false, $m1, false);
+        $n = $this->_add($lsd, false, $temp[self::VALUE], false); // m.length + (m.length >> 1) + 1
+
+        if ($m_length & 1) {
+            return $this->_regularBarrett($n[self::VALUE], $m);
+        }
+
+        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
+        $temp = array_slice($n[self::VALUE], $m_length - 1);
+        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
+        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
+        $temp = $this->_multiply($temp, false, $u, false);
+        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
+        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
+        $temp = array_slice($temp[self::VALUE], ($m_length >> 1) + 1);
+        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
+        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
+        $temp = $this->_multiply($temp, false, $m, false);
+
+        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
+        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
+        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
+
+        $result = $this->_subtract($n[self::VALUE], false, $temp[self::VALUE], false);
+
+        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $m, false) >= 0) {
+            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $m, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * (Regular) Barrett Modular Reduction
+     *
+     * For numbers with more than four digits BigInteger::_barrett() is faster.  The difference between that and this
+     * is that this function does not fold the denominator into a smaller form.
+     *
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _regularBarrett($x, $n)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        $n_length = count($n);
+
+        if (count($x) > 2 * $n_length) {
+            $lhs = new static();
+            $rhs = new static();
+            $lhs->value = $x;
+            $rhs->value = $n;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $n;
+            $lhs = new static();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
+            $lhs_value[] = 1;
+            $rhs = new static();
+            $rhs->value = $n;
+            list($temp, ) = $lhs->divide($rhs); // m.length
+            $cache[self::DATA][] = $temp->value;
+        }
+
+        // 2 * m.length - (m.length - 1) = m.length + 1
+        $temp = array_slice($x, $n_length - 1);
+        // (m.length + 1) + m.length = 2 * m.length + 1
+        $temp = $this->_multiply($temp, false, $cache[self::DATA][$key], false);
+        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
+        $temp = array_slice($temp[self::VALUE], $n_length + 1);
+
+        // m.length + 1
+        $result = array_slice($x, 0, $n_length + 1);
+        // m.length + 1
+        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
+        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
+
+        if ($this->_compare($result, false, $temp[self::VALUE], $temp[self::SIGN]) < 0) {
+            $corrector_value = $this->_array_repeat(0, $n_length + 1);
+            $corrector_value[count($corrector_value)] = 1;
+            $result = $this->_add($result, false, $corrector_value, false);
+            $result = $result[self::VALUE];
+        }
+
+        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
+        $result = $this->_subtract($result, false, $temp[self::VALUE], $temp[self::SIGN]);
+        while ($this->_compare($result[self::VALUE], $result[self::SIGN], $n, false) > 0) {
+            $result = $this->_subtract($result[self::VALUE], $result[self::SIGN], $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Performs long multiplication up to $stop digits
+     *
+     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
+     *
+     * @see self::_regularBarrett()
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @param int $stop
+     * @return array
+     * @access private
+     */
+    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if (!$x_length || !$y_length) { // a 0 is being multiplied
+            return array(
+                self::VALUE => array(),
+                self::SIGN => false
+            );
+        }
+
+        if ($x_length < $y_length) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $product_value[$j] = (int) ($temp - self::$baseFull * $carry);
+        }
+
+        if ($j < $stop) {
+            $product_value[$j] = $carry;
+        }
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+                $product_value[$k] = (int) ($temp - self::$baseFull * $carry);
+            }
+
+            if ($k < $stop) {
+                $product_value[$k] = $carry;
+            }
+        }
+
+        return array(
+            self::VALUE => $this->_trim($product_value),
+            self::SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Montgomery Modular Reduction
+     *
+     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
+     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
+     * to work correctly.
+     *
+     * @see self::_prepMontgomery()
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _montgomery($x, $n)
+    {
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        if (($key = array_search($n, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $x;
+            $cache[self::DATA][] = $this->_modInverse67108864($n);
+        }
+
+        $k = count($n);
+
+        $result = array(self::VALUE => $x);
+
+        for ($i = 0; $i < $k; ++$i) {
+            $temp = $result[self::VALUE][$i] * $cache[self::DATA][$key];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $this->_regularMultiply(array($temp), $n);
+            $temp = array_merge($this->_array_repeat(0, $i), $temp);
+            $result = $this->_add($result[self::VALUE], false, $temp, false);
+        }
+
+        $result[self::VALUE] = array_slice($result[self::VALUE], $k);
+
+        if ($this->_compare($result, false, $n, false) >= 0) {
+            $result = $this->_subtract($result[self::VALUE], false, $n, false);
+        }
+
+        return $result[self::VALUE];
+    }
+
+    /**
+     * Montgomery Multiply
+     *
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     *
+     * @see self::_prepMontgomery()
+     * @see self::_montgomery()
+     * @access private
+     * @param array $x
+     * @param array $y
+     * @param array $m
+     * @return array
+     */
+    function _montgomeryMultiply($x, $y, $m)
+    {
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_montgomery($temp[self::VALUE], $m);
+
+        // the following code, although not callable, can be run independently of the above code
+        // although the above code performed better in my benchmarks the following could might
+        // perform better under different circumstances. in lieu of deleting it it's just been
+        // made uncallable
+
+        static $cache = array(
+            self::VARIABLE => array(),
+            self::DATA => array()
+        );
+
+        if (($key = array_search($m, $cache[self::VARIABLE])) === false) {
+            $key = count($cache[self::VARIABLE]);
+            $cache[self::VARIABLE][] = $m;
+            $cache[self::DATA][] = $this->_modInverse67108864($m);
+        }
+
+        $n = max(count($x), count($y), count($m));
+        $x = array_pad($x, $n, 0);
+        $y = array_pad($y, $n, 0);
+        $m = array_pad($m, $n, 0);
+        $a = array(self::VALUE => $this->_array_repeat(0, $n + 1));
+        for ($i = 0; $i < $n; ++$i) {
+            $temp = $a[self::VALUE][0] + $x[$i] * $y[0];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $temp * $cache[self::DATA][$key];
+            $temp = $temp - self::$baseFull * (self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31));
+            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
+            $a = $this->_add($a[self::VALUE], false, $temp[self::VALUE], false);
+            $a[self::VALUE] = array_slice($a[self::VALUE], 1);
+        }
+        if ($this->_compare($a[self::VALUE], false, $m, false) >= 0) {
+            $a = $this->_subtract($a[self::VALUE], false, $m, false);
+        }
+        return $a[self::VALUE];
+    }
+
+    /**
+     * Prepare a number for use in Montgomery Modular Reductions
+     *
+     * @see self::_montgomery()
+     * @see self::_slidingWindow()
+     * @access private
+     * @param array $x
+     * @param array $n
+     * @return array
+     */
+    function _prepMontgomery($x, $n)
+    {
+        $lhs = new static();
+        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
+        $rhs = new static();
+        $rhs->value = $n;
+
+        list(, $temp) = $lhs->divide($rhs);
+        return $temp->value;
+    }
+
+    /**
+     * Modular Inverse of a number mod 2**26 (eg. 67108864)
+     *
+     * Based off of the bnpInvDigit function implemented and justified in the following URL:
+     *
+     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
+     *
+     * The following URL provides more info:
+     *
+     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
+     *
+     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
+     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields
+     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
+     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
+     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
+     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
+     * 40 bits, which only 64-bit floating points will support.
+     *
+     * Thanks to Pedro Gimeno Fortea for input!
+     *
+     * @see self::_montgomery()
+     * @access private
+     * @param array $x
+     * @return int
+     */
+    function _modInverse67108864($x) // 2**26 == 67,108,864
+    {
+        $x = -$x[0];
+        $result = $x & 0x3; // x**-1 mod 2**2
+        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
+        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
+        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
+        $result = fmod($result * (2 - fmod($x * $result, self::$baseFull)), self::$baseFull); // x**-1 mod 2**26
+        return $result & self::$maxDigit;
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(30);
+     *    $b = new \phpseclib\Math\BigInteger(17);
+     *
+     *    $c = $a->modInverse($b);
+     *    echo $c->toString(); // outputs 4
+     *
+     *    echo "\r\n";
+     *
+     *    $d = $a->multiply($c);
+     *    list(, $d) = $d->divide($b);
+     *    echo $d; // outputs 1 (as per the definition of modular inverse)
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger|false
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
+     */
+    function modInverse($n)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_invert($this->value, $n->value);
+
+                return ($temp->value === false) ? false : $this->_normalize($temp);
+        }
+
+        static $zero, $one;
+        if (!isset($zero)) {
+            $zero = new static();
+            $one = new static(1);
+        }
+
+        // $x mod -$n == $x mod $n.
+        $n = $n->abs();
+
+        if ($this->compare($zero) < 0) {
+            $temp = $this->abs();
+            $temp = $temp->modInverse($n);
+            return $this->_normalize($n->subtract($temp));
+        }
+
+        extract($this->extendedGCD($n));
+
+        if (!$gcd->equals($one)) {
+            return false;
+        }
+
+        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
+
+        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
+    }
+
+    /**
+     * Calculates the greatest common divisor and Bezout's identity.
+     *
+     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
+     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
+     * combination is returned is dependent upon which mode is in use.  See
+     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(693);
+     *    $b = new \phpseclib\Math\BigInteger(609);
+     *
+     *    extract($a->extendedGCD($b));
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal Calculates the GCD using the binary xGCD algorithim described in
+     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
+     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
+     */
+    function extendedGCD($n)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                extract(gmp_gcdext($this->value, $n->value));
+
+                return array(
+                    'gcd' => $this->_normalize(new static($g)),
+                    'x'   => $this->_normalize(new static($s)),
+                    'y'   => $this->_normalize(new static($t))
+                );
+            case self::MODE_BCMATH:
+                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
+                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
+                // the basic extended euclidean algorithim is what we're using.
+
+                $u = $this->value;
+                $v = $n->value;
+
+                $a = '1';
+                $b = '0';
+                $c = '0';
+                $d = '1';
+
+                while (bccomp($v, '0', 0) != 0) {
+                    $q = bcdiv($u, $v, 0);
+
+                    $temp = $u;
+                    $u = $v;
+                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
+
+                    $temp = $a;
+                    $a = $c;
+                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
+
+                    $temp = $b;
+                    $b = $d;
+                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
+                }
+
+                return array(
+                    'gcd' => $this->_normalize(new static($u)),
+                    'x'   => $this->_normalize(new static($a)),
+                    'y'   => $this->_normalize(new static($b))
+                );
+        }
+
+        $y = $n->copy();
+        $x = $this->copy();
+        $g = new static();
+        $g->value = array(1);
+
+        while (!(($x->value[0] & 1)|| ($y->value[0] & 1))) {
+            $x->_rshift(1);
+            $y->_rshift(1);
+            $g->_lshift(1);
+        }
+
+        $u = $x->copy();
+        $v = $y->copy();
+
+        $a = new static();
+        $b = new static();
+        $c = new static();
+        $d = new static();
+
+        $a->value = $d->value = $g->value = array(1);
+        $b->value = $c->value = array();
+
+        while (!empty($u->value)) {
+            while (!($u->value[0] & 1)) {
+                $u->_rshift(1);
+                if ((!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1))) {
+                    $a = $a->add($y);
+                    $b = $b->subtract($x);
+                }
+                $a->_rshift(1);
+                $b->_rshift(1);
+            }
+
+            while (!($v->value[0] & 1)) {
+                $v->_rshift(1);
+                if ((!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1))) {
+                    $c = $c->add($y);
+                    $d = $d->subtract($x);
+                }
+                $c->_rshift(1);
+                $d->_rshift(1);
+            }
+
+            if ($u->compare($v) >= 0) {
+                $u = $u->subtract($v);
+                $a = $a->subtract($c);
+                $b = $b->subtract($d);
+            } else {
+                $v = $v->subtract($u);
+                $c = $c->subtract($a);
+                $d = $d->subtract($b);
+            }
+        }
+
+        return array(
+            'gcd' => $this->_normalize($g->multiply($v)),
+            'x'   => $this->_normalize($c),
+            'y'   => $this->_normalize($d)
+        );
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     *
+     * Here's an example:
+     * <code>
+     * <?php
+     *    $a = new \phpseclib\Math\BigInteger(693);
+     *    $b = new \phpseclib\Math\BigInteger(609);
+     *
+     *    $gcd = a->extendedGCD($b);
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     * ?>
+     * </code>
+     *
+     * @param \phpseclib\Math\BigInteger $n
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function gcd($n)
+    {
+        extract($this->extendedGCD($n));
+        return $gcd;
+    }
+
+    /**
+     * Absolute value.
+     *
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function abs()
+    {
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp->value = gmp_abs($this->value);
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
+                break;
+            default:
+                $temp->value = $this->value;
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
+     * demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * @param \phpseclib\Math\BigInteger $y
+     * @return int that is < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @access public
+     * @see self::equals()
+     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
+     */
+    function compare($y)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $r = gmp_cmp($this->value, $y->value);
+                if ($r < -1) {
+                    $r = -1;
+                }
+                if ($r > 1) {
+                    $r = 1;
+                }
+                return $r;
+            case self::MODE_BCMATH:
+                return bccomp($this->value, $y->value, 0);
+        }
+
+        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * @param array $x_value
+     * @param bool $x_negative
+     * @param array $y_value
+     * @param bool $y_negative
+     * @return int
+     * @see self::compare()
+     * @access private
+     */
+    function _compare($x_value, $x_negative, $y_value, $y_negative)
+    {
+        if ($x_negative != $y_negative) {
+            return (!$x_negative && $y_negative) ? 1 : -1;
+        }
+
+        $result = $x_negative ? -1 : 1;
+
+        if (count($x_value) != count($y_value)) {
+            return (count($x_value) > count($y_value)) ? $result : -$result;
+        }
+        $size = max(count($x_value), count($y_value));
+
+        $x_value = array_pad($x_value, $size, 0);
+        $y_value = array_pad($y_value, $size, 0);
+
+        for ($i = count($x_value) - 1; $i >= 0; --$i) {
+            if ($x_value[$i] != $y_value[$i]) {
+                return ($x_value[$i] > $y_value[$i]) ? $result : -$result;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use BigInteger::compare()
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @return bool
+     * @access public
+     * @see self::compare()
+     */
+    function equals($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_cmp($this->value, $x->value) == 0;
+            default:
+                return $this->value === $x->value && $this->is_negative == $x->is_negative;
+        }
+    }
+
+    /**
+     * Set Precision
+     *
+     * Some bitwise operations give different results depending on the precision being used.  Examples include left
+     * shift, not, and rotates.
+     *
+     * @param int $bits
+     * @access public
+     */
+    function setPrecision($bits)
+    {
+        $this->precision = $bits;
+        if (MATH_BIGINTEGER_MODE != self::MODE_BCMATH) {
+            $this->bitmask = new static(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
+        } else {
+            $this->bitmask = new static(bcpow('2', $bits, 0));
+        }
+
+        $temp = $this->_normalize($this);
+        $this->value = $temp->value;
+    }
+
+    /**
+     * Logical And
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
+     */
+    function bitwise_and($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_and($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left & $right, 256));
+        }
+
+        $result = $this->copy();
+
+        $length = min(count($x->value), count($this->value));
+
+        $result->value = array_slice($result->value, 0, $length);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]&= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Or
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
+     */
+    function bitwise_or($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_or($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left | $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]|= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Exclusive-Or
+     *
+     * @param \phpseclib\Math\BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
+     */
+    function bitwise_xor($x)
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                $temp = new static();
+                $temp->value = gmp_xor(gmp_abs($this->value), gmp_abs($x->value));
+                return $this->_normalize($temp);
+            case self::MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new static($left ^ $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->is_negative = false;
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]^= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Not
+     *
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez <lluis _a_ pamies.cat>
+     * @return \phpseclib\Math\BigInteger
+     */
+    function bitwise_not()
+    {
+        // calculuate "not" without regard to $this->precision
+        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
+        $temp = $this->toBytes();
+        if ($temp == '') {
+            return $this->_normalize(new static());
+        }
+        $pre_msb = decbin(ord($temp[0]));
+        $temp = ~$temp;
+        $msb = decbin(ord($temp[0]));
+        if (strlen($msb) == 8) {
+            $msb = substr($msb, strpos($msb, '0'));
+        }
+        $temp[0] = chr(bindec($msb));
+
+        // see if we need to add extra leading 1's
+        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
+        $new_bits = $this->precision - $current_bits;
+        if ($new_bits <= 0) {
+            return $this->_normalize(new static($temp, 256));
+        }
+
+        // generate as many leading 1's as we need to.
+        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
+        $this->_base256_lshift($leading_ones, $current_bits);
+
+        $temp = str_pad($temp, strlen($leading_ones), chr(0), STR_PAD_LEFT);
+
+        return $this->_normalize(new static($leading_ones | $temp, 256));
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
+     *
+     * @param int $shift
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
+     */
+    function bitwise_rightShift($shift)
+    {
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
+
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_rshift($shift);
+        }
+
+        return $this->_normalize($temp);
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
+     *
+     * @param int $shift
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
+     */
+    function bitwise_leftShift($shift)
+    {
+        $temp = new static();
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
+
+                break;
+            case self::MODE_BCMATH:
+                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_lshift($shift);
+        }
+
+        return $this->_normalize($temp);
+    }
+
+    /**
+     * Logical Left Rotate
+     *
+     * Instead of the top x bits being dropped they're appended to the shifted bit string.
+     *
+     * @param int $shift
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function bitwise_leftRotate($shift)
+    {
+        $bits = $this->toBytes();
+
+        if ($this->precision > 0) {
+            $precision = $this->precision;
+            if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+                $mask = $this->bitmask->subtract(new static(1));
+                $mask = $mask->toBytes();
+            } else {
+                $mask = $this->bitmask->toBytes();
+            }
+        } else {
+            $temp = ord($bits[0]);
+            for ($i = 0; $temp >> $i; ++$i) {
+            }
+            $precision = 8 * strlen($bits) - 8 + $i;
+            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
+        }
+
+        if ($shift < 0) {
+            $shift+= $precision;
+        }
+        $shift%= $precision;
+
+        if (!$shift) {
+            return $this->copy();
+        }
+
+        $left = $this->bitwise_leftShift($shift);
+        $left = $left->bitwise_and(new static($mask, 256));
+        $right = $this->bitwise_rightShift($precision - $shift);
+        $result = MATH_BIGINTEGER_MODE != self::MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Right Rotate
+     *
+     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
+     *
+     * @param int $shift
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     */
+    function bitwise_rightRotate($shift)
+    {
+        return $this->bitwise_leftRotate(-$shift);
+    }
+
+    /**
+     * Generates a random BigInteger
+     *
+     * Byte length is equal to $length. Uses \phpseclib\Crypt\Random if it's loaded and mt_rand if it's not.
+     *
+     * @param int $size
+     * @return \phpseclib\Math\BigInteger
+     * @access private
+     */
+    function _random_number_helper($size)
+    {
+        if (class_exists('\phpseclib\Crypt\Random')) {
+            $random = Random::string($size);
+        } else {
+            $random = '';
+
+            if ($size & 1) {
+                $random.= chr(mt_rand(0, 255));
+            }
+
+            $blocks = $size >> 1;
+            for ($i = 0; $i < $blocks; ++$i) {
+                // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
+                $random.= pack('n', mt_rand(0, 0xFFFF));
+            }
+        }
+
+        return new static($random, 256);
+    }
+
+    /**
+     * Generate a random number
+     *
+     * Returns a random number between $min and $max where $min and $max
+     * can be defined using one of the two methods:
+     *
+     * $min->random($max)
+     * $max->random($min)
+     *
+     * @param \phpseclib\Math\BigInteger $arg1
+     * @param \phpseclib\Math\BigInteger $arg2
+     * @return \phpseclib\Math\BigInteger
+     * @access public
+     * @internal The API for creating random numbers used to be $a->random($min, $max), where $a was a BigInteger object.
+     *           That method is still supported for BC purposes.
+     */
+    function random($arg1, $arg2 = false)
+    {
+        if ($arg1 === false) {
+            return false;
+        }
+
+        if ($arg2 === false) {
+            $max = $arg1;
+            $min = $this;
+        } else {
+            $min = $arg1;
+            $max = $arg2;
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $this->_normalize($min);
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        static $one;
+        if (!isset($one)) {
+            $one = new static(1);
+        }
+
+        $max = $max->subtract($min->subtract($one));
+        $size = strlen(ltrim($max->toBytes(), chr(0)));
+
+        /*
+            doing $random % $max doesn't work because some numbers will be more likely to occur than others.
+            eg. if $max is 140 and $random's max is 255 then that'd mean both $random = 5 and $random = 145
+            would produce 5 whereas the only value of random that could produce 139 would be 139. ie.
+            not all numbers would be equally likely. some would be more likely than others.
+
+            creating a whole new random number until you find one that is within the range doesn't work
+            because, for sufficiently small ranges, the likelihood that you'd get a number within that range
+            would be pretty small. eg. with $random's max being 255 and if your $max being 1 the probability
+            would be pretty high that $random would be greater than $max.
+
+            phpseclib works around this using the technique described here:
+
+            http://crypto.stackexchange.com/questions/5708/creating-a-small-number-from-a-cryptographically-secure-random-string
+        */
+        $random_max = new static(chr(1) . str_repeat("\0", $size), 256);
+        $random = $this->_random_number_helper($size);
+
+        list($max_multiple) = $random_max->divide($max);
+        $max_multiple = $max_multiple->multiply($max);
+
+        while ($random->compare($max_multiple) >= 0) {
+            $random = $random->subtract($max_multiple);
+            $random_max = $random_max->subtract($max_multiple);
+            $random = $random->bitwise_leftShift(8);
+            $random = $random->add($this->_random_number_helper(1));
+            $random_max = $random_max->bitwise_leftShift(8);
+            list($max_multiple) = $random_max->divide($max);
+            $max_multiple = $max_multiple->multiply($max);
+        }
+        list(, $random) = $random->divide($max);
+
+        return $this->_normalize($random->add($min));
+    }
+
+    /**
+     * Generate a random prime number.
+     *
+     * If there's not a prime within the given range, false will be returned.
+     * If more than $timeout seconds have elapsed, give up and return false.
+     *
+     * @param \phpseclib\Math\BigInteger $arg1
+     * @param \phpseclib\Math\BigInteger $arg2
+     * @param int $timeout
+     * @return Math_BigInteger|false
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
+     */
+    function randomPrime($arg1, $arg2 = false, $timeout = false)
+    {
+        if ($arg1 === false) {
+            return false;
+        }
+
+        if ($arg2 === false) {
+            $max = $arg1;
+            $min = $this;
+        } else {
+            $min = $arg1;
+            $max = $arg2;
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $min->isPrime() ? $min : false;
+        } elseif ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        static $one, $two;
+        if (!isset($one)) {
+            $one = new static(1);
+            $two = new static(2);
+        }
+
+        $start = time();
+
+        $x = $this->random($min, $max);
+
+        // gmp_nextprime() requires PHP 5 >= 5.2.0 per <http://php.net/gmp-nextprime>.
+        if (MATH_BIGINTEGER_MODE == self::MODE_GMP && extension_loaded('gmp')) {
+            $p = new static();
+            $p->value = gmp_nextprime($x->value);
+
+            if ($p->compare($max) <= 0) {
+                return $p;
+            }
+
+            if (!$min->equals($x)) {
+                $x = $x->subtract($one);
+            }
+
+            return $x->randomPrime($min, $x);
+        }
+
+        if ($x->equals($two)) {
+            return $x;
+        }
+
+        $x->_make_odd();
+        if ($x->compare($max) > 0) {
+            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
+            if ($min->equals($max)) {
+                return false;
+            }
+            $x = $min->copy();
+            $x->_make_odd();
+        }
+
+        $initial_x = $x->copy();
+
+        while (true) {
+            if ($timeout !== false && time() - $start > $timeout) {
+                return false;
+            }
+
+            if ($x->isPrime()) {
+                return $x;
+            }
+
+            $x = $x->add($two);
+
+            if ($x->compare($max) > 0) {
+                $x = $min->copy();
+                if ($x->equals($two)) {
+                    return $x;
+                }
+                $x->_make_odd();
+            }
+
+            if ($x->equals($initial_x)) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see self::randomPrime()
+     * @access private
+     */
+    function _make_odd()
+    {
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                gmp_setbit($this->value, 0);
+                break;
+            case self::MODE_BCMATH:
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    $this->value = bcadd($this->value, '1');
+                }
+                break;
+            default:
+                $this->value[0] |= 1;
+        }
+    }
+
+    /**
+     * Checks a numer to see if it's prime
+     *
+     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
+     * $t parameter is distributability.  BigInteger::randomPrime() can be distributed across multiple pageloads
+     * on a website instead of just one.
+     *
+     * @param \phpseclib\Math\BigInteger $t
+     * @return bool
+     * @access public
+     * @internal Uses the
+     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See
+     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
+     */
+    function isPrime($t = false)
+    {
+        $length = strlen($this->toBytes());
+
+        if (!$t) {
+            // see HAC 4.49 "Note (controlling the error probability)"
+            // @codingStandardsIgnoreStart
+                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
+            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
+            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
+            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
+            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
+            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
+            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
+            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
+            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
+            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
+            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
+            else                     { $t = 27; }
+            // @codingStandardsIgnoreEnd
+        }
+
+        // ie. gmp_testbit($this, 0)
+        // ie. isEven() or !isOdd()
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                return gmp_prob_prime($this->value, $t) != 0;
+            case self::MODE_BCMATH:
+                if ($this->value === '2') {
+                    return true;
+                }
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    return false;
+                }
+                break;
+            default:
+                if ($this->value == array(2)) {
+                    return true;
+                }
+                if (~$this->value[0] & 1) {
+                    return false;
+                }
+        }
+
+        static $primes, $zero, $one, $two;
+
+        if (!isset($primes)) {
+            $primes = array(
+                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,
+                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,
+                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,
+                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,
+                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,
+                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,
+                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,
+                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,
+                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,
+                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,
+                953,  967,  971,  977,  983,  991,  997
+            );
+
+            if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+                for ($i = 0; $i < count($primes); ++$i) {
+                    $primes[$i] = new static($primes[$i]);
+                }
+            }
+
+            $zero = new static();
+            $one = new static(1);
+            $two = new static(2);
+        }
+
+        if ($this->equals($one)) {
+            return false;
+        }
+
+        // see HAC 4.4.1 "Random search for probable primes"
+        if (MATH_BIGINTEGER_MODE != self::MODE_INTERNAL) {
+            foreach ($primes as $prime) {
+                list(, $r) = $this->divide($prime);
+                if ($r->equals($zero)) {
+                    return $this->equals($prime);
+                }
+            }
+        } else {
+            $value = $this->value;
+            foreach ($primes as $prime) {
+                list(, $r) = $this->_divide_digit($value, $prime);
+                if (!$r) {
+                    return count($value) == 1 && $value[0] == $prime;
+                }
+            }
+        }
+
+        $n   = $this->copy();
+        $n_1 = $n->subtract($one);
+        $n_2 = $n->subtract($two);
+
+        $r = $n_1->copy();
+        $r_value = $r->value;
+        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+        if (MATH_BIGINTEGER_MODE == self::MODE_BCMATH) {
+            $s = 0;
+            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
+            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
+                $r->value = bcdiv($r->value, '2', 0);
+                ++$s;
+            }
+        } else {
+            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
+                $temp = ~$r_value[$i] & 0xFFFFFF;
+                for ($j = 1; ($temp >> $j) & 1; ++$j) {
+                }
+                if ($j != 25) {
+                    break;
+                }
+            }
+            $s = 26 * $i + $j;
+            $r->_rshift($s);
+        }
+
+        for ($i = 0; $i < $t; ++$i) {
+            $a = $this->random($two, $n_2);
+            $y = $a->modPow($r, $n);
+
+            if (!$y->equals($one) && !$y->equals($n_1)) {
+                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
+                    $y = $y->modPow($two, $n);
+                    if ($y->equals($one)) {
+                        return false;
+                    }
+                }
+
+                if (!$y->equals($n_1)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     *
+     * @param int $shift
+     * @access private
+     */
+    function _lshift($shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / self::$base);
+        $shift %= self::$base;
+        $shift = 1 << $shift;
+
+        $carry = 0;
+
+        for ($i = 0; $i < count($this->value); ++$i) {
+            $temp = $this->value[$i] * $shift + $carry;
+            $carry = self::$base === 26 ? intval($temp / 0x4000000) : ($temp >> 31);
+            $this->value[$i] = (int) ($temp - $carry * self::$baseFull);
+        }
+
+        if ($carry) {
+            $this->value[count($this->value)] = $carry;
+        }
+
+        while ($num_digits--) {
+            array_unshift($this->value, 0);
+        }
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     *
+     * @param int $shift
+     * @access private
+     */
+    function _rshift($shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / self::$base);
+        $shift %= self::$base;
+        $carry_shift = self::$base - $shift;
+        $carry_mask = (1 << $shift) - 1;
+
+        if ($num_digits) {
+            $this->value = array_slice($this->value, $num_digits);
+        }
+
+        $carry = 0;
+
+        for ($i = count($this->value) - 1; $i >= 0; --$i) {
+            $temp = $this->value[$i] >> $shift | $carry;
+            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
+            $this->value[$i] = $temp;
+        }
+
+        $this->value = $this->_trim($this->value);
+    }
+
+    /**
+     * Normalize
+     *
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
+     *
+     * @param \phpseclib\Math\BigInteger $result
+     * @return \phpseclib\Math\BigInteger
+     * @see self::_trim()
+     * @access private
+     */
+    function _normalize($result)
+    {
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        switch (MATH_BIGINTEGER_MODE) {
+            case self::MODE_GMP:
+                if ($this->bitmask !== false) {
+                    $flip = gmp_cmp($result->value, gmp_init(0)) < 0;
+                    if ($flip) {
+                        $result->value = gmp_neg($result->value);
+                    }
+                    $result->value = gmp_and($result->value, $result->bitmask->value);
+                    if ($flip) {
+                        $result->value = gmp_neg($result->value);
+                    }
+                }
+
+                return $result;
+            case self::MODE_BCMATH:
+                if (!empty($result->bitmask->value)) {
+                    $result->value = bcmod($result->value, $result->bitmask->value);
+                }
+
+                return $result;
+        }
+
+        $value = &$result->value;
+
+        if (!count($value)) {
+            $result->is_negative = false;
+            return $result;
+        }
+
+        $value = $this->_trim($value);
+
+        if (!empty($result->bitmask->value)) {
+            $length = min(count($value), count($this->bitmask->value));
+            $value = array_slice($value, 0, $length);
+
+            for ($i = 0; $i < $length; ++$i) {
+                $value[$i] = $value[$i] & $this->bitmask->value[$i];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Trim
+     *
+     * Removes leading zeros
+     *
+     * @param array $value
+     * @return \phpseclib\Math\BigInteger
+     * @access private
+     */
+    function _trim($value)
+    {
+        for ($i = count($value) - 1; $i >= 0; --$i) {
+            if ($value[$i]) {
+                break;
+            }
+            unset($value[$i]);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Array Repeat
+     *
+     * @param array $input
+     * @param mixed $multiplier
+     * @return array
+     * @access private
+     */
+    function _array_repeat($input, $multiplier)
+    {
+        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
+     *
+     * @param string $x (by reference)
+     * @param int $shift
+     * @return string
+     * @access private
+     */
+    function _base256_lshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $carry = 0;
+        for ($i = strlen($x) - 1; $i >= 0; --$i) {
+            $temp = ord($x[$i]) << $shift | $carry;
+            $x[$i] = chr($temp);
+            $carry = $temp >> 8;
+        }
+        $carry = ($carry != 0) ? chr($carry) : '';
+        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
+     *
+     * @param string $x (by referenc)
+     * @param int $shift
+     * @return string
+     * @access private
+     */
+    function _base256_rshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            $x = ltrim($x, chr(0));
+            return '';
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $remainder = '';
+        if ($num_bytes) {
+            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
+            $remainder = substr($x, $start);
+            $x = substr($x, 0, -$num_bytes);
+        }
+
+        $carry = 0;
+        $carry_shift = 8 - $shift;
+        for ($i = 0; $i < strlen($x); ++$i) {
+            $temp = (ord($x[$i]) >> $shift) | $carry;
+            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
+            $x[$i] = chr($temp);
+        }
+        $x = ltrim($x, chr(0));
+
+        $remainder = chr($carry >> $carry_shift) . $remainder;
+
+        return ltrim($remainder, chr(0));
+    }
+
+    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
+    // at 32-bits, while java's longs are 64-bits.
+
+    /**
+     * Converts 32-bit integers to bytes.
+     *
+     * @param int $x
+     * @return string
+     * @access private
+     */
+    function _int2bytes($x)
+    {
+        return ltrim(pack('N', $x), chr(0));
+    }
+
+    /**
+     * Converts bytes to 32-bit integers
+     *
+     * @param string $x
+     * @return int
+     * @access private
+     */
+    function _bytes2int($x)
+    {
+        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
+        return $temp['int'];
+    }
+
+    /**
+     * DER-encode an integer
+     *
+     * The ability to DER-encode integers is needed to create RSA public keys for use with OpenSSL
+     *
+     * @see self::modPow()
+     * @access private
+     * @param int $length
+     * @return string
+     */
+    function _encodeASN1Length($length)
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+
+    /**
+     * Single digit division
+     *
+     * Even if int64 is being used the division operator will return a float64 value
+     * if the dividend is not evenly divisible by the divisor. Since a float64 doesn't
+     * have the precision of int64 this is a problem so, when int64 is being used,
+     * we'll guarantee that the dividend is divisible by first subtracting the remainder.
+     *
+     * @access private
+     * @param int $x
+     * @param int $y
+     * @return int
+     */
+    function _safe_divide($x, $y)
+    {
+        if (self::$base === 26) {
+            return (int) ($x / $y);
+        }
+
+        // self::$base === 31
+        return ($x - ($x % $y)) / $y;
+    }
+}
diff --git a/build/phpseclib/openssl.cnf b/build/phpseclib/openssl.cnf
new file mode 100644
index 000000000..2b8b52f9f
--- /dev/null
+++ b/build/phpseclib/openssl.cnf
@@ -0,0 +1,6 @@
+# minimalist openssl.cnf file for use with phpseclib
+
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+[ v3_ca ]
diff --git a/build/plugins.php b/build/plugins.php
index e2c5d3507..9cb4d9c1e 100755
--- a/build/plugins.php
+++ b/build/plugins.php
@@ -1,9 +1,17 @@
 <?php
-define('ROOT_DIR', dirname(__DIR__));
 define('PLUGINS_DEST_DIR', __DIR__ . '/dist/releases/plugins');
 
-$destPath = __DIR__ . 'build/dist/releases/plugins/';
 is_dir(PLUGINS_DEST_DIR) || mkdir(PLUGINS_DEST_DIR, 0777, true);
+$files = new RecursiveIteratorIterator(
+    new RecursiveDirectoryIterator(PLUGINS_DEST_DIR, RecursiveDirectoryIterator::SKIP_DOTS),
+    RecursiveIteratorIterator::CHILD_FIRST
+);
+foreach ($files as $fileinfo) {
+    $fileinfo->isDir() || unlink($fileinfo->getRealPath());
+}
+
+$terser = ROOT_DIR . '/node_modules/terser/bin/terser';
+
 $manifest = [];
 require ROOT_DIR . '/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php';
 $keys = [
@@ -20,10 +28,46 @@ $keys = [
 	'url',
 	'version'
 ];
+/*
+$released = [
+	'add-x-originating-ip-header',
+	'avatars',
+	'backup',
+	'black-list',
+	'change-password',
+	'change-password-froxlor',
+	'change-password-hestia',
+	'change-password-hmailserver',
+	'change-password-ispconfig',
+	'change-password-poppassd',
+	'custom-login-mapping',
+	'imap-contacts-suggestions',
+	'kolab',
+	'ldap-contacts-suggestions',
+	'ldap-identities',
+	'ldap-login-mapping',
+	'ldap-mail-accounts',
+	'login-external',
+	'login-external-sso',
+	'login-override',
+	'login-register',
+	'login-remote',
+	'mailbox-detect',
+	'nextcloud',
+	'override-smtp-credentials',
+	'set-remote-addr',
+	'smtp-use-from-adr-account',
+	'snowfall-on-login-screen',
+	'two-factor-auth',
+	'view-ics',
+	'white-list'
+];
+*/
 foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
-	if (is_file("{$dir}/index.php")) {
+	if (is_file("{$dir}/index.php") && !strpos($dir, '.bak')) {
 		require "{$dir}/index.php";
 		$name = basename($dir);
+//		if (!in_array($name, $released)) continue;
 		$class = new ReflectionClass(str_replace('-', '', $name) . 'Plugin');
 		$manifest_item = [];
 		foreach ($class->getConstants() as $key => $value) {
@@ -35,29 +79,51 @@ foreach (glob(ROOT_DIR . '/plugins/*', GLOB_NOSORT | GLOB_ONLYDIR) as $dir) {
 		$version = $manifest_item['version'];
 		if (0 < floatval($version)) {
 			echo "+ {$name} {$version}\n";
+
+			// Minify JavaScript
+			foreach (glob("{$dir}/*.js") as $file) {
+				if (!strpos($file,'.min')) {
+					$mfile = str_replace('.js', '.min.js', $file);
+					passthru("{$terser} {$file} --output {$mfile} --compress 'drop_console' --ecma 6 --mangle");
+				}
+			}
+			foreach (glob("{$dir}/js/*.js") as $file) {
+				if (!strpos($file,'.min')) {
+					$mfile = str_replace('.js', '.min.js', $file);
+					passthru("{$terser} {$file} --output {$mfile} --compress 'drop_console' --ecma 6 --mangle");
+				}
+			}
+
 			$manifest_item['type'] = 'plugin';
 			$manifest_item['id']   = $name;
-			$manifest_item['file'] = "{$dir}-{$version}.tgz";
-			ksort($manifest_item);
-			$manifest[$name] = $manifest_item;
+			$manifest_item['file'] = "plugins/{$name}-{$version}.tgz";
 			$tar_destination = PLUGINS_DEST_DIR . "/{$name}-{$version}.tar";
 			$tgz_destination = PLUGINS_DEST_DIR . "/{$name}-{$version}.tgz";
 			@unlink($tgz_destination);
 			@unlink("{$tar_destination}.gz");
 			$tar = new PharData($tar_destination);
-			$tar->buildFromDirectory('./plugins/', '/' . \preg_quote("./plugins/{$name}", '/') . '/');
+			$tar->buildFromDirectory('./plugins/', '/' . \preg_quote("./plugins/{$name}/", '/') . '((?!\.bak).)*$/');
 			$tar->compress(Phar::GZ);
 			unlink($tar_destination);
 			rename("{$tar_destination}.gz", $tgz_destination);
+/*
 			if (Phar::canWrite()) {
 				$phar_destination = PLUGINS_DEST_DIR . "/{$name}.phar";
 				@unlink($phar_destination);
 				$tar = new Phar($phar_destination);
-				$tar->buildFromDirectory("./plugins/{$name}/");
+				$tar->buildFromDirectory("./plugins/{$name}/", '/^((?!\.bak).)*$/');
 				$tar->compress(Phar::GZ);
 				unlink($phar_destination);
 				rename("{$phar_destination}.gz", $phar_destination);
 			}
+*/
+			if (isset($options['sign'])) {
+				passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tgz_destination), $return_var);
+				$manifest_item['pgp_sig'] = trim(preg_replace('/-----(BEGIN|END) PGP SIGNATURE-----/', '', file_get_contents($tgz_destination.'.asc')));
+			}
+			ksort($manifest_item);
+			$manifest[$name] = $manifest_item;
+
 		} else {
 			echo "- {$name} {$version}\n";
 		}
@@ -73,5 +139,6 @@ $manifest = str_replace('"}', "\"\n\t}", $manifest);
 $manifest = str_replace('}]', "}\n]", $manifest);
 $manifest = str_replace('","', "\",\n\t\t\"", $manifest);
 $manifest = str_replace('\/', '/', $manifest);
-file_put_contents(PLUGINS_DEST_DIR . "/packages.json", $manifest);
+file_put_contents(dirname(PLUGINS_DEST_DIR) . "/packages.json", $manifest);
+
 exit;
diff --git a/cli/compile.php b/cli/compile.php
new file mode 100755
index 000000000..936643cc3
--- /dev/null
+++ b/cli/compile.php
@@ -0,0 +1,247 @@
+#!/usr/bin/php
+<?php
+define('ROOT_DIR', dirname(__DIR__));
+chdir(ROOT_DIR);
+
+$options = getopt('', ['readme','source','knockout','openpgp','squire']);
+$return_var = '';
+
+function execCmd($cmd)
+{
+	passthru($cmd, $return_var);
+	if ($return_var) {
+		exit("`{$cmd}` failed with error code {$return_var}\n");
+	}
+}
+
+if (isset($options['knockout'])) {
+	chdir(ROOT_DIR . '/vendors/knockout');
+	if ($grunt = trim(`which grunt`)) {
+		execCmd($grunt, $return_var);
+	} else {
+		exit('grunt not installed');
+	}
+
+	$file = ROOT_DIR . '/vendors/knockout/build/output/knockout-latest.js';
+	$data = file_get_contents($file);
+/*
+	Strip start: (()=>{'use strict';var aa="function"==typeof Object.defineProperties?Object.defineProperty:function(C,F,E){if(C==Array.prototype||C==Object.prototype)return C;C[F]=E.value;return C};function ba(C){C=["object"==typeof globalThis&&globalThis,C,"object"==typeof window&&window,"object"==typeof self&&self,"object"==typeof global&&global];for(var F=0;F<C.length;++F){var E=C[F];if(E&&E.Math==Math)return E}throw Error("Cannot find global object");}var ca=ba(this);
+function Z(C,F){if(F)a:{var E=ca;C=C.split(".");for(var J=0;J<C.length-1;J++){var S=C[J];if(!(S in E))break a;E=E[S]}C=C[C.length-1];J=E[C];F=F(J);F!=J&&null!=F&&aa(E,C,{configurable:!0,writable:!0,value:F})}}Z("Object.entries",function(C){return C?C:function(F){var E=[],J;for(J in F)Object.prototype.hasOwnProperty.call(F,J)&&E.push([J,F[J]]);return E}});
+Z("Array.prototype.includes",function(C){return C?C:function(F,E){var J=this;J instanceof String&&(J=String(J));var S=J.length;E=E||0;for(0>E&&(E=Math.max(E+S,0));E<S;E++){var V=J[E];if(V===F||Object.is(V,F))return!0}return!1}});
+	Strip end: })();
+*/
+
+	$p1 = strpos($data, '(()=>');
+	// ECMASCRIPT_202
+	$data = substr($data, 0, $p1) . substr($data, $p1 + 6, -6) . "\n";
+	// ECMASCRIPT_2018
+//	$data = substr($data, 0, $p1) . substr($data, $p1 + 19, -6) . "\n";
+	// ECMASCRIPT6
+//	$data = substr($data, 0, $p1) . substr($data, strpos($data, 'return!0}return!1}});') + 22, -6) . "\n";
+
+	file_put_contents($file, $data);
+	exit;
+}
+
+if (isset($options['openpgp'])) {
+	chdir(ROOT_DIR . '/vendors/openpgp-5');
+	execCmd('git pull', $return_var);
+	execCmd('./build.sh', $return_var);
+	exit;
+}
+
+if (isset($options['squire'])) {
+	chdir(ROOT_DIR . '/vendors/squire2');
+//	execCmd('git pull', $return_var);
+//	execCmd('git checkout snappymail', $return_var);
+	execCmd('./build.sh', $return_var);
+	exit;
+}
+
+if (isset($options['source'])) {
+	#cd ROOT_DIR . '/vendors/openpgp-2.6.2/';
+	#rollup -c
+	#npm cache clean --force
+
+	if ($gulp = trim(`which gulp`)) {
+		execCmd($gulp, $return_var);
+	} else {
+		exit('gulp not installed, run as root: npm install --global gulp-cli');
+	}
+
+	#rollup -c
+
+	$cmddir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0/static';
+
+	if ($gzip = trim(`which gzip`)) {
+		echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n";
+//		execCmd("{$gzip} -k --best {$cmddir}/js/*.js");
+		execCmd("{$gzip} -k --best {$cmddir}/js/min/*.js");
+		execCmd("{$gzip} -k --best {$cmddir}/css/admin*.css");
+		execCmd("{$gzip} -k --best {$cmddir}/css/app*.css");
+//		unlink($cmddir . '/js/boot.js.gz');
+//		unlink($cmddir . '/js/min/boot.min.js.gz');
+	}
+
+	if ($brotli = trim(`which brotli`)) {
+		echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n";
+//		execCmd("{$brotli} -k --best {$cmddir}/js/*.js");
+		execCmd("{$brotli} -k --best {$cmddir}/js/min/*.js");
+		execCmd("{$brotli} -k --best {$cmddir}/css/admin*.css");
+		execCmd("{$brotli} -k --best {$cmddir}/css/app*.css");
+//		unlink($cmddir . '/js/boot.js.br');
+//		unlink($cmddir . '/js/min/boot.min.js.br');
+	}
+}
+
+if (isset($options['readme'])) {
+
+	$basedir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0';
+
+	$readme = file_get_contents(ROOT_DIR . '/README.md');
+
+	$total = filesize("{$basedir}/static/js/serviceworker.js");
+	foreach (['admin','app','boot','libs','sieve'] as $name) {
+		$size = filesize("{$basedir}/static/js/{$name}.js");
+		$total += $size;
+		$readme = preg_replace("/(\\|{$name}\\.js\\s+\\|[\\s0-9.]+\\|)[\\s0-9.]+\\|/Ds",
+			'$1' . str_pad(number_format($size, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	|',
+			$readme
+		);
+	}
+	$readme = preg_replace("/(\\|TOTAL\\s+\\|8[\\s0-9.]+\\|)[\\s0-9.]+\\|/Ds",
+		'$1' . str_pad(number_format($total, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	|',
+		$readme
+	);
+
+	$total = [];
+	$total_br = [];
+	$total_gz = [];
+	foreach (['admin','app','boot','libs','sieve'] as $name) {
+		$size = filesize("{$basedir}/static/js/min/{$name}.min.js");
+		$size_br = filesize("{$basedir}/static/js/min/{$name}.min.js.br");
+		$size_gz = filesize("{$basedir}/static/js/min/{$name}.min.js.gz");
+		$total[$name] = $size;
+		$total_br[$name] = $size_br;
+		$total_gz[$name] = $size_gz;
+		$readme = preg_replace(
+			"/(\\|{$name}\\.min\\.js\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
+			'$1|'
+			. str_pad(number_format($size, 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
+			. '$2|'
+			. str_pad(number_format($size_gz, 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '$3|'
+			. str_pad(number_format($size_br, 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '|'
+			,
+			$readme
+		);
+	}
+	$readme = preg_replace(
+		"/(TOTAL user\+sieve\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
+		'$1|'
+		. str_pad(number_format(array_sum($total) - $total['admin'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
+		. '$2|'
+		. str_pad(number_format(array_sum($total_gz) - $total_gz['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '$3|'
+		. str_pad(number_format(array_sum($total_br) - $total_br['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '|'
+		,
+		$readme
+	);
+
+	//$smaller = 1217635 / (array_sum($total) - $total['admin']);
+	$smaller = 358761 / (array_sum($total_gz) - $total_gz['admin']);
+	//$smaller = 299485 / (array_sum($total_br) - $total_br['admin']);
+	$readme = preg_replace(
+		'/(For a user it is around) [0-9]+/',
+		'$1 ' . round(100 - 100 / $smaller),
+		$readme
+	);
+
+	unset($total['sieve']);
+	unset($total_br['sieve']);
+	unset($total_gz['sieve']);
+	$readme = preg_replace(
+		"/(TOTAL user\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
+		'$1|'
+		. str_pad(number_format(array_sum($total) - $total['admin'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
+		. '$2|'
+		. str_pad(number_format(array_sum($total_gz) - $total_gz['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '$3|'
+		. str_pad(number_format(array_sum($total_br) - $total_br['admin'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '|'
+		,
+		$readme
+	);
+	$readme = preg_replace(
+		"/(TOTAL admin\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
+		'$1|'
+		. str_pad(number_format(array_sum($total) - $total['app'], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
+		. '$2|'
+		. str_pad(number_format(array_sum($total_gz) - $total_gz['app'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '$3|'
+		. str_pad(number_format(array_sum($total_br) - $total_br['app'], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '|'
+		,
+		$readme
+	);
+
+	foreach (['admin','app'] as $name) {
+		$readme = preg_replace(
+			"/(\\|{$name}\\.css\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|[\\s0-9.]+\\|/Ds",
+			'$1|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '$2|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css.gz"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.css.br"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '|'
+			,
+			$readme
+		);
+		$readme = preg_replace(
+			"/(\\|{$name}\\.min\\.css\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|[\\s0-9.]+\\|/Ds",
+			'$1|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '$2|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css.gz"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	|'
+			. str_pad(number_format(filesize("{$basedir}/static/css/{$name}.min.css.br"), 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+			. '|'
+			,
+			$readme
+		);
+	}
+
+
+	$sizes = [
+		filesize("{$basedir}/static/js/min/openpgp.min.js"),
+		filesize("{$basedir}/static/js/min/openpgp.min.js.gz"),
+		filesize("{$basedir}/static/js/min/openpgp.min.js.br")
+	];
+	//|openpgp.min.js 	|  330.742	|  540.542	|102.388	| 167.397	| 84.241  	| 137.502	|
+	$readme = preg_replace(
+		"/(openpgp\.min\.js\\s+\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+(\\|[\\s0-9.]+)\\|[\\s0-9.]+\\|/Ds",
+		'$1|'
+		. str_pad(number_format($sizes[0], 0, '', '.'), 9, ' ', STR_PAD_LEFT) . '	'
+		. '$2| '
+		. str_pad(number_format($sizes[1], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '$3|  '
+		. str_pad(number_format($sizes[2], 0, '', '.'), 7, ' ', STR_PAD_LEFT) . '	'
+		. '|'
+		,
+		$readme
+	);
+
+	//file://
+
+	file_put_contents(ROOT_DIR . '/README.md', $readme);
+
+	$data = file_put_contents(
+		"{$basedir}/app/templates/Views/Admin/AdminSettingsAbout.html",
+		preg_replace(
+			'/20[0-9][0-9] ©/',
+			date('Y').' ©',
+			file_get_contents("{$basedir}/app/templates/Views/Admin/AdminSettingsAbout.html")
+		)
+	);
+}
diff --git a/cli/release.php b/cli/release.php
new file mode 100755
index 000000000..b86c1d7aa
--- /dev/null
+++ b/cli/release.php
@@ -0,0 +1,280 @@
+#!/usr/bin/php
+<?php
+define('ROOT_DIR', dirname(__DIR__));
+chdir(ROOT_DIR);
+
+$options = getopt('', ['aur','docker','plugins','skip-gulp','debian','nextcloud','owncloud','cpanel','sign']);
+
+if (isset($options['plugins'])) {
+	require(ROOT_DIR . '/build/plugins.php');
+}
+
+$gulp = trim(shell_exec('which gulp'));
+if (!$gulp) {
+	exit('gulp not installed, run as root: npm install --global gulp-cli');
+}
+
+$package = json_decode(file_get_contents('package.json'));
+
+/**
+ * Update files that contain version
+ */
+// cloudron
+$file = ROOT_DIR . '/integrations/cloudron/Dockerfile';
+file_put_contents($file, preg_replace('/VERSION=[0-9.]+/', "VERSION={$package->version}", file_get_contents($file)));
+$file = ROOT_DIR . '/integrations/cloudron/DESCRIPTION.md';
+file_put_contents($file, preg_replace('/<upstream>[^<]*</', "<upstream>{$package->version}<", file_get_contents($file)));
+// virtualmin
+$file = ROOT_DIR . '/integrations/virtualmin/snappymail.pl';
+file_put_contents($file, preg_replace('/return \\( "[0-9]+\\.[0-9]+\\.[0-9]+" \\)/', "return ( \"{$package->version}\" )", file_get_contents($file)));
+
+// Arch User Repository
+// https://aur.archlinux.org/packages/snappymail/
+$options['aur'] = isset($options['aur']);
+
+// Docker build
+$options['docker'] = isset($options['docker']);
+if ($options['docker'] && !($docker = trim(shell_exec('which docker')))) {
+	exit('docker not found');
+}
+if ($options['docker'] && $options['aur']) {
+	exit('Conflict between docker and aur');
+}
+
+$destPath = "build/dist/releases/webmail/{$package->version}/";
+is_dir($destPath) || mkdir($destPath, 0777, true);
+
+$zip_destination = "{$destPath}snappymail-{$package->version}.zip";
+$tar_destination = "{$destPath}snappymail-{$package->version}.tar";
+
+@unlink($zip_destination);
+@unlink($tar_destination);
+@unlink("{$tar_destination}.gz");
+
+if (!isset($options['skip-gulp'])) {
+	echo "\x1b[33;1m === Gulp === \x1b[0m\n";
+	passthru($gulp, $return_var);
+	if ($return_var) {
+		exit("gulp failed with error code {$return_var}\n");
+	}
+
+	$cmddir = escapeshellcmd(ROOT_DIR) . '/snappymail/v/0.0.0/static';
+
+	if ($gzip = trim(shell_exec('which gzip'))) {
+		echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n";
+		passthru("{$gzip} -k --best {$cmddir}/js/*.js");
+		passthru("{$gzip} -k --best {$cmddir}/js/min/*.js");
+		passthru("{$gzip} -k --best {$cmddir}/css/admin*.css");
+		passthru("{$gzip} -k --best {$cmddir}/css/app*.css");
+		unlink(ROOT_DIR . '/snappymail/v/0.0.0/static/js/boot.js.gz');
+		unlink(ROOT_DIR . '/snappymail/v/0.0.0/static/js/min/boot.min.js.gz');
+	}
+
+	if ($brotli = trim(shell_exec('which brotli'))) {
+		echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n";
+		passthru("{$brotli} -k --best {$cmddir}/js/*.js");
+		passthru("{$brotli} -k --best {$cmddir}/js/min/*.js");
+		passthru("{$brotli} -k --best {$cmddir}/css/admin*.css");
+		passthru("{$brotli} -k --best {$cmddir}/css/app*.css");
+		unlink(ROOT_DIR . '/snappymail/v/0.0.0/static/js/boot.js.br');
+		unlink(ROOT_DIR . '/snappymail/v/0.0.0/static/js/min/boot.min.js.br');
+	}
+}
+
+// Temporary rename folder to speed up PharData
+//if (!rename('snappymail/v/0.0.0', "snappymail/v/{$package->version}")){
+if (!rename('snappymail/v/0.0.0', "snappymail/v/{$package->version}")) {
+	exit('Failed to temporary rename snappymail/v/0.0.0');
+}
+register_shutdown_function(function(){
+	// Rename folder back to original
+	@rename("snappymail/v/{$GLOBALS['package']->version}", 'snappymail/v/0.0.0');
+});
+
+echo "\x1b[33;1m === Zip/Tar === \x1b[0m\n";
+
+$zip = new ZipArchive();
+if (!$zip->open($zip_destination, ZIPARCHIVE::CREATE)) {
+	exit("Failed to create {$zip_destination}");
+}
+
+$tar = new PharData($tar_destination);
+
+$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
+foreach ($files as $file) {
+	$file = str_replace('\\', '/', $file);
+	//echo "{$file}\n";
+	// Ignore "." and ".." folders
+	if (!in_array(substr($file, strrpos($file, '/')+1), array('.', '..'))) {
+		if (is_dir($file)) {
+			$zip->addEmptyDir($file);
+		} else if (is_file($file)) {
+			$zip->addFile($file);
+		}
+	}
+}
+
+if ($options['docker']) {
+	$tar->buildFromDirectory('./snappymail/', "@v/{$package->version}@");
+} else {
+	$tar->buildFromDirectory('./', "@snappymail/v/{$package->version}@");
+}
+
+//$zip->addFile('cli/upgrade.sh');
+//$tar->addFile('cli/upgrade.sh');
+
+$zip->addFile('data/.htaccess');
+$tar->addFile('data/.htaccess');
+
+$zip->addFromString('data/VERSION', $package->version);
+$tar->addFromString('data/VERSION', $package->version);
+
+$zip->addFile('data/README.md');
+$tar->addFile('data/README.md');
+
+if ($options['aur']) {
+	$data = '<?php
+function __get_custom_data_full_path()
+{
+	return \'/var/lib/snappymail\';
+}
+';
+	$zip->addFromString('include.php', $data);
+	$tar->addFromString('include.php', $data);
+} else {
+	$zip->addFile('_include.php');
+	$tar->addFile('_include.php');
+}
+
+$zip->addFile('.htaccess');
+$tar->addFile('.htaccess');
+
+$index = file_get_contents('index.php');
+$index = str_replace('0.0.0', $package->version, $index);
+$zip->addFromString('index.php', $index);
+$tar->addFromString('index.php', $index);
+
+$zip->addFile('README.md');
+$tar->addFile('README.md');
+
+$zip->close();
+
+$tar->compress(Phar::GZ);
+unlink($tar_destination);
+$tar_destination .= '.gz';
+
+echo "{$zip_destination} created\n{$tar_destination} created\n";
+
+if (isset($options['nextcloud'])) {
+	require(ROOT_DIR . '/build/nextcloud.php');
+}
+
+if (isset($options['owncloud'])) {
+	require(ROOT_DIR . '/build/owncloud.php');
+}
+
+if (isset($options['cpanel'])) {
+	require(ROOT_DIR . '/build/cpanel.php');
+}
+
+rename("snappymail/v/{$package->version}", 'snappymail/v/0.0.0');
+
+file_put_contents("{$destPath}core.json", '{
+	"version": "'.$package->version.'",
+	"file": "../latest.tar.gz",
+	"warnings": []
+}');
+
+// Arch User Repository
+if ($options['aur']) {
+	// extension_loaded('blake2')
+	if (!function_exists('b2sum') && $b2sum = trim(shell_exec('which b2sum'))) {
+		function b2sum($file) {
+			$file = escapeshellarg($file);
+			exec("b2sum --binary {$file} 2>&1", $output, $exitcode);
+			$output = explode(' ', implode("\n", $output));
+			return $output[0];
+		}
+	}
+
+	$b2sums = function_exists('b2sum') ? [
+		b2sum($tar_destination),
+		b2sum(ROOT_DIR . '/build/arch/snappymail.sysusers'),
+		b2sum(ROOT_DIR . '/build/arch/snappymail.tmpfiles')
+	] : [];
+
+	file_put_contents('build/arch/.SRCINFO', 'pkgbase = snappymail
+	pkgdesc = modern PHP webmail client
+	pkgver = '.$package->version.'
+	pkgrel = 1
+	url = https://github.com/the-djmaze/snappymail
+	arch = any
+	license = AGPL3
+	makedepends = php
+	makedepends = nodejs
+	makedepends = yarn
+	makedepends = gulp
+	depends = php-fpm
+	optdepends = mariadb: storage backend for contacts
+	optdepends = php-pgsql: storage backend for contacts
+	optdepends = php-sqlite: storage backend for contacts
+	source = snappymail-'.$package->version.'.tar.gz::https://github.com/the-djmaze/snappymail/archive/v'.$package->version.'.tar.gz
+	source = snappymail.sysusers
+	source = snappymail.tmpfiles
+	b2sums = '.implode("\n	b2sums = ", $b2sums).'
+
+pkgname = snappymail
+');
+
+	$file = ROOT_DIR . '/build/arch/PKGBUILD';
+	if (is_file($file)) {
+		$PKGBUILD = file_get_contents($file);
+		$PKGBUILD = preg_replace('/pkgver=[0-9.]+/', "pkgver={$package->version}", $PKGBUILD);
+		$PKGBUILD = preg_replace('/b2sums=\\([^)]+\\)/s', "b2sums=('".implode("'\n        '", $b2sums)."')", $PKGBUILD);
+		file_put_contents($file, $PKGBUILD);
+	}
+}
+// Debian Repository
+else if (isset($options['debian'])) {
+	require(ROOT_DIR . '/build/deb.php');
+}
+// Docker build
+else if ($options['docker']) {
+	echo "\x1b[33;1m === Docker === \x1b[0m\n";
+	$zip_filename = "snappymail-{$package->version}.zip";
+	copy($zip_destination, "./.docker/release/{$zip_filename}");
+	if ($docker) {
+		passthru("{$docker} build --pull -f " . ROOT_DIR . '/.docker/release/Dockerfile ' . ROOT_DIR . " --build-arg FILES_ZIP={$zip_filename} -t snappymail:{$package->version}");
+	} else {
+		echo "Docker not installed!\n";
+	}
+}
+
+if (isset($options['sign'])) {
+	echo "\x1b[33;1m === PGP Sign === \x1b[0m\n";
+	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tar_destination), $return_var);
+	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($zip_destination), $return_var);
+	if (isset($options['nextcloud'])) {
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
+			.escapeshellarg("{$destPath}snappymail-{$package->version}-nextcloud.tar.gz"), $return_var);
+	}
+	if (isset($options['owncloud'])) {
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
+			.escapeshellarg("{$destPath}snappymail-{$package->version}-owncloud.tar.gz"), $return_var);
+	}
+	if (isset($options['cpanel'])) {
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
+			.escapeshellarg("{$destPath}snappymail-{$package->version}-cpanel.tar.gz"), $return_var);
+	}
+	if (isset($options['debian'])) {
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
+			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var);
+		// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output '
+			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' '
+			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);
+		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 -abs --output '
+			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release.gpg") . ' '
+			. escapeshellarg(ROOT_DIR . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);
+	}
+}
diff --git a/cli/upgrade.sh b/cli/upgrade.sh
new file mode 100755
index 000000000..cf0eeb5e4
--- /dev/null
+++ b/cli/upgrade.sh
@@ -0,0 +1,51 @@
+#!/bin/bash
+
+# UPGRADING Snappymail
+#
+# I've found this to be working fine when upgrading my Snappymail. The
+# commands should be used at your own risk. I take no responsibility.
+#
+# The script can only be run from the  SnappyMail install directory!
+#
+# By Uwe Bieling <pychi@gmx.de>
+# and Jordan S (https://github.com/jas8522)
+
+SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
+LATEST_URL="https://snappymail.eu/repository/latest.tar.gz"
+cd "${SCRIPT_DIR}"
+OWNERGROUP=`stat -c "%U:%G" snappymail`
+OLD_VERSION=`grep "define('APP_VERSION" index.php | awk -F\' '{print $4}'`
+
+# check if we are root
+if [[ $(id -u) -ne 0 ]] ; then echo -e "\033[1;31mPlease run as root\033[0m" ; exit 1 ; fi
+
+# check if we are in the correct dir
+if [ ! -d snappymail/v ] ; then echo -e "\033[1;31mThis script can only be run from the SnappyMail install directory\033[0m" ; exit 1 ; fi
+
+# Download last release to /tmp
+echo -e "\033[1;33mDownloading last release\033[0m"
+wget $LATEST_URL -O /tmp/snappymail_latest.tar.gz >/dev/null 2>&1
+NEW_VERSION=`tar -tf /tmp/snappymail_latest.tar.gz | grep "snappymail/v/.*/index.php" | awk -F/ '{print $3}'`
+
+if [ $OLD_VERSION != $NEW_VERSION ] ;
+then
+        # Safety First ... make a backup
+        DSTAMP=`date +%Y-%m-%d`
+        echo -e "\033[1;33mBacking up snappymail $OLD_VERSION to ../backup_snappymail_${DSTAMP}.tar.gz\033[0m"
+        tar -czf ../backup_snappymail_${DSTAMP}.tar.gz .
+
+        # installing
+        echo -e "\033[1;33mInstalling $NEW_VERSION\033[0m";
+        tar -xzf /tmp/snappymail_latest.tar.gz;
+
+        # set permissions
+        echo -e "\033[1;33mSet permissions\033[0m"
+        find . -type d -exec chmod 755 {} \;
+        find . -type f -exec chmod 644 {} \;
+        chmod u+x "${SCRIPT_DIR}/upgrade.sh"
+        chown -R $OWNERGROUP $SCRIPT_DIR
+        echo -e "\033[1;32mFinished with snappymail upgrade from $OLD_VERSION to $NEW_VERSION... \033[0m"
+
+else
+        echo -e "\033[1;31msame Version skipping.. \033[0m";
+fi
diff --git a/dev/App/Abstract.js b/dev/App/Abstract.js
index a1a385bba..1e545bbf9 100644
--- a/dev/App/Abstract.js
+++ b/dev/App/Abstract.js
@@ -1,17 +1,14 @@
 import ko from 'ko';
 
-import { Settings } from 'Common/Globals';
-
 import { logoutLink } from 'Common/Links';
 import { i18nToNodes, initOnStartOrLangChange } from 'Common/Translator';
 
-import { LanguageStore } from 'Stores/Language';
-import { ThemeStore } from 'Stores/Theme';
+import { arePopupsVisible } from 'Knoin/Knoin';
+
+import { LanguageStore } from 'Stores/Language';
+import { initThemes } from 'Stores/Theme';
 
-import { InputComponent } from 'Component/Input';
 import { SelectComponent } from 'Component/Select';
-import { TextAreaComponent } from 'Component/TextArea';
-import { CheckboxMaterialDesignComponent } from 'Component/MaterialDesign/Checkbox';
 import { CheckboxComponent } from 'Component/Checkbox';
 
 export class AbstractApp {
@@ -22,41 +19,37 @@ export class AbstractApp {
 		this.Remote = Remote;
 	}
 
-	logoutReload() {
-		const url = logoutLink();
-
+	logoutReload(url) {
+		arePopupsVisible(false);
+		url = url || logoutLink();
 		if (location.href !== url) {
-			setTimeout(() => (Settings.app('inIframe') ? parent : window).location.href = url, 100);
+			setTimeout(() => location.href = url, 100);
 		} else {
 			rl.route.reload();
 		}
+		// this does not work due to ViewModelClass.__builded = true;
+//		rl.settings.set('Auth', false);
+//		rl.app.start();
 	}
 
 	bootstart() {
-		const register = (key, ClassObject, templateID) => ko.components.register(key, {
-				template: { element: templateID || (key + 'Component') },
+		const register = (name, ClassObject) => ko.components.register(name, {
+				template: { element: ClassObject.name },
 				viewModel: {
 					createViewModel: (params, componentInfo) => {
 						params = params || {};
 						i18nToNodes(componentInfo.element);
-						if (params.inline) {
-							componentInfo.element.style.display = 'inline-block';
-						}
 						return new ClassObject(params);
 					}
 				}
 			});
-
-		register('Input', InputComponent);
 		register('Select', SelectComponent);
-		register('TextArea', TextAreaComponent);
-		register('Checkbox', CheckboxMaterialDesignComponent, 'CheckboxMaterialDesignComponent');
-		register('CheckboxSimple', CheckboxComponent, 'CheckboxComponent');
+		register('Checkbox', CheckboxComponent);
 
 		initOnStartOrLangChange();
 
 		LanguageStore.populate();
-		ThemeStore.populate();
+		initThemes();
 
 		this.start();
 	}
diff --git a/dev/App/Admin.js b/dev/App/Admin.js
index 755cb0d5f..91440875c 100644
--- a/dev/App/Admin.js
+++ b/dev/App/Admin.js
@@ -1,6 +1,7 @@
 import 'External/ko';
 
-import { Settings, SettingsGet } from 'Common/Globals';
+import { SettingsGet, SettingsAdmin } from 'Common/Globals';
+import { initThemes } from 'Stores/Theme';
 
 import Remote from 'Remote/Admin/Fetch';
 
@@ -10,6 +11,8 @@ import { LoginAdminScreen } from 'Screen/Admin/Login';
 import { startScreens } from 'Knoin/Knoin';
 import { AbstractApp } from 'App/Abstract';
 
+import { AskPopupView } from 'View/Popup/Ask';
+
 export class AdminApp extends AbstractApp {
 	constructor() {
 		super(Remote);
@@ -17,18 +20,33 @@ export class AdminApp extends AbstractApp {
 	}
 
 	refresh() {
+		initThemes();
 		this.start();
 	}
 
 	start() {
-		if (!Settings.app('adminAllowed')) {
+//		if (!Settings.app('adminAllowed')) {
+		if (!SettingsAdmin('allowed')) {
 			rl.route.root();
 			setTimeout(() => location.href = '/', 1);
 		} else if (SettingsGet('Auth')) {
-			this.weakPassword(!!SettingsGet('WeakPassword'));
+			this.weakPassword(SettingsGet('weakPassword'));
 			startScreens([SettingsAdminScreen]);
 		} else {
 			startScreens([LoginAdminScreen]);
 		}
 	}
 }
+
+AskPopupView.credentials = function(sAskDesc, btnText) {
+	return new Promise(resolve => {
+		this.showModal([
+			sAskDesc,
+			view => resolve({username:view.username(), password:view.passphrase()}),
+			() => resolve(null),
+			true,
+			3,
+			btnText
+		]);
+	});
+};
diff --git a/dev/App/User.js b/dev/App/User.js
index cc7850531..5e28164ac 100644
--- a/dev/App/User.js
+++ b/dev/App/User.js
@@ -1,11 +1,11 @@
 import 'External/User/ko';
 
-import { isArray, pString, changeTheme } from 'Common/Utils';
-import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility } from 'Common/UtilsUser';
+import { SMAudio } from 'Common/Audio';
+import { arrayLength } from 'Common/Utils';
+import { mailToHelper, setLayoutResizer, dropdownsDetectVisibility, loadAccountsAndIdentities } from 'Common/UtilsUser';
 
 import {
 	FolderType,
-	SetSystemFoldersNotification,
 	ClientSideKeyNameFolderListSize
 } from 'Common/EnumsUser';
 
@@ -23,31 +23,26 @@ import {
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
 import {
-	MessageFlagsCache,
-	setFolderHash,
-	getFolderHash,
 	getFolderInboxName,
 	getFolderFromCacheList
 } from 'Common/Cache';
 
-import { i18n, reloadTime } from 'Common/Translator';
+import { i18n, reloadTime, getErrorMessage } from 'Common/Translator';
 
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { NotificationUserStore } from 'Stores/User/Notification';
 import { AccountUserStore } from 'Stores/User/Account';
 import { ContactUserStore } from 'Stores/User/Contact';
-import { IdentityUserStore } from 'Stores/User/Identity';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { PgpUserStore } from 'Stores/User/Pgp';
+import { SMimeUserStore } from 'Stores/User/SMime';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { ThemeStore } from 'Stores/Theme';
+import { ThemeStore, initThemes } from 'Stores/Theme';
 import { LanguageStore } from 'Stores/Language';
+import { MessageUserStore } from 'Stores/User/Message';
 
 import Remote from 'Remote/User/Fetch';
 
-import { AccountModel } from 'Model/Account';
-import { IdentityModel } from 'Model/Identity';
-
 import { LoginUserScreen } from 'Screen/User/Login';
 import { MailBoxUserScreen } from 'Screen/User/MailBox';
 import { SettingsUserScreen } from 'Screen/User/Settings';
@@ -61,11 +56,9 @@ import { FolderSystemPopupView } from 'View/Popup/FolderSystem';
 import { AskPopupView } from 'View/Popup/Ask';
 
 import {
+	folderInformation,
 	folderInformationMultiply,
-	refreshFoldersInterval,
-	messagesMoveHelper,
-	messagesDeleteHelper,
-	fetchFolderInformation
+	setRefreshFoldersInterval
 } from 'Common/Folders';
 import { loadFolders } from 'Model/FolderCollection';
 
@@ -78,257 +71,134 @@ export class AppUser extends AbstractApp {
 		let lastTime = Date.now();
 		setInterval(() => {
 			const currentTime = Date.now();
-			if (currentTime > (lastTime + interval + 1000)) {
-				Remote.request('Version',
-					iError => (100 < iError) && (Settings.app('inIframe') ? parent : window).location.reload(),
-					{ Version: Settings.app('version') }
+			(currentTime > (lastTime + interval + 1000))
+			&& Remote.request('Version',
+					iError => (100 < iError) && location.reload(),
+					{ version: Settings.app('version') }
 				);
-			}
 			lastTime = currentTime;
 		}, interval);
 
-		const fn = (ev=>$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey)).debounce(500);
-		addEventsListener(doc, ['keydown','keyup'], fn);
+		addEventsListener(doc, ['keydown','keyup'], (ev=>$htmlCL.toggle('rl-ctrl-key-pressed', ev.ctrlKey)).debounce(500));
 
 		addShortcut('escape,enter', '', dropdownsDetectVisibility);
 		addEventListener('click', dropdownsDetectVisibility);
-	}
 
-	refresh() {
-		LanguageStore.language(SettingsGet('Language'));
-		ThemeStore.populate();
-		changeTheme(SettingsGet('Theme'));
-		this.start();
+		this.folderList = FolderUserStore.folderList;
+		this.messageList = MessagelistUserStore;
+
+		this.ask = AskPopupView;
+
+		this.loadAccountsAndIdentities = loadAccountsAndIdentities;
 	}
 
 	/**
-	 * @param {number} iDeleteType
+	 * @param {number} iFolderType
 	 * @param {string} sFromFolderFullName
-	 * @param {Array} aUidForRemove
-	 * @param {boolean=} bUseFolder = true
+	 * @param {Set} oUids
+	 * @param {boolean=} bDelete = false
 	 */
-	deleteMessagesFromFolder(iDeleteType, sFromFolderFullName, aUidForRemove, bUseFolder) {
+	moveMessagesToFolderType(iFolderType, sFromFolderFullName, oUids, bDelete) {
 		let oMoveFolder = null,
-			nSetSystemFoldersNotification = null;
+			nSetSystemFoldersNotification = 0;
 
-		switch (iDeleteType) {
-			case FolderType.Spam:
+		switch (iFolderType) {
+			case FolderType.Junk:
 				oMoveFolder = getFolderFromCacheList(FolderUserStore.spamFolder());
-				nSetSystemFoldersNotification = SetSystemFoldersNotification.Spam;
+				nSetSystemFoldersNotification = iFolderType;
+				bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.spamFolder();
 				break;
-			case FolderType.NotSpam:
+			case FolderType.Inbox:
 				oMoveFolder = getFolderFromCacheList(getFolderInboxName());
 				break;
 			case FolderType.Trash:
 				oMoveFolder = getFolderFromCacheList(FolderUserStore.trashFolder());
-				nSetSystemFoldersNotification = SetSystemFoldersNotification.Trash;
+				nSetSystemFoldersNotification = iFolderType;
+				bDelete = bDelete/* || UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()*/
+					|| sFromFolderFullName === FolderUserStore.spamFolder()
+					|| sFromFolderFullName === FolderUserStore.trashFolder();
 				break;
 			case FolderType.Archive:
 				oMoveFolder = getFolderFromCacheList(FolderUserStore.archiveFolder());
-				nSetSystemFoldersNotification = SetSystemFoldersNotification.Archive;
+				nSetSystemFoldersNotification = iFolderType;
+				bDelete = bDelete || UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder();
 				break;
 			// no default
 		}
 
-		bUseFolder = undefined === bUseFolder ? true : !!bUseFolder;
-		if (bUseFolder) {
-			if (
-				(FolderType.Spam === iDeleteType && UNUSED_OPTION_VALUE === FolderUserStore.spamFolder()) ||
-				(FolderType.Trash === iDeleteType && UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) ||
-				(FolderType.Archive === iDeleteType && UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder())
-			) {
-				bUseFolder = false;
-			}
-		}
-
-		if (!oMoveFolder && bUseFolder) {
-			showScreenPopup(FolderSystemPopupView, [nSetSystemFoldersNotification]);
-		} else if (
-			!bUseFolder ||
-			(FolderType.Trash === iDeleteType &&
-				(sFromFolderFullName === FolderUserStore.spamFolder()
-				 || sFromFolderFullName === FolderUserStore.trashFolder()))
-		) {
+		if (bDelete) {
 			showScreenPopup(AskPopupView, [
 				i18n('POPUPS_ASK/DESC_WANT_DELETE_MESSAGES'),
 				() => {
-					messagesDeleteHelper(sFromFolderFullName, aUidForRemove);
-					MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, aUidForRemove);
+					MessagelistUserStore.moveMessages(sFromFolderFullName, oUids);
 				}
 			]);
 		} else if (oMoveFolder) {
-			messagesMoveHelper(sFromFolderFullName, oMoveFolder.fullName, aUidForRemove);
-			MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, aUidForRemove, oMoveFolder.fullName);
+			MessagelistUserStore.moveMessages(sFromFolderFullName, oUids, oMoveFolder.fullName);
+		} else {
+			showScreenPopup(FolderSystemPopupView, [nSetSystemFoldersNotification]);
 		}
 	}
 
-	accountsAndIdentities() {
-		AccountUserStore.loading(true);
-		IdentityUserStore.loading(true);
-
-		Remote.request('AccountsAndIdentities', (iError, oData) => {
-			AccountUserStore.loading(false);
-			IdentityUserStore.loading(false);
-
-			if (!iError) {
-				const
-//					counts = {},
-					accounts = oData.Result.Accounts,
-					mainEmail = SettingsGet('MainEmail');
-
-				if (isArray(accounts)) {
-//					AccountUserStore.accounts.forEach(oAccount => counts[oAccount.email] = oAccount.count());
-
-					AccountUserStore.accounts(
-						accounts.map(
-							sValue => new AccountModel(sValue/*, counts[sValue]*/)
-						)
-					);
-//					accounts.length &&
-					AccountUserStore.accounts.unshift(new AccountModel(mainEmail/*, counts[mainEmail]*/, false));
-				}
-
-				if (isArray(oData.Result.Identities)) {
-					IdentityUserStore(
-						oData.Result.Identities.map(identityData => {
-							const identity = new IdentityModel(
-								pString(identityData.Id),
-								pString(identityData.Email)
-							);
-
-							identity.name(pString(identityData.Name));
-							identity.replyTo(pString(identityData.ReplyTo));
-							identity.bcc(pString(identityData.Bcc));
-							identity.signature(pString(identityData.Signature));
-							identity.signatureInsertBefore(!!identityData.SignatureInsertBefore);
-
-							return identity;
-						})
-					);
-				}
-			}
-		});
-	}
-
 	/**
 	 * @param {string} folder
 	 * @param {Array=} list = []
 	 */
 	folderInformation(folder, list) {
-		if (folder && folder.trim()) {
-			fetchFolderInformation(
-				(iError, data) => {
-					if (!iError && data.Result) {
-						const result = data.Result,
-							hash = getFolderHash(result.Folder),
-							folderFromCache = getFolderFromCacheList(result.Folder);
-						if (folderFromCache) {
-							folderFromCache.expires = Date.now();
-
-							setFolderHash(result.Folder, result.Hash);
-
-							folderFromCache.messageCountAll(result.MessageCount);
-
-							let unreadCountChange = (folderFromCache.messageCountUnread() !== result.MessageUnseenCount);
-
-							folderFromCache.messageCountUnread(result.MessageUnseenCount);
-
-							if (unreadCountChange) {
-								MessageFlagsCache.clearFolder(folderFromCache.fullName);
-							}
-
-							if (result.Flags.length) {
-								result.Flags.forEach(message =>
-									MessageFlagsCache.setFor(folderFromCache.fullName, message.Uid.toString(), message.Flags)
-								);
-
-								MessagelistUserStore.reloadFlagsAndCachedMessage();
-							}
-
-							MessagelistUserStore.initUidNextAndNewMessages(
-								folderFromCache.fullName,
-								result.UidNext,
-								result.NewMessages
-							);
-
-							if (!hash || unreadCountChange || result.Hash !== hash) {
-								if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
-									MessagelistUserStore.reload();
-								} else if (getFolderInboxName() === folderFromCache.fullName) {
-									Remote.messageList(null, {Folder: getFolderInboxName()}, true);
-								}
-							}
-						}
-					}
-				},
-				folder,
-				list
-			);
-		}
+		folderInformation(folder, list);
 	}
 
 	logout() {
-		Remote.request('Logout', () => {
-			const customLogoutLink = Settings.app('customLogoutLink');
-			if (customLogoutLink) {
-				((window.parent && Settings.app('inIframe')) ? window.parent : window).location.href = customLogoutLink;
-			} else {
-				rl.logoutReload()
-			}
-		});
+		Remote.request('Logout', (iError, data) =>
+			iError ? alert('Logout error: ' + getErrorMessage(iError, data))
+				: rl.logoutReload(Settings.app('customLogoutLink'))
+		);
 	}
 
 	bootstart() {
 		super.bootstart();
 
-		addEventListener('resize', () => leftPanelDisabled(ThemeStore.isMobile() || 1000 > innerWidth));
 		addEventListener('beforeunload', event => {
-			if (arePopupsVisible()) {
+			if (arePopupsVisible() || (!SettingsUserStore.usePreviewPane() && MessageUserStore.message())) {
 				event.preventDefault();
-				return event.returnValue = "Are you sure you want to exit?";
+				return event.returnValue = i18n('POPUPS_ASK/EXIT_ARE_YOU_SURE');
 			}
 		}, {capture: true});
 	}
 
+	refresh() {
+		initThemes();
+		LanguageStore.language(SettingsGet('language'));
+		this.start();
+	}
+
 	start() {
 		if (SettingsGet('Auth')) {
-			rl.setWindowTitle(i18n('GLOBAL/LOADING'));
+			rl.setTitle(i18n('GLOBAL/LOADING'));
 
-			NotificationUserStore.enableSoundNotification(!!SettingsGet('SoundNotification'));
-			NotificationUserStore.enableDesktopNotification(!!SettingsGet('DesktopNotifications'));
+			SMAudio.notifications(!!SettingsGet('SoundNotification'));
+			NotificationUserStore.enabled(!!SettingsGet('DesktopNotifications'));
 
 			AccountUserStore.email(SettingsGet('Email'));
 
 			SettingsUserStore.init();
 			ContactUserStore.init();
 
-			loadFolders(value => {
+			loadFolders((success, error) => {
 				try {
-					if (value) {
+					if (success) {
 						startScreens([
 							MailBoxUserScreen,
 							SettingsUserScreen
 						]);
 
-						setInterval(() => {
-							const cF = FolderUserStore.currentFolderFullName(),
-								iF = getFolderInboxName();
-							this.folderInformation(iF);
-							if (iF !== cF) {
-								this.folderInformation(cF);
-							}
-							folderInformationMultiply();
-						}, refreshFoldersInterval);
+						setRefreshFoldersInterval(SettingsGet('CheckMailInterval'));
 
-						ContactUserStore.init();
-
-						this.accountsAndIdentities();
+						loadAccountsAndIdentities();
 
 						setTimeout(() => {
 							const cF = FolderUserStore.currentFolderFullName();
-							if (getFolderInboxName() !== cF) {
-								this.folderInformation(cF);
-							}
+							getFolderInboxName() === cF || folderInformation(cF);
 							FolderUserStore.hasCapability('LIST-STATUS') || folderInformationMultiply(true);
 						}, 1000);
 
@@ -341,39 +211,29 @@ export class AppUser extends AbstractApp {
 						// initLeftSideLayoutResizer
 						setTimeout(() => {
 							const left = elementById('rl-left'),
-								right = elementById('rl-right'),
 								fToggle = () =>
-									setLayoutResizer(left, right, ClientSideKeyNameFolderListSize,
+									setLayoutResizer(left, ClientSideKeyNameFolderListSize,
 										(ThemeStore.isMobile() || leftPanelDisabled()) ? 0 : 'Width');
-							if (left && right) {
+							if (left) {
 								fToggle();
 								leftPanelDisabled.subscribe(fToggle);
 							}
 						}, 1);
 
-						setInterval(reloadTime(), 60000);
+						setInterval(reloadTime, 60000);
 
 						PgpUserStore.init();
+						SMimeUserStore.loadCertificates();
 
-						// When auto-login is active
-						if (navigator.registerProtocolHandler) {
-							try {
-								navigator.registerProtocolHandler(
-									'mailto',
-									location.protocol + '//' + location.host + location.pathname + '?mailto&to=%s',
-									(SettingsGet('Title') || 'SnappyMail')
-								);
-							} catch (e) {} // eslint-disable-line no-empty
-						}
-						setTimeout(() => mailToHelper(SettingsGet('MailToEmail')), 500);
+						setTimeout(() => mailToHelper(SettingsGet('mailToEmail')), 500);
 					} else {
 						this.logout();
+						alert('Folders error: ' + getErrorMessage(0, error))
 					}
 				} catch (e) {
 					console.error(e);
 				}
 			});
-
 		} else {
 			startScreens([LoginUserScreen]);
 		}
@@ -381,6 +241,62 @@ export class AppUser extends AbstractApp {
 
 	showMessageComposer(params = [])
 	{
-		showScreenPopup(ComposePopupView, params);
+		let msg = params[1];
+		if (1 == arrayLength(msg)) {
+			msg = msg[0];
+		}
+		if (msg) {
+			msg.decrypt().then((/*success*/)=>showScreenPopup(ComposePopupView, params));
+		} else {
+			showScreenPopup(ComposePopupView, params);
+		}
 	}
 }
+
+AskPopupView.password = function(sAskDesc, btnText, ask) {
+	return new Promise(resolve => {
+		this.showModal([
+			sAskDesc,
+			view => resolve({
+				password:view.passphrase(),
+				username:/*ask & 2 ? */view.username(),
+				remember:/*ask & 4 ? */view.remember(),
+				rememberPermanent: view.rememberPermanent(),
+			}),
+			() => resolve(null),
+			true,
+			ask || 1,
+			btnText
+		]);
+	});
+};
+
+AskPopupView.cryptkey = () => new Promise(resolve => {
+	const fn = () => AskPopupView.showModal([
+		i18n('CRYPTO/ASK_CRYPTKEY_PASS'),
+		view => {
+			let pass = view.passphrase();
+			if (pass) {
+				Remote.post('ResealCryptKey', null, {
+					passphrase: pass
+				}).then(response => {
+					resolve(response?.Result);
+				}).catch(e => {
+					if (111 === e.code) {
+						fn();
+					} else {
+						console.error(e);
+						resolve(null);
+					}
+				});
+			} else {
+				resolve(null);
+			}
+		},
+		() => resolve(null),
+		true,
+		1,
+		i18n('CRYPTO/DECRYPT')
+	]);
+	fn();
+});
diff --git a/dev/Common/Audio.js b/dev/Common/Audio.js
index a77efbcd5..26459af0b 100644
--- a/dev/Common/Audio.js
+++ b/dev/Common/Audio.js
@@ -1,9 +1,10 @@
 import * as Links from 'Common/Links';
 import { doc, SettingsGet, fireEvent, addEventsListener } from 'Common/Globals';
+import { addObservablesTo } from 'External/ko';
 
 let notificator = null,
 	player = null,
-	canPlay = type => player && !!player.canPlayType(type).replace('no', ''),
+	canPlay = type => !!player?.canPlayType(type).replace('no', ''),
 
 	audioCtx = window.AudioContext || window.webkitAudioContext,
 
@@ -45,12 +46,12 @@ let notificator = null,
 		'keydown','keyup'
 	],
 	unlock = () => {
+		unlockEvents.forEach(type => doc.removeEventListener(type, unlock, true));
 		if (audioCtx) {
 			console.log('AudioContext ' + audioCtx.state);
 			audioCtx.resume();
 		}
-		unlockEvents.forEach(type => doc.removeEventListener(type, unlock, true));
-//		setTimeout(()=>Audio.playNotification(1),1);
+//		setTimeout(()=>SMAudio.playNotification(0,1),1);
 	};
 
 if (audioCtx) {
@@ -76,6 +77,10 @@ export const SMAudio = new class {
 			addEventsListener(player, ['ended','error'], stopFn);
 			addEventListener('audio.api.stop', stopFn);
 		}
+
+		addObservablesTo(this, {
+			notifications: false
+		});
 	}
 
 	paused() {
@@ -87,7 +92,7 @@ export const SMAudio = new class {
 	}
 
 	pause() {
-		player && player.pause();
+		player?.pause();
 		fireEvent('audio.stop');
 	}
 
@@ -103,18 +108,24 @@ export const SMAudio = new class {
 		this.supportedWav && play(url, name);
 	}
 
-	playNotification(silent) {
-		if ('running' == audioCtx.state && (this.supportedMp3 || this.supportedOgg)) {
-			notificator = notificator || createNewObject();
-			if (notificator) {
-				notificator.src = Links.staticLink('sounds/'
-					+ SettingsGet('NotificationSound')
-					+ (this.supportedMp3 ? '.mp3' : '.ogg'));
-				notificator.volume = silent ? 0.01 : 1;
-				notificator.play();
+	/**
+	 * Used with SoundNotification setting
+	 */
+	playNotification(force, silent) {
+		if (force || this.notifications()) {
+			if ('running' == audioCtx.state && (this.supportedMp3 || this.supportedOgg)) {
+				notificator = notificator || createNewObject();
+				if (notificator) {
+//					SettingsGet('NotificationSound').startsWith('custom@')
+					notificator.src = Links.staticLink('sounds/'
+						+ SettingsGet('NotificationSound')
+						+ (this.supportedMp3 ? '.mp3' : '.ogg'));
+					notificator.volume = silent ? 0.01 : 1;
+					notificator.play();
+				}
+			} else {
+				console.log('No audio: ' + audioCtx.state);
 			}
-		} else {
-			console.log('No audio: ' + audioCtx.state);
 		}
 	}
 };
diff --git a/dev/Common/Cache.js b/dev/Common/Cache.js
index 280450812..b1cbd7241 100644
--- a/dev/Common/Cache.js
+++ b/dev/Common/Cache.js
@@ -1,11 +1,5 @@
-import { MessageSetAction } from 'Common/EnumsUser';
-import { isArray } from 'Common/Utils';
-
-let FOLDERS_CACHE = {},
-	FOLDERS_NAME_CACHE = {},
-	MESSAGE_FLAGS_CACHE = {},
-	NEW_MESSAGE_CACHE = {},
-	REQUESTED_MESSAGE_CACHE = {},
+let FOLDERS_CACHE = new Map,
+	FOLDERS_HASH_MAP = new Map,
 	inboxFolderName = 'INBOX';
 
 export const
@@ -13,56 +7,10 @@ export const
 	 * @returns {void}
 	 */
 	clearCache = () => {
-		FOLDERS_CACHE = {};
-		FOLDERS_NAME_CACHE = {};
-		MESSAGE_FLAGS_CACHE = {};
-		NEW_MESSAGE_CACHE = {};
-		REQUESTED_MESSAGE_CACHE = {};
+		FOLDERS_CACHE.clear();
+		FOLDERS_HASH_MAP.clear();
 	},
 
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {string}
-	 */
-	getMessageKey = (folderFullName, uid) => folderFullName + '#' + uid,
-
-	/**
-	 * @param {string} folder
-	 * @param {string} uid
-	 */
-	addRequestedMessage = (folder, uid) => REQUESTED_MESSAGE_CACHE[getMessageKey(folder, uid)] = true,
-
-	/**
-	 * @param {string} folder
-	 * @param {string} uid
-	 * @returns {boolean}
-	 */
-	hasRequestedMessage = (folder, uid) => true === REQUESTED_MESSAGE_CACHE[getMessageKey(folder, uid)],
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 */
-	addNewMessageCache = (folderFullName, uid) => NEW_MESSAGE_CACHE[getMessageKey(folderFullName, uid)] = true,
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 */
-	hasNewMessageAndRemoveFromCache = (folderFullName, uid) => {
-		if (NEW_MESSAGE_CACHE[getMessageKey(folderFullName, uid)]) {
-			NEW_MESSAGE_CACHE[getMessageKey(folderFullName, uid)] = null;
-			return true;
-		}
-		return false;
-	},
-
-	/**
-	 * @returns {void}
-	 */
-	clearNewMessageCache = () => NEW_MESSAGE_CACHE = {},
-
 	/**
 	 * @returns {string}
 	 */
@@ -74,175 +22,35 @@ export const
 	setFolderInboxName = name => inboxFolderName = name,
 
 	/**
-	 * @param {string} folderHash
+	 * @param {string} fullNameHash
 	 * @returns {string}
 	 */
-	getFolderFullName = folderHash =>
-		folderHash && FOLDERS_NAME_CACHE[folderHash] ? FOLDERS_NAME_CACHE[folderHash] : '',
+	getFolderFromHashMap = fullNameHash => getFolderFromCacheList(FOLDERS_HASH_MAP.get(fullNameHash)),
 
 	/**
-	 * @param {string} folderHash
-	 * @param {string} folderFullName
 	 * @param {?FolderModel} folder
 	 */
 	setFolder = folder => {
-		folder.hash = '';
-		FOLDERS_CACHE[folder.fullName] = folder;
-		FOLDERS_NAME_CACHE[folder.fullNameHash] = folder.fullName;
+		folder.etag = '';
+		FOLDERS_CACHE.set(folder.fullName, folder);
+		FOLDERS_HASH_MAP.set(folder.fullNameHash, folder.fullName);
 	},
 
 	/**
 	 * @param {string} folderFullName
-	 * @returns {string}
+	 * @param {string} folderETag
 	 */
-	getFolderHash = folderFullName =>
-		FOLDERS_CACHE[folderFullName] ? FOLDERS_CACHE[folderFullName].hash : '',
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} folderHash
-	 */
-	setFolderHash = (folderFullName, folderHash) =>
-		FOLDERS_CACHE[folderFullName] && (FOLDERS_CACHE[folderFullName].hash = folderHash),
-
-	/**
-	 * @param {string} folderFullName
-	 * @returns {string}
-	 */
-	getFolderUidNext = folderFullName =>
-		FOLDERS_CACHE[folderFullName] ? FOLDERS_CACHE[folderFullName].uidNext : 0,
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uidNext
-	 */
-	setFolderUidNext = (folderFullName, uidNext) =>
-		FOLDERS_CACHE[folderFullName] && (FOLDERS_CACHE[folderFullName].uidNext = uidNext),
+	setFolderETag = (folderFullName, folderETag) =>
+		FOLDERS_CACHE.has(folderFullName) && (FOLDERS_CACHE.get(folderFullName).etag = folderETag),
 
 	/**
 	 * @param {string} folderFullName
 	 * @returns {?FolderModel}
 	 */
 	getFolderFromCacheList = folderFullName =>
-		FOLDERS_CACHE[folderFullName] ? FOLDERS_CACHE[folderFullName] : null,
+		FOLDERS_CACHE.get(folderFullName),
 
 	/**
 	 * @param {string} folderFullName
 	 */
-	removeFolderFromCacheList = folderFullName => delete FOLDERS_CACHE[folderFullName];
-
-export class MessageFlagsCache
-{
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {string} flag
-	 * @returns {bool}
-	 */
-	static hasFlag(folderFullName, uid, flag) {
-		return MESSAGE_FLAGS_CACHE[folderFullName]
-			&& MESSAGE_FLAGS_CACHE[folderFullName][uid]
-			&& MESSAGE_FLAGS_CACHE[folderFullName][uid].includes(flag);
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @returns {?Array}
-	 */
-	static getFor(folderFullName, uid) {
-		return MESSAGE_FLAGS_CACHE[folderFullName] && MESSAGE_FLAGS_CACHE[folderFullName][uid];
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 * @param {string} uid
-	 * @param {Array} flagsCache
-	 */
-	static setFor(folderFullName, uid, flags) {
-		if (isArray(flags)) {
-			if (!MESSAGE_FLAGS_CACHE[folderFullName]) {
-				MESSAGE_FLAGS_CACHE[folderFullName] = {};
-			}
-			MESSAGE_FLAGS_CACHE[folderFullName][uid] = flags;
-		}
-	}
-
-	/**
-	 * @param {string} folderFullName
-	 */
-	static clearFolder(folderFullName) {
-		MESSAGE_FLAGS_CACHE[folderFullName] = {};
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static initMessage(message) {
-		if (message) {
-			const uid = message.uid,
-				flags = this.getFor(message.folder, uid),
-				thread = message.threads;
-
-			if (isArray(flags)) {
-				message.flags(flags);
-			}
-
-			if (thread.length) {
-				const unseenSubUid = thread.find(iSubUid =>
-					(uid !== iSubUid) && !this.hasFlag(message.folder, iSubUid, '\\seen')
-				);
-
-				const flaggedSubUid = thread.find(iSubUid =>
-					(uid !== iSubUid) && this.hasFlag(message.folder, iSubUid, '\\flagged')
-				);
-
-				message.hasUnseenSubMessage(!!unseenSubUid);
-				message.hasFlaggedSubMessage(!!flaggedSubUid);
-			}
-		}
-	}
-
-	/**
-	 * @param {(MessageModel|null)} message
-	 */
-	static store(message) {
-		if (message) {
-			this.setFor(message.folder, message.uid, message.flags());
-		}
-	}
-
-	/**
-	 * @param {string} folder
-	 * @param {string} uid
-	 * @param {number} setAction
-	 */
-	static storeBySetAction(folder, uid, setAction) {
-		let flags = this.getFor(folder, uid) || [];
-		const
-			unread = flags.includes('\\seen') ? 0 : 1,
-			add = item => flags.includes(item) || flags.push(item),
-			remove = item => flags = flags.filter(flag => flag != item);
-
-		switch (setAction) {
-			case MessageSetAction.SetSeen:
-				add('\\seen');
-				break;
-			case MessageSetAction.UnsetSeen:
-				remove('\\seen');
-				break;
-			case MessageSetAction.SetFlag:
-				add('\\flagged');
-				break;
-			case MessageSetAction.UnsetFlag:
-				remove('\\flagged');
-				break;
-			// no default
-		}
-
-		this.setFor(folder, uid, flags);
-
-		return unread;
-	}
-
-}
+	removeFolderFromCacheList = folderFullName => FOLDERS_CACHE.delete(folderFullName);
diff --git a/dev/Common/Enums.js b/dev/Common/Enums.js
index f9ce77143..cb3df4817 100644
--- a/dev/Common/Enums.js
+++ b/dev/Common/Enums.js
@@ -5,12 +5,10 @@ export const
 /**
  * @enum {string}
  */
-Scope = {
-	MessageList: 'MessageList',
-	FolderList: 'FolderList',
-	MessageView: 'MessageView',
-	Settings: 'Settings'
-},
+ScopeMessageList = 'MessageList',
+ScopeFolderList = 'FolderList',
+ScopeMessageView = 'MessageView',
+ScopeSettings = 'Settings',
 
 /**
  * @enum {number}
@@ -29,19 +27,20 @@ UploadErrorCode = {
 /**
  * @enum {number}
  */
-SaveSettingsStep = {
-	Animate: -2,
+SaveSettingStatus = {
+	Saving: -2,
 	Idle: -1,
-	TrueResult: 1,
-	FalseResult: 0
+	Success: 1,
+	Failed: 0
 },
 
 /**
  * @enum {number}
  */
-Notification = {
+Notifications = {
 	RequestError: 1,
 	RequestAborted: 2,
+	RequestTimeout: 3,
 
 	// Global
 	InvalidToken: 101,
@@ -51,6 +50,7 @@ Notification = {
 	ConnectionError: 104,
 	DomainNotAllowed: 109,
 	AccountNotAllowed: 110,
+	CryptKeyError: 111,
 
 	ContactsSyncError: 140,
 
@@ -96,7 +96,6 @@ Notification = {
 	JsonParse: 952,
 //	JsonTimeout: 953,
 
-	UnknownNotification: 998,
 	UnknownError: 999,
 
 	// Admin
diff --git a/dev/Common/EnumsUser.js b/dev/Common/EnumsUser.js
index 032ed7f2a..a8948e5a7 100644
--- a/dev/Common/EnumsUser.js
+++ b/dev/Common/EnumsUser.js
@@ -4,20 +4,33 @@
  * @enum {number}
  */
 export const FolderType = {
-	User: 0,
 	Inbox: 1,
 	Sent: 2,
 	Drafts: 3,
-	Spam: 4, // JUNK
+	Junk: 4, // Spam
 	Trash: 5,
-	Archive: 6,
-	NotSpam: 80
-};
+	Archive: 6
+/*
+	IMPORTANT : 10;
+	FLAGGED : 11;
+	ALL : 13;
+	// TODO: SnappyMail
+	TEMPLATES : 19;
+	// Kolab
+	CONFIGURATION : 20;
+	CALENDAR : 21;
+	CONTACTS : 22;
+	TASKS    : 23;
+	NOTES    : 24;
+	FILES    : 25;
+	JOURNAL  : 26;
+*/
+},
 
 /**
  * @enum {string}
  */
-export const FolderMetadataKeys = {
+FolderMetadataKeys = {
 	// RFC 5464
 	Comment: '/private/comment',
 	CommentShared: '/shared/comment',
@@ -26,28 +39,12 @@ export const FolderMetadataKeys = {
 	// Kolab
 	KolabFolderType: '/private/vendor/kolab/folder-type',
 	KolabFolderTypeShared: '/shared/vendor/kolab/folder-type'
-};
+},
 
 /**
  * @enum {string}
  */
-export const FolderSortMode = {
-	DateDesc: '', // default 'REVERSE DATE'
-	DateAsc: 'DATE',
-	FromDesc: 'REVERSE FROM',
-	FromAsc: 'FROM',
-	SizeDesc: 'REVERSE SIZE',
-	SizeAsc: 'SIZE',
-	SubjectDesc: 'REVERSE SUBJECT',
-	SubjectAsc: 'SUBJECT'
-//	ToDesc: 'REVERSE TO',
-//	ToAsc: 'TO',
-};
-
-/**
- * @enum {string}
- */
-export const ComposeType = {
+ComposeType = {
 	Empty: 0,
 	Reply: 1,
 	ReplyAll: 2,
@@ -55,66 +52,34 @@ export const ComposeType = {
 	ForwardAsAttachment: 4,
 	Draft: 5,
 	EditAsNew: 6
-};
+},
 
 /**
  * @enum {number}
  */
-export const SetSystemFoldersNotification = {
-	None: 0,
-	Sent: 1,
-	Draft: 2,
-	Spam: 3,
-	Trash: 4,
-	Archive: 5
-};
+ClientSideKeyNameExpandedFolders = 3,
+ClientSideKeyNameFolderListSize = 4,
+ClientSideKeyNameMessageListSize = 5,
+ClientSideKeyNameLastSignMe = 7,
+ClientSideKeyNameMessageHeaderFullInfo = 9,
+ClientSideKeyNameMessageAttachmentControls = 10,
 
 /**
  * @enum {number}
  */
-export const
-	ClientSideKeyNameExpandedFolders = 3,
-	ClientSideKeyNameFolderListSize = 4,
-	ClientSideKeyNameMessageListSize = 5,
-	ClientSideKeyNameLastReplyAction = 6,
-	ClientSideKeyNameLastSignMe = 7,
-	ClientSideKeyNameMessageHeaderFullInfo = 9,
-	ClientSideKeyNameMessageAttachmentControls = 10;
-
-/**
- * @enum {number}
- */
-export const MessageSetAction = {
+MessageSetAction = {
 	SetSeen: 0,
 	UnsetSeen: 1,
 	SetFlag: 2,
-	UnsetFlag: 3
-};
+	UnsetFlag: 3,
+	SetDeleted: 4,
+	UnsetDeleted: 5
+},
 
 /**
  * @enum {number}
  */
-export const MessagePriority = {
-	Low: 5,
-	Normal: 3,
-	High: 1
-};
-
-/**
- * @enum {string}
- */
-export const EditorDefaultType = {
-	Html: 'Html',
-	Plain: 'Plain',
-	HtmlForced: 'HtmlForced',
-	PlainForced: 'PlainForced'
-};
-
-/**
- * @enum {number}
- */
-export const Layout = {
-	NoPreview: 0,
-	SidePreview: 1,
-	BottomPreview: 2
-};
+//LayoutNoView = 0,
+LayoutSideView = 1,
+LayoutBottomView = 2
+;
diff --git a/dev/Common/File.js b/dev/Common/File.js
index aab390c4d..38b1f917b 100644
--- a/dev/Common/File.js
+++ b/dev/Common/File.js
@@ -1,7 +1,9 @@
 /* eslint key-spacing: 0 */
 /* eslint quote-props: 0 */
 
-import { arrayLength } from 'Common/Utils';
+import { arrayLength, pInt } from 'Common/Utils';
+
+export const RFC822 = 'message/rfc822';
 
 const
 	cache = {},
@@ -12,8 +14,8 @@ const
 	lowerCase = text => text.toLowerCase().trim(),
 
 	exts = {
-		eml: 'message/rfc822',
-		mime: 'message/rfc822',
+		eml: RFC822,
+		mime: RFC822,
 		vcard: 'text/vcard',
 		vcf: 'text/vcard',
 		htm: 'text/html',
@@ -22,11 +24,14 @@ const
 		ics: 'text/calendar',
 		xml: 'text/xml',
 		json: app+'json',
-		asc: app+'pgp-signature',
+//		asc: app+'pgp-signature',
+//		asc: app+'pgp-keys',
 		p10: app+'pkcs10',
 		p7c: app+'pkcs7-mime',
 		p7m: app+'pkcs7-mime',
 		p7s: app+'pkcs7-signature',
+		p12: app+'pkcs12',
+		pfx: app+'x-pkcs12',
 		torrent: app+'x-bittorrent',
 
 		// scripts
@@ -115,7 +120,8 @@ export const FileType = {
 	Spreadsheet: 'spreadsheet',
 	Presentation: 'presentation',
 	Certificate: 'certificate',
-	Archive: 'archive'
+	Archive: 'archive',
+	Calendar: 'calendar'
 };
 
 export const FileInfo = {
@@ -132,7 +138,7 @@ export const FileInfo = {
 	getContentType: fileName => {
 		fileName = lowerCase(fileName);
 		if ('winmail.dat' === fileName) {
-			return app + 'ms-tnef';
+			return app + 'vnd.ms-tnef';
 		}
 		let ext = fileName.split('.').pop();
 		if (/^(txt|text|def|list|in|ini|log|sql|cfg|conf)$/.test(ext))
@@ -160,7 +166,7 @@ export const FileInfo = {
 	 */
 	getType: (ext, mimeType) => {
 		ext = lowerCase(ext);
-		mimeType = lowerCase(mimeType).replace('csv/plain', 'text/csv');
+		mimeType = lowerCase(mimeType).replace('csv/plain', 'text/csv').replace('x-','');
 
 		let key = ext + mimeType;
 		if (cache[key]) {
@@ -169,7 +175,7 @@ export const FileInfo = {
 
 		let result = FileType.Unknown;
 		const mimeTypeParts = mimeType.split('/'),
-			type = mimeTypeParts[1].replace('x-','').replace('-compressed',''),
+			type = mimeTypeParts[1].replace('-compressed',''),
 			match = str => mimeType.includes(str),
 			archive = /^(zip|7z|tar|rar|gzip|bzip|bzip2)$/;
 
@@ -186,9 +192,12 @@ export const FileInfo = {
 			case ['php', 'js', 'css', 'xml', 'html'].includes(ext) || 'text/html' == mimeType:
 				result = FileType.Code;
 				break;
-			case 'eml' == ext || ['message/delivery-status', 'message/rfc822'].includes(mimeType):
+			case 'eml' == ext || ['message/delivery-status', RFC822].includes(mimeType):
 				result = FileType.Eml;
 				break;
+			case 'ics' == ext || mimeType == 'text/calendar':
+				result = FileType.Calendar;
+				break;
 			case 'text' == mimeTypeParts[0] || 'txt' == ext || 'log' == ext:
 				result = FileType.Text;
 				break;
@@ -198,9 +207,8 @@ export const FileInfo = {
 			case 'pdf' == type || 'pdf' == ext:
 				result = FileType.Pdf;
 				break;
-			case [app+'pgp-signature', app+'pgp-keys'].includes(mimeType)
-				|| ['asc', 'pem', 'ppk'].includes(ext)
-				|| [app+'pkcs7-signature'].includes(mimeType) || 'p7s' == ext:
+			case [app+'pgp-signature', app+'pgp-keys', exts.p7m, exts.p7s, exts.p12, exts.pfx].includes(mimeType)
+				|| ['asc', 'pem', 'ppk', 'p7s', 'p7m', 'p12', 'pfx'].includes(ext):
 				result = FileType.Certificate;
 				break;
 			case match(msOffice+'.wordprocessingml') || match(openDoc+'.text') || match('vnd.ms-word')
@@ -239,6 +247,7 @@ export const FileInfo = {
 			case FileType.Certificate:
 			case FileType.Spreadsheet:
 			case FileType.Presentation:
+			case FileType.Calendar:
 				return result + '-' + fileType;
 		}
 		return result;
@@ -256,7 +265,7 @@ export const FileInfo = {
 				.map(item => item ? FileInfo.getIconClass(FileInfo.getExtension(item.fileName), item.mimeType) : '')
 				.validUnique();
 
-			return (icons && 1 === icons.length && 'icon-file' !== icons[0])
+			return (1 === icons?.length && 'icon-file' !== icons[0])
 				 ? icons[0]
 				 : 'icon-attachment';
 		}
@@ -265,8 +274,8 @@ export const FileInfo = {
 	},
 
 	friendlySize: bytes => {
-		bytes = parseInt(bytes, 10) || 0;
-		let i = Math.floor(Math.log(bytes) / Math.log(1024));
+		bytes = pInt(bytes);
+		let i = bytes ? Math.floor(Math.log(bytes) / Math.log(1024)) : 0;
 		return (bytes / Math.pow(1024, i)).toFixed(2>i ? 0 : 1) + ' ' + sizes[i];
 	}
 
diff --git a/dev/Common/Folders.js b/dev/Common/Folders.js
index 1a9ff9287..a6278201c 100644
--- a/dev/Common/Folders.js
+++ b/dev/Common/Folders.js
@@ -1,24 +1,35 @@
-import { isArray, arrayLength } from 'Common/Utils';
-import {
-	MessageFlagsCache,
-	setFolderHash,
-	getFolderHash,
-	getFolderInboxName,
-	getFolderFromCacheList,
-	getFolderUidNext
-} from 'Common/Cache';
+import { RFC822 } from 'Common/File';
+import { getFolderInboxName, getFolderFromCacheList } from 'Common/Cache';
+import { baseCollator } from 'Common/Translator';
+import { SettingsGet } from 'Common/Globals';
+import { isArray, arrayLength, pInt } from 'Common/Utils';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { getNotification } from 'Common/Translator';
 
 import Remote from 'Remote/User/Fetch';
 
+let refreshInterval,
+	// Default every 15 minutes
+	refreshFoldersInterval = 900000;
+
 export const
 
+setRefreshFoldersInterval = minutes => {
+	refreshFoldersInterval = Math.max(1, pInt(SettingsGet('minRefreshInterval')), pInt(minutes)) * 60000;
+	clearInterval(refreshInterval);
+	refreshInterval = setInterval(() => {
+		const cF = FolderUserStore.currentFolderFullName(),
+			iF = getFolderInboxName();
+		folderInformation(iF);
+		iF === cF || folderInformation(cF);
+		folderInformationMultiply();
+	}, refreshFoldersInterval);
+},
+
 sortFolders = folders => {
 	try {
-		let collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+		let collator = baseCollator(true);
 		folders.sort((a, b) =>
 			a.isInbox() ? -1 : (b.isInbox() ? 1 : collator.compare(a.fullName, b.fullName))
 		);
@@ -27,43 +38,6 @@ sortFolders = folders => {
 	}
 },
 
-/**
- * @param {?Function} fCallback
- * @param {string} folder
- * @param {Array=} list = []
- */
-fetchFolderInformation = (fCallback, folder, list = []) => {
-	let fetch = !arrayLength(list);
-	const uids = [];
-
-	if (!fetch) {
-		list.forEach(messageListItem => {
-			if (!MessageFlagsCache.getFor(messageListItem.folder, messageListItem.uid)) {
-				uids.push(messageListItem.uid);
-			}
-
-			if (messageListItem.threads.length) {
-				messageListItem.threads.forEach(uid => {
-					if (!MessageFlagsCache.getFor(messageListItem.folder, uid)) {
-						uids.push(uid);
-					}
-				});
-			}
-		});
-		fetch = uids.length;
-	}
-
-	if (fetch) {
-		Remote.request('FolderInformation', fCallback, {
-			Folder: folder,
-			FlagsUids: uids,
-			UidNext: getFolderUidNext(folder) // Used to check for new messages
-		});
-	} else if (SettingsUserStore.useThreads()) {
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
-	}
-},
-
 /**
  * @param {Array=} aDisabled
  * @param {Array=} aHeaderLines
@@ -76,15 +50,14 @@ folderListOptionsBuilder = (
 	aDisabled,
 	aHeaderLines,
 	fRenameCallback,
-	fDisableCallback,
-	bNoSelectSelectable,
-	aList = FolderUserStore.folderList()
+	fDisableCallback
 ) => {
 	const
 		aResult = [],
 		sDeepPrefix = '\u00A0\u00A0\u00A0',
 		// FolderSystemPopupView should always be true
 		showUnsubscribed = fRenameCallback ? !SettingsUserStore.hideUnsubscribed() : true,
+		isDisabled = fDisableCallback || (item => !item.selectable() || aDisabled.includes(item.fullName)),
 
 		foldersWalk = folders => {
 			folders.forEach(oItem => {
@@ -95,16 +68,10 @@ folderListOptionsBuilder = (
 							sDeepPrefix.repeat(oItem.deep) +
 							fRenameCallback(oItem),
 						system: false,
-						disabled: !bNoSelectSelectable && (
-							!oItem.selectable() ||
-							aDisabled.includes(oItem.fullName) ||
-							fDisableCallback(oItem))
+						disabled: isDisabled(oItem)
 					});
 				}
-
-				if (oItem.subFolders.length) {
-					foldersWalk(oItem.subFolders());
-				}
+				foldersWalk(oItem.subFolders());
 			});
 		};
 
@@ -122,13 +89,66 @@ folderListOptionsBuilder = (
 		})
 	);
 
-	foldersWalk(aList);
+	foldersWalk(FolderUserStore.folderList());
 
 	return aResult;
 },
 
-// Every 5 minutes
-refreshFoldersInterval = 300000,
+/**
+ * @param {string} folder
+ * @param {Array=} list = []
+ */
+folderInformation = (folder, list) => {
+	if (folder?.trim()) {
+		let count = 1;
+		const uids = [];
+
+		if (arrayLength(list)) {
+			list.forEach(messageListItem => {
+				uids.push(messageListItem.uid);
+				messageListItem.threads.forEach(uid => uids.push(uid));
+			});
+			count = uids.length;
+		}
+
+		if (count) {
+			Remote.request('FolderInformation', (iError, data) => {
+				if (!iError && data.Result) {
+					const result = data.Result,
+						folderFromCache = getFolderFromCacheList(result.name);
+					if (folderFromCache) {
+						const oldHash = folderFromCache.etag,
+							unreadCountChange = (folderFromCache.unreadEmails() !== result.unreadEmails);
+
+//						folderFromCache.revivePropertiesFromJson(result);
+						folderFromCache.expires = Date.now();
+						folderFromCache.uidNext = result.uidNext;
+						folderFromCache.etag = result.etag;
+						folderFromCache.totalEmails(result.totalEmails);
+						folderFromCache.unreadEmails(result.unreadEmails);
+
+						MessagelistUserStore.notifyNewMessages(folderFromCache.fullName, result.newMessages);
+
+						if (!oldHash || unreadCountChange || result.etag !== oldHash) {
+							if (folderFromCache.fullName === FolderUserStore.currentFolderFullName()) {
+								MessagelistUserStore.reload();
+/*
+							} else if (getFolderInboxName() === folderFromCache.fullName) {
+//								Remote.messageList(null, {folder: getFolderFromCacheList(getFolderInboxName())}, true);
+								Remote.messageList(null, {folder: getFolderInboxName()}, true);
+*/
+							}
+						}
+					}
+				}
+			}, {
+				folder: folder,
+				flagsUids: uids,
+				uidNext: getFolderFromCacheList(folder)?.uidNext || 0 // Used to check for new messages
+			});
+		}
+	}
+},
 
 /**
  * @param {boolean=} boot = false
@@ -140,120 +160,52 @@ folderInformationMultiply = (boot = false) => {
 			if (!iError && arrayLength(oData.Result)) {
 				const utc = Date.now();
 				oData.Result.forEach(item => {
-					const hash = getFolderHash(item.Folder),
-						folder = getFolderFromCacheList(item.Folder);
-
+					const folder = getFolderFromCacheList(item.name);
 					if (folder) {
+						const oldHash = folder.etag,
+							unreadCountChange = folder.unreadEmails() !== item.unreadEmails;
+
+//						folder.revivePropertiesFromJson(item);
 						folder.expires = utc;
+						folder.etag = item.etag;
+						folder.totalEmails(item.totalEmails);
+						folder.unreadEmails(item.unreadEmails);
 
-						setFolderHash(item.Folder, item.Hash);
-
-						folder.messageCountAll(item.MessageCount);
-
-						let unreadCountChange = folder.messageCountUnread() !== item.MessageUnseenCount;
-
-						folder.messageCountUnread(item.MessageUnseenCount);
-
-						if (unreadCountChange) {
-							MessageFlagsCache.clearFolder(folder.fullName);
-						}
-
-						if (!hash || item.Hash !== hash) {
+						if (!oldHash || item.etag !== oldHash) {
 							if (folder.fullName === FolderUserStore.currentFolderFullName()) {
 								MessagelistUserStore.reload();
 							}
 						} else if (unreadCountChange
 						 && folder.fullName === FolderUserStore.currentFolderFullName()
 						 && MessagelistUserStore.length) {
-							rl.app.folderInformation(folder.fullName, MessagelistUserStore());
+							folderInformation(folder.fullName, MessagelistUserStore());
 						}
 					}
 				});
 
-				if (boot) {
-					setTimeout(() => folderInformationMultiply(true), 2000);
-				}
+				boot && setTimeout(() => folderInformationMultiply(true), 2000);
 			}
 		}, {
-			Folders: folders
+			folders: folders
 		});
 	}
 },
 
-moveOrDeleteResponseHelper = (iError, oData) => {
-	if (iError) {
-		setFolderHash(FolderUserStore.currentFolderFullName(), '');
-		alert(getNotification(iError));
-	} else if (FolderUserStore.currentFolder()) {
-		if (2 === arrayLength(oData.Result)) {
-			setFolderHash(oData.Result[0], oData.Result[1]);
+dropFilesInFolder = (sFolderFullName, files) => {
+	let count = files.length;
+	for (const file of files) {
+		if (RFC822 === file.type) {
+			let data = new FormData;
+			data.append('folder', sFolderFullName);
+			data.append('appendFile', file);
+			Remote.request('FolderAppend', (iError, data)=>{
+				iError && console.error(data.message);
+				0 == --count
+				&& FolderUserStore.currentFolderFullName() == sFolderFullName
+				&& MessagelistUserStore.reload(true, true);
+			}, data);
 		} else {
-			setFolderHash(FolderUserStore.currentFolderFullName(), '');
-		}
-		MessagelistUserStore.reload(!MessagelistUserStore.length);
-	}
-},
-
-messagesMoveHelper = (fromFolderFullName, toFolderFullName, uidsForMove) => {
-	const
-		sSpamFolder = FolderUserStore.spamFolder(),
-		isSpam = sSpamFolder === toFolderFullName,
-		isHam = !isSpam && sSpamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName;
-
-	Remote.request('MessageMove',
-		moveOrDeleteResponseHelper,
-		{
-			FromFolder: fromFolderFullName,
-			ToFolder: toFolderFullName,
-			Uids: uidsForMove.join(','),
-			MarkAsRead: (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0,
-			Learning: isSpam ? 'SPAM' : isHam ? 'HAM' : ''
-		},
-		null,
-		'',
-		['MessageList']
-	);
-},
-
-messagesDeleteHelper = (sFromFolderFullName, aUidForRemove) => {
-	Remote.request('MessageDelete',
-		moveOrDeleteResponseHelper,
-		{
-			Folder: sFromFolderFullName,
-			Uids: aUidForRemove.join(',')
-		},
-		null,
-		'',
-		['MessageList']
-	);
-},
-
-/**
- * @param {string} sFromFolderFullName
- * @param {Array} aUidForMove
- * @param {string} sToFolderFullName
- * @param {boolean=} bCopy = false
- */
-moveMessagesToFolder = (sFromFolderFullName, aUidForMove, sToFolderFullName, bCopy) => {
-	if (sFromFolderFullName !== sToFolderFullName && arrayLength(aUidForMove)) {
-		const oFromFolder = getFolderFromCacheList(sFromFolderFullName),
-			oToFolder = getFolderFromCacheList(sToFolderFullName);
-
-		if (oFromFolder && oToFolder) {
-			if (bCopy) {
-				Remote.request('MessageCopy', null, {
-					FromFolder: oFromFolder.fullName,
-					ToFolder: oToFolder.fullName,
-					Uids: aUidForMove.join(',')
-				});
-			} else {
-				messagesMoveHelper(oFromFolder.fullName, oToFolder.fullName, aUidForMove);
-			}
-
-			MessagelistUserStore.removeMessagesFromList(oFromFolder.fullName, aUidForMove, oToFolder.fullName, bCopy);
-			return true;
+			--count;
 		}
 	}
-
-	return false;
 };
diff --git a/dev/Common/Fullscreen.js b/dev/Common/Fullscreen.js
index dc7e42fb5..77cf0b599 100644
--- a/dev/Common/Fullscreen.js
+++ b/dev/Common/Fullscreen.js
@@ -1,20 +1,19 @@
-import { doc, elementById, $htmlCL } from 'Common/Globals';
+import { doc, appEl, $htmlCL } from 'Common/Globals';
 
 // Fullscreen must be on app, else other popups fail
 export const
-	app = elementById('rl-app'),
-	appFullscreen = () => (doc.fullscreenElement || doc.webkitFullscreenElement) === app,
+	appFullscreen = () => (doc.fullscreenElement || doc.webkitFullscreenElement) === appEl,
 	exitFullscreen = () => appFullscreen() && (doc.exitFullscreen || doc.webkitExitFullscreen).call(doc),
 	isFullscreen = ko.observable(false),
-	toggleFullscreen = () => isFullscreen() ? exitFullscreen() : app.requestFullscreen();
+	toggleFullscreen = () => isFullscreen() ? exitFullscreen() : appEl.requestFullscreen();
 
-if (app) {
+if (appEl) {
 	let event = 'fullscreenchange';
-	if (!app.requestFullscreen && app.webkitRequestFullscreen) {
-		app.requestFullscreen = app.webkitRequestFullscreen;
+	if (!appEl.requestFullscreen && appEl.webkitRequestFullscreen) {
+		appEl.requestFullscreen = appEl.webkitRequestFullscreen;
 		event = 'webkit'+event;
 	}
-	if (app.requestFullscreen) {
+	if (appEl.requestFullscreen) {
 		doc.addEventListener(event, () => {
 			isFullscreen(appFullscreen());
 			$htmlCL.toggle('rl-fullscreen', appFullscreen());
diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index e260e79ea..105660c31 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -11,15 +11,18 @@ export const
 
 	elementById = id => doc.getElementById(id),
 
+	appEl = elementById('rl-app'),
+
 	Settings = rl.settings,
 	SettingsGet = Settings.get,
-	SettingsCapa = Settings.capa,
+	SettingsAdmin = name => (SettingsGet('Admin') || {})[name],
+	SettingsCapa = name => name && !!(SettingsGet('Capa') || {})[name],
 
 	dropdowns = [],
 	dropdownVisibility = ko.observable(false).extend({ rateLimit: 0 }),
 
-	moveAction = ko.observable(false),
 	leftPanelDisabled = ko.observable(false),
+	toggleLeftPanel = () => leftPanelDisabled(!leftPanelDisabled()),
 
 	createElement = (name, attr) => {
 		let el = doc.createElement(name);
@@ -27,9 +30,16 @@ export const
 		return el;
 	},
 
-	fireEvent = (name, detail) => dispatchEvent(new CustomEvent(name, {detail:detail})),
+	fireEvent = (name, detail, cancelable) => dispatchEvent(
+		new CustomEvent(name, {detail:detail, cancelable: !!cancelable})
+	),
 
-	formFieldFocused = () => doc.activeElement && doc.activeElement.matches('input,textarea'),
+	stopEvent = event => {
+		event.preventDefault();
+		event.stopPropagation();
+	},
+
+	formFieldFocused = () => doc.activeElement?.matches('input,textarea'),
 
 	addShortcut = (...args) => shortcuts.add(...args),
 
@@ -66,10 +76,4 @@ dropdownVisibility.subscribe(value => {
 	}
 });
 
-leftPanelDisabled.toggle = () => leftPanelDisabled(!leftPanelDisabled());
-leftPanelDisabled.subscribe(value => {
-	value && moveAction() && moveAction(false);
-	$htmlCL.toggle('rl-left-panel-disabled', value);
-});
-
-moveAction.subscribe(value => value && leftPanelDisabled() && leftPanelDisabled(false));
+leftPanelDisabled.subscribe(value => $htmlCL.toggle('rl-left-panel-disabled', value));
diff --git a/dev/Common/Html.js b/dev/Common/Html.js
index 2a5b53b8a..d495a8c31 100644
--- a/dev/Common/Html.js
+++ b/dev/Common/Html.js
@@ -1,10 +1,14 @@
-import { createElement, SettingsGet } from 'Common/Globals';
-import { forEachObjectEntry, pInt } from 'Common/Utils';
-import { proxy } from 'Common/Links';
+import { createElement } from 'Common/Globals';
+import { forEachObjectEntry, isArray, pInt } from 'Common/Utils';
+import { SettingsUserStore } from 'Stores/User/Settings';
 
 const
-	tpl = createElement('template'),
+	tmpl = createElement('template'),
+
+	turndown = new TurndownService(),
+
 	htmlre = /[&<>"']/g,
+	httpre = /^(https?:)?\/\//i,
 	htmlmap = {
 		'&': '&amp;',
 		'<': '&lt;',
@@ -13,13 +17,200 @@ const
 		"'": '&#x27;'
 	},
 
+	keepTagContent = 'form,button,data', // font
+
+	allowedTags = [
+		// Structural Elements:
+		'blockquote','br','div','figcaption','figure','h1','h2','h3','h4','h5','h6','hgroup','hr','p','wbr',
+		'article','aside','header','footer','main','section',
+		'details','summary','nav',
+		// List Elements
+		'dd','dl','dt','li','ol','ul',
+		// Text Formatting Elements
+		'a','abbr','address','b','bdi','bdo','cite','code','del','dfn',
+		'em','i','ins','kbd','mark','pre','q','rp','rt','ruby','s','samp','small',
+		'span','strong','sub','sup','time','u','var',
+		// Deprecated by HTML Standard
+		'acronym','big','center','dir','font','marquee',
+		'nobr','plaintext','rb','rtc','strike','tt',
+		// Media Elements
+		'img',//'picture','source',
+		// Table Elements
+		'caption','col','colgroup','table','tbody','td','tfoot','th','thead','tr',
+		// Disallowed but converted later
+		'style','xmp'
+	].join(','),
+
+	nonEmptyTags = [
+		'A','B','EM','I','SPAN','STRONG'
+	],
+
+	blockquoteSwitcher = () => {
+		SettingsUserStore.collapseBlockquotes() &&
+//		tmpl.content.querySelectorAll('blockquote').forEach(node => {
+		[...tmpl.content.querySelectorAll('blockquote')].reverse().forEach(node => {
+			const el = createElement('details', {class:'sm-bq-switcher'});
+			el.innerHTML = '<summary>•••</summary>';
+			node.replaceWith(el);
+			el.append(node);
+		});
+	},
+
 	replaceWithChildren = node => node.replaceWith(...[...node.childNodes]),
 
+	urlRegExp = /https?:\/\/[^\p{C}\p{Z}]+[^\p{C}\p{Z}.]/gu,
+	// eslint-disable-next-line max-len
+	email = /(^|\r|\n|\p{C}\p{Z})((?:[^"(),.:;<>@[\]\\\p{C}\p{Z}]+(?:\.[^"(),.:;<>@[\]\\\p{C}\p{Z}]+)*|"(?:\\?[^"\\\p{C}\p{Z}])*")@[^@\p{C}\p{Z}]+[^@\p{C}\p{Z}.])/gui,
+	// rfc3966
+	tel = /(tel:(\+[0-9().-]+|[0-9*#().-]+(;phone-context=\+[0-9+().-]+)?))/g,
+
 	// Strip tracking
-	stripTracking = text => text
-		.replace(/^.+awstrack\.me\/.+(https:%2F%2F[^/]+)/gsi, (...m) => decodeURIComponent(m[1]))
-		.replace(/([?&])utm_[a-z]+=[^&?#]*/gsi, '$1')
-		.replace(/&&+/, '');
+	/** TODO: implement other url strippers like from
+	 * https://www.bleepingcomputer.com/news/security/new-firefox-privacy-feature-strips-urls-of-tracking-parameters/
+	 * https://github.com/newhouse/url-tracking-stripper
+	 * https://github.com/svenjacobs/leon
+	 * https://maxchadwick.xyz/tracking-query-params-registry/
+	 * https://github.com/M66B/FairEmail/blob/master/app/src/main/java/eu/faircode/email/UriHelper.java
+	 */
+	// eslint-disable-next-line max-len
+	stripParams = /^(utm_|ec_|fbclid|mc_eid|mkt_tok|_hsenc|vero_id|oly_enc_id|oly_anon_id|__s|Referrer|mailing|elq|bch|trc|ref|correlation_id|pd_|pf_|email_hash)$/i,
+	urlGetParam = (url, name) => new URL(url).searchParams.get(name) || url,
+	base64Url = data => atob(data.replace(/_/g,'/').replace(/-/g,'+')),
+	decode = decodeURIComponent,
+	stripTracking = url => {
+		try {
+			let nurl = url
+				// Copernica
+				.replace(/^.+\/(https%253A[^/?&]+).*$/i, (...m) => decode(decode(m[1])))
+				.replace(/tracking\.(printabout\.nl[^?]+)\?.*/i, (...m) => m[1])
+				.replace(/(zalando\.nl[^?]+)\?.*/i, (...m) => m[1])
+				.replace(/^.+(awstrack\.me|redditmail\.com)\/.+(https:%2F%2F[^/]+).*/i, (...m) => decode(m[2]))
+				.replace(/^.+(www\.google|safelinks\.protection\.outlook\.com|mailchimp\.com).+url=.+$/i,
+					() => urlGetParam(url, 'url'))
+				.replace(/^.+click\.godaddy\.com.+$/i, () => urlGetParam(url, 'redir'))
+				.replace(/^.+delivery-status\.com.+$/i, () => urlGetParam(url, 'fb'))
+				.replace(/^.+go\.dhlparcel\.nl.+\/([A-Za-z0-9_-]+)$/i, (...m) => base64Url(m[1]))
+				.replace(/^(.+mopinion\.com.+)\?.*$/i, (...m) => m[1])
+				.replace(/^.+sellercentral\.amazon\.com\/nms\/redirect.+$/i, () => base64Url(urlGetParam(url, 'u')))
+				.replace(/^.+amazon\.com\/gp\/r\.html.+$/i, () => urlGetParam(url, 'U'))
+				// Mandrill
+				.replace(/^.+\/track\/click\/.+\?p=.+$/i, () => {
+					let d = urlGetParam(url, 'p');
+					try {
+						d = JSON.parse(base64Url(d));
+						if (d?.p) {
+							d = JSON.parse(d.p);
+						}
+					} catch (e) {
+						console.error(e);
+					}
+					return d?.url || url;
+				})
+				// Remove invalid URL characters
+				.replace(/[\s<>]+/gi, '');
+			nurl = new URL(nurl);
+			let s = nurl.searchParams;
+			[...s.keys()].forEach(key => stripParams.test(key) && s.delete(key));
+			return nurl.toString();
+		} catch (e) {
+			console.dir({
+				error:e,
+				url:url
+			});
+		}
+		return url;
+	},
+
+	cleanCSS = source =>
+		source.trim()
+			.replace(/;\s*-[^;]+/g, '')
+			.replace(/^\s*-[^;]+(;|$)/g, '')
+			.replace(/white-space[^;]+/g, '')
+			// Drop Microsoft Office style properties
+//			.replace(/mso-[^:;]+:[^;]+/gi, '')
+	,
+
+	/*
+		Parses given css string, and returns css object
+		keys as selectors and values are css rules
+		eliminates all css comments before parsing
+
+		@param source css string to be parsed
+
+		@return object css
+	*/
+	parseCSS = source => {
+		const css = [];
+		css.toString = () => css.reduce(
+			(ret, tmp) =>
+				ret + tmp.selector + ' {\n'
+					+ (tmp.type === 'media' ? tmp.subStyles.toString() : tmp.rules)
+					+ '}\n'
+			,
+			''
+		);
+		/**
+		 * Given css array, parses it and then for every selector,
+		 * prepends namespace to prevent css collision issues
+		 */
+		css.applyNamespace = namespace => css.forEach(obj => {
+			if (obj.type === 'media') {
+				obj.subStyles.applyNamespace(namespace);
+			} else {
+				obj.selector = obj.selector.split(',').map(selector =>
+					(namespace + ' .mail-body ' + selector.replace(/\./g, '.msg-'))
+					.replace(/\sbody/gi, '')
+				).join(',');
+			}
+		});
+
+		if (source) {
+			source = source
+				// strip comments
+				.replace(/\/\*[\s\S]*?\*\//gi, '')
+				// strip MS Word comments
+				.replace(/<!--[\s\S]*?-->/gi, '')
+				// strip HTML, as < is no CSS combinator anyway
+				.replace(/<[\s\S]*/gi, '');
+//				.replace(/<\/?[a-z][\s\S]*?>/gi, '');
+
+			// unified regex to match css & media queries together
+			let unified = /(?:(\s*?@(?:media)[\s\S]*?){([\s\S]*?)}\s*?})|(?:([\s\S]*?){([\s\S]*?)})/gi,
+				arr;
+
+			while (true) {
+				arr = unified.exec(source);
+				if (arr === null) {
+					break;
+				}
+
+				let selector = arr[arr[2] === undefined ? 3 : 1].split('\r\n').join('\n').trim()
+					// Never have more than a single line break in a row
+					.replace(/\n+/, "\n")
+					// Remove :root and html
+					.split(/\s+/g).map(item => item.replace(/^(:root|html)$/, '')).join(' ').trim();
+
+				// determine the type
+				if (selector.includes('@media')) {
+					// we have a media query
+					css.push({
+						selector: selector,
+						type: 'media',
+						subStyles: parseCSS(arr[2] + '\n}') //recursively parse media query inner css
+					});
+				} else if (selector && !selector.includes('@')) {
+					// we have standard css
+					// ignores @import, @keyframe, @font-face statements
+					css.push({
+						selector: selector,
+						rules: cleanCSS(arr[4])
+					});
+				}
+			}
+		}
+
+		return css;
+	};
 
 export const
 
@@ -27,32 +218,39 @@ export const
 	 * @param {string} text
 	 * @returns {string}
 	 */
-	encodeHtml = text => (text && text.toString ? text.toString() : '' + text).replace(htmlre, m => htmlmap[m]),
+	encodeHtml = text => (text?.toString?.() || '' + text).replace(htmlre, m => htmlmap[m]),
 
 	/**
 	 * Clears the Message Html for viewing
 	 * @param {string} text
 	 * @returns {string}
 	 */
-	cleanHtml = (html, contentLocationUrls, removeColors) => {
+	cleanHtml = (html, oAttachments, msgId) => {
+		let aColor;
 		const
 			debug = false, // Config()->Get('debug', 'enable', false);
-			useProxy = !!SettingsGet('UseLocalProxyForExternalImages'),
 			detectHiddenImages = true, // !!SettingsGet('try_to_detect_hidden_images'),
 
+			bqLevel = parseInt(SettingsUserStore.maxBlockquotesLevel()),
+			minFontSize = parseInt(SettingsUserStore.minFontSize()),
+
 			result = {
 				hasExternals: false,
-				foundCIDs: [],
-				foundContentLocationUrls: []
+				tracking: false,
+				linkedData: []
+			},
+
+			isMsg = !!msgId,
+
+			findAttachmentByCid = cId => oAttachments.findByCid(cId),
+			findLocationByCid = cId => {
+				const attachment = findAttachmentByCid(cId);
+				return attachment?.contentLocation ? attachment : 0;
 			},
 
 			// convert body attributes to CSS
 			tasks = {
-				link: value => {
-					if (/^#[a-fA-Z0-9]{3,6}$/.test(value)) {
-						tpl.content.querySelectorAll('a').forEach(node => node.style.color = value)
-					}
-				},
+				link: value => aColor = value,
 				text: (value, node) => node.style.color = value,
 				topmargin: (value, node) => node.style.marginTop = pInt(value) + 'px',
 				leftmargin: (value, node) => node.style.marginLeft = pInt(value) + 'px',
@@ -60,6 +258,15 @@ export const
 				rightmargin: (value, node) => node.style.marginRight = pInt(value) + 'px'
 			},
 			allowedAttributes = [
+				// SnappyMail
+//				'data-x-href-broken',
+//				'data-x-href-tracking',
+				'data-x-src',
+//				'data-x-src-hidden',
+//				'data-x-src-tracking',
+//				'data-x-src-broken',
+//				'data-x-style-url',
+//				'data-x-style-broken-urls',
 				// defaults
 				'name',
 				'dir', 'lang', 'style', 'title',
@@ -87,85 +294,147 @@ export const
 				'abbr', 'scope',
 				// td
 				'colspan', 'rowspan', 'headers'
-			],
-			disallowedTags = [
-				'HEAD','STYLE','SVG','SCRIPT','TITLE','LINK','BASE','META',
-				'INPUT','OUTPUT','SELECT','BUTTON','TEXTAREA',
-				'BGSOUND','KEYGEN','SOURCE','OBJECT','EMBED','APPLET','IFRAME','FRAME','FRAMESET','VIDEO','AUDIO','AREA','MAP'
-			],
-			nonEmptyTags = [
-				'A','B','EM','I','SPAN','STRONG','O:P','TABLE'
+				// others
+				//'class', 'id', 'target'
 			];
 
-		tpl.innerHTML = html
+		if (SettingsUserStore.allowStyles()) {
+			allowedAttributes.push('class');
+		} else {
+			msgId = 0;
+		}
+
+		tmpl.innerHTML = html
 //			.replace(/<pre[^>]*>[\s\S]*?<\/pre>/gi, pre => pre.replace(/\n/g, '\n<br>'))
-			.replace(/<!doctype[^>]*>/gi, '')
-			.replace(/<\?xml[^>]*\?>/gi, '')
 			// Not supported by <template> element
-			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div class="mail-body"$2>')
-			.replace(/<\/?(html|head)[^>]*>/gi, '')
+//			.replace(/<!doctype[^>]*>/gi, '')
+//			.replace(/<\?xml[^>]*\?>/gi, '')
+			// https://github.com/the-djmaze/snappymail/issues/1860
+			.replace(/<(\/?)x-html(\s[^>]*)?>/gi, '')
+			.replace(/<(\/?)head(\s[^>]*)?>/gi, '')
+			.replace(/<body(\s[^>]*)?>/i, '<div class="mail-body"$1>')
+			.replace(/<(\/?)body(\s[^>]*)?>/gi, '<$1div$2>')
+//			.replace(/<\/?(html|head)[^>]*>/gi, '')
+			// Fix Reddit https://github.com/the-djmaze/snappymail/issues/540
+			.replace(/<span class="preview-text"[\s\S]+?<\/span>/, '')
+			// https://github.com/the-djmaze/snappymail/issues/900
+			.replace(/\u2028/g,' ')
+			// https://github.com/the-djmaze/snappymail/issues/1415
+			.replace(/<br>\s*<\/p>/gi,'</p>')
 			.trim();
 		html = '';
 
-		// \MailSo\Base\HtmlUtils::ClearComments()
-		// https://github.com/the-djmaze/snappymail/issues/187
-		const nodeIterator = document.createNodeIterator(tpl.content, NodeFilter.SHOW_COMMENT);
+		// Strip all comments
+		const nodeIterator = document.createNodeIterator(tmpl.content, NodeFilter.SHOW_COMMENT);
 		while (nodeIterator.nextNode()) {
 			nodeIterator.referenceNode.remove();
 		}
 
-		tpl.content.querySelectorAll('*').forEach(oElement => {
+		/**
+		 * Basic support for Linked Data (Structured Email)
+		 * https://json-ld.org/
+		 * https://structured.email/
+		 **/
+		tmpl.content.querySelectorAll('script[type="application/ld+json"]').forEach(oElement => {
+			// Could be array of objects or single object
+			try {
+				const data = JSON.parse(oElement.textContent);
+				(isArray(data) ? data : [data]).forEach(entry => result.linkedData.push(entry));
+			} catch (e) {
+				console.error(e, oElement.textContent);
+			}
+		});
+
+		// https://github.com/the-djmaze/snappymail/issues/1125
+		tmpl.content.querySelectorAll(keepTagContent).forEach(oElement => replaceWithChildren(oElement));
+
+		tmpl.content.querySelectorAll(
+			':not('+allowedTags+'),a:empty,span:empty'
+			+ (0 < bqLevel ? ',' + (new Array(1 + bqLevel).fill('blockquote').join(' ')) : '')
+		).forEach(oElement => oElement.remove());
+/*		// Is this slower or faster?
+		).forEach(oElement => {
+			if (!node || !node.contains(oElement)) {
+				oElement.remove();
+				node = oElement;
+			}
+		});
+*/
+
+		// https://github.com/the-djmaze/snappymail/issues/1641
+		let body = tmpl.content.querySelector('.mail-body');
+		[...tmpl.content.querySelectorAll('.mail-body + .mail-body')]
+			.forEach(oElement => body.append(...oElement.childNodes));
+/*
+			.forEach(oElement => {
+				let bq = createElement('blockquote');
+				bq.append(...oElement.childNodes);
+				body.replaceWith(bq);
+			});
+*/
+
+		[...tmpl.content.querySelectorAll('*')].forEach(oElement => {
 			const name = oElement.tagName,
 				oStyle = oElement.style;
 
+			if ('STYLE' === name) {
+				let css = msgId ? parseCSS(oElement.textContent) : [];
+				if (css.length) {
+					css.applyNamespace(msgId);
+					css = css.toString();
+					if (SettingsUserStore.removeColors()) {
+						css = css.replace(/(background-)?color:[^};]+;?/g, '');
+					}
+					oElement.textContent = css;
+				} else {
+					oElement.remove();
+				}
+				return;
+			}
+
+			if ('XMP' === name) {
+				const pre = createElement('pre');
+				pre.innerHTML = encodeHtml(oElement.innerHTML);
+				oElement.replaceWith(pre);
+				return;
+			}
+
 			// \MailSo\Base\HtmlUtils::ClearTags()
-			if (disallowedTags.includes(name)
-			 || 'none' == oStyle.display
+			if ('none' == oStyle.display
 			 || 'hidden' == oStyle.visibility
 //			 || (oStyle.lineHeight && 1 > parseFloat(oStyle.lineHeight)
 //			 || (oStyle.maxHeight && 1 > parseFloat(oStyle.maxHeight)
 //			 || (oStyle.maxWidth && 1 > parseFloat(oStyle.maxWidth)
 //			 || ('0' === oStyle.opacity
-			 || (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim() && !oElement.querySelector('img')))
 			) {
 				oElement.remove();
 				return;
 			}
-//			if (['CENTER','FORM'].includes(name)) {
-			if ('FORM' === name || 'O:P' === name) {
-				replaceWithChildren(oElement);
-				return;
-			}
-/*
-			// Idea to allow CSS
-			if ('STYLE' === name) {
-				msgId = '#rl-msg-061eb4d647771be4185943ce91f0039d';
-				oElement.textContent = oElement.textContent
-					.replace(/[^{}]+{/g, m => msgId + ' ' + m.replace(',', ', '+msgId+' '))
-					.replace(/(background-)color:[^};]+/g, '');
-				return;
-			}
-*/
+
 			const aAttrsForRemove = [],
+				className = oElement.className,
 				hasAttribute = name => oElement.hasAttribute(name),
 				getAttribute = name => hasAttribute(name) ? oElement.getAttribute(name).trim() : '',
 				setAttribute = (name, value) => oElement.setAttribute(name, value),
-				delAttribute = name => oElement.removeAttribute(name);
+				delAttribute = name => {
+					let value = getAttribute(name);
+					oElement.removeAttribute(name);
+					return value;
+				};
 
-			if ('mail-body' === oElement.className) {
-				forEachObjectEntry(tasks, (name, cb) => {
-					if (hasAttribute(name)) {
-						cb(getAttribute(name), oElement);
-						delAttribute(name);
-					}
-				});
+			if ('mail-body' === className) {
+				forEachObjectEntry(tasks, (name, cb) =>
+					hasAttribute(name) && cb(delAttribute(name), oElement)
+				);
+			} else if (msgId && className) {
+				oElement.className = className.replace(/(^|\s+)/g, '$1msg-');
 			}
 
 			if (oElement.hasAttributes()) {
 				let i = oElement.attributes.length;
 				while (i--) {
 					let sAttrName = oElement.attributes[i].name.toLowerCase();
-					if (!allowedAttributes.includes(sAttrName)) {
+					if (!allowedAttributes.includes(sAttrName) && ('class' !== sAttrName || 'mail-body' !== className)) {
 						delAttribute(sAttrName);
 						aAttrsForRemove.push(sAttrName);
 					}
@@ -174,29 +443,51 @@ export const
 
 			let value;
 
-			if ('TABLE' === name) {
-				if (hasAttribute('width')) {
-					oStyle.width = getAttribute('width');
-					delAttribute('width');
-				}
-				value = oStyle.width;
-				if (value && !value.includes('%')) {
-					oStyle.maxWidth = value;
-					oStyle.width = '100%';
+//			if ('TABLE' === name || 'TD' === name || 'TH' === name) {
+			if (!oStyle.backgroundImage) {
+				if ('TD' !== name && 'TH' !== name) {
+					['width','height'].forEach(key => {
+						if (hasAttribute(key)) {
+							value = delAttribute(key);
+							oStyle[key] || (oStyle[key] = value.includes('%') ? value : value + 'px');
+						}
+					});
+					// Make width responsive
+					value = oStyle.width;
+					if (100 < parseInt(value,10) && !oStyle.maxWidth) {
+						oStyle.maxWidth = value;
+						oStyle.width = '100%';
+					}
+					// Make height responsive
+					value = oStyle.removeProperty('height');
+					if (value && !oStyle.maxHeight) {
+						oStyle.maxHeight = value;
+					}
 				}
 			}
-
-			else if ('A' === name) {
+//			} else
+			if ('A' === name) {
 				value = oElement.href;
 				if (!/^([a-z]+):/i.test(value)) {
-					setAttribute('data-x-broken-href', value);
+					setAttribute('data-x-href-broken', value);
 					delAttribute('href');
 				} else {
 					oElement.href = stripTracking(value);
+					if (oElement.href != value) {
+						result.tracking = true;
+						setAttribute('data-x-href-tracking', value);
+					}
 					setAttribute('target', '_blank');
-					setAttribute('rel', 'external nofollow noopener noreferrer');
+//					setAttribute('rel', 'external nofollow noopener noreferrer');
 				}
 				setAttribute('tabindex', '-1');
+				aColor && !oElement.style.color && (oElement.style.color = aColor);
+			}
+
+//			if (['CENTER','FORM'].includes(name)) {
+			if (nonEmptyTags.includes(name) && ('' == oElement.textContent.trim())) {
+				('A' !== name || !oElement.querySelector('IMG')) && replaceWithChildren(oElement);
+				return;
 			}
 
 			// SVG xlink:href
@@ -207,63 +498,85 @@ export const
 			*/
 
 			let skipStyle = false;
-			if (hasAttribute('src')) {
-				value = getAttribute('src');
-				delAttribute('src');
-
-				if (detectHiddenImages
-					&& 'IMG' === name
-					&& (('' != getAttribute('height') && 3 > pInt(getAttribute('height')))
-						|| ('' != getAttribute('width') && 3 > pInt(getAttribute('width')))
-						|| [
-							'email.microsoftemail.com/open',
-							'github.com/notifications/beacon/',
-							'mandrillapp.com/track/open',
-							'list-manage.com/track/open'
-						].filter(uri => value.toLowerCase().includes(uri)).length
-				)) {
-					skipStyle = true;
-					setAttribute('style', 'display:none');
-					setAttribute('data-x-hidden-src', value);
-				}
-				else if (contentLocationUrls[value])
-				{
-					setAttribute('data-x-src-location', value);
-					result.foundContentLocationUrls.push(value);
-				}
-				else if ('cid:' === value.slice(0, 4))
-				{
-					setAttribute('data-x-src-cid', value.slice(4));
-					result.foundCIDs.push(value.slice(4));
-				}
-				else if (/^(https?:)?\/\//i.test(value))
-				{
-					setAttribute('data-x-src', useProxy ? proxy(value) : value);
-					result.hasExternals = true;
-				}
-				else if ('data:image/' === value.slice(0, 11))
-				{
-					setAttribute('src', value);
-				}
-				else
-				{
-					setAttribute('data-x-broken-src', value);
+			if (isMsg) {
+				value = isMsg && delAttribute('src');
+				if (value) {
+					if ('IMG' === name) {
+						oElement.loading = 'lazy';
+						let attachment;
+						if (value.startsWith('cid:'))
+						{
+							setAttribute('data-x-src', value);
+							value = value.slice(4);
+							attachment = findAttachmentByCid(value);
+							if (attachment?.download) {
+								oElement.src = attachment.linkPreview();
+//								oElement.title || (oElement.title = '+attachment.fileName);
+								attachment.isInline(true);
+								attachment.isLinked(true);
+							}
+						}
+						else if ((attachment = findLocationByCid(value)))
+						{
+							if (attachment.download) {
+								oElement.src = attachment.linkPreview();
+								attachment.isLinked(true);
+							}
+						}
+						else if (detectHiddenImages
+							&& ((oStyle.maxHeight && 3 > pInt(oStyle.maxHeight)) // TODO: issue with 'in'
+								|| (oStyle.maxWidth && 3 > pInt(oStyle.maxWidth)) // TODO: issue with 'in'
+								|| (oStyle.width && 2 > pInt(oStyle.width))
+								|| [
+									'email.microsoftemail.com/open',
+									'github.com/notifications/beacon/',
+									'/track/open', // mandrillapp.com list-manage.com
+									'google-analytics.com'
+								].filter(uri => value.toLowerCase().includes(uri)).length
+						)) {
+							skipStyle = true;
+							oStyle.display = 'none';
+	//						setAttribute('style', 'display:none');
+							setAttribute('data-x-src-hidden', value);
+	//						result.tracking = true;
+						}
+						else if (httpre.test(value))
+						{
+							let src = stripTracking(value);
+							if (src != value) {
+								result.tracking = true;
+								setAttribute('data-x-src-tracking', value);
+							}
+							setAttribute('data-x-src', src);
+							result.hasExternals = true;
+							oElement.alt || (oElement.alt = src.replace(/^.+\/([^/?]+).*$/, '$1').slice(-20));
+						}
+						else if (value.startsWith('data:image/'))
+						{
+							oElement.src = value;
+						}
+						else
+						{
+							setAttribute('data-x-src-broken', value);
+						}
+					}
+					else
+					{
+						setAttribute('data-x-src-broken', value);
+					}
 				}
 			}
 
 			if (hasAttribute('background')) {
-				oStyle.backgroundImage = 'url("' + getAttribute('background') + '")';
-				delAttribute('background');
+				oStyle.backgroundImage = 'url("' + delAttribute('background') + '")';
 			}
 
 			if (hasAttribute('bgcolor')) {
-				oStyle.backgroundColor = getAttribute('bgcolor');
-				delAttribute('bgcolor');
+				oStyle.backgroundColor = delAttribute('bgcolor');
 			}
 
 			if (hasAttribute('color')) {
-				oStyle.color = getAttribute('color');
-				delAttribute('color');
+				oStyle.color = delAttribute('color');
 			}
 
 			if (!skipStyle) {
@@ -276,30 +589,31 @@ export const
 				oStyle.removeProperty('cursor');
 				oStyle.removeProperty('min-width');
 
-				const urls = {
-					cid: [],    // 'data-x-style-cid'
-					remote: [], // 'data-x-style-url'
-					broken: []  // 'data-x-broken-style-src'
-				};
+				const
+					urls_remote = [], // 'data-x-style-url'
+					urls_broken = []; // 'data-x-broken-style-src'
 				['backgroundImage', 'listStyleImage', 'content'].forEach(property => {
 					if (oStyle[property]) {
 						let value = oStyle[property],
-							found = value.match(/url\s*\(([^)]+)\)/gi);
+							found = value.match(/url\s*\(([^)]+)\)/i);
 						if (found) {
 							oStyle[property] = null;
-							found = found[0].replace(/^["'\s]+|["'\s]+$/g, '');
+							found = found[1].replace(/^["'\s]+|["'\s]+$/g, '');
 							let lowerUrl = found.toLowerCase();
-							if ('cid:' === lowerUrl.slice(0, 4)) {
-								found = found.slice(4);
-								urls.cid[property] = found
-								result.foundCIDs.push(found);
-							} else if (/http[s]?:\/\//.test(lowerUrl) || '//' === found.slice(0, 2)) {
+							if (lowerUrl.startsWith('cid:')) {
+								const attachment = findAttachmentByCid(found);
+								if (attachment?.linkPreview && name) {
+									oStyle[property] = "url('" + attachment.linkPreview() + "')";
+									attachment.isInline(true);
+									attachment.isLinked(true);
+								}
+							} else if (httpre.test(lowerUrl)) {
 								result.hasExternals = true;
-								urls.remote[property] = useProxy ? proxy(found) : found;
-							} else if ('data:image/' === lowerUrl.slice(0, 11)) {
+								urls_remote.push([property, found]);
+							} else if (lowerUrl.startsWith('data:image/')) {
 								oStyle[property] = value;
 							} else {
-								urls.broken[property] = found;
+								urls_broken.push([property, found]);
 							}
 						}
 					}
@@ -307,31 +621,30 @@ export const
 //				oStyle.removeProperty('background-image');
 //				oStyle.removeProperty('list-style-image');
 
-				if (urls.cid.length) {
-					setAttribute('data-x-style-cid', JSON.stringify(urls.cid));
+				if (urls_remote.length) {
+					setAttribute('data-x-style-url', JSON.stringify(urls_remote));
 				}
-				if (urls.remote.length) {
-					setAttribute('data-x-style-url', JSON.stringify(urls.remote));
-				}
-				if (urls.broken.length) {
-					setAttribute('data-x-style-broken-urls', JSON.stringify(urls.broken));
+				if (urls_broken.length) {
+					setAttribute('data-x-style-broken-urls', JSON.stringify(urls_broken));
 				}
 
-				if (11 > pInt(oStyle.fontSize)) {
-					oStyle.removeProperty('font-size');
+				// https://github.com/the-djmaze/snappymail/issues/1082
+				// Use getComputedStyle?
+				if (oStyle.fontSize && minFontSize > pInt(oStyle.fontSize)) {
+					oStyle.fontSize = minFontSize + "px";
+//					oStyle.setProperty('font-size', minFontSize + "px");
 				}
 
 				// Removes background and color
 				// Many e-mails incorrectly only define one, not both
 				// And in dark theme mode this kills the readability
-				if (removeColors) {
+				if (SettingsUserStore.removeColors()) {
 					oStyle.removeProperty('background-color');
 					oStyle.removeProperty('background-image');
 					oStyle.removeProperty('color');
 				}
 
-				// Drop Microsoft Office style properties
-//				oStyle.cssText = oStyle.cssText.replace(/mso-[^:;]+:[^;]+/gi, '');
+				oStyle.cssText && (oStyle.cssText = cleanCSS(oStyle.cssText));
 			}
 
 			if (debug && aAttrsForRemove.length) {
@@ -339,8 +652,10 @@ export const
 			}
 		});
 
-//		return tpl.content.firstChild;
-		result.html = tpl.innerHTML.trim();
+		isMsg && blockquoteSwitcher();
+
+//		return tmpl.content.firstChild;
+		result.html = tmpl.innerHTML.trim();
 		return result;
 	},
 
@@ -349,9 +664,12 @@ export const
 	 * @returns {string}
 	 */
 	htmlToPlain = html => {
+		if (SettingsUserStore.markdown()) {
+			return htmlToMarkdown(html);
+		}
 		const
 			hr = '⎯'.repeat(64),
-			forEach = (selector, fn) => tpl.content.querySelectorAll(selector).forEach(fn),
+			forEach = (selector, fn) => tmpl.content.querySelectorAll(selector).forEach(fn),
 			blockquotes = node => {
 				let bq;
 				while ((bq = node.querySelector('blockquote'))) {
@@ -369,6 +687,8 @@ export const
 		html = html
 			.replace(/<pre[^>]*>([\s\S]*?)<\/pre>/gim, (...args) =>
 				1 < args.length ? args[1].toString().replace(/\n/g, '<br>') : '')
+			// Remove line duplication
+			.replace(/<br><\/div>/gi, '</div>')
 			.replace(/\r?\n/g, '')
 			.replace(/\s+/gm, ' ');
 
@@ -379,12 +699,11 @@ export const
 			html = html.replace(/\n*<\/(div|tr)(\s[\s\S]*?)?>\n*/gi, '\n');
 		}
 
-		tpl.innerHTML = html
+		tmpl.innerHTML = html
 			.replace(/<t[dh](\s[\s\S]*?)?>/gi, '\t')
 			.replace(/<\/tr(\s[\s\S]*?)?>/gi, '\n');
 
-		// Convert line-breaks
-		forEach('br', br => br.replaceWith('\n'));
+		forEach('style', node => node.remove());
 
 		// lines
 		forEach('hr', node => node.replaceWith(`\n\n${hr}\n\n`));
@@ -408,9 +727,8 @@ export const
 				parent = node,
 				ordered = 'OL' == node.tagName,
 				i = 0;
-			while (parent && parent.parentNode && parent.parentNode.closest) {
-				parent = parent.parentNode.closest('ol,ul');
-				parent && (prefix = '    ' + prefix);
+			while ((parent = parent?.parentNode?.closest?.('ol,ul'))) {
+				prefix = '    ' + prefix;
 			}
 			node.querySelectorAll(':scope > li').forEach(li => {
 				li.prepend('\n' + prefix + (ordered ? `${++i}. ` : ' * '));
@@ -422,7 +740,11 @@ export const
 		// Convert anchors
 		forEach('a', a => {
 			let txt = a.textContent, href = a.href;
-			return a.replaceWith((txt.trim() == href ? txt : txt + ' ' + href + ' '));
+			return a.replaceWith(
+				txt.replace(/[\s()-]+/g, '').includes(href.replace(/^[a-z]:/, '').replace(/[\s()-]+/g, ''))
+				? txt
+				: txt + ' ' + href + ' '
+			);
 		});
 
 		// Bold
@@ -430,10 +752,22 @@ export const
 		// Italic
 		forEach('i,em', i => i.replaceWith(`*${i.textContent}*`));
 
-		// Blockquotes must be last
-		blockquotes(tpl.content);
+		// Convert line-breaks
+		tmpl.innerHTML = tmpl.innerHTML
+			.replace(/\n{3,}/gm, '\n\n')
+			.replace(/\n<br[^>]*>/g, '\n')
+			.replace(/<br[^>]*>\n/g, '\n');
+		forEach('br', br => br.replaceWith('\n'));
 
-		return (tpl.content.textContent || '').replace(/\n{3,}/gm, '\n\n').trim();
+		// Blockquotes must be last
+		blockquotes(tmpl.content);
+
+		return (tmpl.content.textContent || '').trim();
+	},
+
+	htmlToMarkdown = html => {
+		tmpl.innerHTML = html;
+		return turndown.turndown(tmpl.content);
 	},
 
 	/**
@@ -442,10 +776,11 @@ export const
 	 * @returns {string}
 	 */
 	plainToHtml = plain => {
-		plain = stripTracking(plain)
-			.toString()
+		plain = plain.toString()
 			.replace(/\r/g, '')
-			.replace(/^>[> ]>+/gm, ([match]) => (match ? match.replace(/[ ]+/g, '') : match));
+			.replace(/^>[> ]>+/gm, ([match]) => (match ? match.replace(/[ ]+/g, '') : match))
+			// https://github.com/the-djmaze/snappymail/issues/900
+			.replace(/\u2028/g,' ');
 
 		let bIn = false,
 			bDo = true,
@@ -486,186 +821,28 @@ export const
 			aText = aNextText;
 		} while (bDo);
 
-		return aText.join('\n')
+		tmpl.innerHTML = aText.join('\n')
 			// .replace(/~~~\/blockquote~~~\n~~~blockquote~~~/g, '\n')
 			.replace(/&/g, '&amp;')
 			.replace(/>/g, '&gt;')
 			.replace(/</g, '&lt;')
+			.replace(urlRegExp, (...m) => {
+				m[0] = stripTracking(m[0]);
+				return `<a href="${m[0]}" target="_blank">${m[0]}</a>`;
+			})
+			.replace(email, '$1<a href="mailto:$2">$2</a>')
+			.replace(tel, '<a href="$1">$1</a>')
 			.replace(/~~~blockquote~~~\s*/g, '<blockquote>')
 			.replace(/\s*~~~\/blockquote~~~/g, '</blockquote>')
 			.replace(/\n/g, '<br>');
+		blockquoteSwitcher();
+		return tmpl.innerHTML.trim();
 	};
 
-export class HtmlEditor {
-	/**
-	 * @param {Object} element
-	 * @param {Function=} onBlur
-	 * @param {Function=} onReady
-	 * @param {Function=} onModeChange
-	 */
-	constructor(element, onBlur = null, onReady = null, onModeChange = null) {
-		this.blurTimer = 0;
-
-		this.onBlur = onBlur;
-		this.onModeChange = onModeChange;
-
-		if (element) {
-			let editor;
-
-			onReady = onReady ? [onReady] : [];
-			this.onReady = fn => onReady.push(fn);
-			const readyCallback = () => {
-				this.editor = editor;
-				this.onReady = fn => fn();
-				onReady.forEach(fn => fn());
-			};
-
-			if (rl.createWYSIWYG) {
-				editor = rl.createWYSIWYG(element, readyCallback);
-			}
-			if (!editor) {
-				editor = new SquireUI(element);
-				setTimeout(readyCallback, 1);
-			}
-
-			editor.on('blur', () => this.blurTrigger());
-			editor.on('focus', () => this.blurTimer && clearTimeout(this.blurTimer));
-			editor.on('mode', () => {
-				this.blurTrigger();
-				this.onModeChange && this.onModeChange(!this.isPlain());
-			});
-		}
-	}
-
-	blurTrigger() {
-		if (this.onBlur) {
-			clearTimeout(this.blurTimer);
-			this.blurTimer = setTimeout(() => this.onBlur && this.onBlur(), 200);
-		}
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isHtml() {
-		return this.editor ? !this.isPlain() : false;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isPlain() {
-		return this.editor ? 'plain' === this.editor.mode : false;
-	}
-
-	/**
-	 * @returns {void}
-	 */
-	clearCachedSignature() {
-		this.onReady(() => this.editor.execCommand('insertSignature', {
-			clearCache: true
-		}));
-	}
-
-	/**
-	 * @param {string} signature
-	 * @param {bool} html
-	 * @param {bool} insertBefore
-	 * @returns {void}
-	 */
-	setSignature(signature, html, insertBefore = false) {
-		this.onReady(() => this.editor.execCommand('insertSignature', {
-			isHtml: html,
-			insertBefore: insertBefore,
-			signature: signature
-		}));
-	}
-
-	/**
-	 * @param {boolean=} wrapIsHtml = false
-	 * @returns {string}
-	 */
-	getData() {
-		let result = '';
-		if (this.editor) {
-			try {
-				if (this.isPlain() && this.editor.plugins.plain && this.editor.__plain) {
-					result = this.editor.__plain.getRawData();
-				} else {
-					result = this.editor.getData();
-				}
-			} catch (e) {} // eslint-disable-line no-empty
-		}
-		return result;
-	}
-
-	/**
-	 * @returns {string}
-	 */
-	getDataWithHtmlMark() {
-		return (this.isHtml() ? ':HTML:' : '') + this.getData();
-	}
-
-	modeWysiwyg() {
-		this.onReady(() => this.editor.setMode('wysiwyg'));
-	}
-	modePlain() {
-		this.onReady(() => this.editor.setMode('plain'));
-	}
-
-	setHtmlOrPlain(text) {
-		if (':HTML:' === text.slice(0, 6)) {
-			this.setHtml(text.slice(6));
-		} else {
-			this.setPlain(text);
-		}
-	}
-
-	setData(mode, data) {
-		this.onReady(() => {
-			const editor = this.editor;
-			this.clearCachedSignature();
-			try {
-				editor.setMode(mode);
-				if (this.isPlain() && editor.plugins.plain && editor.__plain) {
-					editor.__plain.setRawData(data);
-				} else {
-					editor.setData(data);
-				}
-			} catch (e) { console.error(e); }
-		});
-	}
-
-	setHtml(html) {
-		this.setData('wysiwyg', html/*.replace(/<p[^>]*><\/p>/gi, '')*/);
-	}
-
-	setPlain(txt) {
-		this.setData('plain', txt);
-	}
-
-	focus() {
-		this.onReady(() => this.editor.focus());
-	}
-
-	hasFocus() {
-		try {
-			return this.editor && !!this.editor.focusManager.hasFocus;
-		} catch (e) {
-			return false;
-		}
-	}
-
-	blur() {
-		this.onReady(() => this.editor.focusManager.blur(true));
-	}
-
-	clear() {
-		this.onReady(() => this.isPlain() ? this.setPlain('') : this.setHtml(''));
-	}
-}
-
 rl.Utils = {
+	cleanHtml: cleanHtml,
 	htmlToPlain: htmlToPlain,
-	plainToHtml: plainToHtml
+	plainToHtml: plainToHtml,
+	htmlToMarkdown: htmlToMarkdown
+//	markdownToHtml: md => marked.parse(md)
 };
diff --git a/dev/Common/HtmlEditor.js b/dev/Common/HtmlEditor.js
new file mode 100644
index 000000000..06555b478
--- /dev/null
+++ b/dev/Common/HtmlEditor.js
@@ -0,0 +1,161 @@
+import { SettingsUserStore } from 'Stores/User/Settings';
+
+export const
+	WYSIWYGS = ko.observableArray();
+
+WYSIWYGS.push({
+	name: 'Squire',
+	construct: (owner, container, onReady) => onReady(new SquireUI(container))
+});
+
+rl.registerWYSIWYG = (name, construct) => WYSIWYGS.push({name, construct});
+
+export class HtmlEditor {
+	/**
+	 * @param {Object} element
+	 * @param {Function=} onBlur
+	 * @param {Function=} onReady
+	 * @param {Function=} onModeChange
+	 */
+	constructor(element, onReady = null, onModeChange = null, onBlur = null) {
+		this.blurTimer = 0;
+
+		this.onBlur = onBlur;
+		this.onModeChange = onModeChange;
+
+		if (element) {
+			onReady = onReady ? [onReady] : [];
+			this.onReady = fn => onReady.push(fn);
+			const which = SettingsUserStore.editorWysiwyg(),
+				wysiwyg = WYSIWYGS.find(item => which == item.name) || WYSIWYGS.find(item => 'Squire' == item.name);
+			wysiwyg.construct(this, element, editor => setTimeout(()=>{
+				this.editor = editor;
+				editor.on('blur', () => this.blurTrigger());
+				editor.on('focus', () => clearTimeout(this.blurTimer));
+				editor.on('mode', () => {
+					this.blurTrigger();
+					this.onModeChange?.(!this.isPlain());
+				});
+				this.onReady = fn => fn();
+				onReady.forEach(fn => fn());
+			},1));
+		}
+	}
+
+	blurTrigger() {
+		if (this.onBlur) {
+			clearTimeout(this.blurTimer);
+			this.blurTimer = setTimeout(() => this.onBlur?.(), 200);
+		}
+	}
+
+	/**
+	 * @returns {boolean}
+	 */
+	isHtml() {
+		return this.editor ? !this.isPlain() : false;
+	}
+
+	/**
+	 * @returns {boolean}
+	 */
+	isPlain() {
+		return this.editor ? 'plain' === this.editor.mode : false;
+	}
+
+	/**
+	 * @returns {void}
+	 */
+	clearCachedSignature() {
+		this.onReady(() => this.editor.execCommand('insertSignature', {
+			clearCache: true
+		}));
+	}
+
+	/**
+	 * @param {string} signature
+	 * @param {bool} html
+	 * @param {bool} insertBefore
+	 * @returns {void}
+	 */
+	setSignature(signature, html, insertBefore = false) {
+		this.onReady(() => this.editor.execCommand('insertSignature', {
+			isHtml: html,
+			insertBefore: insertBefore,
+			signature: signature
+		}));
+	}
+
+	/**
+	 * @param {boolean=} wrapIsHtml = false
+	 * @returns {string}
+	 */
+	getData() {
+		let result = '';
+		if (this.editor) {
+			try {
+				if (this.isPlain()) {
+					result = this.editor.getPlainData();
+				} else {
+					result = this.editor.getData();
+				}
+			} catch (e) {} // eslint-disable-line no-empty
+		}
+		return result;
+	}
+
+	/**
+	 * @returns {string}
+	 */
+	getDataWithHtmlMark() {
+		return (this.isHtml() ? ':HTML:' : '') + this.getData();
+	}
+
+	modeWysiwyg() {
+		this.onReady(() => this.editor.setMode('wysiwyg'));
+	}
+	modePlain() {
+		this.onReady(() => this.editor.setMode('plain'));
+	}
+
+	setHtmlOrPlain(text) {
+		text.startsWith(':HTML:')
+			? this.setHtml(text.slice(6))
+			: this.setPlain(text);
+	}
+
+	setData(mode, data) {
+		this.onReady(() => {
+			const editor = this.editor;
+			this.clearCachedSignature();
+			try {
+				editor.setMode(mode);
+				if (this.isPlain()) {
+					editor.setPlainData(data);
+				} else {
+					editor.setData(data);
+				}
+			} catch (e) { console.error(e); }
+		});
+	}
+
+	setHtml(html) {
+		this.setData('wysiwyg', html/*.replace(/<p[^>]*><\/p>/gi, '')*/);
+	}
+
+	setPlain(txt) {
+		this.setData('plain', txt);
+	}
+
+	focus() {
+		this.onReady(() => this.editor.focus());
+	}
+
+	blur() {
+		this.onReady(() => this.editor.blur());
+	}
+
+	clear() {
+		this.onReady(() => this.isPlain() ? this.setPlain('') : this.setHtml(''));
+	}
+}
diff --git a/dev/Common/Links.js b/dev/Common/Links.js
index 977094de9..c0923ed58 100644
--- a/dev/Common/Links.js
+++ b/dev/Common/Links.js
@@ -1,15 +1,13 @@
-import { pString, pInt } from 'Common/Utils';
-import { Settings } from 'Common/Globals';
+import { pInt } from 'Common/Utils';
+import { doc, Settings, SettingsAdmin } from 'Common/Globals';
 
 const
+	BASE = doc.location.pathname.replace(/\/+$/,'') + '/',
 	HASH_PREFIX = '#/',
-	SERVER_PREFIX = './?',
-	VERSION = Settings.app('version'),
-	VERSION_PREFIX = () => Settings.app('webVersionPath') || 'snappymail/v/' + VERSION + '/',
 
-	adminPath = () => rl.adminArea() && !Settings.app('adminHostUse'),
+	adminPath = () => rl.adminArea() && !SettingsAdmin('host'),
 
-	prefix = () => SERVER_PREFIX + (adminPath() ? Settings.app('adminPath') : '');
+	prefix = () => BASE + '?' + (adminPath() ? SettingsAdmin('path') : '');
 
 export const
 	SUB_QUERY_PREFIX = '&q[]=',
@@ -23,7 +21,7 @@ export const
 	/**
 	 * @returns {string}
 	 */
-	logoutLink = () => adminPath() ? prefix() : './',
+	logoutLink = () => adminPath() ? prefix() : BASE,
 
 	/**
 	 * @param {string} type
@@ -32,23 +30,24 @@ export const
 	 * @returns {string}
 	 */
 	serverRequestRaw = (type, hash) =>
-		SERVER_PREFIX + '/Raw/' + SUB_QUERY_PREFIX + '/'
-		+ '0/' // AuthAccountHash ?
+		BASE + '?/Raw/' + SUB_QUERY_PREFIX + '/'
+		+ '0/' // Settings.get('accountHash') ?
 		+ (type
 			? type + '/' + (hash ? SUB_QUERY_PREFIX + '/' + hash : '')
 			: ''),
 
 	/**
 	 * @param {string} download
-	 * @param {string=} customSpecSuffix
 	 * @returns {string}
 	 */
-	attachmentDownload = (download, customSpecSuffix) =>
-		serverRequestRaw('Download', download, customSpecSuffix),
+	attachmentDownload = (download) =>
+		serverRequestRaw('Download', download),
 
 	proxy = url =>
-		SERVER_PREFIX + '/ProxyExternal/'
+		BASE + '?/ProxyExternal/'
+//			+ btoa(JSON.stringify([token,url]).replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 			+ btoa(url.replace(/ /g, '%20')).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
+//			+ b64EncodeJSONSafe(url.replace(/ /g, '%20')),
 
 	/**
 	 * @param {string} type
@@ -56,32 +55,40 @@ export const
 	 */
 	serverRequest = type => prefix() + '/' + type + '/' + SUB_QUERY_PREFIX + '/0/',
 
+	// Is '?/Css/0/Admin' needed?
+	cssLink = theme => BASE + '?/Css/0/User/-/' + encodeURI(theme) + '/-/' + Date.now() + '/Hash/-/Json/',
+
 	/**
 	 * @param {string} lang
 	 * @param {boolean} isAdmin
 	 * @returns {string}
 	 */
 	langLink = (lang, isAdmin) =>
-		SERVER_PREFIX + '/Lang/0/' + (isAdmin ? 'Admin' : 'App') + '/' + encodeURI(lang) + '/' + VERSION + '/',
+		BASE + '?/Lang/0/' + (isAdmin ? 'Admin' : 'App')
+			+ '/' + encodeURI(lang)
+			+ '/' + Settings.app('version') + '/',
 
 	/**
 	 * @param {string} path
 	 * @returns {string}
 	 */
-	staticLink = path => VERSION_PREFIX() + 'static/' + path,
+	staticLink = path => Settings.app('webVersionPath') + 'static/' + path,
 
 	/**
 	 * @param {string} theme
 	 * @returns {string}
 	 */
 	themePreviewLink = theme => {
-		let prefix = VERSION_PREFIX();
-		if ('@custom' === theme.slice(-7)) {
-			theme = theme.slice(0, theme.length - 7).trim();
-			prefix = Settings.app('webPath') || '';
+		if (theme.endsWith('@nextcloud')) {
+			theme = theme.slice(0, theme.length - 10).trim();
+			return parent.OC.webroot + '/themes/' + encodeURI(theme) + '/snappymail/preview.png';
 		}
-
-		return prefix + 'themes/' + encodeURI(theme) + '/images/preview.png';
+		let path = 'webVersionPath';
+		if (theme.endsWith('@custom')) {
+			theme = theme.slice(0, theme.length - 7).trim();
+			path = 'webPath';
+		}
+		return Settings.app(path) + 'themes/' + encodeURI(theme) + '/images/preview.png';
 	},
 
 	/**
@@ -113,22 +120,24 @@ export const
 	 * @param {number=} threadUid = 0
 	 * @returns {string}
 	 */
-	mailBox = (folder, page, search, threadUid) => {
+	mailBox = (folder, page, search, threadUid, messageUid) => {
 		let result = [HASH_PREFIX + 'mailbox'];
 
 		if (folder) {
 			result.push(folder + (threadUid ? '~' + threadUid : ''));
 		}
 
-		page = pInt(page, 1);
-		if (1 < page) {
-			result.push('p' + page);
-		}
-
-		search = pString(search);
-		if (search) {
-			result.push(encodeURI(search));
+		if (messageUid) {
+			result.push('m' + messageUid);
+		} else {
+			page = pInt(page, 1);
+			if (1 < page) {
+				result.push('p' + page);
+			}
+			search && result.push(encodeURI(search));
 		}
 
 		return result.join('/');
-	};
+	},
+
+	mailBoxMessage = (folder, messageUid) => mailBox(folder, 1, '', 0, pInt(messageUid));
diff --git a/dev/Common/Plugins.js b/dev/Common/Plugins.js
index 694930c1f..47c658d2c 100644
--- a/dev/Common/Plugins.js
+++ b/dev/Common/Plugins.js
@@ -39,9 +39,9 @@ rl.addSettingsViewModelForAdmin = (SettingsViewModelClass, template, labelName,
  * @param {boolean} admin
  */
 export function runSettingsViewModelHooks(admin) {
-	(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS).forEach(view => {
-		settingsAddViewModel(view[0], view[1], view[2], view[3]);
-	});
+	(admin ? ADMIN_VIEW_MODELS_HOOKS : USER_VIEW_MODELS_HOOKS).forEach(view =>
+		settingsAddViewModel(...view)
+	);
 }
 
 /**
@@ -49,10 +49,7 @@ export function runSettingsViewModelHooks(admin) {
  * @param {string} name
  * @returns {?}
  */
-rl.pluginSettingsGet = (pluginSection, name) => {
-	let plugins = SettingsGet('Plugins');
-	plugins = plugins && null != plugins[pluginSection] ? plugins[pluginSection] : null;
-	return plugins ? (null == plugins[name] ? null : plugins[name]) : null;
-};
+rl.pluginSettingsGet = (pluginSection, name) =>
+	SettingsGet('Plugins')?.[pluginSection]?.[name];
 
 rl.pluginPopupView = AbstractViewPopup;
diff --git a/dev/Common/Selector.js b/dev/Common/Selector.js
index f413fd76c..d22ab6a15 100644
--- a/dev/Common/Selector.js
+++ b/dev/Common/Selector.js
@@ -7,11 +7,13 @@ import { koComputable } from 'External/ko';
 	oCallbacks:
 		ItemSelect
 		MiddleClick
-		AutoSelect
+		canSelect
 		ItemGetUid
 		UpOrDown
 */
 
+let shiftStart;
+
 export class Selector {
 	/**
 	 * @param {koProperty} koList
@@ -19,89 +21,86 @@ export class Selector {
 	 * @param {koProperty} koFocusedItem
 	 * @param {string} sItemSelector
 	 * @param {string} sItemCheckedSelector
-	 * @param {string} sItemFocusedSelector
 	 */
 	constructor(
 		koList,
 		koSelectedItem,
 		koFocusedItem,
 		sItemSelector,
-		sItemCheckedSelector,
-		sItemFocusedSelector
+		sItemCheckedSelector
 	) {
+		koFocusedItem = (koFocusedItem || ko.observable(null)).extend({ toggleSubscribeProperty: [this, 'focused'] });
+		koSelectedItem = (koSelectedItem || ko.observable(null)).extend({ toggleSubscribeProperty: [null, 'selected'] });
+
 		this.list = koList;
-		this.listChecked = koComputable(() => this.list.filter(item => item.checked())).extend({ rateLimit: 0 });
-		this.isListChecked = koComputable(() => 0 < this.listChecked().length);
+		this.listChecked = koComputable(() => koList.filter(item => item.checked())).extend({ rateLimit: 0 });
 
-		this.focusedItem = koFocusedItem || ko.observable(null);
-		this.selectedItem = koSelectedItem || ko.observable(null);
-
-		this.selectedItemUseCallback = true;
+		this.focusedItem = koFocusedItem;
+		this.selectedItem = koSelectedItem;
 
 		this.iSelectNextHelper = 0;
 		this.iFocusedNextHelper = 0;
-		this.oContentScrollable;
+//		this.oContentScrollable = null;
 
 		this.sItemSelector = sItemSelector;
 		this.sItemCheckedSelector = sItemCheckedSelector;
-		this.sItemFocusedSelector = sItemFocusedSelector;
+		this.sItemFocusedSelector = sItemSelector + '.focused';
 
 		this.sLastUid = '';
 		this.oCallbacks = {};
 
-		const itemSelectedThrottle = (item => this.itemSelected(item)).debounce(300);
+		const
+			itemSelected = item => {
+				if (koList.hasChecked()) {
+					item || this.oCallbacks.ItemSelect?.(null);
+				} else if (item) {
+					this.oCallbacks.ItemSelect?.(item);
+				}
+			},
 
-		this.listChecked.subscribe((items) => {
+			itemSelectedThrottle = (item => itemSelected(item)).debounce(300);
+
+		this.listChecked.subscribe(items => {
 			if (items.length) {
-				if (null === this.selectedItem()) {
-					if (this.selectedItem.valueHasMutated) {
-						this.selectedItem.valueHasMutated();
-					}
-				} else {
-					this.selectedItem(null);
-				}
-			} else if (this.autoSelect() && this.focusedItem()) {
-				this.selectedItem(this.focusedItem());
+				koSelectedItem() ? koSelectedItem(null) : koSelectedItem.valueHasMutated?.();
+			} else {
+				this.autoSelect();
 			}
-		}, this);
+		});
 
-		this.selectedItem.subscribe((item) => {
+		let selectedItemUseCallback = true;
+
+		koSelectedItem.subscribe(item => {
 			if (item) {
-				if (this.isListChecked()) {
-					this.listChecked().forEach(subItem => subItem.checked(false));
-				}
-
-				if (this.selectedItemUseCallback) {
-					itemSelectedThrottle(item);
-				}
-			} else if (this.selectedItemUseCallback) {
-				this.itemSelected(null);
+//				koList.forEach(subItem => subItem.checked(false));
+				selectedItemUseCallback && itemSelectedThrottle(item);
+			} else {
+				selectedItemUseCallback && itemSelected();
 			}
-		}, this);
+		});
 
-		this.selectedItem = this.selectedItem.extend({ toggleSubscribeProperty: [this, 'selected'] });
-		this.focusedItem = this.focusedItem.extend({ toggleSubscribeProperty: [null, 'focused'] });
+		koFocusedItem.subscribe(item => item && (this.sLastUid = this.getItemUid(item)));
 
-		this.focusedItem.subscribe(item => item && (this.sLastUid = this.getItemUid(item)), this);
+		/**
+		 * Below code is used to keep checked/focused/selected states when array is refreshed.
+		 */
 
-		let aCache = [],
-			aCheckedCache = [],
+		let aCheckedCache = [],
 			mFocused = null,
 			mSelected = null;
 
-		this.list.subscribe(
+		// Before removing old list
+		koList.subscribe(
 			items => {
 				if (isArray(items)) {
 					items.forEach(item => {
-						if (item) {
-							const uid = this.getItemUid(item);
-
-							aCache.push(uid);
+						const uid = this.getItemUid(item);
+						if (uid) {
 							item.checked() && aCheckedCache.push(uid);
-							if (null === mFocused && item.focused()) {
+							if (!mFocused && item.focused()) {
 								mFocused = uid;
 							}
-							if (null === mSelected && item.selected()) {
+							if (!mSelected && item.selected()) {
 								mSelected = uid;
 							}
 						}
@@ -112,120 +111,64 @@ export class Selector {
 			'beforeChange'
 		);
 
-		this.list.subscribe((aItems) => {
-			let temp = null,
-				getNext = false,
-				isNextFocused = mFocused,
-				isChecked = false,
-				isSelected = false,
-				len = 0;
+		koList.subscribe(aItems => {
+			selectedItemUseCallback = false;
 
-			const uids = [];
-
-			this.selectedItemUseCallback = false;
-
-			this.focusedItem(null);
-			this.selectedItem(null);
+			this.unselect();
 
 			if (isArray(aItems)) {
-				len = aCheckedCache.length;
+				let temp,
+					isChecked,
+					next = this.iFocusedNextHelper || this.iSelectNextHelper;
 
 				aItems.forEach(item => {
 					const uid = this.getItemUid(item);
-					uids.push(uid);
+					if (uid) {
 
-					if (null !== mFocused && mFocused === uid) {
-						this.focusedItem(item);
-						mFocused = null;
-					}
+						if (mFocused === uid) {
+							koFocusedItem(item);
+							mFocused = null;
+						}
 
-					if (0 < len && aCheckedCache.includes(uid)) {
-						isChecked = true;
-						item.checked(true);
-						--len;
-					}
+						if (aCheckedCache.includes(uid)) {
+							item.checked(true);
+							isChecked = true;
+						}
 
-					if (!isChecked && null !== mSelected && mSelected === uid) {
-						isSelected = true;
-						this.selectedItem(item);
-						mSelected = null;
+						if (!isChecked && mSelected === uid) {
+							koSelectedItem(item);
+							mSelected = null;
+						}
 					}
 				});
 
-				this.selectedItemUseCallback = true;
-
-				if (!isChecked && !isSelected && this.autoSelect()) {
-					if (this.focusedItem()) {
-						this.selectedItem(this.focusedItem());
-					} else if (aItems.length) {
-						if (null !== isNextFocused) {
-							getNext = false;
-							isNextFocused = aCache.find(sUid => {
-								if (getNext && uids.includes(sUid)) {
-									return sUid;
-								}
-								if (isNextFocused === sUid) {
-									getNext = true;
-								}
-								return false;
-							});
-
-							if (isNextFocused) {
-								temp = aItems.find(oItem => isNextFocused === this.getItemUid(oItem));
-							}
-						}
-
-						this.selectedItem(temp || null);
-						this.focusedItem(this.selectedItem());
-					}
-				}
-
-				if (
-					(0 !== this.iSelectNextHelper || 0 !== this.iFocusedNextHelper) &&
-					aItems.length &&
-					!this.focusedItem()
-				) {
-					temp = null;
-					if (0 !== this.iFocusedNextHelper) {
-						temp = aItems[-1 === this.iFocusedNextHelper ? aItems.length - 1 : 0] || null;
-					}
-
-					if (!temp && 0 !== this.iSelectNextHelper) {
-						temp = aItems[-1 === this.iSelectNextHelper ? aItems.length - 1 : 0] || null;
-					}
+				selectedItemUseCallback = true;
 
+				if (next && aItems.length && !koFocusedItem()) {
+					temp = aItems[-1 === next ? aItems.length - 1 : 0];
 					if (temp) {
-						if (0 !== this.iSelectNextHelper) {
-							this.selectedItem(temp || null);
-						}
+						this.iSelectNextHelper && koSelectedItem(temp);
 
-						this.focusedItem(temp || null);
+						koFocusedItem(temp);
 
 						this.scrollToFocused();
-
 						setTimeout(this.scrollToFocused, 100);
 					}
 
 					this.iSelectNextHelper = 0;
 					this.iFocusedNextHelper = 0;
 				}
+
+				!isChecked && !koSelectedItem() && this.autoSelect();
 			}
 
-			aCache = [];
 			aCheckedCache = [];
 			mFocused = null;
 			mSelected = null;
+			selectedItemUseCallback = true;
 		});
 	}
 
-	itemSelected(item) {
-		if (this.isListChecked()) {
-			item || (this.oCallbacks.ItemSelect || (()=>0))(null);
-		} else if (item) {
-			(this.oCallbacks.ItemSelect || (()=>0))(item);
-		}
-	}
-
 	unselect() {
 		this.selectedItem(null);
 		this.focusedItem(null);
@@ -242,10 +185,11 @@ export class Selector {
 
 			addEventsListeners(contentScrollable, {
 				click: event => {
-					let el = event.target.closestWithin(this.sItemSelector, contentScrollable);
-					el && this.actionClick(ko.dataFor(el), event);
+					const el = event.target.closestWithin(this.sItemSelector, contentScrollable);
+					let item = el && ko.dataFor(el);
+					el && (this.oCallbacks.click || (()=>1))(event, item) && this.actionClick(item, event);
 
-					const item = getItem(this.sItemCheckedSelector);
+					item = getItem(this.sItemCheckedSelector);
 					if (item) {
 						if (event.shiftKey) {
 							this.actionClick(item, event);
@@ -260,7 +204,7 @@ export class Selector {
 						const item = getItem(this.sItemSelector);
 						if (item) {
 							this.focusedItem(item);
-							(this.oCallbacks.MiddleClick || (()=>0))(item);
+							this.oCallbacks.MiddleClick?.(item);
 						}
 					}
 				}
@@ -290,8 +234,10 @@ export class Selector {
 	/**
 	 * @returns {boolean}
 	 */
-	autoSelect() {
-		return !!(this.oCallbacks.AutoSelect || (()=>1))();
+	autoSelect(bForce) {
+		(bForce || (this.oCallbacks.canSelect || (()=>1))())
+		&& this.focusedItem()
+		&& this.selectedItem(this.focusedItem());
 	}
 
 	/**
@@ -299,14 +245,7 @@ export class Selector {
 	 * @returns {string}
 	 */
 	getItemUid(item) {
-		let uid = '';
-
-		const getItemUidCallback = this.oCallbacks.ItemGetUid || null;
-		if (getItemUidCallback && item) {
-			uid = getItemUidCallback(item);
-		}
-
-		return uid.toString();
+		return (item && this.oCallbacks.ItemGetUid?.(item)?.toString()) || '';
 	}
 
 	/**
@@ -315,24 +254,36 @@ export class Selector {
 	 * @param {boolean=} bForceSelect = false
 	 */
 	newSelectPosition(sEventKey, bShiftKey, bForceSelect) {
-		let isArrow = 'ArrowUp' === sEventKey || 'ArrowDown' === sEventKey,
-			result = null;
+		let result;
 
-		const pageStep = 10,
+		const up = 'ArrowUp' === sEventKey,
+			isArrow = up || 'ArrowDown' === sEventKey,
+			pageStep = 10,
 			list = this.list(),
 			listLen = list.length,
 			focused = this.focusedItem();
 
-		if (listLen) {
+		bShiftKey || (shiftStart = -1);
+
+		if (' ' === sEventKey) {
+			focused?.checked(!focused.checked());
+		} else if (listLen) {
 			if (focused) {
 				if (isArrow) {
 					let i = list.indexOf(focused);
-					if ('ArrowUp' == sEventKey) {
-						i > 0 && (result = list[i-1]);
+					if (bShiftKey) {
+						shiftStart = -1 < shiftStart ? shiftStart : i;
+						shiftStart == i
+							? focused.checked(true)
+							: ((up ? shiftStart < i : shiftStart > i) && focused.checked(false));
+					}
+					if (up) {
+						i > 0 && (result = list[--i]);
 					} else if (++i < listLen) {
 						result = list[i];
 					}
-					result || (this.oCallbacks.UpOrDown || (()=>0))('ArrowUp' === sEventKey);
+					bShiftKey && result?.checked(true);
+					result || this.oCallbacks.UpOrDown?.(up);
 				} else if ('Home' === sEventKey) {
 					result = list[0];
 				} else if ('End' === sEventKey) {
@@ -359,26 +310,12 @@ export class Selector {
 			) {
 				result = list[list.length - 1];
 			}
-		}
 
-		if (result) {
-			this.focusedItem(result);
-
-			if (focused && ((bShiftKey && isArrow) || ' ' === sEventKey)) {
-				focused.checked(!focused.checked());
+			if (result) {
+				this.focusedItem(result);
+				!this.list.hasChecked() && this.autoSelect(bForceSelect);
+				this.scrollToFocused();
 			}
-
-			if (' ' !== sEventKey && (this.autoSelect() || bForceSelect) && !this.isListChecked()) {
-				this.selectedItem(result);
-			}
-
-			this.scrollToFocused();
-		} else if (focused) {
-			if ((bShiftKey && isArrow) || ' ' === sEventKey) {
-				focused.checked(!focused.checked());
-			}
-
-			this.focusedItem(focused);
 		}
 	}
 
@@ -388,16 +325,15 @@ export class Selector {
 	scrollToFocused() {
 		const scrollable = this.oContentScrollable;
 		if (scrollable) {
-			let block, focused = scrollable.querySelector(this.sItemFocusedSelector);
+			let focused = scrollable.querySelector(this.sItemFocusedSelector);
 			if (focused) {
 				const fRect = focused.getBoundingClientRect(),
 					sRect = scrollable.getBoundingClientRect();
 				if (fRect.top < sRect.top) {
-					block = 'start';
+					focused.scrollIntoView(true);
 				} else if (fRect.bottom > sRect.bottom) {
-					block = 'end';
+					focused.scrollIntoView(false);
 				}
-				block && focused.scrollIntoView(block === 'start');
 			} else {
 				scrollable.scrollTop = 0;
 			}
@@ -411,78 +347,47 @@ export class Selector {
 		this.oContentScrollable && (this.oContentScrollable.scrollTop = 0);
 	}
 
-	eventClickFunction(item, event) {
-		let index = 0,
-			length = 0,
-			changeRange = false,
-			isInRange = false,
-			list = [],
-			checked = false,
-			listItem = null,
-			lineUid = '';
-
-		const uid = this.getItemUid(item);
-		if (event && event.shiftKey) {
-			if (uid && this.sLastUid && uid !== this.sLastUid) {
-				list = this.list();
-				checked = item.checked();
-
-				for (index = 0, length = list.length; index < length; index++) {
-					listItem = list[index];
-					lineUid = this.getItemUid(listItem);
-
-					changeRange = false;
-					if (lineUid === this.sLastUid || lineUid === uid) {
-						changeRange = true;
-					}
-
-					if (changeRange) {
-						isInRange = !isInRange;
-					}
-
-					if (isInRange || changeRange) {
-						listItem.checked(checked);
-					}
-				}
-			}
-		}
-
-		this.sLastUid = uid || '';
-	}
-
 	/**
 	 * @param {Object} item
 	 * @param {Object=} event
 	 */
-	actionClick(item, event = null) {
+	actionClick(item, event) {
 		if (item) {
-			let click = true;
-			if (event) {
-				if (event.shiftKey && !(event.ctrlKey || event.metaKey) && !event.altKey) {
-					click = false;
-					if (!this.sLastUid) {
-						this.sLastUid = this.getItemUid(item);
+			let select = true;
+			if (event && !event.altKey) {
+				if (event.shiftKey && !event.ctrlKey && !event.metaKey) {
+					const uid = this.getItemUid(item);
+					if (uid && this.sLastUid && uid !== this.sLastUid) {
+						let changeRange = false,
+							isInRange = false,
+							checked = !item.checked(),
+							lineUid = '';
+						this.list().forEach(listItem => {
+							lineUid = this.getItemUid(listItem);
+							changeRange = (lineUid === this.sLastUid || lineUid === uid);
+							if (isInRange || changeRange) {
+								if (changeRange) {
+									isInRange = !isInRange;
+								}
+								listItem.checked(checked);
+							}
+						});
 					}
-
-					item.checked(!item.checked());
-					this.eventClickFunction(item, event);
-
+					this.sLastUid = uid;
 					this.focusedItem(item);
-				} else if ((event.ctrlKey || event.metaKey) && !event.shiftKey && !event.altKey) {
-					click = false;
+					return;
+				}
+				if (!event.shiftKey && (event.ctrlKey || event.metaKey)) {
+					select = false;
 					this.focusedItem(item);
-
-					if (this.selectedItem() && item !== this.selectedItem()) {
-						this.selectedItem().checked(true);
+					const selected = this.selectedItem();
+					if (selected && item !== selected) {
+						selected.checked(true);
 					}
-
-					item.checked(!item.checked());
 				}
 			}
 
-			if (click) {
-				this.selectMessageItem(item);
-			}
+			select ? this.selectMessageItem(item) : item.checked(!item.checked());
 		}
 	}
 
diff --git a/dev/Common/Translator.js b/dev/Common/Translator.js
index 852bd36d1..b4953291f 100644
--- a/dev/Common/Translator.js
+++ b/dev/Common/Translator.js
@@ -1,39 +1,19 @@
 import ko from 'ko';
-import { Notification, UploadErrorCode } from 'Common/Enums';
+import { Notifications, UploadErrorCode } from 'Common/Enums';
 import { langLink } from 'Common/Links';
 import { doc, createElement } from 'Common/Globals';
 import { getKeyByValue, forEachObjectEntry } from 'Common/Utils';
+import { pInt } from 'Common/Utils';
+import { LanguageStore } from 'Stores/Language';
 
 let I18N_DATA = {};
 
 const
-	i18nToNode = element => {
-		const key = element.dataset.i18n;
-		if (key) {
-			if ('[' === key.slice(0, 1)) {
-				switch (key.slice(0, 6)) {
-					case '[html]':
-						element.innerHTML = i18n(key.slice(6));
-						break;
-					case '[place':
-						element.placeholder = i18n(key.slice(13));
-						break;
-					case '[title':
-						element.title = i18n(key.slice(7));
-						break;
-					// no default
-				}
-			} else {
-				element.textContent = i18n(key);
-			}
-		}
-	},
-
 	init = () => {
 		if (rl.I18N) {
 			I18N_DATA = rl.I18N;
-			Date.defineRelativeTimeFormat(rl.relativeTime || {});
 			rl.I18N = null;
+			doc.documentElement.dir = I18N_DATA.LANG_DIR;
 			return 1;
 		}
 	},
@@ -41,12 +21,38 @@ const
 	i18nKey = key => key.replace(/([a-z])([A-Z])/g, '$1_$2').toUpperCase(),
 
 	getNotificationMessage = code => {
-		let key = getKeyByValue(Notification, code);
-		return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
-	};
+		let key = getKeyByValue(Notifications, code);
+		return key ? I18N_DATA.NOTIFICATIONS[key] : '';
+	},
+
+	fromNow = date => relativeTime(Math.round((date.getTime() - Date.now()) / 1000));
 
 export const
-	trigger = ko.observable(false),
+	translateTrigger = ko.observable(false),
+
+	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
+	// see /snappymail/v/0.0.0/app/localization/relativetimeformat/
+	relativeTime = seconds => {
+		let unit = 'second',
+			t = [[60,'minute'],[3600,'hour'],[86400,'day'],[2628000,'month'],[31536000,'year']],
+			i = 5,
+			abs = Math.abs(seconds);
+		while (i--) {
+			if (t[i][0] <= abs) {
+				seconds = Math.round(seconds / t[i][0]);
+				unit = t[i][1];
+				break;
+			}
+		}
+		if (Intl.RelativeTimeFormat) {
+			return (new Intl.RelativeTimeFormat(doc.documentElement.lang)).format(seconds, unit);
+		}
+		// Safari < 14
+		abs = Math.abs(seconds);
+		let rtf = rl.relativeTime.long[unit][0 > seconds ? 'past' : 'future'],
+			plural = rl.relativeTime.plural(abs);
+		return (rtf[plural] || rtf).replace('{0}', abs);
+	},
 
 	/**
 	 * @param {string} key
@@ -55,18 +61,14 @@ export const
 	 * @returns {string}
 	 */
 	i18n = (key, valueList, defaulValue) => {
-		let result = defaulValue || key;
-		if (key) {
-			let path = key.split('/');
-			if (I18N_DATA[path[0]] && path[1]) {
-				result = I18N_DATA[path[0]][path[1]] || result;
-			}
-		}
-		if (valueList) {
-			forEachObjectEntry(valueList, (key, value) => {
-				result = result.replace('%' + key + '%', value);
-			});
+		let result = defaulValue ?? key;
+		let path = key.split('/');
+		if (I18N_DATA[path[0]] && path[1]) {
+			result = I18N_DATA[path[0]][path[1]] || result;
 		}
+		valueList && forEachObjectEntry(valueList, (key, value) => {
+			result = result.replace('%' + key + '%', value);
+		});
 		return result;
 	},
 
@@ -76,35 +78,56 @@ export const
 	 */
 	i18nToNodes = element =>
 		setTimeout(() =>
-			element.querySelectorAll('[data-i18n]').forEach(item => i18nToNode(item))
+			element.querySelectorAll('[data-i18n]').forEach(element => {
+				const key = element.dataset.i18n;
+				if ('[' === key[0]) {
+					switch (key.slice(1, 6)) {
+						case 'html]':
+							element.innerHTML = i18n(key.slice(6));
+							break;
+						case 'place':
+							element.placeholder = i18n(key.slice(13));
+							break;
+						case 'title':
+							element.title = i18n(key.slice(7));
+							break;
+						// no default
+					}
+				} else {
+					element.textContent = i18n(key);
+				}
+			})
 		, 1),
 
 	timestampToString = (timeStampInUTC, formatStr) => {
 		const now = Date.now(),
-			time = 0 < timeStampInUTC ? Math.min(now, timeStampInUTC * 1000) : (0 === timeStampInUTC ? now : 0);
-
+			time = 0 < timeStampInUTC ? timeStampInUTC * 1000 : (0 === timeStampInUTC ? now : 0);
 		if (31536000000 < time) {
-			const m = new Date(time);
+			const m = new Date(time), h = LanguageStore.hourCycle();
 			switch (formatStr) {
 				case 'FROMNOW':
-					return m.fromNow();
-				case 'SHORT': {
-					if (4 >= (now - time) / 3600000)
-						return m.fromNow();
-					const mt = m.getTime(), date = new Date,
+					return fromNow(m);
+				case 'AUTO': {
+					// 4 hours
+					if (14400000 >= now - time)
+						return fromNow(m);
+					const date = new Date,
 						dt = date.setHours(0,0,0,0);
-					if (mt > dt)
-						return i18n('MESSAGE_LIST/TODAY_AT', {TIME: m.format('LT')});
-					if (mt > dt - 86400000)
-						return i18n('MESSAGE_LIST/YESTERDAY_AT', {TIME: m.format('LT')});
-					if (date.getFullYear() === m.getFullYear())
-						return m.format('d M');
-					return m.format('LL');
+					return (time > dt - 86400000)
+						? i18n(
+							time > dt ? 'MESSAGE_LIST/TODAY_AT' : 'MESSAGE_LIST/YESTERDAY_AT',
+							{TIME: m.format('LT',0,h)}
+						)
+						: m.format(
+							date.getFullYear() === m.getFullYear()
+								? {day: '2-digit', month: 'short', hour: 'numeric', minute: 'numeric'}
+								: {dateStyle: 'medium', timeStyle: 'short'}
+							, 0, h);
 				}
 				case 'FULL':
-					return m.format('LLL');
+					return m.format('LLL',0,h);
 				default:
-					return m.format(formatStr);
+					return m.format(formatStr,0,h);
 			}
 		}
 
@@ -114,18 +137,17 @@ export const
 	timeToNode = (element, time) => {
 		try {
 			if (time) {
-				element.dateTime = (new Date(time * 1000)).format('Y-m-d\\TH:i:s');
+				element.dateTime = new Date(time * 1000).toISOString();
 			} else {
 				time = Date.parse(element.dateTime) / 1000;
 			}
 
-			let key = element.dataset.momentFormat;
+			let key = element.dataset.timeFormat;
 			if (key) {
 				element.textContent = timestampToString(time, key);
-			}
-
-			if ((key = element.dataset.momentFormatTitle)) {
-				element.title = timestampToString(time, key);
+				if ('FULL' !== key && 'FROMNOW' !== key) {
+					element.title = timestampToString(time, 'FULL');
+				}
 			}
 		} catch (e) {
 			// prevent knockout crashes
@@ -133,18 +155,16 @@ export const
 		}
 	},
 
-	reloadTime = () => setTimeout(() =>
-			doc.querySelectorAll('time').forEach(element => timeToNode(element))
-			, 1),
+	reloadTime = () => doc.querySelectorAll('time').forEach(element => timeToNode(element)),
 
 	/**
 	 * @param {Function} startCallback
 	 * @param {Function=} langCallback = null
 	 */
-	initOnStartOrLangChange = (startCallback, langCallback = null) => {
-		startCallback && startCallback();
-		startCallback && trigger.subscribe(startCallback);
-		langCallback && trigger.subscribe(langCallback);
+	initOnStartOrLangChange = (startCallback, langCallback) => {
+		startCallback?.();
+		startCallback && translateTrigger.subscribe(startCallback);
+		langCallback && translateTrigger.subscribe(langCallback);
 	},
 
 	/**
@@ -154,16 +174,19 @@ export const
 	 * @returns {string}
 	 */
 	getNotification = (code, message = '', defCode = 0) => {
-		code = parseInt(code, 10) || 0;
-		if (Notification.ClientViewError === code && message) {
+		code = pInt(code);
+		if (Notifications.ClientViewError === code && message) {
 			return message;
 		}
 
 		return getNotificationMessage(code)
-			|| getNotificationMessage(parseInt(defCode, 10))
+			|| getNotificationMessage(pInt(defCode))
 			|| '';
 	},
 
+	getErrorMessage = (code, data) =>
+		getNotification(code) || data?.messageAdditional || data?.message || data,
+
 	/**
 	 * @param {*} code
 	 * @returns {string}
@@ -177,27 +200,26 @@ export const
 	 * @param {boolean} admin
 	 * @param {string} language
 	 */
-	translatorReload = (admin, language) =>
+	translatorReload = (language, admin) =>
 		new Promise((resolve, reject) => {
 			const script = createElement('script');
 			script.onload = () => {
 				// reload the data
 				if (init()) {
 					i18nToNodes(doc);
-					admin || reloadTime();
-					trigger(!trigger());
+					translateTrigger(!translateTrigger());
+//					admin || reloadTime();
 				}
 				script.remove();
 				resolve();
 			};
-			script.onerror = () => reject(new Error('Language '+language+' failed'));
+			script.onerror = () => reject(Error('Language '+language+' failed'));
 			script.src = langLink(language, admin);
 	//		script.async = true;
 			doc.head.append(script);
 		}),
 
 	/**
-	 *
 	 * @param {string} language
 	 * @param {boolean=} isEng = false
 	 * @returns {string}
@@ -207,6 +229,8 @@ export const
 			'LANGS_NAMES' + (true === isEng ? '_EN' : '') + '/' + language,
 			null,
 			language
-		);
+		),
+
+	baseCollator = numeric => new Intl.Collator(doc.documentElement.lang, {numeric: !!numeric, sensitivity: 'base'});
 
 init();
diff --git a/dev/Common/Utils.js b/dev/Common/Utils.js
index 98cc9cffd..d4616f30d 100644
--- a/dev/Common/Utils.js
+++ b/dev/Common/Utils.js
@@ -1,9 +1,3 @@
-import { SaveSettingsStep } from 'Common/Enums';
-import { elementById } from 'Common/Globals';
-
-let __themeTimer = 0,
-	__themeJson = null;
-
 export const
 	isArray = Array.isArray,
 	arrayLength = array => isArray(array) && array.length,
@@ -16,56 +10,22 @@ export const
 
 	pInt = (value, defaultValue = 0) => {
 		value = parseInt(value, 10);
-		return isNaN(value) || !isFinite(value) ? defaultValue : value;
+		return isFinite(value) ? value : defaultValue;
 	},
 
-	convertThemeName = theme => theme
-		.replace(/@custom$/, '')
-		.replace(/([A-Z])/g, ' $1')
-		.replace(/[^a-zA-Z0-9]+/g, ' ')
-		.trim(),
-
 	defaultOptionsAfterRender = (domItem, item) =>
-		domItem && item && undefined !== item.disabled
-		&& domItem.classList.toggle('disabled', domItem.disabled = item.disabled),
+		item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled),
 
 	// unescape(encodeURIComponent()) makes the UTF-16 DOMString to an UTF-8 string
-	b64EncodeJSON = data => btoa(unescape(encodeURIComponent(JSON.stringify(data)))),
+	b64Encode = data => btoa(unescape(encodeURIComponent(data))),
 /* 	// Without deprecated 'unescape':
-	b64EncodeJSON = data => btoa(encodeURIComponent(JSON.stringify(data)).replace(
+	b64Encode = data => btoa(encodeURIComponent(data).replace(
 		/%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode('0x' + p1)
 	)),
 */
+
+	b64EncodeJSON = data => b64Encode(JSON.stringify(data)),
+
 	b64EncodeJSONSafe = data => b64EncodeJSON(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
 
-	changeTheme = (value, themeTrigger = ()=>0) => {
-		const themeStyle = elementById('app-theme-style'),
-			clearTimer = () => {
-				__themeTimer = setTimeout(() => themeTrigger(SaveSettingsStep.Idle), 1000);
-				__themeJson = null;
-			},
-			url = themeStyle.dataset.href.replace(/(Admin|User)\/-\/[^/]+\//, '$1/-/' + value + '/') + 'Json/';
-
-		clearTimeout(__themeTimer);
-
-		themeTrigger(SaveSettingsStep.Animate);
-
-		if (__themeJson) {
-			__themeJson.abort();
-		}
-		let init = {};
-		if (window.AbortController) {
-			__themeJson = new AbortController();
-			init.signal = __themeJson.signal;
-		}
-		rl.fetchJSON(url, init)
-			.then(data => {
-				if (2 === arrayLength(data)) {
-					themeStyle.textContent = data[1];
-					themeTrigger(SaveSettingsStep.TrueResult);
-				}
-			})
-			.then(clearTimer, clearTimer);
-	},
-
 	getKeyByValue = (o, v) => Object.keys(o).find(key => o[key] === v);
diff --git a/dev/Common/UtilsUser.js b/dev/Common/UtilsUser.js
index 23566440b..503cd793b 100644
--- a/dev/Common/UtilsUser.js
+++ b/dev/Common/UtilsUser.js
@@ -1,29 +1,74 @@
-import { MessageFlagsCache, addRequestedMessage } from 'Common/Cache';
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { MessageSetAction, ComposeType/*, FolderType*/ } from 'Common/EnumsUser';
-import { doc, createElement, elementById, dropdowns, dropdownVisibility } from 'Common/Globals';
+import { doc, createElement, elementById, dropdowns, dropdownVisibility, SettingsGet, leftPanelDisabled } from 'Common/Globals';
 import { plainToHtml } from 'Common/Html';
 import { getNotification } from 'Common/Translator';
-import { EmailModel } from 'Model/Email';
-import { MessageModel } from 'Model/Message';
+import { EmailCollectionModel } from 'Model/EmailCollection';
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import * as Local from 'Storage/Client';
 import { ThemeStore } from 'Stores/Theme';
 import Remote from 'Remote/User/Fetch';
+import { attachmentDownload } from 'Common/Links';
+
+import { AccountModel } from 'Model/Account';
+import { IdentityModel } from 'Model/Identity';
+import { AccountUserStore } from 'Stores/User/Account';
+import { IdentityUserStore } from 'Stores/User/Identity';
+import { isArray } from 'Common/Utils';
+
+import { showScreenPopup } from 'Knoin/Knoin';
+import { IdentityPopupView } from 'View/Popup/Identity';
 
 export const
 
+// 1 = move, 2 = copy
+moveAction = ko.observable(0),
+
 dropdownsDetectVisibility = (() =>
 	dropdownVisibility(!!dropdowns.find(item => item.classList.contains('show')))
 ).debounce(50),
 
+
+editIdentity = Identity => showScreenPopup(IdentityPopupView, [Identity]),
+
+loadAccountsAndIdentities = () => {
+	AccountUserStore.loading(true);
+	IdentityUserStore.loading(true);
+
+	Remote.request('AccountsAndIdentities', (iError, oData) => {
+		AccountUserStore.loading(false);
+		IdentityUserStore.loading(false);
+
+		if (!iError) {
+			let items = oData.Result.Accounts;
+			AccountUserStore(isArray(items)
+				? items.map(oValue => new AccountModel(oValue.email, oValue.name))
+				: []
+			);
+			AccountUserStore.unshift(new AccountModel(SettingsGet('mainEmail'), '', false));
+
+			items = oData.Result.Identities;
+			IdentityUserStore(isArray(items)
+				? items.map(identityData => IdentityModel.reviveFromJson(identityData))
+				: []
+			);
+
+			// Invoke "Update Identity" pop up right after login
+			// https://github.com/the-djmaze/snappymail/issues/1689
+			const main = IdentityUserStore.main();
+			main && !main.exists() && setTimeout(()=>editIdentity(main), 1000);
+		}
+	});
+},
+
 /**
  * @param {string} link
  * @returns {boolean}
  */
 download = (link, name = "") => {
+	console.log('download: '+link);
 	// Firefox 98 issue https://github.com/the-djmaze/snappymail/issues/301
 	if (ThemeStore.isMobile() || /firefox/i.test(navigator.userAgent)) {
 		open(link, '_blank');
@@ -39,6 +84,29 @@ download = (link, name = "") => {
 	}
 },
 
+downloadZip = (name, hashes, onError, fTrigger, folder) => {
+	if (hashes.length) {
+		let params = {
+			target: 'zip',
+			filename: name,
+			hashes: hashes
+		};
+		if (!onError) {
+			onError = () => alert('Download failed');
+		}
+		if (folder) {
+			params.folder = folder;
+//			params.uids = uids;
+		}
+		Remote.post('AttachmentsActions', fTrigger || null, params)
+		.then(result => {
+			let hash = result?.Result?.fileHash;
+			hash ? download(attachmentDownload(hash), hash+'.zip') : onError();
+		})
+		.catch(onError);
+	}
+},
+
 /**
  * @returns {function}
  */
@@ -47,27 +115,24 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
 		const currentPage = koCurrentPage(),
 			pageCount = koPageCount(),
 			result = [],
+			lang = doc.documentElement.lang,
 			fAdd = (index, push = true, customName = '') => {
-				const data = {
-					current: index === currentPage,
-					name: customName ? customName.toString() : index.toString(),
-					custom: !!customName,
-					title: customName ? index.toString() : '',
-					value: index.toString()
-				};
+				const name = index.toLocaleString(lang),
+					data = {
+						current: index === currentPage,
+						name: customName || name,
+						title: customName ? name : '',
+						value: index
+					};
 
-				if (push) {
-					result.push(data);
-				} else {
-					result.unshift(data);
-				}
+				push ? result.push(data) : result.unshift(data);
 			};
 
 		let prev = 0,
 			next = 0,
 			limit = 2;
 
-		if (1 < pageCount || (0 < pageCount && pageCount < currentPage)) {
+		if (1 < pageCount) {
 			if (pageCount < currentPage) {
 				fAdd(pageCount);
 				prev = pageCount;
@@ -130,33 +195,19 @@ computedPaginatorHelper = (koCurrentPage, koPageCount) => {
  * @returns {boolean}
  */
 mailToHelper = mailToUrl => {
-	if (mailToUrl && 'mailto:' === mailToUrl.slice(0, 7).toLowerCase()) {
+	if ('mailto:' === mailToUrl?.slice(0, 7).toLowerCase()) {
 		mailToUrl = mailToUrl.slice(7).split('?');
 
 		const
-			email = mailToUrl[0],
+			email = decodeURIComponent(mailToUrl[0]),
 			params = new URLSearchParams(mailToUrl[1]),
-			toEmailModel = value => null != value ? EmailModel.parseEmailLine(value) : null;
+			to = params.get('to'),
+			toEmailModel = value => EmailCollectionModel.fromString(value);
 
 		showMessageComposer([
 			ComposeType.Empty,
 			null,
-			params.get('to')
-				? Object.values(
-						toEmailModel(email + ',' + params.get('to')).reduce((result, value) => {
-							if (value) {
-								if (result[value.email]) {
-									if (!result[value.email].name) {
-										result[value.email] = value;
-									}
-								} else {
-									result[value.email] = value;
-								}
-							}
-							return result;
-						}, {})
-					)
-				: EmailModel.parseEmailLine(email),
+			toEmailModel(to ? email + ',' + to : email),
 			toEmailModel(params.get('cc')),
 			toEmailModel(params.get('bcc')),
 			params.get('subject'),
@@ -174,26 +225,27 @@ showMessageComposer = (params = []) =>
 	rl.app.showMessageComposer(params);
 },
 
-setLayoutResizer = (source, target, sClientSideKeyName, mode) =>
+setLayoutResizer = (source, sClientSideKeyName, mode) =>
 {
 	if (source.layoutResizer && source.layoutResizer.mode != mode) {
-		target.removeAttribute('style');
 		source.removeAttribute('style');
 	}
+	source.observer?.disconnect();
 //	source.classList.toggle('resizable', mode);
 	if (mode) {
-		const length = Local.get(sClientSideKeyName+mode);
+		const length = Local.get(sClientSideKeyName + mode) || SettingsGet('Resizer' + sClientSideKeyName + mode);
+		if (length) {
+			source.style[mode.toLowerCase()] = length + 'px';
+		}
 		if (!source.layoutResizer) {
 			const resizer = createElement('div', {'class':'resizer'}),
+				save = (data => Remote.saveSettings(0, data)).debounce(500),
 				size = {},
 				store = () => {
-					if ('Width' == resizer.mode) {
-						target.style.left = source.offsetWidth + 'px';
-						Local.set(resizer.key+resizer.mode, source.offsetWidth);
-					} else {
-						target.style.top = (4 + source.offsetTop + source.offsetHeight) + 'px';
-						Local.set(resizer.key+resizer.mode, source.offsetHeight);
-					}
+					const value = ('Width' == resizer.mode) ? source.offsetWidth : source.offsetHeight,
+						prop = resizer.key + resizer.mode;
+					(value == Local.get(prop)) || Local.set(prop, value);
+					(value == SettingsGet('Resizer' + prop)) || save({['Resizer' + prop]: value});
 				},
 				cssint = s => {
 					let value = getComputedStyle(source, null)[s].replace('px', '');
@@ -233,130 +285,90 @@ setLayoutResizer = (source, target, sClientSideKeyName, mode) =>
 		}
 		source.layoutResizer.mode = mode;
 		source.layoutResizer.key = sClientSideKeyName;
-		source.observer && source.observer.observe(source, { box: 'border-box' });
-		if (length) {
-			source.style[mode] = length + 'px';
-		}
-	} else {
-		source.observer && source.observer.disconnect();
+		source.observer?.observe(source, { box: 'border-box' });
 	}
 },
 
-populateMessageBody = (oMessage, preload) => {
+viewMessage = (oMessage, popup) => {
+	if (popup) {
+		oMessage.popupMessage();
+	} else {
+		MessageUserStore.error('');
+		let id = 'rl-msg-' + oMessage.hash,
+			body = oMessage.body || elementById(id);
+		if (!body) {
+			body = createElement('div',{
+				id:id,
+				hidden:'',
+				class:'b-text-part'
+					+ (oMessage.pgpSigned() ? ' openpgp-signed' : '')
+					+ (oMessage.pgpEncrypted() ? ' openpgp-encrypted' : '')
+					+ (oMessage.smimeSigned() ? ' smime-signed' : '')
+					+ (oMessage.smimeEncrypted() ? ' smime-encrypted' : '')
+			});
+			MessageUserStore.purgeCache();
+		}
+
+		body.message = oMessage;
+		oMessage.body = body;
+
+		if (!SettingsUserStore.viewHTML() || !oMessage.viewHtml()) {
+			oMessage.viewPlain();
+		}
+
+		MessageUserStore.bodiesDom().append(body);
+
+		MessageUserStore.loading(false);
+		oMessage.body.hidden = false;
+
+		if (oMessage.isUnseen() && SettingsUserStore.messageReadAuto()) {
+			MessageUserStore.MessageSeenTimer = setTimeout(
+				() => MessagelistUserStore.setAction(oMessage.folder, MessageSetAction.SetSeen, [oMessage]),
+				SettingsUserStore.messageReadDelay() * 1000 // seconds
+			);
+		}
+	}
+},
+
+populateMessageBody = (oMessage, popup) => {
 	if (oMessage) {
-		preload || MessageUserStore.hideMessageBodies();
-		preload || MessageUserStore.loading(true);
-		Remote.message((iError, oData/*, bCached*/) => {
-			if (iError) {
-				if (Notification.RequestAborted !== iError && !preload) {
-					MessageUserStore.message(null);
-					MessageUserStore.error(getNotification(iError));
-				}
-			} else {
-				oMessage = preload ? oMessage : null;
-				let
-					isNew = false,
-					json = oData && oData.Result,
-					message = oMessage || MessageUserStore.message();
-
-				if (
-					json &&
-					MessageModel.validJson(json) &&
-					message &&
-					message.folder === json.Folder
-				) {
-					const threads = message.threads(),
-						messagesDom = MessageUserStore.bodiesDom();
-					if (!oMessage && message.uid != json.Uid && threads.includes(json.Uid)) {
-						message = MessageModel.reviveFromJson(json);
-						if (message) {
-							message.threads(threads);
-							MessageFlagsCache.initMessage(message);
-
-							// Set clone
-							MessageUserStore.message(MessageModel.fromMessageListItem(message));
-							message = MessageUserStore.message();
-
-							isNew = true;
-						}
+		popup || MessageUserStore.message(oMessage);
+		if (oMessage.body) {
+			viewMessage(oMessage, popup);
+		} else {
+			popup || MessageUserStore.loading(true);
+			Remote.message((iError, oData/*, bCached*/) => {
+				if (iError) {
+					if (Notifications.RequestAborted !== iError && !popup) {
+						MessageUserStore.message(null);
+						MessageUserStore.error(getNotification(iError));
 					}
-
-					if (message && message.uid == json.Uid) {
-						oMessage || MessageUserStore.error('');
+				} else {
+					let json = oData?.Result;
+					if (json
+						&& ((
+								oMessage.hash && oMessage.hash === json.hash
+							) || (
+								!oMessage.hash
+								&& oMessage.folder === json.folder
+								&& oMessage.uid == json.uid)
+						)
+						&& oMessage.revivePropertiesFromJson(json)
+					) {
 /*
 						if (bCached) {
-							delete json.Flags;
+							delete json.flags;
 						}
+						oMessage.body.remove();
 */
-						isNew || message.revivePropertiesFromJson(json);
-						addRequestedMessage(message.folder, message.uid);
-						if (messagesDom) {
-							let id = 'rl-msg-' + message.hash.replace(/[^a-zA-Z0-9]/g, ''),
-								body = elementById(id);
-							if (body) {
-								message.body = body;
-								message.isHtml(body.classList.contains('html'));
-								message.hasImages(body.rlHasImages);
-							} else {
-								body = Element.fromHTML('<div id="' + id + '" hidden="" class="b-text-part '
-									+ (message.pgpSigned() ? ' openpgp-signed' : '')
-									+ (message.pgpEncrypted() ? ' openpgp-encrypted' : '')
-									+ '">'
-									+ '</div>');
-								message.body = body;
-								if (!SettingsUserStore.viewHTML() || !message.viewHtml()) {
-									message.viewPlain();
-								}
-
-								MessageUserStore.purgeMessageBodyCache();
-							}
-
-							messagesDom.append(body);
-
-							if (!oMessage) {
-								MessageUserStore.activeDom(message.body);
-								MessageUserStore.hideMessageBodies();
-								message.body.hidden = false;
-							}
-							oMessage && message.viewPopupMessage();
-						}
-
-						MessageFlagsCache.initMessage(message);
-						if (message.isUnseen()) {
-							MessageUserStore.MessageSeenTimer = setTimeout(
-								() => MessagelistUserStore.setAction(message.folder, MessageSetAction.SetSeen, [message]),
-								SettingsUserStore.messageReadDelay() * 1000 // seconds
-							);
-						}
-
-						if (message && isNew) {
-							let selectedMessage = MessagelistUserStore.selectedMessage();
-							if (
-								selectedMessage &&
-								(message.folder !== selectedMessage.folder || message.uid != selectedMessage.uid)
-							) {
-								MessagelistUserStore.selectedMessage(null);
-								if (1 === MessagelistUserStore.length) {
-									MessagelistUserStore.focusedMessage(null);
-								}
-							} else if (!selectedMessage) {
-								selectedMessage = MessagelistUserStore.find(
-									subMessage =>
-										subMessage &&
-										subMessage.folder === message.folder &&
-										subMessage.uid == message.uid
-								);
-
-								if (selectedMessage) {
-									MessagelistUserStore.selectedMessage(selectedMessage);
-									MessagelistUserStore.focusedMessage(selectedMessage);
-								}
-							}
-						}
+						viewMessage(oMessage, popup);
 					}
 				}
-			}
-			preload || MessageUserStore.loading(false);
-		}, oMessage.folder, oMessage.uid);
+				popup || MessageUserStore.loading(false);
+			}, oMessage.folder, oMessage.uid);
+		}
 	}
 };
+
+leftPanelDisabled.subscribe(value => value && moveAction(0));
+moveAction.subscribe(value => value && leftPanelDisabled(false));
diff --git a/dev/Component/AbstractCheckbox.js b/dev/Component/AbstractCheckbox.js
deleted file mode 100644
index 812da3108..000000000
--- a/dev/Component/AbstractCheckbox.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import ko from 'ko';
-
-export class AbstractCheckbox {
-	/**
-	 * @param {Object} params = {}
-	 */
-	constructor(params = {}) {
-		this.value = ko.isObservable(params.value) ? params.value
-			: ko.observable(!!params.value);
-
-		this.enable = ko.isObservable(params.enable) ? params.enable
-			: ko.observable(undefined === params.enable || !!params.enable);
-
-		this.label = params.label || '';
-		this.inline = !!params.inline;
-
-		this.labeled = undefined !== params.label;
-	}
-
-	click() {
-		this.enable() && this.value(!this.value());
-	}
-}
diff --git a/dev/Component/AbstractInput.js b/dev/Component/AbstractInput.js
deleted file mode 100644
index 63a8830db..000000000
--- a/dev/Component/AbstractInput.js
+++ /dev/null
@@ -1,57 +0,0 @@
-import ko from 'ko';
-import { pInt } from 'Common/Utils';
-import { SaveSettingsStep } from 'Common/Enums';
-import { koComputable } from 'External/ko';
-import { dispose } from 'External/ko';
-
-export class AbstractInput {
-	/**
-	 * @param {Object} params
-	 */
-	constructor(params) {
-		this.value = params.value || '';
-		this.label = params.label || '';
-		this.enable = null == params.enable ? true : params.enable;
-		this.trigger = params.trigger && params.trigger.subscribe ? params.trigger : null;
-		this.placeholder = params.placeholder || '';
-
-		this.labeled = null != params.label;
-
-		let size = 0 < params.size ? 'span' + params.size : '';
-		if (this.trigger) {
-			const
-				classForTrigger = ko.observable(''),
-				setTriggerState = value => {
-					switch (pInt(value)) {
-						case SaveSettingsStep.TrueResult:
-							classForTrigger('success');
-							break;
-						case SaveSettingsStep.FalseResult:
-							classForTrigger('error');
-							break;
-						default:
-							classForTrigger('');
-							break;
-					}
-				};
-
-			setTriggerState(this.trigger());
-
-			this.className = koComputable(() =>
-				(size + ' settings-saved-trigger-input ' + classForTrigger()).trim()
-			);
-
-			this.disposables = [
-				this.trigger.subscribe(setTriggerState, this),
-				this.className
-			];
-		} else {
-			this.className = size;
-			this.disposables = [];
-		}
-	}
-
-	dispose() {
-		this.disposables.forEach(dispose);
-	}
-}
diff --git a/dev/Component/Checkbox.js b/dev/Component/Checkbox.js
index 9927babdc..b0675cd2b 100644
--- a/dev/Component/Checkbox.js
+++ b/dev/Component/Checkbox.js
@@ -1,3 +1,17 @@
-import { AbstractCheckbox } from 'Component/AbstractCheckbox';
+export class CheckboxComponent {
+	constructor(params = {}) {
+		this.name = params.name;
 
-export class CheckboxComponent extends AbstractCheckbox {}
+		this.value = ko.isObservable(params.value) ? params.value
+			: ko.observable(!!params.value);
+
+		this.enable = ko.isObservable(params.enable) ? params.enable
+			: ko.observable(params.enable ?? 1);
+
+		this.label = params.label;
+	}
+
+	click() {
+		this.enable() && this.value(!this.value());
+	}
+}
diff --git a/dev/Component/EmailAddresses.js b/dev/Component/EmailAddresses.js
index 2122918a1..c4c6e364f 100644
--- a/dev/Component/EmailAddresses.js
+++ b/dev/Component/EmailAddresses.js
@@ -1,8 +1,30 @@
 import { doc, createElement, addEventsListeners } from 'Common/Globals';
 import { EmailModel } from 'Model/Email';
+import { addressparser } from 'Mime/Address';
 
 const contentType = 'snappymail/emailaddress',
-	getAddressKey = li => li && li.emailaddress && li.emailaddress.key;
+	getAddressKey = li => li?.emailaddress?.key,
+
+	parseEmailLine = line => addressparser(line).map(item =>
+			(item.name || item.email)
+				? new EmailModel(item.email, item.name) : null
+		).filter(v => v),
+	splitEmailLine = line => {
+		const result = [];
+		let exists = false;
+		addressparser(line).forEach(item => {
+			const address = (item.name || item.email)
+				? new EmailModel(item.email, item.name)
+				: null;
+
+			if (address?.email) {
+				exists = true;
+			}
+
+			result.push(address ? address.toLine() : item.name);
+		});
+		return exists ? result : null;
+	};
 
 let dragAddress, datalist;
 
@@ -17,9 +39,11 @@ export class EmailAddressesComponent {
 		}
 
 		const self = this,
+			input = createElement('input',{type:"text", list:datalist.id,
+				autocomplete:"off", autocorrect:"off", autocapitalize:"off"}),
 			// In Chrome we have no access to dataTransfer.getData unless it's the 'drop' event
 			// In Chrome Mobile dataTransfer.types.includes(contentType) fails, only text/plain is set
-			validDropzone = () => dragAddress && dragAddress.li.parentNode !== self.ul,
+			validDropzone = () => dragAddress?.li.parentNode !== self.ul,
 			fnDrag = e => validDropzone() && e.preventDefault();
 
 		self.element = element;
@@ -55,13 +79,12 @@ export class EmailAddressesComponent {
 			}
 		});
 
-		self.input = createElement('input',{type:"text", list:datalist.id,
-			autocomplete:"off", autocorrect:"off", autocapitalize:"off", spellcheck:"false"});
+		self.input = input;
 
-		addEventsListeners(self.input, {
+		addEventsListeners(input, {
 			focus: () => {
 				self._focusTrigger(true);
-				self.input.value || self._resetDatalist();
+				input.value || self._resetDatalist();
 			},
 			blur: () => {
 				// prevent autoComplete menu click from causing a false 'blur'
@@ -71,8 +94,7 @@ export class EmailAddressesComponent {
 			keydown: e => {
 				if ('Backspace' === e.key || 'ArrowLeft' === e.key) {
 					// if our input contains no value and backspace has been pressed, select the last tag
-					var lastTag = self.inputCont.previousElementSibling,
-						input = self.input;
+					var lastTag = self.inputCont.previousElementSibling;
 					if (lastTag && (!input.value
 						|| (('selectionStart' in input) && input.selectionStart === 0 && input.selectionEnd === 0))
 					) {
@@ -93,11 +115,11 @@ export class EmailAddressesComponent {
 
 		// define starting placeholder
 		if (element.placeholder) {
-			self.input.placeholder = element.placeholder;
+			input.placeholder = element.placeholder;
 		}
 
 		self.inputCont = createElement('li',{class:"emailaddresses-input"});
-		self.inputCont.append(self.input);
+		self.inputCont.append(input);
 		self.ul.append(self.inputCont);
 
 		element.replaceWith(self.ul);
@@ -109,14 +131,23 @@ export class EmailAddressesComponent {
 
 		self._updateDatalist = self.options.autoCompleteSource
 			? (() => {
-				let value = self.input.value.trim();
+				let value = input.value.trim();
 				if (datalist.inputValue !== value) {
 					datalist.inputValue = value;
 					value.length && self.options.autoCompleteSource(
-						{term:value},
+						value,
 						items => {
 							self._resetDatalist();
-							items && items.forEach(item => datalist.append(new Option(item)));
+							let chars = value.length;
+							items?.forEach(item => {
+								datalist.append(new Option(item));
+								chars = Math.max(chars, item.length);
+							});
+							// https://github.com/the-djmaze/snappymail/issues/368 and #513
+							chars *= 8;
+							if (input.clientWidth < chars) {
+								input.style.width = chars + 'px';
+							}
 						}
 					)
 				}
@@ -135,8 +166,10 @@ export class EmailAddressesComponent {
 
 	_parseInput(force) {
 		let val = this.input.value;
-		if (force || val.includes(',') || val.includes(';')) {
-			this._parseValue(val) && (this.input.value = '');
+		if ((force || val.includes(',') || val.includes(';')
+				|| (val.charAt(val.length-1)===' ' && this._simpleEmailMatch(val)))
+			&& this._parseValue(val)) {
+			this.input.value = '';
 		}
 		this._resizeInput();
 	}
@@ -145,8 +178,8 @@ export class EmailAddressesComponent {
 		if (val) {
 			const self = this,
 				v = val.trim(),
-				hook = (v && [',', ';', '\n'].includes(v.slice(-1))) ? EmailModel.splitEmailLine(val) : null,
-				values = (hook || [val]).map(value => EmailModel.parseEmailLine(value))
+				hook = (v && [',', ';', '\n'].includes(v.slice(-1))) ? splitEmailLine(val) : null,
+				values = (hook || [val]).map(value => parseEmailLine(value))
 						.flat(Infinity)
 						.map(item => (item.toLine ? [item.toLine(), item] : [item, null]));
 
@@ -166,7 +199,7 @@ export class EmailAddressesComponent {
 							lastIndex = kk;
 						}
 
-						vv.value === v && (exists = true);
+						exists |= vv.value === v;
 					});
 
 					if (v !== '' && a[1] && !exists) {
@@ -186,7 +219,7 @@ export class EmailAddressesComponent {
 					}
 				});
 
-				if (values.length === 1 && values[0] === '' && self._lastEdit !== '') {
+				if (1 === values.length && '' === values[0] && '' !== self._lastEdit) {
 					self._lastEdit = '';
 					self._renderTags();
 				}
@@ -202,7 +235,7 @@ export class EmailAddressesComponent {
 	_resizeInput() {
 		let input = this.input;
 		if (input.clientWidth < input.scrollWidth) {
-			input.style.width = Math.min(500, Math.max(200, input.scrollWidth)) + 'px';
+			input.style.width = (input.scrollWidth + 20) + 'px';
 		}
 	}
 
@@ -254,6 +287,13 @@ export class EmailAddressesComponent {
 		}
 	}
 
+	_simpleEmailMatch(value) {
+		// A very SIMPLE test to check if the value might be an email
+		const val = value.trim();
+		return /^[^@]*<[^\s@]{1,128}@[^\s@]{1,256}\.[\w]{2,32}>$/g.test(val)
+			|| /^[^\s@]{1,128}@[^\s@]{1,256}\.[\w]{2,32}$/g.test(val);
+	}
+
 	_renderTags() {
 		let self = this;
 		[...self.ul.children].forEach(node => node !== self.inputCont && node.remove());
@@ -262,7 +302,7 @@ export class EmailAddressesComponent {
 			if (v.obj) {
 				let li = createElement('li',{title:v.obj.toLine(),draggable:'true'}),
 					el = createElement('span');
-				el.append(v.obj.toLine(true, false, true));
+				el.append(v.obj.toLine(true));
 				li.append(el);
 
 				el = createElement('a',{href:'#', class:'ficon'});
diff --git a/dev/Component/Input.js b/dev/Component/Input.js
deleted file mode 100644
index ca0a450fa..000000000
--- a/dev/Component/Input.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AbstractInput } from 'Component/AbstractInput';
-
-export class InputComponent extends AbstractInput {}
diff --git a/dev/Component/MaterialDesign/Checkbox.js b/dev/Component/MaterialDesign/Checkbox.js
deleted file mode 100644
index 48cdcd72d..000000000
--- a/dev/Component/MaterialDesign/Checkbox.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AbstractCheckbox } from 'Component/AbstractCheckbox';
-
-export class CheckboxMaterialDesignComponent extends AbstractCheckbox {}
diff --git a/dev/Component/Select.js b/dev/Component/Select.js
index 482138e08..3c9a4ed8a 100644
--- a/dev/Component/Select.js
+++ b/dev/Component/Select.js
@@ -1,20 +1,56 @@
-import { i18n } from 'Common/Translator';
+import { SaveSettingStatus } from 'Common/Enums';
+import { dispose, koComputable } from 'External/ko';
 import { defaultOptionsAfterRender } from 'Common/Utils';
-import { AbstractInput } from 'Component/AbstractInput';
 
-export class SelectComponent extends AbstractInput {
+export class SelectComponent {
 	/**
 	 * @param {Object} params
 	 */
 	constructor(params) {
-		super(params);
+		this.value = params.value;
+		this.label = params.label;
+		this.trigger = params.trigger?.subscribe ? params.trigger : null;
+		this.placeholder = params.placeholder;
+		this.options = params.options;
+		this.optionsText = params.optionsText;
+		this.optionsValue = params.optionsValue;
 
-		this.options = params.options || '';
+		let size = 0 < params.size ? 'span' + params.size : '';
+		if (this.trigger) {
+			const
+				classForTrigger = ko.observable(''),
+				setTriggerState = value => {
+					switch (value) {
+						case SaveSettingStatus.Success:
+							classForTrigger('success');
+							break;
+						case SaveSettingStatus.Failed:
+							classForTrigger('error');
+							break;
+						default:
+							classForTrigger('');
+							break;
+					}
+				};
 
-		this.optionsText = params.optionsText || null;
-		this.optionsValue = params.optionsValue || null;
-		this.optionsCaption = i18n(params.optionsCaption || null);
+			setTriggerState(this.trigger());
+
+			this.className = koComputable(() =>
+				(size + ' settings-save-trigger-input ' + classForTrigger()).trim()
+			);
+
+			this.disposables = [
+				this.trigger.subscribe(setTriggerState, this),
+				this.className
+			];
+		} else {
+			this.className = size;
+		}
 
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 	}
+
+	dispose() {
+		this.disposables?.forEach(dispose);
+	}
 }
diff --git a/dev/Component/TextArea.js b/dev/Component/TextArea.js
deleted file mode 100644
index bc2ad55a9..000000000
--- a/dev/Component/TextArea.js
+++ /dev/null
@@ -1,13 +0,0 @@
-import { AbstractInput } from 'Component/AbstractInput';
-
-export class TextAreaComponent extends AbstractInput {
-	/**
-	 * @param {Object} params
-	 */
-	constructor(params) {
-		super(params);
-
-		this.rows = params.rows || 5;
-		this.spellcheck = !!params.spellcheck;
-	}
-}
diff --git a/dev/DAV/JCard.js b/dev/DAV/JCard.js
new file mode 100644
index 000000000..ad0850df8
--- /dev/null
+++ b/dev/DAV/JCard.js
@@ -0,0 +1,227 @@
+/**
+ * https://datatracker.ietf.org/doc/html/rfc7095
+ *
+ * Inspired by https://github.com/mcpar-land/vcfer
+ */
+
+import { VCardProperty } from './VCardProperty'
+
+export class JCard {
+
+	constructor(input)
+	{
+		this.props = new Map()
+		this.version = '4.0'
+		if (input) {
+			// read from jCard
+			if (typeof input !== 'object') {
+				throw Error('error reading vcard')
+			}
+			this.parseFromJCard(input)
+		}
+	}
+
+	parseFromJCard(json)
+	{
+		json = JSON.parse(JSON.stringify(json));
+		if (!/vcard/i.test(json[0])) {
+			throw new SyntaxError('Incorrect jCard format');
+		}
+		json[1].forEach(jprop => this.add(new VCardProperty(jprop)));
+	}
+
+	/**
+	 * Retrieve an array of {@link VCardProperty} objects under the specified field.
+	 * Returns [] if there are no VCardProperty objects found.
+	 * Properites are always stored in an array.
+	 * @param field to get.
+	 * @param type If provided, only return {@link VCardProperty}s with the specified
+	 * type as a param.
+	 */
+	get(field, type)
+	{
+		if (type) {
+			let props = this.props.get(field);
+			return props
+				? props.filter(prop => {
+					let types = prop.type;
+					return (Array.isArray(types) ? types : [types]).includes(type);
+				})
+				: [];
+		}
+		return this.props.get(field) || [];
+		// TODO with type filter-er
+	}
+
+	/**
+	 * Retrieve a _single_ VCardProperty of the specified field. Attempts to pick based
+	 * on the following priorities, in order:
+	 * - `TYPE={type}` of the value specified in the `type` argument. Ignored
+	 * if the argument isn't supplied.
+	 * - `TYPE=pref` is present.
+	 * - is the VCardProperty at index 0 from get(field)
+	 * @param field
+	 * @param type
+	 */
+	getOne(field, type)
+	{
+		return this.get(field, type || 'pref')[0] || this.get(field)[0];
+	}
+
+	/**
+	 * Set the contents of a field to contain a single {@link VCardProperty}.
+	 *
+	 * Accepts either 2-4 arguments to construct a VCardProperty,
+	 * or 1 argument of a preexisting VCardProperty object.
+	 *
+	 * This will always overwrite all existing properties of the given
+	 * field. For just adding a new VCardProperty, see {@link VCard#add}
+	 * @param arg the field, or a VCardProperty object
+	 * @param value the value for the VCardProperty object
+	 * @param params the parameters for the VCardProperty object
+	 * @param type the type for the VCardProperty object
+	 */
+	set(arg, value, params, type)
+	{
+		if (typeof arg === 'string') {
+			arg = new VCardProperty(String(arg), value, params, type);
+		}
+		if (!(arg instanceof VCardProperty)) {
+			throw Error('invalid argument of VCard.set(), expects string arguments or a VCardProperty');
+		}
+		let field = arg.getField();
+		this.props.set(field, [arg]);
+		return arg;
+	}
+
+	add(arg, value, params, type)
+	{
+		// string arguments
+		if (typeof arg === 'string') {
+			arg = new VCardProperty(String(arg), value, params, type);
+		}
+		if (!(arg instanceof VCardProperty)) {
+			throw Error('invalid argument of VCard.add(), expects string arguments or a VCardProperty');
+		}
+		// VCardProperty arguments
+		let field = arg.getField();
+		if (this.props.get(field)) this.props.get(field)?.push(arg)
+		else this.props.set(field, [arg])
+		return arg;
+	}
+
+	/**
+	 * Removes a {@link VCardProperty}, or all properties of the supplied field.
+	 * @param arg the field, or a {@link VCardProperty} object
+	 * @param paramFilter (incomplete)
+	 */
+	remove(arg) {
+		// string arguments
+		if (typeof arg === 'string') {
+			// TODO filter by param
+			this.props.delete(arg);
+		}
+		// VCardProperty argument
+		else if (arg instanceof VCardProperty) {
+			let propArray = this.props.get(arg.getField());
+			if (!propArray?.includes(arg))
+				throw Error("Attempted to remove VCardProperty VCard does not have: ".concat(arg));
+			propArray.splice(propArray.indexOf(arg), 1);
+			if (propArray.length === 0)
+				this.props.delete(arg.getField());
+		}
+		// incorrect arguments
+		else
+			throw Error('invalid argument of VCard.remove(), expects ' +
+				'string and optional param filter or a VCardProperty');
+	}
+
+	/**
+	 * Returns true if the vCard has at least one @{link VCardProperty}
+	 * of the given field.
+	 * @param field The field to query
+	 */
+	has(field)
+	{
+		return (!!this.props.get(field) && this.props.get(field).length > 0);
+	}
+
+
+	/**
+	 * Returns stringified JSON
+	 */
+	toString()
+	{
+		return JSON.stringify(this);
+	}
+
+	/**
+	 * Returns a {@link JCard} object as a JSON array.
+	 */
+	toJSON()
+	{
+		let data = [['version', {}, 'text', '4.0']];
+/*
+		this.props.forEach((props, field) =>
+			(field === 'version')  || props.forEach(prop => prop.isEmpty() || data.push(prop.toJSON()))
+		);
+*/
+		for (const [field, props] of this.props.entries()) {
+			if ('version' !== field) {
+				for (const prop of props) {
+					prop.isEmpty() || data.push(prop.toJSON());
+				}
+			}
+		}
+
+		return ['vcard', data];
+	}
+
+	/**
+	 * Automatically generate the 'fn' VCardProperty from the preferred 'n' VCardProperty.
+	 *
+	 * #### `set` (`boolean`)
+	 *
+	 * - `false`: (default) return the generated full name string without
+	 * modifying the VCard.
+	 *
+	 * - `true`: modify the VCard's `fn` VCardProperty directly, as specified
+	 * by `append`
+	 *
+	 * #### `append` (`boolean`)
+	 *
+	 * (ignored if `set` is `false`)
+	 *
+	 * - `false`: (default) replace the existing 'fn' VCardProperty/properties with
+	 * a new one.
+	 *
+	 * - `true`: append a new `fn` VCardProperty to the array.
+	 *
+	 * see: [RFC 6350 section 6.2.1](https://tools.ietf.org/html/rfc6350#section-6.2.1)
+	 */
+	parseFullName(options) {
+		let n = this.getOne('n');
+		if (n === undefined) {
+			throw Error('\'fn\' VCardProperty not present in card, cannot parse full name');
+		}
+		let fnString = '';
+		// Position in n -> position in fn
+		[3, 1, 2, 0, 4].forEach(pos => {
+			let splitStr = n.value[pos];
+			if (splitStr) {
+				// comma separated values separated by spaces
+				fnString += ' ' + splitStr.replace(',', ' ');
+			}
+		});
+		fnString = fnString.trim();
+		let fn = new VCardProperty('fn', fnString);
+		if (options?.set) {
+			if (options.append) {
+				this.add(fn);
+			} else {
+				this.set(fn);
+			}
+		}
+		return fn;
+	}
+}
diff --git a/dev/DAV/VCardProperty.js b/dev/DAV/VCardProperty.js
new file mode 100644
index 000000000..30fd8813e
--- /dev/null
+++ b/dev/DAV/VCardProperty.js
@@ -0,0 +1,146 @@
+/**
+ * Inspired by https://github.com/mcpar-land/vcfer
+ */
+
+export class VCardProperty {
+
+	/**
+	 * A class describing a single vCard property.
+	 * Will almost always be a member of a
+	 * {@link VCard}'s [props]{@link VCard.props} map.
+	 *
+	 * Accepts either 2-4 arguments, or 1 argument in jCard property format.
+	 * @param arg the field, or a jCard property
+	 * @param value
+	 * @param params
+	 * @param type
+	 */
+	constructor(arg, value, params, type = 'text')
+	{
+		this.field = '';
+
+		/**
+		 * the value of the property.
+		 * @example '(123) 456 7890'
+		 */
+		this.value = '';
+
+		/**
+		 * the type of the property value.
+		 * @example 'text'
+		 */
+		this.type = '';
+
+		/**
+		 * https://www.rfc-editor.org/rfc/rfc6350.html#section-5
+		 * An jCard parameters object.
+		 * @example
+		 * {
+		 * 	type: ['work', 'voice', 'pref'],
+		 * 	value: 'uri'
+		 * }
+		 */
+		this.params = {};
+
+		// Construct from arguments
+		if (value !== undefined && typeof arg === 'string') {
+			this.field = arg;
+			this.value = value;
+			this.params = params || {};
+			this.type = type;
+		}
+		// construct from jcard
+		else if (value === undefined && params === undefined && typeof arg === 'object') {
+			this.parseFromJCardProperty(arg);
+		}
+		// invalid property
+		else {
+			throw Error('invalid Property constructor');
+		}
+	}
+
+	parseFromJCardProperty(jCardProp)
+	{
+		jCardProp = JSON.parse(JSON.stringify(jCardProp));
+		this.field = jCardProp[0].toLowerCase();
+		this.params = jCardProp[1];
+		this.type = jCardProp[2];
+		this.value = jCardProp[3];
+	}
+
+	addParam(key, value)
+	{
+		if (Array.isArray(this.params[key])) {
+			this.params[key].push(value);
+		}
+		else if (this.params[key] != null) {
+			this.params[key] = [this.params[key], value];
+		}
+		else {
+			this.params[key] = value;
+		}
+	}
+
+	/** Returns a copy of the Property's string value. */
+	getValue()
+	{
+		return '' + this.value;
+	}
+
+	/**
+	 * https://www.rfc-editor.org/rfc/rfc6350.html#section-5.3
+	 */
+	pref()
+	{
+		return this.params.pref || 100;
+	}
+
+	/**
+	 * https://www.rfc-editor.org/rfc/rfc6350.html#section-5.6
+	 */
+	tags()
+	{
+		return this.params.type || [];
+	}
+
+	/** Returns `true` if all the following are true:
+	 * - the property's value contains charactes other than `;`
+	 * - the property has no parameters
+	 */
+	isEmpty()
+	{
+		return ((null == this.value || !/[^;]+/.test(this.value)) && !Object.keys(this.params).length);
+	}
+
+	notEmpty()
+	{
+		return !this.isEmpty();
+	}
+
+	/** Returns a readonly string copy of the property's field. */
+	getField()
+	{
+		return '' + this.field;
+	}
+
+	/**
+	 * Returns stringified JSON
+	 */
+	toString()
+	{
+		return JSON.stringify(this);
+	}
+
+	/**
+	 * Returns a JSON array in a [jCard property]{@link JCardProperty} format
+	 */
+	toJSON()
+	{
+		return [
+			this.field,
+			this.params,
+			this.type || 'text',
+			this.value
+		];
+	}
+}
diff --git a/dev/External/SquireUI.js b/dev/External/SquireUI.js
index b4e5efefb..b1e50fcad 100644
--- a/dev/External/SquireUI.js
+++ b/dev/External/SquireUI.js
@@ -3,10 +3,6 @@
 (doc => {
 
 const
-	removeElements = 'HEAD,LINK,META,NOSCRIPT,SCRIPT,TEMPLATE,TITLE',
-	allowedElements = 'A,B,BLOCKQUOTE,BR,DIV,FONT,H1,H2,H3,H4,H5,H6,HR,IMG,LI,OL,P,SPAN,STRONG,TABLE,TD,TH,TR,U,UL',
-	allowedAttributes = 'abbr,align,background,bgcolor,border,cellpadding,cellspacing,class,color,colspan,dir,face,frame,height,href,hspace,id,lang,rowspan,rules,scope,size,src,style,target,type,usemap,valign,vspace,width'.split(','),
-
 	i18n = (str, def) => rl.i18n(str) || def,
 
 	ctrlKey = shortcuts.getMetaKey() + ' + ',
@@ -14,73 +10,55 @@ const
 	createElement = name => doc.createElement(name),
 
 	tpl = createElement('template'),
-	clr = createElement('input'),
 
 	trimLines = html => html.trim().replace(/^(<div>\s*<br\s*\/?>\s*<\/div>)+/, '').trim(),
 	htmlToPlain = html => rl.Utils.htmlToPlain(html).trim(),
 	plainToHtml = text => rl.Utils.plainToHtml(text),
 
-	getFragmentOfChildren = parent => {
-		let frag = doc.createDocumentFragment();
-		frag.append(...parent.childNodes);
-		return frag;
-	},
+	forEachObjectValue = (obj, fn) => Object.values(obj).forEach(fn),
 
 	SquireDefaultConfig = {
 /*
-		blockTag: 'P',
-		undo: {
-			documentSizeThreshold: -1, // -1 means no threshold
-			undoLimit: -1 // -1 means no limit
-		},
 		addLinks: true // allow_smart_html_links
 */
 		sanitizeToDOMFragment: (html, isPaste/*, squire*/) => {
-			tpl.innerHTML = (html||'')
+			html = (html||'')
 				.replace(/<\/?(BODY|HTML)[^>]*>/gi,'')
 				.replace(/<!--[^>]+-->/g,'')
 				.replace(/<span[^>]*>\s*<\/span>/gi,'')
 				.trim();
-			tpl.querySelectorAll('a:empty,span:empty').forEach(el => el.remove());
-			if (isPaste) {
-				tpl.querySelectorAll(removeElements).forEach(el => el.remove());
-				tpl.querySelectorAll('*').forEach(el => {
-					if (!el.matches(allowedElements)) {
-						el.replaceWith(getFragmentOfChildren(el));
-					} else if (el.hasAttributes()) {
-						[...el.attributes].forEach(attr => {
-							let name = attr.name.toLowerCase();
-							if (!allowedAttributes.includes(name)) {
-								el.removeAttribute(name);
-							}
-						});
-					}
-				});
-			}
+			tpl.innerHTML =  isPaste ? rl.Utils.cleanHtml(html).html : html;
 			return tpl.content;
 		}
 	};
 
-clr.type = "color";
-clr.style.display = 'none';
-doc.body.append(clr);
-
 class SquireUI
 {
 	constructor(container) {
 		const
-			doClr = name => () => {
+			clr = createElement('input'),
+			doClr = name => input => {
+				// https://github.com/the-djmaze/snappymail/issues/826
+				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
+				clr.style.width = input.offsetWidth + 'px';
+
 				clr.value = '';
 				clr.onchange = () => squire.setStyle({[name]:clr.value});
-				clr.click();
+				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
+//				clr.oninput = () => squire.setStyle({[name]:clr.value});
+				setTimeout(()=>clr.click(),1);
 			},
 
 			actions = {
 				mode: {
 					plain: {
-						html: '〈〉',
-						cmd: () => this.setMode('plain' == this.mode ? 'wysiwyg' : 'plain'),
-						hint: i18n('EDITOR/TEXT_SWITCHER_PLAINT_TEXT', 'Plain')
+//						html: '〈〉',
+//						cmd: () => this.setMode('plain' == this.mode ? 'wysiwyg' : 'plain'),
+						select: [
+							[i18n('SETTINGS_GENERAL/EDITOR_HTML'),'wysiwyg'],
+							[i18n('SETTINGS_GENERAL/EDITOR_PLAIN'),'plain']
+						],
+						cmd: s => this.setMode('plain' == s.value ? 'plain' : 'wysiwyg')
 					}
 				},
 				font: {
@@ -106,20 +84,45 @@ class SquireUI
 						cmd: s => squire.setStyle({ fontFamily: s.value })
 					},
 					fontSize: {
-						select: ['11px','13px','16px','20px','24px','30px'],
+						select: [[i18n('GLOBAL/DEFAULT'),''],'11px','13px','16px','20px','24px','30px'],
+						defaultValueIndex: 0,
 						cmd: s => squire.setStyle({ fontSize: s.value })
+						// TODO: maybe consider using https://developer.mozilla.org/en-US/docs/Web/CSS/font-size#values
+						// example:
+						// select: ['','xx-small', 'x-small',' small',' medium', 'large', 'x-large', 'xx-large', 'xxx-large'],
+						// defaultValueIndex: 0,
+					},
+// 					dir: {
+// 						select: [
+// 							[i18n('EDITOR/DIR_LTR', 'LTR'),'ltr'],
+// 							[i18n('EDITOR/DIR_RTL', 'RTL'),'rtl'],
+// 							[i18n('EDITOR/DIR_AUTO', 'Auto'),'auto'],
+// 							['',''],
+// 						],
+// 						cmd: s => {
+// 							squire.setAttribute('dir', s.value || null);
+// //							squire.setStyle({ 'unicode-bidi': 'plaintext' });
+// 						}
+// 					}
+				},
+				dir: {
+					dir_ltr: {
+						html: '⁋',
+						cmd: () => squire.setTextDirection('ltr')
+					},
+					dir_rtl: {
+						html: '¶',
+						cmd: () => squire.setTextDirection('rtl')
 					}
 				},
 				colors: {
 					textColor: {
 						html: 'A<sub>▾</sub>',
-						cmd: doClr('color'),
-						hint: 'Text color'
+						cmd: doClr('color')
 					},
 					backgroundColor: {
 						html: '🎨', /* ▧ */
-						cmd: doClr('backgroundColor'),
-						hint: 'Background color'
+						cmd: doClr('backgroundColor')
 					},
 				},
 				inline: {
@@ -127,37 +130,37 @@ class SquireUI
 						html: 'B',
 						cmd: () => this.doAction('bold'),
 						key: 'B',
-						hint: 'Bold'
+						matches: 'B,STRONG'
 					},
 					italic: {
 						html: 'I',
 						cmd: () => this.doAction('italic'),
 						key: 'I',
-						hint: 'Italic'
+						matches: 'I'
 					},
 					underline: {
 						html: '<u>U</u>',
 						cmd: () => this.doAction('underline'),
 						key: 'U',
-						hint: 'Underline'
+						matches: 'U'
 					},
 					strike: {
 						html: '<s>S</s>',
 						cmd: () => this.doAction('strikethrough'),
 						key: 'Shift + 7',
-						hint: 'Strikethrough'
+						matches: 'S'
 					},
 					sub: {
 						html: 'Xₙ',
 						cmd: () => this.doAction('subscript'),
 						key: 'Shift + 5',
-						hint: 'Subscript'
+						matches: 'SUB'
 					},
 					sup: {
 						html: 'Xⁿ',
 						cmd: () => this.doAction('superscript'),
 						key: 'Shift + 6',
-						hint: 'Superscript'
+						matches: 'SUP'
 					}
 				},
 				block: {
@@ -165,64 +168,58 @@ class SquireUI
 						html: '#',
 						cmd: () => this.doList('OL'),
 						key: 'Shift + 8',
-						hint: 'Ordered list'
+						matches: 'OL'
 					},
 					ul: {
 						html: '⋮',
 						cmd: () => this.doList('UL'),
 						key: 'Shift + 9',
-						hint: 'Unordered list'
+						matches: 'UL'
 					},
 					quote: {
 						html: '"',
 						cmd: () => {
-							let parent = this.getParentNodeName('UL,OL');
-							(parent && 'BLOCKQUOTE' == parent) ? squire.decreaseQuoteLevel() : squire.increaseQuoteLevel();
+							let parent = squire.getSelectionClosest('UL,OL,BLOCKQUOTE')?.nodeName;
+							('BLOCKQUOTE' == parent) ? squire.decreaseQuoteLevel() : squire.increaseQuoteLevel();
 						},
-						hint: 'Blockquote'
+						matches: 'BLOCKQUOTE'
 					},
 					indentDecrease: {
 						html: '⇤',
 						cmd: () => squire.changeIndentationLevel('decrease'),
-						key: ']',
-						hint: 'Decrease indent'
+						key: ']'
 					},
 					indentIncrease: {
 						html: '⇥',
 						cmd: () => squire.changeIndentationLevel('increase'),
-						key: '[',
-						hint: 'Increase indent'
+						key: '['
 					}
 				},
 				targets: {
 					link: {
 						html: '🔗',
 						cmd: () => {
-							if ('A' === this.getParentNodeName()) {
-								squire.removeLink();
-							} else {
-								let url = prompt("Link","https://");
-								url != null && url.length && squire.makeLink(url);
+							let node = squire.getSelectionClosest('A'),
+								url = prompt("Link", node?.href || "https://");
+							if (url != null) {
+								url.length ? squire.makeLink(url) : (node && squire.removeLink());
 							}
 						},
-						hint: 'Link'
+						matches: 'A'
 					},
 					imageUrl: {
 						html: '🖼️',
 						cmd: () => {
-							if ('IMG' === this.getParentNodeName()) {
-//								squire.removeLink();
-							} else {
-								let src = prompt("Image","https://");
-								src != null && src.length && squire.insertImage(src);
-							}
+							let node = squire.getSelectionClosest('IMG'),
+								src = prompt("Image", node?.src || "https://");
+							src?.length ? squire.insertImage(src) : node?.remove();
 						},
-						hint: 'Image URL'
+						matches: 'IMG'
 					},
 					imageUpload: {
 						html: '📂️',
 						cmd: () => browseImage.click(),
-						hint: 'Image select',
+						matches: 'IMG'
 					}
 				},
 /*
@@ -234,14 +231,26 @@ class SquireUI
 					undo: {
 						html: '↶',
 						cmd: () => squire.undo(),
-						key: 'Z',
-						hint: 'Undo'
+						key: 'Z'
 					},
 					redo: {
 						html: '↷',
 						cmd: () => squire.redo(),
-						key: 'Y',
-						hint: 'Redo'
+						key: 'Y'
+					},
+					source: {
+						html: '👁',
+						cmd: btn => {
+							this.setMode('source' == this.mode ? 'wysiwyg' : 'source');
+							btn.classList.toggle('active', 'source' == this.mode);
+						}
+					}
+				},
+
+				clear: {
+					removeStyle: {
+						html: '⎚',
+						cmd: () => squire.setStyle()
 					}
 				}
 			},
@@ -252,6 +261,30 @@ class SquireUI
 			browseImage = createElement('input'),
 			squire = new Squire(wysiwyg, SquireDefaultConfig);
 
+		clr.type = 'color';
+		toolbar.append(clr);
+		// Chrome https://github.com/the-djmaze/snappymail/issues/1199
+		let clrid = 'squire-colors',
+			colorlist = doc.getElementById(clrid),
+			add = hex => colorlist.append(new Option(hex));
+		if (!colorlist) {
+			colorlist = createElement('datalist');
+			colorlist.id = clrid;
+			// Color blind safe Tableau 10 by Maureen Stone
+			add('#4E79A7');
+			add('#F28E2B');
+			add('#E15759');
+			add('#76B7B2');
+			add('#59A14F');
+			add('#EDC948');
+			add('#B07AA1');
+			add('#FF9DA7');
+			add('#9C755F');
+			add('#BAB0AC');
+			doc.body.append(colorlist);
+		}
+		clr.setAttribute('list', clrid);
+
 		browseImage.type = 'file';
 		browseImage.accept = 'image/*';
 		browseImage.style.display = 'none';
@@ -265,25 +298,18 @@ class SquireUI
 
 		plain.className = 'squire-plain';
 		wysiwyg.className = 'squire-wysiwyg';
+		wysiwyg.dir = 'auto';
 		this.mode = ''; // 'plain' | 'wysiwyg'
-		this.__plain = {
-			getRawData: () => this.plain.value,
-			setRawData: plain => this.plain.value = plain
-		};
-
 		this.container = container;
 		this.squire = squire;
 		this.plain = plain;
 		this.wysiwyg = wysiwyg;
 
+		dispatchEvent(new CustomEvent('squire-toolbar', {detail:{squire:this,actions:actions}}));
+
 		toolbar.className = 'squire-toolbar btn-toolbar';
-		let group, action, touchTap;
+		let group, action/*, touchTap*/;
 		for (group in actions) {
-/*
-			if ('bidi' == group && !rl.settings.app('allowHtmlEditorBitiButtons')) {
-				continue;
-			}
-*/
 			let toolgroup = createElement('div');
 			toolgroup.className = 'btn-group';
 			toolgroup.id = 'squire-toolgroup-'+group;
@@ -298,11 +324,13 @@ class SquireUI
 					input.className = 'btn';
 					if (Array.isArray(cfg.select)) {
 						cfg.select.forEach(value => {
-							var option = new Option(value, value);
-							option.style[action] = value;
+							value = Array.isArray(value) ? value : [value, value];
+							var option = new Option(value[0], value[1]);
+							option.style[action] = value[1];
 							input.append(option);
 						});
 					} else {
+						input.add(new Option(i18n('GLOBAL/DEFAULT'), ''));
 						Object.entries(cfg.select).forEach(([label, options]) => {
 							let group = createElement('optgroup');
 							group.label = label;
@@ -311,7 +339,7 @@ class SquireUI
 								option.style[action] = value;
 								group.append(option);
 							});
-							input.append(group);
+							input.add(group);
 						});
 					}
 					ev = 'input';
@@ -321,18 +349,21 @@ class SquireUI
 					input.className = 'btn';
 					input.innerHTML = cfg.html;
 					input.action_cmd = cfg.cmd;
-					input.addEventListener('touchstart', () => touchTap = input, {passive:true});
-					input.addEventListener('touchmove', () => touchTap = null, {passive:true});
-					input.addEventListener('touchcancel', () => touchTap = null);
-					input.addEventListener('touchend', e => {
+/*
+					input.addEventListener('pointerdown', () => touchTap = input, {passive:true});
+					input.addEventListener('pointermove', () => touchTap = null, {passive:true});
+					input.addEventListener('pointercancel', () => touchTap = null);
+					input.addEventListener('pointerup', e => {
 						if (touchTap === input) {
 							e.preventDefault();
 							cfg.cmd(input);
 						}
 						touchTap = null;
 					});
+*/
 				}
 				input.addEventListener(ev, () => cfg.cmd(input));
+				cfg.hint = i18n('EDITOR/' + action.toUpperCase());
 				if (cfg.hint) {
 					input.title = cfg.key ? cfg.hint + ' (' + ctrlKey + cfg.key + ')' : cfg.hint;
 				} else if (cfg.key) {
@@ -346,38 +377,182 @@ class SquireUI
 			toolgroup.children.length && toolbar.append(toolgroup);
 		}
 
+		this.modeSelect = actions.mode.plain.input;
+
 		let changes = actions.changes;
 		changes.undo.input.disabled = changes.redo.input.disabled = true;
-		squire.addEventListener('undoStateChange', state => {
-			changes.undo.input.disabled = !state.canUndo;
-			changes.redo.input.disabled = !state.canRedo;
+		squire.addEventListener('undoStateChange', e => {
+			changes.undo.input.disabled = !e.detail.canUndo;
+			changes.redo.input.disabled = !e.detail.canRedo;
 		});
 
+		squire.addEventListener('pasteImage', e => {
+			const items = e.detail.clipboardData.items;
+			let l = items.length;
+			while (l--) {
+				const item = items[l];
+				if (/^image\/(png|jpeg|webp)/.test(item.type)) {
+					let reader = new FileReader();
+					reader.onload = event => {
+						let img = createElement("img"),
+							canvas = createElement("canvas"),
+							ctx = canvas.getContext('2d');
+						img.onload = ()=>{
+							ctx.drawImage(img, 0, 0);
+							let width = img.width, height = img.height;
+							if (width > height) {
+								// Landscape
+								if (width > 1024) {
+									height = height * 1024 / width;
+									width = 1024;
+								}
+							} else if (height > 1024) {
+								// Portrait
+								width = width * 1024 / height;
+								height = 1024;
+							}
+							canvas.width = width;
+							canvas.height = height;
+							ctx.drawImage(img, 0, 0, width, height);
+							squire.insertHTML('<img alt="" style="width:100%;max-width:'+width+'px" src="'+canvas.toDataURL()+'">', true);
+						};
+						img.src = event.target.result;
+					}
+					reader.readAsDataURL(item.getAsFile());
+					break;
+				}
+			}
+		});
+
+		actions.font.fontSize.input.selectedIndex = actions.font.fontSize.defaultValueIndex;
+
 //		squire.addEventListener('focus', () => shortcuts.off());
 //		squire.addEventListener('blur', () => shortcuts.on());
 
 		container.append(toolbar, wysiwyg, plain);
 
-/*
-		squire.addEventListener('dragover', );
-		squire.addEventListener('drop', );
-		squire.addEventListener('pathChange', );
-		squire.addEventListener('cursor', );
-		squire.addEventListener('select', );
-		squire.addEventListener('input', );
-		squire.addEventListener('willPaste', );
-		squire.addEventListener( 'keydown keyup', monitorShiftKey )
-		squire.addEventListener( 'keydown', onKey )
-*/
+		/**
+		 * @param {string} fontName
+		 * @return {string}
+		 */
+		const normalizeFontName = (fontName) => fontName.trim().replace(/(^["']*|["']*$)/g, '').trim().toLowerCase();
 
-		// CKEditor gimmicks used by HtmlEditor
-		this.plugins = {
-			plain: true
-		};
-		this.focusManager = {
-			hasFocus: () => squire._isFocused,
-			blur: () => squire.blur()
+		/** @type {string[]} - lower cased array of available font families*/
+		const fontFamiliesLowerCase = Object.values(actions.font.fontFamily.input.options).map(option => option.value.toLowerCase());
+
+		/**
+		 * A theme might have CSS like div.squire-wysiwyg[contenteditable="true"] {
+		 * font-family: 'Times New Roman', Times, serif; }
+		 * so let's find the best match squire.getRoot()'s font
+		 * it will also help to properly handle generic font names like 'sans-serif'
+		 * @type {number}
+		 */
+		let defaultFontFamilyIndex = 0;
+		const squireRootFonts = getComputedStyle(squire.getRoot()).fontFamily.split(',').map(normalizeFontName);
+		fontFamiliesLowerCase.some((family, index) => {
+			const matchFound = family.split(',').some(availableFontName => {
+				const normalizedFontName = normalizeFontName(availableFontName);
+				return squireRootFonts.some(squireFontName => squireFontName === normalizedFontName);
+			});
+			if (matchFound) {
+				defaultFontFamilyIndex = index;
+			}
+			return matchFound;
+		});
+
+		/**
+		 * Instead of comparing whole 'font-family' strings,
+		 * we are going to look for individual font names, because we might be
+		 * editing a Draft started in another email client for example
+		 *
+		 * @type {Object.<string,number>}
+		 */
+		const fontNamesMap = {};
+		/**
+		 * @param {string} fontFamily
+		 * @param {number} index
+		 */
+		const processFontFamilyString = (fontFamily, index) => {
+			fontFamily.split(',').forEach(fontName => {
+				const key = normalizeFontName(fontName);
+				if (fontNamesMap[key] === undefined) {
+					fontNamesMap[key] = index;
+				}
+			});
 		};
+		// first deal with the default font family
+		processFontFamilyString(fontFamiliesLowerCase[defaultFontFamilyIndex], defaultFontFamilyIndex);
+		// and now with the rest of the font families
+		fontFamiliesLowerCase.forEach((fontFamily, index) => {
+			if (index !== defaultFontFamilyIndex) {
+				processFontFamilyString(fontFamily, index);
+			}
+		});
+
+		// -----
+
+		squire.addEventListener('pathChange', () => {
+
+			const squireRoot = squire.getRoot();
+			let range = squire.getSelection(),
+				collapsed = range.collapsed,
+				elm = collapsed ? range.endContainer : range?.commonAncestorContainer;
+			if (elm && !(elm instanceof Element)) {
+				elm = elm.parentElement;
+			}
+			forEachObjectValue(actions, entries => {
+				forEachObjectValue(entries, cfg => {
+					// Check if selection has a matching parent or contains a matching element
+					cfg.matches && cfg.input.classList.toggle('active', !!(elm && (
+						(!collapsed && [...elm.querySelectorAll(cfg.matches)].some(node => range.intersectsNode(node)))
+						 || elm.closestWithin(cfg.matches, squireRoot)
+					)));
+				});
+			});
+
+			if (elm) {
+				// try to find font-family and/or font-size and set "select" elements' values
+
+				let sizeSelectedIndex = actions.font.fontSize.defaultValueIndex;
+				let familySelectedIndex = defaultFontFamilyIndex;
+
+				let familyFound = false;
+				let sizeFound = false;
+				do {
+					if (!familyFound && elm.style.fontFamily) {
+						familyFound = true;
+						familySelectedIndex = -1; // show empty select if we don't know the font
+						const fontNames = elm.style.fontFamily.split(',');
+						for (let i = 0; i < fontNames.length; i++) {
+							const index = fontNamesMap[normalizeFontName(fontNames[i])];
+							if (index !== undefined) {
+								familySelectedIndex = index;
+								break;
+							}
+						}
+					}
+
+					if (!sizeFound && elm.style.fontSize) {
+						sizeFound = true;
+						// -1 is ok because it will just show a black <select>
+						sizeSelectedIndex = actions.font.fontSize.select.indexOf(elm.style.fontSize);
+					}
+
+					elm = elm.parentElement;
+				} while ((!familyFound || !sizeFound) && elm && elm !== squireRoot);
+
+				actions.font.fontFamily.input.selectedIndex = familySelectedIndex;
+				actions.font.fontSize.input.selectedIndex = sizeSelectedIndex;
+			}
+		});
+/*
+		squire.addEventListener('cursor', e => {
+			console.dir({cursor:e.detail.range});
+		});
+		squire.addEventListener('select', e => {
+			console.dir({select:e.detail.range});
+		});
+*/
 	}
 
 	doAction(name) {
@@ -385,39 +560,36 @@ class SquireUI
 		this.squire.focus();
 	}
 
-	getParentNodeName(selector) {
-		let parent = this.squire.getSelectionClosest(selector);
-		return parent ? parent.nodeName : null;
-	}
-
 	doList(type) {
-		let parent = this.getParentNodeName('UL,OL'),
+		let parent = this.squire.getSelectionClosest('UL,OL')?.nodeName,
 			fn = {UL:'makeUnorderedList',OL:'makeOrderedList'};
-		(parent && parent == type) ? this.squire.removeList() : this.squire[fn[type]]();
+		(parent == type) ? this.squire.removeList() : this.squire[fn[type]]();
 	}
-
+/*
 	testPresenceinSelection(format, validation) {
 		return validation.test(this.squire.getPath()) || this.squire.hasFormat(format);
 	}
-
+*/
 	setMode(mode) {
 		if (this.mode != mode) {
-			let cl = this.container.classList;
+			let cl = this.container.classList, source = 'source' == this.mode;
 			cl.remove('squire-mode-'+this.mode);
 			if ('plain' == mode) {
-				this.plain.value = htmlToPlain(this.squire.getHTML(), true);
+				this.plain.value = htmlToPlain(source ? this.plain.value : this.squire.getHTML(), true);
+			} else if ('source' == mode) {
+				this.plain.value = this.squire.getHTML();
 			} else {
-				this.setData(plainToHtml(this.plain.value, true));
+				this.setData(source ? this.plain.value : plainToHtml(this.plain.value, true));
 				mode = 'wysiwyg';
 			}
 			this.mode = mode; // 'wysiwyg' or 'plain'
 			cl.add('squire-mode-'+mode);
-			this.onModeChange && this.onModeChange();
+			this.onModeChange?.();
 			setTimeout(()=>this.focus(),1);
 		}
+		this.modeSelect.selectedIndex = 'plain' == this.mode ? 1 : 0;
 	}
 
-	// CKeditor gimmicks used by HtmlEditor
 	on(type, fn) {
 		if ('mode' == type) {
 			this.onModeChange = fn;
@@ -451,16 +623,16 @@ class SquireUI
 				} else {
 					const squire = this.squire,
 						root = squire.getRoot(),
-						range = squire.getSelection(),
+						br = createElement('br'),
 						div = createElement('div');
 					div.className = 'rl-signature';
 					div.innerHTML = cfg.isHtml ? cfg.signature : plainToHtml(cfg.signature);
 					root.querySelectorAll('div.rl-signature').forEach(node => node.remove());
 					cfg.insertBefore ? root.prepend(div) : root.append(div);
 					// Move cursor above signature
-					range.setStart(div, 0);
-					range.setEnd(div, 0);
-					squire.setSelection( range );
+					div.before(br);
+					div.before(br.cloneNode());
+//					squire._docWasChanged();
 				}
 				this._prev_txt_sig = signature;
 			} catch (e) {
@@ -470,16 +642,39 @@ class SquireUI
 	}
 
 	getData() {
-		return trimLines(this.squire.getHTML());
+		return 'source' == this.mode ? this.plain.value : trimLines(this.squire.getHTML());
 	}
 
 	setData(html) {
 //		this.plain.value = html;
-		this.squire.setHTML(trimLines(html));
+		const squire = this.squire;
+		squire.setHTML(trimLines(html));
+		const node = squire.getRoot(),
+			range = squire.getSelection();
+		range.setStart(node, 0);
+		range.setEnd(node, 0);
+		squire.setSelection( range );
+	}
+
+	getPlainData() {
+		return this.plain.value;
+	}
+
+	setPlainData(text) {
+		this.plain.value = text;
+	}
+
+	blur() {
+		this.squire.blur();
 	}
 
 	focus() {
-		('plain' == this.mode ? this.plain : this.squire).focus();
+		if ('plain' == this.mode) {
+			this.plain.focus();
+			this.plain.setSelectionRange(0, 0);
+		} else {
+			this.squire.focus();
+		}
 	}
 }
 
diff --git a/dev/External/User/ko.js b/dev/External/User/ko.js
index a75a58d10..2e951e576 100644
--- a/dev/External/User/ko.js
+++ b/dev/External/User/ko.js
@@ -1,21 +1,22 @@
 import 'External/ko';
 import ko from 'ko';
-import { HtmlEditor } from 'Common/Html';
+import { RFC822 } from 'Common/File';
+import { HtmlEditor } from 'Common/HtmlEditor';
 import { timeToNode } from 'Common/Translator';
-import { elementById, addEventsListeners, dropdowns } from 'Common/Globals';
-import { isArray } from 'Common/Utils';
-import { dropdownsDetectVisibility } from 'Common/UtilsUser';
+import { doc, elementById, addEventsListeners, dropdowns, leftPanelDisabled } from 'Common/Globals';
 import { EmailAddressesComponent } from 'Component/EmailAddresses';
 import { ThemeStore } from 'Stores/Theme';
-import { moveMessagesToFolder } from 'Common/Folders';
+import { dropFilesInFolder } from 'Common/Folders';
 import { setExpandedFolder } from 'Model/FolderCollection';
+import { FolderUserStore } from 'Stores/User/Folder';
+import { MessagelistUserStore } from 'Stores/User/Messagelist';
 
 const rlContentType = 'snappymail/action',
 
 	// In Chrome we have no access to dataTransfer.getData unless it's the 'drop' event
 	// In Chrome Mobile dataTransfer.types.includes(rlContentType) fails, only text/plain is set
-	dragMessages = () => dragData && 'messages' === dragData.action,
-	dragSortable = () => dragData && 'sortable' === dragData.action,
+	dragMessages = () => 'messages' === dragData?.action,
+	dragSortable = () => 'sortable' === dragData?.action,
 	setDragAction = (e, action, effect, data, img) => {
 		dragData = {
 			action: action,
@@ -28,9 +29,46 @@ const rlContentType = 'snappymail/action',
 	},
 
 	dragTimer = {
-		id: 0,
-		stop: () => clearTimeout(dragTimer.id),
-		start: fn => dragTimer.id = setTimeout(fn, 500)
+		id: 0
+	},
+
+	dragStop = (e, element) => {
+		e.preventDefault();
+		element?.classList.remove('droppableHover');
+		if (dragTimer.node == element) {
+			dragTimer.node = null;
+			clearTimeout(dragTimer.id);
+		}
+	},
+	dragEnter = (e, element, folder) => {
+		let files = false;
+//		if (e.dataTransfer.types.includes('Files'))
+		for (const item of e.dataTransfer.items) {
+			files |= 'file' === item.kind && RFC822 === item.type;
+		}
+		if (files || dragMessages()) {
+			e.stopPropagation();
+			dragStop(e, dragTimer.node);
+			e.dataTransfer.dropEffect = files ? 'copy' : (e.ctrlKey ? 'copy' : 'move');
+			element.classList.add('droppableHover');
+			if (folder.collapsed()) {
+				dragTimer.node = element;
+				dragTimer.id = setTimeout(() => {
+					folder.collapsed(false);
+					setExpandedFolder(folder.fullName, true);
+				}, 500);
+			}
+		}
+	},
+	dragDrop = (e, element, folder, dragData) => {
+		dragStop(e, element);
+		if (dragMessages() && 'copyMove' == e.dataTransfer.effectAllowed) {
+			MessagelistUserStore.moveMessages(
+				FolderUserStore.currentFolderFullName(), dragData.data, folder.fullName, e.ctrlKey
+			);
+		} else if (e.dataTransfer.types.includes('Files')) {
+			dropFilesInFolder(folder.fullName, e.dataTransfer.files);
+		}
 	},
 
 	ttn = (element, fValueAccessor) => timeToNode(element, ko.unwrap(fValueAccessor()));
@@ -45,27 +83,27 @@ Object.assign(ko.bindingHandlers, {
 			let editor = null;
 
 			const fValue = fValueAccessor(),
-				fUpdateEditorValue = () => fValue && fValue.__editor && fValue.__editor.setHtmlOrPlain(fValue()),
-				fUpdateKoValue = () => fValue && fValue.__editor && fValue(fValue.__editor.getDataWithHtmlMark()),
+				fUpdateEditorValue = () => fValue.__editor?.setHtmlOrPlain(fValue()),
+				fUpdateKoValue = () => fValue.__editor && fValue(fValue.__editor.getDataWithHtmlMark()),
 				fOnReady = () => {
 					fValue.__editor = editor;
 					fUpdateEditorValue();
 				};
 
-			if (ko.isObservable(fValue) && HtmlEditor) {
-				editor = new HtmlEditor(element, fUpdateKoValue, fOnReady, fUpdateKoValue);
+			if (ko.isObservable(fValue)) {
+				editor = new HtmlEditor(element, fOnReady, fUpdateKoValue, fUpdateKoValue);
 
 				fValue.__fetchEditorValue = fUpdateKoValue;
 
 				fValue.subscribe(fUpdateEditorValue);
 
-				// ko.utils.domNodeDisposal.addDisposeCallback(element, () => {
+				// ko.addDisposeCallback(element, () => {
 				// });
 			}
 		}
 	},
 
-	moment: {
+	time: {
 		init: ttn,
 		update: ttn
 	},
@@ -76,88 +114,60 @@ Object.assign(ko.bindingHandlers, {
 				focused = fValue.focused;
 
 			element.addresses = new EmailAddressesComponent(element, {
-				focusCallback: value => focused && focused(!!value),
+				focusCallback: value => focused?.(!!value),
 				autoCompleteSource: fAllBindings.get('autoCompleteSource'),
 				onChange: value => fValue(value)
 			});
 
-			if (focused) {
-				focused.subscribe(value =>
-					element.addresses[value ? 'focus' : 'blur']()
-				);
-			}
+			focused?.subscribe(value =>
+				element.addresses[value ? 'focus' : 'blur']()
+			);
 		},
 		update: (element, fValueAccessor) => {
 			element.addresses.value = ko.unwrap(fValueAccessor());
 		}
 	},
 
-	// Start dragging selected messages
+	// Start dragging checked messages
 	dragmessages: {
-		init: (element, fValueAccessor) => {
+		init: element => {
 			element.addEventListener("dragstart", e => {
-				let data = fValueAccessor()(e);
 				dragImage || (dragImage = elementById('messagesDragImage'));
-				if (data && dragImage && !ThemeStore.isMobile()) {
-					dragImage.querySelector('.text').textContent = data.uids.length;
-					let img = dragImage.querySelector('i');
-					img.classList.toggle('icon-copy', e.ctrlKey);
-					img.classList.toggle('icon-mail', !e.ctrlKey);
+				if (dragImage && !ThemeStore.isMobile()) {
+					ko.dataFor(doc.elementFromPoint(e.clientX, e.clientY))?.checked?.(true);
 
-					// Else Chrome doesn't show it
+					const uids = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails();
+					dragImage.querySelector('.text').textContent = uids.size;
+
+					// Make sure Chrome shows it
 					dragImage.style.left = e.clientX + 'px';
 					dragImage.style.top = e.clientY + 'px';
 					dragImage.style.right = 'auto';
 
-					setDragAction(e, 'messages', e.ctrlKey ? 'copy' : 'move', data, dragImage);
+					setDragAction(e, 'messages', 'copyMove', uids, dragImage);
 
 					// Remove the Chrome visibility
 					dragImage.style.cssText = '';
+
+					leftPanelDisabled(false);
 				} else {
 					e.preventDefault();
 				}
 
 			}, false);
 			element.addEventListener("dragend", () => dragData = null);
-			element.setAttribute('draggable', true);
 		}
 	},
 
 	// Drop selected messages on folder
 	dropmessages: {
 		init: (element, fValueAccessor) => {
-			const folder = fValueAccessor(),
-	//			folder = ko.dataFor(element),
-				fnStop = e => {
-					e.preventDefault();
-					element.classList.remove('droppableHover');
-					dragTimer.stop();
-				},
-				fnHover = e => {
-					if (dragMessages()) {
-						fnStop(e);
-						element.classList.add('droppableHover');
-						if (folder && folder.collapsed()) {
-							dragTimer.start(() => {
-								folder.collapsed(false);
-								setExpandedFolder(folder.fullName, true);
-							}, 500);
-						}
-					}
-				};
-			addEventsListeners(element, {
-				dragenter: fnHover,
-				dragover: fnHover,
-				dragleave: fnStop,
-				drop: e => {
-					fnStop(e);
-					if (dragMessages() && ['move','copy'].includes(e.dataTransfer.effectAllowed)) {
-						let data = dragData.data;
-						if (folder && data && data.folder && isArray(data.uids)) {
-							moveMessagesToFolder(data.folder, data.uids, folder.fullName, data.copy && e.ctrlKey);
-						}
-					}
-				}
+			const folder = fValueAccessor(); // ko.dataFor(element)
+			folder && addEventsListeners(element, {
+				dragenter: e => dragEnter(e, element, folder),
+				dragover: e => e.preventDefault(),
+				dragleave: e => dragStop(e, element),
+				drop: e => dragDrop(e, element, folder, dragData)
 			});
 		}
 	},
@@ -184,10 +194,6 @@ Object.assign(ko.bindingHandlers, {
 				};
 			addEventsListeners(element, {
 				dragstart: e => {
-					dragData = {
-						action: 'sortable',
-						element: element
-					};
 					setDragAction(e, 'sortable', 'move', element, element);
 					element.style.opacity = 0.25;
 				},
@@ -220,7 +226,7 @@ Object.assign(ko.bindingHandlers, {
 								options.list(arr);
 							}
 							dragData = null;
-							options.afterMove && options.afterMove();
+							options.afterMove?.();
 						}
 					}
 				});
@@ -237,18 +243,5 @@ Object.assign(ko.bindingHandlers, {
 			dropdowns.push(element);
 			element.ddBtn = new BSN.Dropdown(element.querySelector('.dropdown-toggle'));
 		}
-	},
-
-	openDropdownTrigger: {
-		update: (element, fValueAccessor) => {
-			if (ko.unwrap(fValueAccessor())) {
-				const el = element.ddBtn;
-				el.open || el.toggle();
-	//			el.focus();
-
-				dropdownsDetectVisibility();
-				fValueAccessor()(false);
-			}
-		}
 	}
 });
diff --git a/dev/External/ifvisible.js b/dev/External/ifvisible.js
deleted file mode 100644
index 23fb02269..000000000
--- a/dev/External/ifvisible.js
+++ /dev/null
@@ -1,40 +0,0 @@
-(doc => {
-	let idle = 'idle',
-		visible = 'visible',
-		status = visible,
-		timer = 0,
-		wakeUp = () => {
-			clearTimeout(timer);
-			status = visible;
-			timer = setTimeout(() => {
-				if (status === visible) {
-					status = idle;
-					dispatchEvent(new CustomEvent(idle));
-				}
-			}, 10000);
-		},
-		init = () => {
-			init = () => 0;
-			// Safari
-			addEventListener('pagehide', () => status = 'hidden');
-			// Else
-			doc.addEventListener('visibilitychange', () => {
-				status = doc.visibilityState;
-				doc.hidden || wakeUp();
-			});
-			wakeUp();
-			['mousemove','keyup','touchstart'].forEach(t => doc.addEventListener(t, wakeUp));
-			['scroll','pageshow'].forEach(t => addEventListener(t, wakeUp));
-		};
-
-	this.ifvisible = {
-		idle: callback => {
-			init();
-			addEventListener(idle, callback);
-		},
-		now: () => {
-			init();
-			return status === visible;
-		}
-	};
-})(document);
diff --git a/dev/External/ko.js b/dev/External/ko.js
index dcdb5fa7d..d783ae1df 100644
--- a/dev/External/ko.js
+++ b/dev/External/ko.js
@@ -1,8 +1,8 @@
 import ko from 'ko';
 import { i18nToNodes } from 'Common/Translator';
 import { doc, createElement } from 'Common/Globals';
-import { SaveSettingsStep } from 'Common/Enums';
-import { arrayLength, isFunction, forEachObjectEntry } from 'Common/Utils';
+import { SaveSettingStatus } from 'Common/Enums';
+import { isFunction, forEachObjectEntry } from 'Common/Utils';
 
 export const
 	errorTip = (element, value) => value
@@ -15,6 +15,7 @@ export const
 	 * based solely on the values of other observables in the application
 	 */
 	koComputable = fn => ko.computed(fn, {'pure':true}),
+//	koObservable = value => ko.observable(value),
 
 	addObservablesTo = (target, observables) =>
 		forEachObjectEntry(observables, (key, value) =>
@@ -26,14 +27,30 @@ export const
 	addSubscribablesTo = (target, subscribables) =>
 		forEachObjectEntry(subscribables, (key, fn) => target[key].subscribe(fn)),
 
-	dispose = disposable => disposable && isFunction(disposable.dispose) && disposable.dispose(),
+	dispose = disposable => isFunction(disposable?.dispose) && disposable.dispose(),
+
+	onEvent = (element, event, fn) => {
+		element.addEventListener(event, fn);
+		ko.addDisposeCallback(element, () => element.removeEventListener(event, fn));
+	},
+
+	onKey = (key, element, fValueAccessor, fAllBindings, model) => {
+		let fn = event => {
+			if (key == event.key) {
+//				stopEvent(event);
+//				element.dispatchEvent(new Event('change'));
+				fValueAccessor().call(model);
+			}
+		};
+		onEvent(element, 'keydown', fn);
+	},
 
 	// With this we don't need delegateRunOnDestroy
 	koArrayWithDestroy = data => {
 		data = ko.observableArray(data);
 		data.subscribe(changes =>
 			changes.forEach(item =>
-				'deleted' === item.status && null == item.moved && item.value.onDestroy && item.value.onDestroy()
+				'deleted' === item.status && null == item.moved && item.value.onDestroy?.()
 			)
 		, data, 'arrayChange');
 		return data;
@@ -50,33 +67,31 @@ Object.assign(ko.bindingHandlers, {
 		},
 		update: (element, fValueAccessor) => {
 			let value = ko.unwrap(fValueAccessor());
-			value = isFunction(value) ? value() : value;
-			errorTip(element, value);
+			errorTip(element, isFunction(value) ? value() : value);
 		}
 	},
 
 	onEnter: {
-		init: (element, fValueAccessor, fAllBindings, viewModel) => {
-			let fn = event => {
-				if ('Enter' == event.key) {
-					element.dispatchEvent(new Event('change'));
-					fValueAccessor().call(viewModel);
-				}
-			};
-			element.addEventListener('keydown', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keydown', fn));
-		}
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey('Enter', element, fValueAccessor, fAllBindings, model)
+	},
+
+	onEsc: {
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey('Escape', element, fValueAccessor, fAllBindings, model)
 	},
 
 	onSpace: {
-		init: (element, fValueAccessor, fAllBindings, viewModel) => {
-			let fn = event => {
-				if (' ' == event.key) {
-					fValueAccessor().call(viewModel, event);
-				}
-			};
-			element.addEventListener('keyup', fn);
-			ko.utils.domNodeDisposal.addDisposeCallback(element, () => element.removeEventListener('keyup', fn));
+		init: (element, fValueAccessor, fAllBindings, model) =>
+			onKey(' ', element, fValueAccessor, fAllBindings, model)
+	},
+
+	toggle: {
+		init: (element, fValueAccessor) => {
+			let observable = fValueAccessor(),
+				fn = () => observable(!observable());
+			onEvent(element, 'click', fn);
+			onEvent(element, 'keydown', event => ' ' == event.key && fn());
 		}
 	},
 
@@ -87,16 +102,12 @@ Object.assign(ko.bindingHandlers, {
 		}
 	},
 
-	title: {
-		update: (element, fValueAccessor) => element.title = ko.unwrap(fValueAccessor())
-	},
-
 	command: {
 		init: (element, fValueAccessor, fAllBindings, viewModel, bindingContext) => {
 			const command = fValueAccessor();
 
 			if (!command || !command.canExecute) {
-				throw new Error('Value should be a command');
+				throw Error('Value should be a command');
 			}
 
 			ko.bindingHandlers['FORM'==element.nodeName ? 'submit' : 'click'].init(
@@ -108,11 +119,8 @@ Object.assign(ko.bindingHandlers, {
 			);
 		},
 		update: (element, fValueAccessor) => {
-			const cl = element.classList,
-				command = fValueAccessor();
-
-			let disabled = !command.canExecute();
-			cl.toggle('disabled', disabled);
+			let disabled = !fValueAccessor().canExecute();
+			element.classList.toggle('disabled', disabled);
 
 			if (element.matches('INPUT,TEXTAREA,BUTTON')) {
 				element.disabled = disabled;
@@ -124,7 +132,7 @@ Object.assign(ko.bindingHandlers, {
 		init: (element) => {
 			let icon = element;
 			if (element.matches('input,select,textarea')) {
-				element.classList.add('settings-saved-trigger-input');
+				element.classList.add('settings-save-trigger-input');
 				element.after(element.saveTriggerIcon = icon = createElement('span'));
 			}
 			icon.classList.add('settings-save-trigger');
@@ -133,51 +141,29 @@ Object.assign(ko.bindingHandlers, {
 			const value = parseInt(ko.unwrap(fValueAccessor()),10);
 			let cl = (element.saveTriggerIcon || element).classList;
 			if (element.saveTriggerIcon) {
-				cl.toggle('saving', value === SaveSettingsStep.Animate);
-				cl.toggle('success', value === SaveSettingsStep.TrueResult);
-				cl.toggle('error', value === SaveSettingsStep.FalseResult);
+				cl.toggle('saving', value === SaveSettingStatus.Saving);
+				cl.toggle('success', value === SaveSettingStatus.Success);
+				cl.toggle('error', value === SaveSettingStatus.Failed);
 			}
 			cl = element.classList;
-			cl.toggle('success', value === SaveSettingsStep.TrueResult);
-			cl.toggle('error', value === SaveSettingsStep.FalseResult);
+			cl.toggle('success', value === SaveSettingStatus.Success);
+			cl.toggle('error', value === SaveSettingStatus.Failed);
 		}
 	}
 });
 
 // extenders
 
-ko.extenders.limitedList = (target, limitedList) => {
-	const result = ko
-		.computed({
-			read: target,
-			write: newValue => {
-				let currentValue = target(),
-					list = ko.unwrap(limitedList);
-				list = arrayLength(list) ? list : [''];
-				if (!list.includes(newValue)) {
-					newValue = list.includes(currentValue, list) ? currentValue : list[0];
-					target(newValue + ' ');
-				}
-				target(newValue);
-			}
-		})
-		.extend({ notify: 'always' });
-
-	result(target());
-
-	return result;
-};
-
 ko.extenders.toggleSubscribeProperty = (target, options) => {
 	const prop = options[1];
 	if (prop) {
 		target.subscribe(
-			prev => prev && prev[prop] && prev[prop](false),
+			prev => prev?.[prop]?.(false),
 			options[0],
 			'beforeChange'
 		);
 
-		target.subscribe(next => next && next[prop] && next[prop](true), options[0]);
+		target.subscribe(next => next?.[prop]?.(true), options[0]);
 	}
 
 	return target;
@@ -190,6 +176,6 @@ ko.extenders.falseTimeout = (target, option) => {
 
 // functions
 
-ko.observable.fn.askDeleteHelper = function() {
-	return this.extend({ falseTimeout: 3000, toggleSubscribeProperty: [this, 'askDelete'] });
+ko.observable.fn.askDeleteHelper = function(prop='askDelete') {
+	return this.extend({ falseTimeout: 3000, toggleSubscribeProperty: [this, prop] });
 };
diff --git a/dev/Html/PreviewMessage.html b/dev/Html/PreviewMessage.html
deleted file mode 100644
index a9bbb736c..000000000
--- a/dev/Html/PreviewMessage.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<html>
-<head>
-	<meta charset="utf-8"/>
-	<title></title>
-	<style>
-html, body {
-	margin: 0;
-	padding: 0;
-}
-
-header {
-	background: rgba(125,128,128,0.3);
-	border-bottom: 1px solid #888;
-}
-
-header h1 {
-	font-size: 120%;
-}
-
-header * {
-	margin: 5px 0;
-}
-
-header time {
-	float: right;
-}
-
-blockquote {
-	border-left: 2px solid rgba(125,128,128,0.5);
-	margin: 0;
-	padding: 0 0 0 10px;
-}
-
-pre {
-	white-space: pre-wrap;
-	word-wrap: break-word;
-	word-break: normal;
-}
-
-body > * {
-	padding: 0.5em 1em;
-}
-	</style>
-</head>
-<body></body>
-</html>
diff --git a/dev/Knoin/AbstractModel.js b/dev/Knoin/AbstractModel.js
index 95d0b2600..0fb0b2d90 100644
--- a/dev/Knoin/AbstractModel.js
+++ b/dev/Knoin/AbstractModel.js
@@ -5,9 +5,13 @@ function typeCast(curValue, newValue) {
 	if (null != curValue) {
 		switch (typeof curValue)
 		{
-		case 'boolean': return 0 != newValue && !!newValue;
-		case 'number': return isFinite(newValue) ? parseFloat(newValue) : 0;
-		case 'string': return null != newValue ? '' + newValue : '';
+		case 'boolean':
+			return 0 != newValue && !!newValue;
+		case 'number':
+			newValue = parseFloat(newValue);
+			return isFinite(newValue) ? newValue : 0;
+		case 'string':
+			return null != newValue ? '' + newValue : '';
 		case 'object':
 			if (curValue.constructor.reviveFromJson) {
 				return curValue.constructor.reviveFromJson(newValue);
@@ -23,10 +27,10 @@ export class AbstractModel {
 	constructor() {
 /*
 		if (new.target === AbstractModel) {
-			throw new Error("Can't instantiate AbstractModel!");
+			throw Error("Can't instantiate AbstractModel!");
 		}
 */
-		this.disposables = [];
+		Object.defineProperty(this, 'disposables', {value: []});
 	}
 
 	addObservables(observables) {
@@ -50,8 +54,7 @@ export class AbstractModel {
 //		forEachObjectEntry(this, (key, value) => {
 		forEachObjectValue(this, value => {
 			/** clear CollectionModel */
-			let arr = ko.isObservableArray(value) ? value() : value;
-			arr && arr.onDestroy && arr.onDestroy();
+			(ko.isObservableArray(value) ? value() : value)?.onDestroy?.();
 			/** destroy ko.observable/ko.computed? */
 //			dispose(value);
 			/** clear object value */
@@ -76,18 +79,16 @@ export class AbstractModel {
 	 */
 	static reviveFromJson(json) {
 		let obj = this.validJson(json) ? new this() : null;
-		obj && obj.revivePropertiesFromJson(json);
+		obj?.revivePropertiesFromJson(json);
 		return obj;
 	}
 
 	revivePropertiesFromJson(json) {
-		let model = this.constructor;
-		if (!model.validJson(json)) {
-			return false;
-		}
-		forEachObjectEntry(json, (key, value) => {
+		const model = this.constructor,
+			valid = model.validJson(json);
+		valid && forEachObjectEntry(json, (key, value) => {
 			if ('@' !== key[0]) try {
-				key = key[0].toLowerCase() + key.slice(1);
+//				key = key[0].toLowerCase() + key.slice(1);
 				switch (typeof this[key])
 				{
 				case 'function':
@@ -103,9 +104,12 @@ export class AbstractModel {
 				case 'string':
 					this[key] = typeCast(this[key], value);
 					break;
-					// fall through
 				case 'undefined':
-				default:
+					console.log(`Undefined ${model.name}.${key} set`);
+					this[key] = value;
+					break;
+//				default:
+//					console.log((typeof this[key])+` ${model.name}.${key} not revived`);
 //					console.log((typeof this[key])+' '+(model.name)+'.'+key+' not revived');
 				}
 			} catch (e) {
@@ -113,7 +117,7 @@ export class AbstractModel {
 				console.error(e);
 			}
 		});
-		return true;
+		return valid;
 	}
 
 }
diff --git a/dev/Knoin/AbstractScreen.js b/dev/Knoin/AbstractScreen.js
index d1797364f..ef5cb2fbe 100644
--- a/dev/Knoin/AbstractScreen.js
+++ b/dev/Knoin/AbstractScreen.js
@@ -31,7 +31,7 @@ export class AbstractScreen {
 			let route = new Crossroads(),
 				fMatcher = (this.onRoute || (()=>0)).bind(this);
 
-			routes.forEach(item => item && route && (route.addRoute(item[0], fMatcher).rules = item[1]));
+			routes.forEach(item => item && (route.addRoute(item[0], fMatcher).rules = item[1]));
 
 			this.__cross = route;
 		}
diff --git a/dev/Knoin/AbstractViews.js b/dev/Knoin/AbstractViews.js
index 55d413137..409e44386 100644
--- a/dev/Knoin/AbstractViews.js
+++ b/dev/Knoin/AbstractViews.js
@@ -1,10 +1,10 @@
 import ko from 'ko';
 
 import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
-import { keyScope, SettingsGet, leftPanelDisabled } from 'Common/Globals';
+import { keyScope, addShortcut, SettingsGet, toggleLeftPanel, elementById } from 'Common/Globals';
 import { ViewTypePopup, showScreenPopup } from 'Knoin/Knoin';
 
-import { SaveSettingsStep } from 'Common/Enums';
+import { SaveSettingStatus } from 'Common/Enums';
 
 class AbstractView {
 	constructor(templateID, type)
@@ -59,12 +59,12 @@ export class AbstractViewPopup extends AbstractView
 		super('Popups' + name, ViewTypePopup);
 		this.keyScope.scope = name;
 		this.modalVisible = ko.observable(false).extend({ rateLimit: 0 });
-		shortcuts.add('escape,close', '', name, () => {
-			if (this.modalVisible() && false !== this.onClose()) {
-				this.close();
-				return false;
-			}
-			return true;
+		this.close = () => this.modalVisible(false);
+		this.tryToClose = () => (false === this.onClose()) || this.close();
+		addShortcut('escape,close', '', name, () => {
+			this.modalVisible() && this.tryToClose();
+			return false;
+//			return true; Issue with supported modal close
 		});
 	}
 
@@ -78,8 +78,6 @@ export class AbstractViewPopup extends AbstractView
 	afterShow() {}  // Happens after  showModal() animation transitionend
 	onHide() {}     // Happens before animation transitionend
 	afterHide() {}  // Happens after  animation transitionend
-
-	close() {}
 */
 }
 
@@ -95,8 +93,8 @@ export class AbstractViewLeft extends AbstractView
 {
 	constructor(templateID)
 	{
-		super(templateID, 'Left');
-		this.leftPanelDisabled = leftPanelDisabled;
+		super(templateID, 'left');
+		this.toggleLeftPanel = toggleLeftPanel;
 	}
 }
 
@@ -104,7 +102,7 @@ export class AbstractViewRight extends AbstractView
 {
 	constructor(templateID)
 	{
-		super(templateID, 'Right');
+		super(templateID, 'right');
 	}
 }
 
@@ -117,28 +115,38 @@ export class AbstractViewSettings
 	onHide() {}
 	viewModelDom
 */
+	/**
+	 * When this[name] does not exists, create as observable with value of SettingsGet(name)
+	 * When this[name+'Trigger'] does not exists, create as observable
+	 * Subscribe to this[name], and handle saving the setting
+	 */
 	addSetting(name, valueCb)
 	{
 		let prop = name[0].toLowerCase() + name.slice(1),
 			trigger = prop + 'Trigger';
 		addObservablesTo(this, {
 			[prop]: SettingsGet(name),
-			[trigger]: SaveSettingsStep.Idle,
+			[trigger]: SaveSettingStatus.Idle,
 		});
 		addSubscribablesTo(this, {
 			[prop]: (value => {
-				this[trigger](SaveSettingsStep.Animate);
-				valueCb && valueCb(value);
+				this[trigger](SaveSettingStatus.Saving);
+				valueCb?.(value);
 				rl.app.Remote.saveSetting(name, value,
 					iError => {
-						this[trigger](iError ? SaveSettingsStep.FalseResult : SaveSettingsStep.TrueResult);
-						setTimeout(() => this[trigger](SaveSettingsStep.Idle), 1000);
+						this[trigger](iError ? SaveSettingStatus.Failed : SaveSettingStatus.Success);
+//						iError || Settings.set(name, value);
+						setTimeout(() => this[trigger](SaveSettingStatus.Idle), 1000);
 					}
 				);
 			}).debounce(999),
 		});
 	}
 
+	/**
+	 * Foreach name if this[name] does not exists, create as observable with value of SettingsGet(name)
+	 * Subscribe to this[name], for saving the setting
+	 */
 	addSettings(names)
 	{
 		names.forEach(name => {
@@ -151,8 +159,7 @@ export class AbstractViewSettings
 
 export class AbstractViewLogin extends AbstractView {
 	constructor(templateID) {
-		super(templateID, 'Content');
-		this.hideSubmitButton = SettingsGet('hideSubmitButton');
+		super(templateID, 'content');
 		this.formError = ko.observable(false).extend({ falseTimeout: 500 });
 	}
 
@@ -161,9 +168,16 @@ export class AbstractViewLogin extends AbstractView {
 	}
 
 	onShow() {
+		elementById('rl-left').hidden = true;
+		elementById('rl-right').hidden = true;
 		rl.route.off();
 	}
 
+	onHide() {
+		elementById('rl-left').hidden = false;
+		elementById('rl-right').hidden = false;
+	}
+
 	submitForm() {
 //		return false;
 	}
diff --git a/dev/Knoin/Knoin.js b/dev/Knoin/Knoin.js
index 6e2d417b3..12d07d1cb 100644
--- a/dev/Knoin/Knoin.js
+++ b/dev/Knoin/Knoin.js
@@ -1,19 +1,20 @@
 import ko from 'ko';
 import { koComputable } from 'External/ko';
-import { doc, $htmlCL, elementById, fireEvent } from 'Common/Globals';
-import { forEachObjectValue, forEachObjectEntry } from 'Common/Utils';
+import { doc, $htmlCL, elementById, createElement, fireEvent } from 'Common/Globals';
+import { forEachObjectEntry } from 'Common/Utils';
 import { i18nToNodes } from 'Common/Translator';
 
+import { leftPanelDisabled } from 'Common/Globals';
+import { ThemeStore } from 'Stores/Theme';
+
 let
-	SCREENS = {},
 	currentScreen = null,
 	defaultScreenName = '';
 
 const
-	autofocus = dom => {
-		const af = dom.querySelector('[autofocus]');
-		af && af.focus();
-	},
+	SCREENS = new Map,
+
+	autofocus = dom => dom.querySelector('[autofocus]')?.focus(),
 
 	visiblePopups = new Set,
 
@@ -21,66 +22,69 @@ const
 	 * @param {string} screenName
 	 * @returns {?Object}
 	 */
-	screen = screenName => screenName && null != SCREENS[screenName] ? SCREENS[screenName] : null,
+	screen = screenName => (screenName && SCREENS.get(screenName)) || null,
 
 	/**
+	 * Creates the extended AbstractView model
 	 * @param {Function} ViewModelClass
 	 * @param {Object=} vmScreen
 	 * @returns {*}
 	 */
 	buildViewModel = (ViewModelClass, vmScreen) => {
-		if (ViewModelClass && !ViewModelClass.__builded) {
-			let vmDom = null;
+		if (ViewModelClass && !ViewModelClass.__vm) {
 			const
 				vm = new ViewModelClass(vmScreen),
 				id = vm.viewModelTemplateID,
-				position = vm.viewType || '',
-				dialog = ViewTypePopup === position,
-				vmPlace = position ? doc.getElementById('rl-' + position.toLowerCase()) : null;
-
-			ViewModelClass.__builded = true;
-			ViewModelClass.__vm = vm;
+				position = 'rl-' + vm.viewType,
+				dialog = ViewTypePopup === vm.viewType,
+				vmPlace = doc.getElementById(position);
 
 			if (vmPlace) {
-				vmDom = Element.fromHTML(dialog
-					? '<dialog id="V-'+ id + '"></dialog>'
-					: '<div id="V-'+ id + '" hidden=""></div>');
+				ViewModelClass.__vm = vm;
+
+				let vmDom = dialog
+					? createElement('dialog',{id:'V-'+id})
+					: createElement('div',{id:'V-'+id,hidden:''})
 				vmPlace.append(vmDom);
 
 				vm.viewModelDom = vmDom;
-				ViewModelClass.__dom = vmDom;
 
-				if (ViewTypePopup === position) {
-					vm.close = () => hideScreenPopup(ViewModelClass);
-
-					// Firefox / Safari HTMLDialogElement not defined
+				if (dialog) {
+					// Firefox < 98 / Safari < 15.4 HTMLDialogElement not defined
 					if (!vmDom.showModal) {
-						vmDom.classList.add('polyfill');
+						vmDom.className = 'polyfill';
 						vmDom.showModal = () => {
 							vmDom.backdrop ||
-								vmDom.before(vmDom.backdrop = Element.fromHTML('<div class="dialog-backdrop"></div>'));
+								vmDom.before(vmDom.backdrop = createElement('div',{class:'dialog-backdrop'}));
 							vmDom.setAttribute('open','');
 							vmDom.open = true;
-							vmDom.returnValue = null;
 							vmDom.backdrop.hidden = false;
 						};
-						vmDom.close = v => {
-							vmDom.backdrop.hidden = true;
-							vmDom.returnValue = v;
-							vmDom.removeAttribute('open', null);
-							vmDom.open = false;
+						vmDom.close = () => {
+//							if (vmDom.dispatchEvent(new CustomEvent('cancel', {cancelable:true}))) {
+								vmDom.backdrop.hidden = true;
+								vmDom.removeAttribute('open', null);
+								vmDom.open = false;
+//								vmDom.dispatchEvent(new CustomEvent('close'));
+//							}
 						};
 					}
+					// https://developer.mozilla.org/en-US/docs/Web/API/HTMLDialogElement/cancel_event
+//					vmDom.addEventListener('cancel', event => (false === vm.onClose() && event.preventDefault()));
+//					vmDom.addEventListener('close', () => vm.modalVisible(false));
 
 					// show/hide popup/modal
+					// transitionend is called for each property, so we only listen to `opacity`
+					// as defined in CSS by `dialog:not(.animate)`
 					const endShowHide = e => {
-						if (e.target === vmDom) {
+						if (e.target === vmDom && 'opacity' === e.propertyName) {
 							if (vmDom.classList.contains('animate')) {
-								autofocus(vmDom);
-								vm.afterShow && vm.afterShow();
+								vm.afterShow?.();
+								fireEvent('rl-vm-visible', vm);
 							} else {
 								vmDom.close();
-								vm.afterHide && vm.afterHide();
+								vm.afterHide?.();
+//								fireEvent('rl-vm-hidden', vm);
 							}
 						}
 					};
@@ -89,19 +93,20 @@ const
 						if (value) {
 							i18nToNodes(vmDom);
 							visiblePopups.add(vm);
-							vmDom.style.zIndex = 3000 + (visiblePopups.size * 2);
+							vmDom.style.zIndex = 3001 + (visiblePopups.size * 2);
 							vmDom.showModal();
 							if (vmDom.backdrop) {
-								vmDom.backdrop.style.zIndex = 3000 + visiblePopups.size;
+								vmDom.backdrop.style.zIndex = 3000 + (visiblePopups.size * 2);
 							}
 							vm.keyScope.set();
+							setTimeout(()=>autofocus(vmDom),1);
 							requestAnimationFrame(() => { // wait just before the next paint
 								vmDom.offsetHeight; // force a reflow
 								vmDom.classList.add('animate'); // trigger the transitions
 							});
 						} else {
 							visiblePopups.delete(vm);
-							vm.onHide && vm.onHide();
+							vm.onHide?.();
 							vm.keyScope.unset();
 							vmDom.classList.remove('animate'); // trigger the transitions
 						}
@@ -110,6 +115,8 @@ const
 					vmDom.addEventListener('transitionend', endShowHide);
 				}
 
+				fireEvent('rl-view-model.create', vm);
+
 				ko.applyBindingAccessorsToNode(
 					vmDom,
 					{
@@ -118,7 +125,7 @@ const
 					vm
 				);
 
-				vm.onBuild && vm.onBuild(vmDom);
+				vm.onBuild?.(vmDom);
 
 				fireEvent('rl-view-model', vm);
 			} else {
@@ -126,38 +133,28 @@ const
 			}
 		}
 
-		return ViewModelClass && ViewModelClass.__vm;
+		return ViewModelClass?.__vm;
 	},
 
 	forEachViewModel = (screen, fn) => {
 		screen.viewModels.forEach(ViewModelClass => {
 			if (
 				ViewModelClass.__vm &&
-				ViewModelClass.__dom &&
 				ViewTypePopup !== ViewModelClass.__vm.viewType
 			) {
-				fn(ViewModelClass.__vm, ViewModelClass.__dom);
+				fn(ViewModelClass.__vm, ViewModelClass.__vm.viewModelDom);
 			}
 		});
 	},
 
 	hideScreen = (screenToHide, destroy) => {
-		screenToHide.onHide && screenToHide.onHide();
+		screenToHide.onHide?.();
 		forEachViewModel(screenToHide, (vm, dom) => {
 			dom.hidden = true;
-			vm.onHide && vm.onHide();
-			destroy && vm.viewModelDom.remove();
+			vm.onHide?.();
+			destroy && dom.remove();
 		});
-	},
-
-	/**
-	 * @param {Function} ViewModelClassToHide
-	 * @returns {void}
-	 */
-	hideScreenPopup = ViewModelClassToHide => {
-		if (ViewModelClassToHide && ViewModelClassToHide.__vm && ViewModelClassToHide.__dom) {
-			ViewModelClassToHide.__vm.modalVisible(false);
-		}
+		ThemeStore.isMobile() && leftPanelDisabled(true);
 	},
 
 	/**
@@ -166,20 +163,14 @@ const
 	 * @returns {void}
 	 */
 	screenOnRoute = (screenName, subPart) => {
-		let vmScreen = null,
-			isSameScreen = false;
+		screenName = screenName || defaultScreenName;
+		if (screenName && fireEvent('sm-show-screen', screenName + (subPart ?  '/' + subPart : ''), 1)) {
+			// Close all popups
+			for (let vm of visiblePopups) {
+				vm.tryToClose();
+			}
 
-		if (null == screenName || '' == screenName) {
-			screenName = defaultScreenName;
-		}
-
-		// Close all popups
-		for (let vm of visiblePopups) {
-			false === vm.onClose() || vm.close();
-		}
-
-		if (screenName) {
-			vmScreen = screen(screenName);
+			let vmScreen = screen(screenName);
 			if (!vmScreen) {
 				vmScreen = screen(defaultScreenName);
 				if (vmScreen) {
@@ -188,8 +179,8 @@ const
 				}
 			}
 
-			if (vmScreen && vmScreen.__started) {
-				isSameScreen = currentScreen && vmScreen === currentScreen;
+			if (vmScreen?.__started) {
+				let isSameScreen = currentScreen && vmScreen === currentScreen;
 
 				if (!vmScreen.__builded) {
 					vmScreen.__builded = true;
@@ -198,33 +189,31 @@ const
 						buildViewModel(ViewModelClass, vmScreen)
 					);
 
-					vmScreen.onBuild && vmScreen.onBuild();
+					vmScreen.onBuild?.();
 				}
 
 				setTimeout(() => {
 					// hide screen
-					if (currentScreen && !isSameScreen) {
-						hideScreen(currentScreen);
-					}
+					currentScreen && !isSameScreen && hideScreen(currentScreen);
 					// --
 
 					currentScreen = vmScreen;
 
 					// show screen
 					if (!isSameScreen) {
-						vmScreen.onShow && vmScreen.onShow();
+						vmScreen.onShow?.();
 
 						forEachViewModel(vmScreen, (vm, dom) => {
-							vm.beforeShow && vm.beforeShow();
+							vm.beforeShow?.();
 							i18nToNodes(dom);
 							dom.hidden = false;
-							vm.onShow && vm.onShow();
+							vm.onShow?.();
 							autofocus(dom);
 						});
 					}
 					// --
 
-					vmScreen.__cross && vmScreen.__cross.parse(subPart);
+					vmScreen.__cross?.parse(subPart);
 				}, 1);
 			}
 		}
@@ -232,7 +221,7 @@ const
 
 
 export const
-	ViewTypePopup = 'Popups',
+	ViewTypePopup = 'popups',
 
 	/**
 	 * @param {Function} ViewModelClassToShow
@@ -240,16 +229,12 @@ export const
 	 * @returns {void}
 	 */
 	showScreenPopup = (ViewModelClassToShow, params = []) => {
-		const vm = buildViewModel(ViewModelClassToShow) && ViewModelClassToShow.__dom && ViewModelClassToShow.__vm;
-
+		const vm = buildViewModel(ViewModelClassToShow);
 		if (vm) {
 			params = params || [];
-
-			vm.beforeShow && vm.beforeShow(...params);
-
+			vm.beforeShow?.(...params);
 			vm.modalVisible(true);
-
-			vm.onShow && vm.onShow(...params);
+			vm.onShow?.(...params);
 		}
 	},
 
@@ -261,21 +246,19 @@ export const
 	 */
 	startScreens = screensClasses => {
 		hasher.clear();
-		forEachObjectValue(SCREENS, screen => hideScreen(screen, 1));
-		SCREENS = {};
+		SCREENS.forEach(screen => hideScreen(screen, 1));
+		SCREENS.clear();
 		currentScreen = null,
 		defaultScreenName = '';
 
 		screensClasses.forEach(CScreen => {
-			if (CScreen) {
-				const vmScreen = new CScreen(),
-					screenName = vmScreen.screenName;
-				defaultScreenName || (defaultScreenName = screenName);
-				SCREENS[screenName] = vmScreen;
-			}
+			const vmScreen = new CScreen(),
+				screenName = vmScreen.screenName;
+			defaultScreenName || (defaultScreenName = screenName);
+			SCREENS.set(screenName, vmScreen);
 		});
 
-		forEachObjectValue(SCREENS, vmScreen => {
+		SCREENS.forEach(vmScreen => {
 			if (!vmScreen.__started) {
 				vmScreen.onStart();
 				vmScreen.__started = true;
@@ -283,7 +266,7 @@ export const
 		});
 
 		const cross = new Crossroads();
-		cross.addRoute(/^([a-zA-Z0-9-]*)\/?(.*)$/, screenOnRoute);
+		cross.addRoute(/^([^/]*)\/?(.*)$/, screenOnRoute);
 
 		hasher.add(cross.parse.bind(cross));
 		hasher.init();
@@ -292,7 +275,7 @@ export const
 
 		const c = elementById('rl-content'), l = elementById('rl-loading');
 		c && (c.hidden = false);
-		l && l.remove();
+		l?.remove();
 	},
 
 	/**
diff --git a/dev/Mime/Address.js b/dev/Mime/Address.js
new file mode 100644
index 000000000..5e9ae887d
--- /dev/null
+++ b/dev/Mime/Address.js
@@ -0,0 +1,197 @@
+import { decodeEncodedWords } from 'Mime/Encoding';
+
+/**
+ * Parses structured e-mail addresses from an address/mailbox(-list) field
+ * https://datatracker.ietf.org/doc/html/rfc2822#section-3.4
+ *
+ * Example:
+ *
+ *    "Name <address@domain>"
+ *
+ * will be converted to
+ *
+ *     [{name: "Name", email: "address@domain"}]
+ *
+ * @param {String} str Address field
+ * @return {Array} An array of address objects
+ */
+export function addressparser(str) {
+	str = (str || '').toString();
+
+	let
+		endOperator = '',
+		node = {
+			type: 'text',
+			value: ''
+		},
+		escaped = false,
+		address = [],
+		addresses = [];
+
+	const
+		/*
+		 * Operator tokens and which tokens are expected to end the sequence
+		 */
+		OPERATORS = {
+		  '"': '"',
+		  '(': ')',
+		  '<': '>',
+		  ',': '',
+		  // Groups are ended by semicolons
+		  ':': ';',
+		  // Semicolons are not a legal delimiter per the RFC2822 grammar other
+		  // than for terminating a group, but they are also not valid for any
+		  // other use in this context.  Given that some mail clients have
+		  // historically allowed the semicolon as a delimiter equivalent to the
+		  // comma in their UI, it makes sense to treat them the same as a comma
+		  // when used outside of a group.
+		  ';': ''
+		},
+		pushToken = token => {
+			token.value = (token.value || '').toString().trim();
+			token.value.length && address.push(token);
+			node = {
+				type: 'text',
+				value: ''
+			},
+			escaped = false;
+		},
+		pushAddress = () => {
+			if (address.length) {
+				address = _handleAddress(address);
+				if (address.length) {
+					addresses = addresses.concat(address);
+				}
+			}
+			address = [];
+		};
+
+	[...str].forEach(chr => {
+		if (!escaped && (chr === endOperator || (!endOperator && chr in OPERATORS))) {
+			pushToken(node);
+			if (',' === chr || ';' === chr) {
+				pushAddress();
+			} else {
+				endOperator = endOperator ? '' : OPERATORS[chr];
+				if ('<' === chr) {
+					node.type = 'email';
+				} else if ('(' === chr) {
+					node.type = 'comment';
+				} else if (':' === chr) {
+					node.type = 'group';
+				}
+			}
+		} else {
+			node.value += chr;
+			escaped = !escaped && '\\' === chr;
+		}
+	});
+	pushToken(node);
+
+	pushAddress();
+
+	return addresses;
+}
+
+/**
+ * Converts tokens for a single address into an address object
+ *
+ * @param {Array} tokens Tokens object
+ * @return {Object} Address object
+ */
+function _handleAddress(tokens) {
+	let
+		isGroup = false,
+		address = {},
+		addresses = [],
+		data = {
+			email: [],
+			comment: [],
+			group: [],
+			text: []
+		};
+
+	tokens.forEach(token => {
+		isGroup = isGroup || 'group' === token.type;
+		data[token.type].push(token.value);
+	});
+
+	// If there is no text but a comment, replace the two
+	if (!data.text.length && data.comment.length) {
+		data.text = data.comment;
+		data.comment = [];
+	}
+
+	if (isGroup) {
+		// http://tools.ietf.org/html/rfc2822#appendix-A.1.3
+/*
+		addresses.push({
+			email: '',
+			name: data.text.join(' ').trim(),
+			group: addressparser(data.group.join(','))
+//			,comment: data.comment.join(' ').trim()
+		});
+*/
+		addresses = addresses.concat(addressparser(data.group.join(',')));
+	} else {
+		// If no address was found, try to detect one from regular text
+		if (!data.email.length && data.text.length) {
+			var i = data.text.length;
+			while (i--) {
+				if (data.text[i].match(/^[^@\s]+@[^@\s]+$/)) {
+					data.email = data.text.splice(i, 1);
+					break;
+				}
+			}
+
+			// still no address
+			if (!data.email.length) {
+				i = data.text.length;
+				while (i--) {
+					data.text[i] = data.text[i].replace(/\s*\b[^@\s]+@[^@\s]+\b\s*/, address => {
+						if (!data.email.length) {
+							data.email = [address.trim()];
+							return '';
+						}
+						return address.trim();
+					});
+					if (data.email.length) {
+						break;
+					}
+				}
+			}
+		}
+
+		// If there's still no text but a comment exists, replace the two
+		if (!data.text.length && data.comment.length) {
+			data.text = data.comment;
+			data.comment = [];
+		}
+
+		// Keep only the first address occurence, push others to regular text
+		if (data.email.length > 1) {
+			data.text = data.text.concat(data.email.splice(1));
+		}
+
+		address = {
+			// Join values with spaces
+			email: decodeEncodedWords(data.email.join(' ').trim()),
+			name: decodeEncodedWords(data.text.join(' ').trim())
+//			,comment: data.comment.join(' ').trim()
+		};
+
+		if (address.email === address.name) {
+			if (address.email.includes('@')) {
+				address.name = '';
+			} else {
+				address.email = '';
+			}
+		}
+
+//		address.email = address.email.replace(/^[<]+(.*)[>]+$/g, '$1');
+
+		addresses.push(address);
+	}
+
+	return addresses;
+}
diff --git a/dev/Mime/Encoding.js b/dev/Mime/Encoding.js
new file mode 100644
index 000000000..6f9f8fcd0
--- /dev/null
+++ b/dev/Mime/Encoding.js
@@ -0,0 +1,35 @@
+const
+	QPDecodeParams = [/=([0-9A-F]{2})/g, (...args) => String.fromCharCode(parseInt(args[1], 16))];
+
+export const
+	// https://datatracker.ietf.org/doc/html/rfc2045#section-6.8
+	BDecode = atob,
+
+	// unescape(encodeURIComponent()) makes the UTF-16 DOMString to an UTF-8 string
+	BEncode = data => btoa(unescape(encodeURIComponent(data))),
+/* 	// Without deprecated 'unescape':
+	BEncode = data => btoa(encodeURIComponent(data).replace(
+		/%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode('0x' + p1)
+	)),
+*/
+
+	// https://datatracker.ietf.org/doc/html/rfc2045#section-6.7
+	QPDecode = data => data.replace(/=\r?\n/g, '').replace(...QPDecodeParams),
+
+	// https://datatracker.ietf.org/doc/html/rfc2047#section-4.1
+	// https://datatracker.ietf.org/doc/html/rfc2047#section-4.2
+	// encoded-word = "=?" charset "?" encoding "?" encoded-text "?="
+	decodeEncodedWords = data =>
+		data.replace(/=\?([^?]+)\?(B|Q)\?(.+?)\?=/g, (m, charset, encoding, text) =>
+			decodeText(charset, 'B' == encoding ? BDecode(text) : QPDecode(text))
+		)
+	,
+
+	decodeText = (charset, data) => {
+		try {
+			// https://developer.mozilla.org/en-US/docs/Web/API/Encoding_API/Encodings
+			return new TextDecoder(charset).decode(Uint8Array.from(data, c => c.charCodeAt(0)));
+		} catch (e) {
+			console.error({charset:charset,error:e});
+		}
+	};
diff --git a/dev/Mime/Parser.js b/dev/Mime/Parser.js
index 59ed4c408..eb13c199b 100644
--- a/dev/Mime/Parser.js
+++ b/dev/Mime/Parser.js
@@ -1,19 +1,75 @@
-
-const
-	// RFC2045
-	QPDecodeIn = /=([0-9A-F]{2})/g,
-	QPDecodeOut = (...args) => String.fromCharCode(parseInt(args[1], 16));
+import { decodeEncodedWords, BDecode, BEncode, QPDecode, decodeText } from 'Mime/Encoding';
+import { addressparser } from 'Mime/Address';
 
 export function ParseMime(text)
 {
 	class MimePart
 	{
+/*
+		constructor() {
+			this.id = 0;
+			this.start = 0;
+			this.end = 0;
+			this.parts = [];
+			this.bodyStart = 0;
+			this.bodyEnd = 0;
+			this.boundary = '';
+			this.bodyText = '';
+			// https://datatracker.ietf.org/doc/html/rfc2822#section-3.6
+			// https://datatracker.ietf.org/doc/html/rfc4021
+			this.headers = {
+				// Required
+				date = null,
+				from = [], // mailbox-list
+				// Optional
+				sender          = [], // mailbox MUST occur with multi-address
+				'reply-to'      = [], // address-list
+				to              = [], // address-list
+				cc              = [], // address-list
+				bcc             = [], // address-list
+				'message-id'    = '', // msg-id SHOULD be present
+				'in-reply-to'   = '', // 1*msg-id SHOULD occur in some replies
+				references      = '', // 1*msg-id SHOULD occur in some replies
+				subject         = '', // unstructured
+				// Optional unlimited
+				comments        = [], // unstructured
+				keywords        = [], // phrase *("," phrase)
+				// https://datatracker.ietf.org/doc/html/rfc2822#section-3.6.6
+				'resent-date'   = [],
+				'resent-from'   = [],
+				'resent-sender' = [],
+				'resent-to'     = [],
+				'resent-cc'     = [],
+				'resent-bcc'    = [],
+				'resent-msg-id' = [],
+				// https://datatracker.ietf.org/doc/html/rfc2822#section-3.6.7
+				trace           = [],
+				'return-path'   = '', // angle-addr
+				received        = [],
+				// optional others outside RFC2822
+				'mime-version'              = '', // RFC2045
+				'content-transfer-encoding' = '',
+				'content-type'              = '',
+				'delivered-to'              = [], // RFC9228 addr-spec
+				'authentication-results'    = '', // dkim, spf, dmarc
+				'dkim-signature'            = '',
+				'x-rspamd-queue-id'         = '',
+				'x-rspamd-action'           = '',
+				'x-spamd-bar'               = '',
+				'x-rspamd-server'           = '',
+				'x-spamd-result'            = '',
+				'x-remote-address'          = '',
+				// etc.
+			};
+		}
+*/
+
 		header(name) {
-			return this.headers && this.headers[name];
+			return this.headers?.[name];
 		}
 
 		headerValue(name) {
-			return (this.header(name) || {value:null}).value;
+			return this.header(name)?.value;
 		}
 
 		get raw() {
@@ -26,88 +82,100 @@ export function ParseMime(text)
 
 		get body() {
 			let body = this.bodyRaw,
-				encoding = this.headerValue('content-transfer-encoding');
+				charset = this.header('content-type')?.params.charset,
+				encoding = this.headerValue('content-transfer-encoding')?.toLowerCase();
 			if ('quoted-printable' == encoding) {
-				body = body.replace(/=\r?\n/g, '').replace(QPDecodeIn, QPDecodeOut);
+				body = QPDecode(body);
 			} else if ('base64' == encoding) {
-				body = atob(body.replace(/\r?\n/g, ''));
+				body = BDecode(body.replace(/\r?\n/g, ''));
 			}
-			return body;
+			return decodeText(charset, body);
 		}
 
 		get dataUrl() {
 			let body = this.bodyRaw,
-				encoding = this.headerValue('content-transfer-encoding');
+				encoding = this.headerValue('content-transfer-encoding')?.toLowerCase();
 			if ('base64' == encoding) {
 				body = body.replace(/\r?\n/g, '');
 			} else {
 				if ('quoted-printable' == encoding) {
-					body = body.replace(/=\r?\n/g, '').replace(QPDecodeIn, QPDecodeOut);
+					body = QPDecode(body);
 				}
-				body = btoa(body);
+				body = BEncode(body);
 			}
 			return 'data:' + this.headerValue('content-type') + ';base64,' + body;
 		}
 
 		forEach(fn) {
 			fn(this);
-			if (this.parts) {
-				this.parts.forEach(part => part.forEach(fn));
-			}
+			this.parts.forEach(part => part.forEach(fn));
 		}
 
 		getByContentType(type) {
-			if (type == this.headerValue('content-type')) {
+			if (type == this.headerValue('content-type')?.toLowerCase()) {
 				return this;
 			}
-			if (this.parts) {
-				let i = 0, p = this.parts, part;
-				for (i; i < p.length; ++i) {
-					if ((part = p[i].getByContentType(type))) {
-						return part;
-					}
+			let i = 0, p = this.parts, part;
+			for (i; i < p.length; ++i) {
+				if ((part = p[i].getByContentType(type))) {
+					return part;
 				}
 			}
 		}
 	}
 
+	// mailbox-list or address-list
+	const lists = ['from','reply-to','to','cc','bcc'];
+
 	const ParsePart = (mimePart, start_pos = 0, id = '') =>
 	{
-		let part = new MimePart;
+		let part = new MimePart,
+			head = mimePart.match(/^[\s\S]+?\r?\n\r?\n/)?.[0],
+			headers = {};
 		if (id) {
 			part.id = id;
 			part.start = start_pos;
 			part.end = start_pos + mimePart.length;
 		}
+		part.parts = [];
 
 		// get headers
-		let head = mimePart.match(/^[\s\S]+?\r?\n\r?\n/);
 		if (head) {
-			head = head[0];
-			let headers = {};
 			head.replace(/\r?\n\s+/g, ' ').split(/\r?\n/).forEach(header => {
 				let match = header.match(/^([^:]+):\s*([^;]+)/),
 					params = {};
-				[...header.matchAll(/;\s*([^;=]+)=\s*"?([^;"]+)"?/g)].forEach(param =>
-					params[param[1].trim().toLowerCase()] = param[2].trim()
-				);
-				headers[match[1].trim().toLowerCase()] = {
-					value: match[2].trim(),
-					params: params
-				};
+				if (match) {
+					[...header.matchAll(/;\s*([^;=]+)=\s*"?([^;"]+)"?/g)].forEach(param =>
+						params[param[1].trim().toLowerCase()] = param[2].trim()
+					);
+					let field = match[1].trim().toLowerCase();
+					if (lists.includes(field)) {
+						match[2] = addressparser(match[2]);
+					} else if ('keywords' === field) {
+						match[2] = match[2].split(',').forEach(entry => decodeEncodedWords(entry.trim()));
+						match[2] = (headers[field]?.value || []).concat(match[2]);
+					} else {
+						match[2] = decodeEncodedWords(match[2].trim());
+						if ('comments' === field) {
+							match[2] = (headers[field]?.value || []).push(match[2]);
+						}
+					}
+					headers[field] = {
+						value: match[2],
+						params: params
+					};
+				}
 			});
-			part.headers = headers;
 
 			// get body
 			part.bodyStart = start_pos + head.length;
 			part.bodyEnd = start_pos + mimePart.length;
 
 			// get child parts
-			let boundary = headers['content-type'].params.boundary;
+			let boundary = headers['content-type']?.params.boundary;
 			if (boundary) {
 				part.boundary = boundary;
-				part.parts = [];
-				let regex = new RegExp('(?:^|\r?\n)--' + boundary + '(?:--)?(?:\r?\n|$)', 'g'),
+				let regex = new RegExp('(?:^|\r?\n)--' + RegExp.escape(boundary) + '(?:--)?(?:\r?\n|$)', 'g'),
 					body = mimePart.slice(head.length),
 					bodies = body.split(regex),
 					pos = part.bodyStart;
@@ -123,6 +191,8 @@ export function ParseMime(text)
 					}
 				});
 			}
+
+			part.headers = headers;
 		}
 
 		return part;
diff --git a/dev/Mime/Utils.js b/dev/Mime/Utils.js
index 07d836c63..4927898f3 100644
--- a/dev/Mime/Utils.js
+++ b/dev/Mime/Utils.js
@@ -4,23 +4,40 @@ import { AttachmentModel } from 'Model/Attachment';
 import { FileInfo } from 'Common/File';
 import { BEGIN_PGP_MESSAGE } from 'Stores/User/Pgp';
 
+import { EmailModel } from 'Model/Email';
+
 /**
  * @param string data
  * @param MessageModel message
  */
 export function MimeToMessage(data, message)
 {
-	let signed;
 	const struct = ParseMime(data);
 	if (struct.headers) {
-		let html = struct.getByContentType('text/html');
+		let html = struct.getByContentType('text/html'),
+			subject = struct.headerValue('subject');
 		html = html ? html.body : '';
 
+		// Content-Type: ...; protected-headers="v1"
+		subject && message.subject(subject);
+
+		// EmailCollectionModel
+		['from','to'].forEach(name => {
+			const items = message[name];
+			struct.headerValue(name)?.forEach(item => {
+				item = new EmailModel(item.email, item.name);
+				// Make them unique
+				if (item.email && item.name || !items.find(address => address.email == item.email)) {
+					items.push(item);
+				}
+			});
+		});
+
 		struct.forEach(part => {
 			let cd = part.header('content-disposition'),
-				cid = part.header('content-id'),
+				cId = part.header('content-id'),
 				type = part.header('content-type');
-			if (cid || cd) {
+			if (cId || cd) {
 				// if (cd && 'attachment' === cd.value) {
 				let attachment = new AttachmentModel;
 				attachment.mimeType = type.value;
@@ -28,18 +45,15 @@ export function MimeToMessage(data, message)
 				attachment.fileNameExt = attachment.fileName.replace(/^.+(\.[a-z]+)$/, '$1');
 				attachment.fileType = FileInfo.getType('', type.value);
 				attachment.url = part.dataUrl;
-				attachment.friendlySize = FileInfo.friendlySize(part.body.length);
+				attachment.estimatedSize = part.body.length;
 /*
-				attachment.isThumbnail = false;
 				attachment.contentLocation = '';
-				attachment.download = '';
 				attachment.folder = '';
 				attachment.uid = '';
 				attachment.mimeIndex = part.id;
-				attachment.framed = false;
 */
-				attachment.cid = cid ? cid.value : '';
-				if (cid && html) {
+				attachment.cId = cId ? cId.value : '';
+				if (cId && html) {
 					let cid = 'cid:' + attachment.contentId(),
 						found = html.includes(cid);
 					attachment.isInline(found);
@@ -51,12 +65,28 @@ export function MimeToMessage(data, message)
 				} else {
 					message.attachments.push(attachment);
 				}
-			} else if ('multipart/signed' === type.value && 'application/pgp-signature' === type.params.protocol) {
-				signed = {
-					MicAlg: type.micalg,
-					BodyPart: part.parts[0],
-					SigPart: part.parts[1]
-				};
+			} else if ('multipart/signed' === type.value) {
+				let protocol = type.params.protocol;
+				if ('application/pgp-signature' === protocol) {
+					message.pgpSigned({
+						micAlg: type.micalg,
+						bodyPart: part.parts[0],
+						sigPart: part.parts[1]
+					});
+				} else if ('application/pkcs7-signature' === protocol.replace('x-')) {
+					message.smimeSigned({
+						micAlg: type.micalg,
+						bodyPart: part,
+						sigPart: part.parts[1], // For importing
+						detached: true
+					});
+				}
+			} else if ('application/pkcs7-mime' === type.value /*&& 'signed-data' === type.params['smime-type']=*/) {
+				message.smimeSigned({
+					micAlg: type.micalg,
+					bodyPart: part,
+					detached: false
+				});
 			}
 		});
 
@@ -67,10 +97,7 @@ export function MimeToMessage(data, message)
 		message.plain(data);
 	}
 
-	if (!signed && message.plain().includes(BEGIN_PGP_MESSAGE)) {
-		signed = true;
+	if (message.plain().includes(BEGIN_PGP_MESSAGE)) {
+		message.pgpSigned(true);
 	}
-	message.pgpSigned(signed);
-
-	// TODO: Verify instantly?
 }
diff --git a/dev/Model/AbstractCollection.js b/dev/Model/AbstractCollection.js
index 85dd57449..e4a9d0910 100644
--- a/dev/Model/AbstractCollection.js
+++ b/dev/Model/AbstractCollection.js
@@ -5,14 +5,14 @@ export class AbstractCollectionModel extends Array
 	constructor() {
 /*
 		if (new.target === AbstractCollectionModel) {
-			throw new Error("Can't instantiate AbstractCollectionModel!");
+			throw Error("Can't instantiate AbstractCollectionModel!");
 		}
 */
 		super();
 	}
 
 	onDestroy() {
-		this.forEach(item => item.onDestroy && item.onDestroy());
+		this.forEach(item => item.onDestroy?.());
 	}
 
 	/**
@@ -27,12 +27,10 @@ export class AbstractCollectionModel extends Array
 				forEachObjectEntry(json, (key, value) => '@' !== key[0] && (result[key] = value));
 				json = json['@Collection'];
 			}
-			if (isArray(json)) {
-				json.forEach(item => {
-					item && itemCallback && (item = itemCallback(item, result));
-					item && result.push(item);
-				});
-			}
+			isArray(json) && json.forEach(item => {
+				item && itemCallback && (item = itemCallback(item, result));
+				item && result.push(item);
+			});
 		}
 		return result;
 	}
diff --git a/dev/Model/Account.js b/dev/Model/Account.js
index adfc5feec..2df0ea725 100644
--- a/dev/Model/Account.js
+++ b/dev/Model/Account.js
@@ -1,4 +1,7 @@
 import { AbstractModel } from 'Knoin/AbstractModel';
+import { addObservablesTo } from 'External/ko';
+import Remote from 'Remote/User/Fetch';
+import { SettingsUserStore } from 'Stores/User/Settings';
 
 export class AccountModel extends AbstractModel {
 	/**
@@ -6,16 +9,56 @@ export class AccountModel extends AbstractModel {
 	 * @param {boolean=} canBeDelete = true
 	 * @param {number=} count = 0
 	 */
-	constructor(email/*, count = 0*/, isAdditional = true) {
+	constructor(email, name, isAdditional = true) {
 		super();
 
+		this.name = name;
 		this.email = email;
 
-		this.addObservables({
-//			count: count || 0,
+		this.displayName = name ? name + ' <' + email + '>' : email;
+
+		addObservablesTo(this, {
+			unreadEmails: null,
 			askDelete: false,
 			isAdditional: isAdditional
 		});
+
+		// Load at random between 3 and 30 seconds
+		SettingsUserStore.showUnreadCount() && isAdditional
+		&& setTimeout(()=>this.fetchUnread(), (Math.ceil(Math.random() * 10)) * 3000);
 	}
 
+	label() {
+		return this.name || IDN.toUnicode(this.email);
+	}
+
+	/**
+	 * Get INBOX unread messages
+	 */
+	fetchUnread() {
+		Remote.request('AccountUnread', (iError, oData) => {
+			iError || this.unreadEmails(oData?.Result?.unreadEmails || null);
+		}, {
+			email: this.email
+		});
+	}
+
+	/**
+	 * Imports all mail to main account
+	 *//*
+	importAll(account) {
+		Remote.streamPerLine(line => {
+			try {
+				line = JSON.parse(line);
+				console.dir(line);
+			} catch (e) {
+				// OOPS
+			}
+		}, 'AccountImport', {
+			Action: 'AccountImport',
+			email: account.email
+		});
+	}
+	*/
+
 }
diff --git a/dev/Model/Attachment.js b/dev/Model/Attachment.js
index c5522a1dc..93fbc42f4 100644
--- a/dev/Model/Attachment.js
+++ b/dev/Model/Attachment.js
@@ -1,12 +1,15 @@
 import ko from 'ko';
 
 import { FileInfo, FileType } from 'Common/File';
+import { stopEvent, SettingsGet, SettingsCapa } from 'Common/Globals';
+import { b64EncodeJSONSafe } from 'Common/Utils';
 import {
 	attachmentDownload,
 	serverRequestRaw
 } from 'Common/Links';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
+import { addObservablesTo } from 'External/ko';
 
 import { SMAudio } from 'Common/Audio';
 
@@ -14,24 +17,22 @@ export class AttachmentModel extends AbstractModel {
 	constructor() {
 		super();
 
-		this.checked = ko.observable(false);
+		this.checked = ko.observable(true);
 
 		this.mimeType = '';
+//		this.mimeTypeParams = '';
 		this.fileName = '';
 		this.fileNameExt = '';
 		this.fileType = FileType.Unknown;
-		this.friendlySize = '';
-		this.isThumbnail = false;
-		this.cid = '';
+		this.cId = '';
 		this.contentLocation = '';
-		this.download = '';
 		this.folder = '';
 		this.uid = '';
 		this.url = '';
 		this.mimeIndex = '';
-		this.framed = false;
+		this.estimatedSize = 0;
 
-		this.addObservables({
+		addObservablesTo(this, {
 			isInline: false,
 			isLinked: false
 		});
@@ -45,16 +46,23 @@ export class AttachmentModel extends AbstractModel {
 	static reviveFromJson(json) {
 		const attachment = super.reviveFromJson(json);
 		if (attachment) {
-			attachment.friendlySize = FileInfo.friendlySize(json.EstimatedSize);
-
 			attachment.fileNameExt = FileInfo.getExtension(attachment.fileName);
 			attachment.fileType = FileInfo.getType(attachment.fileNameExt, attachment.mimeType);
 		}
 		return attachment;
 	}
 
+	toggleChecked(self, event) {
+		stopEvent(event);
+		self.checked(!self.checked());
+	}
+
+	friendlySize() {
+		return FileInfo.friendlySize(this.estimatedSize) + (this.isLinked() ? ' 🔗' : '');
+	}
+
 	contentId() {
-		return this.cid.replace(/^<+|>+$/g, '');
+		return this.cId.replace(/^<+|>+$/g, '');
 	}
 
 	/**
@@ -85,13 +93,6 @@ export class AttachmentModel extends AbstractModel {
 		return FileType.Audio === this.fileType && 'wav' === this.fileNameExt;
 	}
 
-	/**
-	 * @returns {boolean}
-	 */
-	hasThumbnail() {
-		return this.isThumbnail;
-	}
-
 	/**
 	 * @returns {boolean}
 	 */
@@ -124,6 +125,20 @@ export class AttachmentModel extends AbstractModel {
 		);
 	}
 
+	get download() {
+		return b64EncodeJSONSafe(this.url ? {
+			fileName: this.fileName,
+			data: this.url.replace(/^.+,/, '')
+		} : {
+			folder: this.folder,
+			uid: this.uid,
+			mimeIndex: this.mimeIndex,
+			mimeType: this.mimeType,
+			fileName: this.fileName,
+			accountHash: SettingsGet('accountHash')
+		});
+	}
+
 	/**
 	 * @returns {string}
 	 */
@@ -138,11 +153,20 @@ export class AttachmentModel extends AbstractModel {
 		return this.url || serverRequestRaw('View', this.download);
 	}
 
+	/**
+	 * @returns {boolean}
+	 */
+	hasThumbnail() {
+		return SettingsCapa('AttachmentThumbnails') && this.isImage() && !this.isLinked();
+	}
+
 	/**
 	 * @returns {string}
 	 */
-	linkThumbnailPreviewStyle() {
-		return this.hasThumbnail() ? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')' : '';
+	thumbnailStyle() {
+		return this.hasThumbnail()
+			? 'background:url(' + serverRequestRaw('ViewThumbnail', this.download) + ')'
+			: null;
 	}
 
 	/**
@@ -173,7 +197,7 @@ export class AttachmentModel extends AbstractModel {
 		const localEvent = event.originalEvent || event;
 		if (attachment && localEvent && localEvent.dataTransfer && localEvent.dataTransfer.setData) {
 			let link = this.linkDownload();
-			if ('http' !== link.slice(0, 4)) {
+			if (!link.startsWith('http')) {
 				link = location.protocol + '//' + location.host + location.pathname + link;
 			}
 			localEvent.dataTransfer.setData('DownloadURL', this.mimeType + ':' + this.fileName + ':' + link);
diff --git a/dev/Model/AttachmentCollection.js b/dev/Model/AttachmentCollection.js
index b799dc8dc..016110efe 100644
--- a/dev/Model/AttachmentCollection.js
+++ b/dev/Model/AttachmentCollection.js
@@ -1,3 +1,4 @@
+import { baseCollator } from 'Common/Translator';
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { AttachmentModel } from 'Model/Attachment';
 
@@ -10,29 +11,32 @@ export class AttachmentCollectionModel extends AbstractCollectionModel
 	 * @returns {AttachmentCollectionModel}
 	 */
 	static reviveFromJson(items) {
-		return super.reviveFromJson(items, attachment => AttachmentModel.reviveFromJson(attachment));
-/*
 		const attachments = super.reviveFromJson(items, attachment => AttachmentModel.reviveFromJson(attachment));
+		let collator = baseCollator(true);
+		attachments.sort((a, b) => {
+			if (a.isInline()) {
+				if (!b.isInline()) {
+					return 1;
+				}
+			} else if (!b.isInline()) {
+				return -1;
+			}
+			return collator.compare(a.fileName, b.fileName);
+		});
+/*
 		if (attachments) {
 			attachments.InlineCount = attachments.reduce((accumulator, a) => accumulator + (a.isInline ? 1 : 0), 0);
 		}
-		return attachments;
 */
+		return attachments;
 	}
 
 	/**
-	 * @returns {boolean}
-	 */
-	hasVisible() {
-		return !!this.filter(item => !item.isLinked()).length;
-	}
-
-	/**
-	 * @param {string} cid
+	 * @param {string} cId
 	 * @returns {*}
 	 */
-	findByCid(cid) {
-		cid = cid.replace(/^<+|>+$/g, '');
-		return this.find(item => cid === item.contentId());
+	findByCid(cId) {
+		cId = cId.replace(/^<+|>+$/g, '');
+		return this.find(item => cId === item.contentId());
 	}
 }
diff --git a/dev/Model/ComposeAttachment.js b/dev/Model/ComposeAttachment.js
index 8c3d898c9..6fc8eb3f5 100644
--- a/dev/Model/ComposeAttachment.js
+++ b/dev/Model/ComposeAttachment.js
@@ -1,6 +1,7 @@
 import { FileInfo } from 'Common/File';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
 export class ComposeAttachmentModel extends AbstractModel {
 	/**
@@ -9,23 +10,24 @@ export class ComposeAttachmentModel extends AbstractModel {
 	 * @param {?number=} size = null
 	 * @param {boolean=} isInline = false
 	 * @param {boolean=} isLinked = false
-	 * @param {string=} CID = ''
+	 * @param {string=} cId = ''
 	 * @param {string=} contentLocation = ''
 	 */
-	constructor(id, fileName, size = null, isInline = false, isLinked = false, CID = '', contentLocation = '') {
+	constructor(id, fileName, size = null, isInline = false, isLinked = false, cId = '', contentLocation = '') {
 		super();
 
 		this.id = id;
 		this.isInline = !!isInline;
 		this.isLinked = !!isLinked;
-		this.CID = CID;
+		this.cId = cId;
 		this.contentLocation = contentLocation;
 		this.fromMessage = false;
 
-		this.addObservables({
+		addObservablesTo(this, {
 			fileName: fileName,
 			size: size,
 			tempName: '',
+			type: '', // application/octet-stream
 
 			progress: 0,
 			error: '',
@@ -35,15 +37,15 @@ export class ComposeAttachmentModel extends AbstractModel {
 			complete: false
 		});
 
-		this.addComputables({
+		addComputablesTo(this, {
 			progressText: () => {
 				const p = this.progress();
-				return 0 === p ? '' : '' + (98 < p ? 100 : p) + '%';
+				return 1 > p ? '' : (100 < p ? 100 : p) + '%';
 			},
 
 			progressStyle: () => {
 				const p = this.progress();
-				return 0 === p ? '' : 'width:' + (98 < p ? 100 : p) + '%';
+				return 1 > p ? '' : 'width:' + (100 < p ? 100 : p) + '%';
 			},
 
 			title: () => this.error() || this.fileName(),
@@ -53,15 +55,10 @@ export class ComposeAttachmentModel extends AbstractModel {
 				return null === localSize ? '' : FileInfo.friendlySize(localSize);
 			},
 
-			mimeType: () => FileInfo.getContentType(this.fileName()),
-			fileExt: () => FileInfo.getExtension(this.fileName())
+			mimeType: () => this.type() || FileInfo.getContentType(this.fileName()),
+			fileExt: () => FileInfo.getExtension(this.fileName()),
+
+			iconClass: () => FileInfo.getIconClass(this.fileExt(), this.mimeType())
 		});
 	}
-
-	/**
-	 * @returns {string}
-	 */
-	iconClass() {
-		return FileInfo.getIconClass(this.fileExt(), this.mimeType());
-	}
 }
diff --git a/dev/Model/Contact.js b/dev/Model/Contact.js
index edff787bd..3ff94dc35 100644
--- a/dev/Model/Contact.js
+++ b/dev/Model/Contact.js
@@ -1,123 +1,307 @@
-import { arrayLength } from 'Common/Utils';
-import { ContactPropertyModel, ContactPropertyType } from 'Model/ContactProperty';
 import { AbstractModel } from 'Knoin/AbstractModel';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
+
+import { JCard } from 'DAV/JCard';
+//import { VCardProperty } from 'DAV/VCardProperty';
+
+const nProps = [
+	'surName',
+	'givenName',
+	'middleName',
+	'namePrefix',
+	'nameSuffix'
+];
+
+/*
+const propertyMap = [
+	// vCard 2.1 properties and up
+	'N' => 'Text',
+	'FN' => 'FlatText',
+	'PHOTO' => 'Binary',
+	'BDAY' => 'DateAndOrTime',
+	'ADR' => 'Text',
+	'TEL' => 'FlatText',
+	'EMAIL' => 'FlatText',
+	'GEO' => 'FlatText',
+	'TITLE' => 'FlatText',
+	'ROLE' => 'FlatText',
+	'LOGO' => 'Binary',
+	'ORG' => 'Text',
+	'NOTE' => 'FlatText',
+	'REV' => 'TimeStamp',
+	'SOUND' => 'FlatText',
+	'URL' => 'Uri',
+	'UID' => 'FlatText',
+	'VERSION' => 'FlatText',
+	'KEY' => 'FlatText', // <uri>data:application/pgp-keys;base64,AZaz09==</uri>
+	'TZ' => 'Text',
+
+	// vCard 3.0 properties
+	'CATEGORIES' => 'Text',
+	'SORT-STRING' => 'FlatText',
+	'PRODID' => 'FlatText',
+	'NICKNAME' => 'Text',
+
+	// rfc2739 properties
+	'FBURL' => 'Uri',
+	'CAPURI' => 'Uri',
+	'CALURI' => 'Uri',
+	'CALADRURI' => 'Uri',
+
+	// rfc4770 properties
+	'IMPP' => 'Uri',
+
+	// vCard 4.0 properties
+	'SOURCE' => 'Uri',
+	'XML' => 'FlatText',
+	'ANNIVERSARY' => 'DateAndOrTime',
+	'CLIENTPIDMAP' => 'Text',
+	'LANG' => 'LanguageTag',
+	'GENDER' => 'Text',
+	'KIND' => 'FlatText',
+	'MEMBER' => 'Uri',
+	'RELATED' => 'Uri',
+
+	// rfc6474 properties
+	'BIRTHPLACE' => 'FlatText',
+	'DEATHPLACE' => 'FlatText',
+	'DEATHDATE' => 'DateAndOrTime',
+
+	// rfc6715 properties
+	'EXPERTISE' => 'FlatText',
+	'HOBBY' => 'FlatText',
+	'INTEREST' => 'FlatText',
+	'ORG-DIRECTORY' => 'FlatText
+];
+*/
 
 export class ContactModel extends AbstractModel {
 	constructor() {
 		super();
 
-		this.id = 0;
-		this.display = '';
-		this.properties = [];
-		this.readOnly = false;
+		this.jCard = ['vcard',[]];
 
-		this.addObservables({
+		addObservablesTo(this, {
+			// Also used by Selector
 			focused: false,
 			selected: false,
 			checked: false,
-			deleted: false
+			sendToAll: true,
+
+			deleted: false,
+			readOnly: false,
+
+			id: 0,
+			givenName:  '', // FirstName
+			surName:    '', // LastName
+			middleName: '', // MiddleName
+			namePrefix: '', // NamePrefix
+			nameSuffix: '',  // NameSuffix
+			nickname: null,
+			note: null,
+
+			// Business
+			org: '',
+			department: '',
+			title: '',
+
+			// Crypto
+			encryptpref: '',
+			signpref: ''
+		});
+//		this.email = koArrayWithDestroy();
+		this.email = ko.observableArray();
+		this.tel   = ko.observableArray();
+		this.url   = ko.observableArray();
+		this.adr   = ko.observableArray();
+
+		addComputablesTo(this, {
+			fullName: () => [this.namePrefix(), this.givenName(), this.middleName(), this.surName()].join(' ').trim(),
+
+			display: () => {
+				let a = this.fullName(),
+					b = this.email()[0]?.value(),
+					c = this.nickname();
+				return a || b || c;
+			}
+/*
+			fullName: {
+				read: () => this.givenName() + " " + this.surName(),
+				write: value => {
+					this.jCard.set('fn', value/*, params, group* /)
+				}
+			}
+*/
 		});
 	}
 
-	/**
-	 * @returns {Array|null}
-	 */
-	getNameAndEmailHelper() {
-		let name = '',
-			email = '';
-
-		if (arrayLength(this.properties)) {
-			this.properties.forEach(property => {
-				if (property) {
-					if (ContactPropertyType.FirstName === property.type()) {
-						name = (property.value() + ' ' + name).trim();
-					} else if (ContactPropertyType.LastName === property.type()) {
-						name = (name + ' ' + property.value()).trim();
-					} else if (!email && ContactPropertyType.Email === property.type()) {
-						email = property.value();
-					}
-				}
-			});
-		}
-
-		return email ? [email, name] : null;
-	}
-
 	/**
 	 * @static
-	 * @param {FetchJsonContact} json
+	 * @param {jCard} json
 	 * @returns {?ContactModel}
 	 */
 	static reviveFromJson(json) {
 		const contact = super.reviveFromJson(json);
 		if (contact) {
-			let list = [];
-			if (arrayLength(json.properties)) {
-				json.properties.forEach(property => {
-					property = ContactPropertyModel.reviveFromJson(property);
-					property && list.push(property);
-				});
+			let jCard = new JCard(json.jCard),
+				props = jCard.getOne('n')?.value;
+			props && props.forEach((value, index) =>
+				value && contact[nProps[index]](value)
+			);
+
+			['nickname', 'note', 'title'].forEach(field => {
+				props = jCard.getOne(field);
+				props && contact[field](props.value);
+			});
+
+			if ((props = jCard.getOne('org')?.value)) {
+				contact.org(props[0]);
+				contact.department(props[1] || '');
 			}
-			contact.properties = list;
-			contact.initDefaultProperties();
+
+			['email', 'tel', 'url'].forEach(field => {
+				props = jCard.get(field);
+				props && props.forEach(prop => {
+					contact[field].push({
+						value: ko.observable(prop.value)
+//						type: prop.params.type
+					});
+				});
+			});
+
+			props = jCard.get('adr');
+			props && props.forEach(prop => {
+				contact.adr.push({
+					street: ko.observable(prop.value[2]),
+					street_ext: ko.observable(prop.value[1]),
+					locality: ko.observable(prop.value[3]),
+					region: ko.observable(prop.value[4]),
+					postcode: ko.observable(prop.value[5]),
+					pobox: ko.observable(prop.value[0]),
+					country: ko.observable(prop.value[6]),
+					preferred: ko.observable(prop.params.pref),
+					type: ko.observable(prop.params.type) // HOME | WORK
+				});
+			});
+
+			props = jCard.getOne('x-crypto');
+			contact.signpref(props?.params.signpref || 'Ask');
+			contact.encryptpref(props?.params.encryptpref || 'Ask');
+//			contact.encryptpref(props?.params.allowed || 'PGP/INLINE,PGP/MIME,S/MIME,S/MIMEOpaque');
+
+			contact.jCard = json.jCard;
 		}
 		return contact;
 	}
 
-	initDefaultProperties() {
-		let list = this.properties;
-		list.sort((p1,p2) =>{
-			if (p2.type() == ContactPropertyType.FirstName) {
-				return 1;
-			}
-			if (p1.type() == ContactPropertyType.FirstName || p1.type() == ContactPropertyType.LastName) {
-				return -1;
-			}
-			if (p2.type() == ContactPropertyType.LastName) {
-				return 1;
-			}
-			return 0;
+	addEmail() {
+		// home, work
+		this.email.push({
+			value: ko.observable('')
+//			type: prop.params.type
 		});
-		let found = list.find(prop => prop.type() == ContactPropertyType.LastName);
-		if (!found) {
-			found = new ContactPropertyModel(ContactPropertyType.LastName);
-			list.unshift(found);
-		}
-		found.placeholder('CONTACTS/PLACEHOLDER_ENTER_LAST_NAME');
-		found = list.find(prop => prop.type() == ContactPropertyType.FirstName);
-		if (!found) {
-			found = new ContactPropertyModel(ContactPropertyType.FirstName);
-			list.unshift(found);
-		}
-		found.placeholder('CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME');
-		this.properties = list;
+
+		if (this.sendToAllDisplayStatus())
+			document.getElementById('send-to-all').style.display = 'block';
 	}
 
-	/**
-	 * @returns {string}
-	 */
-	generateUid() {
-		return ''+this.id;
+	addTel() {
+		// home, work, text, voice, fax, cell, video, pager, textphone, iana-token, x-name
+		this.tel.push({
+			value: ko.observable('')
+//			type: prop.params.type
+		});
+	}
+
+	addUrl() {
+		// home, work
+		this.url.push({
+			value: ko.observable('')
+//			type: prop.params.type
+		});
+	}
+
+	addNickname() {
+		// home, work
+		this.nickname() || this.nickname('');
+	}
+
+	addNote() {
+		this.note() || this.note('');
+	}
+
+	hasChanges()
+	{
+		return this.email().filter(v => v.length).length && this.toJSON().jCard != JSON.stringify(this.jCard);
+	}
+
+	toJSON()
+	{
+		let jCard = new JCard(this.jCard);
+		jCard.set('n', [
+			this.surName(),
+			this.givenName(),
+			this.middleName(),
+			this.namePrefix(),
+			this.nameSuffix()
+		]/*, params, group*/);
+		jCard.parseFullName({set:true});
+
+		['nickname', 'note', 'title'].forEach(field =>
+			this[field]() ? jCard.set(field, this[field]()/*, params, group*/) : jCard.remove(field)
+		);
+
+		if (this.org()) {
+			let org = [this.org()];
+			if (this.department()) {
+				org.push(this.department());
+			}
+			let prop = jCard.getOne('org');
+			prop ? prop.value = org : jCard.set('org', org);
+		} else {
+			jCard.remove('');
+		}
+
+		['email', 'tel', 'url'].forEach(field => {
+			let values = this[field].map(item => item.value());
+			jCard.get(field).forEach(prop => {
+				let i = values.indexOf(prop.value);
+				if (0 > i || !prop.value) {
+					jCard.remove(prop);
+				} else {
+					values.splice(i, 1);
+				}
+			});
+			values.forEach(value => value && jCard.add(field, value));
+		});
+
+		jCard.set('x-crypto', '', {
+			allowed: 'PGP/INLINE,PGP/MIME,S/MIME,S/MIMEOpaque',
+			signpref: this.signpref(),
+			encryptpref: this.encryptpref()
+		}, 'x-crypto');
+
+		// Done by server
+//		jCard.set('rev', '2022-05-21T10:59:52Z')
+
+		return {
+			uid: this.id,
+			jCard: JSON.stringify(jCard)
+		};
 	}
 
 	/**
 	 * @return string
 	 */
 	lineAsCss() {
-		const result = [];
-		if (this.deleted()) {
-			result.push('deleted');
-		}
-		if (this.selected()) {
-			result.push('selected');
-		}
-		if (this.checked()) {
-			result.push('checked');
-		}
-		if (this.focused()) {
-			result.push('focused');
-		}
-
-		return result.join(' ');
+		return (this.selected() ? 'selected' : '')
+			+ (this.deleted() ? ' deleted' : '')
+			+ (this.checked() ? ' checked' : '')
+			+ (this.focused() ? ' focused' : '');
 	}
+
+	sendToAllDisplayStatus() {
+		return this.email.length > 1
+	}
+
 }
diff --git a/dev/Model/ContactProperty.js b/dev/Model/ContactProperty.js
deleted file mode 100644
index 8617627f5..000000000
--- a/dev/Model/ContactProperty.js
+++ /dev/null
@@ -1,86 +0,0 @@
-import { pInt, pString } from 'Common/Utils';
-import { i18n } from 'Common/Translator';
-
-import { AbstractModel } from 'Knoin/AbstractModel';
-
-const trim = text => null == text ? "" : (text + "").trim();
-
-/**
- * @enum {number}
- */
-export const ContactPropertyType = {
-	Unknown: 0,
-
-	FullName: 10,
-
-	FirstName: 15,
-	LastName: 16,
-	MiddleName: 17,
-	Nick: 18,
-
-	NamePrefix: 20,
-	NameSuffix: 21,
-
-	Email: 30,
-	Phone: 31,
-	Web: 32,
-
-	Birthday: 40,
-
-	Facebook: 90,
-	Skype: 91,
-	GitHub: 92,
-
-	Note: 110,
-
-	Custom: 250
-};
-
-export class ContactPropertyModel extends AbstractModel {
-	/**
-	 * @param {number=} type = Enums.ContactPropertyType.Unknown
-	 * @param {string=} typeStr = ''
-	 * @param {string=} value = ''
-	 * @param {boolean=} focused = false
-	 * @param {string=} placeholder = ''
-	 */
-	constructor(type = ContactPropertyType.Unknown, typeStr = '', value = '', focused = false, placeholder = '') {
-		super();
-
-		this.addObservables({
-			type: pInt(type),
-			typeStr: pString(typeStr),
-			focused: !!focused,
-			value: pString(value),
-
-			placeholder: placeholder
-		});
-
-		this.addComputables({
-			placeholderValue: () => {
-				const v = this.placeholder();
-				return v ? i18n(v) : '';
-			},
-
-			largeValue: () => ContactPropertyType.Note === this.type()
-		});
-	}
-
-	isType(type) {
-		return this.type && type === this.type();
-	}
-
-	isValid() {
-		return this.value && !!trim(this.value());
-	}
-
-	toJSON() {
-		return {
-			type: this.type(),
-			typeStr: this.typeStr(),
-			value: this.value()
-		};
-	}
-
-//	static reviveFromJson(json) {}
-}
diff --git a/dev/Model/Email.js b/dev/Model/Email.js
index 6502e105e..b4a77efcf 100644
--- a/dev/Model/Email.js
+++ b/dev/Model/Email.js
@@ -4,277 +4,18 @@ import { AbstractModel } from 'Knoin/AbstractModel';
 
 'use strict';
 
-/**
- * Parses structured e-mail addresses from an address field
- *
- * Example:
- *
- *    "Name <address@domain>"
- *
- * will be converted to
- *
- *     [{name: "Name", address: "address@domain"}]
- *
- * @param {String} str Address field
- * @return {Array} An array of address objects
- */
-function addressparser(str) {
-	var tokenizer = new Tokenizer(str);
-	var tokens = tokenizer.tokenize();
-	var addresses = [];
-	var address = [];
-	var parsedAddresses = [];
-
-	tokens.forEach(token => {
-		if (token.type === 'operator' && (token.value === ',' || token.value === ';')) {
-			if (address.length) {
-				addresses.push(address);
-			}
-			address = [];
-		} else {
-			address.push(token);
-		}
-	});
-
-	if (address.length) {
-		addresses.push(address);
-	}
-
-	addresses.forEach(address => {
-		address = _handleAddress(address);
-		if (address.length) {
-			parsedAddresses = parsedAddresses.concat(address);
-		}
-	});
-
-	return parsedAddresses;
-}
-
-/**
- * Converts tokens for a single address into an address object
- *
- * @param {Array} tokens Tokens object
- * @return {Object} Address object
- */
-function _handleAddress(tokens) {
-	var isGroup = false;
-	var state = 'text';
-	var address = void 0;
-	var addresses = [];
-	var data = {
-		address: [],
-		comment: [],
-		group: [],
-		text: []
-	};
-
-	// Filter out <addresses>, (comments) and regular text
-	tokens.forEach(token => {
-		if (token.type === 'operator') {
-			switch (token.value) {
-				case '<':
-					state = 'address';
-					break;
-				case '(':
-					state = 'comment';
-					break;
-				case ':':
-					state = 'group';
-					isGroup = true;
-					break;
-				default:
-					state = 'text';
-			}
-		} else if (token.value) {
-			data[state].push(token.value);
-		}
-	});
-
-	// If there is no text but a comment, replace the two
-	if (!data.text.length && data.comment.length) {
-		data.text = data.comment;
-		data.comment = [];
-	}
-
-	if (isGroup) {
-		// http://tools.ietf.org/html/rfc2822#appendix-A.1.3
-		data.text = data.text.join(' ');
-		addresses.push({
-			name: data.text || address && address.name,
-			group: data.group.length ? addressparser(data.group.join(',')) : []
-		});
-	} else {
-		// If no address was found, try to detect one from regular text
-		if (!data.address.length && data.text.length) {
-			var i = data.text.length;
-			while (i--) {
-				if (data.text[i].match(/^[^@\s]+@[^@\s]+$/)) {
-					data.address = data.text.splice(i, 1);
-					break;
-				}
-			}
-
-			// still no address
-			if (!data.address.length) {
-				i = data.text.length;
-				while (i--) {
-					data.text[i] = data.text[i].replace(/\s*\b[^@\s]+@[^@\s]+\b\s*/, address => {
-						if (!data.address.length) {
-							data.address = [address.trim()];
-							return '';
-						}
-						return address.trim();
-					});
-					if (data.address.length) {
-						break;
-					}
-				}
-			}
-		}
-
-		// If there's still is no text but a comment exixts, replace the two
-		if (!data.text.length && data.comment.length) {
-			data.text = data.comment;
-			data.comment = [];
-		}
-
-		// Keep only the first address occurence, push others to regular text
-		if (data.address.length > 1) {
-			data.text = data.text.concat(data.address.splice(1));
-		}
-
-		// Join values with spaces
-		data.text = data.text.join(' ');
-		data.address = data.address.join(' ');
-
-		if (!data.address && isGroup) {
-			return [];
-		}
-		address = {
-			address: data.address || data.text || '',
-			name: data.text || data.address || ''
-		};
-
-		if (address.address === address.name) {
-			if ((address.address || '').match(/@/)) {
-				address.name = '';
-			} else {
-				address.address = '';
-			}
-		}
-
-		addresses.push(address);
-	}
-
-	return addresses;
-}
-
-/*
- * Operator tokens and which tokens are expected to end the sequence
- */
-var OPERATORS = {
-  '"': '"',
-  '(': ')',
-  '<': '>',
-  ',': '',
-  // Groups are ended by semicolons
-  ':': ';',
-  // Semicolons are not a legal delimiter per the RFC2822 grammar other
-  // than for terminating a group, but they are also not valid for any
-  // other use in this context.  Given that some mail clients have
-  // historically allowed the semicolon as a delimiter equivalent to the
-  // comma in their UI, it makes sense to treat them the same as a comma
-  // when used outside of a group.
-  ';': ''
-};
-
-class Tokenizer
-{
-	constructor(str) {
-		this.str = (str || '').toString();
-		this.operatorCurrent = '';
-		this.operatorExpecting = '';
-		this.node = null;
-		this.escaped = false;
-		this.list = [];
-	}
-
-	tokenize() {
-		var list = [];
-		[...this.str].forEach(c => this.checkChar(c));
-
-		this.list.forEach(node => {
-			node.value = (node.value || '').toString().trim();
-			if (node.value) {
-				list.push(node);
-			}
-		});
-
-		return list;
-	}
-
-	checkChar(chr) {
-		if ((chr in OPERATORS || chr === '\\') && this.escaped) {
-			this.escaped = false;
-		} else if (this.operatorExpecting && chr === this.operatorExpecting) {
-			this.node = {
-				type: 'operator',
-				value: chr
-			};
-			this.list.push(this.node);
-			this.node = null;
-			this.operatorExpecting = '';
-			this.escaped = false;
-			return;
-		} else if (!this.operatorExpecting && chr in OPERATORS) {
-			this.node = {
-				type: 'operator',
-				value: chr
-			};
-			this.list.push(this.node);
-			this.node = null;
-			this.operatorExpecting = OPERATORS[chr];
-			this.escaped = false;
-			return;
-		}
-
-		if (!this.escaped && chr === '\\') {
-			this.escaped = true;
-			return;
-		}
-
-		if (!this.node) {
-			this.node = {
-				type: 'text',
-				value: ''
-			};
-			this.list.push(this.node);
-		}
-
-		if (this.escaped && chr !== '\\') {
-			this.node.value += '\\';
-		}
-
-		this.node.value += chr;
-		this.escaped = false;
-	}
-}
-
 export class EmailModel extends AbstractModel {
 	/**
 	 * @param {string=} email = ''
 	 * @param {string=} name = ''
 	 * @param {string=} dkimStatus = 'none'
-	 * @param {string=} dkimValue = ''
 	 */
-	constructor(email = '', name = '', dkimStatus = 'none', dkimValue = '') {
+	constructor(email, name, dkimStatus = 'none') {
 		super();
-		this.email = email;
-		this.name = name;
+		this.email = email || '';
+		this.name = name || '';
 		this.dkimStatus = dkimStatus;
-		this.dkimValue = dkimValue;
-
-		this.clearDuplicateName();
+		this.cleanup();
 	}
 
 	/**
@@ -284,149 +25,57 @@ export class EmailModel extends AbstractModel {
 	 */
 	static reviveFromJson(json) {
 		const email = super.reviveFromJson(json);
-		email && email.clearDuplicateName();
-		return email;
-	}
-
-	/**
-	 * @returns {void}
-	 */
-	clear() {
-		this.email = '';
-		this.name = '';
-
-		this.dkimStatus = 'none';
-		this.dkimValue = '';
+		email?.cleanup();
+		return email?.valid() ? email : null;
 	}
 
 	/**
 	 * @returns {boolean}
 	 */
-	validate() {
+	valid() {
 		return this.name || this.email;
 	}
 
-	/**
-	 * @param {boolean} withoutName = false
-	 * @returns {string}
-	 */
-	hash(withoutName = false) {
-		return '#' + (withoutName ? '' : this.name) + '#' + this.email + '#';
-	}
-
 	/**
 	 * @returns {void}
 	 */
-	clearDuplicateName() {
+	cleanup() {
 		if (this.name === this.email) {
 			this.name = '';
 		}
 	}
 
-	/**
-	 * @param {string} query
-	 * @returns {boolean}
-	 */
-	search(query) {
-		return (this.name + ' ' + this.email).toLowerCase().includes(query.toLowerCase());
-	}
-
 	/**
 	 * @param {boolean} friendlyView = false
-	 * @param {boolean=} wrapWithLink = false
-	 * @param {boolean=} useEncodeHtml = false
+	 * @param {boolean} wrapWithLink = false
 	 * @returns {string}
 	 */
-	toLine(friendlyView, wrapWithLink, useEncodeHtml) {
-		let result = '',
-			toLink = (to, txt) => '<a href="mailto:' + to + '" target="_blank" tabindex="-1">' + encodeHtml(txt) + '</a>';
-		if (this.email) {
-			if (friendlyView && this.name) {
-				result = wrapWithLink
-					? toLink(
-						encodeHtml(this.email) + '?to=' + encodeURIComponent('"' + this.name + '" <' + this.email + '>'),
-						this.name
-					)
-					: (useEncodeHtml ? encodeHtml(this.name) : this.name);
-			} else {
-				result = this.email;
-				if (this.name) {
-					if (wrapWithLink) {
-						result =
-							encodeHtml('"' + this.name + '" <')
-							+ toLink(
-								encodeHtml(this.email) + '?to=' + encodeURIComponent('"' + this.name + '" <' + this.email + '>'),
-								result
-							)
-							+ encodeHtml('>');
-					} else {
-						result = '"' + this.name + '" <' + result + '>';
-						if (useEncodeHtml) {
-							result = encodeHtml(result);
-						}
-					}
-				} else if (wrapWithLink) {
-					result = toLink(encodeHtml(this.email), this.email);
-				}
+	toLine(friendlyView, wrapWithLink) {
+		let name = this.name,
+			result = this.email,
+			toLink = text =>
+				'<a href="mailto:'
+				+ encodeHtml(result) + (name ? '?to=' + encodeURIComponent('"' + name + '" <' + result + '>') : '')
+				+ '" target="_blank" tabindex="-1">'
+				+ encodeHtml(text || result)
+				+ '</a>';
+		if (result) {
+			if (name) {
+				result = friendlyView
+					? (wrapWithLink ? toLink(name) : name)
+					: (wrapWithLink
+						? encodeHtml('"' + name + '" <') + toLink() + encodeHtml('>')
+						: '"' + name + '" <' + result + '>'
+					);
+			} else if (wrapWithLink) {
+				result = toLink();
 			}
 		}
-
-		return result;
+		return result || name;
 	}
 
-	static splitEmailLine(line) {
-		const parsedResult = addressparser(line);
-		if (parsedResult.length) {
-			const result = [];
-			let exists = false;
-			parsedResult.forEach((item) => {
-				const address = item.address
-					? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '')
-					: null;
-
-				if (address && address.email) {
-					exists = true;
-				}
-
-				result.push(address ? address.toLine() : item.name);
-			});
-
-			return exists ? result : null;
-		}
-
-		return null;
-	}
-
-	static parseEmailLine(line) {
-		const parsedResult = addressparser(line);
-		if (parsedResult.length) {
-			return parsedResult.map(item =>
-				item.address ? new EmailModel(item.address.replace(/^[<]+(.*)[>]+$/g, '$1'), item.name || '') : null
-			).filter(v => v);
-		}
-
-		return [];
-	}
-
-	/**
-	 * @param {string} emailAddress
-	 * @returns {boolean}
-	 */
-	parse(emailAddress) {
-		emailAddress = emailAddress.trim();
-		if (!emailAddress) {
-			return false;
-		}
-
-		const result = addressparser(emailAddress);
-		if (result.length) {
-			this.name = result[0].name || '';
-			this.email = result[0].address || '';
-			this.clearDuplicateName();
-
-			return true;
-		}
-
-		return false;
+	get domain() {
+		return this.email.replace(/^.+@([^@]+)$/, '$1');
+//		return this.email.slice(this.email.lastIndexOf('@'))
 	}
 }
diff --git a/dev/Model/EmailCollection.js b/dev/Model/EmailCollection.js
index a79feaa83..8722ff78e 100644
--- a/dev/Model/EmailCollection.js
+++ b/dev/Model/EmailCollection.js
@@ -1,5 +1,7 @@
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { EmailModel } from 'Model/Email';
+import { forEachObjectValue } from 'Common/Utils';
+import { addressparser } from 'Mime/Address';
 
 'use strict';
 
@@ -13,27 +15,61 @@ export class EmailCollectionModel extends AbstractCollectionModel
 		return super.reviveFromJson(items, email => EmailModel.reviveFromJson(email));
 	}
 
+	/**
+	 * @param {string} text
+	 * @returns {EmailCollectionModel}
+	 */
+	static fromString(str) {
+		let list = new this();
+		list.fromString(str);
+		return list;
+	}
+
 	/**
 	 * @param {boolean=} friendlyView = false
 	 * @param {boolean=} wrapWithLink = false
 	 * @returns {string}
 	 */
-	toString(friendlyView = false, wrapWithLink = false) {
-		const result = [];
-		this.forEach(email => result.push(email.toLine(friendlyView, wrapWithLink)));
-		return result.join(', ');
+	toString(friendlyView, wrapWithLink) {
+		return this.map(email => email.toLine(friendlyView, wrapWithLink)).join(', ');
 	}
 
 	/**
-	 * @returns {string}
+	 * @param {string} text
 	 */
-	toStringClear() {
-		const result = [];
-		this.forEach(email => {
-			if (email && email.email && email.name) {
-				result.push(email.email);
+	fromString(str) {
+		if (str) {
+			let items = {}, key;
+			addressparser(str).forEach(item => {
+				item = new EmailModel(item.email, item.name);
+				// Make them unique
+				key = item.email || item.name;
+				if (key && (item.name || !items[key])) {
+					items[key] = item;
+				}
+			});
+			forEachObjectValue(items, item => this.push(item));
+		}
+	}
+
+	/**
+	 * @param {array} [{name: "Name", email: "address@domain"}]
+	 */
+/*
+	static fromArray(addresses) {
+		let list = new this();
+		list.fromArray(addresses);
+		return list;
+	}
+	fromArray(addresses) {
+		addresses.forEach(item => {
+			item = new EmailModel(item.email, item.name);
+			// Make them unique
+			if (item.email && item.name || !this.find(address => address.email == item.email)) {
+				this.push(item);
 			}
 		});
-		return result.join(', ');
 	}
+*/
+
 }
diff --git a/dev/Model/FolderCollection.js b/dev/Model/FolderCollection.js
index b3fec9770..228b4c502 100644
--- a/dev/Model/FolderCollection.js
+++ b/dev/Model/FolderCollection.js
@@ -3,7 +3,7 @@ import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { isArray, getKeyByValue, forEachObjectEntry, b64EncodeJSONSafe } from 'Common/Utils';
 import { ClientSideKeyNameExpandedFolders, FolderType, FolderMetadataKeys } from 'Common/EnumsUser';
-import { getFolderFromCacheList, setFolder, setFolderInboxName, setFolderHash } from 'Common/Cache';
+import { clearCache, getFolderFromCacheList, setFolder, setFolderInboxName } from 'Common/Cache';
 import { Settings, SettingsGet, fireEvent } from 'Common/Globals';
 
 import * as Local from 'Storage/Client';
@@ -13,21 +13,26 @@ import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { SettingsUserStore } from 'Stores/User/Settings';
 
-import ko from 'ko';
-
 import { sortFolders } from 'Common/Folders';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 
 import { AbstractModel } from 'Knoin/AbstractModel';
 
-import { koComputable } from 'External/ko';
+import { /*koComputable,*/ addObservablesTo } from 'External/ko';
 
-//import { mailBox } from 'Common/Links';
+import { mailBox } from 'Common/Links';
 
 import Remote from 'Remote/User/Fetch';
 
+import { FileInfo } from 'Common/File';
+
+import { FolderPopupView } from 'View/Popup/Folder';
+import { showScreenPopup } from 'Knoin/Knoin';
+
+import { isAllowedKeyword } from 'Stores/User/Folder';
+
 const
-	isPosNumeric = value => null != value && /^[0-9]*$/.test(value.toString()),
+//	isPosNumeric = value => null != value && /^[0-9]*$/.test(value.toString()),
 
 	normalizeFolder = sFolderFullName => ('' === sFolderFullName
 		|| UNUSED_OPTION_VALUE === sFolderFullName
@@ -39,7 +44,7 @@ const
 		Inbox:   0,
 		Sent:    0,
 		Drafts:  0,
-		Spam:    0,
+		Junk:    0, // Spam
 		Trash:   0,
 		Archive: 0
 	},
@@ -64,7 +69,7 @@ const
 			case FolderType.Trash:
 			case FolderType.Archive:
 				return i18n('FOLDER_LIST/' + getKeyByValue(FolderType, type).toUpperCase() + '_NAME');
-			case FolderType.Spam:
+			case FolderType.Junk:
 				return i18n('GLOBAL/SPAM');
 			// no default
 		}
@@ -78,19 +83,13 @@ export const
 	 */
 	setExpandedFolder = (sFullName, bExpanded) => {
 		let aExpandedList = Local.get(ClientSideKeyNameExpandedFolders);
-		if (!isArray(aExpandedList)) {
-			aExpandedList = [];
-		}
-
-		if (bExpanded) {
-			aExpandedList.includes(sFullName) || aExpandedList.push(sFullName);
-		} else {
-			aExpandedList = aExpandedList.filter(value => value !== sFullName);
-		}
-
-		Local.set(ClientSideKeyNameExpandedFolders, aExpandedList);
+		aExpandedList = new Set(isArray(aExpandedList) ? aExpandedList : []);
+		bExpanded ? aExpandedList.add(sFullName) : aExpandedList.delete(sFullName);
+		Local.set(ClientSideKeyNameExpandedFolders, [...aExpandedList]);
 	},
 
+	foldersFilter = ko.observable(''),
+
 	/**
 	 * @param {?Function} fCallback
 	 */
@@ -99,13 +98,13 @@ export const
 		Remote.abort('Folders')
 			.post('Folders', FolderUserStore.foldersLoading)
 			.then(data => {
-				data = FolderCollectionModel.reviveFromJson(data.Result);
-				data && data.storeIt();
-				fCallback && fCallback(true);
+				clearCache();
+				FolderCollectionModel.reviveFromJson(data.Result)?.storeIt();
+				fCallback?.(true);
 				// Repeat every 15 minutes?
 //				this.foldersTimeout = setTimeout(loadFolders, 900000);
 			})
-			.catch(() => fCallback && setTimeout(fCallback, 1, false));
+			.catch(e => fCallback && setTimeout(fCallback, 1, false, e));
 	};
 
 export class FolderCollectionModel extends AbstractCollectionModel
@@ -113,12 +112,13 @@ export class FolderCollectionModel extends AbstractCollectionModel
 /*
 	constructor() {
 		super();
-		this.CountRec
-		this.IsThreadsSupported
-		this.Namespace;
-		this.Optimized
-		this.SystemFolders
-		this.Capabilities
+		this.quotaUsage;
+		this.quotaLimit;
+		this.namespace;
+		this.optimized
+		this.capabilities
+		this.allow; // allow adding
+//		this.exist;
 	}
 */
 
@@ -128,58 +128,125 @@ export class FolderCollectionModel extends AbstractCollectionModel
 	 */
 	static reviveFromJson(object) {
 		const expandedFolders = Local.get(ClientSideKeyNameExpandedFolders);
-		if (object && object.SystemFolders) {
-			forEachObjectEntry(SystemFolders, key =>
-				SystemFolders[key] = SettingsGet(key+'Folder') || object.SystemFolders[FolderType[key]]
-			);
-		}
+
+		forEachObjectEntry(SystemFolders, (key, value) =>
+			value || (SystemFolders[key] = SettingsGet(key+'Folder'))
+		);
 
 		const result = super.reviveFromJson(object, oFolder => {
-			let oCacheFolder = getFolderFromCacheList(oFolder.FullName),
-				type = FolderType[getKeyByValue(SystemFolders, oFolder.FullName)];
-
-			if (!oCacheFolder) {
+			let oCacheFolder = getFolderFromCacheList(oFolder.fullName);
+			if (oCacheFolder) {
+//				oCacheFolder.revivePropertiesFromJson(oFolder);
+				if (oFolder.etag) {
+					oCacheFolder.etag = oFolder.etag;
+				}
+				if (null != oFolder.totalEmails) {
+					oCacheFolder.totalEmails(oFolder.totalEmails);
+				}
+				if (null != oFolder.unreadEmails) {
+					oCacheFolder.unreadEmails(oFolder.unreadEmails);
+				}
+			} else {
 				oCacheFolder = FolderModel.reviveFromJson(oFolder);
 				if (!oCacheFolder)
 					return null;
-
-				if (1 == type) {
-					oCacheFolder.type(FolderType.Inbox);
-					setFolderInboxName(oFolder.FullName);
-				}
 				setFolder(oCacheFolder);
 			}
 
-			if (1 < type) {
-				oCacheFolder.type(type);
+			// JMAP RFC 8621
+			let role = oFolder.role;
+/*
+			if (!role) {
+				// Kolab
+				let type = oFolder.metadata[FolderMetadataKeys.KolabFolderType]
+					|| oFolder.metadata[FolderMetadataKeys.KolabFolderTypeShared];
+				switch (type) {
+					case 'mail.inbox':
+					case 'mail.drafts':
+						role = type.replace('mail.', '');
+						break;
+//					case 'mail.outbox':
+					case 'mail.sentitems':
+						role = 'sent';
+						break;
+					case 'mail.junkemail':
+						role = 'spam';
+						break;
+					case 'mail.wastebasket':
+						role = 'trash';
+						break;
+				}
+				// Flags
+				if (oFolder.attributes.includes('\\sentmail')) {
+					role = 'sent';
+				}
+				if (oFolder.attributes.includes('\\spam')) {
+					role = 'junk';
+				}
+				if (oFolder.attributes.includes('\\bin')) {
+					role = 'trash';
+				}
+				if (oFolder.attributes.includes('\\important')) {
+					role = 'important';
+				}
+				if (oFolder.attributes.includes('\\starred')) {
+					role = 'flagged';
+				}
+				if (oFolder.attributes.includes('\\all') || oFolder.flags.includes('\\allmail')) {
+					role = 'all';
+				}
 			}
+*/
+			if (role) {
+				role = role[0].toUpperCase() + role.slice(1);
+				SystemFolders[role] || (SystemFolders[role] = oFolder.fullName);
+			}
+
+			oCacheFolder.type(FolderType[getKeyByValue(SystemFolders, oFolder.fullName)] || 0);
 
 			oCacheFolder.collapsed(!expandedFolders
 				|| !isArray(expandedFolders)
 				|| !expandedFolders.includes(oCacheFolder.fullName));
 
-			if (oFolder.Extended) {
-				if (oFolder.Extended.Hash) {
-					setFolderHash(oCacheFolder.fullName, oFolder.Extended.Hash);
-				}
-
-				if (null != oFolder.Extended.MessageCount) {
-					oCacheFolder.messageCountAll(oFolder.Extended.MessageCount);
-				}
-
-				if (null != oFolder.Extended.MessageUnseenCount) {
-					oCacheFolder.messageCountUnread(oFolder.Extended.MessageUnseenCount);
-				}
-			}
 			return oCacheFolder;
 		});
 
+		result.CountRec = result.length;
+		setFolderInboxName(SystemFolders.Inbox);
+
 		let i = result.length;
 		if (i) {
 			sortFolders(result);
 			try {
 				while (i--) {
 					let folder = result[i], parent = getFolderFromCacheList(folder.parentName);
+					if (!parent) {
+						// Create NonExistent parent folders
+						let delimiter = folder.delimiter;
+						if (delimiter) {
+							let parents = folder.fullName.split(delimiter);
+							parents.pop();
+							while (parents.length) {
+								let parentName = parents.join(delimiter),
+									name = parents.pop(),
+									pfolder = getFolderFromCacheList(parentName);
+								if (!pfolder) {
+									console.log('Create nonexistent folder ' + parentName);
+									pfolder = FolderModel.reviveFromJson({
+										'@Object': 'Object/Folder',
+										name: name,
+										fullName: parentName,
+										delimiter: delimiter,
+										attributes: ['\\nonexistent']
+									});
+									setFolder(pfolder);
+									result.splice(i, 0, pfolder);
+									++i;
+								}
+							}
+							parent = getFolderFromCacheList(folder.parentName);
+						}
+					}
 					if (parent) {
 						parent.subFolders.unshift(folder);
 						result.splice(i,1);
@@ -193,13 +260,17 @@ export class FolderCollectionModel extends AbstractCollectionModel
 		return result;
 	}
 
+	visible() {
+		return this.filter(folder => folder.visible());
+	}
+
 	storeIt() {
 		FolderUserStore.displaySpecSetting(Settings.app('folderSpecLimit') < this.CountRec);
 
 		if (!(
 				SettingsGet('SentFolder') +
 				SettingsGet('DraftsFolder') +
-				SettingsGet('SpamFolder') +
+				SettingsGet('JunkFolder') +
 				SettingsGet('TrashFolder') +
 				SettingsGet('ArchiveFolder')
 			)
@@ -209,18 +280,19 @@ export class FolderCollectionModel extends AbstractCollectionModel
 
 		FolderUserStore.folderList(this);
 
-		FolderUserStore.namespace = this.Namespace;
+		FolderUserStore.namespace = this.namespace;
 
-		AppUserStore.threadsAllowed(!!(Settings.app('useImapThread') && this.IsThreadsSupported));
+		// 'THREAD=REFS', 'THREAD=REFERENCES', 'THREAD=ORDEREDSUBJECT'
+		AppUserStore.threadsAllowed(!!this.capabilities.some(capa => capa.startsWith('THREAD=')));
 
-		FolderUserStore.folderListOptimized(!!this.Optimized);
+//		FolderUserStore.optimized(!!this.optimized);
 		FolderUserStore.quotaUsage(this.quotaUsage);
 		FolderUserStore.quotaLimit(this.quotaLimit);
-		FolderUserStore.capabilities(this.Capabilities);
+		FolderUserStore.capabilities(this.capabilities);
 
 		FolderUserStore.sentFolder(normalizeFolder(SystemFolders.Sent));
 		FolderUserStore.draftsFolder(normalizeFolder(SystemFolders.Drafts));
-		FolderUserStore.spamFolder(normalizeFolder(SystemFolders.Spam));
+		FolderUserStore.spamFolder(normalizeFolder(SystemFolders.Junk));
 		FolderUserStore.trashFolder(normalizeFolder(SystemFolders.Trash));
 		FolderUserStore.archiveFolder(normalizeFolder(SystemFolders.Archive));
 
@@ -234,6 +306,7 @@ export class FolderModel extends AbstractModel {
 		super();
 
 		this.fullName = '';
+		this.parentName = '';
 		this.delimiter = '';
 		this.deep = 0;
 		this.expires = 0;
@@ -241,38 +314,187 @@ export class FolderModel extends AbstractModel {
 
 		this.exists = true;
 
-//		this.hash = '';
-//		this.uidNext = 0;
+		this.etag = '';
+		this.id = 0;
+		this.uidNext = 0;
+		this.size = 0;
 
-		this.addObservables({
+		addObservablesTo(this, {
 			name: '',
-			type: FolderType.User,
+			type: 0,
+			role: null,
 			selectable: false,
 
 			focused: false,
 			selected: false,
-			edited: false,
-			subscribed: true,
+			isSubscribed: true,
 			checkable: false, // Check for new messages
 			askDelete: false,
 
-			nameForEdit: '',
 			errorMsg: '',
 
-			privateMessageCountAll: 0,
-			privateMessageCountUnread: 0,
+			totalEmails: 0,
+			unreadEmails: 0,
 
 			kolabType: null,
 
-			collapsed: true
+			collapsed: true,
+
+			tagsAllowed: false
 		});
 
+		this.attributes = ko.observableArray();
+		// For messages
+		this.permanentFlags = ko.observableArray();
+
 		this.addSubscribables({
-			kolabType: sValue => this.metadata[FolderMetadataKeys.KolabFolderType] = sValue
+			kolabType: sValue => this.metadata[FolderMetadataKeys.KolabFolderType] = sValue,
+			permanentFlags: aValue => this.tagsAllowed(aValue.includes('\\*')),
+			unreadEmails: unread => FolderType.Inbox === this.type() && fireEvent('mailbox.inbox-unread-count', unread)
 		});
 
 		this.subFolders = ko.observableArray(new FolderCollectionModel);
 		this.actionBlink = ko.observable(false).extend({ falseTimeout: 1000 });
+/*
+		this.totalEmails = koComputable({
+				read: this.totalEmailsValue,
+				write: iValue =>
+					isPosNumeric(iValue) ? this.totalEmailsValue(iValue) : this.totalEmailsValue.valueHasMutated()
+			})
+			.extend({ notify: 'always' });
+
+		this.unreadEmails = koComputable({
+				read: this.unreadEmailsValue,
+				write: value =>
+					isPosNumeric(value) ? this.unreadEmailsValue(value) : this.unreadEmailsValue.valueHasMutated()
+			})
+			.extend({ notify: 'always' });
+*/
+/*
+		// https://www.rfc-editor.org/rfc/rfc8621.html#section-2
+		this.myRights = {
+			'mayAddItems': true,
+			'mayCreateChild': true,
+			'mayDelete': true,
+			'mayReadItems': true,
+			'mayRemoveItems': true,
+			'mayRename': true,
+			'maySetKeywords': true,
+			'maySetSeen': true,
+			'maySubmit': true
+		};
+*/
+		this.addComputables({
+
+			isInbox: () => FolderType.Inbox === this.type(),
+
+			isFlagged: () => FolderUserStore.currentFolder() === this
+				&& MessagelistUserStore.listSearch().includes('flagged'),
+
+//			isSubscribed: () => this.attributes().includes('\\subscribed'),
+
+			hasVisibleSubfolders: () => !!this.subFolders().find(folder => folder.visible()),
+			visibleSubfolders: () => this.subFolders().visible(),
+
+			hasSubscriptions: () => this.isSubscribed() | !!this.subFolders().find(
+					oFolder => {
+						const subscribed = oFolder.hasSubscriptions();
+						return !oFolder.isSystemFolder() && subscribed;
+					}
+				),
+
+			isSystemFolder: () => this.type()
+				| (FolderUserStore.allowKolab() && !!this.kolabType() & !SettingsUserStore.unhideKolabFolders()),
+
+			canBeSelected: () => this.selectable() && !this.isSystemFolder(),
+
+			canBeDeleted: () => this.canBeSelected() && this.exists,
+
+			canBeSubscribed: () => this.selectable()
+				&& !(this.isSystemFolder() | !SettingsUserStore.hideUnsubscribed()),
+
+			optionalTags: () => this.permanentFlags.filter(isAllowedKeyword),
+
+			/**
+			 * Folder is visible when:
+			 * - hasVisibleSubfolders()
+			 * Or when all below conditions are true:
+			 * - selectable()
+			 * - isSubscribed() OR hideUnsubscribed = false
+			 * - 0 == type()
+			 * - not kolabType()
+			 */
+			visible: () => {
+				const selectable = this.canBeSelected(),
+					name = this.name(),
+					filter = foldersFilter(),
+					visible = (this.isSubscribed() | !SettingsUserStore.hideUnsubscribed())
+						&& selectable
+						&& (!filter || name.toLowerCase().includes(filter.toLowerCase()));
+				return this.hasVisibleSubfolders() | visible;
+			},
+
+			unreadCount: () => this.unreadEmails() || null,
+/*
+			{
+				// TODO: make this optional in Settings
+				// https://github.com/the-djmaze/snappymail/issues/457
+				// https://github.com/the-djmaze/snappymail/issues/567
+				const
+					unread = this.unreadEmails(),
+					type = this.type();
+//				return ((!this.isSystemFolder() || type == FolderType.Inbox) && unread) ? unread : null;
+			},
+*/
+
+			localName: () => {
+				let name = this.name();
+				if (this.isSystemFolder()) {
+					translateTrigger();
+					name = getSystemFolderName(this.type(), name);
+				}
+				return name;
+			},
+
+			nameInfo: () => {
+				if (this.isSystemFolder()) {
+					translateTrigger();
+					let suffix = getSystemFolderName(this.type(), getKolabFolderName(this.kolabType()));
+					if (this.name() !== suffix && 'inbox' !== suffix.toLowerCase()) {
+						return ' (' + suffix + ')';
+					}
+				}
+				return '';
+			},
+
+			friendlySize: () => FileInfo.friendlySize(this.size),
+
+			detailedName: () => this.name() + ' ' + this.nameInfo(),
+
+			icon: () => {
+				switch (this.type())
+				{
+					case 1: return '📥'; // FolderType.Inbox
+					case 2: return '📧'; // FolderType.Sent icon-paper-plane
+					case 3: return '🗎'; // FolderType.Drafts
+					case 4: return '⚠'; // FolderType.Junk
+					case 5: return '🗑'; // FolderType.Trash
+					case 6: return '🗄'; // FolderType.Archive
+				}
+				return null;
+			},
+
+			hasUnreadInSub: () =>
+				this.subFolders().some(
+					folder => folder.unreadEmails() | folder.hasUnreadInSub()
+				),
+
+			href: () => this.canBeSelected() && mailBox(this.fullNameHash)
+		});
+	}
+
+	edit() {
+		showScreenPopup(FolderPopupView, [this]);
 	}
 
 	/**
@@ -292,6 +514,7 @@ export class FolderModel extends AbstractModel {
 		const folder = super.reviveFromJson(json);
 		if (folder) {
 			const path = folder.fullName.split(folder.delimiter),
+				attr = name => folder.attributes.includes(name),
 				type = (folder.metadata[FolderMetadataKeys.KolabFolderType]
 					|| folder.metadata[FolderMetadataKeys.KolabFolderTypeShared]
 					|| ''
@@ -301,139 +524,13 @@ export class FolderModel extends AbstractModel {
 			path.pop();
 			folder.parentName = path.join(folder.delimiter);
 
+			folder.isSubscribed(attr('\\subscribed'));
+			folder.exists = !attr('\\nonexistent');
+			folder.subFolders.allow = !attr('\\noinferiors');
+//			folder.subFolders.exist = attr('\\haschildren') || !attr('\\hasnochildren');
+			folder.selectable(folder.exists && !attr('\\noselect'));
+
 			type && 'mail' != type && folder.kolabType(type);
-
-			folder.messageCountAll = koComputable({
-					read: folder.privateMessageCountAll,
-					write: (iValue) => {
-						if (isPosNumeric(iValue)) {
-							folder.privateMessageCountAll(iValue);
-						} else {
-							folder.privateMessageCountAll.valueHasMutated();
-						}
-					}
-				})
-				.extend({ notify: 'always' });
-
-			folder.messageCountUnread = koComputable({
-					read: folder.privateMessageCountUnread,
-					write: (value) => {
-						if (isPosNumeric(value)) {
-							folder.privateMessageCountUnread(value);
-						} else {
-							folder.privateMessageCountUnread.valueHasMutated();
-						}
-					}
-				})
-				.extend({ notify: 'always' });
-
-			folder.addComputables({
-
-				isInbox: () => FolderType.Inbox === folder.type(),
-
-				isFlagged: () => FolderUserStore.currentFolder() === folder
-					&& MessagelistUserStore.listSearch().includes('flagged'),
-
-				hasVisibleSubfolders: () => !!folder.subFolders().find(folder => folder.visible()),
-
-				hasSubscriptions: () => folder.subscribed() | !!folder.subFolders().find(
-						oFolder => {
-							const subscribed = oFolder.hasSubscriptions();
-							return !oFolder.isSystemFolder() && subscribed;
-						}
-					),
-
-				canBeEdited: () => FolderType.User === folder.type() && folder.exists/* && folder.selectable()*/,
-
-				isSystemFolder: () => FolderType.User !== folder.type() | !!folder.kolabType(),
-
-				canBeSelected: () => folder.selectable() && !folder.isSystemFolder(),
-
-				canBeDeleted: () => folder.canBeSelected() && folder.exists,
-
-				canBeSubscribed: () => folder.selectable()
-					&& !(folder.isSystemFolder() | !SettingsUserStore.hideUnsubscribed()),
-
-				/**
-				 * Folder is visible when:
-				 * - hasVisibleSubfolders()
-				 * Or when all below conditions are true:
-				 * - selectable()
-				 * - subscribed() OR hideUnsubscribed = false
-				 * - FolderType.User
-				 * - not kolabType()
-				 */
-				visible: () => {
-					const selectable = folder.canBeSelected(),
-						visible = (folder.subscribed() | !SettingsUserStore.hideUnsubscribed()) && selectable;
-					return folder.hasVisibleSubfolders() | visible;
-				},
-
-				hidden: () => !folder.selectable() && (folder.isSystemFolder() | !folder.hasVisibleSubfolders()),
-
-				printableUnreadCount: () => {
-					const count = folder.messageCountAll(),
-						unread = folder.messageCountUnread(),
-						type = folder.type();
-
-					if (count) {
-						if (FolderType.Drafts === type) {
-							return count;
-						}
-						if (
-							unread &&
-							FolderType.Trash !== type &&
-							FolderType.Archive !== type &&
-							FolderType.Sent !== type
-						) {
-							return unread;
-						}
-					}
-
-					return null;
-				},
-
-				localName: () => {
-					let name = folder.name();
-					if (folder.isSystemFolder()) {
-						translatorTrigger();
-						name = getSystemFolderName(folder.type(), name);
-					}
-					return name;
-				},
-
-				manageFolderSystemName: () => {
-					if (folder.isSystemFolder()) {
-						translatorTrigger();
-						let suffix = getSystemFolderName(folder.type(), getKolabFolderName(folder.kolabType()));
-						if (folder.name() !== suffix && 'inbox' !== suffix.toLowerCase()) {
-							return '(' + suffix + ')';
-						}
-					}
-					return '';
-				},
-
-				hasUnreadMessages: () => 0 < folder.messageCountUnread() && folder.printableUnreadCount(),
-
-				hasSubscribedUnreadMessagesSubfolders: () =>
-					!!folder.subFolders().find(
-						folder => folder.hasUnreadMessages() | folder.hasSubscribedUnreadMessagesSubfolders()
-					)
-
-//				,href: () => folder.canBeSelected() && mailBox(folder.fullNameHash)
-			});
-
-			folder.addSubscribables({
-				name: value => folder.nameForEdit(value),
-
-				edited: value => value && folder.nameForEdit(folder.name()),
-
-				messageCountUnread: unread => {
-					if (FolderType.Inbox === folder.type()) {
-						fireEvent('mailbox.inbox-unread-count', unread);
-					}
-				}
-			});
 		}
 		return folder;
 	}
diff --git a/dev/Model/Identity.js b/dev/Model/Identity.js
index bb3f4379f..4a93b2d81 100644
--- a/dev/Model/Identity.js
+++ b/dev/Model/Identity.js
@@ -1,39 +1,52 @@
-import { koComputable } from 'External/ko';
+//import { AbstractModel } from 'Knoin/AbstractModel';
+import { EmailModel } from 'Model/Email';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
-import { AbstractModel } from 'Knoin/AbstractModel';
-
-export class IdentityModel extends AbstractModel {
-	/**
-	 * @param {string} id
-	 * @param {string} email
-	 */
-	constructor(id, email) {
+export class IdentityModel extends EmailModel /*AbstractModel*/ {
+	constructor() {
 		super();
 
-		this.addObservables({
-			id: id || '',
-			email: email,
-			name: '',
+		addObservablesTo(this, {
+			id: '',
+			label: '',
+//			email: '',
+//			name: '',
 
 			replyTo: '',
 			bcc: '',
+			sentFolder: '',
 
 			signature: '',
 			signatureInsertBefore: false,
 
-			askDelete: false
+			pgpSign: false,
+			pgpEncrypt: false,
+
+			smimeKey: '',
+			smimeCertificate: '',
+			smimeCertificateChain: '',
+
+			askDelete: false,
+
+			exists: false
 		});
 
-		this.canBeDeleted = koComputable(() => !!this.id());
+		addComputablesTo(this, {
+			smimeKeyEncrypted: () => this.smimeKey().includes('-----BEGIN ENCRYPTED PRIVATE KEY-----'),
+			smimeKeyValid: () => /^-----BEGIN (ENCRYPTED |RSA )?PRIVATE KEY-----/.test(this.smimeKey()),
+			smimeCertificateValid: () => /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificate()),
+			smimeCertificateChainValid: () => !this.smimeCertificateChain()
+				|| /^-----BEGIN CERTIFICATE-----/.test(this.smimeCertificateChain())
+		});
 	}
 
 	/**
 	 * @returns {string}
 	 */
-	formattedName() {
-		const name = this.name(),
-			email = this.email();
-
-		return name ? name + ' <' + email + '>' : email;
+	toString() {
+		const name = this.name,
+			email = this.email,
+			label = this.label();
+		return (name ? `${name} ` : '') + `<${email}>` + (label ? ` (${label})` : '');
 	}
 }
diff --git a/dev/Model/Message.js b/dev/Model/Message.js
index 094599373..9b320c14e 100644
--- a/dev/Model/Message.js
+++ b/dev/Model/Message.js
@@ -1,71 +1,169 @@
 import ko from 'ko';
 
-import { MessagePriority } from 'Common/EnumsUser';
 import { i18n } from 'Common/Translator';
 
-import { doc } from 'Common/Globals';
-import { encodeHtml, plainToHtml, cleanHtml } from 'Common/Html';
-import { isArray, arrayLength, forEachObjectEntry } from 'Common/Utils';
-import { serverRequestRaw } from 'Common/Links';
+import { doc, elementById, SettingsGet } from 'Common/Globals';
+import { encodeHtml, plainToHtml, htmlToPlain, cleanHtml } from 'Common/Html';
+import { forEachObjectEntry, b64EncodeJSONSafe } from 'Common/Utils';
+import { serverRequestRaw, proxy } from 'Common/Links';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
 import { FolderUserStore } from 'Stores/User/Folder';
 import { SettingsUserStore } from 'Stores/User/Settings';
 
-import { FileInfo } from 'Common/File';
+import { FileInfo, RFC822 } from 'Common/File';
 import { AttachmentCollectionModel } from 'Model/AttachmentCollection';
 import { EmailCollectionModel } from 'Model/EmailCollection';
+import { MimeHeaderCollectionModel } from 'Model/MimeHeaderCollection';
+//import { MimeHeaderAutocryptModel } from 'Model/MimeHeaderAutocrypt';
 import { AbstractModel } from 'Knoin/AbstractModel';
 
-import PreviewHTML from 'Html/PreviewMessage.html';
+import { LanguageStore } from 'Stores/Language';
+
+import Remote from 'Remote/User/Fetch';
+
+import { MimeToMessage } from 'Mime/Utils';
+
+import { PgpUserStore } from 'Stores/User/Pgp';
+import { IdentityUserStore } from 'Stores/User/Identity';
+import { Passphrases } from 'Storage/Passphrases';
 
 const
-	// eslint-disable-next-line max-len
-	url = /(^|[\s\n]|\/?>)(https:\/\/[-A-Z0-9+\u0026\u2019#/%?=()~_|!:,.;]*[-A-Z0-9+\u0026#/%=~()_|])/gi,
-	// eslint-disable-next-line max-len
-	email = /(^|[\s\n]|\/?>)((?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x21\x23-\x5b\x5d-\x7f]|\\[\x21\x23-\x5b\x5d-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9]))\.){3}(?:(2(5[0-5]|[0-4][0-9])|1[0-9][0-9]|[1-9]?[0-9])|[a-z0-9-]*[a-z0-9]:(?:[\x21-\x5a\x53-\x7f]|\\[\x21\x23-\x5b\x5d-\x7f])+)\]))/gi,
+	PreviewHTML = `<html>
+<head>
+	<meta charset="utf-8">
+	<title></title>
+	<style>
+html, body {
+	margin: 0;
+	padding: 0;
+}
 
-	hcont = Element.fromHTML('<div area="hidden" style="position:absolute;left:-5000px"></div>'),
-	getRealHeight = el => {
-		hcont.innerHTML = el.outerHTML;
-		const result = hcont.clientHeight;
-		hcont.innerHTML = '';
-		return result;
+header {
+	background: rgba(125,128,128,0.3);
+	border-bottom: 1px solid #888;
+}
+
+header h1 {
+	font-size: 120%;
+}
+
+header * {
+	margin: 5px 0;
+}
+
+header time {
+	float: right;
+}
+
+blockquote {
+	border-left: 2px solid rgba(125,128,128,0.5);
+	margin: 0;
+	padding: 0 0 0 10px;
+}
+
+pre {
+	white-space: pre-wrap;
+	word-wrap: break-word;
+	word-break: normal;
+}
+
+body > * {
+	padding: 0.5em 1em;
+}
+
+#attachments > * {
+	border: 1px solid rgba(125,128,128,0.5);
+	padding: 0.25em;
+	margin-right: 1em;
+}
+#attachments > *::before {
+	content: '📎 ';
+}
+	</style>
+</head>
+<body></body>
+</html>`,
+
+	msgHtml = msg => cleanHtml(msg.html(), msg.attachments(), '#rl-msg-' + msg.hash),
+
+	toggleTag = (message, keyword) => {
+		const lower = keyword.toLowerCase(),
+			flags = message.flags,
+			isSet = flags.includes(lower);
+		Remote.request('MessageSetKeyword', iError => {
+			if (!iError) {
+				isSet ? flags.remove(lower) : flags.push(lower);
+			}
+		}, {
+			folder: message.folder,
+			uids: message.uid,
+			keyword: keyword,
+			setAction: isSet ? 0 : 1
+		})
 	},
 
-	replyHelper = (emails, unic, localEmails) => {
-		emails.forEach(email => {
-			if (undefined === unic[email.email]) {
-				unic[email.email] = true;
-				localEmails.push(email);
-			}
-		});
-	};
-
-doc.body.append(hcont);
+	/**
+	 * @param {EmailCollectionModel} emails
+	 * @param {Object} unic
+	 * @param {Map} localEmails
+	 */
+	replyHelper = (emails, unic, localEmails) =>
+		emails.forEach(email =>
+			unic[email.email] || localEmails.has(email.email) || localEmails.set(email.email, email)
+		);
 
 export class MessageModel extends AbstractModel {
 	constructor() {
 		super();
 
-		this._reset();
+		Object.assign(this, {
+			folder: '',
+			uid: 0,
+			hash: '',
+			from: new EmailCollectionModel,
+			to: new EmailCollectionModel,
+			cc: new EmailCollectionModel,
+			bcc: new EmailCollectionModel,
+			sender: new EmailCollectionModel,
+			replyTo: new EmailCollectionModel,
+			deliveredTo: new EmailCollectionModel,
+			body: null,
+			draftInfo: [],
+			dkim: [],
+			spf: [],
+			dmarc: [],
+			messageId: '',
+			inReplyTo: '',
+			references: '',
+//			autocrypt: ko.observableArray(),
+			hasVirus: null, // or boolean when scanned
+			priority: 3, // Normal
+			senderEmailsString: '',
+			senderClearEmailsString: '',
+			isSpam: false,
+			spamScore: 0,
+			spamResult: '',
+			size: 0,
+			readReceipt: '',
+			preview: null,
 
-		this.addObservables({
+			attachments: ko.observableArray(new AttachmentCollectionModel),
+			threads: ko.observableArray(),
+			threadUnseen: ko.observableArray(),
+			unsubsribeLinks: ko.observableArray(),
+			flags: ko.observableArray(),
+			headers: ko.observableArray(new MimeHeaderCollectionModel)
+		});
+
+		addObservablesTo(this, {
 			subject: '',
 			plain: '',
 			html: '',
-			size: 0,
-			spamScore: 0,
-			spamResult: '',
-			isSpam: false,
-			hasVirus: null, // or boolean when scanned
-			dateTimeStampInUTC: 0,
-			priority: MessagePriority.Normal,
-
-			senderEmailsString: '',
-			senderClearEmailsString: '',
-
-			deleted: false,
+			dateTimestamp: 0,
+			dateTimestampSource: 0,
 
+			// Also used by Selector
 			focused: false,
 			selected: false,
 			checked: false,
@@ -73,128 +171,124 @@ export class MessageModel extends AbstractModel {
 			isHtml: false,
 			hasImages: false,
 			hasExternals: false,
+			hasTracking: false,
+
+			encrypted: false,
 
 			pgpSigned: null,
-			pgpVerified: null,
-
 			pgpEncrypted: null,
 			pgpDecrypted: false,
 
-			readReceipt: '',
+			smimeSigned: null,
+			smimeEncrypted: null,
+			smimeDecrypted: false,
 
-			hasUnseenSubMessage: false,
-			hasFlaggedSubMessage: false
+			// rfc8621
+			id: '',
+//			threadId: ''
+
+			/**
+			 * Basic support for Linked Data (Structured Email)
+			 * https://json-ld.org/
+			 * https://structured.email/
+			 **/
+			linkedData: []
 		});
 
-		this.attachments = ko.observableArray(new AttachmentCollectionModel);
-		this.threads = ko.observableArray();
-		this.unsubsribeLinks = ko.observableArray();
-		this.flags = ko.observableArray();
+		addComputablesTo(this, {
+			attachmentIconClass: () =>
+				this.encrypted() ? 'icon-lock' : FileInfo.getAttachmentsIconClass(this.attachments()),
+			threadsLen: () => rl.app.messageList.threadUid() ? 0 : this.threads().length,
+			threadUnseenLen: () => rl.app.messageList.threadUid() ? 0 : this.threadUnseen().length,
 
-		this.addComputables({
-			attachmentIconClass: () => FileInfo.getAttachmentsIconClass(this.attachments()),
-			threadsLen: () => this.threads().length,
-			isImportant: () => MessagePriority.High === this.priority(),
-			hasAttachments: () => this.attachments().hasVisible(),
+			threadsLenText: () => {
+				const unseenLen = this.threadUnseenLen();
+				return this.threadsLen() + (unseenLen > 0 ? '/' + unseenLen : '');
+			},
 
-			isDeleted: () => this.flags().includes('\\deleted'),
-			isUnseen: () => !this.flags().includes('\\seen') /* || this.flags().includes('\\unseen')*/,
+			isUnseen: () => !this.flags().includes('\\seen'),
 			isFlagged: () => this.flags().includes('\\flagged'),
-			isAnswered: () => this.flags().includes('\\answered'),
-			isForwarded: () => this.flags().includes('$forwarded'),
-			isReadReceipt: () => this.flags().includes('$mdnsent')
+			isDeleted: () => this.flags().includes('\\deleted'),
 //			isJunk: () => this.flags().includes('$junk') && !this.flags().includes('$nonjunk'),
-//			isPhishing: () => this.flags().includes('$phishing')
+//			isPhishing: () => this.flags().includes('$phishing'),
+
+			tagOptions: () => {
+				const tagOptions = [];
+				FolderUserStore.currentFolder().optionalTags().forEach(value => {
+					let lower = value.toLowerCase();
+					tagOptions.push({
+						css: 'msgflag-' + lower,
+						value: value,
+						checked: this.flags().includes(lower),
+						label: i18n('MESSAGE_TAGS/'+lower, 0, value),
+						toggle: (/*obj*/) => toggleTag(this, value)
+					});
+				});
+				return tagOptions
+			},
+
+			whitelistOptions: () => {
+				let options = [];
+				if ('match' === SettingsUserStore.viewImages()) {
+					let from = this.from[0],
+						list = SettingsUserStore.viewImagesWhitelist(),
+						counts = {};
+					this.html().match(/src=["'][^"']+/g)?.forEach(m => {
+						m = m.replace(/^.+(:\/\/[^/]+).+$/, '$1');
+						if (counts[m]) {
+							++counts[m];
+						} else {
+							counts[m] = 1;
+							options.push(m);
+						}
+					});
+					options = options.filter(txt => !list.includes(txt)).sort((a,b) => (counts[a] < counts[b])
+						? 1
+						: (counts[a] > counts[b] ? -1 : a.localeCompare(b))
+					);
+					from && options.unshift(from.email);
+				}
+				return options;
+			}
+		});
+
+		this.smimeSigned.subscribe(value =>
+			value?.body && MimeToMessage(value.body, this)
+		);
+	}
+
+	get requestHash() {
+		return b64EncodeJSONSafe({
+			folder: this.folder,
+			uid: this.uid,
+			mimeType: RFC822,
+			fileName: (this.subject() || 'message') + '-' + this.hash + '.eml',
+			accountHash: SettingsGet('accountHash')
 		});
 	}
 
-	_reset() {
-		this.folder = '';
-		this.uid = 0;
-		this.hash = '';
-		this.requestHash = '';
-		this.emails = [];
-		this.from = new EmailCollectionModel;
-		this.to = new EmailCollectionModel;
-		this.cc = new EmailCollectionModel;
-		this.bcc = new EmailCollectionModel;
-		this.replyTo = new EmailCollectionModel;
-		this.deliveredTo = new EmailCollectionModel;
-		this.body = null;
-		this.draftInfo = [];
-		this.messageId = '';
-		this.inReplyTo = '';
-		this.references = '';
-	}
-
-	clear() {
-		this._reset();
-		this.subject('');
-		this.html('');
-		this.plain('');
-		this.size(0);
-		this.spamScore(0);
-		this.spamResult('');
-		this.isSpam(false);
-		this.hasVirus(null);
-		this.dateTimeStampInUTC(0);
-		this.priority(MessagePriority.Normal);
-
-		this.senderEmailsString('');
-		this.senderClearEmailsString('');
-
-		this.deleted(false);
-
-		this.selected(false);
-		this.checked(false);
-
-		this.isHtml(false);
-		this.hasImages(false);
-		this.hasExternals(false);
-		this.attachments(new AttachmentCollectionModel);
-
-		this.pgpSigned(null);
-		this.pgpVerified(null);
-
-		this.pgpEncrypted(null);
-		this.pgpDecrypted(false);
-
-		this.priority(MessagePriority.Normal);
-		this.readReceipt('');
-
-		this.threads([]);
-		this.unsubsribeLinks([]);
-
-		this.hasUnseenSubMessage(false);
-		this.hasFlaggedSubMessage(false);
+	toggleTag(keyword) {
+		toggleTag(this, keyword);
 	}
 
 	spamStatus() {
-		let spam = this.spamResult();
-		return spam ? i18n(this.isSpam() ? 'GLOBAL/SPAM' : 'GLOBAL/NOT_SPAM') + ': ' + spam : '';
-	}
-
-	/**
-	 * @param {Array} properties
-	 * @returns {Array}
-	 */
-	getEmails(properties) {
-		return properties.reduce((carry, property) => carry.concat(this[property]), []).map(
-			oItem => oItem ? oItem.email : ''
-		).validUnique();
+		let spam = this.spamResult;
+		return spam ? i18n(this.isSpam ? 'GLOBAL/SPAM' : 'GLOBAL/NOT_SPAM') + ': ' + spam : '';
 	}
 
 	/**
 	 * @returns {string}
 	 */
 	friendlySize() {
-		return FileInfo.friendlySize(this.size());
+		return FileInfo.friendlySize(this.size);
 	}
 
 	computeSenderEmail() {
-		const list = [FolderUserStore.sentFolder(), FolderUserStore.draftsFolder()].includes(this.folder) ? 'to' : 'from';
-		this.senderEmailsString(this[list].toString(true));
-		this.senderClearEmailsString(this[list].toStringClear());
+		const list = this[
+			[FolderUserStore.sentFolder(), FolderUserStore.draftsFolder()].includes(this.folder) ? 'to' : 'from'
+		];
+		this.senderEmailsString = list.toString(true);
+		this.senderClearEmailsString = list.map(email => email?.email).filter(email => email).join(', ');
 	}
 
 	/**
@@ -202,124 +296,96 @@ export class MessageModel extends AbstractModel {
 	 * @returns {boolean}
 	 */
 	revivePropertiesFromJson(json) {
-		if ('Priority' in json && ![MessagePriority.High, MessagePriority.Low].includes(json.Priority)) {
-			json.Priority = MessagePriority.Normal;
-		}
 		if (super.revivePropertiesFromJson(json)) {
 //			this.foundCIDs = isArray(json.FoundCIDs) ? json.FoundCIDs : [];
-//			this.attachments(AttachmentCollectionModel.reviveFromJson(json.Attachments, this.foundCIDs));
+//			this.attachments(AttachmentCollectionModel.reviveFromJson(json.attachments, this.foundCIDs));
+//			this.headers(MimeHeaderCollectionModel.reviveFromJson(json.headers));
 
 			this.computeSenderEmail();
+
+			let value, headers = this.headers();
+/*			// These could be by Envelope or MIME
+			this.messageId = headers.valueByName('Message-Id');
+			this.subject(headers.valueByName('Subject'));
+			this.sender = EmailCollectionModel.fromString(headers.valueByName('Sender'));
+			this.from = EmailCollectionModel.fromArray(headers.valueByName('From'));
+			this.replyTo = EmailCollectionModel.fromArray(headers.valueByName('Reply-To'));
+			this.to = EmailCollectionModel.fromArray(headers.valueByName('To'));
+			this.cc = EmailCollectionModel.fromArray(headers.valueByName('Cc'));
+			this.bcc = EmailCollectionModel.fromArray(headers.valueByName('Bcc'));
+			this.inReplyTo = headers.valueByName('In-Reply-To');
+
+			this.deliveredTo = EmailCollectionModel.fromString(headers.valueByName('Delivered-To'));
+*/
+			// Priority
+			value = headers.valueByName('X-MSMail-Priority')
+				|| headers.valueByName('Importance')
+				|| headers.valueByName('X-Priority');
+			if (value) {
+				if (/[h12]/.test(value[0])) {
+					this.priority = 1;
+				} else if (/[l45]/.test(value[0])) {
+					this.priority = 5;
+				}
+			}
+
+			// Unsubscribe links
+			if (value = headers.valueByName('List-Unsubscribe')) {
+				this.unsubsribeLinks(value.split(',').map(
+					link => link.replace(/^[ <>]+|[ <>]+$/g, '')
+				));
+			}
+
+			if (headers.valueByName('X-Virus')) {
+				this.hasVirus = true;
+			}
+			if (value = headers.valueByName('X-Virus-Status')) {
+				if (value.includes('infected')) {
+					this.hasVirus = true;
+				} else if (value.includes('clean')) {
+					this.hasVirus = false;
+				}
+			}
+/*
+			if (value = headers.valueByName('X-Virus-Scanned')) {
+				this.virusScanned(value);
+			}
+
+			// https://autocrypt.org/level1.html#the-autocrypt-header
+			headers.valuesByName('Autocrypt').forEach(value => {
+				this.autocrypt.push(new MimeHeaderAutocryptModel(value));
+			});
+*/
+			return true;
 		}
 	}
 
-	/**
-	 * @returns {boolean}
-	 */
-	hasUnsubsribeLinks() {
-		return this.unsubsribeLinks().length;
-	}
-
-	/**
-	 * @returns {string}
-	 */
-	getFirstUnsubsribeLink() {
-		return this.unsubsribeLinks()[0] || '';
-	}
-
-	/**
-	 * @param {boolean} friendlyView
-	 * @param {boolean=} wrapWithLink
-	 * @returns {string}
-	 */
-	fromToLine(friendlyView, wrapWithLink) {
-		return this.from.toString(friendlyView, wrapWithLink);
-	}
-
-	/**
-	 * @returns {string}
-	 */
-	fromDkimData() {
-		let result = ['none', ''];
-		if (1 === arrayLength(this.from) && this.from[0] && this.from[0].dkimStatus) {
-			result = [this.from[0].dkimStatus, this.from[0].dkimValue || ''];
-		}
-
-		return result;
-	}
-
-	/**
-	 * @param {boolean} friendlyView
-	 * @param {boolean=} wrapWithLink
-	 * @returns {string}
-	 */
-	toToLine(friendlyView, wrapWithLink) {
-		return this.to.toString(friendlyView, wrapWithLink);
-	}
-
-	/**
-	 * @param {boolean} friendlyView
-	 * @param {boolean=} wrapWithLink
-	 * @returns {string}
-	 */
-	ccToLine(friendlyView, wrapWithLink) {
-		return this.cc.toString(friendlyView, wrapWithLink);
-	}
-
-	/**
-	 * @param {boolean} friendlyView
-	 * @param {boolean=} wrapWithLink
-	 * @returns {string}
-	 */
-	bccToLine(friendlyView, wrapWithLink) {
-		return this.bcc.toString(friendlyView, wrapWithLink);
-	}
-
-	/**
-	 * @param {boolean} friendlyView
-	 * @param {boolean=} wrapWithLink
-	 * @returns {string}
-	 */
-	replyToToLine(friendlyView, wrapWithLink) {
-		return this.replyTo.toString(friendlyView, wrapWithLink);
-	}
-
 	/**
 	 * @return string
 	 */
-	lineAsCss() {
+	lineAsCss(flags=1) {
 		let classes = [];
 		forEachObjectEntry({
-			deleted: this.deleted(),
-			'deleted-mark': this.isDeleted(),
 			selected: this.selected(),
 			checked: this.checked(),
-			flagged: this.isFlagged(),
 			unseen: this.isUnseen(),
-			answered: this.isAnswered(),
-			forwarded: this.isForwarded(),
 			focused: this.focused(),
-			important: this.isImportant(),
+			priorityHigh: this.priority === 1,
 			withAttachments: !!this.attachments().length,
-			emptySubject: !this.subject(),
-			// hasChildrenMessage: 1 < this.threadsLen(),
-			hasUnseenSubMessage: this.hasUnseenSubMessage(),
-			hasFlaggedSubMessage: this.hasFlaggedSubMessage()
+			// hasChildrenMessage: 1 < this.threadsLen()
 		}, (key, value) => value && classes.push(key));
+		flags && this.flags().forEach(value => classes.push('msgflag-'+value));
 		return classes.join(' ');
 	}
 
-	/**
-	 * @returns {string}
-	 */
-	fromAsSingleEmail() {
-		return isArray(this.from) && this.from[0] ? this.from[0].email : '';
+	indent() {
+		return this.level ? 'margin-left:'+this.level+'em' : null;
 	}
 
 	/**
 	 * @returns {string}
 	 */
-	viewLink() {
+	viewRaw() {
 		return serverRequestRaw('ViewAsPlain', this.requestHash);
 	}
 
@@ -332,264 +398,192 @@ export class MessageModel extends AbstractModel {
 
 	/**
 	 * @param {Object} excludeEmails
-	 * @param {boolean=} last = false
 	 * @returns {Array}
 	 */
-	replyEmails(excludeEmails, last) {
-		const result = [],
-			unic = undefined === excludeEmails ? {} : excludeEmails;
-
+	replyEmails(excludeEmails) {
+		const
+			result = new Map(),
+			unic = excludeEmails || {};
 		replyHelper(this.replyTo, unic, result);
-		if (!result.length) {
-			replyHelper(this.from, unic, result);
-		}
-
-		if (!result.length && !last) {
-			return this.replyEmails({}, true);
-		}
-
-		return result;
+		result.size || replyHelper(this.from, unic, result);
+		return result.size ? [...result.values()] : [this.to[0]];
 	}
 
 	/**
 	 * @param {Object} excludeEmails
-	 * @param {boolean=} last = false
 	 * @returns {Array.<Array>}
 	 */
-	replyAllEmails(excludeEmails, last) {
-		let data = [];
-		const toResult = [],
-			ccResult = [],
-			unic = undefined === excludeEmails ? {} : excludeEmails;
+	replyAllEmails(excludeEmails) {
+		const
+			toResult = new Map(),
+			ccResult = new Map(),
+			unic = excludeEmails || {};
 
 		replyHelper(this.replyTo, unic, toResult);
-		if (!toResult.length) {
-			replyHelper(this.from, unic, toResult);
-		}
+		toResult.size || replyHelper(this.from, unic, toResult);
 
 		replyHelper(this.to, unic, toResult);
+
 		replyHelper(this.cc, unic, ccResult);
 
-		if (!toResult.length && !last) {
-			data = this.replyAllEmails({}, true);
-			return [data[0], ccResult];
+		return [[...toResult.values()], [...ccResult.values()]];
+	}
+
+	viewBody(html) {
+		const body = this.body;
+		if (body) {
+			if (html) {
+				let result = msgHtml(this);
+				this.hasExternals(result.hasExternals);
+				this.hasImages(!!result.hasExternals);
+				this.hasTracking(!!result.tracking);
+				this.linkedData(result.linkedData);
+				body.innerHTML = result.html;
+				if (!this.isSpam && FolderUserStore.spamFolder() != this.folder) {
+					if ('always' === SettingsUserStore.viewImages()) {
+						this.showExternalImages();
+					}
+					if ('match' === SettingsUserStore.viewImages()) {
+						this.showExternalImages(1);
+					}
+				}
+			} else {
+				body.innerHTML = plainToHtml(
+					(this.plain()
+						? this.plain()
+							.replace(/-----BEGIN PGP (SIGNED MESSAGE-----(\r?\n[^\r\n]+)+|SIGNATURE-----[\s\S]*)/sg, '')
+							.trim()
+						: htmlToPlain(body.innerHTML || msgHtml(this).html)
+					)
+				);
+				this.hasImages(false);
+			}
+			body.classList.toggle('html', html);
+			body.classList.toggle('plain', !html);
+			this.isHtml(html);
+			return true;
 		}
 
-		return [toResult, ccResult];
 	}
 
 	viewHtml() {
-		const body = this.body;
-		if (body && this.html()) {
-			const contentLocationUrls = {},
-				oAttachments = this.attachments();
-
-			// Get contentLocationUrls
-			oAttachments.forEach(oAttachment => {
-				if (oAttachment.cid && oAttachment.contentLocation) {
-					contentLocationUrls[oAttachment.contentId()] = oAttachment.contentLocation;
-				}
-			});
-
-			let result = cleanHtml(this.html(), contentLocationUrls, SettingsUserStore.removeColors());
-			this.hasExternals(result.hasExternals);
-//			this.hasInternals = result.foundCIDs.length || result.foundContentLocationUrls.length;
-			this.hasImages(body.rlHasImages = !!result.hasExternals);
-
-			// Hide valid inline attachments in message view 'attachments' section
-			oAttachments.forEach(oAttachment => {
-				let cid = oAttachment.contentId(),
-					found = result.foundCIDs.includes(cid);
-				oAttachment.isInline(found);
-				oAttachment.isLinked(found || result.foundContentLocationUrls.includes(oAttachment.contentLocation));
-			});
-
-			body.innerHTML = result.html;
-
-			body.classList.toggle('html', 1);
-			body.classList.toggle('plain', 0);
-
-			// showInternalImages
-			const findAttachmentByCid = cid => this.attachments().findByCid(cid);
-			body.querySelectorAll('[data-x-src-cid],[data-x-src-location],[data-x-style-cid]').forEach(el => {
-				const data = el.dataset;
-				if (data.xSrcCid) {
-					const attachment = findAttachmentByCid(data.xSrcCid);
-					if (attachment && attachment.download) {
-						el.src = attachment.linkPreview();
-					}
-				} else if (data.xSrcLocation) {
-					const attachment = this.attachments.find(item => data.xSrcLocation === item.contentLocation)
-						|| findAttachmentByCid(data.xSrcLocation);
-					if (attachment && attachment.download) {
-						el.loading = 'lazy';
-						el.src = attachment.linkPreview();
-					}
-				} else if (data.xStyleCid) {
-					forEachObjectEntry(JSON.parse(data.xStyleCid), (name, cid) => {
-						const attachment = findAttachmentByCid(cid);
-						if (attachment && attachment.linkPreview && name) {
-							el.style[name] = "url('" + attachment.linkPreview() + "')";
-						}
-					});
-				}
-			});
-
-			if (SettingsUserStore.showImages()) {
-				this.showExternalImages();
-			}
-
-			this.isHtml(true);
-			this.initView();
-			return true;
-		}
+		return this.html() && this.viewBody(true);
 	}
 
 	viewPlain() {
-		const body = this.body;
-		if (body && this.plain()) {
-			body.classList.toggle('html', 0);
-			body.classList.toggle('plain', 1);
-			body.innerHTML = plainToHtml(
-				this.plain()
-					.replace(/-----BEGIN PGP (SIGNED MESSAGE-----(\r?\n[a-z][^\r\n]+)+|SIGNATURE-----[\s\S]*)/, '')
-					.trim()
-			)
-				.replace(url, '$1<a href="$2" target="_blank">$2</a>')
-				.replace(email, '$1<a href="mailto:$2">$2</a>');
-			this.isHtml(false);
-			this.hasImages(false);
-			this.initView();
-			return true;
-		}
+		return this.viewBody(false);
 	}
 
-	initView() {
-		// init BlockquoteSwitcher
-		this.body.querySelectorAll('blockquote:not(.rl-bq-switcher)').forEach(node => {
-			node.removeAttribute('style')
-			if (node.textContent.trim() && !node.parentNode.closest('blockquote')) {
-				let h = node.clientHeight || getRealHeight(node);
-				if (0 === h || 100 < h) {
-					const el = Element.fromHTML('<span class="rlBlockquoteSwitcher">•••</span>');
-					node.classList.add('rl-bq-switcher','hidden-bq');
-					node.before(el);
-					el.addEventListener('click', () => node.classList.toggle('hidden-bq'));
-				}
-			}
-		});
-	}
-
-	viewPopupMessage(print) {
-		const timeStampInUTC = this.dateTimeStampInUTC() || 0,
-			ccLine = this.ccToLine(false),
-			m = 0 < timeStampInUTC ? new Date(timeStampInUTC * 1000) : null,
-			win = open(''),
-			sdoc = win.document;
-		let subject = encodeHtml(this.subject()),
-			mode = this.isHtml() ? 'div' : 'pre',
-			cc = ccLine ? `<div>${encodeHtml(i18n('GLOBAL/CC'))}: ${encodeHtml(ccLine)}</div>` : '',
-			style = getComputedStyle(doc.querySelector('.messageView')),
-			prop = property => style.getPropertyValue(property);
-		sdoc.write(PreviewHTML
-			.replace('<title>', '<title>'+subject)
-			// eslint-disable-next-line max-len
-			.replace('<body>', `<body style="background-color:${prop('background-color')};color:${prop('color')}"><header><h1>${subject}</h1><time>${encodeHtml(m ? m.format('LLL') : '')}</time><div>${encodeHtml(this.fromToLine(false))}</div><div>${encodeHtml(i18n('GLOBAL/TO'))}: ${encodeHtml(this.toToLine(false))}</div>${cc}</header><${mode}>${this.bodyAsHTML()}</${mode}>`)
-		);
-		sdoc.close();
-
-		if (print) {
-			setTimeout(() => win.print(), 100);
-		}
+	swapColors() {
+		const cl = this.body?.classList;
+		cl && cl.toggle('swapColors');
 	}
 
 	/**
 	 * @param {boolean=} print = false
 	 */
-	popupMessage() {
-		this.viewPopupMessage(false);
+	popupMessage(print) {
+		const
+			timeStampInUTC = this.dateTimestamp() || 0,
+			ccLine = this.cc.toString(),
+			bccLine = this.bcc.toString(),
+			m = 0 < timeStampInUTC ? new Date(timeStampInUTC * 1000) : null,
+			win = open('', 'sm-msg-'+this.requestHash
+				,SettingsUserStore.messageNewWindow() ? 'innerWidth=' + elementById('V-MailMessageView').clientWidth : ''
+			),
+			sdoc = win.document,
+			subject = encodeHtml(this.subject()),
+			mode = this.isHtml() ? 'div' : 'pre',
+			to = `<div>${encodeHtml(i18n('GLOBAL/TO'))}: ${encodeHtml(this.to)}</div>`
+				+ (ccLine ? `<div>${encodeHtml(i18n('GLOBAL/CC'))}: ${encodeHtml(ccLine)}</div>` : '')
+				+ (bccLine ? `<div>${encodeHtml(i18n('GLOBAL/BCC'))}: ${encodeHtml(bccLine)}</div>` : ''),
+			style = getComputedStyle(doc.querySelector('.messageView')),
+			prop = property => style.getPropertyValue(property);
+		let attachments = '';
+		this.attachments.forEach(attachment => {
+			attachments += `<a href="${attachment.linkDownload()}">${attachment.fileName}</a>`;
+		});
+		sdoc.write(PreviewHTML
+			.replace('<title>', '<title>'+subject)
+			// eslint-disable-next-line max-len
+			.replace('<body>', `<body style="background-color:${prop('background-color')};color:${prop('color')}"><header><h1>${subject}</h1><time>${encodeHtml(m ? m.format('LLL',0,LanguageStore.hourCycle()) : '')}</time><div>${encodeHtml(this.from)}</div>${to}</header><${mode}>${this.bodyAsHTML()}</${mode}>`)
+			.replace('</body>', `<div id="attachments">${attachments}</div></body>`)
+		);
+		sdoc.close();
+		(true === print) && setTimeout(() => win.print(), 100);
 	}
 
 	printMessage() {
-		this.viewPopupMessage(true);
+		this.popupMessage(true);
 	}
 
 	/**
-	 * @returns {string}
-	 */
-	generateUid() {
-		return this.folder + '/' + this.uid;
-	}
-
-	/**
-	 * @param {MessageModel} message
 	 * @returns {MessageModel}
-	 */
-	static fromMessageListItem(message) {
+	 *//*
+	clone() {
 		let self = new MessageModel();
-
-		if (message) {
-			self.folder = message.folder;
-			self.uid = message.uid;
-			self.hash = message.hash;
-			self.requestHash = message.requestHash;
-			self.subject(message.subject());
-			self.plain(message.plain());
-			self.html(message.html());
-
-			self.size(message.size());
-			self.spamScore(message.spamScore());
-			self.spamResult(message.spamResult());
-			self.isSpam(message.isSpam());
-			self.hasVirus(message.hasVirus());
-			self.dateTimeStampInUTC(message.dateTimeStampInUTC());
-			self.priority(message.priority());
-
-			self.hasExternals(message.hasExternals());
-
-			self.emails = message.emails;
-
-			self.from = message.from;
-			self.to = message.to;
-			self.cc = message.cc;
-			self.bcc = message.bcc;
-			self.replyTo = message.replyTo;
-			self.deliveredTo = message.deliveredTo;
-			self.unsubsribeLinks(message.unsubsribeLinks);
-
-			self.flags(message.flags());
-
-			self.priority(message.priority());
-
-			self.selected(message.selected());
-			self.checked(message.checked());
-			self.attachments(message.attachments());
-
-			self.threads(message.threads());
-		}
-
+		// Clone message values
+		forEachObjectEntry(this, (key, value) => {
+			if (ko.isObservable(value)) {
+				ko.isComputed(value) || self[key](value());
+			} else if (!isFunction(value)) {
+				self[key] = value;
+			}
+		});
 		self.computeSenderEmail();
-
 		return self;
-	}
+	}*/
 
-	showExternalImages() {
+	showExternalImages(regex) {
 		const body = this.body;
 		if (body && this.hasImages()) {
-			this.hasImages(false);
-			body.rlHasImages = false;
-
-			let attr = 'data-x-src';
-			body.querySelectorAll('[' + attr + ']').forEach(node => {
-				if (node.matches('img')) {
-					node.loading = 'lazy';
+			if (regex) {
+				regex = [];
+				SettingsUserStore.viewImagesWhitelist().trim().split(/[\s\r\n,;]+/g).forEach(rule => {
+					rule = rule.split('+');
+					rule[0] = rule[0].trim();
+					if (rule[0]
+					 && (!rule.includes('spf') || 'pass' === this.spf[0]?.[0])
+					 && (!rule.includes('dkim') || 'pass' === this.dkim[0]?.[0])
+					 && (!rule.includes('dmarc') || 'pass' === this.dmarc[0]?.[0])
+					) {
+						regex.push(rule[0].replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&'));
+					}
+				});
+				regex = regex.join('|').replace(/\|+/g, '|');
+				if (regex) {
+					console.log('whitelist images = '+regex);
+					regex = new RegExp(regex);
+					if (this.from[0]?.email.match(regex)) {
+						regex = null;
+					}
+				}
+			}
+			let hasImages = false,
+				isValid = src => {
+					if (null == regex || (regex && src.match(regex))) {
+						return true;
+					}
+					hasImages = true;
+				},
+				attr = 'data-x-src',
+				src, useProxy = !!SettingsGet('proxyExternalImages');
+			body.querySelectorAll('img[' + attr + ']').forEach(node => {
+				src = node.getAttribute(attr);
+				if (isValid(src)) {
+					node.src = useProxy ? proxy(src) : src;
 				}
-				node.src = node.getAttribute(attr);
 			});
 
 			body.querySelectorAll('[data-x-style-url]').forEach(node => {
-				forEachObjectEntry(JSON.parse(node.dataset.xStyleUrl), (name, url) => node.style[name] = "url('" + url + "')");
+				JSON.parse(node.dataset.xStyleUrl).forEach(data => {
+					if (isValid(data[1])) {
+						node.style[data[0]] = "url('" + (useProxy ? proxy(data[1]) : data[1]) + "')"
+					}
+				});
 			});
+
+			this.hasImages(hasImages);
 		}
 	}
 
@@ -597,33 +591,151 @@ export class MessageModel extends AbstractModel {
 	 * @returns {string}
 	 */
 	bodyAsHTML() {
-//		if (this.body && !this.body.querySelector('iframe[src*=decrypt]')) {
-		if (this.body && !this.body.querySelector('iframe')) {
+		if (this.body) {
 			let clone = this.body.cloneNode(true);
-			clone.querySelectorAll('blockquote.rl-bq-switcher').forEach(
-				node => node.classList.remove('rl-bq-switcher','hidden-bq')
+			clone.querySelectorAll('.sm-bq-switcher').forEach(
+				node => node.replaceWith(node.lastElementChild)
 			);
-			clone.querySelectorAll('.rlBlockquoteSwitcher').forEach(
-				node => node.remove()
-			);
-			return clone.innerHTML;
+			return (clone.querySelector('.mail-body') || clone).innerHTML;
 		}
-		return this.html() || plainToHtml(this.plain());
+		let result = msgHtml(this);
+		return result.html || plainToHtml(this.plain());
 	}
 
-	/**
-	 * @returns {string}
-	 */
-	flagHash() {
-		return [
-			this.deleted(),
-			this.isDeleted(),
-			this.isUnseen(),
-			this.isFlagged(),
-			this.isAnswered(),
-			this.isForwarded(),
-			this.isReadReceipt()
-		].join(',');
+	async decrypt() {
+		const msg = this;
+		if (msg.pgpEncrypted() && !msg.pgpDecrypted()) {
+			return await msg.pgpDecrypt().then(()=>msg.pgpDecrypted());
+		}
+		if (msg.smimeEncrypted() && !msg.smimeDecrypted()) {
+			return await msg.smimeDecrypt().then(()=>msg.smimeDecrypted());
+		}
+		return true;
+	}
+/*
+	async decrypted() {
+		return msg.pgpDecrypted() || msg.smimeDecrypted());
+	}
+*/
+	async pgpDecrypt() {
+		const oMessage = this,
+			data = oMessage.pgpEncrypted();
+		delete data.error;
+		await PgpUserStore.decrypt(oMessage).then(result => {
+			if (!result) {
+				// TODO: translate
+				throw Error('Decryption failed, canceled or not possible');
+			}
+			oMessage.pgpDecrypted(true);
+			if (result.data) {
+				MimeToMessage(result.data, oMessage);
+				oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain();
+				if (result.signatures?.length) {
+					oMessage.pgpSigned({
+						signatures: result.signatures,
+						success: !!result.signatures.length
+					});
+				}
+			}
+		})
+		.catch(e => {
+			data.error = e.message;
+		})
+		.finally(() => {
+			oMessage.pgpEncrypted(data);
+		});
 	}
 
+	pgpVerify(/*self, event*/) {
+		const oMessage = this;
+		PgpUserStore.verify(oMessage).then(result => {
+			if (result) {
+				oMessage.pgpSigned(result);
+			} else {
+				alert('Verification failed or no valid public key found');
+			}
+/*
+			if (result?.success) {
+				i18n('CRYPTO/GOOD_SIGNATURE', {
+					USER: validKey.user + ' (' + validKey.id + ')'
+				});
+				message.getText()
+			} else {
+				const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
+					additional = keyIds
+						? keyIds.map(item => item?.toHex?.()).filter(v => v).join(', ')
+						: '';
+
+				i18n('CRYPTO/ERROR', {
+					TYPE: 'OpenPGP',
+					ERROR: 'message'
+				}) + (additional ? ' (' + additional + ')' : '');
+			}
+*/
+		});
+	}
+
+	async smimeDecrypt() {
+		const message = this;
+		const addresses = message.from.concat(message.to, message.cc, message.bcc).map(item => item.email),
+			identity = IdentityUserStore.find(item => addresses.includes(item.email)),
+			data = message.smimeEncrypted(); // { partId: "1" }
+		if (data && identity) {
+			delete data.error;
+			let pass, params = { ...data }; // clone
+			params.folder = message.folder;
+			params.uid = message.uid;
+//			params.bodyPart = params.bodyPart?.raw;
+			params.certificate = identity.smimeCertificate();
+			params.privateKey = identity.smimeKey();
+			if (identity.smimeKeyEncrypted()) {
+				pass = await Passphrases.ask(identity,
+					i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email}),
+					'CRYPTO/DECRYPT'
+				);
+				if (!pass) {
+					return;
+				}
+				params.passphrase = pass?.password;
+			}
+			await Remote.post('SMimeDecryptMessage', null, params).then(response => {
+				if (response?.Result?.data) {
+					message.smimeDecrypted(true);
+					MimeToMessage(response.Result.data, message);
+					message.html() ? message.viewHtml() : message.viewPlain();
+					pass && pass.remember && Passphrases.handle(identity, pass.password);
+					if ('signed' in response.Result) {
+						message.smimeSigned(response.Result.signed);
+					}
+				}
+			}).catch(e => {
+				data.error = e.message
+			})
+			.finally(() => {
+				message.smimeEncrypted(data);
+			});
+		}
+	}
+
+	smimeVerify(/*self, event*/) {
+		const message = this,
+			data = message.smimeSigned(); // { partId: "1", micAlg: "pgp-sha256" }
+		if (data) {
+			const params = { ...data }; // clone
+			params.folder = message.folder;
+			params.uid = message.uid;
+			params.bodyPart = data.bodyPart?.raw;
+			params.sigPart = data.sigPart?.bodyRaw;
+			Remote.post('SMimeVerifyMessage', null, params).then(response => {
+				if (response?.Result) {
+					if (response.Result.body) {
+						MimeToMessage(response.Result.body, message);
+						message.html() ? message.viewHtml() : message.viewPlain();
+					}
+					data.success = response.Result.success;
+					message.smimeSigned(data);
+				}
+			});
+		}
+	}
 }
diff --git a/dev/Model/MessageCollection.js b/dev/Model/MessageCollection.js
index 425284866..93ec76cbb 100644
--- a/dev/Model/MessageCollection.js
+++ b/dev/Model/MessageCollection.js
@@ -1,10 +1,6 @@
 import { AbstractCollectionModel } from 'Model/AbstractCollection';
 import { MessageModel } from 'Model/Message';
-
-import {
-	MessageFlagsCache,
-	hasNewMessageAndRemoveFromCache
-} from 'Common/Cache';
+import { MessageUserStore } from 'Stores/User/Message';
 
 'use strict';
 
@@ -13,18 +9,16 @@ export class MessageCollectionModel extends AbstractCollectionModel
 /*
 	constructor() {
 		super();
-		this.Filtered
-		this.Folder
-		this.FolderHash
-		this.Limit
-		this.MessageCount
-		this.MessageUnseenCount
-		this.MessageResultCount
-		this.NewMessages
-		this.Offset
-		this.Search
-		this.ThreadUid
-		this.UidNext
+		this.filtered
+		this.folder
+		this.totalEmails
+		this.totalThreads
+		this.threadUid
+		this.newMessages
+		this.offset
+		this.limit
+		this.search
+		this.limited
 	}
 */
 
@@ -32,20 +26,17 @@ export class MessageCollectionModel extends AbstractCollectionModel
 	 * @param {?Object} json
 	 * @returns {MessageCollectionModel}
 	 */
-	static reviveFromJson(object, cached) {
-		let newCount = 0;
+	static reviveFromJson(object/*, cached*/) {
+		let msg = MessageUserStore.message();
 		return super.reviveFromJson(object, message => {
-			message = MessageModel.reviveFromJson(message);
-			if (message) {
-				if (hasNewMessageAndRemoveFromCache(message.folder, message.uid) && 5 >= newCount) {
-					++newCount;
-				}
-
-				message.deleted(false);
-
-				cached ? MessageFlagsCache.initMessage(message) : MessageFlagsCache.store(message);
-				return message;
+			// If message is currently viewed, use that.
+			if (msg && msg.hash === message.hash) {
+				msg.revivePropertiesFromJson(message);
+				message = msg;
+			} else {
+				message = MessageModel.reviveFromJson(message);
 			}
+			return message;
 		});
 	}
 }
diff --git a/dev/Model/MimeHeader.js b/dev/Model/MimeHeader.js
new file mode 100644
index 000000000..5b4de7f7f
--- /dev/null
+++ b/dev/Model/MimeHeader.js
@@ -0,0 +1,13 @@
+import ko from 'ko';
+
+import { AbstractModel } from 'Knoin/AbstractModel';
+
+export class MimeHeaderModel extends AbstractModel
+{
+	constructor() {
+		super();
+		this.name = '';
+		this.value = '';
+		this.parameters = ko.observableArray();
+	}
+}
diff --git a/dev/Model/MimeHeaderAutocrypt.js b/dev/Model/MimeHeaderAutocrypt.js
new file mode 100644
index 000000000..cfd12ea57
--- /dev/null
+++ b/dev/Model/MimeHeaderAutocrypt.js
@@ -0,0 +1,34 @@
+//import { AbstractModel } from 'Knoin/AbstractModel';
+
+export class MimeHeaderAutocryptModel/* extends AbstractModel*/
+{
+	constructor(value) {
+//		super();
+		this.addr = '';
+		this.prefer_encrypt = 'nopreference', // nopreference or mutual
+		this.keydata = '';
+
+		if (value) {
+			value.split(';').forEach(entry => {
+				entry = entry.match(/^([^=]+)=(.*)$/);
+				const trim = str => (str || '').trim().replace(/^["']|["']+$/g, '');
+				this[trim(entry[1]).replace('-', '_')] = trim(entry[2]);
+			});
+			this.keydata = this.keydata.replace(/\s+/g, '\n');
+		}
+	}
+
+	toString() {
+		let result = `addr=${this.addr}; `;
+		if ('mutual' === this.prefer_encrypt) {
+			result += 'prefer-encrypt=mutual; ';
+		}
+		return result + 'keydata=' + this.keydata.replace(/\n/g, '\n ');
+	}
+
+	pem() {
+		return '-----BEGIN PGP PUBLIC KEY BLOCK-----\n\n'
+			+ this.keydata
+			+ '\n-----END PGP PUBLIC KEY BLOCK-----';
+	}
+}
diff --git a/dev/Model/MimeHeaderCollection.js b/dev/Model/MimeHeaderCollection.js
new file mode 100644
index 000000000..a0138e676
--- /dev/null
+++ b/dev/Model/MimeHeaderCollection.js
@@ -0,0 +1,38 @@
+import { AbstractCollectionModel } from 'Model/AbstractCollection';
+import { MimeHeaderModel } from 'Model/MimeHeader';
+
+'use strict';
+
+export class MimeHeaderCollectionModel extends AbstractCollectionModel
+{
+	/**
+	 * @param {?Array} json
+	 * @returns {MimeHeaderCollectionModel}
+	 */
+	static reviveFromJson(items) {
+		return super.reviveFromJson(items, header => MimeHeaderModel.reviveFromJson(header));
+	}
+
+	/**
+	 * @param {string} name
+	 * @returns {?MimeHeader}
+	 */
+	getByName(name)
+	{
+		name = name.toLowerCase();
+		return this.find(header => header.name.toLowerCase() === name);
+	}
+
+	valueByName(name)
+	{
+		const header = this.getByName(name);
+		return header ? header.value : '';
+	}
+
+	valuesByName(name)
+	{
+		name = name.toLowerCase();
+		return this.filter(header => header.name.toLowerCase() === name).map(header => header.value);
+	}
+
+}
diff --git a/dev/Remote/AbstractFetch.js b/dev/Remote/AbstractFetch.js
index 57c2bab1d..f05af9915 100644
--- a/dev/Remote/AbstractFetch.js
+++ b/dev/Remote/AbstractFetch.js
@@ -1,25 +1,25 @@
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { isArray, pInt, pString } from 'Common/Utils';
 import { serverRequest } from 'Common/Links';
 import { getNotification } from 'Common/Translator';
 
 let iJsonErrorCount = 0;
 
-const getURL = (add = '') => serverRequest('Json') + add,
+const getURL = (add = '') => serverRequest('Json') + pString(add),
 
 checkResponseError = data => {
-	const err = data ? data.ErrorCode : null;
-	if (Notification.InvalidToken === err) {
-		alert(getNotification(err));
-		rl.logoutReload();
+	const err = data ? data.code : null;
+	if (Notifications.InvalidToken === err) {
+		console.error(getNotification(err) + ` (${data.messageAdditional})`);
+//		alert(getNotification(err));
+		setTimeout(rl.logoutReload, 5000);
 	} else if ([
-			Notification.AuthError,
-			Notification.ConnectionError,
-			Notification.DomainNotAllowed,
-			Notification.AccountNotAllowed,
-			Notification.MailServerError,
-			Notification.UnknownNotification,
-			Notification.UnknownError
+			Notifications.AuthError,
+			Notifications.ConnectionError,
+			Notifications.DomainNotAllowed,
+			Notifications.AccountNotAllowed,
+			Notifications.MailServerError,
+			Notifications.UnknownError
 		].includes(err)
 	) {
 		if (7 < ++iJsonErrorCount) {
@@ -30,49 +30,52 @@ checkResponseError = data => {
 
 oRequests = {},
 
-abort = (sAction, bClearOnly) => {
-	if (oRequests[sAction]) {
-		if (!bClearOnly && oRequests[sAction].abort) {
-//			oRequests[sAction].__aborted = true;
-			oRequests[sAction].abort();
-		}
-
-		oRequests[sAction] = null;
-		delete oRequests[sAction];
+abort = (sAction, sReason, bClearOnly) => {
+	let controller = oRequests[sAction];
+	oRequests[sAction] = null;
+	if (controller) {
+		clearTimeout(controller.timeoutId);
+		bClearOnly || controller.abort(new DOMException(sAction, sReason || 'AbortError'));
 	}
 },
 
-fetchJSON = (action, sGetAdd, params, timeout, jsonCallback) => {
-	sGetAdd = pString(sGetAdd);
-	params = params || {};
-	if (params instanceof FormData) {
-		params.set('Action', action);
-	} else {
-		params.Action = action;
+fetchJSON = (action, sUrl, params, timeout, jsonCallback) => {
+	if (params) {
+		if (params instanceof FormData) {
+			params.set('Action', action);
+		} else {
+			params.Action = action;
+		}
 	}
-	let init = {};
-	if (window.AbortController) {
-		abort(action);
-		const controller = new AbortController();
-		timeout && setTimeout(() => controller.abort(), timeout);
-		oRequests[action] = controller;
-		init.signal = controller.signal;
-	}
-	return rl.fetchJSON(getURL(sGetAdd), init, sGetAdd ? null : params).then(jsonCallback);
+	// Don't abort, read https://github.com/the-djmaze/snappymail/issues/487
+//	abort(action, 0, 1);
+	const controller = new AbortController(),
+		signal = controller.signal;
+	oRequests[action] = controller;
+	// Currently there is no way to combine multiple signals, so AbortSignal.timeout() not possible
+	controller.timeoutId = timeout && setTimeout(() => abort(action, 'TimeoutError'), timeout);
+	return rl.fetchJSON(sUrl, {signal: signal}, params).then(data => {
+		abort(action, 0, 1);
+		return jsonCallback ? jsonCallback(data) : Promise.resolve(data);
+	}).catch(err => {
+		clearTimeout(controller.timeoutId);
+		err.aborted = signal.aborted;
+		return Promise.reject(err);
+	});
 };
 
 class FetchError extends Error
 {
 	constructor(code, message) {
 		super(message);
-		this.code = code || Notification.JsonFalse;
+		this.code = code || Notifications.JsonFalse;
 	}
 }
 
 export class AbstractFetchRemote
 {
-	abort(sAction, bClearOnly) {
-		abort(sAction, bClearOnly);
+	abort(sAction, sReason) {
+		abort(sAction, sReason);
 		return this;
 	}
 
@@ -107,10 +110,8 @@ export class AbstractFetchRemote
 						buffer = buffer.slice(result.index + 1);
 						re.lastIndex = 0;
 					}
-					if (buffer.length) {
-						// last line didn't end in a newline char
-						fCallback(buffer);
-					}
+					// last line didn't end in a newline char
+					buffer.length && fCallback(buffer);
 				};
 			reader.read().then(processText);
 		})
@@ -122,35 +123,18 @@ export class AbstractFetchRemote
 	 * @param {Object=} oParameters
 	 * @param {?number=} iTimeout
 	 * @param {string=} sGetAdd = ''
-	 * @param {Array=} aAbortActions = []
 	 */
-	request(sAction, fCallback, params, iTimeout, sGetAdd, abortActions) {
+	request(sAction, fCallback, params, iTimeout, sGetAdd) {
 		params = params || {};
 
 		const start = Date.now();
 
-		if (sAction && abortActions) {
-			abortActions.forEach(actionToAbort => abort(actionToAbort));
-		}
-
-		fetchJSON(sAction, sGetAdd,
-			params,
-			undefined === iTimeout ? 30000 : pInt(iTimeout),
-			data => {
-				let cached = false;
-				if (data && data.Time) {
-					cached = pInt(data.Time) > Date.now() - start;
-				}
-
+		fetchJSON(sAction, getURL(sGetAdd),
+			sGetAdd ? null : (params || {}),
+			pInt(iTimeout ?? 30000),
+			async data => {
 				let iError = 0;
-				if (sAction && oRequests[sAction]) {
-					if (oRequests[sAction].__aborted) {
-						iError = 2;
-					}
-					abort(sAction, true);
-				}
-
-				if (!iError && data) {
+				if (data) {
 /*
 					if (sAction !== data.Action) {
 						console.log(sAction + ' !== ' + data.Action);
@@ -160,58 +144,69 @@ export class AbstractFetchRemote
 						iJsonErrorCount = 0;
 					} else {
 						checkResponseError(data);
-						iError = data.ErrorCode || Notification.UnknownError
+						iError = data.code || Notifications.UnknownError
 					}
 				}
 
+				if (111 === iError && rl.app.ask && await rl.app.ask.cryptkey()) {
+					return this.request(sAction, fCallback, params, iTimeout, sGetAdd);
+				}
+
 				fCallback && fCallback(
 					iError,
 					data,
-					cached,
-					sAction,
-					params
+					/**
+					 * Responses like "304 Not Modified" are returned as "200 OK"
+					 * This is an attempt to detect if the request comes from cache.
+					 * But when client has wrong date/time, it will fail.
+					 */
+					data?.epoch && data.epoch < Math.floor(start / 1000) - 60
 				);
 			}
 		)
 		.catch(err => {
-			console.error(err);
-			fCallback && fCallback(err.name == 'AbortError' ? 2 : 1);
+			console.error({fetchError:err});
+			fCallback && fCallback(
+				'TimeoutError' == err.name ? 3 : (err.name == 'AbortError' ? 2 : 1),
+				err
+			);
 		});
 	}
 
-	/**
-	 * @param {?Function} fCallback
-	 */
-	getPublicKey(fCallback) {
-		this.request('GetPublicKey', fCallback);
-	}
-
 	setTrigger(trigger, value) {
 		if (trigger) {
 			value = !!value;
 			(isArray(trigger) ? trigger : [trigger]).forEach(fTrigger => {
-				fTrigger && fTrigger(value);
+				fTrigger?.(value);
 			});
 		}
 	}
 
+	get(action, url) {
+		return fetchJSON(action, url);
+	}
+
 	post(action, fTrigger, params, timeOut) {
 		this.setTrigger(fTrigger, true);
-		return fetchJSON(action, '', params, pInt(timeOut, 30000),
-			data => {
-				abort(action, true);
+		return fetchJSON(action, getURL(), params || {}, pInt(timeOut, 30000),
+			async data => {
+				abort(action, 0, 1);
 
 				if (!data) {
-					return Promise.reject(new FetchError(Notification.JsonParse));
+					return Promise.reject(new FetchError(Notifications.JsonParse));
+				}
+
+				if (111 === data?.code && rl.app.ask && await rl.app.ask.cryptkey()) {
+					return this.post(action, fTrigger, params, timeOut);
 				}
 /*
 				let isCached = false, type = '';
-				if (data && data.Time) {
-					isCached = pInt(data.Time) > microtime() - start;
+				if (data?.epoch) {
+					isCached = data.epoch > microtime() - start;
 				}
 				// backward capability
 				switch (true) {
-					case 'success' === textStatus && data && data.Result && action === data.Action:
+					case 'success' === textStatus && data?.Result && action === data.Action:
 						type = AbstractFetchRemote.SUCCESS;
 						break;
 					case 'abort' === textStatus && (!data || !data.__aborted__):
@@ -227,8 +222,8 @@ export class AbstractFetchRemote
 				if (!data.Result || action !== data.Action) {
 					checkResponseError(data);
 					return Promise.reject(new FetchError(
-						data ? data.ErrorCode : 0,
-						data ? (data.ErrorMessageAdditional || data.ErrorMessage) : ''
+						data ? data.code : 0,
+						data ? (data.messageAdditional || data.message) : ''
 					));
 				}
 
diff --git a/dev/Remote/User/Fetch.js b/dev/Remote/User/Fetch.js
index 32366fd04..e235cc62f 100644
--- a/dev/Remote/User/Fetch.js
+++ b/dev/Remote/User/Fetch.js
@@ -1,8 +1,6 @@
 import { pString, pInt, b64EncodeJSONSafe } from 'Common/Utils';
 
 import {
-	getFolderHash,
-	getFolderUidNext,
 	getFolderFromCacheList
 } from 'Common/Cache';
 
@@ -11,56 +9,11 @@ import { SUB_QUERY_PREFIX } from 'Common/Links';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
-import { FolderUserStore } from 'Stores/User/Folder';
 
 import { AbstractFetchRemote } from 'Remote/AbstractFetch';
 
 class RemoteUserFetch extends AbstractFetchRemote {
 
-	/**
-	 * @param {Function} fCallback
-	 * @param {object} params
-	 * @param {boolean=} bSilent = false
-	 */
-	messageList(fCallback, params, bSilent = false) {
-		const
-			sFolderFullName = pString(params.Folder),
-			folderHash = getFolderHash(sFolderFullName);
-
-		params = Object.assign({
-			Offset: 0,
-			Limit: SettingsUserStore.messagesPerPage(),
-			Search: '',
-			UidNext: getFolderUidNext(sFolderFullName), // Used to check for new messages
-			Sort: FolderUserStore.sortMode(),
-			Hash: folderHash + SettingsGet('AccountHash')
-		}, params);
-		params.Folder = sFolderFullName;
-		if (AppUserStore.threadsAllowed() && SettingsUserStore.useThreads()) {
-			params.UseThreads = 1;
-		} else {
-			params.ThreadUid = 0;
-		}
-
-		let sGetAdd = '';
-
-		if (folderHash && (!params.Search || !params.Search.includes('is:'))) {
-			sGetAdd = 'MessageList/' +
-				SUB_QUERY_PREFIX +
-				'/' +
-				b64EncodeJSONSafe(params);
-			params = {};
-		}
-
-		this.request('MessageList',
-			fCallback,
-			params,
-			30000,
-			sGetAdd,
-			bSilent ? [] : ['MessageList']
-		);
-	}
-
 	/**
 	 * @param {?Function} fCallback
 	 * @param {string} sFolderFullName
@@ -72,7 +25,7 @@ class RemoteUserFetch extends AbstractFetchRemote {
 		iUid = pInt(iUid);
 
 		if (getFolderFromCacheList(sFolderFullName) && 0 < iUid) {
-			this.request('Message',
+			this.abort('Message').request('Message',
 				fCallback,
 				{},
 				null,
@@ -83,9 +36,8 @@ class RemoteUserFetch extends AbstractFetchRemote {
 						sFolderFullName,
 						iUid,
 						AppUserStore.threadsAllowed() && SettingsUserStore.useThreads() ? 1 : 0,
-						SettingsGet('AccountHash')
-					]),
-				['Message']
+						SettingsGet('accountHash')
+					])
 			);
 
 			return true;
@@ -112,16 +64,6 @@ class RemoteUserFetch extends AbstractFetchRemote {
 			[key]: value
 		});
 	}
-
-/*
-	folderMove(sPrevFolderFullName, sNewFolderFullName, bSubscribe) {
-		return this.post('FolderMove', FolderUserStore.foldersRenaming, {
-			Folder: sPrevFolderFullName,
-			NewFolder: sNewFolderFullName,
-			Subscribe: bSubscribe ? 1 : 0
-		});
-	}
-*/
 }
 
 export default new RemoteUserFetch();
diff --git a/dev/Screen/AbstractSettings.js b/dev/Screen/AbstractSettings.js
index 4619f21e4..78813c423 100644
--- a/dev/Screen/AbstractSettings.js
+++ b/dev/Screen/AbstractSettings.js
@@ -2,7 +2,7 @@ import ko from 'ko';
 
 import { pString } from 'Common/Utils';
 import { settings } from 'Common/Links';
-import { createElement, elementById } from 'Common/Globals';
+import { createElement/*, elementById*/, fireEvent } from 'Common/Globals';
 
 import { AbstractScreen } from 'Knoin/AbstractScreen';
 import { i18nToNodes } from 'Common/Translator';
@@ -25,35 +25,42 @@ export class AbstractSettingsScreen extends AbstractScreen {
 		let settingsScreen = null,
 			viewModelDom = null,
 			RoutedSettingsViewModel = VIEW_MODELS.find(
-				SettingsViewModel => subName === SettingsViewModel.__rlSettingsData.route
+				SettingsViewModel => subName === SettingsViewModel.route
 			);
 
 		if (RoutedSettingsViewModel) {
-			const vmPlace = elementById('rl-settings-subscreen');
-			if (RoutedSettingsViewModel.__vm) {
-				settingsScreen = RoutedSettingsViewModel.__vm;
+//			const vmPlace = elementById('V-SettingsPane') || elementById('V-AdminPane);
+			const vmPlace = this.viewModels[1].__vm.viewModelDom,
+				SettingsViewModelClass = RoutedSettingsViewModel.vmc;
+			if (SettingsViewModelClass.__vm) {
+				settingsScreen = SettingsViewModelClass.__vm;
+				viewModelDom = settingsScreen.viewModelDom;
 			} else if (vmPlace) {
 				viewModelDom = createElement('div',{
-					id: 'V-Settings-' + RoutedSettingsViewModel.name.replace(/(User|Admin)Settings/,''),
+					id: 'V-Settings-' + SettingsViewModelClass.name.replace(/(User|Admin)Settings/,''),
 					hidden: ''
 				})
 				vmPlace.append(viewModelDom);
 
-				settingsScreen = new RoutedSettingsViewModel();
+				settingsScreen = new SettingsViewModelClass();
 				settingsScreen.viewModelDom = viewModelDom;
+				settingsScreen.viewModelTemplateID = RoutedSettingsViewModel.template;
 
-				RoutedSettingsViewModel.__dom = viewModelDom;
-				RoutedSettingsViewModel.__vm = settingsScreen;
+				SettingsViewModelClass.__vm = settingsScreen;
+
+				fireEvent('rl-view-model.create', settingsScreen);
 
 				ko.applyBindingAccessorsToNode(
 					viewModelDom,
 					{
-						template: () => ({ name: RoutedSettingsViewModel.__rlSettingsData.template })
+						template: () => ({ name: RoutedSettingsViewModel.template })
 					},
 					settingsScreen
 				);
 
-				settingsScreen.onBuild && settingsScreen.onBuild(viewModelDom);
+				settingsScreen.onBuild?.(viewModelDom);
+
+				fireEvent('rl-view-model', settingsScreen);
 			} else {
 				console.log('Cannot find sub settings view model position: SettingsSubScreen');
 			}
@@ -67,14 +74,14 @@ export class AbstractSettingsScreen extends AbstractScreen {
 					this.oCurrentSubScreen = settingsScreen;
 
 					// show
-					settingsScreen.beforeShow && settingsScreen.beforeShow();
-					i18nToNodes(settingsScreen.viewModelDom);
-					settingsScreen.viewModelDom.hidden = false;
-					settingsScreen.onShow && settingsScreen.onShow();
+					settingsScreen.beforeShow?.();
+					i18nToNodes(viewModelDom);
+					viewModelDom.hidden = false;
+					settingsScreen.onShow?.();
 
 					this.menu.forEach(item => {
 						item.selected(
-							item.route === RoutedSettingsViewModel.__rlSettingsData.route
+							item.route === RoutedSettingsViewModel.route
 						);
 					});
 
@@ -90,25 +97,27 @@ export class AbstractSettingsScreen extends AbstractScreen {
 	onHide() {
 		let subScreen = this.oCurrentSubScreen;
 		if (subScreen) {
-			subScreen.onHide && subScreen.onHide();
+			subScreen.onHide?.();
 			subScreen.viewModelDom.hidden = true;
 		}
 	}
 
 	onBuild() {
-		VIEW_MODELS.forEach(SettingsViewModel => this.menu.push(SettingsViewModel.__rlSettingsData));
+		// TODO: issue on account switch
+		// When current domain has sieve but the new has not, or current has not and the new has
+		// SettingsViewModel.disabled() || this.menu.push()
+		VIEW_MODELS.forEach(SettingsViewModel => this.menu.push(SettingsViewModel));
 	}
 
 	routes() {
 		const DefaultViewModel = VIEW_MODELS.find(
-				SettingsViewModel => SettingsViewModel.__rlSettingsData.isDefault
+				SettingsViewModel => SettingsViewModel.isDefault
 			),
-			defaultRoute =
-				DefaultViewModel ? DefaultViewModel.__rlSettingsData.route : 'general',
+			defaultRoute = DefaultViewModel?.route || 'general',
 			rules = {
 				subname: /^(.*)$/,
 				normalize_: (rquest, vals) => {
-					vals.subname = null == vals.subname ? defaultRoute : pString(vals.subname);
+					vals.subname = pString(vals.subname ?? defaultRoute);
 					return [vals.subname];
 				}
 			};
@@ -131,13 +140,12 @@ export class AbstractSettingsScreen extends AbstractScreen {
  */
 export function settingsAddViewModel(SettingsViewModelClass, template, labelName, route, isDefault = false) {
 	let name = SettingsViewModelClass.name.replace(/(User|Admin)Settings/, '');
-	SettingsViewModelClass.__rlSettingsData = {
-		label: labelName || 'SETTINGS_LABELS/LABEL_' + name.toUpperCase() + '_NAME',
+	VIEW_MODELS.push({
+		vmc: SettingsViewModelClass,
+		label: labelName || 'SETTINGS_LABELS/' + name.toUpperCase(),
 		route: route || name.toLowerCase(),
 		selected: ko.observable(false),
 		template: template || SettingsViewModelClass.name,
 		isDefault: !!isDefault
-	};
-
-	VIEW_MODELS.push(SettingsViewModelClass);
+	});
 }
diff --git a/dev/Screen/Admin/Login.js b/dev/Screen/Admin/Login.js
index 7d0301b2f..76b224d71 100644
--- a/dev/Screen/Admin/Login.js
+++ b/dev/Screen/Admin/Login.js
@@ -8,6 +8,6 @@ export class LoginAdminScreen extends AbstractScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/Admin/Settings.js b/dev/Screen/Admin/Settings.js
index a57cc8219..95d024691 100644
--- a/dev/Screen/Admin/Settings.js
+++ b/dev/Screen/Admin/Settings.js
@@ -37,6 +37,6 @@ export class SettingsAdminScreen extends AbstractSettingsScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/User/Login.js b/dev/Screen/User/Login.js
index c6282f67e..8865353bb 100644
--- a/dev/Screen/User/Login.js
+++ b/dev/Screen/User/Login.js
@@ -8,6 +8,6 @@ export class LoginUserScreen extends AbstractScreen {
 	}
 
 	onShow() {
-		rl.setWindowTitle();
+		rl.setTitle();
 	}
 }
diff --git a/dev/Screen/User/MailBox.js b/dev/Screen/User/MailBox.js
index 851e23ff4..d2831a63a 100644
--- a/dev/Screen/User/MailBox.js
+++ b/dev/Screen/User/MailBox.js
@@ -1,17 +1,14 @@
-import { Scope } from 'Common/Enums';
-import { Layout, ClientSideKeyNameMessageListSize } from 'Common/EnumsUser';
-import { doc, leftPanelDisabled, moveAction, Settings, elementById } from 'Common/Globals';
+import { ScopeMessageList } from 'Common/Enums';
+import { doc, createElement, Settings } from 'Common/Globals';
 import { pString, pInt } from 'Common/Utils';
-import { setLayoutResizer } from 'Common/UtilsUser';
-import { getFolderFromCacheList, getFolderFullName, getFolderInboxName } from 'Common/Cache';
-import { i18n } from 'Common/Translator';
-import { SettingsUserStore } from 'Stores/User/Settings';
+import { moveAction } from 'Common/UtilsUser';
+import { getFolderFromHashMap, getFolderInboxName } from 'Common/Cache';
+import { i18n, initOnStartOrLangChange } from 'Common/Translator';
 
 import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
 import { FolderUserStore } from 'Stores/User/Folder';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { ThemeStore } from 'Stores/Theme';
 
 import { SystemDropDownUserView } from 'View/User/SystemDropDown';
 import { MailFolderList } from 'View/User/MailBox/FolderList';
@@ -20,8 +17,17 @@ import { MailMessageView } from 'View/User/MailBox/MessageView';
 
 import { AbstractScreen } from 'Knoin/AbstractScreen';
 
+import { MessageModel } from 'Model/Message';
+import { populateMessageBody } from 'Common/UtilsUser';
+
 export class MailBoxUserScreen extends AbstractScreen {
 	constructor() {
+		var styleSheet = createElement('style');
+		doc.head.appendChild(styleSheet);
+		initOnStartOrLangChange(() =>
+			styleSheet.innerText = '.subjectParent:empty::after,.subjectParent .subject:empty::after'
+			+'{content:"'+i18n('MESSAGE/EMPTY_SUBJECT_TEXT')+'"}'
+		);
 		super('mailbox', [
 			SystemDropDownUserView,
 			MailFolderList,
@@ -37,7 +43,7 @@ export class MailBoxUserScreen extends AbstractScreen {
 		const count = Settings.app('listPermanentFiltered') ? 0 : FolderUserStore.foldersInboxUnreadCount(),
 			email = AccountUserStore.email();
 
-		rl.setWindowTitle(
+		rl.setTitle(
 			(email
 				? '' + (0 < count ? '(' + count + ') ' : ' ') + email + ' - '
 				: ''
@@ -50,11 +56,8 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 */
 	onShow() {
 		this.updateWindowTitle();
-
 		AppUserStore.focusedState('none');
-		AppUserStore.focusedState(Scope.MessageList);
-
-		ThemeStore.isMobile() && leftPanelDisabled(true);
+		AppUserStore.focusedState(ScopeMessageList);
 	}
 
 	/**
@@ -63,17 +66,22 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @param {string} search
 	 * @returns {void}
 	 */
-	onRoute(folderHash, page, search) {
-		const folder = getFolderFromCacheList(getFolderFullName(folderHash.replace(/~([\d]+)$/, '')));
+	onRoute(folderHash, page, search, messageUid) {
+		// Only works when FolderUserStore.folderList() is loaded
+		const folder = getFolderFromHashMap(folderHash.replace(/~([\d]+)$/, ''));
 		if (folder) {
-			let threadUid = folderHash.replace(/^.+~(\d+)$/, '$1');
-
 			FolderUserStore.currentFolder(folder);
-
 			MessagelistUserStore.page(1 > page ? 1 : page);
 			MessagelistUserStore.listSearch(search);
-			MessagelistUserStore.threadUid((folderHash === threadUid) ? 0 : pInt(threadUid));
-
+			if (messageUid) {
+				let message = new MessageModel;
+				message.folder = folderHash;
+				message.uid = messageUid;
+				populateMessageBody(message);
+			} else {
+				let threadUid = folderHash.replace(/^.+~(\d+)$/, '$1');
+				MessagelistUserStore.threadUid((folderHash === threadUid) ? 0 : pInt(threadUid));
+			}
 			MessagelistUserStore.reload();
 		}
 	}
@@ -88,8 +96,8 @@ export class MailBoxUserScreen extends AbstractScreen {
 			FolderUserStore.foldersInboxUnreadCount(e.detail);
 /*			// Disabled in SystemDropDown.html
 			const email = AccountUserStore.email();
-			AccountUserStore.accounts.forEach(item =>
-				item && email === item.email && item.count(e.detail)
+			AccountUserStore.forEach(item =>
+				email === item?.email && item?.count(e.detail)
 			);
 */
 			this.updateWindowTitle();
@@ -100,26 +108,8 @@ export class MailBoxUserScreen extends AbstractScreen {
 	 * @returns {void}
 	 */
 	onBuild() {
-		setTimeout(() => {
-			// initMailboxLayoutResizer
-			const top = elementById('V-MailMessageList'),
-				bottom = elementById('V-MailMessageView'),
-				fToggle = () => {
-					let layout = SettingsUserStore.layout();
-					setLayoutResizer(top, bottom, ClientSideKeyNameMessageListSize,
-						(ThemeStore.isMobile() || Layout.NoPreview === layout)
-							? 0
-							: (Layout.SidePreview === layout ? 'Width' : 'Height')
-					);
-				};
-			if (top && bottom) {
-				fToggle();
-				addEventListener('rl-layout', fToggle);
-			}
-		}, 1);
-
 		doc.addEventListener('click', event =>
-			event.target.closest('#rl-right') && moveAction(false)
+			event.target.closest('#rl-right') && moveAction(0)
 		);
 	}
 
@@ -139,6 +129,10 @@ export class MailBoxUserScreen extends AbstractScreen {
 			[/^([a-zA-Z0-9.~_-]+)\/(.+)\/?$/, { normalize_: (request, vals) =>
 				[folder(request, vals), 1, decodeURI(pString(vals[1]))]
 			}],
+			// Message: {folder}/m{uid}(/{search})?
+			[/^([a-zA-Z0-9.~_-]+)\/m([1-9][0-9]*)(?:\/(.+))?$/, { normalize_: (request, vals) =>
+				[folder(request, vals), 1, pString(vals[2]), pString(vals[1])]
+			}],
 			// Page: {folder}/p{int}(/{search})?
 			[/^([a-zA-Z0-9.~_-]+)\/p([1-9][0-9]*)(?:\/(.+))?$/, { normalize_: fNormS }]
 		];
diff --git a/dev/Screen/User/Settings.js b/dev/Screen/User/Settings.js
index 00f19ab67..f4d912c7f 100644
--- a/dev/Screen/User/Settings.js
+++ b/dev/Screen/User/Settings.js
@@ -1,11 +1,10 @@
-import { Scope } from 'Common/Enums';
-import { keyScope, leftPanelDisabled, SettingsCapa } from 'Common/Globals';
+import { ScopeSettings } from 'Common/Enums';
+import { keyScope, SettingsCapa } from 'Common/Globals';
 import { runSettingsViewModelHooks } from 'Common/Plugins';
 import { initOnStartOrLangChange, i18n } from 'Common/Translator';
 
 import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
-import { ThemeStore } from 'Stores/Theme';
 
 import { AbstractSettingsScreen, settingsAddViewModel } from 'Screen/AbstractSettings';
 
@@ -23,7 +22,7 @@ import { SettingsPaneUserView } from 'View/User/Settings/Pane';
 
 export class SettingsUserScreen extends AbstractSettingsScreen {
 	constructor() {
-		super([SystemDropDownUserView, SettingsMenuUserView, SettingsPaneUserView]);
+		super([SettingsMenuUserView, SettingsPaneUserView, SystemDropDownUserView]);
 
 		const views = [
 			UserSettingsGeneral
@@ -37,13 +36,13 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 			views.push(UserSettingsAccounts);
 		}
 
+		// TODO: issue on account switch
+		// When current domain has sieve but the new has not, or current has not and the new has
 		if (SettingsCapa('Sieve')) {
 			views.push(UserSettingsFilters);
 		}
 
-		if (SettingsCapa('AutoLogout') || SettingsCapa('OpenPGP') || SettingsCapa('GnuPG')) {
-			views.push(UserSettingsSecurity);
-		}
+		views.push(UserSettingsSecurity);
 
 		views.push(UserSettingsFolders);
 
@@ -52,7 +51,10 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 		}
 
 		views.forEach((item, index) =>
-			settingsAddViewModel(item, item.name.replace('User', ''), 0, 0, 0 === index)
+			settingsAddViewModel(item, item.name.replace('User', ''),
+				(item === UserSettingsAccounts && !SettingsCapa('AdditionalAccounts'))
+					? 'SETTINGS_ACCOUNTS/LEGEND_IDENTITIES' : 0,
+				0, 0 === index)
 		);
 
 		runSettingsViewModelHooks(false);
@@ -65,12 +67,11 @@ export class SettingsUserScreen extends AbstractSettingsScreen {
 
 	onShow() {
 		this.setSettingsTitle();
-		keyScope(Scope.Settings);
-		ThemeStore.isMobile() && leftPanelDisabled(true);
+		keyScope(ScopeSettings);
 	}
 
 	setSettingsTitle() {
 		const sEmail = AccountUserStore.email();
-		rl.setWindowTitle((sEmail ? sEmail + ' - ' :  '') + this.sSettingsTitle);
+		rl.setTitle((sEmail ? sEmail + ' - ' :  '') + this.sSettingsTitle);
 	}
 }
diff --git a/dev/Settings/Admin/About.js b/dev/Settings/Admin/About.js
index f90f1cacd..456fa250d 100644
--- a/dev/Settings/Admin/About.js
+++ b/dev/Settings/Admin/About.js
@@ -3,7 +3,7 @@ import { Settings } from 'Common/Globals';
 import { addObservablesTo } from 'External/ko';
 import Remote from 'Remote/Admin/Fetch';
 
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger } from 'Common/Translator';
 
 export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 	constructor() {
@@ -16,13 +16,17 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 			coreWarning: false,
 			coreVersion: '',
 			coreVersionCompare: -2,
+			php64: true,
+			load1: 0,
+			load5: 0,
+			load15: 0,
 			errorDesc: ''
 		});
 		this.coreChecking = ko.observable(false).extend({ throttle: 100 });
 		this.coreUpdating = ko.observable(false).extend({ throttle: 100 });
 
 		this.coreVersionHtmlDesc = ko.computed(() => {
-			translatorTrigger();
+			translateTrigger();
 			return i18n('TAB_ABOUT/HTML_NEW_VERSION', { 'VERSION': this.coreVersion() });
 		});
 
@@ -51,18 +55,22 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 	}
 
 	onBuild() {
-		Remote.request('AdminPHPExtensions', (iError, data) => iError || this.phpextensions(data.Result));
-
 //	beforeShow() {
 		this.coreChecking(true);
-		Remote.request('AdminUpdateInfo', (iError, data) => {
+		Remote.request('AdminInfo', (iError, data) => {
 			this.coreChecking(false);
-			if (!iError && data && data.Result) {
+			data = data?.Result;
+			if (!iError && data) {
+				this.load1(data.system.load?.[0]);
+				this.load5(data.system.load?.[1]);
+				this.load15(data.system.load?.[2]);
+				this.phpextensions(data.php);
 				this.coreReal(true);
-				this.coreUpdatable(!!data.Result.Updatable);
-				this.coreWarning(!!data.Result.Warning);
-				this.coreVersion(data.Result.Version || '');
-				this.coreVersionCompare(data.Result.VersionCompare);
+				this.coreUpdatable(!!data.core.updatable);
+				this.coreWarning(!!data.core.warning);
+				this.coreVersion(data.core.version || '');
+				this.coreVersionCompare(data.core.versionCompare);
+				this.php64(data.php[1].loaded);
 			} else {
 				this.coreReal(false);
 				this.coreWarning(false);
@@ -72,6 +80,10 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 		});
 	}
 
+	clearCache() {
+		Remote.request('AdminClearCache');
+	}
+
 	updateCoreData() {
 		if (!this.coreUpdating()) {
 			this.coreUpdating(true);
@@ -79,7 +91,7 @@ export class AdminSettingsAbout /*extends AbstractViewSettings*/ {
 				this.coreUpdating(false);
 				this.coreVersion('');
 				this.coreVersionCompare(-2);
-				if (!iError && data && data.Result) {
+				if (!iError && data?.Result) {
 					this.coreReal(true);
 					window.location.reload();
 				} else {
diff --git a/dev/Settings/Admin/Branding.js b/dev/Settings/Admin/Branding.js
index c8ad7aea1..52a673d46 100644
--- a/dev/Settings/Admin/Branding.js
+++ b/dev/Settings/Admin/Branding.js
@@ -3,8 +3,8 @@ import { AbstractViewSettings } from 'Knoin/AbstractViews';
 export class AdminSettingsBranding extends AbstractViewSettings {
 	constructor() {
 		super();
-		this.addSetting('Title');
-		this.addSetting('LoadingDescription');
-		this.addSetting('FaviconUrl');
+		this.addSetting('title');
+		this.addSetting('loadingDescription');
+		this.addSetting('faviconUrl');
 	}
 }
diff --git a/dev/Settings/Admin/Config.js b/dev/Settings/Admin/Config.js
index 0a7bd3037..5c33b13f2 100644
--- a/dev/Settings/Admin/Config.js
+++ b/dev/Settings/Admin/Config.js
@@ -2,11 +2,40 @@ import ko from 'ko';
 
 import Remote from 'Remote/Admin/Fetch';
 import { forEachObjectEntry } from 'Common/Utils';
+import { SettingsAdmin } from 'Common/Globals';
+import { LanguageStore } from 'Stores/Language';
+import { ThemeStore } from 'Stores/Theme';
 
 export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 
 	constructor() {
 		this.config = ko.observableArray();
+		this.search = ko.observable('');
+		this.saved = ko.observable(false).extend({ falseTimeout: 5000 });
+
+		this.search.subscribe(value => {
+			const v = value.toLowerCase(),
+				qsa = (node, selector, fn) => node.querySelectorAll(selector).forEach(fn),
+				match = node => node.textContent.toLowerCase().includes(v);
+			if (v.length) {
+				qsa(this.viewModelDom, 'tbody', tbody => {
+					let show = match(tbody.querySelector('th'));
+					if (show) {
+						qsa(tbody, '[hidden]', n => n.hidden = false);
+					} else {
+						qsa(tbody, 'tbody td:first-child', td => {
+							let hide = !match(td);
+							show = show || !hide;
+//							td.closest('tr').hidden = hide;
+							td.parentNode.hidden = hide;
+						});
+					}
+					tbody.hidden = !show;
+				});
+			} else {
+				qsa(this.viewModelDom, 'table [hidden]', n => n.hidden = false);
+			}
+		});
 	}
 
 	beforeShow() {
@@ -27,12 +56,19 @@ export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 						items: []
 					};
 					forEachObjectEntry(items, (skey, item) => {
+						if ('language' === skey) {
+							item[2] = ('webmail' === key) ? LanguageStore.languages : SettingsAdmin('languages');
+						} else if ('theme' === skey) {
+							item[2] = ThemeStore.themes;
+						}
+						'admin_password' === skey ||
 						section.items.push({
 							key: `config[${key}][${skey}]`,
 							name: skey,
 							value: item[0],
 							type: getInputType(item[0], skey.includes('password')),
-							comment: item[1]
+							comment: item[1],
+							options: item[2]
 						});
 					});
 					cfg.push(section);
@@ -43,6 +79,27 @@ export class AdminSettingsConfig /*extends AbstractViewSettings*/ {
 	}
 
 	saveConfig(form) {
-		Remote.post('AdminSettingsSet', null, new FormData(form));
+		const data = new FormData(form),
+			config = {};
+		this.config.forEach(section => {
+			if (!config[section.name]) {
+				config[section.name] = {};
+			}
+			section.items.forEach(item => {
+				let value = data.get(item.key);
+				switch (typeof item.value) {
+					case 'boolean':
+						value = 'on' == value;
+						break;
+					case 'number':
+						value = parseInt(value, 10);
+						break;
+				}
+				config[section.name][item.name] = value;
+			})
+		});
+		Remote.post('AdminSettingsSet', null, {config:config}).then(result => {
+			result.Result && this.saved(true);
+		});
 	}
 }
diff --git a/dev/Settings/Admin/Contacts.js b/dev/Settings/Admin/Contacts.js
index 1cb0d0d1d..ad65c8453 100644
--- a/dev/Settings/Admin/Contacts.js
+++ b/dev/Settings/Admin/Contacts.js
@@ -13,16 +13,22 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 		super();
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 
-		this.addSetting('ContactsPdoDsn');
-		this.addSetting('ContactsPdoUser');
-		this.addSetting('ContactsPdoPassword');
-		this.addSetting('ContactsPdoType', () => {
+		this.addSetting('contactsPdoDsn');
+		this.addSetting('contactsPdoUser');
+		this.addSetting('contactsPdoPassword');
+		this.addSetting('contactsPdoType', () => {
 			this.testContactsSuccess(false);
 			this.testContactsError(false);
 			this.testContactsErrorMessage('');
 		});
 
-		this.addSettings(['ContactsEnable','ContactsSync']);
+		this.addSettings(['contactsEnable','contactsSync']);
+
+		this.addSetting('contactsMySQLSSLCA');
+		this.addSetting('contactsMySQLSSLVerify');
+		this.addSetting('contactsMySQLSSLCiphers');
+
+		this.addSetting('contactsSQLiteGlobal');
 
 		addObservablesTo(this, {
 			testing: false,
@@ -31,6 +37,8 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 			testContactsErrorMessage: ''
 		});
 
+		this.addSetting('contactsSuggestionsLimit');
+
 		const supportedTypes = SettingsGet('supportedPdoDrivers') || [],
 			types = [{
 				id:'sqlite',
@@ -85,19 +93,19 @@ export class AdminSettingsContacts extends AbstractViewSettings {
 					this.testContactsSuccess(true);
 				} else {
 					this.testContactsError(true);
-					if (data && data.Result) {
-						this.testContactsErrorMessage(data.Result.Message || '');
-					} else {
-						this.testContactsErrorMessage('');
-					}
+					this.testContactsErrorMessage(data?.Result?.Message || '');
 				}
 
 				this.testing(false);
 			}, {
-				ContactsPdoType: this.contactsPdoType(),
-				ContactsPdoDsn: this.contactsPdoDsn(),
-				ContactsPdoUser: this.contactsPdoUser(),
-				ContactsPdoPassword: this.contactsPdoPassword()
+				PdoType: this.contactsPdoType(),
+				PdoDsn: this.contactsPdoDsn(),
+				PdoUser: this.contactsPdoUser(),
+				PdoPassword: this.contactsPdoPassword(),
+				MySQLSSLCA: this.contactsMySQLSSLCA(),
+				MySQLSSLVerify: this.contactsMySQLSSLVerify(),
+				MySQLSSLCiphers: this.contactsMySQLSSLCiphers(),
+				SQLiteGlobal: this.contactsSQLiteGlobal()
 			}
 		);
 	}
diff --git a/dev/Settings/Admin/Domains.js b/dev/Settings/Admin/Domains.js
index e248d7063..1a769bb14 100644
--- a/dev/Settings/Admin/Domains.js
+++ b/dev/Settings/Admin/Domains.js
@@ -11,10 +11,25 @@ import { DomainAliasPopupView } from 'View/Popup/DomainAlias';
 export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.domains = DomainAdminStore;
-
+		this.username = ko.observable('');
 		this.domainForDeletion = ko.observable(null).askDeleteHelper();
 	}
 
+	testUsername() {
+		Remote.request('AdminDomainMatch',
+			(iError, oData) => {
+				if (oData?.Result?.name) {
+					alert(`${oData.Result.email} matched domain: ${oData.Result.name}`);
+				} else {
+					alert('No domain match');
+				}
+			},
+			{
+				username: this.username
+			}
+		);
+	}
+
 	createDomain() {
 		showScreenPopup(DomainPopupView);
 	}
@@ -26,15 +41,15 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 	deleteDomain(domain) {
 		DomainAdminStore.remove(domain);
 		Remote.request('AdminDomainDelete', DomainAdminStore.fetch, {
-			Name: domain.name
+			name: domain.name
 		});
 	}
 
 	disableDomain(domain) {
 		domain.disabled(!domain.disabled());
 		Remote.request('AdminDomainDisable', DomainAdminStore.fetch, {
-			Name: domain.name,
-			Disabled: domain.disabled() ? 1 : 0
+			name: domain.name,
+			disabled: domain.disabled() ? 1 : 0
 		});
 	}
 
@@ -44,7 +59,7 @@ export class AdminSettingsDomains /*extends AbstractViewSettings*/ {
 			el && ko.dataFor(el) && Remote.request('AdminDomainLoad',
 				(iError, oData) => iError || showScreenPopup(DomainPopupView, [oData.Result]),
 				{
-					Name: ko.dataFor(el).name
+					name: ko.dataFor(el).name
 				}
 			);
 
diff --git a/dev/Settings/Admin/General.js b/dev/Settings/Admin/General.js
index 66127ca21..143d30464 100644
--- a/dev/Settings/Admin/General.js
+++ b/dev/Settings/Admin/General.js
@@ -1,15 +1,9 @@
 import ko from 'ko';
 
-import {
-	isArray,
-	changeTheme,
-	convertThemeName
-} from 'Common/Utils';
-
 import { addObservablesTo, addSubscribablesTo, addComputablesTo } from 'External/ko';
 
-import { SaveSettingsStep } from 'Common/Enums';
-import { Settings, SettingsGet, SettingsCapa } from 'Common/Globals';
+import { SaveSettingStatus } from 'Common/Enums';
+import { SettingsAdmin, SettingsGet, SettingsCapa } from 'Common/Globals';
 import { translatorReload, convertLangName } from 'Common/Translator';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
@@ -17,7 +11,7 @@ import { showScreenPopup } from 'Knoin/Knoin';
 
 import Remote from 'Remote/Admin/Fetch';
 
-import { ThemeStore } from 'Stores/Theme';
+import { ThemeStore, convertThemeName, changeTheme } from 'Stores/Theme';
 import { LanguageStore } from 'Stores/Language';
 import { LanguagesPopupView } from 'View/Popup/Languages';
 
@@ -26,22 +20,14 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 		super();
 
 		this.language = LanguageStore.language;
-		this.languages = LanguageStore.languages;
-
-		const aLanguagesAdmin = Settings.app('languagesAdmin');
-		this.languagesAdmin = ko.observableArray(isArray(aLanguagesAdmin) ? aLanguagesAdmin : []);
-		this.languageAdmin = ko
-			.observable(SettingsGet('LanguageAdmin'))
-			.extend({ limitedList: this.languagesAdmin });
+		this.languageAdmin = ko.observable(SettingsAdmin('language'));
 
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
 
-		this.addSettings(['AllowLanguagesOnSettings','NewMoveToFolder']);
+		this.addSettings(['allowLanguagesOnSettings']);
 
 		addObservablesTo(this, {
-			attachmentLimitTrigger: SaveSettingsStep.Idle,
-			themeTrigger: SaveSettingsStep.Idle,
 			capaThemes: SettingsCapa('Themes'),
 			capaUserBackground: SettingsCapa('UserBackground'),
 			capaAdditionalAccounts: SettingsCapa('AdditionalAccounts'),
@@ -59,16 +45,16 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 		*/
 
 		this.attachmentLimit = ko
-			.observable(SettingsGet('AttachmentLimit') / (1024 * 1024))
+			.observable(SettingsGet('attachmentLimit') / (1024 * 1024))
 			.extend({ debounce: 500 });
 
-		this.addSetting('Language');
-		this.addSetting('AttachmentLimit');
+		this.addSetting('language');
+		this.addSetting('attachmentLimit');
 		this.addSetting('Theme', value => changeTheme(value, this.themeTrigger));
 
-		this.uploadData = SettingsGet('PhpUploadSizes');
+		this.uploadData = SettingsGet('phpUploadSizes');
 		this.uploadDataDesc =
-			this.uploadData && (this.uploadData.upload_max_filesize || this.uploadData.post_max_size)
+			(this.uploadData?.upload_max_filesize || this.uploadData?.post_max_size)
 				? [
 						this.uploadData.upload_max_filesize
 							? 'upload_max_filesize = ' + this.uploadData.upload_max_filesize + '; '
@@ -84,20 +70,20 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 			languageAdminFullName: () => convertLangName(this.languageAdmin())
 		});
 
-		this.languageAdminTrigger = ko.observable(SaveSettingsStep.Idle).extend({ debounce: 100 });
+		this.languageAdminTrigger = ko.observable(SaveSettingStatus.Idle).extend({ debounce: 100 });
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
 				this.languageAdminTrigger(saveSettingsStep);
-				setTimeout(() => this.languageAdminTrigger(SaveSettingsStep.Idle), 1000);
+				setTimeout(() => this.languageAdminTrigger(SaveSettingStatus.Idle), 1000);
 			},
 			fSaveHelper = key => value => Remote.saveSetting(key, value);
 
 		addSubscribablesTo(this, {
 			languageAdmin: value => {
-				this.languageAdminTrigger(SaveSettingsStep.Animate);
-				translatorReload(true, value)
-					.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
-					.then(() => Remote.saveSetting('LanguageAdmin', value));
+				this.languageAdminTrigger(SaveSettingStatus.Saving);
+				translatorReload(value, 1)
+					.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
+					.then(() => Remote.saveSetting('languageAdmin', value));
 			},
 
 			capaAdditionalAccounts: fSaveHelper('CapaAdditionalAccounts'),
@@ -113,14 +99,18 @@ export class AdminSettingsGeneral extends AbstractViewSettings {
 	}
 
 	selectLanguage() {
-		showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
+		showScreenPopup(LanguagesPopupView, [
+			this.language,
+			LanguageStore.languages,
+			LanguageStore.userLanguage()
+		]);
 	}
 
 	selectLanguageAdmin() {
 		showScreenPopup(LanguagesPopupView, [
 			this.languageAdmin,
-			this.languagesAdmin(),
-			SettingsGet('UserLanguageAdmin')
+			SettingsAdmin('languages'),
+			SettingsAdmin('clientLanguage')
 		]);
 	}
 }
diff --git a/dev/Settings/Admin/Login.js b/dev/Settings/Admin/Login.js
index cfc1feba0..47da49bf8 100644
--- a/dev/Settings/Admin/Login.js
+++ b/dev/Settings/Admin/Login.js
@@ -3,7 +3,7 @@ import { AbstractViewSettings } from 'Knoin/AbstractViews';
 export class AdminSettingsLogin extends AbstractViewSettings {
 	constructor() {
 		super();
-		this.addSetting('LoginDefaultDomain');
-		this.addSettings(['DetermineUserLanguage','DetermineUserDomain','AllowLanguagesOnLogin','hideSubmitButton']);
+		this.addSetting('loginDefaultDomain');
+		this.addSettings(['determineUserLanguage','determineUserDomain','allowLanguagesOnLogin']);
 	}
 }
diff --git a/dev/Settings/Admin/Packages.js b/dev/Settings/Admin/Packages.js
index 7a161e5b1..37fd18ee6 100644
--- a/dev/Settings/Admin/Packages.js
+++ b/dev/Settings/Admin/Packages.js
@@ -1,6 +1,6 @@
 import ko from 'ko';
 
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { getNotification } from 'Common/Translator';
 
 import { PackageAdminStore } from 'Stores/Admin/Package';
@@ -15,21 +15,35 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.addSettings(['EnabledPlugins']);
+		this.addSettings(['pluginsEnable']);
 
 		addObservablesTo(this, {
-			packagesError: ''
+			packagesError: '',
+			search: ''
 		});
 
 		this.packages = PackageAdminStore;
 
 		addComputablesTo(this, {
-			packagesCurrent: () => PackageAdminStore().filter(item => item && item.installed && !item.canBeUpdated),
-			packagesUpdate: () => PackageAdminStore().filter(item => item && item.installed && item.canBeUpdated),
-			packagesAvailable: () => PackageAdminStore().filter(item => item && !item.installed),
+			packagesCurrent: () => PackageAdminStore().filter(item => item?.installed && !item.canBeUpdated),
+			packagesUpdate: () => PackageAdminStore().filter(item => item?.installed && item.canBeUpdated),
+			packagesAvailable: () => PackageAdminStore().filter(item => !item?.installed),
 
 			visibility: () => (PackageAdminStore.loading() ? 'visible' : 'hidden')
 		});
+
+		this.search.subscribe(value => {
+			const v = value.toLowerCase(),
+				qsa = (node, selector, fn) => node.querySelectorAll(selector).forEach(fn),
+				match = node => node.textContent.toLowerCase().includes(v);
+			if (v.length) {
+				qsa(this.viewModelDom, 'td:first-child', td => {
+					td.parentNode.hidden = !match(td);
+				});
+			} else {
+				qsa(this.viewModelDom, 'tr[hidden]', n => n.hidden = false);
+			}
+		});
 	}
 
 	onShow() {
@@ -42,16 +56,16 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 		oDom.addEventListener('click', event => {
 			// configurePlugin
 			let el = event.target.closestWithin('.package-configure', oDom),
-				data = el ? ko.dataFor(el) : 0;
+				data = el && ko.dataFor(el);
 			data && Remote.request('AdminPluginLoad',
 				(iError, data) => iError || showScreenPopup(PluginPopupView, [data.Result]),
 				{
-					Id: data.id
+					id: data.id
 				}
 			);
 			// disablePlugin
 			el = event.target.closestWithin('.package-active', oDom);
-			data = el ? ko.dataFor(el) : 0;
+			data = el && ko.dataFor(el);
 			data && this.disablePlugin(data);
 		});
 	}
@@ -59,7 +73,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 	requestHelper(packageToRequest, install) {
 		return (iError, data) => {
 			PackageAdminStore.forEach(item => {
-				if (item && packageToRequest && item.loading && item.loading() && packageToRequest.file === item.file) {
+				if (packageToRequest && item?.loading?.() && packageToRequest.file === item.file) {
 					packageToRequest.loading(false);
 					item.loading(false);
 				}
@@ -67,8 +81,8 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 
 			if (iError) {
 				this.packagesError(
-					getNotification(install ? Notification.CantInstallPackage : Notification.CantDeletePackage)
-					+ (data.ErrorMessage ? ':\n' + data.ErrorMessage : '')
+					getNotification(install ? Notifications.CantInstallPackage : Notifications.CantDeletePackage)
+					+ (data.message ? ':\n' + data.message : '')
 				);
 			} else if (data.Result.Reload) {
 				location.reload();
@@ -84,7 +98,7 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 			Remote.request('AdminPackageDelete',
 				this.requestHelper(packageToDelete, false),
 				{
-					Id: packageToDelete.id
+					id: packageToDelete.id
 				}
 			);
 		}
@@ -96,9 +110,9 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 			Remote.request('AdminPackageInstall',
 				this.requestHelper(packageToInstall, true),
 				{
-					Id: packageToInstall.id,
-					Type: packageToInstall.type,
-					File: packageToInstall.file
+					id: packageToInstall.id,
+					type: packageToInstall.type,
+					file: packageToInstall.file
 				},
 				60000
 			);
@@ -109,19 +123,19 @@ export class AdminSettingsPackages extends AbstractViewSettings {
 		let disable = plugin.enabled();
 		plugin.enabled(!disable);
 		Remote.request('AdminPluginDisable',
-		(iError, data) => {
+			(iError, data) => {
 				if (iError) {
 					plugin.enabled(disable);
 					this.packagesError(
-						(Notification.UnsupportedPluginPackage === iError && data && data.ErrorMessage)
-						? data.ErrorMessage
+						(Notifications.UnsupportedPluginPackage === iError && data?.message)
+						? data.message
 						: getNotification(iError)
 					);
 				}
 //				PackageAdminStore.fetch();
 			}, {
-				Id: plugin.id,
-				Disabled: disable ? 1 : 0
+				id: plugin.id,
+				disabled: disable ? 1 : 0
 			}
 		);
 	}
diff --git a/dev/Settings/Admin/Security.js b/dev/Settings/Admin/Security.js
index a1ba65b6f..c9e9d8276 100644
--- a/dev/Settings/Admin/Security.js
+++ b/dev/Settings/Admin/Security.js
@@ -10,52 +10,86 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.addSettings(['UseLocalProxyForExternalImages','VerifySslCertificate','AllowSelfSigned']);
+		this.addSettings(['proxyExternalImages', 'autoVerifySignatures']);
 
 		this.weakPassword = rl.app.weakPassword;
 
 		addObservablesTo(this, {
-			adminLogin: SettingsGet('AdminLogin'),
+			adminLogin: SettingsGet('adminLogin'),
 			adminLoginError: false,
 			adminPassword: '',
 			adminPasswordNew: '',
 			adminPasswordNew2: '',
 			adminPasswordNewError: false,
-			adminTOTP: SettingsGet('AdminTOTP'),
+			adminTOTP: '',
 
-			adminPasswordUpdateError: false,
-			adminPasswordUpdateSuccess: false,
+			saveError: false,
+			saveSuccess: false,
 
+			viewQRCode: '',
+
+			capaGnuPG: SettingsCapa('GnuPG'),
 			capaOpenPGP: SettingsCapa('OpenPGP')
 		});
 
+		this.gnuPGversion = 'GnuPG v' + SettingsGet('gnupg');
+
 		const reset = () => {
-			this.adminPasswordUpdateError(false);
-			this.adminPasswordUpdateSuccess(false);
+			this.saveError(false);
+			this.saveSuccess(false);
 			this.adminPasswordNewError(false);
 		};
 
 		addSubscribablesTo(this, {
 			adminPassword: () => {
-				this.adminPasswordUpdateError(false);
-				this.adminPasswordUpdateSuccess(false);
+				this.saveError(false);
+				this.saveSuccess(false);
 			},
 
 			adminLogin: () => this.adminLoginError(false),
 
+			adminTOTP: value => {
+				if (/[A-Z2-7]{16,}/.test(value) && 0 == value.length * 5 % 8) {
+					Remote.request('AdminQRCode', (iError, data) => {
+						if (!iError) {
+							console.dir({data:data});
+							this.viewQRCode(data.Result);
+						}
+					}, {
+						'username': this.adminLogin(),
+						'TOTP': this.adminTOTP()
+					});
+				} else {
+					this.viewQRCode('');
+				}
+			},
+
 			adminPasswordNew: reset,
 
 			adminPasswordNew2: reset,
 
-			capaOpenPGP: value => Remote.saveSetting('CapaOpenPGP', value)
+			capaGnuPG: value => Remote.saveSetting('capaGnuPG', value),
+			capaOpenPGP: value => Remote.saveSetting('capaOpenPGP', value)
 		});
 
+		this.adminTOTP(SettingsGet('adminTOTP'));
+
 		decorateKoCommands(this, {
-			saveNewAdminPasswordCommand: self => self.adminLogin().trim() && self.adminPassword()
+			saveAdminUserCommand: self => self.adminLogin().trim() && self.adminPassword()
 		});
 	}
 
-	saveNewAdminPasswordCommand() {
+	generateTOTP() {
+		let CHARS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567',
+			length = 16,
+			secret = '';
+		while (0 < length--) {
+			secret += CHARS[Math.floor(Math.random() * 32)];
+		}
+		this.adminTOTP(secret);
+	}
+
+	saveAdminUserCommand() {
 		if (!this.adminLogin().trim()) {
 			this.adminLoginError(true);
 			return false;
@@ -66,26 +100,26 @@ export class AdminSettingsSecurity extends AbstractViewSettings {
 			return false;
 		}
 
-		this.adminPasswordUpdateError(false);
-		this.adminPasswordUpdateSuccess(false);
+		this.saveError(false);
+		this.saveSuccess(false);
 
 		Remote.request('AdminPasswordUpdate', (iError, data) => {
 			if (iError) {
-				this.adminPasswordUpdateError(true);
+				this.saveError(true);
 			} else {
 				this.adminPassword('');
 				this.adminPasswordNew('');
 				this.adminPasswordNew2('');
 
-				this.adminPasswordUpdateSuccess(true);
+				this.saveSuccess(true);
 
 				this.weakPassword(!!data.Result.Weak);
 			}
 		}, {
-			'Login': this.adminLogin(),
-			'Password': this.adminPassword(),
-			'NewPassword': this.adminPasswordNew(),
-			'TOTP': this.adminTOTP()
+			Login: this.adminLogin(),
+			Password: this.adminPassword(),
+			newPassword: this.adminPasswordNew(),
+			TOTP: this.adminTOTP()
 		});
 
 		return true;
diff --git a/dev/Settings/User/Accounts.js b/dev/Settings/User/Accounts.js
index 014d0be73..6eec1e148 100644
--- a/dev/Settings/User/Accounts.js
+++ b/dev/Settings/User/Accounts.js
@@ -1,28 +1,35 @@
 import ko from 'ko';
 
+//import { koComputable } from 'External/ko';
 import { SettingsCapa, SettingsGet } from 'Common/Globals';
+import { loadAccountsAndIdentities, editIdentity } from 'Common/UtilsUser';
 
 import { AccountUserStore } from 'Stores/User/Account';
 import { IdentityUserStore } from 'Stores/User/Identity';
+import { SettingsUserStore } from 'Stores/User/Settings';
 import Remote from 'Remote/User/Fetch';
 
 import { showScreenPopup } from 'Knoin/Knoin';
 
 import { AccountPopupView } from 'View/Popup/Account';
-import { IdentityPopupView } from 'View/Popup/Identity';
 
 export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	constructor() {
 		this.allowAdditionalAccount = SettingsCapa('AdditionalAccounts');
 		this.allowIdentities = SettingsCapa('Identities');
 
-		this.accounts = AccountUserStore.accounts;
+		this.accounts = AccountUserStore;
 		this.loading = AccountUserStore.loading;
 		this.identities = IdentityUserStore;
-		this.mainEmail = SettingsGet('MainEmail');
+		this.mainEmail = SettingsGet('mainEmail');
 
 		this.accountForDeletion = ko.observable(null).askDeleteHelper();
 		this.identityForDeletion = ko.observable(null).askDeleteHelper();
+
+		this.showUnread = SettingsUserStore.showUnreadCount;
+		SettingsUserStore.showUnreadCount.subscribe(value => Remote.saveSetting('ShowUnreadCount', value));
+
+//		this.additionalAccounts = koComputable(() => AccountUserStore.filter(account => account.isAdditional()));
 	}
 
 	addNewAccount() {
@@ -30,17 +37,17 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	}
 
 	editAccount(account) {
-		if (account && account.isAdditional()) {
+		if (account?.isAdditional()) {
 			showScreenPopup(AccountPopupView, [account]);
 		}
 	}
 
 	addNewIdentity() {
-		showScreenPopup(IdentityPopupView);
+		editIdentity();
 	}
 
 	editIdentity(identity) {
-		showScreenPopup(IdentityPopupView, [identity]);
+		editIdentity(identity);
 	}
 
 	/**
@@ -48,22 +55,20 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	 * @returns {void}
 	 */
 	deleteAccount(accountToRemove) {
-		if (accountToRemove && accountToRemove.askDelete()) {
+		if (accountToRemove?.askDelete()) {
 			this.accountForDeletion(null);
-			if (accountToRemove) {
-				this.accounts.remove((account) => accountToRemove === account);
+			this.accounts.remove(account => accountToRemove === account);
 
-				Remote.request('AccountDelete', (iError, data) => {
-					if (!iError && data.Reload) {
-						rl.route.root();
-						setTimeout(() => location.reload(), 1);
-					} else {
-						rl.app.accountsAndIdentities();
-					}
-				}, {
-					EmailToDelete: accountToRemove.email
-				});
-			}
+			Remote.request('AccountDelete', (iError, data) => {
+				if (!iError && data.Reload) {
+					rl.route.root();
+					setTimeout(() => location.reload(), 1);
+				} else {
+					loadAccountsAndIdentities();
+				}
+			}, {
+				emailToDelete: accountToRemove.email
+			});
 		}
 	}
 
@@ -72,21 +77,18 @@ export class UserSettingsAccounts /*extends AbstractViewSettings*/ {
 	 * @returns {void}
 	 */
 	deleteIdentity(identityToRemove) {
-		if (identityToRemove && identityToRemove.askDelete()) {
+		if (identityToRemove?.askDelete()) {
 			this.identityForDeletion(null);
-
-			if (identityToRemove) {
-				IdentityUserStore.remove(oIdentity => identityToRemove === oIdentity);
-				Remote.request('IdentityDelete', () => rl.app.accountsAndIdentities(), {
-					IdToDelete: identityToRemove.id()
-				});
-			}
+			IdentityUserStore.remove(oIdentity => identityToRemove === oIdentity);
+			Remote.request('IdentityDelete', () => rl.app.accountsAndIdentities(), {
+				idToDelete: identityToRemove.id()
+			});
 		}
 	}
 
 	accountsAndIdentitiesAfterMove() {
 		Remote.request('AccountsAndIdentitiesSortOrder', null, {
-			Accounts: AccountUserStore.getEmailAddresses().filter(v => v != SettingsGet('MainEmail')),
+			Accounts: AccountUserStore.filter(item => item.isAdditional()).map(item => item.email),
 			Identities: IdentityUserStore.map(item => (item ? item.id() : ""))
 		});
 	}
diff --git a/dev/Settings/User/Contacts.js b/dev/Settings/User/Contacts.js
index a274873e3..8d21cdb83 100644
--- a/dev/Settings/User/Contacts.js
+++ b/dev/Settings/User/Contacts.js
@@ -2,7 +2,7 @@ import ko from 'ko';
 import { koComputable } from 'External/ko';
 
 import { SettingsGet } from 'Common/Globals';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger, getErrorMessage } from 'Common/Translator';
 import { ContactUserStore } from 'Stores/User/Contact';
 import Remote from 'Remote/User/Fetch';
 
@@ -15,14 +15,14 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 		this.syncUrl = ContactUserStore.syncUrl;
 		this.syncUser = ContactUserStore.syncUser;
 		this.syncPass = ContactUserStore.syncPass;
+		this.syncError = ko.observable('');
 
-		const i18nSyncMode = key => i18n('SETTINGS_CONTACTS/SYNC_' + key);
 		this.syncModeOptions = koComputable(() => {
-			translatorTrigger();
+			translateTrigger();
 			return [
-				{ id: 0, name: i18nSyncMode('NO') },
-				{ id: 1, name: i18nSyncMode('YES') },
-				{ id: 2, name: i18nSyncMode('READ') },
+				{ id: 0, name: i18n('GLOBAL/NO') },
+				{ id: 1, name: i18n('GLOBAL/YES') },
+				{ id: 2, name: i18n('SETTINGS_CONTACTS/SYNC_READ') },
 			];
 		});
 
@@ -49,4 +49,15 @@ export class UserSettingsContacts /*extends AbstractViewSettings*/ {
 			})
 		);
 	}
+
+	test() {
+		this.syncError('');
+		Remote.request('TestContactsSyncData', (iError, data) => {
+			iError && this.syncError(data.messageAdditional || data.message || getErrorMessage(iError, data));
+		}, {
+			Url: ContactUserStore.syncUrl(),
+			User: ContactUserStore.syncUser(),
+			Password: ContactUserStore.syncPass()
+		})
+	}
 }
diff --git a/dev/Settings/User/Filters.js b/dev/Settings/User/Filters.js
index 7010603bc..bb3ea4442 100644
--- a/dev/Settings/User/Filters.js
+++ b/dev/Settings/User/Filters.js
@@ -1,6 +1,6 @@
-import { addObservablesTo } from 'External/ko';
+import { koComputable, addObservablesTo } from 'External/ko';
 import { FolderUserStore } from 'Stores/User/Folder';
-import { SettingsGet } from 'Common/Globals';
+import { SettingsGet/*, SettingsCapa*/ } from 'Common/Globals';
 
 //export class UserSettingsFilters /*extends AbstractViewSettings*/ {
 export class UserSettingsFilters /*extends AbstractViewSettings*/ {
@@ -22,9 +22,19 @@ export class UserSettingsFilters /*extends AbstractViewSettings*/ {
 			Sieve.updateList();
 		}).catch(e => console.error(e));
 
+		this.hasActive = koComputable(() => this.scripts().filter(script=>script.active()).length);
+
 		this.scriptForDeletion = ko.observable(null).askDeleteHelper();
 	}
 
+/*
+	// TODO: issue on account switch
+	// When current domain has sieve but the new has not, or current has not and the new has
+	disabled() {
+		return !SettingsCapa('Sieve');
+	}
+*/
+
 	addScript() {
 		this.editScript();
 	}
@@ -37,19 +47,23 @@ export class UserSettingsFilters /*extends AbstractViewSettings*/ {
 		window.Sieve.deleteScript(script);
 	}
 
-	toggleScript(script) {
-		window.Sieve.toggleScript(script);
+	disableScripts() {
+		window.Sieve.setActiveScript('');
+	}
+
+	enableScript(script) {
+		window.Sieve.setActiveScript(script.name());
 	}
 
 	onBuild(oDom) {
 		oDom.addEventListener('click', event => {
-			const el = event.target.closestWithin('.script-item .e-action', oDom),
+			const el = event.target.closestWithin('.script-item .script-name', oDom),
 				script = el && ko.dataFor(el);
 			script && this.editScript(script);
 		});
 	}
 
 	onShow() {
-		window.Sieve && window.Sieve.updateList();
+		window.Sieve?.updateList();
 	}
 }
diff --git a/dev/Settings/User/Folders.js b/dev/Settings/User/Folders.js
index d5e2b9aa2..f0dd7d797 100644
--- a/dev/Settings/User/Folders.js
+++ b/dev/Settings/User/Folders.js
@@ -1,14 +1,11 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
 
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { FolderMetadataKeys } from 'Common/EnumsUser';
-import { SettingsCapa } from 'Common/Globals';
 import { getNotification } from 'Common/Translator';
 
-import { setFolder, getFolderFromCacheList, removeFolderFromCacheList } from 'Common/Cache';
+import { getFolderFromCacheList, removeFolderFromCacheList } from 'Common/Cache';
 import { defaultOptionsAfterRender } from 'Common/Utils';
-import { sortFolders } from 'Common/Folders';
 import { initOnStartOrLangChange, i18n } from 'Common/Translator';
 
 import { FolderUserStore } from 'Stores/User/Folder';
@@ -18,15 +15,15 @@ import Remote from 'Remote/User/Fetch';
 
 import { showScreenPopup } from 'Knoin/Knoin';
 
+//import { FolderPopupView } from 'View/Popup/Folder';
 import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
 import { FolderSystemPopupView } from 'View/Popup/FolderSystem';
-import { loadFolders } from 'Model/FolderCollection';
 
 const folderForDeletion = ko.observable(null).askDeleteHelper();
 
 export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 	constructor() {
-		this.showKolab = koComputable(() => FolderUserStore.hasCapability('METADATA') && SettingsCapa('Kolab'));
+		this.showKolab = FolderUserStore.allowKolab();
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 		this.kolabTypeOptions = ko.observableArray();
 		let i18nFilter = key => i18n('SETTINGS_FOLDERS/TYPE_' + key);
@@ -45,69 +42,21 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 
 		this.displaySpecSetting = FolderUserStore.displaySpecSetting;
 		this.folderList = FolderUserStore.folderList;
-		this.folderListOptimized = FolderUserStore.folderListOptimized;
-		this.folderListError = FolderUserStore.folderListError;
+		this.folderListOptimized = FolderUserStore.optimized;
+		this.folderListError = FolderUserStore.error;
 		this.hideUnsubscribed = SettingsUserStore.hideUnsubscribed;
+		this.unhideKolabFolders = SettingsUserStore.unhideKolabFolders;
 
-		this.loading = koComputable(() => {
-			const loading = FolderUserStore.foldersLoading(),
-				creating = FolderUserStore.foldersCreating(),
-				deleting = FolderUserStore.foldersDeleting(),
-				renaming = FolderUserStore.foldersRenaming();
-
-			return loading || creating || deleting || renaming;
-		});
+		this.loading = FolderUserStore.foldersChanging;
 
 		this.folderForDeletion = folderForDeletion;
 
-		this.folderForEdit = ko.observable(null).extend({ toggleSubscribeProperty: [this, 'edited'] });
-
 		SettingsUserStore.hideUnsubscribed.subscribe(value => Remote.saveSetting('HideUnsubscribed', value));
-	}
-
-	folderEditOnEnter(folder) {
-		const nameToEdit = folder ? folder.nameForEdit().trim() : '';
-
-		if (nameToEdit && folder.name() !== nameToEdit) {
-			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
-					Folder: folder.fullName,
-					NewFolderName: nameToEdit,
-					Subscribe: folder.subscribed() ? 1 : 0
-				})
-				.then(data => {
-					folder.name(nameToEdit/*data.Name*/);
-					if (folder.subFolders.length) {
-						Remote.setTrigger(FolderUserStore.foldersLoading, true);
-//						clearTimeout(Remote.foldersTimeout);
-//						Remote.foldersTimeout = setTimeout(loadFolders, 500);
-						setTimeout(loadFolders, 500);
-						// TODO: rename all subfolders with folder.delimiter to prevent reload?
-					} else {
-						removeFolderFromCacheList(folder.fullName);
-						folder.fullName = data.Result.FullName;
-						setFolder(folder);
-						const parent = getFolderFromCacheList(folder.parentName);
-						sortFolders(parent ? parent.subFolders : FolderUserStore.folderList);
-					}
-				})
-				.catch(error => {
-					FolderUserStore.folderListError(
-						getNotification(error.code, '', Notification.CantRenameFolder)
-						+ '.\n' + error.message);
-				});
-		}
-
-		folder.edited(false);
-	}
-
-	folderEditOnEsc(folder) {
-		if (folder) {
-			folder.edited(false);
-		}
+		SettingsUserStore.unhideKolabFolders.subscribe(value => Remote.saveSetting('UnhideKolabFolders', value));
 	}
 
 	onShow() {
-		FolderUserStore.folderListError('');
+		FolderUserStore.error('');
 	}
 /*
 	onBuild(oDom) {
@@ -126,20 +75,20 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		 && folderToRemove.canBeDeleted()
 		 && folderToRemove.askDelete()
 		) {
-			if (0 < folderToRemove.privateMessageCountAll()) {
-//				FolderUserStore.folderListError(getNotification(Notification.CantDeleteNonEmptyFolder));
-				folderToRemove.errorMsg(getNotification(Notification.CantDeleteNonEmptyFolder));
+			if (0 < folderToRemove.totalEmails()) {
+//				FolderUserStore.error(getNotification(Notifications.CantDeleteNonEmptyFolder));
+				folderToRemove.errorMsg(getNotification(Notifications.CantDeleteNonEmptyFolder));
 			} else {
 				folderForDeletion(null);
 
 				if (folderToRemove) {
 					Remote.abort('Folders').post('FolderDelete', FolderUserStore.foldersDeleting, {
-							Folder: folderToRemove.fullName
+							folder: folderToRemove.fullName
 						}).then(
 							() => {
-//								folderToRemove.flags.push('\\nonexistent');
+//								folderToRemove.attributes.push('\\nonexistent');
 								folderToRemove.selectable(false);
-//								folderToRemove.subscribed(false);
+//								folderToRemove.isSubscribed(false);
 //								folderToRemove.checkable(false);
 								if (!folderToRemove.subFolders.length) {
 									removeFolderFromCacheList(folderToRemove.fullName);
@@ -148,8 +97,8 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 								}
 							},
 							error => {
-								FolderUserStore.folderListError(
-									getNotification(error.code, '', Notification.CantDeleteFolder)
+								FolderUserStore.error(
+									getNotification(error.code, '', Notifications.CantDeleteFolder)
 									+ '.\n' + error.message
 								);
 							}
@@ -159,31 +108,35 @@ export class UserSettingsFolders /*extends AbstractViewSettings*/ {
 		}
 	}
 
+	hideError() {
+		FolderUserStore.error('');
+	}
+
 	toggleFolderKolabType(folder, event) {
 		let type = event.target.value;
 		// TODO: append '.default' ?
 		Remote.request('FolderSetMetadata', null, {
-			Folder: folder.fullName,
-			Key: FolderMetadataKeys.KolabFolderType,
-			Value: type
+			folder: folder.fullName,
+			key: FolderMetadataKeys.KolabFolderType,
+			value: type
 		});
 		folder.kolabType(type);
 	}
 
 	toggleFolderSubscription(folder) {
-		let subscribe = !folder.subscribed();
+		let subscribe = !folder.isSubscribed();
 		Remote.request('FolderSubscribe', null, {
-			Folder: folder.fullName,
-			Subscribe: subscribe ? 1 : 0
+			folder: folder.fullName,
+			subscribe: subscribe ? 1 : 0
 		});
-		folder.subscribed(subscribe);
+		folder.isSubscribed(subscribe);
 	}
 
 	toggleFolderCheckable(folder) {
 		let checkable = !folder.checkable();
 		Remote.request('FolderCheckable', null, {
-			Folder: folder.fullName,
-			Checkable: checkable ? 1 : 0
+			folder: folder.fullName,
+			checkable: checkable ? 1 : 0
 		});
 		folder.checkable(checkable);
 	}
diff --git a/dev/Settings/User/General.js b/dev/Settings/User/General.js
index 28cb69176..d0f57062c 100644
--- a/dev/Settings/User/General.js
+++ b/dev/Settings/User/General.js
@@ -1,121 +1,192 @@
 import ko from 'ko';
 
-import { SaveSettingsStep } from 'Common/Enums';
-import { EditorDefaultType, Layout } from 'Common/EnumsUser';
+import { SMAudio } from 'Common/Audio';
+import { SaveSettingStatus } from 'Common/Enums';
+import { LayoutSideView, LayoutBottomView } from 'Common/EnumsUser';
+import { setRefreshFoldersInterval } from 'Common/Folders';
 import { Settings, SettingsGet } from 'Common/Globals';
-import { isArray } from 'Common/Utils';
+import { WYSIWYGS } from 'Common/HtmlEditor';
 import { addSubscribablesTo, addComputablesTo } from 'External/ko';
-import { i18n, trigger as translatorTrigger, translatorReload, convertLangName } from 'Common/Translator';
+import { i18n, translateTrigger, translatorReload, convertLangName } from 'Common/Translator';
+import { editIdentity } from 'Common/UtilsUser';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 import { showScreenPopup } from 'Knoin/Knoin';
 
 import { AppUserStore } from 'Stores/User/App';
 import { LanguageStore } from 'Stores/Language';
+import { FolderUserStore } from 'Stores/User/Folder';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { IdentityUserStore } from 'Stores/User/Identity';
 import { NotificationUserStore } from 'Stores/User/Notification';
-import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 
 import Remote from 'Remote/User/Fetch';
 
-import { IdentityPopupView } from 'View/Popup/Identity';
 import { LanguagesPopupView } from 'View/Popup/Languages';
 
 export class UserSettingsGeneral extends AbstractViewSettings {
 	constructor() {
 		super();
 
+		this.mailto = ko.observable(!!navigator.registerProtocolHandler);
+
 		this.language = LanguageStore.language;
 		this.languages = LanguageStore.languages;
-		this.messageReadDelay = SettingsUserStore.messageReadDelay;
-		this.messagesPerPage = SettingsUserStore.messagesPerPage;
+		this.hourCycle = LanguageStore.hourCycle;
 
-		this.editorDefaultType = SettingsUserStore.editorDefaultType;
-		this.layout = SettingsUserStore.layout;
-
-		this.soundNotification = NotificationUserStore.enableSoundNotification;
+		this.soundNotification = SMAudio.notifications;
 		this.notificationSound = ko.observable(SettingsGet('NotificationSound'));
-		this.notificationSounds = ko.observableArray(SettingsGet('NewMailSounds'));
+		this.notificationSounds = ko.observableArray(SettingsGet('newMailSounds'));
 
-		this.desktopNotification = NotificationUserStore.enableDesktopNotification;
-		this.isDesktopNotificationAllowed = NotificationUserStore.isDesktopNotificationAllowed;
+		this.minRefreshInterval = SettingsGet('minRefreshInterval');
+
+		this.desktopNotifications = NotificationUserStore.enabled;
+		this.isDesktopNotificationAllowed = NotificationUserStore.allowed;
+
+		const i18nSort = s => i18n('MESSAGE_LIST/SORT_'+s);
+		this.sortSupported = FolderUserStore.hasCapability('SORT');
+		this.sortOptions = [
+			{
+				value: '',
+				text: i18nSort('DATE_DESC')
+			},
+			{
+				value: 'DATE',
+				text: i18nSort('DATE_ASC')
+			},
+			{
+				value: 'FROM',
+				text: i18nSort('FROM_ASC')
+			},
+			{
+				value: 'REVERSE FROM',
+				text: i18nSort('FROM_DESC')
+			},
+			{
+				value: 'REVERSE SIZE',
+				text: i18nSort('SIZE_DESC')
+			},
+			{
+				value: 'SIZE',
+				text: i18nSort('SIZE_ASC')
+			},
+			{
+				value: 'SUBJECT',
+				text: i18nSort('SUBJECT_ASC')
+			},
+			{
+				value: 'REVERSE SUBJECT',
+				text: i18nSort('SUBJECT_DESC')
+			},
+			{
+				value: 'REVERSE ARRIVAL',
+				text: i18nSort('ARRIVAL_DESC')
+			},
+			{
+				value: 'ARRIVAL',
+				text: i18nSort('ARRIVAL_ASC')
+			}
+		];
 
-		this.viewHTML = SettingsUserStore.viewHTML;
-		this.showImages = SettingsUserStore.showImages;
-		this.removeColors = SettingsUserStore.removeColors;
-		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
 		this.threadsAllowed = AppUserStore.threadsAllowed;
-		this.useThreads = SettingsUserStore.useThreads;
-		this.replySameFolder = SettingsUserStore.replySameFolder;
-		this.allowLanguagesOnSettings = !!SettingsGet('AllowLanguagesOnSettings');
+		// 'THREAD=REFS', 'THREAD=REFERENCES', 'THREAD=ORDEREDSUBJECT'
+		this.threadAlgorithms = ko.observableArray();
+		FolderUserStore.capabilities.forEach(capa =>
+			capa.startsWith('THREAD=') && this.threadAlgorithms.push(capa.slice(7))
+		);
+		this.threadAlgorithms.sort((a, b) => a.length - b.length);
 
-		this.languageTrigger = ko.observable(SaveSettingsStep.Idle);
+		['defaultSort', 'useThreads', 'threadAlgorithm',
+		 // These use addSetting()
+		 'layout', 'messageReadDelay', 'messagesPerPage', 'checkMailInterval',
+		 'editorDefaultType', 'editorWysiwyg', 'msgDefaultAction', 'maxBlockquotesLevel', 'minFontSize',
+		 // These are in addSettings()
+		 'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
+		 'viewHTML', 'viewImages', 'viewImagesWhitelist', 'removeColors', 'allowStyles', 'allowDraftAutosave',
+		 'hideDeleted', 'listInlineAttachments', 'simpleAttachmentsList', 'collapseBlockquotes',
+		 'useCheckboxesInList', 'listGrouped', 'replySameFolder', 'allowSpellcheck',
+		 'messageReadAuto', 'showNextMessage', 'messageNewWindow', 'markdown'
+		].forEach(name => this[name] = SettingsUserStore[name]);
+
+		this.allowLanguagesOnSettings = !!SettingsGet('allowLanguagesOnSettings');
+
+		this.languageTrigger = ko.observable(SaveSettingStatus.Idle);
 
 		this.identities = IdentityUserStore;
 
+		this.wysiwygs = WYSIWYGS;
+
 		addComputablesTo(this, {
 			languageFullName: () => convertLangName(this.language()),
 
-			identityMain: () => {
-				const list = this.identities();
-				return isArray(list) ? list.find(item => item && !item.id()) : null;
-			},
-
 			identityMainDesc: () => {
-				const identity = this.identityMain();
-				return identity ? identity.formattedName() : '---';
+				const identity = IdentityUserStore.main();
+				return identity ? identity.toString() : '---';
 			},
 
 			editorDefaultTypes: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
-					{ id: EditorDefaultType.Html, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML') },
-					{ id: EditorDefaultType.Plain, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN') },
-					{ id: EditorDefaultType.HtmlForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_HTML_FORCED') },
-					{ id: EditorDefaultType.PlainForced, name: i18n('SETTINGS_GENERAL/LABEL_EDITOR_PLAIN_FORCED') }
+					{ id: 'Html', name: i18n('SETTINGS_GENERAL/EDITOR_HTML') },
+					{ id: 'Plain', name: i18n('SETTINGS_GENERAL/EDITOR_PLAIN') }
+				];
+			},
+
+			hasWysiwygs: () => 1 < WYSIWYGS().length,
+
+			msgDefaultActions: () => {
+				translateTrigger();
+				return [
+					{ id: 1, name: i18n('MESSAGE/BUTTON_REPLY') }, // ComposeType.Reply,
+					{ id: 2, name: i18n('MESSAGE/BUTTON_REPLY_ALL') } // ComposeType.ReplyAll
 				];
 			},
 
 			layoutTypes: () => {
-				translatorTrigger();
+				translateTrigger();
 				return [
-					{ id: Layout.NoPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_NO_SPLIT') },
-					{ id: Layout.SidePreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_VERTICAL_SPLIT') },
-					{ id: Layout.BottomPreview, name: i18n('SETTINGS_GENERAL/LABEL_LAYOUT_HORIZONTAL_SPLIT') }
+					{ id: 0, name: i18n('SETTINGS_GENERAL/LAYOUT_NO_SPLIT') },
+					{ id: LayoutSideView, name: i18n('SETTINGS_GENERAL/LAYOUT_VERTICAL_SPLIT') },
+					{ id: LayoutBottomView, name: i18n('SETTINGS_GENERAL/LAYOUT_HORIZONTAL_SPLIT') }
 				];
 			}
 		});
 
 		this.addSetting('EditorDefaultType');
+		this.addSetting('editorWysiwyg');
+		this.addSetting('MsgDefaultAction');
 		this.addSetting('MessageReadDelay');
 		this.addSetting('MessagesPerPage');
-		this.addSetting('Layout', () => MessagelistUserStore([]));
+		this.addSetting('CheckMailInterval');
+		this.addSetting('Layout');
+		this.addSetting('MaxBlockquotesLevel');
+		this.addSetting('minFontSize');
+		this.addSetting('defaultSort');
 
-		this.addSettings(['ViewHTML', 'ShowImages', 'UseCheckboxesInList', 'ReplySameFolder',
+		this.addSettings([
+			'requestReadReceipt', 'requestDsn', 'requireTLS', 'pgpSign', 'pgpEncrypt',
+			'ViewHTML', 'ViewImages', 'ViewImagesWhitelist', 'RemoveColors', 'AllowStyles', 'AllowDraftAutosave',
+			'HideDeleted', 'ListInlineAttachments', 'simpleAttachmentsList', 'CollapseBlockquotes',
+			'UseCheckboxesInList', 'listGrouped', 'ReplySameFolder', 'allowSpellcheck',
+			'messageReadAuto', 'showNextMessage', 'messageNewWindow', 'markdown',
 			'DesktopNotifications', 'SoundNotification']);
 
 		const fReloadLanguageHelper = (saveSettingsStep) => () => {
 				this.languageTrigger(saveSettingsStep);
-				setTimeout(() => this.languageTrigger(SaveSettingsStep.Idle), 1000);
+				setTimeout(() => this.languageTrigger(SaveSettingStatus.Idle), 1000);
 			};
 
 		addSubscribablesTo(this, {
 			language: value => {
-				this.languageTrigger(SaveSettingsStep.Animate);
-				translatorReload(false, value)
-					.then(fReloadLanguageHelper(SaveSettingsStep.TrueResult), fReloadLanguageHelper(SaveSettingsStep.FalseResult))
-					.then(() => Remote.saveSetting('Language', value));
+				this.languageTrigger(SaveSettingStatus.Saving);
+				translatorReload(value)
+					.then(fReloadLanguageHelper(SaveSettingStatus.Success), fReloadLanguageHelper(SaveSettingStatus.Failed))
+					.then(() => Remote.saveSetting('language', value));
 			},
 
-			removeColors: value => {
-				let dom = MessageUserStore.bodiesDom();
-				if (dom) {
-					dom.innerHTML = '';
-				}
-				Remote.saveSetting('RemoveColors', value);
-			},
+			hourCycle: value =>
+				Remote.saveSetting('hourCycle', value),
 
 			notificationSound: value => {
 				Remote.saveSetting('NotificationSound', value);
@@ -125,24 +196,43 @@ export class UserSettingsGeneral extends AbstractViewSettings {
 			useThreads: value => {
 				MessagelistUserStore([]);
 				Remote.saveSetting('UseThreads', value);
+			},
+
+			threadAlgorithm: value => {
+				MessagelistUserStore([]);
+				Remote.saveSetting('threadAlgorithm', value);
+			},
+
+			checkMailInterval: () => {
+				setRefreshFoldersInterval(SettingsUserStore.checkMailInterval());
 			}
 		});
 	}
 
 	editMainIdentity() {
-		const identity = this.identityMain();
-		identity && showScreenPopup(IdentityPopupView, [identity]);
+		editIdentity(IdentityUserStore.main());
 	}
 
 	testSoundNotification() {
-		NotificationUserStore.playSoundNotification(true);
+		SMAudio.playNotification(true);
 	}
 
 	testSystemNotification() {
-		NotificationUserStore.displayDesktopNotification('SnappyMail', 'Test notification');
+		NotificationUserStore.display('SnappyMail', 'Test notification');
 	}
 
 	selectLanguage() {
 		showScreenPopup(LanguagesPopupView, [this.language, this.languages(), LanguageStore.userLanguage()]);
 	}
+
+	registerMailto() {
+		console.log(`mailto = ${location.protocol}//${location.host}${location.pathname}?mailto`);
+		navigator.registerProtocolHandler(
+			'mailto',
+			`${location.protocol}//${location.host}${location.pathname}?mailto&to=%s`,
+			(SettingsGet('title') || 'SnappyMail')
+		);
+		alert(i18n('GLOBAL/DONE'));
+		this.mailto(0);
+	}
 }
diff --git a/dev/Settings/User/Security.js b/dev/Settings/User/Security.js
index 798be119b..337f65240 100644
--- a/dev/Settings/User/Security.js
+++ b/dev/Settings/User/Security.js
@@ -1,7 +1,7 @@
 import { koComputable } from 'External/ko';
 
 import { SettingsCapa } from 'Common/Globals';
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { i18n, translateTrigger, relativeTime } from 'Common/Translator';
 
 import { AbstractViewSettings } from 'Knoin/AbstractViews';
 
@@ -10,39 +10,36 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
 
-import Remote from 'Remote/User/Fetch';
-
 import { showScreenPopup } from 'Knoin/Knoin';
 
 import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
 import { OpenPgpGeneratePopupView } from 'View/Popup/OpenPgpGenerate';
 
+import { SMimeUserStore } from 'Stores/User/SMime';
+import { SMimeImportPopupView } from 'View/Popup/SMimeImport';
+
 export class UserSettingsSecurity extends AbstractViewSettings {
 	constructor() {
 		super();
 
-		this.capaAutoLogout = SettingsCapa('AutoLogout');
-
 		this.autoLogout = SettingsUserStore.autoLogout;
-
-		let i18nLogout = (key, params) => i18n('SETTINGS_SECURITY/AUTOLOGIN_' + key, params);
 		this.autoLogoutOptions = koComputable(() => {
-			translatorTrigger();
+			translateTrigger();
 			return [
-				{ id: 0, name: i18nLogout('NEVER_OPTION_NAME') },
-				{ id: 5, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 5 }) },
-				{ id: 10, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 10 }) },
-				{ id: 30, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 30 }) },
-				{ id: 60, name: i18nLogout('MINUTES_OPTION_NAME', { MINUTES: 60 }) },
-				{ id: 60 * 2, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 2 }) },
-				{ id: 60 * 5, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 5 }) },
-				{ id: 60 * 10, name: i18nLogout('HOURS_OPTION_NAME', { HOURS: 10 }) }
+				{ id: 0, name: i18n('SETTINGS_SECURITY/NEVER') },
+				{ id: 5, name: relativeTime(300) },
+				{ id: 15, name: relativeTime(900) },
+				{ id: 30, name: relativeTime(1800) },
+				{ id: 60, name: relativeTime(3600) },
+				{ id: 120, name: relativeTime(7200) },
+				{ id: 300, name: relativeTime(18000) },
+				{ id: 600, name: relativeTime(36000) }
 			];
 		});
+		this.addSetting('AutoLogout');
 
-		if (this.capaAutoLogout) {
-			this.addSetting('AutoLogout');
-		}
+		this.keyPassForget = SettingsUserStore.keyPassForget;
+		this.addSetting('keyPassForget');
 
 		this.gnupgPublicKeys = GnuPGUserStore.publicKeys;
 		this.gnupgPrivateKeys = GnuPGUserStore.privateKeys;
@@ -50,13 +47,11 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		this.openpgpkeysPublic = OpenPGPUserStore.publicKeys;
 		this.openpgpkeysPrivate = OpenPGPUserStore.privateKeys;
 
+		this.smimeCertificates = SMimeUserStore;
+
 		this.canOpenPGP = SettingsCapa('OpenPGP');
 		this.canGnuPG = GnuPGUserStore.isSupported();
 		this.canMailvelope = !!window.mailvelope;
-
-		this.allowDraftAutosave = SettingsUserStore.allowDraftAutosave;
-
-		this.allowDraftAutosave.subscribe(value => Remote.saveSetting('AllowDraftAutosave', value))
 	}
 
 	addOpenPgpKey() {
@@ -67,11 +62,25 @@ export class UserSettingsSecurity extends AbstractViewSettings {
 		showScreenPopup(OpenPgpGeneratePopupView);
 	}
 
+	importToOpenPGP() {
+		OpenPGPUserStore.loadBackupKeys();
+	}
+
+	importToSMime() {
+		showScreenPopup(SMimeImportPopupView);
+	}
+
 	onBuild() {
 		/**
 		 * Create an iframe to display the Mailvelope keyring settings.
 		 * The iframe will be injected into the container identified by selector.
 		 */
 		window.mailvelope && mailvelope.createSettingsContainer('#mailvelope-settings'/*[, keyring], options*/);
+		/**
+		 * https://github.com/the-djmaze/snappymail/issues/973
+		Remote.request('GetStoredPGPKeys', (iError, data) => {
+			console.dir([iError, data]);
+		});
+		*/
 	}
 }
diff --git a/dev/Settings/User/Themes.js b/dev/Settings/User/Themes.js
index 5e61f8b97..ed4fb33bb 100644
--- a/dev/Settings/User/Themes.js
+++ b/dev/Settings/User/Themes.js
@@ -1,12 +1,12 @@
 import { addObservablesTo } from 'External/ko';
 
-import { SaveSettingsStep, UploadErrorCode } from 'Common/Enums';
-import { changeTheme, convertThemeName } from 'Common/Utils';
+import { SaveSettingStatus, UploadErrorCode } from 'Common/Enums';
 import { themePreviewLink, serverRequest } from 'Common/Links';
 import { i18n } from 'Common/Translator';
 import { SettingsCapa } from 'Common/Globals';
 
-import { ThemeStore } from 'Stores/Theme';
+import { ThemeStore, convertThemeName, changeTheme } from 'Stores/Theme';
+import { addSubscribablesTo } from 'External/ko';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -22,6 +22,27 @@ addObservablesTo(themeBackground, {
 
 export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 	constructor() {
+		this.fontSansSerif = ThemeStore.fontSansSerif;
+		this.fontSerif = ThemeStore.fontSerif;
+		this.fontMono = ThemeStore.fontMono;
+		addSubscribablesTo(ThemeStore, {
+			fontSansSerif: value => {
+				Remote.saveSettings(null, {
+					fontSansSerif: value
+				});
+			},
+			fontSerif: value => {
+				Remote.saveSettings(null, {
+					fontSerif: value
+				});
+			},
+			fontMono: value => {
+				Remote.saveSettings(null, {
+					fontMono: value
+				});
+			}
+		});
+
 		this.theme = ThemeStore.theme;
 		this.themes = ThemeStore.themes;
 		this.themesObjects = ko.observableArray();
@@ -29,12 +50,10 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 		themeBackground.enabled = SettingsCapa('UserBackground');
 		this.background = themeBackground;
 
-		this.themeTrigger = ko.observable(SaveSettingsStep.Idle).extend({ debounce: 100 });
+		this.themeTrigger = ko.observable(SaveSettingStatus.Idle).extend({ debounce: 100 });
 
 		ThemeStore.theme.subscribe(value => {
-			this.themesObjects.forEach(theme => {
-				theme.selected(value === theme.name);
-			});
+			this.themesObjects.forEach(theme => theme.selected(value === theme.name));
 
 			changeTheme(value, this.themeTrigger);
 
@@ -44,6 +63,10 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 		});
 	}
 
+	setTheme(theme) {
+		ThemeStore.theme(theme.name);
+	}
+
 	onBuild() {
 		const currentTheme = ThemeStore.theme();
 
@@ -69,21 +92,15 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 				.on('onStart', () => {
 					themeBackground.loading(true);
 					themeBackground.error('');
-					return true;
 				})
 				.on('onComplete', (id, result, data) => {
 					themeBackground.loading(false);
-
-					if (result && id && data && data.Result && data.Result.Name && data.Result.Hash) {
-						themeBackground.name(data.Result.Name);
-						themeBackground.hash(data.Result.Hash);
-					} else {
-						themeBackground.name('');
-						themeBackground.hash('');
-
+					themeBackground.name(data?.Result?.name || '');
+					themeBackground.hash(data?.Result?.hash || '');
+					if (!themeBackground.name() || !themeBackground.hash()) {
 						let errorMsg = '';
-						if (data.ErrorCode) {
-							switch (data.ErrorCode) {
+						if (data.code) {
+							switch (data.code) {
 								case UploadErrorCode.FileIsTooBig:
 									errorMsg = i18n('SETTINGS_THEMES/ERROR_FILE_IS_TOO_BIG');
 									break;
@@ -94,14 +111,8 @@ export class UserSettingsThemes /*extends AbstractViewSettings*/ {
 							}
 						}
 
-						if (!errorMsg && data.ErrorMessage) {
-							errorMsg = data.ErrorMessage;
-						}
-
-						themeBackground.error(errorMsg || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
+						themeBackground.error(errorMsg || data.message || i18n('SETTINGS_THEMES/ERROR_UNKNOWN'));
 					}
-
-					return true;
 				});
 		}
 	}
diff --git a/dev/Sieve/Commands.js b/dev/Sieve/Commands.js
index 45c2199c2..e2c59e5fa 100644
--- a/dev/Sieve/Commands.js
+++ b/dev/Sieve/Commands.js
@@ -15,7 +15,6 @@ import {
 } from 'Sieve/Commands/Actions';
 
 import {
-	ConditionalCommand,
 	ElsIfCommand,
 	ElseCommand,
 	IfCommand,
@@ -49,6 +48,7 @@ import { NotifyCommand, ValidNotifyMethodTest, NotifyMethodCapabilityTest } from
 import { IHaveTest, ErrorCommand } from 'Sieve/Extensions/rfc5463';
 import { MailboxExistsTest, MetadataTest, MetadataExistsTest } from 'Sieve/Extensions/rfc5490';
 import { ForEveryPartCommand, BreakCommand, ReplaceCommand, EncloseCommand, ExtractTextCommand } from 'Sieve/Extensions/rfc5703';
+import { ValidExtListTest } from 'Sieve/Extensions/rfc6134';
 import { IncludeCommand, ReturnCommand, GlobalCommand } from 'Sieve/Extensions/rfc6609';
 
 export const
@@ -67,7 +67,6 @@ export const
 		IfCommand,
 		ElsIfCommand,
 		ElseCommand,
-		ConditionalCommand,
 		RequireCommand,
 		StopCommand,
 		// Action commands
@@ -129,6 +128,8 @@ export const
 		ReplaceCommand,
 		EncloseCommand,
 		ExtractTextCommand,
+		// rfc6134
+		ValidExtListTest,
 		// rfc6609
 		IncludeCommand,
 		ReturnCommand,
@@ -146,6 +147,17 @@ export const
 		return commands;
 	},
 
+	unavailableCommands = () => {
+		let commands = {};
+		AllCommands.forEach(cmd => {
+			const obj = new cmd, requires = obj.require;
+			if (requires && !(Array.isArray(requires) ? requires : [requires]).every(string => capa.includes(string))) {
+				commands[obj.identifier] = cmd;
+			}
+		});
+		return commands;
+	},
+
 	availableActions = () => {
 		let actions = {}, id;
 		AllCommands.forEach(cmd => {
diff --git a/dev/Sieve/Commands/Actions.js b/dev/Sieve/Commands/Actions.js
index 3d0665a7d..d38f5bcc3 100644
--- a/dev/Sieve/Commands/Actions.js
+++ b/dev/Sieve/Commands/Actions.js
@@ -21,6 +21,10 @@ export class FileIntoCommand extends ActionCommand
 		super();
 		// QuotedString / MultiLine
 		this._mailbox = new GrammarQuotedString();
+		// https://datatracker.ietf.org/doc/html/rfc3894
+		this.copy = false;
+		// https://datatracker.ietf.org/doc/html/rfc5490#section-3.2
+		this.create = false;
 	}
 
 	get require() { return 'fileinto'; }
@@ -28,9 +32,7 @@ export class FileIntoCommand extends ActionCommand
 	toString()
 	{
 		return 'fileinto'
-			// https://datatracker.ietf.org/doc/html/rfc3894
 			+ ((this.copy && capa.includes('copy')) ? ' :copy' : '')
-			// https://datatracker.ietf.org/doc/html/rfc5490#section-3.2
 			+ ((this.create && capa.includes('mailbox')) ? ' :create' : '')
 			+ ' ' + this._mailbox
 			+ ';';
@@ -64,15 +66,17 @@ export class RedirectCommand extends ActionCommand
 		super();
 		// QuotedString / MultiLine
 		this._address = new GrammarQuotedString();
+		// https://datatracker.ietf.org/doc/html/rfc3894
+		this.copy = false;
+		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
+		this.list = null;
 	}
 
 	toString()
 	{
 
 		return 'redirect'
-			// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
 //			+ ((this.list && capa.includes('extlists')) ? ' :list ' + this.list : '')
-			// https://datatracker.ietf.org/doc/html/rfc3894
 			+ ((this.copy && capa.includes('copy')) ? ' :copy' : '')
 			+ ' ' + this._address
 			+ ';';
diff --git a/dev/Sieve/Commands/Controls.js b/dev/Sieve/Commands/Controls.js
index bb2a17bc6..a82ed6f9a 100644
--- a/dev/Sieve/Commands/Controls.js
+++ b/dev/Sieve/Commands/Controls.js
@@ -5,6 +5,7 @@
 
 import {
 	ControlCommand,
+	GrammarCommands,
 	GrammarStringList,
 	GrammarQuotedString
 } from 'Sieve/Grammar';
@@ -16,37 +17,55 @@ import {
  *    elsif <test2: test> <block2: block>
  *    else <block3: block>
  */
-export class ConditionalCommand extends ControlCommand
+export /*abstract*/ class ConditionalCommand extends ControlCommand
 {
 	constructor()
 	{
-		super();
-		this.test = null;
-	}
-
-	toString()
-	{
-		return this.identifier + ' ' + this.test + ' ' + this.commands;
-	}
 /*
-	public function pushArguments(array $args): void
-	{
-		args.forEach((arg, i) => {
-			if (':' === args[i-1][0]) {
-				this[args[i-1].replace(':','_')].value = arg.value;
-			}
-		});
-		print_r($args);
-		exit;
-	}
+		if (this.constructor == ConditionalCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
 */
+		super();
+		this.commands = new GrammarCommands;
+	}
 }
 
 export class IfCommand extends ConditionalCommand
 {
+	constructor()
+	{
+		super();
+		this._test = null; // must be descendent instanceof TestCommand
+	}
+
+	get test()
+	{
+		return this._test;
+	}
+
+	set test(value)
+	{
+/*
+		if (!value instanceof TestCommand) {
+			throw Error("test must be descendent instanceof TestCommand.");
+		}
+*/
+		this._test = value;
+	}
+
+	toString()
+	{
+/*
+		if (!this._test instanceof TestCommand) {
+			throw Error("test must be descendent instanceof TestCommand.");
+		}
+*/
+		return this.identifier + ' ' + this._test + ' ' + this.commands;
+	}
 }
 
-export class ElsIfCommand extends ConditionalCommand
+export class ElsIfCommand extends IfCommand
 {
 }
 
diff --git a/dev/Sieve/Commands/Tests.js b/dev/Sieve/Commands/Tests.js
index 58791c14e..093b746a2 100644
--- a/dev/Sieve/Commands/Tests.js
+++ b/dev/Sieve/Commands/Tests.js
@@ -40,8 +40,8 @@ export class AddressTest extends TestCommand
 		this.header_list  = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
-//		this.index        = new GrammarNumber;
-//		this.last         = false;
+		this.index        = new GrammarNumber('');
+		this.last         = false;
 		// rfc5703#section-6
 //		this.mime
 //		this.anychild
@@ -67,10 +67,11 @@ export class AddressTest extends TestCommand
 			}
 		}
 		return result
-//			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.address_part
-			+ ' ' + this.match_type
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.header_list
 			+ ' ' + this.key_list;
 	}
@@ -88,7 +89,7 @@ export class AddressTest extends TestCommand
 				this.mime = true;
 			} else if (':anychild' === arg) {
 				this.anychild = true;
-			} else if (':index' === args[i-1]) {
+			} else if (i && ':index' === args[i-1]) {
 				this.index.value = arg.value;
 			}
 		});
@@ -147,9 +148,10 @@ export class EnvelopeTest extends TestCommand
 	toString()
 	{
 		return 'envelope'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.address_part
-			+ ' ' + this.match_type
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.envelope_part
 			+ ' ' + this.key_list;
 	}
@@ -205,7 +207,7 @@ export class ExistsTest extends TestCommand
 			if (':mime' === arg) {
 				this.mime = true;
 			} else if (':anychild' === arg) {
-				this.mime = true;
+				this.anychild = true;
 			}
 		});
 	}
@@ -234,8 +236,8 @@ export class HeaderTest extends TestCommand
 		this.header_names = new GrammarStringList;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
-//		this.index        = new GrammarNumber;
-//		this.last         = false;
+		this.index        = new GrammarNumber('');
+		this.last         = false;
 		// rfc5703#section-6
 		this.mime         = false;
 		this.anychild     = false;
@@ -278,9 +280,10 @@ export class HeaderTest extends TestCommand
 			}
 		}
 		return result
-//			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
+			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.header_names
 			+ ' ' + this.key_list;
 	}
@@ -294,7 +297,7 @@ export class HeaderTest extends TestCommand
 				this.address_part = arg;
 			} else if (':last' === arg) {
 				this.last = true;
-			} else if (':index' === args[i-1]) {
+			} else if (i && ':index' === args[i-1]) {
 				this.index.value = arg.value;
 			}
 		});
@@ -316,11 +319,6 @@ export class NotTest extends TestCommand
 	{
 		return 'not ' + this.test;
 	}
-
-	pushArguments()
-	{
-		throw 'No arguments';
-	}
 }
 
 /**
diff --git a/dev/Sieve/Extensions/rfc5173.js b/dev/Sieve/Extensions/rfc5173.js
index 23a6e9a68..d72b97f89 100644
--- a/dev/Sieve/Extensions/rfc5173.js
+++ b/dev/Sieve/Extensions/rfc5173.js
@@ -22,8 +22,9 @@ export class BodyTest extends TestCommand
 	toString()
 	{
 		return 'body'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + this.body_transform
 			+ ' ' + this.key_list;
 	}
@@ -34,7 +35,7 @@ export class BodyTest extends TestCommand
 			if (':raw' === arg || ':text' === arg) {
 				this.body_transform = arg;
 			} else if (arg instanceof GrammarStringList || arg instanceof GrammarString) {
-				if (':content' === args[i-1]) {
+				if (i && ':content' === args[i-1]) {
 					this.body_transform = ':content ' + arg;
 				} else {
 					this[args[i+1] ? 'content_list' : 'key_list'] = arg;
diff --git a/dev/Sieve/Extensions/rfc5183.js b/dev/Sieve/Extensions/rfc5183.js
index 7e8ff1388..65e51961b 100644
--- a/dev/Sieve/Extensions/rfc5183.js
+++ b/dev/Sieve/Extensions/rfc5183.js
@@ -13,24 +13,28 @@ export class EnvironmentTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.name     = new GrammarQuotedString;
+		this._name    = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
+	get name() { return this._name.value; }
+	set name(v) { this._name.value = v; }
+
 	get require() { return 'environment'; }
 
 	toString()
 	{
 		return 'environment'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.name
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.name     = args.pop();
+		this._name    = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5229.js b/dev/Sieve/Extensions/rfc5229.js
index bb23ab983..794260185 100644
--- a/dev/Sieve/Extensions/rfc5229.js
+++ b/dev/Sieve/Extensions/rfc5229.js
@@ -21,6 +21,12 @@ export class SetCommand extends ActionCommand
 
 	get require() { return 'variables'; }
 
+	get name()     { return this._name.value; }
+	set name(str)  { this._name.value = str; }
+
+	get value()    { return this._value.value; }
+	set value(str) { this._value.value = str; }
+
 	toString()
 	{
 		return 'set'
@@ -29,12 +35,6 @@ export class SetCommand extends ActionCommand
 			+ ' ' + this._value;
 	}
 
-	get name()     { return this._name.value; }
-	set name(str)  { this._name.value = str; }
-
-	get value()    { return this._value.value; }
-	set value(str) { this._value.value = str; }
-
 	pushArguments(args)
 	{
 		[':lower', ':upper', ':lowerfirst', ':upperfirst', ':quotewildcard', ':length'].forEach(modifier => {
@@ -57,8 +57,9 @@ export class StringTest extends TestCommand
 	toString()
 	{
 		return 'string'
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.source
 			+ ' ' + this.key_list;
 	}
diff --git a/dev/Sieve/Extensions/rfc5230.js b/dev/Sieve/Extensions/rfc5230.js
index 8b0b112eb..a5937a3bd 100644
--- a/dev/Sieve/Extensions/rfc5230.js
+++ b/dev/Sieve/Extensions/rfc5230.js
@@ -30,33 +30,6 @@ export class VacationCommand extends ActionCommand
 //	get require() { return ['vacation','vacation-seconds']; }
 	get require() { return 'vacation'; }
 
-	toString()
-	{
-		let result = 'vacation';
-		if (0 < this._seconds.value && capa.includes('vacation-seconds')) {
-			result += ' :seconds ' + this._seconds;
-		} else if (0 < this._days.value) {
-			result += ' :days ' + this._days;
-		}
-		if (this._subject.length) {
-			result += ' :subject ' + this._subject;
-		}
-		if (this._from.length) {
-			result += ' :from ' + this._from;
-//			result += ' :from ' + this.arguments[':from'];
-		}
-		if (this.addresses.length) {
-			result += ' :addresses ' + this.addresses;
-		}
-		if (this.mime) {
-			result += ' :mime';
-		}
-		if (this._handle.length) {
-			result += ' :handle ' + this._handle;
-		}
-		return result + ' ' + this._reason;
-	}
-
 	get days()      { return this._days.value; }
 	get seconds()   { return this._seconds.value; }
 	get subject()   { return this._subject.value; }
@@ -71,17 +44,44 @@ export class VacationCommand extends ActionCommand
 	set handle(str)  { this._handle.value = str; }
 	set reason(str)  { this._reason.value = str; }
 
+	toString()
+	{
+		let result = 'vacation';
+		if (0 < this._seconds.value && capa.includes('vacation-seconds')) {
+			result += ' :seconds ' + this._seconds;
+		} else if (0 < this._days.value) {
+			result += ' :days ' + this._days;
+		}
+		if (this._subject.length) {
+			result += ' :subject ' + this._subject;
+		}
+		if (this._from.length) {
+			result += ' :from ' + this._from;
+		}
+		if (this.addresses.length) {
+			result += ' :addresses ' + this.addresses;
+		}
+		if (this.mime) {
+			result += ' :mime';
+		}
+		if (this._handle.length) {
+			result += ' :handle ' + this._handle;
+		}
+		return result + ' ' + this._reason;
+	}
+
 	pushArguments(args)
 	{
 		this._reason.value = args.pop().value; // GrammarQuotedString
 		args.forEach((arg, i) => {
 			if (':mime' === arg) {
 				this.mime = true;
-			} else if (':addresses' === args[i-1]) {
+			} else if (i && ':addresses' === args[i-1]) {
 				this.addresses = arg; // GrammarStringList
-			} else if (':' === args[i-1][0]) {
+			} else if (i && ':' === args[i-1][0]) {
 				// :days, :seconds, :subject, :from, :handle
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5232.js b/dev/Sieve/Extensions/rfc5232.js
index 0206dba06..ea56261f5 100644
--- a/dev/Sieve/Extensions/rfc5232.js
+++ b/dev/Sieve/Extensions/rfc5232.js
@@ -23,7 +23,8 @@ class FlagCommand extends ActionCommand
 
 	toString()
 	{
-		return this.identifier + ' ' + this._variablename + ' ' + this.list_of_flags + ';';
+		let name = this._variablename;
+		return this.identifier + (name.length ? ' ' + this.variablename : '') + ' ' + this.list_of_flags + ';';
 	}
 
 	get variablename()
@@ -42,11 +43,12 @@ class FlagCommand extends ActionCommand
 			if (args[0] instanceof GrammarQuotedString) {
 				this._variablename = args[0];
 			}
-			if (args[1] instanceof GrammarString) {
-				this.list_of_flags = args[1];
-			}
-		} else if (args[0] instanceof GrammarString) {
+			args[0] = args[1];
+		}
+		if (args[0] instanceof GrammarStringList) {
 			this.list_of_flags = args[0];
+		} else if (args[0]) {
+			this.list_of_flags.push(args[0]);
 		}
 	}
 }
@@ -77,8 +79,9 @@ export class HasFlagTest extends TestCommand
 	toString()
 	{
 		return 'hasflag'
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
 			+ ' ' + this.variable_list
 			+ ' ' + this.list_of_flags;
 	}
diff --git a/dev/Sieve/Extensions/rfc5235.js b/dev/Sieve/Extensions/rfc5235.js
index 5561a1a5e..ac1e8406e 100644
--- a/dev/Sieve/Extensions/rfc5235.js
+++ b/dev/Sieve/Extensions/rfc5235.js
@@ -4,7 +4,6 @@
 
 import {
 	GrammarQuotedString,
-	GrammarString,
 	TestCommand
 } from 'Sieve/Grammar';
 
@@ -14,19 +13,23 @@ export class SpamTestTest extends TestCommand
 	{
 		super();
 		this.percent = false, // 0 - 100 else 0 - 10
-		this.value = new GrammarQuotedString;
+		this._value = new GrammarQuotedString;
 	}
 
 //	get require() { return this.percent ? 'spamtestplus' : 'spamtest'; }
-	get require() { return /:value|:count/.test(this.match_type) ? ['spamtestplus','relational'] : 'spamtestplus'; }
+	get require() { return /:value|:count/.test(this._match_type) ? ['spamtestplus','relational'] : 'spamtestplus'; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
 
 	toString()
 	{
 		return 'spamtest'
 			+ (this.percent ? ' :percent' : '')
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.value;
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._value;
 	}
 
 	pushArguments(args)
@@ -34,8 +37,8 @@ export class SpamTestTest extends TestCommand
 		args.forEach(arg => {
 			if (':percent' === arg) {
 				this.percent = true;
-			} else if (arg instanceof GrammarString) {
-				this.value = arg;
+			} else if (arg instanceof GrammarQuotedString) {
+				this._value = arg;
 			}
 		});
 	}
@@ -46,24 +49,28 @@ export class VirusTestTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.value = new GrammarQuotedString; // 1 - 5
+		this._value = new GrammarQuotedString; // 1 - 5
 	}
 
-	get require() { return /:value|:count/.test(this.match_type) ? ['virustest','relational'] : 'virustest'; }
+	get require() { return ':value' == this._match_type ? ['virustest','relational'] : 'virustest'; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
 
 	toString()
 	{
 		return 'virustest'
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.value;
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._value;
 	}
 
 	pushArguments(args)
 	{
 		args.forEach(arg => {
-			if (arg instanceof GrammarString) {
-				this.value = arg;
+			if (arg instanceof GrammarQuotedString) {
+				this._value = arg;
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5260.js b/dev/Sieve/Extensions/rfc5260.js
index d54736fa2..2745a2087 100644
--- a/dev/Sieve/Extensions/rfc5260.js
+++ b/dev/Sieve/Extensions/rfc5260.js
@@ -14,10 +14,10 @@ export class DateTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.zone         = new GrammarQuotedString;
+		this._zone        = new GrammarQuotedString;
 		this.originalzone = false;
-		this.header_name  = new GrammarQuotedString;
-		this.date_part    = new GrammarQuotedString;
+		this._header_name = new GrammarQuotedString;
+		this._date_part   = new GrammarQuotedString;
 		this.key_list     = new GrammarStringList;
 		// rfc5260#section-6
 		this.index        = new GrammarNumber;
@@ -27,31 +27,41 @@ export class DateTest extends TestCommand
 //	get require() { return ['date','index']; }
 	get require() { return 'date'; }
 
+	get zone() { return this._zone.value; }
+	set zone(v) { this._zone.value = v; }
+
+	get header_name() { return this._header_name.value; }
+	set header_name(v) { this._header_name.value = v; }
+
+	get date_part() { return this._date_part.value; }
+	set date_part(v) { this._date_part.value = v; }
+
 	toString()
 	{
 		return 'date'
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
-			+ (this.originalzone ? ' :originalzone' : (this.zone.length ? ' :zone ' + this.zone : ''))
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.header_name
-			+ ' ' + this.date_part
+			+ (this.originalzone ? ' :originalzone' : (this._zone.length ? ' :zone ' + this._zone : ''))
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._header_name
+			+ ' ' + this._date_part
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.date_part = args.pop();
-		this.header_name = args.pop();
+		this._date_part = args.pop();
+		this._header_name = args.pop();
 		args.forEach((arg, i) => {
 			if (':originalzone' === arg) {
 				this.originalzone = true;
 			} else if (':last' === arg) {
 				this.last = true;
-			} else if (':zone' === args[i-1]) {
-				this.zone.value = arg.value;
-			} else if (':index' === args[i-1]) {
+			} else if (i && ':zone' === args[i-1]) {
+				this._zone.value = arg.value;
+			} else if (i && ':index' === args[i-1]) {
 				this.index.value = arg.value;
 			}
 		});
@@ -63,30 +73,37 @@ export class CurrentDateTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.zone       = new GrammarQuotedString;
-		this.date_part  = new GrammarQuotedString;
+		this._zone      = new GrammarQuotedString;
+		this._date_part = new GrammarQuotedString;
 		this.key_list   = new GrammarStringList;
 	}
 
 	get require() { return 'date'; }
 
+	get zone() { return this._zone.value; }
+	set zone(v) { this._zone.value = v; }
+
+	get date_part() { return this._date_part.value; }
+	set date_part(v) { this._date_part.value = v; }
+
 	toString()
 	{
 		return 'currentdate'
-			+ (this.zone.length ? ' :zone ' + this.zone : '')
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.match_type
-			+ ' ' + this.date_part
+			+ (this._zone.length ? ' :zone ' + this._zone : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ ' ' + this._date_part
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.date_part = args.pop();
+		this._date_part = args.pop();
 		args.forEach((arg, i) => {
-			if (':zone' === args[i-1]) {
-				this.zone.value = arg.value;
+			if (i && ':zone' === args[i-1]) {
+				this._zone.value = arg.value;
 			}
 		});
 	}
diff --git a/dev/Sieve/Extensions/rfc5293.js b/dev/Sieve/Extensions/rfc5293.js
index 25634faf4..8b9a6a1b8 100644
--- a/dev/Sieve/Extensions/rfc5293.js
+++ b/dev/Sieve/Extensions/rfc5293.js
@@ -16,24 +16,30 @@ export class AddHeaderCommand extends ActionCommand
 	{
 		super();
 		this.last       = false;
-		this.field_name = new GrammarQuotedString;
-		this.value      = new GrammarQuotedString;
+		this._field_name = new GrammarQuotedString;
+		this._value      = new GrammarQuotedString;
 	}
 
 	get require() { return 'editheader'; }
 
+	get field_name() { return this._field_name.value; }
+	set field_name(v) { this._field_name.value = v; }
+
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
+
 	toString()
 	{
 		return this.identifier
 			+ (this.last ? ' :last' : '')
-			+ ' ' + this.field_name
-			+ ' ' + this.value + ';';
+			+ ' ' + this._field_name
+			+ ' ' + this._value + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.value = args.pop();
-		this.field_name = args.pop();
+		this._value = args.pop();
+		this._field_name = args.pop();
 		this.last = args.includes(':last');
 	}
 }
@@ -47,19 +53,22 @@ export class DeleteHeaderCommand extends ActionCommand
 		this.last           = false;
 		this.comparator     = '',
 		this.match_type     = ':is',
-		this.field_name     = new GrammarQuotedString;
+		this._field_name    = new GrammarQuotedString;
 		this.value_patterns = new GrammarStringList;
 	}
 
 	get require() { return 'editheader'; }
 
+	get field_name() { return this._field_name.value; }
+	set field_name(v) { this._field_name.value = v; }
+
 	toString()
 	{
 		return this.identifier
 			+ (this.last ? ' :last' : (this.index.value ? ' :index ' + this.index : ''))
 			+ (this.comparator ? ' :comparator ' + this.comparator : '')
 			+ ' ' + this.match_type
-			+ ' ' + this.field_name
+			+ ' ' + this._field_name
 			+ ' ' + this.value_patterns + ';';
 	}
 
@@ -69,17 +78,17 @@ export class DeleteHeaderCommand extends ActionCommand
 		args.forEach((arg, i) => {
 			if (':last' === arg) {
 				this.last = true;
-			} else if (':index' === args[i-1]) {
+			} else if (i && ':index' === args[i-1]) {
 				this.index.value = arg.value;
 				args[i] = null;
 			}
 		});
 
-		if (args[l-1] instanceof GrammarString) {
-			this.field_name = args[l-1];
+		if (l && args[l-1] instanceof GrammarString) {
+			this._field_name = args[l-1];
 			this.value_patterns = args[l];
 		} else {
-			this.field_name = args[l];
+			this._field_name = args[l];
 		}
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5429.js b/dev/Sieve/Extensions/rfc5429.js
index d422f2eb8..d33aead7c 100644
--- a/dev/Sieve/Extensions/rfc5429.js
+++ b/dev/Sieve/Extensions/rfc5429.js
@@ -8,10 +8,7 @@ import {
 	GrammarString
 } from 'Sieve/Grammar';
 
-/**
- * https://tools.ietf.org/html/rfc5429#section-2.1
- */
-export class ErejectCommand extends ActionCommand
+class /*abstract*/ rfc5429Command extends ActionCommand
 {
 	constructor()
 	{
@@ -19,11 +16,9 @@ export class ErejectCommand extends ActionCommand
 		this._reason = new GrammarQuotedString;
 	}
 
-	get require() { return 'ereject'; }
-
 	toString()
 	{
-		return 'ereject ' + this._reason + ';';
+		return this.require + ' ' + this._reason + ';';
 	}
 
 	get reason()
@@ -44,38 +39,18 @@ export class ErejectCommand extends ActionCommand
 	}
 }
 
+/**
+ * https://tools.ietf.org/html/rfc5429#section-2.1
+ */
+export class ErejectCommand extends rfc5429Command
+{
+	get require() { return 'ereject'; }
+}
+
 /**
  * https://tools.ietf.org/html/rfc5429#section-2.2
  */
-export class RejectCommand extends ActionCommand
+export class RejectCommand extends rfc5429Command
 {
-	constructor()
-	{
-		super();
-		this._reason = new GrammarQuotedString;
-	}
-
 	get require() { return 'reject'; }
-
-	toString()
-	{
-		return 'reject ' + this._reason + ';';
-	}
-
-	get reason()
-	{
-		return this._reason.value;
-	}
-
-	set reason(value)
-	{
-		this._reason.value = value;
-	}
-
-	pushArguments(args)
-	{
-		if (args[0] instanceof GrammarString) {
-			this._reason = args[0];
-		}
-	}
 }
diff --git a/dev/Sieve/Extensions/rfc5435.js b/dev/Sieve/Extensions/rfc5435.js
index 4adcdb72a..b6f040096 100644
--- a/dev/Sieve/Extensions/rfc5435.js
+++ b/dev/Sieve/Extensions/rfc5435.js
@@ -26,14 +26,16 @@ export class NotifyCommand extends ActionCommand
 	}
 
 	get method()     { return this._method.value; }
-	get from()       { return this._from.value; }
-	get importance() { return this._importance.value; }
-	get message()    { return this._message.value; }
+	set method(str)  { this._method.value = str; }
 
-	set method(str)     { this._method.value = str; }
-	set from(str)       { this._from.value = str; }
+	get from()       { return this._from.value; }
+	set from(str)    { this._from.value = str; }
+
+	get importance() { return this._importance.value; }
 	set importance(int) { this._importance.value = int; }
-	set message(str)    { this._message.value = str; }
+
+	get message()    { return this._message.value; }
+	set message(str) { this._message.value = str; }
 
 	get require() { return 'enotify'; }
 
@@ -59,11 +61,12 @@ export class NotifyCommand extends ActionCommand
 	{
 		this._method.value = args.pop().value; // GrammarQuotedString
 		args.forEach((arg, i) => {
-			if (':options' === args[i-1]) {
+			if (i && ':options' === args[i-1]) {
 				this.options = arg; // GrammarStringList
-			} else if (':' === args[i-1][0]) {
+			} else if (i && ':' === args[i-1][0]) {
 				// :from, :importance, :message
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -99,25 +102,32 @@ export class NotifyMethodCapabilityTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.notification_uri = new GrammarQuotedString;
-		this.notification_capability = new GrammarQuotedString;
+		this._notification_uri = new GrammarQuotedString;
+		this._notification_capability = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
+	get notification_uri() { return this._notification_uri.value; }
+	set notification_uri(v) { this._notification_uri.value = v; }
+
+	get notification_capability() { return this._notification_capability.value; }
+	set notification_capability(v) { this._notification_capability.value = v; }
+
 	toString()
 	{
 		return 'valid_notify_method '
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ (this.match_type ? ' ' + this.match_type : '')
-			+ this.notification_uri
-			+ this.notification_capability
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ this._notification_uri
+			+ this._notification_capability
 			+ this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.notification_capability = args.pop();
-		this.notification_uri = args.pop();
+		this._notification_capability = args.pop();
+		this._notification_uri = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5463.js b/dev/Sieve/Extensions/rfc5463.js
index 68166f275..31d91f47a 100644
--- a/dev/Sieve/Extensions/rfc5463.js
+++ b/dev/Sieve/Extensions/rfc5463.js
@@ -41,18 +41,21 @@ export class ErrorCommand extends ControlCommand
 	constructor()
 	{
 		super();
-		this.message = new GrammarQuotedString;
+		this._message = new GrammarQuotedString;
 	}
 
 	get require() { return 'ihave'; }
 
+	get message() { return this._message.value; }
+	set message(v) { this._message.value = v; }
+
 	toString()
 	{
-		return 'error ' + this.message + ';';
+		return 'error ' + this._message + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.message = args.pop();
+		this._message = args.pop();
 	}
 }
diff --git a/dev/Sieve/Extensions/rfc5490.js b/dev/Sieve/Extensions/rfc5490.js
index 14a087b1d..94f7605b7 100644
--- a/dev/Sieve/Extensions/rfc5490.js
+++ b/dev/Sieve/Extensions/rfc5490.js
@@ -42,28 +42,35 @@ export class MetadataTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.mailbox = new GrammarQuotedString;
-		this.annotation_name = new GrammarQuotedString;
+		this._mailbox = new GrammarQuotedString;
+		this._annotation_name = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
 	get require() { return 'mboxmetadata'; }
 
+	get mailbox() { return this._mailbox.value; }
+	set mailbox(v) { this._mailbox.value = v; }
+
+	get annotation_name() { return this._annotation_name.value; }
+	set annotation_name(v) { this._annotation_name.value = v; }
+
 	toString()
 	{
 		return 'metadata '
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.mailbox
-			+ ' ' + this.annotation_name
+			+ ' ' + this._match_type
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ ' ' + this._mailbox
+			+ ' ' + this._annotation_name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.annotation_name = args.pop();
-		this.mailbox = args.pop();
+		this._annotation_name = args.pop();
+		this._mailbox = args.pop();
 	}
 }
 
@@ -75,23 +82,26 @@ export class MetadataExistsTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.mailbox = new GrammarQuotedString;
+		this._mailbox = new GrammarQuotedString;
 		this.annotation_names = new GrammarStringList;
 	}
 
 	get require() { return 'mboxmetadata'; }
 
+	get mailbox() { return this._mailbox.value; }
+	set mailbox(v) { this._mailbox.value = v; }
+
 	toString()
 	{
 		return 'metadataexists '
-			+ ' ' + this.mailbox
+			+ ' ' + this._mailbox
 			+ ' ' + this.annotation_names;
 	}
 
 	pushArguments(args)
 	{
 		this.annotation_names = args.pop();
-		this.mailbox = args.pop();
+		this._mailbox = args.pop();
 	}
 }
 
@@ -103,25 +113,29 @@ export class ServerMetadataTest extends TestCommand
 	constructor()
 	{
 		super();
-		this.annotation_name = new GrammarQuotedString;
+		this._annotation_name = new GrammarQuotedString;
 		this.key_list = new GrammarStringList;
 	}
 
 	get require() { return 'servermetadata'; }
 
+	get annotation_name() { return this._annotation_name.value; }
+	set annotation_name(v) { this._annotation_name.value = v; }
+
 	toString()
 	{
 		return 'servermetadata '
-			+ ' ' + this.match_type
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ ' ' + this.annotation_name
+			+ ' ' + this._match_type
+			+ (this.relational_match ? ' ' + this.relational_match : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ ' ' + this._annotation_name
 			+ ' ' + this.key_list;
 	}
 
 	pushArguments(args)
 	{
 		this.key_list = args.pop();
-		this.annotation_name = args.pop();
+		this._annotation_name = args.pop();
 	}
 }
 
diff --git a/dev/Sieve/Extensions/rfc5703.js b/dev/Sieve/Extensions/rfc5703.js
index 202d3e902..552e04c2f 100644
--- a/dev/Sieve/Extensions/rfc5703.js
+++ b/dev/Sieve/Extensions/rfc5703.js
@@ -5,6 +5,7 @@
 import {
 	ActionCommand,
 	ControlCommand,
+	GrammarCommands,
 	GrammarNumber,
 	GrammarQuotedString,
 	GrammarString,
@@ -19,7 +20,8 @@ export class ForEveryPartCommand extends ControlCommand
 	constructor()
 	{
 		super();
-		this._name = new GrammarString;
+		this.name = new GrammarString;
+		this.commands = new GrammarCommands;
 	}
 
 	get require() { return 'foreverypart'; }
@@ -27,8 +29,8 @@ export class ForEveryPartCommand extends ControlCommand
 	toString()
 	{
 		let result = 'foreverypart';
-		if (this._subject.length) {
-			result += ' :name ' + this._name;
+		if (this.name.length) {
+			result += ' :name ' + this.name;
 		}
 		return result + ' ' + this.commands;
 	}
@@ -37,19 +39,22 @@ export class ForEveryPartCommand extends ControlCommand
 	{
 		args.forEach((arg, i) => {
 			if (':name' === arg) {
-				this._name.value = args[i+1].value;
+				this.name.value = args[i+1].value;
 			}
 		});
 	}
 }
 
+/**
+ * Must be inside foreverypart
+ */
 export class BreakCommand extends ForEveryPartCommand
 {
 	toString()
 	{
 		let result = 'break';
-		if (this._subject.length) {
-			result += ' :name ' + this._name;
+		if (this.name.length) {
+			result += ' :name ' + this.name;
 		}
 		return result + ';';
 	}
@@ -63,14 +68,23 @@ export class ReplaceCommand extends ActionCommand
 	constructor()
 	{
 		super();
-		this.mime        = false;
-		this._subject    = new GrammarQuotedString;
-		this._from       = new GrammarQuotedString;
-		this.replacement = new GrammarQuotedString;
+		this.mime         = false;
+		this._subject     = new GrammarQuotedString;
+		this._from        = new GrammarQuotedString;
+		this._replacement = new GrammarQuotedString;
 	}
 
 	get require() { return 'replace'; }
 
+	get subject()     { return this._subject.value; }
+	set subject(str)  { this._subject.value = str; }
+
+	get from()        { return this._from.value; }
+	set from(str)     { this._from.value = str; }
+
+	get replacement()    { return this._replacement.value; }
+	set replacement(str) { this._replacement.value = str; }
+
 	toString()
 	{
 		let result = 'replace';
@@ -82,20 +96,20 @@ export class ReplaceCommand extends ActionCommand
 		}
 		if (this._from.length) {
 			result += ' :from ' + this._from;
-//			result += ' :from ' + this.arguments[':from'];
 		}
-		return result + this.replacement + ';';
+		return result + this._replacement + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.replacement = args.pop();
+		this._replacement = args.pop();
 		args.forEach((arg, i) => {
 			if (':mime' === arg) {
 				this.mime = true;
-			} else if (':' === args[i-1][0]) {
+			} else if (i && ':' === args[i-1][0]) {
 				// :subject, :from
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -115,6 +129,9 @@ export class EncloseCommand extends ActionCommand
 
 	get require() { return 'enclose'; }
 
+	get subject()  { return this._subject.value; }
+	set subject(v) { this._subject.value = v; }
+
 	toString()
 	{
 		let result = 'enclose';
@@ -130,9 +147,10 @@ export class EncloseCommand extends ActionCommand
 	pushArguments(args)
 	{
 		args.forEach((arg, i) => {
-			if (':' === args[i-1][0]) {
+			if (i && ':' === args[i-1][0]) {
 				// :subject, :headers
-				this[args[i-1].replace(':','_')].value = arg.value;
+				let p = args[i-1].replace(':','_');
+				this[p] ? (this[p].value = arg.value) : console.log('Unknown VacationCommand :' + p);
 			}
 		});
 	}
@@ -140,6 +158,7 @@ export class EncloseCommand extends ActionCommand
 
 /**
  * https://datatracker.ietf.org/doc/html/rfc5703#section-7
+ * Should be inside foreverypart, else empty and flagged as a compilation error
  */
 export class ExtractTextCommand extends ActionCommand
 {
@@ -148,9 +167,12 @@ export class ExtractTextCommand extends ActionCommand
 		super();
 		this.modifiers = [];
 		this._first    = new GrammarNumber;
-		this.varname   = new GrammarQuotedString;
+		this._varname  = new GrammarQuotedString;
 	}
 
+	get varname()  { return this._varname.value; }
+	set varname(v) { this._varname.value = v; }
+
 	get require() { return 'extracttext'; }
 
 	toString()
@@ -160,17 +182,17 @@ export class ExtractTextCommand extends ActionCommand
 		if (0 < this._first.value) {
 			result += ' :first ' + this._first;
 		}
-		return result + ' ' + this.varname + ';';
+		return result + ' ' + this._varname + ';';
 	}
 
 	pushArguments(args)
 	{
-		this.varname = args.pop();
+		this._varname = args.pop();
 		[':lower', ':upper', ':lowerfirst', ':upperfirst', ':quotewildcard', ':length'].forEach(modifier => {
 			args.includes(modifier) && this.modifiers.push(modifier);
 		});
 		args.forEach((arg, i) => {
-			if (':' === args[i-1][0]) {
+			if (i && ':' === args[i-1][0]) {
 				// :first
 				this[args[i-1].replace(':','_')].value = arg.value;
 			}
diff --git a/dev/Sieve/Extensions/rfc6134.js b/dev/Sieve/Extensions/rfc6134.js
index 872938eab..1bdb7c8b0 100644
--- a/dev/Sieve/Extensions/rfc6134.js
+++ b/dev/Sieve/Extensions/rfc6134.js
@@ -14,7 +14,7 @@ export class ValidExtListTest extends TestCommand
 {
 	constructor()
 	{
-		super();
+		super('valid_ext_list');
 		this.ext_list_names = new GrammarStringList;
 	}
 
diff --git a/dev/Sieve/Extensions/rfc6609.js b/dev/Sieve/Extensions/rfc6609.js
index 1f96ada30..8d7fd74ae 100644
--- a/dev/Sieve/Extensions/rfc6609.js
+++ b/dev/Sieve/Extensions/rfc6609.js
@@ -16,27 +16,30 @@ export class IncludeCommand extends ControlCommand
 		this.global = false; // ':personal' / ':global';
 		this.once = false;
 		this.optional = false;
-		this.value = new GrammarQuotedString;
+		this._value = new GrammarQuotedString;
 	}
 
 	get require() { return 'include'; }
 
+	get value() { return this._value.value; }
+	set value(v) { this._value.value = v; }
+
 	toString()
 	{
 		return 'include'
 			+ (this.global ? ' :global' : '')
 			+ (this.once ? ' :once' : '')
 			+ (this.optional ? ' :optional' : '')
-			+ ' ' + this.value + ';';
+			+ ' ' + this._value + ';';
 	}
 
 	pushArguments(args)
 	{
 		args.forEach(arg => {
 			if (':global' === arg || ':once' === arg || ':optional' === arg) {
-				this[arg.substr(1)] = true;
+				this[arg.slice(1)] = true;
 			} else if (arg instanceof GrammarQuotedString) {
-				this.value = arg;
+				this._value = arg;
 			}
 		});
 	}
diff --git a/dev/Sieve/Grammar.js b/dev/Sieve/Grammar.js
index f610c260e..595a34bda 100644
--- a/dev/Sieve/Grammar.js
+++ b/dev/Sieve/Grammar.js
@@ -9,7 +9,7 @@ import {
 	MULTILINE_DOTSTART
 } from 'Sieve/RegEx';
 
-import { arrayToString, getMatchTypes } from 'Sieve/Utils';
+import { arrayToString, getMatchTypes, getComparators } from 'Sieve/Utils';
 
 /**
  * abstract
@@ -18,7 +18,7 @@ export class GrammarString /*extends String*/
 {
 	constructor(value = '')
 	{
-		this._value = value;
+		this._value = value.toString ? value.toString() : value;
 	}
 
 	toString()
@@ -45,41 +45,41 @@ export class GrammarString /*extends String*/
 /**
  * abstract
  */
-export class GrammarComment extends GrammarString
+export /*abstract*/ class GrammarComment extends GrammarString
 {
+/*
+	constructor()
+	{
+		if (this.constructor == GrammarComment) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-2.9
  */
-export class GrammarCommand
+const cmdNameSuffix = /(test|command|action)$/;
+export /*abstract*/ class GrammarCommand
 {
 	constructor(identifier)
 	{
-		this.identifier = identifier || this.constructor.name.toLowerCase().replace(/(test|command|action)$/, '');
-		this.arguments = [];
-		this.commands = new GrammarCommands;
+/*
+		if (this.constructor == GrammarCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+*/
+		this.identifier = identifier || this.constructor.name.toLowerCase().replace(cmdNameSuffix, '');
 	}
 
 	toString()
 	{
 		let result = this.identifier;
-		if (this.arguments.length) {
+		if (this.arguments?.length) {
 			result += ' ' + arrayToString(this.arguments, ' ');
 		}
-		return result + (
-			this.commands.length ? ' ' + this.commands : ';'
-		);
-	}
-
-	getComparators()
-	{
-		return ['i;ascii-casemap'];
-	}
-
-	getMatchTypes()
-	{
-		return [':is', ':contains', ':matches'];
+		return result + ';';
 	}
 
 	pushArguments(args)
@@ -108,83 +108,107 @@ export class GrammarCommands extends Array
 /**
  * https://tools.ietf.org/html/rfc5228#section-3
  */
-export class ControlCommand extends GrammarCommand
+export /*abstract*/ class ControlCommand extends GrammarCommand
 {
+/*
 	constructor(identifier)
 	{
-		super(identifier);
-		this.commands = new GrammarCommands;
-	}
-
-	toString()
-	{
-		let result = this.identifier;
-		if (this.arguments.length) {
-			result += ' ' + arrayToString(this.arguments, ' ');
+		if (this.constructor == ControlCommand) {
+			throw Error("Abstract class can't be instantiated.");
 		}
-		return result + (
-			this.commands.length ? ' ' + this.commands : ';'
-		);
-	}
-
-	getComparators()
-	{
-		return ['i;ascii-casemap'];
-	}
-
-	getMatchTypes()
-	{
-		return [':is', ':contains', ':matches'];
-	}
-
-	pushArguments(args)
-	{
-		this.arguments = args;
+		super(identifier);
 	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-4
  */
-export class ActionCommand extends GrammarCommand
+export /*abstract*/ class ActionCommand extends GrammarCommand
 {
+/*
 	constructor(identifier)
 	{
+		if (this.constructor == ActionCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
 		super(identifier);
 	}
-
-	toString()
-	{
-		let result = this.identifier;
-		if (this.arguments.length) {
-			result += ' ' + arrayToString(this.arguments, ' ');
-		}
-		return result + ';'
-	}
+*/
 }
 
 /**
  * https://tools.ietf.org/html/rfc5228#section-5
  */
-export class TestCommand extends GrammarCommand
+export /*abstract*/ class TestCommand extends GrammarCommand
 {
 	constructor(identifier)
 	{
+/*
+		if (this.constructor == TestCommand) {
+			throw Error("Abstract class can't be instantiated.");
+		}
+*/
 		super(identifier);
 		// Almost every test has a comparator and match_type, so define them here
-		this.comparator = '';
-		this.match_type = ':is';
+		this._comparator = '';
+		this._match_type = '';
+		this.relational_match = ''; // GrammarQuotedString DQUOTE ( "gt" / "ge" / "lt" / "le" / "eq" / "ne" ) DQUOTE
+	}
+
+	get require() { return /:value|:count/.test(this._match_type) ? 'relational' : ''; }
+
+	get match_type()
+	{
+		return this._match_type;
+	}
+	set match_type(value)
+	{
+		// default?
+		if (':is' == value) {
+			value = '';
+		}
+		if (value.length && !getMatchTypes(0).includes(value)) {
+			throw 'Unsupported match-type ' + value;
+		}
+		if (':list' == value) {
+			this._comparator = '';
+		}
+		if (':count' != value && ':value' != value) {
+			this.relational_match = '';
+		}
+		this._match_type = value;
+	}
+
+	get comparator()
+	{
+		return this._comparator;
+	}
+	set comparator(value)
+	{
+		if (!(value instanceof GrammarQuotedString)) {
+			value = new GrammarQuotedString(value);
+		}
+		// default?
+		if (value.length && 'i;ascii-casemap' != value.value) {
+			if (':list' == this._match_type) {
+				throw 'Comparator not allowed when using :list';
+			}
+			if (!getComparators().includes(value.value)) {
+				throw 'Unsupported comparator ' + value;
+			}
+			this._comparator = value;
+		} else {
+			this._comparator = '';
+		}
 	}
 
 	toString()
 	{
-		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
-		if (!getMatchTypes().includes(this.match_type)) {
-			throw 'Unsupported match-type ' + this.match_type;
-		}
 		return (this.identifier
-			+ (this.comparator ? ' :comparator ' + this.comparator : '')
-			+ (this.match_type ? ' ' + this.match_type : '')
+			+ (this._comparator ? ' :comparator ' + this._comparator : '')
+			+ (this._match_type ? ' ' + this._match_type : '')
+			+ (this.relational_match ? ' ' + this.relational_match : '')
 			+ ' ' + arrayToString(this.arguments, ' ')).trim();
 	}
 }
@@ -201,7 +225,7 @@ export class GrammarTestList extends Array
 //			return '(\r\n\t' + arrayToString(this, ',\r\n\t') + '\r\n)';
 			return '(' + this.join(', ') + ')';
 		}
-		return this.length ? this[0] : '';
+		return this.length ? this[0].toString() : '';
 	}
 
 	push(value)
@@ -256,15 +280,16 @@ export class GrammarStringList extends Array
 {
 	toString()
 	{
+		// if there is only a single string, the brackets are optional
 		if (1 < this.length) {
 			return '[' + this.join(',') + ']';
 		}
-		return this.length ? this[0] : '';
+		return this.length ? this[0].toString() : '';
 	}
 
 	push(value)
 	{
-		if (!(value instanceof GrammarString)) {
+		if (!(value instanceof GrammarQuotedString)) {
 			value = new GrammarQuotedString(value);
 		}
 		super.push(value);
@@ -291,10 +316,14 @@ GrammarStringList.fromString = list => {
 
 export class GrammarQuotedString extends GrammarString
 {
+	constructor(value = '')
+	{
+		super(value instanceof GrammarQuotedString ? value.value : value);
+	}
+
 	toString()
 	{
 		return '"' + this._value.replace(/[\\"]/g, '\\$&') + '"';
-//		return '"' + super.toString().replace(/[\\"]/g, '\\$&') + '"';
 	}
 }
 
@@ -329,3 +358,23 @@ GrammarMultiLine.fromString = string => {
 	}
 	return new GrammarMultiLine();
 }
+
+export class UnknownCommand extends GrammarCommand
+{
+	constructor(identifier)
+	{
+		super(identifier);
+		this.commands = new GrammarCommands;
+	}
+
+	toString()
+	{
+		let result = this.identifier;
+		if (this.arguments?.length) {
+			result += ' ' + arrayToString(this.arguments, ' ');
+		}
+		return result + (
+			this.commands?.length ? ' ' + this.commands : ';'
+		);
+	}
+}
diff --git a/dev/Sieve/Model/Abstract.js b/dev/Sieve/Model/Abstract.js
index 4df08e039..3130fd175 100644
--- a/dev/Sieve/Model/Abstract.js
+++ b/dev/Sieve/Model/Abstract.js
@@ -22,10 +22,10 @@ export class AbstractModel {
 	constructor() {
 /*
 		if (new.target === AbstractModel) {
-			throw new Error("Can't instantiate AbstractModel!");
+			throw Error("Can't instantiate AbstractModel!");
 		}
 */
-		this.disposables = [];
+		Object.defineProperty(this, 'disposables', {value: []});
 	}
 
 	addObservables(observables) {
@@ -46,14 +46,13 @@ export class AbstractModel {
 	onDestroy() {
 		/** dispose ko subscribables */
 		this.disposables.forEach(disposable => {
-			disposable && typeof disposable.dispose === 'function' && disposable.dispose();
+			typeof disposable?.dispose === 'function' && disposable.dispose();
 		});
 		/** clear object entries */
 //		forEachObjectEntry(this, (key, value) => {
 		forEachObjectValue(this, value => {
 			/** clear CollectionModel */
-			let arr = ko.isObservableArray(value) ? value() : value;
-			arr && arr.onDestroy && arr.onDestroy();
+			(ko.isObservableArray(value) ? value() : value)?.onDestroy?.();
 			/** destroy ko.observable/ko.computed? */
 //			dispose(value);
 			/** clear object value */
@@ -78,16 +77,14 @@ export class AbstractModel {
 	 */
 	static reviveFromJson(json) {
 		let obj = this.validJson(json) ? new this() : null;
-		obj && obj.revivePropertiesFromJson(json);
+		obj?.revivePropertiesFromJson(json);
 		return obj;
 	}
 
 	revivePropertiesFromJson(json) {
-		let model = this.constructor;
-		if (!model.validJson(json)) {
-			return false;
-		}
-		forEachObjectEntry(json, (key, value) => {
+		const model = this.constructor,
+			valid = model.validJson(json);
+		valid && forEachObjectEntry(json, (key, value) => {
 			if ('@' !== key[0]) try {
 				key = key[0].toLowerCase() + key.slice(1);
 				switch (typeof this[key])
@@ -105,9 +102,12 @@ export class AbstractModel {
 				case 'string':
 					this[key] = typeCast(this[key], value);
 					break;
-					// fall through
 				case 'undefined':
-				default:
+					console.log(`Undefined ${model.name}.${key} not set`);
+//					this[key] = value;
+					break;
+//				default:
+//					console.log((typeof this[key])+` ${model.name}.${key} not revived`);
 //					console.log((typeof this[key])+' '+(model.name)+'.'+key+' not revived');
 				}
 			} catch (e) {
@@ -115,7 +115,7 @@ export class AbstractModel {
 				console.error(e);
 			}
 		});
-		return true;
+		return valid;
 	}
 
 }
diff --git a/dev/Sieve/Model/Filter.js b/dev/Sieve/Model/Filter.js
index 809e0030d..8b13b7262 100644
--- a/dev/Sieve/Model/Filter.js
+++ b/dev/Sieve/Model/Filter.js
@@ -36,11 +36,9 @@ export class FilterModel extends AbstractModel {
 		this.addObservables({
 			enabled: true,
 			askDelete: false,
-			canBeDeleted: true,
 
 			name: '',
 			nameError: false,
-			nameFocused: false,
 
 			conditionsType: FilterRulesType.Any,
 
@@ -54,10 +52,10 @@ export class FilterModel extends AbstractModel {
 			actionValueFourth: '',
 			actionValueFourthError: false,
 
-			actionMarkAsRead: false,
+			markAsRead: false,
 
-			actionKeep: true,
-			actionNoStop: false,
+			keep: true,
+			stop: true,
 
 			actionType: FilterAction.MoveTo
 		});
@@ -66,7 +64,7 @@ export class FilterModel extends AbstractModel {
 
 		const fGetRealFolderName = folderFullName => {
 //			const folder = getFolderFromCacheList(folderFullName);
-//			return folder ? folder.fullName.replace('.' === folder.delimiter ? /\./ : /[\\/]+/, ' / ') : folderFullName;
+//			return folder?.fullName.replace('.' === folder.delimiter ? /\./ : /[\\/]+/, ' / ') : folderFullName;
 			return folderFullName;
 		};
 
@@ -182,27 +180,6 @@ export class FilterModel extends AbstractModel {
 		return true;
 	}
 
-	toJson() {
-		return {
-//			'@Object': 'Object/Filter',
-			ID: this.id,
-			Enabled: this.enabled() ? 1 : 0,
-			Name: this.name(),
-			Conditions: this.conditions.map(item => item.toJson()),
-			ConditionsType: this.conditionsType(),
-
-			ActionType: this.actionType(),
-			ActionValue: this.actionValue(),
-			ActionValueSecond: this.actionValueSecond(),
-			ActionValueThird: this.actionValueThird(),
-			ActionValueFourth: this.actionValueFourth(),
-
-			Keep: this.actionKeep() ? 1 : 0,
-			Stop: this.actionNoStop() ? 0 : 1,
-			MarkAsRead: this.actionMarkAsRead() ? 1 : 0
-		};
-	}
-
 	addCondition() {
 		this.conditions.push(new FilterConditionModel());
 	}
@@ -211,8 +188,22 @@ export class FilterModel extends AbstractModel {
 		this.conditions.remove(oConditionToDelete);
 	}
 
-	setRecipients() {
-//		this.actionValueFourth(AccountUserStore.getEmailAddresses().join(', '));
+	toJSON() {
+		return {
+			ID: this.id,
+			Enabled: this.enabled(),
+			Name: this.name(),
+			Conditions: this.conditions(),
+			ConditionsType: this.conditionsType(),
+			ActionType: this.actionType(),
+			ActionValue: this.actionValue(),
+			ActionValueSecond: this.actionValueSecond(),
+			ActionValueThird: this.actionValueThird(),
+			ActionValueFourth: this.actionValueFourth(),
+			Keep: this.keep(),
+			Stop: this.stop(),
+			MarkAsRead: this.markAsRead()
+		};
 	}
 
 	/**
@@ -221,21 +212,23 @@ export class FilterModel extends AbstractModel {
 	 * @returns {?FilterModel}
 	 */
 	static reviveFromJson(json) {
+		json.id = json.ID;
+		delete json.ID;
 		const filter = super.reviveFromJson(json);
 		if (filter) {
-			filter.id = filter.id ? '' + filter.id : '';
+			filter.id = '' + (filter.id || '');
 			filter.conditions(
-				json.Conditions ? json.Conditions.map(aData => FilterConditionModel.reviveFromJson(aData)).filter(v => v) : []
+				(json.Conditions || json.conditions || []).map(condition => {
+					condition['@Object'] = 'Object/FilterCondition';
+					return FilterConditionModel.reviveFromJson(condition)
+				}).filter(v => v)
 			);
-			filter.actionKeep(0 != json.Keep);
-			filter.actionNoStop(0 == json.Stop);
-			filter.actionMarkAsRead(1 == json.MarkAsRead);
 		}
 		return filter;
 	}
 
-	cloneSelf() {
-		const filter = new FilterModel();
+	assignTo(target) {
+		const filter = target || new FilterModel();
 
 		filter.id = this.id;
 
@@ -246,7 +239,7 @@ export class FilterModel extends AbstractModel {
 
 		filter.conditionsType(this.conditionsType());
 
-		filter.actionMarkAsRead(this.actionMarkAsRead());
+		filter.markAsRead(this.markAsRead());
 
 		filter.actionType(this.actionType());
 
@@ -257,8 +250,8 @@ export class FilterModel extends AbstractModel {
 		filter.actionValueThird(this.actionValueThird());
 		filter.actionValueFourth(this.actionValueFourth());
 
-		filter.actionKeep(this.actionKeep());
-		filter.actionNoStop(this.actionNoStop());
+		filter.keep(this.keep());
+		filter.stop(this.stop());
 
 		filter.conditions(this.conditions.map(item => item.cloneSelf()));
 
diff --git a/dev/Sieve/Model/FilterCondition.js b/dev/Sieve/Model/FilterCondition.js
index 5ee0806aa..e068214b0 100644
--- a/dev/Sieve/Model/FilterCondition.js
+++ b/dev/Sieve/Model/FilterCondition.js
@@ -79,11 +79,8 @@ export class FilterConditionModel extends AbstractModel {
 		return true;
 	}
 
-//	static reviveFromJson(json) {}
-
-	toJson() {
+	toJSON() {
 		return {
-//			'@Object': 'Object/FilterCondition',
 			Field: this.field(),
 			Type: this.type(),
 			Value: this.value(),
@@ -91,6 +88,8 @@ export class FilterConditionModel extends AbstractModel {
 		};
 	}
 
+//	static reviveFromJson(json) {}
+
 	cloneSelf() {
 		const filterCond = new FilterConditionModel();
 
diff --git a/dev/Sieve/Model/Script.js b/dev/Sieve/Model/Script.js
index 2314b27bf..d9182dd98 100644
--- a/dev/Sieve/Model/Script.js
+++ b/dev/Sieve/Model/Script.js
@@ -17,8 +17,8 @@ function filtersToSieveScript(filters)
 			''
 		];
 
-	const quote = string => '"' + string.trim().replace(/(\\|")/, '\\\\$1') + '"';
-	const StripSpaces = string => string.replace(/\s+/, ' ').trim();
+	const quote = string => '"' + string.replace(/(\\|")/g, '\\$1') + '"';
+	const StripSpaces = string => string.replace(/\s+/, ' ');
 
 	// conditionToSieveScript
 	const conditionToString = (condition, require) =>
@@ -26,8 +26,8 @@ function filtersToSieveScript(filters)
 		let result = '',
 			type = condition.type(),
 			field = condition.field(),
-			value = condition.value().trim(),
-			valueSecond = condition.valueSecond().trim();
+			value = condition.value(),
+			valueSecond = condition.valueSecond();
 
 		if (value.length && ('Header' !== field || valueSecond.length)) {
 			switch (type)
@@ -85,7 +85,7 @@ function filtersToSieveScript(filters)
 			}
 
 			if (('From' === field || 'Recipient' === field) && value.includes(',')) {
-				result += ' [' + value.split(',').map(value => quote(value)).join(', ').trim() + ']';
+				result += ' [' + value.split(',').map(value => quote(value)).join(', ') + ']';
 			} else if ('Size' === field) {
 				result += ' ' + value;
 			} else {
@@ -125,12 +125,12 @@ function filtersToSieveScript(filters)
 		// actions
 		block ? result.push('{') : (sTab = '');
 
-		if (filter.actionMarkAsRead() && ['None','MoveTo','Forward'].includes(filter.actionType())) {
+		if (filter.markAsRead() && ['None','MoveTo','Forward'].includes(filter.actionType())) {
 			require.imap4flags = 1;
 			result.push(sTab + 'addflag "\\\\Seen";');
 		}
 
-		let value = filter.actionValue().trim();
+		let value = filter.actionValue();
 		value = value.length ? quote(value) : 0;
 		switch (filter.actionType())
 		{
@@ -146,21 +146,21 @@ function filtersToSieveScript(filters)
 					let days = 1,
 						subject = '',
 						addresses = '',
-						paramValue = filter.actionValueSecond().trim();
+						paramValue = filter.actionValueSecond();
 
 					if (paramValue.length) {
 						subject = ':subject ' + quote(StripSpaces(paramValue)) + ' ';
 					}
 
-					paramValue = (filter.actionValueThird() || '').trim();
+					paramValue = ('' + (filter.actionValueThird() || ''));
 					if (paramValue.length) {
 						days = Math.max(1, parseInt(paramValue, 10));
 					}
 
-					paramValue = (filter.actionValueFourth() || '').trim()
+					paramValue = ('' + (filter.actionValueFourth() || ''))
 					if (paramValue.length) {
 						paramValue = paramValue.split(',').map(email =>
-							email.trim().length ? quote(email) : ''
+							email.length ? quote(email) : ''
 						).filter(email => email.length);
 						if (paramValue.length) {
 							addresses = ':addresses [' + paramValue.join(', ') + '] ';
@@ -182,7 +182,7 @@ function filtersToSieveScript(filters)
 				break; }
 			case 'Forward':
 				if (value) {
-					if (filter.actionKeep()) {
+					if (filter.keep()) {
 						require.fileinto = 1;
 						result.push(sTab + 'fileinto "INBOX";');
 					}
@@ -201,7 +201,7 @@ function filtersToSieveScript(filters)
 				break;
 		}
 
-		filter.actionNoStop() || result.push(sTab + 'stop;');
+		filter.stop() && result.push(sTab + 'stop;');
 
 		block && result.push('}');
 
@@ -213,7 +213,7 @@ function filtersToSieveScript(filters)
 			'/*',
 			'BEGIN:FILTER:' + filter.id,
 			'BEGIN:HEADER',
-			btoa(unescape(encodeURIComponent(JSON.stringify(filter.toJson())))).match(split).join(eol) + 'END:HEADER',
+			btoa(unescape(encodeURIComponent(JSON.stringify(filter)))).match(split).join(eol) + 'END:HEADER',
 			'*/',
 			filter.enabled() ? '' : '/* @Filter is disabled ',
 			filterToString(filter, require),
@@ -228,7 +228,7 @@ function filtersToSieveScript(filters)
 }
 
 // fileStringToCollection
-function sieveScriptToFilters(script)
+function rainloopScriptToFilters(script)
 {
 	let regex = /BEGIN:HEADER([\s\S]+?)END:HEADER/gm,
 		filters = [],
@@ -239,7 +239,6 @@ function sieveScriptToFilters(script)
 			json = decodeURIComponent(escape(atob(json[1].replace(/\s+/g, ''))));
 			if (json && json.length && (json = JSON.parse(json))) {
 				json['@Object'] = 'Object/Filter';
-				json.Conditions.forEach(condition => condition['@Object'] = 'Object/FilterCondition');
 				filter = FilterModel.reviveFromJson(json);
 				filter && filters.push(filter);
 			}
@@ -261,7 +260,6 @@ export class SieveScriptModel extends AbstractModel
 			exists: false,
 			nameError: false,
 			askDelete: false,
-			canBeDeleted: true,
 			hasChanges: false
 		});
 
@@ -280,22 +278,17 @@ export class SieveScriptModel extends AbstractModel
 //		this.body(filtersToSieveScript(this.filters));
 	}
 
-	rawToFilters() {
-		return sieveScriptToFilters(this.body());
-//		this.filters(sieveScriptToFilters(this.body()));
-	}
-
 	verify() {
-		this.nameError(!this.name().trim());
+		this.nameError(!this.name());
 		return !this.nameError();
 	}
 
-	toJson() {
+	toJSON() {
 		return {
-			name: this.name(),
-			active: this.active() ? 1 : 0,
-			body: this.body(),
-			filters: this.filters.map(item => item.toJson())
+			name: this.name,
+			active: this.active,
+			body: this.body
+//			body: this.allowFilters() ? this.body() : this.filtersToRaw()
 		};
 	}
 
@@ -315,15 +308,8 @@ export class SieveScriptModel extends AbstractModel
 		const script = super.reviveFromJson(json);
 		if (script) {
 			if (script.allowFilters()) {
-				script.filters(
-					Array.isArray(json.filters) && json.filters.length
-						? json.filters.map(aData => FilterModel.reviveFromJson(aData)).filter(v => v)
-						: sieveScriptToFilters(script.body())
-				);
-			} else {
-				script.filters([]);
+				script.filters(rainloopScriptToFilters(script.body()));
 			}
-			script.canBeDeleted(SIEVE_FILE_NAME !== json.name);
 			script.exists(true);
 			script.hasChanges(false);
 		}
diff --git a/dev/Sieve/Parser.js b/dev/Sieve/Parser.js
index a6b00968e..8515d28b6 100644
--- a/dev/Sieve/Parser.js
+++ b/dev/Sieve/Parser.js
@@ -18,6 +18,7 @@ import {
 import {
 	GrammarBracketComment,
 	GrammarCommand,
+	GrammarComment,
 	GrammarHashComment,
 	GrammarMultiLine,
 	GrammarNumber,
@@ -27,8 +28,8 @@ import {
 	GrammarTestList
 } from 'Sieve/Grammar';
 
-import { availableCommands } from 'Sieve/Commands';
-import { ConditionalCommand, RequireCommand } from 'Sieve/Commands/Controls';
+import { availableCommands, unavailableCommands } from 'Sieve/Commands';
+import { ConditionalCommand, IfCommand, RequireCommand } from 'Sieve/Commands/Controls';
 import { NotTest } from 'Sieve/Commands/Tests';
 
 const
@@ -92,6 +93,7 @@ export const parseScript = (script, name = 'script.sieve') => {
 
 	// Only activate available commands
 	const Commands = availableCommands();
+	const disabledCommands = unavailableCommands();
 
 	let match,
 		line = 1,
@@ -110,25 +112,27 @@ export const parseScript = (script, name = 'script.sieve') => {
 		error = message => {
 //			throw new SyntaxError(message + ' at ' + regex.lastIndex + ' line ' + line, name, line)
 			throw new SyntaxError(message + ' on line ' + line
-				+ ' around:\n\n' + script.substr(regex.lastIndex - 20, 30), name, line)
+				+ ' around:\n\n' + script.slice(regex.lastIndex - 20, regex.lastIndex + 10), name, line)
 		},
 		pushArg = arg => {
 			command || error('Argument not part of command');
 			let prev_arg = args[args.length-1];
 			if (getMatchTypes(0).includes(arg)) {
 				command.match_type = arg;
-			} else if (':value' === prev_arg || ':count' === prev_arg) {
-				// Sieve relational [RFC5231] match types
-				/^(gt|ge|lt|le|eq|ne)$/.test(arg.value) || error('Invalid relational match-type ' + arg);
-				command.match_type = prev_arg + ' ' + arg;
+			} else if (getMatchTypes(0).includes(prev_arg)) {
 				--args.length;
-//				requires.push('relational');
+				if (':value' === prev_arg || ':count' === prev_arg) {
+					// Sieve relational [RFC5231] match types
+					/^"(gt|ge|lt|le|eq|ne)"$/.test(arg) || error('Invalid relational match-type ' + arg);
+					command.relational_match = arg;
+//					requires.push('relational');
+					return;
+				}
 			} else if (':comparator' === prev_arg) {
 				command.comparator = arg;
 				--args.length;
-			} else {
-				args.push(arg);
 			}
+			args.push(arg);
 		},
 		pushArgs = () => {
 			if (args.length) {
@@ -154,27 +158,30 @@ export const parseScript = (script, name = 'script.sieve') => {
 			pushArgs();
 			value = value.toLowerCase();
 			let new_command;
-			if ('if' === value) {
-				new_command = new ConditionalCommand(value);
-			} else if ('elsif' === value || 'else' === value) {
-//				(prev_command instanceof ConditionalCommand) || error('Not after IF condition');
-				new_command = new ConditionalCommand(value);
-			} else if (Commands[value]) {
+			if (Commands[value]) {
+				if ('elsif' === value || 'else' === value) {
+					let valid = false, cmd = (command ? command?.commands : tree), i = cmd?.length;
+					while (i) {
+						cmd[--i];
+						if (cmd[i] instanceof IfCommand) {
+							valid = true;
+							break;
+						} else if (typeof cmd[i] !== 'string' && !(cmd[i] instanceof GrammarComment)) {
+							break;
+						}
+					}
+					valid || error('Not after IF/ELSIF condition');
+				}
 				if ('allof' === value || 'anyof' === value) {
 //					(command instanceof ConditionalCommand || command instanceof NotTest) || error('Test-list not in conditional');
 				}
 				new_command = new Commands[value]();
+			} else if (disabledCommands[value]) {
+				console.error('Unsupported command: ' + value);
+				new_command = new disabledCommands[value]();
 			} else {
-				if (command && (
-				    command instanceof ConditionalCommand
-				 || command instanceof NotTest
-				 || command.tests instanceof GrammarTestList)) {
-					console.error('Unknown test: ' + value);
-					new_command = new TestCommand(value);
-				} else {
-					console.error('Unknown command: ' + value);
-					new_command = new GrammarCommand(value);
-				}
+				console.error('Unknown command: ' + value);
+				new_command = new GrammarCommand(value);
 			}
 
 			if (new_command instanceof TestCommand) {
@@ -192,7 +199,7 @@ export const parseScript = (script, name = 'script.sieve') => {
 				if (command.commands) {
 					command.commands.push(new_command);
 				} else {
-					error('commands not allowed in "' + command.identifier + '" command');
+					error('command "' + new_command.identifier + '" not allowed in "' + command.identifier + '" command');
 				}
 			} else {
 				tree.push(new_command);
@@ -219,7 +226,8 @@ export const parseScript = (script, name = 'script.sieve') => {
 			pushArg(GrammarMultiLine.fromString(value));
 			break;
 		case T_QUOTED_STRING:
-			pushArg(new GrammarQuotedString(value.substr(1,value.length-2)));
+			try { value = JSON.parse(value); } catch(e) { console.error(e, value); }
+			pushArg(new GrammarQuotedString(value));
 			break;
 		case T_NUMBER:
 			pushArg(new GrammarNumber(value));
@@ -229,8 +237,8 @@ export const parseScript = (script, name = 'script.sieve') => {
 		case T_BRACKET_COMMENT:
 		case T_HASH_COMMENT: {
 			let obj = (T_HASH_COMMENT == type)
-				? new GrammarHashComment(value.substr(1).trim())
-				: new GrammarBracketComment(value.substr(2, value.length-4));
+				? new GrammarHashComment(value.slice(1).trim())
+				: new GrammarBracketComment(value.slice(2, -2));
 			if (command) {
 				if (!command.comments) {
 					command.comments = [];
@@ -268,7 +276,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 			break;
 		case T_BLOCK_END:
 			(command instanceof ConditionalCommand) || error(TokenError[type]);
-//			prev_command = command;
 			command = levels.up();
 			break;
 
@@ -293,5 +300,6 @@ export const parseScript = (script, name = 'script.sieve') => {
 	}
 
 	tree.requires = requires;
+	tree.toString = () => tree.join('\r\n');
 	return tree;
 };
diff --git a/dev/Sieve/Utils.js b/dev/Sieve/Utils.js
index 4002b9e15..5f5d13f07 100644
--- a/dev/Sieve/Utils.js
+++ b/dev/Sieve/Utils.js
@@ -12,7 +12,7 @@ export const
 		data = ko.observableArray(data);
 		data.subscribe(changes =>
 			changes.forEach(item =>
-				'deleted' === item.status && null == item.moved && item.value.onDestroy && item.value.onDestroy()
+				'deleted' === item.status && null == item.moved && item.value.onDestroy?.()
 			)
 		, data, 'arrayChange');
 		return data;
@@ -22,16 +22,16 @@ export const
 	koComputable = fn => ko.computed(fn, {'pure':true}),
 
 	arrayToString = (arr, separator) =>
-		arr.map(item => item.toString ? item.toString() : item).join(separator),
+		(arr || []).map(item => item.toString?.() || item).join(separator),
 /*
 	getNotificationMessage = code => {
-		let key = getKeyByValue(Notification, code);
+		let key = getKeyByValue(Notifications, code);
 		return key ? I18N_DATA.NOTIFICATIONS[i18nKey(key).replace('_NOTIFICATION', '_ERROR')] : '';
 		rl.i18n('NOTIFICATIONS/')
 	},
 	getNotification = (code, message = '', defCode = 0) => {
 		code = parseInt(code, 10) || 0;
-		if (Notification.ClientViewError === code && message) {
+		if (Notifications.ClientViewError === code && message) {
 			return message;
 		}
 
@@ -58,11 +58,33 @@ export const
 		serverErrorDesc(text);
 	},
 
+	getComparators = (validOnly = 0) => {
+		let result = [
+			// Default
+			'i;ascii-casemap',
+		];
+		if (capa.includes('relational') || !validOnly) {
+			result.push('i;octet');
+		}
+		if (capa.includes('comparator-i;ascii-numeric') || !validOnly) {
+			result.push('i;ascii-numeric');
+		}
+		if (capa.includes('comparator-i;unicode-casemap') || !validOnly) {
+			result.push('i;unicode-casemap');
+		}
+		return result;
+	},
+
 	getMatchTypes = (validOnly = 1) => {
 		let result = [':is',':contains',':matches'];
 		// https://datatracker.ietf.org/doc/html/rfc6134#section-2.3
+		// Only available for tests with a key_list property
 		if (capa.includes('extlists') || !validOnly) {
 			result.push(':list');
 		}
+		if (capa.includes('relational') || !validOnly) {
+			result.push(':value');
+			result.push(':count');
+		}
 		return result;
 	};
diff --git a/dev/Sieve/View/Filter.js b/dev/Sieve/View/Filter.js
index 9c3a5493b..41bf85998 100644
--- a/dev/Sieve/View/Filter.js
+++ b/dev/Sieve/View/Filter.js
@@ -13,23 +13,20 @@ import {
 const
 	// import { defaultOptionsAfterRender } from 'Common/Utils';
 	defaultOptionsAfterRender = (domItem, item) =>
-		domItem && item && undefined !== item.disabled
-		&& domItem.classList.toggle('disabled', domItem.disabled = item.disabled),
+		item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled),
 
 	// import { folderListOptionsBuilder } from 'Common/Folders';
 	/**
-	 * @param {Array=} aDisabled
-	 * @param {Array=} aHeaderLines
-	 * @param {Function=} fRenameCallback
 	 * @returns {Array}
 	 */
-	folderListOptionsBuilder = (
-		aDisabled,
-		aHeaderLines,
-		fRenameCallback
-	) => {
+	folderListOptionsBuilder = () => {
 		const
-			aResult = [],
+			aResult = [{
+				id: '',
+				name: '',
+				system: false,
+				disabled: false
+			}],
 			sDeepPrefix = '\u00A0\u00A0\u00A0',
 			showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
 
@@ -38,11 +35,9 @@ const
 					if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
 						aResult.push({
 							id: oItem.fullName,
-							name:
-								sDeepPrefix.repeat(oItem.deep) +
-								fRenameCallback(oItem),
+							name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(),
 							system: false,
-							disabled: !oItem.selectable() || aDisabled.includes(oItem.fullName)
+							disabled: !oItem.selectable()
 						});
 					}
 
@@ -53,18 +48,6 @@ const
 			};
 
 
-		fRenameCallback = fRenameCallback || (oItem => oItem.name());
-		Array.isArray(aDisabled) || (aDisabled = []);
-
-		Array.isArray(aHeaderLines) && aHeaderLines.forEach(line =>
-			aResult.push({
-				id: line[0],
-				name: line[1],
-				system: false,
-				disabled: false
-			})
-		);
-
 		// FolderUserStore.folderList()
 		foldersWalk(window.Sieve.folderList() || []);
 
@@ -83,13 +66,7 @@ export class FilterPopupView extends rl.pluginPopupView {
 		});
 
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
-		this.folderSelectList = koComputable(() =>
-			folderListOptionsBuilder(
-				[rl.settings.get('SieveAllowFileintoInbox') ? '' : 'INBOX'],
-				[['', '']],
-				item => item ? item.localName() : ''
-			)
-		);
+		this.folderSelectList = koComputable(folderListOptionsBuilder);
 
 		this.selectedFolderValue.subscribe(() => this.filter().actionValueError(false));
 
@@ -141,12 +118,14 @@ export class FilterPopupView extends rl.pluginPopupView {
 					id: FilterAction.MoveTo,
 					name: i18nFilter('ACTION_MOVE_TO')
 				});
-				this.actionTypeOptions.push({
-					id: FilterAction.Forward,
-					name: i18nFilter('ACTION_FORWARD_TO')
-				});
 			}
 
+			// redirect command
+			this.actionTypeOptions.push({
+				id: FilterAction.Forward,
+				name: i18nFilter('ACTION_FORWARD_TO')
+			});
+
 			if (capa.includes('reject')) {
 				this.actionTypeOptions.push({ id: FilterAction.Reject, name: i18nFilter('ACTION_REJECT') });
 			}
@@ -186,19 +165,13 @@ export class FilterPopupView extends rl.pluginPopupView {
 
 	beforeShow(oFilter, fTrueCallback, bEdit) {
 //	onShow(oFilter, fTrueCallback, bEdit) {
+		this.populateOptions();
+
 		this.isNew(!bEdit);
 
 		this.fTrueCallback = fTrueCallback;
 		this.filter(oFilter);
 
 		this.selectedFolderValue(oFilter.actionValue());
-
-		bEdit || oFilter.nameFocused(true);
-
-		this.populateOptions();
-	}
-
-	afterShow() {
-		this.isNew() && this.filter().nameFocused(true);
 	}
 }
diff --git a/dev/Sieve/View/Script.js b/dev/Sieve/View/Script.js
index 20dd4a325..047eae50f 100644
--- a/dev/Sieve/View/Script.js
+++ b/dev/Sieve/View/Script.js
@@ -22,8 +22,8 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 			saveError: false,
 			errorText: '',
 			rawActive: false,
-			allowToggle: false,
 			script: null,
+			saving: false,
 
 			sieveCapabilities: '',
 			availableActions: '',
@@ -31,8 +31,6 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 			availableTests: ''
 		});
 
-		this.saving = false;
-
 		this.filterForDeletion = ko.observable(null).askDeleteHelper();
 	}
 
@@ -48,7 +46,7 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 	saveScript() {
 		let self = this,
 			script = self.script();
-		if (!self.saving/* && script.hasChanges()*/) {
+		if (!self.saving()/* && script.hasChanges()*/) {
 			this.errorText('');
 			self.saveError(false);
 
@@ -62,32 +60,33 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 			}
 
 			try {
-				parseScript(this.script().body());
+				parseScript(script.body());
 			} catch (e) {
 				this.errorText(e.message);
 				return;
 			}
 
-			self.saving = true;
+			self.saving(true);
 
-			if (self.allowToggle()) {
+			if (script.allowFilters()) {
 				script.body(script.filtersToRaw());
 			}
 
 			Remote.request('FiltersScriptSave',
 				(iError, data) => {
-					self.saving = false;
+					self.saving(false);
 
 					if (iError) {
 						self.saveError(true);
-						self.errorText((data && data.ErrorMessageAdditional) || getNotification(iError));
+						self.errorText(data?.messageAdditional || getNotification(iError));
 					} else {
 						script.exists() || scripts.push(script);
 						script.exists(true);
 						script.hasChanges(false);
+//						this.close();
 					}
 				},
-				script.toJson()
+				script.toJSON()
 			);
 		}
 	}
@@ -102,34 +101,26 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 		filter.generateID();
 		FilterPopupView.showModal([
 			filter,
-			() => this.filters.push(filter)
+			() => this.filters.push(filter.assignTo())
 		]);
 	}
 
 	editFilter(filter) {
-		const clonedFilter = filter.cloneSelf();
+		const clonedFilter = filter.assignTo();
 		FilterPopupView.showModal([
 			clonedFilter,
 			() => {
-				const script = this.script(),
-					filters = script.filters(),
-					index = filters.indexOf(filter);
-				if (-1 < index) {
-//					script.filters.splice(index, 1, clonedFilter);
-					filters[index] = clonedFilter;
-					script.filters(filters);
-				}
+				clonedFilter.assignTo(filter);
+				const script = this.script();
+				script.hasChanges(script.body() != script.filtersToRaw());
 			},
 			true
 		]);
 	}
 
 	toggleFiltersRaw() {
-		let script = this.script(), notRaw = !this.rawActive();
-		if (notRaw) {
-			script.body(script.filtersToRaw());
-			script.hasChanges(script.hasChanges());
-		}
+		const script = this.script(), notRaw = !this.rawActive();
+		notRaw && script.body(script.filtersToRaw());
 		this.rawActive(notRaw);
 	}
 
@@ -149,10 +140,8 @@ export class SieveScriptPopupView extends rl.pluginPopupView {
 		this.availableTests([...Object.keys(availableTests())].join(', '));
 
 		oScript = oScript || new SieveScriptModel();
-		let raw = !oScript.allowFilters();
 		this.script(oScript);
-		this.rawActive(raw);
-		this.allowToggle(!raw);
+		this.rawActive(!oScript.allowFilters());
 		this.saveError(false);
 		this.errorText('');
 
diff --git a/dev/Storage/Client.js b/dev/Storage/Client.js
index b8bb55060..0afe98134 100644
--- a/dev/Storage/Client.js
+++ b/dev/Storage/Client.js
@@ -23,12 +23,12 @@ try {
 	data = data ? decodeURIComponent(data[2]) : null;
 	data = data ? JSON.parse(data) : {};
 	win[sName] = {
-		getItem: key => data[key] == null ? null : data[key],
+		getItem: key => data[key] ?? null,
 		setItem: (key, value) => {
 			data[key] = ''+value; // forces the value to a string
 			document.cookie = sName+'='+encodeURIComponent(JSON.stringify(data))
-				+"; expires="+((new Date(Date.now()+(365*24*60*60*1000))).toGMTString())
-				+"; path=/; samesite=strict";
+				+";expires="+((new Date(Date.now()+(365*24*60*60*1000))).toGMTString())
+				+";path=/;samesite=strict";
 		}
 	};
 }
diff --git a/dev/Storage/Passphrases.js b/dev/Storage/Passphrases.js
new file mode 100644
index 000000000..0242ddd45
--- /dev/null
+++ b/dev/Storage/Passphrases.js
@@ -0,0 +1,155 @@
+import { AskPopupView } from 'View/Popup/Ask';
+import { SettingsUserStore } from 'Stores/User/Settings';
+import { SettingsGet } from '../Common/Globals';
+import { isArray } from '../Common/Utils';
+
+export const Passphrases = new WeakMap();
+
+Passphrases.ask = async (key, sAskDesc, btnText) => {
+	if (Passphrases.has(key)) {
+		return { password: Passphrases.handle(key)/*, remember:false*/ };
+	} else if (Passphrases.hasInLocalStorage(key)) {
+		return { password: await getFromLocalStorage(key) };
+	} else {
+		const pass = await AskPopupView.password(sAskDesc, btnText,
+			window.crypto.subtle && canUseLocalStorage(key) ? 0b1101 : 0b0101);
+		pass.rememberPermanent && await saveToLocalStorage(key, pass.password);
+		return pass;
+	}
+};
+
+Passphrases._deleteFromSession = Passphrases.delete;
+
+const timeouts = {};
+// get/set accessor to control deletion after N minutes of inactivity
+Passphrases.handle = (key, pass) => {
+	const timeout = SettingsUserStore.keyPassForget();
+	if (timeout && !timeouts[key]) {
+		timeouts[key] = (() => Passphrases._deleteFromSession(key)).debounce(timeout * 60 * 1000);
+	}
+	pass && Passphrases.set(key, pass);
+	timeout && timeouts[key]();
+	return Passphrases.get(key);
+};
+
+const deleteFromLocalStorage = (key) => {
+	const keyId = getKeyId(key);
+	if (keyId) {
+		localStorage.removeItem(keyId);
+	}
+};
+Passphrases.delete = (key) => {
+	deleteFromLocalStorage(key);
+	return Passphrases._deleteFromSession(key);
+};
+
+Passphrases.hasInLocalStorage = (key) => {
+	const keyId = getKeyId(key);
+	return keyId && localStorage.getItem(keyId) !== null;
+};
+
+const saveToLocalStorage = async (key, pass) => {
+	const keyId = getKeyId(key);
+	if (!keyId) {
+		return;
+	}
+
+	if (!pass) {
+		localStorage.removeItem(keyId);
+		return;
+	}
+
+	try {
+		const salt = window.crypto.getRandomValues(new Uint8Array(16));
+		const derivedKey = await deriveKeyFromHash(SettingsGet('accountHash'), salt);
+
+		const iv = window.crypto.getRandomValues(new Uint8Array(12));
+		const encrypted = await window.crypto.subtle.encrypt(
+			{ name: 'AES-GCM', iv: iv },
+			derivedKey,
+			new TextEncoder().encode(pass)
+		);
+		localStorage.setItem(keyId, JSON.stringify([
+			btoa(String.fromCharCode.apply(null, salt)),
+			btoa(String.fromCharCode.apply(null, iv)),
+			btoa(String.fromCharCode.apply(null, new Uint8Array(encrypted)))
+		]));
+	} catch (e) {
+		console.error('Passphrases.saveToLocalStorage failed', e);
+	}
+};
+
+const getFromLocalStorage = async (key) => {
+	const keyId = getKeyId(key);
+	if (!keyId) {
+		return undefined;
+	}
+
+	const jsonData = localStorage.getItem(keyId);
+	if (!jsonData) {
+		console.error('Passphrases.getFromLocalStorage failed: no data found');
+		return undefined;
+	}
+
+	try {
+		const saltIvData = JSON.parse(jsonData);
+		if (!saltIvData || !isArray(saltIvData) || saltIvData.length !== 3) {
+			// noinspection ExceptionCaughtLocallyJS
+			throw new Error('invalid passphrase data');
+		}
+		const toUint8 = (str) => new Uint8Array(atob(str).split('').map(c => c.charCodeAt(0)));
+
+		const derivedKey = await deriveKeyFromHash(SettingsGet('accountHash'), toUint8(saltIvData[0]));
+		const decrypted = await window.crypto.subtle.decrypt(
+			{
+				name: 'AES-GCM',
+				iv: toUint8(saltIvData[1])
+			},
+			derivedKey,
+			toUint8(saltIvData[2])
+		);
+		return String.fromCharCode.apply(null, new Uint8Array(decrypted));
+	} catch (e) {
+		localStorage.removeItem(keyId);
+		console.error('Passphrases.getFromLocalStorage failed', e);
+		return undefined;
+	}
+};
+
+const canUseLocalStorage = (key) => getKeyId(key) !== undefined;
+
+const getKeyId = (key) => {
+	if (key && typeof key.id === 'string' && key.id.length > 4 && typeof key.forgetPass === 'function') {
+		// only deal with keys that we can forget (OpenPGB, GnuPG)
+		return key.id + '_local_key';
+	} else {
+		console.info('Passphrases.getKeyId: unsupported key type');
+		return undefined;
+	}
+};
+
+const deriveKeyFromHash = async (hash, salt) => {
+	if (!hash) {
+		throw new Error('empty accountHash');
+	}
+	return window.crypto.subtle.importKey(
+		'raw',
+		new TextEncoder().encode(hash),
+		{ 'name': 'PBKDF2' },
+		false,
+		['deriveKey']
+	).then(keyMaterial => {
+		return window.crypto.subtle.deriveKey(
+			{
+				'name': 'PBKDF2',
+				'salt': salt,
+				'iterations': 512,
+				'hash': 'SHA-256'
+			},
+			keyMaterial,
+			{ 'name': 'AES-GCM', 'length': 256 },
+			false,
+			['encrypt', 'decrypt']
+		);
+	});
+};
diff --git a/dev/Stores/Admin/Domain.js b/dev/Stores/Admin/Domain.js
index 195ff2b77..ba09daeab 100644
--- a/dev/Stores/Admin/Domain.js
+++ b/dev/Stores/Admin/Domain.js
@@ -13,6 +13,7 @@ DomainAdminStore.fetch = () => {
 			if (!iError) {
 				DomainAdminStore(
 					data.Result.map(item => {
+						item.name = IDN.toUnicode(item.name);
 						item.disabled = ko.observable(item.disabled);
 						item.askDelete = ko.observable(false);
 						return item;
@@ -20,6 +21,6 @@ DomainAdminStore.fetch = () => {
 				);
 			}
 		}, {
-			IncludeAliases: 1
+			includeAliases: 1
 		});
 };
diff --git a/dev/Stores/Admin/Package.js b/dev/Stores/Admin/Package.js
index 3f4136338..5e49f9c89 100644
--- a/dev/Stores/Admin/Package.js
+++ b/dev/Stores/Admin/Package.js
@@ -1,5 +1,6 @@
 import ko from 'ko';
 import { isArray } from 'Common/Utils';
+import { getNotification } from 'Common/Translator';
 import Remote from 'Remote/Admin/Fetch';
 
 export const PackageAdminStore = ko.observableArray();
@@ -16,13 +17,18 @@ PackageAdminStore.fetch = () => {
 		PackageAdminStore.loading(false);
 		if (iError) {
 			PackageAdminStore.real(false);
+			PackageAdminStore.error(getNotification(iError));
+//			let error = getNotification(iError);
+//			if (data.message) { error = data.message + error; }
+//			if (data.reason) { error = data.reason + " " + error; }
+//			PackageAdminStore.error(error);
 		} else {
 			PackageAdminStore.real(!!data.Result.Real);
 			PackageAdminStore.error(data.Result.Error);
 
 			const loading = {};
 			PackageAdminStore.forEach(item => {
-				if (item && item.loading()) {
+				if (item?.loading()) {
 					loading[item.file] = item;
 				}
 			});
diff --git a/dev/Stores/Language.js b/dev/Stores/Language.js
index 546785e18..aeeb716e3 100644
--- a/dev/Stores/Language.js
+++ b/dev/Stores/Language.js
@@ -3,16 +3,16 @@ import { Settings, SettingsGet } from 'Common/Globals';
 import { isArray } from 'Common/Utils';
 
 export const LanguageStore = {
+	language: ko.observable(''),
 	languages: ko.observableArray(),
 	userLanguage: ko.observable(''),
+	hourCycle: ko.observable(''),
 
 	populate: function() {
 		const aLanguages = Settings.app('languages');
 		this.languages(isArray(aLanguages) ? aLanguages : []);
-		this.language(SettingsGet('Language'));
-		this.userLanguage(SettingsGet('UserLanguage'));
+		this.language(SettingsGet('language'));
+		this.userLanguage(SettingsGet('clientLanguage'));
+		this.hourCycle(SettingsGet('hourCycle'));
 	}
 }
-
-LanguageStore.language = ko.observable('')
-	.extend({ limitedList: LanguageStore.languages });
diff --git a/dev/Stores/Theme.js b/dev/Stores/Theme.js
index 4864ef04f..fddf66882 100644
--- a/dev/Stores/Theme.js
+++ b/dev/Stores/Theme.js
@@ -1,38 +1,114 @@
 import ko from 'ko';
-import { doc, $htmlCL, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
-import { isArray } from 'Common/Utils';
-import { serverRequestRaw } from 'Common/Links';
+import { $htmlCL, appEl, elementById, leftPanelDisabled, Settings, SettingsGet } from 'Common/Globals';
+import { isArray, arrayLength } from 'Common/Utils';
+import { cssLink, serverRequestRaw } from 'Common/Links';
+import { SaveSettingStatus } from 'Common/Enums';
+import { addSubscribablesTo } from 'External/ko';
 
-export const ThemeStore = {
-	themes: ko.observableArray(),
-	userBackgroundName: ko.observable(''),
-	userBackgroundHash: ko.observable(''),
-	isMobile: ko.observable($htmlCL.contains('rl-mobile')),
+let __themeTimer = 0;
 
-	populate: () => {
-		const themes = Settings.app('themes');
+export const
+	// Also see Styles/_Values.less @maxMobileWidth
+	isMobile = matchMedia('(max-width: 799px)'),
+	// https://github.com/the-djmaze/snappymail/issues/1150
+//	isSmall = matchMedia('(max-width: 1400px)'),
+
+	ThemeStore = {
+		theme: ko.observable(''),
+		themes: ko.observableArray(),
+		userBackgroundName: ko.observable(''),
+		userBackgroundHash: ko.observable(''),
+		fontSansSerif: ko.observable(''),
+		fontSerif: ko.observable(''),
+		fontMono: ko.observable(''),
+		isMobile: ko.observable(false)
+	},
+
+	initThemes = () => {
+		const theme = SettingsGet('Theme'),
+			themes = Settings.app('themes');
 
 		ThemeStore.themes(isArray(themes) ? themes : []);
-		ThemeStore.theme(SettingsGet('Theme'));
+		ThemeStore.theme(theme);
+		changeTheme(theme);
 		if (!ThemeStore.isMobile()) {
-			ThemeStore.userBackgroundName(SettingsGet('UserBackgroundName'));
-			ThemeStore.userBackgroundHash(SettingsGet('UserBackgroundHash'));
+			ThemeStore.userBackgroundName(SettingsGet('userBackgroundName'));
+			ThemeStore.userBackgroundHash(SettingsGet('userBackgroundHash'));
 		}
+		ThemeStore.fontSansSerif(SettingsGet('fontSansSerif'));
+		ThemeStore.fontSerif(SettingsGet('fontSerif'));
+		ThemeStore.fontMono(SettingsGet('fontMono'));
 
 		leftPanelDisabled(ThemeStore.isMobile());
-	}
-};
+	},
 
-ThemeStore.theme = ko.observable('').extend({ limitedList: ThemeStore.themes });
+	changeTheme = (value, themeTrigger = ()=>0) => {
+		const themeStyle = elementById('app-theme-style'),
+			clearTimer = () => {
+				__themeTimer = setTimeout(() => themeTrigger(SaveSettingStatus.Idle), 1000);
+			},
+			url = cssLink(value);
 
-ThemeStore.isMobile.subscribe(value => $htmlCL.toggle('rl-mobile', value));
+		if (themeStyle.dataset.name != value) {
+			clearTimeout(__themeTimer);
 
-ThemeStore.userBackgroundHash.subscribe(value => {
-	if (value) {
-		$htmlCL.add('UserBackground');
-		doc.body.style.backgroundImage = "url("+serverRequestRaw('UserBackground', value)+")";
-	} else {
-		$htmlCL.remove('UserBackground');
-		doc.body.removeAttribute('style');
+			themeTrigger(SaveSettingStatus.Saving);
+
+			rl.app.Remote.abort('theme').get('theme', url)
+				.then(data => {
+					if (2 === arrayLength(data)) {
+						themeStyle.textContent = data[1];
+						themeStyle.dataset.name = value;
+						themeTrigger(SaveSettingStatus.Success);
+					}
+					clearTimer();
+				}, clearTimer);
+		}
+	},
+
+	convertThemeName = theme => theme.replace(/@[a-z]+$/, '').replace(/([A-Z])/g, ' $1').trim();
+
+addSubscribablesTo(ThemeStore, {
+	fontSansSerif: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => {
+				if (name.startsWith('font') && !/font(Serif|Mono)/.test(name)) {
+					cl.remove(name);
+				}
+			});
+			value && cl.add('font'+value);
+		}
+	},
+
+	fontSerif: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => name.startsWith('fontSerif') && cl.remove(name));
+			value && cl.add('fontSerif'+value);
+		}
+	},
+
+	fontMono: value => {
+		if (null != value) {
+			let cl = appEl.classList;
+			cl.forEach(name => name.startsWith('fontMono') && cl.remove(name));
+			value && cl.add('fontMono'+value);
+		}
+	},
+
+	userBackgroundHash: value => {
+		appEl.classList.toggle('UserBackground', !!value);
+		appEl.style.backgroundImage = value ? "url("+serverRequestRaw('UserBackground', value)+")" : null;
 	}
 });
+
+isMobile.onchange = e => {
+	ThemeStore.isMobile(e.matches);
+	$htmlCL.toggle('rl-mobile', e.matches);
+	/*$htmlCL.contains('sm-msgView-side') || */leftPanelDisabled(e.matches);
+};
+isMobile.onchange(isMobile);
+
+//isSmall.onchange = e => $htmlCL.contains('sm-msgView-side') && leftPanelDisabled(e.matches);
+//isSmall.onchange(isSmall);
diff --git a/dev/Stores/User/Account.js b/dev/Stores/User/Account.js
index 4dc389326..122ba358e 100644
--- a/dev/Stores/User/Account.js
+++ b/dev/Stores/User/Account.js
@@ -1,13 +1,8 @@
 import { addObservablesTo, koArrayWithDestroy } from 'External/ko';
 
-export const AccountUserStore = {
-	accounts: koArrayWithDestroy(),
-	loading: ko.observable(false).extend({ debounce: 100 }),
-
-	getEmailAddresses: () => AccountUserStore.accounts.map(item => item.email)
-};
+export const AccountUserStore = koArrayWithDestroy();
 
 addObservablesTo(AccountUserStore, {
 	email: '',
-	signature: ''
+	loading: false
 });
diff --git a/dev/Stores/User/App.js b/dev/Stores/User/App.js
index a38880570..9825c8951 100644
--- a/dev/Stores/User/App.js
+++ b/dev/Stores/User/App.js
@@ -1,26 +1,24 @@
 import { keyScope, leftPanelDisabled, SettingsGet, elementById } from 'Common/Globals';
 import { addObservablesTo } from 'External/ko';
 import { ThemeStore } from 'Stores/Theme';
+import { arePopupsVisible } from 'Knoin/Knoin';
 
 export const AppUserStore = {
-	allowContacts: () => !!SettingsGet('ContactsIsAllowed')
+	allowContacts: () => !!SettingsGet('contactsAllowed')
 };
 
 addObservablesTo(AppUserStore, {
 	focusedState: 'none',
 
-	threadsAllowed: false,
-
-	composeInEdit: false
+	threadsAllowed: false
 });
 
 AppUserStore.focusedState.subscribe(value => {
 	['FolderList','MessageList','MessageView'].forEach(name => {
 		if (name === value) {
-			keyScope(value);
+			arePopupsVisible() || keyScope(value);
 			ThemeStore.isMobile() && leftPanelDisabled('FolderList' !== value);
 		}
-		let dom = elementById('V-Mail'+name);
-		dom && dom.classList.toggle('focused', name === value);
+		elementById('V-Mail'+name).classList.toggle('focused', name === value);
 	});
 });
diff --git a/dev/Stores/User/Contact.js b/dev/Stores/User/Contact.js
index 1b171bdd6..c95af029a 100644
--- a/dev/Stores/User/Contact.js
+++ b/dev/Stores/User/Contact.js
@@ -1,8 +1,8 @@
 import ko from 'ko';
 import { SettingsGet } from 'Common/Globals';
-import { pInt } from 'Common/Utils';
-import { addObservablesTo, koArrayWithDestroy } from 'External/ko';
+import { koComputable, addObservablesTo, koArrayWithDestroy } from 'External/ko';
 import Remote from 'Remote/User/Fetch';
+import { Notifications } from 'Common/Enums';
 
 export const ContactUserStore = koArrayWithDestroy();
 
@@ -18,6 +18,12 @@ addObservablesTo(ContactUserStore, {
 	syncPass: ''
 });
 
+// Also used by Selector
+ContactUserStore.hasChecked = koComputable(
+	// Issue: not all are observed?
+	() => !!ContactUserStore.find(item => item.checked())
+);
+
 /**
  * @param {Function} fResultFunc
  * @returns {void}
@@ -28,24 +34,31 @@ ContactUserStore.sync = fResultFunc => {
 	 && !ContactUserStore.syncing()
 	) {
 		ContactUserStore.syncing(true);
-		Remote.request('ContactsSync', (iError, oData) => {
-			ContactUserStore.syncing(false);
-			fResultFunc && fResultFunc(iError, oData);
-		}, null, 200000);
+		Remote.streamPerLine(line => {
+			try {
+				line = JSON.parse(line);
+				if ('ContactsSync' === line.Action) {
+					ContactUserStore.syncing(false);
+					fResultFunc?.(line.code, line);
+				}
+			} catch (e) {
+				ContactUserStore.syncing(false);
+				console.error(e);
+				fResultFunc?.(Notifications.UnknownError);
+			}
+		}, 'ContactsSync');
 	}
 };
 
 ContactUserStore.init = () => {
-	let value = !!SettingsGet('ContactsSyncIsAllowed');
-	ContactUserStore.allowSync(value);
-	if (value) {
-		ContactUserStore.syncMode(SettingsGet('ContactsSyncMode'));
-		ContactUserStore.syncUrl(SettingsGet('ContactsSyncUrl'));
-		ContactUserStore.syncUser(SettingsGet('ContactsSyncUser'));
-		ContactUserStore.syncPass(SettingsGet('ContactsSyncPassword'));
+	let config = SettingsGet('ContactsSync');
+	ContactUserStore.allowSync(!!config);
+	if (config) {
+		ContactUserStore.syncMode(config.Mode);
+		ContactUserStore.syncUrl(config.Url);
+		ContactUserStore.syncUser(config.User);
+		ContactUserStore.syncPass(config.Password);
 		setTimeout(ContactUserStore.sync, 10000);
-		value = pInt(SettingsGet('ContactsSyncInterval'));
-		value = 5 <= value ? (320 >= value ? value : 320) : 20;
-		setInterval(ContactUserStore.sync, value * 60000 + 5000);
+		setInterval(ContactUserStore.sync, config.Interval * 60000 + 5000);
 	}
 };
diff --git a/dev/Stores/User/Folder.js b/dev/Stores/User/Folder.js
index d1c51862b..37007c768 100644
--- a/dev/Stores/User/Folder.js
+++ b/dev/Stores/User/Folder.js
@@ -1,15 +1,52 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
+import { koComputable, addObservablesTo, addSubscribablesTo, addComputablesTo } from 'External/ko';
 
-import { FolderType, FolderSortMode } from 'Common/EnumsUser';
+import { FolderType } from 'Common/EnumsUser';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { forEachObjectEntry } from 'Common/Utils';
-import { addObservablesTo, addSubscribablesTo, addComputablesTo } from 'External/ko';
 import { getFolderInboxName, getFolderFromCacheList } from 'Common/Cache';
-import { Settings } from 'Common/Globals';
+import { Settings, SettingsCapa } from 'Common/Globals';
 //import Remote from 'Remote/User/Fetch'; // Circular dependency
 
-export const FolderUserStore = new class {
+export const
+
+ignoredKeywords = [
+	// rfc5788
+	'$forwarded',
+	'$mdnsent',
+	'$submitpending',
+	'$submitted',
+	// rfc9051
+	'$junk',
+	'$notjunk',
+	'$phishing',
+	// Mailo
+	'sent',
+	// KMail
+	'$encrypted',
+	'$error',
+	'$ignored',
+	'$invitation',
+	'$queued',
+	'$sent',
+	'$signed',
+	'$todo',
+	'$watched',
+	// GMail
+	'$notphishing',
+	'junk',
+	'nonjunk',
+	// KMail & GMail
+	'$attachment',
+	'$replied',
+	// Others
+	'$readreceipt',
+	'$notdelivered'
+],
+
+isAllowedKeyword = value => '\\' != value[0] && !ignoredKeywords.includes(value.toLowerCase()),
+
+FolderUserStore = new class {
 	constructor() {
 		const self = this;
 		addObservablesTo(self, {
@@ -22,7 +59,7 @@ export const FolderUserStore = new class {
 			 */
 			displaySpecSetting: false,
 
-//			sortMode: '',
+			sortMode: '',
 
 			quotaLimit: 0,
 			quotaUsage: 0,
@@ -33,8 +70,8 @@ export const FolderUserStore = new class {
 			trashFolder: '',
 			archiveFolder: '',
 
-			folderListOptimized: false,
-			folderListError: '',
+			optimized: false,
+			error: '',
 
 			foldersLoading: false,
 			foldersCreating: false,
@@ -44,8 +81,6 @@ export const FolderUserStore = new class {
 			foldersInboxUnreadCount: 0
 		});
 
-		self.sortMode = ko.observable('').extend({ limitedList: Object.values(FolderSortMode) });
-
 		self.namespace = '';
 
 		self.folderList = ko.observableArray(/*new FolderCollectionModel*/);
@@ -64,7 +99,7 @@ export const FolderUserStore = new class {
 			foldersChanging: () =>
 				self.foldersLoading() | self.foldersCreating() | self.foldersDeleting() | self.foldersRenaming(),
 
-			folderListSystemNames: () => {
+			systemFoldersNames: () => {
 				const list = [getFolderInboxName()],
 				others = [self.sentFolder(), self.draftsFolder(), self.spamFolder(), self.trashFolder(), self.archiveFolder()];
 
@@ -74,21 +109,15 @@ export const FolderUserStore = new class {
 				return list;
 			},
 
-			folderListSystem: () =>
-				self.folderListSystemNames().map(name => getFolderFromCacheList(name)).filter(v => v)
+			systemFolders: () =>
+				self.systemFoldersNames().map(name => getFolderFromCacheList(name)).filter(v => v)
 		});
 
 		const
 			subscribeRemoveSystemFolder = observable => {
-				observable.subscribe(() => {
-					const folder = getFolderFromCacheList(observable());
-					folder && folder.type(FolderType.User);
-				}, self, 'beforeChange');
+				observable.subscribe(() => getFolderFromCacheList(observable())?.type(0), self, 'beforeChange');
 			},
-			fSetSystemFolderType = type => value => {
-				const folder = getFolderFromCacheList(value);
-				folder && folder.type(type);
-			};
+			fSetSystemFolderType = type => value => getFolderFromCacheList(value)?.type(type);
 
 		subscribeRemoveSystemFolder(self.sentFolder);
 		subscribeRemoveSystemFolder(self.draftsFolder);
@@ -99,7 +128,7 @@ export const FolderUserStore = new class {
 		addSubscribablesTo(self, {
 			sentFolder: fSetSystemFolderType(FolderType.Sent),
 			draftsFolder: fSetSystemFolderType(FolderType.Drafts),
-			spamFolder: fSetSystemFolderType(FolderType.Spam),
+			spamFolder: fSetSystemFolderType(FolderType.Junk),
 			trashFolder: fSetSystemFolderType(FolderType.Trash),
 			archiveFolder: fSetSystemFolderType(FolderType.Archive)
 		});
@@ -117,6 +146,10 @@ export const FolderUserStore = new class {
 		return this.capabilities().includes(name);
 	}
 
+	allowKolab() {
+		return FolderUserStore.hasCapability('METADATA') && SettingsCapa('Kolab');
+	}
+
 	/**
 	 * @returns {Array}
 	 */
@@ -130,16 +163,15 @@ export const FolderUserStore = new class {
 			fSearchFunction = (list) => {
 				list.forEach(folder => {
 					if (
-						folder &&
-						folder.selectable() &&
+						folder?.selectable() &&
 						folder.exists &&
 						timeout > folder.expires &&
-						(folder.isSystemFolder() || (folder.subscribed() && (folder.checkable() || !bDisplaySpecSetting)))
+						(folder.isSystemFolder() || (folder.isSubscribed() && (folder.checkable() || !bDisplaySpecSetting)))
 					) {
 						timeouts.push([folder.expires, folder.fullName]);
 					}
 
-					if (folder && folder.subFolders.length) {
+					if (folder?.subFolders.length) {
 						fSearchFunction(folder.subFolders());
 					}
 				});
@@ -153,22 +185,23 @@ export const FolderUserStore = new class {
 			const folder = getFolderFromCacheList(aItem[1]);
 			if (folder) {
 				folder.expires = utc;
+//				result.indexOf(aItem[1]) ||
 				result.push(aItem[1]);
 			}
 
 			return limit <= result.length;
 		});
 
-		return result.filter((value, index, self) => self.indexOf(value) == index);
+		return result;
 	}
 
 	saveSystemFolders(folders) {
 		folders = folders || {
-			Sent: FolderUserStore.sentFolder(),
-			Drafts: FolderUserStore.draftsFolder(),
-			Spam: FolderUserStore.spamFolder(),
-			Trash: FolderUserStore.trashFolder(),
-			Archive: FolderUserStore.archiveFolder()
+			sent: FolderUserStore.sentFolder(),
+			drafts: FolderUserStore.draftsFolder(),
+			junk: FolderUserStore.spamFolder(),
+			trash: FolderUserStore.trashFolder(),
+			archive: FolderUserStore.archiveFolder()
 		};
 		forEachObjectEntry(folders, (k,v)=>Settings.set(k+'Folder',v));
 		rl.app.Remote.request('SystemFoldersUpdate', null, folders);
diff --git a/dev/Stores/User/GnuPG.js b/dev/Stores/User/GnuPG.js
index 6352c8789..f70b9a3c3 100644
--- a/dev/Stores/User/GnuPG.js
+++ b/dev/Stores/User/GnuPG.js
@@ -9,16 +9,17 @@ import Remote from 'Remote/User/Fetch';
 
 import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
-import { AskPopupView } from 'View/Popup/Ask';
+
+import { Passphrases } from 'Storage/Passphrases';
+
+import { baseCollator } from 'Common/Translator';
 
 const
-	askPassphrase = async (privateKey, btnTxt = 'LABEL_SIGN') =>
-		await AskPopupView.password('GnuPG key<br>' + privateKey.id + ' ' + privateKey.emails[0], 'OPENPGP/'+btnTxt),
-
-	findGnuPGKey = (keys, query, sign) =>
+	findGnuPGKey = (keys, query/*, sign*/) =>
 		keys.find(key =>
-			key[sign ? 'can_sign' : 'can_decrypt']
-			&& (key.emails.includes(query) || key.subkeys.find(key => query == key.keyid || query == key.fingerprint))
+//			key[sign ? 'can_sign' : 'can_decrypt']
+			(key.can_sign || key.can_decrypt)
+			&& (key.for(query) || key.subkeys.find(key => query == key.keyid || query == key.fingerprint))
 		);
 
 export const GnuPGUserStore = new class {
@@ -36,9 +37,10 @@ export const GnuPGUserStore = new class {
 		this.keyring = null;
 		this.publicKeys([]);
 		this.privateKeys([]);
-		Remote.request('GnupgGetKeys',
+		SettingsCapa('GnuPG')
+		&& Remote.request('GnupgGetKeys',
 			(iError, oData) => {
-				if (oData && oData.Result) {
+				if (oData?.Result) {
 					this.keyring = oData.Result;
 					const initKey = (key, isPrivate) => {
 						const aEmails = [];
@@ -46,55 +48,80 @@ export const GnuPGUserStore = new class {
 						key.fingerprint = key.subkeys[0].fingerprint;
 						key.uids.forEach(uid => uid.email && aEmails.push(uid.email));
 						key.emails = aEmails;
+						key.for = email => aEmails.includes(IDN.toASCII(email));
 						key.askDelete = ko.observable(false);
 						key.openForDeletion = ko.observable(null).askDeleteHelper();
+						key.askForgetPass = ko.observable(false);
+						key.openForPassForget = ko.observable(null).askDeleteHelper('askForgetPass');
+						key.forgetPass = () => {
+							Passphrases.delete(key);
+							key.hasStoredPass(false);
+						};
+						key.hasStoredPass = ko.observable(Passphrases.hasInLocalStorage(key));
 						key.remove = () => {
 							if (key.askDelete()) {
 								Remote.request('GnupgDeleteKey',
 									(iError, oData) => {
 										if (oData) {
 											if (iError) {
-												alert(oData.ErrorMessage);
+												alert(oData.message);
 											} else if (oData.Result) {
-												if (isPrivate) {
-													this.privateKeys.remove(key);
-												} else {
-													this.publicKeys.remove(key);
-												}
+												isPrivate
+													? this.privateKeys.remove(key)
+													: this.publicKeys.remove(key);
 											}
 										}
 									}, {
-										KeyId: key.id,
+										keyId: key.id,
 										isPrivate: isPrivate
 									}
 								);
+								isPrivate && key.forgetPass();
 							}
 						};
-						key.view = () => {
-							const fetch = pass => Remote.request('GnupgExportKey',
-									(iError, oData) => {
-										if (oData && oData.Result) {
-											key.armor = oData.Result;
-											showScreenPopup(OpenPgpKeyPopupView, [key]);
-										}
-									}, {
-										KeyId: key.id,
-										isPrivate: isPrivate,
-										Passphrase: pass
-									}
+						if (isPrivate) {
+							key.password = async btnTxt => {
+								const pass = await Passphrases.ask(key,
+									'GnuPG key<br>' + key.id + ' ' + key.emails[0],
+									btnTxt
 								);
-							if (isPrivate) {
-								askPassphrase(key, 'POPUP_VIEW_TITLE').then(passphrase => {
-									(null !== passphrase) && fetch(passphrase);
-								});
+								pass && pass.remember && Passphrases.handle(key, pass.password);
+								return pass?.password;
+							};
+						}
+						key.fetch = async callback => {
+							if (key.armor) {
+								callback && callback();
 							} else {
-								fetch('');
+								let pass = isPrivate ? await key.password('OPENPGP/POPUP_VIEW_TITLE') : '';
+								if (null != pass) try {
+									const result = await Remote.post('GnupgExportKey', null, {
+											keyId: key.id,
+											isPrivate: isPrivate,
+											passphrase: pass
+										});
+									if (result?.Result) {
+										key.armor = result.Result;
+										callback && callback();
+									} else {
+										Passphrases.delete(key);
+									}
+								} catch (e) {
+									Passphrases.delete(key);
+									alert(e.message);
+								}
 							}
+							return key.armor;
 						};
+						key.view = () => key.fetch(() => showScreenPopup(OpenPgpKeyPopupView, [key]));
 						return key;
-					};
-					this.publicKeys(oData.Result.public.map(key => initKey(key, 0)));
-					this.privateKeys(oData.Result.private.map(key => initKey(key, 1)));
+					},
+					collator = baseCollator(),
+					sort = keys => keys.sort(
+						(a, b) => collator.compare(a.emails[0], b.emails[0]) || collator.compare(a.id, b.id)
+					);
+					this.publicKeys(sort(oData.Result.public.map(key => initKey(key, 0))));
+					this.privateKeys(sort(oData.Result.private.map(key => initKey(key, 1))));
 					console.log('gnupg ready');
 				}
 			}
@@ -108,19 +135,6 @@ export const GnuPGUserStore = new class {
 		return SettingsCapa('GnuPG');
 	}
 
-	importKey(key, callback) {
-		Remote.request('GnupgImportKey',
-			(iError, oData) => {
-				if (oData && oData.Result/* && (oData.Result.imported || oData.Result.secretimported)*/) {
-					this.loadKeyrings();
-				}
-				callback && callback(iError, oData);
-			}, {
-				Key: key
-			}
-		);
-	}
-
 	/**
 		keyPair.privateKey
 		keyPair.publicKey
@@ -131,10 +145,10 @@ export const GnuPGUserStore = new class {
 	storeKeyPair(keyPair, callback) {
 		Remote.request('PgpStoreKeyPair',
 			(iError, oData) => {
-				if (oData && oData.Result) {
+				if (oData?.Result) {
 //					this.gnupgKeyring = oData.Result;
 				}
-				callback && callback(iError, oData);
+				callback?.(iError, oData);
 			}, keyPair
 		);
 	}
@@ -146,7 +160,7 @@ export const GnuPGUserStore = new class {
 		const count = recipients.length,
 			length = count ? recipients.filter(email =>
 //				(key.can_verify || key.can_encrypt) &&
-				this.publicKeys.find(key => key.emails.includes(email))
+				this.publicKeys.find(key => key.for(email))
 			).length : 0;
 		return length && length === count;
 	}
@@ -154,20 +168,20 @@ export const GnuPGUserStore = new class {
 	getPublicKeyFingerprints(recipients) {
 		const fingerprints = [];
 		recipients.forEach(email => {
-			fingerprints.push(this.publicKeys.find(key => key.emails.includes(email)).fingerprint);
+			fingerprints.push(this.publicKeys.find(key => key.for(email)).fingerprint);
 		});
 		return fingerprints;
 	}
 
-	getPrivateKeyFor(query, sign) {
-		return findGnuPGKey(this.privateKeys, query, sign);
+	getPrivateKeyFor(query/*, sign*/) {
+		return findGnuPGKey(this.privateKeys, query/*, sign*/);
 	}
 
 	async decrypt(message) {
 		const
 			pgpInfo = message.pgpEncrypted();
 		if (pgpInfo) {
-			let ids = [message.to[0].email].concat(pgpInfo.KeyIds),
+			let ids = [message.to[0].email].concat(pgpInfo.keyIds),
 				i = ids.length, key;
 			while (i--) {
 				key = findGnuPGKey(this.privateKeys, ids[i]);
@@ -178,17 +192,23 @@ export const GnuPGUserStore = new class {
 			if (key) {
 				// Also check message.from[0].email
 				let params = {
-					Folder: message.folder,
-					Uid: message.uid,
-					PartId: pgpInfo.PartId,
-					KeyId: key.id,
-					Passphrase: await askPassphrase(key, 'BUTTON_DECRYPT'),
-					Data: '' // message.plain() optional
+					folder: message.folder,
+					uid: message.uid,
+					partId: pgpInfo.partId,
+					keyId: key.id,
+					passphrase: await key.password('CRYPTO/DECRYPT'),
+					data: '' // message.plain() optional
 				}
-				if (null !== params.Passphrase) {
-					const result = await Remote.post('GnupgDecrypt', null, params);
-					if (result && result.Result) {
-						return result.Result;
+				if (null != params.passphrase) {
+					try {
+						const response = await Remote.post('GnupgDecrypt', null, params);
+						if (response?.Result?.data) {
+							return response.Result;
+						}
+						throw response;
+					} catch (e) {
+						Passphrases.delete(key);
+						throw e;
 					}
 				}
 			}
@@ -196,29 +216,30 @@ export const GnuPGUserStore = new class {
 	}
 
 	async verify(message) {
-		let data = message.pgpSigned(); // { BodyPartId: "1", SigPartId: "2", MicAlg: "pgp-sha256" }
+		let data = message.pgpSigned(); // { partId: "1", sigPartId: "2", micAlg: "pgp-sha256" }
 		if (data) {
 			data = { ...data }; // clone
 //			const sender = message.from[0].email;
 //			let mode = await this.hasPublicKeyForEmails([sender]);
-			data.Folder = message.folder;
-			data.Uid = message.uid;
-			if (data.BodyPart) {
-				data.BodyPart = data.BodyPart.raw;
-				data.SigPart = data.SigPart.body;
+			data.folder = message.folder;
+			data.uid = message.uid;
+			if (data.bodyPart) {
+				data.bodyPart = data.bodyPart.raw;
+				data.sigPart = data.sigPart.body;
 			}
-			let response = await Remote.post('MessagePgpVerify', null, data);
-			if (response && response.Result) {
+			let response = await Remote.post('PgpVerifyMessage', null, data);
+			if (response?.Result) {
 				return {
 					fingerprint: response.Result.fingerprint,
-					success: 0 == response.Result.status // GOODSIG
+					success: 0 == response.Result.status, // GOODSIG
+					error: response.Result.message
 				};
 			}
 		}
 	}
 
 	async sign(privateKey) {
-		return await askPassphrase(privateKey);
+		return await privateKey.password('CRYPTO/SIGN');
 	}
 
 };
diff --git a/dev/Stores/User/Identity.js b/dev/Stores/User/Identity.js
index 224ae2226..94f5ce871 100644
--- a/dev/Stores/User/Identity.js
+++ b/dev/Stores/User/Identity.js
@@ -1,5 +1,12 @@
-import { koArrayWithDestroy } from 'External/ko';
+import { koArrayWithDestroy, koComputable } from 'External/ko';
+import { isArray } from 'Common/Utils';
 
 export const IdentityUserStore = koArrayWithDestroy();
 
 IdentityUserStore.loading = ko.observable(false).extend({ debounce: 100 });
+
+/** Returns main (login) identity */
+IdentityUserStore.main = koComputable(() => {
+	const list = IdentityUserStore();
+	return isArray(list) ? list.find(item => item && !item.id()) : null;
+});
diff --git a/dev/Stores/User/Mailvelope.js b/dev/Stores/User/Mailvelope.js
new file mode 100644
index 000000000..a4893f2fa
--- /dev/null
+++ b/dev/Stores/User/Mailvelope.js
@@ -0,0 +1,124 @@
+import { SettingsGet } from 'Common/Globals';
+
+// https://mailvelope.github.io/mailvelope/Keyring.html
+let mailvelopeKeyring = null;
+
+export const MailvelopeUserStore = {
+	keyring: null,
+
+	loadKeyring(identifier) {
+		identifier = identifier || SettingsGet('Email');
+		if (window.mailvelope) {
+			const fn = keyring => {
+					mailvelopeKeyring = keyring;
+					console.log('mailvelope ready');
+				};
+			mailvelope.getKeyring().then(fn, err => {
+				if (identifier) {
+					// attempt to create a new keyring for this app/user
+					mailvelope.createKeyring(identifier).then(fn, err => console.error(err));
+				} else {
+					console.error(err);
+				}
+			});
+			addEventListener('mailvelope-disconnect', event => {
+				alert('Mailvelope is updated to version ' + event.detail.version + '. Reload page');
+			}, false);
+		} else {
+			addEventListener('mailvelope', () => this.loadKeyring(identifier));
+		}
+	},
+
+	async hasPublicKeyForEmails(recipients) {
+		const
+			mailvelope = mailvelopeKeyring && await mailvelopeKeyring.validKeyForAddress(recipients)
+				/*.then(LookupResult => Object.entries(LookupResult))*/,
+			entries = mailvelope && Object.entries(mailvelope);
+		return entries && entries.filter(value => value[1]).length === recipients.length;
+	},
+
+	async getPrivateKeyFor(email/*, sign*/) {
+		if (mailvelopeKeyring && await mailvelopeKeyring.hasPrivateKey({email:email})) {
+			return ['mailvelope', email];
+		}
+		return false;
+	},
+
+	async decrypt(message) {
+		// Try Mailvelope (does not support inline images)
+		if (mailvelopeKeyring) {
+			const sender = message.from[0].email,
+				armoredText = message.plain();
+			try {
+				let emails = [...message.from,...message.to,...message.cc].validUnique(),
+					i = emails.length;
+				while (i--) {
+					if (await this.getPrivateKeyFor(emails[i].email)) {
+						/**
+						* https://mailvelope.github.io/mailvelope/Mailvelope.html#createEncryptedFormContainer
+						* Creates an iframe to display an encrypted form
+						*/
+	//					mailvelope.createEncryptedFormContainer('#mailvelope-form');
+						/**
+						* https://mailvelope.github.io/mailvelope/Mailvelope.html#createDisplayContainer
+						* Creates an iframe to display the decrypted content of the encrypted mail.
+						*/
+						const body = message.body;
+						body.textContent = '';
+						let result = await mailvelope.createDisplayContainer(
+							'#'+body.id,
+							armoredText,
+							mailvelopeKeyring,
+							{
+								senderAddress: sender
+								// emails[i].email
+							}
+						);
+						if (result) {
+							if (result.error?.message) {
+								if ('PWD_DIALOG_CANCEL' !== result.error.code) {
+									alert(result.error.code + ': ' + result.error.message);
+								}
+							} else {
+								body.classList.add('mailvelope');
+								return true;
+							}
+						}
+						break;
+					}
+				}
+			} catch (err) {
+				console.error(err);
+			}
+		}
+	}
+	/**
+	 * Returns headers that should be added to an outgoing email.
+	 * So far this is only the autocrypt header.
+	 */
+/*
+	mailvelopeKeyring.additionalHeadersForOutgoingEmail(from: 'abc@web.de')
+	.then(function(additional) {
+		console.log('additionalHeadersForOutgoingEmail', additional);
+		// logs: {autocrypt: "addr=abc@web.de; prefer-encrypt=mutual; keydata=..."}
+	});
+
+	mailvelopeKeyring.addSyncHandler(syncHandlerObj)
+	mailvelopeKeyring.createKeyBackupContainer(selector, options)
+	mailvelopeKeyring.createKeyGenContainer(selector, {
+//		userIds: [],
+		keySize: 4096
+	})
+
+	mailvelopeKeyring.exportOwnPublicKey(emailAddr).then(<AsciiArmored, Error>)
+	mailvelopeKeyring.importPublicKey(armored)
+
+	// https://mailvelope.github.io/mailvelope/global.html#SyncHandlerObject
+	mailvelopeKeyring.addSyncHandler({
+		uploadSync
+		downloadSync
+		backup
+		restore
+	});
+*/
+};
diff --git a/dev/Stores/User/Message.js b/dev/Stores/User/Message.js
index e6c44d530..c49626a58 100644
--- a/dev/Stores/User/Message.js
+++ b/dev/Stores/User/Message.js
@@ -1,4 +1,4 @@
-import { Scope } from 'Common/Enums';
+import { ScopeMessageList, ScopeMessageView } from 'Common/Enums';
 import { elementById } from 'Common/Globals';
 import { exitFullscreen } from 'Common/Fullscreen';
 import { addObservablesTo, addSubscribablesTo } from 'External/ko';
@@ -15,8 +15,7 @@ export const MessageUserStore = new class {
 			loading: false,
 
 			// Cache mail bodies
-			bodiesDom: null,
-			activeDom: null
+			bodiesDom: null
 		});
 
 		// Subscribers
@@ -26,32 +25,26 @@ export const MessageUserStore = new class {
 				clearTimeout(this.MessageSeenTimer);
 				elementById('rl-right').classList.toggle('message-selected', !!message);
 				if (message) {
-					if (!SettingsUserStore.usePreviewPane()) {
-						AppUserStore.focusedState(Scope.MessageView);
-					}
+					SettingsUserStore.usePreviewPane() || AppUserStore.focusedState(ScopeMessageView);
 				} else {
-					AppUserStore.focusedState(Scope.MessageList);
+					AppUserStore.focusedState(ScopeMessageList);
 					exitFullscreen();
-					this.hideMessageBodies();
 				}
+				[...(this.bodiesDom()?.children || [])].forEach(el => el.hidden = true);
 			},
 		});
 
-		this.purgeMessageBodyCache = this.purgeMessageBodyCache.throttle(30000);
+		this.purgeCache = this.purgeCache.throttle(30000);
 	}
 
-	purgeMessageBodyCache() {
-		const messagesDom = this.bodiesDom(),
-			children = messagesDom && messagesDom.children;
-		if (children) {
-			while (15 < children.length) {
-				children[0].remove();
+	purgeCache(all) {
+		const children = this.bodiesDom()?.children || [];
+		let i = Math.max(0, children.length - (all ? 0 : 15));
+		while (i--) {
+			children[i].remove();
+			if (children[i].message) {
+				children[i].message.body = null;
 			}
 		}
 	}
-
-	hideMessageBodies() {
-		const messagesDom = this.bodiesDom();
-		messagesDom && Array.from(messagesDom.children).forEach(el => el.hidden = true);
-	}
 };
diff --git a/dev/Stores/User/Messagelist.js b/dev/Stores/User/Messagelist.js
index d24848ade..8afda5478 100644
--- a/dev/Stores/User/Messagelist.js
+++ b/dev/Stores/User/Messagelist.js
@@ -1,19 +1,16 @@
-import { koComputable } from 'External/ko';
+import { koComputable, addObservablesTo, addComputablesTo } from 'External/ko';
 
-import { Notification } from 'Common/Enums';
+import { SMAudio } from 'Common/Audio';
+import { Notifications } from 'Common/Enums';
 import { MessageSetAction } from 'Common/EnumsUser';
-import { $htmlCL } from 'Common/Globals';
-import { arrayLength, pInt, pString } from 'Common/Utils';
-import { addObservablesTo, addComputablesTo } from 'External/ko';
+import { $htmlCL, fireEvent } from 'Common/Globals';
+import { arrayLength, pString } from 'Common/Utils';
+import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 
 import {
 	getFolderInboxName,
-	addNewMessageCache,
-	setFolderUidNext,
 	getFolderFromCacheList,
-	setFolderHash,
-	MessageFlagsCache,
-	clearNewMessageCache
+	setFolderETag
 } from 'Common/Cache';
 
 import { mailBox } from 'Common/Links';
@@ -30,23 +27,34 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 
 import Remote from 'Remote/User/Fetch';
 
+import { b64EncodeJSONSafe } from 'Common/Utils';
+import { SettingsGet } from 'Common/Globals';
+import { SUB_QUERY_PREFIX } from 'Common/Links';
+import { AppUserStore } from 'Stores/User/App';
+
+import { baseCollator } from 'Common/Translator';
+
 const
 	isChecked = item => item.checked(),
+	isDeleted = item => item.isDeleted(),
 	replaceHash = hash => {
 		rl.route.off();
 		hasher.replaceHash(hash);
 		rl.route.on();
-	}
+	},
+	disableAutoSelect = ko.observable(false).extend({ falseTimeout: 500 });
 
 export const MessagelistUserStore = ko.observableArray().extend({ debounce: 0 });
 
 addObservablesTo(MessagelistUserStore, {
 	count: 0,
 	listSearch: '',
+	listLimited: 0,
 	threadUid: 0,
 	page: 1,
 	pageBeforeThread: 1,
 	error: '',
+//	folder: '',
 
 	endHash: '',
 	endThreadUid: 0,
@@ -59,8 +67,6 @@ addObservablesTo(MessagelistUserStore, {
 	focusedMessage: null
 });
 
-MessagelistUserStore.disableAutoSelect = ko.observable(false).extend({ falseTimeout: 500 });
-
 // Computed Observables
 
 addComputablesTo(MessagelistUserStore, {
@@ -70,6 +76,25 @@ addComputablesTo(MessagelistUserStore, {
 		return value;
 	},
 
+	isArchiveFolder: () => FolderUserStore.archiveFolder() === MessagelistUserStore().folder,
+
+	isDraftFolder: () => FolderUserStore.draftsFolder() === MessagelistUserStore().folder,
+
+	isSentFolder: () => FolderUserStore.sentFolder() === MessagelistUserStore().folder,
+
+	isSpamFolder: () => FolderUserStore.spamFolder() === MessagelistUserStore().folder,
+
+	isTrashFolder: () => FolderUserStore.trashFolder() === MessagelistUserStore().folder,
+
+	archiveAllowed: () => ![UNUSED_OPTION_VALUE, MessagelistUserStore().folder].includes(FolderUserStore.archiveFolder())
+		&& !MessagelistUserStore.isDraftFolder(),
+
+	canMarkAsSpam: () => !(UNUSED_OPTION_VALUE === FolderUserStore.spamFolder()
+//		| MessagelistUserStore.isArchiveFolder()
+		| MessagelistUserStore.isSentFolder()
+		| MessagelistUserStore.isDraftFolder()
+		| MessagelistUserStore.isSpamFolder()),
+
 	pageCount: () => Math.max(1, Math.ceil(MessagelistUserStore.count() / SettingsUserStore.messagesPerPage())),
 
 	mainSearch: {
@@ -83,17 +108,17 @@ addComputablesTo(MessagelistUserStore, {
 	listCheckedOrSelected: () => {
 		const
 			selectedMessage = MessagelistUserStore.selectedMessage(),
-			focusedMessage = MessagelistUserStore.focusedMessage(),
-			checked = MessagelistUserStore.filter(item => isChecked(item) || item === selectedMessage);
-		return checked.length ? checked : (focusedMessage ? [focusedMessage] : []);
+			checked = MessagelistUserStore.filter(item => isChecked(item));
+		return checked.length ? checked : (selectedMessage ? [selectedMessage] : []);
 	},
 
 	listCheckedOrSelectedUidsWithSubMails: () => {
-		let result = [];
+		let result = new Set;
 		MessagelistUserStore.listCheckedOrSelected().forEach(message => {
-			result.push(message.uid);
+			result.add(message.uid);
+			result.folder = message.folder;
 			if (1 < message.threadsLen()) {
-				result = result.concat(message.threads()).unique();
+				message.threads().forEach(result.add, result);
 			}
 		});
 		return result;
@@ -101,59 +126,73 @@ addComputablesTo(MessagelistUserStore, {
 });
 
 MessagelistUserStore.listChecked = koComputable(
-	() => MessagelistUserStore.filter(isChecked)).extend({ rateLimit: 0 }
-);
+	() => MessagelistUserStore.filter(isChecked)
+).extend({ rateLimit: 0 });
 
-MessagelistUserStore.hasCheckedMessages = koComputable(
+// Also used by Selector
+MessagelistUserStore.hasChecked = koComputable(
+	// Issue: not all are observed?
 	() => !!MessagelistUserStore.find(isChecked)
 ).extend({ rateLimit: 0 });
 
 MessagelistUserStore.hasCheckedOrSelected = koComputable(() =>
-		!!(MessagelistUserStore.selectedMessage()
-		|| MessagelistUserStore.focusedMessage()
-		|| MessagelistUserStore.find(item => item.checked()))
-	).extend({ rateLimit: 50 });
+	!!MessagelistUserStore.selectedMessage()
+	// Issue: not all are observed?
+	| !!MessagelistUserStore.find(isChecked)
+).extend({ rateLimit: 50 });
 
-MessagelistUserStore.initUidNextAndNewMessages = (folder, uidNext, newMessages) => {
-	if (getFolderInboxName() === folder && uidNext) {
-		if (arrayLength(newMessages)) {
-			newMessages.forEach(item => addNewMessageCache(folder, item.Uid));
+MessagelistUserStore.hasCheckedOrSelectedAndDeleted = koComputable(
+	() => !!MessagelistUserStore.listCheckedOrSelected().find(isDeleted)
+).extend({ rateLimit: 50 });
 
-			NotificationUserStore.playSoundNotification();
+MessagelistUserStore.hasCheckedOrSelectedAndUndeleted = koComputable(
+	() => !!MessagelistUserStore.listCheckedOrSelected().find(item => !item?.isDeleted())
+).extend({ rateLimit: 50 });
 
-			const len = newMessages.length;
-			if (3 < len) {
-				NotificationUserStore.displayDesktopNotification(
-					AccountUserStore.email(),
-					i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', {
-						COUNT: len
-					}),
-					{ Url: mailBox(newMessages[0].Folder) }
+MessagelistUserStore.notifyNewMessages = (folder, newMessages) => {
+	if (getFolderInboxName() === folder && arrayLength(newMessages)) {
+
+		SMAudio.playNotification();
+
+		const len = newMessages.length;
+		if (3 < len) {
+			NotificationUserStore.display(
+				AccountUserStore.email(),
+				i18n('MESSAGE_LIST/NEW_MESSAGE_NOTIFICATION', {
+					COUNT: len
+				}),
+				{ Url: mailBox(newMessages[0].folder) }
+			);
+		} else {
+			newMessages.forEach(item => {
+				NotificationUserStore.display(
+					EmailCollectionModel.reviveFromJson(item.from).toString(),
+					item.subject,
+					{ folder: item.folder, uid: item.uid }
 				);
-			} else {
-				newMessages.forEach(item => {
-					NotificationUserStore.displayDesktopNotification(
-						EmailCollectionModel.reviveFromJson(item.From).toString(),
-						item.Subject,
-						{ Folder: item.Folder, Uid: item.Uid }
-					);
-				});
-			}
+			});
 		}
-
-		setFolderUidNext(folder, uidNext);
 	}
 }
 
+MessagelistUserStore.canSelect = () =>
+	!disableAutoSelect()
+	&& SettingsUserStore.usePreviewPane();
+//	&& !SettingsUserStore.showNextMessage();
+
+let prevFolderName;
+
 /**
  * @param {boolean=} bDropPagePosition = false
- * @param {boolean=} bDropCurrenFolderCache = false
+ * @param {boolean=} bDropCurrentFolderCache = false
  */
-MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrenFolderCache = false) => {
-	let iOffset = (MessagelistUserStore.page() - 1) * SettingsUserStore.messagesPerPage();
+MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrentFolderCache = false) => {
+	let iOffset = (MessagelistUserStore.page() - 1) * SettingsUserStore.messagesPerPage(),
+		folderName = FolderUserStore.currentFolderFullName();
+//		folderName = FolderUserStore.currentFolder() ? self.currentFolder().fullName : '');
 
-	if (bDropCurrenFolderCache) {
-		setFolderHash(FolderUserStore.currentFolderFullName(), '');
+	if (bDropCurrentFolderCache) {
+		setFolderETag(folderName, '');
 	}
 
 	if (bDropPagePosition) {
@@ -171,86 +210,132 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrenFolderCache
 		);
 	}
 
+	if (prevFolderName != folderName) {
+		prevFolderName = folderName;
+		MessagelistUserStore([]);
+	}
+
 	MessagelistUserStore.loading(true);
-	MessagelistUserStore.error('');
-	Remote.messageList(
-		(iError, oData, bCached) => {
+
+	let sGetAdd = '',
+//		folder = getFolderFromCacheList(folderName.fullName),
+		folder = getFolderFromCacheList(folderName),
+		folderETag = folder?.etag || '',
+		params = {
+			folder: folderName,
+			offset: iOffset,
+			limit: SettingsUserStore.messagesPerPage(),
+			uidNext: folder?.uidNext || 0, // Used to check for new messages
+			sort: FolderUserStore.sortMode(),
+			search: MessagelistUserStore.listSearch()
+		},
+		fCallback = (iError, oData, bCached) => {
+			let error = '';
 			if (iError) {
-				if (Notification.RequestAborted !== iError) {
-					MessagelistUserStore([]);
-					MessagelistUserStore.error(getNotification(iError));
+				if ('reload' != oData?.name) {
+					error = getNotification(iError);
+					MessagelistUserStore.loading(false);
+//					if (Notifications.RequestAborted !== iError) {
+//						MessagelistUserStore([]);
+//					}
+//					if (oData.message) { error = oData.message + error; }
 				}
 			} else {
 				const collection = MessageCollectionModel.reviveFromJson(oData.Result, bCached);
 				if (collection) {
-					let unreadCountChange = false;
-
 					const
-						folder = getFolderFromCacheList(collection.Folder);
-
+						folderInfo = collection.folder,
+						folder = getFolderFromCacheList(folderInfo.name);
+					collection.folder = folderInfo.name;
 					if (folder && !bCached) {
+//						folder.revivePropertiesFromJson(result);
 						folder.expires = Date.now();
+						folder.uidNext = folderInfo.uidNext;
+						folder.etag = folderInfo.etag;
 
-						setFolderHash(collection.Folder, collection.FolderHash);
-
-						if (null != collection.MessageCount) {
-							folder.messageCountAll(collection.MessageCount);
+						if (null != folderInfo.totalEmails) {
+							folder.totalEmails(folderInfo.totalEmails);
 						}
 
-						if (null != collection.MessageUnseenCount) {
-							if (pInt(folder.messageCountUnread()) !== pInt(collection.MessageUnseenCount)) {
-								unreadCountChange = true;
-								MessageFlagsCache.clearFolder(folder.fullName);
+						if (null != folderInfo.unreadEmails) {
+							folder.unreadEmails(folderInfo.unreadEmails);
+						}
+
+						let flags = folderInfo.permanentFlags || [];
+						if (flags.includes('\\*')) {
+							/** Add Thunderbird labels */
+							let i = 6;
+							while (--i) {
+								flags.includes('$label'+i) || flags.push('$label'+i);
 							}
-
-							folder.messageCountUnread(collection.MessageUnseenCount);
+							/** TODO: add others by default? */
 						}
+						folder.permanentFlags(flags.sort(baseCollator().compare));
 
-						MessagelistUserStore.initUidNextAndNewMessages(folder.fullName, collection.UidNext, collection.NewMessages);
+						MessagelistUserStore.notifyNewMessages(folder.fullName, collection.newMessages);
 					}
 
-					MessagelistUserStore.count(collection.MessageResultCount);
-					MessagelistUserStore.listSearch(pString(collection.Search));
-					MessagelistUserStore.page(Math.ceil(collection.Offset / SettingsUserStore.messagesPerPage() + 1));
-					MessagelistUserStore.threadUid(collection.ThreadUid);
+					MessagelistUserStore.count(collection.totalEmails);
+					MessagelistUserStore.listSearch(pString(collection.search));
+					MessagelistUserStore.listLimited(!!collection.limited);
+					MessagelistUserStore.page(Math.ceil(collection.offset / SettingsUserStore.messagesPerPage() + 1));
+					MessagelistUserStore.threadUid(collection.threadUid);
 
 					MessagelistUserStore.endHash(
-						collection.Folder +
-						'|' + collection.Search +
+						folderInfo.name +
+						'|' + collection.search +
 						'|' + MessagelistUserStore.threadUid() +
 						'|' + MessagelistUserStore.page()
 					);
-					MessagelistUserStore.endThreadUid(collection.ThreadUid);
+					MessagelistUserStore.endThreadUid(collection.threadUid);
 					const message = MessageUserStore.message();
-					if (message && collection.Folder !== message.folder) {
+					if (message && folderInfo.name !== message.folder) {
 						MessageUserStore.message(null);
 					}
 
-					MessagelistUserStore.disableAutoSelect(true);
+					disableAutoSelect(true);
+
+					if (collection.threadUid) {
+						let refs = {};
+						collection.forEach(msg => {
+							msg.level = 0;
+							if (msg.inReplyTo && refs[msg.inReplyTo]) {
+								msg.level = 1 + refs[msg.inReplyTo].level;
+							}
+							refs[msg.messageId] = msg;
+						});
+					}
 
 					MessagelistUserStore(collection);
 					MessagelistUserStore.isIncomplete(false);
-
-					clearNewMessageCache();
-
-					if (folder && (bCached || unreadCountChange || SettingsUserStore.useThreads())) {
-						rl.app.folderInformation(folder.fullName, collection);
-					}
 				} else {
 					MessagelistUserStore.count(0);
 					MessagelistUserStore([]);
-					MessagelistUserStore.error(getNotification(Notification.CantGetMessageList));
+					error = getNotification(Notifications.CantGetMessageList);
 				}
+				MessagelistUserStore.loading(false);
 			}
-			MessagelistUserStore.loading(false);
-		},
-		{
-			Folder: FolderUserStore.currentFolderFullName(),
-			Offset: iOffset,
-			Limit: SettingsUserStore.messagesPerPage(),
-			Search: MessagelistUserStore.listSearch(),
-			ThreadUid: MessagelistUserStore.threadUid()
-		}
+			MessagelistUserStore.error(error);
+		};
+
+	if (AppUserStore.threadsAllowed() && SettingsUserStore.useThreads()) {
+		params.useThreads = 1;
+		params.threadAlgorithm = SettingsUserStore.threadAlgorithm();
+		params.threadUid = MessagelistUserStore.threadUid();
+	} else {
+		params.threadUid = 0;
+	}
+	if (folderETag) {
+		params.hash = folderETag + '-' + SettingsGet('accountHash');
+		sGetAdd = 'MessageList/' + SUB_QUERY_PREFIX + '/' + b64EncodeJSONSafe(params);
+		params = {};
+	}
+
+	Remote.abort('MessageList', 'reload').request('MessageList',
+		fCallback,
+		params,
+		60000, // 60 seconds before aborting
+		sGetAdd
 	);
 };
 
@@ -262,174 +347,214 @@ MessagelistUserStore.reload = (bDropPagePosition = false, bDropCurrenFolderCache
 MessagelistUserStore.setAction = (sFolderFullName, iSetAction, messages) => {
 	messages = messages || MessagelistUserStore.listChecked();
 
-	let folder = null,
-		alreadyUnread = 0,
-		rootUids = messages.map(oMessage => oMessage && oMessage.uid ? oMessage.uid : null)
-			.validUnique(),
-		length = rootUids.length;
+	let folder,
+		rootUids = [],
+		length;
+
+	if (iSetAction == MessageSetAction.SetSeen) {
+		messages.forEach(oMessage => {
+			if (oMessage.isUnseen() && rootUids.push(oMessage.uid)) {
+				oMessage.flags.push('\\seen');
+				if (oMessage.threads().length > 0 && oMessage.threadUnseen().includes(oMessage.uid)) {
+					oMessage.threadUnseen.remove(oMessage.uid);
+				}
+			}
+		});
+	} else if (iSetAction == MessageSetAction.UnsetSeen) {
+		messages.forEach(oMessage => {
+			if (!oMessage.isUnseen() && rootUids.push(oMessage.uid)) {
+				oMessage.flags.remove('\\seen');
+				if (oMessage.threads().length > 0 && !oMessage.threadUnseen().includes(oMessage.uid)) {
+					oMessage.threadUnseen.push(oMessage.uid);
+				}
+			}
+		});
+	} else if (iSetAction == MessageSetAction.SetFlag) {
+		messages.forEach(oMessage =>
+			!oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\flagged')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetFlag) {
+		messages.forEach(oMessage =>
+			oMessage.isFlagged() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\flagged')
+		);
+	} else if (iSetAction == MessageSetAction.SetDeleted) {
+		messages.forEach(oMessage =>
+			!oMessage.isDeleted() && rootUids.push(oMessage.uid) && oMessage.flags.push('\\deleted')
+		);
+	} else if (iSetAction == MessageSetAction.UnsetDeleted) {
+		messages.forEach(oMessage =>
+			oMessage.isDeleted() && rootUids.push(oMessage.uid) && oMessage.flags.remove('\\deleted')
+		);
+	}
+	rootUids = rootUids.validUnique();
+	length = rootUids.length;
 
 	if (sFolderFullName && length) {
 		switch (iSetAction) {
 			case MessageSetAction.SetSeen:
-				length = 0;
+				length = -length;
 				// fallthrough is intentionally
 			case MessageSetAction.UnsetSeen:
-				rootUids.forEach(sSubUid =>
-					alreadyUnread += MessageFlagsCache.storeBySetAction(sFolderFullName, sSubUid, iSetAction)
-				);
-
 				folder = getFolderFromCacheList(sFolderFullName);
 				if (folder) {
-					folder.messageCountUnread(folder.messageCountUnread() - alreadyUnread + length);
+					folder.unreadEmails(Math.max(0, folder.unreadEmails() + length));
 				}
-
 				Remote.request('MessageSetSeen', null, {
-					Folder: sFolderFullName,
-					Uids: rootUids.join(','),
-					SetAction: iSetAction == MessageSetAction.SetSeen ? 1 : 0
+					folder: sFolderFullName,
+					uids: rootUids.join(','),
+					setAction: iSetAction == MessageSetAction.SetSeen ? 1 : 0
 				});
 				break;
 
 			case MessageSetAction.SetFlag:
 			case MessageSetAction.UnsetFlag:
-				rootUids.forEach(sSubUid =>
-					MessageFlagsCache.storeBySetAction(sFolderFullName, sSubUid, iSetAction)
-				);
 				Remote.request('MessageSetFlagged', null, {
-					Folder: sFolderFullName,
-					Uids: rootUids.join(','),
-					SetAction: iSetAction == MessageSetAction.SetFlag ? 1 : 0
+					folder: sFolderFullName,
+					uids: rootUids.join(','),
+					setAction: iSetAction == MessageSetAction.SetFlag ? 1 : 0
+				});
+				break;
+
+			case MessageSetAction.SetDeleted:
+			case MessageSetAction.UnsetDeleted:
+				Remote.request('MessageSetDeleted', null, {
+					folder: sFolderFullName,
+					uids: rootUids.join(','),
+					setAction: iSetAction == MessageSetAction.SetDeleted ? 1 : 0
 				});
 				break;
 			// no default
 		}
-
-		MessagelistUserStore.reloadFlagsAndCachedMessage();
 	}
 };
 
 /**
  * @param {string} fromFolderFullName
- * @param {Array} uidForRemove
+ * @param {Set} oUids
  * @param {string=} toFolderFullName = ''
  * @param {boolean=} copy = false
  */
-MessagelistUserStore.removeMessagesFromList = (
-	fromFolderFullName, uidForRemove, toFolderFullName = '', copy = false
+MessagelistUserStore.moveMessages = (
+	fromFolderFullName, oUids, toFolderFullName = '', copy = false
 ) => {
-	uidForRemove = uidForRemove.map(mValue => pInt(mValue));
+	const fromFolder = getFolderFromCacheList(fromFolderFullName);
+
+	if (!fromFolder || !oUids?.size) return;
 
 	let unseenCount = 0,
-		messageList = MessagelistUserStore,
+		setPage = 0,
 		currentMessage = MessageUserStore.message();
 
-	const trashFolder = FolderUserStore.trashFolder(),
+	const toFolder = toFolderFullName ? getFolderFromCacheList(toFolderFullName) : null,
+		trashFolder = FolderUserStore.trashFolder(),
 		spamFolder = FolderUserStore.spamFolder(),
-		fromFolder = getFolderFromCacheList(fromFolderFullName),
-		toFolder = toFolderFullName ? getFolderFromCacheList(toFolderFullName) : null,
+		page = MessagelistUserStore.page(),
 		messages =
 			FolderUserStore.currentFolderFullName() === fromFolderFullName
-				? messageList.filter(item => item && uidForRemove.includes(pInt(item.uid)))
-				: [];
+				? MessagelistUserStore.filter(item => item && oUids.has(item.uid))
+				: [],
+		moveOrDeleteResponseHelper = (iError, oData) => {
+			if (iError) {
+				setFolderETag(FolderUserStore.currentFolderFullName(), '');
+				alert(getNotification(iError));
+			} else if (FolderUserStore.currentFolder()) {
+				if (2 === arrayLength(oData.Result)) {
+					setFolderETag(oData.Result[0], oData.Result[1]);
+				} else {
+					setFolderETag(FolderUserStore.currentFolderFullName(), '');
+				}
 
-	messages.forEach(item => {
-		if (item && item.isUnseen()) {
-			++unseenCount;
-		}
-	});
+				MessagelistUserStore.count(MessagelistUserStore.count() - oUids.size);
+				if (page > MessagelistUserStore.pageCount()) {
+					setPage = MessagelistUserStore.pageCount();
+				}
+				if (setPage) {
+					MessagelistUserStore.page(setPage);
+					replaceHash(
+						mailBox(
+							FolderUserStore.currentFolderFullNameHash(),
+							setPage,
+							MessagelistUserStore.listSearch(),
+							MessagelistUserStore.threadUid()
+						)
+					);
+				}
 
-	if (fromFolder && !copy) {
-		fromFolder.messageCountAll(
-			0 <= fromFolder.messageCountAll() - uidForRemove.length ? fromFolder.messageCountAll() - uidForRemove.length : 0
-		);
+				MessagelistUserStore.reload(!MessagelistUserStore.count());
+			}
+		};
 
-		if (0 < unseenCount) {
-			fromFolder.messageCountUnread(
-				0 <= fromFolder.messageCountUnread() - unseenCount ? fromFolder.messageCountUnread() - unseenCount : 0
-			);
-		}
+	messages.forEach(item => item?.isUnseen() && ++unseenCount);
+
+	if (!copy) {
+		fromFolder.etag = '';
+		fromFolder.totalEmails(Math.max(0, fromFolder.totalEmails() - oUids.size));
+		fromFolder.unreadEmails(Math.max(0, fromFolder.unreadEmails() - unseenCount));
 	}
 
 	if (toFolder) {
-		if (trashFolder === toFolder.fullName || spamFolder === toFolder.fullName) {
-			unseenCount = 0;
+		toFolder.etag = '';
+		toFolder.totalEmails(toFolder.totalEmails() + oUids.size);
+		if (trashFolder !== toFolder.fullName && spamFolder !== toFolder.fullName) {
+			toFolder.unreadEmails(toFolder.unreadEmails() + unseenCount);
 		}
-
-		toFolder.messageCountAll(toFolder.messageCountAll() + uidForRemove.length);
-		if (0 < unseenCount) {
-			toFolder.messageCountUnread(toFolder.messageCountUnread() + unseenCount);
-		}
-
 		toFolder.actionBlink(true);
 	}
 
 	if (messages.length) {
+		disableAutoSelect(true);
 		if (copy) {
 			messages.forEach(item => item.checked(false));
 		} else {
 			MessagelistUserStore.isIncomplete(true);
 
+			// Select next email https://github.com/the-djmaze/snappymail/issues/968
+			if (currentMessage && 1 == messages.length && SettingsUserStore.showNextMessage()) {
+				let next = MessagelistUserStore.indexOf(currentMessage) + 1;
+				if (0 < next && (next = MessagelistUserStore()[next])) {
+					currentMessage = null;
+					fireEvent('mailbox.message.show', {
+						folder: next.folder,
+						uid: next.uid
+					});
+				}
+			}
+
 			messages.forEach(item => {
 				if (currentMessage && currentMessage.hash === item.hash) {
 					currentMessage = null;
 					MessageUserStore.message(null);
 				}
-
-				item.deleted(true);
+				MessagelistUserStore.remove(item);
 			});
-
-			setTimeout(() => messages.forEach(item => messageList.remove(item)), 350);
 		}
 	}
 
-	if (fromFolderFullName) {
-		setFolderHash(fromFolderFullName, '');
-	}
-
 	if (toFolderFullName) {
-		setFolderHash(toFolderFullName, '');
-	}
-
-	if (MessagelistUserStore.threadUid()) {
-		if (
-			messageList.length &&
-			!!messageList.find(item => !!(item && item.deleted() && item.uid == MessagelistUserStore.threadUid()))
-		) {
-			const message = messageList.find(item => item && !item.deleted());
-			let setHash;
-			if (!message) {
-				if (1 < MessagelistUserStore.page()) {
-					MessagelistUserStore.page(MessagelistUserStore.page() - 1);
-					setHash = 1;
-				} else {
-					MessagelistUserStore.threadUid(0);
-					replaceHash(
-						mailBox(
-							FolderUserStore.currentFolderFullNameHash(),
-							MessagelistUserStore.pageBeforeThread(),
-							MessagelistUserStore.listSearch()
-						)
-					);
-				}
-			} else if (MessagelistUserStore.threadUid() != message.uid) {
-				MessagelistUserStore.threadUid(message.uid);
-				setHash = 1;
-			}
-			if (setHash) {
-				replaceHash(
-					mailBox(
-						FolderUserStore.currentFolderFullNameHash(),
-						MessagelistUserStore.page(),
-						MessagelistUserStore.listSearch(),
-						MessagelistUserStore.threadUid()
-					)
-				);
+		if (toFolder && fromFolderFullName != toFolderFullName) {
+			const params =  {
+				fromFolder: fromFolderFullName,
+				toFolder: toFolderFullName,
+				uids: [...oUids].join(',')
+			};
+			if (copy) {
+				Remote.request('MessageCopy', null, params);
+			} else {
+				const
+					isSpam = spamFolder === toFolderFullName,
+					isHam = !isSpam && spamFolder === fromFolderFullName && getFolderInboxName() === toFolderFullName;
+				params.markAsRead = (isSpam || FolderUserStore.trashFolder() === toFolderFullName) ? 1 : 0;
+				params.learning = isSpam ? 'SPAM' : isHam ? 'HAM' : '';
+				Remote.abort('MessageList', 'reload').request('MessageMove', moveOrDeleteResponseHelper, params);
 			}
 		}
+	} else {
+		Remote.abort('MessageList', 'reload').request('MessageDelete',
+			moveOrDeleteResponseHelper,
+			{
+				folder: fromFolderFullName,
+				uids: [...oUids].join(',')
+			}
+		);
 	}
-},
-
-MessagelistUserStore.reloadFlagsAndCachedMessage = () => {
-	MessagelistUserStore.forEach(message => MessageFlagsCache.initMessage(message));
-	MessageFlagsCache.initMessage(MessageUserStore.message());
 };
diff --git a/dev/Stores/User/Notification.js b/dev/Stores/User/Notification.js
index d84bf4b97..f126ba0ab 100644
--- a/dev/Stores/User/Notification.js
+++ b/dev/Stores/User/Notification.js
@@ -1,5 +1,4 @@
-import { SMAudio } from 'Common/Audio';
-import * as Links from 'Common/Links';
+import { staticLink } from 'Common/Links';
 import { addObservablesTo } from 'External/ko';
 import { fireEvent } from 'Common/Globals';
 
@@ -7,12 +6,12 @@ import { fireEvent } from 'Common/Globals';
  * Might not work due to the new ServiceWorkerRegistration.showNotification
  */
 const HTML5Notification = window.Notification,
-	HTML5NotificationStatus = () => (HTML5Notification && HTML5Notification.permission) || 'denied',
+	HTML5NotificationStatus = () => HTML5Notification?.permission || 'denied',
 	NotificationsDenied = () => 'denied' === HTML5NotificationStatus(),
 	NotificationsGranted = () => 'granted' === HTML5NotificationStatus(),
 	dispatchMessage = data => {
 		focus();
-		if (data.Folder && data.Uid) {
+		if (data.folder && data.uid) {
 			fireEvent('mailbox.message.show', data);
 		} else if (data.Url) {
 			hasher.setHash(data.Url);
@@ -23,63 +22,54 @@ let DesktopNotifications = false,
 	WorkerNotifications = navigator.serviceWorker;
 
 // Are Notifications supported in the service worker?
-if (WorkerNotifications && ServiceWorkerRegistration && ServiceWorkerRegistration.prototype.showNotification) {
-	/* Listen for close requests from the ServiceWorker */
-	WorkerNotifications.addEventListener('message', event => {
-		const obj = JSON.parse(event.data);
-		obj && 'notificationclick' === obj.action && dispatchMessage(obj.data);
-	});
+if (WorkerNotifications) {
+	if (ServiceWorkerRegistration && ServiceWorkerRegistration.prototype.showNotification) {
+		/* Listen for close requests from the ServiceWorker */
+		WorkerNotifications.addEventListener('message', event => {
+			const obj = JSON.parse(event.data);
+			'notificationclick' === obj?.action && dispatchMessage(obj.data);
+		});
+	} else {
+		console.log('ServiceWorkerRegistration.showNotification undefined');
+		WorkerNotifications = null;
+	}
 } else {
-	WorkerNotifications = null;
-	console.log('ServiceWorker Notifications not supported');
+	console.log('ServiceWorker undefined');
 }
 
 export const NotificationUserStore = new class {
 	constructor() {
 		addObservablesTo(this, {
-			enableSoundNotification: false,
-
-			enableDesktopNotification: false,/*.extend({ notify: 'always' })*/
-
-			isDesktopNotificationAllowed: !NotificationsDenied()
+			enabled: false,/*.extend({ notify: 'always' })*/
+			allowed: !NotificationsDenied()
 		});
 
-		this.enableDesktopNotification.subscribe(value => {
+		this.enabled.subscribe(value => {
 			DesktopNotifications = !!value;
 			if (value && HTML5Notification && !NotificationsGranted()) {
 				HTML5Notification.requestPermission(() =>
-					this.isDesktopNotificationAllowed(!NotificationsDenied())
+					this.allowed(!NotificationsDenied())
 				);
 			}
 		});
 	}
 
-	/**
-	 * Used with SoundNotification setting
-	 */
-	playSoundNotification(skipSetting) {
-		if (skipSetting ? true : this.enableSoundNotification()) {
-			SMAudio.playNotification();
-		}
-	}
-
 	/**
 	 * Used with DesktopNotifications setting
 	 */
-	displayDesktopNotification(title, text, messageData, imageSrc) {
+	display(title, text, messageData, imageSrc) {
 		if (DesktopNotifications && NotificationsGranted()) {
 			const options = {
 				body: text,
-				icon: imageSrc || Links.staticLink('css/images/icon-message-notification.png'),
+				icon: imageSrc || staticLink('images/icon-message-notification.png'),
 				data: messageData
 			};
-			if (messageData && messageData.Uid) {
-				options.tag = messageData.Uid;
+			if (messageData?.uid) {
+				options.tag = messageData.uid;
 			}
 			if (WorkerNotifications) {
 				// Service-Worker-Allowed HTTP header to allow the scope.
-				WorkerNotifications.register('/serviceworker.js')
-//				WorkerNotifications.register(Links.staticLink('js/serviceworker.js'), {scope:'/'})
+				WorkerNotifications.register(staticLink('js/serviceworker.js'), {scope:'/'})
 				.then(() =>
 					WorkerNotifications.ready.then(registration =>
 						/* Show the notification */
@@ -93,10 +83,13 @@ export const NotificationUserStore = new class {
 							)
 					)
 				)
-				.catch(e => console.error(e));
+				.catch(e => {
+					console.error(e);
+					WorkerNotifications = null;
+				});
 			} else {
 				const notification = new HTML5Notification(title, options);
-				notification.show && notification.show();
+				notification.show?.();
 				notification.onclick = messageData ? () => dispatchMessage(messageData) : null;
 				setTimeout(() => notification.close(), 7000);
 			}
diff --git a/dev/Stores/User/OpenPGP.js b/dev/Stores/User/OpenPGP.js
index 5e929ec13..5c521d214 100644
--- a/dev/Stores/User/OpenPGP.js
+++ b/dev/Stores/User/OpenPGP.js
@@ -10,16 +10,47 @@ import Remote from 'Remote/User/Fetch';
 
 import { showScreenPopup } from 'Knoin/Knoin';
 import { OpenPgpKeyPopupView } from 'View/Popup/OpenPgpKey';
-import { AskPopupView } from 'View/Popup/Ask';
+
+import { Passphrases } from 'Storage/Passphrases';
+
+import { baseCollator, getNotification } from 'Common/Translator';
 
 const
+	loaded = () => !!window.openpgp,
+
 	findOpenPGPKey = (keys, query/*, sign*/) =>
 		keys.find(key =>
-			key.emails.includes(query) || query == key.id || query == key.fingerprint
+			key.for(query) || query == key.id || query == key.fingerprint
 		),
 
-	askPassphrase = async (privateKey, btnTxt = 'LABEL_SIGN') =>
-		await AskPopupView.password('OpenPGP.js key<br>' + privateKey.id + ' ' + privateKey.emails[0], 'OPENPGP/'+btnTxt),
+	decryptKey = async (privateKey, btnTxt = 'SIGN') => {
+		if (privateKey.key.isDecrypted()) {
+			return privateKey.key;
+		}
+		const key = privateKey.id,
+			pass = await Passphrases.ask(privateKey,
+				'OpenPGP.js key<br>' + key + ' ' + privateKey.emails[0],
+				'CRYPTO/'+btnTxt
+			);
+		if (pass) {
+			const passphrase = pass.password,
+				result = await openpgp.decryptKey({
+					privateKey: privateKey.key,
+					passphrase
+				});
+			result && pass.remember && Passphrases.handle(privateKey, passphrase);
+			return result;
+		}
+	},
+
+	collator = baseCollator(),
+	sort = keys => keys.sort(
+//		(a, b) => collator.compare(a.emails[0], b.emails[0]) || collator.compare(a.fingerprint, b.fingerprint)
+		(a, b) => collator.compare(a.emails[0], b.emails[0]) || collator.compare(a.id, b.id)
+	),
+	dedup = keys => sort((keys || [])
+		.filter((v, i, a) => a.findIndex(entry => entry.fingerprint == v.fingerprint) === i)
+	),
 
 	/**
 	 * OpenPGP.js v5 removed the localStorage (keyring)
@@ -27,47 +58,57 @@ const
 	 */
 	publicKeysItem = 'openpgp-public-keys',
 	privateKeysItem = 'openpgp-private-keys',
-	storage = window.localStorage,
 	loadOpenPgpKeys = async itemname => {
 		let keys = [], key,
-			armoredKeys = JSON.parse(storage.getItem(itemname)),
+			armoredKeys = JSON.parse(localStorage.getItem(itemname)),
 			i = arrayLength(armoredKeys);
-		while (i--) {
+		while (i--) try {
 			key = await openpgp.readKey({armoredKey:armoredKeys[i]});
-			if (!key.err) {
-				keys.push(new OpenPgpKeyModel(armoredKeys[i], key));
-			}
+			key.err || keys.push(new OpenPgpKeyModel(armoredKeys[i], key));
+		} catch (e) {
+			console.error(e);
 		}
 		return keys;
 	},
 	storeOpenPgpKeys = (keys, section) => {
 		let armoredKeys = keys.map(item => item.armor);
 		if (armoredKeys.length) {
-			storage.setItem(section, JSON.stringify(armoredKeys));
+			localStorage.setItem(section, JSON.stringify(armoredKeys));
 		} else {
-			storage.removeItem(section);
+			localStorage.removeItem(section);
 		}
 	};
 
 class OpenPgpKeyModel {
 	constructor(armor, key) {
 		this.key = key;
-		const aEmails = [];
-		if (key.users) {
-			key.users.forEach(user => user.userID.email && aEmails.push(user.userID.email));
-		}
 		this.id = key.getKeyID().toHex().toUpperCase();
 		this.fingerprint = key.getFingerprint();
 		this.can_encrypt = !!key.getEncryptionKey();
 		this.can_sign = !!key.getSigningKey();
-		this.emails = aEmails;
+		this.emails = key.users.map(user => IDN.toASCII(user.userID.email)).filter(email => email);
 		this.armor = armor;
 		this.askDelete = ko.observable(false);
 		this.openForDeletion = ko.observable(null).askDeleteHelper();
+		this.hasStoredPass = ko.observable(Passphrases.hasInLocalStorage(this));
+		this.askForgetPass = ko.observable(false);
+		this.openForPassForget = ko.observable(null).askDeleteHelper('askForgetPass');
 //		key.getUserIDs()
 //		key.getPrimaryUser()
 	}
 
+/*
+	get id() { return this.key.getKeyID().toHex().toUpperCase(); }
+	get fingerprint() { return this.key.getFingerprint(); }
+	get can_encrypt() { return !!this.key.getEncryptionKey(); }
+	get can_sign() { return !!this.key.getSigningKey(); }
+	get emails() { return this.key.users.map(user => IDN.toASCII(user.userID.email)).filter(email => email); }
+	get armor() { return this.key.armor(); }
+*/
+	for(email) {
+		return this.emails.includes(IDN.toASCII(email));
+	}
+
 	view() {
 		showScreenPopup(OpenPgpKeyPopupView, [this]);
 	}
@@ -77,12 +118,29 @@ class OpenPgpKeyModel {
 			if (this.key.isPrivate()) {
 				OpenPGPUserStore.privateKeys.remove(this);
 				storeOpenPgpKeys(OpenPGPUserStore.privateKeys, privateKeysItem);
+				this.forgetPass()
 			} else {
 				OpenPGPUserStore.publicKeys.remove(this);
 				storeOpenPgpKeys(OpenPGPUserStore.publicKeys, publicKeysItem);
 			}
+			Remote.request('DeletePGPKey',
+				(iError, oData) => {
+					if (oData) {
+						if (iError || oData.Result === false) {
+							alert(oData.message || getNotification(iError));
+						}
+					}
+				}, {
+					key: this.armor
+				}
+			);
 		}
 	}
+
+	forgetPass() {
+		Passphrases.delete(this);
+		this.hasStoredPass(false);
+	}
 /*
 	toJSON() {
 		return this.armor;
@@ -97,35 +155,62 @@ export const OpenPGPUserStore = new class {
 	}
 
 	loadKeyrings() {
-		loadOpenPgpKeys(publicKeysItem).then(keys => {
-			this.publicKeys(keys || []);
-			console.log('openpgp.js public keys loaded');
-		});
-		loadOpenPgpKeys(privateKeysItem).then(keys => {
-			this.privateKeys(keys || [])
-			console.log('openpgp.js private keys loaded');
-		});
+		if (loaded()) {
+			loadOpenPgpKeys(publicKeysItem)
+			.then(keys => {
+				this.publicKeys(dedup(keys));
+				console.log('openpgp.js public keys loaded');
+			})
+			.finally(() => {
+				loadOpenPgpKeys(privateKeysItem)
+				.then(keys => {
+					this.privateKeys(dedup(keys));
+					console.log('openpgp.js private keys loaded');
+				})
+				.finally(() => {
+					/*SettingsGet('loadBackupKeys') && */this.loadBackupKeys();
+				});
+			});
+		}
+	}
+
+	loadBackupKeys() {
+		Remote.request('GetPGPKeys',
+			(iError, oData) => !iError && oData.Result && this.importKeys(oData.Result)
+		);
 	}
 
 	/**
 	 * @returns {boolean}
 	 */
 	isSupported() {
-		return !!window.openpgp;
+		return loaded();
 	}
 
 	importKey(armoredKey) {
-		openpgp.readKey({armoredKey:armoredKey}).then(key => {
-			if (!key.err) {
-				if (key.isPrivate()) {
-					this.privateKeys.push(new OpenPgpKeyModel(armoredKey, key));
-					storeOpenPgpKeys(this.privateKeys, privateKeysItem);
-				} else {
-					this.publicKeys.push(new OpenPgpKeyModel(armoredKey, key));
-					storeOpenPgpKeys(this.publicKeys, publicKeysItem);
+		this.importKeys([armoredKey]);
+	}
+
+	async importKeys(keys) {
+		if (loaded()) {
+			const privateKeys = this.privateKeys(),
+				publicKeys = this.publicKeys();
+			for (const armoredKey of keys) try {
+				let key = await openpgp.readKey({armoredKey:armoredKey});
+				if (!key.err) {
+					key = new OpenPgpKeyModel(armoredKey, key);
+					const keys = key.key.isPrivate() ? privateKeys : publicKeys;
+					keys.find(entry => entry.fingerprint == key.fingerprint)
+					|| keys.push(key);
 				}
+			} catch (e) {
+				console.error(e, armoredKey);
 			}
-		});
+			this.privateKeys(sort(privateKeys));
+			this.publicKeys(sort(publicKeys));
+			storeOpenPgpKeys(privateKeys, privateKeysItem);
+			storeOpenPgpKeys(publicKeys, publicKeysItem);
+		}
 	}
 
 	/**
@@ -134,14 +219,16 @@ export const OpenPGPUserStore = new class {
 		keyPair.revocationCertificate
 	 */
 	storeKeyPair(keyPair) {
-		openpgp.readKey({armoredKey:keyPair.publicKey}).then(key => {
-			this.publicKeys.push(new OpenPgpKeyModel(keyPair.publicKey, key));
-			storeOpenPgpKeys(this.publicKeys, publicKeysItem);
-		});
-		openpgp.readKey({armoredKey:keyPair.privateKey}).then(key => {
-			this.privateKeys.push(new OpenPgpKeyModel(keyPair.privateKey, key));
-			storeOpenPgpKeys(this.privateKeys, privateKeysItem);
-		});
+		if (loaded()) {
+			openpgp.readKey({armoredKey:keyPair.publicKey}).then(key => {
+				this.publicKeys.push(new OpenPgpKeyModel(keyPair.publicKey, key));
+				storeOpenPgpKeys(this.publicKeys, publicKeysItem);
+			});
+			openpgp.readKey({armoredKey:keyPair.privateKey}).then(key => {
+				this.privateKeys.push(new OpenPgpKeyModel(keyPair.privateKey, key));
+				storeOpenPgpKeys(this.privateKeys, privateKeysItem);
+			});
+		}
 	}
 
 	/**
@@ -150,7 +237,7 @@ export const OpenPGPUserStore = new class {
 	hasPublicKeyForEmails(recipients) {
 		const count = recipients.length,
 			length = count ? recipients.filter(email =>
-				this.publicKeys().find(key => key.emails.includes(email))
+				this.publicKeys().find(key => key.for(email))
 			).length : 0;
 		return length && length === count;
 	}
@@ -178,19 +265,12 @@ export const OpenPGPUserStore = new class {
 			}
 		}
 		if (privateKey) try {
-			const passphrase = await askPassphrase(privateKey, 'BUTTON_DECRYPT');
-
-			if (null !== passphrase) {
-				const
-					publicKey = findOpenPGPKey(this.publicKeys, sender/*, sign*/),
-					decryptedKey = await openpgp.decryptKey({
-						privateKey: privateKey.key,
-						passphrase
-					});
-
+			const decryptedKey = await decryptKey(privateKey, 'DECRYPT');
+			if (decryptedKey) {
+				const publicKey = findOpenPGPKey(this.publicKeys, sender/*, sign*/);
 				return await openpgp.decrypt({
 					message,
-					verificationKeys: publicKey && publicKey.key,
+					verificationKeys: publicKey?.key,
 //					expectSigned: true,
 //					signature: '', // Detached signature
 					decryptionKeys: decryptedKey
@@ -206,17 +286,18 @@ export const OpenPGPUserStore = new class {
 	 * https://docs.openpgpjs.org/#sign-and-verify-cleartext-messages
 	 */
 	async verify(message) {
-		const data = message.pgpSigned(), // { BodyPartId: "1", SigPartId: "2", MicAlg: "pgp-sha256" }
-			publicKey = this.publicKeys().find(key => key.emails.includes(message.from[0].email));
+		const data = message.pgpSigned(), // { partId: "1", sigPartId: "2", micAlg: "pgp-sha256" }
+			publicKey = this.publicKeys().find(key => key.for(message.from[0].email));
 		if (data && publicKey) {
-			data.Folder = message.folder;
-			data.Uid = message.uid;
-			data.GnuPG = 0;
+			data.folder = message.folder;
+			data.uid = message.uid;
+			data.tryGnuPG = 0;
 			let response;
-			if (data.SigPartId) {
-				response = await Remote.post('MessagePgpVerify', null, data);
-			} else if (data.BodyPart) {
-				response = { Result: { text: data.BodyPart.raw, signature: data.SigPart.body } };
+			if (data.sigPartId) {
+				response = await Remote.post('PgpVerifyMessage', null, data);
+			} else if (data.bodyPart) {
+				// MimePart
+				response = { Result: { text: data.bodyPart.raw, signature: data.sigPart.body } };
 			} else {
 				response = { Result: { text: message.plain(), signature: null } };
 			}
@@ -246,18 +327,14 @@ export const OpenPGPUserStore = new class {
 	 * https://docs.openpgpjs.org/global.html#sign
 	 */
 	async sign(text, privateKey, detached) {
-		const passphrase = await askPassphrase(privateKey);
-		if (null !== passphrase) {
-			privateKey = await openpgp.decryptKey({
-				privateKey: privateKey.key,
-				passphrase
-			});
+		const signingKey = await decryptKey(privateKey);
+		if (signingKey) {
 			const message = detached
 				? await openpgp.createMessage({ text: text })
 				: await openpgp.createCleartextMessage({ text: text });
 			return await openpgp.sign({
 				message: message,
-				signingKeys: privateKey,
+				signingKeys: signingKey,
 				detached: !!detached
 			});
 		}
@@ -269,17 +346,13 @@ export const OpenPGPUserStore = new class {
 	 */
 	async encrypt(text, recipients, signPrivateKey) {
 		const count = recipients.length;
-		recipients = recipients.map(email => this.publicKeys().find(key => key.emails.includes(email))).filter(key => key);
+		recipients = recipients.map(email => this.publicKeys().find(key => key.for(email))).filter(key => key);
 		if (count === recipients.length) {
 			if (signPrivateKey) {
-				const passphrase = await askPassphrase(signPrivateKey);
-				if (null === passphrase) {
+				signPrivateKey = await decryptKey(signPrivateKey);
+				if (!signPrivateKey) {
 					return;
 				}
-				signPrivateKey = await openpgp.decryptKey({
-					privateKey: signPrivateKey.key,
-					passphrase
-				});
 			}
 			return await openpgp.encrypt({
 				message: await openpgp.createMessage({ text: text }),
diff --git a/dev/Stores/User/Pgp.js b/dev/Stores/User/Pgp.js
index b5291e851..648843eea 100644
--- a/dev/Stores/User/Pgp.js
+++ b/dev/Stores/User/Pgp.js
@@ -8,18 +8,18 @@ import { SettingsCapa, SettingsGet } from 'Common/Globals';
 
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+import { MailvelopeUserStore } from 'Stores/User/Mailvelope';
+
+import Remote from 'Remote/User/Fetch';
 
 export const
 	BEGIN_PGP_MESSAGE = '-----BEGIN PGP MESSAGE-----',
 //	BEGIN_PGP_SIGNATURE = '-----BEGIN PGP SIGNATURE-----',
 //	BEGIN_PGP_SIGNED = '-----BEGIN PGP SIGNED MESSAGE-----',
+//	BEGIN_PGP_PUBLIC_KEY = '-----BEGIN PGP PUBLIC KEY BLOCK-----',
+//	END_PGP_PUBLIC_KEY = '-----END PGP PUBLIC KEY BLOCK-----',
 
 	PgpUserStore = new class {
-		constructor() {
-			// https://mailvelope.github.io/mailvelope/Keyring.html
-			this.mailvelopeKeyring = null;
-		}
-
 		init() {
 			if (SettingsCapa('OpenPGP') && window.crypto && crypto.getRandomValues) {
 				rl.loadScript(SettingsGet('StaticLibsJs').replace('/libs.', '/openpgp.'))
@@ -35,34 +35,9 @@ export const
 		}
 
 		loadKeyrings(identifier) {
-			identifier = identifier || SettingsGet('Email');
-			if (window.mailvelope) {
-				const fn = keyring => {
-						this.mailvelopeKeyring = keyring;
-						console.log('mailvelope ready');
-					};
-				mailvelope.getKeyring().then(fn, err => {
-					if (identifier) {
-						// attempt to create a new keyring for this app/user
-						mailvelope.createKeyring(identifier).then(fn, err => console.error(err));
-					} else {
-						console.error(err);
-					}
-				});
-				addEventListener('mailvelope-disconnect', event => {
-					alert('Mailvelope is updated to version ' + event.detail.version + '. Reload page');
-				}, false);
-			} else {
-				addEventListener('mailvelope', () => this.loadKeyrings(identifier));
-			}
-
-			if (OpenPGPUserStore.isSupported()) {
-				OpenPGPUserStore.loadKeyrings();
-			}
-
-			if (SettingsCapa('GnuPG')) {
-				GnuPGUserStore.loadKeyrings();
-			}
+			MailvelopeUserStore.loadKeyring(identifier);
+			OpenPGPUserStore.loadKeyrings();
+			GnuPGUserStore.loadKeyrings();
 		}
 
 		/**
@@ -79,22 +54,28 @@ export const
 			return 0 === text.trim().indexOf(BEGIN_PGP_MESSAGE);
 		}
 
-		async mailvelopeHasPublicKeyForEmails(recipients) {
-			const
-				keyring = this.mailvelopeKeyring,
-				mailvelope = keyring && await keyring.validKeyForAddress(recipients)
-					/*.then(LookupResult => Object.entries(LookupResult))*/,
-				entries = mailvelope && Object.entries(mailvelope);
-			return entries && entries.filter(value => value[1]).length === recipients.length;
+		importKey(key, gnuPG, backup) {
+			if (gnuPG || backup) {
+				Remote.request('PgpImportKey',
+					(iError, oData) => {
+						if (gnuPG && oData?.Result/* && (oData.Result.imported || oData.Result.secretimported)*/) {
+							GnuPGUserStore.loadKeyrings();
+						}
+						iError && alert(oData.message);
+					}, {
+						key, gnuPG, backup
+					}
+				);
+			}
+			OpenPGPUserStore.importKey(key);
 		}
 
 		/**
 		 * Checks if verifying/encrypting a message is possible with given email addresses.
 		 * Returns the first library that can.
 		 */
-		async hasPublicKeyForEmails(recipients) {
-			const count = recipients.length;
-			if (count) {
+		hasPublicKeyForEmails(recipients) {
+			if (recipients.length) {
 				if (GnuPGUserStore.hasPublicKeyForEmails(recipients)) {
 					return 'gnupg';
 				}
@@ -105,102 +86,36 @@ export const
 			return false;
 		}
 
-		async getMailvelopePrivateKeyFor(email/*, sign*/) {
-			let keyring = this.mailvelopeKeyring;
-			if (keyring && await keyring.hasPrivateKey({email:email})) {
-				return ['mailvelope', email];
-			}
-			return false;
-		}
-
-		/**
-		 * Checks if signing a message is possible with given email address.
-		 * Returns the first library that can.
-		 */
-		async getKeyForSigning(email) {
-			let key = OpenPGPUserStore.getPrivateKeyFor(email, 1);
-			if (key) {
-				return ['openpgp', key];
-			}
-
-			key = GnuPGUserStore.getPrivateKeyFor(email, 1);
-			if (key) {
-				return ['gnupg', key];
-			}
-
-	//		return await this.getMailvelopePrivateKeyFor(email, 1);
-		}
-
 		async decrypt(message) {
-			const sender = message.from[0].email,
-				armoredText = message.plain();
-
+			const armoredText = message.plain();
 			if (!this.isEncrypted(armoredText)) {
-				return;
+				throw Error('Not armored text');
 			}
 
 			// Try OpenPGP.js
-			let result = await OpenPGPUserStore.decrypt(armoredText, sender);
-			if (result) {
-				return result;
+			if (OpenPGPUserStore.isSupported()) {
+				const sender = message.from[0].email;
+				let result = await OpenPGPUserStore.decrypt(armoredText, sender);
+				if (result) {
+					return result;
+				}
 			}
 
 			// Try Mailvelope (does not support inline images)
-			try {
-				let key = await this.getMailvelopePrivateKeyFor(message.to[0].email);
-				if (key) {
-					/**
-					* https://mailvelope.github.io/mailvelope/Mailvelope.html#createEncryptedFormContainer
-					* Creates an iframe to display an encrypted form
-					*/
-	//				mailvelope.createEncryptedFormContainer('#mailvelope-form');
-					/**
-					* https://mailvelope.github.io/mailvelope/Mailvelope.html#createDisplayContainer
-					* Creates an iframe to display the decrypted content of the encrypted mail.
-					*/
-					const body = message.body;
-					body.textContent = '';
-					result = await mailvelope.createDisplayContainer(
-						'#'+body.id,
-						armoredText,
-						this.mailvelopeKeyring,
-						{
-							senderAddress: sender
-						}
-					);
-					if (result) {
-						if (result.error && result.error.message) {
-							if ('PWD_DIALOG_CANCEL' !== result.error.code) {
-								alert(result.error.code + ': ' + result.error.message);
-							}
-						} else {
-							body.classList.add('mailvelope');
-							return true;
-						}
-					}
-				}
-			} catch (err) {
-				console.error(err);
-			}
-
-			// Now try GnuPG
-			return GnuPGUserStore.decrypt(message);
+			return (await MailvelopeUserStore.decrypt(message))
+				// Or try GnuPG
+				|| GnuPGUserStore.decrypt(message);
 		}
 
 		async verify(message) {
-			const signed = message.pgpSigned();
+			const signed = message.pgpSigned(),
+				sender = message.from[0].email;
 			if (signed) {
-				const sender = message.from[0].email,
-					gnupg = GnuPGUserStore.hasPublicKeyForEmails([sender]),
-					openpgp = OpenPGPUserStore.hasPublicKeyForEmails([sender]);
-				// Detached signature use GnuPG first, else we must download whole message
-				if (gnupg && signed.SigPartId) {
-					return GnuPGUserStore.verify(message);
-				}
-				if (openpgp) {
+				// OpenPGP only when inline, else we must download the whole message
+				if (!signed.sigPartId && OpenPGPUserStore.hasPublicKeyForEmails([sender])) {
 					return OpenPGPUserStore.verify(message);
 				}
-				if (gnupg) {
+				if (GnuPGUserStore.hasPublicKeyForEmails([sender])) {
 					return GnuPGUserStore.verify(message);
 				}
 				// Mailvelope can't
@@ -208,29 +123,23 @@ export const
 			}
 		}
 
-		/**
-		 * Returns headers that should be added to an outgoing email.
-		 * So far this is only the autocrypt header.
-		 */
-	/*
-		this.mailvelopeKeyring.additionalHeadersForOutgoingEmail(headers)
-		this.mailvelopeKeyring.addSyncHandler(syncHandlerObj)
-		this.mailvelopeKeyring.createKeyBackupContainer(selector, options)
-		this.mailvelopeKeyring.createKeyGenContainer(selector, {
-	//		userIds: [],
-			keySize: 4096
-		})
-
-		this.mailvelopeKeyring.exportOwnPublicKey(emailAddr).then(<AsciiArmored, Error>)
-		this.mailvelopeKeyring.importPublicKey(armored)
-
-		// https://mailvelope.github.io/mailvelope/global.html#SyncHandlerObject
-		this.mailvelopeKeyring.addSyncHandler({
-			uploadSync
-			downloadSync
-			backup
-			restore
-		});
-	*/
-
+		getPublicKeyOfEmails(recipients) {
+			if (recipients.length) {
+				let result = {};
+				recipients.forEach(email => {
+					OpenPGPUserStore.publicKeys().forEach(key => {
+						if (key.for(email)) {
+							result[email] = key.armor;
+						}
+					});
+					GnuPGUserStore.publicKeys.map(async key => {
+						if (!result[email] && key.for(email)) {
+							result[email] = await key.fetch();
+						}
+					});
+				});
+				return result;
+			}
+			return false;
+		}
 	};
diff --git a/dev/Stores/User/SMime.js b/dev/Stores/User/SMime.js
new file mode 100644
index 000000000..2bd4f91c8
--- /dev/null
+++ b/dev/Stores/User/SMime.js
@@ -0,0 +1,21 @@
+import { addObservablesTo, koArrayWithDestroy } from 'External/ko';
+import { baseCollator } from 'Common/Translator';
+import Remote from 'Remote/User/Fetch';
+
+export const SMimeUserStore = koArrayWithDestroy();
+
+addObservablesTo(SMimeUserStore, {
+	loading: false
+});
+
+SMimeUserStore.loadCertificates = () => {
+	SMimeUserStore([]);
+	SMimeUserStore.loading(true);
+	Remote.request('SMimeGetCertificates', (iError, oData) => {
+		SMimeUserStore.loading(false);
+		const collator = baseCollator();
+		iError || SMimeUserStore(oData.Result.sort(
+			(a, b) => collator.compare(a.emailAddress, b.emailAddress) || (b.validTo_time_t - a.validTo_time_t)
+		));
+	});
+};
diff --git a/dev/Stores/User/Settings.js b/dev/Stores/User/Settings.js
index 50597f36b..841e89302 100644
--- a/dev/Stores/User/Settings.js
+++ b/dev/Stores/User/Settings.js
@@ -1,54 +1,70 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
+import { koComputable, addObservablesTo } from 'External/ko';
 
-import { Layout, EditorDefaultType } from 'Common/EnumsUser';
+import { LayoutSideView, LayoutBottomView } from 'Common/EnumsUser';
 import { pInt } from 'Common/Utils';
-import { addObservablesTo } from 'External/ko';
 import { $htmlCL, SettingsGet, fireEvent } from 'Common/Globals';
 import { ThemeStore } from 'Stores/Theme';
+import { FolderUserStore } from 'Stores/User/Folder';
 
 export const SettingsUserStore = new class {
 	constructor() {
 		const self = this;
 
-		self.layout = ko
-			.observable(1)
-			.extend({ limitedList: Object.values(Layout) });
-
-		self.editorDefaultType = ko.observable('Html').extend({
-			limitedList: [
-				EditorDefaultType.Html,
-				EditorDefaultType.Plain,
-				EditorDefaultType.HtmlForced,
-				EditorDefaultType.PlainForced
-			]
-		});
-
 		self.messagesPerPage = ko.observable(25).extend({ debounce: 999 });
-
+		self.checkMailInterval = ko.observable(15).extend({ debounce: 999 });
 		self.messageReadDelay = ko.observable(5).extend({ debounce: 999 });
 
 		addObservablesTo(self, {
 			viewHTML: 1,
-			showImages: 0,
+			viewImages: 0,
+			viewImagesWhitelist: '',
 			removeColors: 0,
+			allowStyles: 0,
+			collapseBlockquotes: 1,
+			maxBlockquotesLevel: 0,
+			minFontSize: 0,
+			listInlineAttachments: 0,
+			simpleAttachmentsList: 0,
 			useCheckboxesInList: 1,
+			listGrouped: 0,
+			showNextMessage: 0,
 			allowDraftAutosave: 1,
 			useThreads: 0,
+			defaultSort: '',
+			threadAlgorithm: '',
 			replySameFolder: 0,
 			hideUnsubscribed: 0,
-			autoLogout: 0
+			hideDeleted: 1,
+			unhideKolabFolders: 0,
+			autoLogout: 0,
+			keyPassForget: 15,
+			showUnreadCount: 0,
+			messageNewWindow: 0,
+			messageReadAuto: 0,
+
+			requestReadReceipt: 0,
+			requestDsn: 0,
+			requireTLS: 0,
+			pgpSign: 0,
+			pgpEncrypt: 0,
+			allowSpellcheck: 0,
+
+			layout: 1,
+			editorDefaultType: 'Html',
+			editorWysiwyg: 'Squire',
+			markdown: 0,
+			msgDefaultAction: 1
 		});
 
 		self.init();
 
-		self.usePreviewPane = koComputable(() => Layout.NoPreview !== self.layout() && !ThemeStore.isMobile());
+		self.usePreviewPane = koComputable(() => ThemeStore.isMobile() ? 0 : self.layout());
 
 		const toggleLayout = () => {
-			const value = ThemeStore.isMobile() ? Layout.NoPreview : self.layout();
-			$htmlCL.toggle('rl-no-preview-pane', Layout.NoPreview === value);
-			$htmlCL.toggle('rl-side-preview-pane', Layout.SidePreview === value);
-			$htmlCL.toggle('rl-bottom-preview-pane', Layout.BottomPreview === value);
+			const value = self.usePreviewPane();
+			$htmlCL.toggle('sm-msgView-side', LayoutSideView === value);
+			$htmlCL.toggle('sm-msgView-bottom', LayoutBottomView === value);
 			fireEvent('rl-layout', value);
 		};
 		self.layout.subscribe(toggleLayout);
@@ -58,7 +74,7 @@ export const SettingsUserStore = new class {
 		let iAutoLogoutTimer;
 		self.delayLogout = (() => {
 			clearTimeout(iAutoLogoutTimer);
-			if (0 < self.autoLogout() && !SettingsGet('AccountSignMe')) {
+			if (0 < self.autoLogout() && !SettingsGet('accountSignMe')) {
 				iAutoLogoutTimer = setTimeout(
 					rl.app.logout,
 					self.autoLogout() * 60000
@@ -69,21 +85,88 @@ export const SettingsUserStore = new class {
 
 	init() {
 		const self = this;
-		self.editorDefaultType(SettingsGet('EditorDefaultType'));
+
+		[
+			'EditorDefaultType',
+			'editorWysiwyg',
+			'messageNewWindow',
+			'messageReadAuto',
+			'MsgDefaultAction',
+			'ViewHTML',
+			'ViewImages',
+			'ViewImagesWhitelist',
+			'RemoveColors',
+			'AllowStyles',
+			'CollapseBlockquotes',
+			'MaxBlockquotesLevel',
+			'minFontSize',
+			'ListInlineAttachments',
+			'simpleAttachmentsList',
+			'UseCheckboxesInList',
+			'listGrouped',
+			'showNextMessage',
+			'AllowDraftAutosave',
+			'useThreads',
+			'defaultSort',
+			'threadAlgorithm',
+			'ReplySameFolder',
+			'HideUnsubscribed',
+			'HideDeleted',
+			'ShowUnreadCount',
+			'UnhideKolabFolders',
+			'requestReadReceipt',
+			'requestDsn',
+			'requireTLS',
+			'pgpSign',
+			'pgpEncrypt',
+			'allowSpellcheck',
+			'markdown'
+/*
+			'MessagesPerPage',
+			'MessageReadDelay',
+			'SoundNotification',
+			'NotificationSound',
+			'DesktopNotifications',
+			'Layout',
+			'AutoLogout',
+			'ContactsAutosave',
+			'contactsAllowed',
+			'CheckMailInterval',
+			'SentFolder',
+			'DraftsFolder',
+			'JunkFolder',
+			'TrashFolder',
+			'ArchiveFolder',
+			'hourCycle',
+			'Resizer4Width',
+			'Resizer5Width',
+			'Resizer5Height',
+			'fontSansSerif',
+			'fontSerif',
+			'fontMono',
+			'userBackgroundName',
+			'userBackgroundHash',
+			'autoVerifySignatures',
+			'allowLanguagesOnSettings',
+			'attachmentLimit',
+			'Theme',
+			'language',
+			'clientLanguage',
+			'StaticLibsJs',
+*/
+		].forEach(name => {
+			let value = SettingsGet(name);
+			name = name[0].toLowerCase() + name.slice(1);
+			self[name](value);
+		});
 
 		self.layout(pInt(SettingsGet('Layout')));
 		self.messagesPerPage(pInt(SettingsGet('MessagesPerPage')));
+		self.checkMailInterval(pInt(SettingsGet('CheckMailInterval')));
 		self.messageReadDelay(pInt(SettingsGet('MessageReadDelay')));
 		self.autoLogout(pInt(SettingsGet('AutoLogout')));
+		self.keyPassForget(pInt(SettingsGet('keyPassForget')));
 
-		self.viewHTML(SettingsGet('ViewHTML'));
-		self.showImages(SettingsGet('ShowImages'));
-		self.removeColors(SettingsGet('RemoveColors'));
-		self.useCheckboxesInList(SettingsGet('UseCheckboxesInList'));
-		self.allowDraftAutosave(SettingsGet('AllowDraftAutosave'));
-		self.useThreads(SettingsGet('UseThreads'));
-		self.replySameFolder(SettingsGet('ReplySameFolder'));
-
-		self.hideUnsubscribed(SettingsGet('HideUnsubscribed'));
+		FolderUserStore.sortMode(self.defaultSort());
 	}
 };
diff --git a/dev/Styles/@Admin.less b/dev/Styles/@Admin.less
index 85ebb53dc..48281cf62 100644
--- a/dev/Styles/@Admin.less
+++ b/dev/Styles/@Admin.less
@@ -14,7 +14,6 @@
 @import "../../vendors/bootstrap/less/alerts.less";
 
 @import "_FontasticToBoot.less";
-@import "_BootstrapFix.less";
 
 @import "Ui.less";
 @import "Main.less";
diff --git a/dev/Styles/@Boot.css b/dev/Styles/@Boot.css
index 87cf109ef..b575b4f8c 100644
--- a/dev/Styles/@Boot.css
+++ b/dev/Styles/@Boot.css
@@ -1,24 +1,70 @@
 :root {
-	--fontSans: "DejaVu Sans", Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", Arial, sans-serif;
+	--fontSans: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+	--fontSerif: ui-serif, Georgia, Cambria, "Times New Roman", Times, serif;
+	--fontMono: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
+}
+
+#rl-app.fontArial {
+	--fontSans: "Nimbus Sans L", "Liberation sans", "Arial Unicode MS", Arial, Helvetica, Garuda, Utkal, FreeSans, sans-serif;
+}
+#rl-app.fontTahoma {
+	--fontSans: "Luxi Sans", Tahoma, Loma, Geneva, Meera, sans-serif;
+}
+#rl-app.fontTrebuchet {
+	--fontSans: "DejaVu Sans Condensed", Trebuchet, "Trebuchet MS", sans-serif;
+}
+#rl-app.fontLucida {
+	--fontSans: "Lucida Sans Unicode", "Lucida Sans", "DejaVu Sans", "Bitstream Vera Sans", "DejaVu LGC Sans", sans-serif;
+}
+#rl-app.fontVerdana {
+	--fontSans: "DejaVu Sans", Verdana, Geneva, "Bitstream Vera Sans", "DejaVu LGC Sans", sans-serif;
+}
+#rl-app.fontMonoCourier {
+	--fontMono: "Liberation Mono", "Courier New", FreeMono, Courier, monospace;
+}
+#rl-app.fontMonoLucida {
+	--fontMono: "DejaVu Sans Mono", "DejaVu LGC Sans Mono", "Bitstream Vera Sans Mono", "Lucida Console", Monaco, monospace;
+}
+#rl-app.fontSerifTimes {
 	--fontSerif: "Nimbus Roman No9 L", "Times New Roman", Times, FreeSerif, serif;
-	--fontMono: "Liberation Mono", Monaco, Menlo, Consolas, "Courier New", FreeMono, Courier, monospace;
+}
+#rl-app.fontSerifPalatino {
+	--fontSerif: "Bitstream Charter", "Palatino Linotype", Palatino, Palladio, "URW Palladio L", "Book Antiqua", Times, serif;
+}
+#rl-app.fontSerifGeorgia {
+	--fontSerif: "URW Palladio L", Georgia, Times, serif;
 }
 
 html, body {
-	font-family: var(--fontSans);
 	margin: 0;
 	padding: 0;
+	-webkit-text-size-adjust: 100%; /* 2 */
 }
 
-body {
-	background: var(--main-bg-color, #aaa);
+#rl-app *, #rl-app *::before, #rl-app *::after {
+	box-sizing: border-box;
+}
+
+#rl-app {
+	background-color: var(--main-bg-color, #aaa);
 	color: var(--main-color, #333);
+	font-family: var(--fontSans);
+
+	-webkit-touch-callout: none;
+	font-size: var(--main-font-size, 14px);
+	line-height: 1.25; /* 1 */
+	position: relative;
+}
+body#rl-app {
+	height: 100vh;
+	height: 100dvh;
+	width: 100vw;
 }
 
-#rl-loading, #rl-loading-error {
+#rl-loading, #rl-loading-error, #rl-BadBrowser, #rl-NoCookie {
 	color: var(--loading-color, #000);
 	text-shadow: var(--loading-text-shadow);
-	font-size: 30px;
+	font-size: 214%;
 	line-height: 130%;
 	position: fixed;
 	text-align: center;
diff --git a/dev/Styles/@Main.less b/dev/Styles/@Main.less
index be381df6c..d91d9559a 100644
--- a/dev/Styles/@Main.less
+++ b/dev/Styles/@Main.less
@@ -14,11 +14,9 @@
 @import "../../vendors/bootstrap/less/alerts.less";
 @import "../../vendors/bootstrap/less/code.less";
 @import "../../vendors/bootstrap/less/dropdowns.less";
-@import "../../vendors/bootstrap/less/navs.less";
 @import "../../vendors/bootstrap/less/utilities.less";
 
 @import "_FontasticToBoot.less";
-@import "_BootstrapFix.less";
 
 @import "Ui.less";
 @import "Main.less";
@@ -36,6 +34,7 @@
 @import "User/Identity.less";
 @import "User/AdvancedSearch.less";
 @import "User/Attachments.less";
+@import "User/MessageFlags.less";
 @import "User/MessageList.less";
 @import "User/MessageView.less";
 @import "User/Contacts.less";
@@ -54,4 +53,43 @@
 
 @import "User/Animations.less";
 
+@import "rtl.less";
+
 @import "_End.less";
+
+@media print {
+	#rl-app, #rl-right {
+		position: initial;
+	}
+	#rl-left {
+		display: none;
+	}
+	#rl-content, #rl-right {
+		display: block;
+		width: 100%;
+	}
+	.message-selected {
+		.close,
+		.infoParent,
+		.top-toolbar,
+		.messageView .controls-handle,
+		#tags-dropdown-id,
+		.message-fixed-button-toolbar,
+		#V-MailMessageList,
+		#V-SystemDropDown,
+		.bodySubHeader {
+			display: none;
+		}
+		#V-MailMessageView {
+			left: 0;
+			overflow: initial;
+			position: initial;
+		}
+		.messageView,
+		.messageView .b-message,
+		#messageItem,
+		#messageItem .b-text-part {
+			height: auto;
+		}
+	}
+}
diff --git a/dev/Styles/Admin/About.less b/dev/Styles/Admin/About.less
index 73d0991cd..945f04738 100644
--- a/dev/Styles/Admin/About.less
+++ b/dev/Styles/Admin/About.less
@@ -4,6 +4,7 @@
 		display: inline-block;
 		width: 250px;
 		height: 200px;
-		background: url("images/snappymail-logo.png") -30px -30px;
+		/* Yes this LESS css relative path quirk becomes ../ */
+		background: url(../../images/snappymail-logo.png) -30px -30px;
 	}
 }
diff --git a/dev/Styles/Admin/Config.less b/dev/Styles/Admin/Config.less
index 68283efa6..b8100460e 100644
--- a/dev/Styles/Admin/Config.less
+++ b/dev/Styles/Admin/Config.less
@@ -4,5 +4,10 @@
 
 	em {
 		display: block;
+		white-space: pre-wrap;
+	}
+
+	th {
+		background: rgba(128,128,128,0.3);
 	}
 }
diff --git a/dev/Styles/Admin/Domain.less b/dev/Styles/Admin/Domain.less
index 268e90d67..562aef636 100644
--- a/dev/Styles/Admin/Domain.less
+++ b/dev/Styles/Admin/Domain.less
@@ -7,16 +7,12 @@
 	max-width: 810px;
 
 	.domain-desc {
-		color: #666;
-		line-height: 20px;
-		background-color: #f9f9f9;
 		padding: 8px;
-		border: 1px solid #eee;
-		border-radius: 3px;
+		border: 1px solid;
+		border-radius: var(--input-border-radius, 3px);
 		margin: -5px 0;
-		i {
-			font-style: normal;
-			color: red;
+		strong {
+			color: var(--error-clr, #b94a48);
 		}
 	}
 
@@ -30,7 +26,7 @@
 
 	.tab-content {
 		grid-column-end: 5;
-		border: 1px solid #ddd;
+		border: 1px solid var(--border-color, #ddd);
 		padding: 10px;
 	}
 }
diff --git a/dev/Styles/Admin/Domains.less b/dev/Styles/Admin/Domains.less
index 8c92ecb57..ae5aab987 100644
--- a/dev/Styles/Admin/Domains.less
+++ b/dev/Styles/Admin/Domains.less
@@ -7,12 +7,10 @@
 	.domain-name {
 		display: inline-block;
 		word-break: break-all;
-		box-sizing: border-box;
 	}
 
 	.domain-alias {
 		display: inline-block;
-		box-sizing: border-box;
 		color: #bbb;
 		padding-left: 5px;
 	}
diff --git a/dev/Styles/Admin/Layout.less b/dev/Styles/Admin/Layout.less
index 83294f1d8..40ef19ace 100644
--- a/dev/Styles/Admin/Layout.less
+++ b/dev/Styles/Admin/Layout.less
@@ -1,19 +1,7 @@
 
-.UserBackground body {
-	background-size: contain;
-	background-repeat: no-repeat;
-	background-position: center;
-}
-
-#rl-content {
-	display:flex;
-	height: 100%;
-}
-
 #rl-left {
 	flex-grow: 0;
 	flex-shrink: 0;
-	overflow: auto;
 	padding-top: 50px + @rlLowMargin + 10px;
 	transition: width 0.3s ease-out;
 	width: @rlLeftWidth;
@@ -23,7 +11,7 @@
 			color: var(--settings-menu-color, #333);
 			cursor: pointer;
 			display: block;
-			font-size: 18px;
+			font-size: 128%;
 			line-height: 30px;
 			padding: 4px 10px;
 			text-decoration: none;
@@ -48,20 +36,27 @@
 }
 
 #V-AdminPane {
-	height: 100%;
+	height: calc(100% - 50px - @rlLowMargin);
+	margin: 50px @rlLowMargin 0 0;
+
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
+	box-shadow: var(--smMainShadow);
+	overflow-y: auto;
+	padding: 20px;
+	scroll-behavior: smooth;
 
 	> .b-toolbar {
+		color: #fff;
+		display: flex;
 		position: absolute;
 		top: 0;
 		right: 0;
 		left: 0;
-		height: 34px;
 		padding: 8px @rlLowMargin 8px 0;
-		color: #fff;
 		text-shadow: 0 1px 1px #000;
 
-		display: flex;
-
 		h4 {
 			flex-grow: 1;
 			margin: 8px;
@@ -74,20 +69,8 @@
 	padding-right: 12px;
 }
 
-#rl-settings-subscreen {
-	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
-	box-shadow: @rlMainShadow;
-	box-sizing: border-box;
-	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
-	margin: (50px + @rlLowMargin) @rlLowMargin @rlLowMargin 0;
-	overflow-y: auto;
-	padding: 20px;
-}
-
 /* desktop */
-@media screen and (min-width: 1000px) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.toggleLeft {
 		display: none;
 	}
@@ -100,16 +83,16 @@
 	}
 }
 
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
-	#rl-settings-subscreen {
-		padding: 10px;
-	}
-
+@media screen and (max-width: @maxMobileWidth) {
 	#rl-right {
 		min-width: calc(100% - @rlLowMargin);
 	}
 
+	#V-AdminPane {
+		margin-right: 0;
+		padding: 10px;
+	}
+
 	html.rl-left-panel-disabled {
 		#rl-left {
 			width: 0;
diff --git a/dev/Styles/Admin/Packages.less b/dev/Styles/Admin/Packages.less
index 50b17d72a..54583b8a8 100644
--- a/dev/Styles/Admin/Packages.less
+++ b/dev/Styles/Admin/Packages.less
@@ -26,7 +26,7 @@
 		font-weight: bold;
 	}
 	.package-desc {
-		font-size: 12px;
+		font-size: 85%;
 		opacity: 0.7;
 	}
 
diff --git a/dev/Styles/Admin/Plugin.less b/dev/Styles/Admin/Plugin.less
index cb6c50b81..c42d4f3c9 100644
--- a/dev/Styles/Admin/Plugin.less
+++ b/dev/Styles/Admin/Plugin.less
@@ -2,17 +2,6 @@
 
 	max-width: 660px;
 
-	.information {
-		display: inline-block;
-		background-color: #ddd;
-		border-radius: 10px;
-		cursor: pointer;
-		height: 25px;
-		width: 30px;
-		text-align: center;
-		padding-top: 5px;
-	}
-
 	textarea {
 		width: 400px;
 		height: 70px;
@@ -30,7 +19,7 @@
 	.help-block span {
 		background-color: #fff;
 		border: 1px solid #000;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 		color: #000;
 		display: none;
 		left: 2px;
@@ -45,4 +34,9 @@
 		display: block;
 	}
 
+	.tab-content {
+		grid-column-end: 3;
+		border: 1px solid var(--border-color, #ddd);
+		padding: 10px;
+	}
 }
diff --git a/dev/Styles/Ask.less b/dev/Styles/Ask.less
index 7f7d569bc..995525c2a 100644
--- a/dev/Styles/Ask.less
+++ b/dev/Styles/Ask.less
@@ -1,8 +1,13 @@
 #V-PopupsAsk {
 
 	.modal-body {
-		font-size: 18px;
+		font-size: 128%;
 		padding: 3em 15px;
 		text-align: center;
 	}
+
+	button:focus {
+		box-shadow: 0 0 1px inset;
+	}
+
 }
diff --git a/dev/Styles/Components.less b/dev/Styles/Components.less
index 0cc3edb44..f77dac2e3 100644
--- a/dev/Styles/Components.less
+++ b/dev/Styles/Components.less
@@ -41,54 +41,54 @@
 		outline: 1px dotted;
 	}
 
-	&.e-checkbox {
-
-		cursor: pointer;
-		margin-bottom: 6px;
-		margin-left: -2px;
-		padding: 2px;
-
-		&:focus {
-			outline: 1px dotted;
-		}
-
-		&.disabled {
-			cursor: not-allowed;
-			opacity: 0.5;
-		}
-	}
-
 	span {
-		margin-left: 0.5em;
+		margin: 0 0.5em;
 		white-space: normal;
 	}
 
 	select + span {
-		line-height: 1.43em;
-		padding: 4px 0;
+		padding: 2px 0;
+	}
+}
+
+.e-checkbox {
+
+	cursor: pointer;
+	margin-bottom: 6px;
+	padding: 2px 0;
+
+	&:focus-within {
+		outline: 1px dotted;
+	}
+
+	&.disabled {
+		cursor: not-allowed;
+		opacity: 0.5;
 	}
 }
 
 .e-checkbox.material-design {
 
 	line-height: 20px;
+	width: auto !important;
 
 	> div {
 		position: relative;
 		width: 18px;
-		height: 18px;
-		vertical-align: top;
 	}
 
 	> div > div {
 		position: absolute;
-		box-sizing: border-box;
-		margin-top: 1px;
-
+		.checkbox-box-sizes();
 		animation: checkmark-to-box 200ms ease-out forwards;
 	}
 
-	div.checked {
+	input {
+		opacity:0;
+	}
+
+	input:checked + div {
+		.checkbox-mark-sizes();
 		animation: box-to-checkmark 200ms ease-out forwards;
 	}
 }
diff --git a/dev/Styles/Languages.less b/dev/Styles/Languages.less
index 8111bec7e..e0046710d 100644
--- a/dev/Styles/Languages.less
+++ b/dev/Styles/Languages.less
@@ -1,15 +1,15 @@
 #V-PopupsLanguages {
 
-	max-width: 710px;
+	max-width: 720px;
 
 	label {
 		display: inline-block;
 		padding: 5px 15px;
 		margin: 2px 5px;
-		width: 180px;
+		width: 216px;
 		background-color: rgba(128, 128, 128, 0.1);
 		border: 1px solid transparent;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
 		position: relative;
 		cursor: pointer;
 
@@ -34,8 +34,8 @@
 	}
 }
 
-@media screen and (max-width: 999px) {
+@media screen and (max-width: 480px) {
 	#V-PopupsLanguages label {
-		width: calc(100% - 40px);
+		width: 100%;
 	}
 }
diff --git a/dev/Styles/Login.less b/dev/Styles/Login.less
index 603d59903..2a5ee12d8 100644
--- a/dev/Styles/Login.less
+++ b/dev/Styles/Login.less
@@ -10,15 +10,11 @@
 	z-index: 5;
 }
 
-@glass-color: #fff;
-@glass-error-color: #f76260;
-@glass-m-color: rgba(255, 255, 255, .8);
-
 .LoginView {
 
 	.descWrapper {
 		color: var(--loading-color, #000);
-		font-size: 30px;
+		font-size: 214%;
 		margin-bottom: 10px;
 		text-align: center;
 		text-shadow: var(--loading-text-shadow);
@@ -29,18 +25,18 @@
 		border: var(--login-border, 1px solid rgba(255, 255, 255, .2));
 		border-radius: var(--login-border-radius, 7px);
 		box-shadow: var(--login-box-shadow);
-		color: var(--login-color, @glass-m-color);
+		color: var(--login-color, rgba(255, 255, 255, .8));
 		margin: 0;
 		padding: 40px 40px 20px 40px;
 		position: relative;
 
 		* {
-			color: var(--login-color, @glass-m-color);
+			color: var(--login-color, rgba(255, 255, 255, .8));
 		}
 
 		.controls.error * {
-			color: @glass-error-color;
-			border-color: @glass-error-color;
+			color: #f76260;
+			border-color: #f76260;
 		}
 
 		&.submitting > * {
@@ -72,62 +68,47 @@
 	}
 
 	input {
-		font-size: 18px;
+		font-size: 128%;
 		height: 40px;
 		padding-right: 30px;
 
 		&:placeholder {
-			color: @glass-color;
+			color: #fff;
 		}
 
 		&:focus, &:hover {
-			border-color: @glass-color;
+			border-color: #fff;
 		}
 	}
 
 	input, .btn {
-		background: none !important;
-		border: 1px solid @glass-m-color;
-		color: @glass-color;
+		background: none;
+		border: 1px solid rgba(255, 255, 255, .8);
 	}
 
 	.fontastic + input {
-		padding-left: 30px;
+		padding: 0 30px;
 	}
 
 	.controls > .fontastic:first-child {
 		position: absolute;
-		font-size: 17px;
+		font-size: 121%;
 		line-height: 38px;
 		left: 6px;
 	}
 
-	input + button {
-		border: none;
-		background: none;
-		cursor: pointer;
-		display: inline-block;
-		font-size: 17px;
-		line-height: 38px;
-		margin: 0;
-		padding: 0;
-		position: absolute;
-		right: 6px;
-		top: 0;
-	}
-
 	.btn {
 
 		text-transform: uppercase;
-		font-size: 13px;
+		font-size: 90%;
 
 		&:hover, &:active {
-			border-color: @glass-color;
+			border-color: #fff;
 		}
 	}
 
 	.buttonLogin {
-		margin: 0;
+		width: 100%;
 	}
 
 	.alert {
@@ -138,6 +119,11 @@
 		display: block;
 		opacity: 1;
 		transition: opacity 0.5s linear;
+
+		p {
+			font-family: var(--fontMono);
+			font-size: 90%;
+		}
 	}
 	.alert[hidden] {
 		opacity: 0;
@@ -145,8 +131,7 @@
 
 	.language-buttons {
 		flex-grow: 1;
-		margin-top: 5px;
-		text-align: right;
+		text-align: var(--right, right);
 	}
 
 	.language-button {
diff --git a/dev/Styles/Main.less b/dev/Styles/Main.less
index b23555de0..8df8433ee 100644
--- a/dev/Styles/Main.less
+++ b/dev/Styles/Main.less
@@ -1,32 +1,18 @@
-/**
- * 1. Correct the line height in all browsers.
- * 2. Prevent adjustments of font size after orientation changes in iOS.
- */
-
-html, body {
-	height: 100%;
-	overflow: hidden;
-	line-height: 1.15; /* 1 */
-	-webkit-text-size-adjust: 100%; /* 2 */
-}
-
-body {
-	-webkit-touch-callout: none;
-	font-size: @baseFontSize;
-	position: fixed;
-	top: 0;
-	left: 0;
-	bottom: 0;
-	right: 0;
-}
 
 html.list-loading body {
 /*	cursor: wait;*/
 	cursor: progress;
 }
 
-@media screen and (min-width: 1000px) {
-	body {
+.toggleLeft::before {
+	content: '❮';
+}
+html.rl-left-panel-disabled .toggleLeft::before {
+	content: '❯';
+}
+
+@media screen and (min-width: @maxMobileWidth + 1px) {
+	#rl-app {
 		background-image: var(--main-bg-image);
 		background-size: var(--main-bg-size);
 		background-repeat: var(--main-bg-repeat);
@@ -43,6 +29,10 @@ option:disabled {
 	-webkit-tap-highlight-color: rgba(0,0,0,0);
 }
 
+#rl-content:not([hidden]) {
+	display:flex;
+	height: 100%;
+}
 
 dialog::backdrop {
 	background: rgba(0,0,0,0.5);
@@ -58,14 +48,16 @@ dialog::backdrop {
 
 dialog {
 	border: 0;
-	background-color: @white;
-	border: 1px solid rgba(0,0,0,.3);
-	border-radius: 6px;
+	background-color: var(--dialog-bg-clr, #fff);
+	border: 1px solid var(--dialog-border-clr, rgba(0,0,0,.3));
+	border-radius: var(--dialog-border-radius, 6px);
 	box-shadow: 0 5px 80px rgba(0,0,0,0.3);
+	color: var(--dialog-clr, #333);
 	display: flex;
 	flex-direction: column;
 	margin: 10px auto;
-	max-height: calc(100vh - 20px);
+	max-height: calc(100vh - var(--smDialogShrink));
+	max-height: calc(100dvh - var(--smDialogShrink));
 	max-width: 560px;
 	overflow: auto;
 	padding: 0;
@@ -86,9 +78,21 @@ dialog:not(.animate) {
 	top: -25%;
 }
 
+/**
+ * https://github.com/the-djmaze/snappymail/issues/686
+ */
+@media screen and (max-width: @maxMobileWidth) {
+	dialog {
+		margin: 0 auto;
+/*		max-height: calc(100vh - 86px);*/
+/*		max-height: 100dvh;*/
+		width: 100%;
+	}
+}
+
 dialog > header {
 	padding: 9px 15px;
-	border-bottom: 1px solid #eee;
+	border-bottom: 1px solid var(--border-color, #ddd);
 
 	// Close icon
 	.close {
@@ -112,11 +116,11 @@ dialog .modal-body {
 
 // Footer (for actions)
 dialog > footer {
-	padding: 14px 15px 15px;
+	padding: 9px 15px;
 	margin-bottom: 0;
-	text-align: right; // right align buttons
-	border-top: 1px solid #ddd;
-	border-radius: 0 0 6px 6px;
+	text-align: var(--right, right); // right align buttons
+	border-top: 1px solid var(--border-color, #ddd);
+	border-radius: 0 0 var(--dialog-border-radius, 6px) var(--dialog-border-radius, 6px);
 
 	// Properly space out buttons
 	.btn + .btn {
diff --git a/dev/Styles/Ui.less b/dev/Styles/Ui.less
index 6a7cb090e..d33c25d55 100644
--- a/dev/Styles/Ui.less
+++ b/dev/Styles/Ui.less
@@ -1,5 +1,4 @@
 
-#rl-settings-subscreen,
 .g-ui-user-select-none {
 	user-select: none;
 	-webkit-touch-callout: none;
@@ -20,9 +19,8 @@
 .settings-save-trigger {
 
 	display: inline-block;
-	height: 1em;
 	line-height: 1em;
-	margin-left: 0.5em;
+	margin-left: 0.5em !important;
 
 	&::after {
 		font-family: "snappymail";
@@ -56,7 +54,7 @@ textarea + .settings-save-trigger {
 	vertical-align: top;
 }
 
-.settings-saved-trigger-input {
+.settings-save-trigger-input {
 	transition: border-color 0.5s linear;
 
 	&.success {
@@ -99,9 +97,11 @@ tr:hover .drag-handle {
 
 .tabs {
     display: grid;
+    grid-auto-columns: minmax(0, 1fr);
+    grid-template-rows: min-content auto;
 }
 
-.tabs input[type="radio"] {
+.tabs > input[type="radio"] {
 	position: absolute;
 	top: 0;
 	left: -9999px;
@@ -109,24 +109,23 @@ tr:hover .drag-handle {
 }
 
 // Actual tabs
-.tabs label {
+.tabs > label {
 	border: 1px solid transparent;
 	border-radius: 4px 4px 0 0;
 	cursor: pointer;
 	grid-row-start: 1;
-	line-height: @baseLineHeight;
 	opacity: 0.6;
 	margin: 0 2px -1px 0;
 	padding: 5px;
 	text-align: center;
 	&:hover {
-		border-color: @grayLighter;
+		border-color: var(--tab-hover-border-clr, #eee);
 		opacity: 0.8;
 	}
 }
-.tabs [id^="tab"]:checked + label {
-	background-color: @white;
-	border-color: #ddd #ddd transparent #ddd;
+.tabs > [id^="tab"]:checked + label {
+	background-color: var(--tab-active-bg-clr, #fff);
+	border-color: var(--border-color, #ddd) var(--border-color, #ddd) transparent var(--border-color, #ddd);
 	opacity: 1;
 	z-index: 1;
 }
@@ -140,6 +139,37 @@ tr:hover .drag-handle {
 	visibility: hidden;
 }
 
-.tabs [id^="tab"]:checked + label + .tab-content {
+.tabs > [id^="tab"]:checked + label + .tab-content {
 	visibility: visible;
 }
+
+// OTHER
+
+.legend {
+	border-bottom: 1px solid var(--border-color, #ddd);
+	font-size: 150%;
+	line-height: 2.1;
+	margin-bottom: 1.43em;
+}
+summary.legend {
+	cursor: pointer;
+}
+
+.btn.btn-thin {
+	padding: 0 9px;
+}
+
+@media screen and (max-width: @maxMobileWidth) {
+	.form-horizontal {
+		.control-group {
+			> label {
+				text-align: var(--left, left);
+			}
+
+			// Move over all input controls and content
+			> *:not(label) {
+				margin-left: 20px;
+			}
+		}
+	}
+}
diff --git a/dev/Styles/User/AdvancedSearch.less b/dev/Styles/User/AdvancedSearch.less
index e9043f598..005e02f57 100644
--- a/dev/Styles/User/AdvancedSearch.less
+++ b/dev/Styles/User/AdvancedSearch.less
@@ -1,11 +1,20 @@
 #V-PopupsAdvancedSearch {
-
 	max-width: 780px;
-
 	label {
 		width: 110px;
 	}
-	.span4 {
-		width: 360px;
+}
+#advancedsearchform > div {
+	display: inline-block;
+	vertical-align: top;
+	margin-right:1em;
+}
+
+@media screen and (max-width: 480px) {
+	#advancedsearchform label {
+		width: 100%;
+	}
+	#advancedsearchform label + * {
+		margin-left: 0;
 	}
 }
diff --git a/dev/Styles/User/Animations.less b/dev/Styles/User/Animations.less
index da155da61..317c98a24 100644
--- a/dev/Styles/User/Animations.less
+++ b/dev/Styles/User/Animations.less
@@ -10,7 +10,7 @@
 	100% {background-position: 60px 0;}
 }
 
-@media screen and (min-width: 1000px) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 
 	.b-folders li .anim-action-class {
 		animation: highlight-folder-row 0.5s linear;
diff --git a/dev/Styles/User/Attachments.less b/dev/Styles/User/Attachments.less
index 4ef482afd..9fad78369 100644
--- a/dev/Styles/User/Attachments.less
+++ b/dev/Styles/User/Attachments.less
@@ -1,28 +1,26 @@
+.attachmentList {
+	margin: 0;
+}
+
 .attachmentItem {
 
-	position: relative;
-
-	display: inline-block;
-	margin: 5px;
-	max-width: 200px;
-	min-width: 60px;
-	overflow: hidden;
-	list-style: none;
-	line-height: 24px;
-	border: 0;
 	background-color: rgba(128, 128, 128, 0.1);
+	border: 0;
+	border-radius: var(--input-border-radius, 3px);
 	box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.04), 0 1px 5px rgba(0, 0, 0, 0.1);
-
-	border-radius: 3px;
+	display: inline-block;
+	list-style: none;
+	line-height: 20px;
+	margin: 5px;
+	min-height: 48px;
+	width: 16em;
+	overflow: hidden;
+	position: relative;
 
 	&.waiting {
 		opacity: 0.6;
 	}
 
-	&.checked {
-		box-shadow: 0 0 0 1px rgba(0, 0, 255, 0.1), 0 1px 5px rgba(0, 0, 255, 0.2);
-	}
-
 	.checkboxAttachment {
 		bottom: 6px;
 		cursor: pointer;
@@ -36,10 +34,10 @@
 		}
 	}
 
-	.attachmentIconParent {
+	.attachmentIcon {
 		position: absolute;
-		height: 56px;
-		width: 60px;
+		height: 48px;
+		width: 48px;
 		text-align: center;
 	}
 
@@ -57,7 +55,7 @@
 	}
 
 	.iconBG {
-		font-size: 18px;
+		font-size: 128%;
 		font-weight: bold;
 		line-height: 55px;
 		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.8);
@@ -70,7 +68,7 @@
 	.attachmentNameParent {
 		border-left: 1px solid #ddd;
 		cursor: pointer;
-		margin-left: 60px;
+		margin-left: 48px;
 		min-width: 90px;
 		padding: 4px 4px 3px 6px;
 		position: relative;
@@ -83,15 +81,16 @@
 	}
 
 	.attachmentSize {
-		font-size: 12px;
-		opacity: 0.5;
+		font-size: 85%;
+		opacity: 0.7;
 	}
 
 	.iconMain, .iconPreview {
-		box-sizing: border-box;
 		padding: 6px 0 0;
-		font-size: 36px;
-		color: #aaa;
+		font-size: 257%;
+		color: var(--main-color);
+		filter: invert(33%);
+		mix-blend-mode: difference;
 
 		&.icon-none {
 			display: none;
@@ -106,22 +105,41 @@
 	}
 */
 
-	.showPreview, .showPreplay,
+	.showPreview,
 	.hasPreview:hover .iconMain,
-	.hasPreplay:hover .iconMain,
-	.hasPreview .hidePreview,
-	.hasPreplay .hidePreview {
+	.hasPreview .hidePreview {
 		display: none;
 	}
 
-	.hasPreview:hover .iconPreview,
-	.hasPreplay:hover .iconPreview {
+	.hasPreview:hover .iconPreview {
 		display: inline-block;
 	}
 
-	.hasPreview .showPreview,
-	.hasPreplay .showPreplay {
+	.hasPreplay:hover .iconMain::before {
+		content: "▶";
+	}
+
+	.hasPreview .showPreview {
 		display: inline;
 		cursor: pointer;
 	}
 }
+
+.attachmentListSimple {
+	margin: 0;
+
+	.attachmentItem {
+		min-height: 1em;
+		border: 1px solid var(--border-color);
+		padding: 0 2px;
+	}
+
+	.attachmentName {
+		margin:0;
+	}
+
+	.checkboxAttachment {
+		position: initial;
+		margin-left:.5em;
+	}
+}
diff --git a/dev/Styles/User/Compose.less b/dev/Styles/User/Compose.less
index 9da079e94..56eae3dd1 100644
--- a/dev/Styles/User/Compose.less
+++ b/dev/Styles/User/Compose.less
@@ -7,9 +7,11 @@
 }
 
 #V-PopupsCompose {
-	height: calc(100vh - 52px);
-	max-width: 1000px;
-	width: 98%;
+	height: 100vh;
+	height: 100dvh;
+	max-width: min(99vw, 1600px);
+	resize: horizontal;
+	width: 99%;
 
 	.modal-body {
 		padding: 0;
@@ -18,8 +20,21 @@
 		height: 100%;
 	}
 
+	.tabs {
+		height: 100%;
+		max-height: 100%;
+		overflow: auto;
+	}
+
+	.tabs > label > * + * {
+		margin-left: 0.5em;
+	}
+
+	.tabs .tab-content {
+		overflow: auto;
+	}
+
 	.textAreaParent, .attachmentAreaParent {
-		box-sizing: border-box;
 		height: 100%;
 		min-height: 200px;
 		position: relative;
@@ -28,6 +43,11 @@
 	.textAreaParent {
 		display: flex;
 		flex-direction: column;
+/*
+		.rl-signature {
+			border-top: 1px solid rgba(128,128,128,0.7);
+		}
+*/
 	}
 
 	.attachmentAreaParent {
@@ -39,8 +59,8 @@
 	.no-attachments-desc {
 		padding-top: 50px;
 		text-align: center;
-		font-size: 24px;
-		color: #666;
+		font-size: 171%;
+		opacity: 0.5;
 		text-shadow: 0 1px 0 rgba(255, 255, 255, 0.5);
 	}
 
@@ -52,7 +72,7 @@
 		.close, .minimize-custom {
 			border-color: #eee;
 			float: none;
-			font-size: 24px;
+			font-size: 171%;
 			opacity: 1;
 			line-height: 28px;
 			margin-left: .7em;
@@ -86,7 +106,7 @@
 		}
 		td:first-child {
 			padding: 0 10px 0 0;
-			text-align: right;
+			text-align: var(--right, right);
 			white-space: nowrap;
 			width: 4em;
 		}
@@ -126,29 +146,24 @@
 		top: 5px;
 		bottom: 5px;
 
-		border: 2px #777 dashed;
+		border: 2px var(--border-color, #ddd) dashed;
 		z-index: 300;
 
 		line-height: 119px;
 		text-align: center;
-		background-color: #efefef;
-		font-size: 24px;
+		background-color: var(--dialog-bg-clr, #fff);
+		font-size: 171%;
 
 		border-radius: 10px;
 
+		opacity: 0.9;
 		&.dragAndDropOver {
-			background-color: #fff;
+			border-color: var(--main-color, #fff);
+			opacity: 1;
 		}
 	}
 }
 
-@media screen and (max-width: 999px) {
-	#V-PopupsCompose {
-		border: 0;
-		width: 100%;
-	}
-}
-
 .minimize-custom {
 	border: 0 solid #333;
 	border-bottom-width: 3px;
diff --git a/dev/Styles/User/Contacts.less b/dev/Styles/User/Contacts.less
index 620cf5b2f..d9744e907 100644
--- a/dev/Styles/User/Contacts.less
+++ b/dev/Styles/User/Contacts.less
@@ -1,62 +1,53 @@
 
-@contacts-popup-left-width: 25%;
-
 #V-PopupsContacts {
-
-	bottom: 0;
-	width: auto;
-	min-width: 550px;
+	height: 100vh;
+	height: 100dvh;
 	max-width: 900px;
 	min-height: 300px;
-	max-height: 700px;
 
 	.control-group {
-		label {
+		label.iconsize24 {
 			padding-top: 0;
 			width: 50px;
 		}
 	}
 
 	.modal-body {
-		height: calc(100vh - 49px);
+		display: flex;
+		height: 100%;
 		padding: 0;
-		position: relative;
+	}
+
+	/* Left */
+
+	.left {
+		max-width: 30%;
 	}
 
 	.b-list-toolbar {
 		padding: 0;
 		height: 44px;
 		text-align: center;
-		width: @contacts-popup-left-width;
-		border-bottom: 1px solid rgba(128,128,128,0.4);
+		border-bottom: 1px solid var(--border-color, #ddd);
 
 		.e-search {
 			margin: 7px 0 0;
-			width: calc(100% - 20px);
+			width: calc(100% - 10px);
 		}
 	}
 
 	.b-list-footer-toolbar {
-		position: absolute;
-		left: 0;
-		bottom: 0;
 		height: 46px;
-		width: @contacts-popup-left-width;
-		background-color: var(--message-list-toolbar-bg-color,#eee);
-		box-shadow: inset 0 1px 0 #ccc;
+		border-top: 1px solid var(--border-color, #ddd);
 
 		.footer-pager {
 			padding: 8px 10px 0 0;
-			text-align: right;
+			text-align: var(--right, right);
 		}
 	}
 
 	.b-list-content {
-		position: absolute;
-		top: 45px;
-		bottom: 46px;
-		left: 0;
-		width: @contacts-popup-left-width;
+		height: calc(100% - 44px - 46px);
 		overflow: hidden;
 		overflow-y: auto;
 		scroll-behavior: smooth;
@@ -72,7 +63,7 @@
 			color: #999;
 			text-align: center;
 			padding: 60px 10px;
-			font-size: 24px;
+			font-size: 171%;
 			line-height: 30px;
 		}
 	}
@@ -87,12 +78,11 @@
 		position: relative;
 
 		margin: 0;
-		border: 0;
 		border-left: 6px solid #eee;
-		border-bottom: 1px solid rgba(128,128,128,0.25);
+		border-bottom: 1px solid var(--border-color, #ddd) !important;
 
 		&.focused {
-			border-left-color: #bbb;
+			border-color: #bbb;
 		}
 
 		&.deleted {
@@ -106,7 +96,7 @@
 		}
 
 		.nameParent {
-			font-size: 16px;
+			font-size: 114%;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			white-space: nowrap;
@@ -114,153 +104,108 @@
 		}
 
 		&.checked {
-			border-left-color: #69A8F5;
+			border-color: #69A8F5;
 
 			&.focused {
-				border-left-color: darken(#69A8F5, 5%);
+				border-color: darken(#69A8F5, 5%);
 			}
 		}
 
 		&.selected {
 
 			background-color: rgba(140, 200, 255, 0.3);
-			border-left-color: #398CF2;
+			border-color: #398CF2;
 
 			&.focused {
-				border-left-color: darken(#398CF2, 5%);
+				border-color: darken(#398CF2, 5%);
 			}
 		}
 	}
 
+	/* Right */
+
+	.right {
+		border-left: 1px solid var(--border-color, #ddd);
+		max-width: 600px;
+		width: 100%;
+	}
+
 	.b-view-content-toolbar {
+		border-top: 1px solid var(--border-color, #ddd);
 		padding: 7px;
-		position: absolute;
-		top: 0;
-		right: 0;
-		left: @contacts-popup-left-width;
-		height: 30px;
-		text-align: right;
-		border-bottom: 1px solid rgba(128,128,128,0.4);
+		text-align: var(--right, right);
 
-		.button-save-contact {
-			&.dirty:enabled {
-				color: #51a351;
-				font-weight: bold;
-			}
-		}
-
-		&.read-only .button-save-contact {
-			display: none;
+		.dropdown-menu.right-edge {
+			top: auto;
+			bottom: 100%;
 		}
 	}
 
 	.b-view-content {
-		position: absolute;
-		top: 45px;
-		bottom: 0;
-		left: @contacts-popup-left-width;
-		right: 0;
+		height: calc(100% - 46px);
+		margin: 0;
 		overflow: auto;
-		border-left: 1px solid rgba(128,128,128,0.25);
 
-		span {
+		:not(.e-checkbox) > span {
 			height: 20px;
 			line-height: 20px;
 			display: none;
 			padding: 5px 7px;
-			font-size: 18px;
+			font-size: 128%;
 			display: none;
 		}
 
 		.b-contact-view-desc {
 			text-align: center;
-			font-size: 24px;
+			font-size: 171%;
 			line-height: 30px;
 			padding-top: 120px;
 			color: #999;
 		}
 
-		.top-part {
-			padding-top: 20px;
-		}
-
 		.property-line {
 			margin-bottom: 5px;
 		}
 
-		.top-row {
-			padding: 10px 0;
-			height: 30px;
+		input:not([type='checkbox']), textarea {
+			width: 70vw;
+			max-width: 400px;
 		}
+	}
 
-		.add-link {
-			margin-left: 2px;
-			padding: 5px;
-			font-size: 12px;
-			color: #aaa;
+	.read-only-sign {
+		display: none;
+		position: absolute;
+		top: 20px;
+		right: 40px;
+	}
+
+	.read-only {
+		span, .e-read-only-sign {
+			display: inline-block;
 		}
 
 		input, textarea {
-			box-shadow: none;
-			border-color: #fff;
-			font-size: 18px;
-			width: 70vw;
-			max-width: 400px;
-
-			&:hover {
-				box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-				border-color: #ccc;
-			}
-
-			&:focus {
-				box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
-				border-color: #999;
-			}
-		}
-
-		.hasError {
-			input {
-				color: #ee5f5b;
-				border-color: #ee5f5b;
-			}
-		}
-
-		.e-save-trigger {
-			position: absolute;
-			top: 25px;
-			left: 10px;
-		}
-
-		.e-read-only-sign {
 			display: none;
-			position: absolute;
-			top: 20px;
-			right: 40px;
 		}
+	}
 
-		.e-share-sign {
-			position: absolute;
-			top: 20px;
-			right: 20px;
-			cursor: pointer;
-		}
-
-		&.read-only {
-			span, .e-read-only-sign {
-				display: inline-block;
-			}
-
-			input, textarea, .e-share-sign {
-				display: none;
-			}
-		}
+	.tab-content {
+		grid-column-end: 4;
+		padding-top: 20px;
 	}
 }
 
-html:not(rl-mobile) {
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.hideContactListCheckbox {
 		.checkboxItem {
 			visibility: hidden;
 		}
 	}
 }
+
+@media screen and (max-width: @maxMobileWidth) {
+	#V-PopupsContacts {
+		width: 100%;
+	}
+}
diff --git a/dev/Styles/User/EmailAddresses.less b/dev/Styles/User/EmailAddresses.less
index 12015fbbc..e8b46607a 100644
--- a/dev/Styles/User/EmailAddresses.less
+++ b/dev/Styles/User/EmailAddresses.less
@@ -1,19 +1,21 @@
 .emailaddresses {
-	background-color: #fff;
-	border: 1px solid #ccc;
-	border-radius: 3px;
+	background-color: var(--input-bg-clr, #fff);
+	border: 1px solid var(--input-border-clr, #ccc);
+	border-radius: var(--input-border-radius, 3px);
 	box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
-	box-sizing: border-box;
+	color: var(--input-clr, #555);
 	cursor: text;
 	font-size: 90%;
 	list-style: none;
 	margin: 0;
 	padding: 0;
 	transition: border linear .2s, box-shadow linear .2s;
+	max-height: 5em;
+	overflow: auto;
 }
 
 .emailaddresses.emailaddresses-focused {
-	border: 1px solid darken(@inputBorder, 20%);
+	border-color: var(--input-focus-border-clr, #999);
 	box-shadow: none;
 }
 
@@ -23,7 +25,7 @@
 .emailaddresses li[draggable] {
 	background-color: #eee;
 	border: 1px solid #aaa;
-	border-radius: 2px;
+	border-radius: calc(var(--input-border-radius, 3px) - 1px);
 	box-shadow: 0 1px 0 rgba(255,255,255,0.75) inset;
 	color: #555;
 	cursor: default;
@@ -46,7 +48,7 @@
 }
 
 .emailaddresses li a {
-	font-size: 12px;
+	font-size: 85%;
 	color: #999;
 	padding: 1px;
 	position: absolute;
@@ -71,6 +73,8 @@
 	height: auto;
 	line-height: inherit;
 	margin: 0;
+	min-width: 18em;
+	max-width: 500px;
 	padding: 4px;
 	vertical-align: baseline;
 }
diff --git a/dev/Styles/User/Filter.less b/dev/Styles/User/Filter.less
index f36d45368..c64950553 100644
--- a/dev/Styles/User/Filter.less
+++ b/dev/Styles/User/Filter.less
@@ -5,9 +5,4 @@
 	.button-delete {
 		cursor: pointer;
 	}
-
-	.setRecipientsBtn {
-		margin-top: -2px;
-		margin-left: 5px;
-	}
 }
diff --git a/dev/Styles/User/FolderList.less b/dev/Styles/User/FolderList.less
index 97d8372bf..d920dfd90 100644
--- a/dev/Styles/User/FolderList.less
+++ b/dev/Styles/User/FolderList.less
@@ -2,13 +2,35 @@
 @folderItemPadding: 7px;
 @subPadding: 15px;
 
-.b-folders {
+#V-MailFolderList,
+#V-MailFolderList .b-content {
+	height: 100%;
+}
 
-	> * {
-		position: absolute;
-		right: 0;
-		left: 0;
-	}
+.focused .b-folders a.focused {
+	background-color: var(--folders-focused-bg-color, #333);
+	border-color: #fff;
+	color: var(--folders-focused-color, #eee);
+}
+
+#folderSearchInput {
+	width: 100%;
+}
+
+/* https://github.com/the-djmaze/snappymail/issues/1427 */
+#V-MailFolderList .e-checkbox {
+	margin: 0 4px;
+	width: calc(100% - 8px);
+}
+#V-MailFolderList .unreadOnly li a:not(.unread-sub):not([data-unread]) {
+    display:none;
+}
+
+.b-folders {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	padding-right: 2px;
 
 	ul {
 		margin: 0;
@@ -30,34 +52,24 @@
 	}
 
 	.b-toolbar {
-		top: 0;
-		height: 30px;
-		padding: 10px 0 0 @rlLowMargin;
 		color: #fff;
-		z-index: 101;
 	}
 
 	.b-footer {
-		bottom: 10px;
-		height: 30px;
-		padding: 0 10px 0 5px;
-		z-index: 101;
-
+		padding: 10px @rlLowMargin;
 		overflow: hidden;
 		white-space: nowrap;
 	}
 
 	.b-content {
-		bottom: 32px + @rlLowMargin + @rlBottomMargin;
-		top: 50px + @rlLowMargin;
 		overflow: hidden;
 		overflow-y: auto;
 		min-width: 100px;
+		color: var(--folders-color, #333);
 	}
 
 	hr {
 		margin: 10px;
-		border-color: #999;
 	}
 
 	li {
@@ -66,23 +78,18 @@
 		white-space: nowrap;
 
 		a {
-			display: block;
-			position: relative;
-			z-index: 1;
-			height: 34px;
-			line-height: 34px;
 			background-color: transparent;
-			vertical-align: middle;
-			color: var(--folders-disabled-color, #666);
 			border-left: 3px solid transparent;
-
+			color: var(--folders-color, #333);
+			display: block;
+			line-height: 2.2em;
 			padding: 0 2em 0 @folderItemPadding;
-
+			position: relative;
 			text-decoration: none;
+			vertical-align: middle;
+			z-index: 1;
 
 			&.selectable {
-
-				color: var(--folders-color, #333);
 				cursor: pointer;
 
 				&:hover {
@@ -99,37 +106,25 @@
 					pointer-events: none;
 				}
 
-				&.focused {
-					background-color: var(--folders-focused-bg-color, #333);
-					color: var(--folders-focused-color, #eee);
-				}
-
 				&.selected {
 					background-color: var(--folders-selected-bg-color, #333);
 					color: var(--folders-selected-color, #eee);
 				}
 			}
 			&:not(.selectable) {
+				color: var(--folders-disabled-color, #666);
 				cursor: default;
 				font-style: italic;
 			}
 
-			&.focused {
-				background-color: #888;
-				border-left-color: #fff;
-			}
-
 			&.unread-sub {
 				font-weight: bold;
 			}
 
-			&.hidden {
-				display: none;
-			}
-
 			.e-collapsed-sign {
 				cursor: pointer;
 				font-size: 150%;
+				text-indent: 0;
 				vertical-align: inherit;
 			}
 		}
@@ -151,18 +146,19 @@
 	.b-folders-user a[data-unread]:not(.system)::after
 	{
 		content: attr(data-unread);
-		background-color: @grayLight;
-		border-radius: 9px;
-		color: @white;
-		font-size: 11px;
-		line-height: 19px;
-		margin-top: 5px;
-		min-width: 1em;
+		background-color: var(--unread-count-bg-color, #999);
+		border-radius: 1em;
+		color: var(--unread-count-color, #fff);
+		font-size: 80%;
+		line-height: 1.5em;
+		margin-top: 0.5em;
+		min-width: 1.7em;
 		padding: 1px 4px;
 		text-align: center;
 		text-shadow: 0 -1px 0 rgba(0,0,0,.25);
 		position: absolute;
 		right: 3px;
+		text-indent: 0;
 	}
 
 	.flag-icon {
@@ -185,68 +181,33 @@
 	}
 
 	li li a {
-		padding-left: @subPadding * 1 + @folderItemPadding;
+		text-indent: 1em;
 	}
 	li li li a {
-		padding-left: @subPadding * 2 + @folderItemPadding;
+		text-indent: 2em;
 	}
 	li li li li a {
-		padding-left: @subPadding * 3 + @folderItemPadding;
+		text-indent: 3em;
 	}
 	li li li li li a {
-		padding-left: @subPadding * 4 + @folderItemPadding;
+		text-indent: 4em;
 	}
-
-/**/
-	&.single-root-inbox .b-folders-user > li > a {
-		display: none !important;
-	}
-
-	&.single-root-inbox {
-		li li a {
-			padding-left: @folderItemPadding;
-		}
-		li li li a {
-			padding-left: @subPadding * 1 + @folderItemPadding;
-		}
-		li li li li a {
-			padding-left: @subPadding * 2 + @folderItemPadding;
-		}
-		li li li li li a {
-			padding-left: @subPadding * 3 + @folderItemPadding;
-		}
-	}
-/**/
 }
 
-.btn {
-	&.buttonCompose {
-		width: calc(100% - 68px);
-		max-width: -moz-fit-content;
-		max-width: -webkit-fit-content;
-		max-width: fit-content;
-		overflow: hidden;
-		height: 19px;
-		padding: 4px 8px;
-	}
+#rl-left .buttonCompose {
+	max-height: 2em;
+	max-width: fit-content;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	width: calc(100% - 48px);
 }
 
 html.rl-left-panel-disabled {
-	.buttonComposeText{
+	.buttonComposeText,
+	.buttonContacts {
 		display: none;
 	}
-	.btn.buttonCompose {
+	#rl-left .buttonCompose {
 		width: auto;
 	}
-	.btn.buttonContacts {
-		margin-top: 10px !important;
-		margin-left: 0 !important;
-	}
-	&.rl-mobile #rl-left {
-		visibility: hidden;
-	}
-}
-
-html.rl-mobile .b-folders .b-content {
-	bottom: 0;
 }
diff --git a/dev/Styles/User/Identity.less b/dev/Styles/User/Identity.less
index bc8d1210e..4458c40ed 100644
--- a/dev/Styles/User/Identity.less
+++ b/dev/Styles/User/Identity.less
@@ -2,9 +2,15 @@
 
 	max-width: 770px;
 
+	.tab-content {
+		grid-column-end: 5;
+		padding-top: 20px;
+	}
+
 	.e-signature-place {
 		border: 1px solid #ccc;
-		border-radius: 3px;
+		border-radius: var(--input-border-radius, 3px);
+		margin-bottom: 1.43em;
 	}
 
 	.textEmail {
diff --git a/dev/Styles/User/Layout.less b/dev/Styles/User/Layout.less
index 03730c135..9e2a164e1 100644
--- a/dev/Styles/User/Layout.less
+++ b/dev/Styles/User/Layout.less
@@ -1,29 +1,28 @@
 
-.UserBackground body {
-	background-size: contain;
+#rl-app.UserBackground {
+	background-size: cover;
 	background-repeat: no-repeat;
 	background-position: center;
 }
 
-#rl-left, #rl-right {
-	position: absolute;
-	top: 0;
-	right: 0;
-	bottom: 0;
-	left: 0;
-	padding: 0;
-	margin: 0;
-	border: 0;
-	z-index: 0;
-}
-
 #rl-left {
+	flex-grow: 0;
+	flex-shrink: 0;
+	position: relative;
+/*	transition: width 0.3s ease-out;*/
 	width: @rlLeftWidth;
+	z-index: 0;
+
+	.b-toolbar {
+		padding: 10px 0 10px @rlLowMargin;
+		white-space: nowrap;
+	}
 }
 
-#rl-right {
-	z-index: 1;
-	left: @rlLeftWidth;
+#rl-right:not([hidden]) {
+	display: flex;
+	flex-grow: 1;
+	width: 20%;
 }
 
 /*
@@ -44,119 +43,34 @@
 }
 */
 
-.resizer {
-	background: #aaa;
-	background: rgba(255,255,255,0.5);
-	display: none;
-	opacity: 0;
-	position: absolute;
-	z-index: 102;
-}
-.resizer:hover {
-	opacity: 1;
-}
-
 html:not(.rl-left-panel-disabled) #rl-left {
-	resize: horizontal;
-	overflow: hidden;
+	resize: horizontal; overflow: auto;
 	min-width: 155px;
 	max-width: 350px;
 }
 
-#rl-left > .resizer,
-.rl-side-preview-pane #V-MailMessageList > .resizer {
-	cursor: ew-resize;
-	height: 100%;
-	right: 0;
-	top: 0;
-	width: 5px;
-}
-
-.rl-side-preview-pane #V-MailMessageList {
-	resize: horizontal;
-	min-width: 320px;
-	max-width: 60%;
-}
-.rl-bottom-preview-pane #V-MailMessageList {
-	resize: vertical;
-	min-height: 200px;
-	max-height: 60%;
-}
-.rl-bottom-preview-pane #V-MailMessageList > .resizer {
-	cursor: ns-resize;
-	height: 5px;
-	left: 0;
-	bottom: 0;
-	width: 100%;
-}
-
-html:not(.rl-left-panel-disabled) #rl-left > .resizer,
-#V-MailMessageList > .resizer {
-	display: block;
-}
-
-#V-MailMessageList {
-	position: absolute;
-	top: 0;
-	bottom: @rlBottomMargin;
-	left: 0;
-	width: 50%;
-}
-
-#V-MailMessageView {
-	position: absolute;
-	top: 50px + @rlLowMargin;
-	bottom: 13px;
-	right: 0;
-	left: 0;
-
-	.b-message-view-backdrop {
-		position: absolute;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		background: rgba(0, 0, 0, .4);
-		z-index: 10;
-		text-align: center;
-
-		.backdrop-message {
-			position: relative;
-			display: inline-block;
-			color: white;
-			font-size: 20px;
-			line-height: 30px;
-			background: rgba(0, 0, 0, .6);
-			padding: 15px;
-			border-radius: 5px;
-			text-shadow: 0 1px 1px #000;
-			transform: translateY(-50%);
-			top: 50%;
-		}
-	}
-}
-
-html.rl-side-preview-pane {
-	#V-MailMessageView {
-		left: 50%;
-	}
+#top-system-dropdown-id::after,
+#button-add-prop-dropdown-id::after {
+	content: '▼';
+	font-size: 80%;
 }
 
 .dropdown-menu * + .dividerbar {
 	margin-top: 9px;
 	padding-top: 9px;
-	border-top: 1px solid #e5e5e5;
+	border-top: 1px solid var(--border-color, #e5e5e5);
 }
 
 .dropdown.show {
-	box-shadow: 0 0 1px var(--main-color, @dropdownLinkColor);
+	box-shadow: 0 0 1px var(--main-color, #333);
 }
 
 .btn.btn-transparent {
 	background: none !important;
 	border-color: transparent !important;
-	text-shadow: none !important;
 	box-shadow: none !important;
+	color: inherit;
+	text-shadow: none !important;
 	opacity: .6;
 
 	&:hover {
@@ -166,57 +80,31 @@ html.rl-side-preview-pane {
 
 .btn-group.open .btn.btn-transparent.dropdown-toggle {
 	color: #BD362F;
-	.caret {
-		border-top-color: #BD362F;
-	}
 }
 
 .btn-group > .btn.single {
-	border-radius: 3px !important;
+	border-radius: var(--input-border-radius, 3px) !important;
 }
 
-/* desktop */
-@media screen and (min-width: 1000px) {
+.search-input-wrp {
+	position: relative;
 }
+.search-input-wrp a {
+	position: absolute;
+	right: 0;
+	top: 5px;
+	margin: 0 7px;
+	z-index: 100;
+	opacity: .4;
+	cursor: pointer;
 
-/* desktop-large */
-@media screen and (min-width: 1401px) {
-	#rl-left {
-		width: @rlLeftWidth + 20;
-	}
-
-	#rl-right {
-		left: @rlLeftWidth + 20;
-	}
-
-	#V-MailMessageList {
-		width: 40%;
-	}
-
-	html.rl-side-preview-pane {
-		#V-MailMessageView {
-			left: 40%;
-		}
+	&:hover {
+		opacity: .6;
 	}
 }
-
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
-	#rl-left {
-		width: 155px;
-	}
-
-	#rl-right {
-		left: 155px;
-	}
-
-	#rl-settings-subscreen {
-		padding: 10px;
-	}
-
-	.dropdown-menu a {
-		line-height: 2.5;
-	}
+#rl-left .search-input-wrp {
+	margin: 0 4px;
+	width: calc(100% - 8px);
 }
 
 html:not(.rl-ctrl-key-pressed) .visible-on-ctrl-btn,
@@ -242,44 +130,6 @@ html.rl-left-panel-disabled {
 			display: none;
 		}
 	}
-
-	#rl-right {
-		left: 60px;
-	}
-}
-
-html.rl-no-preview-pane {
-
-	#V-MailMessageList {
-		right: @rlBottomMargin !important;
-		width: inherit;
-	}
-
-}
-
-html.rl-mobile #rl-left > .resizer,
-html.rl-no-preview-pane #rl-right .resizer {
-	display: none !important;
-}
-
-html.rl-bottom-preview-pane {
-
-	#V-MailMessageList {
-		bottom: inherit;
-		width: inherit;
-		height: 300px;
-		right: 0;
-	}
-
-	#V-MailMessageView {
-		left: 0;
-		top: 356px;
-	}
-}
-
-html.rl-mobile .hide-mobile,
-html:not(.rl-mobile) .show-mobile {
-	display: none !important;
 }
 
 .e-paginator {
@@ -287,8 +137,8 @@ html:not(.rl-mobile) .show-mobile {
 	a {
 		opacity: 0.5;
 		text-decoration: none;
-		font-size: 22px;
-		padding: 3px;
+		font-size: 157%;
+		padding: 0 3px;
 		cursor: pointer;
 
 		&:hover {
@@ -297,19 +147,90 @@ html:not(.rl-mobile) .show-mobile {
 
 		&.current {
 			opacity: 1;
-			font-size: 25px;
+			font-size: 179%;
 			cursor: default;
 		}
 	}
 }
 
-html.rl-mobile {
+.resizer {
+	display: none;
+}
 
-	&:not(.rl-left-panel-disabled) #rl-right {
-		right: -150px;
+@media screen and (max-width: @maxMobileWidth) {
+	#rl-app {
+		#V-SettingsPane {
+			margin-right: 0;
+			padding: 10px;
+		}
 	}
 
-	&.rl-left-panel-disabled #rl-right {
-		left: 5px;
+	#rl-left {
+		background: var(--main-bg-color, #aaa);
+		border-right: 1px solid var(--border-color, #ddd);
+		position: fixed;
+/*		left: 0; RTL issue*/
+		top: 0;
+		bottom: 0;
+		width: 50vw;
+		z-index: 99;
+	}
+	.rl-left-panel-disabled #rl-left {
+		display: none;
+	}
+
+	.dropdown-menu a {
+		line-height: 2.5;
+	}
+
+	.hide-mobile {
+		display: none !important;
+	}
+}
+
+/* desktop */
+@media screen and (min-width: @maxMobileWidth + 1px) {
+	#rl-right .toggleLeft,
+	#V-MailMessageList .buttonCompose {
+		display: none !important;
+	}
+
+	.sm-msgView-bottom #rl-right {
+		flex-direction: column;
+	}
+
+	.resizer {
+		background: #aaa;
+		background: rgba(255,255,255,0.5);
+		opacity: 0;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		z-index: 102;
+	}
+	.resizer:hover {
+		opacity: 1;
+	}
+	html:not(.rl-left-panel-disabled) #rl-left > .resizer,
+	.sm-msgView-side #V-MailMessageList .resizer {
+		cursor: ew-resize;
+		cursor: col-resize;
+		display: block;
+		top: 0;
+		width: 5px;
+	}
+	.sm-msgView-bottom #V-MailMessageList .resizer {
+		cursor: ns-resize;
+		cursor: row-resize;
+		display: block;
+		left: 0;
+		height: 5px;
+	}
+}
+
+/* desktop-large */
+@media screen and (min-width: 1401px) {
+	#rl-left {
+		width: @rlLeftWidth + 20;
 	}
 }
diff --git a/dev/Styles/User/MessageFlags.less b/dev/Styles/User/MessageFlags.less
new file mode 100644
index 000000000..3ca268f90
--- /dev/null
+++ b/dev/Styles/User/MessageFlags.less
@@ -0,0 +1,26 @@
+/* RFC8457 */
+.msgflag-\$important .checkboxMessage { background-color: #F00; color: #fff; }
+.msgflag-\$important.focused { background-color: rgba(255,   0,   0, 0.30); }
+.msgflag-\$important:not(.focused) { color: #F00; }
+
+/* KMail tags */
+.msgflag-\$todo .checkboxMessage { background-color: #00F; color: #fff; }
+.msgflag-\$todo.focused { background-color: rgba( 64,  64, 255, 0.30); }
+.msgflag-\$todo:not(.focused) { color: #33F; }
+
+/* Thunderbird labels */
+.msgflag-\$label5 .checkboxMessage { background-color: #808; color: #fff; }
+.msgflag-\$label4 .checkboxMessage { background-color: #00F; color: #fff; }
+.msgflag-\$label3 .checkboxMessage { background-color: #080; color: #fff; }
+.msgflag-\$label2 .checkboxMessage { background-color: #FA0; color: #fff; }
+.msgflag-\$label1 .checkboxMessage { background-color: #F00; color: #fff; }
+.msgflag-\$label5.focused { background-color: rgba(255,   0, 255, 0.30); }
+.msgflag-\$label4.focused { background-color: rgba( 64,  64, 255, 0.30); }
+.msgflag-\$label3.focused { background-color: rgba(  0, 255,   0, 0.30); }
+.msgflag-\$label2.focused { background-color: rgba(255, 170,   0, 0.30); }
+.msgflag-\$label1.focused { background-color: rgba(255,   0,   0, 0.30); }
+.msgflag-\$label5:not(.focused) { color: #939; }
+.msgflag-\$label4:not(.focused) { color: #33F; }
+.msgflag-\$label3:not(.focused) { color: #090; }
+.msgflag-\$label2:not(.focused) { color: #F90; }
+.msgflag-\$label1:not(.focused) { color: #F00; }
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index d1e7312f2..93130fcf0 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -1,64 +1,81 @@
 
-html.rl-mobile,
-html.rl-no-preview-pane {
-	.message-selected #V-MailMessageList {
-		display: none;
-	}
+#V-MailMessageList {
+	position: relative;
+	height: 100%;
+	width: 100%;
 }
 
 #V-MailMessageList.focused .messageList {
 	border-color: #9d9d9d;
+	box-shadow: var(--smMainShadow);
 }
 
+#no-sort-list,
 #sort-list-dropdown-id {
 	padding-left: 6px;
 	padding-right: 6px;
 }
 
 #V-MailMessageList .btn-toolbar {
-	height: 30px;
 	padding: 10px 1px;
 	white-space: nowrap;
 }
 
 .messageList {
-	height: calc(100% - 50px);
-	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
-	box-shadow: @rlMainShadow;
+	height: calc(100% - 60px);
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
 	display: flex;
 	flex-direction: column;
 
+	.groupLabel {
+		background:rgba(128,128,128,0.2);
+		cursor: pointer;
+		font-size: 85%;
+		line-height: 2;
+		opacity: 0.6;
+		text-align: center;
+		text-transform: capitalize;
+	}
+
+	.reply::before {
+		content: '↳';
+		line-height: 3;
+		position: absolute;
+		margin-left: -1em;
+	}
+
 	.b-footer {
-	    display: flex;
+		display: flex;
 		flex-shrink: 0;
 		padding: 7px;
 
 		background-color: var(--message-list-toolbar-bg-color, #eee);
 //		#gradient > .vertical(#f4f4f4, #dfdfdf);
 
-		border-bottom-right-radius: @rlMainBorderRadius;
-		border-bottom-left-radius: @rlMainBorderRadius;
-		border-top: 1px solid #bbb;
+		border-bottom-right-radius: var(--border-radius, 5px);
+		border-bottom-left-radius: var(--border-radius, 5px);
+		border-top: 1px solid var(--border-color, #bbb);
 
 		.e-quota {
 			border-bottom: 1px dashed #333;
 			display: inline-block;
 			margin-top: 5px;
 			margin-left: 5px;
-			font-size: 18px;
+			font-size: 128%;
 			cursor: help;
 		}
 	}
 
 	.b-footer nav {
 		flex-grow: 1;
-		text-align: right;
+		display: flex;
+		justify-content: end;
 	}
 
 	.btn.buttonMoreSearch {
-		font-size: 11px;
+		font-size: 80%;
 		padding-left: 8px;
 		padding-right: 8px;
 	}
@@ -72,9 +89,9 @@ html.rl-no-preview-pane {
 		background-color: var(--message-list-toolbar-bg-color, #eee);
 //		#gradient > .vertical(#f4f4f4, #dfdfdf);
 
-		border-top-right-radius: @rlMainBorderRadius;
-		border-top-left-radius: @rlMainBorderRadius;
-		border-bottom: 1px solid #bbb;
+		border-top-right-radius: var(--border-radius, 5px);
+		border-top-left-radius: var(--border-radius, 5px);
+		border-bottom: 1px solid var(--border-color, #bbb);
 	}
 
 	.checkboxCheckAll {
@@ -84,28 +101,12 @@ html.rl-no-preview-pane {
 
 	.search-input-wrp {
 		flex-grow: 1;
-		position: relative;
-		text-align: right;
 	}
 
 	.inputSearch {
-		max-width: 300px;
 		width: 100%;
 	}
 
-	.closeSearch {
-		position: absolute;
-		right: 0;
-		top: 5px;
-		margin: 0 7px;
-		z-index: 100;
-		vertical-align: middle;
-		opacity: .4;
-		&:hover {
-			opacity: .6;
-		}
-	}
-
 	.b-content {
 		height: 100%;
 		padding: 0;
@@ -122,7 +123,7 @@ html.rl-no-preview-pane {
 			color: #999;
 			text-align: center;
 			padding: 60px 10px;
-			font-size: 24px;
+			font-size: 171%;
 			line-height: 30px;
 		}
 
@@ -146,13 +147,13 @@ html.rl-no-preview-pane {
 		}
 
 		.listSearchDesc {
-			font-size: 16px;
+			font-size: 114%;
 			padding: 12px;
 			border-bottom: 1px solid #eee;
 		}
 
 		.listThreadUidDesc {
-			font-size: 16px;
+			font-size: 114%;
 			padding: 7px 20px 6px 20px;
 			background-color: rgba(128,128,128,0.5);
 			border-bottom: 1px solid #888;
@@ -171,34 +172,22 @@ html.rl-no-preview-pane {
 	}
 }
 
-html:not(rl-mobile) {
-	.hideMessageListCheckbox {
-		.checkboxCheckAll {
-			visibility: hidden;
-		}
-
-		.checkboxMessage {
-			display: none;
-		}
-	}
+.messageListItem > div + div {
+	display: flex;
+	overflow: hidden;
+	padding: 5px 0 5px 5px;
+	width: 100%;
 }
 
 .messageListItem {
-	display: flex;
-	flex-wrap: wrap;
-
-	position: relative;
-	font-size: 12px;
-	overflow: hidden;
 	cursor: pointer;
-
-	margin: 0;
-	padding: 5px 0;
 	border: 0;
 	border-bottom: 1px solid rgba(153, 153, 153, 0.2);
-	border-left: 6px solid #eee;
-
-	z-index: 100;
+	border-left: 6px solid transparent;
+	display: flex;
+	font-size: 90%;
+	line-height: 2;
+	position: relative;
 /*
 	> * {
 		display: flex;
@@ -209,41 +198,31 @@ html:not(rl-mobile) {
 	&.focused {
 		background-color: rgba(128, 128, 128, 0.1);
 		border-left-color: #ccc;
+		border-right-color: #ccc !important;
 	}
 
-	.importantMark {
-		color:red;
-		margin-right:5px
+	&.priorityHigh .subjectParent::before {
+		content: '! '; /*❗*/
+		color: red;
+		font-weight: bolder;
 	}
 
-	&.deleted-mark {
-		opacity: .7;
-		.subjectParent {
-			text-decoration: line-through;
-		}
+	.messageCheckbox {
+		font-size: 114%;
+		padding: 5px .5em 0;
+		white-space: nowrap;
 	}
-
-	&.deleted {
-		opacity: .3;
-	}
-
 	.checkboxMessage {
-		padding: 0 6px;
-		font-size: 16px;
+		display: inline;
 	}
 
 	time, .sizeParent {
-		margin: 0 5px;
-		opacity: 0.6;
-		font-size: 11px;
+		margin: 0 5px 0 0;
+		opacity: 0.7;
+		font-size: 80%;
 		white-space: nowrap;
-	}
-
-	.attachmentParent {
-		position: relative;
-		margin: 2px 10px 0 5px;
-		color: #666;
-		text-shadow: 0 1px 0 #eee;
+		min-width: 3.5em;
+		text-align: var(--right, right);
 	}
 
 	.senderParent, .subjectParent {
@@ -253,6 +232,19 @@ html:not(rl-mobile) {
 		white-space: nowrap;
 	}
 
+	.senderParent {
+		flex: 0 0 25%;
+	}
+
+	.subjectParent {
+		flex: 1 1 auto;
+	}
+
+	.subjectParent:empty {
+		font-style: italic;
+		opacity: 0.5;
+	}
+
 	.threadsCountParent {
 		display: inline;
 		overflow: hidden;
@@ -260,7 +252,7 @@ html:not(rl-mobile) {
 		padding: 1px 5px;
 		margin-right: 5px;
 		border: 1px solid #ccc;
-		border-radius: 5px;
+		border-radius: var(--border-radius, 5px);
 	}
 
 	.threadsCountParent.lastSelected {
@@ -273,55 +265,50 @@ html:not(rl-mobile) {
 		border-color: #666;
 	}
 
-	&.emptySubject .subjectParent {
-		font-style: italic;
-		opacity: 0.5;
-	}
-
-	.threads-len span {
-		border-radius: 6px;
+	.threads-len {
+		border-radius: var(--border-radius, 5px);
 		border: 1px solid #ccc;
-		font-size: 11px;
-		padding: 0 2px;
+		font-size: 80%;
+		padding: 0 4px;
+		white-space: nowrap;
 		&:hover {
 			background-color: rgba(127,127,127,0.3);
 			border-color: #666;
 		}
 	}
+	.threads-len::after {
+		content: ' ›';
+	}
 
 	.replyFlag, .forwardFlag {
 		margin-right: 0.25em;
 	}
 
-	&:not(.withAttachments) .attachmentParent {
-		display: none;
-	}
-
-	&.hasUnseenSubMessage {
-		background-color: rgba(255, 255, 64, 0.15);
-		border-left-color: lighten(orange, 30%);
-		&.focused {
-			border-left-color: darken(orange, 10%);
-		}
-	}
-
 	&.unseen {
 		background-color: rgba(255, 255, 64, 0.15);
 		border-left-color: orange;
+		border-right-color: orange !important;
 		.senderParent, .subjectParent {
 			font-weight: bold;
 		}
 
 		&.focused {
 			border-left-color: darken(orange, 10%);
+			border-right-color: darken(orange, 10%) !important;
 		}
 	}
+	[data-unseen] {
+		background-color: rgba(255, 255, 64, 0.15);
+		border-color: orange;
+	}
 
 	&.checked {
 		border-left-color: lighten(#398CF2, 10%);
+		border-right-color: lighten(#398CF2, 10%) !important;
 
 		&.focused {
 			border-left-color: darken(#398CF2, 5%);
+			border-right-color: darken(#398CF2, 5%) !important;
 		}
 	}
 
@@ -329,47 +316,96 @@ html:not(rl-mobile) {
 		background-color: rgba(140, 200, 255, 0.3);
 		border-bottom-color: rgba(57, 140, 242, 0.2);
 		border-left-color: #398CF2;
+		border-right-color: #398CF2 !important;
 		z-index: 101;
-
-		+ .messageListItem {
-			border-bottom-color: rgba(57, 140, 242, 0.3);
-		}
 	}
 
+	.attachmentParent,
 	.flagParent {
-		padding: 0 10px 0 5px;
+		margin: 0 10px 0 5px;
+		min-width: 1em;
 	}
-	&.flagged .flagParent::after,
+	.flagParent::after {
+		content: '☆'; /*⚐*/
+	}
+	&.msgflag-\\flagged .flagParent::after,
 	&.hasFlaggedSubMessage .flagParent::after {
 		color: orange;
 		content: '★'; /*⚑*/
 	}
-	&:not(.flagged):not(.hasFlaggedSubMessage) .flagParent::after {
-		content: '☆'; /*⚐*/
-	}
-	&:not(.flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover) {
+	&:not(.msgflag-\\flagged):not(.hasFlaggedSubMessage) .flagParent:not(:hover)::after {
 		opacity: 0.5;
 	}
+
+	.senderParent::before {
+		font-family: snappymail;
+	}
+	&.msgflag-\\answered .senderParent::before {
+		content: '← ';
+	}
+	&.msgflag-\$forwarded .senderParent::before {
+		content: '→ ';
+	}
+	&.msgflag-\\answered.msgflag-\$forwarded .senderParent::before {
+		content: '←→ ';
+	}
+	&.msgflag-\\deleted {
+		opacity: .7;
+		.subjectParent {
+			text-decoration: line-through;
+		}
+	}
 }
 
-html.rl-ctrl-key-pressed .messageListItem {
-	cursor: copy;
+html:not(.sm-msgView-bottom):not(.sm-msgView-side) .message-selected #V-MailMessageList {
+	display: none;
 }
 
-@media screen and (min-width: 1000px) {
+@media screen and (max-width: @maxMobileWidth) {
+	#V-MailMessageList .btn-toolbar:not(.hasChecked) .onCheckedShow,
+	#V-MailMessageList .hasChecked .onCheckedHide {
+		display: none;
+	}
+}
+
+@media screen and (min-width: @maxMobileWidth + 1px) {
 	.messageList {
 		.listDragOver {
 			transition: all 400ms ease;
 		}
 	}
-}
 
-/* desktop-large */
-@media screen and (min-width: 1401px) {
-	.messageListItem {
-		font-size: 13px;
-		time {
-			font-size: 13px;
+	.hideMessageListCheckbox {
+		.checkboxCheckAll {
+			visibility: hidden;
+		}
+		.checkboxMessage {
+			display: none;
+		}
+	}
+
+	.sm-msgView-side #V-MailMessageList {
+		width: unset;
+
+		.messageList {
+			max-width: 50vw;
+			min-width: 320px;
+			overflow: auto;
+			resize: horizontal;
+			width: 35vw;
+		}
+	}
+
+	.sm-msgView-bottom #V-MailMessageList {
+		height: unset;
+		width: unset;
+
+		.messageList {
+			height: 35vh;
+			max-height: 50vh;
+			min-height: 200px;
+			overflow: auto;
+			resize: vertical;
 		}
 	}
 }
@@ -385,13 +421,21 @@ html.rl-ctrl-key-pressed .messageListItem {
 	top: 0;
 }
 
-.rl-side-preview-pane, .rl-mobile {
+.sm-msgView-side, .rl-mobile {
+
+	.messageListItem > div + div {
+		flex-wrap: wrap;
+	}
 
 	.messageListItem {
+		line-height: 1.5;
 
-		.checkboxMessage {
-			line-height: 12px;
-			margin: 10px 0 -5px;
+		.messageCheckbox {
+			padding-top: 0.8em;
+		}
+
+		.senderParent {
+			flex: 1 0 25%;
 		}
 
 		.subjectParent {
@@ -401,10 +445,6 @@ html.rl-ctrl-key-pressed .messageListItem {
 			width: calc(100% - 120px);
 		}
 
-		.senderParent {
-			flex: 1 0 45%;
-		}
-
 		.flagParent {
 			order: 1;
 		}
@@ -417,29 +457,4 @@ html.rl-ctrl-key-pressed .messageListItem {
 			order: 3;
 		}
 	}
-
-	.messageList:not(.hideMessageListCheckbox) .subjectParent {
-		margin-left: 28px;
-	}
-}
-
-html:not(.rl-mobile):not(.rl-side-preview-pane) {
-
-	.messageListItem {
-
-		line-height: 25px;
-		flex-wrap: nowrap;
-
-		> * {
-			line-height: 25px;
-		}
-
-		.senderParent {
-			flex: 0 0 25%;
-		}
-
-		.subjectParent {
-			flex: 1 1 auto;
-		}
-	}
 }
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index c23deddeb..dd7d970c2 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -1,33 +1,52 @@
 
-html.rl-no-preview-pane {
-	#rl-right:not(.message-selected) #V-MailMessageView {
-		display: none;
+#V-MailMessageView {
+	flex-grow: 1;
+	overflow: auto;
+	padding-bottom: @rlLowMargin;
+
+	.b-message-view-backdrop {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, .4);
+		z-index: 10;
+		text-align: center;
+
+		.backdrop-message {
+			position: relative;
+			display: inline-block;
+			color: white;
+			font-size: 143%;
+			line-height: 30px;
+			background: rgba(0, 0, 0, .6);
+			padding: 15px;
+			border-radius: var(--border-radius, 5px);
+			text-shadow: 0 1px 1px #000;
+			transform: translateY(-50%);
+			top: 50%;
+		}
 	}
 }
 
-#V-MailMessageView.focused .messageView {
-	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-	border-color: darken(@rlMainDarkColor, 5%);
+#V-MailMessageView .top-toolbar {
+	color: #fff;
+	padding: 10px 0;
+	visibility: visible;
 }
 
 .messageView {
-	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	border-radius: @rlMainBorderRadius;
-	height: 100%;
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
+	height: calc(100% - 50px);
+	position: relative;
 
-	.toolbar {
-		position: absolute;
-		top: -50px - @rlLowMargin;
-		right: 0;
-		left: 0;
-		height: 30px;
-		padding: 10px 0;
-		color: #fff;
-	}
-
-	.b-content {
-		height: 100%;
+	.priorityHigh .subject::before {
+		content: '! '; /*❗*/
+		color: red;
+		font-weight: bolder;
 	}
 
 	.b-message {
@@ -39,24 +58,20 @@ html.rl-no-preview-pane {
 	.b-message-view-checked-helper {
 		text-align: center;
 		font-size: 70px;
-		line-height: 70px;
-		padding-top: 100px;
-		color: #999;
-
-		.icon-mail {
-			font-size: 100px;
-			font-size: 50px;
-			line-height: 90px;
-			padding-left: 10px;
-		}
+		padding-top: 25vh;
+		opacity: 0.6;
+	}
+	.b-message-view-checked-helper::after {
+		content: ' ✉';
+		font-family: snappymail;
 	}
 
 	.b-message-view-desc {
 		text-align: center;
-		font-size: 24px;
+		font-size: 171%;
 		line-height: 30px;
 		color: #999;
-		padding: 120px 10px 0 10px;
+		padding: 25vh 10px 0;
 	}
 
 	.b-message-view-desc.error {
@@ -82,7 +97,6 @@ html.rl-no-preview-pane {
 	.flagParent {
 
 		cursor: pointer;
-		margin: 0 0.25em;
 
 		.flagOn {
 			color: orange;
@@ -93,34 +107,56 @@ html.rl-no-preview-pane {
 		}
 	}
 
+	.messageTags {
+		align-items: baseline;
+		display: flex;
+	}
+	.messageTags > * {
+		flex: 0 0 0;
+	}
+	.messageAssignedTags {
+		flex: 1 0 0;
+	}
+	.messageAssignedTags span {
+		border: 1px solid #808080;
+		line-height: 2;
+		padding: 2px;
+		white-space: nowrap;
+	}
+
 	.messageItemHeader {
 
-		background-color: #f8f8f8;
-		border-bottom: 1px solid #ddd;
-		border-radius: @rlMainBorderRadius @rlMainBorderRadius 0 0;
+		background-color: var(--message-header-bg-clr, #eee);
+		border-bottom: 1px solid var(--border-color, #bbb);
+		border-radius: var(--border-radius, 5px) var(--border-radius, 5px) 0 0;
 		padding: 10px;
 		flex-shrink: 0;
+		word-break: keep-all;
+
+		.fontastic + span {
+			margin-left: 0.25em;
+		}
 
 		.subjectParent {
 			display: flex;
-			font-size: 18px;
+			font-size: 128%;
 			font-weight: bold;
-			margin-bottom: 8px;
 		}
 
-		.subject, .emptySubjectText {
+		.subject {
 			flex-grow: 1;
 			overflow: hidden;
 			text-overflow: ellipsis;
 			white-space: nowrap;
+			margin: 0 0.25em;
 		}
-
-		.messageButtons {
-			margin-top: 5px;
+		.subject:empty {
+			font-style: italic;
+			opacity: 0.5;
 		}
 
 		.informationShort {
-			margin: 4px 40px 0 0;
+			margin: 0 56px 0 0;
 			overflow: hidden;
 			text-overflow: ellipsis;
 
@@ -135,8 +171,6 @@ html.rl-no-preview-pane {
 		}
 
 		.informationFull {
-			margin-top: 30px;
-
 
 			table {
 				border-spacing: 0;
@@ -151,20 +185,10 @@ html.rl-no-preview-pane {
 
 			td:first-child {
 				border-right: 1px solid #999;
-				text-align: right;
+				text-align: var(--right, right);
 				white-space: nowrap;
 				width: 1%;
 			}
-
-			td + td {
-				word-break: break-all;
-			}
-		}
-
-		.emptySubjectText {
-			font-style: italic;
-			font-weight: normal;
-			color: #999;
 		}
 
 		.hasVirus {
@@ -174,8 +198,7 @@ html.rl-no-preview-pane {
 		}
 	}
 
-	.openpgp-control {
-		margin: 0.5em;
+	.crypto-control {
 		padding: 0.5em;
 
 		span {
@@ -208,9 +231,6 @@ html.rl-no-preview-pane {
 			display: none;
 		}
 	}
-	.b-text-part > iframe {
-		min-height: 50vh;
-	}
 
 	.thread-controls {
 		.dropdown-toggle {
@@ -224,57 +244,36 @@ html.rl-no-preview-pane {
 	}
 }
 
+#V-MailMessageView.focused .messageView {
+	border-color: #9d9d9d;
+	box-shadow: var(--smMainShadow);
+}
+
 #messageItem {
 
-	color: #000;
 	height: 100%;
 	overflow: auto;
 	scroll-behavior: smooth;
 
-	.buttonFull {
-		display: inline-block;
-		position: fixed;
-		right: 8px;
-		bottom: 8px;
-		height: 30px;
-		width: 30px;
-		text-align: center;
-		vertical-align: middle;
-		line-height: 30px;
-		background-color: transparent;
-		background-color: #fff;
-		border: 1px solid #333;
-		color: #333;
-		z-index: 2;
-		cursor: pointer;
-		border-radius: 5px;
-		opacity: 0.5;
-
-		&:hover {
-			opacity: 0.8;
-			border-color: #666;
-			background-color: #888;
-			color: #fff;
-		}
-	}
-
 	.loading {
 		text-align: center;
-		font-size: 24px;
+		font-size: 171%;
 		color: grey;
 		padding: 50px 0;
 	}
 
-	.showImages, .readReceipt, .pgpSigned, .pgpEncrypted {
+	.bodySubHeader {
+		background-color: var(--message-header-bg-clr, #eee);
+	}
+	.bodySubHeader > * {
+		border-bottom: 1px solid var(--border-color, #bbb);
 		cursor: pointer;
-		padding: 10px 15px;
-		border-bottom: 1px solid #ddd;
-		background-color: #eee;
+		padding: 10px;
 	}
 
 	.pgpInfo {
 		padding: 5px 15px;
-		border-bottom: 1px solid #ddd;
+		border-bottom: 1px solid var(--border-color, #bbb);
 		background-color: #fcf8e3;
 
 		&.success {
@@ -282,35 +281,17 @@ html.rl-no-preview-pane {
 		}
 	}
 
-	.readReceipt {
-		background-color: #ffffd9;
-	}
-
 	.attachmentsPlace {
 
-		padding: 10px 10px 6px 10px;
-		background: #eee;
-		border-bottom: 1px solid #ddd;
+		border-bottom: 1px solid var(--border-color, #bbb);
 		position: relative;
 
-		.attachmentList {
-			margin: 0;
-		}
-
 		&:not(.selection-mode) {
 			.checkboxAttachment {
 				display: none;
 			}
 		}
 
-		&.unselectedAttachmentsError {
-			.attachmentItem {
-				box-shadow: 0 1px 4px red;
-				box-shadow: 0 1px 5px rgba(255, 0, 0, 0.4);
-				box-shadow: 0 0 0 1px rgba(255, 0, 0, 0.2), 0 1px 5px rgba(255, 0, 0, 0.3);
-			}
-		}
-
 		.controls-handle {
 			position: absolute;
 			bottom: 5px;
@@ -321,20 +302,24 @@ html.rl-no-preview-pane {
 	}
 
 	.attachmentsControls {
-		padding: 7px 5px 7px 14px;
-		background: #e8e8e8;
-		border-bottom: 1px solid #ddd;
+		padding-top: 7px;
+		border-top: 1px solid var(--border-color, #bbb);
+	}
+	.attachmentsControls > * {
+		display: inline-block;
+		margin-right: 0.5em;
+		white-space: nowrap;
 	}
 
-	.rlBlockquoteSwitcher {
+	.sm-bq-switcher > summary {
 		border: 1px solid #999;
-		display: block;
-		width: 3em;
-		line-height: 1em;
-		text-align: center;
 		cursor: pointer;
+		line-height: 1em;
 		margin: 2em 0 10px;
 		opacity: 0.5;
+		padding: 0 0.5em;
+		text-align: center;
+		width: fit-content;
 		&:hover {
 			opacity: 1;
 		}
@@ -344,9 +329,20 @@ html.rl-no-preview-pane {
 
 		height: 100%;
 		padding: 10px;
+		position: relative;
+
+		&.swapColors {
+			background-color: var(--main-color, currentcolor);
+			color: var(--main-bg-color);
+		}
+
+		* {
+			box-sizing: unset;
+/*			unicode-bidi: plaintext;*/
+		}
 
 		a {
-			color: blue;
+			color: var(--link-color, blue);
 			text-decoration: underline;
 
 			&:visited {
@@ -362,20 +358,22 @@ html.rl-no-preview-pane {
 			opacity: 0.8;
 			padding: 0 10px;
 			margin: 0;
-		}
 
-		.rl-bq-switcher.hidden-bq {
-			display: none;
+			blockquote {
+				opacity: 1;
+			}
 		}
 
 		&.html {
 
 			img {
-				max-width: 90vw;
+				max-width: 100%;
 				height: auto;
 			}
 			img[data-x-src]:not([src]) {
 				border: 1px solid #999;
+				line-height: 1;
+				padding-left: 1.1em;
 				position: relative;
 			}
 			img[data-x-src]:not([src])::after {
@@ -390,12 +388,9 @@ html.rl-no-preview-pane {
 			img[data-x-src]:not([src]):hover::after {
 				content: attr(data-x-src);
 				font-family: var(--fontSans);
-				font-size: 11px;
+				font-size: 80%;
 				height: auto;
 				transform: translate(-25%,0);
-				width: auto;
-				width: -moz-fit-content;
-				width: -webkit-fit-content;
 				width: fit-content;
 				z-index: 1000;
 			}
@@ -414,7 +409,7 @@ html.rl-no-preview-pane {
 			}
 
 			pre {
-				border-radius: 5px;
+				border-radius: var(--border-radius, 5px);
 				display: block;
 				padding: 5px 10px;
 			}
@@ -456,72 +451,45 @@ html.rl-no-preview-pane {
 	}
 }
 
-html.rl-no-preview-pane .messageView {
-
-	.toolbar {
-		padding-left: 1px;
-	}
-
-	.b-content {
-		top: 50px;
-		left: 0;
-		bottom: @rlBottomMargin;
-		right: @rlBottomMargin;
-		border: 1px solid @rlMainDarkColor;
-		box-shadow: @rlMainShadow;
-	}
+.mailvelope iframe {
+	min-height: 400px;
 }
 
-html:not(.rl-mobile):not(.rl-no-preview-pane) .messageView {
-	.top-toolbar {
+html:not(.sm-msgView-bottom):not(.sm-msgView-side) {
+	#rl-right:not(.message-selected) #V-MailMessageView {
 		display: none;
 	}
 }
 
-html.rl-bottom-preview-pane .messageView {
-	.b-content {
-		bottom: @rlBottomMargin;
+@media screen and (max-width: 1400px) {
+	html.sm-msgView-side #V-MailMessageView .top-toolbar {
+		visibility: hidden;
 	}
 }
 
+html.sm-msgView-bottom {
+	#V-MailMessageView .top-toolbar {
+		display: none;
+	}
+	.messageView {
+		height: 100%;
+	}
+}
+
+/*
+@media all and (display-mode: fullscreen) {
+*/
 html.rl-fullscreen {
 
-	#rl-left {
-		display: none !important;
-	}
-
-	#rl-right {
-		left: 0 !important;
-
-		#V-MailMessageList,
-		#V-SettingsPane,
-		#V-SystemDropDown,
-		#V-MailMessageView .messageView .toolbar {
-			display: none !important;
-		}
-	}
-
+	#rl-left,
+	#V-MailMessageList,
+	#V-SettingsPane,
 	#V-SystemDropDown,
-	.messageView .top-toolbar {
-		display: none;
+	#V-MailMessageView .top-toolbar {
+		display: none !important;
 	}
 
 	.messageView {
 		border: 0;
 	}
-
-	.messageView .b-content {
-		position: fixed;
-		top: 0;
-		right: 0;
-		bottom: 0;
-		left: 0;
-		border: 0;
-	}
-}
-
-html:not(.rl-mobile) #messageItem {
-	.buttonFull {
-		display: none !important;
-	}
 }
diff --git a/dev/Styles/User/OpenPgpKey.less b/dev/Styles/User/OpenPgpKey.less
index c318b157d..c7404e6ab 100644
--- a/dev/Styles/User/OpenPgpKey.less
+++ b/dev/Styles/User/OpenPgpKey.less
@@ -3,9 +3,10 @@
 }
 
 #V-PopupsOpenPgpKey {
-	.key-viewer {
+	pre {
 		margin: 0;
 		max-height: 500px;
+		padding: 0;
 		overflow: auto;
 	}
 }
@@ -13,9 +14,8 @@
 #V-PopupsOpenPgpImport {
 	max-width: 645px;
 
-	.inputKey {
+	textarea {
 		font-family: var(--fontMono);
 		width: 600px;
-
 	}
 }
diff --git a/dev/Styles/User/Settings.less b/dev/Styles/User/Settings.less
index aaca64723..72d4597f6 100644
--- a/dev/Styles/User/Settings.less
+++ b/dev/Styles/User/Settings.less
@@ -1,24 +1,5 @@
 
 #V-SettingsMenu {
-
-	.b-footer {
-		position: absolute;
-		bottom: 10px;
-		right: 0;
-		left: 0;
-		padding: 0 10px 0 5px;
-		z-index: 101;
-	}
-
-	.b-content {
-		position: absolute;
-		top: 50px + @rlLowMargin + 10px;
-		bottom: @rlLowMargin;
-		left: 0;
-		right: 0;
-		overflow: hidden;
-	}
-
 	nav {
 
 		a {
@@ -26,12 +7,14 @@
 			color: var(--settings-menu-color, #333);
 			cursor: pointer;
 			display: block;
-			font-size: 18px;
-			height: 30px;
-			line-height: 29px;
+			font-size: 128%;
+			line-height: 2em;
+			max-height: 2em;
 			overflow: hidden;
-			padding: 4px 10px;
+			padding: 0 10px;
 			text-decoration: none;
+			text-overflow: ellipsis;
+			white-space: nowrap;
 		}
 
 		a:focus, a:hover {
@@ -47,16 +30,22 @@
 }
 
 #V-SettingsPane {
-	height: 100%;
+	height: calc(100% - 50px - @rlLowMargin);
+	margin: 50px @rlLowMargin 0 0;
+	padding:20px;
+	width: 100%;
+
+	background-color: var(--panel-bg-clr, #fff);
+	border: 1px solid var(--border-color, #aaa);
+	border-radius: var(--border-radius, 5px);
+	box-shadow: var(--smMainShadow);
+	overflow-y: auto;
+	scroll-behavior: smooth;
 
 	.btn-toolbar {
 		position: absolute;
-		top: 0;
-		right: 0;
-		left: 0;
-		height: 34px;
-		padding: 8px 0;
-		color: #fff;
+		top: 8px;
+		left: @rlLowMargin;
 	}
 
 	td {
@@ -65,22 +54,7 @@
 	}
 }
 
-#rl-settings-subscreen {
-	margin: 50px @rlLowMargin @rlLowMargin 0;
-	overflow-y: auto;
-	scroll-behavior: smooth;
-	padding:20px;
-
-	box-sizing: border-box;
-	height: calc(100% - 50px - @rlLowMargin - @rlLowMargin);
-
-	background-color: #fff;
-	border: 1px solid @rlMainDarkColor;
-	box-shadow: @rlMainShadow;
-	border-radius: @rlMainBorderRadius;
-}
-
-.firefox-drag #rl-settings-subscreen,
+.firefox-drag #V-SettingsPane,
 .firefox-drag .modal-body {
 	overflow: hidden;
 }
diff --git a/dev/Styles/User/SettingsAccounts.less b/dev/Styles/User/SettingsAccounts.less
index b83ee1a3c..5b7f5c91a 100644
--- a/dev/Styles/User/SettingsAccounts.less
+++ b/dev/Styles/User/SettingsAccounts.less
@@ -26,7 +26,7 @@
 	}
 
 	td + td + td {
-		text-align: right;
+		text-align: var(--right, right);
 	}
 	td:first-child,
 	td:last-child, {
@@ -45,4 +45,8 @@
 		content: ')';
 	}
 
+	.identities-list tr + tr .identity-default {
+		display: none;
+	}
+
 }
diff --git a/dev/Styles/User/SettingsFolders.less b/dev/Styles/User/SettingsFolders.less
index 6cf0fd517..1025dceb6 100644
--- a/dev/Styles/User/SettingsFolders.less
+++ b/dev/Styles/User/SettingsFolders.less
@@ -9,6 +9,10 @@
 		margin-top: 1em;
 	}
 
+	td:first-child {
+		cursor: pointer;
+	}
+
 	td + td {
 		white-space: nowrap;
 		width: 1em;
@@ -19,15 +23,11 @@
 		white-space: pre-wrap;
 	}
 
-	.folder-system-name {
+	.folder-system-name, .folder-size {
+		margin-left: 0.2em;
 		opacity: 0.6;
 	}
 
-	.folder-name.can-be-edited:hover {
-		text-decoration-style: dashed;
-		cursor: pointer;
-	}
-
 	select {
 		width: auto;
 	}
diff --git a/dev/Styles/User/SettingsThemes.less b/dev/Styles/User/SettingsThemes.less
index 9b26a27cd..60f3bc0fe 100644
--- a/dev/Styles/User/SettingsThemes.less
+++ b/dev/Styles/User/SettingsThemes.less
@@ -8,7 +8,7 @@
 		cursor: pointer;
 		padding: 8px;
 		margin: 5px;
-		width: 128px;
+		min-width: 148px;
 
 		&:hover {
 			border-color: grey;
diff --git a/dev/Styles/User/Shortcuts.less b/dev/Styles/User/Shortcuts.less
index 1605d89c6..1edd1ad5f 100644
--- a/dev/Styles/User/Shortcuts.less
+++ b/dev/Styles/User/Shortcuts.less
@@ -6,6 +6,6 @@
 	}
 
 	.tab-content {
-		grid-column-end: 6;
+		grid-column-end: 5;
 	}
 }
diff --git a/dev/Styles/User/SquireUI.less b/dev/Styles/User/SquireUI.less
index 72f290898..1a9c46ce3 100644
--- a/dev/Styles/User/SquireUI.less
+++ b/dev/Styles/User/SquireUI.less
@@ -5,13 +5,22 @@
 	overflow-x: auto;
 	overflow-y: hidden;
 	padding: 2px;
+	position: relative;
 	white-space: nowrap;
 }
 
+.squire-toolbar input[type="color"] {
+	bottom: 0;
+	left: -100em;
+	opacity: 0;
+	position: absolute;
+	width: 40px;
+}
+
 .squire-toolbar select {
-	font-size: 12px;
+	font-size: 85%;
 	padding: 4px 1.5em 4px 6px;
-	text-align: left;
+	text-align: var(--left, left);
 	vertical-align: middle;
 	width: 7em;
 }
@@ -37,8 +46,6 @@
 */
 
 .squire-wysiwyg, .squire-plain {
-	box-sizing: border-box;
-	font-size: 13px;
 	height: 100%;
 	line-height: 16px;
 	min-height: 200px;
@@ -49,6 +56,12 @@
 .squire-wysiwyg {
 	font-family: var(--fontSans);
 
+	/* Prevent collapse of empty elements so that the caret can be placed in there
+	*:empty::before {
+		content: "\200B";
+	}
+	*/
+
 	ul {
 		padding-left: 40px;
 		li {
@@ -80,7 +93,7 @@
 	}
 
 	pre {
-		border-radius: 5px;
+		border-radius: var(--border-radius, 5px);
 		padding: 5px 10px;
 	}
 
@@ -133,39 +146,14 @@ Secondly, we can't rely on MUA's what to do with :empty
 	width: 100%;
 }
 
+.squire-mode-source .squire-wysiwyg,
 .squire-mode-wysiwyg .squire-plain,
 .squire-mode-plain .squire-wysiwyg,
 .squire-mode-plain .btn-group:not(#squire-toolgroup-mode) {
 	display: none;
 }
 
+.squire-mode-source .squire-plain,
 .squire-mode-plain .squire-plain {
 	display: block;
 }
-
-/* @media (hover: none) */
-@media screen and (max-height: 600px) {
-	.rl-mobile .textAreaParent:not(:focus-within) .squire-toolbar {
-		display: none;
-	}
-	.rl-mobile .squire-toolbar {
-		background: #EEE;
-		padding: 1px;
-		position: fixed;
-		top: 18px;
-		left: 0;
-		right: 0;
-	/*
-		transform: translateY(-42px);
-		z-index: 9;
-	*/
-	}
-}
-
-.rl-mobile #V-PopupsCompose {
-	min-height: calc(100% - 12px);
-}
-
-#V-PopupsCompose[data-wysiwyg*=Forced] #squire-toolgroup-mode {
-	display: none;
-}
diff --git a/dev/Styles/User/SystemDropDown.less b/dev/Styles/User/SystemDropDown.less
index 5f0ff170f..af6234865 100644
--- a/dev/Styles/User/SystemDropDown.less
+++ b/dev/Styles/User/SystemDropDown.less
@@ -1,8 +1,6 @@
 
 #top-system-dropdown-id {
-	overflow: hidden;
-	padding-left: 10px;
-	padding-right: 10px;
+	padding: 0 6px;
 }
 
 .rl-left-panel-disabled #more-list-dropdown-id + .dropdown-menu {
@@ -15,25 +13,19 @@
 	position: absolute;
 	top: 0;
 	right: 0;
-	height: 30px;
 	padding: 10px @rlLowMargin;
 	z-index: 103;
 
 	.email-title {
-		display: inline-block;
-		max-width: 50vw;
-		text-align: left;
 		text-overflow: ellipsis;
 		overflow: hidden;
-		margin-right: 28px;
-		vertical-align: middle;
 	}
 
 	.audioPlace {
 		cursor: pointer;
 		display: inline-block;
-		font-size: 30px;
-		height: 30px;
+		font-size: 214%;
+		height: 1em;
 		margin-right: 10px;
 		width: 1em;
 
@@ -55,29 +47,33 @@
 	}
 
 	.accountPlace {
-		background-color: rgba(0, 0, 0, 0.5);
-		border-radius: 4px;
-		color: #fff;
+		border-right: 1px solid var(--btn-border-clr, rgba(0, 0, 0, 0.2));
 		display: inline-block;
-		font-weight: bold;
-		font-size: 16px;
-		height: 29px;
-		line-height: 30px;
+		font-weight: 600;
+		line-height: 1.3;
+		margin: 0 6px -4px 0;
 		max-width: 25vw;
+/*		max-width: calc(100vw - 300px);*/
 		overflow: hidden;
-		padding: 1px 8px;
+		padding-right: 6px;
 		text-overflow: ellipsis;
-		text-shadow: 0 1px 0 #000;
-		white-space: nowrap;
 	}
 
-	.counter {
-		display: inline-block;
+	a[data-unread]::after {
+		content: attr(data-unread);
+		background-color: var(--unread-count-bg-color, #999);
+		border-radius: 1em;
+		color: var(--unread-count-color, #fff);
+		font-size: 80%;
+		line-height: 1.5em;
+		min-width: 1.7em;
+		padding: 1px 4px;
+		text-align: center;
+		text-shadow: 0 -1px 0 rgba(0,0,0,.25);
+		position: absolute;
+		right: 3px;
 	}
 
-	.dropdown-menu a.account-item {
-		padding-right: 5px;
-	}
 }
 
 @keyframes equaliserBar {
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
deleted file mode 100644
index e2c0b51d1..000000000
--- a/dev/Styles/_BootstrapFix.less
+++ /dev/null
@@ -1,49 +0,0 @@
-
-.legend {
-	display: block;
-	width: 100%;
-	padding: 0;
-	margin-bottom: @baseLineHeight;
-	font-size: @baseFontSize * 1.5;
-	line-height: @baseLineHeight * 1.5;
-	color: @grayDark;
-	border: 0;
-	border-bottom: 1px solid @dropdownDividerTop;
-}
-summary.legend {
-	display: list-item;
-	cursor: pointer;
-}
-
-.btn.btn-thin {
-	padding: 4px 9px;
-}
-
-.alert a:not(.close) {
-	text-decoration: underline;
-	color: @warningText;
-}
-
-.alert.alert-info a:not(.close) {
-	color: @infoText;
-}
-
-.alert.alert-error a:not(.close) {
-	color: @errorText;
-}
-
-/* mobile and tablet */
-@media screen and (max-width: 999px) {
-	.form-horizontal {
-		.control-group {
-			> label {
-				text-align: left;
-			}
-
-			// Move over all input controls and content
-			> *:not(label) {
-				margin-left: 20px;
-			}
-		}
-	}
-}
diff --git a/dev/Styles/_End.less b/dev/Styles/_End.less
index 91f0b998e..75875d0f0 100644
--- a/dev/Styles/_End.less
+++ b/dev/Styles/_End.less
@@ -4,22 +4,22 @@
 }
 [data-rainloopErrorTip]::before {
 	background: #fff;
-	border-radius: 3px;
+	border-radius: var(--input-border-radius, 3px);
 	border: 1px solid #999;
 	color: red;
 	content: attr(data-rainloopErrorTip);
-	font-size: 13px;
-	left: 100%;
+	font-size: 90%;
+	left: 0;
 	opacity: 1;
 	padding: 0.25em;
 	position : absolute;
-	text-align: left;
+	text-align: var(--left, left);
 	top: 100%;
 	transition: opacity 0.2s ease-in-out;
-	white-space: nowrap;
+	white-space: pre;
 	z-index: 2001;
 }
-@media only screen and (max-width: 600px) {
+@media screen and (max-width: @maxMobileWidth) {
 	[data-rainloopErrorTip]::before {
 		min-width: 60vw;
 		white-space: normal;
@@ -33,6 +33,11 @@ input:-webkit-autofill:active {
 	transition: color 9999s ease-out, background-color 9999s ease-out;
 }
 
+.btn-rotate,
+[data-icon].rotate::before {
+	transform: rotate(-180deg);
+}
+
 /*
 @media (pointer: coarse), (hover: none) {
 	[title] {
diff --git a/dev/Styles/_FontasticToBoot.less b/dev/Styles/_FontasticToBoot.less
index 92a7645b3..2e257760e 100644
--- a/dev/Styles/_FontasticToBoot.less
+++ b/dev/Styles/_FontasticToBoot.less
@@ -8,8 +8,7 @@
 [class^="icon-"],
 [class*=" icon-"] {
 	display: inline-block;
-	width: 1em;
-	vertical-align: text-top;
+	min-width: 1em;
 
 	.disabled &,
 	.btn[disabled] & {
@@ -19,7 +18,7 @@
 
 /* .b-contacts-content .b-view-content */
 .iconsize24 {
-	font-size: 24px;
+	font-size: 171%;
 }
 
 .iconcolor-green {
@@ -36,14 +35,16 @@
 
 .icon-spinner {
 
-	height: 0.75em;
-	width: 0.75em;
+	height: 1.2em;
+	width: 1.2em;
 
 	margin: 0 -1px;
 
 	border: 3px solid #aaa;
 	border-top-color: #333;
 	border-radius: 100%;
+
+	vertical-align: text-top;
 }
 
 .icon-spinner:not(.not-animated),
diff --git a/dev/Styles/_Values.less b/dev/Styles/_Values.less
index 75f0faf08..11dd6cb05 100644
--- a/dev/Styles/_Values.less
+++ b/dev/Styles/_Values.less
@@ -1,11 +1,17 @@
 
 @rlLeftWidth: 200px;
-
-@rlMainBorderRadius: 5px;
-
-@rlMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
-
 @rlLowMargin: 8px;
-@rlBottomMargin: 5px;
 
-@rlMainDarkColor: #aaa;
+/* mobile and tablet */
+@maxMobileWidth: 799px;
+
+:root {
+	--smDialogShrink: 20px;
+	--smMainShadow: 0 2px 8px rgba(0, 0, 0, 0.2);
+}
+/* For Firefox */
+@media screen and (max-width: @maxMobileWidth) {
+	:root {
+		--smDialogShrink: 25px;
+	}
+}
diff --git a/dev/Styles/rtl.less b/dev/Styles/rtl.less
new file mode 100644
index 000000000..86e27bf3e
--- /dev/null
+++ b/dev/Styles/rtl.less
@@ -0,0 +1,130 @@
+html[dir="rtl"] {
+	direction: rtl;
+
+	--right: left;
+	--left: right;
+}
+
+[dir="rtl"] {
+
+	.LoginView .controls > .fontastic:first-child {
+		left: unset;
+		right: 6px;
+	}
+
+	&.sm-msgView-side #V-MailMessageList .resizer,
+	.search-input-wrp a {
+		right: unset;
+		left: 0;
+	}
+
+	.fontastic + span, [class^="icon-"] + span, [class*=" icon-"] + span {
+		margin-left: unset;
+		margin-right: 0.5em;
+	}
+
+	[data-icon]::before {
+		margin-left: 0.5em;
+		margin-right: 0;
+	}
+
+	.dropdown-menu.right-edge {
+		right: auto;
+		left: 0;
+	}
+
+	.form-horizontal .control-group > :not(label) {
+		margin: 0 20px 0 0;
+	}
+
+	.messageList .checkboxCheckAll {
+		margin: 0.45em 0 0 0.5em;
+	}
+
+	.messageListItem {
+		border-left: 0;
+		border-right: 6px solid transparent;
+
+		time, .sizeParent {
+			margin: 0 0 0 5px;
+		}
+
+		.attachmentParent,
+		.flagParent {
+			margin: 0 5px 0 10px;
+		}
+	}
+	.messageListItem > div + div {
+		padding: 5px 5px 5px 0;
+	}
+
+	#V-SystemDropDown {
+		right: unset;
+		left: 0;
+
+		.accountPlace {
+			border-right: 0;
+			border-left: 1px solid var(--btn-border-clr, rgba(0, 0, 0, 0.2));
+			margin: 0 0 -4px 6px;
+			padding-right: 0;
+			padding-left: 6px;
+		}
+	}
+
+	#V-PopupsCompose {
+		.b-header {
+			td:first-child {
+				padding: 0 0 0 10px;
+			}
+		}
+
+		header .close,
+		header .minimize-custom {
+			margin-left: 0;
+			margin-right: 0.7em;
+		}
+	}
+
+	.b-folders {
+		padding-left: 2px;
+		padding-right: unset;
+
+		.b-folders-system a[data-unread]::after,
+		.b-folders-user a[data-unread]:not(.system)::after {
+			right: unset;
+			left: 3px;
+		}
+		.flag-icon {
+			margin-left: 0;
+			margin-right: 7px;
+		}
+		li a {
+			border-left: 0;
+			border-right: 3px solid transparent;
+			padding: 0 @folderItemPadding 0 2em;
+		}
+	}
+
+	.messageView .messageItemHeader .informationShort {
+		margin: 0 0 0 56px;
+	}
+	.messageView .messageItemHeader .informationFull td:first-child {
+		border-right: 0;
+		border-left: 1px solid #999;
+	}
+	.messageView .message-fixed-button-toolbar {
+		right: unset;
+		left: 10px;
+	}
+
+	#V-PopupsContacts {
+		.e-contact-item {
+			border-left: 0;
+			border-right: 6px solid #eee;
+		}
+	}
+
+	[data-rainloopErrorTip]::before {
+		left: 100%;
+	}
+}
diff --git a/dev/View/Admin/Login.js b/dev/View/Admin/Login.js
index ba8571aa6..d50ee858e 100644
--- a/dev/View/Admin/Login.js
+++ b/dev/View/Admin/Login.js
@@ -1,5 +1,6 @@
 import { fireEvent } from 'Common/Globals';
 import { getNotification } from 'Common/Translator';
+import { addObservablesTo, addSubscribablesTo } from 'External/ko';
 
 import Remote from 'Remote/Admin/Fetch';
 
@@ -10,7 +11,7 @@ export class AdminLoginView extends AbstractViewLogin {
 	constructor() {
 		super('AdminLogin');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			login: '',
 			password: '',
 			totp: '',
@@ -22,7 +23,7 @@ export class AdminLoginView extends AbstractViewLogin {
 			submitError: ''
 		});
 
-		this.addSubscribables({
+		addSubscribablesTo(this, {
 			login: () => this.loginError(false),
 			password: () => this.passwordError(false)
 		});
@@ -32,10 +33,14 @@ export class AdminLoginView extends AbstractViewLogin {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	submitCommand(self, event) {
 		let form = event.target.form,
 			data = new FormData(form),
-			valid = form.reportValidity() && fireEvent('sm-admin-login', data);
+			valid = form.reportValidity() && fireEvent('sm-admin-login', data, 1);
 
 		this.loginError(!this.login());
 		this.passwordError(!this.password());
diff --git a/dev/View/Admin/Settings/Pane.js b/dev/View/Admin/Settings/Pane.js
index 207c90440..9f85b60eb 100644
--- a/dev/View/Admin/Settings/Pane.js
+++ b/dev/View/Admin/Settings/Pane.js
@@ -2,12 +2,12 @@ import Remote from 'Remote/Admin/Fetch';
 
 import { AbstractViewRight } from 'Knoin/AbstractViews';
 
-import { leftPanelDisabled } from 'Common/Globals';
+import { toggleLeftPanel } from 'Common/Globals';
 
 export class PaneSettingsAdminView extends AbstractViewRight {
 	constructor() {
 		super('AdminPane');
-		this.leftPanelDisabled = leftPanelDisabled;
+		this.toggleLeftPanel = toggleLeftPanel;
 	}
 
 	logoutClick() {
diff --git a/dev/View/Popup/Account.js b/dev/View/Popup/Account.js
index 71e8ab12e..8e36b14f4 100644
--- a/dev/View/Popup/Account.js
+++ b/dev/View/Popup/Account.js
@@ -1,4 +1,6 @@
+import { addObservablesTo } from 'External/ko';
 import { getNotification } from 'Common/Translator';
+import { loadAccountsAndIdentities } from 'Common/UtilsUser';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -8,66 +10,53 @@ export class AccountPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Account');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			isNew: true,
 
+			name: '',
 			email: '',
 			password: '',
 
-			emailError: false,
-			passwordError: false,
-
 			submitRequest: false,
 			submitError: '',
 			submitErrorAdditional: ''
 		});
-
-		this.email.subscribe(() => this.emailError(false));
-
-		this.password.subscribe(() => this.passwordError(false));
 	}
 
-	submitForm() {
-		if (!this.submitRequest()) {
-			const email = this.email().trim(), pass = this.password();
-			this.emailError(!email);
-			this.passwordError(!pass);
-			if (!this.emailError() && pass) {
-				this.submitRequest(true);
-				Remote.request('AccountSetup', (iError, data) => {
-						this.submitRequest(false);
-						if (iError) {
-							this.submitError(getNotification(iError));
-							this.submitErrorAdditional((data && data.ErrorMessageAdditional) || '');
-						} else {
-							rl.app.accountsAndIdentities();
-							this.close();
-						}
-					}, {
-						Email: email,
-						Password: pass,
-						New: this.isNew() ? 1 : 0
+	hideError() {
+		this.submitError('');
+	}
+
+	submitForm(form) {
+		if (!this.submitRequest() && form.reportValidity()) {
+			const data = new FormData(form);
+			data.set('new', this.isNew() ? 1 : 0);
+			this.submitRequest(true);
+			Remote.request('AccountSetup', (iError, data) => {
+					this.submitRequest(false);
+					if (iError) {
+						this.submitError(getNotification(iError));
+						this.submitErrorAdditional(data?.messageAdditional);
+					} else {
+						loadAccountsAndIdentities();
+						this.close();
 					}
-				);
-			}
+				}, data
+			);
 		}
 	}
 
-	onShow(account) {
-		if (account && account.isAdditional()) {
-			this.isNew(false);
-			this.email(account.email);
-		} else {
-			this.isNew(true);
-			this.email('');
-		}
+	onHide() {
 		this.password('');
-
-		this.emailError(false);
-		this.passwordError(false);
-
 		this.submitRequest(false);
 		this.submitError('');
 		this.submitErrorAdditional('');
 	}
+
+	onShow(account) {
+		let edit = account?.isAdditional();
+		this.isNew(!edit);
+		this.name(edit ? account.name : '');
+		this.email(edit ? account.email : '');
+	}
 }
diff --git a/dev/View/Popup/AdvancedSearch.js b/dev/View/Popup/AdvancedSearch.js
index 74800a7ed..813023148 100644
--- a/dev/View/Popup/AdvancedSearch.js
+++ b/dev/View/Popup/AdvancedSearch.js
@@ -1,22 +1,24 @@
-import { koComputable } from 'External/ko';
-
-import { i18n, trigger as translatorTrigger } from 'Common/Translator';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
+import { i18n, translateTrigger } from 'Common/Translator';
+import { pString } from 'Common/Utils';
 
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
-import { FolderUserStore } from 'Stores/User/Folder';
+import { FolderUserStore, isAllowedKeyword } from 'Stores/User/Folder';
 
 export class AdvancedSearchPopupView extends AbstractViewPopup {
 	constructor() {
 		super('AdvancedSearch');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			from: '',
 			to: '',
 			subject: '',
 			text: '',
-			selectedDateValue: -1,
+			keyword: '',
+			repliedValue: -1,
+			selectedDateValue: 0,
 			selectedTreeValue: '',
 
 			hasAttachment: false,
@@ -24,30 +26,66 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 			unseen: false
 		});
 
-		this.showMultisearch = koComputable(() => FolderUserStore.hasCapability('MULTISEARCH'));
+		addComputablesTo(this, {
+			showMultisearch: () => FolderUserStore.hasCapability('MULTISEARCH'),
 
-		this.selectedDates = koComputable(() => {
-			translatorTrigger();
-			let prefix = 'SEARCH/LABEL_ADV_DATE_';
-			return [
-				{ id: -1, name: i18n(prefix + 'ALL') },
-				{ id: 3, name: i18n(prefix + '3_DAYS') },
-				{ id: 7, name: i18n(prefix + '7_DAYS') },
-				{ id: 30, name: i18n(prefix + 'MONTH') },
-				{ id: 90, name: i18n(prefix + '3_MONTHS') },
-				{ id: 180, name: i18n(prefix + '6_MONTHS') },
-				{ id: 365, name: i18n(prefix + 'YEAR') }
-			];
-		});
+			// Almost the same as MessageModel.tagOptions
+			keywords: () => {
+				const keywords = [{value:'',label:''}];
+				FolderUserStore.currentFolder().optionalTags().forEach(value => {
+					let lower = value.toLowerCase();
+					keywords.push({
+						value: value,
+						label: i18n('MESSAGE_TAGS/'+lower, 0, lower)
+					});
+				});
+				return keywords
+			},
 
-		this.selectedTree = koComputable(() => {
-			translatorTrigger();
-			let prefix = 'SEARCH/LABEL_ADV_SUBFOLDERS_';
-			return [
-				{ id: '', name: i18n(prefix + 'NONE') },
-				{ id: 'subtree-one', name: i18n(prefix + 'SUBTREE_ONE') },
-				{ id: 'subtree', name: i18n(prefix + 'SUBTREE') }
-			];
+			showKeywords: () => FolderUserStore.currentFolder().permanentFlags().some(isAllowedKeyword),
+
+			repliedOptions: () => {
+				translateTrigger();
+				return [
+					{ id: -1, name: '' },
+					{ id: 1, name: i18n('GLOBAL/YES') },
+					{ id: 0, name: i18n('GLOBAL/NO') }
+				];
+			},
+
+			selectedDates: () => {
+				translateTrigger();
+				// We should think about migrating all SEARCH/DATE_ to either SEARCH/SINCE_DATE or SEARCH/BEFORE_DATE
+				// and adjust the prefix accordingly
+				// let prefix_since = 'SEARCH/SINCE_DATE_';
+				let prefix = 'SEARCH/SINCE_';
+				let prefix_before = 'SEARCH/BEFORE_';
+				return [
+					{ id: 0, name: i18n('SEARCH/DATE_ALL') },
+					{ id: 3, name: i18n(prefix + '3_DAYS') },
+					{ id: 7, name: i18n(prefix + '7_DAYS') },
+					{ id: 30, name: i18n(prefix + 'MONTH') },
+					{ id: 90, name: i18n(prefix + '3_MONTHS') },
+					{ id: 180, name: i18n(prefix + '6_MONTHS') },
+					{ id: 365, name: i18n(prefix + 'YEAR') },
+					{ id: -3, name: i18n(prefix_before + '3_DAYS') },
+					{ id: -7, name: i18n(prefix_before + '7_DAYS') },
+					{ id: -30, name: i18n(prefix_before + 'MONTH') },
+					{ id: -90, name: i18n(prefix_before + '3_MONTHS') },
+					{ id: -180, name: i18n(prefix_before + '6_MONTHS') },
+					{ id: -365, name: i18n(prefix_before + 'YEAR') }
+				];
+			},
+
+			selectedTree: () => {
+				translateTrigger();
+				let prefix = 'SEARCH/SUBFOLDERS_';
+				return [
+					{ id: '', name: i18n(prefix + 'NONE') },
+					{ id: 'subtree-one', name: i18n(prefix + 'SUBTREE_ONE') },
+					{ id: 'subtree', name: i18n(prefix + 'SUBTREE') }
+				];
+			}
 		});
 	}
 
@@ -60,66 +98,67 @@ export class AdvancedSearchPopupView extends AbstractViewPopup {
 		this.close();
 	}
 
-	parseSearchStringValue(search) {
-		const parts = (search || '').split(/[\s]+/g);
-		parts.forEach(part => {
-			switch (part) {
-				case 'has:attachment':
-					this.hasAttachment(true);
-					break;
-				case 'is:unseen,flagged':
-					this.starred(true);
-				/* falls through */
-				case 'is:unseen':
-					this.unseen(true);
-					break;
-				// no default
-			}
-		});
-	}
-
 	buildSearchString() {
 		const
+			self = this,
 			data = new FormData(),
 			append = (key, value) => value.length && data.append(key, value);
 
-		append('from', this.from().trim());
-		append('to', this.to().trim());
-		append('subject', this.subject().trim());
-		append('text', this.text().trim());
-		append('in', this.selectedTreeValue());
-		if (-1 < this.selectedDateValue()) {
+		append('from', self.from().trim());
+		append('to', self.to().trim());
+		append('subject', self.subject().trim());
+		append('text', self.text().trim());
+		append('keyword', self.keyword());
+		append('in', self.selectedTreeValue());
+		if (0 < self.selectedDateValue()) {
 			let d = new Date();
-			d.setDate(d.getDate() - this.selectedDateValue());
+			d.setDate(d.getDate() - self.selectedDateValue());
 			append('since', d.toISOString().split('T')[0]);
 		}
+		else if (-1 > self.selectedDateValue()) {
+			let d = new Date();
+			d.setDate(d.getDate() + self.selectedDateValue());
+			append('before', d.toISOString().split('T')[0]);
+		}
 
-		let result = new URLSearchParams(data).toString();
+		let result = decodeURIComponent(new URLSearchParams(data).toString());
 
-		if (this.hasAttachment()) {
+		if (self.hasAttachment()) {
 			result += '&attachment';
 		}
-		if (this.unseen()) {
+		if (self.unseen()) {
 			result += '&unseen';
 		}
-		if (this.starred()) {
+		if (self.starred()) {
 			result += '&flagged';
 		}
+		if (1 == self.repliedValue()) {
+			result += '&answered';
+		}
+		if (0 == self.repliedValue()) {
+			result += '&unanswered';
+		}
 
 		return result.replace(/^&+/, '');
 	}
 
 	onShow(search) {
-		this.from('');
-		this.to('');
-		this.subject('');
-		this.text('');
-
-		this.selectedDateValue(-1);
-		this.hasAttachment(false);
-		this.starred(false);
-		this.unseen(false);
-
-		this.parseSearchStringValue(search);
+		const self = this,
+			params = new URLSearchParams('?'+search);
+		self.from(pString(params.get('from')));
+		self.to(pString(params.get('to')));
+		self.subject(pString(params.get('subject')));
+		self.text(pString(params.get('text')));
+		self.keyword(pString(params.get('keyword')));
+		self.selectedTreeValue(pString(params.get('in')));
+		self.selectedDateValue(0);
+		self.hasAttachment(params.has('attachment'));
+		self.starred(params.has('flagged'));
+		self.unseen(params.has('unseen'));
+		if (params.has('answered')) {
+			self.repliedValue(1);
+		} else if (params.has('unanswered')) {
+			self.repliedValue(0);
+		}
 	}
 }
diff --git a/dev/View/Popup/Ask.js b/dev/View/Popup/Ask.js
index ae1f8388e..8392dfcbd 100644
--- a/dev/View/Popup/Ask.js
+++ b/dev/View/Popup/Ask.js
@@ -1,20 +1,28 @@
 import { i18n } from 'Common/Translator';
 import { isFunction } from 'Common/Utils';
-
+import { addObservablesTo } from 'External/ko';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
 export class AskPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Ask');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			askDesc: '',
 			yesButton: '',
 			noButton: '',
+			username: '',
+			askUsername: false,
 			passphrase: '',
-			askPass: false
+			askPass: false,
+			remember: true, // remember for session
+			askRemeber: false,
+			rememberPermanent: false,
+			askRememberPermanent: false,
 		});
 
+		this.rememberPermanent.subscribe(value => value && this.remember(true));
+
 		this.fYesAction = null;
 		this.fNoAction = null;
 
@@ -24,13 +32,13 @@ export class AskPopupView extends AbstractViewPopup {
 	yesClick() {
 		this.close();
 
-		isFunction(this.fYesAction) && this.fYesAction();
+		isFunction(this.fYesAction) && this.fYesAction(this);
 	}
 
 	noClick() {
 		this.close();
 
-		isFunction(this.fNoAction) && this.fNoAction();
+		isFunction(this.fNoAction) && this.fNoAction(this);
 	}
 
 	/**
@@ -40,15 +48,23 @@ export class AskPopupView extends AbstractViewPopup {
 	 * @param {boolean=} focusOnShow = true
 	 * @returns {void}
 	 */
-	onShow(sAskDesc, fYesFunc = null, fNoFunc = null, focusOnShow = true, askPass = false, btnText = '') {
+	onShow(sAskDesc, fYesFunc = null, fNoFunc = null, focusOnShow = true, ask = 0, btnText = '') {
 		this.askDesc(sAskDesc || '');
-		this.askPass(askPass);
+		this.askUsername(ask & 2);
+		this.askPass(ask & 1);
+		this.askRemeber(ask & 4); // 0b0100
+		this.askRememberPermanent(ask & 0b1000)
+		this.username('');
 		this.passphrase('');
-		this.yesButton(i18n(btnText || 'POPUPS_ASK/BUTTON_YES'));
-		this.noButton(i18n(askPass ? 'GLOBAL/CANCEL' : 'POPUPS_ASK/BUTTON_NO'));
+		this.remember(true);
+		this.rememberPermanent(false);
+		this.yesButton(i18n(btnText || 'GLOBAL/YES'));
+		this.noButton(i18n(ask ? 'GLOBAL/CANCEL' : 'GLOBAL/NO'));
 		this.fYesAction = fYesFunc;
 		this.fNoAction = fNoFunc;
-		this.focusOnShow = focusOnShow ? (askPass ? 'input[type="password"]' : '.buttonYes') : '';
+		this.focusOnShow = focusOnShow
+			? (ask ? 'input[type="'+(ask&2?'text':'password')+'"]' : '.buttonYes')
+			: '';
 	}
 
 	afterShow() {
@@ -63,25 +79,15 @@ export class AskPopupView extends AbstractViewPopup {
 	onBuild() {
 //		shortcuts.add('tab', 'shift', 'Ask', () => {
 		shortcuts.add('tab,arrowright,arrowleft', '', 'Ask', () => {
-			let btn = this.querySelector('.buttonYes');
-			if (btn.matches(':focus')) {
-				btn = this.querySelector('.buttonNo');
+			let yes = this.querySelector('.buttonYes'),
+				no = this.querySelector('.buttonNo');
+			if (yes.matches(':focus')) {
+				no.focus();
+				return false;
+			} else if (no.matches(':focus')) {
+				yes.focus();
+				return false;
 			}
-			btn.focus();
-			return false;
 		});
 	}
 }
-
-AskPopupView.password = function(sAskDesc, btnText) {
-	return new Promise(resolve => {
-		this.showModal([
-			sAskDesc,
-			() => resolve(this.__vm.passphrase()),
-			() => resolve(null),
-			true,
-			true,
-			btnText
-		]);
-	});
-}
diff --git a/dev/View/Popup/Compose.js b/dev/View/Popup/Compose.js
index 4836e0fc5..ffa49a2a4 100644
--- a/dev/View/Popup/Compose.js
+++ b/dev/View/Popup/Compose.js
@@ -1,26 +1,26 @@
 import ko from 'ko';
 
 import {
-	Notification,
+	Notifications,
 	UploadErrorCode
 } from 'Common/Enums';
 
 import {
 	ComposeType,
-	EditorDefaultType,
-	SetSystemFoldersNotification
+	FolderType
 } from 'Common/EnumsUser';
 
-import { pInt, isArray, arrayLength, forEachObjectEntry } from 'Common/Utils';
-import { encodeHtml, HtmlEditor, htmlToPlain } from 'Common/Html';
-import { koArrayWithDestroy } from 'External/ko';
+import { pInt, isArray, arrayLength, b64Encode } from 'Common/Utils';
+import { encodeHtml, htmlToPlain } from 'Common/Html';
+import { HtmlEditor } from 'Common/HtmlEditor';
+import { koArrayWithDestroy, addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
-import { messagesDeleteHelper } from 'Common/Folders';
+import { folderInformation } from 'Common/Folders';
 import { serverRequest } from 'Common/Links';
 import { i18n, getNotification, getUploadErrorDescByCode, timestampToString } from 'Common/Translator';
-import { MessageFlagsCache, setFolderHash } from 'Common/Cache';
-import { Settings, SettingsGet, elementById, addShortcut } from 'Common/Globals';
+import { setFolderETag } from 'Common/Cache';
+import { SettingsCapa, SettingsGet, elementById, addShortcut, createElement } from 'Common/Globals';
 //import { exitFullscreen, isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
 import { AppUserStore } from 'Stores/User/App';
@@ -28,9 +28,15 @@ import { SettingsUserStore } from 'Stores/User/Settings';
 import { IdentityUserStore } from 'Stores/User/Identity';
 import { AccountUserStore } from 'Stores/User/Account';
 import { FolderUserStore } from 'Stores/User/Folder';
+
 import { PgpUserStore } from 'Stores/User/Pgp';
 import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
+import { MailvelopeUserStore } from 'Stores/User/Mailvelope';
+//import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
+import { SMimeUserStore } from 'Stores/User/SMime';
+import { Passphrases } from 'Storage/Passphrases';
+
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 
@@ -38,6 +44,9 @@ import Remote from 'Remote/User/Fetch';
 
 import { ComposeAttachmentModel } from 'Model/ComposeAttachment';
 import { EmailModel } from 'Model/Email';
+import { IdentityModel } from 'Model/Identity';
+import { MimeHeaderAutocryptModel } from 'Model/MimeHeaderAutocrypt';
+import { addressparser } from 'Mime/Address';
 
 import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
@@ -45,23 +54,64 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
 import { FolderSystemPopupView } from 'View/Popup/FolderSystem';
 import { AskPopupView } from 'View/Popup/Ask';
 import { ContactsPopupView } from 'View/Popup/Contacts';
+
 /*
 import { ThemeStore } from 'Stores/Theme';
 
 let alreadyFullscreen;
 */
+let oLastMessage;
+
 const
 	ScopeCompose = 'Compose',
 
-	base64_encode = text => btoa(text).match(/.{1,76}/g).join('\r\n'),
+	tpl = createElement('template'),
 
-	email = new EmailModel(),
-	getEmail = value => {
-		email.clear();
-		email.parse(value.trim());
-		return email.email || false;
+	base64_encode = text => text ? b64Encode(text).match(/.{1,76}/g).join('\r\n') : '',
+
+	getEmail = value => addressparser(value)[0]?.email || false,
+
+	/**
+	 * @param {Array} aList
+	 * @param {boolean} bFriendly
+	 * @returns {string}
+	 */
+	emailArrayToStringLineHelper = (aList, bFriendly) =>
+		aList.filter(item => item.email).map(item => item.toLine(bFriendly)).join(', '),
+
+	reloadDraftFolder = () => {
+		const draftsFolder = FolderUserStore.draftsFolder();
+		if (draftsFolder && UNUSED_OPTION_VALUE !== draftsFolder) {
+			setFolderETag(draftsFolder, '');
+			if (FolderUserStore.currentFolderFullName() === draftsFolder) {
+				MessagelistUserStore.reload(true);
+			} else {
+				folderInformation(draftsFolder);
+			}
+		}
 	},
 
+	findIdentity = addresses => {
+		addresses = addresses.map(item => item.email);
+		return IdentityUserStore.find(item => addresses.includes(item.email));
+	},
+
+	/**
+	 * @param {Function} fKoValue
+	 * @param {Array} emails
+	 */
+	addEmailsTo = (fKoValue, emails) => {
+		if (arrayLength(emails)) {
+			const value = fKoValue().trim(),
+				values = emails.map(item => item ? item.toLine() : null)
+					.validUnique();
+
+			fKoValue(value + (value ? ', ' :  '') + values.join(', ').trim());
+		}
+	},
+
+	isPlainEditor = () => 'Plain' === SettingsUserStore.editorDefaultType(),
+
 	/**
 	 * @param {string} prefix
 	 * @param {string} subject
@@ -124,7 +174,7 @@ class MimePart {
 		const hasSub = this.children.length,
 			boundary = this.boundary || (this.boundary = 'part' + Jua.randomId()),
 			headers = this.headers;
-		if (hasSub) {
+		if (hasSub && !headers['Content-Type'].includes(boundary)) {
 			headers['Content-Type'] += `; boundary="${boundary}"`;
 		}
 		let result = Object.entries(headers).map(([key, value]) => `${key}: ${value}`).join('\r\n') + '\r\n';
@@ -144,8 +194,8 @@ export class ComposePopupView extends AbstractViewPopup {
 		super('Compose');
 
 		const fEmailOutInHelper = (context, identity, name, isIn) => {
-			if (identity && context && identity[name]() && (isIn ? true : context[name]())) {
-				const identityEmail = identity[name]();
+			const identityEmail = context && identity?.[name]();
+			if (identityEmail && (isIn ? true : context[name]())) {
 				let list = context[name]().trim().split(',');
 
 				list = list.filter(email => {
@@ -153,29 +203,23 @@ export class ComposePopupView extends AbstractViewPopup {
 					return email && identityEmail.trim() !== email;
 				});
 
-				if (isIn) {
-					list.push(identityEmail);
-				}
+				isIn && list.push(identityEmail);
 
 				context[name](list.join(','));
 			}
 		};
 
-		this.oLastMessage = null;
 		this.oEditor = null;
-		this.aDraftInfo = null;
-		this.sInReplyTo = '';
-		this.bFromDraft = false;
-		this.sReferences = '';
 
 		this.sLastFocusedField = 'to';
 
 		this.allowContacts = AppUserStore.allowContacts();
+		this.allowIdentities = SettingsCapa('Identities');
+		this.allowSpellcheck = SettingsUserStore.allowSpellcheck;
 
-		this.bSkipNextHide = false;
-
-		this.addObservables({
-			identitiesDropdownTrigger: false,
+		addObservablesTo(this, {
+			// bootstrap dropdown
+			identitiesMenu: null,
 
 			from: '',
 			to: '',
@@ -189,6 +233,7 @@ export class ComposePopupView extends AbstractViewPopup {
 
 			requestDsn: false,
 			requestReadReceipt: false,
+			requireTLS: false,
 			markAsImportant: false,
 
 			sendError: false,
@@ -209,11 +254,8 @@ export class ComposePopupView extends AbstractViewPopup {
 			showBcc: false,
 			showReplyTo: false,
 
-			pgpSign: false,
-			canPgpSign: false,
-			pgpEncrypt: false,
-			canPgpEncrypt: false,
-			canMailvelope: false,
+			doSign: false,
+			doEncrypt: false,
 
 			draftsFolder: '',
 			draftUid: 0,
@@ -230,19 +272,15 @@ export class ComposePopupView extends AbstractViewPopup {
 			currentIdentity: IdentityUserStore()[0]
 		});
 
-		this.from(IdentityUserStore()[0].formattedName());
-
-		// this.to.subscribe((v) => console.log(v));
-
 		// Used by ko.bindingHandlers.emailsTags
-		this.to.focused = ko.observable(false);
-		this.to.focused.subscribe(value => value && (this.sLastFocusedField = 'to'));
-		this.cc.focused = ko.observable(false);
-		this.cc.focused.subscribe(value => value && (this.sLastFocusedField = 'cc'));
-		this.bcc.focused = ko.observable(false);
-		this.bcc.focused.subscribe(value => value && (this.sLastFocusedField = 'bcc'));
+		['to','cc','bcc'].forEach(name => {
+			this[name].focused = ko.observable(false);
+			this[name].focused.subscribe(value => value && (this.sLastFocusedField = name));
+		});
 
 		this.attachments = koArrayWithDestroy();
+		this.encryptOptions = koArrayWithDestroy();
+		this.signOptions = koArrayWithDestroy();
 
 		this.dragAndDropOver = ko.observable(false).extend({ debounce: 1 });
 		this.dragAndDropVisible = ko.observable(false).extend({ debounce: 1 });
@@ -261,11 +299,11 @@ export class ComposePopupView extends AbstractViewPopup {
 			]
 		});
 
-		this.tryToClosePopup = this.tryToClosePopup.debounce(200);
+		this.doClose = this.doClose.debounce(200);
 
 		this.iTimer = 0;
 
-		this.addComputables({
+		addComputablesTo(this, {
 			sendButtonSuccess: () => !this.sendError() && !this.sendSuccessButSaveError(),
 
 			savedTimeText: () =>
@@ -288,56 +326,62 @@ export class ComposePopupView extends AbstractViewPopup {
 			},
 
 			attachmentsInProcess: () => this.attachments.filter(item => item && !item.complete()),
-			attachmentsInError: () => this.attachments.filter(item => item && item.error()),
+			attachmentsInError: () => this.attachments.filter(item => item?.error()),
 
-			attachmentsCount: () => this.attachments.length,
+			attachmentsCount: () => this.attachments().length,
 			attachmentsInErrorCount: () => this.attachmentsInError.length,
 			attachmentsInProcessCount: () => this.attachmentsInProcess.length,
-			isDraftFolderMessage: () => this.draftsFolder() && this.draftUid(),
+			isDraft: () => this.draftsFolder() && this.draftUid(),
+
+			canEncrypt: () => this.encryptOptions().length,
+			canMailvelope: () => this.encryptOptions.includes('Mailvelope'),
+			canSign: () => this.signOptions().length,
+
+			encryptOptionsText: () => this.encryptOptions().join(', '),
+			signOptionsText: () => this.signOptions().map(o => o[0]).join(', '),
 
 			identitiesOptions: () =>
 				IdentityUserStore.map(item => ({
 					item: item,
 					optValue: item.id(),
-					optText: item.formattedName()
+					optText: item
 				})),
 
 			canBeSentOrSaved: () => !this.sending() && !this.saving()
 		});
 
-		this.addSubscribables({
+		addSubscribablesTo(this, {
 			sendError: value => !value && this.sendErrorDesc(''),
 
 			savedError: value => !value && this.savedErrorDesc(''),
 
 			sendSuccessButSaveError: value => !value && this.savedErrorDesc(''),
 
-			currentIdentity: value => value && this.from(value.formattedName()),
+			currentIdentity: value => {
+				if (value) {
+					this.from(value.toString());
+					this.doEncrypt(value.pgpEncrypt() || SettingsUserStore.pgpEncrypt());
+					this.doSign(value.pgpSign() || SettingsUserStore.pgpSign());
+				}
+			},
 
-			from: value => {
-				this.canPgpSign(false);
-				value = getEmail(value);
-				value && PgpUserStore.getKeyForSigning(value).then(result => {
-					console.log({
-						email: value,
-						canPgpSign:result
-					});
-					this.canPgpSign(result)
-				});
+			from: () => {
+				this.initSign();
+				this.initEncrypt();
 			},
 
 			cc: value => {
 				if (false === this.showCc() && value.length) {
 					this.showCc(true);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			bcc: value => {
 				if (false === this.showBcc() && value.length) {
 					this.showBcc(true);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			replyTo: value => {
@@ -356,137 +400,79 @@ export class ComposePopupView extends AbstractViewPopup {
 				if (this.emptyToError() && value.length) {
 					this.emptyToError(false);
 				}
-				this.initPgpEncrypt();
+				this.initEncrypt();
 			},
 
 			attachmentsInProcess: value => {
 				if (this.attachmentsInProcessError() && arrayLength(value)) {
 					this.attachmentsInProcessError(false);
 				}
+			},
+
+			viewArea: value => {
+				if (!this.mailvelope && 'mailvelope' == value) {
+					/**
+					 * Creates an iframe with an editor for a new encrypted mail.
+					 * The iframe will be injected into the container identified by selector.
+					 * https://mailvelope.github.io/mailvelope/Editor.html
+					 */
+					let armored = oLastMessage && oLastMessage.body.classList.contains('mailvelope'),
+						text = armored ? oLastMessage.plain() : this.oEditor.getData(),
+						draft = this.isDraft(),
+						encrypted = PgpUserStore.isEncrypted(text),
+						size = SettingsGet('phpUploadSizes')['post_max_size'],
+						quota = pInt(size);
+					switch (size.slice(-1)) {
+						case 'G': quota *= 1024; // fallthrough
+						case 'M': quota *= 1024; // fallthrough
+						case 'K': quota *= 1024;
+					}
+					// Issue: can't select signing key
+//					this.doSign(this.doSign() || confirm('Sign this message?'));
+					mailvelope.createEditorContainer('#mailvelope-editor', PgpUserStore.mailvelopeKeyring, {
+						// https://mailvelope.github.io/mailvelope/global.html#EditorContainerOptions
+						quota: Math.max(2048, (quota / 1024)) - 48, // (text + attachments) limit in kilobytes
+						armoredDraft: (encrypted && draft) ? text : '', // Ascii Armored PGP Text Block
+						predefinedText: encrypted ? '' : (this.oEditor.isHtml() ? htmlToPlain(text) : text),
+						quotedMail: (encrypted && !draft) ? text : '', // Ascii Armored PGP Text Block mail that should be quoted
+/*
+						quotedMailIndent: true, // if true the quoted mail will be indented (default: true)
+						quotedMailHeader: '', // header to be added before the quoted mail
+						keepAttachments: false, // add attachments of quotedMail to editor (default: false)
+						// Issue: can't select signing key
+						signMsg: this.doSign()
+*/
+					}).then(editor => this.mailvelope = editor);
+				}
 			}
 		});
 
 		decorateKoCommands(this, {
 			sendCommand: self => self.canBeSentOrSaved(),
 			saveCommand: self => self.canBeSentOrSaved(),
-			deleteCommand: self => self.isDraftFolderMessage(),
+			deleteCommand: self => self.isDraft(),
 			skipCommand: self => self.canBeSentOrSaved(),
 			contactsCommand: self => self.allowContacts
 		});
+
+		this.from(IdentityUserStore()[0].toString());
 	}
 
-	async getMessageRequestParams(sSaveFolder, draft)
+	sentFolder()
 	{
-		const
-			identity = this.currentIdentity(),
-			params = {
-				IdentityID: identity.id(),
-				MessageFolder: this.draftsFolder(),
-				MessageUid: this.draftUid(),
-				SaveFolder: sSaveFolder,
-				From: this.from(),
-				To: this.to(),
-				Cc: this.cc(),
-				Bcc: this.bcc(),
-				ReplyTo: this.replyTo(),
-				Subject: this.subject(),
-				DraftInfo: this.aDraftInfo,
-				InReplyTo: this.sInReplyTo,
-				References: this.sReferences,
-				MarkAsImportant: this.markAsImportant() ? 1 : 0,
-				Attachments: this.prepareAttachmentsForSendOrSave(),
-				// Only used at send, not at save:
-				Dsn: this.requestDsn() ? 1 : 0,
-				ReadReceiptRequest: this.requestReadReceipt() ? 1 : 0
-			},
-			recipients = draft ? [identity.email()] : this.allRecipients(),
-			sign = !draft && this.pgpSign() && this.canPgpSign(),
-			encrypt = this.pgpEncrypt() && this.canPgpEncrypt(),
-			TextIsHtml = this.oEditor.isHtml();
-
-		let Text = this.oEditor.getData();
-		if (TextIsHtml) {
-			let l;
-			do {
-				l = Text.length;
-				Text = Text
-					// Remove Microsoft Office styling
-					.replace(/(<[^>]+[;"'])\s*mso-[a-z-]+\s*:[^;"']+/gi, '$1')
-					// Remove hubspot data-hs- attributes
-					.replace(/(<[^>]+)\s+data-hs-[a-z-]+=("[^"]+"|'[^']+')/gi, '$1');
-			} while (l != Text.length)
-			params.Html = Text;
-			params.Text = htmlToPlain(Text);
-		} else {
-			params.Text = Text;
-		}
-
-		if (this.mailvelope && 'mailvelope' === this.viewArea()) {
-			params.Encrypted = draft
-				? await this.mailvelope.createDraft()
-				: await this.mailvelope.encrypt(recipients);
-		} else if (sign || encrypt) {
-			let data = new MimePart;
-			data.headers['Content-Type'] = 'text/'+(TextIsHtml?'html':'plain')+'; charset="utf-8"';
-			data.headers['Content-Transfer-Encoding'] = 'base64';
-			data.body = base64_encode(Text);
-			if (TextIsHtml) {
-				const alternative = new MimePart, plain = new MimePart;
-				alternative.headers['Content-Type'] = 'multipart/alternative';
-				plain.headers['Content-Type'] = 'text/plain; charset="utf-8"';
-				plain.headers['Content-Transfer-Encoding'] = 'base64';
-				plain.body = base64_encode(params.Text);
-				// First add plain
-				alternative.children.push(plain);
-				// Now add HTML
-				alternative.children.push(data);
-				data = alternative;
-			}
-			if (sign && !draft && sign[1]) {
-				if ('openpgp' == sign[0]) {
-					// Doesn't sign attachments
-					params.Html = params.Text = '';
-					let signed = new MimePart;
-					signed.headers['Content-Type'] =
-						'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"';
-					signed.headers['Content-Transfer-Encoding'] = '7Bit';
-					signed.children.push(data);
-					let signature = new MimePart;
-					signature.headers['Content-Type'] = 'application/pgp-signature; name="signature.asc"';
-					signature.headers['Content-Transfer-Encoding'] = '7Bit';
-					signature.body = await OpenPGPUserStore.sign(data.toString(), sign[1], 1);
-					signed.children.push(signature);
-					params.Signed = signed.toString();
-					params.Boundary = signed.boundary;
-					data = signed;
-				} else if ('gnupg' == sign[0]) {
-					// TODO: sign in PHP fails
-//					params.SignData = data.toString();
-					params.SignFingerprint = sign[1].fingerprint;
-					params.SignPassphrase = await GnuPGUserStore.sign(sign[1]);
-				} else {
-					throw 'Signing with ' + sign[0] + ' not yet implemented';
-				}
-			}
-			if (encrypt) {
-				if ('openpgp' == encrypt) {
-					// Doesn't encrypt attachments
-					params.Encrypted = await OpenPGPUserStore.encrypt(data.toString(), recipients);
-					params.Signed = '';
-				} else if ('gnupg' == encrypt) {
-					// Does encrypt attachments
-					params.EncryptFingerprints = JSON.stringify(GnuPGUserStore.getPublicKeyFingerprints(recipients));
-				} else {
-					throw 'Encryption with ' + encrypt + ' not yet implemented';
-				}
+		let sSentFolder = this.currentIdentity()?.sentFolder?.() || FolderUserStore.sentFolder();
+		if (SettingsUserStore.replySameFolder()) {
+			if (
+				3 === arrayLength(this.aDraftInfo) &&
+				this.aDraftInfo[2]?.length
+			) {
+				sSentFolder = this.aDraftInfo[2];
 			}
 		}
-		return params;
+		return UNUSED_OPTION_VALUE === sSentFolder ? null : sSentFolder;
 	}
 
 	sendCommand() {
-		let sSentFolder = FolderUserStore.sentFolder();
-
 		this.attachmentsInProcessError(false);
 		this.attachmentsInErrorError(false);
 		this.emptyToError(false);
@@ -504,124 +490,153 @@ export class ComposePopupView extends AbstractViewPopup {
 		}
 
 		if (!this.emptyToError() && !this.attachmentsInErrorError() && !this.attachmentsInProcessError()) {
-			if (SettingsUserStore.replySameFolder()) {
-				if (
-					3 === arrayLength(this.aDraftInfo) &&
-					null != this.aDraftInfo[2] &&
-					this.aDraftInfo[2].length
-				) {
-					sSentFolder = this.aDraftInfo[2];
-				}
-			}
-
-			if (!sSentFolder) {
-				showScreenPopup(FolderSystemPopupView, [SetSystemFoldersNotification.Sent]);
-			} else try {
-				this.sendError(false);
-				this.sending(true);
-
-				if (3 === arrayLength(this.aDraftInfo)) {
-					const flagsCache = MessageFlagsCache.getFor(this.aDraftInfo[2], this.aDraftInfo[1]);
-					if (isArray(flagsCache)) {
-						flagsCache.push(('forward' === this.aDraftInfo[0]) ? '$forwarded' : '\\answered');
-						MessageFlagsCache.setFor(this.aDraftInfo[2], this.aDraftInfo[1], flagsCache);
-						MessagelistUserStore.reloadFlagsAndCachedMessage();
-						setFolderHash(this.aDraftInfo[2], '');
-					}
-				}
-
-				sSentFolder = UNUSED_OPTION_VALUE === sSentFolder ? '' : sSentFolder;
-
-				this.getMessageRequestParams(sSentFolder).then(params => {
-					Remote.request('SendMessage',
-						(iError, data) => {
-							this.sending(false);
-							if (iError) {
-								if (Notification.CantSaveMessage === iError) {
-									this.sendSuccessButSaveError(true);
-									this.savedErrorDesc(i18n('COMPOSE/SAVED_ERROR_ON_SEND').trim());
-								} else {
-									this.sendError(true);
-									this.sendErrorDesc(getNotification(iError, data && data.ErrorMessage)
-										|| getNotification(Notification.CantSendMessage));
-								}
-							} else {
-								this.close();
-							}
-							setFolderHash(this.draftsFolder(), '');
-							setFolderHash(sSentFolder, '');
-							this.reloadDraftFolder();
-						},
-						params,
-						30000
-					);
-				}).catch(e => {
+			const sSentFolder = this.sentFolder();
+			if ('' === sSentFolder) {
+				showScreenPopup(FolderSystemPopupView, [FolderType.Sent]);
+			} else {
+				const sendError = e => {
 					console.error(e);
 					this.sendError(true);
 					this.sendErrorDesc(e);
 					this.sending(false);
-				});
-			} catch (e) {
-				console.error(e);
-				this.sendError(true);
-				this.sendErrorDesc(e);
-				this.sending(false);
+				};
+				const sendFailed = (iError, data) => {
+					this.sendError(true);
+					this.sendErrorDesc(
+						getNotification(iError, data?.message, Notifications.CantSendMessage)
+						+ "\n" + (data?.messageAdditional || data?.message)
+					);
+				};
+				try {
+					this.sendError(false);
+					this.sending(true);
+
+					const sendMessage = params => {
+						Remote.request('SendMessage',
+							(iError, data) => {
+								this.sending(false);
+								if (iError) {
+/*
+									if (Notifications.AuthError === iError && !params.auth) {
+										AskPopupView.password('SMTP login', 'retry', 3).then(result => {
+											if (result) {
+												this.sending(true);
+												params.auth = result;
+												sendMessage(params);
+											} else {
+												sendFailed(iError, data);
+											}
+										});
+									} else
+*/
+									if (Notifications.CantSaveMessage === iError) {
+										this.sendSuccessButSaveError(true);
+										let msg = i18n('COMPOSE/SAVED_ERROR_ON_SEND');
+										if (data?.messageAdditional) {
+											msg = msg + "\n" + data?.messageAdditional;
+										}
+										this.savedErrorDesc(msg);
+									} else {
+										this.sendError(true);
+										sendFailed(iError, data);
+										// Remove remembered passphrase as it could be wrong
+										let key = ('S/MIME' === params.sign) ? this.currentIdentity() : null;
+										params.signFingerprint
+										&& this.signOptions.forEach(option => ('GnuPG' === option[0]) && (key = option[1]));
+										key && Passphrases.delete(key);
+									}
+								} else {
+									if (arrayLength(this.aDraftInfo) > 0) {
+										const flag = {
+											'reply': '\\answered',
+											'forward': '$forwarded'
+										}[this.aDraftInfo[0]];
+										if (flag) {
+											const aFlags = oLastMessage.flags();
+											if (aFlags.indexOf(flag) === -1) {
+												aFlags.push(flag);
+												oLastMessage.flags(aFlags);
+											}
+										}
+									}
+									this.close();
+								}
+								setFolderETag(this.draftsFolder(), '');
+								setFolderETag(params.saveFolder, '');
+								if (3 === arrayLength(this.aDraftInfo)) {
+									setFolderETag(this.aDraftInfo[2], '');
+								}
+								reloadDraftFolder();
+							},
+							params,
+							30000
+						);
+					};
+
+					this.getMessageRequestParams(sSentFolder)
+					.then(sendMessage)
+					.catch(sendError);
+				} catch (e) {
+					sendError(e);
+				}
 			}
 		}
 	}
 
 	saveCommand() {
-		if (FolderUserStore.draftsFolderNotEnabled()) {
-			showScreenPopup(FolderSystemPopupView, [SetSystemFoldersNotification.Draft]);
-		} else {
-			this.savedError(false);
-			this.saving(true);
-			this.autosaveStart();
-			this.getMessageRequestParams(FolderUserStore.draftsFolder(), 1).then(params => {
-				Remote.request('SaveMessage',
-					(iError, oData) => {
-						let result = false;
+		if (!this.saving() && !this.sending()) {
+			if (FolderUserStore.draftsFolderNotEnabled()) {
+				showScreenPopup(FolderSystemPopupView, [FolderType.Drafts]);
+			} else {
+				this.savedError(false);
+				this.saving(true);
+				this.autosaveStart();
+				this.getMessageRequestParams(FolderUserStore.draftsFolder(), 1).then(params => {
+					Remote.request('SaveMessage',
+						(iError, oData) => {
+							let result = false;
 
-						this.saving(false);
+							this.saving(false);
 
-						if (!iError) {
-							if (oData.Result.NewFolder && oData.Result.NewUid) {
-								result = true;
+							if (!iError) {
+								if (oData.Result.folder && oData.Result.uid) {
+									result = true;
 
-								if (this.bFromDraft) {
-									const message = MessageUserStore.message();
-									if (message && this.draftsFolder() === message.folder && this.draftUid() == message.uid) {
-										MessageUserStore.message(null);
+									if (this.bFromDraft) {
+										const message = MessageUserStore.message();
+										if (message && this.draftsFolder() === message.folder && this.draftUid() == message.uid) {
+											MessageUserStore.message(null);
+										}
 									}
+
+									this.draftsFolder(oData.Result.folder);
+									this.draftUid(oData.Result.uid);
+
+									this.savedTime(new Date);
+
+									if (this.bFromDraft) {
+										setFolderETag(this.draftsFolder(), '');
+									}
+									setFolderETag(FolderUserStore.draftsFolder(), '');
 								}
-
-								this.draftsFolder(oData.Result.NewFolder);
-								this.draftUid(oData.Result.NewUid);
-
-								this.savedTime(new Date);
-
-								if (this.bFromDraft) {
-									setFolderHash(this.draftsFolder(), '');
-								}
-								setFolderHash(FolderUserStore.draftsFolder(), '');
 							}
-						}
 
-						if (!result) {
-							this.savedError(true);
-							this.savedErrorDesc(getNotification(Notification.CantSaveMessage));
-						}
+							if (!result) {
+								this.savedError(true);
+								this.savedErrorDesc(getNotification(Notifications.CantSaveMessage));
+							}
 
-						this.reloadDraftFolder();
-					},
-					params,
-					200000
-				);
-			}).catch(e => {
-				this.saving(false);
-				this.savedError(true);
-				this.savedErrorDesc(getNotification(Notification.CantSaveMessage) + ': ' + e);
-			});
+							reloadDraftFolder();
+						},
+						params,
+						200000
+					);
+				}).catch(e => {
+					this.saving(false);
+					this.savedError(true);
+					this.savedErrorDesc(getNotification(Notifications.CantSaveMessage) + ': ' + e);
+				});
+			}
 		}
 	}
 
@@ -632,9 +647,8 @@ export class ComposePopupView extends AbstractViewPopup {
 			() => {
 				const
 					sFromFolderFullName = this.draftsFolder(),
-					aUidForRemove = [this.draftUid()];
-				messagesDeleteHelper(sFromFolderFullName, aUidForRemove);
-				MessagelistUserStore.removeMessagesFromList(sFromFolderFullName, aUidForRemove);
+					oUids = new Set([this.draftUid()]);
+				MessagelistUserStore.moveMessages(sFromFolderFullName, oUids);
 				this.close();
 			}
 		]);
@@ -646,18 +660,13 @@ export class ComposePopupView extends AbstractViewPopup {
 	}
 
 	skipCommand() {
-		this.bSkipNextHide = true;
+		ComposePopupView.inEdit(true);
 
-		if (
-			!this.saving() &&
-			!this.sending() &&
-			!FolderUserStore.draftsFolderNotEnabled() &&
-			SettingsUserStore.allowDraftAutosave()
-		) {
+		if (!FolderUserStore.draftsFolderNotEnabled() && SettingsUserStore.allowDraftAutosave()) {
 			this.saveCommand();
 		}
 
-		this.tryToClosePopup();
+		this.doClose();
 	}
 
 	contactsCommand() {
@@ -676,8 +685,6 @@ export class ComposePopupView extends AbstractViewPopup {
 				&& !FolderUserStore.draftsFolderNotEnabled()
 				&& SettingsUserStore.allowDraftAutosave()
 				&& !this.isEmptyForm(false)
-				&& !this.saving()
-				&& !this.sending()
 				&& !this.savedError()
 			) {
 				this.saveCommand();
@@ -688,71 +695,30 @@ export class ComposePopupView extends AbstractViewPopup {
 	}
 
 	// getAutocomplete
-	emailsSource(oData, fResponse) {
-		Remote.request('Suggestions',
+	emailsSource(value, fResponse) {
+		Remote.abort('Suggestions').request('Suggestions',
 			(iError, data) => {
 				if (!iError && isArray(data.Result)) {
 					fResponse(
-						data.Result.map(item => (item && item[0] ? (new EmailModel(item[0], item[1])).toLine() : null))
+						data.Result.map(item => (item?.[0] ? (new EmailModel(item[0], item[1])).toLine() : null))
 						.filter(v => v)
 					);
-				} else if (Notification.RequestAborted !== iError) {
+				} else if (Notifications.RequestAborted !== iError) {
 					fResponse([]);
 				}
 			},
 			{
-				Query: oData.term
+				Query: value
 //				,Page: 1
-			},
-			null,
-			'',
-			['Suggestions']
+			}
 		);
 	}
 
-	reloadDraftFolder() {
-		const draftsFolder = FolderUserStore.draftsFolder();
-		if (draftsFolder && UNUSED_OPTION_VALUE !== draftsFolder) {
-			setFolderHash(draftsFolder, '');
-			if (FolderUserStore.currentFolderFullName() === draftsFolder) {
-				MessagelistUserStore.reload(true);
-			} else {
-				rl.app.folderInformation(draftsFolder);
-			}
-		}
-	}
-
-	findIdentityByMessage(composeType, message) {
-		let resultIdentity = null;
-		const find = addresses => {
-			addresses = addresses.map(item => item.email);
-			return IdentityUserStore.find(item => addresses.includes(item.email()));
-		};
-
-		if (message) {
-			switch (composeType) {
-				case ComposeType.Reply:
-				case ComposeType.ReplyAll:
-				case ComposeType.Forward:
-				case ComposeType.ForwardAsAttachment:
-					resultIdentity = find(message.to.concat(message.cc, message.bcc))/* || find(message.deliveredTo)*/;
-					break;
-				case ComposeType.Draft:
-					resultIdentity = find(message.from.concat(message.replyTo));
-					break;
-				// no default
-//				case ComposeType.Empty:
-			}
-		}
-
-		return resultIdentity || IdentityUserStore()[0] || null;
-	}
-
 	selectIdentity(identity) {
-		identity = identity && identity.item;
+		identity = identity?.item;
 		if (identity) {
 			this.currentIdentity(identity);
-			this.setSignatureFromIdentity(identity);
+			this.setSignature(identity);
 		}
 	}
 
@@ -760,11 +726,7 @@ export class ComposePopupView extends AbstractViewPopup {
 		// Stop autosave
 		clearTimeout(this.iTimer);
 
-		AppUserStore.composeInEdit(this.bSkipNextHide);
-
-		this.bSkipNextHide || this.reset();
-
-		this.bSkipNextHide = false;
+		ComposePopupView.inEdit() || this.reset();
 
 		this.to.focused(false);
 
@@ -786,7 +748,6 @@ export class ComposePopupView extends AbstractViewPopup {
 				// setTimeout(() => {
 				this.oEditor = new HtmlEditor(
 					this.editorArea(),
-					null,
 					() => fOnInit(this.oEditor),
 					bHtml => this.isHtml(!!bHtml)
 				);
@@ -795,12 +756,12 @@ export class ComposePopupView extends AbstractViewPopup {
 		}
 	}
 
-	setSignatureFromIdentity(identity) {
-		if (identity) {
+	setSignature(identity, msgComposeType) {
+		if (identity && ComposeType.Draft !== msgComposeType && ComposeType.EditAsNew !== msgComposeType) {
 			this.editor(editor => {
 				let signature = identity.signature() || '',
-					isHtml = ':HTML:' === signature.slice(0, 6),
-					fromLine = this.oLastMessage ? this.emailArrayToStringLineHelper(this.oLastMessage.from, true) : '';
+					isHtml = signature.startsWith(':HTML:'),
+					fromLine = oLastMessage ? emailArrayToStringLineHelper(oLastMessage.from, true) : '';
 				if (fromLine) {
 					signature = signature.replace(/{{FROM-FULL}}/g, fromLine);
 					if (!fromLine.includes(' ') && 0 < fromLine.indexOf('@')) {
@@ -812,10 +773,10 @@ export class ComposePopupView extends AbstractViewPopup {
 					.replace(/\r/g, '')
 					.replace(/\s{1,2}?{{FROM}}/g, '')
 					.replace(/\s{1,2}?{{FROM-FULL}}/g, '')
-					.replace(/{{DATE}}/g, new Date().format('LLLL'))
+					.replace(/{{DATE}}/g, new Date().format({dateStyle: 'full', timeStyle: 'short'}))
 					.replace(/{{TIME}}/g, new Date().format('LT'))
 					.replace(/{{MOMENT:[^}]+}}/g, '');
-				editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
+				signature.length && editor.setSignature(signature, isHtml, !!identity.signatureInsertBefore());
 			});
 		}
 	}
@@ -834,226 +795,202 @@ export class ComposePopupView extends AbstractViewPopup {
 
 		this.viewModelDom.dataset.wysiwyg = SettingsUserStore.editorDefaultType();
 
-		if (AppUserStore.composeInEdit()) {
-			type = type || ComposeType.Empty;
-			if (ComposeType.Empty !== type) {
+		let options = {
+			mode: type || ComposeType.Empty,
+			to:  aToEmails,
+			cc:  aCcEmails,
+			bcc: aBccEmails,
+			subject: sCustomSubject,
+			text: sCustomPlainText
+		};
+		if (1 < arrayLength(oMessageOrArray)) {
+			options.messages = oMessageOrArray;
+		} else {
+			options.message = isArray(oMessageOrArray) ? oMessageOrArray[0] : oMessageOrArray;
+		}
+
+		if (ComposePopupView.inEdit()) {
+			if (ComposeType.Empty !== options.mode) {
 				showScreenPopup(AskPopupView, [
 					i18n('COMPOSE/DISCARD_UNSAVED_DATA'),
-					() => {
-						this.initOnShow(type, oMessageOrArray, aToEmails, aCcEmails, aBccEmails, sCustomSubject, sCustomPlainText);
-					},
+					() => this.initOnShow(options),
 					null,
 					false
 				]);
 			} else {
-				this.addEmailsTo(this.to, aToEmails);
-				this.addEmailsTo(this.cc, aCcEmails);
-				this.addEmailsTo(this.bcc, aBccEmails);
+				addEmailsTo(this.to, aToEmails);
+				addEmailsTo(this.cc, aCcEmails);
+				addEmailsTo(this.bcc, aBccEmails);
 
 				if (sCustomSubject && !this.subject()) {
 					this.subject(sCustomSubject);
 				}
 			}
 		} else {
-			this.initOnShow(type, oMessageOrArray, aToEmails, aCcEmails, aBccEmails, sCustomSubject, sCustomPlainText);
+			this.initOnShow(options);
 		}
 
+		ComposePopupView.inEdit(false);
 		// Chrome bug #298
 //		alreadyFullscreen = isFullscreen();
 //		alreadyFullscreen || (ThemeStore.isMobile() && toggleFullscreen());
 	}
 
 	/**
-	 * @param {Function} fKoValue
-	 * @param {Array} emails
+	 * @param {object} options
 	 */
-	addEmailsTo(fKoValue, emails) {
-		if (arrayLength(emails)) {
-			const value = fKoValue().trim(),
-				values = emails.map(item => item ? item.toLine() : null)
-					.validUnique();
+	initOnShow(options) {
 
-			fKoValue(value + (value ? ', ' :  '') + values.join(', ').trim());
-		}
-	}
+		const
+//			excludeEmail = new Set(),
+			excludeEmail = {},
+			mEmail = AccountUserStore.email();
 
-	/**
-	 *
-	 * @param {Array} aList
-	 * @param {boolean} bFriendly
-	 * @returns {string}
-	 */
-	emailArrayToStringLineHelper(aList, bFriendly) {
-		bFriendly = !!bFriendly;
-		return aList.map(item => item.toLine(bFriendly)).join(', ');
-	}
+		oLastMessage = options.message;
 
-	isPlainEditor() {
-		let type = SettingsUserStore.editorDefaultType();
-		return EditorDefaultType.Html !== type && EditorDefaultType.HtmlForced !== type;
-	}
-
-	/**
-	 * @param {string=} sType = ComposeType.Empty
-	 * @param {?MessageModel|Array=} oMessageOrArray = null
-	 * @param {Array=} aToEmails = null
-	 * @param {Array=} aCcEmails = null
-	 * @param {Array=} aBccEmails = null
-	 * @param {string=} sCustomSubject = null
-	 * @param {string=} sCustomPlainText = null
-	 */
-	initOnShow(sType, oMessageOrArray, aToEmails, aCcEmails, aBccEmails, sCustomSubject, sCustomPlainText) {
-		let sFrom = '',
-			sTo = '',
-			sCc = '',
-			sDate = '',
-			sSubject = '',
-			sText = '',
-			identity = null,
-			aDraftInfo = null,
-			message = null;
-
-		const excludeEmail = {},
-			mEmail = AccountUserStore.email(),
-			lineComposeType = sType || ComposeType.Empty;
-
-		oMessageOrArray = oMessageOrArray || null;
-		if (oMessageOrArray) {
-			message =
-				1 === arrayLength(oMessageOrArray)
-					? oMessageOrArray[0]
-					: isArray(oMessageOrArray)
-					? null
-					: oMessageOrArray;
-		}
-
-		this.oLastMessage = message;
-
-		if (null !== mEmail) {
+		if (mEmail) {
+//			excludeEmail.add(mEmail);
 			excludeEmail[mEmail] = true;
 		}
 
 		this.reset();
 
-		identity = this.findIdentityByMessage(lineComposeType, message);
-		if (identity) {
-			excludeEmail[identity.email()] = true;
-		}
-
-		if (arrayLength(aToEmails)) {
-			this.to(this.emailArrayToStringLineHelper(aToEmails));
-		}
-
-		if (arrayLength(aCcEmails)) {
-			this.cc(this.emailArrayToStringLineHelper(aCcEmails));
-		}
-
-		if (arrayLength(aBccEmails)) {
-			this.bcc(this.emailArrayToStringLineHelper(aBccEmails));
-		}
-
-		if (lineComposeType && message) {
-			sDate = timestampToString(message.dateTimeStampInUTC(), 'FULL');
-			sSubject = message.subject();
-			aDraftInfo = message.aDraftInfo;
-
-			let resplyAllParts = null;
-			switch (lineComposeType) {
-				case ComposeType.Empty:
-					break;
-
+		let identity = null;
+		if (oLastMessage) {
+			switch (options.mode) {
 				case ComposeType.Reply:
-					this.to(this.emailArrayToStringLineHelper(message.replyEmails(excludeEmail)));
-					this.subject(replySubjectAdd('Re', sSubject));
-					this.prepareMessageAttachments(message, lineComposeType);
-					this.aDraftInfo = ['reply', message.uid, message.folder];
-					this.sInReplyTo = message.sMessageId;
-					this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim();
-					break;
-
 				case ComposeType.ReplyAll:
-					resplyAllParts = message.replyAllEmails(excludeEmail);
-					this.to(this.emailArrayToStringLineHelper(resplyAllParts[0]));
-					this.cc(this.emailArrayToStringLineHelper(resplyAllParts[1]));
-					this.subject(replySubjectAdd('Re', sSubject));
-					this.prepareMessageAttachments(message, lineComposeType);
-					this.aDraftInfo = ['reply', message.uid, message.folder];
-					this.sInReplyTo = message.sMessageId;
-					this.sReferences = (this.sInReplyTo + ' ' + message.references).trim();
+				case ComposeType.Forward:
+				case ComposeType.ForwardAsAttachment:
+					identity = findIdentity(oLastMessage.to.concat(oLastMessage.cc, oLastMessage.bcc))
+						|| findIdentity(oLastMessage.from)
+						/* || findIdentity(oLastMessage.deliveredTo)*/;
 					break;
+				case ComposeType.Draft:
+					identity = findIdentity(oLastMessage.from.concat(oLastMessage.replyTo));
+					break;
+				// no default
+//				case ComposeType.Empty:
+			}
+		}
+		// Set from custom email
+		if (!identity
+			&& oLastMessage && (ComposeType.Reply === options.mode || ComposeType.ReplyAll === options.mode)
+			&& 1 === oLastMessage.to.length
+//			&& mEmail.includes(oLastMessage.to[0].domain)
+		) {
+			identity = new IdentityModel;
+			identity.name = oLastMessage.to[0].name;
+			identity.email = oLastMessage.to[0].email;
+		}
+		identity = identity || IdentityUserStore()[0];
+		if (identity) {
+//			excludeEmail.add(identity.email);
+			excludeEmail[identity.email] = true;
+		}
+
+		if (arrayLength(options.to)) {
+			this.to(emailArrayToStringLineHelper(options.to));
+		}
+
+		if (arrayLength(options.cc)) {
+			this.cc(emailArrayToStringLineHelper(options.cc));
+		}
+
+		if (arrayLength(options.bcc)) {
+			this.bcc(emailArrayToStringLineHelper(options.bcc));
+		}
+
+		if (options.mode && oLastMessage) {
+			let usePlain,
+				sCc = '',
+				sDate = timestampToString(oLastMessage.dateTimestamp(), 'FULL'),
+				sSubject = oLastMessage.subject(),
+				sText = '',
+				aDraftInfo = oLastMessage.draftInfo;
+
+			switch (options.mode) {
+				case ComposeType.Reply:
+				case ComposeType.ReplyAll: {
+//					if (1 == oLastMessage.to.length) {
+//						setTimeout(() => this.from(emailArrayToStringLineHelper(oLastMessage.to)), 1);
+//					}
+					if (ComposeType.Reply === options.mode) {
+						this.to(emailArrayToStringLineHelper(oLastMessage.replyEmails(excludeEmail)));
+					} else {
+						let parts = oLastMessage.replyAllEmails(excludeEmail);
+						this.to(emailArrayToStringLineHelper(parts[0]));
+						this.cc(emailArrayToStringLineHelper(parts[1]));
+					}
+					this.subject(replySubjectAdd('Re', sSubject));
+					this.prepareMessageAttachments(oLastMessage, options.mode);
+					this.aDraftInfo = ['reply', oLastMessage.uid, oLastMessage.folder];
+					this.sInReplyTo = oLastMessage.messageId;
+					this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
+					oLastMessage.headers().valuesByName('autocrypt').forEach(value => {
+						let autocrypt = new MimeHeaderAutocryptModel(value);
+						if (autocrypt.addr && autocrypt.keydata) {
+							PgpUserStore.hasPublicKeyForEmails([autocrypt.addr])
+							|| PgpUserStore.importKey(autocrypt.pem(), true, true)
+//							|| showScreenPopup(OpenPgpImportPopupView, [autocrypt.pem()])
+						}
+					});
+				} break;
 
 				case ComposeType.Forward:
-					this.subject(replySubjectAdd('Fwd', sSubject));
-					this.prepareMessageAttachments(message, lineComposeType);
-					this.aDraftInfo = ['forward', message.uid, message.folder];
-					this.sInReplyTo = message.sMessageId;
-					this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim();
-					break;
-
 				case ComposeType.ForwardAsAttachment:
 					this.subject(replySubjectAdd('Fwd', sSubject));
-					this.prepareMessageAttachments(message, lineComposeType);
-					this.aDraftInfo = ['forward', message.uid, message.folder];
-					this.sInReplyTo = message.sMessageId;
-					this.sReferences = (this.sInReplyTo + ' ' + message.sReferences).trim();
+					this.prepareMessageAttachments(oLastMessage, options.mode);
+					this.aDraftInfo = ['forward', oLastMessage.uid, oLastMessage.folder];
+					this.sInReplyTo = oLastMessage.messageId;
+					this.sReferences = (oLastMessage.references + ' ' + oLastMessage.messageId).trim();
 					break;
 
 				case ComposeType.Draft:
-					this.to(this.emailArrayToStringLineHelper(message.to));
-					this.cc(this.emailArrayToStringLineHelper(message.cc));
-					this.bcc(this.emailArrayToStringLineHelper(message.bcc));
-					this.replyTo(this.emailArrayToStringLineHelper(message.replyTo));
-
 					this.bFromDraft = true;
-
-					this.draftsFolder(message.folder);
-					this.draftUid(message.uid);
-
-					this.subject(sSubject);
-					this.prepareMessageAttachments(message, lineComposeType);
-
-					this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
-					this.sInReplyTo = message.sInReplyTo;
-					this.sReferences = message.sReferences;
-					break;
-
+					this.draftsFolder(oLastMessage.folder);
+					this.draftUid(oLastMessage.uid);
+					// fallthrough
 				case ComposeType.EditAsNew:
-					this.to(this.emailArrayToStringLineHelper(message.to));
-					this.cc(this.emailArrayToStringLineHelper(message.cc));
-					this.bcc(this.emailArrayToStringLineHelper(message.bcc));
-					this.replyTo(this.emailArrayToStringLineHelper(message.replyTo));
-
+					this.to(emailArrayToStringLineHelper(oLastMessage.to));
+					this.cc(emailArrayToStringLineHelper(oLastMessage.cc));
+					this.bcc(emailArrayToStringLineHelper(oLastMessage.bcc));
+					this.replyTo(emailArrayToStringLineHelper(oLastMessage.replyTo));
 					this.subject(sSubject);
-					this.prepareMessageAttachments(message, lineComposeType);
-
+					this.prepareMessageAttachments(oLastMessage, options.mode);
 					this.aDraftInfo = 3 === arrayLength(aDraftInfo) ? aDraftInfo : null;
-					this.sInReplyTo = message.sInReplyTo;
-					this.sReferences = message.sReferences;
+					this.sInReplyTo = oLastMessage.inReplyTo;
+					this.sReferences = oLastMessage.references;
 					break;
+
+//				case ComposeType.Empty:
+//					break;
 				// no default
 			}
 
-			sText = message.bodyAsHTML();
-			let encrypted;
+			// https://github.com/the-djmaze/snappymail/issues/491
+			tpl.innerHTML = oLastMessage.bodyAsHTML();
+			tpl.content.querySelectorAll('img').forEach(img => {
+				img.src || img.dataset.xSrc || img.replaceWith(img.alt || img.title)
+			});
+			sText = tpl.innerHTML.trim();
 
-			switch (lineComposeType) {
+			switch (options.mode) {
 				case ComposeType.Reply:
 				case ComposeType.ReplyAll:
-					sFrom = message.fromToLine(false, true);
-					sText = '<div><p>' + i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: sFrom })
+					sText = '<br><br><p>'
+						+ i18n('COMPOSE/REPLY_MESSAGE_TITLE', { DATETIME: sDate, EMAIL: oLastMessage.from.toString(false, true) })
 						+ ':</p><blockquote>'
-						+ sText.replace(/<img[^>]+>/g, '').replace(/<a\s[^>]+><\/a>/g, '').trim()
-						+ '</blockquote></div>';
+						+ sText.trim()
+						+ '</blockquote>';
 					break;
 
 				case ComposeType.Forward:
-					sFrom = message.fromToLine(false, true);
-					sTo = message.toToLine(false, true);
-					sCc = message.ccToLine(false, true);
-					sText = '<div><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p>'
-						+ i18n('GLOBAL/FROM') + ': ' + sFrom
+					sCc = oLastMessage.cc.toString(false, true);
+					sText = '<br><br><p>' + i18n('COMPOSE/FORWARD_MESSAGE_TOP_TITLE') + '</p><div>'
+						+ i18n('GLOBAL/FROM') + ': ' + oLastMessage.from.toString(false, true)
 						+ '<br>'
-						+ i18n('GLOBAL/TO') + ': ' + sTo
+						+ i18n('GLOBAL/TO') + ': ' + oLastMessage.to.toString(false, true)
 						+ (sCc.length ? '<br>' + i18n('GLOBAL/CC') + ': ' + sCc : '')
 						+ '<br>'
 						+ i18n('COMPOSE/FORWARD_MESSAGE_TOP_SENT')
@@ -1071,121 +1008,85 @@ export class ComposePopupView extends AbstractViewPopup {
 				case ComposeType.ForwardAsAttachment:
 					sText = '';
 					break;
+
 				default:
-					encrypted = PgpUserStore.isEncrypted(sText);
-					if (encrypted) {
-						sText = message.plain();
+					usePlain = PgpUserStore.isEncrypted(sText) || isPlainEditor() || !oLastMessage.isHtml();
+					if (usePlain) {
+						sText = oLastMessage.plain();
 					}
 			}
 
 			this.editor(editor => {
-				encrypted || editor.setHtml(sText);
-
-				if (encrypted
-					|| EditorDefaultType.PlainForced === SettingsUserStore.editorDefaultType()
-					|| (!message.isHtml() && EditorDefaultType.HtmlForced !== SettingsUserStore.editorDefaultType())
-				) {
-					editor.modePlain();
-				}
-
-				!encrypted || editor.setPlain(sText);
-
-				if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType) {
-					this.setSignatureFromIdentity(identity);
-				}
-
+				usePlain ? (editor.modePlain() | editor.setPlain(sText)) : editor.setHtml(sText);
+				this.setSignature(identity, options.mode);
 				this.setFocusInPopup();
 			});
-		} else if (ComposeType.Empty === lineComposeType) {
-			this.subject(null != sCustomSubject ? '' + sCustomSubject : '');
-
-			sText = null != sCustomPlainText ? '' + sCustomPlainText : '';
-
+		} else if (ComposeType.Empty === options.mode) {
+			this.subject(null != options.subject ? '' + options.subject : '');
 			this.editor(editor => {
-				editor.setHtml(sText);
-
-				if (this.isPlainEditor()) {
-					editor.modePlain();
-				}
-
-				if (identity) {
-					this.setSignatureFromIdentity(identity);
-				}
-
+				editor.setHtml(options.text ? '' + options.text : '');
+				isPlainEditor() && editor.modePlain();
+				this.setSignature(identity);
 				this.setFocusInPopup();
 			});
-		} else if (arrayLength(oMessageOrArray)) {
-			oMessageOrArray.forEach(item => this.addMessageAsAttachment(item));
-
+		} else if (options.messages) {
+			options.messages.forEach(item => this.addMessageAsAttachment(item));
 			this.editor(editor => {
-				if (this.isPlainEditor()) {
-					editor.setPlain('')
-				} else {
-					editor.setHtml('');
-				}
-
-				if (identity && ComposeType.Draft !== lineComposeType && ComposeType.EditAsNew !== lineComposeType) {
-					this.setSignatureFromIdentity(identity);
-				}
-
+				isPlainEditor() ? editor.setPlain('') : editor.setHtml('');
+				this.setSignature(identity, options.mode);
 				this.setFocusInPopup();
 			});
 		} else {
 			this.setFocusInPopup();
 		}
 
-		const downloads = this.getAttachmentsDownloadsForUpload();
+		// item.cId item.isInline item.isLinked
+		const downloads = this.attachments.filter(item => item && !item.tempName()).map(item => item.id);
 		if (arrayLength(downloads)) {
 			Remote.request('MessageUploadAttachments',
 				(iError, oData) => {
-					if (!iError) {
-						forEachObjectEntry(oData.Result, (tempName, id) => {
-							const attachment = this.getAttachmentById(id);
-							if (attachment) {
-								attachment.tempName(tempName);
-								attachment
-									.waiting(false)
-									.uploading(false)
-									.complete(true);
+					const result = oData?.Result;
+					downloads.forEach((id, index) => {
+						const attachment = this.getAttachmentById(id);
+						if (attachment) {
+							attachment
+								.waiting(false)
+								.uploading(false)
+								.complete(true);
+							if (iError || !result?.[index]) {
+								attachment.error(getUploadErrorDescByCode(UploadErrorCode.NoFileUploaded));
+							} else {
+								attachment.tempName(result[index].tempName);
+								attachment.type(result[index].mimeType);
 							}
-						});
-					} else {
-						this.attachments.forEach(attachment => {
-							if (attachment && attachment.fromMessage) {
-								attachment
-									.waiting(false)
-									.uploading(false)
-									.complete(true)
-									.error(getUploadErrorDescByCode(UploadErrorCode.NoFileUploaded));
-							}
-						});
-					}
+						}
+					});
 				},
 				{
-					Attachments: downloads
+					attachments: downloads
 				},
 				999000
 			);
 		}
 
-		if (identity) {
-			this.currentIdentity(identity);
-		}
+		this.currentIdentity(identity);
 	}
 
 	setFocusInPopup() {
 		setTimeout(() => {
 			if (!this.to()) {
 				this.to.focused(true);
-			} else if (!this.to.focused()) {
-				this.oEditor && this.oEditor.focus();
+			} else if (!this.subject()) {
+				this.viewModelDom.querySelector('input[name="subject"]').focus();
+			} else {
+				this.oEditor?.focus();
 			}
 		}, 100);
 	}
 
-	tryToClosePopup() {
+	doClose() {
 		if (AskPopupView.hidden()) {
-			if (this.bSkipNextHide || (this.isEmptyForm() && !this.draftUid())) {
+			if (ComposePopupView.inEdit() || (this.isEmptyForm() && !this.draftUid())) {
 				this.close();
 			} else {
 				showScreenPopup(AskPopupView, [
@@ -1203,12 +1104,9 @@ export class ComposePopupView extends AbstractViewPopup {
 				clickElement: dom.querySelector('#composeUploadButton'),
 				dragAndDropElement: dom.querySelector('.b-attachment-place')
 			}),
-			attachmentSizeLimit = pInt(SettingsGet('AttachmentLimit'));
+			attachmentSizeLimit = pInt(SettingsGet('attachmentLimit'));
 
 		oJua
-			// .on('onLimitReached', (limit) => {
-			// 	alert(limit);
-			// })
 			.on('onDragEnter', () => {
 				this.dragAndDropOver(true);
 			})
@@ -1232,10 +1130,10 @@ export class ComposePopupView extends AbstractViewPopup {
 				this.dragAndDropOver(false);
 
 				const
-					size = pInt(oData.Size, null),
+					size = pInt(oData.size, null),
 					attachment = new ComposeAttachmentModel(
 						sId,
-						oData.FileName ? oData.FileName.toString() : '',
+						oData.fileName ? oData.fileName.toString() : '',
 						size
 					);
 
@@ -1264,8 +1162,8 @@ export class ComposePopupView extends AbstractViewPopup {
 			})
 			.on('onComplete', (id, result, data) => {
 				const attachment = this.getAttachmentById(id),
-					response = (data && data.Result) || {},
-					errorCode = response.ErrorCode,
+					response = data?.Result || {},
+					errorCode = response.code,
 					attachmentJson = result && response.Attachment;
 
 				let error = '';
@@ -1281,16 +1179,17 @@ export class ComposePopupView extends AbstractViewPopup {
 							.waiting(false)
 							.uploading(false)
 							.complete(true)
-							.error(error + '\n' + response.ErrorMessage);
+							.error(error + '\n' + response.message);
 					} else if (attachmentJson) {
 						attachment
 							.waiting(false)
 							.uploading(false)
 							.complete(true);
-						attachment.fileName(attachmentJson.Name);
-						attachment.size(attachmentJson.Size ? pInt(attachmentJson.Size) : 0);
-						attachment.tempName(attachmentJson.TempName ? attachmentJson.TempName : '');
+						attachment.fileName(attachmentJson.name);
+						attachment.size(attachmentJson.size ? pInt(attachmentJson.size) : 0);
+						attachment.tempName(attachmentJson.tempName ? attachmentJson.tempName : '');
 						attachment.isInline = false;
+						attachment.type(attachmentJson.mimeType);
 					}
 				}
 			});
@@ -1301,7 +1200,7 @@ export class ComposePopupView extends AbstractViewPopup {
 		addShortcut('w', 'meta', ScopeCompose, ()=>false);
 
 		addShortcut('m', 'meta', ScopeCompose, () => {
-			this.identitiesDropdownTrigger(true);
+			this.identitiesMenu().ddBtn.toggle();
 			return false;
 		});
 
@@ -1319,23 +1218,23 @@ export class ComposePopupView extends AbstractViewPopup {
 			return false;
 		});
 
-		if (Settings.app('allowCtrlEnterOnCompose')) {
-			addShortcut('enter', 'meta', ScopeCompose, () => {
+		addShortcut('enter', 'meta', ScopeCompose, () => {
+//			if (SettingsUserStore.allowCtrlEnterOnCompose()) {
 				this.sendCommand();
 				return false;
-			});
-		}
+//			}
+		});
 		addShortcut('mailsend', '', ScopeCompose, () => {
 			this.sendCommand();
 			return false;
 		});
 
 		addShortcut('escape,close', 'shift', ScopeCompose, () => {
-			this.tryToClosePopup();
+			this.doClose();
 			return false;
 		});
 
-		this.editor(editor => editor[this.isPlainEditor()?'modePlain':'modeWysiwyg']());
+		this.editor(editor => editor[isPlainEditor()?'modePlain':'modeWysiwyg']());
 	}
 
 	/**
@@ -1346,29 +1245,16 @@ export class ComposePopupView extends AbstractViewPopup {
 		return this.attachments.find(item => item && id === item.id);
 	}
 
-	/**
-	 * @returns {Object}
-	 */
-	prepareAttachmentsForSendOrSave() {
-		const result = {};
-		this.attachments.forEach(item => {
-			if (item && item.complete() && item.tempName() && item.enabled()) {
-				result[item.tempName()] = [item.fileName(), item.isInline ? '1' : '0', item.CID, item.contentLocation];
-			}
-		});
-
-		return result;
-	}
-
 	/**
 	 * @param {MessageModel} message
 	 */
 	addMessageAsAttachment(message) {
 		if (message) {
-			let temp = message.subject();
-			temp = '.eml' === temp.slice(-4).toLowerCase() ? temp : temp + '.eml';
-
-			const attachment = new ComposeAttachmentModel(message.requestHash, temp, message.size());
+			const attachment = new ComposeAttachmentModel(
+				message.requestHash,
+				message.subject() /*+ '-' + Jua.randomId()*/ + '.eml',
+				message.size
+			);
 			attachment.fromMessage = true;
 			attachment.complete(true);
 			this.addAttachment(attachment);
@@ -1379,20 +1265,20 @@ export class ComposePopupView extends AbstractViewPopup {
 		oJua || attachment.waiting(false).uploading(true);
 		attachment.cancel = () => {
 			this.attachments.remove(attachment);
-			oJua && oJua.cancel(attachment.id);
+			oJua?.cancel(attachment.id);
 		};
 		this.attachments.push(attachment);
 		view && this.attachmentsArea();
 	}
 
 	/**
-	 * @param {string} url
+	 * @param {string} id
 	 * @param {string} name
 	 * @param {number} size
 	 * @returns {ComposeAttachmentModel}
 	 */
-	addAttachmentHelper(url, name, size) {
-		const attachment = new ComposeAttachmentModel(url, name, size);
+	addAttachmentHelper(id, name, size) {
+		const attachment = new ComposeAttachmentModel(id, name, size);
 		this.addAttachment(attachment, 1);
 		return attachment;
 	}
@@ -1403,38 +1289,27 @@ export class ComposePopupView extends AbstractViewPopup {
 	 */
 	prepareMessageAttachments(message, type) {
 		if (message) {
-			if (ComposeType.ForwardAsAttachment === type) {
-				this.addMessageAsAttachment(message);
-			} else {
+			let reply = [ComposeType.Reply, ComposeType.ReplyAll].includes(type);
+			if (reply || [ComposeType.Forward, ComposeType.Draft, ComposeType.EditAsNew].includes(type)) {
+				// item instanceof AttachmentModel
 				message.attachments.forEach(item => {
-					let add = false;
-					switch (type) {
-						case ComposeType.Reply:
-						case ComposeType.ReplyAll:
-							break;
-
-						case ComposeType.Forward:
-						case ComposeType.Draft:
-						case ComposeType.EditAsNew:
-							add = true;
-							break;
-						// no default
-					}
-
-					if (add) {
+					if (!reply || item.isLinked()) {
 						const attachment = new ComposeAttachmentModel(
 							item.download,
 							item.fileName,
 							item.estimatedSize,
 							item.isInline(),
 							item.isLinked(),
-							item.cid,
+							item.cId,
 							item.contentLocation
 						);
 						attachment.fromMessage = true;
+						attachment.type(item.mimeType);
 						this.addAttachment(attachment);
 					}
 				});
+			} else if (ComposeType.ForwardAsAttachment === type) {
+				this.addMessageAsAttachment(message);
 			}
 		}
 	}
@@ -1446,7 +1321,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	isEmptyForm(includeAttachmentInProgress = true) {
 		const withoutAttachment = includeAttachmentInProgress
 			? !this.attachments.length
-			: !this.attachments.some(item => item && item.complete());
+			: !this.attachments.some(item => item?.complete());
 
 		return (
 			!this.to.length &&
@@ -1466,8 +1341,9 @@ export class ComposePopupView extends AbstractViewPopup {
 		this.replyTo('');
 		this.subject('');
 
-		this.requestDsn(false);
-		this.requestReadReceipt(false);
+		this.requestDsn(SettingsUserStore.requestDsn());
+		this.requestReadReceipt(SettingsUserStore.requestReadReceipt());
+		this.requireTLS(SettingsUserStore.requireTLS());
 		this.markAsImportant(false);
 
 		this.bodyArea();
@@ -1488,8 +1364,8 @@ export class ComposePopupView extends AbstractViewPopup {
 		this.showBcc(false);
 		this.showReplyTo(false);
 
-		this.pgpSign(false);
-		this.pgpEncrypt(false);
+		this.doSign(SettingsUserStore.pgpSign());
+		this.doEncrypt(SettingsUserStore.pgpEncrypt());
 
 		this.attachments([]);
 
@@ -1502,55 +1378,11 @@ export class ComposePopupView extends AbstractViewPopup {
 		this.sending(false);
 		this.saving(false);
 
-		this.oEditor && this.oEditor.clear();
+		this.oEditor?.clear();
 
 		this.dropMailvelope();
 	}
 
-	/**
-	 * @returns {Array}
-	 */
-	getAttachmentsDownloadsForUpload() {
-		return this.attachments.filter(item => item && !item.tempName()).map(
-			item => item.id
-		);
-	}
-
-	mailvelopeArea() {
-		if (!this.mailvelope) {
-			/**
-			 * Creates an iframe with an editor for a new encrypted mail.
-			 * The iframe will be injected into the container identified by selector.
-			 * https://mailvelope.github.io/mailvelope/Editor.html
-			 */
-			let text = this.oEditor.getData(),
-				encrypted = PgpUserStore.isEncrypted(text),
-				size = SettingsGet('PhpUploadSizes')['post_max_size'],
-				quota = pInt(size);
-			switch (size.slice(-1)) {
-				case 'G': quota *= 1024; // fallthrough
-				case 'M': quota *= 1024; // fallthrough
-				case 'K': quota *= 1024;
-			}
-			// Issue: can't select signing key
-//			this.pgpSign(this.pgpSign() || confirm('Sign this message?'));
-			mailvelope.createEditorContainer('#mailvelope-editor', PgpUserStore.mailvelopeKeyring, {
-				// https://mailvelope.github.io/mailvelope/global.html#EditorContainerOptions
-				quota: Math.max(2048, (quota / 1024)) - 48, // (text + attachments) limit in kilobytes
-				armoredDraft: encrypted ? text : '', // Ascii Armored PGP Text Block
-				predefinedText: encrypted ? '' : (this.oEditor.isHtml() ? htmlToPlain(text) : text),
-/*
-				quotedMail: '', // Ascii Armored PGP Text Block mail that should be quoted
-				quotedMailIndent: true, // if true the quoted mail will be indented (default: true)
-				quotedMailHeader: '', // header to be added before the quoted mail
-				keepAttachments: false, // add attachments of quotedMail to editor (default: false)
-				// Issue: can't select signing key
-				signMsg: this.pgpSign()
-*/
-			}).then(editor => this.mailvelope = editor);
-		}
-		this.viewArea('mailvelope');
-	}
 	attachmentsArea() {
 		this.viewArea('attachments');
 	}
@@ -1561,7 +1393,7 @@ export class ComposePopupView extends AbstractViewPopup {
 	allRecipients() {
 		return [
 				// From/sender is also recipient (Sent mailbox)
-//				this.currentIdentity().email(),
+//				this.currentIdentity().email,
 				this.from(),
 				this.to(),
 				this.cc(),
@@ -1569,27 +1401,281 @@ export class ComposePopupView extends AbstractViewPopup {
 			].join(',').split(',').map(value => getEmail(value.trim())).validUnique();
 	}
 
-	initPgpEncrypt() {
-		const recipients = this.allRecipients();
-		PgpUserStore.hasPublicKeyForEmails(recipients).then(result => {
-			console.log({canPgpEncrypt:result});
-			this.canPgpEncrypt(result);
-		});
-		PgpUserStore.mailvelopeHasPublicKeyForEmails(recipients).then(result => {
-			console.log({canMailvelope:result});
-			this.canMailvelope(result);
-			if (!result) {
+	/**
+	 * Checks if signing a message is possible with from email address.
+	 * And sets all that can.
+	 */
+	initSign() {
+		let options = [],
+			identity = this.currentIdentity(),
+			email = getEmail(this.from()),
+			key = OpenPGPUserStore.getPrivateKeyFor(email, 1);
+		key && options.push(['OpenPGP', key]);
+		key = GnuPGUserStore.getPrivateKeyFor(email, 1);
+		key && options.push(['GnuPG', key]);
+		identity.smimeKeyValid() && identity.smimeCertificateValid()
+			&& identity.smimeCertificateChainValid() && identity.email === email
+			&& options.push(['S/MIME']);
+		console.dir({signOptions: options});
+		this.signOptions(options);
+	}
+
+	async initEncrypt() {
+		const recipients = this.allRecipients(),
+			options = [];
+
+		if (recipients.length) {
+			GnuPGUserStore.hasPublicKeyForEmails(recipients)
+			&& options.push('GnuPG');
+
+			OpenPGPUserStore.hasPublicKeyForEmails(recipients)
+			&& options.push('OpenPGP');
+
+			const count = recipients.length,
+				identity = this.currentIdentity(),
+				from = (identity.smimeKey() && identity.smimeCertificate()) ? identity.email : null;
+			count
+				&& count === recipients.filter(email =>
+					email == from
+					|| SMimeUserStore.find(certificate => email == certificate.emailAddress && certificate.smimeencrypt)
+				).length
+				&& options.push('S/MIME');
+
+			if (await MailvelopeUserStore.hasPublicKeyForEmails(recipients)) {
+				options.push('Mailvelope');
+			} else {
 				'mailvelope' === this.viewArea() && this.bodyArea();
 //				this.dropMailvelope();
 			}
+		}
+
+		console.dir({encryptOptions:options});
+		this.encryptOptions(options);
+	}
+
+	async getMessageRequestParams(sSaveFolder, draft)
+	{
+		let Text = this.oEditor.getData().trim(),
+			l,
+			hasAttachments = 0;
+
+		// Prepare ComposeAttachmentModel attachments
+		const attachments = {};
+		this.attachments.forEach(item => {
+			if (item?.complete() && item?.tempName() && item?.enabled()) {
+				++hasAttachments;
+				attachments[item.tempName()] = {
+					name: item.fileName(),
+					inline: item.isInline,
+					cId: item.cId,
+					location: item.contentLocation,
+					type: item.mimeType()
+				};
+			}
 		});
-	}
+/*
+		let sToAddress = this.to();
 
-	togglePgpSign() {
-		this.pgpSign(!this.pgpSign()/* && this.canPgpSign()*/);
-	}
+		if (/".*" <.*,.*>/g.test(sToAddress)) {
+			sToAddress = sToAddress.match(/<.*>/g)[0].replace(/[<>]/g, '');
+		}
+*/
+		const
+			identity = this.currentIdentity(),
+			params = {
+				identityID: identity.id(),
+				messageFolder: this.draftsFolder(),
+				messageUid: this.draftUid(),
+				saveFolder: sSaveFolder,
+				from: this.from(),
+				to: this.to(),
+				cc: this.cc(),
+				bcc: this.bcc(),
+				replyTo: this.replyTo(),
+				subject: this.subject(),
+				draftInfo: this.aDraftInfo,
+				inReplyTo: this.sInReplyTo,
+				references: this.sReferences,
+				markAsImportant: this.markAsImportant() ? 1 : 0,
+				attachments: attachments,
+				// Only used at send, not at save:
+				dsn: this.requestDsn() ? 1 : 0,
+				requireTLS: this.requireTLS() ? 1 : 0,
+				readReceiptRequest: this.requestReadReceipt() ? 1 : 0,
+				autocrypt: [],
+				/**
+				 * Basic support for Linked Data (Structured Email)
+				 * https://json-ld.org/
+				 * https://structured.email/
+				 **/
+				linkedData: []
+			},
+			recipients = draft ? [identity.email] : this.allRecipients(),
+			signOptions = !draft && this.doSign() && this.signOptions(),
+			encryptOptions = this.doEncrypt() && this.encryptOptions(),
+			isHtml = this.oEditor.isHtml();
 
-	togglePgpEncrypt() {
-		this.pgpEncrypt(!this.pgpEncrypt()/* && this.canPgpEncrypt()*/);
+		if (isHtml) {
+			tpl.innerHTML = Text;
+			tpl.content.querySelectorAll('img').forEach(img => {
+				if (img.dataset.xSrc) {
+					img.src = img.dataset.xSrc;
+					img.removeAttribute('data-x-src')
+				}
+			});
+			Text = tpl.innerHTML.trim();
+
+			do {
+				l = Text.length;
+				Text = Text
+					// Remove Microsoft Office styling
+					.replace(/(<[^>]+[;"'])\s*mso-[a-z-]+\s*:[^;"']+/gi, '$1')
+					// Remove hubspot data-hs- attributes
+					.replace(/(<[^>]+)\s+data-hs-[a-z-]+=("[^"]+"|'[^']+')/gi, '$1');
+			} while (l != Text.length)
+			params.html = Text;
+			params.plain = htmlToPlain(Text);
+		} else {
+			params.plain = Text;
+		}
+
+		if (this.mailvelope && 'mailvelope' === this.viewArea()) {
+			params.encrypted = draft
+				? await this.mailvelope.createDraft()
+				: await this.mailvelope.encrypt(recipients);
+/*
+			Object.entries(PgpUserStore.getPublicKeyOfEmails(recipients) || {}).forEach(([k,v]) =>
+				params.autocrypt.push({addr:k, keydata:v.replace(/-----(BEGIN|END) PGP PUBLIC KEY BLOCK-----/g).trim()})
+			);
+*/
+		} else if (signOptions.length || encryptOptions.length) {
+			if (!draft && !hasAttachments && !Text.length) {
+				throw i18n('COMPOSE/ERROR_EMPTY_BODY');
+			}
+			let data = new MimePart;
+			data.headers['Content-Type'] = 'text/'+(isHtml?'html':'plain')+'; charset="utf-8"';
+			data.headers['Content-Transfer-Encoding'] = 'base64';
+			data.body = base64_encode(Text);
+			if (isHtml) {
+				const alternative = new MimePart, plain = new MimePart;
+				alternative.headers['Content-Type'] = 'multipart/alternative';
+				plain.headers['Content-Type'] = 'text/plain; charset="utf-8"';
+				plain.headers['Content-Transfer-Encoding'] = 'base64';
+				plain.body = base64_encode(params.plain);
+				// First add plain
+				alternative.children.push(plain);
+				// Now add HTML
+				alternative.children.push(data);
+				data = alternative;
+			}
+			let isSigned = false;
+			for (let i = 0; i < signOptions.length; ++i) {
+				if ('OpenPGP' == signOptions[i][0]) {
+					try {
+						// Doesn't sign attachments
+						let signed = new MimePart;
+						signed.headers['Content-Type'] =
+							'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"';
+						signed.headers['Content-Transfer-Encoding'] = '7Bit';
+						signed.children.push(data);
+						let signature = new MimePart;
+						signature.headers['Content-Type'] = 'application/pgp-signature; name="signature.asc"';
+						signature.headers['Content-Transfer-Encoding'] = '7Bit';
+						signature.body = await OpenPGPUserStore.sign(data.toString(), signOptions[i][1], 1);
+						signed.children.push(signature);
+						isSigned = true;
+						params.html = params.plain = '';
+						params.signed = signed.toString();
+						params.boundary = signed.boundary;
+						data = signed;
+/*
+						Object.entries(PgpUserStore.getPublicKeyOfEmails([getEmail(this.from())]) || {})
+						.forEach(([k,v]) => params.publicKey = v);
+*/
+						break;
+					} catch (e) {
+						Passphrases.delete(signOptions[i][1])
+						console.error(e);
+					}
+				} else if ('GnuPG' == signOptions[i][0]) {
+					// TODO: sign in PHP fails
+					let pass = await GnuPGUserStore.sign(signOptions[i][1]);
+					if (null != pass) {
+//						params.signData = data.toString();
+						params.signFingerprint = signOptions[i][1].fingerprint;
+						params.signPassphrase = pass;
+//						params.attachPublicKey = false;
+						isSigned = true;
+						break;
+					}
+				} else if ('S/MIME' == signOptions[i][0]) {
+					// TODO: sign in PHP fails
+					params.sign = 'S/MIME';
+//					params.signCertificate = identity.smimeCertificate();
+//					params.signCertificateChain = identity.smimeCertificateChain();
+//					params.signPrivateKey = identity.smimeKey();
+//					params.attachCertificate = false;
+					if (identity.smimeKeyEncrypted()) {
+						const pass = await Passphrases.ask(identity,
+							i18n('SMIME/PRIVATE_KEY_OF', {EMAIL: identity.email}),
+							'CRYPTO/SIGN'
+						);
+						if (null != pass) {
+							params.signPassphrase = pass.password;
+							pass.remember && Passphrases.handle(identity, pass.password);
+							isSigned = true;
+						}
+					}
+				}
+			}
+			if (signOptions.length && !isSigned) {
+				throw 'Signing failed';
+			}
+
+			if (encryptOptions.length) {
+				const autocrypt = () =>
+					Object.entries(PgpUserStore.getPublicKeyOfEmails(recipients) || {}).forEach(([k,v]) =>
+						params.autocrypt.push({
+							addr: k,
+							keydata: v
+								.replace(/-----(BEGIN|END) PGP PUBLIC KEY BLOCK-----/g, '')
+								.replace(/\s+/g, '') // Single base64 string, let the server do compliance formatting
+						})
+					);
+				for (let i = 0; i < encryptOptions.length; ++i) {
+					if ('OpenPGP' == encryptOptions[i]) {
+						// Doesn't encrypt attachments
+						params.encrypted = await OpenPGPUserStore.encrypt(data.toString(), recipients);
+						params.signed = '';
+						autocrypt();
+						break;
+					}
+					if ('GnuPG' == encryptOptions[i]) {
+						// Does encrypt attachments
+						params.encryptFingerprints = JSON.stringify(GnuPGUserStore.getPublicKeyFingerprints(recipients));
+						autocrypt();
+						break;
+					}
+					if ('S/MIME' == encryptOptions[i]) {
+						params.encryptCertificates = [identity.smimeCertificate()];
+						SMimeUserStore.forEach(certificate => {
+							certificate.emailAddress != identity.email
+							&& recipients.includes(certificate.emailAddress)
+							&& params.encryptCertificates.push(certificate.id)
+						});
+						break;
+					}
+					// We skip Mailvelope as it has its own window
+				}
+			}
+		}
+
+		return params;
 	}
 }
+
+/**
+ * When view is closed and reopened, fill it with previous data.
+ * This, for example, happens when opening Contacts view to select recipients
+ */
+ComposePopupView.inEdit = ko.observable(false);
diff --git a/dev/View/Popup/Contacts.js b/dev/View/Popup/Contacts.js
index 41b272222..2f75d0070 100644
--- a/dev/View/Popup/Contacts.js
+++ b/dev/View/Popup/Contacts.js
@@ -1,6 +1,4 @@
-import { koArrayWithDestroy } from 'External/ko';
-
-import { SaveSettingsStep } from 'Common/Enums';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 import { ComposeType } from 'Common/EnumsUser';
 import { registerShortcut } from 'Common/Globals';
 import { arrayLength, pInt } from 'Common/Utils';
@@ -17,192 +15,155 @@ import Remote from 'Remote/User/Fetch';
 
 import { EmailModel } from 'Model/Email';
 import { ContactModel } from 'Model/Contact';
-import { ContactPropertyModel, ContactPropertyType } from 'Model/ContactProperty';
 
-import { decorateKoCommands, showScreenPopup } from 'Knoin/Knoin';
+import { decorateKoCommands } from 'Knoin/Knoin';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
 import { AskPopupView } from 'View/Popup/Ask';
 
 const
 	CONTACTS_PER_PAGE = 50,
-	ScopeContacts = 'Contacts',
-	propertyIsMail = prop => prop.isType(ContactPropertyType.Email),
-	propertyIsName = prop => prop.isType(ContactPropertyType.FirstName) || prop.isType(ContactPropertyType.LastName);
+	ScopeContacts = 'Contacts';
+
+let
+	bOpenCompose = false,
+	sComposeRecipientsField = '';
 
 export class ContactsPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Contacts');
 
-		this.bBackToCompose = false;
-		this.sLastComposeFocusedField = '';
-
-		this.addObservables({
+		addObservablesTo(this, {
 			search: '',
 			contactsCount: 0,
 
-			currentContact: null,
+			selectorContact: null,
 
-			importUploaderButton: null,
+			importButton: null,
 
 			contactsPage: 1,
 
-			emptySelection: true,
-			viewClearSearch: false,
+			isSaving: false,
 
-			viewID: '',
-			viewReadOnly: false,
-
-			viewSaveTrigger: SaveSettingsStep.Idle,
-
-			viewSaving: false,
-
-			watchDirty: false,
-			watchHash: false
+			contact: null
 		});
 
 		this.contacts = ContactUserStore;
 
-		this.viewProperties = koArrayWithDestroy();
-
 		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
 
 		this.selector = new Selector(
 			ContactUserStore,
-			this.currentContact,
+			this.selectorContact,
 			null,
-			'.e-contact-item .actionHandle',
-			'.e-contact-item .checkboxItem',
-			'.e-contact-item.focused'
+			'.e-contact-item',
+			'.e-contact-item .checkboxItem'
 		);
 
-		this.selector.on('ItemSelect', contact => {
-			this.populateViewContact(contact);
-			if (!contact) {
-				this.emptySelection(true);
-			}
-		});
+		this.selector.on('ItemSelect', contact => this.populateViewContact(contact));
 
-		this.selector.on('ItemGetUid', contact => contact ? contact.generateUid() : '');
+		this.selector.on('ItemGetUid', contact => contact ? contact.id() : '');
 
-		this.bDropPageAfterDelete = false;
-
-		// this.saveCommandDebounce = this.saveCommand.bind(this).debounce(1000);
-
-		const
-//			propertyFocused = property => !property.isValid() && !property.focused(),
-			pagecount = () => Math.max(1, Math.ceil(this.contactsCount() / CONTACTS_PER_PAGE));
-
-		this.addComputables({
-			contactsPageCount: pagecount,
-
-			contactsPaginator: computedPaginatorHelper(this.contactsPage, pagecount),
-
-			viewPropertiesNames: () => this.viewProperties.filter(propertyIsName),
-
-			viewPropertiesEmails: () => this.viewProperties.filter(propertyIsMail),
-
-			viewPropertiesOther: () => this.viewProperties.filter(property => property.isType(ContactPropertyType.Nick)),
-
-			viewPropertiesWeb: () => this.viewProperties.filter(property => property.isType(ContactPropertyType.Web)),
-
-			viewPropertiesPhones: () => this.viewProperties.filter(property => property.isType(ContactPropertyType.Phone)),
-
-			contactHasValidName: () => !!this.viewProperties.find(prop => propertyIsName(prop) && prop.isValid()),
+		addComputablesTo(this, {
+			contactsPaginator: computedPaginatorHelper(
+				this.contactsPage,
+				() => Math.max(1, Math.ceil(this.contactsCount() / CONTACTS_PER_PAGE))
+			),
 
 			contactsCheckedOrSelected: () => {
-				const checked = ContactUserStore.filter(item => item.checked && item.checked()),
-					selected = this.currentContact();
-
-				return selected
-					? [...checked, selected].unique()
-					: checked;
+				const checked = ContactUserStore.filter(item => item.checked()),
+					selected = this.selectorContact();
+				return checked.length ? checked : (selected ? [selected] : []);
 			},
 
-			contactsCheckedOrSelectedUids: () => this.contactsCheckedOrSelected().map(contact => contact.id),
-
 			contactsSyncEnabled: () => ContactUserStore.allowSync() && ContactUserStore.syncMode(),
 
-			viewHash: () => '' + this.viewProperties.map(property => property.value && property.value()).join('')
+			isBusy: () => ContactUserStore.syncing() | ContactUserStore.importing() | ContactUserStore.loading()
+				| this.isSaving()
 		});
 
 		this.search.subscribe(() => this.reloadContactList());
 
-		this.viewHash.subscribe(() => {
-			if (this.watchHash() && !this.viewReadOnly() && !this.watchDirty()) {
-				this.watchDirty(true);
-			}
-		});
+		this.saveCommand = this.saveCommand.bind(this);
 
 		decorateKoCommands(this, {
-//			close: self => !self.watchDirty(),
-			deleteCommand: self => 0 < self.contactsCheckedOrSelected().length,
-			newMessageCommand: self => 0 < self.contactsCheckedOrSelected().length,
-			saveCommand: self => !self.viewSaving() && !self.viewReadOnly()
-				&& (self.contactHasValidName() || self.viewProperties.find(prop => propertyIsMail(prop) && prop.isValid())),
-			syncCommand: self => !self.contacts.syncing() && !self.contacts.importing()
+			deleteCommand: self => !self.isBusy() && 0 < self.contactsCheckedOrSelected().length,
+			newMessageCommand: self => !self.isBusy() && 0 < self.contactsCheckedOrSelected().length,
+			saveCommand: self => !self.isBusy(),
+			syncCommand: self => !self.isBusy()
 		});
 	}
 
 	newContact() {
-		this.populateViewContact(null);
-		this.currentContact(null);
+		this.populateViewContact(new ContactModel);
+		this.selectorContact(null);
 	}
 
 	deleteCommand() {
-		this.deleteSelectedContacts();
-		this.emptySelection(true);
+		const contacts = this.contactsCheckedOrSelected();
+		if (contacts.length) {
+			let selectorContact = this.selectorContact(),
+				uids = [],
+				count = 0;
+			contacts.forEach(contact => {
+				uids.push(contact.id());
+				if (selectorContact && selectorContact.id() === contact.id()) {
+					this.selectorContact(selectorContact = null);
+				}
+				contact.deleted(true);
+				++count;
+			});
+			Remote.request('ContactsDelete',
+				(iError, oData) => {
+					if (iError) {
+						alert(oData?.message || getNotification(iError));
+					} else {
+						const page = this.contactsPage();
+						if (page > Math.max(1, Math.ceil((this.contactsCount() - count) / CONTACTS_PER_PAGE))) {
+							this.contactsPage(page - 1);
+						}
+//						contacts.forEach(contact => ContactUserStore.remove(contact));
+					}
+					this.reloadContactList();
+				}, {
+					uids: uids.join(',')
+				}
+			);
+		}
 	}
 
 	newMessageCommand() {
 		let aE = [],
-			toEmails = null,
-			ccEmails = null,
-			bccEmails = null;
+			recipients = {to:null,cc:null,bcc:null};
 
-		const aC = this.contactsCheckedOrSelected();
-		if (arrayLength(aC)) {
-			aE = aC.map(oItem => {
-				if (oItem) {
-					const data = oItem.getNameAndEmailHelper(),
-						email = data ? new EmailModel(data[0], data[1]) : null;
-
-					if (email && email.validate()) {
-						return email;
-					}
+		this.contactsCheckedOrSelected().forEach(oContact => {
+			if (oContact) {
+				let name = (oContact.givenName() + ' ' + oContact.surName()).trim(),
+					email,
+					addresses = oContact.email();
+				if (!oContact.sendToAll()) {
+					addresses = addresses.slice(0,1);
 				}
-
-				return null;
-			});
-
-			aE = aE.filter(value => !!value);
-		}
+				addresses.forEach(address => {
+					email = new EmailModel(address.value(), name);
+					email.valid() && aE.push(email);
+				});
+/*
+		//		oContact.jCard.getOne('fn')?.notEmpty() ||
+				oContact.jCard.parseFullName({set:true});
+		//		let name = oContact.jCard.getOne('nickname'),
+				let name = oContact.jCard.getOne('fn'),
+					email = [oContact.jCard.getOne('email')];
+*/
+			}
+		});
 
 		if (arrayLength(aE)) {
-			this.bBackToCompose = false;
-
+			bOpenCompose = false;
 			this.close();
-
-			switch (this.sLastComposeFocusedField) {
-				case 'cc':
-					ccEmails = aE;
-					break;
-				case 'bcc':
-					bccEmails = aE;
-					break;
-				default:
-					toEmails = aE;
-					break;
-			}
-
-			this.sLastComposeFocusedField = '';
-
-			setTimeout(() =>
-				showMessageComposer([ComposeType.Empty, null, toEmails, ccEmails, bccEmails])
-			, 200);
+			recipients[sComposeRecipientsField] = aE;
+			showMessageComposer([ComposeType.Empty, null, recipients.to, recipients.cc, recipients.bcc])
 		}
-
-		return true;
 	}
 
 	clearSearch() {
@@ -210,110 +171,38 @@ export class ContactsPopupView extends AbstractViewPopup {
 	}
 
 	saveCommand() {
-		this.viewSaving(true);
-		this.viewSaveTrigger(SaveSettingsStep.Animate);
+		this.saveContact(this.contact());
+	}
 
-		const requestUid = Jua.randomId();
-
-		Remote.request('ContactSave',
-			(iError, oData) => {
-				let res = false;
-				this.viewSaving(false);
-
-				if (
-					!iError &&
-					oData.Result.RequestUid === requestUid &&
-					0 < pInt(oData.Result.ResultID)
-				) {
-					if (!this.viewID()) {
-						this.viewID(pInt(oData.Result.ResultID));
+	saveContact(contact) {
+		const data = contact.toJSON();
+		if (data.jCard != JSON.stringify(contact.jCard)) {
+			this.isSaving(true);
+			Remote.request('ContactSave',
+				(iError, oData) => {
+					if (iError) {
+						alert(oData?.message || getNotification(iError));
+					} else if (oData.Result.ResultID) {
+						if (contact.id()) {
+							contact.id(oData.Result.ResultID);
+							contact.jCard = JSON.parse(data.jCard);
+						} else {
+							this.reloadContactList(); // TODO: remove when e-contact-foreach is dynamic
+						}
 					}
-
-					this.reloadContactList(); // TODO: remove when e-contact-foreach is dynamic
-					res = true;
-				}
-
-				setTimeout(() =>
-					this.viewSaveTrigger(res ? SaveSettingsStep.TrueResult : SaveSettingsStep.FalseResult)
-				, 350);
-
-				if (res) {
-					this.watchDirty(false);
-					setTimeout(() => this.viewSaveTrigger(SaveSettingsStep.Idle), 1000);
-				}
-			}, {
-				RequestUid: requestUid,
-				Uid: this.viewID(),
-				Properties: this.viewProperties.map(oItem => oItem.toJSON())
-			}
-		);
+					this.isSaving(false);
+				}, data
+			);
+		}
 	}
 
 	syncCommand() {
 		ContactUserStore.sync(iError => {
 			iError && alert(getNotification(iError));
-
 			this.reloadContactList(true);
 		});
 	}
 
-	getPropertyPlaceholder(type) {
-		let result = '';
-		switch (type) {
-			case ContactPropertyType.LastName:
-				result = 'CONTACTS/PLACEHOLDER_ENTER_LAST_NAME';
-				break;
-			case ContactPropertyType.FirstName:
-				result = 'CONTACTS/PLACEHOLDER_ENTER_FIRST_NAME';
-				break;
-			case ContactPropertyType.Nick:
-				result = 'CONTACTS/PLACEHOLDER_ENTER_NICK_NAME';
-				break;
-			// no default
-		}
-
-		return result;
-	}
-
-	addNewProperty(type, typeStr) {
-		this.viewProperties.push(
-			new ContactPropertyModel(type, typeStr || '', '', true, this.getPropertyPlaceholder(type))
-		);
-	}
-
-	addNewOrFocusProperty(type, typeStr) {
-		const item = this.viewProperties.find(prop => prop.isType(type));
-		if (item) {
-			item.focused(true);
-		} else {
-			this.addNewProperty(type, typeStr);
-		}
-	}
-
-	addNewEmail() {
-		this.addNewProperty(ContactPropertyType.Email, 'Home');
-	}
-
-	addNewPhone() {
-		this.addNewProperty(ContactPropertyType.Phone, 'Mobile');
-	}
-
-	addNewWeb() {
-		this.addNewProperty(ContactPropertyType.Web);
-	}
-
-	addNewNickname() {
-		this.addNewOrFocusProperty(ContactPropertyType.Nick);
-	}
-
-	addNewNotes() {
-		this.addNewOrFocusProperty(ContactPropertyType.Note);
-	}
-
-	addNewBirthday() {
-		this.addNewOrFocusProperty(ContactPropertyType.Birthday);
-	}
-
 	exportVcf() {
 		download(serverRequestRaw('ContactsVcf'), 'contacts.vcf');
 	}
@@ -322,80 +211,19 @@ export class ContactsPopupView extends AbstractViewPopup {
 		download(serverRequestRaw('ContactsCsv'), 'contacts.csv');
 	}
 
-	removeCheckedOrSelectedContactsFromList() {
-		const contacts = this.contactsCheckedOrSelected();
-
-		let currentContact = this.currentContact(),
-			count = ContactUserStore.length;
-
-		if (contacts.length) {
-			contacts.forEach(contact => {
-				if (currentContact && currentContact.id === contact.id) {
-					currentContact = null;
-					this.currentContact(null);
-				}
-
-				contact.deleted(true);
-				--count;
-			});
-
-			if (0 >= count) {
-				this.bDropPageAfterDelete = true;
-			}
-
-			setTimeout(() => {
-				contacts.forEach(contact => ContactUserStore.remove(contact));
-			}, 500);
-		}
-	}
-
-	deleteSelectedContacts() {
-		if (this.contactsCheckedOrSelected().length) {
-			Remote.request('ContactsDelete',
-				(iError, oData) => {
-					if (500 < (!iError && oData && oData.Time ? pInt(oData.Time) : 0)) {
-						this.reloadContactList(this.bDropPageAfterDelete);
-					} else {
-						setTimeout(() => this.reloadContactList(this.bDropPageAfterDelete), 500);
-					}
-				}, {
-					Uids: this.contactsCheckedOrSelectedUids().join(',')
-				}
-			);
-			this.removeCheckedOrSelectedContactsFromList();
-		}
-	}
-
-	removeProperty(oProp) {
-		this.viewProperties.remove(oProp);
-	}
-
 	/**
 	 * @param {?ContactModel} contact
 	 */
 	populateViewContact(contact) {
-		let id = '';
-
-		this.watchHash(false);
-
-		this.emptySelection(false);
-		this.viewReadOnly(false);
-
-		if (contact) {
-			id = contact.id;
-			this.viewReadOnly(!!contact.readOnly);
-		} else {
-			contact = new ContactModel;
-			contact.initDefaultProperties();
-		}
-
-		this.viewID(id);
-
-//		this.viewProperties([]);
-		this.viewProperties(contact.properties);
-
-		this.watchDirty(false);
-		this.watchHash(true);
+		const oldContact = this.contact(),
+			fn = () => this.contact(contact);
+		if (oldContact?.hasChanges()) {
+			AskPopupView.showModal([
+				i18n('GLOBAL/SAVE_CHANGES'),
+				() => this.saveContact(oldContact) | fn(),
+				fn
+			]);
+		} else fn();
 	}
 
 	/**
@@ -404,44 +232,39 @@ export class ContactsPopupView extends AbstractViewPopup {
 	reloadContactList(dropPagePosition = false) {
 		let offset = (this.contactsPage() - 1) * CONTACTS_PER_PAGE;
 
-		this.bDropPageAfterDelete = false;
-
 		if (dropPagePosition) {
 			this.contactsPage(1);
 			offset = 0;
 		}
 
 		ContactUserStore.loading(true);
-		Remote.request('Contacts',
+		Remote.abort('Contacts').request('Contacts',
 			(iError, data) => {
 				let count = 0,
 					list = [];
 
-				if (!iError && arrayLength(data.Result.List)) {
+				if (iError) {
+//					console.error(data);
+					alert(data?.message || getNotification(iError));
+				} else if (arrayLength(data.Result.List)) {
 					data.Result.List.forEach(item => {
 						item = ContactModel.reviveFromJson(item);
 						item && list.push(item);
 					});
-
 					count = pInt(data.Result.Count);
-					count = 0 < count ? count : 0;
 				}
 
-				this.contactsCount(count);
+				this.contactsCount(0 < count ? count : 0);
 
 				ContactUserStore(list);
 
 				ContactUserStore.loading(false);
-				this.viewClearSearch(!!this.search());
 			},
 			{
 				Offset: offset,
 				Limit: CONTACTS_PER_PAGE,
 				Search: this.search()
-			},
-			null,
-			'',
-			['Contacts']
+			}
 		);
 	}
 
@@ -462,20 +285,19 @@ export class ContactsPopupView extends AbstractViewPopup {
 
 		dom.addEventListener('click', event => {
 			let el = event.target.closestWithin('.e-paginator a', dom);
-			if (el && ko.dataFor(el)) {
-				self.contactsPage(pInt(ko.dataFor(el).value));
+			if (el && (el = pInt(ko.dataFor(el)?.value))) {
+				self.contactsPage(el);
 				self.reloadContactList();
 			}
 		});
 
 		// initUploader
 
-		if (this.importUploaderButton()) {
+		if (this.importButton()) {
 			const j = new Jua({
 				action: serverRequest('UploadContacts'),
 				limit: 1,
-				disableDocumentDropPrevent: true,
-				clickElement: this.importUploaderButton()
+				clickElement: this.importButton()
 			});
 
 			if (j) {
@@ -493,35 +315,31 @@ export class ContactsPopupView extends AbstractViewPopup {
 	}
 
 	onClose() {
-		if (this.watchDirty() && AskPopupView.hidden()) {
-			showScreenPopup(AskPopupView, [
-				i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
+		const contact = this.contact();
+		if (AskPopupView.hidden() && contact?.hasChanges()) {
+			AskPopupView.showModal([
+				i18n('GLOBAL/SAVE_CHANGES'),
+				() => this.close() | this.saveContact(contact),
 				() => this.close()
 			]);
 			return false;
 		}
 	}
 
-	onShow(bBackToCompose, sLastComposeFocusedField) {
-		this.bBackToCompose = !!bBackToCompose;
-		this.sLastComposeFocusedField = sLastComposeFocusedField;
+	onShow(bBackToCompose, sRecipientsField) {
+		bOpenCompose = !!bBackToCompose;
+		sComposeRecipientsField = ['to','cc','bcc'].includes(sRecipientsField) ? sRecipientsField : 'to';
 		this.reloadContactList(true);
 	}
 
 	onHide() {
-		this.currentContact(null);
-		this.emptySelection(true);
+		this.contact(null);
+		this.selectorContact(null);
 		this.search('');
 		this.contactsCount(0);
 
 		ContactUserStore([]);
 
-		this.sLastComposeFocusedField = '';
-
-		if (this.bBackToCompose) {
-			this.bBackToCompose = false;
-
-			showMessageComposer();
-		}
+		bOpenCompose && showMessageComposer();
 	}
 }
diff --git a/dev/View/Popup/Domain.js b/dev/View/Popup/Domain.js
index dbe07bc03..764655acc 100644
--- a/dev/View/Popup/Domain.js
+++ b/dev/View/Popup/Domain.js
@@ -1,3 +1,5 @@
+import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
+
 import { pInt, forEachObjectEntry } from 'Common/Utils';
 import { i18n, getNotification } from 'Common/Translator';
 
@@ -8,31 +10,131 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
 import { DomainAdminStore } from 'Stores/Admin/Domain';
 
-const domainToParams = oDomain => ({
-			Name: oDomain.name(),
+import { AskPopupView } from 'View/Popup/Ask';
 
-			IncHost: oDomain.imapHost(),
-			IncPort: oDomain.imapPort(),
-			IncSecure: oDomain.imapSecure(),
+const
+	capitalize = string => string.charAt(0).toUpperCase() + string.slice(1),
+	domainDefaults = {
+		enableSmartPorts: false,
 
-			UseSieve: oDomain.useSieve() ? 1 : 0,
-			SieveHost: oDomain.sieveHost(),
-			SievePort: oDomain.sievePort(),
-			SieveSecure: oDomain.sieveSecure(),
+		savingError: '',
 
-			OutHost: oDomain.smtpHost(),
-			OutPort: oDomain.smtpPort(),
-			OutSecure: oDomain.smtpSecure(),
-			OutAuth: oDomain.smtpAuth() ? 1 : 0,
-			OutUsePhpMail: oDomain.smtpPhpMail() ? 1 : 0
-		});
+		name: '',
+
+		imapHost: '',
+		imapPort: 143,
+		imapType: 0,
+		imapTimeout: 300,
+		imapShortLogin: false,
+		imapLowerLogin: true,
+		// SSL
+		imapSslVerify_peer: false,
+		imapSslAllow_self_signed: false,
+		// Options
+		imapExpunge_all_on_delete: false,
+		imapFast_simple_search: true,
+		imapFetch_new_messages: true,
+		imapForce_select: false,
+		imapFolder_list_limit: 200,
+		imapMessage_all_headers: false,
+		imapMessage_list_limit: 10000,
+		imapSearch_filter: '',
+		imapSpam_headers: '',
+		imapVirus_headers: '',
+
+		sieveEnabled: false,
+		sieveHost: '',
+		sievePort: 4190,
+		sieveType: 0,
+		sieveTimeout: 10,
+		sieveAuthLiteral: true,
+
+		smtpHost: '',
+		smtpPort: 25,
+		smtpType: 0,
+		smtpTimeout: 60,
+		smtpShortLogin: false,
+		smtpLowerLogin: true,
+		smtpUseAuth: true,
+		smtpSetSender: false,
+		smtpAuthPlainLine: false,
+		smtpUsePhpMail: false,
+		// SSL
+		smtpSslVerify_peer: false,
+		smtpSslAllow_self_signed: false,
+
+		whiteList: '',
+		aliasName: ''
+	},
+	domainToParams = oDomain => ({
+		name: oDomain.name,
+		IMAP: {
+			host: oDomain.imapHost,
+			port: oDomain.imapPort,
+			secure: pInt(oDomain.imapType()),
+			timeout: oDomain.imapTimeout,
+			shortLogin: !!oDomain.imapShortLogin(),
+			lowerLogin: !!oDomain.imapLowerLogin(),
+			ssl: {
+				verify_peer: !!oDomain.imapSslVerify_peer(),
+				verify_peer_name: !!oDomain.imapSslVerify_peer(),
+				allow_self_signed: !!oDomain.imapSslAllow_self_signed()
+			},
+			disabled_capabilities:  oDomain.imapDisabled_capabilities(),
+			folder_list_limit: pInt(oDomain.imapFolder_list_limit()),
+			message_list_limit: pInt(oDomain.imapMessage_list_limit()),
+/*
+			expunge_all_on_delete: ,
+			fast_simple_search: ,
+			fetch_new_messages: ,
+			force_select: ,
+			message_all_headers: ,
+*/
+			search_filter: oDomain.imapSearch_filter(),
+			spam_headers: oDomain.imapSpam_headers(),
+			virus_headers: oDomain.imapVirus_headers()
+		},
+		SMTP: {
+			host: oDomain.smtpHost,
+			port: oDomain.smtpPort,
+			secure: pInt(oDomain.smtpType()),
+			timeout: oDomain.smtpTimeout,
+			shortLogin: !!oDomain.smtpShortLogin(),
+			lowerLogin: !!oDomain.smtpLowerLogin(),
+			ssl: {
+				verify_peer: !!oDomain.smtpSslVerify_peer(),
+				verify_peer_name: !!oDomain.smtpSslVerify_peer(),
+				allow_self_signed: !!oDomain.smtpSslAllow_self_signed()
+			},
+			setSender: !!oDomain.smtpSetSender(),
+			authPlainLine: !!oDomain.smtpAuthPlainLine(),
+			useAuth: !!oDomain.smtpUseAuth(),
+			usePhpMail: !!oDomain.smtpUsePhpMail()
+		},
+		Sieve: {
+			enabled: !!oDomain.sieveEnabled(),
+			authLiteral: !!oDomain.sieveAuthLiteral(),
+			host: oDomain.sieveHost,
+			port: oDomain.sievePort,
+			secure: pInt(oDomain.sieveType()),
+			timeout: oDomain.sieveTimeout,
+			shortLogin: !!oDomain.imapShortLogin(),
+			lowerLogin: !!oDomain.imapLowerLogin(),
+			ssl: {
+				verify_peer: !!oDomain.imapSslVerify_peer(),
+				verify_peer_name: !!oDomain.imapSslVerify_peer(),
+				allow_self_signed: !!oDomain.imapSslAllow_self_signed()
+			}
+		},
+		whiteList: oDomain.whiteList
+	});
 
 export class DomainPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Domain');
 
-		this.addObservables(this.getDefaults());
-		this.addObservables({
+		addObservablesTo(this, domainDefaults);
+		addObservablesTo(this, {
 			edit: false,
 
 			saving: false,
@@ -42,34 +144,25 @@ export class DomainPopupView extends AbstractViewPopup {
 			testingImapError: false,
 			testingSieveError: false,
 			testingSmtpError: false,
-			testingImapErrorDesc: '',
-			testingSieveErrorDesc: '',
-			testingSmtpErrorDesc: '',
 
 			imapHostFocus: false,
 			sieveHostFocus: false,
 			smtpHostFocus: false,
-		});
 
-		this.addComputables({
+			detectingConfig: false
+		});
+		this.imapDisabled_capabilities = ko.observableArray();
+		this.imapCapabilities = ko.observableArray();
+
+		addComputablesTo(this, {
 			headerText: () => {
 				const name = this.name(),
 					aliasName = this.aliasName();
-
-				let result = '';
-
-				if (this.edit()) {
-					result = i18n('POPUPS_DOMAIN/TITLE_EDIT_DOMAIN', { NAME: name });
-					if (aliasName) {
-						result += ' ⫘ ' + aliasName;
-					}
-				} else {
-					result = name
-							? i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN_WITH_NAME', { NAME: name })
-							: i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN');
-				}
-
-				return result;
+				return this.edit()
+					? i18n('POPUPS_DOMAIN/TITLE_EDIT_DOMAIN', { NAME: name }) + (aliasName ? ' ⫘ ' + aliasName : '')
+					: (name
+						? i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN_WITH_NAME', { NAME: name })
+						: i18n('POPUPS_DOMAIN/TITLE_ADD_DOMAIN'));
 			},
 
 			domainDesc: () => {
@@ -78,14 +171,14 @@ export class DomainPopupView extends AbstractViewPopup {
 			},
 
 			domainIsComputed: () => {
-				const usePhpMail = this.smtpPhpMail(),
-					useSieve = this.useSieve();
+				const usePhpMail = this.smtpUsePhpMail(),
+					sieveEnabled = this.sieveEnabled();
 
 				return (
 					this.name() &&
 					this.imapHost() &&
 					this.imapPort() &&
-					(useSieve ? this.sieveHost() && this.sievePort() : true) &&
+					(sieveEnabled ? this.sieveHost() && this.sievePort() : true) &&
 					((this.smtpHost() && this.smtpPort()) || usePhpMail)
 				);
 			},
@@ -94,11 +187,7 @@ export class DomainPopupView extends AbstractViewPopup {
 			canBeSaved: () => !this.saving() && this.domainIsComputed()
 		});
 
-		this.addSubscribables({
-			testingImapError: value => value || this.testingImapErrorDesc(''),
-			testingSieveError: value => value || this.testingSieveErrorDesc(''),
-			testingSmtpError: value => value || this.testingSmtpErrorDesc(''),
-
+		addSubscribablesTo(this, {
 			// smart form improvements
 			imapHostFocus: value =>
 				value && this.name() && !this.imapHost() && this.imapHost(this.name().replace(/[.]?[*][.]?/g, '')),
@@ -109,7 +198,7 @@ export class DomainPopupView extends AbstractViewPopup {
 			smtpHostFocus: value => value && this.imapHost() && !this.smtpHost()
 				&& this.smtpHost(this.imapHost().replace(/imap/gi, 'smtp')),
 
-			imapSecure: value => {
+			imapType: value => {
 				if (this.enableSmartPorts()) {
 					const port = pInt(this.imapPort());
 					switch (pInt(value)) {
@@ -129,7 +218,7 @@ export class DomainPopupView extends AbstractViewPopup {
 				}
 			},
 
-			smtpSecure: value => {
+			smtpType: value => {
 				if (this.enableSmartPorts()) {
 					const port = pInt(this.smtpPort());
 					switch (pInt(value)) {
@@ -163,65 +252,63 @@ export class DomainPopupView extends AbstractViewPopup {
 	createOrAddCommand() {
 		this.saving(true);
 		Remote.request('AdminDomainSave',
-			this.onDomainCreateOrSaveResponse.bind(this),
+			iError => {
+				this.saving(false);
+				if (iError) {
+					this.savingError(getNotification(iError));
+				} else {
+					DomainAdminStore.fetch();
+					this.close();
+				}
+			},
 			Object.assign(domainToParams(this), {
-				Create: this.edit() ? 0 : 1,
-
-				IncShortLogin: this.imapShortLogin() ? 1 : 0,
-
-				OutShortLogin: this.smtpShortLogin() ? 1 : 0,
-				OutSetSender: this.smtpSetSender() ? 1 : 0,
-
-				WhiteList: this.whiteList()
+				create: this.edit() ? 0 : 1
 			})
 		);
 	}
 
 	testConnectionCommand() {
-		this.clearTesting(false);
-		this.testing(true);
-
-		Remote.request('AdminDomainTest',
-			(iError, oData) => {
-				this.testing(false);
-				if (iError) {
-					this.testingImapError(true);
-					this.testingSieveError(true);
-					this.testingSmtpError(true);
-				} else {
-					this.testingDone(true);
-					this.testingImapError(true !== oData.Result.Imap);
-					this.testingSieveError(true !== oData.Result.Sieve);
-					this.testingSmtpError(true !== oData.Result.Smtp);
-
-					if (this.testingImapError() && oData.Result.Imap) {
-						this.testingImapErrorDesc('');
-						this.testingImapErrorDesc(oData.Result.Imap);
-					}
-
-					if (this.testingSieveError() && oData.Result.Sieve) {
-						this.testingSieveErrorDesc('');
-						this.testingSieveErrorDesc(oData.Result.Sieve);
-					}
-
-					if (this.testingSmtpError() && oData.Result.Smtp) {
-						this.testingSmtpErrorDesc('');
-						this.testingSmtpErrorDesc(oData.Result.Smtp);
-					}
-				}
-			},
-			domainToParams(this)
-		);
-	}
-
-	onDomainCreateOrSaveResponse(iError) {
-		this.saving(false);
-		if (iError) {
-			this.savingError(getNotification(iError));
-		} else {
-			DomainAdminStore.fetch();
-			this.close();
-		}
+		this.clearTesting();
+		// https://github.com/the-djmaze/snappymail/issues/477
+		AskPopupView.credentials('IMAP', 'GLOBAL/TEST').then(credentials => {
+			if (credentials) {
+				this.testing(true);
+				const params = domainToParams(this);
+				params.auth = {
+					user: credentials.username,
+					pass: credentials.password
+				};
+				Remote.request('AdminDomainTest',
+					(iError, oData) => {
+						this.testing(false);
+						if (iError) {
+							this.testingImapError(getNotification(iError));
+							this.testingSieveError(getNotification(iError));
+							this.testingSmtpError(getNotification(iError));
+						} else {
+							const result = oData.Result;
+							this.testingDone(true);
+							this.testingImapError(true !== result.Imap ? result.Imap : false);
+							this.testingSieveError(true !== result.Sieve ? result.Sieve : false);
+							this.testingSmtpError(true !== result.Smtp ? result.Smtp : false);
+							// result.ImapResult.connectCapa
+							if (true === result.Imap) {
+								let capa = result.ImapResult.authCapa
+									|| ['LIST-STATUS','METADATA','MOVE','SORT','THREAD','BINARY','STATUS=SIZE','PREVIEW'];
+								capa = capa.concat(result.ImapResult.connectCapa).unique();
+								capa.sort();
+								this.imapCapabilities(capa);
+							}
+							// result.SmtpResult.connectCapa
+							// result.SmtpResult.authCapa
+							// result.SieveResult.connectCapa
+							// result.SieveResult.authCapa
+						}
+					},
+					params
+				);
+			}
+		});
 	}
 
 	clearTesting() {
@@ -232,52 +319,71 @@ export class DomainPopupView extends AbstractViewPopup {
 		this.testingSmtpError(false);
 	}
 
+	autoconfig() {
+		this.detectingConfig(true);
+		let domain = this.name();
+		Remote.request('AdminDomainAutoconfig', (iError, oData) => {
+			if (oData?.Result?.config) {
+				let server = oData.Result.config.incomingServer[0];
+				this.imapHost(server.hostname);
+				this.imapPort(server.port);
+				this.imapType('STARTTLS' === server.socketType ? 2 : ('SSL' === server.socketType ? 1 : 0));
+				this.imapShortLogin('%EMAILADDRESS%' !== server.username);
+
+				server = oData.Result.config.outgoingServer[0];
+				this.smtpHost(server.hostname);
+				this.smtpPort(server.port);
+				this.smtpType('STARTTLS' === server.socketType ? 2 : ('SSL' === server.socketType ? 1 : 0));
+				this.smtpShortLogin('%EMAILADDRESS%' !== server.username);
+				this.smtpUseAuth(!!server.authentication);
+				this.smtpUsePhpMail(false);
+			}
+			this.detectingConfig(false);
+		}, {domain});
+	}
+
 	onShow(oDomain) {
 		this.saving(false);
 		this.clearTesting();
-		this.clearForm();
+		this.edit(false);
+		this.imapCapabilities([
+			'BINARY',
+			'LIST-STATUS',
+			'METADATA',
+			'MOVE',
+			'NAMESPACE',
+			'PREVIEW',
+			'SORT',
+			'STATUS=SIZE',
+			'THREAD'
+		]);
+		this.imapDisabled_capabilities(['METADATA','OBJECTID','PREVIEW','STATUS=SIZE']);
+		forEachObjectEntry(domainDefaults, (key, value) => this[key](value));
+		this.enableSmartPorts(true);
 		if (oDomain) {
 			this.enableSmartPorts(false);
 			this.edit(true);
-			forEachObjectEntry(oDomain, (key, value) => this[key] && this[key](value));
+			forEachObjectEntry(oDomain, (key, value) => {
+				if ('IMAP' === key || 'SMTP' === key || 'Sieve' === key) {
+					key = key.toLowerCase();
+					forEachObjectEntry(value, (skey, value) => {
+						skey = capitalize(skey);
+						if ('Ssl' == skey) {
+							forEachObjectEntry(value, (sslkey, value) => {
+								this[key + skey + capitalize(sslkey)]?.(value);
+							});
+						} else {
+							this[key + skey]?.(value);
+						}
+					});
+				} else {
+					this[key]?.(value);
+				}
+			});
+			this.name(IDN.toUnicode(this.name()));
+			this.aliasName(IDN.toUnicode(this.aliasName()));
+			this.imapCapabilities(this.imapCapabilities.concat(this.imapDisabled_capabilities()).unique());
 			this.enableSmartPorts(true);
 		}
 	}
-
-	getDefaults() {
-		return {
-			enableSmartPorts: false,
-
-			savingError: '',
-
-			name: '',
-
-			imapHost: '',
-			imapPort: 143,
-			imapSecure: 0,
-			imapShortLogin: false,
-
-			useSieve: false,
-			sieveHost: '',
-			sievePort: 4190,
-			sieveSecure: 0,
-
-			smtpHost: '',
-			smtpPort: 25,
-			smtpSecure: 0,
-			smtpShortLogin: false,
-			smtpAuth: true,
-			smtpSetSender: false,
-			smtpPhpMail: false,
-
-			whiteList: '',
-			aliasName: ''
-		};
-	}
-
-	clearForm() {
-		this.edit(false);
-		forEachObjectEntry(this.getDefaults(), (key, value) => this[key](value));
-		this.enableSmartPorts(true);
-	}
 }
diff --git a/dev/View/Popup/DomainAlias.js b/dev/View/Popup/DomainAlias.js
index f6952d3a3..30cee4515 100644
--- a/dev/View/Popup/DomainAlias.js
+++ b/dev/View/Popup/DomainAlias.js
@@ -1,4 +1,5 @@
 import { getNotification } from 'Common/Translator';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
 import { DomainAdminStore } from 'Stores/Admin/Domain';
 
@@ -11,7 +12,7 @@ export class DomainAliasPopupView extends AbstractViewPopup {
 	constructor() {
 		super('DomainAlias');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			saving: false,
 			savingError: '',
 
@@ -20,7 +21,7 @@ export class DomainAliasPopupView extends AbstractViewPopup {
 			alias: ''
 		});
 
-		this.addComputables({
+		addComputablesTo(this, {
 			domains: () => DomainAdminStore.filter(item => item && !item.alias),
 
 			domainsOptions: () => this.domains().map(item => ({ optValue: item.name, optText: item.name })),
@@ -45,21 +46,15 @@ export class DomainAliasPopupView extends AbstractViewPopup {
 					this.close();
 				}
 			}, {
-				Name: this.name(),
-				Alias: this.alias()
+				name: this.name,
+				alias: this.alias
 			});
 	}
 
 	onShow() {
-		this.clearForm();
-	}
-
-	clearForm() {
 		this.saving(false);
 		this.savingError('');
-
 		this.name('');
-
 		this.alias('');
 	}
 }
diff --git a/dev/View/Popup/Folder.js b/dev/View/Popup/Folder.js
new file mode 100644
index 000000000..6a6160e6f
--- /dev/null
+++ b/dev/View/Popup/Folder.js
@@ -0,0 +1,220 @@
+import { AbstractViewPopup } from 'Knoin/AbstractViews';
+import { addObservablesTo, koComputable } from 'External/ko';
+import Remote from 'Remote/User/Fetch';
+import { FolderUserStore } from 'Stores/User/Folder';
+
+import { getFolderFromCacheList, setFolder, removeFolderFromCacheList } from 'Common/Cache';
+import { Notifications } from 'Common/Enums';
+import { FolderMetadataKeys } from 'Common/EnumsUser';
+import { folderListOptionsBuilder, sortFolders } from 'Common/Folders';
+import { initOnStartOrLangChange, i18n, getNotification } from 'Common/Translator';
+import { defaultOptionsAfterRender } from 'Common/Utils';
+
+import { FolderACLPopupView } from 'View/Popup/FolderAcl';
+import { showScreenPopup } from 'Knoin/Knoin';
+
+import { AbstractCollectionModel } from 'Model/AbstractCollection';
+export class FolderACLModel extends AbstractCollectionModel
+{
+	static reviveFromJson(json) {
+		return super.reviveFromJson(json, rights => FolderACLRightsModel.reviveFromJson(rights));
+	}
+}
+
+import { AbstractModel } from 'Knoin/AbstractModel';
+export class FolderACLRightsModel extends AbstractModel {
+	constructor() {
+		super();
+		addObservablesTo(this, {
+			identifier: '',
+			mine: false
+		});
+		// The "RIGHTS=" capability MUST NOT include any of the rights defined in RFC 2086.
+		// That way we know it supports RFC 4314
+//		this.rights = ko.observableArray(/*'alrswipcd'.split('')*/);
+		this.rights = ko.observableArray(/*'alrswipkxte'.split('')*/);
+	}
+
+	static reviveFromJson(json) {
+		json.rights = json.rights.split('');
+		return super.reviveFromJson(json);
+	}
+/*
+	get mayReadItems()   { return this.rights.includes('l') && this.rights.includes('r'); }
+	get mayAddItems()    { return this.rights.includes('i'); }
+	get mayRemoveItems() { return this.rights.includes('t') && this.rights.includes('e'); }
+	get maySetSeen()     { return this.rights.includes('s'); }
+	get maySetKeywords() { return this.rights.includes('w'); }
+	get mayCreateChild() { return this.rights.includes('k'); }
+	get mayRename()      { return this.rights.includes('x'); }
+	get mayDelete()      { return this.rights.includes('x'); }
+	get maySubmit()      { return this.rights.includes('p'); }
+*/
+}
+
+export class FolderPopupView extends AbstractViewPopup {
+	constructor() {
+		super('Folder');
+		addObservablesTo(this, {
+			folder: null, // FolderModel
+			parentFolder: '',
+			name: '',
+			editing: false,
+			adminACL: false
+		});
+		this.ACLAllowed = FolderUserStore.hasCapability('ACL');
+
+		this.parentFolderSelectList = koComputable(() =>
+			folderListOptionsBuilder(
+				[],
+				[['', '']],
+				oItem => oItem ? oItem.detailedName() : '',
+				item => !item.subFolders.allow
+					|| (FolderUserStore.namespace && !item.fullName.startsWith(FolderUserStore.namespace))
+			)
+		);
+
+		this.displaySpecSetting = FolderUserStore.displaySpecSetting;
+
+		this.showKolab = FolderUserStore.allowKolab();
+		this.kolabTypeOptions = ko.observableArray();
+		let i18nFilter = key => i18n('SETTINGS_FOLDERS/TYPE_' + key);
+		initOnStartOrLangChange(()=>{
+			this.kolabTypeOptions([
+				{ id: '', name: '' },
+				{ id: 'event', name: i18nFilter('CALENDAR') },
+				{ id: 'contact', name: i18nFilter('CONTACTS') },
+				{ id: 'task', name: i18nFilter('TASKS') },
+				{ id: 'note', name: i18nFilter('NOTES') },
+				{ id: 'file', name: i18nFilter('FILES') },
+				{ id: 'journal', name: i18nFilter('JOURNAL') },
+				{ id: 'configuration', name: i18nFilter('CONFIGURATION') }
+			]);
+		});
+
+		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
+		this.editACL = this.editACL.bind(this);
+		this.deleteACL = this.deleteACL.bind(this);
+	}
+
+	afterHide() {
+		this.editing(false);
+	}
+
+	submitForm(/*form*/) {
+		const
+			folder = this.folder(),
+			nameToEdit = this.name().trim(),
+			newParentName = this.parentFolder(),
+			oldParent = getFolderFromCacheList(folder.parentName),
+			newParent = getFolderFromCacheList(newParentName),
+			folderList = FolderUserStore.folderList,
+			newFolderList = newParent ? newParent.subFolders : folderList,
+			delimiter = (newParent || folder).delimiter,
+			oldFullname = folder.fullName,
+			newFullname = (newParent ? newParentName + delimiter : '') + nameToEdit;
+		if (nameToEdit && newFullname != oldFullname) {
+			Remote.abort('Folders').post('FolderRename', FolderUserStore.foldersRenaming, {
+				oldName: oldFullname,
+				newName: newFullname,
+				// toggleFolderSubscription / FolderSubscribe
+				subscribe: folder.isSubscribed() ? 1 : 0,
+				// toggleFolderCheckable / FolderCheckable
+				checkable: folder.checkable() ? 1 : 0,
+				// toggleFolderKolabType / FolderSetMetadata
+				kolab: {
+					// TODO: append '.default' ?
+					type: FolderMetadataKeys.KolabFolderType,
+					value: folder.kolabType()
+				}
+			})
+			.then(() => {
+				const
+					renameFolder = (folder, parent) => {
+						removeFolderFromCacheList(folder.fullName);
+						folder.parentName = (parent ? parent.fullName : '');
+						folder.fullName = (parent ? parent.fullName + delimiter : '') + folder.name();
+						folder.delimiter = delimiter;
+						folder.deep = (parent ? parent.deep : -1) + 1;
+						setFolder(folder);
+					},
+					renameChildren = folder => {
+						folder.subFolders.forEach(child => {
+							renameFolder(child, folder);
+							renameChildren(child);
+						})
+					};
+				folder.name(nameToEdit);
+				renameFolder(folder, newParent);
+				if (folder.subFolders.length || newParent != oldParent) {
+					// Rename all subfolders to prevent reload
+					renameChildren(folder);
+				}
+				(oldParent ? oldParent.subFolders : folderList).remove(folder);
+				newFolderList.push(folder);
+				sortFolders(newFolderList);
+			})
+			.catch(error => {
+				console.error(error);
+				FolderUserStore.error(
+					getNotification(error.code, '', Notifications.CantRenameFolder) + '.\n' + error.message
+				);
+			});
+		} else {
+			Remote.request('FolderSettings', null, {
+				folder: folder.fullName,
+				// toggleFolderSubscription / FolderSubscribe
+				subscribe: folder.isSubscribed() ? 1 : 0,
+				// toggleFolderCheckable / FolderCheckable
+				checkable: folder.checkable() ? 1 : 0,
+				// toggleFolderKolabType / FolderSetMetadata
+				kolab: {
+					// TODO: append '.default' ?
+					type: FolderMetadataKeys.KolabFolderType,
+					value: folder.kolabType()
+				}
+			});
+		}
+
+		this.close();
+	}
+
+	createACL()
+	{
+		showScreenPopup(FolderACLPopupView, [this.folder(), new FolderACLRightsModel]);
+	}
+
+	editACL(acl)
+	{
+		showScreenPopup(FolderACLPopupView, [this.folder(), acl]);
+	}
+
+	deleteACL(acl)
+	{
+		Remote.request('FolderDeleteACL',
+			(iError, data) => !iError && data.Result && this.folder().ACL.remove(acl),
+			{
+				folder: this.folder().fullName,
+				identifier: acl.identifier
+			}
+		);
+	}
+
+	beforeShow(folder) {
+		folder.ACL || (folder.ACL = ko.observableArray());
+		this.adminACL(false);
+		this.ACLAllowed && Remote.request('FolderACL', (iError, data) => {
+			if (!iError && data.Result) {
+				folder.ACL(FolderACLModel.reviveFromJson(data.Result));
+//				data.Result.map(aItem => FolderACLRightsModel.reviveFromJson(aItem)).filter(v => v)
+				this.adminACL(folder.ACL()[0].rights.includes('a'));
+			}
+		}, {
+			folder: folder.fullName
+		});
+		this.editing(!folder.type() && folder.exists && folder.selectable());
+		this.name(folder.name()),
+		this.parentFolder(folder.parentName);
+		this.folder(folder);
+	}
+}
diff --git a/dev/View/Popup/FolderAcl.js b/dev/View/Popup/FolderAcl.js
new file mode 100644
index 000000000..786fdb21b
--- /dev/null
+++ b/dev/View/Popup/FolderAcl.js
@@ -0,0 +1,58 @@
+import { AbstractViewPopup } from 'Knoin/AbstractViews';
+import { addObservablesTo } from 'External/ko';
+import Remote from 'Remote/User/Fetch';
+
+export class FolderACLPopupView extends AbstractViewPopup {
+	constructor() {
+		super('FolderACL');
+		addObservablesTo(this, {
+			create: false,
+			mine: false,
+			folderName: '',
+			identifier: ''
+		});
+		this.rights = ko.observableArray();
+	}
+
+	submitForm(/*form*/) {
+		if (!this.mine()) {
+			const rights = this.rights();
+			Remote.request('FolderSetACL',
+				(iError, data) => {
+					if (!iError && data.Result) {
+						const acl = this.acl;
+						if (!acl.identifier) {
+							this.folder.ACL.push(acl);
+						}
+						acl.rights = rights;
+					}
+				}, {
+					folder: this.folderName(),
+					identifier: this.identifier(),
+					rights: rights.join('')
+				}
+			);
+		}
+		this.close();
+	}
+
+	beforeShow(folder, acl) {
+		this.folder = folder;
+		this.create(!acl.identifier());
+		this.mine(acl.mine());
+		this.acl = acl;
+/*
+		this.ACLAllowed && Remote.request('FolderIdentifierRights', (iError, data) => {
+			if (!iError && data.Result) {
+				this.rights(data.Result.rights.split(''));
+			}
+		}, {
+			folder: folder.fullName,
+			identifier: acl.identifier
+		});
+*/
+		this.folderName(folder.fullName);
+		this.identifier(acl.identifier());
+		this.rights(acl.rights());
+	}
+}
diff --git a/dev/View/Popup/FolderClear.js b/dev/View/Popup/FolderClear.js
index 388b0a0d6..420bf3148 100644
--- a/dev/View/Popup/FolderClear.js
+++ b/dev/View/Popup/FolderClear.js
@@ -1,5 +1,5 @@
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 import { i18n, getNotification } from 'Common/Translator';
-import { setFolderHash } from 'Common/Cache';
 
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
@@ -13,57 +13,43 @@ export class FolderClearPopupView extends AbstractViewPopup {
 	constructor() {
 		super('FolderClear');
 
-		this.addObservables({
-			selectedFolder: null,
-			clearingProcess: false,
-			clearingError: ''
+		addObservablesTo(this, {
+			folder: null,
+			clearing: false
 		});
 
-		this.addComputables({
+		addComputablesTo(this, {
 			dangerDescHtml: () => {
-				const folder = this.selectedFolder();
-//				return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder ? folder.fullName.replace(folder.delimiter, ' / ') : '' });
-				return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder ? folder.localName() : '' });
+//				const folder = this.folder();
+//				return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: folder.fullName.replace(folder.delimiter, ' / ') });
+				return i18n('POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_1', { FOLDER: this.folder()?.localName() });
 			}
 		});
 
 		decorateKoCommands(this, {
-			clearCommand: self => {
-					const folder = self.selectedFolder();
-					return !self.clearingProcess() && null !== folder;
-				}
+			clearCommand: self => !self.clearing()
 		});
 	}
 
 	clearCommand() {
-		const folderToClear = this.selectedFolder();
-		if (folderToClear) {
-			MessageUserStore.message(null);
-			MessagelistUserStore([]);
-
-			this.clearingProcess(true);
-
-			folderToClear.messageCountAll(0);
-			folderToClear.messageCountUnread(0);
-
-			setFolderHash(folderToClear.fullName, '');
-
+		const folder = this.folder();
+		if (folder) {
+			this.clearing(true);
 			Remote.request('FolderClear', iError => {
-				this.clearingProcess(false);
-				if (iError) {
-					this.clearingError(getNotification(iError));
-				} else {
-					MessagelistUserStore.reload(true);
-					this.close();
-				}
+				folder.totalEmails(0);
+				folder.unreadEmails(0);
+				MessageUserStore.message(null);
+				MessagelistUserStore.reload(true, true);
+				this.clearing(false);
+				iError ? alert(getNotification(iError)) : this.close();
 			}, {
-				Folder: folderToClear.fullName
+				folder: folder.fullName
 			});
 		}
 	}
 
 	onShow(folder) {
-		this.clearingProcess(false);
-		this.selectedFolder(folder || null);
+		this.clearing(false);
+		this.folder(folder);
 	}
 }
diff --git a/dev/View/Popup/FolderCreate.js b/dev/View/Popup/FolderCreate.js
index a7da49fbd..0f47b0ca1 100644
--- a/dev/View/Popup/FolderCreate.js
+++ b/dev/View/Popup/FolderCreate.js
@@ -1,13 +1,11 @@
-import { koComputable } from 'External/ko';
+import { koComputable, addObservablesTo } from 'External/ko';
 
-import { Notification } from 'Common/Enums';
-import { UNUSED_OPTION_VALUE } from 'Common/Consts';
+import { Notifications } from 'Common/Enums';
 import { defaultOptionsAfterRender } from 'Common/Utils';
 import { folderListOptionsBuilder, sortFolders } from 'Common/Folders';
-import { getNotification } from 'Common/Translator';
+import { getNotification/*, baseCollator*/ } from 'Common/Translator';
 
 import { FolderUserStore } from 'Stores/User/Folder';
-import { SettingsUserStore } from 'Stores/User/Settings';
 
 import Remote from 'Remote/User/Fetch';
 
@@ -20,41 +18,35 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 	constructor() {
 		super('FolderCreate');
 
-		this.addObservables({
-			folderName: '',
-			folderSubscribe: SettingsUserStore.hideUnsubscribed(),
-
-			selectedParentValue: UNUSED_OPTION_VALUE
+		addObservablesTo(this, {
+			name: '',
+			subscribe: true,
+			parentFolder: ''
 		});
 
 		this.parentFolderSelectList = koComputable(() =>
 			folderListOptionsBuilder(
 				[],
 				[['', '']],
-				oItem =>
-					oItem ? (oItem.isSystemFolder() ? oItem.name() + ' ' + oItem.manageFolderSystemName() : oItem.name()) : '',
-				FolderUserStore.namespace
-					? item => FolderUserStore.namespace !== item.fullName.slice(0, FolderUserStore.namespace.length)
-					: null,
-				true
+				oItem => oItem ? oItem.detailedName() : '',
+				item => !item.subFolders.allow
+					|| (FolderUserStore.namespace && !item.fullName.startsWith(FolderUserStore.namespace))
 			)
 		);
 
 		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
 	}
 
-	submitForm() {
-		if (/^[^\\/]+$/g.test(this.folderName())) {
-			let parentFolderName = this.selectedParentValue();
+	submitForm(form) {
+		if (form.reportValidity()) {
+			const data = new FormData(form);
+
+			let parentFolderName = this.parentFolder();
 			if (!parentFolderName && 1 < FolderUserStore.namespace.length) {
-				parentFolderName = FolderUserStore.namespace.slice(0, FolderUserStore.namespace.length - 1);
+				data.set('parent', FolderUserStore.namespace.slice(0, FolderUserStore.namespace.length - 1));
 			}
 
-			Remote.abort('Folders').post('FolderCreate', FolderUserStore.foldersCreating, {
-					Folder: this.folderName(),
-					Parent: parentFolderName,
-					Subscribe: this.folderSubscribe() ? 1 : 0
-				})
+			Remote.abort('Folders').post('FolderCreate', FolderUserStore.foldersCreating, data)
 				.then(
 					data => {
 						const folder = getFolderFromCacheList(parentFolderName),
@@ -64,13 +56,13 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 						folders.push(subFolder);
 						sortFolders(folders);
 /*
-						var collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+						var collator = baseCollator(true);
 						console.log((folder ? folder.subFolders : FolderUserStore.folderList).sort(collator.compare));
 */
 					},
 					error => {
-						FolderUserStore.folderListError(
-							getNotification(error.code, '', Notification.CantCreateFolder)
+						FolderUserStore.error(
+							getNotification(error.code, '', Notifications.CantCreateFolder)
 							+ '.\n' + error.message);
 					}
 				);
@@ -80,7 +72,8 @@ export class FolderCreatePopupView extends AbstractViewPopup {
 	}
 
 	onShow() {
-		this.folderName('');
-		this.selectedParentValue('');
+		this.name('');
+		this.subscribe(true);
+		this.parentFolder('');
 	}
 }
diff --git a/dev/View/Popup/FolderSystem.js b/dev/View/Popup/FolderSystem.js
index a5186a3f2..8c6d898d6 100644
--- a/dev/View/Popup/FolderSystem.js
+++ b/dev/View/Popup/FolderSystem.js
@@ -1,7 +1,7 @@
 import ko from 'ko';
 import { koComputable, addSubscribablesTo } from 'External/ko';
 
-import { SetSystemFoldersNotification } from 'Common/EnumsUser';
+import { FolderType } from 'Common/EnumsUser';
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
 import { defaultOptionsAfterRender } from 'Common/Utils';
 import { folderListOptionsBuilder } from 'Common/Folders';
@@ -19,7 +19,7 @@ export class FolderSystemPopupView extends AbstractViewPopup {
 
 		this.folderSelectList = koComputable(() =>
 			folderListOptionsBuilder(
-				FolderUserStore.folderListSystemNames(),
+				FolderUserStore.systemFoldersNames(),
 				[
 					['', i18n('POPUPS_SYSTEM_FOLDERS/SELECT_CHOOSE_ONE')],
 					[UNUSED_OPTION_VALUE, i18n('POPUPS_SYSTEM_FOLDERS/SELECT_UNUSE_NAME')]
@@ -47,24 +47,24 @@ export class FolderSystemPopupView extends AbstractViewPopup {
 	}
 
 	/**
-	 * @param {number=} notificationType = SetSystemFoldersNotification.None
+	 * @param {number=} notificationType = 0
 	 */
-	onShow(notificationType = SetSystemFoldersNotification.None) {
+	onShow(notificationType = 0) {
 		let notification = '', prefix = 'POPUPS_SYSTEM_FOLDERS/NOTIFICATION_';
 		switch (notificationType) {
-			case SetSystemFoldersNotification.Sent:
+			case FolderType.Sent:
 				notification = i18n(prefix + 'SENT');
 				break;
-			case SetSystemFoldersNotification.Draft:
+			case FolderType.Drafts:
 				notification = i18n(prefix + 'DRAFTS');
 				break;
-			case SetSystemFoldersNotification.Spam:
+			case FolderType.Junk:
 				notification = i18n(prefix + 'SPAM');
 				break;
-			case SetSystemFoldersNotification.Trash:
+			case FolderType.Trash:
 				notification = i18n(prefix + 'TRASH');
 				break;
-			case SetSystemFoldersNotification.Archive:
+			case FolderType.Archive:
 				notification = i18n(prefix + 'ARCHIVE');
 				break;
 			// no default
diff --git a/dev/View/Popup/Identity.js b/dev/View/Popup/Identity.js
index dcdbde8bc..b47b9d07d 100644
--- a/dev/View/Popup/Identity.js
+++ b/dev/View/Popup/Identity.js
@@ -1,168 +1,145 @@
+
+import { addObservablesTo, koComputable } from 'External/ko';
+
 import { getNotification } from 'Common/Translator';
 
 import Remote from 'Remote/User/Fetch';
 
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
-const reEmail = /^[^@\s]+@[^@\s]+$/;
+import { IdentityModel } from 'Model/Identity';
+
+import { folderListOptionsBuilder } from 'Common/Folders';
+import { i18n } from 'Common/Translator';
+import { defaultOptionsAfterRender } from 'Common/Utils';
+
+import { showScreenPopup } from 'Knoin/Knoin';
+import { AskPopupView } from 'View/Popup/Ask';
 
 export class IdentityPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Identity');
 
-		this.id = '';
-		this.addObservables({
+		addObservablesTo(this, {
+			identity: null,
 			edit: false,
-			owner: false,
-
-			email: '',
-			emailFocused: false,
-			emailHasError: false,
-
-			name: '',
-
-			replyTo: '',
-			replyToFocused: false,
-			replyToHasError: false,
-
-			bcc: '',
-			bccFocused: false,
-			bccHasError: false,
-
-			signature: '',
-			signatureInsertBefore: false,
-
-			showBcc: false,
-			showReplyTo: false,
-
+			labelFocused: false,
+			nameFocused: false,
 			submitRequest: false,
 			submitError: ''
 		});
-
-		this.addSubscribables({
-			email: value => this.emailHasError(value && !reEmail.test(value)),
-			replyTo: value => {
-				this.replyToHasError(value && !reEmail.test(value));
-				if (false === this.showReplyTo() && value.length) {
-					this.showReplyTo(true);
-				}
-			},
-			bcc: value => {
-				this.bccHasError(value && !reEmail.test(value));
-				if (false === this.showBcc() && value.length) {
-					this.showBcc(true);
-				}
-			}
-		});
 /*
 		this.email.valueHasMutated();
 		this.replyTo.valueHasMutated();
 		this.bcc.valueHasMutated();
 */
+		this.folderSelectList = koComputable(() =>
+			folderListOptionsBuilder(
+				[],
+				[['', '('+i18n('GLOBAL/DEFAULT')+')']]
+			)
+		);
+		this.defaultOptionsAfterRender = defaultOptionsAfterRender;
+
+		this.createSelfSigned = this.createSelfSigned.bind(this);
+		this.setSMimeKeyPass = this.setSMimeKeyPass.bind(this);
 	}
 
-	submitForm() {
-		if (!this.submitRequest()) {
-			if (this.signature && this.signature.__fetchEditorValue) {
-				this.signature.__fetchEditorValue();
+	createSelfSigned() {
+		AskPopupView.password('', 'CRYPTO/CREATE_SELF_SIGNED').then(result => {
+			if (result) {
+				const identity = this.identity();
+				Remote.request('SMimeCreateCertificate', (iError, oData) => {
+					if (oData.Result.x509) {
+						identity.smimeKey(oData.Result.pkey);
+						identity.smimeCertificate(oData.Result.x509);
+					} else {
+						this.submitError(oData.message);
+					}
+				}, {
+					name: identity.name,
+					email: identity.email,
+					privateKey: identity.smimeKey(),
+					passphrase: result.password
+				});
 			}
+		});
+	}
 
-			if (!this.emailHasError()) {
-				this.emailHasError(!this.email().trim());
-			}
-
-			if (this.emailHasError()) {
-				if (!this.owner()) {
-					this.emailFocused(true);
-				}
-
+	async setSMimeKeyPass() {
+		const identity = this.identity();
+		let old = null
+		if (identity.smimeKeyEncrypted()) {
+			old = await AskPopupView.password(i18n('CRYPTO/CURRENT_PASS'), 'CRYPTO/DECRYPT');
+			if (!old) {
 				return;
 			}
-
-			if (this.replyToHasError()) {
-				this.replyToFocused(true);
-				return;
-			}
-
-			if (this.bccHasError()) {
-				this.bccFocused(true);
-				return;
+		}
+		AskPopupView.password(i18n('CRYPTO/NEW_PASS'), 'GLOBAL/SAVE').then(result => {
+			if (result) {
+				Remote.request('SMimeExportPrivateKey', (iError, oData) => {
+					if (oData.Result) {
+						identity.smimeKey(oData.Result);
+					} else {
+						this.submitError(oData.message);
+					}
+				}, {
+					privateKey: identity.smimeKey(),
+					oldPassphrase: old?.password,
+					newPassphrase: result.password
+				});
 			}
+		});
+	}
 
+	submitForm(form) {
+		if (!this.submitRequest() && form.reportValidity()) {
+			let identity = this.identity();
+			identity.signature?.__fetchEditorValue?.();
 			this.submitRequest(true);
-
+			const data = new FormData(form);
+			data.set('Id', identity.id());
+			data.set('Signature', identity.signature());
 			Remote.request('IdentityUpdate', iError => {
 					this.submitRequest(false);
 					if (iError) {
 						this.submitError(getNotification(iError));
 					} else {
-						rl.app.accountsAndIdentities();
+						rl.app.loadAccountsAndIdentities();
 						this.close();
 					}
-				}, {
-					Id: this.id,
-					Email: this.email(),
-					Name: this.name(),
-					ReplyTo: this.replyTo(),
-					Bcc: this.bcc(),
-					Signature: this.signature(),
-					SignatureInsertBefore: this.signatureInsertBefore() ? 1 : 0
-				}
+				}, data
 			);
 		}
 	}
 
-	clearPopup() {
-		this.id = '';
-		this.edit(false);
-		this.owner(false);
-
-		this.name('');
-		this.email('');
-		this.replyTo('');
-		this.bcc('');
-		this.signature('');
-		this.signatureInsertBefore(false);
-
-		this.emailHasError(false);
-		this.replyToHasError(false);
-		this.bccHasError(false);
-
-		this.showBcc(false);
-		this.showReplyTo(false);
-
-		this.submitRequest(false);
-		this.submitError('');
-	}
-
 	/**
 	 * @param {?IdentityModel} oIdentity
 	 */
 	onShow(identity) {
-		this.clearPopup();
-
+		this.submitRequest(false);
+		this.submitError('');
 		if (identity) {
 			this.edit(true);
-
-			this.id = identity.id() || '';
-			this.name(identity.name());
-			this.email(identity.email());
-			this.replyTo(identity.replyTo());
-			this.bcc(identity.bcc());
-			this.signature(identity.signature());
-			this.signatureInsertBefore(identity.signatureInsertBefore());
-
-			this.owner(!this.id);
 		} else {
-			this.id = Jua.randomId();
+			this.edit(false);
+			identity = new IdentityModel;
+			identity.id(Jua.randomId());
 		}
+		this.identity(identity);
 	}
 
 	afterShow() {
-		this.owner() || this.emailFocused(true);
+		this.identity().id() ? this.labelFocused(true) : this.nameFocused(true);
 	}
 
-	afterHide() {
-		this.clearPopup();
+	onClose() {
+		if (!this.identity().exists()) {
+			showScreenPopup(AskPopupView, [
+				i18n('POPUPS_ASK/DESC_WANT_CLOSE_THIS_WINDOW'),
+				() => this.close()
+			]);
+			return false;
+		}
 	}
 }
diff --git a/dev/View/Popup/Languages.js b/dev/View/Popup/Languages.js
index ff62f63e3..7bcf2b719 100644
--- a/dev/View/Popup/Languages.js
+++ b/dev/View/Popup/Languages.js
@@ -1,5 +1,4 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
 
 import { convertLangName } from 'Common/Translator';
 
@@ -8,50 +7,23 @@ import { AbstractViewPopup } from 'Knoin/AbstractViews';
 export class LanguagesPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Languages');
-
 		this.fLang = null;
-		this.userLanguage = ko.observable('');
-
-		this.langs = ko.observableArray();
-
-		this.languages = koComputable(() => {
-			const userLanguage = this.userLanguage();
-			return this.langs.map(language => ({
-				key: language,
-				user: language === userLanguage,
-				selected: ko.observable(false),
-				fullName: convertLangName(language)
-			}));
-		});
-
-		this.langs.subscribe(() => this.setLanguageSelection());
-	}
-
-	languageTooltipName(language) {
-		return convertLangName(language, true);
-	}
-
-	setLanguageSelection() {
-		const currentLang = this.fLang ? ko.unwrap(this.fLang) : '';
-		this.languages().forEach(item => item.selected(item.key === currentLang));
-	}
-
-	beforeShow() {
-		this.fLang = null;
-		this.userLanguage('');
-
-		this.langs([]);
+		this.languages = ko.observableArray();
 	}
 
 	onShow(fLanguage, langs, userLanguage) {
 		this.fLang = fLanguage;
-		this.userLanguage(userLanguage || '');
-
-		this.langs(langs);
+		this.languages(langs.map(language => ({
+			key: language,
+			user: userLanguage === language,
+			selected: fLanguage?.() === language,
+			fullName: convertLangName(language),
+			title: convertLangName(language, true)
+		})));
 	}
 
 	changeLanguage(lang) {
-		this.fLang && this.fLang(lang);
+		this.fLang?.(lang);
 		this.close();
 	}
 }
diff --git a/dev/View/Popup/OpenPgpGenerate.js b/dev/View/Popup/OpenPgpGenerate.js
index 6d50d8dd8..e785af81e 100644
--- a/dev/View/Popup/OpenPgpGenerate.js
+++ b/dev/View/Popup/OpenPgpGenerate.js
@@ -1,3 +1,4 @@
+import { addObservablesTo } from 'External/ko';
 //import { pInt } from 'Common/Utils';
 
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
@@ -15,7 +16,7 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 
 		this.identities = IdentityUserStore;
 
-		this.addObservables({
+		addObservablesTo(this, {
 			email: '',
 			emailError: false,
 
@@ -42,7 +43,7 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 		const type = this.keyType().toLowerCase(),
 			userId = {
 				name: this.name(),
-				email: this.email()
+				email: IDN.toASCII(this.email())
 			},
 			cfg = {
 				type: type,
@@ -92,17 +93,21 @@ export class OpenPgpGeneratePopupView extends AbstractViewPopup {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	showError(e) {
 		console.log(e);
-		if (e && e.message) {
+		if (e?.message) {
 			this.submitError(e.message);
 		}
 	}
 
 	onShow() {
-		this.name(''/*IdentityUserStore()[0].name()*/);
+		this.name(''/*IdentityUserStore()[0].name*/);
 		this.password('');
-		this.email(''/*IdentityUserStore()[0].email()*/);
+		this.email(''/*IdentityUserStore()[0].email*/);
 		this.emailError(false);
 		this.submitError('');
 	}
diff --git a/dev/View/Popup/OpenPgpImport.js b/dev/View/Popup/OpenPgpImport.js
index 8ade6d47a..3765b38e9 100644
--- a/dev/View/Popup/OpenPgpImport.js
+++ b/dev/View/Popup/OpenPgpImport.js
@@ -1,19 +1,25 @@
+import { addObservablesTo } from 'External/ko';
 import { GnuPGUserStore } from 'Stores/User/GnuPG';
-import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+import { PgpUserStore } from 'Stores/User/Pgp';
 
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
+import Remote from 'Remote/User/Fetch';
+import { i18n } from 'Common/Translator';
+
 export class OpenPgpImportPopupView extends AbstractViewPopup {
 	constructor() {
 		super('OpenPgpImport');
 
-		this.addObservables({
+		addObservablesTo(this, {
+			search: '',
+
 			key: '',
 			keyError: false,
 			keyErrorMessage: '',
 
 			saveGnuPG: true,
-			saveServer: false
+			saveServer: true
 		});
 
 		this.canGnuPG = GnuPGUserStore.isSupported();
@@ -24,6 +30,44 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 		});
 	}
 
+	searchPGP() {
+		this.key(i18n('SUGGESTIONS/SEARCHING_DESC'));
+		const fn = () => Remote.request('PgpSearchKey',
+			(iError, oData) => {
+				if (iError) {
+					this.key(oData.message);
+				} else {
+					this.key(oData.Result);
+				}
+			}, {
+				query: this.search()
+			}
+		);
+		fetch(
+			`https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=${this.search()}`,
+			{
+				method: 'GET',
+				mode: 'cors',
+				cache: 'no-cache',
+				redirect: 'error',
+				referrerPolicy: 'no-referrer',
+				credentials: 'omit'
+			}
+		)
+		.then(response => {
+			if ('application/pgp-keys' == response.headers.get('Content-Type')) {
+				response.text().then(body => this.key(body));
+			} else {
+				fn();
+			}
+		})
+		.catch(e => {
+			this.key('keys.openpgp.org: ' + e?.message + '\nTrying local...');
+			fn();
+			throw e;
+		});
+	}
+
 	submitForm() {
 		let keyTrimmed = this.key().trim();
 
@@ -34,42 +78,34 @@ export class OpenPgpImportPopupView extends AbstractViewPopup {
 		this.keyError(!keyTrimmed);
 		this.keyErrorMessage('');
 
-		if (!keyTrimmed) {
-			return;
-		}
-
-		let match = null,
-			count = 30,
-			done = false;
-		// eslint-disable-next-line max-len
-		const reg = /[-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}[\s\S]+?[-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}/gi;
-
-		do {
-			match = reg.exec(keyTrimmed);
-			if (match && 0 < count) {
-				if (match[0] && match[1] && match[2] && match[1] === match[2]) {
-					this.saveGnuPG() && GnuPGUserStore.isSupported() && GnuPGUserStore.importKey(this.key(), (iError, oData) => {
-						iError && alert(oData.ErrorMessage);
-					});
-					OpenPGPUserStore.isSupported() && OpenPGPUserStore.importKey(this.key());
-				}
-
-				--count;
+		if (keyTrimmed) {
+			let match = null,
+				count = 30,
 				done = false;
-			} else {
-				done = true;
-			}
-		} while (!done);
+			const GnuPG = this.saveGnuPG() && GnuPGUserStore.isSupported(),
+				backup = this.saveServer(),
+				// eslint-disable-next-line max-len
+				reg = /[-]{3,6}BEGIN[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}[\s\S]+?[-]{3,6}END[\s]PGP[\s](PRIVATE|PUBLIC)[\s]KEY[\s]BLOCK[-]{3,6}/gi;
 
-		if (this.keyError()) {
-			return;
+			do {
+				match = reg.exec(keyTrimmed);
+				if (match && 0 < count) {
+					if (match[0] && match[1] && match[2] && match[1] === match[2]) {
+						PgpUserStore.importKey(this.key(), GnuPG, backup);
+					}
+					--count;
+					done = false;
+				} else {
+					done = true;
+				}
+			} while (!done);
+
+			this.close();
 		}
-
-		this.close();
 	}
 
-	onShow() {
-		this.key('');
+	onShow(key) {
+		this.key(key || '');
 		this.keyError(false);
 		this.keyErrorMessage('');
 	}
diff --git a/dev/View/Popup/OpenPgpKey.js b/dev/View/Popup/OpenPgpKey.js
index ba8ca84a3..f81e4651a 100644
--- a/dev/View/Popup/OpenPgpKey.js
+++ b/dev/View/Popup/OpenPgpKey.js
@@ -1,3 +1,4 @@
+import { addObservablesTo } from 'External/ko';
 import { doc, addShortcut } from 'Common/Globals';
 import { AbstractViewPopup } from 'Knoin/AbstractViews';
 
@@ -5,7 +6,7 @@ export class OpenPgpKeyPopupView extends AbstractViewPopup {
 	constructor() {
 		super('OpenPgpKey');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			key: '',
 			keyDom: null
 		});
diff --git a/dev/View/Popup/Plugin.js b/dev/View/Popup/Plugin.js
index 2c899a367..ff597b915 100644
--- a/dev/View/Popup/Plugin.js
+++ b/dev/View/Popup/Plugin.js
@@ -1,4 +1,5 @@
 import ko from 'ko';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
 import { getNotification, i18n } from 'Common/Translator';
 import { arrayLength } from 'Common/Utils';
@@ -13,16 +14,20 @@ export class PluginPopupView extends AbstractViewPopup {
 	constructor() {
 		super('Plugin');
 
-		this.addObservables({
+		addObservablesTo(this, {
 			saveError: '',
 			id: '',
 			name: '',
-			readme: ''
+			readme: '',
+			author: '',
+			url: '',
+			version: '',
+			released: ''
 		});
 
 		this.config = ko.observableArray();
 
-		this.addComputables({
+		addComputablesTo(this, {
 			hasReadme: () => !!this.readme(),
 			hasConfiguration: () => 0 < this.config().length
 		});
@@ -34,21 +39,25 @@ export class PluginPopupView extends AbstractViewPopup {
 		});
 	}
 
+	hideError() {
+		this.saveError('');
+	}
+
 	saveCommand() {
 		const oConfig = {
-			Id: this.id(),
-			Settings: {}
+			id: this.id,
+			settings: {}
 		},
 		setItem = item => {
 			let value = item.value();
 			if (false === value || true === value) {
 				value = value ? 1 : 0;
 			}
-			oConfig.Settings[item.Name] = value;
+			oConfig.settings[item.name] = value;
 		};
 
 		this.config.forEach(oItem => {
-			if (7 == oItem.Type) {
+			if (7 == oItem.type) {
 				// Group
 				oItem.config.forEach(oSubItem => setItem(oSubItem));
 			} else {
@@ -68,18 +77,26 @@ export class PluginPopupView extends AbstractViewPopup {
 		this.id('');
 		this.name('');
 		this.readme('');
+		this.author('');
+		this.url('');
+		this.version('');
+		this.released('');
 		this.config([]);
 
 		if (oPlugin) {
-			this.id(oPlugin.Id);
-			this.name(oPlugin.Name);
-			this.readme(oPlugin.Readme);
+			this.id(oPlugin.id);
+			this.name(oPlugin.name);
+			this.readme(oPlugin.readme);
+			this.author(oPlugin.author);
+			this.url(oPlugin.url);
+			this.version(oPlugin.version);
+			this.released(oPlugin.released);
 
-			const config = oPlugin.Config;
+			const config = oPlugin.config;
 			if (arrayLength(config)) {
 				this.config(
 					config.map(item => {
-						if (7 == item.Type) {
+						if (7 == item.type) {
 							// Group
 							item.config.forEach(subItem => {
 								subItem.value = ko.observable(subItem.value);
diff --git a/dev/View/Popup/SMimeImport.js b/dev/View/Popup/SMimeImport.js
new file mode 100644
index 000000000..c686c7570
--- /dev/null
+++ b/dev/View/Popup/SMimeImport.js
@@ -0,0 +1,50 @@
+import { addObservablesTo } from 'External/ko';
+import { getNotification } from 'Common/Translator';
+
+import { AbstractViewPopup } from 'Knoin/AbstractViews';
+
+import Remote from 'Remote/User/Fetch';
+
+export class SMimeImportPopupView extends AbstractViewPopup {
+	constructor() {
+		super('SMimeImport');
+
+		addObservablesTo(this, {
+			pem: '',
+			pemError: false,
+			pemErrorMessage: '',
+			pemValid: false
+		});
+
+		this.pem.subscribe(value => {
+			this.pemError(false);
+			this.pemErrorMessage('');
+			this.pemValid(value && value.includes('-----BEGIN CERTIFICATE-----'));
+		});
+	}
+
+	submitForm() {
+		if (this.pemValid()) {
+			Remote.request('SMimeImportCertificate',
+				(iError, oData) => {
+					if (iError) {
+						this.pemError(true);
+						this.pemErrorMessage(getNotification(iError, oData?.message));
+//						oData?.messageAdditional;
+					} else {
+						this.close();
+					}
+				},
+				{pem:this.pem()}
+			);
+		} else {
+			this.pemError(true);
+		}
+	}
+
+	onShow() {
+		this.pem('');
+		this.pemError(false);
+		this.pemErrorMessage('');
+	}
+}
diff --git a/dev/View/User/Login.js b/dev/View/User/Login.js
index 6db9779fa..f80262252 100644
--- a/dev/View/User/Login.js
+++ b/dev/View/User/Login.js
@@ -1,7 +1,8 @@
-import { Notification } from 'Common/Enums';
+import { Notifications } from 'Common/Enums';
 import { ClientSideKeyNameLastSignMe } from 'Common/EnumsUser';
 import { SettingsGet, fireEvent } from 'Common/Globals';
 import { getNotification, translatorReload, convertLangName } from 'Common/Translator';
+import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 
 import { LanguageStore } from 'Stores/Language';
 
@@ -19,13 +20,12 @@ const
 	SignMeOn = 1,
 	SignMeUnused = 2;
 
-
 export class LoginUserView extends AbstractViewLogin {
 	constructor() {
 		super();
 
-		this.addObservables({
-			loadingDesc: SettingsGet('LoadingDescription'),
+		addObservablesTo(this, {
+			loadingDesc: SettingsGet('loadingDescription'),
 
 			email: SettingsGet('DevEmail'),
 			password: SettingsGet('DevPassword'),
@@ -36,39 +36,39 @@ export class LoginUserView extends AbstractViewLogin {
 
 			submitRequest: false,
 			submitError: '',
-			submitErrorAddidional: '',
+			submitErrorAdditional: '',
 
 			langRequest: false,
 
 			signMeType: SignMeUnused
 		});
 
-		this.allowLanguagesOnLogin = !!SettingsGet('AllowLanguagesOnLogin');
+		this.allowLanguagesOnLogin = !!SettingsGet('allowLanguagesOnLogin');
 
 		this.language = LanguageStore.language;
 		this.languages = LanguageStore.languages;
 
 		this.bSendLanguage = false;
 
-		this.addComputables({
+		addComputablesTo(this, {
 
 			languageFullName: () => convertLangName(this.language()),
 
 			signMeVisibility: () => SignMeUnused !== this.signMeType()
 		});
 
-		this.addSubscribables({
+		addSubscribablesTo(this, {
 			email: () => this.emailError(false),
 
 			password: () => this.passwordError(false),
 
-			submitError: value => value || this.submitErrorAddidional(''),
+			submitError: value => value || this.submitErrorAdditional(''),
 
 			signMeType: iValue => this.signMe(SignMeOn === iValue),
 
 			language: value => {
 				this.langRequest(true);
-				translatorReload(false, value).then(
+				translatorReload(value).then(
 					() => {
 						this.langRequest(false);
 						this.bSendLanguage = true;
@@ -87,19 +87,26 @@ export class LoginUserView extends AbstractViewLogin {
 		});
 	}
 
+	hideError() {
+		this.submitError('');
+	}
+
 	submitCommand(self, event) {
+		const email = this.email().trim();
+		this.email(email);
+
 		let form = event.target.form,
 			data = new FormData(form),
-			valid = form.reportValidity() && fireEvent('sm-user-login', data);
+			valid = form.reportValidity() && fireEvent('sm-user-login', data, 1);
 
-		this.emailError(!this.email());
+		this.emailError(!email);
 		this.passwordError(!this.password());
 		this.formError(!valid);
 
 		if (valid) {
 			this.submitRequest(true);
-			data.set('Language', this.bSendLanguage ? this.language() : '');
-			data.set('SignMe', this.signMe() ? 1 : 0);
+			data.set('language', this.bSendLanguage ? this.language() : '');
+			data.set('signMe', this.signMe() ? 1 : 0);
 			Remote.request('Login',
 				(iError, oData) => {
 					fireEvent('sm-user-login-response', {
@@ -108,12 +115,12 @@ export class LoginUserView extends AbstractViewLogin {
 					});
 					if (iError) {
 						this.submitRequest(false);
-						if (Notification.InvalidInputArgument == iError) {
-							iError = Notification.AuthError;
+						if (Notifications.InvalidInputArgument == iError) {
+							iError = Notifications.AuthError;
 						}
-						this.submitError(getNotification(iError, (oData ? oData.ErrorMessage : ''),
-							Notification.UnknownNotification));
-						this.submitErrorAddidional((oData && oData.ErrorMessageAdditional) || '');
+						this.submitError(getNotification(iError, oData?.message,
+							Notifications.UnknownError));
+						this.submitErrorAdditional(oData?.messageAdditional || oData?.message);
 					} else {
 						rl.setData(oData.Result);
 					}
@@ -130,25 +137,20 @@ export class LoginUserView extends AbstractViewLogin {
 	onBuild(dom) {
 		super.onBuild(dom);
 
-		const signMe = (SettingsGet('SignMe') || '').toLowerCase();
-
+		let signMe = SettingsGet('signMe');
 		switch (signMe) {
-			case 'defaultoff':
-			case 'defaulton':
-				this.signMeType(
-					'defaulton' === signMe ? SignMeOn : SignMeOff
-				);
-
+			case SignMeOff:
+			case SignMeOn:
 				switch (Local.get(ClientSideKeyNameLastSignMe)) {
 					case '-1-':
-						this.signMeType(SignMeOn);
+						signMe = SignMeOn;
 						break;
 					case '-0-':
-						this.signMeType(SignMeOff);
+						signMe = SignMeOff;
 						break;
 					// no default
 				}
-
+				this.signMeType(signMe);
 				break;
 			default:
 				this.signMeType(SignMeUnused);
diff --git a/dev/View/User/MailBox/FolderList.js b/dev/View/User/MailBox/FolderList.js
index 9f367cf0c..d8f60fe78 100644
--- a/dev/View/User/MailBox/FolderList.js
+++ b/dev/View/User/MailBox/FolderList.js
@@ -1,9 +1,9 @@
 import ko from 'ko';
 
-import { Scope } from 'Common/Enums';
-import { moveAction, addShortcut } from 'Common/Globals';
+import { ScopeFolderList, ScopeMessageList } from 'Common/Enums';
+import { addShortcut, leftPanelDisabled, stopEvent } from 'Common/Globals';
 import { mailBox, settings } from 'Common/Links';
-import { setFolderHash } from 'Common/Cache';
+//import { setFolderETag } from 'Common/Cache';
 import { addComputablesTo } from 'External/ko';
 
 import { AppUserStore } from 'Stores/User/App';
@@ -15,49 +15,38 @@ import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { showScreenPopup } from 'Knoin/Knoin';
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
-import { showMessageComposer } from 'Common/UtilsUser';
+import { showMessageComposer, moveAction } from 'Common/UtilsUser';
 import { FolderCreatePopupView } from 'View/Popup/FolderCreate';
 import { ContactsPopupView } from 'View/Popup/Contacts';
+import { ComposePopupView } from 'View/Popup/Compose';
 
-import { moveMessagesToFolder } from 'Common/Folders';
-
-import { setExpandedFolder } from 'Model/FolderCollection';
+import { setExpandedFolder, foldersFilter } from 'Model/FolderCollection';
+import { ThemeStore } from '../../../Stores/Theme';
 
 export class MailFolderList extends AbstractViewLeft {
 	constructor() {
 		super();
 
-		this.oContentScrollable = null;
+//		this.oContentScrollable = null;
 
-		this.composeInEdit = AppUserStore.composeInEdit;
+		this.composeInEdit = ComposePopupView.inEdit;
 
-		this.folderList = FolderUserStore.folderList;
-		this.folderListSystem = FolderUserStore.folderListSystem;
-		this.foldersChanging = FolderUserStore.foldersChanging;
+		this.systemFolders = FolderUserStore.systemFolders;
 
 		this.moveAction = moveAction;
 
-		this.foldersListWithSingleInboxRootFolder = ko.observable(false);
-
 		this.allowContacts = AppUserStore.allowContacts();
 
+		this.foldersFilter = foldersFilter;
+
+		this.filterUnseen = ko.observable(false);
+
 		addComputablesTo(this, {
+			foldersFilterVisible: () => 20 < FolderUserStore.folderList().CountRec,
+
 			folderListVisible: () => {
-				let multiple = false,
-					inbox, visible,
-					result = FolderUserStore.folderList().filter(folder => {
-						if (folder.isInbox()) {
-							inbox = folder;
-						}
-						visible = folder.visible();
-						multiple |= visible && !folder.isInbox();
-						return visible;
-					});
-				if (inbox && !multiple) {
-					inbox.collapsed(false);
-				}
-				this.foldersListWithSingleInboxRootFolder(!multiple);
-				return result;
+				let result = FolderUserStore.folderList().visible();
+				return 1 === result.length && result[0].isInbox() ? result[0].visibleSubfolders() : result;
 			}
 		});
 	}
@@ -77,49 +66,55 @@ export class MailFolderList extends AbstractViewLeft {
 					setExpandedFolder(folder.fullName, collapsed);
 
 					folder.collapsed(!collapsed);
-					event.preventDefault();
-					event.stopPropagation();
+					stopEvent(event);
 					return;
 				}
 			}
 
 			el = eqs(event, 'a');
-			if (el && el.matches('.selectable')) {
+			if (el?.matches('.selectable')) {
 				event.preventDefault();
 				const folder = ko.dataFor(el);
 				if (folder) {
 					if (moveAction()) {
-						moveAction(false);
-						moveMessagesToFolder(
-							FolderUserStore.currentFolderFullName(),
-							MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
+						const copy = event.ctrlKey || 2 === moveAction(),
+							messages = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails();
+						moveAction(0);
+						messages.size && MessagelistUserStore.moveMessages(
+							messages.folder,
+							messages,
 							folder.fullName,
-							event.ctrlKey
+							copy
 						);
 					} else {
 						if (!SettingsUserStore.usePreviewPane()) {
 							MessageUserStore.message(null);
 						}
-
+/*
 						if (folder.fullName === FolderUserStore.currentFolderFullName()) {
-							setFolderHash(folder.fullName, '');
+							setFolderETag(folder.fullName, '');
 						}
+*/
+						let search = '';
+						if (event.target.matches('.flag-icon') && !folder.isFlagged()) {
+							search = 'flagged';
+						} else if (folder.unreadCount() && event.clientX > el.getBoundingClientRect().right - 25) {
+							search = 'unseen';
+						}
+						hasher.setHash(mailBox(folder.fullNameHash, 1, search));
 
-						hasher.setHash(
-							mailBox(folder.fullNameHash, 1,
-								(event.target.matches('.flag-icon') && !folder.isFlagged()) ? 'flagged' : ''
-							)
-						);
+						// in mobile mode hide the panel when a folder is clicked
+						ThemeStore.isMobile() && leftPanelDisabled(true);
 					}
 
-					AppUserStore.focusedState(Scope.MessageList);
+					AppUserStore.focusedState(ScopeMessageList);
 				}
 			}
 		});
 
-		addShortcut('arrowup,arrowdown', '', Scope.FolderList, event => {
+		addShortcut('arrowup,arrowdown', '', ScopeFolderList, event => {
 			let items = [], index = 0;
-			dom.querySelectorAll('li a:not(.hidden)').forEach(node => {
+			dom.querySelectorAll('li a').forEach(node => {
 				if (node.offsetHeight || node.getClientRects().length) {
 					items.push(node);
 					if (node.matches('.focused')) {
@@ -141,18 +136,18 @@ export class MailFolderList extends AbstractViewLeft {
 			return false;
 		});
 
-		addShortcut('enter,open', '', Scope.FolderList, () => {
-			const item = qs('li a:not(.hidden).focused');
+		addShortcut('enter,open', '', ScopeFolderList, () => {
+			const item = qs('li a.focused');
 			if (item) {
-				AppUserStore.focusedState(Scope.MessageList);
+				AppUserStore.focusedState(ScopeMessageList);
 				item.click();
 			}
 
 			return false;
 		});
 
-		addShortcut('space', '', Scope.FolderList, () => {
-			const item = qs('li a:not(.hidden).focused'),
+		addShortcut('space', '', ScopeFolderList, () => {
+			const item = qs('li a.focused'),
 				folder = item && ko.dataFor(item);
 			if (folder) {
 				const collapsed = folder.collapsed();
@@ -163,21 +158,12 @@ export class MailFolderList extends AbstractViewLeft {
 			return false;
 		});
 
-//		addShortcut('tab', 'shift', Scope.FolderList, () => {
-		addShortcut('escape,tab,arrowright', '', Scope.FolderList, () => {
-			AppUserStore.focusedState(Scope.MessageList);
-			moveAction(false);
+//		addShortcut('tab', 'shift', ScopeFolderList, () => {
+		addShortcut('escape,tab,arrowright', '', ScopeFolderList, () => {
+			AppUserStore.focusedState(ScopeMessageList);
+			moveAction(0);
 			return false;
 		});
-
-		AppUserStore.focusedState.subscribe(value => {
-			let el = qs('li a.focused');
-			el && el.classList.remove('focused');
-			if (Scope.FolderList === value) {
-				el = qs('li a.selected');
-				el && el.classList.add('focused');
-			}
-		});
 	}
 
 	scrollToFocused() {
@@ -201,6 +187,10 @@ export class MailFolderList extends AbstractViewLeft {
 		showMessageComposer();
 	}
 
+	clearFolderSearch() {
+		foldersFilter('');
+	}
+
 	createFolder() {
 		showScreenPopup(FolderCreatePopupView);
 	}
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index 4b5f6595a..e273e3069 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -1,37 +1,33 @@
 import ko from 'ko';
-
-import { Scope } from 'Common/Enums';
-
-import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
+import { addObservablesTo, addComputablesTo } from 'External/ko';
 
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
-
-import { doc, leftPanelDisabled, moveAction,
-	Settings, SettingsCapa, SettingsGet,
-	addEventsListeners,
+import { ScopeFolderList, ScopeMessageList, ScopeMessageView } from 'Common/Enums';
+import { ComposeType, FolderType, MessageSetAction } from 'Common/EnumsUser';
+import { doc,
+	leftPanelDisabled, toggleLeftPanel,
+	Settings, SettingsCapa,
+	addEventsListeners, stopEvent,
 	addShortcut, registerShortcut, formFieldFocused
 } from 'Common/Globals';
-
-import { computedPaginatorHelper, showMessageComposer, populateMessageBody } from 'Common/UtilsUser';
-import { FileInfo } from 'Common/File';
-import { folderListOptionsBuilder, moveMessagesToFolder } from 'Common/Folders';
+import { arrayLength } from 'Common/Utils';
+import { computedPaginatorHelper, showMessageComposer, populateMessageBody, downloadZip, moveAction } from 'Common/UtilsUser';
+import { FileInfo, RFC822 } from 'Common/File';
 import { isFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
-import { mailBox, serverRequest } from 'Common/Links';
+import { mailBox } from 'Common/Links';
 import { Selector } from 'Common/Selector';
 
-import { i18n, initOnStartOrLangChange } from 'Common/Translator';
+import { i18n } from 'Common/Translator';
 
-import {
-	getFolderFromCacheList,
-	MessageFlagsCache,
-	hasRequestedMessage,
-	addRequestedMessage
-} from 'Common/Cache';
+import { dropFilesInFolder } from 'Common/Folders';
+
+import { getFolderFromCacheList } from 'Common/Cache';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { FolderUserStore } from 'Stores/User/Folder';
+import { LanguageStore } from 'Stores/Language';
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
 import { ThemeStore } from 'Stores/Theme';
@@ -43,9 +39,13 @@ import { AbstractViewRight } from 'Knoin/AbstractViews';
 
 import { FolderClearPopupView } from 'View/Popup/FolderClear';
 import { AdvancedSearchPopupView } from 'View/Popup/AdvancedSearch';
+import { ComposePopupView } from 'View/Popup/Compose';
 
 import { MessageModel } from 'Model/Message';
 
+import { LayoutSideView, ClientSideKeyNameMessageListSize } from 'Common/EnumsUser';
+import { setLayoutResizer } from 'Common/UtilsUser';
+
 const
 	canBeMovedHelper = () => MessagelistUserStore.hasCheckedOrSelected(),
 
@@ -55,93 +55,97 @@ const
 	 * @param {Array=} aMessages = null
 	 * @returns {void}
 	 */
-	listAction = (...args) => MessagelistUserStore.setAction(...args);
+	listAction = (...args) => MessagelistUserStore.setAction(...args),
+
+	moveMessagesToFolderType = (toFolderType, bDelete) => {
+		let messages = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails();
+		messages.size && rl.app.moveMessagesToFolderType(
+			toFolderType,
+			messages.folder,
+			messages,
+			bDelete
+		)
+	},
+
+	pad2 = v => 10 > v ? '0' + v : '' + v,
+	Ymd = dt => dt.getFullYear() + pad2(1 + dt.getMonth()) + pad2(dt.getDate()),
+
+	setMessage = msg => {
+		populateMessageBody(msg);
+/* This will replace url hash, and then load message
+ * It's working properly yet
+//		let hash = msg.href;
+		let hash = mailBox(
+			msg.folder,
+			MessagelistUserStore.page(),
+			MessagelistUserStore.listSearch(),
+			MessagelistUserStore.threadUid(),
+			msg.uid
+		);
+		MessageUserStore.message() ? hasher.replaceHash(hash) : hasher.setHash(hash);
+*/
+	};
+
+
+let
+	sLastSearchValue = '';
 
 export class MailMessageList extends AbstractViewRight {
 	constructor() {
 		super();
 
-		this.bPrefetch = false;
-		this.emptySubjectValue = '';
-
-		this.iGoToUpOrDownTimeout = 0;
-
-		this.newMoveToFolder = !!SettingsGet('NewMoveToFolder');
-
-		this.allowSearch = SettingsCapa('Search');
-		this.allowSearchAdv = SettingsCapa('SearchAdv');
 		this.allowDangerousActions = SettingsCapa('DangerousActions');
 
 		this.messageList = MessagelistUserStore;
+		this.archiveAllowed = MessagelistUserStore.archiveAllowed;
+		this.canMarkAsSpam = MessagelistUserStore.canMarkAsSpam;
+		this.isSpamFolder = MessagelistUserStore.isSpamFolder;
 
-		this.composeInEdit = AppUserStore.composeInEdit;
+		this.composeInEdit = ComposePopupView.inEdit;
 
-		this.isMobile = ThemeStore.isMobile;
-		this.leftPanelDisabled = leftPanelDisabled;
-
-		this.messageListSearch = MessagelistUserStore.listSearch;
-		this.messageListError = MessagelistUserStore.error;
+		this.isMobile = ThemeStore.isMobile; // Obsolete
 
 		this.popupVisibility = arePopupsVisible;
 
 		this.useCheckboxesInList = SettingsUserStore.useCheckboxesInList;
 
-		this.messageListThreadUid = MessagelistUserStore.endThreadUid;
-
-		this.messageListIsLoading = MessagelistUserStore.isLoading;
-
-		initOnStartOrLangChange(() => this.emptySubjectValue = i18n('MESSAGE_LIST/EMPTY_SUBJECT_TEXT'));
-
 		this.userUsageProc = FolderUserStore.quotaPercentage;
 
-		this.addObservables({
-			moveDropdownTrigger: false,
-			moreDropdownTrigger: false,
-			sortDropdownTrigger: false,
+		this.hideDeleted = SettingsUserStore.hideDeleted;
 
-			dragOverArea: null,
-			dragOverBodyArea: null,
-
-			inputMessageListSearchFocus: false
+		addObservablesTo(this, {
+			focusSearch: false
 		});
 
 		// append drag and drop
 		this.dragOver = ko.observable(false).extend({ throttle: 1 });
 		this.dragOverEnter = ko.observable(false).extend({ throttle: 1 });
 
-		this.sLastSearchValue = '';
+		const attachmentsActions = Settings.app('attachmentsActions');
+		this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
 
-		this.addComputables({
+		addComputablesTo(this, {
 
-			sortSupported: () =>
-				FolderUserStore.hasCapability('SORT') | FolderUserStore.hasCapability('ESORT'),
-
-			folderMenuForMove: () =>
-				folderListOptionsBuilder(
-					[FolderUserStore.currentFolderFullName()],
-					[],
-					item => item ? item.localName() : ''
-				),
+			sortSupported: () => FolderUserStore.hasCapability('SORT') && !MessagelistUserStore.threadUid(),
 
 			messageListSearchDesc: () => {
-				const value = MessagelistUserStore().Search;
+				const value = MessagelistUserStore().search;
 				return value ? i18n('MESSAGE_LIST/SEARCH_RESULT_FOR', { SEARCH: value }) : ''
 			},
 
-			messageListPaginator: computedPaginatorHelper(MessagelistUserStore.page,
-				MessagelistUserStore.pageCount),
+			messageListPaginator: computedPaginatorHelper(MessagelistUserStore.page, MessagelistUserStore.pageCount),
 
 			checkAll: {
-				read: () => 0 < MessagelistUserStore.listChecked().length,
+				read: () => MessagelistUserStore.hasChecked(),
 				write: (value) => {
 					value = !!value;
 					MessagelistUserStore.forEach(message => message.checked(value));
 				}
 			},
 
-			inputProxyMessageListSearch: {
+			inputSearch: {
 				read: MessagelistUserStore.mainSearch,
-				write: value => this.sLastSearchValue = value
+				write: value => sLastSearchValue = value
 			},
 
 			isIncompleteChecked: () => {
@@ -149,63 +153,96 @@ export class MailMessageList extends AbstractViewRight {
 				return c && MessagelistUserStore().length > c;
 			},
 
-			hasMessages: () => 0 < MessagelistUserStore().length,
+			listGrouped: () => {
+				let uid = MessagelistUserStore.threadUid(),
+					sort = FolderUserStore.sortMode() || 'DATE';
+				return SettingsUserStore.listGrouped() && (sort.includes('DATE') || sort.includes('FROM')) && !uid;
+			},
 
-			isSpamFolder: () => (FolderUserStore.spamFolder() || 0) === MessagelistUserStore().Folder,
+			timeFormat: () => (FolderUserStore.sortMode() || '').includes('FROM') ? 'AUTO' : 'LT',
 
-			isSpamDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.spamFolder(),
-
-			isTrashFolder: () => (FolderUserStore.trashFolder() || 0) === MessagelistUserStore().Folder,
-
-			isDraftFolder: () => (FolderUserStore.draftsFolder() || 0) === MessagelistUserStore().Folder,
-
-			isSentFolder: () => (FolderUserStore.sentFolder() || 0) === MessagelistUserStore().Folder,
-
-			isArchiveFolder: () => (FolderUserStore.archiveFolder() || 0) === MessagelistUserStore().Folder,
-
-			isArchiveDisabled: () => UNUSED_OPTION_VALUE === FolderUserStore.archiveFolder(),
-
-			isArchiveVisible: () => !this.isArchiveFolder() && !this.isArchiveDisabled() && !this.isDraftFolder(),
-
-			isSpamVisible: () =>
-				!this.isSpamFolder() && !this.isSpamDisabled() && !this.isDraftFolder() && !this.isSentFolder(),
-
-			isUnSpamVisible: () =>
-				this.isSpamFolder() && !this.isSpamDisabled() && !this.isDraftFolder() && !this.isSentFolder(),
-
-			mobileCheckedStateShow: () => ThemeStore.isMobile() ? 0 < MessagelistUserStore.listChecked().length : true,
-
-			mobileCheckedStateHide: () => ThemeStore.isMobile() ? !MessagelistUserStore.listChecked().length : true,
+			groupedList: () => {
+				let list = [], current, sort = FolderUserStore.sortMode() || 'DATE';
+				if (sort.includes('FROM')) {
+					MessagelistUserStore.forEach(msg => {
+						let email = msg.from[0]?.email;
+						if (!current || email != current.id) {
+							current = {
+								id: email,
+								label: msg.from[0]?.toLine(),
+								search: 'from=' + email,
+								messages: []
+							};
+							list.push(current);
+						}
+						current.messages.push(msg);
+					});
+				} else if (sort.includes('DATE')) {
+					let today = Ymd(new Date()),
+						rtf = Intl.RelativeTimeFormat
+							? new Intl.RelativeTimeFormat(doc.documentElement.lang, { numeric: "auto" }) : 0;
+					MessagelistUserStore.forEach(msg => {
+						let dt = (new Date(msg.dateTimestamp() * 1000)),
+							date,
+							ymd = Ymd(dt);
+						if (!current || ymd != current.id) {
+							if (rtf && today == ymd) {
+								date = rtf.format(0, 'day');
+							} else if (rtf && today - 1 == ymd) {
+								date = rtf.format(-1, 'day');
+//							} else if (today - 7 < ymd) {
+//								date = dt.format({weekday: 'long'});
+//								date = dt.format({dateStyle: 'full'},0,LanguageStore.hourCycle());
+							} else {
+//								date = dt.format({dateStyle: 'medium'},0,LanguageStore.hourCycle());
+								date = dt.format({dateStyle: 'full'},0,LanguageStore.hourCycle());
+							}
+							current = {
+								id: ymd,
+								label: date,
+								search: 'on=' + dt.getFullYear() + '-' + pad2(1 + dt.getMonth()) + '-' + pad2(dt.getDate()),
+								messages: []
+							};
+							list.push(current);
+						}
+						current.messages.push(msg);
+					});
+				}
+				return list;
+			},
 
 			sortText: () => {
 				let mode = FolderUserStore.sortMode(),
-					desc = '' === mode || mode.includes('REVERSE');
+					has = w => mode.includes(w),
+					desc = '' === mode || has('REVERSE');
 				mode = mode.split(/\s+/);
-				if (mode.includes('FROM')) {
+				if (has('FROM')) {
 					 return '@' + (desc ? '⬆' : '⬇');
 				}
-				if (mode.includes('SUBJECT')) {
+				if (has('SUBJECT')) {
 					 return '𝐒' + (desc ? '⬆' : '⬇');
 				}
-				return (mode.includes('SIZE') ? '✉' : '📅') + (desc ? '⬇' : '⬆');
-			}
-		});
+				if (has('SIZE')) {
+					 return '✉' + (desc ? '⬇' : '⬆');
+				}
+				return (has('ARRIVAL') ? '📨' : '📅') + (desc ? '⬇' : '⬆');
+			},
 
-		this.hasCheckedOrSelectedLines = MessagelistUserStore.hasCheckedOrSelected,
+			downloadAsZipAllowed: () => this.attachmentsActions.includes('zip')
+		});
 
 		this.selector = new Selector(
 			MessagelistUserStore,
 			MessagelistUserStore.selectedMessage,
 			MessagelistUserStore.focusedMessage,
-			'.messageListItem .actionHandle',
-			'.messageListItem .checkboxMessage',
-			'.messageListItem.focused'
+			'.messageListItem',
+			'.messageListItem .messageCheckbox'
 		);
 
 		this.selector.on('ItemSelect', message => {
 			if (message) {
-				MessageUserStore.message(MessageModel.fromMessageListItem(message));
-				populateMessageBody(MessageUserStore.message());
+//				setMessage(message.clone());
+				setMessage(message);
 			} else {
 				MessageUserStore.message(null);
 			}
@@ -213,11 +250,43 @@ export class MailMessageList extends AbstractViewRight {
 
 		this.selector.on('MiddleClick', message => populateMessageBody(message, true));
 
-		this.selector.on('ItemGetUid', message => (message ? message.generateUid() : ''));
+		this.selector.on('ItemGetUid', message => (message ? message.folder + '/' + message.uid : ''));
 
-		this.selector.on('AutoSelect', () => this.useAutoSelect());
+		this.selector.on('canSelect', () => MessagelistUserStore.canSelect());
 
-		this.selector.on('UpOrDown', v => this.goToUpOrDown(v));
+		this.selector.on('click', (event, currentMessage) => {
+			const el = event.target;
+			if (el.closest('.flagParent')) {
+				if (currentMessage) {
+					const checked = MessagelistUserStore.listCheckedOrSelected();
+					listAction(
+						currentMessage.folder,
+						currentMessage.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
+						checked.find(message => message.uid == currentMessage.uid) ? checked : [currentMessage]
+					);
+				}
+			} else if (el.closest('.threads-len')) {
+				this.gotoThread(currentMessage);
+			} else {
+				return 1;
+			}
+		});
+
+		this.selector.on('UpOrDown', up => {
+			if (!MessagelistUserStore.hasChecked()) {
+				up = up ? -1 : 1;
+				const page = MessagelistUserStore.page() + up;
+				if (page > 0 && page <= MessagelistUserStore.pageCount()) {
+					if (SettingsUserStore.usePreviewPane() || MessageUserStore.message()) {
+						this.selector.iSelectNextHelper = up;
+					} else {
+						this.selector.iFocusedNextHelper = up;
+					}
+					this.selector.unselect();
+					this.gotoPage(page);
+				}
+			}
+		});
 
 		addEventListener('mailbox.message-list.selector.go-down',
 			e => this.selector.newSelectPosition('ArrowDown', false, e.detail)
@@ -228,28 +297,27 @@ export class MailMessageList extends AbstractViewRight {
 		);
 
 		addEventListener('mailbox.message.show', e => {
-			const sFolder = e.detail.Folder, iUid = e.detail.Uid;
+			const sFolder = e.detail.folder, iUid = e.detail.uid;
 
 			const message = MessagelistUserStore.find(
-				item => item && sFolder === item.folder && iUid == item.uid
+				item => sFolder === item?.folder && iUid == item?.uid
 			);
 
-			if ('INBOX' === sFolder) {
+			if ('INBOX' === sFolder && 'INBOX' !== FolderUserStore.currentFolderFullName()) {
 				hasher.setHash(mailBox(sFolder));
 			}
 
 			if (message) {
 				this.selector.selectMessageItem(message);
 			} else {
-				if ('INBOX' !== sFolder) {
+				if ('INBOX' !== sFolder && sFolder !== FolderUserStore.currentFolderFullName()) {
 					hasher.setHash(mailBox(sFolder));
 				}
 				if (sFolder && iUid) {
-					MessageUserStore.message(MessageModel.fromMessageListItem(null));
-					MessageUserStore.message().folder = sFolder;
-					MessageUserStore.message().uid = iUid;
-
-					populateMessageBody(MessageUserStore.message());
+					let message = new MessageModel;
+					message.folder = sFolder;
+					message.uid = iUid;
+					setMessage(message);
 				} else {
 					MessageUserStore.message(null);
 				}
@@ -261,14 +329,17 @@ export class MailMessageList extends AbstractViewRight {
 		).throttle(50));
 
 		decorateKoCommands(this, {
-			multyForwardCommand: canBeMovedHelper,
+			downloadAttachCommand: canBeMovedHelper,
+			downloadZipCommand: canBeMovedHelper,
+			forwardCommand: canBeMovedHelper,
 			deleteWithoutMoveCommand: canBeMovedHelper,
-			deleteCommand: canBeMovedHelper,
+			deleteCommand: () => MessagelistUserStore.hasCheckedOrSelectedAndUndeleted(),
+			undeleteCommand: () => MessagelistUserStore.hasCheckedOrSelectedAndDeleted(),
 			archiveCommand: canBeMovedHelper,
 			spamCommand: canBeMovedHelper,
 			notSpamCommand: canBeMovedHelper,
 			moveCommand: canBeMovedHelper,
-			moveNewCommand: canBeMovedHelper,
+			copyCommand: canBeMovedHelper
 		});
 	}
 
@@ -277,145 +348,131 @@ export class MailMessageList extends AbstractViewRight {
 		this.reload();
 	}
 
+	clearListIsVisible() {
+		return (
+			!this.messageListSearchDesc()
+		 && !MessagelistUserStore.error()
+		 && !MessagelistUserStore.endThreadUid()
+		 && MessagelistUserStore().length
+		 && (MessagelistUserStore.isSpamFolder() || MessagelistUserStore.isTrashFolder())
+		 && SettingsCapa('DangerousActions')
+		);
+	}
+
 	clear() {
-		if (SettingsCapa('DangerousActions')) {
-			showScreenPopup(FolderClearPopupView, [FolderUserStore.currentFolder()]);
-		}
+		SettingsCapa('DangerousActions')
+		&& showScreenPopup(FolderClearPopupView, [FolderUserStore.currentFolder()]);
 	}
 
 	reload() {
-		if (!MessagelistUserStore.isLoading()) {
-			MessagelistUserStore.reload(false, true);
-		}
+		MessagelistUserStore.isLoading()
+		|| MessagelistUserStore.reload(false, true);
 	}
 
-	multyForwardCommand() {
+	forwardCommand() {
 		showMessageComposer([
 			ComposeType.ForwardAsAttachment,
 			MessagelistUserStore.listCheckedOrSelected()
 		]);
 	}
 
+	/**
+	 * Download selected messages
+	 */
+	downloadZipCommand() {
+		let hashes = []/*, uids = []*/;
+//		MessagelistUserStore.forEach(message => message.checked() && uids.push(message.uid));
+		MessagelistUserStore.forEach(message => message.checked() && hashes.push(message.requestHash));
+		downloadZip(null, hashes, null, null, MessagelistUserStore().folder);
+	}
+
+	/**
+	 * Download attachments of selected messages
+	 */
+	downloadAttachCommand() {
+		let hashes = [];
+		MessagelistUserStore.forEach(message => {
+			if (message.checked()) {
+				message.attachments.forEach(attachment => {
+					if (!attachment.isLinked() && attachment.download) {
+						hashes.push(attachment.download);
+					}
+				});
+			}
+		});
+		downloadZip(null, hashes);
+	}
+
 	deleteWithoutMoveCommand() {
-		if (SettingsCapa('DangerousActions')) {
-			rl.app.deleteMessagesFromFolder(
-				FolderType.Trash,
+		SettingsCapa('DangerousActions')
+		&& moveMessagesToFolderType(FolderType.Trash, true);
+	}
+
+	// User setting hideDeleted || immediatelyMoveToTrash ??
+	deleteCommand() {
+		/**
+		 * When FolderUserStore.trashFolder is set to "Do not use",
+		 * flag as \Deleted for removal by later EXPUNGE
+		 */
+		if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) {
+			listAction(
 				FolderUserStore.currentFolderFullName(),
-				MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-				false
+				MessageSetAction.SetDeleted,
+				MessagelistUserStore.listCheckedOrSelected()
 			);
+		} else {
+			moveMessagesToFolderType(FolderType.Trash);
 		}
 	}
 
-	deleteCommand() {
-		rl.app.deleteMessagesFromFolder(
-			FolderType.Trash,
+	// User setting !hideDeleted && !immediatelyMoveToTrash ??
+	undeleteCommand() {
+		listAction(
 			FolderUserStore.currentFolderFullName(),
-			MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-			true
+			MessageSetAction.UnsetDeleted,
+			MessagelistUserStore.listCheckedOrSelected()
 		);
 	}
 
 	archiveCommand() {
-		rl.app.deleteMessagesFromFolder(
-			FolderType.Archive,
-			FolderUserStore.currentFolderFullName(),
-			MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-			true
-		);
+		moveMessagesToFolderType(FolderType.Archive);
 	}
 
 	spamCommand() {
-		rl.app.deleteMessagesFromFolder(
-			FolderType.Spam,
-			FolderUserStore.currentFolderFullName(),
-			MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-			true
-		);
+		moveMessagesToFolderType(FolderType.Junk);
 	}
 
 	notSpamCommand() {
-		rl.app.deleteMessagesFromFolder(
-			FolderType.NotSpam,
-			FolderUserStore.currentFolderFullName(),
-			MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-			true
-		);
+		moveMessagesToFolderType(FolderType.Inbox);
 	}
 
-	moveCommand() {}
-
-	moveNewCommand(vm, event) {
-		if (this.newMoveToFolder && this.mobileCheckedStateShow()) {
-			if (vm && event && event.preventDefault) {
-				event.preventDefault();
-				event.stopPropagation();
+	moveOrCopy(vm, event, mode) {
+		if (canBeMovedHelper()) {
+			if (vm && event?.preventDefault) {
+				stopEvent(event);
 			}
 
-			let b = moveAction();
-			AppUserStore.focusedState(b ? Scope.MessageList : Scope.FolderList);
-			moveAction(!b);
+			let i = moveAction();
+			AppUserStore.focusedState(i ? ScopeMessageList : ScopeFolderList);
+			moveAction(i ? 0 : mode);
 		}
 	}
 
+	moveCommand(vm, event) {
+		this.moveOrCopy(vm, event, 1);
+	}
+
+	copyCommand(vm, event) {
+		this.moveOrCopy(vm, event, 2);
+	}
+
 	composeClick() {
 		showMessageComposer();
 	}
 
-	goToUpOrDown(up) {
-		if (MessagelistUserStore.listChecked().length) {
-			return false;
-		}
-
-		clearTimeout(this.iGoToUpOrDownTimeout);
-		this.iGoToUpOrDownTimeout = setTimeout(() => {
-			let prev, next, temp, current;
-
-			this.messageListPaginator().find(item => {
-				if (item) {
-					if (current) {
-						next = item;
-					}
-
-					if (item.current) {
-						current = item;
-						prev = temp;
-					}
-
-					if (next) {
-						return true;
-					}
-
-					temp = item;
-				}
-
-				return false;
-			});
-
-			if (!SettingsUserStore.usePreviewPane() && !MessageUserStore.message()) {
-				this.selector.iFocusedNextHelper = up ? -1 : 1;
-			} else {
-				this.selector.iSelectNextHelper = up ? -1 : 1;
-			}
-
-			if (up ? prev : next) {
-				this.selector.unselect();
-				this.gotoPage(up ? prev : next);
-			}
-		}, 350);
-
-		return true;
-	}
-
-	useAutoSelect() {
-		return !MessagelistUserStore.disableAutoSelect()
-			&& !/is:unseen/.test(MessagelistUserStore.mainSearch())
-			&& SettingsUserStore.usePreviewPane();
-	}
-
 	cancelSearch() {
 		MessagelistUserStore.mainSearch('');
-		this.inputMessageListSearchFocus(false);
+		this.focusSearch(false);
 	}
 
 	cancelThreadUid() {
@@ -429,36 +486,6 @@ export class MailMessageList extends AbstractViewRight {
 		);
 	}
 
-	/**
-	 * @param {string} sToFolderFullName
-	 * @param {boolean} bCopy
-	 * @returns {boolean}
-	 */
-	moveSelectedMessagesToFolder(sToFolderFullName, bCopy) {
-		if (MessagelistUserStore.hasCheckedOrSelected()) {
-			moveMessagesToFolder(
-				FolderUserStore.currentFolderFullName(),
-				MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails(),
-				sToFolderFullName,
-				bCopy
-			);
-		}
-
-		return false;
-	}
-
-	getDragData(event) {
-		const item = ko.dataFor(doc.elementFromPoint(event.clientX, event.clientY));
-		item && item.checked && item.checked(true);
-		const uids = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails();
-		item && !uids.includes(item.uid) && uids.push(item.uid);
-		return uids.length ? {
-			copy: event.ctrlKey,
-			folder: FolderUserStore.currentFolderFullName(),
-			uids: uids
-		} : null;
-	}
-
 	listSetSeen() {
 		listAction(
 			FolderUserStore.currentFolderFullName(),
@@ -487,20 +514,16 @@ export class MailMessageList extends AbstractViewRight {
 				});
 
 				if (iThreadUid) {
-					folder.messageCountUnread(Math.max(0, folder.messageCountUnread() - cnt));
+					folder.unreadEmails(Math.max(0, folder.unreadEmails() - cnt));
 				} else {
-					folder.messageCountUnread(0);
+					folder.unreadEmails(0);
 				}
 
-				MessageFlagsCache.clearFolder(sFolderFullName);
-
 				Remote.request('MessageSetSeenToAll', null, {
-					Folder: sFolderFullName,
-					SetAction: 1,
-					ThreadUids: uids.join(',')
+					folder: sFolderFullName,
+					setAction: 1,
+					threadUids: uids.join(',')
 				});
-
-				MessagelistUserStore.reloadFlagsAndCachedMessage();
 			}
 		}
 	}
@@ -529,63 +552,14 @@ export class MailMessageList extends AbstractViewRight {
 		);
 	}
 
-	flagMessages(currentMessage) {
-		const checked = MessagelistUserStore.listCheckedOrSelected();
-		if (currentMessage) {
-			const checkedUids = checked.map(message => message.uid);
-			if (checkedUids.includes(currentMessage.uid)) {
-				listAction(
-					currentMessage.folder,
-					currentMessage.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
-					checked
-				);
-			} else {
-				listAction(
-					currentMessage.folder,
-					currentMessage.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
-					[currentMessage]
-				);
-			}
-		}
-	}
-
-	flagMessagesFast(bFlag) {
-		const checked = MessagelistUserStore.listCheckedOrSelected();
-		if (checked.length) {
-			if (undefined === bFlag) {
-				const flagged = checked.filter(message => message.isFlagged());
-				listAction(
-					checked[0].folder,
-					checked.length === flagged.length ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
-					checked
-				);
-			} else {
-				listAction(
-					checked[0].folder,
-					!bFlag ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
-					checked
-				);
-			}
-		}
-	}
-
 	seenMessagesFast(seen) {
 		const checked = MessagelistUserStore.listCheckedOrSelected();
 		if (checked.length) {
-			if (undefined === seen) {
-				const unseen = checked.filter(message => message.isUnseen());
-				listAction(
-					checked[0].folder,
-					unseen.length ? MessageSetAction.SetSeen : MessageSetAction.UnsetSeen,
-					checked
-				);
-			} else {
-				listAction(
-					checked[0].folder,
-					seen ? MessageSetAction.SetSeen : MessageSetAction.UnsetSeen,
-					checked
-				);
-			}
+			listAction(
+				checked[0].folder,
+				seen ? MessageSetAction.SetSeen : MessageSetAction.UnsetSeen,
+				checked
+			);
 		}
 	}
 
@@ -593,7 +567,7 @@ export class MailMessageList extends AbstractViewRight {
 		page && hasher.setHash(
 			mailBox(
 				FolderUserStore.currentFolderFullNameHash(),
-				page.value,
+				page,
 				MessagelistUserStore.listSearch(),
 				MessagelistUserStore.threadUid()
 			)
@@ -601,7 +575,7 @@ export class MailMessageList extends AbstractViewRight {
 	}
 
 	gotoThread(message) {
-		if (message && 0 < message.threadsLen()) {
+		if (message?.threadsLen()) {
 			MessagelistUserStore.pageBeforeThread(MessagelistUserStore.page());
 
 			hasher.setHash(
@@ -620,183 +594,206 @@ export class MailMessageList extends AbstractViewRight {
 		return '';
 	}
 
-	clearListIsVisible() {
-		return (
-			!this.messageListSearchDesc() &&
-			!MessagelistUserStore.error() &&
-			!MessagelistUserStore.endThreadUid() &&
-			MessagelistUserStore().length &&
-			(this.isSpamFolder() || this.isTrashFolder())
-		);
-	}
-
 	onBuild(dom) {
-		const eqs = (ev, s) => ev.target.closestWithin(s, dom);
+		const b_content = dom.querySelector('.b-content'),
+			eqs = (ev, s) => ev.target.closestWithin(s, dom);
 
-		this.selector.init(dom.querySelector('.b-content'), Scope.MessageList);
+		setTimeout(() => {
+			// initMailboxLayoutResizer
+			const top = dom.querySelector('.messageList'),
+				fToggle = () => {
+					let layout = SettingsUserStore.usePreviewPane();
+					setLayoutResizer(top, ClientSideKeyNameMessageListSize,
+						layout ? (LayoutSideView === layout ? 'Width' : 'Height') : 0
+					);
+				};
+			if (top) {
+				fToggle();
+				addEventListener('rl-layout', fToggle);
+			}
+		}, 1);
+
+		this.selector.init(b_content, ScopeMessageList);
 
 		addEventsListeners(dom, {
 			click: event => {
-				ThemeStore.isMobile() && !eqs(event, '.toggleLeft') && leftPanelDisabled(true);
+				if (eqs(event, '.toggleLeft')) {
+					toggleLeftPanel();
+				} else {
+					ThemeStore.isMobile() && leftPanelDisabled(true);
 
-				if (eqs(event, '.messageList') && Scope.MessageView === AppUserStore.focusedState()) {
-					AppUserStore.focusedState(Scope.MessageList);
+					if (eqs(event, '.messageList') && ScopeMessageView === AppUserStore.focusedState()) {
+						AppUserStore.focusedState(ScopeMessageList);
+					}
+
+					let el = eqs(event, '.e-paginator a');
+					el && this.gotoPage(ko.dataFor(el)?.value);
+
+					eqs(event, '.checkboxCheckAll') && this.checkAll(!this.checkAll());
 				}
-
-				let el = eqs(event, '.e-paginator a');
-				el && this.gotoPage(ko.dataFor(el));
-
-				eqs(event, '.checkboxCheckAll') && this.checkAll(!this.checkAll());
-
-				el = eqs(event, '.flagParent');
-				el && this.flagMessages(ko.dataFor(el));
-
-				el = eqs(event, '.threads-len');
-				el && this.gotoThread(ko.dataFor(el));
 			},
 			dblclick: event => {
-				let  el = eqs(event, '.actionHandle');
-				el && this.gotoThread(ko.dataFor(el));
+				let msg = ko.dataFor(eqs(event, '.messageListItem'));
+				if (msg) {
+					msg.threadsLen() ? this.gotoThread(msg) : toggleFullscreen();
+				}
 			}
 		});
 
 		// initUploaderForAppend
 
-		if (Settings.app('allowAppendMessage') && this.dragOverArea()) {
-			const oJua = new Jua({
-				action: serverRequest('Append'),
-				name: 'AppendFile',
-				limit: 1,
-				hidden: {
-					Folder: () => FolderUserStore.currentFolderFullName()
-				},
-				dragAndDropElement: this.dragOverArea(),
-				dragAndDropBodyElement: this.dragOverBodyArea()
-			});
-
-			this.dragOver.subscribe(value => value && this.selector.scrollToTop());
-
-			oJua
-				.on('onDragEnter', () => this.dragOverEnter(true))
-				.on('onDragLeave', () => this.dragOverEnter(false))
-				.on('onBodyDragEnter', () => this.dragOver(true))
-				.on('onBodyDragLeave', () => this.dragOver(false))
-				.on('onSelect', (sUid, oData) => {
-					if (sUid && oData && 'message/rfc822' === oData.Type) {
-						MessagelistUserStore.loading(true);
-						return true;
+		if (Settings.app('allowAppendMessage')) {
+			const dropZone = dom.querySelector('.listDragOver'),
+				validFiles = oEvent => {
+					for (const item of oEvent.dataTransfer.items) {
+						if ('file' === item.kind && RFC822 === item.type) {
+							return true;
+						}
 					}
-
-					return false;
-				})
-				.on('onComplete', () => MessagelistUserStore.reload(true, true));
+				};
+			addEventsListeners(dropZone, {
+				dragover: oEvent => {
+					if (validFiles(oEvent)) {
+						oEvent.dataTransfer.dropEffect = 'copy';
+						oEvent.preventDefault();
+					}
+				},
+			});
+			addEventsListeners(b_content, {
+				dragenter: oEvent => {
+					if (validFiles(oEvent)) {
+						if (b_content.contains(oEvent.target)) {
+							this.dragOver(true);
+						}
+						if (oEvent.target == dropZone) {
+							oEvent.dataTransfer.dropEffect = 'copy';
+							this.dragOverEnter(true);
+						}
+					}
+				},
+				dragleave: oEvent => {
+					if (oEvent.target == dropZone) {
+						this.dragOverEnter(false);
+					}
+					let related = oEvent.relatedTarget;
+					if (!related || !b_content.contains(related)) {
+						this.dragOver(false);
+					}
+				},
+				drop: oEvent => {
+					oEvent.preventDefault();
+					if (oEvent.target == dropZone && validFiles(oEvent)) {
+						MessagelistUserStore.loading(true);
+						dropFilesInFolder(FolderUserStore.currentFolderFullName(), oEvent.dataTransfer.files);
+					}
+					this.dragOverEnter(false);
+					this.dragOver(false);
+				}
+			});
 		}
 
 		// initShortcuts
 
-		addShortcut('enter,open', '', Scope.MessageList, () => {
+		addShortcut('enter,open', '', ScopeMessageList, () => {
 			if (formFieldFocused()) {
-				MessagelistUserStore.mainSearch(this.sLastSearchValue);
+				MessagelistUserStore.mainSearch(sLastSearchValue);
 				return false;
 			}
-			if (MessageUserStore.message() && this.useAutoSelect()) {
+			if (MessageUserStore.message() && MessagelistUserStore.canSelect()) {
 				isFullscreen() || toggleFullscreen();
 				return false;
 			}
 		});
 
 		// archive (zip)
-		registerShortcut('z', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('z', '', [ScopeMessageList, ScopeMessageView], () => {
 			this.archiveCommand();
 			return false;
 		});
 
 		// delete
-		registerShortcut('delete', 'shift', Scope.MessageList, () => {
+		registerShortcut('delete', 'shift', ScopeMessageList, () => {
 			MessagelistUserStore.listCheckedOrSelected().length && this.deleteWithoutMoveCommand();
 			return false;
 		});
-//		registerShortcut('3', 'shift', Scope.MessageList, () => {
-		registerShortcut('delete', '', Scope.MessageList, () => {
+//		registerShortcut('3', 'shift', ScopeMessageList, () => {
+		registerShortcut('delete', '', ScopeMessageList, () => {
 			MessagelistUserStore.listCheckedOrSelected().length && this.deleteCommand();
 			return false;
 		});
 
 		// check mail
-		addShortcut('r', 'meta', [Scope.FolderList, Scope.MessageList, Scope.MessageView], () => {
+		addShortcut('r', 'meta', [ScopeFolderList, ScopeMessageList, ScopeMessageView], () => {
 			this.reload();
 			return false;
 		});
 
 		// check all
-		registerShortcut('a', 'meta', Scope.MessageList, () => {
+		registerShortcut('a', 'meta', ScopeMessageList, () => {
 			this.checkAll(!(this.checkAll() && !this.isIncompleteChecked()));
 			return false;
 		});
 
 		// write/compose (open compose popup)
-		registerShortcut('w,c,new', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('w,c,new', '', [ScopeMessageList, ScopeMessageView], () => {
 			showMessageComposer();
 			return false;
 		});
 
 		// important - star/flag messages
-		registerShortcut('i', '', [Scope.MessageList, Scope.MessageView], () => {
-			this.flagMessagesFast();
+		registerShortcut('i', '', [ScopeMessageList, ScopeMessageView], () => {
+			const checked = MessagelistUserStore.listCheckedOrSelected();
+			if (checked.length) {
+				listAction(
+					checked[0].folder,
+					checked.every(message => message.isFlagged()) ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
+					checked
+				);
+			}
 			return false;
 		});
 
-		registerShortcut('t', '', [Scope.MessageList], () => {
-			let message = MessagelistUserStore.selectedMessage();
-			if (!message) {
-				message = MessagelistUserStore.focusedMessage();
-			}
-
-			if (message && 0 < message.threadsLen()) {
+		registerShortcut('t', '', [ScopeMessageList], () => {
+			let message = MessagelistUserStore.selectedMessage() || MessagelistUserStore.focusedMessage();
+			if (0 < message?.threadsLen()) {
 				this.gotoThread(message);
 			}
-
 			return false;
 		});
 
 		// move
-		registerShortcut('insert', '', Scope.MessageList, () => {
-			if (this.newMoveToFolder) {
-				this.moveNewCommand();
-			} else {
-				this.moveDropdownTrigger(true);
-			}
-
+		registerShortcut('insert', '', ScopeMessageList, () => {
+			this.moveCommand();
 			return false;
 		});
 
 		// read
-		registerShortcut('q', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('q', '', [ScopeMessageList, ScopeMessageView], () => {
 			this.seenMessagesFast(true);
 			return false;
 		});
 
 		// unread
-		registerShortcut('u', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('u', '', [ScopeMessageList, ScopeMessageView], () => {
 			this.seenMessagesFast(false);
 			return false;
 		});
 
-		addShortcut('f,mailforward', 'shift', [Scope.MessageList, Scope.MessageView], () => {
-			this.multyForwardCommand();
+		registerShortcut('f,mailforward', 'shift', [ScopeMessageList, ScopeMessageView], () => {
+			this.forwardCommand();
 			return false;
 		});
 
 		if (SettingsCapa('Search')) {
 			// search input focus
-			addShortcut('/', '', [Scope.MessageList, Scope.MessageView], () => {
-				this.inputMessageListSearchFocus(true);
+			addShortcut('/', '', [ScopeMessageList, ScopeMessageView], () => {
+				this.focusSearch(true);
 				return false;
 			});
 		}
 
 		// cancel search
-		addShortcut('escape', '', Scope.MessageList, () => {
+		addShortcut('escape', '', ScopeMessageList, () => {
 			if (this.messageListSearchDesc()) {
 				this.cancelSearch();
 				return false;
@@ -807,59 +804,37 @@ export class MailMessageList extends AbstractViewRight {
 		});
 
 		// change focused state
-		addShortcut('tab', 'shift', Scope.MessageList, () => {
-			AppUserStore.focusedState(Scope.FolderList);
+		addShortcut('tab', 'shift', ScopeMessageList, () => {
+			AppUserStore.focusedState(ScopeFolderList);
 			return false;
 		});
-		addShortcut('arrowleft', '', Scope.MessageList, () => {
-			AppUserStore.focusedState(Scope.FolderList);
+		addShortcut('arrowleft', '', ScopeMessageList, () => {
+			AppUserStore.focusedState(ScopeFolderList);
 			return false;
 		});
-		addShortcut('tab,arrowright', '', Scope.MessageList, () => {
-			if (MessageUserStore.message()){
-				AppUserStore.focusedState(Scope.MessageView);
+		addShortcut('tab,arrowright', '', ScopeMessageList, () => {
+			if (MessageUserStore.message()) {
+				AppUserStore.focusedState(ScopeMessageView);
 				return false;
 			}
 		});
 
-		addShortcut('arrowleft', 'meta', Scope.MessageView, ()=>false);
-		addShortcut('arrowright', 'meta', Scope.MessageView, ()=>false);
+		addShortcut('arrowleft', 'meta', ScopeMessageView, ()=>false);
+		addShortcut('arrowright', 'meta', ScopeMessageView, ()=>false);
 
-		addShortcut('f', 'meta', Scope.MessageList, ()=>this.advancedSearchClick());
-
-		if (!ThemeStore.isMobile() && SettingsCapa('Prefetch')) {
-			ifvisible.idle(this.prefetchNextTick.bind(this));
-		}
-	}
-
-	prefetchNextTick() {
-		if (!this.bPrefetch && !ifvisible.now() && !this.viewModelDom.hidden) {
-			const message = MessagelistUserStore.find(
-				item => item && !hasRequestedMessage(item.folder, item.uid)
-			);
-			if (message) {
-				this.bPrefetch = true;
-
-				addRequestedMessage(message.folder, message.uid);
-
-				Remote.message(
-					iError => {
-						const next = !iError;
-						setTimeout(() => {
-							this.bPrefetch = false;
-							next && this.prefetchNextTick();
-						}, 1000);
-					},
-					message.folder,
-					message.uid
-				);
-			}
-		}
+		addShortcut('f', 'meta', ScopeMessageList, this.advancedSearchClick);
 	}
 
 	advancedSearchClick() {
-		SettingsCapa('SearchAdv')
-			&& showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
+		showScreenPopup(AdvancedSearchPopupView, [MessagelistUserStore.mainSearch()]);
+	}
+
+	groupSearch(group) {
+		group.search && MessagelistUserStore.mainSearch(group.search);
+	}
+
+	groupCheck(group) {
+		group.messages.forEach(message => message.checked(!message.checked()));
 	}
 
 	quotaTooltip() {
diff --git a/dev/View/User/MailBox/MessageView.js b/dev/View/User/MailBox/MessageView.js
index a3dcf3d32..9e19242f8 100644
--- a/dev/View/User/MailBox/MessageView.js
+++ b/dev/View/User/MailBox/MessageView.js
@@ -1,49 +1,43 @@
 import ko from 'ko';
-import { koComputable } from 'External/ko';
+import { addObservablesTo, addComputablesTo, addSubscribablesTo } from 'External/ko';
 
 import { UNUSED_OPTION_VALUE } from 'Common/Consts';
-
-import { Scope } from 'Common/Enums';
+import { ScopeFolderList, ScopeMessageList, ScopeMessageView } from 'Common/Enums';
 
 import {
 	ComposeType,
-	ClientSideKeyNameLastReplyAction,
 	ClientSideKeyNameMessageHeaderFullInfo,
 	ClientSideKeyNameMessageAttachmentControls,
 	FolderType,
 	MessageSetAction
 } from 'Common/EnumsUser';
-
+import { RFC822 } from 'Common/File';
 import {
 	elementById,
-	leftPanelDisabled,
 	keyScopeReal,
-	moveAction,
 	Settings,
 	SettingsCapa,
 	fireEvent,
+	stopEvent,
 	addShortcut,
-	registerShortcut
+	registerShortcut,
+	formFieldFocused
 } from 'Common/Globals';
-
+import { encodeHtml } from 'Common/Html';
 import { arrayLength } from 'Common/Utils';
-import { download, mailToHelper, showMessageComposer } from 'Common/UtilsUser';
+import { download, downloadZip, mailToHelper, showMessageComposer, moveAction } from 'Common/UtilsUser';
 import { isFullscreen, exitFullscreen, toggleFullscreen } from 'Common/Fullscreen';
 
 import { SMAudio } from 'Common/Audio';
 
 import { i18n } from 'Common/Translator';
-import { attachmentDownload } from 'Common/Links';
-
-import { MessageFlagsCache } from 'Common/Cache';
 
 import { AppUserStore } from 'Stores/User/App';
 import { SettingsUserStore } from 'Stores/User/Settings';
 import { AccountUserStore } from 'Stores/User/Account';
-import { FolderUserStore } from 'Stores/User/Folder';
+import { FolderUserStore, isAllowedKeyword } from 'Stores/User/Folder';
 import { MessageUserStore } from 'Stores/User/Message';
 import { MessagelistUserStore } from 'Stores/User/Messagelist';
-import { ThemeStore } from 'Stores/Theme';
 
 import * as Local from 'Storage/Client';
 
@@ -56,10 +50,24 @@ import { PgpUserStore } from 'Stores/User/Pgp';
 
 import { MimeToMessage } from 'Mime/Utils';
 
+import { MessageModel } from 'Model/Message';
+
+import { showScreenPopup } from 'Knoin/Knoin';
+import { OpenPgpImportPopupView } from 'View/Popup/OpenPgpImport';
+import { GnuPGUserStore } from 'Stores/User/GnuPG';
+import { OpenPGPUserStore } from 'Stores/User/OpenPGP';
+
 const
 	oMessageScrollerDom = () => elementById('messageItem') || {},
 
-	currentMessage = () => MessageUserStore.message();
+	currentMessage = MessageUserStore.message,
+
+	setAction = action => {
+		const message = currentMessage();
+		message && MessagelistUserStore.setAction(message.folder, action, [message]);
+	},
+
+	fetchRaw = url => rl.fetch(url).then(response => response.ok && response.text());
 
 export class MailMessageView extends AbstractViewRight {
 	constructor() {
@@ -73,59 +81,78 @@ export class MailMessageView extends AbstractViewRight {
 			 */
 			createCommand = (fExecute, fCanExecute) => {
 				let fResult = () => {
-						fResult.canExecute() && fExecute.call(null);
+						fCanExecute() && fExecute.call(null);
 						return false;
 					};
-				fResult.canExecute = koComputable(() => fCanExecute());
+				fResult.canExecute = fCanExecute;
 				return fResult;
 			},
 
 			createCommandReplyHelper = type =>
 				createCommand(() => this.replyOrforward(type), this.canBeRepliedOrForwarded),
 
-			createCommandActionHelper = (folderType, useFolder) =>
+			createCommandActionHelper = (folderType, bDelete) =>
 				createCommand(() => {
 					const message = currentMessage();
 					if (message) {
-						MessageUserStore.message(null);
-						rl.app.deleteMessagesFromFolder(folderType, message.folder, [message.uid], useFolder);
+						currentMessage(null);
+						rl.app.moveMessagesToFolderType(folderType, message.folder, new Set([message.uid]), bDelete);
 					}
-				}, this.messageVisibility);
+				}, this.messageVisible),
+			createCommandSetHelper = action =>
+				createCommand(() => setAction(action), this.messageVisible),
+			createCommandDeleteHelper = () =>
+				createCommand(() => {
+					/**
+					 * When FolderUserStore.trashFolder is set to "Do not use",
+					 * flag as \Deleted for removal by later EXPUNGE
+					 */
+					if (UNUSED_OPTION_VALUE === FolderUserStore.trashFolder()) {
+						setAction(MessageSetAction.SetDeleted);
+					} else {
+						const message = currentMessage();
+						if (message) {
+							currentMessage(null);
+							rl.app.moveMessagesToFolderType(FolderType.Trash, message.folder, new Set([message.uid]));
+						}
+					}
+				}, this.messageVisible);
 
-		this.addObservables({
-			showAttachmentControls: false,
+		this.msgDefaultAction = SettingsUserStore.msgDefaultAction;
+		this.simpleAttachmentsList = SettingsUserStore.simpleAttachmentsList;
+
+		addObservablesTo(this, {
+			showAttachmentControls: !!Local.get(ClientSideKeyNameMessageAttachmentControls),
 			downloadAsZipLoading: false,
-			lastReplyAction_: '',
 			showFullInfo: '1' === Local.get(ClientSideKeyNameMessageHeaderFullInfo),
-			moreDropdownTrigger: false,
-
+			// bootstrap dropdown
+			actionsMenu: null,
 			// viewer
 			viewFromShort: '',
-			viewFromDkimData: ['none', ''],
-			viewToShort: ''
+			dkimData: ['none', '', ''],
+			spfData: ['none', '', ''],
+			dmarcData: ['none', '', ''],
+			nowTracking: false
 		});
 
 		this.moveAction = moveAction;
 
-		this.allowMessageActions = SettingsCapa('MessageActions');
-
 		const attachmentsActions = Settings.app('attachmentsActions');
 		this.attachmentsActions = ko.observableArray(arrayLength(attachmentsActions) ? attachmentsActions : []);
 
-		this.message = MessageUserStore.message;
-		this.hasCheckedMessages = MessagelistUserStore.hasCheckedMessages;
+		this.hasCheckedMessages = MessagelistUserStore.hasChecked;
+		this.archiveAllowed = MessagelistUserStore.archiveAllowed;
+		this.canMarkAsSpam = MessagelistUserStore.canMarkAsSpam;
+		this.isDraftFolder = MessagelistUserStore.isDraftFolder;
+		this.isSpamFolder = MessagelistUserStore.isSpamFolder;
+
+		this.message = currentMessage;
 		this.messageLoadingThrottle = MessageUserStore.loading;
-		this.messagesBodiesDom = MessageUserStore.bodiesDom;
 		this.messageError = MessageUserStore.error;
 
 		this.fullScreenMode = isFullscreen;
 		this.toggleFullScreen = toggleFullscreen;
 
-		this.messageListOfThreadsLoading = ko.observable(false).extend({ rateLimit: 1 });
-		this.highlightUnselectedAttachments = ko.observable(false).extend({ falseTimeout: 2000 });
-
-		this.showAttachmentControlsState = v => Local.set(ClientSideKeyNameMessageAttachmentControls, !!v);
-
 		this.downloadAsZipError = ko.observable(false).extend({ falseTimeout: 7000 });
 
 		this.messageDomFocused = ko.observable(false).extend({ rateLimit: 0 });
@@ -133,77 +160,112 @@ export class MailMessageView extends AbstractViewRight {
 		// viewer
 		this.viewHash = '';
 
-		this.addComputables({
-			allowAttachmentControls: () => this.attachmentsActions.length && SettingsCapa('AttachmentsActions'),
+		addComputablesTo(this, {
+			allowAttachmentControls: () => arrayLength(attachmentsActions) && SettingsCapa('AttachmentsActions'),
 
-			downloadAsZipAllowed: () => this.attachmentsActions.includes('zip') && this.allowAttachmentControls(),
+			downloadAsZipAllowed: () => this.attachmentsActions.includes('zip')
+				&& (currentMessage()?.attachments || [])
+					.filter(item => item?.checked() && item?.download /*&& !item?.isLinked()*/)
+					.length,
 
-			lastReplyAction: {
-				read: this.lastReplyAction_,
-				write: value => this.lastReplyAction_(
-					[ComposeType.Reply, ComposeType.ReplyAll, ComposeType.Forward].includes(value)
-						? ComposeType.Reply
-						: value
-				)
-			},
+			tagsAllowed: () => FolderUserStore.currentFolder()?.tagsAllowed(),
 
-			messageVisibility: () => !MessageUserStore.loading() && !!currentMessage(),
+			messageVisible: () => !MessageUserStore.loading() && !!currentMessage(),
 
-			canBeRepliedOrForwarded: () => !this.isDraftFolder() && this.messageVisibility(),
+			tagsToHTML: () => currentMessage()?.flags().map(value =>
+					isAllowedKeyword(value)
+					? '<span class="focused msgflag-'+encodeHtml(value)+'">' + encodeHtml(i18n('MESSAGE_TAGS/'+value,0,value)) + '</span>'
+					: ''
+				).join(' '),
 
-			viewFromDkimVisibility: () => 'none' !== this.viewFromDkimData()[0],
+			askReadReceipt: () => currentMessage()?.readReceipt
+				&& !(MessagelistUserStore.isDraftFolder() || MessagelistUserStore.isSentFolder())
+				&& !currentMessage()?.flags().includes('$mdnsent')
+				&& !currentMessage()?.flags().includes('\\answered'),
 
-			viewFromDkimStatusIconClass:() => {
-				switch (this.viewFromDkimData()[0]) {
+			listAttachments: () => currentMessage()?.attachments()
+				.filter(item => SettingsUserStore.listInlineAttachments() || !item.isLinked()),
+//			hasAttachments: () => currentMessage()?.attachments()?.length,
+			hasAttachments: () => currentMessage()?.attachments()
+				.some(item => SettingsUserStore.listInlineAttachments() || !item.isLinked()),
+//			listInline: () => currentMessage()?.attachments().filter(item => item.isLinked()),
+//			hasInline: () => currentMessage()?.attachments().some(item => item.isLinked()),
+
+			canBeRepliedOrForwarded: () => !MessagelistUserStore.isDraftFolder() && this.messageVisible(),
+
+			dkimIcon: () => {
+				switch (this.dkimData()[0]) {
 					case 'none':
-						return '';
+						return '🚫︎';
 					case 'pass':
-						return 'icon-ok iconcolor-green';
+						return '✔';
 					default:
-						return 'icon-warning-alt iconcolor-red';
+						return '✖';
 				}
 			},
-
-			viewFromDkimStatusTitle:() => {
-				const status = this.viewFromDkimData();
-				if (arrayLength(status) && status[0]) {
-					return status[1] || 'DKIM: ' + status[0];
-				}
-
-				return '';
+			dkimIconClass: () => 'pass' === this.dkimData()[0] ? 'iconcolor-green' : 'iconcolor-red',
+			dkimTitle:() => {
+				const dkim = this.dkimData();
+				return dkim[0] ? dkim[2] || 'DKIM: ' + dkim[0] : '';
 			},
 
+			spfIcon: () => {
+				switch (this.spfData()[0]) {
+					case 'none':
+						return '🚫︎';
+					case 'pass':
+						return '✔';
+					default:
+						return '✖';
+				}
+			},
+			spfIconClass: () => 'pass' === this.spfData()[0] ? 'iconcolor-green' : 'iconcolor-red',
+			spfTitle:() => {
+				const spf = this.spfData();
+				return spf[0] ? spf[2] || 'SPF: ' + spf[0] : '';
+			},
+
+			dmarcIcon: () => {
+				switch (this.dmarcData()[0]) {
+					case 'none':
+						return '🚫︎';
+					case 'pass':
+						return '✔';
+					default:
+						return '✖';
+				}
+			},
+			dmarcIconClass: () => 'pass' === this.dmarcData()[0] ? 'iconcolor-green' : 'iconcolor-red',
+			dmarcTitle:() => {
+				const dmarc = this.dmarcData();
+				return dmarc[0] ? dmarc[2] || 'DMARC: ' + dmarc[0] : '';
+			},
+
+			showWhitelistOptions: () => 'match' === SettingsUserStore.viewImages(),
+
+			firstUnsubsribeLink: () => currentMessage()?.unsubsribeLinks()[0] || '',
+
 			pgpSupported: () => currentMessage() && PgpUserStore.isSupported(),
 
+			canBeUndeleted: () => currentMessage()?.isDeleted(),
+
 			messageListOrViewLoading:
 				() => MessagelistUserStore.isLoading() | MessageUserStore.loading()
 		});
 
-		this.addSubscribables({
-			showAttachmentControls: v => currentMessage()
-				&& currentMessage().attachments.forEach(item => item && item.checked(!!v)),
-
-			lastReplyAction_: value => Local.set(ClientSideKeyNameLastReplyAction, value),
-
+		addSubscribablesTo(this, {
 			message: message => {
-				MessageUserStore.activeDom(null);
-
 				if (message) {
-					this.showAttachmentControls(false);
-					if (Local.get(ClientSideKeyNameMessageAttachmentControls)) {
-						setTimeout(() => {
-							this.showAttachmentControls(true);
-						}, 50);
-					}
-
 					if (this.viewHash !== message.hash) {
 						this.scrollMessageToTop();
 					}
-
 					this.viewHash = message.hash;
-					this.viewFromShort(message.fromToLine(true, true));
-					this.viewFromDkimData(message.fromDkimData());
-					this.viewToShort(message.toToLine(true, true));
+					// TODO: make first param a user setting #683
+					this.viewFromShort(message.from.toString(false, true));
+					this.dkimData(message.dkim[0] || ['none', '', '']);
+					this.spfData(message.spf[0] || ['none', '', '']);
+					this.dmarcData(message.dmarc[0] || ['none', '', '']);
+					this.nowTracking(false);
 				} else {
 					MessagelistUserStore.selectedMessage(null);
 
@@ -216,8 +278,6 @@ export class MailMessageView extends AbstractViewRight {
 			showFullInfo: value => Local.set(ClientSideKeyNameMessageHeaderFullInfo, value ? '1' : '0')
 		});
 
-		this.lastReplyAction(Local.get(ClientSideKeyNameLastReplyAction) || ComposeType.Reply);
-
 		// commands
 		this.replyCommand = createCommandReplyHelper(ComposeType.Reply);
 		this.replyAllCommand = createCommandReplyHelper(ComposeType.ReplyAll);
@@ -225,38 +285,68 @@ export class MailMessageView extends AbstractViewRight {
 		this.forwardAsAttachmentCommand = createCommandReplyHelper(ComposeType.ForwardAsAttachment);
 		this.editAsNewCommand = createCommandReplyHelper(ComposeType.EditAsNew);
 
-		this.deleteCommand = createCommandActionHelper(FolderType.Trash, true);
-		this.deleteWithoutMoveCommand = createCommandActionHelper(FolderType.Trash, false);
-		this.archiveCommand = createCommandActionHelper(FolderType.Archive, true);
-		this.spamCommand = createCommandActionHelper(FolderType.Spam, true);
-		this.notSpamCommand = createCommandActionHelper(FolderType.NotSpam, true);
+//		this.deleteCommand = createCommandActionHelper(FolderType.Trash);
+		// User setting hideDeleted || immediatelyMoveToTrash ??
+		this.deleteCommand = createCommandDeleteHelper();
+		// User setting !hideDeleted && !immediatelyMoveToTrash ??
+		this.undeleteCommand = createCommandSetHelper(MessageSetAction.UnsetDeleted);
+		this.deleteWithoutMoveCommand = createCommandActionHelper(FolderType.Trash, true);
+		this.archiveCommand = createCommandActionHelper(FolderType.Archive);
+		this.spamCommand = createCommandActionHelper(FolderType.Junk);
+		this.notSpamCommand = createCommandActionHelper(FolderType.Inbox);
 
 		decorateKoCommands(this, {
-			messageEditCommand: self => self.messageVisibility(),
+			editCommand: self => self.messageVisible(),
+			moveCommand: self => self.messageVisible(),
+			copyCommand: self => self.messageVisible(),
 			goUpCommand: self => !self.messageListOrViewLoading(),
 			goDownCommand: self => !self.messageListOrViewLoading()
 		});
 	}
 
-	closeMessage() {
-		MessageUserStore.message(null);
+	toggleFullInfo() {
+		this.showFullInfo(!this.showFullInfo());
 	}
 
-	messageEditCommand() {
-		if (currentMessage()) {
-			showMessageComposer([ComposeType.Draft, currentMessage()]);
+	closeMessage() {
+		currentMessage(null);
+	}
+
+	editCommand() {
+		currentMessage() && showMessageComposer([ComposeType.Draft, currentMessage()]);
+	}
+
+	moveOrCopy(vm, event, mode) {
+		if (vm && event?.preventDefault) {
+			stopEvent(event);
 		}
+		this.actionsMenu().ddBtn.hide();
+		AppUserStore.focusedState(ScopeFolderList);
+		moveAction(mode);
+	}
+
+	moveCommand(vm, event) {
+		this.moveOrCopy(vm, event, 1);
+	}
+
+	copyCommand(vm, event) {
+		this.moveOrCopy(vm, event, 2);
+	}
+
+	setUnseen() {
+		setAction(MessageSetAction.UnsetSeen);
+		currentMessage(null);
 	}
 
 	goUpCommand() {
 		fireEvent('mailbox.message-list.selector.go-up',
-			SettingsUserStore.usePreviewPane() || !!currentMessage() // bForceSelect
+			!!currentMessage() // bForceSelect
 		);
 	}
 
 	goDownCommand() {
 		fireEvent('mailbox.message-list.selector.go-down',
-			SettingsUserStore.usePreviewPane() || !!currentMessage() // bForceSelect
+			!!currentMessage() // bForceSelect
 		);
 	}
 
@@ -265,30 +355,37 @@ export class MailMessageView extends AbstractViewRight {
 	 * @returns {void}
 	 */
 	replyOrforward(sType) {
-		this.lastReplyAction(sType);
 		showMessageComposer([sType, currentMessage()]);
 	}
 
 	onBuild(dom) {
 		const eqs = (ev, s) => ev.target.closestWithin(s, dom);
 		dom.addEventListener('click', event => {
-			ThemeStore.isMobile() && leftPanelDisabled(true);
-
 			let el = eqs(event, 'a');
-			if (el) {
-				return !(
-					0 === event.button &&
-					mailToHelper(el.href)
-				);
+			if (el && 0 === event.button && mailToHelper(el.href)) {
+				stopEvent(event);
+				return;
 			}
 
-			if (eqs(event, '.attachmentsPlace .attachmentIconParent')) {
-				event.stopPropagation();
+			el = eqs(event, '.attachmentsPlace .showPreview');
+			if (el) {
+				const attachment = ko.dataFor(el), url = attachment?.linkDownload();
+//				if (url && FileType.Eml === attachment.fileType) {
+				if (url && RFC822 == attachment.mimeType) {
+					stopEvent(event);
+					fetchRaw(url).then(text => {
+						const oMessage = new MessageModel();
+						MimeToMessage(text, oMessage);
+						// cleanHTML
+						oMessage.popupMessage();
+					});
+				}
+				return;
 			}
 
 			el = eqs(event, '.attachmentsPlace .showPreplay');
 			if (el) {
-				event.stopPropagation();
+				stopEvent(event);
 				const attachment = ko.dataFor(el);
 				if (attachment && SMAudio.supported) {
 					switch (true) {
@@ -304,48 +401,46 @@ export class MailMessageView extends AbstractViewRight {
 						// no default
 					}
 				}
+				return;
 			}
 
-			el = eqs(event, '.attachmentsPlace .attachmentItem .attachmentNameParent');
+			el = eqs(event, '.attachmentItem');
 			if (el) {
-				const attachment = ko.dataFor(el);
-				attachment && attachment.linkDownload() && download(attachment.linkDownload(), attachment.fileName);
+				const attachment = ko.dataFor(el), url = attachment?.linkDownload();
+				if (url) {
+					if ('application/pgp-keys' == attachment.mimeType
+					 && (OpenPGPUserStore.isSupported() || GnuPGUserStore.isSupported())) {
+						fetchRaw(url).then(text =>
+							showScreenPopup(OpenPgpImportPopupView, [text])
+						);
+					} else {
+						download(url, attachment.fileName);
+					}
+				}
 			}
 
 			if (eqs(event, '.messageItemHeader .subjectParent .flagParent')) {
-				const message = currentMessage();
-				message && MessagelistUserStore.setAction(
-					message.folder,
-					message.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag,
-					[message]
-				);
+				setAction(currentMessage()?.isFlagged() ? MessageSetAction.UnsetFlag : MessageSetAction.SetFlag);
 			}
 		});
 
-		AppUserStore.focusedState.subscribe(value => {
-			if (Scope.MessageView !== value) {
-				this.scrollMessageToTop();
-				this.scrollMessageToLeft();
-			}
-		});
-
-		keyScopeReal.subscribe(value => this.messageDomFocused(Scope.MessageView === value));
+		keyScopeReal.subscribe(value => this.messageDomFocused(ScopeMessageView === value));
 
 		// initShortcuts
 
 		// exit fullscreen, back
-		addShortcut('escape', '', Scope.MessageView, () => {
+		addShortcut('escape', '', ScopeMessageView, () => {
 			if (!this.viewModelDom.hidden && currentMessage()) {
 				const preview = SettingsUserStore.usePreviewPane();
 				if (isFullscreen()) {
 					exitFullscreen();
 					if (preview) {
-						AppUserStore.focusedState(Scope.MessageList);
+						AppUserStore.focusedState(ScopeMessageList);
 					}
 				} else if (!preview) {
-					MessageUserStore.message(null);
+					currentMessage(null);
 				} else {
-					AppUserStore.focusedState(Scope.MessageList);
+					AppUserStore.focusedState(ScopeMessageList);
 				}
 
 				return false;
@@ -353,13 +448,13 @@ export class MailMessageView extends AbstractViewRight {
 		});
 
 		// fullscreen
-		addShortcut('enter,open', '', Scope.MessageView, () => {
+		addShortcut('enter,open', '', ScopeMessageView, () => {
 			isFullscreen() || toggleFullscreen();
 			return false;
 		});
 
 		// reply
-		registerShortcut('r,mailreply', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('r,mailreply', '', [ScopeMessageList, ScopeMessageView], () => {
 			if (currentMessage()) {
 				this.replyCommand();
 				return false;
@@ -368,13 +463,13 @@ export class MailMessageView extends AbstractViewRight {
 		});
 
 		// replyAll
-		registerShortcut('a', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('a', '', [ScopeMessageList, ScopeMessageView], () => {
 			if (currentMessage()) {
 				this.replyAllCommand();
 				return false;
 			}
 		});
-		registerShortcut('mailreply', 'shift', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('mailreply', 'shift', [ScopeMessageList, ScopeMessageView], () => {
 			if (currentMessage()) {
 				this.replyAllCommand();
 				return false;
@@ -382,7 +477,7 @@ export class MailMessageView extends AbstractViewRight {
 		});
 
 		// forward
-		registerShortcut('f,mailforward', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('f,mailforward', '', [ScopeMessageList, ScopeMessageView], () => {
 			if (currentMessage()) {
 				this.forwardCommand();
 				return false;
@@ -390,146 +485,89 @@ export class MailMessageView extends AbstractViewRight {
 		});
 
 		// message information
-		registerShortcut('i', 'meta', [Scope.MessageList, Scope.MessageView], () => {
-			if (currentMessage()) {
-				this.showFullInfo(!this.showFullInfo());
-			}
+		registerShortcut('i', 'meta', [ScopeMessageList, ScopeMessageView], () => {
+			currentMessage() && this.toggleFullInfo();
 			return false;
 		});
 
 		// toggle message blockquotes
-		registerShortcut('b', '', [Scope.MessageList, Scope.MessageView], () => {
+		registerShortcut('b', '', [ScopeMessageList, ScopeMessageView], () => {
 			const message = currentMessage();
-			if (message && message.body) {
-				message.body.querySelectorAll('.rlBlockquoteSwitcher').forEach(node => node.click());
+			if (message?.body) {
+				message.body.querySelectorAll('details').forEach(node => node.open = !node.open);
 				return false;
 			}
 		});
 
-		addShortcut('arrowup,arrowleft', 'meta', [Scope.MessageList, Scope.MessageView], () => {
+		addShortcut('b', 'shift', [ScopeMessageList, ScopeMessageView], () => {
+			if (!formFieldFocused()) {
+				currentMessage()?.swapColors?.();
+				return false;
+			}
+		});
+
+		addShortcut('arrowup,arrowleft', 'meta', [ScopeMessageList, ScopeMessageView], () => {
 			this.goUpCommand();
 			return false;
 		});
 
-		addShortcut('arrowdown,arrowright', 'meta', [Scope.MessageList, Scope.MessageView], () => {
+		addShortcut('arrowdown,arrowright', 'meta', [ScopeMessageList, ScopeMessageView], () => {
 			this.goDownCommand();
 			return false;
 		});
 
-		// print
-		addShortcut('p,printscreen', 'meta', [Scope.MessageView, Scope.MessageList], () => {
-			currentMessage() && currentMessage().printMessage();
-			return false;
-		});
-
 		// delete
-		addShortcut('delete', '', Scope.MessageView, () => {
+		addShortcut('delete', '', ScopeMessageView, () => {
 			this.deleteCommand();
 			return false;
 		});
-		addShortcut('delete', 'shift', Scope.MessageView, () => {
+		addShortcut('delete', 'shift', ScopeMessageView, () => {
 			this.deleteWithoutMoveCommand();
 			return false;
 		});
 
 		// change focused state
-		addShortcut('arrowleft', '', Scope.MessageView, () => {
+		addShortcut('arrowleft', '', ScopeMessageView, () => {
 			if (!isFullscreen() && currentMessage() && SettingsUserStore.usePreviewPane()
 			 && !oMessageScrollerDom().scrollLeft) {
-				AppUserStore.focusedState(Scope.MessageList);
+				AppUserStore.focusedState(ScopeMessageList);
 				return false;
 			}
 		});
-		addShortcut('tab', 'shift', Scope.MessageView, () => {
+		addShortcut('tab', 'shift', ScopeMessageView, () => {
 			if (!isFullscreen() && currentMessage() && SettingsUserStore.usePreviewPane()) {
-				AppUserStore.focusedState(Scope.MessageList);
+				AppUserStore.focusedState(ScopeMessageList);
 			}
 			return false;
 		});
-	}
 
-	/**
-	 * @returns {boolean}
-	 */
-	isDraftFolder() {
-		return currentMessage() && FolderUserStore.draftsFolder() === currentMessage().folder;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isSentFolder() {
-		return currentMessage() && FolderUserStore.sentFolder() === currentMessage().folder;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isSpamFolder() {
-		return currentMessage() && FolderUserStore.spamFolder() === currentMessage().folder;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isSpamDisabled() {
-		return currentMessage() && FolderUserStore.spamFolder() === UNUSED_OPTION_VALUE;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isArchiveFolder() {
-		return currentMessage() && FolderUserStore.archiveFolder() === currentMessage().folder;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isArchiveDisabled() {
-		return currentMessage() && FolderUserStore.archiveFolder() === UNUSED_OPTION_VALUE;
-	}
-
-	/**
-	 * @returns {boolean}
-	 */
-	isDraftOrSentFolder() {
-		return this.isDraftFolder() || this.isSentFolder();
-	}
-
-	composeClick() {
-		showMessageComposer();
+		MessageUserStore.bodiesDom(dom.querySelector('.bodyText'));
 	}
 
 	scrollMessageToTop() {
-		oMessageScrollerDom().scrollTop = (50 < oMessageScrollerDom().scrollTop) ? 50 : 0;
+		oMessageScrollerDom().scrollTop = 0;
 	}
 
 	scrollMessageToLeft() {
 		oMessageScrollerDom().scrollLeft = 0;
 	}
 
+	toggleAttachmentControls() {
+		const b = !this.showAttachmentControls();
+		this.showAttachmentControls(b);
+		Local.set(ClientSideKeyNameMessageAttachmentControls, b);
+	}
+
 	downloadAsZip() {
-		const hashes = (currentMessage() ? currentMessage().attachments : [])
-			.map(item => (item && !item.isLinked() && item.checked() ? item.download : ''))
+		const hashes = (currentMessage()?.attachments || [])
+			.map(item => item?.checked() /*&& !item?.isLinked()*/ ? item.download : '')
 			.filter(v => v);
-		if (hashes.length) {
-			Remote.post('AttachmentsActions', this.downloadAsZipLoading, {
-				Do: 'Zip',
-				Hashes: hashes
-			})
-			.then(result => {
-				let hash = result && result.Result && result.Result.FileHash;
-				if (hash) {
-					download(attachmentDownload(hash), hash+'.zip');
-				} else {
-					this.downloadAsZipError(true);
-				}
-			})
-			.catch(() => this.downloadAsZipError(true));
-		} else {
-			this.highlightUnselectedAttachments(true);
-		}
+		downloadZip(
+			currentMessage().subject(),
+			hashes,
+			() => this.downloadAsZipError(true),
+			this.downloadAsZipLoading
+		);
 	}
 
 	/**
@@ -540,11 +578,34 @@ export class MailMessageView extends AbstractViewRight {
 		currentMessage().showExternalImages();
 	}
 
+	showTracking() {
+		const msg = currentMessage(), body = msg?.body;
+		if (body && msg.hasTracking()) {
+			let attr = 'data-x-href-tracking';
+			body.querySelectorAll('a['+attr+']').forEach(node => node.href = node.getAttribute(attr));
+//			attr = 'data-x-src-tracking';
+//			body.querySelectorAll('img['+attr+']').forEach(node => node.src = node.getAttribute(attr));
+			this.nowTracking(true);
+		}
+	}
+
+	whitelistText(txt) {
+		let value = (SettingsUserStore.viewImagesWhitelist().trim() + '\n' + txt).trim();
+/*
+		if ('pass' === currentMessage().spf[0]?.[0]) value += '+spf';
+		if ('pass' === currentMessage().dkim[0]?.[0]) value += '+dkim';
+		if ('pass' === currentMessage().dmarc[0]?.[0]) value += '+dmarc';
+*/
+		SettingsUserStore.viewImagesWhitelist(value);
+		Remote.saveSetting('ViewImagesWhitelist', value);
+		currentMessage().showExternalImages(1);
+	}
+
 	/**
 	 * @returns {string}
 	 */
 	printableCheckedMessageCount() {
-		const cnt = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails().length;
+		const cnt = MessagelistUserStore.listCheckedOrSelectedUidsWithSubMails().size;
 		return 0 < cnt ? (100 > cnt ? cnt : '99+') : '';
 	}
 
@@ -553,69 +614,47 @@ export class MailMessageView extends AbstractViewRight {
 	 * @returns {void}
 	 */
 	readReceipt() {
-		let oMessage = currentMessage()
-		if (oMessage.readReceipt()) {
-			Remote.request('SendReadReceiptMessage', null, {
-				MessageFolder: oMessage.folder,
-				MessageUid: oMessage.uid,
-				ReadReceipt: oMessage.readReceipt(),
-				Subject: i18n('READ_RECEIPT/SUBJECT', { SUBJECT: oMessage.subject() }),
-				Text: i18n('READ_RECEIPT/BODY', { 'READ-RECEIPT': AccountUserStore.email() })
-			});
-
+		let oMessage = currentMessage();
+		if (oMessage.readReceipt) {
 			oMessage.flags.push('$mdnsent');
-//			oMessage.flags.valueHasMutated();
+			Remote.request('SendReadReceiptMessage',
+				iError => iError && oMessage.flags.remove('$mdnsent'),
+				{
+					messageFolder: oMessage.folder,
+					messageUid: oMessage.uid,
+					readReceipt: oMessage.readReceipt,
+					subject: i18n('READ_RECEIPT/SUBJECT', { SUBJECT: oMessage.subject() }),
+					plain: i18n('READ_RECEIPT/BODY', { 'READ-RECEIPT': AccountUserStore.email() })
+				}
+			);
+		}
+	}
 
-			MessageFlagsCache.store(oMessage);
-
-			MessagelistUserStore.reloadFlagsAndCachedMessage();
+	newTag() {
+		let message = currentMessage();
+		if (message) {
+			let keyword = prompt(i18n('MESSAGE/NEW_TAG'), '')?.replace(/[\s\\]+/g, '');
+			if (keyword.length && isAllowedKeyword(keyword)) {
+				message.toggleTag(keyword);
+				FolderUserStore.currentFolder().permanentFlags.push(keyword);
+			}
 		}
 	}
 
 	pgpDecrypt() {
-		const oMessage = currentMessage();
-		PgpUserStore.decrypt(oMessage).then(result => {
-			if (result) {
-				oMessage.pgpDecrypted(true);
-				if (result.data) {
-					MimeToMessage(result.data, oMessage);
-					oMessage.html() ? oMessage.viewHtml() : oMessage.viewPlain();
-					if (result.signatures && result.signatures.length) {
-						oMessage.pgpSigned(true);
-						oMessage.pgpVerified({
-							signatures: result.signatures,
-							success: !!result.signatures.length
-						});
-					}
-				}
-			}
-		});
+		currentMessage().decrypt();
 	}
 
 	pgpVerify(/*self, event*/) {
-		const oMessage = currentMessage()/*, ctrl = event.target.closest('.openpgp-control')*/;
-		PgpUserStore.verify(oMessage).then(result => {
-			if (result) {
-				oMessage.pgpVerified(result);
-			}
-/*
-			if (result && result.success) {
-				i18n('OPENPGP/GOOD_SIGNATURE', {
-					USER: validKey.user + ' (' + validKey.id + ')'
-				});
-				message.getText()
-			} else {
-				const keyIds = arrayLength(signingKeyIds) ? signingKeyIds : null,
-					additional = keyIds
-						? keyIds.map(item => (item && item.toHex ? item.toHex() : null)).filter(v => v).join(', ')
-						: '';
+		currentMessage().pgpVerify();
+	}
 
-				i18n('OPENPGP/ERROR', {
-					ERROR: 'message'
-				}) + (additional ? ' (' + additional + ')' : '');
-			}
-*/
-		});
+	async smimeDecrypt() {
+		currentMessage().decrypt();
+	}
+
+	smimeVerify(/*self, event*/) {
+		currentMessage().smimeVerify();
 	}
 
 }
diff --git a/dev/View/User/Settings/Menu.js b/dev/View/User/Settings/Menu.js
index 8726f3377..a0ef39e6a 100644
--- a/dev/View/User/Settings/Menu.js
+++ b/dev/View/User/Settings/Menu.js
@@ -1,6 +1,6 @@
-import { settings, mailbox } from 'Common/Links';
+import { settings } from 'Common/Links';
+import { mailbox } from 'Common/Links';
 import { getFolderInboxName } from 'Common/Cache';
-
 import { AbstractViewLeft } from 'Knoin/AbstractViews';
 
 export class SettingsMenuUserView extends AbstractViewLeft {
@@ -17,7 +17,7 @@ export class SettingsMenuUserView extends AbstractViewLeft {
 		return settings(route);
 	}
 
-	backToMailBoxClick() {
+	backToInbox() {
 		hasher.setHash(mailbox(getFolderInboxName()));
 	}
 }
diff --git a/dev/View/User/Settings/Pane.js b/dev/View/User/Settings/Pane.js
index 13deb056f..049e444b4 100644
--- a/dev/View/User/Settings/Pane.js
+++ b/dev/View/User/Settings/Pane.js
@@ -1,6 +1,4 @@
-import { mailbox } from 'Common/Links';
-import { getFolderInboxName } from 'Common/Cache';
-import { leftPanelDisabled } from 'Common/Globals';
+import { leftPanelDisabled, toggleLeftPanel } from 'Common/Globals';
 
 import { MessageUserStore } from 'Stores/User/Message';
 import { ThemeStore } from 'Stores/Theme';
@@ -10,9 +8,6 @@ import { AbstractViewRight } from 'Knoin/AbstractViews';
 export class SettingsPaneUserView extends AbstractViewRight {
 	constructor() {
 		super();
-
-		this.isMobile = ThemeStore.isMobile;
-		this.leftPanelDisabled = leftPanelDisabled;
 	}
 
 	onShow() {
@@ -20,12 +15,12 @@ export class SettingsPaneUserView extends AbstractViewRight {
 	}
 
 	onBuild(dom) {
-		dom.addEventListener('click', () =>
-			ThemeStore.isMobile() && !event.target.closestWithin('.toggleLeft', dom) && leftPanelDisabled(true)
-		);
-	}
-
-	backToMailBoxClick() {
-		hasher.setHash(mailbox(getFolderInboxName()));
+		dom.addEventListener('click', () => {
+			if (event.target.closestWithin('.toggleLeft', dom)) {
+				toggleLeftPanel();
+			} else {
+				ThemeStore.isMobile() && leftPanelDisabled(true);
+			}
+		});
 	}
 }
diff --git a/dev/View/User/SystemDropDown.js b/dev/View/User/SystemDropDown.js
index b56eefc53..34a7880a6 100644
--- a/dev/View/User/SystemDropDown.js
+++ b/dev/View/User/SystemDropDown.js
@@ -2,7 +2,7 @@ import { AppUserStore } from 'Stores/User/App';
 import { AccountUserStore } from 'Stores/User/Account';
 //import { FolderUserStore } from 'Stores/User/Folder';
 
-import { Scope } from 'Common/Enums';
+import { ScopeMessageList, ScopeMessageView, ScopeSettings } from 'Common/Enums';
 import { settings } from 'Common/Links';
 
 import { showScreenPopup } from 'Knoin/Knoin';
@@ -12,14 +12,12 @@ import { KeyboardShortcutsHelpPopupView } from 'View/Popup/KeyboardShortcutsHelp
 import { AccountPopupView } from 'View/Popup/Account';
 import { ContactsPopupView } from 'View/Popup/Contacts';
 
-import { doc, leftPanelDisabled, fireEvent, SettingsCapa, registerShortcut } from 'Common/Globals';
-
-import { ThemeStore } from 'Stores/Theme';
+import { fireEvent, stopEvent, SettingsCapa, registerShortcut } from 'Common/Globals';
 
 import Remote from 'Remote/User/Fetch';
 import { getNotification } from 'Common/Translator';
-//import { clearCache } from 'Common/Cache';
 //import { koComputable } from 'External/ko';
+import { addObservablesTo } from 'External/ko';
 
 export class SystemDropDownUserView extends AbstractViewRight {
 	constructor() {
@@ -29,16 +27,17 @@ export class SystemDropDownUserView extends AbstractViewRight {
 
 		this.accountEmail = AccountUserStore.email;
 
-		this.accounts = AccountUserStore.accounts;
+		this.accounts = AccountUserStore;
 		this.accountsLoading = AccountUserStore.loading;
 /*
 		this.accountsUnreadCount = : koComputable(() => 0);
-		this.accountsUnreadCount = : koComputable(() => AccountUserStore.accounts().reduce((result, item) => result + item.count(), 0));
+		this.accountsUnreadCount = : koComputable(() => AccountUserStore().reduce((result, item) => result + item.count(), 0));
 */
 
-		this.addObservables({
+		addObservablesTo(this, {
 			currentAudio: '',
-			accountMenuDropdownTrigger: false
+			// bootstrap dropdown
+			accountMenu: null
 		});
 
 		this.allowContacts = AppUserStore.allowContacts();
@@ -52,26 +51,23 @@ export class SystemDropDownUserView extends AbstractViewRight {
 	}
 
 	accountClick(account, event) {
-		let email = account && account.email;
+		let email = account?.email;
 		if (email && 0 === event.button && AccountUserStore.email() != email) {
 			AccountUserStore.loading(true);
-			event.preventDefault();
-			event.stopPropagation();
+			stopEvent(event);
 			Remote.request('AccountSwitch',
 				(iError/*, oData*/) => {
 					if (iError) {
 						AccountUserStore.loading(false);
-						alert(getNotification(iError).replace('%EMAIL%', email));
+						alert('Account error: ' + getNotification(iError).replace('%EMAIL%', email));
 						if (account.isAdditional()) {
 							showScreenPopup(AccountPopupView, [account]);
 						}
 					} else {
 /*						// Not working yet
 						forEachObjectEntry(oData.Result, (key, value) => rl.settings.set(key, value));
-						clearCache();
-//						MessageUserStore.setMessage();
-//						MessageUserStore.purgeMessageBodyCache();
-//						MessageUserStore.hideMessageBodies();
+//						MessageUserStore.message();
+//						MessageUserStore.purgeCache();
 						MessagelistUserStore([]);
 //						FolderUserStore.folderList([]);
 						loadFolders(value => {
@@ -90,8 +86,9 @@ export class SystemDropDownUserView extends AbstractViewRight {
 		return true;
 	}
 
-	emailTitle() {
-		return AccountUserStore.email();
+	accountName() {
+		const email = AccountUserStore.email();
+		return AccountUserStore.find(account => account.email == email)?.label() || IDN.toUnicode(email);
 	}
 
 	settingsClick() {
@@ -110,29 +107,21 @@ export class SystemDropDownUserView extends AbstractViewRight {
 		this.allowContacts && showScreenPopup(ContactsPopupView);
 	}
 
-	toggleLayout()
-	{
-		const mobile = !ThemeStore.isMobile();
-		doc.cookie = 'rllayout=' + (mobile ? 'mobile' : 'desktop') + '; samesite=strict';
-		ThemeStore.isMobile(mobile);
-		leftPanelDisabled(mobile);
-	}
-
 	logoutClick() {
 		rl.app.logout();
 	}
 
 	onBuild() {
-		registerShortcut('m', '', [Scope.MessageList, Scope.MessageView, Scope.Settings], () => {
+		registerShortcut('m', '', [ScopeMessageList, ScopeMessageView, ScopeSettings], () => {
 			if (!this.viewModelDom.hidden) {
 //				exitFullscreen();
-				this.accountMenuDropdownTrigger(true);
+				this.accountMenu().ddBtn.toggle();
 				return false;
 			}
 		});
 
 		// shortcuts help
-		registerShortcut('?,f1,help', '', [Scope.MessageList, Scope.MessageView, Scope.Settings], () => {
+		registerShortcut('?,f1,help', '', [ScopeMessageList, ScopeMessageView, ScopeSettings], () => {
 			if (!this.viewModelDom.hidden) {
 				showScreenPopup(KeyboardShortcutsHelpPopupView);
 				return false;
diff --git a/dev/boot.js b/dev/boot.js
index 43f777d3f..f8c9ac381 100644
--- a/dev/boot.js
+++ b/dev/boot.js
@@ -1,75 +1,164 @@
 (doc => {
 
-[].flat || doc.location.replace('./?/BadBrowser');
-navigator.cookieEnabled || doc.location.replace('./?/NoCookie');
-
 const
+	qUri = path => doc.location.pathname.replace(/\/+$/,'') + '/?/' + path,
 	eId = id => doc.getElementById('rl-'+id),
-	app = eId('app'),
-	admin = app && '1' == app.dataset.admin,
-	layout = doc.cookie.match(/(^|;) ?rllayout=([^;]+)/) || '',
+	admin = '1' == eId('app').dataset.admin,
+	mimeJSON = 'application/json',
 
-	loadScript = src => {
-		if (!src) {
-			throw new Error('src should not be empty.');
-		}
-		return new Promise((resolve, reject) => {
+	toggle = div => {
+		eId('loading').hidden = true;
+		div.hidden = false;
+	},
+	showError = msg => {
+		let div = eId('loading-error');
+		div.append(msg);
+		toggle(div);
+	},
+
+	loadScript = src => src ? new Promise((resolve, reject) => {
 			const script = doc.createElement('script');
 			script.onload = () => resolve();
-			script.onerror = () => reject(new Error('Failed loading ' + src));
+			script.onerror = () => reject('Failed loading ' + src);
 			script.src = src;
 //			script.async = true;
 			doc.head.append(script);
-		});
-	};
+		}) : Promise.reject('src is empty');
+
+try {
+	let smctoken = doc.cookie.match(/(^|;) ?smctoken=([^;]+)/);
+	smctoken = smctoken ? smctoken[2] : localStorage.getItem('smctoken');
+	if (!smctoken) {
+		let data = new Uint8Array(16);
+		crypto.getRandomValues(data);
+		smctoken = encodeURIComponent(btoa(String.fromCharCode(...data)));
+	}
+	localStorage.setItem('smctoken', smctoken);
+	doc.cookie = 'smctoken='+smctoken+";path=/;samesite=strict";
+} catch (e) {
+	console.error(e);
+}
 
 let RL_APP_DATA = {};
 
-doc.documentElement.classList.toggle('rl-mobile', 'mobile' === layout[2] || (!layout && 1000 > innerWidth));
-
 window.rl = {
 	adminArea: () => admin,
+
 	settings: {
 		get: name => RL_APP_DATA[name],
 		set: (name, value) => RL_APP_DATA[name] = value,
-		app: name => RL_APP_DATA.System[name],
-		capa: name => name && !!(RL_APP_DATA.Capa || {})[name]
+		app: name => RL_APP_DATA.System[name]
 	},
-	setWindowTitle: title =>
-		doc.title = RL_APP_DATA.Title ? (title ? title + ' - ' : '') + RL_APP_DATA.Title : (title ? '' + title : ''),
 
-	initData: appData => {
-		RL_APP_DATA = appData;
-		const url = appData.StaticLibsJs,
-			cb = () => rl.app.bootstart(),
-			div = eId('loading-error'),
-			showError = msg => {
-				div.append(' ' + msg);
-				eId('loading').hidden = true;
-				div.hidden = false;
-			};
-		loadScript(url)
-			.then(() => loadScript(url.replace('/libs.', `/${admin?'admin':'app'}.`)))
-			.then(() => appData.PluginsLink ? loadScript(appData.PluginsLink) : Promise.resolve())
-			.then(() => rl.app.bootstart
-					? cb()
-					: doc.addEventListener('readystatechange', () => 'complete' == doc.readyState && cb())
-			)
-			.catch(e => {
-				showError(e.message);
-				throw e;
-			});
-	},
+	setTitle: title =>
+		doc.title = (title || '') + (RL_APP_DATA.title ? (title ? ' - ' : '') + RL_APP_DATA.title : ''),
 
 	setData: appData => {
 		RL_APP_DATA = appData;
 		rl.app.refresh();
 	},
 
-	loadScript: loadScript
+	loadScript: loadScript,
+
+	fetch: (resource, init, postData) => {
+		init = Object.assign({
+			mode: 'same-origin',
+			cache: 'no-cache',
+			redirect: 'error',
+			referrerPolicy: 'no-referrer',
+			credentials: 'same-origin',
+			headers: {}
+		}, init);
+		let asJSON = 1,
+			XToken = (RL_APP_DATA.System || {}).token,
+			object = {};
+		if (postData) {
+			init.method = 'POST';
+			if (postData instanceof FormData) {
+				postData.forEach((value, key) => {
+					if (value instanceof File) {
+						asJSON = 0;
+					} else if (!Reflect.has(object, key)) {
+						object[key] = value;
+					} else {
+						Array.isArray(object[key]) || (object[key] = [object[key]]);
+						object[key].push(value);
+					}
+				});
+				if (asJSON) {
+					postData = object;
+//					postData.XToken = XToken;
+				} else {
+					XToken && postData.set('XToken', XToken);
+				}
+			}
+			if (asJSON) {
+				init.headers['Content-Type'] = mimeJSON;
+				postData = JSON.stringify(postData);
+			}
+			init.body = postData;
+		}
+		XToken && (init.headers['X-SM-Token'] = XToken);
+//		init.headers = new Headers(init.headers);
+		return fetch(resource, init);
+	},
+
+	fetchJSON: (resource, init, postData) => {
+		init = Object.assign({ headers: {} }, init);
+		init.headers.Accept = mimeJSON;
+		return rl.fetch(resource, init, postData).then(response => {
+			if (response.ok) {
+				const ct = response.headers.get('Content-Type');
+				if (!ct.startsWith(mimeJSON)) {
+					return Promise.reject(new Error(`Invalid Content-Type '${ct}' for url '${resource}'`));
+				}
+				/* TODO: use this for non-developers?
+				response.clone()
+				let data = response.text();
+				try {
+					return JSON.parse(data);
+				} catch (e) {
+					console.error(e);
+//					console.log(data);
+					return Promise.reject(Notifications.JsonParse);
+					return {
+						Result: false,
+						code: 952, // Notifications.JsonParse
+						message: e.message,
+						messageAdditional: data
+					}
+				}
+				*/
+				return response.json();
+			}
+			return Promise.reject(new Error('Network response error: ' + response.status));
+		});
+	}
 };
 
-loadScript(`./?/${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`)
-	.then(() => 0);
+if (!navigator.cookieEnabled) {
+	toggle(eId('NoCookie'));
+} else if (![].flat) {
+	toggle(eId('BadBrowser'));
+} else {
+	rl.fetchJSON(qUri(`${admin ? 'Admin' : ''}AppData/0/${Math.random().toString().slice(2)}/`))
+	.then(appData => {
+		RL_APP_DATA = appData;
+		const url = appData.StaticLibsJs,
+			cb = () => rl.app.bootstart();
+		loadScript(url)
+			.then(() => loadScript(url.replace('/libs.', `/${admin?'admin':'app'}.`)))
+			.then(() => appData.PluginsLink ? loadScript(qUri(appData.PluginsLink)) : Promise.resolve())
+			.then(() => rl.app
+				? cb()
+				: doc.addEventListener('readystatechange', () => 'complete' == doc.readyState && cb())
+			)
+			.catch(e => {
+				showError(e);
+				throw e;
+			});
+	})
+	.catch(e => showError(e));
+}
 
 })(document);
diff --git a/dev/bootstrap.js b/dev/bootstrap.js
index 7715858f9..dd2cd0218 100644
--- a/dev/bootstrap.js
+++ b/dev/bootstrap.js
@@ -1,6 +1,4 @@
-import { Settings } from 'Common/Globals';
 import { i18n } from 'Common/Translator';
-
 import { root } from 'Common/Links';
 
 export default App => {
@@ -25,71 +23,10 @@ export default App => {
 		},
 		reload: () => {
 			rl.route.root();
-			setTimeout(() => (Settings.app('inIframe') ? parent : window).location.reload(), 100);
+			setTimeout(() => location.reload(), 100);
 		},
 		off: () => hasher.active = false,
 		on: () => hasher.active = true
 	};
 
-	rl.fetch = (resource, init, postData) => {
-		init = Object.assign({
-			mode: 'same-origin',
-			cache: 'no-cache',
-			redirect: 'error',
-			referrerPolicy: 'no-referrer',
-			credentials: 'same-origin',
-			headers: {}
-		}, init);
-		if (postData) {
-			init.method = 'POST';
-			init.headers['Content-Type'] = 'application/x-www-form-urlencoded; charset=UTF-8';
-			const buildFormData = (formData, data, parentKey) => {
-				if (data && typeof data === 'object' && !(data instanceof Date || data instanceof File)) {
-					Object.keys(data).forEach(key =>
-						buildFormData(formData, data[key], parentKey ? `${parentKey}[${key}]` : key)
-					);
-				} else {
-					formData.set(parentKey, data == null ? '' : data);
-				}
-				return formData;
-			};
-			postData = (postData instanceof FormData)
-				? postData
-				: buildFormData(new FormData(), postData);
-			postData.set('XToken', Settings.app('token'));
-//			init.body = JSON.stringify(Object.fromEntries(postData));
-			init.body = new URLSearchParams(postData);
-		}
-
-		return fetch(resource, init);
-	};
-
-	rl.fetchJSON = (resource, init, postData) => {
-		init = Object.assign({ headers: {} }, init);
-		init.headers.Accept = 'application/json';
-		return rl.fetch(resource, init, postData).then(response => {
-			if (!response.ok) {
-				return Promise.reject('Network response error: ' + response.status);
-			}
-			/* TODO: use this for non-developers?
-			response.clone()
-			let data = response.text();
-			try {
-				return JSON.parse(data);
-			} catch (e) {
-				console.error(e);
-//				console.log(data);
-				return Promise.reject(Notification.JsonParse);
-				return {
-					Result: false,
-					ErrorCode: 952, // Notification.JsonParse
-					ErrorMessage: e.message,
-					ErrorMessageAdditional: data
-				}
-			}
-			*/
-			return response.json();
-		});
-	};
-
 };
diff --git a/dev/dragdropgecko.js b/dev/dragdropgecko.js
index e48ea3f8f..b87115cca 100644
--- a/dev/dragdropgecko.js
+++ b/dev/dragdropgecko.js
@@ -70,13 +70,13 @@
 		htmlDrag = b => doc.documentElement.classList.toggle('firefox-drag', b),
 
 		setDragImage = (src, xOffset, yOffset) => {
-			img && img.remove();
+			img?.remove();
 			if (src) {
 				// create drag image from custom element or drag source
 				img = src.cloneNode(true);
 				copyStyle(src, img);
-				img._x = xOffset == null ? src.clientWidth / 2 : xOffset;
-				img._y = yOffset == null ? src.clientHeight / 2 : yOffset;
+				img._x = xOffset ?? src.clientWidth / 2;
+				img._y = yOffset ?? src.clientHeight / 2;
 			}
 		},
 
@@ -85,7 +85,7 @@
 			if (dragSource) {
 				clearInterval(holdInterval);
 				// dispose of drag image element
-				img && img.remove();
+				img?.remove();
 				isDragging && dispatchEvent(lastTouch, 'dragend', dragSource);
 				img = dragSource = lastTouch = lastTarget = dataTransfer = holdInterval = null;
 				isDragging = allowDrop = false;
@@ -163,6 +163,17 @@
 			return false;
 		};
 
+/*
+		doc.addEventListener('pointerdown', e => {
+			doc.addEventListener('pointermove', e => {
+				e.clientX
+			});
+			doc.setPointerCapture(e.pointerId);
+		});
+		doc.addEventListener('pointerup', e => {
+			doc.releasePointerCapture(e.pointerId);
+		});
+*/
 		doc.addEventListener('touchstart', e => {
 			// clear all variables
 			reset();
diff --git a/dev/prototype.js b/dev/prototype.js
index 1ee2c9be6..f8b74e92b 100644
--- a/dev/prototype.js
+++ b/dev/prototype.js
@@ -5,90 +5,32 @@
 		return this.filter((v, i, a) => (fn ? fn(v) : v) && a.indexOf(v) === i);
 	};
 
-	Date.defineRelativeTimeFormat = config => relativeTime = config;
-
+	// full = Monday, December 12, 2022 at 12:16:21 PM Central European Standard Time
+	// long = December 12, 2022 at 12:16:21 PM GMT+1
+	// medium = Dec 12, 2022, 12:16:21 PM
+	// short = 12/12/22, 12:16 PM
 	let formats = {
+//		LT   : {timeStyle: 'short'}, // Issue in Safari
 		LT   : {hour: 'numeric', minute: 'numeric'},
-		L    : {},
-		LL   : {year: 'numeric', month: 'short', day: 'numeric'},
-		LLL  : {year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric'},
-		LLLL : {weekday: 'long', year: 'numeric', month: 'long', day: 'numeric', hour: 'numeric', minute: 'numeric'},
-		'd M': {day: '2-digit', month: 'short'}
-	},
-	phpFormats = {
-		// Day
-		d: {day: '2-digit'},
-		D: {weekday: 'short'},
-		j: {day: 'numeric'},
-		l: {weekday: 'long'},
-		z: {},
-		// Month
-		F: {month: 'long'},
-		m: {month: '2-digit'},
-		M: {month: 'short'},
-		n: {month: 'numeric'},
-		Y: {year: 'numeric'},
-		y: {year: '2-digit'},
-		// Time
-		A: {hour12: true},
-		G: {hour: 'numeric'},
-		H: {hour: '2-digit'},
-		i: {minute: '2-digit'},
-		s: {second: '2-digit'},
-		u: {fractionalSecondDigits: 3},
-		Z: {timeZone: 'UTC'}
-	},
-	relativeTime = {
-		// see /snappymail/v/0.0.0/app/localization/relativetimeformat/
-	},
-	pad2 = v => 10 > v ? '0' + v : v;
+		LLL  : {dateStyle: 'long', timeStyle: 'short'}
+	};
 
 	// Format momentjs/PHP date formats to Intl.DateTimeFormat
 	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat
-	Date.prototype.format = function (options, UTC) {
+	Date.prototype.format = function (options, UTC, hourCycle) {
 		if (typeof options == 'string') {
-			if ('Y-m-d\\TH:i:s' == options) {
-				return this.getFullYear() + '-' + pad2(1 + this.getMonth()) + '-' + pad2(this.getDate())
-					+ 'T' + pad2(this.getHours()) + ':' + pad2(this.getMinutes()) + ':' + pad2(this.getSeconds());
-			}
 			if (formats[options]) {
 				options = formats[options];
 			} else {
-				let o, s = options + (UTC?'Z':''), i = s.length;
-				console.log('Date.format('+s+')');
+				console.log('Date.format('+options+')');
 				options = {};
-				while (i--) {
-					o = phpFormats[s[i]] || phpFormats[s[i].toUpperCase()];
-					o && Object.entries(o).forEach(([k,v])=>options[k]=v);
-				}
-				formats[s] = options;
 			}
 		}
-		return new Intl.DateTimeFormat(doc.documentElement.lang, options).format(this);
-	};
-
-	// https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/RelativeTimeFormat
-	Date.prototype.fromNow = function() {
-		let unit = 'second',
-			value = Math.round((this.getTime() - Date.now()) / 1000),
-			t = [[60,'minute'],[3600,'hour'],[86400,'day'],[2628000,'month'],[31536000,'year']],
-			i = 5,
-			abs = Math.abs(value);
-		while (i--) {
-			if (t[i][0] <= abs) {
-				value = Math.round(value / t[i][0]);
-				unit = t[i][1];
-				break;
-			}
+		if (hourCycle) {
+			options.hourCycle = hourCycle;
 		}
-		if (Intl.RelativeTimeFormat) {
-			let rtf = new Intl.RelativeTimeFormat(doc.documentElement.lang);
-			return rtf.format(value, unit);
-		}
-		abs = Math.abs(value);
-		let rtf = relativeTime.long[unit][0 > value ? 'past' : 'future'],
-			plural = relativeTime.plural(abs);
-		return (rtf[plural] || rtf).replace('{0}', abs);
+		let el = doc.documentElement;
+		return this.toLocaleString(el.dataset.dateLang || el.lang, options);
 	};
 
 	Element.prototype.closestWithin = function(selector, parent) {
@@ -102,6 +44,13 @@
 		return template.content.firstChild;
 	};
 
+	/**
+	 * https://github.com/tc39/proposal-regex-escaping
+	 */
+	if (!RegExp.escape){
+		RegExp.escape = s => String(s).replace(/[\\^$*+?.()|[\]{}]/g, '\\$&');
+	}
+
 	/**
 	 * Every time the function is executed,
 	 * it will delay the execution with the given amount of milliseconds.
@@ -112,7 +61,7 @@
 			return function(...args) {
 				timer && clearTimeout(timer);
 				timer = setTimeout(()=>{
-					func.apply(this, args)
+					func.apply(this, args);
 					timer = 0;
 				}, ms);
 			};
@@ -127,12 +76,10 @@
 		Function.prototype.throttle = function(ms) {
 			let func = this, timer;
 			return function(...args) {
-				if (!timer) {
-					timer = setTimeout(()=>{
-						func.apply(this, args)
+				timer = timer || setTimeout(()=>{
+						func.apply(this, args);
 						timer = 0;
 					}, ms);
-				}
 			};
 		};
 	}
diff --git a/dev/shortcuts.js b/dev/shortcuts.js
index 794cfd2bf..d993b7300 100644
--- a/dev/shortcuts.js
+++ b/dev/shortcuts.js
@@ -56,6 +56,7 @@ const
 		setScope: value => {
 			_scope = value || 'all';
 			scope = _scopes[_scope] || {};
+			console.log('Shortcuts scope set to: ' + _scope);
 		},
 		getScope: () => _scope,
 		getMetaKey: () => 'meta' === meta ? '⌘' : 'Ctrl'
@@ -64,9 +65,8 @@ const
 	keydown = event => {
 		let key = (event.key || '').toLowerCase().replace(' ','space'),
 			modifiers = ['alt','ctrl','meta','shift'].filter(v => event[v+'Key']).join('+');
-		scope[key] && scope[key][modifiers] && scope[key][modifiers].forEach(cmd => exec(event, cmd));
-		!event.defaultPrevented && _scope !== 'all' && _scopes.all[key] && _scopes.all[key][modifiers]
-			&& _scopes.all[key][modifiers].forEach(cmd => exec(event, cmd));
+		scope[key]?.[modifiers]?.forEach(cmd => exec(event, cmd));
+		!event.defaultPrevented && _scope !== 'all' && _scopes.all[key]?.[modifiers]?.forEach(cmd => exec(event, cmd));
 	};
 
 win.shortcuts = shortcuts;
diff --git a/dev/sieve.js b/dev/sieve.js
index 238463aa0..122eb2e6c 100644
--- a/dev/sieve.js
+++ b/dev/sieve.js
@@ -17,7 +17,6 @@ import { SieveScriptPopupView } from 'Sieve/View/Script';
 window.Sieve = {
 	capa: capa,
 	scripts: scripts,
-	setError: setError,
 	loading: loading,
 	serverError: serverError,
 	serverErrorDesc: serverErrorDesc,
@@ -46,7 +45,7 @@ window.Sieve = {
 */
 					forEachObjectValue(data.Result.Scripts, value => {
 						value = SieveScriptModel.reviveFromJson(value);
-						value && scripts.push(value)
+						value && (value.allowFilters() ? scripts.unshift(value) : scripts.push(value))
 					});
 				}
 			});
@@ -56,28 +55,23 @@ window.Sieve = {
 	deleteScript: script => {
 		serverError(false);
 		Remote.request('FiltersScriptDelete',
-			(iError, data) => {
-				if (iError) {
-					setError((data && data.ErrorMessageAdditional) || getNotification(iError));
-				} else {
-					scripts.remove(script);
-				}
-			},
+			(iError, data) =>
+				iError
+					? setError(data?.messageAdditional || getNotification(iError))
+					: scripts.remove(script)
+			,
 			{name:script.name()}
 		);
 	},
 
-	toggleScript(script) {
-		let name = script.active() ? '' : script.name();
+	setActiveScript(name) {
 		serverError(false);
 		Remote.request('FiltersScriptActivate',
-			(iError, data) => {
-				if (iError) {
-					setError((data && data.ErrorMessageAdditional) || iError)
-				} else {
-					scripts.forEach(script => script.active(script.name() === name));
-				}
-			},
+			(iError, data) =>
+				iError
+					? setError(data?.messageAdditional || iError)
+					: scripts.forEach(script => script.active(script.name() === name))
+			,
 			{name:name}
 		);
 	}
diff --git a/docker-compose.yml b/docker-compose.yml
index 23d28c6ee..5011a3798 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,16 +1,55 @@
+#
+# Note: Before starting, ensure you run gulp once, to generate static assets in ./snappymail/v/0.0.0/static/css and ./snappymail/v/0.0.0/static/js
+#
 version: '3.0'
-
 services:
 
-  # Mail server running on separate image
-  mail:
-    image: tvial/docker-mailserver:latest
-    restart: always
-    domainname: example.com
+  # Generate self-signed certs
+  # See: https://docker-mailserver.github.io/docker-mailserver/latest/config/security/ssl/#self-signed-certificates
+  step-ca:
+    image: smallstep/step-ca:latest
+    working_dir: /certs
     volumes:
-      - maildata:/var/mail
-      - mailstate:/var/mail-state
-      - ./.docker/dev/mail/config/:/tmp/docker-mailserver/
+      - certs:/certs
+    entrypoint:
+      - /bin/sh
+    user: 0:0
+    command:
+      - -c
+      - |
+          set -eu
+          if [ ! -d demoCA ]; then
+              mkdir -p demoCA
+
+              step certificate create "Smallstep Root CA" "demoCA/cacert.pem" "demoCA/cakey.pem" \
+                --no-password --insecure \
+                --profile root-ca \
+                --not-before "2021-01-01T00:00:00+00:00" \
+                --not-after "2031-01-01T00:00:00+00:00" \
+                --san "example.com" \
+                --san "mail.example.com" \
+                --kty RSA --size 2048
+
+              step certificate create "Smallstep Leaf" mail.example.com-cert.pem mail.example.com-key.pem \
+                --no-password --insecure \
+                --profile leaf \
+                --ca "demoCA/cacert.pem" \
+                --ca-key "demoCA/cakey.pem" \
+                --not-before "2021-01-01T00:00:00+00:00" \
+                --not-after "2031-01-01T00:00:00+00:00" \
+                --san "example.com" \
+                --san "mail.example.com" \
+                --san "imap.example.com" \
+                --san "smtp.example.com" \
+                --kty RSA --size 2048
+          fi
+
+  # Mail server
+  # See: https://docker-mailserver.github.io/docker-mailserver/latest
+  # Add an account: echo 'test' | docker exec -i $( docker-compose ps -q docker-mailserver ) setup email add test@example.com
+  docker-mailserver:
+    image: docker.io/mailserver/docker-mailserver:12
+    domainname: mail.example.com
     environment:
       - ENABLE_SPAMASSASSIN=0
       - ENABLE_CLAMAV=0
@@ -19,14 +58,75 @@ services:
       - ENABLE_MANAGESIEVE=1
       - ONE_DIR=1
       - DMS_DEBUG=0
-    cap_add:
-      - NET_ADMIN
-      - SYS_PTRACE
+      - POSTFIX_INET_PROTOCOLS=ipv4
+      - DOVECOT_INET_PROTOCOLS=ipv4
+      - SSL_TYPE=manual
+      - SSL_CERT_PATH=/certs/mail.example.com-cert.pem
+      - SSL_KEY_PATH=/certs/mail.example.com-key.pem
+    volumes:
+      - certs:/certs
+      - dms-mail-data:/var/mail
+      - dms-mail-state:/var/mail-state
+      - dms-mail-logs:/var/log/mail
+      - dms-config:/tmp/docker-mailserver
+    networks:
+      default:
+        aliases:
+          - example.com
+          - mail.example.com
+          - imap.example.com
+          - smtp.example.com
+    depends_on:
+      step-ca:
+        condition: service_completed_successfully
+    entrypoint:
+      - /bin/sh
+    command:
+      - -c
+      - |
+          set -eu
+          echo "Trusting demoCA certificate"
+          cp -v /certs/demoCA/cacert.pem /usr/local/share/ca-certificates/cacert.crt  # Debian expects certs to end with .crt
+          update-ca-certificates
+          exec supervisord -c /etc/supervisor/supervisord.conf
+
+  # Snappymail: http://localhost:8888
+  # Admin panel: http://localhost:8888/?admin
+  # Get the Admin Panel password: docker exec -it $( docker-compose ps -q snappymail ) cat /var/lib/snappymail/_data_/_default_/admin_password.txt
+  snappymail:
+    build:
+      dockerfile: ./.docker/release/Dockerfile
+      context: .
+    # environment:
+    #   - DEBUG=true
+    volumes:
+      - certs:/certs:ro
+      - ./snappymail:/snappymail/snappymail:ro
+      - ./index.php:/snappymail/index.php:ro
+      - snappymail:/var/lib/snappymail
+    ports:
+      - 8888:8888
+    networks:
+      - default
+    depends_on:
+      step-ca:
+        condition: service_completed_successfully
+      db:
+        condition: service_started
+    entrypoint:
+      - /bin/sh
+    command:
+      - -c
+      - |
+          set -eu
+          echo "Trusting demoCA certificate"
+          cp -v /certs/demoCA/cacert.pem /usr/local/share/ca-certificates/
+          update-ca-certificates
+          exec /entrypoint.sh
 
   # MySQL database
   db:
     image: mysql:5.7
-    hostname: db
     restart: always
     environment:
       - MYSQL_ROOT_PASSWORD=root
@@ -35,36 +135,17 @@ services:
       - MYSQL_DATABASE=snappymail
     volumes:
       - mysql:/var/lib/mysql
-      
-  # PHP FPM Server
-  php:
-    build:
-      context: ./.docker/dev/php
-    depends_on:
-      - db
-      - mail
-    volumes:
-      - ./:/var/www
-      - ./.docker/dev/php/snappymail.ini:/usr/local/etc/php/conf.d/snappymail.ini
-
-  # Nginx load balancer translating to PHP FPM
-  nginx:
-    image: nginx:latest
-    hostname: nginx
-    depends_on:
-      - php
-    ports:
-      - "${HTTPS_PORT}:443"
-      - "${HTTP_PORT}:80"
-    volumes:
-      - ./:/var/www
-      - ./.docker/dev/nginx/ssl:/etc/nginx/ssl
-      - ./.docker/dev/nginx/default.conf:/etc/nginx/conf.d/default.conf
+    networks:
+      - default
 
 volumes:
+  certs:
+  dms-mail-data:
+  dms-mail-state:
+  dms-mail-logs:
+  dms-config:
+  snappymail:
   mysql:
-    driver: local
-  maildata:
-    driver: local
-  mailstate:
-    driver: local
\ No newline at end of file
+
+networks:
+  default:
diff --git a/examples/IMAP.md b/examples/IMAP.md
new file mode 100644
index 000000000..97c3e2815
--- /dev/null
+++ b/examples/IMAP.md
@@ -0,0 +1,62 @@
+
+# IMAP capability responses
+
+## GMail
+```
+IMAP[INFO]: Start connection to "ssl://imap.gmail.com:993"
+IMAP[INFO]: Connect (success)
+IMAP[DEBUG]: 0.015585899353027 (raw connection)
+IMAP[INFO]: < * OK Gimap ready for requests\r\n
+IMAP[DEBUG]: 0.025404930114746 (*)
+IMAP[INFO]: > TAG1 CAPABILITY\r\n
+IMAP[INFO]: < * CAPABILITY IMAP4rev1 UNSELECT IDLE NAMESPACE QUOTA ID XLIST CHILDREN X-GM-EXT-1 XYZZY SASL-IR AUTH=XOAUTH2 AUTH=PLAIN AUTH=PLAIN-CLIENTTOKEN AUTH=OAUTHBEARER\r\n
+IMAP[INFO]: < TAG1 OK Thats all she wrote!\r\n
+IMAP[DEBUG]: 0.0093989372253418 (TAG1)
+IMAP[INFO]: > TAG2 AUTHENTICATE PLAIN *******\r\n
+IMAP[INFO]: < * CAPABILITY IMAP4rev1 UNSELECT IDLE NAMESPACE QUOTA ID XLIST CHILDREN X-GM-EXT-1 UIDPLUS COMPRESS=DEFLATE ENABLE MOVE CONDSTORE ESEARCH UTF8=ACCEPT LIST-EXTENDED LIST-STATUS LITERAL- SPECIAL-USE APPENDLIMIT=35651584\r\n
+IMAP[INFO]: < TAG2 OK AUTHENTICATE completed.\r\n
+```
+
+## Office365
+```
+IMAP[INFO]: Start connection to "ssl://outlook.office365.com:993"
+IMAP[INFO]: Connect (success)
+IMAP[DEBUG]: 0.034216165542603 (raw connection)
+IMAP[INFO]: < * OK The Microsoft Exchange IMAP4 service is ready.\r\n
+IMAP[DEBUG]: 0.076694011688232 (*)
+IMAP[INFO]: > TAG1 CAPABILITY\r\n
+IMAP[INFO]: < * CAPABILITY IMAP4 IMAP4rev1 AUTH=PLAIN AUTH=XOAUTH2 SASL-IR UIDPLUS ID UNSELECT CHILDREN IDLE NAMESPACE LITERAL+\r\n
+IMAP[INFO]: < TAG1 OK CAPABILITY completed.\r\n
+IMAP[DEBUG]: 0.0017299652099609 (TAG1)
+IMAP[INFO]: > TAG2 AUTHENTICATE PLAIN *******\r\n
+IMAP[INFO]: < TAG2 OK AUTHENTICATE completed.\r\n
+IMAP[DEBUG]: 3.1996140480042 (TAG2)
+IMAP[INFO]: > TAG3 CAPABILITY\r\n
+IMAP[INFO]: < * CAPABILITY IMAP4 IMAP4rev1 AUTH=PLAIN AUTH=XOAUTH2 SASL-IR UIDPLUS MOVE ID UNSELECT CLIENTACCESSRULES CLIENTNETWORKPRESENCELOCATION BACKENDAUTHENTICATE CHILDREN IDLE NAMESPACE LITERAL+\r\n
+IMAP[INFO]: < TAG3 OK CAPABILITY completed.\r\n
+```
+
+## mailo
+```
+IMAP[INFO]: Start connection to "ssl://mail.mailo.com:993"
+IMAP[INFO]: Connect (success)
+IMAP[DEBUG]: 0.059124946594238 (raw connection)
+IMAP[INFO]: < * OK [CAPABILITY IMAP4rev1 ID LITERAL+ AUTH=LOGIN AUTH=PLAIN STARTTLS] IMAP4rev1 MAILO Ready\r\n
+IMAP[DEBUG]: 0.10482406616211 (*)
+IMAP[INFO]: > TAG1 AUTHENTICATE PLAIN\r\n
+IMAP[INFO]: < + \r\n
+IMAP[DEBUG]: 0.012395143508911 (TAG1)
+IMAP[INFO]: > *******\r\n
+IMAP[INFO]: < TAG1 OK [CAPABILITY IMAP4rev1 ID LITERAL+ ENABLE IDLE QUOTA NAMESPACE SORT UIDPLUS UNSELECT UTF8=ACCEPT]\r\n
+```
+
+## Dovecot
+```
+IMAP[INFO]: Start connection to "tcp://localhost:143"
+IMAP[INFO]: Connect (success)
+IMAP[DEBUG]: 0.0021297931671143 (raw connection)
+IMAP[INFO]: < * OK [CAPABILITY IMAP4rev1 SASL-IR LOGIN-REFERRALS ID ENABLE IDLE LITERAL+ STARTTLS AUTH=PLAIN AUTH=LOGIN] Dovecot ready.\r\n
+IMAP[DEBUG]: 0.013399839401245 (*)
+IMAP[INFO]: > TAG1 AUTHENTICATE PLAIN *******\r\n
+IMAP[INFO]: < TAG1 OK [CAPABILITY IMAP4rev1 SASL-IR LOGIN-REFERRALS ID ENABLE IDLE SORT SORT=DISPLAY THREAD=REFERENCES THREAD=REFS THREAD=ORDEREDSUBJECT MULTIAPPEND URL-PARTIAL CATENATE UNSELECT CHILDREN NAMESPACE UIDPLUS LIST-EXTENDED I18NLEVEL=1 CONDSTORE QRESYNC ESEARCH ESORT SEARCHRES WITHIN CONTEXT=SEARCH LIST-STATUS BINARY MOVE SNIPPET=FUZZY PREVIEW=FUZZY PREVIEW STATUS=SIZE SAVEDATE LITERAL+ NOTIFY METADATA SPECIAL-USE] Logged in\r\n
+```
diff --git a/examples/crypto/3140898548F06E97-private.asc b/examples/crypto/3140898548F06E97-private.asc
new file mode 100644
index 000000000..be99cdc8b
--- /dev/null
+++ b/examples/crypto/3140898548F06E97-private.asc
@@ -0,0 +1,106 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+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
+YXYPCv6njzAv1+fTgemAZYyomQ1qhVg=
+=a9os
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/examples/crypto/3140898548F06E97-public.asc b/examples/crypto/3140898548F06E97-public.asc
new file mode 100644
index 000000000..d6407e86a
--- /dev/null
+++ b/examples/crypto/3140898548F06E97-public.asc
@@ -0,0 +1,50 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+=0ljX
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/examples/crypto/5F3A5CDC09AD8AE3-private.asc b/examples/crypto/5F3A5CDC09AD8AE3-private.asc
new file mode 100644
index 000000000..ecdf91192
--- /dev/null
+++ b/examples/crypto/5F3A5CDC09AD8AE3-private.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+lIYEYfQDqBYJKwYBBAHaRw8BAQdAy+llquGb/U4M0kD2xyJoQ2pwlDN02C7XD906
+7I8zdB3+BwMC7y2sGFhuzTHldCm0gfdOH3H2PkmhDfM/OSTYGVEu1mKInC3xmp2F
+HmC2wUd+yM+hzMrQMgHn61iT9CHDeunUhQqG8PoXfAUAL7syGiXQ0rQZZGVtbyA8
+ZGVtb0BzbmFwcHltYWlsLmV1PoiMBBAWCgAdBQJh9AOoBAsJBwgDFQgKBBYAAgEC
+GQECGwMCHgEAIQkQXzpc3AmtiuMWIQQsIj8g6irbTLaPgdlfOlzcCa2K4/nPAP4u
+UrWr39wv+YKsNcLwHwOpljyu59iHOXA3halUbVCeJwD/dY6JXCwMDgG+BmurPcJh
+S/S8Q6fjlN9hUi/za3acYASciwRh9AOoEgorBgEEAZdVAQUBAQdAvXl+RCkqtUqN
+VQ3Fj3bFTZjZOeNlI3ibK2eN6EjlnwcDAQgH/gcDAjAzqrbZEDg05XxnZqG/vHCg
+1bJ/OofU+0oYZy6DHhAVDa5IhNLkC7kDeA8gXtQnNVuOd5kSIWvLcVRMZZval8iI
+Xfrt037sAAciOIft1uSIeAQYFggACQUCYfQDqAIbDAAhCRBfOlzcCa2K4xYhBCwi
+PyDqKttMto+B2V86XNwJrYrjolQBAMqdz8VkgMYjM7tinwUUTe4JjZoCsuhHPN6S
+pQLd/UzKAQDgRlbAdrl042/nJcdrBrQz3+wVzkaF0ehvihBf4/tfDw==
+=5A1c
+-----END PGP PRIVATE KEY BLOCK-----
diff --git a/examples/crypto/5F3A5CDC09AD8AE3-public.asc b/examples/crypto/5F3A5CDC09AD8AE3-public.asc
new file mode 100644
index 000000000..6490530e2
--- /dev/null
+++ b/examples/crypto/5F3A5CDC09AD8AE3-public.asc
@@ -0,0 +1,13 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYfQDqBYJKwYBBAHaRw8BAQdAy+llquGb/U4M0kD2xyJoQ2pwlDN02C7XD906
+7I8zdB20GWRlbW8gPGRlbW9Ac25hcHB5bWFpbC5ldT6IjAQQFgoAHQUCYfQDqAQL
+CQcIAxUICgQWAAIBAhkBAhsDAh4BACEJEF86XNwJrYrjFiEELCI/IOoq20y2j4HZ
+Xzpc3AmtiuP5zwD+LlK1q9/cL/mCrDXC8B8DqZY8rufYhzlwN4WpVG1QnicA/3WO
+iVwsDA4BvgZrqz3CYUv0vEOn45TfYVIv82t2nGAEuDgEYfQDqBIKKwYBBAGXVQEF
+AQEHQL15fkQpKrVKjVUNxY92xU2Y2TnjZSN4mytnjehI5Z8HAwEIB4h4BBgWCAAJ
+BQJh9AOoAhsMACEJEF86XNwJrYrjFiEELCI/IOoq20y2j4HZXzpc3AmtiuOiVAEA
+yp3PxWSAxiMzu2KfBRRN7gmNmgKy6Ec83pKlAt39TMoBAOBGVsB2uXTjb+clx2sG
+tDPf7BXORoXR6G+KEF/j+18P
+=fymh
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
diff --git a/examples/crypto/A0B428E12402D875-private.asc b/examples/crypto/A0B428E12402D875-private.asc
new file mode 100644
index 000000000..900820afe
--- /dev/null
+++ b/examples/crypto/A0B428E12402D875-private.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP PRIVATE KEY BLOCK-----
+
+xYYEZfCT4RYJKwYBBAHaRw8BAQdABPuO2YQhhYx3HV4l8NGfC7TAUICCXYPB
+B2YAgTIDR1j+CQMIGrTjdLMkuHvgN0hXM6160YQj51KfsJrY2uWtwTtjiJa7
+CgyvXj8krDEGrtdTWL0aGGZN+LpMbieyVPstLjycdxEMx0VwT5VOaMZX68As
+vs0vU25hcHB5TWFpbCBEZW1vMyA8ZGVtbzNAeG4tLWR1OGguc25hcHB5bWFp
+bC5ldT7CjAQQFgoAPgUCZfCT4QQLCQcICRCgtCjhJALYdQMVCAoEFgACAQIZ
+AQIbAwIeARYhBA2rP+d/WzbDEuhm0aC0KOEkAth1AAA7fwEA2spNcx/tdZz8
+yBxsTbaOzWXrPa2RnU24QWI3nKiH65IA/j2UV2O6QwoB9PVoLLhqdsP0w7HH
+msAcOY47Kt/rkqIHx4sEZfCT4RIKKwYBBAGXVQEFAQEHQB7lSl1px2GgNclu
+DDFneXLe+ZjQAY6OvK23ti0zaCsFAwEIB/4JAwiaLdYHtWW/YOCOgzSJiwKU
+4zmfRHIkkbCVyJO19Fpc4DwLx8dMKyPBQbLT0X7JI6SnR9qYPm35pJj2Cbrl
+GNk3bImoPkcLVrwkrbUo+33gwngEGBYIACoFAmXwk+EJEKC0KOEkAth1AhsM
+FiEEDas/539bNsMS6GbRoLQo4SQC2HUAAD+5APwO89z/dHpWj2GWRoLIbGsM
+0zJcy7rldxp7FD+joiMOTQD/TnMrX8vwJCG/RMKzEVY02EnTScACrCzWIoLl
+SxgrqQo=
+=SBKt
+-----END PGP PRIVATE KEY BLOCK-----
\ No newline at end of file
diff --git a/examples/crypto/A0B428E12402D875-public.asc b/examples/crypto/A0B428E12402D875-public.asc
new file mode 100644
index 000000000..80173e6d6
--- /dev/null
+++ b/examples/crypto/A0B428E12402D875-public.asc
@@ -0,0 +1,14 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+xjMEZfCT4RYJKwYBBAHaRw8BAQdABPuO2YQhhYx3HV4l8NGfC7TAUICCXYPB
+B2YAgTIDR1jNL1NuYXBweU1haWwgRGVtbzMgPGRlbW8zQHhuLS1kdThoLnNu
+YXBweW1haWwuZXU+wowEEBYKAD4FAmXwk+EECwkHCAkQoLQo4SQC2HUDFQgK
+BBYAAgECGQECGwMCHgEWIQQNqz/nf1s2wxLoZtGgtCjhJALYdQAAO38BANrK
+TXMf7XWc/MgcbE22js1l6z2tkZ1NuEFiN5yoh+uSAP49lFdjukMKAfT1aCy4
+anbD9MOxx5rAHDmOOyrf65KiB844BGXwk+ESCisGAQQBl1UBBQEBB0Ae5Upd
+acdhoDXJbgwxZ3ly3vmY0AGOjrytt7YtM2grBQMBCAfCeAQYFggAKgUCZfCT
+4QkQoLQo4SQC2HUCGwwWIQQNqz/nf1s2wxLoZtGgtCjhJALYdQAAP7kA/A7z
+3P90elaPYZZGgshsawzTMlzLuuV3GnsUP6OiIw5NAP9Ocytfy/AkIb9EwrMR
+VjTYSdNJwAKsLNYiguVLGCupCg==
+=FuIG
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/examples/crypto/smime.crt b/examples/crypto/smime.crt
new file mode 100644
index 000000000..f85d172b7
--- /dev/null
+++ b/examples/crypto/smime.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+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
+r7HREQ/4hof+B0bTZCma/l0n
+-----END CERTIFICATE-----
diff --git a/examples/crypto/smime.key b/examples/crypto/smime.key
new file mode 100644
index 000000000..2413be484
--- /dev/null
+++ b/examples/crypto/smime.key
@@ -0,0 +1,54 @@
+-----BEGIN ENCRYPTED PRIVATE KEY-----
+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
+/ZYVVu8GG0wUcrvQizogAg==
+-----END ENCRYPTED PRIVATE KEY-----
diff --git a/examples/docker/Docker.md b/examples/docker/Docker.md
new file mode 100644
index 000000000..9d5ec834f
--- /dev/null
+++ b/examples/docker/Docker.md
@@ -0,0 +1,123 @@
+# Examples
+
+Here are some [`docker-compose`] examples.
+
+## `docker-compose.simple.yml`
+
+This runs `snappymail`, using [SQLite](https://www.sqlite.org/index.html) as the database.
+
+Start the stack:
+
+```sh
+docker-compose -f docker-compose.simple.yml up
+```
+
+Get the Admin Panel password:
+
+```sh
+docker exec -it $( docker-compose -f docker-compose.simple.yml ps -q snappymail ) cat /var/lib/snappymail/_data_/_default_/admin_password.txt
+```
+
+Now, login to [http://localhost:8888/?admin](http://localhost:8888/?admin) with user `admin` and the admin password.
+
+## `docker-compose.mysql.yml`
+
+This runs `snappymail`, using [MariaDB](https://mariadb.org/) (a fork of [MYSQL](https://www.mysql.com/)) as the database.
+
+Start `snappymail` and `mysql`:
+
+```sh
+docker-compose -f docker-compose.mysql.yml up
+```
+
+Get the Admin Panel password:
+
+```sh
+docker exec -it $( docker-compose -f docker-compose.mysql.yml ps -q snappymail ) cat /var/lib/snappymail/_data_/_default_/admin_password.txt
+```
+
+Now, login to [http://localhost:8888/?admin](http://localhost:8888/?admin) with user `admin` and the admin password.
+
+To setup MySQL as the DB, in Admin Panel, click `Contacts`, check `Enable contacts` and , and under `Storage (PDO)` choose the following:
+
+- Type: `MySQL`
+- Data Source Name (DSN): `host=mysql;port=3306;dbname=snappymail`
+- User `snappymail`
+- Password `snappymail`
+
+Click the `Test` button. If it turns green, MySQL is ready to be used for contacts.
+
+To setup Redis for caching, in Admin Panel, click `Extensions`, update the following configuration options:
+
+- `Cache Redis`: `install`
+- `Cache Redis`: `enable`
+- `Cache Redis > host`: `redis`
+- `Cache Redis > port`: `6379`
+
+Redis caching is now enabled.
+
+## `docker-compose.postgres.yml`
+
+This runs `snappymail`, using [PostgreSQL](https://hub.docker.com/_/postgres) as the database.
+
+Start `snappymail` and `postgres`:
+
+```sh
+docker-compose -f docker-compose.postgres.yml up
+```
+
+Get the Admin Panel password:
+
+```sh
+docker exec -it $( docker-compose -f docker-compose.postgres.yml ps -q snappymail ) cat /var/lib/snappymail/_data_/_default_/admin_password.txt
+```
+
+Now, login to [http://localhost:8888/?admin](http://localhost:8888/?admin) with user `admin` and the admin password.
+
+To use PostgreSQL as the DB, in Admin Panel, click `Contacts`, check `Enable contacts` and , and under `Storage (PDO)` choose the following:
+
+- Type: `PostgresSQL`
+- Data Source Name (DSN): `host=db;port=5432;dbname=snappymail`
+- User `snappymail`
+- Password `snappymail`
+
+Click the `Test` button. If it turns green, PostgreSQL is ready to be used for contacts.
+
+To setup Redis for caching, in Admin Panel, click `Extensions`, update the following configuration options:
+
+- `Cache Redis`: `install`
+- `Cache Redis`: `enable`
+- `Cache Redis > host`: `redis`
+- `Cache Redis > port`: `6379`
+
+Redis caching is now enabled.
+
+## `docker-compose.traefik.yml`
+
+This runs `snappymail`, using [SQLite](https://www.sqlite.org/index.html) as the database, with `traefik` as the TLS reverse proxy and loadbalancer.
+
+In this example, it is assumed the domain name is `snappymail.example.com`. It is assumed you have an [OVHcloud](https://www.ovh.com/auth/) account to obtain LetsEncrypt TLS certs via `ACME` using DNS challenge for the domain `snappymail.example.com`. If you are using another DNS provider, see [here](https://doc.traefik.io/traefik/https/acme/#providers).
+
+To begin, edit the `OVH_*` environment variables in [`docker-compose.traefik.yml`](docker-compose.traefik.yml) accordingly:
+
+```sh
+nano docker-compose.traefik.yml
+```
+
+Start `snappymail` and `traefik`:
+
+```sh
+docker-compose -f docker-compose.traefik.yml up
+```
+
+`traefik` should now begin requesting a TLS cert for `snappymail.example.com`. The process may take a few minutes. If all goes well, https://snappymail.example.com should now be ready.
+
+> You may still visit https://snappymail.example.com while waiting for `traefik` to be issued a TLS certificate. `traefik` simply serves a self-signed TLS cert.
+
+Get the Admin Panel password:
+
+```sh
+docker exec -it $( docker-compose -f docker-compose.traefik.yml ps -q snappymail ) cat /var/lib/snappymail/_data_/_default_/admin_password.txt
+```
+
+Now, login to [https://snappymail.example.com/?admin](https://snappymail.example.com/?admin) with user `admin` and the admin password.
diff --git a/examples/docker/docker-compose.mysql.yml b/examples/docker/docker-compose.mysql.yml
new file mode 100644
index 000000000..0e9844630
--- /dev/null
+++ b/examples/docker/docker-compose.mysql.yml
@@ -0,0 +1,57 @@
+version: '2'
+services:
+  snappymail:
+    image: djmaze/snappymail:latest
+    ports:
+      - 8888:8888
+    environment:
+      - DEBUG=true
+    volumes:
+      - snappymail:/var/lib/snappymail
+    networks:
+      - default
+      - db-network
+      - redis-network
+    restart: unless-stopped
+
+  # This provides prometheus metrics for snappymail's php-fpm
+  php-fpm-exporter:
+    image: hipages/php-fpm_exporter:2.2.0
+    ports:
+      - 9253:9253
+    environment:
+      - PHP_FPM_SCRAPE_URI=tcp://snappymail:9000/status
+    networks:
+      - default
+
+  mysql:
+    image: mariadb:10
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_USER=snappymail
+      - MYSQL_PASSWORD=snappymail
+      - MYSQL_DATABASE=snappymail
+    volumes:
+      - mysql:/var/lib/mysql
+    networks:
+      - db-network
+    restart: unless-stopped
+
+  redis:
+    image: redis:7-alpine
+    networks:
+      - redis-network
+    restart: unless-stopped
+
+networks:
+  default:
+  db-network:
+    internal: true
+  redis-network:
+    internal: true
+
+volumes:
+  mysql:
+    driver: local
+  snappymail:
+    driver: local
diff --git a/examples/docker/docker-compose.postgres.yml b/examples/docker/docker-compose.postgres.yml
new file mode 100644
index 000000000..bc9d4f33b
--- /dev/null
+++ b/examples/docker/docker-compose.postgres.yml
@@ -0,0 +1,56 @@
+version: '2'
+services:
+  snappymail:
+    image: djmaze/snappymail:latest
+    ports:
+      - 8888:8888
+    environment:
+      - DEBUG=true
+    volumes:
+      - snappymail:/var/lib/snappymail
+    networks:
+      - default
+      - db-network
+      - redis-network
+    restart: unless-stopped
+
+  # This provides prometheus metrics for snappymail's php-fpm
+  php-fpm-exporter:
+    image: hipages/php-fpm_exporter:2.2.0
+    ports:
+      - 9253:9253
+    environment:
+      - PHP_FPM_SCRAPE_URI=tcp://snappymail:9000/status
+    networks:
+      - default
+
+  db:
+    image: postgres:15-alpine
+    environment:
+      - POSTGRES_USER=snappymail
+      - POSTGRES_PASSWORD=snappymail
+      - POSTGRES_DB=snappymail
+    volumes:
+      - postgres:/var/lib/postgresql/data
+    networks:
+      - db-network
+    restart: unless-stopped
+
+  redis:
+    image: redis:7-alpine
+    networks:
+      - redis-network
+    restart: unless-stopped
+
+networks:
+  default:
+  db-network:
+    internal: true
+  redis-network:
+    internal: true
+
+volumes:
+  postgres:
+    driver: local
+  snappymail:
+    driver: local
diff --git a/examples/docker/docker-compose.simple.yml b/examples/docker/docker-compose.simple.yml
new file mode 100644
index 000000000..fc112a3cc
--- /dev/null
+++ b/examples/docker/docker-compose.simple.yml
@@ -0,0 +1,30 @@
+version: '2'
+services:
+  snappymail:
+    image: djmaze/snappymail:latest
+    ports:
+      - 8888:8888
+    environment:
+      - DEBUG=true
+    volumes:
+      - snappymail:/var/lib/snappymail
+    networks:
+      - default
+    restart: unless-stopped
+
+  # This provides prometheus metrics for snappymail's php-fpm
+  php-fpm-exporter:
+    image: hipages/php-fpm_exporter:2.2.0
+    ports:
+      - 9253:9253
+    environment:
+      - PHP_FPM_SCRAPE_URI=tcp://snappymail:9000/status
+    networks:
+      - default
+
+networks:
+  default:
+
+volumes:
+  snappymail:
+    driver: local
diff --git a/examples/docker/docker-compose.traefik.yml b/examples/docker/docker-compose.traefik.yml
new file mode 100644
index 000000000..6ef69fcec
--- /dev/null
+++ b/examples/docker/docker-compose.traefik.yml
@@ -0,0 +1,86 @@
+version: '2'
+services:
+  # The reverse proxy for our web containers
+  # See https://github.com/traefik/traefik/tree/v2.7/docs/content/user-guides/docker-compose for some examples for enabling HTTPS using ACME
+  # You will need a domain name. E.g. 'example.com'
+  # This example requests TLS certs via ACME via DNS challenge using OVHcloud as the DNS provider.
+  # For a list of supported DNS providers, see: https://doc.traefik.io/traefik/https/acme/#providers
+  traefik:
+    image: traefik:v2
+    environment:
+      - OVH_ENDPOINT=xxx
+      - OVH_APPLICATION_KEY=xxx
+      - OVH_APPLICATION_SECRET=xxx
+      - OVH_CONSUMER_KEY=xxx
+    volumes:
+      # Allow traefik to listen to the Docker events
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+      - acme-volume:/letsencrypt
+    ports:
+      - 80:80
+      - 443:443
+    networks:
+      - traefik-network
+    restart: unless-stopped
+    command:
+      - --global.checknewversion=false
+      - --global.sendanonymoususage=false
+      # - --log.level=DEBUG
+      - --providers.docker=true
+      - --providers.docker.exposedbydefault=false
+      - --entrypoints.web.address=:80
+      - --entrypoints.websecure.address=:443
+      - --certificatesresolvers.myresolver.acme.dnschallenge=true
+      - --certificatesresolvers.myresolver.acme.dnschallenge.provider=ovh
+      # - --certificatesresolvers.myresolver.acme.caserver=https://acme-staging-v02.api.letsencrypt.org/directory
+      - --certificatesresolvers.myresolver.acme.email=postmaster@example.com
+      - --certificatesresolvers.myresolver.acme.storage=/letsencrypt/acme.json
+
+  # snappymail will be available at: https://snappymail.example.com
+  snappymail:
+    image: djmaze/snappymail:latest
+    labels:
+      - "traefik.enable=true"
+      - "traefik.docker.network=traefik-network"
+      # traefik v2
+      # http
+      - "traefik.http.routers.snappymail-http.entrypoints=web"
+      - "traefik.http.routers.snappymail-http.rule=Host(`snappymail.example.com`)"
+      - "traefik.http.routers.snappymail-http.middlewares=snappymail-http-myRedirectScheme" # Redirect http to https
+      - "traefik.http.middlewares.snappymail-http-myRedirectScheme.redirectScheme.scheme=https" # Redirect http to https
+      # https
+      - "traefik.http.routers.snappymail.entrypoints=websecure"
+      - "traefik.http.routers.snappymail.tls"
+      - "traefik.http.routers.snappymail.rule=Host(`snappymail.example.com`)"
+      - "traefik.http.services.snappymail.loadbalancer.server.port=8888"
+    expose:
+      - 8888
+    environment:
+      - DEBUG=true
+    volumes:
+      - snappymail:/var/lib/snappymail
+    networks:
+      - default
+      - traefik-network
+    restart: unless-stopped
+
+  # This provides prometheus metrics for snappymail's php-fpm
+  php-fpm-exporter:
+    image: hipages/php-fpm_exporter:2.2.0
+    ports:
+      - 9253:9253
+    environment:
+      - PHP_FPM_SCRAPE_URI=tcp://snappymail:9000/status
+    networks:
+      - default
+
+networks:
+  default:
+  traefik-network:
+    name: traefik-network
+
+volumes:
+  acme-volume:
+    driver: local
+  snappymail:
+    driver: local
diff --git a/examples/eml/json-ld.eml b/examples/eml/json-ld.eml
new file mode 100644
index 000000000..646201e60
--- /dev/null
+++ b/examples/eml/json-ld.eml
@@ -0,0 +1,315 @@
+Return-Path: <json-ld@example.com>
+Delivered-To: json-ld@example.com
+MIME-Version: 1.0
+Date: Mon, 05 Feb 2024 12:37:15 +0000
+Content-Type: multipart/alternative;
+ boundary="46987ad0-df2c-4cc8-8c7b-20e34b1f9bbf-1"
+From: json-ld@example.com
+Message-ID: <2cb0cdd30d1a7ec8c810710da8dc14eedaf10e7e@example.com>
+TLS-Required: No
+Subject: test json-ld
+To: json-ld@example.com
+
+--46987ad0-df2c-4cc8-8c7b-20e34b1f9bbf-1
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+test json-ld
+--46987ad0-df2c-4cc8-8c7b-20e34b1f9bbf-1
+Content-Type: text/html; charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE html><html><head><meta http-equiv=3D"Content-Type" content=3D"t=
+ext/html; charset=3Dutf-8">
+<script type=3D"application/ld+json">
+{
+	"@context": "http://schema.org",
+	"@type": "FlightReservation",
+	"reservationNumber": "RXJ34P",
+	"underName": {
+		"@type": "Person",
+		"name": "Eva Green"
+	},
+	"reservationFor": {
+		"@type": "Flight",
+		"flightNumber": "110",
+		"airline": {
+			"@type": "Airline",
+			"name": "United",
+			"iataCode": "UA"
+		},
+		"departureAirport": {
+			"@type": "Airport",
+			"name": "San Francisco Airport",
+			"iataCode": "SFO"
+		},
+		"departureTime": "2027-03-04T20:15:00-08:00",
+		"arrivalAirport": {
+			"@type": "Airport",
+			"iataCode": "JFK",
+			"name": "John F. Kennedy International Airport"
+		},
+		"arrivalTime": "2027-03-05T06:30:00-05:00"
+	}
+}
+</script>
+<script type=3D"application/ld+json">
+[
+	{
+		"@context": "http://schema.org/",
+		"@type": "Person",
+		"name": "Jane Doe",
+		"jobTitle": "Professor",
+		"telephone": "(425) 123-4567",
+		"url": "http://www.janedoe.com"
+	},
+	{
+		"@context": {
+			"ical": "http://www.w3.org/2002/12/cal/ical#",
+			"xsd": "http://www.w3.org/2001/XMLSchema#",
+			"ical:dtstart": {
+				"@type": "xsd:dateTime"
+			}
+		},
+		"ical:summary": "Lady Gaga Concert",
+		"ical:location": "New Orleans Arena, New Orleans, Louisiana, USA",
+		"ical:dtstart": "2011-04-09T20:00:00Z"
+	},
+	{
+		"@context": {
+			"name": "http://schema.org/name",
+			"description": "http://schema.org/description",
+			"image": {
+				"@id": "http://schema.org/image",
+				"@type": "@id"
+			},
+			"geo": "http://schema.org/geo",
+			"latitude": {
+				"@id": "http://schema.org/latitude",
+				"@type": "xsd:float"
+			},
+			"longitude": {
+				"@id": "http://schema.org/longitude",
+				"@type": "xsd:float"
+			},
+			"xsd": "http://www.w3.org/2001/XMLSchema#"
+		},
+		"name": "The Empire State Building",
+		"description": "The Empire State Building is a 102-story landmark in New York City.",
+		"image": "http://www.civil.usherbrooke.ca/cours/gci215a/empire-state-building.jpg",
+		"geo": {
+			"latitude": "40.75",
+			"longitude": "73.98"
+		}
+	},
+	{
+		"@context": {
+			"gr": "http://purl.org/goodrelations/v1#",
+			"pto": "http://www.productontology.org/id/",
+			"foaf": "http://xmlns.com/foaf/0.1/",
+			"xsd": "http://www.w3.org/2001/XMLSchema#",
+			"foaf:page": {
+				"@type": "@id"
+			},
+			"gr:acceptedPaymentMethods": {
+				"@type": "@id"
+			},
+			"gr:hasBusinessFunction": {
+				"@type": "@id"
+			},
+			"gr:hasCurrencyValue": {
+				"@type": "xsd:float"
+			}
+		},
+		"@id": "http://example.org/cars/for-sale#tesla",
+		"@type": "gr:Offering",
+		"gr:name": "Used Tesla Roadster",
+		"gr:description": "Need to sell fast and furiously",
+		"gr:hasBusinessFunction": "gr:Sell",
+		"gr:acceptedPaymentMethods": "gr:Cash",
+		"gr:hasPriceSpecification": {
+			"gr:hasCurrencyValue": "85000",
+			"gr:hasCurrency": "USD"
+		},
+		"gr:includes": {
+			"@type": [
+				"gr:Individual",
+				"pto:Vehicle"
+			],
+			"gr:name": "Tesla Roadster",
+			"foaf:page": "http://www.teslamotors.com/roadster"
+		}
+	},
+	{
+		"@context": {
+			"name": "http://rdf.data-vocabulary.org/#name",
+			"ingredient": "http://rdf.data-vocabulary.org/#ingredients",
+			"yield": "http://rdf.data-vocabulary.org/#yield",
+			"instructions": "http://rdf.data-vocabulary.org/#instructions",
+			"step": {
+				"@id": "http://rdf.data-vocabulary.org/#step",
+				"@type": "xsd:integer"
+			},
+			"description": "http://rdf.data-vocabulary.org/#description",
+			"xsd": "http://www.w3.org/2001/XMLSchema#"
+		},
+		"name": "Mojito",
+		"ingredient": [
+			"12 fresh mint leaves",
+			"1/2 lime, juiced with pulp",
+			"1 tablespoons white sugar",
+			"1 cup ice cubes",
+			"2 fluid ounces white rum",
+			"1/2 cup club soda"
+		],
+		"yield": "1 cocktail",
+		"instructions": [
+			{
+				"step": 1,
+				"description": "Crush lime juice, mint and sugar together in glass."
+			},
+			{
+				"step": 2,
+				"description": "Fill glass to top with ice cubes."
+			},
+			{
+				"step": 3,
+				"description": "Pour white rum over ice."
+			},
+			{
+				"step": 4,
+				"description": "Fill the rest of glass with club soda, stir."
+			},
+			{
+				"step": 5,
+				"description": "Garnish with a lime wedge."
+			}
+		]
+	},
+	{
+		"@context": {
+			"dc11": "http://purl.org/dc/elements/1.1/",
+			"ex": "http://example.org/vocab#",
+			"xsd": "http://www.w3.org/2001/XMLSchema#",
+			"ex:contains": {
+				"@type": "@id"
+			}
+		},
+		"@graph": [
+			{
+				"@id": "http://example.org/library",
+				"@type": "ex:Library",
+				"ex:contains": "http://example.org/library/the-republic"
+			},
+			{
+				"@id": "http://example.org/library/the-republic",
+				"@type": "ex:Book",
+				"dc11:creator": "Plato",
+				"dc11:title": "The Republic",
+				"ex:contains": "http://example.org/library/the-republic#introduction"
+			},
+			{
+				"@id": "http://example.org/library/the-republic#introduction",
+				"@type": "ex:Chapter",
+				"dc11:description": "An introductory chapter on The Republic.",
+				"dc11:title": "The Introduction"
+			}
+		]
+	},
+	{
+		"@context": "https://www.w3.org/ns/activitystreams",
+		"@type": "Create",
+		"actor": {
+			"@type": "Person",
+			"@id": "acct:sally@example.org",
+			"name": "Sally"
+		},
+		"object": {
+			"@type": "Note",
+			"content": "This is a simple note"
+		},
+		"published": "2015-01-25T12:34:56Z"
+	},
+	{
+		"@context": "http://schema.org",
+		"@type": "FoodEstablishmentReservation",
+		"reservationNumber": "OT12345",
+		"reservationStatus": "http://schema.org/Confirmed",
+		"underName": {
+			"@type": "Person",
+			"name": "John Smith"
+		},
+		"reservationFor": {
+			"@type": "FoodEstablishment",
+			"name": "Wagamama",
+			"address": {
+				"@type": "PostalAddress",
+				"streetAddress": "1 Tavistock Street",
+				"addressLocality": "London",
+				"addressRegion": "Greater London",
+				"postalCode": "WC2E 7PG",
+				"addressCountry": "United Kingdom"
+			}
+		},
+		"startTime": "2027-04-10T08:00:00+00:00",
+		"partySize": "2"
+	},
+	{
+		"@context": "http://schema.org",
+		"@type": "ParcelDelivery",
+		"deliveryAddress": {
+			"@type": "PostalAddress",
+			"streetAddress": "757 Westwood Plaza",
+			"addressLocality": "Los Angeles",
+			"addressRegion": "CA",
+			"addressCountry": "US",
+			"postalCode": "90095"
+		},
+		"expectedArrivalUntil": "2016-11-12T12:00:00-09:00",
+		"carrier": {
+			"@type": "Organization",
+			"name": "FedEx"
+		},
+		"itemShipped": {
+			"@type": "Product",
+			"name": "A bottle of beer"
+		},
+		"partOfOrder": {
+			"@type": "Order",
+			"orderNumber": "159487-sh-1971",
+			"merchant": {
+				"@type": "Organization",
+				"name": "SomeRetailer.com"
+			}
+		}
+	}
+]
+</script>
+<script type=3D"application/ld+json">
+[
+{
+    "@context": "http://schema.org/",
+    "@type": "PromotionCard",
+    "image": "IMAGE_URL1",
+    "url": "PROMO_URL1",
+    "headline": "HEADLINE1",
+    "price": "PRICE1",
+    "priceCurrency": "PRICE_CURRENCY1",
+    "discountValue": "DISCOUNT_VALUE1"
+},
+{
+    "@context": "http://schema.org/",
+    "@type": "PromotionCard",
+    "image": "IMAGE_URL2",
+    "url": "PROMO_URL2",
+    "headline": "HEADLINE2",
+    "price": "PRICE2",
+    "priceCurrency": "PRICE_CURRENCY2",
+    "discountValue": "DISCOUNT_VALUE2"
+}
+]
+</script></head><body>
+Example of Linked Data (Structured Email)
+
+</body></html>
+--46987ad0-df2c-4cc8-8c7b-20e34b1f9bbf-1--
diff --git a/examples/eml/mms-img.eml b/examples/eml/mms-img.eml
new file mode 100644
index 000000000..5c97b765b
--- /dev/null
+++ b/examples/eml/mms-img.eml
@@ -0,0 +1,7719 @@
+Return-Path: <example@example.com>
+Delivered-To: example@example.com
+Authentication-Results: OpenDMARC; dmarc=none (p=none dis=none) header.from=mms.att.net
+Authentication-Results: mail.openmbox.net;
+	dkim=pass (2048-bit key; unprotected) header.d=mms.att.net header.i=@mms.att.net header.a=rsa-sha256 header.s=EMG20171113 header.b=Pc1pdIlr;
+	dkim-atps=neutral
+Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=35.89.44.45; helo=omta046.uswest2.a.cloudfilter.net; envelope-from=example@example.com; receiver=<UNKNOWN>
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mms.att.net;
+	s=EMG20171113; t=1706825825;
+	bh=oh/myBqZiPH1sb1xzhTTNvBRusKia/uOa36Gtl44Jzg=;
+	h=In-Reply-To:To:From:Date;
+	b=Pc1pdIlrL0f+y+srfQDEx9yoW2/rv+/67KKi/yf0TYlBr7uq7noUuHYF6DsxKqfGU
+	 svQD+L+gfg8zSC5GlVS4IUYEWiFN/NtVW3s9dEdPR0O8+6DpNKIfrmiUhYVtiHNsHb
+	 FvtKqNpqfSJQXcuy4+UFSyLY6cg+1yYJn++VVQB9GB3buTXE9dKDfPD1LZQNjYG6vb
+	 yHyh9iCJY0GYkhoUiyB6+FuBAkBrdIeMCd99Z1+LbKmynqyNU+Uc+X8383wI6X78Fx
+	 kh+oL4gRLI83YaDIAbgGmNvSyjJyrsfMr6qqbt1f5d/Y0zTN2MqivovdYWK+2CDm5M
+	 WwwObX4Pnb7NA==
+X-Authority-Analysis: v=2.4 cv=UanyS7SN c=1 sm=1 tr=0 ts=65bc1860
+ a=Cae/ypYY5EJzol8WdJCe9w==:117 a=ssLW7mNWLh8yNo8kx25H8A==:17
+ a=s5jvgZ67dGcA:10 a=k7vzHIieQBIA:10 a=vES_i12o5K0ozii14FIA:9 a=KQqxNPgzF0kA:10
+Message-ID: <Vf8cr9zO6UbvzVfMmrc7v7@txt.att.net>
+In-Reply-To: 1216658863.57218724.1706825824443.JavaMail.nems@ZALL1BMMSC01NFE002
+X-Mms-Message-Type: m-send-req
+X-Mms-Transaction-Id: 1706825822-0
+X-Mms-MMS-Version: 1.2
+To: example@example.com
+From: example@example.com
+Date: Thu, 1 Feb 2024 22:17:04 +0000 (UTC)
+Subject: MMS received image
+X-Mms-Sender-Visibility: Show
+Content-Type: multipart/mixed;
+	boundary="----=_Part_57218723_1235803086.1706825824442"
+MIME-Version: 1.0
+X-CMAE-Envelope: MS4xfBkFZ85kHQiPU6xql2bY3LnPDkfgQNEmObQeD/DALVYU27k6BvYZeq7gtuBZw5KwHSEObnNnEGaeGeUA+xexP7NxRjdAEnhs8lnfLzWkQVHYPWXqCeCg
+ 0IYEN1C6ohpC3NgEuSoXjYP6wtMtY4z94m8mjk2amrV4ao9Z3o9uWj/BAugdhPz9Vrj9JwYicrpTAZnfj2k7ojcq/EgoazogEO4=
+
+------=_Part_57218723_1235803086.1706825824442
+Content-Type: image/jpeg; Name=IMG_8109.jpg
+Content-Disposition: attachment;filename=IMG_8109.jpg
+Content-ID: <IMG_8109.jpg>
+Content-Location: IMG_8109.jpg
+Content-Transfer-Encoding: BASE64
+
+/9j/4AAQSkZJRgABAQAASABIAAD/4QBMRXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAA
+A6ABAAMAAAABAAEAAKACAAQAAAABAAADwKADAAQAAAABAAAFAAAAAAD/7QA4UGhvdG9zaG9wIDMu
+MAA4QklNBAQAAAAAAAA4QklNBCUAAAAAABDUHYzZjwCyBOmACZjs+EJ+/8AAEQgFAAPAAwEiAAIR
+AQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYHCAkKC//EALUQAAIBAwMCBAMFBQQEAAAB
+fQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHwJDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5
+OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeo
+qaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMB
+AQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIBAgQEAwQHBQQEAAECdwABAgMRBAUhMQYS
+QVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEXGBkaJicoKSo1Njc4OTpDREVGR0hJSlNU
+VVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5
+usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX29/j5+v/bAEMAAgICAgICAwICAwUDAwMF
+BgUFBQUGCAYGBgYGCAoICAgICAgKCgoKCgoKCgwMDAwMDA4ODg4ODw8PDw8PDw8PD//bAEMBAgIC
+BAQEBwQEBxALCQsQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQ
+EBAQEP/dAAQAPP/aAAwDAQACEQMRAD8A/U4dKcKTBpa+4PkZO7FFLkYptFBIuaYTSk4qPdzQMWim
+Z5p2RQBICKkByKr7vSpATmgCyD2pxOOKrgkmps0CEPSmHpT84qPrxQA3qaWl6CjHNADgM04EdzTK
+iMLt1oGXAVzxUwIOKpRQmM5zVsdKAJ1xmphUKjPSpwMDNADk9alAA5pijvUg56VYEgIp9IBSimMc
+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
+------=_Part_57218723_1235803086.1706825824442--
diff --git a/examples/eml/mms-text.eml b/examples/eml/mms-text.eml
new file mode 100644
index 000000000..81ecf71f6
--- /dev/null
+++ b/examples/eml/mms-text.eml
@@ -0,0 +1,45 @@
+Return-Path: <example@example.com>
+Delivered-To: example@example.com
+Authentication-Results: OpenDMARC; dmarc=none (p=none dis=none) header.from=mms.att.net
+Authentication-Results: mx.openmbox.net;
+	dkim=pass (2048-bit key; unprotected) header.d=mms.att.net header.i=@mms.att.net header.a=rsa-sha256 header.s=EMG20171113 header.b=GcdBwt6y;
+	dkim-atps=neutral
+Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=44.202.169.45; helo=omta046.useast.a.cloudfilter.net; envelope-from=example@example.com; receiver=<UNKNOWN>
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mms.att.net;
+	s=EMG20171113; t=1698342917;
+	bh=M3LX5C0C3qQXh0kAN3/Saon5/gfmPas4QOsI95X7Lfk=;
+	h=In-Reply-To:To:From:Date;
+	b=GcdBwt6yjVyiftB7LlpmgsvZO3RNgXyYXq1VD1wjAXTHXX7DSCJbUZplQlpy8M6hc
+	 4TEUDsJYdsHv8ATD8hxyep9DxJIdYsigChIc7MjbOAAWzZ3bLyyku44G587Wdziqg9
+	 4hIHQsMiH1b1OlsBdVLT/x2ITG2uWUMRRRrYZPwWrRfAtuvb6vVcgV56coeQIFkftj
+	 nKW2LEUzjC7IVzlJ9031VVFrgFk5PiB4Tq5aO1LFyRyf9x1a7uHMJPBZMKP3Hn5fQA
+	 f7klGU6JNWmJlQ/utOvoPVZIujbFKjLrFsB4T++UtZwJSMBBaJo0z1ZvER2iZuE3ig
+	 JVMusIgmkGe9w==
+X-Authority-Analysis: v=2.4 cv=WJ1s41gR c=1 sm=1 tr=0 ts=653aa804
+ a=4KXCUzhBzoMCTCvOBLK/Fg==:117 a=0+xkjrd6YXNsCDu6qej0Vw==:17
+ a=s5jvgZ67dGcA:10 a=bhdUkHdE2iEA:10 a=Jg6cXP8y7QPT-mWRylsA:9 a=QEXdDO2ut3YA:10
+Message-ID: <w4F1qyGBP1PJfw4ZgqPYHY@txt.att.net>
+In-Reply-To: 750185620.20857872.1698342916592.JavaMail.nems@zwhp1ammsc01nfe001
+X-Mms-Message-Type: m-send-req
+X-Mms-Transaction-Id: 1698342912-2
+X-Mms-MMS-Version: 1.2
+To: example@example.com
+From: example@example.com
+Date: Thu, 26 Oct 2023 17:55:16 +0000 (UTC)
+Subject: MMS received text
+X-Mms-Sender-Visibility: Show
+Content-Type: multipart/mixed;
+	boundary="----=_Part_20857871_171488604.1698342916592"
+MIME-Version: 1.0
+X-CMAE-Envelope: MS4xfDzjWfgMQkj7Acfuw1x4/STexPLS/5ft1aLx0YttKdGnHkOi+pZyP6QEG0wOnAdrOd9wVuimUsyNjn3w8TzxPDRQ4gR0E//gBqpnJl1gpwIhow4YnPkE
+ LYgJ+J4bLCkuo6HWTKdXqMoHBR8igs6tv+8JU4AKdtCPRT9dnyk6KmRZ7s6nN1EjquGCGb9+VIn14VuumX0tm+IhPSAdks7oZcp6Do/DwcrUUi/DT6pq293i
+
+------=_Part_20857871_171488604.1698342916592
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: Attachment; Filename=text_0.txt; Charset=US-ASCII
+Content-ID: 0
+Content-Location: text_0.txt
+Content-Transfer-Encoding: BASE64
+
+NjYzMjQx
+------=_Part_20857871_171488604.1698342916592--
diff --git a/examples/eml/tnef.eml b/examples/eml/tnef.eml
new file mode 100644
index 000000000..7709e9ada
--- /dev/null
+++ b/examples/eml/tnef.eml
@@ -0,0 +1,1745 @@
+From: Alice <alice@example.net>
+To: Bob <bob@example.net>
+Subject: TNEF test
+MIME-Version: 1.0
+Content-Type: multipart/mixed; boundary="=-2UbcDuksJBAwUNBNW7UD"
+
+--=-2UbcDuksJBAwUNBNW7UD
+Content-Type: text/plain; charset=us-ascii; format=flowed
+
+Test message body with example TNEF part from
+https://github.com/Yeraze/ytnef
+
+https://github.com/the-djmaze/snappymail/discussions/1012
+
+--=-2UbcDuksJBAwUNBNW7UD
+Content-Type: application/vnd.ms-tnef
+Content-Disposition: attachment; filename=winmail.dat
+Content-Transfer-Encoding: base64
+
+eJ8+IjMPAQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEIgAcAGAAAAElQTS5NaWNy
+b3NvZnQgTWFpbC5Ob3RlADEIAQ2ABAACAAAAAgACAAEGgAMADgAAANMHBgARAAoAFwAAAAIAFAEB
+A5AGAPAEAAAnAAAACwACAAEAAAALACMAAAAAAAMAJgAAAAAACwApAAAAAAADADYAAAAAAB4AcAAB
+AAAABQAAAHRlc3QAAAAAAgFxAAEAAAAWAAAAAcM05HC0gONzLGp+T/KnwUnJ7LwETAAAAgEdDAEA
+AAAaAAAAU01UUDpKR0VSTEFOREBTWU5BQ09SLkNPTQAAAAsAAQ4AAAAAQAAGDgDiNFbkNMMBAgEK
+DgEAAAAYAAAAAAAAAM/yM912IydOt4pJEsJHoOTCgAAAAwAUDgAAAAALAB8OAQAAAAIBCRABAAAA
+2QAAANUAAAC7AQAATFpGdYDK2Y4DAAoAcmNwZzEyNRYyAPgLYG4OEDAzM08B9wKkA+MCAGNoCsBz
+sGV0MCAHEwKAfQqA2QjIIDsJYg4wNQm7AoCdEfIqCbAJ8ASQYXQFsRpSDeBoEvERUDUuNIAwLjEx
+LjIyD0BJAoBcdgiQd2sLgGTaNAxgYwBQCwNjAEELtaAgQ2FzZBixZhjl+wqiCoRkGJ8X4AFAGacZ
+1fMb6gPQNDgaTxuZHa8cDyMaHyAsb2JqFOB0cPhoXCcMASEPIh4L4yK/CyPKEeEAKKAAAAADAN4/
+n04AAAMACVkDAAAAAwBAZQAAAAALABOACCAGAAAAAADAAAAAAAAARgAAAAADhQAAAAAAAAMAFYAI
+IAYAAAAAAMAAAAAAAABGAAAAABCFAAAAAAAACwAYgAggBgAAAAAAwAAAAAAAAEYAAAAAFIUAAAAA
+AAADABuACCAGAAAAAADAAAAAAAAARgAAAABShQAA45ABAAMAIoAIIAYAAAAAAMAAAAAAAABGAAAA
+AAGFAAAAAAAAHgBEgAggBgAAAAAAwAAAAAAAAEYAAAAAVIUAAAEAAAAFAAAAMTAuMAAAAAALAEWA
+CCAGAAAAAADAAAAAAAAARgAAAAAGhQAAAAAAAAsASYAIIAYAAAAAAMAAAAAAAABGAAAAAA6FAAAA
+AAAAAwBMgAggBgAAAAAAwAAAAAAAAEYAAAAAGIUAAAAAAAALAGGACCAGAAAAAADAAAAAAAAARgAA
+AACChQAAAAAAAAIB+A8BAAAAEAAAAM/yM912IydOt4pJEsJHoOQCAfoPAQAAABAAAADP8jPddiMn
+TreKSRLCR6DkAgH7DwEAAACWAAAAAAAAADihuxAF5RAaobsIACsqVsIAAG1zcHN0LmRsbAAAAAAA
+TklUQfm/uAEAqgA32W4AAABDOlxEb2N1bWVudHMgYW5kIFNldHRpbmdzXGpnZXJsYW5kXExvY2Fs
+IFNldHRpbmdzXEFwcGxpY2F0aW9uIERhdGFcTWljcm9zb2Z0XE91dGxvb2tcT3V0bG9vay5wc3QA
+AAADAP4PBQAAAAMADTT9NwIAAgEUNAEAAAAQAAAATklUQfm/uAEAqgA32W4AAAIBfwABAAAAMQAA
+ADAwMDAwMDAwQ0ZGMjMzREQ3NjIzMjc0RUI3OEE0OTEyQzI0N0EwRTQ2NDUzMjcwMAAAAAADAAYQ
+ONf/MwMABxBaAAAAAwAQEAAAAAADABEQAAAAAB4ACBABAAAAWwAAAENBU0RBU0RGQVNERkFTRENB
+U0RBU0RGQVNERkFTRENBU0RBU0RGQVNERkFTRENBU0RBU0RGQVNERkFTRENBU0RBU0RGQVNERkFT
+RENBU0RBU0RGQVNERkFTRAAASAICApAGAA4AAAABAF0AAAAgACAAAAAAAJ4AAhOAAwAOAAAA0wcE
+AAcACgAjACYAAQA5AQIPgAYAeQsAAP/Y/+AAEEpGSUYAAQIAAGQAZAAA/+wAEUR1Y2t5AAEABAAA
+ADwAAP/uACZBZG9iZQBkwAAAAAEDABUEAwYKDQAAA4gAAAVMAAAH5wAAC3f/2wCEAAYEBAQFBAYF
+BQYJBgUGCQsIBgYICwwKCgsKCgwQDAwMDAwMEAwODxAPDgwTExQUExMcGxsbHB8fHx8fHx8fHx8B
+BwcHDQwNGBAQGBoVERUaHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f
+Hx8fHx8fH//CABEIAEgAUwMBEQACEQEDEQH/xADFAAABBQEBAQAAAAAAAAAAAAAGAgMEBQcBAAgB
+AQEBAQAAAAAAAAAAAAAAAAEAAgMQAAEEAgEDAwMFAAAAAAAAAAMAAQIEEQUTECESMEAGICIUUDFB
+JBURAAECAwUFBQYHAQAAAAAAAAECAwARIRAxQVESYSIyEwQgcZGx0fCBocFCUuFicoIjMxRTEgEA
+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
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA8AAAA/AAAAHwAAAB8AAA
+AfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB
+8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAA/AAAAPwAAAH8AAAD/AAAf8h
+BgAAQQtGAGYAIAAgAAAAAAAgACAAAAAAACgAAAAgAAAAIAAAAAEAGAAAAAAAAAwAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDAwMDAwMDAwMDAwMDA
+wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////////////////////AwMDAwMDAwMDAwMDA
+wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAADAwMD////////////////////////////////////AwMDAwMDAwMDAwMDAwMDAwMDAwMDA
+wMDAwMDAwMDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////////////
+///////////////////////////AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////////////////////////////////////
+///////AwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAADAwMD////////AwMCAgICAgICAgICAgICAgICAgICAgICAgICAgIDAwMDAwMDAwMDA
+wMCAgICAgIDAwMDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////A
+wMCAgICAgICAgICAgICAgICAgICAgICAgICAgIDAwMDAwMDAwMDAwMDAwMCAgICAgIDAwMDAwMDA
+wMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////AwMCAgICAgICAgICAgICAgICA
+gICAgICAgIDAwMDAwMDAwMDAwMDAwMDAwMCAgICAgIDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAADAwMD////////AwMCAgICAgICAgICAgICAgICAgICAgIDAwMDAwMDAwMDAwMDA
+wMDAwMCAgICAgICAgIDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////
+///AwMCAgICAgICAgICAgICAgICAgICAgICAgIDAwMDAwMDAwMDAwMDAwMDAwMCAgICAgIDAwMDA
+wMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////AwMCAgICAgICAgIAAgICA
+gICAgICAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMCAgICAgIDAwMDAwMDAwMAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAADAwMD////////AwMCAgICAgICAgIAAgICAgICAgICAgICAgIDAwMDAwMDA
+wMDAwMDAwMDAwMCAgICAgIDAwMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/
+///////AwMCAgICAgIAAgIAAAIAAgICAgICAgICAgIDAwMDAwMDAwMDAwMDAwMCAgICAgICAgIDA
+wMDAwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////AwMCAgICAgIAAAIAA
+gICAgICAgICAgICAgIDAwMDAwMDAwMDAwMDAwMCAgICAgICAgID////AwMDAwMAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAADAwMD////////AwMCAgICAgIAAAIAAgICAgIAA//8A//8A//8A//8A
+///AwMAA//8A//+AgICAgICAgID////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADA
+wMD///////8AAIAAAIAAAIAAAIAAgIAAAIAAAP8AAP8AAP8AAP8AAP8AAP8AAP8AAP8AAP8AAP+A
+gID////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD///////8AAIAAAIAAAIAA
+AIAAAIAAAIAAAIAAAP8AAP8AAP8AAP8AAP8AAP8AAP8AAP8AAP+AgID////AwMDAwMAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAADAwMD///////+AgIAAAP8AgIAAgIAAAP8A//8A//8AgIAAgICA
+gIDAwMDAwMDAwMAA//8AAP8AAP+AgID////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AADAwMD///////+AgIAAAP8AgIAAgIAAAP8A//8A//8A//8A//8A///AwMD////AwMDAwMDAwMAA
+//+AgID////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD///////+AgIAAAP8A
+gIAAAP8AAP8A//8A//8A//8A//8A///AwMDAwMDAwMAA//8A//8A//+AgID////AwMDAwMAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD////////AwMAAAP8AAP8AAP8AAP8AAP8A//8A//8A
+///AwMAA///AwMDAwMDAwMAA//8A//+AgID////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAADAwMD///////////+AgICAgICAgICAgIDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA
+wMDAwMD////////AwMDAwMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////////////
+///////////////////////////////////////////////////////AwMDAwMDAwMDAwMDAwMAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////////////////////////////////////
+///////////////////////////////AwMDAwMDAwMDAwMCAgIAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAADAwMD/////////////////////////////////////////////////////////////
+///AwMD//wCAgACAgACAgACAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMD/////////
+///////////////////////////////////////////////////////AwMDAwMD//wD//wCAgIAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////////////////////////////////
+///////////////////////////////AwMDAwMD//wCAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAD/////////////////////////////////////////////////////////////
+///////AwMDAwMCAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD/////////
+///////////////////////////////////////////////////////////AwMDAwMAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA
+wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCAgIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAADAAAAAADg9wIFkAYAmAEAABIAAAADACAOlBkAAB4AATABAAAADgAAAHphcHBhX2F2MS5qcGcA
+AAACAQI3AQAAAAAAAAAeAAM3AQAAAAUAAAAuanBnAAAAAAMABTcBAAAAHgAHNwEAAAAOAAAAemFw
+cGFfYXYxLmpwZwAAAAMACzddAAAAAwAUNwAAAAADAPp/AAAAAEAA+38AQN2jV0WzDEAA/H8AQN2j
+V0WzDAMA/X8AAAAACwD+fwAAAAADACEOJckDAAIB+A8BAAAAEAAAAM/yM912IydOt4pJEsJHoOQC
+AfoPAQAAABAAAADP8jPddiMnTreKSRLCR6DkAgH7DwEAAACWAAAAAAAAADihuxAF5RAaobsIACsq
+VsIAAG1zcHN0LmRsbAAAAAAATklUQfm/uAEAqgA32W4AAABDOlxEb2N1bWVudHMgYW5kIFNldHRp
+bmdzXGpnZXJsYW5kXExvY2FsIFNldHRpbmdzXEFwcGxpY2F0aW9uIERhdGFcTWljcm9zb2Z0XE91
+dGxvb2tcT3V0bG9vay5wc3QAAAADAP4PBwAAAFdnAgKQBgAOAAAAAQBzAAAAIAAgAAAAAAC0AAIT
+gAMADgAAANMHBgARAAoAFgApAAIAPAECEYAGALgNAAABAAkAAAPcBgAAAAAhBgAAAAAFAAAACQIA
+AAAABQAAAAEC////AKUAAABBC8YAiAAgACAAAAAAACAAIAAAAAAAKAAAACAAAABAAAAAAQABAAAA
+AAAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADgAAAH4AAAB+AAAAfg
+AAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AA
+AAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAAfgAAAH4AAAB+AAAA/gAAAf4AAAP+AAAH/gAAD/4AAB
+/yEGAABBC0YAZgAgACAAAAAAACAAIAAAAAAAKAAAACAAAAAgAAAAAQAYAAAAAAAADAAAAAAAAAAA
+AAAAAAAAAAAAAAAAAAAAAAAAAFVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVV
+VVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVVQAAAAAAAAAAAAAAAAAAAAAA
+AIaGhtbn58zMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+zMzMzMzMzMzMzMzMzMzMzMzMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////////
+/////////////////////////////////////////////////////////////////////////8zM
+zFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////////////////////////////////
+/////////////////////////////////////////////////8zMzFVVVQAAAAAAAAAAAAAAAAAA
+AAAAAIaGhtbn5///////////////////////////////////////////////////////////////
+/////////////////////////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////
+////////////////////////////////////////////////////////////////////////////
+/8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////////////////////////////
+/////////////////////////////////////////////////////8zMzFVVVQAAAAAAAAAAAAAA
+AAAAAAAAAIaGhtbn5////////wwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwM
+DAwMDAwMDAwMDAwMDAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////
+/4aGhszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzAwMDP//
+/////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn59bn59bn59bn59bn
+59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn58zMzAwMDP///////8zMzE1NTQAAAAAAAAAA
+AAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5///////////////////////////////////////
+/////////////9bn58zMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///
+/////4aGhtbn5////4aGhoaGhoaGhv///4aGhoaGhoaGhv///4aGhoaGhoaGhv///9bn58zMzAwM
+DP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5///////////
+/////////////////////////////////////////9bn58zMzAwMDP///////8zMzFVVVQAAAAAA
+AAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5////8zMzAAAgP///////8zMzIAAgIAAgP//
+/wCAAACAAACAAP///9bn58zMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn
+5////////4aGhtbn5////wAAgAAA/wAAgP////8AAP8AAMzMzP///wCAAAD/AP8AAP///9bn58zM
+zAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5////wAA
+/wD//wAAgP//////AP8AAP8AAP///////wCAAACAAP///9bn58zMzAwMDP///////8zMzFVVVQAA
+AAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5////////wAA/wAAgP////8AAP//////
+/////////wCAAP///////9bn58zMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaG
+htbn5////////4aGhtbn5////////////////////////////////////////////////////9bn
+58zMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn5///
+/////////////////////////////////////////////////9bn58zMzAwMDP///////8zMzFVV
+VQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhtbn59bn59bn59bn59bn59bn59bn59bn
+59bn59bn59bn59bn59bn59bn59bn58zMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAA
+AIaGhtbn5////////4aGhszMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzM
+zMzMzMzMzAwMDP///////8zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhjOZ
+zJkAAJkAAJkAAJkAAJkAAJkAAJkAAJkAAJkAAIAAAIAAAIAAAIAAAIAAAIAAAAwMDP///9bn58zM
+zFVVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5////////4aGhjPM/5kAAJkAAJkAAJkAAJkAAJkA
+AJkAAJkAAJkAAP///4AAAP///4AAAP///4AAAAwMDNbn58zMzJmZmVVVVQAAAAAAAAAAAAAAAAAA
+AAAAAIaGhtbn5////////4aGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaG
+hoaGhoaGhoaGhgwMDMzMzJmZmXd3d1VVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////
+/////////////////////////////////////////////////////////////9bn58zMzJmZmXd3
+d3d3d1VVVQAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////////////////////////////
+/////////////////////////////////5mZmU1NTU1NTTMzMzMzMzMzMzMzMwAAAAAAAAAAAAAA
+AAAAAAAAAIaGhtbn5///////////////////////////////////////////////////////////
+/////////5mZmf///////9bn58zMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////
+/////////////////////////////////////////////////////////////5mZmf///9bn58zM
+zFVVVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn5///////////////////////////////
+/////////////////////////////////////5mZmdbn58zMzFVVVQAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAIaGhtbn5///////////////////////////////////////////////////////
+/////////////5mZmczMzFVVVQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIaGhtbn59bn
+59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn59bn55mZmVVVVQAA
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaG
+hoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhoaGhpmZmQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAMAAAAAACFfAg+ABgAtTwEAPCFET0NUWVBFIE5FVFNDQVBFLUJvb2ttYXJrLWZpbGUtMT4N
+CjwhLS0gVGhpcyBpcyBhbiBhdXRvbWF0aWNhbGx5IGdlbmVyYXRlZCBmaWxlLg0KSXQgd2lsbCBi
+ZSByZWFkIGFuZCBvdmVyd3JpdHRlbi4NCkRvIE5vdCBFZGl0ISAtLT4NCjxUSVRMRT5Cb29rbWFy
+a3M8L1RJVExFPg0KPEgxPkJvb2ttYXJrczwvSDE+DQo8REw+PHA+DQogICAgPERUPjxIMyBGT0xE
+RUQgQUREX0RBVEU9IjEwNDI2NDY4NzQiPkFkb2JlIEdvTGl2ZTwvSDM+DQogICAgPERMPjxwPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5ydWR5bGVtY2tlLmNvbS9BY3Rpb25zLyIg
+QUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzQiPkdvTGl2ZSBBY3Rpb25zIFJlc291cmNlPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5tYXR0LXJpZGxleS5jb20vc29mdHdhcmUvYWN0aW9ucy9hY3Rp
+b25zLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5Hb0xpdmUgQWN0aW9uczwvQT4NCiAgICAgICAgPERU
+PjxBIEhSRUY9Imh0dHA6Ly93d3cuZ29saXZlaHEuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkdvTGl2
+ZSBIZWFkcXVhcnRlcnMgIE5ld3M8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+LmdvbGl2ZWhlYXZlbi5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+R29MaXZlSGVhdmVuICBBIEh1YiBm
+b3IgdGhlIEdvTGl2ZSBDb21tdW5pdHk8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+MjE2LjI0Ni41MS4yMDIvZm9ydW1zL2Fkb2JlX2dvbGl2ZS9pbmRleC5odG0iIEFERF9EQVRFPSIx
+MDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2
+ODc0Ij5odHRwLS0yMTYuMjQ2LjUxLjIwMi1mb3J1bXMtYWRvYmVfZ29saXZlLWluZGV4Lmh0bTwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud2JsYWR5LmNvbS9hY3Rpb25zLmh0
+bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc0Ij5Nb3JlIEFkb2JlIEdvTGl2ZSBBY3Rpb25zIHBhZ2Ugb25lPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5vdXQudG8vYWN0aW9ucy9odG1sL2lu
+ZGV4Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5PVVRhY3Rpb25zPC9BPg0KICAgIDwvREw+PHA+DQog
+ICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzQiPkFTUCBTdHVmZjwvSDM+DQog
+ICAgPERMPjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5hc3BzdHJlZXQuY29t
+L2QudGFmIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+QVNQIC0gQXBwbGljYXRpb24gc2VydmljZSBwcm92aWRl
+cnM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNybXhjaGFuZ2UuY29tLyIg
+QUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzQiPkNSTVhjaGFuZ2UgR2F0ZXdheSB0byB0aGUgQ29udGFjdCBDZW50ZXIs
+IENSTSBhbmQgQ3VzdG9tZXIgQ2FyZSBDb21tdW5pdHk8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LnBlb3BsZXNvZnQuY29tL2VuL3VzL3Byb2R1Y3RzL2FwcGxpY2F0aW9ucy9j
+cm0vcHJvZHVjdF9jb250ZW50Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5QZW9wbGVTb2Z0ICBDdXN0
+b21lciBSZWxhdGlvbnNoaXAgTWFuYWdlbWVudCAgSG9tZTwvQT4NCiAgICA8L0RMPjxwPg0KICAg
+IDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc0Ij5EYWlseTwvSDM+DQogICAgPERM
+PjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2FudHdycC5nc2ZjLm5hc2EuZ292L2Fw
+b2QvYXJjaGl2ZXBpeC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+QXN0cm9ub215IFBpY3R1cmUgb2Yg
+dGhlIERheSBBcmNoaXZlPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mYWly
+dnVlLmNvbS8/ZmVhdHVyZT1hd2FyZHMyMDAxIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+QmVzdCBvZiB0aGUg
+QmxvZ3M8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmJyaWxsc2NvbnRlbnQu
+Y29tL2luZGV4Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5CcmlsbCdzIENvbnRlbnQ8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNhbXdvcmxkLmNvbS8iIEFERF9EQVRFPSIxMDQy
+NjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0
+Ij5DYW1Xb3JsZCBUaGlua2luZyBPdXRzaWRlIHRoZSBCb3g8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3LmNodWQuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkNIVUQgLSBDaW5lbWF0
+aWMgSGFwcGVuaW5ncyBVbmRlciBEZXZlbG9wbWVudDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly93d3cuZGF5cG9wLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5EYXlwb3AgLSBhIGN1cnJl
+bnQgZXZlbnRzLXdlYmxvZy1uZXdzIHNlYXJjaCBlbmdpbmU8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3LmRvdGNvbXNjb29wLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5Eb3Rjb20g
+U2Nvb3A8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmRvdGN1bHQuY29tLyIg
+QUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzQiPmRvdENVTFQuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0
+cDovL2RyZXcuY29ycnVwdC5uZXQvIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+ZHJldyMjXiM8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmZhcmsuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4
+NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkZB
+UksgRHJldyBDdXJ0aXMnIEZBUksuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5mZWVkbWFnLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4
+MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5GRUVEIE1hZ2F6aW5lPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5lbGVnYW50aGFjay5jb20vaW5kZXguaHRtbCIg
+QUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzQiPklBIEVILiBFbGVnYW50aGFjayBpcyBhIGd1aWRlIHRvIEluZm9ybWF0
+aW9uIEFyY2hpdGVjdHVyZSwgSW50ZXJmYWNlIERlc2lnbiwgVXNhYmlsaXR5LCBVc2VyIENlPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5pcm9ubWluZHMuY29tL2luZGV4LnNo
+dG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NCI+SXJvbm1pbmRzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL3d3dy5tZW1lcG9vbC5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+bWVtZXBvb2wuY29tPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5tZXRhZmlsdGVyLmNvbS8iIEFERF9E
+QVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc0Ij5NZXRhZmlsdGVyICBDb21tdW5pdHkgV2VibG9nPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5tcmJhcnJldHQuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPm1yYmFy
+cmV0dC5jb208L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBsYXN0aWMuY29t
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPlBsYXN0aWM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LnNhbG9uLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4
+MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5TYWxvbi5jb208L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnNoYXJwZXdvcmxkLmNvbS8iIEFERF9EQVRFPSIxMDQy
+NjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0
+Ij5TSEFSUEVXT1JMRCAgYW1lcmljYSdzIG5vLiAxIHdlYnNpdGU8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LnNsYXNoZG90Lm9yZy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5TbGFzaGRv
+dCBOZXdzIGZvciBuZXJkcywgc3R1ZmYgdGhhdCBtYXR0ZXJzPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy5zdWNrLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5TdWNrLmNvbSBEYWls
+eTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cudGFsa2hhcmRvbmxpbmUuY29t
+L2luZGV4LnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRhbGsgSGFyZCBPbmxpbmUgRm9ydW1zPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy50aGVtb3JuaW5nbmV3cy5vcmcvIiBBRERf
+REFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NCI+VGhlIE1vcm5pbmcgTmV3czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cudGhlc3RhbmRhcmQuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZVN0YW5kYXJkLmNv
+bSBob21lcGFnZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud2lyZWQuY29t
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPldpcmVkIE5ld3M8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+
+PEgzIEZPTERFRCBBRERfREFURT0iMTA0MTI2NTc4MyI+RGVsbDwvSDM+DQogICAgPERMPjxwPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5kZWxsYXVjdGlvbi5jb20iIEFERF9EQVRF
+PSIxMDQxMjY1NzkyIiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQw
+MjU2NzE4Ij5EZWxsIEF1Y3Rpb248L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+LmRlbGwuY29tLyIgQUREX0RBVEU9IjEwNDEyNjU3OTIiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIi
+IExBU1RfTU9ESUZJRUQ9IjEwNDAyNTY3MTgiPkRlbGw8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LmRlbGxuZXQuY29tLyIgQUREX0RBVEU9IjEwNDEyNjU3OTIiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDAyNTY3MTgiPkRlbGxuZXQ8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmdpZ2FidXlzLmNvbS8iIEFERF9EQVRFPSIx
+MDQxMjY1NzkyIiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQwMjU2
+NzE4Ij5HaWdhYnV5czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9zdXBwb3J0LmRl
+bGwuY29tIiBBRERfREFURT0iMTA0MTI2NTc5MiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFT
+VF9NT0RJRklFRD0iMTA0MDI1NjcxOCI+U3VwcG9ydC5EZWxsLmNvbTwvQT4NCiAgICA8L0RMPjxw
+Pg0KICAgIDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc0Ij5lWmluZXM8L0gzPg0K
+ICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9hYW4ub3JnL2diYXNlL0Fh
+bi9pbmRleCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkFzc29jaWF0aW9uIG9mIEFsdGVybmF0aXZlIE5ld3N3
+ZWVrbGllczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9sb3N0YXRzZWEubmV0L0xB
+Uy9pbmRleDIuaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+TE9TVCBBVCBTRUEgb25saW5lPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5tb3RoZXJqb25lcy5jb20vIiBBRERfREFURT0i
+MTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NCI+TW90aGVySm9uZXMuY29tIC0tIE5ld3MgYW5kIFJlc291cmNlcyBmb3IgdGhlIFNrZXB0
+aWNhbCBDaXRpemVuPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zaGlmdC5j
+b20vaW5kZXguYXNwIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+U2hpZnQuY29tPC9BPg0KICAgIDwvREw+PHA+
+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzQiPkZpbmFuY2VzPC9IMz4N
+CiAgICA8REw+PHA+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vcGVyc29uYWwzMDAuZmlk
+ZWxpdHkuY29tL2dlbi9tZmxmaWQvNS8zMTYwNjkzMDEuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4
+NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkZp
+ZGVsaXR5IEFzc2V0IE1hbmFnZXIgR3Jvd3RoPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0
+cDovL3d3dy5mb29sLmNvbS9pbmRleC5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5Gb29sLmNvbSBGaW5h
+bmNlIGFuZCBGb2xseSAtLSBNYWluIFBhZ2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LmZvb2wuY29tL21vbmV5LzQwMWsvNDAxazAwMy5odG0/cmVmPU1URjQwMWsiIEFERF9E
+QVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc0Ij5Gb29sLmNvbSBJcyBZb3VyIDQwMShrKSBGb29saXNoIC0tIEhvdyB0byBQaWNr
+IGEgV2lubmVyPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cHM6Ly9haXMyLnRpYWEtY3Jl
+Zi5vcmcvY2dpLWJpbi9XZWJPYmplY3RzL0lBUGFydGljaXBhbnQiIEFERF9EQVRFPSIxMDQyNjQ2
+ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQyIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5J
+QVBhcnRpY2lwYW50PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL215ZmlkZWxpdHkz
+MDAubWVtYmVycy5maWRlbGl0eS5jb20vbXlGaWRlbGl0eS9pbmRleC5qaHRtbCIgQUREX0RBVEU9
+IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2
+NDY4NzQiPk15IEZpZGVsaXR5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL215LmZv
+b2wuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZSBNb3RsZXkgRm9vbCAtLSBNeSBGb29sPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mYWJpYW4uY29tLyIgQUREX0RBVEU9IjEw
+NDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4
+NzQiPldlbGNvbWUgdG8gTWF2ZXJpY2sgSW52ZXN0aW5nIHdpdGggRG91ZyBGYWJpYW4hPC9BPg0K
+ICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzQiPkZv
+bnRzPC9IMz4NCiAgICA8REw+PHA+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmRz
+ZzQuY29tLzA0L2V4dHJhL2JpdG1hcC9pbmRleC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIg
+TEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+MDQgIGV4
+dHJhICBiaXRtYXA8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LjEwMDFmb250
+cy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+MTAwMSBGb250cyAuY29tPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5ibGFtYm90LmNvbS90aXRsZS5odG1sIiBBRERfREFURT0iMTA0
+MzM1NDA3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MzM1NDA3
+NiI+QkxBTUJPVCBDb21pYyBGb250cyAmIExldHRlcmluZzwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cuY2hhbmsuY29tL2ZvbnRzLnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDIiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkNIQU5L
+IEZPTlRTITwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuY2hlYXBza2F0ZWZv
+bnRzLmNvbS9mb250cy5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MiIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+Q2hlYXBza2F0ZUZvbnRzIC0gRm9u
+dHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LndlYm1hc3RlcmJhc2UuY29t
+L2FydGljbGUucGhwLzgxMSIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkRyLiBEZXNpZ24ncyBEZWZpbml0aXZl
+IERlc2lnbiBMaW5rcyBMaXN0PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2Rlc2t0
+b3BwdWIuYWJvdXQuY29tL2NzL3RoZW1lZm9udHMvIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+Rm9udCBDb2xs
+ZWN0aW9ucyBpbiBTcGVjaWFsdHkgVGhlbWVzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0
+cDovL3d3dy5mcmVzaG1lZGlhLm5sLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPmZvbnQtby12aWxsZTwvQT4N
+CiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubW9vcnN0YXRpb24ub3JnL3R5cG9hc2lz
+L2Rlc2lnbmVycy9mb250bWFrZXIvZm9udG1ha2VyLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkZvbnRt
+YWtlciBbUEFHRSAxXTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZm9udG9z
+YXVydXMuY29tL2ZvbnRzLmFzcD90YXJnZXQ9bnVsbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkZvbnRvc2F1
+cnVzIFRleHQ8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmZvbnRzbnRoaW5n
+cy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+Rm9udHMgJiBUaGluZ3MgLSB0aGUgbW9zdCB1bnVzdWFs
+IGZvbnRzIG9ubGluZS4uLjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZnJl
+ZS10eXBld3JpdGVyLWZvbnRzLmNvbS9Gb250cy5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIg
+TEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+RnJlZSBU
+eXBld3JpdGVyIEZvbnRzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5sYXJh
+YmllZm9udHMuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkxhcmFiaWUgRm9udHM8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm9yZ2RvdC5jb20vYWxpYXNmb250cy8iIEFERF9EQVRF
+PSIxMDQ2MTA0MDM4IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQ2
+MTA0MDM5Ij5Pcmdkb3Qgb3BlbiBzb3VyY2UgcGl4ZWwgYW5kIGxlZCBmb250cyBmb3IgZmxhc2g8
+L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBoYW50b21wb3dlci5kZS9waGFu
+dG9tcGhvbnRzLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5waGFudG9tcGhvbnRzPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5pYW1jYWwuY29tL2ZvbnRzLyIgQUREX0RBVEU9IjEw
+NDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4
+NzQiPlNtYWxsIEZvbnRzIGJ5IENhbCBIZW5kZXJzb248L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LmRvZ2hhdXNlLmNvbS9mb250cy5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3
+NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+VGhl
+IERvZyBIYXVzZSBGb250czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud3Bk
+ZmQuY29tL3dwZHR5cG8zYS5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5XZWIgUGFnZSBEZXNpZ24gZm9y
+IERlc2lnbmVycyAtIFBpeGVsIEZvbnRzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5waXp6YWR1ZGUuZGsvZm9udHMuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPnd3dy5waXp6YWR1
+ZGUuZGsgIGZvbnRzLmh0bWw8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBB
+RERfREFURT0iMTA0MjY0Njg3NCI+RnVubmllczwvSDM+DQogICAgPERMPjxwPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zYXRpcmV3aXJlLmNvbS9pbmRleC5zaHRtbCIgQUREX0RB
+VEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzQiPlNhdGlyZVdpcmUgIGRvdC5jb20uZWR5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3NubC5qdC5vcmcvIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+U05MIE1NIChTYXR1cmRheSBO
+aWdodCBMaXZlIE11bHRpbWVkaWEgLSBzbmwuanQub3JnKSBZT1VSIFNPVVJDRSBGT1IgU05MIE1V
+TFRJTUVESUEsIHNhdHVyZGF5IG48L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vcmlu
+a3dvcmtzLmNvbS9kaWFsZWN0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZSBEaWFsZWN0aXplcjwvQT4N
+CiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9pbmZvbWVkaWEuanQub3JnL2luZGV4LnBodG1s
+IiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NCI+V2VsY29tZSB0byBTTkwgSW5mb01lZGlhPC9BPg0KICAgIDwvREw+
+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzQiPkdyYXRlZnVsIERl
+YWQ8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9jZmEtd3d3
+LmhhcnZhcmQuZWR1L2NmYS9wcy9zcGVjaWFsL0dhcmNpYS5odG1sIiBBRERfREFURT0iMTA0MjY0
+Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+
+KDQ0NDIpIEdhcmNpYSAoU3Rhcik8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vY2Zh
+LXd3dy5oYXJ2YXJkLmVkdS9jZmEvcHMvc3BlY2lhbC9yb2NrbnJvbGwvMDAwNDQ0Mi5odG1sIiBB
+RERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NCI+KDQ0NDIpIEdhcmNpYTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly9zbGF0ZS5tc24uY29tLz9pZD0yMDcwMjUxIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+QSBMb25nLCBT
+dGFpZCBUcmlwIC0gSG93IERlYWRoZWFkcyBydWluZWQgdGhlIEdyYXRlZnVsIERlYWQuIEJ5IE1h
+cmOgV2VpbmdhcnRlbjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYWNjZXNz
+cGxhY2UuY29tL2dyYXRlZnVsLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkFjY2VzcyBQbGFjZSBHcmF0
+ZWZ1bCBEZWFkIC0gTHlyaWNzLCBQaWN0dXJlcywgTVAzLCBTZXRsaXN0cy4uPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy50aGViZWFyLm9yZy8iIEFERF9EQVRFPSIxMDQyNjQ2
+ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5C
+RUFSJ1MgQVJUIFBBR0VTPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5uaWku
+bmV0L35vYmllMS9kZWFkY2QvYmV0dHlfYm9hcmRfaW5mby5odG0iIEFERF9EQVRFPSIxMDQyNjQ2
+ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5C
+ZXR0eSBCb2FyZCBpbmZvPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5ibGFp
+cmphY2tzb24uY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkJsYWlyIEphY2tzb24gLSBHYXJjaWE8L0E+
+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZ3JvdXBzLmdvb2dsZS5jb20vZ3JvdXBzP3E9
+YnVmZmFsbytncm91cDpyZWMubXVzaWMuZ2RlYWQmaGw9ZW4mYXNfZHJyYj1iJmFzX21pbmQ9MTIm
+YXNfbWlubT01JmFzX21pbnk9MTk4MSZhc19tYXhkPTE3JmFzX21heG09MTImYXNfbWF4eT0xOTkx
+JnJudW09OCZzZWxtPTE5OTBKdWwyMC4xNDI2MTYuMTM3OTIlNDB1dmFhcnBhLlZpcmdpbmlhLkVE
+VSIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPkJ1ZmZhbG8gTmV3cyBDb25jZXJ0IFJldmlldyA3LTE3LTkwPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2l2ZXJtY2xlb2QudHJpcG9kLmNvbS9wb3N0
+ZXJmcmFtZXMuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkNvbmNlcnQgUG9zdGVyczwvQT4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9kYi5ldHJlZS5vcmcvYnJvd3NlYnlteXNob3dzLnBocD9h
+cnRpc3Q9MiIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPmRiLmV0cmVlLm9yZyAtIEdEIGJ5IFllYXI8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vcHViNy5lemJvYXJkLmNvbS9iZGVhZGhvb2siIEFE
+RF9EQVRFPSIxMDQ4MDE0NjQ2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVE
+PSIxMDQ4MDE0NjQ3Ij5EZWFkaG9vayBAIHd3dy5lemJvYXJkLmNvbTwvQT4NCiAgICAgICAgPERU
+PjxBIEhSRUY9Imh0dHA6Ly93d3cuZGVhZGxlZ3MuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPmRlYWRs
+ZWdzLmNvbSBtcDMgYW5kIHJlYWwgYXVkaW8gbGlicmFyeSBvZiBncmF0ZWZ1bCBkZWFkIHF1YWxp
+dHkgYXVkaW8uIE1wMyBzaG93cyBhbmQgTXAzIGJvb3RsPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy5kZWFkc2hvdy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+RGVhZHNob3cuY29t
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5nZW9jaXRpZXMuY29tL1N1bnNl
+dFN0cmlwL1BhbG1zLzU1MjAvZGVhZDEuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkRpZCBZb3UgS25v
+dzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9sYXdyb21haW5lLmNvbS9pZDIwLmh0
+bSIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPkRvdWcgSXJ3aW5zIEZpcnN0IEFtZW5kZWQgUGV0aXRpb24gdW5k
+ZXIgUHJvYmF0ZSBDb2RlIHNlY3Rpb24gOTg2MDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cuZG96aW4uY29tLyMiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5Eb3ppbi5jb208L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmV1cm9kZWFkLm5ldC8iIEFERF9EQVRFPSIxMDQy
+NjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0
+Ij5FdXJvZGVhZC5uZXQgLSBmb3IgR3JhdGVmdWwgRGVhZCBmYW5zIGV2ZXJ5d2hlcmU8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZXVyb2RlYWQubmV0L3BhZ2VzLyIgQUREX0RBVEU9
+IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2
+NDY4NzQiPkV1cm9kZWFkLm5ldCBMaW5rcyBEaXJlY3Rvcnk8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3LnBzeWtlZGVsYm9rLnNlL2dhcmNpYXNfZ3VpdGFycy5odG1sIiBBRERf
+REFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NCI+R2FyY2lhJ3MgR3VpdGFycyBNYWMgVmlkZW8gR2FtZTwvQT4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZ2RjZGNvdmVycy5jb20vIiBBRERfREFURT0iMTA0MjY0
+Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+
+R0QgQ0QtUiBDb3ZlcnM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lmdvb2ds
+ZS5jb20vc2VhcmNoP3E9Z3JhdGVmdWwrZGVhZCsxJTJGMjAlMkY3OSIgQUREX0RBVEU9IjEwNDI2
+NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQi
+Pkdvb2dsZSBTZWFyY2ggZ3JhdGVmdWwgZGVhZCAxLTIwLTc5PC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL2dyb3Vwcy5nb29nbGUuY29tL2dyb3Vwcz9obD1lbiZscj0mc2FmZT1vZmYm
+Z3JvdXA9cmVjLm11c2ljLmdkZWFkIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+R29vZ2xlIFNlYXJjaCByZWMu
+bXVzaWMuZ2RlYWQ8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZGlyZWN0b3J5Lmdv
+b2dsZS5jb20vVG9wL0FydHMvTXVzaWMvQmFuZHNfYW5kX0FydGlzdHMvRy9HcmF0ZWZ1bF9EZWFk
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPkdvb2dsZSBXZWIgRGlyZWN0b3J5IC0gQXJ0cyAgTXVzaWMgIEJh
+bmRzoGFuZKBBcnRpc3RzICBHICBHcmF0ZWZ1bKBEZWFkPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy5ncmFtbXkuY29tL2ZlYXR1cmVzLzAxMTdfbWNuYWxseS5odG1sIiBBRERf
+REFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NCI+R1JBTU1ZLmNvbSAtIEludGVydmlldyB3aXRoIERlbm5pcyBNY05hbGx5PC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5ncmF0ZWZ1bGRheS5jb20vIiBBRERf
+REFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NCI+R3JhdGVmdWwgRGF5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy53ZWxsLmNvbS91c2VyL2FsbWFuYWMvIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+R3JhdGVmdWwgRGVh
+ZCBBbG1hbmFjPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5iYXJuY2FyZC5j
+b20vZ2QuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkdSQVRFRlVMIERFQUQgQVQgV0lOVEVSTEFORCwg
+TkVXIFlFQVInUyAxOTcyLTczPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5k
+ZWFkZGlzYy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+R3JhdGVmdWwgRGVhZCBGYW1pbHkgRGlzY29n
+cmFwaHk8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNzLmNtdS5lZHUvfm1s
+ZW9uZS9nZGVhZC9mYXEvZmFxLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5HcmF0ZWZ1bCBEZWFkIEZy
+ZXF1ZW50bHkgQXNrZWQgUXVlc3Rpb25zPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5uZXRyZWFjaC5uZXQvfm5ob2plbS9kZWFkbGluay5odG0iIEFERF9EQVRFPSIxMDQyNjQ2
+ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5H
+cmF0ZWZ1bCBEZWFkIExpbmtzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5n
+ZGxpdmUuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkdSQVRFRlVMIERFQUQgTElWRSAtIHd3dy5nZGxp
+dmUuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dzMuY2xlYXJsaWdodC5j
+b20vfmFjc2EvaW50cm8uaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+R3JhdGVmdWwgRGVhZCBMeXJpYyBB
+bmQgU29uZyBGaW5kZXI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lmd1aXRh
+ci5jb20vRzJLZmVhdHVyZXMvdmlld2ZlYXR1cmUuYXNwP2ZlYXR1cmVJRD00MiIgQUREX0RBVEU9
+IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2
+NDY4NzQiPkd1aXRhci5jb20gLSBKZXJyeSBHYXJjaWEgVGhlIEFjb3VzdGljIE1hbidzIERlYWQ8
+L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnN0cmF0ZWd5LWJ1c2luZXNzLmNv
+bS9zdHJhdGVneS85NzEwNi9wYWdlMS5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+SG93IHRvICdUcnVj
+aycgdGhlIEJyYW5kIExlc3NvbnMgZnJvbSB0aGUgR3JhdGVmdWwgRGVhZCAtIFBhZ2UgMTwvQT4N
+CiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9sYXdyb21haW5lLmNvbS9pZDQuaHRtIiBBRERf
+REFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NCI+SmVycnkgR2FyY2lhcyBHdWl0YXJzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy5jb25zZXJ2YXRvcnkuY29tL2VyaWMvIiBBRERfREFURT0iMTA0MjY0Njg3
+NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+TG9u
+ZSBTdGFyIERlYWQgd2ViIHNwYWNlPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5wc2lsby5jb20vZGVhZC9pbmRleC5waHAiIEFERF9EQVRFPSIxMDQ2NDQzMjk1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQ2NDQzMjk1Ij5wc2lsby5jb20gLSBE
+ZWFkIFRpY2tldHMsIFBhc3NlcywgJiBMYW1pbmF0ZXM8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LnJvY2toYWxsLmNvbS9ob2YvaW5kdWN0ZWUuYXNwP2lkPTExMyIgQUREX0RB
+VEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzQiPlJvY2sgYW5kIFJvbGwgSGFsbCBvZiBGYW1lIGFuZCBNdXNldW0gIEhhbGwgb2Yg
+RmFtZSAgSW5kdWN0ZWUgRGV0YWlsPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5yb2xsaW5nc3RvbmUuY29tL2FydGlzdHMvZGVmYXVsdC5hc3A/YWZsPXNlcyZvaWQ9MzQzIiBB
+RERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NCI+Um9sbGluZ1N0b25lLmNvbSBBcnRpc3RzIFRoZSBHcmF0ZWZ1bCBEZWFk
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2RiLmV0cmVlLm9yZy9zaG5saXN0LnBo
+cD9hcnRpc3Q9MiZ5ZWFyPTE5OTUiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5TSE4gTGlzdCBmb3IgR3JhdGVm
+dWwgRGVhZDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZWZmLm9yZy9wdWIv
+UHVibGljYXRpb25zL0pvaG5fUGVycnlfQmFybG93L0hUTUwvYmFybG93c19seXJpY3MuaHRtbCIg
+QUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzQiPlNvbmdzIGZvciB0aGUgRGVhZDwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cuc2ZnYXRlLmNvbS9jZ2ktYmluL2FydGljbGUuY2dpP2ZpbGU9L2MvYS8y
+MDAxLzExLzA2L0RENjIzNjQuRFRMIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+U3RyaW5ncyBvZiBnb2xkIC0g
+VGhlcmUgd2FzIHNvbWV0aGluZyBzcGVjaWFsIGFib3V0IERvdWcgSXJ3aW4ncyBndWl0YXJzLCBh
+bmQgSmVycnkgR2FyY2lhIGtuZXc8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+Lm1hdGgudWthbnMuZWR1L3RidC92ZW51ZXMvTlkuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRCVCBW
+ZW51ZXMgTmV3IFlvcms8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vYXJ0cy51Y3Nj
+LmVkdS9nZGVhZC9hZ2RsLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZSBBbm5vdGF0ZWQgR3JhdGVmdWwg
+RGVhZCBMeXJpY3MsIGJ5IERhdmlkIERvZGQ8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LmV1cm9kZWFkLm5ldC9jZ2ktYmluL2lrb25ib2FyZC9mb3J1bXMuY2dpP2ZvcnVtPTIi
+IEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc0Ij5UaGUgRGVhZEJvYXJkICBEZWFkIEdlbmVyYWwgIEdvdCBzb21ldGhp
+bmcgdG8gdGFsayBhYm91dDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubWFt
+YmEuZGVtb24uY28udWsvaGVhZHMvaW5kZXguaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZSBEZWFk
+aGVhZHMgTmV3c2xldHRlcnMgMTk3MiAtMTk3NDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cuYXBibmV3cy5jb20vbWVkaWEvZ2ZpbGVzL2RlYWQvZGVhZGZpbGVzLmh0bWwiIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc0Ij5UaGUgR3JhdGVmdWwgRGVhZCAtIEZCSSBGaWxlczwvQT4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc2V0bGlzdHMubmV0LyIgQUREX0RBVEU9IjEwNDI2NDY4
+NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRo
+ZSBTZXRMaXN0IFByb2dyYW08L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnRo
+ZXNtb2tpbmdndW4uY29tL2FyY2hpdmUvZ2FyY2lhMS5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3
+NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+VGhl
+IFNtb2tpbmcgR3VuIEFyY2hpdmUtIEdhcmNpYSdzIEFzc2V0czwvQT4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly93d3cudGhlc3RhbmRhcmQuY29tL2FydGljbGUvZGlzcGxheS8wLDExNTEs
+MjI4NTAsMDAuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPlRoZVN0YW5kYXJkLmNvbSBJJ20gV2l0aCB0
+aGUgQnJhbmQ8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vaG9tZS5ueWNhcC5yci5j
+b20vY29udGVudC91c19kZWFkLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5VbmNsZSBTYW0gYW5kIHRo
+ZSBHcmF0ZWZ1bCBEZWFkPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53aXJl
+ZC5jb20vbmV3cy9jdWx0dXJlLzAsMTI4NCw0MzE4NCwwMC5odG1sIiBBRERfREFURT0iMTA0MjY0
+Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+
+V2lyZWQuY29tIC0gQXByaWwgMjMsIDIwMDEgLSBEZWFkaGVhZHMgTWF5IE5vdCBCZSBHcmF0ZWZ1
+bDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZ2RsaXZlLmNvbS9zaG4vIiBB
+RERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NCI+d3d3LmdkbGl2ZS5jb20gLSAtc2huLTwvQT4NCiAgICA8L0RMPjxwPg0K
+ICAgIDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc0Ij5JbmRpZSBNdXNpYyBTaXRl
+czwvSDM+DQogICAgPERMPjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5pbmRp
+ZXRhYnMubmV0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPi0taW5kaWV0YWJzLm5ldCAgaSBjYW4ndCBmcmVl
+c3R5bGUuIGknbSBhIGxvdyBidWRnZXQgbHVkYWNyaXMuPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy4zMG11c2ljLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij4tMzAtbXVzaWMgLi4u
+IDMwbXVzaWMuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy4zd2suY29t
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzQiPjNXSyBVbmRlcmdyb3VuZCBSYWRpbyAtIEludGVybmV0IE9ubHkg
+QWx0ZXJuYXRpdmUgUmFkaW8hPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5h
+dmVyc2lvbi5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+QXZlcnNpb24uY29tIC0gUm9jayAgUHVuayAg
+SW5kaWUgTXVzaWM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmJhcnN1ay5j
+b20vd2ViLmNnaSIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPmJhcnN1ayByZWNvcmRzPC9BPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5jbWouY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzQiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzQiPkNNSiBOZXcg
+TXVzaWMgRmlyc3Q8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vY3dhcy5oaW5haC5j
+b20vbmV3cy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5Db21lcyB3aXRoIGEgU21pbGU8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LjItNC03LW11c2ljLmNvbS9mcm9udHBhZ2UuYXNwIiBB
+RERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NCI+Q3J1ZCBNYWdhemluZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cuYWRlcXVhY3kubmV0L2luZGV4LnNodG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIg
+TEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+RGVsdXNp
+b25zIG9mIEFkZXF1YWN5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5kdXN0
+ZWRtYWdhemluZS5jb20vIiBBRERfREFURT0iMTA0NTE2NzU4NSIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0NTE2NzU4NSI+RHVzdGVkIE1hZ2F6aW5lPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5lbW1pZW1hZy5jb20vIiBBRERfREFURT0iMTA0
+MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NCI+RW1taWUgTWFnYXppbmU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmVw
+aXRvbmljLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQz
+IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5FcGl0b25pYy5jb20gSGkgUXVhbGl0eSBGcmVl
+IE1QMyBNdXNpYzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYmFzZW1lbnQt
+bGlmZS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIg
+TEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+aHR0cC0td3d3LmJhc2VtZW50LWxpZmUuY29tLTwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuaHlicmlkbWFnYXppbmUuY29tL2lu
+ZGV4Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc0Ij5oeWJyaWRtYWdhemluZS5jb208L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmlubXVzaWN3ZXRydXN0LmNvbS8iIEFERF9EQVRFPSIx
+MDQyNjQ2ODc0IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2
+ODc0Ij5JbiBNdXNpYyBXZSBUcnVzdDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cuaW5kaWV3b3Jrc2hvcC5jb20vbmV3cy8iIEFERF9EQVRFPSIxMDQ1MTcwNTM3IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQ1MTcwNTM4Ij5pbmRpZXdvcmtzaG9w
+LmNvbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuaW5zb3VuZC5jb20vIiBB
+RERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NCI+aW5zb3VuZDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cuanVua21lZGlhLm9yZy9pbmRleC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NCIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NCI+aiB1IG4gayBtIGUg
+ZCBpIGEgIG11c2ljIG5ld3MsIHJldmlld3MgJiBpbnRlcnZpZXdzPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL2xvc3RhdHNlYS5uZXQvTEFTLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkwgbyBz
+IHQgQSB0IFMgZSBhIC4gbyBuIGwgaSBuIGU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LmtuZXJkLmNvbS9+aW5kaWVwb3BsaXZlLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkxpdmUgSW5k
+aWUgUm9jayBNdXNpYzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9tcDMucGFsdWth
+dmlsbGUubmV0L2RlZmF1bHQuYXNwP2JhbmQ9MyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPm1wMy5wYWx1a2F2
+aWxsZS5uZXQ8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnByb2plY3RhdGxh
+bnRpc3ppbmUuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlAgUiBPIEogRSBDIFQgIEEgVCBMIEEgTiBU
+IEkgUyBaIEkgTiBFPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5waXRjaGZv
+cmttZWRpYS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+UGl0Y2hmb3JrbWVkaWEuY29tPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5wb3BtYXR0ZXJzLmNvbS8iIEFERF9EQVRFPSIx
+MDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2
+ODc1Ij5Qb3BNYXR0ZXJzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5yb2Nr
+ZXQtZnVlbC5jb20vIiBBRERfREFURT0iMTA0NTE3MDA2NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MyIgTEFTVF9NT0RJRklFRD0iMTA0NTE3MDA2NSI+Um9ja2V0IEZ1ZWwgT25saW5lIE1hZ2F6aW5l
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zb3VuZHRoZXNpcmVucy5jb20v
+IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NSI+U09VTkRUSEVTSVJFTlMuQ09NIC0gSW5kZXBlbmRlbnQgT25saW5l
+IE1hZ2F6aW5lPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zcGxlbmRpZGV6
+aW5lLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5TcGxlbmRpZDwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly90b25ldmVuZG9yLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij50b25ldmVuZG9yLmNv
+bSAuIHdlbGNvbWU8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBBRERfREFU
+RT0iMTA0MjY0Njg3NSI+SW5mb3JtYXRpb24gQXJjaGl0ZWN0dXJlPC9IMz4NCiAgICA8REw+PHA+
+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vYXJndXMtYWNpYS5jb20vaW5kZXguaHRtbCIg
+QUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzUiPkFyZ3VzIENlbnRlciBmb3IgSW5mb3JtYXRpb24gQXJjaGl0ZWN0dXJl
+PC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4
+NzUiPkpvYnM8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cuYnVmZmFsb2pvYmZpbmRlci5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+QnVmZmFsb0pvYkZpbmRl
+ci5jb208L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmdyZWF0am9ibmV0d29y
+ay5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+R3JlYXRKb2JOZXR3b3JrLmNvbSAgSm9icyBpbiBCdWZm
+YWxvLCBOZXcgWW9yazwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuaG90am9i
+cy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+SG90Sm9icy5jb208L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3LmlhbWJ1ZmZhbG9uaWFnYXJham9icy5jb20vIiBBRERfREFURT0iMTA0
+MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NSI+aWFtYnVmZmFsb25pYWdhcmFqb2JzLmNvbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cud255am9icy5jb20vZGVmYXVsdC5hc3AiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5XZXN0ZXJu
+IE5ldyBZb3JrIEpvYnMgPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiPkxhYjwvSDM+DQogICAgPERMPjxwPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy5ibGFja2xhYnN0dWRpb3MuY29tL0dhbGxlcnlfZmlsZXMvZ2FsbGVy
+eS1hdXR1bW4uaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+QmxhY2sgTGFiIFN0dWRpb3MgLSBHYWxsZXJ5
+IEF1dHVtbjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucHVwc29uY3Vwcy5j
+b20vbGlua3MvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIg
+TEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+RG9nIExpbmtzIC0gRS1jb21tZXJjZTwvQT4NCiAg
+ICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubHVja3lsYWIuY29tLyIgQUREX0RBVEU9IjEw
+NDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4
+NzUiPkxVQ0tZIExBQlJBRE9SIEJSRVdJTkcgQ09NUEFOWTwvQT4NCiAgICA8L0RMPjxwPg0KICAg
+IDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQxMjY1NzgzIj5MaW5rczwvSDM+DQogICAgPERM
+PjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy4zd2suY29tL2NoYXJ0Lmh0bSIg
+QUREX0RBVEU9IjEwNDQyODg4NTMiIExBU1RfVklTSVQ9IjEwNDgxNzIzNDMiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDQyODg4NTMiPjNXSzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9hZG1p
+bi5zeW5hY29yLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTcy
+MjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5BZG1pbjwvQT4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly93d3cuYnVmZmFsb25ld3MuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzIyNDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkJOZXdz
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53bnltdXNpYy5jb20vYm9hcmQi
+IEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTcyOTUyIiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc1Ij5Cb2FyZDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9k
+Yi5ldHJlZS5vcmcvYnJvamF5IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0
+ODE3MjM0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+Q0RSPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5kZW1vbi5uZXQvZXh0ZXJuYWwvIiBBRERfREFURT0iMTA0MjY0
+Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjM0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+
+RGVtb248L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vY2dpMS5lYmF5LmNvbS9hdy1j
+Z2kvZWJheUlTQVBJLmRsbD9NeUViYXlJdGVtc0JpZGRpbmdPbiZ1c2VyaWQ9amF5dHJhZGVyNzEm
+cGFzcz1oVlRVYkU4UHMxNnJkcXQ1SC5jNDMwMiZmaXJzdD1OJnNlbGxlclNvcnQ9MyZiaWRkZXJT
+b3J0PTMmd2F0Y2hTb3J0PTMmZGF5c3NpbmNlPTImcDE9MCZwMj0wJnAzPTAmcDQ9MCZwNT0wIiBB
+RERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NSI+ZUJheTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cu
+ZmFyay5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjI0NCIg
+TEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+RmFyazwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly93d3cuZ29vZ2xlLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTcyMzQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Hb29nbGU8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vcWEuY2hlay5jb20vfmpnZXJsYW5kL3Bob2VuaXgvamF5
+LnBocD9wcm9kX2NvZGU9NDMiIEFERF9EQVRFPSIxMDQ0NjM5ODQ4IiBMQVNUX1ZJU0lUPSIxMDQ4
+MTcyMjQ0IiBMQVNUX01PRElGSUVEPSIxMDQ4MDgzNTU1Ij5qYXk8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3Lmxpc2hvc3QuY29tL35qYXkvd255bXVzaWMvYm9hcmQvIiBBRERf
+REFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjM0MyIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NSI+TGlzaG9zdCAtIEJvYXJkPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0
+cHM6Ly9vbmxpbmViYW5raW5nLm1hbmR0YmFuay5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIg
+TEFTVF9WSVNJVD0iMTA0ODE3MjM0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+TSZUPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taW5kbGVhZGVycy5jb20vIiBBRERf
+REFURT0iMTA0NTA2MzkzOSIgTEFTVF9WSVNJVD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0i
+MTA0NTA2MzkzOSI+TWluZExlYWRlcnM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+d3d3Lm1zbmJjLmNvbS9uZXdzL2RlZmF1bHQuYXNwIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFT
+VF9WSVNJVD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+TVNOPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL215LmZvb2wuY29tLyIgQUREX0RBVEU9IjEwNDI2
+NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzIzNDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUi
+Pk15Rm9vbDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9teXViLmJ1ZmZhbG8uZWR1
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzIzNDMiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzUiPk15VUI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+d3d3Lm55dGltZXMuY29tL3lyL21vL2RheS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTcyMjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5OWVQ8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJqYXZhc2NyaXB0OnBocGZ1bmM9d2luZG93LnByb21wdCgnUEhQIEZ1
+bmN0aW9uIExvb2t1cDonLCcnKSA7IGlmKHBocGZ1bmMgJiYgcGhwZnVuYyAhPSAnJykgeyB3aW5k
+b3cubG9jYXRpb24gPSAnaHR0cDovL3d3dy5waHAubmV0L21hbnVhbC1sb29rdXAucGhwP2Z1bmN0
+aW9uPScgK3BocGZ1bmM7IH0gZWxzZSB7IGhpc3RvcnkuZ28oLTEpOyB9IiBBRERfREFURT0iMTA0
+MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NSI+UEhQPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3FhLmNoZWsuY29tL2NoZWtp
+bi5waHA/dV9kPWpheXRlc3RAcWEuY2hlay5jb20mcGFzc3dvcmQ9dGVzdGpheSZib3VuY2V0bz10
+ZW1wbGF0ZTEzLmNoZWsuY29tIiBBRERfREFURT0iMTA0MzMzOTg5OSIgTEFTVF9WSVNJVD0iMTA0
+ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0iMTA0NjQ0ODY4NCI+UG9ydGFsUUE8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vcWEuY2hlay5jb20vfmpnZXJsYW5kL3Byb3BsYXQzLyIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzIyNDMiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPlBQMzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9xYS5jaGVr
+LmNvbS9+amdlcmxhbmQvcHJvcGxhdDQvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJ
+VD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+UFA0PC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL2RiLmV0cmVlLm9yZy9zaG93bWFpbnQvY29ycmVjdGlvbnMv
+IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3MjM0MyIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NSI+U2V0bGlzdCBDb3JyZWN0aW9uczwvQT4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly9zbGFzaGRvdC5vcmcvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9W
+SVNJVD0iMTA0ODE3MjI0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+U2xhc2g8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnRoZWJsYWNrZG9nLm9yZy8iIEFERF9EQVRF
+PSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTcyMzQzIiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc1Ij5UTUQ8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBBRERfREFU
+RT0iMTA0MjY0Njg3NSI+TWVkaWE8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9pc2FwaS9yZWRpci5kbGw/cHJkPVdpbmRvd3Mm
+c2JwPU1lZGlhUGxheWVyJmFyPUZhdm9yaXRlJnNiYT1CbG9vbWJlcmcmcHZlcj02LjIiIEFERF9E
+QVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc1Ij5CbG9vbWJlcmc8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+Lm1pY3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1XaW5kb3dzJnNicD1NZWRpYVBsYXll
+ciZhcj1GYXZvcml0ZSZzYmE9Q2FwaXRvbCZwdmVyPTYuMiIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkNhcGl0
+b2wgUmVjb3JkczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubWljcm9zb2Z0
+LmNvbS9pc2FwaS9yZWRpci5kbGw/cHJkPVdpbmRvd3Mmc2JwPU1lZGlhUGxheWVyJmFyPUZhdm9y
+aXRlJnNiYT1DQlMmcHZlcj02LjIiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5DQlM8L0E+DQogICAgICAgIDxE
+VD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1X
+aW5kb3dzJnNicD1NZWRpYVBsYXllciZhcj1GYXZvcml0ZSZzYmE9Q05CQyZwdmVyPTYuMiIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPkNOQkMgRG93IEpvbmVzIEJ1c2luZXNzIFZpZGVvPC9BPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2lzYXBpL3JlZGlyLmRsbD9wcmQ9
+V2luZG93cyZzYnA9TWVkaWFQbGF5ZXImYXI9RmF2b3JpdGUmc2JhPUNORVQmcHZlcj02LjIiIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij5DTkVUIFRvZGF5IC0gVGVjaG5vbG9neSBOZXdzPC9BPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2lzYXBpL3JlZGlyLmRsbD9wcmQ9
+V2luZG93cyZzYnA9TWVkaWFQbGF5ZXImYXI9RmF2b3JpdGUmc2JhPUNOTiZwdmVyPTYuMiIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPkNOTiBWaWRlb3NlbGVjdDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9pc2FwaS9yZWRpci5kbGw/cHJkPVdpbmRvd3Mmc2JwPU1l
+ZGlhUGxheWVyJmFyPUZhdm9yaXRlJnNiYT1EaXNuZXkmcHZlcj02LjIiIEFERF9EQVRFPSIxMDQy
+NjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1
+Ij5EaXNuZXk8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5j
+b20vaXNhcGkvcmVkaXIuZGxsP3ByZD1XaW5kb3dzJnNicD1NZWRpYVBsYXllciZhcj1GYXZvcml0
+ZSZzYmE9RVNQTiZwdmVyPTYuMiIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkVTUE4gU3BvcnRzPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2lzYXBpL3JlZGlyLmRs
+bD9wcmQ9V2luZG93cyZzYnA9TWVkaWFQbGF5ZXImYXI9RmF2b3JpdGUmc2JhPUZveE5ld3MmcHZl
+cj02LjIiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Gb3ggTmV3czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9pc2FwaS9yZWRpci5kbGw/cHJkPVdpbmRvd3Mmc2Jw
+PU1lZGlhUGxheWVyJmFyPUZhdm9yaXRlJnNiYT1Gb3hTcG9ydHMmcHZlcj02LjIiIEFERF9EQVRF
+PSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc1Ij5Gb3ggU3BvcnRzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5t
+aWNyb3NvZnQuY29tL2lzYXBpL3JlZGlyLmRsbD9wcmQ9V2luZG93cyZzYnA9TWVkaWFQbGF5ZXIm
+YXI9RmF2b3JpdGUmc2JhPUhvbGx5d29vZCZwdmVyPTYuMiIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkhvbGx5
+d29vZCBPbmxpbmU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29m
+dC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD13aW5kb3dzJnNicD1tZWRpYXBsYXllciZhcj1NZWRp
+YSZzYmE9UmFkaW9HdWlkZSZwdmVyPTYuMiIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkludGVybmV0IFJhZGlv
+IEd1aWRlPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQuY29t
+L2lzYXBpL3JlZGlyLmRsbD9wcmQ9V2luZG93cyZzYnA9TWVkaWFQbGF5ZXImYXI9RmF2b3JpdGUm
+c2JhPU1TTkJDJnB2ZXI9Ni4yIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+TVNOQkM8L0E+DQogICAgICAgIDxE
+VD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1X
+aW5kb3dzJnNicD1NZWRpYVBsYXllciZhcj1GYXZvcml0ZSZzYmE9TXVzaWNWaWRlb3MmcHZlcj02
+LjIiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc1Ij5NVVNJQ1ZJREVPUy5DT008L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1XaW5kb3dz
+JnNicD1NZWRpYVBsYXllciZhcj1GYXZvcml0ZSZzYmE9TkJDJnB2ZXI9Ni4yIiBBRERfREFURT0i
+MTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NSI+TkJDIFZpZGVvU2Vla2VyPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iY2FzdDM6Ly8y
+NC40Ni42My4xNjA6NDIwMC9qZXJyeSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlN1Z2FybWVncyBMaXZlIFN0
+cmVhbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9p
+c2FwaS9yZWRpci5kbGw/cHJkPVdpbmRvd3Mmc2JwPU1lZGlhUGxheWVyJmFyPUZhdm9yaXRlJnNi
+YT1UVkd1aWRlJnB2ZXI9Ni4yIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0MyIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+VFYgR3VpZGUgRW50ZXJ0YWlubWVu
+dCBOZXR3b3JrPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQu
+Y29tL2lzYXBpL3JlZGlyLmRsbD9wcmQ9V2luZG93cyZzYnA9TWVkaWFQbGF5ZXImYXI9RmF2b3Jp
+dGUmc2JhPVVuaXZlcnNhbFN0dWRpb3MmcHZlcj02LjIiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Vbml2ZXJz
+YWwgU3R1ZGlvcyBPbmxpbmU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1p
+Y3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1XaW5kb3dzJnNicD1NZWRpYVBsYXllciZh
+cj1GYXZvcml0ZSZzYmE9V2FybmVyQnJvcyZwdmVyPTYuMiIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDMiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPldhcm5l
+ciBCcm9zLiBIaXAgQ2xpcHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1p
+Y3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3ByZD1udHNlcnZlciZzYnA9bmV0c2hvdyZhcj1O
+ZXRTaG93JnNiYT1FdmVudHMmcHZlcj0zLjAiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQzIiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5XaGF0J3MgT24gTm93
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL2lzYXBp
+L3JlZGlyLmRsbD9wcmQ9d2luZG93cyZzYnA9bWVkaWFwbGF5ZXImYXI9TWVkaWEmc2JhPUd1aWRl
+JnB2ZXI9Ni4yIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIg
+TEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+V2luZG93cyBNZWRpYSBTaG93Y2FzZTwvQT4NCiAg
+ICA8L0RMPjxwPg0KICAgIDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc1Ij5NdXNp
+YzwvSDM+DQogICAgPERMPjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5kY24u
+Y29tL2luZGV4LnNodG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+RGlnaXRhbCBDbHViIE5ldHdvcmsgKERD
+TikgLSBUaGUgTGl2ZSBNdXNpYyBTb3VyY2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LmVwaXRvbmljLmNvbS9pbmRleC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+RXBpdG9uaWMu
+Y29tIEhpIFF1YWxpdHkgRnJlZSBNUDMgTXVzaWM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJo
+dHRwOi8vbXAzLnBhbHVrYXZpbGxlLm5ldC9kZWZhdWx0LmFzcD9iYW5kPTMiIEFERF9EQVRFPSIx
+MDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2
+ODc1Ij5JbmRpZSBMaXZlIE1QM3MgLSBtcDMucGFsdWthdmlsbGUubmV0PC9BPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5rbmVyZC5jb20vfmluZGllcG9wbGl2ZS8iIEFERF9EQVRF
+PSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc1Ij5MaXZlIEluZGllIFJvY2sgTXVzaWM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJo
+dHRwOi8vZWFzeWNhc3Qtc2YubGl2ZTM2NS5jb20vbWVtYmVycy9jb250cm9scGFuZWwubGl2ZSIg
+QUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzUiPkxpdmUzNjUuY29tIC0gQnJvYWRjYXN0PC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL2dpci5tcDMuY29tL2dpcj9nZW5yZV9pZD0wJmdlb19pZD0wMDAwMzA0
+OCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzUiPk1QMy5jb20gQnVmZmFsbzwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cubXVzaWN0b2RheS5jb20vZGVmYXVsdC5hc3AiIEFERF9EQVRFPSIxMDQy
+NjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1
+Ij5NdXNpY1RvZGF5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5jaG9pY2Vv
+bmVvbmxpbmUuY29tL350aW0vbXAzL2pheS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5UaW0ncyBTZWNyZXQg
+TVAzIFN0YXNoPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9
+IjEwNDI2NDY4NzUiPk5pY2UgU2l0ZXM8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly93d3cuYXRnLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5BcnQgVGVjaG5vbG9n
+eSBHcm91cDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYmxhY2tkb2dpbnRl
+cmFjdGl2ZS5jb20vaW5kZXguYXNwIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+QmxhY2sgRG9nIEludGVyYWN0
+aXZlICBBIE5ldyBCcmVlZDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYm9y
+bm1hZy5jb20vbW90aGVyLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Cb3JuIE1hZ2F6aW5lIERlc2ln
+biBhbmQgTGl0ZXJhdHVyZSBDb2xsYWJvcmF0aW9uPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL3d3dy5icmllbmNlLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5CcmllbmNlLmNvbTwvQT4N
+CiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZmFjdGl2YS5jb20vIiBBRERfREFURT0i
+MTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NSI+RmFjdGl2YSwgYSBEb3cgSm9uZXMgUmV1dGVycyBDb21wYW55PC9BPg0KICAgICAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mYWN0b3JkZXNpZ24uY29tLyIgQUREX0RBVEU9IjEwNDI2
+NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUi
+PkZBQ1RPUiBERVNJR048L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmVzY2Fw
+ZWhldi5jb20vaW5kZXguYXNwIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+Rm9yZCBIRVY8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmZ1c2lvbm9uZS5jb20vIiBBRERfREFURT0iMTA0MjY0
+Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+
+ZnVzaW9uT25lPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5paHQuY29tL2Zy
+b250cGFnZS5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+SW50ZXJuYXRpb25hbCBIZXJhbGQgVHJpYnVu
+ZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuaXN5bmRpY2F0ZS5jb20vIiBB
+RERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NSI+aVN5bmRpY2F0ZSBTeW5kaWNhdGlvbiBzb2x1dGlvbnMgYnVpbHQgb24g
+b3VyIEludGVsbGlnZW50IFN5bmRpY2F0aW9uIE5ldHdvcms8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3Lm9kZGNhc3QuY29tL25ld3NpdGUyL3NpdGUvaW5kZXguaHRtbCIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPm9kZGNhc3Q8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+LnNpZWdlbGdhbGUuY29tL2luZGV4X2ZsYXNoLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5zaWVnZWxn
+YWxlICBMYXVuY2g8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBBRERfREFU
+RT0iMTA0MjY0Njg3NSI+UEhQPC9IMz4NCiAgICA8REw+PHA+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vY29kZXdhbGtlcnMuY29tLyIgQUREX0RBVEU9IjEwNDc1NzAzOTQiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDc1NzAzOTUiPmNvZGV3YWxrZXJzLmNv
+bSAtIG1haW4gcGFnZSAtIFBIUCBIZWxwPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5lendlYmRlc2lnbi5jb20vcGhwLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5FWndlYmRlc2ln
+bi5jb20gLSBQSFAgUmVzb3VyY2VzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5ob3RzY3JpcHRzLmNvbS9QSFAvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+SG90U2NyaXB0cy5jb20gUEhQ
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5waHBpbnNpZGVyLmNvbS8iIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij5odHRwLS13d3cucGhwaW5zaWRlci5jb20tPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5tYWNyb21lZGlhLmNvbS9zb2Z0d2FyZS9kcmVhbXdlYXZlci9z
+cGVjaWFsL2V4dGVuZC9waHAvaW5kZXguaHRtbD9wcm9tb2lkPWZtYTVhIiBBRERfREFURT0iMTA0
+NzU3MzE5NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0NzU3MzE5
+NyI+TWFjcm9tZWRpYSAtIFBIUCBhbmQgRHJlYW13ZWF2ZXIgTVg8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3Lm15c3FsLmNvbS9kb2N1bWVudGF0aW9uL215c3FsL2NvbW1lbnRl
+ZC8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc1Ij5NeVNRTCAgRG9jdW1lbnRhdGlvbiAgTXlTUUwgIENvbW1lbnRl
+ZCBNeVNRTCBNYW51YWw8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vbnlwaHAub3Jn
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzUiPk5ldyBZb3JrIFBIUCAtIExpbnV4IEFwYWNoZSBNeVNRTCBQSFA8
+L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBocGhpZGVvdXQuY29tL2FydGlj
+bGVzLnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBIUCBIaWRlb3V0PC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy5waHAubmV0L2luZGV4LnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBIUCBI
+eXBlcnRleHQgUHJlcHJvY2Vzc29yPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5waHAtbWFnLmRlLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBIUCBNYWdhemluIC0gR2VybWFuPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5waHAubmV0L21hbnVhbC9lbi9mdW5jdGlv
+bi5kYXRlLnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBIUCBNYW51YWwgZGF0ZTwvQT4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucGhwd29ybGQuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4
+NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBI
+UCBXT1JMRCAtIEZyZWUgUEhQIEhlbHAgLCBSZXNvdXJjZXMgYW5kIFNjcmlwdHMgQ29uc3VsdGlu
+ZyAtIE1ZU1FMLCBPcmFjbGUgZGF0YWJhc2UgUEhQIFN1cHBvPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy5waHBudWtlLm9yZy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5QSFAtTnVrZTwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucGhwYnVpbGRlci5jb20vIiBBRERf
+REFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NSI+UEhQQnVpbGRlci5jb20gLSBUaGUgUmVzb3VyY2UgRm9yIFBIUCBEZXZlbG9w
+ZXJzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3BocC1jb24uY29tLyIgQUREX0RB
+VEU9IjEwNDc1NjU4NTIiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEw
+NDc1NjU4NTIiPlBIUENvbiBFYXN0IDIwMDMgIFVTIENvbmZlcmVuY2UgZm9yIFBIUCBEZXZlbG9w
+ZXJzLjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9waHBkZXZlbG9wZXIub3JnLyIg
+QUREX0RBVEU9IjEwNDc1NzA0MzgiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDc1NzA0MzkiPlBIUERldmVsb3Blci5vcmc8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LnBocGtpdGNoZW4uY29tLyIgQUREX0RBVEU9IjEwNDc1NjU4MTEiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDc1NjU4MTIiPlBIUGtpdGNoZW4g
+LSBDb21lIFNlZSBXaGF0J3MgQ29va2luJzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6
+Ly9waHB3aXphcmQubmV0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPnBocFdpemFyZCAtIEJ1aWxkaW5nIER5
+bmFtaWMgV2Vic2l0ZXMgd2l0aCBQSFA8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+cHguc2tsYXIuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBYIFBIUCBDb2RlIEV4Y2hhbmdlPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5vbW5pZ3JvdXAuY29tL21haWxtYW4vYXJj
+aGl2ZS93ZWJvYmplY3RzLWRldi8yMDAxLUZlYnJ1YXJ5LzAwNjgxOC5odG1sIiBBRERfREFURT0i
+MTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NSI+UmFuZG9tIENWUyBub3RlczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9w
+aHAucmVzb3VyY2VpbmRleC5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+VGhlIFBIUCBSZXNvdXJjZSBJ
+bmRleDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc3RhcnMuY29tL0F1dGhv
+cmluZy9MYW5ndWFnZXMvUEhQLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPldEVkwgUEhQPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5kLnVtbi5lZHUvaXRzcy9zdXBwb3J0L1RyYWluaW5n
+L09ubGluZS93ZWJkZXNpZ24vcGhwLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5XZWIgRGVzaWduIFJl
+ZmVyZW5jZXMgUEhQPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53ZWJtYXN0
+ZXJiYXNlLmNvbS9zdWJjYXRzLzUzIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+V2VibWFzdGVyQmFzZSAtIFBI
+UCBhbmQgTXlTUUw8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBBRERfREFU
+RT0iMTA0MjY0Njg3NSI+cGhwQkI8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly9oYWNrcy5waHBiYi5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+SGFja3MucGhwQkIu
+Q29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3BocGJiLnNvdXJjZWZvcmdlLm5l
+dC9waHBCQjIvaW5kZXgucGhwIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0
+ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+cGhwQkIgMiAgSW5kZXg8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vcGVyc29uYWwuYmVsbHNvdXRoLm5ldC9hdGwvYS9s
+L2FsaWV4YWkvcGhwYmIvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+cGhwQkIyIENWUyBzbmFwc2hvdHM8L0E+
+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBocGJiMi11c2Vycy5kZS8iIEFERF9E
+QVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc1Ij5waHBCQjIuZGU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vc291
+cmNlZm9yZ2UubmV0L3Byb2plY3RzL3BocGJiLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlNvdXJjZUZvcmdl
+IFByb2plY3QgSW5mbyAtIHBocEJCPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xE
+RUQgQUREX0RBVEU9IjEwNDI2NDY4NzUiPlBocE51a2U8L0gzPg0KICAgIDxETD48cD4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9waHBudWtlLm9yZy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1
+IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5QSFAt
+TnVrZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucWNoYy5jb20vIiBBRERf
+REFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NSI+UXVlYmVjIEhhcmRjb3JlIE5ld3M8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vZ3JvdXBzLnlhaG9vLmNvbS9ncm91cC9waHBudWtlL2ZpbGVzLyIgQUREX0RBVEU9
+IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2
+NDY4NzUiPllhaG9vISBHcm91cHMgIHBocG51a2UgRmlsZXM8L0E+DQogICAgPC9ETD48cD4NCiAg
+ICA8RFQ+PEgzIEZPTERFRCBBRERfREFURT0iMTA0MjY0Njg3NSI+UmVmZXJlbmNlczwvSDM+DQog
+ICAgPERMPjxwPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2FsbG11c2ljLmNvbS8iIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij5BTUcgQWxsIE11c2ljIEd1aWRlPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy5iYXJ0bGVieS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+QmFydGxlYnkuY29t
+IEdyZWF0IEJvb2tzIE9ubGluZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9meWku
+Y25uLmNvbS9meWkvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+Q05OZnlpLmNvbSAtIFN0dWRlbnQgTWFpbnBh
+Z2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZ3d1LmVkdS9+Z3ByaWNlL2hhbmRi
+b29rLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkZhc3QgRmFjdHMgSGFuZGJvb2s8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmhhcmNvdXJ0LmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2
+ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5o
+b21ld29yayBoZWxwIGFuZCBlZHVjYXRpb25hbCByZXNvdXJjZXMgYXQgaGFyY291cnQuY29tPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3doYXRpcy50ZWNodGFyZ2V0LmNvbS8iIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij53aGF0aXMuY29tPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBG
+T0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzUiPlNldGxpc3RzPC9IMz4NCiAgICA8REw+PHA+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmFsbG1hbmJyb3RoZXJzYmFuZC5jb20vbXVz
+aWMvYWJiYXNlLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5BbGxtYW4gQnJvdGhlcnMgQmFuZCBTZXRs
+aXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9iZW5oYXJwZXIubmV0L3NldGxp
+c3RzL2xhdW5jaC5waHAiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5CZW4gSGFycGVyIFNldGxpc3RzPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5taW5kc2hhcmVkZXNpZ24uY29tL2JsYWNr
+Y3Jvd2VzL3NldGxpc3RzLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5CbGFjayBDcm93cyBTZXRsaXN0
+cyAjMTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYm9hLmNvbS9jZi90YXBl
+c2VhcmNoLmNmbSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkJsYWNrIENyb3dzIFNldGxpc3RzICMyPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zZ2kubmV0L2JsdWVzdHJhdmVsZXIvU2V0
+bGlzdHMvZnJhbWUuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkJsdWVzIFRyYXZlbGVyIFNldGxpc3Rz
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5ibHVlc3RyYXZlbGVyLm5ldC9z
+ZXRsaXN0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkJsdWVzIFRyYXZlbGVyIFN0YWdlIGFuZCBQcmUtc2hv
+dyBTZXRsaXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZXhwZWN0aW5n
+cmFpbi5jb20vZG9rL3NldC90b3VybWFpbi5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+Qm9iIER5bGFu
+IFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5saXZlbWFybGV5
+LmNvbS9wZXJmb3JtLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkJvYiBNYXJsZXkgUGVyZm9ybWFuY2Vz
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5icnV1dWNlLmNvbS9zZXRsaXN0
+cy5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5CcnVjZSBIb3Juc2J5IFNldGxpc3RzPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5jaGFybGllaHVudGVyLmNvbS9zZXRsaXN0cy9pbmRl
+eC5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5DaGFybGllIEh1bnRlciBTZXRsaXN0cyA8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmVudGVyYWN0LmNvbS9+cmZ1c3MvY2Nib290cy5o
+dG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NSI+Q291bnRpbmcgQ3Jvd3MgQm9vdGxlZyBHdWlkZTwvQT4NCiAg
+ICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZ2VvY2l0aWVzLmNvbS9+c2F0ZWxsaXRlNzgv
+IzIwMDAiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Db3VudGluZyBDcm93cyBTZXRsaXN0cyAtIDI8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmRhcmtzdGFyb3JjaGVzdHJhLm5ldC9QYXN0
+X1NldGxpc3QuaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+RGFyayBTdGFyIE9yY2hlc3RyYSBTZXRsaXN0
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5uYW5jaWVzLm9yZy9kbWJ0YS8i
+IEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc1Ij5EYXZlIE1hdHRoZXdzIEJhbmQgU2V0bGlzdHM8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vbWljaGVsZWouaG9tZS5taW5kc3ByaW5nLmNvbS9kZXJla2Jh
+c2UvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NSI+RGVyZWsgVHJ1Y2tzIEJhbmQ8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LmRpc2NvYmlzY3VpdHMubmV0L3NldGxpc3RzLmh0bWwiIEFERF9E
+QVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc1Ij5EaXNjbyBCaXNjdWl0cyBTZXRsaXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cuZ2FsYWN0aWNmdW5rLmNvbS9zZXRsaXN0cy9kZWZhdWx0LmFzcCIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPkdhbGFjdGljIFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL3d3dy5tdWxlYmFzZS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+R292J3QgTXVsZSBTZXRs
+aXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZGVhZGxpc3RzLmNvbS8i
+IEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc1Ij5HcmF0ZWZ1bCBEZWFkTGlzdHM8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vd3d3Lm9uZS1wZXJjZW50LmNvbS9ib290b2dyYXBoeS9qYW5lc19hZGRpY3Rp
+b24vaW5kZXguc2h0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5KYW5lJ3MgQWRkaWN0aW9uIC0gQm9vdHM8
+L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmphenptYW5kb2xpbnByb2plY3Qu
+Y29tL3NldHMuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkphenogTWFuZG9saW4gUHJvamVjdCBTZXRs
+aXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cudGhlamVycnlzaXRlLmNv
+bS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc1Ij5KZXJyeSBHYXJjaWEgU2V0bGlzdHM8L0E+DQogICAgICAgIDxE
+VD48QSBIUkVGPSJodHRwOi8vd3d3LmplcnJ5am9zZXBoLmNvbS9TZXRsaXN0cy5odG1sIiBBRERf
+REFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NSI+SmVycnkgSm9zZXBoICYgdGhlIEphY2ttb3Jtb25zIC0gU2V0bGlzdHM8L0E+
+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNvYm8ub3JnL2NnaS1sb2NhbC9zZXRs
+aXN0cy9kYi5jZ2k/ZGI9ZGVmYXVsdCZ1aWQ9JnZpZXdfc2VhcmNoPTEiIEFERF9EQVRFPSIxMDQy
+NjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1
+Ij5KaW1teSBCdWZmZXQgU2V0bGlzdHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+d3d3Lmx1a2V3LmNvbS9rZHR1LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkthcmwgRGVuc29uJ3MgVGlueSBV
+bml2ZXJzZSBTZXRsaXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYm9v
+dGxlZHouY29tL3NldGxpc3RzLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkxlZCBaZXBwZWxpbiBTZXRs
+aXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly90aW5wYW4uZm9ydHVuZWNpdHku
+Y29tL3NhaW50cy83NTIvbG9zX3NldGxpc3QvIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+TGVmdG92ZXIgU2Fs
+bW9uIFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5jcnlzdGFs
+LW5pZ2h0LmNvbS9+YndpbGxlbi9NTVNldHMuaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+TW9kZXN0IE1v
+dXNlIFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5tb2VsaW5r
+cy5jb20vc2V0bGlzdHMvaW5kZXguaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPk1vZSBTZXRsaXN0czwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9jYW51ZmVlbGl0LmNvbS9Sb2JlcnQvdG9v
+c2V0bGlzdHMuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPk90aGVyIE9uZXMgU2V0bGlzdHM8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBoaWx6b25lLmNvbS9waGlsYmFzZS8iIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij5QaGlsIExlc2ggU2V0bGlzdHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vb3Vyd29ybGQuY29tcHVzZXJ2ZS5jb20vaG9tZXBhZ2VzL1BGQXJjaGl2ZXMvdG91
+cmRhdGUuaHRtIzE5NzIiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5QaW5rIEZsb3lkIENvbmNlcnQgQXBwZWFy
+YW5jZXM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBmLXJvaW8uZGUvIiBB
+RERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NSI+UGluayBGbG95ZCBST0lPPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL21lbWJlcnMuYW9sLmNvbS9SYXRCYXNlL2Zyb250cGFnZS5odG1sIiBBRERfREFURT0i
+MTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NSI+UmF0ZG9nIFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL21l
+bWJlcnMuYW9sLmNvbS9qd3RqdGEvcHJpbWFsc2NyZWFtLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2
+ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5S
+dXN0ZWQgUm9vdCBTZXRsaXN0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cu
+dGhlc2FtcGxlcy5vcmcvc2V0bGlzdHMiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5TYW1wbGVzIFNldGxpc3Rz
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zdHRmLmNvbS9zZWN0b3I5Mi5o
+dG1sIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NSI+U2VjdG9yIDkgU2V0bGlzdHM8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LnNldGxpc3QuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlNldGxpc3Qu
+Q29tIEZvciBhbGwgeW91ciBzZXRsaXN0IG5lZWRzITwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly9qYW0uYWJvdXQuY29tL211c2ljcGVyZm9ybS9qYW0vY3Mvc2V0bGlzdHMvaW5kZXgu
+aHRtIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NSI+U2V0bGlzdHMgLSBBYm91dC5jb208L0E+DQogICAgICAgIDxE
+VD48QSBIUkVGPSJodHRwOi8vZXhwZXJ0LmNjLnB1cmR1ZS5lZHUvfm1vaHJqL2Nkci9zb3VsaXZl
+Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5Tb3VsaXZlIFNldGxpc3RzPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5zdHJhbmdlZm9say5jb20vY29udGVudC9zZXRsaXN0L3NldGxp
+c3RfZGIucGhwMyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlN0cmFuZ2Vmb2xrIFNldGxpc3RzPC9BPg0KICAg
+ICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mcmllbmRzb2ZjaGVlc2UuY29tL3NldGxpc3Rz
+L2luZGV4LmFzcCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlN0cmluZyBDaGVlc2UgU2V0bGlzdHM8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBvcmNocGFydHkuY29tL3NldGxpc3RzLmh0
+bSIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzUiPlRoZSBSZWNpcGUgU2V0bGlzdHM8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LnUyc2V0bGlzdHMuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlUyIFNl
+dGxpc3QgQXJjaGl2ZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZXZlcnlk
+YXljb21wYW5pb24uY29tL2FzcC9kZWZhdWx0LmFzcCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPldpZGVzcHJl
+YWQgUGFuaWMgU2V0bGlzdHM8L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBB
+RERfREFURT0iMTA0MjY0Njg3NSI+U2hvcHBpbmc8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZmlnaHRkaXZ4LmNvbS9jb3Vwb25zLmh0bSIgQUREX0RB
+VEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzUiPk9ubGluZSBEVkQgRGVhbHMgYW5kIENvdXBvbnM8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vdGVjaGJhcmdhaW5zLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij50ZWNoYmFy
+Z2FpbnMuY29tPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERUPjxIMyBGT0xERUQgQUREX0RBVEU9
+IjEwNDI2NDY4NzUiPlN0ZWFtaW5nIFR1bmVzPC9IMz4NCiAgICA8REw+PHA+DQogICAgICAgIDxE
+VD48QSBIUkVGPSJodHRwOi8vd3d3LjN3ay5jb20vbGlzdHJlYWwuaHRtIiBBRERfREFURT0iMTA0
+MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NSI+M1dLIFJlYWxQbGF5ZXI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LjN3
+ay5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+M1dLIFVuZGVyZ3JvdW5kIFJhZGlvPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5ncmF0ZWZ1bGRheS5jb20vIiBBRERfREFURT0iMTA0
+MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NSI+R3JhdGVmdWwgRGF5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zdWdh
+cm1lZ3Mub3JnL2dyOGZ1bGRlYWRzbWlsLmh0bWwjZ2QiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBM
+QVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5HcmF0ZWZ1
+bCBEZWFkIGFuZCBQaHJpZW5kcy0gU3RyZWFtaW5nIFJlYWwgQXVkaW8gRmlsZXM8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vdGhlaGlwLm9yZy9wdWIvYm9vdGxlZ3MvbXAzX3Nob3dz
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzUiPkhpcCBCb290cyAtIE1QMzwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cucnlhbmFkYW1zLmluZm8vcGxheWxpc3QuaHRtIiBBRERfREFURT0iMTA0
+NDU0OTAxNyIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0NDU0OTAx
+NyI+SG9va2VkIG9uIFNvbmljcyBSYWRpbzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6
+Ly93d3cubGlzdGVuLmNvbS9saXN0ZW5ob21lLmpzcCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkxpc3Rlbjwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubXVzaWNuZXZlcnN0b3BzLmNvbS9p
+bmRleC5waHAzP2xzX3Nlc3Npb249MGQxYmNkZTE4N2FhNzkxZGE4MDE5ZmU1MTVjMjdkNjQiIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc1Ij5tdXNpY25ldmVyc3RvcHMuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy5vbnNoYXJlLmNvbS9ncm91cGxpc3QuanNwP2NhdGVnb3J5aWQ9MTYzNzQ0
+IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NSI+T25TaGFyZSBHcm91cExpc3Rpbmc8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LnRoZWJpZ3JpcG9mZi5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3
+NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+cmlw
+LW9mZiByYWRpbyBAIHRoZWJpZ3JpcG9mZi5jb208L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJo
+dHRwOi8vc3VnYXJtZWdzLm9yZy8xYTQvP009RCIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlN1Z2FybWVncy0g
+c3RyZWFtczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly90aGVqYW16b25lLmNvbS8i
+IEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc1Ij5UaGUgSmFtIFpvbmUhIC0gQ29tZSBpbiBhbmQgZ3Jvb3ZlIHdpdGgg
+dGhlIERlYWQsIFBoaXNoLCBQaW5rIEZsb3lkLCBEYXZlIE1hdHRoZXdzIGFuZCBtYW55IG90aDwv
+QT4NCiAgICA8L0RMPjxwPg0KICAgIDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc1
+Ij5UcmFkaW5nPC9IMz4NCiAgICA8REw+PHA+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+dHRjLmNvcnJ1cHQubmV0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPiN0YXBlX3RyYWRlX2NlbnRyYWwgLSBE
+YWxuZXQncyBDb25jZXJ0IFRyYWRpbmcgQ2hhbm5lbDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly93d3cuZGVzb2xhdGlvbnJvdy5jb20vY292ZXJzL2FydHdvcmsuaHRtbCIgQUREX0RB
+VEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzUiPkJvYiBEeWxhbiBCb290bGVnIEFydHdvcms8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vbWVtYmVycy50cmlwb2QuY29tL35EYXZlTUwvdHJhZGUtYXJ0Lmh0bSIgQURE
+X0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzUiPkNELVIgVHJhZGluZyBCb290bGVnIENvdmVyIEFydCBMaW5rczwvQT4NCiAg
+ICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9waG90b3MueWFob28uY29tL2JjL3dpdGVfa25pdGUv
+bHN0PyYuZGlyPS9DRCtDT1ZFUitBUlQrLStPUklHSU5BTCYuc3JjPXBoJi5iZWdpbj05OTk5Ji52
+aWV3PXQmLm9yZGVyPSYuZG9uZT1odHRwJTNhLy9waG90b3MueWFob28uY29tL2JjL3dpdGVfa25p
+dGUvbHN0JTNmJTI2LmRpcj0vQ0QlMmJDT1ZFUiUyYkFSVCUyYi0lMmJPUklHSU5BTCUyNi5zcmM9
+cGglMjYudmlldz10IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+Q0RSIENvdmVycyAtIFlhaG9vISBQaG90b3Mg
+LSBUaHVtYm5haWxzIFZpZXc8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNk
+cmluZm8uY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkNEUi1JbmZvLCBUaGUgUmVjb3JkaW5nIEF1dGhv
+cml0eTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuY292ZXJ1bml2ZXJzZS5j
+b20vIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NSI+Q292ZXJVbml2ZXJzZTwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cuZXRyZWUub3JnLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkV0cmVlLm9yZzwvQT4N
+CiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZXRyZWVuZXdzLm9yZy4vaW5kZXgucGhw
+IiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NSI+ZXRyZWVuZXdzLm9yZzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+ImZ0cDovL3RoZWhpcC5vcmcvcHViLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPkhpcCBGVFA8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnUyLWZsb20uZGUvIiBBRERfREFURT0iMTA0MjY0
+Njg3NSIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+
+aHR0cC0td3d3LnUyLWZsb20uZGUtPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5pbmhpZGluZy5jb20vaW5kZXguaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NSIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NSI+aSBuIGggaSBkIGkgbiBn
+oCAuoCBjIG8gbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubXVzaWNuZXZl
+cnN0b3BzLmNvbS9ldHJlZS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4
+MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5JbmRleCBvZiAtZXRyZWU8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNkLXJvbWR1cGxpY2F0aW9uLmNvbS9pbmxh
+eV90ZW1wbGF0ZS5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5JbmxheSBDYXJkIFRlbXBsYXRlPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mb3J0dW5lY2l0eS5jby51ay9tYWRjaGVz
+dGVyL2Jhc3MvMzc2L2luZGV4Lmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5KdWxpYW4gRm93bGVyJ3Mg
+Q0QgSmV3ZWwgQ2FzZSBJbnNlcnRzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5uaWNrc3BpY2tzLmNvbS9zaGVsbC5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc1IiBMQVNUX1ZJ
+U0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc1Ij5OaWNrc1BpY2tzLmNv
+bTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cub2x5bXB1cy1tb25zLmNvbS9q
+YW5lLyIgQUREX0RBVEU9IjEwNDI2NDY4NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1Rf
+TU9ESUZJRUQ9IjEwNDI2NDY4NzUiPk5vdGhpbmcncyBTaG9ja2luZzwvQT4NCiAgICAgICAgPERU
+PjxBIEhSRUY9Imh0dHA6Ly93d3cucGFwZXJjZGNhc2UuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4
+NzUiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzUiPlBh
+cGVyIENEIENhc2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnBmLXJvaW8u
+ZGUvIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NiI+UGluayBGbG95ZCBST0lPPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3NhdGl2YS5ldHJlZS5vcmcvIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+c2F0aXZhLmV0
+cmVlLm9yZyBob21lcGFnZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9pY2R3ZWIu
+Y2MucHVyZHVlLmVkdS9+c2NyZWVjaC9pbmRleDIuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlNjcmVl
+Y2gncyBEb21haW48L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZm9ydW0uc2hpbmJ1
+cm4uY29tL2luZGV4LnBocCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlNoaW5idXJuIC0gcG93ZXJlZCBieSBY
+TUI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vc2hudHVuZXMub3JnLyIgQUREX0RB
+VEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzYiPnNobnR1bmVzLm9yZzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cuZ2VvY2l0aWVzLmNvbS9TdW5zZXRTdHJpcC9DbHViLzY3NTIvcmV2ZW5nZS5odG1sIiBBRERf
+REFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NiI+VGFwZXJzIFJldmVuZ2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LnN3LWRlc2lnbnMuY29tL3RlbXBsYXRlcy5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3
+NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VGVt
+cGxhdGVzIENELVJPTSBMYWJlbHMsIENEIFRyYXkgQ2FyZHMsIENEIEluc2VydHMsIGFuZCBDRCBN
+YWlsZXJzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5tZXRyb25vaXIuZjJz
+LmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XZWxjb21lIHRvIE1ldHJvcG9saXMgTm9pciAtIFlvdXIg
+aG9tZSBmb3IgaGlnaCBxdWFsaXR5IEhpcDwvQT4NCiAgICA8L0RMPjxwPg0KICAgIDxEVD48SDMg
+Rk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2ODc2Ij5XQVAtV01MPC9IMz4NCiAgICA8REw+PHA+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmFsbG5ldGRldmljZXMuY29tL2ZhcS8iIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc2Ij5hbGxOZXREZXZpY2VzIC0tIFRoZSBXaXJlbGVzcyBGQVE8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm5va2lhLmNvbS93YXAvIiBBRERfREFURT0iMTA0
+MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NiI+Tm9raWEgLSBXQVAgb24gV2ViPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2Rl
+dmVsb3Blci5vcGVud2F2ZS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+T3BlbndhdmUgRGV2ZWxvcGVy
+IFByb2dyYW08L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm9wZW53YXZlLmNv
+bS9pbmRleC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+T3BlbndhdmUgU3lzdGVtcyBJbmMuPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53aXJlbGVzc2luYW51dHNoZWxsLmNvbS93
+YXAvd21scmVmLnNodG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VGFnIFJlZmVyZW5jZSAtIFdpcmVsZXNz
+IGluIGEgbnV0c2hlbGwuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3RhZ3Rh
+Zy5jb20vc2l0ZS9pbmRleC5waHAzIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VGFnVGFnLmNvbSAtKy0gRlJF
+RSBXQVAgc2l0ZSBjb25zdHJ1Y3Rpb24gYW5kIGhvc3Rpbmc8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vdHRlbXVsYXRvci5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VFRlbXVsYXRvciAt
+IFdBUCBlbXVsYXRvcjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9jZWxscGhvbmVz
+LmFib3V0LmNvbS9nYWRnZXRzL2NlbGxwaG9uZXMvY3Mvd2FwL2luZGV4Lmh0bT9ybms9cjEmdGVy
+bXM9d2FwIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V0FQIChXaXJlbGVzcyBhcHBsaWNhdGlvbiBwcm90b2Nv
+bCkgLSBBYm91dC5jb208L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmdlbG9u
+Lm5ldC8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ0IiBMQVNU
+X01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XQVAgYnJvd3NlciBAIEdlbG9uLm5ldDwvQT4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud2FwZm9ydW0ub3JnLyIgQUREX0RBVEU9IjEwNDI2
+NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYi
+PldBUCBGb3J1bTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYW55d2hlcmV5
+b3Vnby5jb20vd2FwL0luZGV4LnBvIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V0FQIEhvbWUgLSBBbnl3aGVy
+ZVlvdUdvLmNvbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cubm5ncm91cC5j
+b20vcmVwb3J0cy93YXAvIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V0FQIFVzYWJpbGl0eSBSZXBvcnQgRmll
+bGQgU3R1ZHkgRmFsbCAyMDAwPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53
+YXAuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExB
+U1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldBUC5jb20gLSAtIFlvdXIgZ3VpZGUgdG8gdGhlIHdp
+cmVsZXNzIEludGVybmV0LCB3YXAgcGhvbmVzLCB3YXAgc2VydmljZXMgYW5kIFBEQXM8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LndhcHRpZ2VyLmRlL3dhcHRpZ2VyLyIgQURE
+X0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDQiIExBU1RfTU9ESUZJRUQ9
+IjEwNDI2NDY4NzYiPldhcFRpZ2VyIC0gV0FQIGVtdWxhdG9yPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy53YXBkcml2ZS5jb20vRE9DUy9pbmRleC5odG1sIiBBRERfREFURT0i
+MTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NCIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NiI+V2VsY29tZSB0byBXQVBEcml2ZSAgRnJlZSBXQVAgc2l0ZXMgIFdBUCBuZXdzICBXTUwg
+dHV0b3JpYWwgIFdBUCBnYXRld2F5czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cud2lyZWxlc3NkZXZuZXQuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldpcmVsZXNzIERldmVsb3Bl
+ciBOZXR3b3JrIC0gSG9tZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud2Fw
+cmVkaXJlY3QuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldpcmVsZXNzIGluIGEgbnV0c2hlbGwuY29t
+IC0gV0FQLCBTTVMsIGlNb2RlLCAzRywgQmx1ZXRvb3RoLCBWb3hNTCwgSjJNRTwvQT4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93aXJlbGVzcy5hYm91dC5jb20vaW5kdXN0cnkvd2lyZWxl
+c3MvaW5kZXguaHRtP3Juaz1jNCZ0ZXJtcz13YXAiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XaXJlbGVzcyBJ
+bmR1c3RyeSAtIEFib3V0LmNvbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cu
+d21sc2NyaXB0LmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XTUxTY3JpcHQuY29tPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL21vYmlsZS55YWhvby5jb20vcGhvbmUvdG91cj8ucHY9bWFp
+biYucGc9MSYucGg9dHAiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5ZYWhvbyEgTW9iaWxlIC0gVG91cnM8L0E+
+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vbW9iaWxlLnlhaG9vLmNvbS9waG9uZS9kaXIi
+IEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc2Ij5ZYWhvbyEgTW9iaWxlPC9BPg0KICAgIDwvREw+PHA+DQogICAgPERU
+PjxIMyBGT0xERUQgQUREX0RBVEU9IjEwNDI2NDY4NzYiPldlYiBEZXNpZ248L0gzPg0KICAgIDxE
+TD48cD4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucGxpbmtvLm5ldC80MDQvIiBB
+RERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NiI+NDA0IFJlc2VhcmNoIExhYjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9
+Imh0dHA6Ly93d3cuYWxpc3RhcGFydC5jb20vbWFpbi5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3
+NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+QSBM
+aXN0IEFwYXJ0IEZvciBQZW9wbGUgV2hvIE1ha2UgV2Vic2l0ZXM8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LmFzc2VtYmxlci5vcmcvIiBBRERfREFURT0iMTA0MjY0Njg3NiIg
+TEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+QVNTRU1C
+TEVSLk9SRyA9IE1ha2luZyBBcnQgV2l0aCBNYWNoaW5lIENvZGU7PC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL2JvYmJ5LmNhc3Qub3JnL2JvYmJ5L2h0bWwvZW4vaW5kZXguanNwIiBB
+RERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NiI+Qm9iYnkgVmFsaWRhdG9yPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL3d3dy5ib3hlc2FuZGFycm93cy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+Qm94ZXMgYW5k
+IEFycm93cyBCZWNhdXNlIHdlIGNhbjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93
+d3cuY2hhbWkuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkNoYW1pLmNvbSAtIEhUTUwtS2l0LCBldGMu
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2hvbWUuY25ldC5jb20vd2ViYnVpbGRp
+bmcvMC03NjkwLmh0bWw/dGFnPXN0LmJsLjM4ODEuZGlyMS43NjkwIiBBRERfREFURT0iMTA0MjY0
+Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+
+Q05FVC5jb20gLSBXZWIgQnVpbGRpbmcgLSBTdHVwaWQgV2ViIFRyaWNrczwvQT4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuY29sb3JzY2hlbWVyLmNvbS9vbmxpbmUvIiBBRERfREFU
+RT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0
+MjY0Njg3NiI+Q29sb3IgU2NoZW1lciAtIE9ubGluZSBDb2xvciBTY2hlbWUgR2VuZXJhdG9yPC9B
+Pg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2J1aWxkZXIuY25ldC5jb20vd2ViYnVpbGRp
+bmcvMC0zODg1LTgtNDUwMDAzMS0xLmh0bWw/dGFnPXN0LmJsLjM4ODUuZGlyMS4zODg1LTgtNDUw
+MDAzMSIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1Rf
+TU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkNvbnRyYWN0cyBmb3IgZXZlcnkgb2NjYXNpb24gLSBXZWIg
+QnVpbGRpbmcgLSBDTkVULmNvbTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9tc2Ru
+Lm1pY3Jvc29mdC5jb20vd29ya3Nob3AvYXV0aG9yL2Nzcy9yZWZlcmVuY2UvYXR0cmlidXRlcy5h
+c3AiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc2Ij5DU1MgQXR0cmlidXRlcyBSZWZlcmVuY2U8L0E+DQogICAgICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Mi5pbWFnaXdhcmUuY29tL1J4SFRNTC8iIEFERF9EQVRF
+PSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc2Ij5Eb2N0b3IgSFRNTCB2NjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9l
+dm9sdC5vcmcvaW5kZXguaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPmV2b2x0Lm9yZyAgV29ya2VycyBv
+ZiB0aGUgV2ViLCBFdm9sdCE8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmZs
+YXNoOTlnb29kLmNvbS9pbmRleF9mbGFzaC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+Rmxhc2ggOTkl
+IEdvb2QuIEZpcnN0IEFpZCBNYW51YWwgRm9yIFVzYWJsZSBGbGFzaCBTaXRlczwvQT4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9yOTM3LmNvbS9mcWEuY2ZtIiBBRERfREFURT0iMTA0MjY0
+Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+
+RnJlcXVlbnQgUXVlc3Rpb25zIEFuc3dlcmVkIC0tIHI5MzcuY29tPC9BPg0KICAgICAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5nbGlzaC5jb20vY3NzLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPmdsaXNo
+LmNvbSAgQ1NTIGxheW91dCB0ZWNobmlxdWVzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0
+cDovL2RlZXppbi5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+R3JhcGhpYyBEZXNpZ24gUmVzb3VyY2Vz
+IENlbnRlciAtIEdyYXBoaWMgZGVzaWduIHR1dG9yaWFscywgZ3JhcGhpY3MgdGlwcywgd2ViIGRl
+c2lnbiBhcnRpY2xlcyw8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lmh0bWxo
+ZWxwLmNvbS9yZWZlcmVuY2UvY3NzLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkd1aWRlIHRvIENhc2NhZGlu
+ZyBTdHlsZSBTaGVldHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lmd1aXN0
+dWZmLmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5HVUlTdHVmZi5jb20gLSBGcmVlIEdyYXBoaWNhbCBV
+c2VyIEludGVyZmFjZXM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmRldmVs
+b3Blci5pcnQub3JnL3NjcmlwdC93aW5kb3cuaHRtIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+aXJ0Lm9yZyAt
+IEphdmFTY3JpcHQgV2luZG93cyBGQVEgS25vd2xlZGdlIEJhc2U8L0E+DQogICAgICAgIDxEVD48
+QSBIUkVGPSJodHRwOi8vd3d3LnhzNGFsbC5ubC9+cHBrL2pzL2luZGV4Lmh0bWwiIEFERF9EQVRF
+PSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc2Ij5KYXZhU2NyaXB0IFNlY3Rpb24gLSBIb21lcGFnZTwvQT4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly93d3cuampnLm5ldC9pYS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5qamcubmV0IGlu
+Zm9ybWF0aW9uIGFyY2hpdGVjdHVyZSByZXNvdXJjZXM8L0E+DQogICAgICAgIDxEVD48QSBIUkVG
+PSJodHRwOi8vd3d3LnNob3Jld2Fsa2VyLmNvbS9wYWdlcy9saWdodGhvdXNlX2luZGV4Lmh0bWwi
+IEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc2Ij5MaWdodGhvdXNlIGxhdGVzdDwvQT4NCiAgICAgICAgPERUPjxBIEhS
+RUY9Imh0dHA6Ly93d3cud2Vic2l0ZS1hbmFseXN0LmNvLmlsL2x1Y2Rlc2svbHVjZGVzay5odG1s
+IiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NiI+THVjRGVzayAtIEluZm9ybWF0aW9uIERlc2lnbiAuIFdlYiBVc2Fi
+aWxpdHkgLiBVc2VyIEV4cGVyaWVuY2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+d3d3Lm1lZGlhaW5zcGlyYXRpb24uY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPm1lZGlhIGluc3BpcmF0
+aW9uPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL21vcmVjcmF5b25zLmNvbS9pbmRl
+eC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+bW9yZSBjcmF5b25zIGNvbG9ycyBmb3Igd2ViIGRlc2ln
+bmVyczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cudi0yLm9yZy9pbmRleC5o
+dG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NiI+bXkgZ29kLi4uaXQncyBwaGlsaXBwZSBzdGFyY2suLi4gIHYt
+MiBvcmdhbmlzYXRpb248L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vY29tcHV0aW5n
+Lm5ldHNjYXBlLmNvbS9jb21wdXRpbmcvZGV2ZWxvcGVyL21haW4udG1wbCIgQUREX0RBVEU9IjEw
+NDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4
+NzYiPk5ldHNjYXBlIC0gRGV2ZWxvcGVyPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5vcmVpbGx5bmV0LmNvbS9qYXZhc2NyaXB0LyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPk8nUmVpbGx5
+IE5ldHdvcmsgSmF2YXNjcmlwdCBhbmQgQ1NTIERldkNlbnRlcjwvQT4NCiAgICAgICAgPERUPjxB
+IEhSRUY9Imh0dHA6Ly93d3cucGRuLXBpeC5jb20vcGl4L2NvbHVtbi8iIEFERF9EQVRFPSIxMDQy
+NjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2
+Ij5QRE4ncyBQSVggLSBzZWNvbmQgc2l0ZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6
+Ly93d3cucGRuLXBpeC5jb20vcGl4LyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlBETidzIFBJWCAtIFRIRSBN
+QUdBWklORSBGT1IgVklTVUFMIENSRUFUSVZFUzwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0
+dHA6Ly93d3cucGlyYXRlZC1zaXRlcy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+UGlyYXRlZCBTaXRl
+cyEhIEFhYXJyZ2doaC4uLjwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucGly
+YXRlZC1zaXRlcy5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3
+NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+UGlyYXRlZCBTaXRlcyE8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmRyZWFtd2VhdmVyLWV4dGVuc2lvbnMuY29tLyIg
+QUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzYiPlJhYmkncyBEcmVhbXdlYXZlciBFeHRlbnNpb25zPC9BPg0KICAgICAg
+ICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53ZWJndWlsZC5vcmcvY29udGVzdC8iIEFERF9EQVRF
+PSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc2Ij5TaWxpY29uIFZhbGxleSBXZWJHdWlsZCBXZWIgU2l0ZSBEZXNpZ24gQ29udGVzdDwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc2ltcGx5dGhlYmVzdHNjcmlwdHMu
+Y29tL2phdmFzY3JpcHRzLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlNpbXBseXRoZUJlc3QgSmF2YXNjcmlw
+dHMsIEpBVkEgU2NyaXB0czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc2l0
+ZXBvaW50LmNvbS8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1
+IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5TaXRlUG9pbnQuY29tIC0gSGVscGluZyBCdXNp
+bmVzcyBHcm93IE9ubGluZSE8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnRl
+YW1waG90b3Nob3AuY29tL3Bob3Rvc2hvcC90dXRvcmlhbHMvcHNfdHV0X3RlY2huaXF1ZXMucGhw
+IyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzYiPnRlYW1waG90b3Nob3AuY29tPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy53ZWJzdGFuZGFyZHMub3JnLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYi
+IExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlRoZSBX
+ZWIgU3RhbmRhcmRzIFByb2plY3QgRmlnaHRpbmcgZm9yIFN0YW5kYXJkcyBpbiBvdXIgQnJvd3Nl
+cnM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vdG9tYWxhay5vcmcvIiBBRERfREFU
+RT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0
+MjY0Njg3NiI+VG9tYWxhaydzIFJlYWxtICBEYWlseSBMaW5rcyB0byBTdHJhdGVnaWMgV2ViIERl
+c2lnbiBOZXdzPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5qdWljeXN0dWRp
+by5jb20vdHV0b3JpYWxzLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5UdXRvcmlhbHM8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnVzYWJpbGl0eS5nb3YvIiBBRERfREFURT0iMTA0
+MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NiI+VXNhYmlsaXR5LmdvdiAtIFByb3ZpZGVkIGJ5IHRoZSBOQ0kgTmF0aW9uYWwgQ2FuY2VyIElu
+c3RpdHV0ZTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly91c2FibGV3ZWIuY29tLyIg
+QUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzYiPlVzYWJsZSBXZWI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LnZpc2lib25lLmNvbS9jb2xvcmxhYi8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5WaXNpQm9uZSBX
+ZWJtYXN0ZXIncyBDb2xvciBMYWI8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vdmFs
+aWRhdG9yLnczLm9yZy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XM0MgSFRNTCBWYWxpZGF0aW9uIFNlcnZp
+Y2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lnczc2Nob29scy5jb20vZGVm
+YXVsdC5hc3AiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XM1NjaG9vbHMgT25saW5lIFdlYiBUdXRvcmlhbHM8
+L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm11bmRpZGVzaWduLmNvbS93ZWJj
+dC93ZWJjdC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V2ViIENvbG9yIFRoZW9yeTwvQT4NCiAgICAg
+ICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZC51bW4uZWR1L2l0c3Mvc3VwcG9ydC9UcmFpbmlu
+Zy9PbmxpbmUvd2ViZGVzaWduLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldlYiBEZXNpZ24gUmVmZXJlbmNl
+czwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc3RhcnMuY29tLyIgQUREX0RB
+VEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzYiPldlYiBEZXZlbG9wZXIncyBWaXJ0dWFsIExpYnJhcnkgRW5jeWNsb3BlZGlhIG9m
+IFdlYiBEZXNpZ24gVHV0b3JpYWxzLCBBcnRpY2xlcyBhbmQgRGlzY3Vzc2lvbnM8L0E+DQogICAg
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LndwZGZkLmNvbS93cGRob21lLmh0bSIgQUREX0RB
+VEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzYiPldlYiBQYWdlIERlc2lnbiBmb3IgRGVzaWduZXJzIC0gSG9tZSBQYWdlPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53ZWJzaXRlc3RoYXRzdWNrLmNvbS9pbmRl
+eC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V2ViIFBhZ2VzIFRoYXQgU3VjazwvQT4NCiAgICAgICAg
+PERUPjxBIEhSRUY9Imh0dHA6Ly93ZWJzaXRlZ2FyYWdlLm5ldHNjYXBlLmNvbS8iIEFERF9EQVRF
+PSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc2Ij5XZWIgU2l0ZSBHYXJhZ2U8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8v
+d3d3LmthdHN1ZXlkZXNpZ253b3Jrcy5jb20vd21wX2luZGV4Lmh0bSIgQUREX0RBVEU9IjEwNDI2
+NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYi
+PldlYiBUaXBlczwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud2VibWFzdGVy
+YmFzZS5jb20vIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIg
+TEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V2VibWFzdGVyQmFzZSAtIEhlbHBpbmcgQnVzaW5l
+c3MgR3JvdyBPbmxpbmU8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vaG90d2lyZWQu
+bHljb3MuY29tL3dlYm1vbmtleS9yZWZlcmVuY2UvY29sb3JfY29kZXMvIiBBRERfREFURT0iMTA0
+MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NiI+V2VibW9ua2V5ICBSZWZlcmVuY2UgQ29sb3IgQ29kZXM8L0E+DQogICAgICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vaG90d2lyZWQubHljb3MuY29tL3dlYm1vbmtleS9nbG9zc2FyeS8iIEFERF9E
+QVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIx
+MDQyNjQ2ODc2Ij5XZWJtb25rZXkgIFJlZmVyZW5jZSBHbG9zc2FyeTwvQT4NCiAgICAgICAgPERU
+PjxBIEhSRUY9Imh0dHA6Ly9ob3R3aXJlZC5seWNvcy5jb20vd2VibW9ua2V5L3JlZmVyZW5jZS9o
+dG1sX2NoZWF0c2hlZXQvaW5kZXguaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklT
+SVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldlYm1vbmtleSAgUmVm
+ZXJlbmNlIEhUTUwgQ2hlYXRzaGVldDwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9o
+b3R3aXJlZC5seWNvcy5jb20vd2VibW9ua2V5L3JlZmVyZW5jZS9zcGVjaWFsX2NoYXJhY3RlcnMv
+IiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJ
+RklFRD0iMTA0MjY0Njg3NiI+V2VibW9ua2V5ICBSZWZlcmVuY2UgU3BlY2lhbCBDaGFyYWN0ZXJz
+PC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2hvdHdpcmVkLmx5Y29zLmNvbS93ZWJt
+b25rZXkvIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V2VibW9ua2V5PC9BPg0KICAgICAgICA8RFQ+PEEgSFJF
+Rj0iaHR0cDovL3d3dy53ZWJyZXZpZXcuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPldlYlJldmlldy5j
+b208L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LndlYndvcmQuY29tL2hvdHNp
+dGVzLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBM
+QVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XZWJXb3JkLmNvbSBIb3QgV2ViIFNpdGVzPC9BPg0K
+ICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5zaXRlY3JpdGlxdWUubmV0L2luZGV4LnBo
+cCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzYiPldlbGNvbWUgdG8gU2l0ZUNyaXRpcXVlLm5ldCAtIEhlbHBpbmcg
+WW91IENyZWF0ZSBCZXR0ZXIgRGVzaWducyBUaHJvdWdoIEZyaWVuZGx5IEFkdmljZSE8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm5yMXdlYnJlc291cmNlLmNvbS9pbmRleC5o
+dG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01P
+RElGSUVEPSIxMDQyNjQ2ODc2Ij5XZWxjb21lIHRvIFdlYiBSZXNvdXJjZXMgLSBXaGVyZSBXZWJU
+ZWNobm9sb2d5IG1lZXRzIFNpbXBsaWNpdHk8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LnpkbmV0LmNvbS9kZXZoZWFkL2ZpbHRlcnMvMCw5NDI5LDIxMzMyMjQsMDAuaHRtbCIg
+QUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzYiPlpETmV0IGQgZSB2IGUgbCBvIHAgZSByICBVc2FiaWxpdHk8L0E+DQog
+ICAgPC9ETD48cD4NCiAgICA8RFQ+PEgzIEZPTERFRCBBRERfREFURT0iMTA0MjY0Njg3NiI+V05Z
+TXVzaWM8L0gzPg0KICAgIDxETD48cD4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cu
+d255bXVzaWMuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkJ1ZmZhbG8gTXVzaWMgT25saW5lIC0gV255
+bXVzaWMuY29tPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53bnltdXNpYy5j
+b20vYm9hcmQvY2dpLWJpbi9VbHRpbWF0ZS5jZ2k/YWN0aW9uPWludHJvJkJ5cGFzc0Nvb2tpZT10
+cnVlIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9N
+T0RJRklFRD0iMTA0MjY0Njg3NiI+QnVmZmFsbyBNdXNpYyBPbmxpbmUgTWVzc2FnZSBCb2FyZDwv
+QT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cud255bXVzaWMuY29tL2JvYXJkL05v
+bkNHSS9jcC5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0
+NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VWx0aW1hdGUgQnVsbGV0aW4gQm9hcmQgLSBD
+b250cm9sIFBhbmVsIEZyYW1lPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy53
+bnltdXNpYy5jb20vbGlzdC5waHAzIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+V05ZTXVzaWMgLSBUaGUgTGlz
+dDwvQT4NCiAgICA8L0RMPjxwPg0KICAgIDxEVD48SDMgRk9MREVEIEFERF9EQVRFPSIxMDQyNjQ2
+ODc2Ij5aaXB6YXBzPC9IMz4NCiAgICA8REw+PHA+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vc2VhcmNoLWRlc2MuZWJheS5jb20vc2VhcmNoL3NlYXJjaC5kbGw/R2V0UmVzdWx0JnN0PTIm
+U29ydFByb3BlcnR5PU1ldGFFbmRTb3J0JnF1ZXJ5PXppcHphcCZzcmNoZGVzYz15JmZyb209Ujcm
+ZWJheXRhZzE9ZWJheXJlZyZodD0xJmNvbWJpbmU9eSIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExB
+U1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkViYXkgLSBJ
+dGVtcyBtYXRjaGluZyAoIHppcHphcCApPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0iaHR0cDov
+L3d3dy5sYXRlbmN5cHJvamVjdC5jb20vemlwemFwcy96aXB6YXByYWNpbmcuaHRtbCIgQUREX0RB
+VEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzYiPmxhdGVuY3lwcm9qZWN0LmNvbSAtIHppcCBtb2RzIGFuZCByYWNpbmc8L0E+DQog
+ICAgICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3JvcmNjZW50ZXIuY29tLyIgQUREX0RB
+VEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEw
+NDI2NDY4NzYiPk1pY3JvIFJDIENhcnMgQ2VudGVyPC9BPg0KICAgICAgICA8RFQ+PEEgSFJFRj0i
+aHR0cDovL3d3dy5taWNyb3JjY2VudGVyLmNvbS9mb3J1bS9pbmRleC5waHA/cz03YWEwNTYyMTQ2
+NWVhMzQ0NjQ3YmE5MDY4YWExODlkNyZhY3Q9U0YmZj01IiBBRERfREFURT0iMTA0MjY0Njg3NiIg
+TEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+TWljcm8g
+UkMgQ2FycyBGb3J1bTwvQT4NCiAgICAgICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cucmFkaW9z
+aGFjay5jb20vUGFydG5lcnMvWmlwWmFwcy9aaXBaYXBzSG9tZS5hc3AiIEFERF9EQVRFPSIxMDQy
+NjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2
+Ij5SYWRpb3NoYWNrLmNvbSAtIFppcFphcHM8L0E+DQogICAgICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vd3d3LnRpbnlyYy5jb20vZm9ydW1zL2ZvcnVtZGlzcGxheS5waHA/cz0mZm9ydW1pZD03NSIg
+QUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJ
+RUQ9IjEwNDI2NDY4NzYiPlRpbnlSQy5jb20gLSBaaXBaYXBzPC9BPg0KICAgICAgICA8RFQ+PEEg
+SFJFRj0iaHR0cDovL3d3dy50aW55cmMuY29tLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1Rf
+VklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPlRpbnlSQy5jb208
+L0E+DQogICAgPC9ETD48cD4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL2RtLmRlc2ttb2QuY29t
+LyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9E
+SUZJRUQ9IjEwNDI2NDY4NzYiPi5bRGVza01vZCAtIFlvdXIgU291cmNlIGZvciBEZXNrdG9wIE1v
+ZGlmaWNhdGlvbl0uPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmFsdC1waHAtZmFx
+Lm9yZy9sb2NhbC83NS9saW5rcy5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+QUxULVBIUC1GQVEgLSBI
+b3cgZG8gSSB0dXJuIG5ld2xpbmVzIC0gcmV0dXJucyBpbnRvIGh0bWwgYnJlYWtzIChicik8L0E+
+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYmFieWNlbnRyZS5jby51ay9yZWZjYXAvNDE4
+OC5odG1sIiBBRERfREFURT0iMTA0MzM0NjA2MCIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MzM0NjA2MCI+QmFieUNlbnRyZSAgRGFkcycgc3R1ZmYgRGlldCBmb3Ig
+YSBoZWFsdGh5IGZhdGhlci10by1iZTwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5i
+YWJ5Y2VudHJlLmNvLnVrL3RyeWluZ2ZvcmJhYnkiIEFERF9EQVRFPSIxMDQzMzQ2MTQwIiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQzMzQ2MTQwIj5CYWJ5Q2VudHJl
+ICBUcnlpbmcgZm9yIGEgYmFieTwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3N3ei1idXNp
+bmVzc3dlZWsuc2FsYXJ5LmNvbS9zYWxhcnl3aXphcmQvbGF5b3V0c2NyaXB0cy9zd3psX2NvbXBy
+ZXN1bHQuYXNwP3ppcGNvZGU9MTQyMjMmbmFycm93Y29kZT1JVDAzJmdlbz1CdWZmYWxvJTJDK05Z
+KzE0MjIzJmpvYmNvZGU9SVQxMDAwMDE1MyZqb2J0aXRsZT1XZWJtYXN0ZXImaW1hZ2UxLng9NTEm
+aW1hZ2UxLnk9MTciIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1
+IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5CdXNpbmVzcyBXZWVrIE9ubGluZSBTYWxhcnkg
+V2l6YXJkPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNvcHlsZWZ0Lm5ldC9pbmRl
+eC5waHRtbD9keW5hbWljPTEmcmVmZXJlcj0lMkZpdGVtLnBodG1sJTNGJTI2cGFnZSUzRHByb2R1
+Y3RfMTA3NV9mcm9udC5waHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEw
+NDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkNvcHlsZWZ0Lm5ldCAtIEdlZWsg
+Q2hpYyE8L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZG9tYWdnaW9yZS5pdC9pbmRl
+eC5odG1sIiBBRERfREFURT0iMTA0MzY5MjQ0MiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MzY5MjQ0MiI+Q292ZXJhbGwgQ0QgQXVkaW8gQ292ZXJzPC9BPg0KICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmNzLnV0YWguZWR1L2RlcHQvb2xkL3RleGluZm8vY3Zz
+L2N2c190b2MuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2
+NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkNWUy0tQ29uY3VycmVudCBWZXJzaW9ucyBT
+eXN0ZW0gLSBUYWJsZSBvZiBDb250ZW50czwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3
+dy5ic3lzLnRzdWt1YmEuYWMuanAvfmp1bnlhL2R0Ym9vdHMvMDktbG91ZC5odG1sIiBBRERfREFU
+RT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0
+MjY0Njg3NiI+RHJlYW0gVGhlYXRlciAtIEltcGF4eCA1LjE4LjkzIC0gRHJlYW0gT3V0IExvdWQ8
+L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuZXZyc29mdC5jb20vZmFzdHN1Ym1pdC8i
+IEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElG
+SUVEPSIxMDQyNjQ2ODc2Ij5GYXN0U3VibWl0IC0gU3VibWl0IHlvdXIgd2Vic2l0ZSB0byBzZWFy
+Y2ggZW5naW5lcyBmb3IgRlJFRSE8L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuc3Rh
+bmZvcmQuZWR1L2dyb3VwL3BhbmRlZ3JvdXAvQ29zbS9pbmRleC5odG1sIiBBRERfREFURT0iMTA0
+MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3
+NiI+Rm9sZGluZ0Bob21lPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vZWNhbGFtZS50cmlw
+b2QuY29tL2ZyZWUuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgx
+NzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkZyZWUgTmV3cyBTZXJ2ZXJzPC9BPg0K
+ICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmZyZWV3YXJlcGFsbS5jb20vIiBBRERfREFURT0i
+MTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NiI+RnJlZXdhcmVQYWxtPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LmJ1ZmZh
+bG9uZXQub3JnLyIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUi
+IExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPkhpc3Rvcnkgb2YgQnVmZmFsbywgTmV3IFlvcms8
+L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cudGFjb3NoZWxsLmNvbS9zcGluYWxjcmFj
+a2VyL2NnaS1iaW4vc2VhcmNoLnBsP2luZGV4IiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9W
+SVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+aW50ZXJuZXQgYmVh
+dGxlcyByZWNvcmRpbmcgaW5kZXggbWFpbiBwYWdlPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRw
+Oi8vZGV2ZWxvcGVyLmlydC5vcmcvc2NyaXB0L2RodG1sLmh0bSIgQUREX0RBVEU9IjEwNDI2NDY4
+NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPmly
+dC5vcmcgLSBEeW5hbWljIEhUTUwgRkFRIEtub3dsZWRnZSBCYXNlPC9BPg0KICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vZGV2ZWxvcGVyLmlydC5vcmcvc2NyaXB0L3RhYmxlLmh0bSIgQUREX0RBVEU9
+IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2
+NDY4NzYiPmlydC5vcmcgLSBKYXZhU2NyaXB0IFRhYmxlIEZBUSBLbm93bGVkZ2UgQmFzZTwvQT4N
+CiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3N1cHBvcnQubWljcm9zb2Z0LmNvbS9zdXBwb3J0L2ti
+L2FydGljbGVzL1ExMjYvNC80OS5hc3AiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5LZXlib2FyZCBTaG9ydGN1
+dHMgZm9yIFdpbmRvd3M8L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly9ob21lcGFnZS5tYWMu
+Y29tL2xlcGVyb3VzL1Bob3RvQWxidW0xLmh0bWwiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNU
+X1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5Lbm93IFlvdXIg
+UGxhY2UhIFNodXQgWW91ciBGYWNlITwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5n
+ZW5lc2lzLXBhdGguY29tL2xhbWJzdHVmZi5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFT
+VF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+TGFtYiBzdHVm
+ZiE8L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cuYml6dWJjb21tLmNvbS9MaWJlcnR5
+QmVsbC9NaXNjLi5odG0iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0
+NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5NaXNjLiBTcGFjZSBMaXN0PC9BPg0KICAg
+IDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vaXNhcGkvcmVkaXIuZGxsP3By
+ZD1pZSZwdmVyPTYmYXI9SVN0YXJ0IiBBRERfREFURT0iMTA0MTI2NTc5MiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MTI2NTgxMiI+TVNOLmNvbTwvQT4NCiAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL3Zpc2libGVlYXJ0aC5uYXNhLmdvdi8iIEFERF9EQVRFPSIxMDQy
+NjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2
+Ij5OQVNBJ3MgVmlzaWJsZSBFYXJ0aDwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5k
+ZWJyaXMuY29tL2pvdXJuYWwvMTM0IiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0i
+MTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+T3B0LU91dDwvQT4NCiAgICA8
+RFQ+PEEgSFJFRj0iaHR0cDovL2RvY3MucG9ydGFsLmRldi8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2
+IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5Qb3J0
+YWwgRG9jcyAgVE9DPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lm1pY3Jvc29mdC5j
+b20vaXNhcGkvcmVkaXIuZGxsP3ByZD13aW5kb3dzJnNicD1tZWRpYXBsYXllciZwbGNpZD0mcHZl
+cj02LjEmb3M9Jm92ZXI9Jm9sY2lkPSZjbGNpZD0mYXI9TWVkaWEmc2JhPVJhZGlvQmFyJm8xPSZv
+Mj0mbzM9IiBBRERfREFURT0iMTA0MTI2NTc5MiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFT
+VF9NT0RJRklFRD0iMTA0MTI2NTgxMiI+UmFkaW8gU3RhdGlvbiBHdWlkZTwvQT4NCiAgICA8RFQ+
+PEEgSFJFRj0iaHR0cDovL3d3dy5yZXN0b3JhdGlvbmNlbnRyYWwuY29tL2luZGV4Lmh0bWwiIEFE
+RF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVE
+PSIxMDQyNjQ2ODc2Ij5SZXN0b3JhdGlvbiBDZW50cmFsIEhvbWUsIG51cnR1cmluZyB0aGUgcGFz
+c2lvbiBmb3IgYW50aXF1ZXMgYW5kIG9sZCBob21lcyB3aXRoIGFuIEFydHMgJiBDcmFmdDwvQT4N
+CiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3d3dy5mYWJ1bG91c2Zvb2RzLmNvbS9ob2xpZGF5cy9o
+YWxsb3dlZW4vcHVtcHBsYW5zMi5odG1sIiBBRERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJ
+VD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+Um9jayBhbmQgUm9sbCBQ
+dW1wa2luIENhcnZpbmcgUGF0dGVybnM8L0E+DQogICAgPERUPjxBIEhSRUY9Imh0dHA6Ly93d3cu
+c2ZuMi5jb20vZm9ydW0vaG9tZS5waHAiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lU
+PSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5TdGVybkZhbk5ldHdvcmsg
+SG9tZSBQYWdlPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnN3aG9pcy5uZXQvIiBB
+RERfREFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklF
+RD0iMTA0MjY0Njg3NiI+U1dob2lzLm5ldDwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0cDovL3Nj
+b3V0MTguY3Mud2lzYy5lZHUvbmV0LW5ld3MvOTgtMDYvOTgtMDYtMjIvMDAxMC5odG1sIiBBRERf
+REFURT0iMTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0i
+MTA0MjY0Njg3NiI+VGhlIExhd3llcnMgV2hvIEdldCBJdCBSaWdodCAtIEpheSBHZXJsYW5kPC9B
+Pg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnRoaW5rZ2Vlay5jb20vIiBBRERfREFURT0i
+MTA0MjY0Njg3NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0
+Njg3NiI+VGhpbmtHZWVrICBTdHVmZiBmb3IgU21hcnQgTWFzc2VzPC9BPg0KICAgIDxEVD48QSBI
+UkVGPSJodHRwOi8vam9ic2VhcmNoLm5ldHNjYXBlLm1vbnN0ZXIuY29tL2dldGpvYi5hc3A/Sm9i
+SUQ9MTMyOTQxNzMmY29sPSZjeT0mYnJkPSZsaWQ9NTQ2JmZuPTYmcT0mQVZTRE09MjAwMSUyRDEx
+JTJEMTUrMTYlM0EyNCUzQTAwJTJFMDAwJkNDRD1teSUyRW5ldHNjYXBlJTJFbW9uc3RlciUyRWNv
+bSZKU0Q9am9ic2VhcmNoJTJFbmV0c2NhcGUlMkVtb25zdGVyJTJFY29tJkhEPWNvbXBhbnklMkVu
+ZXRzY2FwZSUyRW1vbnN0ZXIlMkVjb20mQUQ9aHR0cCUzQSUyIiBBRERfREFURT0iMTA0MjY0Njg3
+NiIgTEFTVF9WSVNJVD0iMTA0ODE3NDY0NSIgTEFTVF9NT0RJRklFRD0iMTA0MjY0Njg3NiI+VVMt
+TlktQnVmZmFsby1XZWIgRGV2ZWxvcGVyPC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3
+LmV2cnNvZnQuY29tL3dlYm1hZy8iIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIx
+MDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XZWJNYWcgT25saW5lIC0gVGhl
+IE5vIzEgUmVzb3VyY2UgZm9yIFdlYiBCdWlsZGVyczwvQT4NCiAgICA8RFQ+PEEgSFJFRj0iaHR0
+cDovL2FtYXppbmdmb3J1bXMuY29tL2ZvcnVtL0lNTk9CT0RZL2ZvcnVtLmh0bWwiIEFERF9EQVRF
+PSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQy
+NjQ2ODc2Ij5XZWxjb21lIHRvIHRoZSBIYXBweSBCdWZmYWxvIFNsYW5kZXIgQ29ybmVyISEhPC9B
+Pg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3Lnd4cGVyaWVuY2Uud2ViLXVubGltaXRlZC5k
+ZS9waHBCQi9pbmRleC5waHAiIEFERF9EQVRFPSIxMDQyNjQ2ODc2IiBMQVNUX1ZJU0lUPSIxMDQ4
+MTc0NjQ1IiBMQVNUX01PRElGSUVEPSIxMDQyNjQ2ODc2Ij5XeHBlcmllbmNlIEZvcnVtcyAtIEZv
+cnVtIEluZGV4PC9BPg0KICAgIDxEVD48QSBIUkVGPSJodHRwOi8vd3d3LnJnYWdub24uY29tL21h
+c3RlcnMvanMtbGFuZ3VhZ2UuaHRtbCIgQUREX0RBVEU9IjEwNDI2NDY4NzYiIExBU1RfVklTSVQ9
+IjEwNDgxNzQ2NDUiIExBU1RfTU9ESUZJRUQ9IjEwNDI2NDY4NzYiPltSZWFsJ3MgSkFWQSBKQVZB
+U0NSSVBUIFBCIGFuZCBXU0ggSG93LXRvXTwvQT4NCjwvREw+PHA+DQpWmgIQgAEADQAAAGJvb2tt
+YXJrLmh0bQDNBAIFkAYAmAEAABIAAAADACAOjk8BAB4AATABAAAADQAAAGJvb2ttYXJrLmh0bQAA
+AAACAQI3AQAAAAAAAAAeAAM3AQAAAAUAAAAuaHRtAAAAAAMABTcBAAAAHgAHNwEAAAANAAAAYm9v
+a21hcmsuaHRtAAAAAAMACzdzAAAAAwAUNwAAAAADAPp/AAAAAEAA+38AQN2jV0WzDEAA/H8AQN2j
+V0WzDAMA/X8AAAAACwD+fwAAAAADACEORckDAAIB+A8BAAAAEAAAAM/yM912IydOt4pJEsJHoOQC
+AfoPAQAAABAAAADP8jPddiMnTreKSRLCR6DkAgH7DwEAAACWAAAAAAAAADihuxAF5RAaobsIACsq
+VsIAAG1zcHN0LmRsbAAAAAAATklUQfm/uAEAqgA32W4AAABDOlxEb2N1bWVudHMgYW5kIFNldHRp
+bmdzXGpnZXJsYW5kXExvY2FsIFNldHRpbmdzXEFwcGxpY2F0aW9uIERhdGFcTWljcm9zb2Z0XE91
+dGxvb2tcT3V0bG9vay5wc3QAAAADAP4PBwAAAHpn
+
+--=-2UbcDuksJBAwUNBNW7UD--
+
diff --git a/examples/eml/tnef2.eml b/examples/eml/tnef2.eml
new file mode 100644
index 000000000..ecf71d444
--- /dev/null
+++ b/examples/eml/tnef2.eml
@@ -0,0 +1,101 @@
+From: Alice <alice@example.net>
+To: Bob <bob@example.net>
+Subject: TNEF test 2
+Date: Thu, 10 Feb 2022 12:19:57 +0100
+Message-ID: <001d01d81e70$23211250$696336f0$@example.net>
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="----=_NextPart_000_001E_01D81E78.84E7EB50"
+X-Mailer: Microsoft Outlook 16.0
+Content-Language: cs
+X-MS-TNEF-Correlator: 0000000045EA84AB25A1494B8CD618FC27E0940E04CA7500
+Authentication-Results: example.net;
+	dkim=pass header.d=example.net header.s=mail header.b=UH8A3Z8P;
+	dmarc=pass (policy=reject) header.from=example.net;
+	spf=pass () smtp.mailfrom=example@example.net
+
+This is a multipart message in MIME format.
+
+------=_NextPart_000_001E_01D81E78.84E7EB50
+Content-Type: text/plain;
+	charset="iso-8859-2"
+Content-Transfer-Encoding: quoted-printable
+
+Dobr=FD den,
+
+=20
+
+pos=EDl=E1m zku=B9ebn=ED e-mail:
+
+=20
+
+P=F8=EDli=B9 =BElu=BBou=E8k=FD k=F9=F2 =FAp=ECl =EF=E1belsk=E9 =F3dy
+
+=20
+
+S pozdravem
+
+=20
+
+Mgr. Milo=B9 Bart=E1k
+
+
+------=_NextPart_000_001E_01D81E78.84E7EB50
+Content-Type: application/ms-tnef;
+	name="winmail.dat"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+	filename="winmail.dat"
+
+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
+
+------=_NextPart_000_001E_01D81E78.84E7EB50--
+
diff --git a/gulpfile.js b/gulpfile.js
index c614fb21a..9b0d1bbb4 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,8 +1,7 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 const gulp = require('gulp');
 
 const { cleanStatic } = require('./tasks/common');
-const { assets } = require('./tasks/assets');
 const { js, jsLint } = require('./tasks/js');
 const { css, cssLint } = require('./tasks/css');
 const { vendors } = require('./tasks/vendors');
@@ -12,7 +11,7 @@ const clean = gulp.series(cleanStatic);
 const lint = gulp.parallel(jsLint, cssLint);
 
 const buildState1 = gulp.parallel(js, css, vendors);
-const buildState2 = gulp.series(clean, assets, buildState1);
+const buildState2 = gulp.series(clean, buildState1);
 
 const build = gulp.parallel(lint, buildState2);
 
diff --git a/index.php b/index.php
index efcc8acd1..8d4f0b67e 100644
--- a/index.php
+++ b/index.php
@@ -6,12 +6,16 @@ if (!defined('APP_VERSION'))
 	define('APP_INDEX_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-if (file_exists('snappymail/v/'.APP_VERSION.'/include.php'))
+if (file_exists(APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php'))
 {
-	include 'snappymail/v/'.APP_VERSION.'/include.php';
+	include APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php';
 }
 else
 {
-	echo '[105] Missing version directory';
+	echo '[105] Missing snappymail/v/'.APP_VERSION.'/include.php';
+	// opcache_reset is a terrible solution
+//	is_callable('opcache_reset') && opcache_reset();
+	// opcache_invalidate will not do everything
+	is_callable('opcache_invalidate') && opcache_invalidate(__FILE__, true);
 	exit(105);
 }
diff --git a/integrations/cloudron/DESCRIPTION.md b/integrations/cloudron/DESCRIPTION.md
index 402d04283..c3a50a8fa 100644
--- a/integrations/cloudron/DESCRIPTION.md
+++ b/integrations/cloudron/DESCRIPTION.md
@@ -1,4 +1,4 @@
-This app packages SnappyMail <upstream>2.15.0</upstream>.
+This app packages SnappyMail <upstream>2.38.2</upstream>.
 
 SnappyMail is a simple, modern, lightweight & fast web-based email client.
 
diff --git a/integrations/cloudron/Dockerfile b/integrations/cloudron/Dockerfile
index 8f21608b0..a3d442e96 100644
--- a/integrations/cloudron/Dockerfile
+++ b/integrations/cloudron/Dockerfile
@@ -4,7 +4,7 @@ RUN mkdir -p /app/code
 WORKDIR /app/code
 
 # If you change the extraction below, be sure to test on scaleway
-VERSION=2.15.0
+VERSION=2.38.2
 RUN wget https://github.com/the-djmaze/snappymail/releases/download/v${VERSION}/snappymail-${VERSION}.zip -O /tmp/snappymail.zip && \
     unzip /tmp/snappymail.zip -d /app/code && \
     rm /tmp/snappymail.zip && \
diff --git a/integrations/cpanel/usr/local/cpanel/base/3rdparty/snappymail/include.php b/integrations/cpanel/usr/local/cpanel/base/3rdparty/snappymail/include.php
new file mode 100644
index 000000000..0135d1f8d
--- /dev/null
+++ b/integrations/cpanel/usr/local/cpanel/base/3rdparty/snappymail/include.php
@@ -0,0 +1,37 @@
+<?php
+
+//header('Strict-Transport-Security: max-age=31536000');
+
+/**
+ * Uncomment to use gzip compressed output
+ */
+//define('USE_GZIP', 1);
+
+/**
+ * Uncomment to use brotli compressed output
+ */
+//define('USE_BROTLI', 1);
+
+/**
+ * Uncomment to enable multiple domain installation.
+ */
+//define('MULTIDOMAIN', 1);
+
+/**
+ * Uncomment to disable APCU.
+ */
+//define('APP_USE_APCU_CACHE', false);
+
+/**
+ * Custom 'data' folder path
+ */
+if (!empty($_ENV['CPANEL']) && isset($_ENV['HOME'])) {
+	define('APP_DATA_FOLDER_PATH', $_ENV['HOME'] . '/var/snappymail/');
+} else {
+	exit('Not in cPanel');
+}
+
+/**
+ * Additional configuration file name
+ */
+//define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
diff --git a/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml b/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml
new file mode 100644
index 000000000..682f79565
--- /dev/null
+++ b/integrations/cpanel/var/cpanel/webmail/webmail_snappymail.yaml
@@ -0,0 +1,3 @@
+url: "/3rdparty/snappymail/?RemoteAutoLogin"
+displayname: "SnappyMail"
+icon: "/3rdparty/snappymail/snappymail/v/2.22.1/static/logo-text.png"
diff --git a/integrations/cyberpanel/install.php b/integrations/cyberpanel/install.php
new file mode 100644
index 000000000..67fff17b3
--- /dev/null
+++ b/integrations/cyberpanel/install.php
@@ -0,0 +1,67 @@
+#!/usr/bin/php
+<?php
+/**
+ * Alternative to cyberpanel/install/install.py
+ * https://github.com/usmannasir/cyberpanel/blob/f7e4f5d91cb2b40473ae6ceb4ca473493ab3bb0c/install/install.py#L1255
+ */
+define('SNAPPYMAIL_PUBLIC_DIR', '/usr/local/CyberCP/public/snappymail');
+
+if (PHP_SAPI !== 'cli' && false === stripos(php_sapi_name(), 'cli')) {
+	exit('not cli');
+}
+
+chdir(SNAPPYMAIL_PUBLIC_DIR);
+
+spl_autoload_register(function($sClassName){
+	$file = SNAPPYMAIL_LIBRARIES_PATH . strtolower(strtr($sClassName, '\\', DIRECTORY_SEPARATOR)) . '.php';
+	if (is_file($file)) {
+		include_once $file;
+	}
+});
+
+file_put_contents(
+	SNAPPYMAIL_PUBLIC_DIR . '/include.php',
+	str_replace(
+		'//define(\'APP_DATA_FOLDER_PATH\', dirname(__DIR__) . \'/snappymail-data/\')',
+		'define(\'APP_DATA_FOLDER_PATH\', \'/usr/local/lscp/cyberpanel/rainloop/data/\')',
+		file_get_contents(SNAPPYMAIL_PUBLIC_DIR . '/_include.php')
+	)
+);
+
+$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+require_once SNAPPYMAIL_PUBLIC_DIR . '/index.php';
+
+$oConfig = RainLoop\Api::Config();
+
+// https://github.com/usmannasir/cyberpanel/blob/f7e4f5d91cb2b40473ae6ceb4ca473493ab3bb0c/install/install.py#L1342
+$oConfig->Set('ssl', 'verify_certificate', false);
+
+// https://github.com/usmannasir/cyberpanel/blob/f7e4f5d91cb2b40473ae6ceb4ca473493ab3bb0c/install/install.py#L1354
+$oConfig->Set('plugins', 'enable', true);
+
+/**
+ * Install mailbox-detect extension
+ */
+SnappyMail\Repository::installPackage('plugin', 'mailbox-detect');
+/**
+ * Enable mailbox-detect autocreate_system_folders
+ * https://github.com/usmannasir/cyberpanel/blob/f7e4f5d91cb2b40473ae6ceb4ca473493ab3bb0c/install/install.py#L1363
+ */
+$oPlugin = RainLoop\Api::Actions()->Plugins()->CreatePluginByName('mailbox-detect');
+if ($oPlugin) {
+	$oPluginConfig = $oPlugin->Config();
+	$oPluginConfig->Set('plugin', 'autocreate_system_folders', true);
+	$oPluginConfig->Save();
+}
+
+/**
+ * Enable mailbox-detect extension
+ * https://github.com/usmannasir/cyberpanel/blob/f7e4f5d91cb2b40473ae6ceb4ca473493ab3bb0c/install/install.py#L1363
+ */
+$aList = SnappyMail\Repository::getEnabledPackagesNames();
+$aList[] = 'mailbox-detect';
+$oConfig->Set('plugins', 'enabled_list', implode(',', array_unique($aList)));
+// v2.5.4
+//\SnappyMail\Repository::enablePackage('mailbox-detect');
+
+$oConfig->Save();
diff --git a/integrations/hestiacp/bin/v-add-sys-snappymail b/integrations/hestiacp/bin/v-add-sys-snappymail
new file mode 100644
index 000000000..5b799e362
--- /dev/null
+++ b/integrations/hestiacp/bin/v-add-sys-snappymail
@@ -0,0 +1,160 @@
+#!/bin/bash
+# info: Install SnappyMail webmail client
+# options: [MODE]
+#
+# This function installs the SnappyMail webmail client.
+
+#----------------------------------------------------------#
+#                Variables & Functions                     #
+#----------------------------------------------------------#
+
+# Includes
+# shellcheck source=/etc/hestiacp/hestia.conf
+source /etc/hestiacp/hestia.conf
+# shellcheck source=/usr/local/hestia/func/main.sh
+source $HESTIA/func/main.sh
+# load config file
+source_conf "$HESTIA/conf/hestia.conf"
+# upgrade config file
+source "$HESTIA/install/upgrade/upgrade.conf"
+
+MODE=$1
+UPDATE="no"
+# Version and Download paths
+# Version to be moved to upgrade script
+SM_FILE="snappymail-latest.tar.gz"
+# For removal of folder
+SM_EXTRACT_MAIN="snappymail"
+
+# Downloading full version
+SM_URL="https://snappymail.eu/repository/latest.tar.gz"
+
+# Folder paths
+SM_INSTALL_DIR="/var/lib/snappymail"
+SM_CONFIG_DIR="/etc/snappymail"
+SM_LOG="/var/log/snappymail"
+
+#----------------------------------------------------------#
+#                    Verifications                         #
+#----------------------------------------------------------#
+
+# Checking root permissions
+if [ "x$(id -u)" != 'x0' ]; then
+    echo "ERROR: v-add-sys-snappymail can only be executed by the root user"
+    exit 10
+fi
+
+# Ensure that $HESTIA (/usr/local/hestia/) and other variables are valid.
+if [ -z "$HESTIA" ]; then
+    HESTIA="/usr/local/hestia"
+fi
+
+if [ -z "$HOMEDIR" ] || [ -z "$HESTIA_INSTALL_DIR" ]; then
+    echo "ERROR: Environment variables not present, installation aborted."
+    exit 2
+fi
+
+# Get current version
+if [ -f "/var/lib/snappymail/data/VERSION" ]; then
+    version=$(cat $SM_INSTALL_DIR/data/VERSION);
+    if [ "$version" == "$sm_v" ]; then
+        echo "Error: Installed version ($version) is equal to the available version ($sm_v)"
+        exit 2;
+    else
+        UPDATE="yes"
+    fi
+fi
+
+# Perform verification if read-only mode is enabled
+check_hestia_demo_mode
+
+#----------------------------------------------------------#
+#                       Action                             #
+#----------------------------------------------------------#
+
+if [ "$UPDATE" == "no" ]; then
+    rm -f -r $SM_INSTALL_DIR
+    rm -f -r $SM_CONFIG_DIR
+
+    mkdir $SM_INSTALL_DIR
+    mkdir $SM_CONFIG_DIR
+
+    cd "$SM_INSTALL_DIR"
+    [ ! -f "${SM_INSTALL_DIR}/${SM_FILE}" ] && wget "$SM_URL" --retry-connrefused --quiet -O "${SM_INSTALL_DIR}/${SM_FILE}"
+
+    if [ -f "${SM_INSTALL_DIR}/${SM_FILE}" ]; then
+        echo "ERROR: Download failed, installation aborted."
+        exit 2
+    fi
+
+# Get current version
+
+    key=$(openssl rand -hex 4);
+
+    admin_account="admin_$key"
+    admin_password=$(generate_password)
+
+    echo "Username: admin_$key" > ~/.snappymail
+    echo "Password: $admin_password" >> ~/.snappymail
+    echo "Secret key: admin_$key" >> ~/.snappymail
+
+    tar -xzf ${SM_INSTALL_DIR}/${SM_FILE}
+
+    mv ./data $SM_CONFIG_DIR/
+    ln -s $SM_CONFIG_DIR/data/ ./data
+
+    # Create database
+    mysql -e "CREATE DATABASE snappymail"
+    # Mysql available on system
+    r=$(generate_password)
+    mysql -e "GRANT ALL ON snappymail.*
+     TO snappymail@localhost IDENTIFIED BY '$r'"
+
+    php -f $HESTIA_INSTALL_DIR/snappymail/hestia.php "admin_$key" "$admin_password" "$r"
+
+    chown -R  www-data:www-data ./data
+    chown -R  www-data:www-data $SM_CONFIG_DIR/
+
+    rm  ${SM_INSTALL_DIR}/${SM_FILE}
+    # Add robots.txt
+    echo "User-agent: *" > $SM_INSTALL_DIR/robots.txt
+    echo "Disallow: /" >> $SM_INSTALL_DIR/robots.txt
+
+    # Updating hestia.conf
+    if [ -z "$(grep WEBMAIL_SYSTEM $HESTIA/conf/hestia.conf)" ]; then
+        $BIN/v-change-sys-config-value 'WEBMAIL_SYSTEM' 'snappymail'
+    else
+        if [  -z "$(echo "$WEBMAIL_SYSTEM" | grep -w 'snappymail')" ]; then
+           if [ -n "$WEBMAIL_SYSTEM" ]; then
+               $BIN/v-change-sys-config-value 'WEBMAIL_SYSTEM' "snappymail,$WEBMAIL_SYSTEM"
+           else
+               $BIN/v-change-sys-config-value 'WEBMAIL_SYSTEM' "snappymail"
+           fi
+        fi
+    fi
+
+else
+   [ ! -f "${SM_INSTALL_DIR}/${SM_FILE}" ] && wget "$SM_URL" --quiet -O "${SM_INSTALL_DIR}/${SM_FILE}"
+   version=$(cat $SM_INSTALL_DIR/data/VERSION);
+
+   tar -xzf snappymail-latest.tar.gz "data/VERSION" $SM_INSTALL_DIR/
+   version_source=$(cat $SM_INSTALL_DIR/VERSION);
+
+   # Check version inside .tar.gz file in case hestia didn't update yet
+   if [ "$version" != "$version_source" ]; then
+       tar -xzf ${SM_INSTALL_DIR}/${SM_FILE}
+       rm $SM_INSTALL_DIR/$SM_FILE
+    fi
+    rm ${SM_INSTALL_DIR}/VERSION
+fi
+
+#----------------------------------------------------------#
+#                       Hestia                             #
+#----------------------------------------------------------#
+
+if [ "$UPDATE" = "yes" ]; then
+    $BIN/v-log-action "system" "Info" "Plugins" "SnappyMail updated (Version: $version)."
+else
+    $BIN/v-log-action "system" "Info" "Plugins" "SnappyMail enabled (Version: $version)."
+fi
+log_event "$OK" "$ARGUMENTS"
diff --git a/integrations/hestiacp/install/deb/snappymail/install.php b/integrations/hestiacp/install/deb/snappymail/install.php
new file mode 100644
index 000000000..a84de4e4d
--- /dev/null
+++ b/integrations/hestiacp/install/deb/snappymail/install.php
@@ -0,0 +1,60 @@
+<?php
+
+$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+require_once '/var/lib/snappymail/index.php';
+
+	$oConfig = \RainLoop\Api::Config();
+
+	// Change default login data / key
+	$oConfig->Set('security', 'admin_login', $argv[1]);
+	$oConfig->Set('security', 'admin_panel_key', $argv[1]);
+	$oConfig->SetPassword($argv[2]);
+
+	// Allow Contacts to be saved in database
+	$oConfig->Set('contacts', 'enable', 'On');
+	$oConfig->Set('contacts', 'allow_sync', 'On');
+	$oConfig->Set('contacts', 'type', 'mysql');
+	$oConfig->Set('contacts', 'pdo_dsn', 'mysql:host=127.0.0.1;port=3306;dbname=snappymail');
+	$oConfig->Set('contacts', 'pdo_user', 'snappymail');
+	$oConfig->Set('contacts', 'pdo_password', $argv[3]);
+
+	// Plugins
+	$oConfig->Set('plugins', 'enable', 'On');
+
+	\SnappyMail\Repository::installPackage('plugin', 'change-password');
+	\SnappyMail\Repository::installPackage('plugin', 'change-password-hestia');
+	$sFile = APP_PRIVATE_DATA.'configs/plugin-change-password.json';
+	if (!file_exists($sFile)) {
+		file_put_contents('', json_encode([
+			'plugin' => [
+				'pass_min_length' => 8,
+				'pass_min_strength' => 60,
+				'driver_hestia_enabled' => true,
+				'driver_hestia_allowed_emails' => '*',
+				'hestia_host' => gethostname(),
+				'hestia_port' => 8083 // $BACKEND_PORT
+			]
+		], JSON_PRETTY_PRINT));
+	}
+	\SnappyMail\Repository::enablePackage('change-password');
+
+	\SnappyMail\Repository::installPackage('plugin', 'add-x-originating-ip-header');
+	\SnappyMail\Repository::enablePackage('add-x-originating-ip-header');
+	$sFile = APP_PRIVATE_DATA.'configs/plugin-add-x-originating-ip-header.json';
+	if (!file_exists($sFile)) {
+		file_put_contents('', json_encode([
+			'plugin' => [
+				'check_proxy' => true
+			]
+		], JSON_PRETTY_PRINT));
+	}
+
+	$oConfig->Save();
+
+	$sFile = APP_PRIVATE_DATA.'domains/hestia.json';
+	if (!file_exists($sFile)) {
+		$config = json_decode(file_get_contents(__DIR__ . '/app/domains/default.json'), true);
+		$config['IMAP']['shortLogin'] = true;
+		$config['SMTP']['shortLogin'] = true;
+		file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
+	}
diff --git a/integrations/nextcloud/screenshots/help_a1.png b/integrations/nextcloud/screenshots/help_a1.png
new file mode 100644
index 000000000..e7b557ca8
Binary files /dev/null and b/integrations/nextcloud/screenshots/help_a1.png differ
diff --git a/integrations/nextcloud/screenshots/help_a2.png b/integrations/nextcloud/screenshots/help_a2.png
new file mode 100644
index 000000000..55a29ef00
Binary files /dev/null and b/integrations/nextcloud/screenshots/help_a2.png differ
diff --git a/integrations/nextcloud/screenshots/inbox.jpg b/integrations/nextcloud/screenshots/inbox.jpg
new file mode 100644
index 000000000..5e87d7bf8
Binary files /dev/null and b/integrations/nextcloud/screenshots/inbox.jpg differ
diff --git a/integrations/nextcloud/screenshots/nextcloud-admin.png b/integrations/nextcloud/screenshots/nextcloud-admin.png
new file mode 100644
index 000000000..4b469eb20
Binary files /dev/null and b/integrations/nextcloud/screenshots/nextcloud-admin.png differ
diff --git a/integrations/nextcloud/snappymail/INSTALL b/integrations/nextcloud/snappymail/INSTALL
index d9c57d60b..2e42a4f67 100755
--- a/integrations/nextcloud/snappymail/INSTALL
+++ b/integrations/nextcloud/snappymail/INSTALL
@@ -7,11 +7,14 @@
 ************************************************************************
 
 REQUIREMENTS:
-- Nextcloud version 14 and above
+- Nextcloud version 18 and above
 
 INSTALL & CONFIGURATION:
 Start within Nextcloud, and click on the "+ Apps" button in the upper-left corner dropdown menu:
 Then, enable the SnappyMail plugin that is in the "Social & communication" section.
 After a quick wait, SnappyMail is installed. Even if it is really attractive, it is too soon to click on the newly appeared "Email" icon in the apps list. You should configure SnappyMail before using it (which makes some sense, doesn'it): go to Nextcloud admin panel (upper-right corner dropdown menu) and go to "Additionnal settings". There click on the "Go to SnappyMail Webmail admin panel".
-In the SnappyMail admin prompt, the default login is "admin" and the default password is "12345". No need to advise you to change it once in the admin panel!
+In the SnappyMail admin prompt, the default login is "admin" and the default password will be generated in "[nextcloud-data]/app_snappymail/_data_/_default_/admin_password.txt". No need to advise you to change it once in the admin panel!
 This is it, you are now free to configure SnappyMail as you wish. One important point is the Domains section when you will set up the IMAP/SMTP parameters that shall be associated with the email adresses of your users.
+
+STUCK IN MAINTENANCE:
+https://github.com/the-djmaze/snappymail/issues/929
diff --git a/integrations/nextcloud/snappymail/README.md b/integrations/nextcloud/snappymail/README.md
index dc67fcb7c..6047b3fc9 100644
--- a/integrations/nextcloud/snappymail/README.md
+++ b/integrations/nextcloud/snappymail/README.md
@@ -2,46 +2,46 @@
 
 snappymail-nextcloud is a plugin for Nextcloud to use the excellent SnappyMail webmail (https://snappymail.eu/).
 
-## Which branch for which version of Nextcloud?
-
-- The master branch corresponds to the latest stable version of the plugin that is suitable for Nextcloud 19 and upwards.
-- The 'up-to-nc18' corresponds to the working version of the plugin for Nextcloud 14 to 18.
-- The 'nc14' branch corresponds to a beta version of the plugin for Nextcloud 14. All the changes of 'nc14' branch were merged into master when it was deemed suitable for production.
-- The 'nc13' branch corresponds to the working version of the plugin for Nextcloud 10 to Nextcloud 13.
-
-
 Thank you to all contributors to SnappyMail for nextcloud:
-- SnappyMail Team, who initiated it
+- RainLoop Team, who initiated it
 - [pierre-alain-b](https://github.com/pierre-alain-b/rainloop-nextcloud)
 - Tab Fitts (@tabp0le)
 - Nextgen Networks (@nextgen-networks)
+- [All testers of issue 96](https://github.com/the-djmaze/snappymail/issues/96)
 
 ## How to Install
 
-Start within Nextcloud, and click on the "+ Apps" button in the upper-left corner dropdown menu:
+Start within Nextcloud as user with administrator rights and click on the "+ Apps" button in the upper-right corner dropdown menu:
 
-![Image1](https://github.com/pierre-alain-b/rainloop-nextcloud/blob/master/screenshots/help_a1.png)
+![Image1](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/help_a1.png)
 
 Then, enable the SnappyMail plugin that you will find in the "Social & communication" section:
 
-![Image2](https://github.com/pierre-alain-b/rainloop-nextcloud/blob/master/screenshots/help_a2.png)
+![Image2](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/help_a2.png)
 
-After a quick wait, SnappyMail is installed. Now you should configure it before use: open the Nextcloud admin panel (upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link.
+After a quick wait, SnappyMail is installed. Now you should configure it before use: open the Nextcloud admin panel (upper-right corner dropdown menu -> Settings) and go to "Additional settings" under the "Administration" section. There, click on the "Go to SnappyMail Webmail admin panel" link.
 
-![Image3](https://github.com/pierre-alain-b/rainloop-nextcloud/blob/master/screenshots/help_a3.png)
+![Image3](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/nextcloud-admin.png)
 
-To enter SnappyMail admin area, the default login is "admin" and the default password is "12345". Don't forget to change it once in the admin panel!
+To enter SnappyMail admin area, you must be Nextcloud admin (so you get logged in automatically) or else use the admin login credentials.
+The default login is "admin" and the default password will be generated in `[nextcloud-data]/app_snappymail/_data_/_default_/admin_password.txt`. Don't forget to change it once in the admin panel!
 
-From that point, all instance-wide SnappyMail settings can be tweaked as you wish. One important point is the "Domains" section where you should set up the IMAP/SMTP parameters that will be associated with the email adresses of your users. Basically, if a user of the Nextcloud instance starts SnappyMail and puts "firstname@domain.tld" as an email address, then SnappyMail should know how to connect to the IMAP & SMTP of domain.tld. You can fill in this information in the "Domains" section of the SnappyMail admin settings.
+From that point, all instance-wide SnappyMail settings can be tweaked as you wish. One important point is the "Domains" section where you should set up the IMAP/SMTP parameters that will be associated with the email adresses of your users. Basically, if a user of the Nextcloud instance starts SnappyMail and puts "firstname@domain.tld" as an email address, then SnappyMail should know how to connect to the IMAP & SMTP of domain.tld. You can fill in this information in the "Domains" section of the SnappyMail admin settings. For more information how to configure an automatic login for your Nextcloud users see [How to auto-connect to SnappyMail?](#how-to-auto-connect-to-snappymail)
 
-![Image4](https://github.com/pierre-alain-b/rainloop-nextcloud/blob/master/screenshots/help_a4.png)
+![grafik](https://user-images.githubusercontent.com/63400209/199767908-fbef0f50-ecb7-47ae-9ac1-771959d4b7f5.png)
+
+![grafik](https://user-images.githubusercontent.com/63400209/199768097-7bd939a7-56d0-47ba-b481-aeac08776fb4.png)
+
+## App Integrations
+### Contacts
+SnappyMail automatically connects with the Nextcloud contacts app. Download and install the [contacts app](https://apps.nextcloud.com/apps/contacts) for SnappyMail to obtain access to all registered users on the Nextcloud system, as well as users' personal contacts saved in here.
 
 ## SnappyMail Settings, Where Are They?
 
 SnappyMail for Nextcloud is highly configurable. But settings are available in multiple places and this can be misleading for first-time users.
 
 ### SnappyMail admin settings
-SnappyMail admin settings can be reached only by the Nextcloud administrator. Open the Nextcloud admin panel ("Admin" in the upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. Alternatively, you may use the following link: https://path.to.nextcloud/index.php/apps/snappymail/app/?admin.
+SnappyMail admin settings can be reached only by the Nextcloud administrator. Open the Nextcloud admin panel ("Admin" in the upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. Alternatively, you may use the following link: https://path.to.nextcloud/index.php/apps/snappymail/?admin.
 
 SnappyMail admin settings include all settings that will apply to all SnappyMail users (default login rules, branding, management of plugins, security rules and domains).
 
@@ -56,6 +56,31 @@ This is to be kept in mind for the use case where multiple users shall have the
 
 ## How to auto-connect to SnappyMail?
 
+### Default Domain
+As already said SnappyMail uses the domain part (@example.com) to choose the IMAP/SMTP server to use. If in the following settings the username passed to SnappyMail does not contain a domain, the "default domain" is added to this username. In this way SnappyMail can lookup the "Domain" configuration to use (IMAP, SMTP, SIEVE server ecc.).
+Example: if the username `john` is passed to SnappyMail, the "default domain" `example.com` would be added to the username basing on your configuration. So SnappyMail would try to login the user with the username `john@example.com`.
+
+You can configure the "default domain" and connected settings in the SnappyMail Admin Panel under the menu "Login".
+
+### Auto-connect options
+The Nextcloud administrator can choose how SnappyMail tries to automatically login when a user clicks on the icon of SnappyMail within Nextcloud. There are different options that can be found in the Nextcloud "Settings -> Administration -> Additional settings":
+
+#### Option 1: Users will login manually, or define credentials in their personal settings for automatic logins.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the user is prompted by SnappyMail to insert his credentials every time he tries to open the SnappyMail App within Nextcloud.
+
+#### Option 2: Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the Nextcloud username and password is used by SnappyMail to login (eventually adding the [default domain](#default-domain)).
+
+If your IMAP server only accepts usernames without a domain (for example the ldap username of your user) the automatic addition of the "default domain" would block your users from logging in to your IMAP server - but on the other side it is needed by SnappyMail to determine the server settings to use. In such a case you must configure SnappyMail to strip off the domain part before sending the credentials to your IMAP server. This is done by entering to the SnappyMail Admin Panel -> Domains -> clicking on your default domain -> flagging the checkbox "Use short login" under IMAP and SMTP.
+
+#### Option 3: Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the mail address of the Nextcloud user and his password are used by SnappyMail to login. SnappyMail will lookup the "Domain" settings for a configuration that meets the domain part of the mail address passed as username.
+
+#### Option 4: Attempt to automatically login with OIDC when active
+
 ### Auto-connection for all Nextcloud users
 If your Nextcloud users base is synchronized with an email system, then it is possible that Nextcloud credentials could be used right away to access the centralized email system. In the SnappyMail admin settings, the Nextcloud administrator can then tick the "Automatically login with Nextcloud/Nextcloud user credentials" checkbox.
 
@@ -64,14 +89,14 @@ Beware, if you tick this box, all Nextcloud users will *not* be able to use the
 ### Auto-connection for one user at a time
 Except if the above setting is activated, any Nextcloud user can have Nextcloud and SnappyMail keep in mind the default email/password to connect to SnappyMail. There, logging in Nextcloud is sufficient to then access SnappyMail within Nextcloud.
 
-To fill in the default email address and password to use, each Nextcloud user should go in the personal settings: choose "Personal" in the upper-right corner dropdown menu. Then select the "Rainlopp webmail" section. You can also use this direct link: https://path.to.nextcloud/index.php/settings/personal#snappymail-webmail.
+To fill in the default email address and password to use, each Nextcloud user should go in the personal settings: choose "Settings" in the upper-right corner dropdown menu. Under "Personal" select the "Additional settings" section where you can find the "SnappyMail Webmail" settings. You can also use this direct link: https://path.to.nextcloud/settings/user/additional.
 
 
 ## How to Activate SnappyMail Logging and then Find Logs
 
-You can activate SnappyMail logging here: `/path/to/nextcloud/data/snappymail-storage/_data_/_default_/configs/application.ini`
+You can activate SnappyMail logging here: `/path/to/nextcloud/data/appdata_snappymail/_data_/_default_/configs/application.ini`
 ```
 [logs]
 enable = On
 ```
-Logs are then available in `/path/to/nextcloud/data/snappymail-storage/_data_/_default_/logs/`
+Logs are then available in `/path/to/nextcloud/data/appdata_snappymail/_data_/_default_/logs/`
diff --git a/integrations/nextcloud/snappymail/VERSION b/integrations/nextcloud/snappymail/VERSION
deleted file mode 100755
index c910885a0..000000000
--- a/integrations/nextcloud/snappymail/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-2.15.0
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/NextCloudSuggestions.php b/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/NextCloudSuggestions.php
deleted file mode 100644
index a99e9052e..000000000
--- a/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/NextCloudSuggestions.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?php
-
-class OwnCloudSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
-{
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger;
-
-	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
-	{
-		$iInputLimit = $iLimit;
-		$aResult = array();
-		$sQuery = \trim($sQuery);
-
-		try
-		{
-			if ('' === $sQuery || !$oAccount || !OwnCloudPlugin::IsOwnCloudLoggedIn())
-			{
-				return $aResult;
-			}
-
-			$aParams = array('FN', 'NICKNAME', 'TITLE', 'EMAIL');
-			if (\class_exists('OC') && isset(\OC::$server) && \method_exists(\OC::$server, 'getContactsManager'))
-			{
-				$cm = \OC::$server->getContactsManager();
-				if (!$cm && !$cm->isEnabled())
-				{
-					return $aResult;
-				}
-
-				$aSearchResult = $cm->search($sQuery, $aParams);
-			}
-			else if (\class_exists('OCP\Contacts') && \OCP\Contacts::isEnabled())
-			{
-				$aSearchResult = \OCP\Contacts::search($sQuery, $aParams);
-			}
-			else
-			{
-				return $aResult;
-			}
-
-			//$this->oLogger->WriteDump($aSearchResult);
-
-			$aHashes = array();
-			if (\is_array($aSearchResult) && 0 < \count($aSearchResult))
-			{
-				foreach ($aSearchResult as $aContact)
-				{
-					if (0 >= $iLimit)
-					{
-						break;
-					}
-
-					$sUid = empty($aContact['UID']) ? '' : $aContact['UID'];
-					if (!empty($sUid))
-					{
-						$mEmails = isset($aContact['EMAIL']) ? $aContact['EMAIL'] : '';
-
-						$sFullName = isset($aContact['FN']) ? \trim($aContact['FN']) : '';
-						if (empty($sFullName))
-						{
-							$sFullName = isset($aContact['NICKNAME']) ? \trim($aContact['NICKNAME']) : '';
-						}
-
-						if (!\is_array($mEmails))
-						{
-							$mEmails = array($mEmails);
-						}
-
-						foreach ($mEmails as $sEmail)
-						{
-							$sHash = '"'.$sFullName.'" <'.$sEmail.'>';
-							if (!isset($aHashes[$sHash]))
-							{
-								$aHashes[$sHash] = true;
-								$aResult[] = array($sEmail, $sFullName);
-								$iLimit--;
-							}
-						}
-					}
-				}
-
-				$aResult = \array_slice($aResult, 0, $iInputLimit);
-			}
-
-			unset($aSearchResult, $aHashes);
-		}
-		catch (\Throwable $oException)
-		{
-			if ($this->oLogger)
-			{
-				$this->oLogger->WriteException($oException);
-			}
-		}
-
-		return $aResult;
-	}
-
-	/**
-	 * @param \MailSo\Log\Logger $oLogger
-	 */
-	public function SetLogger($oLogger)
-	{
-		$this->oLogger = $oLogger instanceof \MailSo\Log\Logger ? $oLogger : null;
-	}
-}
diff --git a/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/index.php b/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/index.php
deleted file mode 100644
index 099d239a3..000000000
--- a/integrations/nextcloud/snappymail/app/data/_data_/_default_/plugins/nextcloud/index.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-class NextCloudPlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME = 'NextCloud',
-		VERSION = '2.0',
-		CATEGORY = 'Integrations',
-		DESCRIPTION = 'Plugin that adds functionality to integrate with NextCloud.';
-
-	private static function IsNextCloud() : bool
-	{
-		return !empty($_ENV['SNAPPYMAIL_NEXTCLOUD']) && \class_exists('OC');
-	}
-
-	private static function IsNextCloudLoggedIn() : bool
-	{
-		return static::IsNextCloud() && \class_exists('OCP\User') && \OCP\User::isLoggedIn();
-	}
-
-	public function Init() : void
-	{
-		if (static::IsNextCloud()) {
-			$this->addHook('main.fabrica', 'MainFabrica');
-			$this->addHook('filter.app-data', 'FilterAppData');
-			$this->addHook('json.attachments', 'DoAttachmentsActions');
-
-			$sAppPath = '';
-			if (\class_exists('OC_App')) {
-				$sAppPath = \rtrim(\trim(\OC_App::getAppWebPath('snappymail')), '\\/').'/app/';
-			}
-			if (!$sAppPath) {
-				$sUrl = \MailSo\Base\Http::SingletonInstance()->GetUrl();
-				if ($sUrl && \preg_match('/\/index\.php\/apps\/snappymail/', $sUrl)) {
-					$sAppPath = \preg_replace('/\/index\.php\/apps\/snappymail.+$/',
-						'/apps/snappymail/app/', $sUrl);
-				}
-			}
-			$_SERVER['SCRIPT_NAME'] = $sAppPath;
-		}
-	}
-
-	public function Supported() : string
-	{
-		if (!static::IsNextCloud()) {
-			return 'NextCloud not found to use this plugin';
-		}
-		return '';
-	}
-
-	// DoAttachmentsActions
-	public function DoAttachmentsActions(\SnappyMail\AttachmentsAction $data)
-	{
-		if ('nextcloud' === $data->action) {
-			if (static::IsNextCloudLoggedIn() && \class_exists('OCP\Files')) {
-				$oFiles = \OCP\Files::getStorage('files');
-				if ($oFiles && $data->filesProvider->IsActive() && \method_exists($oFiles, 'file_put_contents')) {
-					$sSaveFolder = $this->Config()->Get('plugin', 'save_folder', '') ?: 'Attachments';
-					$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
-					$data->result = true;
-					foreach ($data->items as $aItem) {
-						$sSavedFileName = isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat';
-						$sSavedFileHash = !empty($aItem['FileHash']) ? $aItem['FileHash'] : '';
-						if (!empty($sSavedFileHash)) {
-							$fFile = $data->filesProvider->GetFile($data->account, $sSavedFileHash, 'rb');
-							if (\is_resource($fFile)) {
-								$sSavedFileNameFull = \MailSo\Base\Utils::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, function ($sPath) use ($oFiles) {
-									return $oFiles->file_exists($sPath);
-								});
-
-								if (!$oFiles->file_put_contents($sSavedFileNameFull, $fFile)) {
-									$data->result = false;
-								}
-
-								if (\is_resource($fFile)) {
-									\fclose($fFile);
-								}
-							}
-						}
-					}
-				}
-			}
-
-			foreach ($data->items as $aItem) {
-				$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
-				if (!empty($sFileHash)) {
-					$data->filesProvider->Clear($data->account, $sFileHash);
-				}
-			}
-		}
-	}
-
-	/**
-	 * TODO: create pre-login auth hook
-	 */
-	public function ServiceNextCloudAuth()
-	{
-/*
-		$this->oHttp->ServerNoCache();
-
-		if (!static::IsNextCloud() ||
-			!isset($_ENV['___snappymail_nextcloud_email']) ||
-			!isset($_ENV['___snappymail_nextcloud_password']) ||
-			empty($_ENV['___snappymail_nextcloud_email'])
-		)
-		{
-			$this->oActions->SetAuthLogoutToken();
-			$this->oActions->Location('./');
-			return '';
-		}
-
-		$bLogout = true;
-
-		$sEmail = $_ENV['___snappymail_nextcloud_email'];
-		$sPassword = $_ENV['___snappymail_nextcloud_password'];
-
-		try
-		{
-			$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-			$this->oActions->AuthToken($oAccount);
-
-			$bLogout = !($oAccount instanceof \snappymail\Model\Account);
-		}
-		catch (\Exception $oException)
-		{
-			$this->oActions->Logger()->WriteException($oException);
-		}
-
-		if ($bLogout)
-		{
-			$this->oActions->SetAuthLogoutToken();
-		}
-
-		$this->oActions->Location('./');
-		return '';
-*/
-	}
-
-	/**
-	 * @return void
-	 */
-	public function FilterAppData($bAdmin, &$aResult)
-	{
-		if (!$bAdmin && \is_array($aResult) && static::IsNextCloud()) {
-			$key = \array_search(\RainLoop\Enumerations\Capa::AUTOLOGOUT, $aResult['Capa']);
-			if (false !== $key) {
-				unset($aResult['Capa'][$key]);
-			}
-			if (static::IsNextCloudLoggedIn() && \class_exists('OCP\Files')) {
-				$aResult['System']['attachmentsActions'][] = 'nextcloud';
-			}
-		}
-	}
-
-	/**
-	 * @param string $sName
-	 * @param mixed $mResult
-	 */
-	public function MainFabrica($sName, &$mResult)
-	{
-		if ('suggestions' === $sName && static::IsNextCloud() && $this->Config()->Get('plugin', 'suggestions', true)) {
-			include_once __DIR__.'/NextCloudSuggestions.php';
-			if (!\is_array($mResult)) {
-				$mResult = array();
-			}
-			$mResult[] = new NextCloudSuggestions();
-		}
-	}
-
-	protected function configMapping() : array
-	{
-		return array(
-			\RainLoop\Plugins\Property::NewInstance('save_folder')->SetLabel('Save Folder')
-				->SetDefaultValue('Attachments'),
-			\RainLoop\Plugins\Property::NewInstance('suggestions')->SetLabel('Suggestions')
-				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
-				->SetDefaultValue(true)
-		);
-	}
-}
diff --git a/integrations/nextcloud/snappymail/app/include.php b/integrations/nextcloud/snappymail/app/include.php
new file mode 100644
index 000000000..7aa451923
--- /dev/null
+++ b/integrations/nextcloud/snappymail/app/include.php
@@ -0,0 +1,55 @@
+<?php
+
+// Name this file as "include.php" to enable it.
+
+//header('Strict-Transport-Security: max-age=31536000');
+
+/**
+ * Uncomment to use gzip compressed output
+ */
+//define('USE_GZIP', 1);
+
+/**
+ * Uncomment to use brotli compressed output
+ */
+//define('USE_BROTLI', 1);
+
+/**
+ * Uncomment to enable multiple domain installation.
+ */
+//define('MULTIDOMAIN', 1);
+
+/**
+ * Uncomment to disable APCU.
+ */
+//define('APP_USE_APCU_CACHE', false);
+
+/**
+ * Custom 'data' folder path
+ */
+if (class_exists('OC')) {
+	define('APP_DATA_FOLDER_PATH', \rtrim(\trim(
+//		\OCA\SnappyMail\Util\SnappyMailHelper::getSystemConfigValue('datadirectory', '')
+		\method_exists(\OC::$server, 'getSystemConfig')
+			? \OC::$server->getSystemConfig()->getValue('datadirectory', '')
+			// Nextcloud 34+
+			: \OC::$server->get(\OCP\IConfig::class)->getSystemValue('datadirectory', '')
+	), '\\/') . '/appdata_snappymail/');
+} else {
+	http_response_code(400);
+	header($_SERVER['SERVER_PROTOCOL'].' 400 Bad Request', true, 400);
+	error_log("SnappyMail outside Nextcloud {$_SERVER['REQUEST_URI']}");
+	exit('Not inside Nextcloud');
+//	define('APP_DATA_FOLDER_PATH', dirname(__DIR__) . '/snappymail-data/');
+//	define('APP_DATA_FOLDER_PATH', '/var/external-snappymail-data-folder/');
+}
+
+/**
+ * Additional configuration file name
+ */
+//define('APP_CONFIGURATION_NAME', $_SERVER['HTTP_HOST'].'.ini');
+
+/**
+ * Also update extensions on upgrade
+ */
+define('SNAPPYMAIL_UPDATE_PLUGINS', 1);
diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png b/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png
new file mode 100644
index 000000000..d1f82db87
Binary files /dev/null and b/integrations/nextcloud/snappymail/app/themes/Nextcloud/images/preview.png differ
diff --git a/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
new file mode 100644
index 000000000..21d16034e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/app/themes/Nextcloud/styles.css
@@ -0,0 +1,221 @@
+* {
+/* Nextcloud 25
+	--background-image-invert-if-bright: no;
+	--background-invert-if-bright: invert(100%);
+	--background-invert-if-dark: no;
+	--border-radius: 3px;
+	--border-radius-large: 10px;
+	--border-radius-pill: 100px;
+	--breakpoint-mobile: 1024px;
+	--color-background-dark: #ededed;
+	--color-background-darker: #dbdbdb;
+	--color-background-hover: #f5f5f5;
+	--color-background-plain: #0082c9;
+	--color-border: #ededed;
+	--color-border-dark: #dbdbdb;
+	--color-box-shadow: rgba(var(--color-box-shadow-rgb), 0.5);
+	--color-box-shadow-rgb: 77,77,77;
+	--color-error: #e9322d;
+	--color-error-hover: #ed5a56;
+	--color-error-rgb: 233,50,45;
+	--color-loading-dark: #444444;
+	--color-loading-light: #cccccc;
+	--color-main-background: #ffffff;
+	--color-main-background-blur: rgba(var(--color-main-background-rgb), .8);
+	--color-main-background-rgb: 255,255,255;
+	--color-main-background-translucent: rgba(var(--color-main-background-rgb), .97);
+	--color-main-text: #222222;
+	--color-placeholder-dark: #cccccc;
+	--color-placeholder-light: #e6e6e6;
+	--color-primary-default: #0082c9;
+	--color-primary-element: #00639a;
+	--color-primary-element-hover: #3282ae;
+	--color-primary-element-light: #e5eff4;
+	--color-primary-element-light-hover: #dbe4e9;
+	--color-primary-element-light-text: #00273d;
+	--color-primary-element-text: #ffffff;
+	--color-primary-element-text-dark: #ededed;
+	--color-primary-hover: #3282ae;
+	--color-primary-light: #e5eff4;
+	--color-primary-light-hover: #dbe4e9;
+	--color-primary-light-text: #00273d;
+	--color-primary-text: #ffffff;
+	--color-primary-text-dark: #ededed;
+	--color-primary: #00639a;
+	--color-scrollbar: rgba(34,34,34, .15);
+	--color-success: #46ba61;
+	--color-success-hover: #6ac780;
+	--color-success-rgb: 70,186,97;
+	--color-text-light: #222222;
+	--color-text-lighter: #767676;
+	--color-text-maxcontrast: #767676;
+	--color-text-maxcontrast-background-blur: #646464;
+	--color-text-maxcontrast-default: #767676;
+	--color-warning: #eca700;
+	--color-warning-hover: #efb832;
+	--color-warning-rgb: 236,167,0;
+	--default-clickable-area: 44px;
+	--default-font-size: 15px;
+	--default-grid-baseline: 4px;
+	--default-line-height: 24px;
+	--filter-background-blur: blur(25px);
+	--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';
+	--gradient-main-background: var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%;
+	--gradient-primary-background: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-hover) 100%);
+	--header-height: 50px;
+	--header-menu-item-height: 44px;
+	--header-menu-profile-item-height: 66px;
+	--image-background: url('/nextcloud/core/img/app-background.jpg');
+	--list-max-width: 300px;
+	--list-min-width: 200px;
+	--navigation-width: 300px;
+	--primary-invert-if-bright: no;
+	--sidebar-max-width: 500px;
+	--sidebar-min-width: 300px;
+*/
+	--fontSans: var(--font-face);
+
+	/* MAIN */
+	--main-color: var(--color-main-text);
+	--main-bg-color: var(--color-main-background);
+	--main-bg-image: none;
+	--main-bg-size: auto;
+	--main-bg-repeat: repeat;
+	--main-font-size: 14px;
+	--link-color: #369;
+	--border-color: var(--color-border);
+	--border-radius: var(--border-radius);
+	--hr-color: var(--color-border);
+
+	--panel-bg-clr: var(--color-main-background);
+
+	--warning-clr: var(--color-warning);
+	--warning-bg-clr: #fcf8e3;
+	--warning-border-clr: #fbeed5;
+
+	--error-clr: var(--color-error);
+	--error-bg-clr: #f2dede;
+	--error-border-clr: #eed3d7;
+
+	--info-clr: #3a87ad;
+	--info-bg-clr: #d9edf7;
+	--info-border-clr: #bce8f1;
+
+	/* LOADING */
+	--loading-color: var(--color-main-text);
+	--loading-text-shadow: none; /* 0px 1px 0px rgba(0, 0, 0, 0.5); */
+
+	/* LOGIN */
+	--login-color: var(--color-main-text);
+	--login-bg-color: var(--color-background-darker);
+	--login-box-shadow: var(--color-box-shadow);
+	--login-border: none;
+	--login-border-radius: var(--border-radius-large);
+
+	--spinner-color: #fff;
+
+	/* MENU */
+	--dropdown-menu-color: var(--color-main-text);
+	--dropdown-menu-bg-color: var(--color-main-background);
+	--dropdown-menu-hover-bg-color: var(--color-background-hover);
+	--dropdown-menu-hover-color: var(--color-main-text);
+	--dropdown-menu-disabled-color: #999;
+	--dropdown-menu-border-clr: var(--color-border);
+
+	/* FOLDERS */
+	--folders-color: var(--color-main-text);
+	--folders-disabled-color: #999;
+	--folders-selected-color: var(--color-primary-text);
+	--folders-selected-bg-color: var(--color-background-darker);
+	--folders-focused-color: var(--color-primary-text);
+	--folders-focused-bg-color: var(--color-background-dark);
+	--folders-hover-color: var(--color-primary-hover);
+	--folders-hover-bg-color: var(--color-background-hover);
+	--folders-drop-color: var(--color-primary-hover);
+	--folders-drop-bg-color:  var(--color-background-hover);
+	--unread-count-color: #fff;
+	--unread-count-bg-color: #333;
+
+	/* SETTINGS */
+	--settings-bg-clr: transparent;
+	--settings-menu-color: var(--color-main-text);
+	--settings-menu-selected-color: #eee;
+	--settings-menu-selected-bg-color: rgba(0,0,0,0.5);
+	--settings-menu-hover-color: #eee;
+	--settings-menu-hover-bg-color: rgba(0,0,0,0.5);
+
+	/* MESSAGE LIST */
+	--message-list-toolbar-bg-color: #eee;
+
+	/* MESSAGE */
+	--message-bg-color: #fff;
+
+	/* DIALOGS */
+	--dialog-clr: var(--color-main-text);
+	--dialog-bg-clr: var(--color-main-background);
+	--dialog-border-clr: var(--color-border);
+	--dialog-border-radius: var(--border-radius-large);
+
+	/* FORMS */
+	--btn-clr: var(--color-primary-text);
+	--btn-bg-clr: var(--color-primary-element);
+	--btn-border-clr: var(--color-border);
+	--btn-success-bg-clr: #84AB04;
+	--btn-danger-bg-clr: #ee5f5b;
+
+	--input-clr: var(--color-main-text);
+	--input-bg-clr: var(--color-main-background);
+	--input-border-clr: var(--color-border-dark);
+	--input-border-radius: var(--border-radius);
+	--input-focus-border-clr: var(--color-primary-element);
+
+	/* TABLES */
+	--tr-hover-bg-clr: var(--color-background-hover);
+	--tr-odd-bg-clr: var(--color-background-darker); /* when striped */
+
+	/* TABS */
+	--tab-active-bg-clr: var(--color-main-background);
+	--tab-hover-border-clr: var(--color-background-hover);
+}
+
+.thm-message-list-top-toolbar, .thm-message-list-bottom-toolbar {
+    background: transparent linear-gradient(to bottom, var(--color-main-background) 0%, var(--color-main-background-translucent) 85%, transparent 100%) repeat-x !important;
+}
+#V-AdminPane > .b-toolbar {
+	color: var(--main-color);
+	text-shadow: none;
+}
+
+#rl-app dialog header {
+	background-color: var(--color-primary-element);
+	background-image: linear-gradient(40deg, var(--color-primary) 0%, var(--color-primary-element-light) 100%);
+	color: var(--color-primary-text);
+}
+
+.messageList, .messageView {
+	background-color: var(--color-main-background, #fff);
+	border-color: var(--color-border);
+	border-radius: var(--border-radius);
+}
+
+#messageItem {
+	color: var(--main-color, #000);
+}
+.messageView .messageItemHeader,
+#messageItem .attachmentsPlace,
+#messageItem .attachmentsControls,
+#messageItem .bodySubHeader > * {
+	background-color: var(--color-main-background, #eee);
+}
+
+#V-MailFolderList.focused .b-content,
+#V-MailMessageList.focused .messageList,
+#V-MailMessageView.focused .messageView {
+	border-color: var(--color-border-dark);
+	box-shadow: 0 2px 8px var(--color-box-shadow);
+}
+
+#rl-app button.btn:not(.button-vue) {
+	color: var(--color-primary-text);
+	background-color: var(--color-primary-element);
+}
diff --git a/integrations/nextcloud/snappymail/appinfo/app.php b/integrations/nextcloud/snappymail/appinfo/app.php
deleted file mode 100644
index 7b86a17b8..000000000
--- a/integrations/nextcloud/snappymail/appinfo/app.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-/**
- * Nextcloud - SnappyMail mail plugin
- *
- * @author SnappyMail Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b)
- *
- * Based initially on https://github.com/SnappyMail/snappymail-webmail/tree/master/build/owncloud
- */
-
-$app = new OCA\SnappyMail\AppInfo\Application();
-$app->registerNavigation();
-$app->registerPersonalSettings();
-$app->getContainer()->query('SnappyMailHelper')->registerHooks();
-
diff --git a/integrations/nextcloud/snappymail/appinfo/info.xml b/integrations/nextcloud/snappymail/appinfo/info.xml
index 6fdca35db..5f25f2e54 100644
--- a/integrations/nextcloud/snappymail/appinfo/info.xml
+++ b/integrations/nextcloud/snappymail/appinfo/info.xml
@@ -3,27 +3,91 @@
 	<id>snappymail</id>
 	<name>SnappyMail</name>
 	<summary>SnappyMail Webmail</summary>
-	<description>Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, "Additionnal settings" and you will see a "SnappyMail webmail" section. There, click on the link to go to the SnappyMail admin panel. The default user/password is admin/12345. This version is based on SnappyMail 2.6.0 (2021-07).</description>
-	<version>2.15.0</version>
+	<version>2.38.2</version>
 	<licence>agpl</licence>
-	<author>SnappyMail Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
-  <namespace>SnappyMail</namespace>
+	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
+	<description><![CDATA[**Lightweight & fast email client.**
+
+- **Dark mode**
+- **Responsive design**
+- **Full Sieve filtering support**
+- **Almost all IMAP features** including advanced searching
+- **Integration with Nextcloud Unified Search**
+- **Integration with other Nextcloud apps** (Contacts, Files and Calendar)
+- **Multiple mail accounts and identities**
+- **Send & receive OpenPGP encrypted/signed emails** (With full HTML support, ECC keys, or plain text with Mailvelope)
+- **Send & receive S/MIME encrypted/signed emails**
+- **Many security features** (Sodium encrypted passwords, Sec-Fetch, TOTP 2FA, DKIM, prevent tracking, etc.)
+- **Kolab integrations**
+
+After enabling in Nextcloud, go to Nextcloud admin panel, "Additional settings" and you will see a "SnappyMail webmail" section.
+There, click on the link to go to the SnappyMail admin panel.
+	]]></description>
+	<namespace>SnappyMail</namespace>
 	<documentation>
-		<user>https://github.com/pierre-alain-b/snappymail-nextcloud/blob/master/README.md</user>
-		<website>https://snappymail.eu/</website>
+		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/nextcloud/snappymail/README.md</user>
+		<admin>https://github.com/the-djmaze/snappymail/wiki/Admin-Manual</admin>
+		<developer>https://github.com/the-djmaze/snappymail/wiki/Developer-Documentation</developer>
+		<website>https://github.com/the-djmaze/snappymail/wiki</website>
 	</documentation>
+	<category>integration</category>
+	<category>office</category>
+	<category>search</category>
 	<category>social</category>
-    <category>tools</category>
-    <category>integration</category>
-    <screenshot>https://raw.githubusercontent.com/pierre-alain-b/snappymail-nextcloud/master/screenshots/2016.10.20-screenshot.jpg</screenshot>
-	<website>https://github.com/pierre-alain-b/snappymail-nextcloud</website>
-	<bugs>https://github.com/pierre-alain-b/snappymail-nextcloud/issues</bugs>
+	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/nextcloud/screenshots/inbox.jpg</screenshot>
+	<website>https://snappymail.eu</website>
+	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
+	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/nextcloud</repository>
+	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
 	<dependencies>
-    <php min-version="7.4" />
-		<owncloud min-version="6" max-version="9.2" />
-		<nextcloud min-version="20" max-version="22" />
-  </dependencies>
+		<php min-version="8.2" min-int-size="32" />
+		<lib>mbstring</lib>
+		<lib>zlib</lib>
+<!--
+		<lib>gnupg</lib>
+		<lib>curl</lib>
+		<lib>exif</lib>
+		<lib>gd</lib>
+		<lib>gmagick</lib>
+		<lib>imagick</lib>
+		<lib>iconv</lib>
+		<lib>intl</lib>
+		<lib>ldap</lib>
+		<lib>openssl</lib>
+		<lib>sodium</lib>
+		<lib>redis</lib>
+		<lib>pdo_mysql</lib>
+		<lib>pdo_pgsql</lib>
+		<lib>pdo_sqlite</lib>
+		<lib>tidy</lib>
+		<lib>uuid</lib>
+		<lib>xxtea</lib>
+		<lib>zip</lib>
+		<nextcloud min-version="25" max-version="33" />
+-->
+		<nextcloud min-version="25" />
+	</dependencies>
 	<settings>
 		<admin>OCA\SnappyMail\Settings\AdminSettings</admin>
+		<personal>OCA\SnappyMail\Settings\PersonalSettings</personal>
 	</settings>
+	<navigations>
+		<navigation>
+			<name>Email</name>
+			<route>snappymail.page.index</route>
+			<icon>logo-white-64x64.png</icon>
+			<order>4</order>
+		</navigation>
+	</navigations>
+	<repair-steps>
+		<install>
+			<step>OCA\SnappyMail\Migration\InstallStep</step>
+		</install>
+		<post-migration>
+			<step>OCA\SnappyMail\Migration\InstallStep</step>
+		</post-migration>
+	</repair-steps>
+	<commands>
+		<command>OCA\SnappyMail\Command\Settings</command>
+	</commands>
 </info>
diff --git a/integrations/nextcloud/snappymail/appinfo/routes.php b/integrations/nextcloud/snappymail/appinfo/routes.php
old mode 100755
new mode 100644
index a19b5a4f3..5304f9869
--- a/integrations/nextcloud/snappymail/appinfo/routes.php
+++ b/integrations/nextcloud/snappymail/appinfo/routes.php
@@ -7,24 +7,34 @@ return [
 			'url' => '/',
 			'verb' => 'GET'
 		],
+		[
+			'name' => 'page#indexPost',
+			'url' => '/',
+			'verb' => 'POST'
+		],
 		[
 			'name' => 'page#appGet',
-			'url' => '/app/',
+			'url' => '/run/',
 			'verb' => 'GET'
 		],
 		[
 			'name' => 'page#appPost',
-			'url' => '/app/',
+			'url' => '/run/',
 			'verb' => 'POST'
 		],
 		[
-			'name' => 'ajax#setPersonal',
-			'url' => '/ajax/personal.php',
+			'name' => 'fetch#setPersonal',
+			'url' => '/fetch/personal.php',
 			'verb' => 'POST'
 		],
 		[
-			'name' => 'ajax#setAdmin',
-			'url' => '/ajax/admin.php',
+			'name' => 'fetch#setAdmin',
+			'url' => '/fetch/admin.php',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'fetch#upgrade',
+			'url' => '/fetch/upgrade',
 			'verb' => 'POST'
 		]
 	]
diff --git a/integrations/nextcloud/snappymail/appinfo/version b/integrations/nextcloud/snappymail/appinfo/version
deleted file mode 100755
index a8a188756..000000000
--- a/integrations/nextcloud/snappymail/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-7.1.2
diff --git a/integrations/nextcloud/snappymail/css/embed.css b/integrations/nextcloud/snappymail/css/embed.css
new file mode 100644
index 000000000..37613d383
--- /dev/null
+++ b/integrations/nextcloud/snappymail/css/embed.css
@@ -0,0 +1,145 @@
+/*
+This stylesheet is used when SnappyMail runs in embed mode.
+*/
+#content.app-snappymail {
+	max-height: 100%;
+}
+#content #rl-app {
+	min-width: 100%;
+	min-height: 100%;
+}
+
+.squire-wysiwyg {
+	min-width: 100%;
+	min-height: 100%;
+}
+
+#V-AdminPane .btn-logout {
+	display: none;
+}
+
+#rl-app select,
+#rl-app input
+{
+	min-height: auto;
+	height: auto;
+	margin: 0;
+	padding: 3px;
+}
+#rl-app .select, #rl-app select {
+	padding-right: 1.5em !important;
+}
+
+#rl-app button.btn:not(.button-vue) {
+	min-height: auto;
+	height: auto;
+	margin: 0;
+	padding: 0 12px;
+	line-height: 2;
+}
+
+#rl-app .form-horizontal .control-group > :not(label)
+{
+	margin-left: 20px;
+}
+
+#rl-app .LoginView .fontastic + input {
+	padding-left: 30px;
+}
+
+#rl-app .loading::after {
+	display: none;
+}
+
+#rl-app .squire-plain, #rl-app .squire-wysiwyg {
+	font-size: 13px;
+	height: 100%;
+	line-height: 16px;
+	min-height: 200px;
+}
+
+#rl-app tbody tr:hover {
+	background-color: inherit;
+}
+
+#rl-app table {
+	white-space: inherit;
+}
+
+#rl-app .b-text-part ul {
+	list-style: initial;
+}
+
+body > header ul {
+	margin: 0;
+}
+
+#rl-app h3 {
+	color: inherit;
+}
+
+.messageListItem * {
+	cursor: pointer;
+}
+
+/**
+ * Firefox < 98
+ * https://github.com/the-djmaze/snappymail/issues/673
+ */
+#rl-app dialog.polyfill {
+	margin-top: 50px;
+	max-height: calc(100vh - 60px);
+}
+
+/**
+ * hampoelz
+ * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
+ */
+
+.messageList {
+	margin: 0 5px 0 0;
+}
+
+a.selectable {
+	margin: 2px;
+	line-height: inherit !important;
+	border-radius: var(--border-radius-pill);
+}
+
+a.selectable::after {
+	display: block;
+	margin: 0 !important;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.btn {
+	border: initial !important;
+}
+
+.btn-group > .btn {
+	border-radius: 0;
+}
+.btn-group > .btn:first-child {
+	border-top-left-radius: var(--border-radius-pill, 3px);
+	border-bottom-left-radius: var(--border-radius-pill, 3px);
+}
+.btn-group > .btn:last-child {
+	border-top-right-radius: var(--border-radius-pill, 3px);
+	border-bottom-right-radius: var(--border-radius-pill, 3px);
+}
+
+@media print {
+	#body-user #header {
+		display: none;
+	}
+	#content {
+		padding-top: 0;
+	}
+}
+
+@media screen and (max-width: 799px) {
+	#body-user #rl-left {
+		top: 50px;
+	}
+}
diff --git a/integrations/nextcloud/snappymail/css/style.css b/integrations/nextcloud/snappymail/css/style.css
old mode 100755
new mode 100644
diff --git a/integrations/nextcloud/snappymail/img/favicon-mask.svg b/integrations/nextcloud/snappymail/img/favicon-mask.svg
new file mode 100644
index 000000000..81079c660
--- /dev/null
+++ b/integrations/nextcloud/snappymail/img/favicon-mask.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.0" width="512pt" height="512pt" viewBox="0 0 512.000000 512.000000" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg">
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" stroke="none"><path d="M933 3908 c-150 -150 -276 -281 -279 -291 -5 -16 51 -77 272 -298 l279 -279 177 0 c98 0 178 3 178 7 0 4 -89 97 -197 206 -157 157 -195 200 -183 207 9 6 257 10 613 10 l597 0 0 134 c0 113 -2 135 -16 140 -9 3 -283 6 -610 6 -327 0 -594 3 -594 8 0 4 90 97 199 206 110 110 198 203 195 208 -3 4 -84 8 -181 8 l-176 0 -274 -272z"/><path d="M3560 4173 c0 -4 88 -96 196 -204 115 -115 194 -201 190 -208 -5 -8 -178 -11 -611 -11 -540 0 -603 -2 -609 -16 -3 -9 -6 -67 -6 -129 0 -103 2 -115 19 -125 13 -6 224 -10 615 -10 328 0 596 -3 596 -8 0 -4 -90 -97 -200 -207 -110 -110 -200 -203 -200 -207 0 -5 82 -8 182 -8 l182 0 285 286 285 285 -285 285 -284 284 -177 0 c-98 0 -178 -3 -178 -7z"/><path d="M640 2317 l0 -1163 28 -27 28 -27 1865 0 1865 0 27 28 27 28 0 1156 c0 636 -4 1159 -8 1162 -5 3 -41 -27 -80 -67 l-72 -72 -2 -1030 -3 -1030 -1755 0 -1755 0 -3 1030 -2 1030 -72 72 c-40 40 -76 73 -80 73 -5 0 -8 -523 -8 -1163z"/><path d="M1290 2972 c0 -4 84 -92 188 -195 l187 -187 895 0 895 0 188 188 c103 103 187 191 187 195 0 4 -75 7 -168 7 l-168 0 -69 -70 -69 -70 -796 0 -796 0 -69 70 -69 70 -168 0 c-93 0 -168 -3 -168 -8z"/><rect width="105.70417" height="113.39262" x="965.82471" y="-1995.0565" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="968.17059" y="-1775.3387" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="1544.7432" y="-1770.8339" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="1201.2841" y="-2214.6541" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="1529.8855" y="-2211.1558" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="1766.1398" y="-2213.186" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="1767.3953" y="-1976.6418" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="2112.5291" y="-2219.311" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="2677.8127" y="-2214.9653" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="2672.6284" y="-1988.6554" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="2673.4526" y="-1762.207" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="2898.8728" y="-2216.2759" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3249.094" y="-2212.2566" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3251.0608" y="-1984.4783" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3251.5601" y="-1774.9227" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3470.1848" y="-2214.272" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3829.9443" y="-2215.0381" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="4044.0989" y="-2214.53" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="4041.5127" y="-1999.0615" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="4043.4043" y="-1785.1989" transform="scale(1,-1)" ry="0"/><rect width="105.70417" height="113.39262" x="3830.5203" y="-1781.4473" transform="scale(1,-1)" ry="0"/></g>
+</svg>
diff --git a/assets/apple-touch-icon.png b/integrations/nextcloud/snappymail/img/favicon-touch.png
similarity index 100%
rename from assets/apple-touch-icon.png
rename to integrations/nextcloud/snappymail/img/favicon-touch.png
diff --git a/integrations/nextcloud/snappymail/img/logo-white-64x64.png b/integrations/nextcloud/snappymail/img/logo-white-64x64.png
new file mode 100644
index 000000000..1bca3e09a
Binary files /dev/null and b/integrations/nextcloud/snappymail/img/logo-white-64x64.png differ
diff --git a/integrations/nextcloud/snappymail/js/admin.js b/integrations/nextcloud/snappymail/js/admin.js
deleted file mode 100755
index e84b4a0c0..000000000
--- a/integrations/nextcloud/snappymail/js/admin.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/**
- * Nextcloud - SnappyMail mail plugin
- *
- * @author SnappyMail Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b)
- *
- * Based initially on https://github.com/SnappyMail/snappymail-webmail/tree/master/build/owncloud
- */
-
-$(function() {
-	SnappyMailFormHelper('#mail-snappymail-admin-form', 'admin.php');
-});
diff --git a/integrations/nextcloud/snappymail/js/personal.js b/integrations/nextcloud/snappymail/js/personal.js
deleted file mode 100755
index b2a7d7c3d..000000000
--- a/integrations/nextcloud/snappymail/js/personal.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-/**
- * Nextcloud - SnappyMail mail plugin
- *
- * @author SnappyMail Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b)
- *
- * Based initially on https://github.com/SnappyMail/snappymail-webmail/tree/master/build/owncloud
- */
-
-$(function() {
-	SnappyMailFormHelper('#mail-snappymail-personal-form', 'personal.php');
-});
diff --git a/integrations/nextcloud/snappymail/js/rainloop.js b/integrations/nextcloud/snappymail/js/rainloop.js
deleted file mode 100755
index d8687f21b..000000000
--- a/integrations/nextcloud/snappymail/js/rainloop.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Do the following things once the document is fully loaded.
-document.onreadystatechange = function () {
-	if (document.readyState === 'complete') {
-		watchIFrameTitle();
-	}
-}
-
-// The SnappyMail application is already configured to modify the <title> element
-// of its root document with the number of unread messages in the inbox.
-// However, its document is the SnappyMail iframe. This function sets up a
-// Mutation Observer to watch the <title> element of the iframe for changes in
-// the unread message count and propagates that to the parent <title> element,
-// allowing the unread message count to be displayed in the NC tab's text when
-// the SnappyMail app is selected.
-function watchIFrameTitle() {
-	iframe = document.getElementById('rliframe');
-	if (!iframe) {
-		return;
-	}
-	target = iframe.contentDocument.getElementsByTagName('title')[0];
-	config = {
-		characterData: true,
-		childList: true,
-		subtree: true
-	}
-	observer = new MutationObserver(function(mutations) {
-		title = mutations[0].target.innerText;
-		if (title) {
-			matches = title.match(/\(([0-9]+)\)/);
-			if (matches) {
-				document.title = '('+ matches[1] + ') ' + t('snappymail', 'Email') + ' - Nextcloud';
-			} else {
-				document.title = t('snappymail', 'Email') + ' - Nextcloud';
-			}
-		}
-	});
-	observer.observe(target, config);
-}
-
-function SnappyMailFormHelper(sID, sAjaxFile, fCallback)
-{
-	try
-	{
-		var
-			oForm = $(sID),
-			oSubmit = $('#snappymail-save-button', oForm),
-			sSubmitValue = oSubmit.val(),
-			oDesc = oForm.find('.snappymail-result-desc')
-		;
-
-		oSubmit.click(function (oEvent) {
-
-			var oDefAjax = null;
-
-			oEvent.preventDefault();
-
-			oForm
-				.addClass('snappymail-ajax')
-				.removeClass('snappymail-error')
-				.removeClass('snappymail-success')
-			;
-
-			oDesc.text('');
-			oSubmit.val('...');
-
-			oDefAjax = $.ajax({
-				'type': 'POST',
-				'async': true,
-				'url': OC.filePath('snappymail', 'ajax', sAjaxFile),
-				'data': oForm.serialize(),
-				'dataType': 'json',
-				'global': true
-			});
-
-			oDefAjax.always(function (oData) {
-
-				var bResult = false;
-
-				oForm.removeClass('snappymail-ajax');
-				oSubmit.val(sSubmitValue);
-
-				if (oData)
-				{
-					bResult = 'success' === oData['status'];
-					if (oData['Message'])
-					{
-						oDesc.text(t('snappymail', oData['Message']));
-					}
-				}
-
-				if (bResult)
-				{
-					oForm.addClass('snappymail-success');
-				}
-				else
-				{
-					oForm.addClass('snappymail-error');
-					if ('' === oDesc.text())
-					{
-						oDesc.text(t('snappymail', 'Error'));
-					}
-				}
-
-				if (fCallback)
-				{
-					fCallback(bResult, oData);
-				}
-			});
-
-			return false;
-		});
-	}
-	catch(e) {}
-}
diff --git a/integrations/nextcloud/snappymail/js/resize.js b/integrations/nextcloud/snappymail/js/resize.js
deleted file mode 100755
index 5c16f0022..000000000
--- a/integrations/nextcloud/snappymail/js/resize.js
+++ /dev/null
@@ -1,26 +0,0 @@
-$(function (window, document) {
-
-	var
-		buffer = 0, //was 5 but this was creating a white space of 5px at the bottom of the page
-		ifr = document.getElementById('rliframe')
-	;
-
-
-	function pageY(elem) {
-		return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
-	}
-
-	function resizeIframe() {
-		var height = document.documentElement.clientHeight;
-		height -= pageY(ifr) + buffer;
-		height = (height < 0) ? 0 : height;
-		ifr.style.height = height + 'px';
-	}
-
-	if (ifr)
-	{
-		ifr.onload = resizeIframe;
-		window.onresize = resizeIframe;
-	}
-
-}(window, document));
diff --git a/integrations/nextcloud/snappymail/js/snappymail.js b/integrations/nextcloud/snappymail/js/snappymail.js
new file mode 100644
index 000000000..289b54d66
--- /dev/null
+++ b/integrations/nextcloud/snappymail/js/snappymail.js
@@ -0,0 +1,158 @@
+/**
+ * Nextcloud - SnappyMail mail plugin
+ *
+ * @author RainLoop Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b), SnappyMail, Rene Hampölz (@hampoelz)
+ *
+ * Based initially on https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud/rainloop-app
+ */
+
+// Do the following things once the document is fully loaded.
+document.onreadystatechange = () => {
+	if (document.readyState === 'complete') {
+		watchIFrameTitle();
+		passThemesToIFrame();
+		let form = document.querySelector('form.snappymail');
+		form && SnappyMailFormHelper(form);
+		setupUnifiedSearchListener()
+	}
+};
+
+// Pass Nextcloud themes and theme attributes to SnappyMail on
+// first load and when the SnappyMail iframe is reloaded. 
+function passThemesToIFrame() {
+	const iframe = document.getElementById('rliframe');
+	if (!iframe) return;
+
+	let firstLoad = true;
+
+	iframe.addEventListener('load', event => {
+		// repass theme styles when iframe is reloaded
+		if (!firstLoad) {
+			passThemes(event.target);
+		}
+		firstLoad = false;
+	});
+
+	passThemes(iframe);
+}
+
+// Pass Nextcloud themes and theme attributes to SnappyMail.
+function passThemes(iframe) {
+	if (!iframe) return;
+	
+	const target = iframe.contentWindow.document;
+
+	const ncStylesheets = [...document.querySelectorAll('link.theme')];
+	ncStylesheets.forEach(ncSheet => {
+		const smSheet = target.importNode(ncSheet, true);
+		target.head.appendChild(smSheet);
+	});
+
+	const themes = [...document.body.attributes].filter(att => att.name.startsWith('data-theme'));
+	themes.forEach(theme => target.body.setAttribute(theme.name, theme.value));
+}
+
+// The SnappyMail application is already configured to modify the <title> element
+// of its root document with the number of unread messages in the inbox.
+// However, its document is the SnappyMail iframe. This function sets up a
+// Mutation Observer to watch the <title> element of the iframe for changes in
+// the unread message count and propagates that to the parent <title> element,
+// allowing the unread message count to be displayed in the NC tab's text when
+// the SnappyMail app is selected.
+function watchIFrameTitle() {
+	let iframe = document.getElementById('rliframe');
+	if (!iframe) {
+		return;
+	}
+	let target = iframe.contentDocument.getElementsByTagName('title')[0];
+	let config = {
+		characterData: true,
+		childList: true,
+		subtree: true
+	};
+	let observer = new MutationObserver(mutations => {
+		let title = mutations[0].target.innerText;
+		if (title) {
+			let matches = title.match(/\(([0-9]+)\)/);
+			if (matches) {
+				document.title = '('+ matches[1] + ') ' + t('snappymail', 'Email') + ' - Nextcloud';
+			} else {
+				document.title = t('snappymail', 'Email') + ' - Nextcloud';
+			}
+		}
+	});
+	observer.observe(target, config);
+}
+
+function SnappyMailFormHelper(oForm)
+{
+	try
+	{
+		var
+			oSubmit = document.getElementById('snappymail-save-button'),
+			sSubmitValue = oSubmit.textContent,
+			oDesc = oForm.querySelector('.snappymail-result-desc')
+		;
+
+		oForm.addEventListener('submit', oEvent => {
+			oEvent.preventDefault();
+
+			oForm.classList.add('snappymail-fetch')
+			oForm.classList.remove('snappymail-error')
+			oForm.classList.remove('snappymail-success')
+
+			oDesc.textContent = '';
+			oSubmit.textContent = '...';
+
+			let data = new FormData(oForm);
+			data.set('appname', 'snappymail');
+
+			fetch(OC.filePath('snappymail', 'fetch', oForm.getAttribute('action')), {
+				mode: 'same-origin',
+				cache: 'no-cache',
+				redirect: 'error',
+				referrerPolicy: 'no-referrer',
+				credentials: 'same-origin',
+				method: 'POST',
+				headers: {},
+				body: data
+			})
+			.then(response => response.json())
+			.then(oData => {
+				let bResult = 'success' === oData?.status;
+				oForm.classList.remove('snappymail-fetch');
+				oSubmit.textContent = sSubmitValue;
+				if (oData?.Message) {
+					oDesc.textContent = t('snappymail', oData.Message);
+				}
+				if (bResult) {
+					oForm.classList.add('snappymail-success');
+				} else {
+					oForm.classList.add('snappymail-error');
+					if ('' === oDesc.textContent) {
+						oDesc.textContent = t('snappymail', 'Error');
+					}
+				}
+			});
+
+			return false;
+		});
+	} catch (e) {
+		console.error(e);
+	}
+}
+
+function setupUnifiedSearchListener() {
+	const iframe = document.getElementById('rliframe');
+	if (!iframe || !iframe.contentWindow) return;
+
+	addEventListener('hashchange', (event) => {
+		const hashIndex = event.newURL.indexOf('#/mailbox/');
+		if (hashIndex !== -1) {
+			const hash = event.newURL.substring(hashIndex + 1);
+			if (/\/[\w-]+\/[\w-]+\/\w\d+\/.{0,24}/.test(hash)) {
+				iframe.contentWindow.location.hash = hash;
+			}
+		}
+	});
+}
diff --git a/integrations/nextcloud/snappymail/l10n/af.js b/integrations/nextcloud/snappymail/l10n/af.js
new file mode 100644
index 000000000..a04ff3eb8
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/af.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-pos",
+    "Error" : "Fout",
+    "Save" : "Stoor",
+    "Password" : "Wagwoord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/af.json b/integrations/nextcloud/snappymail/l10n/af.json
new file mode 100644
index 000000000..a4b2c346e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/af.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-pos",
+    "Error" : "Fout",
+    "Save" : "Stoor",
+    "Password" : "Wagwoord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/an.js b/integrations/nextcloud/snappymail/l10n/an.js
new file mode 100644
index 000000000..1fdbbe80e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/an.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correu electronico",
+    "Error" : "Error",
+    "Password" : "Clau"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/an.json b/integrations/nextcloud/snappymail/l10n/an.json
new file mode 100644
index 000000000..6eb81db22
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/an.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Email" : "Correu electronico",
+    "Error" : "Error",
+    "Password" : "Clau"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ar.js b/integrations/nextcloud/snappymail/l10n/ar.js
new file mode 100644
index 000000000..eb93c8c21
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ar.js
@@ -0,0 +1,18 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "البريد الإلكترونى",
+    "Error" : "خطأ",
+    "RainLoop" : "رين لوب",
+    "RainLoop Webmail" : "رين لوب لبريد الويب",
+    "Go to RainLoop Webmail admin panel" : "اذهب الى لوحة ادارة رين لوب لبريد الويب",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "المستخدمين س يدخلو يدويا، او تعريف شهادات في اعدادات حساباتهم الشخصية لتسجيل الدخول آليا.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "حاول ان تقوم بتسجيل دخول المستخدمين مع اسم المستخدم و الرمز لنيكست كلاود، او شهادة تعريف المستخدم، اذا تناسب.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "حاول ان تقوم بتسجيل دخول المستخدمين مع الايميل و الرمز لنيكست كلاود، او شهادة تعريف المستخدم، اذا تناسب.",
+    "Save" : "حفظ",
+    "RainLoop Webmail is not configured yet." : "بريد الويب رين لوب لم يتم تكوينه بعد..",
+    "may have some" : "هل لي بعض",
+    "security considerations" : "اعتبارات امنية",
+    "Password" : "كلمة السر"
+},
+"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;");
diff --git a/integrations/nextcloud/snappymail/l10n/ar.json b/integrations/nextcloud/snappymail/l10n/ar.json
new file mode 100644
index 000000000..6b285aaed
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ar.json
@@ -0,0 +1,12 @@
+{ "translations": {
+    "Email" : "البريد الإلكترونى",
+    "Error" : "خطأ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "المستخدمين س يدخلو يدويا، او تعريف شهادات في اعدادات حساباتهم الشخصية لتسجيل الدخول آليا.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "حاول ان تقوم بتسجيل دخول المستخدمين مع اسم المستخدم و الرمز لنيكست كلاود، او شهادة تعريف المستخدم، اذا تناسب.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "حاول ان تقوم بتسجيل دخول المستخدمين مع الايميل و الرمز لنيكست كلاود، او شهادة تعريف المستخدم، اذا تناسب.",
+    "Save" : "حفظ",
+    "may have some" : "هل لي بعض",
+    "security considerations" : "اعتبارات امنية",
+    "Password" : "كلمة السر"
+},"pluralForm" :"nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ast.js b/integrations/nextcloud/snappymail/l10n/ast.js
new file mode 100644
index 000000000..4e67b482a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ast.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "Fallu",
+    "Save" : "Guardar",
+    "Password" : "Password"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ast.json b/integrations/nextcloud/snappymail/l10n/ast.json
new file mode 100644
index 000000000..2189a2231
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ast.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "Fallu",
+    "Save" : "Guardar",
+    "Password" : "Password"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/az.js b/integrations/nextcloud/snappymail/l10n/az.js
new file mode 100644
index 000000000..47a4118dc
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/az.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Səhv",
+    "Save" : "Saxla",
+    "Password" : "Şifrə"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/az.json b/integrations/nextcloud/snappymail/l10n/az.json
new file mode 100644
index 000000000..f6e14a6ac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/az.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Səhv",
+    "Save" : "Saxla",
+    "Password" : "Şifrə"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/be.js b/integrations/nextcloud/snappymail/l10n/be.js
new file mode 100644
index 000000000..2529534c3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/be.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "Памылка",
+    "Save" : "Save",
+    "Password" : "Password"
+},
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/be.json b/integrations/nextcloud/snappymail/l10n/be.json
new file mode 100644
index 000000000..b23a4c611
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/be.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "Памылка",
+    "Save" : "Save",
+    "Password" : "Password"
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/bg.js b/integrations/nextcloud/snappymail/l10n/bg.js
new file mode 100644
index 000000000..f5f28b614
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bg.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Имейл",
+    "Error" : "Грешка",
+    "Invalid argument(s)" : "Невалиден аргумент(и)",
+    "Saved successfully" : "Успешно запазено",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Уеб поща RainLoop ",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Прост, модерен и бърз уеб-базиран имейл клиент. След като го активирате в Nextcloud, отидете на административния панел на Nextcloud, \"Допълнителни настройки\" и ще видите раздел „Уеб поща Rainloop“. Там щракнете върху връзката, за да отидете в администраторския панел на Rainloop. Потребителят/паролата по подразбиране е admin/12345. Тази версия е базирана на Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Отидете в администраторския панел на уеб поща RainLoop ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Потребителите ще влизат ръчно или ще определят идентификационни данни в личните си настройки за автоматично влизане.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Опит за автоматично влизане на потребителите с тяхното име на потребител и парола в Nextcloud или потребителски дефинирани идентификационни данни, ако са зададени.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Опит за автоматично влизане на потребителите с техния имейл и парола в Nextcloud или потребителски дефинирани идентификационни данни, ако са зададени.",
+    "Save" : "Запазване",
+    "RainLoop Webmail is not configured yet." : "Уеб поща RainLoop все още не е конфигурирана.",
+    "may have some" : "може да има някои",
+    "security considerations" : "съображения за сигурност",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Въведете имейл и парола за автоматично влизане в RainLoop. <b>Моля, имайте предвид</b> ,че тази функция %s %s.",
+    "Password" : "Парола"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/bg.json b/integrations/nextcloud/snappymail/l10n/bg.json
new file mode 100644
index 000000000..d90135a32
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bg.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Имейл",
+    "Error" : "Грешка",
+    "Invalid argument(s)" : "Невалиден аргумент(и)",
+    "Saved successfully" : "Успешно запазено",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Уеб поща SnappyMail ",
+    "Go to SnappyMail Webmail admin panel" : "Отидете в администраторския панел на уеб поща SnappyMail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Потребителите ще влизат ръчно или ще определят идентификационни данни в личните си настройки за автоматично влизане.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Опит за автоматично влизане на потребителите с тяхното име на потребител и парола в Nextcloud или потребителски дефинирани идентификационни данни, ако са зададени.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Опит за автоматично влизане на потребителите с техния имейл и парола в Nextcloud или потребителски дефинирани идентификационни данни, ако са зададени.",
+    "Save" : "Запазване",
+    "SnappyMail Webmail is not configured yet." : "Уеб поща SnappyMail все още не е конфигурирана.",
+    "may have some" : "може да има някои",
+    "security considerations" : "съображения за сигурност",
+    "Enter an email and password to auto-login to SnappyMail." : "Въведете имейл и парола за автоматично влизане в SnappyMail.",
+    "Password" : "Парола"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/bn_BD.js b/integrations/nextcloud/snappymail/l10n/bn_BD.js
new file mode 100644
index 000000000..1a35cc8cd
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bn_BD.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "ইমেইল",
+    "Error" : "সমস্যা",
+    "Save" : "সংরক্ষণ",
+    "Password" : "কূটশব্দ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/bn_BD.json b/integrations/nextcloud/snappymail/l10n/bn_BD.json
new file mode 100644
index 000000000..8d7fac121
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bn_BD.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "ইমেইল",
+    "Error" : "সমস্যা",
+    "Save" : "সংরক্ষণ",
+    "Password" : "কূটশব্দ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/br.js b/integrations/nextcloud/snappymail/l10n/br.js
new file mode 100644
index 000000000..cb5d19289
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/br.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Postel",
+    "Error" : "Fazi",
+    "Invalid argument(s)" : "Arguzenn(où) fall",
+    "Saved successfully" : "Enrollet mat",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Postel web RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Kit da banel ar merour ar bostel RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "An implijourienn a zeuio tre gant an dorn, pe lakaet a vo gante ho tirouroù identitelez en ho arventennoù bersonnel evit ur mont-tre otomatek. ",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Klaskit em-gevreañ gant hoc'h anv-implijader hag ho ker-tremen Nextcloud, pe ar c'hredadoù termenet gant an implijader, m'emaint termenet.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Klaskit em-gevreañ gant ho postel hag ho ker-tremen Nextcloud, pe ar c'hredadoù termenet gant an implijader, m'emaint termenet.",
+    "Save" : "Enrollañ",
+    "RainLoop Webmail is not configured yet." : "N'eo ket arventet ar bostel RainLoop c'hoaz.",
+    "may have some" : "en deus un tamm marteze",
+    "security considerations" : "preder surentez",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Lakait ar bostelhag ar ger-temen evit mont-tre en un doare otomatek da RainLoop. <b>Notennit</b> e ra ar perzh-mañ %s %s.",
+    "Password" : "Ger-tremen"
+},
+"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);");
diff --git a/integrations/nextcloud/snappymail/l10n/br.json b/integrations/nextcloud/snappymail/l10n/br.json
new file mode 100644
index 000000000..31d5d46a8
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/br.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Postel",
+    "Error" : "Fazi",
+    "Invalid argument(s)" : "Arguzenn(où) fall",
+    "Saved successfully" : "Enrollet mat",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Postel web SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Kit da banel ar merour ar bostel SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "An implijourienn a zeuio tre gant an dorn, pe lakaet a vo gante ho tirouroù identitelez en ho arventennoù bersonnel evit ur mont-tre otomatek. ",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Klaskit em-gevreañ gant hoc'h anv-implijader hag ho ker-tremen Nextcloud, pe ar c'hredadoù termenet gant an implijader, m'emaint termenet.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Klaskit em-gevreañ gant ho postel hag ho ker-tremen Nextcloud, pe ar c'hredadoù termenet gant an implijader, m'emaint termenet.",
+    "Save" : "Enrollañ",
+    "SnappyMail Webmail is not configured yet." : "N'eo ket arventet ar bostel SnappyMail c'hoaz.",
+    "may have some" : "en deus un tamm marteze",
+    "security considerations" : "preder surentez",
+    "Enter an email and password to auto-login to SnappyMail." : "Lakait ar bostelhag ar ger-temen evit mont-tre en un doare otomatek da SnappyMail.",
+    "Password" : "Ger-tremen"
+},"pluralForm" :"nplurals=5; plural=((n%10 == 1) && (n%100 != 11) && (n%100 !=71) && (n%100 !=91) ? 0 :(n%10 == 2) && (n%100 != 12) && (n%100 !=72) && (n%100 !=92) ? 1 :(n%10 ==3 || n%10==4 || n%10==9) && (n%100 < 10 || n% 100 > 19) && (n%100 < 70 || n%100 > 79) && (n%100 < 90 || n%100 > 99) ? 2 :(n != 0 && n % 1000000 == 0) ? 3 : 4);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/bs.js b/integrations/nextcloud/snappymail/l10n/bs.js
new file mode 100644
index 000000000..4e97d11be
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bs.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-pošta",
+    "Error" : "Greška",
+    "Save" : "Spremi",
+    "Password" : "Lozinka"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/integrations/nextcloud/snappymail/l10n/bs.json b/integrations/nextcloud/snappymail/l10n/bs.json
new file mode 100644
index 000000000..69ae04b31
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/bs.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-pošta",
+    "Error" : "Greška",
+    "Save" : "Spremi",
+    "Password" : "Lozinka"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ca.js b/integrations/nextcloud/snappymail/l10n/ca.js
new file mode 100644
index 000000000..f7e6ff360
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ca.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correu",
+    "Error" : "Error",
+    "Invalid argument(s)" : "Els arguments no són vàlids",
+    "Saved successfully" : "S'ha desat correctament",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Correu web RainLoop",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Client web de correu electrònic senzill, modern i ràpid. Després d'habilitar-lo en el Nextcloud, aneu al tauler d'administració del Nextcloud, «Paràmetres addicionals» i veureu una secció anomenada «Correu web RainLoop». Allà, feu clic en l'enllaç per a anar al tauler d'administració del RainLoop. L'usuari i la contrasenya per defecte són admin/12345. Aquesta versió està basada en el RainLoop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Ves al tauler d'administració del correu web RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Els usuaris iniciaran la sessió manualment o definiran les credencials en els seus paràmetres personals per a iniciar la sessió automàticament.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Intenta iniciar la sessió automàticament amb el nom d'usuari i la contrasenya del Nextcloud o les credencials definides per l'usuari, si n'hi ha",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Intenta iniciar la sessió automàticament amb l'adreça electrònica i la contrasenya del Nextcloud o les credencials definides per l'usuari, si n'hi ha",
+    "Save" : "Desa",
+    "RainLoop Webmail is not configured yet." : "Encara no s'ha configurat el correu web RainLoop.",
+    "may have some" : "pot tenir algunes",
+    "security considerations" : "implicacions de seguretat",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Introduïu una adreça electrònica i una contrasenya per a iniciar la sessió automàticament en el RainLoop. <b>Tingueu en compte</b> que aquesta característica %s %s.",
+    "Password" : "Contrasenya"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ca.json b/integrations/nextcloud/snappymail/l10n/ca.json
new file mode 100644
index 000000000..569756439
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ca.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Correu",
+    "Error" : "Error",
+    "Invalid argument(s)" : "Els arguments no són vàlids",
+    "Saved successfully" : "S'ha desat correctament",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Correu web SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Ves al tauler d'administració del correu web SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Els usuaris iniciaran la sessió manualment o definiran les credencials en els seus paràmetres personals per a iniciar la sessió automàticament.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Intenta iniciar la sessió automàticament amb el nom d'usuari i la contrasenya del Nextcloud o les credencials definides per l'usuari, si n'hi ha",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Intenta iniciar la sessió automàticament amb l'adreça electrònica i la contrasenya del Nextcloud o les credencials definides per l'usuari, si n'hi ha",
+    "Save" : "Desa",
+    "SnappyMail Webmail is not configured yet." : "Encara no s'ha configurat el correu web SnappyMail.",
+    "may have some" : "pot tenir algunes",
+    "security considerations" : "implicacions de seguretat",
+    "Enter an email and password to auto-login to SnappyMail." : "Introduïu una adreça electrònica i una contrasenya per a iniciar la sessió automàticament en el SnappyMail.",
+    "Password" : "Contrasenya"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/cs.js b/integrations/nextcloud/snappymail/l10n/cs.js
new file mode 100644
index 000000000..420476cd7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/cs.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Chyba",
+    "Invalid argument(s)" : "Neplatné argumenty",
+    "Saved successfully" : "Úspěšně uloženo",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop webový e-mailový klient",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Snadno se obsluhující, moderní a rychlý webový e-mailový klient. Po jeho zapnutí v Netxcloud, jděte do správy Nextcloud, sekce „Další nastavení“. Zde klikněte na odkaz vedoucí do rozhraní pro správu Rainloop. Výchozí uživatel/heslo je admin/12345. Tato verze je založena na Rainloop 1.16 (vydáno v lednu 2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Přejít do webového rozhraní pro správu RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Uživatelé se budou přihlašovat ručně nebo zadají své přihlašovací údaje do v osobních nastaveních Nextcloud a budou se přihlašovat automaticky.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokoušet se uživatele přihlašovat automaticky pomocí jejich uživatelských jmen a hesel, používaných v jejich Nextcloud účtech, nebo těch uživateli zadaných (pokud jsou).",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokoušet se uživatele přihlašovat automaticky pomocí jejich e-mailů a hesel, používaných v jejich Nextcloud účtech, nebo těch uživateli zadaných (pokud jsou).",
+    "Save" : "Uložit",
+    "RainLoop Webmail is not configured yet." : "Webový e-mailový klient RainLoop doposud není nastavený.",
+    "may have some" : "může mít některé",
+    "security considerations" : "co zvážit ohledně zabezpečení",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Zadejte e-mail a heslo pro automatické přihlašování do Rainloop. <b>Prosím uvědomte</b> si, že tato funkce %s %s.",
+    "Password" : "Heslo"
+},
+"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;");
diff --git a/integrations/nextcloud/snappymail/l10n/cs.json b/integrations/nextcloud/snappymail/l10n/cs.json
new file mode 100644
index 000000000..94bb1e3cc
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/cs.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Chyba",
+    "Invalid argument(s)" : "Neplatné argumenty",
+    "Saved successfully" : "Úspěšně uloženo",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail webový e-mailový klient",
+    "Go to SnappyMail Webmail admin panel" : "Přejít do webového rozhraní pro správu SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Uživatelé se budou přihlašovat ručně nebo zadají své přihlašovací údaje do v osobních nastaveních Nextcloud a budou se přihlašovat automaticky.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokoušet se uživatele přihlašovat automaticky pomocí jejich uživatelských jmen a hesel, používaných v jejich Nextcloud účtech, nebo těch uživateli zadaných (pokud jsou).",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokoušet se uživatele přihlašovat automaticky pomocí jejich e-mailů a hesel, používaných v jejich Nextcloud účtech, nebo těch uživateli zadaných (pokud jsou).",
+    "Save" : "Uložit",
+    "SnappyMail Webmail is not configured yet." : "Webový e-mailový klient SnappyMail doposud není nastavený.",
+    "may have some" : "může mít některé",
+    "security considerations" : "co zvážit ohledně zabezpečení",
+    "Enter an email and password to auto-login to SnappyMail." : "Zadejte e-mail a heslo pro automatické přihlašování do Rainloop.",
+    "Password" : "Heslo"
+},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/cy_GB.js b/integrations/nextcloud/snappymail/l10n/cy_GB.js
new file mode 100644
index 000000000..ff60c3c61
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/cy_GB.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-bost",
+    "Error" : "Gwall",
+    "Save" : "Cadw",
+    "Password" : "Cyfrinair"
+},
+"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;");
diff --git a/integrations/nextcloud/snappymail/l10n/cy_GB.json b/integrations/nextcloud/snappymail/l10n/cy_GB.json
new file mode 100644
index 000000000..0f2806c2d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/cy_GB.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-bost",
+    "Error" : "Gwall",
+    "Save" : "Cadw",
+    "Password" : "Cyfrinair"
+},"pluralForm" :"nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/da.js b/integrations/nextcloud/snappymail/l10n/da.js
new file mode 100644
index 000000000..6b11d5428
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/da.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Fejl",
+    "Invalid argument(s)" : "Ugyldige argument(er)",
+    "Saved successfully" : "Gemt",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Go to RainLoop Webmail admin panel" : "Gå til RainLoop Webmail admin panel",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Brugere vil logge på manuelt eller definere legitimationsoplysninger i deres personlige indstillinger for automatiske logins.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Forsøg automatisk at logge på brugere med deres Nextcloud-brugernavn og adgangskode eller brugerdefinerede legitimationsoplysninger, hvis det er angivet.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Forsøg automatisk at logge på brugere med deres Nextcloud-e-mail og adgangskode eller brugerdefinerede legitimationsoplysninger, hvis det er angivet.",
+    "Save" : "Gem",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail er ikke konfigureret endnu.",
+    "may have some" : "kan have nogle",
+    "security considerations" : "sikkerhedshensyn",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Indtast en e-mail og adgangskode for automatisk at logge på RainLoop. <b>Bemærk</b> at denne funktion %s %s.",
+    "Password" : "Adgangskode"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/da.json b/integrations/nextcloud/snappymail/l10n/da.json
new file mode 100644
index 000000000..a5ed6759c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/da.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Fejl",
+    "Invalid argument(s)" : "Ugyldige argument(er)",
+    "Saved successfully" : "Gemt",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Gå til SnappyMail Webmail admin panel",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Brugere vil logge på manuelt eller definere legitimationsoplysninger i deres personlige indstillinger for automatiske logins.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Forsøg automatisk at logge på brugere med deres Nextcloud-brugernavn og adgangskode eller brugerdefinerede legitimationsoplysninger, hvis det er angivet.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Forsøg automatisk at logge på brugere med deres Nextcloud-e-mail og adgangskode eller brugerdefinerede legitimationsoplysninger, hvis det er angivet.",
+    "Save" : "Gem",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail er ikke konfigureret endnu.",
+    "may have some" : "kan have nogle",
+    "security considerations" : "sikkerhedshensyn",
+    "Enter an email and password to auto-login to SnappyMail." : "Indtast en e-mail og adgangskode for automatisk at logge på SnappyMail.",
+    "Password" : "Adgangskode"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/de.js b/integrations/nextcloud/snappymail/l10n/de.js
new file mode 100644
index 000000000..204629524
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/de.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-Mail",
+    "Error" : "Fehler",
+    "Invalid argument(s)" : "Ungültige(r) Parameter",
+    "Saved successfully" : "Gespeichert",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Einfacher, moderner und schneller webbasierter E-Mail-Client. Nach der Aktivierung in Nextcloud, siehst du in den Einstellungen unter Verwaltung in \"Zusätzliche Einstellungen\" einen Abschnitt mit dem Namen \"RainLoop Webmail\". Klicke dort auf den Link, um zum RainLoop-Verwaltungsbereich zu gelangen. Der Standardbenutzer/Passwort ist admin/12345. Diese Version basiert auf RainLoop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Gehe zum Administrator-Bereich von RainLoop Webmail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Benutzer melden sich manuell an oder definieren Zugangsdaten in ihren persönlichen Einstellungen für die automatische Anmeldung.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit ihrem Benutzername und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit der E-Mail-Adresse und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Save" : "Speichern",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail ist noch nicht eingerichtet.",
+    "may have some" : "möglicherweise einige",
+    "security considerations" : "Sicherheitsüberlegungen benötigt",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "E-Mail-Adresse und Passwort für die automatische Anmeldung bei RainLoop eingeben. <b>Bitte beachte</b>, dass diese Funktion %s %s.",
+    "Password" : "Passwort"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/de.json b/integrations/nextcloud/snappymail/l10n/de.json
new file mode 100644
index 000000000..32b6a02f2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/de.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-Mail",
+    "Error" : "Fehler",
+    "Invalid argument(s)" : "Ungültige(r) Parameter",
+    "Saved successfully" : "Gespeichert",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Gehe zum Administrator-Bereich von SnappyMail Webmail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Benutzer melden sich manuell an oder definieren Zugangsdaten in ihren persönlichen Einstellungen für die automatische Anmeldung.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit ihrem Benutzername und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit der E-Mail-Adresse und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Save" : "Speichern",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail ist noch nicht eingerichtet.",
+    "may have some" : "möglicherweise einige",
+    "security considerations" : "Sicherheitsüberlegungen benötigt",
+    "Enter an email and password to auto-login to SnappyMail." : "E-Mail-Adresse und Passwort für die automatische Anmeldung bei SnappyMail eingeben.",
+    "Password" : "Passwort"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/de_DE.js b/integrations/nextcloud/snappymail/l10n/de_DE.js
new file mode 100644
index 000000000..942a84fe1
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/de_DE.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-Mail",
+    "Error" : "Fehler",
+    "Invalid argument(s)" : "Ungültige(r) Parameter",
+    "Saved successfully" : "Erfolgreich gespeichert",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Einfacher, moderner und schneller webbasierter E-Mail-Client. Nach der Aktivierung in Nextcloud, sehen Sie in den Einstellungen unter Verwaltung in \"Zusätzliche Einstellungen\" einen Abschnitt mit dem Namen \"RainLoop Webmail\". Klicken Sie dort auf den Link, um zum RainLoop-Verwaltungsbereich zu gelangen. Der Standardbenutzer/Passwort ist admin/12345. Diese Version basiert auf RainLoop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Gehen Sie zum Administrator-Bereich von RainLoop Webmail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Benutzer melden sich manuell an oder definieren Zugangsdaten  in ihren persönlichen Einstellungen für die automatische Anmeldung.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit ihrem Benutzername und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit der E-Mail-Adresse und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Save" : "Speichern",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail ist noch nicht eingerichtet.",
+    "may have some" : "möglicherweise einige",
+    "security considerations" : "Sicherheitsüberlegungen benötigt",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "E-Mail-Adresse und Passwort für die automatische Anmeldung bei RainLoop eingeben. <b>Bitte beachten Sie</b>, dass diese Funktion %s %s.",
+    "Password" : "Passwort"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/de_DE.json b/integrations/nextcloud/snappymail/l10n/de_DE.json
new file mode 100644
index 000000000..831633c78
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/de_DE.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-Mail",
+    "Error" : "Fehler",
+    "Invalid argument(s)" : "Ungültige(r) Parameter",
+    "Saved successfully" : "Erfolgreich gespeichert",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Gehen Sie zum Administrator-Bereich von SnappyMail Webmail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Benutzer melden sich manuell an oder definieren Zugangsdaten  in ihren persönlichen Einstellungen für die automatische Anmeldung.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit ihrem Benutzername und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Es wird versucht Benutzer automatisch mit der E-Mail-Adresse und Passwort von Nextcloud oder, falls festgelegt, mit benutzerdefinierten Anmeldedaten anzumelden.",
+    "Save" : "Speichern",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail ist noch nicht eingerichtet.",
+    "may have some" : "möglicherweise einige",
+    "security considerations" : "Sicherheitsüberlegungen benötigt",
+    "Enter an email and password to auto-login to SnappyMail." : "E-Mail-Adresse und Passwort für die automatische Anmeldung bei SnappyMail eingeben.",
+    "Password" : "Passwort"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/el.js b/integrations/nextcloud/snappymail/l10n/el.js
new file mode 100644
index 000000000..d7e0517ef
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/el.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Ηλ.Ταχυδρομείο",
+    "Error" : "Σφάλμα",
+    "Invalid argument(s)" : "Μη έγκυρο όρισμα(τα)",
+    "Saved successfully" : "Επιτυχής αποθήκευση",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Ηλ.Ταχυδρομείο RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Μετάβαση στον πίνακα διαχείρισης του RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Οι χρήστες θα συνδεθούν χειροκίνητα ή θα ορίσουν διαπιστευτήρια στις προσωπικές τους ρυθμίσεις για αυτόματη σύνδεση.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Αυτόματη σύνδεση χρηστών με όνομα χρήστη και κωδικό πρόσβασης του Nextcloud ή με τα διαπιστευτήρια που καθορίζονται από τον χρήστη.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Αυτόματη σύνδεση χρηστών με την διεύθυνση Ηλ.Ταχυδρομείου και κωδικό πρόσβασης του Nextcloud ή με τα διαπιστευτήρια που καθορίζονται από τον χρήστη.",
+    "Save" : "Αποθήκευση",
+    "RainLoop Webmail is not configured yet." : "Το Ηλ.Ταχυδρομείο RainLoop δεν έχει ρυθμιστεί ακόμη.",
+    "may have some" : "μπορεί να έχει κάποια",
+    "security considerations" : "θέματα ασφάλειας",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Εισάγεται διεύθυνση ηλ.ταχυδρομείου και κωδικό πρόσβασης για αυτόματη σύνδεση στο RainLoop. <b>Σημειώστε</b> ότι αυτή η δυνατότητα %s %s.",
+    "Password" : "Συνθηματικό"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/el.json b/integrations/nextcloud/snappymail/l10n/el.json
new file mode 100644
index 000000000..6b49d23e5
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/el.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Ηλ.Ταχυδρομείο",
+    "Error" : "Σφάλμα",
+    "Invalid argument(s)" : "Μη έγκυρο όρισμα(τα)",
+    "Saved successfully" : "Επιτυχής αποθήκευση",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Ηλ.Ταχυδρομείο SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Μετάβαση στον πίνακα διαχείρισης του SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Οι χρήστες θα συνδεθούν χειροκίνητα ή θα ορίσουν διαπιστευτήρια στις προσωπικές τους ρυθμίσεις για αυτόματη σύνδεση.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Αυτόματη σύνδεση χρηστών με όνομα χρήστη και κωδικό πρόσβασης του Nextcloud ή με τα διαπιστευτήρια που καθορίζονται από τον χρήστη.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Αυτόματη σύνδεση χρηστών με την διεύθυνση Ηλ.Ταχυδρομείου και κωδικό πρόσβασης του Nextcloud ή με τα διαπιστευτήρια που καθορίζονται από τον χρήστη.",
+    "Save" : "Αποθήκευση",
+    "SnappyMail Webmail is not configured yet." : "Το Ηλ.Ταχυδρομείο SnappyMail δεν έχει ρυθμιστεί ακόμη.",
+    "may have some" : "μπορεί να έχει κάποια",
+    "security considerations" : "θέματα ασφάλειας",
+    "Enter an email and password to auto-login to SnappyMail." : "Εισάγεται διεύθυνση ηλ.ταχυδρομείου και κωδικό πρόσβασης για αυτόματη σύνδεση στο SnappyMail.",
+    "Password" : "Συνθηματικό"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/eo.js b/integrations/nextcloud/snappymail/l10n/eo.js
new file mode 100644
index 000000000..050d60a20
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/eo.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Retpoŝtadreso",
+    "Error" : "Eraro",
+    "Save" : "Konservi",
+    "Password" : "Pasvorto"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/eo.json b/integrations/nextcloud/snappymail/l10n/eo.json
new file mode 100644
index 000000000..4c0ce755d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/eo.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Retpoŝtadreso",
+    "Error" : "Eraro",
+    "Save" : "Konservi",
+    "Password" : "Pasvorto"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es.js b/integrations/nextcloud/snappymail/l10n/es.js
new file mode 100644
index 000000000..5b6a84a2b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Invalid argument(s)" : "Argumento(s) inválidos",
+    "Saved successfully" : "Guardado correctamente",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Un cliente de correo basado en web sencillo, moderno y rápido. Tras activarlo en Nexcloud, vaya al panel de administración de Nextcloud, \"Ajustes adicionales\" y verá la sección \"Rainloop webmail\". Haga clic en el enlace para ir al panel de administración de Rainloop. Los valores predeterminados para usuario/contraseña son admin/12345. Esta versión está basada en Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Ir al panel de administración de RainLoop Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Los usuarios deben registrarse manualmente, o definir credenciales en sus ajustes personales para un registro automático.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Intenta iniciar sesión automáticamente con los usuarios usando el nombre de usuario y contraseña de Nextcloud, o las credenciales definidas del usuario, si está configurado.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Intenta iniciar sesión automáticamente con los usuarios usando el correo y contraseña de Nextcloud, o las credenciales definidas del usuario, si está configurado.",
+    "Save" : "Guardar",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail aun no está configurado",
+    "may have some" : "puede tener alguna",
+    "security considerations" : "consideraciones de seguridad",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Escriba un email y contraseña para auto registro en RainLoop. Por favor, observe note</b> que esta característica %s %s.",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es.json b/integrations/nextcloud/snappymail/l10n/es.json
new file mode 100644
index 000000000..45f7c921c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Invalid argument(s)" : "Argumento(s) inválidos",
+    "Saved successfully" : "Guardado correctamente",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Ir al panel de administración de SnappyMail Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Los usuarios deben registrarse manualmente, o definir credenciales en sus ajustes personales para un registro automático.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Intenta iniciar sesión automáticamente con los usuarios usando el nombre de usuario y contraseña de Nextcloud, o las credenciales definidas del usuario, si está configurado.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Intenta iniciar sesión automáticamente con los usuarios usando el correo y contraseña de Nextcloud, o las credenciales definidas del usuario, si está configurado.",
+    "Save" : "Guardar",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail aun no está configurado",
+    "may have some" : "puede tener alguna",
+    "security considerations" : "consideraciones de seguridad",
+    "Enter an email and password to auto-login to SnappyMail." : "Escriba un email y contraseña para auto registro en SnappyMail.",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_419.js b/integrations/nextcloud/snappymail/l10n/es_419.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_419.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_419.json b/integrations/nextcloud/snappymail/l10n/es_419.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_419.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_AR.js b/integrations/nextcloud/snappymail/l10n/es_AR.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_AR.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_AR.json b/integrations/nextcloud/snappymail/l10n/es_AR.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_AR.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_CL.js b/integrations/nextcloud/snappymail/l10n/es_CL.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CL.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_CL.json b/integrations/nextcloud/snappymail/l10n/es_CL.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CL.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_CO.js b/integrations/nextcloud/snappymail/l10n/es_CO.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CO.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_CO.json b/integrations/nextcloud/snappymail/l10n/es_CO.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CO.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_CR.js b/integrations/nextcloud/snappymail/l10n/es_CR.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CR.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_CR.json b/integrations/nextcloud/snappymail/l10n/es_CR.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_CR.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_DO.js b/integrations/nextcloud/snappymail/l10n/es_DO.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_DO.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_DO.json b/integrations/nextcloud/snappymail/l10n/es_DO.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_DO.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_EC.js b/integrations/nextcloud/snappymail/l10n/es_EC.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_EC.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_EC.json b/integrations/nextcloud/snappymail/l10n/es_EC.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_EC.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_GT.js b/integrations/nextcloud/snappymail/l10n/es_GT.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_GT.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_GT.json b/integrations/nextcloud/snappymail/l10n/es_GT.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_GT.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_HN.js b/integrations/nextcloud/snappymail/l10n/es_HN.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_HN.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_HN.json b/integrations/nextcloud/snappymail/l10n/es_HN.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_HN.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_MX.js b/integrations/nextcloud/snappymail/l10n/es_MX.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_MX.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_MX.json b/integrations/nextcloud/snappymail/l10n/es_MX.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_MX.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_NI.js b/integrations/nextcloud/snappymail/l10n/es_NI.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_NI.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_NI.json b/integrations/nextcloud/snappymail/l10n/es_NI.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_NI.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_PA.js b/integrations/nextcloud/snappymail/l10n/es_PA.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PA.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_PA.json b/integrations/nextcloud/snappymail/l10n/es_PA.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PA.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_PE.js b/integrations/nextcloud/snappymail/l10n/es_PE.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PE.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_PE.json b/integrations/nextcloud/snappymail/l10n/es_PE.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PE.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_PR.js b/integrations/nextcloud/snappymail/l10n/es_PR.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PR.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_PR.json b/integrations/nextcloud/snappymail/l10n/es_PR.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PR.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_PY.js b/integrations/nextcloud/snappymail/l10n/es_PY.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PY.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_PY.json b/integrations/nextcloud/snappymail/l10n/es_PY.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_PY.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_SV.js b/integrations/nextcloud/snappymail/l10n/es_SV.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_SV.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_SV.json b/integrations/nextcloud/snappymail/l10n/es_SV.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_SV.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/es_UY.js b/integrations/nextcloud/snappymail/l10n/es_UY.js
new file mode 100644
index 000000000..6c9b85eac
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_UY.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/es_UY.json b/integrations/nextcloud/snappymail/l10n/es_UY.json
new file mode 100644
index 000000000..8cefd6dc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/es_UY.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Correo electrónico",
+    "Error" : "Error",
+    "Save" : "Guardar",
+    "Password" : "Contraseña"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/et_EE.js b/integrations/nextcloud/snappymail/l10n/et_EE.js
new file mode 100644
index 000000000..7d7540c8c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/et_EE.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Epost",
+    "Error" : "Viga",
+    "Save" : "Salvesta",
+    "Password" : "Parool"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/et_EE.json b/integrations/nextcloud/snappymail/l10n/et_EE.json
new file mode 100644
index 000000000..a661cd753
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/et_EE.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Epost",
+    "Error" : "Viga",
+    "Save" : "Salvesta",
+    "Password" : "Parool"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/eu.js b/integrations/nextcloud/snappymail/l10n/eu.js
new file mode 100644
index 000000000..beea9c048
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/eu.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Helbide elektronikoa",
+    "Error" : "Errorea",
+    "Invalid argument(s)" : "Argumentu baliogabea(k)",
+    "Saved successfully" : "Ondo gorde da",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Sarean oinarritutako e-posta bezero sinple, moderno eta azkarra. Nextclouden gaitu eta gero, joan Nextcloud admin panelera, \"Ezarpen gehigarriak\" atalera eta bertan ikusiko duzu \"Rainloop webmail\" atala. Hor, egin klik Rainloopen admin panelera joateko estekan. Lehenetsitako erabiltzaile/pasahitza hau da: admin/12345. Bertsio hau honetan oinarrituta dago: Rainloop 1.16.0 (2020-05)",
+    "Go to RainLoop Webmail admin panel" : "Joan RainLoop Webmailen administrazio panelera",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Erabiltzaileek eskuz hasiko dute saioa, edo bestela beraien ezarpen pertsonaletan kredentzialak zehaztu ditzakete saio-hasiera automatikorako.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Ezarri saiakera erabiltzaileek saio-hasiera automatikoa egiteko Nextcloud erabiltzaile-izena eta pasahitzarekin, edo erabiltzaileek definitutako kredentzialekin, zehaztuz gero.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Ezarri saiakera erabiltzaileek saio-hasiera automatikoa egiteko Nextcloud e-posta eta pasahitzarekin, edo erabiltzaileek definitutako kredentzialekin, zehaztuz gero.",
+    "Save" : "Gorde",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail ez dago konfiguratuta oraindik.",
+    "may have some" : "batzuk izan ditzake",
+    "security considerations" : "segurtasun kontuak",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Saioa automatikoki hasteko sartu helbide elektronikoa eta pasahitza RainLoop-en.<b>Kontuan izan</b>ezaugarri hori dela%s%s.",
+    "Password" : "Pasahitza"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/eu.json b/integrations/nextcloud/snappymail/l10n/eu.json
new file mode 100644
index 000000000..d9ef0f7e4
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/eu.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Posta",
+    "Error" : "Errorea",
+    "Invalid argument(s)" : "Argumentu baliogabea(k)",
+    "Saved successfully" : "Ondo gorde da",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Joan SnappyMail Webmailen administrazio panelera",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Erabiltzaileek eskuz hasiko dute saioa, edo bestela beraien ezarpen pertsonaletan kredentzialak zehaztu ditzakete saio-hasiera automatikorako.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Ezarri saiakera erabiltzaileek saio-hasiera automatikoa egiteko Nextcloud erabiltzaile-izena eta pasahitzarekin, edo erabiltzaileek definitutako kredentzialekin, zehaztuz gero.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Ezarri saiakera erabiltzaileek saio-hasiera automatikoa egiteko Nextcloud e-posta eta pasahitzarekin, edo erabiltzaileek definitutako kredentzialekin, zehaztuz gero.",
+    "Save" : "Gorde",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail ez dago konfiguratuta oraindik.",
+    "may have some" : "batzuk izan ditzake",
+    "security considerations" : "segurtasun kontuak",
+    "Enter an email and password to auto-login to SnappyMail." : "Saioa automatikoki hasteko sartu helbide elektronikoa eta pasahitza SnappyMail-en.",
+    "Password" : "Pasahitza"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
diff --git a/integrations/nextcloud/snappymail/l10n/fa.js b/integrations/nextcloud/snappymail/l10n/fa.js
new file mode 100644
index 000000000..aa836c92b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fa.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "خطا",
+    "Save" : "ذخیره",
+    "Password" : "کلمه عبور"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/fa.json b/integrations/nextcloud/snappymail/l10n/fa.json
new file mode 100644
index 000000000..ef5d52db3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fa.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "خطا",
+    "Save" : "ذخیره",
+    "Password" : "کلمه عبور"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/fi.js b/integrations/nextcloud/snappymail/l10n/fi.js
new file mode 100644
index 000000000..70fd04bf1
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fi.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Sähköposti",
+    "Error" : "Virhe",
+    "Invalid argument(s)" : "Yksi tai useampi virheellinen argumentti",
+    "Saved successfully" : "Tallennettu onnistuneesti",
+    "RainLoop" : "RainLoop",
+    "Save" : "Tallenna",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmailia ei ole vielä määritetty.",
+    "Password" : "Salasana"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/fi.json b/integrations/nextcloud/snappymail/l10n/fi.json
new file mode 100644
index 000000000..8eea80ef7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fi.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Email" : "Sähköposti",
+    "Error" : "Virhe",
+    "Invalid argument(s)" : "Yksi tai useampi virheellinen argumentti",
+    "Saved successfully" : "Tallennettu onnistuneesti",
+    "SnappyMail" : "SnappyMail",
+    "Save" : "Tallenna",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmailia ei ole vielä määritetty.",
+    "Password" : "Salasana"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/fo.js b/integrations/nextcloud/snappymail/l10n/fo.js
new file mode 100644
index 000000000..ed3dd4444
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fo.js
@@ -0,0 +1,7 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "T-post",
+    "Password" : "Loyniorð"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/fo.json b/integrations/nextcloud/snappymail/l10n/fo.json
new file mode 100644
index 000000000..363f0c26b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fo.json
@@ -0,0 +1,5 @@
+{ "translations": {
+    "Email" : "T-post",
+    "Password" : "Loyniorð"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/fr.js b/integrations/nextcloud/snappymail/l10n/fr.js
new file mode 100644
index 000000000..70f933bd2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fr.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Erreur",
+    "Invalid argument(s)" : "Argument(s) non valides",
+    "Saved successfully" : "Enregistré avec succès",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Webmail RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Accédez à  la page d'administration de RainLoop ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Les utilisateurs se connecteront manuellement ou définiront des informations d'identification dans leurs paramètres personnels pour les connexions automatiques.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenter de connecter automatiquement les utilisateurs avec leur nom d'utilisateur et mot de passe Nextcloud, ou avec les informations d'identification définies par l'utilisateur, si elles le sont.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenter de connecter es utilisateurs avec leur e-mail et mot de passe Nextcloud, ou avec informations d'identification définies par l'utilisateur, si définies.",
+    "Save" : "Enregistrer",
+    "RainLoop Webmail is not configured yet." : "RainLoop n'est pas encore configuré.",
+    "may have some" : "peut avoir",
+    "security considerations" : "Motifs de sécurité",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Saisissez un e-mail et un mot de passe pour se connecter automatiquement à RainLoop. <b>À noter que </b> cette fonctionnalité %s %s.",
+    "Password" : "Mot de passe"
+},
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/fr.json b/integrations/nextcloud/snappymail/l10n/fr.json
new file mode 100644
index 000000000..149c9d694
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/fr.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Erreur",
+    "Invalid argument(s)" : "Argument(s) non valides",
+    "Saved successfully" : "Enregistré avec succès",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Webmail SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Accédez à  la page d'administration de SnappyMail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Les utilisateurs se connecteront manuellement ou définiront des informations d'identification dans leurs paramètres personnels pour les connexions automatiques.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenter de connecter automatiquement les utilisateurs avec leur nom d'utilisateur et mot de passe Nextcloud, ou avec les informations d'identification définies par l'utilisateur, si elles le sont.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenter de connecter es utilisateurs avec leur e-mail et mot de passe Nextcloud, ou avec informations d'identification définies par l'utilisateur, si définies.",
+    "Save" : "Enregistrer",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail n'est pas encore configuré.",
+    "may have some" : "peut avoir",
+    "security considerations" : "Motifs de sécurité",
+    "Enter an email and password to auto-login to SnappyMail." : "Saisissez un e-mail et un mot de passe pour se connecter automatiquement à SnappyMail.",
+    "Password" : "Mot de passe"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/gd.js b/integrations/nextcloud/snappymail/l10n/gd.js
new file mode 100644
index 000000000..676fd5018
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/gd.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Post-d",
+    "Error" : "Mearachd",
+    "Save" : "Sàbhail",
+    "Password" : "Facal-faire"
+},
+"nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;");
diff --git a/integrations/nextcloud/snappymail/l10n/gd.json b/integrations/nextcloud/snappymail/l10n/gd.json
new file mode 100644
index 000000000..fbafed6bd
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/gd.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Post-d",
+    "Error" : "Mearachd",
+    "Save" : "Sàbhail",
+    "Password" : "Facal-faire"
+},"pluralForm" :"nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/gl.js b/integrations/nextcloud/snappymail/l10n/gl.js
new file mode 100644
index 000000000..f5197b514
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/gl.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Correo-e",
+    "Error" : "Erro",
+    "Invalid argument(s)" : "Argumento(s) incorrecto(s)",
+    "Saved successfully" : "Gardadao satisfactoriamente",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Correo web RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Ir ao panel de administración do Correo web RainLoop ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Os usuarios iniciarán sesión manualmente ou definirán as credenciais nos seus axustes persoais para os accesos automáticos.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tente acceder de xeito automático aos usuarios co seu nome de usuario e contrasinal do Nextcloud ou as credenciais definidas polo usuario, se están definidas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tente acceder de xeito automático aos usuarios co seu correo contrasinal do Nextcloud ou as credenciais definidas polo usuario, se están definidas.",
+    "Save" : "Gardar",
+    "RainLoop Webmail is not configured yet." : "O Correo web RainLoop aínda non foi configurado.",
+    "may have some" : "pode que teña algunhas",
+    "security considerations" : "consideracións de seguridade",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Introduza un correo electrónico e un contrasinal para o acceso automático ao RainLoop. <b>Teña en conta</b> que esta característica %s %s.",
+    "Password" : "Contrasinal"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/gl.json b/integrations/nextcloud/snappymail/l10n/gl.json
new file mode 100644
index 000000000..942c48bdc
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/gl.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Correo-e",
+    "Error" : "Erro",
+    "Invalid argument(s)" : "Argumento(s) incorrecto(s)",
+    "Saved successfully" : "Gardadao satisfactoriamente",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Correo web SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Ir ao panel de administración do Correo web SnappyMail ",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Os usuarios iniciarán sesión manualmente ou definirán as credenciais nos seus axustes persoais para os accesos automáticos.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tente acceder de xeito automático aos usuarios co seu nome de usuario e contrasinal do Nextcloud ou as credenciais definidas polo usuario, se están definidas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tente acceder de xeito automático aos usuarios co seu correo contrasinal do Nextcloud ou as credenciais definidas polo usuario, se están definidas.",
+    "Save" : "Gardar",
+    "SnappyMail Webmail is not configured yet." : "O Correo web SnappyMail aínda non foi configurado.",
+    "may have some" : "pode que teña algunhas",
+    "security considerations" : "consideracións de seguridade",
+    "Enter an email and password to auto-login to SnappyMail." : "Introduza un correo electrónico e un contrasinal para o acceso automático ao SnappyMail.",
+    "Password" : "Contrasinal"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/he.js b/integrations/nextcloud/snappymail/l10n/he.js
new file mode 100644
index 000000000..3d733e2c2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/he.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "דוא״ל",
+    "Error" : "שגיאה",
+    "Invalid argument(s)" : "ארגומנטים שגויים",
+    "Saved successfully" : "נשמר בהצלחה",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "דוא״ל דפדפן RainLoop",
+    "Go to RainLoop Webmail admin panel" : "מעבר ללוח הניהול של הדוא״ל דרך הדפדפן RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "משתמשים ייכנסו ידנית או יגדירו הרשאות גישה בהגדרות האישיות שלהם לכניסות באופן אוטומטי.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "לנסות להכניס משתמשים עם שם המשתמש והססמה שלהם ב־Nextcloud או באמצעות פרטי גישה שהוגדרו על ידי המשתמש, אם הוגדרו כאלה.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "לנסות להכניס משתמשים עם כתובת הדוא״ל והססמה שלהם ב־Nextcloud או באמצעות פרטי גישה שהוגדרו על ידי המשתמש, אם הוגדרו כאלה.",
+    "Save" : "שמירה",
+    "RainLoop Webmail is not configured yet." : "דוא״ל דפדפן RainLoop אינו מוגדר עדיין.",
+    "may have some" : "עשויים להיות",
+    "security considerations" : "ענייני אבטחה",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "נא למלא שם משתמש וססמה כדי להיכנס ל־RainLoop אוטומטית. <b>נא לשים לב</b> שהתכונה הזאת %s %s.",
+    "Password" : "ססמה"
+},
+"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;");
diff --git a/integrations/nextcloud/snappymail/l10n/he.json b/integrations/nextcloud/snappymail/l10n/he.json
new file mode 100644
index 000000000..c7d3f7749
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/he.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "דוא״ל",
+    "Error" : "שגיאה",
+    "Invalid argument(s)" : "ארגומנטים שגויים",
+    "Saved successfully" : "נשמר בהצלחה",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "דוא״ל דפדפן SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "מעבר ללוח הניהול של הדוא״ל דרך הדפדפן SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "משתמשים ייכנסו ידנית או יגדירו הרשאות גישה בהגדרות האישיות שלהם לכניסות באופן אוטומטי.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "לנסות להכניס משתמשים עם שם המשתמש והססמה שלהם ב־Nextcloud או באמצעות פרטי גישה שהוגדרו על ידי המשתמש, אם הוגדרו כאלה.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "לנסות להכניס משתמשים עם כתובת הדוא״ל והססמה שלהם ב־Nextcloud או באמצעות פרטי גישה שהוגדרו על ידי המשתמש, אם הוגדרו כאלה.",
+    "Save" : "שמירה",
+    "SnappyMail Webmail is not configured yet." : "דוא״ל דפדפן SnappyMail אינו מוגדר עדיין.",
+    "may have some" : "עשויים להיות",
+    "security considerations" : "ענייני אבטחה",
+    "Enter an email and password to auto-login to SnappyMail." : "נא למלא שם משתמש וססמה כדי להיכנס ל־SnappyMail אוטומטית.",
+    "Password" : "ססמה"
+},"pluralForm" :"nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/hr.js b/integrations/nextcloud/snappymail/l10n/hr.js
new file mode 100644
index 000000000..a9b035d77
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hr.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-pošta",
+    "Error" : "Pogreška",
+    "Invalid argument(s)" : "Nevažeći argument(i)",
+    "Saved successfully" : "Uspješno spremljeno",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Go to RainLoop Webmail admin panel" : "Idi na administracijsku ploču aplikacije RainLoop Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Korisnici će se ručno prijavljivati ili definirati vjerodajnice za automatsku prijavu u svojim osobnim postavkama.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokušajte automatski prijaviti korisnike s njihovim Nextcloudovim korisničkim imenom i zaporkom ili korisničkim vjerodajnicama, ako postoje.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokušajte automatski prijaviti korisnike s njihovom Nextcloudovom adresom e-pošte i zaporkom ili korisničkim vjerodajnicama, ako postoje.",
+    "Save" : "Spremi",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail još nije konfiguriran.",
+    "may have some" : "možda postoje neka",
+    "security considerations" : "sigurnosna pitanja",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Unesite adresu e-pošte i zaporku za automatsku prijavu u aplikaciju RainLoop. <b>Imajte na umu</b> da ova značajka %s %s.",
+    "Password" : "Zaporka"
+},
+"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/hr.json b/integrations/nextcloud/snappymail/l10n/hr.json
new file mode 100644
index 000000000..322a907ca
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hr.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-pošta",
+    "Error" : "Pogreška",
+    "Invalid argument(s)" : "Nevažeći argument(i)",
+    "Saved successfully" : "Uspješno spremljeno",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Idi na administracijsku ploču aplikacije SnappyMail Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Korisnici će se ručno prijavljivati ili definirati vjerodajnice za automatsku prijavu u svojim osobnim postavkama.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokušajte automatski prijaviti korisnike s njihovim Nextcloudovim korisničkim imenom i zaporkom ili korisničkim vjerodajnicama, ako postoje.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokušajte automatski prijaviti korisnike s njihovom Nextcloudovom adresom e-pošte i zaporkom ili korisničkim vjerodajnicama, ako postoje.",
+    "Save" : "Spremi",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail još nije konfiguriran.",
+    "may have some" : "možda postoje neka",
+    "security considerations" : "sigurnosna pitanja",
+    "Enter an email and password to auto-login to SnappyMail." : "Unesite adresu e-pošte i zaporku za automatsku prijavu u aplikaciju SnappyMail.",
+    "Password" : "Zaporka"
+},"pluralForm" :"nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/hu.js b/integrations/nextcloud/snappymail/l10n/hu.js
new file mode 100644
index 000000000..9dfb0d031
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hu.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Hiba",
+    "Invalid argument(s)" : "Érvénytelen argumentumok",
+    "Saved successfully" : "Sikeres mentés",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Egyszerű, modern és gyors webes e-mail-kliens. Miután engedélyezte a Nextcloudban, ugorjon az adminisztrációs panelhez, válassza a „További beállítások” lehetőséget, és látni fogja a „RainLoop Webmail” szakaszt. Ott kattintson a hivatkozásra, amely a RainLoop adminisztrációs paneljéhez vezet. Az alapértelmezett felhasználónév/jelszó páros admin/12345. Ez a verzió a RainLoop 1.16.0-s (2021. májusi) verziójára épül.",
+    "Go to RainLoop Webmail admin panel" : "Ugorjon a RainLoop Webmail adminisztrációs paneljéhez",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "A felhasználók kézileg fognak belépni, vagy megadják a hitelesítő adataikat a személyes beállításaikban az automatikusan bejelentkezéshez.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Megpróbálja automatikusan bejelentkezni a felhasználókat a nextcloudos felhasználónevükkel és jelszavukkal, vagy a felhasználó által megadott hitelesítő adatokkal, ha be vannak állítva.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Megpróbálja automatikusan bejelentkezni a felhasználókat a nextcloudos e-mail-címükkel és jelszavukkal, vagy a felhasználó által megadott hitelesítő adatokkal, ha be vannak állítva.",
+    "Save" : "Mentés",
+    "RainLoop Webmail is not configured yet." : "A RainLoop Webmail még nincs beállítva.",
+    "may have some" : "biztonsági megfontolásokat",
+    "security considerations" : "vethet fel",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Adjon meg egy e-mail-címet és jelszót a RainLoopba történő automatikus bejelentkezéshez. <b>Felhívjuk figyelmét</b>, hogy ez a funkció %s %s.",
+    "Password" : "Jelszó"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/hu.json b/integrations/nextcloud/snappymail/l10n/hu.json
new file mode 100644
index 000000000..0f908b7e2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hu.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Hiba",
+    "Invalid argument(s)" : "Érvénytelen argumentumok",
+    "Saved successfully" : "Sikeres mentés",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Ugorjon a SnappyMail Webmail adminisztrációs paneljéhez",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "A felhasználók kézileg fognak belépni, vagy megadják a hitelesítő adataikat a személyes beállításaikban az automatikusan bejelentkezéshez.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Megpróbálja automatikusan bejelentkezni a felhasználókat a nextcloudos felhasználónevükkel és jelszavukkal, vagy a felhasználó által megadott hitelesítő adatokkal, ha be vannak állítva.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Megpróbálja automatikusan bejelentkezni a felhasználókat a nextcloudos e-mail-címükkel és jelszavukkal, vagy a felhasználó által megadott hitelesítő adatokkal, ha be vannak állítva.",
+    "Save" : "Mentés",
+    "SnappyMail Webmail is not configured yet." : "A SnappyMail Webmail még nincs beállítva.",
+    "may have some" : "biztonsági megfontolásokat",
+    "security considerations" : "vethet fel",
+    "Enter an email and password to auto-login to SnappyMail." : "Adjon meg egy e-mail-címet és jelszót a SnappyMailba történő automatikus bejelentkezéshez.",
+    "Password" : "Jelszó"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/hy.js b/integrations/nextcloud/snappymail/l10n/hy.js
new file mode 100644
index 000000000..cb0663dec
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hy.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Էլ․փոստ",
+    "Error" : "Սխալ",
+    "Save" : "Պահպանել",
+    "Password" : "Գաղտնաբառ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/hy.json b/integrations/nextcloud/snappymail/l10n/hy.json
new file mode 100644
index 000000000..65f477129
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/hy.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Էլ․փոստ",
+    "Error" : "Սխալ",
+    "Save" : "Պահպանել",
+    "Password" : "Գաղտնաբառ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ia.js b/integrations/nextcloud/snappymail/l10n/ia.js
new file mode 100644
index 000000000..0809f48cf
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ia.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-posta",
+    "Error" : "Error",
+    "Save" : "Salveguardar",
+    "Password" : "Contrasigno"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ia.json b/integrations/nextcloud/snappymail/l10n/ia.json
new file mode 100644
index 000000000..4560cbd5a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ia.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-posta",
+    "Error" : "Error",
+    "Save" : "Salveguardar",
+    "Password" : "Contrasigno"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/id.js b/integrations/nextcloud/snappymail/l10n/id.js
new file mode 100644
index 000000000..d19b50177
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/id.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Surel",
+    "Error" : "Kesalahan",
+    "Save" : "Simpan",
+    "Password" : "Kata kunci"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/id.json b/integrations/nextcloud/snappymail/l10n/id.json
new file mode 100644
index 000000000..9a1dee076
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/id.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Surel",
+    "Error" : "Kesalahan",
+    "Save" : "Simpan",
+    "Password" : "Kata kunci"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/is.js b/integrations/nextcloud/snappymail/l10n/is.js
new file mode 100644
index 000000000..bb5e77c04
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/is.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Tölvupóstur",
+    "Error" : "Villa",
+    "Invalid argument(s)" : "Ógilt viðfang/viðföng",
+    "Saved successfully" : "Tókst að vista",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop vefpóstur",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Einfalt, nútímalegt og hraðvirkt vefpóstviðmót. Eftir að það hefur verið virkjað í Nextcloud, skal fara í Nextcloud-stjórnborðið, \"Viðbótarstillingar\" og þar má sjá hluta merktann \"Rainloop vefpóstur\". Þar er hægt að smella á tengil til að fara í Rainloop-stjórnborðið. Skjálfgefið er notandi/lykilorð sama og admin/12345. Þessi útgáfa er byggð á Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Fara á stjórnborð RainLoop vefpósts",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Notendur geta skráð sig inn handvirkt, eða skilgreint auðkenni í persónulegum stillingunum sínum til að skrá sig inn sjálfvirkt.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Reyna að skrá sjálfkrafa inn með Nextcloud notandanafni þeirra og lykilorði, eða auðkennum skilgreindum af notandanum, ef þau eru stillt.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Reyna að skrá sjálfkrafa inn með Nextcloud tölvupóstfangi þeirra og lykilorði, eða auðkennum skilgreindum af notandanum, ef þau eru stillt.",
+    "Save" : "Vista",
+    "RainLoop Webmail is not configured yet." : "RainLoop vefpóstur hefur enn ekki verið stilltur.",
+    "may have some" : "gæti gaft í för með sér",
+    "security considerations" : "ýmis umhugsunarefni varðandi öryggi",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Settu inn tölvupóstfang og lykilorð til að skrá sjálfkrafa inn í RainLoop vefpósti. <b>Athugaðu</b> að þessi eiginleiki %s %s.",
+    "Password" : "Lykilorð"
+},
+"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);");
diff --git a/integrations/nextcloud/snappymail/l10n/is.json b/integrations/nextcloud/snappymail/l10n/is.json
new file mode 100644
index 000000000..65f867663
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/is.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Tölvupóstur",
+    "Error" : "Villa",
+    "Invalid argument(s)" : "Ógilt viðfang/viðföng",
+    "Saved successfully" : "Tókst að vista",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail vefpóstur",
+    "Go to SnappyMail Webmail admin panel" : "Fara á stjórnborð SnappyMail vefpósts",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Notendur geta skráð sig inn handvirkt, eða skilgreint auðkenni í persónulegum stillingunum sínum til að skrá sig inn sjálfvirkt.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Reyna að skrá sjálfkrafa inn með Nextcloud notandanafni þeirra og lykilorði, eða auðkennum skilgreindum af notandanum, ef þau eru stillt.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Reyna að skrá sjálfkrafa inn með Nextcloud tölvupóstfangi þeirra og lykilorði, eða auðkennum skilgreindum af notandanum, ef þau eru stillt.",
+    "Save" : "Vista",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail vefpóstur hefur enn ekki verið stilltur.",
+    "may have some" : "gæti gaft í för með sér",
+    "security considerations" : "ýmis umhugsunarefni varðandi öryggi",
+    "Enter an email and password to auto-login to SnappyMail." : "Settu inn tölvupóstfang og lykilorð til að skrá sjálfkrafa inn í SnappyMail vefpósti.",
+    "Password" : "Lykilorð"
+},"pluralForm" :"nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/it.js b/integrations/nextcloud/snappymail/l10n/it.js
new file mode 100644
index 000000000..fc0509f23
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/it.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Errore",
+    "Invalid argument(s)" : "Argomenti non validi",
+    "Saved successfully" : "Salvato correttamente",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Webmail RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Vai al pannello di amministrazione della webmail RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Gli utenti accederanno manualmente, o definiranno le credenziali nelle impostazioni personali per gli accessi automatici.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenta l'accesso automatico degli utenti tramite nome utente e password di Nextcloud, o con le credenziali definite dall'utente, se disponibili.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenta l'accesso automatico degli utenti tramite indirizzo email e password di Nextcloud, o con le credenziali definite dall'utente, se disponibili.",
+    "Save" : "Salva",
+    "RainLoop Webmail is not configured yet." : "La webmail RainLoop non è ancora configurata.",
+    "may have some" : "potrebbe avere alcune",
+    "security considerations" : "considerazioni sulla sicurezza",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Digita un indirizzo email e una password per l'accesso automatico a RainLoop. <b>Nota</b>Nota che questa funzionalità %s %s.",
+    "Password" : "Password"
+},
+"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/it.json b/integrations/nextcloud/snappymail/l10n/it.json
new file mode 100644
index 000000000..eb8024dd2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/it.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Errore",
+    "Invalid argument(s)" : "Argomenti non validi",
+    "Saved successfully" : "Salvato correttamente",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Webmail SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Vai al pannello di amministrazione della webmail SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Gli utenti accederanno manualmente, o definiranno le credenziali nelle impostazioni personali per gli accessi automatici.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenta l'accesso automatico degli utenti tramite nome utente e password di Nextcloud, o con le credenziali definite dall'utente, se disponibili.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenta l'accesso automatico degli utenti tramite indirizzo email e password di Nextcloud, o con le credenziali definite dall'utente, se disponibili.",
+    "Save" : "Salva",
+    "SnappyMail Webmail is not configured yet." : "La webmail SnappyMail non è ancora configurata.",
+    "may have some" : "potrebbe avere alcune",
+    "security considerations" : "considerazioni sulla sicurezza",
+    "Enter an email and password to auto-login to SnappyMail." : "Digita un indirizzo email e una password per l'accesso automatico a SnappyMail.",
+    "Password" : "Password"
+},"pluralForm" :"nplurals=3; plural=n == 1 ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ja.js b/integrations/nextcloud/snappymail/l10n/ja.js
new file mode 100644
index 000000000..1cd13f38f
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ja.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "メール",
+    "Error" : "エラー",
+    "Invalid argument(s)" : "無効な（複数の）引数",
+    "Saved successfully" : "保存しました",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webメール",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "シンプルでモダンで高速なWebベースのメールクライアントです。Nextcloudで有効化した後、Nextcloud管理画面の \"追加設定 \"で \"Rainloop webmail \"という項目が表示されます。その中のリンクをクリックすると、Rainloopの管理画面に移動します。デフォルトのユーザー/パスワードはadmin/12345です。このバージョンはRainloop 1.16.0 (2021-05)をベースにしています。",
+    "Go to RainLoop Webmail admin panel" : "RainLoop Webメールの管理画面を開く",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "ユーザーは手動でログインするか、個人設定で資格情報を定義して自動ログインを行います。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Nextcloudのユーザー名とパスワード、またはユーザー定義の資格情報が設定されている場合は、ユーザーの自動ログインを試みます。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Nextcloudの電子メールとパスワード、または設定されている場合はユーザー定義の資格情報を使用して、ユーザーの自動的ログインを試みます。",
+    "Save" : "保存",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail はまだ設定されていません。",
+    "may have some" : "あるかもしれない",
+    "security considerations" : "セキュリティ上の配慮事項",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "RainLoopに自動ログインするには、メールアドレスとパスワードを入力してください。<b>注意</b>この機能%s %s。",
+    "Password" : "パスワード"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/ja.json b/integrations/nextcloud/snappymail/l10n/ja.json
new file mode 100644
index 000000000..f34e5cfb3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ja.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "メール",
+    "Error" : "エラー",
+    "Invalid argument(s)" : "無効な（複数の）引数",
+    "Saved successfully" : "保存しました",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webメール",
+    "Go to SnappyMail Webmail admin panel" : "SnappyMail Webメールの管理画面を開く",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "ユーザーは手動でログインするか、個人設定で資格情報を定義して自動ログインを行います。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Nextcloudのユーザー名とパスワード、またはユーザー定義の資格情報が設定されている場合は、ユーザーの自動ログインを試みます。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Nextcloudの電子メールとパスワード、または設定されている場合はユーザー定義の資格情報を使用して、ユーザーの自動的ログインを試みます。",
+    "Save" : "保存",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail はまだ設定されていません。",
+    "may have some" : "あるかもしれない",
+    "security considerations" : "セキュリティ上の配慮事項",
+    "Enter an email and password to auto-login to SnappyMail." : "SnappyMailに自動ログインするには、メールアドレスとパスワードを入力してください。",
+    "Password" : "パスワード"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ka.js b/integrations/nextcloud/snappymail/l10n/ka.js
new file mode 100644
index 000000000..0917405ba
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ka.js
@@ -0,0 +1,6 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Password" : "პაროლი"
+},
+"nplurals=2; plural=(n!=1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ka.json b/integrations/nextcloud/snappymail/l10n/ka.json
new file mode 100644
index 000000000..a8d9a374d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ka.json
@@ -0,0 +1,4 @@
+{ "translations": {
+    "Password" : "პაროლი"
+},"pluralForm" :"nplurals=2; plural=(n!=1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ka_GE.js b/integrations/nextcloud/snappymail/l10n/ka_GE.js
new file mode 100644
index 000000000..f6415859b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ka_GE.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "ელ-ფოსტა",
+    "Error" : "შეცდომა",
+    "Save" : "შენახვა",
+    "Password" : "პაროლი"
+},
+"nplurals=2; plural=(n!=1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ka_GE.json b/integrations/nextcloud/snappymail/l10n/ka_GE.json
new file mode 100644
index 000000000..75807777a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ka_GE.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "ელ-ფოსტა",
+    "Error" : "შეცდომა",
+    "Save" : "შენახვა",
+    "Password" : "პაროლი"
+},"pluralForm" :"nplurals=2; plural=(n!=1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/kab.js b/integrations/nextcloud/snappymail/l10n/kab.js
new file mode 100644
index 000000000..4a036f791
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/kab.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Imayl",
+    "Error" : "Erreur",
+    "Save" : "Sekles",
+    "Password" : "Awal uffir"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/kab.json b/integrations/nextcloud/snappymail/l10n/kab.json
new file mode 100644
index 000000000..556a8ceef
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/kab.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Imayl",
+    "Error" : "Erreur",
+    "Save" : "Sekles",
+    "Password" : "Awal uffir"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/km.js b/integrations/nextcloud/snappymail/l10n/km.js
new file mode 100644
index 000000000..17bfa0b0e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/km.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "អ៊ីមែល",
+    "Error" : "កំហុស",
+    "Save" : "រក្សាទុក",
+    "Password" : "ពាក្យសម្ងាត់"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/km.json b/integrations/nextcloud/snappymail/l10n/km.json
new file mode 100644
index 000000000..899da6138
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/km.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "អ៊ីមែល",
+    "Error" : "កំហុស",
+    "Save" : "រក្សាទុក",
+    "Password" : "ពាក្យសម្ងាត់"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/kn.js b/integrations/nextcloud/snappymail/l10n/kn.js
new file mode 100644
index 000000000..b181b80f7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/kn.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "ಇ-ಅಂಚೆ",
+    "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "Save" : "ಉಳಿಸಿ",
+    "Password" : "ಗುಪ್ತ ಪದ"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/kn.json b/integrations/nextcloud/snappymail/l10n/kn.json
new file mode 100644
index 000000000..0ceb3fc61
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/kn.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "ಇ-ಅಂಚೆ",
+    "Error" : "ತಪ್ಪಾಗಿದೆ",
+    "Save" : "ಉಳಿಸಿ",
+    "Password" : "ಗುಪ್ತ ಪದ"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ko.js b/integrations/nextcloud/snappymail/l10n/ko.js
new file mode 100644
index 000000000..e35dd41e5
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ko.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "이메일",
+    "Error" : "오류",
+    "Save" : "저장",
+    "Password" : "암호"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/ko.json b/integrations/nextcloud/snappymail/l10n/ko.json
new file mode 100644
index 000000000..f59b88bc9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ko.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "이메일",
+    "Error" : "오류",
+    "Save" : "저장",
+    "Password" : "암호"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/lb.js b/integrations/nextcloud/snappymail/l10n/lb.js
new file mode 100644
index 000000000..6c6226e02
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lb.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Fehler",
+    "Save" : "Späicheren",
+    "Password" : "Passwuert"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/lb.json b/integrations/nextcloud/snappymail/l10n/lb.json
new file mode 100644
index 000000000..109ed393b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lb.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Fehler",
+    "Save" : "Späicheren",
+    "Password" : "Passwuert"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/lo.js b/integrations/nextcloud/snappymail/l10n/lo.js
new file mode 100644
index 000000000..f61230217
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lo.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "ອິເມວ",
+    "Error" : "ຜິດພາດ",
+    "Save" : "ບັນທຶກ",
+    "Password" : "ລະຫັດຜ່ານ"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/lo.json b/integrations/nextcloud/snappymail/l10n/lo.json
new file mode 100644
index 000000000..9704feb67
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lo.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "ອິເມວ",
+    "Error" : "ຜິດພາດ",
+    "Save" : "ບັນທຶກ",
+    "Password" : "ລະຫັດຜ່ານ"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/lt_LT.js b/integrations/nextcloud/snappymail/l10n/lt_LT.js
new file mode 100644
index 000000000..193f02fca
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lt_LT.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "El. paštas",
+    "Error" : "Klaida",
+    "Saved successfully" : "Sėkmingai įrašyta",
+    "Save" : "Įrašyti",
+    "Password" : "Slaptažodis"
+},
+"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/lt_LT.json b/integrations/nextcloud/snappymail/l10n/lt_LT.json
new file mode 100644
index 000000000..ca942d7a9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lt_LT.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Email" : "El. paštas",
+    "Error" : "Klaida",
+    "Saved successfully" : "Sėkmingai įrašyta",
+    "Save" : "Įrašyti",
+    "Password" : "Slaptažodis"
+},"pluralForm" :"nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/lv.js b/integrations/nextcloud/snappymail/l10n/lv.js
new file mode 100644
index 000000000..fce6c88d0
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lv.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-pasts",
+    "Error" : "Kļūda",
+    "Save" : "Saglabāt",
+    "Password" : "Parole"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);");
diff --git a/integrations/nextcloud/snappymail/l10n/lv.json b/integrations/nextcloud/snappymail/l10n/lv.json
new file mode 100644
index 000000000..6e23224ee
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/lv.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-pasts",
+    "Error" : "Kļūda",
+    "Save" : "Saglabāt",
+    "Password" : "Parole"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/mk.js b/integrations/nextcloud/snappymail/l10n/mk.js
new file mode 100644
index 000000000..b5aa5ecf2
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/mk.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Е-пошта",
+    "Error" : "Грешка",
+    "Save" : "Зачувај",
+    "Password" : "Лозинка"
+},
+"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;");
diff --git a/integrations/nextcloud/snappymail/l10n/mk.json b/integrations/nextcloud/snappymail/l10n/mk.json
new file mode 100644
index 000000000..def0286c9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/mk.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Е-пошта",
+    "Error" : "Грешка",
+    "Save" : "Зачувај",
+    "Password" : "Лозинка"
+},"pluralForm" :"nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/mn.js b/integrations/nextcloud/snappymail/l10n/mn.js
new file mode 100644
index 000000000..41606e43d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/mn.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Цахим шуудан",
+    "Error" : "Алдаа",
+    "Save" : "Хадгалах",
+    "Password" : "Нууц үг"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/mn.json b/integrations/nextcloud/snappymail/l10n/mn.json
new file mode 100644
index 000000000..a4c8c4862
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/mn.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Цахим шуудан",
+    "Error" : "Алдаа",
+    "Save" : "Хадгалах",
+    "Password" : "Нууц үг"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ms_MY.js b/integrations/nextcloud/snappymail/l10n/ms_MY.js
new file mode 100644
index 000000000..ed221eddd
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ms_MY.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Ralat",
+    "Save" : "Simpan",
+    "Password" : "Kata laluan"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/ms_MY.json b/integrations/nextcloud/snappymail/l10n/ms_MY.json
new file mode 100644
index 000000000..3a3169240
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ms_MY.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Ralat",
+    "Save" : "Simpan",
+    "Password" : "Kata laluan"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/nb.js b/integrations/nextcloud/snappymail/l10n/nb.js
new file mode 100644
index 000000000..4fd316d5c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nb.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-post",
+    "Error" : "Feil",
+    "Save" : "Lagre",
+    "Password" : "Passord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/nb.json b/integrations/nextcloud/snappymail/l10n/nb.json
new file mode 100644
index 000000000..9cb029b43
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nb.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-post",
+    "Error" : "Feil",
+    "Save" : "Lagre",
+    "Password" : "Passord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/nl.js b/integrations/nextcloud/snappymail/l10n/nl.js
new file mode 100644
index 000000000..f52760a2a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nl.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Fout",
+    "Invalid argument(s)" : "Ongeldig(e) argument(en)",
+    "Saved successfully" : "Succesvol opgeslagen",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Eenvoudige, moderne en snelle webgebaseerde e-mailclient. Na het inschakelen in Nextcloud, ga je in het Nextcloud beheerscherm naar \"Additionele instellingen\" en je zult een \"Rainloop webmail\" sectie zien. Klik dan op de link om naar het Rainloop-beheerdscherm te gaan. De standaard gebruikersnasam / wachtwoord is admin / 12345. Deze versie is gebaseerd op Rainloop 1.15.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Ga naar RainLoop Webmail beheerscherm",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Gebruikers loggen handmatig in of geven hun inloggegevens op in hun persoonlijke instellingen voor automatische logins.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Probeer gebruikers automatisch te laten inloggen met hun Nextcloud-gebruikersnaam en wachtwoord, of door de gebruiker gedefinieerde inloggegevens, als dat is ingesteld.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Probeer gebruikers automatisch te laten inloggen met hun Nextcloud-e-mailadres en wachtwoord, of door de gebruiker gedefinieerde inloggegevens, als dat is ingesteld.",
+    "Save" : "Opslaan",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail is nog niet geconfigureerd.",
+    "may have some" : "kan wat hebben",
+    "security considerations" : "Beveiligingoverwegingen",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Geef een e-mailadres en wachtwoord op voor auto-login naar RainLoop. <b>Lep op</b> dat deze optie %s%s.",
+    "Password" : "Wachtwoord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/nl.json b/integrations/nextcloud/snappymail/l10n/nl.json
new file mode 100644
index 000000000..8c688c064
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nl.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Fout",
+    "Invalid argument(s)" : "Ongeldig(e) argument(en)",
+    "Saved successfully" : "Succesvol opgeslagen",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Ga naar SnappyMail Webmail beheerscherm",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Gebruikers loggen handmatig in of geven hun inloggegevens op in hun persoonlijke instellingen voor automatische logins.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Probeer gebruikers automatisch te laten inloggen met hun Nextcloud-gebruikersnaam en wachtwoord, of door de gebruiker gedefinieerde inloggegevens, als dat is ingesteld.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Probeer gebruikers automatisch te laten inloggen met hun Nextcloud-e-mailadres en wachtwoord, of door de gebruiker gedefinieerde inloggegevens, als dat is ingesteld.",
+    "Save" : "Opslaan",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail is nog niet geconfigureerd.",
+    "may have some" : "kan wat hebben",
+    "security considerations" : "Beveiligingoverwegingen",
+    "Enter an email and password to auto-login to SnappyMail." : "Geef een e-mailadres en wachtwoord op voor auto-login naar SnappyMail.",
+    "Password" : "Wachtwoord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/nn_NO.js b/integrations/nextcloud/snappymail/l10n/nn_NO.js
new file mode 100644
index 000000000..4fd316d5c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nn_NO.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-post",
+    "Error" : "Feil",
+    "Save" : "Lagre",
+    "Password" : "Passord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/nn_NO.json b/integrations/nextcloud/snappymail/l10n/nn_NO.json
new file mode 100644
index 000000000..9cb029b43
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/nn_NO.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "E-post",
+    "Error" : "Feil",
+    "Save" : "Lagre",
+    "Password" : "Passord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/oc.js b/integrations/nextcloud/snappymail/l10n/oc.js
new file mode 100644
index 000000000..ea09cb9ba
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/oc.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Adreça corrièl",
+    "Error" : "Error",
+    "Save" : "Salvar",
+    "Password" : "Senhal"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/oc.json b/integrations/nextcloud/snappymail/l10n/oc.json
new file mode 100644
index 000000000..538be91e3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/oc.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Adreça corrièl",
+    "Error" : "Error",
+    "Save" : "Salvar",
+    "Password" : "Senhal"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/pl.js b/integrations/nextcloud/snappymail/l10n/pl.js
new file mode 100644
index 000000000..c023d50e4
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pl.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Błąd",
+    "Invalid argument(s)" : "Nieprawidłowe argumenty",
+    "Saved successfully" : "Zapisano pomyślnie",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Prosty, nowoczesny i szybki internetowy klient poczty e-mail. Po włączeniu w Nextcloud przejdź do panelu administracyjnego Nextcloud, \"Ustawienia dodatkowe\", a zobaczysz sekcję \"Poczta internetowa Rainloop\". Tam kliknij link, aby przejść do panelu administracyjnego Rainloop. Domyślny użytkownik/hasło to admin/12345. Ta wersja jest oparta na Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Przejdź do panelu administracyjnego RainLoop Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Użytkownicy zalogują się ręcznie lub zdefiniują poświadczenia w swoich ustawieniach osobistych w celu automatycznego logowania.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Próba automatycznego logowania użytkowników przy użyciu nazwy użytkownika i hasła Nextcloud lub poświadczeń zdefiniowanych przez użytkownika, jeśli są ustawione.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Próba automatycznego logowania użytkowników przy użyciu adresu e-mail i hasła Nextcloud lub poświadczeń zdefiniowanych przez użytkownika, jeśli są ustawione.",
+    "Save" : "Zapisz",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail nie jest jeszcze skonfigurowany.",
+    "may have some" : "może mieć pewne",
+    "security considerations" : "względy bezpieczeństwa",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Wpisz adres e-mail i hasło, aby automatycznie zalogować się do RainLoop. <b>Pamiętaj</b>, że ta funkcja %s %s.",
+    "Password" : "Hasło"
+},
+"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/pl.json b/integrations/nextcloud/snappymail/l10n/pl.json
new file mode 100644
index 000000000..13cb4625b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pl.json
@@ -0,0 +1,22 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Błąd",
+    "Invalid argument(s)" : "Nieprawidłowe argumenty",
+    "Saved successfully" : "Zapisano pomyślnie",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Przejdź do panelu administracyjnego SnappyMail Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Użytkownicy zalogują się ręcznie lub zdefiniują poświadczenia w swoich ustawieniach osobistych w celu automatycznego logowania.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Próba automatycznego logowania użytkowników przy użyciu nazwy użytkownika i hasła Nextcloud lub poświadczeń zdefiniowanych przez użytkownika, jeśli są ustawione.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Próba automatycznego logowania użytkowników przy użyciu adresu e-mail i hasła Nextcloud lub poświadczeń zdefiniowanych przez użytkownika, jeśli są ustawione.",
+    "Save" : "Zapisz",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail nie jest jeszcze skonfigurowany.",
+    "may have some" : "może mieć pewne",
+    "security considerations" : "względy bezpieczeństwa",
+    "Enter an email and password to auto-login to SnappyMail." : "Wpisz adres e-mail i hasło, aby automatycznie zalogować się do SnappyMaila.",
+    "Password" : "Hasło",
+    "Don't fully integrate in Nextcloud, use in iframe" : "Nie integruj całkowicie z Nextcloudem, używaj wewnątrz iframe",
+    "Debug" : "Debuguj",
+    "Import RainLoop data" : "Zaimportuj dane z RainLoopa"
+},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ps.js b/integrations/nextcloud/snappymail/l10n/ps.js
new file mode 100644
index 000000000..1290dfb9a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ps.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Error" : "شسیب",
+    "Save" : "ساتل",
+    "Password" : "پاسورډ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ps.json b/integrations/nextcloud/snappymail/l10n/ps.json
new file mode 100644
index 000000000..caaab2164
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ps.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "شسیب",
+    "Save" : "ساتل",
+    "Password" : "پاسورډ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/pt_BR.js b/integrations/nextcloud/snappymail/l10n/pt_BR.js
new file mode 100644
index 000000000..ff608f092
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pt_BR.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Erro",
+    "Invalid argument(s)" : "Argumento(s) inválido(s)",
+    "Saved successfully" : "Salvo com sucesso",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Webmail RainLoop",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Cliente de e-mail baseado na web simples, moderno e rápido. Depois de habilitar no Nextcloud, vá para o painel de administração do Nextcloud, \"Configurações adicionais\" e você verá uma seção \"Rainloop webmail\". Lá, clique no link para acessar o painel de administração do Rainloop. O usuário/senha padrão é admin/12345. Esta versão é baseada no Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Ir ao painel de administração do Webmail RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Os usuários farão login manualmente ou definirão credenciais em suas configurações pessoais para logins automáticos.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tente conectar-se automaticamente aos usuários com seu nome de usuário e senha do Nextcloud ou credenciais definidas pelo usuário, se configuradas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tente conectar-se automaticamente aos usuários com seu e-mail e senha Nextcloud, ou credenciais definidas pelo usuário, se configuradas.",
+    "Save" : "Salvar",
+    "RainLoop Webmail is not configured yet." : "O RainLoop Webmail não está configurado ainda.",
+    "may have some" : "pode haver algum",
+    "security considerations" : "considerações de segurança",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Digite um e-mail e senha para efetuar login no RainLoop automaticamente. <b>Observe</b> que este recurso %s %s.",
+    "Password" : "Senha"
+},
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/pt_BR.json b/integrations/nextcloud/snappymail/l10n/pt_BR.json
new file mode 100644
index 000000000..d8aa4861a
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pt_BR.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Erro",
+    "Invalid argument(s)" : "Argumento(s) inválido(s)",
+    "Saved successfully" : "Salvo com sucesso",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Webmail SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Ir ao painel de administração do Webmail SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Os usuários farão login manualmente ou definirão credenciais em suas configurações pessoais para logins automáticos.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tente conectar-se automaticamente aos usuários com seu nome de usuário e senha do Nextcloud ou credenciais definidas pelo usuário, se configuradas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tente conectar-se automaticamente aos usuários com seu e-mail e senha Nextcloud, ou credenciais definidas pelo usuário, se configuradas.",
+    "Save" : "Salvar",
+    "SnappyMail Webmail is not configured yet." : "O SnappyMail Webmail não está configurado ainda.",
+    "may have some" : "pode haver algum",
+    "security considerations" : "considerações de segurança",
+    "Enter an email and password to auto-login to SnappyMail." : "Digite um e-mail e senha para efetuar login no SnappyMail automaticamente.",
+    "Password" : "Senha"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/pt_PT.js b/integrations/nextcloud/snappymail/l10n/pt_PT.js
new file mode 100644
index 000000000..f948f0419
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pt_PT.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Erro",
+    "Save" : "Guardar",
+    "Password" : "Palavra-passe"
+},
+"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;");
diff --git a/integrations/nextcloud/snappymail/l10n/pt_PT.json b/integrations/nextcloud/snappymail/l10n/pt_PT.json
new file mode 100644
index 000000000..b2ddc9143
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/pt_PT.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Erro",
+    "Save" : "Guardar",
+    "Password" : "Palavra-passe"
+},"pluralForm" :"nplurals=3; plural=(n == 0 || n == 1) ? 0 : n != 0 && n % 1000000 == 0 ? 1 : 2;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ro.js b/integrations/nextcloud/snappymail/l10n/ro.js
new file mode 100644
index 000000000..227f96800
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ro.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Eroare",
+    "Invalid argument(s)" : "Argument(e) invalid(e)",
+    "Saved successfully" : "Salvat cu succes",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Client de e-mail simplu, modern și rapid, bazat pe web. După activarea în Nextcloud, mergeți la panoul de administrare Nextcloud, \"Additionnal settings\" și veți vedea o secțiune \"Rainloop webmail\". Acolo, faceți clic pe link pentru a merge la panoul de administrare Rainloop. Utilizatorul/parola implicită este admin/12345. Această versiune se bazează pe Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Mergi la panoul de administrare RainLoop Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Utilizatorii se vor autentifica manual sau vor defini credențiale în setările personale pentru autentificarea automată.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Încearcă să autentifici automat utilizatorii cu email-ul și parola de Nextcloud sau credențialele definite de aceștia, dacă există.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Încearcă să autentifici automat utilizatorii cu email-ul și parola de Nextcloud sau credențialele definite de aceștia, dacă există.",
+    "Save" : "Salvează",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail nu este configurat deocamdată.",
+    "may have some" : "poate avea niște",
+    "security considerations" : "considerații de securitate",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Indrouduceți un email și parolă pentru a vă autentifica automat în RainLoop. <b>Vă rugăm să notați</b> că această funcție %s %s.",
+    "Password" : "Parolă"
+},
+"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));");
diff --git a/integrations/nextcloud/snappymail/l10n/ro.json b/integrations/nextcloud/snappymail/l10n/ro.json
new file mode 100644
index 000000000..5c85f3479
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ro.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Eroare",
+    "Invalid argument(s)" : "Argument(e) invalid(e)",
+    "Saved successfully" : "Salvat cu succes",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Mergi la panoul de administrare SnappyMail Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Utilizatorii se vor autentifica manual sau vor defini credențiale în setările personale pentru autentificarea automată.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Încearcă să autentifici automat utilizatorii cu email-ul și parola de Nextcloud sau credențialele definite de aceștia, dacă există.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Încearcă să autentifici automat utilizatorii cu email-ul și parola de Nextcloud sau credențialele definite de aceștia, dacă există.",
+    "Save" : "Salvează",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail nu este configurat deocamdată.",
+    "may have some" : "poate avea niște",
+    "security considerations" : "considerații de securitate",
+    "Enter an email and password to auto-login to SnappyMail." : "Indrouduceți un email și parolă pentru a vă autentifica automat în SnappyMail.",
+    "Password" : "Parolă"
+},"pluralForm" :"nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ru.js b/integrations/nextcloud/snappymail/l10n/ru.js
new file mode 100644
index 000000000..5af8635e4
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ru.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Ошибка",
+    "Invalid argument(s)" : "Неверные аргументы",
+    "Saved successfully" : "Сохранено успешно",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Веб-почта RainLoop",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Простой, современный и быстрый веб-клиент электронной почты. После включения в Nextcloud перейдите в панель администратора Nextcloud, \"Дополнительные настройки\", и вы увидите раздел \"Веб-почта RainLoop\". Там нажмите на ссылку, чтобы перейти в панель администратора RainLoop. Пользователь/пароль по умолчанию - admin/12345. Эта версия основана на Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Перейти в панель администратора RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Пользователи будут входить в систему вручную или определять учетные данные в своих личных настройках для автоматического входа.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Старайтесь автоматически входить в систему пользователей с именем пользователя и паролем Nextcloud или пользовательскими учетными данными, если они установлены. ",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Старайтесь автоматически входить в систему пользователей с почтовым адресом и паролем Nextcloud или пользовательскими учетными данными, если они установлены. ",
+    "Save" : "Сохранить",
+    "RainLoop Webmail is not configured yet." : "Веб-почта RailLoop ещё не настроена.",
+    "may have some" : "есть кое-какие требования",
+    "security considerations" : "по обеспечению безопасности",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Введите адрес электронной почты и пароль для автоматического входа в RainLoop. <b>Имейте ввиду</b>, что у этой функции %s %s.",
+    "Password" : "Пароль"
+},
+"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/ru.json b/integrations/nextcloud/snappymail/l10n/ru.json
new file mode 100644
index 000000000..49c855959
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ru.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Ошибка",
+    "Invalid argument(s)" : "Неверные аргументы",
+    "Saved successfully" : "Сохранено успешно",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Веб-почта SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Перейти в панель администратора SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Пользователи будут входить в систему вручную или определять учетные данные в своих личных настройках для автоматического входа.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Старайтесь автоматически входить в систему пользователей с именем пользователя и паролем Nextcloud или пользовательскими учетными данными, если они установлены. ",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Старайтесь автоматически входить в систему пользователей с почтовым адресом и паролем Nextcloud или пользовательскими учетными данными, если они установлены. ",
+    "Save" : "Сохранить",
+    "SnappyMail Webmail is not configured yet." : "Веб-почта RailLoop ещё не настроена.",
+    "may have some" : "есть кое-какие требования",
+    "security considerations" : "по обеспечению безопасности",
+    "Enter an email and password to auto-login to SnappyMail." : "Введите адрес электронной почты и пароль для автоматического входа в SnappyMail.",
+    "Password" : "Пароль"
+},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sc.js b/integrations/nextcloud/snappymail/l10n/sc.js
new file mode 100644
index 000000000..f8ab2d1e0
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sc.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Posta eletrònica",
+    "Error" : "Errore",
+    "Invalid argument(s)" : "Argumentu(os) non bàlidu(os)",
+    "Saved successfully" : "Sarvadu",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Posta eletrònica RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Bae a su pannellu de amministratzione de sa posta eletrònica RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Is utentes intrant a manu, o definint is credentziales in is impostatziones personales issoro pro s'atzessu automàticu.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenta s'atzessu automàticu de is utentes cun nùmene utente e crae de Nextcloud, o cun is credentziales definidas dae s'utente, si sunt impostadas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenta s'atzessu automàticu de is utentes cun indiritzu de posta e crae de Nextcloud, o cun is credentziales definidas dae s'utente, si sunt impostadas.",
+    "Save" : "Sarva",
+    "RainLoop Webmail is not configured yet." : "Sa posta eletrònica RainLoop no est ancora cunfigurada.",
+    "may have some" : "diat pòdet tènnere",
+    "security considerations" : "cunsideratziones subra de sa seguresa",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Inserta un'indiritzu de posta e una crae pro intrare in automàticu in RainLoop. <b>Nota</b> chi custa funtzionalidade %s %s.",
+    "Password" : "Crae"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/sc.json b/integrations/nextcloud/snappymail/l10n/sc.json
new file mode 100644
index 000000000..7c9c8b7ed
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sc.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Posta eletrònica",
+    "Error" : "Errore",
+    "Invalid argument(s)" : "Argumentu(os) non bàlidu(os)",
+    "Saved successfully" : "Sarvadu",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Posta eletrònica SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Bae a su pannellu de amministratzione de sa posta eletrònica SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Is utentes intrant a manu, o definint is credentziales in is impostatziones personales issoro pro s'atzessu automàticu.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Tenta s'atzessu automàticu de is utentes cun nùmene utente e crae de Nextcloud, o cun is credentziales definidas dae s'utente, si sunt impostadas.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Tenta s'atzessu automàticu de is utentes cun indiritzu de posta e crae de Nextcloud, o cun is credentziales definidas dae s'utente, si sunt impostadas.",
+    "Save" : "Sarva",
+    "SnappyMail Webmail is not configured yet." : "Sa posta eletrònica SnappyMail no est ancora cunfigurada.",
+    "may have some" : "diat pòdet tènnere",
+    "security considerations" : "cunsideratziones subra de sa seguresa",
+    "Enter an email and password to auto-login to SnappyMail." : "Inserta un'indiritzu de posta e una crae pro intrare in automàticu in SnappyMail.",
+    "Password" : "Crae"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/si.js b/integrations/nextcloud/snappymail/l10n/si.js
new file mode 100644
index 000000000..28cd81d17
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/si.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Error" : "දෝෂය",
+    "Save" : "සුරකින්න",
+    "Password" : "මුර පදය"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/si.json b/integrations/nextcloud/snappymail/l10n/si.json
new file mode 100644
index 000000000..d9f31fe58
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/si.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "විද්‍යුත් තැපෑල",
+    "Error" : "දෝෂය",
+    "Save" : "සුරකින්න",
+    "Password" : "මුර පදය"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sk.js b/integrations/nextcloud/snappymail/l10n/sk.js
new file mode 100644
index 000000000..fc68d0e2c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sk.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-mail",
+    "Error" : "Chyba",
+    "Invalid argument(s)" : "Neplatný(é) argument(y)",
+    "Saved successfully" : "Úspešne uložené",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Jednoduchý, moderný a rýchly webový e-mailový klient. Po povolení v Nextcloud prejdite na panel správcu, „Doplnkové nastavenia“ a uvidíte sekciu „Rainloop webmail“. Tam kliknite na odkaz, aby ste prešli na administrátorský panel Rainloop. Predvolené meno používateľa/heslo je admin/12345. Táto verzia je založená na Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Prejdite na správcovský panel RainLoop Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Používatelia sa budú prihlasovať manuálne alebo v osobných nastaveniach definujte prihlasovacie údaje pre automatické prihlásenie.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokúste sa automaticky prihlásiť používateľov pomocou ich používateľského mena a hesla Nextcloud alebo prihlasovacích údajov definovaných používateľom, ak sú nastavené.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokúste sa automaticky prihlásiť používateľov pomocou ich Nextcloud e-mailu a hesla alebo prihlasovacích údajov definovaných používateľom, ak sú nastavené.",
+    "Save" : "Uložiť",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail ešte nie je nastavený.",
+    "may have some" : "môže mať",
+    "security considerations" : "vplyv na bezpečnosť",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Zadajte e-mail a heslo pre automatické prihlásenie do RainLoop. <b>Prosím uvedomte si,</b> že táto funkcia %s %s.",
+    "Password" : "Heslo"
+},
+"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/sk.json b/integrations/nextcloud/snappymail/l10n/sk.json
new file mode 100644
index 000000000..187d08f94
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sk.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-mail",
+    "Error" : "Chyba",
+    "Invalid argument(s)" : "Neplatný(é) argument(y)",
+    "Saved successfully" : "Úspešne uložené",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "Prejdite na správcovský panel SnappyMail Webmail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Používatelia sa budú prihlasovať manuálne alebo v osobných nastaveniach definujte prihlasovacie údaje pre automatické prihlásenie.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Pokúste sa automaticky prihlásiť používateľov pomocou ich používateľského mena a hesla Nextcloud alebo prihlasovacích údajov definovaných používateľom, ak sú nastavené.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Pokúste sa automaticky prihlásiť používateľov pomocou ich Nextcloud e-mailu a hesla alebo prihlasovacích údajov definovaných používateľom, ak sú nastavené.",
+    "Save" : "Uložiť",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail ešte nie je nastavený.",
+    "may have some" : "môže mať",
+    "security considerations" : "vplyv na bezpečnosť",
+    "Enter an email and password to auto-login to SnappyMail." : "Zadajte e-mail a heslo pre automatické prihlásenie do SnappyMail.",
+    "Password" : "Heslo"
+},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sl.js b/integrations/nextcloud/snappymail/l10n/sl.js
new file mode 100644
index 000000000..d71d07828
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sl.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Elektronski naslov",
+    "Error" : "Napaka",
+    "Invalid argument(s)" : "Neveljavni argumenti",
+    "Saved successfully" : "Uspešno shranjeno",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "Spletna pošta RainLoop",
+    "Go to RainLoop Webmail admin panel" : "Skoči na skrbniške nastavitve spletne pošte RainLoop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Uporabniki se lahko prijavijo ročno, ali pa določijo poverila med osebnimi nastavitvami za samodejne prijave.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Poskusi samodejno prijaviti uporabnike z uporabniškim imenom Nextcloud in geslom oziroma z uporabniško določenimi poverili, če so ta določena.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Poskusi samodejno prijaviti uporabnike z elektronskim naslovom in geslom oziroma z uporabniško določenimi poverili, če so ta določena.",
+    "Save" : "Shrani",
+    "RainLoop Webmail is not configured yet." : "Program RainLoop še ni nastavljen.",
+    "may have some" : "nekatere pomembne",
+    "security considerations" : "varnostne omejitve",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Vpišite elektronski naslov in geslo za samodejno vpisovanje v RainLoop. <b>Upoštevajte</b>, da ima ta zmožnost %s %s.",
+    "Password" : "Geslo"
+},
+"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/sl.json b/integrations/nextcloud/snappymail/l10n/sl.json
new file mode 100644
index 000000000..e6e6380e8
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sl.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Elektronski naslov",
+    "Error" : "Napaka",
+    "Invalid argument(s)" : "Neveljavni argumenti",
+    "Saved successfully" : "Uspešno shranjeno",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "Spletna pošta SnappyMail",
+    "Go to SnappyMail Webmail admin panel" : "Skoči na skrbniške nastavitve spletne pošte SnappyMail",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Uporabniki se lahko prijavijo ročno, ali pa določijo poverila med osebnimi nastavitvami za samodejne prijave.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Poskusi samodejno prijaviti uporabnike z uporabniškim imenom Nextcloud in geslom oziroma z uporabniško določenimi poverili, če so ta določena.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Poskusi samodejno prijaviti uporabnike z elektronskim naslovom in geslom oziroma z uporabniško določenimi poverili, če so ta določena.",
+    "Save" : "Shrani",
+    "SnappyMail Webmail is not configured yet." : "Program SnappyMail še ni nastavljen.",
+    "may have some" : "nekatere pomembne",
+    "security considerations" : "varnostne omejitve",
+    "Enter an email and password to auto-login to SnappyMail." : "Vpišite elektronski naslov in geslo za samodejno vpisovanje v SnappyMail.",
+    "Password" : "Geslo"
+},"pluralForm" :"nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sq.js b/integrations/nextcloud/snappymail/l10n/sq.js
new file mode 100644
index 000000000..b34e5079e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sq.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "Error",
+    "Save" : "Ruaj",
+    "Password" : "Fjalëkalim"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/sq.json b/integrations/nextcloud/snappymail/l10n/sq.json
new file mode 100644
index 000000000..2282f4eaf
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sq.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "Error",
+    "Save" : "Ruaj",
+    "Password" : "Fjalëkalim"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sr.js b/integrations/nextcloud/snappymail/l10n/sr.js
new file mode 100644
index 000000000..5a94fcefd
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sr.js
@@ -0,0 +1,13 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Е-пошта",
+    "Error" : "Грешка",
+    "Invalid argument(s)" : "Неисправни аргумент(и)",
+    "Saved successfully" : "Успешно сачувано",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop веб пошта",
+    "Save" : "Сачувај",
+    "Password" : "Лозинка"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/integrations/nextcloud/snappymail/l10n/sr.json b/integrations/nextcloud/snappymail/l10n/sr.json
new file mode 100644
index 000000000..ab499e9b3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sr.json
@@ -0,0 +1,11 @@
+{ "translations": {
+    "Email" : "Е-пошта",
+    "Error" : "Грешка",
+    "Invalid argument(s)" : "Неисправни аргумент(и)",
+    "Saved successfully" : "Успешно сачувано",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail веб пошта",
+    "Save" : "Сачувај",
+    "Password" : "Лозинка"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sr@latin.js b/integrations/nextcloud/snappymail/l10n/sr@latin.js
new file mode 100644
index 000000000..50b74728c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sr@latin.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "Error",
+    "Save" : "Sačuvaj",
+    "Password" : "Lozinka"
+},
+"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);");
diff --git a/integrations/nextcloud/snappymail/l10n/sr@latin.json b/integrations/nextcloud/snappymail/l10n/sr@latin.json
new file mode 100644
index 000000000..cbe0dca41
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sr@latin.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "Error",
+    "Save" : "Sačuvaj",
+    "Password" : "Lozinka"
+},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/sv.js b/integrations/nextcloud/snappymail/l10n/sv.js
new file mode 100644
index 000000000..12f367d6e
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sv.js
@@ -0,0 +1,10 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-post",
+    "Error" : "Fel",
+    "Go to RainLoop Webmail admin panel" : "Gå till administrationsdelen i Rainloop webbmejl",
+    "Save" : "Spara",
+    "Password" : "Lösenord"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/sv.json b/integrations/nextcloud/snappymail/l10n/sv.json
new file mode 100644
index 000000000..966bb9ea7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/sv.json
@@ -0,0 +1,8 @@
+{ "translations": {
+    "Email" : "E-post",
+    "Error" : "Fel",
+    "Go to SnappyMail Webmail admin panel" : "Gå till administrationsdelen i Rainloop webbmejl",
+    "Save" : "Spara",
+    "Password" : "Lösenord"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ta.js b/integrations/nextcloud/snappymail/l10n/ta.js
new file mode 100644
index 000000000..7d61ddeef
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ta.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "மின்னஞ்சல்",
+    "Error" : "வழு",
+    "Save" : "சேமிக்க ",
+    "Password" : "கடவுச்சொல்"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ta.json b/integrations/nextcloud/snappymail/l10n/ta.json
new file mode 100644
index 000000000..6de251069
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ta.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "மின்னஞ்சல்",
+    "Error" : "வழு",
+    "Save" : "சேமிக்க ",
+    "Password" : "கடவுச்சொல்"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/th.js b/integrations/nextcloud/snappymail/l10n/th.js
new file mode 100644
index 000000000..6f2158312
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/th.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "อีเมล",
+    "Error" : "ข้อผิดพลาด",
+    "Save" : "บันทึก",
+    "Password" : "รหัสผ่าน"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/th.json b/integrations/nextcloud/snappymail/l10n/th.json
new file mode 100644
index 000000000..eb7c2b03b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/th.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "อีเมล",
+    "Error" : "ข้อผิดพลาด",
+    "Save" : "บันทึก",
+    "Password" : "รหัสผ่าน"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/tk.js b/integrations/nextcloud/snappymail/l10n/tk.js
new file mode 100644
index 000000000..c86245bf7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/tk.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Error" : "ýalňyşlyk",
+    "Save" : "Saklamak",
+    "Password" : "Açarsöz"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/tk.json b/integrations/nextcloud/snappymail/l10n/tk.json
new file mode 100644
index 000000000..0c12f1908
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/tk.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "ýalňyşlyk",
+    "Save" : "Saklamak",
+    "Password" : "Açarsöz"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/tr.js b/integrations/nextcloud/snappymail/l10n/tr.js
new file mode 100644
index 000000000..adbdcb66f
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/tr.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "E-posta",
+    "Error" : "Hata",
+    "Invalid argument(s)" : "Parametre geçersiz",
+    "Saved successfully" : "Kaydedildi",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Basit, modern ve hızlı web tabanlı e-posta istemcisi. Nextcloud üzerinde etkinleştirdikten sonra, Nextcloud yönetim panosunda \"Ek ayarlar\" içinde \"RainLoop Webmail\" bağlantısını göreceksiniz. RainLoop yönetim panosuna gitmek için bağlantıya tıklayın. Varsayılan kullanıcı adı/parola, admin/12345 şeklindedir. Bu uygulamada RainLoop 1.16.0 (2021-05) sürümü temel alınmıştır.",
+    "Go to RainLoop Webmail admin panel" : "RainLoop Webmail yönetim panosuna git",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Kullanıcılar el ile oturum açar ya da oturumun otomatik olarak açılması için kişisel ayarlarından kimlik doğrulama bilgilerini belirtebilir.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Kullanıcıların oturumu, Nextcloud kullanıcı adı ve parolaları ile ya da ayarlanmış ise kullanıcının belirttiği kimlik doğrulama bilgileri ile otomatik olarak açılmaya çalışılır.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Kullanıcıların oturumu, Nextcloud e-posta adresi ve parolaları ile ya da ayarlanmış ise kullanıcının belirttiği kimlik doğrulama bilgileri ile otomatik olarak açılmaya çalışılır.",
+    "Save" : "Kaydet",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail henüz yapılandırılmamış.",
+    "may have some" : "içinde bazı",
+    "security considerations" : "güvenlik konuları bulunabilir",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "RainLoop oturumunun otomatik olarak açılması için bir e-posta adresi ve parola yazın. <b>Lütfen bu özelliği farkedin</b> %s%s",
+    "Password" : "Parola"
+},
+"nplurals=2; plural=(n > 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/tr.json b/integrations/nextcloud/snappymail/l10n/tr.json
new file mode 100644
index 000000000..5f5df5baa
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/tr.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "E-posta",
+    "Error" : "Hata",
+    "Invalid argument(s)" : "Parametre geçersiz",
+    "Saved successfully" : "Kaydedildi",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "SnappyMail Webmail yönetim panosuna git",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Kullanıcılar el ile oturum açar ya da oturumun otomatik olarak açılması için kişisel ayarlarından kimlik doğrulama bilgilerini belirtebilir.",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Kullanıcıların oturumu, Nextcloud kullanıcı adı ve parolaları ile ya da ayarlanmış ise kullanıcının belirttiği kimlik doğrulama bilgileri ile otomatik olarak açılmaya çalışılır.",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Kullanıcıların oturumu, Nextcloud e-posta adresi ve parolaları ile ya da ayarlanmış ise kullanıcının belirttiği kimlik doğrulama bilgileri ile otomatik olarak açılmaya çalışılır.",
+    "Save" : "Kaydet",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail henüz yapılandırılmamış.",
+    "may have some" : "içinde bazı",
+    "security considerations" : "güvenlik konuları bulunabilir",
+    "Enter an email and password to auto-login to SnappyMail." : "SnappyMail oturumunun otomatik olarak açılması için bir e-posta adresi ve parola yazın.",
+    "Password" : "Parola"
+},"pluralForm" :"nplurals=2; plural=(n > 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ug.js b/integrations/nextcloud/snappymail/l10n/ug.js
new file mode 100644
index 000000000..4c48f63de
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ug.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "تورخەت",
+    "Error" : "خاتالىق",
+    "Save" : "ساقلا",
+    "Password" : "ئىم"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ug.json b/integrations/nextcloud/snappymail/l10n/ug.json
new file mode 100644
index 000000000..21e9ad2f7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ug.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "تورخەت",
+    "Error" : "خاتالىق",
+    "Save" : "ساقلا",
+    "Password" : "ئىم"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/uk.js b/integrations/nextcloud/snappymail/l10n/uk.js
new file mode 100644
index 000000000..f84cc1fe1
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/uk.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Ел.пошта",
+    "Error" : "Помилка",
+    "Invalid argument(s)" : "Недопустимий аргумент(и)",
+    "Saved successfully" : "Збережено успішно",
+    "RainLoop" : "Rainloop",
+    "RainLoop Webmail" : "Поштовий вебклієнт Rainloop",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "Простий, сучасний та швидкий поштовий веб-клієнт. Після включення в Nextcloud перейдіть в адмін панель Nextcloud, \"Додаткові налаштування\" і побачите розділ \"Електронна пошта Rainloop\". Там натисніть на посилання, щоб перейти до адмін панелі Rainloop. За замовчуванням користувач/пароль - admin/12345. Ця версія базується на Rainloop 1.16.0 (2021-05).",
+    "Go to RainLoop Webmail admin panel" : "Перейти до панелі керування вебпошти Rainloop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Користувачі будуть входити в систему вручну або визначати облікові дані в особистих налаштуваннях для автоматичного входу. ",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Спроба автоматичного входу користувачів за допомогою їхнього імені користувача та пароля Nextcloud або визначених користувачем облікових даних, якщо вони встановлені. ",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Спроба автоматичного входу користувачів за допомогою їхньої електронної пошти та пароля Nextcloud або визначених користувачем облікових даних, якщо вони встановлені. ",
+    "Save" : "Зберегти",
+    "RainLoop Webmail is not configured yet." : "Поштовий клієнт Rainloop ще не налаштовано",
+    "may have some" : "може мати деякі",
+    "security considerations" : "проблеми з безпекою",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "Введіть електронну пошту та пароль для автоматичного входу в RainLoop. <b>Зверніть увагу</b> що ця можливість %s %s.",
+    "Password" : "Пароль"
+},
+"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);");
diff --git a/integrations/nextcloud/snappymail/l10n/uk.json b/integrations/nextcloud/snappymail/l10n/uk.json
new file mode 100644
index 000000000..3040ed9f3
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/uk.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "Ел.пошта",
+    "Error" : "Помилка",
+    "Invalid argument(s)" : "Недопустимий аргумент(и)",
+    "Saved successfully" : "Збережено успішно",
+    "SnappyMail" : "Rainloop",
+    "SnappyMail Webmail" : "Поштовий вебклієнт Rainloop",
+    "Go to SnappyMail Webmail admin panel" : "Перейти до панелі керування вебпошти Rainloop",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "Користувачі будуть входити в систему вручну або визначати облікові дані в особистих налаштуваннях для автоматичного входу. ",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "Спроба автоматичного входу користувачів за допомогою їхнього імені користувача та пароля Nextcloud або визначених користувачем облікових даних, якщо вони встановлені. ",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "Спроба автоматичного входу користувачів за допомогою їхньої електронної пошти та пароля Nextcloud або визначених користувачем облікових даних, якщо вони встановлені. ",
+    "Save" : "Зберегти",
+    "SnappyMail Webmail is not configured yet." : "Поштовий клієнт Rainloop ще не налаштовано",
+    "may have some" : "може мати деякі",
+    "security considerations" : "проблеми з безпекою",
+    "Enter an email and password to auto-login to SnappyMail." : "Введіть електронну пошту та пароль для автоматичного входу в SnappyMail.",
+    "Password" : "Пароль"
+},"pluralForm" :"nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/ur_PK.js b/integrations/nextcloud/snappymail/l10n/ur_PK.js
new file mode 100644
index 000000000..359b08d08
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ur_PK.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "email",
+    "Error" : "ایرر",
+    "Save" : "حفظ",
+    "Password" : "پاسورڈ"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/nextcloud/snappymail/l10n/ur_PK.json b/integrations/nextcloud/snappymail/l10n/ur_PK.json
new file mode 100644
index 000000000..e73bd3932
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/ur_PK.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "email",
+    "Error" : "ایرر",
+    "Save" : "حفظ",
+    "Password" : "پاسورڈ"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/uz.js b/integrations/nextcloud/snappymail/l10n/uz.js
new file mode 100644
index 000000000..2b0fd064c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/uz.js
@@ -0,0 +1,8 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Error" : "Error",
+    "Save" : "Save",
+    "Password" : "Password"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/uz.json b/integrations/nextcloud/snappymail/l10n/uz.json
new file mode 100644
index 000000000..9628cddeb
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/uz.json
@@ -0,0 +1,6 @@
+{ "translations": {
+    "Error" : "Error",
+    "Save" : "Save",
+    "Password" : "Password"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/vi.js b/integrations/nextcloud/snappymail/l10n/vi.js
new file mode 100644
index 000000000..14dd91754
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/vi.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Thư điện tử",
+    "Error" : "Lỗi",
+    "Save" : "Lưu",
+    "Password" : "Mật khẩu"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/vi.json b/integrations/nextcloud/snappymail/l10n/vi.json
new file mode 100644
index 000000000..1e2cad36d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/vi.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Thư điện tử",
+    "Error" : "Lỗi",
+    "Save" : "Lưu",
+    "Password" : "Mật khẩu"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/zh_CN.js b/integrations/nextcloud/snappymail/l10n/zh_CN.js
new file mode 100644
index 000000000..4811b57ba
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_CN.js
@@ -0,0 +1,21 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "电子邮箱",
+    "Error" : "错误",
+    "Invalid argument(s)" : "一个（或多个）无效参数",
+    "Saved successfully" : "已成功保存",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop 网页邮箱",
+    "Go to RainLoop Webmail admin panel" : "转到 RainLoop 网页邮箱管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "用户将手动登录，或在其个人设置中定义凭据以自动登录。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "尝试使用其 Nextcloud 用户名和密码或用户定义的凭据（如果设置）自动登录。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "尝试使用其 Nextcloud 电子邮件和密码或用户定义的凭据（如果设置）自动登录。",
+    "Save" : "保存",
+    "RainLoop Webmail is not configured yet." : "RainLoop 网页邮箱尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考量",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "输入电子邮件和密码以自动登录到 RainLoop。<b>请注意</b>，此功能%s%s。",
+    "Password" : "密码"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/zh_CN.json b/integrations/nextcloud/snappymail/l10n/zh_CN.json
new file mode 100644
index 000000000..7aef5a2c7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_CN.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "电子邮箱",
+    "Error" : "错误",
+    "Invalid argument(s)" : "一个（或多个）无效参数",
+    "Saved successfully" : "已成功保存",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail 网页邮箱",
+    "Go to SnappyMail Webmail admin panel" : "转到 SnappyMail 网页邮箱管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "用户将手动登录，或在其个人设置中定义凭据以自动登录。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "尝试使用其 Nextcloud 用户名和密码或用户定义的凭据（如果设置）自动登录。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "尝试使用其 Nextcloud 电子邮件和密码或用户定义的凭据（如果设置）自动登录。",
+    "Save" : "保存",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail 网页邮箱尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考量",
+    "Enter an email and password to auto-login to SnappyMail." : "输入电子邮件和密码以自动登录到 SnappyMail。",
+    "Password" : "密码"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/zh_HK.js b/integrations/nextcloud/snappymail/l10n/zh_HK.js
new file mode 100644
index 000000000..c5414de9c
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_HK.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "電郵地址",
+    "Error" : "錯誤",
+    "Invalid argument(s)" : "無效的參數",
+    "Saved successfully" : "保存成功",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "簡單、現代和快速的 Web-based 電郵客戶端。在 Nextcloud 中啟用後，轉到 Nextcloud 管理面板的“其他設置”，您將看到“ Rainloop webmail”部分。在那裡，單擊連結轉到 Rainloop 管理面板。默認用戶/密碼是 admin/12345。此版本基於 Rainloop 1.16.0（2021-05）。",
+    "Go to RainLoop Webmail admin panel" : "轉到 RainLoop Webmail 管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "用戶將手動登入，或在其個人設置中定義身分驗證以自動登入。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "嘗試使用其Nextcloud用戶名和密碼或用戶定義的身分驗證（如果設置）自動登入用戶。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "嘗試使用其Nextcloud電子郵件和密碼或用戶定義的身分驗證（如果設置）自動登入用戶。",
+    "Save" : "儲存",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考慮",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "輸入電子郵件和密碼以自動登入到RainLoop。<b>請注意</b>此功能%s%s。",
+    "Password" : "密碼"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/zh_HK.json b/integrations/nextcloud/snappymail/l10n/zh_HK.json
new file mode 100644
index 000000000..4b7eebae7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_HK.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "電郵地址",
+    "Error" : "錯誤",
+    "Invalid argument(s)" : "無效的參數",
+    "Saved successfully" : "保存成功",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "轉到 SnappyMail Webmail 管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "用戶將手動登入，或在其個人設置中定義身分驗證以自動登入。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "嘗試使用其Nextcloud用戶名和密碼或用戶定義的身分驗證（如果設置）自動登入用戶。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "嘗試使用其Nextcloud電子郵件和密碼或用戶定義的身分驗證（如果設置）自動登入用戶。",
+    "Save" : "儲存",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考慮",
+    "Enter an email and password to auto-login to SnappyMail." : "輸入電子郵件和密碼以自動登入到SnappyMail。",
+    "Password" : "密碼"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/l10n/zh_TW.js b/integrations/nextcloud/snappymail/l10n/zh_TW.js
new file mode 100644
index 000000000..598277ba9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_TW.js
@@ -0,0 +1,22 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "電子郵件",
+    "Error" : "錯誤",
+    "Invalid argument(s)" : "無效的參數",
+    "Saved successfully" : "已成功儲存",
+    "RainLoop" : "RainLoop",
+    "RainLoop Webmail" : "RainLoop Webmail",
+    "Simple, modern and fast web-based email client. After enabling in Nextcloud, go to Nextcloud admin panel, \"Additionnal settings\" and you will see a \"Rainloop webmail\" section. There, click on the link to go to the Rainloop admin panel. The default user/password is admin/12345. This version is based on Rainloop 1.16.0 (2021-05)." : "簡潔、現代且快速的以網路為基礎的電子郵件客戶端。在 Nextcloud 中啟用後，前往 Nextcloud 的管理面板，其中有個「其他設定」，您將會在此看到「Rainloop webmail」區塊。請在該處點擊連結前往 Rainloop 管理面板。預設的使用者名稱與密碼組合為 admin/12345。此版本是以 Rainloop 1.16.0 (2021-05) 為基礎。",
+    "Go to RainLoop Webmail admin panel" : "前往 RainLoop Webmail 管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "使用者將手動登入，或在其個人設定中定義憑證以自動登入。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "嘗試使用其 Nextcloud 使用者名和密碼或使用者定義的身分驗證（如果設定）自動登入使用者。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "嘗試使用其 Nextcloud 電子郵件和密碼或使用者定義的憑證（如果設定）自動登入使用者。",
+    "Save" : "儲存",
+    "RainLoop Webmail is not configured yet." : "RainLoop Webmail 尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考量",
+    "Enter an email and password to auto-login to RainLoop. <b>Please note</b> that this feature %s %s." : "輸入電子郵件和密碼以自動登入到 RainLoop。<b>請注意</b>此功能%s%s。",
+    "Password" : "密碼"
+},
+"nplurals=1; plural=0;");
diff --git a/integrations/nextcloud/snappymail/l10n/zh_TW.json b/integrations/nextcloud/snappymail/l10n/zh_TW.json
new file mode 100644
index 000000000..1b71c0676
--- /dev/null
+++ b/integrations/nextcloud/snappymail/l10n/zh_TW.json
@@ -0,0 +1,19 @@
+{ "translations": {
+    "Email" : "電子郵件",
+    "Error" : "錯誤",
+    "Invalid argument(s)" : "無效的參數",
+    "Saved successfully" : "已成功儲存",
+    "SnappyMail" : "SnappyMail",
+    "SnappyMail Webmail" : "SnappyMail Webmail",
+    "Go to SnappyMail Webmail admin panel" : "前往 SnappyMail Webmail 管理面板",
+    "Users will login manually, or define credentials in their personal settings for automatic logins." : "使用者將手動登入，或在其個人設定中定義憑證以自動登入。",
+    "Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set." : "嘗試使用其 Nextcloud 使用者名和密碼或使用者定義的身分驗證（如果設定）自動登入使用者。",
+    "Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set." : "嘗試使用其 Nextcloud 電子郵件和密碼或使用者定義的憑證（如果設定）自動登入使用者。",
+    "Save" : "儲存",
+    "SnappyMail Webmail is not configured yet." : "SnappyMail Webmail 尚未配置。",
+    "may have some" : "可能有一些",
+    "security considerations" : "安全考量",
+    "Enter an email and password to auto-login to SnappyMail." : "輸入電子郵件和密碼以自動登入到 SnappyMail。",
+    "Password" : "密碼"
+},"pluralForm" :"nplurals=1; plural=0;"
+}
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
index d1d81e6bd..ce417562a 100644
--- a/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
+++ b/integrations/nextcloud/snappymail/lib/AppInfo/Application.php
@@ -3,45 +3,54 @@
 namespace OCA\SnappyMail\AppInfo;
 
 use OCA\SnappyMail\Util\SnappyMailHelper;
-use OCA\SnappyMail\Controller\AjaxController;
+use OCA\SnappyMail\Controller\FetchController;
 use OCA\SnappyMail\Controller\PageController;
+use OCA\SnappyMail\Search\Provider;
+use OCA\SnappyMail\Listeners\AccessTokenUpdatedListener;
 
 use OCP\AppFramework\App;
-use OCP\IL10N;
-use OCP\IUser;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\User\Events\PostLoginEvent;
+use OCP\User\Events\BeforeUserLoggedOutEvent;
 
-class Application extends App {
+use OCA\OIDCLogin\Events\AccessTokenUpdatedEvent;
 
-	public function __construct(array $urlParams = []) {
-		parent::__construct('snappymail', $urlParams);
+use Psr\Container\ContainerInterface;
 
-		$container = $this->getContainer();
-		$server = $container->getServer();
-		$config = $server->getConfig();
+class Application extends App implements IBootstrap
+{
+	public const APP_ID = 'snappymail';
+
+	public function __construct(array $urlParams = [])
+	{
+		parent::__construct(self::APP_ID, $urlParams);
+	}
+
+	public function register(IRegistrationContext $context): void
+	{
+//		SnappyMailHelper::$server = $c->query('ServerContainer');
 
 		/**
 		 * Controllers
 		 */
-		$container->registerService(
-			'PageController', function($c) {
+		$context->registerService(
+			'PageController', function(ContainerInterface $c) {
 				return new PageController(
 					$c->query('AppName'),
 					$c->query('Request'),
-					$c->getServer()->getAppManager(),
-					$c->query('ServerContainer')->getConfig(),
-					$c->getServer()->getSession()
+					$c
 				);
 			}
 		);
 
-		$container->registerService(
-			'AjaxController', function($c) {
-				return new AjaxController(
+		$context->registerService(
+			'FetchController', function(ContainerInterface $c) {
+				return new FetchController(
 					$c->query('AppName'),
 					$c->query('Request'),
-					$c->getServer()->getAppManager(),
-					$c->query('ServerContainer')->getConfig(),
-					$c->query(IL10N::class)
+					$c
 				);
 			}
 		);
@@ -49,39 +58,65 @@ class Application extends App {
 		/**
 		 * Utils
 		 */
-		$container->registerService(
+		$context->registerService(
 			'SnappyMailHelper', function($c) {
-				return new SnappyMailHelper(
-					$c->getServer()->getConfig(),
-					$c->getServer()->getUserSession(),
-					$c->getServer()->getAppManager(),
-					$c->getServer()->getSession()
-				);
+				return new SnappyMailHelper();
 			}
 		);
 
-		// Add script js/snappymail.js
-		\OCP\Util::addScript('snappymail', 'snappymail');
+		$context->registerSearchProvider(Provider::class);
+		$context->registerEventListener(AccessTokenUpdatedEvent::class, AccessTokenUpdatedListener::class);
+
+		// TODO: Not working yet, needs a Vue UI
+//		$context->registerDashboardWidget(\OCA\SnappyMail\Dashboard\UnreadMailWidget::class);
 	}
 
-	public function registerNavigation() {
-		$container = $this->getContainer();
+	public function boot(IBootContext $context): void
+	{
+//		SnappyMailHelper::$server = $context->getServerContainer();
 
-		$container->query('OCP\INavigationManager')->add(function () use ($container) {
-			$urlGenerator = $container->query('OCP\IURLGenerator');
-			return [
-				'id' => 'snappymail',
-				'order' => 10,
-				'href' => $urlGenerator->linkToRoute('snappymail.page.index'),
-				'icon' => $urlGenerator->imagePath('snappymail', 'logo-64x64.png'),
-				'name' => \OCP\Util::getL10N('snappymail')->t('Email')
-			];
+		if (!\is_dir(\rtrim(\trim(SnappyMailHelper::getSystemConfigValue('datadirectory', '')), '\\/') . '/appdata_snappymail')) {
+			return;
+		}
+
+		$dispatcher = $context->getAppContainer()->query(\OCP\EventDispatcher\IEventDispatcher::class);
+		$dispatcher->addListener(PostLoginEvent::class, function (PostLoginEvent $Event) {
+/*
+			// Only store the user's password in the current session if they have
+			// enabled auto-login using Nextcloud username or email address.
+			if (SnappyMailHelper::getAppConfigValue('snappymail-autologin', false)
+			 || SnappyMailHelper::getAppConfigValue('snappymail-autologin-with-email', false)) {
+*/
+				$sUID = $Event->getUser()->getUID();
+				SnappyMailHelper::setSessionValue('snappymail-nc-uid', $sUID);
+				SnappyMailHelper::setSessionValue('snappymail-passphrase', SnappyMailHelper::encodePassword($Event->getPassword(), $sUID));
+/*
+			}
+*/
 		});
-	}
 
-	public function registerPersonalSettings() {
-		\OCP\App::registerPersonal('snappymail', 'templates/personal');
-	}
+		$dispatcher->addListener(BeforeUserLoggedOutEvent::class, function (BeforeUserLoggedOutEvent $Event) {
+			// https://github.com/nextcloud/server/issues/36083#issuecomment-1387370634
+//			SnappyMailHelper::setSessionValue('snappymail-passphrase', '');
+			SnappyMailHelper::loadApp();
+//			\RainLoop\Api::Actions()->Logout(true);
+			\RainLoop\Api::Actions()->DoLogout();
+		});
 
+		// https://github.com/nextcloud/impersonate/issues/179
+		// https://github.com/nextcloud/impersonate/pull/180
+		$class = 'OCA\Impersonate\Events\BeginImpersonateEvent';
+		if (\class_exists($class)) {
+			$dispatcher->addListener($class, function ($Event) {
+				SnappyMailHelper::setSessionValue('snappymail-passphrase', '');
+				SnappyMailHelper::loadApp();
+				\RainLoop\Api::Actions()->Logout(true);
+			});
+			$dispatcher->addListener('OCA\Impersonate\Events\EndImpersonateEvent', function ($Event) {
+				SnappyMailHelper::setSessionValue('snappymail-passphrase', '');
+				SnappyMailHelper::loadApp();
+				\RainLoop\Api::Actions()->Logout(true);
+			});
+		}
+	}
 }
-
diff --git a/integrations/nextcloud/snappymail/lib/Command/Settings.php b/integrations/nextcloud/snappymail/lib/Command/Settings.php
new file mode 100644
index 000000000..2843d9f3b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Command/Settings.php
@@ -0,0 +1,70 @@
+<?php
+
+namespace OCA\SnappyMail\Command;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCP\IConfig;
+use OCP\IUserManager;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class Settings extends Command
+{
+	protected IUserManager $userManager;
+	protected IConfig $config;
+
+	public function __construct(IUserManager $userManager, IConfig $config) {
+		parent::__construct();
+		$this->userManager = $userManager;
+		$this->config = $config;
+	}
+
+	protected function configure() {
+		$this
+			->setName('snappymail:settings')
+			->setDescription('modifies configuration')
+			->addArgument(
+				'uid',
+				InputArgument::REQUIRED,
+				'User ID used to login'
+			)
+			->addArgument(
+				'user',
+				InputArgument::REQUIRED,
+				'The login username'
+			)
+			->addArgument(
+				'pass',
+				InputArgument::OPTIONAL,
+				'The login passphrase'
+			)
+		;
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$uid = $input->getArgument('uid');
+		if (!$this->userManager->userExists($uid)) {
+			$output->writeln('<error>The user "' . $uid . '" does not exist.</error>');
+			return 1;
+		}
+
+		$sEmail = $input->getArgument('user');
+		$this->config->setUserValue($uid, 'snappymail', 'snappymail-email', $sEmail);
+
+		$sPass = $input->getArgument('pass');
+		if (empty($sPass)) {
+			// Prompt on command line for value
+			if (\is_callable('readline')) {
+				$sPass = \readline("password: ");
+			} else {
+				echo "password: ";
+				$sPass = \stream_get_line(STDIN, 1024, PHP_EOL);
+			}
+		}
+		$sPass = ($sEmail && $sPass) ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : '';
+		$this->config->setUserValue($uid, 'snappymail', 'passphrase', $sPass);
+		return 0;
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
new file mode 100644
index 000000000..55df22c7b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/ContentSecurityPolicy.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace OCA\SnappyMail;
+
+class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy {
+
+	/** @var bool Whether inline JS snippets are allowed */
+	protected $inlineScriptAllowed = false;
+	/** @var bool Whether eval in JS scripts is allowed */
+	protected $evalScriptAllowed = true;
+	/** @var bool Whether strict-dynamic should be set */
+//	protected $strictDynamicAllowed = true; // NC24+
+	/** @var bool Whether inline CSS is allowed */
+	protected $inlineStyleAllowed = true;
+
+	function __construct() {
+		$CSP = \RainLoop\Api::getCSP();
+
+		$this->allowedScriptDomains = \array_unique(\array_merge($this->allowedScriptDomains, $CSP->get('script-src')));
+		$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'unsafe-inline'", "'unsafe-eval'"]);
+
+		// Nextcloud only sets 'strict-dynamic' when browserSupportsCspV3() ?
+		\method_exists($this, 'useStrictDynamic')
+			? $this->useStrictDynamic(true) // NC24+
+			: $this->addAllowedScriptDomain("'strict-dynamic'");
+
+		$this->allowedImageDomains = \array_unique(\array_merge($this->allowedImageDomains, $CSP->get('img-src')));
+
+		$this->allowedStyleDomains = \array_unique(\array_merge($this->allowedStyleDomains, $CSP->get('style-src')));
+		$this->allowedStyleDomains = \array_diff($this->allowedStyleDomains, ["'unsafe-inline'"]);
+
+		$this->allowedFrameDomains = \array_unique(\array_merge($this->allowedFrameDomains, $CSP->get('frame-src')));
+
+		$this->reportTo = \array_unique(\array_merge($this->reportTo, $CSP->report_to));
+	}
+
+	public function getSnappyMailNonce() {
+		static $sNonce;
+		if (!$sNonce) {
+			$cspManager = (\method_exists(\OC::$server, 'getContentSecurityPolicyNonceManager')
+				? \OC::$server->getContentSecurityPolicyNonceManager()
+				// Nextcloud 34+
+				: \OCP\Server::get(\OC\Security\CSP\ContentSecurityPolicyNonceManager::class)
+			);
+			$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
+			if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
+				$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
+			}
+		}
+		return $sNonce;
+	}
+
+}
diff --git a/integrations/nextcloud/snappymail/lib/Controller/FetchController.php b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
new file mode 100644
index 000000000..66d3724e9
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Controller/FetchController.php
@@ -0,0 +1,152 @@
+<?php
+
+namespace OCA\SnappyMail\Controller;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+
+use OCP\App\IAppManager;
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\JSONResponse;
+use OCP\IConfig;
+use OCP\IL10N;
+use OCP\IRequest;
+
+class FetchController extends Controller
+{
+	private IConfig $config;
+	private IL10N $l10n;
+
+	public function __construct(string $appName, IRequest $request, \Psr\Container\ContainerInterface $container)
+	{
+		parent::__construct($appName, $request);
+		$this->config = $container->query(IConfig::class);
+		$this->l10n = $container->query(IL10N::class);
+	}
+
+	public function upgrade(): JSONResponse
+	{
+		$error = 'Upgrade failed';
+		try {
+			SnappyMailHelper::loadApp();
+			if (\SnappyMail\Upgrade::core()) {
+				return new JSONResponse([
+					'status' => 'success',
+					'Message' => $this->l10n->t('Upgraded successfully')
+				]);
+			}
+		} catch (Exception $e) {
+			$error .= ': ' . $e->getMessage();
+		}
+		return new JSONResponse([
+			'status' => 'error',
+			'Message' => $error
+		]);
+	}
+
+	public function setAdmin(): JSONResponse
+	{
+		try {
+			$sUrl = '';
+			$sPath = '';
+
+			if (isset($_POST['appname']) && 'snappymail' === $_POST['appname']) {
+				$this->config->setAppValue('snappymail', 'snappymail-autologin',
+					isset($_POST['snappymail-autologin']) ? '1' === $_POST['snappymail-autologin'] : false);
+				$this->config->setAppValue('snappymail', 'snappymail-autologin-with-email',
+					isset($_POST['snappymail-autologin']) ? '2' === $_POST['snappymail-autologin'] : false);
+				$this->config->setAppValue('snappymail', 'snappymail-no-embed', isset($_POST['snappymail-no-embed']));
+				$this->config->setAppValue('snappymail', 'snappymail-autologin-oidc', isset($_POST['snappymail-autologin-oidc']));
+			} else {
+				return new JSONResponse([
+					'status' => 'error',
+					'Message' => $this->l10n->t('Invalid argument(s)')
+				]);
+			}
+
+			SnappyMailHelper::loadApp();
+
+			$oConfig = \RainLoop\Api::Config();
+			if (!empty($_POST['snappymail-app_path'])) {
+				$oConfig->Set('webmail', 'app_path', $_POST['snappymail-app_path']);
+			}
+			$oConfig->Set('webmail', 'allow_languages_on_settings', empty($_POST['snappymail-nc-lang']));
+			$oConfig->Set('login', 'allow_languages_on_login', empty($_POST['snappymail-nc-lang']));
+			$oConfig->Save();
+
+			if (!empty($_POST['import-rainloop'])) {
+				return new JSONResponse([
+					'status' => 'success',
+					'Message' => \implode("\n", \OCA\SnappyMail\Util\RainLoop::import())
+				]);
+			}
+
+			$debug = !empty($_POST['snappymail-debug']);
+			$oConfig = \RainLoop\Api::Config();
+			if ($debug != $oConfig->Get('debug', 'enable', false)) {
+				$oConfig->Set('debug', 'enable', $debug);
+				$oConfig->Save();
+			}
+
+			return new JSONResponse([
+				'status' => 'success',
+				'Message' => $this->l10n->t('Saved successfully')
+			]);
+		} catch (Exception $e) {
+			return new JSONResponse([
+				'status' => 'error',
+				'Message' => $e->getMessage()
+			]);
+		}
+	}
+
+	/**
+	 * @NoAdminRequired
+	 */
+	public function setPersonal(): JSONResponse
+	{
+		try {
+			$sEmail = '';
+			if (isset($_POST['appname'], $_POST['snappymail-password'], $_POST['snappymail-email']) && 'snappymail' === $_POST['appname']) {
+				$sUser = SnappyMailHelper::getUID();
+//				$sUser = $this->userSession->getUser()?->getUID();
+				if ($sUser) {
+					$sEmail = $_POST['snappymail-email'];
+					$this->config->setUserValue($sUser, 'snappymail', 'snappymail-email', $sEmail);
+
+					$sPass = $_POST['snappymail-password'];
+					if ('******' !== $sPass) {
+						$this->config->setUserValue($sUser, 'snappymail', 'passphrase',
+							$sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sEmail)) : '');
+					}
+				}
+			} else {
+				return new JSONResponse([
+					'status' => 'error',
+					'Message' => $this->l10n->t('Invalid argument(s)'),
+					'Email' => $sEmail
+				]);
+			}
+
+			// Logout as the credentials have changed
+			SnappyMailHelper::loadApp();
+			\RainLoop\Api::Actions()->DoLogout();
+
+			return new JSONResponse([
+				'status' => 'success',
+				'Message' => $this->l10n->t('Saved successfully'),
+				'Email' => $sEmail
+			]);
+		} catch (Exception $e) {
+			// Logout as the credentials might have changed, as exception could be in one attribute
+			// TODO: Handle both exceptions separately?
+			SnappyMailHelper::loadApp();
+			\RainLoop\Api::Actions()->DoLogout();
+
+			return new JSONResponse([
+				'status' => 'error',
+				'Message' => $e->getMessage()
+			]);
+		}
+	}
+}
+
diff --git a/integrations/nextcloud/snappymail/lib/Controller/PageController.php b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
index 2279430e3..e78b3d5fc 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/PageController.php
+++ b/integrations/nextcloud/snappymail/lib/Controller/PageController.php
@@ -3,49 +3,98 @@
 namespace OCA\SnappyMail\Controller;
 
 use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCA\SnappyMail\ContentSecurityPolicy;
 
-use OCP\App\IAppManager;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Http\ContentSecurityPolicy;
 use OCP\AppFramework\Http\TemplateResponse;
+
 use OCP\IConfig;
+use OCP\INavigationManager;
 use OCP\IRequest;
-use OCP\ISession;
 
-class PageController extends Controller {
-	private $userId;
-	private $config;
-	private $appManager;
-	private $appPath;
-	private $session;
+class PageController extends Controller
+{
+	private IConfig $config;
+	private INavigationManager $navigationManager;
 
-	public function __construct($AppName, IRequest $request, IAppManager $appManager, IConfig $config, ISession $session) {
-		parent::__construct($AppName, $request);
-		$this->appPath = $appManager->getAppPath('snappymail');
-		$this->config = $config;
-		$this->appManager = $appManager;
-		$this->session = $session;
+	public function __construct($appName, IRequest $request, \Psr\Container\ContainerInterface $container)
+	{
+		parent::__construct($appName, $request);
+		$this->config = $container->query(IConfig::class);
+		$this->navigationManager = $container->query(INavigationManager::class);
 	}
 
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function index() {
-		\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
+	public function index()
+	{
+		$bAdmin = false;
+		if (!empty($_SERVER['QUERY_STRING'])) {
+			SnappyMailHelper::loadApp();
+			$bAdmin = \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin') == $_SERVER['QUERY_STRING'];
+			if (!$bAdmin) {
+				return SnappyMailHelper::startApp(true);
+			}
+		}
 
-		\OCP\Util::addStyle('snappymail', 'style');
+		if (!$bAdmin && SnappyMailHelper::getAppConfigValue('snappymail-no-embed')) {
+			$this->navigationManager->setActiveEntry('snappymail');
+			\OCP\Util::addScript('snappymail', 'snappymail');
+			\OCP\Util::addStyle('snappymail', 'style');
+			SnappyMailHelper::startApp();
+			$response = new TemplateResponse('snappymail', 'index', [
+				'snappymail-iframe-url' => SnappyMailHelper::normalizeUrl(SnappyMailHelper::getAppUrl())
+					. (empty($_GET['target']) ? '' : "#{$_GET['target']}")
+			]);
+			$csp = new ContentSecurityPolicy();
+			$csp->addAllowedFrameDomain("'self'");
+//			$csp->addAllowedFrameAncestorDomain("'self'");
+			$response->setContentSecurityPolicy($csp);
+			return $response;
+		}
 
-		$sUrl = SnappyMailHelper::normalizeUrl(SnappyMailHelper::getAppUrl());
+		$this->navigationManager->setActiveEntry('snappymail');
 
-		$params = [
-			'snappymail-iframe-url' => SnappyMailHelper::normalizeUrl($sUrl).'?OwnCloudAuth'
-		];
+		\OCP\Util::addStyle('snappymail', 'embed');
 
-		$response = new TemplateResponse('snappymail', 'index', $params);
+		SnappyMailHelper::startApp();
+		$oConfig = \RainLoop\Api::Config();
+		$oActions = $bAdmin ? new \RainLoop\ActionsAdmin() : \RainLoop\Api::Actions();
+		$oHttp = \MailSo\Base\Http::SingletonInstance();
+		$oServiceActions = new \RainLoop\ServiceActions($oHttp, $oActions);
+		$sAppJsMin = $oConfig->Get('debug', 'javascript', false) ? '' : '.min';
+		$sAppCssMin = $oConfig->Get('debug', 'css', false) ? '' : '.min';
+		$sLanguage = $oActions->GetLanguage(false);
 
 		$csp = new ContentSecurityPolicy();
-		$csp->addAllowedFrameDomain("'self'");
+		$sNonce = $csp->getSnappyMailNonce();
+
+		$params = [
+			'Admin' => $bAdmin ? 1 : 0,
+			'LoadingDescriptionEsc' => \htmlspecialchars($oConfig->Get('webmail', 'loading_description', 'SnappyMail'), ENT_QUOTES|ENT_IGNORE, 'UTF-8'),
+			'BaseTemplates' => \RainLoop\Utils::ClearHtmlOutput($oServiceActions->compileTemplates($bAdmin)),
+			'BaseAppBootScript' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin.'.js'),
+			'BaseAppBootScriptNonce' => $sNonce,
+			'BaseLanguage' => $oActions->compileLanguage($sLanguage, $bAdmin),
+			'BaseAppBootCss' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'),
+			'BaseAppThemeCss' => \preg_replace(
+				'/\\s*([:;{},]+)\\s*/s',
+				'$1',
+				$oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin)
+			)
+		];
+
+//		\OCP\Util::addScript('snappymail', '../app/snappymail/v/'.APP_VERSION.'/static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin);
+
+		// Nextcloud html encodes, so addHeader('style') is not possible
+//		\OCP\Util::addHeader('style', ['id'=>'app-boot-css'], \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'));
+		\OCP\Util::addHeader('link', ['type'=>'text/css','rel'=>'stylesheet','href'=>\RainLoop\Utils::WebStaticPath('css/'.($bAdmin?'admin':'app').$sAppCssMin.'.css')], '');
+//		\OCP\Util::addHeader('style', ['id'=>'app-theme-style','data-href'=>$params['BaseAppThemeCssLink']], $params['BaseAppThemeCss']);
+
+		$response = new TemplateResponse('snappymail', 'index_embed', $params);
+
 		$response->setContentSecurityPolicy($csp);
 
 		return $response;
@@ -55,56 +104,26 @@ class PageController extends Controller {
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function appGet() {
-		$this->app();
+	public function appGet()
+	{
+		return SnappyMailHelper::startApp(true);
 	}
 
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
 	 */
-	public function appPost() {
-		$this->app();
+	public function appPost()
+	{
+		return SnappyMailHelper::startApp(true);
 	}
 
-	public function app() {
-
-		SnappyMailHelper::regSnappyMailDataFunction();
-
-		if (isset($_GET['OwnCloudAuth'])) {
-			$sEmail = '';
-			$sEncodedPassword = '';
-
-			$sUser = \OC::$server->getUserSession()->getUser()->getUID();
-
-			if ($this->config->getAppValue('snappymail', 'snappymail-autologin', false)) {
-				$sEmail = $sUser;
-				$sPasswordSalt = $sUser;
-				$sEncodedPassword = $this->session['snappymail-autologin-password'];
-			} else if ($this->config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
-				$sEmail = $this->config->getUserValue($sUser, 'settings', 'email', '');
-				$sPasswordSalt = $sUser;
-				$sEncodedPassword = $this->session['snappymail-autologin-password'];
-			}
-
-			// If the user has set credentials for SnappyMail in their personal
-			// settings, override everything before and use those instead.
-			$sIndividualEmail = $this->config->getUserValue($sUser, 'snappymail', 'snappymail-email', '');
-			if ($sIndividualEmail) {
-				$sEmail = $sIndividualEmail;
-				$sPasswordSalt = $sEmail;
-				$sEncodedPassword = $this->config->getUserValue($sUser, 'snappymail', 'snappymail-password', '');
-			}
-
-			$sDecodedPassword = SnappyMailHelper::decodePassword($sEncodedPassword, md5($sPasswordSalt));
-
-			$_ENV['___snappymail_owncloud_email'] = $sEmail;
-			$_ENV['___snappymail_owncloud_password'] = $sDecodedPassword;
-		}
-
-		include $this->appPath . '/app/index.php';
-
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function indexPost()
+	{
+		return SnappyMailHelper::startApp(true);
 	}
-
 }
-
diff --git a/integrations/nextcloud/snappymail/lib/Dashboard/UnreadMailWidget.php b/integrations/nextcloud/snappymail/lib/Dashboard/UnreadMailWidget.php
new file mode 100644
index 000000000..e9d996bbc
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Dashboard/UnreadMailWidget.php
@@ -0,0 +1,171 @@
+<?php
+
+namespace OCA\SnappyMail\Dashboard;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+
+use OCP\AppFramework\Services\IInitialState;
+use OCP\Dashboard\IAPIWidget;
+use OCP\Dashboard\IIconWidget;
+use OCP\Dashboard\IOptionWidget;
+use OCP\Dashboard\Model\WidgetItem;
+use OCP\Dashboard\Model\WidgetOptions;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+//use OCP\Util;
+
+class UnreadMailWidget implements IAPIWidget, IIconWidget/*, IOptionWidget*/
+{
+	protected IL10N $l10n;
+	protected IURLGenerator $urlGenerator;
+	protected IInitialState $initialState;
+
+	public function __construct(IL10N $l10n, IURLGenerator $urlGenerator,
+		IInitialState $initialState,
+		?string $userId)
+	{
+		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
+		$this->initialState = $initialState;
+		$this->userId = $userId;
+	}
+
+	// IWidget
+
+	/**
+	 * @return string Unique id that identifies the widget, e.g. the app id
+	 * @since 20.0.0
+	 */
+	public function getId(): string
+	{
+		return 'snappymail-unread';
+	}
+
+	/**
+	 * @return string User facing title of the widget
+	 * @since 20.0.0
+	 */
+	public function getTitle(): string
+	{
+		return $this->l10n->t('Unread mail');
+	}
+
+	/**
+	 * @return int Initial order for widget sorting
+	 * @since 20.0.0
+	 */
+	public function getOrder(): int
+	{
+		return 3;
+	}
+
+	/**
+	 * @return string css class that displays an icon next to the widget title
+	 * @since 20.0.0
+	 */
+	public function getIconClass(): string
+	{
+		return 'icon-mail';
+	}
+
+	/**
+	 * @return string|null The absolute url to the apps own view
+	 * @since 20.0.0
+	 */
+	public function getUrl(): ?string
+	{
+		return $this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkToRoute('snappymail.page.index'));
+	}
+
+	/**
+	 * Execute widget bootstrap code like loading scripts and providing initial state
+	 * @since 20.0.0
+	 */
+	public function load(): void
+	{
+//		Util::addScript(Application::APP_ID, 'dashboard');
+		if ($this->userId !== null) {
+			$this->initialStateService->provideInitialState('dashboard-widget-items', $this->getItems($this->userId));
+		}
+	}
+
+	// IAPIWidget
+
+	/**
+	 * @return \OCP\Dashboard\Model\WidgetItem[] The widget items
+	 * @since 22.0.0
+	 */
+	public function getItems(string $userId, ?string $since = null, int $limit = 7): array
+	{
+		$result = [];
+		SnappyMailHelper::startApp();
+		$oActions = \RainLoop\Api::Actions();
+//		$oAccount = $oActions->getMainAccountFromToken(false); // Issue: when account switched, wrong email is shown
+		$oAccount = $oActions->getAccountFromToken(false);
+		if ($oAccount) {
+			$oConfig = $oActions->Config();
+
+			$oParams = new \MailSo\Mail\MessageListParams;
+			$oParams->sFolderName = 'INBOX'; // or \All ?
+			$oParams->sSearch = 'unseen';
+			$oParams->oCacher = ($oConfig->Get('cache', 'enable', true) && $oConfig->Get('cache', 'server_uids', false))
+				? $oActions->Cacher($oAccount) : null;
+			$oParams->bUseSortIfSupported = !!$oConfig->Get('labs', 'use_imap_sort', true);
+//			$oParams->sSort = 'DATE DESC';
+			$oParams->iLimit = $iLimit;
+
+			$oMailClient = $oActions->MailClient();
+			if (!$oMailClient->IsLoggined()) {
+				$oAccount->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oConfig);
+			}
+
+			// instanceof \MailSo\Mail\MessageCollection
+			$MessageCollection = $oMailClient->MessageList($oParams);
+
+			$baseURL = $this->urlGenerator->linkToRoute('snappymail.page.index') . '#';
+
+			foreach ($MessageCollection as $Message) {
+				$result[] = new WidgetItem(
+					// title
+					$Message->From()->ToString(),
+					// subtitle
+					$Message->Subject(),
+					// link
+					$baseURL . '/mailbox/INBOX/m' . $Message->Uid(),
+					// iconUrl use the avatar?
+					'',
+					// sinceId
+					$Message->ETag('')
+				);
+			}
+		}
+
+		return $result;
+	}
+
+	// IIconWidget
+
+	/**
+	 * Get the absolute url for the widget icon
+	 *
+	 * @return string
+	 * @since 25.0.0
+	 */
+	public function getIconUrl(): string
+	{
+		SnappyMailHelper::loadApp();
+//		return $this->urlGenerator->getAbsoluteURL(
+		return \RainLoop\Utils::WebStaticPath('images/snappymail-logo.png');
+	}
+
+	// IOptionWidget
+
+	/**
+	 * Get additional options for the widget
+	 * @since 25.0.0
+	 */
+	public function getWidgetOptions(): WidgetOptions
+	{
+		return new WidgetOptions(true);
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Listeners/AccessTokenUpdatedListener.php b/integrations/nextcloud/snappymail/lib/Listeners/AccessTokenUpdatedListener.php
new file mode 100644
index 000000000..7b94359a7
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Listeners/AccessTokenUpdatedListener.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\SnappyMail\Listeners;
+
+use OCA\OIDCLogin\Events\AccessTokenUpdatedEvent;
+use OCP\App\IAppManager;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\ISession;
+use OCP\IUserSession;
+
+class AccessTokenUpdatedListener implements IEventListener {
+	private IUserSession $userSession;
+	private ISession $session;
+	private IAppManager $appManager;
+
+	private const SNAPPYMAIL_APP_ID = 'snappymail';
+	private const OIDC_LOGIN_APP_ID = 'oidc_login';
+
+
+	public function __construct(IUserSession $userSession, ISession $session, IAppManager $appManager) {
+		$this->userSession = $userSession;
+		$this->session = $session;
+		$this->appManager = $appManager;
+	}
+
+	public function handle(Event $event): void {
+		if (!($event instanceof AccessTokenUpdatedEvent) || !$this->userSession->isLoggedIn() || !$this->session->exists('is_oidc')) {
+			return;
+		}
+		// just-in-case checks(also maybe useful for selfhosters)
+		if (!$this->appManager->isEnabledForUser(self::SNAPPYMAIL_APP_ID) || !$this->appManager->isEnabledForUser(self::OIDC_LOGIN_APP_ID)) {
+			return;
+		}
+		$accessToken = $event->getAccessToken();
+		if (!$accessToken) {
+			return;
+		}
+
+		$username = $this->userSession->getUser()->getUID();
+		$this->session->set('snappymail-nc-uid', $username);
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
new file mode 100644
index 000000000..247d9d405
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Migration/InstallStep.php
@@ -0,0 +1,149 @@
+<?php
+// https://docs.nextcloud.com/server/19/developer_manual/app/repair.html
+namespace OCA\SnappyMail\Migration;
+
+use OCA\SnappyMail\AppInfo\Application;
+
+use OCP\App\IAppManager;
+use OCP\IConfig;
+use OCP\Migration\IOutput;
+use OCP\Migration\IRepairStep;
+
+use Psr\Log\LoggerInterface;
+
+/**
+ * Note: this is not run at install, but when:
+ * - app is enabled in Admin -> Settings -> Apps
+ * - after upgrade
+ */
+class InstallStep implements IRepairStep
+{
+	private IAppManager $appManager;
+	private IConfig $config;
+	private LoggerInterface $logger;
+
+	public function __construct(IAppManager $appManager, IConfig $config, LoggerInterface $logger)
+	{
+		$this->appManager = $appManager;
+		$this->config = $config;
+		$this->logger = $logger;
+	}
+
+	public function getName()
+	{
+		return 'Setup SnappyMail';
+	}
+
+	public function run(IOutput $output)
+	{
+
+		$output->info('clearstatcache');
+		\clearstatcache();
+		\clearstatcache(true);
+		$output->info('opcache_reset');
+		// opcache_reset is a terrible solution, but certain Nextcloud setups have issues
+		\is_callable('opcache_reset') && \opcache_reset();
+
+		$output->info('Load App');
+		\OCA\SnappyMail\Util\SnappyMailHelper::loadApp();
+
+		$output->info('Fix permissions');
+		\SnappyMail\Upgrade::fixPermissions();
+
+		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
+//		$app_dir = \rtrim(APP_INDEX_ROOT_PATH, '\\/');
+
+		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
+		if (!\file_exists($app_dir . '/.htaccess') && \file_exists($app_dir . '/_htaccess')) {
+			\rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
+		}
+		if (!\file_exists(APP_VERSION_ROOT_PATH . 'app/.htaccess') && \file_exists(APP_VERSION_ROOT_PATH . 'app/_htaccess')) {
+			\rename(APP_VERSION_ROOT_PATH . 'app/_htaccess', APP_VERSION_ROOT_PATH . 'app/.htaccess');
+		}
+//		if (!\file_exists(APP_VERSION_ROOT_PATH . 'static/.htaccess') && \file_exists(APP_VERSION_ROOT_PATH . 'static/_htaccess')) {
+//			\rename(APP_VERSION_ROOT_PATH . 'static/_htaccess', APP_VERSION_ROOT_PATH . 'static/.htaccess');
+//		}
+
+		$oConfig = \RainLoop\Api::Config();
+		$bSave = false;
+
+		if (!$oConfig->Get('webmail', 'app_path')) {
+			$output->info('Set config [webmail]app_path');
+			$oConfig->Set('webmail', 'app_path', $this->appManager->getAppWebPath('snappymail') . '/app/');
+			$oConfig->Set('webmail', 'allow_languages_on_settings', false);
+			$oConfig->Set('login', 'allow_languages_on_login', false);
+			$bSave = true;
+		}
+
+		if (!\is_dir(APP_PLUGINS_PATH . 'nextcloud')) {
+			$output->info('Install extension: nextcloud');
+			\SnappyMail\Repository::installPackage('plugin', 'nextcloud');
+			$oConfig->Set('plugins', 'enable', true);
+			$aList = \SnappyMail\Repository::getEnabledPackagesNames();
+			$aList[] = 'nextcloud';
+			$oConfig->Set('plugins', 'enabled_list', \implode(',', \array_unique($aList)));
+			$oConfig->Set('webmail', 'theme', 'NextcloudV25+');
+			$bSave = true;
+		}
+
+		$sPassword = $oConfig->Get('security', 'admin_password');
+		if ('12345' == $sPassword || !$sPassword) {
+			$output->info('Generate admin password');
+			$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
+			$oConfig->SetPassword(new \SnappyMail\SensitiveString($sPassword));
+			\RainLoop\Utils::saveFile(APP_PRIVATE_DATA . 'admin_password.txt', $sPassword . "\n");
+			$bSave = true;
+		}
+
+		// Pre-configure domain
+		$oProvider = \RainLoop\Api::Actions()->DomainProvider();
+		$oDomain = $oProvider->Load('nextcloud');
+		if (!$oDomain) {
+			$output->info('Add nextcloud as domain');
+//			$oDomain = \RainLoop\Model\Domain::fromIniArray('nextcloud', []);
+			$oDomain = new \RainLoop\Model\Domain('nextcloud');
+			$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
+			$oDomain->ImapSettings()->host = 'localhost';
+			$oDomain->ImapSettings()->type = $iSecurityType;
+			$oDomain->ImapSettings()->shortLogin = true;
+			$oDomain->SieveSettings()->enabled = true;
+			$oDomain->SieveSettings()->host = 'localhost';
+			$oDomain->SieveSettings()->type = $iSecurityType;
+			$oDomain->SmtpSettings()->host = 'localhost';
+			$oDomain->SmtpSettings()->type = $iSecurityType;
+			$oDomain->SmtpSettings()->shortLogin = true;
+			$oProvider->Save($oDomain);
+			if (!$oConfig->Get('login', 'default_domain', '')) {
+				$oConfig->Set('login', 'default_domain', 'nextcloud');
+				$bSave = true;
+			}
+		}
+
+		if ($bSave) {
+			$oConfig->Save()
+				? $output->info('Config saved')
+				: $output->info('Config failed');
+		} else {
+			$output->info('Config not changed');
+		}
+
+		// check if admins provided additional/custom initial config file
+		// https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html#setting-a-single-configuration-value
+		// ex: php occ config:app:set snappymail custom_config_file --value="/path/to/config.php"
+		// https://github.com/the-djmaze/snappymail/pull/1197
+		try {
+			$customConfigFile = $this->config->getAppValue(Application::APP_ID, 'custom_config_file');
+			if ($customConfigFile) {
+				$output->info("Load custom config: {$customConfigFile}");
+				if (!\str_contains($customConfigFile, ':') && \is_readable($customConfigFile)) {
+					require $customConfigFile;
+				} else {
+					throw new \Exception("not found {$customConfigFile}");
+				}
+			}
+		} catch (\Throwable $e) {
+			$output->warning("custom config error: " . $e->getMessage());
+			$this->logger->error("custom config error: " . $e->getMessage());
+		}
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Search/Provider.php b/integrations/nextcloud/snappymail/lib/Search/Provider.php
new file mode 100644
index 000000000..011871e4b
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Search/Provider.php
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\SnappyMail\Search;
+
+use OCA\SnappyMail\AppInfo\Application;
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCP\IDateTimeFormatter;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+/**
+ * https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/search.html#search-providers
+ */
+class Provider implements IProvider
+{
+	/** @var IL10N */
+	private $l10n;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	public function __construct(IL10N $l10n, IURLGenerator $urlGenerator)
+	{
+		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	public function getId(): string
+	{
+		return Application::APP_ID;
+	}
+
+	public function getName(): string
+	{
+		return 'SnappyMail';
+//		return $this->l10n->t('Mails');
+	}
+
+	public function getOrder(string $route, array $routeParameters): int
+	{
+		if (0 === \strpos($route, Application::APP_ID . '.')) {
+			// Active app, prefer Mail results
+			return -1;
+		}
+		return 20;
+	}
+
+	public function search(IUser $user, ISearchQuery $query): SearchResult
+	{
+		$result = [];
+		if (2 > \strlen(\trim($query->getTerm()))) {
+			return SearchResult::complete($this->getName(), $result);
+		}
+		SnappyMailHelper::startApp();
+		$oActions = \RainLoop\Api::Actions();
+//		$oAccount = $oActions->getMainAccountFromToken(false); // Issue: when account switched, wrong email is shown
+		$oAccount = $oActions->getAccountFromToken(false);
+		$iCursor = (int) $query->getCursor();
+		$iLimit = $query->getLimit();
+		if ($oAccount) {
+			$oConfig = $oActions->Config();
+
+			$oParams = new \MailSo\Mail\MessageListParams;
+			$oParams->sFolderName = 'INBOX'; // or \All ?
+			$oParams->sSearch = $query->getTerm();
+			$oParams->oCacher = ($oConfig->Get('cache', 'enable', true) && $oConfig->Get('cache', 'server_uids', false))
+				? $oActions->Cacher($oAccount) : null;
+			$oParams->bUseSortIfSupported = !!$oConfig->Get('labs', 'use_imap_sort', true);
+//			$oParams->bUseThreads = $oConfig->Get('labs', 'use_imap_thread', false);
+//			$oParams->bHideDeleted = false;
+//			$oParams->sSort = (string) $aValues['Sort'];
+//				ISearchQuery::SORT_DATE_DESC == $query->getSortOrder(): int;
+			$oParams->iOffset = $iCursor;
+			$oParams->iLimit = $iLimit;
+//			$oParams->iPrevUidNext = 0, // used to check for new messages
+//			$oParams->iThreadUid = 0;
+
+			$oMailClient = $oActions->MailClient();
+			if (!$oMailClient->IsLoggined()) {
+				$oAccount->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oConfig);
+			}
+
+			// instanceof \MailSo\Mail\MessageCollection
+			$MessageCollection = $oMailClient->MessageList($oParams);
+
+			$baseURL = $this->urlGenerator->linkToRoute('snappymail.page.index');
+//			if (SnappyMailHelper::getAppConfigValue('snappymail-no-embed')) {
+//				$baseURL .= '?target=';
+//			} else {
+				$baseURL .= '#';
+//			}
+			$search = \rawurlencode($oParams->sSearch);
+
+//			$MessageCollection->totalEmails;
+			foreach ($MessageCollection as $Message) {
+				// $Message instanceof \MailSo\Mail\Message
+				$result[] = new SearchResultEntry(
+					// thumbnailUrl
+					'',
+					// title
+					$Message->Subject(),
+					// subline
+					$Message->From()->ToString(),
+					// resourceUrl /index.php/apps/snappymail/#/mailbox/INBOX/p2/text=an&unseen
+					$baseURL . '/mailbox/INBOX/m' . $Message->Uid() . '/' . $search,
+					// icon
+					'icon-mail',
+					// rounded
+					false
+				);
+			}
+		} else {
+			\error_log('SnappyMail not logged in to use unified search');
+		}
+
+		if ($iLimit > \count($result)) {
+			return SearchResult::complete($this->getName(), $result);
+		}
+		return SearchResult::paginated($this->getName(), $result, $iCursor + $iLimit);
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
index df6107e47..eea9f49a8 100644
--- a/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
+++ b/integrations/nextcloud/snappymail/lib/Settings/AdminSettings.php
@@ -6,40 +6,103 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
 
-class AdminSettings implements ISettings {
+use OCP\IUserSession;
+use OCP\IGroupManager;
+use OCP\IURLGenerator;
+use OCP\App\IAppManager;
+use OCP\Util;
 
-	private $config;
+class AdminSettings implements ISettings
+{
+	private IConfig $config;
+	private IUserSession $userSession;
+	private IGroupManager $groupManager;
+	private IURLGenerator $urlGenerator;
+	private IAppManager $appManager;
 
-	public function __construct(IConfig $config) {
+	public function __construct(
+		IConfig $config,
+		IUserSession $userSession,
+		IGroupManager $groupManager,
+		IURLGenerator $urlGenerator,
+		IAppManager $appManager
+	) {
 		$this->config = $config;
+		$this->userSession = $userSession;
+		$this->groupManager = $groupManager;
+		$this->urlGenerator = $urlGenerator;
+		$this->appManager = $appManager;
 	}
 
-	public function getForm() {
+	public function getForm()
+	{
+		SnappyMailHelper::loadApp();
+
 		$keys = [
 			'snappymail-autologin',
-			'snappymail-autologin-with-email'
+			'snappymail-autologin-with-email',
+			'snappymail-no-embed',
+			'snappymail-autologin-oidc'
 		];
-
 		$parameters = [];
 		foreach ($keys as $k) {
-			$v = $this->config->getAppValue('snappymail', $k);
-			$parameters[$k] = $v;
+			$parameters[$k] = $this->config->getAppValue('snappymail', $k);
 		}
 
-		$uid = \OC::$server->getUserSession()->getUser()->getUID();
-		if (\OC_User::isAdminUser($uid)) {
-			$parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin';
+		$uid = $this->userSession->getUser()?->getUID();
+		if ($uid && $this->groupManager->isAdmin($uid)) {
+//			$parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin';
+			SnappyMailHelper::loadApp();
+			$parameters['snappymail-admin-panel-link'] =
+				$this->urlGenerator->linkToRoute('snappymail.page.index')
+				. '?' . \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin');
 		}
 
+		$oConfig = \RainLoop\Api::Config();
+		$passfile = APP_PRIVATE_DATA . 'admin_password.txt';
+		$sPassword = '';
+		if (\is_file($passfile)) {
+			$sPassword = \file_get_contents($passfile);
+			$parameters['snappymail-admin-panel-link'] .= '#/security';
+		}
+		$parameters['snappymail-admin-password'] = $sPassword;
+
+		$parameters['can-import-rainloop'] = $sPassword && \is_dir(
+			\rtrim(\trim($this->config->getSystemValue('datadirectory', '')), '\\/')
+			. '/rainloop-storage'
+		);
+
+		$parameters['snappymail-debug'] = $oConfig->Get('debug', 'enable', false);
+
+		// Check for nextcloud plugin update, if so then update
+		foreach (\SnappyMail\Repository::getPackagesList()['List'] as $plugin) {
+			if ('nextcloud' == $plugin['id'] && $plugin['canBeUpdated']) {
+				\SnappyMail\Repository::installPackage('plugin', 'nextcloud');
+			}
+		}
+
+		// Prevent "Failed loading /nextcloud/snappymail/v/2.N.N/static/js/min/libs.min.js"
+		$app_path = $oConfig->Get('webmail', 'app_path');
+		if (!$app_path) {
+			$app_path = $this->appManager->getAppWebPath('snappymail') . '/app/';
+			$oConfig->Set('webmail', 'app_path', $app_path);
+			$oConfig->Set('webmail', 'theme', 'NextcloudV25+');
+			$oConfig->Save();
+		}
+		$parameters['snappymail-app_path'] = $oConfig->Get('webmail', 'app_path', false);
+		$parameters['snappymail-nc-lang'] = !$oConfig->Get('webmail', 'allow_languages_on_settings', true);
+
+		\OCP\Util::addScript('snappymail', 'snappymail');
 		return new TemplateResponse('snappymail', 'admin-local', $parameters);
 	}
 
-	public function getSection() {
+	public function getSection()
+	{
 		return 'additional';
 	}
 
-	public function getPriority() {
+	public function getPriority()
+	{
 		return 50;
 	}
-
 }
diff --git a/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php b/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
index e931868a5..7a3e7ef56 100644
--- a/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
+++ b/integrations/nextcloud/snappymail/lib/Settings/PersonalSettings.php
@@ -1,32 +1,43 @@
 <?php
 namespace OCA\SnappyMail\Settings;
 
+use OCA\SnappyMail\Util\SnappyMailHelper;
 use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
+use OCP\Settings\ISettings;
 
-class PersonalSettings {
+class PersonalSettings implements ISettings
+{
 	private $config;
 
-	public function __construct(IConfig $config) {
+	public function __construct(IConfig $config)
+	{
 		$this->config = $config;
 	}
 
-	public function getForm() {
-		$uid = \OC::$server->getUserSession()->getUser()->getUID();
-
-		$keys = [
-			'snappymail-email',
-			'snappymail-password'
-		];
-
-		$parameters = [];
-		foreach ($keys as $k) {
-			$v = $this->config->getUserValue($uid, 'snappymail', $k);
-			$parameters[$k] = $v;
+	public function getForm()
+	{
+		$uid = SnappyMailHelper::getUID();
+		$sEmail = $this->config->getUserValue($uid, 'snappymail', 'snappymail-email');
+		if ($sPass = $this->config->getUserValue($uid, 'snappymail', 'snappymail-password')) {
+			$this->config->deleteUserValue($uid, 'snappymail', 'snappymail-password');
+			$this->config->setUserValue($uid, 'snappymail', 'passphrase', $sPass);
 		}
-
+		$parameters = [
+			'snappymail-email' => $sEmail,
+			'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'passphrase') ? '******' : ''
+		];
+		\OCP\Util::addScript('snappymail', 'snappymail');
 		return new TemplateResponse('snappymail', 'personal_settings', $parameters, '');
 	}
 
-}
+	public function getSection()
+	{
+		return 'additional';
+	}
 
+	public function getPriority()
+	{
+		return 50;
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Util/RainLoop.php b/integrations/nextcloud/snappymail/lib/Util/RainLoop.php
new file mode 100644
index 000000000..737f73ded
--- /dev/null
+++ b/integrations/nextcloud/snappymail/lib/Util/RainLoop.php
@@ -0,0 +1,71 @@
+<?php
+
+namespace OCA\SnappyMail\Util;
+
+class RainLoop
+{
+	/**
+	 * Imports data from RainLoop
+	 * skips: /data/rainloop-storage/_data_/_default_/configs/application.ini
+	 * skips: /data/rainloop-storage/_data_/_default_/domains/disabled
+	 * skips: /data/rainloop-storage/SALT.php
+	 * skips: /data/rainloop-storage/index.html
+	 * skips: /data/rainloop-storage/INSTALLED
+	 * skips: /data/rainloop-storage/index.php
+	 */
+	public static function import(): array
+	{
+		$dir = \rtrim(\trim(SnappyMailHelper::getSystemConfigValue('datadirectory', '')), '\\/');
+		$dir_snappy = $dir . '/appdata_snappymail/';
+		$dir_rainloop = $dir . '/rainloop-storage';
+		$result = [];
+		$rainloop_plugins = [];
+		if (\is_dir($dir_rainloop)) {
+			\is_dir($dir_snappy) || \mkdir($dir_snappy, 0755, true);
+			$iterator = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($dir_rainloop, \RecursiveDirectoryIterator::SKIP_DOTS),
+				\RecursiveIteratorIterator::SELF_FIRST
+			);
+			foreach ($iterator as $item) {
+				$target = $dir_snappy . $iterator->getSubPathname();
+				if (\preg_match('@/plugins/([^/]+)@', $target, $match)) {
+					$rainloop_plugins[$match[1]] = $match[1];
+				} else if (!\strpos($target, '/cache/')) {
+					if ($item->isDir()) {
+						\is_dir($target) || \mkdir($target, 0755, true);
+					} else if (\file_exists($target)) {
+						$result[] = "skipped: {$target}";
+					} else {
+						\copy($item, $target);
+						$result[] = "copied : {$target}";
+					}
+				}
+			}
+		}
+
+//		$password = APP_PRIVATE_DATA . 'admin_password.txt';
+//		\is_file($password) && \unlink($password);
+
+		SnappyMailHelper::loadApp();
+
+		// Attempt to install same plugins as RainLoop
+		if ($rainloop_plugins) {
+			foreach (\SnappyMail\Repository::getPackagesList()['List'] as $plugin) {
+				if (\in_array($plugin['id'], $rainloop_plugins)) {
+					$result[] = "install plugin : {$plugin['id']}";
+					\SnappyMail\Repository::installPackage('plugin', $plugin['id']);
+					unset($rainloop_plugins[$plugin['id']]);
+				}
+			}
+			foreach ($rainloop_plugins as $plugin) {
+				$result[] = "skipped plugin : {$plugin}";
+			}
+		}
+
+		$oConfig = \RainLoop\Api::Config();
+		$oConfig->Set('webmail', 'theme', 'NextcloudV25+');
+		$oConfig->Save();
+
+		return $result;
+	}
+}
diff --git a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
index 9191b52f8..43b03a664 100644
--- a/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
+++ b/integrations/nextcloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -2,340 +2,320 @@
 
 namespace OCA\SnappyMail\Util;
 
-use OCP\App\IAppManager;
-use OCP\IConfig;
-use OCP\ISession;
-use OCP\IUserSession;
-
-class SnappyMailHelper {
-
-	private $appManager;
-	private $config;
-	private $session;
-	private $userSession;
-
-	public function __construct(IConfig $config, IUserSession $userSession, IAppManager $appManager, ISession $session) {
-		$this->appManager = $appManager;
-		$this->config = $config;
-		$this->userSession = $userSession;
-		$this->session = $session;
-	}
-
-	public function registerHooks() {
-		$this->userSession->listen('\OC\User', 'postLogin', function($user, $loginName, $password, $isTokenLogin) {
-			$this->login($user, $loginName, $password, $isTokenLogin, $this->config, $this->session);
-		});
-
-		$this->userSession->listen('\OC\User', 'logout', function() {
-			$this->logout($this->appManager, $this->config, $this->session);
-		});
-	}
-
-	/**
-	 * @return string
-	 */
-	public static function getAppUrl()
+class SnappyMailResponse extends \OCP\AppFramework\Http\Response
+{
+	public function render(): string
 	{
-		$sRequestUri = \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
-		if ($sRequestUri)
-		{
-			return $sRequestUri;
+		$data = '';
+		$i = \ob_get_level();
+		while ($i--) {
+			$data .= \ob_get_clean();
+		}
+		return $data;
+	}
+}
+
+/**
+ * Nextcloud 34+
+ * @CarlSchwan 2026-03-10
+ * refactor: remove long deprecated IServerContainer methods
+ *
+ * https://github.com/nextcloud/server/commit/39c14c383b698467711a2de09870d7c032d92f63
+ */
+
+class SnappyMailHelper
+{
+	public static $server;
+
+	public static function getServerContainer(): object
+	{
+		return static::$server || \OC::$server;
+	}
+
+	public static function getConfig(): object
+	{
+		return \method_exists(\OC::$server, 'getConfig')
+			? \OC::$server->getConfig()
+			// Nextcloud 34+
+			: \OCP\Server::get(\OCP\IConfig::class);
+	}
+
+	public static function getAppConfigValue(string $key, mixed $default = null): object
+	{
+		return (\method_exists(\OC::$server, 'getConfig')
+			? \OC::$server->getConfig()
+			// Nextcloud 34+
+			: \OCP\Server::get(\OCP\IAppConfig::class)
+		)->getAppValue('snappymail', $key, $default);
+	}
+
+	public static function getNavigationManager(): object
+	{
+		return \method_exists(\OC::$server, 'getNavigationManager')
+			? \OC::$server->getNavigationManager()
+			// Nextcloud 32+
+			: \OCP\Server::get(\OCP\INavigationManager::class);
+	}
+
+	public static function getSystemConfigValue(string $key, mixed $default = null): mixed
+	{
+		return \method_exists(\OC::$server, 'getSystemConfig')
+			? \OC::$server->getSystemConfig()->getValue($key, $default)
+			// Nextcloud 34+
+			: \OCP\Server::get(\OCP\IConfig::class)->getSystemValue($key, $default);
+	}
+
+	public static function getUID(): mixed
+	{
+		return static::getUser()?->getUID();
+	}
+
+	public static function getUser(): object
+	{
+		return static::getUserSession()->getUser();
+	}
+
+	public static function getUserSession(): object
+	{
+		return (\method_exists(\OC::$server, 'getUserSession')
+			? \OC::$server->getUserSession()
+			// Nextcloud 34+
+			: \OCP\Server::get(\OCP\IUserSession::class)
+		);
+	}
+
+	public static function getSession(): object
+	{
+		return (\method_exists(\OC::$server, 'getSession')
+			? \OC::$server->getSession()
+			// Nextcloud 34+
+			: \OCP\Server::get(\OCP\ISession::class)
+		);
+	}
+
+	public static function getSessionValue(string $key): mixed
+	{
+		return static::getSession()->get($key);
+	}
+
+	public static function setSessionValue(string $key, mixed $value): void
+	{
+		if (\method_exists(\OC::$server, 'getSession')) {
+			\OC::$server->getSession()[$key] = $value;
+		} else {
+			// Nextcloud 34+
+			\OCP\Server::get(\OCP\ISession::class)->set($key, $value);
+		}
+	}
+
+	public static function loadApp(): void
+	{
+		if (\class_exists('RainLoop\\Api')) {
+			return;
 		}
 
-		$sRequestUri = empty($_SERVER['REQUEST_URI']) ? '': trim($_SERVER['REQUEST_URI']);
-		$sRequestUri = preg_replace('/index.php\/.+$/', 'index.php/', $sRequestUri);
-		$sRequestUri = $sRequestUri.'apps/snappymail/app/';
+		// Nextcloud the default spl_autoload_register() not working
+		\spl_autoload_register(function($sClassName){
+			$file = SNAPPYMAIL_LIBRARIES_PATH . \strtolower(\strtr($sClassName, '\\', DIRECTORY_SEPARATOR)) . '.php';
+			if (\is_file($file)) {
+				include_once $file;
+			}
+		});
 
-		return '/'.ltrim($sRequestUri, '/\\');
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+
+//		define('APP_VERSION', '0.0.0');
+//		define('APP_INDEX_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+//		include APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php';
+//		define('APP_DATA_FOLDER_PATH', \rtrim(\trim(static::getSystemConfigValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
+
+		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
+		require_once $app_dir . '/index.php';
 	}
 
-	/**
-	 * @param string $sPath
-	 * @param string $sEmail
-	 * @param string $sPassword
-	 *
-	 * @return string
-	 */
-	public static function getSsoHash($sPath, $sEmail, $sPassword)
+	public static function startApp(bool $handle = false): void
 	{
-		$SsoHash = '';
+		static::loadApp();
 
-		$sPath = rtrim(trim($sPath), '\\/').'/index.php';
-		if (file_exists($sPath))
-		{
-			self::regSnappyMailDataFunction();
+		$oConfig = \RainLoop\Api::Config();
 
-			$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
-			include $sPath;
+		if (false !== \stripos(\php_sapi_name(), 'cli')) {
+			return;
+		}
 
-			if (class_exists('\\RainLoop\\Api'))
-			{
-				$SsoHash = \RainLoop\Api::GetUserSsoHash($sEmail, $sPassword);
+		try {
+			$oActions = \RainLoop\Api::Actions();
+			if (isset($_GET[$oConfig->Get('security', 'admin_panel_key', 'admin')])) {
+				if ($oConfig->Get('security', 'allow_admin_panel', true)
+				&& \OC_User::isAdminUser(static::getUID())
+				&& !$oActions->IsAdminLoggined(false)
+				) {
+					$sRand = \MailSo\Base\Utils::Sha1Rand();
+					if ($oActions->Cacher(null, true)->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time())) {
+						$sToken = \RainLoop\Utils::EncodeKeyValuesQ(array('token', $sRand));
+//						$oActions->setAdminAuthToken($sToken);
+						\SnappyMail\Cookies::set('smadmin', $sToken);
+					}
+				}
+			} else {
+				$doLogin = !$oActions->getMainAccountFromToken(false);
+				$aCredentials = static::getLoginCredentials();
+/*
+				// NC25+ workaround for Impersonate plugin
+				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
+				require \OC::$SERVERROOT . '/version.php';
+//				\OC\SystemConfig
+//				file_get_contents(\OC::$SERVERROOT . 'config/config.php');
+//				$CONFIG['version']
+				if (24 < $OC_Version[0]) {
+					$ocSession = static::getSession();
+					$ocSession->reopen();
+					if (!$doLogin && $ocSession['snappymail-uid'] && $ocSession['snappymail-uid'] != $aCredentials[0]) {
+						// UID changed, Impersonate plugin probably active
+						$oActions->Logout(true);
+						$doLogin = true;
+					}
+					$ocSession->set('snappymail-uid', $aCredentials[0]);
+				}
+*/
+				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
+					$isOIDC = \str_starts_with($aCredentials[2], 'oidc_login|');
+					try {
+						$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
+						if (!$isOIDC && $oAccount
+						 && $oConfig->Get('login', 'sign_me_auto', \RainLoop\Enumerations\SignMeType::DefaultOff) === \RainLoop\Enumerations\SignMeType::DefaultOn
+						) {
+							$oActions->SetSignMeToken($oAccount);
+						}
+					} catch (\Throwable $e) {
+						// Login failure, reset password to prevent more attempts
+						if (!$isOIDC) {
+							$sUID = static::getUID();
+							static::setSessionValue('snappymail-passphrase', '');
+							static::getConfig()->setUserValue($sUID, 'snappymail', 'passphrase', '');
+							\SnappyMail\Log::error('Nextcloud', $e->getMessage());
+						}
+					}
+				}
+			}
+
+			if ($handle) {
+				\header_remove('Content-Security-Policy');
+				\RainLoop\Service::Handle();
+				// https://github.com/the-djmaze/snappymail/issues/1069
+				exit;
+//				return new SnappyMailResponse();
+			}
+		} catch (\Throwable $e) {
+			// Ignore login failure
+		}
+	}
+
+	// Check if OpenID Connect (OIDC) is enabled and used for login
+	// https://apps.nextcloud.com/apps/oidc_login
+	public static function isOIDCLogin(): bool
+	{
+		if (static::getAppConfigValue('snappymail-autologin-oidc', false)) {
+			// Check if the OIDC Login app is enabled
+			if (\OC::$server->getAppManager()->isEnabledForUser('oidc_login')) {
+				// Check if session is an OIDC Login
+				$ocSession = static::getSession();
+				if ($ocSession->get('is_oidc')) {
+					// IToken->getPassword() ???
+					if ($ocSession->get('oidc_access_token')) {
+						return true;
+					}
+					\SnappyMail\Log::debug('Nextcloud', 'OIDC access_token missing');
+				} else {
+					\SnappyMail\Log::debug('Nextcloud', 'No OIDC login');
+				}
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'OIDC login disabled');
+			}
+		}
+		return false;
+	}
+
+	private static function getLoginCredentials(): array
+	{
+		$sUID = static::getUID();
+		$config = static::getConfig();
+		$ocSession = static::getSession();
+
+		// If the user has set credentials for SnappyMail in their personal settings,
+		// this has the first priority.
+		$sEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email');
+		$sPassword = $config->getUserValue($sUID, 'snappymail', 'passphrase')
+			?: $config->getUserValue($sUID, 'snappymail', 'snappymail-password');
+		if ($sEmail && $sPassword) {
+			$sPassword = static::decodePassword($sPassword, \md5($sEmail));
+			if ($sPassword) {
+				return [$sUID, $sEmail, $sPassword];
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'decodePassword failed for getUserValue');
 			}
 		}
 
-		return $SsoHash;
+		// If the current user ID is identical to login ID (not valid when using account switching),
+		// this has the second priority.
+		if ($ocSession['snappymail-nc-uid'] == $sUID) {
+
+			// If OpenID Connect (OIDC) is enabled and used for login, use this.
+			if (static::isOIDCLogin()) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
+				$pwd = new \SnappyMail\SensitiveString("oidc_login|{$sUID}");
+				return [$sUID, $sEmail, $pwd];
+			}
+
+			// Only use the user's password in the current session if they have
+			// enabled auto-login using Nextcloud username or email address.
+			$sEmail = '';
+			$sPassword = '';
+			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
+				$sEmail = $sUID;
+				$sPassword = $ocSession['snappymail-passphrase'];
+			} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email');
+				$sPassword = $ocSession['snappymail-passphrase'];
+			} else {
+				\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
+			}
+			if ($sPassword) {
+				return [$sUID, $sEmail, static::decodePassword($sPassword, $sUID)];
+			}
+		} else {
+			\SnappyMail\Log::debug('Nextcloud', "snappymail-nc-uid mismatch '{$ocSession['snappymail-nc-uid']}' != '{$sUID}'");
+		}
+
+		return [$sUID, '', ''];
 	}
 
-	/**
-	 * @param string $sUrl
-	 *
-	 * @return string
-	 */
-	public static function normalizeUrl($sUrl)
+	public static function getAppUrl(): string
 	{
-		$sUrl = rtrim(trim($sUrl), '/\\');
-		if ('.php' !== strtolower(substr($sUrl, -4)))
-		{
+		return \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
+	}
+
+	public static function normalizeUrl(string $sUrl): string
+	{
+		$sUrl = \rtrim(\trim($sUrl), '/\\');
+		if ('.php' !== \strtolower(\substr($sUrl, -4))) {
 			$sUrl .= '/';
 		}
 
 		return $sUrl;
 	}
 
-	/**
-	 * @return boolean
-	 */
-	public static function mcryptSupported()
+	public static function encodePassword(string $sPassword, string $sSalt): string
 	{
-		return function_exists('mcrypt_encrypt') &&
-			function_exists('mcrypt_decrypt') &&
-			defined('MCRYPT_RIJNDAEL_256') &&
-			defined('MCRYPT_MODE_ECB');
+		static::loadApp();
+		return \SnappyMail\Crypt::EncryptUrlSafe($sPassword, $sSalt);
 	}
 
-	/**
-	 * @return string
-	 */
-	public static function openSslSupportedMethod()
+	public static function decodePassword(string $sPassword, string $sSalt): ?\SnappyMail\SensitiveString
 	{
-		$method = 'AES-256-CBC';
-		return function_exists('openssl_encrypt') &&
-			function_exists('openssl_decrypt') &&
-			function_exists('openssl_random_pseudo_bytes') &&
-			function_exists('openssl_cipher_iv_length') &&
-			function_exists('openssl_get_cipher_methods') &&
-			defined('OPENSSL_RAW_DATA') && defined('OPENSSL_ZERO_PADDING') &&
-			in_array($method, openssl_get_cipher_methods()) ? $method : '';
+		static::loadApp();
+		$result = \SnappyMail\Crypt::DecryptUrlSafe($sPassword, $sSalt);
+		return $result ? new \SnappyMail\SensitiveString($result) : null;
 	}
-
-	/**
-	 * @param string $sMethod
-	 * @param string $sPassword
-	 * @param string $sSalt
-	 *
-	 * @return string
-	 */
-	public static function encodePasswordSsl($sMethod, $sPassword, $sSalt)
-	{
-		$sData = base64_encode($sPassword);
-
-		$iv = @openssl_random_pseudo_bytes(openssl_cipher_iv_length($sMethod));
-		$r = @openssl_encrypt($sData, $sMethod, md5($sSalt), OPENSSL_RAW_DATA, $iv);
-
-		return @base64_encode(base64_encode($r).'|'.base64_encode($iv));
-	}
-
-	/**
-	 * @param string $sMethod
-	 * @param string $sPassword
-	 * @param string $sSalt
-	 *
-	 * @return string
-	 */
-	public static function decodePasswordSsl($sMethod, $sPassword, $sSalt)
-	{
-		$sLine = base64_decode(trim($sPassword));
-		$aParts = explode('|', $sLine, 2);
-
-		if (is_array($aParts) && !empty($aParts[0]) && !empty($aParts[1])) {
-
-			$sData = @base64_decode($aParts[0]);
-			$iv = @base64_decode($aParts[1]);
-
-			return @base64_decode(trim(
-				@openssl_decrypt($sData, $sMethod, md5($sSalt), OPENSSL_RAW_DATA, $iv)
-			));
-		}
-
-		return '';
-	}
-
-	/**
-	 * @param string $sPassword
-	 * @param string $sSalt
-	 *
-	 * @return string
-	 */
-	public static function encodePassword($sPassword, $sSalt)
-	{
-		$method = self::openSslSupportedMethod();
-		if ($method)
-		{
-			return self::encodePasswordSsl($method, $sPassword, $sSalt);
-		}
-		else if (self::mcryptSupported())
-		{
-			return @trim(base64_encode(
-				@mcrypt_encrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_encode($sPassword), MCRYPT_MODE_ECB)
-			));
-		}
-
-		return @trim(base64_encode($sPassword));
-	}
-
-	/**
-	 * @param string $sPassword
-	 * @param string $sSalt
-	 *
-	 * @return string
-	 */
-	public static function decodePassword($sPassword, $sSalt)
-	{
-		$method = self::openSslSupportedMethod();
-		if ($method)
-		{
-			return self::decodePasswordSsl($method, $sPassword, $sSalt);
-		}
-		else if (self::mcryptSupported())
-		{
-			return @base64_decode(trim(
-				@mcrypt_decrypt(MCRYPT_RIJNDAEL_256, md5($sSalt), base64_decode(trim($sPassword)), MCRYPT_MODE_ECB)
-			));
-		}
-
-		return @base64_decode(trim($sPassword));
-	}
-
-	/**
-	 * @param array $aParams
-	 * @return boolean
-	 * @UseSession
-	 */
-	public static function login($user, $loginName, $password, $isTokenLogin, $config, &$session)
-	{
-		$sUser = $user->getUID();
-
-		$sEmail = $sUser;
-		$sPassword = $password;
-		$sEncodedPassword = self::encodePassword($sPassword, md5($sEmail));
-
-		// Only store the user's password in the current session if they have
-		// enabled auto-login using Nextcloud username or email address.
-		if ($config->getAppValue('snappymail', 'snappymail-autologin') || $config->getAppValue('snappymail', 'snappymail-autologin-with-email')) {
-			$session['snappymail-autologin-password'] = $sEncodedPassword;
-		}
-	}
-
-	/**
-	 * @UseSession
-	 */
-	public static function logout($appManager, $config, &$session)
-	{
-		$session['snappymail-autologin-password'] = '';
-
-		$sApiPath = $appManager->getAppPath('snappymail') . '/app/index.php';
-
-		self::regSnappyMailDataFunction();
-
-		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
-		include $sApiPath;
-
-		\RainLoop\Api::LogoutCurrentLogginedUser();
-
-		return true;
-	}
-
-	public static function regSnappyMailDataFunction()
-	{
-		if (!@function_exists('__get_custom_data_full_path'))
-		{
-			$_ENV['SNAPPYMAIL_NEXTCLOUD'] = true;
-
-			function __get_custom_data_full_path()
-			{
-				$sData = rtrim(trim(OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/';
-				return @is_dir($sData) ? $sData.'snappymail-storage' : '';
-			}
-		}
-	}
-
-	public static function mimeContentType($filename) {
-
-        $mime_types = array(
-
-            'woff' => 'application/font-woff',
-
-            'txt' => 'text/plain',
-            'htm' => 'text/html',
-            'html' => 'text/html',
-            'php' => 'text/html',
-            'css' => 'text/css',
-            'js' => 'application/javascript',
-            'json' => 'application/json',
-            'xml' => 'application/xml',
-            'swf' => 'application/x-shockwave-flash',
-            'flv' => 'video/x-flv',
-
-            // images
-            'png' => 'image/png',
-            'jpe' => 'image/jpeg',
-            'jpeg' => 'image/jpeg',
-            'jpg' => 'image/jpeg',
-            'gif' => 'image/gif',
-            'bmp' => 'image/bmp',
-            'ico' => 'image/vnd.microsoft.icon',
-            'tiff' => 'image/tiff',
-            'tif' => 'image/tiff',
-            'svg' => 'image/svg+xml',
-            'svgz' => 'image/svg+xml',
-
-            // archives
-            'zip' => 'application/zip',
-            'rar' => 'application/x-rar-compressed',
-            'exe' => 'application/x-msdownload',
-            'msi' => 'application/x-msdownload',
-            'cab' => 'application/vnd.ms-cab-compressed',
-
-            // audio/video
-            'mp3' => 'audio/mpeg',
-            'qt' => 'video/quicktime',
-            'mov' => 'video/quicktime',
-
-            // adobe
-            'pdf' => 'application/pdf',
-            'psd' => 'image/vnd.adobe.photoshop',
-            'ai' => 'application/postscript',
-            'eps' => 'application/postscript',
-            'ps' => 'application/postscript',
-
-            // ms office
-            'doc' => 'application/msword',
-            'rtf' => 'application/rtf',
-            'xls' => 'application/vnd.ms-excel',
-            'ppt' => 'application/vnd.ms-powerpoint',
-
-            // open office
-            'odt' => 'application/vnd.oasis.opendocument.text',
-            'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
-        );
-
-		if (0 < strpos($filename, '.'))
-		{
-			$ext = strtolower(array_pop(explode('.',$filename)));
-			if (array_key_exists($ext, $mime_types))
-			{
-				return $mime_types[$ext];
-			}
-			else if (function_exists('finfo_open'))
-			{
-				$finfo = finfo_open(FILEINFO_MIME);
-				$mimetype = finfo_file($finfo, $filename);
-				finfo_close($finfo);
-				return $mimetype;
-			}
-		}
-
-		return 'application/octet-stream';
-    }
 }
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a1.png b/integrations/nextcloud/snappymail/screenshots/help_a1.png
deleted file mode 100644
index bec6cbed3..000000000
Binary files a/integrations/nextcloud/snappymail/screenshots/help_a1.png and /dev/null differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a2.png b/integrations/nextcloud/snappymail/screenshots/help_a2.png
deleted file mode 100644
index 0d7174f5d..000000000
Binary files a/integrations/nextcloud/snappymail/screenshots/help_a2.png and /dev/null differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a3.png b/integrations/nextcloud/snappymail/screenshots/help_a3.png
deleted file mode 100644
index 77415d815..000000000
Binary files a/integrations/nextcloud/snappymail/screenshots/help_a3.png and /dev/null differ
diff --git a/integrations/nextcloud/snappymail/screenshots/help_a4.png b/integrations/nextcloud/snappymail/screenshots/help_a4.png
deleted file mode 100644
index ff2e62d66..000000000
Binary files a/integrations/nextcloud/snappymail/screenshots/help_a4.png and /dev/null differ
diff --git a/integrations/nextcloud/snappymail/templates/admin-local.php b/integrations/nextcloud/snappymail/templates/admin-local.php
old mode 100755
new mode 100644
index c7ee3c9a8..5270f3e50
--- a/integrations/nextcloud/snappymail/templates/admin-local.php
+++ b/integrations/nextcloud/snappymail/templates/admin-local.php
@@ -1,44 +1,94 @@
-<?php script('snappymail', 'admin') ?>
-
 <div class="section">
-	<form id="mail-snappymail-admin-form" action="#" method="post">
+	<form class="snappymail" action="admin.php" method="post">
 		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
-		<input type="hidden" name="appname" value="snappymail">
-
 		<fieldset class="personalblock">
 			<h2><?php echo($l->t('SnappyMail Webmail')); ?></h2>
 			<br />
-			<?php if ($_['snappymail-admin-panel-link']): ?>
+			<?php if ($_['snappymail-admin-panel-link']) { ?>
 			<p>
-				<a href="<?php echo $_['snappymail-admin-panel-link'] ?>" target="_blank" style="text-decoration: underline">
+				<a href="<?php echo $_['snappymail-admin-panel-link'] ?>" style="text-decoration: underline">
 					<?php echo($l->t('Go to SnappyMail Webmail admin panel')); ?>
 				</a>
+			<?php if ($_['snappymail-admin-password']) { ?>
+				<br/>
+				Username: admin<br/>
+				Temporary password: <?php echo $_['snappymail-admin-password']; ?>
+			<?php } ?>
 			</p>
 			<br />
-			<?php endif; ?>
+			<?php } ?>
 			<p>
 				<div style="display: flex;">
-					<input type="radio" id="snappymail-noautologin" name="snappymail-autologin" value="0" <?php if (!$_['snappymail-autologin']&&!$_['snappymail-autologin-with-email']): ?>checked="checked"<?php endif; ?> />
+					<input type="radio" id="snappymail-noautologin" name="snappymail-autologin" value="0" <?php if (!$_['snappymail-autologin']&&!$_['snappymail-autologin-with-email']) echo 'checked="checked"'; ?> />
 					<label style="margin: auto 5px;" for="snappymail-noautologin">
 						<?php echo($l->t('Users will login manually, or define credentials in their personal settings for automatic logins.')); ?>
 					</label>
 				</div>
 				<div style="display: flex;">
-					<input type="radio" id="snappymail-autologin" name="snappymail-autologin" value="1" <?php if ($_['snappymail-autologin']): ?>checked="checked"<?php endif; ?> />
+					<input type="radio" id="snappymail-autologin" name="snappymail-autologin" value="1" <?php if ($_['snappymail-autologin']) echo 'checked="checked"'; ?> />
 					<label style="margin: auto 5px;" for="snappymail-autologin">
 						<?php echo($l->t('Attempt to automatically login users with their Nextcloud username and password, or user-defined credentials, if set.')); ?>
 					</label>
 				</div>
 				<div style="display: flex;">
-					<input type="radio" id="snappymail-autologin-with-email" name="snappymail-autologin" value="2" <?php if ($_['snappymail-autologin-with-email']): ?>checked="checked"<?php endif; ?> />
+					<input type="radio" id="snappymail-autologin-with-email" name="snappymail-autologin" value="2" <?php if ($_['snappymail-autologin-with-email']) echo 'checked="checked"'; ?> />
 					<label style="margin: auto 5px;" for="snappymail-autologin-with-email">
 						<?php echo($l->t('Attempt to automatically login users with their Nextcloud email and password, or user-defined credentials, if set.')); ?>
 					</label>
 				</div>
-				<br />
-				<br />
-				<input type="button" id="snappymail-save-button" name="snappymail-save-button" value="<?php echo($l->t('Save')); ?>" />
-				&nbsp;&nbsp;<span class="snappymail-result-desc"></span>
+			</p>
+			<br />
+
+			<p>
+				<input id="snappymail-autologin-oidc" name="snappymail-autologin-oidc" type="checkbox" class="checkbox" <?php if ($_['snappymail-autologin-oidc']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-autologin-oidc">
+					<?php echo($l->t('Attempt to automatically login with OIDC when active')); ?>
+				</label>
+			</p>
+			<br />
+
+			<p>
+				<input id="snappymail-no-embed" name="snappymail-no-embed" type="checkbox" class="checkbox" <?php if ($_['snappymail-no-embed']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-no-embed">
+					<?php echo($l->t('Don\'t fully integrate in Nextcloud, use in iframe')); ?>
+				</label>
+			</p>
+			<br />
+			<p>
+				<input id="snappymail-debug" name="snappymail-debug" type="checkbox" class="checkbox" <?php if ($_['snappymail-debug']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-debug">
+					<?php echo($l->t('Debug')); ?>
+				</label>
+			</p>
+			<br />
+			<?php if ($_['can-import-rainloop']) { ?>
+			<p>
+				<input id="import-rainloop" name="import-rainloop" type="checkbox" class="checkbox">
+				<label for="import-rainloop">
+					<?php echo($l->t('Import RainLoop data')); ?>
+				</label>
+			</p>
+			<br />
+			<?php } ?>
+
+			<p>
+				<input id="snappymail-nc-lang" name="snappymail-nc-lang" type="checkbox" class="checkbox" <?php if ($_['snappymail-nc-lang']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-nc-lang">
+					<?php echo($l->t('Force Nextcloud personal language')); ?>
+				</label>
+			</p>
+			<br />
+			<p>
+				<label for="snappymail-app_path">
+					<?php echo($l->t('app_path')); ?>
+				</label>
+				<input id="snappymail-app_path" name="snappymail-app_path" type="text" <?php echo 'value="'.\htmlspecialchars($_['snappymail-app_path']).'"'; ?> style="width:20em">
+			</p>
+			<br />
+
+			<p>
+				<button id="snappymail-save-button" name="snappymail-save-button"><?php echo($l->t('Save')); ?></button>
+				<div class="snappymail-result-desc" style="white-space: pre"></div>
 			</p>
 		</fieldset>
 	</form>
diff --git a/integrations/nextcloud/snappymail/templates/empty.php b/integrations/nextcloud/snappymail/templates/empty.php
deleted file mode 100755
index fa0c45f25..000000000
--- a/integrations/nextcloud/snappymail/templates/empty.php
+++ /dev/null
@@ -1 +0,0 @@
-<!-- empty -->
\ No newline at end of file
diff --git a/integrations/nextcloud/snappymail/templates/index-empty.php b/integrations/nextcloud/snappymail/templates/index-empty.php
deleted file mode 100755
index e95b0cd88..000000000
--- a/integrations/nextcloud/snappymail/templates/index-empty.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<div style="margin: 20px">
-	<?php p($l->t('SnappyMail Webmail is not configured yet.')); ?>
-</div>
diff --git a/integrations/nextcloud/snappymail/templates/index.php b/integrations/nextcloud/snappymail/templates/index.php
old mode 100755
new mode 100644
index fcdd98db2..f304654fb
--- a/integrations/nextcloud/snappymail/templates/index.php
+++ b/integrations/nextcloud/snappymail/templates/index.php
@@ -1 +1,3 @@
-<iframe id="rliframe" style="border: none; width: 100%; height: 100%; position: relative;" tabindex="-1" frameborder="0" src="<?php echo $_['snappymail-iframe-url']; ?>"></iframe><?php OCP\Util::addScript('snappymail', 'resize');
+<iframe id="rliframe" style="border: none; width: 100%; min-height: 100%; position: relative;" tabindex="-1" frameborder="0" src="<?php echo $_['snappymail-iframe-url']; ?>"></iframe>
+<?php
+// OCP\Util::addScript('snappymail', 'resize');
diff --git a/integrations/nextcloud/snappymail/templates/index_embed.php b/integrations/nextcloud/snappymail/templates/index_embed.php
new file mode 100644
index 000000000..4384bef5d
--- /dev/null
+++ b/integrations/nextcloud/snappymail/templates/index_embed.php
@@ -0,0 +1,19 @@
+<style id="app-boot-css"><?php echo $_['BaseAppBootCss']; ?></style>
+<style id="app-theme-style"><?php echo $_['BaseAppThemeCss']; ?></style>
+<div id="rl-app" data-admin="<?php echo $_['Admin']; ?>" spellcheck="false">
+	<div id="rl-loading">
+		<div id="rl-loading-desc"><?php echo $_['LoadingDescriptionEsc']; ?></div>
+		<i class="icon-spinner"></i>
+	</div>
+	<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div>
+	<div id="rl-content" hidden="">
+		<div id="rl-left"></div>
+		<div id="rl-right"></div>
+	</div>
+	<div id="rl-popups"></div>
+	<?php echo $_['BaseTemplates']; ?>
+</div>
+<?php
+echo '
+	<script nonce="'.$_['BaseAppBootScriptNonce'].'" type="text/javascript">'.$_['BaseAppBootScript'].$_['BaseLanguage'].'</script>
+';
diff --git a/integrations/nextcloud/snappymail/templates/personal.php b/integrations/nextcloud/snappymail/templates/personal.php
deleted file mode 100755
index ccaf65de2..000000000
--- a/integrations/nextcloud/snappymail/templates/personal.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-use OCA\SnappyMail\Settings\PersonalSettings;
-
-$app = new \OCA\SnappyMail\AppInfo\Application();
-$controller = $app->getContainer()->query(PersonalSettings::class);
-return $controller->getForm()->render();
-
diff --git a/integrations/nextcloud/snappymail/templates/personal_settings.php b/integrations/nextcloud/snappymail/templates/personal_settings.php
old mode 100755
new mode 100644
index ec5ff5026..93a86c744
--- a/integrations/nextcloud/snappymail/templates/personal_settings.php
+++ b/integrations/nextcloud/snappymail/templates/personal_settings.php
@@ -1,21 +1,10 @@
-<?php script('snappymail', 'personal');
-
-$textLink1 = $l->t('may have some');
-$textLink2 = $l->t('security considerations');
-$links = [
-	"<a href=\"https://github.com/pierre-alain-b/rainloop-nextcloud/issues/87\" style=\"text-decoration:underline\" target=\"_blank\">{$textLink1}</a>",
-	"<a href=\"https://github.com/RainLoop/rainloop-webmail/issues/1082\" style=\"text-decoration:underline\" target=\"_blank\">{$textLink2}</a>"
-	]; ?>
-
 <div class="section">
-	<form id="mail-snappymail-personal-form" action="#" method="post">
+	<form class="snappymail" action="personal.php" method="post">
 		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
-		<input type="hidden" name="appname" value="snappymail">
-
 		<fieldset class="personalblock">
-			<h2><?php echo($l->t('SnappyMail Webmail')); ?></h2>
+			<h2><?php echo $l->t('SnappyMail Webmail'); ?></h2>
 			<p>
-				<?php echo($l->t('Enter an email and password to auto-login to SnappyMail. <b>Please note</b> that this feature %s %s.', $links)); ?>
+				<?php echo $l->t('Enter an email and password to auto-login to SnappyMail.'); ?>
 			</p>
 			<p>
 				<input type="text" id="snappymail-email" name="snappymail-email"
@@ -24,7 +13,7 @@ $links = [
 				<input type="password" id="snappymail-password" name="snappymail-password"
 					value="<?php echo $_['snappymail-password']; ?>" placeholder="<?php echo($l->t('Password')); ?>" />
 
-				<input type="button" id="snappymail-save-button" name="snappymail-save-button" value="<?php echo($l->t('Save')); ?>" />
+				<button id="snappymail-save-button" name="snappymail-save-button"><?php echo($l->t('Save')); ?></button>
 				&nbsp;&nbsp;<span class="snappymail-result-desc"></span>
 			</p>
 		</fieldset>
diff --git a/integrations/owncloud/snappymail/CHANGELOG.md b/integrations/owncloud/snappymail/CHANGELOG.md
new file mode 100644
index 000000000..4d0457f06
--- /dev/null
+++ b/integrations/owncloud/snappymail/CHANGELOG.md
@@ -0,0 +1,774 @@
+## 2.24.4 – 2022-12-30
+
+## Added
+- Check PHP_INT_SIZE if SnappyMail runs on 64bit
+
+## Changed
+- A lot of MessageList sorting improvements
+  [#796](https://github.com/the-djmaze/snappymail/pull/796)
+- On upgrade also update plugins in Nextcloud due to many misunderstandings and prevent invalid open issues
+- Moved application.ini labs.use_app_debug_* to debug.*
+
+## Fixed
+- Dutch translation for confusing message (threads vs grouped)
+- Workaround Nextcloud disallowed .htaccess
+  [#790](https://github.com/the-djmaze/snappymail/pull/790)
+- Searching on Nextcloud search failed
+  [#787](https://github.com/the-djmaze/snappymail/pull/787)
+
+
+## 2.24.3 – 2022-12-28
+
+## Changed
+- When sorting on FROM also sort on REVERSE DATE
+
+## Fixed
+- F5 and Ctrl-F5 reload logs out of Snappymail in Chrome.
+  [#800](https://github.com/the-djmaze/snappymail/pull/800)
+- Switching accounts does not work anymore with 2.24.2
+  [#802](https://github.com/the-djmaze/snappymail/pull/802)
+
+
+## 2.24.2 – 2022-12-27
+
+### Changed
+- Disable sorting when viewing message thread
+  [#445](https://github.com/the-djmaze/snappymail/pull/445)
+- Update Chinese translation by @mayswind
+  [#794](https://github.com/the-djmaze/snappymail/pull/794)
+- No need to call IMAP EXAMINE when current folder already SELECT
+- Thread view now has tree indentation
+
+### Fixed
+- Nextcloud failed on Integrity check
+  [#790](https://github.com/the-djmaze/snappymail/pull/790)
+- Deleting message fails with message "Cannot move message" on hMailServer
+  [#793](https://github.com/the-djmaze/snappymail/pull/793)
+- List messages per day feature is enabled by default and breaks sorting
+  [#796](https://github.com/the-djmaze/snappymail/pull/796)
+- Custom page login not working for first time due to smctoken security
+  [#798](https://github.com/the-djmaze/snappymail/pull/798)
+- Message list is always empty due to wrong implementation of RFC 8474
+  [#799](https://github.com/the-djmaze/snappymail/pull/799)
+
+
+## 2.24.1 – 2022-12-23
+
+### Changed
+- Intl.DateTimeFormat() into toLocaleString() for iOS < 14
+- Cleanup locale date/time handling
+- Make MessageList per day optional
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+
+### Fixed
+- Typed property MailSo\Cache\Drivers\Redis::$sKeyPrefix must not be accessed before initialization #792
+  [#792](https://github.com/the-djmaze/snappymail/pull/792)
+- Attachments in mails in 2.24 not loading in reply/forward #789
+  [#789](https://github.com/the-djmaze/snappymail/pull/789)
+- Rollback #280 due to complications
+  [#280](https://github.com/the-djmaze/snappymail/pull/280)
+
+
+## 2.24.0 – 2022-12-22
+
+### Added
+- Option to enable additional account unread messages count
+- Prevent godaddy click tracking
+- Dark theme use `color-scheme: dark;`
+- More imapsync.php CLI options and help
+
+### Changed
+- MessageList now grouped/split per day
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+- Account switcher still shown when allow_additional_accounts is set to Off
+  [#280](https://github.com/the-djmaze/snappymail/pull/280)
+- PHP classes use typed properties
+- Speedup Contacts Suggestions handling
+- Check SMTP SIZE
+  [#779](https://github.com/the-djmaze/snappymail/pull/779)
+
+### Fixed
+- Handle multiple DKIM signatures authentication results
+- Reload admin extensions on update
+- SieveClient quoted string parsing failed
+- Invalid Attachments (PDF)
+  [#466](https://github.com/the-djmaze/snappymail/pull/466)
+- Email HTML images rendering issue
+  [#564](https://github.com/the-djmaze/snappymail/pull/564)
+- "Server message: No supported SASL mechanism found, remote server wants:" in hMailServer
+  [#780](https://github.com/the-djmaze/snappymail/pull/780)
+
+### Removed
+- Some unused plugin hooks to improve Action handling speed
+
+
+## 2.23.1 – 2022-12-15
+
+### Changed
+- More JMAP RFC matching including role
+- Speedup fetch all Folders/mailboxes
+- Disable unused folder_list_limit
+- Merge MailSo\Mail\Folder into MailSo\Imap\Folder and speedup process
+- SnappyMail\Imap\Sync now matches folders based on JMAP role
+- Added the new imapsync.php command line script for
+  [#744](https://github.com/the-djmaze/snappymail/pull/744)
+- Added manual setting for 12/24h clock
+  [#760](https://github.com/the-djmaze/snappymail/pull/760)
+- Add options to mark the message I'm viewing as unread and return to the inbox #766
+
+### Fixed
+- Extension menu shows only some available extensions #778
+- New solution for [#423](https://github.com/the-djmaze/snappymail/pull/423) due to [#774](https://github.com/the-djmaze/snappymail/pull/774)
+- Avatars extension error on smartphone
+  [#764](https://github.com/the-djmaze/snappymail/pull/764)
+- Don't fetch Unread count for main account
+- CSS .e-checkbox.material-design invisible on show/hide
+
+
+## 2.23.0 – 2022-12-08
+
+### Added
+- Show the number of unread mails on all mail addresses/accounts
+  [#437](https://github.com/the-djmaze/snappymail/pull/437)
+- Show OpenSSL version in Admin => About
+
+### Changed
+- Redirect to login page instead of "invalid token" popup
+  [#752](https://github.com/the-djmaze/snappymail/pull/752)
+- Make all dialogs fit in mobile view
+- Changed some Plugin hooks for better handling:
+	* json.action-pre-call => json.before-{actionname}
+	* json.action-post-call => json.after-{actionname}
+- Cleaner accounts list in systemdropdown
+- Multiple imapConnect handling for new import mail feature
+  [#744](https://github.com/the-djmaze/snappymail/pull/744)
+
+### Fixed
+- Loosing HTML signature in account identity under settings
+  [#750](https://github.com/the-djmaze/snappymail/pull/750)
+- Plugin configuration did not load anymore when type was SELECTION by @cm-schl
+  [#753](https://github.com/the-djmaze/snappymail/pull/753)
+- Nextcloud Default theme shows gray text on gray background
+  [#754](https://github.com/the-djmaze/snappymail/pull/754)
+- Only run JSON hooks when $sAction is set
+  [#755](https://github.com/the-djmaze/snappymail/pull/755)
+- Unsupported SASL mechanism OAUTHBEARER
+  [#756](https://github.com/the-djmaze/snappymail/pull/756)
+  [#758](https://github.com/the-djmaze/snappymail/pull/758)
+  [#759](https://github.com/the-djmaze/snappymail/pull/759)
+- border-box issue with .buttonCompose
+
+### Removed
+- Deprecate \RainLoop\Account->Login() and \RainLoop\Account->Password()
+
+
+## 2.22.7 – 2022-12-06
+
+### Changed
+- Scroll bar with the mobile version in "Advanced search" screen
+  [#712](https://github.com/the-djmaze/snappymail/pull/712)
+
+### Fixed
+- Undefined property: MailSo\Mail\FolderCollection::$capabilities
+- PHP 8.2 Creation of dynamic property is deprecated
+- Attempt to solve #745 in v2.22.6 failed and resulted in errors #746 and #748
+  [#745](https://github.com/the-djmaze/snappymail/pull/745)
+  [#746](https://github.com/the-djmaze/snappymail/pull/746)
+  [#748](https://github.com/the-djmaze/snappymail/pull/748)
+- Admin domain test undefined matched domain should say email@example matched domain
+
+
+## 2.22.6 – 2022-12-05
+
+### Changed
+- Narrow MessageList wraps star icon
+  [#737](https://github.com/the-djmaze/snappymail/pull/737)
+- Use UIDVALIDITY when HIGHESTMODSEQ not available, maybe solves
+  [#745](https://github.com/the-djmaze/snappymail/pull/745)
+- No need to generate 1000's of ID's for MessageListByRequestIndexOrUids()
+- Update Chinese translation by @mayswind
+
+### Fixed
+- PluginProperty DefaultValue contained array while it should not
+  [#741](https://github.com/the-djmaze/snappymail/pull/741)
+
+### Removed
+- IMAP SELECT/EXAMINE unset `UNSEEN` because IMAP4rev2 deprecated
+
+
+## 2.22.5 – 2022-12-02
+
+### Added
+- Support plugin minified .min.js and .min.css
+- ZIP Download multiple emails
+  [#717](https://github.com/the-djmaze/snappymail/pull/717)
+
+### Changed
+- Replaced some data-bind="click: function(){} with object functions to prevent eval()
+- Improved plugins hash when there are changes
+
+### Fixed
+- Settings Themes style due to border-box change
+- "Remember me" failed due to v2.22.4 Session token change
+  [#719](https://github.com/the-djmaze/snappymail/pull/719)
+  [#731](https://github.com/the-djmaze/snappymail/pull/731)
+
+### Removed
+- Vacation filter: Button to add recipients (+)
+  [#728](https://github.com/the-djmaze/snappymail/pull/728)
+
+
+## 2.22.4 – 2022-11-28
+
+### Changed
+- Contacts dialog layout using flex
+- Session token is related to the user agent string
+  [#713](https://github.com/the-djmaze/snappymail/pull/713)
+- Better browser cache handling for avatars plugin
+  [#714](https://github.com/the-djmaze/snappymail/pull/714)
+- Force HTML editor when set as default when replying to message
+  [#355](https://github.com/the-djmaze/snappymail/pull/355)
+
+### Fixed
+- Contact Error - object Object
+  [#716](https://github.com/the-djmaze/snappymail/pull/716)
+- Unable to move messages to different folder by drag and drop
+  [#710](https://github.com/the-djmaze/snappymail/pull/710)
+- v2.22.3 unknown error
+  [#709https://github.com/the-djmaze/snappymail/pull/709)
+
+
+## 2.22.3 – 2022-11-25
+
+### Added
+- application.ini config logs.path and cache.path to improve custom data structure.
+
+### Changed
+- Improved cPanel integration
+  [#697](https://github.com/the-djmaze/snappymail/pull/697)
+- Update to OpenPGP.js v5.5.0
+
+### Fixed
+- drag & drop folder expansion
+  [#707](https://github.com/the-djmaze/snappymail/pull/707)
+- Save selected messages as .eml in Nextcloud failed
+  [#704](https://github.com/the-djmaze/snappymail/pull/704)
+
+
+## 2.22.2 – 2022-11-24
+
+### Added
+- Support cPanel #697
+
+
+## 2.22.1 – 2022-11-23
+
+### Added
+- AddressBookInterface::GetContactByEmail() to support sender image/avatar extension
+  [#115](https://github.com/the-djmaze/snappymail/pull/115)
+
+### Changed
+- All the attachment zone is not clickable, even if the cursor is a hand
+  [#691](https://github.com/the-djmaze/snappymail/pull/691)
+- Different approach for "update button duplicated in admin panel"
+  [#677](https://github.com/the-djmaze/snappymail/pull/677)
+- Better drag & drop solution for leftPanel
+
+### Fixed
+- The page does not change after batch deletion
+  [#684](https://github.com/the-djmaze/snappymail/pull/684)
+- Prevent domain uppercase issues found in
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Login invalid response: VXNlcm5hbWU6CG
+  [#693](https://github.com/the-djmaze/snappymail/pull/693)
+
+
+## 2.21.4 – 2022-11-22
+
+### Added
+- Added domain matcher test for
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Download all Attachments of selected Emails
+  [#361](https://github.com/the-djmaze/snappymail/pull/361)
+
+### Changed
+- Log current shortcuts scope for
+  [#690](https://github.com/the-djmaze/snappymail/pull/690)
+- CSS everything to be box-sizing: border-box;
+- Make messageview a bit larger so that it is the same height as the messagelist
+- Cleanup and rearrange some fontastic glyphs
+- Also show From email address by default
+  [#683](https://github.com/the-djmaze/snappymail/pull/683)
+
+### Fixed
+- Contact.display() returns [object Object]
+- When left panel disabled and drag messages, show it
+- Issue with admin domain connection type settings selectbox
+  [#689](https://github.com/the-djmaze/snappymail/pull/689)
+- Mobile View on cellphones: automatic scrolling not working near the visual keyboard
+  [#686](https://github.com/the-djmaze/snappymail/pull/686)
+- Unable to separate runtime from installation
+  [#685](https://github.com/the-djmaze/snappymail/pull/685)
+
+### Removed
+- Removed inline parameter of checkbox and select components
+
+
+## 2.21.3 – 2022-11-16
+
+### Added
+- Click on PGP KEY attachment opens "Import key" dialog
+
+### Changed
+- Increase visible reading area for small screens
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+- Improved message spam score detailed view
+- Improved DAV connection logging
+
+### Fixed
+- Handling attachments MIME type / content-type
+- Message responsive resizing width/height of elements
+  [#678](https://github.com/the-djmaze/snappymail/pull/678)
+- Focus on textarea when creating a new plain text email
+  [#501](https://github.com/the-djmaze/snappymail/pull/501)
+- CardDav remove photos of my contacts when synchronizing
+  [#679](https://github.com/the-djmaze/snappymail/pull/679)
+
+### Removed
+- \MailSo\Mime\Enumerations\MimeType
+
+### Nextcloud
+- Use fontastic in Nextcloud Files selector dialog
+- Firefox < 98 dialogs
+  [#673](https://github.com/the-djmaze/snappymail/pull/673)
+
+## 2.21.2 – 2022-11-15
+
+### Added
+- Allow browser Spellchecker
+  [#574](https://github.com/the-djmaze/snappymail/pull/574)
+- Decode MIME charset of .EML attachments
+  [#662](https://github.com/the-djmaze/snappymail/pull/662)
+
+### Changed
+- Increase message visible text area
+  [#672](https://github.com/the-djmaze/snappymail/pull/672)
+- When copy/paste image use the raw data instead of clipboard HTML
+  [#654](https://github.com/the-djmaze/snappymail/pull/654)
+- When application.ini debug.enable is true, also debug js and css
+- JavaScript rl.setWindowTitle() renamed to rl.setTitle()
+
+### Removed
+- Message toggle fullscreen button which was only in mobile view
+
+### Nextcloud
+- Workaround Nextcloud calendar crashes
+  [#622](https://github.com/the-djmaze/snappymail/pull/622)
+  [#661](https://github.com/the-djmaze/snappymail/pull/661)
+- Added share public/internal file link
+  [#569](https://github.com/the-djmaze/snappymail/pull/569)
+
+
+## 2.21.1 – 2022-11-13
+
+### Fixed
+- Crypt crashes when Sodium not installed
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+  [#657](https://github.com/the-djmaze/snappymail/pull/657)
+  [#663](https://github.com/the-djmaze/snappymail/pull/663)
+  [#664](https://github.com/the-djmaze/snappymail/pull/664)
+  [#668](https://github.com/the-djmaze/snappymail/pull/668)
+  [#669](https://github.com/the-djmaze/snappymail/pull/669)
+- Personalised favicon not working - default Snappymail favicon showing
+  [#665](https://github.com/the-djmaze/snappymail/pull/665)
+
+### Nextcloud
+- v23 ContentSecurityPolicy versions issue
+  [#666](https://github.com/the-djmaze/snappymail/pull/666)
+
+
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by
+  [#585](https://github.com/the-djmaze/snappymail/pull/585)
+- Light/Dark favicon.svg
+  [#643](https://github.com/the-djmaze/snappymail/pull/643)
+- Allow an account name/label
+  [#571](https://github.com/the-djmaze/snappymail/pull/571)
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen
+  [#638](https://github.com/the-djmaze/snappymail/pull/638)
+
+### Fixed
+- ldap-identities-plugin by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+- OpenSSL v3 ciphers issue
+  [#641](https://github.com/the-djmaze/snappymail/pull/641)
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
+## 2.20.6 – 2022-11-08
+
+### Fixed
+- ?admin login failed
+  [#642](https://github.com/the-djmaze/snappymail/pull/642)
+- Resolve PHP 8.2 Creation of dynamic property is deprecated
+
+
+## 2.20.5 – 2022-11-08
+
+### Nextcloud
+- Improved workaround for Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.3 – 2022-11-07
+
+### Added
+- Throw decrypt errors
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+
+### Changed
+- Better multiple WYSIWYG registration system (not finished)
+- Better handling of admin token cookie
+
+### Fixed
+- Cookie “name” has been rejected because it is already expired.
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+- Content-Security-Policy 'strict-dynamic' was missing
+
+### Nextcloud
+- Better handling of Content-Security-Policy
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+- Nextcloud 23 Error Call to undefined method useStrictDynamic()
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+- Use snappymail icon as favicon-mask.svg instead default nextcloud logo
+  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+
+
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
+## 2.20.1 – 2022-11-04
+
+### Added
+- Added CSS --dialog-border-clr and --dialog-border-radius
+- Show lock (lock) glyph in messagelist for encrypted messages
+
+### Fixed
+- Decrypt failed when OpenPGP.js not loaded
+
+### Nextcloud
+- Now integrate with Nextcloud by default, but keep iframe option available
+- Better theme integration with Nextcloud
+- Use Nextcloud 18+ IEventDispatcher
+- Solve Nextcloud 25 CSS issues
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+- PutinICS does is not working for all calendar events
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+- Update readme by @cm-schl
+  [#617](https://github.com/the-djmaze/snappymail/issues/617)
+
+
+## 2.20.0 – 2022-11-03
+
+### Added
+- Strip mailchimp tracking
+
+### Changed
+- Use some PHP typed properties
+- Move bootstrap @less variables to CSS var()
+- Improved theme styling
+
+### Fixed
+- CSS --dropdown-menu-background-color should be --dropdown-menu-bg-color
+
+### Nextcloud
+- Disable Nextcloud Impersonate check due to login/logout complications
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- Improved theme integration and be compatible with Breeze Dark
+
+
+## 2.19.7 – 2022-11-02
+
+### Added
+- Make it clear that you are on the admin panel login screen
+- Force PHP opcache_invalidate due to upgrade error reports "Missing version directory"
+
+### Fixed
+- Switching user (impersonate plugin) keeps old Email logged in
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- PGP Decryption / Encryption Failures
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+- Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+- Cannot access admin panel
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+- Wont show my emails
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+- Return type of MailSo\Base\StreamFilters\LineEndings::filter
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+- Create .pgp directory was missing
+
+### Security
+- Logger leaked some passwords
+
+## 2.19.6 – 2022-10-31
+
+### Added
+- Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
+- Filter scripts UI let user understand which filter is active
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+
+### Fixed
+- Method 'GetRequest' not found in \MailSo\Base\Http
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+
+### Changed
+- Base Domain setup enhancements
+- Cleanup MailSo MailClient using __call()
+- Domain settings handling and store as JSON instead of ini
+- Some JavaScript changes
+- When try to login IMAP/SMTP/SIEVE but STARTTLS is required, force STARTTLS
+- Embed admin panel into Nextcloud (with autologin, no need for separate login)
+- Don't set default_domain in Nextcloud when already set
+
+### Removed
+- Nextcloud dark mode, it is incomplete
+
+### Deprecated
+- nothing
+## 2.21.0 – 2022-11-11
+
+### Added
+- Put messagelist top bar buttons also in dropdown
+- Allow setting additional Sec-Fetch rules, as discussed by #585
+- Light/Dark favicon.svg #643
+- Allow an account name/label #571
+
+### Changed
+- Moved ServiceRemoteAutoLogin to plugin/extension
+- Moved ServiceExternalSso to plugin/extension
+- Moved ServiceExternalLogin to plugin/extension
+- Renamed ManageSieveClient to SieveClient
+- New Net/Imap/Smtp/Sieve Settings object system which allows
+  setting SSL options per domain and verify_certificate by default
+- Update plugins to use new Net/Imap/Smtp/Sieve Settings object
+- Removed message double-click to full screen #638
+
+### Fixed
+- ldap-identities-plugin by @cm-schl
+  [#647](https://github.com/the-djmaze/snappymail/pull/647)
+- OpenSSL v3 ciphers issue #641
+
+### Nextcloud
+- Style PopupsNextcloudFiles view
+- Link to internal files in composer
+
+
+## 2.20.6 – 2022-11-08
+
+### Fixed
+- ?admin login failed
+  [#642](https://github.com/the-djmaze/snappymail/pull/642)
+- Resolve PHP 8.2 Creation of dynamic property is deprecated
+
+
+## 2.20.5 – 2022-11-08
+
+### Nextcloud
+- Improved workaround for Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.4 – 2022-11-07
+
+### Fixed
+- Nextcloud no-embed use iframe mode failed
+
+### Nextcloud
+- Workaround Nextcloud Content-Security-Policy bug
+  Safari [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  Edge [#633](https://github.com/the-djmaze/snappymail/issues/633)
+  Reported [#35013](https://github.com/nextcloud/server/issues/35013)
+
+
+## 2.20.3 – 2022-11-07
+
+### Added
+- Throw decrypt errors
+  [#632](https://github.com/the-djmaze/snappymail/issues/632)
+
+### Changed
+- Better multiple WYSIWYG registration system (not finished)
+- Better handling of admin token cookie
+
+### Fixed
+- Cookie “name” has been rejected because it is already expired.
+  [#636](https://github.com/the-djmaze/snappymail/issues/636)
+- Content-Security-Policy 'strict-dynamic' was missing
+
+### Nextcloud
+- Better handling of Content-Security-Policy
+  [#631](https://github.com/the-djmaze/snappymail/issues/631)
+  [#633](https://github.com/the-djmaze/snappymail/issues/633)
+- Nextcloud 23 Error Call to undefined method useStrictDynamic()
+  [#634](https://github.com/the-djmaze/snappymail/issues/634)
+- Use snappymail icon as favicon-mask.svg instead default nextcloud logo
+  [#635](https://github.com/the-djmaze/snappymail/issues/635)
+
+
+## 2.20.2 – 2022-11-05
+
+### Added
+- Add more search operators (i.e. copy lots of Gmail ones)
+  [#625](https://github.com/the-djmaze/snappymail/issues/625)
+
+### Changed
+- Some CSS borders to var(--border-color)
+
+### Fixed
+- pgpDecrypt() using MailVelope the decrypt message was not green
+- Shift + F in search bar resulted in forwarding message
+  [#624](https://github.com/the-djmaze/snappymail/issues/624)
+
+### Nextcloud
+- auto login mechanism not working anymore
+  [#627](https://github.com/the-djmaze/snappymail/issues/627)
+
+
+## 2.20.1 – 2022-11-04
+
+### Added
+- Added CSS --dialog-border-clr and --dialog-border-radius
+- Show lock (lock) glyph in messagelist for encrypted messages
+
+### Fixed
+- Decrypt failed when OpenPGP.js not loaded
+
+### Nextcloud
+- Now integrate with Nextcloud by default, but keep iframe option available
+- Better theme integration with Nextcloud
+- Use Nextcloud 18+ IEventDispatcher
+- Solve Nextcloud 25 CSS issues
+  [#620](https://github.com/the-djmaze/snappymail/issues/620)
+- PutinICS does is not working for all calendar events
+  [#622](https://github.com/the-djmaze/snappymail/issues/622)
+- Update readme by @cm-schl
+  [#617](https://github.com/the-djmaze/snappymail/issues/617)
+
+
+## 2.20.0 – 2022-11-03
+
+### Added
+- Strip mailchimp tracking
+
+### Changed
+- Use some PHP typed properties
+- Move bootstrap @less variables to CSS var()
+- Improved theme styling
+
+### Fixed
+- CSS --dropdown-menu-background-color should be --dropdown-menu-bg-color
+
+### Nextcloud
+- Disable Nextcloud Impersonate check due to login/logout complications
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- Improved theme integration and be compatible with Breeze Dark
+
+
+## 2.19.7 – 2022-11-02
+
+### Added
+- Make it clear that you are on the admin panel login screen
+- Force PHP opcache_invalidate due to upgrade error reports "Missing version directory"
+
+### Fixed
+- Switching user (impersonate plugin) keeps old Email logged in
+  [#561](https://github.com/the-djmaze/snappymail/issues/561)
+- PGP Decryption / Encryption Failures
+  [#600](https://github.com/the-djmaze/snappymail/issues/600)
+- Undefined constant "OCA\SnappyMail\Util\RAINLOOP_APP_LIBRARIES_PATH
+  [#601](https://github.com/the-djmaze/snappymail/issues/601)
+- Cannot access admin panel
+  [#602](https://github.com/the-djmaze/snappymail/issues/602)
+- Wont show my emails
+  [#604](https://github.com/the-djmaze/snappymail/issues/604)
+- Return type of MailSo\Base\StreamFilters\LineEndings::filter
+  [#610](https://github.com/the-djmaze/snappymail/issues/610)
+- Create .pgp directory was missing
+
+### Security
+- Logger leaked some passwords
+
+## 2.19.6 – 2022-10-31
+
+### Added
+- Put sign and encrypt options in composer dropdown menu and simplify te two existing buttons with a glyph
+- Filter scripts UI let user understand which filter is active
+  [#590](https://github.com/the-djmaze/snappymail/issues/590)
+
+### Fixed
+- Method 'GetRequest' not found in \MailSo\Base\Http
+  [#585](https://github.com/the-djmaze/snappymail/issues/585)
+
+### Changed
+- Base Domain setup enhancements
+- Cleanup MailSo MailClient using __call()
+- Domain settings handling and store as JSON instead of ini
+- Some JavaScript changes
+- When try to login IMAP/SMTP/SIEVE but STARTTLS is required, force STARTTLS
+- Embed admin panel into Nextcloud (with autologin, no need for separate login)
+- Don't set default_domain in Nextcloud when already set
+
+### Removed
+- Nextcloud dark mode, it is incomplete
+
+### Deprecated
+- nothing
diff --git a/integrations/owncloud/snappymail/INSTALL b/integrations/owncloud/snappymail/INSTALL
new file mode 100644
index 000000000..e199b596b
--- /dev/null
+++ b/integrations/owncloud/snappymail/INSTALL
@@ -0,0 +1,17 @@
+************************************************************************
+*
+* ownCloud - SnappyMail Webmail package
+*
+* @author SnappyMail Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b)
+*
+************************************************************************
+
+REQUIREMENTS:
+- ownCloud version 10 and above
+
+INSTALL & CONFIGURATION:
+Start within ownCloud, and click on the "+ Apps" button in the upper-left corner dropdown menu:
+Then, enable the SnappyMail plugin that is in the "Social & communication" section.
+After a quick wait, SnappyMail is installed. Even if it is really attractive, it is too soon to click on the newly appeared "Email" icon in the apps list. You should configure SnappyMail before using it (which makes some sense, doesn'it): go to ownCloud admin panel (upper-right corner dropdown menu) and go to "Additionnal settings". There click on the "Go to SnappyMail Webmail admin panel".
+In the SnappyMail admin prompt, the default login is "admin" and the default password will be generated in "[nextcloud-data]/app_snappymail/_data_/_default_/admin_password.txt". No need to advise you to change it once in the admin panel!
+This is it, you are now free to configure SnappyMail as you wish. One important point is the Domains section when you will set up the IMAP/SMTP parameters that shall be associated with the email adresses of your users.
diff --git a/integrations/owncloud/snappymail/README.md b/integrations/owncloud/snappymail/README.md
new file mode 100644
index 000000000..dd64fad96
--- /dev/null
+++ b/integrations/owncloud/snappymail/README.md
@@ -0,0 +1,97 @@
+# snappymail-owncloud
+
+snappymail-owncloud is a plugin for ownCloud to use the excellent SnappyMail webmail (https://snappymail.eu/).
+
+Thank you to all contributors to SnappyMail for ownCloud:
+- RainLoop Team, who initiated it
+- [pierre-alain-b](https://github.com/pierre-alain-b/rainloop-owncloud)
+- Tab Fitts (@tabp0le)
+- Nextgen Networks (@nextgen-networks)
+- [All testers of issue 96](https://github.com/the-djmaze/snappymail/issues/96)
+
+## How to Install
+
+Start within ownCloud as user with administrator rights and click on the "+ Apps" button in the upper-right corner dropdown menu:
+
+![Image1](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/help_a1.png)
+
+Then, enable the SnappyMail plugin that you will find in the "Social & communication" section:
+
+![Image2](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/help_a2.png)
+
+After a quick wait, SnappyMail is installed. Now you should configure it before use: open the ownCloud admin panel (upper-right corner dropdown menu -> Settings) and go to "Additional settings" under the "Administration" section. There, click on the "Go to SnappyMail Webmail admin panel" link.
+
+![Image3](https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/owncloud-admin.png)
+
+To enter SnappyMail admin area, you must be ownCloud admin (so you get logged in automatically) or else use the admin login credentials.
+The default login is "admin" and the default password will be generated in `[owncloud-data]/app_snappymail/_data_/_default_/admin_password.txt`. Don't forget to change it once in the admin panel!
+
+From that point, all instance-wide SnappyMail settings can be tweaked as you wish. One important point is the "Domains" section where you should set up the IMAP/SMTP parameters that will be associated with the email adresses of your users. Basically, if a user of the ownCloud instance starts SnappyMail and puts "firstname@domain.tld" as an email address, then SnappyMail should know how to connect to the IMAP & SMTP of domain.tld. You can fill in this information in the "Domains" section of the SnappyMail admin settings. For more information how to configure an automatic login for your ownCloud users see [How to auto-connect to SnappyMail?](#how-to-auto-connect-to-snappymail)
+
+![grafik](https://user-images.githubusercontent.com/63400209/199767908-fbef0f50-ecb7-47ae-9ac1-771959d4b7f5.png)
+
+![grafik](https://user-images.githubusercontent.com/63400209/199768097-7bd939a7-56d0-47ba-b481-aeac08776fb4.png)
+
+
+## SnappyMail Settings, Where Are They?
+
+SnappyMail for ownCloud is highly configurable. But settings are available in multiple places and this can be misleading for first-time users.
+
+### SnappyMail admin settings
+SnappyMail admin settings can be reached only by the ownCloud administrator. Open the ownCloud admin panel ("Admin" in the upper-right corner dropdown menu) and go to "Additionnal settings". There, click on the "Go to SnappyMail Webmail admin panel" link. Alternatively, you may use the following link: https://path.to.owncloud/index.php/apps/snappymail/?admin.
+
+SnappyMail admin settings include all settings that will apply to all SnappyMail users (default login rules, branding, management of plugins, security rules and domains).
+
+### SnappyMail user settings
+Each user of SnappyMail can also change user-specific behaviors in the SnappyMail user settings. SnappyMail user settings are found within SnappyMail by clicking on the user button (in the upper-right corner of SnappyMail) and then choosing "Settings" in the dropdown menu.
+
+SnappyMail user settings include management of contacts, of email accounts, of folders, appearance and OpenPGP.
+
+### The specificity of SnappyMail user accounts
+The plugin passes the login information of the user to the SnappyMail app which then creates and manages the user accounts. Accounts in SnappyMail are based soley on the authenticated email accounts, and do not take into account the owncloud user which created them in the first place. If two or more ownCloud users have the same email account in additional settings, they will in fact share the same 'email account' in SnappyMail including any additional email accounts that they may have added subsequently to their main account.
+This is to be kept in mind for the use case where multiple users shall have the same email account but may be also tempted to add additionnal acounts to their SnappyMail.
+
+## How to auto-connect to SnappyMail?
+
+### Default Domain
+As already said SnappyMail uses the domain part (@example.com) to choose the IMAP/SMTP server to use. If in the following settings the username passed to SnappyMail does not contain a domain, the "default domain" is added to this username. In this way SnappyMail can lookup the "Domain" configuration to use (IMAP, SMTP, SIEVE server ecc.).
+Example: if the username `john` is passed to SnappyMail, the "default domain" `example.com` would be added to the username basing on your configuration. So SnappyMail would try to login the user with the username `john@example.com`.
+
+You can configure the "default domain" and connected settings in the SnappyMail Admin Panel under the menu "Login".
+
+### Auto-connect options
+The ownCloud administrator can choose how SnappyMail tries to automatically login when a user clicks on the icon of SnappyMail within ownCloud. There are different options that can be found in the ownCloud "Settings -> Administration -> Additional settings":
+
+#### Option 1: Users will login manually, or define credentials in their personal settings for automatic logins.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the user is prompted by SnappyMail to insert his credentials every time he tries to open the SnappyMail App within ownCloud.
+
+#### Option 2: Attempt to automatically login users with their ownCloud username and password, or user-defined credentials, if set.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the ownCloud username and password is used by SnappyMail to login (eventually adding the [default domain](#default-domain)).
+
+If your IMAP server only accepts usernames without a domain (for example the ldap username of your user) the automatic addition of the "default domain" would block your users from logging in to your IMAP server - but on the other side it is needed by SnappyMail to determine the server settings to use. In such a case you must configure SnappyMail to strip off the domain part before sending the credentials to your IMAP server. This is done by entering to the SnappyMail Admin Panel -> Domains -> clicking on your default domain -> flagging the checkbox "Use short login" under IMAP and SMTP.
+
+#### Option 3: Attempt to automatically login users with their ownCloud email and password, or user-defined credentials, if set.
+If the user sets his credentials for the mailbox in his personal account under "Settings -> Additional settings", these credentials are used by SnappyMail to login.
+If no personal credentials are defined the mail address of the ownCloud user and his password are used by SnappyMail to login. SnappyMail will lookup the "Domain" settings for a configuration that meets the domain part of the mail address passed as username.
+
+### Auto-connection for all ownCloud users
+If your ownCloud users base is synchronized with an email system, then it is possible that ownCloud credentials could be used right away to access the centralized email system. In the SnappyMail admin settings, the ownCloud administrator can then tick the "Automatically login with ownCloud/ownCloud user credentials" checkbox.
+
+Beware, if you tick this box, all ownCloud users will *not* be able to use the override it with the setting below.
+
+### Auto-connection for one user at a time
+Except if the above setting is activated, any ownCloud user can have ownCloud and SnappyMail keep in mind the default email/password to connect to SnappyMail. There, logging in ownCloud is sufficient to then access SnappyMail within ownCloud.
+
+To fill in the default email address and password to use, each ownCloud user should go in the personal settings: choose "Settings" in the upper-right corner dropdown menu. Under "Personal" select the "Additional settings" section where you can find the "SnappyMail Webmail" settings. You can also use this direct link: https://path.to.owncloud/settings/user/additional.
+
+
+## How to Activate SnappyMail Logging and then Find Logs
+
+You can activate SnappyMail logging here: `/path/to/owncloud/data/appdata_snappymail/_data_/_default_/configs/application.ini`
+```
+[logs]
+enable = On
+```
+Logs are then available in `/path/to/owncloud/data/appdata_snappymail/_data_/_default_/logs/`
diff --git a/integrations/owncloud/snappymail/appinfo/info.xml b/integrations/owncloud/snappymail/appinfo/info.xml
new file mode 100644
index 000000000..84ce9cb7f
--- /dev/null
+++ b/integrations/owncloud/snappymail/appinfo/info.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0"?>
+<info xmlns:xsi= "http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://apps.nextcloud.com/schema/apps/info.xsd">
+	<id>snappymail</id>
+	<name>SnappyMail</name>
+	<summary>SnappyMail Webmail</summary>
+	<version>2.24.4</version>
+	<licence>agpl</licence>
+	<author>SnappyMail, RainLoop Team, Nextgen-Networks, Tab Fitts, Nathan Kinkade, Pierre-Alain Bandinelli</author>
+	<description><![CDATA[**Simple, modern, lightweight & fast web-based email client.**
+
+- **Dark mode**
+- **Responsive design**
+- **Full Sieve filtering support**
+- **Almost all IMAP features** including advanced searching
+- **Multiple mail accounts and identities**
+- **Send & receive OpenPGP encrypted/signed emails** (With full HTML support, ECC keys, or plain text with Mailvelope)
+- **Many security features** (Sodium encrypted passwords, Sec-Fetch, TOTP 2FA, DKIM, prevent tracking, etc.)
+- **Kolab integrations**
+
+After enabling in ownCloud, go to ownCloud admin panel, "Additional settings" and you will see a "SnappyMail webmail" section.
+There, click on the link to go to the SnappyMail admin panel.
+	]]></description>
+	<namespace>SnappyMail</namespace>
+	<documentation>
+		<user>https://github.com/the-djmaze/snappymail/blob/master/integrations/owncloud/snappymail/README.md</user>
+		<website>https://github.com/the-djmaze/snappymail/wiki</website>
+	</documentation>
+	<category>integration</category>
+	<category>office</category>
+	<category>search</category>
+	<category>social</category>
+	<screenshot>https://raw.githubusercontent.com/the-djmaze/snappymail/master/integrations/owncloud/screenshots/inbox.jpg</screenshot>
+	<website>https://snappymail.eu</website>
+	<discussion>https://github.com/the-djmaze/snappymail/discussions</discussion>
+	<repository>https://github.com/the-djmaze/snappymail/tree/master/integrations/owncloud</repository>
+	<bugs>https://github.com/the-djmaze/snappymail/issues</bugs>
+	<dependencies>
+		<php min-version="7.4" min-int-size="64" />
+		<lib>mbstring</lib>
+		<lib>zlib</lib>
+<!--
+		<lib>gnupg</lib>
+		<lib>curl</lib>
+		<lib>exif</lib>
+		<lib>gd</lib>
+		<lib>gmagick</lib>
+		<lib>imagick</lib>
+		<lib>iconv</lib>
+		<lib>intl</lib>
+		<lib>ldap</lib>
+		<lib>openssl</lib>
+		<lib>sodium</lib>
+		<lib>redis</lib>
+		<lib>pdo_mysql</lib>
+		<lib>pdo_pgsql</lib>
+		<lib>pdo_sqlite</lib>
+		<lib>tidy</lib>
+		<lib>uuid</lib>
+		<lib>xxtea</lib>
+		<lib>zip</lib>
+-->
+		<owncloud min-version="10.11" max-version="11" />
+	</dependencies>
+	<settings>
+		<admin>OCA\SnappyMail\Settings\AdminSettings</admin>
+		<personal>OCA\SnappyMail\Settings\PersonalSettings</personal>
+	</settings>
+	<navigations>
+		<navigation>
+			<name>Email</name>
+			<route>snappymail.page.index</route>
+			<icon>logo-white-64x64.png</icon>
+			<order>4</order>
+		</navigation>
+	</navigations>
+</info>
diff --git a/integrations/owncloud/snappymail/appinfo/routes.php b/integrations/owncloud/snappymail/appinfo/routes.php
new file mode 100644
index 000000000..5304f9869
--- /dev/null
+++ b/integrations/owncloud/snappymail/appinfo/routes.php
@@ -0,0 +1,41 @@
+<?php
+
+return [
+	'routes' => [
+		[
+			'name' => 'page#index',
+			'url' => '/',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'page#indexPost',
+			'url' => '/',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'page#appGet',
+			'url' => '/run/',
+			'verb' => 'GET'
+		],
+		[
+			'name' => 'page#appPost',
+			'url' => '/run/',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'fetch#setPersonal',
+			'url' => '/fetch/personal.php',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'fetch#setAdmin',
+			'url' => '/fetch/admin.php',
+			'verb' => 'POST'
+		],
+		[
+			'name' => 'fetch#upgrade',
+			'url' => '/fetch/upgrade',
+			'verb' => 'POST'
+		]
+	]
+];
diff --git a/integrations/owncloud/snappymail/css/embed.css b/integrations/owncloud/snappymail/css/embed.css
new file mode 100644
index 000000000..150a27fe9
--- /dev/null
+++ b/integrations/owncloud/snappymail/css/embed.css
@@ -0,0 +1,124 @@
+/*
+This stylesheet is used when SnappyMail runs in embed mode.
+*/
+#content.app-snappymail {
+	max-height: 100%;
+}
+#content #rl-app {
+	position: relative;
+	min-width: 100%;
+	min-height: 100%;
+}
+
+.squire-wysiwyg {
+	min-width: 100%;
+	min-height: 100%;
+}
+
+#V-AdminPane .btn-logout {
+	display: none;
+}
+
+#rl-app select,
+#rl-app input
+{
+	min-height: auto;
+	height: auto;
+	margin: 0;
+	padding: 3px;
+}
+#rl-app .select, #rl-app select {
+	padding-right: 1.5em !important;
+}
+
+#rl-app button.btn:not(.button-vue) {
+	min-height: auto;
+	height: auto;
+	margin: 0;
+	padding: 4px 12px;
+}
+
+#rl-app .form-horizontal .control-group > :not(label)
+{
+	margin-left: 20px;
+}
+
+#rl-app .LoginView .fontastic + input {
+	padding-left: 30px;
+}
+
+#rl-app .loading::after {
+	display: none;
+}
+
+#rl-app .squire-plain, #rl-app .squire-wysiwyg {
+	font-size: 13px;
+	height: 100%;
+	line-height: 16px;
+	min-height: 200px;
+}
+
+#rl-app tbody tr:hover {
+	background-color: inherit;
+}
+
+#rl-app table {
+	white-space: inherit;
+}
+
+body > header ul {
+	margin: 0;
+}
+
+#rl-app h3 {
+	color: inherit;
+}
+
+.messageListItem * {
+	cursor: pointer;
+}
+
+/**
+ * Firefox < 98
+ * https://github.com/the-djmaze/snappymail/issues/673
+ */
+#rl-app dialog.polyfill {
+	margin-top: 50px;
+	max-height: calc(100vh - 60px);
+}
+
+/**
+ * hampoelz
+ * https://github.com/the-djmaze/snappymail/issues/96#issuecomment-1279783076
+ */
+
+.messageList {
+	margin: 0 5px 0 0;
+}
+
+a.selectable {
+	margin: 2px;
+	height: 38px !important;
+	line-height: 38px !important;
+	border-radius: var(--border-radius-pill);
+}
+
+a.selectable::after {
+	display: block;
+	margin: 0 !important;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.btn {
+	border: initial !important;
+}
+
+@media print {
+	#body-user #header {
+		display: none;
+	}
+	#content {
+		padding-top: 0;
+	}
+}
diff --git a/integrations/owncloud/snappymail/css/style.css b/integrations/owncloud/snappymail/css/style.css
new file mode 100644
index 000000000..88f73b2f7
--- /dev/null
+++ b/integrations/owncloud/snappymail/css/style.css
@@ -0,0 +1,6 @@
+/*
+Empty style sheet!
+Only needed to give you the opportunity to theme the owncloud part
+of the snappymail app with the theming system integrated in ownCoud
+if the snappymail app is activated.
+*/
diff --git a/assets/favicon.png b/integrations/owncloud/snappymail/img/favicon-touch.png
similarity index 100%
rename from assets/favicon.png
rename to integrations/owncloud/snappymail/img/favicon-touch.png
diff --git a/integrations/owncloud/snappymail/img/favicon.ico b/integrations/owncloud/snappymail/img/favicon.ico
new file mode 100644
index 000000000..ce6462649
Binary files /dev/null and b/integrations/owncloud/snappymail/img/favicon.ico differ
diff --git a/integrations/owncloud/snappymail/img/logo-64x64.png b/integrations/owncloud/snappymail/img/logo-64x64.png
new file mode 100644
index 000000000..78ab30b38
Binary files /dev/null and b/integrations/owncloud/snappymail/img/logo-64x64.png differ
diff --git a/integrations/owncloud/snappymail/img/logo-white-64x64.png b/integrations/owncloud/snappymail/img/logo-white-64x64.png
new file mode 100644
index 000000000..1bca3e09a
Binary files /dev/null and b/integrations/owncloud/snappymail/img/logo-white-64x64.png differ
diff --git a/integrations/owncloud/snappymail/js/snappymail.js b/integrations/owncloud/snappymail/js/snappymail.js
new file mode 100644
index 000000000..f3aae6f49
--- /dev/null
+++ b/integrations/owncloud/snappymail/js/snappymail.js
@@ -0,0 +1,107 @@
+/**
+ * Nextcloud - SnappyMail mail plugin
+ *
+ * @author RainLoop Team, Nextgen-Networks (@nextgen-networks), Tab Fitts (@tabp0le), Pierre-Alain Bandinelli (@pierre-alain-b), SnappyMail
+ *
+ * Based initially on https://github.com/RainLoop/rainloop-webmail/tree/master/build/owncloud/rainloop-app
+ */
+
+// Do the following things once the document is fully loaded.
+document.onreadystatechange = () => {
+	if (document.readyState === 'complete') {
+		watchIFrameTitle();
+		let form = document.querySelector('form.snappymail');
+		form && SnappyMailFormHelper(form);
+	}
+};
+
+// The SnappyMail application is already configured to modify the <title> element
+// of its root document with the number of unread messages in the inbox.
+// However, its document is the SnappyMail iframe. This function sets up a
+// Mutation Observer to watch the <title> element of the iframe for changes in
+// the unread message count and propagates that to the parent <title> element,
+// allowing the unread message count to be displayed in the NC tab's text when
+// the SnappyMail app is selected.
+function watchIFrameTitle() {
+	let iframe = document.getElementById('rliframe');
+	if (!iframe) {
+		return;
+	}
+	let target = iframe.contentDocument.getElementsByTagName('title')[0];
+	let config = {
+		characterData: true,
+		childList: true,
+		subtree: true
+	};
+	let observer = new MutationObserver(mutations => {
+		let title = mutations[0].target.innerText;
+		if (title) {
+			let matches = title.match(/\(([0-9]+)\)/);
+			if (matches) {
+				document.title = '('+ matches[1] + ') ' + t('snappymail', 'Email') + ' - Nextcloud';
+			} else {
+				document.title = t('snappymail', 'Email') + ' - Nextcloud';
+			}
+		}
+	});
+	observer.observe(target, config);
+}
+
+function SnappyMailFormHelper(oForm)
+{
+	try
+	{
+		var
+			oSubmit = document.getElementById('snappymail-save-button'),
+			sSubmitValue = oSubmit.textContent,
+			oDesc = oForm.querySelector('.snappymail-result-desc')
+		;
+
+		oForm.addEventListener('submit', oEvent => {
+			oEvent.preventDefault();
+
+			oForm.classList.add('snappymail-fetch')
+			oForm.classList.remove('snappymail-error')
+			oForm.classList.remove('snappymail-success')
+
+			oDesc.textContent = '';
+			oSubmit.textContent = '...';
+
+			let data = new FormData(oForm);
+			data.set('appname', 'snappymail');
+
+			fetch(OC.filePath('snappymail', 'fetch', oForm.getAttribute('action')), {
+				mode: 'same-origin',
+				cache: 'no-cache',
+				redirect: 'error',
+				referrerPolicy: 'no-referrer',
+				credentials: 'same-origin',
+				method: 'POST',
+				headers: {},
+				body: data
+			})
+			.then(response => response.json())
+			.then(oData => {
+				let bResult = 'success' === oData?.status;
+				oForm.classList.remove('snappymail-fetch');
+				oSubmit.textContent = sSubmitValue;
+				if (oData?.Message) {
+					oDesc.textContent = t('snappymail', oData.Message);
+				}
+				if (bResult) {
+					oForm.classList.add('snappymail-success');
+				} else {
+					oForm.classList.add('snappymail-error');
+					if ('' === oDesc.textContent) {
+						oDesc.textContent = t('snappymail', 'Error');
+					}
+				}
+			});
+
+			return false;
+		});
+	}
+	catch(e) {
+		console.error(e);
+	}
+}
diff --git a/integrations/owncloud/snappymail/l10n/en_GB.js b/integrations/owncloud/snappymail/l10n/en_GB.js
new file mode 100644
index 000000000..dc856193f
--- /dev/null
+++ b/integrations/owncloud/snappymail/l10n/en_GB.js
@@ -0,0 +1,9 @@
+OC.L10N.register(
+    "snappymail",
+    {
+    "Email" : "Email",
+    "Error" : "Error",
+    "Save" : "Save",
+    "Password" : "Password"
+},
+"nplurals=2; plural=(n != 1);");
diff --git a/integrations/owncloud/snappymail/l10n/en_GB.json b/integrations/owncloud/snappymail/l10n/en_GB.json
new file mode 100644
index 000000000..98a2adb74
--- /dev/null
+++ b/integrations/owncloud/snappymail/l10n/en_GB.json
@@ -0,0 +1,7 @@
+{ "translations": {
+    "Email" : "Email",
+    "Error" : "Error",
+    "Save" : "Save",
+    "Password" : "Password"
+},"pluralForm" :"nplurals=2; plural=(n != 1);"
+}
\ No newline at end of file
diff --git a/integrations/owncloud/snappymail/lib/AppInfo/Application.php b/integrations/owncloud/snappymail/lib/AppInfo/Application.php
new file mode 100644
index 000000000..6eb04652c
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/AppInfo/Application.php
@@ -0,0 +1,106 @@
+<?php
+
+namespace OCA\SnappyMail\AppInfo;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCA\SnappyMail\Controller\FetchController;
+use OCA\SnappyMail\Controller\PageController;
+use OCA\SnappyMail\Search\Provider;
+
+use OCP\AppFramework\App;
+use OCP\IL10N;
+use OCP\IUser;
+use OCP\User\Events\PostLoginEvent;
+use OCP\User\Events\BeforeUserLoggedOutEvent;
+use OCP\IContainer;
+
+class Application extends App
+{
+	public const APP_ID = 'snappymail';
+
+	public function __construct(array $urlParams = [])
+	{
+		parent::__construct(self::APP_ID, $urlParams);
+
+		$container = $this->getContainer();
+		$server = $container->getServer();
+
+		/**
+		 * Controllers
+		 *//*
+		$container->registerService(
+			'PageController', function(IContainer $c) {
+				return new PageController(
+					$c->query('AppName'),
+					$c->query('Request')
+				);
+			}
+		);
+
+		$container->registerService(
+			'FetchController', function(IContainer $c) {
+				return new FetchController(
+					$c->query('AppName'),
+					$c->query('Request'),
+					$c->getServer()->getAppManager(),
+					$c->query('ServerContainer')->getConfig(),
+					$c->query(IL10N::class)
+				);
+			}
+		);
+
+		/**
+		 * Utils
+		 *//*
+		$container->registerService(
+			'SnappyMailHelper', function(IContainer $c) {
+				return new SnappyMailHelper();
+			}
+		);
+*/
+//		$container->registerSearchProvider(Provider::class);
+	}
+/*
+	public function boot(IBootContext $context): void
+	{
+		if (!\is_dir(\rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/') . '/appdata_snappymail')) {
+			return;
+		}
+
+		$dispatcher = $context->getAppContainer()->query('OCP\EventDispatcher\IEventDispatcher');
+		$dispatcher->addListener(PostLoginEvent::class, function (PostLoginEvent $Event) {
+			$config = \OC::$server->getConfig();
+			// Only store the user's password in the current session if they have
+			// enabled auto-login using ownCloud username or email address.
+			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)
+			 || $config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+				$sUID = $Event->getUser()->getUID();
+				\OC::$server->getSession()['snappymail-nc-uid'] = $sUID;
+				\OC::$server->getSession()['snappymail-password'] = SnappyMailHelper::encodePassword($Event->getPassword(), $sUID);
+			}
+		});
+
+		$dispatcher->addListener(BeforeUserLoggedOutEvent::class, function (BeforeUserLoggedOutEvent $Event) {
+			\OC::$server->getSession()['snappymail-password'] = '';
+			SnappyMailHelper::loadApp();
+			\RainLoop\Api::Actions()->Logout(true);
+		});
+
+		// https://github.com/nextcloud/impersonate/issues/179
+		// https://github.com/nextcloud/impersonate/pull/180
+		$class = 'OCA\Impersonate\Events\BeginImpersonateEvent';
+		if (\class_exists($class)) {
+			$dispatcher->addListener($class, function ($Event) {
+				\OC::$server->getSession()['snappymail-password'] = '';
+				SnappyMailHelper::loadApp();
+				\RainLoop\Api::Actions()->Logout(true);
+			});
+			$dispatcher->addListener('OCA\Impersonate\Events\EndImpersonateEvent', function ($Event) {
+				\OC::$server->getSession()['snappymail-password'] = '';
+				SnappyMailHelper::loadApp();
+				\RainLoop\Api::Actions()->Logout(true);
+			});
+		}
+	}
+*/
+}
diff --git a/integrations/owncloud/snappymail/lib/ContentSecurityPolicy.php b/integrations/owncloud/snappymail/lib/ContentSecurityPolicy.php
new file mode 100644
index 000000000..f144f835c
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/ContentSecurityPolicy.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace OCA\SnappyMail;
+
+class ContentSecurityPolicy extends \OCP\AppFramework\Http\ContentSecurityPolicy {
+
+	/** @var bool Whether inline JS snippets are allowed */
+	protected $inlineScriptAllowed = false;
+	/** @var bool Whether eval in JS scripts is allowed */
+	protected $evalScriptAllowed = true;
+	/** @var bool Whether strict-dynamic should be set */
+//	protected $strictDynamicAllowed = true; // NC24+
+	/** @var bool Whether inline CSS is allowed */
+	protected $inlineStyleAllowed = true;
+
+	function __construct() {
+		$CSP = \RainLoop\Api::getCSP();
+
+		$this->allowedScriptDomains = \array_unique(\array_merge($this->allowedScriptDomains, $CSP->script));
+		$this->allowedScriptDomains = \array_diff($this->allowedScriptDomains, ["'unsafe-inline'", "'unsafe-eval'"]);
+
+		// Nextcloud only sets 'strict-dynamic' when browserSupportsCspV3() ?
+		\method_exists($this, 'useStrictDynamic')
+			? $this->useStrictDynamic(true) // NC24+
+			: $this->addAllowedScriptDomain("'strict-dynamic'");
+
+		$this->allowedImageDomains = \array_unique(\array_merge($this->allowedImageDomains, $CSP->img));
+
+		$this->allowedStyleDomains = \array_unique(\array_merge($this->allowedStyleDomains, $CSP->style));
+		$this->allowedStyleDomains = \array_diff($this->allowedStyleDomains, ["'unsafe-inline'"]);
+
+		$this->allowedFrameDomains = \array_unique(\array_merge($this->allowedFrameDomains, $CSP->frame));
+
+//		$this->reportTo = \array_unique(\array_merge($this->reportTo, $CSP->report_to));
+	}
+
+	public function getSnappyMailNonce() {
+		static $sNonce;
+		if (!$sNonce) {
+/*
+			$cspManager = \OC::$server->getContentSecurityPolicyNonceManager();
+			$sNonce = $cspManager->getNonce() ?: \SnappyMail\UUID::generate();
+			if (\method_exists($cspManager, 'browserSupportsCspV3') && !$cspManager->browserSupportsCspV3()) {
+				$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
+			}
+*/
+			$sNonce = \SnappyMail\UUID::generate();
+			$this->addAllowedScriptDomain("'nonce-{$sNonce}'");
+		}
+		return $sNonce;
+	}
+
+}
diff --git a/integrations/nextcloud/snappymail/lib/Controller/AjaxController.php b/integrations/owncloud/snappymail/lib/Controller/FetchController.php
similarity index 66%
rename from integrations/nextcloud/snappymail/lib/Controller/AjaxController.php
rename to integrations/owncloud/snappymail/lib/Controller/FetchController.php
index e0a561138..df8c8dabe 100644
--- a/integrations/nextcloud/snappymail/lib/Controller/AjaxController.php
+++ b/integrations/owncloud/snappymail/lib/Controller/FetchController.php
@@ -11,7 +11,7 @@ use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 
-class AjaxController extends Controller {
+class FetchController extends Controller {
 	private $config;
 	private $appManager;
 
@@ -22,18 +22,36 @@ class AjaxController extends Controller {
 		$this->l = $l;
 	}
 
+	public function upgrade(): JSONResponse {
+		$error = 'Upgrade failed';
+		try {
+			SnappyMailHelper::loadApp();
+			if (SnappyMail\Upgrade::core()) {
+				return new JSONResponse([
+					'status' => 'success',
+					'Message' => $this->l->t('Upgraded successfully')
+				]);
+			}
+		} catch (Exception $e) {
+			$error .= ': ' . $e->getMessage();
+		}
+		return new JSONResponse([
+			'status' => 'error',
+			'Message' => $error
+		]);
+	}
+
 	public function setAdmin(): JSONResponse {
 		try {
 			$sUrl = '';
 			$sPath = '';
-			$bAutologin = false;
 
 			if (isset($_POST['appname']) && 'snappymail' === $_POST['appname']) {
 				$this->config->setAppValue('snappymail', 'snappymail-autologin',
 					isset($_POST['snappymail-autologin']) ? '1' === $_POST['snappymail-autologin'] : false);
 				$this->config->setAppValue('snappymail', 'snappymail-autologin-with-email',
 					isset($_POST['snappymail-autologin']) ? '2' === $_POST['snappymail-autologin'] : false);
-				$bAutologin = $this->config->getAppValue('snappymail', 'snappymail-autologin', false);
+				$this->config->setAppValue('snappymail', 'snappymail-no-embed', isset($_POST['snappymail-no-embed']));
 			} else {
 				return new JSONResponse([
 					'status' => 'error',
@@ -41,6 +59,22 @@ class AjaxController extends Controller {
 				]);
 			}
 
+			if (!empty($_POST['import-rainloop'])) {
+				$result = SnappyMailHelper::importRainLoop();
+				return new JSONResponse([
+					'status' => 'success',
+					'Message' => \implode("\n", $result)
+				]);
+			}
+
+			SnappyMailHelper::loadApp();
+			$debug = !empty($_POST['snappymail-debug']);
+			$oConfig = \RainLoop\Api::Config();
+			if ($debug != $oConfig->Get('debug', 'enable', false)) {
+				$oConfig->Set('debug', 'enable', $debug);
+				$oConfig->Save();
+			}
+
 			return new JSONResponse([
 				'status' => 'success',
 				'Message' => $this->l->t('Saved successfully')
@@ -53,9 +87,9 @@ class AjaxController extends Controller {
 		}
 	}
 
-  /**
-  * @NoAdminRequired
-  */
+	/**
+	 * @NoAdminRequired
+	 */
 	public function setPersonal(): JSONResponse {
 		try {
 
@@ -66,11 +100,11 @@ class AjaxController extends Controller {
 				$this->config->setUserValue($sUser, 'snappymail', 'snappymail-email', $sPostEmail);
 
 				$sPass = $_POST['snappymail-password'];
-				if ('******' !== $sPass && '' !== $sPass) {
-					include_once $this->appManager->getAppPath('snappymail').'/lib/Util/SnappyMailHelper.php';
+				if ('******' !== $sPass) {
+					require_once $this->appManager->getAppPath('snappymail').'/lib/Util/SnappyMailHelper.php';
 
 					$this->config->setUserValue($sUser, 'snappymail', 'snappymail-password',
-						SnappyMailHelper::encodePassword($sPass, md5($sPostEmail)));
+						$sPass ? SnappyMailHelper::encodePassword($sPass, \md5($sPostEmail)) : '');
 				}
 
 				$sEmail = $this->config->getUserValue($sUser, 'snappymail', 'snappymail-email', '');
diff --git a/integrations/owncloud/snappymail/lib/Controller/PageController.php b/integrations/owncloud/snappymail/lib/Controller/PageController.php
new file mode 100644
index 000000000..e3617b9c3
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/Controller/PageController.php
@@ -0,0 +1,117 @@
+<?php
+
+namespace OCA\SnappyMail\Controller;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCA\SnappyMail\ContentSecurityPolicy;
+
+use OCP\AppFramework\Controller;
+use OCP\AppFramework\Http\TemplateResponse;
+
+class PageController extends Controller
+{
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function index()
+	{
+		$config = \OC::$server->getConfig();
+
+		$bAdmin = false;
+		if (!empty($_SERVER['QUERY_STRING'])) {
+			SnappyMailHelper::loadApp();
+			$bAdmin = \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin') == $_SERVER['QUERY_STRING'];
+			if (!$bAdmin) {
+				SnappyMailHelper::startApp(true);
+			}
+		}
+
+		if (!$bAdmin && $config->getAppValue('snappymail', 'snappymail-no-embed')) {
+			\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
+			\OCP\Util::addScript('snappymail', 'snappymail');
+			\OCP\Util::addStyle('snappymail', 'style');
+			SnappyMailHelper::startApp();
+			$response = new TemplateResponse('snappymail', 'index', [
+				'snappymail-iframe-url' => SnappyMailHelper::normalizeUrl(SnappyMailHelper::getAppUrl())
+					. (empty($_GET['target']) ? '' : "#{$_GET['target']}")
+			]);
+			$csp = new ContentSecurityPolicy();
+			$csp->addAllowedFrameDomain("'self'");
+			$response->setContentSecurityPolicy($csp);
+			return $response;
+		}
+
+		\OC::$server->getNavigationManager()->setActiveEntry('snappymail');
+
+		\OCP\Util::addStyle('snappymail', 'embed');
+
+		SnappyMailHelper::startApp();
+		$oConfig = \RainLoop\Api::Config();
+		$oActions = $bAdmin ? new \RainLoop\ActionsAdmin() : \RainLoop\Api::Actions();
+		$oHttp = \MailSo\Base\Http::SingletonInstance();
+		$oServiceActions = new \RainLoop\ServiceActions($oHttp, $oActions);
+		$sAppJsMin = $oConfig->Get('debug', 'javascript', false) ? '' : '.min';
+		$sAppCssMin = $oConfig->Get('debug', 'css', false) ? '' : '.min';
+		$sLanguage = $oActions->GetLanguage(false);
+
+		$csp = new ContentSecurityPolicy();
+		$sNonce = $csp->getSnappyMailNonce();
+
+		$params = [
+			'Admin' => $bAdmin ? 1 : 0,
+			'LoadingDescriptionEsc' => \htmlspecialchars($oConfig->Get('webmail', 'loading_description', 'SnappyMail'), ENT_QUOTES|ENT_IGNORE, 'UTF-8'),
+			'BaseTemplates' => \RainLoop\Utils::ClearHtmlOutput($oServiceActions->compileTemplates($bAdmin)),
+			'BaseAppBootScript' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin.'.js'),
+			'BaseAppBootScriptNonce' => $sNonce,
+			'BaseLanguage' => $oActions->compileLanguage($sLanguage, $bAdmin),
+			'BaseAppBootCss' => \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'),
+			'BaseAppThemeCssLink' => $oActions->ThemeLink($bAdmin),
+			'BaseAppThemeCss' => \preg_replace(
+				'/\\s*([:;{},]+)\\s*/s',
+				'$1',
+				$oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin)
+			)
+		];
+
+//		\OCP\Util::addScript('snappymail', '../app/snappymail/v/'.APP_VERSION.'/static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin);
+
+		// ownCloud html encodes, so addHeader('style') is not possible
+//		\OCP\Util::addHeader('style', ['id'=>'app-boot-css'], \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css'));
+		\OCP\Util::addHeader('link', ['type'=>'text/css','rel'=>'stylesheet','href'=>\RainLoop\Utils::WebStaticPath('css/'.($bAdmin?'admin':'app').$sAppCssMin.'.css')], '');
+//		\OCP\Util::addHeader('style', ['id'=>'app-theme-style','data-href'=>$params['BaseAppThemeCssLink']], $params['BaseAppThemeCss']);
+
+		$response = new TemplateResponse('snappymail', 'index_embed', $params);
+
+		$response->setContentSecurityPolicy($csp);
+
+		return $response;
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function appGet()
+	{
+		SnappyMailHelper::startApp(true);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function appPost()
+	{
+		SnappyMailHelper::startApp(true);
+	}
+
+	/**
+	 * @NoAdminRequired
+	 * @NoCSRFRequired
+	 */
+	public function indexPost()
+	{
+		SnappyMailHelper::startApp(true);
+	}
+}
diff --git a/integrations/owncloud/snappymail/lib/Search/Provider.php b/integrations/owncloud/snappymail/lib/Search/Provider.php
new file mode 100644
index 000000000..7b9b63157
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/Search/Provider.php
@@ -0,0 +1,129 @@
+<?php
+
+declare(strict_types=1);
+
+namespace OCA\SnappyMail\Search;
+
+use OCA\SnappyMail\AppInfo\Application;
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCP\IDateTimeFormatter;
+use OCP\IL10N;
+use OCP\IURLGenerator;
+use OCP\IUser;
+use OCP\Search\IProvider;
+use OCP\Search\ISearchQuery;
+use OCP\Search\SearchResult;
+use OCP\Search\SearchResultEntry;
+
+/**
+ * https://docs.nextcloud.com/server/latest/developer_manual/digging_deeper/search.html#search-providers
+ */
+class Provider implements IProvider
+{
+	/** @var IL10N */
+	private $l10n;
+
+	/** @var IURLGenerator */
+	private $urlGenerator;
+
+	public function __construct(IL10N $l10n, IURLGenerator $urlGenerator)
+	{
+		$this->l10n = $l10n;
+		$this->urlGenerator = $urlGenerator;
+	}
+
+	public function getId(): string
+	{
+		return Application::APP_ID;
+	}
+
+	public function getName(): string
+	{
+		return 'SnappyMail';
+//		return $this->l10n->t('Mails');
+	}
+
+	public function getOrder(string $route, array $routeParameters): int
+	{
+		if (0 === \strpos($route, Application::APP_ID . '.')) {
+			// Active app, prefer Mail results
+			return -1;
+		}
+		return 20;
+	}
+
+	public function search(IUser $user, ISearchQuery $query): SearchResult
+	{
+		$result = [];
+		if (2 > \strlen(\trim($query->getTerm()))) {
+			return SearchResult::complete($this->getName(), $result);
+		}
+		SnappyMailHelper::startApp();
+		$oActions = \RainLoop\Api::Actions();
+//		$oAccount = $oActions->getMainAccountFromToken(false); // Issue: when account switched, wrong email is shown
+		$oAccount = $oActions->getAccountFromToken(false);
+		$iCursor = (int) $query->getCursor();
+		$iLimit = $query->getLimit();
+		if ($oAccount) {
+			$oConfig = $oActions->Config();
+
+			$oParams = new \MailSo\Mail\MessageListParams;
+			$oParams->sFolderName = 'INBOX'; // or \All ?
+			$oParams->sSearch = $query->getTerm();
+			$oParams->oCacher = ($oConfig->Get('cache', 'enable', true) && $oConfig->Get('cache', 'server_uids', false))
+				? $oActions->Cacher($oAccount) : null;
+			$oParams->bUseSortIfSupported = !!$oConfig->Get('labs', 'use_imap_sort', true);
+//			$oParams->bUseThreads = $oConfig->Get('labs', 'use_imap_thread', false);
+//			$oParams->bHideDeleted = false;
+//			$oParams->sSort = (string) $aValues['Sort'];
+//				ISearchQuery::SORT_DATE_DESC == $query->getSortOrder(): int;
+			$oParams->iOffset = $iCursor;
+			$oParams->iLimit = $iLimit;
+//			$oParams->iPrevUidNext = 0, // used to check for new messages
+//			$oParams->iThreadUid = 0;
+
+			$oMailClient = $oActions->MailClient();
+			if (!$oMailClient->IsLoggined()) {
+				$oAccount->ImapConnectAndLoginHelper($oActions->Plugins(), $oMailClient->ImapClient(), $oConfig);
+			}
+
+			// instanceof \MailSo\Mail\MessageCollection
+			$MessageCollection = $oMailClient->MessageList($oParams);
+
+			$baseURL = $this->urlGenerator->linkToRoute('snappymail.page.index');
+			$config = \OC::$server->getConfig();
+			if ($config->getAppValue('snappymail', 'snappymail-no-embed')) {
+				$baseURL .= '?target=';
+			} else {
+				$baseURL .= '#';
+			}
+			$search = \rawurlencode($oParams->sSearch);
+
+//			$MessageCollection->totalEmails;
+			foreach ($MessageCollection as $Message) {
+				// $Message instanceof \MailSo\Mail\Message
+				$result[] = new SearchResultEntry(
+					// thumbnailUrl
+					'',
+					// title
+					$Message->Subject(),
+					// subline
+					$Message->From()->ToString(),
+					// resourceUrl /index.php/apps/snappymail/#/mailbox/INBOX/p2/text=an&unseen
+					$baseURL . '/mailbox/INBOX/m' . $Message->Uid() . '/' . $search,
+					// icon
+					'icon-mail',
+					// rounded
+					false
+				);
+			}
+		} else {
+			\error_log('SnappyMail not logged in to use unified search');
+		}
+
+		if ($iLimit > \count($result)) {
+			return SearchResult::complete($this->getName(), $result);
+		}
+		return SearchResult::paginated($this->getName(), $result, $iCursor + $iLimit);
+	}
+}
diff --git a/integrations/owncloud/snappymail/lib/Settings/AdminSettings.php b/integrations/owncloud/snappymail/lib/Settings/AdminSettings.php
new file mode 100644
index 000000000..c55adf025
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/Settings/AdminSettings.php
@@ -0,0 +1,77 @@
+<?php
+namespace OCA\SnappyMail\Settings;
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\Settings\ISettings;
+
+class AdminSettings implements ISettings
+{
+	private $config;
+
+	public function __construct(IConfig $config)
+	{
+		$this->config = $config;
+	}
+
+	public function getPanel()
+	{
+		\OCA\SnappyMail\Util\SnappyMailHelper::loadApp();
+
+		$keys = [
+			'snappymail-autologin',
+			'snappymail-autologin-with-email',
+			'snappymail-no-embed'
+		];
+		$parameters = [];
+		foreach ($keys as $k) {
+			$v = $this->config->getAppValue('snappymail', $k);
+			$parameters[$k] = $v;
+		}
+		$uid = \OC::$server->getUserSession()->getUser()->getUID();
+		if (\OC_User::isAdminUser($uid)) {
+//			$parameters['snappymail-admin-panel-link'] = SnappyMailHelper::getAppUrl().'?admin';
+			SnappyMailHelper::loadApp();
+			$parameters['snappymail-admin-panel-link'] =
+				\OC::$server->getURLGenerator()->linkToRoute('snappymail.page.index')
+				. '?' . \RainLoop\Api::Config()->Get('security', 'admin_panel_key', 'admin');
+		}
+
+		$oConfig = \RainLoop\Api::Config();
+		$passfile = APP_PRIVATE_DATA . 'admin_password.txt';
+		$sPassword = '';
+		if (\is_file($passfile)) {
+			$sPassword = \file_get_contents($passfile);
+			$parameters['snappymail-admin-panel-link'] .= '#/security';
+		}
+		$parameters['snappymail-admin-password'] = $sPassword;
+
+		$parameters['can-import-rainloop'] = $sPassword && \is_dir(
+			\rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/')
+			. '/rainloop-storage'
+		);
+
+		$parameters['snappymail-debug'] = $oConfig->Get('debug', 'enable', false);
+
+		// Check for owncloud plugin update, if so then update
+		foreach (\SnappyMail\Repository::getPackagesList()['List'] as $plugin) {
+			if ('owncloud' == $plugin['id'] && $plugin['canBeUpdated']) {
+				\SnappyMail\Repository::installPackage('plugin', 'owncloud');
+			}
+		}
+
+		\OCP\Util::addScript('snappymail', 'snappymail');
+		return new TemplateResponse('snappymail', 'admin-local', $parameters);
+	}
+
+	public function getSectionID()
+	{
+		return 'additional';
+	}
+
+	public function getPriority()
+	{
+		return 50;
+	}
+}
diff --git a/integrations/owncloud/snappymail/lib/Settings/PersonalSettings.php b/integrations/owncloud/snappymail/lib/Settings/PersonalSettings.php
new file mode 100644
index 000000000..310beb17b
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/Settings/PersonalSettings.php
@@ -0,0 +1,37 @@
+<?php
+namespace OCA\SnappyMail\Settings;
+
+use OCP\AppFramework\Http\TemplateResponse;
+use OCP\IConfig;
+use OCP\Settings\ISettings;
+
+class PersonalSettings implements ISettings
+{
+	private $config;
+
+	public function __construct(IConfig $config)
+	{
+		$this->config = $config;
+	}
+
+	public function getPanel()
+	{
+		$uid = \OC::$server->getUserSession()->getUser()->getUID();
+		$parameters = [
+			'snappymail-email' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-email'),
+			'snappymail-password' => $this->config->getUserValue($uid, 'snappymail', 'snappymail-password') ? '******' : ''
+		];
+		\OCP\Util::addScript('snappymail', 'snappymail');
+		return new TemplateResponse('snappymail', 'personal_settings', $parameters, '');
+	}
+
+	public function getSectionID()
+	{
+		return 'additional';
+	}
+
+	public function getPriority()
+	{
+		return 50;
+	}
+}
diff --git a/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
new file mode 100644
index 000000000..8835da06c
--- /dev/null
+++ b/integrations/owncloud/snappymail/lib/Util/SnappyMailHelper.php
@@ -0,0 +1,278 @@
+<?php
+
+namespace OCA\SnappyMail\Util;
+
+class SnappyMailHelper
+{
+
+	public static function loadApp() : void
+	{
+		if (\class_exists('RainLoop\\Api')) {
+			return;
+		}
+
+		// ownCloud the default spl_autoload_register() not working
+		\spl_autoload_register(function($sClassName){
+			$file = SNAPPYMAIL_LIBRARIES_PATH . \strtolower(\strtr($sClassName, '\\', DIRECTORY_SEPARATOR)) . '.php';
+			if (\is_file($file)) {
+				include_once $file;
+			}
+		});
+
+		$_ENV['SNAPPYMAIL_OWNCLOUD'] = true; // Obsolete
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+
+//		define('APP_VERSION', '0.0.0');
+//		define('APP_INDEX_ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
+//		include APP_INDEX_ROOT_PATH.'snappymail/v/'.APP_VERSION.'/include.php';
+//		define('APP_DATA_FOLDER_PATH', \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/').'/appdata_snappymail/');
+
+		$app_dir = \dirname(\dirname(__DIR__)) . '/app';
+		require_once $app_dir . '/index.php';
+
+		// https://github.com/the-djmaze/snappymail/issues/790#issuecomment-1366527884
+		if (!file_exists($app_dir . '/.htaccess') && file_exists($app_dir . '/_htaccess')) {
+			rename($app_dir . '/_htaccess', $app_dir . '/.htaccess');
+			if (!file_exists(APP_VERSION_ROOT_PATH . '/app/.htaccess') && file_exists(APP_VERSION_ROOT_PATH . '/app/_htaccess')) {
+				rename(APP_VERSION_ROOT_PATH . '/app/_htaccess', APP_VERSION_ROOT_PATH . '/app/.htaccess');
+			}
+			if (!file_exists(APP_VERSION_ROOT_PATH . '/static/.htaccess') && file_exists(APP_VERSION_ROOT_PATH . '/static/_htaccess')) {
+				rename(APP_VERSION_ROOT_PATH . '/static/_htaccess', APP_VERSION_ROOT_PATH . '/static/.htaccess');
+			}
+		}
+
+		$oConfig = \RainLoop\Api::Config();
+		$bSave = false;
+
+		if (!$oConfig->Get('webmail', 'app_path')) {
+			$oConfig->Set('webmail', 'app_path', \OC::$server->getAppManager()->getAppWebPath('snappymail') . '/app/');
+			$bSave = true;
+		}
+
+		if (!\is_dir(APP_PLUGINS_PATH . 'owncloud')) {
+			\SnappyMail\Repository::installPackage('plugin', 'owncloud');
+			$oConfig->Set('plugins', 'enable', true);
+			$aList = \SnappyMail\Repository::getEnabledPackagesNames();
+			$aList[] = 'owncloud';
+			$oConfig->Set('plugins', 'enabled_list', \implode(',', \array_unique($aList)));
+//			$oConfig->Set('webmail', 'theme', 'ownCloud@custom');
+			$bSave = true;
+		}
+
+		$sPassword = $oConfig->Get('security', 'admin_password');
+		if ('12345' == $sPassword || !$sPassword) {
+			$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
+			$oConfig->SetPassword($sPassword);
+			\RainLoop\Utils::saveFile(APP_PRIVATE_DATA . 'admin_password.txt', $sPassword . "\n");
+			$bSave = true;
+		}
+
+		// Pre-configure domain
+		$ocConfig = \OC::$server->getConfig();
+		if ($ocConfig->getAppValue('snappymail', 'snappymail-autologin', false)
+		 || $ocConfig->getAppValue('snappymail', 'snappymail-autologin-with-email', false)
+		) {
+			$oProvider = \RainLoop\Api::Actions()->DomainProvider();
+			$oDomain = $oProvider->Load('owncloud');
+			if (!$oDomain) {
+//				$oDomain = \RainLoop\Model\Domain::fromIniArray('owncloud', []);
+				$oDomain = new \RainLoop\Model\Domain('owncloud');
+				$iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
+				$oDomain->ImapSettings()->host = 'localhost';
+				$oDomain->ImapSettings()->type = $iSecurityType;
+				$oDomain->ImapSettings()->shortLogin = true;
+				$oDomain->SieveSettings()->enabled = true;
+				$oDomain->SieveSettings()->host = 'localhost';
+				$oDomain->SieveSettings()->type = $iSecurityType;
+				$oDomain->SmtpSettings()->host = 'localhost';
+				$oDomain->SmtpSettings()->type = $iSecurityType;
+				$oDomain->SmtpSettings()->shortLogin = true;
+				$oProvider->Save($oDomain);
+				if (!$oConfig->Get('login', 'default_domain', '')) {
+					$oConfig->Set('login', 'default_domain', 'owncloud');
+					$bSave = true;
+				}
+			}
+		}
+
+		$bSave && $oConfig->Save();
+	}
+
+	public static function startApp(bool $handle = false) : void
+	{
+		static::loadApp();
+
+		try {
+			$oActions = \RainLoop\Api::Actions();
+			$oConfig = \RainLoop\Api::Config();
+			if (isset($_GET[$oConfig->Get('security', 'admin_panel_key', 'admin')])) {
+				if ($oConfig->Get('security', 'allow_admin_panel', true)
+				 && \OC_User::isAdminUser(\OC::$server->getUserSession()->getUser()->getUID())
+				 && !$oActions->IsAdminLoggined(false)
+				) {
+					$sRand = \MailSo\Base\Utils::Sha1Rand();
+					if ($oActions->Cacher(null, true)->Set(\RainLoop\KeyPathHelper::SessionAdminKey($sRand), \time())) {
+						$sToken = \RainLoop\Utils::EncodeKeyValuesQ(array('token', $sRand));
+//						$oActions->setAdminAuthToken($sToken);
+						\RainLoop\Utils::SetCookie('smadmin', $sToken);
+					}
+				}
+			} else {
+				$doLogin = !$oActions->getMainAccountFromToken(false);
+				$aCredentials = static::getLoginCredentials();
+/*
+				// NC25+ workaround for Impersonate plugin
+				// https://github.com/the-djmaze/snappymail/issues/561#issuecomment-1301317723
+				// https://github.com/nextcloud/server/issues/34935#issuecomment-1302145157
+				require \OC::$SERVERROOT . '/version.php';
+//				\OC\SystemConfig
+//				file_get_contents(\OC::$SERVERROOT . 'config/config.php');
+//				$CONFIG['version']
+				if (24 < $OC_Version[0]) {
+					$ocSession = \OC::$server->getSession();
+					$ocSession->reopen();
+					if (!$doLogin && $ocSession['snappymail-uid'] && $ocSession['snappymail-uid'] != $aCredentials[0]) {
+						// UID changed, Impersonate plugin probably active
+						$oActions->Logout(true);
+						$doLogin = true;
+					}
+					$ocSession->set('snappymail-uid', $aCredentials[0]);
+				}
+*/
+				if ($doLogin && $aCredentials[1] && $aCredentials[2]) {
+					$oActions->Logger()->AddSecret($aCredentials[2]);
+					$oAccount = $oActions->LoginProcess($aCredentials[1], $aCredentials[2]);
+				}
+			}
+		} catch (\Throwable $e) {
+			// Ignore login failure
+		}
+
+		if ($handle) {
+			\header_remove('Content-Security-Policy');
+			\RainLoop\Service::Handle();
+			exit;
+		}
+	}
+
+	public static function getLoginCredentials() : array
+	{
+		$sEmail = '';
+		$sPassword = '';
+		$config = \OC::$server->getConfig();
+		$sUID = \OC::$server->getUserSession()->getUser()->getUID();
+		$ocSession = \OC::$server->getSession();
+		// Only use the user's password in the current session if they have
+		// enabled auto-login using ownCloud username or email address.
+		if ($ocSession['snappymail-nc-uid'] == $sUID) {
+			if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
+				$sEmail = $sUID;
+				$sPassword = $ocSession['snappymail-password'];
+			} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+				$sEmail = $config->getUserValue($sUID, 'settings', 'email', '');
+				$sPassword = $ocSession['snappymail-password'];
+			}
+			if ($sPassword) {
+				$sPassword = static::decodePassword($sPassword, $sUID);
+			}
+		}
+
+		// If the user has set credentials for SnappyMail in their personal
+		// settings, override everything before and use those instead.
+		$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', '');
+		if ($sCustomEmail) {
+			$sEmail = $sCustomEmail;
+			$sPassword = $config->getUserValue($sUID, 'snappymail', 'snappymail-password', '');
+			if ($sPassword) {
+				$sPassword = static::decodePassword($sPassword, \md5($sEmail));
+			}
+		}
+		return [$sUID, $sEmail, $sPassword ?: ''];
+	}
+
+	public static function getAppUrl() : string
+	{
+		return \OC::$server->getURLGenerator()->linkToRoute('snappymail.page.appGet');
+	}
+
+	public static function normalizeUrl(string $sUrl) : string
+	{
+		$sUrl = \rtrim(\trim($sUrl), '/\\');
+		if ('.php' !== \strtolower(\substr($sUrl, -4))) {
+			$sUrl .= '/';
+		}
+
+		return $sUrl;
+	}
+
+	public static function encodePassword(string $sPassword, string $sSalt) : string
+	{
+		static::loadApp();
+		return \SnappyMail\Crypt::EncryptUrlSafe($sPassword, $sSalt);
+	}
+
+	public static function decodePassword(string $sPassword, string $sSalt)/* : mixed */
+	{
+		static::loadApp();
+		return \SnappyMail\Crypt::DecryptUrlSafe($sPassword, $sSalt);
+	}
+
+	// Imports data from RainLoop
+	public static function importRainLoop() : array
+	{
+		$result = [];
+
+		$dir = \rtrim(\trim(\OC::$server->getSystemConfig()->getValue('datadirectory', '')), '\\/');
+		$dir_snappy = $dir . '/appdata_snappymail/';
+		$dir_rainloop = $dir . '/rainloop-storage';
+		$rainloop_plugins = [];
+		if (\is_dir($dir_rainloop)) {
+			\is_dir($dir_snappy) || \mkdir($dir_snappy, 0755, true);
+			$iterator = new \RecursiveIteratorIterator(
+				new \RecursiveDirectoryIterator($dir_rainloop, \RecursiveDirectoryIterator::SKIP_DOTS),
+				\RecursiveIteratorIterator::SELF_FIRST
+			);
+			foreach ($iterator as $item) {
+				$target = $dir_snappy . $iterator->getSubPathname();
+				if (\preg_match('@/plugins/([^/])@', $target, $match)) {
+					$rainloop_plugins[$match[1]] = $match[1];
+				} else if (!\strpos($target, '/cache/')) {
+					if ($item->isDir()) {
+						\is_dir($target) || \mkdir($target, 0755, true);
+					} else if (\file_exists($target)) {
+						$result[] = "skipped: {$target}";
+					} else {
+						\copy($item, $target);
+						$result[] = "copied : {$target}";
+					}
+				}
+			}
+		}
+
+//		$password = APP_PRIVATE_DATA . 'admin_password.txt';
+//		\is_file($password) && \unlink($password);
+
+		static::loadApp();
+
+		// Attempt to install same plugins as RainLoop
+		if ($rainloop_plugins) {
+			foreach (\SnappyMail\Repository::getPackagesList()['List'] as $plugin) {
+				if (\in_array($plugin['id'], $rainloop_plugins)) {
+					$result[] = "install plugin : {$plugin['id']}";
+					\SnappyMail\Repository::installPackage('plugin', $plugin['id']);
+					unset($rainloop_plugins[$plugin['id']]);
+				}
+			}
+			foreach ($rainloop_plugins as $plugin) {
+				$result[] = "skipped plugin : {$plugin}";
+			}
+		}
+
+		$oConfig = \RainLoop\Api::Config();
+//		$oConfig->Set('webmail', 'theme', 'ownCloud@custom');
+		$oConfig->Save();
+
+		return $result;
+	}
+
+}
diff --git a/integrations/owncloud/snappymail/templates/admin-local.php b/integrations/owncloud/snappymail/templates/admin-local.php
new file mode 100644
index 000000000..749befd18
--- /dev/null
+++ b/integrations/owncloud/snappymail/templates/admin-local.php
@@ -0,0 +1,64 @@
+<div class="section">
+	<form class="snappymail" action="admin.php" method="post">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+		<fieldset class="personalblock">
+			<h2><?php echo($l->t('SnappyMail Webmail')); ?></h2>
+			<br />
+			<?php if ($_['snappymail-admin-panel-link']) { ?>
+			<p>
+				<a href="<?php echo $_['snappymail-admin-panel-link'] ?>" style="text-decoration: underline">
+					<?php echo($l->t('Go to SnappyMail Webmail admin panel')); ?>
+				</a>
+			<?php if ($_['snappymail-admin-password']) { ?>
+				<br/>
+				Username: admin<br/>
+				Temporary password: <?php echo $_['snappymail-admin-password']; ?>
+			<?php } ?>
+			</p>
+			<br />
+			<?php } ?>
+			<p>
+				<div style="display: flex;">
+					<input type="radio" id="snappymail-noautologin" name="snappymail-autologin" value="0" <?php if (!$_['snappymail-autologin']&&!$_['snappymail-autologin-with-email']) echo 'checked="checked"'; ?> />
+					<label style="margin: auto 5px;" for="snappymail-noautologin">
+						<?php echo($l->t('Users will login manually, or define credentials in their personal settings for automatic logins.')); ?>
+					</label>
+				</div>
+				<div style="display: flex;">
+					<input type="radio" id="snappymail-autologin" name="snappymail-autologin" value="1" <?php if ($_['snappymail-autologin']) echo 'checked="checked"'; ?> />
+					<label style="margin: auto 5px;" for="snappymail-autologin">
+						<?php echo($l->t('Attempt to automatically login users with their ownCloud username and password, or user-defined credentials, if set.')); ?>
+					</label>
+				</div>
+				<div style="display: flex;">
+					<input type="radio" id="snappymail-autologin-with-email" name="snappymail-autologin" value="2" <?php if ($_['snappymail-autologin-with-email']) echo 'checked="checked"'; ?> />
+					<label style="margin: auto 5px;" for="snappymail-autologin-with-email">
+						<?php echo($l->t('Attempt to automatically login users with their ownCloud email and password, or user-defined credentials, if set.')); ?>
+					</label>
+				</div>
+			</p>
+			<br />
+			<p>
+				<input id="snappymail-no-embed" name="snappymail-no-embed" type="checkbox" class="checkbox" <?php if ($_['snappymail-no-embed']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-no-embed">Don't fully integrate in ownCloud, use in iframe</label>
+			</p>
+			<br />
+			<p>
+				<input id="snappymail-debug" name="snappymail-debug" type="checkbox" class="checkbox" <?php if ($_['snappymail-debug']) echo 'checked="checked"'; ?>>
+				<label for="snappymail-debug">Debug</label>
+			</p>
+			<br />
+			<?php if ($_['can-import-rainloop']) { ?>
+			<p>
+				<input id="import-rainloop" name="import-rainloop" type="checkbox" class="checkbox">
+				<label for="import-rainloop">Import RainLoop data</label>
+			</p>
+			<br />
+			<?php } ?>
+			<p>
+				<button id="snappymail-save-button" name="snappymail-save-button"><?php echo($l->t('Save')); ?></button>
+				<div class="snappymail-result-desc" style="white-space: pre"></div>
+			</p>
+		</fieldset>
+	</form>
+</div>
diff --git a/integrations/owncloud/snappymail/templates/index.php b/integrations/owncloud/snappymail/templates/index.php
new file mode 100644
index 000000000..f304654fb
--- /dev/null
+++ b/integrations/owncloud/snappymail/templates/index.php
@@ -0,0 +1,3 @@
+<iframe id="rliframe" style="border: none; width: 100%; min-height: 100%; position: relative;" tabindex="-1" frameborder="0" src="<?php echo $_['snappymail-iframe-url']; ?>"></iframe>
+<?php
+// OCP\Util::addScript('snappymail', 'resize');
diff --git a/integrations/owncloud/snappymail/templates/index_embed.php b/integrations/owncloud/snappymail/templates/index_embed.php
new file mode 100644
index 000000000..c51f8e355
--- /dev/null
+++ b/integrations/owncloud/snappymail/templates/index_embed.php
@@ -0,0 +1,19 @@
+<style id="app-boot-css"><?php echo $_['BaseAppBootCss']; ?></style>
+<style id="app-theme-style" data-href="<?php echo $_['BaseAppThemeCssLink']; ?>"><?php echo $_['BaseAppThemeCss']; ?></style>
+<div id="rl-app" data-admin="<?php echo $_['Admin']; ?>" spellcheck="false">
+	<div id="rl-loading">
+		<div id="rl-loading-desc"><?php echo $_['LoadingDescriptionEsc']; ?></div>
+		<i class="icon-spinner"></i>
+	</div>
+	<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div>
+	<div id="rl-content" hidden="">
+		<div id="rl-left"></div>
+		<div id="rl-right"></div>
+	</div>
+	<div id="rl-popups"></div>
+	<?php echo $_['BaseTemplates']; ?>
+</div>
+<?php
+echo '
+	<script nonce="'.$_['BaseAppBootScriptNonce'].'" type="text/javascript">'.$_['BaseAppBootScript'].$_['BaseLanguage'].'</script>
+';
diff --git a/integrations/owncloud/snappymail/templates/personal_settings.php b/integrations/owncloud/snappymail/templates/personal_settings.php
new file mode 100644
index 000000000..93a86c744
--- /dev/null
+++ b/integrations/owncloud/snappymail/templates/personal_settings.php
@@ -0,0 +1,21 @@
+<div class="section">
+	<form class="snappymail" action="personal.php" method="post">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
+		<fieldset class="personalblock">
+			<h2><?php echo $l->t('SnappyMail Webmail'); ?></h2>
+			<p>
+				<?php echo $l->t('Enter an email and password to auto-login to SnappyMail.'); ?>
+			</p>
+			<p>
+				<input type="text" id="snappymail-email" name="snappymail-email"
+					value="<?php echo $_['snappymail-email']; ?>" placeholder="<?php echo($l->t('Email')); ?>" />
+
+				<input type="password" id="snappymail-password" name="snappymail-password"
+					value="<?php echo $_['snappymail-password']; ?>" placeholder="<?php echo($l->t('Password')); ?>" />
+
+				<button id="snappymail-save-button" name="snappymail-save-button"><?php echo($l->t('Save')); ?></button>
+				&nbsp;&nbsp;<span class="snappymail-result-desc"></span>
+			</p>
+		</fieldset>
+	</form>
+</div>
diff --git a/integrations/virtualmin/snappymail.pl b/integrations/virtualmin/snappymail.pl
index 1bea312ca..c3fcc7ab5 100644
--- a/integrations/virtualmin/snappymail.pl
+++ b/integrations/virtualmin/snappymail.pl
@@ -20,7 +20,7 @@ return "SnappyMail Webmail is a browser-based multilingual IMAP client with an a
 # script_snappymail_versions()
 sub script_snappymail_versions
 {
-return ( "2.15.0" );
+return ( "2.38.2" );
 }
 
 sub script_snappymail_version_desc
diff --git a/package.json b/package.json
index 5ebff92ef..3e7ef29eb 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "title": "SnappyMail",
   "description": "Simple, modern & fast web-based email client",
   "private": true,
-  "version": "2.15.0",
+  "version": "2.38.2",
   "homepage": "https://snappymail.eu",
   "author": {
     "name": "DJ Maze",
@@ -15,8 +15,7 @@
     "url": "git://github.com/the-djmaze/snappymail.git"
   },
   "scripts": {
-    "watch-css": "gulp watchCss",
-    "watch-js": "webpack --color --watch"
+    "watch-css": "gulp watchCss"
   },
   "license": "SEE LICENSE IN LICENSE",
   "licenses": [
@@ -41,38 +40,31 @@
     "openpgp"
   ],
   "readmeFilename": "README.md",
-  "devDependencies": {
-    "babel-eslint": "10.1.0",
-    "core-js": "3.16.3",
-    "eslint": "7.32.0",
-    "gulp": "4.0.2",
-    "gulp-cached": "1.1.1",
-    "gulp-clean-css": "4.3.0",
-    "gulp-eol": "0.2.0",
-    "gulp-eslint": "6.0.0",
-    "gulp-expect-file": "2.0.0",
-    "gulp-filter": "7.0.0",
-    "gulp-header": "2.0.9",
-    "gulp-less": "5.0.0",
-    "gulp-rename": "2.0.0",
-    "gulp-replace": "1.1.3",
-    "gulp-size": "4.0.1",
-    "gulp-stripbom": "1.0.5",
-    "gulp-terser": "2.0.1",
-    "gulp-util": "3.0.8"
-  },
   "dependencies": {
     "@rollup/plugin-node-resolve": "^13.1.3",
     "@rollup/plugin-replace": "^3.0.1",
+    "@rollup/plugin-terser": "^1.0.2",
+    "babel-eslint": "^10.1.0",
     "del": "^6.0.0",
-    "fs": "^0.0.1-security",
+    "eslint": "^7.32.0",
+    "gulp": "^5.0.1",
+    "gulp-append-prepend": "^1.0.9",
+    "gulp-cached": "^1.1.1",
+    "gulp-clean-css": "^4.3.0",
     "gulp-concat": "^2.6.1",
+    "gulp-eol": "^0.2.0",
+    "gulp-eslint": "^6.0.0",
+    "gulp-expect-file": "^2.0.0",
+    "gulp-filter": "^6.0.0",
     "gulp-group-css-media-queries": "^1.2.2",
+    "gulp-less": "^5.0.0",
+    "gulp-rename": "^2.0.0",
+    "gulp-replace": "^1.1.3",
     "gulp-rollup-2": "^1.2.1",
-    "rollup": "2.56.3",
+    "gulp-size": "^3.0.0",
+    "gulp-terser": "^2.1.0",
+    "rollup": "^2.56.3",
     "rollup-plugin-external-globals": "^0.6.1",
-    "rollup-plugin-html": "^0.2.1",
-    "rollup-plugin-includepaths": "^0.2.4",
-    "rollup-plugin-terser": "^7.0.2"
+    "rollup-plugin-includepaths": "^0.2.4"
   }
 }
diff --git a/plugins/README.md b/plugins/README.md
index 1145aa0f7..7e318c186 100644
--- a/plugins/README.md
+++ b/plugins/README.md
@@ -1,15 +1,88 @@
+Also see https://github.com/the-djmaze/snappymail/tree/master/plugins/example
+
 PHP
 ```php
 class Plugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	public function __construct();
-	public function Name() : string;
-	public function Description() : string;
-	public function UseLangs(?bool $bLangs = null) : bool;
-	public function Supported() : string;
-	public function Init() : void;
-	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig) : void;
-	protected function configMapping() : array;
+
+	/** Returns static::NAME */
+	public function Name(): string;
+
+	/** Returns /README file contents or static::DESCRIPTION */
+	public function Description(): string;
+
+	/** When $bLangs is boolean it sets the value, else returns current value */
+	public function UseLangs(?bool $bLangs = null): bool;
+
+	/** When true the result is empty string, else the error message */
+	public function Supported(): string;
+
+	/** Initialize settings */
+	public function Init(): void;
+
+	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig): void;
+
+	/** Returns array of all plugin Property options for use in Admin -> Extensions -> Plugin cog wheel */
+	protected function configMapping(): array;
+
+	/** With this function you hook to an event
+	 * $sHookName see chapter "Hooks" below for available names
+	 * $sFunctionName the name of a function in this class
+	 */
+	final protected function addHook(string $sHookName, string $sFunctionName): self;
+
+	final protected function addCss(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addJs(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addTemplate(string $sFile, bool $bAdminScope = false): self;
+
+	final protected function addJsonHook(string $sActionName, string $sFunctionName): self;
+
+	/**
+	 * You may register your own service actions.
+	 * Url is like /?{actionname}/etc.
+	 * Predefined actions of \RainLoop\ServiceActions that can't be registered are:
+	 * - admin
+	 * - AdminAppData
+	 * - AppData
+	 * - Append
+	 * - Backup
+	 * - BadBrowser
+	 * - CspReport
+	 * - Css
+	 * - Json
+	 * - Lang
+	 * - Mailto
+	 * - NoCookie
+	 * - NoScript
+	 * - Ping
+	 * - Plugins
+	 * - ProxyExternal
+	 * - Raw
+	 * - Sso
+	 * - Upload
+	 * - UploadBackground
+	 * - UploadContacts
+	 */
+	final protected function addPartHook(string $sActionName, string $sFunctionName): self
+
+	final public function Config(): \RainLoop\Config\Plugin;
+	final public function Manager(): \RainLoop\Plugins\Manager;
+	final public function Path(): string;
+	final public function ConfigMap(bool $flatten = false): array;
+
+	/**
+	 * Returns result of Actions->DefaultResponse($sFunctionName, $mData) or json_encode($mData)
+	 */
+	final protected function jsonResponse(string $sFunctionName, $mData): mixed;
+
+	final public function jsonParam(string $sKey, $mDefault = null): mixed;
+
+	final public function getUserSettings(): array;
+
+	final public function saveUserSettings(array $aSettings): bool;
 }
 ```
 
@@ -51,20 +124,34 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		string &$sEmail
 
+	Happens in resolveLoginCredentials($sEmail) BEFORE resolving domain name.
+	This is the pure text from the login screen (DoLogin) or the SSO feature (ServiceSso) received by LoginProcess().
+	- DoLogin() -> LoginProcess() -> resolveLoginCredentials($sEmail)
+	- ServiceSso() -> LoginProcess() -> resolveLoginCredentials($sEmail)
+	So $sEmail can just have the value `test` without a domain.
+
 ### login.credentials.step-2
 	params:
 		string &$sEmail
 		string &$sPassword
 
+	Happens in resolveLoginCredentials($sEmail) AFTER resolving domain name.
+	So $sEmail always has a domain (for example `test` is now `test@example.com`).
+
 ### login.credentials
 	params:
 		string &$sEmail
-		string &$sLogin
+		string &$sImapUser
 		string &$sPassword
+		string &$sSmtpUser
+
+		$sEmail is the domain imap->fixUsername() without shortening.
+		$sImapUser is the domain imap->fixUsername() for login into IMAP.
+		$sSmtpUser is the domain smtp->fixUsername() for login into SMTP.
 
 ### login.success
 	params:
-		\RainLoop\Model\Account $oAccount
+		\RainLoop\Model\MainAccount $oAccount
 
 ## IMAP
 
@@ -72,53 +159,59 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array &$aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array $aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
-		array &$aCredentials
+		\MailSo\Imap\Settings $oSettings
 
 ### imap.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Imap\ImapClient $oImapClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Imap\Settings $oSettings
+
+### imap.message-headers
+	params:
+		array &$aHeaders
+
+	Allows you to fetch more MIME headers for messages.
 
 ## Sieve
 
 ### sieve.before-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array &$aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array $aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
-		array &$aCredentials
+		\MailSo\Sieve\SieveClient $oSieveClient
+		\MailSo\Sieve\Settings $oSettings
 
 ### sieve.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
-		\MailSo\Sieve\ManageSieveClient $oSieveClient
+		\MailSo\Sieve\SieveClient $oSieveClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Sieve\Settings $oSettings
 
 ## SMTP
 
@@ -126,48 +219,48 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array &$aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.after-connect
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array $aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.before-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
-		array &$aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
 ### smtp.after-login
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Smtp\SmtpClient $oSmtpClient
 		bool $bSuccess
-		array $aCredentials
+		\MailSo\Smtp\Settings $oSettings
 
-## Folders
+## Json service actions
+Called by RainLoop\ServiceActions::ServiceJson()
+{actionname} is one of the RainLoop\Actions::Do{ActionName}(),
+or an extension action as "Plugin{ActionName}" added with Plugin::addJsonHook()
+and called in JavaScript using rl.pluginRemoteRequest().
 
-### filter.folders-post
+### json.before-{actionname}
+	params: none
+
+### json.after-{actionname}
 	params:
-		\RainLoop\Model\Account $oAccount
-		\MailSo\Mail\FolderCollection $oFolderCollection
+		array &$aResponse
 
-### filter.folders-complete
-	params:
-		\RainLoop\Model\Account $oAccount
-		\MailSo\Mail\FolderCollection $oFolderCollection
+### json.action-post-call
+	Obsolete, use json.after-{actionname}
 
-### filter.folders-system-types
-	params:
-		\RainLoop\Model\Account $oAccount
-		array &$aList
+### json.action-pre-call
+	Obsolete, use json.before-{actionname}
 
-### filter.system-folders-names
-	params:
-		\RainLoop\Model\Account $oAccount
-		array &$aCache
+### filter.json-response
+	Obsolete, use json.after-{actionname}
 
 ## Others
 
@@ -202,7 +295,7 @@ $Plugin->addHook('hook.name', 'functionName');
 
 ### filter.domain
 	params:
-		\RainLoop\Model\Domain &$oDomain
+		\RainLoop\Model\Domain $oDomain
 
 ### filter.fabrica
 	params:
@@ -214,10 +307,12 @@ $Plugin->addHook('hook.name', 'functionName');
 	params:
 		array &$aPaths
 
-### filter.json-response
+### filter.language
 	params:
-		string $sAction
-		array &$aResponseItem
+		string &$sLanguage
+		bool $bAdmin
+
+	Allows you to set a different language
 
 ### filter.message-html
 	params:
@@ -236,6 +331,7 @@ $Plugin->addHook('hook.name', 'functionName');
 	Happens before send/save message
 
 ### filter.message-rcpt
+	Called by DoSendMessage and DoSendReadReceiptMessage
 	params:
 		\RainLoop\Model\Account $oAccount
 		\MailSo\Mime\EmailCollection $oRcpt
@@ -288,6 +384,7 @@ $Plugin->addHook('hook.name', 'functionName');
 		array &$aHiddenRcpt
 
 ### filter.smtp-message-stream
+	Called by DoSendMessage and DoSendReadReceiptMessage
 	params:
 		\RainLoop\Model\Account $oAccount
 		resource &$rMessageStream
@@ -295,16 +392,7 @@ $Plugin->addHook('hook.name', 'functionName');
 
 ### filter.upload-response
 	params:
-		array &$aResponseItem
-
-### json.action-post-call
-	params:
-		string $sAction
-		array &$aResponseItem
-
-### json.action-pre-call
-	params:
-		string $sAction
+		array &$aResponse
 
 ### json.attachments
 	params:
@@ -316,20 +404,6 @@ $Plugin->addHook('hook.name', 'functionName');
 		int &$iLimit
 		\RainLoop\Model\Account $oAccount
 
-### json.suggestions-post
-	params:
-		array &$aResult
-		string $sQuery
-		\RainLoop\Model\Account $oAccount
-		int $iLimit
-
-### json.suggestions-pre
-	params:
-		array &$aResult
-		string $sQuery
-		\RainLoop\Model\Account $oAccount
-		int $iLimit
-
 ### main.content-security-policy
 	params:
 		\SnappyMail\HTTP\CSP $oCSP
@@ -338,45 +412,172 @@ $Plugin->addHook('hook.name', 'functionName');
 	`$oCSP->script[] = "'strict-dynamic'";`
 
 ### main.default-response
-	params:
-		string $sActionName
-		array &$aResponseItem
+	Obsolete, use json.after-{actionname}
 
 ### main.default-response-data
-	params:
-		string $sActionName
-		mixed &$mResult
+	Obsolete, use json.after-{actionname}
 
 ### main.default-response-error-data
-	params:
-		string $sActionName
-		int &$iErrorCode
-		string &$sErrorMessage
+	Obsolete, use json.after-{actionname}
 
 ### main.fabrica
 	params:
 		string $sName
 		mixed &$mResult
 
-### service.app-delay-start-begin
-	no params
-
-### service.app-delay-start-end
-	no params
-
 # JavaScript Events
 
 ## mailbox
+### mailbox.inbox-unread-count
 ### mailbox.message-list.selector.go-up
 ### mailbox.message-list.selector.go-down
-### mailbox.inbox-unread-count
+
 ### mailbox.message.show
+	Use to show a specific message.
+``` JavaScript
+	dispatchEvent(
+		new CustomEvent(
+			'mailbox.message.show',
+			{
+				detail: {
+					folder: 'INBOX',
+					uid: 1
+				},
+				cancelable: false
+			}
+		)
+	);
+```
+
 ## audio
 ### audio.start
 ### audio.stop
 ### audio.api.stop
 ## Misc
-### idle
 ### rl-layout
+	event.detail value is one of:
+	0. NoPreview
+	1. SidePreview
+	2. BottomPreview
+
+### rl-view-model.create
+	event.detail = the ViewModel class
+	Happens immediately after the ViewModel constructor.
+	See accessible properties as https://github.com/the-djmaze/snappymail/blob/master/dev/Knoin/AbstractViews.js
+
 ### rl-view-model
 	event.detail = the ViewModel class
+	Happens after the full build (vm.onBuild()) and contains viewModelDom
+
+### rl-vm-visible
+	event.detail = the ViewModel class
+	Happens after the model is made visible (vm.afterShow())
+
+### sm-admin-login
+	event.detail = FormData
+	cancelable using preventDefault()
+### sm-admin-login-response
+	event.detail = { error: int, data: {JSON response} }
+### sm-user-login
+	event.detail = FormData
+	cancelable using preventDefault()
+### sm-user-login-response
+	event.detail = { error: int, data: {JSON response} }
+
+### sm-show-screen
+	event.detail = 'screenname'
+	cancelable using preventDefault()
+
+### squire-toolbar
+	event.detail = { squire: SquireUI, actions: object }
+	`actions` is the toolbar structure.
+	```javascript
+	block-of-buttons: {
+		button-name: {
+			select: ['selectbox options'],
+			html: 'button text',
+			cmd: () => `command to execute`,
+			key: 'keyboard shortcut',
+			matches: 'HTML elements that match'
+		}
+	}
+	```
+	See [SquireUI.js](https://github.com/the-djmaze/snappymail/blob/master/dev/External/SquireUI.js)
+	for all default toolbar actions.
+
+# JavaScript `rl` object
+
+## rl.Enums.StorageResultType
+### rl.Enums.StorageResultType.Abort
+### rl.Enums.StorageResultType.Error
+### rl.Enums.StorageResultType.Success
+
+## rl.​Utils.htmlToPlain(html)
+Converts HTML to text
+
+## rl.Utils.plainToHtml(plain)
+Converts text to HTML
+
+## rl.addSettingsViewModel(SettingsViewModelClass, template, labelName, route)​
+Examples in
+* ./change-password/js/ChangePasswordUserSettings.js
+* ./example/js/ExampleUserSettings.js
+* ./kolab/js/settings.js
+* ./two-factor-auth/js/TwoFactorAuthSettings.js
+
+## rl.addSettingsViewModelForAdmin(SettingsViewModelClass, template, labelName, route)​
+Examples in
+* ./example/js/ExampleAdminSettings.js:34:	rl.addSettingsViewModelForAdmin(ExampleAdminSettings, 'ExampleAdminSettingsTab',
+
+## rl.adminArea()​
+Returns true or false when in '?admin' area
+
+## rl.app.Remote.abort(action)​​​​​
+
+## rl.app.Remote.get(action, url)​​​​​
+
+## rl.app.Remote.getPublicKey(fCallback)​​​​​
+
+## rl.app.Remote.post(action, fTrigger, params, timeOut)​​​​​
+
+## rl.app.Remote.request(action, fCallback, params, iTimeout, sGetAdd)​​​​​
+
+## rl.app.Remote.setTrigger(trigger, value)​​​​​
+
+## rl.app.Remote.streamPerLine(fCallback, sGetAdd, postData)
+
+## rl.app.folderList
+A knockout observable array of all folders/mailboxes
+
+## rl.fetch(resource, init, postData)​
+
+## rl.fetchJSON(resource, init, postData)​
+
+## rl.i18n(key, valueList, defaulValue)​
+
+## rl.loadScript(src)​
+
+## rl.logoutReload(url)​
+
+## rl.pluginPopupView
+class AbstractViewPopup
+
+## rl.pluginRemoteRequest(callback, action, parameters, timeout)​
+
+## rl.pluginSettingsGet(pluginSection, name)​
+
+## rl.registerWYSIWYG(name, construct)​
+
+## rl.route.root()
+
+## rl.route.reload()
+
+## rl.route.off()
+
+## rl.setTitle(title)​
+
+## rl.settings.get(name)
+
+## rl.settings.set(name, value)
+
+## rl.settings.app(name)
diff --git a/plugins/attachments-force-open/extension.js b/plugins/attachments-force-open/extension.js
new file mode 100644
index 000000000..8020ca6fa
--- /dev/null
+++ b/plugins/attachments-force-open/extension.js
@@ -0,0 +1,13 @@
+(() => {
+
+const dom = document.getElementById('MailMessageView').content;
+
+dom.querySelector('.attachmentsControls').dataset.bind = '';
+
+let ds = dom.querySelector('.attachmentsPlace').dataset;
+ds.bind = ds.bind.replace('showAttachmentControls', 'true');
+
+ds = dom.querySelector('.controls-handle').dataset;
+ds.bind = ds.bind.replace('allowAttachmentControls', 'false');
+
+})();
diff --git a/plugins/attachments-force-open/index.php b/plugins/attachments-force-open/index.php
new file mode 100644
index 000000000..4110b7894
--- /dev/null
+++ b/plugins/attachments-force-open/index.php
@@ -0,0 +1,20 @@
+<?php
+
+class AttachmentsForceOpenPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Attachments force open',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://github.com/the-djmaze/snappymail/pull/1489',
+		VERSION  = '0.1',
+		RELEASE  = '2024-03-15',
+		REQUIRED = '2.14.0',
+		CATEGORY = 'General',
+		LICENSE  = 'MIT',
+		DESCRIPTION = '';
+
+	public function Init() : void
+	{
+		$this->addJs('extension.js'); // add js file
+	}
+}
diff --git a/plugins/auto-domain-grab/index.php b/plugins/auto-domain-grab/index.php
index 58999f66b..ee2458948 100644
--- a/plugins/auto-domain-grab/index.php
+++ b/plugins/auto-domain-grab/index.php
@@ -15,8 +15,9 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Auto Domain Selection',
-		VERSION  = '2.8',
-		REQUIRED = '2.8.0',
+		VERSION  = '2.9',
+		RELEASE = '2022-11-11',
+		REQUIRED = '2.21.0',
 		CATEGORY = 'General',
 		DESCRIPTION = 'Sets the IMAP/SMTP host based on the user\'s login';
 
@@ -32,20 +33,20 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 	/**
 	 * This function detects the IMAP Host, and if it is set to 'auto', replaces it with the MX or email domain.
 	 */
-	public function FilterImapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oImapClient, array &$aImapCredentials)
+	public function FilterImapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oImapClient, \MailSo\Imap\Settings $oSettings)
 	{
 		// Check for mail.$DOMAIN as entered value in RL settings
-		if (!empty($aImapCredentials['Host']) && 'auto' === $aImapCredentials['Host'])
+		if ('auto' === $oSettings->host)
 		{
 			$domain = \substr(\strrchr($oAccount->Email(), '@'), 1);
 			$mxhosts = array();
 			if (\getmxrr($domain, $mxhosts) && $mxhosts)
 			{
-				$aImapCredentials['Host'] = $mxhosts[0];
+				$oSettings->host = $mxhosts[0];
 			}
 			else
 			{
-				$aImapCredentials['Host'] = $this->imap_prefix.$domain;
+				$oSettings->host = $this->imap_prefix.$domain;
 			}
 		}
 	}
@@ -53,20 +54,20 @@ class AutoDomainGrabPlugin extends \RainLoop\Plugins\AbstractPlugin
 	/**
 	 * This function detects the SMTP Host, and if it is set to 'auto', replaces it with the MX or email domain.
 	 */
-	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, array &$aSmtpCredentials)
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
 	{
 		// Check for mail.$DOMAIN as entered value in RL settings
-		if (!empty($aSmtpCredentials['Host']) && 'auto' === $aSmtpCredentials['Host'])
+		if ('auto' === $oSettings->host)
 		{
 			$domain = \substr(\strrchr($oAccount->Email(), '@'), 1);
 			$mxhosts = array();
 			if (\getmxrr($domain, $mxhosts) && $mxhosts)
 			{
-				$aSmtpCredentials['Host'] = $mxhosts[0];
+				$oSettings->host = $mxhosts[0];
 			}
 			else
 			{
-				$aSmtpCredentials['Host'] = $this->smtp_prefix . $domain;
+				$oSettings->host = $this->smtp_prefix . $domain;
 			}
 		}
 	}
diff --git a/plugins/custom-admin-settings-tab/LICENSE b/plugins/avatars/LICENSE
similarity index 100%
rename from plugins/custom-admin-settings-tab/LICENSE
rename to plugins/avatars/LICENSE
diff --git a/plugins/avatars/avatars.js b/plugins/avatars/avatars.js
new file mode 100644
index 000000000..0c09bcbd6
--- /dev/null
+++ b/plugins/avatars/avatars.js
@@ -0,0 +1,252 @@
+(rl => {
+
+	window.identiconSvg = (hash, txt, font) => {
+		// color defaults to last 7 chars as hue at 70% saturation, 50% brightness
+		// hsl2rgb adapted from: https://gist.github.com/aemkei/1325937
+		let h = (parseInt(hash.substr(-7), 16) / 0xfffffff) * 6, s = 0.7, l = 0.5,
+			v = [
+				l += s *= l < .5 ? l : 1 - l,
+				l - h % 1 * s * 2,
+				l -= s *= 2,
+				l,
+				l + h % 1 * s,
+				l + s
+			],
+			m = txt ? 128 : 200,
+			color = 'rgb(' + [
+				v[ ~~h % 6 ] * m, // red
+				v[ (h | 16) % 6 ] * m, // green
+				v[ (h |  8) % 6 ] * m // blue
+			].map(Math.round).join(',') + ')';
+
+		if (txt) {
+			return `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" viewBox="0 0 ${size} ${size}" version="1.1">
+				<circle fill="${color}" width="${size}" height="${size}" cx="${size/2}" cy="${size/2}" r="${size/2}"/>
+				<text x="${size}%" y="${size}%" style="color:#FFF" alignment-baseline="middle" text-anchor="middle"
+					 font-weight="bold" font-size="${Math.round(size*0.5)}" font-family="${font.replace(/"/g, "'")}"
+					 dy=".1em" dominant-baseline="middle" fill="#FFF">${txt}</text>
+				</svg>`;
+		}
+		return `<svg version="1.1" width="412" height="412" viewBox="0 0 412 412" xmlns="http://www.w3.org/2000/svg">
+			<path fill="${color}" d="m 404.4267,343.325 c -5.439,-16.32 -15.298,-32.782 -29.839,-42.362 -27.979,-18.572 -60.578,-28.479 -92.099,-39.085 -7.604,-2.664 -15.33,-5.568 -22.279,-9.7 -6.204,-3.686 -8.533,-11.246 -9.974,-17.886 -0.636,-3.512 -1.026,-7.116 -1.228,-10.661 22.857,-31.267 38.019,-82.295 38.019,-124.136 0,-65.298 -36.896,-83.495 -82.402,-83.495 -45.515,0 -82.403,18.17 -82.403,83.468 0,43.338 16.255,96.5 40.489,127.383 -0.221,2.438 -0.511,4.876 -0.95,7.303 -1.444,6.639 -3.77,14.058 -9.97,17.743 -6.957,4.133 -14.682,6.756 -22.287,9.42 -31.520996,10.605 -64.118996,19.957 -92.090996,38.529 -14.549,9.58 -24.403,27.159 -29.838,43.479 -5.597,16.938 -7.88600003,37.917 -7.54100003,54.917 H 205.9917 411.9657 c 0.348,-16.999 -1.946,-37.978 -7.539,-54.917 z"/>
+		</svg>`;
+	};
+
+	const
+		size = 50,
+		getEl = id => document.getElementById(id),
+		queue = [],
+		avatars = new Map,
+		ncAvatars = new Map,
+		identicons = new Map,
+		templateId = 'MailMessageView',
+		b64 = data => btoa(unescape(encodeURIComponent(data))),
+		b64url = data => b64(data).replace(/\+/g, '-').replace(/\//g, '_').replace(/=+$/, ''),
+		getBimiSelector = msg => {
+			// Get 's' value out of 'v=BIMI1; s=foo;'
+			let bimiSelector = msg.headers().valueByName('BIMI-Selector');
+			bimiSelector = bimiSelector ? bimiSelector.match(/;.*s=([^\s;]+)/)[1] : '';
+			return bimiSelector || '';
+		},
+		getBimiId = msg => ('pass' == msg.from[0].dkimStatus ? 1 : 0) + '-' + getBimiSelector(msg),
+		email = msg => msg.from[0].email.toLowerCase(),
+		getAvatarUid = msg => `${getBimiId(msg)}/${email(msg)}`,
+		getAvatar = msg => ncAvatars.get(email(msg)) || avatars.get(getAvatarUid(msg)),
+		getAvatarUri = msg => {
+			if ('remote' === msg.avatar) {
+				msg.avatar = `?Avatar/${getBimiId(msg)}/${b64url(email(msg))}`;
+			}
+/*
+			else if (!msg.avatar.startsWith('data:')) {
+				msg.avatar = null;
+			}
+*/
+			return msg.avatar;
+		},
+
+		hash = async txt => {
+			if (/^[0-9a-f]{15,}$/i.test(txt)) {
+				return txt;
+			}
+			const hashArray = Array.from(new Uint8Array(
+//				await crypto.subtle.digest('SHA-256', (new TextEncoder()).encode(txt.toLowerCase()))
+				await crypto.subtle.digest('SHA-1', (new TextEncoder()).encode(txt.toLowerCase()))
+			));
+			return hashArray.map(b => b.toString(16).padStart(2, '0')).join(''); // convert bytes to hex string
+		},
+		fromChars = from =>
+//			(from.name?.split(/[^\p{Lu}]+/gu) || []).reduce((a, s) => a + (s || '')), '')
+			(from.name?.split(/[^\p{L}]+/gu) || []).reduce((a, s) => a + (s[0] || ''), '')
+			.slice(0,2)
+			.toUpperCase(),
+		setIdenticon = (msg, fn, cb) => {
+			const from = email(msg);
+			if (identicons.get(from)) {
+				fn(identicons.get(from));
+			} else {
+				hash(from).then(hash => {
+					const uri = 'data:image/svg+xml;base64,' + b64(window.identiconSvg(
+						hash,
+						fromChars(msg.from[0]),
+						window.getComputedStyle(getEl('rl-app'), null).getPropertyValue('font-family')
+					));
+					fn(uri);
+					identicons.set(email(msg), uri);
+					cb?.(uri);
+				});
+			}
+		},
+
+		addQueue = (msg, fn) => {
+			if (msg.from?.[0]) {
+				if (getAvatarUri(msg)) {
+					if (rl.pluginSettingsGet('avatars', 'delay')) {
+						setIdenticon(msg, fn, ()=>{
+							queue.push([msg, fn]);
+							runQueue();
+						});
+					} else {
+						fn(msg.avatar);
+					}
+				} else {
+					setIdenticon(msg, fn);
+				}
+			}
+		},
+		runQueue = (() => {
+			let item = queue.shift();
+			while (item) {
+				let url = getAvatar(item[0]);
+				if (url) {
+					item[1](url);
+					item = queue.shift();
+					continue;
+				} else if (item[0].avatar) {
+					item[1](item[0].avatar);
+				}
+				runQueue();
+				break;
+			}
+		}).debounce(1000);
+
+		/**
+		 * Modify templates
+		 */
+		getEl('MailMessageList').content.querySelectorAll('.messageCheckbox')
+			.forEach(el => el.append(Element.fromHTML(`<img class="fromPic" data-bind="fromPic:$data" loading="lazy">`)));
+		const messageItemHeader = getEl(templateId).content.querySelector('.messageItemHeader');
+		if (messageItemHeader) {
+			messageItemHeader.prepend(Element.fromHTML(
+				`<img class="fromPic" data-bind="visible: viewUserPicVisible, attr: {'src': viewUserPic() }" loading="lazy">`
+			));
+		}
+
+		/**
+		 * Loads images from Nextcloud contacts
+		 */
+//		rl.pluginSettingsGet('avatars', 'nextcloud');
+		if (parent.OC?.requestToken) {
+			const OC = parent.OC,
+				nsDAV = 'DAV:',
+				nsNC = 'http://nextcloud.com/ns',
+				nsCard = 'urn:ietf:params:xml:ns:carddav',
+				getElementsByTagName = (parent, namespace, localName) => parent.getElementsByTagNameNS(namespace, localName),
+				getElementValue = (parent, namespace, localName) =>
+					getElementsByTagName(parent, namespace, localName)?.item(0)?.textContent;
+			fetch(`${OC.webroot}/remote.php/dav/addressbooks/users/${OC.currentUser}/contacts/`, {
+				mode: 'same-origin',
+				cache: 'no-cache',
+				redirect: 'error',
+				credentials: 'same-origin',
+				method: 'REPORT',
+				headers: {
+					requesttoken: OC.requestToken,
+					'Content-Type': 'application/xml; charset=utf-8',
+					Depth: 1
+				},
+				body: '<x4:addressbook-query xmlns:x4="urn:ietf:params:xml:ns:carddav"><x0:prop xmlns:x0="DAV:"><x4:address-data><x4:prop name="EMAIL"/></x4:address-data><x3:has-photo xmlns:x3="http://nextcloud.com/ns"/></x0:prop></x4:addressbook-query>'
+			})
+			.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+			.then(text => {
+				const
+					xmlParser = new DOMParser(),
+					responseList = getElementsByTagName(
+						xmlParser.parseFromString(text, 'application/xml').documentElement,
+						nsDAV,
+						'response');
+				for (let i = 0; i < responseList.length; ++i) {
+					const item = responseList.item(i);
+					if (1 == getElementValue(item, nsNC, 'has-photo')) {
+						[...getElementValue(item, nsCard, 'address-data').matchAll(/EMAIL.*?:([^@\r\n]+@[^@\r\n]+)/g)]
+						.forEach(match => {
+							ncAvatars.set(
+								match[1].toLowerCase(),
+								getElementValue(item, nsDAV, 'href') + '?photo'
+							);
+						});
+					}
+				}
+			});
+		}
+//	});
+
+	/**
+	 * Used by MailMessageList
+	 */
+	ko.bindingHandlers.fromPic = {
+		init: (element, self, dummy, msg) => {
+			try {
+				if (msg?.from?.[0]) {
+					let url = getAvatar(msg),
+						fn = url=>{element.src = url};
+					element.onerror = ()=>{
+						element.onerror = null;
+						setIdenticon(msg, fn, uri=>avatars.set(getAvatarUid(msg), uri));
+					};
+					if (url) {
+						fn(url);
+					} else if (msg.avatar?.startsWith('data:')) {
+						fn(msg.avatar);
+					} else {
+						element.onload = ()=>{
+							if (!element.src.startsWith('data:')) {
+								element.onload = null;
+								avatars.set(getAvatarUid(msg), element.src);
+							}
+						};
+						addQueue(msg, fn);
+					}
+				}
+			} catch (e) {
+				console.error(e);
+			}
+		}
+	};
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+			let view = e.detail;
+			view.viewUserPic = ko.observable('');
+			view.viewUserPicVisible = ko.observable(false);
+
+			view.message.subscribe(msg => {
+				view.viewUserPicVisible(false);
+				if (msg) {
+					let url = msg.from?.[0] ? getAvatar(msg) : 0,
+						fn = url => {
+							view.viewUserPic(url);
+							view.viewUserPicVisible(true);
+						};
+					if (url) {
+						fn(url);
+					} else if (msg.avatar) {
+						fn(getAvatarUri(msg));
+					} else {
+						addQueue(msg, fn);
+					}
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/avatars/identicon.js b/plugins/avatars/identicon.js
new file mode 100644
index 000000000..451f57b96
--- /dev/null
+++ b/plugins/avatars/identicon.js
@@ -0,0 +1,64 @@
+
+(()=>{
+
+const size = 50,
+	margin = 0.08;
+
+window.identiconSvg = (hash, txt, font) => {
+	// color defaults to last 7 chars as hue at 70% saturation, 50% brightness
+	// hsl2rgb adapted from: https://gist.github.com/aemkei/1325937
+	let h = (parseInt(hash.substr(-7), 16) / 0xfffffff) * 6, s = 0.7, l = 0.5,
+		v = [
+			l += s *= l < .5 ? l : 1 - l,
+			l - h % 1 * s * 2,
+			l -= s *= 2,
+			l,
+			l + h % 1 * s,
+			l + s
+		],
+		m = txt ? 128 : 255,
+		color = 'rgb(' + [
+			v[ ~~h % 6 ] * m, // red
+			v[ (h | 16) % 6 ] * m, // green
+			v[ (h |  8) % 6 ] * m // blue
+		].map(Math.round).join(',') + ')';
+
+	if (txt) {
+		txt = `<svg xmlns="http://www.w3.org/2000/svg" width="${size}" height="${size}" viewBox="0 0 ${size} ${size}" version="1.1">
+			<circle fill="${color}" width="${size}" height="${size}" cx="${size/2}" cy="${size/2}" r="${size/2}"/>
+			<text x="${size}%" y="${size}%" style="color:#FFF" alignment-baseline="middle" text-anchor="middle"
+				 font-weight="bold" font-size="${Math.round(size*0.5)}" font-family="${font.replace(/"/g, "'")}"
+				 dy=".1em" dominant-baseline="middle" fill="#FFF">${txt}</text>
+			</svg>`;
+	} else {
+		txt = `<path fill="${color}" d="m 404.4267,343.325 c -5.439,-16.32 -15.298,-32.782 -29.839,-42.362 -27.979,-18.572 -60.578,-28.479 -92.099,-39.085 -7.604,-2.664 -15.33,-5.568 -22.279,-9.7 -6.204,-3.686 -8.533,-11.246 -9.974,-17.886 -0.636,-3.512 -1.026,-7.116 -1.228,-10.661 22.857,-31.267 38.019,-82.295 38.019,-124.136 0,-65.298 -36.896,-83.495 -82.402,-83.495 -45.515,0 -82.403,18.17 -82.403,83.468 0,43.338 16.255,96.5 40.489,127.383 -0.221,2.438 -0.511,4.876 -0.95,7.303 -1.444,6.639 -3.77,14.058 -9.97,17.743 -6.957,4.133 -14.682,6.756 -22.287,9.42 -31.520996,10.605 -64.118996,19.957 -92.090996,38.529 -14.549,9.58 -24.403,27.159 -29.838,43.479 -5.597,16.938 -7.88600003,37.917 -7.54100003,54.917 H 205.9917 411.9657 c 0.348,-16.999 -1.946,-37.978 -7.539,-54.917 z"/>`;
+
+		const cell = Math.floor((size - ((Math.floor(size * margin)) * 2)) / 5),
+			imargin = Math.floor((size - cell * 5) / 2),
+			rectangles = [],
+			add = (x, y) => rectangles.push("<rect x='" + (x * cell + imargin)
+				+ "' y='" + (y * cell + imargin)
+				+ "' width='" + cell + "' height='" + cell + "'/>");
+		// the first 15 characters of the hash control the pixels (even/odd)
+		// they are drawn down the middle first, then mirrored outwards
+		for (let i = 0; i < 15; ++i) {
+			if (!(parseInt(hash.charAt(i), 16) % 2)) {
+				if (i < 5) {
+					add(2, i);
+				} else if (i < 10) {
+					add(1, (i - 5));
+					add(3, (i - 5));
+				} else {
+					add(0, (i - 10));
+					add(4, (i - 10));
+				}
+			}
+		}
+		txt = "<g style='fill:" + color + "; stroke:" + color + "; stroke-width:" + (size * 0.005) + ";'>"
+			+ rectangles.join('')
+			+ "</g>";
+	}
+	return "<svg xmlns='http://www.w3.org/2000/svg' width='" + size + "' height='" + size + "'>" + txt + "</svg>";
+};
+
+})();
diff --git a/plugins/avatars/images/services/amazon.com.png b/plugins/avatars/images/services/amazon.com.png
new file mode 100644
index 000000000..ec102e472
Binary files /dev/null and b/plugins/avatars/images/services/amazon.com.png differ
diff --git a/plugins/avatars/images/services/apple.com.png b/plugins/avatars/images/services/apple.com.png
new file mode 100644
index 000000000..a787a4580
Binary files /dev/null and b/plugins/avatars/images/services/apple.com.png differ
diff --git a/plugins/avatars/images/services/asana.com.png b/plugins/avatars/images/services/asana.com.png
new file mode 100644
index 000000000..17565906d
Binary files /dev/null and b/plugins/avatars/images/services/asana.com.png differ
diff --git a/plugins/avatars/images/services/battle.net.png b/plugins/avatars/images/services/battle.net.png
new file mode 100644
index 000000000..f5baf8db8
Binary files /dev/null and b/plugins/avatars/images/services/battle.net.png differ
diff --git a/plugins/avatars/images/services/blizzard.com.png b/plugins/avatars/images/services/blizzard.com.png
new file mode 100644
index 000000000..f5baf8db8
Binary files /dev/null and b/plugins/avatars/images/services/blizzard.com.png differ
diff --git a/plugins/avatars/images/services/dhl.com.png b/plugins/avatars/images/services/dhl.com.png
new file mode 100644
index 000000000..9969fed2b
Binary files /dev/null and b/plugins/avatars/images/services/dhl.com.png differ
diff --git a/plugins/avatars/images/services/disneyplus.com.png b/plugins/avatars/images/services/disneyplus.com.png
new file mode 100644
index 000000000..3609fb3e7
Binary files /dev/null and b/plugins/avatars/images/services/disneyplus.com.png differ
diff --git a/plugins/avatars/images/services/ea.com.png b/plugins/avatars/images/services/ea.com.png
new file mode 100644
index 000000000..08ed67940
Binary files /dev/null and b/plugins/avatars/images/services/ea.com.png differ
diff --git a/plugins/avatars/images/services/ebay.com.png b/plugins/avatars/images/services/ebay.com.png
new file mode 100644
index 000000000..943b60e9a
Binary files /dev/null and b/plugins/avatars/images/services/ebay.com.png differ
diff --git a/plugins/avatars/images/services/facebook.com.png b/plugins/avatars/images/services/facebook.com.png
new file mode 100644
index 000000000..ef15c9325
Binary files /dev/null and b/plugins/avatars/images/services/facebook.com.png differ
diff --git a/plugins/avatars/images/services/github.com.png b/plugins/avatars/images/services/github.com.png
new file mode 100644
index 000000000..1c9d1f2f0
Binary files /dev/null and b/plugins/avatars/images/services/github.com.png differ
diff --git a/plugins/avatars/images/services/google.com.png b/plugins/avatars/images/services/google.com.png
new file mode 100644
index 000000000..a6a717ce4
Binary files /dev/null and b/plugins/avatars/images/services/google.com.png differ
diff --git a/plugins/avatars/images/services/linkedin.com.png b/plugins/avatars/images/services/linkedin.com.png
new file mode 100644
index 000000000..8756d6f0c
Binary files /dev/null and b/plugins/avatars/images/services/linkedin.com.png differ
diff --git a/plugins/avatars/images/services/microsoft.com.png b/plugins/avatars/images/services/microsoft.com.png
new file mode 100644
index 000000000..628357265
Binary files /dev/null and b/plugins/avatars/images/services/microsoft.com.png differ
diff --git a/plugins/avatars/images/services/onlive.com.png b/plugins/avatars/images/services/onlive.com.png
new file mode 100644
index 000000000..bfc038fea
Binary files /dev/null and b/plugins/avatars/images/services/onlive.com.png differ
diff --git a/plugins/avatars/images/services/paypal.com.png b/plugins/avatars/images/services/paypal.com.png
new file mode 100644
index 000000000..a678fa6ce
Binary files /dev/null and b/plugins/avatars/images/services/paypal.com.png differ
diff --git a/plugins/avatars/images/services/skype.com.png b/plugins/avatars/images/services/skype.com.png
new file mode 100644
index 000000000..74d604734
Binary files /dev/null and b/plugins/avatars/images/services/skype.com.png differ
diff --git a/plugins/avatars/images/services/steampowered.com.png b/plugins/avatars/images/services/steampowered.com.png
new file mode 100644
index 000000000..13c4d526f
Binary files /dev/null and b/plugins/avatars/images/services/steampowered.com.png differ
diff --git a/plugins/avatars/images/services/ted.com.png b/plugins/avatars/images/services/ted.com.png
new file mode 100644
index 000000000..0b1e14cdc
Binary files /dev/null and b/plugins/avatars/images/services/ted.com.png differ
diff --git a/plugins/avatars/images/services/twitter.com.png b/plugins/avatars/images/services/twitter.com.png
new file mode 100644
index 000000000..b8582c00b
Binary files /dev/null and b/plugins/avatars/images/services/twitter.com.png differ
diff --git a/plugins/avatars/images/services/youtube.com.png b/plugins/avatars/images/services/youtube.com.png
new file mode 100644
index 000000000..5002d8439
Binary files /dev/null and b/plugins/avatars/images/services/youtube.com.png differ
diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
new file mode 100644
index 000000000..459172ebe
--- /dev/null
+++ b/plugins/avatars/index.php
@@ -0,0 +1,491 @@
+<?php
+/**
+ * You may store your own custom domain icons in `data/_data_/_default_/avatars/`
+ * Like: `data/_data_/_default_/avatars/snappymail.eu.svg`
+ */
+
+class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Avatars',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.22',
+		RELEASE  = '2025-03-10',
+		REQUIRED = '2.33.0',
+		CATEGORY = 'Contacts',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Show graphic of sender in message and messages list (supports Contacts, BIMI, Gravatar, favicon and identicon)';
+
+	public function Init() : void
+	{
+		$this->addCss('style.css');
+		$this->addJs('avatars.js');
+		$this->addJsonHook('Avatar', 'DoAvatar');
+		$this->addPartHook('Avatar', 'ServiceAvatar');
+		$identicon = $this->Config()->Get('plugin', 'identicon', '');
+		if ($identicon && \is_file(__DIR__ . "/{$identicon}.js")) {
+			$this->addJs("{$identicon}.js");
+		}
+		// https://github.com/the-djmaze/snappymail/issues/714
+		if ($this->Config()->Get('plugin', 'service', true)
+//		 || !$this->Config()->Get('plugin', 'delay', true)
+		 || $this->Config()->Get('plugin', 'gravatar', false)
+		 || $this->Config()->Get('plugin', 'bimi', false)
+		 || $this->Config()->Get('plugin', 'favicon', false)
+		) {
+			$this->addHook('json.after-message', 'JsonMessage');
+			$this->addHook('json.after-messagelist', 'JsonMessageList');
+		}
+		// https://www.ietf.org/archive/id/draft-brand-indicators-for-message-identification-04.html#bimi-selector
+		if ($this->Config()->Get('plugin', 'bimi', false)) {
+			$this->addHook('imap.message-headers', 'ImapMessageHeaders');
+		}
+	}
+
+	public function ImapMessageHeaders(array &$aHeaders)
+	{
+		// \MailSo\Mime\Enumerations\Header::BIMI_SELECTOR
+		$aHeaders[] = 'BIMI-Selector';
+	}
+
+	public function JsonMessage(array &$aResponse)
+	{
+		if ($icon = $this->JsonAvatar($aResponse['Result'])) {
+			$aResponse['Result']['avatar'] = $icon;
+		}
+	}
+
+	public function JsonMessageList(array &$aResponse)
+	{
+		if (!empty($aResponse['Result']['@Collection'])) {
+			foreach ($aResponse['Result']['@Collection'] as &$message) {
+				if ($icon = $this->JsonAvatar($message)) {
+					$message['avatar'] = $icon;
+				}
+			}
+		}
+	}
+
+	private function JsonAvatar($message) : ?string
+	{
+		$mFrom = empty($message['from'][0]) ? null : $message['from'][0];
+		if ($mFrom instanceof \MailSo\Mime\Email) {
+			$mFrom = $mFrom->jsonSerialize();
+		}
+		if (\is_array($mFrom)) {
+			if (/*!$this->Config()->Get('plugin', 'delay', true)
+			 && */($this->Config()->Get('plugin', 'gravatar', false)
+				|| ($this->Config()->Get('plugin', 'bimi', false) && 'pass' == $mFrom['dkimStatus'])
+				|| ($this->Config()->Get('plugin', 'favicon', false) && 'pass' == $mFrom['dkimStatus'])
+			 )
+			) {
+				return 'remote';
+			}
+			if ('pass' == $mFrom['dkimStatus'] && $this->Config()->Get('plugin', 'service', true)) {
+				// 'data:image/png;base64,[a-zA-Z0-9+/=]'
+				return static::getServiceIcon($mFrom['email']);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * POST method handling
+	 */
+	public function DoAvatar() : array
+	{
+		$bBimi = !empty($this->jsonParam('bimi'));
+		$sBimiSelector = $this->jsonParam('bimiSelector') ?: '';
+		$sEmail = $this->jsonParam('email');
+		$aResult = $this->getAvatar($sEmail, $bBimi, $sBimiSelector);
+		if ($aResult) {
+			$aResult = [
+				'type' => $aResult[0],
+				'data' => \base64_encode($aResult[1])
+			];
+		}
+		return $this->jsonResponse(__FUNCTION__, $aResult);
+	}
+
+	/**
+	 * GET /?Avatar/${bimi}/Encoded(${from.email})
+	 * Nextcloud Mail uses insecure unencoded 'index.php/apps/mail/api/avatars/url/local%40example.com'
+	 */
+//	public function ServiceAvatar(...$aParts)
+	public function ServiceAvatar(string $sServiceName, string $sBimi, string $sEncodedEmail)
+	{
+		$maxAge = 86400;
+		$sEmail = \MailSo\Base\Utils::UrlSafeBase64Decode($sEncodedEmail);
+		$aBimi = \explode('-', $sBimi, 2);
+		$sBimiSelector = isset($aBimi[1]) ? $aBimi[1] : 'default';
+//		$sEmail && \MailSo\Base\Http::setETag("{$sBimiSelector}-{$sEncodedEmail}");
+		if ($sEmail && ($aResult = $this->getAvatar($sEmail, !empty($aBimi[0]), $sBimiSelector))) {
+			\header("Cache-Control: max-age={$maxAge}, private");
+			\header('Expires: '.\gmdate('D, j M Y H:i:s', $maxAge + \time()).' UTC');
+			\header('Content-Type: '.$aResult[0]);
+			echo $aResult[1];
+		} else {
+			\MailSo\Base\Http::StatusHeader(404);
+		}
+		exit;
+	}
+
+	protected function configMapping() : array
+	{
+		$group = new \RainLoop\Plugins\PropertyCollection('Lookup');
+		$group->exchangeArray([
+			\RainLoop\Plugins\Property::NewInstance('delay')->SetLabel('Delay lookup')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetAllowedInJs(true)
+				->SetDefaultValue(true),
+			\RainLoop\Plugins\Property::NewInstance('contacts')->SetLabel('Contacts')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDescription('Use the PHOTO stored on a matching address book contact')
+				->SetDefaultValue(true),
+			\RainLoop\Plugins\Property::NewInstance('bimi')->SetLabel('BIMI')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+				->SetDescription('https://bimigroup.org/ (DKIM header must be valid)'),
+			\RainLoop\Plugins\Property::NewInstance('favicon')->SetLabel('Favicon')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+				->SetDescription('Fetch favicon from domain (DKIM header must be valid)'),
+			\RainLoop\Plugins\Property::NewInstance('gravatar')->SetLabel('Gravatar')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+				->SetDescription('https://wikipedia.org/wiki/Gravatar'),
+		]);
+		$aResult = array(
+			defined('RainLoop\\Enumerations\\PluginPropertyType::SELECT')
+				? \RainLoop\Plugins\Property::NewInstance('identicon')->SetLabel('Identicon')
+					->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECT)
+					->SetDefaultValue([
+						['id' => '', 'name' => 'Name characters else silhouette'],
+						['id' => 'identicon', 'name' => 'Name characters else squares'],
+						['id' => 'jdenticon', 'name' => 'Triangles shape']
+					])
+					->SetDescription('https://wikipedia.org/wiki/Identicon')
+				: \RainLoop\Plugins\Property::NewInstance('identicon')->SetLabel('Identicon')
+					->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
+					->SetDefaultValue(['','identicon','jdenticon'])
+					->SetDescription('empty = default, identicon = squares, jdenticon = Triangles shape')
+				,
+			\RainLoop\Plugins\Property::NewInstance('service')->SetLabel('Preload valid domain icons')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetAllowedInJs(true)
+				->SetDefaultValue(true)
+				->SetDescription('DKIM header must be valid and icon is found in avatars/images/services directory'),
+			$group
+		);
+/*
+		if (\class_exists('OC') && isset(\OC::$server)) {
+			$aResult[] = \RainLoop\Plugins\Property::NewInstance('nextcloud')->SetLabel('Lookup Nextcloud Contacts')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+//				->SetAllowedInJs(true)
+				->SetDefaultValue(false);
+		}
+*/
+		return $aResult;
+	}
+
+	private static function getServicePng(string $sDomain) : ?string
+	{
+		$aServices = [
+			"services/{$sDomain}",
+			'services/' . static::serviceDomain($sDomain)
+		];
+		foreach ($aServices as $service) {
+			$file = __DIR__ . "/images/{$service}.png";
+			if (\file_exists($file)) {
+				return $file;
+			}
+		}
+		return null;
+	}
+
+	// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
+	private static function getServiceIcon(string $sEmail) : ?string
+	{
+		$aParts = \explode('@', $sEmail);
+		$file = static::getServicePng(\array_pop($aParts));
+		if ($file) {
+			return 'data:image/png;base64,' . \base64_encode(\file_get_contents($file));
+		}
+
+		$aResult = static::getCachedImage($sEmail);
+		if ($aResult) {
+			return 'data:'.$aResult[0].';base64,' . \base64_encode($aResult[1]);
+		}
+
+		return null;
+	}
+
+	private function getAvatar(string $sEmail, bool $bBimi, string $sBimiSelector = '') : ?array
+	{
+		if (!\strpos($sEmail, '@')) {
+			return null;
+		}
+
+		$sAsciiEmail = \mb_strtolower(\SnappyMail\IDN::emailToAscii($sEmail));
+		$sEmailId = \sha1($sAsciiEmail);
+
+		\MailSo\Base\Http::setETag($sEmailId);
+		\header('Cache-Control: private');
+//		\header('Expires: '.\gmdate('D, j M Y H:i:s', \time() + 86400).' UTC');
+
+		// A photo stored on the contact is authoritative, so it is consulted
+		// before the cache and before any network lookup: it beats a guessed
+		// avatar and replaces up to five remote round-trips. Deliberately not
+		// written to the avatars cache, which has no expiry - a cached copy
+		// would shadow later edits to the contact.
+		if ($this->Config()->Get('plugin', 'contacts', true)) {
+			$aResult = static::getContactPhoto($sAsciiEmail);
+			if ($aResult) {
+				return $aResult;
+			}
+		}
+
+		$aResult = static::getCachedImage($sEmail);
+		if ($aResult) {
+			return $aResult;
+		}
+
+
+		if (!$aResult) {
+			$sDomain = \explode('@', $sEmail);
+			$sDomain = \array_pop($sDomain);
+
+			$aUrls = [];
+
+			if ($this->Config()->Get('plugin', 'bimi', false)) {
+				$BIMI = $bBimi ? \SnappyMail\DNS::BIMI($sDomain, $sBimiSelector) : null;
+				if ($BIMI) {
+					$aUrls[] = $BIMI;
+//					$aResult = ['text/uri-list', $BIMI];
+					\SnappyMail\Log::debug('Avatar', "BIMI {$sDomain}: {$BIMI}");
+				} else {
+					\SnappyMail\Log::notice('Avatar', "BIMI 404 for {$sDomain}");
+				}
+			}
+
+			if ($this->Config()->Get('plugin', 'gravatar', false)) {
+				$aUrls[] = 'https://gravatar.com/avatar/'.\hash('sha256', \strtolower($sAsciiEmail)).'?s=80&d=404';
+			}
+
+			foreach ($aUrls as $sUrl) {
+				if ($aResult = static::getUrl($sUrl)) {
+					break;
+				}
+			}
+		}
+
+		if ($aResult) {
+			static::cacheImage($sEmail, $aResult);
+		}
+
+		// Only allow service icon when DKIM is valid. $bBimi is true when DKIM is valid.
+		if ($bBimi && !$aResult) {
+			$file = static::getServicePng($sDomain);
+			if ($file) {
+				\MailSo\Base\Http::setLastModified(\filemtime($file));
+				$aResult = [
+					'image/png',
+					\file_get_contents($file)
+				];
+			}
+
+			if (!$aResult && $this->Config()->Get('plugin', 'favicon', false)) {
+				$aResult = static::getFavicon($sDomain);
+			}
+		}
+
+		return $aResult;
+	}
+
+	private static function serviceDomain(string $sDomain) : string
+	{
+		$sDomain = \preg_replace('/^(.+\\.)?(paypal\\.[a-z][a-z])$/D', 'paypal.com', $sDomain);
+		$sDomain = \preg_replace('/^facebookmail.com$/D', 'facebook.com', $sDomain);
+		$sDomain = \preg_replace('/^dhlparcel.nl$/D', 'dhl.com', $sDomain);
+		$sDomain = \preg_replace('/^amazon.nl$/D', 'amazon.com', $sDomain);
+		$sDomain = \preg_replace('/^.+\\.([^.]+\\.[^.]+)$/D', '$1', $sDomain);
+		return $sDomain;
+	}
+
+	/**
+	 * Return the PHOTO of the address book contact owning this address.
+	 *
+	 * vCard 4.0 stores it as a data: URI, vCard 3.0 as ENCODING=b with a TYPE
+	 * parameter, and either version may point at an external URL instead.
+	 */
+	private static function getContactPhoto(string $sEmail) : ?array
+	{
+		try {
+			$oActions = \RainLoop\Api::Actions();
+			$oAccount = $oActions->getAccountFromToken(false);
+			if (!$oAccount) {
+				return null;
+			}
+			$oProvider = $oActions->AddressBookProvider($oAccount);
+			if (!$oProvider || !$oProvider->IsActive()) {
+				return null;
+			}
+			// Several contacts can share an address - a synced card, a manual
+			// entry, an auto-collected one - and only one of them may carry the
+			// photo. GetContactByEmail() returns whichever matches first, so
+			// fall back to scanning the matches for one that actually has it.
+			$oPhoto = null;
+			$oContact = $oProvider->GetContactByEmail($sEmail);
+			if ($oContact && $oContact->vCard && isset($oContact->vCard->PHOTO)) {
+				$oPhoto = $oContact->vCard->PHOTO;
+			} else {
+				$iCount = 0;
+				foreach ($oProvider->GetContacts(0, 20, $sEmail, $iCount) as $oCandidate) {
+					if ($oCandidate->vCard && isset($oCandidate->vCard->PHOTO)) {
+						$oPhoto = $oCandidate->vCard->PHOTO;
+						break;
+					}
+				}
+			}
+			if (!$oPhoto) {
+				return null;
+			}
+
+			$sValue = \trim((string) $oPhoto);
+			if (!\strlen($sValue)) {
+				return null;
+			}
+
+			// vCard 4.0: data:image/jpeg;base64,...
+			if (\preg_match('#^data:(image/[a-z0-9.+-]+);base64,(.+)$#si', $sValue, $aMatch)) {
+				$sBinary = \base64_decode(\preg_replace('#\s+#', '', $aMatch[2]), true);
+				return $sBinary ? [\strtolower($aMatch[1]), $sBinary] : null;
+			}
+
+			// vCard 3.0: PHOTO;ENCODING=b;TYPE=JPEG:<base64>
+			$sEncoding = \strtolower((string) ($oPhoto['ENCODING'] ?? ''));
+			if ('b' === $sEncoding || 'base64' === $sEncoding) {
+				$sBinary = \base64_decode(\preg_replace('#\s+#', '', $sValue), true);
+				if ($sBinary) {
+					$sType = \strtolower((string) ($oPhoto['TYPE'] ?? '')) ?: 'jpeg';
+					return [\str_starts_with($sType, 'image/') ? $sType : "image/{$sType}", $sBinary];
+				}
+				return null;
+			}
+
+			// Either version may reference the image instead of embedding it.
+			if (\preg_match('#^https?://#i', $sValue)) {
+				return static::getUrl($sValue);
+			}
+		} catch (\Throwable $oException) {
+			\SnappyMail\Log::notice('Avatar', 'contact photo lookup failed: ' . $oException->getMessage());
+		}
+		return null;
+	}
+
+	private static function cacheImage(string $sEmail, array $aResult) : void
+	{
+		if (!\is_dir(\APP_PRIVATE_DATA . 'avatars')) {
+			\mkdir(\APP_PRIVATE_DATA . 'avatars', 0700);
+		}
+		$sEmailId = \mb_strtolower(\SnappyMail\IDN::emailToAscii($sEmail));
+		if (\str_contains($sEmail, '@')) {
+			$sEmailId = \sha1($sEmailId);
+		}
+		\file_put_contents(
+			\APP_PRIVATE_DATA . 'avatars/' . $sEmailId . \SnappyMail\File\MimeType::toExtension($aResult[0]),
+			$aResult[1]
+		);
+		\MailSo\Base\Http::setLastModified(\time());
+	}
+
+	private static function getCachedImage(string $sEmail) : ?array
+	{
+		$sEmail = \mb_strtolower(\SnappyMail\IDN::emailToAscii($sEmail));
+		$aFiles = \glob(\APP_PRIVATE_DATA . "avatars/{$sEmail}.*");
+		if (!$aFiles && \str_contains($sEmail, '@')) {
+			$sEmailId = \sha1($sEmail);
+			$aFiles = \glob(\APP_PRIVATE_DATA . "avatars/{$sEmailId}.*");
+			if (!$aFiles) {
+				$sDomain = \explode('@', $sEmail);
+				$sDomain = \array_pop($sDomain);
+				$aFiles = \glob(\APP_PRIVATE_DATA . "avatars/{$sDomain}.*");
+			}
+		}
+		if ($aFiles) {
+			return [
+				\SnappyMail\File\MimeType::fromFile($aFiles[0]),
+				\file_get_contents($aFiles[0])
+			];
+		}
+		return null;
+	}
+
+	private static function getFavicon(string $sDomain) : ?array
+	{
+		$aResult = static::getUrl('https://' . $sDomain . '/favicon.ico')
+			?: static::getUrl('https://' . static::serviceDomain($sDomain) . '/favicon.ico')
+			?: static::getUrl('https://www.' . static::serviceDomain($sDomain) . '/favicon.ico')
+			?: static::getUrl("https://www.google.com/s2/favicons?sz=48&domain_url={$sDomain}")
+			?: static::getUrl("https://api.faviconkit.com/{$sDomain}/48")
+//			?: static::getUrl("https://api.statvoo.com/favicon/{$sDomain}")
+		;
+/*
+		Also detect the following?
+
+		<link sizes="16x16" rel="shortcut icon" type="image/x-icon" href="/..." />
+		<link sizes="16x16" rel="shortcut icon" type="image/png" href="/..." />
+		<link sizes="32x32" rel="shortcut icon" type="image/png" href="/..." />
+		<link sizes="96x96" rel="shortcut icon" type="image/png" href="/..." />
+
+		<link sizes="36x36" rel="icon" type="image/png" href="/..." />
+		<link sizes="48x48" rel="icon" type="image/png" href="/..." />
+		<link sizes="72x72" rel="icon" type="image/png" href="/..." />
+		<link sizes="96x96" rel="icon" type="image/png" href="/..." />
+		<link sizes="144x144" rel="icon" type="image/png" href="/..." />
+		<link sizes="192x192" rel="icon" type="image/png" href="/..." />
+
+		<link sizes="57x57" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="60x60" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="72x72" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="76x76" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="114x114" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="120x120" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="144x144" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="152x152" rel="apple-touch-icon" type="image/png" href="/" />
+		<link sizes="180x180" rel="apple-touch-icon" type="image/png" href="/..." />
+		<link sizes="192x192" rel="apple-touch-icon" type="image/png" href="/..." />
+*/
+		if ($aResult) {
+			static::cacheImage($sDomain, $aResult);
+		}
+		return $aResult;
+	}
+
+	private static function getUrl(string $sUrl) : ?array
+	{
+		$oHTTP = \SnappyMail\HTTP\Request::factory(/*'socket' or 'curl'*/);
+		$oHTTP->proxy = \RainLoop\Api::Config()->Get('labs', 'curl_proxy', '');
+		$oHTTP->proxy_auth = \RainLoop\Api::Config()->Get('labs', 'curl_proxy_auth', '');
+		$oHTTP->max_response_kb = 0;
+		$oHTTP->timeout = 15; // timeout in seconds.
+		try {
+			$oResponse = $oHTTP->doRequest('GET', $sUrl);
+			if ($oResponse) {
+				if (200 === $oResponse->status && \str_starts_with($oResponse->getHeader('content-type'), 'image/')) {
+					return [
+						$oResponse->getHeader('content-type'),
+						$oResponse->body
+					];
+				}
+				\SnappyMail\Log::notice('Avatar', "error {$oResponse->status} for {$sUrl}");
+			} else {
+				\SnappyMail\Log::warning('Avatar', "failed for {$sUrl}");
+			}
+		} catch (\Throwable $e) {
+			\SnappyMail\Log::notice('Avatar', "error {$e->getMessage()}");
+		}
+		return null;
+	}
+}
diff --git a/plugins/avatars/jdenticon.js b/plugins/avatars/jdenticon.js
new file mode 100644
index 000000000..6652881a5
--- /dev/null
+++ b/plugins/avatars/jdenticon.js
@@ -0,0 +1,677 @@
+/**
+ * Jdenticon 3.2.0
+ * http://jdenticon.com
+ *
+ * Built: 2022-08-07T11:23:11.640Z
+ *
+ * MIT License
+ *
+ * Copyright (c) 2014-2021 Daniel Mester Pirttijärvi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+(()=>{
+/**
+ * Parses a substring of the hash as a number.
+ * @param {number} startPosition
+ * @param {number=} octets
+ */
+
+class HSLColor
+{
+	constructor(h, s, l)
+	{
+		this.h = h;
+		this.s = s;
+		this.l = l;
+//		this.a = a;
+	}
+
+	toString()
+	{
+		const h = this.h, s = this.s, l = this.l/*, a = this.a*/,
+			hex = v => {
+				v = between(0, 255, v * 255).toString(16);
+				return v.slice(0,2).padStart(2, "0");
+			};
+		let r=l, g=l, b=l;
+		if (0 != s) {
+			let q=l<0.5?l*(s+1):l+s-l*s,
+				p=l*2-q,
+				hue2rgb = h => {
+					h += h<0 ? 1 : (h>1 ? -1 : 0);
+					return (h*6<1) ? (p+(q-p)*h*6) : ((h*2<1) ? q : ((h*3<2) ? p+(q-p)*(2/3-h)*6 : p));
+				};
+			r = hue2rgb(h+1/3);
+			g = hue2rgb(h);
+			b = hue2rgb(h-1/3);
+		}
+		return '#' + hex(r) + hex(g) + hex(b) // isNaN(a)?100:a*100);
+	}
+}
+
+const
+	between = (l, h, v) => Math.max(l, Math.min(h, v)),
+
+	parseHex = (hash, startPosition, octets) => parseInt(hash.substr(startPosition, octets), 16),
+
+	/**
+	 * Converts an HSL color to a hexadecimal RGB color. This function will correct the lightness for the "dark" hues
+	 * @param {number} hue  Hue in range [0, 1]
+	 * @param {number} saturation  Saturation in range [0, 1]
+	 * @param {number} lightness  Lightness in range [0, 1]
+	 * @returns {string}
+	 */
+	correctedHsl = (hue, saturation, lightness) => {
+		// The corrector specifies the perceived middle lightness for each hue
+		var correctors = [ 0.55, 0.5, 0.5, 0.46, 0.6, 0.55, 0.55 ],
+			  corrector = correctors[(hue * 6 + 0.5) | 0];
+
+		// Adjust the input lightness relative to the corrector
+		lightness = lightness < 0.5 ? lightness * corrector * 2 : corrector + (lightness - 0.5) * (1 - corrector) * 2;
+
+		return new HSLColor(hue, saturation, lightness).toString();
+	};
+
+/**
+ * Represents a point.
+ */
+class Point
+{
+	constructor(x, y) {
+		this.x = x;
+		this.y = y;
+	}
+}
+
+/**
+ * Translates and rotates a point before being passed on to the canvas context. This was previously done by the canvas context itself,
+ * but this caused a rendering issue in Chrome on sizes > 256 where the rotation transformation of inverted paths was not done properly.
+ */
+class Transform
+{
+	constructor(x, y, size, rotation) {
+		this.u/*_x*/ = x;
+		this.v/*_y*/ = y;
+		this.K/*_size*/ = size;
+		this.Z/*_rotation*/ = rotation;
+	}
+
+	/**
+	 * Transforms the specified point based on the translation and rotation specification for this Transform.
+	 * @param {number} x x-coordinate
+	 * @param {number} y y-coordinate
+	 * @param {number=} w The width of the transformed rectangle. If greater than 0, this will ensure the returned point is of the upper left corner of the transformed rectangle.
+	 * @param {number=} h The height of the transformed rectangle. If greater than 0, this will ensure the returned point is of the upper left corner of the transformed rectangle.
+	 */
+	L/*transformIconPoint*/(x, y, w, h) {
+		var right = this.u/*_x*/ + this.K/*_size*/,
+			bottom = this.v/*_y*/ + this.K/*_size*/,
+			rotation = this.Z/*_rotation*/;
+		return rotation === 1 ? new Point(right - y - (h || 0), this.v/*_y*/ + x) :
+			   rotation === 2 ? new Point(right - x - (w || 0), bottom - y - (h || 0)) :
+			   rotation === 3 ? new Point(this.u/*_x*/ + y, bottom - x - (w || 0)) :
+			   new Point(this.u/*_x*/ + x, this.v/*_y*/ + y);
+	}
+}
+
+var NO_TRANSFORM = new Transform(0, 0, 0, 0);
+
+/**
+ * Provides helper functions for rendering common basic shapes.
+ */
+class Graphics
+{
+	constructor(renderer) {
+		/**
+		 * @type {Renderer}
+		 * @private
+		 */
+		this.M/*_renderer*/ = renderer;
+
+		/**
+		 * @type {Transform}
+		 */
+		this.A/*currentTransform*/ = NO_TRANSFORM;
+	}
+
+	/**
+	 * Adds a polygon to the underlying renderer.
+	 * @param {Array<number>} points The points of the polygon clockwise on the format [ x0, y0, x1, y1, ..., xn, yn ]
+	 * @param {boolean=} invert Specifies if the polygon will be inverted.
+	 */
+	g/*addPolygon*/(points, invert) {
+			var this$1 = this;
+
+		var di = invert ? -2 : 2,
+			  transformedPoints = [];
+
+		for (var i = invert ? points.length - 2 : 0; i < points.length && i >= 0; i += di) {
+			transformedPoints.push(this$1.A/*currentTransform*/.L/*transformIconPoint*/(points[i], points[i + 1]));
+		}
+
+		this.M/*_renderer*/.g/*addPolygon*/(transformedPoints);
+	}
+
+	/**
+	 * Adds a polygon to the underlying renderer.
+	 * Source: http://stackoverflow.com/a/2173084
+	 * @param {number} x The x-coordinate of the upper left corner of the rectangle holding the entire ellipse.
+	 * @param {number} y The y-coordinate of the upper left corner of the rectangle holding the entire ellipse.
+	 * @param {number} size The size of the ellipse.
+	 * @param {boolean=} invert Specifies if the ellipse will be inverted.
+	 */
+	h/*addCircle*/(x, y, size, invert) {
+		var p = this.A/*currentTransform*/.L/*transformIconPoint*/(x, y, size, size);
+		this.M/*_renderer*/.h/*addCircle*/(p, size, invert);
+	}
+
+	/**
+	 * Adds a rectangle to the underlying renderer.
+	 * @param {number} x The x-coordinate of the upper left corner of the rectangle.
+	 * @param {number} y The y-coordinate of the upper left corner of the rectangle.
+	 * @param {number} w The width of the rectangle.
+	 * @param {number} h The height of the rectangle.
+	 * @param {boolean=} invert Specifies if the rectangle will be inverted.
+	 */
+	i/*addRectangle*/(x, y, w, h, invert) {
+		this.g/*addPolygon*/([
+			x, y,
+			x + w, y,
+			x + w, y + h,
+			x, y + h
+		], invert);
+	}
+
+	/**
+	 * Adds a right triangle to the underlying renderer.
+	 * @param {number} x The x-coordinate of the upper left corner of the rectangle holding the triangle.
+	 * @param {number} y The y-coordinate of the upper left corner of the rectangle holding the triangle.
+	 * @param {number} w The width of the triangle.
+	 * @param {number} h The height of the triangle.
+	 * @param {number} r The rotation of the triangle (clockwise). 0 = right corner of the triangle in the lower left corner of the bounding rectangle.
+	 * @param {boolean=} invert Specifies if the triangle will be inverted.
+	 */
+	j/*addTriangle*/(x, y, w, h, r, invert) {
+		var points = [
+			x + w, y,
+			x + w, y + h,
+			x, y + h,
+			x, y
+		];
+		points.splice(((r || 0) % 4) * 2, 2);
+		this.g/*addPolygon*/(points, invert);
+	}
+
+	/**
+	 * Adds a rhombus to the underlying renderer.
+	 * @param {number} x The x-coordinate of the upper left corner of the rectangle holding the rhombus.
+	 * @param {number} y The y-coordinate of the upper left corner of the rectangle holding the rhombus.
+	 * @param {number} w The width of the rhombus.
+	 * @param {number} h The height of the rhombus.
+	 * @param {boolean=} invert Specifies if the rhombus will be inverted.
+	 */
+	N/*addRhombus*/(x, y, w, h, invert) {
+		this.g/*addPolygon*/([
+			x + w / 2, y,
+			x + w, y + h / 2,
+			x + w / 2, y + h,
+			x, y + h / 2
+		], invert);
+	}
+}
+
+/**
+ * @param {number} index
+ * @param {Graphics} g
+ * @param {number} cell
+ * @param {number} positionIndex
+ */
+function centerShape(index, g, cell, positionIndex) {
+	index = index % 14;
+
+	var k, m, w, h, inner, outer;
+
+	!index ? (
+		k = cell * 0.42,
+		g.g/*addPolygon*/([
+			0, 0,
+			cell, 0,
+			cell, cell - k * 2,
+			cell - k, cell,
+			0, cell
+		])) :
+
+	index == 1 ? (
+		w = 0 | (cell * 0.5),
+		h = 0 | (cell * 0.8),
+
+		g.j/*addTriangle*/(cell - w, 0, w, h, 2)) :
+
+	index == 2 ? (
+		w = 0 | (cell / 3),
+		g.i/*addRectangle*/(w, w, cell - w, cell - w)) :
+
+	index == 3 ? (
+		inner = cell * 0.1,
+		// Use fixed outer border widths in small icons to ensure the border is drawn
+		outer =
+			cell < 6 ? 1 :
+			cell < 8 ? 2 :
+			(0 | (cell * 0.25)),
+
+		inner =
+			inner > 1 ? (0 | inner) : // large icon => truncate decimals
+			inner > 0.5 ? 1 :         // medium size icon => fixed width
+			inner,                    // small icon => anti-aliased border
+
+		g.i/*addRectangle*/(outer, outer, cell - inner - outer, cell - inner - outer)) :
+
+	index == 4 ? (
+		m = 0 | (cell * 0.15),
+		w = 0 | (cell * 0.5),
+		g.h/*addCircle*/(cell - w - m, cell - w - m, w)) :
+
+	index == 5 ? (
+		inner = cell * 0.1,
+		outer = inner * 4,
+
+		// Align edge to nearest pixel in large icons
+		outer > 3 && (outer = 0 | outer),
+
+		g.i/*addRectangle*/(0, 0, cell, cell),
+		g.g/*addPolygon*/([
+			outer, outer,
+			cell - inner, outer,
+			outer + (cell - outer - inner) / 2, cell - inner
+		], true)) :
+
+	index == 6 ?
+		g.g/*addPolygon*/([
+			0, 0,
+			cell, 0,
+			cell, cell * 0.7,
+			cell * 0.4, cell * 0.4,
+			cell * 0.7, cell,
+			0, cell
+		]) :
+
+	index == 7 ?
+		g.j/*addTriangle*/(cell / 2, cell / 2, cell / 2, cell / 2, 3) :
+
+	index == 8 ? (
+		g.i/*addRectangle*/(0, 0, cell, cell / 2),
+		g.i/*addRectangle*/(0, cell / 2, cell / 2, cell / 2),
+		g.j/*addTriangle*/(cell / 2, cell / 2, cell / 2, cell / 2, 1)) :
+
+	index == 9 ? (
+		inner = cell * 0.14,
+		// Use fixed outer border widths in small icons to ensure the border is drawn
+		outer =
+			cell < 4 ? 1 :
+			cell < 6 ? 2 :
+			(0 | (cell * 0.35)),
+
+		inner =
+			cell < 8 ? inner : // small icon => anti-aliased border
+			(0 | inner),       // large icon => truncate decimals
+
+		g.i/*addRectangle*/(0, 0, cell, cell),
+		g.i/*addRectangle*/(outer, outer, cell - outer - inner, cell - outer - inner, true)) :
+
+	index == 10 ? (
+		inner = cell * 0.12,
+		outer = inner * 3,
+
+		g.i/*addRectangle*/(0, 0, cell, cell),
+		g.h/*addCircle*/(outer, outer, cell - inner - outer, true)) :
+
+	index == 11 ?
+		g.j/*addTriangle*/(cell / 2, cell / 2, cell / 2, cell / 2, 3) :
+
+	index == 12 ? (
+		m = cell * 0.25,
+		g.i/*addRectangle*/(0, 0, cell, cell),
+		g.N/*addRhombus*/(m, m, cell - m, cell - m, true)) :
+
+	// 13
+	(
+		!positionIndex && (
+			m = cell * 0.4, w = cell * 1.2,
+			g.h/*addCircle*/(m, m, w)
+		)
+	);
+}
+
+/**
+ * @param {number} index
+ * @param {Graphics} g
+ * @param {number} cell
+ */
+function outerShape(index, g, cell) {
+	index = index % 4;
+
+	var m;
+
+	!index ?
+		g.j/*addTriangle*/(0, 0, cell, cell, 0) :
+
+	index == 1 ?
+		g.j/*addTriangle*/(0, cell / 2, cell, cell / 2, 0) :
+
+	index == 2 ?
+		g.N/*addRhombus*/(0, 0, cell, cell) :
+
+	// 3
+	(
+		m = cell / 6,
+		g.h/*addCircle*/(m, m, cell - 2 * m)
+	);
+}
+
+/**
+ * Prepares a measure to be used as a measure in an SVG path, by
+ * rounding the measure to a single decimal. This reduces the file
+ * size of the generated SVG with more than 50% in some cases.
+ */
+function svgValue(value) {
+	return ((value * 10 + 0.5) | 0) / 10;
+}
+
+/**
+ * Represents an SVG path element.
+ */
+class SvgPath
+{
+	constructor() {
+		/**
+		 * This property holds the data string (path.d) of the SVG path.
+		 * @type {string}
+		 */
+		this.B/*dataString*/ = "";
+	}
+
+	/**
+	 * Adds a polygon with the current fill color to the SVG path.
+	 * @param points An array of Point objects.
+	 */
+	g/*addPolygon*/(points) {
+		var dataString = "";
+		for (var i = 0; i < points.length; i++) {
+			dataString += (i ? "L" : "M") + svgValue(points[i].x) + " " + svgValue(points[i].y);
+		}
+		this.B/*dataString*/ += dataString + "Z";
+	}
+
+	/**
+	 * Adds a circle with the current fill color to the SVG path.
+	 * @param {Point} point The upper left corner of the circle bounding box.
+	 * @param {number} diameter The diameter of the circle.
+	 * @param {boolean} counterClockwise True if the circle is drawn counter-clockwise (will result in a hole if rendered on a clockwise path).
+	 */
+	h/*addCircle*/(point, diameter, counterClockwise) {
+		var sweepFlag = counterClockwise ? 0 : 1,
+			  svgRadius = svgValue(diameter / 2),
+			  svgDiameter = svgValue(diameter),
+			  svgArc = "a" + svgRadius + "," + svgRadius + " 0 1," + sweepFlag + " ";
+
+		this.B/*dataString*/ +=
+			"M" + svgValue(point.x) + " " + svgValue(point.y + diameter / 2) +
+			svgArc + svgDiameter + ",0" +
+			svgArc + (-svgDiameter) + ",0";
+	}
+}
+
+
+/**
+ * Renderer producing SVG output.
+ * @implements {Renderer}
+ */
+class SvgRenderer
+{
+	constructor(target) {
+		/**
+		 * @type {SvgPath}
+		 * @private
+		 */
+		this.C/*_path*/;
+
+		/**
+		 * @type {Object.<string,SvgPath>}
+		 * @private
+		 */
+		this.D/*_pathsByColor*/ = { };
+
+		/**
+		 * @type {SvgElement|SvgWriter}
+		 * @private
+		 */
+		this.R/*_target*/ = target;
+
+		/**
+		 * @type {number}
+		 */
+		this.k/*iconSize*/ = target.k/*iconSize*/;
+	}
+
+	/**
+	 * Fills the background with the specified color.
+	 * @param {string} fillColor  Fill color on the format #rrggbb[aa].
+	 */
+	m/*setBackground*/(fillColor) {
+		var match = /^(#......)(..)?/.exec(fillColor),
+			  opacity = match[2] ? parseHex(match[2], 0) / 255 : 1;
+		this.R/*_target*/.m/*setBackground*/(match[1], opacity);
+	}
+
+	/**
+	 * Marks the beginning of a new shape of the specified color. Should be ended with a call to endShape.
+	 * @param {string} color Fill color on format #xxxxxx.
+	 */
+	O/*beginShape*/(color) {
+		this.C/*_path*/ = this.D/*_pathsByColor*/[color] || (this.D/*_pathsByColor*/[color] = new SvgPath());
+	}
+
+	/**
+	 * Marks the end of the currently drawn shape.
+	 */
+	P/*endShape*/() { }
+
+	/**
+	 * Adds a polygon with the current fill color to the SVG.
+	 * @param points An array of Point objects.
+	 */
+	g/*addPolygon*/(points) {
+		this.C/*_path*/.g/*addPolygon*/(points);
+	}
+
+	/**
+	 * Adds a circle with the current fill color to the SVG.
+	 * @param {Point} point The upper left corner of the circle bounding box.
+	 * @param {number} diameter The diameter of the circle.
+	 * @param {boolean} counterClockwise True if the circle is drawn counter-clockwise (will result in a hole if rendered on a clockwise path).
+	 */
+	h/*addCircle*/(point, diameter, counterClockwise) {
+		this.C/*_path*/.h/*addCircle*/(point, diameter, counterClockwise);
+	}
+
+	/**
+	 * Called when the icon has been completely drawn.
+	 */
+	finish() {
+		var pathsByColor = this.D/*_pathsByColor*/;
+		for (var color in pathsByColor) {
+			// hasOwnProperty cannot be shadowed in pathsByColor
+			// eslint-disable-next-line no-prototype-builtins
+			if (pathsByColor.hasOwnProperty(color)) {
+				this.R/*_target*/.S/*appendPath*/(color, pathsByColor[color].B/*dataString*/);
+			}
+		}
+	}
+}
+
+/**
+ * Renderer producing SVG output.
+ */
+class SvgWriter
+{
+	constructor(iconSize) {
+		/**
+		 * @type {number}
+		 */
+		this.k/*iconSize*/ = iconSize;
+
+		/**
+		 * @type {string}
+		 * @private
+		 */
+		this.F =
+			'<svg xmlns="http://www.w3.org/2000/svg" width="' +
+			iconSize + '" height="' + iconSize + '" viewBox="0 0 ' +
+			iconSize + ' ' + iconSize + '">';
+	}
+
+	/**
+	 * Fills the background with the specified color.
+	 * @param {string} fillColor  Fill color on the format #rrggbb.
+	 * @param {number} opacity  Opacity in the range [0.0, 1.0].
+	 */
+	m/*setBackground*/(fillColor, opacity) {
+		if (opacity) {
+			this.F += '<rect width="100%" height="100%" fill="' +
+				fillColor + '" opacity="' + opacity.toFixed(2) + '"/>';
+		}
+	}
+
+	/**
+	 * Writes a path to the SVG string.
+	 * @param {string} color Fill color on format #rrggbb.
+	 * @param {string} dataString The SVG path data string.
+	 */
+	S/*appendPath*/(color, dataString) {
+		this.F += '<path fill="' + color + '" d="' + dataString + '"/>';
+	}
+
+	/**
+	 * Gets the rendered image as an SVG string.
+	 */
+	toString() {
+		return this.F + "</svg>";
+	}
+}
+
+/**
+ * Draws an identicon as an SVG string.
+ * @param {*} hashOrValue - A hexadecimal hash string or any value that will be hashed by Jdenticon.
+ * @returns {string} SVG string
+ */
+window.identiconSvg = hash => {
+	const writer = new SvgWriter(50),
+		renderer = new SvgRenderer(writer),
+		config = {
+			p/*colorSaturation*/: 0.5,
+			H/*grayscaleSaturation*/: 0,
+			q/*colorLightness*/: value => between(0, 1, 0.4 + value * (0.8 - 0.4)),
+			I/*grayscaleLightness*/: value => between(0, 1, 0.3 + value * (0.9 - 0.3))
+		};
+
+	var index;
+
+	// Calculate padding and round to nearest integer
+	var size = renderer.k/*iconSize*/;
+	var padding = (0.5 + size * 0.08) | 0;
+	size -= padding * 2;
+
+	const graphics = new Graphics(renderer),
+
+		// Calculate cell size and ensure it is an integer
+		cell = 0 | (size / 4),
+
+		// Since the cell size is integer based, the actual icon will be slightly smaller than specified => center icon
+		s = 0 | (padding + size / 2 - cell * 2),
+
+		// AVAILABLE COLORS
+		hue = parseHex(hash, -7) / 0xfffffff,
+
+		// Available colors for this icon
+		availableColors = [
+			// Dark gray
+			correctedHsl(hue, config.H/*grayscaleSaturation*/, config.I/*grayscaleLightness*/(0)),
+			// Mid color
+			correctedHsl(hue, config.p/*colorSaturation*/, config.q/*colorLightness*/(0.5)),
+			// Light gray
+			correctedHsl(hue, config.H/*grayscaleSaturation*/, config.I/*grayscaleLightness*/(1)),
+			// Light color
+			correctedHsl(hue, config.p/*colorSaturation*/, config.q/*colorLightness*/(1)),
+			// Dark color
+			correctedHsl(hue, config.p/*colorSaturation*/, config.q/*colorLightness*/(0))
+		],
+
+		// The index of the selected colors
+		selectedColorIndexes = [],
+
+		isDuplicate = values => {
+			if (values.indexOf(index) >= 0) {
+				for (var i = 0; i < values.length; i++) {
+					if (selectedColorIndexes.indexOf(values[i]) >= 0) {
+						return true;
+					}
+				}
+			}
+		},
+
+		renderShape = (colorIndex, shapes, index, rotationIndex, positions) => {
+			var shapeIndex = parseHex(hash, index, 1);
+			var r = rotationIndex ? parseHex(hash, rotationIndex, 1) : 0;
+
+			renderer.O/*beginShape*/(availableColors[selectedColorIndexes[colorIndex]]);
+
+			for (var i = 0; i < positions.length; i++) {
+				graphics.A/*currentTransform*/
+					= new Transform(s + positions[i][0] * cell, s + positions[i][1] * cell, cell, r++ % 4);
+				shapes(shapeIndex, graphics, cell, i);
+			}
+
+			renderer.P/*endShape*/();
+		};
+
+	for (var i = 0; i < 3; i++) {
+		index = parseHex(hash, 8 + i, 1) % availableColors.length;
+		if (isDuplicate([0, 4]) || // Disallow dark gray and dark color combo
+			isDuplicate([2, 3])) { // Disallow light gray and light color combo
+			index = 1;
+		}
+		selectedColorIndexes.push(index);
+	}
+
+	// ACTUAL RENDERING
+	// Sides
+	renderShape(0, outerShape, 2, 3, [[1, 0], [2, 0], [2, 3], [1, 3], [0, 1], [3, 1], [3, 2], [0, 2]]);
+	// Corners
+	renderShape(1, outerShape, 4, 5, [[0, 0], [3, 0], [3, 3], [0, 3]]);
+	// Center
+	renderShape(2, centerShape, 1, null, [[1, 1], [2, 1], [2, 2], [1, 2]]);
+
+	renderer.finish();
+
+	return writer;
+};
+
+})();
diff --git a/plugins/avatars/style.css b/plugins/avatars/style.css
new file mode 100644
index 000000000..2cf69ccd0
--- /dev/null
+++ b/plugins/avatars/style.css
@@ -0,0 +1,27 @@
+.messageView .fromPic {
+	float: left;
+	width: 50px;
+	height: 50px;
+	margin: 0 4px 0 0;
+	padding: 1px;
+	border-radius: var(--border-radius, 5px);
+}
+/*
+.checkboxMessage {
+	background: #000 no-repeat center / contain;
+	background: #000 no-repeat right / 32px;
+	width:68px
+}
+*/
+.messageCheckbox .fromPic {
+	margin: 0 -0.5em -0.4em 0.4em;
+	height: 1.5em;
+	width: 1.5em;
+}
+[dir="rtl"] .messageView .fromPic {
+	float: right;
+	margin: 0 0 0 4px;
+}
+[dir="rtl"] .messageCheckbox .fromPic {
+	margin: 0 0.4em -0.4em -0.5em;
+}
diff --git a/plugins/backup/LICENSE b/plugins/backup/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/backup/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/backup/index.php b/plugins/backup/index.php
new file mode 100644
index 000000000..1dc65f475
--- /dev/null
+++ b/plugins/backup/index.php
@@ -0,0 +1,95 @@
+<?php
+
+class BackupPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Backup',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.2',
+		RELEASE  = '2024-03-18',
+		REQUIRED = '2.30.0',
+		CATEGORY = 'General',
+		LICENSE  = 'MIT',
+		DESCRIPTION = '';
+
+	public function Init() : void
+	{
+		// Admin Settings tab
+		$this->addJs('js/BackupAdminSettings.js', true); // add js file
+		$this->addJsonHook('JsonAdminBackupData');
+		$this->addJsonHook('JsonAdminRestoreData');
+		$this->addTemplate('templates/BackupAdminSettingsTab.html', true);
+	}
+
+	public function JsonAdminBackupData()
+	{
+		if (!($this->Manager()->Actions() instanceof \RainLoop\ActionsAdmin)
+		 || !$this->Manager()->Actions()->IsAdminLoggined()
+		) {
+			return $this->jsonResponse(__FUNCTION__, false);
+		}
+
+		\file_put_contents(APP_PRIVATE_DATA.'cache/CACHEDIR.TAG', 'Signature: 8a477f597d28d172789f06886806bc55');
+
+		$sFileName = APP_PRIVATE_DATA . \MailSo\Base\Utils::Sha1Rand();
+
+		if (true) {
+			$sType = 'application/zip';
+			$sFileName .= '.zip';
+			if (\class_exists('ZipArchive')) {
+//				$oArchive = new \ZipArchive();
+//				$oArchive->open($sFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
+//				$oArchive->setArchiveComment('SnappyMail/'.APP_VERSION);
+			}
+			$oArchive = new \SnappyMail\Stream\ZIP($sFileName);
+		} else {
+			$sType = 'application/x-gzip';
+			$sFileName .= '.tgz';
+			$oArchive = new \SnappyMail\Stream\TAR($sFileName);
+		}
+
+//		$oArchive->addRecursive(APP_PRIVATE_DATA, '#/(cache.*)#');
+		$oArchive->addRecursive(APP_PRIVATE_DATA.'configs', 'configs');
+		$oArchive->addRecursive(APP_PRIVATE_DATA.'domains', 'domains');
+		$oArchive->addRecursive(APP_PRIVATE_DATA.'plugins', 'plugins');
+		$oArchive->addRecursive(APP_PRIVATE_DATA.'storage', 'storage');
+		if (\is_readable(APP_PRIVATE_DATA.'AddressBook.sqlite')) {
+			$oArchive->addFile(APP_PRIVATE_DATA.'AddressBook.sqlite');
+		}
+//		$oArchive->addFile(APP_DATA_FOLDER_PATH.'SALT.php');
+		$oArchive->close();
+
+		$data = \base64_encode(\file_get_contents($sFileName));
+		\unlink($sFileName);
+
+		return $this->jsonResponse(__FUNCTION__, array(
+			'name' => \basename($sFileName),
+			'data' => "data:{$sType};base64,{$data}"
+		));
+	}
+
+	public function JsonAdminRestoreData()
+	{
+		if (!($this->Manager()->Actions() instanceof \RainLoop\ActionsAdmin)
+		 || empty($_FILES['backup'])
+		 || 'application/zip' !== $_FILES['backup']['type']
+		 || !\is_uploaded_file($_FILES['backup']['tmp_name'])
+		) {
+			return $this->jsonResponse(__FUNCTION__, false);
+		}
+
+		$result = false;
+		if (\class_exists('ZipArchive')) {
+			$oArchive = new \ZipArchive();
+			$oArchive->open($_FILES['backup']['tmp_name'], \ZIPARCHIVE::CREATE);
+			$result = $oArchive->extractTo(APP_PRIVATE_DATA);
+		} else if (\class_exists('PharData')) {
+			$oArchive = new \PharData($sTmp, 0, null, \Phar::GZ);
+			$result = $oArchive->extractTo(APP_PRIVATE_DATA);
+		}
+
+		return $this->jsonResponse(__FUNCTION__, $result);
+	}
+
+}
diff --git a/plugins/backup/js/BackupAdminSettings.js b/plugins/backup/js/BackupAdminSettings.js
new file mode 100644
index 000000000..221b5d1f0
--- /dev/null
+++ b/plugins/backup/js/BackupAdminSettings.js
@@ -0,0 +1,47 @@
+
+(rl => { if (rl) {
+
+	class BackupAdminSettings
+	{
+		constructor()
+		{
+			this.loading = ko.observable(false);
+		}
+
+		backup()
+		{
+			this.loading(true);
+			rl.pluginRemoteRequest((iError, oData) => {
+
+				this.loading(false);
+
+				if (iError) {
+					console.error({
+						iError: iError,
+						oData: oData
+					});
+				} else {
+					var link = document.createElement("a");
+					link.download = oData.Result.name;
+					link.href = oData.Result.data;
+					link.textContent = oData.Result.name;
+					this.viewModelDom.append(link);
+					link.click();
+					link.remove();
+				}
+
+			}, 'JsonAdminBackupData');
+		}
+
+		submitForm(form) {
+			form.reportValidity()
+			&& rl.pluginRemoteRequest((iError, oData) => {
+				console.dir(oData);
+			}, 'JsonAdminRestoreData', new FormData(form));
+		}
+	}
+
+	rl.addSettingsViewModelForAdmin(BackupAdminSettings, 'BackupAdminSettingsTab',
+		'Backup and Restore', 'Backup');
+
+}})(window.rl);
diff --git a/plugins/black-list/index.php b/plugins/black-list/index.php
index 7f692f0e4..dea7e90ed 100644
--- a/plugins/black-list/index.php
+++ b/plugins/black-list/index.php
@@ -4,35 +4,31 @@ class BlackListPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Blacklist',
-		VERSION = '2.1',
-		RELEASE = '2021-04-21',
+		VERSION = '2.2',
+		RELEASE = '2024-03-04',
 		REQUIRED = '2.5.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Simple blacklist extension (with wildcard and exceptions functionality).';
 
 	public function Init() : void
 	{
-		$this->addHook('login.credentials', 'FilterLoginCredentials');
+		$this->addHook('login.credentials.step-1', 'FilterLoginCredentials');
 	}
 
 	/**
-	 * @param string $sEmail
-	 * @param string $sLogin
-	 * @param string $sPassword
-	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	public function FilterLoginCredentials(string &$sEmail)
 	{
 		$sBlackList = \trim($this->Config()->Get('plugin', 'black_list', ''));
-		if (0 < \strlen($sBlackList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sBlackList))
-		{
+		if (\strlen($sBlackList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sBlackList)) {
 			$sExceptions = \trim($this->Config()->Get('plugin', 'exceptions', ''));
-			if (0 === \strlen($sExceptions) || !\RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sExceptions))
-			{
+			if (!\strlen($sExceptions) || !\RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sExceptions)) {
 				throw new \RainLoop\Exceptions\ClientException(
-					$this->Config()->Get('plugin', 'auth_error', true) ?
-						\RainLoop\Notifications::AuthError : \RainLoop\Notifications::AccountNotAllowed);
+					$this->Config()->Get('plugin', 'auth_error', false)
+					? \RainLoop\Notifications::AuthError
+					: \RainLoop\Notifications::AccountNotAllowed
+				);
 			}
 		}
 	}
@@ -46,7 +42,7 @@ class BlackListPlugin extends \RainLoop\Plugins\AbstractPlugin
 			\RainLoop\Plugins\Property::NewInstance('auth_error')->SetLabel('Auth Error')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDescription('Throw an authentication error instead of an access error.')
-				->SetDefaultValue(true),
+				->SetDefaultValue(false),
 			\RainLoop\Plugins\Property::NewInstance('black_list')->SetLabel('Black List')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
 				->SetDescription('Emails black list, space as delimiter, wildcard supported.')
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/APCU.php b/plugins/cache-apcu/APCU.php
similarity index 61%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/APCU.php
rename to plugins/cache-apcu/APCU.php
index 8f1730edb..8ca581ca0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/APCU.php
+++ b/plugins/cache-apcu/APCU.php
@@ -18,19 +18,14 @@ namespace MailSo\Cache\Drivers;
  */
 class APCU implements \MailSo\Cache\DriverInterface
 {
-	/**
-	 * @var string
-	 */
-	private $sKeyPrefix;
+	private string $sKeyPrefix;
 
-	function __construct(string $sKeyPrefix = '')
+	public function setPrefix(string $sKeyPrefix) : void
 	{
-		$this->sKeyPrefix = $sKeyPrefix;
-		if (!empty($this->sKeyPrefix))
-		{
-			$this->sKeyPrefix =
-				\preg_replace('/[^a-zA-Z0-9_]/', '_', rtrim(trim($this->sKeyPrefix), '\\/')).'/';
-		}
+		$sKeyPrefix = \rtrim(\trim($sKeyPrefix), '\\/');
+		$this->sKeyPrefix = empty($sKeyPrefix)
+			? $sKeyPrefix
+			: \preg_replace('/[^a-zA-Z0-9_]/', '_', $sKeyPrefix).'/';
 	}
 
 	public function Set(string $sKey, string $sValue) : bool
@@ -38,10 +33,15 @@ class APCU implements \MailSo\Cache\DriverInterface
 		return \apcu_store($this->generateCachedKey($sKey), (string) $sValue);
 	}
 
-	public function Get(string $sKey) : string
+	public function Exists(string $sKey) : bool
+	{
+		return \apcu_exists($this->generateCachedKey($sKey));
+	}
+
+	public function Get(string $sKey) : ?string
 	{
 		$sValue = \apcu_fetch($this->generateCachedKey($sKey));
-		return \is_string($sValue) ? $sValue : '';
+		return \is_string($sValue) ? $sValue : null;
 	}
 
 	public function Delete(string $sKey) : void
@@ -51,12 +51,7 @@ class APCU implements \MailSo\Cache\DriverInterface
 
 	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
-		if (0 === $iTimeToClearInHours)
-		{
-			return \apcu_clear_cache('user');
-		}
-
-		return false;
+		return (0 === $iTimeToClearInHours) ? \apcu_clear_cache('user') : false;
 	}
 
 	private function generateCachedKey(string $sKey) : string
diff --git a/plugins/cache-apcu/index.php b/plugins/cache-apcu/index.php
new file mode 100644
index 000000000..2e17413a4
--- /dev/null
+++ b/plugins/cache-apcu/index.php
@@ -0,0 +1,34 @@
+<?php
+
+class CacheAPCuPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Cache APCu',
+		VERSION = '2.36',
+		RELEASE = '2024-03-22',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Cache',
+		DESCRIPTION = 'Cache handler using PHP APCu';
+
+	public function Init() : void
+	{
+		if (\MailSo\Base\Utils::FunctionsCallable(array('apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache'))) {
+			$this->addHook('main.fabrica', 'MainFabrica');
+		}
+	}
+
+	public function Supported() : string
+	{
+		return \MailSo\Base\Utils::FunctionsCallable(array('apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache'))
+			? ''
+			: 'PHP APCu not installed';
+	}
+
+	public function MainFabrica($sName, &$mResult)
+	{
+		if ('cache' == $sName) {
+			require_once __DIR__ . '/APCU.php';
+			$mResult = new \MailSo\Cache\Drivers\APCU;
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Memcache.php b/plugins/cache-memcache/Memcache.php
similarity index 56%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Memcache.php
rename to plugins/cache-memcache/Memcache.php
index 746789c83..30a2812c2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Memcache.php
+++ b/plugins/cache-memcache/Memcache.php
@@ -18,65 +18,62 @@ namespace MailSo\Cache\Drivers;
  */
 class Memcache implements \MailSo\Cache\DriverInterface
 {
-	/**
-	 * @var int
-	 */
-	private $iExpire;
+	private int $iExpire;
 
 	/**
-	 * @var \Memcache|null
+	 * @var \Memcache|\Memcached|null
 	 */
 	private $oMem;
 
-	/**
-	 * @var string
-	 */
-	private $sKeyPrefix;
+	private string $sKeyPrefix;
 
-	function __construct(string $sHost = '127.0.0.1', int $iPort = 11211, int $iExpire = 43200, string $sKeyPrefix = '')
+	function __construct(string $sHost = '127.0.0.1', int $iPort = 11211, int $iExpire = 43200)
 	{
 		$this->iExpire = 0 < $iExpire ? $iExpire : 43200;
 
 		$this->oMem = \class_exists('Memcache',false) ? new \Memcache : new \Memcached;
-		if (!$this->oMem->addServer($sHost, \strpos($sHost, ':/') ? 0 : $this->iPort))
-		{
+		if (!$this->oMem->addServer($sHost, \strpos($sHost, ':/') ? 0 : $iPort)) {
 			$this->oMem = null;
 		}
+	}
 
-		$this->sKeyPrefix = $sKeyPrefix;
-		if (!empty($this->sKeyPrefix))
-		{
-			$this->sKeyPrefix =
-				\preg_replace('/[^a-zA-Z0-9_]/', '_', rtrim(trim($this->sKeyPrefix), '\\/')).'/';
-		}
+	public function setPrefix(string $sKeyPrefix) : void
+	{
+		$sKeyPrefix = \rtrim(\trim($sKeyPrefix), '\\/');
+		$this->sKeyPrefix = empty($sKeyPrefix)
+			? $sKeyPrefix
+			: \preg_replace('/[^a-zA-Z0-9_]/', '_', $sKeyPrefix).'/';
 	}
 
 	public function Set(string $sKey, string $sValue) : bool
 	{
-		return $this->oMem ? $this->oMem->set($this->generateCachedKey($sKey), $sValue, 0, $this->iExpire) : false;
+		if ($this->oMem instanceof \Memcache) {
+			return $this->oMem->set($this->generateCachedKey($sKey), $sValue, 0, $this->iExpire);
+		}
+		return $this->oMem ? $this->oMem->set($this->generateCachedKey($sKey), $sValue, $this->iExpire) : false;
 	}
 
-	public function Get(string $sKey) : string
+	public function Exists(string $sKey) : bool
 	{
-		$sValue = $this->oMem ? $this->oMem->get($this->generateCachedKey($sKey)) : '';
-		return \is_string($sValue) ? $sValue : '';
+		return $this->oMem && false !== $this->oMem->get($this->generateCachedKey($sKey));
+	}
+
+	public function Get(string $sKey) : ?string
+	{
+		$sValue = $this->oMem ? $this->oMem->get($this->generateCachedKey($sKey)) : null;
+		return \is_string($sValue) ? $sValue : null;
 	}
 
 	public function Delete(string $sKey) : void
 	{
-		if ($this->oMem)
-		{
-			$this->oMem->delete($this->generateCachedKey($sKey));
-		}
+		$this->oMem && $this->oMem->delete($this->generateCachedKey($sKey));
 	}
 
 	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
-		if (0 === $iTimeToClearInHours && $this->oMem)
-		{
+		if (0 === $iTimeToClearInHours && $this->oMem) {
 			return $this->oMem->flush();
 		}
-
 		return false;
 	}
 
diff --git a/plugins/cache-memcache/index.php b/plugins/cache-memcache/index.php
new file mode 100644
index 000000000..7760ab398
--- /dev/null
+++ b/plugins/cache-memcache/index.php
@@ -0,0 +1,54 @@
+<?php
+
+class CacheMemcachePlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Cache Memcache',
+		VERSION = '2.37',
+		RELEASE = '2024-09-15',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Cache',
+		DESCRIPTION = 'Cache handler using PHP Memcache or PHP Memcached';
+
+	public function Init() : void
+	{
+		if (\class_exists('Memcache',false) || \class_exists('Memcached',false)) {
+			$this->addHook('main.fabrica', 'MainFabrica');
+		}
+	}
+
+	public function Supported() : string
+	{
+		return (\class_exists('Memcache',false) || \class_exists('Memcached',false))
+			? ''
+			: 'PHP Memcache/Memcached not installed';
+	}
+
+	public function MainFabrica($sName, &$mResult)
+	{
+		if ('cache' == $sName) {
+			require_once __DIR__ . '/Memcache.php';
+			$mResult = new \MailSo\Cache\Drivers\Memcache(
+				$this->Config()->Get('plugin', 'host', '127.0.0.1'),
+				(int) $this->Config()->Get('plugin', 'port', 11211)
+			);
+		}
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('host')->SetLabel('Host')
+				->SetDescription('Hostname of the memcache server')
+				->SetDefaultValue('127.0.0.1'),
+			\RainLoop\Plugins\Property::NewInstance('port')->SetLabel('Port')
+				->SetDescription('Port of the memcache server')
+				->SetDefaultValue(11211)
+/*
+			,\RainLoop\Plugins\Property::NewInstance('password')->SetLabel('Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
+				->SetDefaultValue('')
+*/
+		);
+	}
+}
diff --git a/plugins/cache-redis/LICENSE b/plugins/cache-redis/LICENSE
new file mode 100644
index 000000000..9a8cd865b
--- /dev/null
+++ b/plugins/cache-redis/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2009-2020 Daniele Alessandri (original work)
+Copyright (c) 2021-2023 Till Krüss (modified work)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/plugins/cache-redis/Predis/Autoloader.php b/plugins/cache-redis/Predis/Autoloader.php
new file mode 100644
index 000000000..054f7bbb2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Autoloader.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis;
+
+/**
+ * Implements a lightweight PSR-0 compliant autoloader for Predis.
+ *
+ * @author Eric Naeseth <eric@thumbtack.com>
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @codeCoverageIgnore
+ */
+class Autoloader
+{
+    private $directory;
+    private $prefix;
+    private $prefixLength;
+
+    /**
+     * @param string $baseDirectory Base directory where the source files are located.
+     */
+    public function __construct($baseDirectory = __DIR__)
+    {
+        $this->directory = $baseDirectory;
+        $this->prefix = __NAMESPACE__ . '\\';
+        $this->prefixLength = strlen($this->prefix);
+    }
+
+    /**
+     * Registers the autoloader class with the PHP SPL autoloader.
+     *
+     * @param bool $prepend Prepend the autoloader on the stack instead of appending it.
+     */
+    public static function register($prepend = false)
+    {
+        spl_autoload_register([new self(), 'autoload'], true, $prepend);
+    }
+
+    /**
+     * Loads a class from a file using its fully qualified name.
+     *
+     * @param string $className Fully qualified name of a class.
+     */
+    public function autoload($className)
+    {
+        if (0 === strpos($className, $this->prefix)) {
+            $parts = explode('\\', substr($className, $this->prefixLength));
+            $filepath = $this->directory . DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $parts) . '.php';
+
+            if (is_file($filepath)) {
+                require $filepath;
+            }
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Client.php b/plugins/cache-redis/Predis/Client.php
similarity index 50%
rename from snappymail/v/0.0.0/app/libraries/Predis/Client.php
rename to plugins/cache-redis/Predis/Client.php
index 87596ec92..4257667bd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Client.php
+++ b/plugins/cache-redis/Predis/Client.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,21 +12,35 @@
 
 namespace Predis;
 
+use ArrayIterator;
+use InvalidArgumentException;
+use IteratorAggregate;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
+use Predis\Command\Redis\Container\ContainerFactory;
+use Predis\Command\Redis\Container\ContainerInterface;
 use Predis\Command\ScriptCommand;
 use Predis\Configuration\Options;
 use Predis\Configuration\OptionsInterface;
-use Predis\Connection\AggregateConnectionInterface;
 use Predis\Connection\ConnectionInterface;
+use Predis\Connection\Parameters;
 use Predis\Connection\ParametersInterface;
+use Predis\Connection\RelayConnection;
 use Predis\Monitor\Consumer as MonitorConsumer;
+use Predis\Pipeline\Atomic;
+use Predis\Pipeline\FireAndForget;
 use Predis\Pipeline\Pipeline;
+use Predis\Pipeline\RelayAtomic;
+use Predis\Pipeline\RelayPipeline;
 use Predis\PubSub\Consumer as PubSubConsumer;
+use Predis\PubSub\RelayConsumer as RelayPubSubConsumer;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
 use Predis\Transaction\MultiExec as MultiExecTransaction;
+use ReturnTypeWillChange;
+use RuntimeException;
+use Traversable;
 
 /**
  * Client class used for connecting and executing commands on Redis.
@@ -34,17 +49,20 @@ use Predis\Transaction\MultiExec as MultiExecTransaction;
  * abstractions are built. Internally it aggregates various other classes each
  * one with its own responsibility and scope.
  *
- * {@inheritdoc}
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @template-implements \IteratorAggregate<string, static>
  */
-class Client implements ClientInterface
+class Client implements ClientInterface, IteratorAggregate
 {
-    const VERSION = '1.0.3';
+    public const VERSION = '2.2.2';
 
-    protected $connection;
-    protected $options;
-    private $profile;
+    /** @var OptionsInterface */
+    private $options;
+
+    /** @var ConnectionInterface */
+    private $connection;
+
+    /** @var Command\FactoryInterface */
+    private $commands;
 
     /**
      * @param mixed $parameters Connection parameters for one or more servers.
@@ -52,126 +70,99 @@ class Client implements ClientInterface
      */
     public function __construct($parameters = null, $options = null)
     {
-        $this->options = $this->createOptions($options ?: array());
-        $this->connection = $this->createConnection($parameters ?: array());
-        $this->profile = $this->options->profile;
+        $this->options = static::createOptions($options ?? new Options());
+        $this->connection = static::createConnection($this->options, $parameters ?? new Parameters());
+        $this->commands = $this->options->commands;
     }
 
     /**
-     * Creates a new instance of Predis\Configuration\Options from different
-     * types of arguments or simply returns the passed argument if it is an
-     * instance of Predis\Configuration\OptionsInterface.
+     * Creates a new set of client options for the client.
      *
-     * @param mixed $options Client options.
-     *
-     * @throws \InvalidArgumentException
+     * @param array|OptionsInterface $options Set of client options
      *
      * @return OptionsInterface
+     * @throws InvalidArgumentException
      */
-    protected function createOptions($options)
+    protected static function createOptions($options)
     {
         if (is_array($options)) {
             return new Options($options);
-        }
-
-        if ($options instanceof OptionsInterface) {
+        } elseif ($options instanceof OptionsInterface) {
             return $options;
+        } else {
+            throw new InvalidArgumentException('Invalid type for client options');
         }
-
-        throw new \InvalidArgumentException('Invalid type for client options.');
     }
 
     /**
-     * Creates single or aggregate connections from different types of arguments
-     * (string, array) or returns the passed argument if it is an instance of a
-     * class implementing Predis\Connection\ConnectionInterface.
+     * Creates single or aggregate connections from supplied arguments.
      *
-     * Accepted types for connection parameters are:
+     * This method accepts the following types to create a connection instance:
      *
-     *  - Instance of Predis\Connection\ConnectionInterface.
-     *  - Instance of Predis\Connection\ParametersInterface.
-     *  - Array
-     *  - String
-     *  - Callable
+     *  - Array (dictionary: single connection, indexed: aggregate connections)
+     *  - String (URI for a single connection)
+     *  - Callable (connection initializer callback)
+     *  - Instance of Predis\Connection\ParametersInterface (used as-is)
+     *  - Instance of Predis\Connection\ConnectionInterface (returned as-is)
      *
-     * @param mixed $parameters Connection parameters or connection instance.
+     * When a callable is passed, it receives the original set of client options
+     * and must return an instance of Predis\Connection\ConnectionInterface.
      *
-     * @throws \InvalidArgumentException
+     * Connections are created using the connection factory (in case of single
+     * connections) or a specialized aggregate connection initializer (in case
+     * of cluster and replication) retrieved from the supplied client options.
+     *
+     * @param OptionsInterface $options    Client options container
+     * @param mixed            $parameters Connection parameters
      *
      * @return ConnectionInterface
+     * @throws InvalidArgumentException
      */
-    protected function createConnection($parameters)
+    protected static function createConnection(OptionsInterface $options, $parameters)
     {
         if ($parameters instanceof ConnectionInterface) {
             return $parameters;
         }
 
         if ($parameters instanceof ParametersInterface || is_string($parameters)) {
-            return $this->options->connections->create($parameters);
+            return $options->connections->create($parameters);
         }
 
         if (is_array($parameters)) {
             if (!isset($parameters[0])) {
-                return $this->options->connections->create($parameters);
-            }
-
-            $options = $this->options;
-
-            if ($options->defined('aggregate')) {
-                $initializer = $this->getConnectionInitializerWrapper($options->aggregate);
-                $connection = $initializer($parameters, $options);
+                return $options->connections->create($parameters);
+            } elseif ($options->defined('cluster') && $initializer = $options->cluster) {
+                return $initializer($parameters, true);
+            } elseif ($options->defined('replication') && $initializer = $options->replication) {
+                return $initializer($parameters, true);
+            } elseif ($options->defined('aggregate') && $initializer = $options->aggregate) {
+                return $initializer($parameters, false);
             } else {
-                if ($options->defined('replication') && $replication = $options->replication) {
-                    $connection = $replication;
-                } else {
-                    $connection = $options->cluster;
-                }
-
-                $options->connections->aggregate($connection, $parameters);
+                throw new InvalidArgumentException(
+                    'Array of connection parameters requires `cluster`, `replication` or `aggregate` client option'
+                );
             }
-
-            return $connection;
         }
 
         if (is_callable($parameters)) {
-            $initializer = $this->getConnectionInitializerWrapper($parameters);
-            $connection = $initializer($this->options);
+            $connection = call_user_func($parameters, $options);
+
+            if (!$connection instanceof ConnectionInterface) {
+                throw new InvalidArgumentException('Callable parameters must return a valid connection');
+            }
 
             return $connection;
         }
 
-        throw new \InvalidArgumentException('Invalid type for connection parameters.');
-    }
-
-    /**
-     * Wraps a callable to make sure that its returned value represents a valid
-     * connection type.
-     *
-     * @param mixed $callable
-     *
-     * @return \Closure
-     */
-    protected function getConnectionInitializerWrapper($callable)
-    {
-        return function () use ($callable) {
-            $connection = call_user_func_array($callable, func_get_args());
-
-            if (!$connection instanceof ConnectionInterface) {
-                throw new \UnexpectedValueException(
-                    'The callable connection initializer returned an invalid type.'
-                );
-            }
-
-            return $connection;
-        };
+        throw new InvalidArgumentException('Invalid type for connection parameters');
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getProfile()
+    public function getCommandFactory()
     {
-        return $this->profile;
+        return $this->commands;
     }
 
     /**
@@ -183,23 +174,53 @@ class Client implements ClientInterface
     }
 
     /**
-     * Creates a new client instance for the specified connection ID or alias,
-     * only when working with an aggregate connection (cluster, replication).
-     * The new client instances uses the same options of the original one.
+     * Creates a new client using a specific underlying connection.
      *
-     * @param string $connectionID Identifier of a connection.
+     * This method allows to create a new client instance by picking a specific
+     * connection out of an aggregate one, with the same options of the original
+     * client instance.
      *
-     * @throws \InvalidArgumentException
+     * The specified selector defines which logic to use to look for a suitable
+     * connection by the specified value. Supported selectors are:
      *
-     * @return Client
+     *   - `id`
+     *   - `key`
+     *   - `slot`
+     *   - `command`
+     *   - `alias`
+     *   - `role`
+     *
+     * Internally the client relies on duck-typing and follows this convention:
+     *
+     *   $selector string => getConnectionBy$selector($value) method
+     *
+     * This means that support for specific selectors may vary depending on the
+     * actual logic implemented by connection classes and there is no interface
+     * binding a connection class to implement any of these.
+     *
+     * @param string $selector Type of selector.
+     * @param mixed  $value    Value to be used by the selector.
+     *
+     * @return ClientInterface
      */
-    public function getClientFor($connectionID)
+    public function getClientBy($selector, $value)
     {
-        if (!$connection = $this->getConnectionById($connectionID)) {
-            throw new \InvalidArgumentException("Invalid connection ID: $connectionID.");
+        $selector = strtolower($selector);
+
+        if (!in_array($selector, ['id', 'key', 'slot', 'role', 'alias', 'command'])) {
+            throw new InvalidArgumentException("Invalid selector type: `$selector`");
         }
 
-        return new static($connection, $this->options);
+        if (!method_exists($this->connection, $method = "getConnectionBy$selector")) {
+            $class = get_class($this->connection);
+            throw new InvalidArgumentException("Selecting connection by $selector is not supported by $class");
+        }
+
+        if (!$connection = $this->connection->$method($value)) {
+            throw new InvalidArgumentException("Cannot find a connection by $selector matching `$value`");
+        }
+
+        return new static($connection, $this->getOptions());
     }
 
     /**
@@ -248,24 +269,29 @@ class Client implements ClientInterface
     }
 
     /**
-     * Retrieves the specified connection from the aggregate connection when the
-     * client is in cluster or replication mode.
+     * Applies the configured serializer and compression to given value.
      *
-     * @param string $connectionID Index or alias of the single connection.
-     *
-     * @throws NotSupportedException
-     *
-     * @return Connection\NodeConnectionInterface
+     * @param  mixed  $value
+     * @return string
      */
-    public function getConnectionById($connectionID)
+    public function pack($value)
     {
-        if (!$this->connection instanceof AggregateConnectionInterface) {
-            throw new NotSupportedException(
-                'Retrieving connections by ID is supported only by aggregate connections.'
-            );
-        }
+        return $this->connection instanceof RelayConnection
+            ? $this->connection->pack($value)
+            : $value;
+    }
 
-        return $this->connection->getConnectionById($connectionID);
+    /**
+     * Deserializes and decompresses to given value.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    public function unpack($value)
+    {
+        return $this->connection instanceof RelayConnection
+            ? $this->connection->unpack($value)
+            : $value;
     }
 
     /**
@@ -273,7 +299,7 @@ class Client implements ClientInterface
      * applying any prefix to keys or throwing exceptions on Redis errors even
      * regardless of client options.
      *
-     * It is possibile to indentify Redis error responses from normal responses
+     * It is possible to identify Redis error responses from normal responses
      * using the second optional argument which is populated by reference.
      *
      * @param array $arguments Command arguments as defined by the command signature.
@@ -284,9 +310,10 @@ class Client implements ClientInterface
     public function executeRaw(array $arguments, &$error = null)
     {
         $error = false;
+        $commandID = array_shift($arguments);
 
         $response = $this->connection->executeCommand(
-            new RawCommand($arguments)
+            new RawCommand($commandID, $arguments)
         );
 
         if ($response instanceof ResponseInterface) {
@@ -313,9 +340,37 @@ class Client implements ClientInterface
     /**
      * {@inheritdoc}
      */
-    public function createCommand($commandID, $arguments = array())
+    public function createCommand($commandID, $arguments = [])
     {
-        return $this->profile->createCommand($commandID, $arguments);
+        return $this->commands->create($commandID, $arguments);
+    }
+
+    /**
+     * @param  string             $name
+     * @return ContainerInterface
+     */
+    public function __get(string $name)
+    {
+        return ContainerFactory::create($this, $name);
+    }
+
+    /**
+     * @param  string $name
+     * @param  mixed  $value
+     * @return mixed
+     */
+    public function __set(string $name, $value)
+    {
+        throw new RuntimeException('Not allowed');
+    }
+
+    /**
+     * @param  string $name
+     * @return mixed
+     */
+    public function __isset(string $name)
+    {
+        throw new RuntimeException('Not allowed');
     }
 
     /**
@@ -342,17 +397,13 @@ class Client implements ClientInterface
      * @param CommandInterface       $command  Redis command that generated the error.
      * @param ErrorResponseInterface $response Instance of the error response.
      *
-     * @throws ServerException
-     *
      * @return mixed
+     * @throws ServerException
      */
     protected function onErrorResponse(CommandInterface $command, ErrorResponseInterface $response)
     {
         if ($command instanceof ScriptCommand && $response->getErrorType() === 'NOSCRIPT') {
-            $eval = $this->createCommand('EVAL');
-            $eval->setRawArguments($command->getEvalArguments());
-
-            $response = $this->executeCommand($eval);
+            $response = $this->executeCommand($command->getEvalCommand());
 
             if (!$response instanceof ResponseInterface) {
                 $response = $command->parseResponse($response);
@@ -370,7 +421,7 @@ class Client implements ClientInterface
 
     /**
      * Executes the specified initializer method on `$this` by adjusting the
-     * actual invokation depending on the arity (0, 1 or 2 arguments). This is
+     * actual invocation depending on the arity (0, 1 or 2 arguments). This is
      * simply an utility method to create Redis contexts instances since they
      * follow a common initialization path.
      *
@@ -391,7 +442,7 @@ class Client implements ClientInterface
                     : $this->$initializer(null, $argv[0]);
 
             case 2:
-                list($arg0, $arg1) = $argv;
+                [$arg0, $arg1] = $argv;
 
                 return $this->$initializer($arg0, $arg1);
 
@@ -404,11 +455,11 @@ class Client implements ClientInterface
      * Creates a new pipeline context and returns it, or returns the results of
      * a pipeline executed inside the optionally provided callable object.
      *
-     * @param mixed ... Array of options, a callable for execution, or both.
+     * @param mixed ...$arguments Array of options, a callable for execution, or both.
      *
      * @return Pipeline|array
      */
-    public function pipeline(/* arguments */)
+    public function pipeline(...$arguments)
     {
         return $this->sharedContextFactory('createPipeline', func_get_args());
     }
@@ -416,19 +467,29 @@ class Client implements ClientInterface
     /**
      * Actual pipeline context initializer method.
      *
-     * @param array $options  Options for the context.
-     * @param mixed $callable Optional callable used to execute the context.
+     * @param array|null $options  Options for the context.
+     * @param mixed      $callable Optional callable used to execute the context.
      *
      * @return Pipeline|array
      */
-    protected function createPipeline(array $options = null, $callable = null)
+    protected function createPipeline(?array $options = null, $callable = null)
     {
         if (isset($options['atomic']) && $options['atomic']) {
-            $class = 'Predis\Pipeline\Atomic';
+            $class = Atomic::class;
         } elseif (isset($options['fire-and-forget']) && $options['fire-and-forget']) {
-            $class = 'Predis\Pipeline\FireAndForget';
+            $class = FireAndForget::class;
         } else {
-            $class = 'Predis\Pipeline\Pipeline';
+            $class = Pipeline::class;
+        }
+
+        if ($this->connection instanceof RelayConnection) {
+            if (isset($options['atomic']) && $options['atomic']) {
+                $class = RelayAtomic::class;
+            } elseif (isset($options['fire-and-forget']) && $options['fire-and-forget']) {
+                throw new NotSupportedException('The "relay" extension does not support fire-and-forget pipelines.');
+            } else {
+                $class = RelayPipeline::class;
+            }
         }
 
         /*
@@ -447,11 +508,11 @@ class Client implements ClientInterface
      * Creates a new transaction context and returns it, or returns the results
      * of a transaction executed inside the optionally provided callable object.
      *
-     * @param mixed ... Array of options, a callable for execution, or both.
+     * @param mixed ...$arguments Array of options, a callable for execution, or both.
      *
      * @return MultiExecTransaction|array
      */
-    public function transaction(/* arguments */)
+    public function transaction(...$arguments)
     {
         return $this->sharedContextFactory('createTransaction', func_get_args());
     }
@@ -464,7 +525,7 @@ class Client implements ClientInterface
      *
      * @return MultiExecTransaction|array
      */
-    protected function createTransaction(array $options = null, $callable = null)
+    protected function createTransaction(?array $options = null, $callable = null)
     {
         $transaction = new MultiExecTransaction($this, $options);
 
@@ -476,14 +537,14 @@ class Client implements ClientInterface
     }
 
     /**
-     * Creates a new publis/subscribe context and returns it, or starts its loop
+     * Creates a new publish/subscribe context and returns it, or starts its loop
      * inside the optionally provided callable object.
      *
-     * @param mixed ... Array of options, a callable for execution, or both.
+     * @param mixed ...$arguments Array of options, a callable for execution, or both.
      *
      * @return PubSubConsumer|null
      */
-    public function pubSubLoop(/* arguments */)
+    public function pubSubLoop(...$arguments)
     {
         return $this->sharedContextFactory('createPubSub', func_get_args());
     }
@@ -496,9 +557,13 @@ class Client implements ClientInterface
      *
      * @return PubSubConsumer|null
      */
-    protected function createPubSub(array $options = null, $callable = null)
+    protected function createPubSub(?array $options = null, $callable = null)
     {
-        $pubsub = new PubSubConsumer($this, $options);
+        if ($this->connection instanceof RelayConnection) {
+            $pubsub = new RelayPubSubConsumer($this, $options);
+        } else {
+            $pubsub = new PubSubConsumer($this, $options);
+        }
 
         if (!isset($callable)) {
             return $pubsub;
@@ -509,6 +574,8 @@ class Client implements ClientInterface
                 $pubsub->stop();
             }
         }
+
+        return null;
     }
 
     /**
@@ -520,4 +587,26 @@ class Client implements ClientInterface
     {
         return new MonitorConsumer($this);
     }
+
+    /**
+     * @return Traversable<string, static>
+     */
+    #[ReturnTypeWillChange]
+    public function getIterator()
+    {
+        $clients = [];
+        $connection = $this->getConnection();
+
+        if (!$connection instanceof Traversable) {
+            return new ArrayIterator([
+                (string) $connection => new static($connection, $this->getOptions()),
+            ]);
+        }
+
+        foreach ($connection as $node) {
+            $clients[(string) $node] = new static($node, $this->getOptions());
+        }
+
+        return new ArrayIterator($clients);
+    }
 }
diff --git a/plugins/cache-redis/Predis/ClientConfiguration.php b/plugins/cache-redis/Predis/ClientConfiguration.php
new file mode 100644
index 000000000..c70cd61cf
--- /dev/null
+++ b/plugins/cache-redis/Predis/ClientConfiguration.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis;
+
+class ClientConfiguration
+{
+    /**
+     * @var array{modules: array}|string[][]
+     */
+    private static $config = [
+        'modules' => [
+            ['name' => 'Json', 'commandPrefix' => 'JSON'],
+            ['name' => 'BloomFilter', 'commandPrefix' => 'BF'],
+            ['name' => 'CuckooFilter', 'commandPrefix' => 'CF'],
+            ['name' => 'CountMinSketch', 'commandPrefix' => 'CMS'],
+            ['name' => 'TDigest', 'commandPrefix' => 'TDIGEST'],
+            ['name' => 'TopK', 'commandPrefix' => 'TOPK'],
+            ['name' => 'Search', 'commandPrefix' => 'FT'],
+            ['name' => 'TimeSeries', 'commandPrefix' => 'TS'],
+        ],
+    ];
+
+    /**
+     * Returns available modules with configuration.
+     *
+     * @return array|string[][]
+     */
+    public static function getModules(): array
+    {
+        return self::$config['modules'];
+    }
+}
diff --git a/plugins/cache-redis/Predis/ClientContextInterface.php b/plugins/cache-redis/Predis/ClientContextInterface.php
new file mode 100644
index 000000000..e443ee5d1
--- /dev/null
+++ b/plugins/cache-redis/Predis/ClientContextInterface.php
@@ -0,0 +1,380 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis;
+
+use Predis\Command\Argument\Geospatial\ByInterface;
+use Predis\Command\Argument\Geospatial\FromInterface;
+use Predis\Command\Argument\Search\AggregateArguments;
+use Predis\Command\Argument\Search\AlterArguments;
+use Predis\Command\Argument\Search\CreateArguments;
+use Predis\Command\Argument\Search\DropArguments;
+use Predis\Command\Argument\Search\ExplainArguments;
+use Predis\Command\Argument\Search\ProfileArguments;
+use Predis\Command\Argument\Search\SchemaFields\FieldInterface;
+use Predis\Command\Argument\Search\SearchArguments;
+use Predis\Command\Argument\Search\SugAddArguments;
+use Predis\Command\Argument\Search\SugGetArguments;
+use Predis\Command\Argument\Search\SynUpdateArguments;
+use Predis\Command\Argument\Server\LimitOffsetCount;
+use Predis\Command\Argument\Server\To;
+use Predis\Command\Argument\TimeSeries\AddArguments;
+use Predis\Command\Argument\TimeSeries\AlterArguments as TSAlterArguments;
+use Predis\Command\Argument\TimeSeries\CreateArguments as TSCreateArguments;
+use Predis\Command\Argument\TimeSeries\DecrByArguments;
+use Predis\Command\Argument\TimeSeries\GetArguments;
+use Predis\Command\Argument\TimeSeries\IncrByArguments;
+use Predis\Command\Argument\TimeSeries\InfoArguments;
+use Predis\Command\Argument\TimeSeries\MGetArguments;
+use Predis\Command\Argument\TimeSeries\MRangeArguments;
+use Predis\Command\Argument\TimeSeries\RangeArguments;
+use Predis\Command\CommandInterface;
+use Predis\Command\Redis\Container\ACL;
+use Predis\Command\Redis\Container\CLUSTER;
+use Predis\Command\Redis\Container\FunctionContainer;
+use Predis\Command\Redis\Container\Json\JSONDEBUG;
+use Predis\Command\Redis\Container\Search\FTCONFIG;
+use Predis\Command\Redis\Container\Search\FTCURSOR;
+
+/**
+ * Interface defining a client-side context such as a pipeline or transaction.
+ *
+ * @method $this copy(string $source, string $destination, int $db = -1, bool $replace = false)
+ * @method $this del(array|string $keys)
+ * @method $this dump($key)
+ * @method $this exists($key)
+ * @method $this expire($key, $seconds, string $expireOption = '')
+ * @method $this expireat($key, $timestamp, string $expireOption = '')
+ * @method $this expiretime(string $key)
+ * @method $this keys($pattern)
+ * @method $this move($key, $db)
+ * @method $this object($subcommand, $key)
+ * @method $this persist($key)
+ * @method $this pexpire($key, $milliseconds)
+ * @method $this pexpireat($key, $timestamp)
+ * @method $this pttl($key)
+ * @method $this randomkey()
+ * @method $this rename($key, $target)
+ * @method $this renamenx($key, $target)
+ * @method $this scan($cursor, array $options = null)
+ * @method $this sort($key, array $options = null)
+ * @method $this sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
+ * @method $this ttl($key)
+ * @method $this type($key)
+ * @method $this append($key, $value)
+ * @method $this bfadd(string $key, $item)
+ * @method $this bfexists(string $key, $item)
+ * @method $this bfinfo(string $key, string $modifier = '')
+ * @method $this bfinsert(string $key, int $capacity = -1, float $error = -1, int $expansion = -1, bool $noCreate = false, bool $nonScaling = false, string ...$item)
+ * @method $this bfloadchunk(string $key, int $iterator, $data)
+ * @method $this bfmadd(string $key, ...$item)
+ * @method $this bfmexists(string $key, ...$item)
+ * @method $this bfreserve(string $key, float $errorRate, int $capacity, int $expansion = -1, bool $nonScaling = false)
+ * @method $this bfscandump(string $key, int $iterator)
+ * @method $this bitcount(string $key, $start = null, $end = null, string $index = 'byte')
+ * @method $this bitop($operation, $destkey, $key)
+ * @method $this bitfield($key, $subcommand, ...$subcommandArg)
+ * @method $this bitpos($key, $bit, $start = null, $end = null, string $index = 'byte')
+ * @method $this blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
+ * @method $this bzpopmax(array $keys, int $timeout)
+ * @method $this bzpopmin(array $keys, int $timeout)
+ * @method $this bzmpop(int $timeout, array $keys, string $modifier = 'min', int $count = 1)
+ * @method $this cfadd(string $key, $item)
+ * @method $this cfaddnx(string $key, $item)
+ * @method $this cfcount(string $key, $item)
+ * @method $this cfdel(string $key, $item)
+ * @method $this cfexists(string $key, $item)
+ * @method $this cfloadchunk(string $key, int $iterator, $data)
+ * @method $this cfmexists(string $key, ...$item)
+ * @method $this cfinfo(string $key)
+ * @method $this cfinsert(string $key, int $capacity = -1, bool $noCreate = false, string ...$item)
+ * @method $this cfinsertnx(string $key, int $capacity = -1, bool $noCreate = false, string ...$item)
+ * @method $this cfreserve(string $key, int $capacity, int $bucketSize = -1, int $maxIterations = -1, int $expansion = -1)
+ * @method $this cfscandump(string $key, int $iterator)
+ * @method $this cmsincrby(string $key, string|int...$itemIncrementDictionary)
+ * @method $this cmsinfo(string $key)
+ * @method $this cmsinitbydim(string $key, int $width, int $depth)
+ * @method $this cmsinitbyprob(string $key, float $errorRate, float $probability)
+ * @method $this cmsmerge(string $destination, array $sources, array $weights = [])
+ * @method $this cmsquery(string $key, string ...$item)
+ * @method $this decr($key)
+ * @method $this decrby($key, $decrement)
+ * @method $this failover(?To $to = null, bool $abort = false, int $timeout = -1)
+ * @method $this fcall(string $function, array $keys, ...$args)
+ * @method $this fcall_ro(string $function, array $keys, ...$args)
+ * @method $this ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
+ * @method $this ftaliasadd(string $alias, string $index)
+ * @method $this ftaliasdel(string $alias)
+ * @method $this ftaliasupdate(string $alias, string $index)
+ * @method $this ftalter(string $index, FieldInterface[] $schema, ?AlterArguments $arguments = null)
+ * @method $this ftcreate(string $index, FieldInterface[] $schema, ?CreateArguments $arguments = null)
+ * @method $this ftdictadd(string $dict, ...$term)
+ * @method $this ftdictdel(string $dict, ...$term)
+ * @method $this ftdictdump(string $dict)
+ * @method $this ftdropindex(string $index, ?DropArguments $arguments = null)
+ * @method $this ftexplain(string $index, string $query, ?ExplainArguments $arguments = null)
+ * @method $this ftinfo(string $index)
+ * @method $this ftprofile(string $index, ProfileArguments $arguments)
+ * @method $this ftsearch(string $index, string $query, ?SearchArguments $arguments = null)
+ * @method $this ftspellcheck(string $index, string $query, ?SearchArguments $arguments = null)
+ * @method $this ftsugadd(string $key, string $string, float $score, ?SugAddArguments $arguments = null)
+ * @method $this ftsugdel(string $key, string $string)
+ * @method $this ftsugget(string $key, string $prefix, ?SugGetArguments $arguments = null)
+ * @method $this ftsuglen(string $key)
+ * @method $this ftsyndump(string $index)
+ * @method $this ftsynupdate(string $index, string $synonymGroupId, ?SynUpdateArguments $arguments = null, string ...$terms)
+ * @method $this fttagvals(string $index, string $fieldName)
+ * @method $this get($key)
+ * @method $this getbit($key, $offset)
+ * @method $this getex(string $key, $modifier = '', $value = false)
+ * @method $this getrange($key, $start, $end)
+ * @method $this getdel(string $key)
+ * @method $this getset($key, $value)
+ * @method $this incr($key)
+ * @method $this incrby($key, $increment)
+ * @method $this incrbyfloat($key, $increment)
+ * @method $this mget(array $keys)
+ * @method $this mset(array $dictionary)
+ * @method $this msetnx(array $dictionary)
+ * @method $this psetex($key, $milliseconds, $value)
+ * @method $this set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
+ * @method $this setbit($key, $offset, $value)
+ * @method $this setex($key, $seconds, $value)
+ * @method $this setnx($key, $value)
+ * @method $this setrange($key, $offset, $value)
+ * @method $this strlen($key)
+ * @method $this hdel($key, array $fields)
+ * @method $this hexists($key, $field)
+ * @method $this hget($key, $field)
+ * @method $this hgetall($key)
+ * @method $this hincrby($key, $field, $increment)
+ * @method $this hincrbyfloat($key, $field, $increment)
+ * @method $this hkeys($key)
+ * @method $this hlen($key)
+ * @method $this hmget($key, array $fields)
+ * @method $this hmset($key, array $dictionary)
+ * @method $this hrandfield(string $key, int $count = 1, bool $withValues = false)
+ * @method $this hscan($key, $cursor, array $options = null)
+ * @method $this hset($key, $field, $value)
+ * @method $this hsetnx($key, $field, $value)
+ * @method $this hvals($key)
+ * @method $this hstrlen($key, $field)
+ * @method $this jsonarrappend(string $key, string $path = '$', ...$value)
+ * @method $this jsonarrindex(string $key, string $path, string $value, int $start = 0, int $stop = 0)
+ * @method $this jsonarrinsert(string $key, string $path, int $index, string ...$value)
+ * @method $this jsonarrlen(string $key, string $path = '$')
+ * @method $this jsonarrpop(string $key, string $path = '$', int $index = -1)
+ * @method $this jsonarrtrim(string $key, string $path, int $start, int $stop)
+ * @method $this jsonclear(string $key, string $path = '$')
+ * @method $this jsondel(string $key, string $path = '$')
+ * @method $this jsonforget(string $key, string $path = '$')
+ * @method $this jsonget(string $key, string $indent = '', string $newline = '', string $space = '', string ...$paths)
+ * @method $this jsonnumincrby(string $key, string $path, int $value)
+ * @method $this jsonmerge(string $key, string $path, string $value)
+ * @method $this jsonmget(array $keys, string $path)
+ * @method $this jsonmset(string ...$keyPathValue)
+ * @method $this jsonobjkeys(string $key, string $path = '$')
+ * @method $this jsonobjlen(string $key, string $path = '$')
+ * @method $this jsonresp(string $key, string $path = '$')
+ * @method $this jsonset(string $key, string $path, string $value, ?string $subcommand = null)
+ * @method $this jsonstrappend(string $key, string $path, string $value)
+ * @method $this jsonstrlen(string $key, string $path = '$')
+ * @method $this jsontoggle(string $key, string $path)
+ * @method $this jsontype(string $key, string $path = '$')
+ * @method $this blmove(string $source, string $destination, string $where, string $to, int $timeout)
+ * @method $this blpop(array|string $keys, $timeout)
+ * @method $this brpop(array|string $keys, $timeout)
+ * @method $this brpoplpush($source, $destination, $timeout)
+ * @method $this lcs(string $key1, string $key2, bool $len = false, bool $idx = false, int $minMatchLen = 0, bool $withMatchLen = false)
+ * @method $this lindex($key, $index)
+ * @method $this linsert($key, $whence, $pivot, $value)
+ * @method $this llen($key)
+ * @method $this lmove(string $source, string $destination, string $where, string $to)
+ * @method $this lmpop(array $keys, string $modifier = 'left', int $count = 1)
+ * @method $this lpop($key)
+ * @method $this lpush($key, array $values)
+ * @method $this lpushx($key, array $values)
+ * @method $this lrange($key, $start, $stop)
+ * @method $this lrem($key, $count, $value)
+ * @method $this lset($key, $index, $value)
+ * @method $this ltrim($key, $start, $stop)
+ * @method $this rpop($key)
+ * @method $this rpoplpush($source, $destination)
+ * @method $this rpush($key, array $values)
+ * @method $this rpushx($key, array $values)
+ * @method $this sadd($key, array $members)
+ * @method $this scard($key)
+ * @method $this sdiff(array|string $keys)
+ * @method $this sdiffstore($destination, array|string $keys)
+ * @method $this sinter(array|string $keys)
+ * @method $this sintercard(array $keys, int $limit = 0)
+ * @method $this sinterstore($destination, array|string $keys)
+ * @method $this sismember($key, $member)
+ * @method $this smembers($key)
+ * @method $this smismember(string $key, string ...$members)
+ * @method $this smove($source, $destination, $member)
+ * @method $this spop($key, $count = null)
+ * @method $this srandmember($key, $count = null)
+ * @method $this srem($key, $member)
+ * @method $this sscan($key, $cursor, array $options = null)
+ * @method $this sunion(array|string $keys)
+ * @method $this sunionstore($destination, array|string $keys)
+ * @method $this tdigestadd(string $key, float ...$value)
+ * @method $this tdigestbyrank(string $key, int ...$rank)
+ * @method $this tdigestbyrevrank(string $key, int ...$reverseRank)
+ * @method $this tdigestcdf(string $key, int ...$value)
+ * @method $this tdigestcreate(string $key, int $compression = 0)
+ * @method $this tdigestinfo(string $key)
+ * @method $this tdigestmax(string $key)
+ * @method $this tdigestmerge(string $destinationKey, array $sourceKeys, int $compression = 0, bool $override = false)
+ * @method $this tdigestquantile(string $key, float ...$quantile)
+ * @method $this tdigestmin(string $key)
+ * @method $this tdigestrank(string $key, ...$value)
+ * @method $this tdigestreset(string $key)
+ * @method $this tdigestrevrank(string $key, float ...$value)
+ * @method $this tdigesttrimmed_mean(string $key, float $lowCutQuantile, float $highCutQuantile)
+ * @method $this topkadd(string $key, ...$items)
+ * @method $this topkincrby(string $key, ...$itemIncrement)
+ * @method $this topkinfo(string $key)
+ * @method $this topklist(string $key, bool $withCount = false)
+ * @method $this topkquery(string $key, ...$items)
+ * @method $this topkreserve(string $key, int $topK, int $width = 8, int $depth = 7, float $decay = 0.9)
+ * @method $this tsadd(string $key, int $timestamp, float $value, ?AddArguments $arguments = null)
+ * @method $this tsalter(string $key, ?TSAlterArguments $arguments = null)
+ * @method $this tscreate(string $key, ?TSCreateArguments $arguments = null)
+ * @method $this tscreaterule(string $sourceKey, string $destKey, string $aggregator, int $bucketDuration, int $alignTimestamp = 0)
+ * @method $this tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
+ * @method $this tsdel(string $key, int $fromTimestamp, int $toTimestamp)
+ * @method $this tsdeleterule(string $sourceKey, string $destKey)
+ * @method $this tsget(string $key, GetArguments $arguments = null)
+ * @method $this tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
+ * @method $this tsinfo(string $key, ?InfoArguments $arguments = null)
+ * @method $this tsmadd(mixed ...$keyTimestampValue)
+ * @method $this tsmget(MGetArguments $arguments, string ...$filterExpression)
+ * @method $this tsmrange($fromTimestamp, $toTimestamp, MRangeArguments $arguments)
+ * @method $this tsmrevrange($fromTimestamp, $toTimestamp, MRangeArguments $arguments)
+ * @method $this tsqueryindex(string ...$filterExpression)
+ * @method $this tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method $this tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method $this zadd($key, array $membersAndScoresDictionary)
+ * @method $this zcard($key)
+ * @method $this zcount($key, $min, $max)
+ * @method $this zdiff(array $keys, bool $withScores = false)
+ * @method $this zdiffstore(string $destination, array $keys)
+ * @method $this zincrby($key, $increment, $member)
+ * @method $this zintercard(array $keys, int $limit = 0)
+ * @method $this zinterstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
+ * @method $this zinter(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
+ * @method $this zmpop(array $keys, string $modifier = 'min', int $count = 1)
+ * @method $this zmscore(string $key, string ...$member)
+ * @method $this zrandmember(string $key, int $count = 1, bool $withScores = false)
+ * @method $this zrange($key, $start, $stop, array $options = null)
+ * @method $this zrangebyscore($key, $min, $max, array $options = null)
+ * @method $this zrangestore(string $destination, string $source, int|string $min, string|int $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
+ * @method $this zrank($key, $member)
+ * @method $this zrem($key, $member)
+ * @method $this zremrangebyrank($key, $start, $stop)
+ * @method $this zremrangebyscore($key, $min, $max)
+ * @method $this zrevrange($key, $start, $stop, array $options = null)
+ * @method $this zrevrangebyscore($key, $max, $min, array $options = null)
+ * @method $this zrevrank($key, $member)
+ * @method $this zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
+ * @method $this zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
+ * @method $this zscore($key, $member)
+ * @method $this zscan($key, $cursor, array $options = null)
+ * @method $this zrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zrevrangebylex($key, $start, $stop, array $options = null)
+ * @method $this zremrangebylex($key, $min, $max)
+ * @method $this zlexcount($key, $min, $max)
+ * @method $this pexpiretime(string $key)
+ * @method $this pfadd($key, array $elements)
+ * @method $this pfmerge($destinationKey, array|string $sourceKeys)
+ * @method $this pfcount(array|string $keys)
+ * @method $this pubsub($subcommand, $argument)
+ * @method $this publish($channel, $message)
+ * @method $this discard()
+ * @method $this exec()
+ * @method $this multi()
+ * @method $this unwatch()
+ * @method $this waitaof(int $numLocal, int $numReplicas, int $timeout)
+ * @method $this watch($key)
+ * @method $this eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
+ * @method $this eval_ro(string $script, array $keys, ...$argument)
+ * @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
+ * @method $this evalsha_ro(string $sha1, array $keys, ...$argument)
+ * @method $this script($subcommand, $argument = null)
+ * @method $this shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method $this auth($password)
+ * @method $this echo($message)
+ * @method $this ping($message = null)
+ * @method $this select($database)
+ * @method $this bgrewriteaof()
+ * @method $this bgsave()
+ * @method $this client($subcommand, $argument = null)
+ * @method $this config($subcommand, $argument = null)
+ * @method $this dbsize()
+ * @method $this flushall()
+ * @method $this flushdb()
+ * @method $this info($section = null)
+ * @method $this lastsave()
+ * @method $this save()
+ * @method $this slaveof($host, $port)
+ * @method $this slowlog($subcommand, $argument = null)
+ * @method $this time()
+ * @method $this command()
+ * @method $this geoadd($key, $longitude, $latitude, $member)
+ * @method $this geohash($key, array $members)
+ * @method $this geopos($key, array $members)
+ * @method $this geodist($key, $member1, $member2, $unit = null)
+ * @method $this georadius($key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method $this georadiusbymember($key, $member, $radius, $unit, array $options = null)
+ * @method $this geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
+ * @method $this geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
+ *
+ * Container commands
+ * @property CLUSTER           $cluster
+ * @property FunctionContainer $function
+ * @property FTCONFIG          $ftconfig
+ * @property FTCURSOR          $ftcursor
+ * @property JSONDEBUG         $jsondebug
+ * @property ACL               $acl
+ */
+interface ClientContextInterface
+{
+    /**
+     * Sends the specified command instance to Redis.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return mixed
+     */
+    public function executeCommand(CommandInterface $command);
+
+    /**
+     * Sends the specified command with its arguments to Redis.
+     *
+     * @param string $method    Command ID.
+     * @param array  $arguments Arguments for the command.
+     *
+     * @return mixed
+     */
+    public function __call($method, $arguments);
+
+    /**
+     * Starts the execution of the context.
+     *
+     * @param mixed $callable Optional callback for execution.
+     *
+     * @return array
+     */
+    public function execute($callable = null);
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/ClientException.php b/plugins/cache-redis/Predis/ClientException.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/ClientException.php
rename to plugins/cache-redis/Predis/ClientException.php
index 6c07aaf0d..e52ab0244 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/ClientException.php
+++ b/plugins/cache-redis/Predis/ClientException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis;
 
 /**
  * Exception class that identifies client-side errors.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ClientException extends PredisException
 {
diff --git a/plugins/cache-redis/Predis/ClientInterface.php b/plugins/cache-redis/Predis/ClientInterface.php
new file mode 100644
index 000000000..2937c5804
--- /dev/null
+++ b/plugins/cache-redis/Predis/ClientInterface.php
@@ -0,0 +1,431 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis;
+
+use Predis\Command\Argument\Geospatial\ByInterface;
+use Predis\Command\Argument\Geospatial\FromInterface;
+use Predis\Command\Argument\Search\AggregateArguments;
+use Predis\Command\Argument\Search\AlterArguments;
+use Predis\Command\Argument\Search\CreateArguments;
+use Predis\Command\Argument\Search\DropArguments;
+use Predis\Command\Argument\Search\ExplainArguments;
+use Predis\Command\Argument\Search\ProfileArguments;
+use Predis\Command\Argument\Search\SchemaFields\FieldInterface;
+use Predis\Command\Argument\Search\SearchArguments;
+use Predis\Command\Argument\Search\SugAddArguments;
+use Predis\Command\Argument\Search\SugGetArguments;
+use Predis\Command\Argument\Search\SynUpdateArguments;
+use Predis\Command\Argument\Server\LimitOffsetCount;
+use Predis\Command\Argument\Server\To;
+use Predis\Command\Argument\TimeSeries\AddArguments;
+use Predis\Command\Argument\TimeSeries\AlterArguments as TSAlterArguments;
+use Predis\Command\Argument\TimeSeries\CreateArguments as TSCreateArguments;
+use Predis\Command\Argument\TimeSeries\DecrByArguments;
+use Predis\Command\Argument\TimeSeries\GetArguments;
+use Predis\Command\Argument\TimeSeries\IncrByArguments;
+use Predis\Command\Argument\TimeSeries\InfoArguments;
+use Predis\Command\Argument\TimeSeries\MGetArguments;
+use Predis\Command\Argument\TimeSeries\MRangeArguments;
+use Predis\Command\Argument\TimeSeries\RangeArguments;
+use Predis\Command\CommandInterface;
+use Predis\Command\FactoryInterface;
+use Predis\Command\Redis\Container\ACL;
+use Predis\Command\Redis\Container\CLUSTER;
+use Predis\Command\Redis\Container\FunctionContainer;
+use Predis\Command\Redis\Container\Json\JSONDEBUG;
+use Predis\Command\Redis\Container\Search\FTCONFIG;
+use Predis\Command\Redis\Container\Search\FTCURSOR;
+use Predis\Configuration\OptionsInterface;
+use Predis\Connection\ConnectionInterface;
+use Predis\Response\Status;
+
+/**
+ * Interface defining a client able to execute commands against Redis.
+ *
+ * All the commands exposed by the client generally have the same signature as
+ * described by the Redis documentation, but some of them offer an additional
+ * and more friendly interface to ease programming which is described in the
+ * following list of methods:
+ *
+ * @method int               copy(string $source, string $destination, int $db = -1, bool $replace = false)
+ * @method int               del(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method string|null       dump(string $key)
+ * @method int               exists(string $key)
+ * @method int               expire(string $key, int $seconds, string $expireOption = '')
+ * @method int               expireat(string $key, int $timestamp, string $expireOption = '')
+ * @method int               expiretime(string $key)
+ * @method array             keys(string $pattern)
+ * @method int               move(string $key, int $db)
+ * @method mixed             object($subcommand, string $key)
+ * @method int               persist(string $key)
+ * @method int               pexpire(string $key, int $milliseconds)
+ * @method int               pexpireat(string $key, int $timestamp)
+ * @method int               pttl(string $key)
+ * @method string|null       randomkey()
+ * @method mixed             rename(string $key, string $target)
+ * @method int               renamenx(string $key, string $target)
+ * @method array             scan($cursor, array $options = null)
+ * @method array             sort(string $key, array $options = null)
+ * @method array             sort_ro(string $key, ?string $byPattern = null, ?LimitOffsetCount $limit = null, array $getPatterns = [], ?string $sorting = null, bool $alpha = false)
+ * @method int               ttl(string $key)
+ * @method mixed             type(string $key)
+ * @method int               append(string $key, $value)
+ * @method int               bfadd(string $key, $item)
+ * @method int               bfexists(string $key, $item)
+ * @method array             bfinfo(string $key, string $modifier = '')
+ * @method array             bfinsert(string $key, int $capacity = -1, float $error = -1, int $expansion = -1, bool $noCreate = false, bool $nonScaling = false, string ...$item)
+ * @method Status            bfloadchunk(string $key, int $iterator, $data)
+ * @method array             bfmadd(string $key, ...$item)
+ * @method array             bfmexists(string $key, ...$item)
+ * @method Status            bfreserve(string $key, float $errorRate, int $capacity, int $expansion = -1, bool $nonScaling = false)
+ * @method array             bfscandump(string $key, int $iterator)
+ * @method int               bitcount(string $key, $start = null, $end = null, string $index = 'byte')
+ * @method int               bitop($operation, $destkey, $key)
+ * @method array|null        bitfield(string $key, $subcommand, ...$subcommandArg)
+ * @method int               bitpos(string $key, $bit, $start = null, $end = null, string $index = 'byte')
+ * @method array             blmpop(int $timeout, array $keys, string $modifier = 'left', int $count = 1)
+ * @method array             bzpopmax(array $keys, int $timeout)
+ * @method array             bzpopmin(array $keys, int $timeout)
+ * @method array             bzmpop(int $timeout, array $keys, string $modifier = 'min', int $count = 1)
+ * @method int               cfadd(string $key, $item)
+ * @method int               cfaddnx(string $key, $item)
+ * @method int               cfcount(string $key, $item)
+ * @method int               cfdel(string $key, $item)
+ * @method int               cfexists(string $key, $item)
+ * @method Status            cfloadchunk(string $key, int $iterator, $data)
+ * @method int               cfmexists(string $key, ...$item)
+ * @method array             cfinfo(string $key)
+ * @method array             cfinsert(string $key, int $capacity = -1, bool $noCreate = false, string ...$item)
+ * @method array             cfinsertnx(string $key, int $capacity = -1, bool $noCreate = false, string ...$item)
+ * @method Status            cfreserve(string $key, int $capacity, int $bucketSize = -1, int $maxIterations = -1, int $expansion = -1)
+ * @method array             cfscandump(string $key, int $iterator)
+ * @method array             cmsincrby(string $key, string|int...$itemIncrementDictionary)
+ * @method array             cmsinfo(string $key)
+ * @method Status            cmsinitbydim(string $key, int $width, int $depth)
+ * @method Status            cmsinitbyprob(string $key, float $errorRate, float $probability)
+ * @method Status            cmsmerge(string $destination, array $sources, array $weights = [])
+ * @method array             cmsquery(string $key, string ...$item)
+ * @method int               decr(string $key)
+ * @method int               decrby(string $key, int $decrement)
+ * @method Status            failover(?To $to = null, bool $abort = false, int $timeout = -1)
+ * @method mixed             fcall(string $function, array $keys, ...$args)
+ * @method mixed             fcall_ro(string $function, array $keys, ...$args)
+ * @method array             ftaggregate(string $index, string $query, ?AggregateArguments $arguments = null)
+ * @method Status            ftaliasadd(string $alias, string $index)
+ * @method Status            ftaliasdel(string $alias)
+ * @method Status            ftaliasupdate(string $alias, string $index)
+ * @method Status            ftalter(string $index, FieldInterface[] $schema, ?AlterArguments $arguments = null)
+ * @method Status            ftcreate(string $index, FieldInterface[] $schema, ?CreateArguments $arguments = null)
+ * @method int               ftdictadd(string $dict, ...$term)
+ * @method int               ftdictdel(string $dict, ...$term)
+ * @method array             ftdictdump(string $dict)
+ * @method Status            ftdropindex(string $index, ?DropArguments $arguments = null)
+ * @method string            ftexplain(string $index, string $query, ?ExplainArguments $arguments = null)
+ * @method array             ftinfo(string $index)
+ * @method array             ftprofile(string $index, ProfileArguments $arguments)
+ * @method array             ftsearch(string $index, string $query, ?SearchArguments $arguments = null)
+ * @method array             ftspellcheck(string $index, string $query, ?SearchArguments $arguments = null)
+ * @method int               ftsugadd(string $key, string $string, float $score, ?SugAddArguments $arguments = null)
+ * @method int               ftsugdel(string $key, string $string)
+ * @method array             ftsugget(string $key, string $prefix, ?SugGetArguments $arguments = null)
+ * @method int               ftsuglen(string $key)
+ * @method array             ftsyndump(string $index)
+ * @method Status            ftsynupdate(string $index, string $synonymGroupId, ?SynUpdateArguments $arguments = null, string ...$terms)
+ * @method array             fttagvals(string $index, string $fieldName)
+ * @method string|null       get(string $key)
+ * @method int               getbit(string $key, $offset)
+ * @method int|null          getex(string $key, $modifier = '', $value = false)
+ * @method string            getrange(string $key, $start, $end)
+ * @method string            getdel(string $key)
+ * @method string|null       getset(string $key, $value)
+ * @method int               incr(string $key)
+ * @method int               incrby(string $key, int $increment)
+ * @method string            incrbyfloat(string $key, int|float $increment)
+ * @method array             mget(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method mixed             mset(array $dictionary)
+ * @method int               msetnx(array $dictionary)
+ * @method Status            psetex(string $key, $milliseconds, $value)
+ * @method Status            set(string $key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
+ * @method int               setbit(string $key, $offset, $value)
+ * @method Status            setex(string $key, $seconds, $value)
+ * @method int               setnx(string $key, $value)
+ * @method int               setrange(string $key, $offset, $value)
+ * @method int               strlen(string $key)
+ * @method int               hdel(string $key, array $fields)
+ * @method int               hexists(string $key, string $field)
+ * @method string|null       hget(string $key, string $field)
+ * @method array             hgetall(string $key)
+ * @method int               hincrby(string $key, string $field, int $increment)
+ * @method string            hincrbyfloat(string $key, string $field, int|float $increment)
+ * @method array             hkeys(string $key)
+ * @method int               hlen(string $key)
+ * @method array             hmget(string $key, array $fields)
+ * @method mixed             hmset(string $key, array $dictionary)
+ * @method array             hrandfield(string $key, int $count = 1, bool $withValues = false)
+ * @method array             hscan(string $key, $cursor, array $options = null)
+ * @method int               hset(string $key, string $field, string $value)
+ * @method int               hsetnx(string $key, string $field, string $value)
+ * @method array             hvals(string $key)
+ * @method int               hstrlen(string $key, string $field)
+ * @method array             jsonarrappend(string $key, string $path = '$', ...$value)
+ * @method array             jsonarrindex(string $key, string $path, string $value, int $start = 0, int $stop = 0)
+ * @method array             jsonarrinsert(string $key, string $path, int $index, string ...$value)
+ * @method array             jsonarrlen(string $key, string $path = '$')
+ * @method array             jsonarrpop(string $key, string $path = '$', int $index = -1)
+ * @method int               jsonclear(string $key, string $path = '$')
+ * @method array             jsonarrtrim(string $key, string $path, int $start, int $stop)
+ * @method int               jsondel(string $key, string $path = '$')
+ * @method int               jsonforget(string $key, string $path = '$')
+ * @method string            jsonget(string $key, string $indent = '', string $newline = '', string $space = '', string ...$paths)
+ * @method string            jsonnumincrby(string $key, string $path, int $value)
+ * @method Status            jsonmerge(string $key, string $path, string $value)
+ * @method array             jsonmget(array $keys, string $path)
+ * @method Status            jsonmset(string ...$keyPathValue)
+ * @method array             jsonobjkeys(string $key, string $path = '$')
+ * @method array             jsonobjlen(string $key, string $path = '$')
+ * @method array             jsonresp(string $key, string $path = '$')
+ * @method string            jsonset(string $key, string $path, string $value, ?string $subcommand = null)
+ * @method array             jsonstrappend(string $key, string $path, string $value)
+ * @method array             jsonstrlen(string $key, string $path = '$')
+ * @method array             jsontoggle(string $key, string $path)
+ * @method array             jsontype(string $key, string $path = '$')
+ * @method string            blmove(string $source, string $destination, string $where, string $to, int $timeout)
+ * @method array|null        blpop(array|string $keys, int|float $timeout)
+ * @method array|null        brpop(array|string $keys, int|float $timeout)
+ * @method string|null       brpoplpush(string $source, string $destination, int|float $timeout)
+ * @method mixed             lcs(string $key1, string $key2, bool $len = false, bool $idx = false, int $minMatchLen = 0, bool $withMatchLen = false)
+ * @method string|null       lindex(string $key, int $index)
+ * @method int               linsert(string $key, $whence, $pivot, $value)
+ * @method int               llen(string $key)
+ * @method string            lmove(string $source, string $destination, string $where, string $to)
+ * @method array|null        lmpop(array $keys, string $modifier = 'left', int $count = 1)
+ * @method string|null       lpop(string $key)
+ * @method int               lpush(string $key, array $values)
+ * @method int               lpushx(string $key, array $values)
+ * @method string[]          lrange(string $key, int $start, int $stop)
+ * @method int               lrem(string $key, int $count, string $value)
+ * @method mixed             lset(string $key, int $index, string $value)
+ * @method mixed             ltrim(string $key, int $start, int $stop)
+ * @method string|null       rpop(string $key)
+ * @method string|null       rpoplpush(string $source, string $destination)
+ * @method int               rpush(string $key, array $values)
+ * @method int               rpushx(string $key, array $values)
+ * @method int               sadd(string $key, array $members)
+ * @method int               scard(string $key)
+ * @method string[]          sdiff(array|string $keys)
+ * @method int               sdiffstore(string $destination, array|string $keys)
+ * @method string[]          sinter(array|string $keys)
+ * @method int               sintercard(array $keys, int $limit = 0)
+ * @method int               sinterstore(string $destination, array|string $keys)
+ * @method int               sismember(string $key, string $member)
+ * @method string[]          smembers(string $key)
+ * @method array             smismember(string $key, string ...$members)
+ * @method int               smove(string $source, string $destination, string $member)
+ * @method string|array|null spop(string $key, int $count = null)
+ * @method string|null       srandmember(string $key, int $count = null)
+ * @method int               srem(string $key, array|string $member)
+ * @method array             sscan(string $key, int $cursor, array $options = null)
+ * @method string[]          sunion(array|string $keys)
+ * @method int               sunionstore(string $destination, array|string $keys)
+ * @method int               touch(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method Status            tdigestadd(string $key, float ...$value)
+ * @method array             tdigestbyrank(string $key, int ...$rank)
+ * @method array             tdigestbyrevrank(string $key, int ...$reverseRank)
+ * @method array             tdigestcdf(string $key, int ...$value)
+ * @method Status            tdigestcreate(string $key, int $compression = 0)
+ * @method array             tdigestinfo(string $key)
+ * @method string            tdigestmax(string $key)
+ * @method Status            tdigestmerge(string $destinationKey, array $sourceKeys, int $compression = 0, bool $override = false)
+ * @method string[]          tdigestquantile(string $key, float ...$quantile)
+ * @method string            tdigestmin(string $key)
+ * @method array             tdigestrank(string $key, float ...$value)
+ * @method Status            tdigestreset(string $key)
+ * @method array             tdigestrevrank(string $key, float ...$value)
+ * @method string            tdigesttrimmed_mean(string $key, float $lowCutQuantile, float $highCutQuantile)
+ * @method array             topkadd(string $key, ...$items)
+ * @method array             topkincrby(string $key, ...$itemIncrement)
+ * @method array             topkinfo(string $key)
+ * @method array             topklist(string $key, bool $withCount = false)
+ * @method array             topkquery(string $key, ...$items)
+ * @method Status            topkreserve(string $key, int $topK, int $width = 8, int $depth = 7, float $decay = 0.9)
+ * @method int               tsadd(string $key, int $timestamp, float $value, ?AddArguments $arguments = null)
+ * @method Status            tsalter(string $key, ?TSAlterArguments $arguments = null)
+ * @method Status            tscreate(string $key, ?TSCreateArguments $arguments = null)
+ * @method Status            tscreaterule(string $sourceKey, string $destKey, string $aggregator, int $bucketDuration, int $alignTimestamp = 0)
+ * @method int               tsdecrby(string $key, float $value, ?DecrByArguments $arguments = null)
+ * @method int               tsdel(string $key, int $fromTimestamp, int $toTimestamp)
+ * @method Status            tsdeleterule(string $sourceKey, string $destKey)
+ * @method array             tsget(string $key, GetArguments $arguments = null)
+ * @method int               tsincrby(string $key, float $value, ?IncrByArguments $arguments = null)
+ * @method array             tsinfo(string $key, ?InfoArguments $arguments = null)
+ * @method array             tsmadd(mixed ...$keyTimestampValue)
+ * @method array             tsmget(MGetArguments $arguments, string ...$filterExpression)
+ * @method array             tsmrange($fromTimestamp, $toTimestamp, MRangeArguments $arguments)
+ * @method array             tsmrevrange($fromTimestamp, $toTimestamp, MRangeArguments $arguments)
+ * @method array             tsqueryindex(string ...$filterExpression)
+ * @method array             tsrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method array             tsrevrange(string $key, $fromTimestamp, $toTimestamp, ?RangeArguments $arguments = null)
+ * @method string            xadd(string $key, array $dictionary, string $id = '*', array $options = null)
+ * @method int               xdel(string $key, string ...$id)
+ * @method int               xlen(string $key)
+ * @method array             xrevrange(string $key, string $end, string $start, ?int $count = null)
+ * @method array             xrange(string $key, string $start, string $end, ?int $count = null)
+ * @method string            xtrim(string $key, array|string $strategy, string $threshold, array $options = null)
+ * @method int               zadd(string $key, array $membersAndScoresDictionary)
+ * @method int               zcard(string $key)
+ * @method string            zcount(string $key, int|string $min, int|string $max)
+ * @method array             zdiff(array $keys, bool $withScores = false)
+ * @method int               zdiffstore(string $destination, array $keys)
+ * @method string            zincrby(string $key, int $increment, string $member)
+ * @method int               zintercard(array $keys, int $limit = 0)
+ * @method int               zinterstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
+ * @method array             zinter(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
+ * @method array             zmpop(array $keys, string $modifier = 'min', int $count = 1)
+ * @method array             zmscore(string $key, string ...$member)
+ * @method array             zpopmin(string $key, int $count = 1)
+ * @method array             zpopmax(string $key, int $count = 1)
+ * @method mixed             zrandmember(string $key, int $count = 1, bool $withScores = false)
+ * @method array             zrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrangebyscore(string $key, int|string $min, int|string $max, array $options = null)
+ * @method int               zrangestore(string $destination, string $source, int|string $min, int|string $max, string|bool $by = false, bool $reversed = false, bool $limit = false, int $offset = 0, int $count = 0)
+ * @method int|null          zrank(string $key, string $member)
+ * @method int               zrem(string $key, string ...$member)
+ * @method int               zremrangebyrank(string $key, int|string $start, int|string $stop)
+ * @method int               zremrangebyscore(string $key, int|string $min, int|string $max)
+ * @method array             zrevrange(string $key, int|string $start, int|string $stop, array $options = null)
+ * @method array             zrevrangebyscore(string $key, int|string $max, int|string $min, array $options = null)
+ * @method int|null          zrevrank(string $key, string $member)
+ * @method array             zunion(array $keys, int[] $weights = [], string $aggregate = 'sum', bool $withScores = false)
+ * @method int               zunionstore(string $destination, array $keys, int[] $weights = [], string $aggregate = 'sum')
+ * @method string|null       zscore(string $key, string $member)
+ * @method array             zscan(string $key, int $cursor, array $options = null)
+ * @method array             zrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method array             zrevrangebylex(string $key, string $start, string $stop, array $options = null)
+ * @method int               zremrangebylex(string $key, string $min, string $max)
+ * @method int               zlexcount(string $key, string $min, string $max)
+ * @method int               pexpiretime(string $key)
+ * @method int               pfadd(string $key, array $elements)
+ * @method mixed             pfmerge(string $destinationKey, array|string $sourceKeys)
+ * @method int               pfcount(string[]|string $keyOrKeys, string ...$keys = null)
+ * @method mixed             pubsub($subcommand, $argument)
+ * @method int               publish($channel, $message)
+ * @method mixed             discard()
+ * @method array|null        exec()
+ * @method mixed             multi()
+ * @method mixed             unwatch()
+ * @method array             waitaof(int $numLocal, int $numReplicas, int $timeout)
+ * @method mixed             watch(string $key)
+ * @method mixed             eval(string $script, int $numkeys, string ...$keyOrArg = null)
+ * @method mixed             eval_ro(string $script, array $keys, ...$argument)
+ * @method mixed             evalsha(string $script, int $numkeys, string ...$keyOrArg = null)
+ * @method mixed             evalsha_ro(string $sha1, array $keys, ...$argument)
+ * @method mixed             script($subcommand, $argument = null)
+ * @method Status            shutdown(bool $noSave = null, bool $now = false, bool $force = false, bool $abort = false)
+ * @method mixed             auth(string $password)
+ * @method string            echo(string $message)
+ * @method mixed             ping(string $message = null)
+ * @method mixed             select(int $database)
+ * @method mixed             bgrewriteaof()
+ * @method mixed             bgsave()
+ * @method mixed             client($subcommand, $argument = null)
+ * @method mixed             config($subcommand, $argument = null)
+ * @method int               dbsize()
+ * @method mixed             flushall()
+ * @method mixed             flushdb()
+ * @method array             info($section = null)
+ * @method int               lastsave()
+ * @method mixed             save()
+ * @method mixed             slaveof(string $host, int $port)
+ * @method mixed             slowlog($subcommand, $argument = null)
+ * @method array             time()
+ * @method array             command()
+ * @method int               geoadd(string $key, $longitude, $latitude, $member)
+ * @method array             geohash(string $key, array $members)
+ * @method array             geopos(string $key, array $members)
+ * @method string|null       geodist(string $key, $member1, $member2, $unit = null)
+ * @method array             georadius(string $key, $longitude, $latitude, $radius, $unit, array $options = null)
+ * @method array             georadiusbymember(string $key, $member, $radius, $unit, array $options = null)
+ * @method array             geosearch(string $key, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $withCoord = false, bool $withDist = false, bool $withHash = false)
+ * @method int               geosearchstore(string $destination, string $source, FromInterface $from, ByInterface $by, ?string $sorting = null, int $count = -1, bool $any = false, bool $storeDist = false)
+ *
+ * Container commands
+ * @property CLUSTER           $cluster
+ * @property FunctionContainer $function
+ * @property FTCONFIG          $ftconfig
+ * @property FTCURSOR          $ftcursor
+ * @property JSONDEBUG         $jsondebug
+ * @property ACL               $acl
+ */
+interface ClientInterface
+{
+    /**
+     * Returns the command factory used by the client.
+     *
+     * @return FactoryInterface
+     */
+    public function getCommandFactory();
+
+    /**
+     * Returns the client options specified upon initialization.
+     *
+     * @return OptionsInterface
+     */
+    public function getOptions();
+
+    /**
+     * Opens the underlying connection to the server.
+     */
+    public function connect();
+
+    /**
+     * Closes the underlying connection from the server.
+     */
+    public function disconnect();
+
+    /**
+     * Returns the underlying connection instance.
+     *
+     * @return ConnectionInterface
+     */
+    public function getConnection();
+
+    /**
+     * Creates a new instance of the specified Redis command.
+     *
+     * @param string $method    Command ID.
+     * @param array  $arguments Arguments for the command.
+     *
+     * @return CommandInterface
+     */
+    public function createCommand($method, $arguments = []);
+
+    /**
+     * Executes the specified Redis command.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return mixed
+     */
+    public function executeCommand(CommandInterface $command);
+
+    /**
+     * Creates a Redis command with the specified arguments and sends a request
+     * to the server.
+     *
+     * @param string $method    Command ID.
+     * @param array  $arguments Arguments for the command.
+     *
+     * @return mixed
+     */
+    public function __call($method, $arguments);
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/ClusterStrategy.php b/plugins/cache-redis/Predis/Cluster/ClusterStrategy.php
similarity index 70%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/ClusterStrategy.php
rename to plugins/cache-redis/Predis/Cluster/ClusterStrategy.php
index 7635000ec..1965e26dd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/ClusterStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/ClusterStrategy.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,21 +12,17 @@
 
 namespace Predis\Cluster;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Command\ScriptCommand;
 
 /**
  * Common class implementing the logic needed to support clustering strategies.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 abstract class ClusterStrategy implements StrategyInterface
 {
     protected $commands;
 
-    /**
-     *
-     */
     public function __construct()
     {
         $this->commands = $this->getDefaultCommands();
@@ -38,12 +35,12 @@ abstract class ClusterStrategy implements StrategyInterface
      */
     protected function getDefaultCommands()
     {
-        $getKeyFromFirstArgument = array($this, 'getKeyFromFirstArgument');
-        $getKeyFromAllArguments = array($this, 'getKeyFromAllArguments');
+        $getKeyFromFirstArgument = [$this, 'getKeyFromFirstArgument'];
+        $getKeyFromAllArguments = [$this, 'getKeyFromAllArguments'];
 
-        return array(
+        return [
             /* commands operating on the key space */
-            'EXISTS' => $getKeyFromFirstArgument,
+            'EXISTS' => $getKeyFromAllArguments,
             'DEL' => $getKeyFromAllArguments,
             'TYPE' => $getKeyFromFirstArgument,
             'EXPIRE' => $getKeyFromFirstArgument,
@@ -53,9 +50,10 @@ abstract class ClusterStrategy implements StrategyInterface
             'PEXPIREAT' => $getKeyFromFirstArgument,
             'TTL' => $getKeyFromFirstArgument,
             'PTTL' => $getKeyFromFirstArgument,
-            'SORT' => $getKeyFromFirstArgument, // TODO
+            'SORT' => [$this, 'getKeyFromSortCommand'],
             'DUMP' => $getKeyFromFirstArgument,
             'RESTORE' => $getKeyFromFirstArgument,
+            'FLUSHDB' => [$this, 'getFakeKey'],
 
             /* commands operating on string values */
             'APPEND' => $getKeyFromFirstArgument,
@@ -72,14 +70,15 @@ abstract class ClusterStrategy implements StrategyInterface
             'INCRBYFLOAT' => $getKeyFromFirstArgument,
             'SETBIT' => $getKeyFromFirstArgument,
             'SETEX' => $getKeyFromFirstArgument,
-            'MSET' => array($this, 'getKeyFromInterleavedArguments'),
-            'MSETNX' => array($this, 'getKeyFromInterleavedArguments'),
+            'MSET' => [$this, 'getKeyFromInterleavedArguments'],
+            'MSETNX' => [$this, 'getKeyFromInterleavedArguments'],
             'SETNX' => $getKeyFromFirstArgument,
             'SETRANGE' => $getKeyFromFirstArgument,
             'STRLEN' => $getKeyFromFirstArgument,
             'SUBSTR' => $getKeyFromFirstArgument,
-            'BITOP' => array($this, 'getKeyFromBitOp'),
+            'BITOP' => [$this, 'getKeyFromBitOp'],
             'BITCOUNT' => $getKeyFromFirstArgument,
+            'BITFIELD' => $getKeyFromFirstArgument,
 
             /* commands operating on lists */
             'LINSERT' => $getKeyFromFirstArgument,
@@ -88,9 +87,9 @@ abstract class ClusterStrategy implements StrategyInterface
             'LPOP' => $getKeyFromFirstArgument,
             'RPOP' => $getKeyFromFirstArgument,
             'RPOPLPUSH' => $getKeyFromAllArguments,
-            'BLPOP' => array($this, 'getKeyFromBlockingListCommands'),
-            'BRPOP' => array($this, 'getKeyFromBlockingListCommands'),
-            'BRPOPLPUSH' => array($this, 'getKeyFromBlockingListCommands'),
+            'BLPOP' => [$this, 'getKeyFromBlockingListCommands'],
+            'BRPOP' => [$this, 'getKeyFromBlockingListCommands'],
+            'BRPOPLPUSH' => [$this, 'getKeyFromBlockingListCommands'],
             'LPUSH' => $getKeyFromFirstArgument,
             'LPUSHX' => $getKeyFromFirstArgument,
             'RPUSH' => $getKeyFromFirstArgument,
@@ -121,7 +120,7 @@ abstract class ClusterStrategy implements StrategyInterface
             'ZCARD' => $getKeyFromFirstArgument,
             'ZCOUNT' => $getKeyFromFirstArgument,
             'ZINCRBY' => $getKeyFromFirstArgument,
-            'ZINTERSTORE' => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZINTERSTORE' => [$this, 'getKeyFromZsetAggregationCommands'],
             'ZRANGE' => $getKeyFromFirstArgument,
             'ZRANGEBYSCORE' => $getKeyFromFirstArgument,
             'ZRANK' => $getKeyFromFirstArgument,
@@ -132,7 +131,7 @@ abstract class ClusterStrategy implements StrategyInterface
             'ZREVRANGEBYSCORE' => $getKeyFromFirstArgument,
             'ZREVRANK' => $getKeyFromFirstArgument,
             'ZSCORE' => $getKeyFromFirstArgument,
-            'ZUNIONSTORE' => array($this, 'getKeyFromZsetAggregationCommands'),
+            'ZUNIONSTORE' => [$this, 'getKeyFromZsetAggregationCommands'],
             'ZSCAN' => $getKeyFromFirstArgument,
             'ZLEXCOUNT' => $getKeyFromFirstArgument,
             'ZRANGEBYLEX' => $getKeyFromFirstArgument,
@@ -162,9 +161,23 @@ abstract class ClusterStrategy implements StrategyInterface
             'PFMERGE' => $getKeyFromAllArguments,
 
             /* scripting */
-            'EVAL' => array($this, 'getKeyFromScriptingCommands'),
-            'EVALSHA' => array($this, 'getKeyFromScriptingCommands'),
-        );
+            'EVAL' => [$this, 'getKeyFromScriptingCommands'],
+            'EVALSHA' => [$this, 'getKeyFromScriptingCommands'],
+
+            /* server */
+            'INFO' => [$this, 'getFakeKey'],
+
+            /* commands performing geospatial operations */
+            'GEOADD' => $getKeyFromFirstArgument,
+            'GEOHASH' => $getKeyFromFirstArgument,
+            'GEOPOS' => $getKeyFromFirstArgument,
+            'GEODIST' => $getKeyFromFirstArgument,
+            'GEORADIUS' => [$this, 'getKeyFromGeoradiusCommands'],
+            'GEORADIUSBYMEMBER' => [$this, 'getKeyFromGeoradiusCommands'],
+
+            /* cluster */
+            'CLUSTER' => [$this, 'getFakeKey'],
+        ];
     }
 
     /**
@@ -189,7 +202,7 @@ abstract class ClusterStrategy implements StrategyInterface
      * @param string $commandID Command ID.
      * @param mixed  $callback  A valid callable object, or NULL to unset the handler.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function setCommandHandler($commandID, $callback = null)
     {
@@ -202,7 +215,7 @@ abstract class ClusterStrategy implements StrategyInterface
         }
 
         if (!is_callable($callback)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'The argument must be a callable object or NULL.'
             );
         }
@@ -210,6 +223,16 @@ abstract class ClusterStrategy implements StrategyInterface
         $this->commands[$commandID] = $callback;
     }
 
+    /**
+     * Get fake key for commands with no key argument.
+     *
+     * @return string
+     */
+    protected function getFakeKey(): string
+    {
+        return 'key';
+    }
+
     /**
      * Extracts the key from the first argument of a command instance.
      *
@@ -234,9 +257,11 @@ abstract class ClusterStrategy implements StrategyInterface
     {
         $arguments = $command->getArguments();
 
-        if ($this->checkSameSlotForKeys($arguments)) {
-            return $arguments[0];
+        if (!$this->checkSameSlotForKeys($arguments)) {
+            return null;
         }
+
+        return $arguments[0];
     }
 
     /**
@@ -250,15 +275,48 @@ abstract class ClusterStrategy implements StrategyInterface
     protected function getKeyFromInterleavedArguments(CommandInterface $command)
     {
         $arguments = $command->getArguments();
-        $keys = array();
+        $keys = [];
 
         for ($i = 0; $i < count($arguments); $i += 2) {
             $keys[] = $arguments[$i];
         }
 
-        if ($this->checkSameSlotForKeys($keys)) {
-            return $arguments[0];
+        if (!$this->checkSameSlotForKeys($keys)) {
+            return null;
         }
+
+        return $arguments[0];
+    }
+
+    /**
+     * Extracts the key from SORT command.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return string|null
+     */
+    protected function getKeyFromSortCommand(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $firstKey = $arguments[0];
+
+        if (1 === $argc = count($arguments)) {
+            return $firstKey;
+        }
+
+        $keys = [$firstKey];
+
+        for ($i = 1; $i < $argc; ++$i) {
+            if (strtoupper($arguments[$i]) === 'STORE') {
+                $keys[] = $arguments[++$i];
+            }
+        }
+
+        if (!$this->checkSameSlotForKeys($keys)) {
+            return null;
+        }
+
+        return $firstKey;
     }
 
     /**
@@ -272,9 +330,11 @@ abstract class ClusterStrategy implements StrategyInterface
     {
         $arguments = $command->getArguments();
 
-        if ($this->checkSameSlotForKeys(array_slice($arguments, 0, count($arguments) - 1))) {
-            return $arguments[0];
+        if (!$this->checkSameSlotForKeys(array_slice($arguments, 0, count($arguments) - 1))) {
+            return null;
         }
+
+        return $arguments[0];
     }
 
     /**
@@ -288,9 +348,42 @@ abstract class ClusterStrategy implements StrategyInterface
     {
         $arguments = $command->getArguments();
 
-        if ($this->checkSameSlotForKeys(array_slice($arguments, 1, count($arguments)))) {
-            return $arguments[1];
+        if (!$this->checkSameSlotForKeys(array_slice($arguments, 1, count($arguments)))) {
+            return null;
         }
+
+        return $arguments[1];
+    }
+
+    /**
+     * Extracts the key from GEORADIUS and GEORADIUSBYMEMBER commands.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return string|null
+     */
+    protected function getKeyFromGeoradiusCommands(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $argc = count($arguments);
+        $startIndex = $command->getId() === 'GEORADIUS' ? 5 : 4;
+
+        if ($argc > $startIndex) {
+            $keys = [$arguments[0]];
+
+            for ($i = $startIndex; $i < $argc; ++$i) {
+                $argument = strtoupper($arguments[$i]);
+                if ($argument === 'STORE' || $argument === 'STOREDIST') {
+                    $keys[] = $arguments[++$i];
+                }
+            }
+
+            if (!$this->checkSameSlotForKeys($keys)) {
+                return null;
+            }
+        }
+
+        return $arguments[0];
     }
 
     /**
@@ -303,11 +396,13 @@ abstract class ClusterStrategy implements StrategyInterface
     protected function getKeyFromZsetAggregationCommands(CommandInterface $command)
     {
         $arguments = $command->getArguments();
-        $keys = array_merge(array($arguments[0]), array_slice($arguments, 2, $arguments[1]));
+        $keys = array_merge([$arguments[0]], array_slice($arguments, 2, $arguments[1]));
 
-        if ($this->checkSameSlotForKeys($keys)) {
-            return $arguments[0];
+        if (!$this->checkSameSlotForKeys($keys)) {
+            return null;
         }
+
+        return $arguments[0];
     }
 
     /**
@@ -319,15 +414,15 @@ abstract class ClusterStrategy implements StrategyInterface
      */
     protected function getKeyFromScriptingCommands(CommandInterface $command)
     {
-        if ($command instanceof ScriptCommand) {
-            $keys = $command->getKeys();
-        } else {
-            $keys = array_slice($args = $command->getArguments(), 2, $args[1]);
+        $keys = $command instanceof ScriptCommand
+            ? $command->getKeys()
+            : array_slice($args = $command->getArguments(), 2, $args[1]);
+
+        if (!$keys || !$this->checkSameSlotForKeys($keys)) {
+            return null;
         }
 
-        if ($keys && $this->checkSameSlotForKeys($keys)) {
-            return $keys[0];
-        }
+        return $keys[0];
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/DistributorInterface.php b/plugins/cache-redis/Predis/Cluster/Distributor/DistributorInterface.php
similarity index 94%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/DistributorInterface.php
rename to plugins/cache-redis/Predis/Cluster/Distributor/DistributorInterface.php
index 831f52c52..593d9bb3c 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/DistributorInterface.php
+++ b/plugins/cache-redis/Predis/Cluster/Distributor/DistributorInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,8 +17,6 @@ use Predis\Cluster\Hash\HashGeneratorInterface;
 /**
  * A distributor implements the logic to automatically distribute keys among
  * several nodes for client-side sharding.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface DistributorInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/EmptyRingException.php b/plugins/cache-redis/Predis/Cluster/Distributor/EmptyRingException.php
similarity index 66%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/EmptyRingException.php
rename to plugins/cache-redis/Predis/Cluster/Distributor/EmptyRingException.php
index 039f2f2e8..68172066e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/EmptyRingException.php
+++ b/plugins/cache-redis/Predis/Cluster/Distributor/EmptyRingException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,11 +12,11 @@
 
 namespace Predis\Cluster\Distributor;
 
+use Exception;
+
 /**
  * Exception class that identifies empty rings.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class EmptyRingException extends \Exception
+class EmptyRingException extends Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/HashRing.php b/plugins/cache-redis/Predis/Cluster/Distributor/HashRing.php
similarity index 94%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/HashRing.php
rename to plugins/cache-redis/Predis/Cluster/Distributor/HashRing.php
index db864d912..03e75106f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/HashRing.php
+++ b/plugins/cache-redis/Predis/Cluster/Distributor/HashRing.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,21 +18,19 @@ use Predis\Cluster\Hash\HashGeneratorInterface;
  * This class implements an hashring-based distributor that uses the same
  * algorithm of memcache to distribute keys in a cluster using client-side
  * sharding.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  * @author Lorenzo Castelli <lcastelli@gmail.com>
  */
 class HashRing implements DistributorInterface, HashGeneratorInterface
 {
-    const DEFAULT_REPLICAS = 128;
-    const DEFAULT_WEIGHT = 100;
+    public const DEFAULT_REPLICAS = 128;
+    public const DEFAULT_WEIGHT = 100;
 
     private $ring;
     private $ringKeys;
     private $ringKeysCount;
     private $replicas;
     private $nodeHashCallback;
-    private $nodes = array();
+    private $nodes = [];
 
     /**
      * @param int   $replicas         Number of replicas in the ring.
@@ -53,10 +52,10 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
     {
         // In case of collisions in the hashes of the nodes, the node added
         // last wins, thus the order in which nodes are added is significant.
-        $this->nodes[] = array(
+        $this->nodes[] = [
             'object' => $node,
             'weight' => (int) $weight ?: $this::DEFAULT_WEIGHT,
-        );
+        ];
 
         $this->reset();
     }
@@ -131,7 +130,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
             throw new EmptyRingException('Cannot initialize an empty hashring.');
         }
 
-        $this->ring = array();
+        $this->ring = [];
         $totalWeight = $this->computeTotalWeight();
         $nodesCount = count($this->nodes);
 
@@ -161,7 +160,7 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
         $replicas = (int) round($weightRatio * $totalNodes * $replicas);
 
         for ($i = 0; $i < $replicas; ++$i) {
-            $key = crc32("$nodeHash:$i");
+            $key = $this->hash("$nodeHash:$i");
             $ring[$key] = $nodeObject;
         }
     }
@@ -239,9 +238,8 @@ class HashRing implements DistributorInterface, HashGeneratorInterface
     public function get($value)
     {
         $hash = $this->hash($value);
-        $node = $this->getByHash($hash);
 
-        return $node;
+        return $this->getByHash($hash);
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/KetamaRing.php b/plugins/cache-redis/Predis/Cluster/Distributor/KetamaRing.php
similarity index 92%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/KetamaRing.php
rename to plugins/cache-redis/Predis/Cluster/Distributor/KetamaRing.php
index dc77f320f..af3b88455 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Distributor/KetamaRing.php
+++ b/plugins/cache-redis/Predis/Cluster/Distributor/KetamaRing.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,13 +16,11 @@ namespace Predis\Cluster\Distributor;
  * This class implements an hashring-based distributor that uses the same
  * algorithm of libketama to distribute keys in a cluster using client-side
  * sharding.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  * @author Lorenzo Castelli <lcastelli@gmail.com>
  */
 class KetamaRing extends HashRing
 {
-    const DEFAULT_REPLICAS = 160;
+    public const DEFAULT_REPLICAS = 160;
 
     /**
      * @param mixed $nodeHashCallback Callback returning a string used to calculate the hash of nodes.
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/CRC16.php b/plugins/cache-redis/Predis/Cluster/Hash/CRC16.php
similarity index 95%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/CRC16.php
rename to plugins/cache-redis/Predis/Cluster/Hash/CRC16.php
index 3add0cef2..4b21d5d21 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/CRC16.php
+++ b/plugins/cache-redis/Predis/Cluster/Hash/CRC16.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,12 +14,10 @@ namespace Predis\Cluster\Hash;
 
 /**
  * Hash generator implementing the CRC-CCITT-16 algorithm used by redis-cluster.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class CRC16 implements HashGeneratorInterface
 {
-    private static $CCITT_16 = array(
+    private static $CCITT_16 = [
         0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
         0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
         0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
@@ -51,7 +50,7 @@ class CRC16 implements HashGeneratorInterface
         0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
         0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
         0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0,
-    );
+    ];
 
     /**
      * {@inheritdoc}
@@ -61,6 +60,8 @@ class CRC16 implements HashGeneratorInterface
         // CRC-CCITT-16 algorithm
         $crc = 0;
         $CCITT_16 = self::$CCITT_16;
+
+        $value = (string) $value;
         $strlen = strlen($value);
 
         for ($i = 0; $i < $strlen; ++$i) {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/HashGeneratorInterface.php b/plugins/cache-redis/Predis/Cluster/Hash/HashGeneratorInterface.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/HashGeneratorInterface.php
rename to plugins/cache-redis/Predis/Cluster/Hash/HashGeneratorInterface.php
index 271b9e720..c835c0e66 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/Hash/HashGeneratorInterface.php
+++ b/plugins/cache-redis/Predis/Cluster/Hash/HashGeneratorInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis\Cluster\Hash;
 /**
  * An hash generator implements the logic used to calculate the hash of a key to
  * distribute operations among Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface HashGeneratorInterface
 {
diff --git a/plugins/cache-redis/Predis/Cluster/Hash/PhpiredisCRC16.php b/plugins/cache-redis/Predis/Cluster/Hash/PhpiredisCRC16.php
new file mode 100644
index 000000000..04f58a0ec
--- /dev/null
+++ b/plugins/cache-redis/Predis/Cluster/Hash/PhpiredisCRC16.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Cluster\Hash;
+
+use Predis\NotSupportedException;
+
+/**
+ * Hash generator implementing the CRC-CCITT-16 algorithm used by redis-cluster.
+ *
+ * @deprecated 2.1.2
+ */
+class PhpiredisCRC16 implements HashGeneratorInterface
+{
+    public function __construct()
+    {
+        if (!function_exists('phpiredis_utils_crc16')) {
+            // @codeCoverageIgnoreStart
+            throw new NotSupportedException(
+                'This hash generator requires a compatible version of ext-phpiredis'
+            );
+            // @codeCoverageIgnoreEnd
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function hash($value)
+    {
+        return phpiredis_utils_crc16($value);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/PredisStrategy.php b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/PredisStrategy.php
rename to plugins/cache-redis/Predis/Cluster/PredisStrategy.php
index 206684279..574b86f9e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/PredisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/PredisStrategy.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,8 +17,6 @@ use Predis\Cluster\Distributor\HashRing;
 
 /**
  * Default cluster strategy used by Predis to handle client-side sharding.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class PredisStrategy extends ClusterStrategy
 {
@@ -40,9 +39,8 @@ class PredisStrategy extends ClusterStrategy
     {
         $key = $this->extractKeyTag($key);
         $hash = $this->distributor->hash($key);
-        $slot = $this->distributor->getSlot($hash);
 
-        return $slot;
+        return $this->distributor->getSlot($hash);
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/RedisStrategy.php b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
similarity index 76%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/RedisStrategy.php
rename to plugins/cache-redis/Predis/Cluster/RedisStrategy.php
index df0bdb49b..8ae5c0f5e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/RedisStrategy.php
+++ b/plugins/cache-redis/Predis/Cluster/RedisStrategy.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,8 +19,6 @@ use Predis\NotSupportedException;
 /**
  * Default class used by Predis to calculate hashes out of keys of
  * commands supported by redis-cluster.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class RedisStrategy extends ClusterStrategy
 {
@@ -41,9 +40,8 @@ class RedisStrategy extends ClusterStrategy
     public function getSlotByKey($key)
     {
         $key = $this->extractKeyTag($key);
-        $slot = $this->hashGenerator->hash($key) & 0x3FFF;
 
-        return $slot;
+        return $this->hashGenerator->hash($key) & 0x3FFF;
     }
 
     /**
@@ -51,8 +49,7 @@ class RedisStrategy extends ClusterStrategy
      */
     public function getDistributor()
     {
-        throw new NotSupportedException(
-            'This cluster strategy does not provide an external distributor'
-        );
+        $class = get_class($this);
+        throw new NotSupportedException("$class does not provide an external distributor");
     }
 }
diff --git a/plugins/cache-redis/Predis/Cluster/SlotMap.php b/plugins/cache-redis/Predis/Cluster/SlotMap.php
new file mode 100644
index 000000000..1af63077a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Cluster/SlotMap.php
@@ -0,0 +1,209 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Cluster;
+
+use ArrayAccess;
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use OutOfBoundsException;
+use Predis\Connection\NodeConnectionInterface;
+use ReturnTypeWillChange;
+use Traversable;
+
+/**
+ * Slot map for redis-cluster.
+ */
+class SlotMap implements ArrayAccess, IteratorAggregate, Countable
+{
+    private $slots = [];
+
+    /**
+     * Checks if the given slot is valid.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return bool
+     */
+    public static function isValid($slot)
+    {
+        return $slot >= 0x0000 && $slot <= 0x3FFF;
+    }
+
+    /**
+     * Checks if the given slot range is valid.
+     *
+     * @param int $first Initial slot of the range.
+     * @param int $last  Last slot of the range.
+     *
+     * @return bool
+     */
+    public static function isValidRange($first, $last)
+    {
+        return $first >= 0x0000 && $first <= 0x3FFF && $last >= 0x0000 && $last <= 0x3FFF && $first <= $last;
+    }
+
+    /**
+     * Resets the slot map.
+     */
+    public function reset()
+    {
+        $this->slots = [];
+    }
+
+    /**
+     * Checks if the slot map is empty.
+     *
+     * @return bool
+     */
+    public function isEmpty()
+    {
+        return empty($this->slots);
+    }
+
+    /**
+     * Returns the current slot map as a dictionary of $slot => $node.
+     *
+     * The order of the slots in the dictionary is not guaranteed.
+     *
+     * @return array
+     */
+    public function toArray()
+    {
+        return $this->slots;
+    }
+
+    /**
+     * Returns the list of unique nodes in the slot map.
+     *
+     * @return array
+     */
+    public function getNodes()
+    {
+        return array_keys(array_flip($this->slots));
+    }
+
+    /**
+     * Assigns the specified slot range to a node.
+     *
+     * @param int                            $first      Initial slot of the range.
+     * @param int                            $last       Last slot of the range.
+     * @param NodeConnectionInterface|string $connection ID or connection instance.
+     *
+     * @throws OutOfBoundsException
+     */
+    public function setSlots($first, $last, $connection)
+    {
+        if (!static::isValidRange($first, $last)) {
+            throw new OutOfBoundsException("Invalid slot range $first-$last for `$connection`");
+        }
+
+        $this->slots += array_fill($first, $last - $first + 1, (string) $connection);
+    }
+
+    /**
+     * Returns the specified slot range.
+     *
+     * @param int $first Initial slot of the range.
+     * @param int $last  Last slot of the range.
+     *
+     * @return array
+     */
+    public function getSlots($first, $last)
+    {
+        if (!static::isValidRange($first, $last)) {
+            throw new OutOfBoundsException("Invalid slot range $first-$last");
+        }
+
+        return array_intersect_key($this->slots, array_fill($first, $last - $first + 1, null));
+    }
+
+    /**
+     * Checks if the specified slot is assigned.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return bool
+     */
+    #[ReturnTypeWillChange]
+    public function offsetExists($slot)
+    {
+        return isset($this->slots[$slot]);
+    }
+
+    /**
+     * Returns the node assigned to the specified slot.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return string|null
+     */
+    #[ReturnTypeWillChange]
+    public function offsetGet($slot)
+    {
+        return $this->slots[$slot] ?? null;
+    }
+
+    /**
+     * Assigns the specified slot to a node.
+     *
+     * @param int                            $slot       Slot index.
+     * @param NodeConnectionInterface|string $connection ID or connection instance.
+     *
+     * @return void
+     */
+    #[ReturnTypeWillChange]
+    public function offsetSet($slot, $connection)
+    {
+        if (!static::isValid($slot)) {
+            throw new OutOfBoundsException("Invalid slot $slot for `$connection`");
+        }
+
+        $this->slots[(int) $slot] = (string) $connection;
+    }
+
+    /**
+     * Returns the node assigned to the specified slot.
+     *
+     * @param int $slot Slot index.
+     *
+     * @return void
+     */
+    #[ReturnTypeWillChange]
+    public function offsetUnset($slot)
+    {
+        unset($this->slots[$slot]);
+    }
+
+    /**
+     * Returns the current number of assigned slots.
+     *
+     * @return int
+     */
+    #[ReturnTypeWillChange]
+    public function count()
+    {
+        return count($this->slots);
+    }
+
+    /**
+     * Returns an iterator over the slot map.
+     *
+     * @return Traversable<int, string>
+     */
+    #[ReturnTypeWillChange]
+    public function getIterator()
+    {
+        return new ArrayIterator($this->slots);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/StrategyInterface.php b/plugins/cache-redis/Predis/Cluster/StrategyInterface.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Cluster/StrategyInterface.php
rename to plugins/cache-redis/Predis/Cluster/StrategyInterface.php
index cdf7d09fa..83801ae6f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Cluster/StrategyInterface.php
+++ b/plugins/cache-redis/Predis/Cluster/StrategyInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,8 +20,6 @@ use Predis\Command\CommandInterface;
  * keys extracted from supported commands.
  *
  * This is mostly useful to support clustering via client-side sharding.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface StrategyInterface
 {
@@ -30,7 +29,7 @@ interface StrategyInterface
      *
      * @param CommandInterface $command Command instance.
      *
-     * @return int
+     * @return int|null
      */
     public function getSlot(CommandInterface $command);
 
@@ -40,7 +39,7 @@ interface StrategyInterface
      *
      * @param string $key Key string.
      *
-     * @return int
+     * @return int|null
      */
     public function getSlotByKey($key);
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/CursorBasedIterator.php b/plugins/cache-redis/Predis/Collection/Iterator/CursorBasedIterator.php
similarity index 83%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/CursorBasedIterator.php
rename to plugins/cache-redis/Predis/Collection/Iterator/CursorBasedIterator.php
index 922883f05..946bbc3a0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/CursorBasedIterator.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/CursorBasedIterator.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,8 +12,10 @@
 
 namespace Predis\Collection\Iterator;
 
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
+use ReturnTypeWillChange;
 
 /**
  * Provides the base implementation for a fully-rewindable PHP iterator that can
@@ -24,10 +27,8 @@ use Predis\NotSupportedException;
  * can change several times during the iteration process.
  *
  * @see http://redis.io/commands/scan
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class CursorBasedIterator implements \Iterator
+abstract class CursorBasedIterator implements Iterator
 {
     protected $client;
     protected $match;
@@ -65,8 +66,8 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getProfile()->supportsCommand($commandID)) {
-            throw new NotSupportedException("The current profile does not support '$commandID'.");
+        if (!$client->getCommandFactory()->supports($commandID)) {
+            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
         }
     }
 
@@ -77,7 +78,7 @@ abstract class CursorBasedIterator implements \Iterator
     {
         $this->valid = true;
         $this->fetchmore = true;
-        $this->elements = array();
+        $this->elements = [];
         $this->cursor = 0;
         $this->position = -1;
         $this->current = null;
@@ -90,9 +91,9 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function getScanOptions()
     {
-        $options = array();
+        $options = [];
 
-        if (strlen($this->match) > 0) {
+        if (strlen(strval($this->match)) > 0) {
             $options['MATCH'] = $this->match;
         }
 
@@ -117,7 +118,7 @@ abstract class CursorBasedIterator implements \Iterator
      */
     protected function fetch()
     {
-        list($cursor, $elements) = $this->executeCommand();
+        [$cursor, $elements] = $this->executeCommand();
 
         if (!$cursor) {
             $this->fetchmore = false;
@@ -137,8 +138,9 @@ abstract class CursorBasedIterator implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -146,27 +148,30 @@ abstract class CursorBasedIterator implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
-        tryFetch: {
+        tryFetch:
             if (!$this->elements && $this->fetchmore) {
                 $this->fetch();
             }
@@ -178,12 +183,12 @@ abstract class CursorBasedIterator implements \Iterator
             } else {
                 $this->valid = false;
             }
-        }
     }
 
     /**
-     * {@inheritdoc}
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/HashKey.php b/plugins/cache-redis/Predis/Collection/Iterator/HashKey.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/HashKey.php
rename to plugins/cache-redis/Predis/Collection/Iterator/HashKey.php
index aa8aeaf02..91b7d27ff 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/HashKey.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/HashKey.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,7 @@ use Predis\ClientInterface;
  * Abstracts the iteration of fields and values of an hash by leveraging the
  * HSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @link http://redis.io/commands/scan
+ * @see http://redis.io/commands/scan
  */
 class HashKey extends CursorBasedIterator
 {
@@ -51,6 +50,8 @@ class HashKey extends CursorBasedIterator
     protected function extractNext()
     {
         $this->position = key($this->elements);
-        $this->current = array_shift($this->elements);
+        $this->current = current($this->elements);
+
+        unset($this->elements[$this->position]);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/Keyspace.php b/plugins/cache-redis/Predis/Collection/Iterator/Keyspace.php
similarity index 85%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/Keyspace.php
rename to plugins/cache-redis/Predis/Collection/Iterator/Keyspace.php
index 5d985b9bc..b5fa022aa 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/Keyspace.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/Keyspace.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,7 @@ use Predis\ClientInterface;
  * Abstracts the iteration of the keyspace on a Redis instance by leveraging the
  * SCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @link http://redis.io/commands/scan
+ * @see http://redis.io/commands/scan
  */
 class Keyspace extends CursorBasedIterator
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/ListKey.php b/plugins/cache-redis/Predis/Collection/Iterator/ListKey.php
similarity index 82%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/ListKey.php
rename to plugins/cache-redis/Predis/Collection/Iterator/ListKey.php
index 7a6eb479e..79ab3aa19 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/ListKey.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/ListKey.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,8 +12,11 @@
 
 namespace Predis\Collection\Iterator;
 
+use InvalidArgumentException;
+use Iterator;
 use Predis\ClientInterface;
 use Predis\NotSupportedException;
+use ReturnTypeWillChange;
 
 /**
  * Abstracts the iteration of items stored in a list by leveraging the LRANGE
@@ -24,11 +28,9 @@ use Predis\NotSupportedException;
  * guarantees on the returned elements because the collection can change several
  * times (trimmed, deleted, overwritten) during the iteration process.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @link http://redis.io/commands/lrange
+ * @see http://redis.io/commands/lrange
  */
-class ListKey implements \Iterator
+class ListKey implements Iterator
 {
     protected $client;
     protected $count;
@@ -45,14 +47,14 @@ class ListKey implements \Iterator
      * @param string          $key    Redis list key.
      * @param int             $count  Number of items retrieved on each fetch operation.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct(ClientInterface $client, $key, $count = 10)
     {
         $this->requiredCommand($client, 'LRANGE');
 
         if ((false === $count = filter_var($count, FILTER_VALIDATE_INT)) || $count < 0) {
-            throw new \InvalidArgumentException('The $count argument must be a positive integer.');
+            throw new InvalidArgumentException('The $count argument must be a positive integer.');
         }
 
         $this->client = $client;
@@ -73,8 +75,8 @@ class ListKey implements \Iterator
      */
     protected function requiredCommand(ClientInterface $client, $commandID)
     {
-        if (!$client->getProfile()->supportsCommand($commandID)) {
-            throw new NotSupportedException("The current profile does not support '$commandID'.");
+        if (!$client->getCommandFactory()->supports($commandID)) {
+            throw new NotSupportedException("'$commandID' is not supported by the current command factory.");
         }
     }
 
@@ -85,7 +87,7 @@ class ListKey implements \Iterator
     {
         $this->valid = true;
         $this->fetchmore = true;
-        $this->elements = array();
+        $this->elements = [];
         $this->position = -1;
         $this->current = null;
     }
@@ -126,8 +128,9 @@ class ListKey implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         $this->reset();
@@ -135,24 +138,27 @@ class ListKey implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         if (!$this->elements && $this->fetchmore) {
@@ -167,8 +173,9 @@ class ListKey implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SetKey.php b/plugins/cache-redis/Predis/Collection/Iterator/SetKey.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SetKey.php
rename to plugins/cache-redis/Predis/Collection/Iterator/SetKey.php
index bf2543975..74f982346 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SetKey.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/SetKey.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,7 @@ use Predis\ClientInterface;
  * Abstracts the iteration of members stored in a set by leveraging the SSCAN
  * command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @link http://redis.io/commands/scan
+ * @see http://redis.io/commands/scan
  */
 class SetKey extends CursorBasedIterator
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SortedSetKey.php b/plugins/cache-redis/Predis/Collection/Iterator/SortedSetKey.php
similarity index 76%
rename from snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SortedSetKey.php
rename to plugins/cache-redis/Predis/Collection/Iterator/SortedSetKey.php
index e2f178922..abee8c252 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Collection/Iterator/SortedSetKey.php
+++ b/plugins/cache-redis/Predis/Collection/Iterator/SortedSetKey.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,7 @@ use Predis\ClientInterface;
  * Abstracts the iteration of members stored in a sorted set by leveraging the
  * ZSCAN command (Redis >= 2.8) wrapped in a fully-rewindable PHP iterator.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @link http://redis.io/commands/scan
+ * @see http://redis.io/commands/scan
  */
 class SortedSetKey extends CursorBasedIterator
 {
@@ -50,11 +49,9 @@ class SortedSetKey extends CursorBasedIterator
      */
     protected function extractNext()
     {
-        if ($kv = each($this->elements)) {
-            $this->position = $kv[0];
-            $this->current = $kv[1];
+        $this->position = key($this->elements);
+        $this->current = current($this->elements);
 
-            unset($this->elements[$this->position]);
-        }
+        unset($this->elements[$this->position]);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Argument/ArrayableArgument.php b/plugins/cache-redis/Predis/Command/Argument/ArrayableArgument.php
new file mode 100644
index 000000000..11073c054
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/ArrayableArgument.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument;
+
+/**
+ * Allows to use object-oriented approach to handle complex conditional arguments.
+ */
+interface ArrayableArgument
+{
+    /**
+     * Get the instance as an array.
+     *
+     * @return array
+     */
+    public function toArray(): array;
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/AbstractBy.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/AbstractBy.php
new file mode 100644
index 000000000..970833f34
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/AbstractBy.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+use UnexpectedValueException;
+
+abstract class AbstractBy implements ByInterface
+{
+    /**
+     * @var string[]
+     */
+    private static $unitEnum = ['m', 'km', 'ft', 'mi'];
+
+    /**
+     * @var string
+     */
+    protected $unit;
+
+    /**
+     * {@inheritDoc}
+     */
+    abstract public function toArray(): array;
+
+    /**
+     * @param  string $unit
+     * @return void
+     */
+    protected function setUnit(string $unit): void
+    {
+        if (!in_array($unit, self::$unitEnum, true)) {
+            throw new UnexpectedValueException('Wrong value given for unit');
+        }
+
+        $this->unit = $unit;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByBox.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByBox.php
new file mode 100644
index 000000000..7dd9f23b7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByBox.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+class ByBox extends AbstractBy
+{
+    private const KEYWORD = 'BYBOX';
+
+    /**
+     * @var int
+     */
+    private $width;
+
+    /**
+     * @var int
+     */
+    private $height;
+
+    public function __construct(int $width, int $height, string $unit)
+    {
+        $this->width = $width;
+        $this->height = $height;
+        $this->setUnit($unit);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [self::KEYWORD, $this->width, $this->height, $this->unit];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByInterface.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByInterface.php
new file mode 100644
index 000000000..767886cef
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+interface ByInterface extends ArrayableArgument
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByRadius.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByRadius.php
new file mode 100644
index 000000000..e2a4b49f7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/ByRadius.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+class ByRadius extends AbstractBy
+{
+    private const KEYWORD = 'BYRADIUS';
+
+    /**
+     * @var int
+     */
+    private $radius;
+
+    public function __construct(int $radius, string $unit)
+    {
+        $this->radius = $radius;
+        $this->setUnit($unit);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [self::KEYWORD, $this->radius, $this->unit];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromInterface.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromInterface.php
new file mode 100644
index 000000000..44700bda4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+interface FromInterface extends ArrayableArgument
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromLonLat.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromLonLat.php
new file mode 100644
index 000000000..f69be0f8c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromLonLat.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+class FromLonLat implements FromInterface
+{
+    private const KEYWORD = 'FROMLONLAT';
+
+    /**
+     * @var float
+     */
+    private $longitude;
+
+    /**
+     * @var float
+     */
+    private $latitude;
+
+    public function __construct(float $longitude, float $latitude)
+    {
+        $this->longitude = $longitude;
+        $this->latitude = $latitude;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [self::KEYWORD, $this->longitude, $this->latitude];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromMember.php b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromMember.php
new file mode 100644
index 000000000..9e24b2ba0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Geospatial/FromMember.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Geospatial;
+
+class FromMember implements FromInterface
+{
+    private const KEYWORD = 'FROMMEMBER';
+
+    /**
+     * @var string
+     */
+    private $member;
+
+    public function __construct(string $member)
+    {
+        $this->member = $member;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [self::KEYWORD, $this->member];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/AggregateArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/AggregateArguments.php
new file mode 100644
index 000000000..950967070
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/AggregateArguments.php
@@ -0,0 +1,161 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class AggregateArguments extends CommonArguments
+{
+    /**
+     * @var string[]
+     */
+    private $sortingEnum = [
+        'asc' => 'ASC',
+        'desc' => 'DESC',
+    ];
+
+    /**
+     * Loads document attributes from the source document.
+     *
+     * @param  string ...$fields Could be just '*' to load all fields
+     * @return $this
+     */
+    public function load(string ...$fields): self
+    {
+        $arguments = func_get_args();
+
+        $this->arguments[] = 'LOAD';
+
+        if ($arguments[0] === '*') {
+            $this->arguments[] = '*';
+
+            return $this;
+        }
+
+        $this->arguments[] = count($arguments);
+        $this->arguments = array_merge($this->arguments, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Loads document attributes from the source document.
+     *
+     * @param  string ...$properties
+     * @return $this
+     */
+    public function groupBy(string ...$properties): self
+    {
+        $arguments = func_get_args();
+
+        array_push($this->arguments, 'GROUPBY', count($arguments));
+        $this->arguments = array_merge($this->arguments, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Groups the results in the pipeline based on one or more properties.
+     *
+     * If you want to add alias property to your argument just add "true" value in arguments enumeration,
+     * next value will be considered as alias to previous one.
+     *
+     * Example: 'argument', true, 'name' => 'argument' AS 'name'
+     *
+     * @param  string      $function
+     * @param  string|bool ...$argument
+     * @return $this
+     */
+    public function reduce(string $function, ...$argument): self
+    {
+        $arguments = func_get_args();
+        $functionValue = array_shift($arguments);
+        $argumentsCounter = 0;
+
+        for ($i = 0, $iMax = count($arguments); $i < $iMax; $i++) {
+            if (true === $arguments[$i]) {
+                $arguments[$i] = 'AS';
+                $i++;
+                continue;
+            }
+
+            $argumentsCounter++;
+        }
+
+        array_push($this->arguments, 'REDUCE', $functionValue);
+        $this->arguments = array_merge($this->arguments, [$argumentsCounter], $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Sorts the pipeline up until the point of SORTBY, using a list of properties.
+     *
+     * @param  int    $max
+     * @param  string ...$properties Enumeration of properties, including sorting direction (ASC, DESC)
+     * @return $this
+     */
+    public function sortBy(int $max = 0, ...$properties): self
+    {
+        $arguments = func_get_args();
+        $maxValue = array_shift($arguments);
+
+        $this->arguments[] = 'SORTBY';
+        $this->arguments = array_merge($this->arguments, [count($arguments)], $arguments);
+
+        if ($maxValue !== 0) {
+            array_push($this->arguments, 'MAX', $maxValue);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Applies a 1-to-1 transformation on one or more properties and either stores the result
+     * as a new property down the pipeline or replaces any property using this transformation.
+     *
+     * @param  string $expression
+     * @param  string $as
+     * @return $this
+     */
+    public function apply(string $expression, string $as = ''): self
+    {
+        array_push($this->arguments, 'APPLY', $expression);
+
+        if ($as !== '') {
+            array_push($this->arguments, 'AS', $as);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Scan part of the results with a quicker alternative than LIMIT.
+     *
+     * @param  int   $readSize
+     * @param  int   $idleTime
+     * @return $this
+     */
+    public function withCursor(int $readSize = 0, int $idleTime = 0): self
+    {
+        $this->arguments[] = 'WITHCURSOR';
+
+        if ($readSize !== 0) {
+            array_push($this->arguments, 'COUNT', $readSize);
+        }
+
+        if ($idleTime !== 0) {
+            array_push($this->arguments, 'MAXIDLE', $idleTime);
+        }
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/AlterArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/AlterArguments.php
new file mode 100644
index 000000000..5acd2fe1e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/AlterArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class AlterArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/CommonArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/CommonArguments.php
new file mode 100644
index 000000000..96268d4f7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/CommonArguments.php
@@ -0,0 +1,182 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class CommonArguments implements ArrayableArgument
+{
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Adds default language for documents within an index.
+     *
+     * @param  string $defaultLanguage
+     * @return $this
+     */
+    public function language(string $defaultLanguage = 'english'): self
+    {
+        $this->arguments[] = 'LANGUAGE';
+        $this->arguments[] = $defaultLanguage;
+
+        return $this;
+    }
+
+    /**
+     * Selects the dialect version under which to execute the query.
+     * If not specified, the query will execute under the default dialect version
+     * set during module initial loading or via FT.CONFIG SET command.
+     *
+     * @param  string $dialect
+     * @return $this
+     */
+    public function dialect(string $dialect): self
+    {
+        $this->arguments[] = 'DIALECT';
+        $this->arguments[] = $dialect;
+
+        return $this;
+    }
+
+    /**
+     * If set, does not scan and index.
+     *
+     * @return $this
+     */
+    public function skipInitialScan(): self
+    {
+        $this->arguments[] = 'SKIPINITIALSCAN';
+
+        return $this;
+    }
+
+    /**
+     * Adds an arbitrary, binary safe payload that is exposed to custom scoring functions.
+     *
+     * @param  string $payload
+     * @return $this
+     */
+    public function payload(string $payload): self
+    {
+        $this->arguments[] = 'PAYLOAD';
+        $this->arguments[] = $payload;
+
+        return $this;
+    }
+
+    /**
+     * Also returns the relative internal score of each document.
+     *
+     * @return $this
+     */
+    public function withScores(): self
+    {
+        $this->arguments[] = 'WITHSCORES';
+
+        return $this;
+    }
+
+    /**
+     * Retrieves optional document payloads.
+     *
+     * @return $this
+     */
+    public function withPayloads(): self
+    {
+        $this->arguments[] = 'WITHPAYLOADS';
+
+        return $this;
+    }
+
+    /**
+     * Does not try to use stemming for query expansion but searches the query terms verbatim.
+     *
+     * @return $this
+     */
+    public function verbatim(): self
+    {
+        $this->arguments[] = 'VERBATIM';
+
+        return $this;
+    }
+
+    /**
+     * Overrides the timeout parameter of the module.
+     *
+     * @param  int   $timeout
+     * @return $this
+     */
+    public function timeout(int $timeout): self
+    {
+        $this->arguments[] = 'TIMEOUT';
+        $this->arguments[] = $timeout;
+
+        return $this;
+    }
+
+    /**
+     * Adds an arbitrary, binary safe payload that is exposed to custom scoring functions.
+     *
+     * @param  int   $offset
+     * @param  int   $num
+     * @return $this
+     */
+    public function limit(int $offset, int $num): self
+    {
+        array_push($this->arguments, 'LIMIT', $offset, $num);
+
+        return $this;
+    }
+
+    /**
+     * Adds filter expression into index.
+     *
+     * @param  string $filter
+     * @return $this
+     */
+    public function filter(string $filter): self
+    {
+        $this->arguments[] = 'FILTER';
+        $this->arguments[] = $filter;
+
+        return $this;
+    }
+
+    /**
+     * Defines one or more value parameters. Each parameter has a name and a value.
+     *
+     * Example: ['name1', 'value1', 'name2', 'value2'...]
+     *
+     * @param  array $nameValuesDictionary
+     * @return $this
+     */
+    public function params(array $nameValuesDictionary): self
+    {
+        $this->arguments[] = 'PARAMS';
+        $this->arguments[] = count($nameValuesDictionary);
+        $this->arguments = array_merge($this->arguments, $nameValuesDictionary);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/CreateArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/CreateArguments.php
new file mode 100644
index 000000000..b8e0176ba
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/CreateArguments.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use InvalidArgumentException;
+
+class CreateArguments extends CommonArguments
+{
+    /**
+     * @var string[]
+     */
+    private $supportedDataTypesEnum = [
+        'hash' => 'HASH',
+        'json' => 'JSON',
+    ];
+
+    /**
+     * Specify data type for given index. To index JSON you must have the RedisJSON module to be installed.
+     *
+     * @param  string $modifier
+     * @return $this
+     */
+    public function on(string $modifier = 'HASH'): self
+    {
+        if (in_array(strtoupper($modifier), $this->supportedDataTypesEnum)) {
+            $this->arguments[] = 'ON';
+            $this->arguments[] = $this->supportedDataTypesEnum[strtolower($modifier)];
+
+            return $this;
+        }
+
+        $enumValues = implode(', ', array_values($this->supportedDataTypesEnum));
+        throw new InvalidArgumentException("Wrong modifier value given. Currently supports: {$enumValues}");
+    }
+
+    /**
+     * Adds one or more prefixes into index.
+     *
+     * @param  array $prefixes
+     * @return $this
+     */
+    public function prefix(array $prefixes): self
+    {
+        $this->arguments[] = 'PREFIX';
+        $this->arguments[] = count($prefixes);
+        $this->arguments = array_merge($this->arguments, $prefixes);
+
+        return $this;
+    }
+
+    /**
+     * Document attribute set as document language.
+     *
+     * @param  string $languageAttribute
+     * @return $this
+     */
+    public function languageField(string $languageAttribute): self
+    {
+        $this->arguments[] = 'LANGUAGE_FIELD';
+        $this->arguments[] = $languageAttribute;
+
+        return $this;
+    }
+
+    /**
+     * Default score for documents in the index.
+     *
+     * @param  float $defaultScore
+     * @return $this
+     */
+    public function score(float $defaultScore = 1.0): self
+    {
+        $this->arguments[] = 'SCORE';
+        $this->arguments[] = $defaultScore;
+
+        return $this;
+    }
+
+    /**
+     * Document attribute that used as the document rank based on the user ranking.
+     *
+     * @param  string $scoreAttribute
+     * @return $this
+     */
+    public function scoreField(string $scoreAttribute): self
+    {
+        $this->arguments[] = 'SCORE_FIELD';
+        $this->arguments[] = $scoreAttribute;
+
+        return $this;
+    }
+
+    /**
+     * Forces RediSearch to encode indexes as if there were more than 32 text attributes.
+     *
+     * @return $this
+     */
+    public function maxTextFields(): self
+    {
+        $this->arguments[] = 'MAXTEXTFIELDS';
+
+        return $this;
+    }
+
+    /**
+     * Does not store term offsets for documents.
+     *
+     * @return $this
+     */
+    public function noOffsets(): self
+    {
+        $this->arguments[] = 'NOOFFSETS';
+
+        return $this;
+    }
+
+    /**
+     * Creates a lightweight temporary index that expires after a specified period of inactivity, in seconds.
+     *
+     * @param  int   $seconds
+     * @return $this
+     */
+    public function temporary(int $seconds): self
+    {
+        $this->arguments[] = 'TEMPORARY';
+        $this->arguments[] = $seconds;
+
+        return $this;
+    }
+
+    /**
+     * Conserves storage space and memory by disabling highlighting support.
+     *
+     * @return $this
+     */
+    public function noHl(): self
+    {
+        $this->arguments[] = 'NOHL';
+
+        return $this;
+    }
+
+    /**
+     * Does not store attribute bits for each term.
+     *
+     * @return $this
+     */
+    public function noFields(): self
+    {
+        $this->arguments[] = 'NOFIELDS';
+
+        return $this;
+    }
+
+    /**
+     * Avoids saving the term frequencies in the index.
+     *
+     * @return $this
+     */
+    public function noFreqs(): self
+    {
+        $this->arguments[] = 'NOFREQS';
+
+        return $this;
+    }
+
+    /**
+     * Sets the index with a custom stopword list, to be ignored during indexing and search time.
+     *
+     * @param  array $stopWords
+     * @return $this
+     */
+    public function stopWords(array $stopWords): self
+    {
+        $this->arguments[] = 'STOPWORDS';
+        $this->arguments[] = count($stopWords);
+        $this->arguments = array_merge($this->arguments, $stopWords);
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/CursorArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/CursorArguments.php
new file mode 100644
index 000000000..a8bd6b56f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/CursorArguments.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class CursorArguments implements ArrayableArgument
+{
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Is number of results to read. This parameter overrides COUNT specified in FT.AGGREGATE.
+     *
+     * @param  int   $readSize
+     * @return $this
+     */
+    public function count(int $readSize): self
+    {
+        array_push($this->arguments, 'COUNT', $readSize);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/DropArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/DropArguments.php
new file mode 100644
index 000000000..0c6313201
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/DropArguments.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class DropArguments implements ArrayableArgument
+{
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Drop operation that, if set, deletes the actual document hashes.
+     *
+     * @return $this
+     */
+    public function dd(): self
+    {
+        $this->arguments[] = 'DD';
+
+        return $this;
+    }
+
+    /**
+     * @return array
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/ExplainArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/ExplainArguments.php
new file mode 100644
index 000000000..b4bd235b9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/ExplainArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class ExplainArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/ProfileArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/ProfileArguments.php
new file mode 100644
index 000000000..4c8a8c4f2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/ProfileArguments.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class ProfileArguments implements ArrayableArgument
+{
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Adds search context.
+     *
+     * @return $this
+     */
+    public function search(): self
+    {
+        $this->arguments[] = 'SEARCH';
+
+        return $this;
+    }
+
+    /**
+     * Adds aggregate context.
+     *
+     * @return $this
+     */
+    public function aggregate(): self
+    {
+        $this->arguments[] = 'AGGREGATE';
+
+        return $this;
+    }
+
+    /**
+     * Removes details of reader iterator.
+     *
+     * @return $this
+     */
+    public function limited(): self
+    {
+        $this->arguments[] = 'LIMITED';
+
+        return $this;
+    }
+
+    /**
+     * Is query string, as if sent to FT.SEARCH.
+     *
+     * @param  string $query
+     * @return $this
+     */
+    public function query(string $query): self
+    {
+        $this->arguments[] = 'QUERY';
+        $this->arguments[] = $query;
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/AbstractField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/AbstractField.php
new file mode 100644
index 000000000..eb49f0995
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/AbstractField.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+abstract class AbstractField implements FieldInterface
+{
+    public const SORTABLE = true;
+    public const NOT_SORTABLE = false;
+    public const SORTABLE_UNF = 'UNF';
+
+    /**
+     * @var array
+     */
+    protected $fieldArguments = [];
+
+    /**
+     * @param  string      $fieldType
+     * @param  string      $identifier
+     * @param  string      $alias
+     * @param  bool|string $sortable
+     * @param  bool        $noIndex
+     * @return void
+     */
+    protected function setCommonOptions(
+        string $fieldType,
+        string $identifier,
+        string $alias = '',
+        $sortable = self::NOT_SORTABLE,
+        bool $noIndex = false
+    ): void {
+        $this->fieldArguments[] = $identifier;
+
+        if ($alias !== '') {
+            $this->fieldArguments[] = 'AS';
+            $this->fieldArguments[] = $alias;
+        }
+
+        $this->fieldArguments[] = $fieldType;
+
+        if ($sortable === self::SORTABLE) {
+            $this->fieldArguments[] = 'SORTABLE';
+        } elseif ($sortable === self::SORTABLE_UNF) {
+            $this->fieldArguments[] = 'SORTABLE';
+            $this->fieldArguments[] = 'UNF';
+        }
+
+        if ($noIndex) {
+            $this->fieldArguments[] = 'NOINDEX';
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->fieldArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/FieldInterface.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/FieldInterface.php
new file mode 100644
index 000000000..80e57eba0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/FieldInterface.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+/**
+ * Represents field in search schema.
+ */
+interface FieldInterface extends ArrayableArgument
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/GeoField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/GeoField.php
new file mode 100644
index 000000000..23e7cc780
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/GeoField.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+class GeoField extends AbstractField
+{
+    /**
+     * @param string      $identifier
+     * @param string      $alias
+     * @param bool|string $sortable
+     * @param bool        $noIndex
+     */
+    public function __construct(
+        string $identifier,
+        string $alias = '',
+        $sortable = self::NOT_SORTABLE,
+        bool $noIndex = false
+    ) {
+        $this->setCommonOptions('GEO', $identifier, $alias, $sortable, $noIndex);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/NumericField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/NumericField.php
new file mode 100644
index 000000000..758b4e9c6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/NumericField.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+class NumericField extends AbstractField
+{
+    /**
+     * @param string      $identifier
+     * @param string      $alias
+     * @param bool|string $sortable
+     * @param bool        $noIndex
+     */
+    public function __construct(
+        string $identifier,
+        string $alias = '',
+        $sortable = self::NOT_SORTABLE,
+        bool $noIndex = false
+    ) {
+        $this->setCommonOptions('NUMERIC', $identifier, $alias, $sortable, $noIndex);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TagField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TagField.php
new file mode 100644
index 000000000..358b3090e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TagField.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+class TagField extends AbstractField
+{
+    /**
+     * @param string      $identifier
+     * @param string      $alias
+     * @param bool|string $sortable
+     * @param bool        $noIndex
+     * @param string      $separator
+     * @param bool        $caseSensitive
+     */
+    public function __construct(
+        string $identifier,
+        string $alias = '',
+        $sortable = self::NOT_SORTABLE,
+        bool $noIndex = false,
+        string $separator = ',',
+        bool $caseSensitive = false
+    ) {
+        $this->setCommonOptions('TAG', $identifier, $alias, $sortable, $noIndex);
+
+        if ($separator !== ',') {
+            $this->fieldArguments[] = 'SEPARATOR';
+            $this->fieldArguments[] = $separator;
+        }
+
+        if ($caseSensitive) {
+            $this->fieldArguments[] = 'CASESENSITIVE';
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TextField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TextField.php
new file mode 100644
index 000000000..d72c62383
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/TextField.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+class TextField extends AbstractField
+{
+    /**
+     * @param string      $identifier
+     * @param string      $alias
+     * @param bool|string $sortable
+     * @param bool        $noIndex
+     * @param bool        $noStem
+     * @param string      $phonetic
+     * @param int         $weight
+     * @param bool        $withSuffixTrie
+     */
+    public function __construct(
+        string $identifier,
+        string $alias = '',
+        $sortable = self::NOT_SORTABLE,
+        bool $noIndex = false,
+        bool $noStem = false,
+        string $phonetic = '',
+        int $weight = 1,
+        bool $withSuffixTrie = false
+    ) {
+        $this->setCommonOptions('TEXT', $identifier, $alias, $sortable, $noIndex);
+
+        if ($noStem) {
+            $this->fieldArguments[] = 'NOSTEM';
+        }
+
+        if ($phonetic !== '') {
+            $this->fieldArguments[] = 'PHONETIC';
+            $this->fieldArguments[] = $phonetic;
+        }
+
+        if ($weight !== 1) {
+            $this->fieldArguments[] = 'WEIGHT';
+            $this->fieldArguments[] = $weight;
+        }
+
+        if ($withSuffixTrie) {
+            $this->fieldArguments[] = 'WITHSUFFIXTRIE';
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/VectorField.php b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/VectorField.php
new file mode 100644
index 000000000..5228c2250
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SchemaFields/VectorField.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search\SchemaFields;
+
+class VectorField extends AbstractField
+{
+    /**
+     * @var array
+     */
+    protected $fieldArguments = [];
+
+    /**
+     * @param string $fieldName
+     * @param string $algorithm
+     * @param array  $attributeNameValueDictionary
+     * @param string $alias
+     */
+    public function __construct(
+        string $fieldName,
+        string $algorithm,
+        array $attributeNameValueDictionary,
+        string $alias = ''
+    ) {
+        $this->setCommonOptions('VECTOR', $fieldName, $alias);
+
+        array_push($this->fieldArguments, $algorithm, count($attributeNameValueDictionary));
+        $this->fieldArguments = array_merge($this->fieldArguments, $attributeNameValueDictionary);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->fieldArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SearchArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/SearchArguments.php
new file mode 100644
index 000000000..d1eb70580
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SearchArguments.php
@@ -0,0 +1,306 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use InvalidArgumentException;
+
+class SearchArguments extends CommonArguments
+{
+    /**
+     * @var string[]
+     */
+    private $sortingEnum = [
+        'asc' => 'ASC',
+        'desc' => 'DESC',
+    ];
+
+    /**
+     * Returns the document ids and not the content.
+     *
+     * @return $this
+     */
+    public function noContent(): self
+    {
+        $this->arguments[] = 'NOCONTENT';
+
+        return $this;
+    }
+
+    /**
+     * Returns the value of the sorting key, right after the id and score and/or payload, if requested.
+     *
+     * @return $this
+     */
+    public function withSortKeys(): self
+    {
+        $this->arguments[] = 'WITHSORTKEYS';
+
+        return $this;
+    }
+
+    /**
+     * Limits results to those having numeric values ranging between min and max,
+     * if numeric_attribute is defined as a numeric attribute in FT.CREATE.
+     * Min and max follow ZRANGE syntax, and can be -inf, +inf, and use( for exclusive ranges.
+     * Multiple numeric filters for different attributes are supported in one query.
+     *
+     * @param  array ...$filter Should contain: numeric_field, min and max. Example: ['numeric_field', 1, 10]
+     * @return $this
+     */
+    public function searchFilter(array ...$filter): self
+    {
+        $arguments = func_get_args();
+
+        foreach ($arguments as $argument) {
+            array_push($this->arguments, 'FILTER', ...$argument);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Filter the results to a given radius from lon and lat. Radius is given as a number and units.
+     *
+     * @param  array ...$filter Should contain: geo_field, lon, lat, radius, unit. Example: ['geo_field', 34.1231, 35.1231, 300, km]
+     * @return $this
+     */
+    public function geoFilter(array ...$filter): self
+    {
+        $arguments = func_get_args();
+
+        foreach ($arguments as $argument) {
+            array_push($this->arguments, 'GEOFILTER', ...$argument);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Limits the result to a given set of keys specified in the list.
+     *
+     * @param  array $keys
+     * @return $this
+     */
+    public function inKeys(array $keys): self
+    {
+        $this->arguments[] = 'INKEYS';
+        $this->arguments[] = count($keys);
+        $this->arguments = array_merge($this->arguments, $keys);
+
+        return $this;
+    }
+
+    /**
+     * Filters the results to those appearing only in specific attributes of the document, like title or URL.
+     *
+     * @param  array $fields
+     * @return $this
+     */
+    public function inFields(array $fields): self
+    {
+        $this->arguments[] = 'INFIELDS';
+        $this->arguments[] = count($fields);
+        $this->arguments = array_merge($this->arguments, $fields);
+
+        return $this;
+    }
+
+    /**
+     * Limits the attributes returned from the document.
+     * Num is the number of attributes following the keyword.
+     * If num is 0, it acts like NOCONTENT.
+     * Identifier is either an attribute name (for hashes and JSON) or a JSON Path expression (for JSON).
+     * Property is an optional name used in the result. If not provided, the identifier is used in the result.
+     *
+     * If you want to add alias property to your identifier just add "true" value in identifier enumeration,
+     * next value will be considered as alias to previous one.
+     *
+     * Example: 'identifier', true, 'property' => 'identifier' AS 'property'
+     *
+     * @param  int         $count
+     * @param  string|bool ...$identifier
+     * @return $this
+     */
+    public function addReturn(int $count, ...$identifier): self
+    {
+        $arguments = func_get_args();
+
+        $this->arguments[] = 'RETURN';
+
+        for ($i = 1, $iMax = count($arguments); $i < $iMax; $i++) {
+            if (true === $arguments[$i]) {
+                $arguments[$i] = 'AS';
+            }
+        }
+
+        $this->arguments = array_merge($this->arguments, $arguments);
+
+        return $this;
+    }
+
+    /**
+     * Returns only the sections of the attribute that contain the matched text.
+     *
+     * @param  array  $fields
+     * @param  int    $frags
+     * @param  int    $len
+     * @param  string $separator
+     * @return $this
+     */
+    public function summarize(array $fields = [], int $frags = 0, int $len = 0, string $separator = ''): self
+    {
+        $this->arguments[] = 'SUMMARIZE';
+
+        if (!empty($fields)) {
+            $this->arguments[] = 'FIELDS';
+            $this->arguments[] = count($fields);
+            $this->arguments = array_merge($this->arguments, $fields);
+        }
+
+        if ($frags !== 0) {
+            $this->arguments[] = 'FRAGS';
+            $this->arguments[] = $frags;
+        }
+
+        if ($len !== 0) {
+            $this->arguments[] = 'LEN';
+            $this->arguments[] = $len;
+        }
+
+        if ($separator !== '') {
+            $this->arguments[] = 'SEPARATOR';
+            $this->arguments[] = $separator;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Formats occurrences of matched text.
+     *
+     * @param  array  $fields
+     * @param  string $openTag
+     * @param  string $closeTag
+     * @return $this
+     */
+    public function highlight(array $fields = [], string $openTag = '', string $closeTag = ''): self
+    {
+        $this->arguments[] = 'HIGHLIGHT';
+
+        if (!empty($fields)) {
+            $this->arguments[] = 'FIELDS';
+            $this->arguments[] = count($fields);
+            $this->arguments = array_merge($this->arguments, $fields);
+        }
+
+        if ($openTag !== '' && $closeTag !== '') {
+            array_push($this->arguments, 'TAGS', $openTag, $closeTag);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Allows a maximum of N intervening number of unmatched offsets between phrase terms.
+     * In other words, the slop for exact phrases is 0.
+     *
+     * @param  int   $slop
+     * @return $this
+     */
+    public function slop(int $slop): self
+    {
+        $this->arguments[] = 'SLOP';
+        $this->arguments[] = $slop;
+
+        return $this;
+    }
+
+    /**
+     * Puts the query terms in the same order in the document as in the query, regardless of the offsets between them.
+     * Typically used in conjunction with SLOP.
+     *
+     * @return $this
+     */
+    public function inOrder(): self
+    {
+        $this->arguments[] = 'INORDER';
+
+        return $this;
+    }
+
+    /**
+     * Uses a custom query expander instead of the stemmer.
+     *
+     * @param  string $expander
+     * @return $this
+     */
+    public function expander(string $expander): self
+    {
+        $this->arguments[] = 'EXPANDER';
+        $this->arguments[] = $expander;
+
+        return $this;
+    }
+
+    /**
+     * Uses a custom scoring function you define.
+     *
+     * @param  string $scorer
+     * @return $this
+     */
+    public function scorer(string $scorer): self
+    {
+        $this->arguments[] = 'SCORER';
+        $this->arguments[] = $scorer;
+
+        return $this;
+    }
+
+    /**
+     * Returns a textual description of how the scores were calculated.
+     * Using this options requires the WITHSCORES option.
+     *
+     * @return $this
+     */
+    public function explainScore(): self
+    {
+        $this->arguments[] = 'EXPLAINSCORE';
+
+        return $this;
+    }
+
+    /**
+     * Orders the results by the value of this attribute.
+     * This applies to both text and numeric attributes.
+     * Attributes needed for SORTBY should be declared as SORTABLE in the index, in order to be available with very low latency.
+     * Note that this adds memory overhead.
+     *
+     * @param  string $sortAttribute
+     * @param  string $orderBy
+     * @return $this
+     */
+    public function sortBy(string $sortAttribute, string $orderBy = 'asc'): self
+    {
+        $this->arguments[] = 'SORTBY';
+        $this->arguments[] = $sortAttribute;
+
+        if (in_array(strtoupper($orderBy), $this->sortingEnum)) {
+            $this->arguments[] = $this->sortingEnum[strtolower($orderBy)];
+        } else {
+            $enumValues = implode(', ', array_values($this->sortingEnum));
+            throw new InvalidArgumentException("Wrong order direction value given. Currently supports: {$enumValues}");
+        }
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SpellcheckArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/SpellcheckArguments.php
new file mode 100644
index 000000000..7a6c24891
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SpellcheckArguments.php
@@ -0,0 +1,59 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+use InvalidArgumentException;
+
+class SpellcheckArguments extends CommonArguments
+{
+    /**
+     * @var string[]
+     */
+    private $termsEnum = [
+        'include' => 'INCLUDE',
+        'exclude' => 'EXCLUDE',
+    ];
+
+    /**
+     * Is maximum Levenshtein distance for spelling suggestions (default: 1, max: 4).
+     *
+     * @return $this
+     */
+    public function distance(int $distance): self
+    {
+        $this->arguments[] = 'DISTANCE';
+        $this->arguments[] = $distance;
+
+        return $this;
+    }
+
+    /**
+     * Specifies an inclusion (INCLUDE) or exclusion (EXCLUDE) of a custom dictionary named {dict}.
+     *
+     * @param  string $dictionary
+     * @param  string $modifier
+     * @param  string ...$terms
+     * @return $this
+     */
+    public function terms(string $dictionary, string $modifier = 'INCLUDE', string ...$terms): self
+    {
+        if (!in_array(strtoupper($modifier), $this->termsEnum)) {
+            $enumValues = implode(', ', array_values($this->termsEnum));
+            throw new InvalidArgumentException("Wrong modifier value given. Currently supports: {$enumValues}");
+        }
+
+        array_push($this->arguments, 'TERMS', $this->termsEnum[strtolower($modifier)], $dictionary, ...$terms);
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SugAddArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/SugAddArguments.php
new file mode 100644
index 000000000..c8b976978
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SugAddArguments.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class SugAddArguments extends CommonArguments
+{
+    /**
+     * Adds INCR modifier.
+     *
+     * @return $this
+     */
+    public function incr(): self
+    {
+        $this->arguments[] = 'INCR';
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SugGetArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/SugGetArguments.php
new file mode 100644
index 000000000..1176c7736
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SugGetArguments.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class SugGetArguments extends CommonArguments
+{
+    /**
+     * Performs a fuzzy prefix search, including prefixes at Levenshtein distance of 1 from the prefix sent.
+     *
+     * @return $this
+     */
+    public function fuzzy(): self
+    {
+        $this->arguments[] = 'FUZZY';
+
+        return $this;
+    }
+
+    /**
+     * Limits the results to a maximum of num (default: 5).
+     *
+     * @param  int   $num
+     * @return $this
+     */
+    public function max(int $num): self
+    {
+        array_push($this->arguments, 'MAX', $num);
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Search/SynUpdateArguments.php b/plugins/cache-redis/Predis/Command/Argument/Search/SynUpdateArguments.php
new file mode 100644
index 000000000..a6b286a48
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Search/SynUpdateArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Search;
+
+class SynUpdateArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Server/LimitInterface.php b/plugins/cache-redis/Predis/Command/Argument/Server/LimitInterface.php
new file mode 100644
index 000000000..95ebd6433
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Server/LimitInterface.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Server;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+interface LimitInterface extends ArrayableArgument
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Server/LimitOffsetCount.php b/plugins/cache-redis/Predis/Command/Argument/Server/LimitOffsetCount.php
new file mode 100644
index 000000000..9de6733e1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Server/LimitOffsetCount.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Server;
+
+class LimitOffsetCount implements LimitInterface
+{
+    private const KEYWORD = 'LIMIT';
+
+    /**
+     * @var int
+     */
+    private $offset;
+
+    /**
+     * @var int
+     */
+    private $count;
+
+    public function __construct(int $offset, int $count)
+    {
+        $this->offset = $offset;
+        $this->count = $count;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return [self::KEYWORD, $this->offset, $this->count];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/Server/To.php b/plugins/cache-redis/Predis/Command/Argument/Server/To.php
new file mode 100644
index 000000000..1d77ef681
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/Server/To.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\Server;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class To implements ArrayableArgument
+{
+    private const KEYWORD = 'TO';
+    private const FORCE_KEYWORD = 'FORCE';
+
+    /**
+     * @var string
+     */
+    private $host;
+
+    /**
+     * @var int
+     */
+    private $port;
+
+    /**
+     * @var bool
+     */
+    private $isForce;
+
+    public function __construct(string $host, int $port, bool $isForce = false)
+    {
+        $this->host = $host;
+        $this->port = $port;
+        $this->isForce = $isForce;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        $arguments = [self::KEYWORD, $this->host, $this->port];
+
+        if ($this->isForce) {
+            $arguments[] = self::FORCE_KEYWORD;
+        }
+
+        return $arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AddArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AddArguments.php
new file mode 100644
index 000000000..a9fe6f79f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AddArguments.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class AddArguments extends CommonArguments
+{
+    /**
+     * Is overwrite key and database configuration for DUPLICATE_POLICY,
+     * the policy for handling samples with identical timestamps.
+     *
+     * @param  string $policy
+     * @return $this
+     */
+    public function onDuplicate(string $policy = self::POLICY_BLOCK): self
+    {
+        array_push($this->arguments, 'ON_DUPLICATE', $policy);
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AlterArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AlterArguments.php
new file mode 100644
index 000000000..238ebc36d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/AlterArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class AlterArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CommonArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CommonArguments.php
new file mode 100644
index 000000000..a2841bf38
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CommonArguments.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class CommonArguments implements ArrayableArgument
+{
+    public const POLICY_BLOCK = 'BLOCK';
+    public const POLICY_FIRST = 'FIRST';
+    public const POLICY_LAST = 'LAST';
+    public const POLICY_MIN = 'MIN';
+    public const POLICY_MAX = 'MAX';
+    public const POLICY_SUM = 'SUM';
+
+    public const ENCODING_UNCOMPRESSED = 'UNCOMPRESSED';
+    public const ENCODING_COMPRESSED = 'COMPRESSED';
+
+    /**
+     * @var array
+     */
+    protected $arguments = [];
+
+    /**
+     * Is maximum age for samples compared to the highest reported timestamp, in milliseconds.
+     *
+     * @param  int   $retentionPeriod
+     * @return $this
+     */
+    public function retentionMsecs(int $retentionPeriod): self
+    {
+        array_push($this->arguments, 'RETENTION', $retentionPeriod);
+
+        return $this;
+    }
+
+    /**
+     * Is initial allocation size, in bytes, for the data part of each new chunk.
+     *
+     * @param  int   $size
+     * @return $this
+     */
+    public function chunkSize(int $size): self
+    {
+        array_push($this->arguments, 'CHUNK_SIZE', $size);
+
+        return $this;
+    }
+
+    /**
+     * Is policy for handling insertion of multiple samples with identical timestamps.
+     *
+     * @param  string $policy
+     * @return $this
+     */
+    public function duplicatePolicy(string $policy = self::POLICY_BLOCK): self
+    {
+        array_push($this->arguments, 'DUPLICATE_POLICY', $policy);
+
+        return $this;
+    }
+
+    /**
+     * Is set of label-value pairs that represent metadata labels of the key and serve as a secondary index.
+     *
+     * @param  mixed ...$labelValuePair
+     * @return $this
+     */
+    public function labels(...$labelValuePair): self
+    {
+        array_push($this->arguments, 'LABELS', ...$labelValuePair);
+
+        return $this;
+    }
+
+    /**
+     * Specifies the series samples encoding format.
+     *
+     * @param  string $encoding
+     * @return $this
+     */
+    public function encoding(string $encoding = self::ENCODING_COMPRESSED): self
+    {
+        array_push($this->arguments, 'ENCODING', $encoding);
+
+        return $this;
+    }
+
+    /**
+     * Is used when a time series is a compaction.
+     * With LATEST, TS.GET reports the compacted value of the latest, possibly partial, bucket.
+     *
+     * @return $this
+     */
+    public function latest(): self
+    {
+        $this->arguments[] = 'LATEST';
+
+        return $this;
+    }
+
+    /**
+     * Includes in the reply all label-value pairs representing metadata labels of the time series.
+     *
+     * @return $this
+     */
+    public function withLabels(): self
+    {
+        $this->arguments[] = 'WITHLABELS';
+
+        return $this;
+    }
+
+    /**
+     * Returns a subset of the label-value pairs that represent metadata labels of the time series.
+     *
+     * @return $this
+     */
+    public function selectedLabels(string ...$labels): self
+    {
+        array_push($this->arguments, 'SELECTED_LABELS', ...$labels);
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CreateArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CreateArguments.php
new file mode 100644
index 000000000..e47d8ef72
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/CreateArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class CreateArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/DecrByArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/DecrByArguments.php
new file mode 100644
index 000000000..c0da3f0b9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/DecrByArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class DecrByArguments extends IncrByArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/GetArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/GetArguments.php
new file mode 100644
index 000000000..765685cbf
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/GetArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class GetArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/IncrByArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/IncrByArguments.php
new file mode 100644
index 000000000..103efb5f1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/IncrByArguments.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class IncrByArguments extends CommonArguments
+{
+    /**
+     * Is (integer) UNIX sample timestamp in milliseconds or * to set the timestamp according to the server clock.
+     *
+     * @param  string|int $timeStamp
+     * @return $this
+     */
+    public function timestamp($timeStamp): self
+    {
+        array_push($this->arguments, 'TIMESTAMP', $timeStamp);
+
+        return $this;
+    }
+
+    /**
+     * Changes data storage from compressed (default) to uncompressed.
+     *
+     * @return $this
+     */
+    public function uncompressed(): self
+    {
+        $this->arguments[] = 'UNCOMPRESSED';
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/InfoArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/InfoArguments.php
new file mode 100644
index 000000000..1b2cec664
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/InfoArguments.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+use Predis\Command\Argument\ArrayableArgument;
+
+class InfoArguments implements ArrayableArgument
+{
+    /**
+     * @var array
+     */
+    private $arguments = [];
+
+    /**
+     * Is an optional flag to get a more detailed information about the chunks.
+     *
+     * @return $this
+     */
+    public function debug(): self
+    {
+        $this->arguments[] = 'DEBUG';
+
+        return $this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function toArray(): array
+    {
+        return $this->arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MGetArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MGetArguments.php
new file mode 100644
index 000000000..585f574e6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MGetArguments.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class MGetArguments extends CommonArguments
+{
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MRangeArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MRangeArguments.php
new file mode 100644
index 000000000..c1f89c17d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/MRangeArguments.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class MRangeArguments extends RangeArguments
+{
+    /**
+     * Filters time series based on their labels and label values.
+     *
+     * @param  string ...$filterExpressions
+     * @return $this
+     */
+    public function filter(string ...$filterExpressions): self
+    {
+        array_push($this->arguments, 'FILTER', ...$filterExpressions);
+
+        return $this;
+    }
+
+    /**
+     * Splits time series into groups, each group contains time series that share the same
+     * value for the provided label name, then aggregates results in each group.
+     *
+     * @param  string $label
+     * @param  string $reducer
+     * @return $this
+     */
+    public function groupBy(string $label, string $reducer): self
+    {
+        array_push($this->arguments, 'GROUPBY', $label, 'REDUCE', $reducer);
+
+        return $this;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Argument/TimeSeries/RangeArguments.php b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/RangeArguments.php
new file mode 100644
index 000000000..00d3772d7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Argument/TimeSeries/RangeArguments.php
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Argument\TimeSeries;
+
+class RangeArguments extends CommonArguments
+{
+    /**
+     * Filters samples by a list of specific timestamps.
+     *
+     * @param  int   ...$ts
+     * @return $this
+     */
+    public function filterByTs(int ...$ts): self
+    {
+        array_push($this->arguments, 'FILTER_BY_TS', ...$ts);
+
+        return $this;
+    }
+
+    /**
+     * Filters samples by minimum and maximum values.
+     *
+     * @param  int   $min
+     * @param  int   $max
+     * @return $this
+     */
+    public function filterByValue(int $min, int $max): self
+    {
+        array_push($this->arguments, 'FILTER_BY_VALUE', $min, $max);
+
+        return $this;
+    }
+
+    /**
+     * Limits the number of returned samples.
+     *
+     * @param  int   $count
+     * @return $this
+     */
+    public function count(int $count): self
+    {
+        array_push($this->arguments, 'COUNT', $count);
+
+        return $this;
+    }
+
+    /**
+     * Aggregates samples into time buckets.
+     *
+     * @param  string $aggregator
+     * @param  int    $bucketDuration  Is duration of each bucket, in milliseconds.
+     * @param  int    $align           It controls the time bucket timestamps by changing the reference timestamp on which a bucket is defined.
+     * @param  int    $bucketTimestamp Controls how bucket timestamps are reported.
+     * @param  bool   $empty           Is a flag, which, when specified, reports aggregations also for empty buckets.
+     * @return $this
+     */
+    public function aggregation(string $aggregator, int $bucketDuration, int $align = 0, int $bucketTimestamp = 0, bool $empty = false): self
+    {
+        if ($align > 0) {
+            array_push($this->arguments, 'ALIGN', $align);
+        }
+
+        array_push($this->arguments, 'AGGREGATION', $aggregator, $bucketDuration);
+
+        if ($bucketTimestamp > 0) {
+            array_push($this->arguments, 'BUCKETTIMESTAMP', $bucketTimestamp);
+        }
+
+        if (true === $empty) {
+            $this->arguments[] = 'EMPTY';
+        }
+
+        return $this;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/Command.php b/plugins/cache-redis/Predis/Command/Command.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/Command.php
rename to plugins/cache-redis/Predis/Command/Command.php
index bb538e7c5..68629c454 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/Command.php
+++ b/plugins/cache-redis/Predis/Command/Command.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,32 +14,18 @@ namespace Predis\Command;
 
 /**
  * Base class for Redis commands.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 abstract class Command implements CommandInterface
 {
     private $slot;
-    private $arguments = array();
-
-    /**
-     * Returns a filtered array of the arguments.
-     *
-     * @param array $arguments List of arguments.
-     *
-     * @return array
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return $arguments;
-    }
+    private $arguments = [];
 
     /**
      * {@inheritdoc}
      */
     public function setArguments(array $arguments)
     {
-        $this->arguments = $this->filterArguments($arguments);
+        $this->arguments = $arguments;
         unset($this->slot);
     }
 
@@ -82,9 +69,7 @@ abstract class Command implements CommandInterface
      */
     public function getSlot()
     {
-        if (isset($this->slot)) {
-            return $this->slot;
-        }
+        return $this->slot ?? null;
     }
 
     /**
@@ -104,7 +89,7 @@ abstract class Command implements CommandInterface
      */
     public static function normalizeArguments(array $arguments)
     {
-        if (count($arguments) === 1 && is_array($arguments[0])) {
+        if (count($arguments) === 1 && isset($arguments[0]) && is_array($arguments[0])) {
             return $arguments[0];
         }
 
@@ -121,9 +106,21 @@ abstract class Command implements CommandInterface
     public static function normalizeVariadic(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
-            return array_merge(array($arguments[0]), $arguments[1]);
+            return array_merge([$arguments[0]], $arguments[1]);
         }
 
         return $arguments;
     }
+
+    /**
+     * Remove all false values from arguments.
+     *
+     * @return void
+     */
+    public function filterArguments(): void
+    {
+        $this->arguments = array_filter($this->arguments, static function ($argument) {
+            return $argument !== false && $argument !== null;
+        });
+    }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/CommandInterface.php b/plugins/cache-redis/Predis/Command/CommandInterface.php
similarity index 90%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/CommandInterface.php
rename to plugins/cache-redis/Predis/Command/CommandInterface.php
index 9f349e1df..20480316d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/CommandInterface.php
+++ b/plugins/cache-redis/Predis/Command/CommandInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis\Command;
 
 /**
  * Defines an abstraction representing a Redis command.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface CommandInterface
 {
@@ -73,7 +72,7 @@ interface CommandInterface
     /**
      * Parses a raw response and returns a PHP object.
      *
-     * @param string $data Binary string containing the whole response.
+     * @param string|array|null $data Binary string containing the whole response.
      *
      * @return mixed
      */
diff --git a/plugins/cache-redis/Predis/Command/Factory.php b/plugins/cache-redis/Predis/Command/Factory.php
new file mode 100644
index 000000000..ed94dc572
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Factory.php
@@ -0,0 +1,143 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+use InvalidArgumentException;
+use Predis\ClientException;
+use Predis\Command\Processor\ProcessorInterface;
+
+/**
+ * Base command factory class.
+ *
+ * This class provides all of the common functionalities required for a command
+ * factory to create new instances of Redis commands objects. It also allows to
+ * define or undefine command handler classes for each command ID.
+ */
+abstract class Factory implements FactoryInterface
+{
+    protected $commands = [];
+    protected $processor;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function supports(string ...$commandIDs): bool
+    {
+        foreach ($commandIDs as $commandID) {
+            if ($this->getCommandClass($commandID) === null) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Returns the FQCN of a class that represents the specified command ID.
+     *
+     * @codeCoverageIgnore
+     *
+     * @param string $commandID Command ID
+     *
+     * @return string|null
+     */
+    public function getCommandClass(string $commandID): ?string
+    {
+        return $this->commands[strtoupper($commandID)] ?? null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(string $commandID, array $arguments = []): CommandInterface
+    {
+        if (!$commandClass = $this->getCommandClass($commandID)) {
+            $commandID = strtoupper($commandID);
+
+            throw new ClientException("Command `$commandID` is not a registered Redis command.");
+        }
+
+        $command = new $commandClass();
+        $command->setArguments($arguments);
+
+        if (isset($this->processor)) {
+            $this->processor->process($command);
+        }
+
+        return $command;
+    }
+
+    /**
+     * Defines a command in the factory.
+     *
+     * Only classes implementing Predis\Command\CommandInterface are allowed to
+     * handle a command. If the command specified by its ID is already handled
+     * by the factory, the underlying command class is replaced by the new one.
+     *
+     * @param string $commandID    Command ID
+     * @param string $commandClass FQCN of a class implementing Predis\Command\CommandInterface
+     *
+     * @throws InvalidArgumentException
+     */
+    public function define(string $commandID, string $commandClass): void
+    {
+        if (!is_a($commandClass, 'Predis\Command\CommandInterface', true)) {
+            throw new InvalidArgumentException(
+                "Class $commandClass must implement Predis\Command\CommandInterface"
+            );
+        }
+
+        $this->commands[strtoupper($commandID)] = $commandClass;
+    }
+
+    /**
+     * Undefines a command in the factory.
+     *
+     * When the factory already has a class handler associated to the specified
+     * command ID it is removed from the map of known commands. Nothing happens
+     * when the command is not handled by the factory.
+     *
+     * @param string $commandID Command ID
+     */
+    public function undefine(string $commandID): void
+    {
+        unset($this->commands[strtoupper($commandID)]);
+    }
+
+    /**
+     * Sets a command processor for processing command arguments.
+     *
+     * Command processors are used to process and transform arguments of Redis
+     * commands before their newly created instances are returned to the caller
+     * of "create()".
+     *
+     * A NULL value can be used to effectively unset any processor if previously
+     * set for the command factory.
+     *
+     * @param ProcessorInterface|null $processor Command processor or NULL value.
+     */
+    public function setProcessor(?ProcessorInterface $processor): void
+    {
+        $this->processor = $processor;
+    }
+
+    /**
+     * Returns the current command processor.
+     *
+     * @return ProcessorInterface|null
+     */
+    public function getProcessor(): ?ProcessorInterface
+    {
+        return $this->processor;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/FactoryInterface.php b/plugins/cache-redis/Predis/Command/FactoryInterface.php
new file mode 100644
index 000000000..e81951086
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/FactoryInterface.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+/**
+ * Command factory interface.
+ *
+ * A command factory is used through the library to create instances of commands
+ * classes implementing Predis\Command\CommandInterface mapped to Redis commands
+ * by their command ID string (SET, GET, etc...).
+ */
+interface FactoryInterface
+{
+    /**
+     * Checks if the command factory supports the specified list of commands.
+     *
+     * @param string ...$commandIDs List of command IDs
+     *
+     * @return bool
+     */
+    public function supports(string ...$commandIDs): bool;
+
+    /**
+     * Creates a new command instance.
+     *
+     * @param string $commandID Command ID
+     * @param array  $arguments Arguments for the command
+     *
+     * @return CommandInterface
+     */
+    public function create(string $commandID, array $arguments = []): CommandInterface;
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PrefixableCommandInterface.php b/plugins/cache-redis/Predis/Command/PrefixableCommandInterface.php
similarity index 83%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/PrefixableCommandInterface.php
rename to plugins/cache-redis/Predis/Command/PrefixableCommandInterface.php
index 6d54554fa..66b5d19c2 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PrefixableCommandInterface.php
+++ b/plugins/cache-redis/Predis/Command/PrefixableCommandInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis\Command;
 
 /**
  * Defines a command whose keys can be prefixed.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface PrefixableCommandInterface extends CommandInterface
 {
diff --git a/plugins/cache-redis/Predis/Command/Processor/KeyPrefixProcessor.php b/plugins/cache-redis/Predis/Command/Processor/KeyPrefixProcessor.php
new file mode 100644
index 000000000..d7a30c880
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Processor/KeyPrefixProcessor.php
@@ -0,0 +1,577 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Processor;
+
+use InvalidArgumentException;
+use Predis\Command\CommandInterface;
+use Predis\Command\PrefixableCommandInterface;
+
+/**
+ * Command processor capable of prefixing keys stored in the arguments of Redis
+ * commands supported.
+ */
+class KeyPrefixProcessor implements ProcessorInterface
+{
+    private $prefix;
+    private $commands;
+
+    /**
+     * @param string $prefix Prefix for the keys.
+     */
+    public function __construct($prefix)
+    {
+        $this->prefix = $prefix;
+
+        $prefixFirst = static::class . '::first';
+        $prefixAll = static::class . '::all';
+        $prefixInterleaved = static::class . '::interleaved';
+        $prefixSkipFirst = static::class . '::skipFirst';
+        $prefixSkipLast = static::class . '::skipLast';
+        $prefixSort = static::class . '::sort';
+        $prefixEvalKeys = static::class . '::evalKeys';
+        $prefixZsetStore = static::class . '::zsetStore';
+        $prefixMigrate = static::class . '::migrate';
+        $prefixGeoradius = static::class . '::georadius';
+
+        $this->commands = [
+            /* ---------------- Redis 1.2 ---------------- */
+            'EXISTS' => $prefixAll,
+            'DEL' => $prefixAll,
+            'TYPE' => $prefixFirst,
+            'KEYS' => $prefixFirst,
+            'RENAME' => $prefixAll,
+            'RENAMENX' => $prefixAll,
+            'EXPIRE' => $prefixFirst,
+            'EXPIREAT' => $prefixFirst,
+            'TTL' => $prefixFirst,
+            'MOVE' => $prefixFirst,
+            'SORT' => $prefixSort,
+            'DUMP' => $prefixFirst,
+            'RESTORE' => $prefixFirst,
+            'SET' => $prefixFirst,
+            'SETNX' => $prefixFirst,
+            'MSET' => $prefixInterleaved,
+            'MSETNX' => $prefixInterleaved,
+            'GET' => $prefixFirst,
+            'MGET' => $prefixAll,
+            'GETSET' => $prefixFirst,
+            'INCR' => $prefixFirst,
+            'INCRBY' => $prefixFirst,
+            'DECR' => $prefixFirst,
+            'DECRBY' => $prefixFirst,
+            'RPUSH' => $prefixFirst,
+            'LPUSH' => $prefixFirst,
+            'LLEN' => $prefixFirst,
+            'LRANGE' => $prefixFirst,
+            'LTRIM' => $prefixFirst,
+            'LINDEX' => $prefixFirst,
+            'LSET' => $prefixFirst,
+            'LREM' => $prefixFirst,
+            'LPOP' => $prefixFirst,
+            'RPOP' => $prefixFirst,
+            'RPOPLPUSH' => $prefixAll,
+            'SADD' => $prefixFirst,
+            'SREM' => $prefixFirst,
+            'SPOP' => $prefixFirst,
+            'SMOVE' => $prefixSkipLast,
+            'SCARD' => $prefixFirst,
+            'SISMEMBER' => $prefixFirst,
+            'SINTER' => $prefixAll,
+            'SINTERSTORE' => $prefixAll,
+            'SUNION' => $prefixAll,
+            'SUNIONSTORE' => $prefixAll,
+            'SDIFF' => $prefixAll,
+            'SDIFFSTORE' => $prefixAll,
+            'SMEMBERS' => $prefixFirst,
+            'SRANDMEMBER' => $prefixFirst,
+            'ZADD' => $prefixFirst,
+            'ZINCRBY' => $prefixFirst,
+            'ZREM' => $prefixFirst,
+            'ZRANGE' => $prefixFirst,
+            'ZREVRANGE' => $prefixFirst,
+            'ZRANGEBYSCORE' => $prefixFirst,
+            'ZCARD' => $prefixFirst,
+            'ZSCORE' => $prefixFirst,
+            'ZREMRANGEBYSCORE' => $prefixFirst,
+            /* ---------------- Redis 2.0 ---------------- */
+            'SETEX' => $prefixFirst,
+            'APPEND' => $prefixFirst,
+            'SUBSTR' => $prefixFirst,
+            'BLPOP' => $prefixSkipLast,
+            'BRPOP' => $prefixSkipLast,
+            'ZUNIONSTORE' => $prefixZsetStore,
+            'ZINTERSTORE' => $prefixZsetStore,
+            'ZCOUNT' => $prefixFirst,
+            'ZRANK' => $prefixFirst,
+            'ZREVRANK' => $prefixFirst,
+            'ZREMRANGEBYRANK' => $prefixFirst,
+            'HSET' => $prefixFirst,
+            'HSETNX' => $prefixFirst,
+            'HMSET' => $prefixFirst,
+            'HINCRBY' => $prefixFirst,
+            'HGET' => $prefixFirst,
+            'HMGET' => $prefixFirst,
+            'HDEL' => $prefixFirst,
+            'HEXISTS' => $prefixFirst,
+            'HLEN' => $prefixFirst,
+            'HKEYS' => $prefixFirst,
+            'HVALS' => $prefixFirst,
+            'HGETALL' => $prefixFirst,
+            'SUBSCRIBE' => $prefixAll,
+            'UNSUBSCRIBE' => $prefixAll,
+            'PSUBSCRIBE' => $prefixAll,
+            'PUNSUBSCRIBE' => $prefixAll,
+            'PUBLISH' => $prefixFirst,
+            /* ---------------- Redis 2.2 ---------------- */
+            'PERSIST' => $prefixFirst,
+            'STRLEN' => $prefixFirst,
+            'SETRANGE' => $prefixFirst,
+            'GETRANGE' => $prefixFirst,
+            'SETBIT' => $prefixFirst,
+            'GETBIT' => $prefixFirst,
+            'RPUSHX' => $prefixFirst,
+            'LPUSHX' => $prefixFirst,
+            'LINSERT' => $prefixFirst,
+            'BRPOPLPUSH' => $prefixSkipLast,
+            'ZREVRANGEBYSCORE' => $prefixFirst,
+            'WATCH' => $prefixAll,
+            /* ---------------- Redis 2.6 ---------------- */
+            'PTTL' => $prefixFirst,
+            'PEXPIRE' => $prefixFirst,
+            'PEXPIREAT' => $prefixFirst,
+            'PSETEX' => $prefixFirst,
+            'INCRBYFLOAT' => $prefixFirst,
+            'BITOP' => $prefixSkipFirst,
+            'BITCOUNT' => $prefixFirst,
+            'HINCRBYFLOAT' => $prefixFirst,
+            'EVAL' => $prefixEvalKeys,
+            'EVALSHA' => $prefixEvalKeys,
+            'MIGRATE' => $prefixMigrate,
+            /* ---------------- Redis 2.8 ---------------- */
+            'SSCAN' => $prefixFirst,
+            'ZSCAN' => $prefixFirst,
+            'HSCAN' => $prefixFirst,
+            'PFADD' => $prefixFirst,
+            'PFCOUNT' => $prefixAll,
+            'PFMERGE' => $prefixAll,
+            'ZLEXCOUNT' => $prefixFirst,
+            'ZRANGEBYLEX' => $prefixFirst,
+            'ZREMRANGEBYLEX' => $prefixFirst,
+            'ZREVRANGEBYLEX' => $prefixFirst,
+            'BITPOS' => $prefixFirst,
+            /* ---------------- Redis 3.2 ---------------- */
+            'HSTRLEN' => $prefixFirst,
+            'BITFIELD' => $prefixFirst,
+            'GEOADD' => $prefixFirst,
+            'GEOHASH' => $prefixFirst,
+            'GEOPOS' => $prefixFirst,
+            'GEODIST' => $prefixFirst,
+            'GEORADIUS' => $prefixGeoradius,
+            'GEORADIUSBYMEMBER' => $prefixGeoradius,
+            /* ---------------- Redis 5.0 ---------------- */
+            'XADD' => $prefixFirst,
+            'XRANGE' => $prefixFirst,
+            'XREVRANGE' => $prefixFirst,
+            'XDEL' => $prefixFirst,
+            'XLEN' => $prefixFirst,
+            'XACK' => $prefixFirst,
+            'XTRIM' => $prefixFirst,
+
+            /* ---------------- Redis 6.2 ---------------- */
+            'GETDEL' => $prefixFirst,
+
+            /* ---------------- Redis 7.0 ---------------- */
+            'EXPIRETIME' => $prefixFirst,
+
+            /* RedisJSON */
+            'JSON.ARRAPPEND' => $prefixFirst,
+            'JSON.ARRINDEX' => $prefixFirst,
+            'JSON.ARRINSERT' => $prefixFirst,
+            'JSON.ARRLEN' => $prefixFirst,
+            'JSON.ARRPOP' => $prefixFirst,
+            'JSON.ARRTRIM' => $prefixFirst,
+            'JSON.CLEAR' => $prefixFirst,
+            'JSON.DEBUG MEMORY' => $prefixFirst,
+            'JSON.DEL' => $prefixFirst,
+            'JSON.FORGET' => $prefixFirst,
+            'JSON.GET' => $prefixFirst,
+            'JSON.MGET' => $prefixAll,
+            'JSON.NUMINCRBY' => $prefixFirst,
+            'JSON.OBJKEYS' => $prefixFirst,
+            'JSON.OBJLEN' => $prefixFirst,
+            'JSON.RESP' => $prefixFirst,
+            'JSON.SET' => $prefixFirst,
+            'JSON.STRAPPEND' => $prefixFirst,
+            'JSON.STRLEN' => $prefixFirst,
+            'JSON.TOGGLE' => $prefixFirst,
+            'JSON.TYPE' => $prefixFirst,
+
+            /* RedisBloom */
+            'BF.ADD' => $prefixFirst,
+            'BF.EXISTS' => $prefixFirst,
+            'BF.INFO' => $prefixFirst,
+            'BF.INSERT' => $prefixFirst,
+            'BF.LOADCHUNK' => $prefixFirst,
+            'BF.MADD' => $prefixFirst,
+            'BF.MEXISTS' => $prefixFirst,
+            'BF.RESERVE' => $prefixFirst,
+            'BF.SCANDUMP' => $prefixFirst,
+            'CF.ADD' => $prefixFirst,
+            'CF.ADDNX' => $prefixFirst,
+            'CF.COUNT' => $prefixFirst,
+            'CF.DEL' => $prefixFirst,
+            'CF.EXISTS' => $prefixFirst,
+            'CF.INFO' => $prefixFirst,
+            'CF.INSERT' => $prefixFirst,
+            'CF.INSERTNX' => $prefixFirst,
+            'CF.LOADCHUNK' => $prefixFirst,
+            'CF.MEXISTS' => $prefixFirst,
+            'CF.RESERVE' => $prefixFirst,
+            'CF.SCANDUMP' => $prefixFirst,
+            'CMS.INCRBY' => $prefixFirst,
+            'CMS.INFO' => $prefixFirst,
+            'CMS.INITBYDIM' => $prefixFirst,
+            'CMS.INITBYPROB' => $prefixFirst,
+            'CMS.QUERY' => $prefixFirst,
+            'TDIGEST.ADD' => $prefixFirst,
+            'TDIGEST.BYRANK' => $prefixFirst,
+            'TDIGEST.BYREVRANK' => $prefixFirst,
+            'TDIGEST.CDF' => $prefixFirst,
+            'TDIGEST.CREATE' => $prefixFirst,
+            'TDIGEST.INFO' => $prefixFirst,
+            'TDIGEST.MAX' => $prefixFirst,
+            'TDIGEST.MIN' => $prefixFirst,
+            'TDIGEST.QUANTILE' => $prefixFirst,
+            'TDIGEST.RANK' => $prefixFirst,
+            'TDIGEST.RESET' => $prefixFirst,
+            'TDIGEST.REVRANK' => $prefixFirst,
+            'TDIGEST.TRIMMED_MEAN' => $prefixFirst,
+            'TOPK.ADD' => $prefixFirst,
+            'TOPK.INCRBY' => $prefixFirst,
+            'TOPK.INFO' => $prefixFirst,
+            'TOPK.LIST' => $prefixFirst,
+            'TOPK.QUERY' => $prefixFirst,
+            'TOPK.RESERVE' => $prefixFirst,
+
+            /* RediSearch */
+            'FT.AGGREGATE' => $prefixFirst,
+            'FT.ALTER' => $prefixFirst,
+            'FT.CREATE' => $prefixFirst,
+            'FT.CURSOR DEL' => $prefixFirst,
+            'FT.CURSOR READ' => $prefixFirst,
+            'FT.DROPINDEX' => $prefixFirst,
+            'FT.EXPLAIN' => $prefixFirst,
+            'FT.INFO' => $prefixFirst,
+            'FT.PROFILE' => $prefixFirst,
+            'FT.SEARCH' => $prefixFirst,
+            'FT.SPELLCHECK' => $prefixFirst,
+            'FT.SYNDUMP' => $prefixFirst,
+            'FT.SYNUPDATE' => $prefixFirst,
+            'FT.TAGVALS' => $prefixFirst,
+
+            /* Redis TimeSeries */
+            'TS.ADD' => $prefixFirst,
+            'TS.ALTER' => $prefixFirst,
+            'TS.CREATE' => $prefixFirst,
+            'TS.DECRBY' => $prefixFirst,
+            'TS.DEL' => $prefixFirst,
+            'TS.GET' => $prefixFirst,
+            'TS.INCRBY' => $prefixFirst,
+            'TS.INFO' => $prefixFirst,
+            'TS.MGET' => $prefixFirst,
+            'TS.MRANGE' => $prefixFirst,
+            'TS.MREVRANGE' => $prefixFirst,
+            'TS.QUERYINDEX' => $prefixFirst,
+            'TS.RANGE' => $prefixFirst,
+            'TS.REVRANGE' => $prefixFirst,
+        ];
+    }
+
+    /**
+     * Sets a prefix that is applied to all the keys.
+     *
+     * @param string $prefix Prefix for the keys.
+     */
+    public function setPrefix($prefix)
+    {
+        $this->prefix = $prefix;
+    }
+
+    /**
+     * Gets the current prefix.
+     *
+     * @return string
+     */
+    public function getPrefix()
+    {
+        return $this->prefix;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function process(CommandInterface $command)
+    {
+        if ($command instanceof PrefixableCommandInterface) {
+            $command->prefixKeys($this->prefix);
+        } elseif (isset($this->commands[$commandID = strtoupper($command->getId())])) {
+            $this->commands[$commandID]($command, $this->prefix);
+        }
+    }
+
+    /**
+     * Sets an handler for the specified command ID.
+     *
+     * The callback signature must have 2 parameters of the following types:
+     *
+     *   - Predis\Command\CommandInterface (command instance)
+     *   - String (prefix)
+     *
+     * When the callback argument is omitted or NULL, the previously
+     * associated handler for the specified command ID is removed.
+     *
+     * @param string $commandID The ID of the command to be handled.
+     * @param mixed  $callback  A valid callable object or NULL.
+     *
+     * @throws InvalidArgumentException
+     */
+    public function setCommandHandler($commandID, $callback = null)
+    {
+        $commandID = strtoupper($commandID);
+
+        if (!isset($callback)) {
+            unset($this->commands[$commandID]);
+
+            return;
+        }
+
+        if (!is_callable($callback)) {
+            throw new InvalidArgumentException(
+                'Callback must be a valid callable object or NULL'
+            );
+        }
+
+        $this->commands[$commandID] = $callback;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __toString()
+    {
+        return $this->getPrefix();
+    }
+
+    /**
+     * Applies the specified prefix only the first argument.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function first(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $arguments[0] = "$prefix{$arguments[0]}";
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to all the arguments.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function all(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            foreach ($arguments as &$key) {
+                $key = "$prefix$key";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix only to even arguments in the list.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function interleaved(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $length = count($arguments);
+
+            for ($i = 0; $i < $length; $i += 2) {
+                $arguments[$i] = "$prefix{$arguments[$i]}";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to all the arguments but the first one.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function skipFirst(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $length = count($arguments);
+
+            for ($i = 1; $i < $length; ++$i) {
+                $arguments[$i] = "$prefix{$arguments[$i]}";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to all the arguments but the last one.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function skipLast(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $length = count($arguments);
+
+            for ($i = 0; $i < $length - 1; ++$i) {
+                $arguments[$i] = "$prefix{$arguments[$i]}";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to the keys of a SORT command.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function sort(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $arguments[0] = "$prefix{$arguments[0]}";
+
+            if (($count = count($arguments)) > 1) {
+                for ($i = 1; $i < $count; ++$i) {
+                    switch (strtoupper($arguments[$i])) {
+                        case 'BY':
+                        case 'STORE':
+                            $arguments[$i] = "$prefix{$arguments[++$i]}";
+                            break;
+
+                        case 'GET':
+                            $value = $arguments[++$i];
+                            if ($value !== '#') {
+                                $arguments[$i] = "$prefix$value";
+                            }
+                            break;
+
+                        case 'LIMIT':
+                            $i += 2;
+                            break;
+                    }
+                }
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to the keys of an EVAL-based command.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function evalKeys(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            for ($i = 2; $i < $arguments[1] + 2; ++$i) {
+                $arguments[$i] = "$prefix{$arguments[$i]}";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to the keys of Z[INTERSECTION|UNION]STORE.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function zsetStore(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $arguments[0] = "$prefix{$arguments[0]}";
+            $length = ((int) $arguments[1]) + 2;
+
+            for ($i = 2; $i < $length; ++$i) {
+                $arguments[$i] = "$prefix{$arguments[$i]}";
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to the key of a MIGRATE command.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function migrate(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $arguments[2] = "$prefix{$arguments[2]}";
+            $command->setRawArguments($arguments);
+        }
+    }
+
+    /**
+     * Applies the specified prefix to the key of a GEORADIUS command.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $prefix  Prefix string.
+     */
+    public static function georadius(CommandInterface $command, $prefix)
+    {
+        if ($arguments = $command->getArguments()) {
+            $arguments[0] = "$prefix{$arguments[0]}";
+            $startIndex = $command->getId() === 'GEORADIUS' ? 5 : 4;
+
+            if (($count = count($arguments)) > $startIndex) {
+                for ($i = $startIndex; $i < $count; ++$i) {
+                    switch (strtoupper($arguments[$i])) {
+                        case 'STORE':
+                        case 'STOREDIST':
+                            $arguments[$i] = "$prefix{$arguments[++$i]}";
+                            break;
+                    }
+                }
+            }
+
+            $command->setRawArguments($arguments);
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorChain.php b/plugins/cache-redis/Predis/Command/Processor/ProcessorChain.php
similarity index 69%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorChain.php
rename to plugins/cache-redis/Predis/Command/Processor/ProcessorChain.php
index 0a4768b0a..1ce915e2b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorChain.php
+++ b/plugins/cache-redis/Predis/Command/Processor/ProcessorChain.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,21 +12,24 @@
 
 namespace Predis\Command\Processor;
 
+use ArrayAccess;
+use ArrayIterator;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
+use ReturnTypeWillChange;
+use Traversable;
 
 /**
  * Default implementation of a command processors chain.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ProcessorChain implements \ArrayAccess, ProcessorInterface
+class ProcessorChain implements ArrayAccess, ProcessorInterface
 {
-    private $processors = array();
+    private $processors = [];
 
     /**
      * @param array $processors List of instances of ProcessorInterface.
      */
-    public function __construct($processors = array())
+    public function __construct($processors = [])
     {
         foreach ($processors as $processor) {
             $this->add($processor);
@@ -71,11 +75,11 @@ class ProcessorChain implements \ArrayAccess, ProcessorInterface
     /**
      * Returns an iterator over the list of command processor in the chain.
      *
-     * @return \ArrayIterator
+     * @return Traversable<int, ProcessorInterface>
      */
     public function getIterator()
     {
-        return new \ArrayIterator($this->processors);
+        return new ArrayIterator($this->processors);
     }
 
     /**
@@ -89,30 +93,36 @@ class ProcessorChain implements \ArrayAccess, ProcessorInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  int  $index
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function offsetExists($index)
     {
         return isset($this->processors[$index]);
     }
 
     /**
-     * {@inheritdoc}
+     * @param  int                $index
+     * @return ProcessorInterface
      */
+    #[ReturnTypeWillChange]
     public function offsetGet($index)
     {
         return $this->processors[$index];
     }
 
     /**
-     * {@inheritdoc}
+     * @param  int                $index
+     * @param  ProcessorInterface $processor
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function offsetSet($index, $processor)
     {
         if (!$processor instanceof ProcessorInterface) {
-            throw new \InvalidArgumentException(
-                'A processor chain accepts only instances of '.
-                "'Predis\Command\Processor\ProcessorInterface'."
+            throw new InvalidArgumentException(
+                'Processor chain accepts only instances of `Predis\Command\Processor\ProcessorInterface`'
             );
         }
 
@@ -120,8 +130,10 @@ class ProcessorChain implements \ArrayAccess, ProcessorInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  int  $index
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function offsetUnset($index)
     {
         unset($this->processors[$index]);
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorInterface.php b/plugins/cache-redis/Predis/Command/Processor/ProcessorInterface.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorInterface.php
rename to plugins/cache-redis/Predis/Command/Processor/ProcessorInterface.php
index 2f9105802..f915b9eb6 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/ProcessorInterface.php
+++ b/plugins/cache-redis/Predis/Command/Processor/ProcessorInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\Command\CommandInterface;
 
 /**
  * A command processor processes Redis commands before they are sent to Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ProcessorInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/RawCommand.php b/plugins/cache-redis/Predis/Command/RawCommand.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/RawCommand.php
rename to plugins/cache-redis/Predis/Command/RawCommand.php
index 2dd48ca17..61b223112 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/RawCommand.php
+++ b/plugins/cache-redis/Predis/Command/RawCommand.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,52 +13,45 @@
 namespace Predis\Command;
 
 /**
- * Class for generic "anonymous" Redis commands.
+ * Class representing a generic Redis command.
  *
- * This command class does not filter input arguments or parse responses, but
- * can be used to leverage the standard Predis API to execute any command simply
- * by providing the needed arguments following the command signature as defined
- * by Redis in its documentation.
+ * Arguments and responses for these commands are not normalized and they follow
+ * what is defined by the Redis documentation.
  *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * Raw commands can be useful when implementing higher level abstractions on top
+ * of Predis\Client or managing internals like Redis Sentinel or Cluster as they
+ * are not potentially subject to hijacking from third party libraries when they
+ * override command handlers for standard Redis commands.
  */
-class RawCommand implements CommandInterface
+final class RawCommand implements CommandInterface
 {
     private $slot;
     private $commandID;
     private $arguments;
 
     /**
-     * @param array $arguments Command ID and its arguments.
-     *
-     * @throws \InvalidArgumentException
+     * @param string $commandID Command ID
+     * @param array  $arguments Command arguments
      */
-    public function __construct(array $arguments)
+    public function __construct($commandID, array $arguments = [])
     {
-        if (!$arguments) {
-            throw new \InvalidArgumentException(
-                'The arguments array must contain at least the command ID.'
-            );
-        }
-
-        $this->commandID = strtoupper(array_shift($arguments));
-        $this->arguments = $arguments;
+        $this->commandID = strtoupper($commandID);
+        $this->setArguments($arguments);
     }
 
     /**
      * Creates a new raw command using a variadic method.
      *
-     * @param string $commandID Redis command ID.
-     * @param string ...        Arguments list for the command.
+     * @param string $commandID Redis command ID
+     * @param string ...$args   Arguments list for the command
      *
      * @return CommandInterface
      */
-    public static function create($commandID /* [ $arg, ... */)
+    public static function create($commandID, ...$args)
     {
         $arguments = func_get_args();
-        $command = new self($arguments);
 
-        return $command;
+        return new static(array_shift($arguments), $arguments);
     }
 
     /**
@@ -116,9 +110,7 @@ class RawCommand implements CommandInterface
      */
     public function getSlot()
     {
-        if (isset($this->slot)) {
-            return $this->slot;
-        }
+        return $this->slot ?? null;
     }
 
     /**
diff --git a/plugins/cache-redis/Predis/Command/RawFactory.php b/plugins/cache-redis/Predis/Command/RawFactory.php
new file mode 100644
index 000000000..2c0637f22
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/RawFactory.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+/**
+ * Command factory creating raw command instances out of command IDs.
+ *
+ * Any command ID will produce a command instance even for unknown commands that
+ * are not implemented by Redis (the server will return a "-ERR unknown command"
+ * error responses).
+ *
+ * When using this factory the client does not process arguments before sending
+ * commands to Redis and server responses are not further processed before being
+ * returned to the caller.
+ */
+class RawFactory implements FactoryInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function supports(string ...$commandIDs): bool
+    {
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function create(string $commandID, array $arguments = []): CommandInterface
+    {
+        return new RawCommand($commandID, $arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ACL.php b/plugins/cache-redis/Predis/Command/Redis/ACL.php
new file mode 100644
index 000000000..e8999ea2e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ACL.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/?name=ACL
+ *
+ * Container command corresponds to any ACL *.
+ * Represents any ACL command with subcommand as first argument.
+ */
+class ACL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'ACL';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        if ($data === array_values($data)) {
+            return $data;
+        }
+
+        // flatten Relay (RESP3) maps
+        $return = [];
+
+        array_walk($data, function ($value, $key) use (&$return) {
+            $return[] = $key;
+            $return[] = $value;
+        });
+
+        return $return;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringAppend.php b/plugins/cache-redis/Predis/Command/Redis/APPEND.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringAppend.php
rename to plugins/cache-redis/Predis/Command/Redis/APPEND.php
index dac8b8479..627624579 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringAppend.php
+++ b/plugins/cache-redis/Predis/Command/Redis/APPEND.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/append
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/append
  */
-class StringAppend extends Command
+class APPEND extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionAuth.php b/plugins/cache-redis/Predis/Command/Redis/AUTH.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionAuth.php
rename to plugins/cache-redis/Predis/Command/Redis/AUTH.php
index c8c9dedce..cc2020e5f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionAuth.php
+++ b/plugins/cache-redis/Predis/Command/Redis/AUTH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/auth
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/auth
  */
-class ConnectionAuth extends Command
+class AUTH extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/AbstractCommand/BZPOPBase.php b/plugins/cache-redis/Predis/Command/Redis/AbstractCommand/BZPOPBase.php
new file mode 100644
index 000000000..ed4a53b80
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/AbstractCommand/BZPOPBase.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\AbstractCommand;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+
+abstract class BZPOPBase extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+
+    protected static $keysArgumentPositionOffset = 0;
+
+    abstract public function getId(): string;
+
+    public function setArguments(array $arguments)
+    {
+        $this->setKeys($arguments, false);
+    }
+
+    public function parseResponse($data)
+    {
+        $key = array_shift($data);
+
+        if (null === $key) {
+            return [$key];
+        }
+
+        return array_combine([$key], [[$data[0] => $data[1]]]);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundRewriteAOF.php b/plugins/cache-redis/Predis/Command/Redis/BGREWRITEAOF.php
similarity index 67%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundRewriteAOF.php
rename to plugins/cache-redis/Predis/Command/Redis/BGREWRITEAOF.php
index c66a294e5..97d443d90 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundRewriteAOF.php
+++ b/plugins/cache-redis/Predis/Command/Redis/BGREWRITEAOF.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/bgrewriteaof
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/bgrewriteaof
  */
-class ServerBackgroundRewriteAOF extends Command
+class BGREWRITEAOF extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundSave.php b/plugins/cache-redis/Predis/Command/Redis/BGSAVE.php
similarity index 68%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundSave.php
rename to plugins/cache-redis/Predis/Command/Redis/BGSAVE.php
index 4bf67ef30..9be85773f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerBackgroundSave.php
+++ b/plugins/cache-redis/Predis/Command/Redis/BGSAVE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/bgsave
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/bgsave
  */
-class ServerBackgroundSave extends Command
+class BGSAVE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BITCOUNT.php b/plugins/cache-redis/Predis/Command/Redis/BITCOUNT.php
new file mode 100644
index 000000000..859daf4a6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BITCOUNT.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BitByte;
+
+/**
+ * @see http://redis.io/commands/bitcount
+ *
+ * Count the number of set bits (population counting) in a string.
+ */
+class BITCOUNT extends RedisCommand
+{
+    use BitByte;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BITCOUNT';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BITFIELD.php b/plugins/cache-redis/Predis/Command/Redis/BITFIELD.php
new file mode 100644
index 000000000..5ded94794
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BITFIELD.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/bitfield
+ */
+class BITFIELD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BITFIELD';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitOp.php b/plugins/cache-redis/Predis/Command/Redis/BITOP.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitOp.php
rename to plugins/cache-redis/Predis/Command/Redis/BITOP.php
index e04ee79c2..fcf0495cd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitOp.php
+++ b/plugins/cache-redis/Predis/Command/Redis/BITOP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/bitop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/bitop
  */
-class StringBitOp extends Command
+class BITOP extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,14 +30,14 @@ class StringBitOp extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
-            list($operation, $destination) = $arguments;
+            [$operation, $destination] = $arguments;
             $arguments = $arguments[2];
             array_unshift($arguments, $operation, $destination);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/BITPOS.php b/plugins/cache-redis/Predis/Command/Redis/BITPOS.php
new file mode 100644
index 000000000..6ea418817
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BITPOS.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BitByte;
+
+/**
+ * @see http://redis.io/commands/bitpos
+ *
+ * Return the position of the first bit set to 1 or 0 in a string.
+ */
+class BITPOS extends RedisCommand
+{
+    use BitByte;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BITPOS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BLMOVE.php b/plugins/cache-redis/Predis/Command/Redis/BLMOVE.php
new file mode 100644
index 000000000..eec695259
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BLMOVE.php
@@ -0,0 +1,21 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+class BLMOVE extends LMOVE
+{
+    public function getId()
+    {
+        return 'BLMOVE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BLMPOP.php b/plugins/cache-redis/Predis/Command/Redis/BLMPOP.php
new file mode 100644
index 000000000..e5be9017f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BLMPOP.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+class BLMPOP extends LMPOP
+{
+    protected static $keysArgumentPositionOffset = 1;
+    protected static $leftRightArgumentPositionOffset = 2;
+    protected static $countArgumentPositionOffset = 3;
+
+    public function getId()
+    {
+        return 'BLMPOP';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirstBlocking.php b/plugins/cache-redis/Predis/Command/Redis/BLPOP.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirstBlocking.php
rename to plugins/cache-redis/Predis/Command/Redis/BLPOP.php
index 7dc7c0002..feb7ee4b8 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirstBlocking.php
+++ b/plugins/cache-redis/Predis/Command/Redis/BLPOP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/blpop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/blpop
  */
-class ListPopFirstBlocking extends Command
+class BLPOP extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,13 +30,13 @@ class ListPopFirstBlocking extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[0])) {
-            list($arguments, $timeout) = $arguments;
+            [$arguments, $timeout] = $arguments;
             array_push($arguments, $timeout);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/BRPOP.php b/plugins/cache-redis/Predis/Command/Redis/BRPOP.php
new file mode 100644
index 000000000..cf88dc906
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BRPOP.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/brpop
+ */
+class BRPOP extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'BRPOP';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[0])) {
+            [$arguments, $timeout] = $arguments;
+            array_push($arguments, $timeout);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHeadBlocking.php b/plugins/cache-redis/Predis/Command/Redis/BRPOPLPUSH.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHeadBlocking.php
rename to plugins/cache-redis/Predis/Command/Redis/BRPOPLPUSH.php
index ee9c93c85..5cd9cb941 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHeadBlocking.php
+++ b/plugins/cache-redis/Predis/Command/Redis/BRPOPLPUSH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/brpoplpush
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/brpoplpush
  */
-class ListPopLastPushHeadBlocking extends Command
+class BRPOPLPUSH extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BZMPOP.php b/plugins/cache-redis/Predis/Command/Redis/BZMPOP.php
new file mode 100644
index 000000000..2ed6f7893
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BZMPOP.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+/**
+ * @see https://redis.io/commands/bzmpop/
+ *
+ * BZMPOP is the blocking variant of ZMPOP.
+ */
+class BZMPOP extends ZMPOP
+{
+    protected static $keysArgumentPositionOffset = 1;
+    protected static $countArgumentPositionOffset = 3;
+    protected static $modifierArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'BZMPOP';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BZPOPMAX.php b/plugins/cache-redis/Predis/Command/Redis/BZPOPMAX.php
new file mode 100644
index 000000000..1abd1bddd
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BZPOPMAX.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Redis\AbstractCommand\BZPOPBase;
+
+/**
+ * @see https://redis.io/commands/bzpopmax/
+ *
+ * BZPOPMAX is the blocking variant of the sorted set ZPOPMAX primitive.
+ *
+ * It is the blocking version because it blocks the connection when there are
+ * no members to pop from any of the given sorted sets.
+ * A member with the highest score is popped from first sorted set that is non-empty,
+ * with the given keys being checked in the order that they are given.
+ */
+class BZPOPMAX extends BZPOPBase
+{
+    public function getId(): string
+    {
+        return 'BZPOPMAX';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BZPOPMIN.php b/plugins/cache-redis/Predis/Command/Redis/BZPOPMIN.php
new file mode 100644
index 000000000..5b1a32524
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BZPOPMIN.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Redis\AbstractCommand\BZPOPBase;
+
+/**
+ * @see https://redis.io/commands/bzpopmin/
+ *
+ * BZPOPMIN is the blocking variant of the sorted set ZPOPMIN primitive.
+ *
+ * It is the blocking version because it blocks the connection when there are
+ * no members to pop from any of the given sorted sets.
+ * A member with the lowest score is popped from first sorted set that is non-empty,
+ * with the given keys being checked in the order that they are given.
+ */
+class BZPOPMIN extends BZPOPBase
+{
+    public function getId(): string
+    {
+        return 'BZPOPMIN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFADD.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFADD.php
new file mode 100644
index 000000000..af30de08d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFADD.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.add/
+ *
+ * Creates an empty Bloom Filter with a single sub-filter for the
+ * initial capacity requested and with an upper bound error_rate.
+ */
+class BFADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.ADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFEXISTS.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFEXISTS.php
new file mode 100644
index 000000000..73f0fbc5b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFEXISTS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.exists/
+ *
+ * Determines whether an item may exist in the Bloom Filter or not.
+ */
+class BFEXISTS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.EXISTS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINFO.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINFO.php
new file mode 100644
index 000000000..00acd4d57
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINFO.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+use UnexpectedValueException;
+
+/**
+ * @see https://redis.io/commands/bf.info/
+ *
+ * Return information about key filter.
+ */
+class BFINFO extends RedisCommand
+{
+    /**
+     * @var string[]
+     */
+    private $modifierEnum = [
+        'capacity' => 'CAPACITY',
+        'size' => 'SIZE',
+        'filters' => 'FILTERS',
+        'items' => 'ITEMS',
+        'expansion' => 'EXPANSION',
+    ];
+
+    public function getId()
+    {
+        return 'BF.INFO';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (isset($arguments[1])) {
+            $modifier = array_pop($arguments);
+
+            if ($modifier === '') {
+                parent::setArguments($arguments);
+
+                return;
+            }
+
+            if (!in_array(strtoupper($modifier), $this->modifierEnum)) {
+                $enumValues = implode(', ', array_keys($this->modifierEnum));
+                throw new UnexpectedValueException("Argument accepts only: {$enumValues} values");
+            }
+
+            $arguments[] = $this->modifierEnum[strtolower($modifier)];
+        }
+
+        parent::setArguments($arguments);
+    }
+
+    public function parseResponse($data)
+    {
+        if (count($data) > 1) {
+            $result = [];
+
+            for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+                if (array_key_exists($i + 1, $data)) {
+                    $result[(string) $data[$i]] = $data[++$i];
+                }
+            }
+
+            return $result;
+        }
+
+        return $data;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINSERT.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINSERT.php
new file mode 100644
index 000000000..50e23eeaf
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFINSERT.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BloomFilters\Capacity;
+use Predis\Command\Traits\BloomFilters\Error;
+use Predis\Command\Traits\BloomFilters\Expansion;
+use Predis\Command\Traits\BloomFilters\Items;
+use Predis\Command\Traits\BloomFilters\NoCreate;
+
+class BFINSERT extends RedisCommand
+{
+    use Capacity {
+        Capacity::setArguments as setCapacity;
+    }
+    use Error {
+        Error::setArguments as setErrorRate;
+    }
+    use Expansion {
+        Expansion::setArguments as setExpansion;
+    }
+    use Items {
+        Items::setArguments as setItems;
+    }
+    use NoCreate {
+        NoCreate::setArguments as setNoCreate;
+    }
+
+    protected static $capacityArgumentPositionOffset = 1;
+    protected static $errorArgumentPositionOffset = 2;
+    protected static $expansionArgumentPositionOffset = 3;
+    protected static $noCreateArgumentPositionOffset = 4;
+    protected static $itemsArgumentPositionOffset = 6;
+
+    public function getId()
+    {
+        return 'BF.INSERT';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setNoCreate($arguments);
+        $arguments = $this->getArguments();
+
+        if (array_key_exists(5, $arguments) && $arguments[5]) {
+            $arguments[5] = 'NONSCALING';
+        }
+
+        $this->setItems($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setExpansion($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setErrorRate($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setCapacity($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFLOADCHUNK.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFLOADCHUNK.php
new file mode 100644
index 000000000..76a78e997
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFLOADCHUNK.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.loadchunk/
+ *
+ * Restores a filter previously saved using SCANDUMP. See the SCANDUMP command for example usage.
+ */
+class BFLOADCHUNK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.LOADCHUNK';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMADD.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMADD.php
new file mode 100644
index 000000000..164664653
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMADD.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.madd/
+ *
+ * Adds one or more items to the Bloom Filter and creates the filter if it does not exist yet.
+ * This command operates identically to BF.ADD except that it allows multiple inputs and returns multiple values.
+ */
+class BFMADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.MADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMEXISTS.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMEXISTS.php
new file mode 100644
index 000000000..e71a368b7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFMEXISTS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.mexists/
+ *
+ * Determines if one or more items may exist in the filter or not.
+ */
+class BFMEXISTS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.MEXISTS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFRESERVE.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFRESERVE.php
new file mode 100644
index 000000000..2364db480
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFRESERVE.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BloomFilters\Expansion;
+
+/**
+ * @see https://redis.io/commands/bf.reserve/
+ *
+ * Creates an empty Bloom Filter with a single sub-filter for the initial capacity
+ * requested and with an upper bound error_rate.
+ *
+ * By default, the filter auto-scales by creating additional sub-filters when capacity is reached.
+ * The new sub-filter is created with size of the previous sub-filter multiplied by expansion.
+ */
+class BFRESERVE extends RedisCommand
+{
+    use Expansion {
+        Expansion::setArguments as setExpansion;
+    }
+
+    protected static $expansionArgumentPositionOffset = 3;
+
+    public function getId()
+    {
+        return 'BF.RESERVE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (array_key_exists(4, $arguments) && $arguments[4]) {
+            $arguments[4] = 'NONSCALING';
+        }
+
+        $this->setExpansion($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFSCANDUMP.php b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFSCANDUMP.php
new file mode 100644
index 000000000..f8576d2d0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/BloomFilter/BFSCANDUMP.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\BloomFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/bf.scandump/
+ *
+ * Begins an incremental save of the bloom filter.
+ * This is useful for large bloom filters which cannot fit into the normal DUMP and RESTORE model.
+ */
+class BFSCANDUMP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'BF.SCANDUMP';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerClient.php b/plugins/cache-redis/Predis/Command/Redis/CLIENT.php
similarity index 70%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerClient.php
rename to plugins/cache-redis/Predis/Command/Redis/CLIENT.php
index d00ebbfff..6c7bdc9ca 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerClient.php
+++ b/plugins/cache-redis/Predis/Command/Redis/CLIENT.php
@@ -3,23 +3,24 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/client-list
- * @link http://redis.io/commands/client-kill
- * @link http://redis.io/commands/client-getname
- * @link http://redis.io/commands/client-setname
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/client-list
+ * @see http://redis.io/commands/client-kill
+ * @see http://redis.io/commands/client-getname
+ * @see http://redis.io/commands/client-setname
  */
-class ServerClient extends Command
+class CLIENT extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -44,7 +45,7 @@ class ServerClient extends Command
             case 'SETNAME':
             default:
                 return $data;
-        }
+        } // @codeCoverageIgnore
     }
 
     /**
@@ -56,13 +57,13 @@ class ServerClient extends Command
      */
     protected function parseClientList($data)
     {
-        $clients = array();
+        $clients = [];
 
         foreach (explode("\n", $data, -1) as $clientData) {
-            $client = array();
+            $client = [];
 
             foreach (explode(' ', $clientData) as $kv) {
-                @list($k, $v) = explode('=', $kv);
+                @[$k, $v] = explode('=', $kv);
                 $client[$k] = $v;
             }
 
diff --git a/plugins/cache-redis/Predis/Command/Redis/CLUSTER.php b/plugins/cache-redis/Predis/Command/Redis/CLUSTER.php
new file mode 100644
index 000000000..3bbb77cc8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CLUSTER.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/?name=cluster
+ */
+class CLUSTER extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CLUSTER';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/COMMAND.php b/plugins/cache-redis/Predis/Command/Redis/COMMAND.php
new file mode 100644
index 000000000..385d54ee9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/COMMAND.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as BaseCommand;
+
+/**
+ * @see http://redis.io/commands/command
+ */
+class COMMAND extends BaseCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'COMMAND';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        // Relay (RESP3) uses maps and it might be good
+        // to make the return value a breaking change
+
+        return $data;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerConfig.php b/plugins/cache-redis/Predis/Command/Redis/CONFIG.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerConfig.php
rename to plugins/cache-redis/Predis/Command/Redis/CONFIG.php
index 81e497aea..c60ac2dcc 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerConfig.php
+++ b/plugins/cache-redis/Predis/Command/Redis/CONFIG.php
@@ -3,23 +3,24 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/config-set
- * @link http://redis.io/commands/config-get
- * @link http://redis.io/commands/config-resetstat
- * @link http://redis.io/commands/config-rewrite
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/config-set
+ * @see http://redis.io/commands/config-get
+ * @see http://redis.io/commands/config-resetstat
+ * @see http://redis.io/commands/config-rewrite
  */
-class ServerConfig extends Command
+class CONFIG extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -35,7 +36,11 @@ class ServerConfig extends Command
     public function parseResponse($data)
     {
         if (is_array($data)) {
-            $result = array();
+            if ($data !== array_values($data)) {
+                return $data; // Relay
+            }
+
+            $result = [];
 
             for ($i = 0; $i < count($data); ++$i) {
                 $result[$data[$i]] = $data[++$i];
diff --git a/plugins/cache-redis/Predis/Command/Redis/COPY.php b/plugins/cache-redis/Predis/Command/Redis/COPY.php
new file mode 100644
index 000000000..cb6ec659b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/COPY.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\DB;
+use Predis\Command\Traits\Replace;
+
+/**
+ * @see https://redis.io/commands/copy/
+ *
+ * This command copies the value stored at the source key to the destination key.
+ */
+class COPY extends RedisCommand
+{
+    use DB {
+        DB::setArguments as setDB;
+    }
+    use Replace {
+        Replace::setArguments as setReplace;
+    }
+
+    protected static $dbArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'COPY';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setDB($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setReplace($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/ACL.php b/plugins/cache-redis/Predis/Command/Redis/Container/ACL.php
new file mode 100644
index 000000000..2699d37e8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/ACL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+use Predis\Response\Status;
+
+/**
+ * @method Status dryRun(string $username, string $command, ...$arguments)
+ * @method array  getUser(string $username)
+ * @method Status setUser(string $username, string ...$rules)
+ */
+class ACL extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'acl';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/AbstractContainer.php b/plugins/cache-redis/Predis/Command/Redis/Container/AbstractContainer.php
new file mode 100644
index 000000000..4aff4ef04
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/AbstractContainer.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+use Predis\ClientInterface;
+
+abstract class AbstractContainer implements ContainerInterface
+{
+    /**
+     * @var ClientInterface
+     */
+    protected $client;
+
+    public function __construct(ClientInterface $client)
+    {
+        $this->client = $client;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __call(string $subcommandID, array $arguments)
+    {
+        array_unshift($arguments, strtoupper($subcommandID));
+
+        return $this->client->executeCommand(
+            $this->client->createCommand($this->getContainerCommandId(), $arguments)
+        );
+    }
+
+    abstract public function getContainerCommandId(): string;
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/CLUSTER.php b/plugins/cache-redis/Predis/Command/Redis/Container/CLUSTER.php
new file mode 100644
index 000000000..b2925b19b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/CLUSTER.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+use Predis\Response\Status;
+
+/**
+ * @method Status addSlotsRange(int ...$startEndSlots)
+ * @method Status delSlotsRange(int ...$startEndSlots)
+ * @method array  links()
+ * @method array  shards()
+ */
+class CLUSTER extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'CLUSTER';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/ContainerFactory.php b/plugins/cache-redis/Predis/Command/Redis/Container/ContainerFactory.php
new file mode 100644
index 000000000..79d3de099
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/ContainerFactory.php
@@ -0,0 +1,81 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+use Predis\ClientConfiguration;
+use Predis\ClientInterface;
+use UnexpectedValueException;
+
+class ContainerFactory
+{
+    private const CONTAINER_NAMESPACE = "Predis\Command\Redis\Container";
+
+    /**
+     * Mappings for class names that corresponds to PHP reserved words.
+     *
+     * @var array
+     */
+    private static $specialMappings = [
+        'FUNCTION' => FunctionContainer::class,
+    ];
+
+    /**
+     * Creates container command.
+     *
+     * @param  ClientInterface    $client
+     * @param  string             $containerCommandID
+     * @return ContainerInterface
+     */
+    public static function create(ClientInterface $client, string $containerCommandID): ContainerInterface
+    {
+        $containerCommandID = strtoupper($containerCommandID);
+        $commandModule = self::resolveCommandModuleByPrefix($containerCommandID);
+
+        if (null !== $commandModule) {
+            if (class_exists($containerClass = self::CONTAINER_NAMESPACE . '\\' . $commandModule . '\\' . $containerCommandID)) {
+                return new $containerClass($client);
+            }
+
+            throw new UnexpectedValueException('Given module container command is not supported.');
+        }
+
+        if (class_exists($containerClass = self::CONTAINER_NAMESPACE . '\\' . $containerCommandID)) {
+            return new $containerClass($client);
+        }
+
+        if (array_key_exists($containerCommandID, self::$specialMappings)) {
+            $containerClass = self::$specialMappings[$containerCommandID];
+
+            return new $containerClass($client);
+        }
+
+        throw new UnexpectedValueException('Given container command is not supported.');
+    }
+
+    /**
+     * @param  string      $commandID
+     * @return string|null
+     */
+    private static function resolveCommandModuleByPrefix(string $commandID): ?string
+    {
+        $modules = ClientConfiguration::getModules();
+
+        foreach ($modules as $module) {
+            if (preg_match("/^{$module['commandPrefix']}/", $commandID)) {
+                return $module['name'];
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/ContainerInterface.php b/plugins/cache-redis/Predis/Command/Redis/Container/ContainerInterface.php
new file mode 100644
index 000000000..e30c539e3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/ContainerInterface.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+interface ContainerInterface
+{
+    /**
+     * Creates Redis container command with subcommand as virtual method name
+     * and sends a request to the server.
+     *
+     * @param  string $subcommandID
+     * @param  array  $arguments
+     * @return mixed
+     */
+    public function __call(string $subcommandID, array $arguments);
+
+    /**
+     * Returns containerCommandId of specific container command.
+     *
+     * @return string
+     */
+    public function getContainerCommandId(): string;
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
new file mode 100644
index 000000000..8f2a673d1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/FunctionContainer.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container;
+
+use Predis\Response\Status;
+
+/**
+ * @method Status delete(string $libraryName)
+ * @method string dump()
+ * @method Status flush(?string $mode = null)
+ * @method Status kill()
+ * @method array  list(string $libraryNamePattern = null, bool $withCode = false)
+ * @method string load(string $functionCode, bool $replace = 'false')
+ * @method Status restore(string $value, string $policy = null)
+ * @method array  stats()
+ */
+class FunctionContainer extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'FUNCTIONS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/Json/JSONDEBUG.php b/plugins/cache-redis/Predis/Command/Redis/Container/Json/JSONDEBUG.php
new file mode 100644
index 000000000..b20baca09
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/Json/JSONDEBUG.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container\Json;
+
+use Predis\Command\Redis\Container\AbstractContainer;
+
+/**
+ * @method array memory(string $key, string $path)
+ * @method array help()
+ */
+class JSONDEBUG extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'JSONDEBUG';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCONFIG.php b/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCONFIG.php
new file mode 100644
index 000000000..9e80b8c54
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCONFIG.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container\Search;
+
+use Predis\Command\Redis\Container\AbstractContainer;
+use Predis\Response\Status;
+
+/**
+ * @method array  get(string $option)
+ * @method array  help(string $option)
+ * @method Status set(string $option, $value)
+ */
+class FTCONFIG extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'FTCONFIG';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCURSOR.php b/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCURSOR.php
new file mode 100644
index 000000000..4d47c9c0e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Container/Search/FTCURSOR.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Container\Search;
+
+use Predis\Command\Argument\Search\CursorArguments;
+use Predis\Command\Redis\Container\AbstractContainer;
+use Predis\Response\Status;
+
+/**
+ * @method Status del(string $index, int $cursorId)
+ * @method array  read(string $index, int $cursorId, ?CursorArguments $arguments = null)
+ */
+class FTCURSOR extends AbstractContainer
+{
+    public function getContainerCommandId(): string
+    {
+        return 'FTCURSOR';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINCRBY.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINCRBY.php
new file mode 100644
index 000000000..6ce433852
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINCRBY.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.incrby/
+ *
+ * Increases the count of item by increment.
+ * Multiple items can be increased with one call.
+ */
+class CMSINCRBY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.INCRBY';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINFO.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINFO.php
new file mode 100644
index 000000000..ed6d2249a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINFO.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.info/
+ *
+ * Returns width, depth and total count of the sketch.
+ */
+class CMSINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.INFO';
+    }
+
+    public function parseResponse($data)
+    {
+        if (count($data) > 1) {
+            $result = [];
+
+            for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+                if (array_key_exists($i + 1, $data)) {
+                    $result[(string) $data[$i]] = $data[++$i];
+                }
+            }
+
+            return $result;
+        }
+
+        return $data;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM.php
new file mode 100644
index 000000000..8f1f23ff3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYDIM.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.initbydim/
+ *
+ * Initializes a Count-Min Sketch to dimensions specified by user.
+ */
+class CMSINITBYDIM extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.INITBYDIM';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB.php
new file mode 100644
index 000000000..76e0a788e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSINITBYPROB.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.initbyprob/
+ *
+ * Initializes a Count-Min Sketch to accommodate requested tolerances.
+ */
+class CMSINITBYPROB extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.INITBYPROB';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSMERGE.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSMERGE.php
new file mode 100644
index 000000000..0e85c3b06
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSMERGE.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.merge/
+ *
+ * Merges several sketches into one sketch.
+ * All sketches must have identical width and depth.
+ * Weights can be used to multiply certain sketches. Default weight is 1.
+ */
+class CMSMERGE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.MERGE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $processedArguments = array_merge([$arguments[0], count($arguments[1])], $arguments[1]);
+
+        if (!empty($arguments[2])) {
+            $processedArguments[] = 'WEIGHTS';
+            $processedArguments = array_merge($processedArguments, $arguments[2]);
+        }
+
+        parent::setArguments($processedArguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSQUERY.php b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSQUERY.php
new file mode 100644
index 000000000..b9f734316
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CountMinSketch/CMSQUERY.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CountMinSketch;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cms.query/
+ *
+ * Returns the count for one or more items in a sketch.
+ */
+class CMSQUERY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CMS.QUERY';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADD.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADD.php
new file mode 100644
index 000000000..92d05889a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADD.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.add/
+ *
+ * Adds an item to the cuckoo filter, creating the filter if it does not exist.
+ */
+class CFADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.ADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADDNX.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADDNX.php
new file mode 100644
index 000000000..ff972fd33
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFADDNX.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.addnx/
+ *
+ * Adds an item to a cuckoo filter if the item did not exist previously.
+ */
+class CFADDNX extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.ADDNX';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFCOUNT.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFCOUNT.php
new file mode 100644
index 000000000..7610c2c08
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFCOUNT.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.count/
+ *
+ * Returns the number of times an item may be in the filter.
+ * Because this is a probabilistic data structure, this may not necessarily be accurate.
+ */
+class CFCOUNT extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.COUNT';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFDEL.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFDEL.php
new file mode 100644
index 000000000..adbd29ea2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFDEL.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.del/
+ *
+ * Deletes an item once from the filter.
+ * If the item exists only once, it will be removed from the filter.
+ * If the item was added multiple times, it will still be present.
+ */
+class CFDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.DEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFEXISTS.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFEXISTS.php
new file mode 100644
index 000000000..2d3e635a8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFEXISTS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.exists/
+ *
+ * Check if an item exists in a Cuckoo Filter key.
+ */
+class CFEXISTS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.EXISTS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINFO.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINFO.php
new file mode 100644
index 000000000..9a34640ee
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINFO.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.info/
+ *
+ * Return information about key
+ */
+class CFINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.INFO';
+    }
+
+    public function parseResponse($data)
+    {
+        if (count($data) > 1) {
+            $result = [];
+
+            for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+                if (array_key_exists($i + 1, $data)) {
+                    $result[(string) $data[$i]] = $data[++$i];
+                }
+            }
+
+            return $result;
+        }
+
+        return $data;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERT.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERT.php
new file mode 100644
index 000000000..3a49a38d7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERT.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BloomFilters\Capacity;
+use Predis\Command\Traits\BloomFilters\Items;
+use Predis\Command\Traits\BloomFilters\NoCreate;
+
+class CFINSERT extends RedisCommand
+{
+    use Capacity {
+        Capacity::setArguments as setCapacity;
+    }
+    use NoCreate {
+        NoCreate::setArguments as setNoCreate;
+    }
+    use Items {
+        Items::setArguments as setItems;
+    }
+
+    protected static $capacityArgumentPositionOffset = 1;
+    protected static $noCreateArgumentPositionOffset = 2;
+    protected static $itemsArgumentPositionOffset = 3;
+
+    public function getId()
+    {
+        return 'CF.INSERT';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setNoCreate($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setItems($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setCapacity($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERTNX.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERTNX.php
new file mode 100644
index 000000000..629327b4f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFINSERTNX.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+/**
+ * @see https://redis.io/commands/cf.insertnx/
+ *
+ * Adds one or more items to a cuckoo filter, allowing the filter
+ * to be created with a custom capacity if it does not exist yet.
+ */
+class CFINSERTNX extends CFINSERT
+{
+    public function getId()
+    {
+        return 'CF.INSERTNX';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK.php
new file mode 100644
index 000000000..6a9615524
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFLOADCHUNK.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.loadchunk/
+ *
+ * Restores a filter previously saved using SCANDUMP.
+ * See the SCANDUMP command for example usage.
+ */
+class CFLOADCHUNK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.LOADCHUNK';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFMEXISTS.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFMEXISTS.php
new file mode 100644
index 000000000..61ae95584
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFMEXISTS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.mexists/
+ *
+ * Check if one or more items exists in a Cuckoo Filter key.
+ */
+class CFMEXISTS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.MEXISTS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFRESERVE.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFRESERVE.php
new file mode 100644
index 000000000..bfdb93aa5
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFRESERVE.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\BloomFilters\BucketSize;
+use Predis\Command\Traits\BloomFilters\Expansion;
+use Predis\Command\Traits\BloomFilters\MaxIterations;
+
+class CFRESERVE extends RedisCommand
+{
+    use BucketSize {
+        BucketSize::setArguments as setBucketSize;
+    }
+    use MaxIterations {
+        MaxIterations::setArguments as setMaxIterations;
+    }
+    use Expansion {
+        Expansion::setArguments as setExpansion;
+    }
+
+    protected static $bucketSizeArgumentPositionOffset = 2;
+    protected static $maxIterationsArgumentPositionOffset = 3;
+    protected static $expansionArgumentPositionOffset = 4;
+
+    public function getId()
+    {
+        return 'CF.RESERVE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setExpansion($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setMaxIterations($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setBucketSize($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFSCANDUMP.php b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFSCANDUMP.php
new file mode 100644
index 000000000..59caa651c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/CuckooFilter/CFSCANDUMP.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\CuckooFilter;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/cf.scandump/
+ *
+ * Begins an incremental save of the cuckoo filter.
+ * This is useful for large cuckoo filters which cannot fit into the normal DUMP and RESTORE model.
+ */
+class CFSCANDUMP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'CF.SCANDUMP';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerDatabaseSize.php b/plugins/cache-redis/Predis/Command/Redis/DBSIZE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerDatabaseSize.php
rename to plugins/cache-redis/Predis/Command/Redis/DBSIZE.php
index 6bc89724d..f0dc10b14 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerDatabaseSize.php
+++ b/plugins/cache-redis/Predis/Command/Redis/DBSIZE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/dbsize
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/dbsize
  */
-class ServerDatabaseSize extends Command
+class DBSIZE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrement.php b/plugins/cache-redis/Predis/Command/Redis/DECR.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrement.php
rename to plugins/cache-redis/Predis/Command/Redis/DECR.php
index aa5808cd0..453f683a8 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrement.php
+++ b/plugins/cache-redis/Predis/Command/Redis/DECR.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/decr
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/decr
  */
-class StringDecrement extends Command
+class DECR extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrementBy.php b/plugins/cache-redis/Predis/Command/Redis/DECRBY.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrementBy.php
rename to plugins/cache-redis/Predis/Command/Redis/DECRBY.php
index cbf3e1124..15eace6be 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringDecrementBy.php
+++ b/plugins/cache-redis/Predis/Command/Redis/DECRBY.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/decrby
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/decrby
  */
-class StringDecrementBy extends Command
+class DECRBY extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/DEL.php b/plugins/cache-redis/Predis/Command/Redis/DEL.php
new file mode 100644
index 000000000..359bbf4ff
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/DEL.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/del
+ */
+class DEL extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'DEL';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/DISCARD.php b/plugins/cache-redis/Predis/Command/Redis/DISCARD.php
new file mode 100644
index 000000000..251e30499
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/DISCARD.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/discard
+ */
+class DISCARD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'DISCARD';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDump.php b/plugins/cache-redis/Predis/Command/Redis/DUMP.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDump.php
rename to plugins/cache-redis/Predis/Command/Redis/DUMP.php
index 6d9c48800..32f47c575 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDump.php
+++ b/plugins/cache-redis/Predis/Command/Redis/DUMP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/dump
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/dump
  */
-class KeyDump extends Command
+class DUMP extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionEcho.php b/plugins/cache-redis/Predis/Command/Redis/ECHO_.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionEcho.php
rename to plugins/cache-redis/Predis/Command/Redis/ECHO_.php
index fd4960971..c04adea33 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionEcho.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ECHO_.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/echo
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/echo
  */
-class ConnectionEcho extends Command
+class ECHO_ extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEvalSHA.php b/plugins/cache-redis/Predis/Command/Redis/EVALSHA.php
similarity index 70%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEvalSHA.php
rename to plugins/cache-redis/Predis/Command/Redis/EVALSHA.php
index 520a8e985..ee7a38087 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEvalSHA.php
+++ b/plugins/cache-redis/Predis/Command/Redis/EVALSHA.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/evalsha
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/evalsha
  */
-class ServerEvalSHA extends ServerEval
+class EVALSHA extends EVAL_
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EVALSHA_RO.php b/plugins/cache-redis/Predis/Command/Redis/EVALSHA_RO.php
new file mode 100644
index 000000000..809a08757
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EVALSHA_RO.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+/**
+ * @see https://redis.io/commands/evalsha_ro/
+ *
+ * This is a read-only variant of the EVALSHA command
+ * that cannot execute commands that modify data.
+ */
+class EVALSHA_RO extends EVAL_RO
+{
+    public function getId()
+    {
+        return 'EVALSHA_RO';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEval.php b/plugins/cache-redis/Predis/Command/Redis/EVAL_.php
similarity index 70%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEval.php
rename to plugins/cache-redis/Predis/Command/Redis/EVAL_.php
index f5eefd811..0e18fde94 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerEval.php
+++ b/plugins/cache-redis/Predis/Command/Redis/EVAL_.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/eval
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/eval
  */
-class ServerEval extends Command
+class EVAL_ extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EVAL_RO.php b/plugins/cache-redis/Predis/Command/Redis/EVAL_RO.php
new file mode 100644
index 000000000..cef8bd35e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EVAL_RO.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+
+/**
+ * @see https://redis.io/commands/eval_ro/
+ *
+ * This is a read-only variant of the EVAL command
+ * that cannot execute commands that modify data.
+ */
+class EVAL_RO extends RedisCommand
+{
+    use Keys;
+
+    protected static $keysArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'EVAL_RO';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionExec.php b/plugins/cache-redis/Predis/Command/Redis/EXEC.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionExec.php
rename to plugins/cache-redis/Predis/Command/Redis/EXEC.php
index dbd81aae9..7fea7094d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionExec.php
+++ b/plugins/cache-redis/Predis/Command/Redis/EXEC.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/exec
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/exec
  */
-class TransactionExec extends Command
+class EXEC extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EXISTS.php b/plugins/cache-redis/Predis/Command/Redis/EXISTS.php
new file mode 100644
index 000000000..8731c9d84
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EXISTS.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/exists
+ */
+class EXISTS extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'EXISTS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EXPIRE.php b/plugins/cache-redis/Predis/Command/Redis/EXPIRE.php
new file mode 100644
index 000000000..9957acde6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EXPIRE.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Expire\ExpireOptions;
+
+/**
+ * @see http://redis.io/commands/expire
+ *
+ * Set a timeout on key.
+ * After the timeout has expired, the key will automatically be deleted.
+ * A key with an associated timeout is often said to be volatile in Redis terminology.
+ */
+class EXPIRE extends RedisCommand
+{
+    use ExpireOptions;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'EXPIRE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EXPIREAT.php b/plugins/cache-redis/Predis/Command/Redis/EXPIREAT.php
new file mode 100644
index 000000000..ad9314de2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EXPIREAT.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Expire\ExpireOptions;
+
+/**
+ * @see http://redis.io/commands/expireat
+ *
+ * EXPIREAT has the same effect and semantic as EXPIRE, but instead of specifying
+ * the number of seconds representing the TTL (time to live), it takes an absolute Unix timestamp
+ */
+class EXPIREAT extends RedisCommand
+{
+    use ExpireOptions;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'EXPIREAT';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/EXPIRETIME.php b/plugins/cache-redis/Predis/Command/Redis/EXPIRETIME.php
new file mode 100644
index 000000000..8825589da
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/EXPIRETIME.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/expiretime/
+ *
+ * Returns the absolute Unix timestamp (since January 1, 1970)
+ * in seconds at which the given key will expire.
+ */
+class EXPIRETIME extends RedisCommand
+{
+    public function getId()
+    {
+        return 'EXPIRETIME';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/FAILOVER.php b/plugins/cache-redis/Predis/Command/Redis/FAILOVER.php
new file mode 100644
index 000000000..61fdb7bbe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/FAILOVER.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Timeout;
+use Predis\Command\Traits\To\ServerTo;
+
+class FAILOVER extends RedisCommand
+{
+    use ServerTo {
+        ServerTo::setArguments as setTo;
+    }
+    use Timeout {
+        Timeout::setArguments as setTimeout;
+    }
+
+    protected static $toArgumentPositionOffset = 0;
+    protected static $timeoutArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'FAILOVER';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (array_key_exists(1, $arguments) && false !== $arguments[1]) {
+            $arguments[1] = 'ABORT';
+        }
+
+        $this->setTimeout($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setTo($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/FCALL.php b/plugins/cache-redis/Predis/Command/Redis/FCALL.php
new file mode 100644
index 000000000..cc5639321
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/FCALL.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+
+/**
+ * @see https://redis.io/commands/fcall/
+ *
+ * Invoke a function.
+ */
+class FCALL extends RedisCommand
+{
+    use Keys;
+
+    protected static $keysArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'FCALL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/FCALL_RO.php b/plugins/cache-redis/Predis/Command/Redis/FCALL_RO.php
new file mode 100644
index 000000000..8680e7055
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/FCALL_RO.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/fcall_ro/
+ *
+ * This is a read-only variant of the FCALL command that cannot execute commands that modify data.
+ */
+class FCALL_RO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FCALL_RO';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $processedArguments = array_merge([$arguments[0], count($arguments[1])], $arguments[1]);
+
+        if (count($arguments) > 2) {
+            for ($i = 2, $iMax = count($arguments); $i < $iMax; $i++) {
+                $processedArguments[] = $arguments[$i];
+            }
+        }
+
+        parent::setArguments($processedArguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushAll.php b/plugins/cache-redis/Predis/Command/Redis/FLUSHALL.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushAll.php
rename to plugins/cache-redis/Predis/Command/Redis/FLUSHALL.php
index c35b2ad6a..a03a3133d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushAll.php
+++ b/plugins/cache-redis/Predis/Command/Redis/FLUSHALL.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/flushall
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/flushall
  */
-class ServerFlushAll extends Command
+class FLUSHALL extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushDatabase.php b/plugins/cache-redis/Predis/Command/Redis/FLUSHDB.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushDatabase.php
rename to plugins/cache-redis/Predis/Command/Redis/FLUSHDB.php
index 3da6b320d..67a2d485b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerFlushDatabase.php
+++ b/plugins/cache-redis/Predis/Command/Redis/FLUSHDB.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/flushdb
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/flushdb
  */
-class ServerFlushDatabase extends Command
+class FLUSHDB extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/FUNCTIONS.php b/plugins/cache-redis/Predis/Command/Redis/FUNCTIONS.php
new file mode 100644
index 000000000..7f4fde79a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/FUNCTIONS.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Strategy\StrategyResolverInterface;
+use Predis\Command\Strategy\SubcommandStrategyResolver;
+
+/**
+ * @see https://redis.io/commands/?name=function
+ *
+ * Container command corresponds to any FUNCTION *.
+ * Represents any FUNCTION command with subcommand as first argument.
+ */
+class FUNCTIONS extends RedisCommand
+{
+    /**
+     * @var StrategyResolverInterface
+     */
+    private $strategyResolver;
+
+    public function __construct()
+    {
+        $this->strategyResolver = new SubcommandStrategyResolver();
+    }
+
+    public function getId()
+    {
+        return 'FUNCTION';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $strategy = $this->strategyResolver->resolve('functions', strtolower($arguments[0]));
+        $arguments = $strategy->processArguments($arguments);
+
+        parent::setArguments($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEOADD.php b/plugins/cache-redis/Predis/Command/Redis/GEOADD.php
new file mode 100644
index 000000000..56156b72b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEOADD.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/geoadd
+ */
+class GEOADD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOADD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            foreach (array_pop($arguments) as $item) {
+                $arguments = array_merge($arguments, $item);
+            }
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEODIST.php b/plugins/cache-redis/Predis/Command/Redis/GEODIST.php
new file mode 100644
index 000000000..bf2bf2873
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEODIST.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/geodist
+ */
+class GEODIST extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEODIST';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEOHASH.php b/plugins/cache-redis/Predis/Command/Redis/GEOHASH.php
new file mode 100644
index 000000000..11df0dcae
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEOHASH.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/geohash
+ */
+class GEOHASH extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOHASH';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $members = array_pop($arguments);
+            $arguments = array_merge($arguments, $members);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEOPOS.php b/plugins/cache-redis/Predis/Command/Redis/GEOPOS.php
new file mode 100644
index 000000000..2938f276b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEOPOS.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/geopos
+ */
+class GEOPOS extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEOPOS';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $members = array_pop($arguments);
+            $arguments = array_merge($arguments, $members);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEORADIUS.php b/plugins/cache-redis/Predis/Command/Redis/GEORADIUS.php
new file mode 100644
index 000000000..c94ee81ac
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEORADIUS.php
@@ -0,0 +1,77 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @deprecated As of Redis version 6.2.0, this command is regarded as deprecated.
+ *
+ * It can be replaced by GEOSEARCH and GEOSEARCHSTORE with the BYRADIUS argument
+ * when migrating or writing new code.
+ *
+ * @see http://redis.io/commands/georadius
+ */
+class GEORADIUS extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEORADIUS';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if ($arguments && is_array(end($arguments))) {
+            $options = array_change_key_case(array_pop($arguments), CASE_UPPER);
+
+            if (isset($options['WITHCOORD']) && $options['WITHCOORD'] == true) {
+                $arguments[] = 'WITHCOORD';
+            }
+
+            if (isset($options['WITHDIST']) && $options['WITHDIST'] == true) {
+                $arguments[] = 'WITHDIST';
+            }
+
+            if (isset($options['WITHHASH']) && $options['WITHHASH'] == true) {
+                $arguments[] = 'WITHHASH';
+            }
+
+            if (isset($options['COUNT'])) {
+                $arguments[] = 'COUNT';
+                $arguments[] = $options['COUNT'];
+            }
+
+            if (isset($options['SORT'])) {
+                $arguments[] = strtoupper($options['SORT']);
+            }
+
+            if (isset($options['STORE'])) {
+                $arguments[] = 'STORE';
+                $arguments[] = $options['STORE'];
+            }
+
+            if (isset($options['STOREDIST'])) {
+                $arguments[] = 'STOREDIST';
+                $arguments[] = $options['STOREDIST'];
+            }
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEORADIUSBYMEMBER.php b/plugins/cache-redis/Predis/Command/Redis/GEORADIUSBYMEMBER.php
new file mode 100644
index 000000000..542737172
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEORADIUSBYMEMBER.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+/**
+ * @deprecated As of Redis version 6.2.0, this command is regarded as deprecated.
+ *
+ * It can be replaced by GEOSEARCH and GEOSEARCHSTORE with the FROMMEMBER arguments
+ * when migrating or writing new code.
+ *
+ * @see http://redis.io/commands/georadiusbymember
+ */
+class GEORADIUSBYMEMBER extends GEORADIUS
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'GEORADIUSBYMEMBER';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEOSEARCH.php b/plugins/cache-redis/Predis/Command/Redis/GEOSEARCH.php
new file mode 100644
index 000000000..f1fcd2aef
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEOSEARCH.php
@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\By\GeoBy;
+use Predis\Command\Traits\Count;
+use Predis\Command\Traits\From\GeoFrom;
+use Predis\Command\Traits\Sorting;
+use Predis\Command\Traits\With\WithCoord;
+use Predis\Command\Traits\With\WithDist;
+use Predis\Command\Traits\With\WithHash;
+
+/**
+ * @see https://redis.io/commands/geosearch/
+ *
+ * Return the members of a sorted set populated with geospatial information using GEOADD,
+ * which are within the borders of the area specified by a given shape.
+ *
+ * This command extends the GEORADIUS command, so in addition to searching
+ * within circular areas, it supports searching within rectangular areas.
+ */
+class GEOSEARCH extends RedisCommand
+{
+    use GeoFrom {
+        GeoFrom::setArguments as setFrom;
+    }
+    use GeoBy {
+        GeoBy::setArguments as setBy;
+    }
+    use Sorting {
+        Sorting::setArguments as setSorting;
+    }
+    use Count {
+        Count::setArguments as setCount;
+    }
+    use WithCoord {
+        WithCoord::setArguments as setWithCoord;
+    }
+    use WithDist {
+        WithDist::setArguments as setWithDist;
+    }
+    use WithHash {
+        WithHash::setArguments as setWithHash;
+    }
+
+    protected static $sortArgumentPositionOffset = 3;
+    protected static $countArgumentPositionOffset = 4;
+    protected static $withCoordArgumentPositionOffset = 6;
+    protected static $withDistArgumentPositionOffset = 7;
+    protected static $withHashArgumentPositionOffset = 8;
+
+    public function getId()
+    {
+        return 'GEOSEARCH';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setSorting($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setWithCoord($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setWithDist($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setWithHash($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setCount($arguments, $arguments[5] ?? false);
+        $arguments = $this->getArguments();
+
+        $this->setFrom($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setBy($arguments);
+        $this->filterArguments();
+    }
+
+    public function parseResponse($data)
+    {
+        $parsedData = [];
+        $itemKey = '';
+
+        foreach ($data as $item) {
+            if (!is_array($item)) {
+                $parsedData[] = $item;
+                continue;
+            }
+
+            foreach ($item as $key => $itemRow) {
+                if ($key === 0) {
+                    $itemKey = $itemRow;
+                    continue;
+                }
+
+                if (is_string($itemRow)) {
+                    $parsedData[$itemKey]['dist'] = round((float) $itemRow, 5);
+                } elseif (is_int($itemRow)) {
+                    $parsedData[$itemKey]['hash'] = $itemRow;
+                } else {
+                    $parsedData[$itemKey]['lng'] = round($itemRow[0], 5);
+                    $parsedData[$itemKey]['lat'] = round($itemRow[1], 5);
+                }
+            }
+        }
+
+        return $parsedData;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GEOSEARCHSTORE.php b/plugins/cache-redis/Predis/Command/Redis/GEOSEARCHSTORE.php
new file mode 100644
index 000000000..6798db7ed
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GEOSEARCHSTORE.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\By\GeoBy;
+use Predis\Command\Traits\Count;
+use Predis\Command\Traits\From\GeoFrom;
+use Predis\Command\Traits\Sorting;
+use Predis\Command\Traits\Storedist;
+
+/**
+ * @see https://redis.io/commands/geosearchstore/
+ *
+ * This command is like GEOSEARCH, but stores the result in destination key.
+ */
+class GEOSEARCHSTORE extends RedisCommand
+{
+    use GeoFrom {
+        GeoFrom::setArguments as setFrom;
+    }
+    use GeoBy {
+        GeoBy::setArguments as setBy;
+    }
+    use Sorting {
+        Sorting::setArguments as setSorting;
+    }
+    use Count {
+        Count::setArguments as setCount;
+    }
+    use Storedist {
+        Storedist::setArguments as setStoreDist;
+    }
+
+    protected static $sortArgumentPositionOffset = 4;
+    protected static $countArgumentPositionOffset = 5;
+    protected static $storeDistArgumentPositionOffset = 7;
+
+    public function getId()
+    {
+        return 'GEOSEARCHSTORE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setStoreDist($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setCount($arguments, $arguments[6] ?? false);
+        $arguments = $this->getArguments();
+
+        $this->setSorting($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setFrom($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setBy($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGet.php b/plugins/cache-redis/Predis/Command/Redis/GET.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringGet.php
rename to plugins/cache-redis/Predis/Command/Redis/GET.php
index 138e915c2..e9177ab28 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGet.php
+++ b/plugins/cache-redis/Predis/Command/Redis/GET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/get
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/get
  */
-class StringGet extends Command
+class GET extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetBit.php b/plugins/cache-redis/Predis/Command/Redis/GETBIT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetBit.php
rename to plugins/cache-redis/Predis/Command/Redis/GETBIT.php
index 3c5b4f9b7..00ee97085 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetBit.php
+++ b/plugins/cache-redis/Predis/Command/Redis/GETBIT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/getbit
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/getbit
  */
-class StringGetBit extends Command
+class GETBIT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GETDEL.php b/plugins/cache-redis/Predis/Command/Redis/GETDEL.php
new file mode 100644
index 000000000..7e4df93c6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GETDEL.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+class GETDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'GETDEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/GETEX.php b/plugins/cache-redis/Predis/Command/Redis/GETEX.php
new file mode 100644
index 000000000..b2e10e114
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/GETEX.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use UnexpectedValueException;
+
+class GETEX extends RedisCommand
+{
+    /**
+     * @var string[]
+     */
+    private static $modifierEnum = [
+        'ex' => 'EX',
+        'px' => 'PX',
+        'exat' => 'EXAT',
+        'pxat' => 'PXAT',
+        'persist' => 'PERSIST',
+    ];
+
+    public function getId()
+    {
+        return 'GETEX';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (!array_key_exists(1, $arguments) || $arguments[1] === '') {
+            parent::setArguments([$arguments[0]]);
+
+            return;
+        }
+
+        if (!in_array(strtoupper($arguments[1]), self::$modifierEnum)) {
+            $enumValues = implode(', ', array_keys(self::$modifierEnum));
+            throw new UnexpectedValueException("Modifier argument accepts only: {$enumValues} values");
+        }
+
+        if ($arguments[1] === 'persist') {
+            parent::setArguments([$arguments[0], self::$modifierEnum[$arguments[1]]]);
+
+            return;
+        }
+
+        $arguments[1] = self::$modifierEnum[$arguments[1]];
+
+        if (!array_key_exists(2, $arguments)) {
+            throw new UnexpectedValueException('You should provide value for current modifier');
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetRange.php b/plugins/cache-redis/Predis/Command/Redis/GETRANGE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetRange.php
rename to plugins/cache-redis/Predis/Command/Redis/GETRANGE.php
index bb10565b5..c6feb408b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetRange.php
+++ b/plugins/cache-redis/Predis/Command/Redis/GETRANGE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/getrange
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/getrange
  */
-class StringGetRange extends Command
+class GETRANGE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetSet.php b/plugins/cache-redis/Predis/Command/Redis/GETSET.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetSet.php
rename to plugins/cache-redis/Predis/Command/Redis/GETSET.php
index b68870d4c..37a38619c 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetSet.php
+++ b/plugins/cache-redis/Predis/Command/Redis/GETSET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/getset
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/getset
  */
-class StringGetSet extends Command
+class GETSET extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/HDEL.php b/plugins/cache-redis/Predis/Command/Redis/HDEL.php
new file mode 100644
index 000000000..bb1fba345
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HDEL.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/hdel
+ */
+class HDEL extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HDEL';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/HEXISTS.php b/plugins/cache-redis/Predis/Command/Redis/HEXISTS.php
new file mode 100644
index 000000000..c461e2af8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HEXISTS.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/hexists
+ */
+class HEXISTS extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HEXISTS';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGet.php b/plugins/cache-redis/Predis/Command/Redis/HGET.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashGet.php
rename to plugins/cache-redis/Predis/Command/Redis/HGET.php
index 20f33da54..12d54dafe 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGet.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HGET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hget
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hget
  */
-class HashGet extends Command
+class HGET extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetAll.php b/plugins/cache-redis/Predis/Command/Redis/HGETALL.php
similarity index 61%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetAll.php
rename to plugins/cache-redis/Predis/Command/Redis/HGETALL.php
index d69867521..c5f566bae 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetAll.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HGETALL.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hgetall
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hgetall
  */
-class HashGetAll extends Command
+class HGETALL extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -31,7 +32,11 @@ class HashGetAll extends Command
      */
     public function parseResponse($data)
     {
-        $result = array();
+        if ($data !== array_values($data)) {
+            return $data; // Relay
+        }
+
+        $result = [];
 
         for ($i = 0; $i < count($data); ++$i) {
             $result[$data[$i]] = $data[++$i];
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementBy.php b/plugins/cache-redis/Predis/Command/Redis/HINCRBY.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementBy.php
rename to plugins/cache-redis/Predis/Command/Redis/HINCRBY.php
index a37359ffb..cf60ecea1 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementBy.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HINCRBY.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hincrby
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hincrby
  */
-class HashIncrementBy extends Command
+class HINCRBY extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementByFloat.php b/plugins/cache-redis/Predis/Command/Redis/HINCRBYFLOAT.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementByFloat.php
rename to plugins/cache-redis/Predis/Command/Redis/HINCRBYFLOAT.php
index bce9714fc..566ee874a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashIncrementByFloat.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HINCRBYFLOAT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hincrbyfloat
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hincrbyfloat
  */
-class HashIncrementByFloat extends Command
+class HINCRBYFLOAT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashKeys.php b/plugins/cache-redis/Predis/Command/Redis/HKEYS.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashKeys.php
rename to plugins/cache-redis/Predis/Command/Redis/HKEYS.php
index 28266020a..43986ec3f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashKeys.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HKEYS.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hkeys
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hkeys
  */
-class HashKeys extends Command
+class HKEYS extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashLength.php b/plugins/cache-redis/Predis/Command/Redis/HLEN.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashLength.php
rename to plugins/cache-redis/Predis/Command/Redis/HLEN.php
index d70926f1c..32903ea62 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashLength.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HLEN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hlen
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hlen
  */
-class HashLength extends Command
+class HLEN extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/HMGET.php b/plugins/cache-redis/Predis/Command/Redis/HMGET.php
new file mode 100644
index 000000000..077373f68
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HMGET.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/hmget
+ */
+class HMGET extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HMGET';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetMultiple.php b/plugins/cache-redis/Predis/Command/Redis/HMSET.php
similarity index 60%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetMultiple.php
rename to plugins/cache-redis/Predis/Command/Redis/HMSET.php
index 6069e2ad9..98e457452 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetMultiple.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HMSET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hmset
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hmset
  */
-class HashSetMultiple extends Command
+class HMSET extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,10 +30,10 @@ class HashSetMultiple extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
-            $flattenedKVs = array($arguments[0]);
+            $flattenedKVs = [$arguments[0]];
             $args = $arguments[1];
 
             foreach ($args as $k => $v) {
@@ -40,9 +41,9 @@ class HashSetMultiple extends Command
                 $flattenedKVs[] = $v;
             }
 
-            return $flattenedKVs;
+            $arguments = $flattenedKVs;
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/HRANDFIELD.php b/plugins/cache-redis/Predis/Command/Redis/HRANDFIELD.php
new file mode 100644
index 000000000..62ce7dbe9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HRANDFIELD.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\With\WithValues;
+
+/**
+ * @see https://redis.io/commands/hrandfield/
+ *
+ * When called with just the key argument, return a random field from the hash value stored at key.
+ *
+ * If the provided count argument is positive, return an array of distinct fields.
+ * The array's length is either count or the hash's number of fields (HLEN), whichever is lower.
+ */
+class HRANDFIELD extends RedisCommand
+{
+    use WithValues;
+
+    public function getId()
+    {
+        return 'HRANDFIELD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        // flatten Relay (RESP3) maps
+        $return = [];
+
+        array_walk_recursive($data, function ($value) use (&$return) {
+            $return[] = $value;
+        });
+
+        return $return;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashScan.php b/plugins/cache-redis/Predis/Command/Redis/HSCAN.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashScan.php
rename to plugins/cache-redis/Predis/Command/Redis/HSCAN.php
index afde74eb9..5d4dde92d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashScan.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HSCAN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hscan
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hscan
  */
-class HashScan extends Command
+class HSCAN extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,14 +30,14 @@ class HashScan extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 
     /**
@@ -49,7 +50,7 @@ class HashScan extends Command
     protected function prepareOptions($options)
     {
         $options = array_change_key_case($options, CASE_UPPER);
-        $normalized = array();
+        $normalized = [];
 
         if (!empty($options['MATCH'])) {
             $normalized[] = 'MATCH';
@@ -71,7 +72,7 @@ class HashScan extends Command
     {
         if (is_array($data)) {
             $fields = $data[1];
-            $result = array();
+            $result = [];
 
             for ($i = 0; $i < count($fields); ++$i) {
                 $result[$fields[$i]] = $fields[++$i];
diff --git a/plugins/cache-redis/Predis/Command/Redis/HSET.php b/plugins/cache-redis/Predis/Command/Redis/HSET.php
new file mode 100644
index 000000000..662094a3c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HSET.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/hset
+ */
+class HSET extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HSET';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/HSETNX.php b/plugins/cache-redis/Predis/Command/Redis/HSETNX.php
new file mode 100644
index 000000000..ca0c5dd62
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/HSETNX.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/hsetnx
+ */
+class HSETNX extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'HSETNX';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashStringLength.php b/plugins/cache-redis/Predis/Command/Redis/HSTRLEN.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashStringLength.php
rename to plugins/cache-redis/Predis/Command/Redis/HSTRLEN.php
index 7cfda80df..c2056ae0f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashStringLength.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HSTRLEN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hstrlen
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hstrlen
  */
-class HashStringLength extends Command
+class HSTRLEN extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashValues.php b/plugins/cache-redis/Predis/Command/Redis/HVALS.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/HashValues.php
rename to plugins/cache-redis/Predis/Command/Redis/HVALS.php
index 0a5ea5f61..71172c709 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashValues.php
+++ b/plugins/cache-redis/Predis/Command/Redis/HVALS.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/hvals
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/hvals
  */
-class HashValues extends Command
+class HVALS extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionDiscard.php b/plugins/cache-redis/Predis/Command/Redis/INCR.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionDiscard.php
rename to plugins/cache-redis/Predis/Command/Redis/INCR.php
index 44aca2b11..80bc1ee0e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionDiscard.php
+++ b/plugins/cache-redis/Predis/Command/Redis/INCR.php
@@ -3,26 +3,27 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/discard
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/incr
  */
-class TransactionDiscard extends Command
+class INCR extends RedisCommand
 {
     /**
      * {@inheritdoc}
      */
     public function getId()
     {
-        return 'DISCARD';
+        return 'INCR';
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementBy.php b/plugins/cache-redis/Predis/Command/Redis/INCRBY.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementBy.php
rename to plugins/cache-redis/Predis/Command/Redis/INCRBY.php
index 9d8241a25..f4ce4e32c 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementBy.php
+++ b/plugins/cache-redis/Predis/Command/Redis/INCRBY.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/incrby
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/incrby
  */
-class StringIncrementBy extends Command
+class INCRBY extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementByFloat.php b/plugins/cache-redis/Predis/Command/Redis/INCRBYFLOAT.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementByFloat.php
rename to plugins/cache-redis/Predis/Command/Redis/INCRBYFLOAT.php
index 164a0869b..fb626edbe 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrementByFloat.php
+++ b/plugins/cache-redis/Predis/Command/Redis/INCRBYFLOAT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/incrbyfloat
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/incrbyfloat
  */
-class StringIncrementByFloat extends Command
+class INCRBYFLOAT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/INFO.php b/plugins/cache-redis/Predis/Command/Redis/INFO.php
new file mode 100644
index 000000000..26a62c2a3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/INFO.php
@@ -0,0 +1,157 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/info
+ */
+class INFO extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'INFO';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (empty($data) || !$lines = preg_split('/\r?\n/', $data)) {
+            return [];
+        }
+
+        if (strpos($lines[0], '#') === 0) {
+            return $this->parseNewResponseFormat($lines);
+        } else {
+            return $this->parseOldResponseFormat($lines);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseNewResponseFormat($lines)
+    {
+        $info = [];
+        $current = null;
+
+        foreach ($lines as $row) {
+            if ($row === '') {
+                continue;
+            }
+
+            if (preg_match('/^# (\w+)$/', $row, $matches)) {
+                $info[$matches[1]] = [];
+                $current = &$info[$matches[1]];
+                continue;
+            }
+
+            [$k, $v] = $this->parseRow($row);
+            $current[$k] = $v;
+        }
+
+        return $info;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseOldResponseFormat($lines)
+    {
+        $info = [];
+
+        foreach ($lines as $row) {
+            if (strpos($row, ':') === false) {
+                continue;
+            }
+
+            [$k, $v] = $this->parseRow($row);
+            $info[$k] = $v;
+        }
+
+        return $info;
+    }
+
+    /**
+     * Parses a single row of the response and returns the key-value pair.
+     *
+     * @param string $row Single row of the response.
+     *
+     * @return array
+     */
+    protected function parseRow($row)
+    {
+        if (preg_match('/^module:name/', $row)) {
+            return $this->parseModuleRow($row);
+        }
+
+        [$k, $v] = explode(':', $row, 2);
+
+        if (preg_match('/^db\d+$/', $k)) {
+            $v = $this->parseDatabaseStats($v);
+        }
+
+        return [$k, $v];
+    }
+
+    /**
+     * Extracts the statistics of each logical DB from the string buffer.
+     *
+     * @param string $str Response buffer.
+     *
+     * @return array
+     */
+    protected function parseDatabaseStats($str)
+    {
+        $db = [];
+
+        foreach (explode(',', $str) as $dbvar) {
+            [$dbvk, $dbvv] = explode('=', $dbvar);
+            $db[trim($dbvk)] = $dbvv;
+        }
+
+        return $db;
+    }
+
+    /**
+     * Parsing module rows because of different format.
+     *
+     * @param  string $row
+     * @return array
+     */
+    protected function parseModuleRow(string $row): array
+    {
+        [$moduleKeyword, $moduleData] = explode(':', $row);
+        $explodedData = explode(',', $moduleData);
+        $parsedData = [];
+
+        foreach ($explodedData as $moduleDataRow) {
+            [$k, $v] = explode('=', $moduleDataRow);
+
+            if ($k === 'name') {
+                $parsedData[0] = $v;
+                continue;
+            }
+
+            $parsedData[1][$k] = $v;
+        }
+
+        return $parsedData;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRAPPEND.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRAPPEND.php
new file mode 100644
index 000000000..1b2a92036
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRAPPEND.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrappend/
+ *
+ * Append the json values into the array at path after the last element in it
+ */
+class JSONARRAPPEND extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRAPPEND';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINDEX.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINDEX.php
new file mode 100644
index 000000000..4aab18274
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINDEX.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrindex/
+ *
+ * Search for the first occurrence of a JSON value in an array
+ */
+class JSONARRINDEX extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRINDEX';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINSERT.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINSERT.php
new file mode 100644
index 000000000..5e1ff2510
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRINSERT.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrinsert/
+ *
+ * Insert the json values into the array at path before the index (shifts to the right)
+ */
+class JSONARRINSERT extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRINSERT';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRLEN.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRLEN.php
new file mode 100644
index 000000000..5ed950649
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRLEN.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrlen/
+ *
+ * Report the length of the JSON array at path in key
+ */
+class JSONARRLEN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRLEN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRPOP.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRPOP.php
new file mode 100644
index 000000000..a8e239b94
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRPOP.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrpop/
+ *
+ * Remove and return an element from the index in the array
+ */
+class JSONARRPOP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRPOP';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRTRIM.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRTRIM.php
new file mode 100644
index 000000000..7ea5620db
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONARRTRIM.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.arrtrim/
+ *
+ * Trim an array so that it contains only the specified inclusive range of elements
+ */
+class JSONARRTRIM extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.ARRTRIM';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONCLEAR.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONCLEAR.php
new file mode 100644
index 000000000..89797eea5
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONCLEAR.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.clear/
+ *
+ * Clear container values (arrays/objects) and set numeric values to 0
+ */
+class JSONCLEAR extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.CLEAR';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEBUG.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEBUG.php
new file mode 100644
index 000000000..83f645302
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEBUG.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.debug/
+ *
+ * This is a container command for debugging related tasks.
+ */
+class JSONDEBUG extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.DEBUG';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEL.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEL.php
new file mode 100644
index 000000000..86e8a01b7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONDEL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.del/
+ *
+ * Delete a value
+ */
+class JSONDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.DEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONFORGET.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONFORGET.php
new file mode 100644
index 000000000..c99ca532e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONFORGET.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.forget/
+ *
+ * @see https://redis.io/commands/json.del/
+ */
+class JSONFORGET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.FORGET';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONGET.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONGET.php
new file mode 100644
index 000000000..df8fddb7e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONGET.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Json\Indent;
+use Predis\Command\Traits\Json\Newline;
+use Predis\Command\Traits\Json\Space;
+
+/**
+ * @see https://redis.io/commands/json.get/
+ *
+ * Return the value at path in JSON serialized form
+ */
+class JSONGET extends RedisCommand
+{
+    use Indent {
+        Indent::setArguments as setIndent;
+    }
+    use Newline {
+        Newline::setArguments as setNewline;
+    }
+    use Space {
+        Space::setArguments as setSpace;
+    }
+
+    protected static $indentArgumentPositionOffset = 1;
+    protected static $newlineArgumentPositionOffset = 2;
+    protected static $spaceArgumentPositionOffset = 3;
+
+    public function getId()
+    {
+        return 'JSON.GET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setSpace($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setNewline($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setIndent($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONMERGE.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMERGE.php
new file mode 100644
index 000000000..a13222833
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMERGE.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.merge/
+ *
+ * Merge a given JSON value into matching paths.
+ * Consequently, JSON values at matching paths are updated, deleted, or expanded with new children.
+ */
+class JSONMERGE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.MERGE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONMGET.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMGET.php
new file mode 100644
index 000000000..1a5163fb7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMGET.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+class JSONMGET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.MGET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $unpackedArguments = [];
+
+        foreach ($arguments[0] as $key) {
+            $unpackedArguments[] = $key;
+        }
+
+        $unpackedArguments[] = $arguments[1];
+
+        parent::setArguments($unpackedArguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONMSET.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMSET.php
new file mode 100644
index 000000000..4fc6cd854
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONMSET.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.mset/
+ *
+ * Set or update one or more JSON values according to the specified key-path-value triplets.
+ */
+class JSONMSET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.MSET';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONNUMINCRBY.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONNUMINCRBY.php
new file mode 100644
index 000000000..1bc62b1b1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONNUMINCRBY.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.numincrby/
+ *
+ * Increment the number value stored at path by number
+ */
+class JSONNUMINCRBY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.NUMINCRBY';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJKEYS.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJKEYS.php
new file mode 100644
index 000000000..09c5c22d2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJKEYS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.objkeys/
+ *
+ * Return the keys in the object that's referenced by path
+ */
+class JSONOBJKEYS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.OBJKEYS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJLEN.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJLEN.php
new file mode 100644
index 000000000..f6b164a75
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONOBJLEN.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.objlen/
+ *
+ * Report the number of keys in the JSON object at path in key
+ */
+class JSONOBJLEN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.OBJLEN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONRESP.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONRESP.php
new file mode 100644
index 000000000..6fbfa6f01
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONRESP.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.resp/
+ *
+ * Return the JSON in key in Redis serialization protocol specification form
+ */
+class JSONRESP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.RESP';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONSET.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSET.php
new file mode 100644
index 000000000..c044cff83
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSET.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Json\NxXxArgument;
+
+/**
+ * @see https://redis.io/commands/json.set/
+ *
+ * Set the JSON value at path in key
+ */
+class JSONSET extends RedisCommand
+{
+    use NxXxArgument {
+        setArguments as setSubcommand;
+    }
+
+    protected static $nxXxArgumentPositionOffset = 3;
+
+    public function getId()
+    {
+        return 'JSON.SET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setSubcommand($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRAPPEND.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRAPPEND.php
new file mode 100644
index 000000000..9b11458e4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRAPPEND.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.strappend/
+ *
+ * Append the json-string values to the string at path
+ */
+class JSONSTRAPPEND extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.STRAPPEND';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRLEN.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRLEN.php
new file mode 100644
index 000000000..92ed80d3d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONSTRLEN.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.strlen/
+ *
+ * Report the length of the JSON String at path in key
+ */
+class JSONSTRLEN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.STRLEN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONTOGGLE.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONTOGGLE.php
new file mode 100644
index 000000000..7bd33da99
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONTOGGLE.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.toggle/
+ *
+ * Toggle a Boolean value stored at path
+ */
+class JSONTOGGLE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.TOGGLE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Json/JSONTYPE.php b/plugins/cache-redis/Predis/Command/Redis/Json/JSONTYPE.php
new file mode 100644
index 000000000..83a69d054
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Json/JSONTYPE.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Json;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/json.type/
+ *
+ * Report the type of JSON value at path
+ */
+class JSONTYPE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'JSON.TYPE';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyKeys.php b/plugins/cache-redis/Predis/Command/Redis/KEYS.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyKeys.php
rename to plugins/cache-redis/Predis/Command/Redis/KEYS.php
index 6d74c40d2..fadb8d7dd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyKeys.php
+++ b/plugins/cache-redis/Predis/Command/Redis/KEYS.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/keys
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/keys
  */
-class KeyKeys extends Command
+class KEYS extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerLastSave.php b/plugins/cache-redis/Predis/Command/Redis/LASTSAVE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerLastSave.php
rename to plugins/cache-redis/Predis/Command/Redis/LASTSAVE.php
index feeb19a8a..0672845d2 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerLastSave.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LASTSAVE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lastsave
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lastsave
  */
-class ServerLastSave extends Command
+class LASTSAVE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/LCS.php b/plugins/cache-redis/Predis/Command/Redis/LCS.php
new file mode 100644
index 000000000..e8663f457
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/LCS.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/lcs/
+ *
+ * The LCS command implements the longest common subsequence algorithm.
+ */
+class LCS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'LCS';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (isset($arguments[2]) && $arguments[2]) {
+            $arguments[2] = 'LEN';
+        }
+
+        if (isset($arguments[3]) && $arguments[3]) {
+            $arguments[3] = 'IDX';
+        }
+
+        if (isset($arguments[5]) && $arguments[5]) {
+            $arguments[5] = 'WITHMATCHLEN';
+        }
+
+        if (isset($arguments[4])) {
+            if ($arguments[4] !== 0) {
+                $argumentsBefore = array_slice($arguments, 0, 4);
+                $argumentsAfter = array_slice($arguments, 5);
+                $arguments = array_merge($argumentsBefore, ['MINMATCHLEN', $arguments[4]], $argumentsAfter);
+            } else {
+                $arguments[4] = false;
+            }
+        }
+
+        parent::setArguments($arguments);
+        $this->filterArguments();
+    }
+
+    public function parseResponse($data)
+    {
+        if (is_array($data)) {
+            if ($data !== array_values($data)) {
+                return $data; // Relay
+            }
+
+            return [$data[0] => $data[1], $data[2] => $data[3]];
+        }
+
+        return $data;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListIndex.php b/plugins/cache-redis/Predis/Command/Redis/LINDEX.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListIndex.php
rename to plugins/cache-redis/Predis/Command/Redis/LINDEX.php
index 27c64be73..80510e1e4 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListIndex.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LINDEX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lindex
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lindex
  */
-class ListIndex extends Command
+class LINDEX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListInsert.php b/plugins/cache-redis/Predis/Command/Redis/LINSERT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListInsert.php
rename to plugins/cache-redis/Predis/Command/Redis/LINSERT.php
index 7d53d11b2..a81cf3414 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListInsert.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LINSERT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/linsert
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/linsert
  */
-class ListInsert extends Command
+class LINSERT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListLength.php b/plugins/cache-redis/Predis/Command/Redis/LLEN.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListLength.php
rename to plugins/cache-redis/Predis/Command/Redis/LLEN.php
index 6495beb77..628e60280 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListLength.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LLEN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/llen
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/llen
  */
-class ListLength extends Command
+class LLEN extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/LMOVE.php b/plugins/cache-redis/Predis/Command/Redis/LMOVE.php
new file mode 100644
index 000000000..f7bad007d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/LMOVE.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+class LMOVE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'LMOVE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/LMPOP.php b/plugins/cache-redis/Predis/Command/Redis/LMPOP.php
new file mode 100644
index 000000000..12ef06bf3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/LMPOP.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Count;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\LeftRight;
+
+class LMPOP extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+    use LeftRight {
+        LeftRight::setArguments as setLeftRight;
+    }
+    use Count {
+        Count::setArguments as setCount;
+    }
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $leftRightArgumentPositionOffset = 1;
+    protected static $countArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'LMPOP';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setCount($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setLeftRight($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setKeys($arguments);
+        $this->filterArguments();
+    }
+
+    public function parseResponse($data)
+    {
+        if (null === $data) {
+            return null;
+        }
+
+        return [$data[0] => $data[1]];
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirst.php b/plugins/cache-redis/Predis/Command/Redis/LPOP.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirst.php
rename to plugins/cache-redis/Predis/Command/Redis/LPOP.php
index 84d5d6734..d375bacaf 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopFirst.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LPOP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lpop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lpop
  */
-class ListPopFirst extends Command
+class LPOP extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/LPUSH.php b/plugins/cache-redis/Predis/Command/Redis/LPUSH.php
new file mode 100644
index 000000000..f3e0f9e73
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/LPUSH.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/lpush
+ */
+class LPUSH extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'LPUSH';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHeadX.php b/plugins/cache-redis/Predis/Command/Redis/LPUSHX.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHeadX.php
rename to plugins/cache-redis/Predis/Command/Redis/LPUSHX.php
index 8e136b880..3dcacc389 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHeadX.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LPUSHX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lpushx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lpushx
  */
-class ListPushHeadX extends Command
+class LPUSHX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListRange.php b/plugins/cache-redis/Predis/Command/Redis/LRANGE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListRange.php
rename to plugins/cache-redis/Predis/Command/Redis/LRANGE.php
index 32a21a6e6..4092dae73 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListRange.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LRANGE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lrange
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lrange
  */
-class ListRange extends Command
+class LRANGE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListRemove.php b/plugins/cache-redis/Predis/Command/Redis/LREM.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListRemove.php
rename to plugins/cache-redis/Predis/Command/Redis/LREM.php
index c5800899b..47e06c2fd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListRemove.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LREM.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lrem
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lrem
  */
-class ListRemove extends Command
+class LREM extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListSet.php b/plugins/cache-redis/Predis/Command/Redis/LSET.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListSet.php
rename to plugins/cache-redis/Predis/Command/Redis/LSET.php
index 5e59864de..255bb8976 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListSet.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LSET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/lset
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/lset
  */
-class ListSet extends Command
+class LSET extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListTrim.php b/plugins/cache-redis/Predis/Command/Redis/LTRIM.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListTrim.php
rename to plugins/cache-redis/Predis/Command/Redis/LTRIM.php
index 193141809..c958ef6ec 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListTrim.php
+++ b/plugins/cache-redis/Predis/Command/Redis/LTRIM.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/ltrim
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/ltrim
  */
-class ListTrim extends Command
+class LTRIM extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/MGET.php b/plugins/cache-redis/Predis/Command/Redis/MGET.php
new file mode 100644
index 000000000..249cc43f8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/MGET.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/mget
+ */
+class MGET extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'MGET';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMigrate.php b/plugins/cache-redis/Predis/Command/Redis/MIGRATE.php
similarity index 72%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMigrate.php
rename to plugins/cache-redis/Predis/Command/Redis/MIGRATE.php
index 3324ef94c..5772997e7 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMigrate.php
+++ b/plugins/cache-redis/Predis/Command/Redis/MIGRATE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/migrate
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/migrate
  */
-class KeyMigrate extends Command
+class MIGRATE extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,7 +30,7 @@ class KeyMigrate extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (is_array(end($arguments))) {
             foreach (array_pop($arguments) as $modifier => $value) {
@@ -45,6 +46,6 @@ class KeyMigrate extends Command
             }
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerMonitor.php b/plugins/cache-redis/Predis/Command/Redis/MONITOR.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerMonitor.php
rename to plugins/cache-redis/Predis/Command/Redis/MONITOR.php
index 1c3d33095..06e9e59b6 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerMonitor.php
+++ b/plugins/cache-redis/Predis/Command/Redis/MONITOR.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/monitor
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/monitor
  */
-class ServerMonitor extends Command
+class MONITOR extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/MOVE.php b/plugins/cache-redis/Predis/Command/Redis/MOVE.php
new file mode 100644
index 000000000..cd7a8e522
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/MOVE.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/move
+ */
+class MOVE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'MOVE';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiple.php b/plugins/cache-redis/Predis/Command/Redis/MSET.php
similarity index 61%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiple.php
rename to plugins/cache-redis/Predis/Command/Redis/MSET.php
index a3c5324dc..2783716c3 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiple.php
+++ b/plugins/cache-redis/Predis/Command/Redis/MSET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/mset
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/mset
  */
-class StringSetMultiple extends Command
+class MSET extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,10 +30,10 @@ class StringSetMultiple extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 1 && is_array($arguments[0])) {
-            $flattenedKVs = array();
+            $flattenedKVs = [];
             $args = $arguments[0];
 
             foreach ($args as $k => $v) {
@@ -40,9 +41,9 @@ class StringSetMultiple extends Command
                 $flattenedKVs[] = $v;
             }
 
-            return $flattenedKVs;
+            $arguments = $flattenedKVs;
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyType.php b/plugins/cache-redis/Predis/Command/Redis/MSETNX.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyType.php
rename to plugins/cache-redis/Predis/Command/Redis/MSETNX.php
index f4f06e451..94d9ce269 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyType.php
+++ b/plugins/cache-redis/Predis/Command/Redis/MSETNX.php
@@ -3,26 +3,25 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/type
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/msetnx
  */
-class KeyType extends Command
+class MSETNX extends MSET
 {
     /**
      * {@inheritdoc}
      */
     public function getId()
     {
-        return 'TYPE';
+        return 'MSETNX';
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionMulti.php b/plugins/cache-redis/Predis/Command/Redis/MULTI.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionMulti.php
rename to plugins/cache-redis/Predis/Command/Redis/MULTI.php
index 673bf55da..d8f96e64b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionMulti.php
+++ b/plugins/cache-redis/Predis/Command/Redis/MULTI.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/multi
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/multi
  */
-class TransactionMulti extends Command
+class MULTI extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerObject.php b/plugins/cache-redis/Predis/Command/Redis/OBJECT_.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerObject.php
rename to plugins/cache-redis/Predis/Command/Redis/OBJECT_.php
index f921701c2..856a8740e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerObject.php
+++ b/plugins/cache-redis/Predis/Command/Redis/OBJECT_.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/object
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/object
  */
-class ServerObject extends Command
+class OBJECT_ extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PERSIST.php b/plugins/cache-redis/Predis/Command/Redis/PERSIST.php
new file mode 100644
index 000000000..8fd70e7aa
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PERSIST.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/persist
+ */
+class PERSIST extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PERSIST';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpire.php b/plugins/cache-redis/Predis/Command/Redis/PEXPIRE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpire.php
rename to plugins/cache-redis/Predis/Command/Redis/PEXPIRE.php
index 258ec4766..c362b304b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpire.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PEXPIRE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/pexpire
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/pexpire
  */
-class KeyPreciseExpire extends KeyExpire
+class PEXPIRE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpireAt.php b/plugins/cache-redis/Predis/Command/Redis/PEXPIREAT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpireAt.php
rename to plugins/cache-redis/Predis/Command/Redis/PEXPIREAT.php
index e41921870..6723a71e8 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseExpireAt.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PEXPIREAT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/pexpireat
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/pexpireat
  */
-class KeyPreciseExpireAt extends KeyExpireAt
+class PEXPIREAT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PEXPIRETIME.php b/plugins/cache-redis/Predis/Command/Redis/PEXPIRETIME.php
new file mode 100644
index 000000000..de1289698
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PEXPIRETIME.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/pexpiretime/
+ *
+ * PEXPIRETIME has the same semantic as EXPIRETIME,
+ * but returns the absolute Unix expiration timestamp in milliseconds instead of seconds.
+ */
+class PEXPIRETIME extends RedisCommand
+{
+    public function getId()
+    {
+        return 'PEXPIRETIME';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PFADD.php b/plugins/cache-redis/Predis/Command/Redis/PFADD.php
new file mode 100644
index 000000000..a57d9d5a2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PFADD.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/pfadd
+ */
+class PFADD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PFADD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PFCOUNT.php b/plugins/cache-redis/Predis/Command/Redis/PFCOUNT.php
new file mode 100644
index 000000000..4c5c28b25
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PFCOUNT.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/pfcount
+ */
+class PFCOUNT extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PFCOUNT';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PFMERGE.php b/plugins/cache-redis/Predis/Command/Redis/PFMERGE.php
new file mode 100644
index 000000000..fcfa0980e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PFMERGE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/pfmerge
+ */
+class PFMERGE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PFMERGE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionPing.php b/plugins/cache-redis/Predis/Command/Redis/PING.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionPing.php
rename to plugins/cache-redis/Predis/Command/Redis/PING.php
index fa9d7346f..db1d6727b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionPing.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PING.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/ping
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/ping
  */
-class ConnectionPing extends Command
+class PING extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringPreciseSetExpire.php b/plugins/cache-redis/Predis/Command/Redis/PSETEX.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringPreciseSetExpire.php
rename to plugins/cache-redis/Predis/Command/Redis/PSETEX.php
index 2faa954d0..3b8131e4a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringPreciseSetExpire.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PSETEX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/psetex
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/psetex
  */
-class StringPreciseSetExpire extends StringSetExpire
+class PSETEX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/PSUBSCRIBE.php b/plugins/cache-redis/Predis/Command/Redis/PSUBSCRIBE.php
new file mode 100644
index 000000000..7377c7b16
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PSUBSCRIBE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/psubscribe
+ */
+class PSUBSCRIBE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PSUBSCRIBE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseTimeToLive.php b/plugins/cache-redis/Predis/Command/Redis/PTTL.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseTimeToLive.php
rename to plugins/cache-redis/Predis/Command/Redis/PTTL.php
index bdcd34b92..d87dd6354 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPreciseTimeToLive.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PTTL.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/pttl
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/pttl
  */
-class KeyPreciseTimeToLive extends KeyTimeToLive
+class PTTL extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPublish.php b/plugins/cache-redis/Predis/Command/Redis/PUBLISH.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPublish.php
rename to plugins/cache-redis/Predis/Command/Redis/PUBLISH.php
index 55508f8d9..d38cd1949 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPublish.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PUBLISH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/publish
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/publish
  */
-class PubSubPublish extends Command
+class PUBLISH extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPubsub.php b/plugins/cache-redis/Predis/Command/Redis/PUBSUB.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPubsub.php
rename to plugins/cache-redis/Predis/Command/Redis/PUBSUB.php
index 8cf812973..cd6396f5b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubPubsub.php
+++ b/plugins/cache-redis/Predis/Command/Redis/PUBSUB.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/pubsub
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/pubsub
  */
-class PubSubPubsub extends Command
+class PUBSUB extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -49,7 +50,7 @@ class PubSubPubsub extends Command
      */
     protected static function processNumsub(array $channels)
     {
-        $processed = array();
+        $processed = [];
         $count = count($channels);
 
         for ($i = 0; $i < $count; ++$i) {
diff --git a/plugins/cache-redis/Predis/Command/Redis/PUNSUBSCRIBE.php b/plugins/cache-redis/Predis/Command/Redis/PUNSUBSCRIBE.php
new file mode 100644
index 000000000..f15a39fbb
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/PUNSUBSCRIBE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/punsubscribe
+ */
+class PUNSUBSCRIBE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'PUNSUBSCRIBE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionQuit.php b/plugins/cache-redis/Predis/Command/Redis/QUIT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionQuit.php
rename to plugins/cache-redis/Predis/Command/Redis/QUIT.php
index e59e31e3e..330bcebfc 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionQuit.php
+++ b/plugins/cache-redis/Predis/Command/Redis/QUIT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/quit
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/quit
  */
-class ConnectionQuit extends Command
+class QUIT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRandom.php b/plugins/cache-redis/Predis/Command/Redis/RANDOMKEY.php
similarity index 66%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRandom.php
rename to plugins/cache-redis/Predis/Command/Redis/RANDOMKEY.php
index b208b2db4..c77e56243 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRandom.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RANDOMKEY.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/randomkey
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/randomkey
  */
-class KeyRandom extends Command
+class RANDOMKEY extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRename.php b/plugins/cache-redis/Predis/Command/Redis/RENAME.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRename.php
rename to plugins/cache-redis/Predis/Command/Redis/RENAME.php
index 82e44fb2e..78a216ec0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRename.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RENAME.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/rename
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/rename
  */
-class KeyRename extends Command
+class RENAME extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/RENAMENX.php b/plugins/cache-redis/Predis/Command/Redis/RENAMENX.php
new file mode 100644
index 000000000..ce1306fb7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/RENAMENX.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/renamenx
+ */
+class RENAMENX extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'RENAMENX';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRestore.php b/plugins/cache-redis/Predis/Command/Redis/RESTORE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRestore.php
rename to plugins/cache-redis/Predis/Command/Redis/RESTORE.php
index a5b0b2dbc..ae0d482b2 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRestore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RESTORE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/restore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/restore
  */
-class KeyRestore extends Command
+class RESTORE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLast.php b/plugins/cache-redis/Predis/Command/Redis/RPOP.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLast.php
rename to plugins/cache-redis/Predis/Command/Redis/RPOP.php
index 9e92db5f4..3bc3f977f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLast.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RPOP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/rpop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/rpop
  */
-class ListPopLast extends Command
+class RPOP extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHead.php b/plugins/cache-redis/Predis/Command/Redis/RPOPLPUSH.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHead.php
rename to plugins/cache-redis/Predis/Command/Redis/RPOPLPUSH.php
index f430eb227..d158f2d55 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastPushHead.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RPOPLPUSH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/rpoplpush
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/rpoplpush
  */
-class ListPopLastPushHead extends Command
+class RPOPLPUSH extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/RPUSH.php b/plugins/cache-redis/Predis/Command/Redis/RPUSH.php
new file mode 100644
index 000000000..a8a72f018
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/RPUSH.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/rpush
+ */
+class RPUSH extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'RPUSH';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTailX.php b/plugins/cache-redis/Predis/Command/Redis/RPUSHX.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTailX.php
rename to plugins/cache-redis/Predis/Command/Redis/RPUSHX.php
index 1af3645b4..f5b20d45e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTailX.php
+++ b/plugins/cache-redis/Predis/Command/Redis/RPUSHX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/rpushx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/rpushx
  */
-class ListPushTailX extends Command
+class RPUSHX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SADD.php b/plugins/cache-redis/Predis/Command/Redis/SADD.php
new file mode 100644
index 000000000..e2213448b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SADD.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sadd
+ */
+class SADD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SADD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSave.php b/plugins/cache-redis/Predis/Command/Redis/SAVE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSave.php
rename to plugins/cache-redis/Predis/Command/Redis/SAVE.php
index addefe20f..b7fdb6ebd 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSave.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SAVE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/save
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/save
  */
-class ServerSave extends Command
+class SAVE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyScan.php b/plugins/cache-redis/Predis/Command/Redis/SCAN.php
similarity index 77%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyScan.php
rename to plugins/cache-redis/Predis/Command/Redis/SCAN.php
index 05f5bb3ac..bf1da9625 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyScan.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SCAN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/scan
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/scan
  */
-class KeyScan extends Command
+class SCAN extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,14 +30,14 @@ class KeyScan extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 
     /**
@@ -49,7 +50,7 @@ class KeyScan extends Command
     protected function prepareOptions($options)
     {
         $options = array_change_key_case($options, CASE_UPPER);
-        $normalized = array();
+        $normalized = [];
 
         if (!empty($options['MATCH'])) {
             $normalized[] = 'MATCH';
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetCardinality.php b/plugins/cache-redis/Predis/Command/Redis/SCARD.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetCardinality.php
rename to plugins/cache-redis/Predis/Command/Redis/SCARD.php
index a9f959b78..daf1393da 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetCardinality.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SCARD.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/scard
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/scard
  */
-class SetCardinality extends Command
+class SCARD extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerScript.php b/plugins/cache-redis/Predis/Command/Redis/SCRIPT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerScript.php
rename to plugins/cache-redis/Predis/Command/Redis/SCRIPT.php
index 7a01018d9..5df20cf72 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerScript.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SCRIPT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/script
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/script
  */
-class ServerScript extends Command
+class SCRIPT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SDIFF.php b/plugins/cache-redis/Predis/Command/Redis/SDIFF.php
new file mode 100644
index 000000000..b59e63df8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SDIFF.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sdiff
+ */
+class SDIFF extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SDIFF';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SDIFFSTORE.php b/plugins/cache-redis/Predis/Command/Redis/SDIFFSTORE.php
new file mode 100644
index 000000000..008782e9d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SDIFFSTORE.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sdiffstore
+ */
+class SDIFFSTORE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SDIFFSTORE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $arguments = array_merge([$arguments[0]], $arguments[1]);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionSelect.php b/plugins/cache-redis/Predis/Command/Redis/SELECT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionSelect.php
rename to plugins/cache-redis/Predis/Command/Redis/SELECT.php
index 1da825677..f14bb72d9 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ConnectionSelect.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SELECT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/select
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/select
  */
-class ConnectionSelect extends Command
+class SELECT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSentinel.php b/plugins/cache-redis/Predis/Command/Redis/SENTINEL.php
similarity index 73%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSentinel.php
rename to plugins/cache-redis/Predis/Command/Redis/SENTINEL.php
index c0962db3d..bd22ffba5 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSentinel.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SENTINEL.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/topics/sentinel
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/sentinel
  */
-class ServerSentinel extends Command
+class SENTINEL extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -31,7 +32,10 @@ class ServerSentinel extends Command
      */
     public function parseResponse($data)
     {
-        switch (strtolower($this->getArgument(0))) {
+        $argument = $this->getArgument(0);
+        $argument = is_null($argument) ? null : strtolower($argument);
+
+        switch ($argument) {
             case 'masters':
             case 'slaves':
                 return self::processMastersOrSlaves($data);
@@ -51,7 +55,7 @@ class ServerSentinel extends Command
     protected static function processMastersOrSlaves(array $servers)
     {
         foreach ($servers as $idx => $node) {
-            $processed = array();
+            $processed = [];
             $count = count($node);
 
             for ($i = 0; $i < $count; ++$i) {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSet.php b/plugins/cache-redis/Predis/Command/Redis/SET.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringSet.php
rename to plugins/cache-redis/Predis/Command/Redis/SET.php
index b1469945c..f8956f40b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSet.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SET.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/set
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/set
  */
-class StringSet extends Command
+class SET extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetBit.php b/plugins/cache-redis/Predis/Command/Redis/SETBIT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetBit.php
rename to plugins/cache-redis/Predis/Command/Redis/SETBIT.php
index 7933b6be3..6c602ae1d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetBit.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SETBIT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/setbit
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/setbit
  */
-class StringSetBit extends Command
+class SETBIT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetExpire.php b/plugins/cache-redis/Predis/Command/Redis/SETEX.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetExpire.php
rename to plugins/cache-redis/Predis/Command/Redis/SETEX.php
index f08817085..66189128f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetExpire.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SETEX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/setex
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/setex
  */
-class StringSetExpire extends Command
+class SETEX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SETNX.php b/plugins/cache-redis/Predis/Command/Redis/SETNX.php
new file mode 100644
index 000000000..d34796504
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SETNX.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/setnx
+ */
+class SETNX extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SETNX';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifference.php b/plugins/cache-redis/Predis/Command/Redis/SETRANGE.php
similarity index 60%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifference.php
rename to plugins/cache-redis/Predis/Command/Redis/SETRANGE.php
index 35f23f98a..b368e1d42 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifference.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SETRANGE.php
@@ -3,26 +3,27 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/sdiff
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/setrange
  */
-class SetDifference extends SetIntersection
+class SETRANGE extends RedisCommand
 {
     /**
      * {@inheritdoc}
      */
     public function getId()
     {
-        return 'SDIFF';
+        return 'SETRANGE';
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/SHUTDOWN.php b/plugins/cache-redis/Predis/Command/Redis/SHUTDOWN.php
new file mode 100644
index 000000000..4d2b74794
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SHUTDOWN.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/shutdown
+ */
+class SHUTDOWN extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SHUTDOWN';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (empty($arguments)) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $processedArguments = [];
+
+        if (array_key_exists(0, $arguments) && null !== $arguments[0]) {
+            $processedArguments[] = ($arguments[0]) ? 'SAVE' : 'NOSAVE';
+        }
+
+        if (array_key_exists(1, $arguments) && false !== $arguments[1]) {
+            $processedArguments[] = 'NOW';
+        }
+
+        if (array_key_exists(2, $arguments) && false !== $arguments[2]) {
+            $processedArguments[] = 'FORCE';
+        }
+
+        if (array_key_exists(3, $arguments) && false !== $arguments[3]) {
+            $processedArguments[] = 'ABORT';
+        }
+
+        parent::setArguments($processedArguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SINTER.php b/plugins/cache-redis/Predis/Command/Redis/SINTER.php
new file mode 100644
index 000000000..2036714a3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SINTER.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sinter
+ */
+class SINTER extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SINTER';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SINTERCARD.php b/plugins/cache-redis/Predis/Command/Redis/SINTERCARD.php
new file mode 100644
index 000000000..f841db365
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SINTERCARD.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\Limit\Limit;
+
+class SINTERCARD extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+    use Limit {
+        Limit::setArguments as setLimit;
+    }
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $limitArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'SINTERCARD';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setLimit($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setKeys($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersectionStore.php b/plugins/cache-redis/Predis/Command/Redis/SINTERSTORE.php
similarity index 53%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersectionStore.php
rename to plugins/cache-redis/Predis/Command/Redis/SINTERSTORE.php
index b748618aa..144335a1f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersectionStore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SINTERSTORE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/sinterstore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/sinterstore
  */
-class SetIntersectionStore extends Command
+class SINTERSTORE extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,12 +30,12 @@ class SetIntersectionStore extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 2 && is_array($arguments[1])) {
-            return array_merge(array($arguments[0]), $arguments[1]);
+            $arguments = array_merge([$arguments[0]], $arguments[1]);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/SISMEMBER.php b/plugins/cache-redis/Predis/Command/Redis/SISMEMBER.php
new file mode 100644
index 000000000..3991c4c9e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SISMEMBER.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sismember
+ */
+class SISMEMBER extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SISMEMBER';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlaveOf.php b/plugins/cache-redis/Predis/Command/Redis/SLAVEOF.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlaveOf.php
rename to plugins/cache-redis/Predis/Command/Redis/SLAVEOF.php
index 4ff44556a..ef3d4c499 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlaveOf.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SLAVEOF.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/slaveof
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/slaveof
  */
-class ServerSlaveOf extends Command
+class SLAVEOF extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,12 +30,12 @@ class ServerSlaveOf extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 0 || $arguments[0] === 'NO ONE') {
-            return array('NO', 'ONE');
+            $arguments = ['NO', 'ONE'];
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlowlog.php b/plugins/cache-redis/Predis/Command/Redis/SLOWLOG.php
similarity index 71%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlowlog.php
rename to plugins/cache-redis/Predis/Command/Redis/SLOWLOG.php
index 137ff59e7..41fbbcdc4 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerSlowlog.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SLOWLOG.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/slowlog
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/slowlog
  */
-class ServerSlowlog extends Command
+class SLOWLOG extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -32,15 +33,15 @@ class ServerSlowlog extends Command
     public function parseResponse($data)
     {
         if (is_array($data)) {
-            $log = array();
+            $log = [];
 
             foreach ($data as $index => $entry) {
-                $log[$index] = array(
+                $log[$index] = [
                     'id' => $entry[0],
                     'timestamp' => $entry[1],
                     'duration' => $entry[2],
                     'command' => $entry[3],
-                );
+                ];
             }
 
             return $log;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetMembers.php b/plugins/cache-redis/Predis/Command/Redis/SMEMBERS.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetMembers.php
rename to plugins/cache-redis/Predis/Command/Redis/SMEMBERS.php
index f4076ae8b..8f32be40e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetMembers.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SMEMBERS.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/smembers
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/smembers
  */
-class SetMembers extends Command
+class SMEMBERS extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SMISMEMBER.php b/plugins/cache-redis/Predis/Command/Redis/SMISMEMBER.php
new file mode 100644
index 000000000..735b01d4f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SMISMEMBER.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/smismember/
+ *
+ * Returns whether each member is a member of the set stored at key.
+ */
+class SMISMEMBER extends RedisCommand
+{
+    public function getId()
+    {
+        return 'SMISMEMBER';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SMOVE.php b/plugins/cache-redis/Predis/Command/Redis/SMOVE.php
new file mode 100644
index 000000000..2c33e28c2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SMOVE.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/smove
+ */
+class SMOVE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SMOVE';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeySort.php b/plugins/cache-redis/Predis/Command/Redis/SORT.php
similarity index 73%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeySort.php
rename to plugins/cache-redis/Predis/Command/Redis/SORT.php
index fd449f13d..1338c8110 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeySort.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SORT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/sort
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/sort
  */
-class KeySort extends Command
+class SORT extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,13 +30,15 @@ class KeySort extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 1) {
-            return $arguments;
+            parent::setArguments($arguments);
+
+            return;
         }
 
-        $query = array($arguments[0]);
+        $query = [$arguments[0]];
         $sortParams = array_change_key_case($arguments[1], CASE_UPPER);
 
         if (isset($sortParams['BY'])) {
@@ -57,9 +60,9 @@ class KeySort extends Command
             }
         }
 
-        if (isset($sortParams['LIMIT']) &&
-            is_array($sortParams['LIMIT']) &&
-            count($sortParams['LIMIT']) == 2) {
+        if (isset($sortParams['LIMIT'])
+            && is_array($sortParams['LIMIT'])
+            && count($sortParams['LIMIT']) == 2) {
             $query[] = 'LIMIT';
             $query[] = $sortParams['LIMIT'][0];
             $query[] = $sortParams['LIMIT'][1];
@@ -78,6 +81,6 @@ class KeySort extends Command
             $query[] = $sortParams['STORE'];
         }
 
-        return $query;
+        parent::setArguments($query);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/SORT_RO.php b/plugins/cache-redis/Predis/Command/Redis/SORT_RO.php
new file mode 100644
index 000000000..f302b6e3b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SORT_RO.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\By\ByArgument;
+use Predis\Command\Traits\Get\Get;
+use Predis\Command\Traits\Limit\LimitObject;
+use Predis\Command\Traits\Sorting;
+
+/**
+ * @see https://redis.io/commands/sort_ro/
+ *
+ * Read-only variant of the SORT command.
+ * It is exactly like the original SORT but refuses the STORE option
+ * and can safely be used in read-only replicas.
+ */
+class SORT_RO extends RedisCommand
+{
+    use ByArgument {
+        ByArgument::setArguments as setBy;
+    }
+    use LimitObject {
+        LimitObject::setArguments as setLimit;
+    }
+    use Get {
+        Get::setArguments as setGetArgument;
+    }
+    use Sorting {
+        Sorting::setArguments as setSorting;
+    }
+
+    protected static $byArgumentPositionOffset = 1;
+    protected static $getArgumentPositionOffset = 3;
+    protected static $sortArgumentPositionOffset = 4;
+
+    public function getId()
+    {
+        return 'SORT_RO';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $alpha = array_pop($arguments);
+
+        if (is_bool($alpha) && $alpha) {
+            $arguments[] = 'ALPHA';
+        } elseif (!is_bool($alpha)) {
+            $arguments[] = $alpha;
+        }
+
+        $this->setSorting($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setGetArgument($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setLimit($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setBy($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetPop.php b/plugins/cache-redis/Predis/Command/Redis/SPOP.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetPop.php
rename to plugins/cache-redis/Predis/Command/Redis/SPOP.php
index b78d3f33b..e09a3d55a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetPop.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SPOP.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/spop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/spop
  */
-class SetPop extends Command
+class SPOP extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetRandomMember.php b/plugins/cache-redis/Predis/Command/Redis/SRANDMEMBER.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetRandomMember.php
rename to plugins/cache-redis/Predis/Command/Redis/SRANDMEMBER.php
index 2cb79a049..61d8f03b5 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetRandomMember.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SRANDMEMBER.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/srandmember
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/srandmember
  */
-class SetRandomMember extends Command
+class SRANDMEMBER extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SREM.php b/plugins/cache-redis/Predis/Command/Redis/SREM.php
new file mode 100644
index 000000000..ad3cf062f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SREM.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/srem
+ */
+class SREM extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SREM';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetScan.php b/plugins/cache-redis/Predis/Command/Redis/SSCAN.php
similarity index 77%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/SetScan.php
rename to plugins/cache-redis/Predis/Command/Redis/SSCAN.php
index d42b28dfb..1991a029f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetScan.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SSCAN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/sscan
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/sscan
  */
-class SetScan extends Command
+class SSCAN extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,14 +30,14 @@ class SetScan extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 
     /**
@@ -49,7 +50,7 @@ class SetScan extends Command
     protected function prepareOptions($options)
     {
         $options = array_change_key_case($options, CASE_UPPER);
-        $normalized = array();
+        $normalized = [];
 
         if (!empty($options['MATCH'])) {
             $normalized[] = 'MATCH';
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringStrlen.php b/plugins/cache-redis/Predis/Command/Redis/STRLEN.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringStrlen.php
rename to plugins/cache-redis/Predis/Command/Redis/STRLEN.php
index 10f492fd9..f51775662 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringStrlen.php
+++ b/plugins/cache-redis/Predis/Command/Redis/STRLEN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/strlen
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/strlen
  */
-class StringStrlen extends Command
+class STRLEN extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SUBSCRIBE.php b/plugins/cache-redis/Predis/Command/Redis/SUBSCRIBE.php
new file mode 100644
index 000000000..b133c2252
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SUBSCRIBE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/subscribe
+ */
+class SUBSCRIBE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SUBSCRIBE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSubstr.php b/plugins/cache-redis/Predis/Command/Redis/SUBSTR.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/StringSubstr.php
rename to plugins/cache-redis/Predis/Command/Redis/SUBSTR.php
index 3aab7ade8..ec7e5fed0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSubstr.php
+++ b/plugins/cache-redis/Predis/Command/Redis/SUBSTR.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/substr
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/substr
  */
-class StringSubstr extends Command
+class SUBSTR extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SUNION.php b/plugins/cache-redis/Predis/Command/Redis/SUNION.php
new file mode 100644
index 000000000..7a94e8da2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SUNION.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sunion
+ */
+class SUNION extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SUNION';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/SUNIONSTORE.php b/plugins/cache-redis/Predis/Command/Redis/SUNIONSTORE.php
new file mode 100644
index 000000000..80e531d2e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/SUNIONSTORE.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/sunionstore
+ */
+class SUNIONSTORE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'SUNIONSTORE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 2 && is_array($arguments[1])) {
+            $arguments = array_merge([$arguments[0]], $arguments[1]);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTAGGREGATE.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTAGGREGATE.php
new file mode 100644
index 000000000..948455ed0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTAGGREGATE.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.aggregate/
+ *
+ * Run a search query on an index, and perform aggregate transformations
+ * on the results, extracting statistics etc. from them
+ */
+class FTAGGREGATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.AGGREGATE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $query] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$index, $query],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASADD.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASADD.php
new file mode 100644
index 000000000..a2511ea32
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASADD.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.aliasadd/
+ *
+ * Add an alias to an index.
+ */
+class FTALIASADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.ALIASADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASDEL.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASDEL.php
new file mode 100644
index 000000000..821d1c02e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASDEL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.aliasdel/
+ *
+ * Remove an alias from an index.
+ */
+class FTALIASDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.ALIASDEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASUPDATE.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASUPDATE.php
new file mode 100644
index 000000000..ef5328779
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTALIASUPDATE.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.aliasupdate/
+ *
+ * Add an alias to an index. If the alias is already associated with another index,
+ * FT.ALIASUPDATE removes the alias association with the previous index.
+ */
+class FTALIASUPDATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.ALIASUPDATE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTALTER.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTALTER.php
new file mode 100644
index 000000000..a405efe95
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTALTER.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Argument\Search\SchemaFields\FieldInterface;
+use Predis\Command\Command as RedisCommand;
+
+class FTALTER extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.ALTER';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $schema] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        $schema = array_reduce($schema, static function (array $carry, FieldInterface $field) {
+            return array_merge($carry, $field->toArray());
+        }, []);
+
+        array_unshift($schema, 'SCHEMA', 'ADD');
+
+        parent::setArguments(array_merge(
+            [$index],
+            $commandArguments,
+            $schema
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTCONFIG.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTCONFIG.php
new file mode 100644
index 000000000..9cba60e05
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTCONFIG.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.config-get/
+ * @see https://redis.io/commands/ft.config-set/
+ *
+ * Container command corresponds to any FT.CONFIG *.
+ * Represents any FUNCTION command with subcommand as first argument.
+ */
+class FTCONFIG extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.CONFIG';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTCREATE.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTCREATE.php
new file mode 100644
index 000000000..9e43a6cfe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTCREATE.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Argument\Search\SchemaFields\FieldInterface;
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.create/
+ *
+ * Create an index with the given specification
+ */
+class FTCREATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.CREATE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $schema] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        $schema = array_reduce($schema, static function (array $carry, FieldInterface $field) {
+            return array_merge($carry, $field->toArray());
+        }, []);
+
+        array_unshift($schema, 'SCHEMA');
+
+        parent::setArguments(array_merge(
+            [$index],
+            $commandArguments,
+            $schema
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTCURSOR.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTCURSOR.php
new file mode 100644
index 000000000..14a01948a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTCURSOR.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+class FTCURSOR extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.CURSOR';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$subcommand, $index, $cursorId] = $arguments;
+        $commandArguments = (!empty($arguments[3])) ? $arguments[3]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$subcommand, $index, $cursorId],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTADD.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTADD.php
new file mode 100644
index 000000000..c0bc3da72
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTADD.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.dictadd/
+ *
+ * Add terms to a dictionary.
+ */
+class FTDICTADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.DICTADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDEL.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDEL.php
new file mode 100644
index 000000000..19e0633b7
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDEL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.dictdel/
+ *
+ * Delete terms from a dictionary.
+ */
+class FTDICTDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.DICTDEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDUMP.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDUMP.php
new file mode 100644
index 000000000..b8282b560
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTDICTDUMP.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.dictdump/
+ *
+ * Dump all terms in the given dictionary.
+ */
+class FTDICTDUMP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.DICTDUMP';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTDROPINDEX.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTDROPINDEX.php
new file mode 100644
index 000000000..0da330fa9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTDROPINDEX.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+class FTDROPINDEX extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.DROPINDEX';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index] = $arguments;
+        $commandArguments = [];
+
+        if (!empty($arguments[1])) {
+            $commandArguments = $arguments[1]->toArray();
+        }
+
+        parent::setArguments(array_merge(
+            [$index],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTEXPLAIN.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTEXPLAIN.php
new file mode 100644
index 000000000..e2aa35d47
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTEXPLAIN.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.explain/
+ *
+ * Return the execution plan for a complex query.
+ */
+class FTEXPLAIN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.EXPLAIN';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $query] = $arguments;
+        $commandArguments = [];
+
+        if (!empty($arguments[2])) {
+            $commandArguments = $arguments[2]->toArray();
+        }
+
+        parent::setArguments(array_merge(
+            [$index, $query],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTINFO.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTINFO.php
new file mode 100644
index 000000000..02fa95974
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTINFO.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.info/
+ *
+ * Return information and statistics on the index.
+ */
+class FTINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.INFO';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTPROFILE.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTPROFILE.php
new file mode 100644
index 000000000..63be21f40
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTPROFILE.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.profile/
+ *
+ * Perform a FT.SEARCH or FT.AGGREGATE command and collects performance information.
+ */
+class FTPROFILE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.PROFILE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $arguments] = $arguments;
+
+        parent::setArguments(array_merge(
+            [$index],
+            $arguments->toArray()
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSEARCH.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSEARCH.php
new file mode 100644
index 000000000..9fbe8a563
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSEARCH.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see  https://redis.io/commands/ft.search/
+ *
+ * Search the index with a textual query, returning either documents or just ids
+ */
+class FTSEARCH extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SEARCH';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $query] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$index, $query],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSPELLCHECK.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSPELLCHECK.php
new file mode 100644
index 000000000..ac0232bb2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSPELLCHECK.php
@@ -0,0 +1,38 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+class FTSPELLCHECK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SPELLCHECK';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $query] = $arguments;
+        $commandArguments = [];
+
+        if (!empty($arguments[2])) {
+            $commandArguments = $arguments[2]->toArray();
+        }
+
+        parent::setArguments(array_merge(
+            [$index, $query],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGADD.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGADD.php
new file mode 100644
index 000000000..71c42a4a3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGADD.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.sugadd/
+ *
+ * Add a suggestion string to an auto-complete suggestion dictionary.
+ */
+class FTSUGADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SUGADD';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $string, $score] = $arguments;
+        $commandArguments = (!empty($arguments[3])) ? $arguments[3]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $string, $score],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGDEL.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGDEL.php
new file mode 100644
index 000000000..15457d10b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGDEL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.sugdel/
+ *
+ * Delete a string from a suggestion index.
+ */
+class FTSUGDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SUGDEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGGET.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGGET.php
new file mode 100644
index 000000000..e37d643a1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGGET.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.sugget/
+ *
+ * Get completion suggestions for a prefix.
+ */
+class FTSUGGET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SUGGET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $prefix] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $prefix],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGLEN.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGLEN.php
new file mode 100644
index 000000000..1e11d8d30
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSUGLEN.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.suglen/
+ *
+ * Get the size of an auto-complete suggestion dictionary.
+ */
+class FTSUGLEN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SUGLEN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNDUMP.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNDUMP.php
new file mode 100644
index 000000000..b9d9152b4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNDUMP.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.syndump/
+ *
+ * Dump the contents of a synonym group.
+ */
+class FTSYNDUMP extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SYNDUMP';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNUPDATE.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNUPDATE.php
new file mode 100644
index 000000000..3007ddca2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTSYNUPDATE.php
@@ -0,0 +1,46 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.synupdate/
+ *
+ * Update a synonym group
+ */
+class FTSYNUPDATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.SYNUPDATE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$index, $synonymGroupId] = $arguments;
+        $commandArguments = [];
+
+        if (!empty($arguments[2])) {
+            $commandArguments = $arguments[2]->toArray();
+        }
+
+        $terms = array_slice($arguments, 3);
+
+        parent::setArguments(array_merge(
+            [$index, $synonymGroupId],
+            $commandArguments,
+            $terms
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/Search/FTTAGVALS.php b/plugins/cache-redis/Predis/Command/Redis/Search/FTTAGVALS.php
new file mode 100644
index 000000000..b323949fe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/Search/FTTAGVALS.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\Search;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ft.tagvals/
+ *
+ * Return a distinct set of values indexed in a Tag field.
+ */
+class FTTAGVALS extends RedisCommand
+{
+    public function getId()
+    {
+        return 'FT.TAGVALS';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTADD.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTADD.php
new file mode 100644
index 000000000..0ef789e37
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTADD.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.add/
+ *
+ * Adds one or more observations to a t-digest sketch.
+ */
+class TDIGESTADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.ADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYRANK.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYRANK.php
new file mode 100644
index 000000000..8fba75ecc
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYRANK.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.byrank/
+ *
+ * Returns, for each input rank, an estimation of the value (floating-point) with that rank.
+ */
+class TDIGESTBYRANK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.BYRANK';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        return array_map(function ($value) {
+            if (is_string($value) || !is_float($value)) {
+                return $value;
+            }
+
+            if (is_nan($value)) {
+                return 'nan';
+            }
+
+            switch ($value) {
+                case INF: return 'inf';
+                case -INF: return '-inf';
+                default: return $value;
+            }
+        }, $data);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK.php
new file mode 100644
index 000000000..979270ccb
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTBYREVRANK.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.byrevrank/
+ *
+ * Returns, for each input reverse rank, an estimation of the value (floating-point) with that reverse rank.
+ */
+class TDIGESTBYREVRANK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.BYREVRANK';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        return array_map(function ($value) {
+            if (is_string($value) || !is_float($value)) {
+                return $value;
+            }
+
+            if (is_nan($value)) {
+                return 'nan';
+            }
+
+            switch ($value) {
+                case INF: return 'inf';
+                case -INF: return '-inf';
+                default: return $value;
+            }
+        }, $data);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCDF.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCDF.php
new file mode 100644
index 000000000..3f58f9a78
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCDF.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.cdf/
+ *
+ * Returns, for each input value, an estimation of the fraction (floating-point)
+ * of (observations smaller than the given value + half
+ * the observations equal to the given value).
+ */
+class TDIGESTCDF extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.CDF';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        return array_map(function ($value) {
+            if (is_string($value) || !is_float($value)) {
+                return $value;
+            }
+
+            if (is_nan($value)) {
+                return 'nan';
+            }
+
+            switch ($value) {
+                case INF: return 'inf';
+                case -INF: return '-inf';
+                default: return $value;
+            }
+        }, $data);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCREATE.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCREATE.php
new file mode 100644
index 000000000..68db397e0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTCREATE.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.create/
+ *
+ * Allocates memory and initializes a new t-digest sketch.
+ */
+class TDIGESTCREATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.CREATE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (!empty($arguments[1])) {
+            $arguments[2] = $arguments[1];
+            $arguments[1] = 'COMPRESSION';
+        } elseif (array_key_exists(1, $arguments) && $arguments[1] < 1) {
+            array_pop($arguments);
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTINFO.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTINFO.php
new file mode 100644
index 000000000..8cb100abe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTINFO.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.info/
+ *
+ * Returns information and statistics about a t-digest sketch.
+ */
+class TDIGESTINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.INFO';
+    }
+
+    public function parseResponse($data)
+    {
+        $result = [];
+
+        for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+            if (array_key_exists($i + 1, $data)) {
+                $result[(string) $data[$i]] = $data[++$i];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMAX.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMAX.php
new file mode 100644
index 000000000..6441f24ce
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMAX.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.max/
+ *
+ * Returns the maximum observation value from a t-digest sketch.
+ */
+class TDIGESTMAX extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.MAX';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (is_string($data) || !is_float($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        if (is_nan($data)) {
+            return 'nan';
+        }
+
+        switch ($data) {
+            case INF: return 'inf';
+            case -INF: return '-inf';
+            default: return $data;
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMERGE.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMERGE.php
new file mode 100644
index 000000000..e9d5f3a96
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMERGE.php
@@ -0,0 +1,43 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.merge/
+ *
+ * Merges multiple t-digest sketches into a single sketch.
+ */
+class TDIGESTMERGE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.MERGE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $processedArguments = array_merge([$arguments[0], count($arguments[1])], $arguments[1]);
+
+        for ($i = 2, $iMax = count($arguments); $i < $iMax; $i++) {
+            if (is_int($arguments[$i]) && $arguments[$i] !== 0) {
+                array_push($processedArguments, 'COMPRESSION', $arguments[$i]);
+            } elseif (is_bool($arguments[$i]) && $arguments[$i]) {
+                $processedArguments[] = 'OVERRIDE';
+            }
+        }
+
+        parent::setArguments($processedArguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMIN.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMIN.php
new file mode 100644
index 000000000..472f07da3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTMIN.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.min/
+ *
+ * Returns the minimum observation value from a t-digest sketch.
+ */
+class TDIGESTMIN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.MIN';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (is_string($data) || !is_float($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        if (is_nan($data)) {
+            return 'nan';
+        }
+
+        switch ($data) {
+            case INF: return 'inf';
+            case -INF: return '-inf';
+            default: return $data;
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTQUANTILE.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTQUANTILE.php
new file mode 100644
index 000000000..001ec0e31
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTQUANTILE.php
@@ -0,0 +1,55 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.quantile/
+ *
+ * Returns, for each input fraction, an estimation of the value (floating point) that is smaller than the given fraction of observations.
+ */
+class TDIGESTQUANTILE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.QUANTILE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (!is_array($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        return array_map(function ($value) {
+            if (is_string($value) || !is_float($value)) {
+                return $value;
+            }
+
+            if (is_nan($value)) {
+                return 'nan';
+            }
+
+            switch ($value) {
+                case INF: return 'inf';
+                case -INF: return '-inf';
+                default: return $value;
+            }
+        }, $data);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRANK.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRANK.php
new file mode 100644
index 000000000..3e41db1ef
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRANK.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.rank/
+ *
+ * Returns, for each input value (floating-point), the estimated rank
+ * of the value (the number of observations in the sketch that are smaller than
+ * the value + half the number of observations that are equal to the value).
+ */
+class TDIGESTRANK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.RANK';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRESET.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRESET.php
new file mode 100644
index 000000000..0456f4f90
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTRESET.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.reset/
+ *
+ * Resets a t-digest sketch: empty the sketch and re-initializes it.
+ */
+class TDIGESTRESET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.RESET';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTREVRANK.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTREVRANK.php
new file mode 100644
index 000000000..dec778038
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTREVRANK.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.revrank/
+ *
+ * Returns, for each input value (floating-point), the estimated reverse rank
+ * of the value (the number of observations in the sketch that are larger than
+ * the value + half the number of observations that are equal to the value).
+ */
+class TDIGESTREVRANK extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.REVRANK';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN.php b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN.php
new file mode 100644
index 000000000..2ccd3d345
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TDigest/TDIGESTTRIMMED_MEAN.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TDigest;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/tdigest.trimmed_mean/
+ *
+ * Returns an estimation of the mean value from the sketch,
+ * excluding observation values outside the low and high cutoff quantiles.
+ */
+class TDIGESTTRIMMED_MEAN extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TDIGEST.TRIMMED_MEAN';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (is_string($data) || !is_float($data)) {
+            return $data;
+        }
+
+        // convert Relay (RESP3) constants to strings
+        if (is_nan($data)) {
+            return 'nan';
+        }
+
+        switch ($data) {
+            case INF: return 'inf';
+            case -INF: return '-inf';
+            default: return $data;
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerTime.php b/plugins/cache-redis/Predis/Command/Redis/TIME.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ServerTime.php
rename to plugins/cache-redis/Predis/Command/Redis/TIME.php
index 589f92c55..da0ff399f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerTime.php
+++ b/plugins/cache-redis/Predis/Command/Redis/TIME.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/time
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/time
  */
-class ServerTime extends Command
+class TIME extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TOUCH.php b/plugins/cache-redis/Predis/Command/Redis/TOUCH.php
new file mode 100644
index 000000000..82c13fef8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TOUCH.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/touch
+ */
+class TOUCH extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'TOUCH';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyTimeToLive.php b/plugins/cache-redis/Predis/Command/Redis/TTL.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/KeyTimeToLive.php
rename to plugins/cache-redis/Predis/Command/Redis/TTL.php
index 67697a6fb..b8fd32292 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyTimeToLive.php
+++ b/plugins/cache-redis/Predis/Command/Redis/TTL.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/ttl
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/ttl
  */
-class KeyTimeToLive extends Command
+class TTL extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TYPE.php b/plugins/cache-redis/Predis/Command/Redis/TYPE.php
new file mode 100644
index 000000000..dece63778
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TYPE.php
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/type
+ */
+class TYPE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'TYPE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        if (is_string($data)) {
+            return $data;
+        }
+
+        // Relay types
+        switch ($data) {
+            case 0: return 'none';
+            case 1: return 'string';
+            case 2: return 'set';
+            case 3: return 'list';
+            case 4: return 'zset';
+            case 5: return 'hash';
+            case 6: return 'stream';
+            default: return $data;
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSADD.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSADD.php
new file mode 100644
index 000000000..9936151e1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSADD.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.add/
+ *
+ * Append a sample to a time series.
+ */
+class TSADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.ADD';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $timestamp, $value] = $arguments;
+        $commandArguments = (!empty($arguments[3])) ? $arguments[3]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $timestamp, $value],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSALTER.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSALTER.php
new file mode 100644
index 000000000..8797d68a3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSALTER.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.alter/
+ *
+ * Update the retention, chunk size, duplicate policy, and labels of an existing time series.
+ */
+class TSALTER extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.ALTER';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key] = $arguments;
+        $commandArguments = (!empty($arguments[1])) ? $arguments[1]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATE.php
new file mode 100644
index 000000000..0d88072c0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.create/
+ *
+ * Create a new time series.
+ */
+class TSCREATE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.CREATE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key] = $arguments;
+        $commandArguments = (!empty($arguments[1])) ? $arguments[1]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATERULE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATERULE.php
new file mode 100644
index 000000000..c8bd62bcb
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSCREATERULE.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.createrule/
+ *
+ * Create a compaction rule
+ */
+class TSCREATERULE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.CREATERULE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$sourceKey, $destKey, $aggregator, $bucketDuration] = $arguments;
+        $processedArguments = [$sourceKey, $destKey, 'AGGREGATION', $aggregator, $bucketDuration];
+
+        if (count($arguments) === 5) {
+            $processedArguments[] = $arguments[4];
+        }
+
+        parent::setArguments($processedArguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDECRBY.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDECRBY.php
new file mode 100644
index 000000000..4d786713b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDECRBY.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.decrby/
+ *
+ * Decrease the value of the sample with the maximum existing timestamp,
+ * or create a new sample with a value equal to the value of the sample
+ * with the maximum existing timestamp with a given decrement.
+ */
+class TSDECRBY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.DECRBY';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $value] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $value],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDEL.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDEL.php
new file mode 100644
index 000000000..747c5a629
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDEL.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.del/
+ *
+ * Delete all samples between two timestamps for a given time series.
+ */
+class TSDEL extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.DEL';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDELETERULE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDELETERULE.php
new file mode 100644
index 000000000..4b2279fc4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSDELETERULE.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.deleterule/
+ *
+ * Delete a compaction rule.
+ */
+class TSDELETERULE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.DELETERULE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSGET.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSGET.php
new file mode 100644
index 000000000..d5cad6843
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSGET.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.get/
+ *
+ * Get the sample with the highest timestamp from a given time series.
+ */
+class TSGET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.GET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key] = $arguments;
+        $commandArguments = (!empty($arguments[1])) ? $arguments[1]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINCRBY.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINCRBY.php
new file mode 100644
index 000000000..3141e5ded
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINCRBY.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.incrby/
+ *
+ * Increase the value of the sample with the maximum existing timestamp,
+ * or create a new sample with a value equal to the value of the sample
+ * with the maximum existing timestamp with a given increment
+ */
+class TSINCRBY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.INCRBY';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $value] = $arguments;
+        $commandArguments = (!empty($arguments[2])) ? $arguments[2]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $value],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINFO.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINFO.php
new file mode 100644
index 000000000..d4941d407
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSINFO.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.info/
+ *
+ * Return information and statistics for a time series.
+ */
+class TSINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.INFO';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key] = $arguments;
+        $commandArguments = (!empty($arguments[1])) ? $arguments[1]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMADD.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMADD.php
new file mode 100644
index 000000000..085224693
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMADD.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.madd/
+ *
+ * Append new samples to one or more time series.
+ */
+class TSMADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.MADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMGET.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMGET.php
new file mode 100644
index 000000000..78c43d2b5
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMGET.php
@@ -0,0 +1,37 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+class TSMGET extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.MGET';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $processedArguments = [];
+        $argumentsObject = array_shift($arguments);
+        $commandArguments = $argumentsObject->toArray();
+
+        array_push($processedArguments, 'FILTER', ...$arguments);
+
+        parent::setArguments(array_merge(
+            $commandArguments,
+            $processedArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMRANGE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMRANGE.php
new file mode 100644
index 000000000..3d68cdd99
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMRANGE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.mrange/
+ *
+ * Query a range across multiple time series by filters in forward direction.
+ */
+class TSMRANGE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.MRANGE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$fromTimestamp, $toTimestamp] = $arguments;
+        $commandArguments = $arguments[2]->toArray();
+
+        parent::setArguments(array_merge(
+            [$fromTimestamp, $toTimestamp],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMREVRANGE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMREVRANGE.php
new file mode 100644
index 000000000..987fd8201
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSMREVRANGE.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+/**
+ * @see https://redis.io/commands/ts.mrevrange/
+ *
+ * Query a range across multiple time series by filters in reverse direction.
+ */
+class TSMREVRANGE extends TSMRANGE
+{
+    public function getId()
+    {
+        return 'TS.MREVRANGE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSQUERYINDEX.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSQUERYINDEX.php
new file mode 100644
index 000000000..0645426eb
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSQUERYINDEX.php
@@ -0,0 +1,28 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.queryindex/
+ *
+ * Get all time series keys matching a filter list.
+ */
+class TSQUERYINDEX extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.QUERYINDEX';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSRANGE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSRANGE.php
new file mode 100644
index 000000000..f80cfa702
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSRANGE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/ts.range/
+ *
+ * Query a range in forward direction.
+ */
+class TSRANGE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TS.RANGE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        [$key, $fromTimestamp, $toTimestamp] = $arguments;
+        $commandArguments = (!empty($arguments[3])) ? $arguments[3]->toArray() : [];
+
+        parent::setArguments(array_merge(
+            [$key, $fromTimestamp, $toTimestamp],
+            $commandArguments
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSREVRANGE.php b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSREVRANGE.php
new file mode 100644
index 000000000..1e8768e96
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TimeSeries/TSREVRANGE.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TimeSeries;
+
+/**
+ * @see https://redis.io/commands/ts.revrange/
+ *
+ * Query a range in reverse direction.
+ */
+class TSREVRANGE extends TSRANGE
+{
+    public function getId()
+    {
+        return 'TS.REVRANGE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKADD.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKADD.php
new file mode 100644
index 000000000..a2e78cc40
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKADD.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.add/
+ *
+ * Adds an item to the data structure.
+ * Multiple items can be added at once.
+ * If an item enters the Top-K list, the item which is expelled is returned.
+ * This allows dynamic heavy-hitter detection of items being entered or expelled from Top-K list.
+ */
+class TOPKADD extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.ADD';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINCRBY.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINCRBY.php
new file mode 100644
index 000000000..c9df9f608
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINCRBY.php
@@ -0,0 +1,30 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.incrby/
+ *
+ * Increase the score of an item in the data structure by increment.
+ * Multiple items' score can be increased at once.
+ * If an item enters the Top-K list, the item which is expelled is returned.
+ */
+class TOPKINCRBY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.INCRBY';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINFO.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINFO.php
new file mode 100644
index 000000000..108b1172a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKINFO.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.info/
+ *
+ * Returns number of required items (k), width, depth and decay values.
+ */
+class TOPKINFO extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.INFO';
+    }
+
+    public function parseResponse($data)
+    {
+        $result = [];
+
+        for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+            if (array_key_exists($i + 1, $data)) {
+                $result[(string) $data[$i]] = $data[++$i];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKLIST.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKLIST.php
new file mode 100644
index 000000000..11cbcfa5e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKLIST.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.list/
+ *
+ * Return full list of items in Top K list.
+ */
+class TOPKLIST extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.LIST';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        if (!empty($arguments[1])) {
+            $arguments[1] = 'WITHCOUNT';
+        }
+
+        parent::setArguments($arguments);
+        $this->filterArguments();
+    }
+
+    public function parseResponse($data)
+    {
+        if ($this->isWithCountModifier()) {
+            $result = [];
+
+            for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+                if (array_key_exists($i + 1, $data)) {
+                    $result[(string) $data[$i]] = $data[++$i];
+                }
+            }
+
+            return $result;
+        }
+
+        return $data;
+    }
+
+    /**
+     * Checks for the presence of the WITHCOUNT modifier.
+     *
+     * @return bool
+     */
+    private function isWithCountModifier(): bool
+    {
+        $arguments = $this->getArguments();
+        $lastArgument = (!empty($arguments)) ? $arguments[count($arguments) - 1] : null;
+
+        return is_string($lastArgument) && strtoupper($lastArgument) === 'WITHCOUNT';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKQUERY.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKQUERY.php
new file mode 100644
index 000000000..128902194
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKQUERY.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.query/
+ *
+ * Checks whether an item is one of Top-K items.
+ * Multiple items can be checked at once.
+ */
+class TOPKQUERY extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.QUERY';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKRESERVE.php b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKRESERVE.php
new file mode 100644
index 000000000..7f464b2bd
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/TopK/TOPKRESERVE.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis\TopK;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/topk.reserve/
+ *
+ * Initializes a TopK with specified parameters.
+ */
+class TOPKRESERVE extends RedisCommand
+{
+    public function getId()
+    {
+        return 'TOPK.RESERVE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        switch (count($arguments)) {
+            case 3:
+                $arguments[] = 7; // default depth
+                $arguments[] = 0.9; // default decay
+                break;
+            case 4:
+                $arguments[] = 0.9; // default decay
+                break;
+            default:
+                parent::setArguments($arguments);
+
+                return;
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/UNSUBSCRIBE.php b/plugins/cache-redis/Predis/Command/Redis/UNSUBSCRIBE.php
new file mode 100644
index 000000000..b5ea6855e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/UNSUBSCRIBE.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/unsubscribe
+ */
+class UNSUBSCRIBE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'UNSUBSCRIBE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeArguments($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionUnwatch.php b/plugins/cache-redis/Predis/Command/Redis/UNWATCH.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionUnwatch.php
rename to plugins/cache-redis/Predis/Command/Redis/UNWATCH.php
index 792555449..901aa0723 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionUnwatch.php
+++ b/plugins/cache-redis/Predis/Command/Redis/UNWATCH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/unwatch
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/unwatch
  */
-class TransactionUnwatch extends Command
+class UNWATCH extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/WAITAOF.php b/plugins/cache-redis/Predis/Command/Redis/WAITAOF.php
new file mode 100644
index 000000000..f58cc0547
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/WAITAOF.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/waitaof/
+ *
+ * This command blocks the current client until all the previous write commands are acknowledged
+ * as having been fsynced to the AOF of the local Redis and/or at least the specified number of replicas.
+ */
+class WAITAOF extends RedisCommand
+{
+    public function getId()
+    {
+        return 'WAITAOF';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionWatch.php b/plugins/cache-redis/Predis/Command/Redis/WATCH.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionWatch.php
rename to plugins/cache-redis/Predis/Command/Redis/WATCH.php
index d3607801b..d7a93e696 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/TransactionWatch.php
+++ b/plugins/cache-redis/Predis/Command/Redis/WATCH.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/watch
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/watch
  */
-class TransactionWatch extends Command
+class WATCH extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,12 +30,12 @@ class TransactionWatch extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (isset($arguments[0]) && is_array($arguments[0])) {
-            return $arguments[0];
+            $arguments = $arguments[0];
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/plugins/cache-redis/Predis/Command/Redis/XADD.php b/plugins/cache-redis/Predis/Command/Redis/XADD.php
new file mode 100644
index 000000000..21c132272
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XADD.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/xadd
+ */
+class XADD extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XADD';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $args = [];
+
+        $args[] = $arguments[0];
+        $options = $arguments[3] ?? [];
+
+        if (isset($options['nomkstream']) && $options['nomkstream']) {
+            $args[] = 'NOMKSTREAM';
+        }
+
+        if (isset($options['trim']) && is_array($options['trim'])) {
+            array_push($args, ...$options['trim']);
+
+            if (isset($options['limit'])) {
+                $args[] = 'LIMIT';
+                $args[] = $options['limit'];
+            }
+        }
+
+        // ID, default to * to let Redis set it
+        $args[] = $arguments[2] ?? '*';
+        if (isset($arguments[1]) && is_array($arguments[1])) {
+            foreach ($arguments[1] as $key => $val) {
+                $args[] = $key;
+                $args[] = $val;
+            }
+        }
+
+        parent::setArguments($args);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/XDEL.php b/plugins/cache-redis/Predis/Command/Redis/XDEL.php
new file mode 100644
index 000000000..f1c509e35
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XDEL.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/xdel
+ */
+class XDEL extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XDEL';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/XLEN.php b/plugins/cache-redis/Predis/Command/Redis/XLEN.php
new file mode 100644
index 000000000..aa1f65be3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XLEN.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/xlen
+ */
+class XLEN extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XLEN';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/XRANGE.php b/plugins/cache-redis/Predis/Command/Redis/XRANGE.php
new file mode 100644
index 000000000..1be1491b5
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XRANGE.php
@@ -0,0 +1,62 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/xrange
+ */
+class XRANGE extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XRANGE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        if (count($arguments) === 4) {
+            $arguments[] = $arguments[3];
+            $arguments[3] = 'COUNT';
+        }
+
+        parent::setArguments($arguments);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        $result = [];
+        foreach ($data as $entry) {
+            $processed = [];
+            $count = count($entry[1]);
+
+            for ($i = 0; $i < $count; ++$i) {
+                $processed[$entry[1][$i]] = $entry[1][++$i];
+            }
+
+            $result[$entry[0]] = $processed;
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/XREVRANGE.php b/plugins/cache-redis/Predis/Command/Redis/XREVRANGE.php
new file mode 100644
index 000000000..23b66f7be
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XREVRANGE.php
@@ -0,0 +1,27 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+/**
+ * @see http://redis.io/commands/xrevrange
+ */
+class XREVRANGE extends XRANGE
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XREVRANGE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/XTRIM.php b/plugins/cache-redis/Predis/Command/Redis/XTRIM.php
new file mode 100644
index 000000000..6756b51b9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/XTRIM.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/xtrim
+ */
+class XTRIM extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'XTRIM';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $args = [];
+        $options = $arguments[3] ?? [];
+
+        $args[] = $arguments[0];
+        // Either e.g. 'MAXLEN' or ['MAXLEN', '~']
+        if (is_array($arguments[1])) {
+            array_push($args, ...$arguments[1]);
+        } else {
+            $args[] = $arguments[1];
+        }
+
+        $args[] = $arguments[2];
+        if (isset($options['limit'])) {
+            $args[] = 'LIMIT';
+            $args[] = $options['limit'];
+        }
+
+        parent::setArguments($args);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetAdd.php b/plugins/cache-redis/Predis/Command/Redis/ZADD.php
similarity index 65%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetAdd.php
rename to plugins/cache-redis/Predis/Command/Redis/ZADD.php
index 55e4729e5..0ac7ce193 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetAdd.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZADD.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zadd
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zadd
  */
-class ZSetAdd extends Command
+class ZADD extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,7 +30,7 @@ class ZSetAdd extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (is_array(end($arguments))) {
             foreach (array_pop($arguments) as $member => $score) {
@@ -38,6 +39,6 @@ class ZSetAdd extends Command
             }
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCardinality.php b/plugins/cache-redis/Predis/Command/Redis/ZCARD.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCardinality.php
rename to plugins/cache-redis/Predis/Command/Redis/ZCARD.php
index 10332009a..7f6cfd4d0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCardinality.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZCARD.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zcard
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zcard
  */
-class ZSetCardinality extends Command
+class ZCARD extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCount.php b/plugins/cache-redis/Predis/Command/Redis/ZCOUNT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCount.php
rename to plugins/cache-redis/Predis/Command/Redis/ZCOUNT.php
index 918bd2b80..32b54cb33 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetCount.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZCOUNT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zcount
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zcount
  */
-class ZSetCount extends Command
+class ZCOUNT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZDIFF.php b/plugins/cache-redis/Predis/Command/Redis/ZDIFF.php
new file mode 100644
index 000000000..573dcae68
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZDIFF.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\With\WithScores;
+
+/**
+ * @see https://redis.io/commands/zdiff/
+ *
+ * This command is similar to ZDIFFSTORE, but instead of
+ * storing the resulting sorted set, it is returned to the client.
+ */
+class ZDIFF extends RedisCommand
+{
+    use WithScores {
+        WithScores::setArguments as setWithScore;
+    }
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+
+    protected static $keysArgumentPositionOffset = 0;
+
+    public function getId()
+    {
+        return 'ZDIFF';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setKeys($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setWithScore($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZDIFFSTORE.php b/plugins/cache-redis/Predis/Command/Redis/ZDIFFSTORE.php
new file mode 100644
index 000000000..729988372
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZDIFFSTORE.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+
+/**
+ * @see https://redis.io/commands/zdiffstore/
+ *
+ * Computes the difference between the first and all successive input sorted sets
+ * and stores the result in destination. The total number of input keys is specified by numkeys.
+ *
+ * Keys that do not exist are considered to be empty sets.
+ *
+ * If destination already exists, it is overwritten.
+ */
+class ZDIFFSTORE extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+
+    public static $keysArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'ZDIFFSTORE';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIncrementBy.php b/plugins/cache-redis/Predis/Command/Redis/ZINCRBY.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIncrementBy.php
rename to plugins/cache-redis/Predis/Command/Redis/ZINCRBY.php
index 245a8e0f5..c46044e3d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIncrementBy.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZINCRBY.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zincrby
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zincrby
  */
-class ZSetIncrementBy extends Command
+class ZINCRBY extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZINTER.php b/plugins/cache-redis/Predis/Command/Redis/ZINTER.php
new file mode 100644
index 000000000..787db2bbe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZINTER.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Traits\With\WithScores;
+
+/**
+ * @see https://redis.io/commands/zinter/
+ *
+ * This command is similar to ZINTERSTORE, but instead of
+ * storing the resulting sorted set, it is returned to the client.
+ */
+class ZINTER extends ZINTERSTORE
+{
+    use WithScores;
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $weightsArgumentPositionOffset = 1;
+    protected static $aggregateArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'ZINTER';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZINTERCARD.php b/plugins/cache-redis/Predis/Command/Redis/ZINTERCARD.php
new file mode 100644
index 000000000..e6b2b4501
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZINTERCARD.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\Limit\Limit;
+
+/**
+ * @see https://redis.io/commands/zintercard/
+ *
+ * This command is similar to ZINTER, but instead of returning the result set,
+ * it returns just the cardinality of the result.
+ */
+class ZINTERCARD extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+    use Limit {
+        Limit::setArguments as setLimit;
+    }
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $limitArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'ZINTERCARD';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setLimit($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setKeys($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIntersectionStore.php b/plugins/cache-redis/Predis/Command/Redis/ZINTERSTORE.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIntersectionStore.php
rename to plugins/cache-redis/Predis/Command/Redis/ZINTERSTORE.php
index 572a7a324..7f0aa4498 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetIntersectionStore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZINTERSTORE.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/zinterstore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zinterstore
  */
-class ZSetIntersectionStore extends ZSetUnionStore
+class ZINTERSTORE extends ZUNIONSTORE
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetLexCount.php b/plugins/cache-redis/Predis/Command/Redis/ZLEXCOUNT.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetLexCount.php
rename to plugins/cache-redis/Predis/Command/Redis/ZLEXCOUNT.php
index 447b8eb32..c216b99d9 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetLexCount.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZLEXCOUNT.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zlexcount
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zlexcount
  */
-class ZSetLexCount extends Command
+class ZLEXCOUNT extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZMPOP.php b/plugins/cache-redis/Predis/Command/Redis/ZMPOP.php
new file mode 100644
index 000000000..4adc0cca9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZMPOP.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Count;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\MinMaxModifier;
+
+/**
+ * @see https://redis.io/commands/zmpop/
+ *
+ * Pops one or more elements, that are member-score pairs,
+ * from the first non-empty sorted set in the provided list of key names.
+ */
+class ZMPOP extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+    use Count {
+        Count::setArguments as setCount;
+    }
+    use MinMaxModifier;
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $countArgumentPositionOffset = 2;
+    protected static $modifierArgumentPositionOffset = 1;
+
+    public function getId()
+    {
+        return 'ZMPOP';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setCount($arguments);
+        $arguments = $this->getArguments();
+
+        $this->resolveModifier(static::$modifierArgumentPositionOffset, $arguments);
+
+        $this->setKeys($arguments);
+        $arguments = $this->getArguments();
+
+        parent::setArguments($arguments);
+    }
+
+    public function parseResponse($data)
+    {
+        $key = array_shift($data);
+
+        if (null === $key) {
+            return [$key];
+        }
+
+        $data = $data[0];
+        $parsedData = [];
+
+        for ($i = 0, $iMax = count($data); $i < $iMax; $i++) {
+            for ($j = 0, $jMax = count($data[$i]); $j < $jMax; ++$j) {
+                if ($data[$i][$j + 1] ?? false) {
+                    $parsedData[$data[$i][$j]] = $data[$i][++$j];
+                }
+            }
+        }
+
+        return array_combine([$key], [$parsedData]);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZMSCORE.php b/plugins/cache-redis/Predis/Command/Redis/ZMSCORE.php
new file mode 100644
index 000000000..2dd76fd65
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZMSCORE.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see https://redis.io/commands/zmscore/
+ *
+ * Returns the scores associated with the specified members
+ * in the sorted set stored at key.
+ *
+ * For every member that does not exist in the sorted set, a null value is returned.
+ */
+class ZMSCORE extends RedisCommand
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function getId()
+    {
+        return 'ZMSCORE';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZPOPMAX.php b/plugins/cache-redis/Predis/Command/Redis/ZPOPMAX.php
new file mode 100644
index 000000000..1ebf45b09
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZPOPMAX.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/zpopmax
+ */
+class ZPOPMAX extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'ZPOPMAX';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        $result = [];
+
+        for ($i = 0; $i < count($data); ++$i) {
+            if (is_array($data[$i])) {
+                $result[$data[$i][0]] = $data[$i][1]; // Relay
+            } else {
+                $result[$data[$i]] = $data[++$i];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZPOPMIN.php b/plugins/cache-redis/Predis/Command/Redis/ZPOPMIN.php
new file mode 100644
index 000000000..5f561c8ee
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZPOPMIN.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/zpopmin
+ */
+class ZPOPMIN extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'ZPOPMIN';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function parseResponse($data)
+    {
+        $result = [];
+
+        for ($i = 0; $i < count($data); ++$i) {
+            if (is_array($data[$i])) {
+                $result[$data[$i][0]] = $data[$i][1]; // Relay
+            } else {
+                $result[$data[$i]] = $data[++$i];
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZRANDMEMBER.php b/plugins/cache-redis/Predis/Command/Redis/ZRANDMEMBER.php
new file mode 100644
index 000000000..e5597dcef
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANDMEMBER.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\With\WithScores;
+
+/**
+ * @see https://redis.io/commands/zrandmember/
+ *
+ * Return a random element from the sorted set value stored at key.
+ *
+ * If the provided count argument is positive, return an array of distinct elements.
+ *
+ * If called with a negative count, the behavior changes and the command
+ * is allowed to return the same element multiple times.
+ */
+class ZRANDMEMBER extends RedisCommand
+{
+    use WithScores;
+
+    public function getId()
+    {
+        return 'ZRANDMEMBER';
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRange.php b/plugins/cache-redis/Predis/Command/Redis/ZRANGE.php
similarity index 72%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRange.php
rename to plugins/cache-redis/Predis/Command/Redis/ZRANGE.php
index ce72c7c07..2024ad4e4 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRange.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANGE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zrange
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrange
  */
-class ZSetRange extends Command
+class ZRANGE extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,25 +30,24 @@ class ZSetRange extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 4) {
             $lastType = gettype($arguments[3]);
 
             if ($lastType === 'string' && strtoupper($arguments[3]) === 'WITHSCORES') {
                 // Used for compatibility with older versions
-                $arguments[3] = array('WITHSCORES' => true);
+                $arguments[3] = ['WITHSCORES' => true];
                 $lastType = 'array';
             }
 
             if ($lastType === 'array') {
                 $options = $this->prepareOptions(array_pop($arguments));
-
-                return array_merge($arguments, $options);
+                $arguments = array_merge($arguments, $options);
             }
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 
     /**
@@ -60,7 +60,7 @@ class ZSetRange extends Command
     protected function prepareOptions($options)
     {
         $opts = array_change_key_case($options, CASE_UPPER);
-        $finalizedOpts = array();
+        $finalizedOpts = [];
 
         if (!empty($opts['WITHSCORES'])) {
             $finalizedOpts[] = 'WITHSCORES';
@@ -91,10 +91,14 @@ class ZSetRange extends Command
     public function parseResponse($data)
     {
         if ($this->withScores()) {
-            $result = array();
+            $result = [];
 
             for ($i = 0; $i < count($data); ++$i) {
-                $result[$data[$i]] = $data[++$i];
+                if (is_array($data[$i])) {
+                    $result[$data[$i][0]] = $data[$i][1]; // Relay
+                } else {
+                    $result[$data[$i]] = $data[++$i];
+                }
             }
 
             return $result;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByLex.php b/plugins/cache-redis/Predis/Command/Redis/ZRANGEBYLEX.php
similarity index 65%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByLex.php
rename to plugins/cache-redis/Predis/Command/Redis/ZRANGEBYLEX.php
index 9b2991a81..18b4a6d30 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByLex.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANGEBYLEX.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/zrangebylex
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrangebylex
  */
-class ZSetRangeByLex extends ZSetRange
+class ZRANGEBYLEX extends ZRANGE
 {
     /**
      * {@inheritdoc}
@@ -32,14 +31,14 @@ class ZSetRangeByLex extends ZSetRange
     protected function prepareOptions($options)
     {
         $opts = array_change_key_case($options, CASE_UPPER);
-        $finalizedOpts = array();
+        $finalizedOpts = [];
 
         if (isset($opts['LIMIT']) && is_array($opts['LIMIT'])) {
             $limit = array_change_key_case($opts['LIMIT'], CASE_UPPER);
 
             $finalizedOpts[] = 'LIMIT';
-            $finalizedOpts[] = isset($limit['OFFSET']) ? $limit['OFFSET'] : $limit[0];
-            $finalizedOpts[] = isset($limit['COUNT']) ? $limit['COUNT'] : $limit[1];
+            $finalizedOpts[] = $limit['OFFSET'] ?? $limit[0];
+            $finalizedOpts[] = $limit['COUNT'] ?? $limit[1];
         }
 
         return $finalizedOpts;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByScore.php b/plugins/cache-redis/Predis/Command/Redis/ZRANGEBYSCORE.php
similarity index 73%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByScore.php
rename to plugins/cache-redis/Predis/Command/Redis/ZRANGEBYSCORE.php
index 961a5bc2e..66cbe4eab 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRangeByScore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANGEBYSCORE.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/zrangebyscore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrangebyscore
  */
-class ZSetRangeByScore extends ZSetRange
+class ZRANGEBYSCORE extends ZRANGE
 {
     /**
      * {@inheritdoc}
@@ -32,14 +31,14 @@ class ZSetRangeByScore extends ZSetRange
     protected function prepareOptions($options)
     {
         $opts = array_change_key_case($options, CASE_UPPER);
-        $finalizedOpts = array();
+        $finalizedOpts = [];
 
         if (isset($opts['LIMIT']) && is_array($opts['LIMIT'])) {
             $limit = array_change_key_case($opts['LIMIT'], CASE_UPPER);
 
             $finalizedOpts[] = 'LIMIT';
-            $finalizedOpts[] = isset($limit['OFFSET']) ? $limit['OFFSET'] : $limit[0];
-            $finalizedOpts[] = isset($limit['COUNT']) ? $limit['COUNT'] : $limit[1];
+            $finalizedOpts[] = $limit['OFFSET'] ?? $limit[0];
+            $finalizedOpts[] = $limit['COUNT'] ?? $limit[1];
         }
 
         return array_merge($finalizedOpts, parent::prepareOptions($options));
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZRANGESTORE.php b/plugins/cache-redis/Predis/Command/Redis/ZRANGESTORE.php
new file mode 100644
index 000000000..4f820b06c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANGESTORE.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\By\ByLexByScore;
+use Predis\Command\Traits\Limit\Limit;
+use Predis\Command\Traits\Rev;
+
+/**
+ * @see https://redis.io/commands/zrangestore/
+ *
+ * This command is like ZRANGE, but stores the result in the destination key.
+ */
+class ZRANGESTORE extends RedisCommand
+{
+    use ByLexByScore {
+        ByLexByScore::setArguments as setByLexByScoreArgument;
+    }
+    use Rev {
+        Rev::setArguments as setReversedArgument;
+    }
+    use Limit {
+        Limit::setArguments as setLimitArguments;
+    }
+
+    protected static $byLexByScoreArgumentPositionOffset = 4;
+    protected static $revArgumentPositionOffset = 5;
+    protected static $limitArgumentPositionOffset = 6;
+
+    public function getId()
+    {
+        return 'ZRANGESTORE';
+    }
+
+    public function setArguments(array $arguments)
+    {
+        $this->setByLexByScoreArgument($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setReversedArgument($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setLimitArguments($arguments);
+        $this->filterArguments();
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRank.php b/plugins/cache-redis/Predis/Command/Redis/ZRANK.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRank.php
rename to plugins/cache-redis/Predis/Command/Redis/ZRANK.php
index d0c9c536e..3c6ac2a6e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRank.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZRANK.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zrank
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrank
  */
-class ZSetRank extends Command
+class ZRANK extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZREM.php b/plugins/cache-redis/Predis/Command/Redis/ZREM.php
new file mode 100644
index 000000000..f14a0790a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREM.php
@@ -0,0 +1,39 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+
+/**
+ * @see http://redis.io/commands/zrem
+ */
+class ZREM extends RedisCommand
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'ZREM';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        $arguments = self::normalizeVariadic($arguments);
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByLex.php b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYLEX.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByLex.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYLEX.php
index 9ea2d9e5b..f4f8a5776 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByLex.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYLEX.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zremrangebylex
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zremrangebylex
  */
-class ZSetRemoveRangeByLex extends Command
+class ZREMRANGEBYLEX extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByRank.php b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYRANK.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByRank.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYRANK.php
index 89cd5baff..3aeff30c0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByRank.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYRANK.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zremrangebyrank
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zremrangebyrank
  */
-class ZSetRemoveRangeByRank extends Command
+class ZREMRANGEBYRANK extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByScore.php b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYSCORE.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByScore.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYSCORE.php
index a7c30814b..6f88c5d1d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemoveRangeByScore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREMRANGEBYSCORE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zremrangebyscore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zremrangebyscore
  */
-class ZSetRemoveRangeByScore extends Command
+class ZREMRANGEBYSCORE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRange.php b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRange.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREVRANGE.php
index 6a46a7a5a..a22566191 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRange.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGE.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/zrevrange
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrevrange
  */
-class ZSetReverseRange extends ZSetRange
+class ZREVRANGE extends ZRANGE
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByLex.php b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYLEX.php
similarity index 61%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByLex.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYLEX.php
index cdd8ba623..75cad0bce 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByLex.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYLEX.php
@@ -3,15 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
-class ZSetReverseRangeByLex extends ZSetRangeByLex
+/**
+ * @see http://redis.io/commands/zrevrangebylex
+ */
+class ZREVRANGEBYLEX extends ZRANGEBYLEX
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByScore.php b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYSCORE.php
similarity index 57%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByScore.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYSCORE.php
index 1078eb72b..9acc450df 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRangeByScore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREVRANGEBYSCORE.php
@@ -3,20 +3,19 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
 
 /**
- * @link http://redis.io/commands/zrevrangebyscore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrevrangebyscore
  */
-class ZSetReverseRangeByScore extends ZSetRangeByScore
+class ZREVRANGEBYSCORE extends ZRANGEBYSCORE
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRank.php b/plugins/cache-redis/Predis/Command/Redis/ZREVRANK.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRank.php
rename to plugins/cache-redis/Predis/Command/Redis/ZREVRANK.php
index 33fb81584..620d2fe70 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetReverseRank.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZREVRANK.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zrevrank
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zrevrank
  */
-class ZSetReverseRank extends Command
+class ZREVRANK extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScan.php b/plugins/cache-redis/Predis/Command/Redis/ZSCAN.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScan.php
rename to plugins/cache-redis/Predis/Command/Redis/ZSCAN.php
index 1dc2352ed..ee0b13105 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScan.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZSCAN.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zscan
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zscan
  */
-class ZSetScan extends Command
+class ZSCAN extends RedisCommand
 {
     /**
      * {@inheritdoc}
@@ -29,14 +30,14 @@ class ZSetScan extends Command
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (count($arguments) === 3 && is_array($arguments[2])) {
             $options = $this->prepareOptions(array_pop($arguments));
             $arguments = array_merge($arguments, $options);
         }
 
-        return $arguments;
+        parent::setArguments($arguments);
     }
 
     /**
@@ -49,7 +50,7 @@ class ZSetScan extends Command
     protected function prepareOptions($options)
     {
         $options = array_change_key_case($options, CASE_UPPER);
-        $normalized = array();
+        $normalized = [];
 
         if (!empty($options['MATCH'])) {
             $normalized[] = 'MATCH';
@@ -71,7 +72,7 @@ class ZSetScan extends Command
     {
         if (is_array($data)) {
             $members = $data[1];
-            $result = array();
+            $result = [];
 
             for ($i = 0; $i < count($members); ++$i) {
                 $result[$members[$i]] = (float) $members[++$i];
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScore.php b/plugins/cache-redis/Predis/Command/Redis/ZSCORE.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScore.php
rename to plugins/cache-redis/Predis/Command/Redis/ZSCORE.php
index 2e7fce8ed..978a17292 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetScore.php
+++ b/plugins/cache-redis/Predis/Command/Redis/ZSCORE.php
@@ -3,20 +3,21 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Command;
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
 
 /**
- * @link http://redis.io/commands/zscore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/zscore
  */
-class ZSetScore extends Command
+class ZSCORE extends RedisCommand
 {
     /**
      * {@inheritdoc}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZUNION.php b/plugins/cache-redis/Predis/Command/Redis/ZUNION.php
new file mode 100644
index 000000000..e0e7f233f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZUNION.php
@@ -0,0 +1,35 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Traits\With\WithScores;
+
+/**
+ * @see https://redis.io/commands/zunion/
+ *
+ * This command is similar to ZUNIONSTORE, but instead of
+ * storing the resulting sorted set, it is returned to the client.
+ */
+class ZUNION extends ZUNIONSTORE
+{
+    use WithScores;
+
+    protected static $keysArgumentPositionOffset = 0;
+    protected static $weightsArgumentPositionOffset = 1;
+    protected static $aggregateArgumentPositionOffset = 2;
+
+    public function getId()
+    {
+        return 'ZUNION';
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Redis/ZUNIONSTORE.php b/plugins/cache-redis/Predis/Command/Redis/ZUNIONSTORE.php
new file mode 100644
index 000000000..0d213c75d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Redis/ZUNIONSTORE.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Redis;
+
+use Predis\Command\Command as RedisCommand;
+use Predis\Command\Traits\Aggregate;
+use Predis\Command\Traits\Keys;
+use Predis\Command\Traits\Weights;
+
+/**
+ * @see http://redis.io/commands/zunionstore
+ */
+class ZUNIONSTORE extends RedisCommand
+{
+    use Keys {
+        Keys::setArguments as setKeys;
+    }
+    use Weights {
+        Weights::setArguments as setWeights;
+    }
+    use Aggregate{
+        Aggregate::setArguments as setAggregate;
+    }
+
+    protected static $keysArgumentPositionOffset = 1;
+    protected static $weightsArgumentPositionOffset = 2;
+    protected static $aggregateArgumentPositionOffset = 3;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'ZUNIONSTORE';
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setArguments(array $arguments)
+    {
+        // support old `$options` array for backwards compatibility
+        if (!isset($arguments[3]) && (isset($arguments[2]['weights']) || isset($arguments[2]['aggregate']))) {
+            $options = array_pop($arguments);
+            array_push($arguments, $options['weights'] ?? []);
+            array_push($arguments, $options['aggregate'] ?? 'sum');
+        }
+
+        $this->setAggregate($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setWeights($arguments);
+        $arguments = $this->getArguments();
+
+        $this->setKeys($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/RedisFactory.php b/plugins/cache-redis/Predis/Command/RedisFactory.php
new file mode 100644
index 000000000..10c4541d5
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/RedisFactory.php
@@ -0,0 +1,112 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command;
+
+use Predis\ClientConfiguration;
+use Predis\Command\Redis\FUNCTIONS;
+
+/**
+ * Command factory for mainline Redis servers.
+ *
+ * This factory is intended to handle standard commands implemented by mainline
+ * Redis servers. By default it maps a command ID to a specific command handler
+ * class in the Predis\Command\Redis namespace but this can be overridden for
+ * any command ID simply by defining a new command handler class implementing
+ * Predis\Command\CommandInterface.
+ */
+class RedisFactory extends Factory
+{
+    private const COMMANDS_NAMESPACE = "Predis\Command\Redis";
+
+    public function __construct()
+    {
+        $this->commands = [
+            'ECHO' => 'Predis\Command\Redis\ECHO_',
+            'EVAL' => 'Predis\Command\Redis\EVAL_',
+            'OBJECT' => 'Predis\Command\Redis\OBJECT_',
+            // Class name corresponds to PHP reserved word "function", added mapping to bypass restrictions
+            'FUNCTION' => FUNCTIONS::class,
+        ];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCommandClass(string $commandID): ?string
+    {
+        $commandID = strtoupper($commandID);
+
+        if (isset($this->commands[$commandID]) || array_key_exists($commandID, $this->commands)) {
+            return $this->commands[$commandID];
+        }
+
+        $commandClass = $this->resolve($commandID);
+
+        if (null === $commandClass) {
+            return null;
+        }
+
+        $this->commands[$commandID] = $commandClass;
+
+        return $commandClass;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function undefine(string $commandID): void
+    {
+        // NOTE: we explicitly associate `NULL` to the command ID in the map
+        // instead of the parent's `unset()` because our subclass tries to load
+        // a predefined class from the Predis\Command\Redis namespace when no
+        // explicit mapping is defined, see RedisFactory::getCommandClass() for
+        // details of the implementation of this mechanism.
+        $this->commands[strtoupper($commandID)] = null;
+    }
+
+    /**
+     * Resolves command object from given command ID.
+     *
+     * @param  string      $commandID Command ID of virtual method call
+     * @return string|null FQDN of corresponding command object
+     */
+    private function resolve(string $commandID): ?string
+    {
+        if (class_exists($commandClass = self::COMMANDS_NAMESPACE . '\\' . $commandID)) {
+            return $commandClass;
+        }
+
+        $commandModule = $this->resolveCommandModuleByPrefix($commandID);
+
+        if (null === $commandModule) {
+            return null;
+        }
+
+        if (class_exists($commandClass = self::COMMANDS_NAMESPACE . '\\' . $commandModule . '\\' . $commandID)) {
+            return $commandClass;
+        }
+
+        return null;
+    }
+
+    private function resolveCommandModuleByPrefix(string $commandID): ?string
+    {
+        foreach (ClientConfiguration::getModules() as $module) {
+            if (preg_match("/^{$module['commandPrefix']}/", $commandID)) {
+                return $module['name'];
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ScriptCommand.php b/plugins/cache-redis/Predis/Command/ScriptCommand.php
similarity index 62%
rename from snappymail/v/0.0.0/app/libraries/Predis/Command/ScriptCommand.php
rename to plugins/cache-redis/Predis/Command/ScriptCommand.php
index a30bc1d28..330ee94b3 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ScriptCommand.php
+++ b/plugins/cache-redis/Predis/Command/ScriptCommand.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,12 +16,18 @@ namespace Predis\Command;
  * Base class used to implement an higher level abstraction for commands based
  * on Lua scripting with EVAL and EVALSHA.
  *
- * @link http://redis.io/commands/eval
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/commands/eval
  */
-abstract class ScriptCommand extends ServerEvalSHA
+abstract class ScriptCommand extends Command
 {
+    /**
+     * {@inheritdoc}
+     */
+    public function getId()
+    {
+        return 'EVALSHA';
+    }
+
     /**
      * Gets the body of a Lua script.
      *
@@ -28,6 +35,16 @@ abstract class ScriptCommand extends ServerEvalSHA
      */
     abstract public function getScript();
 
+    /**
+     * Calculates the SHA1 hash of the body of the script.
+     *
+     * @return string SHA1 hash.
+     */
+    public function getScriptHash()
+    {
+        return sha1($this->getScript());
+    }
+
     /**
      * Specifies the number of arguments that should be considered as keys.
      *
@@ -55,16 +72,20 @@ abstract class ScriptCommand extends ServerEvalSHA
     /**
      * {@inheritdoc}
      */
-    protected function filterArguments(array $arguments)
+    public function setArguments(array $arguments)
     {
         if (($numkeys = $this->getKeysCount()) && $numkeys < 0) {
             $numkeys = count($arguments) + $numkeys;
         }
 
-        return array_merge(array(sha1($this->getScript()), (int) $numkeys), $arguments);
+        $arguments = array_merge([$this->getScriptHash(), (int) $numkeys], $arguments);
+
+        parent::setArguments($arguments);
     }
 
     /**
+     * Returns arguments for EVAL command.
+     *
      * @return array
      */
     public function getEvalArguments()
@@ -74,4 +95,14 @@ abstract class ScriptCommand extends ServerEvalSHA
 
         return $arguments;
     }
+
+    /**
+     * Returns the equivalent EVAL command as a raw command instance.
+     *
+     * @return RawCommand
+     */
+    public function getEvalCommand()
+    {
+        return new RawCommand('EVAL', $this->getEvalArguments());
+    }
 }
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DeleteStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DeleteStrategy.php
new file mode 100644
index 000000000..250ae744e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DeleteStrategy.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class DeleteStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        return $arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DumpStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DumpStrategy.php
new file mode 100644
index 000000000..13f49ab06
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/DumpStrategy.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class DumpStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        return $arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/FlushStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/FlushStrategy.php
new file mode 100644
index 000000000..f0244d324
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/FlushStrategy.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class FlushStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        $processedArguments = [$arguments[0]];
+
+        if (array_key_exists(1, $arguments) && null !== $arguments[1]) {
+            $processedArguments[] = strtoupper($arguments[1]);
+        }
+
+        return $processedArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/KillStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/KillStrategy.php
new file mode 100644
index 000000000..0c9d6d669
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/KillStrategy.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class KillStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        return $arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/ListStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/ListStrategy.php
new file mode 100644
index 000000000..cb3a84589
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/ListStrategy.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class ListStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        $processedArguments = [$arguments[0]];
+
+        if (array_key_exists(1, $arguments) && null !== $arguments[1]) {
+            array_push($processedArguments, 'LIBRARYNAME', $arguments[1]);
+        }
+
+        if (array_key_exists(2, $arguments) && true === $arguments[2]) {
+            $processedArguments[] = 'WITHCODE';
+        }
+
+        return $processedArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/LoadStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/LoadStrategy.php
new file mode 100644
index 000000000..10269add8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/LoadStrategy.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class LoadStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        if (count($arguments) <= 2) {
+            return $arguments;
+        }
+
+        $processedArguments = [$arguments[0]];
+        $replace = array_pop($arguments);
+
+        if (is_bool($replace) && $replace) {
+            $processedArguments[] = 'REPLACE';
+        } elseif (!is_bool($replace)) {
+            $processedArguments[] = $replace;
+        }
+
+        $processedArguments[] = $arguments[1];
+
+        return $processedArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/RestoreStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/RestoreStrategy.php
new file mode 100644
index 000000000..11850fa7a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/RestoreStrategy.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class RestoreStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        $processedArguments = [$arguments[0], $arguments[1]];
+
+        if (array_key_exists(2, $arguments) && null !== $arguments[2]) {
+            $processedArguments[] = strtoupper($arguments[2]);
+        }
+
+        return $processedArguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/StatsStrategy.php b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/StatsStrategy.php
new file mode 100644
index 000000000..22915059e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/ContainerCommands/Functions/StatsStrategy.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy\ContainerCommands\Functions;
+
+use Predis\Command\Strategy\SubcommandStrategyInterface;
+
+class StatsStrategy implements SubcommandStrategyInterface
+{
+    /**
+     * {@inheritDoc}
+     */
+    public function processArguments(array $arguments): array
+    {
+        return $arguments;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/StrategyResolverInterface.php b/plugins/cache-redis/Predis/Command/Strategy/StrategyResolverInterface.php
new file mode 100644
index 000000000..43c950287
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/StrategyResolverInterface.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy;
+
+interface StrategyResolverInterface
+{
+    /**
+     * Resolves subcommand strategy.
+     *
+     * @param  string                      $commandId
+     * @param  string                      $subcommandId
+     * @return SubcommandStrategyInterface
+     */
+    public function resolve(string $commandId, string $subcommandId): SubcommandStrategyInterface;
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyInterface.php b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyInterface.php
new file mode 100644
index 000000000..acbcb3d6d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyInterface.php
@@ -0,0 +1,24 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy;
+
+interface SubcommandStrategyInterface
+{
+    /**
+     * Process arguments for given subcommand.
+     *
+     * @param  array $arguments
+     * @return array
+     */
+    public function processArguments(array $arguments): array;
+}
diff --git a/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
new file mode 100644
index 000000000..cda84268e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Strategy/SubcommandStrategyResolver.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Strategy;
+
+use InvalidArgumentException;
+
+class SubcommandStrategyResolver implements StrategyResolverInterface
+{
+    private const CONTAINER_COMMANDS_NAMESPACE = 'Predis\Command\Strategy\ContainerCommands';
+
+    /**
+     * @var ?string
+     */
+    private $separator;
+
+    public function __construct(string $separator = null)
+    {
+        $this->separator = $separator;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function resolve(string $commandId, string $subcommandId): SubcommandStrategyInterface
+    {
+        $subcommandStrategyClass = ucwords($subcommandId) . 'Strategy';
+        $commandDirectoryName = ucwords($commandId);
+
+        if (!is_null($this->separator)) {
+            $subcommandStrategyClass = str_replace($this->separator, '', $subcommandStrategyClass);
+            $commandDirectoryName = str_replace($this->separator, '', $commandDirectoryName);
+        }
+
+        if (class_exists(
+            $containerCommandClass = self::CONTAINER_COMMANDS_NAMESPACE . '\\' . $commandDirectoryName . '\\' . $subcommandStrategyClass
+        )) {
+            return new $containerCommandClass();
+        }
+
+        throw new InvalidArgumentException('Non-existing container command given');
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Aggregate.php b/plugins/cache-redis/Predis/Command/Traits/Aggregate.php
new file mode 100644
index 000000000..c49c31085
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Aggregate.php
@@ -0,0 +1,66 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Aggregate
+{
+    /**
+     * @var string[]
+     */
+    private static $aggregateValuesEnum = [
+        'min' => 'MIN',
+        'max' => 'MAX',
+        'sum' => 'SUM',
+    ];
+
+    /**
+     * @var string
+     */
+    private static $aggregateModifier = 'AGGREGATE';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$aggregateArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$aggregateArgumentPositionOffset];
+
+        if (is_string($argument) && in_array(strtoupper($argument), self::$aggregateValuesEnum)) {
+            $argument = self::$aggregateValuesEnum[$argument];
+        } else {
+            $enumValues = implode(', ', array_keys(self::$aggregateValuesEnum));
+            throw new UnexpectedValueException("Aggregate argument accepts only: {$enumValues} values");
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$aggregateArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$aggregateArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$aggregateModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BitByte.php b/plugins/cache-redis/Predis/Command/Traits/BitByte.php
new file mode 100644
index 000000000..067302d22
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BitByte.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+trait BitByte
+{
+    private static $argumentEnum = [
+        'bit' => 'BIT',
+        'byte' => 'BYTE',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $value = array_pop($arguments);
+
+        if (null === $value) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (in_array(strtoupper($value), self::$argumentEnum, true)) {
+            $arguments[] = self::$argumentEnum[$value];
+        } else {
+            $arguments[] = $value;
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/BucketSize.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/BucketSize.php
new file mode 100644
index 000000000..99e22be05
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/BucketSize.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait BucketSize
+{
+    private static $bucketSizeModifier = 'BUCKETSIZE';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$bucketSizeArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$bucketSizeArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$bucketSizeArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$bucketSizeArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong bucket size argument value or position offset');
+        }
+
+        $argument = $arguments[static::$bucketSizeArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$bucketSizeArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$bucketSizeArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$bucketSizeModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Capacity.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Capacity.php
new file mode 100644
index 000000000..c0dccc8a4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Capacity.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Capacity
+{
+    private static $capacityModifier = 'CAPACITY';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$capacityArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$capacityArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$capacityArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$capacityArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong capacity argument value or position offset');
+        }
+
+        $argument = $arguments[static::$capacityArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$capacityArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$capacityArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$capacityModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Error.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Error.php
new file mode 100644
index 000000000..661def80f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Error.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Error
+{
+    private static $errorModifier = 'ERROR';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$errorArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$errorArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$errorArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$errorArgumentPositionOffset] < 0) {
+            throw new UnexpectedValueException('Wrong error argument value or position offset');
+        }
+
+        $argument = $arguments[static::$errorArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$errorArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$errorArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$errorModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Expansion.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Expansion.php
new file mode 100644
index 000000000..74d916f4c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Expansion.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use UnexpectedValueException;
+
+trait Expansion
+{
+    private static $expansionModifier = 'EXPANSION';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$expansionArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$expansionArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$expansionArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$expansionArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong expansion argument value or position offset');
+        }
+
+        $argument = $arguments[static::$expansionArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$expansionArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$expansionArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$expansionModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Items.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Items.php
new file mode 100644
index 000000000..9d2e4dcfe
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/Items.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+
+/**
+ * @mixin Command
+ */
+trait Items
+{
+    private static $itemsModifier = 'ITEMS';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$itemsArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$itemsArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$itemsArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$itemsArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$itemsModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/MaxIterations.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/MaxIterations.php
new file mode 100644
index 000000000..fb307e6d9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/MaxIterations.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait MaxIterations
+{
+    private static $maxIterationsModifier = 'MAXITERATIONS';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$maxIterationsArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$maxIterationsArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$maxIterationsArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$maxIterationsArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong max iterations argument value or position offset');
+        }
+
+        $argument = $arguments[static::$maxIterationsArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$maxIterationsArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$maxIterationsArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$maxIterationsModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/BloomFilters/NoCreate.php b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/NoCreate.php
new file mode 100644
index 000000000..7fc084ec8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/BloomFilters/NoCreate.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\BloomFilters;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait NoCreate
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$noCreateArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$noCreateArgumentPositionOffset]
+        ) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$noCreateArgumentPositionOffset];
+
+        if (true === $argument) {
+            $argument = 'NOCREATE';
+        } else {
+            throw new UnexpectedValueException('Wrong NOCREATE argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$noCreateArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$noCreateArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/By/ByArgument.php b/plugins/cache-redis/Predis/Command/Traits/By/ByArgument.php
new file mode 100644
index 000000000..99bd1722f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/By/ByArgument.php
@@ -0,0 +1,40 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\By;
+
+use Predis\Command\Command;
+
+/**
+ * @mixin Command
+ */
+trait ByArgument
+{
+    private $byModifier = 'BY';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$byArgumentPositionOffset >= $argumentsLength || null === $arguments[static::$byArgumentPositionOffset]) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$byArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$byArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$byArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$this->byModifier, $argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/By/ByLexByScore.php b/plugins/cache-redis/Predis/Command/Traits/By/ByLexByScore.php
new file mode 100644
index 000000000..66c531584
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/By/ByLexByScore.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\By;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait ByLexByScore
+{
+    private static $argumentsEnum = [
+        'bylex' => 'BYLEX',
+        'byscore' => 'BYSCORE',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $argument = $arguments[static::$byLexByScoreArgumentPositionOffset];
+
+        if (false === $argument) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (is_string($argument) && in_array(strtoupper($argument), self::$argumentsEnum)) {
+            $argument = self::$argumentsEnum[$argument];
+        } else {
+            throw new UnexpectedValueException('By argument accepts only "bylex" and "byscore" values');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$byLexByScoreArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$byLexByScoreArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/By/GeoBy.php b/plugins/cache-redis/Predis/Command/Traits/By/GeoBy.php
new file mode 100644
index 000000000..c5ee2b7d1
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/By/GeoBy.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\By;
+
+use InvalidArgumentException;
+use Predis\Command\Argument\Geospatial\ByInterface;
+
+trait GeoBy
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentPositionOffset = $this->getByArgumentPositionOffset($arguments);
+
+        if (null === $argumentPositionOffset) {
+            throw new InvalidArgumentException('Invalid BY argument value given');
+        }
+
+        $byArgumentObject = $arguments[$argumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, $argumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, $argumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            $byArgumentObject->toArray(),
+            $argumentsAfter
+        ));
+    }
+
+    private function getByArgumentPositionOffset(array $arguments): ?int
+    {
+        foreach ($arguments as $i => $value) {
+            if ($value instanceof ByInterface) {
+                return $i;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Count.php b/plugins/cache-redis/Predis/Command/Traits/Count.php
new file mode 100644
index 000000000..46ae489d6
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Count.php
@@ -0,0 +1,71 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Count
+{
+    private $countModifier = 'COUNT';
+    private $anyModifier = 'ANY';
+
+    public function setArguments(array $arguments, bool $any = false)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$countArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$countArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$countArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$countArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong count argument value or position offset');
+        }
+
+        $countArgument = $arguments[static::$countArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$countArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$countArgumentPositionOffset + 2);
+
+        if (!$any) {
+            $argumentsAfter = array_slice($arguments, static::$countArgumentPositionOffset + 1);
+            parent::setArguments(array_merge(
+                $argumentsBefore,
+                [$this->countModifier],
+                [$countArgument],
+                $argumentsAfter
+            ));
+
+            return;
+        }
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [$this->countModifier],
+            [$countArgument],
+            [$this->anyModifier],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/DB.php b/plugins/cache-redis/Predis/Command/Traits/DB.php
new file mode 100644
index 000000000..cf494f96a
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/DB.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use UnexpectedValueException;
+
+trait DB
+{
+    private $dbModifier = 'DB';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$dbArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (!is_numeric($arguments[static::$dbArgumentPositionOffset])) {
+            throw new UnexpectedValueException('DB argument should be a valid numeric value');
+        }
+
+        if ($arguments[static::$dbArgumentPositionOffset] < 0) {
+            array_splice($arguments, static::$dbArgumentPositionOffset, 1);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$dbArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$dbArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$dbArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [$this->dbModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Expire/ExpireOptions.php b/plugins/cache-redis/Predis/Command/Traits/Expire/ExpireOptions.php
new file mode 100644
index 000000000..4f683f3ca
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Expire/ExpireOptions.php
@@ -0,0 +1,42 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Expire;
+
+trait ExpireOptions
+{
+    private static $argumentEnum = [
+        'nx' => 'NX',
+        'xx' => 'XX',
+        'gt' => 'GT',
+        'lt' => 'LT',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $value = array_pop($arguments);
+
+        if (null === $value) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (in_array(strtoupper($value), self::$argumentEnum, true)) {
+            $arguments[] = self::$argumentEnum[strtolower($value)];
+        } else {
+            $arguments[] = $value;
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/From/GeoFrom.php b/plugins/cache-redis/Predis/Command/Traits/From/GeoFrom.php
new file mode 100644
index 000000000..22688adba
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/From/GeoFrom.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\From;
+
+use InvalidArgumentException;
+use Predis\Command\Argument\Geospatial\FromInterface;
+
+trait GeoFrom
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentPositionOffset = $this->getFromArgumentPositionOffset($arguments);
+
+        if (null === $argumentPositionOffset) {
+            throw new InvalidArgumentException('Invalid FROM argument value given');
+        }
+
+        $fromArgumentObject = $arguments[$argumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, $argumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, $argumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            $fromArgumentObject->toArray(),
+            $argumentsAfter
+        ));
+    }
+
+    private function getFromArgumentPositionOffset(array $arguments): ?int
+    {
+        foreach ($arguments as $i => $value) {
+            if ($value instanceof FromInterface) {
+                return $i;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Get/Get.php b/plugins/cache-redis/Predis/Command/Traits/Get/Get.php
new file mode 100644
index 000000000..256676e9e
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Get/Get.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Get;
+
+use UnexpectedValueException;
+
+trait Get
+{
+    private static $getModifier = 'GET';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$getArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (!is_array($arguments[static::$getArgumentPositionOffset])) {
+            throw new UnexpectedValueException('Wrong get argument type');
+        }
+
+        $patterns = [];
+
+        foreach ($arguments[static::$getArgumentPositionOffset] as $pattern) {
+            $patterns[] = self::$getModifier;
+            $patterns[] = $pattern;
+        }
+
+        $argumentsBeforeKeys = array_slice($arguments, 0, static::$getArgumentPositionOffset);
+        $argumentsAfterKeys = array_slice($arguments, static::$getArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBeforeKeys, $patterns, $argumentsAfterKeys));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Json/Indent.php b/plugins/cache-redis/Predis/Command/Traits/Json/Indent.php
new file mode 100644
index 000000000..3e0dfb133
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Json/Indent.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Json;
+
+use UnexpectedValueException;
+
+trait Indent
+{
+    private static $indentModifier = 'INDENT';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$indentArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$indentArgumentPositionOffset] === '') {
+            array_splice($arguments, static::$indentArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$indentArgumentPositionOffset];
+
+        if (!is_string($argument)) {
+            throw new UnexpectedValueException('Indent argument value should be a string');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$indentArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$indentArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$indentModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Json/Newline.php b/plugins/cache-redis/Predis/Command/Traits/Json/Newline.php
new file mode 100644
index 000000000..7bab8205b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Json/Newline.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Json;
+
+use UnexpectedValueException;
+
+trait Newline
+{
+    private static $newlineModifier = 'NEWLINE';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$newlineArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$newlineArgumentPositionOffset] === '') {
+            array_splice($arguments, static::$newlineArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$newlineArgumentPositionOffset];
+
+        if (!is_string($argument)) {
+            throw new UnexpectedValueException('Newline argument value should be a string');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$newlineArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$newlineArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$newlineModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Json/NxXxArgument.php b/plugins/cache-redis/Predis/Command/Traits/Json/NxXxArgument.php
new file mode 100644
index 000000000..39d3cb234
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Json/NxXxArgument.php
@@ -0,0 +1,64 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Json;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait NxXxArgument
+{
+    /**
+     * @var string[]
+     */
+    private static $argumentEnum = [
+        'nx' => 'NX',
+        'xx' => 'XX',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$nxXxArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (null === $arguments[static::$nxXxArgumentPositionOffset]) {
+            array_splice($arguments, static::$nxXxArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$nxXxArgumentPositionOffset];
+
+        if (!in_array(strtoupper($argument), self::$argumentEnum, true)) {
+            $enumValues = implode(', ', array_keys(self::$argumentEnum));
+            throw new UnexpectedValueException("Argument accepts only: {$enumValues} values");
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$nxXxArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$nxXxArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$argumentEnum[strtolower($argument)]],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Json/Space.php b/plugins/cache-redis/Predis/Command/Traits/Json/Space.php
new file mode 100644
index 000000000..5c99828f4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Json/Space.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Json;
+
+use UnexpectedValueException;
+
+trait Space
+{
+    private static $spaceModifier = 'SPACE';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$spaceArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$spaceArgumentPositionOffset] === '') {
+            array_splice($arguments, static::$spaceArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$spaceArgumentPositionOffset];
+
+        if (!is_string($argument)) {
+            throw new UnexpectedValueException('Space argument value should be a string');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$spaceArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$spaceArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$spaceModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Keys.php b/plugins/cache-redis/Predis/Command/Traits/Keys.php
new file mode 100644
index 000000000..5dc86ad7d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Keys.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Keys
+{
+    public function setArguments(array $arguments, bool $withNumkeys = true)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$keysArgumentPositionOffset > $argumentsLength
+            || !is_array($arguments[static::$keysArgumentPositionOffset])
+        ) {
+            throw new UnexpectedValueException('Wrong keys argument type or position offset');
+        }
+
+        $keysArgument = $arguments[static::$keysArgumentPositionOffset];
+        $argumentsBeforeKeys = array_slice($arguments, 0, static::$keysArgumentPositionOffset);
+        $argumentsAfterKeys = array_slice($arguments, static::$keysArgumentPositionOffset + 1);
+
+        if ($withNumkeys) {
+            $numkeys = count($keysArgument);
+            parent::setArguments(array_merge($argumentsBeforeKeys, [$numkeys], $keysArgument, $argumentsAfterKeys));
+
+            return;
+        }
+
+        parent::setArguments(array_merge($argumentsBeforeKeys, $keysArgument, $argumentsAfterKeys));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/LeftRight.php b/plugins/cache-redis/Predis/Command/Traits/LeftRight.php
new file mode 100644
index 000000000..181fbd143
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/LeftRight.php
@@ -0,0 +1,60 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait LeftRight
+{
+    /**
+     * @var array{string: string}
+     */
+    private static $leftRightEnum = [
+        'left' => 'LEFT',
+        'right' => 'RIGHT',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$leftRightArgumentPositionOffset >= $argumentsLength) {
+            $arguments[] = 'LEFT';
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$leftRightArgumentPositionOffset];
+
+        if (is_string($argument) && in_array(strtoupper($argument), self::$leftRightEnum, true)) {
+            $argument = self::$leftRightEnum[$argument];
+        } else {
+            $enumValues = implode(', ', array_keys(self::$leftRightEnum));
+            throw new UnexpectedValueException("Left/Right argument accepts only: {$enumValues} values");
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$leftRightArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$leftRightArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Limit/Limit.php b/plugins/cache-redis/Predis/Command/Traits/Limit/Limit.php
new file mode 100644
index 000000000..e24499472
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Limit/Limit.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Limit;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Limit
+{
+    private static $limitModifier = 'LIMIT';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+        $argumentsBefore = array_slice($arguments, 0, static::$limitArgumentPositionOffset);
+
+        if (
+            static::$limitArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$limitArgumentPositionOffset]
+        ) {
+            parent::setArguments($argumentsBefore);
+
+            return;
+        }
+
+        $argument = $arguments[static::$limitArgumentPositionOffset];
+        $argumentsAfter = array_slice($arguments, static::$limitArgumentPositionOffset + 1);
+
+        if (true === $argument) {
+            parent::setArguments(array_merge($argumentsBefore, [self::$limitModifier], $argumentsAfter));
+
+            return;
+        }
+
+        if (!is_int($argument)) {
+            throw new UnexpectedValueException('Wrong limit argument type');
+        }
+
+        parent::setArguments(array_merge($argumentsBefore, [self::$limitModifier], [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Limit/LimitObject.php b/plugins/cache-redis/Predis/Command/Traits/Limit/LimitObject.php
new file mode 100644
index 000000000..3e47de9ab
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Limit/LimitObject.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\Limit;
+
+use Predis\Command\Argument\Server\LimitInterface;
+
+trait LimitObject
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentPositionOffset = $this->getLimitArgumentPositionOffset($arguments);
+
+        if (null === $argumentPositionOffset) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $limitObject = $arguments[$argumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, $argumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, $argumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            $limitObject->toArray(),
+            $argumentsAfter
+        ));
+    }
+
+    private function getLimitArgumentPositionOffset(array $arguments): ?int
+    {
+        foreach ($arguments as $i => $value) {
+            if ($value instanceof LimitInterface) {
+                return $i;
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/MinMaxModifier.php b/plugins/cache-redis/Predis/Command/Traits/MinMaxModifier.php
new file mode 100644
index 000000000..f48f4c1e8
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/MinMaxModifier.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait MinMaxModifier
+{
+    /**
+     * @var array{string: string}
+     */
+    private $modifierEnum = [
+        'min' => 'MIN',
+        'max' => 'MAX',
+    ];
+
+    public function resolveModifier(int $offset, array &$arguments): void
+    {
+        if ($offset >= count($arguments)) {
+            $arguments[$offset] = $this->modifierEnum['min'];
+
+            return;
+        }
+
+        if (!is_string($arguments[$offset]) || !array_key_exists($arguments[$offset], $this->modifierEnum)) {
+            throw new UnexpectedValueException('Wrong type of modifier given');
+        }
+
+        $arguments[$offset] = $this->modifierEnum[$arguments[$offset]];
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Replace.php b/plugins/cache-redis/Predis/Command/Traits/Replace.php
new file mode 100644
index 000000000..d193d66d3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Replace.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+
+/**
+ * @mixin Command
+ */
+trait Replace
+{
+    public function setArguments(array $arguments)
+    {
+        $replace = array_pop($arguments);
+
+        if (is_bool($replace) && $replace) {
+            $arguments[] = 'REPLACE';
+        } elseif (!is_bool($replace)) {
+            $arguments[] = $replace;
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Rev.php b/plugins/cache-redis/Predis/Command/Traits/Rev.php
new file mode 100644
index 000000000..20e7e686c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Rev.php
@@ -0,0 +1,44 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Rev
+{
+    public function setArguments(array $arguments)
+    {
+        $argument = $arguments[static::$revArgumentPositionOffset];
+
+        if (false === $argument) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (true === $argument) {
+            $argument = 'REV';
+        } else {
+            throw new UnexpectedValueException('Wrong rev argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$revArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$revArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Sorting.php b/plugins/cache-redis/Predis/Command/Traits/Sorting.php
new file mode 100644
index 000000000..ba4077156
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Sorting.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use UnexpectedValueException;
+
+trait Sorting
+{
+    private static $sortingEnum = [
+        'asc' => 'ASC',
+        'desc' => 'DESC',
+    ];
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$sortArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$sortArgumentPositionOffset];
+
+        if (null === $argument) {
+            array_splice($arguments, static::$sortArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (!in_array(strtoupper($argument), self::$sortingEnum, true)) {
+            $enumValues = implode(', ', array_keys(self::$sortingEnum));
+            throw new UnexpectedValueException("Sorting argument accepts only: {$enumValues} values");
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$sortArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$sortArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$sortingEnum[$argument]],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Storedist.php b/plugins/cache-redis/Predis/Command/Traits/Storedist.php
new file mode 100644
index 000000000..6feed1e8c
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Storedist.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Storedist
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$storeDistArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$storeDistArgumentPositionOffset]
+        ) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$storeDistArgumentPositionOffset];
+
+        if (true === $argument) {
+            $argument = 'STOREDIST';
+        } else {
+            throw new UnexpectedValueException('Wrong STOREDIST argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$storeDistArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$storeDistArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Timeout.php b/plugins/cache-redis/Predis/Command/Traits/Timeout.php
new file mode 100644
index 000000000..fd33ea9cf
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Timeout.php
@@ -0,0 +1,53 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use UnexpectedValueException;
+
+trait Timeout
+{
+    private static $timeoutModifier = 'TIMEOUT';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$timeoutArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$timeoutArgumentPositionOffset] === -1) {
+            array_splice($arguments, static::$timeoutArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if ($arguments[static::$timeoutArgumentPositionOffset] < 1) {
+            throw new UnexpectedValueException('Wrong timeout argument value or position offset');
+        }
+
+        $argument = $arguments[static::$timeoutArgumentPositionOffset];
+        $argumentsBefore = array_slice($arguments, 0, static::$timeoutArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$timeoutArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$timeoutModifier],
+            [$argument],
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/To/ServerTo.php b/plugins/cache-redis/Predis/Command/Traits/To/ServerTo.php
new file mode 100644
index 000000000..1ab13eca9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/To/ServerTo.php
@@ -0,0 +1,48 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\To;
+
+use Predis\Command\Argument\Server\To;
+
+trait ServerTo
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$toArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        /** @var To|null $toArgument */
+        $toArgument = $arguments[static::$toArgumentPositionOffset];
+
+        if (null === $toArgument) {
+            array_splice($arguments, static::$toArgumentPositionOffset, 1, [false]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$toArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$toArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            $toArgument->toArray(),
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/Weights.php b/plugins/cache-redis/Predis/Command/Traits/Weights.php
new file mode 100644
index 000000000..1f175ed8b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/Weights.php
@@ -0,0 +1,61 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait Weights
+{
+    /**
+     * @var string
+     */
+    private static $weightsModifier = 'WEIGHTS';
+
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (static::$weightsArgumentPositionOffset >= $argumentsLength) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        if (!is_array($arguments[static::$weightsArgumentPositionOffset])) {
+            throw new UnexpectedValueException('Wrong weights argument type');
+        }
+
+        $weightsArray = $arguments[static::$weightsArgumentPositionOffset];
+
+        if (empty($weightsArray)) {
+            unset($arguments[static::$weightsArgumentPositionOffset]);
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$weightsArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$weightsArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge(
+            $argumentsBefore,
+            [self::$weightsModifier],
+            $weightsArray,
+            $argumentsAfter
+        ));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/With/WithCoord.php b/plugins/cache-redis/Predis/Command/Traits/With/WithCoord.php
new file mode 100644
index 000000000..797ae2e52
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/With/WithCoord.php
@@ -0,0 +1,49 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\With;
+
+use Predis\Command\Command;
+use UnexpectedValueException;
+
+/**
+ * @mixin Command
+ */
+trait WithCoord
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$withCoordArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$withCoordArgumentPositionOffset]
+        ) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$withCoordArgumentPositionOffset];
+
+        if (true === $argument) {
+            $argument = 'WITHCOORD';
+        } else {
+            throw new UnexpectedValueException('Wrong WITHCOORD argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$withCoordArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$withCoordArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/With/WithDist.php b/plugins/cache-redis/Predis/Command/Traits/With/WithDist.php
new file mode 100644
index 000000000..479606dca
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/With/WithDist.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\With;
+
+use UnexpectedValueException;
+
+trait WithDist
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$withDistArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$withDistArgumentPositionOffset]
+        ) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$withDistArgumentPositionOffset];
+
+        if (true === $argument) {
+            $argument = 'WITHDIST';
+        } else {
+            throw new UnexpectedValueException('Wrong WITHDIST argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$withDistArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$withDistArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/With/WithHash.php b/plugins/cache-redis/Predis/Command/Traits/With/WithHash.php
new file mode 100644
index 000000000..c00f680b2
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/With/WithHash.php
@@ -0,0 +1,45 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\With;
+
+use UnexpectedValueException;
+
+trait WithHash
+{
+    public function setArguments(array $arguments)
+    {
+        $argumentsLength = count($arguments);
+
+        if (
+            static::$withHashArgumentPositionOffset >= $argumentsLength
+            || false === $arguments[static::$withHashArgumentPositionOffset]
+        ) {
+            parent::setArguments($arguments);
+
+            return;
+        }
+
+        $argument = $arguments[static::$withHashArgumentPositionOffset];
+
+        if (true === $argument) {
+            $argument = 'WITHHASH';
+        } else {
+            throw new UnexpectedValueException('Wrong WITHHASH argument type');
+        }
+
+        $argumentsBefore = array_slice($arguments, 0, static::$withHashArgumentPositionOffset);
+        $argumentsAfter = array_slice($arguments, static::$withHashArgumentPositionOffset + 1);
+
+        parent::setArguments(array_merge($argumentsBefore, [$argument], $argumentsAfter));
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/With/WithScores.php b/plugins/cache-redis/Predis/Command/Traits/With/WithScores.php
new file mode 100644
index 000000000..bc81d36c9
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/With/WithScores.php
@@ -0,0 +1,68 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\With;
+
+use Predis\Command\Command;
+
+/**
+ * Handles last argument passed into command as WITHSCORES.
+ *
+ * @mixin Command
+ */
+trait WithScores
+{
+    public function setArguments(array $arguments)
+    {
+        $withScores = array_pop($arguments);
+
+        if (is_bool($withScores) && $withScores) {
+            $arguments[] = 'WITHSCORES';
+        } elseif (!is_bool($withScores)) {
+            $arguments[] = $withScores;
+        }
+
+        parent::setArguments($arguments);
+    }
+
+    /**
+     * Checks for the presence of the WITHSCORES modifier.
+     *
+     * @return bool
+     */
+    private function isWithScoreModifier(): bool
+    {
+        $arguments = parent::getArguments();
+        $lastArgument = (!empty($arguments)) ? $arguments[count($arguments) - 1] : null;
+
+        return is_string($lastArgument) && strtoupper($lastArgument) === 'WITHSCORES';
+    }
+
+    public function parseResponse($data)
+    {
+        if ($this->isWithScoreModifier()) {
+            $result = [];
+
+            for ($i = 0, $iMax = count($data); $i < $iMax; ++$i) {
+                if (is_array($data[$i])) {
+                    $result[$data[$i][0]] = $data[$i][1]; // Relay
+                } elseif (array_key_exists($i + 1, $data)) {
+                    $result[$data[$i]] = $data[++$i];
+                }
+            }
+
+            return $result;
+        }
+
+        return $data;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Command/Traits/With/WithValues.php b/plugins/cache-redis/Predis/Command/Traits/With/WithValues.php
new file mode 100644
index 000000000..4efb06584
--- /dev/null
+++ b/plugins/cache-redis/Predis/Command/Traits/With/WithValues.php
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Command\Traits\With;
+
+use Predis\Command\Command;
+
+/**
+ * @mixin Command
+ */
+trait WithValues
+{
+    public function setArguments(array $arguments)
+    {
+        $withValues = array_pop($arguments);
+
+        if (is_bool($withValues) && $withValues) {
+            $arguments[] = 'WITHVALUES';
+        } elseif (!is_bool($withValues)) {
+            $arguments[] = $withValues;
+        }
+
+        parent::setArguments($arguments);
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/CommunicationException.php b/plugins/cache-redis/Predis/CommunicationException.php
similarity index 82%
rename from snappymail/v/0.0.0/app/libraries/Predis/CommunicationException.php
rename to plugins/cache-redis/Predis/CommunicationException.php
index 13fe357c3..0fc7c07a6 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/CommunicationException.php
+++ b/plugins/cache-redis/Predis/CommunicationException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,12 +12,11 @@
 
 namespace Predis;
 
+use Exception;
 use Predis\Connection\NodeConnectionInterface;
 
 /**
  * Base exception class for network-related errors.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 abstract class CommunicationException extends PredisException
 {
@@ -26,15 +26,20 @@ abstract class CommunicationException extends PredisException
      * @param NodeConnectionInterface $connection     Connection that generated the exception.
      * @param string                  $message        Error message.
      * @param int                     $code           Error code.
-     * @param \Exception              $innerException Inner exception for wrapping the original error.
+     * @param Exception|null          $innerException Inner exception for wrapping the original error.
      */
     public function __construct(
         NodeConnectionInterface $connection,
-        $message = null,
-        $code = null,
-        \Exception $innerException = null
+        $message = '',
+        $code = 0,
+        Exception $innerException = null
     ) {
-        parent::__construct($message, $code, $innerException);
+        parent::__construct(
+            is_null($message) ? '' : $message,
+            is_null($code) ? 0 : $code,
+            $innerException
+        );
+
         $this->connection = $connection;
     }
 
diff --git a/plugins/cache-redis/Predis/Configuration/Option/Aggregate.php b/plugins/cache-redis/Predis/Configuration/Option/Aggregate.php
new file mode 100644
index 000000000..262f8d64d
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/Aggregate.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
+use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\NodeConnectionInterface;
+
+/**
+ * Client option for configuring generic aggregate connections.
+ *
+ * The only value accepted by this option is a callable that must return a valid
+ * connection instance of Predis\Connection\AggregateConnectionInterface when
+ * invoked by the client to create a new aggregate connection instance.
+ *
+ * Creation and configuration of the aggregate connection is up to the user.
+ */
+class Aggregate implements OptionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (!is_callable($value)) {
+            throw new InvalidArgumentException(sprintf(
+                '%s expects a callable object acting as an aggregate connection initializer',
+                static::class
+            ));
+        }
+
+        return $this->getConnectionInitializer($options, $value);
+    }
+
+    /**
+     * Wraps a user-supplied callable used to create a new aggregate connection.
+     *
+     * When the original callable acting as a connection initializer is executed
+     * by the client to create a new aggregate connection, it will receive the
+     * following arguments:
+     *
+     * - $parameters (same as passed to Predis\Client::__construct())
+     * - $options (options container, Predis\Configuration\OptionsInterface)
+     * - $option (current option, Predis\Configuration\OptionInterface)
+     *
+     * The original callable must return a valid aggregation connection instance
+     * of type Predis\Connection\AggregateConnectionInterface, this is enforced
+     * by the wrapper returned by this method and an exception is thrown when
+     * invalid values are returned.
+     *
+     * @param OptionsInterface $options  Client options
+     * @param callable         $callable Callable initializer
+     *
+     * @return callable
+     * @throws InvalidArgumentException
+     */
+    protected function getConnectionInitializer(OptionsInterface $options, callable $callable)
+    {
+        return function ($parameters = null, $autoaggregate = false) use ($callable, $options) {
+            $connection = call_user_func_array($callable, [&$parameters, $options, $this]);
+
+            if (!$connection instanceof AggregateConnectionInterface) {
+                throw new InvalidArgumentException(sprintf(
+                    '%s expects the supplied callable to return an instance of %s, but %s was returned',
+                    static::class,
+                    AggregateConnectionInterface::class,
+                    is_object($connection) ? get_class($connection) : gettype($connection)
+                ));
+            }
+
+            if ($parameters && $autoaggregate) {
+                static::aggregate($options, $connection, $parameters);
+            }
+
+            return $connection;
+        };
+    }
+
+    /**
+     * Adds single connections to an aggregate connection instance.
+     *
+     * @param OptionsInterface             $options    Client options
+     * @param AggregateConnectionInterface $connection Target aggregate connection
+     * @param array                        $nodes      List of nodes to be added to the target aggregate connection
+     */
+    public static function aggregate(OptionsInterface $options, AggregateConnectionInterface $connection, array $nodes)
+    {
+        $connections = $options->connections;
+
+        foreach ($nodes as $node) {
+            $connection->add($node instanceof NodeConnectionInterface ? $node : $connections->create($node));
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        return;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Configuration/Option/CRC16.php b/plugins/cache-redis/Predis/Configuration/Option/CRC16.php
new file mode 100644
index 000000000..b17144922
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/CRC16.php
@@ -0,0 +1,74 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Cluster\Hash;
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
+
+/**
+ * Configures an hash generator used by the redis-cluster connection backend.
+ */
+class CRC16 implements OptionInterface
+{
+    /**
+     * Returns an hash generator instance from a descriptive name.
+     *
+     * @param OptionsInterface $options     Client options.
+     * @param string           $description Identifier of a hash generator (`predis`, `phpiredis`)
+     *
+     * @return callable
+     */
+    protected function getHashGeneratorByDescription(OptionsInterface $options, $description)
+    {
+        if ($description === 'predis') {
+            return new Hash\CRC16();
+        } elseif ($description === 'phpiredis') {
+            return new Hash\PhpiredisCRC16();
+        } else {
+            throw new InvalidArgumentException(
+                'String value for the crc16 option must be either `predis` or `phpiredis`'
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (is_callable($value)) {
+            $value = call_user_func($value, $options);
+        }
+
+        if (is_string($value)) {
+            return $this->getHashGeneratorByDescription($options, $value);
+        } elseif ($value instanceof Hash\HashGeneratorInterface) {
+            return $value;
+        } else {
+            $class = get_class($this);
+            throw new InvalidArgumentException("$class expects a valid hash generator");
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        return function_exists('phpiredis_utils_crc16')
+            ? new Hash\PhpiredisCRC16()
+            : new Hash\CRC16();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Configuration/Option/Cluster.php b/plugins/cache-redis/Predis/Configuration/Option/Cluster.php
new file mode 100644
index 000000000..34b33de47
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/Cluster.php
@@ -0,0 +1,99 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Cluster\RedisStrategy;
+use Predis\Configuration\OptionsInterface;
+use Predis\Connection\Cluster\PredisCluster;
+use Predis\Connection\Cluster\RedisCluster;
+
+/**
+ * Configures an aggregate connection used for clustering
+ * multiple Redis nodes using various implementations with
+ * different algorithms or strategies.
+ */
+class Cluster extends Aggregate
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (is_string($value)) {
+            $value = $this->getConnectionInitializerByString($options, $value);
+        }
+
+        if (is_callable($value)) {
+            return $this->getConnectionInitializer($options, $value);
+        } else {
+            throw new InvalidArgumentException(sprintf(
+                '%s expects either a string or a callable value, %s given',
+                static::class,
+                is_object($value) ? get_class($value) : gettype($value)
+            ));
+        }
+    }
+
+    /**
+     * Returns a connection initializer from a descriptive name.
+     *
+     * @param OptionsInterface $options     Client options
+     * @param string           $description Identifier of a replication backend (`predis`, `sentinel`)
+     *
+     * @return callable
+     */
+    protected function getConnectionInitializerByString(OptionsInterface $options, string $description)
+    {
+        switch ($description) {
+            case 'redis':
+            case 'redis-cluster':
+                return function ($parameters, $options, $option) {
+                    return new RedisCluster($options->connections, new RedisStrategy($options->crc16));
+                };
+
+            case 'predis':
+                return $this->getDefaultConnectionInitializer();
+
+            default:
+                throw new InvalidArgumentException(sprintf(
+                    '%s expects either `predis`, `redis` or `redis-cluster` as valid string values, `%s` given',
+                    static::class,
+                    $description
+                ));
+        }
+    }
+
+    /**
+     * Returns the default connection initializer.
+     *
+     * @return callable
+     */
+    protected function getDefaultConnectionInitializer()
+    {
+        return function ($parameters, $options, $option) {
+            return new PredisCluster();
+        };
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        return $this->getConnectionInitializer(
+            $options,
+            $this->getDefaultConnectionInitializer()
+        );
+    }
+}
diff --git a/plugins/cache-redis/Predis/Configuration/Option/Commands.php b/plugins/cache-redis/Predis/Configuration/Option/Commands.php
new file mode 100644
index 000000000..2fbe00e74
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/Commands.php
@@ -0,0 +1,146 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Command\FactoryInterface;
+use Predis\Command\RawFactory;
+use Predis\Command\RedisFactory;
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
+
+/**
+ * Configures a connection factory to be used by the client.
+ */
+class Commands implements OptionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (is_callable($value)) {
+            $value = call_user_func($value, $options);
+        }
+
+        if ($value instanceof FactoryInterface) {
+            return $value;
+        } elseif (is_array($value)) {
+            return $this->createFactoryByArray($options, $value);
+        } elseif (is_string($value)) {
+            return $this->createFactoryByString($options, $value);
+        } else {
+            throw new InvalidArgumentException(sprintf(
+                '%s expects a valid command factory',
+                static::class
+            ));
+        }
+    }
+
+    /**
+     * Creates a new default command factory from a named array.
+     *
+     * The factory instance is configured according to the supplied named array
+     * mapping command IDs (passed as keys) to the FCQN of classes implementing
+     * Predis\Command\CommandInterface.
+     *
+     * @param OptionsInterface $options Client options container
+     * @param array            $value   Named array mapping command IDs to classes
+     *
+     * @return FactoryInterface
+     */
+    protected function createFactoryByArray(OptionsInterface $options, array $value)
+    {
+        /**
+         * @var FactoryInterface
+         */
+        $commands = $this->getDefault($options);
+
+        foreach ($value as $commandID => $commandClass) {
+            if ($commandClass === null) {
+                $commands->undefine($commandID);
+            } else {
+                $commands->define($commandID, $commandClass);
+            }
+        }
+
+        return $commands;
+    }
+
+    /**
+     * Creates a new command factory from a descriptive string.
+     *
+     * The factory instance is configured according to the supplied descriptive
+     * string that identifies specific configurations of schemes and connection
+     * classes. Supported configuration values are:
+     *
+     * - "predis" returns the default command factory used by Predis
+     * - "raw" returns a command factory that creates only raw commands
+     * - "default" is simply an alias of "predis"
+     *
+     * @param OptionsInterface $options Client options container
+     * @param string           $value   Descriptive string identifying the desired configuration
+     *
+     * @return FactoryInterface
+     */
+    protected function createFactoryByString(OptionsInterface $options, string $value)
+    {
+        switch (strtolower($value)) {
+            case 'default':
+            case 'predis':
+                return $this->getDefault($options);
+
+            case 'raw':
+                return $this->createRawFactory($options);
+
+            default:
+                throw new InvalidArgumentException(sprintf(
+                    '%s does not recognize `%s` as a supported configuration string',
+                    static::class,
+                    $value
+                ));
+        }
+    }
+
+    /**
+     * Creates a new raw command factory instance.
+     *
+     * @param OptionsInterface $options Client options container
+     */
+    protected function createRawFactory(OptionsInterface $options): FactoryInterface
+    {
+        $commands = new RawFactory();
+
+        if (isset($options->prefix)) {
+            throw new InvalidArgumentException(sprintf(
+                '%s does not support key prefixing', RawFactory::class
+            ));
+        }
+
+        return $commands;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        $commands = new RedisFactory();
+
+        if (isset($options->prefix)) {
+            $commands->setProcessor($options->prefix);
+        }
+
+        return $commands;
+    }
+}
diff --git a/plugins/cache-redis/Predis/Configuration/Option/Connections.php b/plugins/cache-redis/Predis/Configuration/Option/Connections.php
new file mode 100644
index 000000000..e37de4cad
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/Connections.php
@@ -0,0 +1,152 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
+use Predis\Connection\Factory;
+use Predis\Connection\FactoryInterface;
+use Predis\Connection\PhpiredisSocketConnection;
+use Predis\Connection\PhpiredisStreamConnection;
+use Predis\Connection\RelayConnection;
+
+/**
+ * Configures a new connection factory instance.
+ *
+ * The client uses the connection factory to create the underlying connections
+ * to single redis nodes in a single-server configuration or in replication and
+ * cluster configurations.
+ */
+class Connections implements OptionInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (is_callable($value)) {
+            $value = call_user_func($value, $options);
+        }
+
+        if ($value instanceof FactoryInterface) {
+            return $value;
+        } elseif (is_array($value)) {
+            return $this->createFactoryByArray($options, $value);
+        } elseif (is_string($value)) {
+            return $this->createFactoryByString($options, $value);
+        } else {
+            throw new InvalidArgumentException(sprintf(
+                '%s expects a valid connection factory', static::class
+            ));
+        }
+    }
+
+    /**
+     * Creates a new connection factory from a named array.
+     *
+     * The factory instance is configured according to the supplied named array
+     * mapping URI schemes (passed as keys) to the FCQN of classes implementing
+     * Predis\Connection\NodeConnectionInterface, or callable objects acting as
+     * lazy initializers and returning new instances of classes implementing
+     * Predis\Connection\NodeConnectionInterface.
+     *
+     * @param OptionsInterface $options Client options
+     * @param array            $value   Named array mapping URI schemes to classes or callables
+     *
+     * @return FactoryInterface
+     */
+    protected function createFactoryByArray(OptionsInterface $options, array $value)
+    {
+        /**
+         * @var FactoryInterface
+         */
+        $factory = $this->getDefault($options);
+
+        foreach ($value as $scheme => $initializer) {
+            $factory->define($scheme, $initializer);
+        }
+
+        return $factory;
+    }
+
+    /**
+     * Creates a new connection factory from a descriptive string.
+     *
+     * The factory instance is configured according to the supplied descriptive
+     * string that identifies specific configurations of schemes and connection
+     * classes. Supported configuration values are:
+     *
+     * - "phpiredis-stream" maps tcp, redis, unix to PhpiredisStreamConnection
+     * - "phpiredis-socket" maps tcp, redis, unix to PhpiredisSocketConnection
+     * - "phpiredis" is an alias of "phpiredis-stream"
+     * - "relay" maps tcp, redis, unix, tls, rediss to RelayConnection
+     *
+     * @param OptionsInterface $options Client options
+     * @param string           $value   Descriptive string identifying the desired configuration
+     *
+     * @return FactoryInterface
+     */
+    protected function createFactoryByString(OptionsInterface $options, string $value)
+    {
+        /**
+         * @var FactoryInterface
+         */
+        $factory = $this->getDefault($options);
+
+        switch (strtolower($value)) {
+            case 'phpiredis':
+            case 'phpiredis-stream':
+                $factory->define('tcp', PhpiredisStreamConnection::class);
+                $factory->define('redis', PhpiredisStreamConnection::class);
+                $factory->define('unix', PhpiredisStreamConnection::class);
+                break;
+
+            case 'phpiredis-socket':
+                $factory->define('tcp', PhpiredisSocketConnection::class);
+                $factory->define('redis', PhpiredisSocketConnection::class);
+                $factory->define('unix', PhpiredisSocketConnection::class);
+                break;
+
+            case 'relay':
+                $factory->define('tcp', RelayConnection::class);
+                $factory->define('redis', RelayConnection::class);
+                $factory->define('unix', RelayConnection::class);
+                break;
+
+            case 'default':
+                return $factory;
+
+            default:
+                throw new InvalidArgumentException(sprintf(
+                    '%s does not recognize `%s` as a supported configuration string', static::class, $value
+                ));
+        }
+
+        return $factory;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        $factory = new Factory();
+
+        if ($options->defined('parameters')) {
+            $factory->setDefaultParameters($options->parameters);
+        }
+
+        return $factory;
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ExceptionsOption.php b/plugins/cache-redis/Predis/Configuration/Option/Exceptions.php
similarity index 73%
rename from snappymail/v/0.0.0/app/libraries/Predis/Configuration/ExceptionsOption.php
rename to plugins/cache-redis/Predis/Configuration/Option/Exceptions.php
index 337733e4b..6834272f0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ExceptionsOption.php
+++ b/plugins/cache-redis/Predis/Configuration/Option/Exceptions.php
@@ -3,21 +3,23 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Configuration;
+namespace Predis\Configuration\Option;
+
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
 
 /**
  * Configures whether consumers (such as the client) should throw exceptions on
  * Redis errors (-ERR responses) or just return instances of error responses.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class ExceptionsOption implements OptionInterface
+class Exceptions implements OptionInterface
 {
     /**
      * {@inheritdoc}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/PrefixOption.php b/plugins/cache-redis/Predis/Configuration/Option/Prefix.php
similarity index 66%
rename from snappymail/v/0.0.0/app/libraries/Predis/Configuration/PrefixOption.php
rename to plugins/cache-redis/Predis/Configuration/Option/Prefix.php
index 5827cdc37..772454b36 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/PrefixOption.php
+++ b/plugins/cache-redis/Predis/Configuration/Option/Prefix.php
@@ -3,35 +3,40 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Configuration;
+namespace Predis\Configuration\Option;
 
 use Predis\Command\Processor\KeyPrefixProcessor;
 use Predis\Command\Processor\ProcessorInterface;
+use Predis\Configuration\OptionInterface;
+use Predis\Configuration\OptionsInterface;
 
 /**
  * Configures a command processor that apply the specified prefix string to a
  * series of Redis commands considered prefixable.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class PrefixOption implements OptionInterface
+class Prefix implements OptionInterface
 {
     /**
      * {@inheritdoc}
      */
     public function filter(OptionsInterface $options, $value)
     {
+        if (is_callable($value)) {
+            $value = call_user_func($value, $options);
+        }
+
         if ($value instanceof ProcessorInterface) {
             return $value;
         }
 
-        return new KeyPrefixProcessor($value);
+        return new KeyPrefixProcessor((string) $value);
     }
 
     /**
diff --git a/plugins/cache-redis/Predis/Configuration/Option/Replication.php b/plugins/cache-redis/Predis/Configuration/Option/Replication.php
new file mode 100644
index 000000000..b0f132d19
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/Option/Replication.php
@@ -0,0 +1,126 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration\Option;
+
+use InvalidArgumentException;
+use Predis\Configuration\OptionsInterface;
+use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\Replication\MasterSlaveReplication;
+use Predis\Connection\Replication\SentinelReplication;
+
+/**
+ * Configures an aggregate connection used for master/slave replication among
+ * multiple Redis nodes.
+ */
+class Replication extends Aggregate
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function filter(OptionsInterface $options, $value)
+    {
+        if (is_string($value)) {
+            $value = $this->getConnectionInitializerByString($options, $value);
+        }
+
+        if (is_callable($value)) {
+            return $this->getConnectionInitializer($options, $value);
+        } else {
+            throw new InvalidArgumentException(sprintf(
+                '%s expects either a string or a callable value, %s given',
+                static::class,
+                is_object($value) ? get_class($value) : gettype($value)
+            ));
+        }
+    }
+
+    /**
+     * Returns a connection initializer (callable) from a descriptive string.
+     *
+     * Each connection initializer is specialized for the specified replication
+     * backend so that all the necessary steps for the configuration of the new
+     * aggregate connection are performed inside the initializer and the client
+     * receives a ready-to-use connection.
+     *
+     * Supported configuration values are:
+     *
+     * - `predis` for unmanaged replication setups
+     * - `redis-sentinel` for replication setups managed by redis-sentinel
+     * - `sentinel` is an alias of `redis-sentinel`
+     *
+     * @param OptionsInterface $options     Client options
+     * @param string           $description Identifier of a replication backend
+     *
+     * @return callable
+     */
+    protected function getConnectionInitializerByString(OptionsInterface $options, string $description)
+    {
+        switch ($description) {
+            case 'sentinel':
+            case 'redis-sentinel':
+                return function ($parameters, $options) {
+                    return new SentinelReplication($options->service, $parameters, $options->connections);
+                };
+
+            case 'predis':
+                return $this->getDefaultConnectionInitializer();
+
+            default:
+                throw new InvalidArgumentException(sprintf(
+                    '%s expects either `predis`, `sentinel` or `redis-sentinel` as valid string values, `%s` given',
+                    static::class,
+                    $description
+                ));
+        }
+    }
+
+    /**
+     * Returns the default connection initializer.
+     *
+     * @return callable
+     */
+    protected function getDefaultConnectionInitializer()
+    {
+        return function ($parameters, $options) {
+            $connection = new MasterSlaveReplication();
+
+            if ($options->autodiscovery) {
+                $connection->setConnectionFactory($options->connections);
+                $connection->setAutoDiscovery(true);
+            }
+
+            return $connection;
+        };
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public static function aggregate(OptionsInterface $options, AggregateConnectionInterface $connection, array $nodes)
+    {
+        if (!$connection instanceof SentinelReplication) {
+            parent::aggregate($options, $connection, $nodes);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDefault(OptionsInterface $options)
+    {
+        return $this->getConnectionInitializer(
+            $options,
+            $this->getDefaultConnectionInitializer()
+        );
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionInterface.php b/plugins/cache-redis/Predis/Configuration/OptionInterface.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionInterface.php
rename to plugins/cache-redis/Predis/Configuration/OptionInterface.php
index b31e0c98f..538fc0ba7 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionInterface.php
+++ b/plugins/cache-redis/Predis/Configuration/OptionInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis\Configuration;
 /**
  * Defines an handler used by Predis\Configuration\Options to filter, validate
  * or return default values for a given option.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface OptionInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/Options.php b/plugins/cache-redis/Predis/Configuration/Options.php
similarity index 53%
rename from snappymail/v/0.0.0/app/libraries/Predis/Configuration/Options.php
rename to plugins/cache-redis/Predis/Configuration/Options.php
index 6f3b331b5..3fff04129 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/Options.php
+++ b/plugins/cache-redis/Predis/Configuration/Options.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,44 +13,39 @@
 namespace Predis\Configuration;
 
 /**
- * Manages Predis options with filtering, conversion and lazy initialization of
- * values using a mini-DI container approach.
+ * Default client options container for Predis\Client.
+ *
+ * Pre-defined options have their specialized handlers that can filter, convert
+ * an lazily initialize values in a mini-DI container approach.
  *
  * {@inheritdoc}
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Options implements OptionsInterface
 {
+    /** @var array */
+    protected $handlers = [
+        'aggregate' => Option\Aggregate::class,
+        'cluster' => Option\Cluster::class,
+        'replication' => Option\Replication::class,
+        'connections' => Option\Connections::class,
+        'commands' => Option\Commands::class,
+        'exceptions' => Option\Exceptions::class,
+        'prefix' => Option\Prefix::class,
+        'crc16' => Option\CRC16::class,
+    ];
+
+    /** @var array */
+    protected $options = [];
+
+    /** @var array */
     protected $input;
-    protected $options;
-    protected $handlers;
 
     /**
-     * @param array $options Array of options with their values
+     * @param array $options Named array of client options
      */
-    public function __construct(array $options = array())
+    public function __construct(array $options = null)
     {
-        $this->input = $options;
-        $this->options = array();
-        $this->handlers = $this->getHandlers();
-    }
-
-    /**
-     * Ensures that the default options are initialized.
-     *
-     * @return array
-     */
-    protected function getHandlers()
-    {
-        return array(
-            'cluster' => 'Predis\Configuration\ClusterOption',
-            'connections' => 'Predis\Configuration\ConnectionFactoryOption',
-            'exceptions' => 'Predis\Configuration\ExceptionsOption',
-            'prefix' => 'Predis\Configuration\PrefixOption',
-            'profile' => 'Predis\Configuration\ProfileOption',
-            'replication' => 'Predis\Configuration\ReplicationOption',
-        );
+        $this->input = $options ?? [];
     }
 
     /**
@@ -70,10 +66,10 @@ class Options implements OptionsInterface
      */
     public function defined($option)
     {
-        return (
-            array_key_exists($option, $this->options) ||
-            array_key_exists($option, $this->input)
-        );
+        return
+            array_key_exists($option, $this->options)
+            || array_key_exists($option, $this->input)
+        ;
     }
 
     /**
@@ -82,8 +78,8 @@ class Options implements OptionsInterface
     public function __isset($option)
     {
         return (
-            array_key_exists($option, $this->options) ||
-            array_key_exists($option, $this->input)
+            array_key_exists($option, $this->options)
+            || array_key_exists($option, $this->input)
         ) && $this->__get($option) !== null;
     }
 
@@ -100,14 +96,12 @@ class Options implements OptionsInterface
             $value = $this->input[$option];
             unset($this->input[$option]);
 
-            if (is_object($value) && method_exists($value, '__invoke')) {
-                $value = $value($this, $option);
-            }
-
             if (isset($this->handlers[$option])) {
                 $handler = $this->handlers[$option];
                 $handler = new $handler();
                 $value = $handler->filter($this, $value);
+            } elseif (is_object($value) && method_exists($value, '__invoke')) {
+                $value = $value($this);
             }
 
             return $this->options[$option] = $value;
diff --git a/plugins/cache-redis/Predis/Configuration/OptionsInterface.php b/plugins/cache-redis/Predis/Configuration/OptionsInterface.php
new file mode 100644
index 000000000..597a0579b
--- /dev/null
+++ b/plugins/cache-redis/Predis/Configuration/OptionsInterface.php
@@ -0,0 +1,63 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Configuration;
+
+use Predis\Command\Processor\ProcessorInterface;
+
+/**
+ * @property callable                            $aggregate   Custom aggregate connection initializer
+ * @property callable                            $cluster     Aggregate connection initializer for clustering
+ * @property \Predis\Connection\FactoryInterface $connections Connection factory for creating new connections
+ * @property bool                                $exceptions  Toggles exceptions in client for -ERR responses
+ * @property ProcessorInterface                  $prefix      Key prefixing strategy using the supplied string as prefix
+ * @property \Predis\Command\FactoryInterface    $commands    Command factory for creating Redis commands
+ * @property callable                            $replication Aggregate connection initializer for replication
+ */
+interface OptionsInterface
+{
+    /**
+     * Returns the default value for the given option.
+     *
+     * @param string $option Name of the option
+     *
+     * @return mixed|null
+     */
+    public function getDefault($option);
+
+    /**
+     * Checks if the given option has been set by the user upon initialization.
+     *
+     * @param string $option Name of the option
+     *
+     * @return bool
+     */
+    public function defined($option);
+
+    /**
+     * Checks if the given option has been set and does not evaluate to NULL.
+     *
+     * @param string $option Name of the option
+     *
+     * @return bool
+     */
+    public function __isset($option);
+
+    /**
+     * Returns the value of the given option.
+     *
+     * @param string $option Name of the option
+     *
+     * @return mixed|null
+     */
+    public function __get($option);
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/AbstractConnection.php b/plugins/cache-redis/Predis/Connection/AbstractConnection.php
similarity index 71%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/AbstractConnection.php
rename to plugins/cache-redis/Predis/Connection/AbstractConnection.php
index 029a337eb..3273f3866 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/AbstractConnection.php
+++ b/plugins/cache-redis/Predis/Connection/AbstractConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,15 +12,15 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
+use Predis\Command\RawCommand;
 use Predis\CommunicationException;
 use Predis\Protocol\ProtocolException;
 
 /**
  * Base class with the common logic used by connection classes to communicate
  * with Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 abstract class AbstractConnection implements NodeConnectionInterface
 {
@@ -27,7 +28,11 @@ abstract class AbstractConnection implements NodeConnectionInterface
     private $cachedId;
 
     protected $parameters;
-    protected $initCommands = array();
+
+    /**
+     * @var RawCommand[]
+     */
+    protected $initCommands = [];
 
     /**
      * @param ParametersInterface $parameters Initialization parameters for the connection.
@@ -51,24 +56,10 @@ abstract class AbstractConnection implements NodeConnectionInterface
      *
      * @param ParametersInterface $parameters Initialization parameters for the connection.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return ParametersInterface
+     * @throws InvalidArgumentException
      */
-    protected function assertParameters(ParametersInterface $parameters)
-    {
-        switch ($parameters->scheme) {
-            case 'tcp':
-            case 'redis':
-            case 'unix':
-                break;
-
-            default:
-                throw new \InvalidArgumentException("Invalid scheme: '$parameters->scheme'.");
-        }
-
-        return $parameters;
-    }
+    abstract protected function assertParameters(ParametersInterface $parameters);
 
     /**
      * Creates the underlying resource used to communicate with Redis.
@@ -115,6 +106,14 @@ abstract class AbstractConnection implements NodeConnectionInterface
         $this->initCommands[] = $command;
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function getInitCommands(): array
+    {
+        return $this->initCommands;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -133,39 +132,16 @@ abstract class AbstractConnection implements NodeConnectionInterface
         return $this->read();
     }
 
-    /**
-     * Helper method that returns an exception message augmented with useful
-     * details from the connection parameters.
-     *
-     * @param string $message Error message.
-     *
-     * @return string
-     */
-    private function createExceptionMessage($message)
-    {
-        $parameters = $this->parameters;
-
-        if ($parameters->scheme === 'unix') {
-            return "$message [$parameters->scheme:$parameters->path]";
-        }
-
-        if (filter_var($parameters->host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            return "$message [$parameters->scheme://[$parameters->host]:$parameters->port]";
-        }
-
-        return "$message [$parameters->scheme://$parameters->host:$parameters->port]";
-    }
-
     /**
      * Helper method to handle connection errors.
      *
      * @param string $message Error message.
      * @param int    $code    Error code.
      */
-    protected function onConnectionError($message, $code = null)
+    protected function onConnectionError($message, $code = 0)
     {
         CommunicationException::handle(
-            new ConnectionException($this, static::createExceptionMessage($message), $code)
+            new ConnectionException($this, "$message [{$this->getParameters()}]", $code)
         );
     }
 
@@ -177,7 +153,7 @@ abstract class AbstractConnection implements NodeConnectionInterface
     protected function onProtocolError($message)
     {
         CommunicationException::handle(
-            new ProtocolException($this, static::createExceptionMessage($message))
+            new ProtocolException($this, "$message [{$this->getParameters()}]")
         );
     }
 
@@ -234,6 +210,6 @@ abstract class AbstractConnection implements NodeConnectionInterface
      */
     public function __sleep()
     {
-        return array('parameters', 'initCommands');
+        return ['parameters', 'initCommands'];
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/AggregateConnectionInterface.php b/plugins/cache-redis/Predis/Connection/AggregateConnectionInterface.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/AggregateConnectionInterface.php
rename to plugins/cache-redis/Predis/Connection/AggregateConnectionInterface.php
index 7eeaede76..8864bba53 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/AggregateConnectionInterface.php
+++ b/plugins/cache-redis/Predis/Connection/AggregateConnectionInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,8 +17,6 @@ use Predis\Command\CommandInterface;
 /**
  * Defines a virtual connection composed of multiple connection instances to
  * single Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface AggregateConnectionInterface extends ConnectionInterface
 {
@@ -44,7 +43,7 @@ interface AggregateConnectionInterface extends ConnectionInterface
      *
      * @return NodeConnectionInterface
      */
-    public function getConnection(CommandInterface $command);
+    public function getConnectionByCommand(CommandInterface $command);
 
     /**
      * Returns a connection instance from the aggregate connection by its alias.
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ClusterInterface.php b/plugins/cache-redis/Predis/Connection/Cluster/ClusterInterface.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ClusterInterface.php
rename to plugins/cache-redis/Predis/Connection/Cluster/ClusterInterface.php
index af0f5aab5..79c6f96e9 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ClusterInterface.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/ClusterInterface.php
@@ -3,21 +3,20 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Connection\Aggregate;
+namespace Predis\Connection\Cluster;
 
 use Predis\Connection\AggregateConnectionInterface;
 
 /**
  * Defines a cluster of Redis servers formed by aggregating multiple connection
  * instances to single Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ClusterInterface extends AggregateConnectionInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/PredisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
similarity index 62%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/PredisCluster.php
rename to plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
index 33f98bf2e..c30fd09d3 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/PredisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/PredisCluster.php
@@ -3,32 +3,50 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Connection\Aggregate;
+namespace Predis\Connection\Cluster;
 
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
 use Predis\Cluster\PredisStrategy;
 use Predis\Cluster\StrategyInterface;
 use Predis\Command\CommandInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
+use ReturnTypeWillChange;
+use Traversable;
 
 /**
  * Abstraction for a cluster of aggregate connections to various Redis servers
  * implementing client-side sharding based on pluggable distribution strategies.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- *
- * @todo Add the ability to remove connections from pool.
  */
-class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
+class PredisCluster implements ClusterInterface, IteratorAggregate, Countable
 {
-    private $pool;
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    private $pool = [];
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    private $aliases = [];
+
+    /**
+     * @var StrategyInterface
+     */
     private $strategy;
+
+    /**
+     * @var \Predis\Cluster\Distributor\DistributorInterface
+     */
     private $distributor;
 
     /**
@@ -36,7 +54,6 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function __construct(StrategyInterface $strategy = null)
     {
-        $this->pool = array();
         $this->strategy = $strategy ?: new PredisStrategy();
         $this->distributor = $this->strategy->getDistributor();
     }
@@ -82,14 +99,13 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     {
         $parameters = $connection->getParameters();
 
+        $this->pool[(string) $connection] = $connection;
+
         if (isset($parameters->alias)) {
-            $this->pool[$parameters->alias] = $connection;
-        } else {
-            $this->pool[] = $connection;
+            $this->aliases[$parameters->alias] = $connection;
         }
 
-        $weight = isset($parameters->weight) ? $parameters->weight : null;
-        $this->distributor->add($connection, $weight);
+        $this->distributor->add($connection, $parameters->weight);
     }
 
     /**
@@ -97,36 +113,24 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function remove(NodeConnectionInterface $connection)
     {
-        if (($id = array_search($connection, $this->pool, true)) !== false) {
+        if (false !== $id = array_search($connection, $this->pool, true)) {
             unset($this->pool[$id]);
             $this->distributor->remove($connection);
 
+            if ($this->aliases && $alias = $connection->getParameters()->alias) {
+                unset($this->aliases[$alias]);
+            }
+
             return true;
         }
 
         return false;
     }
 
-    /**
-     * Removes a connection instance using its alias or index.
-     *
-     * @param string $connectionID Alias or index of a connection.
-     *
-     * @return bool Returns true if the connection was in the pool.
-     */
-    public function removeById($connectionID)
-    {
-        if ($connection = $this->getConnectionById($connectionID)) {
-            return $this->remove($connection);
-        }
-
-        return false;
-    }
-
     /**
      * {@inheritdoc}
      */
-    public function getConnection(CommandInterface $command)
+    public function getConnectionByCommand(CommandInterface $command)
     {
         $slot = $this->strategy->getSlot($command);
 
@@ -136,17 +140,39 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
             );
         }
 
-        $node = $this->distributor->getBySlot($slot);
-
-        return $node;
+        return $this->distributor->getBySlot($slot);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getConnectionById($connectionID)
+    public function getConnectionById($id)
     {
-        return isset($this->pool[$connectionID]) ? $this->pool[$connectionID] : null;
+        return $this->pool[$id] ?? null;
+    }
+
+    /**
+     * Returns a connection instance by its alias.
+     *
+     * @param string $alias Connection alias.
+     *
+     * @return NodeConnectionInterface|null
+     */
+    public function getConnectionByAlias($alias)
+    {
+        return $this->aliases[$alias] ?? null;
+    }
+
+    /**
+     * Retrieves a connection instance by slot.
+     *
+     * @param string $slot Slot name.
+     *
+     * @return NodeConnectionInterface|null
+     */
+    public function getConnectionBySlot($slot)
+    {
+        return $this->distributor->getBySlot($slot);
     }
 
     /**
@@ -159,9 +185,8 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     public function getConnectionByKey($key)
     {
         $hash = $this->strategy->getSlotByKey($key);
-        $node = $this->distributor->getBySlot($hash);
 
-        return $node;
+        return $this->distributor->getBySlot($hash);
     }
 
     /**
@@ -176,19 +201,21 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     }
 
     /**
-     * {@inheritdoc}
+     * @return int
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->pool);
     }
 
     /**
-     * {@inheritdoc}
+     * @return Traversable<string, NodeConnectionInterface>
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
-        return new \ArrayIterator($this->pool);
+        return new ArrayIterator($this->pool);
     }
 
     /**
@@ -196,7 +223,7 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function writeRequest(CommandInterface $command)
     {
-        $this->getConnection($command)->writeRequest($command);
+        $this->getConnectionByCommand($command)->writeRequest($command);
     }
 
     /**
@@ -204,7 +231,7 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function readResponse(CommandInterface $command)
     {
-        return $this->getConnection($command)->readResponse($command);
+        return $this->getConnectionByCommand($command)->readResponse($command);
     }
 
     /**
@@ -212,24 +239,6 @@ class PredisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function executeCommand(CommandInterface $command)
     {
-        return $this->getConnection($command)->executeCommand($command);
-    }
-
-    /**
-     * Executes the specified Redis command on all the nodes of a cluster.
-     *
-     * @param CommandInterface $command A Redis command.
-     *
-     * @return array
-     */
-    public function executeCommandOnNodes(CommandInterface $command)
-    {
-        $responses = array();
-
-        foreach ($this->pool as $connection) {
-            $responses[] = $connection->executeCommand($command);
-        }
-
-        return $responses;
+        return $this->getConnectionByCommand($command)->executeCommand($command);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/RedisCluster.php b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
similarity index 59%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/RedisCluster.php
rename to plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
index 337c28702..7f3013c17 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/RedisCluster.php
+++ b/plugins/cache-redis/Predis/Connection/Cluster/RedisCluster.php
@@ -3,22 +3,35 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Connection\Aggregate;
+namespace Predis\Connection\Cluster;
 
+use ArrayIterator;
+use Countable;
+use IteratorAggregate;
+use OutOfBoundsException;
+use Predis\ClientException;
 use Predis\Cluster\RedisStrategy as RedisClusterStrategy;
+use Predis\Cluster\SlotMap;
 use Predis\Cluster\StrategyInterface;
 use Predis\Command\CommandInterface;
 use Predis\Command\RawCommand;
+use Predis\Connection\ConnectionException;
 use Predis\Connection\FactoryInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
+use Predis\Response\Error as ErrorResponse;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
+use Predis\Response\ServerException;
+use ReturnTypeWillChange;
+use Throwable;
+use Traversable;
 
 /**
  * Abstraction for a Redis-backed cluster of nodes (Redis >= 3.0.0).
@@ -39,18 +52,17 @@ use Predis\Response\ErrorInterface as ErrorResponseInterface;
  * of the nodes and optionally enable such a behaviour upon -MOVED redirections.
  * Asking for the cluster configuration to Redis is actually done by issuing a
  * CLUSTER SLOTS command to a random node in the pool.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
+class RedisCluster implements ClusterInterface, IteratorAggregate, Countable
 {
     private $useClusterSlots = true;
-    private $defaultParameters = array();
-    private $pool = array();
-    private $slots = array();
-    private $slotsMap;
+    private $pool = [];
+    private $slots = [];
+    private $slotmap;
     private $strategy;
     private $connections;
+    private $retryLimit = 5;
+    private $retryInterval = 10;
 
     /**
      * @param FactoryInterface  $connections Optional connection factory.
@@ -62,6 +74,41 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     ) {
         $this->connections = $connections;
         $this->strategy = $strategy ?: new RedisClusterStrategy();
+        $this->slotmap = new SlotMap();
+    }
+
+    /**
+     * Sets the maximum number of retries for commands upon server failure.
+     *
+     * -1 = unlimited retry attempts
+     *  0 = no retry attempts (fails immediately)
+     *  n = fail only after n retry attempts
+     *
+     * @param int $retry Number of retry attempts.
+     */
+    public function setRetryLimit($retry)
+    {
+        $this->retryLimit = (int) $retry;
+    }
+
+    /**
+     * Sets the initial retry interval (milliseconds).
+     *
+     * @param int $retryInterval Milliseconds between retries.
+     */
+    public function setRetryInterval($retryInterval)
+    {
+        $this->retryInterval = (int) $retryInterval;
+    }
+
+    /**
+     * Returns the retry interval (milliseconds).
+     *
+     * @return int Milliseconds between retries.
+     */
+    public function getRetryInterval()
+    {
+        return (int) $this->retryInterval;
     }
 
     /**
@@ -104,7 +151,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     public function add(NodeConnectionInterface $connection)
     {
         $this->pool[(string) $connection] = $connection;
-        unset($this->slotsMap);
+        $this->slotmap->reset();
     }
 
     /**
@@ -113,10 +160,9 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     public function remove(NodeConnectionInterface $connection)
     {
         if (false !== $id = array_search($connection, $this->pool, true)) {
-            unset(
-                $this->pool[$id],
-                $this->slotsMap
-            );
+            $this->slotmap->reset();
+            $this->slots = array_diff($this->slots, [$connection]);
+            unset($this->pool[$id]);
 
             return true;
         }
@@ -134,10 +180,9 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     public function removeById($connectionID)
     {
         if (isset($this->pool[$connectionID])) {
-            unset(
-                $this->pool[$connectionID],
-                $this->slotsMap
-            );
+            $this->slotmap->reset();
+            $this->slots = array_diff($this->slots, [$connectionID]);
+            unset($this->pool[$connectionID]);
 
             return true;
         }
@@ -154,9 +199,9 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      * initialization have the "slots" parameter properly set accordingly to the
      * current cluster configuration.
      */
-    public function buildSlotsMap()
+    public function buildSlotMap()
     {
-        $this->slotsMap = array();
+        $this->slotmap->reset();
 
         foreach ($this->pool as $connectionID => $connection) {
             $parameters = $connection->getParameters();
@@ -165,80 +210,90 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
                 continue;
             }
 
-            $slots = explode('-', $parameters->slots, 2);
-            $this->setSlots($slots[0], $slots[1], $connectionID);
+            foreach (explode(',', $parameters->slots) as $slotRange) {
+                $slots = explode('-', $slotRange, 2);
+
+                if (!isset($slots[1])) {
+                    $slots[1] = $slots[0];
+                }
+
+                $this->slotmap->setSlots($slots[0], $slots[1], $connectionID);
+            }
         }
     }
 
+    /**
+     * Queries the specified node of the cluster to fetch the updated slots map.
+     *
+     * When the connection fails, this method tries to execute the same command
+     * on a different connection picked at random from the pool of known nodes,
+     * up until the retry limit is reached.
+     *
+     * @param NodeConnectionInterface $connection Connection to a node of the cluster.
+     *
+     * @return mixed
+     */
+    private function queryClusterNodeForSlotMap(NodeConnectionInterface $connection)
+    {
+        $retries = 0;
+        $retryAfter = $this->retryInterval;
+        $command = RawCommand::create('CLUSTER', 'SLOTS');
+
+        while ($retries <= $this->retryLimit) {
+            try {
+                $response = $connection->executeCommand($command);
+                break;
+            } catch (ConnectionException $exception) {
+                $connection = $exception->getConnection();
+                $connection->disconnect();
+
+                $this->remove($connection);
+
+                if ($retries === $this->retryLimit) {
+                    throw $exception;
+                }
+
+                if (!$connection = $this->getRandomConnection()) {
+                    throw new ClientException('No connections left in the pool for `CLUSTER SLOTS`');
+                }
+
+                usleep($retryAfter * 1000);
+                $retryAfter = $retryAfter * 2;
+                ++$retries;
+            }
+        }
+
+        return $response;
+    }
+
     /**
      * Generates an updated slots map fetching the cluster configuration using
      * the CLUSTER SLOTS command against the specified node or a random one from
      * the pool.
      *
      * @param NodeConnectionInterface $connection Optional connection instance.
-     *
-     * @return array
      */
-    public function askSlotsMap(NodeConnectionInterface $connection = null)
+    public function askSlotMap(NodeConnectionInterface $connection = null)
     {
         if (!$connection && !$connection = $this->getRandomConnection()) {
-            return array();
+            return;
         }
 
-        $command = RawCommand::create('CLUSTER', 'SLOTS');
-        $response = $connection->executeCommand($command);
+        $this->slotmap->reset();
+
+        $response = $this->queryClusterNodeForSlotMap($connection);
 
         foreach ($response as $slots) {
             // We only support master servers for now, so we ignore subsequent
             // elements in the $slots array identifying slaves.
-            list($start, $end, $master) = $slots;
+            [$start, $end, $master] = $slots;
 
             if ($master[0] === '') {
-                $this->setSlots($start, $end, (string) $connection);
+                $this->slotmap->setSlots($start, $end, (string) $connection);
             } else {
-                $this->setSlots($start, $end, "{$master[0]}:{$master[1]}");
+                $this->slotmap->setSlots($start, $end, "{$master[0]}:{$master[1]}");
             }
         }
-
-        return $this->slotsMap;
-    }
-
-    /**
-     * Returns the current slots map for the cluster.
-     *
-     * @return array
-     */
-    public function getSlotsMap()
-    {
-        if (!isset($this->slotsMap)) {
-            $this->slotsMap = array();
-        }
-
-        return $this->slotsMap;
-    }
-
-    /**
-     * Pre-associates a connection to a slots range to avoid runtime guessing.
-     *
-     * @param int                            $first      Initial slot of the range.
-     * @param int                            $last       Last slot of the range.
-     * @param NodeConnectionInterface|string $connection ID or connection instance.
-     *
-     * @throws \OutOfBoundsException
-     */
-    public function setSlots($first, $last, $connection)
-    {
-        if ($first < 0x0000 || $first > 0x3FFF ||
-            $last < 0x0000 || $last > 0x3FFF ||
-            $last < $first
-        ) {
-            throw new \OutOfBoundsException(
-                "Invalid slot range for $connection: [$first-$last]."
-            );
-        }
-
-        $slots = array_fill($first, $last - $first + 1, (string) $connection);
-        $this->slotsMap = $this->getSlotsMap() + $slots;
     }
 
     /**
@@ -252,12 +307,16 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     protected function guessNode($slot)
     {
-        if (!isset($this->slotsMap)) {
-            $this->buildSlotsMap();
+        if (!$this->pool) {
+            throw new ClientException('No connections available in the pool');
         }
 
-        if (isset($this->slotsMap[$slot])) {
-            return $this->slotsMap[$slot];
+        if ($this->slotmap->isEmpty()) {
+            $this->buildSlotMap();
+        }
+
+        if ($node = $this->slotmap[$slot]) {
+            return $node;
         }
 
         $count = count($this->pool);
@@ -278,20 +337,16 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     {
         $separator = strrpos($connectionID, ':');
 
-        $parameters = array_merge($this->defaultParameters, array(
+        return $this->connections->create([
             'host' => substr($connectionID, 0, $separator),
             'port' => substr($connectionID, $separator + 1),
-        ));
-
-        $connection = $this->connections->create($parameters);
-
-        return $connection;
+        ]);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function getConnection(CommandInterface $command)
+    public function getConnectionByCommand(CommandInterface $command)
     {
         $slot = $this->strategy->getSlot($command);
 
@@ -313,14 +368,13 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      *
      * @param int $slot Slot index.
      *
-     * @throws \OutOfBoundsException
-     *
      * @return NodeConnectionInterface
+     * @throws OutOfBoundsException
      */
     public function getConnectionBySlot($slot)
     {
-        if ($slot < 0x0000 || $slot > 0x3FFF) {
-            throw new \OutOfBoundsException("Invalid slot [$slot].");
+        if (!SlotMap::isValid($slot)) {
+            throw new OutOfBoundsException("Invalid slot [$slot].");
         }
 
         if (isset($this->slots[$slot])) {
@@ -342,9 +396,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function getConnectionById($connectionID)
     {
-        if (isset($this->pool[$connectionID])) {
-            return $this->pool[$connectionID];
-        }
+        return $this->pool[$connectionID] ?? null;
     }
 
     /**
@@ -354,9 +406,11 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     protected function getRandomConnection()
     {
-        if ($this->pool) {
-            return $this->pool[array_rand($this->pool)];
+        if (!$this->pool) {
+            return null;
         }
+
+        return $this->pool[array_rand($this->pool)];
     }
 
     /**
@@ -370,6 +424,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     {
         $this->pool[(string) $connection] = $connection;
         $this->slots[(int) $slot] = $connection;
+        $this->slotmap[(int) $slot] = $connection;
     }
 
     /**
@@ -407,20 +462,19 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     protected function onMovedResponse(CommandInterface $command, $details)
     {
-        list($slot, $connectionID) = explode(' ', $details, 2);
+        [$slot, $connectionID] = explode(' ', $details, 2);
 
         if (!$connection = $this->getConnectionById($connectionID)) {
             $connection = $this->createConnection($connectionID);
         }
 
         if ($this->useClusterSlots) {
-            $this->askSlotsMap($connection);
+            $this->askSlotMap($connection);
         }
 
         $this->move($connection, $slot);
-        $response = $this->executeCommand($command);
 
-        return $response;
+        return $this->executeCommand($command);
     }
 
     /**
@@ -434,14 +488,73 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     protected function onAskResponse(CommandInterface $command, $details)
     {
-        list($slot, $connectionID) = explode(' ', $details, 2);
+        [$slot, $connectionID] = explode(' ', $details, 2);
 
         if (!$connection = $this->getConnectionById($connectionID)) {
             $connection = $this->createConnection($connectionID);
         }
 
         $connection->executeCommand(RawCommand::create('ASKING'));
-        $response = $connection->executeCommand($command);
+
+        return $connection->executeCommand($command);
+    }
+
+    /**
+     * Ensures that a command is executed one more time on connection failure.
+     *
+     * The connection to the node that generated the error is evicted from the
+     * pool before trying to fetch an updated slots map from another node. If
+     * the new slots map points to an unreachable server the client gives up and
+     * throws the exception as the nodes participating in the cluster may still
+     * have to agree that something changed in the configuration of the cluster.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $method  Actual method.
+     *
+     * @return mixed
+     */
+    private function retryCommandOnFailure(CommandInterface $command, $method)
+    {
+        $retries = 0;
+        $retryAfter = $this->retryInterval;
+
+        while ($retries <= $this->retryLimit) {
+            try {
+                $response = $this->getConnectionByCommand($command)->$method($command);
+
+                if ($response instanceof ErrorResponse) {
+                    $message = $response->getMessage();
+
+                    if (strpos($message, 'CLUSTERDOWN') !== false) {
+                        throw new ServerException($message);
+                    }
+                }
+
+                break;
+            } catch (Throwable $exception) {
+                usleep($retryAfter * 1000);
+                $retryAfter = $retryAfter * 2;
+
+                if ($exception instanceof ConnectionException) {
+                    $connection = $exception->getConnection();
+
+                    if ($connection) {
+                        $connection->disconnect();
+                        $this->remove($connection);
+                    }
+                }
+
+                if ($retries === $this->retryLimit) {
+                    throw $exception;
+                }
+
+                if ($this->useClusterSlots) {
+                    $this->askSlotMap();
+                }
+
+                ++$retries;
+            }
+        }
 
         return $response;
     }
@@ -451,7 +564,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function writeRequest(CommandInterface $command)
     {
-        $this->getConnection($command)->writeRequest($command);
+        $this->retryCommandOnFailure($command, __FUNCTION__);
     }
 
     /**
@@ -459,7 +572,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function readResponse(CommandInterface $command)
     {
-        return $this->getConnection($command)->readResponse($command);
+        return $this->retryCommandOnFailure($command, __FUNCTION__);
     }
 
     /**
@@ -467,8 +580,7 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
      */
     public function executeCommand(CommandInterface $command)
     {
-        $connection = $this->getConnection($command);
-        $response = $connection->executeCommand($command);
+        $response = $this->retryCommandOnFailure($command, __FUNCTION__);
 
         if ($response instanceof ErrorResponseInterface) {
             return $this->onErrorResponse($command, $response);
@@ -478,19 +590,45 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     }
 
     /**
-     * {@inheritdoc}
+     * @return int
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return count($this->pool);
     }
 
     /**
-     * {@inheritdoc}
+     * @return Traversable<string, NodeConnectionInterface>
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
-        return new \ArrayIterator(array_values($this->pool));
+        if ($this->slotmap->isEmpty()) {
+            $this->useClusterSlots ? $this->askSlotMap() : $this->buildSlotMap();
+        }
+
+        $connections = [];
+
+        foreach ($this->slotmap->getNodes() as $node) {
+            if (!$connection = $this->getConnectionById($node)) {
+                $this->add($connection = $this->createConnection($node));
+            }
+
+            $connections[] = $connection;
+        }
+
+        return new ArrayIterator($connections);
+    }
+
+    /**
+     * Returns the underlying slot map.
+     *
+     * @return SlotMap
+     */
+    public function getSlotMap()
+    {
+        return $this->slotmap;
     }
 
     /**
@@ -517,13 +655,13 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
 
     /**
      * Enables automatic fetching of the current slots map from one of the nodes
-     * using the CLUSTER SLOTS command. This option is disabled by default but
+     * using the CLUSTER SLOTS command. This option is enabled by default as
      * asking the current slots map to Redis upon -MOVED responses may reduce
      * overhead by eliminating the trial-and-error nature of the node guessing
      * procedure, mostly when targeting many keys that would end up in a lot of
      * redirections.
      *
-     * The slots map can still be manually fetched using the askSlotsMap()
+     * The slots map can still be manually fetched using the askSlotMap()
      * method whether or not this option is enabled.
      *
      * @param bool $value Enable or disable the use of CLUSTER SLOTS.
@@ -532,22 +670,4 @@ class RedisCluster implements ClusterInterface, \IteratorAggregate, \Countable
     {
         $this->useClusterSlots = (bool) $value;
     }
-
-    /**
-     * Sets a default array of connection parameters to be applied when creating
-     * new connection instances on the fly when they are not part of the initial
-     * pool supplied upon cluster initialization.
-     *
-     * These parameters are not applied to connections added to the pool using
-     * the add() method.
-     *
-     * @param array $parameters Array of connection parameters.
-     */
-    public function setDefaultParameters(array $parameters)
-    {
-        $this->defaultParameters = array_merge(
-            $this->defaultParameters,
-            $parameters ?: array()
-        );
-    }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeConnectionInterface.php b/plugins/cache-redis/Predis/Connection/CompositeConnectionInterface.php
similarity index 83%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeConnectionInterface.php
rename to plugins/cache-redis/Predis/Connection/CompositeConnectionInterface.php
index 286e082cc..22b8c5f77 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeConnectionInterface.php
+++ b/plugins/cache-redis/Predis/Connection/CompositeConnectionInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis\Connection;
 /**
  * Defines a connection to communicate with a single Redis server that leverages
  * an external protocol processor to handle pluggable protocol handlers.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface CompositeConnectionInterface extends NodeConnectionInterface
 {
@@ -34,7 +33,7 @@ interface CompositeConnectionInterface extends NodeConnectionInterface
     /**
      * Reads the given number of bytes from the connection.
      *
-     * @param int $length Number of bytes to read from the connection.
+     * @param int $length Number of bytes to read from the connection.
      *
      * @return string
      */
@@ -43,7 +42,7 @@ interface CompositeConnectionInterface extends NodeConnectionInterface
     /**
      * Reads a line from the connection.
      *
-     * @param string
+     * @return string
      */
     public function readLine();
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeStreamConnection.php b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
similarity index 91%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeStreamConnection.php
rename to plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
index 7a3534054..ad69cbc12 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/CompositeStreamConnection.php
+++ b/plugins/cache-redis/Predis/Connection/CompositeStreamConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +12,7 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Protocol\ProtocolProcessorInterface;
 use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
@@ -18,8 +20,6 @@ use Predis\Protocol\Text\ProtocolProcessor as TextProtocolProcessor;
 /**
  * Connection abstraction to Redis servers based on PHP's stream that uses an
  * external protocol processor defining the protocol used for the communication.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class CompositeStreamConnection extends StreamConnection implements CompositeConnectionInterface
 {
@@ -59,7 +59,7 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
     public function readBuffer($length)
     {
         if ($length <= 0) {
-            throw new \InvalidArgumentException('Length parameter must be greater than 0.');
+            throw new InvalidArgumentException('Length parameter must be greater than 0.');
         }
 
         $value = '';
@@ -120,6 +120,6 @@ class CompositeStreamConnection extends StreamConnection implements CompositeCon
      */
     public function __sleep()
     {
-        return array_merge(parent::__sleep(), array('protocol'));
+        return array_merge(parent::__sleep(), ['protocol']);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionException.php b/plugins/cache-redis/Predis/Connection/ConnectionException.php
similarity index 78%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionException.php
rename to plugins/cache-redis/Predis/Connection/ConnectionException.php
index ef2e9d73a..77e7a15a0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionException.php
+++ b/plugins/cache-redis/Predis/Connection/ConnectionException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\CommunicationException;
 
 /**
  * Exception class that identifies connection-related errors.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ConnectionException extends CommunicationException
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionInterface.php b/plugins/cache-redis/Predis/Connection/ConnectionInterface.php
similarity index 93%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionInterface.php
rename to plugins/cache-redis/Predis/Connection/ConnectionInterface.php
index 11ace1b69..fc2014612 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ConnectionInterface.php
+++ b/plugins/cache-redis/Predis/Connection/ConnectionInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,8 +17,6 @@ use Predis\Command\CommandInterface;
 /**
  * Defines a connection object used to communicate with one or multiple
  * Redis servers.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ConnectionInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Factory.php b/plugins/cache-redis/Predis/Connection/Factory.php
similarity index 58%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Factory.php
rename to plugins/cache-redis/Predis/Connection/Factory.php
index c2e93f880..86b18c4a0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Factory.php
+++ b/plugins/cache-redis/Predis/Connection/Factory.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,21 +12,27 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
+use Predis\Client;
 use Predis\Command\RawCommand;
+use ReflectionClass;
+use UnexpectedValueException;
 
 /**
  * Standard connection factory for creating connections to Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Factory implements FactoryInterface
 {
-    protected $schemes = array(
+    private $defaults = [];
+
+    protected $schemes = [
         'tcp' => 'Predis\Connection\StreamConnection',
         'unix' => 'Predis\Connection\StreamConnection',
+        'tls' => 'Predis\Connection\StreamConnection',
         'redis' => 'Predis\Connection\StreamConnection',
+        'rediss' => 'Predis\Connection\StreamConnection',
         'http' => 'Predis\Connection\WebdisConnection',
-    );
+    ];
 
     /**
      * Checks if the provided argument represents a valid connection class
@@ -34,9 +41,8 @@ class Factory implements FactoryInterface
      *
      * @param mixed $initializer FQN of a connection class or a callable for lazy initialization.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return mixed
+     * @throws InvalidArgumentException
      */
     protected function checkInitializer($initializer)
     {
@@ -44,10 +50,10 @@ class Factory implements FactoryInterface
             return $initializer;
         }
 
-        $class = new \ReflectionClass($initializer);
+        $class = new ReflectionClass($initializer);
 
         if (!$class->isSubclassOf('Predis\Connection\NodeConnectionInterface')) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'A connection initializer must be a valid connection class or a callable object.'
             );
         }
@@ -83,7 +89,7 @@ class Factory implements FactoryInterface
         $scheme = $parameters->scheme;
 
         if (!isset($this->schemes[$scheme])) {
-            throw new \InvalidArgumentException("Unknown connection scheme: '$scheme'.");
+            throw new InvalidArgumentException("Unknown connection scheme: '$scheme'.");
         }
 
         $initializer = $this->schemes[$scheme];
@@ -96,8 +102,8 @@ class Factory implements FactoryInterface
         }
 
         if (!$connection instanceof NodeConnectionInterface) {
-            throw new \UnexpectedValueException(
-                'Objects returned by connection initializers must implement '.
+            throw new UnexpectedValueException(
+                'Objects returned by connection initializers must implement ' .
                 "'Predis\Connection\NodeConnectionInterface'."
             );
         }
@@ -106,13 +112,26 @@ class Factory implements FactoryInterface
     }
 
     /**
-     * {@inheritdoc}
+     * Assigns a default set of parameters applied to new connections.
+     *
+     * The set of parameters passed to create a new connection have precedence
+     * over the default values set for the connection factory.
+     *
+     * @param array $parameters Set of connection parameters.
      */
-    public function aggregate(AggregateConnectionInterface $connection, array $parameters)
+    public function setDefaultParameters(array $parameters)
     {
-        foreach ($parameters as $node) {
-            $connection->add($node instanceof NodeConnectionInterface ? $node : $this->create($node));
-        }
+        $this->defaults = $parameters;
+    }
+
+    /**
+     * Returns the default set of parameters applied to new connections.
+     *
+     * @return array
+     */
+    public function getDefaultParameters()
+    {
+        return $this->defaults;
     }
 
     /**
@@ -124,7 +143,17 @@ class Factory implements FactoryInterface
      */
     protected function createParameters($parameters)
     {
-        return Parameters::create($parameters);
+        if (is_string($parameters)) {
+            $parameters = Parameters::parse($parameters);
+        } else {
+            $parameters = $parameters ?: [];
+        }
+
+        if ($this->defaults) {
+            $parameters += $this->defaults;
+        }
+
+        return new Parameters($parameters);
     }
 
     /**
@@ -136,15 +165,29 @@ class Factory implements FactoryInterface
     {
         $parameters = $connection->getParameters();
 
-        if (isset($parameters->password)) {
+        if (isset($parameters->password) && strlen($parameters->password)) {
+            $cmdAuthArgs = isset($parameters->username) && strlen($parameters->username)
+                ? [$parameters->username, $parameters->password]
+                : [$parameters->password];
+
             $connection->addConnectCommand(
-                new RawCommand(array('AUTH', $parameters->password))
+                new RawCommand('AUTH', $cmdAuthArgs)
             );
         }
 
-        if (isset($parameters->database)) {
+        if ($parameters->client_info ?? false && !$connection instanceof RelayConnection) {
             $connection->addConnectCommand(
-                new RawCommand(array('SELECT', $parameters->database))
+                new RawCommand('CLIENT', ['SETINFO', 'LIB-NAME', 'predis'])
+            );
+
+            $connection->addConnectCommand(
+                new RawCommand('CLIENT', ['SETINFO', 'LIB-VER', Client::VERSION])
+            );
+        }
+
+        if (isset($parameters->database) && strlen($parameters->database)) {
+            $connection->addConnectCommand(
+                new RawCommand('SELECT', [$parameters->database])
             );
         }
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/FactoryInterface.php b/plugins/cache-redis/Predis/Connection/FactoryInterface.php
similarity index 69%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/FactoryInterface.php
rename to plugins/cache-redis/Predis/Connection/FactoryInterface.php
index 2bae0839e..24dc782a8 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/FactoryInterface.php
+++ b/plugins/cache-redis/Predis/Connection/FactoryInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis\Connection;
 
 /**
  * Interface for classes providing a factory of connections to Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface FactoryInterface
 {
@@ -41,12 +40,4 @@ interface FactoryInterface
      * @return NodeConnectionInterface
      */
     public function create($parameters);
-
-    /**
-     * Aggregates single connections into an aggregate connection instance.
-     *
-     * @param AggregateConnectionInterface $aggregate  Aggregate connection instance.
-     * @param array                        $parameters List of parameters for each connection.
-     */
-    public function aggregate(AggregateConnectionInterface $aggregate, array $parameters);
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/NodeConnectionInterface.php b/plugins/cache-redis/Predis/Connection/NodeConnectionInterface.php
similarity index 92%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/NodeConnectionInterface.php
rename to plugins/cache-redis/Predis/Connection/NodeConnectionInterface.php
index 665b862c1..713331776 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/NodeConnectionInterface.php
+++ b/plugins/cache-redis/Predis/Connection/NodeConnectionInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\Command\CommandInterface;
 
 /**
  * Defines a connection used to communicate with a single Redis node.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface NodeConnectionInterface extends ConnectionInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Parameters.php b/plugins/cache-redis/Predis/Connection/Parameters.php
similarity index 62%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Parameters.php
rename to plugins/cache-redis/Predis/Connection/Parameters.php
index b7d986153..170d7e28e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Parameters.php
+++ b/plugins/cache-redis/Predis/Connection/Parameters.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,40 +12,49 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
+
 /**
  * Container for connection parameters used to initialize connections to Redis.
  *
  * {@inheritdoc}
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Parameters implements ParametersInterface
 {
-    private $parameters;
-
-    private static $defaults = array(
+    protected static $defaults = [
         'scheme' => 'tcp',
         'host' => '127.0.0.1',
         'port' => 6379,
-        'timeout' => 5.0,
-    );
+    ];
+
+    /**
+     * Set of connection parameters already filtered
+     * for NULL or 0-length string values.
+     *
+     * @var array
+     */
+    protected $parameters;
 
     /**
      * @param array $parameters Named array of connection parameters.
      */
-    public function __construct(array $parameters = array())
+    public function __construct(array $parameters = [])
     {
-        $this->parameters = $this->filter($parameters) + $this->getDefaults();
+        $this->parameters = $this->filter($parameters + static::$defaults);
     }
 
     /**
-     * Returns some default parameters with their values.
+     * Filters parameters removing entries with NULL or 0-length string values.
+     *
+     * @params array $parameters Array of parameters to be filtered
      *
      * @return array
      */
-    protected function getDefaults()
+    protected function filter(array $parameters)
     {
-        return self::$defaults;
+        return array_filter($parameters, function ($value) {
+            return $value !== null && $value !== '';
+        });
     }
 
     /**
@@ -61,7 +71,7 @@ class Parameters implements ParametersInterface
             $parameters = static::parse($parameters);
         }
 
-        return new static($parameters ?: array());
+        return new static($parameters ?: []);
     }
 
     /**
@@ -73,24 +83,24 @@ class Parameters implements ParametersInterface
      * database number in the "path" part these values override the values of
      * "password" and "database" if they are present in the "query" part.
      *
-     * @link http://www.iana.org/assignments/uri-schemes/prov/redis
-     * @link http://www.iana.org/assignments/uri-schemes/prov/redis
+     * @see http://www.iana.org/assignments/uri-schemes/prov/redis
+     * @see http://www.iana.org/assignments/uri-schemes/prov/rediss
      *
      * @param string $uri URI string.
      *
-     * @throws \InvalidArgumentException
-     *
      * @return array
+     * @throws InvalidArgumentException
      */
     public static function parse($uri)
     {
-        if (stripos($uri, 'unix') === 0) {
-            // Hack to support URIs for UNIX sockets with minimal effort.
-            $uri = str_ireplace('unix:///', 'unix://localhost/', $uri);
+        if (stripos($uri, 'unix://') === 0) {
+            // parse_url() can parse unix:/path/to/sock so we do not need the
+            // unix:///path/to/sock hack, we will support it anyway until 2.0.
+            $uri = str_ireplace('unix://', 'unix:', $uri);
         }
 
         if (!$parsed = parse_url($uri)) {
-            throw new \InvalidArgumentException("Invalid parameters URI: $uri");
+            throw new InvalidArgumentException("Invalid parameters URI: $uri");
         }
 
         if (
@@ -109,8 +119,17 @@ class Parameters implements ParametersInterface
         }
 
         if (stripos($uri, 'redis') === 0) {
+            if (isset($parsed['user'])) {
+                if (strlen($parsed['user'])) {
+                    $parsed['username'] = $parsed['user'];
+                }
+                unset($parsed['user']);
+            }
+
             if (isset($parsed['pass'])) {
-                $parsed['password'] = $parsed['pass'];
+                if (strlen($parsed['pass'])) {
+                    $parsed['password'] = $parsed['pass'];
+                }
                 unset($parsed['pass']);
             }
 
@@ -129,15 +148,11 @@ class Parameters implements ParametersInterface
     }
 
     /**
-     * Validates and converts each value of the connection parameters array.
-     *
-     * @param array $parameters Connection parameters.
-     *
-     * @return array
+     * {@inheritdoc}
      */
-    protected function filter(array $parameters)
+    public function toArray()
     {
-        return $parameters ?: array();
+        return $this->parameters;
     }
 
     /**
@@ -161,9 +176,17 @@ class Parameters implements ParametersInterface
     /**
      * {@inheritdoc}
      */
-    public function toArray()
+    public function __toString()
     {
-        return $this->parameters;
+        if ($this->scheme === 'unix') {
+            return "$this->scheme:$this->path";
+        }
+
+        if (filter_var($this->host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+            return "$this->scheme://[$this->host]:$this->port";
+        }
+
+        return "$this->scheme://$this->host:$this->port";
     }
 
     /**
@@ -171,6 +194,6 @@ class Parameters implements ParametersInterface
      */
     public function __sleep()
     {
-        return array('parameters');
+        return ['parameters'];
     }
 }
diff --git a/plugins/cache-redis/Predis/Connection/ParametersInterface.php b/plugins/cache-redis/Predis/Connection/ParametersInterface.php
new file mode 100644
index 000000000..7893ea117
--- /dev/null
+++ b/plugins/cache-redis/Predis/Connection/ParametersInterface.php
@@ -0,0 +1,72 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Connection;
+
+/**
+ * Interface defining a container for connection parameters.
+ *
+ * The actual list of connection parameters depends on the features supported by
+ * each connection backend class (please refer to their specific documentation),
+ * but the most common parameters used through the library are:
+ *
+ * @property string $scheme             Connection scheme, such as 'tcp' or 'unix'.
+ * @property string $host               IP address or hostname of Redis.
+ * @property int    $port               TCP port on which Redis is listening to.
+ * @property string $path               Path of a UNIX domain socket file.
+ * @property string $alias              Alias for the connection.
+ * @property float  $timeout            Timeout for the connect() operation.
+ * @property float  $read_write_timeout Timeout for read() and write() operations.
+ * @property bool   $persistent         Leaves the connection open after a GC collection.
+ * @property string $password           Password to access Redis (see the AUTH command).
+ * @property string $database           Database index (see the SELECT command).
+ * @property bool   $async_connect      Performs the connect() operation asynchronously.
+ * @property bool   $tcp_nodelay        Toggles the Nagle's algorithm for coalescing.
+ * @property bool   $client_info        Whether to set LIB-NAME and LIB-VER when connecting.
+ * @property bool   $cache              (Relay only) Whether to use in-memory caching.
+ * @property string $serializer         (Relay only) Serializer used for data serialization.
+ * @property string $compression        (Relay only) Algorithm used for data compression.
+ */
+interface ParametersInterface
+{
+    /**
+     * Checks if the specified parameters is set.
+     *
+     * @param string $parameter Name of the parameter.
+     *
+     * @return bool
+     */
+    public function __isset($parameter);
+
+    /**
+     * Returns the value of the specified parameter.
+     *
+     * @param string $parameter Name of the parameter.
+     *
+     * @return mixed|null
+     */
+    public function __get($parameter);
+
+    /**
+     * Returns basic connection parameters as a valid URI string.
+     *
+     * @return string
+     */
+    public function __toString();
+
+    /**
+     * Returns an array representation of the connection parameters.
+     *
+     * @return array
+     */
+    public function toArray();
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisSocketConnection.php b/plugins/cache-redis/Predis/Connection/PhpiredisSocketConnection.php
similarity index 85%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisSocketConnection.php
rename to plugins/cache-redis/Predis/Connection/PhpiredisSocketConnection.php
index 6948f035f..6ff1f77be 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisSocketConnection.php
+++ b/plugins/cache-redis/Predis/Connection/PhpiredisSocketConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,9 +12,12 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
+use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\Status as StatusResponse;
 
 /**
@@ -36,12 +40,11 @@ use Predis\Response\Status as StatusResponse;
  *  - host: hostname or IP address of the server.
  *  - port: TCP port of the server.
  *  - path: path of a UNIX domain socket when scheme is 'unix'.
- *  - timeout: timeout to perform the connection.
+ *  - timeout: timeout to perform the connection (default is 5 seconds).
  *  - read_write_timeout: timeout of read / write operations.
  *
- * @link http://github.com/nrk/phpiredis
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://github.com/nrk/phpiredis
+ * @deprecated 2.1.2
  */
 class PhpiredisSocketConnection extends AbstractConnection
 {
@@ -65,9 +68,9 @@ class PhpiredisSocketConnection extends AbstractConnection
      */
     public function __destruct()
     {
-        phpiredis_reader_destroy($this->reader);
-
         parent::__destruct();
+
+        phpiredis_reader_destroy($this->reader);
     }
 
     /**
@@ -93,7 +96,15 @@ class PhpiredisSocketConnection extends AbstractConnection
      */
     protected function assertParameters(ParametersInterface $parameters)
     {
-        parent::assertParameters($parameters);
+        switch ($parameters->scheme) {
+            case 'tcp':
+            case 'redis':
+            case 'unix':
+                break;
+
+            default:
+                throw new InvalidArgumentException("Invalid scheme: '$parameters->scheme'.");
+        }
 
         if (isset($parameters->persistent)) {
             throw new NotSupportedException(
@@ -132,25 +143,37 @@ class PhpiredisSocketConnection extends AbstractConnection
     /**
      * Returns the handler used by the protocol reader for inline responses.
      *
-     * @return \Closure
+     * @return Closure
      */
-    private function getStatusHandler()
+    protected function getStatusHandler()
     {
-        return function ($payload) {
-            return StatusResponse::get($payload);
-        };
+        static $statusHandler;
+
+        if (!$statusHandler) {
+            $statusHandler = function ($payload) {
+                return StatusResponse::get($payload);
+            };
+        }
+
+        return $statusHandler;
     }
 
     /**
      * Returns the handler used by the protocol reader for error responses.
      *
-     * @return \Closure
+     * @return Closure
      */
     protected function getErrorHandler()
     {
-        return function ($payload) {
-            return new ErrorResponse($payload);
-        };
+        static $errorHandler;
+
+        if (!$errorHandler) {
+            $errorHandler = function ($errorMessage) {
+                return new ErrorResponse($errorMessage);
+            };
+        }
+
+        return $errorHandler;
     }
 
     /**
@@ -206,9 +229,7 @@ class PhpiredisSocketConnection extends AbstractConnection
             $protocol = SOL_TCP;
         }
 
-        $socket = @socket_create($domain, SOCK_STREAM, $protocol);
-
-        if (!is_resource($socket)) {
+        if (false === $socket = @socket_create($domain, SOCK_STREAM, $protocol)) {
             $this->emitSocketError();
         }
 
@@ -241,10 +262,10 @@ class PhpiredisSocketConnection extends AbstractConnection
             $timeoutSec = floor($rwtimeout);
             $timeoutUsec = ($rwtimeout - $timeoutSec) * 1000000;
 
-            $timeout = array(
+            $timeout = [
                 'sec' => $timeoutSec,
                 'usec' => $timeoutUsec,
-            );
+            ];
 
             if (!socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, $timeout)) {
                 $this->emitSocketError();
@@ -263,7 +284,7 @@ class PhpiredisSocketConnection extends AbstractConnection
      * @param string              $address    IP address (DNS-resolved from hostname)
      * @param ParametersInterface $parameters Parameters used to initialize the connection.
      *
-     * @return string
+     * @return void
      */
     private function connectWithTimeout($socket, $address, ParametersInterface $parameters)
     {
@@ -280,9 +301,9 @@ class PhpiredisSocketConnection extends AbstractConnection
         socket_set_block($socket);
 
         $null = null;
-        $selectable = array($socket);
+        $selectable = [$socket];
 
-        $timeout = (float) $parameters->timeout;
+        $timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0);
         $timeoutSecs = floor($timeout);
         $timeoutUSecs = ($timeout - $timeoutSecs) * 1000000;
 
@@ -308,7 +329,11 @@ class PhpiredisSocketConnection extends AbstractConnection
     {
         if (parent::connect() && $this->initCommands) {
             foreach ($this->initCommands as $command) {
-                $this->executeCommand($command);
+                $response = $this->executeCommand($command);
+
+                if ($response instanceof ErrorResponseInterface) {
+                    $this->onConnectionError("`{$command->getId()}` failed: {$response->getMessage()}", 0);
+                }
             }
         }
     }
@@ -319,7 +344,9 @@ class PhpiredisSocketConnection extends AbstractConnection
     public function disconnect()
     {
         if ($this->isConnected()) {
+            phpiredis_reader_reset($this->reader);
             socket_close($this->getResource());
+
             parent::disconnect();
         }
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisStreamConnection.php b/plugins/cache-redis/Predis/Connection/PhpiredisStreamConnection.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisStreamConnection.php
rename to plugins/cache-redis/Predis/Connection/PhpiredisStreamConnection.php
index beb235758..e3dbfd8ad 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/PhpiredisStreamConnection.php
+++ b/plugins/cache-redis/Predis/Connection/PhpiredisStreamConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +12,8 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Response\Error as ErrorResponse;
@@ -42,9 +45,8 @@ use Predis\Response\Status as StatusResponse;
  *  - tcp_nodelay: enables or disables Nagle's algorithm for coalescing.
  *  - persistent: the connection is left intact after a GC collection.
  *
- * @link https://github.com/nrk/phpiredis
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see https://github.com/nrk/phpiredis
+ * @deprecated 2.1.2
  */
 class PhpiredisStreamConnection extends StreamConnection
 {
@@ -67,9 +69,19 @@ class PhpiredisStreamConnection extends StreamConnection
      */
     public function __destruct()
     {
-        phpiredis_reader_destroy($this->reader);
-
         parent::__destruct();
+
+        phpiredis_reader_destroy($this->reader);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disconnect()
+    {
+        phpiredis_reader_reset($this->reader);
+
+        parent::disconnect();
     }
 
     /**
@@ -87,24 +99,34 @@ class PhpiredisStreamConnection extends StreamConnection
     /**
      * {@inheritdoc}
      */
-    protected function tcpStreamInitializer(ParametersInterface $parameters)
+    protected function assertParameters(ParametersInterface $parameters)
+    {
+        switch ($parameters->scheme) {
+            case 'tcp':
+            case 'redis':
+            case 'unix':
+                break;
+
+            case 'tls':
+            case 'rediss':
+                throw new InvalidArgumentException('SSL encryption is not supported by this connection backend.');
+            default:
+                throw new InvalidArgumentException("Invalid scheme: '$parameters->scheme'.");
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createStreamSocket(ParametersInterface $parameters, $address, $flags)
     {
-        $uri = "tcp://[{$parameters->host}]:{$parameters->port}";
-        $flags = STREAM_CLIENT_CONNECT;
         $socket = null;
+        $timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0);
+        $context = stream_context_create(['socket' => ['tcp_nodelay' => (bool) $parameters->tcp_nodelay]]);
 
-        if (isset($parameters->async_connect) && (bool) $parameters->async_connect) {
-            $flags |= STREAM_CLIENT_ASYNC_CONNECT;
-        }
-
-        if (isset($parameters->persistent) && (bool) $parameters->persistent) {
-            $flags |= STREAM_CLIENT_PERSISTENT;
-            $uri .= strpos($path = $parameters->path, '/') === 0 ? $path : "/$path";
-        }
-
-        $resource = @stream_socket_client($uri, $errno, $errstr, (float) $parameters->timeout, $flags);
-
-        if (!$resource) {
+        if (!$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags, $context)) {
             $this->onConnectionError(trim($errstr), $errno);
         }
 
@@ -112,10 +134,10 @@ class PhpiredisStreamConnection extends StreamConnection
             $rwtimeout = (float) $parameters->read_write_timeout;
             $rwtimeout = $rwtimeout > 0 ? $rwtimeout : -1;
 
-            $timeout = array(
+            $timeout = [
                 'sec' => $timeoutSeconds = floor($rwtimeout),
                 'usec' => ($rwtimeout - $timeoutSeconds) * 1000000,
-            );
+            ];
 
             $socket = $socket ?: socket_import_stream($resource);
             @socket_set_option($socket, SOL_SOCKET, SO_SNDTIMEO, $timeout);
@@ -158,25 +180,37 @@ class PhpiredisStreamConnection extends StreamConnection
     /**
      * Returns the handler used by the protocol reader for inline responses.
      *
-     * @return \Closure
+     * @return Closure
      */
     protected function getStatusHandler()
     {
-        return function ($payload) {
-            return StatusResponse::get($payload);
-        };
+        static $statusHandler;
+
+        if (!$statusHandler) {
+            $statusHandler = function ($payload) {
+                return StatusResponse::get($payload);
+            };
+        }
+
+        return $statusHandler;
     }
 
     /**
      * Returns the handler used by the protocol reader for error responses.
      *
-     * @return \Closure
+     * @return Closure
      */
     protected function getErrorHandler()
     {
-        return function ($errorMessage) {
-            return new ErrorResponse($errorMessage);
-        };
+        static $errorHandler;
+
+        if (!$errorHandler) {
+            $errorHandler = function ($errorMessage) {
+                return new ErrorResponse($errorMessage);
+            };
+        }
+
+        return $errorHandler;
     }
 
     /**
diff --git a/plugins/cache-redis/Predis/Connection/RelayConnection.php b/plugins/cache-redis/Predis/Connection/RelayConnection.php
new file mode 100644
index 000000000..4ff674f5f
--- /dev/null
+++ b/plugins/cache-redis/Predis/Connection/RelayConnection.php
@@ -0,0 +1,337 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Connection;
+
+use InvalidArgumentException;
+use Predis\ClientException;
+use Predis\Command\CommandInterface;
+use Predis\NotSupportedException;
+use Predis\Response\ServerException;
+use Relay\Exception as RelayException;
+use Relay\Relay;
+
+/**
+ * This class provides the implementation of a Predis connection that
+ * uses Relay for network communication and in-memory caching.
+ *
+ * Using Relay allows for:
+ * 1) significantly faster reads thanks to in-memory caching
+ * 2) fast data serialization using igbinary
+ * 3) fast data compression using lzf, lz4 or zstd
+ *
+ * Usage of igbinary serialization and zstd compresses reduces
+ * network traffic and Redis memory usage by ~75%.
+ *
+ * For instructions on how to install the Relay extension, please consult
+ * the repository of the project: https://relay.so/docs/installation
+ *
+ * The connection parameters supported by this class are:
+ *
+ *  - scheme: it can be either 'tcp', 'tls' or 'unix'.
+ *  - host: hostname or IP address of the server.
+ *  - port: TCP port of the server.
+ *  - path: path of a UNIX domain socket when scheme is 'unix'.
+ *  - timeout: timeout to perform the connection.
+ *  - read_write_timeout: timeout of read / write operations.
+ *  - cache: whether to use in-memory caching
+ *  - serializer: data serializer
+ *  - compression: data compression algorithm
+ *
+ * @see https://github.com/cachewerk/relay
+ */
+class RelayConnection extends StreamConnection
+{
+    use RelayMethods;
+
+    /**
+     * The Relay instance.
+     *
+     * @var \Relay\Relay
+     */
+    protected $client;
+
+    /**
+     * These commands must be called on the client, not using `Relay::rawCommand()`.
+     *
+     * @var string[]
+     */
+    public $atypicalCommands = [
+        'AUTH',
+        'SELECT',
+
+        'TYPE',
+
+        'MULTI',
+        'EXEC',
+        'DISCARD',
+
+        'WATCH',
+        'UNWATCH',
+
+        'SUBSCRIBE',
+        'UNSUBSCRIBE',
+        'PSUBSCRIBE',
+        'PUNSUBSCRIBE',
+        'SSUBSCRIBE',
+        'SUNSUBSCRIBE',
+    ];
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(ParametersInterface $parameters)
+    {
+        $this->assertExtensions();
+
+        $this->parameters = $this->assertParameters($parameters);
+        $this->client = $this->createClient();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isConnected()
+    {
+        return $this->client->isConnected();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disconnect()
+    {
+        if ($this->client->isConnected()) {
+            $this->client->close();
+        }
+    }
+
+    /**
+     * Checks if the Relay extension is loaded in PHP.
+     */
+    private function assertExtensions()
+    {
+        if (!extension_loaded('relay')) {
+            throw new NotSupportedException(
+                'The "relay" extension is required by this connection backend.'
+            );
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function assertParameters(ParametersInterface $parameters)
+    {
+        if (!in_array($parameters->scheme, ['tcp', 'tls', 'unix', 'redis', 'rediss'])) {
+            throw new InvalidArgumentException("Invalid scheme: '{$parameters->scheme}'.");
+        }
+
+        if (!in_array($parameters->serializer, [null, 'php', 'igbinary', 'msgpack', 'json'])) {
+            throw new InvalidArgumentException("Invalid serializer: '{$parameters->serializer}'.");
+        }
+
+        if (!in_array($parameters->compression, [null, 'lzf', 'lz4', 'zstd'])) {
+            throw new InvalidArgumentException("Invalid compression algorithm: '{$parameters->compression}'.");
+        }
+
+        return $parameters;
+    }
+
+    /**
+     * Creates a new instance of the client.
+     *
+     * @return \Relay\Relay
+     */
+    private function createClient()
+    {
+        $client = new Relay();
+
+        // throw when errors occur and return `null` for non-existent keys
+        $client->setOption(Relay::OPT_PHPREDIS_COMPATIBILITY, false);
+
+        // use reply literals
+        $client->setOption(Relay::OPT_REPLY_LITERAL, true);
+
+        // disable Relay's command/connection retry
+        $client->setOption(Relay::OPT_MAX_RETRIES, 0);
+
+        // whether to use in-memory caching
+        $client->setOption(Relay::OPT_USE_CACHE, $this->parameters->cache ?? true);
+
+        // set data serializer
+        $client->setOption(Relay::OPT_SERIALIZER, constant(sprintf(
+            '%s::SERIALIZER_%s',
+            Relay::class,
+            strtoupper($this->parameters->serializer ?? 'none')
+        )));
+
+        // set data compression algorithm
+        $client->setOption(Relay::OPT_COMPRESSION, constant(sprintf(
+            '%s::COMPRESSION_%s',
+            Relay::class,
+            strtoupper($this->parameters->compression ?? 'none')
+        )));
+
+        return $client;
+    }
+
+    /**
+     * Returns the underlying client.
+     *
+     * @return \Relay\Relay
+     */
+    public function getClient()
+    {
+        return $this->client;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function getIdentifier()
+    {
+        return $this->client->endpointId();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    protected function createStreamSocket(ParametersInterface $parameters, $address, $flags)
+    {
+        $timeout = isset($parameters->timeout) ? (float) $parameters->timeout : 5.0;
+
+        $retry_interval = 0;
+        $read_timeout = 5.0;
+
+        if (isset($parameters->read_write_timeout)) {
+            $read_timeout = (float) $parameters->read_write_timeout;
+            $read_timeout = $read_timeout > 0 ? $read_timeout : 0;
+        }
+
+        try {
+            $this->client->connect(
+                $parameters->path ?? $parameters->host,
+                isset($parameters->path) ? 0 : $parameters->port,
+                $timeout,
+                null,
+                $retry_interval,
+                $read_timeout
+            );
+        } catch (RelayException $ex) {
+            $this->onConnectionError($ex->getMessage(), $ex->getCode());
+        }
+
+        return $this->client;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function executeCommand(CommandInterface $command)
+    {
+        if (!$this->client->isConnected()) {
+            $this->getResource();
+        }
+
+        try {
+            $name = $command->getId();
+
+            // When using compression or a serializer, we'll need a dedicated
+            // handler for `Predis\Command\RawCommand` calls, currently both
+            // parameters are unsupported until a future Relay release
+            return in_array($name, $this->atypicalCommands)
+                ? $this->client->{$name}(...$command->getArguments())
+                : $this->client->rawCommand($name, ...$command->getArguments());
+        } catch (RelayException $ex) {
+            throw $this->onCommandError($ex, $command);
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function onCommandError(RelayException $exception, CommandInterface $command)
+    {
+        $code = $exception->getCode();
+        $message = $exception->getMessage();
+
+        if (strpos($message, 'RELAY_ERR_IO')) {
+            return new ConnectionException($this, $message, $code, $exception);
+        }
+
+        if (strpos($message, 'RELAY_ERR_REDIS')) {
+            return new ServerException($message, $code, $exception);
+        }
+
+        if (strpos($message, 'RELAY_ERR_WRONGTYPE') && strpos($message, "Got reply-type 'status'")) {
+            $message = 'Operation against a key holding the wrong kind of value';
+        }
+
+        return new ClientException($message, $code, $exception);
+    }
+
+    /**
+     * Applies the configured serializer and compression to given value.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    public function pack($value)
+    {
+        return $this->client->_pack($value);
+    }
+
+    /**
+     * Deserializes and decompresses to given value.
+     *
+     * @param  mixed  $value
+     * @return string
+     */
+    public function unpack($value)
+    {
+        return $this->client->_unpack($value);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeRequest(CommandInterface $command)
+    {
+        throw new NotSupportedException('The "relay" extension does not support writing requests.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readResponse(CommandInterface $command)
+    {
+        throw new NotSupportedException('The "relay" extension does not support reading responses.');
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __destruct()
+    {
+        $this->disconnect();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __wakeup()
+    {
+        $this->assertExtensions();
+        $this->client = $this->createClient();
+    }
+}
diff --git a/plugins/cache-redis/Predis/Connection/RelayMethods.php b/plugins/cache-redis/Predis/Connection/RelayMethods.php
new file mode 100644
index 000000000..a52c4a035
--- /dev/null
+++ b/plugins/cache-redis/Predis/Connection/RelayMethods.php
@@ -0,0 +1,136 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Connection;
+
+trait RelayMethods
+{
+    /**
+     * Registers a new `flushed` event listener.
+     *
+     * @param  callable $callback
+     * @return bool
+     */
+    public function onFlushed(?callable $callback)
+    {
+        return $this->client->onFlushed($callback);
+    }
+
+    /**
+     * Registers a new `invalidated` event listener.
+     *
+     * @param  callable $callback
+     * @param  string   $pattern
+     * @return bool
+     */
+    public function onInvalidated(?callable $callback, string $pattern = null)
+    {
+        return $this->client->onInvalidated($callback, $pattern);
+    }
+
+    /**
+     * Dispatches all pending events.
+     *
+     * @return int|false
+     */
+    public function dispatchEvents()
+    {
+        return $this->client->dispatchEvents();
+    }
+
+    /**
+     * Adds ignore pattern(s). Matching keys will not be cached in memory.
+     *
+     * @param  string $pattern,...
+     * @return int
+     */
+    public function addIgnorePatterns(string ...$pattern)
+    {
+        return $this->client->addIgnorePatterns(...$pattern);
+    }
+
+    /**
+     * Adds allow pattern(s). Only matching keys will be cached in memory.
+     *
+     * @param  string $pattern,...
+     * @return int
+     */
+    public function addAllowPatterns(string ...$pattern)
+    {
+        return $this->client->addAllowPatterns(...$pattern);
+    }
+
+    /**
+     * Returns the connection's endpoint identifier.
+     *
+     * @return string|false
+     */
+    public function endpointId()
+    {
+        return $this->client->endpointId();
+    }
+
+    /**
+     * Returns a unique representation of the underlying socket connection identifier.
+     *
+     * @return string|false
+     */
+    public function socketId()
+    {
+        return $this->client->socketId();
+    }
+
+    /**
+     * Returns information about the license.
+     *
+     * @return array<string, mixed>
+     */
+    public function license()
+    {
+        return $this->client->license();
+    }
+
+    /**
+     * Returns statistics about Relay.
+     *
+     * @return array<string, array<string, mixed>>
+     */
+    public function stats()
+    {
+        return $this->client->stats();
+    }
+
+    /**
+     * Returns the number of bytes allocated, or `0` in client-only mode.
+     *
+     * @return int
+     */
+    public function maxMemory()
+    {
+        return $this->client->maxMemory();
+    }
+
+    /**
+     * Flushes Relay's in-memory cache of all databases.
+     * When given an endpoint, only that connection will be flushed.
+     * When given an endpoint and database index, only that database
+     * for that connection will be flushed.
+     *
+     * @param  ?string $endpointId
+     * @param  ?int    $db
+     * @return bool
+     */
+    public function flushMemory(string $endpointId = null, int $db = null)
+    {
+        return $this->client->flushMemory($endpointId, $db);
+    }
+}
diff --git a/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
new file mode 100644
index 000000000..9d57a5ac3
--- /dev/null
+++ b/plugins/cache-redis/Predis/Connection/Replication/MasterSlaveReplication.php
@@ -0,0 +1,553 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Connection\Replication;
+
+use InvalidArgumentException;
+use Predis\ClientException;
+use Predis\Command\CommandInterface;
+use Predis\Command\RawCommand;
+use Predis\Connection\ConnectionException;
+use Predis\Connection\FactoryInterface;
+use Predis\Connection\NodeConnectionInterface;
+use Predis\Replication\MissingMasterException;
+use Predis\Replication\ReplicationStrategy;
+use Predis\Response\ErrorInterface as ResponseErrorInterface;
+
+/**
+ * Aggregate connection handling replication of Redis nodes configured in a
+ * single master / multiple slaves setup.
+ */
+class MasterSlaveReplication implements ReplicationInterface
+{
+    /**
+     * @var ReplicationStrategy
+     */
+    protected $strategy;
+
+    /**
+     * @var NodeConnectionInterface
+     */
+    protected $master;
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $slaves = [];
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $pool = [];
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $aliases = [];
+
+    /**
+     * @var NodeConnectionInterface
+     */
+    protected $current;
+
+    /**
+     * @var bool
+     */
+    protected $autoDiscovery = false;
+
+    /**
+     * @var FactoryInterface
+     */
+    protected $connectionFactory;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct(ReplicationStrategy $strategy = null)
+    {
+        $this->strategy = $strategy ?: new ReplicationStrategy();
+    }
+
+    /**
+     * Configures the automatic discovery of the replication configuration on failure.
+     *
+     * @param bool $value Enable or disable auto discovery.
+     */
+    public function setAutoDiscovery($value)
+    {
+        if (!$this->connectionFactory) {
+            throw new ClientException('Automatic discovery requires a connection factory');
+        }
+
+        $this->autoDiscovery = (bool) $value;
+    }
+
+    /**
+     * Sets the connection factory used to create the connections by the auto
+     * discovery procedure.
+     *
+     * @param FactoryInterface $connectionFactory Connection factory instance.
+     */
+    public function setConnectionFactory(FactoryInterface $connectionFactory)
+    {
+        $this->connectionFactory = $connectionFactory;
+    }
+
+    /**
+     * Resets the connection state.
+     */
+    protected function reset()
+    {
+        $this->current = null;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(NodeConnectionInterface $connection)
+    {
+        $parameters = $connection->getParameters();
+
+        if ('master' === $parameters->role) {
+            $this->master = $connection;
+        } else {
+            // everything else is considered a slvave.
+            $this->slaves[] = $connection;
+        }
+
+        if (isset($parameters->alias)) {
+            $this->aliases[$parameters->alias] = $connection;
+        }
+
+        $this->pool[(string) $connection] = $connection;
+
+        $this->reset();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function remove(NodeConnectionInterface $connection)
+    {
+        if ($connection === $this->master) {
+            $this->master = null;
+        } elseif (false !== $id = array_search($connection, $this->slaves, true)) {
+            unset($this->slaves[$id]);
+        } else {
+            return false;
+        }
+
+        unset($this->pool[(string) $connection]);
+
+        if ($this->aliases && $alias = $connection->getParameters()->alias) {
+            unset($this->aliases[$alias]);
+        }
+
+        $this->reset();
+
+        return true;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionByCommand(CommandInterface $command)
+    {
+        if (!$this->current) {
+            if ($this->strategy->isReadOperation($command) && $slave = $this->pickSlave()) {
+                $this->current = $slave;
+            } else {
+                $this->current = $this->getMasterOrDie();
+            }
+
+            return $this->current;
+        }
+
+        if ($this->current === $master = $this->getMasterOrDie()) {
+            return $master;
+        }
+
+        if (!$this->strategy->isReadOperation($command) || !$this->slaves) {
+            $this->current = $master;
+        }
+
+        return $this->current;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionById($id)
+    {
+        return $this->pool[$id] ?? null;
+    }
+
+    /**
+     * Returns a connection instance by its alias.
+     *
+     * @param string $alias Connection alias.
+     *
+     * @return NodeConnectionInterface|null
+     */
+    public function getConnectionByAlias($alias)
+    {
+        return $this->aliases[$alias] ?? null;
+    }
+
+    /**
+     * Returns a connection by its role.
+     *
+     * @param string $role Connection role (`master` or `slave`)
+     *
+     * @return NodeConnectionInterface|null
+     */
+    public function getConnectionByRole($role)
+    {
+        if ($role === 'master') {
+            return $this->getMaster();
+        } elseif ($role === 'slave') {
+            return $this->pickSlave();
+        }
+
+        return null;
+    }
+
+    /**
+     * Switches the internal connection in use by the backend.
+     *
+     * @param NodeConnectionInterface $connection Connection instance in the pool.
+     */
+    public function switchTo(NodeConnectionInterface $connection)
+    {
+        if ($connection && $connection === $this->current) {
+            return;
+        }
+
+        if ($connection !== $this->master && !in_array($connection, $this->slaves, true)) {
+            throw new InvalidArgumentException('Invalid connection or connection not found.');
+        }
+
+        $this->current = $connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function switchToMaster()
+    {
+        if (!$connection = $this->getConnectionByRole('master')) {
+            throw new InvalidArgumentException('Invalid connection or connection not found.');
+        }
+
+        $this->switchTo($connection);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function switchToSlave()
+    {
+        if (!$connection = $this->getConnectionByRole('slave')) {
+            throw new InvalidArgumentException('Invalid connection or connection not found.');
+        }
+
+        $this->switchTo($connection);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCurrent()
+    {
+        return $this->current;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaster()
+    {
+        return $this->master;
+    }
+
+    /**
+     * Returns the connection associated to the master server.
+     *
+     * @return NodeConnectionInterface
+     */
+    private function getMasterOrDie()
+    {
+        if (!$connection = $this->getMaster()) {
+            throw new MissingMasterException('No master server available for replication');
+        }
+
+        return $connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSlaves()
+    {
+        return $this->slaves;
+    }
+
+    /**
+     * Returns the underlying replication strategy.
+     *
+     * @return ReplicationStrategy
+     */
+    public function getReplicationStrategy()
+    {
+        return $this->strategy;
+    }
+
+    /**
+     * Returns a random slave.
+     *
+     * @return NodeConnectionInterface|null
+     */
+    protected function pickSlave()
+    {
+        if (!$this->slaves) {
+            return null;
+        }
+
+        return $this->slaves[array_rand($this->slaves)];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isConnected()
+    {
+        return $this->current ? $this->current->isConnected() : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function connect()
+    {
+        if (!$this->current) {
+            if (!$this->current = $this->pickSlave()) {
+                if (!$this->current = $this->getMaster()) {
+                    throw new ClientException('No available connection for replication');
+                }
+            }
+        }
+
+        $this->current->connect();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disconnect()
+    {
+        foreach ($this->pool as $connection) {
+            $connection->disconnect();
+        }
+    }
+
+    /**
+     * Handles response from INFO.
+     *
+     * @param string $response
+     *
+     * @return array
+     */
+    private function handleInfoResponse($response)
+    {
+        $info = [];
+
+        foreach (preg_split('/\r?\n/', $response) as $row) {
+            if (strpos($row, ':') === false) {
+                continue;
+            }
+
+            [$k, $v] = explode(':', $row, 2);
+            $info[$k] = $v;
+        }
+
+        return $info;
+    }
+
+    /**
+     * Fetches the replication configuration from one of the servers.
+     */
+    public function discover()
+    {
+        if (!$this->connectionFactory) {
+            throw new ClientException('Discovery requires a connection factory');
+        }
+
+        while (true) {
+            try {
+                if ($connection = $this->getMaster()) {
+                    $this->discoverFromMaster($connection, $this->connectionFactory);
+                    break;
+                } elseif ($connection = $this->pickSlave()) {
+                    $this->discoverFromSlave($connection, $this->connectionFactory);
+                    break;
+                } else {
+                    throw new ClientException('No connection available for discovery');
+                }
+            } catch (ConnectionException $exception) {
+                $this->remove($connection);
+            }
+        }
+    }
+
+    /**
+     * Discovers the replication configuration by contacting the master node.
+     *
+     * @param NodeConnectionInterface $connection        Connection to the master node.
+     * @param FactoryInterface        $connectionFactory Connection factory instance.
+     */
+    protected function discoverFromMaster(NodeConnectionInterface $connection, FactoryInterface $connectionFactory)
+    {
+        $response = $connection->executeCommand(RawCommand::create('INFO', 'REPLICATION'));
+        $replication = $this->handleInfoResponse($response);
+
+        if ($replication['role'] !== 'master') {
+            throw new ClientException("Role mismatch (expected master, got slave) [$connection]");
+        }
+
+        $this->slaves = [];
+
+        foreach ($replication as $k => $v) {
+            $parameters = null;
+
+            if (strpos($k, 'slave') === 0 && preg_match('/ip=(?P<host>.*),port=(?P<port>\d+)/', $v, $parameters)) {
+                $slaveConnection = $connectionFactory->create([
+                    'host' => $parameters['host'],
+                    'port' => $parameters['port'],
+                    'role' => 'slave',
+                ]);
+
+                $this->add($slaveConnection);
+            }
+        }
+    }
+
+    /**
+     * Discovers the replication configuration by contacting one of the slaves.
+     *
+     * @param NodeConnectionInterface $connection        Connection to one of the slaves.
+     * @param FactoryInterface        $connectionFactory Connection factory instance.
+     */
+    protected function discoverFromSlave(NodeConnectionInterface $connection, FactoryInterface $connectionFactory)
+    {
+        $response = $connection->executeCommand(RawCommand::create('INFO', 'REPLICATION'));
+        $replication = $this->handleInfoResponse($response);
+
+        if ($replication['role'] !== 'slave') {
+            throw new ClientException("Role mismatch (expected slave, got master) [$connection]");
+        }
+
+        $masterConnection = $connectionFactory->create([
+            'host' => $replication['master_host'],
+            'port' => $replication['master_port'],
+            'role' => 'master',
+        ]);
+
+        $this->add($masterConnection);
+
+        $this->discoverFromMaster($masterConnection, $connectionFactory);
+    }
+
+    /**
+     * Retries the execution of a command upon slave failure.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $method  Actual method.
+     *
+     * @return mixed
+     */
+    private function retryCommandOnFailure(CommandInterface $command, $method)
+    {
+        while (true) {
+            try {
+                $connection = $this->getConnectionByCommand($command);
+                $response = $connection->$method($command);
+
+                if ($response instanceof ResponseErrorInterface && $response->getErrorType() === 'LOADING') {
+                    throw new ConnectionException($connection, "Redis is loading the dataset in memory [$connection]");
+                }
+
+                break;
+            } catch (ConnectionException $exception) {
+                $connection = $exception->getConnection();
+                $connection->disconnect();
+
+                if ($connection === $this->master && !$this->autoDiscovery) {
+                    // Throw immediately when master connection is failing, even
+                    // when the command represents a read-only operation, unless
+                    // automatic discovery has been enabled.
+                    throw $exception;
+                } else {
+                    // Otherwise remove the failing slave and attempt to execute
+                    // the command again on one of the remaining slaves...
+                    $this->remove($connection);
+                }
+
+                // ... that is, unless we have no more connections to use.
+                if (!$this->slaves && !$this->master) {
+                    throw $exception;
+                } elseif ($this->autoDiscovery) {
+                    $this->discover();
+                }
+            } catch (MissingMasterException $exception) {
+                if ($this->autoDiscovery) {
+                    $this->discover();
+                } else {
+                    throw $exception;
+                }
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeRequest(CommandInterface $command)
+    {
+        $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readResponse(CommandInterface $command)
+    {
+        return $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function executeCommand(CommandInterface $command)
+    {
+        return $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __sleep()
+    {
+        return ['master', 'slaves', 'pool', 'aliases', 'strategy'];
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ReplicationInterface.php b/plugins/cache-redis/Predis/Connection/Replication/ReplicationInterface.php
similarity index 55%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ReplicationInterface.php
rename to plugins/cache-redis/Predis/Connection/Replication/ReplicationInterface.php
index e09e8265c..14fd2499e 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/ReplicationInterface.php
+++ b/plugins/cache-redis/Predis/Connection/Replication/ReplicationInterface.php
@@ -3,50 +3,51 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
-namespace Predis\Connection\Aggregate;
+namespace Predis\Connection\Replication;
 
 use Predis\Connection\AggregateConnectionInterface;
 use Predis\Connection\NodeConnectionInterface;
 
 /**
  * Defines a group of Redis nodes in a master / slave replication setup.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ReplicationInterface extends AggregateConnectionInterface
 {
     /**
-     * Switches the internal connection instance in use.
-     *
-     * @param string $connection Alias of a connection
+     * Switches the internal connection in use to the master server.
      */
-    public function switchTo($connection);
+    public function switchToMaster();
 
     /**
-     * Returns the connection instance currently in use by the aggregate
-     * connection.
+     * Switches the internal connection in use to a random slave server.
+     */
+    public function switchToSlave();
+
+    /**
+     * Returns the connection in use by the replication backend.
      *
      * @return NodeConnectionInterface
      */
     public function getCurrent();
 
     /**
-     * Returns the connection instance for the master Redis node.
+     * Returns the connection to the master server.
      *
      * @return NodeConnectionInterface
      */
     public function getMaster();
 
     /**
-     * Returns a list of connection instances to slave nodes.
+     * Returns a list of connections to slave servers.
      *
-     * @return NodeConnectionInterface
+     * @return NodeConnectionInterface[]
      */
     public function getSlaves();
 }
diff --git a/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
new file mode 100644
index 000000000..14dbe2758
--- /dev/null
+++ b/plugins/cache-redis/Predis/Connection/Replication/SentinelReplication.php
@@ -0,0 +1,775 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Connection\Replication;
+
+use InvalidArgumentException;
+use Predis\Command\CommandInterface;
+use Predis\Command\RawCommand;
+use Predis\CommunicationException;
+use Predis\Connection\ConnectionException;
+use Predis\Connection\FactoryInterface as ConnectionFactoryInterface;
+use Predis\Connection\NodeConnectionInterface;
+use Predis\Connection\Parameters;
+use Predis\Replication\ReplicationStrategy;
+use Predis\Replication\RoleException;
+use Predis\Response\Error;
+use Predis\Response\ErrorInterface as ErrorResponseInterface;
+use Predis\Response\ServerException;
+
+/**
+ * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @author Ville Mattila <ville@eventio.fi>
+ */
+class SentinelReplication implements ReplicationInterface
+{
+    /**
+     * @var NodeConnectionInterface
+     */
+    protected $master;
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $slaves = [];
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $pool = [];
+
+    /**
+     * @var NodeConnectionInterface
+     */
+    protected $current;
+
+    /**
+     * @var string
+     */
+    protected $service;
+
+    /**
+     * @var ConnectionFactoryInterface
+     */
+    protected $connectionFactory;
+
+    /**
+     * @var ReplicationStrategy
+     */
+    protected $strategy;
+
+    /**
+     * @var NodeConnectionInterface[]
+     */
+    protected $sentinels = [];
+
+    /**
+     * @var int
+     */
+    protected $sentinelIndex = 0;
+
+    /**
+     * @var NodeConnectionInterface
+     */
+    protected $sentinelConnection;
+
+    /**
+     * @var float
+     */
+    protected $sentinelTimeout = 0.100;
+
+    /**
+     * Max number of automatic retries of commands upon server failure.
+     *
+     * -1 = unlimited retry attempts
+     *  0 = no retry attempts (fails immediately)
+     *  n = fail only after n retry attempts
+     *
+     * @var int
+     */
+    protected $retryLimit = 20;
+
+    /**
+     * Time to wait in milliseconds before fetching a new configuration from one
+     * of the sentinel servers.
+     *
+     * @var int
+     */
+    protected $retryWait = 1000;
+
+    /**
+     * Flag for automatic fetching of available sentinels.
+     *
+     * @var bool
+     */
+    protected $updateSentinels = false;
+
+    /**
+     * @param string                     $service           Name of the service for autodiscovery.
+     * @param array                      $sentinels         Sentinel servers connection parameters.
+     * @param ConnectionFactoryInterface $connectionFactory Connection factory instance.
+     * @param ReplicationStrategy        $strategy          Replication strategy instance.
+     */
+    public function __construct(
+        $service,
+        array $sentinels,
+        ConnectionFactoryInterface $connectionFactory,
+        ReplicationStrategy $strategy = null
+    ) {
+        $this->sentinels = $sentinels;
+        $this->service = $service;
+        $this->connectionFactory = $connectionFactory;
+        $this->strategy = $strategy ?: new ReplicationStrategy();
+    }
+
+    /**
+     * Sets a default timeout for connections to sentinels.
+     *
+     * When "timeout" is present in the connection parameters of sentinels, its
+     * value overrides the default sentinel timeout.
+     *
+     * @param float $timeout Timeout value.
+     */
+    public function setSentinelTimeout($timeout)
+    {
+        $this->sentinelTimeout = (float) $timeout;
+    }
+
+    /**
+     * Sets the maximum number of retries for commands upon server failure.
+     *
+     * -1 = unlimited retry attempts
+     *  0 = no retry attempts (fails immediately)
+     *  n = fail only after n retry attempts
+     *
+     * @param int $retry Number of retry attempts.
+     */
+    public function setRetryLimit($retry)
+    {
+        $this->retryLimit = (int) $retry;
+    }
+
+    /**
+     * Sets the time to wait (in milliseconds) before fetching a new configuration
+     * from one of the sentinels.
+     *
+     * @param float $milliseconds Time to wait before the next attempt.
+     */
+    public function setRetryWait($milliseconds)
+    {
+        $this->retryWait = (float) $milliseconds;
+    }
+
+    /**
+     * Set automatic fetching of available sentinels.
+     *
+     * @param bool $update Enable or disable automatic updates.
+     */
+    public function setUpdateSentinels($update)
+    {
+        $this->updateSentinels = (bool) $update;
+    }
+
+    /**
+     * Resets the current connection.
+     */
+    protected function reset()
+    {
+        $this->current = null;
+    }
+
+    /**
+     * Wipes the current list of master and slaves nodes.
+     */
+    protected function wipeServerList()
+    {
+        $this->reset();
+
+        $this->master = null;
+        $this->slaves = [];
+        $this->pool = [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function add(NodeConnectionInterface $connection)
+    {
+        $parameters = $connection->getParameters();
+        $role = $parameters->role;
+
+        if ('master' === $role) {
+            $this->master = $connection;
+        } elseif ('sentinel' === $role) {
+            $this->sentinels[] = $connection;
+
+            // sentinels are not considered part of the pool.
+            return;
+        } else {
+            // everything else is considered a slave.
+            $this->slaves[] = $connection;
+        }
+
+        $this->pool[(string) $connection] = $connection;
+
+        $this->reset();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function remove(NodeConnectionInterface $connection)
+    {
+        if ($connection === $this->master) {
+            $this->master = null;
+        } elseif (false !== $id = array_search($connection, $this->slaves, true)) {
+            unset($this->slaves[$id]);
+        } elseif (false !== $id = array_search($connection, $this->sentinels, true)) {
+            unset($this->sentinels[$id]);
+
+            return true;
+        } else {
+            return false;
+        }
+
+        unset($this->pool[(string) $connection]);
+
+        $this->reset();
+
+        return true;
+    }
+
+    /**
+     * Creates a new connection to a sentinel server.
+     *
+     * @return NodeConnectionInterface
+     */
+    protected function createSentinelConnection($parameters)
+    {
+        if ($parameters instanceof NodeConnectionInterface) {
+            return $parameters;
+        }
+
+        if (is_string($parameters)) {
+            $parameters = Parameters::parse($parameters);
+        }
+
+        if (is_array($parameters)) {
+            // NOTE: sentinels do not accept AUTH and SELECT commands so we must
+            // explicitly set them to NULL to avoid problems when using default
+            // parameters set via client options. Actually AUTH is supported for
+            // sentinels starting with Redis 5 but we have to differentiate from
+            // sentinels passwords and nodes passwords, this will be implemented
+            // in a later release.
+            $parameters['database'] = null;
+            $parameters['username'] = null;
+
+            // don't leak password from between configurations
+            // https://github.com/predis/predis/pull/807/#discussion_r985764770
+            if (!isset($parameters['password'])) {
+                $parameters['password'] = null;
+            }
+
+            if (!isset($parameters['timeout'])) {
+                $parameters['timeout'] = $this->sentinelTimeout;
+            }
+        }
+
+        return $this->connectionFactory->create($parameters);
+    }
+
+    /**
+     * Returns the current sentinel connection.
+     *
+     * If there is no active sentinel connection, a new connection is created.
+     *
+     * @return NodeConnectionInterface
+     */
+    public function getSentinelConnection()
+    {
+        if (!$this->sentinelConnection) {
+            if ($this->sentinelIndex >= count($this->sentinels)) {
+                $this->sentinelIndex = 0;
+                throw new \Predis\ClientException('No sentinel server available for autodiscovery.');
+            }
+
+            $sentinel = $this->sentinels[$this->sentinelIndex];
+            ++$this->sentinelIndex;
+            $this->sentinelConnection = $this->createSentinelConnection($sentinel);
+        }
+
+        return $this->sentinelConnection;
+    }
+
+    /**
+     * Fetches an updated list of sentinels from a sentinel.
+     */
+    public function updateSentinels()
+    {
+        SENTINEL_QUERY: {
+            $sentinel = $this->getSentinelConnection();
+
+            try {
+                $payload = $sentinel->executeCommand(
+                    RawCommand::create('SENTINEL', 'sentinels', $this->service)
+                );
+
+                $this->sentinels = [];
+                $this->sentinelIndex = 0;
+                // NOTE: sentinel server does not return itself, so we add it back.
+                $this->sentinels[] = $sentinel->getParameters()->toArray();
+
+                foreach ($payload as $sentinel) {
+                    $this->sentinels[] = [
+                        'host' => $sentinel[3],
+                        'port' => $sentinel[5],
+                        'role' => 'sentinel',
+                    ];
+                }
+            } catch (ConnectionException $exception) {
+                $this->sentinelConnection = null;
+
+                goto SENTINEL_QUERY;
+            }
+        }
+    }
+
+    /**
+     * Fetches the details for the master and slave servers from a sentinel.
+     */
+    public function querySentinel()
+    {
+        $this->wipeServerList();
+
+        $this->updateSentinels();
+        $this->getMaster();
+        $this->getSlaves();
+    }
+
+    /**
+     * Handles error responses returned by redis-sentinel.
+     *
+     * @param NodeConnectionInterface $sentinel Connection to a sentinel server.
+     * @param ErrorResponseInterface  $error    Error response.
+     */
+    private function handleSentinelErrorResponse(NodeConnectionInterface $sentinel, ErrorResponseInterface $error)
+    {
+        if ($error->getErrorType() === 'IDONTKNOW') {
+            throw new ConnectionException($sentinel, $error->getMessage());
+        } else {
+            throw new ServerException($error->getMessage());
+        }
+    }
+
+    /**
+     * Fetches the details for the master server from a sentinel.
+     *
+     * @param NodeConnectionInterface $sentinel Connection to a sentinel server.
+     * @param string                  $service  Name of the service.
+     *
+     * @return array
+     */
+    protected function querySentinelForMaster(NodeConnectionInterface $sentinel, $service)
+    {
+        $payload = $sentinel->executeCommand(
+            RawCommand::create('SENTINEL', 'get-master-addr-by-name', $service)
+        );
+
+        if ($payload === null) {
+            throw new ServerException('ERR No such master with that name');
+        }
+
+        if ($payload instanceof ErrorResponseInterface) {
+            $this->handleSentinelErrorResponse($sentinel, $payload);
+        }
+
+        return [
+            'host' => $payload[0],
+            'port' => $payload[1],
+            'role' => 'master',
+        ];
+    }
+
+    /**
+     * Fetches the details for the slave servers from a sentinel.
+     *
+     * @param NodeConnectionInterface $sentinel Connection to a sentinel server.
+     * @param string                  $service  Name of the service.
+     *
+     * @return array
+     */
+    protected function querySentinelForSlaves(NodeConnectionInterface $sentinel, $service)
+    {
+        $slaves = [];
+
+        $payload = $sentinel->executeCommand(
+            RawCommand::create('SENTINEL', 'slaves', $service)
+        );
+
+        if ($payload instanceof ErrorResponseInterface) {
+            $this->handleSentinelErrorResponse($sentinel, $payload);
+        }
+
+        foreach ($payload as $slave) {
+            $flags = explode(',', $slave[9]);
+
+            if (array_intersect($flags, ['s_down', 'o_down', 'disconnected'])) {
+                continue;
+            }
+
+            $slaves[] = [
+                'host' => $slave[3],
+                'port' => $slave[5],
+                'role' => 'slave',
+            ];
+        }
+
+        return $slaves;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getCurrent()
+    {
+        return $this->current;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMaster()
+    {
+        if ($this->master) {
+            return $this->master;
+        }
+
+        if ($this->updateSentinels) {
+            $this->updateSentinels();
+        }
+
+        SENTINEL_QUERY: {
+            $sentinel = $this->getSentinelConnection();
+
+            try {
+                $masterParameters = $this->querySentinelForMaster($sentinel, $this->service);
+                $masterConnection = $this->connectionFactory->create($masterParameters);
+
+                $this->add($masterConnection);
+            } catch (ConnectionException $exception) {
+                $this->sentinelConnection = null;
+
+                goto SENTINEL_QUERY;
+            }
+        }
+
+        return $masterConnection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getSlaves()
+    {
+        if ($this->slaves) {
+            return array_values($this->slaves);
+        }
+
+        if ($this->updateSentinels) {
+            $this->updateSentinels();
+        }
+
+        SENTINEL_QUERY: {
+            $sentinel = $this->getSentinelConnection();
+
+            try {
+                $slavesParameters = $this->querySentinelForSlaves($sentinel, $this->service);
+
+                foreach ($slavesParameters as $slaveParameters) {
+                    $this->add($this->connectionFactory->create($slaveParameters));
+                }
+            } catch (ConnectionException $exception) {
+                $this->sentinelConnection = null;
+
+                goto SENTINEL_QUERY;
+            }
+        }
+
+        return array_values($this->slaves);
+    }
+
+    /**
+     * Returns a random slave.
+     *
+     * @return NodeConnectionInterface|null
+     */
+    protected function pickSlave()
+    {
+        $slaves = $this->getSlaves();
+
+        return $slaves
+            ? $slaves[rand(1, count($slaves)) - 1]
+            : null;
+    }
+
+    /**
+     * Returns the connection instance in charge for the given command.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return NodeConnectionInterface
+     */
+    private function getConnectionInternal(CommandInterface $command)
+    {
+        if (!$this->current) {
+            if ($this->strategy->isReadOperation($command) && $slave = $this->pickSlave()) {
+                $this->current = $slave;
+            } else {
+                $this->current = $this->getMaster();
+            }
+
+            return $this->current;
+        }
+
+        if ($this->current === $this->master) {
+            return $this->current;
+        }
+
+        if (!$this->strategy->isReadOperation($command)) {
+            $this->current = $this->getMaster();
+        }
+
+        return $this->current;
+    }
+
+    /**
+     * Asserts that the specified connection matches an expected role.
+     *
+     * @param NodeConnectionInterface $connection Connection to a redis server.
+     * @param string                  $role       Expected role of the server ("master", "slave" or "sentinel").
+     *
+     * @throws RoleException|ConnectionException
+     */
+    protected function assertConnectionRole(NodeConnectionInterface $connection, $role)
+    {
+        $role = strtolower($role);
+        $actualRole = $connection->executeCommand(RawCommand::create('ROLE'));
+
+        if ($actualRole instanceof Error) {
+            throw new ConnectionException($connection, $actualRole->getMessage());
+        }
+
+        if ($role !== $actualRole[0]) {
+            throw new RoleException($connection, "Expected $role but got $actualRole[0] [$connection]");
+        }
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionByCommand(CommandInterface $command)
+    {
+        $connection = $this->getConnectionInternal($command);
+
+        if (!$connection->isConnected()) {
+            // When we do not have any available slave in the pool we can expect
+            // read-only operations to hit the master server.
+            $expectedRole = $this->strategy->isReadOperation($command) && $this->slaves ? 'slave' : 'master';
+            $this->assertConnectionRole($connection, $expectedRole);
+        }
+
+        return $connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getConnectionById($id)
+    {
+        return $this->pool[$id] ?? null;
+    }
+
+    /**
+     * Returns a connection by its role.
+     *
+     * @param string $role Connection role (`master`, `slave` or `sentinel`)
+     *
+     * @return NodeConnectionInterface|null
+     */
+    public function getConnectionByRole($role)
+    {
+        if ($role === 'master') {
+            return $this->getMaster();
+        } elseif ($role === 'slave') {
+            return $this->pickSlave();
+        } elseif ($role === 'sentinel') {
+            return $this->getSentinelConnection();
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Switches the internal connection in use by the backend.
+     *
+     * Sentinel connections are not considered as part of the pool, meaning that
+     * trying to switch to a sentinel will throw an exception.
+     *
+     * @param NodeConnectionInterface $connection Connection instance in the pool.
+     */
+    public function switchTo(NodeConnectionInterface $connection)
+    {
+        if ($connection && $connection === $this->current) {
+            return;
+        }
+
+        if ($connection !== $this->master && !in_array($connection, $this->slaves, true)) {
+            throw new InvalidArgumentException('Invalid connection or connection not found.');
+        }
+
+        $connection->connect();
+
+        if ($this->current) {
+            $this->current->disconnect();
+        }
+
+        $this->current = $connection;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function switchToMaster()
+    {
+        $connection = $this->getConnectionByRole('master');
+        $this->switchTo($connection);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function switchToSlave()
+    {
+        $connection = $this->getConnectionByRole('slave');
+        $this->switchTo($connection);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isConnected()
+    {
+        return $this->current ? $this->current->isConnected() : false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function connect()
+    {
+        if (!$this->current) {
+            if (!$this->current = $this->pickSlave()) {
+                $this->current = $this->getMaster();
+            }
+        }
+
+        $this->current->connect();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function disconnect()
+    {
+        foreach ($this->pool as $connection) {
+            $connection->disconnect();
+        }
+    }
+
+    /**
+     * Retries the execution of a command upon server failure after asking a new
+     * configuration to one of the sentinels.
+     *
+     * @param CommandInterface $command Command instance.
+     * @param string           $method  Actual method.
+     *
+     * @return mixed
+     */
+    private function retryCommandOnFailure(CommandInterface $command, $method)
+    {
+        $retries = 0;
+
+        while ($retries <= $this->retryLimit) {
+            try {
+                $response = $this->getConnectionByCommand($command)->$method($command);
+                break;
+            } catch (CommunicationException $exception) {
+                $this->wipeServerList();
+                $exception->getConnection()->disconnect();
+
+                if ($retries === $this->retryLimit) {
+                    throw $exception;
+                }
+
+                usleep($this->retryWait * 1000);
+
+                ++$retries;
+            }
+        }
+
+        return $response;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function writeRequest(CommandInterface $command)
+    {
+        $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function readResponse(CommandInterface $command)
+    {
+        return $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function executeCommand(CommandInterface $command)
+    {
+        return $this->retryCommandOnFailure($command, __FUNCTION__);
+    }
+
+    /**
+     * Returns the underlying replication strategy.
+     *
+     * @return ReplicationStrategy
+     */
+    public function getReplicationStrategy()
+    {
+        return $this->strategy;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __sleep()
+    {
+        return [
+            'master', 'slaves', 'pool', 'service', 'sentinels', 'connectionFactory', 'strategy',
+        ];
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/StreamConnection.php b/plugins/cache-redis/Predis/Connection/StreamConnection.php
similarity index 54%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/StreamConnection.php
rename to plugins/cache-redis/Predis/Connection/StreamConnection.php
index ed6540b87..2fe307067 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/StreamConnection.php
+++ b/plugins/cache-redis/Predis/Connection/StreamConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,25 +12,26 @@
 
 namespace Predis\Connection;
 
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\Response\Error as ErrorResponse;
+use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\Status as StatusResponse;
 
 /**
  * Standard connection to Redis servers implemented on top of PHP's streams.
  * The connection parameters supported by this class are:.
  *
- *  - scheme: it can be either 'redis', 'tcp' or 'unix'.
+ *  - scheme: it can be either 'redis', 'tcp', 'rediss', 'tls' or 'unix'.
  *  - host: hostname or IP address of the server.
  *  - port: TCP port of the server.
  *  - path: path of a UNIX domain socket when scheme is 'unix'.
- *  - timeout: timeout to perform the connection.
+ *  - timeout: timeout to perform the connection (default is 5 seconds).
  *  - read_write_timeout: timeout of read / write operations.
  *  - async_connect: performs the connection asynchronously.
  *  - tcp_nodelay: enables or disables Nagle's algorithm for coalescing.
  *  - persistent: the connection is left intact after a GC collection.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ *  - ssl: context options array (see http://php.net/manual/en/context.ssl.php)
  */
 class StreamConnection extends AbstractConnection
 {
@@ -47,6 +49,26 @@ class StreamConnection extends AbstractConnection
         $this->disconnect();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    protected function assertParameters(ParametersInterface $parameters)
+    {
+        switch ($parameters->scheme) {
+            case 'tcp':
+            case 'redis':
+            case 'unix':
+            case 'tls':
+            case 'rediss':
+                break;
+
+            default:
+                throw new InvalidArgumentException("Invalid scheme: '$parameters->scheme'.");
+        }
+
+        return $parameters;
+    }
+
     /**
      * {@inheritdoc}
      */
@@ -60,11 +82,44 @@ class StreamConnection extends AbstractConnection
             case 'unix':
                 return $this->unixStreamInitializer($this->parameters);
 
+            case 'tls':
+            case 'rediss':
+                return $this->tlsStreamInitializer($this->parameters);
+
             default:
-                throw new \InvalidArgumentException("Invalid scheme: '{$this->parameters->scheme}'.");
+                throw new InvalidArgumentException("Invalid scheme: '{$this->parameters->scheme}'.");
         }
     }
 
+    /**
+     * Creates a connected stream socket resource.
+     *
+     * @param ParametersInterface $parameters Connection parameters.
+     * @param string              $address    Address for stream_socket_client().
+     * @param int                 $flags      Flags for stream_socket_client().
+     *
+     * @return resource
+     */
+    protected function createStreamSocket(ParametersInterface $parameters, $address, $flags)
+    {
+        $timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0);
+        $context = stream_context_create(['socket' => ['tcp_nodelay' => (bool) $parameters->tcp_nodelay]]);
+
+        if (!$resource = @stream_socket_client($address, $errno, $errstr, $timeout, $flags, $context)) {
+            $this->onConnectionError(trim($errstr), $errno);
+        }
+
+        if (isset($parameters->read_write_timeout)) {
+            $rwtimeout = (float) $parameters->read_write_timeout;
+            $rwtimeout = $rwtimeout > 0 ? $rwtimeout : -1;
+            $timeoutSeconds = floor($rwtimeout);
+            $timeoutUSeconds = ($rwtimeout - $timeoutSeconds) * 1000000;
+            stream_set_timeout($resource, $timeoutSeconds, $timeoutUSeconds);
+        }
+
+        return $resource;
+    }
+
     /**
      * Initializes a TCP stream resource.
      *
@@ -75,42 +130,28 @@ class StreamConnection extends AbstractConnection
     protected function tcpStreamInitializer(ParametersInterface $parameters)
     {
         if (!filter_var($parameters->host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
-            $uri = "tcp://$parameters->host:$parameters->port";
+            $address = "tcp://$parameters->host:$parameters->port";
         } else {
-            $uri = "tcp://[$parameters->host]:$parameters->port";
+            $address = "tcp://[$parameters->host]:$parameters->port";
         }
 
         $flags = STREAM_CLIENT_CONNECT;
 
-        if (isset($parameters->async_connect) && (bool) $parameters->async_connect) {
+        if (isset($parameters->async_connect) && $parameters->async_connect) {
             $flags |= STREAM_CLIENT_ASYNC_CONNECT;
         }
 
-        if (isset($parameters->persistent) && (bool) $parameters->persistent) {
-            $flags |= STREAM_CLIENT_PERSISTENT;
-            $uri .= strpos($path = $parameters->path, '/') === 0 ? $path : "/$path";
+        if (isset($parameters->persistent)) {
+            if (false !== $persistent = filter_var($parameters->persistent, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)) {
+                $flags |= STREAM_CLIENT_PERSISTENT;
+
+                if ($persistent === null) {
+                    $address = "{$address}/{$parameters->persistent}";
+                }
+            }
         }
 
-        $resource = @stream_socket_client($uri, $errno, $errstr, (float) $parameters->timeout, $flags);
-
-        if (!$resource) {
-            $this->onConnectionError(trim($errstr), $errno);
-        }
-
-        if (isset($parameters->read_write_timeout)) {
-            $rwtimeout = (float) $parameters->read_write_timeout;
-            $rwtimeout = $rwtimeout > 0 ? $rwtimeout : -1;
-            $timeoutSeconds = floor($rwtimeout);
-            $timeoutUSeconds = ($rwtimeout - $timeoutSeconds) * 1000000;
-            stream_set_timeout($resource, $timeoutSeconds, $timeoutUSeconds);
-        }
-
-        if (isset($parameters->tcp_nodelay) && function_exists('socket_import_stream')) {
-            $socket = socket_import_stream($resource);
-            socket_set_option($socket, SOL_TCP, TCP_NODELAY, (int) $parameters->tcp_nodelay);
-        }
-
-        return $resource;
+        return $this->createStreamSocket($parameters, $address, $flags);
     }
 
     /**
@@ -126,25 +167,56 @@ class StreamConnection extends AbstractConnection
             throw new InvalidArgumentException('Missing UNIX domain socket path.');
         }
 
-        $uri = "unix://{$parameters->path}";
         $flags = STREAM_CLIENT_CONNECT;
 
-        if ((bool) $parameters->persistent) {
-            $flags |= STREAM_CLIENT_PERSISTENT;
+        if (isset($parameters->persistent)) {
+            if (false !== $persistent = filter_var($parameters->persistent, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)) {
+                $flags |= STREAM_CLIENT_PERSISTENT;
+
+                if ($persistent === null) {
+                    throw new InvalidArgumentException(
+                        'Persistent connection IDs are not supported when using UNIX domain sockets.'
+                    );
+                }
+            }
         }
 
-        $resource = @stream_socket_client($uri, $errno, $errstr, (float) $parameters->timeout, $flags);
+        return $this->createStreamSocket($parameters, "unix://{$parameters->path}", $flags);
+    }
 
-        if (!$resource) {
-            $this->onConnectionError(trim($errstr), $errno);
+    /**
+     * Initializes a SSL-encrypted TCP stream resource.
+     *
+     * @param ParametersInterface $parameters Initialization parameters for the connection.
+     *
+     * @return resource
+     */
+    protected function tlsStreamInitializer(ParametersInterface $parameters)
+    {
+        $resource = $this->tcpStreamInitializer($parameters);
+        $metadata = stream_get_meta_data($resource);
+
+        // Detect if crypto mode is already enabled for this stream (PHP >= 7.0.0).
+        if (isset($metadata['crypto'])) {
+            return $resource;
         }
 
-        if (isset($parameters->read_write_timeout)) {
-            $rwtimeout = (float) $parameters->read_write_timeout;
-            $rwtimeout = $rwtimeout > 0 ? $rwtimeout : -1;
-            $timeoutSeconds = floor($rwtimeout);
-            $timeoutUSeconds = ($rwtimeout - $timeoutSeconds) * 1000000;
-            stream_set_timeout($resource, $timeoutSeconds, $timeoutUSeconds);
+        if (isset($parameters->ssl) && is_array($parameters->ssl)) {
+            $options = $parameters->ssl;
+        } else {
+            $options = [];
+        }
+
+        if (!isset($options['crypto_type'])) {
+            $options['crypto_type'] = STREAM_CRYPTO_METHOD_TLS_CLIENT;
+        }
+
+        if (!stream_context_set_option($resource, ['ssl' => $options])) {
+            $this->onConnectionError('Error while setting SSL context options');
+        }
+
+        if (!stream_socket_enable_crypto($resource, true, $options['crypto_type'])) {
+            $this->onConnectionError('Error while switching to encrypted communication');
         }
 
         return $resource;
@@ -157,7 +229,13 @@ class StreamConnection extends AbstractConnection
     {
         if (parent::connect() && $this->initCommands) {
             foreach ($this->initCommands as $command) {
-                $this->executeCommand($command);
+                $response = $this->executeCommand($command);
+
+                if ($response instanceof ErrorResponseInterface && $command->getId() === 'CLIENT') {
+                    // Do nothing on CLIENT SETINFO command failure
+                } elseif ($response instanceof ErrorResponseInterface) {
+                    $this->onConnectionError("`{$command->getId()}` failed: {$response->getMessage()}", 0);
+                }
             }
         }
     }
@@ -168,7 +246,10 @@ class StreamConnection extends AbstractConnection
     public function disconnect()
     {
         if ($this->isConnected()) {
-            fclose($this->getResource());
+            $resource = $this->getResource();
+            if (is_resource($resource)) {
+                fclose($resource);
+            }
             parent::disconnect();
         }
     }
@@ -184,7 +265,7 @@ class StreamConnection extends AbstractConnection
         $socket = $this->getResource();
 
         while (($length = strlen($buffer)) > 0) {
-            $written = @fwrite($socket, $buffer);
+            $written = is_resource($socket) ? @fwrite($socket, $buffer) : false;
 
             if ($length === $written) {
                 return;
@@ -228,7 +309,7 @@ class StreamConnection extends AbstractConnection
                 $bytesLeft = ($size += 2);
 
                 do {
-                    $chunk = fread($socket, min($bytesLeft, 4096));
+                    $chunk = is_resource($socket) ? fread($socket, min($bytesLeft, 4096)) : false;
 
                     if ($chunk === false || $chunk === '') {
                         $this->onConnectionError('Error while reading bytes from the server.');
@@ -247,7 +328,7 @@ class StreamConnection extends AbstractConnection
                     return;
                 }
 
-                $multibulk = array();
+                $multibulk = [];
 
                 for ($i = 0; $i < $count; ++$i) {
                     $multibulk[$i] = $this->read();
@@ -256,7 +337,9 @@ class StreamConnection extends AbstractConnection
                 return $multibulk;
 
             case ':':
-                return (int) $payload;
+                $integer = (int) $payload;
+
+                return $integer == $payload ? $integer : $payload;
 
             case '-':
                 return new ErrorResponse($payload);
@@ -281,9 +364,8 @@ class StreamConnection extends AbstractConnection
 
         $buffer = "*{$reqlen}\r\n\${$cmdlen}\r\n{$commandID}\r\n";
 
-        for ($i = 0, $reqlen--; $i < $reqlen; ++$i) {
-            $argument = $arguments[$i];
-            $arglen = strlen($argument);
+        foreach ($arguments as $argument) {
+            $arglen = strlen(strval($argument));
             $buffer .= "\${$arglen}\r\n{$argument}\r\n";
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/WebdisConnection.php b/plugins/cache-redis/Predis/Connection/WebdisConnection.php
similarity index 85%
rename from snappymail/v/0.0.0/app/libraries/Predis/Connection/WebdisConnection.php
rename to plugins/cache-redis/Predis/Connection/WebdisConnection.php
index 9cff9d023..bd533783b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/WebdisConnection.php
+++ b/plugins/cache-redis/Predis/Connection/WebdisConnection.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,6 +12,8 @@
 
 namespace Predis\Connection;
 
+use Closure;
+use InvalidArgumentException;
 use Predis\Command\CommandInterface;
 use Predis\NotSupportedException;
 use Predis\Protocol\ProtocolException;
@@ -33,15 +36,14 @@ use Predis\Response\Status as StatusResponse;
  *  - scheme: must be 'http'.
  *  - host: hostname or IP address of the server.
  *  - port: TCP port of the server.
- *  - timeout: timeout to perform the connection.
+ *  - timeout: timeout to perform the connection (default is 5 seconds).
  *  - user: username for authentication.
  *  - pass: password for authentication.
  *
- * @link http://webd.is
- * @link http://github.com/nicolasff/webdis
- * @link http://github.com/seppo0010/phpiredis
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://webd.is
+ * @see http://github.com/nicolasff/webdis
+ * @see http://github.com/seppo0010/phpiredis
+ * @deprecated 2.1.2
  */
 class WebdisConnection implements NodeConnectionInterface
 {
@@ -52,14 +54,14 @@ class WebdisConnection implements NodeConnectionInterface
     /**
      * @param ParametersInterface $parameters Initialization parameters for the connection.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     public function __construct(ParametersInterface $parameters)
     {
         $this->assertExtensions();
 
         if ($parameters->scheme !== 'http') {
-            throw new \InvalidArgumentException("Invalid scheme: '{$parameters->scheme}'.");
+            throw new InvalidArgumentException("Invalid scheme: '{$parameters->scheme}'.");
         }
 
         $this->parameters = $parameters;
@@ -117,19 +119,20 @@ class WebdisConnection implements NodeConnectionInterface
     private function createCurl()
     {
         $parameters = $this->getParameters();
+        $timeout = (isset($parameters->timeout) ? (float) $parameters->timeout : 5.0) * 1000;
 
-        if (filter_var($host = $parameters->host, FILTER_VALIDATE_IP)) {
+        if (filter_var($host = $parameters->host, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             $host = "[$host]";
         }
 
-        $options = array(
+        $options = [
             CURLOPT_FAILONERROR => true,
-            CURLOPT_CONNECTTIMEOUT_MS => $parameters->timeout * 1000,
+            CURLOPT_CONNECTTIMEOUT_MS => $timeout,
             CURLOPT_URL => "$parameters->scheme://$host:$parameters->port",
             CURLOPT_HTTP_VERSION => CURL_HTTP_VERSION_1_1,
             CURLOPT_POST => true,
-            CURLOPT_WRITEFUNCTION => array($this, 'feedReader'),
-        );
+            CURLOPT_WRITEFUNCTION => [$this, 'feedReader'],
+        ];
 
         if (isset($parameters->user, $parameters->pass)) {
             $options[CURLOPT_USERPWD] = "{$parameters->user}:{$parameters->pass}";
@@ -158,25 +161,37 @@ class WebdisConnection implements NodeConnectionInterface
     /**
      * Returns the handler used by the protocol reader for inline responses.
      *
-     * @return \Closure
+     * @return Closure
      */
     protected function getStatusHandler()
     {
-        return function ($payload) {
-            return StatusResponse::get($payload);
-        };
+        static $statusHandler;
+
+        if (!$statusHandler) {
+            $statusHandler = function ($payload) {
+                return StatusResponse::get($payload);
+            };
+        }
+
+        return $statusHandler;
     }
 
     /**
      * Returns the handler used by the protocol reader for error responses.
      *
-     * @return \Closure
+     * @return Closure
      */
     protected function getErrorHandler()
     {
-        return function ($payload) {
-            return new ErrorResponse($payload);
-        };
+        static $errorHandler;
+
+        if (!$errorHandler) {
+            $errorHandler = function ($errorMessage) {
+                return new ErrorResponse($errorMessage);
+            };
+        }
+
+        return $errorHandler;
     }
 
     /**
@@ -223,9 +238,8 @@ class WebdisConnection implements NodeConnectionInterface
      *
      * @param CommandInterface $command Command instance.
      *
-     * @throws NotSupportedException
-     *
      * @return string
+     * @throws NotSupportedException
      */
     protected function getCommandId(CommandInterface $command)
     {
@@ -239,7 +253,6 @@ class WebdisConnection implements NodeConnectionInterface
             case 'DISCARD':
             case 'MONITOR':
                 throw new NotSupportedException("Command '$commandID' is not allowed by Webdis.");
-
             default:
                 return $commandID;
         }
@@ -279,10 +292,10 @@ class WebdisConnection implements NodeConnectionInterface
         curl_setopt($resource, CURLOPT_POSTFIELDS, $serializedCommand);
 
         if (curl_exec($resource) === false) {
-            $error = curl_error($resource);
+            $error = trim(curl_error($resource));
             $errno = curl_errno($resource);
 
-            throw new ConnectionException($this, trim($error), $errno);
+            throw new ConnectionException($this, "$error{$this->getParameters()}]", $errno);
         }
 
         if (phpiredis_reader_get_state($this->reader) !== PHPIREDIS_READER_STATE_COMPLETE) {
@@ -337,7 +350,7 @@ class WebdisConnection implements NodeConnectionInterface
      */
     public function __sleep()
     {
-        return array('parameters');
+        return ['parameters'];
     }
 
     /**
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Monitor/Consumer.php b/plugins/cache-redis/Predis/Monitor/Consumer.php
similarity index 79%
rename from snappymail/v/0.0.0/app/libraries/Predis/Monitor/Consumer.php
rename to plugins/cache-redis/Predis/Monitor/Consumer.php
index d10bad1a0..9076bf12f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Monitor/Consumer.php
+++ b/plugins/cache-redis/Predis/Monitor/Consumer.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,16 +12,16 @@
 
 namespace Predis\Monitor;
 
+use Iterator;
 use Predis\ClientInterface;
-use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\Cluster\ClusterInterface;
 use Predis\NotSupportedException;
+use ReturnTypeWillChange;
 
 /**
  * Redis MONITOR consumer.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class Consumer implements \Iterator
+class Consumer implements Iterator
 {
     private $client;
     private $valid;
@@ -56,14 +57,14 @@ class Consumer implements \Iterator
      */
     private function assertClient(ClientInterface $client)
     {
-        if ($client->getConnection() instanceof AggregateConnectionInterface) {
+        if ($client->getConnection() instanceof ClusterInterface) {
             throw new NotSupportedException(
-                'Cannot initialize a monitor consumer over aggregate connections.'
+                'Cannot initialize a monitor consumer over cluster connections.'
             );
         }
 
-        if ($client->getProfile()->supportsCommand('MONITOR') === false) {
-            throw new NotSupportedException("The current profile does not support 'MONITOR'.");
+        if (!$client->getCommandFactory()->supports('MONITOR')) {
+            throw new NotSupportedException("'MONITOR' is not supported by the current command factory.");
         }
     }
 
@@ -89,8 +90,9 @@ class Consumer implements \Iterator
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         // NOOP
@@ -99,24 +101,27 @@ class Consumer implements \Iterator
     /**
      * Returns the last message payload retrieved from the server.
      *
-     * @return Object
+     * @return object
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->getValue();
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         ++$this->position;
@@ -127,6 +132,7 @@ class Consumer implements \Iterator
      *
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->valid;
@@ -136,7 +142,7 @@ class Consumer implements \Iterator
      * Waits for a new message from the server generated by MONITOR and returns
      * it when available.
      *
-     * @return Object
+     * @return object
      */
     private function getValue()
     {
@@ -160,14 +166,14 @@ class Consumer implements \Iterator
         };
 
         $event = preg_replace_callback('/ \(db (\d+)\) | \[(\d+) (.*?)\] /', $callback, $event, 1);
-        @list($timestamp, $command, $arguments) = explode(' ', $event, 3);
+        @[$timestamp, $command, $arguments] = explode(' ', $event, 3);
 
-        return (object) array(
+        return (object) [
             'timestamp' => (float) $timestamp,
             'database' => $database,
             'client' => $client,
             'command' => substr($command, 1, -1),
             'arguments' => $arguments,
-        );
+        ];
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/NotSupportedException.php b/plugins/cache-redis/Predis/NotSupportedException.php
similarity index 78%
rename from snappymail/v/0.0.0/app/libraries/Predis/NotSupportedException.php
rename to plugins/cache-redis/Predis/NotSupportedException.php
index be82aba72..037696b68 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/NotSupportedException.php
+++ b/plugins/cache-redis/Predis/NotSupportedException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis;
 /**
  * Exception class thrown when trying to use features not supported by certain
  * classes or abstractions of Predis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class NotSupportedException extends PredisException
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Atomic.php b/plugins/cache-redis/Predis/Pipeline/Atomic.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Atomic.php
rename to plugins/cache-redis/Predis/Pipeline/Atomic.php
index 1c9c92aa2..09e19ead6 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Atomic.php
+++ b/plugins/cache-redis/Predis/Pipeline/Atomic.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,11 +19,10 @@ use Predis\Connection\NodeConnectionInterface;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
+use SplQueue;
 
 /**
  * Command pipeline wrapped into a MULTI / EXEC transaction.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Atomic extends Pipeline
 {
@@ -31,9 +31,9 @@ class Atomic extends Pipeline
      */
     public function __construct(ClientInterface $client)
     {
-        if (!$client->getProfile()->supportsCommands(array('multi', 'exec', 'discard'))) {
+        if (!$client->getCommandFactory()->supports('multi', 'exec', 'discard')) {
             throw new ClientException(
-                "The current profile does not support 'MULTI', 'EXEC' and 'DISCARD'."
+                "'MULTI', 'EXEC' and 'DISCARD' are not supported by the current command factory."
             );
         }
 
@@ -59,10 +59,10 @@ class Atomic extends Pipeline
     /**
      * {@inheritdoc}
      */
-    protected function executePipeline(ConnectionInterface $connection, \SplQueue $commands)
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
     {
-        $profile = $this->getClient()->getProfile();
-        $connection->executeCommand($profile->createCommand('multi'));
+        $commandFactory = $this->getClient()->getCommandFactory();
+        $connection->executeCommand($commandFactory->create('multi'));
 
         foreach ($commands as $command) {
             $connection->writeRequest($command);
@@ -72,15 +72,14 @@ class Atomic extends Pipeline
             $response = $connection->readResponse($command);
 
             if ($response instanceof ErrorResponseInterface) {
-                $connection->executeCommand($profile->createCommand('discard'));
+                $connection->executeCommand($commandFactory->create('discard'));
                 throw new ServerException($response->getMessage());
             }
         }
 
-        $executed = $connection->executeCommand($profile->createCommand('exec'));
+        $executed = $connection->executeCommand($commandFactory->create('exec'));
 
         if (!isset($executed)) {
-            // TODO: should be throwing a more appropriate exception.
             throw new ClientException(
                 'The underlying transaction has been aborted by the server.'
             );
@@ -95,7 +94,7 @@ class Atomic extends Pipeline
             );
         }
 
-        $responses = array();
+        $responses = [];
         $sizeOfPipe = count($commands);
         $exceptions = $this->throwServerExceptions();
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/ConnectionErrorProof.php b/plugins/cache-redis/Predis/Pipeline/ConnectionErrorProof.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Pipeline/ConnectionErrorProof.php
rename to plugins/cache-redis/Predis/Pipeline/ConnectionErrorProof.php
index d3bc732e4..8f995cf07 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/ConnectionErrorProof.php
+++ b/plugins/cache-redis/Predis/Pipeline/ConnectionErrorProof.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,18 +13,15 @@
 namespace Predis\Pipeline;
 
 use Predis\CommunicationException;
-use Predis\Connection\Aggregate\ClusterInterface;
+use Predis\Connection\Cluster\ClusterInterface;
 use Predis\Connection\ConnectionInterface;
 use Predis\Connection\NodeConnectionInterface;
 use Predis\NotSupportedException;
+use SplQueue;
 
 /**
  * Command pipeline that does not throw exceptions on connection errors, but
  * returns the exception instances as the rest of the response elements.
- *
- * @todo Awful naming!
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ConnectionErrorProof extends Pipeline
 {
@@ -38,7 +36,7 @@ class ConnectionErrorProof extends Pipeline
     /**
      * {@inheritdoc}
      */
-    protected function executePipeline(ConnectionInterface $connection, \SplQueue $commands)
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
     {
         if ($connection instanceof NodeConnectionInterface) {
             return $this->executeSingleNode($connection, $commands);
@@ -54,9 +52,9 @@ class ConnectionErrorProof extends Pipeline
     /**
      * {@inheritdoc}
      */
-    protected function executeSingleNode(NodeConnectionInterface $connection, \SplQueue $commands)
+    protected function executeSingleNode(NodeConnectionInterface $connection, SplQueue $commands)
     {
-        $responses = array();
+        $responses = [];
         $sizeOfPipe = count($commands);
 
         foreach ($commands as $command) {
@@ -86,14 +84,14 @@ class ConnectionErrorProof extends Pipeline
     /**
      * {@inheritdoc}
      */
-    protected function executeCluster(ClusterInterface $connection, \SplQueue $commands)
+    protected function executeCluster(ClusterInterface $connection, SplQueue $commands)
     {
-        $responses = array();
+        $responses = [];
         $sizeOfPipe = count($commands);
-        $exceptions = array();
+        $exceptions = [];
 
         foreach ($commands as $command) {
-            $cmdConnection = $connection->getConnection($command);
+            $cmdConnection = $connection->getConnectionByCommand($command);
 
             if (isset($exceptions[spl_object_hash($cmdConnection)])) {
                 continue;
@@ -109,7 +107,7 @@ class ConnectionErrorProof extends Pipeline
         for ($i = 0; $i < $sizeOfPipe; ++$i) {
             $command = $commands->dequeue();
 
-            $cmdConnection = $connection->getConnection($command);
+            $cmdConnection = $connection->getConnectionByCommand($command);
             $connectionHash = spl_object_hash($cmdConnection);
 
             if (isset($exceptions[$connectionHash])) {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/FireAndForget.php b/plugins/cache-redis/Predis/Pipeline/FireAndForget.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Pipeline/FireAndForget.php
rename to plugins/cache-redis/Predis/Pipeline/FireAndForget.php
index 95a062b64..75ee88eb2 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/FireAndForget.php
+++ b/plugins/cache-redis/Predis/Pipeline/FireAndForget.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,18 +13,17 @@
 namespace Predis\Pipeline;
 
 use Predis\Connection\ConnectionInterface;
+use SplQueue;
 
 /**
  * Command pipeline that writes commands to the servers but discards responses.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class FireAndForget extends Pipeline
 {
     /**
      * {@inheritdoc}
      */
-    protected function executePipeline(ConnectionInterface $connection, \SplQueue $commands)
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
     {
         while (!$commands->isEmpty()) {
             $connection->writeRequest($commands->dequeue());
@@ -31,6 +31,6 @@ class FireAndForget extends Pipeline
 
         $connection->disconnect();
 
-        return array();
+        return [];
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Pipeline.php b/plugins/cache-redis/Predis/Pipeline/Pipeline.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Pipeline.php
rename to plugins/cache-redis/Predis/Pipeline/Pipeline.php
index cf9c59e4f..1f67d0b9f 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Pipeline/Pipeline.php
+++ b/plugins/cache-redis/Predis/Pipeline/Pipeline.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,30 +12,31 @@
 
 namespace Predis\Pipeline;
 
+use Exception;
+use InvalidArgumentException;
 use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Command\CommandInterface;
-use Predis\Connection\Aggregate\ReplicationInterface;
 use Predis\Connection\ConnectionInterface;
+use Predis\Connection\Replication\ReplicationInterface;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ResponseInterface;
 use Predis\Response\ServerException;
+use SplQueue;
 
 /**
  * Implementation of a command pipeline in which write and read operations of
  * Redis commands are pipelined to alleviate the effects of network round-trips.
  *
  * {@inheritdoc}
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Pipeline implements ClientContextInterface
 {
-    private $client;
+    protected $client;
     private $pipeline;
 
-    private $responses = array();
+    private $responses = [];
     private $running = false;
 
     /**
@@ -43,7 +45,7 @@ class Pipeline implements ClientContextInterface
     public function __construct(ClientInterface $client)
     {
         $this->client = $client;
-        $this->pipeline = new \SplQueue();
+        $this->pipeline = new SplQueue();
     }
 
     /**
@@ -112,7 +114,7 @@ class Pipeline implements ClientContextInterface
         $connection = $this->getClient()->getConnection();
 
         if ($connection instanceof ReplicationInterface) {
-            $connection->switchTo('master');
+            $connection->switchToMaster();
         }
 
         return $connection;
@@ -123,17 +125,17 @@ class Pipeline implements ClientContextInterface
      * from the current connection.
      *
      * @param ConnectionInterface $connection Current connection instance.
-     * @param \SplQueue           $commands   Queued commands.
+     * @param SplQueue            $commands   Queued commands.
      *
      * @return array
      */
-    protected function executePipeline(ConnectionInterface $connection, \SplQueue $commands)
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
     {
         foreach ($commands as $command) {
             $connection->writeRequest($command);
         }
 
-        $responses = array();
+        $responses = [];
         $exceptions = $this->throwServerExceptions();
 
         while (!$commands->isEmpty()) {
@@ -165,7 +167,7 @@ class Pipeline implements ClientContextInterface
             $responses = $this->executePipeline($this->getConnection(), $this->pipeline);
             $this->responses = array_merge($this->responses, $responses);
         } else {
-            $this->pipeline = new \SplQueue();
+            $this->pipeline = new SplQueue();
         }
 
         return $this;
@@ -192,15 +194,14 @@ class Pipeline implements ClientContextInterface
      *
      * @param mixed $callable Optional callback for execution.
      *
-     * @throws \Exception
-     * @throws \InvalidArgumentException
-     *
      * @return array
+     * @throws Exception
+     * @throws InvalidArgumentException
      */
     public function execute($callable = null)
     {
         if ($callable && !is_callable($callable)) {
-            throw new \InvalidArgumentException('The argument must be a callable object.');
+            throw new InvalidArgumentException('The argument must be a callable object.');
         }
 
         $exception = null;
@@ -212,7 +213,7 @@ class Pipeline implements ClientContextInterface
             }
 
             $this->flushPipeline();
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             // NOOP
         }
 
diff --git a/plugins/cache-redis/Predis/Pipeline/RelayAtomic.php b/plugins/cache-redis/Predis/Pipeline/RelayAtomic.php
new file mode 100644
index 000000000..c36e10868
--- /dev/null
+++ b/plugins/cache-redis/Predis/Pipeline/RelayAtomic.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Pipeline;
+
+use Predis\Connection\ConnectionInterface;
+use Predis\Response\Error;
+use Predis\Response\ServerException;
+use Relay\Exception as RelayException;
+use SplQueue;
+
+class RelayAtomic extends Atomic
+{
+    /**
+     * {@inheritdoc}
+     */
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
+    {
+        /** @var \Predis\Connection\RelayConnection $connection */
+        $client = $connection->getClient();
+
+        $throw = $this->client->getOptions()->exceptions;
+
+        try {
+            $transaction = $client->multi();
+
+            foreach ($commands as $command) {
+                $name = $command->getId();
+
+                in_array($name, $connection->atypicalCommands)
+                    ? $transaction->{$name}(...$command->getArguments())
+                    : $transaction->rawCommand($name, ...$command->getArguments());
+            }
+
+            $responses = $transaction->exec();
+
+            if (!is_array($responses)) {
+                return $responses;
+            }
+
+            foreach ($responses as $key => $response) {
+                if ($response instanceof RelayException) {
+                    if ($throw) {
+                        throw $response;
+                    }
+
+                    $responses[$key] = new Error($response->getMessage());
+                }
+            }
+
+            return $responses;
+        } catch (RelayException $ex) {
+            if ($client->getMode() !== $client::ATOMIC) {
+                $client->discard();
+            }
+
+            throw new ServerException($ex->getMessage(), $ex->getCode(), $ex);
+        }
+    }
+}
diff --git a/plugins/cache-redis/Predis/Pipeline/RelayPipeline.php b/plugins/cache-redis/Predis/Pipeline/RelayPipeline.php
new file mode 100644
index 000000000..5f36a0aa4
--- /dev/null
+++ b/plugins/cache-redis/Predis/Pipeline/RelayPipeline.php
@@ -0,0 +1,75 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Pipeline;
+
+use Predis\Connection\ConnectionInterface;
+use Predis\Connection\RelayConnection;
+use Predis\Response\Error;
+use Predis\Response\ServerException;
+use Relay\Exception as RelayException;
+use SplQueue;
+
+class RelayPipeline extends Pipeline
+{
+    /**
+     * Implements the logic to flush the queued commands and read the responses
+     * from the current connection.
+     *
+     * @param  RelayConnection $connection Current connection instance.
+     * @param  SplQueue        $commands   Queued commands.
+     * @return array
+     */
+    protected function executePipeline(ConnectionInterface $connection, SplQueue $commands)
+    {
+        /** @var \Predis\Connection\RelayConnection $connection */
+        $client = $connection->getClient();
+
+        $throw = $this->client->getOptions()->exceptions;
+
+        try {
+            $pipeline = $client->pipeline();
+
+            foreach ($commands as $command) {
+                $name = $command->getId();
+
+                in_array($name, $connection->atypicalCommands)
+                    ? $pipeline->{$name}(...$command->getArguments())
+                    : $pipeline->rawCommand($name, ...$command->getArguments());
+            }
+
+            $responses = $pipeline->exec();
+
+            if (!is_array($responses)) {
+                return $responses;
+            }
+
+            foreach ($responses as $key => $response) {
+                if ($response instanceof RelayException) {
+                    if ($throw) {
+                        throw $response;
+                    }
+
+                    $responses[$key] = new Error($response->getMessage());
+                }
+            }
+
+            return $responses;
+        } catch (RelayException $ex) {
+            if ($client->getMode() !== $client::ATOMIC) {
+                $client->discard();
+            }
+
+            throw new ServerException($ex->getMessage(), $ex->getCode(), $ex);
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/PredisException.php b/plugins/cache-redis/Predis/PredisException.php
similarity index 63%
rename from snappymail/v/0.0.0/app/libraries/Predis/PredisException.php
rename to plugins/cache-redis/Predis/PredisException.php
index 122bde16d..8e124225d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/PredisException.php
+++ b/plugins/cache-redis/Predis/PredisException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,11 +12,11 @@
 
 namespace Predis;
 
+use Exception;
+
 /**
  * Base exception class for Predis-related errors.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class PredisException extends \Exception
+abstract class PredisException extends Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolException.php b/plugins/cache-redis/Predis/Protocol/ProtocolException.php
similarity index 64%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolException.php
rename to plugins/cache-redis/Predis/Protocol/ProtocolException.php
index 6fe5d6d3a..b6ab078a0 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolException.php
+++ b/plugins/cache-redis/Predis/Protocol/ProtocolException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,10 +15,8 @@ namespace Predis\Protocol;
 use Predis\CommunicationException;
 
 /**
- * Exception used to indentify errors encountered while parsing the Redis wire
+ * Exception used to identify errors encountered while parsing the Redis wire
  * protocol.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ProtocolException extends CommunicationException
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolProcessorInterface.php b/plugins/cache-redis/Predis/Protocol/ProtocolProcessorInterface.php
similarity index 91%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolProcessorInterface.php
rename to plugins/cache-redis/Predis/Protocol/ProtocolProcessorInterface.php
index b34ea1814..c36a9bb32 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ProtocolProcessorInterface.php
+++ b/plugins/cache-redis/Predis/Protocol/ProtocolProcessorInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,8 +18,6 @@ use Predis\Connection\CompositeConnectionInterface;
 /**
  * Defines a pluggable protocol processor capable of serializing commands and
  * deserializing responses into PHP objects directly from a connection.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ProtocolProcessorInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/RequestSerializerInterface.php b/plugins/cache-redis/Predis/Protocol/RequestSerializerInterface.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/RequestSerializerInterface.php
rename to plugins/cache-redis/Predis/Protocol/RequestSerializerInterface.php
index eef72a640..ba2a14f43 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/RequestSerializerInterface.php
+++ b/plugins/cache-redis/Predis/Protocol/RequestSerializerInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\Command\CommandInterface;
 
 /**
  * Defines a pluggable serializer for Redis commands.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface RequestSerializerInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ResponseReaderInterface.php b/plugins/cache-redis/Predis/Protocol/ResponseReaderInterface.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/ResponseReaderInterface.php
rename to plugins/cache-redis/Predis/Protocol/ResponseReaderInterface.php
index 86a7bdcce..ce9c09395 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/ResponseReaderInterface.php
+++ b/plugins/cache-redis/Predis/Protocol/ResponseReaderInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,8 +17,6 @@ use Predis\Connection\CompositeConnectionInterface;
 /**
  * Defines a pluggable reader capable of parsing responses returned by Redis and
  * deserializing them to PHP objects.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ResponseReaderInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/CompositeProtocolProcessor.php b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
similarity index 94%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/CompositeProtocolProcessor.php
rename to plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
index ea85ed303..3f7df02e5 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/CompositeProtocolProcessor.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/CompositeProtocolProcessor.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -21,9 +22,7 @@ use Predis\Protocol\ResponseReaderInterface;
  * Composite protocol processor for the standard Redis wire protocol using
  * pluggable handlers to serialize requests and deserialize responses.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class CompositeProtocolProcessor implements ProtocolProcessorInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/BulkResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/BulkResponse.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/BulkResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/BulkResponse.php
index 5b0bf3c2d..961c01188 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/BulkResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/BulkResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +20,7 @@ use Predis\Protocol\ProtocolException;
  * Handler for the bulk response type in the standard Redis wire protocol.
  * It translates the payload to a string or a NULL.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class BulkResponse implements ResponseHandlerInterface
 {
@@ -34,7 +33,7 @@ class BulkResponse implements ResponseHandlerInterface
 
         if ("$length" !== $payload) {
             CommunicationException::handle(new ProtocolException(
-                $connection, "Cannot parse '$payload' as a valid length for a bulk response."
+                $connection, "Cannot parse '$payload' as a valid length for a bulk response [{$connection->getParameters()}]"
             ));
         }
 
@@ -47,7 +46,7 @@ class BulkResponse implements ResponseHandlerInterface
         }
 
         CommunicationException::handle(new ProtocolException(
-            $connection, "Value '$payload' is not a valid length for a bulk response."
+            $connection, "Value '$payload' is not a valid length for a bulk response [{$connection->getParameters()}]"
         ));
 
         return;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ErrorResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/ErrorResponse.php
similarity index 82%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ErrorResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/ErrorResponse.php
index 3e18b7b9e..aa400a47b 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ErrorResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/ErrorResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,9 +19,7 @@ use Predis\Response\Error;
  * Handler for the error response type in the standard Redis wire protocol.
  * It translates the payload to a complex response object for Predis.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class ErrorResponse implements ResponseHandlerInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/IntegerResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/IntegerResponse.php
similarity index 78%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/IntegerResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/IntegerResponse.php
index 4639d7792..cb58a3d42 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/IntegerResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/IntegerResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +20,7 @@ use Predis\Protocol\ProtocolException;
  * Handler for the integer response type in the standard Redis wire protocol.
  * It translates the payload an integer or NULL.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class IntegerResponse implements ResponseHandlerInterface
 {
@@ -31,12 +30,14 @@ class IntegerResponse implements ResponseHandlerInterface
     public function handle(CompositeConnectionInterface $connection, $payload)
     {
         if (is_numeric($payload)) {
-            return (int) $payload;
+            $integer = (int) $payload;
+
+            return $integer == $payload ? $integer : $payload;
         }
 
         if ($payload !== 'nil') {
             CommunicationException::handle(new ProtocolException(
-                $connection, "Cannot parse '$payload' as a valid numeric response."
+                $connection, "Cannot parse '$payload' as a valid numeric response [{$connection->getParameters()}]"
             ));
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/MultiBulkResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/MultiBulkResponse.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/MultiBulkResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/MultiBulkResponse.php
index 820b9b4a6..d9c51425d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/MultiBulkResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/MultiBulkResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +20,7 @@ use Predis\Protocol\ProtocolException;
  * Handler for the multibulk response type in the standard Redis wire protocol.
  * It returns multibulk responses as PHP arrays.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class MultiBulkResponse implements ResponseHandlerInterface
 {
@@ -34,7 +33,7 @@ class MultiBulkResponse implements ResponseHandlerInterface
 
         if ("$length" !== $payload) {
             CommunicationException::handle(new ProtocolException(
-                $connection, "Cannot parse '$payload' as a valid length of a multi-bulk response."
+                $connection, "Cannot parse '$payload' as a valid length of a multi-bulk response [{$connection->getParameters()}]"
             ));
         }
 
@@ -42,10 +41,10 @@ class MultiBulkResponse implements ResponseHandlerInterface
             return;
         }
 
-        $list = array();
+        $list = [];
 
         if ($length > 0) {
-            $handlersCache = array();
+            $handlersCache = [];
             $reader = $connection->getProtocol()->getResponseReader();
 
             for ($i = 0; $i < $length; ++$i) {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php
similarity index 88%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php
index ca08a9c53..b1c90665a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/ResponseHandlerInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\Connection\CompositeConnectionInterface;
 
 /**
  * Defines a pluggable handler used to parse a particular type of response.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ResponseHandlerInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StatusResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/StatusResponse.php
similarity index 83%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StatusResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/StatusResponse.php
index 7bde5558f..efc13656a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StatusResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/StatusResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,9 +20,7 @@ use Predis\Response\Status;
  * translates certain classes of status response to PHP objects or just returns
  * the payload as a string.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class StatusResponse implements ResponseHandlerInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php b/plugins/cache-redis/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
similarity index 87%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
rename to plugins/cache-redis/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
index 7cdb736af..7738e9dbe 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/Handler/StreamableMultiBulkResponse.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,9 +24,7 @@ use Predis\Response\Iterator\MultiBulk as MultiBulkIterator;
  * Streamable multibulk responses are not globally supported by the abstractions
  * built-in into Predis, such as transactions or pipelines. Use them with care!
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class StreamableMultiBulkResponse implements ResponseHandlerInterface
 {
@@ -38,7 +37,7 @@ class StreamableMultiBulkResponse implements ResponseHandlerInterface
 
         if ("$length" != $payload) {
             CommunicationException::handle(new ProtocolException(
-                $connection, "Cannot parse '$payload' as a valid length for a multi-bulk response."
+                $connection, "Cannot parse '$payload' as a valid length for a multi-bulk response [{$connection->getParameters()}]"
             ));
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ProtocolProcessor.php b/plugins/cache-redis/Predis/Protocol/Text/ProtocolProcessor.php
similarity index 91%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ProtocolProcessor.php
rename to plugins/cache-redis/Predis/Protocol/Text/ProtocolProcessor.php
index f04c3ed5b..02e0c5d58 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ProtocolProcessor.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/ProtocolProcessor.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -23,18 +24,13 @@ use Predis\Response\Status as StatusResponse;
 /**
  * Protocol processor for the standard Redis wire protocol.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class ProtocolProcessor implements ProtocolProcessorInterface
 {
     protected $mbiterable;
     protected $serializer;
 
-    /**
-     *
-     */
     public function __construct()
     {
         $this->mbiterable = false;
@@ -81,7 +77,7 @@ class ProtocolProcessor implements ProtocolProcessorInterface
                     return new MultiBulkIterator($connection, $count);
                 }
 
-                $multibulk = array();
+                $multibulk = [];
 
                 for ($i = 0; $i < $count; ++$i) {
                     $multibulk[$i] = $this->read($connection);
@@ -90,14 +86,16 @@ class ProtocolProcessor implements ProtocolProcessorInterface
                 return $multibulk;
 
             case ':':
-                return (int) $payload;
+                $integer = (int) $payload;
+
+                return $integer == $payload ? $integer : $payload;
 
             case '-':
                 return new ErrorResponse($payload);
 
             default:
                 CommunicationException::handle(new ProtocolException(
-                    $connection, "Unknown response prefix: '$prefix'."
+                    $connection, "Unknown response prefix: '$prefix' [{$connection->getParameters()}]"
                 ));
 
                 return;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/RequestSerializer.php b/plugins/cache-redis/Predis/Protocol/Text/RequestSerializer.php
similarity index 79%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/RequestSerializer.php
rename to plugins/cache-redis/Predis/Protocol/Text/RequestSerializer.php
index c8cbbfbcd..853bae03a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/RequestSerializer.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/RequestSerializer.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -17,9 +18,7 @@ use Predis\Protocol\RequestSerializerInterface;
 /**
  * Request serializer for the standard Redis wire protocol.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class RequestSerializer implements RequestSerializerInterface
 {
@@ -36,8 +35,7 @@ class RequestSerializer implements RequestSerializerInterface
 
         $buffer = "*{$reqlen}\r\n\${$cmdlen}\r\n{$commandID}\r\n";
 
-        for ($i = 0, $reqlen--; $i < $reqlen; ++$i) {
-            $argument = $arguments[$i];
+        foreach ($arguments as $argument) {
             $arglen = strlen($argument);
             $buffer .= "\${$arglen}\r\n{$argument}\r\n";
         }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ResponseReader.php b/plugins/cache-redis/Predis/Protocol/Text/ResponseReader.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ResponseReader.php
rename to plugins/cache-redis/Predis/Protocol/Text/ResponseReader.php
index d96218dfa..f49c96d26 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Protocol/Text/ResponseReader.php
+++ b/plugins/cache-redis/Predis/Protocol/Text/ResponseReader.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -19,17 +20,12 @@ use Predis\Protocol\ResponseReaderInterface;
 /**
  * Response reader for the standard Redis wire protocol.
  *
- * @link http://redis.io/topics/protocol
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * @see http://redis.io/topics/protocol
  */
 class ResponseReader implements ResponseReaderInterface
 {
     protected $handlers;
 
-    /**
-     *
-     */
     public function __construct()
     {
         $this->handlers = $this->getDefaultHandlers();
@@ -42,13 +38,13 @@ class ResponseReader implements ResponseReaderInterface
      */
     protected function getDefaultHandlers()
     {
-        return array(
+        return [
             '+' => new Handler\StatusResponse(),
             '-' => new Handler\ErrorResponse(),
             ':' => new Handler\IntegerResponse(),
             '$' => new Handler\BulkResponse(),
             '*' => new Handler\MultiBulkResponse(),
-        );
+        ];
     }
 
     /**
@@ -86,18 +82,16 @@ class ResponseReader implements ResponseReaderInterface
         $header = $connection->readLine();
 
         if ($header === '') {
-            $this->onProtocolError($connection, 'Unexpected empty reponse header.');
+            $this->onProtocolError($connection, 'Unexpected empty response header');
         }
 
         $prefix = $header[0];
 
         if (!isset($this->handlers[$prefix])) {
-            $this->onProtocolError($connection, "Unknown response prefix: '$prefix'.");
+            $this->onProtocolError($connection, "Unknown response prefix: '$prefix'");
         }
 
-        $payload = $this->handlers[$prefix]->handle($connection, substr($header, 1));
-
-        return $payload;
+        return $this->handlers[$prefix]->handle($connection, substr($header, 1));
     }
 
     /**
@@ -110,7 +104,7 @@ class ResponseReader implements ResponseReaderInterface
     protected function onProtocolError(CompositeConnectionInterface $connection, $message)
     {
         CommunicationException::handle(
-            new ProtocolException($connection, $message)
+            new ProtocolException($connection, "$message [{$connection->getParameters()}]")
         );
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/AbstractConsumer.php b/plugins/cache-redis/Predis/PubSub/AbstractConsumer.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/PubSub/AbstractConsumer.php
rename to plugins/cache-redis/Predis/PubSub/AbstractConsumer.php
index d7423f1e3..c9ea2d658 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/AbstractConsumer.php
+++ b/plugins/cache-redis/Predis/PubSub/AbstractConsumer.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,27 +12,28 @@
 
 namespace Predis\PubSub;
 
+use Iterator;
+use ReturnTypeWillChange;
+
 /**
  * Base implementation of a PUB/SUB consumer abstraction based on PHP iterators.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class AbstractConsumer implements \Iterator
+abstract class AbstractConsumer implements Iterator
 {
-    const SUBSCRIBE    = 'subscribe';
-    const UNSUBSCRIBE  = 'unsubscribe';
-    const PSUBSCRIBE   = 'psubscribe';
-    const PUNSUBSCRIBE = 'punsubscribe';
-    const MESSAGE      = 'message';
-    const PMESSAGE     = 'pmessage';
-    const PONG         = 'pong';
+    public const SUBSCRIBE = 'subscribe';
+    public const UNSUBSCRIBE = 'unsubscribe';
+    public const PSUBSCRIBE = 'psubscribe';
+    public const PUNSUBSCRIBE = 'punsubscribe';
+    public const MESSAGE = 'message';
+    public const PMESSAGE = 'pmessage';
+    public const PONG = 'pong';
 
-    const STATUS_VALID       = 1;    // 0b0001
-    const STATUS_SUBSCRIBED  = 2;    // 0b0010
-    const STATUS_PSUBSCRIBED = 4;    // 0b0100
+    public const STATUS_VALID = 1;       // 0b0001
+    public const STATUS_SUBSCRIBED = 2;  // 0b0010
+    public const STATUS_PSUBSCRIBED = 4; // 0b0100
 
-    private $position = null;
-    private $statusFlags = self::STATUS_VALID;
+    protected $position;
+    protected $statusFlags = self::STATUS_VALID;
 
     /**
      * Automatically stops the consumer when the garbage collector kicks in.
@@ -56,9 +58,9 @@ abstract class AbstractConsumer implements \Iterator
     /**
      * Subscribes to the specified channels.
      *
-     * @param mixed $channel,... One or more channel names.
+     * @param string ...$channel One or more channel names.
      */
-    public function subscribe($channel /*, ... */)
+    public function subscribe($channel /* , ... */)
     {
         $this->writeRequest(self::SUBSCRIBE, func_get_args());
         $this->statusFlags |= self::STATUS_SUBSCRIBED;
@@ -67,9 +69,9 @@ abstract class AbstractConsumer implements \Iterator
     /**
      * Unsubscribes from the specified channels.
      *
-     * @param string ... One or more channel names.
+     * @param string ...$channel One or more channel names.
      */
-    public function unsubscribe(/* ... */)
+    public function unsubscribe(...$channel)
     {
         $this->writeRequest(self::UNSUBSCRIBE, func_get_args());
     }
@@ -77,9 +79,9 @@ abstract class AbstractConsumer implements \Iterator
     /**
      * Subscribes to the specified channels using a pattern.
      *
-     * @param mixed $pattern,... One or more channel name patterns.
+     * @param string ...$pattern One or more channel name patterns.
      */
-    public function psubscribe($pattern /* ... */)
+    public function psubscribe(...$pattern)
     {
         $this->writeRequest(self::PSUBSCRIBE, func_get_args());
         $this->statusFlags |= self::STATUS_PSUBSCRIBED;
@@ -88,9 +90,9 @@ abstract class AbstractConsumer implements \Iterator
     /**
      * Unsubscribes from the specified channels using a pattern.
      *
-     * @param string ... One or more channel name patterns.
+     * @param string ...$pattern One or more channel name patterns.
      */
-    public function punsubscribe(/* ... */)
+    public function punsubscribe(...$pattern)
     {
         $this->writeRequest(self::PUNSUBSCRIBE, func_get_args());
     }
@@ -103,7 +105,7 @@ abstract class AbstractConsumer implements \Iterator
      */
     public function ping($payload = null)
     {
-        $this->writeRequest('PING', array($payload));
+        $this->writeRequest('PING', [$payload]);
     }
 
     /**
@@ -149,8 +151,9 @@ abstract class AbstractConsumer implements \Iterator
     abstract protected function writeRequest($method, $arguments);
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         // NOOP
@@ -162,22 +165,25 @@ abstract class AbstractConsumer implements \Iterator
      *
      * @return array
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->getValue();
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         if ($this->valid()) {
@@ -192,6 +198,7 @@ abstract class AbstractConsumer implements \Iterator
      *
      * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         $isValid = $this->isFlagSet(self::STATUS_VALID);
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/Consumer.php b/plugins/cache-redis/Predis/PubSub/Consumer.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/PubSub/Consumer.php
rename to plugins/cache-redis/Predis/PubSub/Consumer.php
index 5f2d8a8bc..51ac3cd78 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/Consumer.php
+++ b/plugins/cache-redis/Predis/PubSub/Consumer.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,28 +15,26 @@ namespace Predis\PubSub;
 use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Command\Command;
-use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\Cluster\ClusterInterface;
 use Predis\NotSupportedException;
 
 /**
- * PUB/SUB consumer abstraction.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * PUB/SUB consumer.
  */
 class Consumer extends AbstractConsumer
 {
-    private $client;
-    private $options;
+    protected $client;
+    protected $options;
 
     /**
      * @param ClientInterface $client  Client instance used by the consumer.
      * @param array           $options Options for the consumer initialization.
      */
-    public function __construct(ClientInterface $client, array $options = null)
+    public function __construct(ClientInterface $client, ?array $options = null)
     {
         $this->checkCapabilities($client);
 
-        $this->options = $options ?: array();
+        $this->options = $options ?: [];
         $this->client = $client;
 
         $this->genericSubscribeInit('subscribe');
@@ -60,19 +59,19 @@ class Consumer extends AbstractConsumer
      *
      * @throws NotSupportedException
      */
-    private function checkCapabilities(ClientInterface $client)
+    protected function checkCapabilities(ClientInterface $client)
     {
-        if ($client->getConnection() instanceof AggregateConnectionInterface) {
+        if ($client->getConnection() instanceof ClusterInterface) {
             throw new NotSupportedException(
-                'Cannot initialize a PUB/SUB consumer over aggregate connections.'
+                'Cannot initialize a PUB/SUB consumer over cluster connections.'
             );
         }
 
-        $commands = array('publish', 'subscribe', 'unsubscribe', 'psubscribe', 'punsubscribe');
+        $commands = ['publish', 'subscribe', 'unsubscribe', 'psubscribe', 'punsubscribe'];
 
-        if ($client->getProfile()->supportsCommands($commands) === false) {
+        if (!$client->getCommandFactory()->supports(...$commands)) {
             throw new NotSupportedException(
-                'The current profile does not support PUB/SUB related commands.'
+                'PUB/SUB commands are not supported by the current command factory.'
             );
         }
     }
@@ -82,7 +81,7 @@ class Consumer extends AbstractConsumer
      *
      * @param string $subscribeAction Type of subscription.
      */
-    private function genericSubscribeInit($subscribeAction)
+    protected function genericSubscribeInit($subscribeAction)
     {
         if (isset($this->options[$subscribeAction])) {
             $this->$subscribeAction($this->options[$subscribeAction]);
@@ -129,25 +128,25 @@ class Consumer extends AbstractConsumer
                 // no break
 
             case self::MESSAGE:
-                return (object) array(
+                return (object) [
                     'kind' => $response[0],
                     'channel' => $response[1],
                     'payload' => $response[2],
-                );
+                ];
 
             case self::PMESSAGE:
-                return (object) array(
+                return (object) [
                     'kind' => $response[0],
                     'pattern' => $response[1],
                     'channel' => $response[2],
                     'payload' => $response[3],
-                );
+                ];
 
             case self::PONG:
-                return (object) array(
+                return (object) [
                     'kind' => $response[0],
                     'payload' => $response[1],
-                );
+                ];
 
             default:
                 throw new ClientException(
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/DispatcherLoop.php b/plugins/cache-redis/Predis/PubSub/DispatcherLoop.php
similarity index 85%
rename from snappymail/v/0.0.0/app/libraries/Predis/PubSub/DispatcherLoop.php
rename to plugins/cache-redis/Predis/PubSub/DispatcherLoop.php
index 0d4a08ef7..b6f79cd3d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/PubSub/DispatcherLoop.php
+++ b/plugins/cache-redis/Predis/PubSub/DispatcherLoop.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,11 +12,11 @@
 
 namespace Predis\PubSub;
 
+use InvalidArgumentException;
+
 /**
  * Method-dispatcher loop built around the client-side abstraction of a Redis
  * PUB / SUB context.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class DispatcherLoop
 {
@@ -30,7 +31,7 @@ class DispatcherLoop
      */
     public function __construct(Consumer $pubsub)
     {
-        $this->callbacks = array();
+        $this->callbacks = [];
         $this->pubsub = $pubsub;
     }
 
@@ -39,12 +40,12 @@ class DispatcherLoop
      *
      * @param mixed $callable A callback.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      */
     protected function assertCallback($callable)
     {
         if (!is_callable($callable)) {
-            throw new \InvalidArgumentException('The given argument must be a callable object.');
+            throw new InvalidArgumentException('The given argument must be a callable object.');
         }
     }
 
@@ -91,11 +92,11 @@ class DispatcherLoop
      * Binds a callback to a channel.
      *
      * @param string   $channel  Channel name.
-     * @param Callable $callback A callback.
+     * @param callable $callback A callback.
      */
     public function attachCallback($channel, $callback)
     {
-        $callbackName = $this->getPrefixKeys().$channel;
+        $callbackName = $this->getPrefixKeys() . $channel;
 
         $this->assertCallback($callback);
         $this->callbacks[$callbackName] = $callback;
@@ -109,7 +110,7 @@ class DispatcherLoop
      */
     public function detachCallback($channel)
     {
-        $callbackName = $this->getPrefixKeys().$channel;
+        $callbackName = $this->getPrefixKeys() . $channel;
 
         if (isset($this->callbacks[$callbackName])) {
             unset($this->callbacks[$callbackName]);
@@ -128,7 +129,7 @@ class DispatcherLoop
             if ($kind !== Consumer::MESSAGE && $kind !== Consumer::PMESSAGE) {
                 if (isset($this->subscriptionCallback)) {
                     $callback = $this->subscriptionCallback;
-                    call_user_func($callback, $message);
+                    call_user_func($callback, $message, $this);
                 }
 
                 continue;
@@ -136,10 +137,10 @@ class DispatcherLoop
 
             if (isset($this->callbacks[$message->channel])) {
                 $callback = $this->callbacks[$message->channel];
-                call_user_func($callback, $message->payload);
+                call_user_func($callback, $message->payload, $this);
             } elseif (isset($this->defaultCallback)) {
                 $callback = $this->defaultCallback;
-                call_user_func($callback, $message);
+                call_user_func($callback, $message, $this);
             }
         }
     }
diff --git a/plugins/cache-redis/Predis/PubSub/RelayConsumer.php b/plugins/cache-redis/Predis/PubSub/RelayConsumer.php
new file mode 100644
index 000000000..2af67b844
--- /dev/null
+++ b/plugins/cache-redis/Predis/PubSub/RelayConsumer.php
@@ -0,0 +1,114 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\PubSub;
+
+use Predis\NotSupportedException;
+
+/**
+ * Relay PUB/SUB consumer.
+ */
+class RelayConsumer extends Consumer
+{
+    /**
+     * Subscribes to the specified channels.
+     *
+     * @param string   ...$channel One or more channel names.
+     * @param callable $callback   The message callback.
+     */
+    public function subscribe($channel) // @phpstan-ignore-line
+    {
+        $channels = func_get_args();
+        $callback = array_pop($channels);
+
+        $this->statusFlags |= self::STATUS_SUBSCRIBED;
+
+        $command = $this->client->createCommand('subscribe', [
+            $channels,
+            function ($relay, $channel, $message) use ($callback) {
+                $callback((object) [
+                    'kind' => is_null($message) ? self::SUBSCRIBE : self::MESSAGE,
+                    'channel' => $channel,
+                    'payload' => $message,
+                ], $relay);
+            },
+        ]);
+
+        $this->client->getConnection()->executeCommand($command);
+
+        $this->invalidate();
+    }
+
+    /**
+     * Subscribes to the specified channels using a pattern.
+     *
+     * @param string   ...$pattern One or more channel name patterns.
+     * @param callable $callback   The message callback.
+     */
+    public function psubscribe(...$pattern) // @phpstan-ignore-line
+    {
+        $patterns = func_get_args();
+        $callback = array_pop($patterns);
+
+        $this->statusFlags |= self::STATUS_PSUBSCRIBED;
+
+        $command = $this->client->createCommand('psubscribe', [
+            $patterns,
+            function ($relay, $pattern, $channel, $message) use ($callback) {
+                $callback((object) [
+                    'kind' => is_null($message) ? self::PSUBSCRIBE : self::PMESSAGE,
+                    'pattern' => $pattern,
+                    'channel' => $channel,
+                    'payload' => $message,
+                ], $relay);
+            },
+        ]);
+
+        $this->client->getConnection()->executeCommand($command);
+
+        $this->invalidate();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected function genericSubscribeInit($subscribeAction)
+    {
+        if (isset($this->options[$subscribeAction])) {
+            throw new NotSupportedException('Relay does not support Pub/Sub constructor options.');
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function ping($payload = null)
+    {
+        throw new NotSupportedException('Relay does not support PING in Pub/Sub.');
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function stop($drop = false)
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function __destruct()
+    {
+        // NOOP
+    }
+}
diff --git a/plugins/cache-redis/Predis/Replication/MissingMasterException.php b/plugins/cache-redis/Predis/Replication/MissingMasterException.php
new file mode 100644
index 000000000..d30c259d0
--- /dev/null
+++ b/plugins/cache-redis/Predis/Replication/MissingMasterException.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Replication;
+
+use Predis\ClientException;
+
+/**
+ * Exception class that identifies when master is missing in a replication setup.
+ */
+class MissingMasterException extends ClientException
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Replication/ReplicationStrategy.php b/plugins/cache-redis/Predis/Replication/ReplicationStrategy.php
similarity index 73%
rename from snappymail/v/0.0.0/app/libraries/Predis/Replication/ReplicationStrategy.php
rename to plugins/cache-redis/Predis/Replication/ReplicationStrategy.php
index 0b7694054..f2c1bf56a 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Replication/ReplicationStrategy.php
+++ b/plugins/cache-redis/Predis/Replication/ReplicationStrategy.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -16,23 +17,19 @@ use Predis\NotSupportedException;
 
 /**
  * Defines a strategy for master/slave replication.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ReplicationStrategy
 {
     protected $disallowed;
     protected $readonly;
     protected $readonlySHA1;
+    protected $loadBalancing = true;
 
-    /**
-     *
-     */
     public function __construct()
     {
         $this->disallowed = $this->getDisallowedOperations();
         $this->readonly = $this->getReadOnlyOperations();
-        $this->readonlySHA1 = array();
+        $this->readonlySHA1 = [];
     }
 
     /**
@@ -41,12 +38,15 @@ class ReplicationStrategy
      *
      * @param CommandInterface $command Command instance.
      *
-     * @throws NotSupportedException
-     *
      * @return bool
+     * @throws NotSupportedException
      */
     public function isReadOperation(CommandInterface $command)
     {
+        if (!$this->loadBalancing) {
+            return false;
+        }
+
         if (isset($this->disallowed[$id = $command->getId()])) {
             throw new NotSupportedException(
                 "The command '$id' is not allowed in replication mode."
@@ -62,7 +62,8 @@ class ReplicationStrategy
         }
 
         if (($eval = $id === 'EVAL') || $id === 'EVALSHA') {
-            $sha1 = $eval ? sha1($command->getArgument(0)) : $command->getArgument(0);
+            $argument = $command->getArgument(0);
+            $sha1 = $eval ? sha1(strval($argument)) : $argument;
 
             if (isset($this->readonlySHA1[$sha1])) {
                 if (true === $readonly = $this->readonlySHA1[$sha1]) {
@@ -90,18 +91,54 @@ class ReplicationStrategy
     }
 
     /**
-     * Checks if a SORT command is a readable operation by parsing the arguments
-     * array of the specified commad instance.
+     * Checks if BITFIELD performs a read-only operation by looking for certain
+     * SET and INCRYBY modifiers in the arguments array of the command.
      *
      * @param CommandInterface $command Command instance.
      *
      * @return bool
      */
-    protected function isSortReadOnly(CommandInterface $command)
+    protected function isBitfieldReadOnly(CommandInterface $command)
     {
         $arguments = $command->getArguments();
+        $argc = count($arguments);
 
-        return ($c = count($arguments)) === 1 ? true : $arguments[$c - 2] !== 'STORE';
+        if ($argc >= 2) {
+            for ($i = 1; $i < $argc; ++$i) {
+                $argument = strtoupper($arguments[$i]);
+                if ($argument === 'SET' || $argument === 'INCRBY') {
+                    return false;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks if a GEORADIUS command is a readable operation by parsing the
+     * arguments array of the specified command instance.
+     *
+     * @param CommandInterface $command Command instance.
+     *
+     * @return bool
+     */
+    protected function isGeoradiusReadOnly(CommandInterface $command)
+    {
+        $arguments = $command->getArguments();
+        $argc = count($arguments);
+        $startIndex = $command->getId() === 'GEORADIUS' ? 5 : 4;
+
+        if ($argc > $startIndex) {
+            for ($i = $startIndex; $i < $argc; ++$i) {
+                $argument = strtoupper($arguments[$i]);
+                if ($argument === 'STORE' || $argument === 'STOREDIST') {
+                    return false;
+                }
+            }
+        }
+
+        return true;
     }
 
     /**
@@ -153,7 +190,7 @@ class ReplicationStrategy
      */
     protected function getDisallowedOperations()
     {
-        return array(
+        return [
             'SHUTDOWN' => true,
             'INFO' => true,
             'DBSIZE' => true,
@@ -165,7 +202,7 @@ class ReplicationStrategy
             'BGSAVE' => true,
             'BGREWRITEAOF' => true,
             'SLOWLOG' => true,
-        );
+        ];
     }
 
     /**
@@ -175,7 +212,7 @@ class ReplicationStrategy
      */
     protected function getReadOnlyOperations()
     {
-        return array(
+        return [
             'EXISTS' => true,
             'TYPE' => true,
             'KEYS' => true,
@@ -231,7 +268,25 @@ class ReplicationStrategy
             'BITPOS' => true,
             'TIME' => true,
             'PFCOUNT' => true,
-            'SORT' => array($this, 'isSortReadOnly'),
-        );
+            'BITFIELD' => [$this, 'isBitfieldReadOnly'],
+            'GEOHASH' => true,
+            'GEOPOS' => true,
+            'GEODIST' => true,
+            'GEORADIUS' => [$this, 'isGeoradiusReadOnly'],
+            'GEORADIUSBYMEMBER' => [$this, 'isGeoradiusReadOnly'],
+        ];
+    }
+
+    /**
+     * Disables reads to slaves when using
+     * a replication topology.
+     *
+     * @return self
+     */
+    public function disableLoadBalancing(): self
+    {
+        $this->loadBalancing = false;
+
+        return $this;
     }
 }
diff --git a/plugins/cache-redis/Predis/Replication/RoleException.php b/plugins/cache-redis/Predis/Replication/RoleException.php
new file mode 100644
index 000000000..968b7e2cd
--- /dev/null
+++ b/plugins/cache-redis/Predis/Replication/RoleException.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Predis package.
+ *
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Predis\Replication;
+
+use Predis\CommunicationException;
+
+/**
+ * Exception class that identifies a role mismatch when connecting to node
+ * managed by redis-sentinel.
+ */
+class RoleException extends CommunicationException
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/Error.php b/plugins/cache-redis/Predis/Response/Error.php
similarity index 85%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/Error.php
rename to plugins/cache-redis/Predis/Response/Error.php
index 3933857e2..3a1c50343 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/Error.php
+++ b/plugins/cache-redis/Predis/Response/Error.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis\Response;
 /**
  * Represents an error returned by Redis (-ERR responses) during the execution
  * of a command on the server.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Error implements ErrorInterface
 {
@@ -42,7 +41,7 @@ class Error implements ErrorInterface
      */
     public function getErrorType()
     {
-        list($errorType) = explode(' ', $this->getMessage(), 2);
+        [$errorType] = explode(' ', $this->getMessage(), 2);
 
         return $errorType;
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/ErrorInterface.php b/plugins/cache-redis/Predis/Response/ErrorInterface.php
similarity index 86%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/ErrorInterface.php
rename to plugins/cache-redis/Predis/Response/ErrorInterface.php
index a4a4a02f7..ac3bb16e8 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/ErrorInterface.php
+++ b/plugins/cache-redis/Predis/Response/ErrorInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -14,8 +15,6 @@ namespace Predis\Response;
 /**
  * Represents an error returned by Redis (responses identified by "-" in the
  * Redis protocol) during the execution of an operation on the server.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ErrorInterface extends ResponseInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulk.php b/plugins/cache-redis/Predis/Response/Iterator/MultiBulk.php
similarity index 94%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulk.php
rename to plugins/cache-redis/Predis/Response/Iterator/MultiBulk.php
index b1d29241c..09f4c08e5 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulk.php
+++ b/plugins/cache-redis/Predis/Response/Iterator/MultiBulk.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\Connection\NodeConnectionInterface;
 
 /**
  * Streamable multibulk response.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class MultiBulk extends MultiBulkIterator
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkIterator.php b/plugins/cache-redis/Predis/Response/Iterator/MultiBulkIterator.php
similarity index 80%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkIterator.php
rename to plugins/cache-redis/Predis/Response/Iterator/MultiBulkIterator.php
index 5d328869b..cbc613859 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkIterator.php
+++ b/plugins/cache-redis/Predis/Response/Iterator/MultiBulkIterator.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,7 +12,10 @@
 
 namespace Predis\Response\Iterator;
 
+use Countable;
+use Iterator;
 use Predis\Response\ResponseInterface;
+use ReturnTypeWillChange;
 
 /**
  * Iterator that abstracts the access to multibulk responses allowing them to be
@@ -22,42 +26,44 @@ use Predis\Response\ResponseInterface;
  *
  * Always make sure that the whole iteration is consumed (or dropped) to prevent
  * protocol desynchronization issues.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-abstract class MultiBulkIterator implements \Iterator, \Countable, ResponseInterface
+abstract class MultiBulkIterator implements Iterator, Countable, ResponseInterface
 {
     protected $current;
     protected $position;
     protected $size;
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function rewind()
     {
         // NOOP
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[ReturnTypeWillChange]
     public function current()
     {
         return $this->current;
     }
 
     /**
-     * {@inheritdoc}
+     * @return int|null
      */
+    #[ReturnTypeWillChange]
     public function key()
     {
         return $this->position;
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[ReturnTypeWillChange]
     public function next()
     {
         if (++$this->position < $this->size) {
@@ -66,8 +72,9 @@ abstract class MultiBulkIterator implements \Iterator, \Countable, ResponseInter
     }
 
     /**
-     * {@inheritdoc}
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function valid()
     {
         return $this->position < $this->size;
@@ -82,6 +89,7 @@ abstract class MultiBulkIterator implements \Iterator, \Countable, ResponseInter
      *
      * @return int
      */
+    #[ReturnTypeWillChange]
     public function count()
     {
         return $this->size;
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkTuple.php b/plugins/cache-redis/Predis/Response/Iterator/MultiBulkTuple.php
similarity index 75%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkTuple.php
rename to plugins/cache-redis/Predis/Response/Iterator/MultiBulkTuple.php
index 2b6f593c4..4761f0ec2 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/Iterator/MultiBulkTuple.php
+++ b/plugins/cache-redis/Predis/Response/Iterator/MultiBulkTuple.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,16 +12,19 @@
 
 namespace Predis\Response\Iterator;
 
+use InvalidArgumentException;
+use OuterIterator;
+use ReturnTypeWillChange;
+use UnexpectedValueException;
+
 /**
  * Outer iterator consuming streamable multibulk responses by yielding tuples of
  * keys and values.
  *
  * This wrapper is useful for responses to commands such as `HGETALL` that can
- * be iterater as $key => $value pairs.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
+ * be iterator as $key => $value pairs.
  */
-class MultiBulkTuple extends MultiBulk implements \OuterIterator
+class MultiBulkTuple extends MultiBulk implements OuterIterator
 {
     private $iterator;
 
@@ -42,25 +46,26 @@ class MultiBulkTuple extends MultiBulk implements \OuterIterator
      *
      * @param MultiBulk $iterator Inner multibulk response iterator.
      *
-     * @throws \InvalidArgumentException
-     * @throws \UnexpectedValueException
+     * @throws InvalidArgumentException
+     * @throws UnexpectedValueException
      */
     protected function checkPreconditions(MultiBulk $iterator)
     {
         if ($iterator->getPosition() !== 0) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'Cannot initialize a tuple iterator using an already initiated iterator.'
             );
         }
 
         if (($size = count($iterator)) % 2 !== 0) {
-            throw new \UnexpectedValueException('Invalid response size for a tuple iterator.');
+            throw new UnexpectedValueException('Invalid response size for a tuple iterator.');
         }
     }
 
     /**
-     * {@inheritdoc}
+     * @return MultiBulk
      */
+    #[ReturnTypeWillChange]
     public function getInnerIterator()
     {
         return $this->iterator;
@@ -85,6 +90,6 @@ class MultiBulkTuple extends MultiBulk implements \OuterIterator
         $v = $this->iterator->current();
         $this->iterator->next();
 
-        return array($k, $v);
+        return [$k, $v];
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/ResponseInterface.php b/plugins/cache-redis/Predis/Response/ResponseInterface.php
similarity index 74%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/ResponseInterface.php
rename to plugins/cache-redis/Predis/Response/ResponseInterface.php
index 0af135745..d2f682806 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/ResponseInterface.php
+++ b/plugins/cache-redis/Predis/Response/ResponseInterface.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis\Response;
 
 /**
  * Represents a complex response object from Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 interface ResponseInterface
 {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/ServerException.php b/plugins/cache-redis/Predis/Response/ServerException.php
similarity index 82%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/ServerException.php
rename to plugins/cache-redis/Predis/Response/ServerException.php
index 407dc5b76..305fe4091 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/ServerException.php
+++ b/plugins/cache-redis/Predis/Response/ServerException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\PredisException;
 
 /**
  * Exception class that identifies server-side Redis errors.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class ServerException extends PredisException implements ErrorInterface
 {
@@ -27,7 +26,7 @@ class ServerException extends PredisException implements ErrorInterface
      */
     public function getErrorType()
     {
-        list($errorType) = explode(' ', $this->getMessage(), 2);
+        [$errorType] = explode(' ', $this->getMessage(), 2);
 
         return $errorType;
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Response/Status.php b/plugins/cache-redis/Predis/Response/Status.php
similarity index 92%
rename from snappymail/v/0.0.0/app/libraries/Predis/Response/Status.php
rename to plugins/cache-redis/Predis/Response/Status.php
index 729bb6635..80cab9300 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Response/Status.php
+++ b/plugins/cache-redis/Predis/Response/Status.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,8 +14,6 @@ namespace Predis\Response;
 
 /**
  * Represents a status response returned by Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class Status implements ResponseInterface
 {
@@ -59,7 +58,7 @@ class Status implements ResponseInterface
      *
      * @param string $payload Status response payload.
      *
-     * @return string
+     * @return self
      */
     public static function get($payload)
     {
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Session/Handler.php b/plugins/cache-redis/Predis/Session/Handler.php
similarity index 77%
rename from snappymail/v/0.0.0/app/libraries/Predis/Session/Handler.php
rename to plugins/cache-redis/Predis/Session/Handler.php
index d7509c7af..68c87378d 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Session/Handler.php
+++ b/plugins/cache-redis/Predis/Session/Handler.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -12,6 +13,8 @@
 namespace Predis\Session;
 
 use Predis\ClientInterface;
+use ReturnTypeWillChange;
+use SessionHandlerInterface;
 
 /**
  * Session handler class that relies on Predis\Client to store PHP's sessions
@@ -20,10 +23,8 @@ use Predis\ClientInterface;
  * This class is mostly intended for PHP 5.4 but it can be used under PHP 5.3
  * provided that a polyfill for `SessionHandlerInterface` is defined by either
  * you or an external package such as `symfony/http-foundation`.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
-class Handler implements \SessionHandlerInterface
+class Handler implements SessionHandlerInterface
 {
     protected $client;
     protected $ttl;
@@ -32,7 +33,7 @@ class Handler implements \SessionHandlerInterface
      * @param ClientInterface $client  Fully initialized client instance.
      * @param array           $options Session handler options.
      */
-    public function __construct(ClientInterface $client, array $options = array())
+    public function __construct(ClientInterface $client, array $options = [])
     {
         $this->client = $client;
 
@@ -52,8 +53,11 @@ class Handler implements \SessionHandlerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  string $save_path
+     * @param  string $session_id
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function open($save_path, $session_id)
     {
         // NOOP
@@ -61,8 +65,9 @@ class Handler implements \SessionHandlerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function close()
     {
         // NOOP
@@ -70,8 +75,10 @@ class Handler implements \SessionHandlerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  int  $maxlifetime
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function gc($maxlifetime)
     {
         // NOOP
@@ -79,8 +86,10 @@ class Handler implements \SessionHandlerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  string $session_id
+     * @return string
      */
+    #[ReturnTypeWillChange]
     public function read($session_id)
     {
         if ($data = $this->client->get($session_id)) {
@@ -89,9 +98,13 @@ class Handler implements \SessionHandlerInterface
 
         return '';
     }
+
     /**
-     * {@inheritdoc}
+     * @param  string $session_id
+     * @param  string $session_data
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function write($session_id, $session_data)
     {
         $this->client->setex($session_id, $this->ttl, $session_data);
@@ -100,8 +113,10 @@ class Handler implements \SessionHandlerInterface
     }
 
     /**
-     * {@inheritdoc}
+     * @param  string $session_id
+     * @return bool
      */
+    #[ReturnTypeWillChange]
     public function destroy($session_id)
     {
         $this->client->del($session_id);
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/AbortedMultiExecException.php b/plugins/cache-redis/Predis/Transaction/AbortedMultiExecException.php
similarity index 84%
rename from snappymail/v/0.0.0/app/libraries/Predis/Transaction/AbortedMultiExecException.php
rename to plugins/cache-redis/Predis/Transaction/AbortedMultiExecException.php
index b36f38aac..75fc0bb07 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/AbortedMultiExecException.php
+++ b/plugins/cache-redis/Predis/Transaction/AbortedMultiExecException.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -15,8 +16,6 @@ use Predis\PredisException;
 
 /**
  * Exception class that identifies a MULTI / EXEC transaction aborted by Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class AbortedMultiExecException extends PredisException
 {
@@ -27,9 +26,10 @@ class AbortedMultiExecException extends PredisException
      * @param string    $message     Error message.
      * @param int       $code        Error code.
      */
-    public function __construct(MultiExec $transaction, $message, $code = null)
+    public function __construct(MultiExec $transaction, $message, $code = 0)
     {
-        parent::__construct($message, $code);
+        parent::__construct($message, is_null($code) ? 0 : $code);
+
         $this->transaction = $transaction;
     }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExec.php b/plugins/cache-redis/Predis/Transaction/MultiExec.php
similarity index 81%
rename from snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExec.php
rename to plugins/cache-redis/Predis/Transaction/MultiExec.php
index 0cf1962da..e7cf26944 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExec.php
+++ b/plugins/cache-redis/Predis/Transaction/MultiExec.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -11,24 +12,29 @@
 
 namespace Predis\Transaction;
 
+use Exception;
+use InvalidArgumentException;
 use Predis\ClientContextInterface;
 use Predis\ClientException;
 use Predis\ClientInterface;
 use Predis\Command\CommandInterface;
 use Predis\CommunicationException;
-use Predis\Connection\AggregateConnectionInterface;
+use Predis\Connection\Cluster\ClusterInterface;
+use Predis\Connection\RelayConnection;
 use Predis\NotSupportedException;
 use Predis\Protocol\ProtocolException;
+use Predis\Response\Error;
 use Predis\Response\ErrorInterface as ErrorResponseInterface;
 use Predis\Response\ServerException;
 use Predis\Response\Status as StatusResponse;
+use Relay\Exception as RelayException;
+use Relay\Relay;
+use SplQueue;
 
 /**
  * Client-side abstraction of a Redis transaction based on MULTI / EXEC.
  *
  * {@inheritdoc}
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class MultiExec implements ClientContextInterface
 {
@@ -38,21 +44,21 @@ class MultiExec implements ClientContextInterface
     protected $commands;
     protected $exceptions = true;
     protected $attempts = 0;
-    protected $watchKeys = array();
+    protected $watchKeys = [];
     protected $modeCAS = false;
 
     /**
      * @param ClientInterface $client  Client instance used by the transaction.
      * @param array           $options Initialization options.
      */
-    public function __construct(ClientInterface $client, array $options = null)
+    public function __construct(ClientInterface $client, ?array $options = null)
     {
         $this->assertClient($client);
 
         $this->client = $client;
         $this->state = new MultiExecState();
 
-        $this->configure($client, $options ?: array());
+        $this->configure($client, $options ?: []);
         $this->reset();
     }
 
@@ -66,15 +72,15 @@ class MultiExec implements ClientContextInterface
      */
     private function assertClient(ClientInterface $client)
     {
-        if ($client->getConnection() instanceof AggregateConnectionInterface) {
+        if ($client->getConnection() instanceof ClusterInterface) {
             throw new NotSupportedException(
-                'Cannot initialize a MULTI/EXEC transaction over aggregate connections.'
+                'Cannot initialize a MULTI/EXEC transaction over cluster connections.'
             );
         }
 
-        if (!$client->getProfile()->supportsCommands(array('MULTI', 'EXEC', 'DISCARD'))) {
+        if (!$client->getCommandFactory()->supports('MULTI', 'EXEC', 'DISCARD')) {
             throw new NotSupportedException(
-                'The current profile does not support MULTI, EXEC and DISCARD.'
+                'MULTI, EXEC and DISCARD are not supported by the current command factory.'
             );
         }
     }
@@ -112,7 +118,7 @@ class MultiExec implements ClientContextInterface
     protected function reset()
     {
         $this->state->reset();
-        $this->commands = new \SplQueue();
+        $this->commands = new SplQueue();
     }
 
     /**
@@ -168,15 +174,30 @@ class MultiExec implements ClientContextInterface
      * @param string $commandID Command ID.
      * @param array  $arguments Arguments for the command.
      *
-     * @throws ServerException
-     *
      * @return mixed
+     * @throws ServerException
      */
-    protected function call($commandID, array $arguments = array())
+    protected function call($commandID, array $arguments = [])
     {
-        $response = $this->client->executeCommand(
-            $this->client->createCommand($commandID, $arguments)
-        );
+        try {
+            $response = $this->client->executeCommand(
+                $this->client->createCommand($commandID, $arguments)
+            );
+        } catch (ServerException $exception) {
+            if (!$this->client->getConnection() instanceof RelayConnection) {
+                throw $exception;
+            }
+
+            if (strcasecmp($commandID, 'EXEC') != 0) {
+                throw $exception;
+            }
+
+            if (!strpos($exception->getMessage(), 'RELAY_ERR_REDIS')) {
+                throw $exception;
+            }
+
+            return null;
+        }
 
         if ($response instanceof ErrorResponseInterface) {
             throw new ServerException($response->getMessage());
@@ -190,10 +211,9 @@ class MultiExec implements ClientContextInterface
      *
      * @param CommandInterface $command Command instance.
      *
+     * @return $this|mixed
      * @throws AbortedMultiExecException
      * @throws CommunicationException
-     *
-     * @return $this|mixed
      */
     public function executeCommand(CommandInterface $command)
     {
@@ -207,6 +227,8 @@ class MultiExec implements ClientContextInterface
 
         if ($response instanceof StatusResponse && $response == 'QUEUED') {
             $this->commands->enqueue($command);
+        } elseif ($response instanceof Relay) {
+            $this->commands->enqueue($command);
         } elseif ($response instanceof ErrorResponseInterface) {
             throw new AbortedMultiExecException($this, $response->getMessage());
         } else {
@@ -221,22 +243,21 @@ class MultiExec implements ClientContextInterface
      *
      * @param string|array $keys One or more keys.
      *
+     * @return mixed
      * @throws NotSupportedException
      * @throws ClientException
-     *
-     * @return mixed
      */
     public function watch($keys)
     {
-        if (!$this->client->getProfile()->supportsCommand('WATCH')) {
-            throw new NotSupportedException('WATCH is not supported by the current profile.');
+        if (!$this->client->getCommandFactory()->supports('WATCH')) {
+            throw new NotSupportedException('WATCH is not supported by the current command factory.');
         }
 
         if ($this->state->isWatchAllowed()) {
             throw new ClientException('Sending WATCH after MULTI is not allowed.');
         }
 
-        $response = $this->call('WATCH', is_array($keys) ? $keys : array($keys));
+        $response = $this->call('WATCH', is_array($keys) ? $keys : [$keys]);
         $this->state->flag(MultiExecState::WATCH);
 
         return $response;
@@ -262,20 +283,19 @@ class MultiExec implements ClientContextInterface
     /**
      * Executes UNWATCH.
      *
-     * @throws NotSupportedException
-     *
      * @return MultiExec
+     * @throws NotSupportedException
      */
     public function unwatch()
     {
-        if (!$this->client->getProfile()->supportsCommand('UNWATCH')) {
+        if (!$this->client->getCommandFactory()->supports('UNWATCH')) {
             throw new NotSupportedException(
-                'UNWATCH is not supported by the current profile.'
+                'UNWATCH is not supported by the current command factory.'
             );
         }
 
         $this->state->unflag(MultiExecState::WATCH);
-        $this->__call('UNWATCH', array());
+        $this->__call('UNWATCH', []);
 
         return $this;
     }
@@ -313,7 +333,7 @@ class MultiExec implements ClientContextInterface
      *
      * @param mixed $callable Callback for execution.
      *
-     * @throws \InvalidArgumentException
+     * @throws InvalidArgumentException
      * @throws ClientException
      */
     private function checkBeforeExecution($callable)
@@ -326,7 +346,7 @@ class MultiExec implements ClientContextInterface
 
         if ($callable) {
             if (!is_callable($callable)) {
-                throw new \InvalidArgumentException('The argument must be a callable object.');
+                throw new InvalidArgumentException('The argument must be a callable object.');
             }
 
             if (!$this->commands->isEmpty()) {
@@ -350,11 +370,10 @@ class MultiExec implements ClientContextInterface
      *
      * @param mixed $callable Optional callback for execution.
      *
+     * @return array
      * @throws CommunicationException
      * @throws AbortedMultiExecException
      * @throws ServerException
-     *
-     * @return array
      */
     public function execute($callable = null)
     {
@@ -378,7 +397,9 @@ class MultiExec implements ClientContextInterface
 
             $execResponse = $this->call('EXEC');
 
-            if ($execResponse === null) {
+            // The additional `false` check is needed for Relay,
+            // let's hope it won't break anything
+            if ($execResponse === null || $execResponse === false) {
                 if ($attempts === 0) {
                     throw new AbortedMultiExecException(
                         $this, 'The current transaction has been aborted by the server.'
@@ -393,7 +414,7 @@ class MultiExec implements ClientContextInterface
             break;
         } while ($attempts-- > 0);
 
-        $response = array();
+        $response = [];
         $commands = $this->commands;
         $size = count($execResponse);
 
@@ -404,10 +425,20 @@ class MultiExec implements ClientContextInterface
         for ($i = 0; $i < $size; ++$i) {
             $cmdResponse = $execResponse[$i];
 
-            if ($cmdResponse instanceof ErrorResponseInterface && $this->exceptions) {
+            if ($this->exceptions && $cmdResponse instanceof ErrorResponseInterface) {
                 throw new ServerException($cmdResponse->getMessage());
             }
 
+            if ($cmdResponse instanceof RelayException) {
+                if ($this->exceptions) {
+                    throw new ServerException($cmdResponse->getMessage(), $cmdResponse->getCode(), $cmdResponse);
+                }
+
+                $commands->dequeue();
+                $response[$i] = new Error($cmdResponse->getMessage());
+                continue;
+            }
+
             $response[$i] = $commands->dequeue()->parseResponse($cmdResponse);
         }
 
@@ -433,7 +464,7 @@ class MultiExec implements ClientContextInterface
             // NOOP
         } catch (ServerException $exception) {
             // NOOP
-        } catch (\Exception $exception) {
+        } catch (Exception $exception) {
             $this->discard();
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExecState.php b/plugins/cache-redis/Predis/Transaction/MultiExecState.php
similarity index 89%
rename from snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExecState.php
rename to plugins/cache-redis/Predis/Transaction/MultiExecState.php
index a0a828529..c9be15c87 100644
--- a/snappymail/v/0.0.0/app/libraries/Predis/Transaction/MultiExecState.php
+++ b/plugins/cache-redis/Predis/Transaction/MultiExecState.php
@@ -3,7 +3,8 @@
 /*
  * This file is part of the Predis package.
  *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
+ * (c) 2009-2020 Daniele Alessandri
+ * (c) 2021-2023 Till Krüss
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -13,22 +14,17 @@ namespace Predis\Transaction;
 
 /**
  * Utility class used to track the state of a MULTI / EXEC transaction.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
  */
 class MultiExecState
 {
-    const INITIALIZED = 1;    // 0b00001
-    const INSIDEBLOCK = 2;    // 0b00010
-    const DISCARDED   = 4;    // 0b00100
-    const CAS         = 8;    // 0b01000
-    const WATCH       = 16;   // 0b10000
+    public const INITIALIZED = 1;    // 0b00001
+    public const INSIDEBLOCK = 2;    // 0b00010
+    public const DISCARDED = 4;    // 0b00100
+    public const CAS = 8;    // 0b01000
+    public const WATCH = 16;   // 0b10000
 
     private $flags;
 
-    /**
-     *
-     */
     public function __construct()
     {
         $this->flags = 0;
diff --git a/plugins/cache-redis/README.md b/plugins/cache-redis/README.md
new file mode 100644
index 000000000..d73754706
--- /dev/null
+++ b/plugins/cache-redis/README.md
@@ -0,0 +1,466 @@
+# Predis #
+
+[![Software license][ico-license]](LICENSE)
+[![Latest stable][ico-version-stable]][link-releases]
+[![Latest development][ico-version-dev]][link-releases]
+[![Monthly installs][ico-downloads-monthly]][link-downloads]
+[![Build status][ico-build]][link-actions]
+[![Coverage Status][ico-coverage]][link-coverage]
+
+A flexible and feature-complete [Redis](http://redis.io) client for PHP 7.2 and newer.
+
+More details about this project can be found on the [frequently asked questions](FAQ.md).
+
+
+## Main features ##
+
+- Support for Redis from __3.0__ to __7.0__.
+- Support for clustering using client-side sharding and pluggable keyspace distributors.
+- Support for [redis-cluster](http://redis.io/topics/cluster-tutorial) (Redis >= 3.0).
+- Support for master-slave replication setups and [redis-sentinel](http://redis.io/topics/sentinel).
+- Transparent key prefixing of keys using a customizable prefix strategy.
+- Command pipelining on both single nodes and clusters (client-side sharding only).
+- Abstraction for Redis transactions (Redis >= 2.0) and CAS operations (Redis >= 2.2).
+- Abstraction for Lua scripting (Redis >= 2.6) and automatic switching between `EVALSHA` or `EVAL`.
+- Abstraction for `SCAN`, `SSCAN`, `ZSCAN` and `HSCAN` (Redis >= 2.8) based on PHP iterators.
+- Connections are established lazily by the client upon the first command and can be persisted.
+- Connections can be established via TCP/IP (also TLS/SSL-encrypted) or UNIX domain sockets.
+- Support for custom connection classes for providing different network or protocol backends.
+- Flexible system for defining custom commands and override the default ones.
+
+
+## How to _install_ and use Predis ##
+
+This library can be found on [Packagist](http://packagist.org/packages/predis/predis) for an easier
+management of projects dependencies using [Composer](http://packagist.org/about-composer).
+Compressed archives of each release are [available on GitHub](https://github.com/predis/predis/releases).
+
+```shell
+composer require predis/predis
+```
+
+
+### Loading the library ###
+
+Predis relies on the autoloading features of PHP to load its files when needed and complies with the
+[PSR-4 standard](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-4-autoloader.md).
+Autoloading is handled automatically when dependencies are managed through Composer, but it is also
+possible to leverage its own autoloader in projects or scripts lacking any autoload facility:
+
+```php
+// Prepend a base path if Predis is not available in your "include_path".
+require 'Predis/Autoloader.php';
+
+Predis\Autoloader::register();
+```
+
+
+### Connecting to Redis ###
+
+When creating a client instance without passing any connection parameter, Predis assumes `127.0.0.1`
+and `6379` as default host and port. The default timeout for the `connect()` operation is 5 seconds:
+
+```php
+$client = new Predis\Client();
+$client->set('foo', 'bar');
+$value = $client->get('foo');
+```
+
+Connection parameters can be supplied either in the form of URI strings or named arrays. The latter
+is the preferred way to supply parameters, but URI strings can be useful when parameters are read
+from non-structured or partially-structured sources:
+
+```php
+// Parameters passed using a named array:
+$client = new Predis\Client([
+    'scheme' => 'tcp',
+    'host'   => '10.0.0.1',
+    'port'   => 6379,
+]);
+
+// Same set of parameters, passed using an URI string:
+$client = new Predis\Client('tcp://10.0.0.1:6379');
+```
+
+Password protected servers can be accessed by adding `password` to the parameters set. When ACLs are
+enabled on Redis >= 6.0, both `username` and `password` are required for user authentication.
+
+It is also possible to connect to local instances of Redis using UNIX domain sockets, in this case
+the parameters must use the `unix` scheme and specify a path for the socket file:
+
+```php
+$client = new Predis\Client(['scheme' => 'unix', 'path' => '/path/to/redis.sock']);
+$client = new Predis\Client('unix:/path/to/redis.sock');
+```
+
+The client can leverage TLS/SSL encryption to connect to secured remote Redis instances without the
+need to configure an SSL proxy like stunnel. This can be useful when connecting to nodes running on
+various cloud hosting providers. Encryption can be enabled with using the `tls` scheme and an array
+of suitable [options](http://php.net/manual/context.ssl.php) passed via the `ssl` parameter:
+
+```php
+// Named array of connection parameters:
+$client = new Predis\Client([
+  'scheme' => 'tls',
+  'ssl'    => ['cafile' => 'private.pem', 'verify_peer' => true],
+]);
+
+// Same set of parameters, but using an URI string:
+$client = new Predis\Client('tls://127.0.0.1?ssl[cafile]=private.pem&ssl[verify_peer]=1');
+```
+
+The connection schemes [`redis`](http://www.iana.org/assignments/uri-schemes/prov/redis) (alias of
+`tcp`) and [`rediss`](http://www.iana.org/assignments/uri-schemes/prov/rediss) (alias of `tls`) are
+also supported, with the difference that URI strings containing these schemes are parsed following
+the rules described on their respective IANA provisional registration documents.
+
+The actual list of supported connection parameters can vary depending on each connection backend so
+it is recommended to refer to their specific documentation or implementation for details.
+
+Predis can aggregate multiple connections when providing an array of connection parameters and the
+appropriate option to instruct the client about how to aggregate them (clustering, replication or a
+custom aggregation logic). Named arrays and URI strings can be mixed when providing configurations
+for each node:
+
+```php
+$client = new Predis\Client([
+    'tcp://10.0.0.1?alias=first-node', ['host' => '10.0.0.2', 'alias' => 'second-node'],
+], [
+    'cluster' => 'predis',
+]);
+```
+
+See the [aggregate connections](#aggregate-connections) section of this document for more details.
+
+Connections to Redis are lazy meaning that the client connects to a server only if and when needed.
+While it is recommended to let the client do its own stuff under the hood, there may be times when
+it is still desired to have control of when the connection is opened or closed: this can easily be
+achieved by invoking `$client->connect()` and `$client->disconnect()`. Please note that the effect
+of these methods on aggregate connections may differ depending on each specific implementation.
+
+
+### Client configuration ###
+
+Many aspects and behaviors of the client can be configured by passing specific client options to the
+second argument of `Predis\Client::__construct()`:
+
+```php
+$client = new Predis\Client($parameters, ['prefix' => 'sample:']);
+```
+
+Options are managed using a mini DI-alike container and their values can be lazily initialized only
+when needed. The client options supported by default in Predis are:
+
+  - `prefix`: prefix string applied to every key found in commands.
+  - `exceptions`: whether the client should throw or return responses upon Redis errors.
+  - `connections`: list of connection backends or a connection factory instance.
+  - `cluster`: specifies a cluster backend (`predis`, `redis` or callable).
+  - `replication`: specifies a replication backend (`predis`, `sentinel` or callable).
+  - `aggregate`: configures the client with a custom aggregate connection (callable).
+  - `parameters`: list of default connection parameters for aggregate connections.
+  - `commands`: specifies a command factory instance to use through the library.
+
+Users can also provide custom options with values or callable objects (for lazy initialization) that
+are stored in the options container for later use through the library.
+
+
+### Aggregate connections ###
+
+Aggregate connections are the foundation upon which Predis implements clustering and replication and
+they are used to group multiple connections to single Redis nodes and hide the specific logic needed
+to handle them properly depending on the context. Aggregate connections usually require an array of
+connection parameters along with the appropriate client option when creating a new client instance.
+
+#### Cluster ####
+
+Predis can be configured to work in clustering mode with a traditional client-side sharding approach
+to create a cluster of independent nodes and distribute the keyspace among them. This approach needs
+some sort of external health monitoring of nodes and requires the keyspace to be rebalanced manually
+when nodes are added or removed:
+
+```php
+$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options    = ['cluster' => 'predis'];
+
+$client = new Predis\Client($parameters);
+```
+
+Along with Redis 3.0, a new supervised and coordinated type of clustering was introduced in the form
+of [redis-cluster](http://redis.io/topics/cluster-tutorial). This kind of approach uses a different
+algorithm to distribute the keyspaces, with Redis nodes coordinating themselves by communicating via
+a gossip protocol to handle health status, rebalancing, nodes discovery and request redirection. In
+order to connect to a cluster managed by redis-cluster, the client requires a list of its nodes (not
+necessarily complete since it will automatically discover new nodes if necessary) and the `cluster`
+client options set to `redis`:
+
+```php
+$parameters = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options    = ['cluster' => 'redis'];
+
+$client = new Predis\Client($parameters, $options);
+```
+
+#### Replication ####
+
+The client can be configured to operate in a single master / multiple slaves setup to provide better
+service availability. When using replication, Predis recognizes read-only commands and sends them to
+a random slave in order to provide some sort of load-balancing and switches to the master as soon as
+it detects a command that performs any kind of operation that would end up modifying the keyspace or
+the value of a key. Instead of raising a connection error when a slave fails, the client attempts to
+fall back to a different slave among the ones provided in the configuration.
+
+The basic configuration needed to use the client in replication mode requires one Redis server to be
+identified as the master (this can be done via connection parameters by setting the `role` parameter
+to `master`) and one or more slaves (in this case setting `role` to `slave` for slaves is optional):
+
+```php
+$parameters = ['tcp://10.0.0.1?role=master', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options    = ['replication' => 'predis'];
+
+$client = new Predis\Client($parameters, $options);
+```
+
+The above configuration has a static list of servers and relies entirely on the client's logic, but
+it is possible to rely on [`redis-sentinel`](http://redis.io/topics/sentinel) for a more robust HA
+environment with sentinel servers acting as a source of authority for clients for service discovery.
+The minimum configuration required by the client to work with redis-sentinel is a list of connection
+parameters pointing to a bunch of sentinel instances, the `replication` option set to `sentinel` and
+the `service` option set to the name of the service:
+
+```php
+$sentinels = ['tcp://10.0.0.1', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options   = ['replication' => 'sentinel', 'service' => 'mymaster'];
+
+$client = new Predis\Client($sentinels, $options);
+```
+
+If the master and slave nodes are configured to require an authentication from clients, a password
+must be provided via the global `parameters` client option. This option can also be used to specify
+a different database index. The client options array would then look like this:
+
+```php
+$options = [
+    'replication' => 'sentinel',
+    'service' => 'mymaster',
+    'parameters' => [
+        'password' => $secretpassword,
+        'database' => 10,
+    ],
+];
+```
+
+While Predis is able to distinguish commands performing write and read-only operations, `EVAL` and
+`EVALSHA` represent a corner case in which the client switches to the master node because it cannot
+tell when a Lua script is safe to be executed on slaves. While this is indeed the default behavior,
+when certain Lua scripts do not perform write operations it is possible to provide an hint to tell
+the client to stick with slaves for their execution:
+
+```php
+$parameters = ['tcp://10.0.0.1?role=master', 'tcp://10.0.0.2', 'tcp://10.0.0.3'];
+$options    = ['replication' => function () {
+    // Set scripts that won't trigger a switch from a slave to the master node.
+    $strategy = new Predis\Replication\ReplicationStrategy();
+    $strategy->setScriptReadOnly($LUA_SCRIPT);
+
+    return new Predis\Connection\Replication\MasterSlaveReplication($strategy);
+}];
+
+$client = new Predis\Client($parameters, $options);
+$client->eval($LUA_SCRIPT, 0);             // Sticks to slave using `eval`...
+$client->evalsha(sha1($LUA_SCRIPT), 0);    // ... and `evalsha`, too.
+```
+
+The [`examples`](examples/) directory contains a few scripts that demonstrate how the client can be
+configured and used to leverage replication in both basic and complex scenarios.
+
+
+### Command pipelines ###
+
+Pipelining can help with performances when many commands need to be sent to a server by reducing the
+latency introduced by network round-trip timings. Pipelining also works with aggregate connections.
+The client can execute the pipeline inside a callable block or return a pipeline instance with the
+ability to chain commands thanks to its fluent interface:
+
+```php
+// Executes a pipeline inside the given callable block:
+$responses = $client->pipeline(function ($pipe) {
+    for ($i = 0; $i < 1000; $i++) {
+        $pipe->set("key:$i", str_pad($i, 4, '0', 0));
+        $pipe->get("key:$i");
+    }
+});
+
+// Returns a pipeline that can be chained thanks to its fluent interface:
+$responses = $client->pipeline()->set('foo', 'bar')->get('foo')->execute();
+```
+
+
+### Transactions ###
+
+The client provides an abstraction for Redis transactions based on `MULTI` and `EXEC` with a similar
+interface to command pipelines:
+
+```php
+// Executes a transaction inside the given callable block:
+$responses = $client->transaction(function ($tx) {
+    $tx->set('foo', 'bar');
+    $tx->get('foo');
+});
+
+// Returns a transaction that can be chained thanks to its fluent interface:
+$responses = $client->transaction()->set('foo', 'bar')->get('foo')->execute();
+```
+
+This abstraction can perform check-and-set operations thanks to `WATCH` and `UNWATCH` and provides
+automatic retries of transactions aborted by Redis when `WATCH`ed keys are touched. For an example
+of a transaction using CAS you can see [the following example](examples/transaction_using_cas.php).
+
+
+### Adding new commands ###
+
+While we try to update Predis to stay up to date with all the commands available in Redis, you might
+prefer to stick with an old version of the library or provide a different way to filter arguments or
+parse responses for specific commands. To achieve that, Predis provides the ability to implement new
+command classes to define or override commands in the default command factory used by the client:
+
+```php
+// Define a new command by extending Predis\Command\Command:
+class BrandNewRedisCommand extends Predis\Command\Command
+{
+    public function getId()
+    {
+        return 'NEWCMD';
+    }
+}
+
+// Inject your command in the current command factory:
+$client = new Predis\Client($parameters, [
+    'commands' => [
+        'newcmd' => 'BrandNewRedisCommand',
+    ],
+]);
+
+$response = $client->newcmd();
+```
+
+There is also a method to send raw commands without filtering their arguments or parsing responses.
+Users must provide the list of arguments for the command as an array, following the signatures as
+defined by the [Redis documentation for commands](http://redis.io/commands):
+
+```php
+$response = $client->executeRaw(['SET', 'foo', 'bar']);
+```
+
+
+### Script commands ###
+
+While it is possible to leverage [Lua scripting](http://redis.io/commands/eval) on Redis 2.6+ using
+directly [`EVAL`](http://redis.io/commands/eval) and [`EVALSHA`](http://redis.io/commands/evalsha),
+Predis offers script commands as an higher level abstraction built upon them to make things simple.
+Script commands can be registered in the command factory used by the client and are accessible as if
+they were plain Redis commands, but they define Lua scripts that get transmitted to the server for
+remote execution. Internally they use [`EVALSHA`](http://redis.io/commands/evalsha) by default and
+identify a script by its SHA1 hash to save bandwidth, but [`EVAL`](http://redis.io/commands/eval)
+is used as a fall back when needed:
+
+```php
+// Define a new script command by extending Predis\Command\ScriptCommand:
+class ListPushRandomValue extends Predis\Command\ScriptCommand
+{
+    public function getKeysCount()
+    {
+        return 1;
+    }
+
+    public function getScript()
+    {
+        return <<<LUA
+math.randomseed(ARGV[1])
+local rnd = tostring(math.random())
+redis.call('lpush', KEYS[1], rnd)
+return rnd
+LUA;
+    }
+}
+
+// Inject the script command in the current command factory:
+$client = new Predis\Client($parameters, [
+    'commands' => [
+        'lpushrand' => 'ListPushRandomValue',
+    ],
+]);
+
+$response = $client->lpushrand('random_values', $seed = mt_rand());
+```
+
+
+### Customizable connection backends ###
+
+Predis can use different connection backends to connect to Redis. The builtin Relay integration
+leverages the [Relay](https://github.com/cachewerk/relay) extension for PHP for major performance
+gains, by caching a partial replica of the Redis dataset in PHP shared runtime memory.
+
+```php
+$client = new Predis\Client('tcp://127.0.0.1', [
+    'connections' => 'relay',
+]);
+```
+
+Developers can create their own connection classes to support whole new network backends, extend
+existing classes or provide completely different implementations. Connection classes must implement
+`Predis\Connection\NodeConnectionInterface` or extend `Predis\Connection\AbstractConnection`:
+
+```php
+class MyConnectionClass implements Predis\Connection\NodeConnectionInterface
+{
+    // Implementation goes here...
+}
+
+// Use MyConnectionClass to handle connections for the `tcp` scheme:
+$client = new Predis\Client('tcp://127.0.0.1', [
+    'connections' => ['tcp' => 'MyConnectionClass'],
+]);
+```
+
+For a more in-depth insight on how to create new connection backends you can refer to the actual
+implementation of the standard connection classes available in the `Predis\Connection` namespace.
+
+
+## Development ##
+
+
+### Reporting bugs and contributing code ###
+
+Contributions to Predis are highly appreciated either in the form of pull requests for new features,
+bug fixes, or just bug reports. We only ask you to adhere to issue and pull request templates.
+
+
+### Test suite ###
+
+__ATTENTION__: Do not ever run the test suite shipped with Predis against instances of Redis running
+in production environments or containing data you are interested in!
+
+Predis has a comprehensive test suite covering every aspect of the library and that can optionally
+perform integration tests against a running instance of Redis (required >= 2.4.0 in order to verify
+the correct behavior of the implementation of each command. Integration tests for unsupported Redis
+commands are automatically skipped. If you do not have Redis up and running, integration tests can
+be disabled. See [the tests README](tests/README.md) for more details about testing this library.
+
+Predis uses GitHub Actions for continuous integration and the history for past and current builds can be
+found [on its actions page](https://github.com/predis/predis/actions).
+
+### License ###
+
+The code for Predis is distributed under the terms of the MIT license (see [LICENSE](LICENSE)).
+
+[ico-license]: https://img.shields.io/github/license/predis/predis.svg?style=flat-square
+[ico-version-stable]: https://img.shields.io/github/v/tag/predis/predis?label=stable&style=flat-square
+[ico-version-dev]: https://img.shields.io/github/v/tag/predis/predis?include_prereleases&label=pre-release&style=flat-square
+[ico-downloads-monthly]: https://img.shields.io/packagist/dm/predis/predis.svg?style=flat-square
+[ico-build]: https://img.shields.io/github/actions/workflow/status/predis/predis/tests.yml?branch=main&style=flat-square
+[ico-coverage]: https://img.shields.io/coverallsCoverage/github/predis/predis?style=flat-square
+
+[link-releases]: https://github.com/predis/predis/releases
+[link-actions]: https://github.com/predis/predis/actions
+[link-downloads]: https://packagist.org/packages/predis/predis/stats
+[link-coverage]: https://coveralls.io/github/predis/predis
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Redis.php b/plugins/cache-redis/Redis.php
similarity index 67%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Redis.php
rename to plugins/cache-redis/Redis.php
index 94345c037..ea41a148c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/Redis.php
+++ b/plugins/cache-redis/Redis.php
@@ -18,23 +18,16 @@ namespace MailSo\Cache\Drivers;
  */
 class Redis implements \MailSo\Cache\DriverInterface
 {
-	/**
-	 * @var int
-	 */
-	private $iExpire;
+	private int $iExpire;
 
 	/**
-	 * @var \Memcache|null
+	 * @var \Predis\Client|null
 	 */
 	private $oRedis;
 
-	/**
-	 * @var string
-	 */
-	private $sKeyPrefix;
+	private string $sKeyPrefix;
 
-
-	function __construct(string $sHost = '127.0.0.1', int $iPort = 6379, int $iExpire = 43200, string $sKeyPrefix = '')
+	function __construct(string $sHost = '127.0.0.1', int $iPort = 6379, int $iExpire = 43200)
 	{
 		$this->iExpire = 0 < $iExpire ? $iExpire : 43200;
 
@@ -49,8 +42,7 @@ class Redis implements \MailSo\Cache\DriverInterface
 
 			$this->oRedis->connect();
 
-			if (!$this->oRedis->isConnected())
-			{
+			if (!$this->oRedis->isConnected()) {
 				$this->oRedis = null;
 			}
 		}
@@ -59,19 +51,19 @@ class Redis implements \MailSo\Cache\DriverInterface
 			$this->oRedis = null;
 			unset($oExc);
 		}
+	}
 
-		$this->sKeyPrefix = $sKeyPrefix;
-		if (!empty($this->sKeyPrefix))
-		{
-			$this->sKeyPrefix =
-				\preg_replace('/[^a-zA-Z0-9_]/', '_', rtrim(trim($this->sKeyPrefix), '\\/')).'/';
-		}
+	public function setPrefix(string $sKeyPrefix) : void
+	{
+		$sKeyPrefix = \rtrim(\trim($sKeyPrefix), '\\/');
+		$this->sKeyPrefix = empty($sKeyPrefix)
+			? $sKeyPrefix
+			: \preg_replace('/[^a-zA-Z0-9_]/', '_', $sKeyPrefix).'/';
 	}
 
 	public function Set(string $sKey, string $sValue) : bool
 	{
-		if (!$this->oRedis)
-		{
+		if (!$this->oRedis) {
 			return false;
 		}
 
@@ -80,24 +72,27 @@ class Redis implements \MailSo\Cache\DriverInterface
 		return $sValue === true || $sValue == 'OK';
 	}
 
-	public function Get(string $sKey) : string
+	public function Exists(string $sKey) : bool
+	{
+		return $this->oRedis && $this->oRedis->exists($this->generateCachedKey($sKey));
+	}
+
+	public function Get(string $sKey) : ?string
 	{
 		$sValue = $this->oRedis ? $this->oRedis->get($this->generateCachedKey($sKey)) : '';
-		return \is_string($sValue) ? $sValue : '';
+		return \is_string($sValue) ? $sValue : null;
 	}
 
 	public function Delete(string $sKey) : void
 	{
-		if ($this->oRedis)
-		{
+		if ($this->oRedis) {
 			$this->oRedis->del($this->generateCachedKey($sKey));
 		}
 	}
 
 	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
-		if (0 === $iTimeToClearInHours && $this->oRedis)
-		{
+		if (0 === $iTimeToClearInHours && $this->oRedis) {
 			return $this->oRedis->flushdb();
 		}
 
diff --git a/plugins/cache-redis/index.php b/plugins/cache-redis/index.php
new file mode 100644
index 000000000..8387ebb75
--- /dev/null
+++ b/plugins/cache-redis/index.php
@@ -0,0 +1,58 @@
+<?php
+
+class CacheRedisPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+//	use \MailSo\Log\Inherit;
+
+	const
+		NAME = 'Cache Redis',
+		VERSION = '2.36.2',
+		RELEASE = '2024-04-08',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Cache',
+		DESCRIPTION = 'Cache handler using Redis';
+
+	public function Init() : void
+	{
+		spl_autoload_register(function($sClassName){
+			$file = __DIR__ . DIRECTORY_SEPARATOR . strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php';
+			is_file($file) && include_once $file;
+		});
+		if (\class_exists('Predis\Client')) {
+			$this->addHook('main.fabrica', 'MainFabrica');
+		}
+	}
+
+	public function Supported() : string
+	{
+		return '';
+	}
+
+	public function MainFabrica($sName, &$mResult)
+	{
+		if ('cache' == $sName) {
+			require_once __DIR__ . '/Redis.php';
+			$mResult = new \MailSo\Cache\Drivers\Redis(
+				$this->Config()->Get('plugin', 'host', '127.0.0.1'),
+				(int) $this->Config()->Get('plugin', 'port', 6379)
+			);
+		}
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('host')->SetLabel('Host')
+				->SetDescription('Hostname of the redis server')
+				->SetDefaultValue('127.0.0.1'),
+			\RainLoop\Plugins\Property::NewInstance('port')->SetLabel('Port')
+				->SetDescription('Port of the redis server')
+				->SetDefaultValue(6379)
+/*
+			,\RainLoop\Plugins\Property::NewInstance('password')->SetLabel('Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
+				->SetDefaultValue('')
+*/
+		);
+	}
+}
diff --git a/plugins/change-password-cpanel/driver.php b/plugins/change-password-cpanel/driver.php
new file mode 100644
index 000000000..61d8d222a
--- /dev/null
+++ b/plugins/change-password-cpanel/driver.php
@@ -0,0 +1,121 @@
+<?php
+/**
+ * TODO: convert to https://api.docs.cpanel.net/openapi/cpanel/operation/passwd_pop/
+ * https://github.com/CpanelInc/xmlapi-php
+ */
+
+use SnappyMail\SensitiveString;
+
+class ChangePasswordCPanelDriver
+{
+	const
+		NAME        = 'cPanel',
+		DESCRIPTION = 'Change passwords in cPanel.';
+
+	private \RainLoop\Config\Plugin $oConfig;
+
+	private \MailSo\Log\Logger $oLogger;
+
+	function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+	{
+		$this->oConfig = $oConfig;
+		$this->oLogger = $oLogger;
+	}
+
+	public static function isSupported() : bool
+	{
+		return !empty($_ENV['CPANEL']) && \is_readable('/usr/local/cpanel/php/cpanel.php');
+	}
+
+	public static function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('cpanel_host')->SetLabel('cPanel Host')
+				->SetDefaultValue('127.0.0.1'),
+			\RainLoop\Plugins\Property::NewInstance('cpanel_port')->SetLabel('cPanel Port')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
+				->SetDefaultValue(2087),
+			\RainLoop\Plugins\Property::NewInstance('cpanel_ssl')->SetLabel('Use SSL')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false),
+			\RainLoop\Plugins\Property::NewInstance('cpanel_user')->SetLabel('cPanel User')
+				->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('cpanel_pass')->SetLabel('cPanel Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
+				->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('cpanel_allowed_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
+	{
+		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'cpanel_allowed_emails', ''))) {
+			return false;
+		}
+
+		$this->oLogger->Write('CPANEL: Try to change password for '.$oAccount->Email());
+
+		if (!\class_exists('cPanel\\jsonapi')) {
+			require_once __DIR__ . '/jsonapi.php';
+		}
+
+		$sHost = $this->oConfig->Get('plugin', 'cpanel_host', '127.0.0.1');
+		$iPort = $this->oConfig->Get('plugin', 'cpanel_port', 2087);
+		$sUser = $this->oConfig->Get('plugin', 'cpanel_user', '');
+		$sPassword = $this->oConfig->Get('plugin', 'cpanel_pass', '');
+
+		if (empty($sHost) || 1 > $iPort || !\strlen($sUser) || !\strlen($sPassword)) {
+			$this->oLogger->Write('CPANEL: Incorrent configuration data', \MailSo\Log\Enumerations\Type::ERROR);
+			return false;
+		}
+
+		$sEmail = $oAccount->Email();
+		$sEmailUser = \MailSo\Base\Utils::getEmailAddressLocalPart($sEmail);
+		$sEmailDomain = \MailSo\Base\Utils::getEmailAddressDomain($sEmail);
+
+		$sHost = \str_replace('{user:domain}', $sEmailDomain, $sHost);
+		$sUser = \str_replace('{user:email}', $sEmail, $sUser);
+		$sUser = \str_replace('{user:login}', $sEmailUser, $sUser);
+		$sPassword = \str_replace('{user:password}', (string) $oPrevPassword, $sPassword);
+
+		$bResult = false;
+		try
+		{
+			$oJSONApi = new \cPanel\jsonapi($sHost);
+			$oJSONApi->set_port($iPort);
+			$oJSONApi->set_protocol($this->oConfig->Get('plugin', 'cpanel_ssl', false) ? 'https' : 'http');
+			$oJSONApi->set_debug(false);
+//			$oJSONApi->set_http_client('fopen');
+//			$oJSONApi->set_http_client('curl');
+			$oJSONApi->password_auth($sUser, $sPassword);
+
+			$aArgs = array(
+				'email' => $sEmailUser,
+				'domain' => $sEmailDomain,
+				'password' => $sNewPassword
+			);
+
+			$sResult = $oJSONApi->api2_query($sUser, 'Email', 'passwdpop', $aArgs);
+			if ($sResult) {
+				$this->oLogger->Write('CPANEL: '.$sResult, \MailSo\Log\Enumerations\Type::INFO);
+
+				$aResult = \json_decode($sResult, true);
+				$bResult = isset($aResult['cpanelresult']['data'][0]['result']) &&
+					!!$aResult['cpanelresult']['data'][0]['result'];
+			}
+
+			if (!$bResult) {
+				$this->oLogger->Write('CPANEL: '.$sResult, \MailSo\Log\Enumerations\Type::ERROR);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger->WriteException($oException);
+		}
+
+		return $bResult;
+	}
+}
diff --git a/plugins/change-password-cpanel/index.php b/plugins/change-password-cpanel/index.php
new file mode 100644
index 000000000..a3ee6138d
--- /dev/null
+++ b/plugins/change-password-cpanel/index.php
@@ -0,0 +1,17 @@
+<?php
+
+class ChangePasswordCPanelPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password cPanel',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through cPanel';
+
+	public function Supported() : string
+	{
+		return 'Use Change Password plugin';
+	}
+}
diff --git a/plugins/change-password-cpanel/jsonapi.php b/plugins/change-password-cpanel/jsonapi.php
new file mode 100644
index 000000000..16e91adfd
--- /dev/null
+++ b/plugins/change-password-cpanel/jsonapi.php
@@ -0,0 +1,339 @@
+<?php
+/**
+ * cPanel XMLAPI Client Class
+ *
+ * This class allows for easy interaction with cPanel's XML-API allow functions within the XML-API to be called
+ * by calling funcions within this class
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2012, cPanel, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this list of conditions and the
+ *   following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the
+ *   following disclaimer in the documentation and/or other materials provided with the distribution.
+ * * Neither the name of the cPanel, Inc. nor the names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category Cpanel
+ * @package xmlapi
+ * @copyright 2012 cPanel, Inc.
+ * @license http://sdk.cpanel.net/license/bsd.html
+ * @version Release: 1.0.13
+ * @link http://twiki.cpanel.net/twiki/bin/view/AllDocumentation/AutomationIntegration/XmlApi
+ * @since Class available since release 0.1
+ */
+
+namespace cPanel;
+
+class jsonapi
+{
+	// should debugging statements be printed?
+	private bool $debug         = false;
+
+	// The host to connect to
+	private string $host        = '127.0.0.1';
+
+	// the port to connect to
+	private int $port           = 2087;
+
+	// should be the literal strings http or https
+	private string $protocol    = 'https';
+
+	// literal strings hash or password
+	private ?string $auth_type  = null;
+
+	// the actual password or hash
+	private ?string $auth       = null;
+
+	// username to authenticate as
+	private ?string $user       = null;
+
+	// The HTTP Client to use
+	private string $http_client = 'curl';
+
+	public function __construct(string $host, ?string $user = null, ?string $password = null )
+	{
+		if ( ( $user != null ) && ( \strlen( $user ) < 9 ) ) {
+			$this->user = $user;
+		}
+
+		if ($password != null) {
+			$this->set_password($password);
+		}
+
+		$this->host = $host;
+
+		// Detemine what the default http client should be.
+		if ( \function_exists('curl_setopt') ) {
+			$this->http_client = "curl";
+		} elseif ( \ini_get('allow_url_fopen') ) {
+			$this->http_client = "fopen";
+		} else {
+			throw new \Exception('allow_url_fopen and curl are neither available in this PHP configuration');
+		}
+
+	}
+
+	public function set_debug( bool $debug = true )
+	{
+		$this->debug = $debug;
+	}
+
+	public function set_host( string $host )
+	{
+		$this->host = $host;
+	}
+
+	public function set_port( int $port )
+	{
+		if ($port < 1 || $port > 65535) {
+			throw new \Exception('non integer or negative integer passed to set_port');
+		}
+
+		// Account for ports that are non-ssl
+		if ($port == '2086' || $port == '2082' || $port == '80' || $port == '2095') {
+			$this->set_protocol('http');
+		}
+
+		$this->port = $port;
+	}
+
+	public function set_protocol( string $proto )
+	{
+		if ($proto != 'https' && $proto != 'http') {
+			throw new \Exception('https and http are the only protocols that can be passed to set_protocol');
+		}
+		$this->protocol = $proto;
+	}
+
+	public function set_password( string $pass )
+	{
+		$this->auth_type = 'pass';
+		$this->auth = $pass;
+	}
+
+	public function set_hash( string $hash )
+	{
+		$this->auth_type = 'hash';
+		$this->auth = \preg_replace("/(\n|\r|\s)/", '', $hash);
+	}
+
+	public function hash_auth( string $user, string $hash )
+	{
+		$this->set_hash( $hash );
+		$this->user = $user;
+	}
+
+	public function password_auth( string $user, string $pass )
+	{
+		$this->set_password( $pass );
+		$this->user = $user;
+	}
+
+	public function set_http_client( string $client )
+	{
+		if ( ( $client != 'curl' ) && ( $client != 'fopen' ) ) {
+			throw new \Exception('only curl and fopen and allowed http clients');
+		}
+		$this->http_client = $client;
+	}
+
+	/**
+	 * Perform an XML-API Query
+	 *
+	 * This function will perform an XML-API Query and return the specified output format of the call being made
+	 *
+	 * @param string $function The XML-API call to execute
+	 * @param array $vars An associative array of the parameters to be passed to the XML-API Calls
+	 * @return mixed
+	 */
+	public function jsonapi_query( string $function, array $vars = array() )
+	{
+		// Check to make sure all the data needed to perform the query is in place
+		if (!$function) {
+			throw new \Exception('jsonapi_query() requires a function to be passed to it');
+		}
+
+		if ($this->user == null) {
+			throw new \Exception('no user has been set');
+		}
+
+		if ($this->auth ==null) {
+			throw new \Exception('no authentication information has been set');
+		}
+
+		// Build the query:
+
+		$query_type = '/json-api/';
+
+		$args = \http_build_query($vars, '', '&');
+		$url =  $this->protocol . '://' . $this->host . ':' . $this->port . $query_type . $function;
+
+		if ($this->debug) {
+			\error_log('URL: ' . $url);
+			\error_log('DATA: ' . $args);
+		}
+
+		// Set the $auth string
+
+		$authstr = '';
+		if ($this->auth_type == 'hash') {
+			$authstr = 'Authorization: WHM ' . $this->user . ':' . $this->auth . "\r\n";
+		} elseif ($this->auth_type == 'pass') {
+			$authstr = 'Authorization: Basic ' . \base64_encode($this->user .':'. $this->auth) . "\r\n";
+		} else {
+			throw new \Exception('invalid auth_type set');
+		}
+
+		if ($this->debug) {
+			\error_log("Authentication Header: " . $authstr ."\n");
+		}
+
+		// Perform the query (or pass the info to the functions that actually do perform the query)
+
+		$response = '';
+		if ($this->http_client == 'curl') {
+			$response = $this->curl_query($url, $args, $authstr);
+		} elseif ($this->http_client == 'fopen') {
+			$response = $this->fopen_query($url, $args, $authstr);
+		}
+
+		// fix #1
+		$aMatch = array();
+		if ($response && false !== stripos($response, '<html>') &&
+			\preg_match('/HTTP-EQUIV[\s]?=[\s]?"refresh"/i', $response) &&
+			\preg_match('/<meta [^>]+url[\s]?=[\s]?([^">]+)/i', $response, $aMatch) &&
+			!empty($aMatch[1]) && 0 === \strpos(\trim($aMatch[1]), 'http'))
+		{
+			$url = \trim($aMatch[1]) . $query_type . $function;
+			if ($this->debug) {
+				\error_log('new URL: ' . $url);
+			}
+
+			if ($this->http_client == 'curl') {
+				$response = $this->curl_query($url, $args, $authstr);
+			} elseif ($this->http_client == 'fopen') {
+				$response = $this->fopen_query($url, $args, $authstr);
+			}
+		}
+		// ---
+
+		/*
+		*	Post-Query Block
+		* Handle response, return proper data types, debug, etc
+		*/
+
+		// print out the response if debug mode is enabled.
+		if ($this->debug) {
+			\error_log("RESPONSE:\n " . $response);
+		}
+
+		// The only time a response should contain <html> is in the case of authentication error
+		// cPanel 11.25 fixes this issue, but if <html> is in the response, we'll error out.
+
+		if (\stristr($response, '<html>') == true) {
+			if (\stristr($response, 'Login Attempt Failed') == true) {
+				\error_log("Login Attempt Failed");
+
+				return;
+			}
+			if (\stristr($response, 'action="/login/"') == true) {
+				\error_log("Authentication Error");
+
+				return;
+			}
+
+			return;
+		}
+
+		return $response;
+	}
+
+	private function curl_query( $url, $postdata, $authstr )
+	{
+		$curl = \curl_init();
+		\curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0);
+		// Return contents of transfer on curl_exec
+		\curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+		// Allow self-signed certs
+		\curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, 0);
+		// Set the URL
+		\curl_setopt($curl, CURLOPT_URL, $url);
+		// Increase buffer size to avoid "funny output" exception
+		\curl_setopt($curl, CURLOPT_BUFFERSIZE, 131072);
+
+		// Pass authentication header
+		$header[0] =$authstr .
+			"Content-Type: application/x-www-form-urlencoded\r\n" .
+			"Content-Length: " . strlen($postdata) . "\r\n" . "\r\n" . $postdata;
+
+		\curl_setopt($curl, CURLOPT_HTTPHEADER, $header);
+
+		\curl_setopt($curl, CURLOPT_POST, 1);
+
+		$result = \curl_exec($curl);
+		if ($result == false) {
+			throw new \Exception("curl_exec threw error \"" . \curl_error($curl) . "\" for " . $url . "?" . $postdata );
+		}
+		\curl_close($curl);
+
+		return $result;
+	}
+
+	private function fopen_query( $url, $postdata, $authstr )
+	{
+		if ( !(ini_get('allow_url_fopen') ) ) {
+			throw new \Exception('fopen_query called on system without allow_url_fopen enabled in php.ini');
+		}
+
+		$opts = array(
+			'http' => array(
+				'allow_self_signed' => true,
+				'method' => 'POST',
+				'header' => $authstr .
+					"Content-Type: application/x-www-form-urlencoded\r\n" .
+					"Content-Length: " . strlen($postdata) . "\r\n" .
+					"\r\n" . $postdata
+			)
+		);
+		$context = \stream_context_create($opts);
+
+		return \file_get_contents($url, false, $context);
+	}
+
+	public function api2_query($user, $module, $function, $args = array())
+	{
+		if (!isset($user) || !isset($module) || !isset($function) ) {
+			\error_log("api2_query requires that a username, module and function are passed to it");
+
+			return false;
+		}
+		if (!is_array($args)) {
+			\error_log("api2_query requires that an array is passed to it as the 4th parameter");
+
+			return false;
+		}
+
+		$args['cpanel_jsonapi_user'] = $user;
+		$args['cpanel_jsonapi_module'] = $module;
+		$args['cpanel_jsonapi_func'] = $function;
+		$args['cpanel_jsonapi_apiversion'] = '2';
+
+		return $this->jsonapi_query('cpanel', $args);
+	}
+}
diff --git a/plugins/change-password-froxlor/driver.php b/plugins/change-password-froxlor/driver.php
new file mode 100644
index 000000000..f7194edd8
--- /dev/null
+++ b/plugins/change-password-froxlor/driver.php
@@ -0,0 +1,109 @@
+<?php
+
+use SnappyMail\SensitiveString;
+
+class ChangePasswordFroxlorDriver
+{
+	const
+		NAME        = 'Froxlor',
+		DESCRIPTION = 'Change passwords in Froxlor.';
+
+	/**
+	 * @var \RainLoop\Config\Plugin
+	 */
+	private $oConfig = null;
+
+	/**
+	 * @var \MailSo\Log\Logger
+	 */
+	private $oLogger = null;
+
+	function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+	{
+		$this->oConfig = $oConfig;
+		$this->oLogger = $oLogger;
+	}
+
+	public static function isSupported() : bool
+	{
+		return \class_exists('PDO', false)
+			// The PHP extension PDO (mysql) must be installed to use this plugin
+			&& \in_array('mysql', \PDO::getAvailableDrivers());
+	}
+
+	public static function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('froxlor_dsn')->SetLabel('Froxlor PDO dsn')
+				->SetDefaultValue('mysql:host=localhost;dbname=froxlor;charset=utf8'),
+			\RainLoop\Plugins\Property::NewInstance('froxlor_user')->SetLabel('User'),
+			\RainLoop\Plugins\Property::NewInstance('froxlor_password')->SetLabel('Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD),
+			\RainLoop\Plugins\Property::NewInstance('froxlor_allowed_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
+	{
+		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'froxlor_allowed_emails', ''))) {
+			return false;
+		}
+
+		try
+		{
+			if ($this->oLogger) {
+				$this->oLogger->Write('froxlor: Try to change password for '.$oAccount->Email());
+			}
+
+			$oPdo = new \PDO(
+				$this->oConfig->Get('plugin', 'froxlor_dsn', ''),
+				$this->oConfig->Get('plugin', 'froxlor_user', ''),
+				$this->oConfig->Get('plugin', 'froxlor_password', ''),
+				array(
+					\PDO::ATTR_ERRMODE => \PDO::ERRMODE_EXCEPTION
+				)
+			);
+
+			$oStmt = $oPdo->prepare('SELECT password_enc, id FROM mail_users WHERE username = ? LIMIT 1');
+
+			if ($oStmt->execute(array($oAccount->IncLogin()))) {
+				$aFetchResult = $oStmt->fetch(\PDO::FETCH_ASSOC);
+				if (!empty($aFetchResult['id'])) {
+					$sDbPassword = $aFetchResult['password_enc'];
+					$sDbSalt = \substr($sDbPassword, 0, \strrpos($sDbPassword, '$'));
+					if (\crypt($oPrevPassword, $sDbSalt) === $sDbPassword) {
+
+						$oStmt = $oPdo->prepare('UPDATE mail_users SET password_enc = ? WHERE id = ?');
+
+						return !!$oStmt->execute(array(
+							$this->cryptPassword($oNewPassword),
+							$aFetchResult['id']
+						));
+					}
+				}
+			}
+		}
+		catch (\Exception $oException)
+		{
+			if ($this->oLogger) {
+				$this->oLogger->WriteException($oException);
+			}
+		}
+		return false;
+	}
+
+	private function cryptPassword(SensitiveString $oPassword) : string
+	{
+		if (\defined('CRYPT_SHA512') && CRYPT_SHA512) {
+			$sSalt = '$6$rounds=5000$' . \bin2hex(\random_bytes(8)) . '$';
+		} elseif (\defined('CRYPT_SHA256') && CRYPT_SHA256) {
+			$sSalt = '$5$rounds=5000$' . \bin2hex(\random_bytes(8)) . '$';
+		} else {
+			$sSalt = '$1$' . \bin2hex(\random_bytes(6)) . '$';
+		}
+		return \crypt($oPassword, $sSalt);
+	}
+}
diff --git a/plugins/change-password-froxlor/index.php b/plugins/change-password-froxlor/index.php
new file mode 100644
index 000000000..339d7e937
--- /dev/null
+++ b/plugins/change-password-froxlor/index.php
@@ -0,0 +1,18 @@
+<?php
+
+class ChangePasswordFroxlorPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password Froxlor',
+		AUTHOR   = 'Euphonique',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through Froxlor';
+
+	public function Supported() : string
+	{
+		return 'Use Change Password plugin';
+	}
+}
diff --git a/plugins/change-password-hestia/driver.php b/plugins/change-password-hestia/driver.php
new file mode 100644
index 000000000..847c792b7
--- /dev/null
+++ b/plugins/change-password-hestia/driver.php
@@ -0,0 +1,72 @@
+<?php
+
+use SnappyMail\SensitiveString;
+
+class ChangePasswordHestiaDriver
+{
+	const
+		NAME        = 'Hestia',
+		DESCRIPTION = 'Change passwords in Hestia.';
+
+	/**
+	 * @var \RainLoop\Config\Plugin
+	 */
+	private $oConfig = null;
+
+	/**
+	 * @var \MailSo\Log\Logger
+	 */
+	protected $oLogger = null;
+
+	function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+	{
+		$this->oConfig = $oConfig;
+		$this->oLogger = $oLogger;
+	}
+
+	public static function isSupported() : bool
+	{
+		return true;
+	}
+
+	public static function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('hestia_host')->SetLabel('Hestia Host')
+				->SetDefaultValue('')
+				->SetDescription('Ex: localhost or domain.com'),
+			\RainLoop\Plugins\Property::NewInstance('hestia_port')->SetLabel('Hestia Port')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
+				->SetDefaultValue(8083)
+		);
+	}
+
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
+	{
+		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'hestia_allowed_emails', ''))) {
+			return false;
+		}
+
+		$this->oLogger->Write("Hestia: Try to change password for {$oAccount->Email()}");
+
+		$sHost = $this->oConfig->Get('plugin', 'hestia_host');
+		$sPort = $this->oConfig->Get('plugin', 'hestia_port');
+
+		$HTTP = \SnappyMail\HTTP\Request::factory();
+		$postvars = array(
+			'email'    => $oAccount->Email(),
+			'password' => (string) $oPrevPassword,
+			'new'      => (string) $oNewPassword,
+		);
+		$response = $HTTP->doRequest('POST', 'https://'.$sHost.':'.$sPort.'/reset/mail/', \http_build_query($postvars));
+		if (!$response) {
+			$this->oLogger->Write("Hestia[Error]: Response failed");
+			return false;
+		}
+		if ('==ok==' != $response->body) {
+			$this->oLogger->Write("Hestia[Error]: Response: {$response->status} {$response->body}");
+			return false;
+		}
+		return true;
+	}
+}
diff --git a/plugins/change-password-hestia/index.php b/plugins/change-password-hestia/index.php
new file mode 100644
index 000000000..2decd1548
--- /dev/null
+++ b/plugins/change-password-hestia/index.php
@@ -0,0 +1,18 @@
+<?php
+
+class ChangePasswordHestiaPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password Hestia',
+		AUTHOR   = 'Jaap Marcus',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through HestiaCP';
+
+	public function Supported() : string
+	{
+		return 'Use Change Password plugin';
+	}
+}
diff --git a/plugins/change-password-hmailserver/driver.php b/plugins/change-password-hmailserver/driver.php
new file mode 100644
index 000000000..d16ccef36
--- /dev/null
+++ b/plugins/change-password-hmailserver/driver.php
@@ -0,0 +1,86 @@
+<?php
+
+use MailSo\Net\ConnectSettings;
+use SnappyMail\SensitiveString;
+
+class ChangePasswordHMailServerDriver
+{
+	const
+		NAME        = 'hMailServer',
+		DESCRIPTION = 'Change passwords using hMailServer. The PHP extension COM must be installed to use this plugin';
+
+	private
+		$oConfig = null;
+
+	function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+	{
+		$this->oConfig = $oConfig;
+		$this->oLogger = $oLogger;
+	}
+
+	public static function isSupported() : bool
+	{
+		return \class_exists('COM');
+	}
+
+	public static function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('hmailserver_login')->SetLabel('Admin Login')
+				->SetDefaultValue('Administrator'),
+			\RainLoop\Plugins\Property::NewInstance('hmailserver_password')->SetLabel('Admin Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
+				->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('hmailserver_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
+	{
+		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'hmailserver_emails', ''))) {
+			return false;
+		}
+
+		$this->oLogger && $this->oLogger->Write('hMailServer: Try to change password for '.$oAccount->Email());
+
+		$bResult = false;
+
+		try
+		{
+			$oHmailApp = new \COM('hMailServer.Application');
+			$oHmailApp->Connect();
+
+			if ($oHmailApp->Authenticate(
+				$this->oConfig->Get('plugin', 'hmailserver_login', ''),
+				$this->oConfig->Get('plugin', 'hmailserver_password', '')
+			)) {
+				$sEmail = $oAccount->Email();
+				$sDomain = \MailSo\Base\Utils::getEmailAddressDomain($sEmail);
+				$oHmailDomain = $oHmailApp->Domains->ItemByName($sDomain);
+				if ($oHmailDomain) {
+					$oHmailAccount = $oHmailDomain->Accounts->ItemByAddress($sEmail);
+					if ($oHmailAccount) {
+						$oHmailAccount->Password = (string) $oNewPassword;
+						$oHmailAccount->Save();
+						$bResult = true;
+					} else {
+						$this->oLogger && $this->oLogger->Write('hMailServer: Unknown account ('.$sEmail.')', \LOG_ERROR);
+					}
+				} else {
+					$this->oLogger && $this->oLogger->Write('hMailServer: Unknown domain ('.$sDomain.')', \LOG_ERROR);
+				}
+			} else {
+				$this->oLogger && $this->oLogger->Write('hMailServer: Auth error', \LOG_ERROR);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$this->oLogger && $this->oLogger->WriteException($oException);
+		}
+
+		return $bResult;
+	}
+}
diff --git a/plugins/change-password-hmailserver/index.php b/plugins/change-password-hmailserver/index.php
new file mode 100644
index 000000000..8fa5180d8
--- /dev/null
+++ b/plugins/change-password-hmailserver/index.php
@@ -0,0 +1,18 @@
+<?php
+
+class ChangePasswordHMailServerPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password hMailServer',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through hMailServer';
+
+	public function Supported() : string
+	{
+		return 'Activate in Change Password plugin'
+			. (\class_exists('COM') ? '' : '. And you must install PHP COM extension');
+	}
+}
diff --git a/plugins/contacts-suggestions-example/LICENSE b/plugins/change-password-ispconfig/LICENSE
similarity index 100%
rename from plugins/contacts-suggestions-example/LICENSE
rename to plugins/change-password-ispconfig/LICENSE
diff --git a/plugins/change-password/drivers/ispconfig.php b/plugins/change-password-ispconfig/driver.php
similarity index 89%
rename from plugins/change-password/drivers/ispconfig.php
rename to plugins/change-password-ispconfig/driver.php
index 1cfae2681..86783e796 100644
--- a/plugins/change-password/drivers/ispconfig.php
+++ b/plugins/change-password-ispconfig/driver.php
@@ -1,6 +1,8 @@
 <?php
 
-class ChangePasswordDriverISPConfig
+use SnappyMail\SensitiveString;
+
+class ChangePasswordISPConfigDriver
 {
 	const
 		NAME        = 'ISPConfig',
@@ -44,7 +46,7 @@ class ChangePasswordDriverISPConfig
 		);
 	}
 
-	public function ChangePassword(\RainLoop\Model\Account $oAccount, string $sPrevPassword, string $sNewPassword) : bool
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
 	{
 		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'ispconfig_allowed_emails', ''))) {
 			return false;
@@ -71,10 +73,10 @@ class ChangePasswordDriverISPConfig
 				if (!empty($aFetchResult['mailuser_id'])) {
 					$sDbPassword = $aFetchResult['password'];
 					$sDbSalt = \substr($sDbPassword, 0, \strrpos($sDbPassword, '$'));
-					if (\crypt($sPrevPassword, $sDbSalt) === $sDbPassword) {
+					if (\crypt($oPrevPassword, $sDbSalt) === $sDbPassword) {
 						$oStmt = $oPdo->prepare('UPDATE mail_user SET password = ? WHERE mailuser_id = ?');
 						return !!$oStmt->execute(array(
-							$this->cryptPassword($sNewPassword),
+							$this->cryptPassword($oNewPassword),
 							$aFetchResult['mailuser_id']
 						));
 					}
@@ -90,7 +92,7 @@ class ChangePasswordDriverISPConfig
 		return false;
 	}
 
-	private function cryptPassword(string $sPassword) : string
+	private function cryptPassword(SensitiveString $oPassword) : string
 	{
 		if (\defined('CRYPT_SHA512') && CRYPT_SHA512) {
 			$sSalt = '$6$rounds=5000$' . \bin2hex(\random_bytes(8)) . '$';
@@ -99,6 +101,6 @@ class ChangePasswordDriverISPConfig
 		} else {
 			$sSalt = '$1$' . \bin2hex(\random_bytes(6)) . '$';
 		}
-		return \crypt($sPassword, $sSalt);
+		return \crypt($oPassword, $sSalt);
 	}
 }
diff --git a/plugins/change-password-ispconfig/index.php b/plugins/change-password-ispconfig/index.php
new file mode 100644
index 000000000..5486e41ae
--- /dev/null
+++ b/plugins/change-password-ispconfig/index.php
@@ -0,0 +1,17 @@
+<?php
+
+class ChangePasswordISPConfigPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password ISPConfig',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through ISPConfig';
+
+	public function Supported() : string
+	{
+		return 'Use Change Password plugin';
+	}
+}
diff --git a/plugins/change-password-mailcow/driver.php b/plugins/change-password-mailcow/driver.php
new file mode 100644
index 000000000..3a66b63c9
--- /dev/null
+++ b/plugins/change-password-mailcow/driver.php
@@ -0,0 +1,74 @@
+<?php
+
+class ChangePasswordMailcowDriver
+{
+    const
+        NAME        = 'Mailcow',
+        DESCRIPTION = 'Driver to change the email account password on Mailcow.';
+
+    private $sHostName = '';
+    private $sApiToken = '';
+
+    /**
+     * @var \MailSo\Log\Logger
+     */
+    private $oLogger = null;
+
+    function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+    {
+        $this->oLogger = $oLogger;
+        $this->sHostName = $oConfig->Get('plugin', 'mailcow_api_hostname', '');
+        $this->sApiToken = $oConfig->Get('plugin', 'mailcow_api_token', '');
+    }
+
+    public static function isSupported() : bool
+    {
+        return true;
+    }
+
+    public static function configMapping() : array
+    {
+        return array(
+            \RainLoop\Plugins\Property::NewInstance('mailcow_api_hostname')
+                ->SetLabel('Mailcow API hostname'),
+            \RainLoop\Plugins\Property::NewInstance('mailcow_api_token')
+                ->SetLabel('API token')
+                ->SetDescription('The Read/Write API token'),
+        );
+    }
+
+    public function ChangePassword(\RainLoop\Model\Account $oAccount, string $sPrevPassword, string $sNewPassword) : bool
+    {
+        $url = 'https://'.$this->sHostName.'/api/v1/edit/mailbox';
+        $headers = [
+            'content-type' => 'application/json',
+            'accept' => 'application/json',
+            'X-API-Key' => $this->sApiToken,
+        ];
+        $body = array(
+            'items' => [ $oAccount->Email() ],
+            'attr' => [
+                'password' => (string)$sNewPassword,
+                'password2' => (string)$sNewPassword,
+            ],
+        );
+
+        $ch = curl_init($url);
+        $payload = json_encode($body);
+        curl_setopt($ch, CURLOPT_POST, 1);
+        curl_setopt($ch, CURLOPT_POSTFIELDS, $payload);
+        curl_setopt($ch, CURLOPT_HTTPHEADER, array_map(function($k, $v) {return "$k: $v";}, array_keys($headers), $headers));
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+        $result = curl_exec($ch);
+        curl_close($ch);
+
+        $status = curl_getinfo($ch, CURLINFO_RESPONSE_CODE);
+
+        if ($status === 200 && $result && ($res = json_decode($result, true)) && $res[0]['type'] === 'success') {
+            return true;
+        }
+
+        $this->oLogger->Write("Mailcow[Error]: Response: {$status} {$result}");
+        return false;
+    }
+}
diff --git a/plugins/change-password-mailcow/index.php b/plugins/change-password-mailcow/index.php
new file mode 100644
index 000000000..80a19c406
--- /dev/null
+++ b/plugins/change-password-mailcow/index.php
@@ -0,0 +1,18 @@
+<?php
+
+class ChangePasswordMailcowPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+    const
+        NAME     = 'Change Password Mailcow',
+        AUTHOR   = 'Cuttlefish',
+        VERSION  = '2.36',
+        RELEASE  = '2024-07-25',
+        REQUIRED = '2.36.0',
+        CATEGORY = 'Security',
+        DESCRIPTION = 'Extension to allow users to change their passwords through Mailcow';
+
+    public function Supported() : string
+    {
+        return 'Use Change Password plugin';
+    }
+}
diff --git a/plugins/custom-settings-tab/LICENSE b/plugins/change-password-poppassd/LICENSE
similarity index 100%
rename from plugins/custom-settings-tab/LICENSE
rename to plugins/change-password-poppassd/LICENSE
diff --git a/plugins/change-password-poppassd/driver.php b/plugins/change-password-poppassd/driver.php
new file mode 100644
index 000000000..5784dd8de
--- /dev/null
+++ b/plugins/change-password-poppassd/driver.php
@@ -0,0 +1,178 @@
+<?php
+
+use MailSo\Net\ConnectSettings;
+use SnappyMail\SensitiveString;
+
+class ChangePasswordPoppassdDriver extends \MailSo\Net\NetClient
+{
+	const
+		NAME        = 'Poppassd',
+		DESCRIPTION = 'Change passwords using Poppassd.';
+
+	private
+		$oConfig = null;
+
+	function __construct(\RainLoop\Config\Plugin $oConfig, \MailSo\Log\Logger $oLogger)
+	{
+		$this->oConfig = $oConfig;
+		$this->oLogger = $oLogger;
+	}
+
+
+	public static function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('poppassd_host')->SetLabel('POPPASSD Host')
+				->SetDefaultValue('127.0.0.1'),
+			\RainLoop\Plugins\Property::NewInstance('poppassd_port')->SetLabel('POPPASSD Port')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
+				->SetDefaultValue(106),
+			\RainLoop\Plugins\Property::NewInstance('poppassd_allowed_emails')->SetLabel('Allowed emails')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Allowed emails, space as delimiter, wildcard supported. Example: user1@domain1.net user2@domain1.net *@domain2.net')
+				->SetDefaultValue('*')
+		);
+	}
+
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
+	{
+		if (!\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->oConfig->Get('plugin', 'poppassd_allowed_emails', ''))) {
+			return false;
+		}
+
+		try
+		{
+			$oSettings = new ConnectSettings;
+			$oSettings->host = $this->oConfig->Get('plugin', 'poppassd_host', '');
+			$oSettings->port = (int) $this->oConfig->Get('plugin', 'poppassd_port', 106);
+			$this->Connect($oSettings);
+
+			if ($this->bIsLoggined) {
+				$this->writeLogException(
+					new \RuntimeException('Already authenticated for this session'),
+					\LOG_ERR, true);
+			}
+
+			try
+			{
+				$this->sendRequestWithCheck('user', $oAccount->IncLogin(), true);
+				$this->sendRequestWithCheck('pass', $oPrevPassword, true);
+			}
+			catch (\Throwable $oException)
+			{
+				$this->writeLogException($oException, \LOG_NOTICE, true);
+			}
+
+			$this->bIsLoggined = true;
+
+			if ($this->bIsLoggined) {
+				$this->sendRequestWithCheck('newpass', $oNewPassword);
+			} else {
+				$this->writeLogException(
+					new \RuntimeException('Required login'),
+					\LOG_ERR, true);
+			}
+
+
+			$this->Disconnect();
+
+			return true;
+		}
+		catch (\Throwable $oException)
+		{
+		}
+
+		return false;
+	}
+
+	private
+		$bIsLoggined = false,
+		$iRequestTime = 0;
+
+	public function Connect(ConnectSettings $oSettings) : void
+	{
+		$this->iRequestTime = \microtime(true);
+		parent::Connect($oSettings);
+		$this->validateResponse();
+	}
+
+	public function supportsAuthType(string $sasl_type) : bool
+	{
+		return true;
+	}
+
+	public static function isSupported() : bool
+	{
+		return true;
+	}
+
+	public function Logout() : void
+	{
+		if ($this->bIsLoggined) {
+			$this->sendRequestWithCheck('quit');
+		}
+		$this->bIsLoggined = false;
+	}
+
+	private function secureRequestParams($sCommand, $sAddToCommand) : ?string
+	{
+		if (\strlen($sAddToCommand)) {
+			switch (\strtolower($sCommand))
+			{
+				case 'pass':
+				case 'newpass':
+					return '********';
+			}
+		}
+
+		return null;
+	}
+
+	private function sendRequestWithCheck(string $sCommand, string $sAddToCommand = '', bool $bAuthRequestValidate = false) : void
+	{
+		$sCommand = \trim($sCommand);
+		if (!\strlen($sCommand)) {
+			$this->writeLogException(new \MailSo\Base\Exceptions\InvalidArgumentException(), \LOG_ERR, true);
+		}
+
+		$this->IsConnected(true);
+
+		$sRealCommand = $sCommand . (\strlen($sAddToCommand) ? ' '.$sAddToCommand : '');
+
+		$sFakeCommand = '';
+		$sFakeAddToCommand = $this->secureRequestParams($sCommand, $sAddToCommand);
+		if (\strlen($sFakeAddToCommand)) {
+			$sFakeCommand = $sCommand . ' ' . $sFakeAddToCommand;
+		}
+
+		$this->iRequestTime = \microtime(true);
+		$this->sendRaw($sRealCommand, true, $sFakeCommand);
+
+		$this->validateResponse($bAuthRequestValidate);
+	}
+
+	private function validateResponse(bool $bAuthRequestValidate = false) : self
+	{
+		$sResponseBuffer = $this->getNextBuffer();
+
+		$bResult = \preg_match($bAuthRequestValidate ? '/^[23]\d\d/' : '/^2\d\d/', \trim($sResponseBuffer));
+
+		if (!$bResult) {
+			// POP3 validation hack
+			$bResult = '+OK ' === \substr(\trim($sResponseBuffer), 0, 4);
+		}
+
+		if (!$bResult) {
+			$this->writeLogException(new \MailSo\Base\Exceptions\Exception(), \LOG_WARNING, true);
+		}
+
+		$this->writeLog((\microtime(true) - $this->iRequestTime), \LOG_DEBUG);
+
+		return $this;
+	}
+
+	function getLogName() : string
+	{
+		return 'POPPASSD';
+	}
+}
diff --git a/plugins/change-password-poppassd/index.php b/plugins/change-password-poppassd/index.php
new file mode 100644
index 000000000..cad4573ec
--- /dev/null
+++ b/plugins/change-password-poppassd/index.php
@@ -0,0 +1,17 @@
+<?php
+
+class ChangePasswordPoppassdPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Change Password Poppassd',
+		VERSION  = '2.36',
+		RELEASE  = '2024-03-17',
+		REQUIRED = '2.36.0',
+		CATEGORY = 'Security',
+		DESCRIPTION = 'Extension to allow users to change their passwords through Poppassd';
+
+	public function Supported() : string
+	{
+		return 'Use Change Password plugin';
+	}
+}
diff --git a/plugins/change-password/drivers/ldap.php b/plugins/change-password/drivers/ldap.php
index e1fc347c4..f9dae8ff8 100644
--- a/plugins/change-password/drivers/ldap.php
+++ b/plugins/change-password/drivers/ldap.php
@@ -1,5 +1,7 @@
 <?php
 
+use SnappyMail\SensitiveString;
+
 class ChangePasswordDriverLDAP
 {
 	const
@@ -55,20 +57,20 @@ class ChangePasswordDriverLDAP
 		);
 	}
 
-	public function ChangePassword(\RainLoop\Model\Account $oAccount, string $sPrevPassword, string $sNewPassword) : bool
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
 	{
-		$sDomain = \MailSo\Base\Utils::GetDomainFromEmail($oAccount->Email());
+		$sDomain = \MailSo\Base\Utils::getEmailAddressDomain($oAccount->Email());
 		$sUserDn = \strtr($this->sUserDnFormat, array(
 			'{domain}' => $sDomain,
 			'{domain:dc}' => 'dc='.\strtr($sDomain, array('.' => ',dc=')),
 			'{email}' => $oAccount->Email(),
-			'{email:user}' => \MailSo\Base\Utils::GetAccountNameFromEmail($oAccount->Email()),
+			'{email:user}' => \MailSo\Base\Utils::getEmailAddressLocalPart($oAccount->Email()),
 			'{email:domain}' => $sDomain,
-			'{login}' => $oAccount->Login(),
-			'{imap:login}' => $oAccount->Login(),
-			'{imap:host}' => $oAccount->Domain()->IncHost(),
-			'{imap:port}' => $oAccount->Domain()->IncPort(),
-			'{gecos}' => \function_exists('posix_getpwnam') ? \posix_getpwnam($oAccount->Login()) : ''
+			'{login}' => $oAccount->IncLogin(),
+			'{imap:login}' => $oAccount->IncLogin(),
+			'{imap:host}' => $oAccount->Domain()->ImapSettings()->host,
+			'{imap:port}' => $oAccount->Domain()->ImapSettings()->port,
+			'{gecos}' => \function_exists('posix_getpwnam') ? \posix_getpwnam($oAccount->IncLogin()) : ''
 		));
 
 		$oCon = \ldap_connect($this->sLdapUri);
@@ -79,7 +81,7 @@ class ChangePasswordDriverLDAP
 		if (!\ldap_set_option($oCon, LDAP_OPT_PROTOCOL_VERSION, 3)) {
 			$this->oLogger->Write(
 				'Failed to set LDAP Protocol version to 3, TLS not supported.',
-				\MailSo\Log\Enumerations\Type::WARNING,
+				\LOG_WARNING,
 				'LDAP'
 			);
 		}
@@ -89,25 +91,25 @@ class ChangePasswordDriverLDAP
 			throw new \Exception('ldap_start_tls error '.\ldap_errno($oCon).': '.\ldap_error($oCon));
 		}
 
-		if (!\ldap_bind($oCon, $sUserDn, $sPrevPassword)) {
+		if (!\ldap_bind($oCon, $sUserDn, $oPrevPassword)) {
 			throw new \Exception('ldap_bind error '.\ldap_errno($oCon).': '.\ldap_error($oCon));
 		}
 
 		$sSshaSalt = '';
 		$sPrefix = '{'.\strtoupper($this->sPasswordEncType).'}';
-		$sEncodedNewPassword = $sNewPassword;
+		$sEncodedNewPassword = $oNewPassword;
 		switch ($sPrefix)
 		{
 			case '{SSHA}':
 				$sSshaSalt = $this->getSalt(4);
 			case '{SHA}':
-				$sEncodedNewPassword = $sPrefix.\base64_encode(\hash('sha1', $sNewPassword.$sSshaSalt, true).$sSshaSalt);
+				$sEncodedNewPassword = $sPrefix.\base64_encode(\hash('sha1', $oNewPassword.$sSshaSalt, true).$sSshaSalt);
 				break;
 			case '{MD5}':
-				$sEncodedNewPassword = $sPrefix.\base64_encode(\md5($sNewPassword, true));
+				$sEncodedNewPassword = $sPrefix.\base64_encode(\md5($oNewPassword, true));
 				break;
 			case '{CRYPT}':
-				$sEncodedNewPassword = $sPrefix.\crypt($sNewPassword, $this->getSalt(2));
+				$sEncodedNewPassword = $sPrefix.\crypt($oNewPassword, $this->getSalt(2));
 				break;
 		}
 
diff --git a/plugins/change-password/drivers/pdo.php b/plugins/change-password/drivers/pdo.php
index 9b7078d87..2051ed2ce 100644
--- a/plugins/change-password/drivers/pdo.php
+++ b/plugins/change-password/drivers/pdo.php
@@ -1,5 +1,7 @@
 <?php
 
+use SnappyMail\SensitiveString;
+
 class ChangePasswordDriverPDO
 {
 	const
@@ -37,8 +39,8 @@ class ChangePasswordDriverPDO
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD),
 			\RainLoop\Plugins\Property::NewInstance('pdo_sql')->SetLabel('Statement')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
-				->SetDescription('SQL statement (allowed wildcards :email, :oldpass, :newpass, :domain, :username).')
-				->SetDefaultValue('UPDATE table SET password = :newpass WHERE domain = :domain AND username = :username and oldpass = :oldpass'),
+				->SetDescription('SQL statement (allowed wildcards :email, :oldpass, :newpass, :domain, :username, :login_name).')
+				->SetDefaultValue('UPDATE table SET password = :newpass WHERE (domain = :domain AND username = :username) OR loginname = :login_name'),
 			\RainLoop\Plugins\Property::NewInstance('pdo_encrypt')->SetLabel('Encryption')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
 				->SetDefaultValue(array('none', 'bcrypt', 'Argon2i', 'Argon2id', 'SHA256-CRYPT', 'SHA512-CRYPT'))
@@ -58,7 +60,7 @@ class ChangePasswordDriverPDO
 		);
 	}
 
-	public function ChangePassword(\RainLoop\Model\Account $oAccount, string $sPrevPassword, string $sNewPassword) : bool
+	public function ChangePassword(\RainLoop\Model\Account $oAccount, SensitiveString $oPrevPassword, SensitiveString $oNewPassword) : bool
 	{
 		try
 		{
@@ -85,10 +87,11 @@ class ChangePasswordDriverPDO
 
 			$placeholders = array(
 				':email' => $sEmail,
-				':oldpass' => $encrypt_prefix . \ChangePasswordPlugin::encrypt($encrypt, $sPrevPassword),
-				':newpass' => $encrypt_prefix . \ChangePasswordPlugin::encrypt($encrypt, $sNewPassword),
-				':domain' => \MailSo\Base\Utils::GetDomainFromEmail($sEmail),
-				':username' => \MailSo\Base\Utils::GetAccountNameFromEmail($sEmail)
+				':oldpass' => $encrypt_prefix . \ChangePasswordPlugin::encrypt($encrypt, $oPrevPassword),
+				':newpass' => $encrypt_prefix . \ChangePasswordPlugin::encrypt($encrypt, $oNewPassword),
+				':domain' => \MailSo\Base\Utils::getEmailAddressDomain($sEmail),
+				':username' => \MailSo\Base\Utils::getEmailAddressLocalPart($sEmail),
+				':login_name' => $oAccount->IncLogin()
 			);
 
 			$sql = $this->oConfig->Get('plugin', 'pdo_sql', '');
@@ -107,6 +110,7 @@ class ChangePasswordDriverPDO
 		}
 		catch (\Exception $oException)
 		{
+			\SnappyMail\Log::error('change-password', $oException->getMessage());
 			if ($this->oLogger) {
 				$this->oLogger->WriteException($oException);
 			}
diff --git a/plugins/change-password/index.php b/plugins/change-password/index.php
index 4fc0eb724..d0d49bab7 100644
--- a/plugins/change-password/index.php
+++ b/plugins/change-password/index.php
@@ -1,14 +1,15 @@
 <?php
 
-use \RainLoop\Exceptions\ClientException;
+use RainLoop\Exceptions\ClientException;
+use SnappyMail\SensitiveString;
 
 class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Change Password',
-		VERSION  = '2.13.1',
-		RELEASE  = '2022-03-10',
-		REQUIRED = '2.12.0',
+		VERSION  = '2.38',
+		RELEASE  = '2024-04-22',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Security',
 		DESCRIPTION = 'Extension to allow users to change their passwords';
 
@@ -17,7 +18,8 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 		CouldNotSaveNewPassword = 130,
 		CurrentPasswordIncorrect = 131,
 		NewPasswordShort = 132,
-		NewPasswordWeak = 133;
+		NewPasswordWeak = 133,
+		NewPasswordHibp = 134;
 
 	public function Init() : void
 	{
@@ -52,7 +54,6 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 				}
 			}
 		} else {
-//			foreach (\glob(__DIR__ . '/../change-password-*', GLOB_ONLYDIR) as $file) {
 			foreach (\glob(__DIR__ . '/drivers/*.php') as $file) {
 				$name = \basename($file, '.php');
 				$class = 'ChangePasswordDriver' . $name;
@@ -71,6 +72,25 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 				}
 			}
 		}
+
+		foreach (\glob(__DIR__ . '/../change-password-*', GLOB_ONLYDIR) as $file) {
+			$name = \str_replace('change-password-', '', \basename($file));
+			$class = "ChangePassword{$name}Driver";
+			$file .= '/driver.php';
+			try
+			{
+				if (\is_readable($file) && ($all || $this->Config()->Get('plugin', "driver_{$name}_enabled", false))) {
+					require_once $file;
+					if ($class::isSupported()) {
+						yield $name => $class;
+					}
+				}
+			}
+			catch (\Throwable $oException)
+			{
+				\trigger_error("ERROR {$class}: " . $oException->getMessage());
+			}
+		}
 	}
 
 	public function Supported() : string
@@ -84,16 +104,23 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 	public function configMapping() : array
 	{
 		$result = [
-			\RainLoop\Plugins\Property::NewInstance("pass_min_length")
+			\RainLoop\Plugins\Property::NewInstance('pass_min_length')
 				->SetLabel('Password minimum length')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
 				->SetDescription('Minimum length of the password')
-				->SetDefaultValue(10),
-			\RainLoop\Plugins\Property::NewInstance("pass_min_strength")
+				->SetDefaultValue(10)
+				->SetAllowedInJs(true),
+			\RainLoop\Plugins\Property::NewInstance('pass_min_strength')
 				->SetLabel('Password minimum strength')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::INT)
 				->SetDescription('Minimum strength of the password in %')
-				->SetDefaultValue(70),
+				->SetDefaultValue(70)
+				->SetAllowedInJs(true),
+			\RainLoop\Plugins\Property::NewInstance('check_hibp')
+				->SetLabel('Check Have I Been Pwned')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDescription('Check if new passphrase is in a data breach')
+				->SetDefaultValue(false),
 		];
 		foreach ($this->getSupportedDrivers(true) as $name => $class) {
 			$group = new \RainLoop\Plugins\PropertyCollection($name);
@@ -126,24 +153,27 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 		}
 
 		$sPrevPassword = $this->jsonParam('PrevPassword');
-		if ($sPrevPassword !== $oAccount->Password()) {
+		if ($sPrevPassword !== $oAccount->IncPassword()) {
 			throw new ClientException(static::CurrentPasswordIncorrect, null, $oActions->StaticI18N('NOTIFICATIONS/CURRENT_PASSWORD_INCORRECT'));
 		}
+		$oPrevPassword = new \SnappyMail\SensitiveString($sPrevPassword);
 
 		$sNewPassword = $this->jsonParam('NewPassword');
 		if ($this->Config()->Get('plugin', 'pass_min_length', 10) > \strlen($sNewPassword)) {
 			throw new ClientException(static::NewPasswordShort, null, $oActions->StaticI18N('NOTIFICATIONS/NEW_PASSWORD_SHORT'));
 		}
-
 		if ($this->Config()->Get('plugin', 'pass_min_strength', 70) > static::PasswordStrength($sNewPassword)) {
 			throw new ClientException(static::NewPasswordWeak, null, $oActions->StaticI18N('NOTIFICATIONS/NEW_PASSWORD_WEAK'));
 		}
+		$oNewPassword = new \SnappyMail\SensitiveString($sNewPassword);
+		if ($this->Config()->Get('plugin', 'check_hibp', false) && \SnappyMail\Hibp::password($oNewPassword)) {
+			throw new ClientException(static::NewPasswordHibp, null, $oActions->StaticI18N('NOTIFICATIONS/NEW_PASSWORD_HIBP'));
+		}
 
 		$bResult = false;
 		$oConfig = $this->Config();
 		foreach ($this->getSupportedDrivers() as $name => $class) {
-			$sFoundedValue = '';
-			if (\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $oConfig->Get('plugin', "driver_{$name}_allowed_emails"), $sFoundedValue)) {
+			if (\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $oConfig->Get('plugin', "driver_{$name}_allowed_emails"))) {
 				$name = $class::NAME;
 				$oLogger = $oActions->Logger();
 				try
@@ -152,7 +182,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 						$oConfig,
 						$oLogger
 					);
-					if (!$oDriver->ChangePassword($oAccount, $sPrevPassword, $sNewPassword)) {
+					if (!$oDriver->ChangePassword($oAccount, $oPrevPassword, $oNewPassword)) {
 						throw new ClientException(static::CouldNotSaveNewPassword);
 					}
 					$bResult = true;
@@ -166,7 +196,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 					if ($oLogger) {
 						$oLogger->Write("ERROR: {$name} password change for {$oAccount->Email()} failed");
 						$oLogger->WriteException($oException);
-//						$oLogger->WriteException($oException, \MailSo\Log\Enumerations\Type::WARNING, $name);
+//						$oLogger->WriteException($oException, \LOG_WARNING, $name);
 					}
 				}
 			}
@@ -177,13 +207,16 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 			throw new ClientException(static::CouldNotSaveNewPassword);
 		}
 
-		$oAccount->SetPassword($sNewPassword);
-		$oActions->SetAuthToken($oAccount);
+		$oAccount->SetPassword($oNewPassword);
+		if ($oAccount instanceof \RainLoop\Model\MainAccount) {
+			$oActions->SetAuthToken($oAccount);
+			$oAccount->resealCryptKey($oPrevPassword);
+		}
 
 		return $this->jsonResponse(__FUNCTION__, $oActions->AppData(false));
 	}
 
-	public static function encrypt(string $algo, string $password)
+	public static function encrypt(string $algo, SensitiveString $password)
 	{
 		switch (\strtolower($algo))
 		{
@@ -212,7 +245,7 @@ class ChangePasswordPlugin extends \RainLoop\Plugins\AbstractPlugin
 	private static function PasswordStrength(string $sPassword) : int
 	{
 		$i = \strlen($sPassword);
-		$max = min(100, $i * 8);
+		$max = \min(100, $i * 8);
 		$s = 0;
 		while (--$i) {
 			$s += ($sPassword[$i] != $sPassword[$i-1] ? 1 : -0.5);
diff --git a/plugins/change-password/js/ChangePasswordUserSettings.js b/plugins/change-password/js/ChangePasswordUserSettings.js
index 156e4655a..8ec0ad048 100644
--- a/plugins/change-password/js/ChangePasswordUserSettings.js
+++ b/plugins/change-password/js/ChangePasswordUserSettings.js
@@ -34,6 +34,9 @@
 	class ChangePasswordUserSettings
 	{
 		constructor() {
+			let minLength = rl.pluginSettingsGet('change-password', 'pass_min_length');
+			let minStrength = rl.pluginSettingsGet('change-password', 'pass_min_strength');
+
 			this.changeProcess = ko.observable(false);
 			this.errorDescription = ko.observable('');
 			this.passwordMismatch = ko.observable(false);
@@ -43,6 +46,7 @@
 			this.currentPasswordError = ko.observable(false);
 			this.newPassword = ko.observable('');
 			this.newPassword2 = ko.observable('');
+			this.pass_min_length = minLength;
 
 			this.currentPassword.subscribe(() => this.resetUpdate(true));
 			this.newPassword.subscribe(() => this.resetUpdate());
@@ -51,11 +55,16 @@
 			ko.decorateCommands(this, {
 				saveNewPasswordCommand: self => !self.changeProcess()
 					&& '' !== self.currentPassword()
-					&& '' !== self.newPassword()
-					&& '' !== self.newPassword2()
+					&& self.newPassword().length >= minLength
+					&& self.newPassword2() == self.newPassword()
+					&& (!this.meter || this.meter.value >= minStrength)
 			});
 		}
 
+		submitForm(form) {
+			form.reportValidity() && this.saveNewPasswordCommand();
+		}
+
 		saveNewPasswordCommand() {
 			if (this.newPassword() !== this.newPassword2()) {
 				this.passwordMismatch(true);
@@ -63,9 +72,28 @@
 			} else {
 				this.reset(true);
 				rl.pluginRemoteRequest(
-					(...args) => {
-						console.dir(...args);
-						this.onChangePasswordResponse(...args);
+					(iError, data) => {
+						this.reset(false);
+						if (iError) {
+							this.passwordUpdateError(true);
+							if (131 === iError) {
+								// Notification.CurrentPasswordIncorrect
+								this.currentPasswordError(true);
+							}
+							this.errorDescription((data && rl.i18n(data.ErrorMessageAdditional))
+								|| rl.i18n('NOTIFICATIONS/COULD_NOT_SAVE_NEW_PASSWORD'));
+						} else {
+							this.currentPassword('');
+							this.newPassword('');
+							this.newPassword2('');
+							this.passwordUpdateSuccess(true);
+/*
+							const refresh = rl.app.refresh;
+							rl.app.refresh = ()=>{};
+							rl.setData(data.Result);
+							rl.app.refresh = refresh;
+*/
+						}
 					},
 					'ChangePassword',
 					{
@@ -90,9 +118,9 @@
 		}
 
 		onBuild(dom) {
-			let input = dom.querySelector('.new-password'),
-				meter = dom.querySelector('.new-password-meter');
-			input && meter && input.addEventListener('input',() => meter.value = getPassStrength(input.value));
+			let meter = dom.querySelector('.new-password-meter');
+			meter && this.newPassword.subscribe(value => meter.value = getPassStrength(value));
+			this.meter = meter;
 		}
 
 		onHide() {
@@ -101,25 +129,6 @@
 			this.newPassword('');
 			this.newPassword2('');
 		}
-
-		onChangePasswordResponse(iError, data) {
-			this.reset(false);
-			if (iError) {
-				this.passwordUpdateError(true);
-				if (131 === iError) {
-					// Notification.CurrentPasswordIncorrect
-					this.currentPasswordError(true);
-				}
-				this.errorDescription((data && rl.i18n(data.ErrorMessageAdditional))
-					|| rl.i18n('NOTIFICATIONS/COULD_NOT_SAVE_NEW_PASSWORD'));
-			} else {
-				this.currentPassword('');
-				this.newPassword('');
-				this.newPassword2('');
-				this.passwordUpdateSuccess(true);
-				rl.setData(data.Result);
-			}
-		}
 	}
 
 	rl.addSettingsViewModel(
diff --git a/plugins/change-password/langs/de_DE.ini b/plugins/change-password/langs/de.ini
similarity index 90%
rename from plugins/change-password/langs/de_DE.ini
rename to plugins/change-password/langs/de.ini
index 583cd5783..71360c000 100644
--- a/plugins/change-password/langs/de_DE.ini
+++ b/plugins/change-password/langs/de.ini
@@ -10,3 +10,4 @@ CURRENT_PASSWORD_INCORRECT = "Aktuelles Passwort falsch"
 CURRENT_PASSWORD_INCORRECT = "Aktuelles Passwort falsch"
 NEW_PASSWORD_SHORT = "Passwort ist zu kurz"
 NEW_PASSWORD_WEAK = "Passwort ist zu einfach"
+NEW_PASSWORD_HIBP = "Passwort gefunden in Have I Been Pwned"
diff --git a/plugins/change-password/langs/en.ini b/plugins/change-password/langs/en.ini
index 8d3db7374..4a4a6ea12 100644
--- a/plugins/change-password/langs/en.ini
+++ b/plugins/change-password/langs/en.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Could not save new password"
 CURRENT_PASSWORD_INCORRECT = "Current password incorrect"
 NEW_PASSWORD_SHORT = "Password is too short"
 NEW_PASSWORD_WEAK = "Password is too easy"
+NEW_PASSWORD_HIBP = "Password found in Have I Been Pwned"
diff --git a/plugins/change-password/langs/en_GB.ini b/plugins/change-password/langs/en_GB.ini
index 8d3db7374..4a4a6ea12 100644
--- a/plugins/change-password/langs/en_GB.ini
+++ b/plugins/change-password/langs/en_GB.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Could not save new password"
 CURRENT_PASSWORD_INCORRECT = "Current password incorrect"
 NEW_PASSWORD_SHORT = "Password is too short"
 NEW_PASSWORD_WEAK = "Password is too easy"
+NEW_PASSWORD_HIBP = "Password found in Have I Been Pwned"
diff --git a/plugins/change-password/langs/en_US.ini b/plugins/change-password/langs/en_US.ini
index 8d3db7374..4a4a6ea12 100644
--- a/plugins/change-password/langs/en_US.ini
+++ b/plugins/change-password/langs/en_US.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Could not save new password"
 CURRENT_PASSWORD_INCORRECT = "Current password incorrect"
 NEW_PASSWORD_SHORT = "Password is too short"
 NEW_PASSWORD_WEAK = "Password is too easy"
+NEW_PASSWORD_HIBP = "Password found in Have I Been Pwned"
diff --git a/plugins/change-password/langs/es_ES.ini b/plugins/change-password/langs/es.ini
similarity index 90%
rename from plugins/change-password/langs/es_ES.ini
rename to plugins/change-password/langs/es.ini
index f545a2505..47bc3ecee 100644
--- a/plugins/change-password/langs/es_ES.ini
+++ b/plugins/change-password/langs/es.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "No se puede guardar la nueva contraseña"
 CURRENT_PASSWORD_INCORRECT = "La contraseña actual es incorrecta"
 NEW_PASSWORD_SHORT = "La contraseña es muy corta"
 NEW_PASSWORD_WEAK = "La contraseña es muy fácil"
+NEW_PASSWORD_HIBP = "Contraseña encontrada en Have I Been Pwned"
diff --git a/plugins/change-password/langs/fr_FR.ini b/plugins/change-password/langs/fr.ini
similarity index 90%
rename from plugins/change-password/langs/fr_FR.ini
rename to plugins/change-password/langs/fr.ini
index 60c449b2c..ecb563f83 100644
--- a/plugins/change-password/langs/fr_FR.ini
+++ b/plugins/change-password/langs/fr.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Impossible d'enregistrer le nouveau mot de passe"
 CURRENT_PASSWORD_INCORRECT = "Le mot de passe actuel est incorrect"
 NEW_PASSWORD_SHORT = "Le mot de passe est trop court"
 NEW_PASSWORD_WEAK = "Le mot de passe n'est pas assez fort"
+NEW_PASSWORD_HIBP = "Mot de passe trouvé dans Have I Been Pwned"
diff --git a/plugins/change-password/langs/it_IT.ini b/plugins/change-password/langs/it.ini
similarity index 91%
rename from plugins/change-password/langs/it_IT.ini
rename to plugins/change-password/langs/it.ini
index e3495e465..62507ce53 100644
--- a/plugins/change-password/langs/it_IT.ini
+++ b/plugins/change-password/langs/it.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Non è stato possibile salvare la nuova password"
 CURRENT_PASSWORD_INCORRECT = "La password attuale non è corretta"
 NEW_PASSWORD_SHORT = "La password scelta è troppo breve"
 NEW_PASSWORD_WEAK = "La password scelta non è abbastanza complessa"
+NEW_PASSWORD_HIBP = "Password trovata in Have I Been Pwned"
diff --git a/plugins/change-password/langs/nl_NL.ini b/plugins/change-password/langs/nl.ini
similarity index 90%
rename from plugins/change-password/langs/nl_NL.ini
rename to plugins/change-password/langs/nl.ini
index 9eff931ad..9b6078e1d 100644
--- a/plugins/change-password/langs/nl_NL.ini
+++ b/plugins/change-password/langs/nl.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "Nieuwe wachtwoord kon niet opgeslagen worden"
 CURRENT_PASSWORD_INCORRECT = "Huidig wachtwoord onjuist"
 NEW_PASSWORD_SHORT = "Wachtwoord is te kort"
 NEW_PASSWORD_WEAK = "Wachtwoord is te makkelijk"
+NEW_PASSWORD_HIBP = "Wachtwoord gevonden in Have I Been Pwned"
diff --git a/plugins/change-password/langs/uk.ini b/plugins/change-password/langs/uk.ini
new file mode 100644
index 000000000..83afa3df4
--- /dev/null
+++ b/plugins/change-password/langs/uk.ini
@@ -0,0 +1,13 @@
+[SETTINGS_CHANGE_PASSWORD]
+LEGEND_CHANGE_PASSWORD = "Змінити пароль"
+LABEL_CURRENT_PASSWORD = "Поточний пароль"
+LABEL_NEW_PASSWORD = "Новий пароль"
+LABEL_REPEAT_PASSWORD = "Підтвердьте новий пароль"
+BUTTON_UPDATE_PASSWORD = "Змінити"
+ERROR_PASSWORD_MISMATCH = "Паролі не збігаються, спробуйте ще раз"
+[NOTIFICATIONS]
+COULD_NOT_SAVE_NEW_PASSWORD = "Не вдалося зберегти новий пароль"
+CURRENT_PASSWORD_INCORRECT = "Поточний пароль не вірний"
+NEW_PASSWORD_SHORT = "Пароль закороткий"
+NEW_PASSWORD_WEAK = "Пароль надто легкий"
+NEW_PASSWORD_HIBP = "Пароль знайдено в сервісі Have I Been Pwned"
diff --git a/plugins/change-password/langs/zh_CN.ini b/plugins/change-password/langs/zh.ini
similarity index 89%
rename from plugins/change-password/langs/zh_CN.ini
rename to plugins/change-password/langs/zh.ini
index 9aab9f805..9f902096b 100644
--- a/plugins/change-password/langs/zh_CN.ini
+++ b/plugins/change-password/langs/zh.ini
@@ -10,3 +10,4 @@ COULD_NOT_SAVE_NEW_PASSWORD = "无法保存新密码"
 CURRENT_PASSWORD_INCORRECT = "当前密码不正确"
 NEW_PASSWORD_SHORT = "密码太短"
 NEW_PASSWORD_WEAK = "密码过于简单"
+NEW_PASSWORD_HIBP = "在 Have I Been Pwned 中找到密码"
diff --git a/plugins/change-password/templates/SettingsChangePassword.html b/plugins/change-password/templates/SettingsChangePassword.html
index ac0e62d20..69cda54b1 100644
--- a/plugins/change-password/templates/SettingsChangePassword.html
+++ b/plugins/change-password/templates/SettingsChangePassword.html
@@ -1,20 +1,20 @@
 <div class="b-settings-general g-ui-user-select-none">
-	<div class="form-horizontal change-password">
+	<form action="" spellcheck="false" data-bind="submit: submitForm" class="form-horizontal change-password">
 		<div class="legend" data-i18n="SETTINGS_CHANGE_PASSWORD/LEGEND_CHANGE_PASSWORD"></div>
 		<div class="row">
 			<div class="span6">
 				<div class="control-group" data-bind="css: {'error': currentPasswordError}">
 					<label class="control-label" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_CURRENT_PASSWORD"></label>
 					<div class="controls">
-						<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
 							data-bind="textInput: currentPassword" />
 					</div>
 				</div>
 				<div class="control-group" data-bind="css: {'error': passwordMismatch}">
 					<label class="control-label" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_NEW_PASSWORD"></label>
 					<div class="controls">
-						<input style="margin:0" class="new-password" type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-							data-bind="textInput: newPassword" />
+						<input style="margin:0" class="new-password" type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off"
+							data-bind="textInput: newPassword, attr:{minlength:pass_min_length}" />
 						<br/>
 						<meter style="width:210px" class="new-password-meter" min="0" low="35" optimum="85" high="70" max="100" value="0"></meter>
 					</div>
@@ -22,20 +22,20 @@
 				<div class="control-group" data-bind="css: {'error': passwordMismatch}">
 					<label class="control-label" data-i18n="SETTINGS_CHANGE_PASSWORD/LABEL_REPEAT_PASSWORD"></label>
 					<div class="controls">
-						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off"
 							data-bind="textInput: newPassword2" />
 					</div>
 				</div>
 				<div class="control-group">
 					<div class="controls">
-						<a class="btn" data-bind="command: saveNewPasswordCommand, css: { 'btn-success': passwordUpdateSuccess, 'btn-danger': passwordUpdateError }">
+						<button class="btn" data-bind="command: saveNewPasswordCommand, css: { 'btn-success': passwordUpdateSuccess, 'btn-danger': passwordUpdateError }">
 							<i class="fontastic" data-bind="css: {'icon-spinner': changeProcess()}">🔑</i>
 							<span class="i18n" data-i18n="SETTINGS_CHANGE_PASSWORD/BUTTON_UPDATE_PASSWORD"></span>
-						</a>
+						</button>
 					</div>
 				</div>
 			</div>
 			<div class="span4 alert alert-error alert-null-left-margin" data-bind="visible: '' !== errorDescription(), text: errorDescription"></div>
 		</div>
-	</div>
+	</form>
 </div>
diff --git a/plugins/change-smtp-ehlo-message/index.php b/plugins/change-smtp-ehlo-message/index.php
index af9fd2964..093566d6c 100644
--- a/plugins/change-smtp-ehlo-message/index.php
+++ b/plugins/change-smtp-ehlo-message/index.php
@@ -9,22 +9,21 @@ class ChangeSmtpEhloMessagePlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function Init() : void
 	{
-		$this->addHook('smtp.credentials', 'FilterSmtpCredentials');
+		$this->addHook('smtp.before-connect', 'FilterSmtpCredentials');
 	}
 
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param array $aSmtpCredentials
 	 */
-	public function FilterSmtpCredentials($oAccount, &$aSmtpCredentials)
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount,
+		\MailSo\Smtp\SmtpClient $oSmtpClient,
+		array &$aSmtpCredentials)
 	{
-		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
-		{
-			// Default:
-			// $aSmtpCredentials['Ehlo'] = \MailSo\Smtp\SmtpClient::EhloHelper();
-			//
-			// or write your custom php
-			$aSmtpCredentials['Ehlo'] = 'localhost';
-		}
+		// Default:
+		// $aSmtpCredentials['Ehlo'] = \MailSo\Smtp\SmtpClient::EhloHelper();
+		//
+		// or write your custom php
+		$aSmtpCredentials['Ehlo'] = 'localhost';
 	}
 }
diff --git a/plugins/ckeditor/ckeditor.js b/plugins/ckeditor/ckeditor.js
deleted file mode 100644
index c5a8286ce..000000000
--- a/plugins/ckeditor/ckeditor.js
+++ /dev/null
@@ -1,92 +0,0 @@
-(rl => {
-	if (rl) {
-		const path = (rl.settings.app('webVersionPath') || 'snappymail/v/' + rl.settings.app('version') + '/'),
-			script = document.createElement('script');
-		script.src = path + 'static/ckeditor/ckeditor.js';
-		document.head.append(script);
-
-		rl.createWYSIWYG = (container, onReady) => {
-			if (!window.CKEDITOR) {
-				return null;
-			}
-
-			const
-				language = (rl.settings.get('Language') || 'en').toLowerCase(),
-				htmlEditorLangsMap = {
-					'ar_sa': 'ar-sa',
-					'pt_br': 'pt-br',
-					'zh_cn': 'zh-cn',
-				},
-				editor = CKEDITOR.appendTo(container, {
-					title: false,
-					stylesSet: false,
-//					customConfig: '',
-//					contentsCss: '',
-					toolbarGroups: [
-						{ name: 'spec' },
-						{ name: 'styles' },
-						{ name: 'basicstyles', groups: ['basicstyles', 'cleanup', 'bidi'] },
-						{ name: 'colors' },
-						{ name: 'paragraph', groups: ['list', 'indent', 'blocks', 'align'] },
-						{ name: 'links' },
-						{ name: 'insert' },
-						{ name: 'document', groups: ['mode', 'document', 'doctools'] },
-						{ name: 'others' }
-					],
-
-					removePlugins: 'liststyle' + (rl.settings.app('allowHtmlEditorBitiButtons') ? '' : ',bidi'),
-					removeButtons: 'Format,Undo,Redo,Cut,Copy,Paste,Anchor,Strike,Subscript,Superscript,Image,SelectAll',
-					removeDialogTabs: 'link:advanced;link:target;image:advanced;images:advanced',
-
-					extraPlugins: 'plain,signature',
-
-					allowedContent: true,
-					extraAllowedContent: true,
-
-					fillEmptyBlocks: false,
-//					ignoreEmptyParagraph: true,
-					disableNativeSpellChecker: false,
-
-					colorButton_enableAutomatic: false,
-//					colorButton_enableMore: true,
-
-					font_defaultLabel: 'Arial',
-					fontSize_defaultLabel: '13',
-					fontSize_sizes: '10/10px;12/12px;13/13px;14/14px;16/16px;18/18px;20/20px;24/24px;28/28px;36/36px;48/48px',
-
-					enterMode: CKEDITOR.ENTER_BR,
-					shiftEnterMode: CKEDITOR.ENTER_P,
-					language: htmlEditorLangsMap[language] || language.substr(0,2)
-				});
-
-			editor.on('key', event => !(event && event.data && 'Tab' == event.data.key));
-
-			editor.on('drop', event => {
-				const dt = event.data.dataTransfer,
-					id = dt.id,
-					file = dt.getFilesCount() ? dt.getFile(0) : 0;
-				if (file && id && file.type && file.type.match(/^image/i)) {
-					const imageId = `[img=${id}]`,
-						reader = new FileReader();
-
-					reader.onloadend = () => {
-						if (reader.result && 'wysiwyg' === editor.mode) {
-							try {
-								editor.setData(editor.getData().replace(imageId, `<img src="${reader.result}"/>`));
-							} catch (e) {} // eslint-disable-line no-empty
-						}
-					};
-
-					reader.readAsDataURL(file);
-
-					dt.setData('text/html', imageId);
-				}
-			});
-
-			editor.on('instanceReady', onReady);
-
-			return editor;
-		}
-	}
-
-})(window.rl);
diff --git a/plugins/ckeditor/src/CHANGES.md b/plugins/ckeditor/src/CHANGES.md
deleted file mode 100644
index ff58654f6..000000000
--- a/plugins/ckeditor/src/CHANGES.md
+++ /dev/null
@@ -1,1219 +0,0 @@
-CKEditor 4 Changelog
-====================
-
-## CKEditor 4.6.2
-
-New Features:
-
-* [#16733](http://dev.ckeditor.com/ticket/16733): Added a new pastel color palette for the [Color Button](http://ckeditor.com/addon/colorbutton) plugin and a new [`config.colorButton_colorsPerRow`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_colorsPerRow) configuration option for setting the number of rows in the color selector.
-* [#16752](http://dev.ckeditor.com/ticket/16752): Added a new Azerbaijani localization. Thanks to the [Azerbaijani language team](https://www.transifex.com/ckeditor/teams/11143/az/)!
-* [#13818](http://dev.ckeditor.com/ticket/13818): It is now possible to group [Widget](http://ckeditor.com/addon/widget) [style definitions](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles), so applying one style disables the other.
-
-Fixed Issues:
-
-* [#13446](http://dev.ckeditor.com/ticket/13446): [Chrome] Fixed: It is possible to type in an unfocused inline editor.
-* [#14856](http://dev.ckeditor.com/ticket/14856): Fixed: [Font size and font family](http://ckeditor.com/addon/font) reset each other when modified at certain positions.
-* [#16745](http://dev.ckeditor.com/ticket/16745): [Edge] Fixed: List items are lost when [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#16682](http://dev.ckeditor.com/ticket/16682): [Edge] Fixed: A list gets [pasted from Word](http://ckeditor.com/addon/pastefromword) as a set of paragraphs. Added the [`config.pasteFromWord_heuristicsEdgeList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWord_heuristicsEdgeList) configuration option.
-* [#10373](http://dev.ckeditor.com/ticket/10373): Fixed: Context menu items can be dragged into the editor.
-* [#16728](http://dev.ckeditor.com/ticket/16728): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Quirks Mode.
-* [#16795](http://dev.ckeditor.com/ticket/16795): [IE] Fixed: [Copy Formatting](http://ckeditor.com/addon/copyformatting) breaks the editor in Compatibility Mode.
-* [#16675](http://dev.ckeditor.com/ticket/16675): Fixed: Styles applied with [Copy Formatting](http://ckeditor.com/addon/copyformatting) to a single table cell are applied to the whole table.
-* [#16753](http://dev.ckeditor.com/ticket/16753): Fixed: [`element.setSize`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setSize) sets incorrect editor dimensions if the border width is represented as a fraction of pixels.
-* [#16705](http://dev.ckeditor.com/ticket/16705): [Firefox] Fixed: Unable to paste images as Base64 strings when using [Clipboard](http://ckeditor.com/addon/clipboard).
-* [#14869](http://dev.ckeditor.com/ticket/14869): Fixed: JavaScript error is thrown when trying to use [Find](http://ckeditor.com/addon/find) in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.6.1
-
-New Features:
-
-* [#16639](http://dev.ckeditor.com/ticket/16639): The `callback` parameter in the [CKEDITOR.ajax.post](http://docs.ckeditor.com/#!/api/CKEDITOR.ajax-method-post) method became optional.
-
-Fixed Issues:
-
-* [#11064](http://dev.ckeditor.com/ticket/11064): [Blink, WebKit] Fixed: Cannot select all editor content when a widget or a non-editable element is the first or last element of the content. Also fixes this issue in the [Select All](http://ckeditor.com/addon/selectall) plugin.
-* [#14755](http://dev.ckeditor.com/ticket/14755): [Blink, WebKit, IE8] Fixed: Browser hangs when a table is inserted in the place of a selected list with an empty last item.
-* [#16624](http://dev.ckeditor.com/ticket/16624): Fixed: Improved the [Color Button](http://ckeditor.com/addon/colorbutton) plugin which will now normalize the CSS `background` property if it only contains a color value. This fixes missing background colors when using [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#16600](http://dev.ckeditor.com/ticket/16600): [Blink, WebKit] Fixed: Error thrown occasionally by an uninitialized editable for multiple CKEditor instances on the same page.
-
-## CKEditor 4.6
-
-New Features:
-
-* [#14569](http://dev.ckeditor.com/ticket/14569): Added a new, flat, default CKEditor skin called [Moono-Lisa](http://ckeditor.com/addon/moono-lisa). Refreshed default colors available in the [Color Button](http://ckeditor.com/addon/colorbutton) plugin ([Text Color and Background Color](http://docs.ckeditor.com/#!/guide/dev_colorbutton) feature).
-* [#14707](http://dev.ckeditor.com/ticket/14707): Added a new [Copy Formatting](http://ckeditor.com/addon/copyformatting) feature to enable easy copying of styles between your document parts.
-* Introduced the completely rewritten [Paste from Word](http://ckeditor.com/addon/pastefromword) plugin:
-	* Backward incompatibility: The [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) option now defaults to `false`. This option will be deprecated in the future. Use [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) to replicate the effect of setting it to `true`.
-	* Backward incompatibility: The [`config.pasteFromWordNumberedHeadingToList`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordNumberedHeadingToList) and [`config.pasteFromWordRemoveStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveStyles) options were dropped and no longer have any effect on pasted content.
-	* Major improvements in preservation of list numbering, styling and indentation (nested lists with multiple levels).
-	* Major improvements in document structure parsing that fix plenty of issues with distorted or missing content after paste.
-* Added new translation: Occitan. Thanks to [Cédric Valmary](https://totenoc.eu/)!
-* [#10015](http://dev.ckeditor.com/ticket/10015): Keyboard shortcuts (relevant to the operating system in use) will now be displayed in tooltips and context menus.
-* [#13794](http://dev.ckeditor.com/ticket/13794): The [Upload Image](http://ckeditor.com/addon/uploadimage) feature now uses `uploaded.width/height` if set.
-* [#12541](http://dev.ckeditor.com/ticket/12541): Added the [Upload File](http://ckeditor.com/addon/uploadfile) plugin that lets you upload a file by drag&amp;dropping it into the editor content.
-* [#14449](http://dev.ckeditor.com/ticket/14449): Introduced the [Balloon Panel](http://ckeditor.com/addon/balloonpanel) plugin that lets you create stylish floating UI elements for the editor.
-* [#12077](https://dev.ckeditor.com/ticket/12077): Added support for the HTML5 `download` attribute in link (`<a>`) elements. Selecting the "Force Download" checkbox in the [Link](http://ckeditor.com/addon/link) dialog will cause the linked file to be downloaded automatically. Thanks to [sbusse](https://github.com/sbusse)!
-* [#13518](http://dev.ckeditor.com/ticket/13518): Introduced the [`additionalRequestParameters`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition-property-additionalRequestParameters) property for file uploads to make it possible to send additional information about the uploaded file to the server.
-* [#14889](http://dev.ckeditor.com/ticket/14889): Added the [`config.image2_altRequired`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_altRequired) option for the [Enhanced Image](http://ckeditor.com/addon/image2) plugin to allow making alternative text a mandatory field. Thanks to [Andrey Fedoseev](https://github.com/andreyfedoseev)!
-
-Fixed Issues:
-
-* [#9991](http://dev.ckeditor.com/ticket/9991): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) should only normalize input data.
-* [#7209](http://dev.ckeditor.com/ticket/7209): Fixed: Lists with 3 levels not [pasted from Word](http://ckeditor.com/addon/pastefromword) correctly.
-* [#14335](http://dev.ckeditor.com/ticket/14335): Fixed: Pasting a numbered list starting with a value different from "1" from Microsoft Word does not work correctly.
-* [#14542](http://dev.ckeditor.com/ticket/14542): Fixed: Copying a numbered list from Microsoft Word does not preserve list formatting.
-* [#14544](http://dev.ckeditor.com/ticket/14544): Fixed: Copying a nested list from Microsoft Word results in an empty list.
-* [#14660](http://dev.ckeditor.com/ticket/14660): Fixed: [Pasting text from  Word](http://ckeditor.com/addon/pastefromword) breaks the styling in some cases.
-* [#14867](http://dev.ckeditor.com/ticket/14867): [Firefox] Fixed: Text gets stripped when [pasting content from Word](http://ckeditor.com/addon/pastefromword).
-* [#2507](http://dev.ckeditor.com/ticket/2507): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) does not detect pasting a part of a paragraph.
-* [#3336](http://dev.ckeditor.com/ticket/3336): Fixed: Extra blank row added on top of the content [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#6115](http://dev.ckeditor.com/ticket/6115): Fixed: When Right-to-Left text direction is applied to a table [pasted from Word](http://ckeditor.com/addon/pastefromword), borders are missing on one side.
-* [#6342](http://dev.ckeditor.com/ticket/6342): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filters out a basic text style when it is [configured to use attributes](http://docs.ckeditor.com/#!/guide/dev_basicstyles-section-custom-basic-text-style-definition).
-* [#6457](http://dev.ckeditor.com/ticket/6457): [IE] Fixed: [Pasting from Word](http://ckeditor.com/addon/pastefromword) is extremely slow.
-* [#6789](http://dev.ckeditor.com/ticket/6789): Fixed: The `mso-list: ignore` style is not handled properly when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7262](http://dev.ckeditor.com/ticket/7262): Fixed: Lists in preformatted body disappear when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7662](http://dev.ckeditor.com/ticket/7662): [Opera] Fixed: Extra empty number/bullet shown in the editor body when editing a multi-level list [pasted from Word](http://ckeditor.com/addon/pastefromword).
-* [#7807](http://dev.ckeditor.com/ticket/7807): Fixed: Last item in a list not converted to a `<li>` element after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#7950](http://dev.ckeditor.com/ticket/7950): [IE] Fixed: Content [from Word pasted](http://ckeditor.com/addon/pastefromword) differently than in other browsers.
-* [#7982](http://dev.ckeditor.com/ticket/7982): Fixed: Multi-level lists get split into smaller ones when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#8231](http://dev.ckeditor.com/ticket/8231): [WebKit, Opera] Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts empty paragraphs.
-* [#8266](http://dev.ckeditor.com/ticket/8266): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) inserts a blank line at the top.
-* [#8341](http://dev.ckeditor.com/ticket/8341), [#7646](http://dev.ckeditor.com/ticket/7646): Fixed: Faulty removal of empty `<span>` elements in [Paste from Word](http://ckeditor.com/addon/pastefromword) content cleanup breaking content formatting.
-* [#8754](http://dev.ckeditor.com/ticket/8754): [Firefox] Fixed: Incorrect pasting of multiple nested lists in [Paste from Word](http://ckeditor.com/addon/pastefromword).
-* [#8983](http://dev.ckeditor.com/ticket/8983): Fixed: Alignment lost when [pasting from Word](http://ckeditor.com/addon/pastefromword) with [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) set to [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#9331](http://dev.ckeditor.com/ticket/9331): [IE] Fixed: [Pasting text from Word](http://ckeditor.com/addon/pastefromword) creates a simple Caesar cipher.
-* [#9422](http://dev.ckeditor.com/ticket/9422): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) leaves an unwanted `color:windowtext` style.
-* [#10011](http://dev.ckeditor.com/ticket/10011): [IE9-10] Fixed: [`config.pasteFromWordRemoveFontStyles`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordRemoveFontStyles) is ignored under certain conditions.
-* [#10643](http://dev.ckeditor.com/ticket/10643): Fixed: Differences between using <kbd>Ctrl+V</kbd> and pasting from the [Paste from Word](http://ckeditor.com/addon/pastefromword) dialog.
-* [#10784](http://dev.ckeditor.com/ticket/10784): Fixed: Lines missing when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11294](http://dev.ckeditor.com/ticket/11294): [IE10] Fixed: Font size is not preserved when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#11627](http://dev.ckeditor.com/ticket/11627): Fixed: Missing words when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#12784](http://dev.ckeditor.com/ticket/12784): Fixed: Bulleted list with custom bullets gets changed to a numbered list when [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13174](http://dev.ckeditor.com/ticket/13174): Fixed: Data loss after [pasting from Word](http://ckeditor.com/addon/pastefromword).
-* [#13828](http://dev.ckeditor.com/ticket/13828): Fixed: Widget classes should be added to the wrapper rather than the widget element.
-* [#13829](http://dev.ckeditor.com/ticket/13829): Fixed: No class in [Widget](http://ckeditor.com/addon/widget) wrapper to identify the widget type.
-* [#13519](http://dev.ckeditor.com/ticket/13519): Server response received when uploading files should be more flexible.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type) and [WebSpellChecker](http://ckeditor.com/addon/wsc) plugins:
- 	* Support for the new default Moono-Lisa skin.
- 	* [#121](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/121): Fixed: [Basic Styles](http://ckeditor.com/addon/basicstyles) do not work when SCAYT is enabled.
- 	* [#125](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/125): Fixed: Inline styles are not continued when writing multiple lines of styled text with SCAYT enabled.
- 	* [#127](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/127): Fixed: Uncaught TypeError after enabling SCAYT in the CKEditor `<div>` element.
- 	* [#128](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/128): Fixed: Error thrown after enabling SCAYT caused by conflicts with RequireJS.
-
-## CKEditor 4.5.11
-
-**Security Updates:**
-
-* [Severity: minor] Fixed the `target="_blank"` vulnerability reported by James Gaskell.
-
-	Issue summary: If a victim had access to a spoofed version of ckeditor.com via HTTP (e.g. due to DNS spoofing, using a hacked public network or mailicious hotspot), then when using a link to the ckeditor.com website it was possible for the attacker to change the current URL of the opening page, even if the opening page was protected with SSL.
-
-  An upgrade is recommended.
-
-New Features:
-
-* [#14747](http://dev.ckeditor.com/ticket/14747): The [Enhanced Image](http://ckeditor.com/addon/image2) caption now supports the link `target` attribute.
-* [#7154](http://dev.ckeditor.com/ticket/7154): Added support for the "Display Text" field to the [Link](http://ckeditor.com/addon/link) dialog. Thanks to [Ryan Guill](https://github.com/ryanguill)!
-
-Fixed Issues:
-
-* [#13362](http://dev.ckeditor.com/ticket/13362): [Blink, WebKit] Fixed: Active widget element is not cached when it is losing focus and it is inside an editable element.
-* [#13755](http://dev.ckeditor.com/ticket/13755): [Edge] Fixed: Pasting images does not work.
-* [#13548](http://dev.ckeditor.com/ticket/13548): [IE] Fixed: Clicking the [elements path](http://ckeditor.com/addon/elementspath) disables Cut and Copy icons.
-* [#13812](http://dev.ckeditor.com/ticket/13812): Fixed: When aborting file upload the placeholder for image is left.
-* [#14659](http://dev.ckeditor.com/ticket/14659): [Blink] Fixed: Content scrolled to the top after closing the dialog in a [`<div>`-based editor](http://ckeditor.com/addon/divarea).
-* [#14825](http://dev.ckeditor.com/ticket/14825): [Edge] Fixed: Focusing the editor causes unwanted scrolling due to dropped support for the `setActive` method.
-
-## CKEditor 4.5.10
-
-Fixed Issues:
-
-* [#10750](http://dev.ckeditor.com/ticket/10750): Fixed: The editor does not escape the `font-style` family property correctly, removing quotes and whitespace from font names.
-* [#14413](http://dev.ckeditor.com/ticket/14413): Fixed: The [Auto Grow](http://ckeditor.com/addon/autogrow) plugin with the [`config.autoGrow_onStartup`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoGrow_onStartup) option set to `true` does not work properly for an editor that is not visible.
-* [#14451](http://dev.ckeditor.com/ticket/14451): Fixed: Numeric element ID not escaped properly. Thanks to [Jakub Chalupa](https://github.com/chaluja7)!
-* [#14590](http://dev.ckeditor.com/ticket/14590): Fixed: Additional line break appearing after inline elements when switching modes. Thanks to [dpidcock](https://github.com/dpidcock)!
-* [#14539](https://dev.ckeditor.com/ticket/14539): Fixed: JAWS reads "selected Blank" instead of "selected <widget name>" when selecting a widget.
-* [#14701](http://dev.ckeditor.com/ticket/14701): Fixed: More precise labels for [Enhanced Image](http://ckeditor.com/addon/image2) and [Placeholder](http://ckeditor.com/addon/placeholder) widgets.
-* [#14667](http://dev.ckeditor.com/ticket/14667): [IE] Fixed: Removing background color from selected text removes background color from the whole paragraph.
-* [#14252](http://dev.ckeditor.com/ticket/14252): [IE] Fixed: Styles drop-down list does not always reflect the current style of the text line.
-* [#14275](http://dev.ckeditor.com/ticket/14275): [IE9+] Fixed: `onerror` and `onload` events are not used in browsers it could have been used when loading scripts dynamically.
-
-## CKEditor 4.5.9
-
-Fixed Issues:
-
-* [#10685](http://dev.ckeditor.com/ticket/10685): Fixed: Unreadable toolbar icons after updating to the new editor version. Fixed with [6876179](https://github.com/ckeditor/ckeditor-dev/commit/6876179db4ee97e786b07b8fd72e6b4120732185) in [ckeditor-dev](https://github.com/ckeditor/ckeditor-dev) and [6c9189f4](https://github.com/ckeditor/ckeditor-presets/commit/6c9189f46392d2c126854fe8889b820b8c76d291) in [ckeditor-presets](https://github.com/ckeditor/ckeditor-presets).
-* [#14573](https://dev.ckeditor.com/ticket/14573): Fixed: Missing [Widget](http://ckeditor.com/addon/widget) drag handler CSS when there are multiple editor instances.
-* [#14620](https://dev.ckeditor.com/ticket/14620): Fixed: Setting both the `min-height` style for the `<body>` element and the `height` style for the `<html>` element breaks the [Auto Grow](http://ckeditor.com/addon/autogrow) plugin.
-* [#14538](http://dev.ckeditor.com/ticket/14538): Fixed: Keyboard focus goes into an embedded `<iframe>` element.
-* [#14602](http://dev.ckeditor.com/ticket/14602): Fixed: The [`dom.element.removeAttribute()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeAttribute) method does not remove all attributes if no parameter is given.
-* [#8679](http://dev.ckeditor.com/ticket/8679): Fixed: Better focus indication and ability to style the selected color in the [color picker dialog](http://ckeditor.com/addon/colordialog).
-* [#11697](http://dev.ckeditor.com/ticket/11697): Fixed: Content is replaced ignoring the letter case setting in the [Find and Replace](http://ckeditor.com/addon/find) dialog window.
-* [#13886](http://dev.ckeditor.com/ticket/13886): Fixed: Invalid handling of the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) instance with the `styles` property by [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#14535](http://dev.ckeditor.com/ticket/14535): Fixed: CSS syntax corrections. Thanks to [mdjdenormandie](https://github.com/mdjdenormandie)!
-
-## CKEditor 4.5.8
-
-New Features:
-
-* [#12440](http://dev.ckeditor.com/ticket/12440): Added the [`config.colorButton_enableAutomatic`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-colorButton_enableAutomatic) option to allow hiding the "Automatic" option in the [color picker](http://ckeditor.com/addon/colorbutton).
-
-Fixed Issues:
-
-* [#10448](http://dev.ckeditor.com/ticket/10448): Fixed: Lack of scrollbar in the [right-to-left text direction](http://ckeditor.com/addon/bidi).
-* [#12707](http://dev.ckeditor.com/ticket/12707): Fixed: The order of table elements does not comply with the HTML specification.
-* [#13756](http://dev.ckeditor.com/ticket/13756): [Edge] Fixed: Context menus are cut-off.
-
-## CKEditor 4.5.7
-
-New Features:
-
-* [#14327](http://dev.ckeditor.com/ticket/14327): Added Swiss German localization. Thanks to [Miro Grenda](https://twitter.com/mirogrenda)!
-
-Fixed Issues:
-
-* [#13816](http://dev.ckeditor.com/ticket/13816): Introduced a new strategy for Filling Character handling to avoid changes in DOM. This fixes the following issues:
-	* [#12727](http://dev.ckeditor.com/ticket/12727): [Blink] `IndexSizeError` when using the [Div Editing Area](http://ckeditor.com/addon/divarea) and [Content Templates](http://ckeditor.com/addon/templates) plugins.
-	* [#13377](http://dev.ckeditor.com/ticket/13377): [Widget](http://ckeditor.com/addon/widget) plugin issue when typing in Korean.
-	* [#13389](http://dev.ckeditor.com/ticket/13389): [Blink] [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) fails when the cursor is next to an `<hr>` tag.
-	* [#13513](http://dev.ckeditor.com/ticket/13513): [Blink, WebKit] [Div Editing Area](http://ckeditor.com/addon/divarea) and [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) throw an error when an image is the only data in the editor.
-* [#13884](http://dev.ckeditor.com/ticket/13884): [Firefox] Fixed: Copying and pasting a table results in just the first cell being pasted.
-* [#14234](http://dev.ckeditor.com/ticket/14234): Fixed: URL input field is not marked as required in the [Media Embed](http://ckeditor.com/addon/embed) dialog.
-
-## CKEditor 4.5.6
-
-New Features:
-
-* Introduced the [`CKEDITOR.tools.getCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCookie) and [`CKEDITOR.tools.setCookie()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-setCookie) methods for accessing cookies.
-* Introduced the [`CKEDITOR.tools.getCsrfToken()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-getCsrfToken) method. The CSRF token is now automatically sent by the [File Browser](http://ckeditor.com/addon/filebrowser) and [File Tools](http://ckeditor.com/addon/filetools) plugins during file uploads. The server-side upload handlers may check it and use it to additionally secure the communication.
-
-Other Changes:
-
-* Updated [SCAYT](http://ckeditor.com/addon/scayt) (Spell Check As You Type):
-	- New features:
-		- CKEditor [Language](http://ckeditor.com/addon/language) plugin support.
-		- CKEditor [Placeholder](http://ckeditor.com/addon/placeholder) plugin support.
-		- [Drag&Drop](http://sdk.ckeditor.com/samples/fileupload.html) support.
-		- **Experimental** [GRAYT](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-grayt_autoStartup) (Grammar As You Type) functionality.
-	- Fixed issues:
-		* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98): SCAYT affects dialog double-click. Fixed in SCAYT core.
-		* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102): SCAYT core performance enhancements.
-		* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104): SCAYT's spans leak into the clipboard and after pasting.
-		* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105): A JavaScript error fired in case of multiple instances of CKEditor on one page.
-		* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107): SCAYT should not check non-editable parts of content.
-		* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108): Latest SCAYT copies the ID of the editor element to the iframe.
-		* SCAYT stops working when CKEditor [Undo plugin](http://ckeditor.com/addon/undo) not enabled.
-		* Issue with pasting SCAYT markup in CKEditor.
-		* SCAYT stops working after pressing the *Cancel* button in the WSC dialog.
-
-## CKEditor 4.5.5
-
-Fixed Issues:
-
-* [#13887](https://dev.ckeditor.com/ticket/13887): Fixed: [Link](http://ckeditor.com/addon/link) plugin alters the `target` attribute value. Thanks to [SamZiemer](https://github.com/SamZiemer)!
-* [#12189](http://dev.ckeditor.com/ticket/12189): Fixed: The [Link](http://ckeditor.com/addon/link) plugin dialog does not display the subject of email links if the subject parameter is not lowercase.
-* [#9192](http://dev.ckeditor.com/ticket/9192): Fixed: An `undefined` string is appended to an email address added with the [Link](http://ckeditor.com/addon/link) plugin if subject and email body are empty and [`config.emailProtection`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-emailProtection) is set to `encode`.
-* [#13790](https://dev.ckeditor.com/ticket/13790): Fixed: It is not possible to destroy the editor `<iframe>` after the editor was detached from DOM. Thanks to [Stefan Rijnhart](https://github.com/StefanRijnhart)!
-* [#13803](https://dev.ckeditor.com/ticket/13803): Fixed: The editor cannot be destroyed before being fully initialized. Thanks to [Cyril Fluck](https://github.com/cyril-sf)!
-* [#13867](http://dev.ckeditor.com/ticket/13867): Fixed: CKEditor does not work when the `classList` polyfill is used.
-* [#13885](http://dev.ckeditor.com/ticket/13885): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) requires the [Link](http://ckeditor.com/addon/link) plugin to link an image.
-* [#13883](http://dev.ckeditor.com/ticket/13883): Fixed: Copying a table using the context menu strips off styles.
-* [#13872](http://dev.ckeditor.com/ticket/13872): Fixed: Cutting is possible in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode.
-* [#12848](http://dev.ckeditor.com/ticket/12848): [Blink] Fixed: Opening the [Find and Replace](http://ckeditor.com/addon/find) dialog window in the [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode throws an exception.
-* [#13879](http://dev.ckeditor.com/ticket/13879): Fixed: It is not possible to prevent the [`editor.drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop) event.
-* [#13361](http://dev.ckeditor.com/ticket/13361): Fixed: Skin images fail when the site path includes parentheses because the `background-image` path needs single quotes around the URL value.
-* [#13771](http://dev.ckeditor.com/ticket/13771): Fixed: The `contents.css` style is not used if the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin is missing.
-* [#13782](http://dev.ckeditor.com/ticket/13782): Fixed: Unclear log messages.
-* [#13919](http://dev.ckeditor.com/ticket/13919): [Edge] Fixed: Browser window crashes when accessing the `isContentEditable` property of an `<input>` DOM element.
-
-Other Changes:
-
-* [#13859](http://dev.ckeditor.com/ticket/13859): Test cases created with `bender.tools.createTestsForEditors` will also receive editor bot as a second parameter.
-
-## CKEditor 4.5.4
-
-New Features:
-
-* [#13632](http://dev.ckeditor.com/ticket/13632): Introduce error logging mechanism.
-* [#13730](http://dev.ckeditor.com/ticket/13730): Switch to the new error logging mechanism.
-
-Fixed Issues:
-
-* [#9856](http://dev.ckeditor.com/ticket/9856): Fixed: Cannot use the native context menu together with the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Mark Wade](https://github.com/mark-wade)!
-* [#12733](http://dev.ckeditor.com/ticket/12733): [IE9+] Fixed: Radio button `onChange` does not work. Thanks to [Iliya Kostadinov](https://github.com/iliyakostadinov)!
-* [#13142](http://dev.ckeditor.com/ticket/13142): [Edge] Fixed: *Ctrl+A* and then *Backspace* result in an empty `<div>` element.
-* [#13599](http://dev.ckeditor.com/ticket/13599): Fixed: Cross-editor drag and drop of an inline widget results in error/artifacts.
-* [#13640](http://dev.ckeditor.com/ticket/13640): [IE] Fixed: Dropping a widget outside the `<body>` element is not handled correctly.
-* [#13533](http://dev.ckeditor.com/ticket/13533): Fixed: No progress during upload.
-* [#13680](http://dev.ckeditor.com/ticket/13680): Fixed: The parser should allow the `<h1-6>` element to be a child of the `<summary>` element.
-* [#11724](http://dev.ckeditor.com/ticket/11724): [Touch devices] Fixed: Drop-downs often hide right after opening them.
-* [#13690](http://dev.ckeditor.com/ticket/13690): Fixed: Copying content from IE to Chrome adds an extra paragraph.
-* [#13284](http://dev.ckeditor.com/ticket/13284): Fixed: Cannot drag and drop a widget if the text caret is placed just after the widget instance.
-* [#13516](http://dev.ckeditor.com/ticket/13516): Fixed: CKEditor removes empty HTML5 anchors without the `name` attribute.
-* [#13765](http://dev.ckeditor.com/ticket/13765): [Safari 9] Fixed: Problems with rendering samples.
-
-Other Changes:
-
-* [#11725](http://dev.ckeditor.com/ticket/11725): Marked [`CKEDITOR.env.mobile`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-mobile) as deprecated. The reason is that it is no longer clear what "mobile" means.
-* [#13737](http://dev.ckeditor.com/ticket/13737): Upgraded [Bender.js](https://github.com/benderjs/benderjs) to 0.4.1.
-
-## CKEditor 4.5.3
-
-New Features:
-
-* [#13501](http://dev.ckeditor.com/ticket/13501): Added the [`config.fileTools_defaultFileName`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fileTools_defaultFileName) option to allow setting a default file name for paste uploads.
-* [#13603](http://dev.ckeditor.com/ticket/13603): Added support for uploading dropped BMP images.
-
-Fixed Issues:
-
-* [#13590](http://dev.ckeditor.com/ticket/13590): Fixed: Various issues related to the [Paste from Word](http://ckeditor.com/addon/pastefromword) feature. Fixes also:
-  * [#11215](http://dev.ckeditor.com/ticket/11215),
-  * [#8780](http://dev.ckeditor.com/ticket/8780),
-  * [#12762](http://dev.ckeditor.com/ticket/12762).
-* [#13386](http://dev.ckeditor.com/ticket/13386): [Edge] Fixed: Issues with selecting and editing images.
-* [#13568](http://dev.ckeditor.com/ticket/13568): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method returns invalid results for entire content selection.
-* [#13453](http://dev.ckeditor.com/ticket/13453): Fixed: Drag&drop of entire editor content throws an error.
-* [#13465](http://dev.ckeditor.com/ticket/13465): Fixed: Error is thrown and the widget is lost on drag&drop if it is the only content of the editor.
-* [#13414](http://dev.ckeditor.com/ticket/13414): Fixed: Content auto paragraphing in a nested editable despite editor configuration.
-* [#13429](http://dev.ckeditor.com/ticket/13429): Fixed: Incorrect selection after content insertion by the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-* [#13388](http://dev.ckeditor.com/ticket/13388): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) integration with [Undo](http://ckeditor.com/addon/undo) is broken.
-
-Other Changes:
-
-* [#13637](https://dev.ckeditor.com/ticket/13637): Several icons were refactored.
-* Updated [Bender.js](https://github.com/benderjs/benderjs) to 0.3.0 and introduced the ability to run tests via HTTPs ([#13265](https://dev.ckeditor.com/ticket/13265)).
-
-## CKEditor 4.5.2
-
-Fixed Issues:
-
-* [#13609](http://dev.ckeditor.com/ticket/13609): [Edge] Fixed: The browser crashes when switching to the source mode. Thanks to [Andrew Williams and Mark Smeed](http://webxsolution.com/)!
-* [PR#201](https://github.com/ckeditor/ckeditor-dev/pull/201): Fixed: Buttons in the toolbar configurator cause form submission. Thanks to [colemanw](https://github.com/colemanw)!
-* [#13422](http://dev.ckeditor.com/ticket/13422): Fixed: A monospaced font should be used in the `<textarea>` element storing editor configuration in the toolbar configurator.
-* [#13494](http://dev.ckeditor.com/ticket/13494): Fixed: Error thrown in the toolbar configurator if plugin requirements are not met.
-* [#13409](http://dev.ckeditor.com/ticket/13409): Fixed: List elements incorrectly merged when pressing *Backspace* or *Delete*.
-* [#13434](http://dev.ckeditor.com/ticket/13434): Fixed: Dialog state indicator broken in Right–To–Left environments.
-* [#13460](http://dev.ckeditor.com/ticket/13460): [IE8] Fixed: Copying inline widgets is broken when [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf) is disabled.
-* [#13495](http://dev.ckeditor.com/ticket/13495): [Firefox, IE] Fixed: Text is not word-wrapped in the Paste dialog window.
-* [#13528](http://dev.ckeditor.com/ticket/13528): [Firefox@Windows] Fixed: Content copied from Microsoft Word and other external applications is pasted as a plain text. Removed the `CKEDITOR.plugins.clipboard.isHtmlInExternalDataTransfer` property as the check must be dynamic.
-* [#13583](http://dev.ckeditor.com/ticket/13583): Fixed: [`DataTransfer.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer-method-getData) should work consistently in all browsers and should not strip valuable content. Fixed pasting tables from Microsoft Excel on Chrome.
-* [#13468](http://dev.ckeditor.com/ticket/13468): [IE] Fixed: Binding drag&drop `dataTransfer` does not work if `text` data was set in the meantime.
-* [#13451](http://dev.ckeditor.com/ticket/13451): [IE8-9] Fixed: One drag&drop operation may affect following ones.
-* [#13184](http://dev.ckeditor.com/ticket/13184): Fixed: Web page reloaded after a drop on editor UI.
-* [#13129](http://dev.ckeditor.com/ticket/13129) Fixed: Block widget blurred after a drop followed by an undo.
-* [#13397](http://dev.ckeditor.com/ticket/13397): Fixed: Drag&drop of a widget inside its nested widget crashes the editor.
-* [#13385](http://dev.ckeditor.com/ticket/13385): Fixed: [`editor.getSnapshot()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSnapshot) may return a non-string value.
-* [#13419](http://dev.ckeditor.com/ticket/13419): Fixed: The [Auto Link](http://ckeditor.com/addon/autolink) plugin does not encode double quotes in URLs.
-* [#13420](http://dev.ckeditor.com/ticket/13420): Fixed: The [Auto Embed](http://ckeditor.com/addon/autoembed) plugin ignores encoded characters in URL parameters.
-* [#13410](http://dev.ckeditor.com/ticket/13410): Fixed: Error thrown in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin when undoing right after pasting a link.
-* [#13566](http://dev.ckeditor.com/ticket/13566): Fixed: Suppressed notifications in the [Media Embed Base](http://ckeditor.com/addon/embedbase) plugin.
-* [#11616](http://dev.ckeditor.com/ticket/11616): [Chrome] Fixed: Resizing the editor while it is not displayed breaks the editable. Fixes also [#9160](http://dev.ckeditor.com/ticket/9160) and [#9715](http://dev.ckeditor.com/ticket/9715).
-* [#11376](http://dev.ckeditor.com/ticket/11376): [IE11] Fixed: Loss of text when pasting bulleted lists from Microsoft Word.
-* [#13143](http://dev.ckeditor.com/ticket/13143): [Edge] Fixed: Focus lost when opening the panel.
-* [#13387](http://dev.ckeditor.com/ticket/13387): [Edge] Fixed: "Permission denied" error thrown when loading the editor with developer tools open.
-* [#13574](http://dev.ckeditor.com/ticket/13574): [Edge] Fixed: "Permission denied" error thrown when opening editor dialog windows.
-* [#13441](http://dev.ckeditor.com/ticket/13441): [Edge] Fixed: The [Clipboard](http://ckeditor.com/addon/clipboard) plugin breaks the state of [Undo](http://ckeditor.com/addon/undo) commands after a paste.
-* [#13554](http://dev.ckeditor.com/ticket/13554): [Edge] Fixed: Paste dialog's iframe does not receive focus on show.
-* [#13440](http://dev.ckeditor.com/ticket/13440): [Edge] Fixed: Unable to paste a widget.
-
-Other Changes:
-
-* [#13421](http://dev.ckeditor.com/ticket/13421): UX improvements to notifications in the [Auto Embed](http://ckeditor.com/addon/autoembed) plugin.
-
-## CKEditor 4.5.1
-
-Fixed Issues:
-
-* [#13486](http://dev.ckeditor.com/ticket/13486): Fixed: The [Upload Image](http://ckeditor.com/addon/uploadimage) plugin should log an error, not throw an error when upload URL is not set.
-
-## CKEditor 4.5
-
-New Features:
-
-* [#13304](http://dev.ckeditor.com/ticket/13304): Added support for passing DOM elements to [`config.sharedSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-sharedSpaces). Thanks to [Undergrounder](https://github.com/Undergrounder)!
-* [#13215](http://dev.ckeditor.com/ticket/13215): Added ability to cancel fetching a resource by the Embed plugins.
-* [#13213](http://dev.ckeditor.com/ticket/13213): Added the [`dialog#setState()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-method-setState) method and used it in the [Embed](http://ckeditor.com/addon/embed) dialog to indicate that a resource is being loaded.
-* [#13337](http://dev.ckeditor.com/ticket/13337): Added the [`repository.onWidget()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-onWidget) method &mdash; a convenient way to listen to [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) events through the [repository](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository).
-* [#13214](http://dev.ckeditor.com/ticket/13214): Added support for pasting links that convert into embeddable resources on the fly.
-
-Fixed Issues:
-
-* [#13334](http://dev.ckeditor.com/ticket/13334): Fixed: Error after nesting widgets and playing with undo/redo.
-* [#13118](http://dev.ckeditor.com/ticket/13118): Fixed: The [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) method throws an error when called in the source mode.
-* [#13158](http://dev.ckeditor.com/ticket/13158): Fixed: Error after canceling a dialog when creating a widget.
-* [#13197](http://dev.ckeditor.com/ticket/13197): Fixed: Linked inline [Enhanced Image](http://ckeditor.com/addon/image2) alignment class is not transferred to the widget wrapper.
-* [#13199](http://dev.ckeditor.com/ticket/13199): Fixed: [Semantic Embed](http://ckeditor.com/addon/embedsemantic) does not support widget classes.
-* [#13003](http://dev.ckeditor.com/ticket/13003): Fixed: Anchors are uploaded when moving them by drag and drop.
-* [#13032](http://dev.ckeditor.com/ticket/13032): Fixed: When upload is done, notification update should be marked as important.
-* [#13300](http://dev.ckeditor.com/ticket/13300): Fixed: The `internalCommit` argument in the [Image](http://ckeditor.com/addon/image) dialog seems to be never used.
-* [#13036](http://dev.ckeditor.com/ticket/13036): Fixed: Notifications are moved 10px to the right.
-* [#13280](http://dev.ckeditor.com/ticket/13280): [IE8] Fixed: Undo after inline widget drag&drop throws an error.
-* [#13186](http://dev.ckeditor.com/ticket/13186): Fixed: Content dropped into a nested editable is not filtered by [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_acf).
-* [#13140](http://dev.ckeditor.com/ticket/13140): Fixed: Error thrown when dropping a block widget right after itself.
-* [#13176](http://dev.ckeditor.com/ticket/13176): [IE8] Fixed: Errors on drag&drop of embed widgets.
-* [#13015](http://dev.ckeditor.com/ticket/13015): Fixed: Dropping an image file on [Enhanced Image](http://ckeditor.com/addon/image2) causes a page reload.
-* [#13080](http://dev.ckeditor.com/ticket/13080): Fixed: Ugly notification shown when the response contains HTML content.
-* [#13011](http://dev.ckeditor.com/ticket/13011): [IE8] Fixed: Anchors are duplicated on drag&drop in specific locations.
-* [#13105](http://dev.ckeditor.com/ticket/13105): Fixed: Various issues related to [`CKEDITOR.tools.htmlEncode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlEncode) and [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) methods.
-* [#11976](http://dev.ckeditor.com/ticket/11976): [Chrome] Fixed: Copy&paste and drag&drop lists from Microsoft Word.
-* [#13128](http://dev.ckeditor.com/ticket/13128): Fixed: Various issues with cloning element IDs:
-  * Fixed the default behavior of [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) and [`range.extractContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-extractContents) methods which now clone IDs similarly to their native counterparts.
-  * Added `cloneId` arguments to the above methods, [`range.splitBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-splitBlock) and [`element.breakParent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-breakParent). Mind the default values and special behavior in the `extractContents()` method!
-  * Fixed issues where IDs were lost on copy&paste and drag&drop.
-* Toolbar configurators:
-  * [#13185](http://dev.ckeditor.com/ticket/13185): Fixed: Wrong position of the suggestion box if there is not enough space below the caret.
-  * [#13138](http://dev.ckeditor.com/ticket/13138): Fixed: The "Toggle empty elements" button label is unclear.
-  * [#13136](http://dev.ckeditor.com/ticket/13136): Fixed: Autocompleter is far too intrusive.
-  * [#13133](http://dev.ckeditor.com/ticket/13133): Fixed: Tab leaves the editor.
-  * [#13173](http://dev.ckeditor.com/ticket/13173): Fixed: [`config.removeButtons`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-removeButtons) is ignored by the advanced toolbar configurator.
-
-Other Changes:
-
-* [#13119](http://dev.ckeditor.com/ticket/13119): Improved compatibility of editor skins ([Moono](http://ckeditor.com/addon/moono) and [Kama](http://ckeditor.com/addon/kama)) with external web page style sheets.
-* Toolbar configurators:
-  * [#13147](http://dev.ckeditor.com/ticket/13147): Added buttons to the sticky toolbar.
-  * [#13207](http://dev.ckeditor.com/ticket/13207): Used modal window to display toolbar configurator help.
-* [#13316](http://dev.ckeditor.com/ticket/13316): Made [`CKEDITOR.env.isCompatible`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-isCompatible) a blacklist rather than a whitelist. More about the change in the [Browser Compatibility](http://docs.ckeditor.com/#!/guide/dev_browsers) guide.
-* [#13398](http://dev.ckeditor.com/ticket/13398): Renamed `CKEDITOR.fileTools.UploadsRepository` to [`CKEDITOR.fileTools.UploadRepository`](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadRepository) and changed all related properties.
-* [#13279](http://dev.ckeditor.com/ticket/13279): Reviewed CSS vendor prefixes.
-* [#13454](http://dev.ckeditor.com/ticket/13454): Removed unused `lang.image.alertUrl` token from the [Image](http://ckeditor.com/addon/image) plugin.
-
-## CKEditor 4.5 Beta
-
-New Features:
-
-* Clipboard (copy&paste, drag&drop) and file uploading features and improvements ([#11437](http://dev.ckeditor.com/ticket/11437)).
-
-  * Major features:
-    * Support for dropping and pasting files into the editor was introduced. Through a set of new facades for native APIs it is now possible to easily intercept and process inserted files.
-    * [File upload tools](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools) were introduced in order to simplify controlling the loading, uploading and handling server response, properly handle [new upload configuration](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uploadUrl) options, etc.
-    * [Upload Image](http://ckeditor.com/addon/uploadimage) widget was introduced to upload dropped images. A base class for the [upload widget](http://docs.ckeditor.com/#!/api/CKEDITOR.fileTools.uploadWidgetDefinition) was exposed, too, to make it simple to create new types of upload widgets which can handle any type of dropped file, show the upload progress and update the content when the process is done. It also handles editing and undo/redo operations when a file is being uploaded and integrates with the [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) to show progress and success or error.
-    * All drag and drop operations were integrated with the editor. All dropped content is passed through the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event and a set of new editor events was introduced &mdash; [`dragstart`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragstart), [`drop`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-drop), [`dragend`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-dragend).
-    * The [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) facade was introduced to unify access to data in various types and files. [Data Transfer](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.clipboard.dataTransfer) is now always available in the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * Switched from the pastebin to using the native clipboard access whenever possible. This solved many issues related to pastebin such as unnecessary scrolling or data loss. Additionally, on copy and cut from the editor the clipboard data is set. Therefore, on paste the editor has access to clean data, undisturbed by the browsers.
-    * Drag and drop of inline and block widgets was integrated with the standard clipboard APIs. By listening to drag events you will thus be notified about widgets, too. This opens a possibility to filter pasted and dropped widgets.
-    * The [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event can have the `range` parameter so it is possible to change the paste position in the listener or paste in the not selectable position. Also the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method now accepts `range` as an additional parameter.
-    * [#11621](http://dev.ckeditor.com/ticket/11621): A configurable [paste filter](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFilter) was introduced. The filter is by default turned to `'semantic-content'` on Webkit and Blink for all pasted content coming from external sources because of the low quality of HTML that these engines put into the clipboard. Internal and cross-editor paste is safe due to the change explained in the previous point.
-
-  * Other changes and related fixes:
-    * [#12095](http://dev.ckeditor.com/ticket/12095): On drag and copy of widgets [the same method](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) is used to get selected HTML as in the normal case. Thanks to that styles applied to inline widgets are not lost.
-    * [#11219](http://dev.ckeditor.com/ticket/11219): Fixed: Dragging a [captioned image](http://ckeditor.com/addon/image2) does not fire the [`editor#paste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-paste) event.
-    * [#9554](http://dev.ckeditor.com/ticket/9554): [Webkit Mac] Fixed: Editor scrolls on paste.
-    * [#9898](http://dev.ckeditor.com/ticket/9898): [Webkit&Divarea] Fixed: Pasting causes undesirable scrolling.
-    * [#11993](http://dev.ckeditor.com/ticket/11993): [Chrome] Fixed: Pasting content scrolls the document.
-    * [#12613](http://dev.ckeditor.com/ticket/12613): Show the user that they can not drop on editor UI (toolbar, bottom bar).
-    * [#12851](http://dev.ckeditor.com/ticket/12851): [Blink/Webkit] Fixed: Formatting disappears when pasting content into cells.
-    * [#12914](http://dev.ckeditor.com/ticket/12914): Fixed: Copy/Paste of table broken in `div`-based editor.
-
-  * Browser support.<br>Browser support for related features varies significantly (see http://caniuse.com/clipboard).
-    * File APIs needed to operate and file upload is not supported in Internet Explorer 9 and below.
-    * Only Chrome and Safari on Mac OS support setting custom data items in the clipboard, so currently it is possible to recognize the origin of the copied content in these browsers only. All drag and drop operations can be identified thanks to the new Data Transfer facade.
-    * No Internet Explorer browser supports the standard clipboard API which results in small glitches like where only plain text can be dropped from outside the editor. Thanks to the new Data Transfer facade, internal and cross-editor drag and drop supports the full range of data.
-    * Direct access to clipboard could only be implemented in Chrome, Safari on Mac OS, Opera and Firefox. In other browsers the pastebin must still be used.
-
-* [#12875](http://dev.ckeditor.com/ticket/12875): Samples and toolbar configuration tools.
-  * The old set of samples shipped with every CKEditor package was replaced with a shiny new single-page sample. This change concluded a long term plan which started from introducing the [CKEditor SDK](http://sdk.ckeditor.com/) and [CKEditor Functionality Overview](http://docs.ckeditor.com/#!/guide/dev_features) section in the documentation which essentially redefined the old samples.
-  * Toolbar configurators with live previews were introduced. They will be shipped with every CKEditor package and are meant to help in configuring toolbar layouts.
-
-* [#10925](http://dev.ckeditor.com/ticket/10925): The [Media Embed](http://ckeditor.com/addon/embed) and [Semantic Media Embed](http://ckeditor.com/addon/embedsemantic) plugins were introduced. Read more about the new features in the [Embedding Content](http://docs.ckeditor.com/#!/guide/dev_media_embed) article.
-* [#10931](http://dev.ckeditor.com/ticket/10931): Added support for nesting widgets. It is now possible to insert one widget into another widget's nested editable. Note that unless nested editable's [allowed content](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable.definition-property-allowedContent) is defined precisely, starting from CKEditor 4.5 some widget buttons may become enabled. This feature is not supported in IE8. Included issues:
-  * [#12018](http://dev.ckeditor.com/ticket/12018): Fixed and reviewed: Nested widgets garbage collection.
-  * [#12024](http://dev.ckeditor.com/ticket/12024): [Firefox] Fixed: Outline is extended to the left by unpositioned drag handlers.
-  * [#12006](http://dev.ckeditor.com/ticket/12006): Fixed: Drag and drop of nested block widgets.
-  * [#12008](http://dev.ckeditor.com/ticket/12008): Fixed various cases of inserting a single non-editable element using the [`editor.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertHtml) method. Fixes pasting a widget with a nested editable inside another widget's nested editable.
-
-* Notification system:
-  * [#11580](http://dev.ckeditor.com/ticket/11580): Introduced the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification).
-  * [#12810](http://dev.ckeditor.com/ticket/12810): Introduced a [notification aggregator](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notificationAggregator) for the [notification system](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.notification) which simplifies displaying progress of many concurrent tasks.
-* [#11636](http://dev.ckeditor.com/ticket/11636): Introduced new, UX-focused, methods for getting selected HTML and deleting it &mdash; [`editor.getSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml) and [`editor.deleteSelectedHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getSelectedHtml).
-* [#12416](http://dev.ckeditor.com/ticket/12416): Added the [`widget.definition.upcastPriority`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-upcastPriority) property which gives more control over widget upcasting order to the widget author.
-* [#12036](http://dev.ckeditor.com/ticket/12036): Initialize the editor in [read-only](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) mode when the `<textarea>` element has a `readonly` attribute.
-* [#11905](http://dev.ckeditor.com/ticket/11905): The [`resize` event](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-resize) passes the current dimensions in its data.
-* [#12126](http://dev.ckeditor.com/ticket/12126): Introduced [`config.image_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image_prefillDimensions) and [`config.image2_prefillDimensions`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_prefillDimensions) to make pre-filling `width` and `height` configurable for the [Enhanced Image](http://ckeditor.com/addon/image2).
-* [#12746](http://dev.ckeditor.com/ticket/12746): Added a new configuration option to hide the [Enhanced Image](http://ckeditor.com/addon/image2) resizer.
-* [#12150](http://dev.ckeditor.com/ticket/12150): Exposed the [`getNestedEditable()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-static-method-getNestedEditable) and `is*` [widget helper](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) functions (see the static methods).
-* [#12448](http://dev.ckeditor.com/ticket/12448): Introduced the [`editable.insertHtmlIntoRange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertHtmlIntoRange) method.
-* [#12143](http://dev.ckeditor.com/ticket/12143): Added the [`config.floatSpacePreferRight`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-floatSpacePreferRight) configuration option that switches the alignment of the floating toolbar. Thanks to [InvisibleBacon](http://github.com/InvisibleBacon)!
-* [#10986](http://dev.ckeditor.com/ticket/10986): Added support for changing dialog input and textarea text directions by using the *Shift+Alt+Home/End* keystrokes. The direction is stored in the value of the input by prepending the [`\u202A`](http://unicode.org/cldr/utility/character.jsp?a=202A) or [`\u202B`](http://unicode.org/cldr/utility/character.jsp?a=202B) marker to it. Read more in the [documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog.definition.textInput-property-bidi). Thanks to [edithkk](https://github.com/edithkk)!
-* [#12770](http://dev.ckeditor.com/ticket/12770): Added support for passing [widget](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget)'s startup data as a widget command's argument. Thanks to [Rebrov Boris](https://github.com/zipp3r) and [Tieme van Veen](https://github.com/tiemevanveen)!
-* [#11583](http://dev.ckeditor.com/ticket/11583): Added support for the HTML5 `required` attribute in various form elements. Thanks to [Steven Busse](https://github.com/sbusse)!
-
-Changes:
-
-* [#12858](http://dev.ckeditor.com/ticket/12858): Basic [Spartan](http://blogs.windows.com/bloggingwindows/2015/03/30/introducing-project-spartan-the-new-browser-built-for-windows-10/) browser compatibility. Full compatibility will be introduced later, because at the moment Spartan is still too unstable to be used for tests and we see many changes from version to version.
-* [#12948](http://dev.ckeditor.com/ticket/12948): The [`config.mathJaxLibrary`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-mathJaxLib) option does not default to the MathJax CDN any more. It needs to be configured to enable the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin now.
-* [#13069](http://dev.ckeditor.com/ticket/13069): Fixed inconsistencies between [`editable.insertHtml()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) and [`editable.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElement) when the `range` parameter is used. Now, the `editor.insertElement()` method works on a higher level, which means that it saves undo snapshots and sets the selection after insertion. Use the [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange) method directly for the pre 4.5 behavior of `editable.insertElement()`.
-* [#12870](http://dev.ckeditor.com/ticket/12870): Use [`editor.showNotification()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-showNotification) instead of `alert()` directly whenever possible. When the [Notification plugin](http://ckeditor.com/addon/notification) is loaded, the notification system is used automatically. Otherwise, the native `alert()` is displayed.
-* [#8024](http://dev.ckeditor.com/ticket/8024): Swapped behavior of the Split Cell Vertically and Horizontally features of the [Table Tools](http://ckeditor.com/addon/tabletools) plugin to be more intuitive. Thanks to [kevinisagit](https://github.com/kevinisagit)!
-* [#10903](http://dev.ckeditor.com/ticket/10903): Performance improvements for the [`dom.element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass), [`dom.element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass) and [`dom.element.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-hasClass) methods. Note: The previous implementation allowed passing multiple classes to `addClass()` although it was only a side effect of that implementation. The new implementation does not allow this.
-* [#11856](http://dev.ckeditor.com/ticket/11856): The jQuery adapter throws a meaningful error if CKEditor or jQuery are not loaded.
-
-Fixed issues:
-
-* [#11586](http://dev.ckeditor.com/ticket/11586): Fixed: [`range.cloneContents()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-cloneContents) should not change the DOM in order not to affect selection.
-* [#12148](http://dev.ckeditor.com/ticket/12148): Fixed: [`dom.element.getChild()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getChild) should not modify a passed array.
-* [#12503](http://dev.ckeditor.com/ticket/12503): [Blink/Webkit] Fixed: Incorrect result of Select All and *Backspace* or *Delete*.
-* [#13001](http://dev.ckeditor.com/ticket/13001): [Firefox] Fixed: The `<br />` filler is placed in the wrong position by the [`range.fixBlock()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-fixBlock) method due to quirky Firefox behavior.
-* [#13101](http://dev.ckeditor.com/ticket/13101): [IE8] Fixed: Colons are prepended to HTML5 element names when cloning them.
-
-## CKEditor 4.4.8
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Dheeraj Joshi](https://twitter.com/dheerajhere) and [Prem Kumar](https://twitter.com/iAmPr3m).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-Fixed Issues:
-
-* [#12899](http://dev.ckeditor.com/ticket/12899): Fixed: Corrected wrong tag ending for horizontal box definition in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin. Thanks to [mizafish](https://github.com/mizafish)!
-* [#13254](http://dev.ckeditor.com/ticket/13254): Fixed: Cannot outdent block after indent when using the [Div Editing Area](http://ckeditor.com/addon/divarea) plugin. Thanks to [Jonathan Cottrill](https://github.com/jcttrll)!
-* [#13268](http://dev.ckeditor.com/ticket/13268): Fixed: Documentation for [`CKEDITOR.dom.text`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.text) is incorrect. Thanks to [Ben Kiefer](https://github.com/benkiefer)!
-* [#12739](http://dev.ckeditor.com/ticket/12739): Fixed: Link loses inline styles when edited without the [Advanced Tab for Dialogs](http://ckeditor.com/addon/dialogadvtab) plugin. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [#13292](http://dev.ckeditor.com/ticket/13292): Fixed: Protection pattern does not work in attribute in self-closing elements with no space before `/>`. Thanks to [Віталій Крутько](https://github.com/asmforce)!
-* [PR#192](https://github.com/ckeditor/ckeditor-dev/pull/192): Fixed: Variable name typo in the [Dialog User Interface](http://ckeditor.com/addon/dialogui) plugin which caused [`CKEDITOR.ui.dialog.radio`](http://docs.ckeditor.com/#!/api/CKEDITOR.ui.dialog.radio) validation to not work. Thanks to [Florian Ludwig](https://github.com/FlorianLudwig)!
-* [#13232](http://dev.ckeditor.com/ticket/13232): [Safari] Fixed: The [`element.appendText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-appendText) method does not work properly for empty elements.
-* [#13233](http://dev.ckeditor.com/ticket/13233): Fixed: [HTMLDataProcessor](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) can process `foo:href` attributes.
-* [#12796](http://dev.ckeditor.com/ticket/12796): Fixed: The [Indent List](http://ckeditor.com/addon/indentlist) plugin unwraps parent `<li>` elements. Thanks to [Andrew Stucki](https://github.com/andrewstucki)!
-* [#12885](http://dev.ckeditor.com/ticket/12885): Added missing [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) parameter documentation.
-* [#11982](http://dev.ckeditor.com/ticket/11982): Fixed: Bullet added in a wrong position after the *Enter* key is pressed in a nested list.
-* [#13027](http://dev.ckeditor.com/ticket/13027): Fixed: Keyboard navigation in dialog windows with multiple tabs not following IBM CI 162 instructions or [ARIA Authoring Practices](http://www.w3.org/TR/2013/WD-wai-aria-practices-20130307/#tabpanel).
-* [#12256](http://dev.ckeditor.com/ticket/12256): Fixed: Basic styles classes are lost when pasting from Microsoft Word if [basic styles](http://ckeditor.com/addon/basicstyles) were configured to use classes.
-* [#12729](http://dev.ckeditor.com/ticket/12729): Fixed: Incorrect structure created when merging a block into a list item on *Backspace* and *Delete*.
-* [#13031](http://dev.ckeditor.com/ticket/13031): [Firefox] Fixed: No more line breaks in source view since Firefox 36.
-* [#13131](http://dev.ckeditor.com/ticket/13131): Fixed: The [Code Snippet](http://ckeditor.com/addon/codesnippet) plugin cannot be used without the [IFrame Editing Area](http://ckeditor.com/addon/wysiwygarea) plugin.
-* [#9086](http://dev.ckeditor.com/ticket/9086): Fixed: Invalid ARIA property used on paste area `<iframe>`.
-* [#13164](http://dev.ckeditor.com/ticket/13164): Fixed: Error when inserting a hidden field.
-* [#13155](http://dev.ckeditor.com/ticket/13155): Fixed: Incorrect [Line Utilities](http://ckeditor.com/addon/lineutils) positioning when `<body>` has a margin.
-* [#13351](http://dev.ckeditor.com/ticket/13351): Fixed: Link lost when editing a linked image with the Link tab disabled. This also fixed a bug when inserting an image into a fully selected link would throw an error ([#12847](https://dev.ckeditor.com/ticket/12847)).
-* [#13344](http://dev.ckeditor.com/ticket/13344): [WebKit/Blink] Fixed: It is possible to remove or change editor content in [read-only mode](http://docs.ckeditor.com/#!/guide/dev_readonly).
-
-Other Changes:
-
-* [#12844](http://dev.ckeditor.com/ticket/12844) and [#13103](http://dev.ckeditor.com/ticket/13103): Upgraded the [testing environment](http://docs.ckeditor.com/#!/guide/dev_tests) to [Bender.js](https://github.com/benderjs/benderjs) `0.2.3`.
-* [#12930](http://dev.ckeditor.com/ticket/12930): Because of licensing issues, `truncated-mathjax/` is now removed from the `tests/` directory. Now `bender.config.mathJaxLibPath` must be configured manually in order to run [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin tests.
-* [#13266](http://dev.ckeditor.com/ticket/13266): Added more shades of gray in the [Color Dialog](http://ckeditor.com/addon/colordialog) window. Thanks to [mizafish](https://github.com/mizafish)!
-
-
-## CKEditor 4.4.7
-
-Fixed Issues:
-
-* [#12825](http://dev.ckeditor.com/ticket/12825): Fixed: Preventing the [Table Resize](http://ckeditor.com/addon/tableresize) plugin from operating on elements outside the editor. Thanks to [Paul Martin](https://github.com/Paul-Martin)!
-* [#12157](http://dev.ckeditor.com/ticket/12157): Fixed: Lost text formatting on pressing *Tab* when the [`config.tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces) configuration option value was greater than zero.
-* [#12777](http://dev.ckeditor.com/ticket/12777): Fixed: The `table-layout` CSS property should be reset by skins. Thanks to [vita10gy](https://github.com/vita10gy)!
-* [#12812](http://dev.ckeditor.com/ticket/12812): Fixed: An uncaught security exception is thrown when [Line Utilities](http://ckeditor.com/addon/lineutils) are used in an inline editor loaded in a cross-domain `iframe`. Thanks to [Vitaliy Zurian](https://github.com/thecatontheflat)!
-* [#12735](http://dev.ckeditor.com/ticket/12735): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) should only apply when outputting data.
-* [#10032](http://dev.ckeditor.com/ticket/10032): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter is executed for every paste after using the button.
-* [#12597](http://dev.ckeditor.com/ticket/12597): [Blink/WebKit] Fixed: Multi-byte Japanese characters entry not working properly after *Shift+Enter*.
-* [#12387](http://dev.ckeditor.com/ticket/12387): Fixed: An error is thrown if a skin does not have the [`chameleon`](http://docs.ckeditor.com/#!/api/CKEDITOR.skin-method-chameleon) property defined and [`config.uiColor`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-uiColor) is defined.
-* [#12747](http://dev.ckeditor.com/ticket/12747): [IE8-10] Fixed: Opening a drop-down for a specific selection when the editor is maximized results in incorrect drop-down panel position.
-* [#12850](http://dev.ckeditor.com/ticket/12850): [IEQM] Fixed: An error is thrown after focusing the editor.
-
-## CKEditor 4.4.6
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the HTML parser reported by [Maco Cortes](https://www.facebook.com/Maaacoooo).
-
-	Issue summary: It was possible to execute XSS inside CKEditor after persuading the victim to: (i) switch CKEditor to source mode, then (ii) paste a specially crafted HTML code, prepared by the attacker, into the opened CKEditor source area, and (iii) switch back to WYSIWYG mode.
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12501](http://dev.ckeditor.com/ticket/12501): Allowed dashes in element names in the [string format of allowed content rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules-section-string-format).
-* [#12550](http://dev.ckeditor.com/ticket/12550): Added the `<main>` element to the [`CKEDITOR.dtd`](http://docs.ckeditor.com/#!/api/CKEDITOR.dtd).
-
-Fixed Issues:
-
-* [#12506](http://dev.ckeditor.com/ticket/12506): [Safari] Fixed: Cannot paste into inline editor if the page has `user-select: none` style. Thanks to [shaohua](https://github.com/shaohua)!
-* [#12683](http://dev.ckeditor.com/ticket/12683): Fixed: [Filter](http://docs.ckeditor.com/#!/guide/dev_acf) fails to remove custom tags. Thanks to [timselier](https://github.com/timselier)!
-* [#12489](http://dev.ckeditor.com/ticket/12489) and [#12491](http://dev.ckeditor.com/ticket/12491): Fixed: Various issues related to restoring the selection after performing operations on filler character. See the [fixed cases](http://dev.ckeditor.com/ticket/12491#comment:4).
-* [#12621](http://dev.ckeditor.com/ticket/12621): Fixed: Cannot remove inline styles (bold, italic, etc.) in empty lines.
-* [#12630](http://dev.ckeditor.com/ticket/12630): [Chrome] Fixed: Selection is placed outside the paragraph when the [New Page](http://ckeditor.com/addon/newpage) button is clicked. This patch significantly simplified the way how the initial selection (a selection after the content of the editable is overwritten) is being fixed. That might have fixed many related scenarios in all browsers.
-* [#11647](http://dev.ckeditor.com/ticket/11647): Fixed: The [`editor.blur`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-blur) event is not fired on first blur after initializing the inline editor on an already focused element.
-* [#12601](http://dev.ckeditor.com/ticket/12601): Fixed: [Strikethrough](http://ckeditor.com/addon/basicstyles) button tooltip spelling.
-* [#12546](http://dev.ckeditor.com/ticket/12546): Fixed: The Preview tab in the [Document Properties](http://ckeditor.com/addon/docprops) dialog window is always disabled.
-* [#12300](http://dev.ckeditor.com/ticket/12300): Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event fired on first navigation key press after typing.
-* [#12141](http://dev.ckeditor.com/ticket/12141): Fixed: List items are lost when indenting a list item with content wrapped with a block element.
-* [#12515](http://dev.ckeditor.com/ticket/12515): Fixed: Cursor is in the wrong position when undoing after adding an image and typing some text.
-* [#12484](http://dev.ckeditor.com/ticket/12484): [Blink/WebKit] Fixed: DOM is changed outside the editor area in a certain case.
-* [#12688](http://dev.ckeditor.com/ticket/12688): Improved the tests of the [styles system](http://docs.ckeditor.com/#!/api/CKEDITOR.style) and fixed two minor issues.
-* [#12403](http://dev.ckeditor.com/ticket/12403): Fixed: Changing the [font](http://ckeditor.com/addon/font) style should not lead to nesting it in the previous style element.
-* [#12609](http://dev.ckeditor.com/ticket/12609): Fixed: Incorrect `config.magicline_putEverywhere` name used for a [Magic Line](http://ckeditor.com/addon/magicline) all-encompassing [`config.magicline_everywhere`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-magicline_everywhere) configuration option.
-
-
-## CKEditor 4.4.5
-
-New Features:
-
-* [#12279](http://dev.ckeditor.com/ticket/12279): Added a possibility to pass a custom evaluator to [`node.getAscendant()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.node-method-getAscendant).
-
-Fixed Issues:
-
-* [#12423](http://dev.ckeditor.com/ticket/12423): [Safari7.1+] Fixed: *Enter* key moved cursor to a strange position.
-* [#12381](http://dev.ckeditor.com/ticket/12381): [iOS] Fixed: Selection issue. Thanks to [Remiremi](https://github.com/Remiremi)!
-* [#10804](http://dev.ckeditor.com/ticket/10804): Fixed: `CKEDITOR_GETURL` is not used with some plugins where it should be used. Thanks to [Thomas Andraschko](https://github.com/tandraschko)!
-* [#9137](http://dev.ckeditor.com/ticket/9137): Fixed: The `<base>` tag is not created when `<head>` has an attribute. Thanks to [naoki.fujikawa](https://github.com/naoki-fujikawa)!
-* [#12377](http://dev.ckeditor.com/ticket/12377): Fixed: Errors thrown in the [Image](http://ckeditor.com/addon/image) plugin when removing preview from the dialog window definition. Thanks to [Axinet](https://github.com/Axinet)!
-* [#12162](http://dev.ckeditor.com/ticket/12162): Fixed: Auto paragraphing and *Enter* key in nested editables.
-* [#12315](http://dev.ckeditor.com/ticket/12315): Fixed: Marked [`config.autoParagraph`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-autoParagraph) as deprecated.
-* [#12113](http://dev.ckeditor.com/ticket/12113): Fixed: A [code snippet](http://ckeditor.com/addon/codesnippet) should be presented in the [elements path](http://ckeditor.com/addon/elementspath) as "code snippet" (translatable).
-* [#12311](http://dev.ckeditor.com/ticket/12311): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) should also remove `<cite>` elements.
-* [#12261](http://dev.ckeditor.com/ticket/12261): Fixed: Filter has to be destroyed and removed from [`CKEDITOR.filter.instances`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-static-property-instances) on editor destroy.
-* [#12398](http://dev.ckeditor.com/ticket/12398): Fixed: [Maximize](http://ckeditor.com/addon/maximize) does not work on an instance without a [title](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#12097](http://dev.ckeditor.com/ticket/12097): Fixed: JAWS not reading the number of options correctly in the [Text Color and Background Color](http://ckeditor.com/addon/colorbutton) button menu.
-* [#12411](http://dev.ckeditor.com/ticket/12411): Fixed: [Page Break](http://ckeditor.com/addon/pagebreak) used directly in the editable breaks the editor.
-* [#12354](http://dev.ckeditor.com/ticket/12354): Fixed: Various issues in undo manager when holding keys.
-* [#12324](http://dev.ckeditor.com/ticket/12324): [IE8] Fixed: Undo steps are not recorded when changing the caret position by clicking below the body.
-* [#12332](http://dev.ckeditor.com/ticket/12332): Fixed: Lowered DOM events listeners' priorities in undo manager in order to avoid ambiguity.
-* [#12402](http://dev.ckeditor.com/ticket/12402): [Blink] Fixed: Workaround for Blink bug with `document.title` which breaks updating title in the full HTML mode.
-* [#12338](http://dev.ckeditor.com/ticket/12338): Fixed: The CKEditor package contains unoptimized images.
-
-
-## CKEditor 4.4.4
-
-Fixed Issues:
-
-* [#12268](http://dev.ckeditor.com/ticket/12268): Cleanup of [UI Color](http://ckeditor.com/addon/uicolor) YUI styles. Thanks to [CasherWest](https://github.com/CasherWest)!
-* [#12263](http://dev.ckeditor.com/ticket/12263): Fixed: [Paste from Word](http://ckeditor.com/addon/pastefromword) filter does not properly normalize semicolons style text. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#12243](http://dev.ckeditor.com/ticket/12243): Fixed: Text formatting lost when pasting from Word. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#111739](http://dev.ckeditor.com/ticket/11739): Fixed: `keypress` listeners should not be used in the undo manager. A complete rewrite of keyboard handling in the undo manager was made. Numerous smaller issues were fixed, among others:
-  * [#10926](http://dev.ckeditor.com/ticket/10926): [Chrome@Android] Fixed: Typing does not record snapshots and does not fire the [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-  * [#11611](http://dev.ckeditor.com/ticket/11611): [Firefox] Fixed: The [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event is fired when pressing Arrow keys.
-  * [#12219](http://dev.ckeditor.com/ticket/12219): [Safari] Fixed: Some modifications of the [`UndoManager.locked`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-property-locked) property violate strict mode in the [Undo](http://ckeditor.com/addon/undo) plugin.
-* [#10916](http://dev.ckeditor.com/ticket/10916): Fixed: [Magic Line](http://ckeditor.com/addon/magicline) icon in Right-To-Left environments.
-* [#11970](http://dev.ckeditor.com/ticket/11970): [IE] Fixed: CKEditor `paste` event is not fired when pasting with *Shift+Ins*.
-* [#12111](http://dev.ckeditor.com/ticket/12111): Fixed: Linked image attributes are not read when opening the image dialog window by doubleclicking.
-* [#10030](http://dev.ckeditor.com/ticket/10030): [IE] Fixed: Prevented "Unspecified Error" thrown in various cases when IE8-9 does not allow access to `document.activeElement`.
-* [#12273](http://dev.ckeditor.com/ticket/12273): Fixed: Applying block style in a description list breaks it.
-* [#12218](http://dev.ckeditor.com/ticket/12218): Fixed: Minor syntax issue in CSS files.
-* [#12178](http://dev.ckeditor.com/ticket/12178): [Blink/WebKit] Fixed: Iterator does not return the block if the selection is located at the end of it.
-* [#12185](http://dev.ckeditor.com/ticket/12185): [IE9QM] Fixed: Error thrown when moving the mouse over focused editor's scrollbar.
-* [#12215](http://dev.ckeditor.com/ticket/12215): Fixed: Basepath resolution does not recognize semicolon as a query separator.
-* [#12135](http://dev.ckeditor.com/ticket/12135): Fixed: [Remove Format](http://ckeditor.com/addon/removeformat) does not work on widgets.
-* [#12298](http://dev.ckeditor.com/ticket/12298): [IE11] Fixed: Clicking below `<body>` in Compatibility Mode will no longer reset selection to the first line.
-* [#12204](http://dev.ckeditor.com/ticket/12204): Fixed: Editor's voice label is not affected by [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title).
-* [#11915](http://dev.ckeditor.com/ticket/11915): Fixed: With [SCAYT](http://ckeditor.com/addon/scayt) enabled, cursor moves to the beginning of the first highlighted, misspelled word after typing or pasting into the editor.
-* [SCAYT](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/69): Fixed: Error thrown in the console after enabling [SCAYT](http://ckeditor.com/addon/scayt) and trying to add a new image.
-
-
-Other Changes:
-
-* [#12296](http://dev.ckeditor.com/ticket/12296): Merged `benderjs-ckeditor` into the main CKEditor repository.
-
-## CKEditor 4.4.3
-
-**Security Updates:**
-
-* Fixed XSS vulnerability in the Preview plugin reported by Mario Heiderich of [Cure53](https://cure53.de/).
-
-**An upgrade is highly recommended!**
-
-New Features:
-
-* [#12164](http://dev.ckeditor.com/ticket/12164): Added the "Justify" option to the "Horizontal Alignment" drop-down in the Table Cell Properties dialog window.
-
-Fixed Issues:
-
-* [#12110](http://dev.ckeditor.com/ticket/12110): Fixed: Editor crash after deleting a table. Thanks to [Alin Purcaru](https://github.com/mesmerizero)!
-* [#11897](http://dev.ckeditor.com/ticket/11897): Fixed: *Enter* key used in an empty list item creates a new line instead of breaking the list. Thanks to [noam-si](https://github.com/noam-si)!
-* [#12140](http://dev.ckeditor.com/ticket/12140): Fixed: Double-clicking linked widgets opens two dialog windows.
-* [#12132](http://dev.ckeditor.com/ticket/12132): Fixed: Image is inserted with `width` and `height` styles even when they are not allowed.
-* [#9317](http://dev.ckeditor.com/ticket/9317): [IE] Fixed: [`config.disableObjectResizing`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableObjectResizing) does not work on IE. **Note**: We were not able to fix this issue on IE11+ because necessary events stopped working. See a [last resort workaround](http://dev.ckeditor.com/ticket/9317#comment:16) and make sure to [support our complaint to Microsoft](https://connect.microsoft.com/IE/feedback/details/742593/please-respect-execcommand-enableobjectresizing-in-contenteditable-elements).
-* [#9638](http://dev.ckeditor.com/ticket/9638): Fixed: There should be no information about accessibility help available under the *Alt+0* keyboard shortcut if the [Accessibility Help](http://ckeditor.com/addon/a11yhelp) plugin is not available.
-* [#8117](http://dev.ckeditor.com/ticket/8117) and [#9186](http://dev.ckeditor.com/ticket/9186): Fixed: In HTML5 `<meta>` tags should be allowed everywhere, including inside the `<body>` element.
-* [#10422](http://dev.ckeditor.com/ticket/10422): Fixed: [`config.fillEmptyBlocks`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fillEmptyBlocks) not working properly if a function is specified.
-
-## CKEditor 4.4.2
-
-Important Notes:
-
-* The CKEditor testing environment is now publicly available. Read more about how to set up the environment and execute tests in the [CKEditor Testing Environment](http://docs.ckeditor.com/#!/guide/dev_tests) guide.
-	Please note that the [`tests/`](https://github.com/ckeditor/ckeditor-dev/tree/master/tests) directory which contains editor tests is not available in release packages. It can only be found in the development version of CKEditor on [GitHub](https://github.com/ckeditor/ckeditor-dev/).
-
-New Features:
-
-* [#11909](http://dev.ckeditor.com/ticket/11909): Introduced a parameter to prevent the [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) method from recording undo snapshots.
-
-Fixed Issues:
-
-* [#11757](http://dev.ckeditor.com/ticket/11757): Fixed: Imperfections in the [Moono](http://ckeditor.com/addon/moono) skin. Thanks to [danyaPostfactum](https://github.com/danyaPostfactum)!
-* [#10091](http://dev.ckeditor.com/ticket/10091): Blockquote should be treated like an object by the styles system. Thanks to [dan-james-deeson](https://github.com/dan-james-deeson)!
-* [#11478](http://dev.ckeditor.com/ticket/11478): Fixed: Issue with passing jQuery objects to [adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) configuration.
-* [#10867](http://dev.ckeditor.com/ticket/10867): Fixed: Issue with setting encoded URI as image link.
-* [#11983](http://dev.ckeditor.com/ticket/11983): Fixed: Clicking a nested widget does not focus it. Additionally, performance of the [`widget.repository.getByElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-getByElement) method was improved.
-* [#12000](http://dev.ckeditor.com/ticket/12000): Fixed: Nested widgets should be initialized on [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData) and [`nestedEditable.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.nestedEditable-method-setData).
-* [#12022](http://dev.ckeditor.com/ticket/12022): Fixed: Outer widget's drag handler is not created at all if it has any nested widgets inside.
-* [#11960](http://dev.ckeditor.com/ticket/11960): [Blink/WebKit] Fixed: The caret should be scrolled into view on *Backspace* and *Delete* (covers only the merging blocks case).
-* [#11306](http://dev.ckeditor.com/ticket/11306): [OSX][Blink/WebKit] Fixed: No widget entries in the context menu on widget right-click.
-* [#11957](http://dev.ckeditor.com/ticket/11957): Fixed: Alignment labels in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window are not translated.
-* [#11980](http://dev.ckeditor.com/ticket/11980): [Blink/WebKit] Fixed: `<span>` elements created when joining adjacent elements (non-collapsed selection).
-* [#12009](http://dev.ckeditor.com/ticket/12009): [Nested widgets] Integration with the [Magic Line](http://ckeditor.com/addon/magicline) plugin.
-* [#11387](http://dev.ckeditor.com/ticket/11387): Fixed: `role="radiogroup"` should be applied only to radio inputs' container.
-* [#7975](http://dev.ckeditor.com/ticket/7975): [IE8] Fixed: Errors when trying to select an empty table cell.
-* [#11947](http://dev.ckeditor.com/ticket/11947): [Firefox+IE11] Fixed: *Shift+Enter* in lists produces two line breaks.
-* [#11972](http://dev.ckeditor.com/ticket/11972): Fixed: Feature detection in the [`element.setText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-setText) method should not trigger the layout engine.
-* [#7634](http://dev.ckeditor.com/ticket/7634): Fixed: The [Flash Dialog](http://ckeditor.com/addon/flash) plugin omits the `allowFullScreen` parameter in the editor data if set to `true`.
-* [#11910](http://dev.ckeditor.com/ticket/11910): Fixed: [Enhanced Image](http://ckeditor.com/addon/image2) does not take [`config.baseHref`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-baseHref) into account when updating image dimensions.
-* [#11753](http://dev.ckeditor.com/ticket/11753): Fixed: Wrong [`checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method value after focusing or blurring a widget.
-* [#11830](http://dev.ckeditor.com/ticket/11830): Fixed: Impossible to pass some arguments to [CKBuilder](https://github.com/ckeditor/ckbuilder) when using the `/dev/builder/build.sh` script.
-* [#11945](http://dev.ckeditor.com/ticket/11945): Fixed: [Form Elements](http://ckeditor.com/addon/forms) plugin should not change a core method.
-* [#11384](http://dev.ckeditor.com/ticket/11384): [IE9+] Fixed: `IndexSizeError` thrown when pasting into a non-empty selection anchored in one text node.
-
-## CKEditor 4.4.1
-
-New Features:
-
-* [#9661](http://dev.ckeditor.com/ticket/9661): Added the option to [configure](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-linkJavaScriptLinksAllowed) anchor tags with JavaScript code in the `href` attribute.
-
-Fixed Issues:
-
-* [#11861](http://dev.ckeditor.com/ticket/11861): [WebKit/Blink] Fixed: Span elements created while joining adjacent elements. **Note:** This patch only covers cases when *Backspace* or *Delete* is pressed on a collapsed (empty) selection. The remaining case, with a non-empty selection, will be fixed in the next release.
-* [#10714](http://dev.ckeditor.com/ticket/10714): [iOS] Fixed: Selection and drop-downs are broken if a touch event listener is used due to a [WebKit bug](https://bugs.webkit.org/show_bug.cgi?id=128924). Thanks to [Arty Gus](https://github.com/artygus)!
-* [#11911](http://dev.ckeditor.com/ticket/11911): Fixed setting the `dir` attribute for a preloaded language in [CKEDITOR.lang](http://docs.ckeditor.com/#!/api/CKEDITOR.lang). Thanks to [Akash Mohapatra](https://github.com/akashmohapatra)!
-* [#11926](http://dev.ckeditor.com/ticket/11926): Fixed: [Code Snippet](http://ckeditor.com/addon/codesnippet) does not decode HTML entities when loading code from the `<code>` element.
-* [#11223](http://dev.ckeditor.com/ticket/11223): Fixed: Issue when [Protected Source](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-protectedSource) was not working in the `<title>` element.
-* [#11859](http://dev.ckeditor.com/ticket/11859): Fixed: Removed the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin dependency from the [Code Snippet](http://ckeditor.com/addon/codesnippet) sample.
-* [#11754](http://dev.ckeditor.com/ticket/11754): [Chrome] Fixed: Infinite loop when content includes not closed attributes.
-* [#11848](http://dev.ckeditor.com/ticket/11848): [IE] Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) throwing an exception when there was no selection in the editor.
-* [#11801](http://dev.ckeditor.com/ticket/11801): Fixed: Editor anchors unavailable when linking the [Enhanced Image](http://ckeditor.com/addon/image2) widget.
-* [#11626](http://dev.ckeditor.com/ticket/11626): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) sets invalid column width.
-* [#11872](http://dev.ckeditor.com/ticket/11872): Made [`element.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-addClass) chainable symmetrically to [`element.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-removeClass).
-* [#11813](http://dev.ckeditor.com/ticket/11813): Fixed: Link lost while pasting a captioned image and restoring an undo snapshot ([Enhanced Image](http://ckeditor.com/addon/image2)).
-* [#11814](http://dev.ckeditor.com/ticket/11814): Fixed: _Link_ and _Unlink_ entries persistently displayed in the [Enhanced Image](http://ckeditor.com/addon/image2) context menu.
-* [#11839](http://dev.ckeditor.com/ticket/11839): [IE9] Fixed: The caret jumps out of the editable area when resizing the editor in the source mode.
-* [#11822](http://dev.ckeditor.com/ticket/11822): [WebKit] Fixed: Editing anchors by double-click is broken in some cases.
-* [#11823](http://dev.ckeditor.com/ticket/11823): [IE8] Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) throws an error over scrollbar.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: It is not possible to change the language back to _Not set_ in the [Code Snippet](http://ckeditor.com/addon/codesnippet) dialog window.
-* [#11788](http://dev.ckeditor.com/ticket/11788): Fixed: [Filter](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied inside elements with the `contenteditable` attribute set to `true`.
-* [#11798](http://dev.ckeditor.com/ticket/11798): Fixed: Inserting a non-editable element inside a table cell breaks the table.
-* [#11793](http://dev.ckeditor.com/ticket/11793): Fixed: Drop-down is not "on" when clicking it while the editor is blurred.
-* [#11850](http://dev.ckeditor.com/ticket/11850): Fixed: Fake objects with the `contenteditable` attribute set to `false` are not downcasted properly.
-* [#11811](http://dev.ckeditor.com/ticket/11811): Fixed: Widget's data is not encoded correctly when passed to an attribute.
-* [#11777](http://dev.ckeditor.com/ticket/11777): Fixed encoding ampersand in the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin.
-* [#11880](http://dev.ckeditor.com/ticket/11880): [IE8-9] Fixed: Linked image has a default thick border.
-
-Other Changes:
-
-* [#11807](http://dev.ckeditor.com/ticket/11807): Updated jQuery version used in the sample to 1.11.0 and tested CKEditor jQuery Adapter with version 1.11.0 and 2.1.0.
-* [#9504](http://dev.ckeditor.com/ticket/9504): Stopped using deprecated `attribute.specified` in all browsers except Internet Explorer.
-* [#11809](http://dev.ckeditor.com/ticket/11809): Changed tab size in `<pre>` to 4 spaces.
-
-## CKEditor 4.4
-
-**Important Notes:**
-
-* Marked the [`editor.beforePaste`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-beforePaste) event as deprecated.
-* The default class of captioned images has changed to `image` (was: `caption`). Please note that once edited in CKEditor 4.4+, all existing images of the `caption` class (`<figure class="caption">`) will be [filtered out](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) unless the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option is set to `caption`. For backward compatibility (i.e. when upgrading), it is highly recommended to use this setting, which also helps prevent CSS conflicts, etc. This does not apply to new CKEditor integrations.
-* Widgets without defined buttons are no longer registered automatically to the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter). Before CKEditor 4.4 widgets were registered to the ACF which was an incorrect behavior ([#11567](http://dev.ckeditor.com/ticket/11567)). This change should not have any impact on standard scenarios, but if your button does not execute the widget command, you need to set [`allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-allowedContent) and [`requiredContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.feature-property-requiredContent) properties for it manually, because the editor will not be able to find them.
-* The [Show Borders](http://ckeditor.com/addon/showborders) plugin was added to the Standard installation package in order to ensure that unstyled tables are still visible for the user ([#11665](http://dev.ckeditor.com/ticket/11665)).
-* Since CKEditor 4.4 the editor instance should be passed to [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) methods to ensure full compatibility with other features (e.g. applying styles to widgets requires that). We ensured backward compatibility though, so the [`CKEDITOR.style`](http://docs.ckeditor.com/#!/api/CKEDITOR.style) will work even when the editor instance is not provided.
-
-New Features:
-
-* [#11297](http://dev.ckeditor.com/ticket/11297): Styles can now be applied to widgets. The definition of a style which can be applied to a specific widget must contain two additional properties &mdash; `type` and `widget`. Read more in the [Widget Styles](http://docs.ckeditor.com/#!/guide/dev_styles-section-widget-styles) section of the "Syles Drop-down" guide. Note that by default, widgets support only classes and no other attributes or styles. Related changes and features:
-  * Introduced the [`CKEDITOR.style.addCustomHandler()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-static-method-addCustomHandler) method for registering custom style handlers.
-  * The [`CKEDITOR.style.apply()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-apply) and [`CKEDITOR.style.remove()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-remove) methods are now called with an editor instance instead of the document so they can be reused by the [`CKEDITOR.editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) and [`CKEDITOR.editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) methods. Backward compatibility was preserved, but from CKEditor 4.4 it is highly recommended to pass an editor instead of a document to these methods.
-  * Many new methods and properties were introduced in the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget) to make the handling of styles by widgets fully customizable. See: [`widget.definition.styleableElements`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleableElements), [`widget.definition.styleToAllowedContentRule`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-styleToAllowedContentRules), [`widget.addClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-addClass), [`widget.removeClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeClass), [`widget.getClasses()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-getClasses), [`widget.hasClass()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-hasClass), [`widget.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-applyStyle), [`widget.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-removeStyle), [`widget.checkStyleActive()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-method-checkStyleActive).
-  * Integration with the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) required an introduction of the [`CKEDITOR.style.toAllowedContent()`](http://docs.ckeditor.com/#!/api/CKEDITOR.style-method-toAllowedContentRules) method which can be implemented by the custom style handler and if exists, it is used by the [`CKEDITOR.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter) to translate a style to [allowed content rules](http://docs.ckeditor.com/#!/api/CKEDITOR.filter.allowedContentRules).
-* [#11300](http://dev.ckeditor.com/ticket/11300): Various changes in the [Enhanced Image](http://ckeditor.com/addon/image2) plugin:
-  * Introduced the [`config.image2_captionedClass`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_captionedClass) option to configure the class of captioned images.
-  * Introduced the [`config.image2_alignClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-image2_alignClasses) option to configure the way images are aligned with CSS classes.
-  If this setting is defined, the editor produces classes instead of inline styles for aligned images.
-  * Default image caption can be translated (customized) with the `editor.lang.image2.captionPlaceholder` string.
-* [#11341](http://dev.ckeditor.com/ticket/11341): [Enhanced Image](http://ckeditor.com/addon/image2) plugin: It is now possible to add a link to any image type.
-* [#10202](http://dev.ckeditor.com/ticket/10202): Introduced wildcard support in the [Allowed Content Rules](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) format.
-* [#10276](http://dev.ckeditor.com/ticket/10276): Introduced blacklisting in the [Allowed Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#10480](http://dev.ckeditor.com/ticket/10480): Introduced code snippets with code highlighting. There are two versions available so far &mdash; the default [Code Snippet](http://ckeditor.com/addon/codesnippet) which uses the [highlight.js](http://highlightjs.org) library and the [Code Snippet GeSHi](http://ckeditor.com/addon/codesnippetgeshi) which uses the [GeSHi](http://qbnz.com/highlighter/) library.
-* [#11737](http://dev.ckeditor.com/ticket/11737): Introduced an option to prevent [filtering](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) of an element that matches custom criteria (see [`filter.addElementCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-method-addElementCallback)).
-* [#11532](http://dev.ckeditor.com/ticket/11532): Introduced the [`editor.addContentsCss()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addContentsCss) method that can be used for [adding custom CSS files](http://docs.ckeditor.com/#!/guide/plugin_sdk_styles).
-* [#11536](http://dev.ckeditor.com/ticket/11536): Added the [`CKEDITOR.tools.htmlDecode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-htmlDecode) method for decoding HTML entities.
-* [#11225](http://dev.ckeditor.com/ticket/11225): Introduced the [`CKEDITOR.tools.transparentImageData`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-property-transparentImageData) property which contains transparent image data to be used in CSS or as image source.
-
-Other Changes:
-
-* [#11377](http://dev.ckeditor.com/ticket/11377): Unified internal representation of empty anchors using the [fake objects](http://ckeditor.com/addon/fakeobjects).
-* [#11422](http://dev.ckeditor.com/ticket/11422): Removed Firefox 3.x, Internet Explorer 6 and Opera 12.x leftovers in code.
-* [#5217](http://dev.ckeditor.com/ticket/5217): Setting data (including switching between modes) creates a new undo snapshot. Besides that:
-  * Introduced the [`editable.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-property-status) property.
-  * Introduced a new `forceUpdate` option for the [`editor.lockSnapshot`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-lockSnapshot) event.
-  * Fixed: Selection not being unlocked in inline editor after setting data ([#11500](http://dev.ckeditor.com/ticket/11500)).
-* The [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin was updated to the latest version.
-
-Fixed Issues:
-
-* [#10190](http://dev.ckeditor.com/ticket/10190): Fixed: Removing block style with [`editor.removeStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-removeStyle) should result in a paragraph and not a div.
-* [#11727](http://dev.ckeditor.com/ticket/11727): Fixed: The editor tries to select a non-editable image which was clicked.
-
-## CKEditor 4.3.5
-
-New Features:
-
-* Added new translation: Tatar.
-
-Fixed Issues:
-
-* [#11677](http://dev.ckeditor.com/ticket/11677): Fixed: Undo/Redo keystrokes are blocked in the source mode.
-* [#11717](http://dev.ckeditor.com/ticket/11717): [Document Properties](http://ckeditor.com/addon/docprops) plugin requires the [Color Dialog](http://ckeditor.com/addon/colordialog) plugin to work.
-
-## CKEditor 4.3.4
-
-Fixed Issues:
-
-* [#11597](http://dev.ckeditor.com/ticket/11597): [IE11] Fixed: Error thrown when trying to open the [preview](http://ckeditor.com/addon/preview) using the keyboard.
-* [#11544](http://dev.ckeditor.com/ticket/11544): [Placeholders](http://ckeditor.com/addon/placeholder) will no longer be upcasted in parents not accepting `<span>` elements.
-* [#8663](http://dev.ckeditor.com/ticket/8663): Fixed [`element.renameNode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-renameNode) not clearing the [`element.getName()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.element-method-getName) cache.
-* [#11574](http://dev.ckeditor.com/ticket/11574): Fixed: *Backspace* destroying the DOM structure if an inline editable is placed in a list item.
-* [#11603](http://dev.ckeditor.com/ticket/11603): Fixed: [Table Resize](http://ckeditor.com/addon/tableresize) attaches to tables outside the editable.
-* [#9205](http://dev.ckeditor.com/ticket/9205), [#7805](http://dev.ckeditor.com/ticket/7805), [#8216](http://dev.ckeditor.com/ticket/8216): Fixed: `{cke_protected_1}` appearing in data in various cases where HTML comments are placed next to `"` or `'`.
-* [#11635](http://dev.ckeditor.com/ticket/11635): Fixed: Some attributes are not protected before the content is passed through the fix bin.
-* [#11660](http://dev.ckeditor.com/ticket/11660): [IE] Fixed: Table content is lost when some extra markup is inside the table.
-* [#11641](http://dev.ckeditor.com/ticket/11641): Fixed: Switching between modes in the classic editor removes content styles for the inline editor.
-* [#11568](http://dev.ckeditor.com/ticket/11568): Fixed: [Styles](http://ckeditor.com/addon/stylescombo) drop-down list is not enabled on selection change.
-
-## CKEditor 4.3.3
-
-Fixed Issues:
-
-* [#11500](http://dev.ckeditor.com/ticket/11500): [WebKit/Blink] Fixed: Selection lost when setting data in another inline editor. Additionally, [`selection.removeAllRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-removeAllRanges) is now scoped to selection's [root](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-property-root).
-* [#11104](http://dev.ckeditor.com/ticket/11104): [IE] Fixed: Various issues with scrolling and selection when focusing widgets.
-* [#11487](http://dev.ckeditor.com/ticket/11487): Moving mouse over the [Enhanced Image](http://ckeditor.com/addon/image2) widget will no longer change the value returned by the [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) method.
-* [#8673](http://dev.ckeditor.com/ticket/8673): [WebKit] Fixed: Cannot select and remove the [Page Break](http://ckeditor.com/addon/pagebreak).
-* [#11413](http://dev.ckeditor.com/ticket/11413): Fixed: Incorrect [`editor.execCommand()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-execCommand) behavior.
-* [#11438](http://dev.ckeditor.com/ticket/11438): Splitting table cells vertically is no longer changing table structure.
-* [#8899](http://dev.ckeditor.com/ticket/8899): Fixed: Links in the [About CKEditor](http://ckeditor.com/addon/about) dialog window now open in a new browser window or tab.
-* [#11490](http://dev.ckeditor.com/ticket/11490): Fixed: [Menu button](http://ckeditor.com/addon/menubutton) panel not showing in the source mode.
-* [#11417](http://dev.ckeditor.com/ticket/11417): The [`widget.doubleclick`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget-event-doubleclick) event is not canceled anymore after editing was triggered.
-* [#11253](http://dev.ckeditor.com/ticket/11253): [IE] Fixed: Clipped upload button in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#11359](http://dev.ckeditor.com/ticket/11359): Standardized the way anchors are discovered by the [Link](http://ckeditor.com/addon/link) plugin.
-* [#11058](http://dev.ckeditor.com/ticket/11058): [IE8] Fixed: Error when deleting a table row.
-* [#11508](http://dev.ckeditor.com/ticket/11508): Fixed: [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor) discovering protected attributes within other attributes' values.
-* [#11533](http://dev.ckeditor.com/ticket/11533): Widgets: Avoid recurring upcasts if the DOM structure was modified during an upcast.
-* [#11400](http://dev.ckeditor.com/ticket/11400): Fixed: The [`domObject.removeAllListeners()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.domObject-method-removeAllListeners) method does not remove custom listeners completely.
-* [#11493](http://dev.ckeditor.com/ticket/11493): Fixed: The [`selection.getRanges()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-getRanges) method does not override cached ranges when used with the `onlyEditables` argument.
-* [#11390](http://dev.ckeditor.com/ticket/11390): [IE] All [XML](http://ckeditor.com/addon/xml) plugin [methods](http://docs.ckeditor.com/#!/api/CKEDITOR.xml) now work in IE10+.
-* [#11542](http://dev.ckeditor.com/ticket/11542): [IE11] Fixed: Blurry toolbar icons when Right-to-Left UI language is set.
-* [#11504](http://dev.ckeditor.com/ticket/11504): Fixed: When [`config.fullPage`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-fullPage) is set to `true`, entities are not encoded in editor output.
-* [#11004](http://dev.ckeditor.com/ticket/11004): Integrated [Enhanced Image](http://ckeditor.com/addon/image2) dialog window with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter).
-* [#11439](http://dev.ckeditor.com/ticket/11439): Fixed: Properties get cloned in the Cell Properties dialog window if multiple cells are selected.
-
-## CKEditor 4.3.2
-
-Fixed Issues:
-
-* [#11331](http://dev.ckeditor.com/ticket/11331): A menu button will have a changed label when selected instead of using the `aria-pressed` attribute.
-* [#11177](http://dev.ckeditor.com/ticket/11177): Widget drag handler improvements:
-  * [#11176](http://dev.ckeditor.com/ticket/11176): Fixed: Initial position is not updated when the widget data object is empty.
-  * [#11001](http://dev.ckeditor.com/ticket/11001): Fixed: Multiple synchronous layout recalculations are caused by initial drag handler positioning causing performance issues.
-  * [#11161](http://dev.ckeditor.com/ticket/11161): Fixed: Drag handler is not repositioned in various situations.
-  * [#11281](http://dev.ckeditor.com/ticket/11281): Fixed: Drag handler and mask are duplicated after widget reinitialization.
-* [#11207](http://dev.ckeditor.com/ticket/11207): [Firefox] Fixed: Misplaced [Enhanced Image](http://ckeditor.com/addon/image2) resizer in the inline editor.
-* [#11102](http://dev.ckeditor.com/ticket/11102): `CKEDITOR.template` improvements:
-  * [#11102](http://dev.ckeditor.com/ticket/11102): Added newline character support.
-  * [#11216](http://dev.ckeditor.com/ticket/11216): Added "\\'" substring support.
-* [#11121](http://dev.ckeditor.com/ticket/11121): [Firefox] Fixed: High Contrast mode is enabled when the editor is loaded in a hidden iframe.
-* [#11350](http://dev.ckeditor.com/ticket/11350): The default value of [`config.contentsCss`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-contentsCss) is affected by [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl).
-* [#11097](http://dev.ckeditor.com/ticket/11097): Improved the [Autogrow](http://ckeditor.com/addon/autogrow) plugin performance when dealing with very big tables.
-* [#11290](http://dev.ckeditor.com/ticket/11290): Removed redundant code in the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin.
-* [#11133](http://dev.ckeditor.com/ticket/11133): [Page Break](http://ckeditor.com/addon/pagebreak) becomes editable if pasted.
-* [#11126](http://dev.ckeditor.com/ticket/11126): Fixed: Native Undo executed once the bottom of the snapshot stack is reached.
-* [#11131](http://dev.ckeditor.com/ticket/11131): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Error thrown when switching to source mode if the selection was in widget's nested editable.
-* [#11139](http://dev.ckeditor.com/ticket/11139): [Div Editing Area](http://ckeditor.com/addon/divarea): Fixed: Elements Path is not cleared after switching to source mode.
-* [#10778](http://dev.ckeditor.com/ticket/10778): Fixed a bug with range enlargement. The range no longer expands to visible whitespace.
-* [#11146](http://dev.ckeditor.com/ticket/11146): [IE] Fixed: Preview window switches Internet Explorer to Quirks Mode.
-* [#10762](http://dev.ckeditor.com/ticket/10762): [IE] Fixed: JavaScript code displayed in preview window's URL bar.
-* [#11186](http://dev.ckeditor.com/ticket/11186): Introduced the [`widgets.repository.addUpcastCallback()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-addUpcastCallback) method that allows to block upcasting given element to a widget.
-* [#11307](http://dev.ckeditor.com/ticket/11307): Fixed: Paste as Plain Text conflict with the [MooTools](http://mootools.net) library.
-* [#11140](http://dev.ckeditor.com/ticket/11140): [IE11] Fixed: Anchors are not draggable.
-* [#11379](http://dev.ckeditor.com/ticket/11379): Changed default contents `line-height` to unitless values to avoid huge text overlapping (like in [#9696](http://dev.ckeditor.com/ticket/9696)).
-* [#10787](http://dev.ckeditor.com/ticket/10787): [Firefox] Fixed: Broken replacement of text while pasting into `div`-based editor.
-* [#10884](http://dev.ckeditor.com/ticket/10884): Widgets integration with the [Show Blocks](http://ckeditor.com/addon/showblocks) plugin.
-* [#11021](http://dev.ckeditor.com/ticket/11021): Fixed: An error thrown when selecting entire editable contents while fake selection is on.
-* [#11086](http://dev.ckeditor.com/ticket/11086): [IE8] Re-enable inline widgets drag&drop in Internet Explorer 8.
-* [#11372](http://dev.ckeditor.com/ticket/11372): Widgets: Special characters encoded twice in nested editables.
-* [#10068](http://dev.ckeditor.com/ticket/10068): Fixed: Support for protocol-relative URLs.
-* [#11283](http://dev.ckeditor.com/ticket/11283): [Enhanced Image](http://ckeditor.com/addon/image2): A `<div>` element with `text-align: center` and an image inside is not recognised correctly.
-* [#11196](http://dev.ckeditor.com/ticket/11196): [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp): Allowed additional keyboard button labels to be translated in the dialog window.
-
-## CKEditor 4.3.1
-
-**Important Notes:**
-
-* To match the naming convention, the `language` button is now `Language` ([#11201](http://dev.ckeditor.com/ticket/11201)).
-* [Enhanced Image](http://ckeditor.com/addon/image2) button, context menu, command, and icon names match those of the [Image](http://ckeditor.com/addon/image) plugin ([#11222](http://dev.ckeditor.com/ticket/11222)).
-
-Fixed Issues:
-
-* [#11244](http://dev.ckeditor.com/ticket/11244): Changed: The [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method now fires the [`widget.repository.checkWidgets`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-event-checkWidgets) event, so from CKEditor 4.3.1 it is preferred to use the method rather than fire the event.
-* [#11171](http://dev.ckeditor.com/ticket/11171): Fixed: [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) and [`editor.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertText) methods do not call the [`widget.repository.checkWidgets()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.repository-method-checkWidgets) method.
-* [#11085](http://dev.ckeditor.com/ticket/11085): [IE8] Replaced preview generated by the [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget with a placeholder.
-* [#11044](http://dev.ckeditor.com/ticket/11044): Enhanced WAI-ARIA support for the [Language](http://ckeditor.com/addon/language) plugin drop-down menu.
-* [#11075](http://dev.ckeditor.com/ticket/11075): With drop-down menu button focused, pressing the *Down Arrow* key will now open the menu and focus its first option.
-* [#11165](http://dev.ckeditor.com/ticket/11165): Fixed: The [File Browser](http://ckeditor.com/addon/filebrowser) plugin cannot be removed from the editor.
-* [#11159](http://dev.ckeditor.com/ticket/11159): [IE9-10] [Enhanced Image](http://ckeditor.com/addon/image2): Fixed buggy discovery of image dimensions.
-* [#11101](http://dev.ckeditor.com/ticket/11101): Drop-down lists no longer break when given double quotes.
-* [#11077](http://dev.ckeditor.com/ticket/11077): [Enhanced Image](http://ckeditor.com/addon/image2): Empty undo step recorded when resizing the image.
-* [#10853](http://dev.ckeditor.com/ticket/10853): [Enhanced Image](http://ckeditor.com/addon/image2): Widget has paragraph wrapper when de-captioning unaligned image.
-* [#11198](http://dev.ckeditor.com/ticket/11198): Widgets: Drag handler is not fully visible when an inline widget is in a heading.
-* [#11132](http://dev.ckeditor.com/ticket/11132): [Firefox] Fixed: Caret is lost after drag and drop of an inline widget.
-* [#11182](http://dev.ckeditor.com/ticket/11182): [IE10-11] Fixed: Editor crashes (IE11) or works with minor issues (IE10) if a page is loaded in Quirks Mode. See [`env.quirks`](http://docs.ckeditor.com/#!/api/CKEDITOR.env-property-quirks) for more details.
-* [#11204](http://dev.ckeditor.com/ticket/11204): Added `figure` and `figcaption` styles to the `contents.css` file so [Enhanced Image](http://ckeditor.com/addon/image2) looks nicer.
-* [#11202](http://dev.ckeditor.com/ticket/11202): Fixed: No newline in [BBCode](http://ckeditor.com/addon/bbcode) mode.
-* [#10890](http://dev.ckeditor.com/ticket/10890): Fixed: Error thrown when pressing the *Delete* key in a list item.
-* [#10055](http://dev.ckeditor.com/ticket/10055): [IE8-10] Fixed: *Delete* pressed on a selected image causes the browser to go back.
-* [#11183](http://dev.ckeditor.com/ticket/11183): Fixed: Inserting a horizontal rule or a table in multiple row selection causes a browser crash. Additionally, the [`editor.insertElement()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-insertElement) method does not insert the element into every range of a selection any more.
-* [#11042](http://dev.ckeditor.com/ticket/11042): Fixed: Selection made on an element containing a non-editable element was not auto faked.
-* [#11125](http://dev.ckeditor.com/ticket/11125): Fixed: Keyboard navigation through menu and drop-down items will now cycle.
-* [#11011](http://dev.ckeditor.com/ticket/11011): Fixed: The [`editor.applyStyle()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-applyStyle) method removes attributes from nested elements.
-* [#11179](http://dev.ckeditor.com/ticket/11179): Fixed: [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy) does not cleanup content generated by the [Table Resize](http://ckeditor.com/addon/tableresize) plugin for inline editors.
-* [#11237](http://dev.ckeditor.com/ticket/11237): Fixed: Table border attribute value is deleted when pasting content from Microsoft Word.
-* [#11250](http://dev.ckeditor.com/ticket/11250): Fixed: HTML entities inside the `<textarea>` element are not encoded.
-* [#11260](http://dev.ckeditor.com/ticket/11260): Fixed: Initially disabled buttons are not read by JAWS as disabled.
-* [#11200](http://dev.ckeditor.com/ticket/11200):  Added [Clipboard](http://ckeditor.com/addon/clipboard) plugin as a dependency for [Widget](http://ckeditor.com/addon/widget) to fix drag and drop.
-
-## CKEditor 4.3
-
-New Features:
-
-* [#10612](http://dev.ckeditor.com/ticket/10612): Internet Explorer 11 support.
-* [#10869](http://dev.ckeditor.com/ticket/10869): Widgets: Added better integration with the [Elements Path](http://ckeditor.com/addon/elementspath) plugin.
-* [#10886](http://dev.ckeditor.com/ticket/10886): Widgets: Added tooltip to the drag handle.
-* [#10933](http://dev.ckeditor.com/ticket/10933): Widgets: Introduced drag and drop of block widgets with the [Line Utilities](http://ckeditor.com/addon/lineutils) plugin.
-* [#10936](http://dev.ckeditor.com/ticket/10936): Widget System changes for easier integration with other dialog systems.
-* [#10895](http://dev.ckeditor.com/ticket/10895): [Enhanced Image](http://ckeditor.com/addon/image2): Added file browser integration.
-* [#11002](http://dev.ckeditor.com/ticket/11002): Added the [`draggable`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget.definition-property-draggable) option to disable drag and drop support for widgets.
-* [#10937](http://dev.ckeditor.com/ticket/10937): [Mathematical Formulas](http://ckeditor.com/addon/mathjax) widget improvements:
-  * loading indicator ([#10948](http://dev.ckeditor.com/ticket/10948)),
-  * applying paragraph changes (like font color change) to iframe ([#10841](http://dev.ckeditor.com/ticket/10841)),
-  * Firefox and IE9 clipboard fixes ([#10857](http://dev.ckeditor.com/ticket/10857)),
-  * fixing same origin policy issue ([#10840](http://dev.ckeditor.com/ticket/10840)),
-  * fixing undo bugs ([#10842](http://dev.ckeditor.com/ticket/10842), [#10930](http://dev.ckeditor.com/ticket/10930)),
-  * fixing other minor bugs.
-* [#10862](http://dev.ckeditor.com/ticket/10862): [Placeholder](http://ckeditor.com/addon/placeholder) plugin was rewritten as a widget.
-* [#10822](http://dev.ckeditor.com/ticket/10822): Added styles system integration with non-editable elements (for example widgets) and their nested editables. Styles cannot change non-editable content and are applied in nested editable only if allowed by its type and content filter.
-* [#10856](http://dev.ckeditor.com/ticket/10856): Menu buttons will now toggle the visibility of their panels when clicked multiple times. [Language](http://ckeditor.com/addon/language) plugin fixes: Added active language highlighting, added an option to remove the language.
-* [#10028](http://dev.ckeditor.com/ticket/10028): New [`config.dialog_noConfirmCancel`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-dialog_noConfirmCancel) configuration option that eliminates the need to confirm closing of a dialog window when the user changed any of its fields.
-* [#10848](http://dev.ckeditor.com/ticket/10848): Integrate remaining plugins ([Styles](http://ckeditor.com/addon/stylescombo), [Format](http://ckeditor.com/addon/format), [Font](http://ckeditor.com/addon/font), [Color Button](http://ckeditor.com/addon/colorbutton), [Language](http://ckeditor.com/addon/language) and [Indent](http://ckeditor.com/addon/indent)) with [active filter](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter).
-* [#10855](http://dev.ckeditor.com/ticket/10855): Change the extension of emoticons in the [BBCode](http://ckeditor.com/addon/bbcode) sample from GIF to PNG.
-
-Fixed Issues:
-
-* [#10831](http://dev.ckeditor.com/ticket/10831): [Enhanced Image](http://ckeditor.com/addon/image2): Merged `image2inline` and `image2block` into one `image2` widget.
-* [#10835](http://dev.ckeditor.com/ticket/10835): [Enhanced Image](http://ckeditor.com/addon/image2): Improved visibility of the resize handle.
-* [#10836](http://dev.ckeditor.com/ticket/10836): [Enhanced Image](http://ckeditor.com/addon/image2): Preserve custom mouse cursor while resizing the image.
-* [#10939](http://dev.ckeditor.com/ticket/10939): [Firefox] [Enhanced Image](http://ckeditor.com/addon/image2): hovering the image causes it to change.
-* [#10866](http://dev.ckeditor.com/ticket/10866): Fixed: Broken *Tab* key navigation in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10833](http://dev.ckeditor.com/ticket/10833): Fixed: *Lock ratio* option should be on by default in the [Enhanced Image](http://ckeditor.com/addon/image2) dialog window.
-* [#10881](http://dev.ckeditor.com/ticket/10881): Various improvements to *Enter* key behavior in nested editables.
-* [#10879](http://dev.ckeditor.com/ticket/10879): [Remove Format](http://ckeditor.com/addon/removeformat) should not leak from a nested editable.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [WebSpellChecker](http://ckeditor.com/addon/wsc) fails to apply changes if a nested editable was focused.
-* [#10877](http://dev.ckeditor.com/ticket/10877): Fixed: [SCAYT](http://ckeditor.com/addon/wsc) blocks typing in nested editables.
-* [#11079](http://dev.ckeditor.com/ticket/11079): Add button icons to the [Placeholder](http://ckeditor.com/addon/placeholder) sample.
-* [#10870](http://dev.ckeditor.com/ticket/10870): The `paste` command is no longer being disabled when the clipboard is empty.
-* [#10854](http://dev.ckeditor.com/ticket/10854): Fixed: Firefox prepends `<br>` to `<body>`, so it is stripped by the HTML data processor.
-* [#10823](http://dev.ckeditor.com/ticket/10823): Fixed: [Link](http://ckeditor.com/addon/link) plugin does not work with non-editable content.
-* [#10828](http://dev.ckeditor.com/ticket/10828): [Magic Line](http://ckeditor.com/addon/magicline) integration with the Widget System.
-* [#10865](http://dev.ckeditor.com/ticket/10865): Improved hiding copybin, so copying widgets works smoothly.
-* [#11066](http://dev.ckeditor.com/ticket/11066): Widget's private parts use CSS reset.
-* [#11027](http://dev.ckeditor.com/ticket/11027): Fixed: Block commands break on widgets; added the [`contentDomInvalidated`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-contentDomInvalidated) event.
-* [#10430](http://dev.ckeditor.com/ticket/10430): Resolve dependence of the [Image](http://ckeditor.com/addon/image) plugin on the [Form Elements](http://ckeditor.com/addon/forms) plugin.
-* [#10911](http://dev.ckeditor.com/ticket/10911): Fixed: Browser *Alt* hotkeys will no longer be blocked while a widget is focused.
-* [#11082](http://dev.ckeditor.com/ticket/11082): Fixed: Selected widget is not copied or cut when using toolbar buttons or context menu.
-* [#11083](http://dev.ckeditor.com/ticket/11083): Fixed list and div element application to block widgets.
-* [#10887](http://dev.ckeditor.com/ticket/10887): Internet Explorer 8 compatibility issues related to the Widget System.
-* [#11074](http://dev.ckeditor.com/ticket/11074): Temporarily disabled inline widget drag and drop, because of seriously buggy native `range#moveToPoint` method.
-* [#11098](http://dev.ckeditor.com/ticket/11098): Fixed: Wrong selection position after undoing widget drag and drop.
-* [#11110](http://dev.ckeditor.com/ticket/11110): Fixed: IFrame and Flash objects are being incorrectly pasted in certain conditions.
-* [#11129](http://dev.ckeditor.com/ticket/11129): Page break is lost when loading data.
-* [#11123](http://dev.ckeditor.com/ticket/11123): [Firefox] Widget is destroyed after being dragged outside of `<body>`.
-* [#11124](http://dev.ckeditor.com/ticket/11124): Fixed the [Elements Path](http://ckeditor.com/addon/elementspath) in an editor using the [Div Editing Area](http://ckeditor.com/addon/divarea).
-
-## CKEditor 4.3 Beta
-
-New Features:
-
-* [#9764](http://dev.ckeditor.com/ticket/9764): Widget System.
-  * [Widget plugin](http://ckeditor.com/addon/widget) introducing the [Widget API](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.widget).
-  * New [`editor.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) and [`editor.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-shiftEnterMode) properties &ndash; normalized versions of [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) and [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-  * Dynamic editor settings. Starting from CKEditor 4.3 Beta, *Enter* mode values and [content filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) instances may be changed dynamically (for example when the caret was placed in an element in which editor features should be adjusted). When you are implementing a new editor feature, you should base its behavior on [dynamic](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) or [static](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-enterMode) *Enter* mode values depending on whether this feature works in selection context or globally on editor content.
-      * Dynamic *Enter* mode values &ndash; [`editor.setActiveEnterMode()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveEnterMode) method, [`editor.activeEnterModeChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeEnterModeChange) event, and two properties: [`editor.activeEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeEnterMode) and [`editor.activeShiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeShiftEnterMode).
-      * Dynamic content filter instances &ndash; [`editor.setActiveFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setActiveFilter) method, [`editor.activeFilterChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-activeFilterChange) event, and [`editor.activeFilter`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-activeFilter) property.
-  * "Fake" selection was introduced. It makes it possible to virtually select any element when the real selection remains hidden. See the  [`selection.fake()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.selection-method-fake) method.
-  * Default [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter) rules are not applied to non-editable elements (elements with `contenteditable` attribute set to `false` and their descendants) anymore. To add a rule which will be applied to all elements you need to pass an additional argument to the [`filter.addRules()`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter-method-addRules) method.
-  * Dozens of new methods were introduced &ndash; most interesting ones:
-      * [`document.find()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-find),
-      * [`document.findOne()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.document-method-findOne),
-      * [`editable.insertElementIntoRange()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertElementIntoRange),
-      * [`range.moveToClosestEditablePosition()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-moveToClosestEditablePosition),
-      * New methods for [`htmlParser.node`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.node) and [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element).
-* [#10659](http://dev.ckeditor.com/ticket/10659): New [Enhanced Image](http://ckeditor.com/addon/image2) plugin that introduces a widget with integrated image captions, an option to center images, and dynamic "click and drag" resizing.
-* [#10664](http://dev.ckeditor.com/ticket/10664): New [Mathematical Formulas](http://ckeditor.com/addon/mathjax) plugin that introduces the MathJax widget.
-* [#7987](https://dev.ckeditor.com/ticket/7987): New [Language](http://ckeditor.com/addon/language) plugin that implements Language toolbar button to support [WCAG 3.1.2 Language of Parts](http://www.w3.org/TR/UNDERSTANDING-WCAG20/meaning-other-lang-id.html).
-* [#10708](http://dev.ckeditor.com/ticket/10708): New [smileys](http://ckeditor.com/addon/smiley).
-
-## CKEditor 4.2.3
-
-Fixed Issues:
-
-* [#10994](http://dev.ckeditor.com/ticket/10994): Fixed: Loading external jQuery library when opening the [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) sample directly from file.
-* [#10975](http://dev.ckeditor.com/ticket/10975): [IE] Fixed: Error thrown while opening the color palette.
-* [#9929](http://dev.ckeditor.com/ticket/9929): [Blink/WebKit] Fixed: A non-breaking space is created once a character is deleted and a regular space is typed.
-* [#10963](http://dev.ckeditor.com/ticket/10963): Fixed: JAWS issue with the keyboard shortcut for [Magic Line](http://ckeditor.com/addon/magicline).
-* [#11096](http://dev.ckeditor.com/ticket/11096): Fixed: TypeError: Object has no method 'is'.
-
-## CKEditor 4.2.2
-
-Fixed Issues:
-
-* [#9314](http://dev.ckeditor.com/ticket/9314): Fixed: Incorrect error message on closing a dialog window without saving changs.
-* [#10308](http://dev.ckeditor.com/ticket/10308): [IE10] Fixed: Unspecified error when deleting a row.
-* [#10945](http://dev.ckeditor.com/ticket/10945): [Chrome] Fixed: Clicking with a mouse inside the editor does not show the caret.
-* [#10912](http://dev.ckeditor.com/ticket/10912): Prevent default action when content of a non-editable link is clicked.
-* [#10913](http://dev.ckeditor.com/ticket/10913): Fixed [`CKEDITOR.plugins.addExternal()`](http://docs.ckeditor.com/#!/api/CKEDITOR.resourceManager-method-addExternal) not handling paths including file name specified.
-* [#10666](http://dev.ckeditor.com/ticket/10666): Fixed [`CKEDITOR.tools.isArray()`](http://docs.ckeditor.com/#!/api/CKEDITOR.tools-method-isArray) not working cross frame.
-* [#10910](http://dev.ckeditor.com/ticket/10910): [IE9] Fixed JavaScript error thrown in Compatibility Mode when clicking and/or typing in the editing area.
-* [#10868](http://dev.ckeditor.com/ticket/10868): [IE8] Prevent the browser from crashing when applying the Inline Quotation style.
-* [#10915](http://dev.ckeditor.com/ticket/10915): Fixed: Invalid CSS filter in the Kama skin.
-* [#10914](http://dev.ckeditor.com/ticket/10914): Plugins [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock) are now included in the build configuration.
-* [#10812](http://dev.ckeditor.com/ticket/10812): Fixed [`range.createBookmark2()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dom.range-method-createBookmark2) incorrectly normalizing offsets. This bug was causing many issues: [#10850](http://dev.ckeditor.com/ticket/10850), [#10842](http://dev.ckeditor.com/ticket/10842).
-* [#10951](http://dev.ckeditor.com/ticket/10951): Reviewed and optimized focus handling on panels (combo, menu buttons, color buttons, and context menu) to enhance accessibility. Fixed [#10705](http://dev.ckeditor.com/ticket/10705), [#10706](http://dev.ckeditor.com/ticket/10706) and [#10707](http://dev.ckeditor.com/ticket/10707).
-* [#10704](http://dev.ckeditor.com/ticket/10704): Fixed a JAWS issue with the Select Color dialog window title not being announced.
-* [#10753](http://dev.ckeditor.com/ticket/10753): The floating toolbar in inline instances now has a dedicated accessibility label.
-
-## CKEditor 4.2.1
-
-Fixed Issues:
-
-* [#10301](http://dev.ckeditor.com/ticket/10301): [IE9-10] Undo fails after 3+ consecutive paste actions with a JavaScript error.
-* [#10689](http://dev.ckeditor.com/ticket/10689): Save toolbar button saves only the first editor instance.
-* [#10368](http://dev.ckeditor.com/ticket/10368): Move language reading direction definition (`dir`) from main language file to core.
-* [#9330](http://dev.ckeditor.com/ticket/9330): Fixed pasting anchors from MS Word.
-* [#8103](http://dev.ckeditor.com/ticket/8103): Fixed pasting nested lists from MS Word.
-* [#9958](http://dev.ckeditor.com/ticket/9958): [IE9] Pressing the "OK" button will trigger the `onbeforeunload` event in the popup dialog.
-* [#10662](http://dev.ckeditor.com/ticket/10662): Fixed styles from the Styles drop-down list not registering to the ACF in case when the [Shared Spaces plugin](http://ckeditor.com/addon/sharedspace) is used.
-* [#9654](http://dev.ckeditor.com/ticket/9654): Problems with Internet Explorer 10 Quirks Mode.
-* [#9816](http://dev.ckeditor.com/ticket/9816): Floating toolbar does not reposition vertically in several cases.
-* [#10646](http://dev.ckeditor.com/ticket/10646): Removing a selected sublist or nested table with *Backspace/Delete* removes the parent element.
-* [#10623](http://dev.ckeditor.com/ticket/10623): [WebKit] Page is scrolled when opening a drop-down list.
-* [#10004](http://dev.ckeditor.com/ticket/10004): [ChromeVox] Button names are not announced.
-* [#10731](http://dev.ckeditor.com/ticket/10731): [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin breaks cloning of editor configuration.
-* It is now possible to set per instance [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin configuration instead of setting the configuration globally.
-
-## CKEditor 4.2
-
-**Important Notes:**
-
-* Dropped compatibility support for Internet Explorer 7 and Firefox 3.6.
-
-* Both the Basic and the Standard distribution packages will not contain the new [Indent Block](http://ckeditor.com/addon/indentblock) plugin. Because of this the [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) might remove block indentations from existing contents. If you want to prevent this, either [add an appropriate ACF rule to your filter](http://docs.ckeditor.com/#!/guide/dev_allowed_content_rules) or create a custom build based on the Basic/Standard package and add the Indent Block plugin in [CKBuilder](http://ckeditor.com/builder).
-
-New Features:
-
-* [#10027](http://dev.ckeditor.com/ticket/10027): Separated list and block indentation into two plugins: [Indent List](http://ckeditor.com/addon/indentlist) and [Indent Block](http://ckeditor.com/addon/indentblock).
-* [#8244](http://dev.ckeditor.com/ticket/8244): Use *(Shift+)Tab* to indent and outdent lists.
-* [#10281](http://dev.ckeditor.com/ticket/10281): The [jQuery Adapter](http://docs.ckeditor.com/#!/guide/dev_jquery) is now available. Several jQuery-related issues fixed: [#8261](http://dev.ckeditor.com/ticket/8261), [#9077](http://dev.ckeditor.com/ticket/9077), [#8710](http://dev.ckeditor.com/ticket/8710), [#8530](http://dev.ckeditor.com/ticket/8530), [#9019](http://dev.ckeditor.com/ticket/9019), [#6181](http://dev.ckeditor.com/ticket/6181), [#7876](http://dev.ckeditor.com/ticket/7876), [#6906](http://dev.ckeditor.com/ticket/6906).
-* [#10042](http://dev.ckeditor.com/ticket/10042): Introduced [`config.title`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-title) setting to change the human-readable title of the editor.
-* [#9794](http://dev.ckeditor.com/ticket/9794): Added [`editor.change`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-change) event.
-* [#9923](http://dev.ckeditor.com/ticket/9923): HiDPI support in the editor UI. HiDPI icons for [Moono skin](http://ckeditor.com/addon/moono) added.
-* [#8031](http://dev.ckeditor.com/ticket/8031): Handle `required` attributes on `<textarea>` elements &mdash; introduced [`editor.required`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-required) event.
-* [#10280](http://dev.ckeditor.com/ticket/10280): Ability to replace `<textarea>` elements with the inline editor.
-
-Fixed Issues:
-
-* [#10599](http://dev.ckeditor.com/ticket/10599): [Indent](http://ckeditor.com/addon/indent) plugin is no longer required by the [List](http://ckeditor.com/addon/list) plugin.
-* [#10370](http://dev.ckeditor.com/ticket/10370): Inconsistency in data events between framed and inline editors.
-* [#10438](http://dev.ckeditor.com/ticket/10438): [FF, IE] No selection is done on an editable element on executing [`editor.setData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setData).
-
-## CKEditor 4.1.3
-
-New Features:
-
-* Added new translation: Indonesian.
-
-Fixed Issues:
-
-* [#10644](http://dev.ckeditor.com/ticket/10644): Fixed a critical bug when pasting plain text in Blink-based browsers.
-* [#5189](http://dev.ckeditor.com/ticket/5189): [Find/Replace](http://ckeditor.com/addon/find) dialog window: rename "Cancel" button to "Close".
-* [#10562](http://dev.ckeditor.com/ticket/10562): [Housekeeping] Unified CSS gradient filter formats in the [Moono](http://ckeditor.com/addon/moono) skin.
-* [#10537](http://dev.ckeditor.com/ticket/10537): Advanced Content Filter should register a default rule for [`config.shiftEnterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-shiftEnterMode).
-* [#10610](http://dev.ckeditor.com/ticket/10610): [`CKEDITOR.dialog.addIframe()`](http://docs.ckeditor.com/#!/api/CKEDITOR.dialog-static-method-addIframe) incorrectly sets the iframe size in dialog windows.
-
-## CKEditor 4.1.2
-
-New Features:
-
-* Added new translation: Sinhala.
-
-Fixed Issues:
-
-* [#10339](http://dev.ckeditor.com/ticket/10339): Fixed: Error thrown when inserted data was totally stripped out after filtering and processing.
-* [#10298](http://dev.ckeditor.com/ticket/10298): Fixed: Data processor breaks attributes containing protected parts.
-* [#10367](http://dev.ckeditor.com/ticket/10367): Fixed: [`editable.insertText()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editable-method-insertText) loses characters when `RegExp` replace controls are being inserted.
-* [#10165](http://dev.ckeditor.com/ticket/10165): [IE] Access denied error when `document.domain` has been altered.
-* [#9761](http://dev.ckeditor.com/ticket/9761): Update the *Backspace* key state in [`keystrokeHandler.blockedKeystrokes`](http://docs.ckeditor.com/#!/api/CKEDITOR.keystrokeHandler-property-blockedKeystrokes) when calling [`editor.setReadOnly()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-setReadOnly).
-* [#6504](http://dev.ckeditor.com/ticket/6504): Fixed: Race condition while loading several [`config.customConfig`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-customConfig) files.
-* [#10146](http://dev.ckeditor.com/ticket/10146): [Firefox] Empty lines are being removed while [`config.enterMode`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode) is [`CKEDITOR.ENTER_BR`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-ENTER_BR).
-* [#10360](http://dev.ckeditor.com/ticket/10360): Fixed: ARIA `role="application"` should not be used for dialog windows.
-* [#10361](http://dev.ckeditor.com/ticket/10361): Fixed: ARIA `role="application"` should not be used for floating panels.
-* [#10510](http://dev.ckeditor.com/ticket/10510): Introduced unique voice labels to differentiate between different editor instances.
-* [#9945](http://dev.ckeditor.com/ticket/9945): [iOS] Scrolling not possible on iPad.
-* [#10389](http://dev.ckeditor.com/ticket/10389): Fixed: Invalid HTML in the "Text and Table" template.
-* [WebSpellChecker](http://ckeditor.com/addon/wsc) plugin user interface was changed to match CKEditor 4 style.
-
-## CKEditor 4.1.1
-
-New Features:
-
-* Added new translation: Albanian.
-
-Fixed Issues:
-
-* [#10172](http://dev.ckeditor.com/ticket/10172): Pressing *Delete* or *Backspace* in an empty table cell moves the cursor to the next/previous cell.
-* [#10219](http://dev.ckeditor.com/ticket/10219): Error thrown when destroying an editor instance in parallel with a `mouseup` event.
-* [#10265](http://dev.ckeditor.com/ticket/10265): Wrong loop type in the [File Browser](http://ckeditor.com/addon/filebrowser) plugin.
-* [#10249](http://dev.ckeditor.com/ticket/10249): Wrong undo/redo states at start.
-* [#10268](http://dev.ckeditor.com/ticket/10268): [Show Blocks](http://ckeditor.com/addon/showblocks) does not recover after switching to Source view.
-* [#9995](http://dev.ckeditor.com/ticket/9995): HTML code in the `<textarea>` should not be modified by the [`htmlDataProcessor`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlDataProcessor).
-* [#10320](http://dev.ckeditor.com/ticket/10320): [Justify](http://ckeditor.com/addon/justify) plugin should add elements to Advanced Content Filter based on current [Enter mode](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-enterMode).
-* [#10260](http://dev.ckeditor.com/ticket/10260): Fixed: Advanced Content Filter blocks [`tabSpaces`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-tabSpaces). Unified `data-cke-*` attributes filtering.
-* [#10315](http://dev.ckeditor.com/ticket/10315): [WebKit] [Undo manager](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager) should not record snapshots after a filling character was added/removed.
-* [#10291](http://dev.ckeditor.com/ticket/10291): [WebKit] Space after a filling character should be secured.
-* [#10330](http://dev.ckeditor.com/ticket/10330): [WebKit] The filling character is not removed on `keydown` in specific cases.
-* [#10285](http://dev.ckeditor.com/ticket/10285): Fixed: Styled text pasted from MS Word causes an infinite loop.
-* [#10131](http://dev.ckeditor.com/ticket/10131): Fixed: [`undoManager.update()`](http://docs.ckeditor.com/#!/api/CKEDITOR.plugins.undo.UndoManager-method-update) does not refresh the command state.
-* [#10337](http://dev.ckeditor.com/ticket/10337): Fixed: Unable to remove `<s>` using [Remove Format](http://ckeditor.com/addon/removeformat).
-
-## CKEditor 4.1
-
-Fixed Issues:
-
-* [#10192](http://dev.ckeditor.com/ticket/10192): Closing lists with the *Enter* key does not work with [Advanced Content Filter](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) in several cases.
-* [#10191](http://dev.ckeditor.com/ticket/10191): Fixed allowed content rules unification, so the [`filter.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.filter-property-allowedContent) property always contains rules in the same format.
-* [#10224](http://dev.ckeditor.com/ticket/10224): Advanced Content Filter does not remove non-empty `<a>` elements anymore.
-* Minor issues in plugin integration with Advanced Content Filter:
-  * [#10166](http://dev.ckeditor.com/ticket/10166): Added transformation from the `align` attribute to `float` style to preserve backward compatibility after the introduction of Advanced Content Filter.
-  * [#10195](http://dev.ckeditor.com/ticket/10195): [Image](http://ckeditor.com/addon/image) plugin no longer registers rules for links to Advanced Content Filter.
-  * [#10213](http://dev.ckeditor.com/ticket/10213): [Justify](http://ckeditor.com/addon/justify) plugin is now correctly registering rules to Advanced Content Filter when [`config.justifyClasses`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-justifyClasses) is defined.
-
-## CKEditor 4.1 RC
-
-New Features:
-
-* [#9829](http://dev.ckeditor.com/ticket/9829): Advanced Content Filter - data and features activation based on editor configuration.
-
-  Brand new data filtering system that works in 2 modes:
-
-  * Based on loaded features (toolbar items, plugins) - the data will be filtered according to what the editor in its
-  current configuration can handle.
-  * Based on [`config.allowedContent`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-allowedContent) rules - the data
-  will be filtered and the editor features (toolbar items, commands, keystrokes) will be enabled if they are allowed.
-
-  See the `datafiltering.html` sample, [guides](http://docs.ckeditor.com/#!/guide/dev_advanced_content_filter) and [`CKEDITOR.filter` API documentation](http://docs.ckeditor.com/#!/api/CKEDITOR.filter).
-* [#9387](http://dev.ckeditor.com/ticket/9387): Reintroduced [Shared Spaces](http://ckeditor.com/addon/sharedspace) - the ability to display toolbar and bottom editor space in selected locations and to share them by different editor instances.
-* [#9907](http://dev.ckeditor.com/ticket/9907): Added the [`contentPreview`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-contentPreview) event for preview data manipulation.
-* [#9713](http://dev.ckeditor.com/ticket/9713): Introduced the [Source Dialog](http://ckeditor.com/addon/sourcedialog) plugin that brings raw HTML editing for inline editor instances.
-* Included in [#9829](http://dev.ckeditor.com/ticket/9829): Introduced new events, [`toHtml`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toHtml) and [`toDataFormat`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-toDataFormat), allowing for better integration with data processing.
-* [#9981](http://dev.ckeditor.com/ticket/9981): Added ability to filter [`htmlParser.fragment`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.fragment), [`htmlParser.element`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.element) etc. by many [`htmlParser.filter`](http://docs.ckeditor.com/#!/api/CKEDITOR.htmlParser.filter)s before writing structure to an HTML string.
-* Included in [#10103](http://dev.ckeditor.com/ticket/10103):
-  * Introduced the [`editor.status`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-status) property to make it easier to check the current status of the editor.
-  * Default [`command`](http://docs.ckeditor.com/#!/api/CKEDITOR.command) state is now [`CKEDITOR.TRISTATE_DISABLE`](http://docs.ckeditor.com/#!/api/CKEDITOR-property-TRISTATE_DISABLED). It will be activated on [`editor.instanceReady`](http://docs.ckeditor.com/#!/api/CKEDITOR-event-instanceReady) or immediately after being added if the editor is already initialized.
-* [#9796](http://dev.ckeditor.com/ticket/9796): Introduced `<s>` as a default tag for strikethrough, which replaces obsolete `<strike>` in HTML5.
-
-## CKEditor 4.0.3
-
-Fixed Issues:
-
-* [#10196](http://dev.ckeditor.com/ticket/10196): Fixed context menus not opening with keyboard shortcuts when [Autogrow](http://ckeditor.com/addon/autogrow) is enabled.
-* [#10212](http://dev.ckeditor.com/ticket/10212): [IE7-10] Undo command throws errors after multiple switches between Source and WYSIWYG view.
-* [#10219](http://dev.ckeditor.com/ticket/10219): [Inline editor] Error thrown after calling [`editor.destroy()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-destroy).
-
-## CKEditor 4.0.2
-
-Fixed Issues:
-
-* [#9779](http://dev.ckeditor.com/ticket/9779): Fixed overriding [`CKEDITOR.getUrl()`](http://docs.ckeditor.com/#!/api/CKEDITOR-method-getUrl) with `CKEDITOR_GETURL`.
-* [#9772](http://dev.ckeditor.com/ticket/9772): Custom buttons in the dialog window footer have different look and size ([Moono](http://ckeditor.com/addon/moono), [Kama](http://ckeditor.com/addon/kama) skins).
-* [#9029](http://dev.ckeditor.com/ticket/9029): Custom styles added with the [`stylesSet.add()`](http://docs.ckeditor.com/#!/api/CKEDITOR.stylesSet-method-add) are displayed in the wrong order.
-* [#9887](http://dev.ckeditor.com/ticket/9887): Disable [Magic Line](http://ckeditor.com/addon/magicline) when [`editor.readOnly`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-property-readOnly) is set.
-* [#9882](http://dev.ckeditor.com/ticket/9882): Fixed empty document title on [`editor.getData()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-getData) if set via the Document Properties dialog window.
-* [#9773](http://dev.ckeditor.com/ticket/9773): Fixed rendering problems with selection fields in the Kama skin.
-* [#9851](http://dev.ckeditor.com/ticket/9851): The [`selectionChange`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-event-selectionChange) event is not fired when mouse selection ended outside editable.
-* [#9903](http://dev.ckeditor.com/ticket/9903): [Inline editor] Bad positioning of floating space with page horizontal scroll.
-* [#9872](http://dev.ckeditor.com/ticket/9872): [`editor.checkDirty()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-checkDirty) returns `true` when called onload. Removed the obsolete `editor.mayBeDirty` flag.
-* [#9893](http://dev.ckeditor.com/ticket/9893): [IE] Fixed broken toolbar when editing mixed direction content in Quirks mode.
-* [#9845](http://dev.ckeditor.com/ticket/9845): Fixed TAB navigation in the [Link](http://ckeditor.com/addon/link) dialog window when the Anchor option is used and no anchors are available.
-* [#9883](http://dev.ckeditor.com/ticket/9883): Maximizing was making the entire page editable with [divarea](http://ckeditor.com/addon/divarea)-based editors.
-* [#9940](http://dev.ckeditor.com/ticket/9940): [Firefox] Navigating back to a page with the editor was making the entire page editable.
-* [#9966](http://dev.ckeditor.com/ticket/9966): Fixed: Unable to type square brackets with French keyboard layout. Changed [Magic Line](http://ckeditor.com/addon/magicline) keystrokes.
-* [#9507](http://dev.ckeditor.com/ticket/9507): [Firefox] Selection is moved before editable position when the editor is focused for the first time.
-* [#9947](http://dev.ckeditor.com/ticket/9947): [WebKit] Editor overflows parent container in some edge cases.
-* [#10105](http://dev.ckeditor.com/ticket/10105): Fixed: Broken [sourcearea](http://ckeditor.com/addon/sourcearea) view when an RTL language is set.
-* [#10123](http://dev.ckeditor.com/ticket/10123): [WebKit] Fixed: Several dialog windows have broken layout since the latest WebKit release.
-* [#10152](http://dev.ckeditor.com/ticket/10152): Fixed: Invalid ARIA property used on menu items.
-
-## CKEditor 4.0.1.1
-
-Fixed Issues:
-
-* Security update: Added protection against XSS attack and possible path disclosure in the PHP sample.
-
-## CKEditor 4.0.1
-
-Fixed Issues:
-
-* [#9655](http://dev.ckeditor.com/ticket/9655): Support for IE Quirks Mode in the new [Moono skin](http://ckeditor.com/addon/moono).
-* Accessibility issues (mainly in inline editor): [#9364](http://dev.ckeditor.com/ticket/9364), [#9368](http://dev.ckeditor.com/ticket/9368), [#9369](http://dev.ckeditor.com/ticket/9369), [#9370](http://dev.ckeditor.com/ticket/9370), [#9541](http://dev.ckeditor.com/ticket/9541), [#9543](http://dev.ckeditor.com/ticket/9543), [#9841](http://dev.ckeditor.com/ticket/9841), [#9844](http://dev.ckeditor.com/ticket/9844).
-* [Magic Line](http://ckeditor.com/addon/magicline) plugin:
-    * [#9481](http://dev.ckeditor.com/ticket/9481): Added accessibility support for Magic Line.
-    * [#9509](http://dev.ckeditor.com/ticket/9509): Added Magic Line support for forms.
-    * [#9573](http://dev.ckeditor.com/ticket/9573): Magic Line does not disappear on `mouseout` in a specific case.
-* [#9754](http://dev.ckeditor.com/ticket/9754): [WebKit] Cutting & pasting simple unformatted text generates an inline wrapper in WebKit browsers.
-* [#9456](http://dev.ckeditor.com/ticket/9456): [Chrome] Properly paste bullet list style from MS Word.
-* [#9699](http://dev.ckeditor.com/ticket/9699), [#9758](http://dev.ckeditor.com/ticket/9758): Improved selection locking when selecting by dragging.
-* Context menu:
-    * [#9712](http://dev.ckeditor.com/ticket/9712): Opening the context menu destroys editor focus.
-    * [#9366](http://dev.ckeditor.com/ticket/9366): Context menu should be displayed over the floating toolbar.
-    * [#9706](http://dev.ckeditor.com/ticket/9706): Context menu generates a JavaScript error in inline mode when the editor is attached to a header element.
-* [#9800](http://dev.ckeditor.com/ticket/9800): Hide float panel when resizing the window.
-* [#9721](http://dev.ckeditor.com/ticket/9721): Padding in content of div-based editor puts the editing area under the bottom UI space.
-* [#9528](http://dev.ckeditor.com/ticket/9528): Host page `box-sizing` style should not influence the editor UI elements.
-* [#9503](http://dev.ckeditor.com/ticket/9503): [Form Elements](http://ckeditor.com/addon/forms) plugin adds context menu listeners only on supported input types. Added support for `tel`, `email`, `search` and `url` input types.
-* [#9769](http://dev.ckeditor.com/ticket/9769): Improved floating toolbar positioning in a narrow window.
-* [#9875](http://dev.ckeditor.com/ticket/9875): Table dialog window does not populate width correctly.
-* [#8675](http://dev.ckeditor.com/ticket/8675): Deleting cells in a nested table removes the outer table cell.
-* [#9815](http://dev.ckeditor.com/ticket/9815): Cannot edit dialog window fields in an editor initialized in the jQuery UI modal dialog.
-* [#8888](http://dev.ckeditor.com/ticket/8888): CKEditor dialog windows do not show completely in a small window.
-* [#9360](http://dev.ckeditor.com/ticket/9360): [Inline editor] Blocks shown for a `<div>` element stay permanently even after the user exits editing the `<div>`.
-* [#9531](http://dev.ckeditor.com/ticket/9531): [Firefox & Inline editor] Toolbar is lost when closing the Format drop-down list by clicking its button.
-* [#9553](http://dev.ckeditor.com/ticket/9553): Table width incorrectly set when the `border-width` style is specified.
-* [#9594](http://dev.ckeditor.com/ticket/9594): Cannot tab past CKEditor when it is in read-only mode.
-* [#9658](http://dev.ckeditor.com/ticket/9658): [IE9] Justify not working on selected images.
-* [#9686](http://dev.ckeditor.com/ticket/9686): Added missing contents styles for `<pre>` elements.
-* [#9709](http://dev.ckeditor.com/ticket/9709): [Paste from Word](http://ckeditor.com/addon/pastefromword) should not depend on configuration from other styles.
-* [#9726](http://dev.ckeditor.com/ticket/9726): Removed [Color Dialog](http://ckeditor.com/addon/colordialog) plugin dependency from [Table Tools](http://ckeditor.com/addon/tabletools).
-* [#9765](http://dev.ckeditor.com/ticket/9765): Toolbar Collapse command documented incorrectly in the [Accessibility Instructions](http://ckeditor.com/addon/a11yhelp) dialog window.
-* [#9771](http://dev.ckeditor.com/ticket/9771): [WebKit & Opera] Fixed scrolling issues when pasting.
-* [#9787](http://dev.ckeditor.com/ticket/9787): [IE9] `onChange` is not fired for checkboxes in dialogs.
-* [#9842](http://dev.ckeditor.com/ticket/9842): [Firefox 17] When opening a toolbar menu for the first time and pressing the *Down Arrow* key, focus goes to the next toolbar button instead of the menu options.
-* [#9847](http://dev.ckeditor.com/ticket/9847): [Elements Path](http://ckeditor.com/addon/elementspath) should not be initialized in the inline editor.
-* [#9853](http://dev.ckeditor.com/ticket/9853): [`editor.addRemoveFormatFilter()`](http://docs.ckeditor.com/#!/api/CKEDITOR.editor-method-addRemoveFormatFilter) is exposed before it really works.
-* [#8893](http://dev.ckeditor.com/ticket/8893): Value of the [`pasteFromWordCleanupFile`](http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-pasteFromWordCleanupFile) configuration option is now taken from the instance configuration.
-* [#9693](http://dev.ckeditor.com/ticket/9693): Removed "Live Preview" checkbox from UI color picker.
-
-
-## CKEditor 4.0
-
-The first stable release of the new CKEditor 4 code line.
-
-The CKEditor JavaScript API has been kept compatible with CKEditor 4, whenever
-possible. The list of relevant changes can be found in the [API Changes page of
-the CKEditor 4 documentation][1].
-
-[1]: http://docs.ckeditor.com/#!/guide/dev_api_changes "API Changes"
diff --git a/plugins/ckeditor/src/FIXES.txt b/plugins/ckeditor/src/FIXES.txt
deleted file mode 100644
index 3e163b01a..000000000
--- a/plugins/ckeditor/src/FIXES.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-:(t=!!k[n],"br"!=n||!e.data("cke-eol")
-:(t=!k||!!k[n],"br"!=n||!e.data("cke-eol")
-
----
-
-for(F=null;y&&!p[y.getName()][L.name];){
-for(F=null;y&&(!p||!p[y.getName()]||!p[y.getName()][L.name]);){
-
----
-
-a.window.$.getSelection().removeAllRanges()
-a.window&&a.window.$&&a.window.$.getSelection().removeAllRanges()
diff --git a/plugins/ckeditor/src/LICENSE.md b/plugins/ckeditor/src/LICENSE.md
deleted file mode 100644
index 044e7daf9..000000000
--- a/plugins/ckeditor/src/LICENSE.md
+++ /dev/null
@@ -1,1420 +0,0 @@
-Software License Agreement
-==========================
-
-CKEditor - The text editor for Internet - http://ckeditor.com
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-   (See Appendix A)
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-   (See Appendix B)
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-   (See Appendix C)
-
-You are not required to, but if you want to explicitly declare the
-license you have chosen to be bound to when using, reproducing,
-modifying and distributing this software, just include a text file
-titled "legal.txt" in your version of this software, indicating your
-license choice. In any case, your choice will not restrict any
-recipient of your version of this software to use, reproduce, modify
-and distribute this software under any of the above licenses.
-
-Sources of Intellectual Property Included in CKEditor
------------------------------------------------------
-
-Where not otherwise indicated, all CKEditor content is authored by
-CKSource engineers and consists of CKSource-owned intellectual
-property. In some specific instances, CKEditor will incorporate work
-done by developers outside of CKSource with their express permission.
-
-The following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* CKSource Samples Framework (included in the samples) - Copyright (c) 2014-2017, CKSource - Frederico Knabben.
-* PicoModal (included in `samples/js/sf.js`) - Copyright (c) 2012 James Frasca.
-* CodeMirror (included in the samples) - Copyright (C) 2014 by Marijn Haverbeke <marijnh@gmail.com> and others.
-
-Parts of code taken from the following libraries are included in CKEditor under the MIT license (see Appendix D):
-
-* jQuery (inspired the domReady function, ckeditor_base.js) - Copyright (c) 2011 John Resig, http://jquery.com/
-
-The following libraries are included in CKEditor under the SIL Open Font License, Version 1.1 (see Appendix E):
-
-* Font Awesome (included in the toolbar configurator) - Copyright (C) 2012 by Dave Gandy.
-
-The following libraries are included in CKEditor under the BSD-3 License (see Appendix F):
-
-* highlight.js (included in the `codesnippet` plugin) - Copyright (c) 2006, Ivan Sagalaev.
-* YUI Library (included in the `uicolor` plugin) - Copyright (c) 2009, Yahoo! Inc.
-
-
-Trademarks
-----------
-
-CKEditor is a trademark of CKSource - Frederico Knabben. All other brand
-and product names are trademarks, registered trademarks or service
-marks of their respective holders.
-
----
-
-Appendix A: The GPL License
----------------------------
-
-```
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software-to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix B: The LGPL License
-----------------------------
-
-```
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software-to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages-typically libraries-of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-GNU LESSER GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
-```
-
-Appendix C: The MPL License
----------------------------
-
-```
-MOZILLA PUBLIC LICENSE
-Version 1.1
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-```
-
-Appendix D: The MIT License
----------------------------
-
-```
-The MIT License (MIT)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-```
-
-Appendix E: The SIL Open Font License Version 1.1
----------------------------------------------
-
-```
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
-```
-
-Appendix F: The BSD-3 License
------------------------------
-
-```
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-```
-
diff --git a/plugins/ckeditor/src/README.md b/plugins/ckeditor/src/README.md
deleted file mode 100644
index d18d4a108..000000000
--- a/plugins/ckeditor/src/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-CKEditor 4
-==========
-
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-http://ckeditor.com - See LICENSE.md for license information.
-
-CKEditor is a text editor to be used inside web pages. It's not a replacement
-for desktop text editors like Word or OpenOffice, but a component to be used as
-part of web applications and websites.
-
-## Documentation
-
-The full editor documentation is available online at the following address:
-http://docs.ckeditor.com
-
-## Installation
-
-Installing CKEditor is an easy task. Just follow these simple steps:
-
- 1. **Download** the latest version from the CKEditor website:
-    http://ckeditor.com. You should have already completed this step, but be
-    sure you have the very latest version.
- 2. **Extract** (decompress) the downloaded file into the root of your website.
-
-**Note:** CKEditor is by default installed in the `ckeditor` folder. You can
-place the files in whichever you want though.
-
-## Checking Your Installation
-
-The editor comes with a few sample pages that can be used to verify that
-installation proceeded properly. Take a look at the `samples` directory.
-
-To test your installation, just call the following page at your website:
-
-	http://<your site>/<CKEditor installation path>/samples/index.html
-
-For example:
-
-	http://www.example.com/ckeditor/samples/index.html
diff --git a/plugins/ckeditor/src/build-config.js b/plugins/ckeditor/src/build-config.js
deleted file mode 100644
index 92f79bfe9..000000000
--- a/plugins/ckeditor/src/build-config.js
+++ /dev/null
@@ -1,152 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-/**
- * This file was added automatically by CKEditor builder.
- * You may re-use it at any time to build CKEditor again.
- *
- * If you would like to build CKEditor online again
- * (for example to upgrade), visit one the following links:
- *
- * (1) http://ckeditor.com/builder
- *     Visit online builder to build CKEditor from scratch.
- *
- * (2) http://ckeditor.com/builder/9b9471acfb896c4f73b825ccf971b5bc
- *     Visit online builder to build CKEditor, starting with the same setup as before.
- *
- * (3) http://ckeditor.com/builder/download/9b9471acfb896c4f73b825ccf971b5bc
- *     Straight download link to the latest version of CKEditor (Optimized) with the same setup as before.
- *
- * NOTE:
- *    This file is not used by CKEditor, you may remove it.
- *    Changing this file will not change your CKEditor configuration.
- */
-
-var CKBUILDER_CONFIG = {
-	skin: 'moono-lisa',
-	preset: 'basic',
-	ignore: [
-		'.bender',
-		'bender.js',
-		'bender-err.log',
-		'bender-out.log',
-		'dev',
-		'.DS_Store',
-		'.editorconfig',
-		'.gitattributes',
-		'.gitignore',
-		'gruntfile.js',
-		'.idea',
-		'.jscsrc',
-		'.jshintignore',
-		'.jshintrc',
-		'less',
-		'.mailmap',
-		'node_modules',
-		'package.json',
-		'README.md',
-		'tests'
-	],
-	plugins : {
-		'about' : 1,
-		'autolink' : 1,
-		'base64image' : 1,
-		'basicstyles' : 1,
-		'bidi' : 1,
-		'blockquote' : 1,
-		'clipboard' : 1,
-		'colorbutton' : 1,
-		'colordialog' : 1,
-		'divarea' : 1,
-		'enterkey' : 1,
-		'entities' : 1,
-		'floatingspace' : 1,
-		'font' : 1,
-		'image' : 1,
-		'image2' : 1,
-		'indentlist' : 1,
-		'link' : 1,
-		'list' : 1,
-		'maximize' : 1,
-		'pastebase64' : 1,
-		'quicktable' : 1,
-		'removeformat' : 1,
-		'sourcearea' : 1,
-		'toolbar' : 1,
-		'undo' : 1,
-		'wysiwygarea' : 1
-	},
-	languages : {
-		'af' : 1,
-		'ar' : 1,
-		'az' : 1,
-		'bg' : 1,
-		'bn' : 1,
-		'bs' : 1,
-		'ca' : 1,
-		'cs' : 1,
-		'cy' : 1,
-		'da' : 1,
-		'de' : 1,
-		'de-ch' : 1,
-		'el' : 1,
-		'en' : 1,
-		'en-au' : 1,
-		'en-ca' : 1,
-		'en-gb' : 1,
-		'eo' : 1,
-		'es' : 1,
-		'et' : 1,
-		'eu' : 1,
-		'fa' : 1,
-		'fi' : 1,
-		'fo' : 1,
-		'fr' : 1,
-		'fr-ca' : 1,
-		'gl' : 1,
-		'gu' : 1,
-		'he' : 1,
-		'hi' : 1,
-		'hr' : 1,
-		'hu' : 1,
-		'id' : 1,
-		'is' : 1,
-		'it' : 1,
-		'ja' : 1,
-		'ka' : 1,
-		'km' : 1,
-		'ko' : 1,
-		'ku' : 1,
-		'lt' : 1,
-		'lv' : 1,
-		'mk' : 1,
-		'mn' : 1,
-		'ms' : 1,
-		'nb' : 1,
-		'nl' : 1,
-		'no' : 1,
-		'oc' : 1,
-		'pl' : 1,
-		'pt' : 1,
-		'pt-br' : 1,
-		'ro' : 1,
-		'ru' : 1,
-		'si' : 1,
-		'sk' : 1,
-		'sl' : 1,
-		'sq' : 1,
-		'sr' : 1,
-		'sr-latn' : 1,
-		'sv' : 1,
-		'th' : 1,
-		'tr' : 1,
-		'tt' : 1,
-		'ug' : 1,
-		'uk' : 1,
-		'vi' : 1,
-		'zh' : 1,
-		'zh-cn' : 1
-	}
-};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/ckeditor.js b/plugins/ckeditor/src/ckeditor.js
deleted file mode 100644
index 75d808fcf..000000000
--- a/plugins/ckeditor/src/ckeditor.js
+++ /dev/null
@@ -1,1010 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){if(window.CKEDITOR&&window.CKEDITOR.dom)return;window.CKEDITOR||(window.CKEDITOR=function(){var a=/(^|.*[\\\/])ckeditor\.js(?:\?.*|;.*)?$/i,d={timestamp:"H0CG",version:"4.6.2",revision:"20af917",rnd:Math.floor(900*Math.random())+100,_:{pending:[],basePathSrcPattern:a},status:"unloaded",basePath:function(){var b=window.CKEDITOR_BASEPATH||"";if(!b)for(var c=document.getElementsByTagName("script"),d=0;d<c.length;d++){var h=c[d].src.match(a);if(h){b=h[1];break}}-1==b.indexOf(":/")&&"//"!=b.slice(0,2)&&(b=0===b.indexOf("/")?location.href.match(/^.*?:\/\/[^\/]*/)[0]+
-b:location.href.match(/^[^\?]*\/(?:)/)[0]+b);if(!b)throw'The CKEditor installation path could not be automatically detected. Please set the global variable "CKEDITOR_BASEPATH" before creating editor instances.';return b}(),getUrl:function(a){-1==a.indexOf(":/")&&0!==a.indexOf("/")&&(a=this.basePath+a);this.timestamp&&"/"!=a.charAt(a.length-1)&&!/[&?]t=/.test(a)&&(a+=(0<=a.indexOf("?")?"\x26":"?")+"t\x3d"+this.timestamp);return a},domReady:function(){function a(){try{document.addEventListener?(document.removeEventListener("DOMContentLoaded",
-a,!1),b()):document.attachEvent&&"complete"===document.readyState&&(document.detachEvent("onreadystatechange",a),b())}catch(c){}}function b(){for(var a;a=c.shift();)a()}var c=[];return function(b){function d(){try{document.documentElement.doScroll("left")}catch(f){setTimeout(d,1);return}a()}c.push(b);"complete"===document.readyState&&setTimeout(a,1);if(1==c.length)if(document.addEventListener)document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1);else if(document.attachEvent){document.attachEvent("onreadystatechange",
-a);window.attachEvent("onload",a);b=!1;try{b=!window.frameElement}catch(r){}document.documentElement.doScroll&&b&&d()}}}()},b=window.CKEDITOR_GETURL;if(b){var c=d.getUrl;d.getUrl=function(a){return b.call(d,a)||c.call(d,a)}}return d}());
-CKEDITOR.event||(CKEDITOR.event=function(){},CKEDITOR.event.implementOn=function(a){var d=CKEDITOR.event.prototype,b;for(b in d)null==a[b]&&(a[b]=d[b])},CKEDITOR.event.prototype=function(){function a(a){var e=d(this);return e[a]||(e[a]=new b(a))}var d=function(a){a=a.getPrivate&&a.getPrivate()||a._||(a._={});return a.events||(a.events={})},b=function(a){this.name=a;this.listeners=[]};b.prototype={getListenerIndex:function(a){for(var b=0,d=this.listeners;b<d.length;b++)if(d[b].fn==a)return b;return-1}};
-return{define:function(b,d){var g=a.call(this,b);CKEDITOR.tools.extend(g,d,!0)},on:function(b,d,g,k,h){function p(a,f,B,h){a={name:b,sender:this,editor:a,data:f,listenerData:k,stop:B,cancel:h,removeListener:r};return!1===d.call(g,a)?!1:a.data}function r(){B.removeListener(b,d)}var f=a.call(this,b);if(0>f.getListenerIndex(d)){f=f.listeners;g||(g=this);isNaN(h)&&(h=10);var B=this;p.fn=d;p.priority=h;for(var u=f.length-1;0<=u;u--)if(f[u].priority<=h)return f.splice(u+1,0,p),{removeListener:r};f.unshift(p)}return{removeListener:r}},
-once:function(){var a=Array.prototype.slice.call(arguments),b=a[1];a[1]=function(a){a.removeListener();return b.apply(this,arguments)};return this.on.apply(this,a)},capture:function(){CKEDITOR.event.useCapture=1;var a=this.on.apply(this,arguments);CKEDITOR.event.useCapture=0;return a},fire:function(){var a=0,b=function(){a=1},g=0,k=function(){g=1};return function(h,p,r){var f=d(this)[h];h=a;var B=g;a=g=0;if(f){var u=f.listeners;if(u.length)for(var u=u.slice(0),z,y=0;y<u.length;y++){if(f.errorProof)try{z=
-u[y].call(this,r,p,b,k)}catch(m){}else z=u[y].call(this,r,p,b,k);!1===z?g=1:"undefined"!=typeof z&&(p=z);if(a||g)break}}p=g?!1:"undefined"==typeof p?!0:p;a=h;g=B;return p}}(),fireOnce:function(a,b,g){b=this.fire(a,b,g);delete d(this)[a];return b},removeListener:function(a,b){var g=d(this)[a];if(g){var k=g.getListenerIndex(b);0<=k&&g.listeners.splice(k,1)}},removeAllListeners:function(){var a=d(this),b;for(b in a)delete a[b]},hasListeners:function(a){return(a=d(this)[a])&&0<a.listeners.length}}}());
-CKEDITOR.editor||(CKEDITOR.editor=function(){CKEDITOR._.pending.push([this,arguments]);CKEDITOR.event.call(this)},CKEDITOR.editor.prototype.fire=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fire.call(this,a,d,this)},CKEDITOR.editor.prototype.fireOnce=function(a,d){a in{instanceReady:1,loaded:1}&&(this[a]=!0);return CKEDITOR.event.prototype.fireOnce.call(this,a,d,this)},CKEDITOR.event.implementOn(CKEDITOR.editor.prototype));
-CKEDITOR.env||(CKEDITOR.env=function(){var a=navigator.userAgent.toLowerCase(),d=a.match(/edge[ \/](\d+.?\d*)/),b=-1<a.indexOf("trident/"),b=!(!d&&!b),b={ie:b,edge:!!d,webkit:!b&&-1<a.indexOf(" applewebkit/"),air:-1<a.indexOf(" adobeair/"),mac:-1<a.indexOf("macintosh"),quirks:"BackCompat"==document.compatMode&&(!document.documentMode||10>document.documentMode),mobile:-1<a.indexOf("mobile"),iOS:/(ipad|iphone|ipod)/.test(a),isCustomDomain:function(){if(!this.ie)return!1;var a=document.domain,b=window.location.hostname;
-return a!=b&&a!="["+b+"]"},secure:"https:"==location.protocol};b.gecko="Gecko"==navigator.product&&!b.webkit&&!b.ie;b.webkit&&(-1<a.indexOf("chrome")?b.chrome=!0:b.safari=!0);var c=0;b.ie&&(c=d?parseFloat(d[1]):b.quirks||!document.documentMode?parseFloat(a.match(/msie (\d+)/)[1]):document.documentMode,b.ie9Compat=9==c,b.ie8Compat=8==c,b.ie7Compat=7==c,b.ie6Compat=7>c||b.quirks);b.gecko&&(d=a.match(/rv:([\d\.]+)/))&&(d=d[1].split("."),c=1E4*d[0]+100*(d[1]||0)+1*(d[2]||0));b.air&&(c=parseFloat(a.match(/ adobeair\/(\d+)/)[1]));
-b.webkit&&(c=parseFloat(a.match(/ applewebkit\/(\d+)/)[1]));b.version=c;b.isCompatible=!(b.ie&&7>c)&&!(b.gecko&&4E4>c)&&!(b.webkit&&534>c);b.hidpi=2<=window.devicePixelRatio;b.needsBrFiller=b.gecko||b.webkit||b.ie&&10<c;b.needsNbspFiller=b.ie&&11>c;b.cssClass="cke_browser_"+(b.ie?"ie":b.gecko?"gecko":b.webkit?"webkit":"unknown");b.quirks&&(b.cssClass+=" cke_browser_quirks");b.ie&&(b.cssClass+=" cke_browser_ie"+(b.quirks?"6 cke_browser_iequirks":b.version));b.air&&(b.cssClass+=" cke_browser_air");
-b.iOS&&(b.cssClass+=" cke_browser_ios");b.hidpi&&(b.cssClass+=" cke_hidpi");return b}());
-"unloaded"==CKEDITOR.status&&function(){CKEDITOR.event.implementOn(CKEDITOR);CKEDITOR.loadFullCore=function(){if("basic_ready"!=CKEDITOR.status)CKEDITOR.loadFullCore._load=1;else{delete CKEDITOR.loadFullCore;var a=document.createElement("script");a.type="text/javascript";a.src=CKEDITOR.basePath+"ckeditor.js";document.getElementsByTagName("head")[0].appendChild(a)}};CKEDITOR.loadFullCoreTimeout=0;CKEDITOR.add=function(a){(this._.pending||(this._.pending=[])).push(a)};(function(){CKEDITOR.domReady(function(){var a=
-CKEDITOR.loadFullCore,d=CKEDITOR.loadFullCoreTimeout;a&&(CKEDITOR.status="basic_ready",a&&a._load?a():d&&setTimeout(function(){CKEDITOR.loadFullCore&&CKEDITOR.loadFullCore()},1E3*d))})})();CKEDITOR.status="basic_loaded"}();"use strict";CKEDITOR.VERBOSITY_WARN=1;CKEDITOR.VERBOSITY_ERROR=2;CKEDITOR.verbosity=CKEDITOR.VERBOSITY_WARN|CKEDITOR.VERBOSITY_ERROR;CKEDITOR.warn=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_WARN&&CKEDITOR.fire("log",{type:"warn",errorCode:a,additionalData:d})};
-CKEDITOR.error=function(a,d){CKEDITOR.verbosity&CKEDITOR.VERBOSITY_ERROR&&CKEDITOR.fire("log",{type:"error",errorCode:a,additionalData:d})};
-CKEDITOR.on("log",function(a){if(window.console&&window.console.log){var d=console[a.data.type]?a.data.type:"log",b=a.data.errorCode;if(a=a.data.additionalData)console[d]("[CKEDITOR] Error code: "+b+".",a);else console[d]("[CKEDITOR] Error code: "+b+".");console[d]("[CKEDITOR] For more information about this error go to http://docs.ckeditor.com/#!/guide/dev_errors-section-"+b)}},null,null,999);CKEDITOR.dom={};
-(function(){var a=[],d=CKEDITOR.env.gecko?"-moz-":CKEDITOR.env.webkit?"-webkit-":CKEDITOR.env.ie?"-ms-":"",b=/&/g,c=/>/g,e=/</g,g=/"/g,k=/&(lt|gt|amp|quot|nbsp|shy|#\d{1,5});/g,h={lt:"\x3c",gt:"\x3e",amp:"\x26",quot:'"',nbsp:" ",shy:"­"},p=function(a,f){return"#"==f[0]?String.fromCharCode(parseInt(f.slice(1),10)):h[f]};CKEDITOR.on("reset",function(){a=[]});CKEDITOR.tools={arrayCompare:function(a,f){if(!a&&!f)return!0;if(!a||!f||a.length!=f.length)return!1;for(var b=0;b<a.length;b++)if(a[b]!=f[b])return!1;
-return!0},getIndex:function(a,f){for(var b=0;b<a.length;++b)if(f(a[b]))return b;return-1},clone:function(a){var f;if(a&&a instanceof Array){f=[];for(var b=0;b<a.length;b++)f[b]=CKEDITOR.tools.clone(a[b]);return f}if(null===a||"object"!=typeof a||a instanceof String||a instanceof Number||a instanceof Boolean||a instanceof Date||a instanceof RegExp||a.nodeType||a.window===a)return a;f=new a.constructor;for(b in a)f[b]=CKEDITOR.tools.clone(a[b]);return f},capitalize:function(a,f){return a.charAt(0).toUpperCase()+
-(f?a.slice(1):a.slice(1).toLowerCase())},extend:function(a){var f=arguments.length,b,c;"boolean"==typeof(b=arguments[f-1])?f--:"boolean"==typeof(b=arguments[f-2])&&(c=arguments[f-1],f-=2);for(var h=1;h<f;h++){var d=arguments[h],m;for(m in d)if(!0===b||null==a[m])if(!c||m in c)a[m]=d[m]}return a},prototypedCopy:function(a){var f=function(){};f.prototype=a;return new f},copy:function(a){var f={},b;for(b in a)f[b]=a[b];return f},isArray:function(a){return"[object Array]"==Object.prototype.toString.call(a)},
-isEmpty:function(a){for(var f in a)if(a.hasOwnProperty(f))return!1;return!0},cssVendorPrefix:function(a,f,b){if(b)return d+a+":"+f+";"+a+":"+f;b={};b[a]=f;b[d+a]=f;return b},cssStyleToDomStyle:function(){var a=document.createElement("div").style,f="undefined"!=typeof a.cssFloat?"cssFloat":"undefined"!=typeof a.styleFloat?"styleFloat":"float";return function(a){return"float"==a?f:a.replace(/-./g,function(a){return a.substr(1).toUpperCase()})}}(),buildStyleHtml:function(a){a=[].concat(a);for(var f,
-b=[],c=0;c<a.length;c++)if(f=a[c])/@import|[{}]/.test(f)?b.push("\x3cstyle\x3e"+f+"\x3c/style\x3e"):b.push('\x3clink type\x3d"text/css" rel\x3dstylesheet href\x3d"'+f+'"\x3e');return b.join("")},htmlEncode:function(a){return void 0===a||null===a?"":String(a).replace(b,"\x26amp;").replace(c,"\x26gt;").replace(e,"\x26lt;")},htmlDecode:function(a){return a.replace(k,p)},htmlEncodeAttr:function(a){return CKEDITOR.tools.htmlEncode(a).replace(g,"\x26quot;")},htmlDecodeAttr:function(a){return CKEDITOR.tools.htmlDecode(a)},
-transformPlainTextToHtml:function(a,f){var b=f==CKEDITOR.ENTER_BR,c=this.htmlEncode(a.replace(/\r\n/g,"\n")),c=c.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;"),h=f==CKEDITOR.ENTER_P?"p":"div";if(!b){var d=/\n{2}/g;if(d.test(c))var m="\x3c"+h+"\x3e",p="\x3c/"+h+"\x3e",c=m+c.replace(d,function(){return p+m})+p}c=c.replace(/\n/g,"\x3cbr\x3e");b||(c=c.replace(new RegExp("\x3cbr\x3e(?\x3d\x3c/"+h+"\x3e)"),function(a){return CKEDITOR.tools.repeat(a,2)}));c=c.replace(/^ | $/g,"\x26nbsp;");return c=c.replace(/(>|\s) /g,
-function(a,f){return f+"\x26nbsp;"}).replace(/ (?=<)/g,"\x26nbsp;")},getNextNumber:function(){var a=0;return function(){return++a}}(),getNextId:function(){return"cke_"+this.getNextNumber()},getUniqueId:function(){for(var a="e",f=0;8>f;f++)a+=Math.floor(65536*(1+Math.random())).toString(16).substring(1);return a},override:function(a,f){var b=f(a);b.prototype=a.prototype;return b},setTimeout:function(a,f,b,c,h){h||(h=window);b||(b=h);return h.setTimeout(function(){c?a.apply(b,[].concat(c)):a.apply(b)},
-f||0)},trim:function(){var a=/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g;return function(f){return f.replace(a,"")}}(),ltrim:function(){var a=/^[ \t\n\r]+/g;return function(f){return f.replace(a,"")}}(),rtrim:function(){var a=/[ \t\n\r]+$/g;return function(f){return f.replace(a,"")}}(),indexOf:function(a,f){if("function"==typeof f)for(var b=0,c=a.length;b<c;b++){if(f(a[b]))return b}else{if(a.indexOf)return a.indexOf(f);b=0;for(c=a.length;b<c;b++)if(a[b]===f)return b}return-1},search:function(a,f){var b=CKEDITOR.tools.indexOf(a,
-f);return 0<=b?a[b]:null},bind:function(a,f){return function(){return a.apply(f,arguments)}},createClass:function(a){var f=a.$,b=a.base,c=a.privates||a._,h=a.proto;a=a.statics;!f&&(f=function(){b&&this.base.apply(this,arguments)});if(c)var d=f,f=function(){var a=this._||(this._={}),f;for(f in c){var b=c[f];a[f]="function"==typeof b?CKEDITOR.tools.bind(b,this):b}d.apply(this,arguments)};b&&(f.prototype=this.prototypedCopy(b.prototype),f.prototype.constructor=f,f.base=b,f.baseProto=b.prototype,f.prototype.base=
-function(){this.base=b.prototype.base;b.apply(this,arguments);this.base=arguments.callee});h&&this.extend(f.prototype,h,!0);a&&this.extend(f,a,!0);return f},addFunction:function(b,f){return a.push(function(){return b.apply(f||this,arguments)})-1},removeFunction:function(b){a[b]=null},callFunction:function(b){var f=a[b];return f&&f.apply(window,Array.prototype.slice.call(arguments,1))},cssLength:function(){var a=/^-?\d+\.?\d*px$/,f;return function(b){f=CKEDITOR.tools.trim(b+"")+"px";return a.test(f)?
-f:b||""}}(),convertToPx:function(){var a;return function(f){a||(a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"position:absolute;left:-9999px;top:-9999px;margin:0px;padding:0px;border:0px;"\x3e\x3c/div\x3e',CKEDITOR.document),CKEDITOR.document.getBody().append(a));return/%$/.test(f)?f:(a.setStyle("width",f),a.$.clientWidth)}}(),repeat:function(a,f){return Array(f+1).join(a)},tryThese:function(){for(var a,f=0,b=arguments.length;f<b;f++){var c=arguments[f];try{a=c();break}catch(h){}}return a},
-genKey:function(){return Array.prototype.slice.call(arguments).join("-")},defer:function(a){return function(){var f=arguments,b=this;window.setTimeout(function(){a.apply(b,f)},0)}},normalizeCssText:function(a,f){var b=[],c,h=CKEDITOR.tools.parseCssText(a,!0,f);for(c in h)b.push(c+":"+h[c]);b.sort();return b.length?b.join(";")+";":""},convertRgbToHex:function(a){return a.replace(/(?:rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\))/gi,function(a,b,c,h){a=[b,c,h];for(b=0;3>b;b++)a[b]=("0"+parseInt(a[b],10).toString(16)).slice(-2);
-return"#"+a.join("")})},normalizeHex:function(a){return a.replace(/#(([0-9a-f]{3}){1,2})($|;|\s+)/gi,function(a,b,c,h){a=b.toLowerCase();3==a.length&&(a=a.split(""),a=[a[0],a[0],a[1],a[1],a[2],a[2]].join(""));return"#"+a+h})},parseCssText:function(a,f,b){var c={};b&&(a=(new CKEDITOR.dom.element("span")).setAttribute("style",a).getAttribute("style")||"");a&&(a=CKEDITOR.tools.normalizeHex(CKEDITOR.tools.convertRgbToHex(a)));if(!a||";"==a)return c;a.replace(/&quot;/g,'"').replace(/\s*([^:;\s]+)\s*:\s*([^;]+)\s*(?=;|$)/g,
-function(a,b,h){f&&(b=b.toLowerCase(),"font-family"==b&&(h=h.replace(/\s*,\s*/g,",")),h=CKEDITOR.tools.trim(h));c[b]=h});return c},writeCssText:function(a,b){var c,h=[];for(c in a)h.push(c+":"+a[c]);b&&h.sort();return h.join("; ")},objectCompare:function(a,b,c){var h;if(!a&&!b)return!0;if(!a||!b)return!1;for(h in a)if(a[h]!=b[h])return!1;if(!c)for(h in b)if(a[h]!=b[h])return!1;return!0},objectKeys:function(a){var b=[],c;for(c in a)b.push(c);return b},convertArrayToObject:function(a,b){var c={};1==
-arguments.length&&(b=!0);for(var h=0,d=a.length;h<d;++h)c[a[h]]=b;return c},fixDomain:function(){for(var a;;)try{a=window.parent.document.domain;break}catch(b){a=a?a.replace(/.+?(?:\.|$)/,""):document.domain;if(!a)break;document.domain=a}return!!a},eventsBuffer:function(a,b,c){function h(){p=(new Date).getTime();d=!1;c?b.call(c):b()}var d,p=0;return{input:function(){if(!d){var b=(new Date).getTime()-p;b<a?d=setTimeout(h,a-b):h()}},reset:function(){d&&clearTimeout(d);d=p=0}}},enableHtml5Elements:function(a,
-b){for(var c="abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video".split(" "),h=c.length,d;h--;)d=a.createElement(c[h]),b&&a.appendChild(d)},checkIfAnyArrayItemMatches:function(a,b){for(var c=0,h=a.length;c<h;++c)if(a[c].match(b))return!0;return!1},checkIfAnyObjectPropertyMatches:function(a,b){for(var c in a)if(c.match(b))return!0;return!1},keystrokeToString:function(a,b){var c=b&16711680,h=
-b&65535,d=CKEDITOR.env.mac,p=[],m=[];c&CKEDITOR.CTRL&&(p.push(d?"⌘":a[17]),m.push(d?a[224]:a[17]));c&CKEDITOR.ALT&&(p.push(d?"⌥":a[18]),m.push(a[18]));c&CKEDITOR.SHIFT&&(p.push(d?"⇧":a[16]),m.push(a[16]));h&&(a[h]?(p.push(a[h]),m.push(a[h])):(p.push(String.fromCharCode(h)),m.push(String.fromCharCode(h))));return{display:p.join("+"),aria:m.join("+")}},transparentImageData:"data:image/gif;base64,R0lGODlhAQABAPABAP///wAAACH5BAEKAAAALAAAAAABAAEAAAICRAEAOw\x3d\x3d",getCookie:function(a){a=a.toLowerCase();
-for(var b=document.cookie.split(";"),c,h,d=0;d<b.length;d++)if(c=b[d].split("\x3d"),h=decodeURIComponent(CKEDITOR.tools.trim(c[0]).toLowerCase()),h===a)return decodeURIComponent(1<c.length?c[1]:"");return null},setCookie:function(a,b){document.cookie=encodeURIComponent(a)+"\x3d"+encodeURIComponent(b)+";path\x3d/"},getCsrfToken:function(){var a=CKEDITOR.tools.getCookie("ckCsrfToken");if(!a||40!=a.length){var a=[],b="";if(window.crypto&&window.crypto.getRandomValues)a=new Uint8Array(40),window.crypto.getRandomValues(a);
-else for(var c=0;40>c;c++)a.push(Math.floor(256*Math.random()));for(c=0;c<a.length;c++)var h="abcdefghijklmnopqrstuvwxyz0123456789".charAt(a[c]%36),b=b+(.5<Math.random()?h.toUpperCase():h);a=b;CKEDITOR.tools.setCookie("ckCsrfToken",a)}return a},escapeCss:function(a){return a?window.CSS&&CSS.escape?CSS.escape(a):isNaN(parseInt(a.charAt(0),10))?a:"\\3"+a.charAt(0)+" "+a.substring(1,a.length):""},style:{parse:{_colors:{aliceblue:"#F0F8FF",antiquewhite:"#FAEBD7",aqua:"#00FFFF",aquamarine:"#7FFFD4",azure:"#F0FFFF",
-beige:"#F5F5DC",bisque:"#FFE4C4",black:"#000000",blanchedalmond:"#FFEBCD",blue:"#0000FF",blueviolet:"#8A2BE2",brown:"#A52A2A",burlywood:"#DEB887",cadetblue:"#5F9EA0",chartreuse:"#7FFF00",chocolate:"#D2691E",coral:"#FF7F50",cornflowerblue:"#6495ED",cornsilk:"#FFF8DC",crimson:"#DC143C",cyan:"#00FFFF",darkblue:"#00008B",darkcyan:"#008B8B",darkgoldenrod:"#B8860B",darkgray:"#A9A9A9",darkgreen:"#006400",darkgrey:"#A9A9A9",darkkhaki:"#BDB76B",darkmagenta:"#8B008B",darkolivegreen:"#556B2F",darkorange:"#FF8C00",
-darkorchid:"#9932CC",darkred:"#8B0000",darksalmon:"#E9967A",darkseagreen:"#8FBC8F",darkslateblue:"#483D8B",darkslategray:"#2F4F4F",darkslategrey:"#2F4F4F",darkturquoise:"#00CED1",darkviolet:"#9400D3",deeppink:"#FF1493",deepskyblue:"#00BFFF",dimgray:"#696969",dimgrey:"#696969",dodgerblue:"#1E90FF",firebrick:"#B22222",floralwhite:"#FFFAF0",forestgreen:"#228B22",fuchsia:"#FF00FF",gainsboro:"#DCDCDC",ghostwhite:"#F8F8FF",gold:"#FFD700",goldenrod:"#DAA520",gray:"#808080",green:"#008000",greenyellow:"#ADFF2F",
-grey:"#808080",honeydew:"#F0FFF0",hotpink:"#FF69B4",indianred:"#CD5C5C",indigo:"#4B0082",ivory:"#FFFFF0",khaki:"#F0E68C",lavender:"#E6E6FA",lavenderblush:"#FFF0F5",lawngreen:"#7CFC00",lemonchiffon:"#FFFACD",lightblue:"#ADD8E6",lightcoral:"#F08080",lightcyan:"#E0FFFF",lightgoldenrodyellow:"#FAFAD2",lightgray:"#D3D3D3",lightgreen:"#90EE90",lightgrey:"#D3D3D3",lightpink:"#FFB6C1",lightsalmon:"#FFA07A",lightseagreen:"#20B2AA",lightskyblue:"#87CEFA",lightslategray:"#778899",lightslategrey:"#778899",lightsteelblue:"#B0C4DE",
-lightyellow:"#FFFFE0",lime:"#00FF00",limegreen:"#32CD32",linen:"#FAF0E6",magenta:"#FF00FF",maroon:"#800000",mediumaquamarine:"#66CDAA",mediumblue:"#0000CD",mediumorchid:"#BA55D3",mediumpurple:"#9370DB",mediumseagreen:"#3CB371",mediumslateblue:"#7B68EE",mediumspringgreen:"#00FA9A",mediumturquoise:"#48D1CC",mediumvioletred:"#C71585",midnightblue:"#191970",mintcream:"#F5FFFA",mistyrose:"#FFE4E1",moccasin:"#FFE4B5",navajowhite:"#FFDEAD",navy:"#000080",oldlace:"#FDF5E6",olive:"#808000",olivedrab:"#6B8E23",
-orange:"#FFA500",orangered:"#FF4500",orchid:"#DA70D6",palegoldenrod:"#EEE8AA",palegreen:"#98FB98",paleturquoise:"#AFEEEE",palevioletred:"#DB7093",papayawhip:"#FFEFD5",peachpuff:"#FFDAB9",peru:"#CD853F",pink:"#FFC0CB",plum:"#DDA0DD",powderblue:"#B0E0E6",purple:"#800080",rebeccapurple:"#663399",red:"#FF0000",rosybrown:"#BC8F8F",royalblue:"#4169E1",saddlebrown:"#8B4513",salmon:"#FA8072",sandybrown:"#F4A460",seagreen:"#2E8B57",seashell:"#FFF5EE",sienna:"#A0522D",silver:"#C0C0C0",skyblue:"#87CEEB",slateblue:"#6A5ACD",
-slategray:"#708090",slategrey:"#708090",snow:"#FFFAFA",springgreen:"#00FF7F",steelblue:"#4682B4",tan:"#D2B48C",teal:"#008080",thistle:"#D8BFD8",tomato:"#FF6347",turquoise:"#40E0D0",violet:"#EE82EE",wheat:"#F5DEB3",white:"#FFFFFF",whitesmoke:"#F5F5F5",yellow:"#FFFF00",yellowgreen:"#9ACD32"},_rgbaRegExp:/rgba?\(\s*\d+%?\s*,\s*\d+%?\s*,\s*\d+%?\s*(?:,\s*[0-9.]+\s*)?\)/gi,_hslaRegExp:/hsla?\(\s*[0-9.]+\s*,\s*\d+%\s*,\s*\d+%\s*(?:,\s*[0-9.]+\s*)?\)/gi,background:function(a){var b=[],c=[],c=this._findColor(a);
-c.length&&(b.color=c[0],CKEDITOR.tools.array.forEach(c,function(b){a=a.replace(b,"")}));if(a=CKEDITOR.tools.trim(a))b.unprocessed=a;return b},margin:function(a){function b(a){c.top=h[a[0]];c.right=h[a[1]];c.bottom=h[a[2]];c.left=h[a[3]]}var c={},h=a.match(/(?:\-?[\.\d]+(?:%|\w*)|auto|inherit|initial|unset)/g)||["0px"];switch(h.length){case 1:b([0,0,0,0]);break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}return c},_findColor:function(a){var b=[],c=CKEDITOR.tools.array,b=
-b.concat(a.match(this._rgbaRegExp)||[]),b=b.concat(a.match(this._hslaRegExp)||[]);return b=b.concat(c.filter(a.split(/\s+/),function(a){return a.match(/^\#[a-f0-9]{3}(?:[a-f0-9]{3})?$/gi)?!0:a.toLowerCase()in CKEDITOR.tools.style.parse._colors}))}}},array:{filter:function(a,b,c){var h=[];this.forEach(a,function(d,p){b.call(c,d,p,a)&&h.push(d)});return h},forEach:function(a,b,c){var h=a.length,d;for(d=0;d<h;d++)b.call(c,a[d],d,a)},map:function(a,b,c){for(var h=[],d=0;d<a.length;d++)h.push(b.call(c,
-a[d],d,a));return h},reduce:function(a,b,c,h){for(var d=0;d<a.length;d++)c=b.call(h,c,a[d],d,a);return c}}};CKEDITOR.tools.array.indexOf=CKEDITOR.tools.indexOf;CKEDITOR.tools.array.isArray=CKEDITOR.tools.isArray})();
-CKEDITOR.dtd=function(){var a=CKEDITOR.tools.extend,d=function(a,b){for(var c=CKEDITOR.tools.clone(a),h=1;h<arguments.length;h++){b=arguments[h];for(var d in b)delete c[d]}return c},b={},c={},e={address:1,article:1,aside:1,blockquote:1,details:1,div:1,dl:1,fieldset:1,figure:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,hr:1,main:1,menu:1,nav:1,ol:1,p:1,pre:1,section:1,table:1,ul:1},g={command:1,link:1,meta:1,noscript:1,script:1,style:1},k={},h={"#":1},p={center:1,dir:1,noframes:1};
-a(b,{a:1,abbr:1,area:1,audio:1,b:1,bdi:1,bdo:1,br:1,button:1,canvas:1,cite:1,code:1,command:1,datalist:1,del:1,dfn:1,em:1,embed:1,i:1,iframe:1,img:1,input:1,ins:1,kbd:1,keygen:1,label:1,map:1,mark:1,meter:1,noscript:1,object:1,output:1,progress:1,q:1,ruby:1,s:1,samp:1,script:1,select:1,small:1,span:1,strong:1,sub:1,sup:1,textarea:1,time:1,u:1,"var":1,video:1,wbr:1},h,{acronym:1,applet:1,basefont:1,big:1,font:1,isindex:1,strike:1,style:1,tt:1});a(c,e,b,p);d={a:d(b,{a:1,button:1}),abbr:b,address:c,
-area:k,article:c,aside:c,audio:a({source:1,track:1},c),b:b,base:k,bdi:b,bdo:b,blockquote:c,body:c,br:k,button:d(b,{a:1,button:1}),canvas:b,caption:c,cite:b,code:b,col:k,colgroup:{col:1},command:k,datalist:a({option:1},b),dd:c,del:b,details:a({summary:1},c),dfn:b,div:c,dl:{dt:1,dd:1},dt:c,em:b,embed:k,fieldset:a({legend:1},c),figcaption:c,figure:a({figcaption:1},c),footer:c,form:c,h1:b,h2:b,h3:b,h4:b,h5:b,h6:b,head:a({title:1,base:1},g),header:c,hgroup:{h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},hr:k,html:a({head:1,
-body:1},c,g),i:b,iframe:h,img:k,input:k,ins:b,kbd:b,keygen:k,label:b,legend:b,li:c,link:k,main:c,map:c,mark:b,menu:a({li:1},c),meta:k,meter:d(b,{meter:1}),nav:c,noscript:a({link:1,meta:1,style:1},b),object:a({param:1},b),ol:{li:1},optgroup:{option:1},option:h,output:b,p:b,param:k,pre:b,progress:d(b,{progress:1}),q:b,rp:b,rt:b,ruby:a({rp:1,rt:1},b),s:b,samp:b,script:h,section:c,select:{optgroup:1,option:1},small:b,source:k,span:b,strong:b,style:h,sub:b,summary:a({h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},b),
-sup:b,table:{caption:1,colgroup:1,thead:1,tfoot:1,tbody:1,tr:1},tbody:{tr:1},td:c,textarea:h,tfoot:{tr:1},th:c,thead:{tr:1},time:d(b,{time:1}),title:h,tr:{th:1,td:1},track:k,u:b,ul:{li:1},"var":b,video:a({source:1,track:1},c),wbr:k,acronym:b,applet:a({param:1},c),basefont:k,big:b,center:c,dialog:k,dir:{li:1},font:b,isindex:k,noframes:c,strike:b,tt:b};a(d,{$block:a({audio:1,dd:1,dt:1,figcaption:1,li:1,video:1},e,p),$blockLimit:{article:1,aside:1,audio:1,body:1,caption:1,details:1,dir:1,div:1,dl:1,
-fieldset:1,figcaption:1,figure:1,footer:1,form:1,header:1,hgroup:1,main:1,menu:1,nav:1,ol:1,section:1,table:1,td:1,th:1,tr:1,ul:1,video:1},$cdata:{script:1,style:1},$editable:{address:1,article:1,aside:1,blockquote:1,body:1,details:1,div:1,fieldset:1,figcaption:1,footer:1,form:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,header:1,hgroup:1,main:1,nav:1,p:1,pre:1,section:1},$empty:{area:1,base:1,basefont:1,br:1,col:1,command:1,dialog:1,embed:1,hr:1,img:1,input:1,isindex:1,keygen:1,link:1,meta:1,param:1,source:1,
-track:1,wbr:1},$inline:b,$list:{dl:1,ol:1,ul:1},$listItem:{dd:1,dt:1,li:1},$nonBodyContent:a({body:1,head:1,html:1},d.head),$nonEditable:{applet:1,audio:1,button:1,embed:1,iframe:1,map:1,object:1,option:1,param:1,script:1,textarea:1,video:1},$object:{applet:1,audio:1,button:1,hr:1,iframe:1,img:1,input:1,object:1,select:1,table:1,textarea:1,video:1},$removeEmpty:{abbr:1,acronym:1,b:1,bdi:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,mark:1,meter:1,output:1,q:1,ruby:1,
-s:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,time:1,tt:1,u:1,"var":1},$tabIndex:{a:1,area:1,button:1,input:1,object:1,select:1,textarea:1},$tableContent:{caption:1,col:1,colgroup:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1},$transparent:{a:1,audio:1,canvas:1,del:1,ins:1,map:1,noscript:1,object:1,video:1},$intermediate:{caption:1,colgroup:1,dd:1,dt:1,figcaption:1,legend:1,li:1,optgroup:1,option:1,rp:1,rt:1,summary:1,tbody:1,td:1,tfoot:1,th:1,thead:1,tr:1}});return d}();
-CKEDITOR.dom.event=function(a){this.$=a};
-CKEDITOR.dom.event.prototype={getKey:function(){return this.$.keyCode||this.$.which},getKeystroke:function(){var a=this.getKey();if(this.$.ctrlKey||this.$.metaKey)a+=CKEDITOR.CTRL;this.$.shiftKey&&(a+=CKEDITOR.SHIFT);this.$.altKey&&(a+=CKEDITOR.ALT);return a},preventDefault:function(a){var d=this.$;d.preventDefault();a&&this.stopPropagation()},stopPropagation:function(){var a=this.$;a.stopPropagation()},getTarget:function(){var a=
-this.$.target||this.$.srcElement;return a?new CKEDITOR.dom.node(a):null},getPhase:function(){return this.$.eventPhase||2},getPageOffset:function(){var a=this.getTarget().getDocument().$;return{x:this.$.pageX||this.$.clientX+(a.documentElement.scrollLeft||a.body.scrollLeft),y:this.$.pageY||this.$.clientY+(a.documentElement.scrollTop||a.body.scrollTop)}}};CKEDITOR.CTRL=1114112;CKEDITOR.SHIFT=2228224;CKEDITOR.ALT=4456448;CKEDITOR.EVENT_PHASE_CAPTURING=1;CKEDITOR.EVENT_PHASE_AT_TARGET=2;
-CKEDITOR.EVENT_PHASE_BUBBLING=3;CKEDITOR.dom.domObject=function(a){a&&(this.$=a)};
-CKEDITOR.dom.domObject.prototype=function(){var a=function(a,b){return function(c){"undefined"!=typeof CKEDITOR&&a.fire(b,new CKEDITOR.dom.event(c))}};return{getPrivate:function(){var a;(a=this.getCustomData("_"))||this.setCustomData("_",a={});return a},on:function(d){var b=this.getCustomData("_cke_nativeListeners");b||(b={},this.setCustomData("_cke_nativeListeners",b));b[d]||(b=b[d]=a(this,d),this.$.addEventListener?this.$.addEventListener(d,b,!!CKEDITOR.event.useCapture):this.$.attachEvent&&this.$.attachEvent("on"+
-d,b));return CKEDITOR.event.prototype.on.apply(this,arguments)},removeListener:function(a){CKEDITOR.event.prototype.removeListener.apply(this,arguments);if(!this.hasListeners(a)){var b=this.getCustomData("_cke_nativeListeners"),c=b&&b[a];c&&(this.$.removeEventListener?this.$.removeEventListener(a,c,!1):this.$.detachEvent&&this.$.detachEvent("on"+a,c),delete b[a])}},removeAllListeners:function(){var a=this.getCustomData("_cke_nativeListeners"),b;for(b in a){var c=a[b];this.$.detachEvent?this.$.detachEvent("on"+
-b,c):this.$.removeEventListener&&this.$.removeEventListener(b,c,!1);delete a[b]}CKEDITOR.event.prototype.removeAllListeners.call(this)}}}();
-(function(a){var d={};CKEDITOR.on("reset",function(){d={}});a.equals=function(a){try{return a&&a.$===this.$}catch(c){return!1}};a.setCustomData=function(a,c){var e=this.getUniqueId();(d[e]||(d[e]={}))[a]=c;return this};a.getCustomData=function(a){var c=this.$["data-cke-expando"];return(c=c&&d[c])&&a in c?c[a]:null};a.removeCustomData=function(a){var c=this.$["data-cke-expando"],c=c&&d[c],e,g;c&&(e=c[a],g=a in c,delete c[a]);return g?e:null};a.clearCustomData=function(){this.removeAllListeners();var a=
-this.$["data-cke-expando"];a&&delete d[a]};a.getUniqueId=function(){return this.$["data-cke-expando"]||(this.$["data-cke-expando"]=CKEDITOR.tools.getNextNumber())};CKEDITOR.event.implementOn(a)})(CKEDITOR.dom.domObject.prototype);
-CKEDITOR.dom.node=function(a){return a?new CKEDITOR.dom[a.nodeType==CKEDITOR.NODE_DOCUMENT?"document":a.nodeType==CKEDITOR.NODE_ELEMENT?"element":a.nodeType==CKEDITOR.NODE_TEXT?"text":a.nodeType==CKEDITOR.NODE_COMMENT?"comment":a.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT?"documentFragment":"domObject"](a):this};CKEDITOR.dom.node.prototype=new CKEDITOR.dom.domObject;CKEDITOR.NODE_ELEMENT=1;CKEDITOR.NODE_DOCUMENT=9;CKEDITOR.NODE_TEXT=3;CKEDITOR.NODE_COMMENT=8;CKEDITOR.NODE_DOCUMENT_FRAGMENT=11;
-CKEDITOR.POSITION_IDENTICAL=0;CKEDITOR.POSITION_DISCONNECTED=1;CKEDITOR.POSITION_FOLLOWING=2;CKEDITOR.POSITION_PRECEDING=4;CKEDITOR.POSITION_IS_CONTAINED=8;CKEDITOR.POSITION_CONTAINS=16;
-CKEDITOR.tools.extend(CKEDITOR.dom.node.prototype,{appendTo:function(a,d){a.append(this,d);return a},clone:function(a,d){function b(c){c["data-cke-expando"]&&(c["data-cke-expando"]=!1);if(c.nodeType==CKEDITOR.NODE_ELEMENT||c.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)if(d||c.nodeType!=CKEDITOR.NODE_ELEMENT||c.removeAttribute("id",!1),a){c=c.childNodes;for(var e=0;e<c.length;e++)b(c[e])}}function c(b){if(b.type==CKEDITOR.NODE_ELEMENT||b.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT){if(b.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=
-b.getName();":"==d[0]&&b.renameNode(d.substring(1))}if(a)for(d=0;d<b.getChildCount();d++)c(b.getChild(d))}}var e=this.$.cloneNode(a);b(e);e=new CKEDITOR.dom.node(e);CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(this.type==CKEDITOR.NODE_ELEMENT||this.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)&&c(e);return e},hasPrevious:function(){return!!this.$.previousSibling},hasNext:function(){return!!this.$.nextSibling},insertAfter:function(a){a.$.parentNode.insertBefore(this.$,a.$.nextSibling);return a},insertBefore:function(a){a.$.parentNode.insertBefore(this.$,
-a.$);return a},insertBeforeMe:function(a){this.$.parentNode.insertBefore(a.$,this.$);return a},getAddress:function(a){for(var d=[],b=this.getDocument().$.documentElement,c=this.$;c&&c!=b;){var e=c.parentNode;e&&d.unshift(this.getIndex.call({$:c},a));c=e}return d},getDocument:function(){return new CKEDITOR.dom.document(this.$.ownerDocument||this.$.parentNode.ownerDocument)},getIndex:function(a){function d(a,c){var p=c?a.nextSibling:a.previousSibling;return p&&p.nodeType==CKEDITOR.NODE_TEXT?b(p)?d(p,
-c):p:null}function b(a){return!a.nodeValue||a.nodeValue==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE}var c=this.$,e=-1,g;if(!this.$.parentNode||a&&c.nodeType==CKEDITOR.NODE_TEXT&&b(c)&&!d(c)&&!d(c,!0))return-1;do a&&c!=this.$&&c.nodeType==CKEDITOR.NODE_TEXT&&(g||b(c))||(e++,g=c.nodeType==CKEDITOR.NODE_TEXT);while(c=c.previousSibling);return e},getNextSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getFirst&&this.getFirst();var e;if(!a){if(this.type==
-CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getNext()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===b(e,!0))return null;a=e.getNext()}return!a||b&&!1===b(a)?null:d&&d!=a.type?a.getNextSourceNode(!1,d,b):a},getPreviousSourceNode:function(a,d,b){if(b&&!b.call){var c=b;b=function(a){return!a.equals(c)}}a=!a&&this.getLast&&this.getLast();var e;if(!a){if(this.type==CKEDITOR.NODE_ELEMENT&&b&&!1===b(this,!0))return null;a=this.getPrevious()}for(;!a&&(e=(e||this).getParent());){if(b&&!1===
-b(e,!0))return null;a=e.getPrevious()}return!a||b&&!1===b(a)?null:d&&a.type!=d?a.getPreviousSourceNode(!1,d,b):a},getPrevious:function(a){var d=this.$,b;do b=(d=d.previousSibling)&&10!=d.nodeType&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getNext:function(a){var d=this.$,b;do b=(d=d.nextSibling)&&new CKEDITOR.dom.node(d);while(b&&a&&!a(b));return b},getParent:function(a){var d=this.$.parentNode;return d&&(d.nodeType==CKEDITOR.NODE_ELEMENT||a&&d.nodeType==CKEDITOR.NODE_DOCUMENT_FRAGMENT)?
-new CKEDITOR.dom.node(d):null},getParents:function(a){var d=this,b=[];do b[a?"push":"unshift"](d);while(d=d.getParent());return b},getCommonAncestor:function(a){if(a.equals(this))return this;if(a.contains&&a.contains(this))return a;var d=this.contains?this:this.getParent();do if(d.contains(a))return d;while(d=d.getParent());return null},getPosition:function(a){var d=this.$,b=a.$;if(d.compareDocumentPosition)return d.compareDocumentPosition(b);if(d==b)return CKEDITOR.POSITION_IDENTICAL;if(this.type==
-CKEDITOR.NODE_ELEMENT&&a.type==CKEDITOR.NODE_ELEMENT){if(d.contains){if(d.contains(b))return CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING;if(b.contains(d))return CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING}if("sourceIndex"in d)return 0>d.sourceIndex||0>b.sourceIndex?CKEDITOR.POSITION_DISCONNECTED:d.sourceIndex<b.sourceIndex?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING}d=this.getAddress();a=a.getAddress();for(var b=Math.min(d.length,a.length),c=0;c<b;c++)if(d[c]!=
-a[c])return d[c]<a[c]?CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_FOLLOWING;return d.length<a.length?CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_PRECEDING:CKEDITOR.POSITION_IS_CONTAINED+CKEDITOR.POSITION_FOLLOWING},getAscendant:function(a,d){var b=this.$,c,e;d||(b=b.parentNode);"function"==typeof a?(e=!0,c=a):(e=!1,c=function(b){b="string"==typeof b.nodeName?b.nodeName.toLowerCase():"";return"string"==typeof a?b==a:b in a});for(;b;){if(c(e?new CKEDITOR.dom.node(b):b))return new CKEDITOR.dom.node(b);
-try{b=b.parentNode}catch(g){b=null}}return null},hasAscendant:function(a,d){var b=this.$;d||(b=b.parentNode);for(;b;){if(b.nodeName&&b.nodeName.toLowerCase()==a)return!0;b=b.parentNode}return!1},move:function(a,d){a.append(this.remove(),d)},remove:function(a){var d=this.$,b=d.parentNode;if(b){if(a)for(;a=d.firstChild;)b.insertBefore(d.removeChild(a),d);b.removeChild(d)}return this},replace:function(a){this.insertBefore(a);a.remove()},trim:function(){this.ltrim();this.rtrim()},ltrim:function(){for(var a;this.getFirst&&
-(a=this.getFirst());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.ltrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(b-d.length),this.$.removeChild(this.$.firstChild));else{a.remove();continue}}break}},rtrim:function(){for(var a;this.getLast&&(a=this.getLast());){if(a.type==CKEDITOR.NODE_TEXT){var d=CKEDITOR.tools.rtrim(a.getText()),b=a.getLength();if(d)d.length<b&&(a.split(d.length),this.$.lastChild.parentNode.removeChild(this.$.lastChild));else{a.remove();continue}}break}CKEDITOR.env.needsBrFiller&&
-(a=this.$.lastChild)&&1==a.type&&"br"==a.nodeName.toLowerCase()&&a.parentNode.removeChild(a)},isReadOnly:function(a){var d=this;this.type!=CKEDITOR.NODE_ELEMENT&&(d=this.getParent());CKEDITOR.env.edge&&d&&d.is("textarea","input")&&(a=!0);if(!a&&d&&"undefined"!=typeof d.$.isContentEditable)return!(d.$.isContentEditable||d.data("cke-editable"));for(;d;){if(d.data("cke-editable"))return!1;if(d.hasAttribute("contenteditable"))return"false"==d.getAttribute("contenteditable");d=d.getParent()}return!0}});
-CKEDITOR.dom.window=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.window.prototype=new CKEDITOR.dom.domObject;
-CKEDITOR.tools.extend(CKEDITOR.dom.window.prototype,{focus:function(){this.$.focus()},getViewPaneSize:function(){var a=this.$.document,d="CSS1Compat"==a.compatMode;return{width:(d?a.documentElement.clientWidth:a.body.clientWidth)||0,height:(d?a.documentElement.clientHeight:a.body.clientHeight)||0}},getScrollPosition:function(){var a=this.$;if("pageXOffset"in a)return{x:a.pageXOffset||0,y:a.pageYOffset||0};a=a.document;return{x:a.documentElement.scrollLeft||a.body.scrollLeft||0,y:a.documentElement.scrollTop||
-a.body.scrollTop||0}},getFrame:function(){var a=this.$.frameElement;return a?new CKEDITOR.dom.element.get(a):null}});CKEDITOR.dom.document=function(a){CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.document.prototype=new CKEDITOR.dom.domObject;
-CKEDITOR.tools.extend(CKEDITOR.dom.document.prototype,{type:CKEDITOR.NODE_DOCUMENT,appendStyleSheet:function(a){if(this.$.createStyleSheet)this.$.createStyleSheet(a);else{var d=new CKEDITOR.dom.element("link");d.setAttributes({rel:"stylesheet",type:"text/css",href:a});this.getHead().append(d)}},appendStyleText:function(a){if(this.$.createStyleSheet){var d=this.$.createStyleSheet("");d.cssText=a}else{var b=new CKEDITOR.dom.element("style",this);b.append(new CKEDITOR.dom.text(a,this));this.getHead().append(b)}return d||
-b.$.sheet},createElement:function(a,d){var b=new CKEDITOR.dom.element(a,this);d&&(d.attributes&&b.setAttributes(d.attributes),d.styles&&b.setStyles(d.styles));return b},createText:function(a){return new CKEDITOR.dom.text(a,this)},focus:function(){this.getWindow().focus()},getActive:function(){var a;try{a=this.$.activeElement}catch(d){return null}return new CKEDITOR.dom.element(a)},getById:function(a){return(a=this.$.getElementById(a))?new CKEDITOR.dom.element(a):null},getByAddress:function(a,d){for(var b=
-this.$.documentElement,c=0;b&&c<a.length;c++){var e=a[c];if(d)for(var g=-1,k=0;k<b.childNodes.length;k++){var h=b.childNodes[k];if(!0!==d||3!=h.nodeType||!h.previousSibling||3!=h.previousSibling.nodeType)if(g++,g==e){b=h;break}}else b=b.childNodes[e]}return b?new CKEDITOR.dom.node(b):null},getElementsByTag:function(a,d){CKEDITOR.env.ie&&8>=document.documentMode||!d||(a=d+":"+a);return new CKEDITOR.dom.nodeList(this.$.getElementsByTagName(a))},getHead:function(){var a=this.$.getElementsByTagName("head")[0];
-return a=a?new CKEDITOR.dom.element(a):this.getDocumentElement().append(new CKEDITOR.dom.element("head"),!0)},getBody:function(){return new CKEDITOR.dom.element(this.$.body)},getDocumentElement:function(){return new CKEDITOR.dom.element(this.$.documentElement)},getWindow:function(){return new CKEDITOR.dom.window(this.$.parentWindow||this.$.defaultView)},write:function(a){this.$.open("text/html","replace");CKEDITOR.env.ie&&(a=a.replace(/(?:^\s*<!DOCTYPE[^>]*?>)|^/i,'$\x26\n\x3cscript data-cke-temp\x3d"1"\x3e('+
-CKEDITOR.tools.fixDomain+")();\x3c/script\x3e"));this.$.write(a);this.$.close()},find:function(a){return new CKEDITOR.dom.nodeList(this.$.querySelectorAll(a))},findOne:function(a){return(a=this.$.querySelector(a))?new CKEDITOR.dom.element(a):null},_getHtml5ShivFrag:function(){var a=this.getCustomData("html5ShivFrag");a||(a=this.$.createDocumentFragment(),CKEDITOR.tools.enableHtml5Elements(a,!0),this.setCustomData("html5ShivFrag",a));return a}});CKEDITOR.dom.nodeList=function(a){this.$=a};
-CKEDITOR.dom.nodeList.prototype={count:function(){return this.$.length},getItem:function(a){return 0>a||a>=this.$.length?null:(a=this.$[a])?new CKEDITOR.dom.node(a):null}};CKEDITOR.dom.element=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createElement(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.element.get=function(a){return(a="string"==typeof a?document.getElementById(a)||document.getElementsByName(a)[0]:a)&&(a.$?a:new CKEDITOR.dom.element(a))};CKEDITOR.dom.element.prototype=new CKEDITOR.dom.node;
-CKEDITOR.dom.element.createFromHtml=function(a,d){var b=new CKEDITOR.dom.element("div",d);b.setHtml(a);return b.getFirst().remove()};CKEDITOR.dom.element.setMarker=function(a,d,b,c){var e=d.getCustomData("list_marker_id")||d.setCustomData("list_marker_id",CKEDITOR.tools.getNextNumber()).getCustomData("list_marker_id"),g=d.getCustomData("list_marker_names")||d.setCustomData("list_marker_names",{}).getCustomData("list_marker_names");a[e]=d;g[b]=1;return d.setCustomData(b,c)};
-CKEDITOR.dom.element.clearAllMarkers=function(a){for(var d in a)CKEDITOR.dom.element.clearMarkers(a,a[d],1)};CKEDITOR.dom.element.clearMarkers=function(a,d,b){var c=d.getCustomData("list_marker_names"),e=d.getCustomData("list_marker_id"),g;for(g in c)d.removeCustomData(g);d.removeCustomData("list_marker_names");b&&(d.removeCustomData("list_marker_id"),delete a[e])};
-(function(){function a(a,b){return-1<(" "+a+" ").replace(g," ").indexOf(" "+b+" ")}function d(a){var b=!0;a.$.id||(a.$.id="cke_tmp_"+CKEDITOR.tools.getNextNumber(),b=!1);return function(){b||a.removeAttribute("id")}}function b(a,b){var c=CKEDITOR.tools.escapeCss(a.$.id);return"#"+c+" "+b.split(/,\s*/).join(", #"+c+" ")}function c(a){for(var b=0,c=0,f=k[a].length;c<f;c++)b+=parseFloat(this.getComputedStyle(k[a][c])||0,10)||0;return b}var e=document.createElement("_").classList,e="undefined"!==typeof e&&
-null!==String(e.add).match(/\[Native code\]/gi),g=/[\n\t\r]/g;CKEDITOR.tools.extend(CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_ELEMENT,addClass:e?function(a){this.$.classList.add(a);return this}:function(b){var c=this.$.className;c&&(a(c,b)||(c+=" "+b));this.$.className=c||b;return this},removeClass:e?function(a){var b=this.$;b.classList.remove(a);b.className||b.removeAttribute("class");return this}:function(b){var c=this.getAttribute("class");c&&a(c,b)&&((c=c.replace(new RegExp("(?:^|\\s+)"+
-b+"(?\x3d\\s|$)"),"").replace(/^\s+/,""))?this.setAttribute("class",c):this.removeAttribute("class"));return this},hasClass:function(b){return a(this.$.className,b)},append:function(a,b){"string"==typeof a&&(a=this.getDocument().createElement(a));b?this.$.insertBefore(a.$,this.$.firstChild):this.$.appendChild(a.$);return a},appendHtml:function(a){if(this.$.childNodes.length){var b=new CKEDITOR.dom.element("div",this.getDocument());b.setHtml(a);b.moveChildren(this)}else this.setHtml(a)},appendText:function(a){null!=
-this.$.text&&CKEDITOR.env.ie&&9>CKEDITOR.env.version?this.$.text+=a:this.append(new CKEDITOR.dom.text(a))},appendBogus:function(a){if(a||CKEDITOR.env.needsBrFiller){for(a=this.getLast();a&&a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.rtrim(a.getText());)a=a.getPrevious();a&&a.is&&a.is("br")||(a=this.getDocument().createElement("br"),CKEDITOR.env.gecko&&a.setAttribute("type","_moz"),this.append(a))}},breakParent:function(a,b){var c=new CKEDITOR.dom.range(this.getDocument());c.setStartAfter(this);c.setEndAfter(a);
-var f=c.extractContents(!1,b||!1),d;c.insertNode(this.remove());if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){for(c=new CKEDITOR.dom.element("div");d=f.getFirst();)d.$.style.backgroundColor&&(d.$.style.backgroundColor=d.$.style.backgroundColor),c.append(d);c.insertAfter(this);c.remove(!0)}else f.insertAfterNode(this)},contains:document.compareDocumentPosition?function(a){return!!(this.$.compareDocumentPosition(a.$)&16)}:function(a){var b=this.$;return a.type!=CKEDITOR.NODE_ELEMENT?b.contains(a.getParent().$):
-b!=a.$&&b.contains(a.$)},focus:function(){function a(){try{this.$.focus()}catch(b){}}return function(b){b?CKEDITOR.tools.setTimeout(a,100,this):a.call(this)}}(),getHtml:function(){var a=this.$.innerHTML;return CKEDITOR.env.ie?a.replace(/<\?[^>]*>/g,""):a},getOuterHtml:function(){if(this.$.outerHTML)return this.$.outerHTML.replace(/<\?[^>]*>/,"");var a=this.$.ownerDocument.createElement("div");a.appendChild(this.$.cloneNode(!0));return a.innerHTML},getClientRect:function(){var a=CKEDITOR.tools.extend({},
-this.$.getBoundingClientRect());!a.width&&(a.width=a.right-a.left);!a.height&&(a.height=a.bottom-a.top);return a},setHtml:CKEDITOR.env.ie&&9>CKEDITOR.env.version?function(a){try{var b=this.$;if(this.getParent())return b.innerHTML=a;var c=this.getDocument()._getHtml5ShivFrag();c.appendChild(b);b.innerHTML=a;c.removeChild(b);return a}catch(f){this.$.innerHTML="";b=new CKEDITOR.dom.element("body",this.getDocument());b.$.innerHTML=a;for(b=b.getChildren();b.count();)this.append(b.getItem(0));return a}}:
-function(a){return this.$.innerHTML=a},setText:function(){var a=document.createElement("p");a.innerHTML="x";a=a.textContent;return function(b){this.$[a?"textContent":"innerText"]=b}}(),getAttribute:function(){var a=function(a){return this.$.getAttribute(a,2)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){switch(a){case "class":a="className";break;case "http-equiv":a="httpEquiv";break;case "name":return this.$.name;case "tabindex":return a=this.$.getAttribute(a,
-2),0!==a&&0===this.$.tabIndex&&(a=null),a;case "checked":return a=this.$.attributes.getNamedItem(a),(a.specified?a.nodeValue:this.$.checked)?"checked":null;case "hspace":case "value":return this.$[a];case "style":return this.$.style.cssText;case "contenteditable":case "contentEditable":return this.$.attributes.getNamedItem("contentEditable").specified?this.$.getAttribute("contentEditable"):null}return this.$.getAttribute(a,2)}:a}(),getAttributes:function(a){var b={},c=this.$.attributes,f;a=CKEDITOR.tools.isArray(a)?
-a:[];for(f=0;f<c.length;f++)-1===CKEDITOR.tools.indexOf(a,c[f].name)&&(b[c[f].name]=c[f].value);return b},getChildren:function(){return new CKEDITOR.dom.nodeList(this.$.childNodes)},getComputedStyle:document.defaultView&&document.defaultView.getComputedStyle?function(a){var b=this.getWindow().$.getComputedStyle(this.$,null);return b?b.getPropertyValue(a):""}:function(a){return this.$.currentStyle[CKEDITOR.tools.cssStyleToDomStyle(a)]},getDtd:function(){var a=CKEDITOR.dtd[this.getName()];this.getDtd=
-function(){return a};return a},getElementsByTag:CKEDITOR.dom.document.prototype.getElementsByTag,getTabIndex:function(){var a=this.$.tabIndex;return 0!==a||CKEDITOR.dtd.$tabIndex[this.getName()]||0===parseInt(this.getAttribute("tabindex"),10)?a:-1},getText:function(){return this.$.textContent||this.$.innerText||""},getWindow:function(){return this.getDocument().getWindow()},getId:function(){return this.$.id||null},getNameAtt:function(){return this.$.name||null},getName:function(){var a=this.$.nodeName.toLowerCase();
-if(CKEDITOR.env.ie&&8>=document.documentMode){var b=this.$.scopeName;"HTML"!=b&&(a=b.toLowerCase()+":"+a)}this.getName=function(){return a};return this.getName()},getValue:function(){return this.$.value},getFirst:function(a){var b=this.$.firstChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getNext(a));return b},getLast:function(a){var b=this.$.lastChild;(b=b&&new CKEDITOR.dom.node(b))&&a&&!a(b)&&(b=b.getPrevious(a));return b},getStyle:function(a){return this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]},
-is:function(){var a=this.getName();if("object"==typeof arguments[0])return!!arguments[0][a];for(var b=0;b<arguments.length;b++)if(arguments[b]==a)return!0;return!1},isEditable:function(a){var b=this.getName();return this.isReadOnly()||"none"==this.getComputedStyle("display")||"hidden"==this.getComputedStyle("visibility")||CKEDITOR.dtd.$nonEditable[b]||CKEDITOR.dtd.$empty[b]||this.is("a")&&(this.data("cke-saved-name")||this.hasAttribute("name"))&&!this.getChildCount()?!1:!1!==a?(a=CKEDITOR.dtd[b]||
-CKEDITOR.dtd.span,!(!a||!a["#"])):!0},isIdentical:function(a){var b=this.clone(0,1);a=a.clone(0,1);b.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);a.removeAttributes(["_moz_dirty","data-cke-expando","data-cke-saved-href","data-cke-saved-name"]);if(b.$.isEqualNode)return b.$.style.cssText=CKEDITOR.tools.normalizeCssText(b.$.style.cssText),a.$.style.cssText=CKEDITOR.tools.normalizeCssText(a.$.style.cssText),b.$.isEqualNode(a.$);b=b.getOuterHtml();a=
-a.getOuterHtml();if(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&this.is("a")){var c=this.getParent();c.type==CKEDITOR.NODE_ELEMENT&&(c=c.clone(),c.setHtml(b),b=c.getHtml(),c.setHtml(a),a=c.getHtml())}return b==a},isVisible:function(){var a=(this.$.offsetHeight||this.$.offsetWidth)&&"hidden"!=this.getComputedStyle("visibility"),b,c;a&&CKEDITOR.env.webkit&&(b=this.getWindow(),!b.equals(CKEDITOR.document.getWindow())&&(c=b.$.frameElement)&&(a=(new CKEDITOR.dom.element(c)).isVisible()));return!!a},isEmptyInlineRemoveable:function(){if(!CKEDITOR.dtd.$removeEmpty[this.getName()])return!1;
-for(var a=this.getChildren(),b=0,c=a.count();b<c;b++){var f=a.getItem(b);if(f.type!=CKEDITOR.NODE_ELEMENT||!f.data("cke-bookmark"))if(f.type==CKEDITOR.NODE_ELEMENT&&!f.isEmptyInlineRemoveable()||f.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(f.getText()))return!1}return!0},hasAttributes:CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(){for(var a=this.$.attributes,b=0;b<a.length;b++){var c=a[b];switch(c.nodeName){case "class":if(this.getAttribute("class"))return!0;case "data-cke-expando":continue;
-default:if(c.specified)return!0}}return!1}:function(){var a=this.$.attributes,b=a.length,c={"data-cke-expando":1,_moz_dirty:1};return 0<b&&(2<b||!c[a[0].nodeName]||2==b&&!c[a[1].nodeName])},hasAttribute:function(){function a(b){var c=this.$.attributes.getNamedItem(b);if("input"==this.getName())switch(b){case "class":return 0<this.$.className.length;case "checked":return!!this.$.checked;case "value":return b=this.getAttribute("type"),"checkbox"==b||"radio"==b?"on"!=this.$.value:!!this.$.value}return c?
-c.specified:!1}return CKEDITOR.env.ie?8>CKEDITOR.env.version?function(b){return"name"==b?!!this.$.name:a.call(this,b)}:a:function(a){return!!this.$.attributes.getNamedItem(a)}}(),hide:function(){this.setStyle("display","none")},moveChildren:function(a,b){var c=this.$;a=a.$;if(c!=a){var f;if(b)for(;f=c.lastChild;)a.insertBefore(c.removeChild(f),a.firstChild);else for(;f=c.firstChild;)a.appendChild(c.removeChild(f))}},mergeSiblings:function(){function a(b,c,f){if(c&&c.type==CKEDITOR.NODE_ELEMENT){for(var d=
-[];c.data("cke-bookmark")||c.isEmptyInlineRemoveable();)if(d.push(c),c=f?c.getNext():c.getPrevious(),!c||c.type!=CKEDITOR.NODE_ELEMENT)return;if(b.isIdentical(c)){for(var h=f?b.getLast():b.getFirst();d.length;)d.shift().move(b,!f);c.moveChildren(b,!f);c.remove();h&&h.type==CKEDITOR.NODE_ELEMENT&&h.mergeSiblings()}}}return function(b){if(!1===b||CKEDITOR.dtd.$removeEmpty[this.getName()]||this.is("a"))a(this,this.getNext(),!0),a(this,this.getPrevious())}}(),show:function(){this.setStyles({display:"",
-visibility:""})},setAttribute:function(){var a=function(a,b){this.$.setAttribute(a,b);return this};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(b,c){"class"==b?this.$.className=c:"style"==b?this.$.style.cssText=c:"tabindex"==b?this.$.tabIndex=c:"checked"==b?this.$.checked=c:"contenteditable"==b?a.call(this,"contentEditable",c):a.apply(this,arguments);return this}:CKEDITOR.env.ie8Compat&&CKEDITOR.env.secure?function(b,c){if("src"==b&&c.match(/^http:\/\//))try{a.apply(this,
-arguments)}catch(f){}else a.apply(this,arguments);return this}:a}(),setAttributes:function(a){for(var b in a)this.setAttribute(b,a[b]);return this},setValue:function(a){this.$.value=a;return this},removeAttribute:function(){var a=function(a){this.$.removeAttribute(a)};return CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)?function(a){"class"==a?a="className":"tabindex"==a?a="tabIndex":"contenteditable"==a&&(a="contentEditable");this.$.removeAttribute(a)}:a}(),removeAttributes:function(a){if(CKEDITOR.tools.isArray(a))for(var b=
-0;b<a.length;b++)this.removeAttribute(a[b]);else for(b in a=a||this.getAttributes(),a)a.hasOwnProperty(b)&&this.removeAttribute(b)},removeStyle:function(a){var b=this.$.style;if(b.removeProperty||"border"!=a&&"margin"!=a&&"padding"!=a)b.removeProperty?b.removeProperty(a):b.removeAttribute(CKEDITOR.tools.cssStyleToDomStyle(a)),this.$.style.cssText||this.removeAttribute("style");else{var c=["top","left","right","bottom"],f;"border"==a&&(f=["color","style","width"]);for(var b=[],d=0;d<c.length;d++)if(f)for(var u=
-0;u<f.length;u++)b.push([a,c[d],f[u]].join("-"));else b.push([a,c[d]].join("-"));for(a=0;a<b.length;a++)this.removeStyle(b[a])}},setStyle:function(a,b){this.$.style[CKEDITOR.tools.cssStyleToDomStyle(a)]=b;return this},setStyles:function(a){for(var b in a)this.setStyle(b,a[b]);return this},setOpacity:function(a){CKEDITOR.env.ie&&9>CKEDITOR.env.version?(a=Math.round(100*a),this.setStyle("filter",100<=a?"":"progid:DXImageTransform.Microsoft.Alpha(opacity\x3d"+a+")")):this.setStyle("opacity",a)},unselectable:function(){this.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select",
-"none"));if(CKEDITOR.env.ie){this.setAttribute("unselectable","on");for(var a,b=this.getElementsByTag("*"),c=0,f=b.count();c<f;c++)a=b.getItem(c),a.setAttribute("unselectable","on")}},getPositionedAncestor:function(){for(var a=this;"html"!=a.getName();){if("static"!=a.getComputedStyle("position"))return a;a=a.getParent()}return null},getDocumentPosition:function(a){var b=0,c=0,f=this.getDocument(),d=f.getBody(),u="BackCompat"==f.$.compatMode;if(document.documentElement.getBoundingClientRect&&(CKEDITOR.env.ie?
-8!==CKEDITOR.env.version:1)){var e=this.$.getBoundingClientRect(),g=f.$.documentElement,m=g.clientTop||d.$.clientTop||0,x=g.clientLeft||d.$.clientLeft||0,k=!0;CKEDITOR.env.ie&&(k=f.getDocumentElement().contains(this),f=f.getBody().contains(this),k=u&&f||!u&&k);k&&(CKEDITOR.env.webkit||CKEDITOR.env.ie&&12<=CKEDITOR.env.version?(b=d.$.scrollLeft||g.scrollLeft,c=d.$.scrollTop||g.scrollTop):(c=u?d.$:g,b=c.scrollLeft,c=c.scrollTop),b=e.left+b-x,c=e.top+c-m)}else for(m=this,x=null;m&&"body"!=m.getName()&&
-"html"!=m.getName();){b+=m.$.offsetLeft-m.$.scrollLeft;c+=m.$.offsetTop-m.$.scrollTop;m.equals(this)||(b+=m.$.clientLeft||0,c+=m.$.clientTop||0);for(;x&&!x.equals(m);)b-=x.$.scrollLeft,c-=x.$.scrollTop,x=x.getParent();x=m;m=(e=m.$.offsetParent)?new CKEDITOR.dom.element(e):null}a&&(e=this.getWindow(),m=a.getWindow(),!e.equals(m)&&e.$.frameElement&&(a=(new CKEDITOR.dom.element(e.$.frameElement)).getDocumentPosition(a),b+=a.x,c+=a.y));document.documentElement.getBoundingClientRect||!CKEDITOR.env.gecko||
-u||(b+=this.$.clientLeft?1:0,c+=this.$.clientTop?1:0);return{x:b,y:c}},scrollIntoView:function(a){var b=this.getParent();if(b){do if((b.$.clientWidth&&b.$.clientWidth<b.$.scrollWidth||b.$.clientHeight&&b.$.clientHeight<b.$.scrollHeight)&&!b.is("body")&&this.scrollIntoParent(b,a,1),b.is("html")){var c=b.getWindow();try{var f=c.$.frameElement;f&&(b=new CKEDITOR.dom.element(f))}catch(d){}}while(b=b.getParent())}},scrollIntoParent:function(a,b,c){var f,d,e,z;function g(b,c){/body|html/.test(a.getName())?
-a.getWindow().$.scrollBy(b,c):(a.$.scrollLeft+=b,a.$.scrollTop+=c)}function m(a,b){var c={x:0,y:0};if(!a.is(k?"body":"html")){var f=a.$.getBoundingClientRect();c.x=f.left;c.y=f.top}f=a.getWindow();f.equals(b)||(f=m(CKEDITOR.dom.element.get(f.$.frameElement),b),c.x+=f.x,c.y+=f.y);return c}function x(a,b){return parseInt(a.getComputedStyle("margin-"+b)||0,10)||0}!a&&(a=this.getWindow());e=a.getDocument();var k="BackCompat"==e.$.compatMode;a instanceof CKEDITOR.dom.window&&(a=k?e.getBody():e.getDocumentElement());
-CKEDITOR.env.webkit&&(e=this.getEditor(!1))&&(e._.previousScrollTop=null);e=a.getWindow();d=m(this,e);var w=m(a,e),F=this.$.offsetHeight;f=this.$.offsetWidth;var l=a.$.clientHeight,q=a.$.clientWidth;e=d.x-x(this,"left")-w.x||0;z=d.y-x(this,"top")-w.y||0;f=d.x+f+x(this,"right")-(w.x+q)||0;d=d.y+F+x(this,"bottom")-(w.y+l)||0;(0>z||0<d)&&g(0,!0===b?z:!1===b?d:0>z?z:d);c&&(0>e||0<f)&&g(0>e?e:f,0)},setState:function(a,b,c){b=b||"cke";switch(a){case CKEDITOR.TRISTATE_ON:this.addClass(b+"_on");this.removeClass(b+
-"_off");this.removeClass(b+"_disabled");c&&this.setAttribute("aria-pressed",!0);c&&this.removeAttribute("aria-disabled");break;case CKEDITOR.TRISTATE_DISABLED:this.addClass(b+"_disabled");this.removeClass(b+"_off");this.removeClass(b+"_on");c&&this.setAttribute("aria-disabled",!0);c&&this.removeAttribute("aria-pressed");break;default:this.addClass(b+"_off"),this.removeClass(b+"_on"),this.removeClass(b+"_disabled"),c&&this.removeAttribute("aria-pressed"),c&&this.removeAttribute("aria-disabled")}},
-getFrameDocument:function(){var a=this.$;try{a.contentWindow.document}catch(b){a.src=a.src}return a&&new CKEDITOR.dom.document(a.contentWindow.document)},copyAttributes:function(a,b){var c=this.$.attributes;b=b||{};for(var f=0;f<c.length;f++){var d=c[f],e=d.nodeName.toLowerCase(),g;if(!(e in b))if("checked"==e&&(g=this.getAttribute(e)))a.setAttribute(e,g);else if(!CKEDITOR.env.ie||this.hasAttribute(e))g=this.getAttribute(e),null===g&&(g=d.nodeValue),a.setAttribute(e,g)}""!==this.$.style.cssText&&
-(a.$.style.cssText=this.$.style.cssText)},renameNode:function(a){if(this.getName()!=a){var b=this.getDocument();a=new CKEDITOR.dom.element(a,b);this.copyAttributes(a);this.moveChildren(a);this.getParent(!0)&&this.$.parentNode.replaceChild(a.$,this.$);a.$["data-cke-expando"]=this.$["data-cke-expando"];this.$=a.$;delete this.getName}},getChild:function(){function a(b,c){var f=b.childNodes;if(0<=c&&c<f.length)return f[c]}return function(b){var c=this.$;if(b.slice)for(b=b.slice();0<b.length&&c;)c=a(c,
-b.shift());else c=a(c,b);return c?new CKEDITOR.dom.node(c):null}}(),getChildCount:function(){return this.$.childNodes.length},disableContextMenu:function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT&&b.hasClass("cke_enable_context_menu")}this.on("contextmenu",function(b){b.data.getTarget().getAscendant(a,!0)||b.data.preventDefault()})},getDirection:function(a){return a?this.getComputedStyle("direction")||this.getDirection()||this.getParent()&&this.getParent().getDirection(1)||this.getDocument().$.dir||
-"ltr":this.getStyle("direction")||this.getAttribute("dir")},data:function(a,b){a="data-"+a;if(void 0===b)return this.getAttribute(a);!1===b?this.removeAttribute(a):this.setAttribute(a,b);return null},getEditor:function(a){var b=CKEDITOR.instances,c,f,d;a=a||void 0===a;for(c in b)if(f=b[c],f.element.equals(this)&&f.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||!a&&(d=f.editable())&&(d.equals(this)||d.contains(this)))return f;return null},find:function(a){var c=d(this);a=new CKEDITOR.dom.nodeList(this.$.querySelectorAll(b(this,
-a)));c();return a},findOne:function(a){var c=d(this);a=this.$.querySelector(b(this,a));c();return a?new CKEDITOR.dom.element(a):null},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var f=a(this);if(!1!==f){c=this.getChildren();for(var d=0;d<c.count();d++)f=c.getItem(d),f.type==CKEDITOR.NODE_ELEMENT?f.forEach(a,b):b&&f.type!=b||a(f)}}});var k={width:["border-left-width","border-right-width","padding-left","padding-right"],height:["border-top-width","border-bottom-width","padding-top","padding-bottom"]};
-CKEDITOR.dom.element.prototype.setSize=function(a,b,d){"number"==typeof b&&(!d||CKEDITOR.env.ie&&CKEDITOR.env.quirks||(b-=c.call(this,a)),this.setStyle(a,b+"px"))};CKEDITOR.dom.element.prototype.getSize=function(a,b){var d=Math.max(this.$["offset"+CKEDITOR.tools.capitalize(a)],this.$["client"+CKEDITOR.tools.capitalize(a)])||0;b&&(d-=c.call(this,a));return d}})();CKEDITOR.dom.documentFragment=function(a){a=a||CKEDITOR.document;this.$=a.type==CKEDITOR.NODE_DOCUMENT?a.$.createDocumentFragment():a};
-CKEDITOR.tools.extend(CKEDITOR.dom.documentFragment.prototype,CKEDITOR.dom.element.prototype,{type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,insertAfterNode:function(a){a=a.$;a.parentNode.insertBefore(this.$,a.nextSibling)},getHtml:function(){var a=new CKEDITOR.dom.element("div");this.clone(1,1).appendTo(a);return a.getHtml().replace(/\s*data-cke-expando=".*?"/g,"")}},!0,{append:1,appendBogus:1,clone:1,getFirst:1,getHtml:1,getLast:1,getParent:1,getNext:1,getPrevious:1,appendTo:1,moveChildren:1,insertBefore:1,
-insertAfterNode:1,replace:1,trim:1,type:1,ltrim:1,rtrim:1,getDocument:1,getChildCount:1,getChild:1,getChildren:1});
-(function(){function a(a,b){var c=this.range;if(this._.end)return null;if(!this._.start){this._.start=1;if(c.collapsed)return this.end(),null;c.optimize()}var f,d=c.startContainer;f=c.endContainer;var e=c.startOffset,B=c.endOffset,g,l=this.guard,q=this.type,n=a?"getPreviousSourceNode":"getNextSourceNode";if(!a&&!this._.guardLTR){var t=f.type==CKEDITOR.NODE_ELEMENT?f:f.getParent(),A=f.type==CKEDITOR.NODE_ELEMENT?f.getChild(B):f.getNext();this._.guardLTR=function(a,b){return(!b||!t.equals(a))&&(!A||
-!a.equals(A))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}if(a&&!this._.guardRTL){var C=d.type==CKEDITOR.NODE_ELEMENT?d:d.getParent(),h=d.type==CKEDITOR.NODE_ELEMENT?e?d.getChild(e-1):null:d.getPrevious();this._.guardRTL=function(a,b){return(!b||!C.equals(a))&&(!h||!a.equals(h))&&(a.type!=CKEDITOR.NODE_ELEMENT||!b||!a.equals(c.root))}}var k=a?this._.guardRTL:this._.guardLTR;g=l?function(a,b){return!1===k(a,b)?!1:l(a,b)}:k;this.current?f=this.current[n](!1,q,g):(a?f.type==CKEDITOR.NODE_ELEMENT&&
-(f=0<B?f.getChild(B-1):!1===g(f,!0)?null:f.getPreviousSourceNode(!0,q,g)):(f=d,f.type==CKEDITOR.NODE_ELEMENT&&((f=f.getChild(e))||(f=!1===g(d,!0)?null:d.getNextSourceNode(!0,q,g)))),f&&!1===g(f)&&(f=null));for(;f&&!this._.end;){this.current=f;if(!this.evaluator||!1!==this.evaluator(f)){if(!b)return f}else if(b&&this.evaluator)return!1;f=f[n](!1,q,g)}this.end();return this.current=null}function d(b){for(var c,f=null;c=a.call(this,b);)f=c;return f}CKEDITOR.dom.walker=CKEDITOR.tools.createClass({$:function(a){this.range=
-a;this._={}},proto:{end:function(){this._.end=1},next:function(){return a.call(this)},previous:function(){return a.call(this,1)},checkForward:function(){return!1!==a.call(this,0,1)},checkBackward:function(){return!1!==a.call(this,1,1)},lastForward:function(){return d.call(this)},lastBackward:function(){return d.call(this,1)},reset:function(){delete this.current;this._={}}}});var b={block:1,"list-item":1,table:1,"table-row-group":1,"table-header-group":1,"table-footer-group":1,"table-row":1,"table-column-group":1,
-"table-column":1,"table-cell":1,"table-caption":1},c={absolute:1,fixed:1};CKEDITOR.dom.element.prototype.isBlockBoundary=function(a){return"none"!=this.getComputedStyle("float")||this.getComputedStyle("position")in c||!b[this.getComputedStyle("display")]?!!(this.is(CKEDITOR.dtd.$block)||a&&this.is(a)):!0};CKEDITOR.dom.walker.blockBoundary=function(a){return function(b){return!(b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary(a))}};CKEDITOR.dom.walker.listItemBoundary=function(){return this.blockBoundary({br:1})};
-CKEDITOR.dom.walker.bookmark=function(a,b){function c(a){return a&&a.getName&&"span"==a.getName()&&a.data("cke-bookmark")}return function(f){var d,e;d=f&&f.type!=CKEDITOR.NODE_ELEMENT&&(e=f.getParent())&&c(e);d=a?d:d||c(f);return!!(b^d)}};CKEDITOR.dom.walker.whitespaces=function(a){return function(b){var c;b&&b.type==CKEDITOR.NODE_TEXT&&(c=!CKEDITOR.tools.trim(b.getText())||CKEDITOR.env.webkit&&b.getText()==CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE);return!!(a^c)}};CKEDITOR.dom.walker.invisible=
-function(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.env.webkit?1:0;return function(f){b(f)?f=1:(f.type==CKEDITOR.NODE_TEXT&&(f=f.getParent()),f=f.$.offsetWidth<=c);return!!(a^f)}};CKEDITOR.dom.walker.nodeType=function(a,b){return function(c){return!!(b^c.type==a)}};CKEDITOR.dom.walker.bogus=function(a){function b(a){return!g(a)&&!k(a)}return function(c){var f=CKEDITOR.env.needsBrFiller?c.is&&c.is("br"):c.getText&&e.test(c.getText());f&&(f=c.getParent(),c=c.getNext(b),f=f.isBlockBoundary()&&
-(!c||c.type==CKEDITOR.NODE_ELEMENT&&c.isBlockBoundary()));return!!(a^f)}};CKEDITOR.dom.walker.temp=function(a){return function(b){b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());b=b&&b.hasAttribute("data-cke-temp");return!!(a^b)}};var e=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,g=CKEDITOR.dom.walker.whitespaces(),k=CKEDITOR.dom.walker.bookmark(),h=CKEDITOR.dom.walker.temp(),p=function(a){return k(a)||g(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.is(CKEDITOR.dtd.$inline)&&!a.is(CKEDITOR.dtd.$empty)};CKEDITOR.dom.walker.ignored=
-function(a){return function(b){b=g(b)||k(b)||h(b);return!!(a^b)}};var r=CKEDITOR.dom.walker.ignored();CKEDITOR.dom.walker.empty=function(a){return function(b){for(var c=0,f=b.getChildCount();c<f;++c)if(!r(b.getChild(c)))return!!a;return!a}};var f=CKEDITOR.dom.walker.empty(),B=CKEDITOR.dom.walker.validEmptyBlockContainers=CKEDITOR.tools.extend(function(a){var b={},c;for(c in a)CKEDITOR.dtd[c]["#"]&&(b[c]=1);return b}(CKEDITOR.dtd.$block),{caption:1,td:1,th:1});CKEDITOR.dom.walker.editable=function(a){return function(b){b=
-r(b)?!1:b.type==CKEDITOR.NODE_TEXT||b.type==CKEDITOR.NODE_ELEMENT&&(b.is(CKEDITOR.dtd.$inline)||b.is("hr")||"false"==b.getAttribute("contenteditable")||!CKEDITOR.env.needsBrFiller&&b.is(B)&&f(b))?!0:!1;return!!(a^b)}};CKEDITOR.dom.element.prototype.getBogus=function(){var a=this;do a=a.getPreviousSourceNode();while(p(a));return a&&(CKEDITOR.env.needsBrFiller?a.is&&a.is("br"):a.getText&&e.test(a.getText()))?a:!1}})();
-CKEDITOR.dom.range=function(a){this.endOffset=this.endContainer=this.startOffset=this.startContainer=null;this.collapsed=!0;var d=a instanceof CKEDITOR.dom.document;this.document=d?a:a.getDocument();this.root=d?a.getBody():a};
-(function(){function a(a){a.collapsed=a.startContainer&&a.endContainer&&a.startContainer.equals(a.endContainer)&&a.startOffset==a.endOffset}function d(a,b,c,d,e){function m(a,b,c,f){var d=c?a.getPrevious():a.getNext();if(f&&k)return d;l||f?b.append(a.clone(!0,e),c):(a.remove(),r&&b.append(a));return d}function g(){var a,b,c,f=Math.min(P.length,v.length);for(a=0;a<f;a++)if(b=P[a],c=v[a],!b.equals(c))return a;return a-1}function h(){var b=G-1,c=M&&H&&!q.equals(n);b<E-1||b<I-1||c?(c?a.moveToPosition(n,
-CKEDITOR.POSITION_BEFORE_START):I==b+1&&D?a.moveToPosition(v[b],CKEDITOR.POSITION_BEFORE_END):a.moveToPosition(v[b+1],CKEDITOR.POSITION_BEFORE_START),d&&(b=P[b+1])&&b.type==CKEDITOR.NODE_ELEMENT&&(c=CKEDITOR.dom.element.createFromHtml('\x3cspan data-cke-bookmark\x3d"1" style\x3d"display:none"\x3e\x26nbsp;\x3c/span\x3e',a.document),c.insertAfter(b),b.mergeSiblings(!1),a.moveToBookmark({startNode:c}))):a.collapse(!0)}a.optimizeBookmark();var k=0===b,r=1==b,l=2==b;b=l||r;var q=a.startContainer,n=a.endContainer,
-t=a.startOffset,A=a.endOffset,C,D,M,H,p,Q;if(l&&n.type==CKEDITOR.NODE_TEXT&&q.equals(n))q=a.document.createText(q.substring(t,A)),c.append(q);else{n.type==CKEDITOR.NODE_TEXT?l?Q=!0:n=n.split(A):0<n.getChildCount()?A>=n.getChildCount()?(n=n.getChild(A-1),D=!0):n=n.getChild(A):H=D=!0;q.type==CKEDITOR.NODE_TEXT?l?p=!0:q.split(t):0<q.getChildCount()?0===t?(q=q.getChild(t),C=!0):q=q.getChild(t-1):M=C=!0;for(var P=q.getParents(),v=n.getParents(),G=g(),E=P.length-1,I=v.length-1,K=c,L,Z,X,fa=-1,S=G;S<=E;S++){Z=
-P[S];X=Z.getNext();for(S!=E||Z.equals(v[S])&&E<I?b&&(L=K.append(Z.clone(0,e))):C?m(Z,K,!1,M):p&&K.append(a.document.createText(Z.substring(t)));X;){if(X.equals(v[S])){fa=S;break}X=m(X,K)}K=L}K=c;for(S=G;S<=I;S++)if(c=v[S],X=c.getPrevious(),c.equals(P[S]))b&&(K=K.getChild(0));else{S!=I||c.equals(P[S])&&I<E?b&&(L=K.append(c.clone(0,e))):D?m(c,K,!1,H):Q&&K.append(a.document.createText(c.substring(0,A)));if(S>fa)for(;X;)X=m(X,K,!0);K=L}l||h()}}function b(){var a=!1,b=CKEDITOR.dom.walker.whitespaces(),
-c=CKEDITOR.dom.walker.bookmark(!0),d=CKEDITOR.dom.walker.bogus();return function(e){return c(e)||b(e)?!0:d(e)&&!a?a=!0:e.type==CKEDITOR.NODE_TEXT&&(e.hasAscendant("pre")||CKEDITOR.tools.trim(e.getText()).length)||e.type==CKEDITOR.NODE_ELEMENT&&!e.is(g)?!1:!0}}function c(a){var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(1);return function(d){return c(d)||b(d)?!0:!a&&k(d)||d.type==CKEDITOR.NODE_ELEMENT&&d.is(CKEDITOR.dtd.$removeEmpty)}}function e(a){return function(){var b;return this[a?
-"getPreviousNode":"getNextNode"](function(a){!b&&r(a)&&(b=a);return p(a)&&!(k(a)&&a.equals(b))})}}var g={abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,"var":1},k=CKEDITOR.dom.walker.bogus(),h=/^[\t\r\n ]*(?:&nbsp;|\xa0)$/,p=CKEDITOR.dom.walker.editable(),r=CKEDITOR.dom.walker.ignored(!0);CKEDITOR.dom.range.prototype={clone:function(){var a=new CKEDITOR.dom.range(this.root);a._setStartContainer(this.startContainer);
-a.startOffset=this.startOffset;a._setEndContainer(this.endContainer);a.endOffset=this.endOffset;a.collapsed=this.collapsed;return a},collapse:function(a){a?(this._setEndContainer(this.startContainer),this.endOffset=this.startOffset):(this._setStartContainer(this.endContainer),this.startOffset=this.endOffset);this.collapsed=!0},cloneContents:function(a){var b=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,2,b,!1,"undefined"==typeof a?!0:a);return b},deleteContents:function(a){this.collapsed||
-d(this,0,null,a)},extractContents:function(a,b){var c=new CKEDITOR.dom.documentFragment(this.document);this.collapsed||d(this,1,c,a,"undefined"==typeof b?!0:b);return c},createBookmark:function(a){var b,c,d,e,m=this.collapsed;b=this.document.createElement("span");b.data("cke-bookmark",1);b.setStyle("display","none");b.setHtml("\x26nbsp;");a&&(d="cke_bm_"+CKEDITOR.tools.getNextNumber(),b.setAttribute("id",d+(m?"C":"S")));m||(c=b.clone(),c.setHtml("\x26nbsp;"),a&&c.setAttribute("id",d+"E"),e=this.clone(),
-e.collapse(),e.insertNode(c));e=this.clone();e.collapse(!0);e.insertNode(b);c?(this.setStartAfter(b),this.setEndBefore(c)):this.moveToPosition(b,CKEDITOR.POSITION_AFTER_END);return{startNode:a?d+(m?"C":"S"):b,endNode:a?d+"E":c,serializable:a,collapsed:m}},createBookmark2:function(){function a(b){var f=b.container,d=b.offset,e;e=f;var g=d;e=e.type!=CKEDITOR.NODE_ELEMENT||0===g||g==e.getChildCount()?0:e.getChild(g-1).type==CKEDITOR.NODE_TEXT&&e.getChild(g).type==CKEDITOR.NODE_TEXT;e&&(f=f.getChild(d-
-1),d=f.getLength());if(f.type==CKEDITOR.NODE_ELEMENT&&0<d){a:{for(e=f;d--;)if(g=e.getChild(d).getIndex(!0),0<=g){d=g;break a}d=-1}d+=1}if(f.type==CKEDITOR.NODE_TEXT){e=f;for(g=0;(e=e.getPrevious())&&e.type==CKEDITOR.NODE_TEXT;)g+=e.getText().replace(CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE,"").length;e=g;f.getText()?d+=e:(g=f.getPrevious(c),e?(d=e,f=g?g.getNext():f.getParent().getFirst()):(f=f.getParent(),d=g?g.getIndex(!0)+1:0))}b.container=f;b.offset=d}function b(a,c){var f=c.getCustomData("cke-fillingChar");
-if(f){var d=a.container;f.equals(d)&&(a.offset-=CKEDITOR.dom.selection.FILLING_CHAR_SEQUENCE.length,0>=a.offset&&(a.offset=d.getIndex(),a.container=d.getParent()))}}var c=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_TEXT,!0);return function(c){var d=this.collapsed,e={container:this.startContainer,offset:this.startOffset},g={container:this.endContainer,offset:this.endOffset};c&&(a(e),b(e,this.root),d||(a(g),b(g,this.root)));return{start:e.container.getAddress(c),end:d?null:g.container.getAddress(c),
-startOffset:e.offset,endOffset:g.offset,normalized:c,collapsed:d,is2:!0}}}(),moveToBookmark:function(a){if(a.is2){var b=this.document.getByAddress(a.start,a.normalized),c=a.startOffset,d=a.end&&this.document.getByAddress(a.end,a.normalized);a=a.endOffset;this.setStart(b,c);d?this.setEnd(d,a):this.collapse(!0)}else b=(c=a.serializable)?this.document.getById(a.startNode):a.startNode,a=c?this.document.getById(a.endNode):a.endNode,this.setStartBefore(b),b.remove(),a?(this.setEndBefore(a),a.remove()):
-this.collapse(!0)},getBoundaryNodes:function(){var a=this.startContainer,b=this.endContainer,c=this.startOffset,d=this.endOffset,e;if(a.type==CKEDITOR.NODE_ELEMENT)if(e=a.getChildCount(),e>c)a=a.getChild(c);else if(1>e)a=a.getPreviousSourceNode();else{for(a=a.$;a.lastChild;)a=a.lastChild;a=new CKEDITOR.dom.node(a);a=a.getNextSourceNode()||a}if(b.type==CKEDITOR.NODE_ELEMENT)if(e=b.getChildCount(),e>d)b=b.getChild(d).getPreviousSourceNode(!0);else if(1>e)b=b.getPreviousSourceNode();else{for(b=b.$;b.lastChild;)b=
-b.lastChild;b=new CKEDITOR.dom.node(b)}a.getPosition(b)&CKEDITOR.POSITION_FOLLOWING&&(a=b);return{startNode:a,endNode:b}},getCommonAncestor:function(a,b){var c=this.startContainer,d=this.endContainer,c=c.equals(d)?a&&c.type==CKEDITOR.NODE_ELEMENT&&this.startOffset==this.endOffset-1?c.getChild(this.startOffset):c:c.getCommonAncestor(d);return b&&!c.is?c.getParent():c},optimize:function(){var a=this.startContainer,b=this.startOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setStartAfter(a):
-this.setStartBefore(a));a=this.endContainer;b=this.endOffset;a.type!=CKEDITOR.NODE_ELEMENT&&(b?b>=a.getLength()&&this.setEndAfter(a):this.setEndBefore(a))},optimizeBookmark:function(){var a=this.startContainer,b=this.endContainer;a.is&&a.is("span")&&a.data("cke-bookmark")&&this.setStartAt(a,CKEDITOR.POSITION_BEFORE_START);b&&b.is&&b.is("span")&&b.data("cke-bookmark")&&this.setEndAt(b,CKEDITOR.POSITION_AFTER_END)},trim:function(a,b){var c=this.startContainer,d=this.startOffset,e=this.collapsed;if((!a||
-e)&&c&&c.type==CKEDITOR.NODE_TEXT){if(d)if(d>=c.getLength())d=c.getIndex()+1,c=c.getParent();else{var m=c.split(d),d=c.getIndex()+1,c=c.getParent();this.startContainer.equals(this.endContainer)?this.setEnd(m,this.endOffset-this.startOffset):c.equals(this.endContainer)&&(this.endOffset+=1)}else d=c.getIndex(),c=c.getParent();this.setStart(c,d);if(e){this.collapse(!0);return}}c=this.endContainer;d=this.endOffset;b||e||!c||c.type!=CKEDITOR.NODE_TEXT||(d?(d>=c.getLength()||c.split(d),d=c.getIndex()+1):
-d=c.getIndex(),c=c.getParent(),this.setEnd(c,d))},enlarge:function(a,b){function c(a){return a&&a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("contenteditable")?null:a}var d=new RegExp(/[^\s\ufeff]/);switch(a){case CKEDITOR.ENLARGE_INLINE:var e=1;case CKEDITOR.ENLARGE_ELEMENT:var m=function(a,b){var c=new CKEDITOR.dom.range(h);c.setStart(a,b);c.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);var c=new CKEDITOR.dom.walker(c),f;for(c.guard=function(a){return!(a.type==CKEDITOR.NODE_ELEMENT&&a.isBlockBoundary())};f=
-c.next();){if(f.type!=CKEDITOR.NODE_TEXT)return!1;C=f!=a?f.getText():f.substring(b);if(d.test(C))return!1}return!0};if(this.collapsed)break;var g=this.getCommonAncestor(),h=this.root,k,r,l,q,n,t=!1,A,C;A=this.startContainer;var D=this.startOffset;A.type==CKEDITOR.NODE_TEXT?(D&&(A=!CKEDITOR.tools.trim(A.substring(0,D)).length&&A,t=!!A),A&&((q=A.getPrevious())||(l=A.getParent()))):(D&&(q=A.getChild(D-1)||A.getLast()),q||(l=A));for(l=c(l);l||q;){if(l&&!q){!n&&l.equals(g)&&(n=!0);if(e?l.isBlockBoundary():
-!h.contains(l))break;t&&"inline"==l.getComputedStyle("display")||(t=!1,n?k=l:this.setStartBefore(l));q=l.getPrevious()}for(;q;)if(A=!1,q.type==CKEDITOR.NODE_COMMENT)q=q.getPrevious();else{if(q.type==CKEDITOR.NODE_TEXT)C=q.getText(),d.test(C)&&(q=null),A=/[\s\ufeff]$/.test(C);else if((q.$.offsetWidth>(CKEDITOR.env.webkit?1:0)||b&&q.is("br"))&&!q.data("cke-bookmark"))if(t&&CKEDITOR.dtd.$removeEmpty[q.getName()]){C=q.getText();if(d.test(C))q=null;else for(var D=q.$.getElementsByTagName("*"),M=0,H;H=
-D[M++];)if(!CKEDITOR.dtd.$removeEmpty[H.nodeName.toLowerCase()]){q=null;break}q&&(A=!!C.length)}else q=null;A&&(t?n?k=l:l&&this.setStartBefore(l):t=!0);if(q){A=q.getPrevious();if(!l&&!A){l=q;q=null;break}q=A}else l=null}l&&(l=c(l.getParent()))}A=this.endContainer;D=this.endOffset;l=q=null;n=t=!1;A.type==CKEDITOR.NODE_TEXT?CKEDITOR.tools.trim(A.substring(D)).length?t=!0:(t=!A.getLength(),D==A.getLength()?(q=A.getNext())||(l=A.getParent()):m(A,D)&&(l=A.getParent())):(q=A.getChild(D))||(l=A);for(;l||
-q;){if(l&&!q){!n&&l.equals(g)&&(n=!0);if(e?l.isBlockBoundary():!h.contains(l))break;t&&"inline"==l.getComputedStyle("display")||(t=!1,n?r=l:l&&this.setEndAfter(l));q=l.getNext()}for(;q;){A=!1;if(q.type==CKEDITOR.NODE_TEXT)C=q.getText(),m(q,0)||(q=null),A=/^[\s\ufeff]/.test(C);else if(q.type==CKEDITOR.NODE_ELEMENT){if((0<q.$.offsetWidth||b&&q.is("br"))&&!q.data("cke-bookmark"))if(t&&CKEDITOR.dtd.$removeEmpty[q.getName()]){C=q.getText();if(d.test(C))q=null;else for(D=q.$.getElementsByTagName("*"),M=
-0;H=D[M++];)if(!CKEDITOR.dtd.$removeEmpty[H.nodeName.toLowerCase()]){q=null;break}q&&(A=!!C.length)}else q=null}else A=1;A&&t&&(n?r=l:this.setEndAfter(l));if(q){A=q.getNext();if(!l&&!A){l=q;q=null;break}q=A}else l=null}l&&(l=c(l.getParent()))}k&&r&&(g=k.contains(r)?r:k,this.setStartBefore(g),this.setEndAfter(g));break;case CKEDITOR.ENLARGE_BLOCK_CONTENTS:case CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:l=new CKEDITOR.dom.range(this.root);h=this.root;l.setStartAt(h,CKEDITOR.POSITION_AFTER_START);l.setEnd(this.startContainer,
-this.startOffset);l=new CKEDITOR.dom.walker(l);var p,Q,P=CKEDITOR.dom.walker.blockBoundary(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?{br:1}:null),v=null,G=function(a){if(a.type==CKEDITOR.NODE_ELEMENT&&"false"==a.getAttribute("contenteditable"))if(v){if(v.equals(a)){v=null;return}}else v=a;else if(v)return;var b=P(a);b||(p=a);return b},e=function(a){var b=G(a);!b&&a.is&&a.is("br")&&(Q=a);return b};l.guard=G;l=l.lastBackward();p=p||h;this.setStartAt(p,!p.is("br")&&(!l&&this.checkStartOfBlock()||l&&p.contains(l))?
-CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_AFTER_END);if(a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS){l=this.clone();l=new CKEDITOR.dom.walker(l);var E=CKEDITOR.dom.walker.whitespaces(),I=CKEDITOR.dom.walker.bookmark();l.evaluator=function(a){return!E(a)&&!I(a)};if((l=l.previous())&&l.type==CKEDITOR.NODE_ELEMENT&&l.is("br"))break}l=this.clone();l.collapse();l.setEndAt(h,CKEDITOR.POSITION_BEFORE_END);l=new CKEDITOR.dom.walker(l);l.guard=a==CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS?e:G;p=v=Q=null;l=l.lastForward();
-p=p||h;this.setEndAt(p,!l&&this.checkEndOfBlock()||l&&p.contains(l)?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_BEFORE_START);Q&&this.setEndAfter(Q)}},shrink:function(a,b,c){if(!this.collapsed){a=a||CKEDITOR.SHRINK_TEXT;var d=this.clone(),e=this.startContainer,m=this.endContainer,g=this.startOffset,h=this.endOffset,k=1,r=1;e&&e.type==CKEDITOR.NODE_TEXT&&(g?g>=e.getLength()?d.setStartAfter(e):(d.setStartBefore(e),k=0):d.setStartBefore(e));m&&m.type==CKEDITOR.NODE_TEXT&&(h?h>=m.getLength()?d.setEndAfter(m):
-(d.setEndAfter(m),r=0):d.setEndBefore(m));var d=new CKEDITOR.dom.walker(d),l=CKEDITOR.dom.walker.bookmark();d.evaluator=function(b){return b.type==(a==CKEDITOR.SHRINK_ELEMENT?CKEDITOR.NODE_ELEMENT:CKEDITOR.NODE_TEXT)};var q;d.guard=function(b,d){if(l(b))return!0;if(a==CKEDITOR.SHRINK_ELEMENT&&b.type==CKEDITOR.NODE_TEXT||d&&b.equals(q)||!1===c&&b.type==CKEDITOR.NODE_ELEMENT&&b.isBlockBoundary()||b.type==CKEDITOR.NODE_ELEMENT&&b.hasAttribute("contenteditable"))return!1;d||b.type!=CKEDITOR.NODE_ELEMENT||
-(q=b);return!0};k&&(e=d[a==CKEDITOR.SHRINK_ELEMENT?"lastForward":"next"]())&&this.setStartAt(e,b?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_START);r&&(d.reset(),(d=d[a==CKEDITOR.SHRINK_ELEMENT?"lastBackward":"previous"]())&&this.setEndAt(d,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_END));return!(!k&&!r)}},insertNode:function(a){this.optimizeBookmark();this.trim(!1,!0);var b=this.startContainer,c=b.getChild(this.startOffset);c?a.insertBefore(c):b.append(a);a.getParent()&&a.getParent().equals(this.endContainer)&&
-this.endOffset++;this.setStartBefore(a)},moveToPosition:function(a,b){this.setStartAt(a,b);this.collapse(!0)},moveToRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,a.type==CKEDITOR.NODE_TEXT?a.getLength():a.getChildCount())},setStart:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex(),b=b.getParent());this._setStartContainer(b);this.startOffset=
-c;this.endContainer||(this._setEndContainer(b),this.endOffset=c);a(this)},setEnd:function(b,c){b.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$empty[b.getName()]&&(c=b.getIndex()+1,b=b.getParent());this._setEndContainer(b);this.endOffset=c;this.startContainer||(this._setStartContainer(b),this.startOffset=c);a(this)},setStartAfter:function(a){this.setStart(a.getParent(),a.getIndex()+1)},setStartBefore:function(a){this.setStart(a.getParent(),a.getIndex())},setEndAfter:function(a){this.setEnd(a.getParent(),
-a.getIndex()+1)},setEndBefore:function(a){this.setEnd(a.getParent(),a.getIndex())},setStartAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setStart(b,0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setStart(b,b.getLength()):this.setStart(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setStartBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setStartAfter(b)}a(this)},setEndAt:function(b,c){switch(c){case CKEDITOR.POSITION_AFTER_START:this.setEnd(b,
-0);break;case CKEDITOR.POSITION_BEFORE_END:b.type==CKEDITOR.NODE_TEXT?this.setEnd(b,b.getLength()):this.setEnd(b,b.getChildCount());break;case CKEDITOR.POSITION_BEFORE_START:this.setEndBefore(b);break;case CKEDITOR.POSITION_AFTER_END:this.setEndAfter(b)}a(this)},fixBlock:function(a,b){var c=this.createBookmark(),d=this.document.createElement(b);this.collapse(a);this.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS);this.extractContents().appendTo(d);d.trim();this.insertNode(d);var e=d.getBogus();e&&e.remove();
-d.appendBogus();this.moveToBookmark(c);return d},splitBlock:function(a,b){var c=new CKEDITOR.dom.elementPath(this.startContainer,this.root),d=new CKEDITOR.dom.elementPath(this.endContainer,this.root),e=c.block,m=d.block,g=null;if(!c.blockLimit.equals(d.blockLimit))return null;"br"!=a&&(e||(e=this.fixBlock(!0,a),m=(new CKEDITOR.dom.elementPath(this.endContainer,this.root)).block),m||(m=this.fixBlock(!1,a)));c=e&&this.checkStartOfBlock();d=m&&this.checkEndOfBlock();this.deleteContents();e&&e.equals(m)&&
-(d?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(m,CKEDITOR.POSITION_AFTER_END),m=null):c?(g=new CKEDITOR.dom.elementPath(this.startContainer,this.root),this.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e=null):(m=this.splitElement(e,b||!1),e.is("ul","ol")||e.appendBogus()));return{previousBlock:e,nextBlock:m,wasStartOfBlock:c,wasEndOfBlock:d,elementPath:g}},splitElement:function(a,b){if(!this.collapsed)return null;this.setEndAt(a,CKEDITOR.POSITION_BEFORE_END);
-var c=this.extractContents(!1,b||!1),d=a.clone(!1,b||!1);c.appendTo(d);d.insertAfter(a);this.moveToPosition(a,CKEDITOR.POSITION_AFTER_END);return d},removeEmptyBlocksAtEnd:function(){function a(d){return function(a){return b(a)||c(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.isEmptyInlineRemoveable()||d.is("table")&&a.is("caption")?!1:!0}}var b=CKEDITOR.dom.walker.whitespaces(),c=CKEDITOR.dom.walker.bookmark(!1);return function(b){for(var c=this.createBookmark(),d=this[b?"endPath":"startPath"](),e=d.block||
-d.blockLimit,g;e&&!e.equals(d.root)&&!e.getFirst(a(e));)g=e.getParent(),this[b?"setEndAt":"setStartAt"](e,CKEDITOR.POSITION_AFTER_END),e.remove(1),e=g;this.moveToBookmark(c)}}(),startPath:function(){return new CKEDITOR.dom.elementPath(this.startContainer,this.root)},endPath:function(){return new CKEDITOR.dom.elementPath(this.endContainer,this.root)},checkBoundaryOfElement:function(a,b){var d=b==CKEDITOR.START,e=this.clone();e.collapse(d);e[d?"setStartAt":"setEndAt"](a,d?CKEDITOR.POSITION_AFTER_START:
-CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);e.evaluator=c(d);return e[d?"checkBackward":"checkForward"]()},checkStartOfBlock:function(){var a=this.startContainer,c=this.startOffset;CKEDITOR.env.ie&&c&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.ltrim(a.substring(0,c)),h.test(a)&&this.trim(0,1));this.trim();a=new CKEDITOR.dom.elementPath(this.startContainer,this.root);c=this.clone();c.collapse(!0);c.setStartAt(a.block||a.blockLimit,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(c);
-a.evaluator=b();return a.checkBackward()},checkEndOfBlock:function(){var a=this.endContainer,c=this.endOffset;CKEDITOR.env.ie&&a.type==CKEDITOR.NODE_TEXT&&(a=CKEDITOR.tools.rtrim(a.substring(c)),h.test(a)&&this.trim(1,0));this.trim();a=new CKEDITOR.dom.elementPath(this.endContainer,this.root);c=this.clone();c.collapse(!1);c.setEndAt(a.block||a.blockLimit,CKEDITOR.POSITION_BEFORE_END);a=new CKEDITOR.dom.walker(c);a.evaluator=b();return a.checkForward()},getPreviousNode:function(a,b,c){var d=this.clone();
-d.collapse(1);d.setStartAt(c||this.root,CKEDITOR.POSITION_AFTER_START);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.previous()},getNextNode:function(a,b,c){var d=this.clone();d.collapse();d.setEndAt(c||this.root,CKEDITOR.POSITION_BEFORE_END);c=new CKEDITOR.dom.walker(d);c.evaluator=a;c.guard=b;return c.next()},checkReadOnly:function(){function a(b,c){for(;b;){if(b.type==CKEDITOR.NODE_ELEMENT){if("false"==b.getAttribute("contentEditable")&&!b.data("cke-editable"))return 0;if(b.is("html")||
-"true"==b.getAttribute("contentEditable")&&(b.contains(c)||b.equals(c)))break}b=b.getParent()}return 1}return function(){var b=this.startContainer,c=this.endContainer;return!(a(b,c)&&a(c,b))}}(),moveToElementEditablePosition:function(a,b){if(a.type==CKEDITOR.NODE_ELEMENT&&!a.isEditable(!1))return this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START),!0;for(var c=0;a;){if(a.type==CKEDITOR.NODE_TEXT){b&&this.endContainer&&this.checkEndOfBlock()&&h.test(a.getText())?this.moveToPosition(a,
-CKEDITOR.POSITION_BEFORE_START):this.moveToPosition(a,b?CKEDITOR.POSITION_AFTER_END:CKEDITOR.POSITION_BEFORE_START);c=1;break}if(a.type==CKEDITOR.NODE_ELEMENT)if(a.isEditable())this.moveToPosition(a,b?CKEDITOR.POSITION_BEFORE_END:CKEDITOR.POSITION_AFTER_START),c=1;else if(b&&a.is("br")&&this.endContainer&&this.checkEndOfBlock())this.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);else if("false"==a.getAttribute("contenteditable")&&a.is(CKEDITOR.dtd.$block))return this.setStartBefore(a),this.setEndAfter(a),
-!0;var d=a,e=c,m=void 0;d.type==CKEDITOR.NODE_ELEMENT&&d.isEditable(!1)&&(m=d[b?"getLast":"getFirst"](r));e||m||(m=d[b?"getPrevious":"getNext"](r));a=m}return!!c},moveToClosestEditablePosition:function(a,b){var c,d=0,e,m,g=[CKEDITOR.POSITION_AFTER_END,CKEDITOR.POSITION_BEFORE_START];a?(c=new CKEDITOR.dom.range(this.root),c.moveToPosition(a,g[b?0:1])):c=this.clone();if(a&&!a.is(CKEDITOR.dtd.$block))d=1;else if(e=c[b?"getNextEditableNode":"getPreviousEditableNode"]())d=1,(m=e.type==CKEDITOR.NODE_ELEMENT)&&
-e.is(CKEDITOR.dtd.$block)&&"false"==e.getAttribute("contenteditable")?(c.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),c.setEndAt(e,CKEDITOR.POSITION_AFTER_END)):!CKEDITOR.env.needsBrFiller&&m&&e.is(CKEDITOR.dom.walker.validEmptyBlockContainers)?(c.setEnd(e,0),c.collapse()):c.moveToPosition(e,g[b?1:0]);d&&this.moveToRange(c);return!!d},moveToElementEditStart:function(a){return this.moveToElementEditablePosition(a)},moveToElementEditEnd:function(a){return this.moveToElementEditablePosition(a,!0)},getEnclosedNode:function(){var a=
-this.clone();a.optimize();if(a.startContainer.type!=CKEDITOR.NODE_ELEMENT||a.endContainer.type!=CKEDITOR.NODE_ELEMENT)return null;var a=new CKEDITOR.dom.walker(a),b=CKEDITOR.dom.walker.bookmark(!1,!0),c=CKEDITOR.dom.walker.whitespaces(!0);a.evaluator=function(a){return c(a)&&b(a)};var d=a.next();a.reset();return d&&d.equals(a.previous())?d:null},getTouchedStartNode:function(){var a=this.startContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.startOffset)||a},getTouchedEndNode:function(){var a=
-this.endContainer;return this.collapsed||a.type!=CKEDITOR.NODE_ELEMENT?a:a.getChild(this.endOffset-1)||a},getNextEditableNode:e(),getPreviousEditableNode:e(1),scrollIntoView:function(){var a=new CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",this.document),b,c,d,e=this.clone();e.optimize();(d=e.startContainer.type==CKEDITOR.NODE_TEXT)?(c=e.startContainer.getText(),b=e.startContainer.split(e.startOffset),a.insertAfter(e.startContainer)):e.insertNode(a);a.scrollIntoView();
-d&&(e.startContainer.setText(c),b.remove());a.remove()},_setStartContainer:function(a){this.startContainer=a},_setEndContainer:function(a){this.endContainer=a},_find:function(a,b){var c=this.getCommonAncestor(),d=this.getBoundaryNodes(),e=[],m,g,h,k;if(c&&c.find)for(g=c.find(a),m=0;m<g.count();m++)if(c=g.getItem(m),b||!c.isReadOnly())h=c.getPosition(d.startNode)&CKEDITOR.POSITION_FOLLOWING||d.startNode.equals(c),k=c.getPosition(d.endNode)&CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_IS_CONTAINED,
-h&&k&&e.push(c);return e}}})();CKEDITOR.POSITION_AFTER_START=1;CKEDITOR.POSITION_BEFORE_END=2;CKEDITOR.POSITION_BEFORE_START=3;CKEDITOR.POSITION_AFTER_END=4;CKEDITOR.ENLARGE_ELEMENT=1;CKEDITOR.ENLARGE_BLOCK_CONTENTS=2;CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS=3;CKEDITOR.ENLARGE_INLINE=4;CKEDITOR.START=1;CKEDITOR.END=2;CKEDITOR.SHRINK_ELEMENT=1;CKEDITOR.SHRINK_TEXT=2;"use strict";
-(function(){function a(a){1>arguments.length||(this.range=a,this.forceBrBreak=0,this.enlargeBr=1,this.enforceRealBlocks=0,this._||(this._={}))}function d(a){var b=[];a.forEach(function(a){if("true"==a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function b(a,c,e,g){a:{null==g&&(g=d(e));for(var h;h=g.shift();)if(h.getDtd().p){g={element:h,remaining:g};break a}g=null}if(!g)return 0;if((h=CKEDITOR.filter.instances[g.element.data("cke-filter")])&&!h.check(c))return b(a,
-c,e,g.remaining);c=new CKEDITOR.dom.range(g.element);c.selectNodeContents(g.element);c=c.createIterator();c.enlargeBr=a.enlargeBr;c.enforceRealBlocks=a.enforceRealBlocks;c.activeFilter=c.filter=h;a._.nestedEditable={element:g.element,container:e,remaining:g.remaining,iterator:c};return 1}function c(a,b,c){if(!b)return!1;a=a.clone();a.collapse(!c);return a.checkBoundaryOfElement(b,c?CKEDITOR.START:CKEDITOR.END)}var e=/^[\r\n\t ]+$/,g=CKEDITOR.dom.walker.bookmark(!1,!0),k=CKEDITOR.dom.walker.whitespaces(!0),
-h=function(a){return g(a)&&k(a)},p={dd:1,dt:1,li:1};a.prototype={getNextParagraph:function(a){var d,k,u,z,y;a=a||"p";if(this._.nestedEditable){if(d=this._.nestedEditable.iterator.getNextParagraph(a))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,d;this.activeFilter=this.filter;if(b(this,a,this._.nestedEditable.container,this._.nestedEditable.remaining))return this.activeFilter=this._.nestedEditable.iterator.activeFilter,this._.nestedEditable.iterator.getNextParagraph(a);this._.nestedEditable=
-null}if(!this.range.root.getDtd()[a])return null;if(!this._.started){var m=this.range.clone();k=m.startPath();var x=m.endPath(),J=!m.collapsed&&c(m,k.block),w=!m.collapsed&&c(m,x.block,1);m.shrink(CKEDITOR.SHRINK_ELEMENT,!0);J&&m.setStartAt(k.block,CKEDITOR.POSITION_BEFORE_END);w&&m.setEndAt(x.block,CKEDITOR.POSITION_AFTER_START);k=m.endContainer.hasAscendant("pre",!0)||m.startContainer.hasAscendant("pre",!0);m.enlarge(this.forceBrBreak&&!k||!this.enlargeBr?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);
-m.collapsed||(k=new CKEDITOR.dom.walker(m.clone()),x=CKEDITOR.dom.walker.bookmark(!0,!0),k.evaluator=x,this._.nextNode=k.next(),k=new CKEDITOR.dom.walker(m.clone()),k.evaluator=x,k=k.previous(),this._.lastNode=k.getNextSourceNode(!0,null,m.root),this._.lastNode&&this._.lastNode.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(this._.lastNode.getText())&&this._.lastNode.getParent().isBlockBoundary()&&(x=this.range.clone(),x.moveToPosition(this._.lastNode,CKEDITOR.POSITION_AFTER_END),x.checkEndOfBlock()&&
-(x=new CKEDITOR.dom.elementPath(x.endContainer,x.root),this._.lastNode=(x.block||x.blockLimit).getNextSourceNode(!0))),this._.lastNode&&m.root.contains(this._.lastNode)||(this._.lastNode=this._.docEndMarker=m.document.createText(""),this._.lastNode.insertAfter(k)),m=null);this._.started=1;k=m}x=this._.nextNode;m=this._.lastNode;for(this._.nextNode=null;x;){var J=0,w=x.hasAscendant("pre"),F=x.type!=CKEDITOR.NODE_ELEMENT,l=0;if(F)x.type==CKEDITOR.NODE_TEXT&&e.test(x.getText())&&(F=0);else{var q=x.getName();
-if(CKEDITOR.dtd.$block[q]&&"false"==x.getAttribute("contenteditable")){d=x;b(this,a,d);break}else if(x.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){if("br"==q)F=1;else if(!k&&!x.getChildCount()&&"hr"!=q){d=x;u=x.equals(m);break}k&&(k.setEndAt(x,CKEDITOR.POSITION_BEFORE_START),"br"!=q&&(this._.nextNode=x));J=1}else{if(x.getFirst()){k||(k=this.range.clone(),k.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));x=x.getFirst();continue}F=1}}F&&!k&&(k=this.range.clone(),k.setStartAt(x,CKEDITOR.POSITION_BEFORE_START));
-u=(!J||F)&&x.equals(m);if(k&&!J)for(;!x.getNext(h)&&!u;){q=x.getParent();if(q.isBlockBoundary(this.forceBrBreak&&!w&&{br:1})){J=1;F=0;u||q.equals(m);k.setEndAt(q,CKEDITOR.POSITION_BEFORE_END);break}x=q;F=1;u=x.equals(m);l=1}F&&k.setEndAt(x,CKEDITOR.POSITION_AFTER_END);x=this._getNextSourceNode(x,l,m);if((u=!x)||J&&k)break}if(!d){if(!k)return this._.docEndMarker&&this._.docEndMarker.remove(),this._.nextNode=null;d=new CKEDITOR.dom.elementPath(k.startContainer,k.root);x=d.blockLimit;J={div:1,th:1,td:1};
-d=d.block;!d&&x&&!this.enforceRealBlocks&&J[x.getName()]&&k.checkStartOfBlock()&&k.checkEndOfBlock()&&!x.equals(k.root)?d=x:!d||this.enforceRealBlocks&&d.is(p)?(d=this.range.document.createElement(a),k.extractContents().appendTo(d),d.trim(),k.insertNode(d),z=y=!0):"li"!=d.getName()?k.checkStartOfBlock()&&k.checkEndOfBlock()||(d=d.clone(!1),k.extractContents().appendTo(d),d.trim(),y=k.splitBlock(),z=!y.wasStartOfBlock,y=!y.wasEndOfBlock,k.insertNode(d)):u||(this._.nextNode=d.equals(m)?null:this._getNextSourceNode(k.getBoundaryNodes().endNode,
-1,m))}z&&(z=d.getPrevious())&&z.type==CKEDITOR.NODE_ELEMENT&&("br"==z.getName()?z.remove():z.getLast()&&"br"==z.getLast().$.nodeName.toLowerCase()&&z.getLast().remove());y&&(z=d.getLast())&&z.type==CKEDITOR.NODE_ELEMENT&&"br"==z.getName()&&(!CKEDITOR.env.needsBrFiller||z.getPrevious(g)||z.getNext(g))&&z.remove();this._.nextNode||(this._.nextNode=u||d.equals(m)||!m?null:this._getNextSourceNode(d,1,m));return d},_getNextSourceNode:function(a,b,c){function d(a){return!(a.equals(c)||a.equals(e))}var e=
-this.range.root;for(a=a.getNextSourceNode(b,null,d);!g(a);)a=a.getNextSourceNode(b,null,d);return a}};CKEDITOR.dom.range.prototype.createIterator=function(){return new a(this)}})();
-CKEDITOR.command=function(a,d){this.uiItems=[];this.exec=function(b){if(this.state==CKEDITOR.TRISTATE_DISABLED||!this.checkAllowed())return!1;this.editorFocus&&a.focus();return!1===this.fire("exec")?!0:!1!==d.exec.call(this,a,b)};this.refresh=function(a,b){if(!this.readOnly&&a.readOnly)return!0;if(this.context&&!b.isContextFor(this.context)||!this.checkAllowed(!0))return this.disable(),!0;this.startDisabled||this.enable();this.modes&&!this.modes[a.mode]&&this.disable();return!1===this.fire("refresh",
-{editor:a,path:b})?!0:d.refresh&&!1!==d.refresh.apply(this,arguments)};var b;this.checkAllowed=function(c){return c||"boolean"!=typeof b?b=a.activeFilter.checkFeature(this):b};CKEDITOR.tools.extend(this,d,{modes:{wysiwyg:1},editorFocus:1,contextSensitive:!!d.context,state:CKEDITOR.TRISTATE_DISABLED});CKEDITOR.event.call(this)};
-CKEDITOR.command.prototype={enable:function(){this.state==CKEDITOR.TRISTATE_DISABLED&&this.checkAllowed()&&this.setState(this.preserveState&&"undefined"!=typeof this.previousState?this.previousState:CKEDITOR.TRISTATE_OFF)},disable:function(){this.setState(CKEDITOR.TRISTATE_DISABLED)},setState:function(a){if(this.state==a||a!=CKEDITOR.TRISTATE_DISABLED&&!this.checkAllowed())return!1;this.previousState=this.state;this.state=a;this.fire("state");return!0},toggleState:function(){this.state==CKEDITOR.TRISTATE_OFF?
-this.setState(CKEDITOR.TRISTATE_ON):this.state==CKEDITOR.TRISTATE_ON&&this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.event.implementOn(CKEDITOR.command.prototype);CKEDITOR.ENTER_P=1;CKEDITOR.ENTER_BR=2;CKEDITOR.ENTER_DIV=3;
-CKEDITOR.config={customConfig:"config.js",autoUpdateElement:!0,language:"",defaultLanguage:"en",contentsLangDirection:"",enterMode:CKEDITOR.ENTER_P,forceEnterMode:!1,shiftEnterMode:CKEDITOR.ENTER_BR,docType:"\x3c!DOCTYPE html\x3e",bodyId:"",bodyClass:"",fullPage:!1,height:200,contentsCss:CKEDITOR.getUrl("contents.css"),extraPlugins:"",removePlugins:"",protectedSource:[],tabIndex:0,width:"",baseFloatZIndex:1E4,blockedKeystrokes:[CKEDITOR.CTRL+66,CKEDITOR.CTRL+73,CKEDITOR.CTRL+85]};
-(function(){function a(a,b,c,d,l){var e,q;a=[];for(e in b){q=b[e];q="boolean"==typeof q?{}:"function"==typeof q?{match:q}:M(q);"$"!=e.charAt(0)&&(q.elements=e);c&&(q.featureName=c.toLowerCase());var n=q;n.elements=k(n.elements,/\s+/)||null;n.propertiesOnly=n.propertiesOnly||!0===n.elements;var f=/\s*,\s*/,t=void 0;for(t in Q){n[t]=k(n[t],f)||null;var m=n,g=P[t],E=k(n[P[t]],f),v=n[t],A=[],I=!0,C=void 0;E?I=!1:E={};for(C in v)"!"==C.charAt(0)&&(C=C.slice(1),A.push(C),E[C]=!0,I=!1);for(;C=A.pop();)v[C]=
-v["!"+C],delete v["!"+C];m[g]=(I?!1:E)||null}n.match=n.match||null;d.push(q);a.push(q)}b=l.elements;l=l.generic;var h;c=0;for(d=a.length;c<d;++c){e=M(a[c]);q=!0===e.classes||!0===e.styles||!0===e.attributes;n=e;t=g=f=void 0;for(f in Q)n[f]=J(n[f]);m=!0;for(t in P){f=P[t];g=n[f];E=[];v=void 0;for(v in g)-1<v.indexOf("*")?E.push(new RegExp("^"+v.replace(/\*/g,".*")+"$")):E.push(v);g=E;g.length&&(n[f]=g,m=!1)}n.nothingRequired=m;n.noProperties=!(n.attributes||n.classes||n.styles);if(!0===e.elements||
-null===e.elements)l[q?"unshift":"push"](e);else for(h in n=e.elements,delete e.elements,n)if(b[h])b[h][q?"unshift":"push"](e);else b[h]=[e]}}function d(a,c,d,l){if(!a.match||a.match(c))if(l||h(a,c))if(a.propertiesOnly||(d.valid=!0),d.allAttributes||(d.allAttributes=b(a.attributes,c.attributes,d.validAttributes)),d.allStyles||(d.allStyles=b(a.styles,c.styles,d.validStyles)),!d.allClasses){a=a.classes;c=c.classes;l=d.validClasses;if(a)if(!0===a)a=!0;else{for(var e=0,q=c.length,n;e<q;++e)n=c[e],l[n]||
-(l[n]=a(n));a=!1}else a=!1;d.allClasses=a}}function b(a,b,c){if(!a)return!1;if(!0===a)return!0;for(var d in b)c[d]||(c[d]=a(d));return!1}function c(a,b,c){if(!a.match||a.match(b)){if(a.noProperties)return!1;c.hadInvalidAttribute=e(a.attributes,b.attributes)||c.hadInvalidAttribute;c.hadInvalidStyle=e(a.styles,b.styles)||c.hadInvalidStyle;a=a.classes;b=b.classes;if(a){for(var d=!1,l=!0===a,q=b.length;q--;)if(l||a(b[q]))b.splice(q,1),d=!0;a=d}else a=!1;c.hadInvalidClass=a||c.hadInvalidClass}}function e(a,
-b){if(!a)return!1;var c=!1,d=!0===a,l;for(l in b)if(d||a(l))delete b[l],c=!0;return c}function g(a,b,c){if(a.disabled||a.customConfig&&!c||!b)return!1;a._.cachedChecks={};return!0}function k(a,b){if(!a)return!1;if(!0===a)return a;if("string"==typeof a)return a=H(a),"*"==a?!0:CKEDITOR.tools.convertArrayToObject(a.split(b));if(CKEDITOR.tools.isArray(a))return a.length?CKEDITOR.tools.convertArrayToObject(a):!1;var c={},d=0,l;for(l in a)c[l]=a[l],d++;return d?c:!1}function h(a,b){if(a.nothingRequired)return!0;
-var c,d,l,e;if(l=a.requiredClasses)for(e=b.classes,c=0;c<l.length;++c)if(d=l[c],"string"==typeof d){if(-1==CKEDITOR.tools.indexOf(e,d))return!1}else if(!CKEDITOR.tools.checkIfAnyArrayItemMatches(e,d))return!1;return p(b.styles,a.requiredStyles)&&p(b.attributes,a.requiredAttributes)}function p(a,b){if(!b)return!0;for(var c=0,d;c<b.length;++c)if(d=b[c],"string"==typeof d){if(!(d in a))return!1}else if(!CKEDITOR.tools.checkIfAnyObjectPropertyMatches(a,d))return!1;return!0}function r(a){if(!a)return{};
-a=a.split(/\s*,\s*/).sort();for(var b={};a.length;)b[a.shift()]="cke-test";return b}function f(a){var b,c,d,l,e={},q=1;for(a=H(a);b=a.match(v);)(c=b[2])?(d=B(c,"styles"),l=B(c,"attrs"),c=B(c,"classes")):d=l=c=null,e["$"+q++]={elements:b[1],classes:c,styles:d,attributes:l},a=a.slice(b[0].length);return e}function B(a,b){var c=a.match(G[b]);return c?H(c[1]):null}function u(a){var b=a.styleBackup=a.attributes.style,c=a.classBackup=a.attributes["class"];a.styles||(a.styles=CKEDITOR.tools.parseCssText(b||
-"",1));a.classes||(a.classes=c?c.split(/\s+/):[])}function z(a,b,l,e){var n=0,f;e.toHtml&&(b.name=b.name.replace(E,"$1"));if(e.doCallbacks&&a.elementCallbacks){a:{f=a.elementCallbacks;for(var t=0,g=f.length,v;t<g;++t)if(v=f[t](b)){f=v;break a}f=void 0}if(f)return f}if(e.doTransform&&(f=a._.transformations[b.name])){u(b);for(t=0;t<f.length;++t)q(a,b,f[t]);m(b)}if(e.doFilter){a:{t=b.name;g=a._;a=g.allowedRules.elements[t];f=g.allowedRules.generic;t=g.disallowedRules.elements[t];g=g.disallowedRules.generic;
-v=e.skipRequired;var A={valid:!1,validAttributes:{},validClasses:{},validStyles:{},allAttributes:!1,allClasses:!1,allStyles:!1,hadInvalidAttribute:!1,hadInvalidClass:!1,hadInvalidStyle:!1},k,C;if(a||f){u(b);if(t)for(k=0,C=t.length;k<C;++k)if(!1===c(t[k],b,A)){a=null;break a}if(g)for(k=0,C=g.length;k<C;++k)c(g[k],b,A);if(a)for(k=0,C=a.length;k<C;++k)d(a[k],b,A,v);if(f)for(k=0,C=f.length;k<C;++k)d(f[k],b,A,v);a=A}else a=null}if(!a||!a.valid)return l.push(b),1;C=a.validAttributes;var h=a.validStyles;
-f=a.validClasses;var t=b.attributes,M=b.styles,g=b.classes;v=b.classBackup;var K=b.styleBackup,G,D,p=[],A=[],H=/^data-cke-/;k=!1;delete t.style;delete t["class"];delete b.classBackup;delete b.styleBackup;if(!a.allAttributes)for(G in t)C[G]||(H.test(G)?G==(D=G.replace(/^data-cke-saved-/,""))||C[D]||(delete t[G],k=!0):(delete t[G],k=!0));if(!a.allStyles||a.hadInvalidStyle){for(G in M)a.allStyles||h[G]?p.push(G+":"+M[G]):k=!0;p.length&&(t.style=p.sort().join("; "))}else K&&(t.style=K);if(!a.allClasses||
-a.hadInvalidClass){for(G=0;G<g.length;++G)(a.allClasses||f[g[G]])&&A.push(g[G]);A.length&&(t["class"]=A.sort().join(" "));v&&A.length<v.split(/\s+/).length&&(k=!0)}else v&&(t["class"]=v);k&&(n=1);if(!e.skipFinalValidation&&!x(b))return l.push(b),1}e.toHtml&&(b.name=b.name.replace(I,"cke:$1"));return n}function y(a){var b=[],c;for(c in a)-1<c.indexOf("*")&&b.push(c.replace(/\*/g,".*"));return b.length?new RegExp("^(?:"+b.join("|")+")$"):null}function m(a){var b=a.attributes,c;delete b.style;delete b["class"];
-if(c=CKEDITOR.tools.writeCssText(a.styles,!0))b.style=c;a.classes.length&&(b["class"]=a.classes.sort().join(" "))}function x(a){switch(a.name){case "a":if(!(a.children.length||a.attributes.name||a.attributes.id))return!1;break;case "img":if(!a.attributes.src)return!1}return!0}function J(a){if(!a)return!1;if(!0===a)return!0;var b=y(a);return function(c){return c in a||b&&c.match(b)}}function w(){return new CKEDITOR.htmlParser.element("br")}function F(a){return a.type==CKEDITOR.NODE_ELEMENT&&("br"==
-a.name||D.$block[a.name])}function l(a,b,c){var d=a.name;if(D.$empty[d]||!a.children.length)"hr"==d&&"br"==b?a.replaceWith(w()):(a.parent&&c.push({check:"it",el:a.parent}),a.remove());else if(D.$block[d]||"tr"==d)if("br"==b)a.previous&&!F(a.previous)&&(b=w(),b.insertBefore(a)),a.next&&!F(a.next)&&(b=w(),b.insertAfter(a)),a.replaceWithChildren();else{var d=a.children,l;b:{l=D[b];for(var e=0,q=d.length,n;e<q;++e)if(n=d[e],n.type==CKEDITOR.NODE_ELEMENT&&!l[n.name]){l=!1;break b}l=!0}if(l)a.name=b,a.attributes=
-{},c.push({check:"parent-down",el:a});else{l=a.parent;for(var e=l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||"body"==l.name,t,f,q=d.length;0<q;)n=d[--q],e&&(n.type==CKEDITOR.NODE_TEXT||n.type==CKEDITOR.NODE_ELEMENT&&D.$inline[n.name])?(t||(t=new CKEDITOR.htmlParser.element(b),t.insertAfter(a),c.push({check:"parent-down",el:t})),t.add(n,0)):(t=null,f=D[l.name]||D.span,n.insertAfter(a),l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||n.type!=CKEDITOR.NODE_ELEMENT||f[n.name]||c.push({check:"el-up",el:n}));a.remove()}}else d in
-{style:1,script:1}?a.remove():(a.parent&&c.push({check:"it",el:a.parent}),a.replaceWithChildren())}function q(a,b,c){var d,l;for(d=0;d<c.length;++d)if(l=c[d],!(l.check&&!a.check(l.check,!1)||l.left&&!l.left(b))){l.right(b,K);break}}function n(a,b){var c=b.getDefinition(),d=c.attributes,l=c.styles,e,q,n,t;if(a.name!=c.element)return!1;for(e in d)if("class"==e)for(c=d[e].split(/\s+/),n=a.classes.join("|");t=c.pop();){if(-1==n.indexOf(t))return!1}else if(a.attributes[e]!=d[e])return!1;for(q in l)if(a.styles[q]!=
-l[q])return!1;return!0}function t(a,b){var c,d;"string"==typeof a?c=a:a instanceof CKEDITOR.style?d=a:(c=a[0],d=a[1]);return[{element:c,left:d,right:function(a,c){c.transform(a,b)}}]}function A(a){return function(b){return n(b,a)}}function C(a){return function(b,c){c[a](b)}}var D=CKEDITOR.dtd,M=CKEDITOR.tools.copy,H=CKEDITOR.tools.trim,R=["","p","br","div"];CKEDITOR.FILTER_SKIP_TREE=2;CKEDITOR.filter=function(a){this.allowedContent=[];this.disallowedContent=[];this.elementCallbacks=null;this.disabled=
-!1;this.editor=null;this.id=CKEDITOR.tools.getNextNumber();this._={allowedRules:{elements:{},generic:[]},disallowedRules:{elements:{},generic:[]},transformations:{},cachedTests:{}};CKEDITOR.filter.instances[this.id]=this;if(a instanceof CKEDITOR.editor){a=this.editor=a;this.customConfig=!0;var b=a.config.allowedContent;!0===b?this.disabled=!0:(b||(this.customConfig=!1),this.allow(b,"config",1),this.allow(a.config.extraAllowedContent,"extra",1),this.allow(R[a.enterMode]+" "+R[a.shiftEnterMode],"default",
-1),this.disallow(a.config.disallowedContent))}else this.customConfig=!1,this.allow(a,"default",1)};CKEDITOR.filter.instances={};CKEDITOR.filter.prototype={allow:function(b,c,d){if(!g(this,b,d))return!1;var l,e;if("string"==typeof b)b=f(b);else if(b instanceof CKEDITOR.style){if(b.toAllowedContentRules)return this.allow(b.toAllowedContentRules(this.editor),c,d);l=b.getDefinition();b={};d=l.attributes;b[l.element]=l={styles:l.styles,requiredStyles:l.styles&&CKEDITOR.tools.objectKeys(l.styles)};d&&(d=
-M(d),l.classes=d["class"]?d["class"].split(/\s+/):null,l.requiredClasses=l.classes,delete d["class"],l.attributes=d,l.requiredAttributes=d&&CKEDITOR.tools.objectKeys(d))}else if(CKEDITOR.tools.isArray(b)){for(l=0;l<b.length;++l)e=this.allow(b[l],c,d);return e}a(this,b,c,this.allowedContent,this._.allowedRules);return!0},applyTo:function(a,b,c,d){if(this.disabled)return!1;var e=this,q=[],n=this.editor&&this.editor.config.protectedSource,t,f=!1,g={doFilter:!c,doTransform:!0,doCallbacks:!0,toHtml:b};
-a.forEach(function(a){if(a.type==CKEDITOR.NODE_ELEMENT){if("off"==a.attributes["data-cke-filter"])return!1;if(!b||"span"!=a.name||!~CKEDITOR.tools.objectKeys(a.attributes).join("|").indexOf("data-cke-"))if(t=z(e,a,q,g),t&1)f=!0;else if(t&2)return!1}else if(a.type==CKEDITOR.NODE_COMMENT&&a.value.match(/^\{cke_protected\}(?!\{C\})/)){var c;a:{var d=decodeURIComponent(a.value.replace(/^\{cke_protected\}/,""));c=[];var l,m,E;if(n)for(m=0;m<n.length;++m)if((E=d.match(n[m]))&&E[0].length==d.length){c=!0;
-break a}d=CKEDITOR.htmlParser.fragment.fromHtml(d);1==d.children.length&&(l=d.children[0]).type==CKEDITOR.NODE_ELEMENT&&z(e,l,c,g);c=!c.length}c||q.push(a)}},null,!0);q.length&&(f=!0);var m;a=[];d=R[d||(this.editor?this.editor.enterMode:CKEDITOR.ENTER_P)];for(var E;c=q.pop();)c.type==CKEDITOR.NODE_ELEMENT?l(c,d,a):c.remove();for(;m=a.pop();)if(c=m.el,c.parent)switch(E=D[c.parent.name]||D.span,m.check){case "it":D.$removeEmpty[c.name]&&!c.children.length?l(c,d,a):x(c)||l(c,d,a);break;case "el-up":c.parent.type==
-CKEDITOR.NODE_DOCUMENT_FRAGMENT||E[c.name]||l(c,d,a);break;case "parent-down":c.parent.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT||E[c.name]||l(c.parent,d,a)}return f},checkFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));return!a.requiredContent||this.check(a.requiredContent)},disable:function(){this.disabled=!0},disallow:function(b){if(!g(this,b,!0))return!1;"string"==typeof b&&(b=f(b));a(this,b,null,this.disallowedContent,this._.disallowedRules);return!0},
-addContentForms:function(a){if(!this.disabled&&a){var b,c,d=[],l;for(b=0;b<a.length&&!l;++b)c=a[b],("string"==typeof c||c instanceof CKEDITOR.style)&&this.check(c)&&(l=c);if(l){for(b=0;b<a.length;++b)d.push(t(a[b],l));this.addTransformations(d)}}},addElementCallback:function(a){this.elementCallbacks||(this.elementCallbacks=[]);this.elementCallbacks.push(a)},addFeature:function(a){if(this.disabled||!a)return!0;a.toFeature&&(a=a.toFeature(this.editor));this.allow(a.allowedContent,a.name);this.addTransformations(a.contentTransformations);
-this.addContentForms(a.contentForms);return a.requiredContent&&(this.customConfig||this.disallowedContent.length)?this.check(a.requiredContent):!0},addTransformations:function(a){var b,c;if(!this.disabled&&a){var d=this._.transformations,l;for(l=0;l<a.length;++l){b=a[l];var e=void 0,q=void 0,n=void 0,t=void 0,f=void 0,g=void 0;c=[];for(q=0;q<b.length;++q)n=b[q],"string"==typeof n?(n=n.split(/\s*:\s*/),t=n[0],f=null,g=n[1]):(t=n.check,f=n.left,g=n.right),e||(e=n,e=e.element?e.element:t?t.match(/^([a-z0-9]+)/i)[0]:
-e.left.getDefinition().element),f instanceof CKEDITOR.style&&(f=A(f)),c.push({check:t==e?null:t,left:f,right:"string"==typeof g?C(g):g});b=e;d[b]||(d[b]=[]);d[b].push(c)}}},check:function(a,b,c){if(this.disabled)return!0;if(CKEDITOR.tools.isArray(a)){for(var d=a.length;d--;)if(this.check(a[d],b,c))return!0;return!1}var l,e;if("string"==typeof a){e=a+"\x3c"+(!1===b?"0":"1")+(c?"1":"0")+"\x3e";if(e in this._.cachedChecks)return this._.cachedChecks[e];d=f(a).$1;l=d.styles;var n=d.classes;d.name=d.elements;
-d.classes=n=n?n.split(/\s*,\s*/):[];d.styles=r(l);d.attributes=r(d.attributes);d.children=[];n.length&&(d.attributes["class"]=n.join(" "));l&&(d.attributes.style=CKEDITOR.tools.writeCssText(d.styles));l=d}else d=a.getDefinition(),l=d.styles,n=d.attributes||{},l&&!CKEDITOR.tools.isEmpty(l)?(l=M(l),n.style=CKEDITOR.tools.writeCssText(l,!0)):l={},l={name:d.element,attributes:n,classes:n["class"]?n["class"].split(/\s+/):[],styles:l,children:[]};var n=CKEDITOR.tools.clone(l),t=[],g;if(!1!==b&&(g=this._.transformations[l.name])){for(d=
-0;d<g.length;++d)q(this,l,g[d]);m(l)}z(this,n,t,{doFilter:!0,doTransform:!1!==b,skipRequired:!c,skipFinalValidation:!c});b=0<t.length?!1:CKEDITOR.tools.objectCompare(l.attributes,n.attributes,!0)?!0:!1;"string"==typeof a&&(this._.cachedChecks[e]=b);return b},getAllowedEnterMode:function(){var a=["p","div","br"],b={p:CKEDITOR.ENTER_P,div:CKEDITOR.ENTER_DIV,br:CKEDITOR.ENTER_BR};return function(c,d){var l=a.slice(),e;if(this.check(R[c]))return c;for(d||(l=l.reverse());e=l.pop();)if(this.check(e))return b[e];
-return CKEDITOR.ENTER_BR}}(),destroy:function(){delete CKEDITOR.filter.instances[this.id];delete this._;delete this.allowedContent;delete this.disallowedContent}};var Q={styles:1,attributes:1,classes:1},P={styles:"requiredStyles",attributes:"requiredAttributes",classes:"requiredClasses"},v=/^([a-z0-9\-*\s]+)((?:\s*\{[!\w\-,\s\*]+\}\s*|\s*\[[!\w\-,\s\*]+\]\s*|\s*\([!\w\-,\s\*]+\)\s*){0,3})(?:;\s*|$)/i,G={styles:/{([^}]+)}/,attrs:/\[([^\]]+)\]/,classes:/\(([^\)]+)\)/},E=/^cke:(object|embed|param)$/,
-I=/^(object|embed|param)$/,K;K=CKEDITOR.filter.transformationsTools={sizeToStyle:function(a){this.lengthToStyle(a,"width");this.lengthToStyle(a,"height")},sizeToAttribute:function(a){this.lengthToAttribute(a,"width");this.lengthToAttribute(a,"height")},lengthToStyle:function(a,b,c){c=c||b;if(!(c in a.styles)){var d=a.attributes[b];d&&(/^\d+$/.test(d)&&(d+="px"),a.styles[c]=d)}delete a.attributes[b]},lengthToAttribute:function(a,b,c){c=c||b;if(!(c in a.attributes)){var d=a.styles[b],l=d&&d.match(/^(\d+)(?:\.\d*)?px$/);
-l?a.attributes[c]=l[1]:"cke-test"==d&&(a.attributes[c]="cke-test")}delete a.styles[b]},alignmentToStyle:function(a){if(!("float"in a.styles)){var b=a.attributes.align;if("left"==b||"right"==b)a.styles["float"]=b}delete a.attributes.align},alignmentToAttribute:function(a){if(!("align"in a.attributes)){var b=a.styles["float"];if("left"==b||"right"==b)a.attributes.align=b}delete a.styles["float"]},splitBorderShorthand:function(a){function b(d){a.styles["border-top-width"]=c[d[0]];a.styles["border-right-width"]=
-c[d[1]];a.styles["border-bottom-width"]=c[d[2]];a.styles["border-left-width"]=c[d[3]]}if(a.styles.border){var c=a.styles.border.match(/([\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:a.styles["border-width"]=c[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}a.styles["border-style"]=a.styles["border-style"]||(a.styles.border.match(/(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/)||[])[0];a.styles["border-style"]||delete a.styles["border-style"];
-delete a.styles.border}},listTypeToStyle:function(a){if(a.attributes.type)switch(a.attributes.type){case "a":a.styles["list-style-type"]="lower-alpha";break;case "A":a.styles["list-style-type"]="upper-alpha";break;case "i":a.styles["list-style-type"]="lower-roman";break;case "I":a.styles["list-style-type"]="upper-roman";break;case "1":a.styles["list-style-type"]="decimal";break;default:a.styles["list-style-type"]=a.attributes.type}},splitMarginShorthand:function(a){function b(d){a.styles["margin-top"]=
-c[d[0]];a.styles["margin-right"]=c[d[1]];a.styles["margin-bottom"]=c[d[2]];a.styles["margin-left"]=c[d[3]]}if(a.styles.margin){var c=a.styles.margin.match(/(\-?[\.\d]+\w+)/g)||["0px"];switch(c.length){case 1:a.styles.margin=c[0];break;case 2:b([0,1,0,1]);break;case 3:b([0,1,2,1]);break;case 4:b([0,1,2,3])}delete a.styles.margin}},matchesStyle:n,transform:function(a,b){if("string"==typeof b)a.name=b;else{var c=b.getDefinition(),d=c.styles,l=c.attributes,e,q,n,t;a.name=c.element;for(e in l)if("class"==
-e)for(c=a.classes.join("|"),n=l[e].split(/\s+/);t=n.pop();)-1==c.indexOf(t)&&a.classes.push(t);else a.attributes[e]=l[e];for(q in d)a.styles[q]=d[q]}}}})();
-(function(){CKEDITOR.focusManager=function(a){if(a.focusManager)return a.focusManager;this.hasFocus=!1;this.currentActive=null;this._={editor:a};return this};CKEDITOR.focusManager._={blurDelay:200};CKEDITOR.focusManager.prototype={focus:function(a){this._.timer&&clearTimeout(this._.timer);a&&(this.currentActive=a);this.hasFocus||this._.locked||((a=CKEDITOR.currentInstance)&&a.focusManager.blur(1),this.hasFocus=!0,(a=this._.editor.container)&&a.addClass("cke_focus"),this._.editor.fire("focus"))},lock:function(){this._.locked=
-1},unlock:function(){delete this._.locked},blur:function(a){function d(){var a=this._.editor;this.hasFocus&&(this.hasFocus=!1,CKEDITOR.env.chrome&&a.editable().isInline()&&a.window&&a.window.$&&a.window.$.getSelection().removeAllRanges(),(a=this._.editor.container)&&a.removeClass("cke_focus"),this._.editor.fire("blur"))}if(!this._.locked){this._.timer&&clearTimeout(this._.timer);var b=CKEDITOR.focusManager._.blurDelay;a||!b?d.call(this):this._.timer=CKEDITOR.tools.setTimeout(function(){delete this._.timer;d.call(this)},
-b,this)}},add:function(a,d){var b=a.getCustomData("focusmanager");if(!b||b!=this){b&&b.remove(a);var b="focus",c="blur";d&&(CKEDITOR.env.ie?(b="focusin",c="focusout"):CKEDITOR.event.useCapture=1);var e={blur:function(){a.equals(this.currentActive)&&this.blur()},focus:function(){this.focus(a)}};a.on(b,e.focus,this);a.on(c,e.blur,this);d&&(CKEDITOR.event.useCapture=0);a.setCustomData("focusmanager",this);a.setCustomData("focusmanager_handlers",e)}},remove:function(a){a.removeCustomData("focusmanager");
-var d=a.removeCustomData("focusmanager_handlers");a.removeListener("blur",d.blur);a.removeListener("focus",d.focus)}}})();CKEDITOR.keystrokeHandler=function(a){if(a.keystrokeHandler)return a.keystrokeHandler;this.keystrokes={};this.blockedKeystrokes={};this._={editor:a};return this};
-(function(){var a,d=function(b){b=b.data;var d=b.getKeystroke(),g=this.keystrokes[d],k=this._.editor;a=!1===k.fire("key",{keyCode:d,domEvent:b});a||(g&&(a=!1!==k.execCommand(g,{from:"keystrokeHandler"})),a||(a=!!this.blockedKeystrokes[d]));a&&b.preventDefault(!0);return!a},b=function(b){a&&(a=!1,b.data.preventDefault(!0))};CKEDITOR.keystrokeHandler.prototype={attach:function(a){a.on("keydown",d,this);if(CKEDITOR.env.gecko&&CKEDITOR.env.mac)a.on("keypress",b,this)}}})();
-(function(){CKEDITOR.lang={languages:{af:1,ar:1,az:1,bg:1,bn:1,bs:1,ca:1,cs:1,cy:1,da:1,de:1,"de-ch":1,el:1,"en-au":1,"en-ca":1,"en-gb":1,en:1,eo:1,es:1,et:1,eu:1,fa:1,fi:1,fo:1,"fr-ca":1,fr:1,gl:1,gu:1,he:1,hi:1,hr:1,hu:1,id:1,is:1,it:1,ja:1,ka:1,km:1,ko:1,ku:1,lt:1,lv:1,mk:1,mn:1,ms:1,nb:1,nl:1,no:1,oc:1,pl:1,"pt-br":1,pt:1,ro:1,ru:1,si:1,sk:1,sl:1,sq:1,"sr-latn":1,sr:1,sv:1,th:1,tr:1,tt:1,ug:1,uk:1,vi:1,"zh-cn":1,zh:1},rtl:{ar:1,fa:1,he:1,ku:1,ug:1},load:function(a,d,b){a&&CKEDITOR.lang.languages[a]||
-(a=this.detect(d,a));var c=this;d=function(){c[a].dir=c.rtl[a]?"rtl":"ltr";b(a,c[a])};this[a]?d():CKEDITOR.scriptLoader.load(CKEDITOR.getUrl("lang/"+a+".js"),d,this)},detect:function(a,d){var b=this.languages;d=d||navigator.userLanguage||navigator.language||a;var c=d.toLowerCase().match(/([a-z]+)(?:-([a-z]+))?/),e=c[1],c=c[2];b[e+"-"+c]?e=e+"-"+c:b[e]||(e=null);CKEDITOR.lang.detect=e?function(){return e}:function(a){return a};return e||a}}})();
-CKEDITOR.scriptLoader=function(){var a={},d={};return{load:function(b,c,e,g){var k="string"==typeof b;k&&(b=[b]);e||(e=CKEDITOR);var h=b.length,p=[],r=[],f=function(a){c&&(k?c.call(e,a):c.call(e,p,r))};if(0===h)f(!0);else{var B=function(a,b){(b?p:r).push(a);0>=--h&&(g&&CKEDITOR.document.getDocumentElement().removeStyle("cursor"),f(b))},u=function(b,c){a[b]=1;var e=d[b];delete d[b];for(var f=0;f<e.length;f++)e[f](b,c)},z=function(b){if(a[b])B(b,!0);else{var e=d[b]||(d[b]=[]);e.push(B);if(!(1<e.length)){var f=
-new CKEDITOR.dom.element("script");f.setAttributes({type:"text/javascript",src:b});c&&(CKEDITOR.env.ie&&(8>=CKEDITOR.env.version||CKEDITOR.env.ie9Compat)?f.$.onreadystatechange=function(){if("loaded"==f.$.readyState||"complete"==f.$.readyState)f.$.onreadystatechange=null,u(b,!0)}:(f.$.onload=function(){setTimeout(function(){u(b,!0)},0)},f.$.onerror=function(){u(b,!1)}));f.appendTo(CKEDITOR.document.getHead())}}};g&&CKEDITOR.document.getDocumentElement().setStyle("cursor","wait");for(var y=0;y<h;y++)z(b[y])}},
-queue:function(){function a(){var b;(b=c[0])&&this.load(b.scriptUrl,b.callback,CKEDITOR,0)}var c=[];return function(d,g){var k=this;c.push({scriptUrl:d,callback:function(){g&&g.apply(this,arguments);c.shift();a.call(k)}});1==c.length&&a.call(this)}}()}}();CKEDITOR.resourceManager=function(a,d){this.basePath=a;this.fileName=d;this.registered={};this.loaded={};this.externals={};this._={waitingList:{}}};
-CKEDITOR.resourceManager.prototype={add:function(a,d){if(this.registered[a])throw Error('[CKEDITOR.resourceManager.add] The resource name "'+a+'" is already registered.');var b=this.registered[a]=d||{};b.name=a;b.path=this.getPath(a);CKEDITOR.fire(a+CKEDITOR.tools.capitalize(this.fileName)+"Ready",b);return this.get(a)},get:function(a){return this.registered[a]||null},getPath:function(a){var d=this.externals[a];return CKEDITOR.getUrl(d&&d.dir||this.basePath+a+"/")},getFilePath:function(a){var d=this.externals[a];
-return CKEDITOR.getUrl(this.getPath(a)+(d?d.file:this.fileName+".js"))},addExternal:function(a,d,b){a=a.split(",");for(var c=0;c<a.length;c++){var e=a[c];b||(d=d.replace(/[^\/]+$/,function(a){b=a;return""}));this.externals[e]={dir:d,file:b||this.fileName+".js"}}},load:function(a,d,b){CKEDITOR.tools.isArray(a)||(a=a?[a]:[]);for(var c=this.loaded,e=this.registered,g=[],k={},h={},p=0;p<a.length;p++){var r=a[p];if(r)if(c[r]||e[r])h[r]=this.get(r);else{var f=this.getFilePath(r);g.push(f);f in k||(k[f]=
-[]);k[f].push(r)}}CKEDITOR.scriptLoader.load(g,function(a,e){if(e.length)throw Error('[CKEDITOR.resourceManager.load] Resource name "'+k[e[0]].join(",")+'" was not found at "'+e[0]+'".');for(var f=0;f<a.length;f++)for(var g=k[a[f]],m=0;m<g.length;m++){var x=g[m];h[x]=this.get(x);c[x]=1}d.call(b,h)},this)}};CKEDITOR.plugins=new CKEDITOR.resourceManager("plugins/","plugin");
-CKEDITOR.plugins.load=CKEDITOR.tools.override(CKEDITOR.plugins.load,function(a){var d={};return function(b,c,e){var g={},k=function(b){a.call(this,b,function(a){CKEDITOR.tools.extend(g,a);var b=[],f;for(f in a){var h=a[f],u=h&&h.requires;if(!d[f]){if(h.icons)for(var z=h.icons.split(","),y=z.length;y--;)CKEDITOR.skin.addIcon(z[y],h.path+"icons/"+(CKEDITOR.env.hidpi&&h.hidpi?"hidpi/":"")+z[y]+".png");d[f]=1}if(u)for(u.split&&(u=u.split(",")),h=0;h<u.length;h++)g[u[h]]||b.push(u[h])}if(b.length)k.call(this,
-b);else{for(f in g)h=g[f],h.onLoad&&!h.onLoad._called&&(!1===h.onLoad()&&delete g[f],h.onLoad._called=1);c&&c.call(e||window,g)}},this)};k.call(this,b)}});CKEDITOR.plugins.setLang=function(a,d,b){var c=this.get(a);a=c.langEntries||(c.langEntries={});c=c.lang||(c.lang=[]);c.split&&(c=c.split(","));-1==CKEDITOR.tools.indexOf(c,d)&&c.push(d);a[d]=b};CKEDITOR.ui=function(a){if(a.ui)return a.ui;this.items={};this.instances={};this.editor=a;this._={handlers:{}};return this};
-CKEDITOR.ui.prototype={add:function(a,d,b){b.name=a.toLowerCase();var c=this.items[a]={type:d,command:b.command||null,args:Array.prototype.slice.call(arguments,2)};CKEDITOR.tools.extend(c,b)},get:function(a){return this.instances[a]},create:function(a){var d=this.items[a],b=d&&this._.handlers[d.type],c=d&&d.command&&this.editor.getCommand(d.command),b=b&&b.create.apply(this,d.args);this.instances[a]=b;c&&c.uiItems.push(b);b&&!b.type&&(b.type=d.type);return b},addHandler:function(a,d){this._.handlers[a]=
-d},space:function(a){return CKEDITOR.document.getById(this.spaceId(a))},spaceId:function(a){return this.editor.id+"_"+a}};CKEDITOR.event.implementOn(CKEDITOR.ui);
-(function(){function a(a,e,f){CKEDITOR.event.call(this);a=a&&CKEDITOR.tools.clone(a);if(void 0!==e){if(!(e instanceof CKEDITOR.dom.element))throw Error("Expect element of type CKEDITOR.dom.element.");if(!f)throw Error("One of the element modes must be specified.");if(CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f==CKEDITOR.ELEMENT_MODE_INLINE)throw Error("Inline element mode is not supported on IE quirks.");if(!b(e,f))throw Error('The specified element mode is not supported on element: "'+e.getName()+'".');
-this.element=e;this.elementMode=f;this.name=this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO&&(e.getId()||e.getNameAtt())}else this.elementMode=CKEDITOR.ELEMENT_MODE_NONE;this._={};this.commands={};this.templates={};this.name=this.name||d();this.id=CKEDITOR.tools.getNextId();this.status="unloaded";this.config=CKEDITOR.tools.prototypedCopy(CKEDITOR.config);this.ui=new CKEDITOR.ui(this);this.focusManager=new CKEDITOR.focusManager(this);this.keystrokeHandler=new CKEDITOR.keystrokeHandler(this);this.on("readOnly",
-c);this.on("selectionChange",function(a){g(this,a.data.path)});this.on("activeFilterChange",function(){g(this,this.elementPath(),!0)});this.on("mode",c);this.on("instanceReady",function(){this.config.startupFocus&&this.focus()});CKEDITOR.fire("instanceCreated",null,this);CKEDITOR.add(this);CKEDITOR.tools.setTimeout(function(){"destroyed"!==this.status?h(this,a):CKEDITOR.warn("editor-incorrect-destroy")},0,this)}function d(){do var a="editor"+ ++z;while(CKEDITOR.instances[a]);return a}function b(a,
-b){return b==CKEDITOR.ELEMENT_MODE_INLINE?a.is(CKEDITOR.dtd.$editable)||a.is("textarea"):b==CKEDITOR.ELEMENT_MODE_REPLACE?!a.is(CKEDITOR.dtd.$nonBodyContent):1}function c(){var a=this.commands,b;for(b in a)e(this,a[b])}function e(a,b){b[b.startDisabled?"disable":a.readOnly&&!b.readOnly?"disable":b.modes[a.mode]?"enable":"disable"]()}function g(a,b,c){if(b){var d,e,l=a.commands;for(e in l)d=l[e],(c||d.contextSensitive)&&d.refresh(a,b)}}function k(a){var b=a.config.customConfig;if(!b)return!1;var b=
-CKEDITOR.getUrl(b),c=y[b]||(y[b]={});c.fn?(c.fn.call(a,a.config),CKEDITOR.getUrl(a.config.customConfig)!=b&&k(a)||a.fireOnce("customConfigLoaded")):CKEDITOR.scriptLoader.queue(b,function(){c.fn=CKEDITOR.editorConfig?CKEDITOR.editorConfig:function(){};k(a)});return!0}function h(a,b){a.on("customConfigLoaded",function(){if(b){if(b.on)for(var c in b.on)a.on(c,b.on[c]);CKEDITOR.tools.extend(a.config,b,!0);delete a.config.on}c=a.config;a.readOnly=c.readOnly?!0:a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?
-a.element.is("textarea")?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):a.element.isReadOnly():a.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.element.hasAttribute("disabled")||a.element.hasAttribute("readonly"):!1;a.blockless=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?!(a.element.is("textarea")||CKEDITOR.dtd[a.element.getName()].p):!1;a.tabIndex=c.tabIndex||a.element&&a.element.getAttribute("tabindex")||0;a.activeEnterMode=a.enterMode=a.blockless?CKEDITOR.ENTER_BR:c.enterMode;
-a.activeShiftEnterMode=a.shiftEnterMode=a.blockless?CKEDITOR.ENTER_BR:c.shiftEnterMode;c.skin&&(CKEDITOR.skinName=c.skin);a.fireOnce("configLoaded");a.dataProcessor=new CKEDITOR.htmlDataProcessor(a);a.filter=a.activeFilter=new CKEDITOR.filter(a);p(a)});b&&null!=b.customConfig&&(a.config.customConfig=b.customConfig);k(a)||a.fireOnce("customConfigLoaded")}function p(a){CKEDITOR.skin.loadPart("editor",function(){r(a)})}function r(a){CKEDITOR.lang.load(a.config.language,a.config.defaultLanguage,function(b,
-c){var d=a.config.title;a.langCode=b;a.lang=CKEDITOR.tools.prototypedCopy(c);a.title="string"==typeof d||!1===d?d:[a.lang.editor,a.name].join(", ");a.config.contentsLangDirection||(a.config.contentsLangDirection=a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?a.element.getDirection(1):a.lang.dir);a.fire("langLoaded");f(a)})}function f(a){a.getStylesSet(function(b){a.once("loaded",function(){a.fire("stylesSet",{styles:b})},null,null,1);B(a)})}function B(a){var b=a.config,c=b.plugins,d=b.extraPlugins,e=
-b.removePlugins;if(d)var l=new RegExp("(?:^|,)(?:"+d.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(l,""),c=c+(","+d);if(e)var q=new RegExp("(?:^|,)(?:"+e.replace(/\s*,\s*/g,"|")+")(?\x3d,|$)","g"),c=c.replace(q,"");CKEDITOR.env.air&&(c+=",adobeair");CKEDITOR.plugins.load(c.split(","),function(c){var d=[],l=[],e=[];a.plugins=c;for(var f in c){var g=c[f],k=g.lang,h=null,p=g.requires,r;CKEDITOR.tools.isArray(p)&&(p=p.join(","));if(p&&(r=p.match(q)))for(;p=r.pop();)CKEDITOR.error("editor-plugin-required",
-{plugin:p.replace(",",""),requiredBy:f});k&&!a.lang[f]&&(k.split&&(k=k.split(",")),0<=CKEDITOR.tools.indexOf(k,a.langCode)?h=a.langCode:(h=a.langCode.replace(/-.*/,""),h=h!=a.langCode&&0<=CKEDITOR.tools.indexOf(k,h)?h:0<=CKEDITOR.tools.indexOf(k,"en")?"en":k[0]),g.langEntries&&g.langEntries[h]?(a.lang[f]=g.langEntries[h],h=null):e.push(CKEDITOR.getUrl(g.path+"lang/"+h+".js")));l.push(h);d.push(g)}CKEDITOR.scriptLoader.load(e,function(){for(var c=["beforeInit","init","afterInit"],e=0;e<c.length;e++)for(var q=
-0;q<d.length;q++){var n=d[q];0===e&&l[q]&&n.lang&&n.langEntries&&(a.lang[n.name]=n.langEntries[l[q]]);if(n[c[e]])n[c[e]](a)}a.fireOnce("pluginsLoaded");b.keystrokes&&a.setKeystroke(a.config.keystrokes);for(q=0;q<a.config.blockedKeystrokes.length;q++)a.keystrokeHandler.blockedKeystrokes[a.config.blockedKeystrokes[q]]=1;a.status="loaded";a.fireOnce("loaded");CKEDITOR.fire("instanceLoaded",null,a)})})}function u(){var a=this.element;if(a&&this.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO){var b=this.getData();
-this.config.htmlEncodeOutput&&(b=CKEDITOR.tools.htmlEncode(b));a.is("textarea")?a.setValue(b):a.setHtml(b);return!0}return!1}a.prototype=CKEDITOR.editor.prototype;CKEDITOR.editor=a;var z=0,y={};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{addCommand:function(a,b){b.name=a.toLowerCase();var c=new CKEDITOR.command(this,b);this.mode&&e(this,c);return this.commands[a]=c},_attachToForm:function(){function a(b){c.updateElement();c._.required&&!d.getValue()&&!1===c.fire("required")&&b.data.preventDefault()}
-function b(a){return!!(a&&a.call&&a.apply)}var c=this,d=c.element,e=new CKEDITOR.dom.element(d.$.form);d.is("textarea")&&e&&(e.on("submit",a),b(e.$.submit)&&(e.$.submit=CKEDITOR.tools.override(e.$.submit,function(b){return function(){a();b.apply?b.apply(this):b()}})),c.on("destroy",function(){e.removeListener("submit",a)}))},destroy:function(a){this.fire("beforeDestroy");!a&&u.call(this);this.editable(null);this.filter&&(this.filter.destroy(),delete this.filter);delete this.activeFilter;this.status=
-"destroyed";this.fire("destroy");this.removeAllListeners();CKEDITOR.remove(this);CKEDITOR.fire("instanceDestroyed",null,this)},elementPath:function(a){if(!a){a=this.getSelection();if(!a)return null;a=a.getStartElement()}return a?new CKEDITOR.dom.elementPath(a,this.editable()):null},createRange:function(){var a=this.editable();return a?new CKEDITOR.dom.range(a):null},execCommand:function(a,b){var c=this.getCommand(a),d={name:a,commandData:b,command:c};return c&&c.state!=CKEDITOR.TRISTATE_DISABLED&&
-!1!==this.fire("beforeCommandExec",d)&&(d.returnValue=c.exec(d.commandData),!c.async&&!1!==this.fire("afterCommandExec",d))?d.returnValue:!1},getCommand:function(a){return this.commands[a]},getData:function(a){!a&&this.fire("beforeGetData");var b=this._.data;"string"!=typeof b&&(b=(b=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?b.is("textarea")?b.getValue():b.getHtml():"");b={dataValue:b};!a&&this.fire("getData",b);return b.dataValue},getSnapshot:function(){var a=this.fire("getSnapshot");
-"string"!=typeof a&&(a=(a=this.element)&&this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE?a.is("textarea")?a.getValue():a.getHtml():"");return a},loadSnapshot:function(a){this.fire("loadSnapshot",a)},setData:function(a,b,c){var d=!0,e=b;b&&"object"==typeof b&&(c=b.internal,e=b.callback,d=!b.noSnapshot);!c&&d&&this.fire("saveSnapshot");if(e||!c)this.once("dataReady",function(a){!c&&d&&this.fire("saveSnapshot");e&&e.call(a.editor)});a={dataValue:a};!c&&this.fire("setData",a);this._.data=a.dataValue;
-!c&&this.fire("afterSetData",a)},setReadOnly:function(a){a=null==a||a;this.readOnly!=a&&(this.readOnly=a,this.keystrokeHandler.blockedKeystrokes[8]=+a,this.editable().setReadOnly(a),this.fire("readOnly"))},insertHtml:function(a,b,c){this.fire("insertHtml",{dataValue:a,mode:b,range:c})},insertText:function(a){this.fire("insertText",a)},insertElement:function(a){this.fire("insertElement",a)},getSelectedHtml:function(a){var b=this.editable(),c=this.getSelection(),c=c&&c.getRanges();if(!b||!c||0===c.length)return null;
-for(var d=new CKEDITOR.dom.documentFragment,e,l,q,n=0;n<c.length;n++){var f=c[n],g=f.startContainer;g.getName&&"tr"==g.getName()?(e||(e=g.getAscendant("table").clone(),e.append(g.getAscendant("tbody").clone()),d.append(e),e=e.findOne("tbody")),l&&l.equals(g)||(l=g,q=g.clone(),e.append(q)),q.append(f.cloneContents())):d.append(f.cloneContents())}b=e?d:b.getHtmlFromRange(c[0]);return a?b.getHtml():b},extractSelectedHtml:function(a,b){var c=this.editable(),d=this.getSelection().getRanges();if(!c||0===
-d.length)return null;d=d[0];c=c.extractHtmlFromRange(d,b);b||this.getSelection().selectRanges([d]);return a?c.getHtml():c},focus:function(){this.fire("beforeFocus")},checkDirty:function(){return"ready"==this.status&&this._.previousValue!==this.getSnapshot()},resetDirty:function(){this._.previousValue=this.getSnapshot()},updateElement:function(){return u.call(this)},setKeystroke:function(){for(var a=this.keystrokeHandler.keystrokes,b=CKEDITOR.tools.isArray(arguments[0])?arguments[0]:[[].slice.call(arguments,
-0)],c,d,e=b.length;e--;)c=b[e],d=0,CKEDITOR.tools.isArray(c)&&(d=c[1],c=c[0]),d?a[c]=d:delete a[c]},getCommandKeystroke:function(a){var b=a.name,c=this.keystrokeHandler.keystrokes,d;if(a.fakeKeystroke)return a.fakeKeystroke;for(d in c)if(c.hasOwnProperty(d)&&c[d]==b)return d;return null},addFeature:function(a){return this.filter.addFeature(a)},setActiveFilter:function(a){a||(a=this.filter);this.activeFilter!==a&&(this.activeFilter=a,this.fire("activeFilterChange"),a===this.filter?this.setActiveEnterMode(null,
-null):this.setActiveEnterMode(a.getAllowedEnterMode(this.enterMode),a.getAllowedEnterMode(this.shiftEnterMode,!0)))},setActiveEnterMode:function(a,b){a=a?this.blockless?CKEDITOR.ENTER_BR:a:this.enterMode;b=b?this.blockless?CKEDITOR.ENTER_BR:b:this.shiftEnterMode;if(this.activeEnterMode!=a||this.activeShiftEnterMode!=b)this.activeEnterMode=a,this.activeShiftEnterMode=b,this.fire("activeEnterModeChange")},showNotification:function(a){alert(a)}})})();CKEDITOR.ELEMENT_MODE_NONE=0;
-CKEDITOR.ELEMENT_MODE_REPLACE=1;CKEDITOR.ELEMENT_MODE_APPENDTO=2;CKEDITOR.ELEMENT_MODE_INLINE=3;CKEDITOR.htmlParser=function(){this._={htmlPartsRegex:/<(?:(?:\/([^>]+)>)|(?:!--([\S|\s]*?)--\x3e)|(?:([^\/\s>]+)((?:\s+[\w\-:.]+(?:\s*=\s*?(?:(?:"[^"]*")|(?:'[^']*')|[^\s"'\/>]+))?)*)[\S\s]*?(\/?)>))/g}};
-(function(){var a=/([\w\-:.]+)(?:(?:\s*=\s*(?:(?:"([^"]*)")|(?:'([^']*)')|([^\s>]+)))|(?=\s|$))/g,d={checked:1,compact:1,declare:1,defer:1,disabled:1,ismap:1,multiple:1,nohref:1,noresize:1,noshade:1,nowrap:1,readonly:1,selected:1};CKEDITOR.htmlParser.prototype={onTagOpen:function(){},onTagClose:function(){},onText:function(){},onCDATA:function(){},onComment:function(){},parse:function(b){for(var c,e,g=0,k;c=this._.htmlPartsRegex.exec(b);){e=c.index;if(e>g)if(g=b.substring(g,e),k)k.push(g);else this.onText(g);
-g=this._.htmlPartsRegex.lastIndex;if(e=c[1])if(e=e.toLowerCase(),k&&CKEDITOR.dtd.$cdata[e]&&(this.onCDATA(k.join("")),k=null),!k){this.onTagClose(e);continue}if(k)k.push(c[0]);else if(e=c[3]){if(e=e.toLowerCase(),!/="/.test(e)){var h={},p,r=c[4];c=!!c[5];if(r)for(;p=a.exec(r);){var f=p[1].toLowerCase();p=p[2]||p[3]||p[4]||"";h[f]=!p&&d[f]?f:CKEDITOR.tools.htmlDecodeAttr(p)}this.onTagOpen(e,h,c);!k&&CKEDITOR.dtd.$cdata[e]&&(k=[])}}else if(e=c[2])this.onComment(e)}if(b.length>g)this.onText(b.substring(g,
-b.length))}}})();
-CKEDITOR.htmlParser.basicWriter=CKEDITOR.tools.createClass({$:function(){this._={output:[]}},proto:{openTag:function(a){this._.output.push("\x3c",a)},openTagClose:function(a,d){d?this._.output.push(" /\x3e"):this._.output.push("\x3e")},attribute:function(a,d){"string"==typeof d&&(d=CKEDITOR.tools.htmlEncodeAttr(d));this._.output.push(" ",a,'\x3d"',d,'"')},closeTag:function(a){this._.output.push("\x3c/",a,"\x3e")},text:function(a){this._.output.push(a)},comment:function(a){this._.output.push("\x3c!--",a,
-"--\x3e")},write:function(a){this._.output.push(a)},reset:function(){this._.output=[];this._.indent=!1},getHtml:function(a){var d=this._.output.join("");a&&this.reset();return d}}});"use strict";
-(function(){CKEDITOR.htmlParser.node=function(){};CKEDITOR.htmlParser.node.prototype={remove:function(){var a=this.parent.children,d=CKEDITOR.tools.indexOf(a,this),b=this.previous,c=this.next;b&&(b.next=c);c&&(c.previous=b);a.splice(d,1);this.parent=null},replaceWith:function(a){var d=this.parent.children,b=CKEDITOR.tools.indexOf(d,this),c=a.previous=this.previous,e=a.next=this.next;c&&(c.next=a);e&&(e.previous=a);d[b]=a;a.parent=this.parent;this.parent=null},insertAfter:function(a){var d=a.parent.children,
-b=CKEDITOR.tools.indexOf(d,a),c=a.next;d.splice(b+1,0,this);this.next=a.next;this.previous=a;a.next=this;c&&(c.previous=this);this.parent=a.parent},insertBefore:function(a){var d=a.parent.children,b=CKEDITOR.tools.indexOf(d,a);d.splice(b,0,this);this.next=a;(this.previous=a.previous)&&(a.previous.next=this);a.previous=this;this.parent=a.parent},getAscendant:function(a){var d="function"==typeof a?a:"string"==typeof a?function(b){return b.name==a}:function(b){return b.name in a},b=this.parent;for(;b&&
-b.type==CKEDITOR.NODE_ELEMENT;){if(d(b))return b;b=b.parent}return null},wrapWith:function(a){this.replaceWith(a);a.add(this);return a},getIndex:function(){return CKEDITOR.tools.indexOf(this.parent.children,this)},getFilterContext:function(a){return a||{}}}})();"use strict";CKEDITOR.htmlParser.comment=function(a){this.value=a;this._={isBlockLike:!1}};
-CKEDITOR.htmlParser.comment.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_COMMENT,filter:function(a,d){var b=this.value;if(!(b=a.onComment(d,b,this)))return this.remove(),!1;if("string"!=typeof b)return this.replaceWith(b),!1;this.value=b;return!0},writeHtml:function(a,d){d&&this.filter(d);a.comment(this.value)}});"use strict";
-(function(){CKEDITOR.htmlParser.text=function(a){this.value=a;this._={isBlockLike:!1}};CKEDITOR.htmlParser.text.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(a,d){if(!(this.value=a.onText(d,this.value,this)))return this.remove(),!1},writeHtml:function(a,d){d&&this.filter(d);a.text(this.value)}})})();"use strict";
-(function(){CKEDITOR.htmlParser.cdata=function(a){this.value=a};CKEDITOR.htmlParser.cdata.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_TEXT,filter:function(){},writeHtml:function(a){a.write(this.value)}})})();"use strict";CKEDITOR.htmlParser.fragment=function(){this.children=[];this.parent=null;this._={isBlockLike:!0,hasInlineStarted:!1}};
-(function(){function a(a){return a.attributes["data-cke-survive"]?!1:"a"==a.name&&a.attributes.href||CKEDITOR.dtd.$removeEmpty[a.name]}var d=CKEDITOR.tools.extend({table:1,ul:1,ol:1,dl:1},CKEDITOR.dtd.table,CKEDITOR.dtd.ul,CKEDITOR.dtd.ol,CKEDITOR.dtd.dl),b={ol:1,ul:1},c=CKEDITOR.tools.extend({},{html:1},CKEDITOR.dtd.html,CKEDITOR.dtd.body,CKEDITOR.dtd.head,{style:1,script:1}),e={ul:"li",ol:"li",dl:"dd",table:"tbody",tbody:"tr",thead:"tr",tfoot:"tr",tr:"td"};CKEDITOR.htmlParser.fragment.fromHtml=
-function(g,k,h){function p(a){var b;if(0<x.length)for(var c=0;c<x.length;c++){var d=x[c],l=d.name,e=CKEDITOR.dtd[l],f=w.name&&CKEDITOR.dtd[w.name];f&&!f[l]||a&&e&&!e[a]&&CKEDITOR.dtd[a]?l==w.name&&(B(w,w.parent,1),c--):(b||(r(),b=1),d=d.clone(),d.parent=w,w=d,x.splice(c,1),c--)}}function r(){for(;J.length;)B(J.shift(),w)}function f(a){if(a._.isBlockLike&&"pre"!=a.name&&"textarea"!=a.name){var b=a.children.length,c=a.children[b-1],d;c&&c.type==CKEDITOR.NODE_TEXT&&((d=CKEDITOR.tools.rtrim(c.value))?
-c.value=d:a.children.length=b-1)}}function B(b,c,d){c=c||w||m;var e=w;void 0===b.previous&&(u(c,b)&&(w=c,y.onTagOpen(h,{}),b.returnPoint=c=w),f(b),a(b)&&!b.children.length||c.add(b),"pre"==b.name&&(l=!1),"textarea"==b.name&&(F=!1));b.returnPoint?(w=b.returnPoint,delete b.returnPoint):w=d?c:e}function u(a,b){if((a==m||"body"==a.name)&&h&&(!a.name||CKEDITOR.dtd[a.name][h])){var c,d;return(c=b.attributes&&(d=b.attributes["data-cke-real-element-type"])?d:b.name)&&c in CKEDITOR.dtd.$inline&&!(c in CKEDITOR.dtd.head)&&
-!b.isOrphan||b.type==CKEDITOR.NODE_TEXT}}function z(a,b){return a in CKEDITOR.dtd.$listItem||a in CKEDITOR.dtd.$tableContent?a==b||"dt"==a&&"dd"==b||"dd"==a&&"dt"==b:!1}var y=new CKEDITOR.htmlParser,m=k instanceof CKEDITOR.htmlParser.element?k:"string"==typeof k?new CKEDITOR.htmlParser.element(k):new CKEDITOR.htmlParser.fragment,x=[],J=[],w=m,F="textarea"==m.name,l="pre"==m.name;y.onTagOpen=function(e,n,f,g){n=new CKEDITOR.htmlParser.element(e,n);n.isUnknown&&f&&(n.isEmpty=!0);n.isOptionalClose=g;
-if(a(n))x.push(n);else{if("pre"==e)l=!0;else{if("br"==e&&l){w.add(new CKEDITOR.htmlParser.text("\n"));return}"textarea"==e&&(F=!0)}if("br"==e)J.push(n);else{for(;!(g=(f=w.name)?CKEDITOR.dtd[f]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c,n.isUnknown||w.isUnknown||g[e]);)if(w.isOptionalClose)y.onTagClose(f);else if(e in b&&f in b)f=w.children,(f=f[f.length-1])&&"li"==f.name||B(f=new CKEDITOR.htmlParser.element("li"),w),!n.returnPoint&&(n.returnPoint=w),w=f;else if(e in CKEDITOR.dtd.$listItem&&
-!z(e,f))y.onTagOpen("li"==e?"ul":"dl",{},0,1);else if(f in d&&!z(e,f))!n.returnPoint&&(n.returnPoint=w),w=w.parent;else if(f in CKEDITOR.dtd.$inline&&x.unshift(w),w.parent)B(w,w.parent,1);else{n.isOrphan=1;break}p(e);r();n.parent=w;n.isEmpty?B(n):w=n}}};y.onTagClose=function(a){for(var b=x.length-1;0<=b;b--)if(a==x[b].name){x.splice(b,1);return}for(var c=[],d=[],l=w;l!=m&&l.name!=a;)l._.isBlockLike||d.unshift(l),c.push(l),l=l.returnPoint||l.parent;if(l!=m){for(b=0;b<c.length;b++){var e=c[b];B(e,e.parent)}w=
-l;l._.isBlockLike&&r();B(l,l.parent);l==w&&(w=w.parent);x=x.concat(d)}"body"==a&&(h=!1)};y.onText=function(a){if(!(w._.hasInlineStarted&&!J.length||l||F)&&(a=CKEDITOR.tools.ltrim(a),0===a.length))return;var b=w.name,f=b?CKEDITOR.dtd[b]||(w._.isBlockLike?CKEDITOR.dtd.div:CKEDITOR.dtd.span):c;if(!F&&!f["#"]&&b in d)y.onTagOpen(e[b]||""),y.onText(a);else{r();p();l||F||(a=a.replace(/[\t\r\n ]{2,}|[\t\r\n]/g," "));a=new CKEDITOR.htmlParser.text(a);if(u(w,a))this.onTagOpen(h,{},0,1);w.add(a)}};y.onCDATA=
-function(a){w.add(new CKEDITOR.htmlParser.cdata(a))};y.onComment=function(a){r();p();w.add(new CKEDITOR.htmlParser.comment(a))};y.parse(g);for(r();w!=m;)B(w,w.parent,1);f(m);return m};CKEDITOR.htmlParser.fragment.prototype={type:CKEDITOR.NODE_DOCUMENT_FRAGMENT,add:function(a,b){isNaN(b)&&(b=this.children.length);var c=0<b?this.children[b-1]:null;if(c){if(a._.isBlockLike&&c.type==CKEDITOR.NODE_TEXT&&(c.value=CKEDITOR.tools.rtrim(c.value),0===c.value.length)){this.children.pop();this.add(a);return}c.next=
-a}a.previous=c;a.parent=this;this.children.splice(b,0,a);this._.hasInlineStarted||(this._.hasInlineStarted=a.type==CKEDITOR.NODE_TEXT||a.type==CKEDITOR.NODE_ELEMENT&&!a._.isBlockLike)},filter:function(a,b){b=this.getFilterContext(b);a.onRoot(b,this);this.filterChildren(a,!1,b)},filterChildren:function(a,b,c){if(this.childrenFilteredBy!=a.id){c=this.getFilterContext(c);if(b&&!this.parent)a.onRoot(c,this);this.childrenFilteredBy=a.id;for(b=0;b<this.children.length;b++)!1===this.children[b].filter(a,
-c)&&b--}},writeHtml:function(a,b){b&&this.filter(b);this.writeChildrenHtml(a)},writeChildrenHtml:function(a,b,c){var d=this.getFilterContext();if(c&&!this.parent&&b)b.onRoot(d,this);b&&this.filterChildren(b,!1,d);b=0;c=this.children;for(d=c.length;b<d;b++)c[b].writeHtml(a)},forEach:function(a,b,c){if(!(c||b&&this.type!=b))var d=a(this);if(!1!==d){c=this.children;for(var e=0;e<c.length;e++)d=c[e],d.type==CKEDITOR.NODE_ELEMENT?d.forEach(a,b):b&&d.type!=b||a(d)}},getFilterContext:function(a){return a||
-{}}}})();"use strict";
-(function(){function a(){this.rules=[]}function d(b,c,d,g){var k,h;for(k in c)(h=b[k])||(h=b[k]=new a),h.add(c[k],d,g)}CKEDITOR.htmlParser.filter=CKEDITOR.tools.createClass({$:function(b){this.id=CKEDITOR.tools.getNextNumber();this.elementNameRules=new a;this.attributeNameRules=new a;this.elementsRules={};this.attributesRules={};this.textRules=new a;this.commentRules=new a;this.rootRules=new a;b&&this.addRules(b,10)},proto:{addRules:function(a,c){var e;"number"==typeof c?e=c:c&&"priority"in c&&(e=
-c.priority);"number"!=typeof e&&(e=10);"object"!=typeof c&&(c={});a.elementNames&&this.elementNameRules.addMany(a.elementNames,e,c);a.attributeNames&&this.attributeNameRules.addMany(a.attributeNames,e,c);a.elements&&d(this.elementsRules,a.elements,e,c);a.attributes&&d(this.attributesRules,a.attributes,e,c);a.text&&this.textRules.add(a.text,e,c);a.comment&&this.commentRules.add(a.comment,e,c);a.root&&this.rootRules.add(a.root,e,c)},applyTo:function(a){a.filter(this)},onElementName:function(a,c){return this.elementNameRules.execOnName(a,
-c)},onAttributeName:function(a,c){return this.attributeNameRules.execOnName(a,c)},onText:function(a,c,d){return this.textRules.exec(a,c,d)},onComment:function(a,c,d){return this.commentRules.exec(a,c,d)},onRoot:function(a,c){return this.rootRules.exec(a,c)},onElement:function(a,c){for(var d=[this.elementsRules["^"],this.elementsRules[c.name],this.elementsRules.$],g,k=0;3>k;k++)if(g=d[k]){g=g.exec(a,c,this);if(!1===g)return null;if(g&&g!=c)return this.onNode(a,g);if(c.parent&&!c.name)break}return c},
-onNode:function(a,c){var d=c.type;return d==CKEDITOR.NODE_ELEMENT?this.onElement(a,c):d==CKEDITOR.NODE_TEXT?new CKEDITOR.htmlParser.text(this.onText(a,c.value)):d==CKEDITOR.NODE_COMMENT?new CKEDITOR.htmlParser.comment(this.onComment(a,c.value)):null},onAttribute:function(a,c,d,g){return(d=this.attributesRules[d])?d.exec(a,g,c,this):g}}});CKEDITOR.htmlParser.filterRulesGroup=a;a.prototype={add:function(a,c,d){this.rules.splice(this.findIndex(c),0,{value:a,priority:c,options:d})},addMany:function(a,
-c,d){for(var g=[this.findIndex(c),0],k=0,h=a.length;k<h;k++)g.push({value:a[k],priority:c,options:d});this.rules.splice.apply(this.rules,g)},findIndex:function(a){for(var c=this.rules,d=c.length-1;0<=d&&a<c[d].priority;)d--;return d+1},exec:function(a,c){var d=c instanceof CKEDITOR.htmlParser.node||c instanceof CKEDITOR.htmlParser.fragment,g=Array.prototype.slice.call(arguments,1),k=this.rules,h=k.length,p,r,f,B;for(B=0;B<h;B++)if(d&&(p=c.type,r=c.name),f=k[B],!(a.nonEditable&&!f.options.applyToAll||
-a.nestedEditable&&f.options.excludeNestedEditable)){f=f.value.apply(null,g);if(!1===f||d&&f&&(f.name!=r||f.type!=p))return f;null!=f&&(g[0]=c=f)}return c},execOnName:function(a,c){for(var d=0,g=this.rules,k=g.length,h;c&&d<k;d++)h=g[d],a.nonEditable&&!h.options.applyToAll||a.nestedEditable&&h.options.excludeNestedEditable||(c=c.replace(h.value[0],h.value[1]));return c}}})();
-(function(){function a(a,d){function f(a){return a||CKEDITOR.env.needsNbspFiller?new CKEDITOR.htmlParser.text(" "):new CKEDITOR.htmlParser.element("br",{"data-cke-bogus":1})}function n(a,d){return function(l){if(l.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var e=[],n=b(l),t,E;if(n)for(q(n,1)&&e.push(n);n;)g(n)&&(t=c(n))&&q(t)&&((E=c(t))&&!g(E)?e.push(t):(f(v).insertAfter(t),t.remove())),n=n.previous;for(n=0;n<e.length;n++)e[n].remove();if(e=!a||!1!==("function"==typeof d?d(l):d))v||CKEDITOR.env.needsBrFiller||
-l.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT?v||CKEDITOR.env.needsBrFiller||!(7<document.documentMode||l.name in CKEDITOR.dtd.tr||l.name in CKEDITOR.dtd.$listItem)?(e=b(l),e=!e||"form"==l.name&&"input"==e.name):e=!1:e=!1;e&&l.add(f(a))}}}function q(a,b){if((!v||CKEDITOR.env.needsBrFiller)&&a.type==CKEDITOR.NODE_ELEMENT&&"br"==a.name&&!a.attributes["data-cke-eol"])return!0;var c;return a.type==CKEDITOR.NODE_TEXT&&(c=a.value.match(x))&&(c.index&&((new CKEDITOR.htmlParser.text(a.value.substring(0,c.index))).insertBefore(a),
-a.value=c[0]),!CKEDITOR.env.needsBrFiller&&v&&(!b||a.parent.name in h)||!v&&((c=a.previous)&&"br"==c.name||!c||g(c)))?!0:!1}var t={elements:{}},v="html"==d,h=CKEDITOR.tools.extend({},l),A;for(A in h)"#"in w[A]||delete h[A];for(A in h)t.elements[A]=n(v,a.config.fillEmptyBlocks);t.root=n(v,!1);t.elements.br=function(a){return function(b){if(b.parent.type!=CKEDITOR.NODE_DOCUMENT_FRAGMENT){var d=b.attributes;if("data-cke-bogus"in d||"data-cke-eol"in d)delete d["data-cke-bogus"];else{for(d=b.next;d&&e(d);)d=
-d.next;var l=c(b);!d&&g(b.parent)?k(b.parent,f(a)):g(d)&&l&&!g(l)&&f(a).insertBefore(d)}}}}(v);return t}function d(a,b){return a!=CKEDITOR.ENTER_BR&&!1!==b?a==CKEDITOR.ENTER_DIV?"div":"p":!1}function b(a){for(a=a.children[a.children.length-1];a&&e(a);)a=a.previous;return a}function c(a){for(a=a.previous;a&&e(a);)a=a.previous;return a}function e(a){return a.type==CKEDITOR.NODE_TEXT&&!CKEDITOR.tools.trim(a.value)||a.type==CKEDITOR.NODE_ELEMENT&&a.attributes["data-cke-bookmark"]}function g(a){return a&&
-(a.type==CKEDITOR.NODE_ELEMENT&&a.name in l||a.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT)}function k(a,b){var c=a.children[a.children.length-1];a.children.push(b);b.parent=a;c&&(c.next=b,b.previous=c)}function h(a){a=a.attributes;"false"!=a.contenteditable&&(a["data-cke-editable"]=a.contenteditable?"true":1);a.contenteditable="false"}function p(a){a=a.attributes;switch(a["data-cke-editable"]){case "true":a.contenteditable="true";break;case "1":delete a.contenteditable}}function r(a){return a.replace(C,
-function(a,b,c){return"\x3c"+b+c.replace(D,function(a,b){return M.test(b)&&-1==c.indexOf("data-cke-saved-"+b)?" data-cke-saved-"+a+" data-cke-"+CKEDITOR.rnd+"-"+a:a})+"\x3e"})}function f(a,b){return a.replace(b,function(a,b,c){0===a.indexOf("\x3ctextarea")&&(a=b+z(c).replace(/</g,"\x26lt;").replace(/>/g,"\x26gt;")+"\x3c/textarea\x3e");return"\x3ccke:encoded\x3e"+encodeURIComponent(a)+"\x3c/cke:encoded\x3e"})}function B(a){return a.replace(Q,function(a,b){return decodeURIComponent(b)})}function u(a){return a.replace(/\x3c!--(?!{cke_protected})[\s\S]+?--\x3e/g,
-function(a){return"\x3c!--"+J+"{C}"+encodeURIComponent(a).replace(/--/g,"%2D%2D")+"--\x3e"})}function z(a){return a.replace(/\x3c!--\{cke_protected\}\{C\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)})}function y(a,b){var c=b._.dataStore;return a.replace(/\x3c!--\{cke_protected\}([\s\S]+?)--\x3e/g,function(a,b){return decodeURIComponent(b)}).replace(/\{cke_protected_(\d+)\}/g,function(a,b){return c&&c[b]||""})}function m(a,b){var c=[],d=b.config.protectedSource,l=b._.dataStore||(b._.dataStore=
-{id:1}),e=/<\!--\{cke_temp(comment)?\}(\d*?)--\x3e/g,d=[/<script[\s\S]*?(<\/script>|$)/gi,/<noscript[\s\S]*?<\/noscript>/gi,/<meta[\s\S]*?\/?>/gi].concat(d);a=a.replace(/\x3c!--[\s\S]*?--\x3e/g,function(a){return"\x3c!--{cke_tempcomment}"+(c.push(a)-1)+"--\x3e"});for(var f=0;f<d.length;f++)a=a.replace(d[f],function(a){a=a.replace(e,function(a,b,d){return c[d]});return/cke_temp(comment)?/.test(a)?a:"\x3c!--{cke_temp}"+(c.push(a)-1)+"--\x3e"});a=a.replace(e,function(a,b,d){return"\x3c!--"+J+(b?"{C}":
-"")+encodeURIComponent(c[d]).replace(/--/g,"%2D%2D")+"--\x3e"});a=a.replace(/<\w+(?:\s+(?:(?:[^\s=>]+\s*=\s*(?:[^'"\s>]+|'[^']*'|"[^"]*"))|[^\s=\/>]+))+\s*\/?>/g,function(a){return a.replace(/\x3c!--\{cke_protected\}([^>]*)--\x3e/g,function(a,b){l[l.id]=decodeURIComponent(b);return"{cke_protected_"+l.id++ +"}"})});return a=a.replace(/<(title|iframe|textarea)([^>]*)>([\s\S]*?)<\/\1>/g,function(a,c,d,l){return"\x3c"+c+d+"\x3e"+y(z(l),b)+"\x3c/"+c+"\x3e"})}CKEDITOR.htmlDataProcessor=function(b){var c,
-l,e=this;this.editor=b;this.dataFilter=c=new CKEDITOR.htmlParser.filter;this.htmlFilter=l=new CKEDITOR.htmlParser.filter;this.writer=new CKEDITOR.htmlParser.basicWriter;c.addRules(q);c.addRules(n,{applyToAll:!0});c.addRules(a(b,"data"),{applyToAll:!0});l.addRules(t);l.addRules(A,{applyToAll:!0});l.addRules(a(b,"html"),{applyToAll:!0});b.on("toHtml",function(a){a=a.data;var c=a.dataValue,l,c=m(c,b),c=f(c,R),c=r(c),c=f(c,H),c=c.replace(P,"$1cke:$2"),c=c.replace(G,"\x3ccke:$1$2\x3e\x3c/cke:$1\x3e"),
-c=c.replace(/(<pre\b[^>]*>)(\r\n|\n)/g,"$1$2$2"),c=c.replace(/([^a-z0-9<\-])(on\w{3,})(?!>)/gi,"$1data-cke-"+CKEDITOR.rnd+"-$2");l=a.context||b.editable().getName();var e;CKEDITOR.env.ie&&9>CKEDITOR.env.version&&"pre"==l&&(l="div",c="\x3cpre\x3e"+c+"\x3c/pre\x3e",e=1);l=b.document.createElement(l);l.setHtml("a"+c);c=l.getHtml().substr(1);c=c.replace(new RegExp("data-cke-"+CKEDITOR.rnd+"-","ig"),"");e&&(c=c.replace(/^<pre>|<\/pre>$/gi,""));c=c.replace(v,"$1$2");c=B(c);c=z(c);l=!1===a.fixForBody?!1:
-d(a.enterMode,b.config.autoParagraph);c=CKEDITOR.htmlParser.fragment.fromHtml(c,a.context,l);l&&(e=c,!e.children.length&&CKEDITOR.dtd[e.name][l]&&(l=new CKEDITOR.htmlParser.element(l),e.add(l)));a.dataValue=c},null,null,5);b.on("toHtml",function(a){a.data.filter.applyTo(a.data.dataValue,!0,a.data.dontFilter,a.data.enterMode)&&b.fire("dataFiltered")},null,null,6);b.on("toHtml",function(a){a.data.dataValue.filterChildren(e.dataFilter,!0)},null,null,10);b.on("toHtml",function(a){a=a.data;var b=a.dataValue,
-c=new CKEDITOR.htmlParser.basicWriter;b.writeChildrenHtml(c);b=c.getHtml(!0);a.dataValue=u(b)},null,null,15);b.on("toDataFormat",function(a){var c=a.data.dataValue;a.data.enterMode!=CKEDITOR.ENTER_BR&&(c=c.replace(/^<br *\/?>/i,""));a.data.dataValue=CKEDITOR.htmlParser.fragment.fromHtml(c,a.data.context,d(a.data.enterMode,b.config.autoParagraph))},null,null,5);b.on("toDataFormat",function(a){a.data.dataValue.filterChildren(e.htmlFilter,!0)},null,null,10);b.on("toDataFormat",function(a){a.data.filter.applyTo(a.data.dataValue,
-!1,!0)},null,null,11);b.on("toDataFormat",function(a){var c=a.data.dataValue,d=e.writer;d.reset();c.writeChildrenHtml(d);c=d.getHtml(!0);c=z(c);c=y(c,b);a.data.dataValue=c},null,null,15)};CKEDITOR.htmlDataProcessor.prototype={toHtml:function(a,b,c,d){var l=this.editor,e,f,n,q;b&&"object"==typeof b?(e=b.context,c=b.fixForBody,d=b.dontFilter,f=b.filter,n=b.enterMode,q=b.protectedWhitespaces):e=b;e||null===e||(e=l.editable().getName());return l.fire("toHtml",{dataValue:a,context:e,fixForBody:c,dontFilter:d,
-filter:f||l.filter,enterMode:n||l.enterMode,protectedWhitespaces:q}).dataValue},toDataFormat:function(a,b){var c,d,l;b&&(c=b.context,d=b.filter,l=b.enterMode);c||null===c||(c=this.editor.editable().getName());return this.editor.fire("toDataFormat",{dataValue:a,filter:d||this.editor.filter,context:c,enterMode:l||this.editor.enterMode}).dataValue}};var x=/(?:&nbsp;|\xa0)$/,J="{cke_protected}",w=CKEDITOR.dtd,F="caption colgroup col thead tfoot tbody".split(" "),l=CKEDITOR.tools.extend({},w.$blockLimit,
-w.$block),q={elements:{input:h,textarea:h}},n={attributeNames:[[/^on/,"data-cke-pa-on"],[/^data-cke-expando$/,""]]},t={elements:{embed:function(a){var b=a.parent;if(b&&"object"==b.name){var c=b.attributes.width,b=b.attributes.height;c&&(a.attributes.width=c);b&&(a.attributes.height=b)}},a:function(a){var b=a.attributes;if(!(a.children.length||b.name||b.id||a.attributes["data-cke-saved-name"]))return!1}}},A={elementNames:[[/^cke:/,""],[/^\?xml:namespace$/,""]],attributeNames:[[/^data-cke-(saved|pa)-/,
-""],[/^data-cke-.*/,""],["hidefocus",""]],elements:{$:function(a){var b=a.attributes;if(b){if(b["data-cke-temp"])return!1;for(var c=["name","href","src"],d,l=0;l<c.length;l++)d="data-cke-saved-"+c[l],d in b&&delete b[c[l]]}return a},table:function(a){a.children.slice(0).sort(function(a,b){var c,d;a.type==CKEDITOR.NODE_ELEMENT&&b.type==a.type&&(c=CKEDITOR.tools.indexOf(F,a.name),d=CKEDITOR.tools.indexOf(F,b.name));-1<c&&-1<d&&c!=d||(c=a.parent?a.getIndex():-1,d=b.parent?b.getIndex():-1);return c>d?
-1:-1})},param:function(a){a.children=[];a.isEmpty=!0;return a},span:function(a){"Apple-style-span"==a.attributes["class"]&&delete a.name},html:function(a){delete a.attributes.contenteditable;delete a.attributes["class"]},body:function(a){delete a.attributes.spellcheck;delete a.attributes.contenteditable},style:function(a){var b=a.children[0];b&&b.value&&(b.value=CKEDITOR.tools.trim(b.value));a.attributes.type||(a.attributes.type="text/css")},title:function(a){var b=a.children[0];!b&&k(a,b=new CKEDITOR.htmlParser.text);
-b.value=a.attributes["data-cke-title"]||""},input:p,textarea:p},attributes:{"class":function(a){return CKEDITOR.tools.ltrim(a.replace(/(?:^|\s+)cke_[^\s]*/g,""))||!1}}};CKEDITOR.env.ie&&(A.attributes.style=function(a){return a.replace(/(^|;)([^\:]+)/g,function(a){return a.toLowerCase()})});var C=/<(a|area|img|input|source)\b([^>]*)>/gi,D=/([\w-:]+)\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|(?:[^ "'>]+))/gi,M=/^(href|src|name)$/i,H=/(?:<style(?=[ >])[^>]*>[\s\S]*?<\/style>)|(?:<(:?link|meta|base)[^>]*>)/gi,
-R=/(<textarea(?=[ >])[^>]*>)([\s\S]*?)(?:<\/textarea>)/gi,Q=/<cke:encoded>([^<]*)<\/cke:encoded>/gi,P=/(<\/?)((?:object|embed|param|html|body|head|title)[^>]*>)/gi,v=/(<\/?)cke:((?:html|body|head|title)[^>]*>)/gi,G=/<cke:(param|embed)([^>]*?)\/?>(?!\s*<\/cke:\1)/gi})();"use strict";
-CKEDITOR.htmlParser.element=function(a,d){this.name=a;this.attributes=d||{};this.children=[];var b=a||"",c=b.match(/^cke:(.*)/);c&&(b=c[1]);b=!!(CKEDITOR.dtd.$nonBodyContent[b]||CKEDITOR.dtd.$block[b]||CKEDITOR.dtd.$listItem[b]||CKEDITOR.dtd.$tableContent[b]||CKEDITOR.dtd.$nonEditable[b]||"br"==b);this.isEmpty=!!CKEDITOR.dtd.$empty[a];this.isUnknown=!CKEDITOR.dtd[a];this._={isBlockLike:b,hasInlineStarted:this.isEmpty||!b}};
-CKEDITOR.htmlParser.cssStyle=function(a){var d={};((a instanceof CKEDITOR.htmlParser.element?a.attributes.style:a)||"").replace(/&quot;/g,'"').replace(/\s*([^ :;]+)\s*:\s*([^;]+)\s*(?=;|$)/g,function(a,c,e){"font-family"==c&&(e=e.replace(/["']/g,""));d[c.toLowerCase()]=e});return{rules:d,populate:function(a){var c=this.toString();c&&(a instanceof CKEDITOR.dom.element?a.setAttribute("style",c):a instanceof CKEDITOR.htmlParser.element?a.attributes.style=c:a.style=c)},toString:function(){var a=[],c;
-for(c in d)d[c]&&a.push(c,":",d[c],";");return a.join("")}}};
-(function(){function a(a){return function(b){return b.type==CKEDITOR.NODE_ELEMENT&&("string"==typeof a?b.name==a:b.name in a)}}var d=function(a,b){a=a[0];b=b[0];return a<b?-1:a>b?1:0},b=CKEDITOR.htmlParser.fragment.prototype;CKEDITOR.htmlParser.element.prototype=CKEDITOR.tools.extend(new CKEDITOR.htmlParser.node,{type:CKEDITOR.NODE_ELEMENT,add:b.add,clone:function(){return new CKEDITOR.htmlParser.element(this.name,this.attributes)},filter:function(a,b){var d=this,k,h;b=d.getFilterContext(b);if(b.off)return!0;
-if(!d.parent)a.onRoot(b,d);for(;;){k=d.name;if(!(h=a.onElementName(b,k)))return this.remove(),!1;d.name=h;if(!(d=a.onElement(b,d)))return this.remove(),!1;if(d!==this)return this.replaceWith(d),!1;if(d.name==k)break;if(d.type!=CKEDITOR.NODE_ELEMENT)return this.replaceWith(d),!1;if(!d.name)return this.replaceWithChildren(),!1}k=d.attributes;var p,r;for(p in k){for(h=k[p];;)if(r=a.onAttributeName(b,p))if(r!=p)delete k[p],p=r;else break;else{delete k[p];break}r&&(!1===(h=a.onAttribute(b,d,r,h))?delete k[r]:
-k[r]=h)}d.isEmpty||this.filterChildren(a,!1,b);return!0},filterChildren:b.filterChildren,writeHtml:function(a,b){b&&this.filter(b);var g=this.name,k=[],h=this.attributes,p,r;a.openTag(g,h);for(p in h)k.push([p,h[p]]);a.sortAttributes&&k.sort(d);p=0;for(r=k.length;p<r;p++)h=k[p],a.attribute(h[0],h[1]);a.openTagClose(g,this.isEmpty);this.writeChildrenHtml(a);this.isEmpty||a.closeTag(g)},writeChildrenHtml:b.writeChildrenHtml,replaceWithChildren:function(){for(var a=this.children,b=a.length;b;)a[--b].insertAfter(this);
-this.remove()},forEach:b.forEach,getFirst:function(b){if(!b)return this.children.length?this.children[0]:null;"function"!=typeof b&&(b=a(b));for(var d=0,g=this.children.length;d<g;++d)if(b(this.children[d]))return this.children[d];return null},getHtml:function(){var a=new CKEDITOR.htmlParser.basicWriter;this.writeChildrenHtml(a);return a.getHtml()},setHtml:function(a){a=this.children=CKEDITOR.htmlParser.fragment.fromHtml(a).children;for(var b=0,d=a.length;b<d;++b)a[b].parent=this},getOuterHtml:function(){var a=
-new CKEDITOR.htmlParser.basicWriter;this.writeHtml(a);return a.getHtml()},split:function(a){for(var b=this.children.splice(a,this.children.length-a),d=this.clone(),k=0;k<b.length;++k)b[k].parent=d;d.children=b;b[0]&&(b[0].previous=null);0<a&&(this.children[a-1].next=null);this.parent.add(d,this.getIndex()+1);return d},find:function(a,b){void 0===b&&(b=!1);var d=[],k;for(k=0;k<this.children.length;k++){var h=this.children[k];"function"==typeof a&&a(h)?d.push(h):"string"==typeof a&&h.name===a&&d.push(h);
-b&&h.find&&(d=d.concat(h.find(a,b)))}return d},addClass:function(a){if(!this.hasClass(a)){var b=this.attributes["class"]||"";this.attributes["class"]=b+(b?" ":"")+a}},removeClass:function(a){var b=this.attributes["class"];b&&((b=CKEDITOR.tools.trim(b.replace(new RegExp("(?:\\s+|^)"+a+"(?:\\s+|$)")," ")))?this.attributes["class"]=b:delete this.attributes["class"])},hasClass:function(a){var b=this.attributes["class"];return b?(new RegExp("(?:^|\\s)"+a+"(?\x3d\\s|$)")).test(b):!1},getFilterContext:function(a){var b=
-[];a||(a={off:!1,nonEditable:!1,nestedEditable:!1});a.off||"off"!=this.attributes["data-cke-processor"]||b.push("off",!0);a.nonEditable||"false"!=this.attributes.contenteditable?a.nonEditable&&!a.nestedEditable&&"true"==this.attributes.contenteditable&&b.push("nestedEditable",!0):b.push("nonEditable",!0);if(b.length){a=CKEDITOR.tools.copy(a);for(var d=0;d<b.length;d+=2)a[b[d]]=b[d+1]}return a}},!0)})();
-(function(){var a={},d=/{([^}]+)}/g,b=/([\\'])/g,c=/\n/g,e=/\r/g;CKEDITOR.template=function(g){if(a[g])this.output=a[g];else{var k=g.replace(b,"\\$1").replace(c,"\\n").replace(e,"\\r").replace(d,function(a,b){return"',data['"+b+"']\x3d\x3dundefined?'{"+b+"}':data['"+b+"'],'"});this.output=a[g]=Function("data","buffer","return buffer?buffer.push('"+k+"'):['"+k+"'].join('');")}}})();delete CKEDITOR.loadFullCore;CKEDITOR.instances={};CKEDITOR.document=new CKEDITOR.dom.document(document);
-CKEDITOR.add=function(a){CKEDITOR.instances[a.name]=a;a.on("focus",function(){CKEDITOR.currentInstance!=a&&(CKEDITOR.currentInstance=a,CKEDITOR.fire("currentInstance"))});a.on("blur",function(){CKEDITOR.currentInstance==a&&(CKEDITOR.currentInstance=null,CKEDITOR.fire("currentInstance"))});CKEDITOR.fire("instance",null,a)};CKEDITOR.remove=function(a){delete CKEDITOR.instances[a.name]};
-(function(){var a={};CKEDITOR.addTemplate=function(d,b){var c=a[d];if(c)return c;c={name:d,source:b};CKEDITOR.fire("template",c);return a[d]=new CKEDITOR.template(c.source)};CKEDITOR.getTemplate=function(d){return a[d]}})();(function(){var a=[];CKEDITOR.addCss=function(d){a.push(d)};CKEDITOR.getCss=function(){return a.join("\n")}})();CKEDITOR.on("instanceDestroyed",function(){CKEDITOR.tools.isEmpty(this.instances)&&CKEDITOR.fire("reset")});CKEDITOR.TRISTATE_ON=1;CKEDITOR.TRISTATE_OFF=2;
-CKEDITOR.TRISTATE_DISABLED=0;
-(function(){CKEDITOR.inline=function(a,d){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var b=new CKEDITOR.editor(d,a,CKEDITOR.ELEMENT_MODE_INLINE),c=a.is("textarea")?a:null;c?(b.setData(c.getValue(),null,!0),a=CKEDITOR.dom.element.createFromHtml('\x3cdiv contenteditable\x3d"'+!!b.readOnly+'" class\x3d"cke_textarea_inline"\x3e'+c.getValue()+"\x3c/div\x3e",CKEDITOR.document),
-a.insertAfter(c),c.hide(),c.$.form&&b._attachToForm()):b.setData(a.getHtml(),null,!0);b.on("loaded",function(){b.fire("uiReady");b.editable(a);b.container=a;b.ui.contentsElement=a;b.setData(b.getData(1));b.resetDirty();b.fire("contentDom");b.mode="wysiwyg";b.fire("mode");b.status="ready";b.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,b)},null,null,1E4);b.on("destroy",function(){c&&(b.container.clearCustomData(),b.container.remove(),c.show());b.element.clearCustomData();delete b.element});
-return b};CKEDITOR.inlineAll=function(){var a,d,b;for(b in CKEDITOR.dtd.$editable)for(var c=CKEDITOR.document.getElementsByTag(b),e=0,g=c.count();e<g;e++)a=c.getItem(e),"true"==a.getAttribute("contenteditable")&&(d={element:a,config:{}},!1!==CKEDITOR.fire("inline",d)&&CKEDITOR.inline(a,d.config))};CKEDITOR.domReady(function(){!CKEDITOR.disableAutoInline&&CKEDITOR.inlineAll()})})();CKEDITOR.replaceClass="ckeditor";
-(function(){function a(a,e,g,k){if(!CKEDITOR.env.isCompatible)return null;a=CKEDITOR.dom.element.get(a);if(a.getEditor())throw'The editor instance "'+a.getEditor().name+'" is already attached to the provided element.';var h=new CKEDITOR.editor(e,a,k);k==CKEDITOR.ELEMENT_MODE_REPLACE&&(a.setStyle("visibility","hidden"),h._.required=a.hasAttribute("required"),a.removeAttribute("required"));g&&h.setData(g,null,!0);h.on("loaded",function(){b(h);k==CKEDITOR.ELEMENT_MODE_REPLACE&&h.config.autoUpdateElement&&
-a.$.form&&h._attachToForm();h.setMode(h.config.startupMode,function(){h.resetDirty();h.status="ready";h.fireOnce("instanceReady");CKEDITOR.fire("instanceReady",null,h)})});h.on("destroy",d);return h}function d(){var a=this.container,b=this.element;a&&(a.clearCustomData(),a.remove());b&&(b.clearCustomData(),this.elementMode==CKEDITOR.ELEMENT_MODE_REPLACE&&(b.show(),this._.required&&b.setAttribute("required","required")),delete this.element)}function b(a){var b=a.name,d=a.element,k=a.elementMode,h=
-a.fire("uiSpace",{space:"top",html:""}).html,p=a.fire("uiSpace",{space:"bottom",html:""}).html,r=new CKEDITOR.template('\x3c{outerEl} id\x3d"cke_{name}" class\x3d"{id} cke cke_reset cke_chrome cke_editor_{name} cke_{langDir} '+CKEDITOR.env.cssClass+'"  dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"application"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':"")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':"")+'\x3c{outerEl} class\x3d"cke_inner cke_reset" role\x3d"presentation"\x3e{topHtml}\x3c{outerEl} id\x3d"{contentId}" class\x3d"cke_contents cke_reset" role\x3d"presentation"\x3e\x3c/{outerEl}\x3e{bottomHtml}\x3c/{outerEl}\x3e\x3c/{outerEl}\x3e'),
-b=CKEDITOR.dom.element.createFromHtml(r.output({id:a.id,name:b,langDir:a.lang.dir,langCode:a.langCode,voiceLabel:a.title,topHtml:h?'\x3cspan id\x3d"'+a.ui.spaceId("top")+'" class\x3d"cke_top cke_reset_all" role\x3d"presentation" style\x3d"height:auto"\x3e'+h+"\x3c/span\x3e":"",contentId:a.ui.spaceId("contents"),bottomHtml:p?'\x3cspan id\x3d"'+a.ui.spaceId("bottom")+'" class\x3d"cke_bottom cke_reset_all" role\x3d"presentation"\x3e'+p+"\x3c/span\x3e":"",outerEl:CKEDITOR.env.ie?"span":"div"}));k==CKEDITOR.ELEMENT_MODE_REPLACE?
-(d.hide(),b.insertAfter(d)):d.append(b);a.container=b;a.ui.contentsElement=a.ui.space("contents");h&&a.ui.space("top").unselectable();p&&a.ui.space("bottom").unselectable();d=a.config.width;k=a.config.height;d&&b.setStyle("width",CKEDITOR.tools.cssLength(d));k&&a.ui.space("contents").setStyle("height",CKEDITOR.tools.cssLength(k));b.disableContextMenu();CKEDITOR.env.webkit&&b.on("focus",function(){a.focus()});a.fireOnce("uiReady")}CKEDITOR.replace=function(b,d){return a(b,d,null,CKEDITOR.ELEMENT_MODE_REPLACE)};
-CKEDITOR.appendTo=function(b,d,g){return a(b,d,g,CKEDITOR.ELEMENT_MODE_APPENDTO)};CKEDITOR.replaceAll=function(){for(var a=document.getElementsByTagName("textarea"),b=0;b<a.length;b++){var d=null,k=a[b];if(k.name||k.id){if("string"==typeof arguments[0]){if(!(new RegExp("(?:^|\\s)"+arguments[0]+"(?:$|\\s)")).test(k.className))continue}else if("function"==typeof arguments[0]&&(d={},!1===arguments[0](k,d)))continue;this.replace(k,d)}}};CKEDITOR.editor.prototype.addMode=function(a,b){(this._.modes||(this._.modes=
-{}))[a]=b};CKEDITOR.editor.prototype.setMode=function(a,b){var d=this,k=this._.modes;if(a!=d.mode&&k&&k[a]){d.fire("beforeSetMode",a);if(d.mode){var h=d.checkDirty(),k=d._.previousModeData,p,r=0;d.fire("beforeModeUnload");d.editable(0);d._.previousMode=d.mode;d._.previousModeData=p=d.getData(1);"source"==d.mode&&k==p&&(d.fire("lockSnapshot",{forceUpdate:!0}),r=1);d.ui.space("contents").setHtml("");d.mode=""}else d._.previousModeData=d.getData(1);this._.modes[a](function(){d.mode=a;void 0!==h&&!h&&
-d.resetDirty();r?d.fire("unlockSnapshot"):"wysiwyg"==a&&d.fire("saveSnapshot");setTimeout(function(){d.fire("mode");b&&b.call(d)},0)})}};CKEDITOR.editor.prototype.resize=function(a,b,d,k){var h=this.container,p=this.ui.space("contents"),r=CKEDITOR.env.webkit&&this.document&&this.document.getWindow().$.frameElement;k=k?this.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}):h;k.setSize("width",a,!0);r&&(r.style.width="1%");var f=(k.$.offsetHeight||0)-(p.$.clientHeight||
-0),h=Math.max(b-(d?0:f),0);b=d?b+f:b;p.setStyle("height",h+"px");r&&(r.style.width="100%");this.fire("resize",{outerHeight:b,contentsHeight:h,outerWidth:a||k.getSize("width")})};CKEDITOR.editor.prototype.getResizable=function(a){return a?this.ui.space("contents"):this.container};CKEDITOR.domReady(function(){CKEDITOR.replaceClass&&CKEDITOR.replaceAll(CKEDITOR.replaceClass)})})();CKEDITOR.config.startupMode="wysiwyg";
-(function(){function a(a){var b=a.editor,e=a.data.path,f=e.blockLimit,g=a.data.selection,h=g.getRanges()[0],D;if(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller)if(g=d(g,e))g.appendBogus(),D=CKEDITOR.env.ie;k(b,e.block,f)&&h.collapsed&&!h.getCommonAncestor().isReadOnly()&&(e=h.clone(),e.enlarge(CKEDITOR.ENLARGE_BLOCK_CONTENTS),f=new CKEDITOR.dom.walker(e),f.guard=function(a){return!c(a)||a.type==CKEDITOR.NODE_COMMENT||a.isReadOnly()},!f.checkForward()||e.checkStartOfBlock()&&e.checkEndOfBlock())&&
-(b=h.fixBlock(!0,b.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p"),CKEDITOR.env.needsBrFiller||(b=b.getFirst(c))&&b.type==CKEDITOR.NODE_TEXT&&CKEDITOR.tools.trim(b.getText()).match(/^(?:&nbsp;|\xa0)$/)&&b.remove(),D=1,a.cancel());D&&h.select()}function d(a,b){if(a.isFake)return 0;var d=b.block||b.blockLimit,e=d&&d.getLast(c);if(!(!d||!d.isBlockBoundary()||e&&e.type==CKEDITOR.NODE_ELEMENT&&e.isBlockBoundary()||d.is("pre")||d.getBogus()))return d}function b(a){var b=a.data.getTarget();b.is("input")&&
-(b=b.getAttribute("type"),"submit"!=b&&"reset"!=b||a.data.preventDefault())}function c(a){return f(a)&&B(a)}function e(a,b){return function(c){var d=c.data.$.toElement||c.data.$.fromElement||c.data.$.relatedTarget;(d=d&&d.nodeType==CKEDITOR.NODE_ELEMENT?new CKEDITOR.dom.element(d):null)&&(b.equals(d)||b.contains(d))||a.call(this,c)}}function g(a){function b(a){return function(b,l){l&&b.type==CKEDITOR.NODE_ELEMENT&&b.is(f)&&(d=b);if(!(l||!c(b)||a&&z(b)))return!1}}var d,e=a.getRanges()[0];a=a.root;
-var f={table:1,ul:1,ol:1,dl:1};if(e.startPath().contains(f)){var g=e.clone();g.collapse(1);g.setStartAt(a,CKEDITOR.POSITION_AFTER_START);a=new CKEDITOR.dom.walker(g);a.guard=b();a.checkBackward();if(d)return g=e.clone(),g.collapse(),g.setEndAt(d,CKEDITOR.POSITION_AFTER_END),a=new CKEDITOR.dom.walker(g),a.guard=b(!0),d=!1,a.checkForward(),d}return null}function k(a,b,c){return!1!==a.config.autoParagraph&&a.activeEnterMode!=CKEDITOR.ENTER_BR&&(a.editable().equals(c)&&!b||b&&"true"==b.getAttribute("contenteditable"))}
-function h(a){return a.activeEnterMode!=CKEDITOR.ENTER_BR&&!1!==a.config.autoParagraph?a.activeEnterMode==CKEDITOR.ENTER_DIV?"div":"p":!1}function p(a){var b=a.editor;b.getSelection().scrollIntoView();setTimeout(function(){b.fire("saveSnapshot")},0)}function r(a,b,c){var d=a.getCommonAncestor(b);for(b=a=c?b:a;(a=a.getParent())&&!d.equals(a)&&1==a.getChildCount();)b=a;b.remove()}var f,B,u,z,y,m,x,J,w,F;CKEDITOR.editable=CKEDITOR.tools.createClass({base:CKEDITOR.dom.element,$:function(a,b){this.base(b.$||
-b);this.editor=a;this.status="unloaded";this.hasFocus=!1;this.setup()},proto:{focus:function(){var a;if(CKEDITOR.env.webkit&&!this.hasFocus&&(a=this.editor._.previousActive||this.getDocument().getActive(),this.contains(a))){a.focus();return}CKEDITOR.env.edge&&14<CKEDITOR.env.version&&!this.hasFocus&&this.getDocument().equals(CKEDITOR.document)&&(this.editor._.previousScrollTop=this.$.scrollTop);try{!CKEDITOR.env.ie||CKEDITOR.env.edge&&14<CKEDITOR.env.version||!this.getDocument().equals(CKEDITOR.document)?
-this.$.focus():this.$.setActive()}catch(b){if(!CKEDITOR.env.ie)throw b;}CKEDITOR.env.safari&&!this.isInline()&&(a=CKEDITOR.document.getActive(),a.equals(this.getWindow().getFrame())||this.getWindow().focus())},on:function(a,b){var c=Array.prototype.slice.call(arguments,0);CKEDITOR.env.ie&&/^focus|blur$/.exec(a)&&(a="focus"==a?"focusin":"focusout",b=e(b,this),c[0]=a,c[1]=b);return CKEDITOR.dom.element.prototype.on.apply(this,c)},attachListener:function(a){!this._.listeners&&(this._.listeners=[]);var b=
-Array.prototype.slice.call(arguments,1),b=a.on.apply(a,b);this._.listeners.push(b);return b},clearListeners:function(){var a=this._.listeners;try{for(;a.length;)a.pop().removeListener()}catch(b){}},restoreAttrs:function(){var a=this._.attrChanges,b,c;for(c in a)a.hasOwnProperty(c)&&(b=a[c],null!==b?this.setAttribute(c,b):this.removeAttribute(c))},attachClass:function(a){var b=this.getCustomData("classes");this.hasClass(a)||(!b&&(b=[]),b.push(a),this.setCustomData("classes",b),this.addClass(a))},changeAttr:function(a,
-b){var c=this.getAttribute(a);b!==c&&(!this._.attrChanges&&(this._.attrChanges={}),a in this._.attrChanges||(this._.attrChanges[a]=c),this.setAttribute(a,b))},insertText:function(a){this.editor.focus();this.insertHtml(this.transformPlainTextToHtml(a),"text")},transformPlainTextToHtml:function(a){var b=this.editor.getSelection().getStartElement().hasAscendant("pre",!0)?CKEDITOR.ENTER_BR:this.editor.activeEnterMode;return CKEDITOR.tools.transformPlainTextToHtml(a,b)},insertHtml:function(a,b,c){var d=
-this.editor;d.focus();d.fire("saveSnapshot");c||(c=d.getSelection().getRanges()[0]);m(this,b||"html",a,c);c.select();p(this);this.editor.fire("afterInsertHtml",{})},insertHtmlIntoRange:function(a,b,c){m(this,c||"html",a,b);this.editor.fire("afterInsertHtml",{intoRange:b})},insertElement:function(a,b){var d=this.editor;d.focus();d.fire("saveSnapshot");var e=d.activeEnterMode,d=d.getSelection(),f=a.getName(),f=CKEDITOR.dtd.$block[f];b||(b=d.getRanges()[0]);this.insertElementIntoRange(a,b)&&(b.moveToPosition(a,
-CKEDITOR.POSITION_AFTER_END),f&&((f=a.getNext(function(a){return c(a)&&!z(a)}))&&f.type==CKEDITOR.NODE_ELEMENT&&f.is(CKEDITOR.dtd.$block)?f.getDtd()["#"]?b.moveToElementEditStart(f):b.moveToElementEditEnd(a):f||e==CKEDITOR.ENTER_BR||(f=b.fixBlock(!0,e==CKEDITOR.ENTER_DIV?"div":"p"),b.moveToElementEditStart(f))));d.selectRanges([b]);p(this)},insertElementIntoSelection:function(a){this.insertElement(a)},insertElementIntoRange:function(a,b){var c=this.editor,d=c.config.enterMode,e=a.getName(),f=CKEDITOR.dtd.$block[e];
-if(b.checkReadOnly())return!1;b.deleteContents(1);b.startContainer.type==CKEDITOR.NODE_ELEMENT&&(b.startContainer.is({tr:1,table:1,tbody:1,thead:1,tfoot:1})?x(b):b.startContainer.is(CKEDITOR.dtd.$list)&&J(b));var g,k;if(f)for(;(g=b.getCommonAncestor(0,1))&&(k=CKEDITOR.dtd[g.getName()])&&(!k||!k[e]);)g.getName()in CKEDITOR.dtd.span?b.splitElement(g):b.checkStartOfBlock()&&b.checkEndOfBlock()?(b.setStartBefore(g),b.collapse(!0),g.remove()):b.splitBlock(d==CKEDITOR.ENTER_DIV?"div":"p",c.editable());
-b.insertNode(a);return!0},setData:function(a,b){b||(a=this.editor.dataProcessor.toHtml(a));this.setHtml(a);this.fixInitialSelection();"unloaded"==this.status&&(this.status="ready");this.editor.fire("dataReady")},getData:function(a){var b=this.getHtml();a||(b=this.editor.dataProcessor.toDataFormat(b));return b},setReadOnly:function(a){this.setAttribute("contenteditable",!a)},detach:function(){this.removeClass("cke_editable");this.status="detached";var a=this.editor;this._.detach();delete a.document;
-delete a.window},isInline:function(){return this.getDocument().equals(CKEDITOR.document)},fixInitialSelection:function(){function a(){var b=c.getDocument().$,d=b.getSelection(),l;a:if(d.anchorNode&&d.anchorNode==c.$)l=!0;else{if(CKEDITOR.env.webkit&&(l=c.getDocument().getActive())&&l.equals(c)&&!d.anchorNode){l=!0;break a}l=void 0}l&&(l=new CKEDITOR.dom.range(c),l.moveToElementEditStart(c),b=b.createRange(),b.setStart(l.startContainer.$,l.startOffset),b.collapse(!0),d.removeAllRanges(),d.addRange(b))}
-function b(){var a=c.getDocument().$,d=a.selection,l=c.getDocument().getActive();"None"==d.type&&l.equals(c)&&(d=new CKEDITOR.dom.range(c),a=a.body.createTextRange(),d.moveToElementEditStart(c),d=d.startContainer,d.type!=CKEDITOR.NODE_ELEMENT&&(d=d.getParent()),a.moveToElementText(d.$),a.collapse(!0),a.select())}var c=this;if(CKEDITOR.env.ie&&(9>CKEDITOR.env.version||CKEDITOR.env.quirks))this.hasFocus&&(this.focus(),b());else if(this.hasFocus)this.focus(),a();else this.once("focus",function(){a()},
-null,null,-999)},getHtmlFromRange:function(a){if(a.collapsed)return new CKEDITOR.dom.documentFragment(a.document);a={doc:this.getDocument(),range:a.clone()};w.eol.detect(a,this);w.bogus.exclude(a);w.cell.shrink(a);a.fragment=a.range.cloneContents();w.tree.rebuild(a,this);w.eol.fix(a,this);return new CKEDITOR.dom.documentFragment(a.fragment.$)},extractHtmlFromRange:function(a,b){var c=F,d={range:a,doc:a.document},e=this.getHtmlFromRange(a);if(a.collapsed)return a.optimize(),e;a.enlarge(CKEDITOR.ENLARGE_INLINE,
-1);c.table.detectPurge(d);d.bookmark=a.createBookmark();delete d.range;var f=this.editor.createRange();f.moveToPosition(d.bookmark.startNode,CKEDITOR.POSITION_BEFORE_START);d.targetBookmark=f.createBookmark();c.list.detectMerge(d,this);c.table.detectRanges(d,this);c.block.detectMerge(d,this);d.tableContentsRanges?(c.table.deleteRanges(d),a.moveToBookmark(d.bookmark),d.range=a):(a.moveToBookmark(d.bookmark),d.range=a,a.extractContents(c.detectExtractMerge(d)));a.moveToBookmark(d.targetBookmark);a.optimize();
-c.fixUneditableRangePosition(a);c.list.merge(d,this);c.table.purge(d,this);c.block.merge(d,this);if(b){c=a.startPath();if(d=a.checkStartOfBlock()&&a.checkEndOfBlock()&&c.block&&!a.root.equals(c.block)){a:{var d=c.block.getElementsByTag("span"),f=0,g;if(d)for(;g=d.getItem(f++);)if(!B(g)){d=!0;break a}d=!1}d=!d}d&&(a.moveToPosition(c.block,CKEDITOR.POSITION_BEFORE_START),c.block.remove())}else c.autoParagraph(this.editor,a),u(a.startContainer)&&a.startContainer.appendBogus();a.startContainer.mergeSiblings();
-return e},setup:function(){var a=this.editor;this.attachListener(a,"beforeGetData",function(){var b=this.getData();this.is("textarea")||!1!==a.config.ignoreEmptyParagraph&&(b=b.replace(y,function(a,b){return b}));a.setData(b,null,1)},this);this.attachListener(a,"getSnapshot",function(a){a.data=this.getData(1)},this);this.attachListener(a,"afterSetData",function(){this.setData(a.getData(1))},this);this.attachListener(a,"loadSnapshot",function(a){this.setData(a.data,1)},this);this.attachListener(a,
-"beforeFocus",function(){var b=a.getSelection();(b=b&&b.getNative())&&"Control"==b.type||this.focus()},this);this.attachListener(a,"insertHtml",function(a){this.insertHtml(a.data.dataValue,a.data.mode,a.data.range)},this);this.attachListener(a,"insertElement",function(a){this.insertElement(a.data)},this);this.attachListener(a,"insertText",function(a){this.insertText(a.data)},this);this.setReadOnly(a.readOnly);this.attachClass("cke_editable");a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?this.attachClass("cke_editable_inline"):
-a.elementMode!=CKEDITOR.ELEMENT_MODE_REPLACE&&a.elementMode!=CKEDITOR.ELEMENT_MODE_APPENDTO||this.attachClass("cke_editable_themed");this.attachClass("cke_contents_"+a.config.contentsLangDirection);a.keystrokeHandler.blockedKeystrokes[8]=+a.readOnly;a.keystrokeHandler.attach(this);this.on("blur",function(){this.hasFocus=!1},null,null,-1);this.on("focus",function(){this.hasFocus=!0},null,null,-1);if(CKEDITOR.env.webkit)this.on("scroll",function(){a._.previousScrollTop=a.editable().$.scrollTop},null,
-null,-1);if(CKEDITOR.env.edge&&14<CKEDITOR.env.version){var d=function(){var b=a.editable();null!=a._.previousScrollTop&&b.getDocument().equals(CKEDITOR.document)&&(b.$.scrollTop=a._.previousScrollTop,a._.previousScrollTop=null,this.removeListener("scroll",d))};this.on("scroll",d)}a.focusManager.add(this);this.equals(CKEDITOR.document.getActive())&&(this.hasFocus=!0,a.once("contentDom",function(){a.focusManager.focus(this)},this));this.isInline()&&this.changeAttr("tabindex",a.tabIndex);if(!this.is("textarea")){a.document=
-this.getDocument();a.window=this.getWindow();var e=a.document;this.changeAttr("spellcheck",!a.config.disableNativeSpellChecker);var t=a.config.contentsLangDirection;this.getDirection(1)!=t&&this.changeAttr("dir",t);var k=CKEDITOR.getCss();if(k){var t=e.getHead(),h=t.getCustomData("stylesheet");h?k!=h.getText()&&(CKEDITOR.env.ie&&9>CKEDITOR.env.version?h.$.styleSheet.cssText=k:h.setText(k)):(k=e.appendStyleText(k),k=new CKEDITOR.dom.element(k.ownerNode||k.owningElement),t.setCustomData("stylesheet",
-k),k.data("cke-temp",1))}t=e.getCustomData("stylesheet_ref")||0;e.setCustomData("stylesheet_ref",t+1);this.setCustomData("cke_includeReadonly",!a.config.disableReadonlyStyling);this.attachListener(this,"click",function(a){a=a.data;var b=(new CKEDITOR.dom.elementPath(a.getTarget(),this)).contains("a");b&&2!=a.$.button&&b.isReadOnly()&&a.preventDefault()});var D={8:1,46:1};this.attachListener(a,"key",function(b){if(a.readOnly)return!0;var c=b.data.domEvent.getKey(),d;if(c in D){b=a.getSelection();var e,
-n=b.getRanges()[0],q=n.startPath(),t,k,h,c=8==c;CKEDITOR.env.ie&&11>CKEDITOR.env.version&&(e=b.getSelectedElement())||(e=g(b))?(a.fire("saveSnapshot"),n.moveToPosition(e,CKEDITOR.POSITION_BEFORE_START),e.remove(),n.select(),a.fire("saveSnapshot"),d=1):n.collapsed&&((t=q.block)&&(h=t[c?"getPrevious":"getNext"](f))&&h.type==CKEDITOR.NODE_ELEMENT&&h.is("table")&&n[c?"checkStartOfBlock":"checkEndOfBlock"]()?(a.fire("saveSnapshot"),n[c?"checkEndOfBlock":"checkStartOfBlock"]()&&t.remove(),n["moveToElementEdit"+
-(c?"End":"Start")](h),n.select(),a.fire("saveSnapshot"),d=1):q.blockLimit&&q.blockLimit.is("td")&&(k=q.blockLimit.getAscendant("table"))&&n.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(h=k[c?"getPrevious":"getNext"](f))?(a.fire("saveSnapshot"),n["moveToElementEdit"+(c?"End":"Start")](h),n.checkStartOfBlock()&&n.checkEndOfBlock()?h.remove():n.select(),a.fire("saveSnapshot"),d=1):(k=q.contains(["td","th","caption"]))&&n.checkBoundaryOfElement(k,c?CKEDITOR.START:CKEDITOR.END)&&(d=1))}return!d});
-a.blockless&&CKEDITOR.env.ie&&CKEDITOR.env.needsBrFiller&&this.attachListener(this,"keyup",function(b){b.data.getKeystroke()in D&&!this.getFirst(c)&&(this.appendBogus(),b=a.createRange(),b.moveToPosition(this,CKEDITOR.POSITION_AFTER_START),b.select())});this.attachListener(this,"dblclick",function(b){if(a.readOnly)return!1;b={element:b.data.getTarget()};a.fire("doubleclick",b)});CKEDITOR.env.ie&&this.attachListener(this,"click",b);CKEDITOR.env.ie&&!CKEDITOR.env.edge||this.attachListener(this,"mousedown",
-function(b){var c=b.data.getTarget();c.is("img","hr","input","textarea","select")&&!c.isReadOnly()&&(a.getSelection().selectElement(c),c.is("input","textarea","select")&&b.data.preventDefault())});CKEDITOR.env.edge&&this.attachListener(this,"mouseup",function(b){(b=b.data.getTarget())&&b.is("img")&&a.getSelection().selectElement(b)});CKEDITOR.env.gecko&&this.attachListener(this,"mouseup",function(b){if(2==b.data.$.button&&(b=b.data.getTarget(),!b.getOuterHtml().replace(y,""))){var c=a.createRange();
-c.moveToElementEditStart(b);c.select(!0)}});CKEDITOR.env.webkit&&(this.attachListener(this,"click",function(a){a.data.getTarget().is("input","select")&&a.data.preventDefault()}),this.attachListener(this,"mouseup",function(a){a.data.getTarget().is("input","textarea")&&a.data.preventDefault()}));CKEDITOR.env.webkit&&this.attachListener(a,"key",function(b){if(a.readOnly)return!0;b=b.data.domEvent.getKey();if(b in D){var c=8==b,d=a.getSelection().getRanges()[0];b=d.startPath();if(d.collapsed)a:{var e=
-b.block;if(e&&d[c?"checkStartOfBlock":"checkEndOfBlock"]()&&d.moveToClosestEditablePosition(e,!c)&&d.collapsed){if(d.startContainer.type==CKEDITOR.NODE_ELEMENT){var f=d.startContainer.getChild(d.startOffset-(c?1:0));if(f&&f.type==CKEDITOR.NODE_ELEMENT&&f.is("hr")){a.fire("saveSnapshot");f.remove();b=!0;break a}}d=d.startPath().block;if(!d||d&&d.contains(e))b=void 0;else{a.fire("saveSnapshot");var n;(n=(c?d:e).getBogus())&&n.remove();n=a.getSelection();f=n.createBookmarks();(c?e:d).moveChildren(c?
-d:e,!1);b.lastElement.mergeSiblings();r(e,d,!c);n.selectBookmarks(f);b=!0}}else b=!1}else c=d,n=b.block,d=c.endPath().block,n&&d&&!n.equals(d)?(a.fire("saveSnapshot"),(e=n.getBogus())&&e.remove(),c.enlarge(CKEDITOR.ENLARGE_INLINE),c.deleteContents(),d.getParent()&&(d.moveChildren(n,!1),b.lastElement.mergeSiblings(),r(n,d,!0)),c=a.getSelection().getRanges()[0],c.collapse(1),c.optimize(),""===c.startContainer.getHtml()&&c.startContainer.appendBogus(),c.select(),b=!0):b=!1;if(!b)return;a.getSelection().scrollIntoView();
-a.fire("saveSnapshot");return!1}},this,null,100)}}},_:{detach:function(){this.editor.setData(this.editor.getData(),0,1);this.clearListeners();this.restoreAttrs();var a;if(a=this.removeCustomData("classes"))for(;a.length;)this.removeClass(a.pop());if(!this.is("textarea")){a=this.getDocument();var b=a.getHead();if(b.getCustomData("stylesheet")){var c=a.getCustomData("stylesheet_ref");--c?a.setCustomData("stylesheet_ref",c):(a.removeCustomData("stylesheet_ref"),b.removeCustomData("stylesheet").remove())}}this.editor.fire("contentDomUnload");
-delete this.editor}}});CKEDITOR.editor.prototype.editable=function(a){var b=this._.editable;if(b&&a)return 0;arguments.length&&(b=this._.editable=a?a instanceof CKEDITOR.editable?a:new CKEDITOR.editable(this,a):(b&&b.detach(),null));return b};CKEDITOR.on("instanceLoaded",function(b){var c=b.editor;c.on("insertElement",function(a){a=a.data;a.type==CKEDITOR.NODE_ELEMENT&&(a.is("input")||a.is("textarea"))&&("false"!=a.getAttribute("contentEditable")&&a.data("cke-editable",a.hasAttribute("contenteditable")?
-"true":"1"),a.setAttribute("contentEditable",!1))});c.on("selectionChange",function(b){if(!c.readOnly){var d=c.getSelection();d&&!d.isLocked&&(d=c.checkDirty(),c.fire("lockSnapshot"),a(b),c.fire("unlockSnapshot"),!d&&c.resetDirty())}})});CKEDITOR.on("instanceCreated",function(a){var b=a.editor;b.on("mode",function(){var a=b.editable();if(a&&a.isInline()){var c=b.title;a.changeAttr("role","textbox");a.changeAttr("aria-label",c);c&&a.changeAttr("title",c);var d=b.fire("ariaEditorHelpLabel",{}).label;
-if(d&&(c=this.ui.space(this.elementMode==CKEDITOR.ELEMENT_MODE_INLINE?"top":"contents"))){var e=CKEDITOR.tools.getNextId(),d=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+e+'" class\x3d"cke_voice_label"\x3e'+d+"\x3c/span\x3e");c.append(d);a.changeAttr("aria-describedby",e)}}})});CKEDITOR.addCss(".cke_editable{cursor:text}.cke_editable img,.cke_editable input,.cke_editable textarea{cursor:default}");f=CKEDITOR.dom.walker.whitespaces(!0);B=CKEDITOR.dom.walker.bookmark(!1,!0);u=CKEDITOR.dom.walker.empty();
-z=CKEDITOR.dom.walker.bogus();y=/(^|<body\b[^>]*>)\s*<(p|div|address|h\d|center|pre)[^>]*>\s*(?:<br[^>]*>|&nbsp;|\u00A0|&#160;)?\s*(:?<\/\2>)?\s*(?=$|<\/body>)/gi;m=function(){function a(b){return b.type==CKEDITOR.NODE_ELEMENT}function b(c,d){var e,f,n,t,g=[],k=d.range.startContainer;e=d.range.startPath();for(var k=p[k.getName()],h=0,C=c.getChildren(),A=C.count(),D=-1,m=-1,r=0,H=e.contains(p.$list);h<A;++h)e=C.getItem(h),a(e)?(n=e.getName(),H&&n in CKEDITOR.dtd.$list?g=g.concat(b(e,d)):(t=!k||!!k[n],
-"br"!=n||!e.data("cke-eol")||h&&h!=A-1||(r=(f=h?g[h-1].node:C.getItem(h+1))&&(!a(f)||!f.is("br")),f=f&&a(f)&&p.$block[f.getName()]),-1!=D||t||(D=h),t||(m=h),g.push({isElement:1,isLineBreak:r,isBlock:e.isBlockBoundary(),hasBlockSibling:f,node:e,name:n,allowed:t}),f=r=0)):g.push({isElement:0,node:e,allowed:1});-1<D&&(g[D].firstNotAllowed=1);-1<m&&(g[m].lastNotAllowed=1);return g}function d(b,c){var e=[],f=b.getChildren(),q=f.count(),g,t=0,k=p[c],h=!b.is(p.$inline)||b.is("br");for(h&&e.push(" ");t<q;t++)g=
-f.getItem(t),a(g)&&!g.is(k)?e=e.concat(d(g,c)):e.push(g);h&&e.push(" ");return e}function e(b){return a(b.startContainer)&&b.startContainer.getChild(b.startOffset-1)}function f(b){return b&&a(b)&&(b.is(p.$removeEmpty)||b.is("a")&&!b.isBlockBoundary())}function g(b,c,d,e){var f=b.clone(),n,q;f.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);(n=(new CKEDITOR.dom.walker(f)).next())&&a(n)&&m[n.getName()]&&(q=n.getPrevious())&&a(q)&&!q.getParent().equals(b.startContainer)&&d.contains(q)&&e.contains(n)&&n.isIdentical(q)&&
-(n.moveChildren(q),n.remove(),g(b,c,d,e))}function D(b,c){function d(b,c){if(c.isBlock&&c.isElement&&!c.node.is("br")&&a(b)&&b.is("br"))return b.remove(),1}var e=c.endContainer.getChild(c.endOffset),f=c.endContainer.getChild(c.endOffset-1);e&&d(e,b[b.length-1]);f&&d(f,b[0])&&(c.setEnd(c.endContainer,c.endOffset-1),c.collapse())}var p=CKEDITOR.dtd,m={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,ul:1,ol:1,li:1,pre:1,dl:1,blockquote:1},r={p:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1},x=CKEDITOR.tools.extend({},
-p.$inline);delete x.br;return function(m,v,G,E){var I=m.editor,K=!1;"unfiltered_html"==v&&(v="html",K=!0);if(!E.checkReadOnly()){var L=(new CKEDITOR.dom.elementPath(E.startContainer,E.root)).blockLimit||E.root;m={type:v,dontFilter:K,editable:m,editor:I,range:E,blockLimit:L,mergeCandidates:[],zombies:[]};v=m.range;E=m.mergeCandidates;var H,u;"text"==m.type&&v.shrink(CKEDITOR.SHRINK_ELEMENT,!0,!1)&&(H=CKEDITOR.dom.element.createFromHtml("\x3cspan\x3e\x26nbsp;\x3c/span\x3e",v.document),v.insertNode(H),
-v.setStartAfter(H));K=new CKEDITOR.dom.elementPath(v.startContainer);m.endPath=L=new CKEDITOR.dom.elementPath(v.endContainer);if(!v.collapsed){var I=L.block||L.blockLimit,B=v.getCommonAncestor();I&&!I.equals(B)&&!I.contains(B)&&v.checkEndOfBlock()&&m.zombies.push(I);v.deleteContents()}for(;(u=e(v))&&a(u)&&u.isBlockBoundary()&&K.contains(u);)v.moveToPosition(u,CKEDITOR.POSITION_BEFORE_END);g(v,m.blockLimit,K,L);H&&(v.setEndBefore(H),v.collapse(),H.remove());H=v.startPath();if(I=H.contains(f,!1,1))v.splitElement(I),
-m.inlineStylesRoot=I,m.inlineStylesPeak=H.lastElement;H=v.createBookmark();(I=H.startNode.getPrevious(c))&&a(I)&&f(I)&&E.push(I);(I=H.startNode.getNext(c))&&a(I)&&f(I)&&E.push(I);for(I=H.startNode;(I=I.getParent())&&f(I);)E.push(I);v.moveToBookmark(H);if(H=G){H=m.range;if("text"==m.type&&m.inlineStylesRoot){u=m.inlineStylesPeak;v=u.getDocument().createText("{cke-peak}");for(E=m.inlineStylesRoot.getParent();!u.equals(E);)v=v.appendTo(u.clone()),u=u.getParent();G=v.getOuterHtml().split("{cke-peak}").join(G)}u=
-m.blockLimit.getName();if(/^\s+|\s+$/.test(G)&&"span"in CKEDITOR.dtd[u]){var z='\x3cspan data-cke-marker\x3d"1"\x3e\x26nbsp;\x3c/span\x3e';G=z+G+z}G=m.editor.dataProcessor.toHtml(G,{context:null,fixForBody:!1,protectedWhitespaces:!!z,dontFilter:m.dontFilter,filter:m.editor.activeFilter,enterMode:m.editor.activeEnterMode});u=H.document.createElement("body");u.setHtml(G);z&&(u.getFirst().remove(),u.getLast().remove());if((z=H.startPath().block)&&(1!=z.getChildCount()||!z.getBogus()))a:{var w;if(1==
-u.getChildCount()&&a(w=u.getFirst())&&w.is(r)&&!w.hasAttribute("contenteditable")){z=w.getElementsByTag("*");H=0;for(E=z.count();H<E;H++)if(v=z.getItem(H),!v.is(x))break a;w.moveChildren(w.getParent(1));w.remove()}}m.dataWrapper=u;H=G}if(H){w=m.range;H=w.document;var y;u=m.blockLimit;E=0;var O,z=[],N,V;G=I=0;var F,J;v=w.startContainer;var K=m.endPath.elements[0],Y,L=K.getPosition(v),B=!!K.getCommonAncestor(v)&&L!=CKEDITOR.POSITION_IDENTICAL&&!(L&CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED);
-v=b(m.dataWrapper,m);for(D(v,w);E<v.length;E++){L=v[E];if(y=L.isLineBreak){y=w;F=u;var U=void 0,aa=void 0;L.hasBlockSibling?y=1:(U=y.startContainer.getAscendant(p.$block,1))&&U.is({div:1,p:1})?(aa=U.getPosition(F),aa==CKEDITOR.POSITION_IDENTICAL||aa==CKEDITOR.POSITION_CONTAINS?y=0:(F=y.splitElement(U),y.moveToPosition(F,CKEDITOR.POSITION_AFTER_START),y=1)):y=0}if(y)G=0<E;else{y=w.startPath();!L.isBlock&&k(m.editor,y.block,y.blockLimit)&&(V=h(m.editor))&&(V=H.createElement(V),V.appendBogus(),w.insertNode(V),
-CKEDITOR.env.needsBrFiller&&(O=V.getBogus())&&O.remove(),w.moveToPosition(V,CKEDITOR.POSITION_BEFORE_END));if((y=w.startPath().block)&&!y.equals(N)){if(O=y.getBogus())O.remove(),z.push(y);N=y}L.firstNotAllowed&&(I=1);if(I&&L.isElement){y=w.startContainer;for(F=null;y&&(!p||!p[y.getName()]||!p[y.getName()][L.name]);){if(y.equals(u)){y=null;break}F=y;y=y.getParent()}if(y)F&&(J=w.splitElement(F),m.zombies.push(J),m.zombies.push(F));else{F=u.getName();Y=!E;y=E==v.length-1;F=d(L.node,F);for(var U=[],aa=F.length,ba=0,da=void 0,
-ea=0,W=-1;ba<aa;ba++)da=F[ba]," "==da?(ea||Y&&!ba||(U.push(new CKEDITOR.dom.text(" ")),W=U.length),ea=1):(U.push(da),ea=0);y&&W==U.length&&U.pop();Y=U}}if(Y){for(;y=Y.pop();)w.insertNode(y);Y=0}else w.insertNode(L.node);L.lastNotAllowed&&E<v.length-1&&((J=B?K:J)&&w.setEndAt(J,CKEDITOR.POSITION_AFTER_START),I=0);w.collapse()}}1!=v.length?O=!1:(O=v[0],O=O.isElement&&"false"==O.node.getAttribute("contenteditable"));O&&(G=!0,y=v[0].node,w.setStartAt(y,CKEDITOR.POSITION_BEFORE_START),w.setEndAt(y,CKEDITOR.POSITION_AFTER_END));
-m.dontMoveCaret=G;m.bogusNeededBlocks=z}O=m.range;var T;J=m.bogusNeededBlocks;for(Y=O.createBookmark();N=m.zombies.pop();)N.getParent()&&(V=O.clone(),V.moveToElementEditStart(N),V.removeEmptyBlocksAtEnd());if(J)for(;N=J.pop();)CKEDITOR.env.needsBrFiller?N.appendBogus():N.append(O.document.createText(" "));for(;N=m.mergeCandidates.pop();)N.mergeSiblings();O.moveToBookmark(Y);if(!m.dontMoveCaret){for(N=e(O);N&&a(N)&&!N.is(p.$empty);){if(N.isBlockBoundary())O.moveToPosition(N,CKEDITOR.POSITION_BEFORE_END);
-else{if(f(N)&&N.getHtml().match(/(\s|&nbsp;)$/g)){T=null;break}T=O.clone();T.moveToPosition(N,CKEDITOR.POSITION_BEFORE_END)}N=N.getLast(c)}T&&O.moveToRange(T)}}}}();x=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$tableContent)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT};return b}function b(a,c,d){c=a.getDocument().createElement(c);a.append(c,d);return c}function c(a){var b=a.count(),
-d;for(b;0<b--;)d=a.getItem(b),CKEDITOR.tools.trim(d.getHtml())||(d.appendBogus(),CKEDITOR.env.ie&&9>CKEDITOR.env.version&&d.getChildCount()&&d.getFirst().remove())}return function(d){var e=d.startContainer,f=e.getAscendant("table",1),g=!1;c(f.getElementsByTag("td"));c(f.getElementsByTag("th"));f=d.clone();f.setStart(e,0);f=a(f).lastBackward();f||(f=d.clone(),f.setEndAt(e,CKEDITOR.POSITION_BEFORE_END),f=a(f).lastForward(),g=!0);f||(f=e);f.is("table")?(d.setStartAt(f,CKEDITOR.POSITION_BEFORE_START),
-d.collapse(!0),f.remove()):(f.is({tbody:1,thead:1,tfoot:1})&&(f=b(f,"tr",g)),f.is("tr")&&(f=b(f,f.getParent().is("thead")?"th":"td",g)),(e=f.getBogus())&&e.remove(),d.moveToPosition(f,g?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END))}}();J=function(){function a(b){b=new CKEDITOR.dom.walker(b);b.guard=function(a,b){if(b)return!1;if(a.type==CKEDITOR.NODE_ELEMENT)return a.is(CKEDITOR.dtd.$list)||a.is(CKEDITOR.dtd.$listItem)};b.evaluator=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&
-a.is(CKEDITOR.dtd.$listItem)};return b}return function(b){var c=b.startContainer,d=!1,e;e=b.clone();e.setStart(c,0);e=a(e).lastBackward();e||(e=b.clone(),e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END),e=a(e).lastForward(),d=!0);e||(e=c);e.is(CKEDITOR.dtd.$list)?(b.setStartAt(e,CKEDITOR.POSITION_BEFORE_START),b.collapse(!0),e.remove()):((c=e.getBogus())&&c.remove(),b.moveToPosition(e,d?CKEDITOR.POSITION_AFTER_START:CKEDITOR.POSITION_BEFORE_END),b.select())}}();w={eol:{detect:function(a,b){var c=a.range,
-d=c.clone(),e=c.clone(),f=new CKEDITOR.dom.elementPath(c.startContainer,b),g=new CKEDITOR.dom.elementPath(c.endContainer,b);d.collapse(1);e.collapse();f.block&&d.checkBoundaryOfElement(f.block,CKEDITOR.END)&&(c.setStartAfter(f.block),a.prependEolBr=1);g.block&&e.checkBoundaryOfElement(g.block,CKEDITOR.START)&&(c.setEndBefore(g.block),a.appendEolBr=1)},fix:function(a,b){var c=b.getDocument(),d;a.appendEolBr&&(d=this.createEolBr(c),a.fragment.append(d));!a.prependEolBr||d&&!d.getPrevious()||a.fragment.append(this.createEolBr(c),
-1)},createEolBr:function(a){return a.createElement("br",{attributes:{"data-cke-eol":1}})}},bogus:{exclude:function(a){var b=a.range.getBoundaryNodes(),c=b.startNode,b=b.endNode;!b||!z(b)||c&&c.equals(b)||a.range.setEndBefore(b)}},tree:{rebuild:function(a,b){var c=a.range,d=c.getCommonAncestor(),e=new CKEDITOR.dom.elementPath(d,b),f=new CKEDITOR.dom.elementPath(c.startContainer,b),c=new CKEDITOR.dom.elementPath(c.endContainer,b),g;d.type==CKEDITOR.NODE_TEXT&&(d=d.getParent());if(e.blockLimit.is({tr:1,
-table:1})){var k=e.contains("table").getParent();g=function(a){return!a.equals(k)}}else if(e.block&&e.block.is(CKEDITOR.dtd.$listItem)&&(f=f.contains(CKEDITOR.dtd.$list),c=c.contains(CKEDITOR.dtd.$list),!f.equals(c))){var h=e.contains(CKEDITOR.dtd.$list).getParent();g=function(a){return!a.equals(h)}}g||(g=function(a){return!a.equals(e.block)&&!a.equals(e.blockLimit)});this.rebuildFragment(a,b,d,g)},rebuildFragment:function(a,b,c,d){for(var e;c&&!c.equals(b)&&d(c);)e=c.clone(0,1),a.fragment.appendTo(e),
-a.fragment=e,c=c.getParent()}},cell:{shrink:function(a){a=a.range;var b=a.startContainer,c=a.endContainer,d=a.startOffset,e=a.endOffset;b.type==CKEDITOR.NODE_ELEMENT&&b.equals(c)&&b.is("tr")&&++d==e&&a.shrink(CKEDITOR.SHRINK_TEXT)}}};F=function(){function a(b,c){var d=b.getParent();if(d.is(CKEDITOR.dtd.$inline))b[c?"insertBefore":"insertAfter"](d)}function b(c,d,e){a(d);a(e,1);for(var f;f=e.getNext();)f.insertAfter(d),d=f;u(c)&&c.remove()}function c(a,b){var d=new CKEDITOR.dom.range(a);d.setStartAfter(b.startNode);
-d.setEndBefore(b.endNode);return d}return{list:{detectMerge:function(a,b){var d=c(b,a.bookmark),e=d.startPath(),f=d.endPath(),l=e.contains(CKEDITOR.dtd.$list),g=f.contains(CKEDITOR.dtd.$list);a.mergeList=l&&g&&l.getParent().equals(g.getParent())&&!l.equals(g);a.mergeListItems=e.block&&f.block&&e.block.is(CKEDITOR.dtd.$listItem)&&f.block.is(CKEDITOR.dtd.$listItem);if(a.mergeList||a.mergeListItems)d=d.clone(),d.setStartBefore(a.bookmark.startNode),d.setEndAfter(a.bookmark.endNode),a.mergeListBookmark=
-d.createBookmark()},merge:function(a,c){if(a.mergeListBookmark){var d=a.mergeListBookmark.startNode,e=a.mergeListBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),l=new CKEDITOR.dom.elementPath(e,c);if(a.mergeList){var g=f.contains(CKEDITOR.dtd.$list),n=l.contains(CKEDITOR.dtd.$list);g.equals(n)||(n.moveChildren(g),n.remove())}a.mergeListItems&&(f=f.contains(CKEDITOR.dtd.$listItem),l=l.contains(CKEDITOR.dtd.$listItem),f.equals(l)||b(l,d,e));d.remove();e.remove()}}},block:{detectMerge:function(a,
-b){if(!a.tableContentsRanges&&!a.mergeListBookmark){var c=new CKEDITOR.dom.range(b);c.setStartBefore(a.bookmark.startNode);c.setEndAfter(a.bookmark.endNode);a.mergeBlockBookmark=c.createBookmark()}},merge:function(a,c){if(a.mergeBlockBookmark&&!a.purgeTableBookmark){var d=a.mergeBlockBookmark.startNode,e=a.mergeBlockBookmark.endNode,f=new CKEDITOR.dom.elementPath(d,c),l=new CKEDITOR.dom.elementPath(e,c),f=f.block,l=l.block;f&&l&&!f.equals(l)&&b(l,d,e);d.remove();e.remove()}}},table:function(){function a(c){var e=
-[],f,l=new CKEDITOR.dom.walker(c),g=c.startPath().contains(d),n=c.endPath().contains(d),k={};l.guard=function(a,l){if(a.type==CKEDITOR.NODE_ELEMENT){var h="visited_"+(l?"out":"in");if(a.getCustomData(h))return;CKEDITOR.dom.element.setMarker(k,a,h,1)}if(l&&g&&a.equals(g))f=c.clone(),f.setEndAt(g,CKEDITOR.POSITION_BEFORE_END),e.push(f);else if(!l&&n&&a.equals(n))f=c.clone(),f.setStartAt(n,CKEDITOR.POSITION_AFTER_START),e.push(f);else{if(h=!l)h=a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&(!g||b(a,g))&&(!n||
-b(a,n));h&&(f=c.clone(),f.selectNodeContents(a),e.push(f))}};l.lastForward();CKEDITOR.dom.element.clearAllMarkers(k);return e}function b(a,c){var d=CKEDITOR.POSITION_CONTAINS+CKEDITOR.POSITION_IS_CONTAINED,e=a.getPosition(c);return e===CKEDITOR.POSITION_IDENTICAL?!1:0===(e&d)}var d={td:1,th:1,caption:1};return{detectPurge:function(a){var b=a.range,c=b.clone();c.enlarge(CKEDITOR.ENLARGE_ELEMENT);var c=new CKEDITOR.dom.walker(c),e=0;c.evaluator=function(a){a.type==CKEDITOR.NODE_ELEMENT&&a.is(d)&&++e};
-c.checkForward();if(1<e){var c=b.startPath().contains("table"),f=b.endPath().contains("table");c&&f&&b.checkBoundaryOfElement(c,CKEDITOR.START)&&b.checkBoundaryOfElement(f,CKEDITOR.END)&&(b=a.range.clone(),b.setStartBefore(c),b.setEndAfter(f),a.purgeTableBookmark=b.createBookmark())}},detectRanges:function(e,f){var l=c(f,e.bookmark),g=l.clone(),k,h,v=l.getCommonAncestor();v.is(CKEDITOR.dtd.$tableContent)&&!v.is(d)&&(v=v.getAscendant("table",!0));h=v;v=new CKEDITOR.dom.elementPath(l.startContainer,
-h);h=new CKEDITOR.dom.elementPath(l.endContainer,h);v=v.contains("table");h=h.contains("table");if(v||h)v&&h&&b(v,h)?(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),g.setEndAt(h,CKEDITOR.POSITION_BEFORE_START),g=l.clone(),g.setEndAt(v,CKEDITOR.POSITION_AFTER_END),k=l.clone(),k.setStartAt(h,CKEDITOR.POSITION_BEFORE_START),k=a(g).concat(a(k))):v?h||(e.tableSurroundingRange=g,g.setStartAt(v,CKEDITOR.POSITION_AFTER_END),l.setEndAt(v,CKEDITOR.POSITION_AFTER_END)):(e.tableSurroundingRange=
-g,g.setEndAt(h,CKEDITOR.POSITION_BEFORE_START),l.setStartAt(h,CKEDITOR.POSITION_AFTER_START)),e.tableContentsRanges=k?k:a(l)},deleteRanges:function(a){for(var b;b=a.tableContentsRanges.pop();)b.extractContents(),u(b.startContainer)&&b.startContainer.appendBogus();a.tableSurroundingRange&&a.tableSurroundingRange.extractContents()},purge:function(a){if(a.purgeTableBookmark){var b=a.doc,c=a.range.clone(),b=b.createElement("p");b.insertBefore(a.purgeTableBookmark.startNode);c.moveToBookmark(a.purgeTableBookmark);
-c.deleteContents();a.range.moveToPosition(b,CKEDITOR.POSITION_AFTER_START)}}}}(),detectExtractMerge:function(a){return!(a.range.startPath().contains(CKEDITOR.dtd.$listItem)&&a.range.endPath().contains(CKEDITOR.dtd.$listItem))},fixUneditableRangePosition:function(a){a.startContainer.getDtd()["#"]||a.moveToClosestEditablePosition(null,!0)},autoParagraph:function(a,b){var c=b.startPath(),d;k(a,c.block,c.blockLimit)&&(d=h(a))&&(d=b.document.createElement(d),d.appendBogus(),b.insertNode(d),b.moveToPosition(d,
-CKEDITOR.POSITION_AFTER_START))}}}()})();
-(function(){function a(){var a=this._.fakeSelection,b;a&&(b=this.getSelection(1),b&&b.isHidden()||(a.reset(),a=0));if(!a&&(a=b||this.getSelection(1),!a||a.getType()==CKEDITOR.SELECTION_NONE))return;this.fire("selectionCheck",a);b=this.elementPath();if(!b.compare(this._.selectionPreviousPath)){var c=this._.selectionPreviousPath&&this._.selectionPreviousPath.blockLimit.equals(b.blockLimit);CKEDITOR.env.webkit&&!c&&(this._.previousActive=this.document.getActive());this._.selectionPreviousPath=b;this.fire("selectionChange",
-{selection:a,path:b})}}function d(){x=!0;m||(b.call(this),m=CKEDITOR.tools.setTimeout(b,200,this))}function b(){m=null;x&&(CKEDITOR.tools.setTimeout(a,0,this),x=!1)}function c(a){return J(a)||a.type==CKEDITOR.NODE_ELEMENT&&!a.is(CKEDITOR.dtd.$empty)?!0:!1}function e(a){function b(c,d){return c&&c.type!=CKEDITOR.NODE_TEXT?a.clone()["moveToElementEdit"+(d?"End":"Start")](c):!1}if(!(a.root instanceof CKEDITOR.editable))return!1;var d=a.startContainer,e=a.getPreviousNode(c,null,d),f=a.getNextNode(c,null,
-d);return b(e)||b(f,1)||!(e||f||d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()&&d.getBogus())?!0:!1}function g(a){k(a,!1);var b=a.getDocument().createText(z);a.setCustomData("cke-fillingChar",b);return b}function k(a,b){var c=a&&a.removeCustomData("cke-fillingChar");if(c){if(!1!==b){var d=a.getDocument().getSelection().getNative(),e=d&&"None"!=d.type&&d.getRangeAt(0),f=z.length;if(c.getLength()>f&&e&&e.intersectsNode(c.$)){var g=[{node:d.anchorNode,offset:d.anchorOffset},{node:d.focusNode,offset:d.focusOffset}];
-d.anchorNode==c.$&&d.anchorOffset>f&&(g[0].offset-=f);d.focusNode==c.$&&d.focusOffset>f&&(g[1].offset-=f)}}c.setText(h(c.getText(),1));g&&(c=a.getDocument().$,d=c.getSelection(),c=c.createRange(),c.setStart(g[0].node,g[0].offset),c.collapse(!0),d.removeAllRanges(),d.addRange(c),d.extend(g[1].node,g[1].offset))}}function h(a,b){return b?a.replace(y,function(a,b){return b?" ":""}):a.replace(z,"")}function p(a,b){var c=CKEDITOR.dom.element.createFromHtml('\x3cdiv data-cke-hidden-sel\x3d"1" data-cke-temp\x3d"1" style\x3d"'+
-(CKEDITOR.env.ie&&14>CKEDITOR.env.version?"display:none":"position:fixed;top:0;left:-1000px")+'"\x3e'+(b||"\x26nbsp;")+"\x3c/div\x3e",a.document);a.fire("lockSnapshot");a.editable().append(c);var d=a.getSelection(1),e=a.createRange(),f=d.root.on("selectionchange",function(a){a.cancel()},null,null,0);e.setStartAt(c,CKEDITOR.POSITION_AFTER_START);e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);d.selectRanges([e]);f.removeListener();a.fire("unlockSnapshot");a._.hiddenSelectionContainer=c}function r(a){var b=
-{37:1,39:1,8:1,46:1};return function(c){var d=c.data.getKeystroke();if(b[d]){var e=a.getSelection().getRanges(),f=e[0];1==e.length&&f.collapsed&&(d=f[38>d?"getPreviousEditableNode":"getNextEditableNode"]())&&d.type==CKEDITOR.NODE_ELEMENT&&"false"==d.getAttribute("contenteditable")&&(a.getSelection().fake(d),c.data.preventDefault(),c.cancel())}}}function f(a){for(var b=0;b<a.length;b++){var c=a[b];c.getCommonAncestor().isReadOnly()&&a.splice(b,1);if(!c.collapsed){if(c.startContainer.isReadOnly())for(var d=
-c.startContainer,e;d&&!((e=d.type==CKEDITOR.NODE_ELEMENT)&&d.is("body")||!d.isReadOnly());)e&&"false"==d.getAttribute("contentEditable")&&c.setStartAfter(d),d=d.getParent();d=c.startContainer;e=c.endContainer;var f=c.startOffset,g=c.endOffset,h=c.clone();d&&d.type==CKEDITOR.NODE_TEXT&&(f>=d.getLength()?h.setStartAfter(d):h.setStartBefore(d));e&&e.type==CKEDITOR.NODE_TEXT&&(g?h.setEndAfter(e):h.setEndBefore(e));d=new CKEDITOR.dom.walker(h);d.evaluator=function(d){if(d.type==CKEDITOR.NODE_ELEMENT&&
-d.isReadOnly()){var e=c.clone();c.setEndBefore(d);c.collapsed&&a.splice(b--,1);d.getPosition(h.endContainer)&CKEDITOR.POSITION_CONTAINS||(e.setStartAfter(d),e.collapsed||a.splice(b+1,0,e));return!0}return!1};d.next()}}return a}var B="function"!=typeof window.getSelection,u=1,z=CKEDITOR.tools.repeat("​",7),y=new RegExp(z+"( )?","g"),m,x,J=CKEDITOR.dom.walker.invisible(1),w=function(){function a(b){return function(a){var c=a.editor.createRange();c.moveToClosestEditablePosition(a.selected,b)&&a.editor.getSelection().selectRanges([c]);
-return!1}}function b(a){return function(b){var c=b.editor,d=c.createRange(),e;(e=d.moveToClosestEditablePosition(b.selected,a))||(e=d.moveToClosestEditablePosition(b.selected,!a));e&&c.getSelection().selectRanges([d]);c.fire("saveSnapshot");b.selected.remove();e||(d.moveToElementEditablePosition(c.editable()),c.getSelection().selectRanges([d]));c.fire("saveSnapshot");return!1}}var c=a(),d=a(1);return{37:c,38:c,39:d,40:d,8:b(),46:b(1)}}();CKEDITOR.on("instanceCreated",function(b){function c(){var a=
-e.getSelection();a&&a.removeAllRanges()}var e=b.editor;e.on("contentDom",function(){function b(){v=new CKEDITOR.dom.selection(e.getSelection());v.lock()}function c(){l.removeListener("mouseup",c);q.removeListener("mouseup",c);var a=CKEDITOR.document.$.selection,b=a.createRange();"None"!=a.type&&b.parentElement().ownerDocument==f.$&&b.select()}var f=e.document,l=CKEDITOR.document,g=e.editable(),h=f.getBody(),q=f.getDocumentElement(),m=g.isInline(),p,v;CKEDITOR.env.gecko&&g.attachListener(g,"focus",
-function(a){a.removeListener();0!==p&&(a=e.getSelection().getNative())&&a.isCollapsed&&a.anchorNode==g.$&&(a=e.createRange(),a.moveToElementEditStart(g),a.select())},null,null,-2);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){p&&CKEDITOR.env.webkit&&(p=e._.previousActive&&e._.previousActive.equals(f.getActive()))&&null!=e._.previousScrollTop&&e._.previousScrollTop!=g.$.scrollTop&&(g.$.scrollTop=e._.previousScrollTop);e.unlockSelection(p);p=0},null,null,-1);g.attachListener(g,
-"mousedown",function(){p=0});if(CKEDITOR.env.ie||m)B?g.attachListener(g,"beforedeactivate",b,null,null,-1):g.attachListener(e,"selectionCheck",b,null,null,-1),g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusOut":"blur",function(){e.lockSelection(v);p=1},null,null,-1),g.attachListener(g,"mousedown",function(){p=0});if(CKEDITOR.env.ie&&!m){var G;g.attachListener(g,"mousedown",function(a){2==a.data.$.button&&((a=e.document.getSelection())&&a.getType()!=CKEDITOR.SELECTION_NONE||(G=e.window.getScrollPosition()))});
-g.attachListener(g,"mouseup",function(a){2==a.data.$.button&&G&&(e.document.$.documentElement.scrollLeft=G.x,e.document.$.documentElement.scrollTop=G.y);G=null});if("BackCompat"!=f.$.compatMode){if(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat){var E,I;q.on("mousedown",function(a){function b(a){a=a.data.$;if(E){var c=h.$.createTextRange();try{c.moveToPoint(a.clientX,a.clientY)}catch(d){}E.setEndPoint(0>I.compareEndPoints("StartToStart",c)?"EndToEnd":"StartToStart",c);E.select()}}function c(){q.removeListener("mousemove",
-b);l.removeListener("mouseup",c);q.removeListener("mouseup",c);E.select()}a=a.data;if(a.getTarget().is("html")&&a.$.y<q.$.clientHeight&&a.$.x<q.$.clientWidth){E=h.$.createTextRange();try{E.moveToPoint(a.$.clientX,a.$.clientY)}catch(d){}I=E.duplicate();q.on("mousemove",b);l.on("mouseup",c);q.on("mouseup",c)}})}if(7<CKEDITOR.env.version&&11>CKEDITOR.env.version)q.on("mousedown",function(a){a.data.getTarget().is("html")&&(l.on("mouseup",c),q.on("mouseup",c))})}}g.attachListener(g,"selectionchange",a,
-e);g.attachListener(g,"keyup",d,e);g.attachListener(g,CKEDITOR.env.webkit?"DOMFocusIn":"focus",function(){e.forceNextSelectionCheck();e.selectionChange(1)});if(m&&(CKEDITOR.env.webkit||CKEDITOR.env.gecko)){var K;g.attachListener(g,"mousedown",function(){K=1});g.attachListener(f.getDocumentElement(),"mouseup",function(){K&&d.call(e);K=0})}else g.attachListener(CKEDITOR.env.ie?g:f.getDocumentElement(),"mouseup",d,e);CKEDITOR.env.webkit&&g.attachListener(f,"keydown",function(a){switch(a.data.getKey()){case 13:case 33:case 34:case 35:case 36:case 37:case 39:case 8:case 45:case 46:k(g)}},
-null,null,-1);g.attachListener(g,"keydown",r(e),null,null,-1)});e.on("setData",function(){e.unlockSelection();CKEDITOR.env.webkit&&c()});e.on("contentDomUnload",function(){e.unlockSelection()});if(CKEDITOR.env.ie9Compat)e.on("beforeDestroy",c,null,null,9);e.on("dataReady",function(){delete e._.fakeSelection;delete e._.hiddenSelectionContainer;e.selectionChange(1)});e.on("loadSnapshot",function(){var a=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT),b=e.editable().getLast(a);b&&b.hasAttribute("data-cke-hidden-sel")&&
-(b.remove(),CKEDITOR.env.gecko&&(a=e.editable().getFirst(a))&&a.is("br")&&a.getAttribute("_moz_editor_bogus_node")&&a.remove())},null,null,100);e.on("key",function(a){if("wysiwyg"==e.mode){var b=e.getSelection();if(b.isFake){var c=w[a.data.keyCode];if(c)return c({editor:e,selected:b.getSelectedElement(),selection:b,keyEvent:a})}}})});if(CKEDITOR.env.webkit)CKEDITOR.on("instanceReady",function(a){var b=a.editor;b.on("selectionChange",function(){var a=b.editable(),c=a.getCustomData("cke-fillingChar");
-c&&(c.getCustomData("ready")?k(a):c.setCustomData("ready",1))},null,null,-1);b.on("beforeSetMode",function(){k(b.editable())},null,null,-1);b.on("getSnapshot",function(a){a.data&&(a.data=h(a.data))},b,null,20);b.on("toDataFormat",function(a){a.data.dataValue=h(a.data.dataValue)},null,null,0)});CKEDITOR.editor.prototype.selectionChange=function(b){(b?a:d).call(this)};CKEDITOR.editor.prototype.getSelection=function(a){return!this._.savedSelection&&!this._.fakeSelection||a?(a=this.editable())&&"wysiwyg"==
-this.mode?new CKEDITOR.dom.selection(a):null:this._.savedSelection||this._.fakeSelection};CKEDITOR.editor.prototype.lockSelection=function(a){a=a||this.getSelection(1);return a.getType()!=CKEDITOR.SELECTION_NONE?(!a.isLocked&&a.lock(),this._.savedSelection=a,!0):!1};CKEDITOR.editor.prototype.unlockSelection=function(a){var b=this._.savedSelection;return b?(b.unlock(a),delete this._.savedSelection,!0):!1};CKEDITOR.editor.prototype.forceNextSelectionCheck=function(){delete this._.selectionPreviousPath};
-CKEDITOR.dom.document.prototype.getSelection=function(){return new CKEDITOR.dom.selection(this)};CKEDITOR.dom.range.prototype.select=function(){var a=this.root instanceof CKEDITOR.editable?this.root.editor.getSelection():new CKEDITOR.dom.selection(this.root);a.selectRanges([this]);return a};CKEDITOR.SELECTION_NONE=1;CKEDITOR.SELECTION_TEXT=2;CKEDITOR.SELECTION_ELEMENT=3;CKEDITOR.dom.selection=function(a){if(a instanceof CKEDITOR.dom.selection){var b=a;a=a.root}var c=a instanceof CKEDITOR.dom.element;
-this.rev=b?b.rev:u++;this.document=a instanceof CKEDITOR.dom.document?a:a.getDocument();this.root=c?a:this.document.getBody();this.isLocked=0;this._={cache:{}};if(b)return CKEDITOR.tools.extend(this._.cache,b._.cache),this.isFake=b.isFake,this.isLocked=b.isLocked,this;a=this.getNative();var d,e;if(a)if(a.getRangeAt)d=(e=a.rangeCount&&a.getRangeAt(0))&&new CKEDITOR.dom.node(e.commonAncestorContainer);else{try{e=a.createRange()}catch(f){}d=e&&CKEDITOR.dom.element.get(e.item&&e.item(0)||e.parentElement())}if(!d||
-d.type!=CKEDITOR.NODE_ELEMENT&&d.type!=CKEDITOR.NODE_TEXT||!this.root.equals(d)&&!this.root.contains(d))this._.cache.type=CKEDITOR.SELECTION_NONE,this._.cache.startElement=null,this._.cache.selectedElement=null,this._.cache.selectedText="",this._.cache.ranges=new CKEDITOR.dom.rangeList;return this};var F={img:1,hr:1,li:1,table:1,tr:1,td:1,th:1,embed:1,object:1,ol:1,ul:1,a:1,input:1,form:1,select:1,textarea:1,button:1,fieldset:1,thead:1,tfoot:1};CKEDITOR.tools.extend(CKEDITOR.dom.selection,{_removeFillingCharSequenceString:h,
-_createFillingCharSequenceNode:g,FILLING_CHAR_SEQUENCE:z});CKEDITOR.dom.selection.prototype={getNative:function(){return void 0!==this._.cache.nativeSel?this._.cache.nativeSel:this._.cache.nativeSel=B?this.document.$.selection:this.document.getWindow().$.getSelection()},getType:B?function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_NONE;try{var c=this.getNative(),d=c.type;"Text"==d&&(b=CKEDITOR.SELECTION_TEXT);"Control"==d&&(b=CKEDITOR.SELECTION_ELEMENT);c.createRange().parentElement()&&
-(b=CKEDITOR.SELECTION_TEXT)}catch(e){}return a.type=b}:function(){var a=this._.cache;if(a.type)return a.type;var b=CKEDITOR.SELECTION_TEXT,c=this.getNative();if(!c||!c.rangeCount)b=CKEDITOR.SELECTION_NONE;else if(1==c.rangeCount){var c=c.getRangeAt(0),d=c.startContainer;d==c.endContainer&&1==d.nodeType&&1==c.endOffset-c.startOffset&&F[d.childNodes[c.startOffset].nodeName.toLowerCase()]&&(b=CKEDITOR.SELECTION_ELEMENT)}return a.type=b},getRanges:function(){var a=B?function(){function a(b){return(new CKEDITOR.dom.node(b)).getIndex()}
-var b=function(b,c){b=b.duplicate();b.collapse(c);var d=b.parentElement();if(!d.hasChildNodes())return{container:d,offset:0};for(var e=d.children,f,l,g=b.duplicate(),h=0,k=e.length-1,v=-1,n,m;h<=k;)if(v=Math.floor((h+k)/2),f=e[v],g.moveToElementText(f),n=g.compareEndPoints("StartToStart",b),0<n)k=v-1;else if(0>n)h=v+1;else return{container:d,offset:a(f)};if(-1==v||v==e.length-1&&0>n){g.moveToElementText(d);g.setEndPoint("StartToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;e=d.childNodes;if(!g)return f=
-e[e.length-1],f.nodeType!=CKEDITOR.NODE_TEXT?{container:d,offset:e.length}:{container:f,offset:f.nodeValue.length};for(d=e.length;0<g&&0<d;)l=e[--d],l.nodeType==CKEDITOR.NODE_TEXT&&(m=l,g-=l.nodeValue.length);return{container:m,offset:-g}}g.collapse(0<n?!0:!1);g.setEndPoint(0<n?"StartToStart":"EndToStart",b);g=g.text.replace(/(\r\n|\r)/g,"\n").length;if(!g)return{container:d,offset:a(f)+(0<n?0:1)};for(;0<g;)try{l=f[0<n?"previousSibling":"nextSibling"],l.nodeType==CKEDITOR.NODE_TEXT&&(g-=l.nodeValue.length,
-m=l),f=l}catch(p){return{container:d,offset:a(f)}}return{container:m,offset:0<n?-g:m.nodeValue.length+g}};return function(){var a=this.getNative(),c=a&&a.createRange(),d=this.getType();if(!a)return[];if(d==CKEDITOR.SELECTION_TEXT)return a=new CKEDITOR.dom.range(this.root),d=b(c,!0),a.setStart(new CKEDITOR.dom.node(d.container),d.offset),d=b(c),a.setEnd(new CKEDITOR.dom.node(d.container),d.offset),a.endContainer.getPosition(a.startContainer)&CKEDITOR.POSITION_PRECEDING&&a.endOffset<=a.startContainer.getIndex()&&
-a.collapse(),[a];if(d==CKEDITOR.SELECTION_ELEMENT){for(var d=[],e=0;e<c.length;e++){for(var f=c.item(e),g=f.parentNode,l=0,a=new CKEDITOR.dom.range(this.root);l<g.childNodes.length&&g.childNodes[l]!=f;l++);a.setStart(new CKEDITOR.dom.node(g),l);a.setEnd(new CKEDITOR.dom.node(g),l+1);d.push(a)}return d}return[]}}():function(){var a=[],b,c=this.getNative();if(!c)return a;for(var d=0;d<c.rangeCount;d++){var e=c.getRangeAt(d);b=new CKEDITOR.dom.range(this.root);b.setStart(new CKEDITOR.dom.node(e.startContainer),
-e.startOffset);b.setEnd(new CKEDITOR.dom.node(e.endContainer),e.endOffset);a.push(b)}return a};return function(b){var c=this._.cache,d=c.ranges;d||(c.ranges=d=new CKEDITOR.dom.rangeList(a.call(this)));return b?f(new CKEDITOR.dom.rangeList(d.slice())):d}}(),getStartElement:function(){var a=this._.cache;if(void 0!==a.startElement)return a.startElement;var b;switch(this.getType()){case CKEDITOR.SELECTION_ELEMENT:return this.getSelectedElement();case CKEDITOR.SELECTION_TEXT:var c=this.getRanges()[0];
-if(c){if(c.collapsed)b=c.startContainer,b.type!=CKEDITOR.NODE_ELEMENT&&(b=b.getParent());else{for(c.optimize();b=c.startContainer,c.startOffset==(b.getChildCount?b.getChildCount():b.getLength())&&!b.isBlockBoundary();)c.setStartAfter(b);b=c.startContainer;if(b.type!=CKEDITOR.NODE_ELEMENT)return b.getParent();if((b=b.getChild(c.startOffset))&&b.type==CKEDITOR.NODE_ELEMENT)for(c=b.getFirst();c&&c.type==CKEDITOR.NODE_ELEMENT;)b=c,c=c.getFirst();else b=c.startContainer}b=b.$}}return a.startElement=b?
-new CKEDITOR.dom.element(b):null},getSelectedElement:function(){var a=this._.cache;if(void 0!==a.selectedElement)return a.selectedElement;var b=this,c=CKEDITOR.tools.tryThese(function(){return b.getNative().createRange().item(0)},function(){for(var a=b.getRanges()[0].clone(),c,d,e=2;e&&!((c=a.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&F[c.getName()]&&(d=c));e--)a.shrink(CKEDITOR.SHRINK_ELEMENT);return d&&d.$});return a.selectedElement=c?new CKEDITOR.dom.element(c):null},getSelectedText:function(){var a=
-this._.cache;if(void 0!==a.selectedText)return a.selectedText;var b=this.getNative(),b=B?"Control"==b.type?"":b.createRange().text:b.toString();return a.selectedText=b},lock:function(){this.getRanges();this.getStartElement();this.getSelectedElement();this.getSelectedText();this._.cache.nativeSel=null;this.isLocked=1},unlock:function(a){if(this.isLocked){if(a)var b=this.getSelectedElement(),c=!b&&this.getRanges(),d=this.isFake;this.isLocked=0;this.reset();a&&(a=b||c[0]&&c[0].getCommonAncestor())&&
-a.getAscendant("body",1)&&(d?this.fake(b):b?this.selectElement(b):this.selectRanges(c))}},reset:function(){this._.cache={};this.isFake=0;var a=this.root.editor;if(a&&a._.fakeSelection)if(this.rev==a._.fakeSelection.rev){delete a._.fakeSelection;var b=a._.hiddenSelectionContainer;if(b){var c=a.checkDirty();a.fire("lockSnapshot");b.remove();a.fire("unlockSnapshot");!c&&a.resetDirty()}delete a._.hiddenSelectionContainer}else CKEDITOR.warn("selection-fake-reset");this.rev=u++},selectElement:function(a){var b=
-new CKEDITOR.dom.range(this.root);b.setStartBefore(a);b.setEndAfter(a);this.selectRanges([b])},selectRanges:function(a){var b=this.root.editor,b=b&&b._.hiddenSelectionContainer;this.reset();if(b)for(var b=this.root,c,d=0;d<a.length;++d)c=a[d],c.endContainer.equals(b)&&(c.endOffset=Math.min(c.endOffset,b.getChildCount()));if(a.length)if(this.isLocked){var f=CKEDITOR.document.getActive();this.unlock();this.selectRanges(a);this.lock();f&&!f.equals(this.root)&&f.focus()}else{var h;a:{var m,p;if(1==a.length&&
-!(p=a[0]).collapsed&&(h=p.getEnclosedNode())&&h.type==CKEDITOR.NODE_ELEMENT&&(p=p.clone(),p.shrink(CKEDITOR.SHRINK_ELEMENT,!0),(m=p.getEnclosedNode())&&m.type==CKEDITOR.NODE_ELEMENT&&(h=m),"false"==h.getAttribute("contenteditable")))break a;h=void 0}if(h)this.fake(h);else{if(B){p=CKEDITOR.dom.walker.whitespaces(!0);m=/\ufeff|\u00a0/;b={table:1,tbody:1,tr:1};1<a.length&&(h=a[a.length-1],a[0].setEnd(h.endContainer,h.endOffset));h=a[0];a=h.collapsed;var r,u,y;if((c=h.getEnclosedNode())&&c.type==CKEDITOR.NODE_ELEMENT&&
-c.getName()in F&&(!c.is("a")||!c.getText()))try{y=c.$.createControlRange();y.addElement(c.$);y.select();return}catch(w){}if(h.startContainer.type==CKEDITOR.NODE_ELEMENT&&h.startContainer.getName()in b||h.endContainer.type==CKEDITOR.NODE_ELEMENT&&h.endContainer.getName()in b)h.shrink(CKEDITOR.NODE_ELEMENT,!0),a=h.collapsed;y=h.createBookmark();b=y.startNode;a||(f=y.endNode);y=h.document.$.body.createTextRange();y.moveToElementText(b.$);y.moveStart("character",1);f?(m=h.document.$.body.createTextRange(),
-m.moveToElementText(f.$),y.setEndPoint("EndToEnd",m),y.moveEnd("character",-1)):(r=b.getNext(p),u=b.hasAscendant("pre"),r=!(r&&r.getText&&r.getText().match(m))&&(u||!b.hasPrevious()||b.getPrevious().is&&b.getPrevious().is("br")),u=h.document.createElement("span"),u.setHtml("\x26#65279;"),u.insertBefore(b),r&&h.document.createText("").insertBefore(b));h.setStartBefore(b);b.remove();a?(r?(y.moveStart("character",-1),y.select(),h.document.$.selection.clear()):y.select(),h.moveToPosition(u,CKEDITOR.POSITION_BEFORE_START),
-u.remove()):(h.setEndBefore(f),f.remove(),y.select())}else{f=this.getNative();if(!f)return;this.removeAllRanges();for(y=0;y<a.length;y++){if(y<a.length-1&&(r=a[y],u=a[y+1],m=r.clone(),m.setStart(r.endContainer,r.endOffset),m.setEnd(u.startContainer,u.startOffset),!m.collapsed&&(m.shrink(CKEDITOR.NODE_ELEMENT,!0),h=m.getCommonAncestor(),m=m.getEnclosedNode(),h.isReadOnly()||m&&m.isReadOnly()))){u.setStart(r.startContainer,r.startOffset);a.splice(y--,1);continue}h=a[y];u=this.document.$.createRange();
-h.collapsed&&CKEDITOR.env.webkit&&e(h)&&(m=g(this.root),h.insertNode(m),(r=m.getNext())&&!m.getPrevious()&&r.type==CKEDITOR.NODE_ELEMENT&&"br"==r.getName()?(k(this.root),h.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START)):h.moveToPosition(m,CKEDITOR.POSITION_AFTER_END));u.setStart(h.startContainer.$,h.startOffset);try{u.setEnd(h.endContainer.$,h.endOffset)}catch(v){if(0<=v.toString().indexOf("NS_ERROR_ILLEGAL_VALUE"))h.collapse(1),u.setEnd(h.endContainer.$,h.endOffset);else throw v;}f.addRange(u)}}this.reset();
-this.root.fire("selectionchange")}}},fake:function(a,b){var c=this.root.editor;void 0===b&&a.hasAttribute("aria-label")&&(b=a.getAttribute("aria-label"));this.reset();p(c,b);var d=this._.cache,e=new CKEDITOR.dom.range(this.root);e.setStartBefore(a);e.setEndAfter(a);d.ranges=new CKEDITOR.dom.rangeList(e);d.selectedElement=d.startElement=a;d.type=CKEDITOR.SELECTION_ELEMENT;d.selectedText=d.nativeSel=null;this.isFake=1;this.rev=u++;c._.fakeSelection=this;this.root.fire("selectionchange")},isHidden:function(){var a=
-this.getCommonAncestor();a&&a.type==CKEDITOR.NODE_TEXT&&(a=a.getParent());return!(!a||!a.data("cke-hidden-sel"))},createBookmarks:function(a){a=this.getRanges().createBookmarks(a);this.isFake&&(a.isFake=1);return a},createBookmarks2:function(a){a=this.getRanges().createBookmarks2(a);this.isFake&&(a.isFake=1);return a},selectBookmarks:function(a){for(var b=[],c,d=0;d<a.length;d++){var e=new CKEDITOR.dom.range(this.root);e.moveToBookmark(a[d]);b.push(e)}a.isFake&&(c=b[0].getEnclosedNode(),c&&c.type==
-CKEDITOR.NODE_ELEMENT||(CKEDITOR.warn("selection-not-fake"),a.isFake=0));a.isFake?this.fake(c):this.selectRanges(b);return this},getCommonAncestor:function(){var a=this.getRanges();return a.length?a[0].startContainer.getCommonAncestor(a[a.length-1].endContainer):null},scrollIntoView:function(){this.type!=CKEDITOR.SELECTION_NONE&&this.getRanges()[0].scrollIntoView()},removeAllRanges:function(){if(this.getType()!=CKEDITOR.SELECTION_NONE){var a=this.getNative();try{a&&a[B?"empty":"removeAllRanges"]()}catch(b){}this.reset()}}}})();
-"use strict";CKEDITOR.STYLE_BLOCK=1;CKEDITOR.STYLE_INLINE=2;CKEDITOR.STYLE_OBJECT=3;
-(function(){function a(a,b){for(var c,d;(a=a.getParent())&&!a.equals(b);)if(a.getAttribute("data-nostyle"))c=a;else if(!d){var e=a.getAttribute("contentEditable");"false"==e?c=a:"true"==e&&(d=1)}return c}function d(a,b,c,d){return(a.getPosition(b)|d)==d&&(!c.childRule||c.childRule(a))}function b(c){var f=c.document;if(c.collapsed)f=J(this,f),c.insertNode(f),c.moveToPosition(f,CKEDITOR.POSITION_BEFORE_END);else{var g=this.element,h=this._.definition,l,k=h.ignoreReadonly,m=k||h.includeReadonly;null==
-m&&(m=c.root.getCustomData("cke_includeReadonly"));var n=CKEDITOR.dtd[g];n||(l=!0,n=CKEDITOR.dtd.span);c.enlarge(CKEDITOR.ENLARGE_INLINE,1);c.trim();var p=c.createBookmark(),q=p.startNode,r=p.endNode,u=q,t;if(!k){var w=c.getCommonAncestor(),k=a(q,w),w=a(r,w);k&&(u=k.getNextSourceNode(!0));w&&(r=w)}for(u.getPosition(r)==CKEDITOR.POSITION_FOLLOWING&&(u=0);u;){k=!1;if(u.equals(r))u=null,k=!0;else{var z=u.type==CKEDITOR.NODE_ELEMENT?u.getName():null,w=z&&"false"==u.getAttribute("contentEditable"),x=z&&
-u.getAttribute("data-nostyle");if(z&&u.data("cke-bookmark")){u=u.getNextSourceNode(!0);continue}if(w&&m&&CKEDITOR.dtd.$block[z])for(var B=u,A=e(B),C=void 0,D=A.length,F=0,B=D&&new CKEDITOR.dom.range(B.getDocument());F<D;++F){var C=A[F],M=CKEDITOR.filter.instances[C.data("cke-filter")];if(M?M.check(this):1)B.selectNodeContents(C),b.call(this,B)}A=z?!n[z]||x?0:w&&!m?0:d(u,r,h,Q):1;if(A)if(C=u.getParent(),A=h,D=g,F=l,!C||!(C.getDtd()||CKEDITOR.dtd.span)[D]&&!F||A.parentRule&&!A.parentRule(C))k=!0;else{if(t||
-z&&CKEDITOR.dtd.$removeEmpty[z]&&(u.getPosition(r)|Q)!=Q||(t=c.clone(),t.setStartBefore(u)),z=u.type,z==CKEDITOR.NODE_TEXT||w||z==CKEDITOR.NODE_ELEMENT&&!u.getChildCount()){for(var z=u,R;(k=!z.getNext(H))&&(R=z.getParent(),n[R.getName()])&&d(R,q,h,P);)z=R;t.setEndAfter(z)}}else k=!0;u=u.getNextSourceNode(x||w)}if(k&&t&&!t.collapsed){for(var k=J(this,f),w=k.hasAttributes(),x=t.getCommonAncestor(),z={},A={},C={},D={},W,T,ca;k&&x;){if(x.getName()==g){for(W in h.attributes)!D[W]&&(ca=x.getAttribute(T))&&
-(k.getAttribute(W)==ca?A[W]=1:D[W]=1);for(T in h.styles)!C[T]&&(ca=x.getStyle(T))&&(k.getStyle(T)==ca?z[T]=1:C[T]=1)}x=x.getParent()}for(W in A)k.removeAttribute(W);for(T in z)k.removeStyle(T);w&&!k.hasAttributes()&&(k=null);k?(t.extractContents().appendTo(k),t.insertNode(k),y.call(this,k),k.mergeSiblings(),CKEDITOR.env.ie||k.$.normalize()):(k=new CKEDITOR.dom.element("span"),t.extractContents().appendTo(k),t.insertNode(k),y.call(this,k),k.remove(!0));t=null}}c.moveToBookmark(p);c.shrink(CKEDITOR.SHRINK_TEXT);
-c.shrink(CKEDITOR.NODE_ELEMENT,!0)}}function c(a){function b(){for(var a=new CKEDITOR.dom.elementPath(d.getParent()),c=new CKEDITOR.dom.elementPath(n.getParent()),e=null,f=null,g=0;g<a.elements.length;g++){var h=a.elements[g];if(h==a.block||h==a.blockLimit)break;p.checkElementRemovable(h,!0)&&(e=h)}for(g=0;g<c.elements.length;g++){h=c.elements[g];if(h==c.block||h==c.blockLimit)break;p.checkElementRemovable(h,!0)&&(f=h)}f&&n.breakParent(f);e&&d.breakParent(e)}a.enlarge(CKEDITOR.ENLARGE_INLINE,1);var c=
-a.createBookmark(),d=c.startNode;if(a.collapsed){for(var e=new CKEDITOR.dom.elementPath(d.getParent(),a.root),f,g=0,h;g<e.elements.length&&(h=e.elements[g])&&h!=e.block&&h!=e.blockLimit;g++)if(this.checkElementRemovable(h)){var k;a.collapsed&&(a.checkBoundaryOfElement(h,CKEDITOR.END)||(k=a.checkBoundaryOfElement(h,CKEDITOR.START)))?(f=h,f.match=k?"start":"end"):(h.mergeSiblings(),h.is(this.element)?z.call(this,h):m(h,l(this)[h.getName()]))}if(f){h=d;for(g=0;;g++){k=e.elements[g];if(k.equals(f))break;
-else if(k.match)continue;else k=k.clone();k.append(h);h=k}h["start"==f.match?"insertBefore":"insertAfter"](f)}}else{var n=c.endNode,p=this;b();for(e=d;!e.equals(n);)f=e.getNextSourceNode(),e.type==CKEDITOR.NODE_ELEMENT&&this.checkElementRemovable(e)&&(e.getName()==this.element?z.call(this,e):m(e,l(this)[e.getName()]),f.type==CKEDITOR.NODE_ELEMENT&&f.contains(d)&&(b(),f=d.getNext())),e=f}a.moveToBookmark(c);a.shrink(CKEDITOR.NODE_ELEMENT,!0)}function e(a){var b=[];a.forEach(function(a){if("true"==
-a.getAttribute("contenteditable"))return b.push(a),!1},CKEDITOR.NODE_ELEMENT,!0);return b}function g(a){var b=a.getEnclosedNode()||a.getCommonAncestor(!1,!0);(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1))&&!a.isReadOnly()&&w(a,this)}function k(a){var b=a.getCommonAncestor(!0,!0);if(a=(new CKEDITOR.dom.elementPath(b,a.root)).contains(this.element,1)){var b=this._.definition,c=b.attributes;if(c)for(var d in c)a.removeAttribute(d,c[d]);if(b.styles)for(var e in b.styles)b.styles.hasOwnProperty(e)&&
-a.removeStyle(e)}}function h(a){var b=a.createBookmark(!0),c=a.createIterator();c.enforceRealBlocks=!0;this._.enterMode&&(c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR);for(var d,e=a.document,f;d=c.getNextParagraph();)!d.isReadOnly()&&(c.activeFilter?c.activeFilter.check(this):1)&&(f=J(this,e,d),r(d,f));a.moveToBookmark(b)}function p(a){var b=a.createBookmark(1),c=a.createIterator();c.enforceRealBlocks=!0;c.enlargeBr=this._.enterMode!=CKEDITOR.ENTER_BR;for(var d,e;d=c.getNextParagraph();)this.checkElementRemovable(d)&&
-(d.is("pre")?((e=this._.enterMode==CKEDITOR.ENTER_BR?null:a.document.createElement(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))&&d.copyAttributes(e),r(d,e)):z.call(this,d));a.moveToBookmark(b)}function r(a,b){var c=!b;c&&(b=a.getDocument().createElement("div"),a.copyAttributes(b));var d=b&&b.is("pre"),e=a.is("pre"),g=!d&&e;if(d&&!e){e=b;(g=a.getBogus())&&g.remove();g=a.getHtml();g=B(g,/(?:^[ \t\n\r]+)|(?:[ \t\n\r]+$)/g,"");g=g.replace(/[ \t\r\n]*(<br[^>]*>)[ \t\r\n]*/gi,"$1");g=g.replace(/([ \t\n\r]+|&nbsp;)/g,
-" ");g=g.replace(/<br\b[^>]*>/gi,"\n");if(CKEDITOR.env.ie){var h=a.getDocument().createElement("div");h.append(e);e.$.outerHTML="\x3cpre\x3e"+g+"\x3c/pre\x3e";e.copyAttributes(h.getFirst());e=h.getFirst().remove()}else e.setHtml(g);b=e}else g?b=u(c?[a.getHtml()]:f(a),b):a.moveChildren(b);b.replace(a);if(d){var c=b,k;(k=c.getPrevious(R))&&k.type==CKEDITOR.NODE_ELEMENT&&k.is("pre")&&(d=B(k.getHtml(),/\n$/,"")+"\n\n"+B(c.getHtml(),/^\n/,""),CKEDITOR.env.ie?c.$.outerHTML="\x3cpre\x3e"+d+"\x3c/pre\x3e":
-c.setHtml(d),k.remove())}else c&&x(b)}function f(a){var b=[];B(a.getOuterHtml(),/(\S\s*)\n(?:\s|(<span[^>]+data-cke-bookmark.*?\/span>))*\n(?!$)/gi,function(a,b,c){return b+"\x3c/pre\x3e"+c+"\x3cpre\x3e"}).replace(/<pre\b.*?>([\s\S]*?)<\/pre>/gi,function(a,c){b.push(c)});return b}function B(a,b,c){var d="",e="";a=a.replace(/(^<span[^>]+data-cke-bookmark.*?\/span>)|(<span[^>]+data-cke-bookmark.*?\/span>$)/gi,function(a,b,c){b&&(d=b);c&&(e=c);return""});return d+a.replace(b,c)+e}function u(a,b){var c;
-1<a.length&&(c=new CKEDITOR.dom.documentFragment(b.getDocument()));for(var d=0;d<a.length;d++){var e=a[d],e=e.replace(/(\r\n|\r)/g,"\n"),e=B(e,/^[ \t]*\n/,""),e=B(e,/\n$/,""),e=B(e,/^[ \t]+|[ \t]+$/g,function(a,b){return 1==a.length?"\x26nbsp;":b?" "+CKEDITOR.tools.repeat("\x26nbsp;",a.length-1):CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "}),e=e.replace(/\n/g,"\x3cbr\x3e"),e=e.replace(/[ \t]{2,}/g,function(a){return CKEDITOR.tools.repeat("\x26nbsp;",a.length-1)+" "});if(c){var f=b.clone();f.setHtml(e);
-c.append(f)}else b.setHtml(e)}return c||b}function z(a,b){var c=this._.definition,d=c.attributes,c=c.styles,e=l(this)[a.getName()],f=CKEDITOR.tools.isEmpty(d)&&CKEDITOR.tools.isEmpty(c),g;for(g in d)if("class"!=g&&!this._.definition.fullMatch||a.getAttribute(g)==q(g,d[g]))b&&"data-"==g.slice(0,5)||(f=a.hasAttribute(g),a.removeAttribute(g));for(var h in c)this._.definition.fullMatch&&a.getStyle(h)!=q(h,c[h],!0)||(f=f||!!a.getStyle(h),a.removeStyle(h));m(a,e,A[a.getName()]);f&&(this._.definition.alwaysRemoveElement?
-x(a,1):!CKEDITOR.dtd.$block[a.getName()]||this._.enterMode==CKEDITOR.ENTER_BR&&!a.hasAttributes()?x(a):a.renameNode(this._.enterMode==CKEDITOR.ENTER_P?"p":"div"))}function y(a){for(var b=l(this),c=a.getElementsByTag(this.element),d,e=c.count();0<=--e;)d=c.getItem(e),d.isReadOnly()||z.call(this,d,!0);for(var f in b)if(f!=this.element)for(c=a.getElementsByTag(f),e=c.count()-1;0<=e;e--)d=c.getItem(e),d.isReadOnly()||m(d,b[f])}function m(a,b,c){if(b=b&&b.attributes)for(var d=0;d<b.length;d++){var e=b[d][0],
-f;if(f=a.getAttribute(e)){var g=b[d][1];(null===g||g.test&&g.test(f)||"string"==typeof g&&f==g)&&a.removeAttribute(e)}}c||x(a)}function x(a,b){if(!a.hasAttributes()||b)if(CKEDITOR.dtd.$block[a.getName()]){var c=a.getPrevious(R),d=a.getNext(R);!c||c.type!=CKEDITOR.NODE_TEXT&&c.isBlockBoundary({br:1})||a.append("br",1);!d||d.type!=CKEDITOR.NODE_TEXT&&d.isBlockBoundary({br:1})||a.append("br");a.remove(!0)}else c=a.getFirst(),d=a.getLast(),a.remove(!0),c&&(c.type==CKEDITOR.NODE_ELEMENT&&c.mergeSiblings(),
-d&&!c.equals(d)&&d.type==CKEDITOR.NODE_ELEMENT&&d.mergeSiblings())}function J(a,b,c){var d;d=a.element;"*"==d&&(d="span");d=new CKEDITOR.dom.element(d,b);c&&c.copyAttributes(d);d=w(d,a);b.getCustomData("doc_processing_style")&&d.hasAttribute("id")?d.removeAttribute("id"):b.setCustomData("doc_processing_style",1);return d}function w(a,b){var c=b._.definition,d=c.attributes,c=CKEDITOR.style.getStyleText(c);if(d)for(var e in d)a.setAttribute(e,d[e]);c&&a.setAttribute("style",c);return a}function F(a,
-b){for(var c in a)a[c]=a[c].replace(M,function(a,c){return b[c]})}function l(a){if(a._.overrides)return a._.overrides;var b=a._.overrides={},c=a._.definition.overrides;if(c){CKEDITOR.tools.isArray(c)||(c=[c]);for(var d=0;d<c.length;d++){var e=c[d],f,g;"string"==typeof e?f=e.toLowerCase():(f=e.element?e.element.toLowerCase():a.element,g=e.attributes);e=b[f]||(b[f]={});if(g){var e=e.attributes=e.attributes||[],h;for(h in g)e.push([h.toLowerCase(),g[h]])}}}return b}function q(a,b,c){var d=new CKEDITOR.dom.element("span");
-d[c?"setStyle":"setAttribute"](a,b);return d[c?"getStyle":"getAttribute"](a)}function n(a,b){function c(a,b){return"font-family"==b.toLowerCase()?a.replace(/["']/g,""):a}"string"==typeof a&&(a=CKEDITOR.tools.parseCssText(a));"string"==typeof b&&(b=CKEDITOR.tools.parseCssText(b,!0));for(var d in a)if(!(d in b)||c(b[d],d)!=c(a[d],d)&&"inherit"!=a[d]&&"inherit"!=b[d])return!1;return!0}function t(a,b,c){var d=a.document,e=a.getRanges();b=b?this.removeFromRange:this.applyToRange;for(var f,g=e.createIterator();f=
-g.getNextRange();)b.call(this,f,c);a.selectRanges(e);d.removeCustomData("doc_processing_style")}var A={address:1,div:1,h1:1,h2:1,h3:1,h4:1,h5:1,h6:1,p:1,pre:1,section:1,header:1,footer:1,nav:1,article:1,aside:1,figure:1,dialog:1,hgroup:1,time:1,meter:1,menu:1,command:1,keygen:1,output:1,progress:1,details:1,datagrid:1,datalist:1},C={a:1,blockquote:1,embed:1,hr:1,img:1,li:1,object:1,ol:1,table:1,td:1,tr:1,th:1,ul:1,dl:1,dt:1,dd:1,form:1,audio:1,video:1},D=/\s*(?:;\s*|$)/,M=/#\((.+?)\)/g,H=CKEDITOR.dom.walker.bookmark(0,
-1),R=CKEDITOR.dom.walker.whitespaces(1);CKEDITOR.style=function(a,b){if("string"==typeof a.type)return new CKEDITOR.style.customHandlers[a.type](a);var c=a.attributes;c&&c.style&&(a.styles=CKEDITOR.tools.extend({},a.styles,CKEDITOR.tools.parseCssText(c.style)),delete c.style);b&&(a=CKEDITOR.tools.clone(a),F(a.attributes,b),F(a.styles,b));c=this.element=a.element?"string"==typeof a.element?a.element.toLowerCase():a.element:"*";this.type=a.type||(A[c]?CKEDITOR.STYLE_BLOCK:C[c]?CKEDITOR.STYLE_OBJECT:
-CKEDITOR.STYLE_INLINE);"object"==typeof this.element&&(this.type=CKEDITOR.STYLE_OBJECT);this._={definition:a}};CKEDITOR.style.prototype={apply:function(a){if(a instanceof CKEDITOR.dom.document)return t.call(this,a.getSelection());if(this.checkApplicable(a.elementPath(),a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);t.call(this,a.getSelection(),0,a);this._.enterMode=b}},remove:function(a){if(a instanceof CKEDITOR.dom.document)return t.call(this,a.getSelection(),1);if(this.checkApplicable(a.elementPath(),
-a)){var b=this._.enterMode;b||(this._.enterMode=a.activeEnterMode);t.call(this,a.getSelection(),1,a);this._.enterMode=b}},applyToRange:function(a){this.applyToRange=this.type==CKEDITOR.STYLE_INLINE?b:this.type==CKEDITOR.STYLE_BLOCK?h:this.type==CKEDITOR.STYLE_OBJECT?g:null;return this.applyToRange(a)},removeFromRange:function(a){this.removeFromRange=this.type==CKEDITOR.STYLE_INLINE?c:this.type==CKEDITOR.STYLE_BLOCK?p:this.type==CKEDITOR.STYLE_OBJECT?k:null;return this.removeFromRange(a)},applyToObject:function(a){w(a,
-this)},checkActive:function(a,b){switch(this.type){case CKEDITOR.STYLE_BLOCK:return this.checkElementRemovable(a.block||a.blockLimit,!0,b);case CKEDITOR.STYLE_OBJECT:case CKEDITOR.STYLE_INLINE:for(var c=a.elements,d=0,e;d<c.length;d++)if(e=c[d],this.type!=CKEDITOR.STYLE_INLINE||e!=a.block&&e!=a.blockLimit){if(this.type==CKEDITOR.STYLE_OBJECT){var f=e.getName();if(!("string"==typeof this.element?f==this.element:f in this.element))continue}if(this.checkElementRemovable(e,!0,b))return!0}}return!1},checkApplicable:function(a,
-b,c){b&&b instanceof CKEDITOR.filter&&(c=b);if(c&&!c.check(this))return!1;switch(this.type){case CKEDITOR.STYLE_OBJECT:return!!a.contains(this.element);case CKEDITOR.STYLE_BLOCK:return!!a.blockLimit.getDtd()[this.element]}return!0},checkElementMatch:function(a,b){var c=this._.definition;if(!a||!c.ignoreReadonly&&a.isReadOnly())return!1;var d=a.getName();if("string"==typeof this.element?d==this.element:d in this.element){if(!b&&!a.hasAttributes())return!0;if(d=c._AC)c=d;else{var d={},e=0,f=c.attributes;
-if(f)for(var g in f)e++,d[g]=f[g];if(g=CKEDITOR.style.getStyleText(c))d.style||e++,d.style=g;d._length=e;c=c._AC=d}if(c._length){for(var h in c)if("_length"!=h)if(d=a.getAttribute(h)||"","style"==h?n(c[h],d):c[h]==d){if(!b)return!0}else if(b)return!1;if(b)return!0}else return!0}return!1},checkElementRemovable:function(a,b,c){if(this.checkElementMatch(a,b,c))return!0;if(b=l(this)[a.getName()]){var d;if(!(b=b.attributes))return!0;for(c=0;c<b.length;c++)if(d=b[c][0],d=a.getAttribute(d)){var e=b[c][1];
-if(null===e)return!0;if("string"==typeof e){if(d==e)return!0}else if(e.test(d))return!0}}return!1},buildPreview:function(a){var b=this._.definition,c=[],d=b.element;"bdo"==d&&(d="span");var c=["\x3c",d],e=b.attributes;if(e)for(var f in e)c.push(" ",f,'\x3d"',e[f],'"');(e=CKEDITOR.style.getStyleText(b))&&c.push(' style\x3d"',e,'"');c.push("\x3e",a||b.name,"\x3c/",d,"\x3e");return c.join("")},getDefinition:function(){return this._.definition}};CKEDITOR.style.getStyleText=function(a){var b=a._ST;if(b)return b;
-var b=a.styles,c=a.attributes&&a.attributes.style||"",d="";c.length&&(c=c.replace(D,";"));for(var e in b){var f=b[e],g=(e+":"+f).replace(D,";");"inherit"==f?d+=g:c+=g}c.length&&(c=CKEDITOR.tools.normalizeCssText(c,!0));return a._ST=c+d};CKEDITOR.style.customHandlers={};CKEDITOR.style.addCustomHandler=function(a){var b=function(a){this._={definition:a};this.setup&&this.setup(a)};b.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.style.prototype),{assignedTo:CKEDITOR.STYLE_OBJECT},
-a,!0);return this.customHandlers[a.type]=b};var Q=CKEDITOR.POSITION_PRECEDING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED,P=CKEDITOR.POSITION_FOLLOWING|CKEDITOR.POSITION_IDENTICAL|CKEDITOR.POSITION_IS_CONTAINED})();CKEDITOR.styleCommand=function(a,d){this.requiredContent=this.allowedContent=this.style=a;CKEDITOR.tools.extend(this,d,!0)};
-CKEDITOR.styleCommand.prototype.exec=function(a){a.focus();this.state==CKEDITOR.TRISTATE_OFF?a.applyStyle(this.style):this.state==CKEDITOR.TRISTATE_ON&&a.removeStyle(this.style)};CKEDITOR.stylesSet=new CKEDITOR.resourceManager("","stylesSet");CKEDITOR.addStylesSet=CKEDITOR.tools.bind(CKEDITOR.stylesSet.add,CKEDITOR.stylesSet);CKEDITOR.loadStylesSet=function(a,d,b){CKEDITOR.stylesSet.addExternal(a,d,"");CKEDITOR.stylesSet.load(a,b)};
-CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{attachStyleStateChange:function(a,d){var b=this._.styleStateChangeCallbacks;b||(b=this._.styleStateChangeCallbacks=[],this.on("selectionChange",function(a){for(var d=0;d<b.length;d++){var g=b[d],k=g.style.checkActive(a.data.path,this)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF;g.fn.call(this,k)}}));b.push({style:a,fn:d})},applyStyle:function(a){a.apply(this)},removeStyle:function(a){a.remove(this)},getStylesSet:function(a){if(this._.stylesDefinitions)a(this._.stylesDefinitions);
-else{var d=this,b=d.config.stylesCombo_stylesSet||d.config.stylesSet;if(!1===b)a(null);else if(b instanceof Array)d._.stylesDefinitions=b,a(b);else{b||(b="default");var b=b.split(":"),c=b[0];CKEDITOR.stylesSet.addExternal(c,b[1]?b.slice(1).join(":"):CKEDITOR.getUrl("styles.js"),"");CKEDITOR.stylesSet.load(c,function(b){d._.stylesDefinitions=b[c];a(d._.stylesDefinitions)})}}}});
-CKEDITOR.dom.comment=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createComment(a));CKEDITOR.dom.domObject.call(this,a)};CKEDITOR.dom.comment.prototype=new CKEDITOR.dom.node;CKEDITOR.tools.extend(CKEDITOR.dom.comment.prototype,{type:CKEDITOR.NODE_COMMENT,getOuterHtml:function(){return"\x3c!--"+this.$.nodeValue+"--\x3e"}});"use strict";
-(function(){var a={},d={},b;for(b in CKEDITOR.dtd.$blockLimit)b in CKEDITOR.dtd.$list||(a[b]=1);for(b in CKEDITOR.dtd.$block)b in CKEDITOR.dtd.$blockLimit||b in CKEDITOR.dtd.$empty||(d[b]=1);CKEDITOR.dom.elementPath=function(b,e){var g=null,k=null,h=[],p=b,r;e=e||b.getDocument().getBody();do if(p.type==CKEDITOR.NODE_ELEMENT){h.push(p);if(!this.lastElement&&(this.lastElement=p,p.is(CKEDITOR.dtd.$object)||"false"==p.getAttribute("contenteditable")))continue;if(p.equals(e))break;if(!k&&(r=p.getName(),
-"true"==p.getAttribute("contenteditable")?k=p:!g&&d[r]&&(g=p),a[r])){if(r=!g&&"div"==r){a:{r=p.getChildren();for(var f=0,B=r.count();f<B;f++){var u=r.getItem(f);if(u.type==CKEDITOR.NODE_ELEMENT&&CKEDITOR.dtd.$block[u.getName()]){r=!0;break a}}r=!1}r=!r}r?g=p:k=p}}while(p=p.getParent());k||(k=e);this.block=g;this.blockLimit=k;this.root=e;this.elements=h}})();
-CKEDITOR.dom.elementPath.prototype={compare:function(a){var d=this.elements;a=a&&a.elements;if(!a||d.length!=a.length)return!1;for(var b=0;b<d.length;b++)if(!d[b].equals(a[b]))return!1;return!0},contains:function(a,d,b){var c;"string"==typeof a&&(c=function(b){return b.getName()==a});a instanceof CKEDITOR.dom.element?c=function(b){return b.equals(a)}:CKEDITOR.tools.isArray(a)?c=function(b){return-1<CKEDITOR.tools.indexOf(a,b.getName())}:"function"==typeof a?c=a:"object"==typeof a&&(c=function(b){return b.getName()in
-a});var e=this.elements,g=e.length;d&&g--;b&&(e=Array.prototype.slice.call(e,0),e.reverse());for(d=0;d<g;d++)if(c(e[d]))return e[d];return null},isContextFor:function(a){var d;return a in CKEDITOR.dtd.$block?(d=this.contains(CKEDITOR.dtd.$intermediate)||this.root.equals(this.block)&&this.block||this.blockLimit,!!d.getDtd()[a]):!0},direction:function(){return(this.block||this.blockLimit||this.root).getDirection(1)}};
-CKEDITOR.dom.text=function(a,d){"string"==typeof a&&(a=(d?d.$:document).createTextNode(a));this.$=a};CKEDITOR.dom.text.prototype=new CKEDITOR.dom.node;
-CKEDITOR.tools.extend(CKEDITOR.dom.text.prototype,{type:CKEDITOR.NODE_TEXT,getLength:function(){return this.$.nodeValue.length},getText:function(){return this.$.nodeValue},setText:function(a){this.$.nodeValue=a},split:function(a){var d=this.$.parentNode,b=d.childNodes.length,c=this.getLength(),e=this.getDocument(),g=new CKEDITOR.dom.text(this.$.splitText(a),e);d.childNodes.length==b&&(a>=c?(g=e.createText(""),g.insertAfter(this)):(a=e.createText(""),a.insertAfter(g),a.remove()));return g},substring:function(a,
-d){return"number"!=typeof d?this.$.nodeValue.substr(a):this.$.nodeValue.substring(a,d)}});
-(function(){function a(a,c,d){var g=a.serializable,k=c[d?"endContainer":"startContainer"],h=d?"endOffset":"startOffset",p=g?c.document.getById(a.startNode):a.startNode;a=g?c.document.getById(a.endNode):a.endNode;k.equals(p.getPrevious())?(c.startOffset=c.startOffset-k.getLength()-a.getPrevious().getLength(),k=a.getNext()):k.equals(a.getPrevious())&&(c.startOffset-=k.getLength(),k=a.getNext());k.equals(p.getParent())&&c[h]++;k.equals(a.getParent())&&c[h]++;c[d?"endContainer":"startContainer"]=k;return c}
-CKEDITOR.dom.rangeList=function(a){if(a instanceof CKEDITOR.dom.rangeList)return a;a?a instanceof CKEDITOR.dom.range&&(a=[a]):a=[];return CKEDITOR.tools.extend(a,d)};var d={createIterator:function(){var a=this,c=CKEDITOR.dom.walker.bookmark(),d=[],g;return{getNextRange:function(k){g=void 0===g?0:g+1;var h=a[g];if(h&&1<a.length){if(!g)for(var p=a.length-1;0<=p;p--)d.unshift(a[p].createBookmark(!0));if(k)for(var r=0;a[g+r+1];){var f=h.document;k=0;p=f.getById(d[r].endNode);for(f=f.getById(d[r+1].startNode);;){p=
-p.getNextSourceNode(!1);if(f.equals(p))k=1;else if(c(p)||p.type==CKEDITOR.NODE_ELEMENT&&p.isBlockBoundary())continue;break}if(!k)break;r++}for(h.moveToBookmark(d.shift());r--;)p=a[++g],p.moveToBookmark(d.shift()),h.setEnd(p.endContainer,p.endOffset)}return h}}},createBookmarks:function(b){for(var c=[],d,g=0;g<this.length;g++){c.push(d=this[g].createBookmark(b,!0));for(var k=g+1;k<this.length;k++)this[k]=a(d,this[k]),this[k]=a(d,this[k],!0)}return c},createBookmarks2:function(a){for(var c=[],d=0;d<
-this.length;d++)c.push(this[d].createBookmark2(a));return c},moveToBookmarks:function(a){for(var c=0;c<this.length;c++)this[c].moveToBookmark(a[c])}}})();
-(function(){function a(){return CKEDITOR.getUrl(CKEDITOR.skinName.split(",")[1]||"skins/"+CKEDITOR.skinName.split(",")[0]+"/")}function d(b){var c=CKEDITOR.skin["ua_"+b],d=CKEDITOR.env;if(c)for(var c=c.split(",").sort(function(a,b){return a>b?-1:1}),e=0,g;e<c.length;e++)if(g=c[e],d.ie&&(g.replace(/^ie/,"")==d.version||d.quirks&&"iequirks"==g)&&(g="ie"),d[g]){b+="_"+c[e];break}return CKEDITOR.getUrl(a()+b+".css")}function b(a,b){g[a]||(CKEDITOR.document.appendStyleSheet(d(a)),g[a]=1);b&&b()}function c(a){var b=
-a.getById(k);b||(b=a.getHead().append("style"),b.setAttribute("id",k),b.setAttribute("type","text/css"));return b}function e(a,b,c){var d,e,g;if(CKEDITOR.env.webkit)for(b=b.split("}").slice(0,-1),e=0;e<b.length;e++)b[e]=b[e].split("{");for(var h=0;h<a.length;h++)if(CKEDITOR.env.webkit)for(e=0;e<b.length;e++){g=b[e][1];for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);a[h].$.sheet.addRule(b[e][0],g)}else{g=b;for(d=0;d<c.length;d++)g=g.replace(c[d][0],c[d][1]);CKEDITOR.env.ie&&11>CKEDITOR.env.version?
-a[h].$.styleSheet.cssText+=g:a[h].$.innerHTML+=g}}var g={};CKEDITOR.skin={path:a,loadPart:function(c,d){CKEDITOR.skin.name!=CKEDITOR.skinName.split(",")[0]?CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(a()+"skin.js"),function(){b(c,d)}):b(c,d)},getPath:function(a){return CKEDITOR.getUrl(d(a))},icons:{},addIcon:function(a,b,c,d){a=a.toLowerCase();this.icons[a]||(this.icons[a]={path:b,offset:c||0,bgsize:d||"16px"})},getIconStyle:function(a,b,c,d,e){var g;a&&(a=a.toLowerCase(),b&&(g=this.icons[a+"-rtl"]),
-g||(g=this.icons[a]));a=c||g&&g.path||"";d=d||g&&g.offset;e=e||g&&g.bgsize||"16px";a&&(a=a.replace(/'/g,"\\'"));return a&&"background-image:url('"+CKEDITOR.getUrl(a)+"');background-position:0 "+d+"px;background-size:"+e+";"}};CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{getUiColor:function(){return this.uiColor},setUiColor:function(a){var b=c(CKEDITOR.document);return(this.setUiColor=function(a){this.uiColor=a;var c=CKEDITOR.skin.chameleon,d="",g="";"function"==typeof c&&(d=c(this,"editor"),g=
-c(this,"panel"));a=[[p,a]];e([b],d,a);e(h,g,a)}).call(this,a)}});var k="cke_ui_color",h=[],p=/\$color/g;CKEDITOR.on("instanceLoaded",function(a){if(!CKEDITOR.env.ie||!CKEDITOR.env.quirks){var b=a.editor;a=function(a){a=(a.data[0]||a.data).element.getElementsByTag("iframe").getItem(0).getFrameDocument();if(!a.getById("cke_ui_color")){a=c(a);h.push(a);var d=b.getUiColor();d&&e([a],CKEDITOR.skin.chameleon(b,"panel"),[[p,d]])}};b.on("panelShow",a);b.on("menuShow",a);b.config.uiColor&&b.setUiColor(b.config.uiColor)}})})();
-(function(){if(CKEDITOR.env.webkit)CKEDITOR.env.hc=!1;else{var a=CKEDITOR.dom.element.createFromHtml('\x3cdiv style\x3d"width:0;height:0;position:absolute;left:-10000px;border:1px solid;border-color:red blue"\x3e\x3c/div\x3e',CKEDITOR.document);a.appendTo(CKEDITOR.document.getHead());try{var d=a.getComputedStyle("border-top-color"),b=a.getComputedStyle("border-right-color");CKEDITOR.env.hc=!(!d||d!=b)}catch(c){CKEDITOR.env.hc=!1}a.remove()}CKEDITOR.env.hc&&(CKEDITOR.env.cssClass+=" cke_hc");CKEDITOR.document.appendStyleText(".cke{visibility:hidden;}");
-CKEDITOR.status="loaded";CKEDITOR.fireOnce("loaded");if(a=CKEDITOR._.pending)for(delete CKEDITOR._.pending,d=0;d<a.length;d++)CKEDITOR.editor.prototype.constructor.apply(a[d][0],a[d][1]),CKEDITOR.add(a[d][0])})();/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.skin.name="moono-lisa";CKEDITOR.skin.ua_editor="ie,iequirks,ie8,gecko";CKEDITOR.skin.ua_dialog="ie,iequirks,ie8";
-CKEDITOR.skin.chameleon=function(){var b=function(){return function(b,d){for(var a=b.match(/[^#]./g),e=0;3>e;e++){var f=e,c;c=parseInt(a[e],16);c=("0"+(0>d?0|c*(1+d):0|c+(255-c)*d).toString(16)).slice(-2);a[f]=c}return"#"+a.join("")}}(),f={editor:new CKEDITOR.template("{id}.cke_chrome [border-color:{defaultBorder};] {id} .cke_top [ background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_bottom [background-color:{defaultBackground};border-top-color:{defaultBorder};] {id} .cke_resizer [border-right-color:{ckeResizer}] {id} .cke_dialog_title [background-color:{defaultBackground};border-bottom-color:{defaultBorder};] {id} .cke_dialog_footer [background-color:{defaultBackground};outline-color:{defaultBorder};] {id} .cke_dialog_tab [background-color:{dialogTab};border-color:{defaultBorder};] {id} .cke_dialog_tab:hover [background-color:{lightBackground};] {id} .cke_dialog_contents [border-top-color:{defaultBorder};] {id} .cke_dialog_tab_selected, {id} .cke_dialog_tab_selected:hover [background:{dialogTabSelected};border-bottom-color:{dialogTabSelectedBorder};] {id} .cke_dialog_body [background:{dialogBody};border-color:{defaultBorder};] {id} a.cke_button_off:hover,{id} a.cke_button_off:focus,{id} a.cke_button_off:active [background-color:{darkBackground};border-color:{toolbarElementsBorder};] {id} .cke_button_on [background-color:{ckeButtonOn};border-color:{toolbarElementsBorder};] {id} .cke_toolbar_separator,{id} .cke_toolgroup a.cke_button:last-child:after,{id} .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after [background-color: {toolbarElementsBorder};border-color: {toolbarElementsBorder};] {id} a.cke_combo_button:hover,{id} a.cke_combo_button:focus,{id} .cke_combo_on a.cke_combo_button [border-color:{toolbarElementsBorder};background-color:{darkBackground};] {id} .cke_combo:after [border-color:{toolbarElementsBorder};] {id} .cke_path_item [color:{elementsPathColor};] {id} a.cke_path_item:hover,{id} a.cke_path_item:focus,{id} a.cke_path_item:active [background-color:{darkBackground};] {id}.cke_panel [border-color:{defaultBorder};] "),panel:new CKEDITOR.template(".cke_panel_grouptitle [background-color:{lightBackground};border-color:{defaultBorder};] .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active [background-color:{menubuttonHover};] .cke_menubutton:hover .cke_menubutton_icon, .cke_menubutton:focus .cke_menubutton_icon, .cke_menubutton:active .cke_menubutton_icon [background-color:{menubuttonIconHover};] .cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon [background-color:{menubuttonIcon};] .cke_menuseparator [background-color:{menubuttonIcon};] a:hover.cke_colorbox, a:active.cke_colorbox [border-color:{defaultBorder};] a:hover.cke_colorauto, a:hover.cke_colormore, a:active.cke_colorauto, a:active.cke_colormore [background-color:{ckeColorauto};border-color:{defaultBorder};] ")};
-return function(g,d){var a=b(g.uiColor,.4),a={id:"."+g.id,defaultBorder:b(a,-.2),toolbarElementsBorder:b(a,-.25),defaultBackground:a,lightBackground:b(a,.8),darkBackground:b(a,-.15),ckeButtonOn:b(a,.4),ckeResizer:b(a,-.4),ckeColorauto:b(a,.8),dialogBody:b(a,.7),dialogTab:b(a,.65),dialogTabSelected:"#FFF",dialogTabSelectedBorder:"#FFF",elementsPathColor:b(a,-.6),menubuttonHover:b(a,.1),menubuttonIcon:b(a,.5),menubuttonIconHover:b(a,.3)};return f[d].output(a).replace(/\[/g,"{").replace(/\]/g,"}")}}();CKEDITOR.plugins.add("dialogui",{onLoad:function(){var h=function(b){this._||(this._={});this._["default"]=this._.initValue=b["default"]||"";this._.required=b.required||!1;for(var a=[this._],d=1;d<arguments.length;d++)a.push(arguments[d]);a.push(!0);CKEDITOR.tools.extend.apply(CKEDITOR.tools,a);return this._},v={build:function(b,a,d){return new CKEDITOR.ui.dialog.textInput(b,a,d)}},n={build:function(b,a,d){return new CKEDITOR.ui.dialog[a.type](b,a,d)}},q={isChanged:function(){return this.getValue()!=
-this.getInitValue()},reset:function(b){this.setValue(this.getInitValue(),b)},setInitValue:function(){this._.initValue=this.getValue()},resetInitValue:function(){this._.initValue=this._["default"]},getInitValue:function(){return this._.initValue}},r=CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onChange:function(b,a){this._.domOnChangeRegistered||(b.on("load",function(){this.getInputElement().on("change",function(){b.parts.dialog.isVisible()&&this.fire("change",{value:this.getValue()})},
-this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},!0),x=/^on([A-Z]\w+)/,t=function(b){for(var a in b)(x.test(a)||"title"==a||"type"==a)&&delete b[a];return b},w=function(b){b=b.data.getKeystroke();b==CKEDITOR.SHIFT+CKEDITOR.ALT+36?this.setDirectionMarker("ltr"):b==CKEDITOR.SHIFT+CKEDITOR.ALT+35&&this.setDirectionMarker("rtl")};CKEDITOR.tools.extend(CKEDITOR.ui.dialog,{labeledElement:function(b,a,d,f){if(!(4>arguments.length)){var c=h.call(this,a);c.labelId=CKEDITOR.tools.getNextId()+
-"_label";this._.children=[];var e={role:a.role||"presentation"};a.includeLabel&&(e["aria-labelledby"]=c.labelId);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"div",null,e,function(){var e=[],g=a.required?" cke_required":"";"horizontal"!=a.labelLayout?e.push('\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" ',' id\x3d"'+c.labelId+'"',c.inputId?' for\x3d"'+c.inputId+'"':"",(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",a.label,"\x3c/label\x3e",'\x3cdiv class\x3d"cke_dialog_ui_labeled_content"',
-a.controlStyle?' style\x3d"'+a.controlStyle+'"':"",' role\x3d"presentation"\x3e',f.call(this,b,a),"\x3c/div\x3e"):(g={type:"hbox",widths:a.widths,padding:0,children:[{type:"html",html:'\x3clabel class\x3d"cke_dialog_ui_labeled_label'+g+'" id\x3d"'+c.labelId+'" for\x3d"'+c.inputId+'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e"+CKEDITOR.tools.htmlEncode(a.label)+"\x3c/label\x3e"},{type:"html",html:'\x3cspan class\x3d"cke_dialog_ui_labeled_content"'+(a.controlStyle?' style\x3d"'+a.controlStyle+
-'"':"")+"\x3e"+f.call(this,b,a)+"\x3c/span\x3e"}]},CKEDITOR.dialog._.uiElementBuilders.hbox.build(b,g,e));return e.join("")})}},textInput:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this._.inputId=CKEDITOR.tools.getNextId()+"_textInput",c={"class":"cke_dialog_ui_input_"+a.type,id:f,type:a.type};a.validate&&(this.validate=a.validate);a.maxLength&&(c.maxlength=a.maxLength);a.size&&(c.size=a.size);a.inputStyle&&(c.style=a.inputStyle);var e=this,m=!1;b.on("load",function(){e.getInputElement().on("keydown",
-function(a){13==a.data.getKeystroke()&&(m=!0)});e.getInputElement().on("keyup",function(a){13==a.data.getKeystroke()&&m&&(b.getButton("ok")&&setTimeout(function(){b.getButton("ok").click()},0),m=!1);e.bidi&&w.call(e,a)},null,null,1E3)});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var b=['\x3cdiv class\x3d"cke_dialog_ui_input_',a.type,'" role\x3d"presentation"'];a.width&&b.push('style\x3d"width:'+a.width+'" ');b.push("\x3e\x3cinput ");c["aria-labelledby"]=this._.labelId;this._.required&&
-(c["aria-required"]=this._.required);for(var e in c)b.push(e+'\x3d"'+c[e]+'" ');b.push(" /\x3e\x3c/div\x3e");return b.join("")})}},textarea:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);var f=this,c=this._.inputId=CKEDITOR.tools.getNextId()+"_textarea",e={};a.validate&&(this.validate=a.validate);e.rows=a.rows||5;e.cols=a.cols||20;e["class"]="cke_dialog_ui_input_textarea "+(a["class"]||"");"undefined"!=typeof a.inputStyle&&(e.style=a.inputStyle);a.dir&&(e.dir=a.dir);if(f.bidi)b.on("load",
-function(){f.getInputElement().on("keyup",w)},f);CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){e["aria-labelledby"]=this._.labelId;this._.required&&(e["aria-required"]=this._.required);var a=['\x3cdiv class\x3d"cke_dialog_ui_input_textarea" role\x3d"presentation"\x3e\x3ctextarea id\x3d"',c,'" '],b;for(b in e)a.push(b+'\x3d"'+CKEDITOR.tools.htmlEncode(e[b])+'" ');a.push("\x3e",CKEDITOR.tools.htmlEncode(f._["default"]),"\x3c/textarea\x3e\x3c/div\x3e");return a.join("")})}},checkbox:function(b,
-a,d){if(!(3>arguments.length)){var f=h.call(this,a,{"default":!!a["default"]});a.validate&&(this.validate=a.validate);CKEDITOR.ui.dialog.uiElement.call(this,b,a,d,"span",null,null,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_checkbox":CKEDITOR.tools.getNextId()+"_checkbox"},!0),e=[],d=CKEDITOR.tools.getNextId()+"_label",g={"class":"cke_dialog_ui_checkbox_input",type:"checkbox","aria-labelledby":d};t(c);a["default"]&&(g.checked="checked");"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);
-f.checkbox=new CKEDITOR.ui.dialog.uiElement(b,c,e,"input",null,g);e.push(' \x3clabel id\x3d"',d,'" for\x3d"',g.id,'"'+(a.labelStyle?' style\x3d"'+a.labelStyle+'"':"")+"\x3e",CKEDITOR.tools.htmlEncode(a.label),"\x3c/label\x3e");return e.join("")})}},radio:function(b,a,d){if(!(3>arguments.length)){h.call(this,a);this._["default"]||(this._["default"]=this._.initValue=a.items[0][1]);a.validate&&(this.validate=a.validate);var f=[],c=this;a.role="radiogroup";a.includeLabel=!0;CKEDITOR.ui.dialog.labeledElement.call(this,
-b,a,d,function(){for(var e=[],d=[],g=(a.id?a.id:CKEDITOR.tools.getNextId())+"_radio",k=0;k<a.items.length;k++){var l=a.items[k],h=void 0!==l[2]?l[2]:l[0],n=void 0!==l[1]?l[1]:l[0],p=CKEDITOR.tools.getNextId()+"_radio_input",q=p+"_label",p=CKEDITOR.tools.extend({},a,{id:p,title:null,type:null},!0),h=CKEDITOR.tools.extend({},p,{title:h},!0),r={type:"radio","class":"cke_dialog_ui_radio_input",name:g,value:n,"aria-labelledby":q},u=[];c._["default"]==n&&(r.checked="checked");t(p);t(h);"undefined"!=typeof p.inputStyle&&
-(p.style=p.inputStyle);p.keyboardFocusable=!0;f.push(new CKEDITOR.ui.dialog.uiElement(b,p,u,"input",null,r));u.push(" ");new CKEDITOR.ui.dialog.uiElement(b,h,u,"label",null,{id:q,"for":r.id},l[0]);e.push(u.join(""))}new CKEDITOR.ui.dialog.hbox(b,f,e,d);return d.join("")});this._.children=f}},button:function(b,a,d){if(arguments.length){"function"==typeof a&&(a=a(b.getParentEditor()));h.call(this,a,{disabled:a.disabled||!1});CKEDITOR.event.implementOn(this);var f=this;b.on("load",function(){var a=this.getElement();
-(function(){a.on("click",function(a){f.click();a.data.preventDefault()});a.on("keydown",function(a){a.data.getKeystroke()in{32:1}&&(f.click(),a.data.preventDefault())})})();a.unselectable()},this);var c=CKEDITOR.tools.extend({},a);delete c.style;var e=CKEDITOR.tools.getNextId()+"_label";CKEDITOR.ui.dialog.uiElement.call(this,b,c,d,"a",null,{style:a.style,href:"javascript:void(0)",title:a.label,hidefocus:"true","class":a["class"],role:"button","aria-labelledby":e},'\x3cspan id\x3d"'+e+'" class\x3d"cke_dialog_ui_button"\x3e'+
-CKEDITOR.tools.htmlEncode(a.label)+"\x3c/span\x3e")}},select:function(b,a,d){if(!(3>arguments.length)){var f=h.call(this,a);a.validate&&(this.validate=a.validate);f.inputId=CKEDITOR.tools.getNextId()+"_select";CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){var c=CKEDITOR.tools.extend({},a,{id:a.id?a.id+"_select":CKEDITOR.tools.getNextId()+"_select"},!0),e=[],d=[],g={id:f.inputId,"class":"cke_dialog_ui_input_select","aria-labelledby":this._.labelId};e.push('\x3cdiv class\x3d"cke_dialog_ui_input_',
-a.type,'" role\x3d"presentation"');a.width&&e.push('style\x3d"width:'+a.width+'" ');e.push("\x3e");void 0!==a.size&&(g.size=a.size);void 0!==a.multiple&&(g.multiple=a.multiple);t(c);for(var k=0,l;k<a.items.length&&(l=a.items[k]);k++)d.push('\x3coption value\x3d"',CKEDITOR.tools.htmlEncode(void 0!==l[1]?l[1]:l[0]).replace(/"/g,"\x26quot;"),'" /\x3e ',CKEDITOR.tools.htmlEncode(l[0]));"undefined"!=typeof c.inputStyle&&(c.style=c.inputStyle);f.select=new CKEDITOR.ui.dialog.uiElement(b,c,e,"select",null,
-g,d.join(""));e.push("\x3c/div\x3e");return e.join("")})}},file:function(b,a,d){if(!(3>arguments.length)){void 0===a["default"]&&(a["default"]="");var f=CKEDITOR.tools.extend(h.call(this,a),{definition:a,buttons:[]});a.validate&&(this.validate=a.validate);b.on("load",function(){CKEDITOR.document.getById(f.frameId).getParent().addClass("cke_dialog_ui_input_file")});CKEDITOR.ui.dialog.labeledElement.call(this,b,a,d,function(){f.frameId=CKEDITOR.tools.getNextId()+"_fileInput";var b=['\x3ciframe frameborder\x3d"0" allowtransparency\x3d"0" class\x3d"cke_dialog_ui_input_file" role\x3d"presentation" id\x3d"',
-f.frameId,'" title\x3d"',a.label,'" src\x3d"javascript:void('];b.push(CKEDITOR.env.ie?"(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"})()":"0");b.push(')"\x3e\x3c/iframe\x3e');return b.join("")})}},fileButton:function(b,a,d){var f=this;if(!(3>arguments.length)){h.call(this,a);a.validate&&(this.validate=a.validate);var c=CKEDITOR.tools.extend({},a),e=c.onClick;c.className=(c.className?c.className+" ":"")+"cke_dialog_ui_button";c.onClick=function(c){var d=
-a["for"];e&&!1===e.call(this,c)||(b.getContentElement(d[0],d[1]).submit(),this.disable())};b.on("load",function(){b.getContentElement(a["for"][0],a["for"][1])._.buttons.push(f)});CKEDITOR.ui.dialog.button.call(this,b,c,d)}},html:function(){var b=/^\s*<[\w:]+\s+([^>]*)?>/,a=/^(\s*<[\w:]+(?:\s+[^>]*)?)((?:.|\r|\n)+)$/,d=/\/$/;return function(f,c,e){if(!(3>arguments.length)){var m=[],g=c.html;"\x3c"!=g.charAt(0)&&(g="\x3cspan\x3e"+g+"\x3c/span\x3e");var k=c.focus;if(k){var l=this.focus;this.focus=function(){("function"==
-typeof k?k:l).call(this);this.fire("focus")};c.isFocusable&&(this.isFocusable=this.isFocusable);this.keyboardFocusable=!0}CKEDITOR.ui.dialog.uiElement.call(this,f,c,m,"span",null,null,"");m=m.join("").match(b);g=g.match(a)||["","",""];d.test(g[1])&&(g[1]=g[1].slice(0,-1),g[2]="/"+g[2]);e.push([g[1]," ",m[1]||"",g[2]].join(""))}}}(),fieldset:function(b,a,d,f,c){var e=c.label;this._={children:a};CKEDITOR.ui.dialog.uiElement.call(this,b,c,f,"fieldset",null,null,function(){var a=[];e&&a.push("\x3clegend"+
-(c.labelStyle?' style\x3d"'+c.labelStyle+'"':"")+"\x3e"+e+"\x3c/legend\x3e");for(var b=0;b<d.length;b++)a.push(d[b]);return a.join("")})}},!0);CKEDITOR.ui.dialog.html.prototype=new CKEDITOR.ui.dialog.uiElement;CKEDITOR.ui.dialog.labeledElement.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setLabel:function(b){var a=CKEDITOR.document.getById(this._.labelId);1>a.getChildCount()?(new CKEDITOR.dom.text(b,CKEDITOR.document)).appendTo(a):a.getChild(0).$.nodeValue=b;return this},getLabel:function(){var b=
-CKEDITOR.document.getById(this._.labelId);return!b||1>b.getChildCount()?"":b.getChild(0).getText()},eventProcessors:r},!0);CKEDITOR.ui.dialog.button.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{click:function(){return this._.disabled?!1:this.fire("click",{dialog:this._.dialog})},enable:function(){this._.disabled=!1;var b=this.getElement();b&&b.removeClass("cke_disabled")},disable:function(){this._.disabled=!0;this.getElement().addClass("cke_disabled")},isVisible:function(){return this.getElement().getFirst().isVisible()},
-isEnabled:function(){return!this._.disabled},eventProcessors:CKEDITOR.tools.extend({},CKEDITOR.ui.dialog.uiElement.prototype.eventProcessors,{onClick:function(b,a){this.on("click",function(){a.apply(this,arguments)})}},!0),accessKeyUp:function(){this.click()},accessKeyDown:function(){this.focus()},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.textInput.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return CKEDITOR.document.getById(this._.inputId)},
-focus:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&a.$.focus()},0)},select:function(){var b=this.selectParentTab();setTimeout(function(){var a=b.getInputElement();a&&(a.$.focus(),a.$.select())},0)},accessKeyUp:function(){this.select()},setValue:function(b){if(this.bidi){var a=b&&b.charAt(0);(a="‪"==a?"ltr":"‫"==a?"rtl":null)&&(b=b.slice(1));this.setDirectionMarker(a)}b||(b="");return CKEDITOR.ui.dialog.uiElement.prototype.setValue.apply(this,arguments)},
-getValue:function(){var b=CKEDITOR.ui.dialog.uiElement.prototype.getValue.call(this);if(this.bidi&&b){var a=this.getDirectionMarker();a&&(b=("ltr"==a?"‪":"‫")+b)}return b},setDirectionMarker:function(b){var a=this.getInputElement();b?a.setAttributes({dir:b,"data-cke-dir-marker":b}):this.getDirectionMarker()&&a.removeAttributes(["dir","data-cke-dir-marker"])},getDirectionMarker:function(){return this.getInputElement().data("cke-dir-marker")},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.textarea.prototype=
-new CKEDITOR.ui.dialog.textInput;CKEDITOR.ui.dialog.select.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,{getInputElement:function(){return this._.select.getElement()},add:function(b,a,d){var f=new CKEDITOR.dom.element("option",this.getDialog().getParentEditor().document),c=this.getInputElement().$;f.$.text=b;f.$.value=void 0===a||null===a?b:a;void 0===d||null===d?CKEDITOR.env.ie?c.add(f.$):c.add(f.$,null):c.add(f.$,d);return this},remove:function(b){this.getInputElement().$.remove(b);
-return this},clear:function(){for(var b=this.getInputElement().$;0<b.length;)b.remove(0);return this},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.checkbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getInputElement:function(){return this._.checkbox.getElement()},setValue:function(b,a){this.getInputElement().$.checked=b;!a&&this.fire("change",{value:b})},getValue:function(){return this.getInputElement().$.checked},accessKeyUp:function(){this.setValue(!this.getValue())},eventProcessors:{onChange:function(b,
-a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return r.onChange.apply(this,arguments);b.on("load",function(){var a=this._.checkbox.getElement();a.on("propertychange",function(b){b=b.data.$;"checked"==b.propertyName&&this.fire("change",{value:a.$.checked})},this)},this);this.on("change",a);return null}},keyboardFocusable:!0},q,!0);CKEDITOR.ui.dialog.radio.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{setValue:function(b,a){for(var d=this._.children,f,c=0;c<d.length&&(f=d[c]);c++)f.getElement().$.checked=
-f.getValue()==b;!a&&this.fire("change",{value:b})},getValue:function(){for(var b=this._.children,a=0;a<b.length;a++)if(b[a].getElement().$.checked)return b[a].getValue();return null},accessKeyUp:function(){var b=this._.children,a;for(a=0;a<b.length;a++)if(b[a].getElement().$.checked){b[a].getElement().focus();return}b[0].getElement().focus()},eventProcessors:{onChange:function(b,a){if(!CKEDITOR.env.ie||8<CKEDITOR.env.version)return r.onChange.apply(this,arguments);b.on("load",function(){for(var a=
-this._.children,b=this,c=0;c<a.length;c++)a[c].getElement().on("propertychange",function(a){a=a.data.$;"checked"==a.propertyName&&this.$.checked&&b.fire("change",{value:this.getAttribute("value")})})},this);this.on("change",a);return null}}},q,!0);CKEDITOR.ui.dialog.file.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.labeledElement,q,{getInputElement:function(){var b=CKEDITOR.document.getById(this._.frameId).getFrameDocument();return 0<b.$.forms.length?new CKEDITOR.dom.element(b.$.forms[0].elements[0]):
-this.getElement()},submit:function(){this.getInputElement().getParent().$.submit();return this},getAction:function(){return this.getInputElement().getParent().$.action},registerEvents:function(b){var a=/^on([A-Z]\w+)/,d,f=function(a,b,c,d){a.on("formLoaded",function(){a.getInputElement().on(c,d,a)})},c;for(c in b)if(d=c.match(a))this.eventProcessors[c]?this.eventProcessors[c].call(this,this._.dialog,b[c]):f(this,this._.dialog,d[1].toLowerCase(),b[c]);return this},reset:function(){function b(){d.$.open();
-var b="";f.size&&(b=f.size-(CKEDITOR.env.ie?7:0));var h=a.frameId+"_input";d.$.write(['\x3chtml dir\x3d"'+g+'" lang\x3d"'+k+'"\x3e\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e\x3cbody style\x3d"margin: 0; overflow: hidden; background: transparent;"\x3e','\x3cform enctype\x3d"multipart/form-data" method\x3d"POST" dir\x3d"'+g+'" lang\x3d"'+k+'" action\x3d"',CKEDITOR.tools.htmlEncode(f.action),'"\x3e\x3clabel id\x3d"',a.labelId,'" for\x3d"',h,'" style\x3d"display:none"\x3e',CKEDITOR.tools.htmlEncode(f.label),
-'\x3c/label\x3e\x3cinput style\x3d"width:100%" id\x3d"',h,'" aria-labelledby\x3d"',a.labelId,'" type\x3d"file" name\x3d"',CKEDITOR.tools.htmlEncode(f.id||"cke_upload"),'" size\x3d"',CKEDITOR.tools.htmlEncode(0<b?b:""),'" /\x3e\x3c/form\x3e\x3c/body\x3e\x3c/html\x3e\x3cscript\x3e',CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"","window.parent.CKEDITOR.tools.callFunction("+e+");","window.onbeforeunload \x3d function() {window.parent.CKEDITOR.tools.callFunction("+m+")}","\x3c/script\x3e"].join(""));
-d.$.close();for(b=0;b<c.length;b++)c[b].enable()}var a=this._,d=CKEDITOR.document.getById(a.frameId).getFrameDocument(),f=a.definition,c=a.buttons,e=this.formLoadedNumber,m=this.formUnloadNumber,g=a.dialog._.editor.lang.dir,k=a.dialog._.editor.langCode;e||(e=this.formLoadedNumber=CKEDITOR.tools.addFunction(function(){this.fire("formLoaded")},this),m=this.formUnloadNumber=CKEDITOR.tools.addFunction(function(){this.getInputElement().clearCustomData()},this),this.getDialog()._.editor.on("destroy",function(){CKEDITOR.tools.removeFunction(e);
-CKEDITOR.tools.removeFunction(m)}));CKEDITOR.env.gecko?setTimeout(b,500):b()},getValue:function(){return this.getInputElement().$.value||""},setInitValue:function(){this._.initValue=""},eventProcessors:{onChange:function(b,a){this._.domOnChangeRegistered||(this.on("formLoaded",function(){this.getInputElement().on("change",function(){this.fire("change",{value:this.getValue()})},this)},this),this._.domOnChangeRegistered=!0);this.on("change",a)}},keyboardFocusable:!0},!0);CKEDITOR.ui.dialog.fileButton.prototype=
-new CKEDITOR.ui.dialog.button;CKEDITOR.ui.dialog.fieldset.prototype=CKEDITOR.tools.clone(CKEDITOR.ui.dialog.hbox.prototype);CKEDITOR.dialog.addUIElement("text",v);CKEDITOR.dialog.addUIElement("password",v);CKEDITOR.dialog.addUIElement("textarea",n);CKEDITOR.dialog.addUIElement("checkbox",n);CKEDITOR.dialog.addUIElement("radio",n);CKEDITOR.dialog.addUIElement("button",n);CKEDITOR.dialog.addUIElement("select",n);CKEDITOR.dialog.addUIElement("file",n);CKEDITOR.dialog.addUIElement("fileButton",n);CKEDITOR.dialog.addUIElement("html",
-n);CKEDITOR.dialog.addUIElement("fieldset",{build:function(b,a,d){for(var f=a.children,c,e=[],h=[],g=0;g<f.length&&(c=f[g]);g++){var k=[];e.push(k);h.push(CKEDITOR.dialog._.uiElementBuilders[c.type].build(b,c,k))}return new CKEDITOR.ui.dialog[a.type](b,h,e,d,a)}})}});CKEDITOR.DIALOG_RESIZE_NONE=0;CKEDITOR.DIALOG_RESIZE_WIDTH=1;CKEDITOR.DIALOG_RESIZE_HEIGHT=2;CKEDITOR.DIALOG_RESIZE_BOTH=3;CKEDITOR.DIALOG_STATE_IDLE=1;CKEDITOR.DIALOG_STATE_BUSY=2;
-(function(){function x(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId)+a,c=b-1;c>b-a;c--)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function A(){for(var a=this._.tabIdList.length,b=CKEDITOR.tools.indexOf(this._.tabIdList,this._.currentTabId),c=b+1;c<b+a;c++)if(this._.tabs[this._.tabIdList[c%a]][0].$.offsetHeight)return this._.tabIdList[c%a];return null}function K(a,b){for(var c=a.$.getElementsByTagName("input"),
-e=0,d=c.length;e<d;e++){var f=new CKEDITOR.dom.element(c[e]);"text"==f.getAttribute("type").toLowerCase()&&(b?(f.setAttribute("value",f.getCustomData("fake_value")||""),f.removeCustomData("fake_value")):(f.setCustomData("fake_value",f.getAttribute("value")),f.setAttribute("value","")))}}function T(a,b){var c=this.getInputElement();c&&(a?c.removeAttribute("aria-invalid"):c.setAttribute("aria-invalid",!0));a||(this.select?this.select():this.focus());b&&alert(b);this.fire("validated",{valid:a,msg:b})}
-function U(){var a=this.getInputElement();a&&a.removeAttribute("aria-invalid")}function V(a){var b=CKEDITOR.dom.element.createFromHtml(CKEDITOR.addTemplate("dialog",W).output({id:CKEDITOR.tools.getNextNumber(),editorId:a.id,langDir:a.lang.dir,langCode:a.langCode,editorDialogClass:"cke_editor_"+a.name.replace(/\./g,"\\.")+"_dialog",closeTitle:a.lang.common.close,hidpi:CKEDITOR.env.hidpi?"cke_hidpi":""})),c=b.getChild([0,0,0,0,0]),e=c.getChild(0),d=c.getChild(1);a.plugins.clipboard&&CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(c);
-!CKEDITOR.env.ie||CKEDITOR.env.quirks||CKEDITOR.env.edge||(a="javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())",CKEDITOR.dom.element.createFromHtml('\x3ciframe frameBorder\x3d"0" class\x3d"cke_iframe_shim" src\x3d"'+a+'" tabIndex\x3d"-1"\x3e\x3c/iframe\x3e').appendTo(c.getParent()));e.unselectable();d.unselectable();return{element:b,parts:{dialog:b.getChild(0),title:e,close:d,tabs:c.getChild(2),contents:c.getChild([3,0,0,0]),
-footer:c.getChild([3,0,1,0])}}}function L(a,b,c){this.element=b;this.focusIndex=c;this.tabIndex=0;this.isFocusable=function(){return!b.getAttribute("disabled")&&b.isVisible()};this.focus=function(){a._.currentFocusIndex=this.focusIndex;this.element.focus()};b.on("keydown",function(a){a.data.getKeystroke()in{32:1,13:1}&&this.fire("click")});b.on("focus",function(){this.fire("mouseover")});b.on("blur",function(){this.fire("mouseout")})}function X(a){function b(){a.layout()}var c=CKEDITOR.document.getWindow();
-c.on("resize",b);a.on("hide",function(){c.removeListener("resize",b)})}function M(a,b){this._={dialog:a};CKEDITOR.tools.extend(this,b)}function Y(a){function b(b){var c=a.getSize(),k=CKEDITOR.document.getWindow().getViewPaneSize(),q=b.data.$.screenX,n=b.data.$.screenY,r=q-e.x,l=n-e.y;e={x:q,y:n};d.x+=r;d.y+=l;a.move(d.x+h[3]<g?-h[3]:d.x-h[1]>k.width-c.width-g?k.width-c.width+("rtl"==f.lang.dir?0:h[1]):d.x,d.y+h[0]<g?-h[0]:d.y-h[2]>k.height-c.height-g?k.height-c.height+h[2]:d.y,1);b.data.preventDefault()}
-function c(){CKEDITOR.document.removeListener("mousemove",b);CKEDITOR.document.removeListener("mouseup",c);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mousemove",b);a.removeListener("mouseup",c)}}var e=null,d=null,f=a.getParentEditor(),g=f.config.dialog_magnetDistance,h=CKEDITOR.skin.margins||[0,0,0,0];"undefined"==typeof g&&(g=20);a.parts.title.on("mousedown",function(g){e={x:g.data.$.screenX,y:g.data.$.screenY};CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",
-c);d=a.getPosition();if(CKEDITOR.env.ie6Compat){var f=u.getChild(0).getFrameDocument();f.on("mousemove",b);f.on("mouseup",c)}g.data.preventDefault()},a)}function Z(a){function b(b){var c="rtl"==f.lang.dir,n=k.width,q=k.height,G=n+(b.data.$.screenX-m.x)*(c?-1:1)*(a._.moved?1:2),H=q+(b.data.$.screenY-m.y)*(a._.moved?1:2),B=a._.element.getFirst(),B=c&&B.getComputedStyle("right"),C=a.getPosition();C.y+H>p.height&&(H=p.height-C.y);(c?B:C.x)+G>p.width&&(G=p.width-(c?B:C.x));if(d==CKEDITOR.DIALOG_RESIZE_WIDTH||
-d==CKEDITOR.DIALOG_RESIZE_BOTH)n=Math.max(e.minWidth||0,G-g);if(d==CKEDITOR.DIALOG_RESIZE_HEIGHT||d==CKEDITOR.DIALOG_RESIZE_BOTH)q=Math.max(e.minHeight||0,H-h);a.resize(n,q);a._.moved||a.layout();b.data.preventDefault()}function c(){CKEDITOR.document.removeListener("mouseup",c);CKEDITOR.document.removeListener("mousemove",b);q&&(q.remove(),q=null);if(CKEDITOR.env.ie6Compat){var a=u.getChild(0).getFrameDocument();a.removeListener("mouseup",c);a.removeListener("mousemove",b)}}var e=a.definition,d=e.resizable;
-if(d!=CKEDITOR.DIALOG_RESIZE_NONE){var f=a.getParentEditor(),g,h,p,m,k,q,n=CKEDITOR.tools.addFunction(function(d){k=a.getSize();var e=a.parts.contents;e.$.getElementsByTagName("iframe").length&&(q=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_dialog_resize_cover" style\x3d"height: 100%; position: absolute; width: 100%;"\x3e\x3c/div\x3e'),e.append(q));h=k.height-a.parts.contents.getSize("height",!(CKEDITOR.env.gecko||CKEDITOR.env.ie&&CKEDITOR.env.quirks));g=k.width-a.parts.contents.getSize("width",
-1);m={x:d.screenX,y:d.screenY};p=CKEDITOR.document.getWindow().getViewPaneSize();CKEDITOR.document.on("mousemove",b);CKEDITOR.document.on("mouseup",c);CKEDITOR.env.ie6Compat&&(e=u.getChild(0).getFrameDocument(),e.on("mousemove",b),e.on("mouseup",c));d.preventDefault&&d.preventDefault()});a.on("load",function(){var b="";d==CKEDITOR.DIALOG_RESIZE_WIDTH?b=" cke_resizer_horizontal":d==CKEDITOR.DIALOG_RESIZE_HEIGHT&&(b=" cke_resizer_vertical");b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_resizer'+
-b+" cke_resizer_"+f.lang.dir+'" title\x3d"'+CKEDITOR.tools.htmlEncode(f.lang.common.resize)+'" onmousedown\x3d"CKEDITOR.tools.callFunction('+n+', event )"\x3e'+("ltr"==f.lang.dir?"◢":"◣")+"\x3c/div\x3e");a.parts.footer.append(b,1)});f.on("destroy",function(){CKEDITOR.tools.removeFunction(n)})}}function I(a){a.data.preventDefault(1)}function N(a){var b=CKEDITOR.document.getWindow(),c=a.config,e=CKEDITOR.skinName||a.config.skin,d=c.dialog_backgroundCoverColor||("moono-lisa"==e?"black":"white"),e=c.dialog_backgroundCoverOpacity,
-f=c.baseFloatZIndex,c=CKEDITOR.tools.genKey(d,e,f),g=z[c];g?g.show():(f=['\x3cdiv tabIndex\x3d"-1" style\x3d"position: ',CKEDITOR.env.ie6Compat?"absolute":"fixed","; z-index: ",f,"; top: 0px; left: 0px; ",CKEDITOR.env.ie6Compat?"":"background-color: "+d,'" class\x3d"cke_dialog_background_cover"\x3e'],CKEDITOR.env.ie6Compat&&(d="\x3chtml\x3e\x3cbody style\x3d\\'background-color:"+d+";\\'\x3e\x3c/body\x3e\x3c/html\x3e",f.push('\x3ciframe hidefocus\x3d"true" frameborder\x3d"0" id\x3d"cke_dialog_background_iframe" src\x3d"javascript:'),
-f.push("void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.write( '"+d+"' );document.close();")+"})())"),f.push('" style\x3d"position:absolute;left:0;top:0;width:100%;height: 100%;filter: progid:DXImageTransform.Microsoft.Alpha(opacity\x3d0)"\x3e\x3c/iframe\x3e')),f.push("\x3c/div\x3e"),g=CKEDITOR.dom.element.createFromHtml(f.join("")),g.setOpacity(void 0!==e?e:.5),g.on("keydown",I),g.on("keypress",I),g.on("keyup",I),g.appendTo(CKEDITOR.document.getBody()),
-z[c]=g);a.focusManager.add(g);u=g;a=function(){var a=b.getViewPaneSize();g.setStyles({width:a.width+"px",height:a.height+"px"})};var h=function(){var a=b.getScrollPosition(),c=CKEDITOR.dialog._.currentTop;g.setStyles({left:a.x+"px",top:a.y+"px"});if(c){do a=c.getPosition(),c.move(a.x,a.y);while(c=c._.parentDialog)}};J=a;b.on("resize",a);a();CKEDITOR.env.mac&&CKEDITOR.env.webkit||g.focus();if(CKEDITOR.env.ie6Compat){var p=function(){h();arguments.callee.prevScrollHandler.apply(this,arguments)};b.$.setTimeout(function(){p.prevScrollHandler=
-window.onscroll||function(){};window.onscroll=p},0);h()}}function O(a){u&&(a.focusManager.remove(u),a=CKEDITOR.document.getWindow(),u.hide(),a.removeListener("resize",J),CKEDITOR.env.ie6Compat&&a.$.setTimeout(function(){window.onscroll=window.onscroll&&window.onscroll.prevScrollHandler||null},0),J=null)}var v=CKEDITOR.tools.cssLength,W='\x3cdiv class\x3d"cke_reset_all {editorId} {editorDialogClass} {hidpi}" dir\x3d"{langDir}" lang\x3d"{langCode}" role\x3d"dialog" aria-labelledby\x3d"cke_dialog_title_{id}"\x3e\x3ctable class\x3d"cke_dialog '+
-CKEDITOR.env.cssClass+' cke_{langDir}" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd role\x3d"presentation"\x3e\x3cdiv class\x3d"cke_dialog_body" role\x3d"presentation"\x3e\x3cdiv id\x3d"cke_dialog_title_{id}" class\x3d"cke_dialog_title" role\x3d"presentation"\x3e\x3c/div\x3e\x3ca id\x3d"cke_dialog_close_button_{id}" class\x3d"cke_dialog_close_button" href\x3d"javascript:void(0)" title\x3d"{closeTitle}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3eX\x3c/span\x3e\x3c/a\x3e\x3cdiv id\x3d"cke_dialog_tabs_{id}" class\x3d"cke_dialog_tabs" role\x3d"tablist"\x3e\x3c/div\x3e\x3ctable class\x3d"cke_dialog_contents" role\x3d"presentation"\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_contents_{id}" class\x3d"cke_dialog_contents_body" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3ctr\x3e\x3ctd id\x3d"cke_dialog_footer_{id}" class\x3d"cke_dialog_footer" role\x3d"presentation"\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e';
-CKEDITOR.dialog=function(a,b){function c(){var a=l._.focusList;a.sort(function(a,b){return a.tabIndex!=b.tabIndex?b.tabIndex-a.tabIndex:a.focusIndex-b.focusIndex});for(var b=a.length,c=0;c<b;c++)a[c].focusIndex=c}function e(a){var b=l._.focusList;a=a||0;if(!(1>b.length)){var c=l._.currentFocusIndex;l._.tabBarMode&&0>a&&(c=0);try{b[c].getInputElement().$.blur()}catch(d){}var e=c,g=1<l._.pageCount;do{e+=a;if(g&&!l._.tabBarMode&&(e==b.length||-1==e)){l._.tabBarMode=!0;l._.tabs[l._.currentTabId][0].focus();
-l._.currentFocusIndex=-1;return}e=(e+b.length)%b.length;if(e==c)break}while(a&&!b[e].isFocusable());b[e].focus();"text"==b[e].type&&b[e].select()}}function d(b){if(l==CKEDITOR.dialog._.currentTop){var c=b.data.getKeystroke(),d="rtl"==a.lang.dir,g=[37,38,39,40];q=n=0;if(9==c||c==CKEDITOR.SHIFT+9)e(c==CKEDITOR.SHIFT+9?-1:1),q=1;else if(c==CKEDITOR.ALT+121&&!l._.tabBarMode&&1<l.getPageCount())l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1,q=1;else if(-1!=CKEDITOR.tools.indexOf(g,
-c)&&l._.tabBarMode)c=-1!=CKEDITOR.tools.indexOf([d?39:37,38],c)?x.call(l):A.call(l),l.selectPage(c),l._.tabs[c][0].focus(),q=1;else if(13!=c&&32!=c||!l._.tabBarMode)if(13==c)c=b.data.getTarget(),c.is("a","button","select","textarea")||c.is("input")&&"button"==c.$.type||((c=this.getButton("ok"))&&CKEDITOR.tools.setTimeout(c.click,0,c),q=1),n=1;else if(27==c)(c=this.getButton("cancel"))?CKEDITOR.tools.setTimeout(c.click,0,c):!1!==this.fire("cancel",{hide:!0}).hide&&this.hide(),n=1;else return;else this.selectPage(this._.currentTabId),
-this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1),q=1;f(b)}}function f(a){q?a.data.preventDefault(1):n&&a.data.stopPropagation()}var g=CKEDITOR.dialog._.dialogDefinitions[b],h=CKEDITOR.tools.clone(aa),p=a.config.dialog_buttonsOrder||"OS",m=a.lang.dir,k={},q,n;("OS"==p&&CKEDITOR.env.mac||"rtl"==p&&"ltr"==m||"ltr"==p&&"rtl"==m)&&h.buttons.reverse();g=CKEDITOR.tools.extend(g(a),h);g=CKEDITOR.tools.clone(g);g=new P(this,g);h=V(a);this._={editor:a,element:h.element,name:b,contentSize:{width:0,height:0},
-size:{width:0,height:0},contents:{},buttons:{},accessKeyMap:{},tabs:{},tabIdList:[],currentTabId:null,currentTabIndex:null,pageCount:0,lastTab:null,tabBarMode:!1,focusList:[],currentFocusIndex:0,hasFocus:!1};this.parts=h.parts;CKEDITOR.tools.setTimeout(function(){a.fire("ariaWidget",this.parts.contents)},0,this);h={position:CKEDITOR.env.ie6Compat?"absolute":"fixed",top:0,visibility:"hidden"};h["rtl"==m?"right":"left"]=0;this.parts.dialog.setStyles(h);CKEDITOR.event.call(this);this.definition=g=CKEDITOR.fire("dialogDefinition",
-{name:b,definition:g},a).definition;if(!("removeDialogTabs"in a._)&&a.config.removeDialogTabs){h=a.config.removeDialogTabs.split(";");for(m=0;m<h.length;m++)if(p=h[m].split(":"),2==p.length){var r=p[0];k[r]||(k[r]=[]);k[r].push(p[1])}a._.removeDialogTabs=k}if(a._.removeDialogTabs&&(k=a._.removeDialogTabs[b]))for(m=0;m<k.length;m++)g.removeContents(k[m]);if(g.onLoad)this.on("load",g.onLoad);if(g.onShow)this.on("show",g.onShow);if(g.onHide)this.on("hide",g.onHide);if(g.onOk)this.on("ok",function(b){a.fire("saveSnapshot");
-setTimeout(function(){a.fire("saveSnapshot")},0);!1===g.onOk.call(this,b)&&(b.data.hide=!1)});this.state=CKEDITOR.DIALOG_STATE_IDLE;if(g.onCancel)this.on("cancel",function(a){!1===g.onCancel.call(this,a)&&(a.data.hide=!1)});var l=this,t=function(a){var b=l._.contents,c=!1,d;for(d in b)for(var e in b[d])if(c=a.call(this,b[d][e]))return};this.on("ok",function(a){t(function(b){if(b.validate){var c=b.validate(this),d="string"==typeof c||!1===c;d&&(a.data.hide=!1,a.stop());T.call(b,!d,"string"==typeof c?
-c:void 0);return d}})},this,null,0);this.on("cancel",function(b){t(function(c){if(c.isChanged())return a.config.dialog_noConfirmCancel||confirm(a.lang.common.confirmCancel)||(b.data.hide=!1),!0})},this,null,0);this.parts.close.on("click",function(a){!1!==this.fire("cancel",{hide:!0}).hide&&this.hide();a.data.preventDefault()},this);this.changeFocus=e;var y=this._.element;a.focusManager.add(y,1);this.on("show",function(){y.on("keydown",d,this);if(CKEDITOR.env.gecko)y.on("keypress",f,this)});this.on("hide",
-function(){y.removeListener("keydown",d);CKEDITOR.env.gecko&&y.removeListener("keypress",f);t(function(a){U.apply(a)})});this.on("iframeAdded",function(a){(new CKEDITOR.dom.document(a.data.iframe.$.contentWindow.document)).on("keydown",d,this,null,0)});this.on("show",function(){c();var b=1<l._.pageCount;a.config.dialog_startupFocusTab&&b?(l._.tabBarMode=!0,l._.tabs[l._.currentTabId][0].focus(),l._.currentFocusIndex=-1):this._.hasFocus||(this._.currentFocusIndex=b?-1:this._.focusList.length-1,g.onFocus?
-(b=g.onFocus.call(this))&&b.focus():e(1))},this,null,4294967295);if(CKEDITOR.env.ie6Compat)this.on("load",function(){var a=this.getElement(),b=a.getFirst();b.remove();b.appendTo(a)},this);Y(this);Z(this);(new CKEDITOR.dom.text(g.title,CKEDITOR.document)).appendTo(this.parts.title);for(m=0;m<g.contents.length;m++)(k=g.contents[m])&&this.addPage(k);this.parts.tabs.on("click",function(a){var b=a.data.getTarget();b.hasClass("cke_dialog_tab")&&(b=b.$.id,this.selectPage(b.substring(4,b.lastIndexOf("_"))),
-this._.tabBarMode&&(this._.tabBarMode=!1,this._.currentFocusIndex=-1,e(1)),a.data.preventDefault())},this);m=[];k=CKEDITOR.dialog._.uiElementBuilders.hbox.build(this,{type:"hbox",className:"cke_dialog_footer_buttons",widths:[],children:g.buttons},m).getChild();this.parts.footer.setHtml(m.join(""));for(m=0;m<k.length;m++)this._.buttons[k[m].id]=k[m]};CKEDITOR.dialog.prototype={destroy:function(){this.hide();this._.element.remove()},resize:function(){return function(a,b){this._.contentSize&&this._.contentSize.width==
-a&&this._.contentSize.height==b||(CKEDITOR.dialog.fire("resize",{dialog:this,width:a,height:b},this._.editor),this.fire("resize",{width:a,height:b},this._.editor),this.parts.contents.setStyles({width:a+"px",height:b+"px"}),"rtl"==this._.editor.lang.dir&&this._.position&&(this._.position.x=CKEDITOR.document.getWindow().getViewPaneSize().width-this._.contentSize.width-parseInt(this._.element.getFirst().getStyle("right"),10)),this._.contentSize={width:a,height:b})}}(),getSize:function(){var a=this._.element.getFirst();
-return{width:a.$.offsetWidth||0,height:a.$.offsetHeight||0}},move:function(a,b,c){var e=this._.element.getFirst(),d="rtl"==this._.editor.lang.dir,f="fixed"==e.getComputedStyle("position");CKEDITOR.env.ie&&e.setStyle("zoom","100%");f&&this._.position&&this._.position.x==a&&this._.position.y==b||(this._.position={x:a,y:b},f||(f=CKEDITOR.document.getWindow().getScrollPosition(),a+=f.x,b+=f.y),d&&(f=this.getSize(),a=CKEDITOR.document.getWindow().getViewPaneSize().width-f.width-a),b={top:(0<b?b:0)+"px"},
-b[d?"right":"left"]=(0<a?a:0)+"px",e.setStyles(b),c&&(this._.moved=1))},getPosition:function(){return CKEDITOR.tools.extend({},this._.position)},show:function(){var a=this._.element,b=this.definition;a.getParent()&&a.getParent().equals(CKEDITOR.document.getBody())?a.setStyle("display","block"):a.appendTo(CKEDITOR.document.getBody());this.resize(this._.contentSize&&this._.contentSize.width||b.width||b.minWidth,this._.contentSize&&this._.contentSize.height||b.height||b.minHeight);this.reset();this.selectPage(this.definition.contents[0].id);
-null===CKEDITOR.dialog._.currentZIndex&&(CKEDITOR.dialog._.currentZIndex=this._.editor.config.baseFloatZIndex);this._.element.getFirst().setStyle("z-index",CKEDITOR.dialog._.currentZIndex+=10);null===CKEDITOR.dialog._.currentTop?(CKEDITOR.dialog._.currentTop=this,this._.parentDialog=null,N(this._.editor)):(this._.parentDialog=CKEDITOR.dialog._.currentTop,this._.parentDialog.getElement().getFirst().$.style.zIndex-=Math.floor(this._.editor.config.baseFloatZIndex/2),CKEDITOR.dialog._.currentTop=this);
-a.on("keydown",Q);a.on("keyup",R);this._.hasFocus=!1;for(var c in b.contents)if(b.contents[c]){var a=b.contents[c],e=this._.tabs[a.id],d=a.requiredContent,f=0;if(e){for(var g in this._.contents[a.id]){var h=this._.contents[a.id][g];"hbox"!=h.type&&"vbox"!=h.type&&h.getInputElement()&&(h.requiredContent&&!this._.editor.activeFilter.check(h.requiredContent)?h.disable():(h.enable(),f++))}!f||d&&!this._.editor.activeFilter.check(d)?e[0].addClass("cke_dialog_tab_disabled"):e[0].removeClass("cke_dialog_tab_disabled")}}CKEDITOR.tools.setTimeout(function(){this.layout();
-X(this);this.parts.dialog.setStyle("visibility","");this.fireOnce("load",{});CKEDITOR.ui.fire("ready",this);this.fire("show",{});this._.editor.fire("dialogShow",this);this._.parentDialog||this._.editor.focusManager.lock();this.foreach(function(a){a.setInitValue&&a.setInitValue()})},100,this)},layout:function(){var a=this.parts.dialog,b=this.getSize(),c=CKEDITOR.document.getWindow().getViewPaneSize(),e=(c.width-b.width)/2,d=(c.height-b.height)/2;CKEDITOR.env.ie6Compat||(b.height+(0<d?d:0)>c.height||
-b.width+(0<e?e:0)>c.width?a.setStyle("position","absolute"):a.setStyle("position","fixed"));this.move(this._.moved?this._.position.x:e,this._.moved?this._.position.y:d)},foreach:function(a){for(var b in this._.contents)for(var c in this._.contents[b])a.call(this,this._.contents[b][c]);return this},reset:function(){var a=function(a){a.reset&&a.reset(1)};return function(){this.foreach(a);return this}}(),setupContent:function(){var a=arguments;this.foreach(function(b){b.setup&&b.setup.apply(b,a)})},
-commitContent:function(){var a=arguments;this.foreach(function(b){CKEDITOR.env.ie&&this._.currentFocusIndex==b.focusIndex&&b.getInputElement().$.blur();b.commit&&b.commit.apply(b,a)})},hide:function(){if(this.parts.dialog.isVisible()){this.fire("hide",{});this._.editor.fire("dialogHide",this);this.selectPage(this._.tabIdList[0]);var a=this._.element;a.setStyle("display","none");this.parts.dialog.setStyle("visibility","hidden");for(ba(this);CKEDITOR.dialog._.currentTop!=this;)CKEDITOR.dialog._.currentTop.hide();
-if(this._.parentDialog){var b=this._.parentDialog.getElement().getFirst();b.setStyle("z-index",parseInt(b.$.style.zIndex,10)+Math.floor(this._.editor.config.baseFloatZIndex/2))}else O(this._.editor);if(CKEDITOR.dialog._.currentTop=this._.parentDialog)CKEDITOR.dialog._.currentZIndex-=10;else{CKEDITOR.dialog._.currentZIndex=null;a.removeListener("keydown",Q);a.removeListener("keyup",R);var c=this._.editor;c.focus();setTimeout(function(){c.focusManager.unlock();CKEDITOR.env.iOS&&c.window.focus()},0)}delete this._.parentDialog;
-this.foreach(function(a){a.resetInitValue&&a.resetInitValue()});this.setState(CKEDITOR.DIALOG_STATE_IDLE)}},addPage:function(a){if(!a.requiredContent||this._.editor.filter.check(a.requiredContent)){for(var b=[],c=a.label?' title\x3d"'+CKEDITOR.tools.htmlEncode(a.label)+'"':"",e=CKEDITOR.dialog._.uiElementBuilders.vbox.build(this,{type:"vbox",className:"cke_dialog_page_contents",children:a.elements,expand:!!a.expand,padding:a.padding,style:a.style||"width: 100%;"},b),d=this._.contents[a.id]={},f=e.getChild(),
-g=0;e=f.shift();)e.notAllowed||"hbox"==e.type||"vbox"==e.type||g++,d[e.id]=e,"function"==typeof e.getChild&&f.push.apply(f,e.getChild());g||(a.hidden=!0);b=CKEDITOR.dom.element.createFromHtml(b.join(""));b.setAttribute("role","tabpanel");e=CKEDITOR.env;d="cke_"+a.id+"_"+CKEDITOR.tools.getNextNumber();c=CKEDITOR.dom.element.createFromHtml(['\x3ca class\x3d"cke_dialog_tab"',0<this._.pageCount?" cke_last":"cke_first",c,a.hidden?' style\x3d"display:none"':"",' id\x3d"',d,'"',e.gecko&&!e.hc?"":' href\x3d"javascript:void(0)"',
-' tabIndex\x3d"-1" hidefocus\x3d"true" role\x3d"tab"\x3e',a.label,"\x3c/a\x3e"].join(""));b.setAttribute("aria-labelledby",d);this._.tabs[a.id]=[c,b];this._.tabIdList.push(a.id);!a.hidden&&this._.pageCount++;this._.lastTab=c;this.updateStyle();b.setAttribute("name",a.id);b.appendTo(this.parts.contents);c.unselectable();this.parts.tabs.append(c);a.accessKey&&(S(this,this,"CTRL+"+a.accessKey,ca,da),this._.accessKeyMap["CTRL+"+a.accessKey]=a.id)}},selectPage:function(a){if(this._.currentTabId!=a&&!this._.tabs[a][0].hasClass("cke_dialog_tab_disabled")&&
-!1!==this.fire("selectPage",{page:a,currentPage:this._.currentTabId})){for(var b in this._.tabs){var c=this._.tabs[b][0],e=this._.tabs[b][1];b!=a&&(c.removeClass("cke_dialog_tab_selected"),e.hide());e.setAttribute("aria-hidden",b!=a)}var d=this._.tabs[a];d[0].addClass("cke_dialog_tab_selected");CKEDITOR.env.ie6Compat||CKEDITOR.env.ie7Compat?(K(d[1]),d[1].show(),setTimeout(function(){K(d[1],1)},0)):d[1].show();this._.currentTabId=a;this._.currentTabIndex=CKEDITOR.tools.indexOf(this._.tabIdList,a)}},
-updateStyle:function(){this.parts.dialog[(1===this._.pageCount?"add":"remove")+"Class"]("cke_single_page")},hidePage:function(a){var b=this._.tabs[a]&&this._.tabs[a][0];b&&1!=this._.pageCount&&b.isVisible()&&(a==this._.currentTabId&&this.selectPage(x.call(this)),b.hide(),this._.pageCount--,this.updateStyle())},showPage:function(a){if(a=this._.tabs[a]&&this._.tabs[a][0])a.show(),this._.pageCount++,this.updateStyle()},getElement:function(){return this._.element},getName:function(){return this._.name},
-getContentElement:function(a,b){var c=this._.contents[a];return c&&c[b]},getValueOf:function(a,b){return this.getContentElement(a,b).getValue()},setValueOf:function(a,b,c){return this.getContentElement(a,b).setValue(c)},getButton:function(a){return this._.buttons[a]},click:function(a){return this._.buttons[a].click()},disableButton:function(a){return this._.buttons[a].disable()},enableButton:function(a){return this._.buttons[a].enable()},getPageCount:function(){return this._.pageCount},getParentEditor:function(){return this._.editor},
-getSelectedElement:function(){return this.getParentEditor().getSelection().getSelectedElement()},addFocusable:function(a,b){if("undefined"==typeof b)b=this._.focusList.length,this._.focusList.push(new L(this,a,b));else{this._.focusList.splice(b,0,new L(this,a,b));for(var c=b+1;c<this._.focusList.length;c++)this._.focusList[c].focusIndex++}},setState:function(a){if(this.state!=a){this.state=a;if(a==CKEDITOR.DIALOG_STATE_BUSY){if(!this.parts.spinner){var b=this.getParentEditor().lang.dir,c={attributes:{"class":"cke_dialog_spinner"},
-styles:{"float":"rtl"==b?"right":"left"}};c.styles["margin-"+("rtl"==b?"left":"right")]="8px";this.parts.spinner=CKEDITOR.document.createElement("div",c);this.parts.spinner.setHtml("\x26#8987;");this.parts.spinner.appendTo(this.parts.title,1)}this.parts.spinner.show();this.getButton("ok").disable()}else a==CKEDITOR.DIALOG_STATE_IDLE&&(this.parts.spinner&&this.parts.spinner.hide(),this.getButton("ok").enable());this.fire("state",a)}}};CKEDITOR.tools.extend(CKEDITOR.dialog,{add:function(a,b){this._.dialogDefinitions[a]&&
-"function"!=typeof b||(this._.dialogDefinitions[a]=b)},exists:function(a){return!!this._.dialogDefinitions[a]},getCurrent:function(){return CKEDITOR.dialog._.currentTop},isTabEnabled:function(a,b,c){a=a.config.removeDialogTabs;return!(a&&a.match(new RegExp("(?:^|;)"+b+":"+c+"(?:$|;)","i")))},okButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"ok",type:"button",label:a.lang.common.ok,"class":"cke_dialog_ui_button_ok",onClick:function(a){a=a.data.dialog;!1!==a.fire("ok",
-{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,b)},{type:"button"},!0)};return a}(),cancelButton:function(){var a=function(a,c){c=c||{};return CKEDITOR.tools.extend({id:"cancel",type:"button",label:a.lang.common.cancel,"class":"cke_dialog_ui_button_cancel",onClick:function(a){a=a.data.dialog;!1!==a.fire("cancel",{hide:!0}).hide&&a.hide()}},c,!0)};a.type="button";a.override=function(b){return CKEDITOR.tools.extend(function(c){return a(c,
-b)},{type:"button"},!0)};return a}(),addUIElement:function(a,b){this._.uiElementBuilders[a]=b}});CKEDITOR.dialog._={uiElementBuilders:{},dialogDefinitions:{},currentTop:null,currentZIndex:null};CKEDITOR.event.implementOn(CKEDITOR.dialog);CKEDITOR.event.implementOn(CKEDITOR.dialog.prototype);var aa={resizable:CKEDITOR.DIALOG_RESIZE_BOTH,minWidth:600,minHeight:400,buttons:[CKEDITOR.dialog.okButton,CKEDITOR.dialog.cancelButton]},D=function(a,b,c){for(var e=0,d;d=a[e];e++)if(d.id==b||c&&d[c]&&(d=D(d[c],
-b,c)))return d;return null},E=function(a,b,c,e,d){if(c){for(var f=0,g;g=a[f];f++){if(g.id==c)return a.splice(f,0,b),b;if(e&&g[e]&&(g=E(g[e],b,c,e,!0)))return g}if(d)return null}a.push(b);return b},F=function(a,b,c){for(var e=0,d;d=a[e];e++){if(d.id==b)return a.splice(e,1);if(c&&d[c]&&(d=F(d[c],b,c)))return d}return null},P=function(a,b){this.dialog=a;for(var c=b.contents,e=0,d;d=c[e];e++)c[e]=d&&new M(a,d);CKEDITOR.tools.extend(this,b)};P.prototype={getContents:function(a){return D(this.contents,
-a)},getButton:function(a){return D(this.buttons,a)},addContents:function(a,b){return E(this.contents,a,b)},addButton:function(a,b){return E(this.buttons,a,b)},removeContents:function(a){F(this.contents,a)},removeButton:function(a){F(this.buttons,a)}};M.prototype={get:function(a){return D(this.elements,a,"children")},add:function(a,b){return E(this.elements,a,b,"children")},remove:function(a){F(this.elements,a,"children")}};var J,z={},u,w={},Q=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=
-a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keydown&&b.keydown.call(b.uiElement,b.dialog,b.key),a.data.preventDefault())},R=function(a){var b=a.data.$.ctrlKey||a.data.$.metaKey,c=a.data.$.altKey,e=a.data.$.shiftKey,d=String.fromCharCode(a.data.$.keyCode);(b=w[(b?"CTRL+":"")+(c?"ALT+":"")+(e?"SHIFT+":"")+d])&&b.length&&(b=b[b.length-1],b.keyup&&(b.keyup.call(b.uiElement,b.dialog,b.key),
-a.data.preventDefault()))},S=function(a,b,c,e,d){(w[c]||(w[c]=[])).push({uiElement:a,dialog:b,key:c,keyup:d||a.accessKeyUp,keydown:e||a.accessKeyDown})},ba=function(a){for(var b in w){for(var c=w[b],e=c.length-1;0<=e;e--)c[e].dialog!=a&&c[e].uiElement!=a||c.splice(e,1);0===c.length&&delete w[b]}},da=function(a,b){a._.accessKeyMap[b]&&a.selectPage(a._.accessKeyMap[b])},ca=function(){};(function(){CKEDITOR.ui.dialog={uiElement:function(a,b,c,e,d,f,g){if(!(4>arguments.length)){var h=(e.call?e(b):e)||
-"div",p=["\x3c",h," "],m=(d&&d.call?d(b):d)||{},k=(f&&f.call?f(b):f)||{},q=(g&&g.call?g.call(this,a,b):g)||"",n=this.domId=k.id||CKEDITOR.tools.getNextId()+"_uiElement";b.requiredContent&&!a.getParentEditor().filter.check(b.requiredContent)&&(m.display="none",this.notAllowed=!0);k.id=n;var r={};b.type&&(r["cke_dialog_ui_"+b.type]=1);b.className&&(r[b.className]=1);b.disabled&&(r.cke_disabled=1);for(var l=k["class"]&&k["class"].split?k["class"].split(" "):[],n=0;n<l.length;n++)l[n]&&(r[l[n]]=1);l=
-[];for(n in r)l.push(n);k["class"]=l.join(" ");b.title&&(k.title=b.title);r=(b.style||"").split(";");b.align&&(l=b.align,m["margin-left"]="left"==l?0:"auto",m["margin-right"]="right"==l?0:"auto");for(n in m)r.push(n+":"+m[n]);b.hidden&&r.push("display:none");for(n=r.length-1;0<=n;n--)""===r[n]&&r.splice(n,1);0<r.length&&(k.style=(k.style?k.style+"; ":"")+r.join("; "));for(n in k)p.push(n+'\x3d"'+CKEDITOR.tools.htmlEncode(k[n])+'" ');p.push("\x3e",q,"\x3c/",h,"\x3e");c.push(p.join(""));(this._||(this._=
-{})).dialog=a;"boolean"==typeof b.isChanged&&(this.isChanged=function(){return b.isChanged});"function"==typeof b.isChanged&&(this.isChanged=b.isChanged);"function"==typeof b.setValue&&(this.setValue=CKEDITOR.tools.override(this.setValue,function(a){return function(c){a.call(this,b.setValue.call(this,c))}}));"function"==typeof b.getValue&&(this.getValue=CKEDITOR.tools.override(this.getValue,function(a){return function(){return b.getValue.call(this,a.call(this))}}));CKEDITOR.event.implementOn(this);
-this.registerEvents(b);this.accessKeyUp&&this.accessKeyDown&&b.accessKey&&S(this,a,"CTRL+"+b.accessKey);var t=this;a.on("load",function(){var b=t.getInputElement();if(b){var c=t.type in{checkbox:1,ratio:1}&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?"cke_dialog_ui_focused":"";b.on("focus",function(){a._.tabBarMode=!1;a._.hasFocus=!0;t.fire("focus");c&&this.addClass(c)});b.on("blur",function(){t.fire("blur");c&&this.removeClass(c)})}});CKEDITOR.tools.extend(this,b);this.keyboardFocusable&&(this.tabIndex=
-b.tabIndex||0,this.focusIndex=a._.focusList.push(this)-1,this.on("focus",function(){a._.currentFocusIndex=t.focusIndex}))}},hbox:function(a,b,c,e,d){if(!(4>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.widths||null,h=d&&d.height||null,p,m={role:"presentation"};d&&d.align&&(m.align=d.align);CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"hbox"},e,"table",{},m,function(){var a=['\x3ctbody\x3e\x3ctr class\x3d"cke_dialog_ui_hbox"\x3e'];for(p=0;p<c.length;p++){var b="cke_dialog_ui_hbox_child",
-e=[];0===p&&(b="cke_dialog_ui_hbox_first");p==c.length-1&&(b="cke_dialog_ui_hbox_last");a.push('\x3ctd class\x3d"',b,'" role\x3d"presentation" ');g?g[p]&&e.push("width:"+v(g[p])):e.push("width:"+Math.floor(100/c.length)+"%");h&&e.push("height:"+v(h));d&&void 0!==d.padding&&e.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[p].align&&e.push("text-align:"+f[p].align);0<e.length&&a.push('style\x3d"'+e.join("; ")+'" ');a.push("\x3e",c[p],"\x3c/td\x3e")}a.push("\x3c/tr\x3e\x3c/tbody\x3e");
-return a.join("")})}},vbox:function(a,b,c,e,d){if(!(3>arguments.length)){this._||(this._={});var f=this._.children=b,g=d&&d.width||null,h=d&&d.heights||null;CKEDITOR.ui.dialog.uiElement.call(this,a,d||{type:"vbox"},e,"div",null,{role:"presentation"},function(){var b=['\x3ctable role\x3d"presentation" cellspacing\x3d"0" border\x3d"0" '];b.push('style\x3d"');d&&d.expand&&b.push("height:100%;");b.push("width:"+v(g||"100%"),";");CKEDITOR.env.webkit&&b.push("float:none;");b.push('"');b.push('align\x3d"',
-CKEDITOR.tools.htmlEncode(d&&d.align||("ltr"==a.getParentEditor().lang.dir?"left":"right")),'" ');b.push("\x3e\x3ctbody\x3e");for(var e=0;e<c.length;e++){var k=[];b.push('\x3ctr\x3e\x3ctd role\x3d"presentation" ');g&&k.push("width:"+v(g||"100%"));h?k.push("height:"+v(h[e])):d&&d.expand&&k.push("height:"+Math.floor(100/c.length)+"%");d&&void 0!==d.padding&&k.push("padding:"+v(d.padding));CKEDITOR.env.ie&&CKEDITOR.env.quirks&&f[e].align&&k.push("text-align:"+f[e].align);0<k.length&&b.push('style\x3d"',
-k.join("; "),'" ');b.push(' class\x3d"cke_dialog_ui_vbox_child"\x3e',c[e],"\x3c/td\x3e\x3c/tr\x3e")}b.push("\x3c/tbody\x3e\x3c/table\x3e");return b.join("")})}}}})();CKEDITOR.ui.dialog.uiElement.prototype={getElement:function(){return CKEDITOR.document.getById(this.domId)},getInputElement:function(){return this.getElement()},getDialog:function(){return this._.dialog},setValue:function(a,b){this.getInputElement().setValue(a);!b&&this.fire("change",{value:a});return this},getValue:function(){return this.getInputElement().getValue()},
-isChanged:function(){return!1},selectParentTab:function(){for(var a=this.getInputElement();(a=a.getParent())&&-1==a.$.className.search("cke_dialog_page_contents"););if(!a)return this;a=a.getAttribute("name");this._.dialog._.currentTabId!=a&&this._.dialog.selectPage(a);return this},focus:function(){this.selectParentTab().getInputElement().focus();return this},registerEvents:function(a){var b=/^on([A-Z]\w+)/,c,e=function(a,b,c,d){b.on("load",function(){a.getInputElement().on(c,d,a)})},d;for(d in a)if(c=
-d.match(b))this.eventProcessors[d]?this.eventProcessors[d].call(this,this._.dialog,a[d]):e(this,this._.dialog,c[1].toLowerCase(),a[d]);return this},eventProcessors:{onLoad:function(a,b){a.on("load",b,this)},onShow:function(a,b){a.on("show",b,this)},onHide:function(a,b){a.on("hide",b,this)}},accessKeyDown:function(){this.focus()},accessKeyUp:function(){},disable:function(){var a=this.getElement();this.getInputElement().setAttribute("disabled","true");a.addClass("cke_disabled")},enable:function(){var a=
-this.getElement();this.getInputElement().removeAttribute("disabled");a.removeClass("cke_disabled")},isEnabled:function(){return!this.getElement().hasClass("cke_disabled")},isVisible:function(){return this.getInputElement().isVisible()},isFocusable:function(){return this.isEnabled()&&this.isVisible()?!0:!1}};CKEDITOR.ui.dialog.hbox.prototype=CKEDITOR.tools.extend(new CKEDITOR.ui.dialog.uiElement,{getChild:function(a){if(1>arguments.length)return this._.children.concat();a.splice||(a=[a]);return 2>
-a.length?this._.children[a[0]]:this._.children[a[0]]&&this._.children[a[0]].getChild?this._.children[a[0]].getChild(a.slice(1,a.length)):null}},!0);CKEDITOR.ui.dialog.vbox.prototype=new CKEDITOR.ui.dialog.hbox;(function(){var a={build:function(a,c,e){for(var d=c.children,f,g=[],h=[],p=0;p<d.length&&(f=d[p]);p++){var m=[];g.push(m);h.push(CKEDITOR.dialog._.uiElementBuilders[f.type].build(a,f,m))}return new CKEDITOR.ui.dialog[c.type](a,h,g,e,c)}};CKEDITOR.dialog.addUIElement("hbox",a);CKEDITOR.dialog.addUIElement("vbox",
-a)})();CKEDITOR.dialogCommand=function(a,b){this.dialogName=a;CKEDITOR.tools.extend(this,b,!0)};CKEDITOR.dialogCommand.prototype={exec:function(a){a.openDialog(this.dialogName)},canUndo:!1,editorFocus:1};(function(){var a=/^([a]|[^a])+$/,b=/^\d*$/,c=/^\d*(?:\.\d+)?$/,e=/^(((\d*(\.\d+))|(\d*))(px|\%)?)?$/,d=/^(((\d*(\.\d+))|(\d*))(px|em|ex|in|cm|mm|pt|pc|\%)?)?$/i,f=/^(\s*[\w-]+\s*:\s*[^:;]+(?:;|$))*$/;CKEDITOR.VALIDATE_OR=1;CKEDITOR.VALIDATE_AND=2;CKEDITOR.dialog.validate={functions:function(){var a=
-arguments;return function(){var b=this&&this.getValue?this.getValue():a[0],c,d=CKEDITOR.VALIDATE_AND,e=[],f;for(f=0;f<a.length;f++)if("function"==typeof a[f])e.push(a[f]);else break;f<a.length&&"string"==typeof a[f]&&(c=a[f],f++);f<a.length&&"number"==typeof a[f]&&(d=a[f]);var n=d==CKEDITOR.VALIDATE_AND?!0:!1;for(f=0;f<e.length;f++)n=d==CKEDITOR.VALIDATE_AND?n&&e[f](b):n||e[f](b);return n?!0:c}},regex:function(a,b){return function(c){c=this&&this.getValue?this.getValue():c;return a.test(c)?!0:b}},
-notEmpty:function(b){return this.regex(a,b)},integer:function(a){return this.regex(b,a)},number:function(a){return this.regex(c,a)},cssLength:function(a){return this.functions(function(a){return d.test(CKEDITOR.tools.trim(a))},a)},htmlLength:function(a){return this.functions(function(a){return e.test(CKEDITOR.tools.trim(a))},a)},inlineStyle:function(a){return this.functions(function(a){return f.test(CKEDITOR.tools.trim(a))},a)},equals:function(a,b){return this.functions(function(b){return b==a},b)},
-notEqual:function(a,b){return this.functions(function(b){return b!=a},b)}};CKEDITOR.on("instanceDestroyed",function(a){if(CKEDITOR.tools.isEmpty(CKEDITOR.instances)){for(var b;b=CKEDITOR.dialog._.currentTop;)b.hide();for(var c in z)z[c].remove();z={}}a=a.editor._.storedDialogs;for(var d in a)a[d].destroy()})})();CKEDITOR.tools.extend(CKEDITOR.editor.prototype,{openDialog:function(a,b){var c=null,e=CKEDITOR.dialog._.dialogDefinitions[a];null===CKEDITOR.dialog._.currentTop&&N(this);if("function"==typeof e)c=
-this._.storedDialogs||(this._.storedDialogs={}),c=c[a]||(c[a]=new CKEDITOR.dialog(this,a)),b&&b.call(c,c),c.show();else{if("failed"==e)throw O(this),Error('[CKEDITOR.dialog.openDialog] Dialog "'+a+'" failed when loading definition.');"string"==typeof e&&CKEDITOR.scriptLoader.load(CKEDITOR.getUrl(e),function(){"function"!=typeof CKEDITOR.dialog._.dialogDefinitions[a]&&(CKEDITOR.dialog._.dialogDefinitions[a]="failed");this.openDialog(a,b)},this,0,1)}CKEDITOR.skin.loadPart("dialog");return c}})})();
-CKEDITOR.plugins.add("dialog",{requires:"dialogui",init:function(x){x.on("doubleclick",function(A){A.data.dialog&&x.openDialog(A.data.dialog)},null,null,999)}});CKEDITOR.plugins.add("about",{requires:"dialog",init:function(a){var b=a.addCommand("about",new CKEDITOR.dialogCommand("about"));b.modes={wysiwyg:1,source:1};b.canUndo=!1;b.readOnly=1;a.ui.addButton&&a.ui.addButton("About",{label:a.lang.about.title,command:"about",toolbar:"about"});CKEDITOR.dialog.add("about",this.path+"dialogs/about.js")}});(function(){function q(b,a,c){a.type||(a.type="auto");if(c&&!1===b.fire("beforePaste",a)||!a.dataValue&&a.dataTransfer.isEmpty())return!1;a.dataValue||(a.dataValue="");if(CKEDITOR.env.gecko&&"drop"==a.method&&b.toolbox)b.once("afterPaste",function(){b.toolbox.focus()});return b.fire("paste",a)}function z(b){function a(){var a=b.editable();if(CKEDITOR.plugins.clipboard.isCustomCopyCutSupported){var c=function(a){b.readOnly&&"cut"==a.name||m.initPasteDataTransfer(a,b);a.data.preventDefault()};a.on("copy",
-c);a.on("cut",c);a.on("cut",function(){b.readOnly||b.extractSelectedHtml()},null,null,999)}a.on(m.mainPasteEvent,function(b){"beforepaste"==m.mainPasteEvent&&p||u(b)});"beforepaste"==m.mainPasteEvent&&(a.on("paste",function(a){v||(f(),a.data.preventDefault(),u(a),d("paste")||b.openDialog("paste"))}),a.on("contextmenu",g,null,null,0),a.on("beforepaste",function(b){!b.data||b.data.$.ctrlKey||b.data.$.shiftKey||g()},null,null,0));a.on("beforecut",function(){!p&&h(b)});var e;a.attachListener(CKEDITOR.env.ie?
-a:b.document.getDocumentElement(),"mouseup",function(){e=setTimeout(function(){r()},0)});b.on("destroy",function(){clearTimeout(e)});a.on("keyup",r)}function c(a){return{type:a,canUndo:"cut"==a,startDisabled:!0,fakeKeystroke:"cut"==a?CKEDITOR.CTRL+88:CKEDITOR.CTRL+67,exec:function(){"cut"==this.type&&h();var a;var c=this.type;if(CKEDITOR.env.ie)a=d(c);else try{a=b.document.$.execCommand(c,!1,null)}catch(g){a=!1}a||b.showNotification(b.lang.clipboard[this.type+"Error"]);return a}}}function e(){return{canUndo:!1,
-async:!0,fakeKeystroke:CKEDITOR.CTRL+86,exec:function(b,a){var c=this,d=function(a,d){a&&q(b,a,!!d);b.fire("afterCommandExec",{name:"paste",command:c,returnValue:!!a})};"string"==typeof a?d({dataValue:a,method:"paste",dataTransfer:m.initPasteDataTransfer()},1):b.getClipboardData(d)}}}function f(){v=1;setTimeout(function(){v=0},100)}function g(){p=1;setTimeout(function(){p=0},10)}function d(a){var c=b.document,d=c.getBody(),g=!1,e=function(){g=!0};d.on(a,e);7<CKEDITOR.env.version?c.$.execCommand(a):
-c.$.selection.createRange().execCommand(a);d.removeListener(a,e);return g}function h(){if(CKEDITOR.env.ie&&!CKEDITOR.env.quirks){var a=b.getSelection(),c,d,g;a.getType()==CKEDITOR.SELECTION_ELEMENT&&(c=a.getSelectedElement())&&(d=a.getRanges()[0],g=b.document.createText(""),g.insertBefore(c),d.setStartBefore(g),d.setEndAfter(c),a.selectRanges([d]),setTimeout(function(){c.getParent()&&(g.remove(),a.selectElement(c))},0))}}function n(a,c){var d=b.document,g=b.editable(),e=function(b){b.cancel()},h;
-if(!d.getById("cke_pastebin")){var k=b.getSelection(),u=k.createBookmarks();CKEDITOR.env.ie&&k.root.fire("selectionchange");var l=new CKEDITOR.dom.element(!CKEDITOR.env.webkit&&!g.is("body")||CKEDITOR.env.ie?"div":"body",d);l.setAttributes({id:"cke_pastebin","data-cke-temp":"1"});var f=0,d=d.getWindow();CKEDITOR.env.webkit?(g.append(l),l.addClass("cke_editable"),g.is("body")||(f="static"!=g.getComputedStyle("position")?g:CKEDITOR.dom.element.get(g.$.offsetParent),f=f.getDocumentPosition().y)):g.getAscendant(CKEDITOR.env.ie?
-"body":"html",1).append(l);l.setStyles({position:"absolute",top:d.getScrollPosition().y-f+10+"px",width:"1px",height:Math.max(1,d.getViewPaneSize().height-20)+"px",overflow:"hidden",margin:0,padding:0});CKEDITOR.env.safari&&l.setStyles(CKEDITOR.tools.cssVendorPrefix("user-select","text"));(f=l.getParent().isReadOnly())?(l.setOpacity(0),l.setAttribute("contenteditable",!0)):l.setStyle("ltr"==b.config.contentsLangDirection?"left":"right","-10000px");b.on("selectionChange",e,null,null,0);if(CKEDITOR.env.webkit||
-CKEDITOR.env.gecko)h=g.once("blur",e,null,null,-100);f&&l.focus();f=new CKEDITOR.dom.range(l);f.selectNodeContents(l);var n=f.select();CKEDITOR.env.ie&&(h=g.once("blur",function(){b.lockSelection(n)}));var r=CKEDITOR.document.getWindow().getScrollPosition().y;setTimeout(function(){CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=r);h&&h.removeListener();CKEDITOR.env.ie&&g.focus();k.selectBookmarks(u);l.remove();var a;CKEDITOR.env.webkit&&(a=l.getFirst())&&a.is&&a.hasClass("Apple-style-span")&&
-(l=a);b.removeListener("selectionChange",e);c(l.getHtml())},0)}}function w(){if("paste"==m.mainPasteEvent)return b.fire("beforePaste",{type:"auto",method:"paste"}),!1;b.focus();f();var a=b.focusManager;a.lock();if(b.editable().fire(m.mainPasteEvent)&&!d("paste"))return a.unlock(),!1;a.unlock();return!0}function k(a){if("wysiwyg"==b.mode)switch(a.data.keyCode){case CKEDITOR.CTRL+86:case CKEDITOR.SHIFT+45:a=b.editable();f();"paste"==m.mainPasteEvent&&a.fire("beforepaste");break;case CKEDITOR.CTRL+88:case CKEDITOR.SHIFT+
-46:b.fire("saveSnapshot"),setTimeout(function(){b.fire("saveSnapshot")},50)}}function u(a){var c={type:"auto",method:"paste",dataTransfer:m.initPasteDataTransfer(a)};c.dataTransfer.cacheData();var d=!1!==b.fire("beforePaste",c);d&&m.canClipboardApiBeTrusted(c.dataTransfer,b)?(a.data.preventDefault(),setTimeout(function(){q(b,c)},0)):n(a,function(a){c.dataValue=a.replace(/<span[^>]+data-cke-bookmark[^<]*?<\/span>/ig,"");d&&q(b,c)})}function r(){if("wysiwyg"==b.mode){var a=t("paste");b.getCommand("cut").setState(t("cut"));
-b.getCommand("copy").setState(t("copy"));b.getCommand("paste").setState(a);b.fire("pasteState",a)}}function t(a){if(x&&a in{paste:1,cut:1})return CKEDITOR.TRISTATE_DISABLED;if("paste"==a)return CKEDITOR.TRISTATE_OFF;a=b.getSelection();var c=a.getRanges();return a.getType()==CKEDITOR.SELECTION_NONE||1==c.length&&c[0].collapsed?CKEDITOR.TRISTATE_DISABLED:CKEDITOR.TRISTATE_OFF}var m=CKEDITOR.plugins.clipboard,p=0,v=0,x=0;(function(){b.on("key",k);b.on("contentDom",a);b.on("selectionChange",function(b){x=
-b.data.selection.getRanges()[0].checkReadOnly();r()});b.contextMenu&&b.contextMenu.addListener(function(b,a){x=a.getRanges()[0].checkReadOnly();return{cut:t("cut"),copy:t("copy"),paste:t("paste")}})})();(function(){function a(c,d,g,e,h){var k=b.lang.clipboard[d];b.addCommand(d,g);b.ui.addButton&&b.ui.addButton(c,{label:k,command:d,toolbar:"clipboard,"+e});b.addMenuItems&&b.addMenuItem(d,{label:k,command:d,group:"clipboard",order:h})}a("Cut","cut",c("cut"),10,1);a("Copy","copy",c("copy"),20,4);a("Paste",
-"paste",e(),30,8)})();b.getClipboardData=function(a,c){function d(a){a.removeListener();a.cancel();c(a.data)}function g(a){a.removeListener();a.cancel();f=!0;c({type:k,dataValue:a.data.dataValue,dataTransfer:a.data.dataTransfer,method:"paste"})}function e(){this.customTitle=a&&a.title}var h=!1,k="auto",f=!1;c||(c=a,a=null);b.on("paste",d,null,null,0);b.on("beforePaste",function(a){a.removeListener();h=!0;k=a.data.type},null,null,1E3);!1===w()&&(b.removeListener("paste",d),h&&b.fire("pasteDialog",
-e)?(b.on("pasteDialogCommit",g),b.on("dialogHide",function(a){a.removeListener();a.data.removeListener("pasteDialogCommit",g);setTimeout(function(){f||c(null)},10)})):c(null))}}function A(b){if(CKEDITOR.env.webkit){if(!b.match(/^[^<]*$/g)&&!b.match(/^(<div><br( ?\/)?><\/div>|<div>[^<]*<\/div>)*$/gi))return"html"}else if(CKEDITOR.env.ie){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi)&&!b.match(/^(<p>([^<]|<br( ?\/)?>)*<\/p>|(\r\n))*$/gi))return"html"}else if(CKEDITOR.env.gecko){if(!b.match(/^([^<]|<br( ?\/)?>)*$/gi))return"html"}else return"html";
-return"htmlifiedtext"}function B(b,a){function c(a){return CKEDITOR.tools.repeat("\x3c/p\x3e\x3cp\x3e",~~(a/2))+(1==a%2?"\x3cbr\x3e":"")}a=a.replace(/\s+/g," ").replace(/> +</g,"\x3e\x3c").replace(/<br ?\/>/gi,"\x3cbr\x3e");a=a.replace(/<\/?[A-Z]+>/g,function(a){return a.toLowerCase()});if(a.match(/^[^<]$/))return a;CKEDITOR.env.webkit&&-1<a.indexOf("\x3cdiv\x3e")&&(a=a.replace(/^(<div>(<br>|)<\/div>)(?!$|(<div>(<br>|)<\/div>))/g,"\x3cbr\x3e").replace(/^(<div>(<br>|)<\/div>){2}(?!$)/g,"\x3cdiv\x3e\x3c/div\x3e"),
-a.match(/<div>(<br>|)<\/div>/)&&(a="\x3cp\x3e"+a.replace(/(<div>(<br>|)<\/div>)+/g,function(a){return c(a.split("\x3c/div\x3e\x3cdiv\x3e").length+1)})+"\x3c/p\x3e"),a=a.replace(/<\/div><div>/g,"\x3cbr\x3e"),a=a.replace(/<\/?div>/g,""));CKEDITOR.env.gecko&&b.enterMode!=CKEDITOR.ENTER_BR&&(CKEDITOR.env.gecko&&(a=a.replace(/^<br><br>$/,"\x3cbr\x3e")),-1<a.indexOf("\x3cbr\x3e\x3cbr\x3e")&&(a="\x3cp\x3e"+a.replace(/(<br>){2,}/g,function(a){return c(a.length/4)})+"\x3c/p\x3e"));return C(b,a)}function D(){function b(){var a=
-{},b;for(b in CKEDITOR.dtd)"$"!=b.charAt(0)&&"div"!=b&&"span"!=b&&(a[b]=1);return a}var a={};return{get:function(c){return"plain-text"==c?a.plainText||(a.plainText=new CKEDITOR.filter("br")):"semantic-content"==c?((c=a.semanticContent)||(c=new CKEDITOR.filter,c.allow({$1:{elements:b(),attributes:!0,styles:!1,classes:!1}}),c=a.semanticContent=c),c):c?new CKEDITOR.filter(c):null}}}function y(b,a,c){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var e=new CKEDITOR.htmlParser.basicWriter;c.applyTo(a,!0,!1,
-b.activeEnterMode);a.writeHtml(e);return e.getHtml()}function C(b,a){b.enterMode==CKEDITOR.ENTER_BR?a=a.replace(/(<\/p><p>)+/g,function(a){return CKEDITOR.tools.repeat("\x3cbr\x3e",a.length/7*2)}).replace(/<\/?p>/g,""):b.enterMode==CKEDITOR.ENTER_DIV&&(a=a.replace(/<(\/)?p>/g,"\x3c$1div\x3e"));return a}function E(b){b.data.preventDefault();b.data.$.dataTransfer.dropEffect="none"}function F(b){var a=CKEDITOR.plugins.clipboard;b.on("contentDom",function(){function c(a,c,d){c.select();q(b,{dataTransfer:d,
-method:"drop"},1);d.sourceEditor.fire("saveSnapshot");d.sourceEditor.editable().extractHtmlFromRange(a);d.sourceEditor.getSelection().selectRanges([a]);d.sourceEditor.fire("saveSnapshot")}function e(d,c){d.select();q(b,{dataTransfer:c,method:"drop"},1);a.resetDragDataTransfer()}function f(a,d,c){var g={$:a.data.$,target:a.data.getTarget()};d&&(g.dragRange=d);c&&(g.dropRange=c);!1===b.fire(a.name,g)&&a.data.preventDefault()}function g(a){a.type!=CKEDITOR.NODE_ELEMENT&&(a=a.getParent());return a.getChildCount()}
-var d=b.editable(),h=CKEDITOR.plugins.clipboard.getDropTarget(b),n=b.ui.space("top"),w=b.ui.space("bottom");a.preventDefaultDropOnElement(n);a.preventDefaultDropOnElement(w);d.attachListener(h,"dragstart",f);d.attachListener(b,"dragstart",a.resetDragDataTransfer,a,null,1);d.attachListener(b,"dragstart",function(d){a.initDragDataTransfer(d,b)},null,null,2);d.attachListener(b,"dragstart",function(){var d=a.dragRange=b.getSelection().getRanges()[0];CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(a.dragStartContainerChildCount=
-d?g(d.startContainer):null,a.dragEndContainerChildCount=d?g(d.endContainer):null)},null,null,100);d.attachListener(h,"dragend",f);d.attachListener(b,"dragend",a.initDragDataTransfer,a,null,1);d.attachListener(b,"dragend",a.resetDragDataTransfer,a,null,100);d.attachListener(h,"dragover",function(a){var b=a.data.getTarget();b&&b.is&&b.is("html")?a.data.preventDefault():CKEDITOR.env.ie&&CKEDITOR.plugins.clipboard.isFileApiSupported&&a.data.$.dataTransfer.types.contains("Files")&&a.data.preventDefault()});
-d.attachListener(h,"drop",function(d){if(!d.data.$.defaultPrevented){d.data.preventDefault();var c=d.data.getTarget();if(!c.isReadOnly()||c.type==CKEDITOR.NODE_ELEMENT&&c.is("html")){var c=a.getRangeAtDropPosition(d,b),g=a.dragRange;c&&f(d,g,c)}}},null,null,9999);d.attachListener(b,"drop",a.initDragDataTransfer,a,null,1);d.attachListener(b,"drop",function(d){if(d=d.data){var g=d.dropRange,h=d.dragRange,f=d.dataTransfer;f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_INTERNAL?setTimeout(function(){a.internalDrop(h,
-g,f,b)},0):f.getTransferType(b)==CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?c(h,g,f):e(g,f)}},null,null,9999)})}CKEDITOR.plugins.add("clipboard",{requires:"dialog",init:function(b){var a,c=D();b.config.forcePasteAsPlainText?a="plain-text":b.config.pasteFilter?a=b.config.pasteFilter:!CKEDITOR.env.webkit||"pasteFilter"in b.config||(a="semantic-content");b.pasteFilter=c.get(a);z(b);F(b);CKEDITOR.dialog.add("paste",CKEDITOR.getUrl(this.path+"dialogs/paste.js"));if(CKEDITOR.env.gecko){var e=["image/png","image/jpeg",
-"image/gif"],f;b.on("paste",function(a){var d=a.data,c=d.dataTransfer;if(!d.dataValue&&"paste"==d.method&&c&&1==c.getFilesCount()&&f!=c.id&&(c=c.getFile(0),-1!=CKEDITOR.tools.indexOf(e,c.type))){var n=new FileReader;n.addEventListener("load",function(){a.data.dataValue='\x3cimg src\x3d"'+n.result+'" /\x3e';b.fire("paste",a.data)},!1);n.addEventListener("abort",function(){b.fire("paste",a.data)},!1);n.addEventListener("error",function(){b.fire("paste",a.data)},!1);n.readAsDataURL(c);f=d.dataTransfer.id;
-a.stop()}},null,null,1)}b.on("paste",function(a){a.data.dataTransfer||(a.data.dataTransfer=new CKEDITOR.plugins.clipboard.dataTransfer);if(!a.data.dataValue){var d=a.data.dataTransfer,c=d.getData("text/html");if(c)a.data.dataValue=c,a.data.type="html";else if(c=d.getData("text/plain"))a.data.dataValue=b.editable().transformPlainTextToHtml(c),a.data.type="text"}},null,null,1);b.on("paste",function(a){var b=a.data.dataValue,c=CKEDITOR.dtd.$block;-1<b.indexOf("Apple-")&&(b=b.replace(/<span class="Apple-converted-space">&nbsp;<\/span>/gi,
-" "),"html"!=a.data.type&&(b=b.replace(/<span class="Apple-tab-span"[^>]*>([^<]*)<\/span>/gi,function(a,b){return b.replace(/\t/g,"\x26nbsp;\x26nbsp; \x26nbsp;")})),-1<b.indexOf('\x3cbr class\x3d"Apple-interchange-newline"\x3e')&&(a.data.startsWithEOL=1,a.data.preSniffing="html",b=b.replace(/<br class="Apple-interchange-newline">/,"")),b=b.replace(/(<[^>]+) class="Apple-[^"]*"/gi,"$1"));if(b.match(/^<[^<]+cke_(editable|contents)/i)){var e,f,k=new CKEDITOR.dom.element("div");for(k.setHtml(b);1==k.getChildCount()&&
-(e=k.getFirst())&&e.type==CKEDITOR.NODE_ELEMENT&&(e.hasClass("cke_editable")||e.hasClass("cke_contents"));)k=f=e;f&&(b=f.getHtml().replace(/<br>$/i,""))}CKEDITOR.env.ie?b=b.replace(/^&nbsp;(?: |\r\n)?<(\w+)/g,function(b,d){return d.toLowerCase()in c?(a.data.preSniffing="html","\x3c"+d):b}):CKEDITOR.env.webkit?b=b.replace(/<\/(\w+)><div><br><\/div>$/,function(b,d){return d in c?(a.data.endsWithEOL=1,"\x3c/"+d+"\x3e"):b}):CKEDITOR.env.gecko&&(b=b.replace(/(\s)<br>$/,"$1"));a.data.dataValue=b},null,
-null,3);b.on("paste",function(a){a=a.data;var d=a.type,e=a.dataValue,f,p=b.config.clipboard_defaultContentType||"html",k=a.dataTransfer.getTransferType(b);f="html"==d||"html"==a.preSniffing?"html":A(e);"htmlifiedtext"==f&&(e=B(b.config,e));"text"==d&&"html"==f?e=y(b,e,c.get("plain-text")):k==CKEDITOR.DATA_TRANSFER_EXTERNAL&&b.pasteFilter&&!a.dontFilter&&(e=y(b,e,b.pasteFilter));a.startsWithEOL&&(e='\x3cbr data-cke-eol\x3d"1"\x3e'+e);a.endsWithEOL&&(e+='\x3cbr data-cke-eol\x3d"1"\x3e');"auto"==d&&
-(d="html"==f||"html"==p?"html":"text");a.type=d;a.dataValue=e;delete a.preSniffing;delete a.startsWithEOL;delete a.endsWithEOL},null,null,6);b.on("paste",function(a){a=a.data;a.dataValue&&(b.insertHtml(a.dataValue,a.type,a.range),setTimeout(function(){b.fire("afterPaste")},0))},null,null,1E3);b.on("pasteDialog",function(a){setTimeout(function(){b.openDialog("paste",a.data)},0)})}});CKEDITOR.plugins.clipboard={isCustomCopyCutSupported:!CKEDITOR.env.ie&&!CKEDITOR.env.iOS,isCustomDataTypesSupported:!CKEDITOR.env.ie,
-isFileApiSupported:!CKEDITOR.env.ie||9<CKEDITOR.env.version,mainPasteEvent:CKEDITOR.env.ie&&!CKEDITOR.env.edge?"beforepaste":"paste",canClipboardApiBeTrusted:function(b,a){return b.getTransferType(a)!=CKEDITOR.DATA_TRANSFER_EXTERNAL||CKEDITOR.env.chrome&&!b.isEmpty()||CKEDITOR.env.gecko&&(b.getData("text/html")||b.getFilesCount())?!0:!1},getDropTarget:function(b){var a=b.editable();return CKEDITOR.env.ie&&9>CKEDITOR.env.version||a.isInline()?a:b.document},fixSplitNodesAfterDrop:function(b,a,c,e){function f(b,
-c,e){var f=b;f.type==CKEDITOR.NODE_TEXT&&(f=b.getParent());if(f.equals(c)&&e!=c.getChildCount())return b=a.startContainer.getChild(a.startOffset-1),c=a.startContainer.getChild(a.startOffset),b&&b.type==CKEDITOR.NODE_TEXT&&c&&c.type==CKEDITOR.NODE_TEXT&&(e=b.getLength(),b.setText(b.getText()+c.getText()),c.remove(),a.setStart(b,e),a.collapse(!0)),!0}var g=a.startContainer;"number"==typeof e&&"number"==typeof c&&g.type==CKEDITOR.NODE_ELEMENT&&(f(b.startContainer,g,c)||f(b.endContainer,g,e))},isDropRangeAffectedByDragRange:function(b,
-a){var c=a.startContainer,e=a.endOffset;return b.endContainer.equals(c)&&b.endOffset<=e||b.startContainer.getParent().equals(c)&&b.startContainer.getIndex()<e||b.endContainer.getParent().equals(c)&&b.endContainer.getIndex()<e?!0:!1},internalDrop:function(b,a,c,e){var f=CKEDITOR.plugins.clipboard,g=e.editable(),d,h;e.fire("saveSnapshot");e.fire("lockSnapshot",{dontUpdate:1});CKEDITOR.env.ie&&10>CKEDITOR.env.version&&this.fixSplitNodesAfterDrop(b,a,f.dragStartContainerChildCount,f.dragEndContainerChildCount);
-(h=this.isDropRangeAffectedByDragRange(b,a))||(d=b.createBookmark(!1));f=a.clone().createBookmark(!1);h&&(d=b.createBookmark(!1));b=d.startNode;a=d.endNode;h=f.startNode;a&&b.getPosition(h)&CKEDITOR.POSITION_PRECEDING&&a.getPosition(h)&CKEDITOR.POSITION_FOLLOWING&&h.insertBefore(b);b=e.createRange();b.moveToBookmark(d);g.extractHtmlFromRange(b,1);a=e.createRange();a.moveToBookmark(f);q(e,{dataTransfer:c,method:"drop",range:a},1);e.fire("unlockSnapshot")},getRangeAtDropPosition:function(b,a){var c=
-b.data.$,e=c.clientX,f=c.clientY,g=a.getSelection(!0).getRanges()[0],d=a.createRange();if(b.data.testRange)return b.data.testRange;if(document.caretRangeFromPoint)c=a.document.$.caretRangeFromPoint(e,f),d.setStart(CKEDITOR.dom.node(c.startContainer),c.startOffset),d.collapse(!0);else if(c.rangeParent)d.setStart(CKEDITOR.dom.node(c.rangeParent),c.rangeOffset),d.collapse(!0);else{if(CKEDITOR.env.ie&&8<CKEDITOR.env.version&&g&&a.editable().hasFocus)return g;if(document.body.createTextRange){a.focus();
-c=a.document.getBody().$.createTextRange();try{for(var h=!1,n=0;20>n&&!h;n++){if(!h)try{c.moveToPoint(e,f-n),h=!0}catch(p){}if(!h)try{c.moveToPoint(e,f+n),h=!0}catch(k){}}if(h){var u="cke-temp-"+(new Date).getTime();c.pasteHTML('\x3cspan id\x3d"'+u+'"\x3e​\x3c/span\x3e');var r=a.document.getById(u);d.moveToPosition(r,CKEDITOR.POSITION_BEFORE_START);r.remove()}else{var t=a.document.$.elementFromPoint(e,f),m=new CKEDITOR.dom.element(t),q;if(m.equals(a.editable())||"html"==m.getName())return g&&g.startContainer&&
-!g.startContainer.equals(a.editable())?g:null;q=m.getClientRect();e<q.left?d.setStartAt(m,CKEDITOR.POSITION_AFTER_START):d.setStartAt(m,CKEDITOR.POSITION_BEFORE_END);d.collapse(!0)}}catch(v){return null}}else return null}return d},initDragDataTransfer:function(b,a){var c=b.data.$?b.data.$.dataTransfer:null,e=new this.dataTransfer(c,a);c?this.dragData&&e.id==this.dragData.id?e=this.dragData:this.dragData=e:this.dragData?e=this.dragData:this.dragData=e;b.data.dataTransfer=e},resetDragDataTransfer:function(){this.dragData=
-null},initPasteDataTransfer:function(b,a){if(this.isCustomCopyCutSupported){if(b&&b.data&&b.data.$){var c=new this.dataTransfer(b.data.$.clipboardData,a);this.copyCutData&&c.id==this.copyCutData.id?(c=this.copyCutData,c.$=b.data.$.clipboardData):this.copyCutData=c;return c}return new this.dataTransfer(null,a)}return new this.dataTransfer(CKEDITOR.env.edge&&b&&b.data.$&&b.data.$.clipboardData||null,a)},preventDefaultDropOnElement:function(b){b&&b.on("dragover",E)}};var p=CKEDITOR.plugins.clipboard.isCustomDataTypesSupported?
-"cke/id":"Text";CKEDITOR.plugins.clipboard.dataTransfer=function(b,a){b&&(this.$=b);this._={metaRegExp:/^<meta.*?>/i,bodyRegExp:/<body(?:[\s\S]*?)>([\s\S]*)<\/body>/i,fragmentRegExp:/\x3c!--(?:Start|End)Fragment--\x3e/g,data:{},files:[],normalizeType:function(a){a=a.toLowerCase();return"text"==a||"text/plain"==a?"Text":"url"==a?"URL":a}};this.id=this.getData(p);this.id||(this.id="Text"==p?"":"cke-"+CKEDITOR.tools.getUniqueId());if("Text"!=p)try{this.$.setData(p,this.id)}catch(c){}a&&(this.sourceEditor=
-a,this.setData("text/html",a.getSelectedHtml(1)),"Text"==p||this.getData("text/plain")||this.setData("text/plain",a.getSelection().getSelectedText()))};CKEDITOR.DATA_TRANSFER_INTERNAL=1;CKEDITOR.DATA_TRANSFER_CROSS_EDITORS=2;CKEDITOR.DATA_TRANSFER_EXTERNAL=3;CKEDITOR.plugins.clipboard.dataTransfer.prototype={getData:function(b){b=this._.normalizeType(b);var a=this._.data[b];if(void 0===a||null===a||""===a)try{a=this.$.getData(b)}catch(c){}if(void 0===a||null===a||""===a)a="";"text/html"==b?(a=a.replace(this._.metaRegExp,
-""),(b=this._.bodyRegExp.exec(a))&&b.length&&(a=b[1],a=a.replace(this._.fragmentRegExp,""))):"Text"==b&&CKEDITOR.env.gecko&&this.getFilesCount()&&"file://"==a.substring(0,7)&&(a="");return a},setData:function(b,a){b=this._.normalizeType(b);this._.data[b]=a;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported||"URL"==b||"Text"==b){"Text"==p&&"Text"==b&&(this.id=a);try{this.$.setData(b,a)}catch(c){}}},getTransferType:function(b){return this.sourceEditor?this.sourceEditor==b?CKEDITOR.DATA_TRANSFER_INTERNAL:
-CKEDITOR.DATA_TRANSFER_CROSS_EDITORS:CKEDITOR.DATA_TRANSFER_EXTERNAL},cacheData:function(){function b(b){b=a._.normalizeType(b);var c=a.getData(b);c&&(a._.data[b]=c)}if(this.$){var a=this,c,e;if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(c=0;c<this.$.types.length;c++)b(this.$.types[c])}else b("Text"),b("URL");e=this._getImageFromClipboard();if(this.$&&this.$.files||e){this._.files=[];if(this.$.files&&this.$.files.length)for(c=0;c<this.$.files.length;c++)this._.files.push(this.$.files[c]);
-0===this._.files.length&&e&&this._.files.push(e)}}},getFilesCount:function(){return this._.files.length?this._.files.length:this.$&&this.$.files&&this.$.files.length?this.$.files.length:this._getImageFromClipboard()?1:0},getFile:function(b){return this._.files.length?this._.files[b]:this.$&&this.$.files&&this.$.files.length?this.$.files[b]:0===b?this._getImageFromClipboard():void 0},isEmpty:function(){var b={},a;if(this.getFilesCount())return!1;for(a in this._.data)b[a]=1;if(this.$)if(CKEDITOR.plugins.clipboard.isCustomDataTypesSupported){if(this.$.types)for(var c=
-0;c<this.$.types.length;c++)b[this.$.types[c]]=1}else b.Text=1,b.URL=1;"Text"!=p&&(b[p]=0);for(a in b)if(b[a]&&""!==this.getData(a))return!1;return!0},_getImageFromClipboard:function(){var b;if(this.$&&this.$.items&&this.$.items[0])try{if((b=this.$.items[0].getAsFile())&&b.type)return b}catch(a){}}}})();(function(){var d=/^(https?|ftp):\/\/(-\.)?([^\s\/?\.#-]+\.?)+(\/[^\s]*)?[^\s\.,]$/ig,e=/"/g;CKEDITOR.plugins.add("autolink",{requires:"clipboard",init:function(c){c.on("paste",function(b){var a=b.data.dataValue;b.data.dataTransfer.getTransferType(c)==CKEDITOR.DATA_TRANSFER_INTERNAL||-1<a.indexOf("\x3c")||(a=a.replace(d,'\x3ca href\x3d"'+a.replace(e,"%22")+'"\x3e$\x26\x3c/a\x3e'),a!=b.data.dataValue&&(b.data.type="html"),b.data.dataValue=a)})}})})();CKEDITOR.plugins.add("base64image",{lang:"af ar bg bn bs ca cs cy da de el en en-au en-ca en-gb eo es et eu fa fi fo fr fr-ca gl gu he hi hr hu id is it ja ka km ko ku lt lv mk mn ms nb nl no pl pt pt-br ro ru si sk sl sq sr sr-latn sv th tr ug uk vi zh zh-cn".split(" "),requires:"dialog",icons:"base64image",hidpi:!0,init:function(a){a.ui.addButton("base64image",{label:a.lang.common.image,command:"base64imageDialog",toolbar:"insert"});CKEDITOR.dialog.add("base64imageDialog",this.path+"dialogs/base64image.js");
-a.addCommand("base64imageDialog",new CKEDITOR.dialogCommand("base64imageDialog",{allowedContent:"img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}",requiredContent:"img[alt,src]",contentTransformations:[["img{width}: sizeToStyle","img[width]: sizeToAttribute"],["img{float}: alignmentToStyle","img[align]: alignmentToAttribute"]]}));a.on("doubleclick",function(b){b.data.element&&(!b.data.element.isReadOnly()&&"img"===b.data.element.getName())&&
-(b.data.dialog="base64imageDialog",a.getSelection().selectElement(b.data.element))});a.addMenuItem&&(a.addMenuGroup("base64imageGroup"),a.addMenuItem("base64imageItem",{label:a.lang.common.image,icon:this.path+"icons/base64image.png",command:"base64imageDialog",group:"base64imageGroup"}));a.contextMenu&&a.contextMenu.addListener(function(b){if(b&&b.getName()==="img"){a.getSelection().selectElement(b);return{base64imageItem:CKEDITOR.TRISTATE_ON}}return null})}});CKEDITOR.plugins.add("basicstyles",{init:function(c){var e=0,d=function(g,d,b,a){if(a){a=new CKEDITOR.style(a);var f=h[b];f.unshift(a);c.attachStyleStateChange(a,function(a){!c.readOnly&&c.getCommand(b).setState(a)});c.addCommand(b,new CKEDITOR.styleCommand(a,{contentForms:f}));c.ui.addButton&&c.ui.addButton(g,{label:d,command:b,toolbar:"basicstyles,"+(e+=10)})}},h={bold:["strong","b",["span",function(a){a=a.styles["font-weight"];return"bold"==a||700<=+a}]],italic:["em","i",["span",function(a){return"italic"==
-a.styles["font-style"]}]],underline:["u",["span",function(a){return"underline"==a.styles["text-decoration"]}]],strike:["s","strike",["span",function(a){return"line-through"==a.styles["text-decoration"]}]],subscript:["sub"],superscript:["sup"]},b=c.config,a=c.lang.basicstyles;d("Bold",a.bold,"bold",b.coreStyles_bold);d("Italic",a.italic,"italic",b.coreStyles_italic);d("Underline",a.underline,"underline",b.coreStyles_underline);d("Strike",a.strike,"strike",b.coreStyles_strike);d("Subscript",a.subscript,
-"subscript",b.coreStyles_subscript);d("Superscript",a.superscript,"superscript",b.coreStyles_superscript);c.setKeystroke([[CKEDITOR.CTRL+66,"bold"],[CKEDITOR.CTRL+73,"italic"],[CKEDITOR.CTRL+85,"underline"]])}});CKEDITOR.config.coreStyles_bold={element:"strong",overrides:"b"};CKEDITOR.config.coreStyles_italic={element:"em",overrides:"i"};CKEDITOR.config.coreStyles_underline={element:"u"};CKEDITOR.config.coreStyles_strike={element:"s",overrides:"strike"};CKEDITOR.config.coreStyles_subscript={element:"sub"};
-CKEDITOR.config.coreStyles_superscript={element:"sup"};(function(){function q(a,f,d,b){if(!a.isReadOnly()&&!a.equals(d.editable())){CKEDITOR.dom.element.setMarker(b,a,"bidi_processed",1);b=a;for(var c=d.editable();(b=b.getParent())&&!b.equals(c);)if(b.getCustomData("bidi_processed")){a.removeStyle("direction");a.removeAttribute("dir");return}b="useComputedState"in d.config?d.config.useComputedState:1;(b?a.getComputedStyle("direction"):a.getStyle("direction")||a.hasAttribute("dir"))!=f&&(a.removeStyle("direction"),b?(a.removeAttribute("dir"),f!=a.getComputedStyle("direction")&&
-a.setAttribute("dir",f)):a.setAttribute("dir",f),d.forceNextSelectionCheck())}}function v(a,f,d){var b=a.getCommonAncestor(!1,!0);a=a.clone();a.enlarge(d==CKEDITOR.ENTER_BR?CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS:CKEDITOR.ENLARGE_BLOCK_CONTENTS);if(a.checkBoundaryOfElement(b,CKEDITOR.START)&&a.checkBoundaryOfElement(b,CKEDITOR.END)){for(var c;b&&b.type==CKEDITOR.NODE_ELEMENT&&(c=b.getParent())&&1==c.getChildCount()&&!(b.getName()in f);)b=c;return b.type==CKEDITOR.NODE_ELEMENT&&b.getName()in f&&b}}function p(a){return{context:"p",
-allowedContent:{"h1 h2 h3 h4 h5 h6 table ul ol blockquote div tr p div li td":{propertiesOnly:!0,attributes:"dir"}},requiredContent:"p[dir]",refresh:function(a,d){var b=a.config.useComputedState,c,b=void 0===b||b;if(!b){c=d.lastElement;for(var h=a.editable();c&&!(c.getName()in u||c.equals(h));){var e=c.getParent();if(!e)break;c=e}}c=c||d.block||d.blockLimit;c.equals(a.editable())&&(h=a.getSelection().getRanges()[0].getEnclosedNode())&&h.type==CKEDITOR.NODE_ELEMENT&&(c=h);c&&(b=b?c.getComputedStyle("direction"):
-c.getStyle("direction")||c.getAttribute("dir"),a.getCommand("bidirtl").setState("rtl"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF),a.getCommand("bidiltr").setState("ltr"==b?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF));b=(d.block||d.blockLimit||a.editable()).getDirection(1);b!=(a._.selDir||a.lang.dir)&&(a._.selDir=b,a.fire("contentDirChanged",b))},exec:function(f){var d=f.getSelection(),b=f.config.enterMode,c=d.getRanges();if(c&&c.length){for(var h={},e=d.createBookmarks(),c=c.createIterator(),g,
-l=0;g=c.getNextRange(1);){var k=g.getEnclosedNode();k&&(!k||k.type==CKEDITOR.NODE_ELEMENT&&k.getName()in r)||(k=v(g,t,b));k&&q(k,a,f,h);var m=new CKEDITOR.dom.walker(g),n=e[l].startNode,p=e[l++].endNode;m.evaluator=function(a){var c=b==CKEDITOR.ENTER_P?"p":"div",d;if(d=(a?a.type==CKEDITOR.NODE_ELEMENT:!1)&&a.getName()in t){if(c=a.is(c))c=(c=a.getParent())?c.type==CKEDITOR.NODE_ELEMENT:!1;d=!(c&&a.getParent().is("blockquote"))}return!!(d&&a.getPosition(n)&CKEDITOR.POSITION_FOLLOWING&&(a.getPosition(p)&
-CKEDITOR.POSITION_PRECEDING+CKEDITOR.POSITION_CONTAINS)==CKEDITOR.POSITION_PRECEDING)};for(;k=m.next();)q(k,a,f,h);g=g.createIterator();for(g.enlargeBr=b!=CKEDITOR.ENTER_BR;k=g.getNextParagraph(b==CKEDITOR.ENTER_P?"p":"div");)q(k,a,f,h)}CKEDITOR.dom.element.clearAllMarkers(h);f.forceNextSelectionCheck();d.selectBookmarks(e);f.focus()}}}}function w(a){var f=a==l.setAttribute,d=a==l.removeAttribute,b=/\bdirection\s*:\s*(.*?)\s*(:?$|;)/;return function(c,h){if(!this.isReadOnly()){var e;if(e=c==(f||d?
-"dir":"direction")||"style"==c&&(d||b.test(h))){a:{e=this;for(var g=e.getDocument().getBody().getParent();e;){if(e.equals(g)){e=!1;break a}e=e.getParent()}e=!0}e=!e}if(e&&(e=this.getDirection(1),g=a.apply(this,arguments),e!=this.getDirection(1)))return this.getDocument().fire("dirChanged",this),g}return a.apply(this,arguments)}}var t={table:1,ul:1,ol:1,blockquote:1,div:1},r={},u={};CKEDITOR.tools.extend(r,t,{tr:1,p:1,div:1,li:1});CKEDITOR.tools.extend(u,r,{td:1});CKEDITOR.plugins.add("bidi",{init:function(a){function f(b,
-c,d,e,f){a.addCommand(d,new CKEDITOR.command(a,e));a.ui.addButton&&a.ui.addButton(b,{label:c,command:d,toolbar:"bidi,"+f})}if(!a.blockless){var d=a.lang.bidi;f("BidiLtr",d.ltr,"bidiltr",p("ltr"),10);f("BidiRtl",d.rtl,"bidirtl",p("rtl"),20);a.on("contentDom",function(){a.document.on("dirChanged",function(b){a.fire("dirChanged",{node:b.data,dir:b.data.getDirection(1)})})});a.on("contentDirChanged",function(b){b=(a.lang.dir!=b.data?"add":"remove")+"Class";var c=a.ui.space(a.config.toolbarLocation);if(c)c[b]("cke_mixed_dir_content")})}}});
-for(var l=CKEDITOR.dom.element.prototype,n=["setStyle","removeStyle","setAttribute","removeAttribute"],m=0;m<n.length;m++)l[n[m]]=CKEDITOR.tools.override(l[n[m]],w)})();(function(){var m={exec:function(g){var a=g.getCommand("blockquote").state,k=g.getSelection(),c=k&&k.getRanges()[0];if(c){var h=k.createBookmarks();if(CKEDITOR.env.ie){var e=h[0].startNode,b=h[0].endNode,d;if(e&&"blockquote"==e.getParent().getName())for(d=e;d=d.getNext();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){e.move(d,!0);break}if(b&&"blockquote"==b.getParent().getName())for(d=b;d=d.getPrevious();)if(d.type==CKEDITOR.NODE_ELEMENT&&d.isBlockBoundary()){b.move(d);break}}var f=c.createIterator();
-f.enlargeBr=g.config.enterMode!=CKEDITOR.ENTER_BR;if(a==CKEDITOR.TRISTATE_OFF){for(e=[];a=f.getNextParagraph();)e.push(a);1>e.length&&(a=g.document.createElement(g.config.enterMode==CKEDITOR.ENTER_P?"p":"div"),b=h.shift(),c.insertNode(a),a.append(new CKEDITOR.dom.text("",g.document)),c.moveToBookmark(b),c.selectNodeContents(a),c.collapse(!0),b=c.createBookmark(),e.push(a),h.unshift(b));d=e[0].getParent();c=[];for(b=0;b<e.length;b++)a=e[b],d=d.getCommonAncestor(a.getParent());for(a={table:1,tbody:1,
-tr:1,ol:1,ul:1};a[d.getName()];)d=d.getParent();for(b=null;0<e.length;){for(a=e.shift();!a.getParent().equals(d);)a=a.getParent();a.equals(b)||c.push(a);b=a}for(;0<c.length;)if(a=c.shift(),"blockquote"==a.getName()){for(b=new CKEDITOR.dom.documentFragment(g.document);a.getFirst();)b.append(a.getFirst().remove()),e.push(b.getLast());b.replace(a)}else e.push(a);c=g.document.createElement("blockquote");for(c.insertBefore(e[0]);0<e.length;)a=e.shift(),c.append(a)}else if(a==CKEDITOR.TRISTATE_ON){b=[];
-for(d={};a=f.getNextParagraph();){for(e=c=null;a.getParent();){if("blockquote"==a.getParent().getName()){c=a.getParent();e=a;break}a=a.getParent()}c&&e&&!e.getCustomData("blockquote_moveout")&&(b.push(e),CKEDITOR.dom.element.setMarker(d,e,"blockquote_moveout",!0))}CKEDITOR.dom.element.clearAllMarkers(d);a=[];e=[];for(d={};0<b.length;)f=b.shift(),c=f.getParent(),f.getPrevious()?f.getNext()?(f.breakParent(f.getParent()),e.push(f.getNext())):f.remove().insertAfter(c):f.remove().insertBefore(c),c.getCustomData("blockquote_processed")||
-(e.push(c),CKEDITOR.dom.element.setMarker(d,c,"blockquote_processed",!0)),a.push(f);CKEDITOR.dom.element.clearAllMarkers(d);for(b=e.length-1;0<=b;b--){c=e[b];a:{d=c;for(var f=0,m=d.getChildCount(),l=void 0;f<m&&(l=d.getChild(f));f++)if(l.type==CKEDITOR.NODE_ELEMENT&&l.isBlockBoundary()){d=!1;break a}d=!0}d&&c.remove()}if(g.config.enterMode==CKEDITOR.ENTER_BR)for(c=!0;a.length;)if(f=a.shift(),"div"==f.getName()){b=new CKEDITOR.dom.documentFragment(g.document);!c||!f.getPrevious()||f.getPrevious().type==
-CKEDITOR.NODE_ELEMENT&&f.getPrevious().isBlockBoundary()||b.append(g.document.createElement("br"));for(c=f.getNext()&&!(f.getNext().type==CKEDITOR.NODE_ELEMENT&&f.getNext().isBlockBoundary());f.getFirst();)f.getFirst().remove().appendTo(b);c&&b.append(g.document.createElement("br"));b.replace(f);c=!1}}k.selectBookmarks(h);g.focus()}},refresh:function(g,a){this.setState(g.elementPath(a.block||a.blockLimit).contains("blockquote",1)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)},context:"blockquote",allowedContent:"blockquote",
-requiredContent:"blockquote"};CKEDITOR.plugins.add("blockquote",{init:function(g){g.blockless||(g.addCommand("blockquote",m),g.ui.addButton&&g.ui.addButton("Blockquote",{label:g.lang.blockquote.toolbar,command:"blockquote",toolbar:"blocks,10"}))}})})();(function(){var c='\x3ca id\x3d"{id}" class\x3d"cke_button cke_button__{name} cke_button_{state} {cls}"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' title\x3d"{title}" tabindex\x3d"-1" hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-describedby\x3d"{id}_description" aria-haspopup\x3d"{hasArrow}" aria-disabled\x3d"{ariaDisabled}"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(c+=' onkeypress\x3d"return false;"');CKEDITOR.env.gecko&&(c+=
-' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var c=c+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan class\x3d"cke_button_icon cke_button__{iconName}_icon" style\x3d"{style}"'),c=c+'\x3e\x26nbsp;\x3c/span\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_button_label cke_button__{name}_label" aria-hidden\x3d"false"\x3e{label}\x3c/span\x3e\x3cspan id\x3d"{id}_description" class\x3d"cke_button_label" aria-hidden\x3d"false"\x3e{ariaShortcut}\x3c/span\x3e{arrowHtml}\x3c/a\x3e',
-t=CKEDITOR.addTemplate("buttonArrow",'\x3cspan class\x3d"cke_button_arrow"\x3e'+(CKEDITOR.env.hc?"\x26#9660;":"")+"\x3c/span\x3e"),u=CKEDITOR.addTemplate("button",c);CKEDITOR.plugins.add("button",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_BUTTON,CKEDITOR.ui.button.handler)}});CKEDITOR.UI_BUTTON="button";CKEDITOR.ui.button=function(a){CKEDITOR.tools.extend(this,a,{title:a.label,click:a.click||function(b){b.execCommand(a.command)}});this._={}};CKEDITOR.ui.button.handler={create:function(a){return new CKEDITOR.ui.button(a)}};
-CKEDITOR.ui.button.prototype={render:function(a,b){function c(){var f=a.mode;f&&(f=this.modes[f]?void 0!==m[f]?m[f]:CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED,f=a.readOnly&&!this.readOnly?CKEDITOR.TRISTATE_DISABLED:f,this.setState(f),this.refresh&&this.refresh())}var n=CKEDITOR.env,p=this._.id=CKEDITOR.tools.getNextId(),g="",d=this.command,q,k,h;this._.editor=a;var e={id:p,button:this,editor:a,focus:function(){CKEDITOR.document.getById(p).focus()},execute:function(){this.button.click(a)},attach:function(a){this.button.attach(a)}},
-v=CKEDITOR.tools.addFunction(function(a){if(e.onkey)return a=new CKEDITOR.dom.event(a),!1!==e.onkey(e,a.getKeystroke())}),w=CKEDITOR.tools.addFunction(function(a){var b;e.onfocus&&(b=!1!==e.onfocus(e,new CKEDITOR.dom.event(a)));return b}),r=0;e.clickFn=q=CKEDITOR.tools.addFunction(function(){r&&(a.unlockSelection(1),r=0);e.execute();n.iOS&&a.focus()});if(this.modes){var m={};a.on("beforeModeUnload",function(){a.mode&&this._.state!=CKEDITOR.TRISTATE_DISABLED&&(m[a.mode]=this._.state)},this);a.on("activeFilterChange",
-c,this);a.on("mode",c,this);!this.readOnly&&a.on("readOnly",c,this)}else d&&(d=a.getCommand(d))&&(d.on("state",function(){this.setState(d.state)},this),g+=d.state==CKEDITOR.TRISTATE_ON?"on":d.state==CKEDITOR.TRISTATE_DISABLED?"disabled":"off");if(this.directional)a.on("contentDirChanged",function(b){var c=CKEDITOR.document.getById(this._.id),d=c.getFirst();b=b.data;b!=a.lang.dir?c.addClass("cke_"+b):c.removeClass("cke_ltr").removeClass("cke_rtl");d.setAttribute("style",CKEDITOR.skin.getIconStyle(l,
-"rtl"==b,this.icon,this.iconOffset))},this);d?(k=a.getCommandKeystroke(d))&&(h=CKEDITOR.tools.keystrokeToString(a.lang.common.keyboard,k)):g+="off";var l=k=this.name||this.command;this.icon&&!/\./.test(this.icon)&&(l=this.icon,this.icon=null);g={id:p,name:k,iconName:l,label:this.label,cls:this.className||"",state:g,ariaDisabled:"disabled"==g?"true":"false",title:this.title+(h?" ("+h.display+")":""),ariaShortcut:h?a.lang.common.keyboardShortcut+" "+h.aria:"",titleJs:n.gecko&&!n.hc?"":(this.title||
-"").replace("'",""),hasArrow:this.hasArrow?"true":"false",keydownFn:v,focusFn:w,clickFn:q,style:CKEDITOR.skin.getIconStyle(l,"rtl"==a.lang.dir,this.icon,this.iconOffset),arrowHtml:this.hasArrow?t.output():""};u.output(g,b);if(this.onRender)this.onRender();return e},setState:function(a){if(this._.state==a)return!1;this._.state=a;var b=CKEDITOR.document.getById(this._.id);return b?(b.setState(a,"cke_button"),a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled"),
-this.hasArrow?(a=a==CKEDITOR.TRISTATE_ON?this._.editor.lang.button.selectedLabel.replace(/%1/g,this.label):this.label,CKEDITOR.document.getById(this._.id+"_label").setText(a)):a==CKEDITOR.TRISTATE_ON?b.setAttribute("aria-pressed",!0):b.removeAttribute("aria-pressed"),!0):!1},getState:function(){return this._.state},toFeature:function(a){if(this._.feature)return this._.feature;var b=this;this.allowedContent||this.requiredContent||!this.command||(b=a.getCommand(this.command)||b);return this._.feature=
-b}};CKEDITOR.ui.prototype.addButton=function(a,b){this.add(a,CKEDITOR.UI_BUTTON,b)}})();CKEDITOR.plugins.add("panelbutton",{requires:"button",onLoad:function(){function e(c){var a=this._;a.state!=CKEDITOR.TRISTATE_DISABLED&&(this.createPanel(c),a.on?a.panel.hide():a.panel.showBlock(this._.id,this.document.getById(this._.id),4))}CKEDITOR.ui.panelButton=CKEDITOR.tools.createClass({base:CKEDITOR.ui.button,$:function(c){var a=c.panel||{};delete c.panel;this.base(c);this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.block={attributes:a.attributes};this.hasArrow=a.toolbarRelated=
-!0;this.click=e;this._={panelDefinition:a}},statics:{handler:{create:function(c){return new CKEDITOR.ui.panelButton(c)}}},proto:{createPanel:function(c){var a=this._;if(!a.panel){var f=this._.panelDefinition,e=this._.panelDefinition.block,g=f.parent||CKEDITOR.document.getBody(),d=this._.panel=new CKEDITOR.ui.floatPanel(c,g,f),f=d.addBlock(a.id,e),b=this;d.onShow=function(){b.className&&this.element.addClass(b.className+"_panel");b.setState(CKEDITOR.TRISTATE_ON);a.on=1;b.editorFocus&&c.focus();if(b.onOpen)b.onOpen()};
-d.onHide=function(d){b.className&&this.element.getFirst().removeClass(b.className+"_panel");b.setState(b.modes&&b.modes[c.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);a.on=0;if(!d&&b.onClose)b.onClose()};d.onEscape=function(){d.hide(1);b.document.getById(a.id).focus()};if(this.onBlock)this.onBlock(d,f);f.onHide=function(){a.on=0;b.setState(CKEDITOR.TRISTATE_OFF)}}}}})},beforeInit:function(e){e.ui.addHandler(CKEDITOR.UI_PANELBUTTON,CKEDITOR.ui.panelButton.handler)}});
-CKEDITOR.UI_PANELBUTTON="panelbutton";(function(){CKEDITOR.plugins.add("panel",{beforeInit:function(a){a.ui.addHandler(CKEDITOR.UI_PANEL,CKEDITOR.ui.panel.handler)}});CKEDITOR.UI_PANEL="panel";CKEDITOR.ui.panel=function(a,b){b&&CKEDITOR.tools.extend(this,b);CKEDITOR.tools.extend(this,{className:"",css:[]});this.id=CKEDITOR.tools.getNextId();this.document=a;this.isFramed=this.forceIFrame||this.css.length;this._={blocks:{}}};CKEDITOR.ui.panel.handler={create:function(a){return new CKEDITOR.ui.panel(a)}};var f=CKEDITOR.addTemplate("panel",
-'\x3cdiv lang\x3d"{langCode}" id\x3d"{id}" dir\x3d{dir} class\x3d"cke cke_reset_all {editorId} cke_panel cke_panel {cls} cke_{dir}" style\x3d"z-index:{z-index}" role\x3d"presentation"\x3e{frame}\x3c/div\x3e'),g=CKEDITOR.addTemplate("panel-frame",'\x3ciframe id\x3d"{id}" class\x3d"cke_panel_frame" role\x3d"presentation" frameborder\x3d"0" src\x3d"{src}"\x3e\x3c/iframe\x3e'),h=CKEDITOR.addTemplate("panel-frame-inner",'\x3c!DOCTYPE html\x3e\x3chtml class\x3d"cke_panel_container {env}" dir\x3d"{dir}" lang\x3d"{langCode}"\x3e\x3chead\x3e{css}\x3c/head\x3e\x3cbody class\x3d"cke_{dir}" style\x3d"margin:0;padding:0" onload\x3d"{onload}"\x3e\x3c/body\x3e\x3c/html\x3e');
-CKEDITOR.ui.panel.prototype={render:function(a,b){this.getHolderElement=function(){var a=this._.holder;if(!a){if(this.isFramed){var a=this.document.getById(this.id+"_frame"),b=a.getParent(),a=a.getFrameDocument();CKEDITOR.env.iOS&&b.setStyles({overflow:"scroll","-webkit-overflow-scrolling":"touch"});b=CKEDITOR.tools.addFunction(CKEDITOR.tools.bind(function(){this.isLoaded=!0;if(this.onLoad)this.onLoad()},this));a.write(h.output(CKEDITOR.tools.extend({css:CKEDITOR.tools.buildStyleHtml(this.css),onload:"window.parent.CKEDITOR.tools.callFunction("+
-b+");"},d)));a.getWindow().$.CKEDITOR=CKEDITOR;a.on("keydown",function(a){var b=a.data.getKeystroke(),c=this.document.getById(this.id).getAttribute("dir");this._.onKeyDown&&!1===this._.onKeyDown(b)?a.data.preventDefault():(27==b||b==("rtl"==c?39:37))&&this.onEscape&&!1===this.onEscape(b)&&a.data.preventDefault()},this);a=a.getBody();a.unselectable();CKEDITOR.env.air&&CKEDITOR.tools.callFunction(b)}else a=this.document.getById(this.id);this._.holder=a}return a};var d={editorId:a.id,id:this.id,langCode:a.langCode,
-dir:a.lang.dir,cls:this.className,frame:"",env:CKEDITOR.env.cssClass,"z-index":a.config.baseFloatZIndex+1};if(this.isFramed){var e=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie?"javascript:void(function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+"}())":"";d.frame=g.output({id:this.id+"_frame",src:e})}e=f.output(d);b&&b.push(e);return e},addBlock:function(a,b){b=this._.blocks[a]=b instanceof CKEDITOR.ui.panel.block?b:new CKEDITOR.ui.panel.block(this.getHolderElement(),
-b);this._.currentBlock||this.showBlock(a);return b},getBlock:function(a){return this._.blocks[a]},showBlock:function(a){a=this._.blocks[a];var b=this._.currentBlock,d=!this.forceIFrame||CKEDITOR.env.ie?this._.holder:this.document.getById(this.id+"_frame");b&&b.hide();this._.currentBlock=a;CKEDITOR.fire("ariaWidget",d);a._.focusIndex=-1;this._.onKeyDown=a.onKeyDown&&CKEDITOR.tools.bind(a.onKeyDown,a);a.show();return a},destroy:function(){this.element&&this.element.remove()}};CKEDITOR.ui.panel.block=
-CKEDITOR.tools.createClass({$:function(a,b){this.element=a.append(a.getDocument().createElement("div",{attributes:{tabindex:-1,"class":"cke_panel_block"},styles:{display:"none"}}));b&&CKEDITOR.tools.extend(this,b);this.element.setAttributes({role:this.attributes.role||"presentation","aria-label":this.attributes["aria-label"],title:this.attributes.title||this.attributes["aria-label"]});this.keys={};this._.focusIndex=-1;this.element.disableContextMenu()},_:{markItem:function(a){-1!=a&&(a=this.element.getElementsByTag("a").getItem(this._.focusIndex=
-a),CKEDITOR.env.webkit&&a.getDocument().getWindow().focus(),a.focus(),this.onMark&&this.onMark(a))}},proto:{show:function(){this.element.setStyle("display","")},hide:function(){this.onHide&&!0===this.onHide.call(this)||this.element.setStyle("display","none")},onKeyDown:function(a,b){var d=this.keys[a];switch(d){case "next":for(var e=this._.focusIndex,d=this.element.getElementsByTag("a"),c;c=d.getItem(++e);)if(c.getAttribute("_cke_focus")&&c.$.offsetWidth){this._.focusIndex=e;c.focus();break}return c||
-b?!1:(this._.focusIndex=-1,this.onKeyDown(a,1));case "prev":e=this._.focusIndex;for(d=this.element.getElementsByTag("a");0<e&&(c=d.getItem(--e));){if(c.getAttribute("_cke_focus")&&c.$.offsetWidth){this._.focusIndex=e;c.focus();break}c=null}return c||b?!1:(this._.focusIndex=d.count(),this.onKeyDown(a,1));case "click":case "mouseup":return e=this._.focusIndex,(c=0<=e&&this.element.getElementsByTag("a").getItem(e))&&(c.$[d]?c.$[d]():c.$["on"+d]()),!1}return!0}}})})();CKEDITOR.plugins.add("floatpanel",{requires:"panel"});
-(function(){function v(a,b,c,l,h){h=CKEDITOR.tools.genKey(b.getUniqueId(),c.getUniqueId(),a.lang.dir,a.uiColor||"",l.css||"",h||"");var g=f[h];g||(g=f[h]=new CKEDITOR.ui.panel(b,l),g.element=c.append(CKEDITOR.dom.element.createFromHtml(g.render(a),b)),g.element.setStyles({display:"none",position:"absolute"}));return g}var f={};CKEDITOR.ui.floatPanel=CKEDITOR.tools.createClass({$:function(a,b,c,l){function h(){e.hide()}c.forceIFrame=1;c.toolbarRelated&&a.elementMode==CKEDITOR.ELEMENT_MODE_INLINE&&
-(b=CKEDITOR.document.getById("cke_"+a.name));var g=b.getDocument();l=v(a,g,b,c,l||0);var m=l.element,p=m.getFirst(),e=this;m.disableContextMenu();this.element=m;this._={editor:a,panel:l,parentElement:b,definition:c,document:g,iframe:p,children:[],dir:a.lang.dir,showBlockParams:null};a.on("mode",h);a.on("resize",h);g.getWindow().on("resize",function(){this.reposition()},this)},proto:{addBlock:function(a,b){return this._.panel.addBlock(a,b)},addListBlock:function(a,b){return this._.panel.addListBlock(a,
-b)},getBlock:function(a){return this._.panel.getBlock(a)},showBlock:function(a,b,c,l,h,g){var m=this._.panel,p=m.showBlock(a);this._.showBlockParams=[].slice.call(arguments);this.allowBlur(!1);var e=this._.editor.editable();this._.returnFocus=e.hasFocus?e:new CKEDITOR.dom.element(CKEDITOR.document.$.activeElement);this._.hideTimeout=0;var k=this.element,e=this._.iframe,e=CKEDITOR.env.ie&&!CKEDITOR.env.edge?e:new CKEDITOR.dom.window(e.$.contentWindow),f=k.getDocument(),r=this._.parentElement.getPositionedAncestor(),
-t=b.getDocumentPosition(f),f=r?r.getDocumentPosition(f):{x:0,y:0},q="rtl"==this._.dir,d=t.x+(l||0)-f.x,n=t.y+(h||0)-f.y;!q||1!=c&&4!=c?q||2!=c&&3!=c||(d+=b.$.offsetWidth-1):d+=b.$.offsetWidth;if(3==c||4==c)n+=b.$.offsetHeight-1;this._.panel._.offsetParentId=b.getId();k.setStyles({top:n+"px",left:0,display:""});k.setOpacity(0);k.getFirst().removeStyle("width");this._.editor.focusManager.add(e);this._.blurSet||(CKEDITOR.event.useCapture=!0,e.on("blur",function(a){function u(){delete this._.returnFocus;
-this.hide()}this.allowBlur()&&a.data.getPhase()==CKEDITOR.EVENT_PHASE_AT_TARGET&&this.visible&&!this._.activeChild&&(CKEDITOR.env.iOS?this._.hideTimeout||(this._.hideTimeout=CKEDITOR.tools.setTimeout(u,0,this)):u.call(this))},this),e.on("focus",function(){this._.focused=!0;this.hideChild();this.allowBlur(!0)},this),CKEDITOR.env.iOS&&(e.on("touchstart",function(){clearTimeout(this._.hideTimeout)},this),e.on("touchend",function(){this._.hideTimeout=0;this.focus()},this)),CKEDITOR.event.useCapture=!1,
-this._.blurSet=1);m.onEscape=CKEDITOR.tools.bind(function(a){if(this.onEscape&&!1===this.onEscape(a))return!1},this);CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.tools.bind(function(){var a=k;a.removeStyle("width");if(p.autoSize){var b=p.element.getDocument(),b=(CKEDITOR.env.webkit||CKEDITOR.env.edge?p.element:b.getBody()).$.scrollWidth;CKEDITOR.env.ie&&CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetWidth||0)-(a.$.clientWidth||0)+3);a.setStyle("width",b+10+"px");b=p.element.$.scrollHeight;CKEDITOR.env.ie&&
-CKEDITOR.env.quirks&&0<b&&(b+=(a.$.offsetHeight||0)-(a.$.clientHeight||0)+3);a.setStyle("height",b+"px");m._.currentBlock.element.setStyle("display","none").removeStyle("display")}else a.removeStyle("height");q&&(d-=k.$.offsetWidth);k.setStyle("left",d+"px");var b=m.element.getWindow(),a=k.$.getBoundingClientRect(),b=b.getViewPaneSize(),c=a.width||a.right-a.left,e=a.height||a.bottom-a.top,l=q?a.right:b.width-a.left,h=q?b.width-a.right:a.left;q?l<c&&(d=h>c?d+c:b.width>c?d-a.left:d-a.right+b.width):
-l<c&&(d=h>c?d-c:b.width>c?d-a.right+b.width:d-a.left);c=a.top;b.height-a.top<e&&(n=c>e?n-e:b.height>e?n-a.bottom+b.height:n-a.top);CKEDITOR.env.ie&&(b=a=new CKEDITOR.dom.element(k.$.offsetParent),"html"==b.getName()&&(b=b.getDocument().getBody()),"rtl"==b.getComputedStyle("direction")&&(d=CKEDITOR.env.ie8Compat?d-2*k.getDocument().getDocumentElement().$.scrollLeft:d-(a.$.scrollWidth-a.$.clientWidth)));var a=k.getFirst(),f;(f=a.getCustomData("activePanel"))&&f.onHide&&f.onHide.call(this,1);a.setCustomData("activePanel",
-this);k.setStyles({top:n+"px",left:d+"px"});k.setOpacity(1);g&&g()},this);m.isLoaded?a():m.onLoad=a;CKEDITOR.tools.setTimeout(function(){var a=CKEDITOR.env.webkit&&CKEDITOR.document.getWindow().getScrollPosition().y;this.focus();p.element.focus();CKEDITOR.env.webkit&&(CKEDITOR.document.getBody().$.scrollTop=a);this.allowBlur(!0);this._.editor.fire("panelShow",this)},0,this)},CKEDITOR.env.air?200:0,this);this.visible=1;this.onShow&&this.onShow.call(this)},reposition:function(){var a=this._.showBlockParams;
-this.visible&&this._.showBlockParams&&(this.hide(),this.showBlock.apply(this,a))},focus:function(){if(CKEDITOR.env.webkit){var a=CKEDITOR.document.getActive();a&&!a.equals(this._.iframe)&&a.$.blur()}(this._.lastFocused||this._.iframe.getFrameDocument().getWindow()).focus()},blur:function(){var a=this._.iframe.getFrameDocument().getActive();a&&a.is("a")&&(this._.lastFocused=a)},hide:function(a){if(this.visible&&(!this.onHide||!0!==this.onHide.call(this))){this.hideChild();CKEDITOR.env.gecko&&this._.iframe.getFrameDocument().$.activeElement.blur();
-this.element.setStyle("display","none");this.visible=0;this.element.getFirst().removeCustomData("activePanel");if(a=a&&this._.returnFocus)CKEDITOR.env.webkit&&a.type&&a.getWindow().$.focus(),a.focus();delete this._.lastFocused;this._.showBlockParams=null;this._.editor.fire("panelHide",this)}},allowBlur:function(a){var b=this._.panel;void 0!==a&&(b.allowBlur=a);return b.allowBlur},showAsChild:function(a,b,c,f,h,g){if(this._.activeChild!=a||a._.panel._.offsetParentId!=c.getId())this.hideChild(),a.onHide=
-CKEDITOR.tools.bind(function(){CKEDITOR.tools.setTimeout(function(){this._.focused||this.hide()},0,this)},this),this._.activeChild=a,this._.focused=!1,a.showBlock(b,c,f,h,g),this.blur(),(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&setTimeout(function(){a.element.getChild(0).$.style.cssText+=""},100)},hideChild:function(a){var b=this._.activeChild;b&&(delete b.onHide,delete this._.activeChild,b.hide(),a&&this.focus())}}});CKEDITOR.on("instanceDestroyed",function(){var a=CKEDITOR.tools.isEmpty(CKEDITOR.instances),
-b;for(b in f){var c=f[b];a?c.destroy():c.element.hide()}a&&(f={})})})();CKEDITOR.plugins.add("colorbutton",{requires:"panelbutton,floatpanel",init:function(e){function t(a,c,f,g,l){var m=new CKEDITOR.style(k["colorButton_"+c+"Style"]),n=CKEDITOR.tools.getNextId()+"_colorBox";l=l||{};e.ui.add(a,CKEDITOR.UI_PANELBUTTON,{label:f,title:f,modes:{wysiwyg:1},editorFocus:0,toolbar:"colors,"+g,allowedContent:m,requiredContent:m,contentTransformations:l.contentTransformations,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":h.panelTitle}},onBlock:function(a,
-b){b.autoSize=!0;b.element.addClass("cke_colorblock");b.element.setHtml(x(a,c,n));b.element.getDocument().getBody().setStyle("overflow","hidden");CKEDITOR.ui.fire("ready",this);var d=b.keys,f="rtl"==e.lang.dir;d[f?37:39]="next";d[40]="next";d[9]="next";d[f?39:37]="prev";d[38]="prev";d[CKEDITOR.SHIFT+9]="prev";d[32]="click"},refresh:function(){e.activeFilter.check(m)||this.setState(CKEDITOR.TRISTATE_DISABLED)},onOpen:function(){var a=e.getSelection(),a=a&&a.getStartElement(),a=e.elementPath(a),b;if(a){a=
-a.block||a.blockLimit||e.document.getBody();do b=a&&a.getComputedStyle("back"==c?"background-color":"color")||"transparent";while("back"==c&&"transparent"==b&&a&&(a=a.getParent()));b&&"transparent"!=b||(b="#ffffff");!1!==k.colorButton_enableAutomatic&&this._.panel._.iframe.getFrameDocument().getById(n).setStyle("background-color",b);return b}}})}function x(a,c,f){var g=[],l=k.colorButton_colors.split(","),m=k.colorButton_colorsPerRow||6,n=e.plugins.colordialog&&!1!==k.colorButton_enableMore,p=l.length+
-(n?2:1),b=CKEDITOR.tools.addFunction(function(b,c){function d(a){this.removeListener("ok",d);this.removeListener("cancel",d);"ok"==a.name&&f(this.getContentElement("picker","selectedColor").getValue(),c)}var f=arguments.callee;if("?"==b)e.openDialog("colordialog",function(){this.on("ok",d);this.on("cancel",d)});else{e.focus();a.hide();e.fire("saveSnapshot");e.removeStyle(new CKEDITOR.style(k["colorButton_"+c+"Style"],{color:"inherit"}));if(b){var g=k["colorButton_"+c+"Style"];g.childRule="back"==
-c?function(a){return u(a)}:function(a){return!(a.is("a")||a.getElementsByTag("a").count())||u(a)};e.applyStyle(new CKEDITOR.style(g,{color:b}))}e.fire("saveSnapshot")}});!1!==k.colorButton_enableAutomatic&&g.push('\x3ca class\x3d"cke_colorauto" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.auto,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",null,'",c,"');return false;\" href\x3d\"javascript:void('",h.auto,'\')" role\x3d"option" aria-posinset\x3d"1" aria-setsize\x3d"',p,'"\x3e\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+
-m+'" align\x3d"center"\x3e\x3cspan class\x3d"cke_colorbox" id\x3d"',f,'"\x3e\x3c/span\x3e',h.auto,"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/a\x3e");g.push('\x3ctable role\x3d"presentation" cellspacing\x3d0 cellpadding\x3d0 width\x3d"100%"\x3e');for(f=0;f<l.length;f++){0===f%m&&g.push("\x3c/tr\x3e\x3ctr\x3e");var d=l[f].split("/"),q=d[0],r=d[1]||q;d[1]||(q="#"+q.replace(/^(.)(.)(.)$/,"$1$1$2$2$3$3"));d=e.lang.colorbutton.colors[r]||r;g.push('\x3ctd\x3e\x3ca class\x3d"cke_colorbox" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',
-d,'" onclick\x3d"CKEDITOR.tools.callFunction(',b,",'",q,"','",c,"'); return false;\" href\x3d\"javascript:void('",d,'\')" role\x3d"option" aria-posinset\x3d"',f+2,'" aria-setsize\x3d"',p,'"\x3e\x3cspan class\x3d"cke_colorbox" style\x3d"background-color:#',r,'"\x3e\x3c/span\x3e\x3c/a\x3e\x3c/td\x3e')}n&&g.push('\x3c/tr\x3e\x3ctr\x3e\x3ctd colspan\x3d"'+m+'" align\x3d"center"\x3e\x3ca class\x3d"cke_colormore" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"',h.more,'" onclick\x3d"CKEDITOR.tools.callFunction(',
-b,",'?','",c,"');return false;\" href\x3d\"javascript:void('",h.more,"')\"",' role\x3d"option" aria-posinset\x3d"',p,'" aria-setsize\x3d"',p,'"\x3e',h.more,"\x3c/a\x3e\x3c/td\x3e");g.push("\x3c/tr\x3e\x3c/table\x3e");return g.join("")}function u(a){return"false"==a.getAttribute("contentEditable")||a.getAttribute("data-nostyle")}var k=e.config,h=e.lang.colorbutton;if(!CKEDITOR.env.hc){t("TextColor","fore",h.textColorTitle,10,{contentTransformations:[[{element:"font",check:"span{color}",left:function(a){return!!a.attributes.color},
-right:function(a){a.name="span";a.attributes.color&&(a.styles.color=a.attributes.color);delete a.attributes.color}}]]});var v={},w=e.config.colorButton_normalizeBackground;if(void 0===w||w)v.contentTransformations=[[{element:"span",left:function(a){var c=CKEDITOR.tools;if("span"!=a.name||!a.styles||!a.styles.background)return!1;a=c.style.parse.background(a.styles.background);return a.color&&1===c.objectKeys(a).length},right:function(a){var c=(new CKEDITOR.style(e.config.colorButton_backStyle,{color:a.styles.background})).getDefinition();
-a.name=c.element;a.styles=c.styles;a.attributes=c.attributes||{};return a}}]];t("BGColor","back",h.bgColorTitle,20,v)}}});CKEDITOR.config.colorButton_colors="1ABC9C,2ECC71,3498DB,9B59B6,4E5F70,F1C40F,16A085,27AE60,2980B9,8E44AD,2C3E50,F39C12,E67E22,E74C3C,ECF0F1,95A5A6,DDD,FFF,D35400,C0392B,BDC3C7,7F8C8D,999,000";CKEDITOR.config.colorButton_foreStyle={element:"span",styles:{color:"#(color)"},overrides:[{element:"font",attributes:{color:null}}]};
-CKEDITOR.config.colorButton_backStyle={element:"span",styles:{"background-color":"#(color)"}};CKEDITOR.plugins.add("divarea",{afterInit:function(a){a.addMode("wysiwyg",function(c){var b=CKEDITOR.dom.element.createFromHtml('\x3cdiv class\x3d"cke_wysiwyg_div cke_reset cke_enable_context_menu" hidefocus\x3d"true"\x3e\x3c/div\x3e');a.ui.space("contents").append(b);b=a.editable(b);b.detach=CKEDITOR.tools.override(b.detach,function(a){return function(){a.apply(this,arguments);this.remove()}});a.setData(a.getData(1),c);a.fire("contentDom")})}});(function(){function q(b,d,a){a=b.config.forceEnterMode||a;"wysiwyg"==b.mode&&(d||(d=b.activeEnterMode),b.elementPath().isContextFor("p")||(d=CKEDITOR.ENTER_BR,a=1),b.fire("saveSnapshot"),d==CKEDITOR.ENTER_BR?t(b,d,null,a):u(b,d,null,a),b.fire("saveSnapshot"))}function v(b){b=b.getSelection().getRanges(!0);for(var d=b.length-1;0<d;d--)b[d].deleteContents();return b[0]}function y(b){var d=b.startContainer.getAscendant(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&"true"==a.getAttribute("contenteditable")},
-!0);if(b.root.equals(d))return b;d=new CKEDITOR.dom.range(d);d.moveToRange(b);return d}CKEDITOR.plugins.add("enterkey",{init:function(b){b.addCommand("enter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b)}});b.addCommand("shiftEnter",{modes:{wysiwyg:1},editorFocus:!1,exec:function(b){q(b,b.activeShiftEnterMode,1)}});b.setKeystroke([[13,"enter"],[CKEDITOR.SHIFT+13,"shiftEnter"]])}});var z=CKEDITOR.dom.walker.whitespaces(),A=CKEDITOR.dom.walker.bookmark();CKEDITOR.plugins.enterkey={enterBlock:function(b,
-d,a,h){if(a=a||v(b)){a=y(a);var f=a.document,k=a.checkStartOfBlock(),m=a.checkEndOfBlock(),l=b.elementPath(a.startContainer),c=l.block,n=d==CKEDITOR.ENTER_DIV?"div":"p",e;if(k&&m){if(c&&(c.is("li")||c.getParent().is("li"))){c.is("li")||(c=c.getParent());a=c.getParent();e=a.getParent();h=!c.hasPrevious();var p=!c.hasNext(),n=b.getSelection(),g=n.createBookmarks(),k=c.getDirection(1),m=c.getAttribute("class"),r=c.getAttribute("style"),q=e.getDirection(1)!=k;b=b.enterMode!=CKEDITOR.ENTER_BR||q||r||m;
-if(e.is("li"))h||p?(h&&p&&a.remove(),c[p?"insertAfter":"insertBefore"](e)):c.breakParent(e);else{if(b)if(l.block.is("li")?(e=f.createElement(d==CKEDITOR.ENTER_P?"p":"div"),q&&e.setAttribute("dir",k),r&&e.setAttribute("style",r),m&&e.setAttribute("class",m),c.moveChildren(e)):e=l.block,h||p)e[h?"insertBefore":"insertAfter"](a);else c.breakParent(a),e.insertAfter(a);else if(c.appendBogus(!0),h||p)for(;f=c[h?"getFirst":"getLast"]();)f[h?"insertBefore":"insertAfter"](a);else for(c.breakParent(a);f=c.getLast();)f.insertAfter(a);
-c.remove()}n.selectBookmarks(g);return}if(c&&c.getParent().is("blockquote")){c.breakParent(c.getParent());c.getPrevious().getFirst(CKEDITOR.dom.walker.invisible(1))||c.getPrevious().remove();c.getNext().getFirst(CKEDITOR.dom.walker.invisible(1))||c.getNext().remove();a.moveToElementEditStart(c);a.select();return}}else if(c&&c.is("pre")&&!m){t(b,d,a,h);return}if(k=a.splitBlock(n)){d=k.previousBlock;c=k.nextBlock;l=k.wasStartOfBlock;b=k.wasEndOfBlock;c?(g=c.getParent(),g.is("li")&&(c.breakParent(g),
-c.move(c.getNext(),1))):d&&(g=d.getParent())&&g.is("li")&&(d.breakParent(g),g=d.getNext(),a.moveToElementEditStart(g),d.move(d.getPrevious()));if(l||b){if(d){if(d.is("li")||!w.test(d.getName())&&!d.is("pre"))e=d.clone()}else c&&(e=c.clone());e?h&&!e.is("li")&&e.renameNode(n):g&&g.is("li")?e=g:(e=f.createElement(n),d&&(p=d.getDirection())&&e.setAttribute("dir",p));if(f=k.elementPath)for(h=0,n=f.elements.length;h<n;h++){g=f.elements[h];if(g.equals(f.block)||g.equals(f.blockLimit))break;CKEDITOR.dtd.$removeEmpty[g.getName()]&&
-(g=g.clone(),e.moveChildren(g),e.append(g))}e.appendBogus();e.getParent()||a.insertNode(e);e.is("li")&&e.removeAttribute("value");!CKEDITOR.env.ie||!l||b&&d.getChildCount()||(a.moveToElementEditStart(b?d:e),a.select());a.moveToElementEditStart(l&&!b?c:e)}else c.is("li")&&(e=a.clone(),e.selectNodeContents(c),e=new CKEDITOR.dom.walker(e),e.evaluator=function(a){return!(A(a)||z(a)||a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in CKEDITOR.dtd.$inline&&!(a.getName()in CKEDITOR.dtd.$empty))},(g=e.next())&&
-g.type==CKEDITOR.NODE_ELEMENT&&g.is("ul","ol")&&(CKEDITOR.env.needsBrFiller?f.createElement("br"):f.createText(" ")).insertBefore(g)),c&&a.moveToElementEditStart(c);a.select();a.scrollIntoView()}}},enterBr:function(b,d,a,h){if(a=a||v(b)){var f=a.document,k=a.checkEndOfBlock(),m=new CKEDITOR.dom.elementPath(b.getSelection().getStartElement()),l=m.block,c=l&&m.block.getName();h||"li"!=c?(!h&&k&&w.test(c)?(k=l.getDirection())?(f=f.createElement("div"),f.setAttribute("dir",k),f.insertAfter(l),a.setStart(f,
-0)):(f.createElement("br").insertAfter(l),CKEDITOR.env.gecko&&f.createText("").insertAfter(l),a.setStartAt(l.getNext(),CKEDITOR.env.ie?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_START)):(b="pre"==c&&CKEDITOR.env.ie&&8>CKEDITOR.env.version?f.createText("\r"):f.createElement("br"),a.deleteContents(),a.insertNode(b),CKEDITOR.env.needsBrFiller?(f.createText("").insertAfter(b),k&&(l||m.blockLimit).appendBogus(),b.getNext().$.nodeValue="",a.setStartAt(b.getNext(),CKEDITOR.POSITION_AFTER_START)):
-a.setStartAt(b,CKEDITOR.POSITION_AFTER_END)),a.collapse(!0),a.select(),a.scrollIntoView()):u(b,d,a,h)}}};var x=CKEDITOR.plugins.enterkey,t=x.enterBr,u=x.enterBlock,w=/^h[1-6]$/})();(function(){function k(b,f){var g={},c=[],e={nbsp:" ",shy:"­",gt:"\x3e",lt:"\x3c",amp:"\x26",apos:"'",quot:'"'};b=b.replace(/\b(nbsp|shy|gt|lt|amp|apos|quot)(?:,|$)/g,function(b,a){var d=f?"\x26"+a+";":e[a];g[d]=f?e[a]:"\x26"+a+";";c.push(d);return""});if(!f&&b){b=b.split(",");var a=document.createElement("div"),d;a.innerHTML="\x26"+b.join(";\x26")+";";d=a.innerHTML;a=null;for(a=0;a<d.length;a++){var h=d.charAt(a);g[h]="\x26"+b[a]+";";c.push(h)}}g.regex=c.join(f?"|":"");return g}CKEDITOR.plugins.add("entities",
-{afterInit:function(b){function f(a){return h[a]}function g(b){return"force"!=c.entities_processNumerical&&a[b]?a[b]:"\x26#"+b.charCodeAt(0)+";"}var c=b.config;if(b=(b=b.dataProcessor)&&b.htmlFilter){var e=[];!1!==c.basicEntities&&e.push("nbsp,gt,lt,amp");c.entities&&(e.length&&e.push("quot,iexcl,cent,pound,curren,yen,brvbar,sect,uml,copy,ordf,laquo,not,shy,reg,macr,deg,plusmn,sup2,sup3,acute,micro,para,middot,cedil,sup1,ordm,raquo,frac14,frac12,frac34,iquest,times,divide,fnof,bull,hellip,prime,Prime,oline,frasl,weierp,image,real,trade,alefsym,larr,uarr,rarr,darr,harr,crarr,lArr,uArr,rArr,dArr,hArr,forall,part,exist,empty,nabla,isin,notin,ni,prod,sum,minus,lowast,radic,prop,infin,ang,and,or,cap,cup,int,there4,sim,cong,asymp,ne,equiv,le,ge,sub,sup,nsub,sube,supe,oplus,otimes,perp,sdot,lceil,rceil,lfloor,rfloor,lang,rang,loz,spades,clubs,hearts,diams,circ,tilde,ensp,emsp,thinsp,zwnj,zwj,lrm,rlm,ndash,mdash,lsquo,rsquo,sbquo,ldquo,rdquo,bdquo,dagger,Dagger,permil,lsaquo,rsaquo,euro"),
-c.entities_latin&&e.push("Agrave,Aacute,Acirc,Atilde,Auml,Aring,AElig,Ccedil,Egrave,Eacute,Ecirc,Euml,Igrave,Iacute,Icirc,Iuml,ETH,Ntilde,Ograve,Oacute,Ocirc,Otilde,Ouml,Oslash,Ugrave,Uacute,Ucirc,Uuml,Yacute,THORN,szlig,agrave,aacute,acirc,atilde,auml,aring,aelig,ccedil,egrave,eacute,ecirc,euml,igrave,iacute,icirc,iuml,eth,ntilde,ograve,oacute,ocirc,otilde,ouml,oslash,ugrave,uacute,ucirc,uuml,yacute,thorn,yuml,OElig,oelig,Scaron,scaron,Yuml"),c.entities_greek&&e.push("Alpha,Beta,Gamma,Delta,Epsilon,Zeta,Eta,Theta,Iota,Kappa,Lambda,Mu,Nu,Xi,Omicron,Pi,Rho,Sigma,Tau,Upsilon,Phi,Chi,Psi,Omega,alpha,beta,gamma,delta,epsilon,zeta,eta,theta,iota,kappa,lambda,mu,nu,xi,omicron,pi,rho,sigmaf,sigma,tau,upsilon,phi,chi,psi,omega,thetasym,upsih,piv"),
-c.entities_additional&&e.push(c.entities_additional));var a=k(e.join(",")),d=a.regex?"["+a.regex+"]":"a^";delete a.regex;c.entities&&c.entities_processNumerical&&(d="[^ -~]|"+d);var d=new RegExp(d,"g"),h=k("nbsp,gt,lt,amp,shy",!0),l=new RegExp(h.regex,"g");b.addRules({text:function(a){return a.replace(l,f).replace(d,g)}},{applyToAll:!0,excludeNestedEditable:!0})}}})})();CKEDITOR.config.basicEntities=!0;CKEDITOR.config.entities=!0;CKEDITOR.config.entities_latin=!0;CKEDITOR.config.entities_greek=!0;
-CKEDITOR.config.entities_additional="#39";(function(){function k(a){var l=a.config,p=a.fire("uiSpace",{space:"top",html:""}).html,t=function(){function f(a,c,e){b.setStyle(c,w(e));b.setStyle("position",a)}function e(a){var b=k.getDocumentPosition();switch(a){case "top":f("absolute","top",b.y-q-r);break;case "pin":f("fixed","top",x);break;case "bottom":f("absolute","top",b.y+(c.height||c.bottom-c.top)+r)}m=a}var m,k,n,c,h,q,v,p=l.floatSpaceDockedOffsetX||0,r=l.floatSpaceDockedOffsetY||0,u=l.floatSpacePinnedOffsetX||0,x=l.floatSpacePinnedOffsetY||
-0;return function(d){if(k=a.editable()){var f=d&&"focus"==d.name;f&&b.show();a.fire("floatingSpaceLayout",{show:f});b.removeStyle("left");b.removeStyle("right");n=b.getClientRect();c=k.getClientRect();h=g.getViewPaneSize();q=n.height;v="pageXOffset"in g.$?g.$.pageXOffset:CKEDITOR.document.$.documentElement.scrollLeft;m?(q+r<=c.top?e("top"):q+r>h.height-c.bottom?e("pin"):e("bottom"),d=h.width/2,d=l.floatSpacePreferRight?"right":0<c.left&&c.right<h.width&&c.width>n.width?"rtl"==l.contentsLangDirection?
-"right":"left":d-c.left>c.right-d?"left":"right",n.width>h.width?(d="left",f=0):(f="left"==d?0<c.left?c.left:0:c.right<h.width?h.width-c.right:0,f+n.width>h.width&&(d="left"==d?"right":"left",f=0)),b.setStyle(d,w(("pin"==m?u:p)+f+("pin"==m?0:"left"==d?v:-v)))):(m="pin",e("pin"),t(d))}}}();if(p){var k=new CKEDITOR.template('\x3cdiv id\x3d"cke_{name}" class\x3d"cke {id} cke_reset_all cke_chrome cke_editor_{name} cke_float cke_{langDir} '+CKEDITOR.env.cssClass+'" dir\x3d"{langDir}" title\x3d"'+(CKEDITOR.env.gecko?
-" ":"")+'" lang\x3d"{langCode}" role\x3d"application" style\x3d"{style}"'+(a.title?' aria-labelledby\x3d"cke_{name}_arialbl"':" ")+"\x3e"+(a.title?'\x3cspan id\x3d"cke_{name}_arialbl" class\x3d"cke_voice_label"\x3e{voiceLabel}\x3c/span\x3e':" ")+'\x3cdiv class\x3d"cke_inner"\x3e\x3cdiv id\x3d"{topId}" class\x3d"cke_top" role\x3d"presentation"\x3e{content}\x3c/div\x3e\x3c/div\x3e\x3c/div\x3e'),b=CKEDITOR.document.getBody().append(CKEDITOR.dom.element.createFromHtml(k.output({content:p,id:a.id,langDir:a.lang.dir,
-langCode:a.langCode,name:a.name,style:"display:none;z-index:"+(l.baseFloatZIndex-1),topId:a.ui.spaceId("top"),voiceLabel:a.title}))),u=CKEDITOR.tools.eventsBuffer(500,t),e=CKEDITOR.tools.eventsBuffer(100,t);b.unselectable();b.on("mousedown",function(a){a=a.data;a.getTarget().hasAscendant("a",1)||a.preventDefault()});a.on("focus",function(b){t(b);a.on("change",u.input);g.on("scroll",e.input);g.on("resize",e.input)});a.on("blur",function(){b.hide();a.removeListener("change",u.input);g.removeListener("scroll",
-e.input);g.removeListener("resize",e.input)});a.on("destroy",function(){g.removeListener("scroll",e.input);g.removeListener("resize",e.input);b.clearCustomData();b.remove()});a.focusManager.hasFocus&&b.show();a.focusManager.add(b,1)}}var g=CKEDITOR.document.getWindow(),w=CKEDITOR.tools.cssLength;CKEDITOR.plugins.add("floatingspace",{init:function(a){a.on("loaded",function(){k(this)},null,null,20)}})})();CKEDITOR.plugins.add("listblock",{requires:"panel",onLoad:function(){var f=CKEDITOR.addTemplate("panel-list",'\x3cul role\x3d"presentation" class\x3d"cke_panel_list"\x3e{items}\x3c/ul\x3e'),g=CKEDITOR.addTemplate("panel-list-item",'\x3cli id\x3d"{id}" class\x3d"cke_panel_listItem" role\x3dpresentation\x3e\x3ca id\x3d"{id}_option" _cke_focus\x3d1 hidefocus\x3dtrue title\x3d"{title}" href\x3d"javascript:void(\'{val}\')"  {onclick}\x3d"CKEDITOR.tools.callFunction({clickFn},\'{val}\'); return false;" role\x3d"option"\x3e{text}\x3c/a\x3e\x3c/li\x3e'),
-h=CKEDITOR.addTemplate("panel-list-group",'\x3ch1 id\x3d"{id}" class\x3d"cke_panel_grouptitle" role\x3d"presentation" \x3e{label}\x3c/h1\x3e'),k=/\'/g;CKEDITOR.ui.panel.prototype.addListBlock=function(a,b){return this.addBlock(a,new CKEDITOR.ui.listBlock(this.getHolderElement(),b))};CKEDITOR.ui.listBlock=CKEDITOR.tools.createClass({base:CKEDITOR.ui.panel.block,$:function(a,b){b=b||{};var c=b.attributes||(b.attributes={});(this.multiSelect=!!b.multiSelect)&&(c["aria-multiselectable"]=!0);!c.role&&
-(c.role="listbox");this.base.apply(this,arguments);this.element.setAttribute("role",c.role);c=this.keys;c[40]="next";c[9]="next";c[38]="prev";c[CKEDITOR.SHIFT+9]="prev";c[32]=CKEDITOR.env.ie?"mouseup":"click";CKEDITOR.env.ie&&(c[13]="mouseup");this._.pendingHtml=[];this._.pendingList=[];this._.items={};this._.groups={}},_:{close:function(){if(this._.started){var a=f.output({items:this._.pendingList.join("")});this._.pendingList=[];this._.pendingHtml.push(a);delete this._.started}},getClick:function(){this._.click||
-(this._.click=CKEDITOR.tools.addFunction(function(a){var b=this.toggle(a);if(this.onClick)this.onClick(a,b)},this));return this._.click}},proto:{add:function(a,b,c){var d=CKEDITOR.tools.getNextId();this._.started||(this._.started=1,this._.size=this._.size||0);this._.items[a]=d;var e;e=CKEDITOR.tools.htmlEncodeAttr(a).replace(k,"\\'");a={id:d,val:e,onclick:CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick",clickFn:this._.getClick(),title:CKEDITOR.tools.htmlEncodeAttr(c||a),text:b||a};
-this._.pendingList.push(g.output(a))},startGroup:function(a){this._.close();var b=CKEDITOR.tools.getNextId();this._.groups[a]=b;this._.pendingHtml.push(h.output({id:b,label:a}))},commit:function(){this._.close();this.element.appendHtml(this._.pendingHtml.join(""));delete this._.size;this._.pendingHtml=[]},toggle:function(a){var b=this.isMarked(a);b?this.unmark(a):this.mark(a);return!b},hideGroup:function(a){var b=(a=this.element.getDocument().getById(this._.groups[a]))&&a.getNext();a&&(a.setStyle("display",
-"none"),b&&"ul"==b.getName()&&b.setStyle("display","none"))},hideItem:function(a){this.element.getDocument().getById(this._.items[a]).setStyle("display","none")},showAll:function(){var a=this._.items,b=this._.groups,c=this.element.getDocument(),d;for(d in a)c.getById(a[d]).setStyle("display","");for(var e in b)a=c.getById(b[e]),d=a.getNext(),a.setStyle("display",""),d&&"ul"==d.getName()&&d.setStyle("display","")},mark:function(a){this.multiSelect||this.unmarkAll();a=this._.items[a];var b=this.element.getDocument().getById(a);
-b.addClass("cke_selected");this.element.getDocument().getById(a+"_option").setAttribute("aria-selected",!0);this.onMark&&this.onMark(b)},unmark:function(a){var b=this.element.getDocument();a=this._.items[a];var c=b.getById(a);c.removeClass("cke_selected");b.getById(a+"_option").removeAttribute("aria-selected");this.onUnmark&&this.onUnmark(c)},unmarkAll:function(){var a=this._.items,b=this.element.getDocument(),c;for(c in a){var d=a[c];b.getById(d).removeClass("cke_selected");b.getById(d+"_option").removeAttribute("aria-selected")}this.onUnmark&&
-this.onUnmark()},isMarked:function(a){return this.element.getDocument().getById(this._.items[a]).hasClass("cke_selected")},focus:function(a){this._.focusIndex=-1;var b=this.element.getElementsByTag("a"),c,d=-1;if(a)for(c=this.element.getDocument().getById(this._.items[a]).getFirst();a=b.getItem(++d);){if(a.equals(c)){this._.focusIndex=d;break}}else this.element.focus();c&&setTimeout(function(){c.focus()},0)}}})}});CKEDITOR.plugins.add("richcombo",{requires:"floatpanel,listblock,button",beforeInit:function(d){d.ui.addHandler(CKEDITOR.UI_RICHCOMBO,CKEDITOR.ui.richCombo.handler)}});
-(function(){var d='\x3cspan id\x3d"{id}" class\x3d"cke_combo cke_combo__{name} {cls}" role\x3d"presentation"\x3e\x3cspan id\x3d"{id}_label" class\x3d"cke_combo_label"\x3e{label}\x3c/span\x3e\x3ca class\x3d"cke_combo_button" title\x3d"{title}" tabindex\x3d"-1"'+(CKEDITOR.env.gecko&&!CKEDITOR.env.hc?"":" href\x3d\"javascript:void('{titleJs}')\"")+' hidefocus\x3d"true" role\x3d"button" aria-labelledby\x3d"{id}_label" aria-haspopup\x3d"true"';CKEDITOR.env.gecko&&CKEDITOR.env.mac&&(d+=' onkeypress\x3d"return false;"');
-CKEDITOR.env.gecko&&(d+=' onblur\x3d"this.style.cssText \x3d this.style.cssText;"');var d=d+(' onkeydown\x3d"return CKEDITOR.tools.callFunction({keydownFn},event,this);" onfocus\x3d"return CKEDITOR.tools.callFunction({focusFn},event);" '+(CKEDITOR.env.ie?'onclick\x3d"return false;" onmouseup':"onclick")+'\x3d"CKEDITOR.tools.callFunction({clickFn},this);return false;"\x3e\x3cspan id\x3d"{id}_text" class\x3d"cke_combo_text cke_combo_inlinelabel"\x3e{label}\x3c/span\x3e\x3cspan class\x3d"cke_combo_open"\x3e\x3cspan class\x3d"cke_combo_arrow"\x3e'+
-(CKEDITOR.env.hc?"\x26#9660;":CKEDITOR.env.air?"\x26nbsp;":"")+"\x3c/span\x3e\x3c/span\x3e\x3c/a\x3e\x3c/span\x3e"),k=CKEDITOR.addTemplate("combo",d);CKEDITOR.UI_RICHCOMBO="richcombo";CKEDITOR.ui.richCombo=CKEDITOR.tools.createClass({$:function(a){CKEDITOR.tools.extend(this,a,{canGroup:!1,title:a.label,modes:{wysiwyg:1},editorFocus:1});a=this.panel||{};delete this.panel;this.id=CKEDITOR.tools.getNextNumber();this.document=a.parent&&a.parent.getDocument()||CKEDITOR.document;a.className="cke_combopanel";
-a.block={multiSelect:a.multiSelect,attributes:a.attributes};a.toolbarRelated=!0;this._={panelDefinition:a,items:{}}},proto:{renderHtml:function(a){var b=[];this.render(a,b);return b.join("")},render:function(a,b){function g(){if(this.getState()!=CKEDITOR.TRISTATE_ON){var c=this.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED;a.readOnly&&!this.readOnly&&(c=CKEDITOR.TRISTATE_DISABLED);this.setState(c);this.setValue("");c!=CKEDITOR.TRISTATE_DISABLED&&this.refresh&&this.refresh()}}var d=
-CKEDITOR.env,h="cke_"+this.id,e=CKEDITOR.tools.addFunction(function(b){l&&(a.unlockSelection(1),l=0);c.execute(b)},this),f=this,c={id:h,combo:this,focus:function(){CKEDITOR.document.getById(h).getChild(1).focus()},execute:function(c){var b=f._;if(b.state!=CKEDITOR.TRISTATE_DISABLED)if(f.createPanel(a),b.on)b.panel.hide();else{f.commit();var d=f.getValue();d?b.list.mark(d):b.list.unmarkAll();b.panel.showBlock(f.id,new CKEDITOR.dom.element(c),4)}},clickFn:e};a.on("activeFilterChange",g,this);a.on("mode",
-g,this);a.on("selectionChange",g,this);!this.readOnly&&a.on("readOnly",g,this);var m=CKEDITOR.tools.addFunction(function(b,d){b=new CKEDITOR.dom.event(b);var g=b.getKeystroke();if(40==g)a.once("panelShow",function(a){a.data._.panel._.currentBlock.onKeyDown(40)});switch(g){case 13:case 32:case 40:CKEDITOR.tools.callFunction(e,d);break;default:c.onkey(c,g)}b.preventDefault()}),n=CKEDITOR.tools.addFunction(function(){c.onfocus&&c.onfocus()}),l=0;c.keyDownFn=m;d={id:h,name:this.name||this.command,label:this.label,
-title:this.title,cls:this.className||"",titleJs:d.gecko&&!d.hc?"":(this.title||"").replace("'",""),keydownFn:m,focusFn:n,clickFn:e};k.output(d,b);if(this.onRender)this.onRender();return c},createPanel:function(a){if(!this._.panel){var b=this._.panelDefinition,d=this._.panelDefinition.block,k=b.parent||CKEDITOR.document.getBody(),h="cke_combopanel__"+this.name,e=new CKEDITOR.ui.floatPanel(a,k,b),f=e.addListBlock(this.id,d),c=this;e.onShow=function(){this.element.addClass(h);c.setState(CKEDITOR.TRISTATE_ON);
-c._.on=1;c.editorFocus&&!a.focusManager.hasFocus&&a.focus();if(c.onOpen)c.onOpen();a.once("panelShow",function(){f.focus(!f.multiSelect&&c.getValue())})};e.onHide=function(b){this.element.removeClass(h);c.setState(c.modes&&c.modes[a.mode]?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);c._.on=0;if(!b&&c.onClose)c.onClose()};e.onEscape=function(){e.hide(1)};f.onClick=function(a,b){c.onClick&&c.onClick.call(c,a,b);e.hide()};this._.panel=e;this._.list=f;e.getBlock(this.id).onHide=function(){c._.on=
-0;c.setState(CKEDITOR.TRISTATE_OFF)};this.init&&this.init()}},setValue:function(a,b){this._.value=a;var d=this.document.getById("cke_"+this.id+"_text");d&&(a||b?d.removeClass("cke_combo_inlinelabel"):(b=this.label,d.addClass("cke_combo_inlinelabel")),d.setText("undefined"!=typeof b?b:a))},getValue:function(){return this._.value||""},unmarkAll:function(){this._.list.unmarkAll()},mark:function(a){this._.list.mark(a)},hideItem:function(a){this._.list.hideItem(a)},hideGroup:function(a){this._.list.hideGroup(a)},
-showAll:function(){this._.list.showAll()},add:function(a,b,d){this._.items[a]=d||a;this._.list.add(a,b,d)},startGroup:function(a){this._.list.startGroup(a)},commit:function(){this._.committed||(this._.list.commit(),this._.committed=1,CKEDITOR.ui.fire("ready",this));this._.committed=1},setState:function(a){if(this._.state!=a){var b=this.document.getById("cke_"+this.id);b.setState(a,"cke_combo");a==CKEDITOR.TRISTATE_DISABLED?b.setAttribute("aria-disabled",!0):b.removeAttribute("aria-disabled");this._.state=
-a}},getState:function(){return this._.state},enable:function(){this._.state==CKEDITOR.TRISTATE_DISABLED&&this.setState(this._.lastState)},disable:function(){this._.state!=CKEDITOR.TRISTATE_DISABLED&&(this._.lastState=this._.state,this.setState(CKEDITOR.TRISTATE_DISABLED))}},statics:{handler:{create:function(a){return new CKEDITOR.ui.richCombo(a)}}}});CKEDITOR.ui.prototype.addRichCombo=function(a,b){this.add(a,CKEDITOR.UI_RICHCOMBO,b)}})();(function(){function n(a,c,h,e,q,n,u,w){var x=a.config,r=new CKEDITOR.style(u),g=q.split(";");q=[];for(var m={},d=0;d<g.length;d++){var l=g[d];if(l){var l=l.split("/"),v={},p=g[d]=l[0];v[h]=q[d]=l[1]||p;m[p]=new CKEDITOR.style(u,v);m[p]._.definition.name=p}else g.splice(d--,1)}a.ui.addRichCombo(c,{label:e.label,title:e.panelTitle,toolbar:"styles,"+w,allowedContent:r,requiredContent:r,contentTransformations:[[{element:"font",check:"span",left:function(b){return!!b.attributes.size||!!b.attributes.align||
-!!b.attributes.face},right:function(b){var a=" x-small small medium large x-large xx-large 48px".split(" ");b.name="span";b.attributes.size&&(b.styles["font-size"]=a[b.attributes.size],delete b.attributes.size);b.attributes.align&&(b.styles["text-align"]=b.attributes.align,delete b.attributes.align);b.attributes.face&&(b.styles["font-family"]=b.attributes.face,delete b.attributes.face)}}]],panel:{css:[CKEDITOR.skin.getPath("editor")].concat(x.contentsCss),multiSelect:!1,attributes:{"aria-label":e.panelTitle}},
-init:function(){this.startGroup(e.panelTitle);for(var b=0;b<g.length;b++){var a=g[b];this.add(a,m[a].buildPreview(),a)}},onClick:function(b){a.focus();a.fire("saveSnapshot");var c=this.getValue(),h=m[b];if(c&&b!=c){var e=m[c],f=a.getSelection().getRanges()[0];if(f.collapsed){var g=a.elementPath(),k=g.contains(function(a){return e.checkElementRemovable(a)});if(k){var d=f.checkBoundaryOfElement(k,CKEDITOR.START),l=f.checkBoundaryOfElement(k,CKEDITOR.END);if(d&&l){for(d=f.createBookmark();g=k.getFirst();)g.insertBefore(k);
-k.remove();f.moveToBookmark(d)}else d||l?f.moveToPosition(k,d?CKEDITOR.POSITION_BEFORE_START:CKEDITOR.POSITION_AFTER_END):(f.splitElement(k),f.moveToPosition(k,CKEDITOR.POSITION_AFTER_END)),t(f,g.elements.slice(),k);a.getSelection().selectRanges([f])}}else a.removeStyle(e)}a[c==b?"removeStyle":"applyStyle"](h);a.fire("saveSnapshot")},onRender:function(){a.on("selectionChange",function(b){var c=this.getValue();b=b.data.path.elements;for(var d=0,e;d<b.length;d++){e=b[d];for(var f in m)if(m[f].checkElementMatch(e,
-!0,a)){f!=c&&this.setValue(f);return}}this.setValue("",n)},this)},refresh:function(){a.activeFilter.check(r)||this.setState(CKEDITOR.TRISTATE_DISABLED)}})}function t(a,c,h){var e=c.pop();if(e){if(h)return t(a,c,e.equals(h)?null:h);h=e.clone();a.insertNode(h);a.moveToPosition(h,CKEDITOR.POSITION_AFTER_START);t(a,c)}}CKEDITOR.plugins.add("font",{requires:"richcombo",init:function(a){var c=a.config;n(a,"Font","family",a.lang.font,c.font_names,c.font_defaultLabel,c.font_style,30);n(a,"FontSize","size",
-a.lang.font.fontSize,c.fontSize_sizes,c.fontSize_defaultLabel,c.fontSize_style,40)}})})();CKEDITOR.config.font_names="Arial/Arial, Helvetica, sans-serif;Comic Sans MS/Comic Sans MS, cursive;Courier New/Courier New, Courier, monospace;Georgia/Georgia, serif;Lucida Sans Unicode/Lucida Sans Unicode, Lucida Grande, sans-serif;Tahoma/Tahoma, Geneva, sans-serif;Times New Roman/Times New Roman, Times, serif;Trebuchet MS/Trebuchet MS, Helvetica, sans-serif;Verdana/Verdana, Geneva, sans-serif";
-CKEDITOR.config.font_defaultLabel="";CKEDITOR.config.font_style={element:"span",styles:{"font-family":"#(family)"},overrides:[{element:"font",attributes:{face:null}}]};CKEDITOR.config.fontSize_sizes="8/8px;9/9px;10/10px;11/11px;12/12px;14/14px;16/16px;18/18px;20/20px;22/22px;24/24px;26/26px;28/28px;36/36px;48/48px;72/72px";CKEDITOR.config.fontSize_defaultLabel="";CKEDITOR.config.fontSize_style={element:"span",styles:{"font-size":"#(size)"},overrides:[{element:"font",attributes:{size:null}}]};(function(){function e(b,a){a||(a=b.getSelection().getSelectedElement());if(a&&a.is("img")&&!a.data("cke-realelement")&&!a.isReadOnly())return a}function f(b){var a=b.getStyle("float");if("inherit"==a||"none"==a)a=0;a||(a=b.getAttribute("align"));return a}CKEDITOR.plugins.add("image",{requires:"dialog",init:function(b){if(!b.plugins.image2){CKEDITOR.dialog.add("image",this.path+"dialogs/image.js");var a="img[alt,!src]{border-style,border-width,float,height,margin,margin-bottom,margin-left,margin-right,margin-top,width}";
-CKEDITOR.dialog.isTabEnabled(b,"image","advanced")&&(a="img[alt,dir,id,lang,longdesc,!src,title]{*}(*)");b.addCommand("image",new CKEDITOR.dialogCommand("image",{allowedContent:a,requiredContent:"img[alt,src]",contentTransformations:[["img{width}: sizeToStyle","img[width]: sizeToAttribute"],["img{float}: alignmentToStyle","img[align]: alignmentToAttribute"]]}));b.ui.addButton&&b.ui.addButton("Image",{label:b.lang.common.image,command:"image",toolbar:"insert,10"});b.on("doubleclick",function(b){var a=
-b.data.element;!a.is("img")||a.data("cke-realelement")||a.isReadOnly()||(b.data.dialog="image")});b.addMenuItems&&b.addMenuItems({image:{label:b.lang.image.menu,command:"image",group:"image"}});b.contextMenu&&b.contextMenu.addListener(function(a){if(e(b,a))return{image:CKEDITOR.TRISTATE_OFF}})}},afterInit:function(b){function a(a){var d=b.getCommand("justify"+a);if(d){if("left"==a||"right"==a)d.on("exec",function(d){var c=e(b),g;c&&(g=f(c),g==a?(c.removeStyle("float"),a==f(c)&&c.removeAttribute("align")):
-c.setStyle("float",a),d.cancel())});d.on("refresh",function(d){var c=e(b);c&&(c=f(c),this.setState(c==a?CKEDITOR.TRISTATE_ON:"right"==a||"left"==a?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),d.cancel())})}}b.plugins.image2||(a("left"),a("right"),a("center"),a("block"))}})})();CKEDITOR.config.image_removeLinkByEmptyURL=!0;(function(){function m(a,d){CKEDITOR.tools.extend(this,{editor:a,editable:a.editable(),doc:a.document,win:a.window},d,!0);this.inline=this.editable.isInline();this.inline||(this.frame=this.win.getFrame());this.target=this[this.inline?"editable":"doc"]}function n(a,d){CKEDITOR.tools.extend(this,d,{editor:a},!0)}function p(a,d){var b=a.editable();CKEDITOR.tools.extend(this,{editor:a,editable:b,inline:b.isInline(),doc:a.document,win:a.window,container:CKEDITOR.document.getBody(),winTop:CKEDITOR.document.getWindow()},
-d,!0);this.hidden={};this.visible={};this.inline||(this.frame=this.win.getFrame());this.queryViewport();var c=CKEDITOR.tools.bind(this.queryViewport,this),e=CKEDITOR.tools.bind(this.hideVisible,this),g=CKEDITOR.tools.bind(this.removeAll,this);b.attachListener(this.winTop,"resize",c);b.attachListener(this.winTop,"scroll",c);b.attachListener(this.winTop,"resize",e);b.attachListener(this.win,"scroll",e);b.attachListener(this.inline?b:this.frame,"mouseout",function(a){var b=a.data.$.clientX;a=a.data.$.clientY;
-this.queryViewport();(b<=this.rect.left||b>=this.rect.right||a<=this.rect.top||a>=this.rect.bottom)&&this.hideVisible();(0>=b||b>=this.winTopPane.width||0>=a||a>=this.winTopPane.height)&&this.hideVisible()},this);b.attachListener(a,"resize",c);b.attachListener(a,"mode",g);a.on("destroy",g);this.lineTpl=(new CKEDITOR.template('\x3cdiv data-cke-lineutils-line\x3d"1" class\x3d"cke_reset_all" style\x3d"{lineStyle}"\x3e\x3cspan style\x3d"{tipLeftStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3cspan style\x3d"{tipRightStyle}"\x3e\x26nbsp;\x3c/span\x3e\x3c/div\x3e')).output({lineStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},
-t,this.lineStyle,!0)),tipLeftStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},q,{left:"0px","border-left-color":"red","border-width":"6px 0 6px 6px"},this.tipCss,this.tipLeftStyle,!0)),tipRightStyle:CKEDITOR.tools.writeCssText(CKEDITOR.tools.extend({},q,{right:"0px","border-right-color":"red","border-width":"6px 6px 6px 0"},this.tipCss,this.tipRightStyle,!0))})}function l(a){var d;if(d=a&&a.type==CKEDITOR.NODE_ELEMENT)d=!(r[a.getComputedStyle("float")]||r[a.getAttribute("align")]);return d&&
-!u[a.getComputedStyle("position")]}CKEDITOR.plugins.add("lineutils");CKEDITOR.LINEUTILS_BEFORE=1;CKEDITOR.LINEUTILS_AFTER=2;CKEDITOR.LINEUTILS_INSIDE=4;m.prototype={start:function(a){var d=this,b=this.editor,c=this.doc,e,g,f,h,k=CKEDITOR.tools.eventsBuffer(50,function(){b.readOnly||"wysiwyg"!=b.mode||(d.relations={},(g=c.$.elementFromPoint(f,h))&&g.nodeType&&(e=new CKEDITOR.dom.element(g),d.traverseSearch(e),isNaN(f+h)||d.pixelSearch(e,f,h),a&&a(d.relations,f,h)))});this.listener=this.editable.attachListener(this.target,
-"mousemove",function(a){f=a.data.$.clientX;h=a.data.$.clientY;k.input()});this.editable.attachListener(this.inline?this.editable:this.frame,"mouseout",function(){k.reset()})},stop:function(){this.listener&&this.listener.removeListener()},getRange:function(){var a={};a[CKEDITOR.LINEUTILS_BEFORE]=CKEDITOR.POSITION_BEFORE_START;a[CKEDITOR.LINEUTILS_AFTER]=CKEDITOR.POSITION_AFTER_END;a[CKEDITOR.LINEUTILS_INSIDE]=CKEDITOR.POSITION_AFTER_START;return function(d){var b=this.editor.createRange();b.moveToPosition(this.relations[d.uid].element,
-a[d.type]);return b}}(),store:function(){function a(a,b,c){var e=a.getUniqueId();e in c?c[e].type|=b:c[e]={element:a,type:b}}return function(d,b){var c;b&CKEDITOR.LINEUTILS_AFTER&&l(c=d.getNext())&&c.isVisible()&&(a(c,CKEDITOR.LINEUTILS_BEFORE,this.relations),b^=CKEDITOR.LINEUTILS_AFTER);b&CKEDITOR.LINEUTILS_INSIDE&&l(c=d.getFirst())&&c.isVisible()&&(a(c,CKEDITOR.LINEUTILS_BEFORE,this.relations),b^=CKEDITOR.LINEUTILS_INSIDE);a(d,b,this.relations)}}(),traverseSearch:function(a){var d,b,c;do if(c=a.$["data-cke-expando"],
-!(c&&c in this.relations)){if(a.equals(this.editable))break;if(l(a))for(d in this.lookups)(b=this.lookups[d](a))&&this.store(a,b)}while((!a||a.type!=CKEDITOR.NODE_ELEMENT||"true"!=a.getAttribute("contenteditable"))&&(a=a.getParent()))},pixelSearch:function(){function a(a,c,e,g,f){for(var h=0,k;f(e);){e+=g;if(25==++h)break;if(k=this.doc.$.elementFromPoint(c,e))if(k==a)h=0;else if(d(a,k)&&(h=0,l(k=new CKEDITOR.dom.element(k))))return k}}var d=CKEDITOR.env.ie||CKEDITOR.env.webkit?function(a,c){return a.contains(c)}:
-function(a,c){return!!(a.compareDocumentPosition(c)&16)};return function(b,c,d){var g=this.win.getViewPaneSize().height,f=a.call(this,b.$,c,d,-1,function(a){return 0<a});c=a.call(this,b.$,c,d,1,function(a){return a<g});if(f)for(this.traverseSearch(f);!f.getParent().equals(b);)f=f.getParent();if(c)for(this.traverseSearch(c);!c.getParent().equals(b);)c=c.getParent();for(;f||c;){f&&(f=f.getNext(l));if(!f||f.equals(c))break;this.traverseSearch(f);c&&(c=c.getPrevious(l));if(!c||c.equals(f))break;this.traverseSearch(c)}}}(),
-greedySearch:function(){this.relations={};for(var a=this.editable.getElementsByTag("*"),d=0,b,c,e;b=a.getItem(d++);)if(!b.equals(this.editable)&&b.type==CKEDITOR.NODE_ELEMENT&&(b.hasAttribute("contenteditable")||!b.isReadOnly())&&l(b)&&b.isVisible())for(e in this.lookups)(c=this.lookups[e](b))&&this.store(b,c);return this.relations}};n.prototype={locate:function(){function a(a,b){var c=a.element[b===CKEDITOR.LINEUTILS_BEFORE?"getPrevious":"getNext"]();return c&&l(c)?(a.siblingRect=c.getClientRect(),
-b==CKEDITOR.LINEUTILS_BEFORE?(a.siblingRect.bottom+a.elementRect.top)/2:(a.elementRect.bottom+a.siblingRect.top)/2):b==CKEDITOR.LINEUTILS_BEFORE?a.elementRect.top:a.elementRect.bottom}return function(d){var b;this.locations={};for(var c in d)b=d[c],b.elementRect=b.element.getClientRect(),b.type&CKEDITOR.LINEUTILS_BEFORE&&this.store(c,CKEDITOR.LINEUTILS_BEFORE,a(b,CKEDITOR.LINEUTILS_BEFORE)),b.type&CKEDITOR.LINEUTILS_AFTER&&this.store(c,CKEDITOR.LINEUTILS_AFTER,a(b,CKEDITOR.LINEUTILS_AFTER)),b.type&
-CKEDITOR.LINEUTILS_INSIDE&&this.store(c,CKEDITOR.LINEUTILS_INSIDE,(b.elementRect.top+b.elementRect.bottom)/2);return this.locations}}(),sort:function(){var a,d,b,c;return function(e,g){a=this.locations;d=[];for(var f in a)for(var h in a[f])if(b=Math.abs(e-a[f][h]),d.length){for(c=0;c<d.length;c++)if(b<d[c].dist){d.splice(c,0,{uid:+f,type:h,dist:b});break}c==d.length&&d.push({uid:+f,type:h,dist:b})}else d.push({uid:+f,type:h,dist:b});return"undefined"!=typeof g?d.slice(0,g):d}}(),store:function(a,
-d,b){this.locations[a]||(this.locations[a]={});this.locations[a][d]=b}};var q={display:"block",width:"0px",height:"0px","border-color":"transparent","border-style":"solid",position:"absolute",top:"-6px"},t={height:"0px","border-top":"1px dashed red",position:"absolute","z-index":9999};p.prototype={removeAll:function(){for(var a in this.hidden)this.hidden[a].remove(),delete this.hidden[a];for(a in this.visible)this.visible[a].remove(),delete this.visible[a]},hideLine:function(a){var d=a.getUniqueId();
-a.hide();this.hidden[d]=a;delete this.visible[d]},showLine:function(a){var d=a.getUniqueId();a.show();this.visible[d]=a;delete this.hidden[d]},hideVisible:function(){for(var a in this.visible)this.hideLine(this.visible[a])},placeLine:function(a,d){var b,c,e;if(b=this.getStyle(a.uid,a.type)){for(e in this.visible)if(this.visible[e].getCustomData("hash")!==this.hash){c=this.visible[e];break}if(!c)for(e in this.hidden)if(this.hidden[e].getCustomData("hash")!==this.hash){this.showLine(c=this.hidden[e]);
-break}c||this.showLine(c=this.addLine());c.setCustomData("hash",this.hash);this.visible[c.getUniqueId()]=c;c.setStyles(b);d&&d(c)}},getStyle:function(a,d){var b=this.relations[a],c=this.locations[a][d],e={};e.width=b.siblingRect?Math.max(b.siblingRect.width,b.elementRect.width):b.elementRect.width;e.top=this.inline?c+this.winTopScroll.y-this.rect.relativeY:this.rect.top+this.winTopScroll.y+c;if(e.top-this.winTopScroll.y<this.rect.top||e.top-this.winTopScroll.y>this.rect.bottom)return!1;this.inline?
-e.left=b.elementRect.left-this.rect.relativeX:(0<b.elementRect.left?e.left=this.rect.left+b.elementRect.left:(e.width+=b.elementRect.left,e.left=this.rect.left),0<(b=e.left+e.width-(this.rect.left+this.winPane.width))&&(e.width-=b));e.left+=this.winTopScroll.x;for(var g in e)e[g]=CKEDITOR.tools.cssLength(e[g]);return e},addLine:function(){var a=CKEDITOR.dom.element.createFromHtml(this.lineTpl);a.appendTo(this.container);return a},prepare:function(a,d){this.relations=a;this.locations=d;this.hash=Math.random()},
-cleanup:function(){var a,d;for(d in this.visible)a=this.visible[d],a.getCustomData("hash")!==this.hash&&this.hideLine(a)},queryViewport:function(){this.winPane=this.win.getViewPaneSize();this.winTopScroll=this.winTop.getScrollPosition();this.winTopPane=this.winTop.getViewPaneSize();this.rect=this.getClientRect(this.inline?this.editable:this.frame)},getClientRect:function(a){a=a.getClientRect();var d=this.container.getDocumentPosition(),b=this.container.getComputedStyle("position");a.relativeX=a.relativeY=
-0;"static"!=b&&(a.relativeY=d.y,a.relativeX=d.x,a.top-=a.relativeY,a.bottom-=a.relativeY,a.left-=a.relativeX,a.right-=a.relativeX);return a}};var r={left:1,right:1,center:1},u={absolute:1,fixed:1};CKEDITOR.plugins.lineutils={finder:m,locator:n,liner:p}})();(function(){function f(a){return a.getName&&!a.hasAttribute("data-cke-temp")}CKEDITOR.plugins.add("widgetselection",{init:function(a){if(CKEDITOR.env.webkit){var b=CKEDITOR.plugins.widgetselection;a.on("contentDom",function(a){a=a.editor;var d=a.document,e=a.editable();e.attachListener(d,"keydown",function(a){var c=a.data.$;65==a.data.getKey()&&(CKEDITOR.env.mac&&c.metaKey||!CKEDITOR.env.mac&&c.ctrlKey)&&CKEDITOR.tools.setTimeout(function(){b.addFillers(e)||b.removeFillers(e)},0)},null,null,-1);a.on("selectionCheck",
-function(a){b.removeFillers(a.editor.editable())});a.on("paste",function(a){a.data.dataValue=b.cleanPasteData(a.data.dataValue)});"selectall"in a.plugins&&b.addSelectAllIntegration(a)})}}});CKEDITOR.plugins.widgetselection={startFiller:null,endFiller:null,fillerAttribute:"data-cke-filler-webkit",fillerContent:"\x26nbsp;",fillerTagName:"div",addFillers:function(a){var b=a.editor;if(!this.isWholeContentSelected(a)&&0<a.getChildCount()){var c=a.getFirst(f),d=a.getLast(f);c&&c.type==CKEDITOR.NODE_ELEMENT&&
-!c.isEditable()&&(this.startFiller=this.createFiller(),a.append(this.startFiller,1));d&&d.type==CKEDITOR.NODE_ELEMENT&&!d.isEditable()&&(this.endFiller=this.createFiller(!0),a.append(this.endFiller,0));if(this.hasFiller(a))return b=b.createRange(),b.selectNodeContents(a),b.select(),!0}return!1},removeFillers:function(a){if(this.hasFiller(a)&&!this.isWholeContentSelected(a)){var b=a.findOne(this.fillerTagName+"["+this.fillerAttribute+"\x3dstart]"),c=a.findOne(this.fillerTagName+"["+this.fillerAttribute+
-"\x3dend]");this.startFiller&&b&&this.startFiller.equals(b)?this.removeFiller(this.startFiller,a):this.startFiller=b;this.endFiller&&c&&this.endFiller.equals(c)?this.removeFiller(this.endFiller,a):this.endFiller=c}},cleanPasteData:function(a){a&&a.length&&(a=a.replace(this.createFillerRegex(),"").replace(this.createFillerRegex(!0),""));return a},isWholeContentSelected:function(a){var b=a.editor.getSelection().getRanges()[0];return!b||b&&b.collapsed?!1:(b=b.clone(),b.enlarge(CKEDITOR.ENLARGE_ELEMENT),
-!!(b&&a&&b.startContainer&&b.endContainer&&0===b.startOffset&&b.endOffset===a.getChildCount()&&b.startContainer.equals(a)&&b.endContainer.equals(a)))},hasFiller:function(a){return 0<a.find(this.fillerTagName+"["+this.fillerAttribute+"]").count()},createFiller:function(a){var b=new CKEDITOR.dom.element(this.fillerTagName);b.setHtml(this.fillerContent);b.setAttribute(this.fillerAttribute,a?"end":"start");b.setAttribute("data-cke-temp",1);b.setStyles({display:"block",width:0,height:0,padding:0,border:0,
-margin:0,position:"absolute",top:0,left:"-9999px",opacity:0,overflow:"hidden"});return b},removeFiller:function(a,b){if(a){var c=b.editor,d=b.editor.getSelection().getRanges()[0].startPath(),e=c.createRange(),g,f;d.contains(a)&&(g=a.getHtml(),f=!0);d="start"==a.getAttribute(this.fillerAttribute);a.remove();g&&0<g.length&&g!=this.fillerContent?(b.insertHtmlIntoRange(g,c.getSelection().getRanges()[0]),e.setStartAt(b.getChild(b.getChildCount()-1),CKEDITOR.POSITION_BEFORE_END),c.getSelection().selectRanges([e])):
-f&&(d?e.setStartAt(b.getFirst().getNext(),CKEDITOR.POSITION_AFTER_START):e.setEndAt(b.getLast().getPrevious(),CKEDITOR.POSITION_BEFORE_END),b.editor.getSelection().selectRanges([e]))}},createFillerRegex:function(a){var b=this.createFiller(a).getOuterHtml().replace(/style="[^"]*"/gi,'style\x3d"[^"]*"').replace(/>[^<]*</gi,"\x3e[^\x3c]*\x3c");return new RegExp((a?"":"^")+b+(a?"$":""))},addSelectAllIntegration:function(a){var b=this;a.editable().attachListener(a,"beforeCommandExec",function(c){var d=
-a.editable();"selectAll"==c.data.name&&d&&b.addFillers(d)},null,null,9999)}}})();(function(){function p(a){this.editor=a;this.registered={};this.instances={};this.selected=[];this.widgetHoldingFocusedEditable=this.focused=null;this._={nextId:0,upcasts:[],upcastCallbacks:[],filters:{}};F(this);G(this);this.on("checkWidgets",H);this.editor.on("contentDomInvalidated",this.checkWidgets,this);I(this);J(this);K(this);L(this);M(this)}function g(a,b,c,d,e){var f=a.editor;CKEDITOR.tools.extend(this,d,{editor:f,id:b,inline:"span"==c.getParent().getName(),element:c,data:CKEDITOR.tools.extend({},
-"function"==typeof d.defaults?d.defaults():d.defaults),dataReady:!1,inited:!1,ready:!1,edit:g.prototype.edit,focusedEditable:null,definition:d,repository:a,draggable:!1!==d.draggable,_:{downcastFn:d.downcast&&"string"==typeof d.downcast?d.downcasts[d.downcast]:d.downcast}},!0);a.fire("instanceCreated",this);N(this,d);this.init&&this.init();this.inited=!0;(a=this.element.data("cke-widget-data"))&&this.setData(JSON.parse(decodeURIComponent(a)));e&&this.setData(e);this.data.classes||this.setData("classes",
-this.getClasses());this.dataReady=!0;r(this);this.fire("data",this.data);this.isInited()&&f.editable().contains(this.wrapper)&&(this.ready=!0,this.fire("ready"))}function q(a,b,c){CKEDITOR.dom.element.call(this,b.$);this.editor=a;this._={};b=this.filter=c.filter;CKEDITOR.dtd[this.getName()].p?(this.enterMode=b?b.getAllowedEnterMode(a.enterMode):a.enterMode,this.shiftEnterMode=b?b.getAllowedEnterMode(a.shiftEnterMode,!0):a.shiftEnterMode):this.enterMode=this.shiftEnterMode=CKEDITOR.ENTER_BR}function O(a,
-b){a.addCommand(b.name,{exec:function(a,d){function e(){a.widgets.finalizeCreation(k)}var f=a.widgets.focused;if(f&&f.name==b.name)f.edit();else if(b.insert)b.insert();else if(b.template){var f="function"==typeof b.defaults?b.defaults():b.defaults,f=CKEDITOR.dom.element.createFromHtml(b.template.output(f)),h,l=a.widgets.wrapElement(f,b.name),k=new CKEDITOR.dom.documentFragment(l.getDocument());k.append(l);(h=a.widgets.initOn(f,b,d&&d.startupData))?(f=h.once("edit",function(b){if(b.data.dialog)h.once("dialog",
-function(b){b=b.data;var d,f;d=b.once("ok",e,null,null,20);f=b.once("cancel",function(b){b.data&&!1===b.data.hide||a.widgets.destroy(h,!0)});b.once("hide",function(){d.removeListener();f.removeListener()})});else e()},null,null,999),h.edit(),f.removeListener()):e()}},allowedContent:b.allowedContent,requiredContent:b.requiredContent,contentForms:b.contentForms,contentTransformations:b.contentTransformations})}function P(a,b){function c(b,d,c){var e=CKEDITOR.tools.getIndex(a._.upcasts,function(a){return a[2]>
-c});0>e&&(e=a._.upcasts.length);a._.upcasts.splice(e,0,[b,d,c])}var d=b.upcast,e=b.upcastPriority||10;if(d)if("string"==typeof d)for(d=d.split(",");d.length;)c(b.upcasts[d.pop()],b.name,e);else c(d,b.name,e)}function t(a,b){a.focused=null;if(b.isInited()){var c=b.editor.checkDirty();a.fire("widgetBlurred",{widget:b});b.setFocused(!1);!c&&b.editor.resetDirty()}}function H(a){a=a.data;if("wysiwyg"==this.editor.mode){var b=this.editor.editable(),c=this.instances,d,e,f,h;if(b){for(d in c)c[d].isReady()&&
-!b.contains(c[d].wrapper)&&this.destroy(c[d],!0);if(a&&a.initOnlyNew)c=this.initOnAll();else{var l=b.find(".cke_widget_wrapper"),c=[];d=0;for(e=l.count();d<e;d++){f=l.getItem(d);if(h=!this.getByElement(f,!0)){a:{h=Q;for(var k=f;k=k.getParent();)if(h(k)){h=!0;break a}h=!1}h=!h}h&&b.contains(f)&&(f.addClass("cke_widget_new"),c.push(this.initOn(f.getFirst(g.isDomWidgetElement))))}}a&&a.focusInited&&1==c.length&&c[0].focus()}}}function u(a,b,c){if(!c.allowedContent)return null;var d=this._.filters[a];
-d||(this._.filters[a]=d={});(a=d[b])||(d[b]=a=new CKEDITOR.filter(c.allowedContent));return a}function R(a){var b=[],c=a._.upcasts,d=a._.upcastCallbacks;return{toBeWrapped:b,iterator:function(a){var f,h,l,k,m;if("data-cke-widget-wrapper"in a.attributes)return(a=a.getFirst(g.isParserWidgetElement))&&b.push([a]),!1;if("data-widget"in a.attributes)return b.push([a]),!1;if(m=c.length){if(a.attributes["data-cke-widget-upcasted"])return!1;k=0;for(f=d.length;k<f;++k)if(!1===d[k](a))return;for(k=0;k<m;++k)if(f=
-c[k],l={},h=f[0](a,l))return h instanceof CKEDITOR.htmlParser.element&&(a=h),a.attributes["data-cke-widget-data"]=encodeURIComponent(JSON.stringify(l)),a.attributes["data-cke-widget-upcasted"]=1,b.push([a,f[1]]),!1}}}}function v(a,b){return{tabindex:-1,contenteditable:"false","data-cke-widget-wrapper":1,"data-cke-filter":"off","class":"cke_widget_wrapper cke_widget_new cke_widget_"+(a?"inline":"block")+(b?" cke_widget_"+b:"")}}function w(a,b,c){if(a.type==CKEDITOR.NODE_ELEMENT){var d=CKEDITOR.dtd[a.name];
-if(d&&!d[c.name]){var d=a.split(b),e=a.parent;b=d.getIndex();a.children.length||(--b,a.remove());d.children.length||d.remove();return w(e,b,c)}}a.add(c,b)}function x(a,b){return"boolean"==typeof a.inline?a.inline:!!CKEDITOR.dtd.$inline[b]}function Q(a){return a.hasAttribute("data-cke-temp")}function n(a,b,c,d){var e=a.editor;e.fire("lockSnapshot");c?(d=c.data("cke-widget-editable"),d=b.editables[d],a.widgetHoldingFocusedEditable=b,b.focusedEditable=d,c.addClass("cke_widget_editable_focused"),d.filter&&
-e.setActiveFilter(d.filter),e.setActiveEnterMode(d.enterMode,d.shiftEnterMode)):(d||b.focusedEditable.removeClass("cke_widget_editable_focused"),b.focusedEditable=null,a.widgetHoldingFocusedEditable=null,e.setActiveFilter(null),e.setActiveEnterMode(null,null));e.fire("unlockSnapshot")}function S(a){a.contextMenu&&a.contextMenu.addListener(function(b){if(b=a.widgets.getByElement(b,!0))return b.fire("contextMenu",{})})}function T(a,b){return CKEDITOR.tools.trim(b)}function L(a){var b=a.editor,c=CKEDITOR.plugins.lineutils;
-b.on("dragstart",function(d){var c=d.data.target;g.isDomDragHandler(c)&&(c=a.getByElement(c),d.data.dataTransfer.setData("cke/widget-id",c.id),b.focus(),c.focus())});b.on("drop",function(d){var c=d.data.dataTransfer,f=c.getData("cke/widget-id"),h=c.getTransferType(b),c=b.createRange();""!==f&&h===CKEDITOR.DATA_TRANSFER_CROSS_EDITORS?d.cancel():""!==f&&h==CKEDITOR.DATA_TRANSFER_INTERNAL&&(f=a.instances[f])&&(c.setStartBefore(f.wrapper),c.setEndAfter(f.wrapper),d.data.dragRange=c,delete CKEDITOR.plugins.clipboard.dragStartContainerChildCount,
-delete CKEDITOR.plugins.clipboard.dragEndContainerChildCount,d.data.dataTransfer.setData("text/html",b.editable().getHtmlFromRange(c).getHtml()),b.widgets.destroy(f,!0))});b.on("contentDom",function(){var d=b.editable();CKEDITOR.tools.extend(a,{finder:new c.finder(b,{lookups:{"default":function(b){if(!b.is(CKEDITOR.dtd.$listItem)&&b.is(CKEDITOR.dtd.$block)&&!g.isDomNestedEditable(b)&&!a._.draggedWidget.wrapper.contains(b)){var c=g.getNestedEditable(d,b);if(c){b=a._.draggedWidget;if(a.getByElement(c)==
-b)return;c=CKEDITOR.filter.instances[c.data("cke-filter")];b=b.requiredContent;if(c&&b&&!c.check(b))return}return CKEDITOR.LINEUTILS_BEFORE|CKEDITOR.LINEUTILS_AFTER}}}}),locator:new c.locator(b),liner:new c.liner(b,{lineStyle:{cursor:"move !important","border-top-color":"#666"},tipLeftStyle:{"border-left-color":"#666"},tipRightStyle:{"border-right-color":"#666"}})},!0)})}function J(a){var b=a.editor;b.on("contentDom",function(){var c=b.editable(),d=c.isInline()?c:b.document,e,f;c.attachListener(d,
-"mousedown",function(c){var d=c.data.getTarget();if(!d.type)return!1;e=a.getByElement(d);f=0;e&&(e.inline&&d.type==CKEDITOR.NODE_ELEMENT&&d.hasAttribute("data-cke-widget-drag-handler")?(f=1,a.focused!=e&&b.getSelection().removeAllRanges()):g.getNestedEditable(e.wrapper,d)?e=null:(c.data.preventDefault(),CKEDITOR.env.ie||e.focus()))});c.attachListener(d,"mouseup",function(){f&&e&&e.wrapper&&(f=0,e.focus())});CKEDITOR.env.ie&&c.attachListener(d,"mouseup",function(){setTimeout(function(){e&&e.wrapper&&
-c.contains(e.wrapper)&&(e.focus(),e=null)})})});b.on("doubleclick",function(b){var d=a.getByElement(b.data.element);if(d&&!g.getNestedEditable(d.wrapper,b.data.element))return d.fire("doubleclick",{element:b.data.element})},null,null,1)}function K(a){a.editor.on("key",function(b){var c=a.focused,d=a.widgetHoldingFocusedEditable,e;c?e=c.fire("key",{keyCode:b.data.keyCode}):d&&(c=b.data.keyCode,b=d.focusedEditable,c==CKEDITOR.CTRL+65?(c=b.getBogus(),d=d.editor.createRange(),d.selectNodeContents(b),
-c&&d.setEndAt(c,CKEDITOR.POSITION_BEFORE_START),d.select(),e=!1):8==c||46==c?(e=d.editor.getSelection().getRanges(),d=e[0],e=!(1==e.length&&d.collapsed&&d.checkBoundaryOfElement(b,CKEDITOR[8==c?"START":"END"]))):e=void 0);return e},null,null,1)}function M(a){function b(b){a.focused&&y(a.focused,"cut"==b.name)}var c=a.editor;c.on("contentDom",function(){var a=c.editable();a.attachListener(a,"copy",b);a.attachListener(a,"cut",b)})}function I(a){var b=a.editor;b.on("selectionCheck",function(){a.fire("checkSelection")});
-a.on("checkSelection",a.checkSelection,a);b.on("selectionChange",function(c){var d=(c=g.getNestedEditable(b.editable(),c.data.selection.getStartElement()))&&a.getByElement(c),e=a.widgetHoldingFocusedEditable;e?e===d&&e.focusedEditable.equals(c)||(n(a,e,null),d&&c&&n(a,d,c)):d&&c&&n(a,d,c)});b.on("dataReady",function(){z(a).commit()});b.on("blur",function(){var b;(b=a.focused)&&t(a,b);(b=a.widgetHoldingFocusedEditable)&&n(a,b,null)})}function G(a){var b=a.editor,c={};b.on("toDataFormat",function(b){var e=
-CKEDITOR.tools.getNextNumber(),f=[];b.data.downcastingSessionId=e;c[e]=f;b.data.dataValue.forEach(function(b){var c=b.attributes,d;if("data-cke-widget-id"in c){if(c=a.instances[c["data-cke-widget-id"]])d=b.getFirst(g.isParserWidgetElement),f.push({wrapper:b,element:d,widget:c,editables:{}}),"1"!=d.attributes["data-cke-widget-keep-attr"]&&delete d.attributes["data-widget"]}else if("data-cke-widget-editable"in c)return f[f.length-1].editables[c["data-cke-widget-editable"]]=b,!1},CKEDITOR.NODE_ELEMENT,
-!0)},null,null,8);b.on("toDataFormat",function(a){if(a.data.downcastingSessionId){a=c[a.data.downcastingSessionId];for(var b,f,h,l,g,m;b=a.shift();){f=b.widget;h=b.element;l=f._.downcastFn&&f._.downcastFn.call(f,h);for(m in b.editables)g=b.editables[m],delete g.attributes.contenteditable,g.setHtml(f.editables[m].getData());l||(l=h);b.wrapper.replaceWith(l)}}},null,null,13);b.on("contentDomUnload",function(){a.destroyAll(!0)})}function F(a){var b=a.editor,c,d;b.on("toHtml",function(b){var d=R(a),h;
-for(b.data.dataValue.forEach(d.iterator,CKEDITOR.NODE_ELEMENT,!0);h=d.toBeWrapped.pop();){var l=h[0],k=l.parent;k.type==CKEDITOR.NODE_ELEMENT&&k.attributes["data-cke-widget-wrapper"]&&k.replaceWith(l);a.wrapElement(h[0],h[1])}c=b.data.protectedWhitespaces?3==b.data.dataValue.children.length&&g.isParserWidgetWrapper(b.data.dataValue.children[1]):1==b.data.dataValue.children.length&&g.isParserWidgetWrapper(b.data.dataValue.children[0])},null,null,8);b.on("dataReady",function(){if(d)for(var c=b.editable().find(".cke_widget_wrapper"),
-f,h,l=0,k=c.count();l<k;++l)f=c.getItem(l),h=f.getFirst(g.isDomWidgetElement),h.type==CKEDITOR.NODE_ELEMENT&&h.data("widget")?(h.replace(f),a.wrapElement(h)):f.remove();d=0;a.destroyAll(!0);a.initOnAll()});b.on("loadSnapshot",function(b){/data-cke-widget/.test(b.data)&&(d=1);a.destroyAll(!0)},null,null,9);b.on("paste",function(a){a=a.data;a.dataValue=a.dataValue.replace(U,T);a.range&&(a=g.getNestedEditable(b.editable(),a.range.startContainer))&&(a=CKEDITOR.filter.instances[a.data("cke-filter")])&&
-b.setActiveFilter(a)});b.on("afterInsertHtml",function(d){d.data.intoRange?a.checkWidgets({initOnlyNew:!0}):(b.fire("lockSnapshot"),a.checkWidgets({initOnlyNew:!0,focusInited:c}),b.fire("unlockSnapshot"))})}function z(a){var b=a.selected,c=[],d=b.slice(0),e=null;return{select:function(a){0>CKEDITOR.tools.indexOf(b,a)&&c.push(a);a=CKEDITOR.tools.indexOf(d,a);0<=a&&d.splice(a,1);return this},focus:function(a){e=a;return this},commit:function(){var f=a.focused!==e,h,g;a.editor.fire("lockSnapshot");for(f&&
-(h=a.focused)&&t(a,h);h=d.pop();)b.splice(CKEDITOR.tools.indexOf(b,h),1),h.isInited()&&(g=h.editor.checkDirty(),h.setSelected(!1),!g&&h.editor.resetDirty());f&&e&&(g=a.editor.checkDirty(),a.focused=e,a.fire("widgetFocused",{widget:e}),e.setFocused(!0),!g&&a.editor.resetDirty());for(;h=c.pop();)b.push(h),h.setSelected(!0);a.editor.fire("unlockSnapshot")}}}function A(a,b,c){var d=0;b=B(b);var e=a.data.classes||{},f;if(b){for(e=CKEDITOR.tools.clone(e);f=b.pop();)c?e[f]||(d=e[f]=1):e[f]&&(delete e[f],
-d=1);d&&a.setData("classes",e)}}function C(a){a.cancel()}function y(a,b){var c=a.editor,d=c.document;if(!d.getById("cke_copybin")){var e=c.blockless||CKEDITOR.env.ie?"span":"div",f=d.createElement(e),h=d.createElement(e),e=CKEDITOR.env.ie&&9>CKEDITOR.env.version;h.setAttributes({id:"cke_copybin","data-cke-temp":"1"});f.setStyles({position:"absolute",width:"1px",height:"1px",overflow:"hidden"});f.setStyle("ltr"==c.config.contentsLangDirection?"left":"right","-5000px");var g=c.createRange();g.setStartBefore(a.wrapper);
-g.setEndAfter(a.wrapper);f.setHtml('\x3cspan data-cke-copybin-start\x3d"1"\x3e​\x3c/span\x3e'+c.editable().getHtmlFromRange(g).getHtml()+'\x3cspan data-cke-copybin-end\x3d"1"\x3e​\x3c/span\x3e');c.fire("saveSnapshot");c.fire("lockSnapshot");h.append(f);c.editable().append(h);var k=c.on("selectionChange",C,null,null,0),m=a.repository.on("checkSelection",C,null,null,0);if(e)var n=d.getDocumentElement().$,p=n.scrollTop;g=c.createRange();g.selectNodeContents(f);g.select();e&&(n.scrollTop=p);setTimeout(function(){b||
-a.focus();h.remove();k.removeListener();m.removeListener();c.fire("unlockSnapshot");b&&(a.repository.del(a),c.fire("saveSnapshot"))},100)}}function B(a){return(a=(a=a.getDefinition().attributes)&&a["class"])?a.split(/\s+/):null}function D(){var a=CKEDITOR.document.getActive(),b=this.editor,c=b.editable();(c.isInline()?c:b.document.getWindow().getFrame()).equals(a)&&b.focusManager.focus(c)}function E(){CKEDITOR.env.gecko&&this.editor.unlockSelection();CKEDITOR.env.webkit||(this.editor.forceNextSelectionCheck(),
-this.editor.selectionChange(1))}function V(a){var b=null;a.on("data",function(){var a=this.data.classes,d;if(b!=a){for(d in b)a&&a[d]||this.removeClass(d);for(d in a)this.addClass(d);b=a}})}function W(a){a.on("data",function(){if(a.wrapper){var b=this.getLabel?this.getLabel():this.editor.lang.widget.label.replace(/%1/,this.pathName||this.element.getName());a.wrapper.setAttribute("role","region");a.wrapper.setAttribute("aria-label",b)}},null,null,9999)}function X(a){if(a.draggable){var b=a.editor,
-c=a.wrapper.getLast(g.isDomDragHandlerContainer),d;c?d=c.findOne("img"):(c=new CKEDITOR.dom.element("span",b.document),c.setAttributes({"class":"cke_reset cke_widget_drag_handler_container",style:"background:rgba(220,220,220,0.5);background-image:url("+b.plugins.widget.path+"images/handle.png)"}),d=new CKEDITOR.dom.element("img",b.document),d.setAttributes({"class":"cke_reset cke_widget_drag_handler","data-cke-widget-drag-handler":"1",src:CKEDITOR.tools.transparentImageData,width:15,title:b.lang.widget.move,
-height:15,role:"presentation"}),a.inline&&d.setAttribute("draggable","true"),c.append(d),a.wrapper.append(c));a.wrapper.on("dragover",function(a){a.data.preventDefault()});a.wrapper.on("mouseenter",a.updateDragHandlerPosition,a);setTimeout(function(){a.on("data",a.updateDragHandlerPosition,a)},50);if(!a.inline&&(d.on("mousedown",Y,a),CKEDITOR.env.ie&&9>CKEDITOR.env.version))d.on("dragstart",function(a){a.data.preventDefault(!0)});a.dragHandlerContainer=c}}function Y(a){function b(){var b;for(q.reset();b=
-g.pop();)b.removeListener();var c=k;b=a.sender;var d=this.repository.finder,e=this.repository.liner,f=this.editor,h=this.editor.editable();CKEDITOR.tools.isEmpty(e.visible)||(c=d.getRange(c[0]),this.focus(),f.fire("drop",{dropRange:c,target:c.startContainer}));h.removeClass("cke_widget_dragging");e.hideVisible();f.fire("dragend",{target:b})}var c=this.repository.finder,d=this.repository.locator,e=this.repository.liner,f=this.editor,h=f.editable(),g=[],k=[],m,n;this.repository._.draggedWidget=this;
-var p=c.greedySearch(),q=CKEDITOR.tools.eventsBuffer(50,function(){m=d.locate(p);k=d.sort(n,1);k.length&&(e.prepare(p,m),e.placeLine(k[0]),e.cleanup())});h.addClass("cke_widget_dragging");g.push(h.on("mousemove",function(a){n=a.data.$.clientY;q.input()}));f.fire("dragstart",{target:a.sender});g.push(f.document.once("mouseup",b,this));h.isInline()||g.push(CKEDITOR.document.once("mouseup",b,this))}function Z(a){var b,c,d=a.editables;a.editables={};if(a.editables)for(b in d)c=d[b],a.initEditable(b,"string"==
-typeof c?{selector:c}:c)}function aa(a){if(a.mask){var b=a.wrapper.findOne(".cke_widget_mask");b||(b=new CKEDITOR.dom.element("img",a.editor.document),b.setAttributes({src:CKEDITOR.tools.transparentImageData,"class":"cke_reset cke_widget_mask"}),a.wrapper.append(b));a.mask=b}}function ba(a){if(a.parts){var b={},c,d;for(d in a.parts)c=a.wrapper.findOne(a.parts[d]),b[d]=c;a.parts=b}}function N(a,b){ca(a);ba(a);Z(a);aa(a);X(a);V(a);W(a);if(CKEDITOR.env.ie&&9>CKEDITOR.env.version)a.wrapper.on("dragstart",
-function(b){var d=b.data.getTarget();g.getNestedEditable(a,d)||a.inline&&g.isDomDragHandler(d)||b.data.preventDefault()});a.wrapper.removeClass("cke_widget_new");a.element.addClass("cke_widget_element");a.on("key",function(b){b=b.data.keyCode;if(13==b)a.edit();else{if(b==CKEDITOR.CTRL+67||b==CKEDITOR.CTRL+88){y(a,b==CKEDITOR.CTRL+88);return}if(b in da||CKEDITOR.CTRL&b||CKEDITOR.ALT&b)return}return!1},null,null,999);a.on("doubleclick",function(b){a.edit()&&b.cancel()});if(b.data)a.on("data",b.data);
-if(b.edit)a.on("edit",b.edit)}function ca(a){(a.wrapper=a.element.getParent()).setAttribute("data-cke-widget-id",a.id)}function r(a){a.element.data("cke-widget-data",encodeURIComponent(JSON.stringify(a.data)))}CKEDITOR.plugins.add("widget",{requires:"lineutils,clipboard,widgetselection",onLoad:function(){CKEDITOR.addCss(".cke_widget_wrapper{position:relative;outline:none}.cke_widget_inline{display:inline-block}.cke_widget_wrapper:hover\x3e.cke_widget_element{outline:2px solid yellow;cursor:default}.cke_widget_wrapper:hover .cke_widget_editable{outline:2px solid yellow}.cke_widget_wrapper.cke_widget_focused\x3e.cke_widget_element,.cke_widget_wrapper .cke_widget_editable.cke_widget_editable_focused{outline:2px solid #ace}.cke_widget_editable{cursor:text}.cke_widget_drag_handler_container{position:absolute;width:15px;height:0;display:none;opacity:0.75;transition:height 0s 0.2s;line-height:0}.cke_widget_wrapper:hover\x3e.cke_widget_drag_handler_container{height:15px;transition:none}.cke_widget_drag_handler_container:hover{opacity:1}img.cke_widget_drag_handler{cursor:move;width:15px;height:15px;display:inline-block}.cke_widget_mask{position:absolute;top:0;left:0;width:100%;height:100%;display:block}.cke_editable.cke_widget_dragging, .cke_editable.cke_widget_dragging *{cursor:move !important}")},
-beforeInit:function(a){a.widgets=new p(a)},afterInit:function(a){var b=a.widgets.registered,c,d,e;for(d in b)c=b[d],(e=c.button)&&a.ui.addButton&&a.ui.addButton(CKEDITOR.tools.capitalize(c.name,!0),{label:e,command:c.name,toolbar:"insert,10"});S(a)}});p.prototype={MIN_SELECTION_CHECK_INTERVAL:500,add:function(a,b){b=CKEDITOR.tools.prototypedCopy(b);b.name=a;b._=b._||{};this.editor.fire("widgetDefinition",b);b.template&&(b.template=new CKEDITOR.template(b.template));O(this.editor,b);P(this,b);return this.registered[a]=
-b},addUpcastCallback:function(a){this._.upcastCallbacks.push(a)},checkSelection:function(){var a=this.editor.getSelection(),b=a.getSelectedElement(),c=z(this),d;if(b&&(d=this.getByElement(b,!0)))return c.focus(d).select(d).commit();a=a.getRanges()[0];if(!a||a.collapsed)return c.commit();a=new CKEDITOR.dom.walker(a);for(a.evaluator=g.isDomWidgetWrapper;b=a.next();)c.select(this.getByElement(b));c.commit()},checkWidgets:function(a){this.fire("checkWidgets",CKEDITOR.tools.copy(a||{}))},del:function(a){if(this.focused===
-a){var b=a.editor,c=b.createRange(),d;(d=c.moveToClosestEditablePosition(a.wrapper,!0))||(d=c.moveToClosestEditablePosition(a.wrapper,!1));d&&b.getSelection().selectRanges([c])}a.wrapper.remove();this.destroy(a,!0)},destroy:function(a,b){this.widgetHoldingFocusedEditable===a&&n(this,a,null,b);a.destroy(b);delete this.instances[a.id];this.fire("instanceDestroyed",a)},destroyAll:function(a,b){var c,d,e=this.instances;if(b&&!a){d=b.find(".cke_widget_wrapper");for(var e=d.count(),f=0;f<e;++f)(c=this.getByElement(d.getItem(f),
-!0))&&this.destroy(c)}else for(d in e)c=e[d],this.destroy(c,a)},finalizeCreation:function(a){(a=a.getFirst())&&g.isDomWidgetWrapper(a)&&(this.editor.insertElement(a),a=this.getByElement(a),a.ready=!0,a.fire("ready"),a.focus())},getByElement:function(){function a(a){return a.is(b)&&a.data("cke-widget-id")}var b={div:1,span:1};return function(b,d){if(!b)return null;var e=a(b);if(!d&&!e){var f=this.editor.editable();do b=b.getParent();while(b&&!b.equals(f)&&!(e=a(b)))}return this.instances[e]||null}}(),
-initOn:function(a,b,c){b?"string"==typeof b&&(b=this.registered[b]):b=this.registered[a.data("widget")];if(!b)return null;var d=this.wrapElement(a,b.name);return d?d.hasClass("cke_widget_new")?(a=new g(this,this._.nextId++,a,b,c),a.isInited()?this.instances[a.id]=a:null):this.getByElement(a):null},initOnAll:function(a){a=(a||this.editor.editable()).find(".cke_widget_new");for(var b=[],c,d=a.count();d--;)(c=this.initOn(a.getItem(d).getFirst(g.isDomWidgetElement)))&&b.push(c);return b},onWidget:function(a){var b=
-Array.prototype.slice.call(arguments);b.shift();for(var c in this.instances){var d=this.instances[c];d.name==a&&d.on.apply(d,b)}this.on("instanceCreated",function(d){d=d.data;d.name==a&&d.on.apply(d,b)})},parseElementClasses:function(a){if(!a)return null;a=CKEDITOR.tools.trim(a).split(/\s+/);for(var b,c={},d=0;b=a.pop();)-1==b.indexOf("cke_")&&(c[b]=d=1);return d?c:null},wrapElement:function(a,b){var c=null,d,e;if(a instanceof CKEDITOR.dom.element){b=b||a.data("widget");d=this.registered[b];if(!d)return null;
-if((c=a.getParent())&&c.type==CKEDITOR.NODE_ELEMENT&&c.data("cke-widget-wrapper"))return c;a.hasAttribute("data-cke-widget-keep-attr")||a.data("cke-widget-keep-attr",a.data("widget")?1:0);a.data("widget",b);e=x(d,a.getName());c=new CKEDITOR.dom.element(e?"span":"div");c.setAttributes(v(e,b));c.data("cke-display-name",d.pathName?d.pathName:a.getName());a.getParent(!0)&&c.replace(a);a.appendTo(c)}else if(a instanceof CKEDITOR.htmlParser.element){b=b||a.attributes["data-widget"];d=this.registered[b];
-if(!d)return null;if((c=a.parent)&&c.type==CKEDITOR.NODE_ELEMENT&&c.attributes["data-cke-widget-wrapper"])return c;"data-cke-widget-keep-attr"in a.attributes||(a.attributes["data-cke-widget-keep-attr"]=a.attributes["data-widget"]?1:0);b&&(a.attributes["data-widget"]=b);e=x(d,a.name);c=new CKEDITOR.htmlParser.element(e?"span":"div",v(e,b));c.attributes["data-cke-display-name"]=d.pathName?d.pathName:a.name;d=a.parent;var f;d&&(f=a.getIndex(),a.remove());c.add(a);d&&w(d,f,c)}return c},_tests_createEditableFilter:u};
-CKEDITOR.event.implementOn(p.prototype);g.prototype={addClass:function(a){this.element.addClass(a);this.wrapper.addClass(g.WRAPPER_CLASS_PREFIX+a)},applyStyle:function(a){A(this,a,1)},checkStyleActive:function(a){a=B(a);var b;if(!a)return!1;for(;b=a.pop();)if(!this.hasClass(b))return!1;return!0},destroy:function(a){this.fire("destroy");if(this.editables)for(var b in this.editables)this.destroyEditable(b,a);a||("0"==this.element.data("cke-widget-keep-attr")&&this.element.removeAttribute("data-widget"),
-this.element.removeAttributes(["data-cke-widget-data","data-cke-widget-keep-attr"]),this.element.removeClass("cke_widget_element"),this.element.replace(this.wrapper));this.wrapper=null},destroyEditable:function(a,b){var c=this.editables[a];c.removeListener("focus",E);c.removeListener("blur",D);this.editor.focusManager.remove(c);b||(this.repository.destroyAll(!1,c),c.removeClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),c.removeAttributes(["contenteditable","data-cke-widget-editable",
-"data-cke-enter-mode"]));delete this.editables[a]},edit:function(){var a={dialog:this.dialog},b=this;if(!1===this.fire("edit",a)||!a.dialog)return!1;this.editor.openDialog(a.dialog,function(a){var d,e;!1!==b.fire("dialog",a)&&(d=a.on("show",function(){a.setupContent(b)}),e=a.on("ok",function(){var d,e=b.on("data",function(a){d=1;a.cancel()},null,null,0);b.editor.fire("saveSnapshot");a.commitContent(b);e.removeListener();d&&(b.fire("data",b.data),b.editor.fire("saveSnapshot"))}),a.once("hide",function(){d.removeListener();
-e.removeListener()}))});return!0},getClasses:function(){return this.repository.parseElementClasses(this.element.getAttribute("class"))},hasClass:function(a){return this.element.hasClass(a)},initEditable:function(a,b){var c=this._findOneNotNested(b.selector);return c&&c.is(CKEDITOR.dtd.$editable)?(c=new q(this.editor,c,{filter:u.call(this.repository,this.name,a,b)}),this.editables[a]=c,c.setAttributes({contenteditable:"true","data-cke-widget-editable":a,"data-cke-enter-mode":c.enterMode}),c.filter&&
-c.data("cke-filter",c.filter.id),c.addClass("cke_widget_editable"),c.removeClass("cke_widget_editable_focused"),b.pathName&&c.data("cke-display-name",b.pathName),this.editor.focusManager.add(c),c.on("focus",E,this),CKEDITOR.env.ie&&c.on("blur",D,this),c._.initialSetData=!0,c.setData(c.getHtml()),!0):!1},_findOneNotNested:function(a){a=this.wrapper.find(a);for(var b,c,d=0;d<a.count();d++)if(b=a.getItem(d),c=b.getAscendant(g.isDomWidgetWrapper),this.wrapper.equals(c))return b;return null},isInited:function(){return!(!this.wrapper||
-!this.inited)},isReady:function(){return this.isInited()&&this.ready},focus:function(){var a=this.editor.getSelection();if(a){var b=this.editor.checkDirty();a.fake(this.wrapper);!b&&this.editor.resetDirty()}this.editor.focus()},removeClass:function(a){this.element.removeClass(a);this.wrapper.removeClass(g.WRAPPER_CLASS_PREFIX+a)},removeStyle:function(a){A(this,a,0)},setData:function(a,b){var c=this.data,d=0;if("string"==typeof a)c[a]!==b&&(c[a]=b,d=1);else{var e=a;for(a in e)c[a]!==e[a]&&(d=1,c[a]=
-e[a])}d&&this.dataReady&&(r(this),this.fire("data",c));return this},setFocused:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_focused");this.fire(a?"focus":"blur");return this},setSelected:function(a){this.wrapper[a?"addClass":"removeClass"]("cke_widget_selected");this.fire(a?"select":"deselect");return this},updateDragHandlerPosition:function(){var a=this.editor,b=this.element.$,c=this._.dragHandlerOffset,b={x:b.offsetLeft,y:b.offsetTop-15};c&&b.x==c.x&&b.y==c.y||(c=a.checkDirty(),
-a.fire("lockSnapshot"),this.dragHandlerContainer.setStyles({top:b.y+"px",left:b.x+"px",display:"block"}),a.fire("unlockSnapshot"),!c&&a.resetDirty(),this._.dragHandlerOffset=b)}};CKEDITOR.event.implementOn(g.prototype);g.getNestedEditable=function(a,b){return!b||b.equals(a)?null:g.isDomNestedEditable(b)?b:g.getNestedEditable(a,b.getParent())};g.isDomDragHandler=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-drag-handler")};g.isDomDragHandlerContainer=function(a){return a.type==
-CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_widget_drag_handler_container")};g.isDomNestedEditable=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-editable")};g.isDomWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-widget")};g.isDomWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasAttribute("data-cke-widget-wrapper")};g.isParserWidgetElement=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-widget"]};
-g.isParserWidgetWrapper=function(a){return a.type==CKEDITOR.NODE_ELEMENT&&!!a.attributes["data-cke-widget-wrapper"]};g.WRAPPER_CLASS_PREFIX="cke_widget_wrapper_";q.prototype=CKEDITOR.tools.extend(CKEDITOR.tools.prototypedCopy(CKEDITOR.dom.element.prototype),{setData:function(a){this._.initialSetData||this.editor.widgets.destroyAll(!1,this);this._.initialSetData=!1;a=this.editor.dataProcessor.toHtml(a,{context:this.getName(),filter:this.filter,enterMode:this.enterMode});this.setHtml(a);this.editor.widgets.initOnAll(this)},
-getData:function(){return this.editor.dataProcessor.toDataFormat(this.getHtml(),{context:this.getName(),filter:this.filter,enterMode:this.enterMode})}});var U=/^(?:<(?:div|span)(?: data-cke-temp="1")?(?: id="cke_copybin")?(?: data-cke-temp="1")?>)?(?:<(?:div|span)(?: style="[^"]+")?>)?<span [^>]*data-cke-copybin-start="1"[^>]*>.?<\/span>([\s\S]+)<span [^>]*data-cke-copybin-end="1"[^>]*>.?<\/span>(?:<\/(?:div|span)>)?(?:<\/(?:div|span)>)?$/i,da={37:1,38:1,39:1,40:1,8:1,46:1};(function(){function a(){}
-function b(a,b,c){return c&&this.checkElement(a)?(a=c.widgets.getByElement(a,!0))&&a.checkStyleActive(this):!1}var c={};CKEDITOR.style.addCustomHandler({type:"widget",setup:function(a){this.widget=a.widget;if(this.group="string"==typeof a.group?[a.group]:a.group){a=this.widget;var b;c[a]||(c[a]={});for(var f=0,h=this.group.length;f<h;f++)b=this.group[f],c[a][b]||(c[a][b]=[]),c[a][b].push(this)}},apply:function(a){var b;a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&(b=a.widgets.focused,
-this.group&&this.removeStylesFromSameGroup(a),b.applyStyle(this))},remove:function(a){a instanceof CKEDITOR.editor&&this.checkApplicable(a.elementPath(),a)&&a.widgets.focused.removeStyle(this)},removeStylesFromSameGroup:function(a){var b,f,h=!1;if(!(a instanceof CKEDITOR.editor))return!1;f=a.elementPath();if(this.checkApplicable(f,a))for(var g=0,k=this.group.length;g<k;g++){b=c[this.widget][this.group[g]];for(var m=0;m<b.length;m++)b[m]!==this&&b[m].checkActive(f,a)&&(a.widgets.focused.removeStyle(b[m]),
-h=!0)}return h},checkActive:function(a,b){return this.checkElementMatch(a.lastElement,0,b)},checkApplicable:function(a,b){return b instanceof CKEDITOR.editor?this.checkElement(a.lastElement):!1},checkElementMatch:b,checkElementRemovable:b,checkElement:function(a){return g.isDomWidgetWrapper(a)?(a=a.getFirst(g.isDomWidgetElement))&&a.data("widget")==this.widget:!1},buildPreview:function(a){return a||this._.definition.name},toAllowedContentRules:function(a){if(!a)return null;a=a.widgets.registered[this.widget];
-var b,c={};if(!a)return null;if(a.styleableElements){b=this.getClassesArray();if(!b)return null;c[a.styleableElements]={classes:b,propertiesOnly:!0};return c}return a.styleToAllowedContentRules?a.styleToAllowedContentRules(this):null},getClassesArray:function(){var a=this._.definition.attributes&&this._.definition.attributes["class"];return a?CKEDITOR.tools.trim(a).split(/\s+/):null},applyToRange:a,removeFromRange:a,applyToObject:a})})();CKEDITOR.plugins.widget=g;g.repository=p;g.nestedEditable=q})();(function(){function D(a){function b(){this.deflated||(a.widgets.focused==this.widget&&(this.focused=!0),a.widgets.destroy(this.widget),this.deflated=!0)}function c(){var d=a.editable(),e=a.document;if(this.deflated)this.widget=a.widgets.initOn(this.element,"image",this.widget.data),this.widget.inline&&!(new CKEDITOR.dom.elementPath(this.widget.wrapper,d)).block&&(d=e.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div"),d.replace(this.widget.wrapper),this.widget.wrapper.move(d)),this.focused&&
-(this.widget.focus(),delete this.focused),delete this.deflated;else{var b=this.widget,d=g,e=b.wrapper,c=b.data.align,b=b.data.hasCaption;if(d){for(var l=3;l--;)e.removeClass(d[l]);"center"==c?b&&e.addClass(d[1]):"none"!=c&&e.addClass(d[q[c]])}else"center"==c?(b?e.setStyle("text-align","center"):e.removeStyle("text-align"),e.removeStyle("float")):("none"==c?e.removeStyle("float"):e.setStyle("float",c),e.removeStyle("text-align"))}}var g=a.config.image2_alignClasses,f=a.config.image2_captionedClass;
-return{allowedContent:E(a),requiredContent:"img[src,alt]",features:F(a),styleableElements:"img figure",contentTransformations:[["img[width]: sizeToAttribute"]],editables:{caption:{selector:"figcaption",allowedContent:"br em strong sub sup u s; a[!href,target]"}},parts:{image:"img",caption:"figcaption"},dialog:"image2",template:'\x3cimg alt\x3d"" src\x3d"" /\x3e',data:function(){var d=this.features;this.data.hasCaption&&!a.filter.checkFeature(d.caption)&&(this.data.hasCaption=!1);"none"==this.data.align||
-a.filter.checkFeature(d.align)||(this.data.align="none");this.shiftState({widget:this,element:this.element,oldData:this.oldData,newData:this.data,deflate:b,inflate:c});this.data.link?this.parts.link||(this.parts.link=this.parts.image.getParent()):this.parts.link&&delete this.parts.link;this.parts.image.setAttributes({src:this.data.src,"data-cke-saved-src":this.data.src,alt:this.data.alt});if(this.oldData&&!this.oldData.hasCaption&&this.data.hasCaption)for(var e in this.data.classes)this.parts.image.removeClass(e);
-if(a.filter.checkFeature(d.dimension)){d=this.data;d={width:d.width,height:d.height};e=this.parts.image;for(var g in d)d[g]?e.setAttribute(g,d[g]):e.removeAttribute(g)}this.oldData=CKEDITOR.tools.extend({},this.data)},init:function(){var d=CKEDITOR.plugins.image2,b=this.parts.image,c={hasCaption:!!this.parts.caption,src:b.getAttribute("src"),alt:b.getAttribute("alt")||"",width:b.getAttribute("width")||"",height:b.getAttribute("height")||"",lock:this.ready?d.checkHasNaturalRatio(b):!0},f=b.getAscendant("a");
-f&&this.wrapper.contains(f)&&(this.parts.link=f);c.align||(b=c.hasCaption?this.element:b,g?(b.hasClass(g[0])?c.align="left":b.hasClass(g[2])&&(c.align="right"),c.align?b.removeClass(g[q[c.align]]):c.align="none"):(c.align=b.getStyle("float")||"none",b.removeStyle("float")));a.plugins.link&&this.parts.link&&(c.link=d.getLinkAttributesParser()(a,this.parts.link),(b=c.link.advanced)&&b.advCSSClasses&&(b.advCSSClasses=CKEDITOR.tools.trim(b.advCSSClasses.replace(/cke_\S+/,""))));this.wrapper[(c.hasCaption?
-"remove":"add")+"Class"]("cke_image_nocaption");this.setData(c);a.filter.checkFeature(this.features.dimension)&&!0!==a.config.image2_disableResizer&&G(this);this.shiftState=d.stateShifter(this.editor);this.on("contextMenu",function(a){a.data.image=CKEDITOR.TRISTATE_OFF;if(this.parts.link||this.wrapper.getAscendant("a"))a.data.link=a.data.unlink=CKEDITOR.TRISTATE_OFF});this.on("dialog",function(a){a.data.widget=this},this)},addClass:function(a){m(this).addClass(a)},hasClass:function(a){return m(this).hasClass(a)},
-removeClass:function(a){m(this).removeClass(a)},getClasses:function(){var a=new RegExp("^("+[].concat(f,g).join("|")+")$");return function(){var b=this.repository.parseElementClasses(m(this).getAttribute("class")),c;for(c in b)a.test(c)&&delete b[c];return b}}(),upcast:H(a),downcast:I(a),getLabel:function(){return this.editor.lang.widget.label.replace(/%1/,(this.data.alt||"")+" "+this.pathName)}}}function H(a){var b=n(a),c=a.config.image2_captionedClass;return function(a,f){var d={width:1,height:1},
-e=a.name,h;if(!a.attributes["data-cke-realelement"]&&(b(a)?("div"==e&&(h=a.getFirst("figure"))&&(a.replaceWith(h),a=h),f.align="center",h=a.getFirst("img")||a.getFirst("a").getFirst("img")):"figure"==e&&a.hasClass(c)?h=a.getFirst("img")||a.getFirst("a").getFirst("img"):r(a)&&(h="a"==a.name?a.children[0]:a),h)){for(var C in d)(d=h.attributes[C])&&d.match(J)&&delete h.attributes[C];return a}}}function I(a){var b=a.config.image2_alignClasses;return function(a){var g="a"==a.name?a.getFirst():a,f=g.attributes,
-d=this.data.align;if(!this.inline){var e=a.getFirst("span");e&&e.replaceWith(e.getFirst({img:1,a:1}))}d&&"none"!=d&&(e=CKEDITOR.tools.parseCssText(f.style||""),"center"==d&&"figure"==a.name?a=a.wrapWith(new CKEDITOR.htmlParser.element("div",b?{"class":b[1]}:{style:"text-align:center"})):d in{left:1,right:1}&&(b?g.addClass(b[q[d]]):e["float"]=d),b||CKEDITOR.tools.isEmpty(e)||(f.style=CKEDITOR.tools.writeCssText(e)));return a}}function n(a){var b=a.config.image2_captionedClass,c=a.config.image2_alignClasses,
-g={figure:1,a:1,img:1};return function(f){if(!(f.name in{div:1,p:1}))return!1;var d=f.children;if(1!==d.length)return!1;d=d[0];if(!(d.name in g))return!1;if("p"==f.name){if(!r(d))return!1}else if("figure"==d.name){if(!d.hasClass(b))return!1}else if(a.enterMode==CKEDITOR.ENTER_P||!r(d))return!1;return(c?f.hasClass(c[1]):"center"==CKEDITOR.tools.parseCssText(f.attributes.style||"",!0)["text-align"])?!0:!1}}function r(a){return"img"==a.name?!0:"a"==a.name?1==a.children.length&&a.getFirst("img"):!1}function G(a){var b=
-a.editor,c=b.editable(),g=b.document,f=a.resizer=g.createElement("span");f.addClass("cke_image_resizer");f.setAttribute("title",b.lang.image2.resizer);f.append(new CKEDITOR.dom.text("​",g));if(a.inline)a.wrapper.append(f);else{var d=a.parts.link||a.parts.image,e=d.getParent(),h=g.createElement("span");h.addClass("cke_image_resizer_wrapper");h.append(d);h.append(f);a.element.append(h,!0);e.is("span")&&e.remove()}f.on("mousedown",function(d){function l(a,b,d){var l=CKEDITOR.document,c=[];g.equals(l)||
-c.push(l.on(a,b));c.push(g.on(a,b));if(d)for(a=c.length;a--;)d.push(c.pop())}function e(){t=m+A*x;u=Math.round(t/v)}function w(){u=q-p;t=Math.round(u*v)}var h=a.parts.image,A="right"==a.data.align?-1:1,k=d.data.$.screenX,K=d.data.$.screenY,m=h.$.clientWidth,q=h.$.clientHeight,v=m/q,n=[],r="cke_image_s"+(~A?"e":"w"),B,t,u,z,x,p,y;b.fire("saveSnapshot");l("mousemove",function(a){B=a.data.$;x=B.screenX-k;p=K-B.screenY;y=Math.abs(x/p);1==A?0>=x?0>=p?e():y>=v?e():w():0>=p?y>=v?w():e():w():0>=x?0>=p?y>=
-v?w():e():w():0>=p?e():y>=v?e():w();15<=t&&15<=u?(h.setAttributes({width:t,height:u}),z=!0):z=!1},n);l("mouseup",function(){for(var d;d=n.pop();)d.removeListener();c.removeClass(r);f.removeClass("cke_image_resizing");z&&(a.setData({width:t,height:u}),b.fire("saveSnapshot"));z=!1},n);c.addClass(r);f.addClass("cke_image_resizing")});a.on("data",function(){f["right"==a.data.align?"addClass":"removeClass"]("cke_image_resizer_left")})}function L(a){var b=[],c;return function(g){var f=a.getCommand("justify"+
-g);if(f){b.push(function(){f.refresh(a,a.elementPath())});if(g in{right:1,left:1,center:1})f.on("exec",function(d){var c=k(a);if(c){c.setData("align",g);for(c=b.length;c--;)b[c]();d.cancel()}});f.on("refresh",function(b){var f=k(a),h={right:1,left:1,center:1};f&&(void 0===c&&(c=a.filter.checkFeature(a.widgets.registered.image.features.align)),c?this.setState(f.data.align==g?CKEDITOR.TRISTATE_ON:g in h?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED):this.setState(CKEDITOR.TRISTATE_DISABLED),b.cancel())})}}}
-function M(a){a.plugins.link&&(CKEDITOR.on("dialogDefinition",function(b){b=b.data;if("link"==b.name){b=b.definition;var c=b.onShow,g=b.onOk;b.onShow=function(){var b=k(a),d=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent();b&&(b.inline?!b.wrapper.getAscendant("a"):1)?(this.setupContent(b.data.link||{}),d.hide()):(d.show(),c.apply(this,arguments))};b.onOk=function(){var b=k(a);if(b&&(b.inline?!b.wrapper.getAscendant("a"):1)){var c={};this.commitContent(c);b.setData("link",
-c)}else g.apply(this,arguments)}}}),a.getCommand("unlink").on("exec",function(b){var c=k(a);c&&c.parts.link&&(c.setData("link",null),this.refresh(a,a.elementPath()),b.cancel())}),a.getCommand("unlink").on("refresh",function(b){var c=k(a);c&&(this.setState(c.data.link||c.wrapper.getAscendant("a")?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED),b.cancel())}))}function k(a){return(a=a.widgets.focused)&&"image"==a.name?a:null}function E(a){var b=a.config.image2_alignClasses;a={div:{match:n(a)},p:{match:n(a)},
-img:{attributes:"!src,alt,width,height"},figure:{classes:"!"+a.config.image2_captionedClass},figcaption:!0};b?(a.div.classes=b[1],a.p.classes=a.div.classes,a.img.classes=b[0]+","+b[2],a.figure.classes+=","+a.img.classes):(a.div.styles="text-align",a.p.styles="text-align",a.img.styles="float",a.figure.styles="float,display");return a}function F(a){a=a.config.image2_alignClasses;return{dimension:{requiredContent:"img[width,height]"},align:{requiredContent:"img"+(a?"("+a[0]+")":"{float}")},caption:{requiredContent:"figcaption"}}}
-function m(a){return a.data.hasCaption?a.element:a.parts.image}var N=new CKEDITOR.template('\x3cfigure class\x3d"{captionedClass}"\x3e\x3cimg alt\x3d"" src\x3d"" /\x3e\x3cfigcaption\x3e{captionPlaceholder}\x3c/figcaption\x3e\x3c/figure\x3e'),q={left:0,center:1,right:2},J=/^\s*(\d+\%)\s*$/i;CKEDITOR.plugins.add("image2",{requires:"widget,dialog",icons:"image",hidpi:!0,onLoad:function(){CKEDITOR.addCss(".cke_image_nocaption{line-height:0}.cke_editable.cke_image_sw, .cke_editable.cke_image_sw *{cursor:sw-resize !important}.cke_editable.cke_image_se, .cke_editable.cke_image_se *{cursor:se-resize !important}.cke_image_resizer{display:none;position:absolute;width:10px;height:10px;bottom:-5px;right:-5px;background:#000;outline:1px solid #fff;line-height:0;cursor:se-resize;}.cke_image_resizer_wrapper{position:relative;display:inline-block;line-height:0;}.cke_image_resizer.cke_image_resizer_left{right:auto;left:-5px;cursor:sw-resize;}.cke_widget_wrapper:hover .cke_image_resizer,.cke_image_resizer.cke_image_resizing{display:block}.cke_widget_wrapper\x3ea{display:inline-block}")},
-init:function(a){var b=a.config,c=a.lang.image2,g=D(a);b.filebrowserImage2BrowseUrl=b.filebrowserImageBrowseUrl;b.filebrowserImage2UploadUrl=b.filebrowserImageUploadUrl;g.pathName=c.pathName;g.editables.caption.pathName=c.pathNameCaption;a.widgets.add("image",g);a.ui.addButton&&a.ui.addButton("Image",{label:a.lang.common.image,command:"image",toolbar:"insert,10"});a.contextMenu&&(a.addMenuGroup("image",10),a.addMenuItem("image",{label:c.menu,command:"image",group:"image"}));CKEDITOR.dialog.add("image2",
-this.path+"dialogs/image2.js")},afterInit:function(a){var b={left:1,right:1,center:1,block:1},c=L(a),g;for(g in b)c(g);M(a)}});CKEDITOR.plugins.image2={stateShifter:function(a){function b(a,b){var d={};f?d.attributes={"class":f[1]}:d.styles={"text-align":"center"};d=g.createElement(a.activeEnterMode==CKEDITOR.ENTER_P?"p":"div",d);c(d,b);b.move(d);return d}function c(b,d){if(d.getParent()){var c=a.createRange();c.moveToPosition(d,CKEDITOR.POSITION_BEFORE_START);d.remove();e.insertElementIntoRange(b,
-c)}else b.replace(d)}var g=a.document,f=a.config.image2_alignClasses,d=a.config.image2_captionedClass,e=a.editable(),h=["hasCaption","align","link"],k={align:function(d,c,g){var e=d.element;d.changed.align?d.newData.hasCaption||("center"==g&&(d.deflate(),d.element=b(a,e)),d.changed.hasCaption||"center"!=c||"center"==g||(d.deflate(),c=e.findOne("a,img"),c.replace(e),d.element=c)):"center"==g&&d.changed.hasCaption&&!d.newData.hasCaption&&(d.deflate(),d.element=b(a,e));!f&&e.is("figure")&&("center"==
-g?e.setStyle("display","inline-block"):e.removeStyle("display"))},hasCaption:function(b,e,f){b.changed.hasCaption&&(e=b.element.is({img:1,a:1})?b.element:b.element.findOne("a,img"),b.deflate(),f?(f=CKEDITOR.dom.element.createFromHtml(N.output({captionedClass:d,captionPlaceholder:a.lang.image2.captionPlaceholder}),g),c(f,b.element),e.replace(f.findOne("img")),b.element=f):(e.replace(b.element),b.element=e))},link:function(b,d,c){if(b.changed.link){var e=b.element.is("img")?b.element:b.element.findOne("img"),
-f=b.element.is("a")?b.element:b.element.findOne("a"),h=b.element.is("a")&&!c||b.element.is("img")&&c,k;h&&b.deflate();c?(d||(k=g.createElement("a",{attributes:{href:b.newData.link.url}}),k.replace(e),e.move(k)),c=CKEDITOR.plugins.image2.getLinkAttributesGetter()(a,c),CKEDITOR.tools.isEmpty(c.set)||(k||f).setAttributes(c.set),c.removed.length&&(k||f).removeAttributes(c.removed)):(c=f.findOne("img"),c.replace(f),k=c);h&&(b.element=k)}}};return function(a){var b,c;a.changed={};for(c=0;c<h.length;c++)b=
-h[c],a.changed[b]=a.oldData?a.oldData[b]!==a.newData[b]:!1;for(c=0;c<h.length;c++)b=h[c],k[b](a,a.oldData?a.oldData[b]:null,a.newData[b]);a.inflate()}},checkHasNaturalRatio:function(a){var b=a.$;a=this.getNatural(a);return Math.round(b.clientWidth/a.width*a.height)==b.clientHeight||Math.round(b.clientHeight/a.height*a.width)==b.clientWidth},getNatural:function(a){if(a.$.naturalWidth)a={width:a.$.naturalWidth,height:a.$.naturalHeight};else{var b=new Image;b.src=a.getAttribute("src");a={width:b.width,
-height:b.height}}return a},getLinkAttributesGetter:function(){return CKEDITOR.plugins.link.getLinkAttributes},getLinkAttributesParser:function(){return CKEDITOR.plugins.link.parseLinkAttributes}}})();CKEDITOR.config.image2_captionedClass="image";(function(){function m(a,b){var e,f;b.on("refresh",function(a){var b=[k],c;for(c in a.data.states)b.push(a.data.states[c]);this.setState(CKEDITOR.tools.search(b,p)?p:k)},b,null,100);b.on("exec",function(b){e=a.getSelection();f=e.createBookmarks(1);b.data||(b.data={});b.data.done=!1},b,null,0);b.on("exec",function(){a.forceNextSelectionCheck();e.selectBookmarks(f)},b,null,100)}var k=CKEDITOR.TRISTATE_DISABLED,p=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indent",{init:function(a){var b=CKEDITOR.plugins.indent.genericDefinition;
-m(a,a.addCommand("indent",new b(!0)));m(a,a.addCommand("outdent",new b));a.ui.addButton&&(a.ui.addButton("Indent",{label:a.lang.indent.indent,command:"indent",directional:!0,toolbar:"indent,20"}),a.ui.addButton("Outdent",{label:a.lang.indent.outdent,command:"outdent",directional:!0,toolbar:"indent,10"}));a.on("dirChanged",function(b){var f=a.createRange(),l=b.data.node;f.setStartBefore(l);f.setEndAfter(l);for(var n=new CKEDITOR.dom.walker(f),c;c=n.next();)if(c.type==CKEDITOR.NODE_ELEMENT)if(!c.equals(l)&&
-c.getDirection())f.setStartAfter(c),n=new CKEDITOR.dom.walker(f);else{var d=a.config.indentClasses;if(d)for(var g="ltr"==b.data.dir?["_rtl",""]:["","_rtl"],h=0;h<d.length;h++)c.hasClass(d[h]+g[0])&&(c.removeClass(d[h]+g[0]),c.addClass(d[h]+g[1]));d=c.getStyle("margin-right");g=c.getStyle("margin-left");d?c.setStyle("margin-left",d):c.removeStyle("margin-left");g?c.setStyle("margin-right",g):c.removeStyle("margin-right")}})}});CKEDITOR.plugins.indent={genericDefinition:function(a){this.isIndent=!!a;
-this.startDisabled=!this.isIndent},specificDefinition:function(a,b,e){this.name=b;this.editor=a;this.jobs={};this.enterBr=a.config.enterMode==CKEDITOR.ENTER_BR;this.isIndent=!!e;this.relatedGlobal=e?"indent":"outdent";this.indentKey=e?9:CKEDITOR.SHIFT+9;this.database={}},registerCommands:function(a,b){a.on("pluginsLoaded",function(){for(var a in b)(function(a,b){var e=a.getCommand(b.relatedGlobal),c;for(c in b.jobs)e.on("exec",function(d){d.data.done||(a.fire("lockSnapshot"),b.execJob(a,c)&&(d.data.done=
-!0),a.fire("unlockSnapshot"),CKEDITOR.dom.element.clearAllMarkers(b.database))},this,null,c),e.on("refresh",function(d){d.data.states||(d.data.states={});d.data.states[b.name+"@"+c]=b.refreshJob(a,c,d.data.path)},this,null,c);a.addFeature(b)})(this,b[a])})}};CKEDITOR.plugins.indent.genericDefinition.prototype={context:"p",exec:function(){}};CKEDITOR.plugins.indent.specificDefinition.prototype={execJob:function(a,b){var e=this.jobs[b];if(e.state!=k)return e.exec.call(this,a)},refreshJob:function(a,
-b,e){b=this.jobs[b];a.activeFilter.checkFeature(this)?b.state=b.refresh.call(this,a,e):b.state=k;return b.state},getContext:function(a){return a.contains(this.context)}}})();(function(){function w(c){function f(b){for(var e=d.startContainer,a=d.endContainer;e&&!e.getParent().equals(b);)e=e.getParent();for(;a&&!a.getParent().equals(b);)a=a.getParent();if(!e||!a)return!1;for(var g=e,e=[],k=!1;!k;)g.equals(a)&&(k=!0),e.push(g),g=g.getNext();if(1>e.length)return!1;g=b.getParents(!0);for(a=0;a<g.length;a++)if(g[a].getName&&p[g[a].getName()]){b=g[a];break}for(var g=l.isIndent?1:-1,a=e[0],e=e[e.length-1],k=CKEDITOR.plugins.list.listToArray(b,q),n=k[e.getCustomData("listarray_index")].indent,
-a=a.getCustomData("listarray_index");a<=e.getCustomData("listarray_index");a++)if(k[a].indent+=g,0<g){var h=k[a].parent;k[a].parent=new CKEDITOR.dom.element(h.getName(),h.getDocument())}for(a=e.getCustomData("listarray_index")+1;a<k.length&&k[a].indent>n;a++)k[a].indent+=g;e=CKEDITOR.plugins.list.arrayToList(k,q,null,c.config.enterMode,b.getDirection());if(!l.isIndent){var f;if((f=b.getParent())&&f.is("li"))for(var g=e.listNode.getChildren(),r=[],m,a=g.count()-1;0<=a;a--)(m=g.getItem(a))&&m.is&&m.is("li")&&
-r.push(m)}e&&e.listNode.replace(b);if(r&&r.length)for(a=0;a<r.length;a++){for(m=b=r[a];(m=m.getNext())&&m.is&&m.getName()in p;)CKEDITOR.env.needsNbspFiller&&!b.getFirst(x)&&b.append(d.document.createText(" ")),b.append(m);b.insertAfter(f)}e&&c.fire("contentDomInvalidated");return!0}for(var l=this,q=this.database,p=this.context,n=c.getSelection(),n=(n&&n.getRanges()).createIterator(),d;d=n.getNextRange();){for(var b=d.getCommonAncestor();b&&(b.type!=CKEDITOR.NODE_ELEMENT||!p[b.getName()]);){if(c.editable().equals(b)){b=
-!1;break}b=b.getParent()}b||(b=d.startPath().contains(p))&&d.setEndAt(b,CKEDITOR.POSITION_BEFORE_END);if(!b){var h=d.getEnclosedNode();h&&h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in p&&(d.setStartAt(h,CKEDITOR.POSITION_AFTER_START),d.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),b=h)}b&&d.startContainer.type==CKEDITOR.NODE_ELEMENT&&d.startContainer.getName()in p&&(h=new CKEDITOR.dom.walker(d),h.evaluator=t,d.startContainer=h.next());b&&d.endContainer.type==CKEDITOR.NODE_ELEMENT&&d.endContainer.getName()in
-p&&(h=new CKEDITOR.dom.walker(d),h.evaluator=t,d.endContainer=h.previous());if(b)return f(b)}return 0}function t(c){return c.type==CKEDITOR.NODE_ELEMENT&&c.is("li")}function x(c){return y(c)&&z(c)}var y=CKEDITOR.dom.walker.whitespaces(!0),z=CKEDITOR.dom.walker.bookmark(!1,!0),u=CKEDITOR.TRISTATE_DISABLED,v=CKEDITOR.TRISTATE_OFF;CKEDITOR.plugins.add("indentlist",{requires:"indent",init:function(c){function f(c){l.specificDefinition.apply(this,arguments);this.requiredContent=["ul","ol"];c.on("key",
-function(f){if("wysiwyg"==c.mode&&f.data.keyCode==this.indentKey){var n=this.getContext(c.elementPath());!n||this.isIndent&&CKEDITOR.plugins.indentList.firstItemInPath(this.context,c.elementPath(),n)||(c.execCommand(this.relatedGlobal),f.cancel())}},this);this.jobs[this.isIndent?10:30]={refresh:this.isIndent?function(c,f){var d=this.getContext(f),b=CKEDITOR.plugins.indentList.firstItemInPath(this.context,f,d);return d&&this.isIndent&&!b?v:u}:function(c,f){return!this.getContext(f)||this.isIndent?
-u:v},exec:CKEDITOR.tools.bind(w,this)}}var l=CKEDITOR.plugins.indent;l.registerCommands(c,{indentlist:new f(c,"indentlist",!0),outdentlist:new f(c,"outdentlist")});CKEDITOR.tools.extend(f.prototype,l.specificDefinition.prototype,{context:{ol:1,ul:1}})}});CKEDITOR.plugins.indentList={};CKEDITOR.plugins.indentList.firstItemInPath=function(c,f,l){var q=f.contains(t);l||(l=f.contains(c));return l&&q&&q.equals(l.getFirst(t))}})();(function(){function g(a,b){var c=l.exec(a),d=l.exec(b);if(c){if(!c[2]&&"px"==d[2])return d[1];if("px"==c[2]&&!d[2])return d[1]+"px"}return b}var k=CKEDITOR.htmlParser.cssStyle,h=CKEDITOR.tools.cssLength,l=/^((?:\d*(?:\.\d+))|(?:\d+))(.*)?$/i,m={elements:{$:function(a){var b=a.attributes;if((b=(b=(b=b&&b["data-cke-realelement"])&&new CKEDITOR.htmlParser.fragment.fromHtml(decodeURIComponent(b)))&&b.children[0])&&a.attributes["data-cke-resizable"]){var c=(new k(a)).rules;a=b.attributes;var d=c.width,
-c=c.height;d&&(a.width=g(a.width,d));c&&(a.height=g(a.height,c))}return b}}};CKEDITOR.plugins.add("fakeobjects",{init:function(a){a.filter.allow("img[!data-cke-realelement,src,alt,title](*){*}","fakeobjects")},afterInit:function(a){(a=(a=a.dataProcessor)&&a.htmlFilter)&&a.addRules(m,{applyToAll:!0})}});CKEDITOR.editor.prototype.createFakeElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown;b={"class":b,"data-cke-realelement":encodeURIComponent(a.getOuterHtml()),"data-cke-real-node-type":a.type,
-alt:e,title:e,align:a.getAttribute("align")||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,c=new k,d=a.getAttribute("width"),a=a.getAttribute("height"),d&&(c.rules.width=h(d)),a&&(c.rules.height=h(a)),c.populate(b));return this.document.createElement("img",{attributes:b})};CKEDITOR.editor.prototype.createFakeParserElement=function(a,b,c,d){var e=this.lang.fakeobjects,e=e[c]||e.unknown,f;f=new CKEDITOR.htmlParser.basicWriter;
-a.writeHtml(f);f=f.getHtml();b={"class":b,"data-cke-realelement":encodeURIComponent(f),"data-cke-real-node-type":a.type,alt:e,title:e,align:a.attributes.align||""};CKEDITOR.env.hc||(b.src=CKEDITOR.tools.transparentImageData);c&&(b["data-cke-real-element-type"]=c);d&&(b["data-cke-resizable"]=d,d=a.attributes,a=new k,c=d.width,d=d.height,void 0!==c&&(a.rules.width=h(c)),void 0!==d&&(a.rules.height=h(d)),a.populate(b));return new CKEDITOR.htmlParser.element("img",b)};CKEDITOR.editor.prototype.restoreRealElement=
-function(a){if(a.data("cke-real-node-type")!=CKEDITOR.NODE_ELEMENT)return null;var b=CKEDITOR.dom.element.createFromHtml(decodeURIComponent(a.data("cke-realelement")),this.document);if(a.data("cke-resizable")){var c=a.getStyle("width");a=a.getStyle("height");c&&b.setAttribute("width",g(b.getAttribute("width"),c));a&&b.setAttribute("height",g(b.getAttribute("height"),a))}return b}})();(function(){function p(c){return c.replace(/'/g,"\\$\x26")}function q(c){for(var b,a=c.length,f=[],e=0;e<a;e++)b=c.charCodeAt(e),f.push(b);return"String.fromCharCode("+f.join(",")+")"}function r(c,b){var a=c.plugins.link,f=a.compiledProtectionFunction.params,e,d;d=[a.compiledProtectionFunction.name,"("];for(var g=0;g<f.length;g++)a=f[g].toLowerCase(),e=b[a],0<g&&d.push(","),d.push("'",e?p(encodeURIComponent(b[a])):"","'");d.push(")");return d.join("")}function n(c){c=c.config.emailProtection||"";
-var b;c&&"encode"!=c&&(b={},c.replace(/^([^(]+)\(([^)]+)\)$/,function(a,c,e){b.name=c;b.params=[];e.replace(/[^,\s]+/g,function(a){b.params.push(a)})}));return b}CKEDITOR.plugins.add("link",{requires:"dialog,fakeobjects",onLoad:function(){function c(b){return a.replace(/%1/g,"rtl"==b?"right":"left").replace(/%2/g,"cke_contents_"+b)}var b="background:url("+CKEDITOR.getUrl(this.path+"images"+(CKEDITOR.env.hidpi?"/hidpi":"")+"/anchor.png")+") no-repeat %1 center;border:1px dotted #00f;background-size:16px;",
-a=".%2 a.cke_anchor,.%2 a.cke_anchor_empty,.cke_editable.%2 a[name],.cke_editable.%2 a[data-cke-saved-name]{"+b+"padding-%1:18px;cursor:auto;}.%2 img.cke_anchor{"+b+"width:16px;min-height:15px;height:1.15em;vertical-align:text-bottom;}";CKEDITOR.addCss(c("ltr")+c("rtl"))},init:function(c){var b="a[!href]";CKEDITOR.dialog.isTabEnabled(c,"link","advanced")&&(b=b.replace("]",",accesskey,charset,dir,id,lang,name,rel,tabindex,title,type,download]{*}(*)"));CKEDITOR.dialog.isTabEnabled(c,"link","target")&&
-(b=b.replace("]",",target,onclick]"));c.addCommand("link",new CKEDITOR.dialogCommand("link",{allowedContent:b,requiredContent:"a[href]"}));c.addCommand("anchor",new CKEDITOR.dialogCommand("anchor",{allowedContent:"a[!name,id]",requiredContent:"a[name]"}));c.addCommand("unlink",new CKEDITOR.unlinkCommand);c.addCommand("removeAnchor",new CKEDITOR.removeAnchorCommand);c.setKeystroke(CKEDITOR.CTRL+76,"link");c.ui.addButton&&(c.ui.addButton("Link",{label:c.lang.link.toolbar,command:"link",toolbar:"links,10"}),
-c.ui.addButton("Unlink",{label:c.lang.link.unlink,command:"unlink",toolbar:"links,20"}),c.ui.addButton("Anchor",{label:c.lang.link.anchor.toolbar,command:"anchor",toolbar:"links,30"}));CKEDITOR.dialog.add("link",this.path+"dialogs/link.js");CKEDITOR.dialog.add("anchor",this.path+"dialogs/anchor.js");c.on("doubleclick",function(a){var b=CKEDITOR.plugins.link.getSelectedLink(c)||a.data.element;b.isReadOnly()||(b.is("a")?(a.data.dialog=!b.getAttribute("name")||b.getAttribute("href")&&b.getChildCount()?
-"link":"anchor",a.data.link=b):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b)&&(a.data.dialog="anchor"))},null,null,0);c.on("doubleclick",function(a){a.data.dialog in{link:1,anchor:1}&&a.data.link&&c.getSelection().selectElement(a.data.link)},null,null,20);c.addMenuItems&&c.addMenuItems({anchor:{label:c.lang.link.anchor.menu,command:"anchor",group:"anchor",order:1},removeAnchor:{label:c.lang.link.anchor.remove,command:"removeAnchor",group:"anchor",order:5},link:{label:c.lang.link.menu,command:"link",
-group:"link",order:1},unlink:{label:c.lang.link.unlink,command:"unlink",group:"link",order:5}});c.contextMenu&&c.contextMenu.addListener(function(a){if(!a||a.isReadOnly())return null;a=CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a);if(!a&&!(a=CKEDITOR.plugins.link.getSelectedLink(c)))return null;var b={};a.getAttribute("href")&&a.getChildCount()&&(b={link:CKEDITOR.TRISTATE_OFF,unlink:CKEDITOR.TRISTATE_OFF});a&&a.hasAttribute("name")&&(b.anchor=b.removeAnchor=CKEDITOR.TRISTATE_OFF);return b});this.compiledProtectionFunction=
-n(c)},afterInit:function(c){c.dataProcessor.dataFilter.addRules({elements:{a:function(a){return a.attributes.name?a.children.length?null:c.createFakeParserElement(a,"cke_anchor","anchor"):null}}});var b=c._.elementsPath&&c._.elementsPath.filters;b&&b.push(function(a,b){if("a"==b&&(CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,a)||a.getAttribute("name")&&(!a.getAttribute("href")||!a.getChildCount())))return"anchor"})}});var t=/^javascript:/,u=/^mailto:([^?]+)(?:\?(.+))?$/,v=/subject=([^;?:@&=$,\/]*)/i,
-w=/body=([^;?:@&=$,\/]*)/i,x=/^#(.*)$/,y=/^((?:http|https|ftp|news):\/\/)?(.*)$/,z=/^(_(?:self|top|parent|blank))$/,A=/^javascript:void\(location\.href='mailto:'\+String\.fromCharCode\(([^)]+)\)(?:\+'(.*)')?\)$/,B=/^javascript:([^(]+)\(([^)]+)\)$/,C=/\s*window.open\(\s*this\.href\s*,\s*(?:'([^']*)'|null)\s*,\s*'([^']*)'\s*\)\s*;\s*return\s*false;*\s*/,D=/(?:^|,)([^=]+)=(\d+|yes|no)/gi,m={id:"advId",dir:"advLangDir",accessKey:"advAccessKey",name:"advName",lang:"advLangCode",tabindex:"advTabIndex",
-title:"advTitle",type:"advContentType","class":"advCSSClasses",charset:"advCharset",style:"advStyles",rel:"advRel"};CKEDITOR.plugins.link={getSelectedLink:function(c){var b=c.getSelection(),a=b.getSelectedElement();return a&&a.is("a")?a:(b=b.getRanges()[0])?(b.shrink(CKEDITOR.SHRINK_TEXT),c.elementPath(b.getCommonAncestor()).contains("a",1)):null},getEditorAnchors:function(c){for(var b=c.editable(),a=b.isInline()&&!c.plugins.divarea?c.document:b,b=a.getElementsByTag("a"),a=a.getElementsByTag("img"),
-f=[],e=0,d;d=b.getItem(e++);)(d.data("cke-saved-name")||d.hasAttribute("name"))&&f.push({name:d.data("cke-saved-name")||d.getAttribute("name"),id:d.getAttribute("id")});for(e=0;d=a.getItem(e++);)(d=this.tryRestoreFakeAnchor(c,d))&&f.push({name:d.getAttribute("name"),id:d.getAttribute("id")});return f},fakeAnchor:!0,tryRestoreFakeAnchor:function(c,b){if(b&&b.data("cke-real-element-type")&&"anchor"==b.data("cke-real-element-type")){var a=c.restoreRealElement(b);if(a.data("cke-saved-name"))return a}},
-parseLinkAttributes:function(c,b){var a=b&&(b.data("cke-saved-href")||b.getAttribute("href"))||"",f=c.plugins.link.compiledProtectionFunction,e=c.config.emailProtection,d,g={};a.match(t)&&("encode"==e?a=a.replace(A,function(a,b,c){c=c||"";return"mailto:"+String.fromCharCode.apply(String,b.split(","))+c.replace(/\\'/g,"'")}):e&&a.replace(B,function(a,b,c){if(b==f.name){g.type="email";a=g.email={};b=/(^')|('$)/g;c=c.match(/[^,\s]+/g);for(var d=c.length,e,h,k=0;k<d;k++)e=decodeURIComponent,h=c[k].replace(b,
-"").replace(/\\'/g,"'"),h=e(h),e=f.params[k].toLowerCase(),a[e]=h;a.address=[a.name,a.domain].join("@")}}));if(!g.type)if(e=a.match(x))g.type="anchor",g.anchor={},g.anchor.name=g.anchor.id=e[1];else if(e=a.match(u)){d=a.match(v);a=a.match(w);g.type="email";var k=g.email={};k.address=e[1];d&&(k.subject=decodeURIComponent(d[1]));a&&(k.body=decodeURIComponent(a[1]))}else a&&(d=a.match(y))&&(g.type="url",g.url={},g.url.protocol=d[1],g.url.url=d[2]);if(b){if(a=b.getAttribute("target"))g.target={type:a.match(z)?
-a:"frame",name:a};else if(a=(a=b.data("cke-pa-onclick")||b.getAttribute("onclick"))&&a.match(C))for(g.target={type:"popup",name:a[1]};e=D.exec(a[2]);)"yes"!=e[2]&&"1"!=e[2]||e[1]in{height:1,width:1,top:1,left:1}?isFinite(e[2])&&(g.target[e[1]]=e[2]):g.target[e[1]]=!0;null!==b.getAttribute("download")&&(g.download=!0);var a={},h;for(h in m)(e=b.getAttribute(h))&&(a[m[h]]=e);if(h=b.data("cke-saved-name")||a.advName)a.advName=h;CKEDITOR.tools.isEmpty(a)||(g.advanced=a)}return g},getLinkAttributes:function(c,
-b){var a=c.config.emailProtection||"",f={};switch(b.type){case "url":var a=b.url&&void 0!==b.url.protocol?b.url.protocol:"http://",e=b.url&&CKEDITOR.tools.trim(b.url.url)||"";f["data-cke-saved-href"]=0===e.indexOf("/")?e:a+e;break;case "anchor":a=b.anchor&&b.anchor.id;f["data-cke-saved-href"]="#"+(b.anchor&&b.anchor.name||a||"");break;case "email":var d=b.email,e=d.address;switch(a){case "":case "encode":var g=encodeURIComponent(d.subject||""),k=encodeURIComponent(d.body||""),d=[];g&&d.push("subject\x3d"+
-g);k&&d.push("body\x3d"+k);d=d.length?"?"+d.join("\x26"):"";"encode"==a?(a=["javascript:void(location.href\x3d'mailto:'+",q(e)],d&&a.push("+'",p(d),"'"),a.push(")")):a=["mailto:",e,d];break;default:a=e.split("@",2),d.name=a[0],d.domain=a[1],a=["javascript:",r(c,d)]}f["data-cke-saved-href"]=a.join("")}if(b.target)if("popup"==b.target.type){for(var a=["window.open(this.href, '",b.target.name||"","', '"],h="resizable status location toolbar menubar fullscreen scrollbars dependent".split(" "),e=h.length,
-g=function(a){b.target[a]&&h.push(a+"\x3d"+b.target[a])},d=0;d<e;d++)h[d]+=b.target[h[d]]?"\x3dyes":"\x3dno";g("width");g("left");g("height");g("top");a.push(h.join(","),"'); return false;");f["data-cke-pa-onclick"]=a.join("")}else"notSet"!=b.target.type&&b.target.name&&(f.target=b.target.name);b.download&&(f.download="");if(b.advanced){for(var l in m)(a=b.advanced[m[l]])&&(f[l]=a);f.name&&(f["data-cke-saved-name"]=f.name)}f["data-cke-saved-href"]&&(f.href=f["data-cke-saved-href"]);l={target:1,onclick:1,
-"data-cke-pa-onclick":1,"data-cke-saved-name":1,download:1};b.advanced&&CKEDITOR.tools.extend(l,m);for(var n in f)delete l[n];return{set:f,removed:CKEDITOR.tools.objectKeys(l)}},showDisplayTextForElement:function(c,b){var a={img:1,table:1,tbody:1,thead:1,tfoot:1,input:1,select:1,textarea:1};return b.widgets&&b.widgets.focused?!1:!c||!c.getName||!c.is(a)}};CKEDITOR.unlinkCommand=function(){};CKEDITOR.unlinkCommand.prototype={exec:function(c){var b=new CKEDITOR.style({element:"a",type:CKEDITOR.STYLE_INLINE,
-alwaysRemoveElement:1});c.removeStyle(b)},refresh:function(c,b){var a=b.lastElement&&b.lastElement.getAscendant("a",!0);a&&"a"==a.getName()&&a.getAttribute("href")&&a.getChildCount()?this.setState(CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_DISABLED)},contextSensitive:1,startDisabled:1,requiredContent:"a[href]"};CKEDITOR.removeAnchorCommand=function(){};CKEDITOR.removeAnchorCommand.prototype={exec:function(c){var b=c.getSelection(),a=b.createBookmarks(),f;if(b&&(f=b.getSelectedElement())&&
-(f.getChildCount()?f.is("a"):CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,f)))f.remove(1);else if(f=CKEDITOR.plugins.link.getSelectedLink(c))f.hasAttribute("href")?(f.removeAttributes({name:1,"data-cke-saved-name":1}),f.removeClass("cke_anchor")):f.remove(1);b.selectBookmarks(a)},requiredContent:"a[name]"};CKEDITOR.tools.extend(CKEDITOR.config,{linkShowAdvancedTab:!0,linkShowTargetTab:!0})})();(function(){function I(b,m,e){function c(c){if(!(!(a=d[c?"getFirst":"getLast"]())||a.is&&a.isBlockBoundary()||!(p=m.root[c?"getPrevious":"getNext"](CKEDITOR.dom.walker.invisible(!0)))||p.is&&p.isBlockBoundary({br:1})))b.document.createElement("br")[c?"insertBefore":"insertAfter"](a)}for(var f=CKEDITOR.plugins.list.listToArray(m.root,e),g=[],k=0;k<m.contents.length;k++){var h=m.contents[k];(h=h.getAscendant("li",!0))&&!h.getCustomData("list_item_processed")&&(g.push(h),CKEDITOR.dom.element.setMarker(e,
-h,"list_item_processed",!0))}h=null;for(k=0;k<g.length;k++)h=g[k].getCustomData("listarray_index"),f[h].indent=-1;for(k=h+1;k<f.length;k++)if(f[k].indent>f[k-1].indent+1){g=f[k-1].indent+1-f[k].indent;for(h=f[k].indent;f[k]&&f[k].indent>=h;)f[k].indent+=g,k++;k--}var d=CKEDITOR.plugins.list.arrayToList(f,e,null,b.config.enterMode,m.root.getAttribute("dir")).listNode,a,p;c(!0);c();d.replace(m.root);b.fire("contentDomInvalidated")}function B(b,m){this.name=b;this.context=this.type=m;this.allowedContent=
-m+" li";this.requiredContent=m}function E(b,m,e,c){for(var f,g;f=b[c?"getLast":"getFirst"](J);)(g=f.getDirection(1))!==m.getDirection(1)&&f.setAttribute("dir",g),f.remove(),e?f[c?"insertBefore":"insertAfter"](e):m.append(f,c)}function F(b){function m(e){var c=b[e?"getPrevious":"getNext"](u);c&&c.type==CKEDITOR.NODE_ELEMENT&&c.is(b.getName())&&(E(b,c,null,!e),b.remove(),b=c)}m();m(1)}function G(b){return b.type==CKEDITOR.NODE_ELEMENT&&(b.getName()in CKEDITOR.dtd.$block||b.getName()in CKEDITOR.dtd.$listItem)&&
-CKEDITOR.dtd[b.getName()]["#"]}function C(b,m,e){b.fire("saveSnapshot");e.enlarge(CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS);var c=e.extractContents();m.trim(!1,!0);var f=m.createBookmark(),g=new CKEDITOR.dom.elementPath(m.startContainer),k=g.block,g=g.lastElement.getAscendant("li",1)||k,h=new CKEDITOR.dom.elementPath(e.startContainer),d=h.contains(CKEDITOR.dtd.$listItem),h=h.contains(CKEDITOR.dtd.$list);k?(k=k.getBogus())&&k.remove():h&&(k=h.getPrevious(u))&&z(k)&&k.remove();(k=c.getLast())&&k.type==CKEDITOR.NODE_ELEMENT&&
-k.is("br")&&k.remove();(k=m.startContainer.getChild(m.startOffset))?c.insertBefore(k):m.startContainer.append(c);d&&(c=A(d))&&(g.contains(d)?(E(c,d.getParent(),d),c.remove()):g.append(c));for(;e.checkStartOfBlock()&&e.checkEndOfBlock();){h=e.startPath();c=h.block;if(!c)break;c.is("li")&&(g=c.getParent(),c.equals(g.getLast(u))&&c.equals(g.getFirst(u))&&(c=g));e.moveToPosition(c,CKEDITOR.POSITION_BEFORE_START);c.remove()}e=e.clone();c=b.editable();e.setEndAt(c,CKEDITOR.POSITION_BEFORE_END);e=new CKEDITOR.dom.walker(e);
-e.evaluator=function(a){return u(a)&&!z(a)};(e=e.next())&&e.type==CKEDITOR.NODE_ELEMENT&&e.getName()in CKEDITOR.dtd.$list&&F(e);m.moveToBookmark(f);m.select();b.fire("saveSnapshot")}function A(b){return(b=b.getLast(u))&&b.type==CKEDITOR.NODE_ELEMENT&&b.getName()in v?b:null}var v={ol:1,ul:1},K=CKEDITOR.dom.walker.whitespaces(),H=CKEDITOR.dom.walker.bookmark(),u=function(b){return!(K(b)||H(b))},z=CKEDITOR.dom.walker.bogus();CKEDITOR.plugins.list={listToArray:function(b,m,e,c,f){if(!v[b.getName()])return[];
-c||(c=0);e||(e=[]);for(var g=0,k=b.getChildCount();g<k;g++){var h=b.getChild(g);h.type==CKEDITOR.NODE_ELEMENT&&h.getName()in CKEDITOR.dtd.$list&&CKEDITOR.plugins.list.listToArray(h,m,e,c+1);if("li"==h.$.nodeName.toLowerCase()){var d={parent:b,indent:c,element:h,contents:[]};f?d.grandparent=f:(d.grandparent=b.getParent(),d.grandparent&&"li"==d.grandparent.$.nodeName.toLowerCase()&&(d.grandparent=d.grandparent.getParent()));m&&CKEDITOR.dom.element.setMarker(m,h,"listarray_index",e.length);e.push(d);
-for(var a=0,p=h.getChildCount(),l;a<p;a++)l=h.getChild(a),l.type==CKEDITOR.NODE_ELEMENT&&v[l.getName()]?CKEDITOR.plugins.list.listToArray(l,m,e,c+1,d.grandparent):d.contents.push(l)}}return e},arrayToList:function(b,m,e,c,f){e||(e=0);if(!b||b.length<e+1)return null;for(var g,k=b[e].parent.getDocument(),h=new CKEDITOR.dom.documentFragment(k),d=null,a=e,p=Math.max(b[e].indent,0),l=null,q,n,t=c==CKEDITOR.ENTER_P?"p":"div";;){var r=b[a];g=r.grandparent;q=r.element.getDirection(1);if(r.indent==p){d&&b[a].parent.getName()==
-d.getName()||(d=b[a].parent.clone(!1,1),f&&d.setAttribute("dir",f),h.append(d));l=d.append(r.element.clone(0,1));q!=d.getDirection(1)&&l.setAttribute("dir",q);for(g=0;g<r.contents.length;g++)l.append(r.contents[g].clone(1,1));a++}else if(r.indent==Math.max(p,0)+1)r=b[a-1].element.getDirection(1),a=CKEDITOR.plugins.list.arrayToList(b,null,a,c,r!=q?q:null),!l.getChildCount()&&CKEDITOR.env.needsNbspFiller&&7>=k.$.documentMode&&l.append(k.createText(" ")),l.append(a.listNode),a=a.nextIndex;else if(-1==
-r.indent&&!e&&g){v[g.getName()]?(l=r.element.clone(!1,!0),q!=g.getDirection(1)&&l.setAttribute("dir",q)):l=new CKEDITOR.dom.documentFragment(k);var d=g.getDirection(1)!=q,y=r.element,D=y.getAttribute("class"),z=y.getAttribute("style"),A=l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&(c!=CKEDITOR.ENTER_BR||d||z||D),w,B=r.contents.length,x;for(g=0;g<B;g++)if(w=r.contents[g],H(w)&&1<B)A?x=w.clone(1,1):l.append(w.clone(1,1));else if(w.type==CKEDITOR.NODE_ELEMENT&&w.isBlockBoundary()){d&&!w.getDirection()&&
-w.setAttribute("dir",q);n=w;var C=y.getAttribute("style");C&&n.setAttribute("style",C.replace(/([^;])$/,"$1;")+(n.getAttribute("style")||""));D&&w.addClass(D);n=null;x&&(l.append(x),x=null);l.append(w.clone(1,1))}else A?(n||(n=k.createElement(t),l.append(n),d&&n.setAttribute("dir",q)),z&&n.setAttribute("style",z),D&&n.setAttribute("class",D),x&&(n.append(x),x=null),n.append(w.clone(1,1))):l.append(w.clone(1,1));x&&((n||l).append(x),x=null);l.type==CKEDITOR.NODE_DOCUMENT_FRAGMENT&&a!=b.length-1&&(CKEDITOR.env.needsBrFiller&&
-(q=l.getLast())&&q.type==CKEDITOR.NODE_ELEMENT&&q.is("br")&&q.remove(),(q=l.getLast(u))&&q.type==CKEDITOR.NODE_ELEMENT&&q.is(CKEDITOR.dtd.$block)||l.append(k.createElement("br")));q=l.$.nodeName.toLowerCase();"div"!=q&&"p"!=q||l.appendBogus();h.append(l);d=null;a++}else return null;n=null;if(b.length<=a||Math.max(b[a].indent,0)<p)break}if(m)for(b=h.getFirst();b;){if(b.type==CKEDITOR.NODE_ELEMENT&&(CKEDITOR.dom.element.clearMarkers(m,b),b.getName()in CKEDITOR.dtd.$listItem&&(e=b,k=f=c=void 0,c=e.getDirection()))){for(f=
-e.getParent();f&&!(k=f.getDirection());)f=f.getParent();c==k&&e.removeAttribute("dir")}b=b.getNextSourceNode()}return{listNode:h,nextIndex:a}}};var L=/^h[1-6]$/,J=CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT);B.prototype={exec:function(b){this.refresh(b,b.elementPath());var m=b.config,e=b.getSelection(),c=e&&e.getRanges();if(this.state==CKEDITOR.TRISTATE_OFF){var f=b.editable();if(f.getFirst(u)){var g=1==c.length&&c[0];(m=g&&g.getEnclosedNode())&&m.is&&this.type==m.getName()&&this.setState(CKEDITOR.TRISTATE_ON)}else m.enterMode==
-CKEDITOR.ENTER_BR?f.appendBogus():c[0].fixBlock(1,m.enterMode==CKEDITOR.ENTER_P?"p":"div"),e.selectRanges(c)}for(var m=e.createBookmarks(!0),f=[],k={},c=c.createIterator(),h=0;(g=c.getNextRange())&&++h;){var d=g.getBoundaryNodes(),a=d.startNode,p=d.endNode;a.type==CKEDITOR.NODE_ELEMENT&&"td"==a.getName()&&g.setStartAt(d.startNode,CKEDITOR.POSITION_AFTER_START);p.type==CKEDITOR.NODE_ELEMENT&&"td"==p.getName()&&g.setEndAt(d.endNode,CKEDITOR.POSITION_BEFORE_END);g=g.createIterator();for(g.forceBrBreak=
-this.state==CKEDITOR.TRISTATE_OFF;d=g.getNextParagraph();)if(!d.getCustomData("list_block")){CKEDITOR.dom.element.setMarker(k,d,"list_block",1);for(var l=b.elementPath(d),a=l.elements,p=0,l=l.blockLimit,q,n=a.length-1;0<=n&&(q=a[n]);n--)if(v[q.getName()]&&l.contains(q)){l.removeCustomData("list_group_object_"+h);(a=q.getCustomData("list_group_object"))?a.contents.push(d):(a={root:q,contents:[d]},f.push(a),CKEDITOR.dom.element.setMarker(k,q,"list_group_object",a));p=1;break}p||(p=l,p.getCustomData("list_group_object_"+
-h)?p.getCustomData("list_group_object_"+h).contents.push(d):(a={root:p,contents:[d]},CKEDITOR.dom.element.setMarker(k,p,"list_group_object_"+h,a),f.push(a)))}}for(q=[];0<f.length;)if(a=f.shift(),this.state==CKEDITOR.TRISTATE_OFF)if(v[a.root.getName()]){c=b;h=a;a=k;g=q;p=CKEDITOR.plugins.list.listToArray(h.root,a);l=[];for(d=0;d<h.contents.length;d++)n=h.contents[d],(n=n.getAscendant("li",!0))&&!n.getCustomData("list_item_processed")&&(l.push(n),CKEDITOR.dom.element.setMarker(a,n,"list_item_processed",
-!0));for(var n=h.root.getDocument(),t=void 0,r=void 0,d=0;d<l.length;d++){var y=l[d].getCustomData("listarray_index"),t=p[y].parent;t.is(this.type)||(r=n.createElement(this.type),t.copyAttributes(r,{start:1,type:1}),r.removeStyle("list-style-type"),p[y].parent=r)}a=CKEDITOR.plugins.list.arrayToList(p,a,null,c.config.enterMode);p=void 0;l=a.listNode.getChildCount();for(d=0;d<l&&(p=a.listNode.getChild(d));d++)p.getName()==this.type&&g.push(p);a.listNode.replace(h.root);c.fire("contentDomInvalidated")}else{p=
-b;g=a;d=q;l=g.contents;c=g.root.getDocument();h=[];1==l.length&&l[0].equals(g.root)&&(a=c.createElement("div"),l[0].moveChildren&&l[0].moveChildren(a),l[0].append(a),l[0]=a);g=g.contents[0].getParent();for(n=0;n<l.length;n++)g=g.getCommonAncestor(l[n].getParent());t=p.config.useComputedState;p=a=void 0;t=void 0===t||t;for(n=0;n<l.length;n++)for(r=l[n];y=r.getParent();){if(y.equals(g)){h.push(r);!p&&r.getDirection()&&(p=1);r=r.getDirection(t);null!==a&&(a=a&&a!=r?null:r);break}r=y}if(!(1>h.length)){l=
-h[h.length-1].getNext();n=c.createElement(this.type);d.push(n);for(t=d=void 0;h.length;)d=h.shift(),t=c.createElement("li"),r=d,r.is("pre")||L.test(r.getName())||"false"==r.getAttribute("contenteditable")?d.appendTo(t):(d.copyAttributes(t),a&&d.getDirection()&&(t.removeStyle("direction"),t.removeAttribute("dir")),d.moveChildren(t),d.remove()),t.appendTo(n);a&&p&&n.setAttribute("dir",a);l?n.insertBefore(l):n.appendTo(g)}}else this.state==CKEDITOR.TRISTATE_ON&&v[a.root.getName()]&&I.call(this,b,a,k);
-for(n=0;n<q.length;n++)F(q[n]);CKEDITOR.dom.element.clearAllMarkers(k);e.selectBookmarks(m);b.focus()},refresh:function(b,m){var e=m.contains(v,1),c=m.blockLimit||m.root;e&&c.contains(e)?this.setState(e.is(this.type)?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF):this.setState(CKEDITOR.TRISTATE_OFF)}};CKEDITOR.plugins.add("list",{requires:"indentlist",init:function(b){b.blockless||(b.addCommand("numberedlist",new B("numberedlist","ol")),b.addCommand("bulletedlist",new B("bulletedlist","ul")),b.ui.addButton&&
-(b.ui.addButton("NumberedList",{label:b.lang.list.numberedlist,command:"numberedlist",directional:!0,toolbar:"list,10"}),b.ui.addButton("BulletedList",{label:b.lang.list.bulletedlist,command:"bulletedlist",directional:!0,toolbar:"list,20"})),b.on("key",function(m){var e=m.data.domEvent.getKey(),c;if("wysiwyg"==b.mode&&e in{8:1,46:1}){var f=b.getSelection().getRanges()[0],g=f&&f.startPath();if(f&&f.collapsed){var k=8==e,h=b.editable(),d=new CKEDITOR.dom.walker(f.clone());d.evaluator=function(a){return u(a)&&
-!z(a)};d.guard=function(a,b){return!(b&&a.type==CKEDITOR.NODE_ELEMENT&&a.is("table"))};e=f.clone();if(k){var a;(a=g.contains(v))&&f.checkBoundaryOfElement(a,CKEDITOR.START)&&(a=a.getParent())&&a.is("li")&&(a=A(a))?(c=a,a=a.getPrevious(u),e.moveToPosition(a&&z(a)?a:c,CKEDITOR.POSITION_BEFORE_START)):(d.range.setStartAt(h,CKEDITOR.POSITION_AFTER_START),d.range.setEnd(f.startContainer,f.startOffset),(a=d.previous())&&a.type==CKEDITOR.NODE_ELEMENT&&(a.getName()in v||a.is("li"))&&(a.is("li")||(d.range.selectNodeContents(a),
-d.reset(),d.evaluator=G,a=d.previous()),c=a,e.moveToElementEditEnd(c),e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END)));if(c)C(b,e,f),m.cancel();else{var p=g.contains(v);p&&f.checkBoundaryOfElement(p,CKEDITOR.START)&&(c=p.getFirst(u),f.checkBoundaryOfElement(c,CKEDITOR.START)&&(a=p.getPrevious(u),A(c)?a&&(f.moveToElementEditEnd(a),f.select()):b.execCommand("outdent"),m.cancel()))}}else if(c=g.contains("li")){if(d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),k=(h=c.getLast(u))&&
-G(h)?h:c,g=0,(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.getName()in v&&a.equals(h)?(g=1,a=d.next()):f.checkBoundaryOfElement(k,CKEDITOR.END)&&(g=2),g&&a){f=f.clone();f.moveToElementEditStart(a);if(1==g&&(e.optimize(),!e.startContainer.equals(c))){for(c=e.startContainer;c.is(CKEDITOR.dtd.$inline);)p=c,c=c.getParent();p&&e.moveToPosition(p,CKEDITOR.POSITION_AFTER_END)}2==g&&(e.moveToPosition(e.endPath().block,CKEDITOR.POSITION_BEFORE_END),f.endPath().block&&f.moveToPosition(f.endPath().block,CKEDITOR.POSITION_AFTER_START));
-C(b,e,f);m.cancel()}}else d.range.setEndAt(h,CKEDITOR.POSITION_BEFORE_END),(a=d.next())&&a.type==CKEDITOR.NODE_ELEMENT&&a.is(v)&&(a=a.getFirst(u),g.block&&f.checkStartOfBlock()&&f.checkEndOfBlock()?(g.block.remove(),f.moveToElementEditStart(a),f.select()):A(a)?(f.moveToElementEditStart(a),f.select()):(f=f.clone(),f.moveToElementEditStart(a),C(b,e,f)),m.cancel());setTimeout(function(){b.selectionChange(1)})}}}))}})})();(function(){function n(a){if(!a||a.type!=CKEDITOR.NODE_ELEMENT||"form"!=a.getName())return[];for(var e=[],f=["style","className"],b=0;b<f.length;b++){var c=a.$.elements.namedItem(f[b]);c&&(c=new CKEDITOR.dom.element(c),e.push([c,c.nextSibling]),c.remove())}return e}function t(a,e){if(a&&a.type==CKEDITOR.NODE_ELEMENT&&"form"==a.getName()&&0<e.length)for(var f=e.length-1;0<=f;f--){var b=e[f][0],c=e[f][1];c?b.insertBefore(c):b.appendTo(a)}}function r(a,e){var f=n(a),b={},c=a.$;e||(b["class"]=c.className||
-"",c.className="");b.inline=c.style.cssText||"";e||(c.style.cssText="position: static; overflow: visible");t(f);return b}function u(a,e){var f=n(a),b=a.$;"class"in e&&(b.className=e["class"]);"inline"in e&&(b.style.cssText=e.inline);t(f)}function v(a){if(!a.editable().isInline()){var e=CKEDITOR.instances,f;for(f in e){var b=e[f];"wysiwyg"!=b.mode||b.readOnly||(b=b.document.getBody(),b.setAttribute("contentEditable",!1),b.setAttribute("contentEditable",!0))}a.editable().hasFocus&&(a.toolbox.focus(),
-a.focus())}}CKEDITOR.plugins.add("maximize",{init:function(a){function e(){var b=c.getViewPaneSize();a.resize(b.width,b.height,null,!0)}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var f=a.lang,b=CKEDITOR.document,c=b.getWindow(),l,m,p,n=CKEDITOR.TRISTATE_OFF;a.addCommand("maximize",{modes:{wysiwyg:!CKEDITOR.env.iOS,source:!CKEDITOR.env.iOS},readOnly:1,editorFocus:!1,exec:function(){var h=a.container.getFirst(function(a){return a.type==CKEDITOR.NODE_ELEMENT&&a.hasClass("cke_inner")}),g=a.ui.space("contents");
-if("wysiwyg"==a.mode){var d=a.getSelection();l=d&&d.getRanges();m=c.getScrollPosition()}else{var k=a.editable().$;l=!CKEDITOR.env.ie&&[k.selectionStart,k.selectionEnd];m=[k.scrollLeft,k.scrollTop]}if(this.state==CKEDITOR.TRISTATE_OFF){c.on("resize",e);p=c.getScrollPosition();for(d=a.container;d=d.getParent();)d.setCustomData("maximize_saved_styles",r(d)),d.setStyle("z-index",a.config.baseFloatZIndex-5);g.setCustomData("maximize_saved_styles",r(g,!0));h.setCustomData("maximize_saved_styles",r(h,!0));
-g={overflow:CKEDITOR.env.webkit?"":"hidden",width:0,height:0};b.getDocumentElement().setStyles(g);!CKEDITOR.env.gecko&&b.getDocumentElement().setStyle("position","fixed");CKEDITOR.env.gecko&&CKEDITOR.env.quirks||b.getBody().setStyles(g);CKEDITOR.env.ie?setTimeout(function(){c.$.scrollTo(0,0)},0):c.$.scrollTo(0,0);h.setStyle("position",CKEDITOR.env.gecko&&CKEDITOR.env.quirks?"fixed":"absolute");h.$.offsetLeft;h.setStyles({"z-index":a.config.baseFloatZIndex-5,left:"0px",top:"0px"});h.addClass("cke_maximized");
-e();g=h.getDocumentPosition();h.setStyles({left:-1*g.x+"px",top:-1*g.y+"px"});CKEDITOR.env.gecko&&v(a)}else if(this.state==CKEDITOR.TRISTATE_ON){c.removeListener("resize",e);for(var d=[g,h],q=0;q<d.length;q++)u(d[q],d[q].getCustomData("maximize_saved_styles")),d[q].removeCustomData("maximize_saved_styles");for(d=a.container;d=d.getParent();)u(d,d.getCustomData("maximize_saved_styles")),d.removeCustomData("maximize_saved_styles");CKEDITOR.env.ie?setTimeout(function(){c.$.scrollTo(p.x,p.y)},0):c.$.scrollTo(p.x,
-p.y);h.removeClass("cke_maximized");CKEDITOR.env.webkit&&(h.setStyle("display","inline"),setTimeout(function(){h.setStyle("display","block")},0));a.fire("resize",{outerHeight:a.container.$.offsetHeight,contentsHeight:g.$.offsetHeight,outerWidth:a.container.$.offsetWidth})}this.toggleState();if(d=this.uiItems[0])g=this.state==CKEDITOR.TRISTATE_OFF?f.maximize.maximize:f.maximize.minimize,d=CKEDITOR.document.getById(d._.id),d.getChild(1).setHtml(g),d.setAttribute("title",g),d.setAttribute("href",'javascript:void("'+
-g+'");');"wysiwyg"==a.mode?l?(CKEDITOR.env.gecko&&v(a),a.getSelection().selectRanges(l),(k=a.getSelection().getStartElement())&&k.scrollIntoView(!0)):c.$.scrollTo(m.x,m.y):(l&&(k.selectionStart=l[0],k.selectionEnd=l[1]),k.scrollLeft=m[0],k.scrollTop=m[1]);l=m=null;n=this.state;a.fire("maximize",this.state)},canUndo:!1});a.ui.addButton&&a.ui.addButton("Maximize",{label:f.maximize.maximize,command:"maximize",toolbar:"tools,10"});a.on("mode",function(){var b=a.getCommand("maximize");b.setState(b.state==
-CKEDITOR.TRISTATE_DISABLED?CKEDITOR.TRISTATE_DISABLED:n)},null,null,100)}}})})();(function(){function g(a){var d=a.listenerData&&a.listenerData.editor,b=a.data.$.clipboardData,c=!1,e=/^image/;if(b)return Array.prototype.forEach.call(b.types,function(a,f){if(!c&&(a.match(e)||b.items[f].type.match(e)))return h(b.items[f],d),c=!0})}function h(a,d){if(a&&"function"===typeof a.getAsFile){var b=a.getAsFile(),c=new FileReader;c.onload=function(a){var b=d.document.createElement("img",{attributes:{src:a.target.result}});setTimeout(function(){d.insertElement(b)},10)};c.readAsDataURL(b)}}
-CKEDITOR.plugins.add("pastebase64",{init:function(a){a.addFeature&&a.addFeature({allowedContent:"img[alt,id,!src]{width,height};"});a.on("contentDom",function(){(a.editable?a.editable():a.document).on("paste",g,null,{editor:a})})}})})();CKEDITOR.plugins.add("table",{requires:"dialog",init:function(a){function e(b){return CKEDITOR.tools.extend(b||{},{contextSensitive:1,refresh:function(b,a){this.setState(a.contains("table",1)?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)}})}if(!a.blockless){var c=a.lang.table;a.addCommand("table",new CKEDITOR.dialogCommand("table",{context:"table",allowedContent:"table{width,height}[align,border,cellpadding,cellspacing,summary];caption tbody thead tfoot;th td tr[scope];"+(a.plugins.dialogadvtab?
-"table"+a.plugins.dialogadvtab.allowedContent():""),requiredContent:"table",contentTransformations:[["table{width}: sizeToStyle","table[width]: sizeToAttribute"],["td: splitBorderShorthand"],[{element:"table",right:function(b){b.styles&&(b.styles.border&&b.styles.border.match(/solid/)&&(b.attributes.border=1),"collapse"==b.styles["border-collapse"]&&(b.attributes.cellspacing=0))}}]]}));a.addCommand("tableProperties",new CKEDITOR.dialogCommand("tableProperties",e()));a.addCommand("tableDelete",e({exec:function(b){var a=
-b.elementPath().contains("table",1);if(a){var d=a.getParent(),c=b.editable();1!=d.getChildCount()||d.is("td","th")||d.equals(c)||(a=d);b=b.createRange();b.moveToPosition(a,CKEDITOR.POSITION_BEFORE_START);a.remove();b.select()}}}));a.ui.addButton&&a.ui.addButton("Table",{label:c.toolbar,command:"table",toolbar:"insert,30"});CKEDITOR.dialog.add("table",this.path+"dialogs/table.js");CKEDITOR.dialog.add("tableProperties",this.path+"dialogs/table.js");a.addMenuItems&&a.addMenuItems({table:{label:c.menu,
-command:"tableProperties",group:"table",order:5},tabledelete:{label:c.deleteTable,command:"tableDelete",group:"table",order:1}});a.on("doubleclick",function(a){a.data.element.is("table")&&(a.data.dialog="tableProperties")});a.contextMenu&&a.contextMenu.addListener(function(){return{tabledelete:CKEDITOR.TRISTATE_OFF,table:CKEDITOR.TRISTATE_OFF}})}}});CKEDITOR.plugins.add("quicktable",{requires:"table,panelbutton,floatpanel",afterInit:function(f){var k,l;function i(a){return new CKEDITOR.dom.element(a,f.document)}function m(a,b){for(var c=i("table"),h=c.append(i("tbody")),e=0;e<a;e++)for(var q=h.append(i("tr")),g=0;g<b;g++)q.append(i("td")).appendBogus();null!==d.qtCellPadding&&c.setAttribute("cellpadding",r);null!==d.qtCellSpacing&&c.setAttribute("cellspacing",s);null!==d.qtBorder&&c.setAttribute("border",t);c.setAttribute("class",u);c.setStyles(v);
-null!==d.qtWidth&&c.setStyle("width",w);f.insertElement(c);f.fire("removeFormatCleanup",c)}function x(a){var b=[],c=CKEDITOR.tools.addFunction(function(b,c){m(parseInt(b,10)+1,parseInt(c,10)+1);a.hide()});b.push('<a style="display:block" _cke_focus=1 hidefocus=true href="javascript:void(1)"><table role="presentation" cellspacing=1 cellpadding=1 style="width: 100%; margin: 0 auto 3px;table-layout:fixed;">');for(var h=0;h<n;h++){b.push("<tr>");for(var e=0;e<o;e++)b.push('<td style="border: '+y+";width:"+
-p+";height:"+p+';" data-i="'+h+'" data-j="'+e+'" onclick="CKEDITOR.tools.callFunction(',c,",'",h,"','",e,"'); return false;\"></td>");b.push("</tr>")}b.push("</table></a>");return b.join("")}function j(a,b,c,h){for(var b=b.$.tBodies[0].rows,e=0;e<b.length;e++)for(var d=b[e].cells,g=0;g<d.length;g++)d[g].style.background=e<c&&g<h?z:"";k=c-1;l=h-1;a.setText(c+" × "+h+" "+f.lang.table.toolbar)}var d=f.config,n=d.qtRows||8,o=d.qtColumns||10,t=d.qtBorder||"1",v=d.qtStyle||null,u=d.qtClass||"",r=d.qtCellPadding||
-"1",s=d.qtCellSpacing||"1",w=d.qtWidth||"500px",p=d.qtPreviewSize||"14px",y=d.qtPreviewBorder||"1px solid #aaa",z=d.qtPreviewBackground||"#e5e5e5";l=k=-1;f.ui.add("Table",CKEDITOR.UI_PANELBUTTON,{label:f.lang.table.toolbar,command:"table",modes:{wysiwyg:1},editorFocus:0,toolbar:"insert,30",caption:null,table:null,panel:{css:CKEDITOR.skin.getPath("editor"),attributes:{role:"listbox","aria-label":f.lang.table.toolbar}},onBlock:function(a,b){b.autoSize=!0;b.element.addClass("cke_colorblock");var c=new CKEDITOR.dom.element("div");
-c.setStyles({"text-align":"center",margin:"3px 0"});b.element.append(c);this.caption=c;c=CKEDITOR.dom.element.createFromHtml(x(a));this.table=this.addEvents(c);b.element.append(c);c=this.createMoreButton();b.element.append(c);CKEDITOR.ui.fire("ready",this);b.keys=this.assignKeys(b.keys)},assignKeys:function(a){var b="rtl"==f.lang.dir;a[b?37:39]="next";a[40]="next";a[9]="next";a[b?39:37]="prev";a[38]="prev";a[CKEDITOR.SHIFT+9]="prev";a[32]="click";return a},addEvents:function(a){var b=this.table=a.getFirst(),
-c=this.caption;b.on("mouseleave",function(){j(c,b,1,1)});b.on("mousemove",function(a){var e=a.data.getTarget();"td"==e.getName()&&(a=parseInt(e.getAttribute("data-i"),10),e=parseInt(e.getAttribute("data-j"),10),j(c,b,a+1,e+1))});a.on("keydown",function(a){var e=a.data.getKeystroke(),d=k,g=l;switch(e){case 37:g--;break;case 39:g++;break;case 40:d++;break;case 38:d--;break;case 13:case 32:m(d+1,g+1);return;default:return}0>d||0>g?this.panel.hide():((d>n-1||g>o-1)&&f.execCommand("table"),j(c,b,d+1,g+
-1),a.data.preventDefault(),a.data.stopPropagation())});return b},createMoreButton:function(){var a=new CKEDITOR.dom.element("a");a.setAttributes({_cke_focus:1,hidefocus:!0,title:f.lang.quicktable.more,href:'javascript:void("'+f.lang.quicktable.more+'")',role:"option"});a.addClass("cke_colormore");a.setText(f.lang.quicktable.more);a.setStyle("text-align","center");a.on("click",function(a){f.execCommand("table");a.data.preventDefault()});return a},onOpen:function(){j(this.caption,this.table,1,1)}})}});CKEDITOR.plugins.add("removeformat",{init:function(a){a.addCommand("removeFormat",CKEDITOR.plugins.removeformat.commands.removeformat);a.ui.addButton&&a.ui.addButton("RemoveFormat",{label:a.lang.removeformat.toolbar,command:"removeFormat",toolbar:"cleanup,10"})}});
-CKEDITOR.plugins.removeformat={commands:{removeformat:{exec:function(a){for(var h=a._.removeFormatRegex||(a._.removeFormatRegex=new RegExp("^(?:"+a.config.removeFormatTags.replace(/,/g,"|")+")$","i")),e=a._.removeAttributes||(a._.removeAttributes=a.config.removeFormatAttributes.split(",")),f=CKEDITOR.plugins.removeformat.filter,m=a.getSelection().getRanges(),n=m.createIterator(),p=function(a){return a.type==CKEDITOR.NODE_ELEMENT},c;c=n.getNextRange();){c.collapsed||c.enlarge(CKEDITOR.ENLARGE_ELEMENT);
-var l=c.createBookmark(),b=l.startNode,d=l.endNode,k=function(b){for(var c=a.elementPath(b),e=c.elements,d=1,g;(g=e[d])&&!g.equals(c.block)&&!g.equals(c.blockLimit);d++)h.test(g.getName())&&f(a,g)&&b.breakParent(g)};k(b);if(d)for(k(d),b=b.getNextSourceNode(!0,CKEDITOR.NODE_ELEMENT);b&&!b.equals(d);)if(b.isReadOnly()){if(b.getPosition(d)&CKEDITOR.POSITION_CONTAINS)break;b=b.getNext(p)}else k=b.getNextSourceNode(!1,CKEDITOR.NODE_ELEMENT),"img"==b.getName()&&b.data("cke-realelement")||!f(a,b)||(h.test(b.getName())?
-b.remove(1):(b.removeAttributes(e),a.fire("removeFormatCleanup",b))),b=k;c.moveToBookmark(l)}a.forceNextSelectionCheck();a.getSelection().selectRanges(m)}}},filter:function(a,h){for(var e=a._.removeFormatFilters||[],f=0;f<e.length;f++)if(!1===e[f](h))return!1;return!0}};CKEDITOR.editor.prototype.addRemoveFormatFilter=function(a){this._.removeFormatFilters||(this._.removeFormatFilters=[]);this._.removeFormatFilters.push(a)};CKEDITOR.config.removeFormatTags="b,big,cite,code,del,dfn,em,font,i,ins,kbd,q,s,samp,small,span,strike,strong,sub,sup,tt,u,var";
-CKEDITOR.config.removeFormatAttributes="class,style,lang,width,height,align,hspace,valign";(function(){CKEDITOR.plugins.add("sourcearea",{init:function(a){function d(){var a=e&&this.equals(CKEDITOR.document.getActive());this.hide();this.setStyle("height",this.getParent().$.clientHeight+"px");this.setStyle("width",this.getParent().$.clientWidth+"px");this.show();a&&this.focus()}if(a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var f=CKEDITOR.plugins.sourcearea;a.addMode("source",function(e){var b=a.ui.space("contents").getDocument().createElement("textarea");b.setStyles(CKEDITOR.tools.extend({width:CKEDITOR.env.ie7Compat?
-"99%":"100%",height:"100%",resize:"none",outline:"none","text-align":"left"},CKEDITOR.tools.cssVendorPrefix("tab-size",a.config.sourceAreaTabSize||4)));b.setAttribute("dir","ltr");b.addClass("cke_source").addClass("cke_reset").addClass("cke_enable_context_menu");a.ui.space("contents").append(b);b=a.editable(new c(a,b));b.setData(a.getData(1));CKEDITOR.env.ie&&(b.attachListener(a,"resize",d,b),b.attachListener(CKEDITOR.document.getWindow(),"resize",d,b),CKEDITOR.tools.setTimeout(d,0,b));a.fire("ariaWidget",
-this);e()});a.addCommand("source",f.commands.source);a.ui.addButton&&a.ui.addButton("Source",{label:a.lang.sourcearea.toolbar,command:"source",toolbar:"mode,10"});a.on("mode",function(){a.getCommand("source").setState("source"==a.mode?CKEDITOR.TRISTATE_ON:CKEDITOR.TRISTATE_OFF)});var e=CKEDITOR.env.ie&&9==CKEDITOR.env.version}}});var c=CKEDITOR.tools.createClass({base:CKEDITOR.editable,proto:{setData:function(a){this.setValue(a);this.status="ready";this.editor.fire("dataReady")},getData:function(){return this.getValue()},
-insertHtml:function(){},insertElement:function(){},insertText:function(){},setReadOnly:function(a){this[(a?"set":"remove")+"Attribute"]("readOnly","readonly")},detach:function(){c.baseProto.detach.call(this);this.clearCustomData();this.remove()}}})})();
-CKEDITOR.plugins.sourcearea={commands:{source:{modes:{wysiwyg:1,source:1},editorFocus:!1,readOnly:1,exec:function(c){"wysiwyg"==c.mode&&c.fire("saveSnapshot");c.getCommand("source").setState(CKEDITOR.TRISTATE_DISABLED);c.setMode("source"==c.mode?"wysiwyg":"source")},canUndo:!1}}};(function(){function D(a){function d(){for(var b=g(),e=CKEDITOR.tools.clone(a.config.toolbarGroups)||v(a),f=0;f<e.length;f++){var m=e[f];if("/"!=m){"string"==typeof m&&(m=e[f]={name:m});var l,d=m.groups;if(d)for(var h=0;h<d.length;h++)l=d[h],(l=b[l])&&c(m,l);(l=b[m.name])&&c(m,l)}}return e}function g(){var b={},c,f,e;for(c in a.ui.items)f=a.ui.items[c],e=f.toolbar||"others",e=e.split(","),f=e[0],e=parseInt(e[1]||-1,10),b[f]||(b[f]=[]),b[f].push({name:c,order:e});for(f in b)b[f]=b[f].sort(function(b,
-a){return b.order==a.order?0:0>a.order?-1:0>b.order?1:b.order<a.order?-1:1});return b}function c(c,e){if(e.length){c.items?c.items.push(a.ui.create("-")):c.items=[];for(var f;f=e.shift();)f="string"==typeof f?f:f.name,b&&-1!=CKEDITOR.tools.indexOf(b,f)||(f=a.ui.create(f))&&a.addFeature(f)&&c.items.push(f)}}function h(b){var a=[],e,d,h;for(e=0;e<b.length;++e)d=b[e],h={},"/"==d?a.push(d):CKEDITOR.tools.isArray(d)?(c(h,CKEDITOR.tools.clone(d)),a.push(h)):d.items&&(c(h,CKEDITOR.tools.clone(d.items)),
-h.name=d.name,a.push(h));return a}var b=a.config.removeButtons,b=b&&b.split(","),e=a.config.toolbar;"string"==typeof e&&(e=a.config["toolbar_"+e]);return a.toolbar=e?h(e):d()}function v(a){return a._.toolbarGroups||(a._.toolbarGroups=[{name:"document",groups:["mode","document","doctools"]},{name:"clipboard",groups:["clipboard","undo"]},{name:"editing",groups:["find","selection","spellchecker"]},{name:"forms"},"/",{name:"basicstyles",groups:["basicstyles","cleanup"]},{name:"paragraph",groups:["list",
-"indent","blocks","align","bidi"]},{name:"links"},{name:"insert"},"/",{name:"styles"},{name:"colors"},{name:"tools"},{name:"others"},{name:"about"}])}var z=function(){this.toolbars=[];this.focusCommandExecuted=!1};z.prototype.focus=function(){for(var a=0,d;d=this.toolbars[a++];)for(var g=0,c;c=d.items[g++];)if(c.focus){c.focus();return}};var E={modes:{wysiwyg:1,source:1},readOnly:1,exec:function(a){a.toolbox&&(a.toolbox.focusCommandExecuted=!0,CKEDITOR.env.ie||CKEDITOR.env.air?setTimeout(function(){a.toolbox.focus()},
-100):a.toolbox.focus())}};CKEDITOR.plugins.add("toolbar",{requires:"button",init:function(a){var d,g=function(c,h){var b,e="rtl"==a.lang.dir,k=a.config.toolbarGroupCycling,q=e?37:39,e=e?39:37,k=void 0===k||k;switch(h){case 9:case CKEDITOR.SHIFT+9:for(;!b||!b.items.length;)if(b=9==h?(b?b.next:c.toolbar.next)||a.toolbox.toolbars[0]:(b?b.previous:c.toolbar.previous)||a.toolbox.toolbars[a.toolbox.toolbars.length-1],b.items.length)for(c=b.items[d?b.items.length-1:0];c&&!c.focus;)(c=d?c.previous:c.next)||
-(b=0);c&&c.focus();return!1;case q:b=c;do b=b.next,!b&&k&&(b=c.toolbar.items[0]);while(b&&!b.focus);b?b.focus():g(c,9);return!1;case 40:return c.button&&c.button.hasArrow?(a.once("panelShow",function(b){b.data._.panel._.currentBlock.onKeyDown(40)}),c.execute()):g(c,40==h?q:e),!1;case e:case 38:b=c;do b=b.previous,!b&&k&&(b=c.toolbar.items[c.toolbar.items.length-1]);while(b&&!b.focus);b?b.focus():(d=1,g(c,CKEDITOR.SHIFT+9),d=0);return!1;case 27:return a.focus(),!1;case 13:case 32:return c.execute(),
-!1}return!0};a.on("uiSpace",function(c){if(c.data.space==a.config.toolbarLocation){c.removeListener();a.toolbox=new z;var d=CKEDITOR.tools.getNextId(),b=['\x3cspan id\x3d"',d,'" class\x3d"cke_voice_label"\x3e',a.lang.toolbar.toolbars,"\x3c/span\x3e",'\x3cspan id\x3d"'+a.ui.spaceId("toolbox")+'" class\x3d"cke_toolbox" role\x3d"group" aria-labelledby\x3d"',d,'" onmousedown\x3d"return false;"\x3e'],d=!1!==a.config.toolbarStartupExpanded,e,k;a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&
-b.push('\x3cspan class\x3d"cke_toolbox_main"'+(d?"\x3e":' style\x3d"display:none"\x3e'));for(var q=a.toolbox.toolbars,f=D(a),m=f.length,l=0;l<m;l++){var r,n=0,w,p=f[l],v="/"!==p&&("/"===f[l+1]||l==m-1),x;if(p)if(e&&(b.push("\x3c/span\x3e"),k=e=0),"/"===p)b.push('\x3cspan class\x3d"cke_toolbar_break"\x3e\x3c/span\x3e');else{x=p.items||p;for(var y=0;y<x.length;y++){var t=x[y],A;if(t){var B=function(c){c=c.render(a,b);u=n.items.push(c)-1;0<u&&(c.previous=n.items[u-1],c.previous.next=c);c.toolbar=n;c.onkey=
-g;c.onfocus=function(){a.toolbox.focusCommandExecuted||a.focus()}};if(t.type==CKEDITOR.UI_SEPARATOR)k=e&&t;else{A=!1!==t.canGroup;if(!n){r=CKEDITOR.tools.getNextId();n={id:r,items:[]};w=p.name&&(a.lang.toolbar.toolbarGroups[p.name]||p.name);b.push('\x3cspan id\x3d"',r,'" class\x3d"cke_toolbar'+(v?' cke_toolbar_last"':'"'),w?' aria-labelledby\x3d"'+r+'_label"':"",' role\x3d"toolbar"\x3e');w&&b.push('\x3cspan id\x3d"',r,'_label" class\x3d"cke_voice_label"\x3e',w,"\x3c/span\x3e");b.push('\x3cspan class\x3d"cke_toolbar_start"\x3e\x3c/span\x3e');
-var u=q.push(n)-1;0<u&&(n.previous=q[u-1],n.previous.next=n)}A?e||(b.push('\x3cspan class\x3d"cke_toolgroup" role\x3d"presentation"\x3e'),e=1):e&&(b.push("\x3c/span\x3e"),e=0);k&&(B(k),k=0);B(t)}}}e&&(b.push("\x3c/span\x3e"),k=e=0);n&&b.push('\x3cspan class\x3d"cke_toolbar_end"\x3e\x3c/span\x3e\x3c/span\x3e')}}a.config.toolbarCanCollapse&&b.push("\x3c/span\x3e");if(a.config.toolbarCanCollapse&&a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE){var C=CKEDITOR.tools.addFunction(function(){a.execCommand("toolbarCollapse")});
-a.on("destroy",function(){CKEDITOR.tools.removeFunction(C)});a.addCommand("toolbarCollapse",{readOnly:1,exec:function(b){var a=b.ui.space("toolbar_collapser"),c=a.getPrevious(),e=b.ui.space("contents"),d=c.getParent(),f=parseInt(e.$.style.height,10),h=d.$.offsetHeight,g=a.hasClass("cke_toolbox_collapser_min");g?(c.show(),a.removeClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarCollapse)):(c.hide(),a.addClass("cke_toolbox_collapser_min"),a.setAttribute("title",b.lang.toolbar.toolbarExpand));
-a.getFirst().setText(g?"▲":"◀");e.setStyle("height",f-(d.$.offsetHeight-h)+"px");b.fire("resize",{outerHeight:b.container.$.offsetHeight,contentsHeight:e.$.offsetHeight,outerWidth:b.container.$.offsetWidth})},modes:{wysiwyg:1,source:1}});a.setKeystroke(CKEDITOR.ALT+(CKEDITOR.env.ie||CKEDITOR.env.webkit?189:109),"toolbarCollapse");b.push('\x3ca title\x3d"'+(d?a.lang.toolbar.toolbarCollapse:a.lang.toolbar.toolbarExpand)+'" id\x3d"'+a.ui.spaceId("toolbar_collapser")+'" tabIndex\x3d"-1" class\x3d"cke_toolbox_collapser');
-d||b.push(" cke_toolbox_collapser_min");b.push('" onclick\x3d"CKEDITOR.tools.callFunction('+C+')"\x3e','\x3cspan class\x3d"cke_arrow"\x3e\x26#9650;\x3c/span\x3e',"\x3c/a\x3e")}b.push("\x3c/span\x3e");c.data.html+=b.join("")}});a.on("destroy",function(){if(this.toolbox){var a,d=0,b,e,g;for(a=this.toolbox.toolbars;d<a.length;d++)for(e=a[d].items,b=0;b<e.length;b++)g=e[b],g.clickFn&&CKEDITOR.tools.removeFunction(g.clickFn),g.keyDownFn&&CKEDITOR.tools.removeFunction(g.keyDownFn)}});a.on("uiReady",function(){var c=
-a.ui.space("toolbox");c&&a.focusManager.add(c,1)});a.addCommand("toolbarFocus",E);a.setKeystroke(CKEDITOR.ALT+121,"toolbarFocus");a.ui.add("-",CKEDITOR.UI_SEPARATOR,{});a.ui.addHandler(CKEDITOR.UI_SEPARATOR,{create:function(){return{render:function(a,d){d.push('\x3cspan class\x3d"cke_toolbar_separator" role\x3d"separator"\x3e\x3c/span\x3e');return{}}}}})}});CKEDITOR.ui.prototype.addToolbarGroup=function(a,d,g){var c=v(this.editor),h=0===d,b={name:a};if(g){if(g=CKEDITOR.tools.search(c,function(a){return a.name==
-g})){!g.groups&&(g.groups=[]);if(d&&(d=CKEDITOR.tools.indexOf(g.groups,d),0<=d)){g.groups.splice(d+1,0,a);return}h?g.groups.splice(0,0,a):g.groups.push(a);return}d=null}d&&(d=CKEDITOR.tools.indexOf(c,function(a){return a.name==d}));h?c.splice(0,0,a):"number"==typeof d?c.splice(d+1,0,b):c.push(a)}})();CKEDITOR.UI_SEPARATOR="separator";CKEDITOR.config.toolbarLocation="top";(function(){var g=[CKEDITOR.CTRL+90,CKEDITOR.CTRL+89,CKEDITOR.CTRL+CKEDITOR.SHIFT+90],n={8:1,46:1};CKEDITOR.plugins.add("undo",{init:function(a){function b(a){d.enabled&&!1!==a.data.command.canUndo&&d.save()}function c(){d.enabled=a.readOnly?!1:"wysiwyg"==a.mode;d.onChange()}var d=a.undoManager=new e(a),l=d.editingHandler=new k(d),f=a.addCommand("undo",{exec:function(){d.undo()&&(a.selectionChange(),this.fire("afterUndo"))},startDisabled:!0,canUndo:!1}),h=a.addCommand("redo",{exec:function(){d.redo()&&
-(a.selectionChange(),this.fire("afterRedo"))},startDisabled:!0,canUndo:!1});a.setKeystroke([[g[0],"undo"],[g[1],"redo"],[g[2],"redo"]]);d.onChange=function(){f.setState(d.undoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED);h.setState(d.redoable()?CKEDITOR.TRISTATE_OFF:CKEDITOR.TRISTATE_DISABLED)};a.on("beforeCommandExec",b);a.on("afterCommandExec",b);a.on("saveSnapshot",function(a){d.save(a.data&&a.data.contentOnly)});a.on("contentDom",l.attachListeners,l);a.on("instanceReady",function(){a.fire("saveSnapshot")});
-a.on("beforeModeUnload",function(){"wysiwyg"==a.mode&&d.save(!0)});a.on("mode",c);a.on("readOnly",c);a.ui.addButton&&(a.ui.addButton("Undo",{label:a.lang.undo.undo,command:"undo",toolbar:"undo,10"}),a.ui.addButton("Redo",{label:a.lang.undo.redo,command:"redo",toolbar:"undo,20"}));a.resetUndo=function(){d.reset();a.fire("saveSnapshot")};a.on("updateSnapshot",function(){d.currentImage&&d.update()});a.on("lockSnapshot",function(a){a=a.data;d.lock(a&&a.dontUpdate,a&&a.forceUpdate)});a.on("unlockSnapshot",
-d.unlock,d)}});CKEDITOR.plugins.undo={};var e=CKEDITOR.plugins.undo.UndoManager=function(a){this.strokesRecorded=[0,0];this.locked=null;this.previousKeyGroup=-1;this.limit=a.config.undoStackSize||20;this.strokesLimit=25;this.editor=a;this.reset()};e.prototype={type:function(a,b){var c=e.getKeyGroup(a),d=this.strokesRecorded[c]+1;b=b||d>=this.strokesLimit;this.typing||(this.hasUndo=this.typing=!0,this.hasRedo=!1,this.onChange());b?(d=0,this.editor.fire("saveSnapshot")):this.editor.fire("change");this.strokesRecorded[c]=
-d;this.previousKeyGroup=c},keyGroupChanged:function(a){return e.getKeyGroup(a)!=this.previousKeyGroup},reset:function(){this.snapshots=[];this.index=-1;this.currentImage=null;this.hasRedo=this.hasUndo=!1;this.locked=null;this.resetType()},resetType:function(){this.strokesRecorded=[0,0];this.typing=!1;this.previousKeyGroup=-1},refreshState:function(){this.hasUndo=!!this.getNextImage(!0);this.hasRedo=!!this.getNextImage(!1);this.resetType();this.onChange()},save:function(a,b,c){var d=this.editor;if(this.locked||
-"ready"!=d.status||"wysiwyg"!=d.mode)return!1;var e=d.editable();if(!e||"ready"!=e.status)return!1;e=this.snapshots;b||(b=new f(d));if(!1===b.contents)return!1;if(this.currentImage)if(b.equalsContent(this.currentImage)){if(a||b.equalsSelection(this.currentImage))return!1}else!1!==c&&d.fire("change");e.splice(this.index+1,e.length-this.index-1);e.length==this.limit&&e.shift();this.index=e.push(b)-1;this.currentImage=b;!1!==c&&this.refreshState();return!0},restoreImage:function(a){var b=this.editor,
-c;a.bookmarks&&(b.focus(),c=b.getSelection());this.locked={level:999};this.editor.loadSnapshot(a.contents);a.bookmarks?c.selectBookmarks(a.bookmarks):CKEDITOR.env.ie&&(c=this.editor.document.getBody().$.createTextRange(),c.collapse(!0),c.select());this.locked=null;this.index=a.index;this.currentImage=this.snapshots[this.index];this.update();this.refreshState();b.fire("change")},getNextImage:function(a){var b=this.snapshots,c=this.currentImage,d;if(c)if(a)for(d=this.index-1;0<=d;d--){if(a=b[d],!c.equalsContent(a))return a.index=
-d,a}else for(d=this.index+1;d<b.length;d++)if(a=b[d],!c.equalsContent(a))return a.index=d,a;return null},redoable:function(){return this.enabled&&this.hasRedo},undoable:function(){return this.enabled&&this.hasUndo},undo:function(){if(this.undoable()){this.save(!0);var a=this.getNextImage(!0);if(a)return this.restoreImage(a),!0}return!1},redo:function(){if(this.redoable()&&(this.save(!0),this.redoable())){var a=this.getNextImage(!1);if(a)return this.restoreImage(a),!0}return!1},update:function(a){if(!this.locked){a||
-(a=new f(this.editor));for(var b=this.index,c=this.snapshots;0<b&&this.currentImage.equalsContent(c[b-1]);)--b;c.splice(b,this.index-b+1,a);this.index=b;this.currentImage=a}},updateSelection:function(a){if(!this.snapshots.length)return!1;var b=this.snapshots,c=b[b.length-1];return c.equalsContent(a)&&!c.equalsSelection(a)?(this.currentImage=b[b.length-1]=a,!0):!1},lock:function(a,b){if(this.locked)this.locked.level++;else if(a)this.locked={level:1};else{var c=null;if(b)c=!0;else{var d=new f(this.editor,
-!0);this.currentImage&&this.currentImage.equalsContent(d)&&(c=d)}this.locked={update:c,level:1}}},unlock:function(){if(this.locked&&!--this.locked.level){var a=this.locked.update;this.locked=null;if(!0===a)this.update();else if(a){var b=new f(this.editor,!0);a.equalsContent(b)||this.update()}}}};e.navigationKeyCodes={37:1,38:1,39:1,40:1,36:1,35:1,33:1,34:1};e.keyGroups={PRINTABLE:0,FUNCTIONAL:1};e.isNavigationKey=function(a){return!!e.navigationKeyCodes[a]};e.getKeyGroup=function(a){var b=e.keyGroups;
-return n[a]?b.FUNCTIONAL:b.PRINTABLE};e.getOppositeKeyGroup=function(a){var b=e.keyGroups;return a==b.FUNCTIONAL?b.PRINTABLE:b.FUNCTIONAL};e.ieFunctionalKeysBug=function(a){return CKEDITOR.env.ie&&e.getKeyGroup(a)==e.keyGroups.FUNCTIONAL};var f=CKEDITOR.plugins.undo.Image=function(a,b){this.editor=a;a.fire("beforeUndoImage");var c=a.getSnapshot();CKEDITOR.env.ie&&c&&(c=c.replace(/\s+data-cke-expando=".*?"/g,""));this.contents=c;b||(this.bookmarks=(c=c&&a.getSelection())&&c.createBookmarks2(!0));a.fire("afterUndoImage")},
-h=/\b(?:href|src|name)="[^"]*?"/gi;f.prototype={equalsContent:function(a){var b=this.contents;a=a.contents;CKEDITOR.env.ie&&(CKEDITOR.env.ie7Compat||CKEDITOR.env.quirks)&&(b=b.replace(h,""),a=a.replace(h,""));return b!=a?!1:!0},equalsSelection:function(a){var b=this.bookmarks;a=a.bookmarks;if(b||a){if(!b||!a||b.length!=a.length)return!1;for(var c=0;c<b.length;c++){var d=b[c],e=a[c];if(d.startOffset!=e.startOffset||d.endOffset!=e.endOffset||!CKEDITOR.tools.arrayCompare(d.start,e.start)||!CKEDITOR.tools.arrayCompare(d.end,
-e.end))return!1}}return!0}};var k=CKEDITOR.plugins.undo.NativeEditingHandler=function(a){this.undoManager=a;this.ignoreInputEvent=!1;this.keyEventsStack=new m;this.lastKeydownImage=null};k.prototype={onKeydown:function(a){var b=a.data.getKey();if(229!==b)if(-1<CKEDITOR.tools.indexOf(g,a.data.getKeystroke()))a.data.preventDefault();else if(this.keyEventsStack.cleanUp(a),a=this.undoManager,this.keyEventsStack.getLast(b)||this.keyEventsStack.push(b),this.lastKeydownImage=new f(a.editor),e.isNavigationKey(b)||
-this.undoManager.keyGroupChanged(b))if(a.strokesRecorded[0]||a.strokesRecorded[1])a.save(!1,this.lastKeydownImage,!1),a.resetType()},onInput:function(){if(this.ignoreInputEvent)this.ignoreInputEvent=!1;else{var a=this.keyEventsStack.getLast();a||(a=this.keyEventsStack.push(0));this.keyEventsStack.increment(a.keyCode);this.keyEventsStack.getTotalInputs()>=this.undoManager.strokesLimit&&(this.undoManager.type(a.keyCode,!0),this.keyEventsStack.resetInputs())}},onKeyup:function(a){var b=this.undoManager;
-a=a.data.getKey();var c=this.keyEventsStack.getTotalInputs();this.keyEventsStack.remove(a);if(!(e.ieFunctionalKeysBug(a)&&this.lastKeydownImage&&this.lastKeydownImage.equalsContent(new f(b.editor,!0))))if(0<c)b.type(a);else if(e.isNavigationKey(a))this.onNavigationKey(!0)},onNavigationKey:function(a){var b=this.undoManager;!a&&b.save(!0,null,!1)||b.updateSelection(new f(b.editor));b.resetType()},ignoreInputEventListener:function(){this.ignoreInputEvent=!0},attachListeners:function(){var a=this.undoManager.editor,
-b=a.editable(),c=this;b.attachListener(b,"keydown",function(a){c.onKeydown(a);if(e.ieFunctionalKeysBug(a.data.getKey()))c.onInput()},null,null,999);b.attachListener(b,CKEDITOR.env.ie?"keypress":"input",c.onInput,c,null,999);b.attachListener(b,"keyup",c.onKeyup,c,null,999);b.attachListener(b,"paste",c.ignoreInputEventListener,c,null,999);b.attachListener(b,"drop",c.ignoreInputEventListener,c,null,999);b.attachListener(b.isInline()?b:a.document.getDocumentElement(),"click",function(){c.onNavigationKey()},
-null,null,999);b.attachListener(this.undoManager.editor,"blur",function(){c.keyEventsStack.remove(9)},null,null,999)}};var m=CKEDITOR.plugins.undo.KeyEventsStack=function(){this.stack=[]};m.prototype={push:function(a){a=this.stack.push({keyCode:a,inputs:0});return this.stack[a-1]},getLastIndex:function(a){if("number"!=typeof a)return this.stack.length-1;for(var b=this.stack.length;b--;)if(this.stack[b].keyCode==a)return b;return-1},getLast:function(a){a=this.getLastIndex(a);return-1!=a?this.stack[a]:
-null},increment:function(a){this.getLast(a).inputs++},remove:function(a){a=this.getLastIndex(a);-1!=a&&this.stack.splice(a,1)},resetInputs:function(a){if("number"==typeof a)this.getLast(a).inputs=0;else for(a=this.stack.length;a--;)this.stack[a].inputs=0},getTotalInputs:function(){for(var a=this.stack.length,b=0;a--;)b+=this.stack[a].inputs;return b},cleanUp:function(a){a=a.data.$;a.ctrlKey||a.metaKey||this.remove(17);a.shiftKey||this.remove(16);a.altKey||this.remove(18)}}})();(function(){function m(a){function f(a){var b=!1;g.attachListener(g,"keydown",function(){var d=c.getBody().getElementsByTag(a);if(!b){for(var e=0;e<d.count();e++)d.getItem(e).setCustomData("retain",!0);b=!0}},null,null,1);g.attachListener(g,"keyup",function(){var d=c.getElementsByTag(a);b&&(1!=d.count()||d.getItem(0).getCustomData("retain")||d.getItem(0).hasAttribute("data-cke-temp")||d.getItem(0).remove(1),b=!1)})}var b=this.editor,c=a.document,d=c.body,e=c.getElementById("cke_actscrpt");e&&e.parentNode.removeChild(e);
-(e=c.getElementById("cke_shimscrpt"))&&e.parentNode.removeChild(e);(e=c.getElementById("cke_basetagscrpt"))&&e.parentNode.removeChild(e);d.contentEditable=!0;CKEDITOR.env.ie&&(d.hideFocus=!0,d.disabled=!0,d.removeAttribute("disabled"));delete this._.isLoadingData;this.$=d;c=new CKEDITOR.dom.document(c);this.setup();this.fixInitialSelection();var g=this;CKEDITOR.env.ie&&!CKEDITOR.env.edge&&c.getDocumentElement().addClass(c.$.compatMode);CKEDITOR.env.ie&&!CKEDITOR.env.edge&&b.enterMode!=CKEDITOR.ENTER_P?
-f("p"):CKEDITOR.env.edge&&b.enterMode!=CKEDITOR.ENTER_DIV&&f("div");if(CKEDITOR.env.webkit||CKEDITOR.env.ie&&10<CKEDITOR.env.version)c.getDocumentElement().on("mousedown",function(a){a.data.getTarget().is("html")&&setTimeout(function(){b.editable().focus()})});n(b);try{b.document.$.execCommand("2D-position",!1,!0)}catch(h){}(CKEDITOR.env.gecko||CKEDITOR.env.ie&&"CSS1Compat"==b.document.$.compatMode)&&this.attachListener(this,"keydown",function(a){var c=a.data.getKeystroke();if(33==c||34==c)if(CKEDITOR.env.ie)setTimeout(function(){b.getSelection().scrollIntoView()},
-0);else if(b.window.$.innerHeight>this.$.offsetHeight){var d=b.createRange();d[33==c?"moveToElementEditStart":"moveToElementEditEnd"](this);d.select();a.data.preventDefault()}});CKEDITOR.env.ie&&this.attachListener(c,"blur",function(){try{c.$.selection.empty()}catch(a){}});CKEDITOR.env.iOS&&this.attachListener(c,"touchend",function(){a.focus()});d=b.document.getElementsByTag("title").getItem(0);d.data("cke-title",d.getText());CKEDITOR.env.ie&&(b.document.$.title=this._.docTitle);CKEDITOR.tools.setTimeout(function(){"unloaded"==
-this.status&&(this.status="ready");b.fire("contentDom");this._.isPendingFocus&&(b.focus(),this._.isPendingFocus=!1);setTimeout(function(){b.fire("dataReady")},0)},0,this)}function n(a){function f(){var c;a.editable().attachListener(a,"selectionChange",function(){var d=a.getSelection().getSelectedElement();d&&(c&&(c.detachEvent("onresizestart",b),c=null),d.$.attachEvent("onresizestart",b),c=d.$)})}function b(a){a.returnValue=!1}if(CKEDITOR.env.gecko)try{var c=a.document.$;c.execCommand("enableObjectResizing",
-!1,!a.config.disableObjectResizing);c.execCommand("enableInlineTableEditing",!1,!a.config.disableNativeTableHandles)}catch(d){}else CKEDITOR.env.ie&&11>CKEDITOR.env.version&&a.config.disableObjectResizing&&f(a)}function p(){var a=[];if(8<=CKEDITOR.document.$.documentMode){a.push("html.CSS1Compat [contenteditable\x3dfalse]{min-height:0 !important}");var f=[],b;for(b in CKEDITOR.dtd.$removeEmpty)f.push("html.CSS1Compat "+b+"[contenteditable\x3dfalse]");a.push(f.join(",")+"{display:inline-block}")}else CKEDITOR.env.gecko&&
-(a.push("html{height:100% !important}"),a.push("img:-moz-broken{-moz-force-broken-image-icon:1;min-width:24px;min-height:24px}"));a.push("html{cursor:text;*cursor:auto}");a.push("img,input,textarea{cursor:default}");return a.join("\n")}var l;CKEDITOR.plugins.add("wysiwygarea",{init:function(a){a.config.fullPage&&a.addFeature({allowedContent:"html head title; style [media,type]; body (*)[id]; meta link [*]",requiredContent:"body"});a.addMode("wysiwyg",function(f){function b(b){b&&b.removeListener();
-a.editable(new l(a,d.$.contentWindow.document.body));a.setData(a.getData(1),f)}var c="document.open();"+(CKEDITOR.env.ie?"("+CKEDITOR.tools.fixDomain+")();":"")+"document.close();",c=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void(function(){"+encodeURIComponent(c)+"}())":"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe src\x3d"'+c+'" frameBorder\x3d"0"\x3e\x3c/iframe\x3e');d.setStyles({width:"100%",height:"100%"});d.addClass("cke_wysiwyg_frame").addClass("cke_reset");
-c=a.ui.space("contents");c.append(d);var e=CKEDITOR.env.ie&&!CKEDITOR.env.edge||CKEDITOR.env.gecko;if(e)d.on("load",b);var g=a.title,h=a.fire("ariaEditorHelpLabel",{}).label;g&&(CKEDITOR.env.ie&&h&&(g+=", "+h),d.setAttribute("title",g));if(h){var g=CKEDITOR.tools.getNextId(),k=CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+g+'" class\x3d"cke_voice_label"\x3e'+h+"\x3c/span\x3e");c.append(k,1);d.setAttribute("aria-describedby",g)}a.on("beforeModeUnload",function(a){a.removeListener();k&&k.remove()});
-d.setAttributes({tabIndex:a.tabIndex,allowTransparency:"true"});!e&&b();a.fire("ariaWidget",d)})}});CKEDITOR.editor.prototype.addContentsCss=function(a){var f=this.config,b=f.contentsCss;CKEDITOR.tools.isArray(b)||(f.contentsCss=b?[b]:[]);f.contentsCss.push(a)};l=CKEDITOR.tools.createClass({$:function(){this.base.apply(this,arguments);this._.frameLoadedHandler=CKEDITOR.tools.addFunction(function(a){CKEDITOR.tools.setTimeout(m,0,this,a)},this);this._.docTitle=this.getWindow().getFrame().getAttribute("title")},
-base:CKEDITOR.editable,proto:{setData:function(a,f){var b=this.editor;if(f)this.setHtml(a),this.fixInitialSelection(),b.fire("dataReady");else{this._.isLoadingData=!0;b._.dataStore={id:1};var c=b.config,d=c.fullPage,e=c.docType,g=CKEDITOR.tools.buildStyleHtml(p()).replace(/<style>/,'\x3cstyle data-cke-temp\x3d"1"\x3e');d||(g+=CKEDITOR.tools.buildStyleHtml(b.config.contentsCss));var h=c.baseHref?'\x3cbase href\x3d"'+c.baseHref+'" data-cke-temp\x3d"1" /\x3e':"";d&&(a=a.replace(/<!DOCTYPE[^>]*>/i,function(a){b.docType=
-e=a;return""}).replace(/<\?xml\s[^\?]*\?>/i,function(a){b.xmlDeclaration=a;return""}));a=b.dataProcessor.toHtml(a);d?(/<body[\s|>]/.test(a)||(a="\x3cbody\x3e"+a),/<html[\s|>]/.test(a)||(a="\x3chtml\x3e"+a+"\x3c/html\x3e"),/<head[\s|>]/.test(a)?/<title[\s|>]/.test(a)||(a=a.replace(/<head[^>]*>/,"$\x26\x3ctitle\x3e\x3c/title\x3e")):a=a.replace(/<html[^>]*>/,"$\x26\x3chead\x3e\x3ctitle\x3e\x3c/title\x3e\x3c/head\x3e"),h&&(a=a.replace(/<head[^>]*?>/,"$\x26"+h)),a=a.replace(/<\/head\s*>/,g+"$\x26"),a=
-e+a):a=c.docType+'\x3chtml dir\x3d"'+c.contentsLangDirection+'" lang\x3d"'+(c.contentsLanguage||b.langCode)+'"\x3e\x3chead\x3e\x3ctitle\x3e'+this._.docTitle+"\x3c/title\x3e"+h+g+"\x3c/head\x3e\x3cbody"+(c.bodyId?' id\x3d"'+c.bodyId+'"':"")+(c.bodyClass?' class\x3d"'+c.bodyClass+'"':"")+"\x3e"+a+"\x3c/body\x3e\x3c/html\x3e";CKEDITOR.env.gecko&&(a=a.replace(/<body/,'\x3cbody contenteditable\x3d"true" '),2E4>CKEDITOR.env.version&&(a=a.replace(/<body[^>]*>/,"$\x26\x3c!-- cke-content-start --\x3e")));
-c='\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"'+(CKEDITOR.env.ie?' defer\x3d"defer" ':"")+"\x3evar wasLoaded\x3d0;function onload(){if(!wasLoaded)window.parent.CKEDITOR.tools.callFunction("+this._.frameLoadedHandler+",window);wasLoaded\x3d1;}"+(CKEDITOR.env.ie?"onload();":'document.addEventListener("DOMContentLoaded", onload, false );')+"\x3c/script\x3e";CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_shimscrpt"\x3ewindow.parent.CKEDITOR.tools.enableHtml5Elements(document)\x3c/script\x3e');
-h&&CKEDITOR.env.ie&&10>CKEDITOR.env.version&&(c+='\x3cscript id\x3d"cke_basetagscrpt"\x3evar baseTag \x3d document.querySelector( "base" );baseTag.href \x3d baseTag.href;\x3c/script\x3e');a=a.replace(/(?=\s*<\/(:?head)>)/,c);this.clearCustomData();this.clearListeners();b.fire("contentDomUnload");var k=this.getDocument();try{k.write(a)}catch(l){setTimeout(function(){k.write(a)},0)}}},getData:function(a){if(a)return this.getHtml();a=this.editor;var f=a.config,b=f.fullPage,c=b&&a.docType,d=b&&a.xmlDeclaration,
-e=this.getDocument(),b=b?e.getDocumentElement().getOuterHtml():e.getBody().getHtml();CKEDITOR.env.gecko&&f.enterMode!=CKEDITOR.ENTER_BR&&(b=b.replace(/<br>(?=\s*(:?$|<\/body>))/,""));b=a.dataProcessor.toDataFormat(b);d&&(b=d+"\n"+b);c&&(b=c+"\n"+b);return b},focus:function(){this._.isLoadingData?this._.isPendingFocus=!0:l.baseProto.focus.call(this)},detach:function(){var a=this.editor,f=a.document,b;try{b=a.window.getFrame()}catch(c){}l.baseProto.detach.call(this);this.clearCustomData();f.getDocumentElement().clearCustomData();
-CKEDITOR.tools.removeFunction(this._.frameLoadedHandler);b&&b.getParent()?(b.clearCustomData(),(a=b.removeCustomData("onResize"))&&a.removeListener(),b.remove()):CKEDITOR.warn("editor-destroy-iframe")}}})})();CKEDITOR.config.disableObjectResizing=!1;CKEDITOR.config.disableNativeTableHandles=!0;CKEDITOR.config.disableNativeSpellChecker=!0;CKEDITOR.plugins.colordialog={requires:"dialog",init:function(b){var c=new CKEDITOR.dialogCommand("colordialog");c.editorFocus=!1;b.addCommand("colordialog",c);CKEDITOR.dialog.add("colordialog",this.path+"dialogs/colordialog.js");b.getColorFromDialog=function(c,f){var d=function(a){this.removeListener("ok",d);this.removeListener("cancel",d);a="ok"==a.name?this.getValueOf("picker","selectedColor"):null;c.call(f,a)},e=function(a){a.on("ok",d);a.on("cancel",d)};b.execCommand("colordialog");if(b._.storedDialogs&&
-b._.storedDialogs.colordialog)e(b._.storedDialogs.colordialog);else CKEDITOR.on("dialogDefinition",function(a){if("colordialog"==a.data.name){var b=a.data.definition;a.removeListener();b.onLoad=CKEDITOR.tools.override(b.onLoad,function(a){return function(){e(this);b.onLoad=a;"function"==typeof a&&a.call(this)}})}})}}};CKEDITOR.plugins.add("colordialog",CKEDITOR.plugins.colordialog);CKEDITOR.config.plugins='dialogui,dialog,about,clipboard,autolink,base64image,basicstyles,bidi,blockquote,button,panelbutton,panel,floatpanel,colorbutton,divarea,enterkey,entities,floatingspace,listblock,richcombo,font,image,lineutils,widgetselection,widget,image2,indent,indentlist,fakeobjects,link,list,maximize,pastebase64,table,quicktable,removeformat,sourcearea,toolbar,undo,wysiwygarea,colordialog';CKEDITOR.config.skin='moono-lisa';(function() {var setIcons = function(icons, strip) {var path = CKEDITOR.getUrl( 'plugins/' + strip );icons = icons.split( ',' );for ( var i = 0; i < icons.length; i++ )CKEDITOR.skin.icons[ icons[ i ] ] = { path: path, offset: -icons[ ++i ], bgsize : icons[ ++i ] };};if (CKEDITOR.env.hidpi) setIcons('about,0,,copy-rtl,24,,copy,48,,cut-rtl,72,,cut,96,,paste-rtl,120,,paste,144,,base64image,168,,bold,192,,italic,216,,strike,240,,subscript,264,,superscript,288,,underline,312,,bidiltr,336,,bidirtl,360,,blockquote,384,,bgcolor,408,,textcolor,432,,image,456,,indent-rtl,480,,indent,504,,outdent-rtl,528,,outdent,552,,anchor-rtl,576,,anchor,600,,link,624,,unlink,648,,bulletedlist-rtl,672,,bulletedlist,696,,numberedlist-rtl,720,,numberedlist,744,,maximize,768,,table,792,,removeformat,816,,source-rtl,840,,source,864,,redo-rtl,888,,redo,912,,undo-rtl,936,,undo,960,','icons_hidpi.png');else setIcons('about,0,auto,copy-rtl,24,auto,copy,48,auto,cut-rtl,72,auto,cut,96,auto,paste-rtl,120,auto,paste,144,auto,base64image,168,auto,bold,192,auto,italic,216,auto,strike,240,auto,subscript,264,auto,superscript,288,auto,underline,312,auto,bidiltr,336,auto,bidirtl,360,auto,blockquote,384,auto,bgcolor,408,auto,textcolor,432,auto,image,456,auto,indent-rtl,480,auto,indent,504,auto,outdent-rtl,528,auto,outdent,552,auto,anchor-rtl,576,auto,anchor,600,auto,link,624,auto,unlink,648,auto,bulletedlist-rtl,672,auto,bulletedlist,696,auto,numberedlist-rtl,720,auto,numberedlist,744,auto,maximize,768,auto,table,792,auto,removeformat,816,auto,source-rtl,840,auto,source,864,auto,redo-rtl,888,auto,redo,912,auto,undo-rtl,936,auto,undo,960,auto','icons.png');})();CKEDITOR.lang.languages={"af":1,"ar":1,"az":1,"bg":1,"bn":1,"bs":1,"ca":1,"cs":1,"cy":1,"da":1,"de":1,"de-ch":1,"el":1,"en":1,"en-au":1,"en-ca":1,"en-gb":1,"eo":1,"es":1,"et":1,"eu":1,"fa":1,"fi":1,"fo":1,"fr":1,"fr-ca":1,"gl":1,"gu":1,"he":1,"hi":1,"hr":1,"hu":1,"id":1,"is":1,"it":1,"ja":1,"ka":1,"km":1,"ko":1,"ku":1,"lt":1,"lv":1,"mk":1,"mn":1,"ms":1,"nb":1,"nl":1,"no":1,"oc":1,"pl":1,"pt":1,"pt-br":1,"ro":1,"ru":1,"si":1,"sk":1,"sl":1,"sq":1,"sr":1,"sr-latn":1,"sv":1,"th":1,"tr":1,"tt":1,"ug":1,"uk":1,"vi":1,"zh":1,"zh-cn":1};}());
diff --git a/plugins/ckeditor/src/config.js b/plugins/ckeditor/src/config.js
deleted file mode 100644
index dcf6d7a62..000000000
--- a/plugins/ckeditor/src/config.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-CKEDITOR.editorConfig = function( config ) {
-	// Define changes to default configuration here.
-	// For complete reference see:
-	// http://docs.ckeditor.com/#!/api/CKEDITOR.config
-
-	// The toolbar groups arrangement, optimized for a single toolbar row.
-	config.toolbarGroups = [
-		{ name: 'document',	   groups: [ 'mode', 'document', 'doctools' ] },
-		{ name: 'clipboard',   groups: [ 'clipboard', 'undo' ] },
-		{ name: 'editing',     groups: [ 'find', 'selection', 'spellchecker' ] },
-		{ name: 'forms' },
-		{ name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] },
-		{ name: 'paragraph',   groups: [ 'list', 'indent', 'blocks', 'align', 'bidi' ] },
-		{ name: 'links' },
-		{ name: 'insert' },
-		{ name: 'styles' },
-		{ name: 'colors' },
-		{ name: 'tools' },
-		{ name: 'others' },
-		{ name: 'about' }
-	];
-
-	// The default plugins included in the basic setup define some buttons that
-	// are not needed in a basic editor. They are removed here.
-	config.removeButtons = 'Cut,Copy,Paste,Undo,Redo,Anchor,Underline,Strike,Subscript,Superscript';
-
-	// Dialog windows are also simplified.
-	config.removeDialogTabs = 'link:advanced';
-};
diff --git a/plugins/ckeditor/src/contents.css b/plugins/ckeditor/src/contents.css
deleted file mode 100644
index 8571059d5..000000000
--- a/plugins/ckeditor/src/contents.css
+++ /dev/null
@@ -1,208 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-
-body
-{
-	/* Font */
-	font-family: sans-serif, Arial, Verdana, "Trebuchet MS";
-	font-size: 12px;
-
-	/* Text color */
-	color: #333;
-
-	/* Remove the background color to make it transparent */
-	background-color: #fff;
-
-	margin: 20px;
-}
-
-.cke_editable
-{
-	font-size: 13px;
-	line-height: 1.6;
-
-	/* Fix for missing scrollbars with RTL texts. (#10488) */
-	word-wrap: break-word;
-}
-
-blockquote
-{
-	font-style: italic;
-	font-family: Georgia, Times, "Times New Roman", serif;
-	padding: 2px 0;
-	border-style: solid;
-	border-color: #ccc;
-	border-width: 0;
-}
-
-.cke_contents_ltr blockquote
-{
-	padding-left: 20px;
-	padding-right: 8px;
-	border-left-width: 5px;
-}
-
-.cke_contents_rtl blockquote
-{
-	padding-left: 8px;
-	padding-right: 20px;
-	border-right-width: 5px;
-}
-
-a
-{
-	color: #0782C1;
-}
-
-ol,ul,dl
-{
-	/* IE7: reset rtl list margin. (#7334) */
-	*margin-right: 0px;
-	/* preserved spaces for list items with text direction other than the list. (#6249,#8049)*/
-	padding: 0 40px;
-}
-
-h1,h2,h3,h4,h5,h6
-{
-	font-weight: normal;
-	line-height: 1.2;
-}
-
-hr
-{
-	border: 0px;
-	border-top: 1px solid #ccc;
-}
-
-img.right
-{
-	border: 1px solid #ccc;
-	float: right;
-	margin-left: 15px;
-	padding: 5px;
-}
-
-img.left
-{
-	border: 1px solid #ccc;
-	float: left;
-	margin-right: 15px;
-	padding: 5px;
-}
-
-pre
-{
-	white-space: pre-wrap; /* CSS 2.1 */
-	word-wrap: break-word; /* IE7 */
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.marker
-{
-	background-color: Yellow;
-}
-
-span[lang]
-{
-	font-style: italic;
-}
-
-figure
-{
-	text-align: center;
-	border: solid 1px #ccc;
-	border-radius: 2px;
-	background: rgba(0,0,0,0.05);
-	padding: 10px;
-	margin: 10px 20px;
-	display: inline-block;
-}
-
-figure > figcaption
-{
-	text-align: center;
-	display: block; /* For IE8 */
-}
-
-a > img {
-	padding: 1px;
-	margin: 1px;
-	border: none;
-	outline: 1px solid #0782C1;
-}
-
-/* Widget Styles */
-.code-featured
-{
-	border: 5px solid red;
-}
-
-.math-featured
-{
-	padding: 20px;
-	box-shadow: 0 0 2px rgba(200, 0, 0, 1);
-	background-color: rgba(255, 0, 0, 0.05);
-	margin: 10px;
-}
-
-.image-clean
-{
-	border: 0;
-	background: none;
-	padding: 0;
-}
-
-.image-clean > figcaption
-{
-	font-size: .9em;
-	text-align: right;
-}
-
-.image-grayscale
-{
-	background-color: white;
-	color: #666;
-}
-
-.image-grayscale img, img.image-grayscale
-{
-	filter: grayscale(100%);
-}
-
-.embed-240p
-{
-	max-width: 426px;
-	max-height: 240px;
-	margin:0 auto;
-}
-
-.embed-360p
-{
-	max-width: 640px;
-	max-height: 360px;
-	margin:0 auto;
-}
-
-.embed-480p
-{
-	max-width: 854px;
-	max-height: 480px;
-	margin:0 auto;
-}
-
-.embed-720p
-{
-	max-width: 1280px;
-	max-height: 720px;
-	margin:0 auto;
-}
-
-.embed-1080p
-{
-	max-width: 1920px;
-	max-height: 1080px;
-	margin:0 auto;
-}
diff --git a/plugins/ckeditor/src/lang/af.js b/plugins/ckeditor/src/lang/af.js
deleted file mode 100644
index 74ddb0108..000000000
--- a/plugins/ckeditor/src/lang/af.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['af']={"editor":"Woordverwerker","editorPanel":"Woordverwerkerpaneel","common":{"editorHelp":"Druk op ALT 0 vir hulp","browseServer":"Blaai op bediener","url":"URL","protocol":"Protokol","upload":"Oplaai","uploadSubmit":"Stuur aan die bediener","image":"Beeld","flash":"Flash","form":"Vorm","checkbox":"Merkhokkie","radio":"Radioknoppie","textField":"Teksveld","textarea":"Teksarea","hiddenField":"Versteekteveld","button":"Knop","select":"Keuseveld","imageButton":"Beeldknop","notSet":"<geen instelling>","id":"Id","name":"Naam","langDir":"Skryfrigting","langDirLtr":"Links na regs (LTR)","langDirRtl":"Regs na links (RTL)","langCode":"Taalkode","longDescr":"Lang beskrywing URL","cssClass":"CSS klasse","advisoryTitle":"Aanbevole titel","cssStyle":"Styl","ok":"OK","cancel":"Kanselleer","close":"Sluit","preview":"Voorbeeld","resize":"Skalierung","generalTab":"Algemeen","advancedTab":"Gevorderd","validateNumberFailed":"Hierdie waarde is nie 'n nommer nie.","confirmNewPage":"Alle wysiginge sal verlore gaan. Is jy seker dat jy 'n nuwe bladsy wil laai?","confirmCancel":"Sommige opsies is gewysig. Is jy seker dat jy hierdie dialoogvenster wil sluit?","options":"Opsies","target":"Teiken","targetNew":"Nuwe venster (_blank)","targetTop":"Boonste venster (_top)","targetSelf":"Selfde venster (_self)","targetParent":"Oorspronklike venster (_parent)","langDirLTR":"Links na Regs (LTR)","langDirRTL":"Regs na Links (RTL)","styles":"Styl","cssClasses":"CSS klasse","width":"Breedte","height":"Hoogte","align":"Orienteerung","alignLeft":"Links","alignRight":"Regs","alignCenter":"Middel","alignJustify":"Eweredig","alignTop":"Bo","alignMiddle":"Middel","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde","invalidHeight":"Hoogte moet 'n getal wees","invalidWidth":"Breedte moet 'n getal wees.","invalidCssLength":"Die waarde vir die \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","invalidHtmlLength":"Die waarde vir die  \"%1\" veld moet 'n posetiewe getal wees met of sonder 'n geldige HTML eenheid (px of %).","invalidInlineStyle":"Ongeldige CSS. Formaat is een of meer sleutel-wert paare, \"naam : wert\" met kommapunte gesky.","cssLengthTooltip":"Voeg 'n getal wert in pixel in, of 'n waarde met geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, nie beskikbaar nie</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Einde","36":"Tuis","46":"Verwyder","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Kopiereg &copy; $1. Alle regte voorbehou.","dlgTitle":"Meer oor CKEditor","help":"Slaan $1 na vir hulp.","moreInfo":"Vir lisensie-informasie, besoek asb. ons webwerf:","title":"Meer oor CKEditor","userGuide":"CKEditor Gebruikers gits"},"clipboard":{"copy":"Kopiëer","copyError":"U blaaier se sekuriteitsinstelling belet die kopiëringsaksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+C).","cut":"Knip","cutError":"U blaaier se sekuriteitsinstelling belet die outomatiese knip-aksie. Gebruik die sleutelbordkombinasie (Ctrl/Cmd+X).","paste":"Plak","pasteArea":"Plak-area","pasteMsg":"Plak die teks in die volgende teks-area met die sleutelbordkombinasie (<STRONG>Ctrl/Cmd+V</STRONG>) en druk <STRONG>OK</STRONG>.","securityMsg":"Weens u blaaier se sekuriteitsinstelling is data op die knipbord nie toeganklik nie. U kan dit eers weer in hierdie venster plak.","title":"Byvoeg"},"base64image":{"alt":"Alternatiewe teks","lockRatio":"Vaste proporsie","vSpace":"VSpasie","hSpace":"HSpasie","border":"Rand"},"basicstyles":{"bold":"Vet","italic":"Skuins","strike":"Deurgestreep","subscript":"Onderskrif","superscript":"Bo-skrif","underline":"Onderstreep"},"bidi":{"ltr":"Skryfrigting van links na regs","rtl":"Skryfrigting van regs na links"},"blockquote":{"toolbar":"Sitaatblok"},"button":{"selectedLabel":"%1 uitgekies"},"colorbutton":{"auto":"Outomaties","bgColorTitle":"Agtergrondkleur","colors":{"000":"Swart","800000":"Meroen","8B4513":"Sjokoladebruin","2F4F4F":"Donkerleisteengrys","008080":"Blougroen","000080":"Vlootblou","4B0082":"Indigo","696969":"Donkergrys","B22222":"Rooibaksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turkoois","0000CD":"Middelblou","800080":"Pers","808080":"Grys","F00":"Rooi","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Siaan","00F":"Blou","EE82EE":"Viooltjieblou","A9A9A9":"Donkergrys","FFA07A":"Ligsalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Lemmetjie","AFEEEE":"Ligturkoois","ADD8E6":"Ligblou","DDA0DD":"Pruim","D3D3D3":"Liggrys","FFF0F5":"Linne","FAEBD7":"Ivoor","FFFFE0":"Liggeel","F0FFF0":"Heuningdou","F0FFFF":"Asuur","F0F8FF":"Ligte hemelsblou","E6E6FA":"Laventel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Meer Kleure...","panelTitle":"Kleure","textColorTitle":"Tekskleur"},"font":{"fontSize":{"label":"Grootte","voiceLabel":"Fontgrootte","panelTitle":"Fontgrootte"},"label":"Font","panelTitle":"Fontnaam","voiceLabel":"Font"},"image":{"alt":"Alternatiewe teks","border":"Rand","btnUpload":"Stuur na bediener","button2Img":"Wil u die geselekteerde afbeeldingsknop vervang met 'n eenvoudige afbeelding?","hSpace":"HSpasie","img2Button":"Wil u die geselekteerde afbeelding vervang met 'n afbeeldingsknop?","infoTab":"Afbeelding informasie","linkTab":"Skakel","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","resetSize":"Herstel grootte","title":"Afbeelding eienskappe","titleButton":"Afbeeldingsknop eienskappe","upload":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","vSpace":"VSpasie","validateBorder":"Rand moet 'n heelgetal wees.","validateHSpace":"HSpasie moet 'n heelgetal wees.","validateVSpace":"VSpasie moet 'n heelgetal wees."},"widget":{"move":"Klik en trek on te beweeg","label":"%1 widget"},"image2":{"alt":"Alternatiewe teks","btnUpload":"Stuur na bediener","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Afbeelding informasie","lockRatio":"Vaste proporsie","menu":"Afbeelding eienskappe","pathName":"image","pathNameCaption":"caption","resetSize":"Herstel grootte","resizer":"Click and drag to resize","title":"Afbeelding eienskappe","uploadTab":"Oplaai","urlMissing":"Die URL na die afbeelding ontbreek.","altMissing":"Alternative text is missing."},"indent":{"indent":"Vergroot inspring","outdent":"Verklein inspring"},"fakeobjects":{"anchor":"Anker","flash":"Flash animasie","hiddenfield":"Verborge veld","iframe":"IFrame","unknown":"Onbekende objek"},"link":{"acccessKey":"Toegangsleutel","advanced":"Gevorderd","advisoryContentType":"Aanbevole inhoudstipe","advisoryTitle":"Aanbevole titel","anchor":{"toolbar":"Anker byvoeg/verander","menu":"Anker-eienskappe","title":"Anker-eienskappe","name":"Ankernaam","errorName":"Voltooi die ankernaam asseblief","remove":"Remove Anchor"},"anchorId":"Op element Id","anchorName":"Op ankernaam","charset":"Karakterstel van geskakelde bron","cssClasses":"CSS klasse","download":"Force Download","displayText":"Display Text","emailAddress":"E-posadres","emailBody":"Berig-inhoud","emailSubject":"Berig-onderwerp","id":"Id","info":"Skakel informasie","langCode":"Taalkode","langDir":"Skryfrigting","langDirLTR":"Links na regs (LTR)","langDirRTL":"Regs na links (RTL)","menu":"Wysig skakel","name":"Naam","noAnchors":"(Geen ankers beskikbaar in dokument)","noEmail":"Gee die e-posadres","noUrl":"Gee die skakel se URL","other":"<ander>","popupDependent":"Afhanklik (Netscape)","popupFeatures":"Eienskappe van opspringvenster","popupFullScreen":"Volskerm (IE)","popupLeft":"Posisie links","popupLocationBar":"Adresbalk","popupMenuBar":"Spyskaartbalk","popupResizable":"Herskaalbaar","popupScrollBars":"Skuifbalke","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Posisie bo","rel":"Relationship","selectAnchor":"Kies 'n anker","styles":"Styl","tabIndex":"Tab indeks","target":"Doel","targetFrame":"<raam>","targetFrameName":"Naam van doelraam","targetPopup":"<opspringvenster>","targetPopupName":"Naam van opspringvenster","title":"Skakel","toAnchor":"Anker in bladsy","toEmail":"E-pos","toUrl":"URL","toolbar":"Skakel invoeg/wysig","type":"Skakelsoort","unlink":"Verwyder skakel","upload":"Oplaai"},"list":{"bulletedlist":"Ongenommerde lys","numberedlist":"Genommerde lys"},"maximize":{"maximize":"Maksimaliseer","minimize":"Minimaliseer"},"table":{"border":"Randbreedte","caption":"Naam","cell":{"menu":"Sel","insertBefore":"Voeg sel in voor","insertAfter":"Voeg sel in na","deleteCell":"Verwyder sel","merge":"Voeg selle saam","mergeRight":"Voeg saam na regs","mergeDown":"Voeg saam ondertoe","splitHorizontal":"Splits sel horisontaal","splitVertical":"Splits sel vertikaal","title":"Sel eienskappe","cellType":"Sel tipe","rowSpan":"Omspan rye","colSpan":"Omspan kolomme","wordWrap":"Woord terugloop","hAlign":"Horisontale oplyning","vAlign":"Vertikale oplyning","alignBaseline":"Basislyn","bgColor":"Agtergrondkleur","borderColor":"Randkleur","data":"Inhoud","header":"Opskrif","yes":"Ja","no":"Nee","invalidWidth":"Selbreedte moet 'n getal wees.","invalidHeight":"Selhoogte moet 'n getal wees.","invalidRowSpan":"Omspan rye moet 'n heelgetal wees.","invalidColSpan":"Omspan kolomme moet 'n heelgetal wees.","chooseColor":"Kies"},"cellPad":"Sel-spasie","cellSpace":"Sel-afstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Verwyder kolom"},"columns":"Kolomme","deleteTable":"Verwyder tabel","headers":"Opskrifte","headersBoth":"Beide    ","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste ry","invalidBorder":"Randbreedte moet 'n getal wees.","invalidCellPadding":"Sel-spasie moet 'n getal wees.","invalidCellSpacing":"Sel-afstand moet 'n getal wees.","invalidCols":"Aantal kolomme moet 'n getal groter as 0 wees.","invalidHeight":"Tabelhoogte moet 'n getal wees.","invalidRows":"Aantal rye moet 'n getal groter as 0 wees.","invalidWidth":"Tabelbreedte moet 'n getal wees.","menu":"Tabel eienskappe","row":{"menu":"Ry","insertBefore":"Voeg ry in voor","insertAfter":"Voeg ry in na","deleteRow":"Verwyder ry"},"rows":"Rye","summary":"Opsomming","title":"Tabel eienskappe","toolbar":"Tabel","widthPc":"persent","widthPx":"piksels","widthUnit":"breedte-eenheid"},"quicktable":{"more":"Meer..."},"removeformat":{"toolbar":"Verwyder opmaak"},"sourcearea":{"toolbar":"Bron"},"toolbar":{"toolbarCollapse":"Verklein werkbalk","toolbarExpand":"Vergroot werkbalk","toolbarGroups":{"document":"Dokument","clipboard":"Knipbord/Undo","editing":"Verander","forms":"Vorms","basicstyles":"Eenvoudige Styl","paragraph":"Paragraaf","links":"Skakels","insert":"Toevoeg","styles":"Style","colors":"Kleure","tools":"Gereedskap"},"toolbars":"Werkbalke"},"undo":{"redo":"Oordoen","undo":"Ontdoen"},"colordialog":{"clear":"Herstel","highlight":"Aktief","options":"Kleuropsies","selected":"Geselekteer","title":"Kies kleur"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ar.js b/plugins/ckeditor/src/lang/ar.js
deleted file mode 100644
index 49eb178fc..000000000
--- a/plugins/ckeditor/src/lang/ar.js
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ar']={"editor":"�
-حرر النص الغني","editorPanel":"لائحة �
-حرر النص ال�
-نسق","common":{"editorHelp":"إضغط على ALT + 0 للحصول على ال�
-ساعدة.","browseServer":"تصفح","url":"الرابط","protocol":"البروتوكول","upload":"رفع","uploadSubmit":"أرسل","image":"صورة","flash":"فلاش","form":"ن�
-وذج","checkbox":"خانة إختيار","radio":"زر اختيار","textField":"�
-ربع نص","textarea":"�
-ساحة نصية","hiddenField":"إدراج حقل خفي","button":"زر ضغط","select":"اختار","imageButton":"زر صورة","notSet":"<بدون تحديد>","id":"الرق�
-","name":"إس�
-","langDir":"إتجاه النص","langDirLtr":"اليسار للي�
-ين (LTR)","langDirRtl":"الي�
-ين لليسار (RTL)","langCode":"ر�
-ز اللغة","longDescr":"الوصف التفصيلى","cssClass":"فئات التنسيق","advisoryTitle":"عنوان التقرير","cssStyle":"ن�
-ط","ok":"�
-وافق","cancel":"إلغاء الأ�
-ر","close":"أغلق","preview":"استعراض","resize":"تغيير الحج�
-","generalTab":"عا�
-","advancedTab":"�
-تقد�
-","validateNumberFailed":"لايوجد نتيجة","confirmNewPage":"ستفقد أي �
-تغييرات اذا ل�
- تق�
- بحفظها اولا. هل أنت �
-تأكد أنك تريد صفحة جديدة؟","confirmCancel":"بعض الخيارات قد تغيرت. هل أنت �
-تأكد �
-ن إغلاق �
-ربع النص؟","options":"خيارات","target":"هدف الرابط","targetNew":"نافذة جديدة","targetTop":"النافذة الأعلى","targetSelf":"داخل النافذة","targetParent":"النافذة الأ�
-","langDirLTR":"اليسار للي�
-ين (LTR)","langDirRTL":"الي�
-ين لليسار (RTL)","styles":"ن�
-ط","cssClasses":"فئات التنسيق","width":"العرض","height":"الإرتفاع","align":"�
-حاذاة","alignLeft":"يسار","alignRight":"ي�
-ين","alignCenter":"وسط","alignJustify":"ضبط","alignTop":"أعلى","alignMiddle":"وسط","alignBottom":"أسفل","alignNone":"None","invalidValue":"قي�
-ة غير �
-فبولة.","invalidHeight":"الارتفاع يجب أن يكون عدداً.","invalidWidth":"العرض يجب أن يكون عدداً.","invalidCssLength":"قي�
-ة الخانة ال�
-خصصة لـ \"%1\" يجب أن تكون رق�
-ا �
-وجبا، باستخدا�
- أو �
-ن غير استخدا�
- وحدة CSS قياس �
-قبولة (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"قي�
-ة الخانة ال�
-خصصة لـ \"%1\" يجب أن تكون رق�
-ا �
-وجبا، باستخدا�
- أو �
-ن غير استخدا�
- وحدة HTML قياس �
-قبولة (px or %).","invalidInlineStyle":"قي�
-ة الخانة ال�
-خصصة لـ  Inline Style يجب أن تختوي على �
-ج�
-وع واحد أو أكثر بالشكل التالي: \"name : value\", �
-فصولة بفاصلة �
-نقزطة.","cssLengthTooltip":"أدخل رق�
-ا للقي�
-ة بالبكسل أو رق�
-ا بوحدة CSS �
-قبولة (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, غير �
-تاح</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"حقوق النشر &copy; $1. ج�
-يع الحقوق �
-حفوظة.","dlgTitle":"عن CKEditor","help":"راجع $1 �
-ن أجل ال�
-ساعدة","moreInfo":"للحصول على �
-علو�
-ات الترخيص ، يرجى زيارة �
-وقعنا:","title":"عن CKEditor","userGuide":"دليل �
-ستخد�
- CKEditor."},"clipboard":{"copy":"نسخ","copyError":"الإعدادات الأ�
-نية لل�
-تصفح الذي تستخد�
-ه ت�
-نع ع�
-ليات النسخ التلقائي. فضلاً إستخد�
- لوحة ال�
-فاتيح لفعل ذلك (Ctrl/Cmd+C).","cut":"قص","cutError":"الإعدادات الأ�
-نية لل�
-تصفح الذي تستخد�
-ه ت�
-نع القص التلقائي. فضلاً إستخد�
- لوحة ال�
-فاتيح لفعل ذلك (Ctrl/Cmd+X).","paste":"لصق","pasteArea":"�
-نطقة اللصق","pasteMsg":"الصق داخل الصندوق بإستخدا�
- زرائر (<STRONG>Ctrl/Cmd+V</STRONG>) في لوحة ال�
-فاتيح، ث�
- اضغط زر  <STRONG>�
-وافق</STRONG>.","securityMsg":"نظراً لإعدادات الأ�
-ان الخاصة ب�
-تصفحك، لن يت�
-كن هذا ال�
-حرر �
-ن الوصول ل�
-حتوى حافظتك، لذلك يجب عليك لصق ال�
-حتوى �
-رة أخرى في هذه النافذة.","title":"لصق"},"base64image":{"alt":"عنوان الصورة","lockRatio":"تناسق الحج�
-","vSpace":"تباعد ع�
-ودي","hSpace":"تباعد أفقي","border":"س�
-ك الحدود"},"basicstyles":{"bold":"عريض","italic":"�
-ائل","strike":"يتوسطه خط","subscript":"�
-نخفض","superscript":"�
-رتفع","underline":"تسطير"},"bidi":{"ltr":"إتجاه النص �
-ن اليسار إلى الي�
-ين","rtl":"إتجاه النص �
-ن الي�
-ين إلى اليسار"},"blockquote":{"toolbar":"اقتباس"},"button":{"selectedLabel":"%1 (�
-حدد)"},"colorbutton":{"auto":"تلقائي","bgColorTitle":"لون الخلفية","colors":{"000":"أسود","800000":"كستنائي","8B4513":"بني فاتح","2F4F4F":"ر�
-ادي أردوازي غا�
-ق","008080":"أزرق �
-خضر","000080":"أزرق داكن","4B0082":"كحلي","696969":"ر�
-ادي داكن","B22222":"طوبي","A52A2A":"بني","DAA520":"ذهبي داكن","006400":"أخضر داكن","40E0D0":"فيروزي","0000CD":"أزرق �
-توسط","800080":"بنفسجي غا�
-ق","808080":"ر�
-ادي","F00":"أح�
-ر","FF8C00":"برتقالي داكن","FFD700":"ذهبي","008000":"أخضر","0FF":"تركواز","00F":"أزرق","EE82EE":"بنفسجي","A9A9A9":"ر�
-ادي شاحب","FFA07A":"برتقالي وردي","FFA500":"برتقالي","FFFF00":"أصفر","00FF00":"لي�
-وني","AFEEEE":"فيروزي شاحب","ADD8E6":"أزرق فاتح","DDA0DD":"بنفسجي فاتح","D3D3D3":"ر�
-ادي فاتح","FFF0F5":"وردي فاتح","FAEBD7":"أبيض عتيق","FFFFE0":"أصفر فاتح","F0FFF0":"أبيض �
-ائل للأخضر","F0FFFF":"س�
-اوي","F0F8FF":"لبني","E6E6FA":"أرجواني","FFF":"أبيض","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ألوان إضافية...","panelTitle":"Colors","textColorTitle":"لون النص"},"font":{"fontSize":{"label":"حج�
- الخط","voiceLabel":"حج�
- الخط","panelTitle":"حج�
- الخط"},"label":"خط","panelTitle":"حج�
- الخط","voiceLabel":"حج�
- الخط"},"image":{"alt":"عنوان الصورة","border":"س�
-ك الحدود","btnUpload":"أرسلها للخاد�
-","button2Img":"هل تريد تحويل زر الصورة ال�
-ختار إلى صورة بسيطة؟","hSpace":"تباعد أفقي","img2Button":"هل تريد تحويل الصورة ال�
-ختارة إلى زر صورة؟","infoTab":"�
-علو�
-ات الصورة","linkTab":"الرابط","lockRatio":"تناسق الحج�
-","menu":"خصائص الصورة","resetSize":"إستعادة الحج�
- الأصلي","title":"خصائص الصورة","titleButton":"خصائص زر الصورة","upload":"رفع","urlMissing":"عنوان �
-صدر الصورة �
-فقود","vSpace":"تباعد ع�
-ودي","validateBorder":"الإطار يجب أن يكون عددا","validateHSpace":"HSpace يجب أن يكون عدداً.","validateVSpace":"VSpace يجب أن يكون عدداً."},"widget":{"move":"إضغط و إسحب للتحريك","label":"%1 widget"},"image2":{"alt":"عنوان الصورة","btnUpload":"أرسلها للخاد�
-","captioned":"صورة ذات اس�
-","captionPlaceholder":"تس�
-ية","infoTab":"�
-علو�
-ات الصورة","lockRatio":"تناسق الحج�
-","menu":"خصائص الصورة","pathName":"صورة","pathNameCaption":"تس�
-ية","resetSize":"إستعادة الحج�
- الأصلي","resizer":"انقر ث�
- اسحب للتحجي�
-","title":"خصائص الصورة","uploadTab":"رفع","urlMissing":"عنوان �
-صدر الصورة �
-فقود","altMissing":"Alternative text is missing."},"indent":{"indent":"زيادة ال�
-سافة البادئة","outdent":"إنقاص ال�
-سافة البادئة"},"fakeobjects":{"anchor":"إرساء","flash":"رس�
- �
-تحرك بالفلاش","hiddenfield":"إدراج حقل خفي","iframe":"iframe","unknown":"عنصر غير �
-عروف"},"link":{"acccessKey":"�
-فاتيح الإختصار","advanced":"�
-تقد�
-","advisoryContentType":"نوع التقرير","advisoryTitle":"عنوان التقرير","anchor":{"toolbar":"إشارة �
-رجعية","menu":"تحرير الإشارة ال�
-رجعية","title":"خصائص الإشارة ال�
-رجعية","name":"اس�
- الإشارة ال�
-رجعية","errorName":"الرجاء كتابة اس�
- الإشارة ال�
-رجعية","remove":"إزالة الإشارة ال�
-رجعية"},"anchorId":"حسب رق�
- العنصر","anchorName":"حسب إس�
- الإشارة ال�
-رجعية","charset":"تر�
-يز ال�
-ادة ال�
-طلوبة","cssClasses":"فئات التنسيق","download":"Force Download","displayText":"Display Text","emailAddress":"البريد الإلكتروني","emailBody":"�
-حتوى الرسالة","emailSubject":"�
-وضوع الرسالة","id":"هوية","info":"�
-علو�
-ات الرابط","langCode":"ر�
-ز اللغة","langDir":"إتجاه نص اللغة","langDirLTR":"اليسار للي�
-ين (LTR)","langDirRTL":"الي�
-ين لليسار (RTL)","menu":"تحرير الرابط","name":"إس�
-","noAnchors":"(لا توجد علا�
-ات �
-رجعية في هذا ال�
-ستند)","noEmail":"الرجاء كتابة الريد الإلكتروني","noUrl":"الرجاء كتابة رابط ال�
-وقع","other":"<أخرى>","popupDependent":"تابع (Netscape)","popupFeatures":"خصائص النافذة ال�
-نبثقة","popupFullScreen":"�
-لئ الشاشة (IE)","popupLeft":"الت�
-ركز لليسار","popupLocationBar":"شريط العنوان","popupMenuBar":"القوائ�
- الرئيسية","popupResizable":"قابلة التشكيل","popupScrollBars":"أشرطة الت�
-رير","popupStatusBar":"شريط الحالة","popupToolbar":"شريط الأدوات","popupTop":"الت�
-ركز للأعلى","rel":"العلاقة","selectAnchor":"اختر علا�
-ة �
-رجعية","styles":"ن�
-ط","tabIndex":"الترتيب","target":"هدف الرابط","targetFrame":"<إطار>","targetFrameName":"اس�
- الإطار ال�
-ستهدف","targetPopup":"<نافذة �
-نبثقة>","targetPopupName":"اس�
- النافذة ال�
-نبثقة","title":"رابط","toAnchor":"�
-كان في هذا ال�
-ستند","toEmail":"بريد إلكتروني","toUrl":"الرابط","toolbar":"رابط","type":"نوع الربط","unlink":"إزالة رابط","upload":"رفع"},"list":{"bulletedlist":"ادخال/حذف تعداد نقطي","numberedlist":"ادخال/حذف تعداد رق�
-ي"},"maximize":{"maximize":"تكبير","minimize":"تصغير"},"table":{"border":"الحدود","caption":"الوصف","cell":{"menu":"خلية","insertBefore":"إدراج خلية قبل","insertAfter":"إدراج خلية بعد","deleteCell":"حذف خلية","merge":"د�
-ج خلايا","mergeRight":"د�
-ج للي�
-ين","mergeDown":"د�
-ج للأسفل","splitHorizontal":"تقسي�
- الخلية أفقياً","splitVertical":"تقسي�
- الخلية ع�
-ودياً","title":"خصائص الخلية","cellType":"نوع الخلية","rowSpan":"ا�
-تداد الصفوف","colSpan":"ا�
-تداد الأع�
-دة","wordWrap":"التفاف النص","hAlign":"�
-حاذاة أفقية","vAlign":"�
-حاذاة رأسية","alignBaseline":"خط القاعدة","bgColor":"لون الخلفية","borderColor":"لون الحدود","data":"بيانات","header":"عنوان","yes":"نع�
-","no":"لا","invalidWidth":"عرض الخلية يجب أن يكون عدداً.","invalidHeight":"ارتفاع الخلية يجب أن يكون عدداً.","invalidRowSpan":"ا�
-تداد الصفوف يجب أن يكون عدداً صحيحاً.","invalidColSpan":"ا�
-تداد الأع�
-دة يجب أن يكون عدداً صحيحاً.","chooseColor":"اختر"},"cellPad":"ال�
-سافة البادئة","cellSpace":"تباعد الخلايا","column":{"menu":"ع�
-ود","insertBefore":"إدراج ع�
-ود قبل","insertAfter":"إدراج ع�
-ود بعد","deleteColumn":"حذف أع�
-دة"},"columns":"أع�
-دة","deleteTable":"حذف الجدول","headers":"العناوين","headersBoth":"كلاه�
-ا","headersColumn":"الع�
-ود الأول","headersNone":"بدون","headersRow":"الصف الأول","invalidBorder":"حج�
- الحد يجب أن يكون عدداً.","invalidCellPadding":"ال�
-سافة البادئة يجب أن تكون عدداً","invalidCellSpacing":"ال�
-سافة بين الخلايا يجب أن تكون عدداً.","invalidCols":"عدد الأع�
-دة يجب أن يكون عدداً أكبر �
-ن صفر.","invalidHeight":"ارتفاع الجدول يجب أن يكون عدداً.","invalidRows":"عدد الصفوف يجب أن يكون عدداً أكبر �
-ن صفر.","invalidWidth":"عرض الجدول يجب أن يكون عدداً.","menu":"خصائص الجدول","row":{"menu":"صف","insertBefore":"إدراج صف قبل","insertAfter":"إدراج صف بعد","deleteRow":"حذف صفوف"},"rows":"صفوف","summary":"الخلاصة","title":"خصائص الجدول","toolbar":"جدول","widthPc":"بال�
-ئة","widthPx":"بكسل","widthUnit":"وحدة العرض"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"إزالة التنسيقات"},"sourcearea":{"toolbar":"ال�
-صدر"},"toolbar":{"toolbarCollapse":"تقليص شريط الأدوت","toolbarExpand":"ت�
-ديد شريط الأدوات","toolbarGroups":{"document":"�
-ستند","clipboard":"الحافظة/الرجوع","editing":"تحرير","forms":"ن�
-اذج","basicstyles":"ن�
-ط بسيط","paragraph":"فقرة","links":"روابط","insert":"إدراج","styles":"أن�
-اط","colors":"ألوان","tools":"أدوات"},"toolbars":"أشرطة أدوات ال�
-حرر"},"undo":{"redo":"إعادة","undo":"تراجع"},"colordialog":{"clear":"�
-سح","highlight":"تحديد","options":"اختيارات الألوان","selected":"اللون ال�
-ختار","title":"اختر اللون"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/az.js b/plugins/ckeditor/src/lang/az.js
deleted file mode 100644
index 5923957d1..000000000
--- a/plugins/ckeditor/src/lang/az.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['az']={"editor":"Mətn Redaktoru","editorPanel":"Mətn Redaktorun Paneli","common":{"editorHelp":"Yardım üçün ALT 0 düymələrini basın","browseServer":"Fayların siyahı","url":"URL","protocol":"Protokol","upload":"Serverə yüklə","uploadSubmit":"Göndər","image":"Şəkil","flash":"Flash","form":"Forma","checkbox":"Çekboks","radio":"Radio düyməsi","textField":"Mətn xanası","textarea":"Mətn","hiddenField":"Gizli xana","button":"Düymə","select":"Opsiyaların seçilməsi","imageButton":"Şəkil tipli düymə","notSet":"<seçilməmiş>","id":"Id","name":"Ad","langDir":"Yaziların istiqaməti","langDirLtr":"Soldan sağa (LTR)","langDirRtl":"Sağdan sola (RTL)","langCode":"Dilin kodu","longDescr":"URL-ın ətraflı izahı","cssClass":"CSS klassları","advisoryTitle":"Başlıq","cssStyle":"CSS","ok":"Tədbiq et","cancel":"İmtina et","close":"Bağla","preview":"Baxış","resize":"Eni dəyiş","generalTab":"Əsas","advancedTab":"Əlavə","validateNumberFailed":"Rəqəm deyil.","confirmNewPage":"Yadda saxlanılmamış dəyişikliklər itiriləcək. Davam etmək istədiyinizə əminsinizmi?","confirmCancel":"Dəyişikliklər edilib. Pəncərəni bağlamaq istəyirsizə əminsinizmi?","options":"Seçimlər","target":"Hədəf çərçivə","targetNew":"Yeni pəncərə (_blank)","targetTop":"Əsas pəncərə (_top)","targetSelf":"Carı pəncərə (_self)","targetParent":"Ana pəncərə (_parent)","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","styles":"Üslub","cssClasses":"Üslub klası","width":"En","height":"Uzunluq","align":"Yerləşmə","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Mərkəz","alignJustify":"Eninə görə","alignTop":"Yuxarı","alignMiddle":"Orta","alignBottom":"Aşağı","alignNone":"Yoxdur","invalidValue":"Yanlışdır.","invalidHeight":"Hündürlük rəqəm olmalıdır.","invalidWidth":"En rəqəm olmalıdır.","invalidCssLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır, CSS-də olan ölçü vahidlərin (px, %, in, cm, mm, em, ex, pt, or pc) istifadısinə icazə verilir.","invalidHtmlLength":"\"%1\" xanasında göstərilən məzmun tam və müsbət olmalıdır HTML-də olan ölçü vahidlərin (px və ya %) istifadısinə icazə verilir.","invalidInlineStyle":"Teq içində olan üslub \"ad :  məzmun\" şəklidə, nöqtə-verqül işarəsi ilə bitməlidir","cssLengthTooltip":"Piksel sayı və ya digər CSS ölçü vahidləri (px, %, in, cm, mm, em, ex, pt, or pc) daxil edin.","unavailable":"%1<span class=\"cke_accessibility\">, mövcud deyil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Boşluq","35":"Son","36":"Evə","46":"Sil","224":"Əmr"},"keyboardShortcut":"Qısayol düymələri"},"about":{"copy":"Copyright &copy; $1. Bütün hüquqlar qorunur.","dlgTitle":"CKEditor haqqında","help":"Kömək üçün  $1 seçin","moreInfo":"Lisenziya informasiyası üçün zəhmət olmasa saytımızı ziyarət edin:","title":"CKEditor haqqında","userGuide":"CKEditor İstifadəçilər üçün kitabça"},"clipboard":{"copy":"Köçür","copyError":"Avtomatik köçürülməsi mümkün deyil. Ctrl+C basın.","cut":"Kəs","cutError":"Avtomatik kəsmə mümkün deyil. Ctrl+X basın.","paste":"Əlavə et","pasteArea":"Əlavəetmə sahəsi","pasteMsg":"Bu sahəyə əlavə edin (<strong>Ctrl+V</strong>)","securityMsg":"Mübadilə buferi açmaq mümkün deyil. Bu pəncərədə yenidən əlavə edin.","title":"Əlavə et"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Qalın","italic":"Kursiv","strike":"Üstüxətli","subscript":"Aşağı indeks","superscript":"Yuxarı indeks","underline":"Altdan xətt"},"bidi":{"ltr":"Mətnin istiqaməti - soldan sağa","rtl":"Mətnin istiqaməti - sağdan sola"},"blockquote":{"toolbar":"Sitat bloku"},"button":{"selectedLabel":"%1 (seçilib)"},"colorbutton":{"auto":"Avtomatik","bgColorTitle":"Doldurma rəngi","colors":{"000":"Qara","800000":"Şabalıdı","8B4513":"Açıq şabalı","2F4F4F":"Açıq boz","008080":"Firuzəyi göy","000080":"Tünd göy","4B0082":"İndigo","696969":"Tünd boz","B22222":"Kərpiç","A52A2A":"Şabalıdı","DAA520":"Qızıl ağcaqayın","006400":"Tünd yaşıl","40E0D0":"Firuzəyi","0000CD":"Göy","800080":"Bənövşəyi","808080":"Boz","F00":"Qırmızı","FF8C00":"Tünd narıncı","FFD700":"Qızıl","008000":"Yaşıl","0FF":"Mavi","00F":"Göy","EE82EE":"Açıq bənövşəyi","A9A9A9":"Asfalt rəngi","FFA07A":"Qızılbalıq","FFA500":"Narıncı","FFFF00":"Sarı","00FF00":"Laym","AFEEEE":"Acıq firuzəyi","ADD8E6":"Acıq göy","DDA0DD":"Gavalı","D3D3D3":"Acıq boz","FFF0F5":"Yasəmən","FAEBD7":"Kağız","FFFFE0":"Acıq sarı","F0FFF0":"Bal","F0FFFF":"Gömgöy","F0F8FF":"Solğun göy","E6E6FA":"Lavanda","FFF":"Ağ","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Digər rənglər...","panelTitle":"Rənglər","textColorTitle":"Mətnin rəngi"},"font":{"fontSize":{"label":"Şrift ölçüsü","voiceLabel":"Şrift ölçüsü","panelTitle":"Şrift ölçüsü"},"label":"Şrift","panelTitle":"Şrift","voiceLabel":"Şrift"},"image":{"alt":"Alternativ mətn","border":"Sərhəd","btnUpload":"Serverə yüklə","button2Img":"Şəkil tipli düyməni şəklə çevirmək istədiyinizə əminsinizmi?","hSpace":"Üfüqi boşluq","img2Button":"Şəkli şəkil tipli düyməyə çevirmək istədiyinizə əminsinizmi?","infoTab":"Şəkil haqqında məlumat","linkTab":"Link","lockRatio":"Ölçülərin uyğunluğu saxla","menu":"Şəklin seçimləri","resetSize":"Ölçüləri qaytar","title":"Şəklin seçimləri","titleButton":"Şəkil tipli düyməsinin seçimləri","upload":"Serverə yüklə","urlMissing":"Şəklin ünvanı yanlışdır.","vSpace":"Şaquli boşluq","validateBorder":"Sərhədin eni rəqəm olmalıdır.","validateHSpace":"Üfüqi boşluq rəqəm olmalıdır.","validateVSpace":"Şaquli boşluq rəqəm olmalıdır."},"widget":{"move":"Tıklayın və aparın","label":"%1 vidjet"},"image2":{"alt":"Alternativ mətn","btnUpload":"Serverə göndər","captioned":"Altyazı olan şəkil","captionPlaceholder":"Altyazı","infoTab":"Şəkil haqqında məlumat","lockRatio":"Ölçülərin nisbəti saxla","menu":"Şəklin seçimləri","pathName":"Şəkil","pathNameCaption":"Altyazı","resetSize":"Ölçüləri qaytar","resizer":"Ölçülər dəyişmək üçün tıklayın və aparın","title":"Şəklin seçimləri","uploadTab":"Serverə yüklə","urlMissing":"Şəklin ünvanı yanlışdır.","altMissing":"Alternativ mətn tapılmayıb"},"indent":{"indent":"Sol boşluqu artır","outdent":"Sol boşluqu azalt"},"fakeobjects":{"anchor":"Lövbər","flash":"Flash animasiya","hiddenfield":"Gizli xana","iframe":"IFrame","unknown":"Tanımamış obyekt"},"link":{"acccessKey":"Qısayol düyməsi","advanced":"Geniş seçimləri","advisoryContentType":"Məsləhətli məzmunun növü","advisoryTitle":"Məsləhətli başlıq","anchor":{"toolbar":"Xeş","menu":"Xeşi redaktə et","title":"Xeşin seçimləri","name":"Xeşin adı","errorName":"Xeşin adı yanlışdır","remove":"Xeşin adı sil"},"anchorId":"ID görə","anchorName":"Xeşin adına görə","charset":"Hədəfin kodlaşdırması","cssClasses":"Üslub klası","download":"Məcburi yükləmə","displayText":"Göstərilən mətn","emailAddress":"E-poçt ünvanı","emailBody":"Mesajın məzmunu","emailSubject":"Mesajın başlığı","id":"ID","info":"Linkin xüsusiyyətləri","langCode":"Dilin kodu","langDir":"Yaziların istiqaməti","langDirLTR":"Soldan sağa (LTR)","langDirRTL":"Sağdan sola (RTL)","menu":"Linki redaktə et","name":"Ad","noAnchors":"(heç bir xeş tapılmayıb)","noEmail":"E-poçt ünvanı daxil edin","noUrl":"Linkin URL-ı daxil edin","other":"<digər>","popupDependent":"Asılı (Netscape)","popupFeatures":"Pəncərənin xüsusiyyətləri","popupFullScreen":"Tam ekran rejimi (IE)","popupLeft":"Solda","popupLocationBar":"Ünvan paneli","popupMenuBar":"Menyu paneli","popupResizable":"Olçülər dəyişilir","popupScrollBars":"Sürüşdürmələr göstər","popupStatusBar":"Bildirişlərin paneli","popupToolbar":"Alətlərin paneli","popupTop":"Yuxarıda","rel":"Münasibət","selectAnchor":"Xeşi seçin","styles":"Üslub","tabIndex":"Tabın nömrəsi","target":"Hədəf çərçivə","targetFrame":"<freym>","targetFrameName":"Freymin adı","targetPopup":"<yeni pəncərə>","targetPopupName":"Pəncərənin adı","title":"Link","toAnchor":"Xeş","toEmail":"E-poçt","toUrl":"URL","toolbar":"Link","type":"Linkin növü","unlink":"Linki sil","upload":"Serverə yüklə"},"list":{"bulletedlist":"Markerlənmiş siyahını başlat/sil","numberedlist":"Nömrələnmiş siyahını başlat/sil"},"maximize":{"maximize":"Aşkarla","minimize":"Gizlət"},"table":{"border":"Sərhədlərin eni","caption":"Cədvəlin başlığı","cell":{"menu":"Xana","insertBefore":"Burdan əvvələ xanası çək","insertAfter":"Burdan sonra xanası çək","deleteCell":"Xanaları sil","merge":"Xanaları birləşdir","mergeRight":"Sağdan birləşdir","mergeDown":"Soldan birləşdir","splitHorizontal":"Üfüqi böl","splitVertical":"Şaquli böl","title":"Xanaların seçimləri","cellType":"Xana növü","rowSpan":"Sətirləri birləşdir","colSpan":"Sütunları birləşdir","wordWrap":"Sətirlərin sınması","hAlign":"Üfüqi düzləndirmə","vAlign":"Şaquli düzləndirmə","alignBaseline":"Mətn xətti","bgColor":"Doldurma rəngi","borderColor":"Sərhədin rəngi","data":"Məlumatlar","header":"Başlıq","yes":"Bəli","no":"Xeyr","invalidWidth":"Xanasın eni rəqəm olmalıdır.","invalidHeight":"Xanasın hündürlüyü rəqəm olmalıdır.","invalidRowSpan":"Birləşdirdiyiniz sütun xanaların sayı tam və müsbət rəqəm olmalıdır.","invalidColSpan":"Birləşdirdiyiniz sətir xanaların sayı tam və müsbət rəqəm olmalıdır.","chooseColor":"Seç"},"cellPad":"Xanalardakı kənar boşluqlar","cellSpace":"Xanalararası interval","column":{"menu":"Sütun","insertBefore":"Sola sütun əlavə et","insertAfter":"Sağa sütun əlavə et","deleteColumn":"Sütunları sil"},"columns":"Sütunlar","deleteTable":"Cədvəli sil","headers":"Başlıqlar","headersBoth":"Hər ikisi","headersColumn":"Birinci sütun","headersNone":"yox","headersRow":"Birinci sətir","invalidBorder":"Sərhədlərin eni müsbət rəqəm olmalıdır.","invalidCellPadding":"Xanalardakı kənar boşluqlar müsbət rəqəm olmalıdır.","invalidCellSpacing":"Xanalararası interval müsbət rəqəm olmalıdır.","invalidCols":"Sütunlarin sayı tam və müsbət olmalıdır.","invalidHeight":"Cədvəlin hündürlüyü rəqəm olmalıdır.","invalidRows":"Sətirlətin sayı tam və müsbət olmalıdır.","invalidWidth":"Cədvəlin eni rəqəm olmalıdır.","menu":"Cədvəl alətləri","row":{"menu":"Sətir","insertBefore":"Yuxarıya sətir əlavə et","insertAfter":"Aşağıya sətir əlavə et","deleteRow":"Sətirləri sil"},"rows":"Sətirlər","summary":"Xülasə","title":"Cədvəl alətləri","toolbar":"Cədvəl","widthPc":"faiz","widthPx":"piksel","widthUnit":"en vahidi"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Formatı sil"},"sourcearea":{"toolbar":"HTML mənbəyini göstər"},"toolbar":{"toolbarCollapse":"Paneli gizlət","toolbarExpand":"Paneli göstər","toolbarGroups":{"document":"Mətn","clipboard":"Mübadilə buferi/İmtina et","editing":"Redaktə edilməsi","forms":"Formalar","basicstyles":"Əsas üslublar","paragraph":"Abzas","links":"Link","insert":"Əlavə et","styles":"Üslublar","colors":"Rənqlər","tools":"Alətləri"},"toolbars":"Redaktorun panelləri"},"undo":{"redo":"Təkrar et","undo":"İmtina et"},"colordialog":{"clear":"Təmizlə","highlight":"Ayırmaq","options":"Rəng seçimləri","selected":"Seçilmiş rəng","title":"Rəngi seç"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/bg.js b/plugins/ckeditor/src/lang/bg.js
deleted file mode 100644
index 6bbc6f1b5..000000000
--- a/plugins/ckeditor/src/lang/bg.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['bg']={"editor":"Текстов редактор за форматиран текст","editorPanel":"Панел на текстовия редактор","common":{"editorHelp":"натиснете ALT 0 за помощ","browseServer":"Избор от сървъра","url":"URL","protocol":"Протокол","upload":"Качване","uploadSubmit":"Изпращане към сървъра","image":"Снимка","flash":"Флаш","form":"Форма","checkbox":"Поле за избор","radio":"Радио бутон","textField":"Текстово поле","textarea":"Текстова зона","hiddenField":"Скрито поле","button":"Бутон","select":"Поле за избор","imageButton":"Бутон за снимка","notSet":"<не е избрано>","id":"ID","name":"Име","langDir":"Посока на езика","langDirLtr":"Ляво на дясно (ЛнД)","langDirRtl":"Дясно на ляво (ДнЛ)","langCode":"Код на езика","longDescr":"Уеб адрес за дълго описание","cssClass":"Класове за CSS","advisoryTitle":"Препоръчително заглавие","cssStyle":"Стил","ok":"ОК","cancel":"Отказ","close":"Затвори","preview":"Преглед","resize":"Влачете за да оразмерите","generalTab":"Общи","advancedTab":"Разширено","validateNumberFailed":"Тази стойност не е число","confirmNewPage":"Всички незапазени промени ще бъдат изгубени. Сигурни ли сте, че желаете да заредите нова страница?","confirmCancel":"Някои от опциите са променени. Сигурни ли сте, че желаете да затворите прозореца?","options":"Опции","target":"Цел","targetNew":"Нов прозорец (_blank)","targetTop":"Горна позиция (_top)","targetSelf":"Текущия прозорец (_self)","targetParent":"Основен прозорец (_parent)","langDirLTR":"Ляво на дясно (ЛнД)","langDirRTL":"Дясно на ляво (ДнЛ)","styles":"Стил","cssClasses":"Класове за CSS","width":"Ширина","height":"Височина","align":"Подравняване","alignLeft":"Ляво","alignRight":"Дясно","alignCenter":"Център","alignJustify":"Двустранно подравняване","alignTop":"Горе","alignMiddle":"По средата","alignBottom":"Долу","alignNone":"Без подравняване","invalidValue":"Невалидна стойност.","invalidHeight":"Височината трябва да е число.","invalidWidth":"Ширина требе да е число.","invalidCssLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна CSS измервателна единица (px, %, in, cm, mm, em, ex, pt, или pc).","invalidHtmlLength":"Стойността на полето \"%1\" трябва да бъде положително число с или без валидна HTML измервателна единица (px или %).","invalidInlineStyle":"Стойността на стилa трябва да съдържат една или повече двойки във формат \"name : value\", разделени с двоеточие.","cssLengthTooltip":"Въведете числена стойност в пиксели или друга валидна CSS единица (px, %, in, cm, mm, em, ex, pt, или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недостъпно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Относно CKEditor","help":"Проверете $1 за помощ.","moreInfo":"За лицензионна информация моля посетете сайта ни:","title":"Относно CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Копирай","copyError":"Настройките за сигурност на вашия бразуър не разрешават на редактора да изпълни запаметяването. За целта използвайте клавиатурата (Ctrl/Cmd+C).","cut":"Отрежи","cutError":"Настройките за сигурност на Вашия браузър не позволяват на редактора автоматично да изъплни действията за отрязване. Моля ползвайте клавиатурните команди за целта (ctrl+x).","paste":"Вмъкни","pasteArea":"Зона за вмъкване","pasteMsg":"Вмъкнете тук съдъжанието с клавиатуарата (<STRONG>Ctrl/Cmd+V</STRONG>) и натиснете <STRONG>OK</STRONG>.","securityMsg":"Заради настройките за сигурност на Вашия браузър, редакторът не може да прочете данните от клипборда коректно.","title":"Вмъкни"},"base64image":{"alt":"Алтернативен текст","lockRatio":"Заключване на съотношението","vSpace":"Вертикален отстъп","hSpace":"Хоризонтален отстъп","border":"Рамка"},"basicstyles":{"bold":"Удебелен","italic":"Наклонен","strike":"Зачертан текст","subscript":"Индексиран текст","superscript":"Суперскрипт","underline":"Подчертан"},"bidi":{"ltr":"Посока на текста от ляво на дясно","rtl":"Посока на текста от дясно на ляво"},"blockquote":{"toolbar":"Блок за цитат"},"button":{"selectedLabel":"%1 (Избрано)"},"colorbutton":{"auto":"Автоматично","bgColorTitle":"Фонов цвят","colors":{"000":"Черно","800000":"Кестеняво","8B4513":"Светлокафяво","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Индиго","696969":"Тъмно сиво","B22222":"Огнено червено","A52A2A":"Кафяво","DAA520":"Златисто","006400":"Тъмно зелено","40E0D0":"Тюркуазено","0000CD":"Средно синьо","800080":"Пурпурно","808080":"Сиво","F00":"Червено","FF8C00":"Тъмно оранжево","FFD700":"Златно","008000":"Зелено","0FF":"Светло синьо","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Още цветове","panelTitle":"Цветове","textColorTitle":"Цвят на шрифт"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер на шрифт","panelTitle":"Размер на шрифт"},"label":"Шрифт","panelTitle":"Име на шрифт","voiceLabel":"Шрифт"},"image":{"alt":"Алтернативен текст","border":"Рамка","btnUpload":"Изпрати я на сървъра","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хоризонтален отстъп","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Инфо за снимка","linkTab":"Връзка","lockRatio":"Заключване на съотношението","menu":"Настройки за снимка","resetSize":"Нулиране на размер","title":"Настройки за снимка","titleButton":"Настойки за бутон за снимка","upload":"Качване","urlMissing":"Image source URL is missing.","vSpace":"Вертикален отстъп","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Кликни и влачи, за да преместиш","label":"%1 widget"},"image2":{"alt":"Алтернативен текст","btnUpload":"Изпрати я на сървъра","captioned":"Надписано изображение","captionPlaceholder":"Надпис","infoTab":"Детайли за изображението","lockRatio":"Заключване на съотношението","menu":"Настройки на изображението","pathName":"изображение","pathNameCaption":"надпис","resetSize":"Нулиране на размер","resizer":"Кликни и влачи, за да преоразмериш","title":"Настройки на изображението","uploadTab":"Качване","urlMissing":"URL адреса на изображението липсва.","altMissing":"Alternative text is missing."},"indent":{"indent":"Увеличаване на отстъпа","outdent":"Намаляване на отстъпа"},"fakeobjects":{"anchor":"Кука","flash":"Флаш анимация","hiddenfield":"Скрито поле","iframe":"IFrame","unknown":"Неизвестен обект"},"link":{"acccessKey":"Ключ за достъп","advanced":"Разширено","advisoryContentType":"Препоръчителен тип на съдържанието","advisoryTitle":"Препоръчително заглавие","anchor":{"toolbar":"Котва","menu":"Промяна на котва","title":"Настройки на котва","name":"Име на котва","errorName":"Моля въведете име на котвата","remove":"Према�
-ване на котва"},"anchorId":"По ID на елемент","anchorName":"По име на котва","charset":"Тип на свързания ресурс","cssClasses":"Класове за CSS","download":"Force Download","displayText":"Display Text","emailAddress":"E-mail aдрес","emailBody":"Съдържание","emailSubject":"Тема","id":"ID","info":"Инфо за връзката","langCode":"Код за езика","langDir":"Посока на езика","langDirLTR":"Ляво на Дясно (ЛнД)","langDirRTL":"Дясно на Ляво (ДнЛ)","menu":"Промяна на връзка","name":"Име","noAnchors":"(Няма котви в текущия документ)","noEmail":"Моля въведете e-mail aдрес","noUrl":"Моля въведете URL адреса","other":"<друго>","popupDependent":"Зависимост (Netscape)","popupFeatures":"Функции на изкачащ прозорец","popupFullScreen":"Цял екран (IE)","popupLeft":"Лява позиция","popupLocationBar":"Лента с локацията","popupMenuBar":"Лента за меню","popupResizable":"Оразмеряем","popupScrollBars":"Скролери","popupStatusBar":"Статусна лента","popupToolbar":"Лента с инструменти","popupTop":"Горна позиция","rel":"Връзка","selectAnchor":"Изберете котва","styles":"Стил","tabIndex":"Ред на достъп","target":"Цел","targetFrame":"<frame>","targetFrameName":"Име на целевият прозорец","targetPopup":"<изкачащ прозорец>","targetPopupName":"Име на изкачащ прозорец","title":"Връзка","toAnchor":"Връзка към котва в текста","toEmail":"E-mail","toUrl":"Уеб адрес","toolbar":"Връзка","type":"Тип на връзката","unlink":"Према�
-ни връзката","upload":"Качване"},"list":{"bulletedlist":"Вмъкване/Према�
-ване на точков списък","numberedlist":"Вмъкване/Према�
-ване на номериран списък"},"maximize":{"maximize":"Максимизиране","minimize":"Минимизиране"},"table":{"border":"Размер на рамката","caption":"Заглавие","cell":{"menu":"Клетка","insertBefore":"Вмъкване на клетка преди","insertAfter":"Вмъкване на клетка след","deleteCell":"Изтриване на клетки","merge":"Сливане на клетки","mergeRight":"Сливане в дясно","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Настройки на клетката","cellType":"Тип на клетката","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Авто. пренос","hAlign":"Хоризонтално подравняване","vAlign":"Вертикално подравняване","alignBaseline":"Базова линия","bgColor":"Фон","borderColor":"Цвят на рамката","data":"Данни","header":"Хедър","yes":"Да","no":"Не","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Изберете"},"cellPad":"Отделяне на клетките","cellSpace":"Разтояние между клетките","column":{"menu":"Колона","insertBefore":"Вмъкване на колона преди","insertAfter":"Вмъкване на колона след","deleteColumn":"Изтриване на колони"},"columns":"Колони","deleteTable":"Изтриване на таблица","headers":"Хедъри","headersBoth":"Заедно","headersColumn":"Първа колона","headersNone":"Няма","headersRow":"Първи ред","invalidBorder":"Размерът на рамката трябва да е число.","invalidCellPadding":"Отстоянието на клетките трябва да е позитивно число.","invalidCellSpacing":"Интервала в клетките трябва да е позитивно число.","invalidCols":"Броят колони трябва да е по-голям от 0.","invalidHeight":"Височината на таблицата трябва да е число.","invalidRows":"Броят редове трябва да е по-голям от 0.","invalidWidth":"Ширината на таблицата трябва да е число.","menu":"Настройки на таблицата","row":{"menu":"Ред","insertBefore":"Вмъкване на ред преди","insertAfter":"Вмъкване на ред след","deleteRow":"Изтриване на редове"},"rows":"Редове","summary":"Обща информация","title":"Настройки на таблицата","toolbar":"Таблица","widthPc":"процент","widthPx":"пиксела","widthUnit":"единица за ширина"},"quicktable":{"more":"Още..."},"removeformat":{"toolbar":"Према�
-ване на форматирането"},"sourcearea":{"toolbar":"Из�
-оден код"},"toolbar":{"toolbarCollapse":"Свиване на лентата с инструменти","toolbarExpand":"Разширяване на лентата с инструменти","toolbarGroups":{"document":"Документ","clipboard":"Клипборд/Отмяна","editing":"Промяна","forms":"Форми","basicstyles":"Базови стилове","paragraph":"Параграф","links":"Връзки","insert":"Вмъкване","styles":"Стилове","colors":"Цветове","tools":"Инструменти"},"toolbars":"Ленти с инструменти"},"undo":{"redo":"Връщане на предишен статус","undo":"Възтанови"},"colordialog":{"clear":"Изчистване","highlight":"Осветяване","options":"Цветови опции","selected":"Изберете цвят","title":"Изберете цвят"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/bn.js b/plugins/ckeditor/src/lang/bn.js
deleted file mode 100644
index a1997d73e..000000000
--- a/plugins/ckeditor/src/lang/bn.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['bn']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"ব্রাউজ সার্ভার","url":"URL","protocol":"প্রোটোকল","upload":"আপলোড","uploadSubmit":"ইহাকে সার্ভারে প্রেরন কর","image":"ছবির লেবেল যুক্ত কর","flash":"ফ্লাশ লেবেল যুক্ত কর","form":"ফর্ম","checkbox":"চেক বাক্স","radio":"রেডিও বাটন","textField":"টেক্সট ফীল্ড","textarea":"টেক্সট এরিয়া","hiddenField":"গুপ্ত ফীল্ড","button":"বাটন","select":"বাছাই ফীল্ড","imageButton":"ছবির বাটন","notSet":"<সেট নেই>","id":"আইডি","name":"নাম","langDir":"ভাষা লেখার দিক","langDirLtr":"বাম থেকে ডান (LTR)","langDirRtl":"ডান থেকে বাম (RTL)","langCode":"ভাষা কোড","longDescr":"URL এর লম্বা বর্ণনা","cssClass":"স্টাইল-শীট ক্লাস","advisoryTitle":"পরামর্শ শীর্ষক","cssStyle":"স্টাইল","ok":"ওকে","cancel":"বাতিল","close":"Close","preview":"প্রিভিউ","resize":"Resize","generalTab":"General","advancedTab":"এডভান্সড","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"টার্গেট","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","styles":"স্টাইল","cssClasses":"স্টাইল-শীট ক্লাস","width":"প্রস্থ","height":"দৈর্ঘ্য","align":"এলাইন","alignLeft":"বামে","alignRight":"ডানে","alignCenter":"মাঝখানে","alignJustify":"ব্লক জাস্টিফাই","alignTop":"উপর","alignMiddle":"মধ্য","alignBottom":"নীচে","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"কপি","copyError":"আপনার ব্রাউজারের নিরাপত্তা সেটিংসমূহ এডিটরকে স্বয়ংক্রিয়ভাবে কপি করার প্রক্রিয়া চালনা করার �
-নুমতি দেয় না। �
-নুগ্রহপূর্বক এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+C)।","cut":"কাট","cutError":"আপনার ব্রাউজারের সুরক্ষা সেটিংস এডিটরকে �
-টোমেটিক কাট করার �
-নুমতি দেয়নি। দয়া করে এই কাজের জন্য কিবোর্ড ব্যবহার করুন (Ctrl/Cmd+X)।","paste":"পেস্ট","pasteArea":"Paste Area","pasteMsg":"�
-নুগ্রহ করে নীচের বাক্সে কিবোর্ড ব্যবহার করে (<STRONG>Ctrl/Cmd+V</STRONG>) পেস্ট করুন এবং <STRONG>OK</STRONG> চাপ দিন","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"পেস্ট"},"base64image":{"alt":"বিকল্প টেক্সট","lockRatio":"�
-নুপাত লক কর","vSpace":"ভার্টিকেল স্পেস","hSpace":"হরাইজন্টাল স্পেস","border":"বর্ডার"},"basicstyles":{"bold":"বোল্ড","italic":"বাঁকা","strike":"স্ট্রাইক থ্রু","subscript":"�
-ধোলেখ","superscript":"�
-ভিলেখ","underline":"আন্ডারলাইন"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"স্বয়ংক্রিয়ভাবে","bgColorTitle":"পৃষ্ঠতলের রং","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"আরও রং...","panelTitle":"Colors","textColorTitle":"টেক্স্ট রং"},"font":{"fontSize":{"label":"সাইজ","voiceLabel":"Font Size","panelTitle":"সাইজ"},"label":"ফন্ট","panelTitle":"ফন্ট","voiceLabel":"ফন্ট"},"image":{"alt":"বিকল্প টেক্সট","border":"বর্ডার","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"হরাইজন্টাল স্পেস","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ছবির তথ্য","linkTab":"লিংক","lockRatio":"�
-নুপাত লক কর","menu":"ছবির প্রোপার্টি","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","title":"ছবির প্রোপার্টি","titleButton":"ছবির বাটন সম্বন্ধীয়","upload":"আপলোড","urlMissing":"Image source URL is missing.","vSpace":"ভার্টিকেল স্পেস","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"বিকল্প টেক্সট","btnUpload":"ইহাকে সার্ভারে প্রেরন কর","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ছবির তথ্য","lockRatio":"�
-নুপাত লক কর","menu":"ছবির প্রোপার্টি","pathName":"image","pathNameCaption":"caption","resetSize":"সাইজ পূর্বাবস্থায় ফিরিয়ে দাও","resizer":"Click and drag to resize","title":"ছবির প্রোপার্টি","uploadTab":"আপলোড","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"ইনডেন্ট বাড়াই","outdent":"ইনডেন্ট কমাও"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"প্রবেশ কী","advanced":"এডভান্সড","advisoryContentType":"পরামর্শ কন্টেন্টের প্রকার","advisoryTitle":"পরামর্শ শীর্ষক","anchor":{"toolbar":"নোঙ্গর","menu":"নোঙর প্রোপার্টি","title":"নোঙর প্রোপার্টি","name":"নোঙরের নাম","errorName":"নোঙরের নাম টাইপ করুন","remove":"Remove Anchor"},"anchorId":"নোঙরের আইডি দিয়ে","anchorName":"নোঙরের নাম দিয়ে","charset":"লিংক রিসোর্স ক্যারেক্টর সেট","cssClasses":"স্টাইল-শীট ক্লাস","download":"Force Download","displayText":"Display Text","emailAddress":"ইমেইল ঠিকানা","emailBody":"মেসেজের দেহ","emailSubject":"মেসেজের বিষয়","id":"আইডি","info":"লিংক তথ্য","langCode":"ভাষা লেখার দিক","langDir":"ভাষা লেখার দিক","langDirLTR":"বাম থেকে ডান (LTR)","langDirRTL":"ডান থেকে বাম (RTL)","menu":"লিংক সম্পাদন","name":"নাম","noAnchors":"(No anchors available in the document)","noEmail":"�
-নুগ্রহ করে ইমেইল এড্রেস টাইপ করুন","noUrl":"�
-নুগ্রহ করে URL লিংক টাইপ করুন","other":"<other>","popupDependent":"ডিপেন্ডেন্ট (Netscape)","popupFeatures":"পপআপ উইন্ডো ফীচার সমূহ","popupFullScreen":"পূর্ণ পর্দা জুড়ে (IE)","popupLeft":"বামের পজিশন","popupLocationBar":"লোকেশন বার","popupMenuBar":"মেন্যু বার","popupResizable":"Resizable","popupScrollBars":"স্ক্রল বার","popupStatusBar":"স্ট্যাটাস বার","popupToolbar":"টুল বার","popupTop":"ডানের পজিশন","rel":"Relationship","selectAnchor":"নোঙর বাছাই","styles":"স্টাইল","tabIndex":"ট্যাব ইন্ডেক্স","target":"টার্গেট","targetFrame":"<ফ্রেম>","targetFrameName":"টার্গেট ফ্রেমের নাম","targetPopup":"<পপআপ উইন্ডো>","targetPopupName":"পপআপ উইন্ডোর নাম","title":"লিংক","toAnchor":"এই পেজে নোঙর কর","toEmail":"ইমেইল","toUrl":"URL","toolbar":"লিংক যুক্ত কর","type":"লিংক প্রকার","unlink":"লিংক সরাও","upload":"আপলোড"},"list":{"bulletedlist":"বুলেটেড তালিকা প্রবেশ/�
-পসারন করি","numberedlist":"সাংখ্যিক লিস্টের লেবেল"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"বর্ডারের সাইজ","caption":"শীর্ষক","cell":{"menu":"সেল","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"সেল মুছে দাও","merge":"সেল জোড়া দাও","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"পৃষ্ঠতলের রং","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"সেল প্যাডিং","cellSpace":"সেল স্পেস","column":{"menu":"কলাম","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"কলাম মুছে দাও"},"columns":"কলাম","deleteTable":"টেবিল ডিলীট কর","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"টেবিল প্রোপার্টি","row":{"menu":"রো","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"রো মুছে দাও"},"rows":"রো","summary":"সারাংশ","title":"টেবিল প্রোপার্টি","toolbar":"টেবিলের লেবেল যুক্ত কর","widthPc":"শতকরা","widthPx":"পিক্সেল","widthUnit":"width unit"},"quicktable":{"more":"আরও..."},"removeformat":{"toolbar":"ধরন-প্রকৃতি �
-পসারণ করি"},"sourcearea":{"toolbar":"উৎস"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"পুনরায়  করি","undo":"আনডু"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/bs.js b/plugins/ckeditor/src/lang/bs.js
deleted file mode 100644
index 554c51448..000000000
--- a/plugins/ckeditor/src/lang/bs.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['bs']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Šalji","uploadSubmit":"Šalji na server","image":"Slika","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije podešeno>","id":"Id","name":"Naziv","langDir":"Smjer pisanja","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Jezièni kôd","longDescr":"Dugaèki opis URL-a","cssClass":"Klase CSS stilova","advisoryTitle":"Advisory title","cssStyle":"Stil","ok":"OK","cancel":"Odustani","close":"Close","preview":"Prikaži","resize":"Resize","generalTab":"General","advancedTab":"Naprednije","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Prozor","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase CSS stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Centar","alignJustify":"Puno poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dno","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživaèa ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke vašeg pretraživaèa ne dozvoljavaju operacije automatskog rezanja. Molimo koristite kraticu na tastaturi (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Zalijepi"},"base64image":{"alt":"Tekst na slici","lockRatio":"Zakljuèaj odnos","vSpace":"VSpace","hSpace":"HSpace","border":"Okvir"},"basicstyles":{"bold":"Boldiraj","italic":"Ukosi","strike":"Precrtaj","subscript":"Subscript","superscript":"Superscript","underline":"Podvuci"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatska","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"font":{"fontSize":{"label":"Velièina","voiceLabel":"Font Size","panelTitle":"Velièina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"image":{"alt":"Tekst na slici","border":"Okvir","btnUpload":"Šalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","resetSize":"Resetuj dimenzije","title":"Svojstva slike","titleButton":"Image Button Properties","upload":"Šalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Tekst na slici","btnUpload":"Šalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zakljuèaj odnos","menu":"Svojstva slike","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj dimenzije","resizer":"Click and drag to resize","title":"Svojstva slike","uploadTab":"Šalji","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Poveæaj uvod","outdent":"Smanji uvod"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Pristupna tipka","advanced":"Naprednije","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Klase CSS stilova","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Adresa","emailBody":"Poruka","emailSubject":"Subjekt poruke","id":"Id","info":"Link info","langCode":"Smjer pisanja","langDir":"Smjer pisanja","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Izmjeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra na stranici)","noEmail":"Molimo ukucajte e-mail adresu","noUrl":"Molimo ukucajte URL link","other":"<other>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Moguænosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Resizable","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka sa alatima","popupTop":"Gornja pozicija","rel":"Relationship","selectAnchor":"Izaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Prozor","targetFrame":"<frejm>","targetFrameName":"Target Frame Name","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/Izmjeni link","type":"Tip linka","unlink":"Izbriši link","upload":"Šalji"},"list":{"bulletedlist":"Lista","numberedlist":"Numerisana lista"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Okvir","caption":"Naslov","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Briši æelije","merge":"Spoji æelije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Uvod æelija","cellSpace":"Razmak æelija","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Briši kolone"},"columns":"Kolona","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Svojstva tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Briši redove"},"rows":"Redova","summary":"Summary","title":"Svojstva tabele","toolbar":"Tabela","widthPc":"posto","widthPx":"piksela","widthUnit":"width unit"},"quicktable":{"more":"Više..."},"removeformat":{"toolbar":"Poništi format"},"sourcearea":{"toolbar":"HTML kôd"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Ponovi","undo":"Vrati"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ca.js b/plugins/ckeditor/src/lang/ca.js
deleted file mode 100644
index 6317fceba..000000000
--- a/plugins/ckeditor/src/lang/ca.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ca']={"editor":"Editor de text enriquit","editorPanel":"Panell de l'editor de text enriquit","common":{"editorHelp":"Premeu ALT 0 per ajuda","browseServer":"Veure servidor","url":"URL","protocol":"Protocol","upload":"Puja","uploadSubmit":"Envia-la al servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casella de verificació","radio":"Botó d'opció","textField":"Camp de text","textarea":"Àrea de text","hiddenField":"Camp ocult","button":"Botó","select":"Camp de selecció","imageButton":"Botó d'imatge","notSet":"<no definit>","id":"Id","name":"Nom","langDir":"Direcció de l'idioma","langDirLtr":"D'esquerra a dreta (LTR)","langDirRtl":"De dreta a esquerra (RTL)","langCode":"Codi d'idioma","longDescr":"Descripció llarga de la URL","cssClass":"Classes del full d'estil","advisoryTitle":"Títol consultiu","cssStyle":"Estil","ok":"D'acord","cancel":"Cancel·la","close":"Tanca","preview":"Previsualitza","resize":"Arrossegueu per redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquest valor no és un número.","confirmNewPage":"Els canvis en aquest contingut que no es desin es perdran. Esteu segur que voleu carregar una pàgina nova?","confirmCancel":"Algunes opcions s'han canviat. Esteu segur que voleu tancar el quadre de diàleg?","options":"Opcions","target":"Destí","targetNew":"Nova finestra (_blank)","targetTop":"Finestra superior (_top)","targetSelf":"Mateixa finestra (_self)","targetParent":"Finestra pare (_parent)","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","styles":"Estil","cssClasses":"Classes del full d'estil","width":"Amplada","height":"Alçada","align":"Alineació","alignLeft":"Ajusta a l'esquerra","alignRight":"Ajusta a la dreta","alignCenter":"Centre","alignJustify":"Justificat","alignTop":"Superior","alignMiddle":"Centre","alignBottom":"Inferior","alignNone":"Cap","invalidValue":"Valor no vàlid.","invalidHeight":"L'alçada ha de ser un número.","invalidWidth":"L'amplada ha de ser un número.","invalidCssLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","invalidHtmlLength":"El valor especificat per als \"%1\" camps ha de ser un número positiu amb o sense unitat de mesura vàlida d'HTML (px o %).","invalidInlineStyle":"El valor especificat per l'estil en línia ha de constar d'una o més tuples amb el format \"name: value\", separats per punt i coma.","cssLengthTooltip":"Introduïu un número per un valor en píxels o un número amb una unitat vàlida de CSS (px, %, in, cm, mm, em, ex, pt o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retrocés","13":"Intro","16":"Majúscules","17":"Ctrl","18":"Alt","32":"Space","35":"Fi","36":"Inici","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tots els drets reservats.","dlgTitle":"Quant al CKEditor","help":"Premi $1 per obtenir ajuda.","moreInfo":"Per informació sobre llicències visiteu el nostre lloc web:","title":"Quant al CKEditor","userGuide":"Manual d'usuari de CKEditor"},"clipboard":{"copy":"Copiar","copyError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de copiar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+C).","cut":"Retallar","cutError":"La configuració de seguretat del vostre navegador no permet executar automàticament les operacions de retallar. Si us plau, utilitzeu el teclat (Ctrl/Cmd+X).","paste":"Enganxar","pasteArea":"Àrea d'enganxat","pasteMsg":"Si us plau, enganxi dins del següent camp utilitzant el teclat (<strong>Ctrl/Cmd+V</strong>) i premi OK.","securityMsg":"A causa de la configuració de seguretat del vostre navegador, l'editor no pot accedir a les dades del porta-retalls directament. Enganxeu-ho un altre cop en aquesta finestra.","title":"Enganxar"},"base64image":{"alt":"Text alternatiu","lockRatio":"Bloqueja les proporcions","vSpace":"Espaiat vert.","hSpace":"Espaiat horit.","border":"Vora"},"basicstyles":{"bold":"Negreta","italic":"Cursiva","strike":"Ratllat","subscript":"Subíndex","superscript":"Superíndex","underline":"Subratllat"},"bidi":{"ltr":"Direcció del text d'esquerra a dreta","rtl":"Direcció del text de dreta a esquerra"},"blockquote":{"toolbar":"Bloc de cita"},"button":{"selectedLabel":"%1 (Seleccionat)"},"colorbutton":{"auto":"Automàtic","bgColorTitle":"Color de Fons","colors":{"000":"Negre","800000":"Grana","8B4513":"Marró sella","2F4F4F":"Gris pissarra fosca","008080":"Blau xarxet","000080":"Blau marí","4B0082":"Indi","696969":"Gris Fosc","B22222":"Foc Maó","A52A2A":"Marró","DAA520":"Solidago","006400":"Verd Fosc","40E0D0":"Turquesa","0000CD":"Blau 1/2","800080":"Lila","808080":"Gris","F00":"Vermell","FF8C00":"Taronja Fosc","FFD700":"Or","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violat","A9A9A9":"Gris clar","FFA07A":"Salmó clar","FFA500":"Taronja","FFFF00":"Groc","00FF00":"Verd Llima","AFEEEE":"Turquesa Pàl·lid","ADD8E6":"Blau Clar","DDA0DD":"Pruna","D3D3D3":"Gris Clar","FFF0F5":"Lavanda rosat","FAEBD7":"Blanc Antic","FFFFE0":"Groc Clar","F0FFF0":"Verd Pàl·lid","F0FFFF":"Atzur","F0F8FF":"Cian pàlid","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Més Colors...","panelTitle":"Colors","textColorTitle":"Color del Text"},"font":{"fontSize":{"label":"Mida","voiceLabel":"Mida de la lletra","panelTitle":"Mida de la lletra"},"label":"Tipus de lletra","panelTitle":"Tipus de lletra","voiceLabel":"Tipus de lletra"},"image":{"alt":"Text alternatiu","border":"Vora","btnUpload":"Envia-la al servidor","button2Img":"Voleu transformar el botó d'imatge seleccionat en una simple imatge?","hSpace":"Espaiat horit.","img2Button":"Voleu transformar la imatge seleccionada en un botó d'imatge?","infoTab":"Informació de la imatge","linkTab":"Enllaç","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","resetSize":"Restaura la mida","title":"Propietats de la imatge","titleButton":"Propietats del botó d'imatge","upload":"Puja","urlMissing":"Falta la URL de la imatge.","vSpace":"Espaiat vert.","validateBorder":"La vora ha de ser un nombre enter.","validateHSpace":"HSpace ha de ser un nombre enter.","validateVSpace":"VSpace ha de ser un nombre enter."},"widget":{"move":"Clicar i arrossegar per moure","label":"%1 widget"},"image2":{"alt":"Text alternatiu","btnUpload":"Envia-la al servidor","captioned":"Imatge amb subtítol","captionPlaceholder":"Títol","infoTab":"Informació de la imatge","lockRatio":"Bloqueja les proporcions","menu":"Propietats de la imatge","pathName":"imatge","pathNameCaption":"subtítol","resetSize":"Restaura la mida","resizer":"Clicar i arrossegar per redimensionar","title":"Propietats de la imatge","uploadTab":"Puja","urlMissing":"Falta la URL de la imatge.","altMissing":"Alternative text is missing."},"indent":{"indent":"Augmenta el sagnat","outdent":"Redueix el sagnat"},"fakeobjects":{"anchor":"Àncora","flash":"Animació Flash","hiddenfield":"Camp ocult","iframe":"IFrame","unknown":"Objecte desconegut"},"link":{"acccessKey":"Clau d'accés","advanced":"Avançat","advisoryContentType":"Tipus de contingut consultiu","advisoryTitle":"Títol consultiu","anchor":{"toolbar":"Insereix/Edita àncora","menu":"Propietats de l'àncora","title":"Propietats de l'àncora","name":"Nom de l'àncora","errorName":"Si us plau, escriviu el nom de l'ancora","remove":"Remove Anchor"},"anchorId":"Per Id d'element","anchorName":"Per nom d'àncora","charset":"Conjunt de caràcters font enllaçat","cssClasses":"Classes del full d'estil","download":"Force Download","displayText":"Text a mostrar","emailAddress":"Adreça de correu electrònic","emailBody":"Cos del missatge","emailSubject":"Assumpte del missatge","id":"Id","info":"Informació de l'enllaç","langCode":"Direcció de l'idioma","langDir":"Direcció de l'idioma","langDirLTR":"D'esquerra a dreta (LTR)","langDirRTL":"De dreta a esquerra (RTL)","menu":"Edita l'enllaç","name":"Nom","noAnchors":"(No hi ha àncores disponibles en aquest document)","noEmail":"Si us plau, escrigui l'adreça correu electrònic","noUrl":"Si us plau, escrigui l'enllaç URL","other":"<altre>","popupDependent":"Depenent (Netscape)","popupFeatures":"Característiques finestra popup","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posició esquerra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barres d'scroll","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'eines","popupTop":"Posició dalt","rel":"Relació","selectAnchor":"Selecciona una àncora","styles":"Estil","tabIndex":"Index de Tab","target":"Destí","targetFrame":"<marc>","targetFrameName":"Nom del marc de destí","targetPopup":"<finestra emergent>","targetPopupName":"Nom finestra popup","title":"Enllaç","toAnchor":"Àncora en aquesta pàgina","toEmail":"Correu electrònic","toUrl":"URL","toolbar":"Insereix/Edita enllaç","type":"Tipus d'enllaç","unlink":"Elimina l'enllaç","upload":"Puja"},"list":{"bulletedlist":"Llista de pics","numberedlist":"Llista numerada"},"maximize":{"maximize":"Maximitza","minimize":"Minimitza"},"table":{"border":"Mida vora","caption":"Títol","cell":{"menu":"Cel·la","insertBefore":"Insereix abans","insertAfter":"Insereix després","deleteCell":"Suprimeix","merge":"Fusiona","mergeRight":"Fusiona a la dreta","mergeDown":"Fusiona avall","splitHorizontal":"Divideix horitzontalment","splitVertical":"Divideix verticalment","title":"Propietats de la cel·la","cellType":"Tipus de cel·la","rowSpan":"Expansió de files","colSpan":"Expansió de columnes","wordWrap":"Ajustar al contingut","hAlign":"Alineació Horizontal","vAlign":"Alineació Vertical","alignBaseline":"A la línia base","bgColor":"Color de fons","borderColor":"Color de la vora","data":"Dades","header":"Capçalera","yes":"Sí","no":"No","invalidWidth":"L'amplada de cel·la ha de ser un nombre.","invalidHeight":"L'alçada de cel·la ha de ser un nombre.","invalidRowSpan":"L'expansió de files ha de ser un nombre enter.","invalidColSpan":"L'expansió de columnes ha de ser un nombre enter.","chooseColor":"Trieu"},"cellPad":"Encoixinament de cel·les","cellSpace":"Espaiat de cel·les","column":{"menu":"Columna","insertBefore":"Insereix columna abans de","insertAfter":"Insereix columna darrera","deleteColumn":"Suprimeix una columna"},"columns":"Columnes","deleteTable":"Suprimeix la taula","headers":"Capçaleres","headersBoth":"Ambdues","headersColumn":"Primera columna","headersNone":"Cap","headersRow":"Primera fila","invalidBorder":"El gruix de la vora ha de ser un nombre.","invalidCellPadding":"L'encoixinament de cel·la  ha de ser un nombre.","invalidCellSpacing":"L'espaiat de cel·la  ha de ser un nombre.","invalidCols":"El nombre de columnes ha de ser un nombre major que 0.","invalidHeight":"L'alçada de la taula  ha de ser un nombre.","invalidRows":"El nombre de files ha de ser un nombre major que 0.","invalidWidth":"L'amplada de la taula  ha de ser un nombre.","menu":"Propietats de la taula","row":{"menu":"Fila","insertBefore":"Insereix fila abans de","insertAfter":"Insereix fila darrera","deleteRow":"Suprimeix una fila"},"rows":"Files","summary":"Resum","title":"Propietats de la taula","toolbar":"Taula","widthPc":"percentatge","widthPx":"píxels","widthUnit":"unitat d'amplada"},"quicktable":{"more":"Més..."},"removeformat":{"toolbar":"Elimina Format"},"sourcearea":{"toolbar":"Codi font"},"toolbar":{"toolbarCollapse":"Redueix la barra d'eines","toolbarExpand":"Amplia la barra d'eines","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor de barra d'eines"},"undo":{"redo":"Refés","undo":"Desfés"},"colordialog":{"clear":"Neteja","highlight":"Destacat","options":"Opcions del color","selected":"Color Seleccionat","title":"Seleccioni el color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/cs.js b/plugins/ckeditor/src/lang/cs.js
deleted file mode 100644
index 4024d6b9a..000000000
--- a/plugins/ckeditor/src/lang/cs.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['cs']={"editor":"Textový editor","editorPanel":"Panel textového editoru","common":{"editorHelp":"Stiskněte ALT 0 pro nápovědu","browseServer":"Vybrat na serveru","url":"URL","protocol":"Protokol","upload":"Odeslat","uploadSubmit":"Odeslat na server","image":"Obrázek","flash":"Flash","form":"Formulář","checkbox":"Zaškrtávací políčko","radio":"Přepínač","textField":"Textové pole","textarea":"Textová oblast","hiddenField":"Skryté pole","button":"Tlačítko","select":"Seznam","imageButton":"Obrázkové tlačítko","notSet":"<nenastaveno>","id":"Id","name":"Jméno","langDir":"Směr jazyka","langDirLtr":"Zleva doprava (LTR)","langDirRtl":"Zprava doleva (RTL)","langCode":"Kód jazyka","longDescr":"Dlouhý popis URL","cssClass":"Třída stylu","advisoryTitle":"Pomocný titulek","cssStyle":"Styl","ok":"OK","cancel":"Zrušit","close":"Zavřít","preview":"Náhled","resize":"Uchopit pro změnu velikosti","generalTab":"Obecné","advancedTab":"Rozšířené","validateNumberFailed":"Zadaná hodnota není číselná.","confirmNewPage":"Jakékoliv neuložené změny obsahu budou ztraceny. Skutečně chcete otevřít novou stránku?","confirmCancel":"Některá z nastavení byla změněna. Skutečně chcete zavřít dialogové okno?","options":"Nastavení","target":"Cíl","targetNew":"Nové okno (_blank)","targetTop":"Okno nejvyšší úrovně (_top)","targetSelf":"Stejné okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","styles":"Styly","cssClasses":"Třídy stylů","width":"Šířka","height":"Výška","align":"Zarovnání","alignLeft":"Vlevo","alignRight":"Vpravo","alignCenter":"Na střed","alignJustify":"Zarovnat do bloku","alignTop":"Nahoru","alignMiddle":"Na střed","alignBottom":"Dolů","alignNone":"Žádné","invalidValue":"Neplatná hodnota.","invalidHeight":"Zadaná výška musí být číslo.","invalidWidth":"Šířka musí být číslo.","invalidCssLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry CSS (px, %, in, cm, mm, em, ex, pt, nebo pc).","invalidHtmlLength":"Hodnota určená pro pole \"%1\" musí být kladné číslo bez nebo s platnou jednotkou míry HTML (px nebo %).","invalidInlineStyle":"Hodnota určená pro řádkový styl se musí skládat z jedné nebo více n-tic ve formátu \"název : hodnota\", oddělené středníky","cssLengthTooltip":"Zadejte číslo jako hodnotu v pixelech nebo číslo s platnou jednotkou CSS (px, %, v cm, mm, em, ex, pt, nebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupné</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Konec","36":"Domů","46":"Smazat","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O aplikaci CKEditor","help":"Prohlédněte si $1 pro nápovědu.","moreInfo":"Pro informace o lincenci navštivte naši webovou stránku:","title":"O aplikaci CKEditor","userGuide":"Uživatelská příručka CKEditor"},"clipboard":{"copy":"Kopírovat","copyError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro kopírování zvoleného textu do schránky. Prosím zkopírujte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+C).","cut":"Vyjmout","cutError":"Bezpečnostní nastavení vašeho prohlížeče nedovolují editoru spustit funkci pro vyjmutí zvoleného textu do schránky. Prosím vyjměte zvolený text do schránky pomocí klávesnice (Ctrl/Cmd+X).","paste":"Vložit","pasteArea":"Oblast vkládání","pasteMsg":"Do následujícího pole vložte požadovaný obsah pomocí klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) a stiskněte <STRONG>OK</STRONG>.","securityMsg":"Z důvodů nastavení bezpečnosti vašeho prohlížeče nemůže editor přistupovat přímo do schránky. Obsah schránky prosím vložte znovu do tohoto okna.","title":"Vložit"},"base64image":{"alt":"Alternativní text","lockRatio":"Zámek","vSpace":"Vertikální mezera","hSpace":"Horizontální mezera","border":"Okraje"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Přeškrtnuté","subscript":"Dolní index","superscript":"Horní index","underline":"Podtržené"},"bidi":{"ltr":"Směr textu zleva doprava","rtl":"Směr textu zprava doleva"},"blockquote":{"toolbar":"Citace"},"button":{"selectedLabel":"%1 (Vybráno)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Barva pozadí","colors":{"000":"Černá","800000":"Kaštanová","8B4513":"Sedlová hněď","2F4F4F":"Tmavě bledě šedá","008080":"Čírka","000080":"Námořnická modř","4B0082":"Inkoustová","696969":"Tmavě šedá","B22222":"Pálená cihla","A52A2A":"Hnědá","DAA520":"Zlatý prut","006400":"Tmavě zelená","40E0D0":"Tyrkisová","0000CD":"Středně modrá","800080":"Purpurová","808080":"Šedá","F00":"Červená","FF8C00":"Tmavě oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azurová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Kalně šedá","FFA07A":"Světle lososová","FFA500":"Oranžová","FFFF00":"Žlutá","00FF00":"Limetková","AFEEEE":"Bledě tyrkisová","ADD8E6":"Světle modrá","DDA0DD":"Švestková","D3D3D3":"Světle šedá","FFF0F5":"Levandulově ruměnná","FAEBD7":"Antická bílá","FFFFE0":"Světle žlutá","F0FFF0":"Medová rosa","F0FFFF":"Azurová","F0F8FF":"Alenčina modrá","E6E6FA":"Levandulová","FFF":"Bílá","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Více barev...","panelTitle":"Barvy","textColorTitle":"Barva textu"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost písma","panelTitle":"Velikost"},"label":"Písmo","panelTitle":"Písmo","voiceLabel":"Písmo"},"image":{"alt":"Alternativní text","border":"Okraje","btnUpload":"Odeslat na server","button2Img":"Skutečně chcete převést zvolené obrázkové tlačítko na obyčejný obrázek?","hSpace":"Horizontální mezera","img2Button":"Skutečně chcete převést zvolený obrázek na obrázkové tlačítko?","infoTab":"Informace o obrázku","linkTab":"Odkaz","lockRatio":"Zámek","menu":"Vlastnosti obrázku","resetSize":"Původní velikost","title":"Vlastnosti obrázku","titleButton":"Vlastností obrázkového tlačítka","upload":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","vSpace":"Vertikální mezera","validateBorder":"Okraj musí být nastaven v celých číslech.","validateHSpace":"Horizontální mezera musí být nastavena v celých číslech.","validateVSpace":"Vertikální mezera musí být nastavena v celých číslech."},"widget":{"move":"Klepněte a táhněte pro přesunutí","label":"Ovládací prvek %1"},"image2":{"alt":"Alternativní text","btnUpload":"Odeslat na server","captioned":"Obrázek s popisem","captionPlaceholder":"Popis","infoTab":"Informace o obrázku","lockRatio":"Zámek","menu":"Vlastnosti obrázku","pathName":"Obrázek","pathNameCaption":"Popis","resetSize":"Původní velikost","resizer":"Klepněte a táhněte pro změnu velikosti","title":"Vlastnosti obrázku","uploadTab":"Odeslat","urlMissing":"Zadané URL zdroje obrázku nebylo nalezeno.","altMissing":"Alternative text is missing."},"indent":{"indent":"Zvětšit odsazení","outdent":"Zmenšit odsazení"},"fakeobjects":{"anchor":"Záložka","flash":"Flash animace","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámý objekt"},"link":{"acccessKey":"Přístupový klíč","advanced":"Rozšířené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulek","anchor":{"toolbar":"Záložka","menu":"Vlastnosti záložky","title":"Vlastnosti záložky","name":"Název záložky","errorName":"Zadejte prosím název záložky","remove":"Odstranit záložku"},"anchorId":"Podle Id objektu","anchorName":"Podle jména kotvy","charset":"Přiřazená znaková sada","cssClasses":"Třída stylu","download":"Force Download","displayText":"Zobrazit text","emailAddress":"E-mailová adresa","emailBody":"Tělo zprávy","emailSubject":"Předmět zprávy","id":"Id","info":"Informace o odkazu","langCode":"Kód jazyka","langDir":"Směr jazyka","langDirLTR":"Zleva doprava (LTR)","langDirRTL":"Zprava doleva (RTL)","menu":"Změnit odkaz","name":"Jméno","noAnchors":"(Ve stránce není definována žádná kotva!)","noEmail":"Zadejte prosím e-mailovou adresu","noUrl":"Zadejte prosím URL odkazu","other":"<jiný>","popupDependent":"Závislost (Netscape)","popupFeatures":"Vlastnosti vyskakovacího okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Levý okraj","popupLocationBar":"Panel umístění","popupMenuBar":"Panel nabídky","popupResizable":"Umožňující měnit velikost","popupScrollBars":"Posuvníky","popupStatusBar":"Stavový řádek","popupToolbar":"Panel nástrojů","popupTop":"Horní okraj","rel":"Vztah","selectAnchor":"Vybrat kotvu","styles":"Styl","tabIndex":"Pořadí prvku","target":"Cíl","targetFrame":"<rámec>","targetFrameName":"Název cílového rámu","targetPopup":"<vyskakovací okno>","targetPopupName":"Název vyskakovacího okna","title":"Odkaz","toAnchor":"Kotva v této stránce","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstranit odkaz","upload":"Odeslat"},"list":{"bulletedlist":"Odrážky","numberedlist":"Číslování"},"maximize":{"maximize":"Maximalizovat","minimize":"Minimalizovat"},"table":{"border":"Ohraničení","caption":"Popis","cell":{"menu":"Buňka","insertBefore":"Vložit buňku před","insertAfter":"Vložit buňku za","deleteCell":"Smazat buňky","merge":"Sloučit buňky","mergeRight":"Sloučit doprava","mergeDown":"Sloučit dolů","splitHorizontal":"Rozdělit buňky vodorovně","splitVertical":"Rozdělit buňky svisle","title":"Vlastnosti buňky","cellType":"Typ buňky","rowSpan":"Spojit řádky","colSpan":"Spojit sloupce","wordWrap":"Zalamování","hAlign":"Vodorovné zarovnání","vAlign":"Svislé zarovnání","alignBaseline":"Na účaří","bgColor":"Barva pozadí","borderColor":"Barva okraje","data":"Data","header":"Hlavička","yes":"Ano","no":"Ne","invalidWidth":"Šířka buňky musí být číslo.","invalidHeight":"Zadaná výška buňky musí být číslená.","invalidRowSpan":"Zadaný počet sloučených řádků musí být celé číslo.","invalidColSpan":"Zadaný počet sloučených sloupců musí být celé číslo.","chooseColor":"Výběr"},"cellPad":"Odsazení obsahu v buňce","cellSpace":"Vzdálenost buněk","column":{"menu":"Sloupec","insertBefore":"Vložit sloupec před","insertAfter":"Vložit sloupec za","deleteColumn":"Smazat sloupec"},"columns":"Sloupce","deleteTable":"Smazat tabulku","headers":"Záhlaví","headersBoth":"Obojí","headersColumn":"První sloupec","headersNone":"Žádné","headersRow":"První řádek","invalidBorder":"Zdaná velikost okraje musí být číselná.","invalidCellPadding":"Zadané odsazení obsahu v buňce musí být číselné.","invalidCellSpacing":"Zadaná vzdálenost buněk musí být číselná.","invalidCols":"Počet sloupců musí být číslo větší než 0.","invalidHeight":"Zadaná výška tabulky musí být číselná.","invalidRows":"Počet řádků musí být číslo větší než 0.","invalidWidth":"Šířka tabulky musí být číslo.","menu":"Vlastnosti tabulky","row":{"menu":"Řádek","insertBefore":"Vložit řádek před","insertAfter":"Vložit řádek za","deleteRow":"Smazat řádky"},"rows":"Řádky","summary":"Souhrn","title":"Vlastnosti tabulky","toolbar":"Tabulka","widthPc":"procent","widthPx":"bodů","widthUnit":"jednotka šířky"},"quicktable":{"more":"Více..."},"removeformat":{"toolbar":"Odstranit formátování"},"sourcearea":{"toolbar":"Zdroj"},"toolbar":{"toolbarCollapse":"Skrýt panel nástrojů","toolbarExpand":"Zobrazit panel nástrojů","toolbarGroups":{"document":"Dokument","clipboard":"Schránka/Zpět","editing":"Úpravy","forms":"Formuláře","basicstyles":"Základní styly","paragraph":"Odstavec","links":"Odkazy","insert":"Vložit","styles":"Styly","colors":"Barvy","tools":"Nástroje"},"toolbars":"Panely nástrojů editoru"},"undo":{"redo":"Znovu","undo":"Zpět"},"colordialog":{"clear":"Vyčistit","highlight":"Zvýraznit","options":"Nastavení barvy","selected":"Vybráno","title":"Výběr barvy"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/cy.js b/plugins/ckeditor/src/lang/cy.js
deleted file mode 100644
index 912134e2f..000000000
--- a/plugins/ckeditor/src/lang/cy.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['cy']={"editor":"Golygydd Testun Cyfoethog","editorPanel":"Panel Golygydd Testun Cyfoethog","common":{"editorHelp":"Gwasgwch ALT 0 am gymorth","browseServer":"Pori'r Gweinydd","url":"URL","protocol":"Protocol","upload":"Lanlwytho","uploadSubmit":"Anfon i'r Gweinydd","image":"Delwedd","flash":"Flash","form":"Ffurflen","checkbox":"Blwch ticio","radio":"Botwm Radio","textField":"Maes Testun","textarea":"Ardal Testun","hiddenField":"Maes Cudd","button":"Botwm","select":"Maes Dewis","imageButton":"Botwm Delwedd","notSet":"<heb osod>","id":"Id","name":"Name","langDir":"Cyfeiriad Iaith","langDirLtr":"Chwith i'r Dde (LTR)","langDirRtl":"Dde i'r Chwith (RTL)","langCode":"Cod Iaith","longDescr":"URL Disgrifiad Hir","cssClass":"Dosbarthiadau Dalen Arddull","advisoryTitle":"Teitl Cynghorol","cssStyle":"Arddull","ok":"Iawn","cancel":"Diddymu","close":"Cau","preview":"Rhagolwg","resize":"Ailfeintio","generalTab":"Cyffredinol","advancedTab":"Uwch","validateNumberFailed":"'Dyw'r gwerth hwn ddim yn rhif.","confirmNewPage":"Byddwch chi'n colli unrhyw newidiadau i'r cynnwys sydd heb eu cadw. Ydych am barhau i lwytho tudalen newydd?","confirmCancel":"Cafodd rhai o'r opsiynau eu newid. Ydych chi wir am gau'r deialog?","options":"Opsiynau","target":"Targed","targetNew":"Ffenest Newydd (_blank)","targetTop":"Ffenest ar y Brig (_top)","targetSelf":"Yr un Ffenest (_self)","targetParent":"Ffenest y Rhiant (_parent)","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","styles":"Arddull","cssClasses":"Dosbarthiadau Dalen Arddull","width":"Lled","height":"Uchder","align":"Alinio","alignLeft":"Chwith","alignRight":"Dde","alignCenter":"Canol","alignJustify":"Unioni","alignTop":"Brig","alignMiddle":"Canol","alignBottom":"Gwaelod","alignNone":"None","invalidValue":"Gwerth annilys.","invalidHeight":"Mae'n rhaid i'r uchder fod yn rhif.","invalidWidth":"Mae'n rhaid i'r lled fod yn rhif.","invalidCssLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad CSS dilys (px, %, in, cm, mm, em, ex, pt, neu pc).","invalidHtmlLength":"Mae'n rhaid i'r gwerth ar gyfer maes \"%1\" fod yn rhif positif gyda neu heb uned fesuriad HTML dilys (px neu %).","invalidInlineStyle":"Mae'n rhaid i'r gwerth ar gyfer arddull mewn-llinell gynnwys un set neu fwy ar y fformat \"enw : gwerth\", wedi'u gwahanu gyda hanner colon.","cssLengthTooltip":"Rhowch rif am werth mewn picsel neu rhif gydag uned CSS dilys (px, %, in, cm, mm, em, pt neu pc).","unavailable":"%1<span class=\"cke_accessibility\">, ddim ar gael</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Hawlfraint &copy; $1. Cedwir pob hawl.","dlgTitle":"Ynghylch CKEditor","help":"Gwirio $1 am gymorth.","moreInfo":"Am wybodaeth ynghylch trwyddedau, ewch i'n gwefan:","title":"Ynghylch CKEditor","userGuide":"Canllawiau Defnyddiwr CKEditor"},"clipboard":{"copy":"Copïo","copyError":"'Dyw gosodiadau diogelwch eich porwr ddim yn caniatàu'r golygydd i gynnal 'gweithredoedd copïo' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+C).","cut":"Torri","cutError":"Nid yw gosodiadau diogelwch eich porwr yn caniatàu'r golygydd i gynnal 'gweithredoedd torri' yn awtomatig. Defnyddiwch y bysellfwrdd (Ctrl/Cmd+X).","paste":"Gludo","pasteArea":"Ardal Gludo","pasteMsg":"Gludwch i mewn i'r blwch canlynol gan ddefnyddio'r bysellfwrdd (<strong>Ctrl/Cmd+V</strong>) a phwyso <strong>Iawn</strong>.","securityMsg":"Oherwydd gosodiadau diogelwch eich porwr, 'dyw'r porwr ddim yn gallu ennill mynediad i'r data ar y clipfwrdd yn uniongyrchol. Mae angen i chi ei ludo eto i'r ffenestr hon.","title":"Gludo"},"base64image":{"alt":"Testun Amgen","lockRatio":"Cloi Cymhareb","vSpace":"BwlchF","hSpace":"BwlchLl","border":"Ymyl"},"basicstyles":{"bold":"Bras","italic":"Italig","strike":"Llinell Trwyddo","subscript":"Is-sgript","superscript":"Uwchsgript","underline":"Tanlinellu"},"bidi":{"ltr":"Cyfeiriad testun o'r chwith i'r dde","rtl":"Cyfeiriad testun o'r dde i'r chwith"},"blockquote":{"toolbar":"Dyfyniad bloc"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Awtomatig","bgColorTitle":"Lliw Cefndir","colors":{"000":"Du","800000":"Marwn","8B4513":"Brown Cyfrwy","2F4F4F":"Llechen Tywyll","008080":"Corhwyad","000080":"Nefi","4B0082":"Indigo","696969":"Llwyd Tywyll","B22222":"Bric Tân","A52A2A":"Brown","DAA520":"Rhoden Aur","006400":"Gwyrdd Tywyll","40E0D0":"Gwyrddlas","0000CD":"Glas Canolig","800080":"Porffor","808080":"Llwyd","F00":"Coch","FF8C00":"Oren Tywyll","FFD700":"Aur","008000":"Gwyrdd","0FF":"Cyan","00F":"Glas","EE82EE":"Fioled","A9A9A9":"Llwyd Pwl","FFA07A":"Samwn Golau","FFA500":"Oren","FFFF00":"Melyn","00FF00":"Leim","AFEEEE":"Gwyrddlas Golau","ADD8E6":"Glas Golau","DDA0DD":"Eirinen","D3D3D3":"Llwyd Golau","FFF0F5":"Gwrid Lafant","FAEBD7":"Gwyn Hynafol","FFFFE0":"Melyn Golau","F0FFF0":"Melwn Gwyrdd Golau","F0FFFF":"Aswr","F0F8FF":"Glas Alys","E6E6FA":"Lafant","FFF":"Gwyn","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mwy o Liwiau...","panelTitle":"Lliwiau","textColorTitle":"Lliw Testun"},"font":{"fontSize":{"label":"Maint","voiceLabel":"Maint y Ffont","panelTitle":"Maint y Ffont"},"label":"Ffont","panelTitle":"Enw'r Ffont","voiceLabel":"Ffont"},"image":{"alt":"Testun Amgen","border":"Ymyl","btnUpload":"Anfon i'r Gweinydd","button2Img":"Ydych am drawsffurfio'r botwm ddelwedd hwn ar ddelwedd syml?","hSpace":"BwlchLl","img2Button":"Ydych am drawsffurfio'r ddelwedd hon ar fotwm delwedd?","infoTab":"Gwyb Delwedd","linkTab":"Dolen","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","resetSize":"Ailosod Maint","title":"Priodweddau Delwedd","titleButton":"Priodweddau Botwm Delwedd","upload":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","vSpace":"BwlchF","validateBorder":"Rhaid i'r ymyl fod yn gyfanrif.","validateHSpace":"Rhaid i'r HSpace fod yn gyfanrif.","validateVSpace":"Rhaid i'r VSpace fod yn gyfanrif."},"widget":{"move":"Clcio a llusgo i symud","label":"%1 widget"},"image2":{"alt":"Testun Amgen","btnUpload":"Anfon i'r Gweinydd","captioned":"Delwedd â phennawd","captionPlaceholder":"Caption","infoTab":"Gwyb Delwedd","lockRatio":"Cloi Cymhareb","menu":"Priodweddau Delwedd","pathName":"delwedd","pathNameCaption":"pennawd","resetSize":"Ailosod Maint","resizer":"Clicio a llusgo i ail-meintio","title":"Priodweddau Delwedd","uploadTab":"Lanlwytho","urlMissing":"URL gwreiddiol y ddelwedd ar goll.","altMissing":"Alternative text is missing."},"indent":{"indent":"Cynyddu'r Mewnoliad","outdent":"Lleihau'r Mewnoliad"},"fakeobjects":{"anchor":"Angor","flash":"Animeiddiant Flash","hiddenfield":"Maes Cudd","iframe":"IFrame","unknown":"Gwrthrych Anhysbys"},"link":{"acccessKey":"Allwedd Mynediad","advanced":"Uwch","advisoryContentType":"Math y Cynnwys Cynghorol","advisoryTitle":"Teitl Cynghorol","anchor":{"toolbar":"Angor","menu":"Golygu'r Angor","title":"Priodweddau'r Angor","name":"Enw'r Angor","errorName":"Teipiwch enw'r angor","remove":"Tynnwch yr Angor"},"anchorId":"Gan Id yr Elfen","anchorName":"Gan Enw'r Angor","charset":"Set Nodau'r Adnodd Cysylltiedig","cssClasses":"Dosbarthiadau Dalen Arddull","download":"Force Download","displayText":"Display Text","emailAddress":"Cyfeiriad E-Bost","emailBody":"Corff y Neges","emailSubject":"Testun y Neges","id":"Id","info":"Gwyb y Ddolen","langCode":"Cod Iaith","langDir":"Cyfeiriad Iaith","langDirLTR":"Chwith i'r Dde (LTR)","langDirRTL":"Dde i'r Chwith (RTL)","menu":"Golygu Dolen","name":"Enw","noAnchors":"(Dim angorau ar gael yn y ddogfen)","noEmail":"Teipiwch gyfeiriad yr e-bost","noUrl":"Teipiwch URL y ddolen","other":"<eraill>","popupDependent":"Dibynnol (Netscape)","popupFeatures":"Nodweddion Ffenestr Bop","popupFullScreen":"Sgrin Llawn (IE)","popupLeft":"Safle Chwith","popupLocationBar":"Bar Safle","popupMenuBar":"Dewislen","popupResizable":"Ailfeintiol","popupScrollBars":"Barrau Sgrolio","popupStatusBar":"Bar Statws","popupToolbar":"Bar Offer","popupTop":"Safle Top","rel":"Perthynas","selectAnchor":"Dewiswch Angor","styles":"Arddull","tabIndex":"Indecs Tab","target":"Targed","targetFrame":"<ffrâm>","targetFrameName":"Enw Ffrâm y Targed","targetPopup":"<ffenestr bop>","targetPopupName":"Enw Ffenestr Bop","title":"Dolen","toAnchor":"Dolen at angor yn y testun","toEmail":"E-bost","toUrl":"URL","toolbar":"Dolen","type":"Math y Ddolen","unlink":"Datgysylltu","upload":"Lanlwytho"},"list":{"bulletedlist":"Mewnosod/Tynnu Rhestr Bwled","numberedlist":"Mewnosod/Tynnu Rhestr Rhifol"},"maximize":{"maximize":"Mwyhau","minimize":"Lleihau"},"table":{"border":"Maint yr Ymyl","caption":"Pennawd","cell":{"menu":"Cell","insertBefore":"Mewnosod Cell Cyn","insertAfter":"Mewnosod Cell Ar Ôl","deleteCell":"Dileu Celloedd","merge":"Cyfuno Celloedd","mergeRight":"Cyfuno i'r Dde","mergeDown":"Cyfuno i Lawr","splitHorizontal":"Hollti'r Gell yn Lorweddol","splitVertical":"Hollti'r Gell yn Fertigol","title":"Priodweddau'r Gell","cellType":"Math y Gell","rowSpan":"Rhychwant Rhesi","colSpan":"Rhychwant Colofnau","wordWrap":"Lapio Geiriau","hAlign":"Aliniad Llorweddol","vAlign":"Aliniad Fertigol","alignBaseline":"Baslinell","bgColor":"Lliw Cefndir","borderColor":"Lliw Ymyl","data":"Data","header":"Pennyn","yes":"Ie","no":"Na","invalidWidth":"Mae'n rhaid i led y gell fod yn rhif.","invalidHeight":"Mae'n rhaid i uchder y gell fod yn rhif.","invalidRowSpan":"Mae'n rhaid i rychwant y rhesi fod yn gyfanrif.","invalidColSpan":"Mae'n rhaid i rychwant y colofnau fod yn gyfanrif.","chooseColor":"Dewis"},"cellPad":"Padio'r gell","cellSpace":"Bylchiad y gell","column":{"menu":"Colofn","insertBefore":"Mewnosod Colofn Cyn","insertAfter":"Mewnosod Colofn Ar Ôl","deleteColumn":"Dileu Colofnau"},"columns":"Colofnau","deleteTable":"Dileu Tabl","headers":"Penynnau","headersBoth":"Y Ddau","headersColumn":"Colofn gyntaf","headersNone":"Dim","headersRow":"Rhes gyntaf","invalidBorder":"Mae'n rhaid i faint yr ymyl fod yn rhif.","invalidCellPadding":"Mae'n rhaid i badiad y gell fod yn rhif positif.","invalidCellSpacing":"Mae'n rhaid i fylchiad y gell fod yn rhif positif.","invalidCols":"Mae'n rhaid cael o leiaf un golofn.","invalidHeight":"Mae'n rhaid i uchder y tabl fod yn rhif.","invalidRows":"Mae'n rhaid cael o leiaf un rhes.","invalidWidth":"Mae'n rhaid i led y tabl fod yn rhif.","menu":"Priodweddau'r Tabl","row":{"menu":"Rhes","insertBefore":"Mewnosod Rhes Cyn","insertAfter":"Mewnosod Rhes Ar Ôl","deleteRow":"Dileu Rhesi"},"rows":"Rhesi","summary":"Crynodeb","title":"Priodweddau'r Tabl","toolbar":"Tabl","widthPc":"y cant","widthPx":"picsel","widthUnit":"uned lled"},"quicktable":{"more":"Mwy..."},"removeformat":{"toolbar":"Tynnu Fformat"},"sourcearea":{"toolbar":"HTML"},"toolbar":{"toolbarCollapse":"Cyfangu'r Bar Offer","toolbarExpand":"Ehangu'r Bar Offer","toolbarGroups":{"document":"Dogfen","clipboard":"Clipfwrdd/Dadwneud","editing":"Golygu","forms":"Ffurflenni","basicstyles":"Arddulliau Sylfaenol","paragraph":"Paragraff","links":"Dolenni","insert":"Mewnosod","styles":"Arddulliau","colors":"Lliwiau","tools":"Offer"},"toolbars":"Bariau offer y golygydd"},"undo":{"redo":"Ailwneud","undo":"Dadwneud"},"colordialog":{"clear":"Clirio","highlight":"Uwcholeuo","options":"Opsiynau Lliw","selected":"Lliw a Ddewiswyd","title":"Dewis lliw"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/da.js b/plugins/ckeditor/src/lang/da.js
deleted file mode 100644
index 7d9570224..000000000
--- a/plugins/ckeditor/src/lang/da.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['da']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Tryk ALT 0 for hjælp","browseServer":"Gennemse...","url":"URL","protocol":"Protokol","upload":"Upload","uploadSubmit":"Upload","image":"Indsæt billede","flash":"Indsæt Flash","form":"Indsæt formular","checkbox":"Indsæt afkrydsningsfelt","radio":"Indsæt alternativknap","textField":"Indsæt tekstfelt","textarea":"Indsæt tekstboks","hiddenField":"Indsæt skjult felt","button":"Indsæt knap","select":"Indsæt liste","imageButton":"Indsæt billedknap","notSet":"<intet valgt>","id":"Id","name":"Navn","langDir":"Tekstretning","langDirLtr":"Fra venstre mod højre (LTR)","langDirRtl":"Fra højre mod venstre (RTL)","langCode":"Sprogkode","longDescr":"Udvidet beskrivelse","cssClass":"Typografiark (CSS)","advisoryTitle":"Titel","cssStyle":"Typografi (CSS)","ok":"OK","cancel":"Annullér","close":"Luk","preview":"Forhåndsvisning","resize":"Træk for at skalere","generalTab":"Generelt","advancedTab":"Avanceret","validateNumberFailed":"Værdien er ikke et tal.","confirmNewPage":"Alt indhold, der ikke er blevet gemt, vil gå tabt. Er du sikker på, at du vil indlæse en ny side?","confirmCancel":"Nogle af indstillingerne er blevet ændret. Er du sikker på, at du vil lukke vinduet?","options":"Vis muligheder","target":"Mål","targetNew":"Nyt vindue (_blank)","targetTop":"Øverste vindue (_top)","targetSelf":"Samme vindue (_self)","targetParent":"Samme vindue (_parent)","langDirLTR":"Venstre til højre (LTR)","langDirRTL":"Højre til venstre (RTL)","styles":"Style","cssClasses":"Stylesheetklasser","width":"Bredde","height":"Højde","align":"Justering","alignLeft":"Venstre","alignRight":"Højre","alignCenter":"Centreret","alignJustify":"Lige margener","alignTop":"Øverst","alignMiddle":"Centreret","alignBottom":"Nederst","alignNone":"Ingen","invalidValue":"Ugyldig værdi.","invalidHeight":"Højde skal være et tal.","invalidWidth":"Bredde skal være et tal.","invalidCssLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Værdien specificeret for \"%1\" feltet skal være et positivt nummer med eller uden en CSS måleenhed  (px eller %).","invalidInlineStyle":"Værdien specificeret for inline style skal indeholde en eller flere elementer med et format som \"name:value\", separeret af semikoloner","cssLengthTooltip":"Indsæt en numerisk værdi i pixel eller nummer med en gyldig CSS værdi (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikke tilgængelig</span>","keyboard":{"8":"Backspace","13":"Retur","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellemrum","35":"End","36":"Home","46":"Slet","224":"Command"},"keyboardShortcut":"Tastatur genvej"},"about":{"copy":"Copyright &copy; $1. Alle rettigheder forbeholdes.","dlgTitle":"Om CKEditor","help":"Se $1 for at få hjælp.","moreInfo":"For informationer omkring licens, se venligst vores hjemmeside (på engelsk):","title":"Om CKEditor","userGuide":"CKEditor-brugermanual"},"clipboard":{"copy":"Kopiér","copyError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at kopiere teksten (Ctrl/Cmd+C).","cut":"Klip","cutError":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Brug i stedet tastaturet til at klippe teksten (Ctrl/Cmd+X).","paste":"Indsæt","pasteArea":"Indsæt område","pasteMsg":"Indsæt i feltet herunder (<STRONG>Ctrl/Cmd+V</STRONG>) og klik på <STRONG>OK</STRONG>.","securityMsg":"Din browsers sikkerhedsindstillinger tillader ikke editoren at få automatisk adgang til udklipsholderen.<br><br>Du skal indsætte udklipsholderens indhold i dette vindue igen.","title":"Indsæt"},"base64image":{"alt":"Alternativ tekst","lockRatio":"Lås størrelsesforhold","vSpace":"Lodret margen","hSpace":"Vandret margen","border":"Ramme"},"basicstyles":{"bold":"Fed","italic":"Kursiv","strike":"Gennemstreget","subscript":"Sænket skrift","superscript":"Hævet skrift","underline":"Understreget"},"bidi":{"ltr":"Tekstretning fra venstre til højre","rtl":"Tekstretning fra højre til venstre"},"blockquote":{"toolbar":"Blokcitat"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Baggrundsfarve","colors":{"000":"Sort","800000":"Mørkerød","8B4513":"Mørk orange","2F4F4F":"Dark Slate Grå","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Mørkegrå","B22222":"Scarlet / Rød","A52A2A":"Brun","DAA520":"Guld","006400":"Mørkegrøn","40E0D0":"Tyrkis","0000CD":"Mellemblå","800080":"Lilla","808080":"Grå","F00":"Rød","FF8C00":"Mørk orange","FFD700":"Guld","008000":"Grøn","0FF":"Cyan","00F":"Blå","EE82EE":"Violet","A9A9A9":"Matgrå","FFA07A":"Laksefarve","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Mat tyrkis","ADD8E6":"Lyseblå","DDA0DD":"Plum","D3D3D3":"Lysegrå","FFF0F5":"Lavender Blush","FAEBD7":"Antikhvid","FFFFE0":"Lysegul","F0FFF0":"Gul / Beige","F0FFFF":"Himmeblå","F0F8FF":"Alice blue","E6E6FA":"Lavendel","FFF":"Hvid","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farver...","panelTitle":"Farver","textColorTitle":"Tekstfarve"},"font":{"fontSize":{"label":"Skriftstørrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrifttype","panelTitle":"Skrifttype","voiceLabel":"Skrifttype"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Upload fil til serveren","button2Img":"Vil du lave billedknappen om til et almindeligt billede?","hSpace":"Vandret margen","img2Button":"Vil du lave billedet om til en billedknap?","infoTab":"Generelt","linkTab":"Hyperlink","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","resetSize":"Nulstil størrelse","title":"Egenskaber for billede","titleButton":"Egenskaber for billedknap","upload":"Upload","urlMissing":"Kilde på billed-URL mangler","vSpace":"Lodret margen","validateBorder":"Kant skal være et helt nummer.","validateHSpace":"HSpace skal være et helt nummer.","validateVSpace":"VSpace skal være et helt nummer."},"widget":{"move":"Klik og træk for at flytte","label":"%1 widget"},"image2":{"alt":"Alternativ tekst","btnUpload":"Upload fil til serveren","captioned":"Tekstet billede","captionPlaceholder":"Tekst","infoTab":"Generelt","lockRatio":"Lås størrelsesforhold","menu":"Egenskaber for billede","pathName":"billede","pathNameCaption":"tekst","resetSize":"Nulstil størrelse","resizer":"Klik og træk for at ændre størrelsen","title":"Egenskaber for billede","uploadTab":"Upload","urlMissing":"Kilde på billed-URL mangler","altMissing":"Alternative text is missing."},"indent":{"indent":"Forøg indrykning","outdent":"Formindsk indrykning"},"fakeobjects":{"anchor":"Anker","flash":"Flashanimation","hiddenfield":"Skjult felt","iframe":"Iframe","unknown":"Ukendt objekt"},"link":{"acccessKey":"Genvejstast","advanced":"Avanceret","advisoryContentType":"Indholdstype","advisoryTitle":"Titel","anchor":{"toolbar":"Indsæt/redigér bogmærke","menu":"Egenskaber for bogmærke","title":"Egenskaber for bogmærke","name":"Bogmærkenavn","errorName":"Indtast bogmærkenavn","remove":"Fjern bogmærke"},"anchorId":"Efter element-Id","anchorName":"Efter ankernavn","charset":"Tegnsæt","cssClasses":"Typografiark","download":"Force Download","displayText":"Display Text","emailAddress":"E-mailadresse","emailBody":"Besked","emailSubject":"Emne","id":"Id","info":"Generelt","langCode":"Tekstretning","langDir":"Tekstretning","langDirLTR":"Fra venstre mod højre (LTR)","langDirRTL":"Fra højre mod venstre (RTL)","menu":"Redigér hyperlink","name":"Navn","noAnchors":"(Ingen bogmærker i dokumentet)","noEmail":"Indtast e-mailadresse!","noUrl":"Indtast hyperlink-URL!","other":"<anden>","popupDependent":"Koblet/dependent (Netscape)","popupFeatures":"Egenskaber for popup","popupFullScreen":"Fuld skærm (IE)","popupLeft":"Position fra venstre","popupLocationBar":"Adresselinje","popupMenuBar":"Menulinje","popupResizable":"Justérbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Værktøjslinje","popupTop":"Position fra toppen","rel":"Relation","selectAnchor":"Vælg et anker","styles":"Typografi","tabIndex":"Tabulatorindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Destinationsvinduets navn","targetPopup":"<popup vindue>","targetPopupName":"Popupvinduets navn","title":"Egenskaber for hyperlink","toAnchor":"Bogmærke på denne side","toEmail":"E-mail","toUrl":"URL","toolbar":"Indsæt/redigér hyperlink","type":"Type","unlink":"Fjern hyperlink","upload":"Upload"},"list":{"bulletedlist":"Punktopstilling","numberedlist":"Talopstilling"},"maximize":{"maximize":"Maksimér","minimize":"Minimér"},"table":{"border":"Rammebredde","caption":"Titel","cell":{"menu":"Celle","insertBefore":"Indsæt celle før","insertAfter":"Indsæt celle efter","deleteCell":"Slet celle","merge":"Flet celler","mergeRight":"Flet til højre","mergeDown":"Flet nedad","splitHorizontal":"Del celle vandret","splitVertical":"Del celle lodret","title":"Celleegenskaber","cellType":"Celletype","rowSpan":"Række span (rows span)","colSpan":"Kolonne span (columns span)","wordWrap":"Tekstombrydning","hAlign":"Vandret justering","vAlign":"Lodret justering","alignBaseline":"Grundlinje","bgColor":"Baggrundsfarve","borderColor":"Rammefarve","data":"Data","header":"Hoved","yes":"Ja","no":"Nej","invalidWidth":"Cellebredde skal være et tal.","invalidHeight":"Cellehøjde skal være et tal.","invalidRowSpan":"Række span skal være et heltal.","invalidColSpan":"Kolonne span skal være et heltal.","chooseColor":"Vælg"},"cellPad":"Cellemargen","cellSpace":"Celleafstand","column":{"menu":"Kolonne","insertBefore":"Indsæt kolonne før","insertAfter":"Indsæt kolonne efter","deleteColumn":"Slet kolonne"},"columns":"Kolonner","deleteTable":"Slet tabel","headers":"Hoved","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første række","invalidBorder":"Rammetykkelse skal være et tal.","invalidCellPadding":"Cellemargen skal være et tal.","invalidCellSpacing":"Celleafstand skal være et tal.","invalidCols":"Antallet af kolonner skal være større end 0.","invalidHeight":"Tabelhøjde skal være et tal.","invalidRows":"Antallet af rækker skal være større end 0.","invalidWidth":"Tabelbredde skal være et tal.","menu":"Egenskaber for tabel","row":{"menu":"Række","insertBefore":"Indsæt række før","insertAfter":"Indsæt række efter","deleteRow":"Slet række"},"rows":"Rækker","summary":"Resumé","title":"Egenskaber for tabel","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"Bredde på enhed"},"quicktable":{"more":"Flere..."},"removeformat":{"toolbar":"Fjern formatering"},"sourcearea":{"toolbar":"Kilde"},"toolbar":{"toolbarCollapse":"Sammenklap værktøjslinje","toolbarExpand":"Udvid værktøjslinje","toolbarGroups":{"document":"Dokument","clipboard":"Udklipsholder/Fortryd","editing":"Redigering","forms":"Formularer","basicstyles":"Basis styles","paragraph":"Paragraf","links":"Links","insert":"Indsæt","styles":"Typografier","colors":"Farver","tools":"Værktøjer"},"toolbars":"Editors værktøjslinjer"},"undo":{"redo":"Annullér fortryd","undo":"Fortryd"},"colordialog":{"clear":"Nulstil","highlight":"Markér","options":"Farvemuligheder","selected":"Valgt farve","title":"Vælg farve"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/de-ch.js b/plugins/ckeditor/src/lang/de-ch.js
deleted file mode 100644
index f7821cc4c..000000000
--- a/plugins/ckeditor/src/lang/de-ch.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['de-ch']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schliessen","preview":"Vorschau","resize":"Grösse ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schliessen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Space","35":"Ende","36":"Pos1","46":"Entfernen","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiss","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiss","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"font":{"fontSize":{"label":"Grösse","voiceLabel":"Schrifgrösse","panelTitle":"Schriftgrösse"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Grössenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Grösse zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 widget"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Grösse zurücksetzen","resizer":"Zum Vergrössern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","altMissing":"Alternative text is missing."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Grösse änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"table":{"border":"Rahmengrösse","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand aussen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muss eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muss eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand aussen muss eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß grösser als 0 sein..","invalidHeight":"Die Tabellenbreite muss eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß grösser als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Formatierung entfernen"},"sourcearea":{"toolbar":"Quellcode"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/de.js b/plugins/ckeditor/src/lang/de.js
deleted file mode 100644
index e19eb2f58..000000000
--- a/plugins/ckeditor/src/lang/de.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['de']={"editor":"WYSIWYG-Editor","editorPanel":"WYSIWYG-Editor-Leiste","common":{"editorHelp":"Drücken Sie ALT 0 für Hilfe","browseServer":"Server durchsuchen","url":"URL","protocol":"Protokoll","upload":"Hochladen","uploadSubmit":"Zum Server senden","image":"Bild","flash":"Flash","form":"Formular","checkbox":"Kontrollbox","radio":"Optionsfeld","textField":"Textfeld","textarea":"Textfeld","hiddenField":"Verstecktes Feld","button":"Schaltfläche","select":"Auswahlfeld","imageButton":"Bildschaltfläche","notSet":"<nicht festgelegt>","id":"Kennung","name":"Name","langDir":"Schreibrichtung","langDirLtr":"Links nach Rechts (LTR)","langDirRtl":"Rechts nach Links (RTL)","langCode":"Sprachcode","longDescr":"Langbeschreibungs-URL","cssClass":"Formatvorlagenklassen","advisoryTitle":"Titel Beschreibung","cssStyle":"Stil","ok":"OK","cancel":"Abbrechen","close":"Schließen","preview":"Vorschau","resize":"Größe ändern","generalTab":"Allgemein","advancedTab":"Erweitert","validateNumberFailed":"Dieser Wert ist keine Nummer.","confirmNewPage":"Alle nicht gespeicherten Änderungen gehen verlohren. Sind Sie sicher die neue Seite zu laden?","confirmCancel":"Einige Optionen wurden geändert. Wollen Sie den Dialog dennoch schließen?","options":"Optionen","target":"Zielseite","targetNew":"Neues Fenster (_blank)","targetTop":"Oberstes Fenster (_top)","targetSelf":"Gleiches Fenster (_self)","targetParent":"Oberes Fenster (_parent)","langDirLTR":"Links nach Rechts (LNR)","langDirRTL":"Rechts nach Links (RNL)","styles":"Style","cssClasses":"Stylesheet Klasse","width":"Breite","height":"Höhe","align":"Ausrichtung","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Zentriert","alignJustify":"Blocksatz","alignTop":"Oben","alignMiddle":"Mitte","alignBottom":"Unten","alignNone":"Keine","invalidValue":"Ungültiger Wert.","invalidHeight":"Höhe muss eine Zahl sein.","invalidWidth":"Breite muss eine Zahl sein.","invalidCssLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","invalidHtmlLength":"Wert spezifiziert für \"%1\" Feld muss ein positiver numerischer Wert sein mit oder ohne korrekte HTML Messeinheit (px oder %).","invalidInlineStyle":"Wert spezifiziert für inline Stilart muss enthalten ein oder mehr Tupels mit dem Format \"Name : Wert\" getrennt mit Semikolons.","cssLengthTooltip":"Gebe eine Zahl ein für ein Wert in pixels oder eine Zahl mit einer korrekten CSS Messeinheit (px, %, in, cm, mm, em, ex, pt oder pc).","unavailable":"%1<span class=\"cke_accessibility\">, nicht verfügbar</span>","keyboard":{"8":"Rücktaste","13":"Eingabe","16":"Umschalt","17":"Strg","18":"Alt","32":"Leer","35":"Ende","36":"Pos1","46":"Entfernen","224":"Befehl"},"keyboardShortcut":"Tastaturkürzel"},"about":{"copy":"Copyright &copy; $1. Alle Rechte vorbehalten.","dlgTitle":"Über CKEditor","help":"Prüfen Sie $1 für Hilfe.","moreInfo":"Für Informationen über unsere Lizenzbestimmungen besuchen sie bitte unsere Webseite:","title":"Über CKEditor","userGuide":"CKEditor Benutzerhandbuch"},"clipboard":{"copy":"Kopieren","copyError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch kopieren. Bitte benutzen Sie die System-Zwischenablage über STRG-C (kopieren).","cut":"Ausschneiden","cutError":"Die Sicherheitseinstellungen Ihres Browsers lassen es nicht zu, den Text automatisch auszuschneiden. Bitte benutzen Sie die System-Zwischenablage über STRG-X (ausschneiden) und STRG-V (einfügen).","paste":"Einfügen","pasteArea":"Einfügebereich","pasteMsg":"Bitte fügen Sie den Text in der folgenden Box über die Tastatur (mit <STRONG>Strg+V</STRONG>) ein und bestätigen Sie mit <STRONG>OK</STRONG>.","securityMsg":"Aufgrund von Sicherheitsbeschränkungen Ihres Browsers kann der Editor nicht direkt auf die Zwischenablage zugreifen. Bitte fügen Sie den Inhalt erneut in diesem Fenster ein.","title":"Einfügen"},"base64image":{"alt":"Alternativer Text","lockRatio":"Größenverhältnis beibehalten","vSpace":"Vertikal-Abstand","hSpace":"Horizontal-Abstand","border":"Rahmen"},"basicstyles":{"bold":"Fett","italic":"Kursiv","strike":"Durchgestrichen","subscript":"Tiefgestellt","superscript":"Hochgestellt","underline":"Unterstrichen"},"bidi":{"ltr":"Leserichtung von Links nach Rechts","rtl":"Leserichtung von Rechts nach Links"},"blockquote":{"toolbar":"Zitatblock"},"button":{"selectedLabel":"%1 (Ausgewählt)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Hintergrundfarbe","colors":{"000":"Schwarz","800000":"Kastanienbraun","8B4513":"Braun","2F4F4F":"Dunkles Schiefergrau","008080":"Blaugrün","000080":"Marineblau","4B0082":"Indigo","696969":"Dunkelgrau","B22222":"Ziegelrot","A52A2A":"Braun","DAA520":"Goldgelb","006400":"Dunkelgrün","40E0D0":"Türkis","0000CD":"Mittelblau","800080":"Lila","808080":"Grau","F00":"Rot","FF8C00":"Dunkelorange","FFD700":"Gold","008000":"Grün","0FF":"Cyan","00F":"Blau","EE82EE":"Violett","A9A9A9":"Dunkelgrau","FFA07A":"Helles Lachsrosa","FFA500":"Orange","FFFF00":"Gelb","00FF00":"Lime","AFEEEE":"Blasstürkis","ADD8E6":"Hellblau","DDA0DD":"Pflaumenblau","D3D3D3":"Hellgrau","FFF0F5":"Lavendel","FAEBD7":"Antik Weiß","FFFFE0":"Hellgelb","F0FFF0":"Honigtau","F0FFFF":"Azurblau","F0F8FF":"Alice Blau","E6E6FA":"Lavendel","FFF":"Weiß","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Weitere Farben...","panelTitle":"Farben","textColorTitle":"Textfarbe"},"font":{"fontSize":{"label":"Größe","voiceLabel":"Schrifgröße","panelTitle":"Schriftgröße"},"label":"Schriftart","panelTitle":"Schriftartname","voiceLabel":"Schriftart"},"image":{"alt":"Alternativer Text","border":"Rahmen","btnUpload":"Zum Server senden","button2Img":"Möchten Sie die ausgewählte Bildschaltfläche in ein einfaches Bild umwandeln?","hSpace":"Horizontal-Abstand","img2Button":"Möchten Sie das ausgewählte Bild in eine Bildschaltfläche umwandeln?","infoTab":"Bildinfo","linkTab":"Link","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","resetSize":"Größe zurücksetzen","title":"Bildeigenschaften","titleButton":"Bildschaltflächeneigenschaften","upload":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","vSpace":"Vertikal-Abstand","validateBorder":"Rahmen muss eine ganze Zahl sein.","validateHSpace":"Horizontal-Abstand muss eine ganze Zahl sein.","validateVSpace":"Vertikal-Abstand muss eine ganze Zahl sein."},"widget":{"move":"Zum Verschieben anwählen und ziehen","label":"%1 Steuerelement"},"image2":{"alt":"Alternativer Text","btnUpload":"Zum Server senden","captioned":"Bild mit Überschrift","captionPlaceholder":"Überschrift","infoTab":"Bildinfo","lockRatio":"Größenverhältnis beibehalten","menu":"Bildeigenschaften","pathName":"Bild","pathNameCaption":"Überschrift","resetSize":"Größe zurücksetzen","resizer":"Zum Vergrößern auswählen und ziehen","title":"Bild-Eigenschaften","uploadTab":"Hochladen","urlMissing":"Bildquellen-URL fehlt.","altMissing":"Alternativer Text fehlt."},"indent":{"indent":"Einzug erhöhen","outdent":"Einzug verringern"},"fakeobjects":{"anchor":"Anker","flash":"Flash-Animation","hiddenfield":"Verstecktes Feld","iframe":"IFrame","unknown":"Unbekanntes Objekt"},"link":{"acccessKey":"Zugriffstaste","advanced":"Erweitert","advisoryContentType":"Inhaltstyp","advisoryTitle":"Titel Beschreibung","anchor":{"toolbar":"Anker","menu":"Anker bearbeiten","title":"Ankereigenschaften","name":"Ankername","errorName":"Bitte geben Sie den Namen des Ankers ein","remove":"Anker entfernen"},"anchorId":"Nach Elementkennung","anchorName":"Nach Ankername","charset":"Verknüpfter Ressourcenzeichensatz","cssClasses":"Formatvorlagenklasse","download":"Herunterladen erzwingen","displayText":"Anzeigetext","emailAddress":"E-Mail-Adresse","emailBody":"Nachrichtentext","emailSubject":"Betreffzeile","id":"Kennung","info":"Linkinfo","langCode":"Sprachcode","langDir":"Schreibrichtung","langDirLTR":"Links nach Rechts (LTR)","langDirRTL":"Rechts nach Links (RTL)","menu":"Link bearbeiten","name":"Name","noAnchors":"(Keine Anker im Dokument vorhanden)","noEmail":"Bitte geben Sie E-Mail-Adresse an","noUrl":"Bitte geben Sie die Link-URL an","other":"<andere>","popupDependent":"Abhängig (Netscape)","popupFeatures":"Pop-up Fenstereigenschaften","popupFullScreen":"Vollbild (IE)","popupLeft":"Linke Position","popupLocationBar":"Adressleiste","popupMenuBar":"Menüleiste","popupResizable":"Größe änderbar","popupScrollBars":"Rollbalken","popupStatusBar":"Statusleiste","popupToolbar":"Werkzeugleiste","popupTop":"Obere Position","rel":"Beziehung","selectAnchor":"Anker auswählen","styles":"Style","tabIndex":"Tab-Index","target":"Zielseite","targetFrame":"<Frame>","targetFrameName":"Ziel-Fenster-Name","targetPopup":"<Pop-up Fenster>","targetPopupName":"Pop-up Fenster-Name","title":"Link","toAnchor":"Anker in dieser Seite","toEmail":"E-Mail","toUrl":"URL","toolbar":"Link einfügen/editieren","type":"Link-Typ","unlink":"Link entfernen","upload":"Hochladen"},"list":{"bulletedlist":"Liste","numberedlist":"Nummerierte Liste einfügen/entfernen"},"maximize":{"maximize":"Maximieren","minimize":"Minimieren"},"table":{"border":"Rahmengröße","caption":"Überschrift","cell":{"menu":"Zelle","insertBefore":"Zelle davor einfügen","insertAfter":"Zelle danach einfügen","deleteCell":"Zelle löschen","merge":"Zellen verbinden","mergeRight":"Nach rechts verbinden","mergeDown":"Nach unten verbinden","splitHorizontal":"Zelle horizontal teilen","splitVertical":"Zelle vertikal teilen","title":"Zelleneigenschaften","cellType":"Zellart","rowSpan":"Anzahl Zeilen verbinden","colSpan":"Anzahl Spalten verbinden","wordWrap":"Zeilenumbruch","hAlign":"Horizontale Ausrichtung","vAlign":"Vertikale Ausrichtung","alignBaseline":"Grundlinie","bgColor":"Hintergrundfarbe","borderColor":"Rahmenfarbe","data":"Daten","header":"Überschrift","yes":"Ja","no":"Nein","invalidWidth":"Zellenbreite muss eine Zahl sein.","invalidHeight":"Zellenhöhe muss eine Zahl sein.","invalidRowSpan":"\"Anzahl Zeilen verbinden\" muss eine Ganzzahl sein.","invalidColSpan":"\"Anzahl Spalten verbinden\" muss eine Ganzzahl sein.","chooseColor":"Wählen"},"cellPad":"Zellenabstand innen","cellSpace":"Zellenabstand außen","column":{"menu":"Spalte","insertBefore":"Spalte links davor einfügen","insertAfter":"Spalte rechts danach einfügen","deleteColumn":"Spalte löschen"},"columns":"Spalte","deleteTable":"Tabelle löschen","headers":"Kopfzeile","headersBoth":"Beide","headersColumn":"Erste Spalte","headersNone":"Keine","headersRow":"Erste Zeile","invalidBorder":"Die Rahmenbreite muß eine Zahl sein.","invalidCellPadding":"Der Zellenabstand innen muß eine positive Zahl sein.","invalidCellSpacing":"Der Zellenabstand außen muß eine positive Zahl sein.","invalidCols":"Die Anzahl der Spalten muß größer als 0 sein..","invalidHeight":"Die Tabellenbreite muß eine Zahl sein.","invalidRows":"Die Anzahl der Zeilen muß größer als 0 sein.","invalidWidth":"Die Tabellenbreite muss eine Zahl sein.","menu":"Tabellen-Eigenschaften","row":{"menu":"Zeile","insertBefore":"Zeile oberhalb einfügen","insertAfter":"Zeile unterhalb einfügen","deleteRow":"Zeile entfernen"},"rows":"Zeile","summary":"Inhaltsübersicht","title":"Tabellen-Eigenschaften","toolbar":"Tabelle","widthPc":"%","widthPx":"Pixel","widthUnit":"Breite Einheit"},"quicktable":{"more":"Mehr..."},"removeformat":{"toolbar":"Formatierung entfernen"},"sourcearea":{"toolbar":"Quellcode"},"toolbar":{"toolbarCollapse":"Werkzeugleiste einklappen","toolbarExpand":"Werkzeugleiste ausklappen","toolbarGroups":{"document":"Dokument","clipboard":"Zwischenablage/Rückgängig","editing":"Editieren","forms":"Formulare","basicstyles":"Grundstile","paragraph":"Absatz","links":"Links","insert":"Einfügen","styles":"Stile","colors":"Farben","tools":"Werkzeuge"},"toolbars":"Editor Werkzeugleisten"},"undo":{"redo":"Wiederherstellen","undo":"Rückgängig"},"colordialog":{"clear":"Entfernen","highlight":"Hervorheben","options":"Farboptionen","selected":"Ausgewählte Farbe","title":"Farbe auswählen"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/el.js b/plugins/ckeditor/src/lang/el.js
deleted file mode 100644
index 53389cd1b..000000000
--- a/plugins/ckeditor/src/lang/el.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['el']={"editor":"Επεξεργαστής Πλούσιο�
- Κειμένο�
-","editorPanel":"Πίνακας Επεξεργαστή Πλούσιο�
- Κειμένο�
-","common":{"editorHelp":"Πατήστε το ALT 0 για βοήθεια","browseServer":"Εξερεύνηση Διακομιστή","url":"URL","protocol":"Πρωτόκολλο","upload":"Αποστολή","uploadSubmit":"Αποστολή στον Διακομιστή","image":"Εικόνα","flash":"Flash","form":"Φόρμα","checkbox":"Κο�
-τί Επιλογής","radio":"Κο�
-μπί Επιλογής","textField":"Πεδίο Κειμένο�
-","textarea":"Περιοχή Κειμένο�
-","hiddenField":"Κρ�
-φό Πεδίο","button":"Κο�
-μπί","select":"Πεδίο Επιλογής","imageButton":"Κο�
-μπί Εικόνας","notSet":"<δεν έχει ρ�
-θμιστεί>","id":"Id","name":"Όνομα","langDir":"Κατεύθ�
-νση Κειμένο�
-","langDirLtr":"Αριστερά προς Δεξιά (LTR)","langDirRtl":"Δεξιά προς Αριστερά (RTL)","langCode":"Κωδικός Γλώσσας","longDescr":"Αναλ�
-τική Περιγραφή URL","cssClass":"Κλάσεις Φύλλων Στ�
-λ","advisoryTitle":"Ενδεικτικός Τίτλος","cssStyle":"Μορφή Κειμένο�
-","ok":"OK","cancel":"Ακύρωση","close":"Κλείσιμο","preview":"Προεπισκόπηση","resize":"Αλλαγή Μεγέθο�
-ς","generalTab":"Γενικά","advancedTab":"Για Προχωρημένο�
-ς","validateNumberFailed":"Α�
-τή η τιμή δεν είναι αριθμός.","confirmNewPage":"Οι όποιες αλλαγές στο περιεχόμενο θα χαθούν. Είσαστε σίγο�
-ροι ότι θέλετε να φορτώσετε μια νέα σελίδα;","confirmCancel":"Μερικές επιλογές έχο�
-ν αλλάξει. Είσαστε σίγο�
-ροι ότι θέλετε να κλείσετε το παράθ�
-ρο διαλόγο�
-;","options":"Επιλογές","target":"Προορισμός","targetNew":"Νέο Παράθ�
-ρο (_blank)","targetTop":"Αρχική Περιοχή (_top)","targetSelf":"Ίδιο Παράθ�
-ρο (_self)","targetParent":"Γονεϊκό Παράθ�
-ρο (_parent)","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","styles":"Μορφή","cssClasses":"Κλάσεις Φύλλων Στ�
-λ","width":"Πλάτος","height":"Ύψος","align":"Στοίχιση","alignLeft":"Αριστερά","alignRight":"Δεξιά","alignCenter":"Κέντρο","alignJustify":"Πλήρης Στοίχιση","alignTop":"Πάνω","alignMiddle":"Μέση","alignBottom":"Κάτω","alignNone":"Χωρίς","invalidValue":"Μη έγκ�
-ρη τιμή.","invalidHeight":"Το ύψος πρέπει να είναι ένας αριθμός.","invalidWidth":"Το πλάτος πρέπει να είναι ένας αριθμός.","invalidCssLength":"Η τιμή πο�
- ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκ�
-ρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","invalidHtmlLength":"Η τιμή πο�
- ορίζεται για το πεδίο \"%1\" πρέπει να είναι ένας θετικός αριθμός με ή χωρίς μια έγκ�
-ρη μονάδα μέτρησης HTML (px ή %).","invalidInlineStyle":"Η τιμή για το εν σειρά στ�
-λ πρέπει να περιέχει ένα ή περισσότερα ζεύγη με την μορφή \"όνομα: τιμή\" διαχωρισμένα με Ελληνικό ερωτηματικό.","cssLengthTooltip":"Εισάγεται μια τιμή σε pixel ή έναν αριθμό μαζί με μια έγκ�
-ρη μονάδα μέτρησης CSS (px, %, in, cm, mm, em, ex, pt, ή pc).","unavailable":"%1<span class=\"cke_accessibility\">, δεν είναι διαθέσιμο</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Πνε�
-ματικά δικαιώματα &copy; $1 Με επιφύλαξη παντός δικαιώματος.","dlgTitle":"Περί το�
- CKEditor","help":"Ελέγξτε τις $1 για βοήθεια.","moreInfo":"Για πληροφορίες σχετικές με την άδεια χρήσης, παρακαλούμε επισκεφθείτε την ιστοσελίδα μας:","title":"Περί το�
- CKEditor","userGuide":"Οδηγίες Χρήστη CKEditor"},"clipboard":{"copy":"Αντιγραφή","copyError":"Οι ρ�
-θμίσεις ασφαλείας το�
- περιηγητή σας δεν επιτρέπο�
-ν την επιλεγμένη εργασία αντιγραφής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+C).","cut":"Αποκοπή","cutError":"Οι ρ�
-θμίσεις ασφαλείας το�
- περιηγητή σας δεν επιτρέπο�
-ν την επιλεγμένη εργασία αποκοπής. Παρακαλώ χρησιμοποιείστε το πληκτρολόγιο (Ctrl/Cmd+X).","paste":"Επικόλληση","pasteArea":"Περιοχή Επικόλλησης","pasteMsg":"Παρακαλώ επικολλήστε στο ακόλο�
-θο κο�
-τί χρησιμοποιώντας το πληκτρολόγιο (<strong>Ctrl/Cmd+V</strong>) και πατήστε OK.","securityMsg":"Λόγων των ρ�
-θμίσεων ασφάλειας το�
- περιηγητή σας, ο επεξεργαστής δεν μπορεί να έχει πρόσβαση στην μνήμη επικόλλησης. Χρειάζεται να επικολλήσετε ξανά σε α�
-τό το παράθ�
-ρο.","title":"Επικόλληση"},"base64image":{"alt":"Εναλλακτικό Κείμενο","lockRatio":"Κλείδωμα Αναλογίας","vSpace":"VSpace","hSpace":"HSpace","border":"Περίγραμμα"},"basicstyles":{"bold":"Έντονη","italic":"Πλάγια","strike":"Διακριτή Διαγραφή","subscript":"Δείκτης","superscript":"Εκθέτης","underline":"Υπογράμμιση"},"bidi":{"ltr":"Διεύθ�
-νση κειμένο�
- από αριστερά στα δεξιά","rtl":"Διεύθ�
-νση κειμένο�
- από δεξιά στα αριστερά"},"blockquote":{"toolbar":"Περιοχή Παράθεσης"},"button":{"selectedLabel":"%1 (Επιλεγμένο)"},"colorbutton":{"auto":"Α�
-τόματα","bgColorTitle":"Χρώμα Φόντο�
-","colors":{"000":"Μαύρο","800000":"Καστανέρ�
-θρο","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Βαθ�
-κύανο","000080":"Μπλε μαρέν","4B0082":"Ινδικό","696969":"Σκούρο Γκρι","B22222":"Ανοικτό Κόκκινο","A52A2A":"Καφέ","DAA520":"Golden Rod","006400":"Σκούρο Πράσινο","40E0D0":"Τ�
-ρκο�
-άζ","0000CD":"Medium Blue","800080":"Μοβ","808080":"Γκρι","F00":"Κόκκινο","FF8C00":"Σκούρο Πορτοκαλί","FFD700":"Χρ�
-σαφί","008000":"Πράσινο","0FF":"Κ�
-ανό","00F":"Μπλε","EE82EE":"Μενεξεδί","A9A9A9":"Ποντικί","FFA07A":"Ανοικτό Σομόν","FFA500":"Πορτοκαλί","FFFF00":"Κίτρινο","00FF00":"Μοσχολέμονο","AFEEEE":"Pale Turquoise","ADD8E6":"Γαλάζιο","DDA0DD":"Δαμασκηνί","D3D3D3":"Ανοικτό Γκρι","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Ανοικτό Κίτρινο","F0FFF0":"Honeydew","F0FFFF":"Γαλανό","F0F8FF":"Alice Blue","E6E6FA":"Ελαφρός Ιώδες","FFF":"Λε�
-κό","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Περισσότερα Χρώματα…","panelTitle":"Χρώματα","textColorTitle":"Χρώμα Κειμένο�
-"},"font":{"fontSize":{"label":"Μέγεθος","voiceLabel":"Μέγεθος Γραμματοσειράς","panelTitle":"Μέγεθος Γραμματοσειράς"},"label":"Γραμματοσειρά","panelTitle":"Όνομα Γραμματοσειράς","voiceLabel":"Γραμματοσειρά"},"image":{"alt":"Εναλλακτικό Κείμενο","border":"Περίγραμμα","btnUpload":"Αποστολή στον Διακομιστή","button2Img":"Θέλετε να μετατρέψετε το επιλεγμένο κο�
-μπί εικόνας σε απλή εικόνα;","hSpace":"HSpace","img2Button":"Θέλετε να μεταμορφώσετε την επιλεγμένη εικόνα πο�
- είναι πάνω σε ένα κο�
-μπί;","infoTab":"Πληροφορίες Εικόνας","linkTab":"Σύνδεσμος","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","resetSize":"Επαναφορά Αρχικού Μεγέθο�
-ς","title":"Ιδιότητες Εικόνας","titleButton":"Ιδιότητες Κο�
-μπιού Εικόνας","upload":"Αποστολή","urlMissing":"Το URL πηγής για την εικόνα λείπει.","vSpace":"VSpace","validateBorder":"Το περίγραμμα πρέπει να είναι ένας ακέραιος αριθμός.","validateHSpace":"Το HSpace πρέπει να είναι ένας ακέραιος αριθμός.","validateVSpace":"Το VSpace πρέπει να είναι ένας ακέραιος αριθμός."},"widget":{"move":"Κάνετε κλικ και σύρετε το ποντίκι για να μετακινήστε","label":"%1 widget"},"image2":{"alt":"Εναλλακτικό Κείμενο","btnUpload":"Αποστολή στον Διακομιστή","captioned":"Εικόνα με λεζάντα","captionPlaceholder":"Λεζάντα","infoTab":"Πληροφορίες Εικόνας","lockRatio":"Κλείδωμα Αναλογίας","menu":"Ιδιότητες Εικόνας","pathName":"εικόνα","pathNameCaption":"λεζάντα","resetSize":"Επαναφορά Αρχικού Μεγέθο�
-ς","resizer":"Κάνετε κλικ και σύρετε το ποντίκι για να αλλάξετε το μέγεθος","title":"Ιδιότητες Εικόνας","uploadTab":"Αποστολή","urlMissing":"Λείπει το πηγαίο URL της εικόνας.","altMissing":"Alternative text is missing."},"indent":{"indent":"Αύξηση Εσοχής","outdent":"Μείωση Εσοχής"},"fakeobjects":{"anchor":"Άγκ�
-ρα","flash":"Ταινία Flash","hiddenfield":"Κρ�
-φό Πεδίο","iframe":"IFrame","unknown":"Άγνωστο Αντικείμενο"},"link":{"acccessKey":"Σ�
-ντόμε�
-ση","advanced":"Για Προχωρημένο�
-ς","advisoryContentType":"Ενδεικτικός Τύπος Περιεχομένο�
-","advisoryTitle":"Ενδεικτικός Τίτλος","anchor":{"toolbar":"Εισαγωγή/επεξεργασία Άγκ�
-ρας","menu":"Ιδιότητες άγκ�
-ρας","title":"Ιδιότητες άγκ�
-ρας","name":"Όνομα άγκ�
-ρας","errorName":"Παρακαλούμε εισάγετε όνομα άγκ�
-ρας","remove":"Αφαίρεση Άγκ�
-ρας"},"anchorId":"Βάσει το�
- Element Id","anchorName":"Βάσει το�
- Ονόματος Άγκ�
-ρας","charset":"Κωδικοποίηση Χαρακτήρων Προσαρτημένης Πηγής","cssClasses":"Κλάσεις Φύλλων Στ�
-λ","download":"Force Download","displayText":"Display Text","emailAddress":"Διεύθ�
-νση E-mail","emailBody":"Κείμενο Μηνύματος","emailSubject":"Θέμα Μηνύματος","id":"Id","info":"Πληροφορίες Σ�
-νδέσμο�
-","langCode":"Κατεύθ�
-νση Κειμένο�
-","langDir":"Κατεύθ�
-νση Κειμένο�
-","langDirLTR":"Αριστερά προς Δεξιά (LTR)","langDirRTL":"Δεξιά προς Αριστερά (RTL)","menu":"Επεξεργασία Σ�
-νδέσμο�
-","name":"Όνομα","noAnchors":"(Δεν �
-πάρχο�
-ν άγκ�
-ρες στο κείμενο)","noEmail":"Εισάγετε τη διεύθ�
-νση ηλεκτρονικού ταχ�
-δρομείο�
-","noUrl":"Εισάγετε την τοποθεσία (URL) το�
- σ�
-νδέσμο�
-","other":"<άλλο>","popupDependent":"Εξαρτημένο (Netscape)","popupFeatures":"Επιλογές Αναδ�
-όμενο�
- Παραθύρο�
-","popupFullScreen":"Πλήρης Οθόνη (IE)","popupLeft":"Θέση Αριστερά","popupLocationBar":"Γραμμή Τοποθεσίας","popupMenuBar":"Γραμμή Επιλογών","popupResizable":"Προσαρμοζόμενο Μέγεθος","popupScrollBars":"Μπάρες Κύλισης","popupStatusBar":"Γραμμή Κατάστασης","popupToolbar":"Εργαλειοθήκη","popupTop":"Θέση Πάνω","rel":"Σχέση","selectAnchor":"Επιλέξτε μια Άγκ�
-ρα","styles":"Μορφή","tabIndex":"Σειρά Μεταπήδησης","target":"Παράθ�
-ρο Προορισμού","targetFrame":"<πλαίσιο>","targetFrameName":"Όνομα Πλαισίο�
- Προορισμού","targetPopup":"<αναδ�
-όμενο παράθ�
-ρο>","targetPopupName":"Όνομα Αναδ�
-όμενο�
- Παραθύρο�
-","title":"Σύνδεσμος","toAnchor":"Άγκ�
-ρα σε α�
-τήν τη σελίδα","toEmail":"E-Mail","toUrl":"URL","toolbar":"Σύνδεσμος","type":"Τύπος Σ�
-νδέσμο�
-","unlink":"Αφαίρεση Σ�
-νδέσμο�
-","upload":"Αποστολή"},"list":{"bulletedlist":"Εισαγωγή/Απομάκρ�
-νση Λίστας Κο�
-κκίδων","numberedlist":"Εισαγωγή/Απομάκρ�
-νση Αριθμημένης Λίστας"},"maximize":{"maximize":"Μεγιστοποίηση","minimize":"Ελαχιστοποίηση"},"table":{"border":"Πάχος Περιγράμματος","caption":"Λεζάντα","cell":{"menu":"Κελί","insertBefore":"Εισαγωγή Κελιού Πριν","insertAfter":"Εισαγωγή Κελιού Μετά","deleteCell":"Διαγραφή Κελιών","merge":"Ενοποίηση Κελιών","mergeRight":"Σ�
-γχώνε�
-ση Με Δεξιά","mergeDown":"Σ�
-γχώνε�
-ση Με Κάτω","splitHorizontal":"Οριζόντια Διαίρεση Κελιού","splitVertical":"Κατακόρ�
-φη Διαίρεση Κελιού","title":"Ιδιότητες Κελιού","cellType":"Τύπος Κελιού","rowSpan":"Εύρος Γραμμών","colSpan":"Εύρος Στηλών","wordWrap":"Αναδίπλωση Λέξεων","hAlign":"Οριζόντια Στοίχιση","vAlign":"Κάθετη Στοίχιση","alignBaseline":"Γραμμή Βάσης","bgColor":"Χρώμα Φόντο�
-","borderColor":"Χρώμα Περιγράμματος","data":"Δεδομένα","header":"Κεφαλίδα","yes":"Ναι","no":"Όχι","invalidWidth":"Το πλάτος το�
- κελιού πρέπει να είναι αριθμός.","invalidHeight":"Το ύψος το�
- κελιού πρέπει να είναι αριθμός.","invalidRowSpan":"Το εύρος των γραμμών πρέπει να είναι ακέραιος αριθμός.","invalidColSpan":"Το εύρος των στηλών πρέπει να είναι ακέραιος αριθμός.","chooseColor":"Επιλέξτε"},"cellPad":"Αναπλήρωση κελιών","cellSpace":"Απόσταση κελιών","column":{"menu":"Στήλη","insertBefore":"Εισαγωγή Στήλης Πριν","insertAfter":"Εισαγωγή Στήλης Μετά","deleteColumn":"Διαγραφή Στηλών"},"columns":"Στήλες","deleteTable":"Διαγραφή Πίνακα","headers":"Κεφαλίδες","headersBoth":"Και τα δύο","headersColumn":"Πρώτη στήλη","headersNone":"Κανένα","headersRow":"Πρώτη Γραμμή","invalidBorder":"Το πάχος το�
- περιγράμματος πρέπει να είναι ένας αριθμός.","invalidCellPadding":"Η αναπλήρωση των κελιών πρέπει να είναι θετικός αριθμός.","invalidCellSpacing":"Η απόσταση μεταξύ των κελιών πρέπει να είναι ένας θετικός αριθμός.","invalidCols":"Ο αριθμός των στηλών πρέπει να είναι μεγαλύτερος από 0.","invalidHeight":"Το ύψος το�
- πίνακα πρέπει να είναι αριθμός.","invalidRows":"Ο αριθμός των σειρών πρέπει να είναι μεγαλύτερος από 0.","invalidWidth":"Το πλάτος το�
- πίνακα πρέπει να είναι ένας αριθμός.","menu":"Ιδιότητες Πίνακα","row":{"menu":"Γραμμή","insertBefore":"Εισαγωγή Γραμμής Πριν","insertAfter":"Εισαγωγή Γραμμής Μετά","deleteRow":"Διαγραφή Γραμμών"},"rows":"Γραμμές","summary":"Περίληψη","title":"Ιδιότητες Πίνακα","toolbar":"Πίνακας","widthPc":"τοις εκατό","widthPx":"pixel","widthUnit":"μονάδα πλάτο�
-ς"},"quicktable":{"more":"Περισσότερα..."},"removeformat":{"toolbar":"Εκκαθάριση Μορφοποίησης"},"sourcearea":{"toolbar":"Κώδικας"},"toolbar":{"toolbarCollapse":"Σύμπτ�
-ξη Εργαλειοθήκης","toolbarExpand":"Ανάπτ�
-ξη Εργαλειοθήκης","toolbarGroups":{"document":"Έγγραφο","clipboard":"Πρόχειρο/Αναίρεση","editing":"Επεξεργασία","forms":"Φόρμες","basicstyles":"Βασικά Στ�
-λ","paragraph":"Παράγραφος","links":"Σύνδεσμοι","insert":"Εισαγωγή","styles":"Στ�
-λ","colors":"Χρώματα","tools":"Εργαλεία"},"toolbars":"Εργαλειοθήκες επεξεργαστή"},"undo":{"redo":"Επανάληψη","undo":"Αναίρεση"},"colordialog":{"clear":"Εκκαθάριση","highlight":"Σήμανση","options":"Επιλογές Χρωμάτων","selected":"Επιλεγμένο Χρώμα","title":"Επιλογή χρώματος"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/en-au.js b/plugins/ckeditor/src/lang/en-au.js
deleted file mode 100644
index ea5e63781..000000000
--- a/plugins/ckeditor/src/lang/en-au.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['en-au']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Redo","undo":"Undo"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/en-ca.js b/plugins/ckeditor/src/lang/en-ca.js
deleted file mode 100644
index 6a8d43fac..000000000
--- a/plugins/ckeditor/src/lang/en-ca.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['en-ca']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colors","textColorTitle":"Text Colour"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Redo","undo":"Undo"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/en-gb.js b/plugins/ckeditor/src/lang/en-gb.js
deleted file mode 100644
index 6ba5f91b2..000000000
--- a/plugins/ckeditor/src/lang/en-gb.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['en-gb']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Drag to resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialogue window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Align","alignLeft":"Left","alignRight":"Right","alignCenter":"Centre","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Colour","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Grey","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Grey","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Grey","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Grey","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colours...","panelTitle":"Colours","textColorTitle":"Text Colour"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"maximize":{"maximize":"Maximise","minimize":"Minimise"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a number.","invalidCellSpacing":"Cell spacing must be a number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Redo","undo":"Undo"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Colour Options","selected":"Selected Colour","title":"Select colour"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/en.js b/plugins/ckeditor/src/lang/en.js
deleted file mode 100644
index 69757c1d4..000000000
--- a/plugins/ckeditor/src/lang/en.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['en']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Send it to the Server","image":"Image","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<not set>","id":"Id","name":"Name","langDir":"Language Direction","langDirLtr":"Left to Right (LTR)","langDirRtl":"Right to Left (RTL)","langCode":"Language Code","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Style","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"General","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Target","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Width","height":"Height","align":"Alignment","alignLeft":"Left","alignRight":"Right","alignCenter":"Center","alignJustify":"Justify","alignTop":"Top","alignMiddle":"Middle","alignBottom":"Bottom","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Copy","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"Cut","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Paste","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Paste"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"image":{"alt":"Alternative Text","border":"Border","btnUpload":"Send it to the Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Image Info","linkTab":"Link","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Reset Size","title":"Image Properties","titleButton":"Image Button Properties","upload":"Upload","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternative Text","btnUpload":"Send it to the Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Image Info","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Reset Size","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Upload","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Language Code","langDir":"Language Direction","langDirLTR":"Left to Right (LTR)","langDirRTL":"Right to Left (RTL)","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Style","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Link","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Link","type":"Link Type","unlink":"Unlink","upload":"Upload"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Redo","undo":"Undo"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/eo.js b/plugins/ckeditor/src/lang/eo.js
deleted file mode 100644
index 903129e26..000000000
--- a/plugins/ckeditor/src/lang/eo.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['eo']={"editor":"RiĉTeksta Redaktilo","editorPanel":"Panelo de la RiĉTeksta Redaktilo","common":{"editorHelp":"Premu ALT 0 por helpilo","browseServer":"Foliumi en la Servilo","url":"URL","protocol":"Protokolo","upload":"Alŝuti","uploadSubmit":"Sendu al Servilo","image":"Bildo","flash":"Flaŝo","form":"Formularo","checkbox":"Markobutono","radio":"Radiobutono","textField":"Teksta kampo","textarea":"Teksta Areo","hiddenField":"Kaŝita Kampo","button":"Butono","select":"Elekta Kampo","imageButton":"Bildbutono","notSet":"<Defaŭlta>","id":"Id","name":"Nomo","langDir":"Skribdirekto","langDirLtr":"De maldekstro dekstren (LTR)","langDirRtl":"De dekstro maldekstren (RTL)","langCode":"Lingva Kodo","longDescr":"URL de Longa Priskribo","cssClass":"Klasoj de Stilfolioj","advisoryTitle":"Priskriba Titolo","cssStyle":"Stilo","ok":"Akcepti","cancel":"Rezigni","close":"Fermi","preview":"Vidigi Aspekton","resize":"Movigi por ŝanĝi la grandon","generalTab":"Ĝenerala","advancedTab":"Speciala","validateNumberFailed":"Tiu valoro ne estas nombro.","confirmNewPage":"La neregistritaj ŝanĝoj estas perdotaj. Ĉu vi certas, ke vi volas ŝargi novan paĝon?","confirmCancel":"Iuj opcioj esta ŝanĝitaj. Ĉu vi certas, ke vi volas fermi la dialogon?","options":"Opcioj","target":"Celo","targetNew":"Nova Fenestro (_blank)","targetTop":"Supra Fenestro (_top)","targetSelf":"Sama Fenestro (_self)","targetParent":"Patra Fenestro (_parent)","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","styles":"Stilo","cssClasses":"Stilfoliaj Klasoj","width":"Larĝo","height":"Alto","align":"Ĝisrandigo","alignLeft":"Maldekstre","alignRight":"Dekstre","alignCenter":"Centre","alignJustify":"Ĝisrandigi Ambaŭflanke","alignTop":"Supre","alignMiddle":"Centre","alignBottom":"Malsupre","alignNone":"Neniu","invalidValue":"Nevalida Valoro","invalidHeight":"Alto devas esti nombro.","invalidWidth":"Larĝo devas esti nombro.","invalidCssLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida CSSmezurunuo (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"La valoro indikita por la \"%1\" kampo devas esti pozitiva nombro kun aŭ sen valida HTMLmezurunuo (px or %).","invalidInlineStyle":"La valoro indikita por la enlinia stilo devas konsisti el unu aŭ pluraj elementoj kun la formato de \"nomo : valoro\", apartigitaj per punktokomoj.","cssLengthTooltip":"Entajpu nombron por rastrumera valoro aŭ nombron kun valida CSSunuo (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, nehavebla</span>","keyboard":{"8":"Retropaŝo","13":"Enigi","16":"Registrumo","17":"Stirklavo","18":"Alt-klavo","32":"Space","35":"Fino","36":"Hejmo","46":"Forigi","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Ĉiuj rajtoj rezervitaj.","dlgTitle":"Pri CKEditor","help":"Kontroli $1 por helpo.","moreInfo":"Por informoj pri licenco, bonvolu viziti nian retpaĝaron:","title":"Pri CKEditor","userGuide":"CKEditor Uzindikoj"},"clipboard":{"copy":"Kopii","copyError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras kopiajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-C).","cut":"Eltondi","cutError":"La sekurecagordo de via TTT-legilo ne permesas, ke la redaktilo faras eltondajn operaciojn. Bonvolu uzi la klavaron por tio (Ctrl/Cmd-X).","paste":"Interglui","pasteArea":"Intergluoareo","pasteMsg":"Bonvolu glui la tekston en la jenan areon per uzado de la klavaro (<strong>Ctrl/Cmd+V</strong>) kaj premu OK","securityMsg":"Pro la sekurecagordo de via TTT-legilo, la redaktilo ne povas rekte atingi viajn datenojn en la poŝo. Bonvolu denove interglui la datenojn en tiun fenestron.","title":"Interglui"},"base64image":{"alt":"Anstataŭiga Teksto","lockRatio":"Konservi Proporcion","vSpace":"Vertikala Spaco","hSpace":"Horizontala Spaco","border":"Bordero"},"basicstyles":{"bold":"Grasa","italic":"Kursiva","strike":"Trastreko","subscript":"Suba indico","superscript":"Supra indico","underline":"Substreko"},"bidi":{"ltr":"Tekstdirekto de maldekstre dekstren","rtl":"Tekstdirekto de dekstre maldekstren"},"blockquote":{"toolbar":"Citaĵo"},"button":{"selectedLabel":"%1 (Selektita)"},"colorbutton":{"auto":"Aŭtomata","bgColorTitle":"Fona Koloro","colors":{"000":"Nigra","800000":"Kaŝtankolora","8B4513":"Mezbruna","2F4F4F":"Ardezgriza","008080":"Marĉanaskolora","000080":"Maristblua","4B0082":"Indigokolora","696969":"Malhelgriza","B22222":"Brikruĝa","A52A2A":"Bruna","DAA520":"Senbrilorkolora","006400":"Malhelverda","40E0D0":"Turkisblua","0000CD":"Reĝblua","800080":"Purpura","808080":"Griza","F00":"Ruĝa","FF8C00":"Malheloranĝkolora","FFD700":"Orkolora","008000":"Verda","0FF":"Verdblua","00F":"Blua","EE82EE":"Viola","A9A9A9":"Mezgriza","FFA07A":"Salmokolora","FFA500":"Oranĝkolora","FFFF00":"Flava","00FF00":"Limetkolora","AFEEEE":"Helturkiskolora","ADD8E6":"Helblua","DDA0DD":"Prunkolora","D3D3D3":"Helgriza","FFF0F5":"Lavendkolora vangoŝminko","FAEBD7":"Antikvablanka","FFFFE0":"Helflava","F0FFF0":"Vintromelonkolora","F0FFFF":"Lazura","F0F8FF":"Aliceblua","E6E6FA":"Lavendkolora","FFF":"Blanka","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Pli da Koloroj...","panelTitle":"Koloroj","textColorTitle":"Teksta Koloro"},"font":{"fontSize":{"label":"Grado","voiceLabel":"Tipara grado","panelTitle":"Tipara grado"},"label":"Tiparo","panelTitle":"Tipara nomo","voiceLabel":"Tiparo"},"image":{"alt":"Anstataŭiga Teksto","border":"Bordero","btnUpload":"Sendu al Servilo","button2Img":"Ĉu vi volas transformi la selektitan bildbutonon en simplan bildon?","hSpace":"Horizontala Spaco","img2Button":"Ĉu vi volas transformi la selektitan bildon en bildbutonon?","infoTab":"Informoj pri Bildo","linkTab":"Ligilo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","resetSize":"Origina Grando","title":"Atributoj de Bildo","titleButton":"Bildbutonaj Atributoj","upload":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","vSpace":"Vertikala Spaco","validateBorder":"La bordero devas esti entjera nombro.","validateHSpace":"La horizontala spaco devas esti entjera nombro.","validateVSpace":"La vertikala spaco devas esti entjera nombro."},"widget":{"move":"klaki kaj treni por movi","label":"%1 widget"},"image2":{"alt":"Anstataŭiga Teksto","btnUpload":"Sendu al Servilo","captioned":"Bildo kun apudskribo","captionPlaceholder":"Apudskribo","infoTab":"Informoj pri Bildo","lockRatio":"Konservi Proporcion","menu":"Atributoj de Bildo","pathName":"bildo","pathNameCaption":"apudskribo","resetSize":"Origina Grando","resizer":"Kliki kaj treni por ŝanĝi la grandon","title":"Atributoj de Bildo","uploadTab":"Alŝuti","urlMissing":"La fontretadreso de la bildo mankas.","altMissing":"Alternative text is missing."},"indent":{"indent":"Pligrandigi Krommarĝenon","outdent":"Malpligrandigi Krommarĝenon"},"fakeobjects":{"anchor":"Ankro","flash":"FlaŝAnimacio","hiddenfield":"Kaŝita kampo","iframe":"Enlinia Kadro (IFrame)","unknown":"Nekonata objekto"},"link":{"acccessKey":"Fulmoklavo","advanced":"Speciala","advisoryContentType":"Enhavotipo","advisoryTitle":"Priskriba Titolo","anchor":{"toolbar":"Ankro","menu":"Enmeti/Ŝanĝi Ankron","title":"Ankraj Atributoj","name":"Ankra Nomo","errorName":"Bv entajpi la ankran nomon","remove":"Forigi Ankron"},"anchorId":"Per Elementidentigilo","anchorName":"Per Ankronomo","charset":"Signaro de la Ligita Rimedo","cssClasses":"Klasoj de Stilfolioj","download":"Force Download","displayText":"Display Text","emailAddress":"Retpoŝto","emailBody":"Mesaĝa korpo","emailSubject":"Mesaĝa Temo","id":"Id","info":"Informoj pri la Ligilo","langCode":"Lingva Kodo","langDir":"Skribdirekto","langDirLTR":"De maldekstro dekstren (LTR)","langDirRTL":"De dekstro maldekstren (RTL)","menu":"Ŝanĝi Ligilon","name":"Nomo","noAnchors":"<Ne disponeblas ankroj en la dokumento>","noEmail":"Bonvolu entajpi la retpoŝtadreson","noUrl":"Bonvolu entajpi la URL-on","other":"<alia>","popupDependent":"Dependa (Netscape)","popupFeatures":"Atributoj de la Ŝprucfenestro","popupFullScreen":"Tutekrane (IE)","popupLeft":"Maldekstra Pozicio","popupLocationBar":"Adresobreto","popupMenuBar":"Menubreto","popupResizable":"Dimensiŝanĝebla","popupScrollBars":"Rulumskaloj","popupStatusBar":"Statobreto","popupToolbar":"Ilobreto","popupTop":"Supra Pozicio","rel":"Rilato","selectAnchor":"Elekti Ankron","styles":"Stilo","tabIndex":"Taba Indekso","target":"Celo","targetFrame":"<kadro>","targetFrameName":"Nomo de CelKadro","targetPopup":"<ŝprucfenestro>","targetPopupName":"Nomo de Ŝprucfenestro","title":"Ligilo","toAnchor":"Ankri en tiu ĉi paĝo","toEmail":"Retpoŝto","toUrl":"URL","toolbar":"Enmeti/Ŝanĝi Ligilon","type":"Tipo de Ligilo","unlink":"Forigi Ligilon","upload":"Alŝuti"},"list":{"bulletedlist":"Bula Listo","numberedlist":"Numera Listo"},"maximize":{"maximize":"Pligrandigi","minimize":"Malgrandigi"},"table":{"border":"Bordero","caption":"Tabeltitolo","cell":{"menu":"Ĉelo","insertBefore":"Enmeti Ĉelon Antaŭ","insertAfter":"Enmeti Ĉelon Post","deleteCell":"Forigi la Ĉelojn","merge":"Kunfandi la Ĉelojn","mergeRight":"Kunfandi dekstren","mergeDown":"Kunfandi malsupren ","splitHorizontal":"Horizontale dividi","splitVertical":"Vertikale dividi","title":"Ĉelatributoj","cellType":"Ĉeltipo","rowSpan":"Kunfando de linioj","colSpan":"Kunfando de kolumnoj","wordWrap":"Cezuro","hAlign":"Horizontala ĝisrandigo","vAlign":"Vertikala ĝisrandigo","alignBaseline":"Malsupro de la teksto","bgColor":"Fonkoloro","borderColor":"Borderkoloro","data":"Datenoj","header":"Supra paĝotitolo","yes":"Jes","no":"No","invalidWidth":"Ĉellarĝo devas esti nombro.","invalidHeight":"Ĉelalto devas esti nombro.","invalidRowSpan":"Kunfando de linioj devas esti entjera nombro.","invalidColSpan":"Kunfando de kolumnoj devas esti entjera nombro.","chooseColor":"Elektu"},"cellPad":"Interna Marĝeno de la ĉeloj","cellSpace":"Spaco inter la Ĉeloj","column":{"menu":"Kolumno","insertBefore":"Enmeti kolumnon antaŭ","insertAfter":"Enmeti kolumnon post","deleteColumn":"Forigi Kolumnojn"},"columns":"Kolumnoj","deleteTable":"Forigi Tabelon","headers":"Supraj Paĝotitoloj","headersBoth":"Ambaŭ","headersColumn":"Unua kolumno","headersNone":"Neniu","headersRow":"Unua linio","invalidBorder":"La bordergrando devas esti nombro.","invalidCellPadding":"La interna marĝeno en la ĉeloj devas esti pozitiva nombro.","invalidCellSpacing":"La spaco inter la ĉeloj devas esti pozitiva nombro.","invalidCols":"La nombro de la kolumnoj devas superi 0.","invalidHeight":"La tabelalto devas esti nombro.","invalidRows":"La nombro de la linioj devas superi 0.","invalidWidth":"La tabellarĝo devas esti nombro.","menu":"Atributoj de Tabelo","row":{"menu":"Linio","insertBefore":"Enmeti linion antaŭ","insertAfter":"Enmeti linion post","deleteRow":"Forigi Liniojn"},"rows":"Linioj","summary":"Resumo","title":"Atributoj de Tabelo","toolbar":"Tabelo","widthPc":"elcentoj","widthPx":"Rastrumeroj","widthUnit":"unuo de larĝo"},"quicktable":{"more":"Pli..."},"removeformat":{"toolbar":"Forigi Formaton"},"sourcearea":{"toolbar":"Fonto"},"toolbar":{"toolbarCollapse":"Faldi la ilbreton","toolbarExpand":"Malfaldi la ilbreton","toolbarGroups":{"document":"Dokumento","clipboard":"Poŝo/Malfari","editing":"Redaktado","forms":"Formularoj","basicstyles":"Bazaj stiloj","paragraph":"Paragrafo","links":"Ligiloj","insert":"Enmeti","styles":"Stiloj","colors":"Koloroj","tools":"Iloj"},"toolbars":"Ilobretoj de la redaktilo"},"undo":{"redo":"Refari","undo":"Malfari"},"colordialog":{"clear":"Forigi","highlight":"Detaloj","options":"Opcioj pri koloroj","selected":"Selektita koloro","title":"Selekti koloron"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/es.js b/plugins/ckeditor/src/lang/es.js
deleted file mode 100644
index 26f06b837..000000000
--- a/plugins/ckeditor/src/lang/es.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['es']={"editor":"Editor de texto enriquecido","editorPanel":"Panel del Editor de Texto Enriquecido","common":{"editorHelp":"Pulse ALT 0 para ayuda","browseServer":"Ver Servidor","url":"URL","protocol":"Protocolo","upload":"Cargar","uploadSubmit":"Enviar al Servidor","image":"Imagen","flash":"Flash","form":"Formulario","checkbox":"Casilla de Verificación","radio":"Botones de Radio","textField":"Campo de Texto","textarea":"Area de Texto","hiddenField":"Campo Oculto","button":"Botón","select":"Campo de Selección","imageButton":"Botón Imagen","notSet":"<No definido>","id":"Id","name":"Nombre","langDir":"Orientación","langDirLtr":"Izquierda a Derecha (LTR)","langDirRtl":"Derecha a Izquierda (RTL)","langCode":"Cód. de idioma","longDescr":"Descripción larga URL","cssClass":"Clases de hojas de estilo","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Cerrar","preview":"Previsualización","resize":"Arrastre para redimensionar","generalTab":"General","advancedTab":"Avanzado","validateNumberFailed":"El valor no es un número.","confirmNewPage":"Cualquier cambio que no se haya guardado se perderá.\r\n¿Está seguro de querer crear una nueva página?","confirmCancel":"Algunas de las opciones se han cambiado.\r\n¿Está seguro de querer cerrar el diálogo?","options":"Opciones","target":"Destino","targetNew":"Nueva ventana (_blank)","targetTop":"Ventana principal (_top)","targetSelf":"Misma ventana (_self)","targetParent":"Ventana padre (_parent)","langDirLTR":"Izquierda a derecha (LTR)","langDirRTL":"Derecha a izquierda (RTL)","styles":"Estilos","cssClasses":"Clase de la hoja de estilos","width":"Anchura","height":"Altura","align":"Alineación","alignLeft":"Izquierda","alignRight":"Derecha","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Tope","alignMiddle":"Centro","alignBottom":"Pie","alignNone":"Ninguno","invalidValue":"Valor no válido","invalidHeight":"Altura debe ser un número.","invalidWidth":"Anchura debe ser un número.","invalidCssLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"El valor especificado para el campo \"%1\" debe ser un número positivo, incluyendo optionalmente una unidad de medida HTML válida (px o %).","invalidInlineStyle":"El valor especificado para el estilo debe consistir en uno o más pares con el formato \"nombre: valor\", separados por punto y coma.","cssLengthTooltip":"Introduca un número para el valor en pixels o un número con una unidad de medida CSS válida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, no disponible</span>","keyboard":{"8":"Retroceso","13":"Ingresar","16":"Mayús.","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Suprimir","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Todos los derechos reservados.","dlgTitle":"Acerca de CKEditor","help":"Lea la  $1 para resolver sus dudas.","moreInfo":"Para información de licencia, por favor visite nuestro sitio web:","title":"Acerca de CKEditor","userGuide":"Guía de usuario de CKEditor"},"clipboard":{"copy":"Copiar","copyError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de copiado.\r\nPor favor use el teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"La configuración de seguridad de este navegador no permite la ejecución automática de operaciones de cortado.\r\nPor favor use el teclado (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Por favor pegue dentro del cuadro utilizando el teclado (<STRONG>Ctrl/Cmd+V</STRONG>);\r\nluego presione <STRONG>Aceptar</STRONG>.","securityMsg":"Debido a la configuración de seguridad de su navegador, el editor no tiene acceso al portapapeles.\r\nEs necesario que lo pegue de nuevo en esta ventana.","title":"Pegar"},"base64image":{"alt":"Texto Alternativo","lockRatio":"Proporcional","vSpace":"Esp.Vert","hSpace":"Esp.Horiz","border":"Borde"},"basicstyles":{"bold":"Negrita","italic":"Cursiva","strike":"Tachado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subrayado"},"bidi":{"ltr":"Dirección del texto de izquierda a derecha","rtl":"Dirección del texto de derecha a izquierda"},"blockquote":{"toolbar":"Cita"},"button":{"selectedLabel":"%1 (Seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Color de Fondo","colors":{"000":"Negro","800000":"Marrón oscuro","8B4513":"Marrón tierra","2F4F4F":"Pizarra Oscuro","008080":"Azul verdoso","000080":"Azul marino","4B0082":"Añil","696969":"Gris oscuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Oro oscuro","006400":"Verde oscuro","40E0D0":"Turquesa","0000CD":"Azul medio-oscuro","800080":"Púrpura","808080":"Gris","F00":"Rojo","FF8C00":"Naranja oscuro","FFD700":"Oro","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Naranja","FFFF00":"Amarillo","00FF00":"Lima","AFEEEE":"Turquesa claro","ADD8E6":"Azul claro","DDA0DD":"Violeta claro","D3D3D3":"Gris claro","FFF0F5":"Lavanda rojizo","FAEBD7":"Blanco antiguo","FFFFE0":"Amarillo claro","F0FFF0":"Miel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Blanco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Más Colores...","panelTitle":"Colores","textColorTitle":"Color de Texto"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño de fuente","panelTitle":"Tamaño"},"label":"Fuente","panelTitle":"Fuente","voiceLabel":"Fuente"},"image":{"alt":"Texto Alternativo","border":"Borde","btnUpload":"Enviar al Servidor","button2Img":"¿Desea convertir el botón de imagen en una simple imagen?","hSpace":"Esp.Horiz","img2Button":"¿Desea convertir la imagen en un botón de imagen?","infoTab":"Información de Imagen","linkTab":"Vínculo","lockRatio":"Proporcional","menu":"Propiedades de Imagen","resetSize":"Tamaño Original","title":"Propiedades de Imagen","titleButton":"Propiedades de Botón de Imagen","upload":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","vSpace":"Esp.Vert","validateBorder":"El borde debe ser un número.","validateHSpace":"El espaciado horizontal debe ser un número.","validateVSpace":"El espaciado vertical debe ser un número."},"widget":{"move":"Dar clic y arrastrar para mover","label":"reproductor %1"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar al Servidor","captioned":"Imagen subtitulada","captionPlaceholder":"Leyenda","infoTab":"Información de Imagen","lockRatio":"Proporcional","menu":"Propiedades de Imagen","pathName":"image","pathNameCaption":"subtítulo","resetSize":"Tamaño Original","resizer":"Dar clic y arrastrar para cambiar tamaño","title":"Propiedades de Imagen","uploadTab":"Cargar","urlMissing":"Debe indicar la URL de la imagen.","altMissing":"Alternative text is missing."},"indent":{"indent":"Aumentar Sangría","outdent":"Disminuir Sangría"},"fakeobjects":{"anchor":"Ancla","flash":"Animación flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconocido"},"link":{"acccessKey":"Tecla de Acceso","advanced":"Avanzado","advisoryContentType":"Tipo de Contenido","advisoryTitle":"Título","anchor":{"toolbar":"Referencia","menu":"Propiedades de Referencia","title":"Propiedades de Referencia","name":"Nombre de la Referencia","errorName":"Por favor, complete el nombre de la Referencia","remove":"Quitar Referencia"},"anchorId":"Por ID de elemento","anchorName":"Por Nombre de Referencia","charset":"Fuente de caracteres vinculado","cssClasses":"Clases de hojas de estilo","download":"Force Download","displayText":"Display Text","emailAddress":"Dirección de E-Mail","emailBody":"Cuerpo del Mensaje","emailSubject":"Título del Mensaje","id":"Id","info":"Información de Vínculo","langCode":"Código idioma","langDir":"Orientación","langDirLTR":"Izquierda a Derecha (LTR)","langDirRTL":"Derecha a Izquierda (RTL)","menu":"Editar Vínculo","name":"Nombre","noAnchors":"(No hay referencias disponibles en el documento)","noEmail":"Por favor escriba la dirección de e-mail","noUrl":"Por favor escriba el vínculo URL","other":"<otro>","popupDependent":"Dependiente (Netscape)","popupFeatures":"Características de Ventana Emergente","popupFullScreen":"Pantalla Completa (IE)","popupLeft":"Posición Izquierda","popupLocationBar":"Barra de ubicación","popupMenuBar":"Barra de Menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desplazamiento","popupStatusBar":"Barra de Estado","popupToolbar":"Barra de Herramientas","popupTop":"Posición Derecha","rel":"Relación","selectAnchor":"Seleccionar una referencia","styles":"Estilo","tabIndex":"Indice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nombre del Marco Destino","targetPopup":"<ventana emergente>","targetPopupName":"Nombre de Ventana Emergente","title":"Vínculo","toAnchor":"Referencia en esta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Insertar/Editar Vínculo","type":"Tipo de vínculo","unlink":"Eliminar Vínculo","upload":"Cargar"},"list":{"bulletedlist":"Viñetas","numberedlist":"Numeración"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"table":{"border":"Tamaño de Borde","caption":"Título","cell":{"menu":"Celda","insertBefore":"Insertar celda a la izquierda","insertAfter":"Insertar celda a la derecha","deleteCell":"Eliminar Celdas","merge":"Combinar Celdas","mergeRight":"Combinar a la derecha","mergeDown":"Combinar hacia abajo","splitHorizontal":"Dividir la celda horizontalmente","splitVertical":"Dividir la celda verticalmente","title":"Propiedades de celda","cellType":"Tipo de Celda","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Ajustar al contenido","hAlign":"Alineación Horizontal","vAlign":"Alineación Vertical","alignBaseline":"Linea de base","bgColor":"Color de fondo","borderColor":"Color de borde","data":"Datos","header":"Encabezado","yes":"Sí","no":"No","invalidWidth":"La anchura de celda debe ser un número.","invalidHeight":"La altura de celda debe ser un número.","invalidRowSpan":"La expansión de filas debe ser un número entero.","invalidColSpan":"La expansión de columnas debe ser un número entero.","chooseColor":"Elegir"},"cellPad":"Esp. interior","cellSpace":"Esp. e/celdas","column":{"menu":"Columna","insertBefore":"Insertar columna a la izquierda","insertAfter":"Insertar columna a la derecha","deleteColumn":"Eliminar Columnas"},"columns":"Columnas","deleteTable":"Eliminar Tabla","headers":"Encabezados","headersBoth":"Ambas","headersColumn":"Primera columna","headersNone":"Ninguno","headersRow":"Primera fila","invalidBorder":"El tamaño del borde debe ser un número.","invalidCellPadding":"El espaciado interior debe ser un número.","invalidCellSpacing":"El espaciado entre celdas debe ser un número.","invalidCols":"El número de columnas debe ser un número mayor que 0.","invalidHeight":"La altura de tabla debe ser un número.","invalidRows":"El número de filas debe ser un número mayor que 0.","invalidWidth":"La anchura de tabla debe ser un número.","menu":"Propiedades de Tabla","row":{"menu":"Fila","insertBefore":"Insertar fila en la parte superior","insertAfter":"Insertar fila en la parte inferior","deleteRow":"Eliminar Filas"},"rows":"Filas","summary":"Síntesis","title":"Propiedades de Tabla","toolbar":"Tabla","widthPc":"porcentaje","widthPx":"pixeles","widthUnit":"unidad de la anchura"},"quicktable":{"more":"Más..."},"removeformat":{"toolbar":"Eliminar Formato"},"sourcearea":{"toolbar":"Fuente HTML"},"toolbar":{"toolbarCollapse":"Contraer barra de herramientas","toolbarExpand":"Expandir barra de herramientas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeles/Deshacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Párrafo","links":"Enlaces","insert":"Insertar","styles":"Estilos","colors":"Colores","tools":"Herramientas"},"toolbars":"Barras de herramientas del editor"},"undo":{"redo":"Rehacer","undo":"Deshacer"},"colordialog":{"clear":"Borrar","highlight":"Muestra","options":"Opciones de colores","selected":"Elegido","title":"Elegir color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/et.js b/plugins/ckeditor/src/lang/et.js
deleted file mode 100644
index 542d48a87..000000000
--- a/plugins/ckeditor/src/lang/et.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['et']={"editor":"Rikkalik tekstiredaktor","editorPanel":"Rikkaliku tekstiredaktori paneel","common":{"editorHelp":"Abi saamiseks vajuta ALT 0","browseServer":"Serveri sirvimine","url":"URL","protocol":"Protokoll","upload":"Laadi üles","uploadSubmit":"Saada serverisse","image":"Pilt","flash":"Flash","form":"Vorm","checkbox":"Märkeruut","radio":"Raadionupp","textField":"Tekstilahter","textarea":"Tekstiala","hiddenField":"Varjatud lahter","button":"Nupp","select":"Valiklahter","imageButton":"Piltnupp","notSet":"<määramata>","id":"ID","name":"Nimi","langDir":"Keele suund","langDirLtr":"Vasakult paremale (LTR)","langDirRtl":"Paremalt vasakule (RTL)","langCode":"Keele kood","longDescr":"Pikk kirjeldus URL","cssClass":"Stiilistiku klassid","advisoryTitle":"Soovituslik pealkiri","cssStyle":"Laad","ok":"Olgu","cancel":"Loobu","close":"Sulge","preview":"Eelvaade","resize":"Suuruse muutmiseks lohista","generalTab":"Üldine","advancedTab":"Täpsemalt","validateNumberFailed":"See väärtus pole number.","confirmNewPage":"Kõik salvestamata muudatused lähevad kaotsi. Kas oled kindel, et tahad laadida uue lehe?","confirmCancel":"Mõned valikud on muudetud. Kas oled kindel, et tahad dialoogi sulgeda?","options":"Valikud","target":"Sihtkoht","targetNew":"Uus aken (_blank)","targetTop":"Kõige ülemine aken (_top)","targetSelf":"Sama aken (_self)","targetParent":"Vanemaken (_parent)","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","styles":"Stiili","cssClasses":"Stiililehe klassid","width":"Laius","height":"Kõrgus","align":"Joondus","alignLeft":"Vasak","alignRight":"Paremale","alignCenter":"Kesk","alignJustify":"Rööpjoondus","alignTop":"Üles","alignMiddle":"Keskele","alignBottom":"Alla","alignNone":"None","invalidValue":"Vigane väärtus.","invalidHeight":"Kõrgus peab olema number.","invalidWidth":"Laius peab olema number.","invalidCssLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv CSS ühikuga (px, %, in, cm, mm, em, ex, pt või pc) või ilma.","invalidHtmlLength":"\"%1\" välja jaoks määratud väärtus peab olema positiivne täisarv HTML ühikuga (px või %) või ilma.","invalidInlineStyle":"Reasisese stiili määrangud peavad koosnema paarisväärtustest (tuples), mis on semikoolonitega eraldatult järgnevas vormingus: \"nimi : väärtus\".","cssLengthTooltip":"Sisesta väärtus pikslites või number koos sobiva CSS-i ühikuga (px, %, in, cm, mm, em, ex, pt või pc).","unavailable":"%1<span class=\"cke_accessibility\">, pole saadaval</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Kõik õigused kaitstud.","dlgTitle":"CKEditorist","help":"Abi jaoks vaata $1.","moreInfo":"Litsentsi andmed leiab meie veebilehelt:","title":"CKEditorist","userGuide":"CKEditori kasutusjuhendit"},"clipboard":{"copy":"Kopeeri","copyError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt kopeerida. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+C).","cut":"Lõika","cutError":"Sinu veebisirvija turvaseaded ei luba redaktoril automaatselt lõigata. Palun kasutage selleks klaviatuuri klahvikombinatsiooni (Ctrl/Cmd+X).","paste":"Aseta","pasteArea":"Asetamise ala","pasteMsg":"Palun aseta tekst järgnevasse kasti kasutades klaviatuuri klahvikombinatsiooni (<STRONG>Ctrl/Cmd+V</STRONG>) ja vajuta seejärel <STRONG>OK</STRONG>.","securityMsg":"Sinu veebisirvija turvaseadete tõttu ei oma redaktor otsest ligipääsu lõikelaua andmetele. Sa pead asetama need uuesti siia aknasse.","title":"Asetamine"},"base64image":{"alt":"Alternatiivne tekst","lockRatio":"Lukusta kuvasuhe","vSpace":"V. vaheruum","hSpace":"H. vaheruum","border":"Joon"},"basicstyles":{"bold":"Paks","italic":"Kursiiv","strike":"Läbijoonitud","subscript":"Allindeks","superscript":"Ülaindeks","underline":"Allajoonitud"},"bidi":{"ltr":"Teksti suund vasakult paremale","rtl":"Teksti suund paremalt vasakule"},"blockquote":{"toolbar":"Blokktsitaat"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automaatne","bgColorTitle":"Tausta värv","colors":{"000":"Must","800000":"Kastanpruun","8B4513":"Sadulapruun","2F4F4F":"Tume paehall","008080":"Sinakasroheline","000080":"Meresinine","4B0082":"Indigosinine","696969":"Tumehall","B22222":"Šamottkivi","A52A2A":"Pruun","DAA520":"Kuldkollane","006400":"Tumeroheline","40E0D0":"Türkiissinine","0000CD":"Keskmine sinine","800080":"Lilla","808080":"Hall","F00":"Punanae","FF8C00":"Tumeoranž","FFD700":"Kuldne","008000":"Roheline","0FF":"Tsüaniidsinine","00F":"Sinine","EE82EE":"Violetne","A9A9A9":"Tuhm hall","FFA07A":"Hele lõhe","FFA500":"Oranž","FFFF00":"Kollane","00FF00":"Lubja hall","AFEEEE":"Kahvatu türkiis","ADD8E6":"Helesinine","DDA0DD":"Ploomililla","D3D3D3":"Helehall","FFF0F5":"Lavendlipunane","FAEBD7":"Antiikvalge","FFFFE0":"Helekollane","F0FFF0":"Meloniroheline","F0FFFF":"Taevasinine","F0F8FF":"Beebisinine","E6E6FA":"Lavendel","FFF":"Valge","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Rohkem värve...","panelTitle":"Värvid","textColorTitle":"Teksti värv"},"font":{"fontSize":{"label":"Suurus","voiceLabel":"Kirja suurus","panelTitle":"Suurus"},"label":"Kiri","panelTitle":"Kiri","voiceLabel":"Kiri"},"image":{"alt":"Alternatiivne tekst","border":"Joon","btnUpload":"Saada serverisse","button2Img":"Kas tahad teisendada valitud pildiga nupu tavaliseks pildiks?","hSpace":"H. vaheruum","img2Button":"Kas tahad teisendada valitud tavalise pildi pildiga nupuks?","infoTab":"Pildi info","linkTab":"Link","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","resetSize":"Lähtesta suurus","title":"Pildi omadused","titleButton":"Piltnupu omadused","upload":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","vSpace":"V. vaheruum","validateBorder":"Äärise laius peab olema täisarv.","validateHSpace":"Horisontaalne vaheruum peab olema täisarv.","validateVSpace":"Vertikaalne vaheruum peab olema täisarv."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternatiivne tekst","btnUpload":"Saada serverisse","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Pildi info","lockRatio":"Lukusta kuvasuhe","menu":"Pildi omadused","pathName":"image","pathNameCaption":"caption","resetSize":"Lähtesta suurus","resizer":"Click and drag to resize","title":"Pildi omadused","uploadTab":"Lae üles","urlMissing":"Pildi lähte-URL on puudu.","altMissing":"Alternative text is missing."},"indent":{"indent":"Taande suurendamine","outdent":"Taande vähendamine"},"fakeobjects":{"anchor":"Ankur","flash":"Flashi animatsioon","hiddenfield":"Varjatud väli","iframe":"IFrame","unknown":"Tundmatu objekt"},"link":{"acccessKey":"Juurdepääsu võti","advanced":"Täpsemalt","advisoryContentType":"Juhendava sisu tüüp","advisoryTitle":"Juhendav tiitel","anchor":{"toolbar":"Ankru sisestamine/muutmine","menu":"Ankru omadused","title":"Ankru omadused","name":"Ankru nimi","errorName":"Palun sisesta ankru nimi","remove":"Eemalda ankur"},"anchorId":"Elemendi id järgi","anchorName":"Ankru nime järgi","charset":"Lingitud ressursi märgistik","cssClasses":"Stiilistiku klassid","download":"Force Download","displayText":"Display Text","emailAddress":"E-posti aadress","emailBody":"Sõnumi tekst","emailSubject":"Sõnumi teema","id":"ID","info":"Lingi info","langCode":"Keele suund","langDir":"Keele suund","langDirLTR":"Vasakult paremale (LTR)","langDirRTL":"Paremalt vasakule (RTL)","menu":"Muuda linki","name":"Nimi","noAnchors":"(Selles dokumendis pole ankruid)","noEmail":"Palun kirjuta e-posti aadress","noUrl":"Palun kirjuta lingi URL","other":"<muu>","popupDependent":"Sõltuv (Netscape)","popupFeatures":"Hüpikakna omadused","popupFullScreen":"Täisekraan (IE)","popupLeft":"Vasak asukoht","popupLocationBar":"Aadressiriba","popupMenuBar":"Menüüriba","popupResizable":"Suurust saab muuta","popupScrollBars":"Kerimisribad","popupStatusBar":"Olekuriba","popupToolbar":"Tööriistariba","popupTop":"Ülemine asukoht","rel":"Suhe","selectAnchor":"Vali ankur","styles":"Laad","tabIndex":"Tab indeks","target":"Sihtkoht","targetFrame":"<raam>","targetFrameName":"Sihtmärk raami nimi","targetPopup":"<hüpikaken>","targetPopupName":"Hüpikakna nimi","title":"Link","toAnchor":"Ankur sellel lehel","toEmail":"E-post","toUrl":"URL","toolbar":"Lingi lisamine/muutmine","type":"Lingi liik","unlink":"Lingi eemaldamine","upload":"Lae üles"},"list":{"bulletedlist":"Punktloend","numberedlist":"Numberloend"},"maximize":{"maximize":"Maksimeerimine","minimize":"Minimeerimine"},"table":{"border":"Joone suurus","caption":"Tabeli tiitel","cell":{"menu":"Lahter","insertBefore":"Sisesta lahter enne","insertAfter":"Sisesta lahter peale","deleteCell":"Eemalda lahtrid","merge":"Ühenda lahtrid","mergeRight":"Ühenda paremale","mergeDown":"Ühenda alla","splitHorizontal":"Poolita lahter horisontaalselt","splitVertical":"Poolita lahter vertikaalselt","title":"Lahtri omadused","cellType":"Lahtri liik","rowSpan":"Ridade vahe","colSpan":"Tulpade vahe","wordWrap":"Sõnade murdmine","hAlign":"Horisontaalne joondus","vAlign":"Vertikaalne joondus","alignBaseline":"Baasjoon","bgColor":"Tausta värv","borderColor":"Äärise värv","data":"Andmed","header":"Päis","yes":"Jah","no":"Ei","invalidWidth":"Lahtri laius peab olema number.","invalidHeight":"Lahtri kõrgus peab olema number.","invalidRowSpan":"Ridade vahe peab olema täisarv.","invalidColSpan":"Tulpade vahe peab olema täisarv.","chooseColor":"Vali"},"cellPad":"Lahtri täidis","cellSpace":"Lahtri vahe","column":{"menu":"Veerg","insertBefore":"Sisesta veerg enne","insertAfter":"Sisesta veerg peale","deleteColumn":"Eemalda veerud"},"columns":"Veerud","deleteTable":"Kustuta tabel","headers":"Päised","headersBoth":"Mõlemad","headersColumn":"Esimene tulp","headersNone":"Puudub","headersRow":"Esimene rida","invalidBorder":"Äärise suurus peab olema number.","invalidCellPadding":"Lahtrite polsterdus (padding) peab olema positiivne arv.","invalidCellSpacing":"Lahtrite vahe peab olema positiivne arv.","invalidCols":"Tulpade arv peab olema nullist suurem.","invalidHeight":"Tabeli kõrgus peab olema number.","invalidRows":"Ridade arv peab olema nullist suurem.","invalidWidth":"Tabeli laius peab olema number.","menu":"Tabeli omadused","row":{"menu":"Rida","insertBefore":"Sisesta rida enne","insertAfter":"Sisesta rida peale","deleteRow":"Eemalda read"},"rows":"Read","summary":"Kokkuvõte","title":"Tabeli omadused","toolbar":"Tabel","widthPc":"protsenti","widthPx":"pikslit","widthUnit":"laiuse ühik"},"quicktable":{"more":"Rohkem..."},"removeformat":{"toolbar":"Vormingu eemaldamine"},"sourcearea":{"toolbar":"Lähtekood"},"toolbar":{"toolbarCollapse":"Tööriistariba peitmine","toolbarExpand":"Tööriistariba näitamine","toolbarGroups":{"document":"Dokument","clipboard":"Lõikelaud/tagasivõtmine","editing":"Muutmine","forms":"Vormid","basicstyles":"Põhistiilid","paragraph":"Lõik","links":"Lingid","insert":"Sisesta","styles":"Stiilid","colors":"Värvid","tools":"Tööriistad"},"toolbars":"Redaktori tööriistaribad"},"undo":{"redo":"Toimingu kordamine","undo":"Tagasivõtmine"},"colordialog":{"clear":"Eemalda","highlight":"Näidis","options":"Värvi valikud","selected":"Valitud värv","title":"Värvi valimine"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/eu.js b/plugins/ckeditor/src/lang/eu.js
deleted file mode 100644
index 593731458..000000000
--- a/plugins/ckeditor/src/lang/eu.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['eu']={"editor":"Testu aberastuaren editorea","editorPanel":"Testu aberastuaren editorearen panela","common":{"editorHelp":"Sakatu ALT 0 laguntza jasotzeko","browseServer":"Arakatu zerbitzaria","url":"URLa","protocol":"Protokoloa","upload":"Kargatu","uploadSubmit":"Bidali zerbitzarira","image":"Irudia","flash":"Flash","form":"Formularioa","checkbox":"Kontrol-laukia","radio":"Aukera-botoia","textField":"Testu-eremua","textarea":"Testu-area","hiddenField":"Ezkutuko eremua","button":"Botoia","select":"Hautespen-eremua","imageButton":"Irudi-botoia","notSet":"<ezarri gabe>","id":"Id","name":"Izena","langDir":"Hizkuntzaren norabidea","langDirLtr":"Ezkerretik eskuinera (LTR)","langDirRtl":"Eskuinetik ezkerrera (RTL)","langCode":"Hizkuntzaren kodea","longDescr":"URLaren deskribapen luzea","cssClass":"Estilo-orriko klaseak","advisoryTitle":"Aholkatutako izenburua","cssStyle":"Estiloa","ok":"Ados","cancel":"Utzi","close":"Itxi","preview":"Aurrebista","resize":"Aldatu tamainaz","generalTab":"Orokorra","advancedTab":"Aurreratua","validateNumberFailed":"Balio hau ez da zenbaki bat.","confirmNewPage":"Eduki honetan gorde gabe dauden aldaketak galduko dira. Ziur zaude orri berri bat kargatu nahi duzula?","confirmCancel":"Aukera batzuk aldatu dituzu. Ziur zaude elkarrizketa-koadroa itxi nahi duzula?","options":"Aukerak","target":"Helburua","targetNew":"Leiho berria (_blank)","targetTop":"Goieneko leihoan (_top)","targetSelf":"Leiho berean (_self)","targetParent":"Leiho gurasoan (_parent)","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","styles":"Estiloa","cssClasses":"Estilo-orriko klaseak","width":"Zabalera","height":"Altuera","align":"Lerrokatzea","alignLeft":"Ezkerrean","alignRight":"Eskuinean","alignCenter":"Erdian","alignJustify":"Justifikatu","alignTop":"Goian","alignMiddle":"Erdian","alignBottom":"Behean","alignNone":"Bat ere ez","invalidValue":"Balio desegokia.","invalidHeight":"Altuera zenbaki bat izan behar da.","invalidWidth":"Zabalera zenbaki bat izan behar da.","invalidCssLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, CSS neurri unitate batekin edo gabe (px, %, in, cm, mm, em, ex, pt edo pc).","invalidHtmlLength":"\"%1\" eremurako zehaztutako balioak zenbaki positibo bat izan behar du, HTML neurri unitate batekin edo gabe (px edo %).","invalidInlineStyle":"Lineako estiloan zehaztutako balioak \"izen : balio\" formatuko tupla bat edo gehiago izan behar dira, komaz bereiztuak.","cssLengthTooltip":"Sartu zenbaki bat edo zenbaki bat baliozko CSS unitate batekin (px, %, in, cm, mm, em, ex, pt, edo pc).","unavailable":"%1<span class=\"cke_accessibility\">, erabilezina</span>","keyboard":{"8":"Backspace","13":"Sartu","16":"Maius","17":"Ktrl","18":"Alt","32":"Space","35":"Buka","36":"Etxea","46":"Ezabatu","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Eskubide guztiak erreserbaturik.","dlgTitle":"CKEditor-i buruz","help":"Begiratu $1 laguntzarako.","moreInfo":"Lizentziari buruzko informazioa gure webgunean:","title":"CKEditor-i buruz","userGuide":"CKEditor-en erabiltzaile-gida"},"clipboard":{"copy":"Kopiatu","copyError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki kopiatzea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+C).","cut":"Ebaki","cutError":"Zure web nabigatzailearen segurtasun ezarpenek ez dute baimentzen testuak automatikoki moztea. Mesedez teklatua erabil ezazu (Ctrl/Cmd+X).","paste":"Itsatsi","pasteArea":"Itsasteko area","pasteMsg":"Mesedez teklatua erabiliz (<strong>Ctrl/Cmd+V</strong>) ondorengo eremuan testua itsatsi eta sakatu <strong>Ados</strong>.","securityMsg":"Nabigatzailearen segurtasun ezarpenak direla eta, editoreak ezin du arbela zuzenean erabili. Leiho honetan berriro itsatsi behar duzu.","title":"Itsatsi"},"base64image":{"alt":"Ordezko Testua","lockRatio":"Erlazioa Blokeatu","vSpace":"VSpace","hSpace":"HSpace","border":"Ertza"},"basicstyles":{"bold":"Lodia","italic":"Etzana","strike":"Marratua","subscript":"Azpi-indizea","superscript":"Goi-indizea","underline":"Azpimarratu"},"bidi":{"ltr":"Testuaren norantza ezkerretik eskuinera","rtl":"Testuaren norantza eskuinetik ezkerrera"},"blockquote":{"toolbar":"Aipamen blokea"},"button":{"selectedLabel":"%1 (hautatuta)"},"colorbutton":{"auto":"Automatikoa","bgColorTitle":"Atzeko planoko kolorea","colors":{"000":"Beltza","800000":"Granatea","8B4513":"Zela marroia","2F4F4F":"Arbel gris iluna","008080":"Urdin berdexka","000080":"Urdin iluna","4B0082":"Indigoa","696969":"Gris iluna","B22222":"Adreilu erregogorra","A52A2A":"Marroia","DAA520":"Urrezko makila","006400":"Berde iluna","40E0D0":"Turkesa","0000CD":"Urdin ertaina","800080":"Morea","808080":"Grisa","F00":"Gorria","FF8C00":"Laranja iluna","FFD700":"Urrea","008000":"Berdea","0FF":"Ziana","00F":"Urdina","EE82EE":"Bioleta","A9A9A9":"Gris ahula","FFA07A":"Izokin-kolore argia","FFA500":"Laranja","FFFF00":"Horia","00FF00":"Lima","AFEEEE":"Turkesa argia","ADD8E6":"Urdin argia","DDA0DD":"Aran-kolorea","D3D3D3":"Gris argia","FFF0F5":"Izpiliku-gorrixka","FAEBD7":"Zuri zaharra","FFFFE0":"Hori argia","F0FFF0":"Ezti-ihintza","F0FFFF":"Zeru-urdina","F0F8FF":"Alizia urdina","E6E6FA":"Izpilikua","FFF":"Zuria","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Kolore gehiago...","panelTitle":"Koloreak","textColorTitle":"Testu-kolorea"},"font":{"fontSize":{"label":"Tamaina","voiceLabel":"Letra-tamaina","panelTitle":"Letra-tamaina"},"label":"Letra-tipoa","panelTitle":"Letra-tipoaren izena","voiceLabel":"Letra-tipoa"},"image":{"alt":"Ordezko testua","border":"Ertza","btnUpload":"Bidali zerbitzarira","button2Img":"Hautatutako irudi-botoia irudi arrunt bihurtu nahi duzu?","hSpace":"HSpace","img2Button":"Hautatutako irudia irudi-botoi bihurtu nahi duzu?","infoTab":"Irudiaren informazioa","linkTab":"Esteka","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","resetSize":"Berrezarri tamaina","title":"Irudiaren propietateak","titleButton":"Irudi-botoiaren propietateak","upload":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","vSpace":"VSpace","validateBorder":"Ertza zenbaki oso bat izan behar da.","validateHSpace":"HSpace zenbaki oso bat izan behar da.","validateVSpace":"VSpace zenbaki oso bat izan behar da."},"widget":{"move":"Klikatu eta arrastatu lekuz aldatzeko","label":"%1 widget"},"image2":{"alt":"Ordezko testua","btnUpload":"Bidali zerbitzarira","captioned":"Argazki oina","captionPlaceholder":"Argazki oina","infoTab":"Irudiaren informazioa","lockRatio":"Blokeatu erlazioa","menu":"Irudiaren propietateak","pathName":"Irudia","pathNameCaption":"Argazki oina","resetSize":"Berrezarri tamaina","resizer":"Klikatu eta arrastatu tamainaz aldatzeko","title":"Irudiaren propietateak","uploadTab":"Kargatu","urlMissing":"Irudiaren iturburuaren URLa falta da.","altMissing":"Alternative text is missing."},"indent":{"indent":"Handitu koska","outdent":"Txikitu koska"},"fakeobjects":{"anchor":"Aingura","flash":"Flash animazioa","hiddenfield":"Ezkutuko eremua","iframe":"IFrame-a","unknown":"Objektu ezezaguna"},"link":{"acccessKey":"Sarbide-tekla","advanced":"Aurreratua","advisoryContentType":"Aholkatutako eduki-mota","advisoryTitle":"Aholkatutako izenburua","anchor":{"toolbar":"Aingura","menu":"Editatu aingura","title":"Ainguraren propietateak","name":"Ainguraren izena","errorName":"Idatzi ainguraren izena","remove":"Kendu aingura"},"anchorId":"Elementuaren Id-aren arabera","anchorName":"Aingura-izenaren arabera","charset":"Estekatutako baliabide karaktere-jokoa","cssClasses":"Estilo-orriko klaseak","download":"Force Download","displayText":"Bistaratu testua","emailAddress":"E-posta helbidea","emailBody":"Mezuaren gorputza","emailSubject":"Mezuaren gaia","id":"Id","info":"Estekaren informazioa","langCode":"Hizkuntzaren kodea","langDir":"Hizkuntzaren norabidea","langDirLTR":"Ezkerretik eskuinera (LTR)","langDirRTL":"Eskuinetik ezkerrera (RTL)","menu":"Editatu esteka","name":"Izena","noAnchors":"(Ez dago aingurarik erabilgarri dokumentuan)","noEmail":"Mesedez idatzi e-posta helbidea","noUrl":"Mesedez idatzi estekaren URLa","other":"<bestelakoa>","popupDependent":"Menpekoa (Netscape)","popupFeatures":"Laster-leihoaren ezaugarriak","popupFullScreen":"Pantaila osoa (IE)","popupLeft":"Ezkerreko posizioa","popupLocationBar":"Kokaleku-barra","popupMenuBar":"Menu-barra","popupResizable":"Tamaina aldakorra","popupScrollBars":"Korritze-barrak","popupStatusBar":"Egoera-barra","popupToolbar":"Tresna-barra","popupTop":"Goiko posizioa","rel":"Erlazioa","selectAnchor":"Hautatu aingura","styles":"Estiloa","tabIndex":"Tabulazio indizea","target":"Helburua","targetFrame":"<frame>","targetFrameName":"Helburuko markoaren izena","targetPopup":"<laster-leihoa>","targetPopupName":"Laster-leihoaren izena","title":"Esteka","toAnchor":"Estekatu testuko aingurara","toEmail":"E-posta","toUrl":"URLa","toolbar":"Esteka","type":"Esteka-mota","unlink":"Kendu esteka","upload":"Kargatu"},"list":{"bulletedlist":"Buletdun Zerrenda","numberedlist":"Zenbakidun Zerrenda"},"maximize":{"maximize":"Maximizatu","minimize":"Minimizatu"},"table":{"border":"Ertzaren zabalera","caption":"Epigrafea","cell":{"menu":"Gelaxka","insertBefore":"Txertatu gelaxka aurretik","insertAfter":"Txertatu gelaxka ondoren","deleteCell":"Ezabatu gelaxkak","merge":"Batu gelaxkak","mergeRight":"Batu eskuinetara","mergeDown":"Batu behera","splitHorizontal":"Banatu gelaxka horizontalki","splitVertical":"Banatu gelaxka bertikalki","title":"Gelaxkaren propietateak","cellType":"Gelaxka-mota","rowSpan":"Errenkaden hedadura","colSpan":"Zutabeen hedadura","wordWrap":"Itzulbira","hAlign":"Lerrokatze horizontala","vAlign":"Lerrokatze bertikala","alignBaseline":"Oinarri-lerroan","bgColor":"Atzeko planoaren kolorea","borderColor":"Ertzaren kolorea","data":"Data","header":"Goiburua","yes":"Bai","no":"Ez","invalidWidth":"Gelaxkaren zabalera zenbaki bat izan behar da.","invalidHeight":"Gelaxkaren altuera zenbaki bat izan behar da.","invalidRowSpan":"Errenkaden hedadura zenbaki osoa izan behar da.","invalidColSpan":"Zutabeen hedadura zenbaki osoa izan behar da.","chooseColor":"Aukeratu"},"cellPad":"Gelaxken betegarria","cellSpace":"Gelaxka arteko tartea","column":{"menu":"Zutabea","insertBefore":"Txertatu zutabea aurretik","insertAfter":"Txertatu zutabea ondoren","deleteColumn":"Ezabatu zutabeak"},"columns":"Zutabeak","deleteTable":"Ezabatu taula","headers":"Goiburuak","headersBoth":"Biak","headersColumn":"Lehen zutabea","headersNone":"Bat ere ez","headersRow":"Lehen errenkada","invalidBorder":"Ertzaren tamaina zenbaki bat izan behar da.","invalidCellPadding":"Gelaxken betegarria zenbaki bat izan behar da.","invalidCellSpacing":"Gelaxka arteko tartea zenbaki bat izan behar da.","invalidCols":"Zutabe kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidHeight":"Taularen altuera zenbaki bat izan behar da.","invalidRows":"Errenkada kopurua 0 baino handiagoa den zenbakia izan behar da.","invalidWidth":"Taularen zabalera zenbaki bat izan behar da.","menu":"Taularen propietateak","row":{"menu":"Errenkada","insertBefore":"Txertatu errenkada aurretik","insertAfter":"Txertatu errenkada ondoren","deleteRow":"Ezabatu errenkadak"},"rows":"Errenkadak","summary":"Laburpena","title":"Taularen propietateak","toolbar":"Taula","widthPc":"ehuneko","widthPx":"pixel","widthUnit":"zabalera unitatea"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Kendu formatua"},"sourcearea":{"toolbar":"Iturburua"},"toolbar":{"toolbarCollapse":"Tolestu tresna-barra","toolbarExpand":"Zabaldu tresna-barra","toolbarGroups":{"document":"Dokumentua","clipboard":"Arbela/Desegin","editing":"Editatu","forms":"Formularioak","basicstyles":"Oinarrizko estiloak","paragraph":"Paragrafoa","links":"Estekak","insert":"Txertatu","styles":"Estiloak","colors":"Koloreak","tools":"Tresnak"},"toolbars":"Editorearen tresna-barrak"},"undo":{"redo":"Berregin","undo":"Desegin"},"colordialog":{"clear":"Garbitu","highlight":"Nabarmendu","options":"Kolore aukerak","selected":"Hautatutako kolorea","title":"Hautatu kolorea"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/fa.js b/plugins/ckeditor/src/lang/fa.js
deleted file mode 100644
index 65add35e9..000000000
--- a/plugins/ckeditor/src/lang/fa.js
+++ /dev/null
@@ -1,167 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['fa']={"editor":"ویرایش‌گر �
-تن غنی","editorPanel":"پنل ویرایشگر �
-تن غنی","common":{"editorHelp":"کلید Alt+0 را برای راهن�
-ایی بفشارید","browseServer":"فهرست​ن�
-ایی سرور","url":"URL","protocol":"قرارداد","upload":"بالاگذاری","uploadSubmit":"به سرور بفرست","image":"تصویر","flash":"فلش","form":"فر�
-","checkbox":"چک‌باکس","radio":"دک�
-ه‌ی رادیویی","textField":"فیلد �
-تنی","textarea":"ناحیهٴ �
-تنی","hiddenField":"فیلد پنهان","button":"دک�
-ه","select":"فیلد انتخاب چند گزینه​ای","imageButton":"دک�
-ه‌ی تصویری","notSet":"<تعیین‌نشده>","id":"شناسه","name":"نا�
-","langDir":"جهت زبان","langDirLtr":"چپ به راست","langDirRtl":"راست به چپ","langCode":"کد زبان","longDescr":"URL توصیف طولانی","cssClass":"کلاس​های شیوه​نا�
-ه (Stylesheet)","advisoryTitle":"عنوان ک�
-کی","cssStyle":"سبک","ok":"پذیرش","cancel":"انصراف","close":"بستن","preview":"پیش‌ن�
-ایش","resize":"تغییر اندازه","generalTab":"ع�
-و�
-ی","advancedTab":"پیش‌رفته","validateNumberFailed":"این �
-قدار یک عدد نیست.","confirmNewPage":"هر تغییر ایجاد شده​ی ذخیره نشده از بین خواهد رفت. آیا اط�
-ینان دارید که قصد بارگیری صفحه جدیدی را دارید؟","confirmCancel":"برخی از گزینه‌ها تغییر کرده‌اند. آیا واقعا قصد بستن این پنجره را دارید؟","options":"گزینه​ها","target":"�
-قصد","targetNew":"پنجره جدید","targetTop":"بالاترین پنجره","targetSelf":"ه�
-ان پنجره","targetParent":"پنجره والد","langDirLTR":"چپ به راست","langDirRTL":"راست به چپ","styles":"سبک","cssClasses":"کلاس‌های سبک‌نا�
-ه","width":"عرض","height":"طول","align":"چینش","alignLeft":"چپ","alignRight":"راست","alignCenter":"وسط","alignJustify":"بلوک چین","alignTop":"بالا","alignMiddle":"�
-یانه","alignBottom":"پائین","alignNone":"هیچ","invalidValue":"�
-قدار نا�
-عتبر.","invalidHeight":"ارتفاع باید یک عدد باشد.","invalidWidth":"عرض باید یک عدد باشد.","invalidCssLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد �
-ثبت با یا بدون یک واحد اندازه گیری CSS �
-عتبر باشد (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"عدد تعیین شده برای فیلد \"%1\" باید یک عدد �
-ثبت با یا بدون یک واحد اندازه گیری HTML �
-عتبر باشد (px or %).","invalidInlineStyle":"عدد تعیین شده برای سبک درون​خطی -Inline Style- باید دارای یک یا چند چندتایی با شکلی شبیه \"name : value\" که باید با یک \";\" از ه�
- جدا شوند.","cssLengthTooltip":"یک عدد برای یک �
-قدار بر حسب پیکسل و یا یک عدد با یک واحد CSS �
-عتبر وارد کنید (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">، غیر قابل دسترس</span>","keyboard":{"8":"عقبگرد","13":"ورود","16":"تعویض","17":"کنترل","18":"دگرساز","32":"Space","35":"پایان","36":"خانه","46":"حذف","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"حق نشر &copy; $1. کلیه حقوق �
-حفوظ است.","dlgTitle":"درباره CKEditor","help":" برای راهن�
-ایی $1 را �
-لاحظه کنید.","moreInfo":"برای کسب اطلاعات �
-جوز لطفا به وب سایت �
-ا �
-راجعه کنید:","title":"درباره CKEditor","userGuide":"راهن�
-ای کاربران CKEditor"},"clipboard":{"copy":"رونوشت","copyError":"تنظی�
-ات ا�
-نیتی �
-رورگر ش�
-ا اجازه ن�
-یدهد که ویرایشگر به طور خودکار ع�
-لکردهای کپی کردن را انجا�
- دهد. لطفا با دک�
-ههای صفحه کلید این کار را انجا�
- دهید (Ctrl/Cmd+C).","cut":"برش","cutError":"تنظی�
-ات ا�
-نیتی �
-رورگر ش�
-ا اجازه ن�
-یدهد که ویرایشگر به طور خودکار ع�
-لکردهای برش را انجا�
- دهد. لطفا با دک�
-ههای صفحه کلید این کار را انجا�
- دهید (Ctrl/Cmd+X).","paste":"چسباندن","pasteArea":"�
-حل چسباندن","pasteMsg":"لطفا �
-تن را با کلیدهای (<STRONG>Ctrl/Cmd+V</STRONG>) در این جعبهٴ �
-تنی بچسبانید و <STRONG>پذیرش</STRONG> را بزنید.","securityMsg":"به خاطر تنظی�
-ات ا�
-نیتی �
-رورگر ش�
-ا، ویرایشگر ن�
-یتواند دسترسی �
-ستقی�
- به دادههای clipboard داشته باشد. ش�
-ا باید دوباره آنرا در این پنجره بچسبانید.","title":"چسباندن"},"base64image":{"alt":"�
-تن جایگزین","lockRatio":"قفل کردن نسبت","vSpace":"فاصلهٴ ع�
-ودی","hSpace":"فاصلهٴ افقی","border":"لبه"},"basicstyles":{"bold":"درشت","italic":"خ�
-یده","strike":"خط‌خورده","subscript":"زیرنویس","superscript":"بالانویس","underline":"زیرخط‌دار"},"bidi":{"ltr":"جهت �
-تن از چپ به راست","rtl":"جهت �
-تن از راست به چپ"},"blockquote":{"toolbar":"بلوک نقل قول"},"button":{"selectedLabel":"%1 (انتخاب شده)"},"colorbutton":{"auto":"خودکار","bgColorTitle":"رنگ پس​ز�
-ینه","colors":{"000":"سیاه","800000":"خر�
-ایی","8B4513":"قهوه​ای شکلاتی","2F4F4F":"ارغوانی �
-ایل به خاکستری","008080":"آبی �
-ایل به خاکستری","000080":"آبی سیر","4B0082":"نیلی","696969":"خاکستری تیره","B22222":"آتش آجری","A52A2A":"قهوه​ای","DAA520":"�
-یله​ی طلایی","006400":"سبز تیره","40E0D0":"فیروزه​ای","0000CD":"آبی روشن","800080":"ارغوانی","808080":"خاکستری","F00":"قر�
-ز","FF8C00":"نارنجی پررنگ","FFD700":"طلایی","008000":"سبز","0FF":"آبی �
-ایل به سبز","00F":"آبی","EE82EE":"بنفش","A9A9A9":"خاکستری �
-ات","FFA07A":"صورتی کدر روشن","FFA500":"نارنجی","FFFF00":"زرد","00FF00":"فسفری","AFEEEE":"فیروزه​ای رنگ پریده","ADD8E6":"آبی ک�
-رنگ","DDA0DD":"آلویی","D3D3D3":"خاکستری روشن","FFF0F5":"بنفش ک�
-رنگ","FAEBD7":"عتیقه سفید","FFFFE0":"زرد روشن","F0FFF0":"عسلی","F0FFFF":"لاجوردی","F0F8FF":"آبی براق","E6E6FA":"بنفش ک�
-رنگ","FFF":"سفید","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"رنگ​های بیشتر...","panelTitle":"رنگها","textColorTitle":"رنگ �
-تن"},"font":{"fontSize":{"label":"اندازه","voiceLabel":"اندازه قل�
-","panelTitle":"اندازه قل�
-"},"label":"قل�
-","panelTitle":"نا�
- قل�
-","voiceLabel":"قل�
-"},"image":{"alt":"�
-تن جایگزین","border":"لبه","btnUpload":"به سرور بفرست","button2Img":"آیا �
-ایلید از یک تصویر ساده روی دک�
-ه تصویری انتخاب شده استفاده کنید؟","hSpace":"فاصلهٴ افقی","img2Button":"آیا �
-ایلید از یک دک�
-ه تصویری روی تصویر انتخاب شده استفاده کنید؟","infoTab":"اطلاعات تصویر","linkTab":"پیوند","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","resetSize":"بازنشانی اندازه","title":"ویژگی​های تصویر","titleButton":"ویژگی​های دک�
-هٴ تصویری","upload":"انتقال به سرور","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","vSpace":"فاصلهٴ ع�
-ودی","validateBorder":"�
-قدار خطوط باید یک عدد باشد.","validateHSpace":"�
-قدار فاصله گذاری افقی باید یک عدد باشد.","validateVSpace":"�
-قدار فاصله گذاری ع�
-ودی باید یک عدد باشد."},"widget":{"move":"کلیک و کشیدن برای جابجایی","label":"%1 widget"},"image2":{"alt":"�
-تن جایگزین","btnUpload":"به سرور بفرست","captioned":"تصویر زیرنویس شده","captionPlaceholder":"عنوان","infoTab":"اطلاعات تصویر","lockRatio":"قفل کردن نسبت","menu":"ویژگی​های تصویر","pathName":"تصویر","pathNameCaption":"عنوان","resetSize":"بازنشانی اندازه","resizer":"کلیک و کشیدن برای تغییر اندازه","title":"ویژگی​های تصویر","uploadTab":"بالاگذاری","urlMissing":"آدرس URL اصلی تصویر یافت نشد.","altMissing":"Alternative text is missing."},"indent":{"indent":"افزایش تورفتگی","outdent":"کاهش تورفتگی"},"fakeobjects":{"anchor":"لنگر","flash":"انی�
-شن فلش","hiddenfield":"فیلد پنهان","iframe":"IFrame","unknown":"شیء ناشناخته"},"link":{"acccessKey":"کلید دستیابی","advanced":"پیشرفته","advisoryContentType":"نوع �
-حتوای ک�
-کی","advisoryTitle":"عنوان ک�
-کی","anchor":{"toolbar":"گنجاندن/ویرایش لنگر","menu":"ویژگی​های لنگر","title":"ویژگی​های لنگر","name":"نا�
- لنگر","errorName":"لطفا نا�
- لنگر را بنویسید","remove":"حذف لنگر"},"anchorId":"با شناسهٴ ال�
-ان","anchorName":"با نا�
- لنگر","charset":"نویسه​گان �
-نبع پیوند شده","cssClasses":"کلاس​های شیوه​نا�
-ه(Stylesheet)","download":"Force Download","displayText":"Display Text","emailAddress":"نشانی پست الکترونیکی","emailBody":"�
-تن پیا�
-","emailSubject":"�
-وضوع پیا�
-","id":"شناسه","info":"اطلاعات پیوند","langCode":"جهت​ن�
-ای زبان","langDir":"جهت​ن�
-ای زبان","langDirLTR":"چپ به راست (LTR)","langDirRTL":"راست به چپ (RTL)","menu":"ویرایش پیوند","name":"نا�
-","noAnchors":"(در این سند لنگری دردسترس نیست)","noEmail":"لطفا نشانی پست الکترونیکی را بنویسید","noUrl":"لطفا URL پیوند را بنویسید","other":"<سایر>","popupDependent":"وابسته (Netscape)","popupFeatures":"ویژگی​های پنجرهٴ پاپاپ","popupFullScreen":"ت�
-ا�
- صفحه (IE)","popupLeft":"�
-وقعیت چپ","popupLocationBar":"نوار �
-وقعیت","popupMenuBar":"نوار �
-نو","popupResizable":"قابل تغییر اندازه","popupScrollBars":"�
-یله​های پی�
-ایش","popupStatusBar":"نوار وضعیت","popupToolbar":"نوار ابزار","popupTop":"�
-وقعیت بالا","rel":"وابستگی","selectAnchor":"یک لنگر برگزینید","styles":"شیوه (style)","tabIndex":"ن�
-ایهٴ دسترسی با برگه","target":"�
-قصد","targetFrame":"<فری�
->","targetFrameName":"نا�
- فری�
- �
-قصد","targetPopup":"<پنجرهٴ پاپاپ>","targetPopupName":"نا�
- پنجرهٴ پاپاپ","title":"پیوند","toAnchor":"لنگر در ه�
-ین صفحه","toEmail":"پست الکترونیکی","toUrl":"URL","toolbar":"گنجاندن/ویرایش پیوند","type":"نوع پیوند","unlink":"برداشتن پیوند","upload":"انتقال به سرور"},"list":{"bulletedlist":"فهرست نقطه​ای","numberedlist":"فهرست ش�
-اره​دار"},"maximize":{"maximize":"بیشنه کردن","minimize":"ک�
-ینه کردن"},"table":{"border":"اندازهٴ لبه","caption":"عنوان","cell":{"menu":"سلول","insertBefore":"افزودن سلول قبل از","insertAfter":"افزودن سلول بعد از","deleteCell":"حذف سلولها","merge":"ادغا�
- سلولها","mergeRight":"ادغا�
- به راست","mergeDown":"ادغا�
- به پایین","splitHorizontal":"جدا کردن افقی سلول","splitVertical":"جدا کردن ع�
-ودی سلول","title":"ویژگیهای سلول","cellType":"نوع سلول","rowSpan":"�
-حدوده ردیفها","colSpan":"�
-حدوده ستونها","wordWrap":"شکستن کل�
-ه","hAlign":"چینش افقی","vAlign":"چینش ع�
-ودی","alignBaseline":"خط �
-بنا","bgColor":"رنگ ز�
-ینه","borderColor":"رنگ خطوط","data":"اطلاعات","header":"سرنویس","yes":"بله","no":"خیر","invalidWidth":"عرض سلول باید یک عدد باشد.","invalidHeight":"ارتفاع سلول باید عدد باشد.","invalidRowSpan":"�
-قدار �
-حدوده ردیفها باید یک عدد باشد.","invalidColSpan":"�
-قدار �
-حدوده ستونها باید یک عدد باشد.","chooseColor":"انتخاب"},"cellPad":"فاصلهٴ پرشده در سلول","cellSpace":"فاصلهٴ �
-یان سلولها","column":{"menu":"ستون","insertBefore":"افزودن ستون قبل از","insertAfter":"افزودن ستون بعد از","deleteColumn":"حذف ستونها"},"columns":"ستونها","deleteTable":"پاک کردن جدول","headers":"سرنویسها","headersBoth":"هردو","headersColumn":"اولین ستون","headersNone":"هیچ","headersRow":"اولین ردیف","invalidBorder":"�
-قدار اندازه خطوط باید یک عدد باشد.","invalidCellPadding":"بالشتک سلول باید یک عدد باشد.","invalidCellSpacing":"�
-قدار فاصلهگذاری سلول باید یک عدد باشد.","invalidCols":"تعداد ستونها باید یک عدد بزرگتر از 0 باشد.","invalidHeight":"�
-قدار ارتفاع  جدول باید یک عدد باشد.","invalidRows":"تعداد ردیفها باید یک عدد بزرگتر از 0 باشد.","invalidWidth":"�
-قدار پهنای جدول باید یک عدد باشد.","menu":"ویژگیهای جدول","row":{"menu":"سطر","insertBefore":"افزودن سطر قبل از","insertAfter":"افزودن سطر بعد از","deleteRow":"حذف سطرها"},"rows":"سطرها","summary":"خلاصه","title":"ویژگیهای جدول","toolbar":"جدول","widthPc":"درصد","widthPx":"پیکسل","widthUnit":"واحد پهنا"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"برداشتن فر�
-ت"},"sourcearea":{"toolbar":"�
-نبع"},"toolbar":{"toolbarCollapse":"بستن نوار ابزار","toolbarExpand":"بازکردن نوار ابزار","toolbarGroups":{"document":"سند","clipboard":"حافظه �
-وقت/برگشت","editing":"در حال ویرایش","forms":"فر�
-​ها","basicstyles":"سبک‌های پایه","paragraph":"بند","links":"پیوندها","insert":"ورود","styles":"سبک‌ها","colors":"رنگ​ها","tools":"ابزارها"},"toolbars":"نوار ابزارهای ویرایش‌گر"},"undo":{"redo":"بازچیدن","undo":"واچیدن"},"colordialog":{"clear":"پاک کردن","highlight":"�
-ت�
-ایز","options":"گزینه​های رنگ","selected":"رنگ انتخاب شده","title":"انتخاب رنگ"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/fi.js b/plugins/ckeditor/src/lang/fi.js
deleted file mode 100644
index 8a400e930..000000000
--- a/plugins/ckeditor/src/lang/fi.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['fi']={"editor":"Rikastekstieditori","editorPanel":"Rikastekstieditoripaneeli","common":{"editorHelp":"Paina ALT 0 nähdäksesi ohjeen","browseServer":"Selaa palvelinta","url":"Osoite","protocol":"Protokolla","upload":"Lisää tiedosto","uploadSubmit":"Lähetä palvelimelle","image":"Kuva","flash":"Flash-animaatio","form":"Lomake","checkbox":"Valintaruutu","radio":"Radiopainike","textField":"Tekstikenttä","textarea":"Tekstilaatikko","hiddenField":"Piilokenttä","button":"Painike","select":"Valintakenttä","imageButton":"Kuvapainike","notSet":"<ei asetettu>","id":"Tunniste","name":"Nimi","langDir":"Kielen suunta","langDirLtr":"Vasemmalta oikealle (LTR)","langDirRtl":"Oikealta vasemmalle (RTL)","langCode":"Kielikoodi","longDescr":"Pitkän kuvauksen URL","cssClass":"Tyyliluokat","advisoryTitle":"Avustava otsikko","cssStyle":"Tyyli","ok":"OK","cancel":"Peruuta","close":"Sulje","preview":"Esikatselu","resize":"Raahaa muuttaaksesi kokoa","generalTab":"Yleinen","advancedTab":"Lisäominaisuudet","validateNumberFailed":"Arvon pitää olla numero.","confirmNewPage":"Kaikki tallentamattomat muutokset tähän sisältöön menetetään. Oletko varma, että haluat ladata uuden sivun?","confirmCancel":"Jotkut asetuksista on muuttuneet. Oletko varma, että haluat sulkea valintaikkunan?","options":"Asetukset","target":"Kohde","targetNew":"Uusi ikkuna (_blank)","targetTop":"Päällimmäinen ikkuna (_top)","targetSelf":"Sama ikkuna (_self)","targetParent":"Ylemmän tason ikkuna (_parent)","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","styles":"Tyyli","cssClasses":"Tyylitiedoston luokat","width":"Leveys","height":"Korkeus","align":"Kohdistus","alignLeft":"Vasemmalle","alignRight":"Oikealle","alignCenter":"Keskelle","alignJustify":"Tasaa molemmat reunat","alignTop":"Ylös","alignMiddle":"Keskelle","alignBottom":"Alas","alignNone":"Ei asetettu","invalidValue":"Virheellinen arvo.","invalidHeight":"Korkeuden täytyy olla numero.","invalidWidth":"Leveyden täytyy olla numero.","invalidCssLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku CSS mittayksikön (px, %, in, cm, mm, em, ex, pt tai pc) kanssa tai ilman.","invalidHtmlLength":"Kentän \"%1\" arvon täytyy olla positiivinen luku HTML mittayksikön (px tai %) kanssa tai ilman.","invalidInlineStyle":"Tyylille annetun arvon täytyy koostua yhdestä tai useammasta \"nimi : arvo\" parista, jotka ovat eroteltuna toisistaan puolipisteillä.","cssLengthTooltip":"Anna numeroarvo pikseleinä tai numeroarvo CSS mittayksikön kanssa (px, %, in, cm, mm, em, ex, pt, tai pc).","unavailable":"%1<span class=\"cke_accessibility\">, ei saatavissa</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Kaikki oikeuden pidätetään.","dlgTitle":"Tietoa CKEditorista","help":"Katso ohjeet: $1.","moreInfo":"Lisenssitiedot löytyvät kotisivuiltamme:","title":"Tietoa CKEditorista","userGuide":"CKEditorin käyttäjäopas"},"clipboard":{"copy":"Kopioi","copyError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa kopioimista. Käytä näppäimistöä kopioimiseen (Ctrl+C).","cut":"Leikkaa","cutError":"Selaimesi turva-asetukset eivät salli editorin toteuttaa leikkaamista. Käytä näppäimistöä leikkaamiseen (Ctrl+X).","paste":"Liitä","pasteArea":"Leikealue","pasteMsg":"Liitä painamalla (<STRONG>Ctrl+V</STRONG>) ja painamalla <STRONG>OK</STRONG>.","securityMsg":"Selaimesi turva-asetukset eivät salli editorin käyttää leikepöytää suoraan. Sinun pitää suorittaa liittäminen tässä ikkunassa.","title":"Liitä"},"base64image":{"alt":"Vaihtoehtoinen teksti","lockRatio":"Lukitse suhteet","vSpace":"Pystytila","hSpace":"Vaakatila","border":"Kehys"},"basicstyles":{"bold":"Lihavoitu","italic":"Kursivoitu","strike":"Yliviivattu","subscript":"Alaindeksi","superscript":"Yläindeksi","underline":"Alleviivattu"},"bidi":{"ltr":"Tekstin suunta vasemmalta oikealle","rtl":"Tekstin suunta oikealta vasemmalle"},"blockquote":{"toolbar":"Lainaus"},"button":{"selectedLabel":"%1 (Valittu)"},"colorbutton":{"auto":"Automaattinen","bgColorTitle":"Taustaväri","colors":{"000":"Musta","800000":"Kastanjanruskea","8B4513":"Satulanruskea","2F4F4F":"Tumma liuskekivenharmaa","008080":"Sinivihreä","000080":"Laivastonsininen","4B0082":"Indigonsininen","696969":"Tummanharmaa","B22222":"Tiili","A52A2A":"Ruskea","DAA520":"Kultapiisku","006400":"Tummanvihreä","40E0D0":"Turkoosi","0000CD":"Keskisininen","800080":"Purppura","808080":"Harmaa","F00":"Punainen","FF8C00":"Tumma oranssi","FFD700":"Kulta","008000":"Vihreä","0FF":"Syaani","00F":"Sininen","EE82EE":"Violetti","A9A9A9":"Tummanharmaa","FFA07A":"Vaaleanlohenpunainen","FFA500":"Oranssi","FFFF00":"Keltainen","00FF00":"Limetin vihreä","AFEEEE":"Haalea turkoosi","ADD8E6":"Vaaleansininen","DDA0DD":"Luumu","D3D3D3":"Vaaleanharmaa","FFF0F5":"Laventelinpunainen","FAEBD7":"Antiikinvalkoinen","FFFFE0":"Vaaleankeltainen","F0FFF0":"Hunajameloni","F0FFFF":"Asurinsininen","F0F8FF":"Alice Blue -sininen","E6E6FA":"Lavanteli","FFF":"Valkoinen","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Lisää värejä...","panelTitle":"Värit","textColorTitle":"Tekstiväri"},"font":{"fontSize":{"label":"Koko","voiceLabel":"Kirjaisimen koko","panelTitle":"Koko"},"label":"Kirjaisinlaji","panelTitle":"Kirjaisinlaji","voiceLabel":"Kirjaisinlaji"},"image":{"alt":"Vaihtoehtoinen teksti","border":"Kehys","btnUpload":"Lähetä palvelimelle","button2Img":"Haluatko muuntaa valitun kuvanäppäimen kuvaksi?","hSpace":"Vaakatila","img2Button":"Haluatko muuntaa valitun kuvan kuvanäppäimeksi?","infoTab":"Kuvan tiedot","linkTab":"Linkki","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","resetSize":"Alkuperäinen koko","title":"Kuvan ominaisuudet","titleButton":"Kuvapainikkeen ominaisuudet","upload":"Lisää kuva","urlMissing":"Kuvan lähdeosoite puuttuu.","vSpace":"Pystytila","validateBorder":"Kehyksen täytyy olla kokonaisluku.","validateHSpace":"HSpace-määrityksen täytyy olla kokonaisluku.","validateVSpace":"VSpace-määrityksen täytyy olla kokonaisluku."},"widget":{"move":"Siirrä klikkaamalla ja raahaamalla","label":"%1 widget"},"image2":{"alt":"Vaihtoehtoinen teksti","btnUpload":"Lähetä palvelimelle","captioned":"Kuva kuvatekstillä","captionPlaceholder":"Kuvateksti","infoTab":"Kuvan tiedot","lockRatio":"Lukitse suhteet","menu":"Kuvan ominaisuudet","pathName":"kuva","pathNameCaption":"kuvateksti","resetSize":"Alkuperäinen koko","resizer":"Klikkaa ja raahaa muuttaaksesi kokoa","title":"Kuvan ominaisuudet","uploadTab":"Lisää tiedosto","urlMissing":"Kuvan lähdeosoite puuttuu.","altMissing":"Alternative text is missing."},"indent":{"indent":"Suurenna sisennystä","outdent":"Pienennä sisennystä"},"fakeobjects":{"anchor":"Ankkuri","flash":"Flash animaatio","hiddenfield":"Piilokenttä","iframe":"IFrame-kehys","unknown":"Tuntematon objekti"},"link":{"acccessKey":"Pikanäppäin","advanced":"Lisäominaisuudet","advisoryContentType":"Avustava sisällön tyyppi","advisoryTitle":"Avustava otsikko","anchor":{"toolbar":"Lisää ankkuri/muokkaa ankkuria","menu":"Ankkurin ominaisuudet","title":"Ankkurin ominaisuudet","name":"Nimi","errorName":"Ankkurille on kirjoitettava nimi","remove":"Poista ankkuri"},"anchorId":"Ankkurin ID:n mukaan","anchorName":"Ankkurin nimen mukaan","charset":"Linkitetty kirjaimisto","cssClasses":"Tyyliluokat","download":"Force Download","displayText":"Display Text","emailAddress":"Sähköpostiosoite","emailBody":"Viesti","emailSubject":"Aihe","id":"Tunniste","info":"Linkin tiedot","langCode":"Kielen suunta","langDir":"Kielen suunta","langDirLTR":"Vasemmalta oikealle (LTR)","langDirRTL":"Oikealta vasemmalle (RTL)","menu":"Muokkaa linkkiä","name":"Nimi","noAnchors":"(Ei ankkureita tässä dokumentissa)","noEmail":"Kirjoita sähköpostiosoite","noUrl":"Linkille on kirjoitettava URL","other":"<muu>","popupDependent":"Riippuva (Netscape)","popupFeatures":"Popup ikkunan ominaisuudet","popupFullScreen":"Täysi ikkuna (IE)","popupLeft":"Vasemmalta (px)","popupLocationBar":"Osoiterivi","popupMenuBar":"Valikkorivi","popupResizable":"Venytettävä","popupScrollBars":"Vierityspalkit","popupStatusBar":"Tilarivi","popupToolbar":"Vakiopainikkeet","popupTop":"Ylhäältä (px)","rel":"Suhde","selectAnchor":"Valitse ankkuri","styles":"Tyyli","tabIndex":"Tabulaattori indeksi","target":"Kohde","targetFrame":"<kehys>","targetFrameName":"Kohdekehyksen nimi","targetPopup":"<popup ikkuna>","targetPopupName":"Popup ikkunan nimi","title":"Linkki","toAnchor":"Ankkuri tässä sivussa","toEmail":"Sähköposti","toUrl":"Osoite","toolbar":"Lisää linkki/muokkaa linkkiä","type":"Linkkityyppi","unlink":"Poista linkki","upload":"Lisää tiedosto"},"list":{"bulletedlist":"Luettelomerkit","numberedlist":"Numerointi"},"maximize":{"maximize":"Suurenna","minimize":"Pienennä"},"table":{"border":"Rajan paksuus","caption":"Otsikko","cell":{"menu":"Solu","insertBefore":"Lisää solu eteen","insertAfter":"Lisää solu perään","deleteCell":"Poista solut","merge":"Yhdistä solut","mergeRight":"Yhdistä oikealla olevan kanssa","mergeDown":"Yhdistä alla olevan kanssa","splitHorizontal":"Jaa solu vaakasuunnassa","splitVertical":"Jaa solu pystysuunnassa","title":"Solun ominaisuudet","cellType":"Solun tyyppi","rowSpan":"Rivin jatkuvuus","colSpan":"Solun jatkuvuus","wordWrap":"Rivitys","hAlign":"Horisontaali kohdistus","vAlign":"Vertikaali kohdistus","alignBaseline":"Alas (teksti)","bgColor":"Taustan väri","borderColor":"Reunan väri","data":"Data","header":"Ylätunniste","yes":"Kyllä","no":"Ei","invalidWidth":"Solun leveyden täytyy olla numero.","invalidHeight":"Solun korkeuden täytyy olla numero.","invalidRowSpan":"Rivin jatkuvuuden täytyy olla kokonaisluku.","invalidColSpan":"Solun jatkuvuuden täytyy olla kokonaisluku.","chooseColor":"Valitse"},"cellPad":"Solujen sisennys","cellSpace":"Solujen väli","column":{"menu":"Sarake","insertBefore":"Lisää sarake vasemmalle","insertAfter":"Lisää sarake oikealle","deleteColumn":"Poista sarakkeet"},"columns":"Sarakkeet","deleteTable":"Poista taulu","headers":"Ylätunnisteet","headersBoth":"Molemmat","headersColumn":"Ensimmäinen sarake","headersNone":"Ei","headersRow":"Ensimmäinen rivi","invalidBorder":"Reunan koon täytyy olla numero.","invalidCellPadding":"Solujen sisennyksen täytyy olla numero.","invalidCellSpacing":"Solujen välin täytyy olla numero.","invalidCols":"Sarakkeiden määrän täytyy olla suurempi kuin 0.","invalidHeight":"Taulun korkeuden täytyy olla numero.","invalidRows":"Rivien määrän täytyy olla suurempi kuin 0.","invalidWidth":"Taulun leveyden täytyy olla numero.","menu":"Taulun ominaisuudet","row":{"menu":"Rivi","insertBefore":"Lisää rivi yläpuolelle","insertAfter":"Lisää rivi alapuolelle","deleteRow":"Poista rivit"},"rows":"Rivit","summary":"Yhteenveto","title":"Taulun ominaisuudet","toolbar":"Taulu","widthPc":"prosenttia","widthPx":"pikseliä","widthUnit":"leveysyksikkö"},"quicktable":{"more":"Lisää..."},"removeformat":{"toolbar":"Poista muotoilu"},"sourcearea":{"toolbar":"Koodi"},"toolbar":{"toolbarCollapse":"Kutista työkalupalkki","toolbarExpand":"Laajenna työkalupalkki","toolbarGroups":{"document":"Dokumentti","clipboard":"Leikepöytä/Kumoa","editing":"Muokkaus","forms":"Lomakkeet","basicstyles":"Perustyylit","paragraph":"Kappale","links":"Linkit","insert":"Lisää","styles":"Tyylit","colors":"Värit","tools":"Työkalut"},"toolbars":"Editorin työkalupalkit"},"undo":{"redo":"Toista","undo":"Kumoa"},"colordialog":{"clear":"Poista","highlight":"Korostus","options":"Värin ominaisuudet","selected":"Valittu","title":"Valitse väri"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/fo.js b/plugins/ckeditor/src/lang/fo.js
deleted file mode 100644
index 1d819adf4..000000000
--- a/plugins/ckeditor/src/lang/fo.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['fo']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Trýst ALT og 0 fyri vegleiðing","browseServer":"Ambætarakagi","url":"URL","protocol":"Protokoll","upload":"Send til ambætaran","uploadSubmit":"Send til ambætaran","image":"Myndir","flash":"Flash","form":"Formur","checkbox":"Flugubein","radio":"Radioknøttur","textField":"Tekstteigur","textarea":"Tekstumráði","hiddenField":"Fjaldur teigur","button":"Knøttur","select":"Valskrá","imageButton":"Myndaknøttur","notSet":"<ikki sett>","id":"Id","name":"Navn","langDir":"Tekstkós","langDirLtr":"Frá vinstru til høgru (LTR)","langDirRtl":"Frá høgru til vinstru (RTL)","langCode":"Málkoda","longDescr":"Víðkað URL frágreiðing","cssClass":"Typografi klassar","advisoryTitle":"Vegleiðandi heiti","cssStyle":"Typografi","ok":"Góðkent","cancel":"Avlýs","close":"Lat aftur","preview":"Frumsýn","resize":"Drag fyri at broyta stødd","generalTab":"Generelt","advancedTab":"Fjølbroytt","validateNumberFailed":"Hetta er ikki eitt tal.","confirmNewPage":"Allar ikki goymdar broytingar í hesum innihaldið hvørva. Skal nýggj síða lesast kortini?","confirmCancel":"Nakrir valmøguleikar eru broyttir. Ert tú vísur í, at dialogurin skal latast aftur?","options":"Options","target":"Target","targetNew":"Nýtt vindeyga (_blank)","targetTop":"Vindeyga ovast (_top)","targetSelf":"Sama vindeyga (_self)","targetParent":"Upphavligt vindeyga (_parent)","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","styles":"Style","cssClasses":"Stylesheet Classes","width":"Breidd","height":"Hædd","align":"Justering","alignLeft":"Vinstra","alignRight":"Høgra","alignCenter":"Miðsett","alignJustify":"Javnir tekstkantar","alignTop":"Ovast","alignMiddle":"Miðja","alignBottom":"Botnur","alignNone":"Eingin","invalidValue":"Invalid value.","invalidHeight":"Hædd má vera eitt tal.","invalidWidth":"Breidd má vera eitt tal.","invalidCssLength":"Virðið sett í \"%1\" feltið má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px, %, in, cm, mm, em, ex, pt, ella pc).","invalidHtmlLength":"Virðið sett í \"%1\" feltiðield má vera eitt positivt tal, við ella uttan gyldugum CSS mátieind (px ella %).","invalidInlineStyle":"Virði specifiserað fyri inline style má hava eitt ella fleiri pør (tuples) skrivað sum \"name : value\", hvørt parið sundurskilt við semi-colon.","cssLengthTooltip":"Skriva eitt tal fyri eitt virði í pixels ella eitt tal við gyldigum CSS eind (px, %, in, cm, mm, em, ex, pt, ella pc).","unavailable":"%1<span class=\"cke_accessibility\">, ikki tøkt</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"Um CKEditor","help":"Kekka $1 fyri hjálp.","moreInfo":"Licens upplýsingar finnast á heimasíðu okkara:","title":"Um CKEditor","userGuide":"CKEditor Brúkaravegleiðing"},"clipboard":{"copy":"Avrita","copyError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at avrita tekstin. Vinarliga nýt knappaborðið til at avrita tekstin (Ctrl/Cmd+C).","cut":"Kvett","cutError":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í at kvetta tekstin. Vinarliga nýt knappaborðið til at kvetta tekstin (Ctrl/Cmd+X).","paste":"Innrita","pasteArea":"Avritingarumráði","pasteMsg":"Vinarliga koyr tekstin í hendan rútin við knappaborðinum (<strong>Ctrl/Cmd+V</strong>) og klikk á <strong>Góðtak</strong>.","securityMsg":"Trygdaruppseting alnótskagans forðar tekstviðgeranum í beinleiðis atgongd til avritingarminnið. Tygum mugu royna aftur í hesum rútinum.","title":"Innrita"},"base64image":{"alt":"Alternativur tekstur","lockRatio":"Læs lutfallið","vSpace":"Vinstri breddi","hSpace":"Høgri breddi","border":"Bordi"},"basicstyles":{"bold":"Feit skrift","italic":"Skráskrift","strike":"Yvirstrikað","subscript":"Lækkað skrift","superscript":"Hækkað skrift","underline":"Undirstrikað"},"bidi":{"ltr":"Tekstkós frá vinstru til høgru","rtl":"Tekstkós frá høgru til vinstru"},"blockquote":{"toolbar":"Blockquote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatiskt","bgColorTitle":"Bakgrundslitur","colors":{"000":"Svart","800000":"Maroon","8B4513":"Saðilsbrúnt","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Myrkagrátt","B22222":"Fire Brick","A52A2A":"Brúnt","DAA520":"Gullstavur","006400":"Myrkagrønt","40E0D0":"Turquoise","0000CD":"Meðal blátt","800080":"Purple","808080":"Grátt","F00":"Reytt","FF8C00":"Myrkt appelsingult","FFD700":"Gull","008000":"Grønt","0FF":"Cyan","00F":"Blátt","EE82EE":"Violet","A9A9A9":"Døkt grátt","FFA07A":"Ljósur laksur","FFA500":"Appelsingult","FFFF00":"Gult","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Ljósablátt","DDA0DD":"Plum","D3D3D3":"Ljósagrátt","FFF0F5":"Lavender Blush","FAEBD7":"Klassiskt hvítt","FFFFE0":"Ljósagult","F0FFF0":"Hunangsdøggur","F0FFFF":"Azure","F0F8FF":"Alice Blátt","E6E6FA":"Lavender","FFF":"Hvítt","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri litir...","panelTitle":"Litir","textColorTitle":"Tekstlitur"},"font":{"fontSize":{"label":"Skriftstødd","voiceLabel":"Skriftstødd","panelTitle":"Skriftstødd"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Skrift"},"image":{"alt":"Alternativur tekstur","border":"Bordi","btnUpload":"Send til ambætaran","button2Img":"Skal valdi myndaknøttur gerast til vanliga mynd?","hSpace":"Høgri breddi","img2Button":"Skal valda mynd gerast til myndaknøtt?","infoTab":"Myndaupplýsingar","linkTab":"Tilknýti","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","resetSize":"Upprunastødd","title":"Myndaeginleikar","titleButton":"Eginleikar fyri myndaknøtt","upload":"Send","urlMissing":"URL til mynd manglar.","vSpace":"Vinstri breddi","validateBorder":"Bordi má vera eitt heiltal.","validateHSpace":"HSpace má vera eitt heiltal.","validateVSpace":"VSpace má vera eitt heiltal."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternativur tekstur","btnUpload":"Send til ambætaran","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Myndaupplýsingar","lockRatio":"Læs lutfallið","menu":"Myndaeginleikar","pathName":"image","pathNameCaption":"caption","resetSize":"Upprunastødd","resizer":"Click and drag to resize","title":"Myndaeginleikar","uploadTab":"Send til ambætaran","urlMissing":"URL til mynd manglar.","altMissing":"Alternative text is missing."},"indent":{"indent":"Økja reglubrotarinntriv","outdent":"Minka reglubrotarinntriv"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Fjaldur teigur","iframe":"IFrame","unknown":"Ókent Object"},"link":{"acccessKey":"Snarvegisknöttur","advanced":"Fjølbroytt","advisoryContentType":"Vegleiðandi innihaldsslag","advisoryTitle":"Vegleiðandi heiti","anchor":{"toolbar":"Ger/broyt marknastein","menu":"Eginleikar fyri marknastein","title":"Eginleikar fyri marknastein","name":"Heiti marknasteinsins","errorName":"Vinarliga rita marknasteinsins heiti","remove":"Strika marknastein"},"anchorId":"Eftir element Id","anchorName":"Eftir navni á marknasteini","charset":"Atknýtt teknsett","cssClasses":"Typografi klassar","download":"Force Download","displayText":"Display Text","emailAddress":"Teldupost-adressa","emailBody":"Breyðtekstur","emailSubject":"Evni","id":"Id","info":"Tilknýtis upplýsingar","langCode":"Tekstkós","langDir":"Tekstkós","langDirLTR":"Frá vinstru til høgru (LTR)","langDirRTL":"Frá høgru til vinstru (RTL)","menu":"Broyt tilknýti","name":"Navn","noAnchors":"(Eingir marknasteinar eru í hesum dokumentið)","noEmail":"Vinarliga skriva teldupost-adressu","noUrl":"Vinarliga skriva tilknýti (URL)","other":"<annað>","popupDependent":"Bundið (Netscape)","popupFeatures":"Popup vindeygans víðkaðu eginleikar","popupFullScreen":"Fullur skermur (IE)","popupLeft":"Frástøða frá vinstru","popupLocationBar":"Adressulinja","popupMenuBar":"Skrábjálki","popupResizable":"Stødd kann broytast","popupScrollBars":"Rullibjálki","popupStatusBar":"Støðufrágreiðingarbjálki","popupToolbar":"Amboðsbjálki","popupTop":"Frástøða frá íerva","rel":"Relatión","selectAnchor":"Vel ein marknastein","styles":"Typografi","tabIndex":"Tabulator indeks","target":"Target","targetFrame":"<ramma>","targetFrameName":"Vís navn vindeygans","targetPopup":"<popup vindeyga>","targetPopupName":"Popup vindeygans navn","title":"Tilknýti","toAnchor":"Tilknýti til marknastein í tekstinum","toEmail":"Teldupostur","toUrl":"URL","toolbar":"Ger/broyt tilknýti","type":"Tilknýtisslag","unlink":"Strika tilknýti","upload":"Send til ambætaran"},"list":{"bulletedlist":"Punktmerktur listi","numberedlist":"Talmerktur listi"},"maximize":{"maximize":"Maksimera","minimize":"Minimera"},"table":{"border":"Bordabreidd","caption":"Tabellfrágreiðing","cell":{"menu":"Meski","insertBefore":"Set meska inn áðrenn","insertAfter":"Set meska inn aftaná","deleteCell":"Strika meskar","merge":"Flætta meskar","mergeRight":"Flætta meskar til høgru","mergeDown":"Flætta saman","splitHorizontal":"Kloyv meska vatnrætt","splitVertical":"Kloyv meska loddrætt","title":"Mesku eginleikar","cellType":"Mesku slag","rowSpan":"Ræð spenni","colSpan":"Kolonnu spenni","wordWrap":"Orðkloyving","hAlign":"Horisontal plasering","vAlign":"Loddrøtt plasering","alignBaseline":"Basislinja","bgColor":"Bakgrundslitur","borderColor":"Bordalitur","data":"Data","header":"Header","yes":"Ja","no":"Nei","invalidWidth":"Meskubreidd má vera eitt tal.","invalidHeight":"Meskuhædd má vera eitt tal.","invalidRowSpan":"Raðspennið má vera eitt heiltal.","invalidColSpan":"Kolonnuspennið má vera eitt heiltal.","chooseColor":"Vel"},"cellPad":"Meskubreddi","cellSpace":"Fjarstøða millum meskar","column":{"menu":"Kolonna","insertBefore":"Set kolonnu inn áðrenn","insertAfter":"Set kolonnu inn aftaná","deleteColumn":"Strika kolonnur"},"columns":"Kolonnur","deleteTable":"Strika tabell","headers":"Yvirskriftir","headersBoth":"Báðir","headersColumn":"Fyrsta kolonna","headersNone":"Eingin","headersRow":"Fyrsta rað","invalidBorder":"Borda-stødd má vera eitt tal.","invalidCellPadding":"Cell padding má vera eitt tal.","invalidCellSpacing":"Cell spacing má vera eitt tal.","invalidCols":"Talið av kolonnum má vera eitt tal størri enn 0.","invalidHeight":"Tabell-hædd má vera eitt tal.","invalidRows":"Talið av røðum má vera eitt tal størri enn 0.","invalidWidth":"Tabell-breidd má vera eitt tal.","menu":"Eginleikar fyri tabell","row":{"menu":"Rað","insertBefore":"Set rað inn áðrenn","insertAfter":"Set rað inn aftaná","deleteRow":"Strika røðir"},"rows":"Røðir","summary":"Samandráttur","title":"Eginleikar fyri tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"pixels","widthUnit":"breiddar unit"},"quicktable":{"more":"Fleiri..."},"removeformat":{"toolbar":"Strika sniðgeving"},"sourcearea":{"toolbar":"Kelda"},"toolbar":{"toolbarCollapse":"Lat Toolbar aftur","toolbarExpand":"Vís Toolbar","toolbarGroups":{"document":"Dokument","clipboard":"Clipboard/Undo","editing":"Editering","forms":"Formar","basicstyles":"Grundleggjandi Styles","paragraph":"Reglubrot","links":"Leinkjur","insert":"Set inn","styles":"Styles","colors":"Litir","tools":"Tól"},"toolbars":"Editor toolbars"},"undo":{"redo":"Vend aftur","undo":"Angra"},"colordialog":{"clear":"Strika","highlight":"Framheva","options":"Litmøguleikar","selected":"Valdur litur","title":"Vel lit"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/fr-ca.js b/plugins/ckeditor/src/lang/fr-ca.js
deleted file mode 100644
index e34bf995a..000000000
--- a/plugins/ckeditor/src/lang/fr-ca.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['fr-ca']={"editor":"Éditeur de texte enrichi","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Appuyez sur 0 pour de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Envoyer","uploadSubmit":"Envoyer au serveur","image":"Image","flash":"Animation Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ caché","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton image","notSet":"<Par défaut>","id":"Id","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"De gauche à droite (LTR)","langDirRtl":"De droite à gauche (RTL)","langCode":"Code langue","longDescr":"URL de description longue","cssClass":"Classes CSS","advisoryTitle":"Titre","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous certain de vouloir charger une nouvelle page?","confirmCancel":"Certaines options ont été modifiées.  Êtes-vous certain de vouloir fermer?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieur (_top)","targetSelf":"Cette fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","styles":"Style","cssClasses":"Classe CSS","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centré","alignJustify":"Justifié","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"None","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ \"%1\" doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style intégré doit être composée d'un ou plusieurs couples de valeur au format \"nom : valeur\", separés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour la valeur en pixel ou un nombre avec une unité CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour l'aide.","moreInfo":"Pour les informations de licence, consulter notre site internet:","title":"À propos de CKEditor","userGuide":"Guide utilisateur de CKEditor"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de copier automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur de couper automatiquement vos données. Veuillez utiliser les équivalents claviers (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller dans la zone ci-dessous en utilisant le clavier (<STRONG>Ctrl/Cmd+V</STRONG>) et appuyer sur <STRONG>OK</STRONG>.","securityMsg":"A cause des paramètres de sécurité de votre navigateur, l'éditeur ne peut accéder au presse-papier directement. Vous devez coller à nouveau le contenu dans cette fenêtre.","title":"Coller"},"base64image":{"alt":"Texte alternatif","lockRatio":"Verrouiller les proportions","vSpace":"Espacement vertical","hSpace":"Espacement horizontal","border":"Bordure"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de gauche à droite","rtl":"Direction du texte de droite à gauche"},"blockquote":{"toolbar":"Citation"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur de fond","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun foncé","2F4F4F":"Gris ardoise foncé","008080":"Sarcelle","000080":"Marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Doré","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu","800080":"Mauve","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris pâle","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Vert lime","AFEEEE":"Turquoise pâle","ADD8E6":"Bleu pâle","DDA0DD":"Prune","D3D3D3":"Gris pâle","FFF0F5":"Bleu lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune pâle","F0FFF0":"Miel doré","F0FFFF":"Azure","F0F8FF":"Bleu alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur de texte"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille","panelTitle":"Taille"},"label":"Police","panelTitle":"Police","voiceLabel":"Police"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Désirez-vous transformer l'image sélectionnée en image simple?","hSpace":"Espacement horizontal","img2Button":"Désirez-vous transformer l'image sélectionnée en bouton image?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image","resetSize":"Taille originale","title":"Propriétés de l'image","titleButton":"Propriétés du bouton image","upload":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un entier.","validateHSpace":"L'espacement horizontal doit être un entier.","validateVSpace":"L'espacement vertical doit être un entier."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informations sur l'image2","lockRatio":"Verrouiller les proportions","menu":"Propriétés de l'image2","pathName":"image","pathNameCaption":"caption","resetSize":"Taille originale","resizer":"Click and drag to resize","title":"Propriétés de l'image2","uploadTab":"Téléverser","urlMissing":"L'URL de la source de l'image est manquant.","altMissing":"Alternative text is missing."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ caché","iframe":"IFrame","unknown":"Objet inconnu"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu","advisoryTitle":"Description","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez saisir le nom de l'ancre","remove":"Supprimer l'ancre"},"anchorId":"Par ID","anchorName":"Par nom","charset":"Encodage de la cible","cssClasses":"Classes CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Courriel","emailBody":"Corps du message","emailSubject":"Objet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"De gauche à droite (LTR)","langDirRTL":"De droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Pas d'ancre disponible dans le document)","noEmail":"Veuillez saisir le courriel","noUrl":"Veuillez saisir l'URL","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre popup","popupFullScreen":"Plein écran (IE)","popupLeft":"Position de la gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"Position à partir du haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Ordre de tabulation","target":"Destination","targetFrame":"<Cadre>","targetFrameName":"Nom du cadre de destination","targetPopup":"<fenêtre popup>","targetPopupName":"Nom de la fenêtre popup","title":"Lien","toAnchor":"Ancre dans cette page","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Liste à puces","numberedlist":"Liste numérotée"},"maximize":{"maximize":"Maximizer","minimize":"Minimizer"},"table":{"border":"Taille de la bordure","caption":"Titre","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer des cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner à droite","mergeDown":"Fusionner en bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Fusion de lignes","colSpan":"Fusion de colonnes","wordWrap":"Retour à la ligne","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Bas du texte","bgColor":"Couleur d'arrière plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de cellule doit être un nombre.","invalidHeight":"La hauteur de cellule doit être un nombre.","invalidRowSpan":"La fusion de lignes doit être un nombre entier.","invalidColSpan":"La fusion de colonnes doit être un nombre entier.","chooseColor":"Sélectionner"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement des cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer des colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux.","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement des cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer des lignes"},"rows":"Lignes","summary":"Résumé","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pourcentage","widthPx":"pixels","widthUnit":"unité de largeur"},"quicktable":{"more":"Plus..."},"removeformat":{"toolbar":"Supprimer le formatage"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse papier/Annuler","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barre d'outils de l'éditeur"},"undo":{"redo":"Refaire","undo":"Annuler"},"colordialog":{"clear":"Effacer","highlight":"Surligner","options":"Options de couleur","selected":"Couleur sélectionnée","title":"Choisir une couleur"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/fr.js b/plugins/ckeditor/src/lang/fr.js
deleted file mode 100644
index 15166dc90..000000000
--- a/plugins/ckeditor/src/lang/fr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['fr']={"editor":"Éditeur de texte enrichi","editorPanel":"Tableau de bord de l'éditeur de texte enrichi","common":{"editorHelp":"Utilisez le raccourci Alt-0 pour obtenir de l'aide","browseServer":"Parcourir le serveur","url":"URL","protocol":"Protocole","upload":"Téléverser","uploadSubmit":"Envoyer sur le serveur","image":"Image","flash":"Flash","form":"Formulaire","checkbox":"Case à cocher","radio":"Bouton radio","textField":"Champ texte","textarea":"Zone de texte","hiddenField":"Champ invisible","button":"Bouton","select":"Liste déroulante","imageButton":"Bouton avec image","notSet":"<indéfini>","id":"ID","name":"Nom","langDir":"Sens d'écriture","langDirLtr":"Gauche à droite (LTR)","langDirRtl":"Droite à gauche (RTL)","langCode":"Code de langue","longDescr":"URL de description longue","cssClass":"Classes de style","advisoryTitle":"Infobulle","cssStyle":"Style","ok":"OK","cancel":"Annuler","close":"Fermer","preview":"Aperçu","resize":"Redimensionner","generalTab":"Général","advancedTab":"Avancé","validateNumberFailed":"Cette valeur n'est pas un nombre.","confirmNewPage":"Les changements non sauvegardés seront perdus. Êtes-vous sûr de vouloir charger une nouvelle page ?","confirmCancel":"Certaines options ont été modifiées. Êtes-vous sûr de vouloir fermer ?","options":"Options","target":"Cible","targetNew":"Nouvelle fenêtre (_blank)","targetTop":"Fenêtre supérieure (_top)","targetSelf":"Même fenêtre (_self)","targetParent":"Fenêtre parent (_parent)","langDirLTR":"Gauche à droite (LTR)","langDirRTL":"Droite à gauche (RTL)","styles":"Style","cssClasses":"Classes de style","width":"Largeur","height":"Hauteur","align":"Alignement","alignLeft":"Gauche","alignRight":"Droite","alignCenter":"Centrer","alignJustify":"Justifier","alignTop":"Haut","alignMiddle":"Milieu","alignBottom":"Bas","alignNone":"Aucun","invalidValue":"Valeur invalide.","invalidHeight":"La hauteur doit être un nombre.","invalidWidth":"La largeur doit être un nombre.","invalidCssLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"La valeur spécifiée pour le champ « %1 » doit être un nombre positif avec ou sans unité de mesure HTML valide (px ou %).","invalidInlineStyle":"La valeur spécifiée pour le style en ligne doit être composée d'un ou plusieurs couples au format « nom : valeur », séparés par des points-virgules.","cssLengthTooltip":"Entrer un nombre pour une valeur en pixels ou un nombre avec une unité de mesure CSS valide (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Backspace","13":"Entrée","16":"Majuscule","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Origine","46":"Supprimer","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Tous droits réservés.","dlgTitle":"À propos de CKEditor","help":"Consulter $1 pour obtenir de l'aide.","moreInfo":"Pour les informations de licence, veuillez visiter notre site web :","title":"À propos de CKEditor","userGuide":"Guide de l'utilisateur CKEditor (en anglais)"},"clipboard":{"copy":"Copier","copyError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Copier ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+C).","cut":"Couper","cutError":"Les paramètres de sécurité de votre navigateur n'autorisent pas l'éditeur à exécuter automatiquement l'opération « Couper ». Veuillez utiliser le raccourci clavier à cet effet (Ctrl/Cmd+X).","paste":"Coller","pasteArea":"Coller la zone","pasteMsg":"Veuillez coller le texte dans la zone suivante en utilisant le raccourci clavier (<strong>Ctrl/Cmd+V</strong>) et cliquez sur OK.","securityMsg":"Les paramètres de sécurité de votre navigateur empêchent l'éditeur d'accéder directement aux données du presse-papier. Vous devez les coller à nouveau dans cette fenêtre.","title":"Coller"},"base64image":{"alt":"Texte de remplacement","lockRatio":"Conserver les proportions","vSpace":"Espacement vertical","hSpace":"Espacement horizontal","border":"Bordure"},"basicstyles":{"bold":"Gras","italic":"Italique","strike":"Barré","subscript":"Indice","superscript":"Exposant","underline":"Souligné"},"bidi":{"ltr":"Direction du texte de la gauche vers la droite","rtl":"Direction du texte de la droite vers la gauche"},"blockquote":{"toolbar":"Citation"},"button":{"selectedLabel":"%1 (Sélectionné)"},"colorbutton":{"auto":"Automatique","bgColorTitle":"Couleur d'arrière-plan","colors":{"000":"Noir","800000":"Marron","8B4513":"Brun de selle","2F4F4F":"Gris sombre d'ardoise","008080":"Canard","000080":"Bleu marine","4B0082":"Indigo","696969":"Gris foncé","B22222":"Rouge brique","A52A2A":"Brun","DAA520":"Or terni","006400":"Vert foncé","40E0D0":"Turquoise","0000CD":"Bleu royal","800080":"Violet","808080":"Gris","F00":"Rouge","FF8C00":"Orange foncé","FFD700":"Or","008000":"Vert","0FF":"Cyan","00F":"Bleu","EE82EE":"Violet","A9A9A9":"Gris tamisé","FFA07A":"Saumon clair","FFA500":"Orange","FFFF00":"Jaune","00FF00":"Lime","AFEEEE":"Turquoise clair","ADD8E6":"Bleu clair","DDA0DD":"Prune","D3D3D3":"Gris clair","FFF0F5":"Fard lavande","FAEBD7":"Blanc antique","FFFFE0":"Jaune clair","F0FFF0":"Vert rosée","F0FFFF":"Azur","F0F8FF":"Bleu Alice","E6E6FA":"Lavande","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plus de couleurs...","panelTitle":"Couleurs","textColorTitle":"Couleur du texte"},"font":{"fontSize":{"label":"Taille","voiceLabel":"Taille de police","panelTitle":"Taille de police"},"label":"Police","panelTitle":"Style de police","voiceLabel":"Police"},"image":{"alt":"Texte alternatif","border":"Bordure","btnUpload":"Envoyer sur le serveur","button2Img":"Voulez-vous transformer le bouton avec image sélectionné en simple image ?","hSpace":"Espacement horizontal","img2Button":"Voulez-vous transformer l'image sélectionnée en bouton avec image ?","infoTab":"Informations sur l'image","linkTab":"Lien","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","resetSize":"Réinitialiser la taille","title":"Propriétés de l'image","titleButton":"Propriétés du bouton avec image","upload":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","vSpace":"Espacement vertical","validateBorder":"La bordure doit être un nombre entier.","validateHSpace":"L'espacement horizontal doit être un nombre entier.","validateVSpace":"L'espacement vertical doit être un nombre entier."},"widget":{"move":"Cliquer et glisser pour déplacer","label":"Élément %1"},"image2":{"alt":"Texte alternatif","btnUpload":"Envoyer sur le serveur","captioned":"Image légendée","captionPlaceholder":"Légende","infoTab":"Informations sur l'image","lockRatio":"Conserver les proportions","menu":"Propriétés de l'image","pathName":"image","pathNameCaption":"légende","resetSize":"Réinitialiser la taille","resizer":"Cliquer et glisser pour redimensionner","title":"Propriétés de l'image","uploadTab":"Téléverser","urlMissing":"L'URL source de l'image est manquante.","altMissing":"Alternative text is missing."},"indent":{"indent":"Augmenter le retrait","outdent":"Diminuer le retrait"},"fakeobjects":{"anchor":"Ancre","flash":"Animation Flash","hiddenfield":"Champ invisible","iframe":"Cadre de contenu incorporé","unknown":"Objet inconnu"},"link":{"acccessKey":"Touche d'accessibilité","advanced":"Avancé","advisoryContentType":"Type de contenu (indicatif)","advisoryTitle":"Infobulle","anchor":{"toolbar":"Ancre","menu":"Modifier l'ancre","title":"Propriétés de l'ancre","name":"Nom de l'ancre","errorName":"Veuillez entrer le nom de l'ancre.","remove":"Supprimer l'ancre"},"anchorId":"Par ID d'élément","anchorName":"Par nom d'ancre","charset":"Encodage de la ressource liée","cssClasses":"Classes de style","download":"Force Download","displayText":"Display Text","emailAddress":"Adresse électronique","emailBody":"Corps du message","emailSubject":"Sujet du message","id":"ID","info":"Informations sur le lien","langCode":"Code de langue","langDir":"Sens d'écriture","langDirLTR":"Gauche à droite","langDirRTL":"Droite à gauche (RTL)","menu":"Modifier le lien","name":"Nom","noAnchors":"(Aucune ancre disponible dans ce document)","noEmail":"Veuillez entrer l'adresse électronique","noUrl":"Veuillez entrer l'URL du lien","other":"<autre>","popupDependent":"Dépendante (Netscape)","popupFeatures":"Caractéristiques de la fenêtre surgissante","popupFullScreen":"Plein écran (IE)","popupLeft":"À gauche","popupLocationBar":"Barre d'adresse","popupMenuBar":"Barre de menu","popupResizable":"Redimensionnable","popupScrollBars":"Barres de défilement","popupStatusBar":"Barre d'état","popupToolbar":"Barre d'outils","popupTop":"En haut","rel":"Relation","selectAnchor":"Sélectionner une ancre","styles":"Style","tabIndex":"Indice de tabulation","target":"Cible","targetFrame":"<cadre>","targetFrameName":"Nom du cadre affecté","targetPopup":"<fenêtre surgissante>","targetPopupName":"Nom de la fenêtre surgissante","title":"Lien","toAnchor":"Ancre","toEmail":"Courriel","toUrl":"URL","toolbar":"Lien","type":"Type de lien","unlink":"Supprimer le lien","upload":"Téléverser"},"list":{"bulletedlist":"Insérer/Supprimer une liste à puces","numberedlist":"Insérer/Supprimer une liste numérotée"},"maximize":{"maximize":"Agrandir","minimize":"Réduire"},"table":{"border":"Taille de la bordure","caption":"Titre du tableau","cell":{"menu":"Cellule","insertBefore":"Insérer une cellule avant","insertAfter":"Insérer une cellule après","deleteCell":"Supprimer les cellules","merge":"Fusionner les cellules","mergeRight":"Fusionner vers la droite","mergeDown":"Fusionner vers le bas","splitHorizontal":"Scinder la cellule horizontalement","splitVertical":"Scinder la cellule verticalement","title":"Propriétés de la cellule","cellType":"Type de cellule","rowSpan":"Lignes occupées","colSpan":"Colonnes occupées","wordWrap":"Césure","hAlign":"Alignement horizontal","vAlign":"Alignement vertical","alignBaseline":"Ligne de base","bgColor":"Couleur d'arrière-plan","borderColor":"Couleur de bordure","data":"Données","header":"En-tête","yes":"Oui","no":"Non","invalidWidth":"La largeur de la cellule doit être un nombre.","invalidHeight":"La hauteur de la cellule doit être un nombre.","invalidRowSpan":"Le nombre de colonnes occupées doit être un nombre entier.","invalidColSpan":"Le nombre de colonnes occupées doit être un nombre entier.","chooseColor":"Choisir"},"cellPad":"Marge interne des cellules","cellSpace":"Espacement entre les cellules","column":{"menu":"Colonne","insertBefore":"Insérer une colonne avant","insertAfter":"Insérer une colonne après","deleteColumn":"Supprimer les colonnes"},"columns":"Colonnes","deleteTable":"Supprimer le tableau","headers":"En-têtes","headersBoth":"Les deux","headersColumn":"Première colonne","headersNone":"Aucun","headersRow":"Première ligne","invalidBorder":"La taille de la bordure doit être un nombre.","invalidCellPadding":"La marge interne des cellules doit être un nombre positif.","invalidCellSpacing":"L'espacement entre les cellules doit être un nombre positif.","invalidCols":"Le nombre de colonnes doit être supérieur à 0.","invalidHeight":"La hauteur du tableau doit être un nombre.","invalidRows":"Le nombre de lignes doit être supérieur à 0.","invalidWidth":"La largeur du tableau doit être un nombre.","menu":"Propriétés du tableau","row":{"menu":"Ligne","insertBefore":"Insérer une ligne avant","insertAfter":"Insérer une ligne après","deleteRow":"Supprimer les lignes"},"rows":"Lignes","summary":"Résumé (description)","title":"Propriétés du tableau","toolbar":"Tableau","widthPc":"pour cent","widthPx":"pixels","widthUnit":"unité de largeur"},"quicktable":{"more":"Plus..."},"removeformat":{"toolbar":"Supprimer la mise en forme"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Enrouler la barre d'outils","toolbarExpand":"Dérouler la barre d'outils","toolbarGroups":{"document":"Document","clipboard":"Presse-papier/Défaire","editing":"Édition","forms":"Formulaires","basicstyles":"Styles de base","paragraph":"Paragraphe","links":"Liens","insert":"Insérer","styles":"Styles","colors":"Couleurs","tools":"Outils"},"toolbars":"Barres d'outils de l'éditeur"},"undo":{"redo":"Rétablir","undo":"Annuler"},"colordialog":{"clear":"Effacer","highlight":"Pointée","options":"Options de couleur","selected":"Couleur choisie","title":"Sélectionner une couleur"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/gl.js b/plugins/ckeditor/src/lang/gl.js
deleted file mode 100644
index 248fc20d6..000000000
--- a/plugins/ckeditor/src/lang/gl.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['gl']={"editor":"Editor de texto mellorado","editorPanel":"Panel do editor de texto mellorado","common":{"editorHelp":"Prema ALT 0 para obter axuda","browseServer":"Examinar o servidor","url":"URL","protocol":"Protocolo","upload":"Enviar","uploadSubmit":"Enviar ao servidor","image":"Imaxe","flash":"Flash","form":"Formulario","checkbox":"Caixa de selección","radio":"Botón de opción","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo agochado","button":"Botón","select":"Campo de selección","imageButton":"Botón de imaxe","notSet":"<sen estabelecer>","id":"ID","name":"Nome","langDir":"Dirección de escritura do idioma","langDirLtr":"Esquerda a dereita (LTR)","langDirRtl":"Dereita a esquerda (RTL)","langCode":"Código do idioma","longDescr":"Descrición completa do URL","cssClass":"Clases da folla de estilos","advisoryTitle":"Título","cssStyle":"Estilo","ok":"Aceptar","cancel":"Cancelar","close":"Pechar","preview":"Vista previa","resize":"Redimensionar","generalTab":"Xeral","advancedTab":"Avanzado","validateNumberFailed":"Este valor non é un número.","confirmNewPage":"Calquera cambio que non gardara neste contido perderase.\r\nConfirma que quere cargar unha páxina nova?","confirmCancel":"Algunhas das opcións foron cambiadas.\r\nConfirma que quere pechar o diálogo?","options":"Opcións","target":"Destino","targetNew":"Nova xanela (_blank)","targetTop":"Xanela principal (_top)","targetSelf":"Mesma xanela (_self)","targetParent":"Xanela superior (_parent)","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","styles":"Estilo","cssClasses":"Clases da folla de estilos","width":"Largo","height":"Alto","align":"Aliñamento","alignLeft":"Esquerda","alignRight":"Dereita","alignCenter":"Centro","alignJustify":"Xustificado","alignTop":"Arriba","alignMiddle":"Centro","alignBottom":"Abaixo","alignNone":"Ningún","invalidValue":"Valor incorrecto.","invalidHeight":"O alto debe ser un número.","invalidWidth":"O largo debe ser un número.","invalidCssLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo «%1» debe ser un número positivo con ou sen unha unidade de medida HTML correcta (px ou %).","invalidInlineStyle":"O valor especificado no estilo en liña debe consistir nunha ou máis tuplas co formato «nome : valor», separadas por punto e coma.","cssLengthTooltip":"Escriba un número para o valor en píxeles ou un número cunha unidade CSS correcta (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, non dispoñíbel</span>","keyboard":{"8":"Backspace","13":"Intro","16":"Maiús","17":"Ctrl","18":"Alt","32":"Space","35":"Fin","36":"Inicio","46":"Supr","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Todos os dereitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Consulte $1 para obter axuda.","moreInfo":"Para obter  información sobre a licenza, visite o noso sitio web:","title":"Sobre o CKEditor","userGuide":"Guía do usuario do CKEditor"},"clipboard":{"copy":"Copiar","copyError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de copia. Use o teclado para iso (Ctrl/Cmd+C).","cut":"Cortar","cutError":"Os axustes de seguranza do seu navegador non permiten que o editor realice automaticamente as tarefas de corte. Use o teclado para iso (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Zona de pegado","pasteMsg":"Pegue dentro do seguinte cadro usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e prema en Aceptar","securityMsg":"Por mor da configuración de seguranza do seu navegador, o editor non ten acceso ao portapapeis. É necesario pegalo novamente nesta xanela.","title":"Pegar"},"base64image":{"alt":"Texto alternativo","lockRatio":"Proporcional","vSpace":"Esp.Vert.","hSpace":"Esp.Horiz.","border":"Bordo"},"basicstyles":{"bold":"Negra","italic":"Cursiva","strike":"Riscado","subscript":"Subíndice","superscript":"Superíndice","underline":"Subliñado"},"bidi":{"ltr":"Dirección do texto de esquerda a dereita","rtl":"Dirección do texto de dereita a esquerda"},"blockquote":{"toolbar":"Cita"},"button":{"selectedLabel":"%1 (seleccionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do fondo","colors":{"000":"Negro","800000":"Marrón escuro","8B4513":"Ocre","2F4F4F":"Pizarra escuro","008080":"Verde azulado","000080":"Azul mariño","4B0082":"Índigo","696969":"Gris escuro","B22222":"Ladrillo","A52A2A":"Marrón","DAA520":"Dourado escuro","006400":"Verde escuro","40E0D0":"Turquesa","0000CD":"Azul medio","800080":"Púrpura","808080":"Gris","F00":"Vermello","FF8C00":"Laranxa escuro","FFD700":"Dourado","008000":"Verde","0FF":"Cian","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Gris medio","FFA07A":"Salmón claro","FFA500":"Laranxa","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa pálido","ADD8E6":"Azul claro","DDA0DD":"Violeta pálido","D3D3D3":"Verde claro","FFF0F5":"Lavanda vermello","FAEBD7":"Branco antigo","FFFFE0":"Amarelo claro","F0FFF0":"Mel","F0FFFF":"Azul celeste","F0F8FF":"Azul pálido","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Máis cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"font":{"fontSize":{"label":"Tamaño","voiceLabel":"Tamaño da letra","panelTitle":"Tamaño da letra"},"label":"Tipo de letra","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"image":{"alt":"Texto alternativo","border":"Bordo","btnUpload":"Enviar ao servidor","button2Img":"Quere converter o botón da imaxe seleccionada nunha imaxe sinxela?","hSpace":"Esp.Horiz.","img2Button":"Quere converter a imaxe seleccionada nun botón de imaxe?","infoTab":"Información da imaxe","linkTab":"Ligazón","lockRatio":"Proporcional","menu":"Propiedades da imaxe","resetSize":"Tamaño orixinal","title":"Propiedades da imaxe","titleButton":"Propiedades do botón de imaxe","upload":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","vSpace":"Esp.Vert.","validateBorder":"O bordo debe ser un número.","validateHSpace":"O espazado horizontal debe ser un número.","validateVSpace":"O espazado vertical debe ser un número."},"widget":{"move":"Prema e arrastre para mover","label":"%1 widget"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar ao servidor","captioned":"Imaxe con lenda","captionPlaceholder":"Lenda","infoTab":"Información da imaxe","lockRatio":"Proporcional","menu":"Propiedades da imaxe","pathName":"Imaxe","pathNameCaption":"lenda","resetSize":"Tamaño orixinal","resizer":"Prema e arrastre para axustar o tamaño","title":"Propiedades da imaxe","uploadTab":"Cargar","urlMissing":"Non se atopa o URL da imaxe.","altMissing":"Alternative text is missing."},"indent":{"indent":"Aumentar a sangría","outdent":"Reducir a sangría"},"fakeobjects":{"anchor":"Ancoraxe","flash":"Animación «Flash»","hiddenfield":"Campo agochado","iframe":"IFrame","unknown":"Obxecto descoñecido"},"link":{"acccessKey":"Chave de acceso","advanced":"Avanzado","advisoryContentType":"Tipo de contido informativo","advisoryTitle":"Título","anchor":{"toolbar":"Ancoraxe","menu":"Editar a ancoraxe","title":"Propiedades da ancoraxe","name":"Nome da ancoraxe","errorName":"Escriba o nome da ancoraxe","remove":"Retirar a ancoraxe"},"anchorId":"Polo ID do elemento","anchorName":"Polo nome da ancoraxe","charset":"Codificación do recurso ligado","cssClasses":"Clases da folla de estilos","download":"Force Download","displayText":"Display Text","emailAddress":"Enderezo de correo","emailBody":"Corpo da mensaxe","emailSubject":"Asunto da mensaxe","id":"ID","info":"Información da ligazón","langCode":"Código do idioma","langDir":"Dirección de escritura do idioma","langDirLTR":"Esquerda a dereita (LTR)","langDirRTL":"Dereita a esquerda (RTL)","menu":"Editar a ligazón","name":"Nome","noAnchors":"(Non hai ancoraxes dispoñíbeis no documento)","noEmail":"Escriba o enderezo de correo","noUrl":"Escriba a ligazón URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características da xanela emerxente","popupFullScreen":"Pantalla completa (IE)","popupLeft":"Posición esquerda","popupLocationBar":"Barra de localización","popupMenuBar":"Barra do menú","popupResizable":"Redimensionábel","popupScrollBars":"Barras de desprazamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posición superior","rel":"Relación","selectAnchor":"Seleccionar unha ancoraxe","styles":"Estilo","tabIndex":"Índice de tabulación","target":"Destino","targetFrame":"<marco>","targetFrameName":"Nome do marco de destino","targetPopup":"<xanela emerxente>","targetPopupName":"Nome da xanela emerxente","title":"Ligazón","toAnchor":"Ligar coa ancoraxe no testo","toEmail":"Correo","toUrl":"URL","toolbar":"Ligazón","type":"Tipo de ligazón","unlink":"Eliminar a ligazón","upload":"Enviar"},"list":{"bulletedlist":"Inserir/retirar lista viñeteada","numberedlist":"Inserir/retirar lista numerada"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"table":{"border":"Tamaño do bordo","caption":"Título","cell":{"menu":"Cela","insertBefore":"Inserir a cela á esquerda","insertAfter":"Inserir a cela á dereita","deleteCell":"Eliminar celas","merge":"Combinar celas","mergeRight":"Combinar á dereita","mergeDown":"Combinar cara abaixo","splitHorizontal":"Dividir a cela en horizontal","splitVertical":"Dividir a cela en vertical","title":"Propiedades da cela","cellType":"Tipo de cela","rowSpan":"Expandir filas","colSpan":"Expandir columnas","wordWrap":"Axustar ao contido","hAlign":"Aliñación horizontal","vAlign":"Aliñación vertical","alignBaseline":"Liña de base","bgColor":"Cor do fondo","borderColor":"Cor do bordo","data":"Datos","header":"Cabeceira","yes":"Si","no":"Non","invalidWidth":"O largo da cela debe ser un número.","invalidHeight":"O alto da cela debe ser un número.","invalidRowSpan":"A expansión de filas debe ser un número enteiro.","invalidColSpan":"A expansión de columnas debe ser un número enteiro.","chooseColor":"Escoller"},"cellPad":"Marxe interior da cela","cellSpace":"Marxe entre celas","column":{"menu":"Columna","insertBefore":"Inserir a columna á esquerda","insertAfter":"Inserir a columna á dereita","deleteColumn":"Borrar Columnas"},"columns":"Columnas","deleteTable":"Borrar Táboa","headers":"Cabeceiras","headersBoth":"Ambas","headersColumn":"Primeira columna","headersNone":"Ningún","headersRow":"Primeira fila","invalidBorder":"O tamaño do bordo debe ser un número.","invalidCellPadding":"A marxe interior debe ser un número positivo.","invalidCellSpacing":"A marxe entre celas debe ser un número positivo.","invalidCols":"O número de columnas debe ser un número maior que 0.","invalidHeight":"O alto da táboa debe ser un número.","invalidRows":"O número de filas debe ser un número maior que 0","invalidWidth":"O largo da táboa debe ser un número.","menu":"Propiedades da táboa","row":{"menu":"Fila","insertBefore":"Inserir a fila por riba","insertAfter":"Inserir a fila por baixo","deleteRow":"Eliminar filas"},"rows":"Filas","summary":"Resumo","title":"Propiedades da táboa","toolbar":"Taboa","widthPc":"porcentaxe","widthPx":"píxeles","widthUnit":"unidade do largo"},"quicktable":{"more":"Máis..."},"removeformat":{"toolbar":"Retirar o formato"},"sourcearea":{"toolbar":"Orixe"},"toolbar":{"toolbarCollapse":"Contraer a barra de ferramentas","toolbarExpand":"Expandir a barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Portapapeis/desfacer","editing":"Edición","forms":"Formularios","basicstyles":"Estilos básicos","paragraph":"Paragrafo","links":"Ligazóns","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barras de ferramentas do editor"},"undo":{"redo":"Refacer","undo":"Desfacer"},"colordialog":{"clear":"Limpar","highlight":"Resaltar","options":"Opcións de cor","selected":"Cor seleccionado","title":"Seleccione unha cor"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/gu.js b/plugins/ckeditor/src/lang/gu.js
deleted file mode 100644
index 3e0250e48..000000000
--- a/plugins/ckeditor/src/lang/gu.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['gu']={"editor":"રીચ ટેક્ષ્ત્ એડીટર","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"પ્રેસ ALT 0 મદદ માટ","browseServer":"સર્વર બ્રાઉઝ કરો","url":"URL","protocol":"પ્રોટોકૉલ","upload":"�
-પલોડ","uploadSubmit":"આ સર્વરને મોકલવું","image":"ચિત્ર","flash":"ફ્લ�
-શ","form":"ફૉર્મ/પત્રક","checkbox":"ચેક બોક્સ","radio":"રેડિઓ બટન","textField":"ટેક્સ્ટ ફીલ્ડ, શબ્દ ક્ષેત્ર","textarea":"ટેક્સ્ટ એરિઆ, શબ્દ વિસ્તાર","hiddenField":"ગુપ્ત ક્ષેત્ર","button":"બટન","select":"પસંદગી ક્ષેત્ર","imageButton":"ચિત્ર બટન","notSet":"<સેટ નથી>","id":"Id","name":"નામ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLtr":"ડાબે થી જમણે (LTR)","langDirRtl":"જમણે થી ડાબે (RTL)","langCode":"ભાષા કોડ","longDescr":"વધારે માહિતી માટે URL","cssClass":"સ્ટાઇલ-શીટ ક્લાસ","advisoryTitle":"મુખ્ય મથાળું","cssStyle":"સ્ટાઇલ","ok":"ઠીક છે","cancel":"રદ કરવું","close":"બંધ કરવું","preview":"જોવું","resize":"ખેંચી ને યોગ્ય કરવું","generalTab":"જનરલ","advancedTab":"�
-ડ્વાન્સડ","validateNumberFailed":"આ રકમ આકડો નથી.","confirmNewPage":"સવે કાર્ય વગરનું ફકરો ખોવાઈ જશે. તમને ખાતરી છે કે તમને નવું પાનું ખોલવું છે?","confirmCancel":"ઘણા વિકલ્પો બદલાયા છે. તમારે આ બોક્ષ્ બંધ કરવું છે?","options":"વિકલ્પો","target":"લક્ષ્ય","targetNew":"નવી વિન્ડો (_blank)","targetTop":"ઉપરની વિન્ડો (_top)","targetSelf":"એજ વિન્ડો (_self)","targetParent":"પેરનટ વિન્ડો (_parent)","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","styles":"શૈલી","cssClasses":"શૈલી કલાસીસ","width":"પહોળાઈ","height":"ઊંચાઈ","align":"લાઇનદોરીમાં ગોઠવવું","alignLeft":"ડાબી બાજુ ગોઠવવું","alignRight":"જમણી","alignCenter":"મધ્ય સેન્ટર","alignJustify":"બ્લૉક, �
-ંતરાય જસ્ટિફાઇ","alignTop":"ઉપર","alignMiddle":"વચ્ચે","alignBottom":"નીચે","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"ઉંચાઈ એક આંકડો હોવો જોઈએ.","invalidWidth":"પોહળ ઈ એક આંકડો હોવો જોઈએ.","invalidCssLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ �
-થવા CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc) વગર.","invalidHtmlLength":"\"%1\" ની વેલ્યુ એક પોસીટીવ આંકડો હોવો જોઈએ �
-થવા HTML measurement unit (px or %) વગર.","invalidInlineStyle":"ઈનલાઈન  સ્ટાઈલ ની વેલ્યુ  \"name : value\" ના ફોર્મેટ માં હોવી જોઈએ, વચ્ચે સેમી-કોલોન જોઈએ.","cssLengthTooltip":"પિક્ષ્લ્ નો આંકડો CSS unit (px, %, in, cm, mm, em, ex, pt, or pc) માં નાખો.","unavailable":"%1<span class=\"cke_accessibility\">, નથી મળતું</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"કોપીરાઈટ &copy; $1. ઓલ રાઈટ્સ ","dlgTitle":"CKEditor વિષે","help":"મદદ માટે $1 તપાસો","moreInfo":"લાયસનસની માહિતી માટે �
-મારી વેબ સાઈટ","title":"CKEditor વિષે","userGuide":"CKEditor યુઝર્સ ગાઈડ"},"clipboard":{"copy":"નકલ","copyError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કોપી કરવાની પરવાનગી નથી આપતી.  (Ctrl/Cmd+C) का प्रयोग करें।","cut":"કાપવું","cutError":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસ કટ કરવાની પરવાનગી નથી આપતી. (Ctrl/Cmd+X) નો ઉપયોગ કરો.","paste":"પેસ્ટ","pasteArea":"પેસ્ટ કરવાની જગ્યા","pasteMsg":"Ctrl/Cmd+V નો પ્રયોગ કરી પેસ્ટ કરો","securityMsg":"તમારા બ્રાઉઝર ની સુરક્ષિત સેટિંગસના કારણે,એડિટર તમારા કિલ્પબોર્ડ ડેટા ને કોપી નથી કરી શકતો. તમારે આ વિન્ડોમાં ફરીથી પેસ્ટ કરવું પડશે.","title":"પેસ્ટ"},"base64image":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","lockRatio":"લૉક ગુણોત્તર","vSpace":"લંબરૂપ જગ્યા","hSpace":"સમસ્તરીય જગ્યા","border":"બોર્ડર"},"basicstyles":{"bold":"બોલ્ડ/સ્પષ્ટ","italic":"ઇટેલિક, ત્રાંસા","strike":"છેકી નાખવું","subscript":"એક ચિહ્નની નીચે કરેલું બીજું ચિહ્ન","superscript":"એક ચિહ્ન ઉપર કરેલું બીજું ચિહ્ન.","underline":"�
-ન્ડર્લાઇન, નીચે લીટી"},"bidi":{"ltr":"ટેક્ષ્ત્ ની દિશા ડાબે થી જમણે","rtl":"ટેક્ષ્ત્ ની દિશા જમણે થી ડાબે"},"blockquote":{"toolbar":"બ્લૉક-કોટ, �
-વતરણચિહ્નો"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"સ્વચાલિત","bgColorTitle":"બ�
-કગ્રાઉન્ડ રંગ,","colors":{"000":"કાળો","800000":"મરુન","8B4513":"છીક","2F4F4F":"ડાર્ક સ્લેટ ગ્રે ","008080":"ટીલ","000080":"નેવી","4B0082":"જામલી","696969":"ડાર્ક ગ્રે","B22222":"ઈટ","A52A2A":"બ્રાઉન","DAA520":"ગોલ્ડન રોડ","006400":"ડાર્ક લીલો","40E0D0":"ટ્રકોઈસ","0000CD":"મધ્યમ વાદળી","800080":"પર્પલ","808080":"ગ્રે","F00":"લાલ","FF8C00":"ડાર્ક ઓરંજ","FFD700":"ગોલ્ડ","008000":"ગ્રીન","0FF":"સાયન","00F":"વાદળી","EE82EE":"વાયોલેટ","A9A9A9":"ડીમ ","FFA07A":"લાઈટ સાલમન","FFA500":"ઓરંજ","FFFF00":"પીળો","00FF00":"લાઈમ","AFEEEE":"પેલ કોઈસ","ADD8E6":"લાઈટ બ્લુ","DDA0DD":"પલ્મ","D3D3D3":"લાઈટ ગ્રે","FFF0F5":"લવંડર ","FAEBD7":"એન્ટીક સફેદ","FFFFE0":"લાઈટ પીળો","F0FFF0":"હનીડઉય","F0FFFF":"�
-ઝુરે","F0F8FF":"એલીસ બ્લુ","E6E6FA":"લવંડર","FFF":"સફેદ","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ઔર રંગ...","panelTitle":"રંગ","textColorTitle":"શબ્દનો રંગ"},"font":{"fontSize":{"label":"ફૉન્ટ સાઇઝ/કદ","voiceLabel":"ફોન્ટ સાઈઝ","panelTitle":"ફૉન્ટ સાઇઝ/કદ"},"label":"ફૉન્ટ","panelTitle":"ફૉન્ટ","voiceLabel":"ફોન્ટ"},"image":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","border":"બોર્ડર","btnUpload":"આ સર્વરને મોકલવું","button2Img":"તમારે ઈમેજ બટનને સાદી ઈમેજમાં બદલવું છે.","hSpace":"સમસ્તરીય જગ્યા","img2Button":"તમારે સાદી ઈમેજને ઈમેજ બટનમાં બદલવું છે.","infoTab":"ચિત્ર ની જાણકારી","linkTab":"લિંક","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","resetSize":"રીસેટ સાઇઝ","title":"ચિત્રના ગુણ","titleButton":"ચિત્ર બટનના ગુણ","upload":"�
-પલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","vSpace":"લંબરૂપ જગ્યા","validateBorder":"બોર્ડેર આંકડો હોવો જોઈએ.","validateHSpace":"HSpaceઆંકડો હોવો જોઈએ.","validateVSpace":"VSpace આંકડો હોવો જોઈએ. "},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"ઑલ્ટર્નટ ટેક્સ્ટ","btnUpload":"આ સર્વરને મોકલવું","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ચિત્ર ની જાણકારી","lockRatio":"લૉક ગુણોત્તર","menu":"ચિત્રના ગુણ","pathName":"image","pathNameCaption":"caption","resetSize":"રીસેટ સાઇઝ","resizer":"Click and drag to resize","title":"ચિત્રના ગુણ","uploadTab":"�
-પલોડ","urlMissing":"ઈમેજની મૂળ URL છે નહી.","altMissing":"Alternative text is missing."},"indent":{"indent":"ઇન્ડેન્ટ, લીટીના આરંભમાં જગ્યા વધારવી","outdent":"ઇન્ડેન્ટ લીટીના આરંભમાં જગ્યા ઘટાડવી"},"fakeobjects":{"anchor":"�
-નકર","flash":"ફ્લેશ ","hiddenfield":"હિડન ","iframe":"IFrame","unknown":"�
-નનોન ઓબ્જેક્ટ"},"link":{"acccessKey":"ઍક્સેસ કી","advanced":"�
-ડ્વાન્સડ","advisoryContentType":"મુખ્ય કન્ટેન્ટ પ્રકાર","advisoryTitle":"મુખ્ય મથાળું","anchor":{"toolbar":"ઍંકર ઇન્સર્ટ/દાખલ કરવી","menu":"ઍંકરના ગુણ","title":"ઍંકરના ગુણ","name":"ઍંકરનું નામ","errorName":"ઍંકરનું નામ ટાઈપ કરો","remove":"સ્થિર નકરવું"},"anchorId":"ઍંકર એલિમન્ટ Id થી પસંદ કરો","anchorName":"ઍંકર નામથી પસંદ કરો","charset":"લિંક રિસૉર્સ ક�
-રિક્ટર સેટ","cssClasses":"સ્ટાઇલ-શીટ ક્લાસ","download":"Force Download","displayText":"Display Text","emailAddress":"ઈ-મેલ સરનામું","emailBody":"સંદેશ","emailSubject":"ઈ-મેલ વિષય","id":"Id","info":"લિંક ઇન્ફૉ ટ�
-બ","langCode":"ભાષા લેખવાની પદ્ધતિ","langDir":"ભાષા લેખવાની પદ્ધતિ","langDirLTR":"ડાબે થી જમણે (LTR)","langDirRTL":"જમણે થી ડાબે (RTL)","menu":" લિંક એડિટ/માં ફેરફાર કરવો","name":"નામ","noAnchors":"(ડૉક્યુમન્ટમાં ઍંકરની સંખ્યા)","noEmail":"ઈ-મેલ સરનામું ટાઇપ કરો","noUrl":"લિંક  URL ટાઇપ કરો","other":"<other> <�
-ન્ય>","popupDependent":"ડિપેન્ડન્ટ (Netscape)","popupFeatures":"પૉપ-�
-પ વિન્ડો ફીચરસ�
-","popupFullScreen":"ફુલ સ્ક્રીન (IE)","popupLeft":"ડાબી બાજુ","popupLocationBar":"લોકેશન બાર","popupMenuBar":"મેન્યૂ બાર","popupResizable":"રીસાઈઝએબલ","popupScrollBars":"સ્ક્રોલ બાર","popupStatusBar":"સ્ટ�
-ટસ બાર","popupToolbar":"ટૂલ બાર","popupTop":"જમણી બાજુ","rel":"સંબંધની સ્થિતિ","selectAnchor":"ઍંકર પસંદ કરો","styles":"સ્ટાઇલ","tabIndex":"ટ�
-બ ઇન્ડેક્સ","target":"ટાર્ગેટ/લક્ષ્ય","targetFrame":"<ફ્રેમ>","targetFrameName":"ટાર્ગેટ ફ્રેમ નું નામ","targetPopup":"<પૉપ-�
-પ વિન્ડો>","targetPopupName":"પૉપ-�
-પ વિન્ડો નું નામ","title":"લિંક","toAnchor":"આ પેજનો ઍંકર","toEmail":"ઈ-મેલ","toUrl":"URL","toolbar":"લિંક ઇન્સર્ટ/દાખલ કરવી","type":"લિંક પ્રકાર","unlink":"લિંક કાઢવી","upload":"�
-પલોડ"},"list":{"bulletedlist":"બુલેટ સૂચિ","numberedlist":"સંખ્યાંકન સૂચિ"},"maximize":{"maximize":"મોટું કરવું","minimize":"નાનું કરવું"},"table":{"border":"કોઠાની બાજુ(બોર્ડર) સાઇઝ","caption":"મથાળું/ક�
-પ્શન ","cell":{"menu":"કોષના ખાના","insertBefore":"પહેલાં કોષ ઉમેરવો","insertAfter":"પછી કોષ ઉમેરવો","deleteCell":"કોષ ડિલીટ/કાઢી નાખવો","merge":"કોષ ભેગા કરવા","mergeRight":"જમણી બાજુ ભેગા કરવા","mergeDown":"નીચે ભેગા કરવા","splitHorizontal":"કોષને સમસ્તરીય વિભાજન કરવું","splitVertical":"કોષને સીધું ને ઊભું વિભાજન કરવું","title":"સેલના ગુણ","cellType":"સેલનો પ્રકાર","rowSpan":"આડી કટારની જગ્યા","colSpan":"ઊભી કતારની જગ્યા","wordWrap":"વર્ડ રેપ","hAlign":"સપાટ લાઈનદોરી","vAlign":"ઊભી લાઈનદોરી","alignBaseline":"બસે લાઈન","bgColor":"પાછાળનો રંગ","borderColor":"બોર્ડેર રંગ","data":"સ્વીકૃત માહિતી","header":"મથાળું","yes":"હા","no":"ના","invalidWidth":"સેલની પોહલાઈ આંકડો હોવો જોઈએ.","invalidHeight":"સેલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRowSpan":"રો સ્પાન આંકડો હોવો જોઈએ.","invalidColSpan":"કોલમ સ્પાન આંકડો હોવો જોઈએ.","chooseColor":"પસંદ કરવું"},"cellPad":"સેલ પ�
-ડિંગ","cellSpace":"સેલ �
-ંતર","column":{"menu":"કૉલમ/ઊભી કટાર","insertBefore":"પહેલાં કૉલમ/ઊભી કટાર ઉમેરવી","insertAfter":"પછી કૉલમ/ઊભી કટાર ઉમેરવી","deleteColumn":"કૉલમ/ઊભી કટાર ડિલીટ/કાઢી નાખવી"},"columns":"કૉલમ/ઊભી કટાર","deleteTable":"કોઠો ડિલીટ/કાઢી નાખવું","headers":"મથાળા","headersBoth":"બેવું","headersColumn":"પહેલી ઊભી કટાર","headersNone":"નથી ","headersRow":"પહેલી  કટાર","invalidBorder":"બોર્ડર એક આંકડો હોવો જોઈએ","invalidCellPadding":"સેલની �
-ંદરની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCellSpacing":"સેલ વચ્ચેની જગ્યા સુન્ય કરતા વધારે હોવી જોઈએ.","invalidCols":"ઉભી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidHeight":"ટેબલની ઊંચાઈ આંકડો હોવો જોઈએ.","invalidRows":"આડી કટાર, 0 કરતા વધારે હોવી જોઈએ.","invalidWidth":"ટેબલની પોહલાઈ આંકડો હોવો જોઈએ.","menu":"ટેબલ, કોઠાનું મથાળું","row":{"menu":"પંક્તિના ખાના","insertBefore":"પહેલાં પંક્તિ ઉમેરવી","insertAfter":"પછી પંક્તિ ઉમેરવી","deleteRow":"પંક્તિઓ ડિલીટ/કાઢી નાખવી"},"rows":"પંક્તિના ખાના","summary":"ટૂંકો એહેવાલ","title":"ટેબલ, કોઠાનું મથાળું","toolbar":"ટેબલ, કોઠો","widthPc":"પ્રતિશત","widthPx":"પિકસલ","widthUnit":"પોહાલાઈ એકમ"},"quicktable":{"more":"ઔર..."},"removeformat":{"toolbar":"ફૉર્મટ કાઢવું"},"sourcearea":{"toolbar":"મૂળ કે પ્રાથમિક દસ્તાવેજ"},"toolbar":{"toolbarCollapse":"ટૂલબાર નાનું કરવું","toolbarExpand":"ટૂલબાર મોટું કરવું","toolbarGroups":{"document":"દસ્તાવેજ","clipboard":"ક્લિપબોર્ડ/�
-ન","editing":"એડીટ કરવું","forms":"ફોર્મ","basicstyles":"બેસિક્ સ્ટાઇલ","paragraph":"ફકરો","links":"લીંક","insert":"ઉમેરવું","styles":"સ્ટાઇલ","colors":"રંગ","tools":"ટૂલ્સ"},"toolbars":"એડીટર ટૂલ બાર"},"undo":{"redo":"રિડૂ; પછી હતી એવી સ્થિતિ પાછી લાવવી","undo":"રદ કરવું; પહેલાં હતી એવી સ્થિતિ પાછી લાવવી"},"colordialog":{"clear":"સાફ કરવું","highlight":"હાઈઈટ","options":"રંગના વિકલ્પ","selected":"પસંદ કરેલો રંગ","title":"રંગ પસંદ કરો"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/he.js b/plugins/ckeditor/src/lang/he.js
deleted file mode 100644
index 4fc42b2be..000000000
--- a/plugins/ckeditor/src/lang/he.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['he']={"editor":"עורך טקסט עשיר","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"לחץ אלט ALT + 0 לעזרה","browseServer":"סייר השרת","url":"כתובת (URL)","protocol":"פרוטוקול","upload":"העלאה","uploadSubmit":"שליחה לשרת","image":"תמונה","flash":"פלאש","form":"טופס","checkbox":"תיבת סימון","radio":"לחצן אפשרויות","textField":"שדה טקסט","textarea":"איזור טקסט","hiddenField":"שדה חבוי","button":"כפתור","select":"שדה בחירה","imageButton":"כפתור תמונה","notSet":"<לא נקבע>","id":"זיהוי (ID)","name":"שם","langDir":"כיוון שפה","langDirLtr":"שמאל לימין (LTR)","langDirRtl":"ימין לשמאל (RTL)","langCode":"קוד שפה","longDescr":"קישור לתיאור מפורט","cssClass":"מחלקת עיצוב (CSS Class)","advisoryTitle":"כותרת מוצעת","cssStyle":"סגנון","ok":"אישור","cancel":"ביטול","close":"סגירה","preview":"תצוגה מקדימה","resize":"יש לגרור בכדי לשנות את הגודל","generalTab":"כללי","advancedTab":"אפשרויות מתקדמות","validateNumberFailed":"הערך חייב להיות מספרי.","confirmNewPage":"כל השינויים שלא נשמרו יאבדו. האם להעלות דף חדש?","confirmCancel":"חלק מהאפשרויות שונו, האם לסגור את הדיאלוג?","options":"אפשרויות","target":"מטרה","targetNew":"חלון חדש (_blank)","targetTop":"החלון העליון ביותר (_top)","targetSelf":"אותו חלון (_self)","targetParent":"חלון האב (_parent)","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","styles":"סגנון","cssClasses":"מחלקות גליונות סגנון","width":"רוחב","height":"גובה","align":"יישור","alignLeft":"לשמאל","alignRight":"לימין","alignCenter":"מרכז","alignJustify":"יישור לשוליים","alignTop":"למעלה","alignMiddle":"לאמצע","alignBottom":"לתחתית","alignNone":"None","invalidValue":"ערך לא חוקי.","invalidHeight":"הגובה חייב להיות מספר.","invalidWidth":"הרוחב חייב להיות מספר.","invalidCssLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של CSS (px, %, in, cm, mm, em, ex, pt, או pc).","invalidHtmlLength":"הערך שצוין לשדה \"%1\" חייב להיות מספר חיובי עם או ללא יחידת מידה חוקית של HTML (px או %).","invalidInlineStyle":"הערך שצויין לשדה הסגנון חייב להכיל זוג ערכים אחד או יותר בפורמט \"שם : ערך\", מופרדים על ידי נקודה-פסיק.","cssLengthTooltip":"יש להכניס מספר המייצג פיקסלים או מספר עם יחידת גליונות סגנון תקינה (px, %, in, cm, mm, em, ex, pt, או pc).","unavailable":"%1<span class=\"cke_accessibility\">, לא זמין</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"מחק","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. כל הזכויות שמורות.","dlgTitle":"אודות CKEditor","help":"היכנסו ל$1 לעזרה.","moreInfo":"למידע נוסף בקרו באתרנו:","title":"אודות CKEditor","userGuide":"מדריך המשתמש של CKEditor"},"clipboard":{"copy":"העתקה","copyError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות העתקה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+C).","cut":"גזירה","cutError":"הגדרות האבטחה בדפדפן שלך לא מאפשרות לעורך לבצע פעולות גזירה אוטומטיות. יש להשתמש במקלדת לשם כך (Ctrl/Cmd+X).","paste":"הדבקה","pasteArea":"איזור הדבקה","pasteMsg":"נא להדביק בתוך הקופסה באמצעות (<b>Ctrl/Cmd+V</b>) וללחוץ על <b>אישור</b>.","securityMsg":"עקב הגדרות אבטחה בדפדפן, לא ניתן לגשת אל לוח הגזירים (Clipboard) בצורה ישירה. נא להדביק שוב בחלון זה.","title":"הדבקה"},"base64image":{"alt":"טקסט חלופי","lockRatio":"נעילת היחס","vSpace":"מרווח אנכי","hSpace":"מרווח אופקי","border":"מסגרת"},"basicstyles":{"bold":"מודגש","italic":"נטוי","strike":"כתיב מחוק","subscript":"כתיב תחתון","superscript":"כתיב עליון","underline":"קו תחתון"},"bidi":{"ltr":"כיוון טקסט משמאל לימין (LTR)","rtl":"כיוון טקסט מימין לשמאל (RTL)"},"blockquote":{"toolbar":"בלוק ציטוט"},"button":{"selectedLabel":"1% (סומן)"},"colorbutton":{"auto":"אוטומטי","bgColorTitle":"צבע רקע","colors":{"000":"שחור","800000":"סגול כהה","8B4513":"חום בהיר","2F4F4F":"אפור צפחה","008080":"כחול-ירוק","000080":"כחול-סגול","4B0082":"אינדיגו","696969":"אפור מעומעם","B22222":"אדום-חום","A52A2A":"חום","DAA520":"כתום זהב","006400":"ירוק כהה","40E0D0":"טורקיז","0000CD":"כחול בינוני","800080":"סגול","808080":"אפור","F00":"אדום","FF8C00":"כתום כהה","FFD700":"זהב","008000":"ירוק","0FF":"ציאן","00F":"כחול","EE82EE":"סגלגל","A9A9A9":"אפור כהה","FFA07A":"כתום-וורוד","FFA500":"כתום","FFFF00":"צהוב","00FF00":"ליים","AFEEEE":"טורקיז בהיר","ADD8E6":"כחול בהיר","DDA0DD":"שזיף","D3D3D3":"אפור בהיר","FFF0F5":"לבנדר מסמיק","FAEBD7":"לבן עתיק","FFFFE0":"צהוב בהיר","F0FFF0":"טל דבש","F0FFFF":"תכלת","F0F8FF":"כחול טיפת מים","E6E6FA":"לבנדר","FFF":"לבן","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"צבעים נוספים...","panelTitle":"צבעים","textColorTitle":"צבע טקסט"},"font":{"fontSize":{"label":"גודל","voiceLabel":"גודל","panelTitle":"גודל"},"label":"גופן","panelTitle":"גופן","voiceLabel":"גופן"},"image":{"alt":"טקסט חלופי","border":"מסגרת","btnUpload":"שליחה לשרת","button2Img":"האם להפוך את תמונת הכפתור לתמונה פשוטה?","hSpace":"מרווח אופקי","img2Button":"האם להפוך את התמונה לכפתור תמונה?","infoTab":"מידע על התמונה","linkTab":"קישור","lockRatio":"נעילת היחס","menu":"תכונות התמונה","resetSize":"איפוס הגודל","title":"מאפייני התמונה","titleButton":"מאפיני כפתור תמונה","upload":"העלאה","urlMissing":"כתובת התמונה חסרה.","vSpace":"מרווח אנכי","validateBorder":"שדה המסגרת חייב להיות מספר שלם.","validateHSpace":"שדה המרווח האופקי חייב להיות מספר שלם.","validateVSpace":"שדה המרווח האנכי חייב להיות מספר שלם."},"widget":{"move":"לחץ וגרור להזזה","label":"%1 widget"},"image2":{"alt":"טקסט חלופי","btnUpload":"שליחה לשרת","captioned":"כותרת תמונה","captionPlaceholder":"כותרת","infoTab":"מידע על התמונה","lockRatio":"נעילת היחס","menu":"תכונות התמונה","pathName":"תמונה","pathNameCaption":"כותרת","resetSize":"איפוס הגודל","resizer":"לחץ וגרור לשינוי הגודל","title":"מאפייני התמונה","uploadTab":"העלאה","urlMissing":"כתובת התמונה חסרה.","altMissing":"Alternative text is missing."},"indent":{"indent":"הגדלת הזחה","outdent":"הקטנת הזחה"},"fakeobjects":{"anchor":"עוגן","flash":"סרטון פלאש","hiddenfield":"שדה חבוי","iframe":"חלון פנימי (iframe)","unknown":"אובייקט לא ידוע"},"link":{"acccessKey":"מקש גישה","advanced":"אפשרויות מתקדמות","advisoryContentType":"Content Type מוצע","advisoryTitle":"כותרת מוצעת","anchor":{"toolbar":"הוספת/עריכת נקודת עיגון","menu":"מאפייני נקודת עיגון","title":"מאפייני נקודת עיגון","name":"שם לנקודת עיגון","errorName":"יש להקליד שם לנקודת עיגון","remove":"מחיקת נקודת עיגון"},"anchorId":"עפ\"י זיהוי (ID) האלמנט","anchorName":"עפ\"י שם העוגן","charset":"קידוד המשאב המקושר","cssClasses":"גיליונות עיצוב קבוצות","download":"Force Download","displayText":"Display Text","emailAddress":"כתובת הדוא\"ל","emailBody":"גוף ההודעה","emailSubject":"נושא ההודעה","id":"זיהוי (ID)","info":"מידע על הקישור","langCode":"קוד שפה","langDir":"כיוון שפה","langDirLTR":"שמאל לימין (LTR)","langDirRTL":"ימין לשמאל (RTL)","menu":"מאפייני קישור","name":"שם","noAnchors":"(אין עוגנים זמינים בדף)","noEmail":"יש להקליד את כתובת הדוא\"ל","noUrl":"יש להקליד את כתובת הקישור (URL)","other":"<אחר>","popupDependent":"תלוי (Netscape)","popupFeatures":"תכונות החלון הקופץ","popupFullScreen":"מסך מלא (IE)","popupLeft":"מיקום צד שמאל","popupLocationBar":"סרגל כתובת","popupMenuBar":"סרגל תפריט","popupResizable":"שינוי גודל","popupScrollBars":"ניתן לגלילה","popupStatusBar":"סרגל חיווי","popupToolbar":"סרגל הכלים","popupTop":"מיקום צד עליון","rel":"קשר גומלין","selectAnchor":"בחירת עוגן","styles":"סגנון","tabIndex":"מספר טאב","target":"מטרה","targetFrame":"<מסגרת>","targetFrameName":"שם מסגרת היעד","targetPopup":"<חלון קופץ>","targetPopupName":"שם החלון הקופץ","title":"קישור","toAnchor":"עוגן בעמוד זה","toEmail":"דוא\"ל","toUrl":"כתובת (URL)","toolbar":"הוספת/עריכת קישור","type":"סוג קישור","unlink":"הסרת הקישור","upload":"העלאה"},"list":{"bulletedlist":"רשימת נקודות","numberedlist":"רשימה ממוספרת"},"maximize":{"maximize":"הגדלה למקסימום","minimize":"הקטנה למינימום"},"table":{"border":"גודל מסגרת","caption":"כיתוב","cell":{"menu":"מאפייני תא","insertBefore":"הוספת תא לפני","insertAfter":"הוספת תא אחרי","deleteCell":"מחיקת תאים","merge":"מיזוג תאים","mergeRight":"מזג ימינה","mergeDown":"מזג למטה","splitHorizontal":"פיצול תא אופקית","splitVertical":"פיצול תא אנכית","title":"תכונות התא","cellType":"סוג התא","rowSpan":"מתיחת השורות","colSpan":"מתיחת התאים","wordWrap":"מניעת גלישת שורות","hAlign":"יישור אופקי","vAlign":"יישור אנכי","alignBaseline":"שורת בסיס","bgColor":"צבע רקע","borderColor":"צבע מסגרת","data":"מידע","header":"כותרת","yes":"כן","no":"לא","invalidWidth":"שדה רוחב התא חייב להיות מספר.","invalidHeight":"שדה גובה התא חייב להיות מספר.","invalidRowSpan":"שדה מתיחת השורות חייב להיות מספר שלם.","invalidColSpan":"שדה מתיחת העמודות חייב להיות מספר שלם.","chooseColor":"בחר"},"cellPad":"ריפוד תא","cellSpace":"מרווח תא","column":{"menu":"עמודה","insertBefore":"הוספת עמודה לפני","insertAfter":"הוספת עמודה אחרי","deleteColumn":"מחיקת עמודות"},"columns":"עמודות","deleteTable":"מחק טבלה","headers":"כותרות","headersBoth":"שניהם","headersColumn":"עמודה ראשונה","headersNone":"אין","headersRow":"שורה ראשונה","invalidBorder":"שדה גודל המסגרת חייב להיות מספר.","invalidCellPadding":"שדה ריפוד התאים חייב להיות מספר חיובי.","invalidCellSpacing":"שדה ריווח התאים חייב להיות מספר חיובי.","invalidCols":"שדה מספר העמודות חייב להיות מספר גדול מ 0.","invalidHeight":"שדה גובה הטבלה חייב להיות מספר.","invalidRows":"שדה מספר השורות חייב להיות מספר גדול מ 0.","invalidWidth":"שדה רוחב הטבלה חייב להיות מספר.","menu":"מאפייני טבלה","row":{"menu":"שורה","insertBefore":"הוספת שורה לפני","insertAfter":"הוספת שורה אחרי","deleteRow":"מחיקת שורות"},"rows":"שורות","summary":"תקציר","title":"מאפייני טבלה","toolbar":"טבלה","widthPc":"אחוז","widthPx":"פיקסלים","widthUnit":"יחידת רוחב"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"הסרת העיצוב"},"sourcearea":{"toolbar":"מקור"},"toolbar":{"toolbarCollapse":"מזעור סרגל כלים","toolbarExpand":"הרחבת סרגל כלים","toolbarGroups":{"document":"מסמך","clipboard":"לוח הגזירים (Clipboard)/צעד אחרון","editing":"עריכה","forms":"טפסים","basicstyles":"עיצוב בסיסי","paragraph":"פסקה","links":"קישורים","insert":"הכנסה","styles":"עיצוב","colors":"צבעים","tools":"כלים"},"toolbars":"סרגלי כלים של העורך"},"undo":{"redo":"חזרה על צעד אחרון","undo":"ביטול צעד אחרון"},"colordialog":{"clear":"ניקוי","highlight":"סימון","options":"אפשרויות צבע","selected":"בחירה","title":"בחירת צבע"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/hi.js b/plugins/ckeditor/src/lang/hi.js
deleted file mode 100644
index feb366bef..000000000
--- a/plugins/ckeditor/src/lang/hi.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['hi']={"editor":"रिच टेक्स्ट एडिटर","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"मदद के लिये ALT 0 दबाए","browseServer":"सर्वर ब्राउज़ करें","url":"URL","protocol":"प्रोटोकॉल","upload":"�
-पलोड","uploadSubmit":"इसे सर्वर को भेजें","image":"तस्वीर","flash":"फ़्लैश","form":"फ़ॉर्म","checkbox":"च�
-क बॉक्स","radio":"रेडिओ बटन","textField":"टेक्स्ट फ़ील्ड","textarea":"टेक्स्ट एरिया","hiddenField":"गुप्त फ़ील्ड","button":"बटन","select":"चुनाव फ़ील्ड","imageButton":"तस्वीर बटन","notSet":"<स�
-ट नहीं>","id":"Id","name":"नाम","langDir":"भाषा लिखने की दिशा","langDirLtr":"बायें से दायें (LTR)","langDirRtl":"दायें से बायें (RTL)","langCode":"भाषा कोड","longDescr":"�
-धिक विवरण के लिए URL","cssClass":"स्टाइल-शीट क्लास","advisoryTitle":"परामर्श शीर्शक","cssStyle":"स्टाइल","ok":"ठीक है","cancel":"रद्द करें","close":"Close","preview":"प्रीव्यू","resize":"Resize","generalTab":"सामान्य","advancedTab":"ऍड्वान्स्ड","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"टार्गेट","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","styles":"स्टाइल","cssClasses":"स्टाइल-शीट क्लास","width":"चौड़ाई","height":"ऊँचाई","align":"ऍलाइन","alignLeft":"दायें","alignRight":"दायें","alignCenter":"बीच में","alignJustify":"ब्लॉक जस्टीफ़ाई","alignTop":"ऊपर","alignMiddle":"मध्य","alignBottom":"नीचे","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"कॉपी","copyError":"आपके ब्राआउज़र की सुरक्षा स�
-टिन्ग्स ने कॉपी करने की �
-नुमति नहीं प्रदान की है। (Ctrl/Cmd+C) का प्रयोग करें।","cut":"कट","cutError":"आपके ब्राउज़र की सुरक्षा स�
-टिन्ग्स ने कट करने की �
-नुमति नहीं प्रदान की है। (Ctrl/Cmd+X) का प्रयोग करें।","paste":"पेस्ट","pasteArea":"Paste Area","pasteMsg":"Ctrl/Cmd+V का प्रयोग करके पेस्ट करें और ठीक है करें.","securityMsg":"आपके ब्राउज़र की सुरक्षा आपके ब्राउज़र की सुरKश सैटिंग के कारण, एडिटर आपके क्लिपबोर्ड डेटा को नहीं पा सकता है. आपको उसे इस विन्डो में दोबारा पेस्ट करना होगा.","title":"पेस्ट"},"base64image":{"alt":"वैकल्पिक टेक्स्ट","lockRatio":"लॉक �
-नुपात","vSpace":"वर्टिकल स्पेस","hSpace":"हॉरिज़ॉन्टल स्पेस","border":"बॉर्डर"},"basicstyles":{"bold":"बोल्ड","italic":"इटैलिक","strike":"स्ट्राइक थ्रू","subscript":"�
-धोलेख","superscript":"�
-भिलेख","underline":"रेखांकण"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"ब्लॉक-कोट"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"स्वचालित","bgColorTitle":"बैक्ग्राउन्ड रंग","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"और रंग...","panelTitle":"Colors","textColorTitle":"टेक्स्ट रंग"},"font":{"fontSize":{"label":"साइज़","voiceLabel":"Font Size","panelTitle":"साइज़"},"label":"फ़ॉन्ट","panelTitle":"फ़ॉन्ट","voiceLabel":"फ़ॉन्ट"},"image":{"alt":"वैकल्पिक टेक्स्ट","border":"बॉर्डर","btnUpload":"इसे सर्वर को भेजें","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"हॉरिज़ॉन्टल स्पेस","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"तस्वीर की जानकारी","linkTab":"लिंक","lockRatio":"लॉक �
-नुपात","menu":"तस्वीर प्रॉपर्टीज़","resetSize":"रीस�
-ट साइज़","title":"तस्वीर प्रॉपर्टीज़","titleButton":"तस्वीर बटन प्रॉपर्टीज़","upload":"�
-पलोड","urlMissing":"Image source URL is missing.","vSpace":"वर्टिकल स्पेस","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"वैकल्पिक टेक्स्ट","btnUpload":"इसे सर्वर को भेजें","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"तस्वीर की जानकारी","lockRatio":"लॉक �
-नुपात","menu":"तस्वीर प्रॉपर्टीज़","pathName":"image","pathNameCaption":"caption","resetSize":"रीस�
-ट साइज़","resizer":"Click and drag to resize","title":"तस्वीर प्रॉपर्टीज़","uploadTab":"�
-पलोड","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"इन्ड�
-न्ट बढ़ायें","outdent":"इन्ड�
-न्ट कम करें"},"fakeobjects":{"anchor":"ऐंकर इन्सर्ट/संपादन","flash":"Flash Animation","hiddenfield":"गुप्त फ़ील्ड","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"ऍक्स�
-स की","advanced":"ऍड्वान्स्ड","advisoryContentType":"परामर्श कन्ट�
-न्ट प्रकार","advisoryTitle":"परामर्श शीर्शक","anchor":{"toolbar":"ऐंकर इन्सर्ट/संपादन","menu":"ऐंकर प्रॉपर्टीज़","title":"ऐंकर प्रॉपर्टीज़","name":"ऐंकर का नाम","errorName":"ऐंकर का नाम टाइप करें","remove":"Remove Anchor"},"anchorId":"ऍलीम�
-न्ट Id से","anchorName":"ऐंकर नाम से","charset":"लिंक रिसोर्स कर�
-क्टर स�
-ट","cssClasses":"स्टाइल-शीट क्लास","download":"Force Download","displayText":"Display Text","emailAddress":"ई-मेल पता","emailBody":"संदेश","emailSubject":"संदेश विषय","id":"Id","info":"लिंक  ","langCode":"भाषा लिखने की दिशा","langDir":"भाषा लिखने की दिशा","langDirLTR":"बायें से दायें (LTR)","langDirRTL":"दायें से बायें (RTL)","menu":"लिंक संपादन","name":"नाम","noAnchors":"(डॉक्यूम�
-न्ट में ऐंकर्स की संख्या)","noEmail":"ई-मेल पता टाइप करें","noUrl":"लिंक URL टाइप करें","other":"<�
-न्य>","popupDependent":"डिपेन्ड�
-न्ट (Netscape)","popupFeatures":"पॉप-�
-प विन्डो फ़ीचर्स","popupFullScreen":"फ़ुल स्क्रीन (IE)","popupLeft":"बायीं तरफ","popupLocationBar":"लोकेशन बार","popupMenuBar":"म�
-न्यू बार","popupResizable":"आकार बदलने लायक","popupScrollBars":"स्क्रॉल बार","popupStatusBar":"स्टेटस बार","popupToolbar":"टूल बार","popupTop":"दायीं तरफ","rel":"संबंध","selectAnchor":"ऐंकर चुनें","styles":"स्टाइल","tabIndex":"टैब इन्ड�
-क्स","target":"टार्गेट","targetFrame":"<फ़्रेम>","targetFrameName":"टार्गेट फ़्रेम का नाम","targetPopup":"<पॉप-�
-प विन्डो>","targetPopupName":"पॉप-�
-प विन्डो का नाम","title":"लिंक","toAnchor":"इस पेज का ऐंकर","toEmail":"ई-मेल","toUrl":"URL","toolbar":"लिंक इन्सर्ट/संपादन","type":"लिंक प्रकार","unlink":"लिंक हटायें","upload":"�
-पलोड"},"list":{"bulletedlist":"बुल�
-ट सूची","numberedlist":"�
-ंकीय सूची"},"maximize":{"maximize":"मेक्सिमाईज़","minimize":"मिनिमाईज़"},"table":{"border":"बॉर्डर साइज़","caption":"शीर्षक","cell":{"menu":"खाना","insertBefore":"पहले सैल डालें","insertAfter":"बाद में सैल डालें","deleteCell":"सैल डिलीट करें","merge":"सैल मिलायें","mergeRight":"बाँया विलय","mergeDown":"नीचे विलय करें","splitHorizontal":"सैल को क्षैतिज स्थिति में विभाजित करें","splitVertical":"सैल को लम्बाकार में विभाजित करें","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"सैल पैडिंग","cellSpace":"सैल �
-ंतर","column":{"menu":"कालम","insertBefore":"पहले कालम डालें","insertAfter":"बाद में कालम डालें","deleteColumn":"कालम डिलीट करें"},"columns":"कालम","deleteTable":"टेबल डिलीट करें","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"टेबल प्रॉपर्टीज़","row":{"menu":"पंक्ति","insertBefore":"पहले पंक्ति डालें","insertAfter":"बाद में पंक्ति डालें","deleteRow":"पंक्तियाँ डिलीट करें"},"rows":"पंक्तियाँ","summary":"सारांश","title":"टेबल प्रॉपर्टीज़","toolbar":"टेबल","widthPc":"प्रतिशत","widthPx":"पिक्सैल","widthUnit":"width unit"},"quicktable":{"more":"और..."},"removeformat":{"toolbar":"फ़ॉर्मैट हटायें"},"sourcearea":{"toolbar":"सोर्स"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"एडिटर टूलबार"},"undo":{"redo":"रीडू","undo":"�
-न्डू"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/hr.js b/plugins/ckeditor/src/lang/hr.js
deleted file mode 100644
index cf76970ad..000000000
--- a/plugins/ckeditor/src/lang/hr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['hr']={"editor":"Bogati uređivač teksta, %1","editorPanel":"Ploča Bogatog Uređivača Teksta","common":{"editorHelp":"Pritisni ALT 0 za pomoć","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Flash","form":"Forma","checkbox":"Checkbox","radio":"Radio Button","textField":"Text Field","textarea":"Textarea","hiddenField":"Hidden Field","button":"Button","select":"Selection Field","imageButton":"Image Button","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smjer jezika","langDirLtr":"S lijeva na desno (LTR)","langDirRtl":"S desna na lijevo (RTL)","langCode":"Kôd jezika","longDescr":"Dugački opis URL","cssClass":"Klase stilova","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Poništi","close":"Zatvori","preview":"Pregledaj","resize":"Povuci za promjenu veličine","generalTab":"Općenito","advancedTab":"Napredno","validateNumberFailed":"Ova vrijednost nije broj.","confirmNewPage":"Sve napravljene promjene će biti izgubljene ukoliko ih niste snimili. Sigurno želite učitati novu stranicu?","confirmCancel":"Neke od opcija su promjenjene. Sigurno želite zatvoriti ovaj prozor?","options":"Opcije","target":"Odredište","targetNew":"Novi prozor (_blank)","targetTop":"Vršni prozor (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Roditeljski prozor (_parent)","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","styles":"Stil","cssClasses":"Klase stilova","width":"Širina","height":"Visina","align":"Poravnanje","alignLeft":"Lijevo","alignRight":"Desno","alignCenter":"Središnje","alignJustify":"Blok poravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dolje","alignNone":"None","invalidValue":"Neispravna vrijednost.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih CSS mjernih jedinica (px, %, in, cm, mm, em, ex, pt ili pc).","invalidHtmlLength":"Vrijednost određena za \"%1\" polje mora biti pozitivni broj sa ili bez važećih HTML mjernih jedinica (px ili %).","invalidInlineStyle":"Vrijednost za linijski stil mora sadržavati jednu ili više definicija s formatom \"naziv:vrijednost\", odvojenih točka-zarezom.","cssLengthTooltip":"Unesite broj za vrijednost u pikselima ili broj s važećim CSS mjernim jedinicama (px, %, in, cm, mm, em, ex, pt ili pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupno</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"O CKEditoru","help":"Provjeri $1 za pomoć.","moreInfo":"Za informacije o licencama posjetite našu web stranicu:","title":"O CKEditoru","userGuide":"Vodič za CKEditor korisnike"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Sigurnosne postavke Vašeg pretraživača ne dozvoljavaju operacije automatskog izrezivanja. Molimo koristite kraticu na tipkovnici (Ctrl/Cmd+X).","paste":"Zalijepi","pasteArea":"Prostor za ljepljenje","pasteMsg":"Molimo zaljepite unutar doljnjeg okvira koristeći tipkovnicu (<STRONG>Ctrl/Cmd+V</STRONG>) i kliknite <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki Vašeg pretraživača, editor nema direktan pristup Vašem međuspremniku. Potrebno je ponovno zalijepiti tekst u ovaj prozor.","title":"Zalijepi"},"base64image":{"alt":"Alternativni tekst","lockRatio":"Zaključaj odnos","vSpace":"VSpace","hSpace":"HSpace","border":"Okvir"},"basicstyles":{"bold":"Podebljaj","italic":"Ukosi","strike":"Precrtano","subscript":"Subscript","superscript":"Superscript","underline":"Potcrtano"},"bidi":{"ltr":"Smjer teksta s lijeva na desno","rtl":"Smjer teksta s desna na lijevo"},"blockquote":{"toolbar":"Blockquote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Crna","800000":"Kesten","8B4513":"Smeđa","2F4F4F":"Tamno siva","008080":"Teal","000080":"Mornarska","4B0082":"Indigo","696969":"Tamno siva","B22222":"Vatrena cigla","A52A2A":"Smeđa","DAA520":"Zlatna","006400":"Tamno zelena","40E0D0":"Tirkizna","0000CD":"Srednje plava","800080":"Ljubičasta","808080":"Siva","F00":"Crvena","FF8C00":"Tamno naranđasta","FFD700":"Zlatna","008000":"Zelena","0FF":"Cijan","00F":"Plava","EE82EE":"Ljubičasta","A9A9A9":"Mutno siva","FFA07A":"Svijetli losos","FFA500":"Naranđasto","FFFF00":"Žuto","00FF00":"Limun","AFEEEE":"Blijedo tirkizna","ADD8E6":"Svijetlo plava","DDA0DD":"Šljiva","D3D3D3":"Svijetlo siva","FFF0F5":"Lavanda rumeno","FAEBD7":"Antikno bijela","FFFFE0":"Svijetlo žuta","F0FFF0":"Med","F0FFFF":"Azurna","F0F8FF":"Alice plava","E6E6FA":"Lavanda","FFF":"Bijela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Boje","textColorTitle":"Boja teksta"},"font":{"fontSize":{"label":"Veličina","voiceLabel":"Veličina slova","panelTitle":"Veličina"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Želite li promijeniti odabrani gumb u jednostavnu sliku?","hSpace":"HSpace","img2Button":"Želite li promijeniti odabranu sliku u gumb?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","resetSize":"Obriši veličinu","title":"Svojstva slika","titleButton":"Image Button svojstva","upload":"Pošalji","urlMissing":"Nedostaje URL slike.","vSpace":"VSpace","validateBorder":"Okvir mora biti cijeli broj.","validateHSpace":"HSpace mora biti cijeli broj","validateVSpace":"VSpace mora biti cijeli broj."},"widget":{"move":"Klikni i povuci da pomakneš","label":"%1 widget"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Svojstva slika","pathName":"image","pathNameCaption":"caption","resetSize":"Obriši veličinu","resizer":"Click and drag to resize","title":"Svojstva slika","uploadTab":"Pošalji","urlMissing":"Nedostaje URL slike.","altMissing":"Alternative text is missing."},"indent":{"indent":"Pomakni udesno","outdent":"Pomakni ulijevo"},"fakeobjects":{"anchor":"Sidro","flash":"Flash animacija","hiddenfield":"Sakriveno polje","iframe":"IFrame","unknown":"Nepoznati objekt"},"link":{"acccessKey":"Pristupna tipka","advanced":"Napredno","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Ubaci/promijeni sidro","menu":"Svojstva sidra","title":"Svojstva sidra","name":"Ime sidra","errorName":"Molimo unesite ime sidra","remove":"Ukloni sidro"},"anchorId":"Po Id elementa","anchorName":"Po nazivu sidra","charset":"Kodna stranica povezanih resursa","cssClasses":"Stylesheet klase","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smjer jezika","langDir":"Smjer jezika","langDirLTR":"S lijeva na desno (LTR)","langDirRTL":"S desna na lijevo (RTL)","menu":"Promijeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Molimo upišite e-mail adresu","noUrl":"Molimo upišite URL link","other":"<drugi>","popupDependent":"Ovisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Cijeli ekran (IE)","popupLeft":"Lijeva pozicija","popupLocationBar":"Traka za lokaciju","popupMenuBar":"Izborna traka","popupResizable":"Promjenjiva veličina","popupScrollBars":"Scroll traka","popupStatusBar":"Statusna traka","popupToolbar":"Traka s alatima","popupTop":"Gornja pozicija","rel":"Veza","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab Indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Ime ciljnog okvira","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Ubaci/promijeni link","type":"Link vrsta","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Obična lista","numberedlist":"Brojčana lista"},"maximize":{"maximize":"Povećaj","minimize":"Smanji"},"table":{"border":"Veličina okvira","caption":"Naslov","cell":{"menu":"Ćelija","insertBefore":"Ubaci ćeliju prije","insertAfter":"Ubaci ćeliju poslije","deleteCell":"Izbriši ćelije","merge":"Spoji ćelije","mergeRight":"Spoji desno","mergeDown":"Spoji dolje","splitHorizontal":"Podijeli ćeliju vodoravno","splitVertical":"Podijeli ćeliju okomito","title":"Svojstva ćelije","cellType":"Vrsta ćelije","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Prelazak u novi red","hAlign":"Vodoravno poravnanje","vAlign":"Okomito poravnanje","alignBaseline":"Osnovna linija","bgColor":"Boja pozadine","borderColor":"Boja ruba","data":"Podatak","header":"Zaglavlje","yes":"Da","no":"ne","invalidWidth":"Širina ćelije mora biti broj.","invalidHeight":"Visina ćelije mora biti broj.","invalidRowSpan":"Rows span mora biti cijeli broj.","invalidColSpan":"Columns span mora biti cijeli broj.","chooseColor":"Odaberi"},"cellPad":"Razmak ćelija","cellSpace":"Prostornost ćelija","column":{"menu":"Kolona","insertBefore":"Ubaci kolonu prije","insertAfter":"Ubaci kolonu poslije","deleteColumn":"Izbriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tablicu","headers":"Zaglavlje","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"Ništa","headersRow":"Prvi red","invalidBorder":"Debljina ruba mora biti broj.","invalidCellPadding":"Razmak ćelija mora biti broj.","invalidCellSpacing":"Prostornost ćelija mora biti broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tablice mora biti broj.","invalidRows":"Broj redova mora biti broj veći od 0.","invalidWidth":"Širina tablice mora biti broj.","menu":"Svojstva tablice","row":{"menu":"Red","insertBefore":"Ubaci red prije","insertAfter":"Ubaci red poslije","deleteRow":"Izbriši redove"},"rows":"Redova","summary":"Sažetak","title":"Svojstva tablice","toolbar":"Tablica","widthPc":"postotaka","widthPx":"piksela","widthUnit":"jedinica širine"},"quicktable":{"more":"Više..."},"removeformat":{"toolbar":"Ukloni formatiranje"},"sourcearea":{"toolbar":"Kôd"},"toolbar":{"toolbarCollapse":"Smanji alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Dokument","clipboard":"Međuspremnik/Poništi","editing":"Uređivanje","forms":"Forme","basicstyles":"Osnovni stilovi","paragraph":"Paragraf","links":"Veze","insert":"Umetni","styles":"Stilovi","colors":"Boje","tools":"Alatke"},"toolbars":"Alatne trake uređivača teksta"},"undo":{"redo":"Ponovi","undo":"Poništi"},"colordialog":{"clear":"Očisti","highlight":"Istaknuto","options":"Opcije boje","selected":"Odabrana boja","title":"Odaberi boju"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/hu.js b/plugins/ckeditor/src/lang/hu.js
deleted file mode 100644
index 70a1b389b..000000000
--- a/plugins/ckeditor/src/lang/hu.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['hu']={"editor":"HTML szerkesztő","editorPanel":"Rich Text szerkesztő panel","common":{"editorHelp":"Segítségért nyomjon ALT 0","browseServer":"Böngészés a szerveren","url":"Hivatkozás","protocol":"Protokoll","upload":"Feltöltés","uploadSubmit":"Küldés a szerverre","image":"Kép","flash":"Flash","form":"Űrlap","checkbox":"Jelölőnégyzet","radio":"Választógomb","textField":"Szövegmező","textarea":"Szövegterület","hiddenField":"Rejtettmező","button":"Gomb","select":"Legördülő lista","imageButton":"Képgomb","notSet":"<nincs beállítva>","id":"Azonosító","name":"Név","langDir":"Írás iránya","langDirLtr":"Balról jobbra","langDirRtl":"Jobbról balra","langCode":"Nyelv kódja","longDescr":"Részletes leírás webcíme","cssClass":"Stíluskészlet","advisoryTitle":"Súgócimke","cssStyle":"Stílus","ok":"Rendben","cancel":"Mégsem","close":"Bezárás","preview":"Előnézet","resize":"Húzza az átméretezéshez","generalTab":"Általános","advancedTab":"További opciók","validateNumberFailed":"A mezőbe csak számokat írhat.","confirmNewPage":"Minden nem mentett változás el fog veszni! Biztosan be szeretné tölteni az oldalt?","confirmCancel":"Az űrlap tartalma megváltozott, ám a változásokat nem rögzítette. Biztosan be szeretné zárni az űrlapot?","options":"Beállítások","target":"Cél","targetNew":"Új ablak (_blank)","targetTop":"Legfelső ablak (_top)","targetSelf":"Aktuális ablakban (_self)","targetParent":"Szülő ablak (_parent)","langDirLTR":"Balról jobbra (LTR)","langDirRTL":"Jobbról balra (RTL)","styles":"Stílus","cssClasses":"Stíluslap osztály","width":"Szélesség","height":"Magasság","align":"Igazítás","alignLeft":"Bal","alignRight":"Jobbra","alignCenter":"Középre","alignJustify":"Sorkizárt","alignTop":"Tetejére","alignMiddle":"Középre","alignBottom":"Aljára","alignNone":"None","invalidValue":"Érvénytelen érték.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidCssLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes CSS egységgel megjelölve(px, %, in, cm, mm, em, ex, pt vagy pc).","invalidHtmlLength":"\"%1\"-hez megadott érték csakis egy pozitív szám lehet, esetleg egy érvényes HTML egységgel megjelölve(px vagy %).","invalidInlineStyle":"Az inline stílusnak megadott értéknek tartalmaznia kell egy vagy több rekordot a \"name : value\" formátumban, pontosvesszővel elválasztva.","cssLengthTooltip":"Adjon meg egy számot értéknek pixelekben vagy egy számot érvényes CSS mértékegységben (px, %, in, cm, mm, em, ex, pt, vagy pc).","unavailable":"%1<span class=\"cke_accessibility\">, nem elérhető</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Minden jog fenntartva.","dlgTitle":"CKEditor névjegy","help":"Itt találsz segítséget: $1","moreInfo":"Licenszelési információkért kérjük látogassa meg weboldalunkat:","title":"CKEditor névjegy","userGuide":"CKEditor Felhasználói útmutató"},"clipboard":{"copy":"Másolás","copyError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a másolás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","cut":"Kivágás","cutError":"A böngésző biztonsági beállításai nem engedélyezik a szerkesztőnek, hogy végrehajtsa a kivágás műveletet. Használja az alábbi billentyűkombinációt (Ctrl/Cmd+X).","paste":"Beillesztés","pasteArea":"Beszúrás mező","pasteMsg":"Másolja be az alábbi mezőbe a <STRONG>Ctrl/Cmd+V</STRONG> billentyűk lenyomásával, majd nyomjon <STRONG>Rendben</STRONG>-t.","securityMsg":"A böngésző biztonsági beállításai miatt a szerkesztő nem képes hozzáférni a vágólap adataihoz. Illeszd be újra ebben az ablakban.","title":"Beillesztés"},"base64image":{"alt":"Buborék szöveg","lockRatio":"Arány megtartása","vSpace":"Függ. táv","hSpace":"Vízsz. táv","border":"Keret"},"basicstyles":{"bold":"Félkövér","italic":"Dőlt","strike":"Áthúzott","subscript":"Alsó index","superscript":"Felső index","underline":"Aláhúzott"},"bidi":{"ltr":"Szöveg iránya balról jobbra","rtl":"Szöveg iránya jobbról balra"},"blockquote":{"toolbar":"Idézet blokk"},"button":{"selectedLabel":"%1 (Kiválasztva)"},"colorbutton":{"auto":"Automatikus","bgColorTitle":"Háttérszín","colors":{"000":"Fekete","800000":"Bordó","8B4513":"Barna","2F4F4F":"Sötét türkiz","008080":"Türkiz","000080":"Király kék","4B0082":"Indigó kék","696969":"Szürke","B22222":"Tégla vörös","A52A2A":"Vörös","DAA520":"Arany sárga","006400":"Sötét zöld","40E0D0":"Türkiz","0000CD":"Kék","800080":"Lila","808080":"Szürke","F00":"Piros","FF8C00":"Sötét narancs","FFD700":"Arany","008000":"Zöld","0FF":"Türkiz","00F":"Kék","EE82EE":"Rózsaszín","A9A9A9":"Sötét szürke","FFA07A":"Lazac","FFA500":"Narancs","FFFF00":"Citromsárga","00FF00":"Neon zöld","AFEEEE":"Világos türkiz","ADD8E6":"Világos kék","DDA0DD":"Világos lila","D3D3D3":"Világos szürke","FFF0F5":"Lavender Blush","FAEBD7":"Törtfehér","FFFFE0":"Világos sárga","F0FFF0":"Menta","F0FFFF":"Azúr kék","F0F8FF":"Halvány kék","E6E6FA":"Lavender","FFF":"Fehér","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"További színek...","panelTitle":"Színek","textColorTitle":"Betűszín"},"font":{"fontSize":{"label":"Méret","voiceLabel":"Betűméret","panelTitle":"Méret"},"label":"Betűtípus","panelTitle":"Betűtípus","voiceLabel":"Betűtípus"},"image":{"alt":"Alternatív szöveg","border":"Keret","btnUpload":"Küldés a szerverre","button2Img":"A kiválasztott képgombból sima képet szeretne csinálni?","hSpace":"Vízsz. táv","img2Button":"A kiválasztott képből képgombot szeretne csinálni?","infoTab":"Alaptulajdonságok","linkTab":"Hivatkozás","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","resetSize":"Eredeti méret","title":"Kép tulajdonságai","titleButton":"Képgomb tulajdonságai","upload":"Feltöltés","urlMissing":"Hiányzik a kép URL-je","vSpace":"Függ. táv","validateBorder":"A keret méretének egész számot kell beírni!","validateHSpace":"Vízszintes távolságnak egész számot kell beírni!","validateVSpace":"Függőleges távolságnak egész számot kell beírni!"},"widget":{"move":"Kattints és húzd a mozgatáshoz","label":"%1 widget"},"image2":{"alt":"Buborék szöveg","btnUpload":"Küldés a szerverre","captioned":"Feliratozott kép","captionPlaceholder":"Képfelirat","infoTab":"Alaptulajdonságok","lockRatio":"Arány megtartása","menu":"Kép tulajdonságai","pathName":"kép","pathNameCaption":"felirat","resetSize":"Eredeti méret","resizer":"Kattints és húzz az átméretezéshez","title":"Kép tulajdonságai","uploadTab":"Feltöltés","urlMissing":"Hiányzik a kép URL-je","altMissing":"Alternative text is missing."},"indent":{"indent":"Behúzás növelése","outdent":"Behúzás csökkentése"},"fakeobjects":{"anchor":"Horgony","flash":"Flash animáció","hiddenfield":"Rejtett mezõ","iframe":"IFrame","unknown":"Ismeretlen objektum"},"link":{"acccessKey":"Billentyűkombináció","advanced":"További opciók","advisoryContentType":"Súgó tartalomtípusa","advisoryTitle":"Súgócimke","anchor":{"toolbar":"Horgony beillesztése/szerkesztése","menu":"Horgony tulajdonságai","title":"Horgony tulajdonságai","name":"Horgony neve","errorName":"Kérem adja meg a horgony nevét","remove":"Horgony eltávolítása"},"anchorId":"Azonosító szerint","anchorName":"Horgony név szerint","charset":"Hivatkozott tartalom kódlapja","cssClasses":"Stíluskészlet","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail cím","emailBody":"Üzenet","emailSubject":"Üzenet tárgya","id":"Id","info":"Alaptulajdonságok","langCode":"Írás iránya","langDir":"Írás iránya","langDirLTR":"Balról jobbra","langDirRTL":"Jobbról balra","menu":"Hivatkozás módosítása","name":"Név","noAnchors":"(Nincs horgony a dokumentumban)","noEmail":"Adja meg az E-Mail címet","noUrl":"Adja meg a hivatkozás webcímét","other":"<más>","popupDependent":"Szülőhöz kapcsolt (csak Netscape)","popupFeatures":"Felugró ablak jellemzői","popupFullScreen":"Teljes képernyő (csak IE)","popupLeft":"Bal pozíció","popupLocationBar":"Címsor","popupMenuBar":"Menü sor","popupResizable":"Átméretezés","popupScrollBars":"Gördítősáv","popupStatusBar":"Állapotsor","popupToolbar":"Eszköztár","popupTop":"Felső pozíció","rel":"Kapcsolat típusa","selectAnchor":"Horgony választása","styles":"Stílus","tabIndex":"Tabulátor index","target":"Tartalom megjelenítése","targetFrame":"<keretben>","targetFrameName":"Keret neve","targetPopup":"<felugró ablakban>","targetPopupName":"Felugró ablak neve","title":"Hivatkozás tulajdonságai","toAnchor":"Horgony az oldalon","toEmail":"E-Mail","toUrl":"URL","toolbar":"Hivatkozás beillesztése/módosítása","type":"Hivatkozás típusa","unlink":"Hivatkozás törlése","upload":"Feltöltés"},"list":{"bulletedlist":"Felsorolás","numberedlist":"Számozás"},"maximize":{"maximize":"Teljes méret","minimize":"Kis méret"},"table":{"border":"Szegélyméret","caption":"Felirat","cell":{"menu":"Cella","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteCell":"Cellák törlése","merge":"Cellák egyesítése","mergeRight":"Cellák egyesítése jobbra","mergeDown":"Cellák egyesítése lefelé","splitHorizontal":"Cellák szétválasztása vízszintesen","splitVertical":"Cellák szétválasztása függőlegesen","title":"Cella tulajdonságai","cellType":"Cella típusa","rowSpan":"Függőleges egyesítés","colSpan":"Vízszintes egyesítés","wordWrap":"Hosszú sorok törése","hAlign":"Vízszintes igazítás","vAlign":"Függőleges igazítás","alignBaseline":"Alapvonalra","bgColor":"Háttér színe","borderColor":"Keret színe","data":"Adat","header":"Fejléc","yes":"Igen","no":"Nem","invalidWidth":"A szélesség mezőbe csak számokat írhat.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRowSpan":"A függőleges egyesítés mezőbe csak számokat írhat.","invalidColSpan":"A vízszintes egyesítés mezőbe csak számokat írhat.","chooseColor":"Válasszon"},"cellPad":"Cella belső margó","cellSpace":"Cella térköz","column":{"menu":"Oszlop","insertBefore":"Beszúrás balra","insertAfter":"Beszúrás jobbra","deleteColumn":"Oszlopok törlése"},"columns":"Oszlopok","deleteTable":"Táblázat törlése","headers":"Fejlécek","headersBoth":"Mindkettő","headersColumn":"Első oszlop","headersNone":"Nincsenek","headersRow":"Első sor","invalidBorder":"A szegélyméret mezőbe csak számokat írhat.","invalidCellPadding":"A cella belső margó mezőbe csak számokat írhat.","invalidCellSpacing":"A cella térköz mezőbe csak számokat írhat.","invalidCols":"Az oszlopok számának nagyobbnak kell lenni mint 0.","invalidHeight":"A magasság mezőbe csak számokat írhat.","invalidRows":"A sorok számának nagyobbnak kell lenni mint 0.","invalidWidth":"A szélesség mezőbe csak számokat írhat.","menu":"Táblázat tulajdonságai","row":{"menu":"Sor","insertBefore":"Beszúrás fölé","insertAfter":"Beszúrás alá","deleteRow":"Sorok törlése"},"rows":"Sorok","summary":"Leírás","title":"Táblázat tulajdonságai","toolbar":"Táblázat","widthPc":"százalék","widthPx":"képpont","widthUnit":"Szélesség egység"},"quicktable":{"more":"További..."},"removeformat":{"toolbar":"Formázás eltávolítása"},"sourcearea":{"toolbar":"Forráskód"},"toolbar":{"toolbarCollapse":"Eszköztár összecsukása","toolbarExpand":"Eszköztár szétnyitása","toolbarGroups":{"document":"Dokumentum","clipboard":"Vágólap/Visszavonás","editing":"Szerkesztés","forms":"Űrlapok","basicstyles":"Alapstílusok","paragraph":"Bekezdés","links":"Hivatkozások","insert":"Beszúrás","styles":"Stílusok","colors":"Színek","tools":"Eszközök"},"toolbars":"Szerkesztő Eszköztár"},"undo":{"redo":"Ismétlés","undo":"Visszavonás"},"colordialog":{"clear":"Ürítés","highlight":"Nagyítás","options":"Szín opciók","selected":"Kiválasztott","title":"Válasszon színt"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/id.js b/plugins/ckeditor/src/lang/id.js
deleted file mode 100644
index 4bbcd035d..000000000
--- a/plugins/ckeditor/src/lang/id.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['id']={"editor":"Rich Text Editor","editorPanel":"Panel Rich Text Editor","common":{"editorHelp":"Tekan ALT 0 untuk bantuan.","browseServer":"Jelajah Server","url":"URL","protocol":"Protokol","upload":"Unggah","uploadSubmit":"Kirim ke Server","image":"Gambar","flash":"Flash","form":"Formulir","checkbox":"Kotak Cek","radio":"Tombol Radio","textField":"Kolom Teks","textarea":"Area Teks","hiddenField":"Kolom Tersembunyi","button":"Tombol","select":"Kolom Seleksi","imageButton":"Tombol Gambar","notSet":"<tidak diatur>","id":"Id","name":"Nama","langDir":"Arah Bahasa","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri","langCode":"Kode Bahasa","longDescr":"Deskripsi URL Panjang","cssClass":"Kelas Stylesheet","advisoryTitle":"Penasehat Judul","cssStyle":"Gaya","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Pratinjau","resize":"Ubah ukuran","generalTab":"Umum","advancedTab":"Lebih Lanjut","validateNumberFailed":"Nilai ini tidak sebuah angka","confirmNewPage":"Semua perubahan yang tidak disimpan di konten ini akan hilang. Apakah anda yakin ingin memuat halaman baru?","confirmCancel":"Beberapa opsi telah berubah. Apakah anda yakin ingin menutup dialog?","options":"Opsi","target":"Sasaran","targetNew":"Jendela Baru (_blank)","targetTop":"Laman Atas (_top)","targetSelf":"Jendela yang Sama (_self)","targetParent":"Jendela Induk (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Gaya","cssClasses":"Kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Penjajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Rata kiri-kanan","alignTop":"Atas","alignMiddle":"Tengah","alignBottom":"Bawah","alignNone":"Tidak ada","invalidValue":"Nilai tidak sah.","invalidHeight":"Tinggi harus sebuah angka.","invalidWidth":"Lebar harus sebuah angka.","invalidCssLength":"Nilai untuk \"%1\" harus sebuah angkat positif dengan atau tanpa pengukuran unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Nilai yang dispesifikasian untuk kolom \"%1\" harus sebuah angka positif dengan atau tanpa sebuah unit pengukuran HTML (px atau %) yang valid.","invalidInlineStyle":"Nilai pada inline style merupakan pasangan nama dan nilai dengan format \"nama : nilai\", yang dipisahkan dengan titik dua.","cssLengthTooltip":"Masukkan sebuah angka untuk sebuah nilai dalam pixel atau sebuah angka dengan unit CSS yang sah (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, tidak tersedia</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spasi","35":"End","36":"Home","46":"Hapus","224":"Command"},"keyboardShortcut":"Pintasan Keyboard"},"about":{"copy":"Hak cipta &copy; $1. All rights reserved.","dlgTitle":"Tentang CKEditor","help":"Cel $1 untuk bantuan.","moreInfo":"Untuk informasi lisensi silahkan kunjungi web site kami:","title":"Tentang CKEditor","userGuide":"Petunjuk Pengguna CKEditor"},"clipboard":{"copy":"Salin","copyError":"Pengaturan keamanan peramban anda tidak mengizinkan editor untuk mengeksekusi operasi menyalin secara otomatis. Mohon gunakan papan tuts (Ctrl/Cmd+C)","cut":"Potong","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"Tempel","pasteArea":"Area Tempel","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Karena pengaturan keamanan peramban anda, editor tida dapat mengakses data clipboard anda secara langsung. Anda harus mem-paste kembali pada halaman ini","title":"Tempel"},"base64image":{"alt":"Teks alternatif","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Batas"},"basicstyles":{"bold":"Huruf Tebal","italic":"Huruf Miring","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"Garis Bawah"},"bidi":{"ltr":"Arah penulisan dari kiri ke kanan.","rtl":"Arah penulisan dari kanan ke kiri."},"blockquote":{"toolbar":"Kutipan Blok"},"button":{"selectedLabel":"%1(Dipilih)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Warna Latar Belakang","colors":{"000":"Hitam","800000":"Merah Tua","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Abu-abu Gelap","B22222":"Merah Bata","A52A2A":"Coklat","DAA520":"Golden Rod","006400":"Hijau Gelap","40E0D0":"Turquoise","0000CD":"Biru Sedang","800080":"Ungu","808080":"Abu-abu","F00":"Merah","FF8C00":"Jingga Gelap","FFD700":"Emas","008000":"Hijau","0FF":"Cyan","00F":"Biru","EE82EE":"Violet","A9A9A9":"Abu-abu Redup","FFA07A":"Salmon Cerah","FFA500":"Jingga","FFFF00":"Kuning","00FF00":"Jeruk Lemon","AFEEEE":"Biru Hijau Pucat","ADD8E6":"Biru Cerah","DDA0DD":"Plum","D3D3D3":"Abu-abu Cerah","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Kuning Cerah","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Putih","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lainnya...","panelTitle":"Warna","textColorTitle":"Warna Teks"},"font":{"fontSize":{"label":"Ukuran","voiceLabel":"Ukuran Huruf","panelTitle":"Ukuran Huruf"},"label":"Huruf","panelTitle":"Font Name","voiceLabel":"Huruf"},"image":{"alt":"Teks alternatif","border":"Batas","btnUpload":"Kirim ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Apakah anda ingin mengubah gambar yang dipilih pada tombol gambar?","infoTab":"Info Gambar","linkTab":"Tautan","lockRatio":"Lock Ratio","menu":"Image Properties","resetSize":"Atur Ulang Ukuran","title":"Image Properties","titleButton":"Image Button Properties","upload":"Unggah","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border harus berupa angka","validateHSpace":"HSpace harus berupa angka","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Tekan dan geser untuk memindahkan","label":"%1 widget"},"image2":{"alt":"Teks alternatif","btnUpload":"Kirim ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Gambar","lockRatio":"Lock Ratio","menu":"Image Properties","pathName":"image","pathNameCaption":"caption","resetSize":"Atur Ulang Ukuran","resizer":"Click and drag to resize","title":"Image Properties","uploadTab":"Unggah","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Tingkatkan Lekuk","outdent":"Kurangi Lekuk"},"fakeobjects":{"anchor":"Anchor","flash":"Animasi Flash","hiddenfield":"Kolom Tersembunyi","iframe":"IFrame","unknown":"Obyek Tak Dikenal"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Penasehat Judul","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-mail","emailBody":"Message Body","emailSubject":"Judul Pesan","id":"Id","info":"Link Info","langCode":"Kode Bahasa","langDir":"Arah Bahasa","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Tautan","name":"Nama","noAnchors":"(No anchors available in the document)","noEmail":"Silahkan ketikkan alamat e-mail","noUrl":"Silahkan ketik URL tautan","other":"<lainnya>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Hubungan","selectAnchor":"Select an Anchor","styles":"Gaya","tabIndex":"Tab Index","target":"Sasaran","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Tautan","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Tautan","type":"Link Type","unlink":"Unlink","upload":"Unggah"},"list":{"bulletedlist":"Sisip/Hapus Daftar Bullet","numberedlist":"Sisip/Hapus Daftar Bernomor"},"maximize":{"maximize":"Memperbesar","minimize":"Memperkecil"},"table":{"border":"Ukuran batas","caption":"Judul halaman","cell":{"menu":"Sel","insertBefore":"Sisip Sel Sebelum","insertAfter":"Sisip Sel Setelah","deleteCell":"Hapus Sel","merge":"Gabungkan Sel","mergeRight":"Gabungkan ke Kanan","mergeDown":"Gabungkan ke Bawah","splitHorizontal":"Pisahkan Sel Secara Horisontal","splitVertical":"Pisahkan Sel Secara Vertikal","title":"Properti Sel","cellType":"Tipe Sel","rowSpan":"Rentang antar baris","colSpan":"Rentang antar kolom","wordWrap":"Word Wrap","hAlign":"Jajaran Horisontal","vAlign":"Jajaran Vertikal","alignBaseline":"Dasar","bgColor":"Warna Latar Belakang","borderColor":"Warna Batasan","data":"Data","header":"Header","yes":"Ya","no":"Tidak","invalidWidth":"Lebar sel harus sebuah angka.","invalidHeight":"Tinggi sel harus sebuah angka","invalidRowSpan":"Rentang antar baris harus angka seluruhnya.","invalidColSpan":"Rentang antar kolom harus angka seluruhnya","chooseColor":"Pilih"},"cellPad":"Sel spasi dalam","cellSpace":"Spasi antar sel","column":{"menu":"Kolom","insertBefore":"Sisip Kolom Sebelum","insertAfter":"Sisip Kolom Sesudah","deleteColumn":"Hapus Kolom"},"columns":"Kolom","deleteTable":"Hapus Tabel","headers":"Headers","headersBoth":"Keduanya","headersColumn":"Kolom pertama","headersNone":"Tidak ada","headersRow":"Baris Pertama","invalidBorder":"Ukuran batasan harus sebuah angka","invalidCellPadding":"'Spasi dalam' sel harus angka positif.","invalidCellSpacing":"Spasi antar sel harus angka positif.","invalidCols":"Jumlah kolom harus sebuah angka lebih besar dari 0","invalidHeight":"Tinggi tabel harus sebuah angka.","invalidRows":"Jumlah barus harus sebuah angka dan lebih besar dari 0.","invalidWidth":"Lebar tabel harus sebuah angka.","menu":"Properti Tabel","row":{"menu":"Baris","insertBefore":"Sisip Baris Sebelum","insertAfter":"Sisip Baris Sesudah","deleteRow":"Hapus Baris"},"rows":"Baris","summary":"Intisari","title":"Properti Tabel","toolbar":"Tabe","widthPc":"persen","widthPx":"piksel","widthUnit":"lebar satuan"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Hapus Format"},"sourcearea":{"toolbar":"Sumber"},"toolbar":{"toolbarCollapse":"Ciutkan Toolbar","toolbarExpand":"Bentangkan Toolbar","toolbarGroups":{"document":"Dokumen","clipboard":"Papan klip / Kembalikan perlakuan","editing":"Sunting","forms":"Formulir","basicstyles":"Gaya Dasar","paragraph":"Paragraf","links":"Tautan","insert":"Sisip","styles":"Gaya","colors":"Warna","tools":"Alat"},"toolbars":"Toolbar Penyunting"},"undo":{"redo":"Kembali lakukan","undo":"Batalkan perlakuan"},"colordialog":{"clear":"Hapus","highlight":"Sorot","options":"Pilihan Warna","selected":"Warna Dipilih","title":"Pilih Warna"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/is.js b/plugins/ckeditor/src/lang/is.js
deleted file mode 100644
index 7d0338870..000000000
--- a/plugins/ckeditor/src/lang/is.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['is']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Fletta í skjalasafni","url":"Vefslóð","protocol":"Samskiptastaðall","upload":"Senda upp","uploadSubmit":"Hlaða upp","image":"Setja inn mynd","flash":"Flash","form":"Setja inn innsláttarform","checkbox":"Setja inn hökunarreit","radio":"Setja inn valhnapp","textField":"Setja inn textareit","textarea":"Setja inn textasvæði","hiddenField":"Setja inn falið svæði","button":"Setja inn hnapp","select":"Setja inn lista","imageButton":"Setja inn myndahnapp","notSet":"<ekkert valið>","id":"Auðkenni","name":"Nafn","langDir":"Lesstefna","langDirLtr":"Frá vinstri til hægri (LTR)","langDirRtl":"Frá hægri til vinstri (RTL)","langCode":"Tungumálakóði","longDescr":"Nánari lýsing","cssClass":"Stílsniðsflokkur","advisoryTitle":"Titill","cssStyle":"Stíll","ok":"Í lagi","cancel":"Hætta við","close":"Close","preview":"Forskoða","resize":"Resize","generalTab":"Almennt","advancedTab":"Tæknilegt","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Mark","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","styles":"Stíll","cssClasses":"Stílsniðsflokkur","width":"Breidd","height":"Hæð","align":"Jöfnun","alignLeft":"Vinstri","alignRight":"Hægri","alignCenter":"Miðjað","alignJustify":"Jafna báðum megin","alignTop":"Efst","alignMiddle":"Miðjuð","alignBottom":"Neðst","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Afrita","copyError":"Öryggisstillingar vafrans þíns leyfa ekki afritun texta með músaraðgerð. Notaðu lyklaborðið í afrita (Ctrl/Cmd+C).","cut":"Klippa","cutError":"Öryggisstillingar vafrans þíns leyfa ekki klippingu texta með músaraðgerð. Notaðu lyklaborðið í klippa (Ctrl/Cmd+X).","paste":"Líma","pasteArea":"Paste Area","pasteMsg":"Límdu í svæðið hér að neðan og (<STRONG>Ctrl/Cmd+V</STRONG>) og smelltu á <STRONG>OK</STRONG>.","securityMsg":"Vegna öryggisstillinga í vafranum þínum fær ritillinn ekki beinan aðgang að klippuborðinu. Þú verður að líma innihaldið aftur inn í þennan glugga.","title":"Líma"},"base64image":{"alt":"Baklægur texti","lockRatio":"Festa stærðarhlutfall","vSpace":"Hægri bil","hSpace":"Vinstri bil","border":"Rammi"},"basicstyles":{"bold":"Feitletrað","italic":"Skáletrað","strike":"Yfirstrikað","subscript":"Niðurskrifað","superscript":"Uppskrifað","underline":"Undirstrikað"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Inndráttur"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Sjálfval","bgColorTitle":"Bakgrunnslitur","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fleiri liti...","panelTitle":"Colors","textColorTitle":"Litur texta"},"font":{"fontSize":{"label":"Leturstærð ","voiceLabel":"Font Size","panelTitle":"Leturstærð "},"label":"Leturgerð ","panelTitle":"Leturgerð ","voiceLabel":"Leturgerð "},"image":{"alt":"Baklægur texti","border":"Rammi","btnUpload":"Hlaða upp","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Vinstri bil","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Almennt","linkTab":"Stikla","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","resetSize":"Reikna stærð","title":"Eigindi myndar","titleButton":"Eigindi myndahnapps","upload":"Hlaða upp","urlMissing":"Image source URL is missing.","vSpace":"Hægri bil","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Baklægur texti","btnUpload":"Hlaða upp","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Almennt","lockRatio":"Festa stærðarhlutfall","menu":"Eigindi myndar","pathName":"image","pathNameCaption":"caption","resetSize":"Reikna stærð","resizer":"Click and drag to resize","title":"Eigindi myndar","uploadTab":"Senda upp","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Minnka inndrátt","outdent":"Auka inndrátt"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Skammvalshnappur","advanced":"Tæknilegt","advisoryContentType":"Tegund innihalds","advisoryTitle":"Titill","anchor":{"toolbar":"Stofna/breyta kaflamerki","menu":"Eigindi kaflamerkis","title":"Eigindi kaflamerkis","name":"Nafn bókamerkis","errorName":"Sláðu inn nafn bókamerkis!","remove":"Remove Anchor"},"anchorId":"Eftir auðkenni einingar","anchorName":"Eftir akkerisnafni","charset":"Táknróf","cssClasses":"Stílsniðsflokkur","download":"Force Download","displayText":"Display Text","emailAddress":"Netfang","emailBody":"Meginmál","emailSubject":"Efni","id":"Auðkenni","info":"Almennt","langCode":"Lesstefna","langDir":"Lesstefna","langDirLTR":"Frá vinstri til hægri (LTR)","langDirRTL":"Frá hægri til vinstri (RTL)","menu":"Breyta stiklu","name":"Nafn","noAnchors":"<Engin bókamerki á skrá>","noEmail":"Sláðu inn netfang!","noUrl":"Sláðu inn veffang stiklunnar!","other":"<annar>","popupDependent":"Háð venslum (Netscape)","popupFeatures":"Eigindi sprettiglugga","popupFullScreen":"Heilskjár (IE)","popupLeft":"Fjarlægð frá vinstri","popupLocationBar":"Fanglína","popupMenuBar":"Vallína","popupResizable":"Resizable","popupScrollBars":"Skrunstikur","popupStatusBar":"Stöðustika","popupToolbar":"Verkfærastika","popupTop":"Fjarlægð frá efri brún","rel":"Relationship","selectAnchor":"Veldu akkeri","styles":"Stíll","tabIndex":"Raðnúmer innsláttarreits","target":"Mark","targetFrame":"<rammi>","targetFrameName":"Nafn markglugga","targetPopup":"<sprettigluggi>","targetPopupName":"Nafn sprettiglugga","title":"Stikla","toAnchor":"Bókamerki á þessari síðu","toEmail":"Netfang","toUrl":"Vefslóð","toolbar":"Stofna/breyta stiklu","type":"Stikluflokkur","unlink":"Fjarlægja stiklu","upload":"Senda upp"},"list":{"bulletedlist":"Punktalisti","numberedlist":"Númeraður listi"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Breidd ramma","caption":"Titill","cell":{"menu":"Reitur","insertBefore":"Skjóta inn reiti fyrir aftan","insertAfter":"Skjóta inn reiti fyrir framan","deleteCell":"Fella reit","merge":"Sameina reiti","mergeRight":"Sameina til hægri","mergeDown":"Sameina niður á við","splitHorizontal":"Kljúfa reit lárétt","splitVertical":"Kljúfa reit lóðrétt","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Reitaspássía","cellSpace":"Bil milli reita","column":{"menu":"Dálkur","insertBefore":"Skjóta inn dálki vinstra megin","insertAfter":"Skjóta inn dálki hægra megin","deleteColumn":"Fella dálk"},"columns":"Dálkar","deleteTable":"Fella töflu","headers":"Fyrirsagnir","headersBoth":"Hvort tveggja","headersColumn":"Fyrsti dálkur","headersNone":"Engar","headersRow":"Fyrsta röð","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Eigindi töflu","row":{"menu":"Röð","insertBefore":"Skjóta inn röð fyrir ofan","insertAfter":"Skjóta inn röð fyrir neðan","deleteRow":"Eyða röð"},"rows":"Raðir","summary":"Áfram","title":"Eigindi töflu","toolbar":"Tafla","widthPc":"prósent","widthPx":"myndeindir","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Fjarlægja snið"},"sourcearea":{"toolbar":"Kóði"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Hætta við afturköllun","undo":"Afturkalla"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/it.js b/plugins/ckeditor/src/lang/it.js
deleted file mode 100644
index 3cf3fa8a6..000000000
--- a/plugins/ckeditor/src/lang/it.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['it']={"editor":"Rich Text Editor","editorPanel":"Pannello Rich Text Editor","common":{"editorHelp":"Premi ALT 0 per aiuto","browseServer":"Cerca sul server","url":"URL","protocol":"Protocollo","upload":"Carica","uploadSubmit":"Invia al server","image":"Immagine","flash":"Oggetto Flash","form":"Modulo","checkbox":"Checkbox","radio":"Radio Button","textField":"Campo di testo","textarea":"Area di testo","hiddenField":"Campo nascosto","button":"Bottone","select":"Menu di selezione","imageButton":"Bottone immagine","notSet":"<non impostato>","id":"Id","name":"Nome","langDir":"Direzione scrittura","langDirLtr":"Da Sinistra a Destra (LTR)","langDirRtl":"Da Destra a Sinistra (RTL)","langCode":"Codice Lingua","longDescr":"URL descrizione estesa","cssClass":"Nome classe CSS","advisoryTitle":"Titolo","cssStyle":"Stile","ok":"OK","cancel":"Annulla","close":"Chiudi","preview":"Anteprima","resize":"Trascina per ridimensionare","generalTab":"Generale","advancedTab":"Avanzate","validateNumberFailed":"Il valore inserito non è un numero.","confirmNewPage":"Ogni modifica non salvata sarà persa. Sei sicuro di voler caricare una nuova pagina?","confirmCancel":"Alcune delle opzioni sono state cambiate. Sei sicuro di voler chiudere la finestra di dialogo?","options":"Opzioni","target":"Destinazione","targetNew":"Nuova finestra (_blank)","targetTop":"Finestra in primo piano (_top)","targetSelf":"Stessa finestra (_self)","targetParent":"Finestra Padre (_parent)","langDirLTR":"Da sinistra a destra (LTR)","langDirRTL":"Da destra a sinistra (RTL)","styles":"Stile","cssClasses":"Classi di stile","width":"Larghezza","height":"Altezza","align":"Allineamento","alignLeft":"Sinistra","alignRight":"Destra","alignCenter":"Centrato","alignJustify":"Giustifica","alignTop":"In Alto","alignMiddle":"Centrato","alignBottom":"In Basso","alignNone":"Nessuno","invalidValue":"Valore non valido.","invalidHeight":"L'altezza dev'essere un numero","invalidWidth":"La Larghezza dev'essere un numero","invalidCssLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le classi CSS (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"Il valore indicato per il campo \"%1\" deve essere un numero positivo con o senza indicazione di una valida unità di misura per le pagine HTML (px o %).","invalidInlineStyle":"Il valore specificato per lo stile inline deve consistere in una o più tuple con il formato di \"name : value\", separati da semicolonne.","cssLengthTooltip":"Inserisci un numero per il valore in pixel oppure un numero con una valida unità CSS (px, %, in, cm, mm, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, non disponibile</span>","keyboard":{"8":"Backspace","13":"Invio","16":"Maiusc","17":"Ctrl","18":"Alt","32":"Spazio","35":"Fine","36":"Inizio","46":"Canc","224":"Comando"},"keyboardShortcut":"Scorciatoia da tastiera"},"about":{"copy":"Copyright &copy; $1. Tutti i diritti riservati.","dlgTitle":"Riguardo CKEditor","help":"Vedi $1 per l'aiuto.","moreInfo":"Per le informazioni sulla licenza si prega di visitare il nostro sito:","title":"Riguardo CKEditor","userGuide":"Guida Utente CKEditor"},"clipboard":{"copy":"Copia","copyError":"Le impostazioni di sicurezza del browser non permettono di copiare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+C).","cut":"Taglia","cutError":"Le impostazioni di sicurezza del browser non permettono di tagliare automaticamente il testo. Usa la tastiera (Ctrl/Cmd+X).","paste":"Incolla","pasteArea":"Incolla","pasteMsg":"Incolla il testo all'interno dell'area sottostante usando la scorciatoia di tastiere (<STRONG>Ctrl/Cmd+V</STRONG>) e premi <STRONG>OK</STRONG>.","securityMsg":"A causa delle impostazioni di sicurezza del browser,l'editor non è in grado di accedere direttamente agli appunti. E' pertanto necessario incollarli di nuovo in questa finestra.","title":"Incolla"},"base64image":{"alt":"Testo alternativo","lockRatio":"Blocca rapporto","vSpace":"VSpace","hSpace":"HSpace","border":"Bordo"},"basicstyles":{"bold":"Grassetto","italic":"Corsivo","strike":"Barrato","subscript":"Pedice","superscript":"Apice","underline":"Sottolineato"},"bidi":{"ltr":"Direzione del testo da sinistra verso destra","rtl":"Direzione del testo da destra verso sinistra"},"blockquote":{"toolbar":"Citazione"},"button":{"selectedLabel":"%1 (selezionato)"},"colorbutton":{"auto":"Automatico","bgColorTitle":"Colore sfondo","colors":{"000":"Nero","800000":"Marrone Castagna","8B4513":"Marrone Cuoio","2F4F4F":"Grigio Fumo di Londra","008080":"Acquamarina","000080":"Blu Oceano","4B0082":"Indigo","696969":"Grigio Scuro","B22222":"Giallo Fiamma","A52A2A":"Marrone","DAA520":"Giallo Mimosa","006400":"Verde Scuro","40E0D0":"Turchese","0000CD":"Blue Scuro","800080":"Viola","808080":"Grigio","F00":"Rosso","FF8C00":"Arancio Scuro","FFD700":"Oro","008000":"Verde","0FF":"Ciano","00F":"Blu","EE82EE":"Violetto","A9A9A9":"Grigio Scuro","FFA07A":"Salmone","FFA500":"Arancio","FFFF00":"Giallo","00FF00":"Lime","AFEEEE":"Turchese Chiaro","ADD8E6":"Blu Chiaro","DDA0DD":"Rosso Ciliegia","D3D3D3":"Grigio Chiaro","FFF0F5":"Lavanda Chiara","FAEBD7":"Bianco Antico","FFFFE0":"Giallo Chiaro","F0FFF0":"Verde Mela","F0FFFF":"Azzurro","F0F8FF":"Celeste","E6E6FA":"Lavanda","FFF":"Bianco","1ABC9C":"Ciano intenso","2ECC71":"Smeraldo","3498DB":"Blu luminoso","9B59B6":"Ametista","4E5F70":"Blu grigiastro","F1C40F":"Giallo vivido","16A085":"Ciano scuro","27AE60":"Smeraldo scuro","2980B9":"Blu intenso","8E44AD":"Viola scuro","2C3E50":"Blu desaturato","F39C12":"Arancio","E67E22":"Carota","E74C3C":"Rosso pallido","ECF0F1":"Argento luminoso","95A5A6":"Ciano grigiastro chiaro","DDD":"Grigio chiaro","D35400":"Zucca","C0392B":"Rosso intenso","BDC3C7":"Argento","7F8C8D":"Ciano grigiastro","999":"Grigio scuro"},"more":"Altri colori...","panelTitle":"Colori","textColorTitle":"Colore testo"},"font":{"fontSize":{"label":"Dimensione","voiceLabel":"Dimensione Carattere","panelTitle":"Dimensione"},"label":"Carattere","panelTitle":"Carattere","voiceLabel":"Carattere"},"image":{"alt":"Testo alternativo","border":"Bordo","btnUpload":"Invia al server","button2Img":"Vuoi trasformare il bottone immagine selezionato in un'immagine semplice?","hSpace":"HSpace","img2Button":"Vuoi trasferomare l'immagine selezionata in un bottone immagine?","infoTab":"Informazioni immagine","linkTab":"Collegamento","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","resetSize":"Reimposta dimensione","title":"Proprietà immagine","titleButton":"Proprietà bottone immagine","upload":"Carica","urlMissing":"Manca l'URL dell'immagine.","vSpace":"VSpace","validateBorder":"Il campo Bordo deve essere un numero intero.","validateHSpace":"Il campo HSpace deve essere un numero intero.","validateVSpace":"Il campo VSpace deve essere un numero intero."},"widget":{"move":"Fare clic e trascinare per spostare","label":"Widget %1"},"image2":{"alt":"Testo alternativo","btnUpload":"Invia al server","captioned":"Immagine con didascalia","captionPlaceholder":"Didascalia","infoTab":"Informazioni immagine","lockRatio":"Blocca rapporto","menu":"Proprietà immagine","pathName":"immagine","pathNameCaption":"didascalia","resetSize":"Reimposta dimensione","resizer":"Fare clic e trascinare per ridimensionare","title":"Proprietà immagine","uploadTab":"Carica","urlMissing":"Manca l'URL dell'immagine.","altMissing":"Testo alternativo mancante."},"indent":{"indent":"Aumenta rientro","outdent":"Riduci rientro"},"fakeobjects":{"anchor":"Ancora","flash":"Animazione Flash","hiddenfield":"Campo Nascosto","iframe":"IFrame","unknown":"Oggetto sconosciuto"},"link":{"acccessKey":"Scorciatoia da tastiera","advanced":"Avanzate","advisoryContentType":"Tipo della risorsa collegata","advisoryTitle":"Titolo","anchor":{"toolbar":"Inserisci/Modifica Ancora","menu":"Proprietà ancora","title":"Proprietà ancora","name":"Nome ancora","errorName":"Inserici il nome dell'ancora","remove":"Rimuovi l'ancora"},"anchorId":"Per id elemento","anchorName":"Per Nome","charset":"Set di caretteri della risorsa collegata","cssClasses":"Nome classe CSS","download":"Forza scaricamento","displayText":"Mostra testo","emailAddress":"Indirizzo E-Mail","emailBody":"Corpo del messaggio","emailSubject":"Oggetto del messaggio","id":"Id","info":"Informazioni collegamento","langCode":"Direzione scrittura","langDir":"Direzione scrittura","langDirLTR":"Da Sinistra a Destra (LTR)","langDirRTL":"Da Destra a Sinistra (RTL)","menu":"Modifica collegamento","name":"Nome","noAnchors":"(Nessuna ancora disponibile nel documento)","noEmail":"Devi inserire un'indirizzo e-mail","noUrl":"Devi inserire l'URL del collegamento","other":"<altro>","popupDependent":"Dipendente (Netscape)","popupFeatures":"Caratteristiche finestra popup","popupFullScreen":"A tutto schermo (IE)","popupLeft":"Posizione da sinistra","popupLocationBar":"Barra degli indirizzi","popupMenuBar":"Barra del menu","popupResizable":"Ridimensionabile","popupScrollBars":"Barre di scorrimento","popupStatusBar":"Barra di stato","popupToolbar":"Barra degli strumenti","popupTop":"Posizione dall'alto","rel":"Relazioni","selectAnchor":"Scegli Ancora","styles":"Stile","tabIndex":"Ordine di tabulazione","target":"Destinazione","targetFrame":"<riquadro>","targetFrameName":"Nome del riquadro di destinazione","targetPopup":"<finestra popup>","targetPopupName":"Nome finestra popup","title":"Collegamento","toAnchor":"Ancora nel testo","toEmail":"E-Mail","toUrl":"URL","toolbar":"Collegamento","type":"Tipo di Collegamento","unlink":"Elimina collegamento","upload":"Carica"},"list":{"bulletedlist":"Inserisci/Rimuovi Elenco Puntato","numberedlist":"Inserisci/Rimuovi Elenco Numerato"},"maximize":{"maximize":"Massimizza","minimize":"Minimizza"},"table":{"border":"Dimensione bordo","caption":"Intestazione","cell":{"menu":"Cella","insertBefore":"Inserisci Cella Prima","insertAfter":"Inserisci Cella Dopo","deleteCell":"Elimina celle","merge":"Unisce celle","mergeRight":"Unisci a Destra","mergeDown":"Unisci in Basso","splitHorizontal":"Dividi Cella Orizzontalmente","splitVertical":"Dividi Cella Verticalmente","title":"Proprietà della cella","cellType":"Tipo di cella","rowSpan":"Su più righe","colSpan":"Su più colonne","wordWrap":"Ritorno a capo","hAlign":"Allineamento orizzontale","vAlign":"Allineamento verticale","alignBaseline":"Linea Base","bgColor":"Colore di Sfondo","borderColor":"Colore del Bordo","data":"Dati","header":"Intestazione","yes":"Si","no":"No","invalidWidth":"La larghezza della cella dev'essere un numero.","invalidHeight":"L'altezza della cella dev'essere un numero.","invalidRowSpan":"Il numero di righe dev'essere un numero intero.","invalidColSpan":"Il numero di colonne dev'essere un numero intero.","chooseColor":"Scegli"},"cellPad":"Padding celle","cellSpace":"Spaziatura celle","column":{"menu":"Colonna","insertBefore":"Inserisci Colonna Prima","insertAfter":"Inserisci Colonna Dopo","deleteColumn":"Elimina colonne"},"columns":"Colonne","deleteTable":"Cancella Tabella","headers":"Intestazione","headersBoth":"Entrambe","headersColumn":"Prima Colonna","headersNone":"Nessuna","headersRow":"Prima Riga","invalidBorder":"La dimensione del bordo dev'essere un numero.","invalidCellPadding":"Il paging delle celle dev'essere un numero","invalidCellSpacing":"La spaziatura tra le celle dev'essere un numero.","invalidCols":"Il numero di colonne dev'essere un numero maggiore di 0.","invalidHeight":"L'altezza della tabella dev'essere un numero.","invalidRows":"Il numero di righe dev'essere un numero maggiore di 0.","invalidWidth":"La larghezza della tabella dev'essere un numero.","menu":"Proprietà tabella","row":{"menu":"Riga","insertBefore":"Inserisci Riga Prima","insertAfter":"Inserisci Riga Dopo","deleteRow":"Elimina righe"},"rows":"Righe","summary":"Indice","title":"Proprietà tabella","toolbar":"Tabella","widthPc":"percento","widthPx":"pixel","widthUnit":"unità larghezza"},"quicktable":{"more":"Altri..."},"removeformat":{"toolbar":"Elimina formattazione"},"sourcearea":{"toolbar":"Sorgente"},"toolbar":{"toolbarCollapse":"Minimizza Toolbar","toolbarExpand":"Espandi Toolbar","toolbarGroups":{"document":"Documento","clipboard":"Copia negli appunti/Annulla","editing":"Modifica","forms":"Form","basicstyles":"Stili di base","paragraph":"Paragrafo","links":"Link","insert":"Inserisci","styles":"Stili","colors":"Colori","tools":"Strumenti"},"toolbars":"Editor toolbar"},"undo":{"redo":"Ripristina","undo":"Annulla"},"colordialog":{"clear":"cancella","highlight":"Evidenzia","options":"Opzioni colore","selected":"Seleziona il colore","title":"Selezionare il colore"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ja.js b/plugins/ckeditor/src/lang/ja.js
deleted file mode 100644
index 5b5946e9a..000000000
--- a/plugins/ckeditor/src/lang/ja.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ja']={"editor":"リッチテキストエディタ","editorPanel":"リッチテキストエディタパネル","common":{"editorHelp":"ヘルプは ALT 0 を押してください","browseServer":"サーバブラウザ","url":"URL","protocol":"プロトコル","upload":"アップロード","uploadSubmit":"サーバーに送信","image":"イメージ","flash":"Flash","form":"フォーム","checkbox":"チェックボックス","radio":"ラジオボタン","textField":"１行テキスト","textarea":"テキストエリア","hiddenField":"不可視フィールド","button":"ボタン","select":"選択フィールド","imageButton":"画像ボタン","notSet":"<なし>","id":"Id","name":"Name属性","langDir":"文字表記の方向","langDirLtr":"左から右 (LTR)","langDirRtl":"右から左 (RTL)","langCode":"言語コード","longDescr":"longdesc属性(長文説明)","cssClass":"スタイルシートクラス","advisoryTitle":"Title属性","cssStyle":"スタイルシート","ok":"OK","cancel":"キャンセル","close":"閉じる","preview":"プレビュー","resize":"ドラッグしてリサイズ","generalTab":"�
-�般","advancedTab":"高度な設定","validateNumberFailed":"値が数ではありません","confirmNewPage":"変更�
-容を保存せず、 新しいページを開いてもよろしいでしょうか？","confirmCancel":"オプション設定を変更しました。ダイアログを閉じてもよろしいでしょうか？","options":"オプション","target":"ターゲット","targetNew":"新しいウインドウ (_blank)","targetTop":"最上部ウィンドウ (_top)","targetSelf":"同じウィンドウ (_self)","targetParent":"親ウィンドウ (_parent)","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","styles":"スタイル","cssClasses":"スタイルシートクラス","width":"�
-","height":"高さ","align":"行揃え","alignLeft":"左","alignRight":"右","alignCenter":"中央","alignJustify":"両端揃え","alignTop":"上","alignMiddle":"中央","alignBottom":"下","alignNone":"なし","invalidValue":"不正な値です。","invalidHeight":"高さは数値で�
-�力してください。","invalidWidth":"�
-は数値で�
-�力してください。","invalidCssLength":"�
-�力された \"%1\" �
-目の値は、CSSの大きさ(px, %, in, cm, mm, em, ex, pt, または pc)が正しいものである/ないに関わらず、正の値である�
-要があります。","invalidHtmlLength":"�
-�力された \"%1\" �
-目の値は、HTMLの大きさ(px または %)が正しいものである/ないに関わらず、正の値である�
-要があります。","invalidInlineStyle":"�
-�力されたインラインスタイルの値は、\"名前 : 値\" のフォーマットのセットで、複数の場合はセミコロンで区切られている形式である�
-要があります。","cssLengthTooltip":"ピクセル数もしくはCSSにセットできる数値を�
-�力してください。(px,%,in,cm,mm,em,ex,pt,or pc)","unavailable":"%1<span class=\"cke_accessibility\">, 利用不可能</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"キーボードショートカット"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"CKEditorについて","help":"$1 のヘルプを見てください。","moreInfo":"ライセンス�
-報の詳細はウェブサイトにて確認してください:","title":"CKEditorについて","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"コピー","copyError":"ブラウザーのセキュリティ設定によりエディタのコピー操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+C)を使用してください。","cut":"切り取り","cutError":"ブラウザーのセキュリティ設定によりエディタの切り取り操作を自動で実行することができません。実行するには手動でキーボードの(Ctrl/Cmd+X)を使用してください。","paste":"貼り付け","pasteArea":"貼り付け場所","pasteMsg":"キーボード(<STRONG>Ctrl/Cmd+V</STRONG>)を使用して、次の�
-�力エリア�
-で貼り付けて、<STRONG>OK</STRONG>を押してください。","securityMsg":"ブラウザのセキュリティ設定により、エディタはクリップボードデータに直接アクセスすることができません。このウィンドウは貼り付け操作を行う度に表示されます。","title":"貼り付け"},"base64image":{"alt":"代替テキスト","lockRatio":"比率を固定","vSpace":"垂直間隔","hSpace":"水平間隔","border":"枠線の�
-"},"basicstyles":{"bold":"太字","italic":"斜体","strike":"打ち消し線","subscript":"下付き","superscript":"上付き","underline":"下線"},"bidi":{"ltr":"テキストの向き : 左から右へ","rtl":"テキストの向き : 右から左へ"},"blockquote":{"toolbar":"ブロック引用文"},"button":{"selectedLabel":"%1 (選択中)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景色","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"その他の色...","panelTitle":"色","textColorTitle":"文字色"},"font":{"fontSize":{"label":"サイズ","voiceLabel":"フォントサイズ","panelTitle":"フォントサイズ"},"label":"フォント","panelTitle":"フォント","voiceLabel":"フォント"},"image":{"alt":"代替テキスト","border":"枠線の�
-","btnUpload":"サーバーに送信","button2Img":"選択した画像ボタンを画像に変換しますか？","hSpace":"水平間隔","img2Button":"選択した画像を画像ボタンに変換しますか？","infoTab":"画像�
-報","linkTab":"リンク","lockRatio":"比率を固定","menu":"画像のプロパティ","resetSize":"サイズをリセット","title":"画像のプロパティ","titleButton":"画像ボタンのプロパティ","upload":"アップロード","urlMissing":"画像のURLを�
-�力してください。","vSpace":"垂直間隔","validateBorder":"枠線の�
-は数値で�
-�力してください。","validateHSpace":"水平間隔は数値で�
-�力してください。","validateVSpace":"垂直間隔は数値で�
-�力してください。"},"widget":{"move":"ドラッグして移動","label":"%1 ウィジェット"},"image2":{"alt":"代替テキスト","btnUpload":"サーバーに送信","captioned":"キャプションを付ける","captionPlaceholder":"キャプション","infoTab":"画像�
-報","lockRatio":"比率を固定","menu":"画像のプロパティ","pathName":"image","pathNameCaption":"caption","resetSize":"サイズをリセット","resizer":"ドラッグしてリサイズ","title":"画像のプロパティ","uploadTab":"アップロード","urlMissing":"画像のURLを�
-�力してください。","altMissing":"Alternative text is missing."},"indent":{"indent":"インデント","outdent":"インデント解除"},"fakeobjects":{"anchor":"アンカー","flash":"Flash Animation","hiddenfield":"不可視フィールド","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"アクセスキー","advanced":"高度な設定","advisoryContentType":"Content Type属性","advisoryTitle":"Title属性","anchor":{"toolbar":"アンカー挿�
-�/編集","menu":"アンカーの編集","title":"アンカーのプロパティ","name":"アンカー名","errorName":"アンカー名を�
-�力してください。","remove":"アンカーを削除"},"anchorId":"エレメントID","anchorName":"アンカー名","charset":"リンク�
-�のcharset","cssClasses":"スタイルシートクラス","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail アドレス","emailBody":"本文","emailSubject":"件名","id":"Id","info":"ハイパーリンク�
-報","langCode":"言語コード","langDir":"文字表記の方向","langDirLTR":"左から右 (LTR)","langDirRTL":"右から左 (RTL)","menu":"リンクを編集","name":"Name属性","noAnchors":"(このドキュメント�
-にアンカーはありません)","noEmail":"メールアドレスを�
-�力してください。","noUrl":"リンクURLを�
-�力してください。","other":"<その他の>","popupDependent":"開いたウィンドウに連動して閉じる (Netscape)","popupFeatures":"ポップアップウィンドウ特徴","popupFullScreen":"�
-�画面モード(IE)","popupLeft":"左端からの座標で指定","popupLocationBar":"ロケーションバー","popupMenuBar":"メニューバー","popupResizable":"サイズ可変","popupScrollBars":"スクロールバー","popupStatusBar":"ステータスバー","popupToolbar":"ツールバー","popupTop":"上端からの座標で指定","rel":"関連リンク","selectAnchor":"アンカーを選択","styles":"スタイルシート","tabIndex":"タブインデックス","target":"ターゲット","targetFrame":"<フレーム>","targetFrameName":"ターゲットのフレーム名","targetPopup":"<ポップアップウィンドウ>","targetPopupName":"ポップアップウィンドウ名","title":"ハイパーリンク","toAnchor":"ページ�
-のアンカー","toEmail":"E-Mail","toUrl":"URL","toolbar":"リンク挿�
-�/編集","type":"リンクタイプ","unlink":"リンクを削除","upload":"アップロード"},"list":{"bulletedlist":"番号無しリスト","numberedlist":"番号付きリスト"},"maximize":{"maximize":"最大化","minimize":"最小化"},"table":{"border":"枠線の�
-","caption":"キャプション","cell":{"menu":"セル","insertBefore":"セルを前に挿�
-�","insertAfter":"セルを後に挿�
-�","deleteCell":"セルを削除","merge":"セルを結合","mergeRight":"右に結合","mergeDown":"下に結合","splitHorizontal":"セルを水平方向に分割","splitVertical":"セルを垂直方向に分割","title":"セルのプロパティ","cellType":"セルの種類","rowSpan":"行の結合数","colSpan":"列の結合数","wordWrap":"単語の折り返し","hAlign":"水平方向の�
-�置","vAlign":"垂直方向の�
-�置","alignBaseline":"ベースライン","bgColor":"背景色","borderColor":"ボーダーカラー","data":"テーブルデータ (td)","header":"ヘッダ","yes":"はい","no":"いいえ","invalidWidth":"セル�
-は数値で�
-�力してください。","invalidHeight":"セル高さは数値で�
-�力してください。","invalidRowSpan":"縦�
-(行数)は数値で�
-�力してください。","invalidColSpan":"横�
-(列数)は数値で�
-�力してください。","chooseColor":"色の選択"},"cellPad":"セル�
-間隔","cellSpace":"セル�
-余白","column":{"menu":"列","insertBefore":"列を左に挿�
-�","insertAfter":"列を右に挿�
-�","deleteColumn":"列を削除"},"columns":"列数","deleteTable":"表を削除","headers":"ヘッダ (th)","headersBoth":"両方","headersColumn":"最初の列のみ","headersNone":"なし","headersRow":"最初の行のみ","invalidBorder":"枠線の�
-は数値で�
-�力してください。","invalidCellPadding":"セル�
-余白は数値で�
-�力してください。","invalidCellSpacing":"セル間余白は数値で�
-�力してください。","invalidCols":"列数は0より大きな数値を�
-�力してください。","invalidHeight":"高さは数値で�
-�力してください。","invalidRows":"行数は0より大きな数値を�
-�力してください。","invalidWidth":"�
-は数値で�
-�力してください。","menu":"表のプロパティ","row":{"menu":"行","insertBefore":"行を上に挿�
-�","insertAfter":"行を下に挿�
-�","deleteRow":"行を削除"},"rows":"行数","summary":"表の概要","title":"表のプロパティ","toolbar":"表","widthPc":"パーセント","widthPx":"ピクセル","widthUnit":"�
-の単位"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"書式を解除"},"sourcearea":{"toolbar":"ソース"},"toolbar":{"toolbarCollapse":"ツールバーを閉じる","toolbarExpand":"ツールバーを開く","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"編集ツールバー"},"undo":{"redo":"やり直す","undo":"�
-�に戻す"},"colordialog":{"clear":"クリア","highlight":"ハイライト","options":"カラーオプション","selected":"選択された色","title":"色選択"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ka.js b/plugins/ckeditor/src/lang/ka.js
deleted file mode 100644
index 33b7187f9..000000000
--- a/plugins/ckeditor/src/lang/ka.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ka']={"editor":"ტექსტის რედაქტორი","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"დააჭირეთ ALT 0-ს დახმარების მისაღებად","browseServer":"სერვერზე დათვალიერება","url":"URL","protocol":"პროტოკოლი","upload":"ატვირთვა","uploadSubmit":"სერვერზე გაგზავნა","image":"სურათი","flash":"Flash","form":"ფორმა","checkbox":"მონიშვნის ღილაკი","radio":"ამორჩევის ღილაკი","textField":"ტექსტური ველი","textarea":"ტექსტური არე","hiddenField":"მალული ველი","button":"ღილაკი","select":"არჩევის ველი","imageButton":"სურათიანი ღილაკი","notSet":"<არაფერი>","id":"Id","name":"სახელი","langDir":"ენის მიმართულება","langDirLtr":"მარცხნიდან მარჯვნივ (LTR)","langDirRtl":"მარჯვნიდან მარცხნივ (RTL)","langCode":"ენის კოდი","longDescr":"დიდი აღწერის URL","cssClass":"CSS კლასი","advisoryTitle":"სათაური","cssStyle":"CSS სტილი","ok":"დიახ","cancel":"გაუქმება","close":"დახურვა","preview":"გადახედვა","resize":"გაწიე ზომის შესაცვლელად","generalTab":"ინფორმაცია","advancedTab":"გაფართოებული","validateNumberFailed":"ეს მნიშვნელობა არაა რიცხვი.","confirmNewPage":"ამ დოკუმენტში ყველა ჩაუწერელი ცვლილება დაიკარგება. დარწმუნებული ხართ რომ ახალი გვერდის ჩატვირთვა გინდათ?","confirmCancel":"ზოგიერთი პარამეტრი შეცვლილია, დარწმუნებულილ ხართ რომ ფანჯრის დახურვა გსურთ?","options":"პარამეტრები","target":"გახსნის ადგილი","targetNew":"ახალი ფანჯარა (_blank)","targetTop":"ზედა ფანჯარა (_top)","targetSelf":"იგივე ფანჯარა (_self)","targetParent":"მშობელი ფანჯარა (_parent)","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","styles":"სტილი","cssClasses":"CSS კლასი","width":"სიგანე","height":"სიმაღლე","align":"სწორება","alignLeft":"მარცხენა","alignRight":"მარჯვენა","alignCenter":"შუა","alignJustify":"両端揃え","alignTop":"ზემოთა","alignMiddle":"შუა","alignBottom":"ქვემოთა","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidWidth":"სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, მიუწვდომელია</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. ყველა უფლება დაცულია.","dlgTitle":"CKEditor-ის შესახებ","help":"დახმარებისთვის იხილეთ $1.","moreInfo":"ლიცენზიის ინფორმაციისთვის ეწვიეთ ჩვენს საიტს:","title":"CKEditor-ის შესახებ","userGuide":"CKEditor-ის მომხმარებლის სახელმძღვანელო"},"clipboard":{"copy":"ასლი","copyError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ასლის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+C).","cut":"ამოჭრა","cutError":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა ამოჭრის ოპერაციის ავტომატურად განხორციელების საშუალებას. გამოიყენეთ კლავიატურა ამისთვის (Ctrl/Cmd+X).","paste":"ჩასმა","pasteArea":"ჩასმის არე","pasteMsg":"ჩასვით ამ არის შიგნით კლავიატურის გამოყენებით (<strong>Ctrl/Cmd+V</strong>) და დააჭირეთ OK-ს","securityMsg":"თქვენი ბროუზერის უსაფრთხოების პარამეტრები არ იძლევა clipboard-ის მონაცემების წვდომის უფლებას. კიდევ უნდა ჩასვათ ტექსტი ამ ფანჯარაში.","title":"ჩასმა"},"base64image":{"alt":"სანაცვლო ტექსტი","lockRatio":"პროპორციის შენარჩუნება","vSpace":"ჰორიზონტალური სივრცე","hSpace":"ვერტიკალური სივრცე","border":"ჩარჩო"},"basicstyles":{"bold":"მსხვილი","italic":"დახრილი","strike":"გადახაზული","subscript":"ინდექსი","superscript":"ხარისხი","underline":"გახაზული"},"bidi":{"ltr":"ტექსტის მიმართულება მარცხნიდან მარჯვნივ","rtl":"ტექსტის მიმართულება მარჯვნიდან მარცხნივ"},"blockquote":{"toolbar":"ციტატა"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"ავტომატური","bgColorTitle":"ფონის ფერი","colors":{"000":"შავი","800000":"მუქი შინდისფერი","8B4513":"ყავისფერი","2F4F4F":"მოლურჯო ნაცრისფერი","008080":"ჩამქრალი ლურჯი","000080":"მუქი ლურჯი","4B0082":"იასამნისფერი","696969":"მუქი ნაცრისფერი","B22222":"აგურისფერი","A52A2A":"მუქი ყავისფერი","DAA520":"მოყვითალო","006400":"მუქი მწვანე","40E0D0":"ცისფერი","0000CD":"ზომიერად ლურჯი","800080":"იისფერი","808080":"ნაცრისფერი","F00":"წითელი","FF8C00":"მუქი სტაფილოსფერი","FFD700":"ოქროსფერი","008000":"მწვანე","0FF":"ღია ცისფერი","00F":"ლურჯი","EE82EE":"იისფერი","A9A9A9":"ბაცი ნაცრისფერი","FFA07A":"ჩამქრალი ვარდისფერი","FFA500":"სტაფილოსფერი","FFFF00":"ყვითელი","00FF00":"ლურჯი","AFEEEE":"ცისფერი","ADD8E6":"ღია ლურჯი","DDA0DD":"ღია იისფერი","D3D3D3":"ღია ნაცრისფერი","FFF0F5":"ღია ვარდისფერი","FAEBD7":"ღია ყავისფერი","FFFFE0":"ნათელი ყვითელი","F0FFF0":"ღია მწვანე","F0FFFF":"ღია ცისფერი 2","F0F8FF":"ღია ცისფერი 3","E6E6FA":"ღია იისფერი 2","FFF":"თეთრი","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"მეტი ფერი...","panelTitle":"ფერები","textColorTitle":"ტექსტის ფერი"},"font":{"fontSize":{"label":"ზომა","voiceLabel":"ტექსტის ზომა","panelTitle":"ტექსტის ზომა"},"label":"ფონტი","panelTitle":"ფონტის სახელი","voiceLabel":"ფონტი"},"image":{"alt":"სანაცვლო ტექსტი","border":"ჩარჩო","btnUpload":"სერვერისთვის გაგზავნა","button2Img":"გსურთ არჩეული სურათიანი ღილაკის გადაქცევა ჩვეულებრივ ღილაკად?","hSpace":"ჰორიზონტალური სივრცე","img2Button":"გსურთ არჩეული ჩვეულებრივი ღილაკის გადაქცევა სურათიან ღილაკად?","infoTab":"სურათის ინფორმცია","linkTab":"ბმული","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","resetSize":"ზომის დაბრუნება","title":"სურათის პარამეტრები","titleButton":"სურათიანი ღილაკის პარამეტრები","upload":"ატვირთვა","urlMissing":"სურათის URL არაა შევსებული.","vSpace":"ვერტიკალური სივრცე","validateBorder":"ჩარჩო მთელი რიცხვი უნდა იყოს.","validateHSpace":"ჰორიზონტალური სივრცე მთელი რიცხვი უნდა იყოს.","validateVSpace":"ვერტიკალური სივრცე მთელი რიცხვი უნდა იყოს."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"სანაცვლო ტექსტი","btnUpload":"სერვერისთვის გაგზავნა","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"სურათის ინფორმცია","lockRatio":"პროპორციის შენარჩუნება","menu":"სურათის პარამეტრები","pathName":"image","pathNameCaption":"caption","resetSize":"ზომის დაბრუნება","resizer":"Click and drag to resize","title":"სურათის პარამეტრები","uploadTab":"აქაჩვა","urlMissing":"სურათის URL არაა შევსებული.","altMissing":"Alternative text is missing."},"indent":{"indent":"მეტად შეწევა","outdent":"ნაკლებად შეწევა"},"fakeobjects":{"anchor":"ღუზა","flash":"Flash ანიმაცია","hiddenfield":"მალული ველი","iframe":"IFrame","unknown":"უცნობი ობიექტი"},"link":{"acccessKey":"წვდომის ღილაკი","advanced":"დაწვრილებით","advisoryContentType":"შიგთავსის ტიპი","advisoryTitle":"სათაური","anchor":{"toolbar":"ღუზა","menu":"ღუზის რედაქტირება","title":"ღუზის პარამეტრები","name":"ღუზუს სახელი","errorName":"აკრიფეთ ღუზის სახელი","remove":"Remove Anchor"},"anchorId":"ელემენტის Id-თ","anchorName":"ღუზის სახელით","charset":"კოდირება","cssClasses":"CSS კლასი","download":"Force Download","displayText":"Display Text","emailAddress":"ელფოსტის მისამართები","emailBody":"წერილის ტექსტი","emailSubject":"წერილის სათაური","id":"Id","info":"ბმულის ინფორმაცია","langCode":"ენის კოდი","langDir":"ენის მიმართულება","langDirLTR":"მარცხნიდან მარჯვნივ (LTR)","langDirRTL":"მარჯვნიდან მარცხნივ (RTL)","menu":"ბმულის რედაქტირება","name":"სახელი","noAnchors":"(ამ დოკუმენტში ღუზა არაა)","noEmail":"აკრიფეთ ელფოსტის მისამართი","noUrl":"აკრიფეთ ბმულის URL","other":"<სხვა>","popupDependent":"დამოკიდებული (Netscape)","popupFeatures":"Popup ფანჯრის პარამეტრები","popupFullScreen":"მთელი ეკრანი (IE)","popupLeft":"მარცხენა პოზიცია","popupLocationBar":"ნავიგაციის ზოლი","popupMenuBar":"მენიუს ზოლი","popupResizable":"ცვალებადი ზომით","popupScrollBars":"გადახვევის ზოლები","popupStatusBar":"სტატუსის ზოლი","popupToolbar":"ხელსაწყოთა ზოლი","popupTop":"ზედა პოზიცია","rel":"კავშირი","selectAnchor":"აირჩიეთ ღუზა","styles":"CSS სტილი","tabIndex":"Tab-ის ინდექსი","target":"გახსნის ადგილი","targetFrame":"<frame>","targetFrameName":"Frame-ის სახელი","targetPopup":"<popup ფანჯარა>","targetPopupName":"Popup ფანჯრის სახელი","title":"ბმული","toAnchor":"ბმული ტექსტში ღუზაზე","toEmail":"ელფოსტა","toUrl":"URL","toolbar":"ბმული","type":"ბმულის ტიპი","unlink":"ბმულის მოხსნა","upload":"აქაჩვა"},"list":{"bulletedlist":"ღილიანი სია","numberedlist":"გადანომრილი სია"},"maximize":{"maximize":"გადიდება","minimize":"დაპატარავება"},"table":{"border":"ჩარჩოს ზომა","caption":"სათაური","cell":{"menu":"უჯრა","insertBefore":"უჯრის ჩასმა მანამდე","insertAfter":"უჯრის ჩასმა მერე","deleteCell":"უჯრების წაშლა","merge":"უჯრების შეერთება","mergeRight":"შეერთება მარჯვენასთან","mergeDown":"შეერთება ქვემოთასთან","splitHorizontal":"გაყოფა ჰორიზონტალურად","splitVertical":"გაყოფა ვერტიკალურად","title":"უჯრის პარამეტრები","cellType":"უჯრის ტიპი","rowSpan":"სტრიქონების ოდენობა","colSpan":"სვეტების ოდენობა","wordWrap":"სტრიქონის გადატანა (Word Wrap)","hAlign":"ჰორიზონტალური სწორება","vAlign":"ვერტიკალური სწორება","alignBaseline":"ძირითადი ხაზის გასწვრივ","bgColor":"ფონის ფერი","borderColor":"ჩარჩოს ფერი","data":"მონაცემები","header":"სათაური","yes":"დიახ","no":"არა","invalidWidth":"უჯრის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","invalidHeight":"უჯრის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRowSpan":"სტრიქონების რაოდენობა მთელი რიცხვი უნდა იყოს.","invalidColSpan":"სვეტების რაოდენობა მთელი რიცხვი უნდა იყოს.","chooseColor":"არჩევა"},"cellPad":"უჯრის კიდე (padding)","cellSpace":"უჯრის სივრცე (spacing)","column":{"menu":"სვეტი","insertBefore":"სვეტის ჩამატება წინ","insertAfter":"სვეტის ჩამატება მერე","deleteColumn":"სვეტების წაშლა"},"columns":"სვეტი","deleteTable":"ცხრილის წაშლა","headers":"სათაურები","headersBoth":"ორივე","headersColumn":"პირველი სვეტი","headersNone":"არაფერი","headersRow":"პირველი სტრიქონი","invalidBorder":"ჩარჩოს ზომა რიცხვით უდნა იყოს წარმოდგენილი.","invalidCellPadding":"უჯრის კიდე (padding) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCellSpacing":"უჯრის სივრცე (spacing) რიცხვით უნდა იყოს წარმოდგენილი.","invalidCols":"სვეტების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidHeight":"ცხრილის სიმაღლე რიცხვით უნდა იყოს წარმოდგენილი.","invalidRows":"სტრიქონების რაოდენობა დადებითი რიცხვი უნდა იყოს.","invalidWidth":"ცხრილის სიგანე რიცხვით უნდა იყოს წარმოდგენილი.","menu":"ცხრილის პარამეტრები","row":{"menu":"სტრიქონი","insertBefore":"სტრიქონის ჩამატება წინ","insertAfter":"სტრიქონის ჩამატება მერე","deleteRow":"სტრიქონების წაშლა"},"rows":"სტრიქონი","summary":"შეჯამება","title":"ცხრილის პარამეტრები","toolbar":"ცხრილი","widthPc":"პროცენტი","widthPx":"წერტილი","widthUnit":"საზომი ერთეული"},"quicktable":{"more":"მეტი..."},"removeformat":{"toolbar":"ფორმატირების მოხსნა"},"sourcearea":{"toolbar":"კოდები"},"toolbar":{"toolbarCollapse":"ხელსაწყოთა ზოლის შეწევა","toolbarExpand":"ხელსაწყოთა ზოლის გამოწევა","toolbarGroups":{"document":"დოკუმენტი","clipboard":"Clipboard/გაუქმება","editing":"რედაქტირება","forms":"ფორმები","basicstyles":"ძირითადი სტილები","paragraph":"აბზაცი","links":"ბმულები","insert":"ჩასმა","styles":"სტილები","colors":"ფერები","tools":"ხელსაწყოები"},"toolbars":"Editor toolbars"},"undo":{"redo":"გამეორება","undo":"გაუქმება"},"colordialog":{"clear":"გასუფთავება","highlight":"ჩვენება","options":"ფერის პარამეტრები","selected":"არჩეული ფერი","title":"ფერის შეცვლა"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/km.js b/plugins/ckeditor/src/lang/km.js
deleted file mode 100644
index e7fc0779a..000000000
--- a/plugins/ckeditor/src/lang/km.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['km']={"editor":"ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","editorPanel":"ផ្ទាំង​ឧបករណ៍​សរសេរ​អត្ថបទ​សម្បូរ​បែប","common":{"editorHelp":"�
-ុ�
- ALT 0 សម្រាប់​ជំនួយ","browseServer":"រក​មើល​ក្នុង​ម៉ាស៊ីន​បម្រើ","url":"URL","protocol":"ពិធីការ","upload":"ផ្ទុក​ឡើង","uploadSubmit":"បញ្ជូនទ�
-កាន់ម៉ាស៊ីន​បម្រើ","image":"រូបភាព","flash":"Flash","form":"បែបបទ","checkbox":"ប្រអប់​ធីក","radio":"ប៊ូតុង​មូល","textField":"វាល​អត្ថបទ","textarea":"Textarea","hiddenField":"វាល​កំបាំង","button":"ប៊ូតុង","select":"វាល​ជម្រើស","imageButton":"ប៊ូតុង​រូបភាព","notSet":"<មិនកំណត់>","id":"Id","name":"ឈ្មោះ","langDir":"ទិសដ�
-ភាសា","langDirLtr":"ពីឆ្វេងទ�
-ស្តាំ (LTR)","langDirRtl":"ពីស្តាំទ�
-ឆ្វេង (RTL)","langCode":"លេខ​កូដ​ភាសា","longDescr":"URL អធិប្បាយ​វែង","cssClass":"Stylesheet Classes","advisoryTitle":"�
-ំណង​ជើង​ណែនាំ","cssStyle":"រ�
-នាបថ","ok":"ព្រម","cancel":"បោះបង់","close":"បិទ","preview":"មើល​ជា​មុន","resize":"ប្ដូរ​ទំហំ","generalTab":"ទូទ�
-","advancedTab":"កម្រិត​ខ្ពស់","validateNumberFailed":"តម្លៃ​នេះ​ពុំ​មែន​ជា​លេខ​ទេ។","confirmNewPage":"រាល់​បន្លាស់​ប្ដូរ​នានា​ដែល​មិន​ទាន់​រក្សា​ទុក​ក្នុង​មាតិកា​នេះ នឹង​ត្រូវ​បាត់​បង់។ តើ​អ្នក​ពិត​ជា​�
-ង់​ផ្ទុក​ទំព័រ​ថ្មី​មែនទេ?","confirmCancel":"ការ​កំណត់​មួយ​�
-ំនួន​ត្រូ​វ​បាន​ផ្លាស់​ប្ដូរ។ តើ​អ្នក​ពិត​ជា​�
-ង់​បិទ​ប្រអប់​នេះ​មែនទេ?","options":"ការ​កំណត់","target":"គោលដ�
-","targetNew":"វីនដូ​ថ្មី (_blank)","targetTop":"វីនដូ​លើ​គេ (_top)","targetSelf":"វីនដូ​ដូ�
-​គ្នា (_self)","targetParent":"វីនដូ​មេ (_parent)","langDirLTR":"ពីឆ្វេងទ�
-ស្តាំ(LTR)","langDirRTL":"ពីស្តាំទ�
-ឆ្វេង(RTL)","styles":"រ�
-នាបថ","cssClasses":"Stylesheet Classes","width":"ទទឹង","height":"កំពស់","align":"កំណត់​ទីតាំង","alignLeft":"ខាងឆ្វង","alignRight":"ខាងស្តាំ","alignCenter":"កណ្តាល","alignJustify":"តំរឹមសងខាង","alignTop":"ខាងលើ","alignMiddle":"កណ្តាល","alignBottom":"ខាងក្រោម","alignNone":"គ្មាន","invalidValue":"តម្លៃ​មិន​ត្រឹម​ត្រូវ។","invalidHeight":"តម្លៃ​កំពស់​ត្រូវ​តែ​ជា​លេខ។","invalidWidth":"តម្លៃ​ទទឹង​ត្រូវ​តែ​ជា​លេខ។","invalidCssLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន​ ដោយ​ភ្ជាប់ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","invalidHtmlLength":"តម្លៃ​កំណត់​សម្រាប់​វាល \"%1\" ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន ដោយ​ភ្ជាប់​ឬ​មិន​ភ្ជាប់​ជាមួយ​នឹង​ឯកតា​រង្វាស់​របស់ HTML (px ឬ %) ។","invalidInlineStyle":"តម្លៃ​កំណត់​សម្រាប់​រ�
-នាបថ​ក្នុង​តួ ត្រូវ​តែ​មាន​មួយ​ឬ​ធាតុ​�
-្រើន​ដោយ​មាន​ទ្រង់ទ្រាយ​ជា \"ឈ្មោះ : តម្លៃ\" ហើយ​ញែក​�
-េញ​ពី​គ្នា​ដោយ​�
-ុ�
-​ក្បៀស។","cssLengthTooltip":"បញ្�
-ូល​លេខ​សម្រាប់​តម្លៃ​ជា​ភិ�
-សែល ឬ​លេខ​ដែល​មាន​ឯកតា​ត្រឹមត្រូវ​របស់ CSS (px, %, in, cm, mm, em, ex, pt ឬ pc) ។","unavailable":"%1<span class=\"cke_accessibility\">, មិន​មាន</span>","keyboard":{"8":"លុបថយក្រោយ","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"�
-ុង","36":"ផ្ទះ","46":"លុប","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"រក្សាសិទ្ធិ &copy; $1។ រក្សា​សិទ្ធិ​គ្រប់​បែប​យ៉ាង។","dlgTitle":"អំពី CKEditor","help":"ពិនិត្យ $1 សម្រាប់​ជំនួយ។","moreInfo":"សម្រាប់​ព័ត៌មាន​អំពី​អាជ្ញាបណញណ សូម​មើល​ក្នុង​គេហទំព័រ​របស់​យើង៖","title":"អំពី CKEditor","userGuide":"វិធី​ប្រើ​ប្រាស់ CKEditor"},"clipboard":{"copy":"�
-ម្លង","copyError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអា�
-ធ្វើកម្មវិធីតាក់តែងអត្ថបទ �
-ំលងអត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូ�
-នេះ (Ctrl/Cmd+C)។","cut":"កាត់យក","cutError":"ការកំណត់សុវត្ថភាពរបស់កម្មវិធីរុករករបស់លោកអ្នក នេះ​មិនអា�
-ធ្វើកម្មវិធីតាក់តែងអត្ថបទ កាត់អត្ថបទយកដោយស្វ័យប្រវត្តបានឡើយ ។ សូមប្រើប្រាស់បន្សំ ឃីដូ�
-នេះ  (Ctrl/Cmd+X) ។","paste":"បិទ​ភ្ជាប់","pasteArea":"តំបន់​បិទ​ភ្ជាប់","pasteMsg":"សូម�
-ំលងអត្ថបទទ�
-ដាក់ក្នុងប្រអប់ដូ�
-ខាងក្រោមដោយប្រើប្រាស់ ឃី ​(<STRONG>Ctrl/Cmd+V</STRONG>) ហើយ�
-ុ�
- <STRONG>OK</STRONG> ។","securityMsg":"ព្រោះតែ​ការកំណត់​សុវត្ថិភាព ប្រអប់សរសេរ​មិន​អា�
-�
-ាប់​យកទិន្នន័យពីក្តារតម្បៀតខ្ទាស់​អ្នក​​ដោយផ្ទាល់​បានទេ។ អ្នក​ត្រូវ�
-ំលង​ដាក់វាម្តង​ទៀត ក្នុងផ្ទាំងនេះ។","title":"បិទ​ភ្ជាប់"},"base64image":{"alt":"អត្ថបទជំនួស","lockRatio":"អត្រាឡុក","vSpace":"VSpace","hSpace":"គំលាតទទឹង","border":"ស៊ុម"},"basicstyles":{"bold":"ដិត","italic":"ទ្រេត","strike":"គូស​បន្ទាត់​�
-ំ​កណ្ដាល","subscript":"អក្សរតូ�
-ក្រោម","superscript":"អក្សរតូ�
-លើ","underline":"គូស​បន្ទាត់​ក្រោម"},"bidi":{"ltr":"ទិស​ដ�
-​អក្សរ​ពី​ឆ្វេង​ទ�
-​ស្ដាំ","rtl":"ទិស​ដ�
-​អក្សរ​ពី​ស្ដាំ​ទ�
-​ឆ្វេង"},"blockquote":{"toolbar":"ប្លក់​ពាក្យ​សម្រង់"},"button":{"selectedLabel":"%1 (បាន​ជ្រើស​រើស)"},"colorbutton":{"auto":"ស្វ័យប្រវត្តិ","bgColorTitle":"ពណ៌ផ្ទៃខាងក្រោយ","colors":{"000":"ខ្ម�
-","800000":"ត្នោត​�
-ាស់","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"ខៀវ​�
-ាស់","4B0082":"ធ្លះ","696969":"ប្រផេះ​ក្រាស់","B22222":"Fire Brick","A52A2A":"ត្នោត","DAA520":"Golden Rod","006400":"បៃតង​�
-ាស់","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"ប្រផេះ","F00":"ក្រហម","FF8C00":"ទឹក​ក្រូ�
-​�
-ាស់","FFD700":"មាស","008000":"បៃតង","0FF":"Cyan","00F":"ខៀវ","EE82EE":"ស្វាយ","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"ទឹក​ក្រូ�
-","FFFF00":"លឿង","00FF00":"ក្រូ�
-​ឆ្មារ","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"លឿង​ស្ដើង","F0FFF0":"Honeydew","F0FFFF":"ផ្ទៃមេឃ","F0F8FF":"Alice Blue","E6E6FA":"ឡាវិនដឺ","FFF":"ស","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ពណ៌​ផ្សេង​ទៀត..","panelTitle":"ពណ៌","textColorTitle":"ពណ៌អក្សរ"},"font":{"fontSize":{"label":"ទំហំ","voiceLabel":"ទំហំ​អក្សរ","panelTitle":"ទំហំ​អក្សរ"},"label":"ពុម្ព​អក្សរ","panelTitle":"ឈ្មោះ​ពុម្ព​អក្សរ","voiceLabel":"ពុម្ព​អក្សរ"},"image":{"alt":"អត្ថបទជំនួស","border":"ស៊ុម","btnUpload":"ផ្ញើ​ទ�
-​ម៉ាស៊ីន​បម្រើ","button2Img":"តើ​អ្នក​�
-ង់​ផ្លាស់​ប្ដូរ​ប៊ូតុង​រូបភាព​ដែល​បាន​ជ្រើស ន�
-​លើ​រូបភាព​ធម្មតា​មួយ​មែនទេ?","hSpace":"គម្លាត​ផ្ដេក","img2Button":"តើ​អ្នក​�
-ង់​ផ្លាស់​ប្ដូរ​រូបភាព​ដែល​បាន​ជ្រើស ន�
-​លើ​ប៊ូតុង​រូបភាព​មែនទេ?","infoTab":"ពត៌មានអំពីរូបភាព","linkTab":"តំណ","lockRatio":"�
-ាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​រូបភាព","resetSize":"កំណត់ទំហំឡើងវិញ","title":"លក្ខណៈ​រូបភាព","titleButton":"លក្ខណៈ​ប៊ូតុង​រូបភាព","upload":"ផ្ទុកឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","vSpace":"គម្លាត​បញ្ឈរ","validateBorder":"ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","validateHSpace":"គម្លាត​ផ្ដេក​ត្រូវ​តែ​ជា​លេខ។","validateVSpace":"គម្លាត​បញ្ឈរ​ត្រូវ​តែ​ជា​លេខ។"},"widget":{"move":"�
-ុ�
-​ហើយ​ទាញ​ដើម្បី​ផ្លាស់​ទី","label":"%1 widget"},"image2":{"alt":"អត្ថបទជំនួស","btnUpload":"បញ្ជូនទ�
-កាន់ម៉ាស៊ីនផ្តល់សេវា","captioned":"រូប​ដែល​មាន​�
-ំណង​ជើង","captionPlaceholder":"Caption","infoTab":"ពត៌មានអំពីរូបភាព","lockRatio":"�
-ាក់​សោ​ផល​ធៀប","menu":"លក្ខណៈ​សម្បត្តិ​រូប​ភាព","pathName":"រូបភាព","pathNameCaption":"�
-ំណងជើង","resetSize":"កំណត់ទំហំឡើងវិញ","resizer":"�
-ុ�
-​ហើយ​ទាញ​ដើម្បី​ប្ដូរ​ទំហំ","title":"លក្ខណៈ​សម្បត្តិ​រូប​ភាប","uploadTab":"ផ្ទុក​ឡើង","urlMissing":"ខ្វះ URL ប្រភព​រូប​ភាព។","altMissing":"Alternative text is missing."},"indent":{"indent":"បន្ថែមការ�
-ូលបន្ទាត់","outdent":"បន្ថយការ�
-ូលបន្ទាត់"},"fakeobjects":{"anchor":"យុថ្កា","flash":"Flash មាន​�
-លនា","hiddenfield":"វាល​កំបាំង","iframe":"IFrame","unknown":"វត្ថុ​មិន​ស្គាល់"},"link":{"acccessKey":"សោរ​�
-ូល","advanced":"កម្រិត​ខ្ពស់","advisoryContentType":"ប្រភេទអត្ថបទ​ប្រឹក្សា","advisoryTitle":"�
-ំណងជើង​ប្រឹក្សា","anchor":{"toolbar":"យុថ្កា","menu":"កែ​យុថ្កា","title":"លក្ខណៈ​យុថ្កា","name":"ឈ្មោះ​យុថ្កា","errorName":"សូម​បញ្�
-ូល​ឈ្មោះ​យុថ្កា","remove":"ដក​យុថ្កា​�
-េញ"},"anchorId":"តាម ID ធាតុ","anchorName":"តាម​ឈ្មោះ​យុថ្កា","charset":"លេខកូតអក្សររបស់ឈ្នាប់","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"អាសយដ្ឋាន​អ៊ីមែល","emailBody":"តួ​អត្ថបទ","emailSubject":"ប្រធានបទ​សារ","id":"Id","info":"ព័ត៌មាន​ពី​តំណ","langCode":"កូដ​ភាសា","langDir":"ទិសដ�
-ភាសា","langDirLTR":"ពីឆ្វេងទ�
-ស្តាំ(LTR)","langDirRTL":"ពីស្តាំទ�
-ឆ្វេង(RTL)","menu":"កែ​តំណ","name":"ឈ្មោះ","noAnchors":"(មិន​មាន​យុថ្កា​ន�
-​ក្នុង​ឯកសារ​អត្ថថបទ​ទេ)","noEmail":"សូម​បញ្�
-ូល​អាសយដ្ឋាន​អ៊ីមែល","noUrl":"សូម​បញ្�
-ូល​តំណ URL","other":"<ផ្សេង​ទៀត>","popupDependent":"Dependent (Netscape)","popupFeatures":"មុខ​ងារ​ផុស​ផ្ទាំង​វីនដូ​ឡើង","popupFullScreen":"ពេញ​អេក្រង់ (IE)","popupLeft":"ទីតាំងខាងឆ្វេង","popupLocationBar":"របារ​ទីតាំង","popupMenuBar":"របារ​ម៉ឺនុយ","popupResizable":"អា�
-​ប្ដូរ​ទំហំ","popupScrollBars":"របារ​រំកិល","popupStatusBar":"របារ​ស្ថានភាព","popupToolbar":"របារ​ឧបករណ៍","popupTop":"ទីតាំង​កំពូល","rel":"សម្ពន្ធ​ភាព","selectAnchor":"រើស​យក​យុថ្កា​មួយ","styles":"ស្ទីល","tabIndex":"លេខ Tab","target":"គោលដ�
-","targetFrame":"<ស៊ុម>","targetFrameName":"ឈ្មោះ​ស៊ុម​ជា​គោល​ដ�
-","targetPopup":"<វីនដូ​ផុស​ឡើង>","targetPopupName":"ឈ្មោះ​វីនដូត​ផុស​ឡើង","title":"តំណ","toAnchor":"ត​ភ្ជាប់​ទ�
-​យុថ្កា​ក្នុង​អត្ថបទ","toEmail":"អ៊ីមែល","toUrl":"URL","toolbar":"តំណ","type":"ប្រភេទ​តំណ","unlink":"ផ្ដា�
-់​តំណ","upload":"ផ្ទុក​ឡើង"},"list":{"bulletedlist":"បញ្�
-ូល / លុប​បញ្ជី​ជា​�
-ំណុ�
-​មូល","numberedlist":"បញ្�
-ូល / លុប​បញ្ជី​ជា​លេខ"},"maximize":{"maximize":"ពង្រីក​អតិបរមា","minimize":"បង្រួម​អប្បបរមា"},"table":{"border":"ទំហំ​បន្ទាត់​ស៊ុម","caption":"�
-ំណងជើង","cell":{"menu":"ក្រឡា","insertBefore":"បញ្�
-ូល​ក្រឡា​ពីមុខ","insertAfter":"បញ្�
-ូល​ក្រឡា​ពី​ក្រោយ","deleteCell":"លុប​ក្រឡា","merge":"បញ្�
-ូល​ក្រឡា​�
-ូល​គ្នា","mergeRight":"បញ្�
-ូល​គ្នា​ខាង​ស្ដាំ","mergeDown":"បញ្�
-ូល​គ្នា​�
-ុះ​ក្រោម","splitHorizontal":"ពុះ​ក្រឡា​ផ្ដេក","splitVertical":"ពុះ​ក្រឡា​បញ្ឈរ","title":"លក្ខណៈ​ក្រឡា","cellType":"ប្រភេទ​ក្រឡា","rowSpan":"�
-ំនួន​ជួរ​ដេក​លាយ​�
-ូល​គ្នា","colSpan":"�
-ំនួន​ជួរ​ឈរ​លាយ​�
-ូល​គ្នា","wordWrap":"រុំ​ពាក្យ","hAlign":"ការ​តម្រឹម​ផ្ដេក","vAlign":"ការ​តម្រឹម​បញ្ឈរ","alignBaseline":"ខ្សែ​បន្ទាត់​គោល","bgColor":"ពណ៌​ផ្ទៃ​ក្រោយ","borderColor":"ពណ៌​បន្ទាត់​ស៊ុម","data":"ទិន្នន័យ","header":"ក្បាល","yes":"ព្រម","no":"ទេ","invalidWidth":"ទទឹង​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidHeight":"កម្ពស់​ក្រឡា​ត្រូវ​តែ​ជា​លេខ។","invalidRowSpan":"�
-ំនួន​ជួរ​ដេក​លាយ​�
-ូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","invalidColSpan":"�
-ំនួន​ជួរ​ឈរ​លាយ​�
-ូល​គ្នា​ត្រូវ​តែ​ជា​លេខ​ទាំង​អស់។","chooseColor":"រើស"},"cellPad":"�
-ន្លោះ​ក្រឡា","cellSpace":"គម្លាត​ក្រឡា","column":{"menu":"ជួរ​ឈរ","insertBefore":"បញ្�
-ូល​ជួរ​ឈរ​ពីមុខ","insertAfter":"បញ្�
-ូល​ជួរ​ឈរ​ពី​ក្រោយ","deleteColumn":"លុប​ជួរ​ឈរ"},"columns":"ជួរឈរ","deleteTable":"លុប​តារាង","headers":"ក្បាល","headersBoth":"ទាំង​ពីរ","headersColumn":"ជួរ​ឈរ​ដំបូង","headersNone":"មិន​មាន","headersRow":"ជួរ​ដេក​ដំបូង","invalidBorder":"ទំហំ​បន្ទាត់​ស៊ុម​ត្រូវ​តែ​ជា​លេខ។","invalidCellPadding":"�
-ន្លោះ​ក្រឡា​ត្រូវ​តែជា​លេខ​វិជ្ជមាន។","invalidCellSpacing":"គម្លាត​ក្រឡា​ត្រូវ​តែ​ជា​លេខ​វិជ្ជមាន។","invalidCols":"�
-ំនួន​ជួរ​ឈរ​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidHeight":"កម្ពស់​តារាង​ត្រូវ​តែ​ជា​លេខ","invalidRows":"�
-ំនួន​ជួរ​ដេក​ត្រូវ​តែ​ជា​លេខ​ធំ​ជាង 0។","invalidWidth":"ទទឹង​តារាង​ត្រូវ​តែ​ជា​លេខ។","menu":"លក្ខណៈ​តារាង","row":{"menu":"ជួរ​ដេក","insertBefore":"បញ្�
-ូល​ជួរ​ដេក​ពីមុខ","insertAfter":"បញ្�
-ូល​ជួរ​ដេក​ពី​ក្រោយ","deleteRow":"លុប​ជួរ​ដេក"},"rows":"ជួរ​ដេក","summary":"សេ�
-ក្តី​សង្ខេប","title":"លក្ខណៈ​តារាង","toolbar":"តារាង","widthPc":"ភាគរយ","widthPx":"ភីកសែល","widthUnit":"ឯកតា​ទទឹង"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"ជម្រះ​ទ្រង់​ទ្រាយ"},"sourcearea":{"toolbar":"អក្សរ​កូដ"},"toolbar":{"toolbarCollapse":"បង្រួម​របារ​ឧបករណ៍","toolbarExpand":"ពង្រីក​របារ​ឧបករណ៍","toolbarGroups":{"document":"ឯកសារ","clipboard":"Clipboard/មិន​ធ្វើ​វិញ","editing":"ការ​កែ​សម្រួល","forms":"បែបបទ","basicstyles":"រ�
-នាបថ​មូលដ្ឋាន","paragraph":"កថាខណ្ឌ","links":"តំណ","insert":"បញ្�
-ូល","styles":"រ�
-នាបថ","colors":"ពណ៌","tools":"ឧបករណ៍"},"toolbars":"របារ​ឧបករណ៍​កែ​សម្រួល"},"undo":{"redo":"ធ្វើ​ឡើង​វិញ","undo":"មិន​ធ្វើ​វិញ"},"colordialog":{"clear":"សម្អាត","highlight":"បន្លិ�
-​ពណ៌","options":"ជម្រើស​ពណ៌","selected":"ពណ៌​ដែល​បាន​រើស","title":"រើស​ពណ៌"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ko.js b/plugins/ckeditor/src/lang/ko.js
deleted file mode 100644
index e73de0b91..000000000
--- a/plugins/ckeditor/src/lang/ko.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ko']={"editor":"리치 �
-�스트 편집기","editorPanel":"리치 �
-�스트 편집기 패널","common":{"editorHelp":"도움이 필요하면 ALT 0 을 누르세요","browseServer":"서버 보기","url":"URL","protocol":"프로토콜","upload":"�
-로드","uploadSubmit":"서버로 전송","image":"이미지","flash":"플래시","form":"폼","checkbox":"체크 박스","radio":"라디오 버튼","textField":"한 줄 �
-력 칸","textarea":"여러 줄 �
-력 칸","hiddenField":"숨은 �
-력 칸","button":"버튼","select":"선택 목록","imageButton":"이미지 버튼","notSet":"<설정 안 됨>","id":"ID","name":"이름","langDir":"언어 방향","langDirLtr":"왼쪽에서 오른쪽 (LTR)","langDirRtl":"오른쪽에서 왼쪽 (RTL)","langCode":"언어 코드","longDescr":"웹 주소 설�
-","cssClass":"스타일 시트 클래스","advisoryTitle":"보조 제목","cssStyle":"스타일","ok":"확인","cancel":"취소","close":"닫기","preview":"미리보기","resize":"크기 조절","generalTab":"일반","advancedTab":"자세히","validateNumberFailed":"이 값은 숫자가 아닙니다.","confirmNewPage":"저장하지 않은 모든 변경사항은 유실됩니다. 정말로 새로운 페이지를 부르겠습니까?","confirmCancel":"일부 옵�
-�이 변경 되었습니다. 정말로 창을 닫겠습니까?","options":"옵�
-�","target":"타겟","targetNew":"새 창 (_blank)","targetTop":"최상위 창 (_top)","targetSelf":"같은 창 (_self)","targetParent":"부모 창 (_parent)","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","styles":"스타일","cssClasses":"스타일 시트 클래스","width":"너비","height":"높이","align":"정렬","alignLeft":"왼쪽","alignRight":"오른쪽","alignCenter":"가운데","alignJustify":"양쪽 맞춤","alignTop":"위","alignMiddle":"중간","alignBottom":"아래","alignNone":"기본","invalidValue":"잘못된 값.","invalidHeight":"높이는 숫자여야 합니다.","invalidWidth":"넓이는 숫자여야 합니다.","invalidCssLength":"\"%1\" 값은 유효한 CSS 측정 단위(px, %, in, cm, mm, em, ex, pt, or pc)를 포함하거나 포함하지 않은 양수 여야 합니다.","invalidHtmlLength":"\"%1\" 값은 유효한 HTML 측정 단위(px or %)를 포함하거나 포함하지 않은 양수여야 합니다.","invalidInlineStyle":"인라인 스타일에 설정된 값은 \"name : value\" 형식을 가진 하나 이상의 투플(tuples)이 세미콜론(;)으로 구분되어 구성되어야 합니다.","cssLengthTooltip":"픽�
-� 단위의 숫자만 �
-력하시거나 유효한 CSS 단위(px, %, in, cm, mm, em, ex, pt, or pc)와 함께 숫자를 �
-력해주세요.","unavailable":"%1<span class=\"cke_accessibility\">, 사용불가</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"저작권 &copy; $1 . 판권 소유.","dlgTitle":"CKEditor 에 대하여","help":"도움이 필요하시면 $1 를 확인하세요.","moreInfo":"라이선스에 대한 정보는 저희 웹 사이트를 참고하세요:","title":"CKEditor에 대하여","userGuide":"CKEditor 사용설�
-서"},"clipboard":{"copy":"복사","copyError":"브라우저의 보안설정 때문에 복사할 수 없습니다. 키보드(Ctrl/Cmd+C)를 이용해서 복사하십시오.","cut":"잘라내기","cutError":"브라우저의 보안설정 때문에 잘라내기 기능을 실행할 수 없습니다. 키보드(Ctrl/Cmd+X)를 이용해서 잘라내기 하십시오","paste":"붙여넣기","pasteArea":"붙여넣기 범위","pasteMsg":"키보드(<strong>Ctrl/Cmd+V</strong>)를 이용해서 상자안에 붙여넣고 <strong>확인</strong> 를 누르세요.","securityMsg":"브라우저 보안 설정으로 인해, 클립보드에 직접 접근할 수 없습니다. 이 창에 다시 붙여넣기 하십시오.","title":"붙여넣기"},"base64image":{"alt":"이미지 설�
-","lockRatio":"비율 유지","vSpace":"수직여백","hSpace":"수평여백","border":"�
-�두리"},"basicstyles":{"bold":"굵게","italic":"기울임꼴","strike":"취소선","subscript":"아래 첨자","superscript":"위 첨자","underline":"밑줄"},"bidi":{"ltr":"�
-�스트 방향이 왼쪽에서 오른쪽으로 ","rtl":"�
-�스트 방향이 오른쪽에서 왼쪽으로"},"blockquote":{"toolbar":"인용 단락"},"button":{"selectedLabel":"%1 (선택됨)"},"colorbutton":{"auto":"기본 색상","bgColorTitle":"배경 색상","colors":{"000":"검정","800000":"밤색","8B4513":"새들 브라운","2F4F4F":"다크 슬레이트 그레이","008080":"틸","000080":"네이비","4B0082":"남색","696969":"짙은 회색","B22222":"벽돌색","A52A2A":"갈색","DAA520":"골든 로드","006400":"암록색","40E0D0":"터코이즈","0000CD":"미디엄 블루","800080":"보라","808080":"회색","F00":"빨강","FF8C00":"짙은 주황","FFD700":"금색","008000":"�
-�색","0FF":"시안","00F":"파랑","EE82EE":"남보라","A9A9A9":"딤 그레이","FFA07A":"라이트 새먼","FFA500":"주황","FFFF00":"�
-�랑","00FF00":"라임","AFEEEE":"패일 터코이즈","ADD8E6":"연한 파랑","DDA0DD":"자두","D3D3D3":"연한 회색","FFF0F5":"라벤더 블러쉬","FAEBD7":"앤틱 화이트","FFFFE0":"연한 �
-�랑","F0FFF0":"허니듀","F0FFFF":"하늘색","F0F8FF":"앨리스 블루","E6E6FA":"라벤더","FFF":"흰색","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"색상 선택...","panelTitle":"색상","textColorTitle":"글자 색상"},"font":{"fontSize":{"label":"크기","voiceLabel":"글자 크기","panelTitle":"글자 크기"},"label":"글꼴","panelTitle":"글꼴","voiceLabel":"글꼴"},"image":{"alt":"대체 문자열","border":"�
-�두리","btnUpload":"서버로 전송","button2Img":"단순 이미지에서 선택한 이미지 버튼을 변환하시겠습니까?","hSpace":"가로 여백","img2Button":"이미지 버튼에 선택한 이미지를 변환하시겠습니까?","infoTab":"이미지 정보","linkTab":"링크","lockRatio":"비율 유지","menu":"이미지 속성","resetSize":"원래 크기로","title":"이미지 속성","titleButton":"이미지 버튼 속성","upload":"�
-로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","vSpace":"세로 여백","validateBorder":"�
-�두리 두께는 정수여야 합니다.","validateHSpace":"가로 길이는 정수여야 합니다.","validateVSpace":"세로 길이는 정수여야 합니다."},"widget":{"move":"움직이려면 클릭 후 드래그 하세요","label":"%1 widget"},"image2":{"alt":"대체 문자열","btnUpload":"서버로 전송","captioned":"이미지 설�
- 넣기","captionPlaceholder":"설�
-","infoTab":"이미지 정보","lockRatio":"비율 유지","menu":"이미지 속성","pathName":"이미지","pathNameCaption":"설�
-","resetSize":"원래 크기로","resizer":"크기를 조절하려면 클릭 후 드래그 하세요","title":"이미지 속성","uploadTab":"�
-로드","urlMissing":"이미지 원본 주소(URL)가 없습니다.","altMissing":"Alternative text is missing."},"indent":{"indent":"들여쓰기","outdent":"내어쓰기"},"fakeobjects":{"anchor":"�
-갈피","flash":"플래시 애니메이�
-�","hiddenfield":"숨은 �
-력 칸","iframe":"아이프레임","unknown":"알 수 없는 객체"},"link":{"acccessKey":"액세스 키","advanced":"고급","advisoryContentType":"보조 콘�
-�츠 유형","advisoryTitle":"보조 제목","anchor":{"toolbar":"�
-갈피","menu":"�
-갈피 편집","title":"�
-갈피 속성","name":"�
-갈피 이름","errorName":"�
-갈피 이름을 �
-력하십시오","remove":"�
-갈피 제거"},"anchorId":"�
-갈피 ID","anchorName":"�
-갈피 이름","charset":"링크된 자료 문자열 인코딩","cssClasses":"스타일시트 클래스","download":"Force Download","displayText":"Display Text","emailAddress":"이메일 주소","emailBody":"메시지 내용","emailSubject":"메시지 제목","id":"ID","info":"링크 정보","langCode":"언어 코드","langDir":"언어 방향","langDirLTR":"왼쪽에서 오른쪽 (LTR)","langDirRTL":"오른쪽에서 왼쪽 (RTL)","menu":"링크 수정","name":"이름","noAnchors":"(문서에 �
-갈피가 없습니다.)","noEmail":"이메일 주소를 �
-력하십시오","noUrl":"링크 주소(URL)를 �
-력하십시오","other":"<기타>","popupDependent":"Dependent (Netscape)","popupFeatures":"팝�
-창 속성","popupFullScreen":"전체화면 (IE)","popupLeft":"왼쪽 위치","popupLocationBar":"주소 표시줄","popupMenuBar":"메뉴 바","popupResizable":"크기 조절 가능","popupScrollBars":"스크롤 바","popupStatusBar":"상태 바","popupToolbar":"툴바","popupTop":"위쪽 위치","rel":"관계","selectAnchor":"�
-갈피 선택","styles":"스타일","tabIndex":"탭 순서","target":"타겟","targetFrame":"<프레임>","targetFrameName":"타겟 프레임 이름","targetPopup":"<팝�
- 창>","targetPopupName":"팝�
- 창 이름","title":"링크","toAnchor":"�
-갈피","toEmail":"이메일","toUrl":"주소(URL)","toolbar":"링크 삽�
-/변경","type":"링크 �
-류","unlink":"링크 지우기","upload":"�
-로드"},"list":{"bulletedlist":"순서 없는 목록","numberedlist":"순서 있는 목록"},"maximize":{"maximize":"최대화","minimize":"최소화"},"table":{"border":"�
-�두리 두께","caption":"주석","cell":{"menu":"�
-�","insertBefore":"앞에 �
-� 삽�
-","insertAfter":"뒤에 �
-� 삽�
-","deleteCell":"�
-� 삭제","merge":"�
-� 합치기","mergeRight":"오른쪽 합치기","mergeDown":"왼쪽 합치기","splitHorizontal":"수평 나누기","splitVertical":"수직 나누기","title":"�
-� 속성","cellType":"�
-� �
-류","rowSpan":"행 간격","colSpan":"열 간격","wordWrap":"줄 끝 단어 줄 바꿈","hAlign":"가로 정렬","vAlign":"세로 정렬","alignBaseline":"영문 글꼴 기준선","bgColor":"배경색","borderColor":"�
-�두리 색","data":"자료","header":"머릿칸","yes":"예","no":"아니오","invalidWidth":"�
-� 너비는 숫자여야 합니다.","invalidHeight":"�
-� 높이는 숫자여야 합니다.","invalidRowSpan":"행 간격은 정수여야 합니다.","invalidColSpan":"열 간격은 정수여야 합니다.","chooseColor":"선택"},"cellPad":"�
-� 여백","cellSpace":"�
-� 간격","column":{"menu":"열","insertBefore":"왼쪽에 열 삽�
-","insertAfter":"오른쪽에 열 삽�
-","deleteColumn":"열 삭제"},"columns":"열","deleteTable":"표 삭제","headers":"머릿칸","headersBoth":"모두","headersColumn":"첫 열","headersNone":"없음","headersRow":"첫 행","invalidBorder":"�
-�두리 두께는 숫자여야 합니다.","invalidCellPadding":"�
-� 여백은 0 이상이어야 합니다.","invalidCellSpacing":"�
-� 간격은 0 이상이어야 합니다.","invalidCols":"열 번호는 0보다 커야 합니다.","invalidHeight":"표 높이는 숫자여야 합니다.","invalidRows":"행 번호는 0보다 커야 합니다.","invalidWidth":"표의 너비는 숫자여야 합니다.","menu":"표 속성","row":{"menu":"행","insertBefore":"위에 행 삽�
-","insertAfter":"아래에 행 삽�
-","deleteRow":"행 삭제"},"rows":"행","summary":"요약","title":"표 속성","toolbar":"표","widthPc":"백분율","widthPx":"픽�
-�","widthUnit":"너비 단위"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"형식 지우기"},"sourcearea":{"toolbar":"소스"},"toolbar":{"toolbarCollapse":"툴바 줄이기","toolbarExpand":"툴바 확장","toolbarGroups":{"document":"문서","clipboard":"클립보드/실행 취소","editing":"편집","forms":"폼","basicstyles":"기본 스타일","paragraph":"단락","links":"링크","insert":"삽�
-","styles":"스타일","colors":"색상","tools":"도구"},"toolbars":"에디터 툴바"},"undo":{"redo":"다시 실행","undo":"실행 취소"},"colordialog":{"clear":"비우기","highlight":"강조","options":"색상 옵�
-�","selected":"선택된 색상","title":"색상 선택"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ku.js b/plugins/ckeditor/src/lang/ku.js
deleted file mode 100644
index cfbdc105e..000000000
--- a/plugins/ckeditor/src/lang/ku.js
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ku']={"editor":"سەرنووسەی دەقی تەواو","editorPanel":"بڕگەی سەرنووسەی دەقی تەواو","common":{"editorHelp":"کلیکی ALT لەگەڵ 0 بکه‌ بۆ یار�
-ەتی","browseServer":"هێنانی ڕاژە","url":"ناونیشانی بەستەر","protocol":"پڕۆتۆکۆڵ","upload":"بارکردن","uploadSubmit":"ناردنی بۆ ڕاژە","image":"وێنە","flash":"فلاش","form":"داڕشتە","checkbox":"خانەی نیشانکردن","radio":"جێگرەوەی دوگ�
-ە","textField":"خانەی دەق","textarea":"ڕووبەری دەق","hiddenField":"شاردنەوی خانە","button":"دوگ�
-ە","select":"هەڵبژاردەی خانە","imageButton":"دوگ�
-ەی وێنە","notSet":"<هیچ دانەدراوە>","id":"ناسنا�
-ە","name":"ناو","langDir":"ئاراستەی ز�
-ان","langDirLtr":"چەپ بۆ ڕاست (LTR)","langDirRtl":"ڕاست بۆ چەپ (RTL)","langCode":"هێ�
-ای ز�
-ان","longDescr":"پێناسەی درێژی بەستەر","cssClass":"شێوازی چینی په‌ڕە","advisoryTitle":"ڕاوێژکاری سەردێڕ","cssStyle":"شێواز","ok":"باشە","cancel":"پاشگەزبوونەوە","close":"داخستن","preview":"پێشبینین","resize":"گۆڕینی ئەندازە","generalTab":"گشتی","advancedTab":"پەرەسەندوو","validateNumberFailed":"ئە�
- نرخە ژ�
-ارە نیە، تکایە نرخێکی ژ�
-ارە بنووسە.","confirmNewPage":"سەرجە�
- گۆڕانکاریەکان و پێکهاتەکانی ناووەوە لەدەست دەدەی گەر بێتوو پاشکەوتی نەکەی یەکە�
- جار، تۆ هەر دڵنیایی لەکردنەوەی پەنجەرەکی نوێ؟","confirmCancel":"هەندێك هەڵبژاردە گۆڕدراوە. تۆ دڵنیایی لە داخستنی ئە�
- دیالۆگە؟","options":"هەڵبژاردەکان","target":"ئا�
-انج","targetNew":"پەنجەرەیەکی نوێ (_blank)","targetTop":"لووتکەی پەنجەرە (_top)","targetSelf":"لەهە�
-ان پەنجەرە (_self)","targetParent":"پەنجەرەی باوان (_parent)","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","styles":"شێواز","cssClasses":"شێوازی چینی پەڕە","width":"پانی","height":"درێژی","align":"ڕێککەرەوە","alignLeft":"چەپ","alignRight":"ڕاست","alignCenter":"ناوەڕاست","alignJustify":"هاوستوونی","alignTop":"سەرەوە","alignMiddle":"ناوەند","alignBottom":"ژێرەوە","alignNone":"هیچ","invalidValue":"نرخێکی نادرووست.","invalidHeight":"درێژی دەبێت ژ�
-ارە بێت.","invalidWidth":"پانی دەبێت ژ�
-ارە بێت.","invalidCssLength":"ئە�
- نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژ�
-ارەکی درووست بێت یان بێ ناونیشانی ئا�
-رازی (px, %, in, cm, mm, em, ex, pt, یان pc).","invalidHtmlLength":"ئە�
- نرخەی دراوە بۆ خانەی \"%1\" دەبێت ژ�
-ارەکی درووست بێت یان بێ ناونیشانی ئا�
-رازی HTML (px یان %).","invalidInlineStyle":"دانەی نرخی شێوازی ناوهێڵ دەبێت پێکهاتبێت لەیەك یان زیاتری داڕشتە \"ناو : نرخ\", جیاکردنەوەی بە فاریزە و خاڵ","cssLengthTooltip":"ژ�
-ارەیەك بنووسه‌ بۆ نرخی piksel یان ئا�
-رازێکی درووستی CSS (px, %, in, cm, mm, em, ex, pt, یان pc).","unavailable":"%1<span class=\"cke_accessibility\">, ئا�
-ادە نیە</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"�
-افی لەبەرگەرتنەوەی &copy; $1. گشتی پارێزراوه. ورگێڕانی بۆ کوردی لەلایەن هۆژە کۆیی.","dlgTitle":"دەربارەی CKEditor","help":"سەیری $1 بکه بۆ یار�
-ەتی.","moreInfo":"بۆ زانیاری زیاتر دەربارەی �
-ۆڵەتی بەکارهێنان، تکایه سەردانی �
-اڵپەڕەکە�
-ان بکه:","title":"دەربارەی CKEditor","userGuide":"ڕێپیشاندەری CKEditors"},"clipboard":{"copy":"لەبەرگرتنەوە","copyError":"پارێزی وێبگەڕەکەت ڕێگەنادات بەسەرنووسەکە لە لکاندنی دەقی خۆکارارنە. تکایە لەبری ئە�
-ە ئە�
- فەر�
-انە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+C).","cut":"بڕین","cutError":"پارێزی وێبگەڕەکەت ڕێگەنادات بە سەرنووسەکە لەبڕینی خۆکارانە. تکایە لەبری ئە�
-ە ئە�
- فەر�
-انە بەکاربهێنە بەداگرتنی کلیلی (Ctrl/Cmd+X).","paste":"لکاندن","pasteArea":"ناوچەی لکاندن","pasteMsg":"تکایە بیلکێنە لەناوەوەی ئە�
- سنوقە لەڕێی تەختەکلیلەکەت بە بەکارهێنانی کلیلی (<STRONG>Ctrl/Cmd+V</STRONG>) دووای کلیکی باشە بکە.","securityMsg":"بەهۆی شێوەپێدانی پارێزی وێبگەڕەکەت، سەرنووسەکه ناتوانێت دەستبگەیەنێت بەهەڵگیراوەکە ڕاستەوخۆ. بۆیه پێویسته دووباره بیلکێنیت لە�
- پەنجەرەیه.","title":"لکاندن"},"base64image":{"alt":"جێگرەوەی دەق","lockRatio":"داخستنی ڕێژه","vSpace":"بۆشایی ئەستونی","hSpace":"بۆشایی ئاسۆیی","border":"پەراوێز"},"basicstyles":{"bold":"قەڵەو","italic":"لار","strike":"لێدان","subscript":"ژێرنووس","superscript":"سەرنووس","underline":"ژێرهێڵ"},"bidi":{"ltr":"ئاراستەی نووسە لە چەپ بۆ ڕاست","rtl":"ئاراستەی نووسە لە ڕاست بۆ چەپ"},"blockquote":{"toolbar":"بەربەستکردنی ووتەی وەرگیراو"},"button":{"selectedLabel":"%1 (هەڵبژێردراو)"},"colorbutton":{"auto":"خۆکار","bgColorTitle":"ڕەنگی پاشبنە�
-ا","colors":{"000":"ڕەش","800000":"سۆرو �
-اڕوونی","8B4513":"�
-اڕوونی","2F4F4F":"سەوزی تاریك","008080":"سەوز و شین","000080":"شینی تۆخ","4B0082":"�
-ۆری تۆخ","696969":"ڕەساسی تۆخ","B22222":"سۆری تۆخ","A52A2A":"قاوەیی","DAA520":"قاوەیی بریسکەدار","006400":"سەوزی تۆخ","40E0D0":"شینی ناتۆخی بریسکەدار","0000CD":"شینی �
-ا�
-ناوەند","800080":"پە�
-بەیی","808080":"ڕەساسی","F00":"سۆر","FF8C00":"نارەنجی تۆخ","FFD700":"زەرد","008000":"سەوز","0FF":"شینی ئاس�
-انی","00F":"شین","EE82EE":"پە�
-ەیی","A9A9A9":"ڕەساسی ناتۆخ","FFA07A":"نارەنجی ناتۆخ","FFA500":"نارەنجی","FFFF00":"زەرد","00FF00":"سەوز","AFEEEE":"شینی ناتۆخ","ADD8E6":"شینی زۆر ناتۆخ","DDA0DD":"پە�
-ەیی ناتۆخ","D3D3D3":"ڕەساسی بریسکەدار","FFF0F5":"جەرگی زۆر ناتۆخ","FAEBD7":"جەرگی ناتۆخ","FFFFE0":"سپی ناتۆخ","F0FFF0":"هەنگوینی ناتۆخ","F0FFFF":"شینێکی زۆر ناتۆخ","F0F8FF":"شینێکی ئاس�
-انی زۆر ناتۆخ","E6E6FA":"شیری","FFF":"سپی","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"ڕەنگی زیاتر...","panelTitle":"ڕەنگەکان","textColorTitle":"ڕەنگی دەق"},"font":{"fontSize":{"label":"گەورەیی","voiceLabel":"گەورەیی فۆنت","panelTitle":"گەورەیی فۆنت"},"label":"فۆنت","panelTitle":"ناوی فۆنت","voiceLabel":"فۆنت"},"image":{"alt":"جێگرەوەی دەق","border":"پەراوێز","btnUpload":"ناردنی بۆ ڕاژه","button2Img":"تۆ دەتەوێت دوگ�
-ەی وێنەی دیاریکراو بگۆڕیت بۆ وێنەیەکی ئاسایی؟","hSpace":"بۆشایی ئاسۆیی","img2Button":"تۆ دەتەوێت وێنەی دیاریکراو بگۆڕیت بۆ دوگ�
-ەی وێنه؟","infoTab":"زانیاری وێنه","linkTab":"بەستەر","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","resetSize":"ڕێکخستنەوەی قەباره","title":"خاسیەتی وێنه","titleButton":"خاسیەتی دوگ�
-ەی وێنه","upload":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","vSpace":"بۆشایی ئەستونی","validateBorder":"پەراوێز دەبێت بەتەواوی تەنها ژ�
-اره بێت.","validateHSpace":"بۆشایی ئاسۆیی دەبێت بەتەواوی تەنها ژ�
-ارە بێت.","validateVSpace":"بۆشایی ئەستونی دەبێت بەتەواوی تەنها ژ�
-اره بێت."},"widget":{"move":"کرتەبکە و ڕایبکێشە بۆ جوڵاندن","label":"%1 ویجێت"},"image2":{"alt":"جێگرەوەی دەق","btnUpload":"ناردنی بۆ ڕاژه","captioned":"وێنەی بەسەردێر","captionPlaceholder":"سەردێر","infoTab":"زانیاری وێنه","lockRatio":"داخستنی ڕێژه","menu":"خاسیەتی وێنه","pathName":"وێنە","pathNameCaption":"سەردێر","resetSize":"ڕێکخستنەوەی قەباره","resizer":"کرتەبکە و ڕایبکێشە بۆ قەبارە گۆڕین","title":"خاسیەتی وێنه","uploadTab":"بارکردن","urlMissing":"سەرچاوەی بەستەری وێنه بزره","altMissing":"Alternative text is missing."},"indent":{"indent":"زیادکردنی بۆشایی","outdent":"کە�
-کردنەوەی بۆشایی"},"fakeobjects":{"anchor":"لەنگەر","flash":"فلاش","hiddenfield":"شاردنەوەی خانه","iframe":"لەچوارچێوە","unknown":"بەرکارێکی نەناسراو"},"link":{"acccessKey":"کلیلی دەستپێگەیشتن","advanced":"پێشکەوتوو","advisoryContentType":"جۆری ناوەڕۆکی ڕاویژکار","advisoryTitle":"ڕاوێژکاری سەردێڕ","anchor":{"toolbar":"دانان/چاکسازی لەنگەر","menu":"چاکسازی لەنگەر","title":"خاسیەتی لەنگەر","name":"ناوی لەنگەر","errorName":"تکایه ناوی لەنگەر بنووسه","remove":"لابردنی لەنگەر"},"anchorId":"بەپێی ناسنا�
-ەی توخ�
-","anchorName":"بەپێی ناوی لەنگەر","charset":"بەستەری سەرچاوەی نووسە","cssClasses":"شێوازی چینی پەڕه","download":"Force Download","displayText":"Display Text","emailAddress":"ناونیشانی ئی�
-ەیل","emailBody":"ناوەڕۆکی نا�
-ە","emailSubject":"بابەتی نا�
-ە","id":"ناسنا�
-ە","info":"زانیاری بەستەر","langCode":"هێ�
-ای ز�
-ان","langDir":"ئاراستەی ز�
-ان","langDirLTR":"چەپ بۆ ڕاست (LTR)","langDirRTL":"ڕاست بۆ چەپ (RTL)","menu":"چاکسازی بەستەر","name":"ناو","noAnchors":"(هیچ جۆرێکی لەنگەر ئا�
-ادە نیە لە�
- پەڕەیه)","noEmail":"تکایە ناونیشانی ئی�
-ەیل بنووسە","noUrl":"تکایە ناونیشانی بەستەر بنووسە","other":"<هیتر>","popupDependent":"پێوەبەستراو (Netscape)","popupFeatures":"خاسیەتی پەنجەرەی سەرهەڵدەر","popupFullScreen":"پڕ بەپڕی شاشە (IE)","popupLeft":"جێگای چەپ","popupLocationBar":"هێڵی ناونیشانی بەستەر","popupMenuBar":"هێڵی لیسته","popupResizable":"توانای گۆڕینی قەباره","popupScrollBars":"هێڵی هاتووچۆپێکردن","popupStatusBar":"هێڵی دۆخ","popupToolbar":"هێڵی تووڵا�
-راز","popupTop":"جێگای سەرەوە","rel":"پەیوەندی","selectAnchor":"هەڵبژاردنی لەنگەرێك","styles":"شێواز","tabIndex":"بازدەری تابی  ئیندێکس","target":"ئا�
-انج","targetFrame":"<چووارچێوە>","targetFrameName":"ناوی ئا�
-انجی چووارچێوە","targetPopup":"<پەنجەرەی سەرهەڵدەر>","targetPopupName":"ناوی پەنجەرەی سەرهەڵدەر","title":"بەستەر","toAnchor":"بەستەر بۆ لەنگەر له دەق","toEmail":"ئی�
-ەیل","toUrl":"ناونیشانی بەستەر","toolbar":"دانان/ڕێکخستنی بەستەر","type":"جۆری بەستەر","unlink":"لابردنی بەستەر","upload":"بارکردن"},"list":{"bulletedlist":"دانان/لابردنی خاڵی لیست","numberedlist":"دانان/لابردنی ژ�
-ارەی لیست"},"maximize":{"maximize":"ئەوپەڕی گەورەیی","minimize":"ئەوپەڕی بچووکی"},"table":{"border":"گەورەیی پەراوێز","caption":"سەردێڕ","cell":{"menu":"خانه","insertBefore":"دانانی خانه لەپێش","insertAfter":"دانانی خانه لەپاش","deleteCell":"سڕینەوەی خانه","merge":"تێکەڵکردنی خانە","mergeRight":"تێکەڵکردنی لەگەڵ ڕاست","mergeDown":"تێکەڵکردنی لەگەڵ خوارەوە","splitHorizontal":"دابەشکردنی خانەی ئاسۆیی","splitVertical":"دابەشکردنی خانەی ئەستونی","title":"خاسیەتی خانه","cellType":"جۆری خانه","rowSpan":"�
-اوەی نێوان ڕیز","colSpan":"بستی ئەستونی","wordWrap":"پێچانەوەی وشە","hAlign":"ڕیزکردنی ئاسۆیی","vAlign":"ڕیزکردنی ئەستونی","alignBaseline":"هێڵەبنەڕەت","bgColor":"ڕەنگی پاشبنە�
-ا","borderColor":"ڕەنگی پەراوێز","data":"داتا","header":"سەرپەڕه","yes":"بەڵێ","no":"نەخێر","invalidWidth":"پانی خانه دەبێت بەتەواوی ژ�
-اره بێت.","invalidHeight":"درێژی خانه بەتەواوی دەبێت ژ�
-ارە بێت.","invalidRowSpan":"�
-اوەی نێوان ڕیز بەتەواوی دەبێت ژ�
-ارە بێت.","invalidColSpan":"�
-اوەی نێوان ئەستونی بەتەواوی دەبێت ژ�
-ارە بێت.","chooseColor":"هەڵبژێرە"},"cellPad":"بۆشایی ناوپۆش","cellSpace":"بۆشایی خانه","column":{"menu":"ئەستون","insertBefore":"دانانی ئەستون لەپێش","insertAfter":"دانانی ئەستوون لەپاش","deleteColumn":"سڕینەوەی ئەستوون"},"columns":"ستوونەکان","deleteTable":"سڕینەوەی خشتە","headers":"سەرپەڕه","headersBoth":"هەردووك","headersColumn":"یەکە�
- ئەستوون","headersNone":"هیچ","headersRow":"یەکە�
- ڕیز","invalidBorder":"ژ�
-ارەی پەراوێز دەبێت تەنها ژ�
-اره بێت.","invalidCellPadding":"ناوپۆشی خانه دەبێت ژ�
-ارەکی درووست بێت.","invalidCellSpacing":"بۆشایی خانه دەبێت ژ�
-ارەکی درووست بێت.","invalidCols":"ژ�
-ارەی ئەستوونی دەبێت گەورەتر بێت لەژ�
-ارەی 0.","invalidHeight":"درێژی خشته دهبێت تهنها ژ�
-اره بێت.","invalidRows":"ژ�
-ارەی ڕیز دەبێت گەورەتر بێت لەژ�
-ارەی 0.","invalidWidth":"پانی خشته دەبێت تەنها ژ�
-اره بێت.","menu":"خاسیەتی خشتە","row":{"menu":"ڕیز","insertBefore":"دانانی ڕیز لەپێش","insertAfter":"دانانی ڕیز لەپاش","deleteRow":"سڕینەوەی ڕیز"},"rows":"ڕیز","summary":"کورتە","title":"خاسیەتی خشتە","toolbar":"خشتە","widthPc":"لەسەدا","widthPx":"وێنەخاڵ - پیکسل","widthUnit":"پانی یەکە"},"quicktable":{"more":"بیشتر..."},"removeformat":{"toolbar":"لابردنی داڕشتەکە"},"sourcearea":{"toolbar":"سەرچاوە"},"toolbar":{"toolbarCollapse":"شاردنەوی هێڵی تووڵا�
-راز","toolbarExpand":"نیشاندانی هێڵی تووڵا�
-راز","toolbarGroups":{"document":"پەڕه","clipboard":"بڕین/پووچکردنەوە","editing":"چاکسازی","forms":"داڕشتە","basicstyles":"شێوازی بنچینەیی","paragraph":"بڕگە","links":"بەستەر","insert":"خستنە ناو","styles":"شێواز","colors":"ڕەنگەکان","tools":"ئا�
-رازەکان"},"toolbars":"تووڵا�
-رازی دەسکاریکەر"},"undo":{"redo":"هەڵگەڕاندنەوە","undo":"پووچکردنەوە"},"colordialog":{"clear":"پاکیکەوە","highlight":"نیشانکردن","options":"هەڵبژاردەی ڕەنگەکان","selected":"ڕەنگی هەڵبژێردراو","title":"هەڵبژاردنی ڕەنگ"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/lt.js b/plugins/ckeditor/src/lang/lt.js
deleted file mode 100644
index b8e1daaf9..000000000
--- a/plugins/ckeditor/src/lang/lt.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['lt']={"editor":"Pilnas redaktorius","editorPanel":"Pilno redagtoriaus skydelis","common":{"editorHelp":"Spauskite ALT 0 dėl pagalbos","browseServer":"Naršyti po serverį","url":"URL","protocol":"Protokolas","upload":"Siųsti","uploadSubmit":"Siųsti į serverį","image":"Vaizdas","flash":"Flash","form":"Forma","checkbox":"Žymimasis langelis","radio":"Žymimoji akutė","textField":"Teksto laukas","textarea":"Teksto sritis","hiddenField":"Nerodomas laukas","button":"Mygtukas","select":"Atrankos laukas","imageButton":"Vaizdinis mygtukas","notSet":"<nėra nustatyta>","id":"Id","name":"Vardas","langDir":"Teksto kryptis","langDirLtr":"Iš kairės į dešinę (LTR)","langDirRtl":"Iš dešinės į kairę (RTL)","langCode":"Kalbos kodas","longDescr":"Ilgas aprašymas URL","cssClass":"Stilių lentelės klasės","advisoryTitle":"Konsultacinė antraštė","cssStyle":"Stilius","ok":"OK","cancel":"Nutraukti","close":"Uždaryti","preview":"Peržiūrėti","resize":"Pavilkite, kad pakeistumėte dydį","generalTab":"Bendros savybės","advancedTab":"Papildomas","validateNumberFailed":"Ši reikšmė nėra skaičius.","confirmNewPage":"Visas neišsaugotas turinys bus prarastas. Ar tikrai norite įkrauti nauj�
- puslapį?","confirmCancel":"Kai kurie parametrai pasikeitė. Ar tikrai norite užverti lang�
-?","options":"Parametrai","target":"Tikslinė nuoroda","targetNew":"Naujas langas (_blank)","targetTop":"Viršutinis langas (_top)","targetSelf":"Esamas langas (_self)","targetParent":"Paskutinis langas (_parent)","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","styles":"Stilius","cssClasses":"Stilių klasės","width":"Plotis","height":"Aukštis","align":"Lygiuoti","alignLeft":"Kairę","alignRight":"Dešinę","alignCenter":"Centr�
-","alignJustify":"Lygiuoti abi puses","alignTop":"Viršūnę","alignMiddle":"Vidurį","alignBottom":"Apači�
-","alignNone":"Niekas","invalidValue":"Neteisinga reikšmė.","invalidHeight":"Aukštis turi būti nurodytas skaičiais.","invalidWidth":"Plotis turi būti nurodytas skaičiais.","invalidCssLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo CSS matavimo vieneto (px, %, in, cm, mm, em, ex, pt arba pc).","invalidHtmlLength":"Reikšmė nurodyta \"%1\" laukui, turi būti teigiamas skaičius su arba be tinkamo HTML matavimo vieneto (px arba %).","invalidInlineStyle":"Reikšmė nurodyta vidiniame stiliuje turi būti sudaryta iš vieno šių reikšmių \"vardas : reikšmė\", atskirta kabliataškiais.","cssLengthTooltip":"Įveskite reikšmę pikseliais arba skaičiais su tinkamu CSS vienetu (px, %, in, cm, mm, em, ex, pt arba pc).","unavailable":"%1<span class=\"cke_accessibility\">, netinkamas</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Visos teiss saugomos.","dlgTitle":"Apie CKEditor","help":"Patikrinkite $1 dėl pagalbos.","moreInfo":"Dėl licencijavimo apsilankykite mūsų svetainėje:","title":"Apie CKEditor","userGuide":"CKEditor Vartotojo Gidas"},"clipboard":{"copy":"Kopijuoti","copyError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti kopijavimo operacijų. Tam prašome naudoti klaviatūr�
- (Ctrl/Cmd+C).","cut":"Iškirpti","cutError":"Jūsų naršyklės saugumo nustatymai neleidžia redaktoriui automatiškai įvykdyti iškirpimo operacijų. Tam prašome naudoti klaviatūr�
- (Ctrl/Cmd+X).","paste":"Įdėti","pasteArea":"Įkelti dalį","pasteMsg":"Žemiau esančiame įvedimo lauke įdėkite tekst�
-, naudodami klaviatūr�
- (<STRONG>Ctrl/Cmd+V</STRONG>) ir paspauskite mygtuk�
- <STRONG>OK</STRONG>.","securityMsg":"Dėl jūsų naršyklės saugumo nustatymų, redaktorius negali tiesiogiai pasiekti laikinosios atminties. Jums reikia nukopijuoti dar kart�
- į šį lang�
-.","title":"Įdėti"},"base64image":{"alt":"Alternatyvus Tekstas","lockRatio":"Išlaikyti proporcij�
-","vSpace":"Vert.Erdvė","hSpace":"Hor.Erdvė","border":"Rėmelis"},"basicstyles":{"bold":"Pusjuodis","italic":"Kursyvas","strike":"Perbrauktas","subscript":"Apatinis indeksas","superscript":"Viršutinis indeksas","underline":"Pabrauktas"},"bidi":{"ltr":"Tekstas iš kairės į dešinę","rtl":"Tekstas iš dešinės į kairę"},"blockquote":{"toolbar":"Citata"},"button":{"selectedLabel":"%1 (Pasirinkta)"},"colorbutton":{"auto":"Automatinis","bgColorTitle":"Fono spalva","colors":{"000":"Juoda","800000":"Kaštoninė","8B4513":"Tamsiai ruda","2F4F4F":"Pilka tamsaus šiferio","008080":"Teal","000080":"Karinis","4B0082":"Indigo","696969":"Tamsiai pilka","B22222":"Ugnies","A52A2A":"Ruda","DAA520":"Aukso","006400":"Tamsiai žalia","40E0D0":"Turquoise","0000CD":"Vidutinė mėlyna","800080":"Violetinė","808080":"Pilka","F00":"Raudona","FF8C00":"Tamsiai oranžinė","FFD700":"Auksinė","008000":"Žalia","0FF":"Žydra","00F":"Mėlyna","EE82EE":"Violetinė","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžinė","FFFF00":"Geltona","00FF00":"Citrinų","AFEEEE":"Pale Turquoise","ADD8E6":"Šviesiai mėlyna","DDA0DD":"Plum","D3D3D3":"Šviesiai pilka","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Šviesiai geltona","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Balta","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Daugiau spalvų...","panelTitle":"Spalva","textColorTitle":"Teksto spalva"},"font":{"fontSize":{"label":"Šrifto dydis","voiceLabel":"Šrifto dydis","panelTitle":"Šrifto dydis"},"label":"Šriftas","panelTitle":"Šriftas","voiceLabel":"Šriftas"},"image":{"alt":"Alternatyvus Tekstas","border":"Rėmelis","btnUpload":"Siųsti į serverį","button2Img":"Ar norite mygtuk�
- paversti paprastu paveiksliuku?","hSpace":"Hor.Erdvė","img2Button":"Ar norite paveiksliuk�
- paversti mygtuku?","infoTab":"Vaizdo informacija","linkTab":"Nuoroda","lockRatio":"Išlaikyti proporcij�
-","menu":"Vaizdo savybės","resetSize":"Atstatyti dydį","title":"Vaizdo savybės","titleButton":"Vaizdinio mygtuko savybės","upload":"Nusiųsti","urlMissing":"Paveiksliuko nuorodos nėra.","vSpace":"Vert.Erdvė","validateBorder":"Reikšmė turi būti sveikas skaičius.","validateHSpace":"Reikšmė turi būti sveikas skaičius.","validateVSpace":"Reikšmė turi būti sveikas skaičius."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternatyvus Tekstas","btnUpload":"Siųsti į serverį","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Vaizdo informacija","lockRatio":"Išlaikyti proporcij�
-","menu":"Vaizdo savybės","pathName":"image","pathNameCaption":"caption","resetSize":"Atstatyti dydį","resizer":"Click and drag to resize","title":"Vaizdo savybės","uploadTab":"Siųsti","urlMissing":"Paveiksliuko nuorodos nėra.","altMissing":"Alternative text is missing."},"indent":{"indent":"Padidinti įtrauk�
-","outdent":"Sumažinti įtrauk�
-"},"fakeobjects":{"anchor":"Žymė","flash":"Flash animacija","hiddenfield":"Paslėptas laukas","iframe":"IFrame","unknown":"Nežinomas objektas"},"link":{"acccessKey":"Prieigos raktas","advanced":"Papildomas","advisoryContentType":"Konsultacinio turinio tipas","advisoryTitle":"Konsultacinė antraštė","anchor":{"toolbar":"Įterpti/modifikuoti žymę","menu":"Žymės savybės","title":"Žymės savybės","name":"Žymės vardas","errorName":"Prašome įvesti žymės vard�
-","remove":"Pašalinti žymę"},"anchorId":"Pagal žymės Id","anchorName":"Pagal žymės vard�
-","charset":"Susietų išteklių simbolių lentelė","cssClasses":"Stilių lentelės klasės","download":"Force Download","displayText":"Display Text","emailAddress":"El.pašto adresas","emailBody":"Žinutės turinys","emailSubject":"Žinutės tema","id":"Id","info":"Nuorodos informacija","langCode":"Teksto kryptis","langDir":"Teksto kryptis","langDirLTR":"Iš kairės į dešinę (LTR)","langDirRTL":"Iš dešinės į kairę (RTL)","menu":"Taisyti nuorod�
-","name":"Vardas","noAnchors":"(Šiame dokumente žymių nėra)","noEmail":"Prašome įvesti el.pašto adres�
-","noUrl":"Prašome įvesti nuorodos URL","other":"<kitas>","popupDependent":"Priklausomas (Netscape)","popupFeatures":"Išskleidžiamo lango savybės","popupFullScreen":"Visas ekranas (IE)","popupLeft":"Kairė pozicija","popupLocationBar":"Adreso juosta","popupMenuBar":"Meniu juosta","popupResizable":"Kintamas dydis","popupScrollBars":"Slinkties juostos","popupStatusBar":"Būsenos juosta","popupToolbar":"Mygtukų juosta","popupTop":"Viršutinė pozicija","rel":"S�
-sajos","selectAnchor":"Pasirinkite žymę","styles":"Stilius","tabIndex":"Tabuliavimo indeksas","target":"Paskirties vieta","targetFrame":"<kadras>","targetFrameName":"Paskirties kadro vardas","targetPopup":"<išskleidžiamas langas>","targetPopupName":"Paskirties lango vardas","title":"Nuoroda","toAnchor":"Žymė šiame puslapyje","toEmail":"El.paštas","toUrl":"Nuoroda","toolbar":"Įterpti/taisyti nuorod�
-","type":"Nuorodos tipas","unlink":"Panaikinti nuorod�
-","upload":"Siųsti"},"list":{"bulletedlist":"Suženklintas s�
-rašas","numberedlist":"Numeruotas s�
-rašas"},"maximize":{"maximize":"Išdidinti","minimize":"Sumažinti"},"table":{"border":"Rėmelio dydis","caption":"Antraštė","cell":{"menu":"Langelis","insertBefore":"Įterpti langelį prieš","insertAfter":"Įterpti langelį po","deleteCell":"Šalinti langelius","merge":"Sujungti langelius","mergeRight":"Sujungti su dešine","mergeDown":"Sujungti su apačia","splitHorizontal":"Skaidyti langelį horizontaliai","splitVertical":"Skaidyti langelį vertikaliai","title":"Cell nustatymai","cellType":"Cell rūšis","rowSpan":"Eilučių Span","colSpan":"Stulpelių Span","wordWrap":"Sutraukti raides","hAlign":"Horizontalus lygiavimas","vAlign":"Vertikalus lygiavimas","alignBaseline":"Apatinė linija","bgColor":"Fono spalva","borderColor":"Rėmelio spalva","data":"Data","header":"Antraštė","yes":"Taip","no":"Ne","invalidWidth":"Reikšmė turi būti skaičius.","invalidHeight":"Reikšmė turi būti skaičius.","invalidRowSpan":"Reikšmė turi būti skaičius.","invalidColSpan":"Reikšmė turi būti skaičius.","chooseColor":"Pasirinkite"},"cellPad":"Tarpas nuo langelio rėmo iki teksto","cellSpace":"Tarpas tarp langelių","column":{"menu":"Stulpelis","insertBefore":"Įterpti stulpelį prieš","insertAfter":"Įterpti stulpelį po","deleteColumn":"Šalinti stulpelius"},"columns":"Stulpeliai","deleteTable":"Šalinti lentelę","headers":"Antraštės","headersBoth":"Abu","headersColumn":"Pirmas stulpelis","headersNone":"Nėra","headersRow":"Pirma eilutė","invalidBorder":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellPadding":"Reikšmė turi būti nurodyta skaičiumi.","invalidCellSpacing":"Reikšmė turi būti nurodyta skaičiumi.","invalidCols":"Skaičius turi būti didesnis nei 0.","invalidHeight":"Reikšmė turi būti nurodyta skaičiumi.","invalidRows":"Skaičius turi būti didesnis nei 0.","invalidWidth":"Reikšmė turi būti nurodyta skaičiumi.","menu":"Lentelės savybės","row":{"menu":"Eilutė","insertBefore":"Įterpti eilutę prieš","insertAfter":"Įterpti eilutę po","deleteRow":"Šalinti eilutes"},"rows":"Eilutės","summary":"Santrauka","title":"Lentelės savybės","toolbar":"Lentelė","widthPc":"procentais","widthPx":"taškais","widthUnit":"pločio vienetas"},"quicktable":{"more":"Daugiau..."},"removeformat":{"toolbar":"Panaikinti format�
-"},"sourcearea":{"toolbar":"Šaltinis"},"toolbar":{"toolbarCollapse":"Apjungti įrankių juost�
-","toolbarExpand":"Išplėsti įrankių juost�
-","toolbarGroups":{"document":"Dokumentas","clipboard":"Atmintinė/Atgal","editing":"Redagavimas","forms":"Formos","basicstyles":"Pagrindiniai stiliai","paragraph":"Paragrafas","links":"Nuorodos","insert":"Įterpti","styles":"Stiliai","colors":"Spalvos","tools":"Įrankiai"},"toolbars":"Redaktoriaus įrankiai"},"undo":{"redo":"Atstatyti","undo":"Atšaukti"},"colordialog":{"clear":"Išvalyti","highlight":"Paryškinti","options":"Spalvos nustatymai","selected":"Pasirinkta spalva","title":"Pasirinkite spalv�
-"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/lv.js b/plugins/ckeditor/src/lang/lv.js
deleted file mode 100644
index 26eecc186..000000000
--- a/plugins/ckeditor/src/lang/lv.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['lv']={"editor":"Bagātinātā teksta redaktors","editorPanel":"Bagātinātā teksta redaktora panelis","common":{"editorHelp":"Palīdzībai, nospiediet ALT 0 ","browseServer":"Skatīt servera saturu","url":"URL","protocol":"Protokols","upload":"Augšupielādēt","uploadSubmit":"Nosūtīt serverim","image":"Attēls","flash":"Flash","form":"Forma","checkbox":"Atzīmēšanas kastīte","radio":"Izvēles poga","textField":"Teksta rinda","textarea":"Teksta laukums","hiddenField":"Paslēpta teksta rinda","button":"Poga","select":"Iezīmēšanas lauks","imageButton":"Attēlpoga","notSet":"<nav iestatīts>","id":"Id","name":"Nosaukums","langDir":"Valodas lasīšanas virziens","langDirLtr":"No kreisās uz labo (LTR)","langDirRtl":"No labās uz kreiso (RTL)","langCode":"Valodas kods","longDescr":"Gara apraksta Hipersaite","cssClass":"Stilu saraksta klases","advisoryTitle":"Konsultatīvs virsraksts","cssStyle":"Stils","ok":"Darīts!","cancel":"Atcelt","close":"Aizvērt","preview":"Priekšskatījums","resize":"Mērogot","generalTab":"Vispārīgi","advancedTab":"Izvērstais","validateNumberFailed":"Šī vērtība nav skaitlis","confirmNewPage":"Jebkuras nesaglabātās izmaiņas tiks zaudētas. Vai tiešām vēlaties atvērt jaunu lapu?","confirmCancel":"Daži no uzstādījumiem ir mainīti. Vai tiešām vēlaties aizvērt šo dialogu?","options":"Uzstādījumi","target":"Mērķis","targetNew":"Jauns logs (_blank)","targetTop":"Virsējais logs (_top)","targetSelf":"Tas pats logs (_self)","targetParent":"Avota logs (_parent)","langDirLTR":"Kreisais uz Labo (LTR)","langDirRTL":"Labais uz Kreiso (RTL)","styles":"Stils","cssClasses":"Stilu klases","width":"Platums","height":"Augstums","align":"Nolīdzināt","alignLeft":"Pa kreisi","alignRight":"Pa labi","alignCenter":"Centrēti","alignJustify":"Izlīdzināt malas","alignTop":"Augšā","alignMiddle":"Vertikāli centrēts","alignBottom":"Apakšā","alignNone":"Nekas","invalidValue":"Nekorekta vērtība","invalidHeight":"Augstumam jābūt skaitlim.","invalidWidth":"Platumam jābūt skaitlim","invalidCssLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām CSS mērvienībām (px, %, in, cm, mm, em, ex, pt, vai pc).","invalidHtmlLength":"Laukam \"%1\" norādītajai vērtībai jābūt pozitīvam skaitlim ar vai bez korektām HTML mērvienībām (px vai %).","invalidInlineStyle":"Iekļautajā stilā norādītajai vērtībai jāsastāv no viena vai vairākiem pāriem pēc forma'ta \"nosaukums: vērtība\", atdalītiem ar semikolu.","cssLengthTooltip":"Ievadiet vērtību pikseļos vai skaitli ar derīgu CSS mērvienību (px, %, in, cm, mm, em, ex, pt, vai pc).","unavailable":"%1<span class=\"cke_accessibility\">, nav pieejams</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Kopēšanas tiesības &copy; $1. Visas tiesības rezervētas.","dlgTitle":"Par CKEditor","help":"Pārbaudiet $1 palīdzībai.","moreInfo":"Informācijai par licenzēšanu apmeklējiet mūsu mājas lapu:","title":"Par CKEditor","userGuide":"CKEditor Lietotāja pamācība"},"clipboard":{"copy":"Kopēt","copyError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt kopēšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+C), lai veiktu šo darbību.","cut":"Izgriezt","cutError":"Jūsu pārlūkprogrammas drošības iestatījumi nepieļauj redaktoram automātiski veikt izgriezšanas darbību.  Lūdzu, izmantojiet (Ctrl/Cmd+X), lai veiktu šo darbību.","paste":"Ielīmēt","pasteArea":"Ielīmēšanas zona","pasteMsg":"Lūdzu, ievietojiet tekstu šajā laukumā, izmantojot klaviatūru (<STRONG>Ctrl/Cmd+V</STRONG>) un apstipriniet ar <STRONG>Darīts!</STRONG>.","securityMsg":"Jūsu pārlūka drošības uzstādījumu dēļ, nav iespējams tieši piekļūt jūsu starpliktuvei. Jums jāielīmē atkārtoti šajā logā.","title":"Ievietot"},"base64image":{"alt":"Alternatīvais teksts","lockRatio":"Nemainīga Augstuma/Platuma attiecība","vSpace":"Horizontālā telpa","hSpace":"Vertikālā telpa","border":"Rāmis"},"basicstyles":{"bold":"Treknināts","italic":"Kursīvs","strike":"Pārsvītrots","subscript":"Apakšrakstā","superscript":"Augšrakstā","underline":"Pasvītrots"},"bidi":{"ltr":"Teksta virziens no kreisās uz labo","rtl":"Teksta virziens no labās uz kreiso"},"blockquote":{"toolbar":"Bloka citāts"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automātiska","bgColorTitle":"Fona krāsa","colors":{"000":"Melns","800000":"Sarkanbrūns","8B4513":"Sedlu brūns","2F4F4F":"Tumšas tāfeles pelēks","008080":"Zili-zaļš","000080":"Jūras","4B0082":"Indigo","696969":"Tumši pelēks","B22222":"Ķieģeļsarkans","A52A2A":"Brūns","DAA520":"Zelta","006400":"Tumši zaļš","40E0D0":"Tirkīzs","0000CD":"Vidēji zils","800080":"Purpurs","808080":"Pelēks","F00":"Sarkans","FF8C00":"Tumši oranžs","FFD700":"Zelta","008000":"Zaļš","0FF":"Tumšzils","00F":"Zils","EE82EE":"Violets","A9A9A9":"Pelēks","FFA07A":"Gaiši laškrāsas","FFA500":"Oranžs","FFFF00":"Dzeltens","00FF00":"Laima","AFEEEE":"Gaiši tirkīza","ADD8E6":"Gaiši zils","DDA0DD":"Plūmju","D3D3D3":"Gaiši pelēks","FFF0F5":"Lavandas sārts","FAEBD7":"Antīki balts","FFFFE0":"Gaiši dzeltens","F0FFF0":"Meduspile","F0FFFF":"Debesszils","F0F8FF":"Alises zils","E6E6FA":"Lavanda","FFF":"Balts","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Plašāka palete...","panelTitle":"Krāsa","textColorTitle":"Teksta krāsa"},"font":{"fontSize":{"label":"Izmērs","voiceLabel":"Fonta izmeŗs","panelTitle":"Izmērs"},"label":"Šrifts","panelTitle":"Šrifts","voiceLabel":"Fonts"},"image":{"alt":"Alternatīvais teksts","border":"Rāmis","btnUpload":"Nosūtīt serverim","button2Img":"Vai vēlaties pārveidot izvēlēto attēla pogu uz attēla?","hSpace":"Horizontālā telpa","img2Button":"Vai vēlaties pārveidot izvēlēto attēlu uz attēla pogas?","infoTab":"Informācija par attēlu","linkTab":"Hipersaite","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","resetSize":"Atjaunot sākotnējo izmēru","title":"Attēla īpašības","titleButton":"Attēlpogas īpašības","upload":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","vSpace":"Vertikālā telpa","validateBorder":"Apmalei jābūt veselam skaitlim","validateHSpace":"HSpace jābūt veselam skaitlim","validateVSpace":"VSpace jābūt veselam skaitlim"},"widget":{"move":"Klikšķina un velc, lai pārvietotu","label":"%1 widget"},"image2":{"alt":"Alternatīvais teksts","btnUpload":"Nosūtīt serverim","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informācija par attēlu","lockRatio":"Nemainīga Augstuma/Platuma attiecība","menu":"Attēla īpašības","pathName":"image","pathNameCaption":"caption","resetSize":"Atjaunot sākotnējo izmēru","resizer":"Click and drag to resize","title":"Attēla īpašības","uploadTab":"Augšupielādēt","urlMissing":"Trūkst attēla atrašanās adrese.","altMissing":"Alternative text is missing."},"indent":{"indent":"Palielināt atkāpi","outdent":"Samazināt atkāpi"},"fakeobjects":{"anchor":"Iezīme","flash":"Flash animācija","hiddenfield":"Slēpts lauks","iframe":"Iframe","unknown":"Nezināms objekts"},"link":{"acccessKey":"Pieejas taustiņš","advanced":"Izvērstais","advisoryContentType":"Konsultatīvs satura tips","advisoryTitle":"Konsultatīvs virsraksts","anchor":{"toolbar":"Ievietot/Labot iezīmi","menu":"Labot iezīmi","title":"Iezīmes uzstādījumi","name":"Iezīmes nosaukums","errorName":"Lūdzu norādiet iezīmes nosaukumu","remove":"Noņemt iezīmi"},"anchorId":"Pēc elementa ID","anchorName":"Pēc iezīmes nosaukuma","charset":"Pievienotā resursa kodējums","cssClasses":"Stilu saraksta klases","download":"Force Download","displayText":"Display Text","emailAddress":"E-pasta adrese","emailBody":"Ziņas saturs","emailSubject":"Ziņas tēma","id":"ID","info":"Hipersaites informācija","langCode":"Valodas kods","langDir":"Valodas lasīšanas virziens","langDirLTR":"No kreisās uz labo (LTR)","langDirRTL":"No labās uz kreiso (RTL)","menu":"Labot hipersaiti","name":"Nosaukums","noAnchors":"(Šajā dokumentā nav iezīmju)","noEmail":"Lūdzu norādi e-pasta adresi","noUrl":"Lūdzu norādi hipersaiti","other":"<cits>","popupDependent":"Atkarīgs (Netscape)","popupFeatures":"Uznirstošā loga nosaukums īpašības","popupFullScreen":"Pilnā ekrānā (IE)","popupLeft":"Kreisā koordināte","popupLocationBar":"Atrašanās vietas josla","popupMenuBar":"Izvēlnes josla","popupResizable":"Mērogojams","popupScrollBars":"Ritjoslas","popupStatusBar":"Statusa josla","popupToolbar":"Rīku josla","popupTop":"Augšējā koordināte","rel":"Relācija","selectAnchor":"Izvēlēties iezīmi","styles":"Stils","tabIndex":"Ciļņu indekss","target":"Mērķis","targetFrame":"<ietvars>","targetFrameName":"Mērķa ietvara nosaukums","targetPopup":"<uznirstošā logā>","targetPopupName":"Uznirstošā loga nosaukums","title":"Hipersaite","toAnchor":"Iezīme šajā lapā","toEmail":"E-pasts","toUrl":"Adrese","toolbar":"Ievietot/Labot hipersaiti","type":"Hipersaites tips","unlink":"Noņemt hipersaiti","upload":"Augšupielādēt"},"list":{"bulletedlist":"Pievienot/Noņemt vienkāršu sarakstu","numberedlist":"Numurēts saraksts"},"maximize":{"maximize":"Maksimizēt","minimize":"Minimizēt"},"table":{"border":"Rāmja izmērs","caption":"Leģenda","cell":{"menu":"Šūna","insertBefore":"Pievienot šūnu pirms","insertAfter":"Pievienot šūnu pēc","deleteCell":"Dzēst rūtiņas","merge":"Apvienot rūtiņas","mergeRight":"Apvieno pa labi","mergeDown":"Apvienot uz leju","splitHorizontal":"Sadalīt šūnu horizontāli","splitVertical":"Sadalīt šūnu vertikāli","title":"Šūnas uzstādījumi","cellType":"Šūnas tips","rowSpan":"Apvienotas rindas","colSpan":"Apvienotas kolonas","wordWrap":"Vārdu pārnese","hAlign":"Horizontālais novietojums","vAlign":"Vertikālais novietojums","alignBaseline":"Pamatrinda","bgColor":"Fona krāsa","borderColor":"Rāmja krāsa","data":"Dati","header":"Virsraksts","yes":"Jā","no":"Nē","invalidWidth":"Šūnas platumam jābūt skaitlim","invalidHeight":"Šūnas augstumam jābūt skaitlim","invalidRowSpan":"Apvienojamo rindu skaitam jābūt veselam skaitlim","invalidColSpan":"Apvienojamo kolonu skaitam jābūt veselam skaitlim","chooseColor":"Izvēlēties"},"cellPad":"Rūtiņu nobīde","cellSpace":"Rūtiņu atstatums","column":{"menu":"Kolonna","insertBefore":"Ievietot kolonu pirms","insertAfter":"Ievieto kolonu pēc","deleteColumn":"Dzēst kolonnas"},"columns":"Kolonnas","deleteTable":"Dzēst tabulu","headers":"Virsraksti","headersBoth":"Abi","headersColumn":"Pirmā kolona","headersNone":"Nekas","headersRow":"Pirmā rinda","invalidBorder":"Rāmju izmēram jābūt skaitlim","invalidCellPadding":"Šūnu atkāpēm jābūt pozitīvam skaitlim","invalidCellSpacing":"Šūnu atstarpēm jābūt pozitīvam skaitlim","invalidCols":"Kolonu skaitam jābūt lielākam par 0","invalidHeight":"Tabulas augstumam jābūt skaitlim","invalidRows":"Rindu skaitam jābūt lielākam par 0","invalidWidth":"Tabulas platumam jābūt skaitlim","menu":"Tabulas īpašības","row":{"menu":"Rinda","insertBefore":"Ievietot rindu pirms","insertAfter":"Ievietot rindu pēc","deleteRow":"Dzēst rindas"},"rows":"Rindas","summary":"Anotācija","title":"Tabulas īpašības","toolbar":"Tabula","widthPc":"procentuāli","widthPx":"pikseļos","widthUnit":"platuma mērvienība"},"quicktable":{"more":"Plašāka..."},"removeformat":{"toolbar":"Noņemt stilus"},"sourcearea":{"toolbar":"HTML kods"},"toolbar":{"toolbarCollapse":"Aizvērt rīkjoslu","toolbarExpand":"Atvērt rīkjoslu","toolbarGroups":{"document":"Dokuments","clipboard":"Starpliktuve/Atcelt","editing":"Labošana","forms":"Formas","basicstyles":"Pamata stili","paragraph":"Paragrāfs","links":"Saites","insert":"Ievietot","styles":"Stili","colors":"Krāsas","tools":"Rīki"},"toolbars":"Redaktora rīkjoslas"},"undo":{"redo":"Atkārtot","undo":"Atcelt"},"colordialog":{"clear":"Notīrīt","highlight":"Paraugs","options":"Krāsas uzstādījumi","selected":"Izvēlētā krāsa","title":"Izvēlies krāsu"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/mk.js b/plugins/ckeditor/src/lang/mk.js
deleted file mode 100644
index b3e5c4d86..000000000
--- a/plugins/ckeditor/src/lang/mk.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['mk']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Притисни ALT 0 за помош","browseServer":"Пребарај низ серверот","url":"URL","protocol":"Протокол","upload":"Прикачи","uploadSubmit":"Прикачи на сервер","image":"Слика","flash":"Flash","form":"Form","checkbox":"Checkbox","radio":"Radio Button","textField":"Поле за текст","textarea":"Големо поле за текст","hiddenField":"Скриено поле","button":"Button","select":"Selection Field","imageButton":"Копче-слика","notSet":"<not set>","id":"Id","name":"Name","langDir":"Насока на јазик","langDirLtr":"Лево кон десно","langDirRtl":"Десно кон лево","langCode":"Код на јазик","longDescr":"Long Description URL","cssClass":"Stylesheet Classes","advisoryTitle":"Advisory Title","cssStyle":"Стил","ok":"OK","cancel":"Cancel","close":"Close","preview":"Preview","resize":"Resize","generalTab":"Општо","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опции","target":"Target","targetNew":"Нов прозорец (_blank)","targetTop":"Најгорниот прозорец (_top)","targetSelf":"Истиот прозорец (_self)","targetParent":"Прозорец-родител (_parent)","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","styles":"Стил","cssClasses":"Stylesheet Classes","width":"Широчина","height":"Височина","align":"Alignment","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Во средина","alignJustify":"Justify","alignTop":"Горе","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"Никое","invalidValue":"Невалидна вредност","invalidHeight":"Височината мора да биде број.","invalidWidth":"Широчината мора да биде број.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Авторски права &copy; $1. Сите права се задржани.","dlgTitle":"За CKEditor","help":"Отворете $1 за помош.","moreInfo":"За информации околу лиценцата, ве молиме посетете го нашиот веб-сајт: ","title":"За CKEditor","userGuide":"CKEditor упатство за корисници"},"clipboard":{"copy":"Копирај (Copy)","copyError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши копирање. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","cut":"Исечи (Cut)","cutError":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот автоматски да изврши сечење. Ве молиме употребете ја тастатурата. (Ctrl/Cmd+C)","paste":"Залепи (Paste)","pasteArea":"Простор за залепување","pasteMsg":"Ве молиме да залепите во следниот квадрат користејќи ја тастатурата (<string>Ctrl/Cmd+V</string>) и да притиснете OK","securityMsg":"Опциите за безбедност на вашиот прелистувач не дозволуваат уредувачот директно да пристапи до копираните податоци. Потребно е повторно да се обидете во овој прозорец.","title":"Залепи (Paste)"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Здебелено","italic":"Накривено","strike":"Прецртано","subscript":"Долен индекс","superscript":"Горен индекс","underline":"Подвлечено"},"bidi":{"ltr":"Насока на текст: од лево кон десно","rtl":"Насока на текст: од десно кон лево"},"blockquote":{"toolbar":"Одвоен цитат"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Background Color","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"Colors","textColorTitle":"Text Color"},"font":{"fontSize":{"label":"Size","voiceLabel":"Font Size","panelTitle":"Font Size"},"label":"Font","panelTitle":"Font Name","voiceLabel":"Font"},"image":{"alt":"Алтернативен текст","border":"Раб","btnUpload":"Прикачи на сервер","button2Img":"Дали сакате да направите сликата-копче да биде само слика?","hSpace":"Хоризонтален простор","img2Button":"Дали сакате да ја претворите сликата во слика-копче?","infoTab":"Информации за сликата","linkTab":"Врска","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","resetSize":"Ресетирај големина","title":"Својства на сликата","titleButton":"Својства на копче-сликата","upload":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","vSpace":"Вертикален простор","validateBorder":"Работ мора да биде цел број.","validateHSpace":"Хор. простор мора да биде цел број.","validateVSpace":"Верт. простор мора да биде цел број."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Алтернативен текст","btnUpload":"Прикачи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Информации за сликата","lockRatio":"Зачувај пропорција","menu":"Својства на сликата","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетирај големина","resizer":"Click and drag to resize","title":"Својства на сликата","uploadTab":"Прикачи","urlMissing":"Недостасува URL-то на сликата.","altMissing":"Alternative text is missing."},"indent":{"indent":"Increase Indent","outdent":"Decrease Indent"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Скриено поле","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Access Key","advanced":"Advanced","advisoryContentType":"Advisory Content Type","advisoryTitle":"Advisory Title","anchor":{"toolbar":"Anchor","menu":"Edit Anchor","title":"Anchor Properties","name":"Anchor Name","errorName":"Please type the anchor name","remove":"Remove Anchor"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"Stylesheet Classes","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"Id","info":"Link Info","langCode":"Код на јазик","langDir":"Насока на јазик","langDirLTR":"Лево кон десно","langDirRTL":"Десно кон лево","menu":"Edit Link","name":"Name","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"Стил","tabIndex":"Tab Index","target":"Target","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"Врска","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"Врска","type":"Link Type","unlink":"Unlink","upload":"Прикачи"},"list":{"bulletedlist":"Insert/Remove Bulleted List","numberedlist":"Insert/Remove Numbered List"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Border size","caption":"Caption","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Delete Cells","merge":"Merge Cells","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"Columns","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Remove Format"},"sourcearea":{"toolbar":"Source"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Redo","undo":"Undo"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/mn.js b/plugins/ckeditor/src/lang/mn.js
deleted file mode 100644
index 4d016ac84..000000000
--- a/plugins/ckeditor/src/lang/mn.js
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['mn']={"editor":"Хэлбэрт бичвэр боловсруулагч","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Үйлчлэгч тооцоолуур (сервэр)-ийг үзэ�
-","url":"ца�
-им �
-уудасны �
-аяг (URL)","protocol":"Протокол","upload":"Илгээж ачаала�
-","uploadSubmit":"Үүнийг үйлчлэгч тооцоолуур (сервер) лүү илгээ�
-","image":"Зураг","flash":"Флаш �
-өдөлгөөнтэй зураг","form":"Маягт","checkbox":"Тэмдэглээний нүд","radio":"Радио товчлуур","textField":"Бичвэрийн талбар","textarea":"Бичвэрийн зай","hiddenField":"Далд талбар","button":"Товчлуур","select":"Сонголтын талбар","imageButton":"Зургий товчуур","notSet":"<то�
-ируулаагүй>","id":"Id (те�
-никийн нэр)","name":"Нэр","langDir":"Хэлний чиглэл","langDirLtr":"Зүүнээс баруун (LTR)","langDirRtl":"Баруунаас зүүн (RTL)","langCode":"Хэлний код","longDescr":"Урт тайлбарын вэб �
-аяг","cssClass":"Хэлбэрийн �
-уудасны ангиуд","advisoryTitle":"Зөвлө�
- гарчиг","cssStyle":"Загвар","ok":"За","cancel":"Боли�
-","close":"Хаа�
-","preview":"Урьдчилан �
-ара�
-","resize":"Resize","generalTab":"Ерөн�
-ий","advancedTab":"Гүнзгий","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Сонголт","target":"Бай","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Зүүн талаас баруун тийшээ (LTR)","langDirRTL":"Баруун талаас зүүн тийшээ (RTL)","styles":"Загвар","cssClasses":"Хэлбэрийн �
-уудасны ангиуд","width":"Өргөн","height":"Өндөр","align":"Эгнээ","alignLeft":"Зүүн","alignRight":"Баруун","alignCenter":"Төвд","alignJustify":"Тэгшлэ�
-","alignTop":"Дээд талд","alignMiddle":"Дунд","alignBottom":"Доод талд","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Өндөр нь тоо бай�
- ёстой.","invalidWidth":"Өргөн нь тоо бай�
- ёстой.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Хуула�
-","copyError":"Таны browser-ын �
-амгаалалтын то�
-иргоо editor-д автоматаар �
-уула�
- үйлдэлийг зөвшөөрө�
-гүй байна. (Ctrl/Cmd+C) товчны �
-ослолыг ашиглана уу.","cut":"Хайчла�
-","cutError":"Таны browser-ын �
-амгаалалтын то�
-иргоо editor-д автоматаар �
-айчла�
- үйлдэлийг зөвшөөрө�
-гүй байна. (Ctrl/Cmd+X) товчны �
-ослолыг ашиглана уу.","paste":"Буулга�
-","pasteArea":"Paste Area","pasteMsg":"(<strong>Ctrl/Cmd+V</strong>) товчийг ашиглан paste �
-ийнэ үү. Мөн <strong>OK</strong> дар.","securityMsg":"Таны үзүүлэгч/browser/-н �
-амгаалалтын то�
-иргооноос болоод editor clipboard өгөгдөлрүү шууд �
-анда�
- боломжгүй. Энэ цон�
-од да�
-ин paste �
-ий�
-ийг оролд.","title":"Буулга�
-"},"base64image":{"alt":"Зургийг орло�
- бичвэр","lockRatio":"Радио түгжи�
-","vSpace":"Босоо зай","hSpace":"Хөндлөн зай","border":"Хүрээ"},"basicstyles":{"bold":"Тод бүдүүн","italic":"Налуу","strike":"Дундуур нь зураастай болго�
-","subscript":"Суурь болго�
-","superscript":"Зэрэг болго�
-","underline":"Доогуур нь зураастай болго�
-"},"bidi":{"ltr":"Зүүнээс баруун тийш бичлэг","rtl":"Баруунаас зүүн тийш бичлэг"},"blockquote":{"toolbar":"Ишлэл �
-эсэг"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Автоматаар","bgColorTitle":"Дэвсгэр өнгө","colors":{"000":"Хар","800000":"Хүрэн","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Саарал","F00":"Улаан","FF8C00":"Dark Orange","FFD700":"Алт","008000":"Ногоон","0FF":"Цэн�
-эр","00F":"Хө�
-","EE82EE":"Ягаан","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Улбар шар","FFFF00":"Шар","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Цайвар саарал","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Цагаан","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Нэмэлт өнгөнүүд...","panelTitle":"Өнгөнүүд","textColorTitle":"Бичвэрийн өнгө"},"font":{"fontSize":{"label":"Хэмжээ","voiceLabel":"Үсгийн �
-эмжээ","panelTitle":"Үсгийн �
-эмжээ"},"label":"Үсгийн �
-элбэр","panelTitle":"Үгсийн �
-элбэрийн нэр","voiceLabel":"Үгсийн �
-элбэр"},"image":{"alt":"Зургийг орло�
- бичвэр","border":"Хүрээ","btnUpload":"Үүнийг сервэррүү илгээ","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Хөндлөн зай","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Зурагны мэдээлэл","linkTab":"Холбоос","lockRatio":"Радио түгжи�
-","menu":"Зураг","resetSize":"�
-эмжээ да�
-ин оноо�
-","title":"Зураг","titleButton":"Зурган товчны шинж чанар","upload":"Хуула�
-","urlMissing":"Зургийн э�
- сурвалжийн �
-аяг (URL) бай�
-гүй байна.","vSpace":"Босоо зай","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Зургийг орло�
- бичвэр","btnUpload":"Үүнийг сервэррүү илгээ","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Зурагны мэдээлэл","lockRatio":"Радио түгжи�
-","menu":"Зураг","pathName":"image","pathNameCaption":"caption","resetSize":"�
-эмжээ да�
-ин оноо�
-","resizer":"Click and drag to resize","title":"Зураг","uploadTab":"Илгээж ачаала�
-","urlMissing":"Зургийн э�
- сурвалжийн �
-аяг (URL) бай�
-гүй байна.","altMissing":"Alternative text is missing."},"indent":{"indent":"Догол мөр �
-аса�
-","outdent":"Догол мөр нэмэ�
-"},"fakeobjects":{"anchor":"Зангуу","flash":"Flash Animation","hiddenfield":"Нууц талбар","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Холбо�
- түл�
-үүр","advanced":"Нэмэлт","advisoryContentType":"Зөвлөлдө�
- төрлийн агуулга","advisoryTitle":"Зөвлөлдө�
- гарчиг","anchor":{"toolbar":"Зангуу","menu":"Зангууг болосруула�
-","title":"Зангуугийн шинж чанар","name":"Зангуугийн нэр","errorName":"Зангуугийн нэрийг оруулна уу","remove":"Зангууг устга�
-"},"anchorId":"Элемэнтйн Id нэрээр","anchorName":"Зангуугийн нэрээр","charset":"Тэмдэгт оноо�
- нөөцөд �
-олбогдсон","cssClasses":"Stylesheet классууд","download":"Force Download","displayText":"Display Text","emailAddress":"Э-шуудангийн �
-аяг","emailBody":"Зурвасны и�
- бие","emailSubject":"Зурвасны гарчиг","id":"Id","info":"Холбоосын ту�
-ай мэдээлэл","langCode":"Хэлний код","langDir":"Хэлний чиглэл","langDirLTR":"Зүүнээс баруун (LTR)","langDirRTL":"Баруунаас зүүн (RTL)","menu":"Холбоос засварла�
-","name":"Нэр","noAnchors":"(Баримт бичиг зангуугүй байна)","noEmail":"Э-шуудангий �
-аягаа шивнэ үү","noUrl":"Холбоосны URL �
-аягийг шивнэ үү","other":"<other>","popupDependent":"Хамаатай (Netscape)","popupFeatures":"Popup цон�
-ны онцлог","popupFullScreen":"Цон�
- дүүргэ�
- (Internet Explorer)","popupLeft":"Зүүн байрлал","popupLocationBar":"Location �
-эсэг","popupMenuBar":"Цэсний самбар","popupResizable":"Resizable","popupScrollBars":"Скрол �
-эсэгүүд","popupStatusBar":"Статус �
-эсэг","popupToolbar":"Багажны самбар","popupTop":"Дээд байрлал","rel":"Relationship","selectAnchor":"Нэг зангууг сонгоно уу","styles":"Загвар","tabIndex":"Tab индекс","target":"Байрлал","targetFrame":"<Агуула�
- �
-үрээ>","targetFrameName":"Очи�
- фремын нэр","targetPopup":"<popup цон�
->","targetPopupName":"Popup цон�
-ны нэр","title":"Холбоос","toAnchor":"Энэ бичвэр дэ�
- зангуу руу очи�
- �
-олбоос","toEmail":"Э-за�
-иа","toUrl":"ца�
-им �
-уудасны �
-аяг (URL)","toolbar":"Холбоос","type":"Линкийн төрөл","unlink":"Холбоос авч �
-ая�
-","upload":"Хуула�
-"},"list":{"bulletedlist":"Цэгтэй жагсаалт","numberedlist":"Дугаарлагдсан жагсаалт"},"maximize":{"maximize":"Дэлгэц дүүргэ�
-","minimize":"Цон�
-ыг багсгаж �
-аруула�
-"},"table":{"border":"Хүрээний �
-эмжээ","caption":"Тайлбар","cell":{"menu":"Нү�
-/зай","insertBefore":"Нү�
-/зай өмнө нь оруула�
-","insertAfter":"Нү�
-/зай дараа нь оруула�
-","deleteCell":"Нү�
- устга�
-","merge":"Нү�
- нэгтэ�
-","mergeRight":"Баруун тийш нэгтгэ�
-","mergeDown":"Доош нэгтгэ�
-","splitHorizontal":"Нү�
-/зайг босоогоор нь тусгаарла�
-","splitVertical":"Нү�
-/зайг �
-өндлөнгөөр нь тусгаарла�
-","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Хэвтээд тэгшлэ�
- арга","vAlign":"Босоод тэгшлэ�
- арга","alignBaseline":"Baseline","bgColor":"Дэвсгэр өнгө","borderColor":"Хүрээний өнгө","data":"Data","header":"Header","yes":"Тийм","no":"Үгүй","invalidWidth":"Нүдний өргөн нь тоо бай�
- ёстой.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сонго�
-"},"cellPad":"Нү�
- доторло�
-(padding)","cellSpace":"Нү�
- �
-оорондын зай (spacing)","column":{"menu":"Багана","insertBefore":"Багана өмнө нь оруула�
-","insertAfter":"Багана дараа нь оруула�
-","deleteColumn":"Багана устга�
-"},"columns":"Багана","deleteTable":"Хүснэгт устга�
-","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Хүснэгтийн өргөн нь тоо бай�
- ёстой.","menu":"Хүснэгт","row":{"menu":"Мөр","insertBefore":"Мөр өмнө нь оруула�
-","insertAfter":"Мөр дараа нь оруула�
-","deleteRow":"Мөр устга�
-"},"rows":"Мөр","summary":"Тайлбар","title":"Хүснэгт","toolbar":"Хүснэгт","widthPc":"�
-увь","widthPx":"цэг","widthUnit":"өргөний нэгж"},"quicktable":{"more":"Нэмэлт..."},"removeformat":{"toolbar":"Параргафын загварыг авч �
-ая�
-"},"sourcearea":{"toolbar":"Код"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Холбоосууд","insert":"Оруула�
-","styles":"Загварууд","colors":"Онгөнүүд","tools":"Хэрэгслүүд"},"toolbars":"Болосруулагчийн �
-эрэгслийн самбар"},"undo":{"redo":"Өмнө�
- үйлдлээ сэргээ�
-","undo":"Хүчингүй болго�
-"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ms.js b/plugins/ckeditor/src/lang/ms.js
deleted file mode 100644
index 9a08a8fca..000000000
--- a/plugins/ckeditor/src/lang/ms.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ms']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Browse Server","url":"URL","protocol":"Protokol","upload":"Muat Naik","uploadSubmit":"Hantar ke Server","image":"Gambar","flash":"Flash","form":"Borang","checkbox":"Checkbox","radio":"Butang Radio","textField":"Text Field","textarea":"Textarea","hiddenField":"Field Tersembunyi","button":"Butang","select":"Field Pilihan","imageButton":"Butang Bergambar","notSet":"<tidak di set>","id":"Id","name":"Nama","langDir":"Arah Tulisan","langDirLtr":"Kiri ke Kanan (LTR)","langDirRtl":"Kanan ke Kiri (RTL)","langCode":"Kod Bahasa","longDescr":"Butiran Panjang URL","cssClass":"Kelas-kelas Stylesheet","advisoryTitle":"Tajuk Makluman","cssStyle":"Stail","ok":"OK","cancel":"Batal","close":"Tutup","preview":"Prebiu","resize":"Resize","generalTab":"Umum","advancedTab":"Advanced","validateNumberFailed":"This value is not a number.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Options","target":"Sasaran","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","styles":"Stail","cssClasses":"Kelas-kelas Stylesheet","width":"Lebar","height":"Tinggi","align":"Jajaran","alignLeft":"Kiri","alignRight":"Kanan","alignCenter":"Tengah","alignJustify":"Jajaran Blok","alignTop":"Atas","alignMiddle":"Pertengahan","alignBottom":"Bawah","alignNone":"None","invalidValue":"Nilai tidak sah.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Salin","copyError":"Keselamatan perisian browser anda tidak membenarkan operasi salinan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+C).","cut":"Potong","cutError":"Keselamatan perisian browser anda tidak membenarkan operasi suntingan text/imej. Sila gunakan papan kekunci (Ctrl/Cmd+X).","paste":"Tampal","pasteArea":"Paste Area","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Tampal"},"base64image":{"alt":"Text Alternatif","lockRatio":"Tetapkan Nisbah","vSpace":"Ruang Menegak","hSpace":"Ruang Melintang","border":"Border"},"basicstyles":{"bold":"Bold","italic":"Italic","strike":"Strike Through","subscript":"Subscript","superscript":"Superscript","underline":"Underline"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Warna Latarbelakang","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Warna lain-lain...","panelTitle":"Colors","textColorTitle":"Warna Text"},"font":{"fontSize":{"label":"Saiz","voiceLabel":"Font Size","panelTitle":"Saiz"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"image":{"alt":"Text Alternatif","border":"Border","btnUpload":"Hantar ke Server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Ruang Melintang","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info Imej","linkTab":"Sambungan","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","resetSize":"Saiz Set Semula","title":"Ciri-ciri Imej","titleButton":"Ciri-ciri Butang Bergambar","upload":"Muat Naik","urlMissing":"Image source URL is missing.","vSpace":"Ruang Menegak","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Text Alternatif","btnUpload":"Hantar ke Server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info Imej","lockRatio":"Tetapkan Nisbah","menu":"Ciri-ciri Imej","pathName":"image","pathNameCaption":"caption","resetSize":"Saiz Set Semula","resizer":"Click and drag to resize","title":"Ciri-ciri Imej","uploadTab":"Muat Naik","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Tambahkan Inden","outdent":"Kurangkan Inden"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Kunci Akses","advanced":"Advanced","advisoryContentType":"Jenis Kandungan Makluman","advisoryTitle":"Tajuk Makluman","anchor":{"toolbar":"Masukkan/Sunting Pautan","menu":"Ciri-ciri Pautan","title":"Ciri-ciri Pautan","name":"Nama Pautan","errorName":"Sila taip nama pautan","remove":"Remove Anchor"},"anchorId":"dengan menggunakan ID elemen","anchorName":"dengan menggunakan nama pautan","charset":"Linked Resource Charset","cssClasses":"Kelas-kelas Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Alamat E-Mail","emailBody":"Isi Kandungan Mesej","emailSubject":"Subjek Mesej","id":"Id","info":"Butiran Sambungan","langCode":"Arah Tulisan","langDir":"Arah Tulisan","langDirLTR":"Kiri ke Kanan (LTR)","langDirRTL":"Kanan ke Kiri (RTL)","menu":"Sunting Sambungan","name":"Nama","noAnchors":"(Tiada pautan terdapat dalam dokumen ini)","noEmail":"Sila taip alamat e-mail","noUrl":"Sila taip sambungan URL","other":"<lain>","popupDependent":"Bergantungan (Netscape)","popupFeatures":"Ciri Tetingkap Popup","popupFullScreen":"Skrin Penuh (IE)","popupLeft":"Posisi Kiri","popupLocationBar":"Bar Lokasi","popupMenuBar":"Bar Menu","popupResizable":"Resizable","popupScrollBars":"Bar-bar skrol","popupStatusBar":"Bar Status","popupToolbar":"Toolbar","popupTop":"Posisi Atas","rel":"Relationship","selectAnchor":"Sila pilih pautan","styles":"Stail","tabIndex":"Indeks Tab ","target":"Sasaran","targetFrame":"<bingkai>","targetFrameName":"Nama Bingkai Sasaran","targetPopup":"<tetingkap popup>","targetPopupName":"Nama Tetingkap Popup","title":"Sambungan","toAnchor":"Pautan dalam muka surat ini","toEmail":"E-Mail","toUrl":"URL","toolbar":"Masukkan/Sunting Sambungan","type":"Jenis Sambungan","unlink":"Buang Sambungan","upload":"Muat Naik"},"list":{"bulletedlist":"Senarai tidak bernombor","numberedlist":"Senarai bernombor"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Saiz Border","caption":"Keterangan","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Buangkan Sel-sel","merge":"Cantumkan Sel-sel","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Tambahan Ruang Sel","cellSpace":"Ruangan Antara Sel","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Buangkan Lajur"},"columns":"Jaluran","deleteTable":"Delete Table","headers":"Headers","headersBoth":"Both","headersColumn":"First column","headersNone":"None","headersRow":"First Row","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Ciri-ciri Jadual","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Buangkan Baris"},"rows":"Barisan","summary":"Summary","title":"Ciri-ciri Jadual","toolbar":"Jadual","widthPc":"peratus","widthPx":"piksel-piksel","widthUnit":"width unit"},"quicktable":{"more":"Lebih..."},"removeformat":{"toolbar":"Buang Format"},"sourcearea":{"toolbar":"Sumber"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editor toolbars"},"undo":{"redo":"Ulangkan","undo":"Batalkan"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/nb.js b/plugins/ckeditor/src/lang/nb.js
deleted file mode 100644
index 4fa7ffcbf..000000000
--- a/plugins/ckeditor/src/lang/nb.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['nb']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla gjennom tjener","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (LTR)","langDirRtl":"Høyre til venstre (RTL)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil gå tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Du har endret noen alternativer. Er du sikker på at du vil lukke dialogvinduet?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vinduet (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Mellomrom","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Tastatursnarvei"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk tastatursnarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<strong>Ctrl/Cmd+V</strong>) og trykk <strong>OK</strong>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"base64image":{"alt":"Alternativ tekst","lockRatio":"Lås forhold","vSpace":"VMarg","hSpace":"HMarg","border":"Ramme"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblå","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svak asurblå","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Skriftstørrelse","panelTitle":"Skriftstørrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Bildetekst","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler.","altMissing":"Alternativ tekst mangler."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Anker","menu":"Rediger anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Tving nedlasting","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (LTR)","langDirRTL":"Høyre til venstre (RTL)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til / fjern punktliste","numberedlist":"Legg til / fjern nummerert liste"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"quicktable":{"more":"Flere..."},"removeformat":{"toolbar":"Fjern formatering"},"sourcearea":{"toolbar":"Kilde"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"undo":{"redo":"Gjør om","undo":"Angre"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt farge","title":"Velg farge"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/nl.js b/plugins/ckeditor/src/lang/nl.js
deleted file mode 100644
index 5b4e53da2..000000000
--- a/plugins/ckeditor/src/lang/nl.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['nl']={"editor":"Tekstverwerker","editorPanel":"Tekstverwerker beheerpaneel","common":{"editorHelp":"Druk ALT 0 voor hulp","browseServer":"Bladeren op server","url":"URL","protocol":"Protocol","upload":"Upload","uploadSubmit":"Naar server verzenden","image":"Afbeelding","flash":"Flash","form":"Formulier","checkbox":"Selectievinkje","radio":"Keuzerondje","textField":"Tekstveld","textarea":"Tekstvak","hiddenField":"Verborgen veld","button":"Knop","select":"Selectieveld","imageButton":"Afbeeldingsknop","notSet":"<niet ingevuld>","id":"Id","name":"Naam","langDir":"Schrijfrichting","langDirLtr":"Links naar rechts (LTR)","langDirRtl":"Rechts naar links (RTL)","langCode":"Taalcode","longDescr":"Lange URL-omschrijving","cssClass":"Stylesheet-klassen","advisoryTitle":"Adviserende titel","cssStyle":"Stijl","ok":"OK","cancel":"Annuleren","close":"Sluiten","preview":"Voorbeeld","resize":"Sleep om te herschalen","generalTab":"Algemeen","advancedTab":"Geavanceerd","validateNumberFailed":"Deze waarde is geen geldig getal.","confirmNewPage":"Alle aangebrachte wijzigingen gaan verloren. Weet u zeker dat u een nieuwe pagina wilt openen?","confirmCancel":"Enkele opties zijn gewijzigd. Weet u zeker dat u dit dialoogvenster wilt sluiten?","options":"Opties","target":"Doelvenster","targetNew":"Nieuw venster (_blank)","targetTop":"Hele venster (_top)","targetSelf":"Zelfde venster (_self)","targetParent":"Origineel venster (_parent)","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","styles":"Stijl","cssClasses":"Stylesheet-klassen","width":"Breedte","height":"Hoogte","align":"Uitlijning","alignLeft":"Links","alignRight":"Rechts","alignCenter":"Centreren","alignJustify":"Uitvullen","alignTop":"Boven","alignMiddle":"Midden","alignBottom":"Onder","alignNone":"Geen","invalidValue":"Ongeldige waarde.","invalidHeight":"De hoogte moet een getal zijn.","invalidWidth":"De breedte moet een getal zijn.","invalidCssLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige CSS meeteenheid (px, %, in, cm, mm, em, ex, pt of pc).","invalidHtmlLength":"Waarde in veld \"%1\" moet een positief nummer zijn, met of zonder een geldige HTML meeteenheid (px of %).","invalidInlineStyle":"Waarde voor de online stijl moet bestaan uit een of meerdere tupels met het formaat \"naam : waarde\", gescheiden door puntkomma's.","cssLengthTooltip":"Geef een nummer in voor een waarde in pixels of geef een nummer in met een geldige CSS eenheid (px, %, in, cm, mm, em, ex, pt, of pc).","unavailable":"%1<span class=\"cke_accessibility\">, niet beschikbaar</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Spatie","35":"End","36":"Home","46":"Verwijderen","224":"Command"},"keyboardShortcut":"Sneltoets"},"about":{"copy":"Copyright &copy; $1. Alle rechten voorbehouden.","dlgTitle":"Over CKEditor","help":"Bekijk de $1 voor hulp.","moreInfo":"Bezoek onze website voor licentieinformatie:","title":"Over CKEditor","userGuide":"CKEditor gebruiksaanwijzing"},"clipboard":{"copy":"Kopiëren","copyError":"De beveiligingsinstelling van de browser verhinderen het automatisch kopiëren. Gebruik de sneltoets Ctrl/Cmd+C van het toetsenbord.","cut":"Knippen","cutError":"De beveiligingsinstelling van de browser verhinderen het automatisch knippen. Gebruik de sneltoets Ctrl/Cmd+X van het toetsenbord.","paste":"Plakken","pasteArea":"Plakgebied","pasteMsg":"Plak de tekst in het volgende vak gebruikmakend van uw toetsenbord (<strong>Ctrl/Cmd+V</strong>) en klik op OK.","securityMsg":"Door de beveiligingsinstellingen van uw browser is het niet mogelijk om direct vanuit het klembord in de editor te plakken. Middels opnieuw plakken in dit venster kunt u de tekst alsnog plakken in de editor.","title":"Plakken"},"base64image":{"alt":"Alternatieve tekst","lockRatio":"Afmetingen vergrendelen","vSpace":"VSpace","hSpace":"HSpace","border":"Rand"},"basicstyles":{"bold":"Vet","italic":"Cursief","strike":"Doorhalen","subscript":"Subscript","superscript":"Superscript","underline":"Onderstrepen"},"bidi":{"ltr":"Schrijfrichting van links naar rechts","rtl":"Schrijfrichting van rechts naar links"},"blockquote":{"toolbar":"Citaatblok"},"button":{"selectedLabel":"%1 (Geselecteerd)"},"colorbutton":{"auto":"Automatisch","bgColorTitle":"Achtergrondkleur","colors":{"000":"Zwart","800000":"Kastanjebruin","8B4513":"Chocoladebruin","2F4F4F":"Donkerleigrijs","008080":"Blauwgroen","000080":"Marine","4B0082":"Indigo","696969":"Donkergrijs","B22222":"Baksteen","A52A2A":"Bruin","DAA520":"Donkergeel","006400":"Donkergroen","40E0D0":"Turquoise","0000CD":"Middenblauw","800080":"Paars","808080":"Grijs","F00":"Rood","FF8C00":"Donkeroranje","FFD700":"Goud","008000":"Groen","0FF":"Cyaan","00F":"Blauw","EE82EE":"Violet","A9A9A9":"Donkergrijs","FFA07A":"Lichtzalm","FFA500":"Oranje","FFFF00":"Geel","00FF00":"Felgroen","AFEEEE":"Lichtturquoise","ADD8E6":"Lichtblauw","DDA0DD":"Pruim","D3D3D3":"Lichtgrijs","FFF0F5":"Linnen","FAEBD7":"Ivoor","FFFFE0":"Lichtgeel","F0FFF0":"Honingdauw","F0FFFF":"Azuur","F0F8FF":"Licht hemelsblauw","E6E6FA":"Lavendel","FFF":"Wit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Meer kleuren...","panelTitle":"Kleuren","textColorTitle":"Tekstkleur"},"font":{"fontSize":{"label":"Lettergrootte","voiceLabel":"Lettergrootte","panelTitle":"Lettergrootte"},"label":"Lettertype","panelTitle":"Lettertype","voiceLabel":"Lettertype"},"image":{"alt":"Alternatieve tekst","border":"Rand","btnUpload":"Naar server verzenden","button2Img":"Wilt u de geselecteerde afbeeldingsknop vervangen door een eenvoudige afbeelding?","hSpace":"HSpace","img2Button":"Wilt u de geselecteerde afbeelding vervangen door een afbeeldingsknop?","infoTab":"Informatie afbeelding","linkTab":"Link","lockRatio":"Afmetingen vergrendelen","menu":"Eigenschappen afbeelding","resetSize":"Afmetingen resetten","title":"Eigenschappen afbeelding","titleButton":"Eigenschappen afbeeldingsknop","upload":"Upload","urlMissing":"De URL naar de afbeelding ontbreekt.","vSpace":"VSpace","validateBorder":"Rand moet een heel nummer zijn.","validateHSpace":"HSpace moet een heel nummer zijn.","validateVSpace":"VSpace moet een heel nummer zijn."},"widget":{"move":"Klik en sleep om te verplaatsen","label":"%1 widget"},"image2":{"alt":"Alternatieve tekst","btnUpload":"Naar server verzenden","captioned":"Afbeelding met onderschrift","captionPlaceholder":"Onderschrift","infoTab":"Afbeeldingsinformatie","lockRatio":"Verhouding vergrendelen","menu":"Eigenschappen afbeelding","pathName":"afbeelding","pathNameCaption":"onderschrift","resetSize":"Afmetingen herstellen","resizer":"Klik en sleep om te herschalen","title":"Afbeeldingseigenschappen","uploadTab":"Uploaden","urlMissing":"De URL naar de afbeelding ontbreekt.","altMissing":"Alternatieve tekst ontbreekt."},"indent":{"indent":"Inspringing vergroten","outdent":"Inspringing verkleinen"},"fakeobjects":{"anchor":"Interne link","flash":"Flash animatie","hiddenfield":"Verborgen veld","iframe":"IFrame","unknown":"Onbekend object"},"link":{"acccessKey":"Toegangstoets","advanced":"Geavanceerd","advisoryContentType":"Aanbevolen content-type","advisoryTitle":"Adviserende titel","anchor":{"toolbar":"Interne link","menu":"Eigenschappen interne link","title":"Eigenschappen interne link","name":"Naam interne link","errorName":"Geef de naam van de interne link op","remove":"Interne link verwijderen"},"anchorId":"Op kenmerk interne link","anchorName":"Op naam interne link","charset":"Karakterset van gelinkte bron","cssClasses":"Stylesheet-klassen","download":"Download forceren","displayText":"Weergavetekst","emailAddress":"E-mailadres","emailBody":"Inhoud bericht","emailSubject":"Onderwerp bericht","id":"Id","info":"Linkomschrijving","langCode":"Taalcode","langDir":"Schrijfrichting","langDirLTR":"Links naar rechts (LTR)","langDirRTL":"Rechts naar links (RTL)","menu":"Link wijzigen","name":"Naam","noAnchors":"(Geen interne links in document gevonden)","noEmail":"Geef een e-mailadres","noUrl":"Geef de link van de URL","other":"<ander>","popupDependent":"Afhankelijk (Netscape)","popupFeatures":"Instellingen popupvenster","popupFullScreen":"Volledig scherm (IE)","popupLeft":"Positie links","popupLocationBar":"Locatiemenu","popupMenuBar":"Menubalk","popupResizable":"Herschaalbaar","popupScrollBars":"Schuifbalken","popupStatusBar":"Statusbalk","popupToolbar":"Werkbalk","popupTop":"Positie boven","rel":"Relatie","selectAnchor":"Kies een interne link","styles":"Stijl","tabIndex":"Tabvolgorde","target":"Doelvenster","targetFrame":"<frame>","targetFrameName":"Naam doelframe","targetPopup":"<popupvenster>","targetPopupName":"Naam popupvenster","title":"Link","toAnchor":"Interne link in pagina","toEmail":"E-mail","toUrl":"URL","toolbar":"Link invoegen/wijzigen","type":"Linktype","unlink":"Link verwijderen","upload":"Upload"},"list":{"bulletedlist":"Opsomming invoegen","numberedlist":"Genummerde lijst invoegen"},"maximize":{"maximize":"Maximaliseren","minimize":"Minimaliseren"},"table":{"border":"Randdikte","caption":"Titel","cell":{"menu":"Cel","insertBefore":"Voeg cel in voor","insertAfter":"Voeg cel in na","deleteCell":"Cellen verwijderen","merge":"Cellen samenvoegen","mergeRight":"Voeg samen naar rechts","mergeDown":"Voeg samen naar beneden","splitHorizontal":"Splits cel horizontaal","splitVertical":"Splits cel vertikaal","title":"Celeigenschappen","cellType":"Celtype","rowSpan":"Rijen samenvoegen","colSpan":"Kolommen samenvoegen","wordWrap":"Automatische terugloop","hAlign":"Horizontale uitlijning","vAlign":"Verticale uitlijning","alignBaseline":"Tekstregel","bgColor":"Achtergrondkleur","borderColor":"Randkleur","data":"Gegevens","header":"Kop","yes":"Ja","no":"Nee","invalidWidth":"De celbreedte moet een getal zijn.","invalidHeight":"De celhoogte moet een getal zijn.","invalidRowSpan":"Rijen samenvoegen moet een heel getal zijn.","invalidColSpan":"Kolommen samenvoegen moet een heel getal zijn.","chooseColor":"Kies"},"cellPad":"Celopvulling","cellSpace":"Celafstand","column":{"menu":"Kolom","insertBefore":"Voeg kolom in voor","insertAfter":"Voeg kolom in na","deleteColumn":"Kolommen verwijderen"},"columns":"Kolommen","deleteTable":"Tabel verwijderen","headers":"Koppen","headersBoth":"Beide","headersColumn":"Eerste kolom","headersNone":"Geen","headersRow":"Eerste rij","invalidBorder":"De randdikte moet een getal zijn.","invalidCellPadding":"Celopvulling moet een getal zijn.","invalidCellSpacing":"Celafstand moet een getal zijn.","invalidCols":"Het aantal kolommen moet een getal zijn groter dan 0.","invalidHeight":"De tabelhoogte moet een getal zijn.","invalidRows":"Het aantal rijen moet een getal zijn groter dan 0.","invalidWidth":"De tabelbreedte moet een getal zijn.","menu":"Tabeleigenschappen","row":{"menu":"Rij","insertBefore":"Voeg rij in voor","insertAfter":"Voeg rij in na","deleteRow":"Rijen verwijderen"},"rows":"Rijen","summary":"Samenvatting","title":"Tabeleigenschappen","toolbar":"Tabel","widthPc":"procent","widthPx":"pixels","widthUnit":"eenheid breedte"},"quicktable":{"more":"Meer..."},"removeformat":{"toolbar":"Opmaak verwijderen"},"sourcearea":{"toolbar":"Broncode"},"toolbar":{"toolbarCollapse":"Werkbalk inklappen","toolbarExpand":"Werkbalk uitklappen","toolbarGroups":{"document":"Document","clipboard":"Klembord/Ongedaan maken","editing":"Bewerken","forms":"Formulieren","basicstyles":"Basisstijlen","paragraph":"Paragraaf","links":"Links","insert":"Invoegen","styles":"Stijlen","colors":"Kleuren","tools":"Toepassingen"},"toolbars":"Werkbalken"},"undo":{"redo":"Opnieuw uitvoeren","undo":"Ongedaan maken"},"colordialog":{"clear":"Wissen","highlight":"Actief","options":"Kleuropties","selected":"Geselecteerde kleur","title":"Selecteer kleur"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/no.js b/plugins/ckeditor/src/lang/no.js
deleted file mode 100644
index 0cabfb1a9..000000000
--- a/plugins/ckeditor/src/lang/no.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['no']={"editor":"Rikteksteditor","editorPanel":"Panel for rikteksteditor","common":{"editorHelp":"Trykk ALT 0 for hjelp","browseServer":"Bla igjennom server","url":"URL","protocol":"Protokoll","upload":"Last opp","uploadSubmit":"Send det til serveren","image":"Bilde","flash":"Flash","form":"Skjema","checkbox":"Avmerkingsboks","radio":"Alternativknapp","textField":"Tekstboks","textarea":"Tekstområde","hiddenField":"Skjult felt","button":"Knapp","select":"Rullegardinliste","imageButton":"Bildeknapp","notSet":"<ikke satt>","id":"Id","name":"Navn","langDir":"Språkretning","langDirLtr":"Venstre til høyre (VTH)","langDirRtl":"Høyre til venstre (HTV)","langCode":"Språkkode","longDescr":"Utvidet beskrivelse","cssClass":"Stilarkklasser","advisoryTitle":"Tittel","cssStyle":"Stil","ok":"OK","cancel":"Avbryt","close":"Lukk","preview":"Forhåndsvis","resize":"Dra for å skalere","generalTab":"Generelt","advancedTab":"Avansert","validateNumberFailed":"Denne verdien er ikke et tall.","confirmNewPage":"Alle ulagrede endringer som er gjort i dette innholdet vil bli tapt. Er du sikker på at du vil laste en ny side?","confirmCancel":"Noen av valgene har blitt endret. Er du sikker på at du vil lukke dialogen?","options":"Valg","target":"Mål","targetNew":"Nytt vindu (_blank)","targetTop":"Hele vindu (_top)","targetSelf":"Samme vindu (_self)","targetParent":"Foreldrevindu (_parent)","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","styles":"Stil","cssClasses":"Stilarkklasser","width":"Bredde","height":"Høyde","align":"Juster","alignLeft":"Venstre","alignRight":"Høyre","alignCenter":"Midtjuster","alignJustify":"Blokkjuster","alignTop":"Topp","alignMiddle":"Midten","alignBottom":"Bunn","alignNone":"Ingen","invalidValue":"Ugyldig verdi.","invalidHeight":"Høyde må være et tall.","invalidWidth":"Bredde må være et tall.","invalidCssLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig CSS-målingsenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Den angitte verdien for feltet \"%1\" må være et positivt tall med eller uten en gyldig HTML-målingsenhet (px eller %).","invalidInlineStyle":"Verdi angitt for inline stil må bestå av en eller flere sett med formatet \"navn : verdi\", separert med semikolon","cssLengthTooltip":"Skriv inn et tall for en piksel-verdi eller et tall med en gyldig CSS-enhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, utilgjenglig</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Alle rettigheter reservert.","dlgTitle":"Om CKEditor","help":"Se $1 for hjelp.","moreInfo":"For lisensieringsinformasjon, vennligst besøk vårt nettsted:","title":"Om CKEditor","userGuide":"CKEditors brukerveiledning"},"clipboard":{"copy":"Kopier","copyError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk kopiering av tekst. Vennligst bruk snarveien (Ctrl/Cmd+C).","cut":"Klipp ut","cutError":"Din nettlesers sikkerhetsinstillinger tillater ikke automatisk utklipping av tekst. Vennligst bruk snarveien (Ctrl/Cmd+X).","paste":"Lim inn","pasteArea":"Innlimingsområde","pasteMsg":"Vennligst lim inn i følgende boks med tastaturet (<STRONG>Ctrl/Cmd+V</STRONG>) og trykk <STRONG>OK</STRONG>.","securityMsg":"Din nettlesers sikkerhetsinstillinger gir ikke redigeringsverktøyet direkte tilgang til utklippstavlen. Du må derfor lime det inn på nytt i dette vinduet.","title":"Lim inn"},"base64image":{"alt":"Alternativ tekst","lockRatio":"Lås forhold","vSpace":"VMarg","hSpace":"HMarg","border":"Ramme"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Gjennomstreking","subscript":"Senket skrift","superscript":"Hevet skrift","underline":"Understreking"},"bidi":{"ltr":"Tekstretning fra venstre til høyre","rtl":"Tekstretning fra høyre til venstre"},"blockquote":{"toolbar":"Blokksitat"},"button":{"selectedLabel":"%1 (Valgt)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrunnsfarge","colors":{"000":"Svart","800000":"Rødbrun","8B4513":"Salbrun","2F4F4F":"Grønnsvart","008080":"Blågrønn","000080":"Marineblått","4B0082":"Indigo","696969":"Mørk grå","B22222":"Mørkerød","A52A2A":"Brun","DAA520":"Lys brun","006400":"Mørk grønn","40E0D0":"Turkis","0000CD":"Medium blå","800080":"Purpur","808080":"Grå","F00":"Rød","FF8C00":"Mørk oransje","FFD700":"Gull","008000":"Grønn","0FF":"Cyan","00F":"Blå","EE82EE":"Fiolett","A9A9A9":"Svak grå","FFA07A":"Rosa-oransje","FFA500":"Oransje","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Svak turkis","ADD8E6":"Lys Blå","DDA0DD":"Plomme","D3D3D3":"Lys grå","FFF0F5":"Svak lavendelrosa","FAEBD7":"Antikk-hvit","FFFFE0":"Lys gul","F0FFF0":"Honningmelon","F0FFFF":"Svakt asurblått","F0F8FF":"Svak cyan","E6E6FA":"Lavendel","FFF":"Hvit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Flere farger...","panelTitle":"Farger","textColorTitle":"Tekstfarge"},"font":{"fontSize":{"label":"Størrelse","voiceLabel":"Font Størrelse","panelTitle":"Størrelse"},"label":"Skrift","panelTitle":"Skrift","voiceLabel":"Font"},"image":{"alt":"Alternativ tekst","border":"Ramme","btnUpload":"Send det til serveren","button2Img":"Vil du endre den valgte bildeknappen til et vanlig bilde?","hSpace":"HMarg","img2Button":"Vil du endre det valgte bildet til en bildeknapp?","infoTab":"Bildeinformasjon","linkTab":"Lenke","lockRatio":"Lås forhold","menu":"Bildeegenskaper","resetSize":"Tilbakestill størrelse","title":"Bildeegenskaper","titleButton":"Egenskaper for bildeknapp","upload":"Last opp","urlMissing":"Bildets adresse mangler.","vSpace":"VMarg","validateBorder":"Ramme må være et heltall.","validateHSpace":"HMarg må være et heltall.","validateVSpace":"VMarg må være et heltall."},"widget":{"move":"Klikk og dra for å flytte","label":"Widget %1"},"image2":{"alt":"Alternativ tekst","btnUpload":"Send det til serveren","captioned":"Bilde med bildetekst","captionPlaceholder":"Caption","infoTab":"Bildeinformasjon","lockRatio":"Lås forhold","menu":"Bildeegenskaper","pathName":"bilde","pathNameCaption":"bildetekst","resetSize":"Tilbakestill størrelse","resizer":"Klikk og dra for å endre størrelse","title":"Bildeegenskaper","uploadTab":"Last opp","urlMissing":"Bildets adresse mangler.","altMissing":"Alternative text is missing."},"indent":{"indent":"Øk innrykk","outdent":"Reduser innrykk"},"fakeobjects":{"anchor":"Anker","flash":"Flash-animasjon","hiddenfield":"Skjult felt","iframe":"IFrame","unknown":"Ukjent objekt"},"link":{"acccessKey":"Aksessknapp","advanced":"Avansert","advisoryContentType":"Type","advisoryTitle":"Tittel","anchor":{"toolbar":"Sett inn/Rediger anker","menu":"Egenskaper for anker","title":"Egenskaper for anker","name":"Ankernavn","errorName":"Vennligst skriv inn ankernavnet","remove":"Fjern anker"},"anchorId":"Element etter ID","anchorName":"Anker etter navn","charset":"Lenket tegnsett","cssClasses":"Stilarkklasser","download":"Force Download","displayText":"Tekst som skal vises","emailAddress":"E-postadresse","emailBody":"Melding","emailSubject":"Meldingsemne","id":"Id","info":"Lenkeinfo","langCode":"Språkkode","langDir":"Språkretning","langDirLTR":"Venstre til høyre (VTH)","langDirRTL":"Høyre til venstre (HTV)","menu":"Rediger lenke","name":"Navn","noAnchors":"(Ingen anker i dokumentet)","noEmail":"Vennligst skriv inn e-postadressen","noUrl":"Vennligst skriv inn lenkens URL","other":"<annen>","popupDependent":"Avhenging (Netscape)","popupFeatures":"Egenskaper for popup-vindu","popupFullScreen":"Fullskjerm (IE)","popupLeft":"Venstre posisjon","popupLocationBar":"Adresselinje","popupMenuBar":"Menylinje","popupResizable":"Skalerbar","popupScrollBars":"Scrollbar","popupStatusBar":"Statuslinje","popupToolbar":"Verktøylinje","popupTop":"Topp-posisjon","rel":"Relasjon (rel)","selectAnchor":"Velg et anker","styles":"Stil","tabIndex":"Tabindeks","target":"Mål","targetFrame":"<ramme>","targetFrameName":"Målramme","targetPopup":"<popup-vindu>","targetPopupName":"Navn på popup-vindu","title":"Lenke","toAnchor":"Lenke til anker i teksten","toEmail":"E-post","toUrl":"URL","toolbar":"Sett inn/Rediger lenke","type":"Lenketype","unlink":"Fjern lenke","upload":"Last opp"},"list":{"bulletedlist":"Legg til/Fjern punktmerket liste","numberedlist":"Legg til/Fjern nummerert liste"},"maximize":{"maximize":"Maksimer","minimize":"Minimer"},"table":{"border":"Rammestørrelse","caption":"Tittel","cell":{"menu":"Celle","insertBefore":"Sett inn celle før","insertAfter":"Sett inn celle etter","deleteCell":"Slett celler","merge":"Slå sammen celler","mergeRight":"Slå sammen høyre","mergeDown":"Slå sammen ned","splitHorizontal":"Del celle horisontalt","splitVertical":"Del celle vertikalt","title":"Celleegenskaper","cellType":"Celletype","rowSpan":"Radspenn","colSpan":"Kolonnespenn","wordWrap":"Tekstbrytning","hAlign":"Horisontal justering","vAlign":"Vertikal justering","alignBaseline":"Grunnlinje","bgColor":"Bakgrunnsfarge","borderColor":"Rammefarge","data":"Data","header":"Overskrift","yes":"Ja","no":"Nei","invalidWidth":"Cellebredde må være et tall.","invalidHeight":"Cellehøyde må være et tall.","invalidRowSpan":"Radspenn må være et heltall.","invalidColSpan":"Kolonnespenn må være et heltall.","chooseColor":"Velg"},"cellPad":"Cellepolstring","cellSpace":"Cellemarg","column":{"menu":"Kolonne","insertBefore":"Sett inn kolonne før","insertAfter":"Sett inn kolonne etter","deleteColumn":"Slett kolonner"},"columns":"Kolonner","deleteTable":"Slett tabell","headers":"Overskrifter","headersBoth":"Begge","headersColumn":"Første kolonne","headersNone":"Ingen","headersRow":"Første rad","invalidBorder":"Rammestørrelse må være et tall.","invalidCellPadding":"Cellepolstring må være et positivt tall.","invalidCellSpacing":"Cellemarg må være et positivt tall.","invalidCols":"Antall kolonner må være et tall større enn 0.","invalidHeight":"Tabellhøyde må være et tall.","invalidRows":"Antall rader må være et tall større enn 0.","invalidWidth":"Tabellbredde må være et tall.","menu":"Egenskaper for tabell","row":{"menu":"Rader","insertBefore":"Sett inn rad før","insertAfter":"Sett inn rad etter","deleteRow":"Slett rader"},"rows":"Rader","summary":"Sammendrag","title":"Egenskaper for tabell","toolbar":"Tabell","widthPc":"prosent","widthPx":"piksler","widthUnit":"Bredde-enhet"},"quicktable":{"more":"Flere..."},"removeformat":{"toolbar":"Fjern formatering"},"sourcearea":{"toolbar":"Kilde"},"toolbar":{"toolbarCollapse":"Skjul verktøylinje","toolbarExpand":"Vis verktøylinje","toolbarGroups":{"document":"Dokument","clipboard":"Utklippstavle/Angre","editing":"Redigering","forms":"Skjema","basicstyles":"Basisstiler","paragraph":"Avsnitt","links":"Lenker","insert":"Innsetting","styles":"Stiler","colors":"Farger","tools":"Verktøy"},"toolbars":"Verktøylinjer for editor"},"undo":{"redo":"Gjør om","undo":"Angre"},"colordialog":{"clear":"Tøm","highlight":"Merk","options":"Alternativer for farge","selected":"Valgt","title":"Velg farge"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/oc.js b/plugins/ckeditor/src/lang/oc.js
deleted file mode 100644
index d47fef9c5..000000000
--- a/plugins/ckeditor/src/lang/oc.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['oc']={"editor":"Editor de tèxte enriquit","editorPanel":"Tablèu de bòrd de l'editor de tèxte enriquit","common":{"editorHelp":"Utilisatz l'acorchi Alt-0 per obténer d'ajuda","browseServer":"Percórrer lo servidor","url":"URL","protocol":"Protocòl","upload":"Mandar","uploadSubmit":"Mandar sul servidor","image":"Imatge","flash":"Flash","form":"Formulari","checkbox":"Casa de marcar","radio":"Boton ràdio","textField":"Camp  tèxte","textarea":"Zòna de tèxte","hiddenField":"Camp invisible","button":"Boton","select":"Lista desenrotlanta","imageButton":"Boton amb imatge","notSet":"<indefinit>","id":"Id","name":"Nom","langDir":"Sens d'escritura","langDirLtr":"Esquèrra a dreita (LTR)","langDirRtl":"Dreita a esquèrra (RTL)","langCode":"Còdi de lenga","longDescr":"URL de descripcion longa","cssClass":"Classas d'estil","advisoryTitle":"Infobulla","cssStyle":"Estil","ok":"D'acòrdi","cancel":"Anullar","close":"Tampar","preview":"Previsualizar","resize":"Redimensionar","generalTab":"General","advancedTab":"Avançat","validateNumberFailed":"Aquesta valor es pas un nombre.","confirmNewPage":"Los cambiaments pas salvats seràn perduts. Sètz segur que volètz cargar una novèla pagina ?","confirmCancel":"Certanas opcions son estadas modificadas. Sètz segur que volètz tampar ?","options":"Opcions","target":"Cibla","targetNew":"Novèla fenèstra (_blank)","targetTop":"Fenèstra superiora (_top)","targetSelf":"Meteissa fenèstra (_self)","targetParent":"Fenèstra parent (_parent)","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","styles":"Estil","cssClasses":"Classas d'estil","width":"Largor","height":"Nautor","align":"Alinhament","alignLeft":"Esquèrra","alignRight":"Dreita","alignCenter":"Centrar","alignJustify":"Justificar","alignTop":"Naut","alignMiddle":"Mitan","alignBottom":"Bas","alignNone":"Pas cap","invalidValue":"Valor invalida.","invalidHeight":"La nautor deu èsser un nombre.","invalidWidth":"La largor deu èsser un nombre.","invalidCssLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura CSS valid (px, %, in, cm, mm, em, ex, pt, o pc).","invalidHtmlLength":"La valor especificada pel camp « %1 » deu èsser un nombre positiu amb o sens unitat de mesura HTML valid (px o %).","invalidInlineStyle":"La valor especificada per l'estil en linha deu èsser compausada d'un o mantun parelh al format « nom : valor », separats per de punts-virgulas.","cssLengthTooltip":"Entrar un nombre per una valor en pixèls o un nombre amb una unitat de mesura CSS valida (px, %, in, cm, mm, em, ex, pt, o pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponible</span>","keyboard":{"8":"Retorn","13":"Entrada","16":"Majuscula","17":"Ctrl","18":"Alt","32":"Espaci","35":"Fin","36":"Origina","46":"Suprimir","224":"Comanda"},"keyboardShortcut":"Acorchi de clavièr"},"about":{"copy":"Copyright &copy; $1. Totes los dreits reservats.","dlgTitle":"A prepaus de CKEditor","help":"Consultar $1 per obténer d'ajuda.","moreInfo":"Per las informacions de licéncia, visitatz nòstre site web :","title":"A prepaus de CKEditor","userGuide":"Guida de l'utilizaire CKEditor (en anglés)"},"clipboard":{"copy":"Copiar","copyError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Copiar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+C).","cut":"Talhar","cutError":"Los paramètres de seguretat de vòstre navigador autorizan pas l'editor a executar automaticament l'operacion « Talhar ». Utilizatz l'acorchi de clavièr a aqueste efièit (Ctrl/Cmd+X).","paste":"Pegar","pasteArea":"Pegar la zòna","pasteMsg":"Pegatz lo tèxte dins la zòna seguenta en utilizant l'acorchi de clavièr (<strong>Ctrl/Cmd+V</strong>) e clicatz sus D'acòrdi.","securityMsg":"Los paramètres de seguretat de vòstre navigador empach l'editor d'accedir dirèctament a las donadas del quichapapièr. Las vos cal pegar tornamai dins aquesta fenèstra.","title":"Pegar"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Gras","italic":"Italica","strike":"Raiat","subscript":"Indici","superscript":"Exponent","underline":"Solinhat"},"bidi":{"ltr":"Direccion del tèxte d'esquèrra cap a dreita","rtl":"Direccion del tèxte de dreita cap a esquèrra"},"blockquote":{"toolbar":"Citacion"},"button":{"selectedLabel":"%1 (Seleccionat)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Color de rèireplan","colors":{"000":"Negre","800000":"Marron","8B4513":"Brun de sèla","2F4F4F":"Gris escur de lausa","008080":"Guit","000080":"Blau marina","4B0082":"Indigo","696969":"Gris escur","B22222":"Roge teula","A52A2A":"Brun","DAA520":"Aur ternit","006400":"Verd escur","40E0D0":"Turquesa","0000CD":"Blau reial","800080":"Violet","808080":"Gris","F00":"Roge","FF8C00":"Irange escur","FFD700":"Aur","008000":"Verd","0FF":"Cian","00F":"Blau","EE82EE":"Violet","A9A9A9":"Gris tamisat","FFA07A":"Salmon clar","FFA500":"Irange","FFFF00":"Jaune","00FF00":"Lima","AFEEEE":"Turquesa clar","ADD8E6":"Blau clar","DDA0DD":"Pruna","D3D3D3":"Gris clar","FFF0F5":"Fard lavanda","FAEBD7":"Blanc antic","FFFFE0":"Jaune clar","F0FFF0":"Verd rosada","F0FFFF":"Azur","F0F8FF":"Blau Alícia","E6E6FA":"Lavanda","FFF":"Blanc","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mai de colors...","panelTitle":"Colors","textColorTitle":"Color del tèxte"},"font":{"fontSize":{"label":"Talha","voiceLabel":"Talha de poliça","panelTitle":"Talha de poliça"},"label":"Poliça","panelTitle":"Estil de poliça","voiceLabel":"Poliça"},"image":{"alt":"Tèxte alternatiu","border":"Bordadura","btnUpload":"Mandar sul servidor","button2Img":"Volètz transformar lo boton amb imatge seleccionat en imatge simple ?","hSpace":"Espaçament orizontal","img2Button":"Volètz transformar l'imatge seleccionat en boton amb imatge ?","infoTab":"Informacions sus l'imatge","linkTab":"Ligam","lockRatio":"Conservar las proporcions","menu":"Proprietats de l'imatge","resetSize":"Reïnicializar la talha","title":"Proprietats de l'imatge","titleButton":"Proprietats del boton amb imatge","upload":"Mandar","urlMissing":"L'URL font de l'imatge es mancanta.","vSpace":"Espaçament vertical","validateBorder":"La bordadura deu èsser un nombre entièr.","validateHSpace":"L'espaçament orizontal deu èsser un nombre entièr.","validateVSpace":"L'espaçament vertical deu èsser un nombre entièr."},"widget":{"move":"Clicar e lisar per desplaçar","label":"Element %1"},"image2":{"alt":"Tèxte alternatiu","btnUpload":"Mandar sul servidor","captioned":"Imatge amb legenda","captionPlaceholder":"Legenda","infoTab":"Informacions sus l'imatge","lockRatio":"Conservar las proporcions","menu":"Proprietats de l'imatge","pathName":"imatge","pathNameCaption":"legenda","resetSize":"Reïnicializar la talha","resizer":"Clicar e lisar per redimensionar","title":"Proprietats de l'imatge","uploadTab":"Mandar","urlMissing":"L'URL font de l'imatge es mancanta.","altMissing":"Lo tèxte alternatiu es mancant."},"indent":{"indent":"Aumentar l'alinèa","outdent":"Dmesir l'alinèa"},"fakeobjects":{"anchor":"Ancòra","flash":"Animacion Flash","hiddenfield":"Camp invisible","iframe":"Quadre de contengut incorporat","unknown":"Objècte desconegut"},"link":{"acccessKey":"Tòca d'accessibilitat","advanced":"Avançat","advisoryContentType":"Tipe de contengut (indicatiu)","advisoryTitle":"Infobulla","anchor":{"toolbar":"Ancòra","menu":"Modificar l'ancòra","title":"Proprietats de l'ancòra","name":"Nom de l'ancòra","errorName":"Entratz lo nom de l'ancòra","remove":"Suprimir l'ancòra"},"anchorId":"Per ID d'element","anchorName":"Per nom d'ancòra","charset":"Encodatge de la ressorsa ligada","cssClasses":"Classas d'estil","download":"Forçar lo telecargament","displayText":"Afichar lo tèxte","emailAddress":"Adreça electronica","emailBody":"Còs del messatge","emailSubject":"Subjècte del messatge","id":"Id","info":"Informacions sul ligam","langCode":"Còdi de lenga","langDir":"Sens d'escritura","langDirLTR":"Esquèrra a dreita (LTR)","langDirRTL":"Dreita a esquèrra (RTL)","menu":"Modificar lo ligam","name":"Nom","noAnchors":"(Cap d'ancòra pas disponibla dins aqueste document)","noEmail":"Entratz l'adreça electronica","noUrl":"Entratz l'URL del ligam","other":"<autre>","popupDependent":"Dependenta (Netscape)","popupFeatures":"Caracteristicas de la fenèstra sorgissenta","popupFullScreen":"Ecran complet (IE)","popupLeft":"A esquèrra","popupLocationBar":"Barra d'adreça","popupMenuBar":"Barra de menú","popupResizable":"Redimensionable","popupScrollBars":"Barras de desfilament","popupStatusBar":"Barra d'estat","popupToolbar":"Barra d'aisinas","popupTop":"Amont","rel":"Relacion","selectAnchor":"Seleccionar una ancòra","styles":"Estil","tabIndex":"Indici de tabulacion","target":"Cibla","targetFrame":"<quadre>","targetFrameName":"Nom del quadre afectat","targetPopup":"<fenèstra sorgissenta>","targetPopupName":"Nom de la fenèstra sorgissenta","title":"Ligam","toAnchor":"Ancòra","toEmail":"Corrièl","toUrl":"URL","toolbar":"Ligam","type":"Tipe de ligam","unlink":"Suprimir lo ligam","upload":"Mandar"},"list":{"bulletedlist":"Inserir/Suprimir una lista amb de piuses","numberedlist":"Inserir/Suprimir una lista numerotada"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"table":{"border":"Talha de la bordadura","caption":"Títol del tablèu","cell":{"menu":"Cellula","insertBefore":"Inserir una cellula abans","insertAfter":"Inserir una cellula aprèp","deleteCell":"Suprimir las cellulas","merge":"Fusionar las cellulas","mergeRight":"Fusionar cap a dreita","mergeDown":"Fusionar cap aval","splitHorizontal":"Separar la cellula orizontalament","splitVertical":"Separar la cellula verticalament","title":"Proprietats de la cellula","cellType":"Tipe de cellula","rowSpan":"Linhas ocupadas","colSpan":"Colomnas ocupadas","wordWrap":"Cesura","hAlign":"Alinhament orizontal","vAlign":"Alinhament vertical","alignBaseline":"Linha de basa","bgColor":"Color de rèireplan","borderColor":"Color de bordadura","data":"Donadas","header":"Entèsta","yes":"Òc","no":"Non","invalidWidth":"La largor de la cellula deu èsser un nombre.","invalidHeight":"La nautor de la cellula deu èsser un nombre.","invalidRowSpan":"Lo nombre de linhas ocupadas deu èsser un nombre entièr.","invalidColSpan":"Lo nombre de colomnas ocupadas deu èsser un nombre entièr.","chooseColor":"Causir"},"cellPad":"Marge intèrne de las cellulas","cellSpace":"Espaçament entre las cellulas","column":{"menu":"Colomna","insertBefore":"Inserir una colomna abans","insertAfter":"Inserir una colomna aprèp","deleteColumn":"Suprimir las colomnas"},"columns":"Colomnas","deleteTable":"Suprimir lo tablèu","headers":"Entèstas","headersBoth":"Los dos","headersColumn":"Primièra colomna","headersNone":"Pas cap","headersRow":"Primièra linha","invalidBorder":"La talha de la bordadura deu èsser un nombre.","invalidCellPadding":"Lo marge intèrne de las cellulas deu èsser un nombre positiu.","invalidCellSpacing":"L'espaçament entre las cellulas deu èsser un nombre positiu.","invalidCols":"Lo nombre de colomnas deu èsser superior a 0.","invalidHeight":"La nautor del tablèu deu èsser un nombre.","invalidRows":"Lo nombre de linhas deu èsser superior a 0.","invalidWidth":"La largor del tablèu deu èsser un nombre.","menu":"Proprietats del tablèu","row":{"menu":"Linha","insertBefore":"Inserir una linha abans","insertAfter":"Inserir una linha aprèp","deleteRow":"Suprimir las linhas"},"rows":"Linhas","summary":"Resumit (descripcion)","title":"Proprietats del tablèu","toolbar":"Tablèu","widthPc":"per cent","widthPx":"pixèls","widthUnit":"unitat de largor"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"Suprimir la mesa en forma"},"sourcearea":{"toolbar":"Font"},"toolbar":{"toolbarCollapse":"Enrotlar la barra d'aisinas","toolbarExpand":"Desenrotlar la barra d'aisinas","toolbarGroups":{"document":"Document","clipboard":"Quichapapièr/Desfar","editing":"Edicion","forms":"Formularis","basicstyles":"Estils de basa","paragraph":"Paragraf","links":"Ligams","insert":"Inserir","styles":"Estils","colors":"Colors","tools":"Aisinas"},"toolbars":"Barras d'aisinas de l'editor"},"undo":{"redo":"Refar","undo":"Restablir"},"colordialog":{"clear":"Escafar","highlight":"Puntada","options":"Opcions de color","selected":"Color seleccionada","title":"Seleccionar una color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/pl.js b/plugins/ckeditor/src/lang/pl.js
deleted file mode 100644
index dd8d65373..000000000
--- a/plugins/ckeditor/src/lang/pl.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['pl']={"editor":"Edytor tekstu sformatowanego","editorPanel":"Panel edytora tekstu sformatowanego","common":{"editorHelp":"W celu uzyskania pomocy naciśnij ALT 0","browseServer":"Przegl�
-daj","url":"Adres URL","protocol":"Protokół","upload":"Wyślij","uploadSubmit":"Wyślij","image":"Obrazek","flash":"Flash","form":"Formularz","checkbox":"Pole wyboru (checkbox)","radio":"Przycisk opcji (radio)","textField":"Pole tekstowe","textarea":"Obszar tekstowy","hiddenField":"Pole ukryte","button":"Przycisk","select":"Lista wyboru","imageButton":"Przycisk graficzny","notSet":"<nie ustawiono>","id":"Id","name":"Nazwa","langDir":"Kierunek tekstu","langDirLtr":"Od lewej do prawej (LTR)","langDirRtl":"Od prawej do lewej (RTL)","langCode":"Kod języka","longDescr":"Adres URL długiego opisu","cssClass":"Nazwa klasy CSS","advisoryTitle":"Opis obiektu docelowego","cssStyle":"Styl","ok":"OK","cancel":"Anuluj","close":"Zamknij","preview":"Podgl�
-d","resize":"Przeci�
-gnij, aby zmienić rozmiar","generalTab":"Ogólne","advancedTab":"Zaawansowane","validateNumberFailed":"Ta wartość nie jest liczb�
-.","confirmNewPage":"Wszystkie niezapisane zmiany zostan�
- utracone. Czy na pewno wczytać now�
- stronę?","confirmCancel":"Pewne opcje zostały zmienione. Czy na pewno zamkn�
-ć okno dialogowe?","options":"Opcje","target":"Obiekt docelowy","targetNew":"Nowe okno (_blank)","targetTop":"Okno najwyżej w hierarchii (_top)","targetSelf":"To samo okno (_self)","targetParent":"Okno nadrzędne (_parent)","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","styles":"Style","cssClasses":"Klasy arkusza stylów","width":"Szerokość","height":"Wysokość","align":"Wyrównaj","alignLeft":"Do lewej","alignRight":"Do prawej","alignCenter":"Do środka","alignJustify":"Wyjustuj","alignTop":"Do góry","alignMiddle":"Do środka","alignBottom":"Do dołu","alignNone":"Brak","invalidValue":"Nieprawidłowa wartość.","invalidHeight":"Wysokość musi być liczb�
-.","invalidWidth":"Szerokość musi być liczb�
-.","invalidCssLength":"Wartość podana dla pola \"%1\" musi być liczb�
- dodatni�
- bez jednostki lub z poprawn�
- jednostk�
- długości zgodn�
- z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","invalidHtmlLength":"Wartość podana dla pola \"%1\" musi być liczb�
- dodatni�
- bez jednostki lub z poprawn�
- jednostk�
- długości zgodn�
- z HTML (px lub %).","invalidInlineStyle":"Wartość podana dla stylu musi składać się z jednej lub większej liczby krotek w formacie \"nazwa : wartość\", rozdzielonych średnikami.","cssLengthTooltip":"Wpisz liczbę dla wartości w pikselach lub liczbę wraz z jednostk�
- długości zgodn�
- z CSS (px, %, in, cm, mm, em, ex, pt lub pc).","unavailable":"%1<span class=\"cke_accessibility\">, niedostępne</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"spacja","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Skrót klawiszowy"},"about":{"copy":"Copyright &copy; $1. Wszelkie prawa zastrzeżone.","dlgTitle":"Informacje o programie CKEditor","help":"Pomoc znajdziesz w $1.","moreInfo":"Informacje na temat licencji można znaleźć na naszej stronie:","title":"Informacje o programie CKEditor","userGuide":"podręczniku użytkownika programu CKEditor"},"clipboard":{"copy":"Kopiuj","copyError":"Ustawienia bezpieczeństwa Twojej przegl�
-darki nie pozwalaj�
- na automatyczne kopiowanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+C.","cut":"Wytnij","cutError":"Ustawienia bezpieczeństwa Twojej przegl�
-darki nie pozwalaj�
- na automatyczne wycinanie tekstu. Użyj skrótu klawiszowego Ctrl/Cmd+X.","paste":"Wklej","pasteArea":"Obszar wklejania","pasteMsg":"Wklej tekst w poniższym polu, używaj�
-c skrótu klawiaturowego (<STRONG>Ctrl/Cmd+V</STRONG>), i kliknij <STRONG>OK</STRONG>.","securityMsg":"Zabezpieczenia przegl�
-darki uniemożliwiaj�
- wklejenie danych bezpośrednio do edytora. Proszę ponownie wkleić dane w tym oknie.","title":"Wklej"},"base64image":{"alt":"Tekst zastępczy","lockRatio":"Zablokuj proporcje","vSpace":"Odstęp pionowy","hSpace":"Odstęp poziomy","border":"Obramowanie"},"basicstyles":{"bold":"Pogrubienie","italic":"Kursywa","strike":"Przekreślenie","subscript":"Indeks dolny","superscript":"Indeks górny","underline":"Podkreślenie"},"bidi":{"ltr":"Kierunek tekstu od lewej strony do prawej","rtl":"Kierunek tekstu od prawej strony do lewej"},"blockquote":{"toolbar":"Cytat"},"button":{"selectedLabel":"%1 (Wybrany)"},"colorbutton":{"auto":"Automatycznie","bgColorTitle":"Kolor tła","colors":{"000":"Czarny","800000":"Kasztanowy","8B4513":"Czekoladowy","2F4F4F":"Ciemnografitowy","008080":"Morski","000080":"Granatowy","4B0082":"Indygo","696969":"Ciemnoszary","B22222":"Czerwień żelazowa","A52A2A":"Br�
-zowy","DAA520":"Ciemnozłoty","006400":"Ciemnozielony","40E0D0":"Turkusowy","0000CD":"Ciemnoniebieski","800080":"Purpurowy","808080":"Szary","F00":"Czerwony","FF8C00":"Ciemnopomarańczowy","FFD700":"Złoty","008000":"Zielony","0FF":"Cyjan","00F":"Niebieski","EE82EE":"Fioletowy","A9A9A9":"Przygaszony szary","FFA07A":"Łososiowy","FFA500":"Pomarańczowy","FFFF00":"Żółty","00FF00":"Limonkowy","AFEEEE":"Bladoturkusowy","ADD8E6":"Jasnoniebieski","DDA0DD":"Śliwkowy","D3D3D3":"Jasnoszary","FFF0F5":"Jasnolawendowy","FAEBD7":"Kremowobiały","FFFFE0":"Jasnożółty","F0FFF0":"Bladozielony","F0FFFF":"Jasnolazurowy","F0F8FF":"Jasnobłękitny","E6E6FA":"Lawendowy","FFF":"Biały","1ABC9C":"Cyjan","2ECC71":"Szmaragdowy","3498DB":"Jasnoniebieski","9B59B6":"Ametystowy","4E5F70":"Szaroniebieski","F1C40F":"Żółty","16A085":"Ciemny cyjan","27AE60":"Ciemnoszmaragdowy","2980B9":"Ciemnoniebieski","8E44AD":"Ciemnofioletowy","2C3E50":"Nienasycony niebieski","F39C12":"Pomarańczowy","E67E22":"Marchewkowy","E74C3C":"Bladoczerwony","ECF0F1":"Jasnosrebrny","95A5A6":"Szarocyjanowy","DDD":"Jasnoszary","D35400":"Dyniowy","C0392B":"Ciemnoczerwony","BDC3C7":"Srebrny","7F8C8D":"Szarawy cyjan","999":"Ciemnoszary"},"more":"Więcej kolorów...","panelTitle":"Kolory","textColorTitle":"Kolor tekstu"},"font":{"fontSize":{"label":"Rozmiar","voiceLabel":"Rozmiar czcionki","panelTitle":"Rozmiar"},"label":"Czcionka","panelTitle":"Czcionka","voiceLabel":"Czcionka"},"image":{"alt":"Tekst zastępczy","border":"Obramowanie","btnUpload":"Wyślij","button2Img":"Czy chcesz przekonwertować zaznaczony przycisk graficzny do zwykłego obrazka?","hSpace":"Odstęp poziomy","img2Button":"Czy chcesz przekonwertować zaznaczony obrazek do przycisku graficznego?","infoTab":"Informacje o obrazku","linkTab":"Hiperł�
-cze","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","resetSize":"Przywróć rozmiar","title":"Właściwości obrazka","titleButton":"Właściwości przycisku graficznego","upload":"Wyślij","urlMissing":"Podaj adres URL obrazka.","vSpace":"Odstęp pionowy","validateBorder":"Wartość obramowania musi być liczb�
- całkowit�
-.","validateHSpace":"Wartość odstępu poziomego musi być liczb�
- całkowit�
-.","validateVSpace":"Wartość odstępu pionowego musi być liczb�
- całkowit�
-."},"widget":{"move":"Kliknij i przeci�
-gnij, by przenieść.","label":"Widget %1"},"image2":{"alt":"Tekst zastępczy","btnUpload":"Wyślij","captioned":"Obrazek z podpisem","captionPlaceholder":"Podpis","infoTab":"Informacje o obrazku","lockRatio":"Zablokuj proporcje","menu":"Właściwości obrazka","pathName":"obrazek","pathNameCaption":"podpis","resetSize":"Przywróć rozmiar","resizer":"Kliknij i przeci�
-gnij, by zmienić rozmiar.","title":"Właściwości obrazka","uploadTab":"Wyślij","urlMissing":"Podaj adres URL obrazka.","altMissing":"Podaj tekst zastępczy obrazka."},"indent":{"indent":"Zwiększ wcięcie","outdent":"Zmniejsz wcięcie"},"fakeobjects":{"anchor":"Kotwica","flash":"Animacja Flash","hiddenfield":"Pole ukryte","iframe":"IFrame","unknown":"Nieznany obiekt"},"link":{"acccessKey":"Klawisz dostępu","advanced":"Zaawansowane","advisoryContentType":"Typ MIME obiektu docelowego","advisoryTitle":"Opis obiektu docelowego","anchor":{"toolbar":"Wstaw/edytuj kotwicę","menu":"Właściwości kotwicy","title":"Właściwości kotwicy","name":"Nazwa kotwicy","errorName":"Wpisz nazwę kotwicy","remove":"Usuń kotwicę"},"anchorId":"Wg identyfikatora","anchorName":"Wg nazwy","charset":"Kodowanie znaków obiektu docelowego","cssClasses":"Nazwa klasy CSS","download":"Wymuś pobieranie","displayText":"Wyświetlany tekst","emailAddress":"Adres e-mail","emailBody":"Treść","emailSubject":"Temat","id":"Id","info":"Informacje ","langCode":"Kod języka","langDir":"Kierunek tekstu","langDirLTR":"Od lewej do prawej (LTR)","langDirRTL":"Od prawej do lewej (RTL)","menu":"Edytuj odnośnik","name":"Nazwa","noAnchors":"(W dokumencie nie zdefiniowano żadnych kotwic)","noEmail":"Podaj adres e-mail","noUrl":"Podaj adres URL","other":"<inny>","popupDependent":"Okno zależne (Netscape)","popupFeatures":"Właściwości wyskakuj�
-cego okna","popupFullScreen":"Pełny ekran (IE)","popupLeft":"Pozycja w poziomie","popupLocationBar":"Pasek adresu","popupMenuBar":"Pasek menu","popupResizable":"Skalowalny","popupScrollBars":"Paski przewijania","popupStatusBar":"Pasek statusu","popupToolbar":"Pasek narzędzi","popupTop":"Pozycja w pionie","rel":"Relacja","selectAnchor":"Wybierz kotwicę","styles":"Styl","tabIndex":"Indeks kolejności","target":"Obiekt docelowy","targetFrame":"<ramka>","targetFrameName":"Nazwa ramki docelowej","targetPopup":"<wyskakuj�
-ce okno>","targetPopupName":"Nazwa wyskakuj�
-cego okna","title":"Odnośnik","toAnchor":"Odnośnik wewn�
-trz strony (kotwica)","toEmail":"Adres e-mail","toUrl":"Adres URL","toolbar":"Wstaw/edytuj odnośnik","type":"Typ odnośnika","unlink":"Usuń odnośnik","upload":"Wyślij"},"list":{"bulletedlist":"Lista wypunktowana","numberedlist":"Lista numerowana"},"maximize":{"maximize":"Maksymalizuj","minimize":"Minimalizuj"},"table":{"border":"Grubość obramowania","caption":"Tytuł","cell":{"menu":"Komórka","insertBefore":"Wstaw komórkę z lewej","insertAfter":"Wstaw komórkę z prawej","deleteCell":"Usuń komórki","merge":"Poł�
-cz komórki","mergeRight":"Poł�
-cz z komórk�
- z prawej","mergeDown":"Poł�
-cz z komórk�
- poniżej","splitHorizontal":"Podziel komórkę poziomo","splitVertical":"Podziel komórkę pionowo","title":"Właściwości komórki","cellType":"Typ komórki","rowSpan":"Scalenie wierszy","colSpan":"Scalenie komórek","wordWrap":"Zawijanie słów","hAlign":"Wyrównanie poziome","vAlign":"Wyrównanie pionowe","alignBaseline":"Linia bazowa","bgColor":"Kolor tła","borderColor":"Kolor obramowania","data":"Dane","header":"Nagłówek","yes":"Tak","no":"Nie","invalidWidth":"Szerokość komórki musi być liczb�
-.","invalidHeight":"Wysokość komórki musi być liczb�
-.","invalidRowSpan":"Scalenie wierszy musi być liczb�
- całkowit�
-.","invalidColSpan":"Scalenie komórek musi być liczb�
- całkowit�
-.","chooseColor":"Wybierz"},"cellPad":"Dopełnienie komórek","cellSpace":"Odstęp pomiędzy komórkami","column":{"menu":"Kolumna","insertBefore":"Wstaw kolumnę z lewej","insertAfter":"Wstaw kolumnę z prawej","deleteColumn":"Usuń kolumny"},"columns":"Liczba kolumn","deleteTable":"Usuń tabelę","headers":"Nagłówki","headersBoth":"Oba","headersColumn":"Pierwsza kolumna","headersNone":"Brak","headersRow":"Pierwszy wiersz","invalidBorder":"Wartość obramowania musi być liczb�
-.","invalidCellPadding":"Dopełnienie komórek musi być liczb�
- dodatni�
-.","invalidCellSpacing":"Odstęp pomiędzy komórkami musi być liczb�
- dodatni�
-.","invalidCols":"Liczba kolumn musi być większa niż 0.","invalidHeight":"Wysokość tabeli musi być liczb�
-.","invalidRows":"Liczba wierszy musi być większa niż 0.","invalidWidth":"Szerokość tabeli musi być liczb�
-.","menu":"Właściwości tabeli","row":{"menu":"Wiersz","insertBefore":"Wstaw wiersz powyżej","insertAfter":"Wstaw wiersz poniżej","deleteRow":"Usuń wiersze"},"rows":"Liczba wierszy","summary":"Podsumowanie","title":"Właściwości tabeli","toolbar":"Tabela","widthPc":"%","widthPx":"piksele","widthUnit":"jednostka szerokości"},"quicktable":{"more":"Więcej..."},"removeformat":{"toolbar":"Usuń formatowanie"},"sourcearea":{"toolbar":"Źródło dokumentu"},"toolbar":{"toolbarCollapse":"Zwiń pasek narzędzi","toolbarExpand":"Rozwiń pasek narzędzi","toolbarGroups":{"document":"Dokument","clipboard":"Schowek/Wstecz","editing":"Edycja","forms":"Formularze","basicstyles":"Style podstawowe","paragraph":"Akapit","links":"Hiperł�
-cza","insert":"Wstawianie","styles":"Style","colors":"Kolory","tools":"Narzędzia"},"toolbars":"Paski narzędzi edytora"},"undo":{"redo":"Ponów","undo":"Cofnij"},"colordialog":{"clear":"Wyczyść","highlight":"Zaznacz","options":"Opcje koloru","selected":"Wybrany","title":"Wybierz kolor"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/pt-br.js b/plugins/ckeditor/src/lang/pt-br.js
deleted file mode 100644
index 2dc2ca4a1..000000000
--- a/plugins/ckeditor/src/lang/pt-br.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['pt-br']={"editor":"Editor de Rich Text","editorPanel":"Painel do editor de Rich Text","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Localizar no Servidor","url":"URL","protocol":"Protocolo","upload":"Enviar ao Servidor","uploadSubmit":"Enviar para o Servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de Seleção","radio":"Botão de Opção","textField":"Caixa de Texto","textarea":"Área de Texto","hiddenField":"Campo Oculto","button":"Botão","select":"Caixa de Listagem","imageButton":"Botão de Imagem","notSet":"<não ajustado>","id":"Id","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para Direita (LTR)","langDirRtl":"Direita para Esquerda (RTL)","langCode":"Idioma","longDescr":"Descrição da URL","cssClass":"Classe de CSS","advisoryTitle":"Título","cssStyle":"Estilos","ok":"OK","cancel":"Cancelar","close":"Fechar","preview":"Visualizar","resize":"Arraste para redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um número.","confirmNewPage":"Todas as mudanças não salvas serão perdidas. Tem certeza de que quer abrir uma nova página?","confirmCancel":"Algumas opções foram alteradas. Tem certeza de que quer fechar a caixa de diálogo?","options":"Opções","target":"Destino","targetNew":"Nova Janela (_blank)","targetTop":"Janela de Cima (_top)","targetSelf":"Mesma Janela (_self)","targetParent":"Janela Pai (_parent)","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","styles":"Estilo","cssClasses":"Classes","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centralizado","alignJustify":"Justificar","alignTop":"Superior","alignMiddle":"Centralizado","alignBottom":"Inferior","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura tem que ser um número","invalidWidth":"A largura tem que ser um número.","invalidCssLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","invalidHtmlLength":"O valor do campo \"%1\" deve ser um número positivo opcionalmente seguido por uma válida unidade de medida de HTML (px ou %).","invalidInlineStyle":"O valor válido para estilo deve conter uma ou mais tuplas no formato \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para valor em pixels ou um número seguido de uma válida unidade de medida de CSS (px, %, in, cm, mm, em, ex, pt ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Tecla Retroceder","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Tecla Espaço","35":"End","36":"Home","46":"Delete","224":"Comando"},"keyboardShortcut":"Atalho do teclado"},"about":{"copy":"Copyright &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Verifique o $1 para obter ajuda.","moreInfo":"Para informações sobre a licença por favor visite o nosso site:","title":"Sobre o CKEditor","userGuide":"Guia do Usuário do CKEditor"},"clipboard":{"copy":"Copiar","copyError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de copiar automaticamente. Por favor, utilize o teclado para copiar (Ctrl/Cmd+C).","cut":"Recortar","cutError":"As configurações de segurança do seu navegador não permitem que o editor execute operações de recortar automaticamente. Por favor, utilize o teclado para recortar (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Área para Colar","pasteMsg":"Transfira o link usado na caixa usando o teclado com (<STRONG>Ctrl/Cmd+V</STRONG>) e <STRONG>OK</STRONG>.","securityMsg":"As configurações de segurança do seu navegador não permitem que o editor acesse os dados da área de transferência diretamente. Por favor cole o conteúdo manualmente nesta janela.","title":"Colar"},"base64image":{"alt":"Texto Alternativo","lockRatio":"Travar Proporções","vSpace":"VSpace","hSpace":"HSpace","border":"Borda"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Tachado","subscript":"Subscrito","superscript":"Sobrescrito","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Citação"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor do Plano de Fundo","colors":{"000":"Preto","800000":"Foquete","8B4513":"Marrom 1","2F4F4F":"Cinza 1","008080":"Cerceta","000080":"Azul Marinho","4B0082":"Índigo","696969":"Cinza 2","B22222":"Tijolo de Fogo","A52A2A":"Marrom 2","DAA520":"Vara Dourada","006400":"Verde Escuro","40E0D0":"Turquesa","0000CD":"Azul Médio","800080":"Roxo","808080":"Cinza 3","F00":"Vermelho","FF8C00":"Laranja Escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza Escuro","FFA07A":"Salmão Claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Lima","AFEEEE":"Turquesa Pálido","ADD8E6":"Azul Claro","DDA0DD":"Ameixa","D3D3D3":"Cinza Claro","FFF0F5":"Lavanda 1","FAEBD7":"Branco Antiguidade","FFFFE0":"Amarelo Claro","F0FFF0":"Orvalho","F0FFFF":"Azure","F0F8FF":"Azul Alice","E6E6FA":"Lavanda 2","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mais Cores...","panelTitle":"Cores","textColorTitle":"Cor do Texto"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da fonte","panelTitle":"Tamanho"},"label":"Fonte","panelTitle":"Fonte","voiceLabel":"Fonte"},"image":{"alt":"Texto Alternativo","border":"Borda","btnUpload":"Enviar para o Servidor","button2Img":"Deseja transformar o botão de imagem em uma imagem comum?","hSpace":"HSpace","img2Button":"Deseja transformar a imagem em um botão de imagem?","infoTab":"Informações da Imagem","linkTab":"Link","lockRatio":"Travar Proporções","menu":"Formatar Imagem","resetSize":"Redefinir para o Tamanho Original","title":"Formatar Imagem","titleButton":"Formatar Botão de Imagem","upload":"Enviar","urlMissing":"URL da imagem está faltando.","vSpace":"VSpace","validateBorder":"A borda deve ser um número inteiro.","validateHSpace":"O HSpace deve ser um número inteiro.","validateVSpace":"O VSpace deve ser um número inteiro."},"widget":{"move":"Click e arraste para mover","label":"%1 widget"},"image2":{"alt":"Texto Alternativo","btnUpload":"Enviar para o Servidor","captioned":"Legenda da Imagem","captionPlaceholder":"Legenda","infoTab":"Informações da Imagem","lockRatio":"Travar Proporções","menu":"Formatar Imagem","pathName":"Imagem","pathNameCaption":"Legenda","resetSize":"Redefinir para o Tamanho Original","resizer":"Click e arraste para redimensionar","title":"Formatar Imagem","uploadTab":"Enviar ao Servidor","urlMissing":"URL da imagem está faltando.","altMissing":"Texto alternativo não informado."},"indent":{"indent":"Aumentar Recuo","outdent":"Diminuir Recuo"},"fakeobjects":{"anchor":"Âncora","flash":"Animação em Flash","hiddenfield":"Campo Oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"link":{"acccessKey":"Chave de Acesso","advanced":"Avançado","advisoryContentType":"Tipo de Conteúdo","advisoryTitle":"Título","anchor":{"toolbar":"Inserir/Editar Âncora","menu":"Formatar Âncora","title":"Formatar Âncora","name":"Nome da Âncora","errorName":"Por favor, digite o nome da âncora","remove":"Remover Âncora"},"anchorId":"Id da âncora","anchorName":"Nome da âncora","charset":"Charset do Link","cssClasses":"Classe de CSS","download":"Forçar Download","displayText":"Exibir Texto","emailAddress":"Endereço E-Mail","emailBody":"Corpo da Mensagem","emailSubject":"Assunto da Mensagem","id":"Id","info":"Informações","langCode":"Direção do idioma","langDir":"Direção do idioma","langDirLTR":"Esquerda para Direita (LTR)","langDirRTL":"Direita para Esquerda (RTL)","menu":"Editar Link","name":"Nome","noAnchors":"(Não há âncoras no documento)","noEmail":"Por favor, digite o endereço de e-mail","noUrl":"Por favor, digite o endereço do Link","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Propriedades da Janela Pop-up","popupFullScreen":"Modo Tela Cheia (IE)","popupLeft":"Esquerda","popupLocationBar":"Barra de Endereços","popupMenuBar":"Barra de Menus","popupResizable":"Redimensionável","popupScrollBars":"Barras de Rolagem","popupStatusBar":"Barra de Status","popupToolbar":"Barra de Ferramentas","popupTop":"Topo","rel":"Tipo de Relação","selectAnchor":"Selecione uma âncora","styles":"Estilos","tabIndex":"Índice de Tabulação","target":"Destino","targetFrame":"<frame>","targetFrameName":"Nome do Frame de Destino","targetPopup":"<janela popup>","targetPopupName":"Nome da Janela Pop-up","title":"Editar Link","toAnchor":"Âncora nesta página","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserir/Editar Link","type":"Tipo de hiperlink","unlink":"Remover Link","upload":"Enviar ao Servidor"},"list":{"bulletedlist":"Lista sem números","numberedlist":"Lista numerada"},"maximize":{"maximize":"Maximizar","minimize":"Minimize"},"table":{"border":"Borda","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula a esquerda","insertAfter":"Inserir célula a direita","deleteCell":"Remover Células","merge":"Mesclar Células","mergeRight":"Mesclar com célula a direita","mergeDown":"Mesclar com célula abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas cobertas","colSpan":"Colunas cobertas","wordWrap":"Quebra de palavra","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Patamar de alinhamento","bgColor":"Cor de fundo","borderColor":"Cor das bordas","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula tem que ser um número.","invalidHeight":"A altura da célula tem que ser um número.","invalidRowSpan":"Linhas cobertas tem que ser um número inteiro.","invalidColSpan":"Colunas cobertas tem que ser um número inteiro.","chooseColor":"Escolher"},"cellPad":"Margem interna","cellSpace":"Espaçamento","column":{"menu":"Coluna","insertBefore":"Inserir coluna a esquerda","insertAfter":"Inserir coluna a direita","deleteColumn":"Remover Colunas"},"columns":"Colunas","deleteTable":"Apagar Tabela","headers":"Cabeçalho","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da borda tem que ser um número.","invalidCellPadding":"A margem interna das células tem que ser um número.","invalidCellSpacing":"O espaçamento das células tem que ser um número.","invalidCols":"O número de colunas tem que ser um número maior que 0.","invalidHeight":"A altura da tabela tem que ser um número.","invalidRows":"O número de linhas tem que ser um número maior que 0.","invalidWidth":"A largura da tabela tem que ser um número.","menu":"Formatar Tabela","row":{"menu":"Linha","insertBefore":"Inserir linha acima","insertAfter":"Inserir linha abaixo","deleteRow":"Remover Linhas"},"rows":"Linhas","summary":"Resumo","title":"Formatar Tabela","toolbar":"Tabela","widthPc":"%","widthPx":"pixels","widthUnit":"unidade largura"},"quicktable":{"more":"Mais..."},"removeformat":{"toolbar":"Remover Formatação"},"sourcearea":{"toolbar":"Código-Fonte"},"toolbar":{"toolbarCollapse":"Diminuir Barra de Ferramentas","toolbarExpand":"Aumentar Barra de Ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Clipboard/Desfazer","editing":"Edição","forms":"Formulários","basicstyles":"Estilos Básicos","paragraph":"Paragrafo","links":"Links","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Barra de Ferramentas do Editor"},"undo":{"redo":"Refazer","undo":"Desfazer"},"colordialog":{"clear":"Limpar","highlight":"Grifar","options":"Opções de Cor","selected":"Cor Selecionada","title":"Selecione uma Cor"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/pt.js b/plugins/ckeditor/src/lang/pt.js
deleted file mode 100644
index 172709532..000000000
--- a/plugins/ckeditor/src/lang/pt.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['pt']={"editor":"Editor de texto enriquecido","editorPanel":"Painel do editor de texto enriquecido","common":{"editorHelp":"Pressione ALT+0 para ajuda","browseServer":"Navegar no servidor","url":"URL","protocol":"Protocolo","upload":"Carregar","uploadSubmit":"Enviar para o servidor","image":"Imagem","flash":"Flash","form":"Formulário","checkbox":"Caixa de verificação","radio":"Botão","textField":"Campo de texto","textarea":"Área de texto","hiddenField":"Campo oculto","button":"Botão","select":"Campo de seleção","imageButton":"Botão da imagem","notSet":"<Não definido>","id":"ID","name":"Nome","langDir":"Direção do idioma","langDirLtr":"Esquerda para a Direita (EPD)","langDirRtl":"Direita para a Esquerda (DPE)","langCode":"Código do idioma","longDescr":"Descrição completa do URL","cssClass":"Classes de estilo das folhas","advisoryTitle":"Título consultivo","cssStyle":"Estilo","ok":"CONFIRMAR","cancel":"Cancelar","close":"Fechar","preview":"Pré-visualização","resize":"Redimensionar","generalTab":"Geral","advancedTab":"Avançado","validateNumberFailed":"Este valor não é um numero.","confirmNewPage":"Irão ser perdidas quaisquer alterações não guardadas. Tem a certeza que deseja carregar a nova página?","confirmCancel":"Foram alteradas algumas das opções. Tem a certeza que deseja fechar a janela?","options":"Opções","target":"Destino","targetNew":"Nova janela (_blank)","targetTop":"Janela superior (_top)","targetSelf":"Mesma janela (_self)","targetParent":"Janela dependente (_parent)","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","styles":"Estilo","cssClasses":"Classes de folhas de estilo","width":"Largura","height":"Altura","align":"Alinhamento","alignLeft":"Esquerda","alignRight":"Direita","alignCenter":"Centrado","alignJustify":"Justificado","alignTop":"Topo","alignMiddle":"Centro","alignBottom":"Base","alignNone":"Nenhum","invalidValue":"Valor inválido.","invalidHeight":"A altura deve ser um número.","invalidWidth":"A largura deve ser um número. ","invalidCssLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","invalidHtmlLength":"O valor especificado para o campo \"1%\" deve ser um número positivo, com ou sem uma unidade de medida HTML válida (px ou %).","invalidInlineStyle":"O valor especificado para o estilo em linha deve constituir um ou mais conjuntos de valores com o formato de \"nome : valor\", separados por ponto e vírgula.","cssLengthTooltip":"Insira um número para um valor em pontos ou um número com uma unidade CSS válida (px, %, in, cm, mm, em, ex, pt, ou pc).","unavailable":"%1<span class=\"cke_accessibility\">, indisponível</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"Fim","36":"Entrada","46":"Eliminar","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Direitos de Autor &copy; $1. Todos os direitos reservados.","dlgTitle":"Sobre o CKEditor","help":"Doar $1 para ajudar.","moreInfo":"Para informação sobre licenciamento visite o nosso sítio web:","title":"Sobre o CKEditor","userGuide":"CKEditor - Guia do utilizador"},"clipboard":{"copy":"Copiar","copyError":"A configuração de segurança do navegador não permite a execução automática de operações de copiar. Por favor use o teclado (Ctrl/Cmd+C).","cut":"Cortar","cutError":"A configuração de segurança do navegador não permite a execução automática de operações de cortar. Por favor use o teclado (Ctrl/Cmd+X).","paste":"Colar","pasteArea":"Colar área","pasteMsg":"Por favor, cole dentro da seguinte caixa usando o teclado (<STRONG>Ctrl/Cmd+V</STRONG>) e carregue em <STRONG>OK</STRONG>.","securityMsg":"Devido ás definições de segurança do teu browser, o editor não pode aceder ao clipboard diretamente. É necessário que voltes a colar as informações nesta janela.","title":"Colar"},"base64image":{"alt":"Texto Alternativo","lockRatio":"Proporcional","vSpace":"Esp.Vert","hSpace":"Esp.Horiz","border":"Limite"},"basicstyles":{"bold":"Negrito","italic":"Itálico","strike":"Rasurado","subscript":"Superior à linha","superscript":"Superior à linha","underline":"Sublinhado"},"bidi":{"ltr":"Direção do texto da esquerda para a direita","rtl":"Direção do texto da direita para a esquerda"},"blockquote":{"toolbar":"Bloco de citação"},"button":{"selectedLabel":"%1 (Selecionado)"},"colorbutton":{"auto":"Automático","bgColorTitle":"Cor de fundo","colors":{"000":"Black","800000":"Castanho","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Azul naval","4B0082":"Indigo","696969":"Cinza escuro","B22222":"Vermelho tijolo","A52A2A":"Castanho","DAA520":"Dourado (daa520)","006400":"Verde escuro (006400)","40E0D0":"Turquesa","0000CD":"Azul médio (0000cd)","800080":"Purple","808080":"Cinza","F00":"Vermelho","FF8C00":"Laranja escuro","FFD700":"Dourado","008000":"Verde","0FF":"Ciano","00F":"Azul","EE82EE":"Violeta","A9A9A9":"Cinza fosco","FFA07A":"Salmão claro","FFA500":"Laranja","FFFF00":"Amarelo","00FF00":"Limão (Verde espectro)","AFEEEE":"Turquesa pálida (afeeee)","ADD8E6":"Light Blue","DDA0DD":"Ameixa","D3D3D3":"Cinza claro","FFF0F5":"Lavanda avermelhada","FAEBD7":"Branco velho","FFFFE0":"Amarelo claro","F0FFF0":"Maná (f0fff0)","F0FFFF":"Azul celeste","F0F8FF":"Azul Alice (f0f8ff)","E6E6FA":"Lavanda","FFF":"Branco","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mais cores...","panelTitle":"Cores","textColorTitle":"Cor do texto"},"font":{"fontSize":{"label":"Tamanho","voiceLabel":"Tamanho da letra","panelTitle":"Tamanho da letra"},"label":"Fonte","panelTitle":"Nome do tipo de letra","voiceLabel":"Tipo de letra"},"image":{"alt":"Texto alternativo","border":"Limite","btnUpload":"Enviar para o servidor","button2Img":"Deseja transformar o botão com imagem selecionado em uma imagem?","hSpace":"Esp. Horiz","img2Button":"Deseja transformar a imagem selecionada em um botão com imagem?","infoTab":"Informação da imagem","linkTab":"Hiperligação","lockRatio":"Proporcional","menu":"Propriedades da Imagem","resetSize":"Tamanho original","title":"Propriedades da imagem","titleButton":"Propriedades do botão de imagem","upload":"Carregar","urlMissing":"O URL da fonte da imagem está em falta.","vSpace":"Esp. Vert","validateBorder":"A borda tem de ser um numero.","validateHSpace":"HSpace tem de ser um numero.","validateVSpace":"VSpace tem de ser um numero."},"widget":{"move":"Clique e arraste para mover","label":"%1 widget"},"image2":{"alt":"Texto alternativo","btnUpload":"Enviar para o servidor","captioned":"Imagem legendada","captionPlaceholder":"Legenda","infoTab":"Informação da imagem","lockRatio":"Proporcional","menu":"Propriedades da imagem","pathName":"imagem","pathNameCaption":"legenda","resetSize":"Tamanho original","resizer":"Clique e arraste para redimensionar","title":"Propriedades da imagem","uploadTab":"Carregar","urlMissing":"O URL da fonte da imagem está em falta.","altMissing":"Alternative text is missing."},"indent":{"indent":"Aumentar avanço","outdent":"Diminuir avanço"},"fakeobjects":{"anchor":" Inserir/Editar âncora","flash":"Animação Flash","hiddenfield":"Campo oculto","iframe":"IFrame","unknown":"Objeto desconhecido"},"link":{"acccessKey":"Chave de acesso","advanced":"Avançado","advisoryContentType":"Tipo de conteúdo","advisoryTitle":"Título","anchor":{"toolbar":" Inserir/Editar âncora","menu":"Propriedades da âncora","title":"Propriedades da âncora","name":"Nome da âncora","errorName":"Por favor, introduza o nome da âncora","remove":"Remover âncora"},"anchorId":"Por ID do elemento","anchorName":"Por Nome de Referência","charset":"Fonte de caracteres vinculado","cssClasses":"Classes de Estilo","download":"Force Download","displayText":"Mostrar texto","emailAddress":"Endereço de email","emailBody":"Corpo da mensagem","emailSubject":"Título de mensagem","id":"ID","info":"Informação da hiperligação","langCode":"Código de idioma","langDir":"Orientação de idioma","langDirLTR":"Esquerda para a Direita (EPD)","langDirRTL":"Direita para a Esquerda (DPE)","menu":"Editar hiperligação","name":"Nome","noAnchors":"(Não existem âncoras no documento)","noEmail":"Por favor, escreva o endereço de email","noUrl":"Por favor, introduza o endereço URL","other":"<outro>","popupDependent":"Dependente (Netscape)","popupFeatures":"Características de janela flutuante","popupFullScreen":"Janela completa (IE)","popupLeft":"Posição esquerda","popupLocationBar":"Barra de localização","popupMenuBar":"Barra de menu","popupResizable":"Redimensionável","popupScrollBars":"Barras de deslocamento","popupStatusBar":"Barra de estado","popupToolbar":"Barra de ferramentas","popupTop":"Posição topo","rel":"Relação","selectAnchor":"Selecionar âncora","styles":"Estilo","tabIndex":"Índice de tabulação","target":"Alvo","targetFrame":"<frame>","targetFrameName":"Nome da janela de destino","targetPopup":"<janela de popup>","targetPopupName":"Nome da janela flutuante","title":"Hiperligação","toAnchor":"Ligar a âncora no texto","toEmail":"Email","toUrl":"URL","toolbar":"Hiperligação","type":"Tipo de hiperligação","unlink":"Eliminar hiperligação","upload":"Carregar"},"list":{"bulletedlist":"Marcas","numberedlist":"Numeração"},"maximize":{"maximize":"Maximizar","minimize":"Minimizar"},"table":{"border":"Tamanho do contorno","caption":"Legenda","cell":{"menu":"Célula","insertBefore":"Inserir célula antes","insertAfter":"Inserir célula depois","deleteCell":"Apagar células","merge":"Unir células","mergeRight":"Unir à direita","mergeDown":"Fundir abaixo","splitHorizontal":"Dividir célula horizontalmente","splitVertical":"Dividir célula verticalmente","title":"Propriedades da célula","cellType":"Tipo de célula","rowSpan":"Linhas na célula","colSpan":"Colunas na célula","wordWrap":"Moldar texto","hAlign":"Alinhamento horizontal","vAlign":"Alinhamento vertical","alignBaseline":"Base","bgColor":"Cor de fundo","borderColor":"Cor da margem","data":"Dados","header":"Cabeçalho","yes":"Sim","no":"Não","invalidWidth":"A largura da célula deve ser um número.","invalidHeight":"A altura da célula deve ser um número.","invalidRowSpan":"As filas da célula deve ter um número inteiro.","invalidColSpan":"As colunas da célula devem ter um número inteiro.","chooseColor":"Escolher"},"cellPad":"Espaço interior","cellSpace":"Espaçamento de célula","column":{"menu":"Coluna","insertBefore":"Inserir coluna antes","insertAfter":"Inserir coluna depois","deleteColumn":"Apagar colunas"},"columns":"Colunas","deleteTable":"Apagar tabela","headers":"Cabeçalhos","headersBoth":"Ambos","headersColumn":"Primeira coluna","headersNone":"Nenhum","headersRow":"Primeira linha","invalidBorder":"O tamanho da margem tem de ser um número.","invalidCellPadding":"A criação do espaço na célula deve ser um número positivo.","invalidCellSpacing":"O espaçamento da célula deve ser um número positivo.","invalidCols":"O número de colunas tem de ser um número maior que 0.","invalidHeight":"A altura da tabela tem de ser um número.","invalidRows":"O número de linhas tem de ser maior que 0.","invalidWidth":"A largura da tabela tem de ser um número.","menu":"Propriedades da tabela","row":{"menu":"Linha","insertBefore":"Inserir linha antes","insertAfter":"Inserir linha depois","deleteRow":"Apagar linhas"},"rows":"Linhas","summary":"Resumo","title":"Propriedades da tabela","toolbar":"Tabela","widthPc":"percentagem","widthPx":"pixéis","widthUnit":"unidade da largura"},"quicktable":{"more":"Mais..."},"removeformat":{"toolbar":"Limpar formatação"},"sourcearea":{"toolbar":"Fonte"},"toolbar":{"toolbarCollapse":"Ocultar barra de ferramentas","toolbarExpand":"Expandir barra de ferramentas","toolbarGroups":{"document":"Documento","clipboard":"Área de transferência/Anular","editing":"Edição","forms":"Formulários","basicstyles":"Estilos básicos","paragraph":"Parágrafo","links":"Hiperligações","insert":"Inserir","styles":"Estilos","colors":"Cores","tools":"Ferramentas"},"toolbars":"Editor de barras de ferramentas"},"undo":{"redo":"Refazer","undo":"Anular"},"colordialog":{"clear":"Limpar","highlight":"Realçar","options":"Opções de cor","selected":"Cor selecionada","title":"Selecionar cor"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ro.js b/plugins/ckeditor/src/lang/ro.js
deleted file mode 100644
index 836f21824..000000000
--- a/plugins/ckeditor/src/lang/ro.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ro']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Apasă ALT 0 pentru ajutor","browseServer":"Răsfoieşte server","url":"URL","protocol":"Protocol","upload":"Încarcă","uploadSubmit":"Trimite la server","image":"Imagine","flash":"Flash","form":"Formular (Form)","checkbox":"Bifă (Checkbox)","radio":"Buton radio (RadioButton)","textField":"Câmp text (TextField)","textarea":"Suprafaţă text (Textarea)","hiddenField":"Câmp ascuns (HiddenField)","button":"Buton","select":"Câmp selecţie (SelectionField)","imageButton":"Buton imagine (ImageButton)","notSet":"<nesetat>","id":"Id","name":"Nume","langDir":"Direcţia cuvintelor","langDirLtr":"stânga-dreapta (LTR)","langDirRtl":"dreapta-stânga (RTL)","langCode":"Codul limbii","longDescr":"Descrierea lungă URL","cssClass":"Clasele cu stilul paginii (CSS)","advisoryTitle":"Titlul consultativ","cssStyle":"Stil","ok":"OK","cancel":"Anulare","close":"Închide","preview":"Previzualizare","resize":"Trage pentru a redimensiona","generalTab":"General","advancedTab":"Avansat","validateNumberFailed":"Această valoare nu este un număr.","confirmNewPage":"Orice modificări nesalvate ale acestui conținut, vor fi pierdute. Sigur doriți încărcarea unei noi pagini?","confirmCancel":"Câteva opțiuni au fost schimbate. Sigur doriți să închideți dialogul?","options":"Opțiuni","target":"Țintă","targetNew":"Fereastră nouă (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"În aceeași fereastră (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"Stânga spre Dreapta (LTR)","langDirRTL":"Dreapta spre Stânga (RTL)","styles":"Stil","cssClasses":"Stylesheet Classes","width":"Lăţime","height":"Înălţime","align":"Aliniere","alignLeft":"Mărește Bara","alignRight":"Dreapta","alignCenter":"Centru","alignJustify":"Aliniere în bloc (Block Justify)","alignTop":"Sus","alignMiddle":"Mijloc","alignBottom":"Jos","alignNone":"None","invalidValue":"Valoare invalidă","invalidHeight":"Înălțimea trebuie să fie un număr.","invalidWidth":"Lățimea trebuie să fie un număr.","invalidCssLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","invalidHtmlLength":"Valoarea specificată pentru câmpul \"%1\" trebuie să fie un număr pozitiv cu sau fără o unitate de măsură HTML (px sau %).","invalidInlineStyle":"Valoarea specificată pentru stil trebuie să conțină una sau mai multe construcții de tipul \"name : value\", separate prin punct și virgulă.","cssLengthTooltip":"Introduceți un număr în pixeli sau un număr cu o unitate de măsură CSS (px, %, in, cm, mm, em, ex, pt, sau pc).","unavailable":"%1<span class=\"cke_accessibility\">, nu este disponibil</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Toate drepturile rezervate.","dlgTitle":"Despre CKEeditor","help":"Citește  $1 pentru ajutor.","moreInfo":"Pentru informații despre licență, vă rugăm vizitați web site-ul nostru:","title":"Despre CKEditor","userGuide":"CKEditor Ghid Utilizator"},"clipboard":{"copy":"Copiază","copyError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de copiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+C).","cut":"Taie","cutError":"Setările de securitate ale navigatorului (browser) pe care îl folosiţi nu permit editorului să execute automat operaţiunea de tăiere. Vă rugăm folosiţi tastatura (Ctrl/Cmd+X).","paste":"Adaugă","pasteArea":"Suprafața de adăugare","pasteMsg":"Vă rugăm adăugaţi în căsuţa următoare folosind tastatura (<strong>Ctrl/Cmd+V</strong>) şi apăsaţi OK","securityMsg":"Din cauza setărilor de securitate ale programului dvs. cu care navigaţi pe internet (browser), editorul nu poate accesa direct datele din clipboard. Va trebui să adăugaţi din nou datele în această fereastră.","title":"Adaugă"},"base64image":{"alt":"Text alternativ","lockRatio":"Păstrează proporţiile","vSpace":"VSpace","hSpace":"HSpace","border":"Margine"},"basicstyles":{"bold":"Îngroşat (bold)","italic":"Înclinat (italic)","strike":"Tăiat (strike through)","subscript":"Indice (subscript)","superscript":"Putere (superscript)","underline":"Subliniat (underline)"},"bidi":{"ltr":"Direcția textului de la stânga la dreapta","rtl":"Direcția textului de la dreapta la stânga"},"blockquote":{"toolbar":"Citat"},"button":{"selectedLabel":"%1 (Selectat)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"Coloarea fundalului","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Mai multe culori...","panelTitle":"Colors","textColorTitle":"Culoarea textului"},"font":{"fontSize":{"label":"Mărime","voiceLabel":"Font Size","panelTitle":"Mărime"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"image":{"alt":"Text alternativ","border":"Margine","btnUpload":"Trimite la server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Informaţii despre imagine","linkTab":"Link (Legătură web)","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","resetSize":"Resetează mărimea","title":"Proprietăţile imaginii","titleButton":"Proprietăţi buton imagine (Image Button)","upload":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","vSpace":"VSpace","validateBorder":"Bordura trebuie să fie un număr întreg.","validateHSpace":"Hspace trebuie să fie un număr întreg.","validateVSpace":"Vspace trebuie să fie un număr întreg."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Text alternativ","btnUpload":"Trimite la server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informaţii despre imagine","lockRatio":"Păstrează proporţiile","menu":"Proprietăţile imaginii","pathName":"image","pathNameCaption":"caption","resetSize":"Resetează mărimea","resizer":"Click and drag to resize","title":"Proprietăţile imaginii","uploadTab":"Încarcă","urlMissing":"Sursa URL a imaginii lipsește.","altMissing":"Alternative text is missing."},"indent":{"indent":"Creşte indentarea","outdent":"Scade indentarea"},"fakeobjects":{"anchor":"Inserează/Editează ancoră","flash":"Flash Animation","hiddenfield":"Câmp ascuns (HiddenField)","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Tasta de acces","advanced":"Avansat","advisoryContentType":"Tipul consultativ al titlului","advisoryTitle":"Titlul consultativ","anchor":{"toolbar":"Inserează/Editează ancoră","menu":"Proprietăţi ancoră","title":"Proprietăţi ancoră","name":"Numele ancorei","errorName":"Vă rugăm scrieţi numele ancorei","remove":"Elimină ancora"},"anchorId":"după Id-ul elementului","anchorName":"după numele ancorei","charset":"Setul de caractere al resursei legate","cssClasses":"Clasele cu stilul paginii (CSS)","download":"Force Download","displayText":"Display Text","emailAddress":"Adresă de e-mail","emailBody":"Opțiuni Meniu Contextual","emailSubject":"Subiectul mesajului","id":"Id","info":"Informaţii despre link (Legătură web)","langCode":"Direcţia cuvintelor","langDir":"Direcţia cuvintelor","langDirLTR":"stânga-dreapta (LTR)","langDirRTL":"dreapta-stânga (RTL)","menu":"Editează Link","name":"Nume","noAnchors":"(Nicio ancoră disponibilă în document)","noEmail":"Vă rugăm să scrieţi adresa de e-mail","noUrl":"Vă rugăm să scrieţi URL-ul","other":"<alt>","popupDependent":"Dependent (Netscape)","popupFeatures":"Proprietăţile ferestrei popup","popupFullScreen":"Tot ecranul (Full Screen)(IE)","popupLeft":"Poziţia la stânga","popupLocationBar":"Bara de locaţie","popupMenuBar":"Bara de meniu","popupResizable":"Redimensionabil","popupScrollBars":"Bare de derulare","popupStatusBar":"Bara de status","popupToolbar":"Bara de opţiuni","popupTop":"Poziţia la dreapta","rel":"Relație","selectAnchor":"Selectaţi o ancoră","styles":"Stil","tabIndex":"Indexul tabului","target":"Ţintă (Target)","targetFrame":"<frame>","targetFrameName":"Numele frameului ţintă","targetPopup":"<fereastra popup>","targetPopupName":"Numele ferestrei popup","title":"Link (Legătură web)","toAnchor":"Ancoră în această pagină","toEmail":"E-Mail","toUrl":"URL","toolbar":"Inserează/Editează link (legătură web)","type":"Tipul link-ului (al legăturii web)","unlink":"Înlătură link (legătură web)","upload":"Încarcă"},"list":{"bulletedlist":"Inserează / Elimină Listă cu puncte","numberedlist":"Inserează / Elimină Listă numerotată"},"maximize":{"maximize":"Mărește","minimize":"Micșorează"},"table":{"border":"Mărimea marginii","caption":"Titlu (Caption)","cell":{"menu":"Celulă","insertBefore":"Inserează celulă înainte","insertAfter":"Inserează celulă după","deleteCell":"Şterge celule","merge":"Uneşte celule","mergeRight":"Uneşte la dreapta","mergeDown":"Uneşte jos","splitHorizontal":"Împarte celula pe orizontală","splitVertical":"Împarte celula pe verticală","title":"Proprietăți celulă","cellType":"Tipul celulei","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Aliniament orizontal","vAlign":"Aliniament vertical","alignBaseline":"Baseline","bgColor":"Culoare fundal","borderColor":"Culoare bordură","data":"Data","header":"Antet","yes":"Da","no":"Nu","invalidWidth":"Lățimea celulei trebuie să fie un număr.","invalidHeight":"Înălțimea celulei trebuie să fie un număr.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Alege"},"cellPad":"Spaţiu în cadrul celulei","cellSpace":"Spaţiu între celule","column":{"menu":"Coloană","insertBefore":"Inserează coloană înainte","insertAfter":"Inserează coloană după","deleteColumn":"Şterge celule"},"columns":"Coloane","deleteTable":"Şterge tabel","headers":"Antente","headersBoth":"Ambele","headersColumn":"Prima coloană","headersNone":"Nimic","headersRow":"Primul rând","invalidBorder":"Dimensiunea bordurii trebuie să aibe un număr.","invalidCellPadding":"Spațierea celulei trebuie sa fie un număr pozitiv","invalidCellSpacing":"Spațierea celului trebuie să fie un număr pozitiv.","invalidCols":"Numărul coloanelor trebuie să fie mai mare decât 0.","invalidHeight":"Inaltimea celulei trebuie sa fie un numar.","invalidRows":"Numărul rândurilor trebuie să fie mai mare decât 0.","invalidWidth":"Lățimea tabelului trebuie să fie un număr.","menu":"Proprietăţile tabelului","row":{"menu":"Rând","insertBefore":"Inserează rând înainte","insertAfter":"Inserează rând după","deleteRow":"Şterge rânduri"},"rows":"Rânduri","summary":"Rezumat","title":"Proprietăţile tabelului","toolbar":"Tabel","widthPc":"procente","widthPx":"pixeli","widthUnit":"unitate lățime"},"quicktable":{"more":"Mai multe..."},"removeformat":{"toolbar":"Înlătură formatarea"},"sourcearea":{"toolbar":"Sursa"},"toolbar":{"toolbarCollapse":"Micșorează Bara","toolbarExpand":"Mărește Bara","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Editează bara de unelte"},"undo":{"redo":"Starea ulterioară (redo)","undo":"Starea anterioară (undo)"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ru.js b/plugins/ckeditor/src/lang/ru.js
deleted file mode 100644
index eb3ffa18d..000000000
--- a/plugins/ckeditor/src/lang/ru.js
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ru']={"editor":"Визуальный текстовый редактор","editorPanel":"Визуальный редактор текста","common":{"editorHelp":"Нажмите ALT-0 для открытия справки","browseServer":"Выбор на сервере","url":"Ссылка","protocol":"Протокол","upload":"Загрузка файла","uploadSubmit":"Загрузить на сервер","image":"Изображение","flash":"Flash","form":"Форма","checkbox":"Чекбокс","radio":"Радиокнопка","textField":"Текстовое поле","textarea":"Многострочное текстовое поле","hiddenField":"Скрытое поле","button":"Кнопка","select":"Выпадающий список","imageButton":"Кнопка-изображение","notSet":"<не указано>","id":"Идентификатор","name":"Имя","langDir":"Направление текста","langDirLtr":"Слева направо (LTR)","langDirRtl":"Справа налево (RTL)","langCode":"Код языка","longDescr":"Длинное описание ссылки","cssClass":"Класс CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль","ok":"ОК","cancel":"Отмена","close":"Закрыть","preview":"Предпросмотр","resize":"Перетащите для изменения размера","generalTab":"Основное","advancedTab":"Дополнительно","validateNumberFailed":"Это значение не является числом.","confirmNewPage":"Несо�
-ранённые изменения будут потеряны! Вы действительно желаете перейти на другую страницу?","confirmCancel":"Некоторые параметры были изменены. Вы уверены, что желаете закрыть без со�
-ранения?","options":"Параметры","target":"Цель","targetNew":"Новое окно (_blank)","targetTop":"Главное окно (_top)","targetSelf":"Текущее окно (_self)","targetParent":"Родительское окно (_parent)","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","styles":"Стиль","cssClasses":"CSS классы","width":"Ширина","height":"Высота","align":"Выравнивание","alignLeft":"По левому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширине","alignTop":"Повер�
-у","alignMiddle":"Посередине","alignBottom":"Понизу","alignNone":"Нет","invalidValue":"Недопустимое значение.","invalidHeight":"Высота задается числом.","invalidWidth":"Ширина задается числом.","invalidCssLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","invalidHtmlLength":"Значение, указанное в поле \"%1\", должно быть положительным целым числом. Допускается указание единиц меры HTML (px или %).","invalidInlineStyle":"Значение, указанное для стиля элемента, должно состоять из одной или нескольки�
- пар данны�
- в формате \"параметр : значение\", разделённы�
- точкой с запятой.","cssLengthTooltip":"Введите значение в пикселя�
-, либо число с корректной единицей меры CSS (px, %, in, cm, mm, em, ex, pt или pc).","unavailable":"%1<span class=\"cke_accessibility\">, недоступно</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Пробел","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Комбинация клавиш"},"about":{"copy":"Copyright &copy; $1. Все права защищены.","dlgTitle":"О CKEditor","help":"$1 содержит подробную справку по использованию.","moreInfo":"Для получения информации о лицензии, пожалуйста, перейдите на наш сайт:","title":"О CKEditor","userGuide":"Руководство пользователя CKEditor"},"clipboard":{"copy":"Копировать","copyError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по копированию текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+C).","cut":"Вырезать","cutError":"Настройки безопасности вашего браузера не разрешают редактору выполнять операции по вырезке текста. Пожалуйста, используйте для этого клавиатуру (Ctrl/Cmd+X).","paste":"Вставить","pasteArea":"Зона для вставки","pasteMsg":"Пожалуйста, вставьте текст в зону ниже, используя клавиатуру (<strong>Ctrl/Cmd+V</strong>) и нажмите кнопку \"OK\".","securityMsg":"Настройки безопасности вашего браузера не разрешают редактору напрямую обращаться к буферу обмена. Вы должны вставить текст снова в это окно.","title":"Вставить"},"base64image":{"alt":"Альтернативный текст","lockRatio":"Со�
-ранять пропорции","vSpace":"Вертик. отступ","hSpace":"Гориз. отступ","border":"Граница"},"basicstyles":{"bold":"Полужирный","italic":"Курсив","strike":"Зачеркнутый","subscript":"Подстрочный индекс","superscript":"Надстрочный индекс","underline":"Подчеркнутый"},"bidi":{"ltr":"Направление текста слева направо","rtl":"Направление текста справа налево"},"blockquote":{"toolbar":"Цитата"},"button":{"selectedLabel":"%1 (Выбрано)"},"colorbutton":{"auto":"Автоматически","bgColorTitle":"Цвет фона","colors":{"000":"Чёрный","800000":"Бордовый","8B4513":"Кожано-коричневый","2F4F4F":"Темный синевато-серый","008080":"Сине-зелёный","000080":"Тёмно-синий","4B0082":"Индиго","696969":"Тёмно-серый","B22222":"Кирпичный","A52A2A":"Коричневый","DAA520":"Золотисто-берёзовый","006400":"Темно-зелёный","40E0D0":"Бирюзовый","0000CD":"Умеренно синий","800080":"Пурпурный","808080":"Серый","F00":"Красный","FF8C00":"Темно-оранжевый","FFD700":"Золотистый","008000":"Зелёный","0FF":"Васильковый","00F":"Синий","EE82EE":"Фиолетовый","A9A9A9":"Тускло-серый","FFA07A":"Светло-лососевый","FFA500":"Оранжевый","FFFF00":"Жёлтый","00FF00":"Лайма","AFEEEE":"Бледно-синий","ADD8E6":"Свелто-голубой","DDA0DD":"Сливовый","D3D3D3":"Светло-серый","FFF0F5":"Розово-лавандовый","FAEBD7":"Античный белый","FFFFE0":"Светло-жёлтый","F0FFF0":"Медвяной росы","F0FFFF":"Лазурный","F0F8FF":"Бледно-голубой","E6E6FA":"Лавандовый","FFF":"Белый","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Ещё цвета...","panelTitle":"Цвета","textColorTitle":"Цвет текста"},"font":{"fontSize":{"label":"Размер","voiceLabel":"Размер шрифта","panelTitle":"Размер шрифта"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"image":{"alt":"Альтернативный текст","border":"Граница","btnUpload":"Загрузить на сервер","button2Img":"Вы желаете преобразовать это изображение-кнопку в обычное изображение?","hSpace":"Гориз. отступ","img2Button":"Вы желаете преобразовать это обычное изображение в изображение-кнопку?","infoTab":"Данные об изображении","linkTab":"Ссылка","lockRatio":"Со�
-ранять пропорции","menu":"Свойства изображения","resetSize":"Вернуть обычные размеры","title":"Свойства изображения","titleButton":"Свойства изображения-кнопки","upload":"Загрузить","urlMissing":"Не указана ссылка на изображение.","vSpace":"Вертик. отступ","validateBorder":"Размер границ должен быть задан числом.","validateHSpace":"Горизонтальный отступ должен быть задан числом.","validateVSpace":"Вертикальный отступ должен быть задан числом."},"widget":{"move":"Нажмите и перетащите, чтобы переместить","label":"%1 виджет"},"image2":{"alt":"Альтернативный текст","btnUpload":"Загрузить на сервер","captioned":"Отображать название","captionPlaceholder":"Название","infoTab":"Данные об изображении","lockRatio":"Со�
-ранять пропорции","menu":"Свойства изображения","pathName":"изображение","pathNameCaption":"название","resetSize":"Вернуть обычные размеры","resizer":"Нажмите и растяните","title":"Свойства изображения","uploadTab":"Загрузка файла","urlMissing":"Не указана ссылка на изображение.","altMissing":"Не задан альтернативный текст"},"indent":{"indent":"Увеличить отступ","outdent":"Уменьшить отступ"},"fakeobjects":{"anchor":"Якорь","flash":"Flash анимация","hiddenfield":"Скрытое поле","iframe":"iFrame","unknown":"Неизвестный объект"},"link":{"acccessKey":"Клавиша доступа","advanced":"Дополнительно","advisoryContentType":"Тип содержимого","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставить / редактировать якорь","menu":"Изменить якорь","title":"Свойства якоря","name":"Имя якоря","errorName":"Пожалуйста, введите имя якоря","remove":"Удалить якорь"},"anchorId":"По идентификатору","anchorName":"По имени","charset":"Кодировка ресурса","cssClasses":"Классы CSS","download":"Force Download","displayText":"Отображаемый текст","emailAddress":"Email адрес","emailBody":"Текст сообщения","emailSubject":"Тема сообщения","id":"Идентификатор","info":"Информация о ссылке","langCode":"Код языка","langDir":"Направление текста","langDirLTR":"Слева направо (LTR)","langDirRTL":"Справа налево (RTL)","menu":"Редактировать ссылку","name":"Имя","noAnchors":"(В документе нет ни одного якоря)","noEmail":"Пожалуйста, введите email адрес","noUrl":"Пожалуйста, введите ссылку","other":"<другой>","popupDependent":"Зависимое (Netscape)","popupFeatures":"Параметры всплывающего окна","popupFullScreen":"Полноэкранное (IE)","popupLeft":"Отступ слева","popupLocationBar":"Панель адреса","popupMenuBar":"Панель меню","popupResizable":"Изменяемый размер","popupScrollBars":"Полосы прокрутки","popupStatusBar":"Строка состояния","popupToolbar":"Панель инструментов","popupTop":"Отступ свер�
-у","rel":"Отношение","selectAnchor":"Выберите якорь","styles":"Стиль","tabIndex":"Последовательность пере�
-ода","target":"Цель","targetFrame":"<фрейм>","targetFrameName":"Имя целевого фрейма","targetPopup":"<всплывающее окно>","targetPopupName":"Имя всплывающего окна","title":"Ссылка","toAnchor":"Ссылка на якорь в тексте","toEmail":"Email","toUrl":"Ссылка","toolbar":"Вставить/Редактировать ссылку","type":"Тип ссылки","unlink":"Убрать ссылку","upload":"Загрузка"},"list":{"bulletedlist":"Вставить / удалить маркированный список","numberedlist":"Вставить / удалить нумерованный список"},"maximize":{"maximize":"Развернуть","minimize":"Свернуть"},"table":{"border":"Размер границ","caption":"Заголовок","cell":{"menu":"Ячейка","insertBefore":"Вставить ячейку слева","insertAfter":"Вставить ячейку справа","deleteCell":"Удалить ячейки","merge":"Объединить ячейки","mergeRight":"Объединить с правой","mergeDown":"Объединить с нижней","splitHorizontal":"Разделить ячейку по вертикали","splitVertical":"Разделить ячейку по горизонтали","title":"Свойства ячейки","cellType":"Тип ячейки","rowSpan":"Объединяет строк","colSpan":"Объединяет колонок","wordWrap":"Перенос по словам","hAlign":"Горизонтальное выравнивание","vAlign":"Вертикальное выравнивание","alignBaseline":"По базовой линии","bgColor":"Цвет фона","borderColor":"Цвет границ","data":"Данные","header":"Заголовок","yes":"Да","no":"Нет","invalidWidth":"Ширина ячейки должна быть числом.","invalidHeight":"Высота ячейки должна быть числом.","invalidRowSpan":"Количество объединяемы�
- строк должно быть задано числом.","invalidColSpan":"Количество объединяемы�
- колонок должно быть задано числом.","chooseColor":"Выберите"},"cellPad":"Внутренний отступ ячеек","cellSpace":"Внешний отступ ячеек","column":{"menu":"Колонка","insertBefore":"Вставить колонку слева","insertAfter":"Вставить колонку справа","deleteColumn":"Удалить колонки"},"columns":"Колонки","deleteTable":"Удалить таблицу","headers":"Заголовки","headersBoth":"Свер�
-у и слева","headersColumn":"Левая колонка","headersNone":"Без заголовков","headersRow":"Вер�
-няя строка","invalidBorder":"Размер границ должен быть числом.","invalidCellPadding":"Внутренний отступ ячеек (cellpadding) должен быть числом.","invalidCellSpacing":"Внешний отступ ячеек (cellspacing) должен быть числом.","invalidCols":"Количество столбцов должно быть больше 0.","invalidHeight":"Высота таблицы должна быть числом.","invalidRows":"Количество строк должно быть больше 0.","invalidWidth":"Ширина таблицы должна быть числом.","menu":"Свойства таблицы","row":{"menu":"Строка","insertBefore":"Вставить строку свер�
-у","insertAfter":"Вставить строку снизу","deleteRow":"Удалить строки"},"rows":"Строки","summary":"Итоги","title":"Свойства таблицы","toolbar":"Таблица","widthPc":"процентов","widthPx":"пикселей","widthUnit":"единица измерения"},"quicktable":{"more":"Ещё..."},"removeformat":{"toolbar":"Убрать форматирование"},"sourcearea":{"toolbar":"Источник"},"toolbar":{"toolbarCollapse":"Свернуть панель инструментов","toolbarExpand":"Развернуть панель инструментов","toolbarGroups":{"document":"Документ","clipboard":"Буфер обмена / Отмена действий","editing":"Корректировка","forms":"Формы","basicstyles":"Простые стили","paragraph":"Абзац","links":"Ссылки","insert":"Вставка","styles":"Стили","colors":"Цвета","tools":"Инструменты"},"toolbars":"Панели инструментов редактора"},"undo":{"redo":"Повторить","undo":"Отменить"},"colordialog":{"clear":"Очистить","highlight":"Под курсором","options":"Настройки цвета","selected":"Выбранный цвет","title":"Выберите цвет"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/si.js b/plugins/ckeditor/src/lang/si.js
deleted file mode 100644
index 4f3ee3667..000000000
--- a/plugins/ckeditor/src/lang/si.js
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['si']={"editor":"පොහොසත් වචන සංස්කරණ","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"උදව් ලබා ගැනීමට  ALT බොත්තම ඔබන්න","browseServer":"සෙවුම් සේවාදායකය","url":"URL","protocol":"මුලාපත්‍රය","upload":"උඩුගතකිරීම","uploadSubmit":"සේවාදායකය වෙත යොමුකිරිම","image":"රුපය","flash":"දීප්තිය","form":"පෝරමය","checkbox":"ලකුණුකිරීමේ කොටුව","radio":"තේරීම් ","textField":"ලියන ප්‍රදේශය","textarea":"�
-කුරු ","hiddenField":"සැඟවුණු ප්‍රදේශය","button":"බොත්තම","select":"තෝරන්න ","imageButton":"රුප ","notSet":"<යොදා >","id":"�
-ංකය","name":"නම","langDir":"භාෂා දිශාව","langDirLtr":"වමේසිට දකුණුට","langDirRtl":"දකුණේ සිට වමට","langCode":"භාෂා කේතය","longDescr":"සම්පුර්න පැහැදිලි කිරීම","cssClass":"විලාශ පත්‍ර පන්තිය","advisoryTitle":"උපදෙස් ","cssStyle":"විලාසය","ok":"නිරදි","cancel":"�
-වලංගු කිරීම","close":"වැසීම","preview":"නැවත ","resize":"විශාලත්වය නැවත වෙනස් කිරීම","generalTab":"පොදු කරුණු.","advancedTab":"දීය","validateNumberFailed":"මෙම වටිනාකම �
-ංකයක් නොවේ","confirmNewPage":"ආරක්ෂා නොක�
- සියලුම දත්තයන් මැකියනුලැබේ. ඔබට නව පිටුවක් ලබා ගැනීමට �
-වශ්‍යද?","confirmCancel":"ඇතම් විකල්පයන් වෙනස් කර ඇත. ඔබට මින් නික්මීමට �
-වශ්‍යද?","options":" විකල්ප","target":"�
-රමුණ","targetNew":"නව කව්�
-ුව","targetTop":"වැදගත් කව්�
-ුව","targetSelf":"එම කව්�
-ුව(_තම\\\\)","targetParent":"මව් කව්�
-ුව(_)","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","styles":"විලාසය","cssClasses":"විලාසපත්‍ර පන්තිය","width":"ප�
-ල","height":"උස","align":"ගැලපුම","alignLeft":"වම","alignRight":"දකුණ","alignCenter":"මධ්‍ය","alignJustify":"Justify","alignTop":"ඉ","alignMiddle":"මැද","alignBottom":"පහල","alignNone":"None","invalidValue":"වැරදී වටිනාකමකි","invalidHeight":"උස �
-ංකයක් විය යුතුය","invalidWidth":"ප�
-ල �
-ංකයක් විය යුතුය","invalidCssLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  CSS මිනුම් එකක(px, %, in, cm, mm, em, ex, pt, pc)","invalidHtmlLength":"වටිනාකමක් නිරූපණය කිරීම \"%1\" ප්‍රදේශය ධන සංක්‍යාත්මක වටිනාකමක් හෝ  නිවරදි නොවන  HTML මිනුම් එකක (px හෝ %).","invalidInlineStyle":"වටිනාකමක් නිරූපණය කිරීම  පේ�
-ි විලාසයයට ආකෘතිය  �
-නතර්ග විය යුතය  \"නම : වටිනාකම\", තිත් කොමාවකින් වෙන් වෙන ලද.","cssLengthTooltip":"සංක්‍යා ඇතුලත් කිරීමේදී වටිනාකම තිත් ප්‍රමාණය නිවරදි CSS  ඒකක(තිත්, %, �
-ඟල්,සෙමි, mm, em, ex, pt, pc)","unavailable":"%1<span පන්තිය=\"�
-ඟා වියහැකි ද බලන්න\">, නොමැතිනම්</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"පිටපත් �
-යිතිය සහ පිටපත් කිරීම;$1 .සියලුම හිමිකම් ඇවිරිණි.","dlgTitle":"CKEditor ගැන විස්තර","help":"උදව් සඳහා $1 ","moreInfo":"බලපත්‍ර තොරතුරු සදහා කරුණාකර �
-පගේ විද්‍යුත් ලිපිනයට පිවිසෙන්න:","title":"CKEditor ගැන විස්තර","userGuide":"CKEditor භාවිතා කිරීම පි�
-ිබඳ "},"clipboard":{"copy":"පිටපත් කරන්න","copyError":"Your browser security settings don't permit the editor to automatically execute copying operations. Please use the keyboard for that (Ctrl/Cmd+C).","cut":"කපාගන්න","cutError":"Your browser security settings don't permit the editor to automatically execute cutting operations. Please use the keyboard for that (Ctrl/Cmd+X).","paste":"�
-ලවන්න","pasteArea":"�
-ලවන ප්‍රදේශ","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"�
-ලවන්න"},"base64image":{"alt":"විකල්ප ","lockRatio":"නවතන �
-නුපාතය ","vSpace":"VSpace","hSpace":"HSpace","border":"සීමාවවල "},"basicstyles":{"bold":"තද �
-කුරින් ලියනලද","italic":"බැධී�
-කුරින් ලියන ලද","strike":"Strikethrough","subscript":"Subscript","superscript":"Superscript","underline":"යටින් ඉරි �
-දින ලද"},"bidi":{"ltr":"වගන්ති දිශාව වමේ සිට දකුණට","rtl":"වගන්ති දිශාව  දකුණේ සිට වමට"},"blockquote":{"toolbar":"උද්ධෘත කොටස"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatic","bgColorTitle":"පසුබිම් වර්ණය","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"More Colors...","panelTitle":"වර්ණය","textColorTitle":"�
-ක්ෂර වර්ණ"},"font":{"fontSize":{"label":"විශාලත්වය","voiceLabel":"�
-ක්ෂර විශාලත්වය","panelTitle":"�
-ක්ෂර විශාලත්වය"},"label":"�
-ක්ෂරය","panelTitle":"�
-ක්ෂර නාමය","voiceLabel":"�
-ක්ෂර"},"image":{"alt":"විකල්ප ","border":"සීමාවවල ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","button2Img":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට �
-වශ්‍යද?","hSpace":"HSpace","img2Button":"ඔබට තෝරන ලද රුපය පරිවර්තනය කිරීමට �
-වශ්‍යද?","infoTab":"රුපයේ තොරතුරු","linkTab":"සබැඳිය","lockRatio":"නවතන �
-නුපාතය ","menu":"රුපයේ ගුණ","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","title":"රුපයේ ","titleButton":"රුප බොත්තමේ ගුණ","upload":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","vSpace":"VSpace","validateBorder":"මාඉම් සම්පුර්ණ සංක්‍යාවක් විය යුතුය.","validateHSpace":"HSpace  සම්පුර්ණ සංක්‍යාවක් විය යුතුය","validateVSpace":"VSpace සම්පුර්ණ සංක්‍යාවක් විය යුතුය."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"විකල්ප ","btnUpload":"සේවාදායකය වෙත යොමුකිරිම","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"රුපයේ තොරතුරු","lockRatio":"නවතන �
-නුපාතය ","menu":"රුපයේ ගුණ","pathName":"image","pathNameCaption":"caption","resetSize":"නැවතත් විශාලත්වය වෙනස් කිරීම","resizer":"Click and drag to resize","title":"රුපයේ ","uploadTab":"උඩුගතකිරීම","urlMissing":"රුප මුලාශ්‍ර URL නැත.","altMissing":"Alternative text is missing."},"indent":{"indent":"�
-තර පරතරය වැඩිකරන්න","outdent":"�
-තර පරතරය �
-ඩුකරන්න"},"fakeobjects":{"anchor":"ආධාරය","flash":"Flash Animation","hiddenfield":"සැඟවුණු ප්‍රදේශය","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"ප්‍රවේශ  යතුර","advanced":"දීය","advisoryContentType":"උපදේශාත්මක �
-න්තර්ගත ආකාරය","advisoryTitle":"උපදේශාත්මක නාමය","anchor":{"toolbar":"ආධාරය","menu":"ආධාරය වෙනස් කිරීම","title":"ආධාරක ","name":"ආධාරකයේ නාමය","errorName":"කරුණාකර ආධාරකයේ නාමය ඇතුල් කරන්න","remove":"ආධාරකය ඉවත් කිරීම"},"anchorId":"By Element Id","anchorName":"By Anchor Name","charset":"Linked Resource Charset","cssClasses":"විලාසපත්‍ර පන්තිය","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail Address","emailBody":"Message Body","emailSubject":"Message Subject","id":"�
-ංකය","info":"Link Info","langCode":"භාෂා කේතය","langDir":"භාෂා දිශාව","langDirLTR":"වමේසිට දකුණුට","langDirRTL":"දකුණේ සිට වමට","menu":"Edit Link","name":"නම","noAnchors":"(No anchors available in the document)","noEmail":"Please type the e-mail address","noUrl":"Please type the link URL","other":"<other>","popupDependent":"Dependent (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Full Screen (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Relationship","selectAnchor":"Select an Anchor","styles":"විලාසය","tabIndex":"Tab Index","target":"�
-රමුණ","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Popup Window Name","title":"සබැඳිය","toAnchor":"Link to anchor in the text","toEmail":"E-mail","toUrl":"URL","toolbar":"සබැඳිය","type":"Link Type","unlink":"Unlink","upload":"උඩුගතකිරීම"},"list":{"bulletedlist":"ඇතුලත් / ඉවත් කිරීම ලඉස්තුව","numberedlist":"ඇතුලත් / ඉවත් කිරීම �
-න්න්කිත ලඉස්තුව"},"maximize":{"maximize":"විශාල කිරීම","minimize":"කුඩා කිරීම"},"table":{"border":"සීමාවවල විශාලත්වය","caption":"Caption","cell":{"menu":"කොටුව","insertBefore":"පෙර කොටුවක් ඇතුල්කිරිම","insertAfter":"පසුව කොටුවක් ඇතුලත් ","deleteCell":"කොටුව මැකීම","merge":"කොටු එකට යාකිරිම","mergeRight":"දකුණට ","mergeDown":"පහලට ","splitHorizontal":"තිරස්ව කොටු පැතිරීම","splitVertical":"සිරස්ව කොටු පැතිරීම","title":"කොටු ","cellType":"කොටු වර්ගය","rowSpan":"පේ�
-ි ප�
-ල","colSpan":"සිරස් ප�
-ල","wordWrap":"වචන ගැලපුම","hAlign":"තිරස්ව ","vAlign":"සිරස්ව ","alignBaseline":"පාද රේඛාව","bgColor":"පසුබිම් වර්ණය","borderColor":"මායිම් ","data":"Data","header":"ශීර්ෂක","yes":"ඔව්","no":"නැත","invalidWidth":"කොටු ප�
-ල සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidHeight":"කොටු උස සංඛ්‍ය්ත්මක වටිනාකමක් විය යුතුය","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"තෝරන්න"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Delete Columns"},"columns":"සිරස් ","deleteTable":"වගුව මකන්න","headers":"ශීර්ෂක","headersBoth":"දෙකම","headersColumn":"ප�
-මූ සිරස් තීරුව","headersNone":"කිසිවක්ම නොවේ","headersRow":"ප�
-මූ පේ�
-ිය","invalidBorder":"Border size must be a number.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Cell spacing must be a positive number.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Table height must be a number.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Table width must be a number.","menu":"Table Properties","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Delete Rows"},"rows":"Rows","summary":"Summary","title":"Table Properties","toolbar":"Table","widthPc":"percent","widthPx":"pixels","widthUnit":"width unit"},"quicktable":{"more":"More..."},"removeformat":{"toolbar":"සැකසීම වෙනස් කරන්න"},"sourcearea":{"toolbar":"මුලාශ්‍රය"},"toolbar":{"toolbarCollapse":"මෙවලම් තීරුව හැකුලුම.","toolbarExpand":"මෙවලම් තීරුව දීගහැරුම","toolbarGroups":{"document":"ලිපිය","clipboard":"ඇමිණුම වෙනස් කිරීම","editing":"සංස්කරණය","forms":"පෝරමය","basicstyles":"මුලික විලාසය","paragraph":"චේදය","links":"සබැඳිය","insert":"ඇතුලත් කිරීම","styles":"විලාසය","colors":"වර්ණය","tools":"මෙවලම්"},"toolbars":"සංස්කරණ මෙවලම් තීරුව"},"undo":{"redo":"නැවත කිරීම","undo":"වෙනස් කිරීම"},"colordialog":{"clear":"පැහැදිලි","highlight":"මතුකර පෙන්වන්න","options":"වර්ණ විකල්ප","selected":"තෙරු වර්ණ","title":"වර්ණ තෝරන්න"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sk.js b/plugins/ckeditor/src/lang/sk.js
deleted file mode 100644
index c86a72edc..000000000
--- a/plugins/ckeditor/src/lang/sk.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sk']={"editor":"Editor formátovaného textu","editorPanel":"Panel editora formátovaného textu","common":{"editorHelp":"Stlačením ALT 0 spustiť pomocníka","browseServer":"Prehliadať server","url":"URL","protocol":"Protokol","upload":"Odoslať","uploadSubmit":"Odoslať na server","image":"Obrázok","flash":"Flash","form":"Formulár","checkbox":"Zaškrtávacie pole","radio":"Prepínač","textField":"Textové pole","textarea":"Textová oblasť","hiddenField":"Skryté pole","button":"Tlačidlo","select":"Rozbaľovací zoznam","imageButton":"Obrázkové tlačidlo","notSet":"<nenastavené>","id":"Id","name":"Meno","langDir":"Orientácia jazyka","langDirLtr":"Zľava doprava (LTR)","langDirRtl":"Sprava doľava (RTL)","langCode":"Kód jazyka","longDescr":"Dlhý popis URL","cssClass":"Trieda štýlu","advisoryTitle":"Pomocný titulok","cssStyle":"Štýl","ok":"OK","cancel":"Zrušiť","close":"Zatvorit","preview":"Náhľad","resize":"Zmeniť veľkosť","generalTab":"Hlavné","advancedTab":"Rozšírené","validateNumberFailed":"Hodnota nie je číslo.","confirmNewPage":"Prajete si načítat novú stránku? Všetky neuložené zmeny budú stratené. ","confirmCancel":"Niektore možnosti boli zmenené. Naozaj chcete zavrieť okno?","options":"Možnosti","target":"Cieľ","targetNew":"Nové okno (_blank)","targetTop":"Najvrchnejšie okno (_top)","targetSelf":"To isté okno (_self)","targetParent":"Rodičovské okno (_parent)","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","styles":"Štýl","cssClasses":"Triedy štýlu","width":"Šírka","height":"Výška","align":"Zarovnanie","alignLeft":"Vľavo","alignRight":"Vpravo","alignCenter":"Na stred","alignJustify":"Zarovnať do bloku","alignTop":"Nahor","alignMiddle":"Na stred","alignBottom":"Dole","alignNone":"Žiadne","invalidValue":"Neplatná hodnota.","invalidHeight":"Výška musí byť číslo.","invalidWidth":"Šírka musí byť číslo.","invalidCssLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej CSS mernej jednotky (px, %, in, cm, mm, em, ex, pt alebo pc).","invalidHtmlLength":"Špecifikovaná hodnota pre pole \"%1\" musí byť kladné číslo s alebo bez platnej HTML mernej jednotky (px alebo %).","invalidInlineStyle":"Zadaná hodnota pre inline štýl musí pozostávať s jedného, alebo viac dvojíc formátu \"názov: hodnota\", oddelených bodkočiarkou.","cssLengthTooltip":"Vložte číslo pre hodnotu v pixeloch alebo číslo so správnou CSS jednotou (px, %, in, cm, mm, em, ex, pt alebo pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedostupný</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Medzerník","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Klávesová skratka"},"about":{"copy":"Copyright &copy; $1. Všetky práva vyhradené.","dlgTitle":"O CKEditor-e","help":"Zaškrtnite $1 pre pomoc.","moreInfo":"Pre informácie o licenciách, prosíme, navštívte našu web stránku:","title":"O CKEditor-e","userGuide":"Používateľská príručka KCEditor-a"},"clipboard":{"copy":"Kopírovať","copyError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu kopírovania. Použite na to klávesnicu (Ctrl/Cmd+C).","cut":"Vystrihnúť","cutError":"Bezpečnostné nastavenia vášho prehliadača nedovoľujú editoru automaticky spustiť operáciu vystrihnutia. Použite na to klávesnicu (Ctrl/Cmd+X).","paste":"Vložiť","pasteArea":"Miesto na vloženie","pasteMsg":"Použitím klávesnice (<STRONG>Ctrl/Cmd+V</STRONG>) vložte text do rámčeka a stlačte OK.","securityMsg":"Kvôli bezpečnostným nastaveniam vášho prehliadača editor nemôže pristupovať k schránke na kopírovanie priamo. Vložte to preto do tohto okna.","title":"Vložiť"},"base64image":{"alt":"Alternatívny text","lockRatio":"Pomer zámky","vSpace":"V-medzera","hSpace":"H-medzera","border":"Rám (border)"},"basicstyles":{"bold":"Tučné","italic":"Kurzíva","strike":"Prečiarknuté","subscript":"Dolný index","superscript":"Horný index","underline":"Podčiarknuté"},"bidi":{"ltr":"Smer textu zľava doprava","rtl":"Smer textu sprava doľava"},"blockquote":{"toolbar":"Citácia"},"button":{"selectedLabel":"%1 (Vybrané)"},"colorbutton":{"auto":"Automaticky","bgColorTitle":"Farba pozadia","colors":{"000":"Čierna","800000":"Gaštanová","8B4513":"Sedlová hnedá","2F4F4F":"Tmavo bridlicovo sivá","008080":"Modrozelená","000080":"Tmavomodrá","4B0082":"Indigo","696969":"Tmavá sivá","B22222":"Ohňová tehlová","A52A2A":"Hnedá","DAA520":"Zlatobyľ","006400":"Tmavá zelená","40E0D0":"Tyrkysová","0000CD":"Stredná modrá","800080":"Purpurová","808080":"Sivá","F00":"Červená","FF8C00":"Tmavá oranžová","FFD700":"Zlatá","008000":"Zelená","0FF":"Azúrová","00F":"Modrá","EE82EE":"Fialová","A9A9A9":"Tmavá sivá","FFA07A":"Svetlá lososová","FFA500":"Oranžová","FFFF00":"Žltá","00FF00":"Vápenná","AFEEEE":"Svetlá tyrkysová","ADD8E6":"Svetlá modrá","DDA0DD":"Slivková","D3D3D3":"Svetlá sivá","FFF0F5":"Levanduľovo červená","FAEBD7":"Antická biela","FFFFE0":"Svetlá žltá","F0FFF0":"Medová","F0FFFF":"Azúrová","F0F8FF":"Alicovo modrá","E6E6FA":"Levanduľová","FFF":"Biela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Viac farieb...","panelTitle":"Farby","textColorTitle":"Farba textu"},"font":{"fontSize":{"label":"Veľkosť","voiceLabel":"Veľkosť písma","panelTitle":"Veľkosť písma"},"label":"Písmo","panelTitle":"Názov písma","voiceLabel":"Písmo"},"image":{"alt":"Alternatívny text","border":"Rám (border)","btnUpload":"Odoslať to na server","button2Img":"Chcete zmeniť vybrané obrázkové tlačidlo na jednoduchý obrázok?","hSpace":"H-medzera","img2Button":"Chcete zmeniť vybraný obrázok na obrázkové tlačidlo?","infoTab":"Informácie o obrázku","linkTab":"Odkaz","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","resetSize":"Pôvodná veľkosť","title":"Vlastnosti obrázka","titleButton":"Vlastnosti obrázkového tlačidla","upload":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","vSpace":"V-medzera","validateBorder":"Rám (border) musí byť celé číslo.","validateHSpace":"H-medzera musí byť celé číslo.","validateVSpace":"V-medzera musí byť celé číslo."},"widget":{"move":"Kliknite a potiahnite pre presunutie","label":"%1 widget"},"image2":{"alt":"Alternatívny text","btnUpload":"Odoslať to na server","captioned":"Opísaný obrázok","captionPlaceholder":"Popis","infoTab":"Informácie o obrázku","lockRatio":"Pomer zámky","menu":"Vlastnosti obrázka","pathName":"obrázok","pathNameCaption":"popis","resetSize":"Pôvodná veľkosť","resizer":"Kliknite a potiahnite pre zmenu veľkosti","title":"Vlastnosti obrázka","uploadTab":"Nahrať","urlMissing":"Chýba URL zdroja obrázka.","altMissing":"Alternative text is missing."},"indent":{"indent":"Zväčšiť odsadenie","outdent":"Zmenšiť odsadenie"},"fakeobjects":{"anchor":"Kotva","flash":"Flash animácia","hiddenfield":"Skryté pole","iframe":"IFrame","unknown":"Neznámy objekt"},"link":{"acccessKey":"Prístupový kľúč","advanced":"Rozšírené","advisoryContentType":"Pomocný typ obsahu","advisoryTitle":"Pomocný titulok","anchor":{"toolbar":"Kotva","menu":"Upraviť kotvu","title":"Vlastnosti kotvy","name":"Názov kotvy","errorName":"Zadajte prosím názov kotvy","remove":"Odstrániť kotvu"},"anchorId":"Podľa Id objektu","anchorName":"Podľa mena kotvy","charset":"Priradená znaková sada","cssClasses":"Triedy štýlu","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mailová adresa","emailBody":"Telo správy","emailSubject":"Predmet správy","id":"Id","info":"Informácie o odkaze","langCode":"Orientácia jazyka","langDir":"Orientácia jazyka","langDirLTR":"Zľava doprava (LTR)","langDirRTL":"Sprava doľava (RTL)","menu":"Upraviť odkaz","name":"Názov","noAnchors":"(V dokumente nie sú dostupné žiadne kotvy)","noEmail":"Zadajte prosím e-mailovú adresu","noUrl":"Zadajte prosím URL odkazu","other":"<iný>","popupDependent":"Závislosť (Netscape)","popupFeatures":"Vlastnosti vyskakovacieho okna","popupFullScreen":"Celá obrazovka (IE)","popupLeft":"Ľavý okraj","popupLocationBar":"Panel umiestnenia (location bar)","popupMenuBar":"Panel ponuky (menu bar)","popupResizable":"Meniteľná veľkosť (resizable)","popupScrollBars":"Posuvníky (scroll bars)","popupStatusBar":"Stavový riadok (status bar)","popupToolbar":"Panel nástrojov (toolbar)","popupTop":"Horný okraj","rel":"Vzťah (rel)","selectAnchor":"Vybrať kotvu","styles":"Štýl","tabIndex":"Poradie prvku (tab index)","target":"Cieľ","targetFrame":"<rámec>","targetFrameName":"Názov rámu cieľa","targetPopup":"<vyskakovacie okno>","targetPopupName":"Názov vyskakovacieho okna","title":"Odkaz","toAnchor":"Odkaz na kotvu v texte","toEmail":"E-mail","toUrl":"URL","toolbar":"Odkaz","type":"Typ odkazu","unlink":"Odstrániť odkaz","upload":"Nahrať"},"list":{"bulletedlist":"Vložiť/odstrániť zoznam s odrážkami","numberedlist":"Vložiť/odstrániť číslovaný zoznam"},"maximize":{"maximize":"Maximalizovať","minimize":"Minimalizovať"},"table":{"border":"Šírka orámovania","caption":"Popis","cell":{"menu":"Bunka","insertBefore":"Vložiť bunku pred","insertAfter":"Vložiť bunku za","deleteCell":"Vymazať bunky","merge":"Zlúčiť bunky","mergeRight":"Zlúčiť doprava","mergeDown":"Zlúčiť dole","splitHorizontal":"Rozdeliť bunky horizontálne","splitVertical":"Rozdeliť bunky vertikálne","title":"Vlastnosti bunky","cellType":"Typ bunky","rowSpan":"Rozsah riadkov","colSpan":"Rozsah stĺpcov","wordWrap":"Zalamovanie riadkov","hAlign":"Horizontálne zarovnanie","vAlign":"Vertikálne zarovnanie","alignBaseline":"Základná čiara (baseline)","bgColor":"Farba pozadia","borderColor":"Farba orámovania","data":"Dáta","header":"Hlavička","yes":"Áno","no":"Nie","invalidWidth":"Šírka bunky musí byť číslo.","invalidHeight":"Výška bunky musí byť číslo.","invalidRowSpan":"Rozsah riadkov musí byť celé číslo.","invalidColSpan":"Rozsah stĺpcov musí byť celé číslo.","chooseColor":"Vybrať"},"cellPad":"Odsadenie obsahu (cell padding)","cellSpace":"Vzdialenosť buniek (cell spacing)","column":{"menu":"Stĺpec","insertBefore":"Vložiť stĺpec pred","insertAfter":"Vložiť stĺpec po","deleteColumn":"Zmazať stĺpce"},"columns":"Stĺpce","deleteTable":"Vymazať tabuľku","headers":"Hlavička","headersBoth":"Obe","headersColumn":"Prvý stĺpec","headersNone":"Žiadne","headersRow":"Prvý riadok","invalidBorder":"Šírka orámovania musí byť číslo.","invalidCellPadding":"Odsadenie v bunkách (cell padding) musí byť kladné číslo.","invalidCellSpacing":"Medzera mädzi bunkami (cell spacing) musí byť kladné číslo.","invalidCols":"Počet stĺpcov musí byť číslo väčšie ako 0.","invalidHeight":"Výška tabuľky musí byť číslo.","invalidRows":"Počet riadkov musí byť číslo väčšie ako 0.","invalidWidth":"Širka tabuľky musí byť číslo.","menu":"Vlastnosti tabuľky","row":{"menu":"Riadok","insertBefore":"Vložiť riadok pred","insertAfter":"Vložiť riadok po","deleteRow":"Vymazať riadky"},"rows":"Riadky","summary":"Prehľad","title":"Vlastnosti tabuľky","toolbar":"Tabuľka","widthPc":"percent","widthPx":"pixelov","widthUnit":"jednotka šírky"},"quicktable":{"more":"Viac..."},"removeformat":{"toolbar":"Odstrániť formátovanie"},"sourcearea":{"toolbar":"Zdroj"},"toolbar":{"toolbarCollapse":"Zbaliť lištu nástrojov","toolbarExpand":"Rozbaliť lištu nástrojov","toolbarGroups":{"document":"Dokument","clipboard":"Schránka pre kopírovanie/Späť","editing":"Upravovanie","forms":"Formuláre","basicstyles":"Základné štýly","paragraph":"Odsek","links":"Odkazy","insert":"Vložiť","styles":"Štýly","colors":"Farby","tools":"Nástroje"},"toolbars":"Lišty nástrojov editora"},"undo":{"redo":"Znovu","undo":"Späť"},"colordialog":{"clear":"Vyčistiť","highlight":"Zvýrazniť","options":"Možnosti farby","selected":"Vybraná farba","title":"Vybrať farbu"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sl.js b/plugins/ckeditor/src/lang/sl.js
deleted file mode 100644
index 139f72bf6..000000000
--- a/plugins/ckeditor/src/lang/sl.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sl']={"editor":"Urejevalnik obogatenega besedila","editorPanel":"Plošča urejevalnika obogatenega besedila","common":{"editorHelp":"Pritisnite ALT 0 za pomoč","browseServer":"Prebrskaj na strežniku","url":"URL","protocol":"Protokol","upload":"Naloži","uploadSubmit":"Pošlji na strežnik","image":"Slika","flash":"Flash","form":"Obrazec","checkbox":"Potrditveno polje","radio":"Izbirno polje","textField":"Besedilno polje","textarea":"Besedilno območje","hiddenField":"Skrito polje","button":"Gumb","select":"Spustno polje","imageButton":"Slikovni gumb","notSet":"<ni določen>","id":"Id","name":"Ime","langDir":"Smer jezika","langDirLtr":"Od leve proti desni (LTR)","langDirRtl":"Od desne proti levi (RTL)","langCode":"Koda jezika","longDescr":"Dolg opis URL-ja","cssClass":"Razredi slogovne predloge","advisoryTitle":"Predlagani naslov","cssStyle":"Slog","ok":"V redu","cancel":"Prekliči","close":"Zapri","preview":"Predogled","resize":"Potegni za spremembo velikosti","generalTab":"Splošno","advancedTab":"Napredno","validateNumberFailed":"Vrednost ni število.","confirmNewPage":"Vse neshranjene spremembe vsebine bodo izgubljene. Ali res želite naložiti novo stran?","confirmCancel":"Spremenili ste nekaj možnosti. Ali res želite zapreti okno?","options":"Možnosti","target":"Cilj","targetNew":"Novo okno (_blank)","targetTop":"Vrhovno okno (_top)","targetSelf":"Isto okno (_self)","targetParent":"Starševsko okno (_parent)","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","styles":"Slog","cssClasses":"Razredi slogovne predloge","width":"Širina","height":"Višina","align":"Poravnava","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredinsko","alignJustify":"Obojestranska poravnava","alignTop":"Na vrh","alignMiddle":"V sredino","alignBottom":"Na dno","alignNone":"Brez poravnave","invalidValue":"Neveljavna vrednost.","invalidHeight":"Višina mora biti število.","invalidWidth":"Širina mora biti število.","invalidCssLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne CSS-enote za merjenje (px, %, in, cm, mm, em, ex, pt ali pc).","invalidHtmlLength":"Vrednost, določena za polje »%1«, mora biti pozitivno število z ali brez veljavne HTML-enote za merjenje (px ali %).","invalidInlineStyle":"Vrednost, določena za slog v vrstici, mora biti sestavljena iz ene ali več dvojic oblike »ime : vrednost«, ločenih s podpičji.","cssLengthTooltip":"Vnesite število za vrednost v slikovnih pikah ali število z veljavno CSS-enoto (px, %, in, cm, mm, em, ex, pt ali pc).","unavailable":"%1<span class=\"cke_accessibility\">, nedosegljiv</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Vse pravice pridržane.","dlgTitle":"O programu CKEditor","help":"Oglejte si $1 za pomoč.","moreInfo":"Za informacije o licenciranju prosimo obiščite našo spletno stran:","title":"O programu CKEditor","userGuide":"Uporabniški vodnik CKEditor"},"clipboard":{"copy":"Kopiraj","copyError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega kopiranja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+C).","cut":"Izreži","cutError":"Varnostne nastavitve brskalnika ne dopuščajo samodejnega izrezovanja. Uporabite kombinacijo tipk na tipkovnici (Ctrl/Cmd+X).","paste":"Prilepi","pasteArea":"Prilepi območje","pasteMsg":"Prosimo, prilepite v sleči okvir s pomočjo tipkovnice (<strong>Ctrl/Cmd+V</strong>) in pritisnite V redu.","securityMsg":"Zaradi varnostnih nastavitev vašega brskalnika urejevalnik ne more neposredno dostopati do odložišča. Vsebino odložišča ponovno prilepite v to okno.","title":"Prilepi"},"base64image":{"alt":"Nadomestno besedilo","lockRatio":"Zakleni razmerje","vSpace":"Navpični razmik","hSpace":"Vodoravni razmik","border":"Obroba"},"basicstyles":{"bold":"Krepko","italic":"Ležeče","strike":"Prečrtano","subscript":"Podpisano","superscript":"Nadpisano","underline":"Podčrtano"},"bidi":{"ltr":"Smer besedila od leve proti desni","rtl":"Smer besedila od desne proti levi"},"blockquote":{"toolbar":"Citat"},"button":{"selectedLabel":"%1 (Izbrano)"},"colorbutton":{"auto":"Samodejno","bgColorTitle":"Barva ozadja","colors":{"000":"Črna","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Rjava","DAA520":"Golden Rod","006400":"Temno zelena","40E0D0":"Turkizna","0000CD":"Srednje modra","800080":"Škrlatna","808080":"Siva","F00":"Rdeča","FF8C00":"Temno oranžna","FFD700":"Zlata","008000":"Zelena","0FF":"Sinja","00F":"Modra","EE82EE":"Vijolična","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Oranžna","FFFF00":"Rumena","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Svetlo modra","DDA0DD":"Plum","D3D3D3":"Svetlo siva","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Svetlo rumena","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Bela","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Več barv ...","panelTitle":"Barve","textColorTitle":"Barva besedila"},"font":{"fontSize":{"label":"Velikost","voiceLabel":"Velikost pisave","panelTitle":"Velikost pisave"},"label":"Pisava","panelTitle":"Ime pisave","voiceLabel":"Pisava"},"image":{"alt":"Nadomestno besedilo","border":"Obroba","btnUpload":"Pošlji na strežnik","button2Img":"Želite pretvoriti izbrani gumb s sliko v preprosto sliko?","hSpace":"Vodoravni odmik","img2Button":"Želite pretvoriti izbrano sliko v gumb s sliko?","infoTab":"Podatki o sliki","linkTab":"Povezava","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","resetSize":"Ponastavi velikost","title":"Lastnosti slike","titleButton":"Lastnosti gumba s sliko","upload":"Naloži","urlMissing":"Manjka URL vira slike.","vSpace":"Navpični odmik","validateBorder":"Meja mora biti celo število.","validateHSpace":"Vodoravni odmik mora biti celo število.","validateVSpace":"VSpace mora biti celo število."},"widget":{"move":"Kliknite in povlecite, da premaknete","label":"%1 widget"},"image2":{"alt":"Nadomestno besedilo","btnUpload":"Pošlji na strežnik","captioned":"Slika z napisom","captionPlaceholder":"Napis","infoTab":"Podatki o sliki","lockRatio":"Zakleni razmerje","menu":"Lastnosti slike","pathName":"slika","pathNameCaption":"napis","resetSize":"Ponastavi velikost","resizer":"Kliknite in povlecite, da spremenite velikost","title":"Lastnosti slike","uploadTab":"Naloži","urlMissing":"Manjka vir (URL) slike.","altMissing":"Alternative text is missing."},"indent":{"indent":"Povečaj zamik","outdent":"Zmanjšaj zamik"},"fakeobjects":{"anchor":"Sidro","flash":"Animacija flash","hiddenfield":"Skrito polje","iframe":"IFrame","unknown":"Neznan objekt"},"link":{"acccessKey":"Tipka za dostop","advanced":"Napredno","advisoryContentType":"Predlagana vrsta vsebine","advisoryTitle":"Predlagani naslov","anchor":{"toolbar":"Sidro","menu":"Uredi sidro","title":"Lastnosti sidra","name":"Ime sidra","errorName":"Prosimo, vnesite ime sidra","remove":"Odstrani sidro"},"anchorId":"Po ID-ju elementa","anchorName":"Po imenu sidra","charset":"Nabor znakov povezanega vira","cssClasses":"Razredi slogovne predloge","download":"Force Download","displayText":"Display Text","emailAddress":"E-poštni naslov","emailBody":"Telo sporočila","emailSubject":"Zadeva sporočila","id":"Id","info":"Podatki o povezavi","langCode":"Koda jezika","langDir":"Smer jezika","langDirLTR":"Od leve proti desni (LTR)","langDirRTL":"Od desne proti levi (RTL)","menu":"Uredi povezavo","name":"Ime","noAnchors":"(V tem dokumentu ni sider)","noEmail":"Vnesite e-poštni naslov","noUrl":"Vnesite URL povezave","other":"<drugo>","popupDependent":"Podokno (Netscape)","popupFeatures":"Značilnosti pojavnega okna","popupFullScreen":"Celozaslonsko (IE)","popupLeft":"Lega levo","popupLocationBar":"Naslovna vrstica","popupMenuBar":"Menijska vrstica","popupResizable":"Spremenljive velikosti","popupScrollBars":"Drsniki","popupStatusBar":"Vrstica stanja","popupToolbar":"Orodna vrstica","popupTop":"Lega na vrhu","rel":"Odnos","selectAnchor":"Izberite sidro","styles":"Slog","tabIndex":"Številka tabulatorja","target":"Cilj","targetFrame":"<okvir>","targetFrameName":"Ime ciljnega okvirja","targetPopup":"<pojavno okno>","targetPopupName":"Ime pojavnega okna","title":"Povezava","toAnchor":"Sidro na tej strani","toEmail":"E-pošta","toUrl":"URL","toolbar":"Vstavi/uredi povezavo","type":"Vrsta povezave","unlink":"Odstrani povezavo","upload":"Naloži"},"list":{"bulletedlist":"Vstavi/odstrani neoštevilčen seznam","numberedlist":"Vstavi/odstrani oštevilčen seznam"},"maximize":{"maximize":"Maksimiraj","minimize":"Minimiraj"},"table":{"border":"Velikost obrobe","caption":"Napis","cell":{"menu":"Celica","insertBefore":"Vstavi celico pred","insertAfter":"Vstavi celico za","deleteCell":"Izbriši celice","merge":"Združi celice","mergeRight":"Združi desno","mergeDown":"Združi navzdol","splitHorizontal":"Razdeli celico vodoravno","splitVertical":"Razdeli celico navpično","title":"Lastnosti celice","cellType":"Vrsta celice","rowSpan":"Razpon vrstic","colSpan":"Razpon stolpcev","wordWrap":"Prelom besedila","hAlign":"Vodoravna poravnava","vAlign":"Navpična poravnava","alignBaseline":"Osnovnica","bgColor":"Barva ozadja","borderColor":"Barva obrobe","data":"Podatki","header":"Glava","yes":"Da","no":"Ne","invalidWidth":"Širina celice mora biti število.","invalidHeight":"Višina celice mora biti število.","invalidRowSpan":"Razpon vrstic mora biti celo število.","invalidColSpan":"Razpon stolpcev mora biti celo število.","chooseColor":"Izberi"},"cellPad":"Odmik znotraj celic","cellSpace":"Razmik med celicami","column":{"menu":"Stolpec","insertBefore":"Vstavi stolpec pred","insertAfter":"Vstavi stolpec za","deleteColumn":"Izbriši stolpce"},"columns":"Stolpci","deleteTable":"Izbriši tabelo","headers":"Glave","headersBoth":"Oboje","headersColumn":"Prvi stolpec","headersNone":"Brez","headersRow":"Prva vrstica","invalidBorder":"Širina obrobe mora biti število.","invalidCellPadding":"Odmik znotraj celic mora biti pozitivno število.","invalidCellSpacing":"Razmik med celicami mora biti pozitivno število.","invalidCols":"Število stolpcev mora biti večje od 0.","invalidHeight":"Višina tabele mora biti število.","invalidRows":"Število vrstic mora biti večje od 0.","invalidWidth":"Širina tabele mora biti število.","menu":"Lastnosti tabele","row":{"menu":"Vrstica","insertBefore":"Vstavi vrstico pred","insertAfter":"Vstavi vrstico za","deleteRow":"Izbriši vrstice"},"rows":"Vrstice","summary":"Povzetek","title":"Lastnosti tabele","toolbar":"Tabela","widthPc":"odstotkov","widthPx":"pik","widthUnit":"enota širine"},"quicktable":{"more":"Več..."},"removeformat":{"toolbar":"Odstrani oblikovanje"},"sourcearea":{"toolbar":"Izvorna koda"},"toolbar":{"toolbarCollapse":"Skrči orodno vrstico","toolbarExpand":"Razširi orodno vrstico","toolbarGroups":{"document":"Dokument","clipboard":"Odložišče/Razveljavi","editing":"Urejanje","forms":"Obrazci","basicstyles":"Osnovni slogi","paragraph":"Odstavek","links":"Povezave","insert":"Vstavi","styles":"Slogi","colors":"Barve","tools":"Orodja"},"toolbars":"Orodne vrstice urejevalnika"},"undo":{"redo":"Uveljavi","undo":"Razveljavi"},"colordialog":{"clear":"Počisti","highlight":"Poudarjeno","options":"Možnosti barve","selected":"Izbrana barva","title":"Izberi barvo"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sq.js b/plugins/ckeditor/src/lang/sq.js
deleted file mode 100644
index f0d7e016f..000000000
--- a/plugins/ckeditor/src/lang/sq.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sq']={"editor":"Redaktues i Pasur Teksti","editorPanel":"Paneli i redaktuesit të tekstit të plotë","common":{"editorHelp":"Shtyp ALT 0 për ndihmë","browseServer":"Shfleto në Server","url":"URL","protocol":"Protokolli","upload":"Ngarko","uploadSubmit":"Dërgo në server","image":"Imazh","flash":"Objekt flash","form":"Formular","checkbox":"Checkbox","radio":"Buton radio","textField":"Fushë tekst","textarea":"Hapësirë tekst","hiddenField":"Fushë e fshehur","button":"Buton","select":"Menu zgjedhjeje","imageButton":"Buton imazhi","notSet":"<e pazgjedhur>","id":"Id","name":"Emër","langDir":"Kod gjuhe","langDirLtr":"Nga e majta në të djathtë (LTR)","langDirRtl":"Nga e djathta në të majtë (RTL)","langCode":"Kod gjuhe","longDescr":"Përshkrim i hollësishëm","cssClass":"Klasa stili CSS","advisoryTitle":"Titull","cssStyle":"Stil","ok":"OK","cancel":"Anulo","close":"Mbyll","preview":"Parashiko","resize":"Ripërmaso","generalTab":"Të përgjithshme","advancedTab":"Të përparuara","validateNumberFailed":"Vlera e futur nuk është një numër","confirmNewPage":"Çdo ndryshim që nuk është ruajtur do humbasë. Je i sigurtë që dëshiron të krijosh një faqe të re?","confirmCancel":"Disa opsione kanë ndryshuar. Je i sigurtë që dëshiron ta mbyllësh dritaren?","options":"Opsione","target":"Objektivi","targetNew":"Dritare e re (_blank)","targetTop":"Dritare në plan të parë (_top)","targetSelf":"E njëjta dritare (_self)","targetParent":"Dritarja prind (_parent)","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","styles":"Stil","cssClasses":"Klasa Stili CSS","width":"Gjerësi","height":"Lartësi","align":"Rreshtim","alignLeft":"Majtas","alignRight":"Djathtas","alignCenter":"Qendër","alignJustify":"Zgjero","alignTop":"Lart","alignMiddle":"Në mes","alignBottom":"Poshtë","alignNone":"Asnjë","invalidValue":"Vlerë e pavlefshme","invalidHeight":"Lartësia duhet të jetë një numër","invalidWidth":"Gjerësia duhet të jetë një numër","invalidCssLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme CSS (px, %, in, cm, mm, em, ex, pt ose pc).","invalidHtmlLength":"Vlera e fushës \"%1\" duhet të jetë një numër pozitiv me apo pa njësi matëse të vlefshme HTML (px ose %)","invalidInlineStyle":"Stili inline duhet të jetë një apo disa vlera të formatit \"emër: vlerë\", ndarë nga pikëpresje.","cssLengthTooltip":"Fut një numër për vlerën në pixel apo një numër me një njësi të vlefshme CSS (px, %, in, cm, mm, ex, pt, ose pc).","unavailable":"%1<span class=\"cke_accessibility\">, i padisponueshëm</span>","keyboard":{"8":"Prapa","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Grise","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Të drejtat  e kopjimit &copy; $1. Të gjitha të drejtat e rezervuara.","dlgTitle":"Rreth CKEditor","help":"Kontrollo $1 për ndihmë.","moreInfo":"Për informacione rreth licencave shih faqen tonë:","title":"Rreth CKEditor","userGuide":"Udhëzuesi i Shfrytëzuesit të CKEditor"},"clipboard":{"copy":"Kopjo","copyError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e kopjimit. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+C).","cut":"Preje","cutError":"Të dhënat e sigurisë së shfletuesit tuaj nuk lejojnë që redaktuesi automatikisht të kryej veprimin e prerjes. Ju lutemi shfrytëzoni tastierën për këtë veprim (Ctrl/Cmd+X).","paste":"Hidhe","pasteArea":"Hapësira Hedhëse","pasteMsg":"Ju lutemi hidhni brenda kutizës në vijim duke shfrytëzuar tastierën (<strong>Ctrl/Cmd+V</strong>) dhe shtypni Mirë.","securityMsg":"Për shkak të dhënave të sigurisë së shfletuesit tuaj, redaktuesi nuk është në gjendje të i qaset drejtpërdrejtë të dhanve të tabelës suaj të punës. Ju duhet të hidhni atë përsëri në këtë dritare.","title":"Hidhe"},"base64image":{"alt":"Tekst Alternativ","lockRatio":"Mbyll Racionin","vSpace":"Hapësira Vertikale","hSpace":"HSpace","border":"Korniza"},"basicstyles":{"bold":"Trash","italic":"Pjerrët","strike":"Nëpërmes","subscript":"Nën-skriptë","superscript":"Super-skriptë","underline":"Nënvijëzuar"},"bidi":{"ltr":"Drejtimi i tekstit nga e majta në të djathtë","rtl":"Drejtimi i tekstit nga e djathta në të majtë"},"blockquote":{"toolbar":"Citatet"},"button":{"selectedLabel":"%1 (Përzgjedhur)"},"colorbutton":{"auto":"Automatik","bgColorTitle":"Ngjyra e Prapavijës","colors":{"000":"E zezë","800000":"Ngjyrë gështenjë","8B4513":"Ngjyrë Shale Kafe","2F4F4F":"Ngjyrë Gri të errët ardëz","008080":"Ngjyrë bajukë","000080":"Ngjyrë Marine","4B0082":"Indigo","696969":"Gri e Errët","B22222":"Tullë në Flakë","A52A2A":"Ngjytë Kafe","DAA520":"Shkop i Artë","006400":"E Gjelbër e Errët","40E0D0":"Ngjyrë e Bruztë","0000CD":"E Kaltër e Mesme","800080":"Vjollcë","808080":"Gri","F00":"E Kuqe","FF8C00":"E Portokalltë e Errët","FFD700":"Ngjyrë Ari","008000":"E Gjelbërt","0FF":"Cyan","00F":"E Kaltër","EE82EE":"Vjollcë","A9A9A9":"Gri e Zbehtë","FFA07A":"Salmon i Ndritur","FFA500":"E Portokalltë","FFFF00":"E Verdhë","00FF00":"Ngjyrë Gëlqere","AFEEEE":"Ngjyrë e Bruztë e Zbehtë","ADD8E6":"E Kaltër e Ndritur","DDA0DD":"Ngjyrë Llokumi","D3D3D3":"Gri e Ndritur","FFF0F5":"Ngjyrë Purpur e Skuqur","FAEBD7":"E Bardhë Antike","FFFFE0":"E verdhë e Ndritur","F0FFF0":"Ngjyrë Nektari","F0FFFF":"Ngjyrë Qielli","F0F8FF":"E Kaltër Alice","E6E6FA":"Ngjyrë Purpur e Zbetë","FFF":"E bardhë","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Më Shumë Ngjyra...","panelTitle":"Ngjyrat","textColorTitle":"Ngjyra e Tekstit"},"font":{"fontSize":{"label":"Madhësia","voiceLabel":"Madhësia e Shkronjës","panelTitle":"Madhësia e Shkronjës"},"label":"Shkronja","panelTitle":"Emri i Shkronjës","voiceLabel":"Shkronja"},"image":{"alt":"Tekst Alternativ","border":"Korniza","btnUpload":"Dërgo në server","button2Img":"Dëshironi të e ndërroni pullën e fotos së selektuar në një foto të thjeshtë?","hSpace":"HSpace","img2Button":"Dëshironi të ndryshoni foton e përzgjedhur në pullë?","infoTab":"Informacione mbi Fotografinë","linkTab":"Nyja","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","resetSize":"Rikthe Madhësinë","title":"Karakteristikat e Fotografisë","titleButton":"Karakteristikat e Pullës së Fotografisë","upload":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","vSpace":"Hapësira Vertikale","validateBorder":"Korniza duhet të jetë numër i plotë.","validateHSpace":"Hapësira horizontale duhet të jetë numër i plotë.","validateVSpace":"Hapësira vertikale duhet të jetë numër i plotë."},"widget":{"move":"Kliko dhe tërhiqe për ta lëvizur","label":"%1 widget"},"image2":{"alt":"Tekst Alternativ","btnUpload":"Dërgo në server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Informacione mbi Fotografinë","lockRatio":"Mbyll Racionin","menu":"Karakteristikat e Fotografisë","pathName":"foto","pathNameCaption":"caption","resetSize":"Rikthe Madhësinë","resizer":"Click and drag to resize","title":"Karakteristikat e Fotografisë","uploadTab":"Ngarko","urlMissing":"Mungon URL e burimit të fotografisë.","altMissing":"Alternative text is missing."},"indent":{"indent":"Rrite Identin","outdent":"Zvogëlo Identin"},"fakeobjects":{"anchor":"Spirancë","flash":"Objekt flash","hiddenfield":"Fushë e fshehur","iframe":"IFrame","unknown":"Objekt i Panjohur"},"link":{"acccessKey":"Sipas ID-së së Elementit","advanced":"Të përparuara","advisoryContentType":"Lloji i Përmbajtjes Këshillimore","advisoryTitle":"Titull","anchor":{"toolbar":"Spirancë","menu":"Redakto Spirancën","title":"Anchor Properties","name":"Emri i Spirancës","errorName":"Ju lutemi shkruani emrin e spirancës","remove":"Largo Spirancën"},"anchorId":"Sipas ID-së së Elementit","anchorName":"Sipas Emrit të Spirancës","charset":"Seti i Karaktereve të Burimeve të Nëdlidhura","cssClasses":"Klasa stili CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Posta Elektronike","emailBody":"Trupi i Porosisë","emailSubject":"Titulli i Porosisë","id":"Id","info":"Informacione të Nyjes","langCode":"Kod gjuhe","langDir":"Drejtim teksti","langDirLTR":"Nga e majta në të djathë (LTR)","langDirRTL":"Nga e djathta në të majtë (RTL)","menu":"Redakto Nyjen","name":"Emër","noAnchors":"(Nuk ka asnjë spirancë në dokument)","noEmail":"Ju lutemi shkruani postën elektronike","noUrl":"Ju lutemi shkruani URL-në e nyjes","other":"<tjetër>","popupDependent":"E Varur (Netscape)","popupFeatures":"Karakteristikat e Dritares së Dialogut","popupFullScreen":"Ekran i Plotë  (IE)","popupLeft":"Pozita Majtas","popupLocationBar":"Shiriti i Lokacionit","popupMenuBar":"Shiriti i Menysë","popupResizable":"I ndryshueshëm","popupScrollBars":"Shiritat zvarritës","popupStatusBar":"Shiriti i Statutit","popupToolbar":"Shiriti i Mejteve","popupTop":"Top Pozita","rel":"Marrëdhëniet","selectAnchor":"Përzgjidh një Spirancë","styles":"Stil","tabIndex":"Indeksi i fletave","target":"Objektivi","targetFrame":"<frame>","targetFrameName":"Emri i Kornizës së Synuar","targetPopup":"<popup window>","targetPopupName":"Emri i Dritares së Dialogut","title":"Nyja","toAnchor":"Lidhu me spirancën në tekst","toEmail":"Posta Elektronike","toUrl":"URL","toolbar":"Nyja","type":"Lloji i Nyjes","unlink":"Largo Nyjen","upload":"Ngarko"},"list":{"bulletedlist":"Vendos/Largo Listën me Pika","numberedlist":"Vendos/Largo Listën me Numra"},"maximize":{"maximize":"Zmadho","minimize":"Zvogëlo"},"table":{"border":"Madhësia e kornizave","caption":"Titull","cell":{"menu":"Qeli","insertBefore":"Shto Qeli Para","insertAfter":"Shto Qeli Prapa","deleteCell":"Gris Qelitë","merge":"Bashko Qelitë","mergeRight":"Bashko Djathtas","mergeDown":"Bashko Poshtë","splitHorizontal":"Ndaj Qelinë Horizontalisht","splitVertical":"Ndaj Qelinë Vertikalisht","title":"Rekuizitat e Qelisë","cellType":"Lloji i Qelisë","rowSpan":"Bashko Rreshtat","colSpan":"Bashko Kolonat","wordWrap":"Fund i Fjalës","hAlign":"Bashkimi Horizontal","vAlign":"Bashkimi Vertikal","alignBaseline":"Baza","bgColor":"Ngjyra e Prapavijës","borderColor":"Ngjyra e Kornizave","data":"Të dhënat","header":"Koka","yes":"Po","no":"Jo","invalidWidth":"Gjerësia e qelisë duhet të jetë numër.","invalidHeight":"Lartësia e qelisë duhet të jetë numër.","invalidRowSpan":"Hapësira e rreshtave duhet të jetë numër i plotë.","invalidColSpan":"Hapësira e kolonave duhet të jetë numër i plotë.","chooseColor":"Përzgjidh"},"cellPad":"Mbushja e qelisë","cellSpace":"Hapësira e qelisë","column":{"menu":"Kolona","insertBefore":"Vendos Kolonë Para","insertAfter":"Vendos Kolonë Pas","deleteColumn":"Gris Kolonat"},"columns":"Kolonat","deleteTable":"Gris Tabelën","headers":"Kokat","headersBoth":"Së bashku","headersColumn":"Kolona e parë","headersNone":"Asnjë","headersRow":"Rreshti i Parë","invalidBorder":"Madhësia e kufinjve duhet të jetë numër.","invalidCellPadding":"Mbushja e qelisë duhet të jetë numër pozitiv.","invalidCellSpacing":"Hapësira e qelisë duhet të jetë numër pozitiv.","invalidCols":"Numri i kolonave duhet të jetë numër më i madh se 0.","invalidHeight":"Lartësia e tabelës duhet të jetë numër.","invalidRows":"Numri i rreshtave duhet të jetë numër më i madh se 0.","invalidWidth":"Gjerësia e tabelës duhet të jetë numër.","menu":"Karakteristikat e Tabelës","row":{"menu":"Rreshti","insertBefore":"Shto Rresht Para","insertAfter":"Shto Rresht Prapa","deleteRow":"Gris Rreshtat"},"rows":"Rreshtat","summary":"Përmbledhje","title":"Karakteristikat e Tabelës","toolbar":"Tabela","widthPc":"përqind","widthPx":"piksell","widthUnit":"njësia e gjerësisë"},"quicktable":{"more":"Më Shumë..."},"removeformat":{"toolbar":"Largo Formatin"},"sourcearea":{"toolbar":"Burimi"},"toolbar":{"toolbarCollapse":"Zvogëlo Shiritin","toolbarExpand":"Zgjero Shiritin","toolbarGroups":{"document":"Dokument","clipboard":"Tabela Punës/Ribëje","editing":"Duke Redaktuar","forms":"Formular","basicstyles":"Stili Bazë","paragraph":"Paragraf","links":"Nyjet","insert":"Shto","styles":"Stil","colors":"Ngjyrat","tools":"Mjetet"},"toolbars":"Shiritet e Redaktuesit"},"undo":{"redo":"Ribëje","undo":"Rizhbëje"},"colordialog":{"clear":"Pastro","highlight":"Thekso","options":"Përzgjedhjet e Ngjyrave","selected":"Ngjyra e Përzgjedhur","title":"Përzgjidh një ngjyrë"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sr-latn.js b/plugins/ckeditor/src/lang/sr-latn.js
deleted file mode 100644
index d058c19a9..000000000
--- a/plugins/ckeditor/src/lang/sr-latn.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sr-latn']={"editor":"Bogati uređivač teksta","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Pretraži server","url":"URL","protocol":"Protokol","upload":"Pošalji","uploadSubmit":"Pošalji na server","image":"Slika","flash":"Fleš","form":"Forma","checkbox":"Polje za potvrdu","radio":"Radio-dugme","textField":"Tekstualno polje","textarea":"Zona teksta","hiddenField":"Skriveno polje","button":"Dugme","select":"Izborno polje","imageButton":"Dugme sa slikom","notSet":"<nije postavljeno>","id":"Id","name":"Naziv","langDir":"Smer jezika","langDirLtr":"S leva na desno (LTR)","langDirRtl":"S desna na levo (RTL)","langCode":"Kôd jezika","longDescr":"Pun opis URL","cssClass":"Stylesheet klase","advisoryTitle":"Advisory naslov","cssStyle":"Stil","ok":"OK","cancel":"Otkaži","close":"Zatvori","preview":"Izgled stranice","resize":"Resize","generalTab":"Opšte","advancedTab":"Napredni tagovi","validateNumberFailed":"Ova vrednost nije broj.","confirmNewPage":"Nesačuvane promene ovog sadržaja će biti izgubljene. Jeste li sigurni da želita da učitate novu stranu?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Opcije","target":"Meta","targetNew":"Novi prozor (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Isti prozor (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","styles":"Stil","cssClasses":"Stylesheet klase","width":"Širina","height":"Visina","align":"Ravnanje","alignLeft":"Levo","alignRight":"Desno","alignCenter":"Sredina","alignJustify":"Obostrano ravnanje","alignTop":"Vrh","alignMiddle":"Sredina","alignBottom":"Dole","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Visina mora biti broj.","invalidWidth":"Širina mora biti broj.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Kopiraj","copyError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog kopiranja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+C).","cut":"Iseci","cutError":"Sigurnosna podešavanja Vašeg pretraživača ne dozvoljavaju operacije automatskog isecanja teksta. Molimo Vas da koristite prečicu sa tastature (Ctrl/Cmd+X).","paste":"Zalepi","pasteArea":"Prostor za lepljenje","pasteMsg":"Molimo Vas da zalepite unutar donje povrine koristeći tastaturnu prečicu (<STRONG>Ctrl/Cmd+V</STRONG>) i da pritisnete <STRONG>OK</STRONG>.","securityMsg":"Zbog sigurnosnih postavki vašeg pregledača, editor nije u mogućnosti da direktno pristupi podacima u klipbordu. Potrebno je da zalepite još jednom u ovom prozoru.","title":"Zalepi"},"base64image":{"alt":"Alternativni tekst","lockRatio":"Zaključaj odnos","vSpace":"VSpace","hSpace":"HSpace","border":"Okvir"},"basicstyles":{"bold":"Podebljano","italic":"Kurziv","strike":"Precrtano","subscript":"Indeks","superscript":"Stepen","underline":"Podvučeno"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Automatski","bgColorTitle":"Boja pozadine","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Više boja...","panelTitle":"Colors","textColorTitle":"Boja teksta"},"font":{"fontSize":{"label":"Veličina fonta","voiceLabel":"Font Size","panelTitle":"Veličina fonta"},"label":"Font","panelTitle":"Font","voiceLabel":"Font"},"image":{"alt":"Alternativni tekst","border":"Okvir","btnUpload":"Pošalji na server","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"HSpace","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Info slike","linkTab":"Link","lockRatio":"Zaključaj odnos","menu":"Osobine slika","resetSize":"Resetuj veličinu","title":"Osobine slika","titleButton":"Osobine dugmeta sa slikom","upload":"Pošalji","urlMissing":"Image source URL is missing.","vSpace":"VSpace","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Alternativni tekst","btnUpload":"Pošalji na server","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Info slike","lockRatio":"Zaključaj odnos","menu":"Osobine slika","pathName":"image","pathNameCaption":"caption","resetSize":"Resetuj veličinu","resizer":"Click and drag to resize","title":"Osobine slika","uploadTab":"Pošalji","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Uvećaj levu marginu","outdent":"Smanji levu marginu"},"fakeobjects":{"anchor":"Unesi/izmeni sidro","flash":"Flash Animation","hiddenfield":"Skriveno polje","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Pristupni taster","advanced":"Napredni tagovi","advisoryContentType":"Advisory vrsta sadržaja","advisoryTitle":"Advisory naslov","anchor":{"toolbar":"Unesi/izmeni sidro","menu":"Osobine sidra","title":"Osobine sidra","name":"Naziv sidra","errorName":"Unesite naziv sidra","remove":"Ukloni sidro"},"anchorId":"Po Id-u elementa","anchorName":"Po nazivu sidra","charset":"Linked Resource Charset","cssClasses":"Stylesheet klase","download":"Force Download","displayText":"Display Text","emailAddress":"E-Mail adresa","emailBody":"Sadržaj poruke","emailSubject":"Naslov","id":"Id","info":"Link Info","langCode":"Smer jezika","langDir":"Smer jezika","langDirLTR":"S leva na desno (LTR)","langDirRTL":"S desna na levo (RTL)","menu":"Izmeni link","name":"Naziv","noAnchors":"(Nema dostupnih sidra)","noEmail":"Otkucajte adresu elektronske pote","noUrl":"Unesite URL linka","other":"<остало>","popupDependent":"Zavisno (Netscape)","popupFeatures":"Mogućnosti popup prozora","popupFullScreen":"Prikaz preko celog ekrana (IE)","popupLeft":"Od leve ivice ekrana (px)","popupLocationBar":"Lokacija","popupMenuBar":"Kontekstni meni","popupResizable":"Promenljive veličine","popupScrollBars":"Scroll bar","popupStatusBar":"Statusna linija","popupToolbar":"Toolbar","popupTop":"Od vrha ekrana (px)","rel":"Odnos","selectAnchor":"Odaberi sidro","styles":"Stil","tabIndex":"Tab indeks","target":"Meta","targetFrame":"<okvir>","targetFrameName":"Naziv odredišnog frejma","targetPopup":"<popup prozor>","targetPopupName":"Naziv popup prozora","title":"Link","toAnchor":"Sidro na ovoj stranici","toEmail":"E-Mail","toUrl":"URL","toolbar":"Unesi/izmeni link","type":"Vrsta linka","unlink":"Ukloni link","upload":"Pošalji"},"list":{"bulletedlist":"Nenabrojiva lista","numberedlist":"Nabrojiva lista"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Veličina okvira","caption":"Naslov tabele","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Obriši ćelije","merge":"Spoj celije","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Razmak ćelija","cellSpace":"Ćelijski prostor","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Obriši kolone"},"columns":"Kolona","deleteTable":"Izbriši tabelu","headers":"Zaglavlja","headersBoth":"Oba","headersColumn":"Prva kolona","headersNone":"None","headersRow":"Prvi red","invalidBorder":"Veličina okvira mora biti broj.","invalidCellPadding":"Padding polja mora biti pozitivan broj.","invalidCellSpacing":"Razmak između ćelija mora biti pozitivan broj.","invalidCols":"Broj kolona mora biti broj veći od 0.","invalidHeight":"Visina tabele mora biti broj.","invalidRows":"Broj redova mora biti veći od 0.","invalidWidth":"Širina tabele mora biti broj.","menu":"Osobine tabele","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Obriši redove"},"rows":"Redova","summary":"Sažetak","title":"Osobine tabele","toolbar":"Tabela","widthPc":"procenata","widthPx":"piksela","widthUnit":"jedinica za širinu"},"quicktable":{"more":"Više..."},"removeformat":{"toolbar":"Ukloni formatiranje"},"sourcearea":{"toolbar":"Kôd"},"toolbar":{"toolbarCollapse":"Suzi alatnu traku","toolbarExpand":"Proširi alatnu traku","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Alatne trake"},"undo":{"redo":"Ponovi akciju","undo":"Poni�ti akciju"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sr.js b/plugins/ckeditor/src/lang/sr.js
deleted file mode 100644
index 9fc807a44..000000000
--- a/plugins/ckeditor/src/lang/sr.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sr']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Press ALT 0 for help","browseServer":"Претражи сервер","url":"УРЛ","protocol":"Протокол","upload":"Пошаљи","uploadSubmit":"Пошаљи на сервер","image":"Слика","flash":"Флеш елемент","form":"Форма","checkbox":"Поље за потврду","radio":"Радио-дугме","textField":"Текстуално поље","textarea":"Зона текста","hiddenField":"Скривено поље","button":"Дугме","select":"Изборно поље","imageButton":"Дугме са сликом","notSet":"<није постављено>","id":"Ид","name":"Назив","langDir":"Смер језика","langDirLtr":"С лева на десно (LTR)","langDirRtl":"С десна на лево (RTL)","langCode":"Kôд језика","longDescr":"Пун опис УРЛ","cssClass":"Stylesheet класе","advisoryTitle":"Advisory наслов","cssStyle":"Стил","ok":"OK","cancel":"Oткажи","close":"Затвори","preview":"Изглед странице","resize":"Resize","generalTab":"Опште","advancedTab":"Напредни тагови","validateNumberFailed":"Ова вредност није цигра.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Опције","target":"Meтa","targetNew":"New Window (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"Same Window (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","styles":"Стил","cssClasses":"Stylesheet класе","width":"Ширина","height":"Висина","align":"Равнање","alignLeft":"Лево","alignRight":"Десно","alignCenter":"Средина","alignJustify":"Обострано равнање","alignTop":"Вр�
-","alignMiddle":"Средина","alignBottom":"Доле","alignNone":"None","invalidValue":"Invalid value.","invalidHeight":"Height must be a number.","invalidWidth":"Width must be a number.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"Копирај","copyError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског копирања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+C).","cut":"Исеци","cutError":"Сигурносна подешавања Вашег претраживача не дозвољавају операције аутоматског исецања текста. Молимо Вас да користите пречицу са тастатуре (Ctrl/Cmd+X).","paste":"Залепи","pasteArea":"Залепи зону","pasteMsg":"Молимо Вас да залепите унутар доње површине користећи тастатурну пречицу (<STRONG>Ctrl/Cmd+V</STRONG>) и да притиснете <STRONG>OK</STRONG>.","securityMsg":"Због сигурносни�
- подешавања претраживача, едитор не може да приступи оставу. Требате да га поново залепите у овом прозору.","title":"Залепи"},"base64image":{"alt":"Алтернативни текст","lockRatio":"Закључај однос","vSpace":"VSpace","hSpace":"HSpace","border":"Оквир"},"basicstyles":{"bold":"Подебљано","italic":"Курзив","strike":"Прецртано","subscript":"Индекс","superscript":"Степен","underline":"Подвучено"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"Аутоматски","bgColorTitle":"Боја позадине","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Више боја...","panelTitle":"Colors","textColorTitle":"Боја текста"},"font":{"fontSize":{"label":"Величина фонта","voiceLabel":"Font Size","panelTitle":"Величина фонта"},"label":"Фонт","panelTitle":"Фонт","voiceLabel":"Фонт"},"image":{"alt":"Алтернативни текст","border":"Оквир","btnUpload":"Пошаљи на сервер","button2Img":"Да ли желите да промените одабрану слику дугмета као једноставну слику?","hSpace":"HSpace","img2Button":"Да ли желите да промените одабрану слику у слику дугмета?","infoTab":"Инфо слике","linkTab":"Линк","lockRatio":"Закључај однос","menu":"Особине слика","resetSize":"Ресетуј величину","title":"Особине слика","titleButton":"Особине дугмета са сликом","upload":"Пошаљи","urlMissing":"Недостаје УРЛ слике.","vSpace":"VSpace","validateBorder":"Ивица треба да буде цифра.","validateHSpace":"HSpace треба да буде цифра.","validateVSpace":"VSpace треба да буде цифра."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"Алтернативни текст","btnUpload":"Пошаљи на сервер","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"Инфо слике","lockRatio":"Закључај однос","menu":"Особине слика","pathName":"image","pathNameCaption":"caption","resetSize":"Ресетуј величину","resizer":"Click and drag to resize","title":"Особине слика","uploadTab":"Пошаљи","urlMissing":"Недостаје УРЛ слике.","altMissing":"Alternative text is missing."},"indent":{"indent":"Увећај леву маргину","outdent":"Смањи леву маргину"},"fakeobjects":{"anchor":"Anchor","flash":"Flash Animation","hiddenfield":"Hidden Field","iframe":"IFrame","unknown":"Unknown Object"},"link":{"acccessKey":"Приступни тастер","advanced":"Напредни тагови","advisoryContentType":"Advisory врста садржаја","advisoryTitle":"Advisory наслов","anchor":{"toolbar":"Унеси/измени сидро","menu":"Особине сидра","title":"Особине сидра","name":"Име сидра","errorName":"Молимо Вас да унесете име сидра","remove":"Remove Anchor"},"anchorId":"Пo Ид-jу елемента","anchorName":"По називу сидра","charset":"Linked Resource Charset","cssClasses":"Stylesheet класе","download":"Force Download","displayText":"Display Text","emailAddress":"Адреса електронске поште","emailBody":"Садржај поруке","emailSubject":"Наслов","id":"Ид","info":"Линк инфо","langCode":"Смер језика","langDir":"Смер језика","langDirLTR":"С лева на десно (LTR)","langDirRTL":"С десна на лево (RTL)","menu":"Промени линк","name":"Назив","noAnchors":"(Нема доступни�
- сидра)","noEmail":"Откуцајте адресу електронске поште","noUrl":"Унесите УРЛ линка","other":"<друго>","popupDependent":"Зависно (Netscape)","popupFeatures":"Могућности искачућег прозора","popupFullScreen":"Приказ преко целог екрана (ИE)","popupLeft":"Од леве ивице екрана (пиксела)","popupLocationBar":"Локација","popupMenuBar":"Контекстни мени","popupResizable":"Величина се мења","popupScrollBars":"Скрол бар","popupStatusBar":"Статусна линија","popupToolbar":"Toolbar","popupTop":"Од вр�
-а екрана (пиксела)","rel":"Однос","selectAnchor":"Одабери сидро","styles":"Стил","tabIndex":"Таб индекс","target":"Meтa","targetFrame":"<оквир>","targetFrameName":"Назив одредишног фрејма","targetPopup":"<искачући прозор>","targetPopupName":"Назив искачућег прозора","title":"Линк","toAnchor":"Сидро на овој страници","toEmail":"Eлектронска пошта","toUrl":"УРЛ","toolbar":"Унеси/измени линк","type":"Врста линка","unlink":"Уклони линк","upload":"Пошаљи"},"list":{"bulletedlist":"Ненабројива листа","numberedlist":"Набројиву листу"},"maximize":{"maximize":"Maximize","minimize":"Minimize"},"table":{"border":"Величина оквира","caption":"Наслов табеле","cell":{"menu":"Cell","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"Обриши ћелије","merge":"Спој ћелије","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"Размак ћелија","cellSpace":"Ћелијски простор","column":{"menu":"Column","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"Обриши колоне"},"columns":"Kолона","deleteTable":"Обриши таблу","headers":"Поглавља","headersBoth":"Оба","headersColumn":"Прва колона","headersNone":"None","headersRow":"Први ред","invalidBorder":"Величина ивице треба да буде цифра.","invalidCellPadding":"Пуњење ћелије треба да буде позитивна цифра.","invalidCellSpacing":"Размак ћелије треба да буде позитивна цифра.","invalidCols":"Број колона треба да буде цифра већа од 0.","invalidHeight":"Висина табеле треба да буде цифра.","invalidRows":"Број реда треба да буде цифра већа од 0.","invalidWidth":"Ширина табеле треба да буде цифра.","menu":"Особине табеле","row":{"menu":"Row","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"Обриши редове"},"rows":"Редова","summary":"Резиме","title":"Особине табеле","toolbar":"Табела","widthPc":"процената","widthPx":"пиксела","widthUnit":"јединица ширине"},"quicktable":{"more":"Више..."},"removeformat":{"toolbar":"Уклони форматирање"},"sourcearea":{"toolbar":"Kôд"},"toolbar":{"toolbarCollapse":"Склопи алатну траку","toolbarExpand":"Прошири алатну траку","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"Едитор алатне траке"},"undo":{"redo":"Понови акцију","undo":"Поништи акцију"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/sv.js b/plugins/ckeditor/src/lang/sv.js
deleted file mode 100644
index 0d0ea12c8..000000000
--- a/plugins/ckeditor/src/lang/sv.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['sv']={"editor":"Rich Text-editor","editorPanel":"Panel till Rich Text-editor","common":{"editorHelp":"Tryck ALT 0 för hjälp","browseServer":"Bläddra på server","url":"URL","protocol":"Protokoll","upload":"Ladda upp","uploadSubmit":"Skicka till server","image":"Bild","flash":"Flash","form":"Formulär","checkbox":"Kryssruta","radio":"Alternativknapp","textField":"Textfält","textarea":"Textruta","hiddenField":"Dolt fält","button":"Knapp","select":"Flervalslista","imageButton":"Bildknapp","notSet":"<ej angivet>","id":"Id","name":"Namn","langDir":"Språkriktning","langDirLtr":"Vänster till Höger (VTH)","langDirRtl":"Höger till Vänster (HTV)","langCode":"Språkkod","longDescr":"URL-beskrivning","cssClass":"Stilmall","advisoryTitle":"Titel","cssStyle":"Stilmall","ok":"OK","cancel":"Avbryt","close":"Stäng","preview":"Förhandsgranska","resize":"Dra för att ändra storlek","generalTab":"Allmänt","advancedTab":"Avancerad","validateNumberFailed":"Värdet är inte ett nummer.","confirmNewPage":"Alla ändringar i innehållet kommer att förloras. Är du säker på att du vill ladda en ny sida?","confirmCancel":"Några av alternativen har ändrats. Är du säker på att du vill stänga dialogrutan?","options":"Alternativ","target":"Mål","targetNew":"Nytt fönster (_blank)","targetTop":"Översta fönstret (_top)","targetSelf":"Samma fönster (_self)","targetParent":"Föregående fönster (_parent)","langDirLTR":"Vänster till höger (LTR)","langDirRTL":"Höger till vänster (RTL)","styles":"Stil","cssClasses":"Stilmallar","width":"Bredd","height":"Höjd","align":"Justering","alignLeft":"Vänster","alignRight":"Höger","alignCenter":"Centrerad","alignJustify":"Justera till marginaler","alignTop":"Överkant","alignMiddle":"Mitten","alignBottom":"Nederkant","alignNone":"Ingen","invalidValue":"Felaktigt värde.","invalidHeight":"Höjd måste vara ett nummer.","invalidWidth":"Bredd måste vara ett nummer.","invalidCssLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan CSS-mätenheter (px, %, in, cm, mm, em, ex, pt, eller pc).","invalidHtmlLength":"Värdet för fältet \"%1\" måste vara ett positivt nummer med eller utan godkända HTML-mätenheter (px eller %).","invalidInlineStyle":"Det angivna värdet för style måste innehålla en eller flera tupler separerade med semikolon i följande format: \"name : value\"","cssLengthTooltip":"Ange ett nummer i pixlar eller ett nummer men godkänd CSS-mätenhet (px, %, in, cm, mm, em, ex, pt, eller pc).","unavailable":"%1<span class=\"cke_accessibility\">, Ej tillgänglig</span>","keyboard":{"8":"Backsteg","13":"Retur","16":"Skift","17":"Ctrl","18":"Alt","32":"Mellanslag","35":"Slut","36":"Hem","46":"Radera","224":"Kommando"},"keyboardShortcut":"Kortkommando"},"about":{"copy":"Copyright &copy; $1. Alla rättigheter reserverade.","dlgTitle":"Om CKEditor","help":"Se $1 för hjälp.","moreInfo":"För information om licensiering besök vår hemsida:","title":"Om CKEditor","userGuide":"CKEditor användarmanual"},"clipboard":{"copy":"Kopiera","copyError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden kopiera. Använd (Ctrl/Cmd+C) istället.","cut":"Klipp ut","cutError":"Säkerhetsinställningar i Er webbläsare tillåter inte åtgärden klipp ut. Använd (Ctrl/Cmd+X) istället.","paste":"Klistra in","pasteArea":"Paste Area","pasteMsg":"Var god och klistra in Er text i rutan nedan genom att använda (<strong>Ctrl/Cmd+V</strong>) klicka sen på OK.","securityMsg":"På grund av din webbläsares säkerhetsinställningar kan verktyget inte få åtkomst till urklippsdatan. Var god och använd detta fönster istället.","title":"Klistra in"},"base64image":{"alt":"Alternativ text","lockRatio":"Lås höjd/bredd förhållanden","vSpace":"Vert. marginal","hSpace":"Horis. marginal","border":"Kant"},"basicstyles":{"bold":"Fet","italic":"Kursiv","strike":"Genomstruken","subscript":"Nedsänkta tecken","superscript":"Upphöjda tecken","underline":"Understruken"},"bidi":{"ltr":"Text riktning från vänster till höger","rtl":"Text riktning från höger till vänster"},"blockquote":{"toolbar":"Blockcitat"},"button":{"selectedLabel":"%1 (Vald)"},"colorbutton":{"auto":"Automatisk","bgColorTitle":"Bakgrundsfärg","colors":{"000":"Svart","800000":"Rödbrun","8B4513":"Mörkbrun","2F4F4F":"Skiffergrå","008080":"Kricka","000080":"Marinblå","4B0082":"Indigo","696969":"Mörkgrå","B22222":"Tegelsten","A52A2A":"Brun","DAA520":"Mörk guld","006400":"Mörkgrön","40E0D0":"Turkos","0000CD":"Medium blå","800080":"Lila","808080":"Grå","F00":"Röd","FF8C00":"Mörkorange","FFD700":"Guld","008000":"Grön","0FF":"Turkos","00F":"Blå","EE82EE":"Violett","A9A9A9":"Matt grå","FFA07A":"Laxrosa","FFA500":"Orange","FFFF00":"Gul","00FF00":"Lime","AFEEEE":"Ljusturkos","ADD8E6":"Ljusblå","DDA0DD":"Plommon","D3D3D3":"Ljusgrå","FFF0F5":"Ljus lavendel","FAEBD7":"Antikvit","FFFFE0":"Ljusgul","F0FFF0":"Honungsdagg","F0FFFF":"Azurblå","F0F8FF":"Aliceblå","E6E6FA":"Lavendel","FFF":"Vit","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Fler färger...","panelTitle":"Färger","textColorTitle":"Textfärg"},"font":{"fontSize":{"label":"Storlek","voiceLabel":"Teckenstorlek","panelTitle":"Teckenstorlek"},"label":"Typsnitt","panelTitle":"Typsnitt","voiceLabel":"Typsnitt"},"image":{"alt":"Alternativ text","border":"Kant","btnUpload":"Skicka till server","button2Img":"Vill du omvandla den valda bildknappen på en enkel bild?","hSpace":"Horis. marginal","img2Button":"Vill du omvandla den valda bildknappen på en enkel bild?","infoTab":"Bildinformation","linkTab":"Länk","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","resetSize":"�
-terställ storlek","title":"Bildegenskaper","titleButton":"Egenskaper för bildknapp","upload":"Ladda upp","urlMissing":"Bildkällans URL saknas.","vSpace":"Vert. marginal","validateBorder":"Kantlinje måste vara ett heltal.","validateHSpace":"HSpace måste vara ett heltal.","validateVSpace":"VSpace måste vara ett heltal."},"widget":{"move":"Klicka och drag för att flytta","label":"%1-widget"},"image2":{"alt":"Alternativ text","btnUpload":"Skicka till server","captioned":"Rubricerad bild","captionPlaceholder":"Bildtext","infoTab":"Bildinformation","lockRatio":"Lås höjd/bredd förhållanden","menu":"Bildegenskaper","pathName":"bild","pathNameCaption":"rubrik","resetSize":"�
-terställ storlek","resizer":"Klicka och drag för att ändra storlek","title":"Bildegenskaper","uploadTab":"Ladda upp","urlMissing":"Bildkällans URL saknas.","altMissing":"Alternativ text saknas"},"indent":{"indent":"Öka indrag","outdent":"Minska indrag"},"fakeobjects":{"anchor":"Ankare","flash":"Flashanimation","hiddenfield":"Gömt fält","iframe":"iFrame","unknown":"Okänt objekt"},"link":{"acccessKey":"Behörighetsnyckel","advanced":"Avancerad","advisoryContentType":"Innehållstyp","advisoryTitle":"Titel","anchor":{"toolbar":"Infoga/Redigera ankarlänk","menu":"Egenskaper för ankarlänk","title":"Egenskaper för ankarlänk","name":"Ankarnamn","errorName":"Var god ange ett ankarnamn","remove":"Radera ankare"},"anchorId":"Efter element-id","anchorName":"Efter ankarnamn","charset":"Teckenuppställning","cssClasses":"Stilmall","download":"Tvinga nerladdning","displayText":"Visningstext","emailAddress":"E-postadress","emailBody":"Innehåll","emailSubject":"Ämne","id":"Id","info":"Länkinformation","langCode":"Språkkod","langDir":"Språkriktning","langDirLTR":"Vänster till höger (VTH)","langDirRTL":"Höger till vänster (HTV)","menu":"Redigera länk","name":"Namn","noAnchors":"(Inga ankare kunde hittas)","noEmail":"Var god ange e-postadress","noUrl":"Var god ange länkens URL","other":"<annan>","popupDependent":"Beroende (endast Netscape)","popupFeatures":"Popup-fönstrets egenskaper","popupFullScreen":"Helskärm (endast IE)","popupLeft":"Position från vänster","popupLocationBar":"Adressfält","popupMenuBar":"Menyfält","popupResizable":"Skalbart","popupScrollBars":"Scrolllista","popupStatusBar":"Statusfält","popupToolbar":"Verktygsfält","popupTop":"Position från sidans topp","rel":"Förhållande","selectAnchor":"Välj ett ankare","styles":"Stilmall","tabIndex":"Tabindex","target":"Mål","targetFrame":"<ram>","targetFrameName":"Målets ramnamn","targetPopup":"<popup-fönster>","targetPopupName":"Popup-fönstrets namn","title":"Länk","toAnchor":"Länk till ankare i texten","toEmail":"E-post","toUrl":"URL","toolbar":"Infoga/Redigera länk","type":"Länktyp","unlink":"Radera länk","upload":"Ladda upp"},"list":{"bulletedlist":"Infoga/ta bort punktlista","numberedlist":"Infoga/ta bort numrerad lista"},"maximize":{"maximize":"Maximera","minimize":"Minimera"},"table":{"border":"Kantstorlek","caption":"Rubrik","cell":{"menu":"Cell","insertBefore":"Lägg till cell före","insertAfter":"Lägg till cell efter","deleteCell":"Radera celler","merge":"Sammanfoga celler","mergeRight":"Sammanfoga höger","mergeDown":"Sammanfoga ner","splitHorizontal":"Dela cell horisontellt","splitVertical":"Dela cell vertikalt","title":"Egenskaper för cell","cellType":"Celltyp","rowSpan":"Rad spann","colSpan":"Kolumnen spann","wordWrap":"Radbrytning","hAlign":"Horisontell justering","vAlign":"Vertikal justering","alignBaseline":"Baslinje","bgColor":"Bakgrundsfärg","borderColor":"Ramfärg","data":"Data","header":"Rubrik","yes":"Ja","no":"Nej","invalidWidth":"Cellens bredd måste vara ett nummer.","invalidHeight":"Cellens höjd måste vara ett nummer.","invalidRowSpan":"Radutvidgning måste vara ett heltal.","invalidColSpan":"Kolumn måste vara ett heltal.","chooseColor":"Välj"},"cellPad":"Cellutfyllnad","cellSpace":"Cellavstånd","column":{"menu":"Kolumn","insertBefore":"Lägg till kolumn före","insertAfter":"Lägg till kolumn efter","deleteColumn":"Radera kolumn"},"columns":"Kolumner","deleteTable":"Radera tabell","headers":"Rubriker","headersBoth":"Båda","headersColumn":"Första kolumnen","headersNone":"Ingen","headersRow":"Första raden","invalidBorder":"Ram måste vara ett nummer.","invalidCellPadding":"Luft i cell måste vara ett nummer.","invalidCellSpacing":"Luft i cell måste vara ett nummer.","invalidCols":"Antal kolumner måste vara ett nummer större än 0.","invalidHeight":"Tabellens höjd måste vara ett nummer.","invalidRows":"Antal rader måste vara större än 0.","invalidWidth":"Tabell måste vara ett nummer.","menu":"Tabellegenskaper","row":{"menu":"Rad","insertBefore":"Lägg till rad före","insertAfter":"Lägg till rad efter","deleteRow":"Radera rad"},"rows":"Rader","summary":"Sammanfattning","title":"Tabellegenskaper","toolbar":"Tabell","widthPc":"procent","widthPx":"pixlar","widthUnit":"enhet bredd"},"quicktable":{"more":"Fler..."},"removeformat":{"toolbar":"Radera formatering"},"sourcearea":{"toolbar":"Källa"},"toolbar":{"toolbarCollapse":"Dölj verktygsfält","toolbarExpand":"Visa verktygsfält","toolbarGroups":{"document":"Dokument","clipboard":"Urklipp/ångra","editing":"Redigering","forms":"Formulär","basicstyles":"Basstilar","paragraph":"Paragraf","links":"Länkar","insert":"Infoga","styles":"Stilar","colors":"Färger","tools":"Verktyg"},"toolbars":"Editorns verktygsfält"},"undo":{"redo":"Gör om","undo":"�
-ngra"},"colordialog":{"clear":"Rensa","highlight":"Markera","options":"Färgalternativ","selected":"Vald färg","title":"Välj färg"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/th.js b/plugins/ckeditor/src/lang/th.js
deleted file mode 100644
index b25645e3b..000000000
--- a/plugins/ckeditor/src/lang/th.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['th']={"editor":"Rich Text Editor","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"กด ALT 0 หากต้องการความช่วยเหลือ","browseServer":"เปิดหน้าต่างจัดการไฟล์อัพโหลด","url":"ที่อยู่อ้างอิง URL","protocol":"โปรโตคอล","upload":"อัพโหลดไฟล์","uploadSubmit":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","image":"รูปภาพ","flash":"ไฟล์ Flash","form":"แบบฟอร์ม","checkbox":"เช็คบ๊อก","radio":"เรดิโอบัตตอน","textField":"เท็กซ์ฟิลด์","textarea":"เท็กซ์แอเรีย","hiddenField":"ฮิดเดนฟิลด์","button":"ปุ่ม","select":"แถบตัวเลือก","imageButton":"ปุ่มแบบรูปภาพ","notSet":"<ไม่ระบุ>","id":"ไอดี","name":"ชื่อ","langDir":"การเขียน-อ่านภาษา","langDirLtr":"จากซ้ายไปขวา (LTR)","langDirRtl":"จากขวามาซ้าย (RTL)","langCode":"รหัสภาษา","longDescr":"คำอธิบายประกอบ URL","cssClass":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","advisoryTitle":"คำเกริ่นนำ","cssStyle":"ลักษณะการแสดงผล","ok":"ตกลง","cancel":"ยกเลิก","close":"ปิด","preview":"ดูหน้าเอกสารตัวอย่าง","resize":"ปรับขนาด","generalTab":"ทั่วไป","advancedTab":"ขั้นสูง","validateNumberFailed":"ค่านี้ไม่ใช่ตัวเลข","confirmNewPage":"การเปลี่ยนแปลงใดๆ ในเนื้อหานี้ ที่ไม่ได้ถูกบันทึกไว้ จะสูญหายทั้งหมด คุณแน่ใจว่าจะเรียกหน้าใหม่?","confirmCancel":"ตัวเลือกบางตัวมีการเปลี่ยนแปลง คุณแน่ใจว่าจะปิดกล่องโต้ตอบนี้?","options":"ตัวเลือก","target":"การเปิดหน้าลิงค์","targetNew":"หน้าต่างใหม่ (_blank)","targetTop":"Topmost Window (_top)","targetSelf":"หน้าต่างเดียวกัน (_self)","targetParent":"Parent Window (_parent)","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","styles":"ลักษณะการแสดงผล","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","width":"ความกว้าง","height":"ความสูง","align":"การจัดวาง","alignLeft":"ชิดซ้าย","alignRight":"ชิดขวา","alignCenter":"กึ่งกลาง","alignJustify":"நியாயப்படுத்தவும்","alignTop":"บนสุด","alignMiddle":"กึ่งกลางแนวตั้ง","alignBottom":"ชิดด้านล่าง","alignNone":"None","invalidValue":"ค่าไม่ถูกต้อง","invalidHeight":"ความสูงต้องเป็นตัวเลข","invalidWidth":"ความกว้างต้องเป็นตัวเลข","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Delete","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"About CKEditor","help":"Check $1 for help.","moreInfo":"For licensing information please visit our web site:","title":"About CKEditor","userGuide":"CKEditor User's Guide"},"clipboard":{"copy":"สำเนา","copyError":"ไม่สามารถสำเนาข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว C พร้อมกัน).","cut":"ตัด","cutError":"ไม่สามารถตัดข้อความที่เลือกไว้ได้เนื่องจากการกำหนดค่าระดับความปลอดภัย. กรุณาใช้ปุ่มลัดเพื่อวางข้อความแทน (กดปุ่ม Ctrl/Cmd และตัว X พร้อมกัน).","paste":"วาง","pasteArea":"Paste Area","pasteMsg":"กรุณาใช้คีย์บอร์ดเท่านั้น โดยกดปุ๋ม (<strong>Ctrl/Cmd และ V</strong>)พร้อมๆกัน และกด <strong>OK</strong>.","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"วาง"},"base64image":{"alt":"คำประกอบรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","vSpace":"ระยะแนวตั้ง","hSpace":"ระยะแนวนอน","border":"ขนาดขอบรูป"},"basicstyles":{"bold":"ตัวหนา","italic":"ตัวเอียง","strike":"ตัวขีดเส้นทับ","subscript":"ตัวห้อย","superscript":"ตัวยก","underline":"ตัวขีดเส้นใต้"},"bidi":{"ltr":"Text direction from left to right","rtl":"Text direction from right to left"},"blockquote":{"toolbar":"Block Quote"},"button":{"selectedLabel":"%1 (Selected)"},"colorbutton":{"auto":"สีอัตโนมัติ","bgColorTitle":"สีพื้นหลัง","colors":{"000":"Black","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Brown","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Gray","F00":"Red","FF8C00":"Dark Orange","FFD700":"Gold","008000":"Green","0FF":"Cyan","00F":"Blue","EE82EE":"Violet","A9A9A9":"Dim Gray","FFA07A":"Light Salmon","FFA500":"Orange","FFFF00":"Yellow","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"White","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"เลือกสีอื่นๆ...","panelTitle":"Colors","textColorTitle":"สีตัวอักษร"},"font":{"fontSize":{"label":"ขนาด","voiceLabel":"Font Size","panelTitle":"ขนาด"},"label":"แบบอักษร","panelTitle":"แบบอักษร","voiceLabel":"แบบอักษร"},"image":{"alt":"คำประกอบรูปภาพ","border":"ขนาดขอบรูป","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"ระยะแนวนอน","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"ข้อมูลของรูปภาพ","linkTab":"ลิ้งค์","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","resetSize":"กำหนดรูปเท่าขนาดจริง","title":"คุณสมบัติของ รูปภาพ","titleButton":"คุณสมบัติของ ปุ่มแบบรูปภาพ","upload":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","vSpace":"ระยะแนวตั้ง","validateBorder":"Border must be a whole number.","validateHSpace":"HSpace must be a whole number.","validateVSpace":"VSpace must be a whole number."},"widget":{"move":"Click and drag to move","label":"%1 widget"},"image2":{"alt":"คำประกอบรูปภาพ","btnUpload":"อัพโหลดไฟล์ไปเก็บไว้ที่เครื่องแม่ข่าย (เซิร์ฟเวอร์)","captioned":"Captioned image","captionPlaceholder":"Caption","infoTab":"ข้อมูลของรูปภาพ","lockRatio":"กำหนดอัตราส่วน กว้าง-สูง แบบคงที่","menu":"คุณสมบัติของ รูปภาพ","pathName":"image","pathNameCaption":"caption","resetSize":"กำหนดรูปเท่าขนาดจริง","resizer":"Click and drag to resize","title":"คุณสมบัติของ รูปภาพ","uploadTab":"อัพโหลดไฟล์","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"เพิ่มระยะย่อหน้า","outdent":"ลดระยะย่อหน้า"},"fakeobjects":{"anchor":"แทรก/แก้ไข Anchor","flash":"ภาพอนิเมชั่นแฟลช","hiddenfield":"ฮิดเดนฟิลด์","iframe":"IFrame","unknown":"วัตถุไม่ทราบชนิด"},"link":{"acccessKey":"แอคเซส คีย์","advanced":"ขั้นสูง","advisoryContentType":"ชนิดของคำเกริ่นนำ","advisoryTitle":"คำเกริ่นนำ","anchor":{"toolbar":"แทรก/แก้ไข Anchor","menu":"รายละเอียด Anchor","title":"รายละเอียด Anchor","name":"ชื่อ Anchor","errorName":"กรุณาระบุชื่อของ Anchor","remove":"Remove Anchor"},"anchorId":"ไอดี","anchorName":"ชื่อ","charset":"ลิงค์เชื่อมโยงไปยังชุดตัวอักษร","cssClasses":"คลาสของไฟล์กำหนดลักษณะการแสดงผล","download":"Force Download","displayText":"Display Text","emailAddress":"อีเมล์ (E-Mail)","emailBody":"ข้อความ","emailSubject":"หัวเรื่อง","id":"ไอดี","info":"รายละเอียด","langCode":"การเขียน-อ่านภาษา","langDir":"การเขียน-อ่านภาษา","langDirLTR":"จากซ้ายไปขวา (LTR)","langDirRTL":"จากขวามาซ้าย (RTL)","menu":"แก้ไข ลิงค์","name":"ชื่อ","noAnchors":"(ยังไม่มีจุดเชื่อมโยงภายในหน้าเอกสารนี้)","noEmail":"กรุณาระบุอีเมล์ (E-mail)","noUrl":"กรุณาระบุที่อยู่อ้างอิงออนไลน์ (URL)","other":"<อื่น ๆ>","popupDependent":"แสดงเต็มหน้าจอ (Netscape)","popupFeatures":"คุณสมบัติของหน้าจอเล็ก (Pop-up)","popupFullScreen":"แสดงเต็มหน้าจอ (IE5.5++ เท่านั้น)","popupLeft":"พิกัดซ้าย (Left Position)","popupLocationBar":"แสดงที่อยู่ของไฟล์","popupMenuBar":"แสดงแถบเมนู","popupResizable":"สามารถปรับขนาดได้","popupScrollBars":"แสดงแถบเลื่อน","popupStatusBar":"แสดงแถบสถานะ","popupToolbar":"แสดงแถบเครื่องมือ","popupTop":"พิกัดบน (Top Position)","rel":"ความสัมพันธ์","selectAnchor":"ระบุข้อมูลของจุดเชื่อมโยง (Anchor)","styles":"ลักษณะการแสดงผล","tabIndex":"ลำดับของ แท็บ","target":"การเปิดหน้าลิงค์","targetFrame":"<เปิดในเฟรม>","targetFrameName":"ชื่อทาร์เก็ตเฟรม","targetPopup":"<เปิดหน้าจอเล็ก (Pop-up)>","targetPopupName":"ระบุชื่อหน้าจอเล็ก (Pop-up)","title":"ลิงค์เชื่อมโยงเว็บ อีเมล์ รูปภาพ หรือไฟล์อื่นๆ","toAnchor":"จุดเชื่อมโยง (Anchor)","toEmail":"ส่งอีเมล์ (E-Mail)","toUrl":"ที่อยู่อ้างอิง URL","toolbar":"แทรก/แก้ไข ลิงค์","type":"ประเภทของลิงค์","unlink":"ลบ ลิงค์","upload":"อัพโหลดไฟล์"},"list":{"bulletedlist":"ลำดับรายการแบบสัญลักษณ์","numberedlist":"ลำดับรายการแบบตัวเลข"},"maximize":{"maximize":"ขยายใหญ่","minimize":"ย่อขนาด"},"table":{"border":"ขนาดเส้นขอบ","caption":"หัวเรื่องของตาราง","cell":{"menu":"ช่องตาราง","insertBefore":"Insert Cell Before","insertAfter":"Insert Cell After","deleteCell":"ลบช่อง","merge":"ผสานช่อง","mergeRight":"Merge Right","mergeDown":"Merge Down","splitHorizontal":"Split Cell Horizontally","splitVertical":"Split Cell Vertically","title":"Cell Properties","cellType":"Cell Type","rowSpan":"Rows Span","colSpan":"Columns Span","wordWrap":"Word Wrap","hAlign":"Horizontal Alignment","vAlign":"Vertical Alignment","alignBaseline":"Baseline","bgColor":"Background Color","borderColor":"Border Color","data":"Data","header":"Header","yes":"Yes","no":"No","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Choose"},"cellPad":"ระยะแนวตั้ง","cellSpace":"ระยะแนวนอนน","column":{"menu":"คอลัมน์","insertBefore":"Insert Column Before","insertAfter":"Insert Column After","deleteColumn":"ลบสดมน์"},"columns":"สดมน์","deleteTable":"ลบตาราง","headers":"ส่วนหัว","headersBoth":"ทั้งสองอย่าง","headersColumn":"คอลัมน์แรก","headersNone":"None","headersRow":"แถวแรก","invalidBorder":"ขนาดเส้นกรอบต้องเป็นจำนวนตัวเลข","invalidCellPadding":"ช่องว่างภายในเซลล์ต้องเลขจำนวนบวก","invalidCellSpacing":"ช่องว่างภายในเซลล์ต้องเป็นเลขจำนวนบวก","invalidCols":"จำนวนคอลัมน์ต้องเป็นจำนวนมากกว่า 0","invalidHeight":"ส่วนสูงของตารางต้องเป็นตัวเลข","invalidRows":"จำนวนของแถวต้องเป็นจำนวนมากกว่า 0","invalidWidth":"ความกว้างตารางต้องเป็นตัวเลข","menu":"คุณสมบัติของ ตาราง","row":{"menu":"แถว","insertBefore":"Insert Row Before","insertAfter":"Insert Row After","deleteRow":"ลบแถว"},"rows":"แถว","summary":"สรุปความ","title":"คุณสมบัติของ ตาราง","toolbar":"ตาราง","widthPc":"เปอร์เซ็น","widthPx":"จุดสี","widthUnit":"หน่วยความกว้าง"},"quicktable":{"more":" เลือกอื่นๆ..."},"removeformat":{"toolbar":"ล้างรูปแบบ"},"sourcearea":{"toolbar":"ดูรหัส HTML"},"toolbar":{"toolbarCollapse":"ซ่อนแถบเครื่องมือ","toolbarExpand":"เปิดแถบเครื่องมือ","toolbarGroups":{"document":"Document","clipboard":"Clipboard/Undo","editing":"Editing","forms":"Forms","basicstyles":"Basic Styles","paragraph":"Paragraph","links":"Links","insert":"Insert","styles":"Styles","colors":"Colors","tools":"Tools"},"toolbars":"แถบเครื่องมือช่วยพิมพ์ข้อความ"},"undo":{"redo":"ทำซ้ำคำสั่ง","undo":"ยกเลิกคำสั่ง"},"colordialog":{"clear":"Clear","highlight":"Highlight","options":"Color Options","selected":"Selected Color","title":"Select color"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/tr.js b/plugins/ckeditor/src/lang/tr.js
deleted file mode 100644
index 7b660da95..000000000
--- a/plugins/ckeditor/src/lang/tr.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['tr']={"editor":"Zengin Metin Editörü","editorPanel":"Zengin Metin Editör Paneli","common":{"editorHelp":"Yardım için ALT 0 tuşlarına basın","browseServer":"Sunucuya Gözat","url":"URL","protocol":"Protokol","upload":"Karşıya Yükle","uploadSubmit":"Sunucuya Gönder","image":"Resim","flash":"Flash","form":"Form","checkbox":"Onay Kutusu","radio":"Seçenek Düğmesi","textField":"Metin Kutusu","textarea":"Metin Alanı","hiddenField":"Gizli Alan","button":"Düğme","select":"Seçme Alanı","imageButton":"Resim Düğmesi","notSet":"<tanımlanmamış>","id":"Kimlik","name":"İsim","langDir":"Dil Yönü","langDirLtr":"Soldan Sağa (LTR)","langDirRtl":"Sağdan Sola (RTL)","langCode":"Dil Kodlaması","longDescr":"Uzun Tanımlı URL","cssClass":"Biçem Sayfası Sınıfları","advisoryTitle":"Öneri Başlığı","cssStyle":"Biçem","ok":"Tamam","cancel":"İptal","close":"Kapat","preview":"Önizleme","resize":"Yeniden Boyutlandır","generalTab":"Genel","advancedTab":"Gelişmiş","validateNumberFailed":"Bu değer bir sayı değildir.","confirmNewPage":"Bu içerikle ilgili kaydedilmemiş tüm bilgiler kaybolacaktır. Yeni bir sayfa yüklemek istediğinizden emin misiniz?","confirmCancel":"Bazı seçenekleri değiştirdiniz. İletişim penceresini kapatmak istediğinizden emin misiniz?","options":"Seçenekler","target":"Hedef","targetNew":"Yeni Pencere (_blank)","targetTop":"En Üstteki Pencere (_top)","targetSelf":"Aynı Pencere (_self)","targetParent":"Üst Pencere (_parent)","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","styles":"Biçem","cssClasses":"Biçem Sayfası Sınıfları","width":"Genişlik","height":"Yükseklik","align":"Hizalama","alignLeft":"Sol","alignRight":"Sağ","alignCenter":"Ortala","alignJustify":"İki Kenara Yaslanmış","alignTop":"Üst","alignMiddle":"Orta","alignBottom":"Alt","alignNone":"Hiçbiri","invalidValue":"Geçersiz değer.","invalidHeight":"Yükseklik değeri bir sayı olmalıdır.","invalidWidth":"Genişlik değeri bir sayı olmalıdır.","invalidCssLength":"\"%1\" alanı için verilen değer, geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt, veya pc) içeren veya içermeyen pozitif bir sayı olmalıdır.","invalidHtmlLength":"Belirttiğiniz sayı \"%1\" alanı için pozitif bir sayı HTML birim değeri olmalıdır (px veya %).","invalidInlineStyle":"Satıriçi biçem için verilen değer, \"isim : değer\" biçiminde birbirinden noktalı virgüllerle ayrılan bir veya daha fazla değişkenler grubundan oluşmalıdır.","cssLengthTooltip":"Piksel türünde bir sayı veya geçerli bir CSS ölçü birimi (px, %, in, cm, mm, em, ex, pt veya pc) içeren bir sayı girin.","unavailable":"%1<span class=\"cke_accessibility\">, kullanılamaz</span>","keyboard":{"8":"Silme Tuşu","13":"Giriş Tuşu","16":"Üst Karater Tuşu","17":"Kontrol Tuşu","18":"Alt Tuşu","32":"Boşluk Tuşu","35":"En Sona Tuşu","36":"En Başa Tuşu","46":"Silme Tuşu","224":"Komut Tuşu"},"keyboardShortcut":"Klavye Kısayolu"},"about":{"copy":"Copyright &copy; $1. Tüm hakları saklıdır.","dlgTitle":"CKEditor Hakkında","help":"Yardım için $1 kontrol edin.","moreInfo":"Lisanslama hakkında daha fazla bilgi almak için lütfen sitemizi ziyaret edin:","title":"CKEditor Hakkında","userGuide":"CKEditor Kullanıcı Kılavuzu"},"clipboard":{"copy":"Kopyala","copyError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kopyalama işlemine izin vermiyor. İşlem için (Ctrl/Cmd+C) tuşlarını kullanın.","cut":"Kes","cutError":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin otomatik kesme işlemine izin vermiyor. İşlem için (Ctrl/Cmd+X) tuşlarını kullanın.","paste":"Yapıştır","pasteArea":"Yapıştırma Alanı","pasteMsg":"Lütfen aşağıdaki kutunun içine yapıştırın. (<STRONG>Ctrl/Cmd+V</STRONG>) ve <STRONG>Tamam</STRONG> butonunu tıklayın.","securityMsg":"Gezgin yazılımınızın güvenlik ayarları düzenleyicinin direkt olarak panoya erişimine izin vermiyor. Bu pencere içine tekrar yapıştırmalısınız..","title":"Yapıştır"},"base64image":{"alt":"Alternatif Yazı","lockRatio":"Oranı Kilitle","vSpace":"Dikey Boşluk","hSpace":"Yatay Boşluk","border":"Kenar"},"basicstyles":{"bold":"Kalın","italic":"İtalik","strike":"Üstü Çizgili","subscript":"Alt Simge","superscript":"Üst Simge","underline":"Altı Çizgili"},"bidi":{"ltr":"Metin yönü soldan sağa","rtl":"Metin yönü sağdan sola"},"blockquote":{"toolbar":"Blok Oluştur"},"button":{"selectedLabel":"%1 (Seçilmiş)"},"colorbutton":{"auto":"Otomatik","bgColorTitle":"Arka Renk","colors":{"000":"Siyah","800000":"Kestane","8B4513":"Koyu Kahverengi","2F4F4F":"Koyu Kurşuni Gri","008080":"Teal","000080":"Mavi","4B0082":"Çivit Mavisi","696969":"Silik Gri","B22222":"Ateş Tuğlası","A52A2A":"Kahverengi","DAA520":"Altun Sırık","006400":"Koyu Yeşil","40E0D0":"Turkuaz","0000CD":"Orta Mavi","800080":"Pembe","808080":"Gri","F00":"Kırmızı","FF8C00":"Koyu Portakal","FFD700":"Altın","008000":"Yeşil","0FF":"Ciyan","00F":"Mavi","EE82EE":"Menekşe","A9A9A9":"Koyu Gri","FFA07A":"Açık Sarımsı","FFA500":"Portakal","FFFF00":"Sarı","00FF00":"Açık Yeşil","AFEEEE":"Sönük Turkuaz","ADD8E6":"Açık Mavi","DDA0DD":"Mor","D3D3D3":"Açık Gri","FFF0F5":"Eflatun Pembe","FAEBD7":"Antik Beyaz","FFFFE0":"Açık Sarı","F0FFF0":"Balsarısı","F0FFFF":"Gök Mavisi","F0F8FF":"Reha Mavi","E6E6FA":"Eflatun","FFF":"Beyaz","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Diğer renkler...","panelTitle":"Renkler","textColorTitle":"Yazı Rengi"},"font":{"fontSize":{"label":"Boyut","voiceLabel":"Font Size","panelTitle":"Boyut"},"label":"Yazı Türü","panelTitle":"Yazı Türü","voiceLabel":"Font"},"image":{"alt":"Alternatif Yazı","border":"Kenar","btnUpload":"Sunucuya Yolla","button2Img":"Seçili resim butonunu basit resime çevirmek istermisiniz?","hSpace":"Yatay Boşluk","img2Button":"Seçili olan resimi, resimli butona çevirmek istermisiniz?","infoTab":"Resim Bilgisi","linkTab":"Köprü","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","resetSize":"Boyutu Başa Döndür","title":"Resim Özellikleri","titleButton":"Resimli Düğme Özellikleri","upload":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı eksiktir.","vSpace":"Dikey Boşluk","validateBorder":"Çerçeve tam sayı olmalıdır.","validateHSpace":"HSpace tam sayı olmalıdır.","validateVSpace":"VSpace tam sayı olmalıdır."},"widget":{"move":"Taşımak için, tıklayın ve sürükleyin","label":"%1 Grafik Beleşeni"},"image2":{"alt":"Alternatif Yazı","btnUpload":"Sunucuya Yolla","captioned":"Başlıklı resim","captionPlaceholder":"Başlık","infoTab":"Resim Bilgisi","lockRatio":"Oranı Kilitle","menu":"Resim Özellikleri","pathName":"Resim","pathNameCaption":"başlık","resetSize":"Boyutu Başa Döndür","resizer":"Boyutlandırmak için, tıklayın ve sürükleyin","title":"Resim Özellikleri","uploadTab":"Karşıya Yükle","urlMissing":"Resmin URL kaynağı bulunamadı.","altMissing":"Alternatif yazı eksik."},"indent":{"indent":"Sekme Arttır","outdent":"Sekme Azalt"},"fakeobjects":{"anchor":"Bağlantı","flash":"Flash Animasyonu","hiddenfield":"Gizli Alan","iframe":"IFrame","unknown":"Bilinmeyen Nesne"},"link":{"acccessKey":"Erişim Tuşu","advanced":"Gelişmiş","advisoryContentType":"Danışma İçerik Türü","advisoryTitle":"Danışma Başlığı","anchor":{"toolbar":"Bağlantı Ekle/Düzenle","menu":"Bağlantı Özellikleri","title":"Bağlantı Özellikleri","name":"Bağlantı Adı","errorName":"Lütfen bağlantı için ad giriniz","remove":"Bağlantıyı Kaldır"},"anchorId":"Eleman Kimlik Numarası ile","anchorName":"Bağlantı Adı ile","charset":"Bağlı Kaynak Karakter Gurubu","cssClasses":"Biçem Sayfası Sınıfları","download":"İndirmeye Zorla","displayText":"Gösterim Metni","emailAddress":"E-Posta Adresi","emailBody":"İleti Gövdesi","emailSubject":"İleti Konusu","id":"Id","info":"Link Bilgisi","langCode":"Dil Yönü","langDir":"Dil Yönü","langDirLTR":"Soldan Sağa (LTR)","langDirRTL":"Sağdan Sola (RTL)","menu":"Link Düzenle","name":"Ad","noAnchors":"(Bu belgede hiç çapa yok)","noEmail":"Lütfen E-posta adresini yazın","noUrl":"Lütfen Link URL'sini yazın","other":"<diğer>","popupDependent":"Bağımlı (Netscape)","popupFeatures":"Yeni Açılan Pencere Özellikleri","popupFullScreen":"Tam Ekran (IE)","popupLeft":"Sola Göre Konum","popupLocationBar":"Yer Çubuğu","popupMenuBar":"Menü Çubuğu","popupResizable":"Resizable","popupScrollBars":"Kaydırma Çubukları","popupStatusBar":"Durum Çubuğu","popupToolbar":"Araç Çubuğu","popupTop":"Yukarıya Göre Konum","rel":"İlişki","selectAnchor":"Bağlantı Seç","styles":"Biçem","tabIndex":"Sekme İndeksi","target":"Hedef","targetFrame":"<çerçeve>","targetFrameName":"Hedef Çerçeve Adı","targetPopup":"<yeni açılan pencere>","targetPopupName":"Yeni Açılan Pencere Adı","title":"Link","toAnchor":"Bu sayfada çapa","toEmail":"E-Posta","toUrl":"URL","toolbar":"Link Ekle/Düzenle","type":"Link Türü","unlink":"Köprü Kaldır","upload":"Karşıya Yükle"},"list":{"bulletedlist":"Simgeli Liste","numberedlist":"Numaralı Liste"},"maximize":{"maximize":"Büyült","minimize":"Küçült"},"table":{"border":"Kenar Kalınlığı","caption":"Başlık","cell":{"menu":"Hücre","insertBefore":"Hücre Ekle - Önce","insertAfter":"Hücre Ekle - Sonra","deleteCell":"Hücre Sil","merge":"Hücreleri Birleştir","mergeRight":"Birleştir - Sağdaki İle ","mergeDown":"Birleştir - Aşağıdaki İle ","splitHorizontal":"Hücreyi Yatay Böl","splitVertical":"Hücreyi Dikey Böl","title":"Hücre Özellikleri","cellType":"Hücre Tipi","rowSpan":"Satırlar Mesafesi (Span)","colSpan":"Sütünlar Mesafesi (Span)","wordWrap":"Kelime Kaydırma","hAlign":"Düşey Hizalama","vAlign":"Yataş Hizalama","alignBaseline":"Tabana","bgColor":"Arkaplan Rengi","borderColor":"Çerçeve Rengi","data":"Veri","header":"Başlık","yes":"Evet","no":"Hayır","invalidWidth":"Hücre genişliği sayı olmalıdır.","invalidHeight":"Hücre yüksekliği sayı olmalıdır.","invalidRowSpan":"Satırların mesafesi tam sayı olmalıdır.","invalidColSpan":"Sütünların mesafesi tam sayı olmalıdır.","chooseColor":"Seçiniz"},"cellPad":"Izgara yazı arası","cellSpace":"Izgara kalınlığı","column":{"menu":"Sütun","insertBefore":"Kolon Ekle - Önce","insertAfter":"Kolon Ekle - Sonra","deleteColumn":"Sütun Sil"},"columns":"Sütunlar","deleteTable":"Tabloyu Sil","headers":"Başlıklar","headersBoth":"Her İkisi","headersColumn":"İlk Sütun","headersNone":"Yok","headersRow":"İlk Satır","invalidBorder":"Çerceve büyüklüklüğü sayı olmalıdır.","invalidCellPadding":"Hücre aralığı (padding) sayı olmalıdır.","invalidCellSpacing":"Hücre boşluğu (spacing) sayı olmalıdır.","invalidCols":"Sütün sayısı 0 sayısından büyük olmalıdır.","invalidHeight":"Tablo yüksekliği sayı olmalıdır.","invalidRows":"Satır sayısı 0 sayısından büyük olmalıdır.","invalidWidth":"Tablo genişliği sayı olmalıdır.","menu":"Tablo Özellikleri","row":{"menu":"Satır","insertBefore":"Satır Ekle - Önce","insertAfter":"Satır Ekle - Sonra","deleteRow":"Satır Sil"},"rows":"Satırlar","summary":"Özet","title":"Tablo Özellikleri","toolbar":"Tablo","widthPc":"yüzde","widthPx":"piksel","widthUnit":"genişlik birimi"},"quicktable":{"more":"Diğer..."},"removeformat":{"toolbar":"Biçimi Kaldır"},"sourcearea":{"toolbar":"Kaynak"},"toolbar":{"toolbarCollapse":"Araç çubuklarını topla","toolbarExpand":"Araç çubuklarını aç","toolbarGroups":{"document":"Belge","clipboard":"Pano/Geri al","editing":"Düzenleme","forms":"Formlar","basicstyles":"Temel Stiller","paragraph":"Paragraf","links":"Bağlantılar","insert":"Ekle","styles":"Stiller","colors":"Renkler","tools":"Araçlar"},"toolbars":"Araç çubukları Editörü"},"undo":{"redo":"Tekrarla","undo":"Geri Al"},"colordialog":{"clear":"Temizle","highlight":"İşaretle","options":"Renk Seçenekleri","selected":"Seçilmiş","title":"Renk seç"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/tt.js b/plugins/ckeditor/src/lang/tt.js
deleted file mode 100644
index 44758ece7..000000000
--- a/plugins/ckeditor/src/lang/tt.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['tt']={"editor":"Форматлаулы текст өлкәсе","editorPanel":"Rich Text Editor panel","common":{"editorHelp":"Ярдәм өчен ALT 0 басыгыз","browseServer":"Сервер карап чыгу","url":"Сылталама","protocol":"Протокол","upload":"Йөкләү","uploadSubmit":"Серверга җибәрү","image":"Рәсем","flash":"Флеш","form":"Форма","checkbox":"Чекбокс","radio":"Радио төймә","textField":"Текст кыры","textarea":"Текст мәйданы","hiddenField":"Яшерен кыр","button":"Төймə","select":"Сайлау кыры","imageButton":"Рәсемле төймə","notSet":"<билгеләнмәгән>","id":"Id","name":"Исем","langDir":"Язылыш юнəлеше","langDirLtr":"Сулдан уңга язылыш (LTR)","langDirRtl":"Уңнан сулга язылыш (RTL)","langCode":"Тел коды","longDescr":"Җентекле тасвирламага сылталама","cssClass":"Стильләр класслары","advisoryTitle":"Киңәш исем","cssStyle":"Стиль","ok":"Тәмам","cancel":"Баш тарту","close":"Чыгу","preview":"Карап алу","resize":"Зурлыкны үзгәртү","generalTab":"Төп","advancedTab":"Киңәйтелгән көйләүләр","validateNumberFailed":"Әлеге кыйммәт сан түгел.","confirmNewPage":"Any unsaved changes to this content will be lost. Are you sure you want to load new page?","confirmCancel":"You have changed some options. Are you sure you want to close the dialog window?","options":"Үзлекләр","target":"Максат","targetNew":"Яңа тәрәзә (_blank)","targetTop":"Өске тәрәзә (_top)","targetSelf":"Шул үк тәрәзә (_self)","targetParent":"Ана тәрәзә (_parent)","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","styles":"Стиль","cssClasses":"Стильләр класслары","width":"Киңлек","height":"Биеклек","align":"Тигезләү","alignLeft":"Сул якка","alignRight":"Уң якка","alignCenter":"Үзәккә","alignJustify":"Киңлеккә карап тигезләү","alignTop":"Өскә","alignMiddle":"Уртага","alignBottom":"Аска","alignNone":"Һичбер","invalidValue":"Дөрес булмаган кыйммәт.","invalidHeight":"Биеклек сан булырга тиеш.","invalidWidth":"Киңлек сан булырга тиеш.","invalidCssLength":"Value specified for the \"%1\" field must be a positive number with or without a valid CSS measurement unit (px, %, in, cm, mm, em, ex, pt, or pc).","invalidHtmlLength":"Value specified for the \"%1\" field must be a positive number with or without a valid HTML measurement unit (px or %).","invalidInlineStyle":"Value specified for the inline style must consist of one or more tuples with the format of \"name : value\", separated by semi-colons.","cssLengthTooltip":"Enter a number for a value in pixels or a number with a valid CSS unit (px, %, in, cm, mm, em, ex, pt, or pc).","unavailable":"%1<span class=\"cke_accessibility\">, unavailable</span>","keyboard":{"8":"Кайтару","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Бетерү","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Бар �
-окуклар сакланган","dlgTitle":"CKEditor турында","help":"Ярдәм өчен $1 тикшереп карагыз.","moreInfo":"For licensing information please visit our web site:","title":"CKEditor турында","userGuide":"CKEditor кулланмасы"},"clipboard":{"copy":"Күчермәләү","copyError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","cut":"Кисеп алу","cutError":"Браузерыгызның иминлек үзлекләре автоматик рәвештә күчермәләү үтәүне тыя. Тиз төймәләрне (Ctrl/Cmd+C) кулланыгыз.","paste":"Өстәү","pasteArea":"Өстәү мәйданы","pasteMsg":"Please paste inside the following box using the keyboard (<strong>Ctrl/Cmd+V</strong>) and hit OK","securityMsg":"Because of your browser security settings, the editor is not able to access your clipboard data directly. You are required to paste it again in this window.","title":"Өстәү"},"base64image":{"alt":"Alternative Text","lockRatio":"Lock Ratio","vSpace":"VSpace","hSpace":"HSpace","border":"Border"},"basicstyles":{"bold":"Калын","italic":"Курсив","strike":"Сызылган","subscript":"Аскы индекс","superscript":"Өске индекс","underline":"Астына сызылган"},"bidi":{"ltr":"Сулдан уңга язылыш","rtl":"Уңнан сулга язылыш"},"blockquote":{"toolbar":"Өземтә блогы"},"button":{"selectedLabel":"%1 (Сайланган)"},"colorbutton":{"auto":"Автоматик","bgColorTitle":"Фон төсе","colors":{"000":"Кара","800000":"Бордо","8B4513":"Дарчин","2F4F4F":"Аспид соры","008080":"Күкле-яшелле","000080":"Куе күк","4B0082":"Индиго","696969":"Куе соры","B22222":"Кармин","A52A2A":"Чия кызыл","DAA520":"Алтын каен","006400":"Үлән","40E0D0":"Фирәзә","0000CD":"Фарсы күк","800080":"Шәмә�
-ә","808080":"Соры","F00":"Кызыл","FF8C00":"Кабак","FFD700":"Алтын","008000":"Яшел","0FF":"Ачык зәңгәр","00F":"Зәңгәр","EE82EE":"Миләүшә","A9A9A9":"Ачык соры","FFA07A":"Кызгылт сары алсу","FFA500":"Кызгылт сары","FFFF00":"Сары","00FF00":"Лайм","AFEEEE":"Тонык күк","ADD8E6":"Тонык күкбаш","DDA0DD":"Аксыл шәмә�
-ә","D3D3D3":"Ачык соры","FFF0F5":"Ал ала миләүшә","FAEBD7":"Җитен","FFFFE0":"Ачык сары","F0FFF0":"Аксыл көрән","F0FFFF":"Ап-ак","F0F8FF":"Аксыл зәңгәр диңгез","E6E6FA":"Ала миләүшә","FFF":"Ак","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Башка төсләр...","panelTitle":"Төсләр","textColorTitle":"Текст төсе"},"font":{"fontSize":{"label":"Зурлык","voiceLabel":"Шрифт зурлыклары","panelTitle":"Шрифт зурлыклары"},"label":"Шрифт","panelTitle":"Шрифт исеме","voiceLabel":"Шрифт"},"image":{"alt":"Альтернатив текст","border":"Чик","btnUpload":"Серверга җибәрү","button2Img":"Do you want to transform the selected image button on a simple image?","hSpace":"Горизонталь ара","img2Button":"Do you want to transform the selected image on a image button?","infoTab":"Рәсем тасвирламасы","linkTab":"Сылталама","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","resetSize":"Баштагы зурлык","title":"Рәсем үзлекләре","titleButton":"Рәсемле төймə үзлекләре","upload":"Йөкләү","urlMissing":"Image source URL is missing.","vSpace":"Вертикаль ара","validateBorder":"Чик киңлеге сан булырга тиеш.","validateHSpace":"Горизонталь ара бөтен сан булырга тиеш.","validateVSpace":"Вертикаль ара бөтен сан булырга тиеш."},"widget":{"move":"Күчереп куер өчен басып шудырыгыз","label":"%1 widget"},"image2":{"alt":"Альтернатив текст","btnUpload":"Серверга җибәрү","captioned":"Исеме куелган рәсем","captionPlaceholder":"Исем","infoTab":"Рәсем тасвирламасы","lockRatio":"Lock Ratio","menu":"Рәсем үзлекләре","pathName":"рәсем","pathNameCaption":"исем","resetSize":"Баштагы зурлык","resizer":"Күчереп куер өчен басып шудырыгыз","title":"Рәсем үзлекләре","uploadTab":"Йөкләү","urlMissing":"Image source URL is missing.","altMissing":"Alternative text is missing."},"indent":{"indent":"Отступны арттыру","outdent":"Отступны кечерәйтү"},"fakeobjects":{"anchor":"Якорь","flash":"Флеш анимациясы","hiddenfield":"Яшерен кыр","iframe":"IFrame","unknown":"Танылмаган объект"},"link":{"acccessKey":"Access Key","advanced":"Киңәйтелгән көйләүләр","advisoryContentType":"Advisory Content Type","advisoryTitle":"Киңәш исем","anchor":{"toolbar":"Якорь","menu":"Якорьне үзгәртү","title":"Якорь үзлекләре","name":"Якорь исеме","errorName":"Якорьнең исемен языгыз","remove":"Якорьне бетерү"},"anchorId":"Элемент идентификаторы буенча","anchorName":"Якорь исеме буенча","charset":"Linked Resource Charset","cssClasses":"Стильләр класслары","download":"Force Download","displayText":"Display Text","emailAddress":"Электрон почта адресы","emailBody":"Хат эчтәлеге","emailSubject":"Хат темасы","id":"Идентификатор","info":"Сылталама тасвирламасы","langCode":"Тел коды","langDir":"Язылыш юнəлеше","langDirLTR":"Сулдан уңга язылыш (LTR)","langDirRTL":"Уңнан сулга язылыш (RTL)","menu":"Сылталамаyны үзгәртү","name":"Исем","noAnchors":"(Әлеге документта якорьләр табылмады)","noEmail":"Электрон почта адресын языгыз","noUrl":"Сылталаманы языгыз","other":"<бүтән>","popupDependent":"Бәйле (Netscape)","popupFeatures":"Popup Window Features","popupFullScreen":"Тулы экран (IE)","popupLeft":"Left Position","popupLocationBar":"Location Bar","popupMenuBar":"Menu Bar","popupResizable":"Resizable","popupScrollBars":"Scroll Bars","popupStatusBar":"Status Bar","popupToolbar":"Toolbar","popupTop":"Top Position","rel":"Бәйләнеш","selectAnchor":"Якорьне сайлау","styles":"Стиль","tabIndex":"Tab Index","target":"Максат","targetFrame":"<frame>","targetFrameName":"Target Frame Name","targetPopup":"<popup window>","targetPopupName":"Попап тәрәзәсе исеме","title":"Сылталама","toAnchor":"Якорьне текст белән бәйләү","toEmail":"Электрон почта","toUrl":"Сылталама","toolbar":"Сылталама","type":"Сылталама төре","unlink":"Сылталаманы бетерү","upload":"Йөкләү"},"list":{"bulletedlist":"Маркерлы тезмә өстәү/бетерү","numberedlist":" Номерланган тезмә өстәү/бетерү"},"maximize":{"maximize":"Зурайту","minimize":"Кечерәйтү"},"table":{"border":"Чик калынлыгы","caption":"Исем","cell":{"menu":"Күзәнәк","insertBefore":"Алдына күзәнәк өстәү","insertAfter":"Артына күзәнәк өстәү","deleteCell":"Күзәнәкләрне бетерү","merge":"Күзәнәкләрне берләштерү","mergeRight":"Уң яктагы белән берләштерү","mergeDown":"Астагы белән берләштерү","splitHorizontal":"Күзәнәкне юлларга бүлү","splitVertical":"Күзәнәкне баганаларга бүлү","title":"Күзәнәк үзлекләре","cellType":"Күзәнәк төре","rowSpan":"Юлларны берләштерү","colSpan":"Баганаларны берләштерү","wordWrap":"Текстны күчерү","hAlign":"Ятма тигезләү","vAlign":"Асма тигезләү","alignBaseline":"Таяныч сызыгы","bgColor":"Фон төсе","borderColor":"Чик төсе","data":"Мәгълүмат","header":"Башлык","yes":"Әйе","no":"Юк","invalidWidth":"Cell width must be a number.","invalidHeight":"Cell height must be a number.","invalidRowSpan":"Rows span must be a whole number.","invalidColSpan":"Columns span must be a whole number.","chooseColor":"Сайлау"},"cellPad":"Cell padding","cellSpace":"Cell spacing","column":{"menu":"Багана","insertBefore":"Сулдан баганалар өстәү","insertAfter":"Уңнан баганалар өстәү","deleteColumn":"Баганаларны бетерү"},"columns":"Баганалар","deleteTable":"Таблицаны бетерү","headers":"Башлыклар","headersBoth":"Икесе дә","headersColumn":"Беренче багана","headersNone":"Һичбер","headersRow":"Беренче юл","invalidBorder":"Чик киңлеге сан булырга тиеш.","invalidCellPadding":"Cell padding must be a positive number.","invalidCellSpacing":"Күзәнәкләр аралары уңай сан булырга тиеш.","invalidCols":"Number of columns must be a number greater than 0.","invalidHeight":"Таблица биеклеге сан булырга тиеш.","invalidRows":"Number of rows must be a number greater than 0.","invalidWidth":"Таблица киңлеге сан булырга тиеш","menu":"Таблица үзлекләре","row":{"menu":"Юл","insertBefore":"Өстән юллар өстәү","insertAfter":"Астан юллар өстәү","deleteRow":"Юлларны бетерү"},"rows":"Юллар","summary":"Йомгаклау","title":"Таблица үзлекләре","toolbar":"Таблица","widthPc":"процент","widthPx":"Нокталар","widthUnit":"киңлек берәмлеге"},"quicktable":{"more":"Башка"},"removeformat":{"toolbar":"Форматлауны бетерү"},"sourcearea":{"toolbar":"Чыганак"},"toolbar":{"toolbarCollapse":"Collapse Toolbar","toolbarExpand":"Expand Toolbar","toolbarGroups":{"document":"Документ","clipboard":"Алмашу буферы/Кайтару","editing":"Төзәтү","forms":"Формалар","basicstyles":"Төп стильләр","paragraph":"Параграф","links":"Сылталамалар","insert":"Өстәү","styles":"Стильләр","colors":"Төсләр","tools":"Кораллар"},"toolbars":"Editor toolbars"},"undo":{"redo":"Кабатлау","undo":"Кайтару"},"colordialog":{"clear":"Бушату","highlight":"Билгеләү","options":"Төс көйләүләре","selected":"Сайланган төсләр","title":"Төс сайлау"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/ug.js b/plugins/ckeditor/src/lang/ug.js
deleted file mode 100644
index 769821cfb..000000000
--- a/plugins/ckeditor/src/lang/ug.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['ug']={"editor":"تەھرىرلىگۈچ","editorPanel":"�
-ول تېكست تەھرىرلىگۈچ تاختىسى","common":{"editorHelp":"ALT+0 نى بېسىپ ياردە�
-نى كۆرۈڭ","browseServer":"كۆرسىتىش �
-ۇلازى�
-ېتىر","url":"ئەسلى ھۆججەت","protocol":"كېلىشى�
-","upload":"يۈكلە","uploadSubmit":"�
-ۇلازى�
-ېتىرغا يۈكلە","image":"سۈرەت","flash":"Flash","form":"جەدۋەل","checkbox":"كۆپ تاللاش را�
-كىسى","radio":"يەككە تاللاش توپچىسى","textField":"يەككە قۇر تېكىست","textarea":"كۆپ قۇر تېكىست","hiddenField":"يوشۇرۇن دائىرە","button":"توپچا","select":"تىزى�
-/تىزى�
-لىك","imageButton":"سۈرەت دائىرە","notSet":"‹تەڭشەل�
-ىگەن›","id":"ID","name":"ئات","langDir":"تىل يۆنىلىشى","langDirLtr":"سولدىن ئوڭغا (LTR)","langDirRtl":"ئوڭدىن سولغا (RTL)","langCode":"تىل كودى","longDescr":"تەپسىلىي چۈشەندۈرۈش ئادرېسى","cssClass":"ئۇسلۇب خىلىنىڭ ئاتى","advisoryTitle":"�
-اۋزۇ","cssStyle":"قۇر ئىچىدىكى ئۇسلۇبى","ok":"جەز�
-لە","cancel":"ۋاز كەچ","close":"تاقا","preview":"ئالدىن كۆزەت","resize":"چوڭلۇقىنى ئۆزگەرت","generalTab":"ئادەتتىكى","advancedTab":"ئالىي","validateNumberFailed":"سان پىچى�
-ىدا كىرگۈزۈش زۆرۈر","confirmNewPage":"نۆۋەتتىكى پۈتۈك �
-ەز�
-ۇنى ساقلان�
-ىدى، يېڭى پۈتۈك قۇرا�
-سىز؟","confirmCancel":"قىس�
-ەن ئۆزگەرتىش ساقلان�
-ىدى، بۇ سۆزلەشكۈنى تاقا�
-سىز؟","options":"تاللان�
-ا","target":"نىشان كۆزنەك","targetNew":"يېڭى كۆزنەك (_blank)","targetTop":"پۈتۈن بەت (_top)","targetSelf":"�
-ەزكۇر كۆزنەك (_self)","targetParent":"ئاتا كۆزنەك (_parent)","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","styles":"ئۇسلۇبلار","cssClasses":"ئۇسلۇب خىللىرى","width":"كەڭلىك","height":"ئېگىزلىك","align":"توغرىلىنىشى","alignLeft":"سول","alignRight":"ئوڭ","alignCenter":"ئوتتۇرا","alignJustify":"ئىككى تەرەپتىن توغرىلا","alignTop":"ئۈستى","alignMiddle":"ئوتتۇرا","alignBottom":"ئاستى","alignNone":"يوق","invalidValue":"ئىناۋەتسىز قى�
-�
-ەت.","invalidHeight":"ئېگىزلىك چوقۇ�
- رەقە�
- پىچى�
-ىدا بولۇشى زۆرۈر","invalidWidth":"كەڭلىك چوقۇ�
- رەقە�
- پىچى�
-ىدا بولۇشى زۆرۈر","invalidCssLength":"بۇ سۆز بۆلىكى چوقۇ�
- �
-ۇۋاپىق بولغان CSS ئۇزۇنلۇق قى�
-�
-ىتى بولۇشى زۆرۈر، بىرلىكى (px, %, in, cm, mm, em, ex, pt ياكى pc)","invalidHtmlLength":"بۇ سۆز بۆلىكى چوقۇ�
- بىرىك�
-ە HTML ئۇزۇنلۇق قى�
-�
-ىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px ياكى %)","invalidInlineStyle":"ئىچكى باغلان�
-ا ئۇسلۇبى چوقۇ�
- چېكىتلىك پەش بىلەن ئايرىلغان بىر ياكى كۆپ «خاسلىق ئاتى:خاسلىق قى�
-�
-ىتى» پىچى�
-ىدا بولۇشى لازى�
-","cssLengthTooltip":"بۇ سۆز بۆلىكى بىرىك�
-ە CSS ئۇزۇنلۇق قى�
-�
-ىتى بولۇشى كېرەك. ئۆز ئىچىگە ئالىدىغان بىرلىك (px, %, in, cm, mm, em, ex, pt ياكى pc)","unavailable":"%1<span class=\\\\\"cke_accessibility\\\\\">، ئىشلەتكىلى بول�
-ايدۇ</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"ئۆچۈر","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. نەشر ھوقۇقىغا ئىگە","dlgTitle":"CKEditor ھەققىدە","help":"$1 نى زىيارەت قىلىپ ياردە�
-گە ئېرىشىڭ","moreInfo":"تور تۇرايى�
-ىزنى زىيارەت قىلىپ كېلىشى�
-گە ئائىت تېخى�
-ۇ كۆپ ئۇچۇرغا ئېرىشىڭ","title":"CKEditor ھەققىدە","userGuide":"CKEditor ئىشلەتكۈچى قوللان�
-ىسى"},"clipboard":{"copy":"كۆچۈر","copyError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كۆچۈر �
-ەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قوي�
-ايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+C) ئارقىلىق تا�
-ا�
-لاڭ","cut":"كەس","cutError":"تور كۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى تەھرىرلىگۈچنىڭ كەس �
-ەشغۇلاتىنى ئۆزلۈكىدىن ئىجرا قىلىشىغا يول قوي�
-ايدۇ، ھەرپتاختا تېز كۇنۇپكا (Ctrl/Cmd+X) ئارقىلىق تا�
-ا�
-لاڭ","paste":"چاپلا","pasteArea":"چاپلاش دائىرىسى","pasteMsg":"ھەرپتاختا تېز كۇنۇپكا (<STRONG>Ctrl/Cmd+V</STRONG>) نى ئىشلىتىپ �
-ەز�
-ۇننى تۆۋەندىكى را�
-كىغا كۆچۈرۈڭ، ئاندىن <STRONG>جەز�
-لە</STRONG>نى بېسىڭ","securityMsg":"توركۆرگۈڭىزنىڭ بىخەتەرلىك تەڭشىكى سەۋەبىدىن بۇ تەھرىرلىگۈچ چاپلاش تاختىسىدىكى �
-ەز�
-ۇننى بىۋاستە زىيارەت قىلال�
-ايدۇ، بۇ كۆزنەكتە قايتا بىر قېتى�
- چاپلىشىڭىز كېرەك.","title":"چاپلا"},"base64image":{"alt":"تېكىست ئال�
-اشتۇر","lockRatio":"نىسبەتنى قۇلۇپلا","vSpace":"بويىغا ئارىلىقى","hSpace":"توغرىسىغا ئارىلىقى","border":"گىرۋەك چوڭلۇقى"},"basicstyles":{"bold":"تو�
-","italic":"يانتۇ","strike":"ئۆچۈرۈش سىزىقى","subscript":"تۆۋەن ئىندېكس","superscript":"يۇقىرى ئىندېكس","underline":"ئاستى سىزىق"},"bidi":{"ltr":"تېكىست يۆنىلىشى سولدىن ئوڭغا","rtl":"تېكىست يۆنىلىشى ئوڭدىن سولغا"},"blockquote":{"toolbar":"بۆلەك نەقىل"},"button":{"selectedLabel":"%1 (تاللاندى)"},"colorbutton":{"auto":"ئۆزلۈكىدىن","bgColorTitle":"تەگلىك رەڭگى","colors":{"000":"قارا","800000":"قىزغۇچ سېرىق","8B4513":"توق قوڭۇر","2F4F4F":"قارا�
-تۇل يېشىل","008080":"كۆكۈش يېشىل","000080":"قارا�
-تۇل كۆك","4B0082":"كۆكۈش كۈلرەڭ","696969":"قارا�
-تۇل كۈلرەڭ","B22222":"خىش قىزىل","A52A2A":"قوڭۇر","DAA520":"ئالتۇن سېرىق","006400":"توق يېشىل","40E0D0":"كۆكۈچ يېشىل","0000CD":"ئوتتۇراھال كۆك","800080":"بىنەپشە","808080":"كۈلرەڭ","F00":"قىزىل","FF8C00":"توق قىزغۇچ سېرىق","FFD700":"ئالتۇن","008000":"يېشىل","0FF":"يېشىل كۆك","00F":"كۆك","EE82EE":"قىزغۇچ بىنەپشە","A9A9A9":"توق كۈلرەڭ","FFA07A":"كاۋا چېچىكى سېرىق","FFA500":"قىزغۇچ سېرىق","FFFF00":"سېرىق","00FF00":"Lime","AFEEEE":"سۇس ھاۋا رەڭ","ADD8E6":"ئوچۇق كۆك","DDA0DD":"قىزغۇچ بىنەپشە","D3D3D3":"سۇس كۆكۈچ كۈلرەڭ","FFF0F5":"سۇس قىزغۇچ بىنەپشە","FAEBD7":"Antique White","FFFFE0":"سۇس سېرىق","F0FFF0":"Honeydew","F0FFFF":"ئاس�
-ان كۆكى","F0F8FF":"سۇس كۆك","E6E6FA":"سۇس بىنەپشە","FFF":"ئاق","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"باشقا رەڭ","panelTitle":"رەڭ","textColorTitle":"تېكىست رەڭگى"},"font":{"fontSize":{"label":"چوڭلۇقى","voiceLabel":"خەت چوڭلۇقى","panelTitle":"چوڭلۇقى"},"label":"خەت نۇسخا","panelTitle":"خەت نۇسخا","voiceLabel":"خەت نۇسخا"},"image":{"alt":"تېكىست ئال�
-اشتۇر","border":"گىرۋەك چوڭلۇقى","btnUpload":"�
-ۇلازى�
-ېتىرغا يۈكلە","button2Img":"نۆۋەتتىكى توپچىنى سۈرەتكە ئۆزگەرتە�
-سىز؟","hSpace":"توغرىسىغا ئارىلىقى","img2Button":"نۆۋەتتىكى سۈرەتنى توپچىغا ئۆزگەرتە�
-سىز؟","infoTab":"سۈرەت","linkTab":"ئۇلان�
-ا","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","resetSize":"ئەسلى چوڭلۇق","title":"سۈرەت خاسلىقى","titleButton":"سۈرەت دائىرە خاسلىقى","upload":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كە�
-","vSpace":"بويىغا ئارىلىقى","validateBorder":"گىرۋەك چوڭلۇقى چوقۇ�
- سان بولىدۇ","validateHSpace":"توغرىسىغا ئارىلىق چوقۇ�
- پۈتۈن سان بولىدۇ","validateVSpace":"بويىغا ئارىلىق چوقۇ�
- پۈتۈن سان بولىدۇ"},"widget":{"move":"يۆتكەشتە چېكىپ سۆرەڭ","label":"%1 widget"},"image2":{"alt":"تېكىست ئال�
-اشتۇر","btnUpload":"�
-ۇلازى�
-ېتىرغا يۈكلە","captioned":"�
-اۋزۇلۇق سۈرەت","captionPlaceholder":"Caption","infoTab":"سۈرەت","lockRatio":"نىسبەتنى قۇلۇپلا","menu":"سۈرەت خاسلىقى","pathName":"image","pathNameCaption":"caption","resetSize":"ئەسلى چوڭلۇق","resizer":"Click and drag to resize","title":"سۈرەت خاسلىقى","uploadTab":"يۈكلە","urlMissing":"سۈرەتنىڭ ئەسلى ھۆججەت ئادرېسى كە�
-","altMissing":"Alternative text is missing."},"indent":{"indent":"تارايت","outdent":"كەڭەيت"},"fakeobjects":{"anchor":"لەڭگەرلىك نۇقتا","flash":"Flash جانلاندۇرۇ�
-","hiddenfield":"يوشۇرۇن دائىرە","iframe":"IFrame","unknown":"يوچۇن نەڭ"},"link":{"acccessKey":"زىيارەت كۇنۇپكا","advanced":"ئالىي","advisoryContentType":"�
-ەز�
-ۇن تىپى","advisoryTitle":"�
-اۋزۇ","anchor":{"toolbar":"لەڭگەرلىك نۇقتا ئۇلان�
-ىسى قىستۇر/تەھرىرلە","menu":"لەڭگەرلىك نۇقتا ئۇلان�
-ا خاسلىقى","title":"لەڭگەرلىك نۇقتا ئۇلان�
-ا خاسلىقى","name":"لەڭگەرلىك نۇقتا ئاتى","errorName":"لەڭگەرلىك نۇقتا ئاتىنى كىرگۈزۈڭ","remove":"لەڭگەرلىك نۇقتا ئۆچۈر"},"anchorId":"لەڭگەرلىك نۇقتا ID سى بويىچە","anchorName":"لەڭگەرلىك نۇقتا ئاتى بويىچە","charset":"ھەرپ كودلىنىشى","cssClasses":"ئۇسلۇب خىلى ئاتى","download":"Force Download","displayText":"Display Text","emailAddress":"ئادرېس","emailBody":"�
-ەز�
-ۇن","emailSubject":"�
-اۋزۇ","id":"ID","info":"ئۇلان�
-ا ئۇچۇرى","langCode":"تىل كودى","langDir":"تىل يۆنىلىشى","langDirLTR":"سولدىن ئوڭغا (LTR)","langDirRTL":"ئوڭدىن سولغا (RTL)","menu":"ئۇلان�
-ا تەھرىر","name":"ئات","noAnchors":"(بۇ پۈتۈكتە ئىشلەتكىلى بولىدىغان لەڭگەرلىك نۇقتا يوق)","noEmail":"ئېلخەت ئادرېسىنى كىرگۈزۈڭ","noUrl":"ئۇلان�
-ا ئادرېسىنى كىرگۈزۈڭ","other":"‹باشقا›","popupDependent":"تەۋە (NS)","popupFeatures":"قاڭقىش كۆزنەك خاسلىقى","popupFullScreen":"پۈتۈن ئېكران (IE)","popupLeft":"سول","popupLocationBar":"ئادرېس بالداق","popupMenuBar":"تىزى�
-لىك بالداق","popupResizable":"چوڭلۇقى ئۆزگەرتىشچان","popupScrollBars":"دو�
-ىلى�
-ا سۈرگۈچ","popupStatusBar":"ھالەت بالداق","popupToolbar":"قورال بالداق","popupTop":"ئوڭ","rel":"باغلىنىش","selectAnchor":"بىر لەڭگەرلىك نۇقتا تاللاڭ","styles":"قۇر ئىچىدىكى ئۇسلۇبى","tabIndex":"Tab تەرتىپى","target":"نىشان","targetFrame":"‹كاندۇك›","targetFrameName":"نىشان كاندۇك ئاتى","targetPopup":"‹قاڭقىش كۆزنەك›","targetPopupName":"قاڭقىش كۆزنەك ئاتى","title":"ئۇلان�
-ا","toAnchor":"بەت ئىچىدىكى لەڭگەرلىك نۇقتا ئۇلان�
-ىسى","toEmail":"ئېلخەت","toUrl":"ئادرېس","toolbar":"ئۇلان�
-ا قىستۇر/تەھرىرلە","type":"ئۇلان�
-ا تىپى","unlink":"ئۇلان�
-ا بىكار قىل","upload":"يۈكلە"},"list":{"bulletedlist":"تۈر بەلگە تىزى�
-ى","numberedlist":"تەرتىپ نو�
-ۇر تىزى�
-ى"},"maximize":{"maximize":"چوڭايت","minimize":"كىچىكلەت"},"table":{"border":"گىرۋەك","caption":"�
-اۋزۇ","cell":{"menu":"كاتەكچە","insertBefore":"سولغا كاتەكچە قىستۇر","insertAfter":"ئوڭغا كاتەكچە قىستۇر","deleteCell":"كەتەكچە ئۆچۈر","merge":"كاتەكچە بىرلەشتۈر","mergeRight":"كاتەكچىنى ئوڭغا بىرلەشتۈر","mergeDown":"كاتەكچىنى ئاستىغا بىرلەشتۈر","splitHorizontal":"كاتەكچىنى توغرىسىغا بىرلەشتۈر","splitVertical":"كاتەكچىنى بويىغا بىرلەشتۈر","title":"كاتەكچە خاسلىقى","cellType":"كاتەكچە تىپى","rowSpan":"بويىغا چات ئارىسى قۇر سانى","colSpan":"توغرىسىغا چات ئارىسى ئىستون سانى","wordWrap":"ئۆزلۈكىدىن قۇر قاتلا","hAlign":"توغرىسىغا توغرىلا","vAlign":"بويىغا توغرىلا","alignBaseline":"ئاساسىي سىزىق","bgColor":"تەگلىك رەڭگى","borderColor":"گىرۋەك رەڭگى","data":"سانلىق �
-ەلۇ�
-ات","header":"جەدۋەل باشى","yes":"ھەئە","no":"ياق","invalidWidth":"كاتەكچە كەڭلىكى چوقۇ�
- سان بولىدۇ","invalidHeight":"كاتەكچە ئېگىزلىكى چوقۇ�
- سان بولىدۇ","invalidRowSpan":"قۇر چات ئارىسى چوقۇ�
- پۈتۈن سان بولىدۇ ","invalidColSpan":"ئىستون چات ئارىسى چوقۇ�
- پۈتۈن سان بولىدۇ","chooseColor":"تاللاڭ"},"cellPad":"يان ئارىلىق","cellSpace":"ئارىلىق","column":{"menu":"ئىستون","insertBefore":"سولغا ئىستون قىستۇر","insertAfter":"ئوڭغا ئىستون قىستۇر","deleteColumn":"ئىستون ئۆچۈر"},"columns":"ئىستون سانى","deleteTable":"جەدۋەل ئۆچۈر","headers":"�
-اۋزۇ كاتەكچە","headersBoth":"بىرىنچى ئىستون ۋە بىرىنچى قۇر","headersColumn":"بىرىنچى ئىستون","headersNone":"يوق","headersRow":"بىرىنچى قۇر","invalidBorder":"گىرۋەك تو�
-لۇقى چوقۇ�
- سان بولىدۇ","invalidCellPadding":"كاتەكچىگە چوقۇ�
- سان تولدۇرۇلىدۇ","invalidCellSpacing":"كاتەكچە ئارىلىقى چوقۇ�
- سان بولىدۇ","invalidCols":"بەلگىلەنگەن قۇر سانى چوقۇ�
- نۆلدىن چوڭ بولىدۇ","invalidHeight":"جەدۋەل ئېگىزلىكى چوقۇ�
- سان بولىدۇ","invalidRows":"بەلگىلەنگەن ئىستون سانى چوقۇ�
- نۆلدىن چوڭ بولىدۇ","invalidWidth":"جەدۋەل كەڭلىكى چوقۇ�
- سان بولىدۇ","menu":"جەدۋەل خاسلىقى","row":{"menu":"قۇر","insertBefore":"ئۈستىگە قۇر قىستۇر","insertAfter":"ئاستىغا قۇر قىستۇر","deleteRow":"قۇر ئۆچۈر"},"rows":"قۇر سانى","summary":"ئۈزۈندە","title":"جەدۋەل خاسلىقى","toolbar":"جەدۋەل","widthPc":"پىرسەنت","widthPx":"پىكسېل","widthUnit":"كەڭلىك بىرلىكى"},"quicktable":{"more":"ا رەڭ"},"removeformat":{"toolbar":"پىچى�
-نى چىقىرىۋەت"},"sourcearea":{"toolbar":"�
-ەنبە"},"toolbar":{"toolbarCollapse":"قورال بالداقنى قاتلا","toolbarExpand":"قورال بالداقنى ياي","toolbarGroups":{"document":"پۈتۈك","clipboard":"چاپلاش تاختىسى/يېنىۋال","editing":"تەھرىر","forms":"جەدۋەل","basicstyles":"ئاساسىي ئۇسلۇب","paragraph":"ئابزاس","links":"ئۇلان�
-ا","insert":"قىستۇر","styles":"ئۇسلۇب","colors":"رەڭ","tools":"قورال"},"toolbars":"قورال بالداق"},"undo":{"redo":"قايتىلا ","undo":"يېنىۋال"},"colordialog":{"clear":"تازىلا","highlight":"يورۇت","options":"رەڭ تاللان�
-ىسى","selected":"رەڭ تاللاڭ","title":"رەڭ تاللاڭ"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/uk.js b/plugins/ckeditor/src/lang/uk.js
deleted file mode 100644
index 02490982e..000000000
--- a/plugins/ckeditor/src/lang/uk.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['uk']={"editor":"Текстовий редактор","editorPanel":"Панель текстового редактора","common":{"editorHelp":"натисніть ALT 0 для довідки","browseServer":"Огляд Сервера","url":"URL","protocol":"Протокол","upload":"Надіслати","uploadSubmit":"Надіслати на сервер","image":"Зображення","flash":"Flash","form":"Форма","checkbox":"Галочка","radio":"Кнопка вибору","textField":"Текстове поле","textarea":"Текстова область","hiddenField":"При�
-оване поле","button":"Кнопка","select":"Список","imageButton":"Кнопка із зображенням","notSet":"<не визначено>","id":"Ідентифікатор","name":"Ім'я","langDir":"Напрямок мови","langDirLtr":"Зліва направо (LTR)","langDirRtl":"Справа наліво (RTL)","langCode":"Код мови","longDescr":"Довгий опис URL","cssClass":"Клас CSS","advisoryTitle":"Заголовок","cssStyle":"Стиль CSS","ok":"ОК","cancel":"Скасувати","close":"Закрити","preview":"Попередній перегляд","resize":"Потягніть для зміни розмірів","generalTab":"Основне","advancedTab":"Додаткове","validateNumberFailed":"Значення не є цілим числом.","confirmNewPage":"Всі незбережені зміни будуть втрачені. Ви впевнені, що �
-очете завантажити нову сторінку?","confirmCancel":"Деякі опції змінено. Закрити вікно без збереження змін?","options":"Опції","target":"Ціль","targetNew":"Нове вікно (_blank)","targetTop":"Поточне вікно (_top)","targetSelf":"Поточний фрейм/вікно (_self)","targetParent":"Батьківський фрейм/вікно (_parent)","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","styles":"Стиль CSS","cssClasses":"Клас CSS","width":"Ширина","height":"Висота","align":"Вирівнювання","alignLeft":"По лівому краю","alignRight":"По правому краю","alignCenter":"По центру","alignJustify":"По ширині","alignTop":"По вер�
-ньому краю","alignMiddle":"По середині","alignBottom":"По нижньому краю","alignNone":"Нема","invalidValue":"Невірне значення.","invalidHeight":"Висота повинна бути цілим числом.","invalidWidth":"Ширина повинна бути цілим числом.","invalidCssLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру CSS блоку (px, %, in, cm, mm, em, ex, pt або pc).","invalidHtmlLength":"Значення, вказане для \"%1\" в полі повинно бути позитивним числом або без дійсного виміру HTML блоку (px або %).","invalidInlineStyle":"Значення, вказане для вбудованого стилю повинне складатися з одного чи кілько�
- кортежів у форматі \"ім'я : значення\", розділени�
- крапкою з комою.","cssLengthTooltip":"Введіть номер значення в пікселя�
- або число з дійсною одиниці CSS (px, %, in, cm, mm, em, ex, pt або pc).","unavailable":"%1<span class=\"cke_accessibility\">, не доступне</span>","keyboard":{"8":"Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Видалити","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Copyright &copy; $1. Всі права застережено.","dlgTitle":"Про CKEditor","help":"Перевірте $1 для допомоги.","moreInfo":"Щодо інформації з ліцензування завітайте на наш сайт:","title":"Про CKEditor","userGuide":"Інструкція Користувача для CKEditor"},"clipboard":{"copy":"Копіювати","copyError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції копіювання. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+C).","cut":"Вирізати","cutError":"Налаштування безпеки Вашого браузера не дозволяють редактору автоматично виконувати операції вирізування. Будь ласка, використовуйте клавіатуру для цього (Ctrl/Cmd+X)","paste":"Вставити","pasteArea":"Область вставки","pasteMsg":"Будь ласка, вставте інформацію з буфера обміну в цю область, користуючись комбінацією клавіш (<STRONG>Ctrl/Cmd+V</STRONG>), та натисніть <STRONG>OK</STRONG>.","securityMsg":"Редактор не може отримати прямий доступ до буферу обміну у зв'язку з налаштуваннями Вашого браузера. Вам потрібно вставити інформацію в це вікно.","title":"Вставити"},"base64image":{"alt":"Альтернативний текст","lockRatio":"Зберегти пропорції","vSpace":"Верт. відступ","hSpace":"Гориз. відступ","border":"Рамка"},"basicstyles":{"bold":"Жирний","italic":"Курсив","strike":"Закреслений","subscript":"Нижній індекс","superscript":"Вер�
-ній індекс","underline":"Підкреслений"},"bidi":{"ltr":"Напрямок тексту зліва направо","rtl":"Напрямок тексту справа наліво"},"blockquote":{"toolbar":"Цитата"},"button":{"selectedLabel":"%1 (Вибрано)"},"colorbutton":{"auto":"Авто","bgColorTitle":"Колір фону","colors":{"000":"Чорний","800000":"Бордовий","8B4513":"Коричневий","2F4F4F":"Темний сіро-зелений","008080":"Морської �
-вилі","000080":"Сливовий","4B0082":"Індиго","696969":"Темносірий","B22222":"Темночервоний","A52A2A":"Каштановий","DAA520":"Бежевий","006400":"Темнозелений","40E0D0":"Бірюзовий","0000CD":"Темносиній","800080":"Пурпурний","808080":"Сірий","F00":"Червоний","FF8C00":"Темнооранжевий","FFD700":"Жовтий","008000":"Зелений","0FF":"Синьо-зелений","00F":"Синій","EE82EE":"Фіолетовий","A9A9A9":"Світлосірий","FFA07A":"Рожевий","FFA500":"Оранжевий","FFFF00":"Яскравожовтий","00FF00":"Салатовий","AFEEEE":"Світлобірюзовий","ADD8E6":"Блакитний","DDA0DD":"Світлофіолетовий","D3D3D3":"Сріблястий","FFF0F5":"Світлорожевий","FAEBD7":"Світлооранжевий","FFFFE0":"Світложовтий","F0FFF0":"Світлозелений","F0FFFF":"Світлий синьо-зелений","F0F8FF":"Світлоблакитний","E6E6FA":"Лавандовий","FFF":"Білий","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Кольори...","panelTitle":"Кольори","textColorTitle":"Колір тексту"},"font":{"fontSize":{"label":"Розмір","voiceLabel":"Розмір шрифту","panelTitle":"Розмір"},"label":"Шрифт","panelTitle":"Шрифт","voiceLabel":"Шрифт"},"image":{"alt":"Альтернативний текст","border":"Рамка","btnUpload":"Надіслати на сервер","button2Img":"Бажаєте перетворити обрану кнопку-зображення на просте зображення?","hSpace":"Гориз. відступ","img2Button":"Бажаєте перетворити обране зображення на кнопку-зображення?","infoTab":"Інформація про зображення","linkTab":"Посилання","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","resetSize":"Очистити поля розмірів","title":"Властивості зображення","titleButton":"Властивості кнопки із зображенням","upload":"Надіслати","urlMissing":"Вкажіть URL зображення.","vSpace":"Верт. відступ","validateBorder":"Ширина рамки повинна бути цілим числом.","validateHSpace":"Гориз. відступ повинен бути цілим числом.","validateVSpace":"Верт. відступ повинен бути цілим числом."},"widget":{"move":"Клікніть і потягніть для переміщення","label":"%1 віджет"},"image2":{"alt":"Альтернативний текст","btnUpload":"Надіслати на сервер","captioned":"Підписане зображення","captionPlaceholder":"Заголовок","infoTab":"Інформація про зображення","lockRatio":"Зберегти пропорції","menu":"Властивості зображення","pathName":"Зображення","pathNameCaption":"заголовок","resetSize":"Очистити поля розмірів","resizer":"Клікніть та потягніть для зміни розмірів","title":"Властивості зображення","uploadTab":"Надіслати","urlMissing":"Вкажіть URL зображення.","altMissing":"Alternative text is missing."},"indent":{"indent":"Збільшити відступ","outdent":"Зменшити відступ"},"fakeobjects":{"anchor":"Якір","flash":"Flash-анімація","hiddenfield":"При�
-овані Поля","iframe":"IFrame","unknown":"Невідомий об'єкт"},"link":{"acccessKey":"Гаряча клавіша","advanced":"Додаткове","advisoryContentType":"Тип вмісту","advisoryTitle":"Заголовок","anchor":{"toolbar":"Вставити/Редагувати якір","menu":"Властивості якоря","title":"Властивості якоря","name":"Ім'я якоря","errorName":"Будь ласка, вкажіть ім'я якоря","remove":"Прибрати якір"},"anchorId":"За ідентифікатором елементу","anchorName":"За ім'ям елементу","charset":"Кодування","cssClasses":"Клас CSS","download":"Force Download","displayText":"Display Text","emailAddress":"Адреса ел. пошти","emailBody":"Тіло повідомлення","emailSubject":"Тема листа","id":"Ідентифікатор","info":"Інформація посилання","langCode":"Код мови","langDir":"Напрямок мови","langDirLTR":"Зліва направо (LTR)","langDirRTL":"Справа наліво (RTL)","menu":"Вставити посилання","name":"Ім'я","noAnchors":"(В цьому документі немає якорів)","noEmail":"Будь ласка, вкажіть адрес ел. пошти","noUrl":"Будь ласка, вкажіть URL посилання","other":"<інший>","popupDependent":"Залежний (Netscape)","popupFeatures":"Властивості випливаючого вікна","popupFullScreen":"Повний екран (IE)","popupLeft":"Позиція зліва","popupLocationBar":"Панель локації","popupMenuBar":"Панель меню","popupResizable":"Масштабоване","popupScrollBars":"Стрічки прокрутки","popupStatusBar":"Рядок статусу","popupToolbar":"Панель інструментів","popupTop":"Позиція звер�
-у","rel":"Зв'язок","selectAnchor":"Оберіть якір","styles":"Стиль CSS","tabIndex":"Послідовність пере�
-оду","target":"Ціль","targetFrame":"<фрейм>","targetFrameName":"Ім'я цільового фрейму","targetPopup":"<випливаюче вікно>","targetPopupName":"Ім'я випливаючого вікна","title":"Посилання","toAnchor":"Якір на цю сторінку","toEmail":"Ел. пошта","toUrl":"URL","toolbar":"Вставити/Редагувати посилання","type":"Тип посилання","unlink":"Видалити посилання","upload":"Надіслати"},"list":{"bulletedlist":"Маркірований список","numberedlist":"Нумерований список"},"maximize":{"maximize":"Максимізувати","minimize":"Мінімізувати"},"table":{"border":"Розмір рамки","caption":"Заголовок таблиці","cell":{"menu":"Комірки","insertBefore":"Вставити комірку перед","insertAfter":"Вставити комірку після","deleteCell":"Видалити комірки","merge":"Об'єднати комірки","mergeRight":"Об'єднати справа","mergeDown":"Об'єднати донизу","splitHorizontal":"Розділити комірку по горизонталі","splitVertical":"Розділити комірку по вертикалі","title":"Властивості комірки","cellType":"Тип комірки","rowSpan":"Об'єднання рядків","colSpan":"Об'єднання стовпців","wordWrap":"Автоперенесення тексту","hAlign":"Гориз. вирівнювання","vAlign":"Верт. вирівнювання","alignBaseline":"По базовій лінії","bgColor":"Колір фону","borderColor":"Колір рамки","data":"Дані","header":"Заголовок","yes":"Так","no":"Ні","invalidWidth":"Ширина комірки повинна бути цілим числом.","invalidHeight":"Висота комірки повинна бути цілим числом.","invalidRowSpan":"Кількість об'єднувани�
- рядків повинна бути цілим числом.","invalidColSpan":"Кількість об'єднувани�
- стовбців повинна бути цілим числом.","chooseColor":"Обрати"},"cellPad":"Внутр. відступ","cellSpace":"Проміжок","column":{"menu":"Стовбці","insertBefore":"Вставити стовбець перед","insertAfter":"Вставити стовбець після","deleteColumn":"Видалити стовбці"},"columns":"Стовбці","deleteTable":"Видалити таблицю","headers":"Заголовки стовбців/рядків","headersBoth":"Стовбці і рядки","headersColumn":"Стовбці","headersNone":"Без заголовків","headersRow":"Рядки","invalidBorder":"Розмір рамки повинен бути цілим числом.","invalidCellPadding":"Внутр. відступ комірки повинен бути цілим числом.","invalidCellSpacing":"Проміжок між комірками повинен бути цілим числом.","invalidCols":"Кількість стовбців повинна бути більшою 0.","invalidHeight":"Висота таблиці повинна бути цілим числом.","invalidRows":"Кількість рядків повинна бути більшою 0.","invalidWidth":"Ширина таблиці повинна бути цілим числом.","menu":"Властивості таблиці","row":{"menu":"Рядки","insertBefore":"Вставити рядок перед","insertAfter":"Вставити рядок після","deleteRow":"Видалити рядки"},"rows":"Рядки","summary":"Детальний опис заголовку таблиці","title":"Властивості таблиці","toolbar":"Таблиця","widthPc":"відсотків","widthPx":"пікселів","widthUnit":"Одиниці вимір."},"quicktable":{"more":"більш..."},"removeformat":{"toolbar":"Видалити форматування"},"sourcearea":{"toolbar":"Джерело"},"toolbar":{"toolbarCollapse":"Згорнути панель інструментів","toolbarExpand":"Розгорнути панель інструментів","toolbarGroups":{"document":"Документ","clipboard":"Буфер обміну / Скасувати","editing":"Редагування","forms":"Форми","basicstyles":"Основний Стиль","paragraph":"Параграф","links":"Посилання","insert":"Вставити","styles":"Стилі","colors":"Кольори","tools":"Інструменти"},"toolbars":"Панель інструментів редактора"},"undo":{"redo":"Повторити","undo":"Повернути"},"colordialog":{"clear":"Очистити","highlight":"Колір, на який вказує курсор","options":"Опції кольорів","selected":"Обраний колір","title":"Обрати колір"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/vi.js b/plugins/ckeditor/src/lang/vi.js
deleted file mode 100644
index ae3d8eebd..000000000
--- a/plugins/ckeditor/src/lang/vi.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['vi']={"editor":"Bộ soạn thảo văn bản có định dạng","editorPanel":"Bảng điều khiển Rich Text Editor","common":{"editorHelp":"Nhấn ALT + 0 để được giúp đỡ","browseServer":"Duyệt máy chủ","url":"URL","protocol":"Giao thức","upload":"Tải lên","uploadSubmit":"Tải lên máy chủ","image":"Hình ảnh","flash":"Flash","form":"Biểu mẫu","checkbox":"Nút kiểm","radio":"Nút chọn","textField":"Trường văn bản","textarea":"Vùng văn bản","hiddenField":"Trường ẩn","button":"Nút","select":"Ô chọn","imageButton":"Nút hình ảnh","notSet":"<không thiết lập>","id":"Định danh","name":"Tên","langDir":"Hướng ngôn ngữ","langDirLtr":"Trái sang phải (LTR)","langDirRtl":"Phải sang trái (RTL)","langCode":"Mã ngôn ngữ","longDescr":"Mô tả URL","cssClass":"Lớp Stylesheet","advisoryTitle":"Nhan đề hướng dẫn","cssStyle":"Kiểu ","ok":"Đồng ý","cancel":"Bỏ qua","close":"Đóng","preview":"Xem trước","resize":"Kéo rê để thay đổi kích cỡ","generalTab":"Tab chung","advancedTab":"Tab mở rộng","validateNumberFailed":"Giá trị này không phải là số.","confirmNewPage":"Mọi thay đổi không được lưu lại, nội dung này sẽ bị mất. Bạn có chắc chắn muốn tải một trang mới?","confirmCancel":"Một vài tùy chọn đã bị thay đổi. Bạn có chắc chắn muốn đóng hộp thoại?","options":"Tùy chọn","target":"Đích đến","targetNew":"Cửa sổ mới (_blank)","targetTop":"Cửa sổ trên cùng (_top)","targetSelf":"Tại trang (_self)","targetParent":"Cửa sổ cha (_parent)","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","styles":"Kiểu","cssClasses":"Lớp CSS","width":"Chiều rộng","height":"Chiều cao","align":"Vị trí","alignLeft":"Trái","alignRight":"Phải","alignCenter":"Giữa","alignJustify":"Sắp chữ","alignTop":"Trên","alignMiddle":"Giữa","alignBottom":"Dưới","alignNone":"Không","invalidValue":"Giá trị không hợp lệ.","invalidHeight":"Chiều cao phải là số nguyên.","invalidWidth":"Chiều rộng phải là số nguyên.","invalidCssLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","invalidHtmlLength":"Giá trị quy định cho trường \"%1\" phải là một số dương có hoặc không có một đơn vị đo HTML hợp lệ (px hoặc %).","invalidInlineStyle":"Giá trị quy định cho kiểu nội tuyến phải bao gồm một hoặc nhiều dữ liệu với định dạng \"tên:giá trị\", cách nhau bằng dấu chấm phẩy.","cssLengthTooltip":"Nhập một giá trị theo pixel hoặc một số với một đơn vị CSS hợp lệ (px, %, in, cm, mm, em, ex, pt, hoặc pc).","unavailable":"%1<span class=\"cke_accessibility\">, không có</span>","keyboard":{"8":"Phím Backspace","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"Space","35":"End","36":"Home","46":"Xóa","224":"Command"},"keyboardShortcut":"Keyboard shortcut"},"about":{"copy":"Bản quyền &copy; $1. Giữ toàn quyền.","dlgTitle":"Thông tin về CKEditor","help":"Kiểm tra $1 để được giúp đỡ.","moreInfo":"Vui lòng ghé thăm trang web của chúng tôi để có thông tin về giấy phép:","title":"Thông tin về CKEditor","userGuide":"Hướng dẫn sử dụng CKEditor"},"clipboard":{"copy":"Sao chép","copyError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh sao chép. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+C).","cut":"Cắt","cutError":"Các thiết lập bảo mật của trình duyệt không cho phép trình biên tập tự động thực thi lệnh cắt. Hãy sử dụng bàn phím cho lệnh này (Ctrl/Cmd+X).","paste":"Dán","pasteArea":"Khu vực dán","pasteMsg":"Hãy dán nội dung vào trong khung bên dưới, sử dụng tổ hợp phím (<STRONG>Ctrl/Cmd+V</STRONG>) và nhấn vào nút <STRONG>Đồng ý</STRONG>.","securityMsg":"Do thiết lập bảo mật của trình duyệt nên trình biên tập không thể truy cập trực tiếp vào nội dung đã sao chép. Bạn cần phải dán lại nội dung vào cửa sổ này.","title":"Dán"},"base64image":{"alt":"Chú thích ảnh","lockRatio":"Giữ nguyên tỷ lệ","vSpace":"Khoảng đệm dọc","hSpace":"Khoảng đệm ngang","border":"Đường viền"},"basicstyles":{"bold":"Đậm","italic":"Nghiêng","strike":"Gạch xuyên ngang","subscript":"Chỉ số dưới","superscript":"Chỉ số trên","underline":"Gạch chân"},"bidi":{"ltr":"Văn bản hướng từ trái sang phải","rtl":"Văn bản hướng từ phải sang trái"},"blockquote":{"toolbar":"Khối trích dẫn"},"button":{"selectedLabel":"%1 (Đã chọn)"},"colorbutton":{"auto":"Tự động","bgColorTitle":"Màu nền","colors":{"000":"Đen","800000":"Maroon","8B4513":"Saddle Brown","2F4F4F":"Dark Slate Gray","008080":"Teal","000080":"Navy","4B0082":"Indigo","696969":"Dark Gray","B22222":"Fire Brick","A52A2A":"Nâu","DAA520":"Golden Rod","006400":"Dark Green","40E0D0":"Turquoise","0000CD":"Medium Blue","800080":"Purple","808080":"Xám","F00":"Đỏ","FF8C00":"Dark Orange","FFD700":"Vàng","008000":"Xanh lá cây","0FF":"Cyan","00F":"Xanh da trời","EE82EE":"Tím","A9A9A9":"Xám tối","FFA07A":"Light Salmon","FFA500":"Màu cam","FFFF00":"Vàng","00FF00":"Lime","AFEEEE":"Pale Turquoise","ADD8E6":"Light Blue","DDA0DD":"Plum","D3D3D3":"Light Grey","FFF0F5":"Lavender Blush","FAEBD7":"Antique White","FFFFE0":"Light Yellow","F0FFF0":"Honeydew","F0FFFF":"Azure","F0F8FF":"Alice Blue","E6E6FA":"Lavender","FFF":"Trắng","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"Màu khác...","panelTitle":"Màu sắc","textColorTitle":"Màu chữ"},"font":{"fontSize":{"label":"Cỡ chữ","voiceLabel":"Kích cỡ phông","panelTitle":"Cỡ chữ"},"label":"Phông","panelTitle":"Phông","voiceLabel":"Phông"},"image":{"alt":"Chú thích ảnh","border":"Đường viền","btnUpload":"Tải lên máy chủ","button2Img":"Bạn có muốn chuyển nút bấm bằng ảnh được chọn thành ảnh?","hSpace":"Khoảng đệm ngang","img2Button":"Bạn có muốn chuyển đổi ảnh được chọn thành nút bấm bằng ảnh?","infoTab":"Thông tin của ảnh","linkTab":"Tab liên kết","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","resetSize":"Kích thước gốc","title":"Thuộc tính của ảnh","titleButton":"Thuộc tính nút của ảnh","upload":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","vSpace":"Khoảng đệm dọc","validateBorder":"Chiều rộng của đường viền phải là một số nguyên dương","validateHSpace":"Khoảng đệm ngang phải là một số nguyên dương","validateVSpace":"Khoảng đệm dọc phải là một số nguyên dương"},"widget":{"move":"Nhấp chuột và kéo để di chuyển","label":"%1 widget"},"image2":{"alt":"Chú thích ảnh","btnUpload":"Tải lên máy chủ","captioned":"Ảnh có chú thích","captionPlaceholder":"Nhãn","infoTab":"Thông tin của ảnh","lockRatio":"Giữ nguyên tỷ lệ","menu":"Thuộc tính của ảnh","pathName":"ảnh","pathNameCaption":"chú thích","resetSize":"Kích thước gốc","resizer":"Kéo rê để thay đổi kích cỡ","title":"Thuộc tính của ảnh","uploadTab":"Tải lên","urlMissing":"Thiếu đường dẫn hình ảnh","altMissing":"Alternative text is missing."},"indent":{"indent":"Dịch vào trong","outdent":"Dịch ra ngoài"},"fakeobjects":{"anchor":"Điểm neo","flash":"Flash","hiddenfield":"Trường ẩn","iframe":"IFrame","unknown":"Đối tượng không rõ ràng"},"link":{"acccessKey":"Phím hỗ trợ truy cập","advanced":"Mở rộng","advisoryContentType":"Nội dung hướng dẫn","advisoryTitle":"Nhan đề hướng dẫn","anchor":{"toolbar":"Chèn/Sửa điểm neo","menu":"Thuộc tính điểm neo","title":"Thuộc tính điểm neo","name":"Tên của điểm neo","errorName":"Hãy nhập vào tên của điểm neo","remove":"Xóa neo"},"anchorId":"Theo định danh thành phần","anchorName":"Theo tên điểm neo","charset":"Bảng mã của tài nguyên được liên kết đến","cssClasses":"Lớp Stylesheet","download":"Force Download","displayText":"Display Text","emailAddress":"Thư điện tử","emailBody":"Nội dung thông điệp","emailSubject":"Tiêu đề thông điệp","id":"Định danh","info":"Thông tin liên kết","langCode":"Mã ngôn ngữ","langDir":"Hướng ngôn ngữ","langDirLTR":"Trái sang phải (LTR)","langDirRTL":"Phải sang trái (RTL)","menu":"Sửa liên kết","name":"Tên","noAnchors":"(Không có điểm neo nào trong tài liệu)","noEmail":"Hãy đưa vào địa chỉ thư điện tử","noUrl":"Hãy đưa vào đường dẫn liên kết (URL)","other":"<khác>","popupDependent":"Phụ thuộc (Netscape)","popupFeatures":"Đặc điểm của cửa sổ Popup","popupFullScreen":"Toàn màn hình (IE)","popupLeft":"Vị trí bên trái","popupLocationBar":"Thanh vị trí","popupMenuBar":"Thanh Menu","popupResizable":"Có thể thay đổi kích cỡ","popupScrollBars":"Thanh cuộn","popupStatusBar":"Thanh trạng thái","popupToolbar":"Thanh công cụ","popupTop":"Vị trí phía trên","rel":"Quan hệ","selectAnchor":"Chọn một điểm neo","styles":"Kiểu (style)","tabIndex":"Chỉ số của Tab","target":"Đích","targetFrame":"<khung>","targetFrameName":"Tên khung đích","targetPopup":"<cửa sổ popup>","targetPopupName":"Tên cửa sổ Popup","title":"Liên kết","toAnchor":"Neo trong trang này","toEmail":"Thư điện tử","toUrl":"URL","toolbar":"Chèn/Sửa liên kết","type":"Kiểu liên kết","unlink":"Xoá liên kết","upload":"Tải lên"},"list":{"bulletedlist":"Chèn/Xoá Danh sách không thứ tự","numberedlist":"Chèn/Xoá Danh sách có thứ tự"},"maximize":{"maximize":"Phóng to tối đa","minimize":"Thu nhỏ"},"table":{"border":"Kích thước đường viền","caption":"Đầu đề","cell":{"menu":"Ô","insertBefore":"Chèn ô Phía trước","insertAfter":"Chèn ô Phía sau","deleteCell":"Xoá ô","merge":"Kết hợp ô","mergeRight":"Kết hợp sang phải","mergeDown":"Kết hợp xuống dưới","splitHorizontal":"Phân tách ô theo chiều ngang","splitVertical":"Phân tách ô theo chiều dọc","title":"Thuộc tính của ô","cellType":"Kiểu của ô","rowSpan":"Kết hợp hàng","colSpan":"Kết hợp cột","wordWrap":"Chữ liền hàng","hAlign":"Canh lề ngang","vAlign":"Canh lề dọc","alignBaseline":"Đường cơ sở","bgColor":"Màu nền","borderColor":"Màu viền","data":"Dữ liệu","header":"Đầu đề","yes":"Có","no":"Không","invalidWidth":"Chiều rộng của ô phải là một số nguyên.","invalidHeight":"Chiều cao của ô phải là một số nguyên.","invalidRowSpan":"Số hàng kết hợp phải là một số nguyên.","invalidColSpan":"Số cột kết hợp phải là một số nguyên.","chooseColor":"Chọn màu"},"cellPad":"Khoảng đệm giữ ô và nội dung","cellSpace":"Khoảng cách giữa các ô","column":{"menu":"Cột","insertBefore":"Chèn cột phía trước","insertAfter":"Chèn cột phía sau","deleteColumn":"Xoá cột"},"columns":"Số cột","deleteTable":"Xóa bảng","headers":"Đầu đề","headersBoth":"Cả hai","headersColumn":"Cột đầu tiên","headersNone":"Không có","headersRow":"Hàng đầu tiên","invalidBorder":"Kích cỡ của đường biên phải là một số nguyên.","invalidCellPadding":"Khoảng đệm giữa ô và nội dung phải là một số nguyên.","invalidCellSpacing":"Khoảng cách giữa các ô phải là một số nguyên.","invalidCols":"Số lượng cột phải là một số lớn hơn 0.","invalidHeight":"Chiều cao của bảng phải là một số nguyên.","invalidRows":"Số lượng hàng phải là một số lớn hơn 0.","invalidWidth":"Chiều rộng của bảng phải là một số nguyên.","menu":"Thuộc tính bảng","row":{"menu":"Hàng","insertBefore":"Chèn hàng phía trước","insertAfter":"Chèn hàng phía sau","deleteRow":"Xoá hàng"},"rows":"Số hàng","summary":"Tóm lược","title":"Thuộc tính bảng","toolbar":"Bảng","widthPc":"Phần trăm (%)","widthPx":"Điểm ảnh (px)","widthUnit":"Đơn vị"},"quicktable":{"more":"Màu..."},"removeformat":{"toolbar":"Xoá định dạng"},"sourcearea":{"toolbar":"Mã HTML"},"toolbar":{"toolbarCollapse":"Thu gọn thanh công cụ","toolbarExpand":"Mở rộng thnah công cụ","toolbarGroups":{"document":"Tài liệu","clipboard":"Clipboard/Undo","editing":"Chỉnh sửa","forms":"Bảng biểu","basicstyles":"Kiểu cơ bản","paragraph":"Đoạn","links":"Liên kết","insert":"Chèn","styles":"Kiểu","colors":"Màu sắc","tools":"Công cụ"},"toolbars":"Thanh công cụ"},"undo":{"redo":"Làm lại thao tác","undo":"Khôi phục thao tác"},"colordialog":{"clear":"Xóa bỏ","highlight":"Màu chọn","options":"Tùy chọn màu","selected":"Màu đã chọn","title":"Chọn màu"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/zh-cn.js b/plugins/ckeditor/src/lang/zh-cn.js
deleted file mode 100644
index 2f6721425..000000000
--- a/plugins/ckeditor/src/lang/zh-cn.js
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['zh-cn']={"editor":"所见即所得编辑器","editorPanel":"所见即所得编辑器面板","common":{"editorHelp":"按 ALT+0 获得帮助","browseServer":"浏览服务器","url":"URL","protocol":"协议","upload":"上传","uploadSubmit":"上传到服务器","image":"图像","flash":"Flash","form":"表单","checkbox":"复选框","radio":"单选按钮","textField":"单行文本","textarea":"多行文本","hiddenField":"隐藏域","button":"按钮","select":"列表/菜单","imageButton":"图像按钮","notSet":"<没有设置>","id":"ID","name":"名称","langDir":"语言方向","langDirLtr":"从左到右 (LTR)","langDirRtl":"从右到左 (RTL)","langCode":"语言代码","longDescr":"详细说明 URL","cssClass":"样式类名称","advisoryTitle":"标题","cssStyle":"行�
-样式","ok":"确定","cancel":"取消","close":"�
-�闭","preview":"预览","resize":"拖拽以改变大小","generalTab":"常规","advancedTab":"高级","validateNumberFailed":"需要输�
-�数字格式","confirmNewPage":"当前文档�
-容未保存，是否确认新建文档？","confirmCancel":"部分修改尚未保存，是否确认�
-�闭对话框？","options":"选项","target":"目标窗口","targetNew":"新窗口 (_blank)","targetTop":"整页 (_top)","targetSelf":"本窗口 (_self)","targetParent":"父窗口 (_parent)","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","styles":"样式","cssClasses":"样式类","width":"宽度","height":"高度","align":"对齐方式","alignLeft":"左对齐","alignRight":"右对齐","alignCenter":"�
-中","alignJustify":"两端对齐","alignTop":"顶端","alignMiddle":"�
-中","alignBottom":"底部","alignNone":"无","invalidValue":"无效的值。","invalidHeight":"高度�
-须为数字格式","invalidWidth":"宽度�
-须为数字格式","invalidCssLength":"此“%1”字段的值�
-须为正数，可以�
-含或不�
-含一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)","invalidHtmlLength":"此“%1”字段的值�
-须为正数，可以�
-含或不�
-含一个有效的 HTML 长度单位(px 或 %)","invalidInlineStyle":"�
-联样式�
-须为格式是以分号分隔的一个或多个“属性名 : 属性值”。","cssLengthTooltip":"输�
-�一个表示像素值的数字，或加上一个有效的 CSS 长度单位(px, %, in, cm, mm, em, ex, pt 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，不可用</span>","keyboard":{"8":"退格键","13":"回车键","16":"Shift","17":"Ctrl","18":"Alt","32":"空格键","35":"行尾键","36":"行首键","46":"删除键","224":"Command"},"keyboardShortcut":"快捷键"},"about":{"copy":"版权所有 &copy; $1。<br />保留所有权利。","dlgTitle":"�
-�于 CKEditor","help":"访问 $1 以获取帮助。","moreInfo":"相�
-�授权许可信息请访问我们的网站：","title":"�
-�于 CKEditor","userGuide":"CKEditor 用户向导"},"clipboard":{"copy":"复制","copyError":"您的浏览器安�
-�设置不�
-�许编辑器自动执行复制操作，请使用键盘快捷键(Ctrl/Cmd+C)来完成。","cut":"剪切","cutError":"您的浏览器安�
-�设置不�
-�许编辑器自动执行剪切操作，请使用键盘快捷键(Ctrl/Cmd+X)来完成。","paste":"粘贴","pasteArea":"粘贴区域","pasteMsg":"请使用键盘快捷键(<STRONG>Ctrl/Cmd+V</STRONG>)把�
-容粘贴到下面的方框里，再按 <STRONG>确定</STRONG>","securityMsg":"因为您的浏览器的安�
-�设置原因，本编辑器不能直接访问您的剪贴板�
-容，你需要在本窗口重新粘贴一次。","title":"粘贴"},"base64image":{"alt":"替换文本","lockRatio":"锁定比例","vSpace":"垂直间距","hSpace":"水平间距","border":"边框大小"},"basicstyles":{"bold":"加粗","italic":"倾斜","strike":"删除线","subscript":"下标","superscript":"上标","underline":"下划线"},"bidi":{"ltr":"文字方向为从左至右","rtl":"文字方向为从右至左"},"blockquote":{"toolbar":"块引用"},"button":{"selectedLabel":"已选中 %1 项"},"colorbutton":{"auto":"自动","bgColorTitle":"背景颜色","colors":{"000":"黑","800000":"褐红","8B4513":"深褐","2F4F4F":"墨绿","008080":"绿松石","000080":"海军蓝","4B0082":"靛蓝","696969":"暗灰","B22222":"砖红","A52A2A":"褐","DAA520":"金黄","006400":"深绿","40E0D0":"蓝绿","0000CD":"中蓝","800080":"紫","808080":"灰","F00":"红","FF8C00":"深橙","FFD700":"金","008000":"绿","0FF":"青","00F":"蓝","EE82EE":"紫罗�
-�","A9A9A9":"深灰","FFA07A":"亮橙","FFA500":"橙","FFFF00":"黄","00FF00":"水绿","AFEEEE":"粉蓝","ADD8E6":"亮蓝","DDA0DD":"�
-红","D3D3D3":"淡灰","FFF0F5":"淡紫红","FAEBD7":"古董白","FFFFE0":"淡黄","F0FFF0":"蜜白","F0FFFF":"天蓝","F0F8FF":"淡蓝","E6E6FA":"淡紫","FFF":"白","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"�
-�它颜色...","panelTitle":"颜色","textColorTitle":"文本颜色"},"font":{"fontSize":{"label":"大小","voiceLabel":"文字大小","panelTitle":"大小"},"label":"字体","panelTitle":"字体","voiceLabel":"字体"},"image":{"alt":"替换文本","border":"边框大小","btnUpload":"上传到服务器","button2Img":"确定要把当前图像按钮转换为普通图像吗？","hSpace":"水平间距","img2Button":"确定要把当前图像改变为图像按钮吗？","infoTab":"图像信息","linkTab":"链接","lockRatio":"锁定比例","menu":"图像属性","resetSize":"原始尺寸","title":"图像属性","titleButton":"图像域属性","upload":"上传","urlMissing":"缺少图像源文件地址","vSpace":"垂直间距","validateBorder":"边框大小�
-须为整数格式","validateHSpace":"水平间距�
-须为整数格式","validateVSpace":"垂直间距�
-须为整数格式"},"widget":{"move":"点击并拖拽以移动","label":"%1 小部件"},"image2":{"alt":"替换文本","btnUpload":"上传到服务器","captioned":"带标题图像","captionPlaceholder":"标题","infoTab":"图像信息","lockRatio":"锁定比例","menu":"图像属性","pathName":"图像","pathNameCaption":"标题","resetSize":"原始尺寸","resizer":"点击并拖拽以改变尺寸","title":"图像属性","uploadTab":"上传","urlMissing":"缺少图像源文件地址","altMissing":"缺少替换文本"},"indent":{"indent":"增加缩进量","outdent":"减少缩进量"},"fakeobjects":{"anchor":"锚点","flash":"Flash 动画","hiddenfield":"隐藏域","iframe":"IFrame","unknown":"未知对象"},"link":{"acccessKey":"访问键","advanced":"高级","advisoryContentType":"�
-容类型","advisoryTitle":"标题","anchor":{"toolbar":"插�
-�/编辑锚点链接","menu":"锚点链接属性","title":"锚点链接属性","name":"锚点名称","errorName":"请输�
-�锚点名称","remove":"删除锚点"},"anchorId":"按锚点 ID","anchorName":"按锚点名称","charset":"字符编码","cssClasses":"样式类名称","download":"强制下载","displayText":"显示文本","emailAddress":"地址","emailBody":"�
-容","emailSubject":"主题","id":"ID","info":"�
-链接信息","langCode":"语言代码","langDir":"语言方向","langDirLTR":"从左到右 (LTR)","langDirRTL":"从右到左 (RTL)","menu":"编辑�
-链接","name":"名称","noAnchors":"(此文档没有可用的锚点)","noEmail":"请输�
-�电子邮件地址","noUrl":"请输�
-��
-链接地址","other":"<�
-�他>","popupDependent":"依附 (NS)","popupFeatures":"弹出窗口属性","popupFullScreen":"�
-�屏 (IE)","popupLeft":"左","popupLocationBar":"地址栏","popupMenuBar":"菜单栏","popupResizable":"可缩放","popupScrollBars":"滚动条","popupStatusBar":"状态栏","popupToolbar":"工�
-�栏","popupTop":"右","rel":"�
-�联","selectAnchor":"选择一个锚点","styles":"行�
-样式","tabIndex":"Tab 键次序","target":"目标","targetFrame":"<框架>","targetFrameName":"目标框架名称","targetPopup":"<弹出窗口>","targetPopupName":"弹出窗口名称","title":"�
-链接","toAnchor":"页�
-锚点链接","toEmail":"电子邮件","toUrl":"地址","toolbar":"插�
-�/编辑�
-链接","type":"�
-链接类型","unlink":"取消�
-链接","upload":"上传"},"list":{"bulletedlist":"项目列表","numberedlist":"编号列表"},"maximize":{"maximize":"�
-�屏","minimize":"最小化"},"table":{"border":"边框","caption":"标题","cell":{"menu":"单�
-�格","insertBefore":"在左侧插�
-�单�
-�格","insertAfter":"在右侧插�
-�单�
-�格","deleteCell":"删除单�
-�格","merge":"合并单�
-�格","mergeRight":"向右合并单�
-�格","mergeDown":"向下合并单�
-�格","splitHorizontal":"水平拆分单�
-�格","splitVertical":"垂直拆分单�
-�格","title":"单�
-�格属性","cellType":"单�
-�格类型","rowSpan":"纵跨行数","colSpan":"横跨列数","wordWrap":"自动换行","hAlign":"水平对齐","vAlign":"垂直对齐","alignBaseline":"基线","bgColor":"背景颜色","borderColor":"边框颜色","data":"数据","header":"表头","yes":"是","no":"否","invalidWidth":"单�
-�格宽度�
-须为数字格式","invalidHeight":"单�
-�格高度�
-须为数字格式","invalidRowSpan":"行跨度�
-须为整数格式","invalidColSpan":"列跨度�
-须为整数格式","chooseColor":"选择"},"cellPad":"边距","cellSpace":"间距","column":{"menu":"列","insertBefore":"在左侧插�
-�列","insertAfter":"在右侧插�
-�列","deleteColumn":"删除列"},"columns":"列数","deleteTable":"删除表格","headers":"标题单�
-�格","headersBoth":"第一列和第一行","headersColumn":"第一列","headersNone":"无","headersRow":"第一行","invalidBorder":"边框粗细�
-须为数字格式","invalidCellPadding":"单�
-�格填�
-
-�
-须为数字格式","invalidCellSpacing":"单�
-�格间距�
-须为数字格式","invalidCols":"指定的行数�
-须大于零","invalidHeight":"表格高度�
-须为数字格式","invalidRows":"指定的列数�
-须大于零","invalidWidth":"表格宽度�
-须为数字格式","menu":"表格属性","row":{"menu":"行","insertBefore":"在上方插�
-�行","insertAfter":"在下方插�
-�行","deleteRow":"删除行"},"rows":"行数","summary":"摘要","title":"表格属性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"宽度单位"},"quicktable":{"more":"�
-�它..."},"removeformat":{"toolbar":"�
-除格式"},"sourcearea":{"toolbar":"源码"},"toolbar":{"toolbarCollapse":"折叠工�
-�栏","toolbarExpand":"展开工�
-�栏","toolbarGroups":{"document":"文档","clipboard":"剪贴板/撤销","editing":"编辑","forms":"表单","basicstyles":"基本格式","paragraph":"段落","links":"链接","insert":"插�
-�","styles":"样式","colors":"颜色","tools":"工�
-�"},"toolbars":"工�
-�栏"},"undo":{"redo":"重做","undo":"撤消"},"colordialog":{"clear":"�
-除","highlight":"高亮","options":"颜色选项","selected":"选择颜色","title":"选择颜色"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/lang/zh.js b/plugins/ckeditor/src/lang/zh.js
deleted file mode 100644
index 3dc649f5f..000000000
--- a/plugins/ckeditor/src/lang/zh.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.lang['zh']={"editor":"RTF 編輯器","editorPanel":"RTF 編輯器面板","common":{"editorHelp":"按下 ALT 0 取得說明。","browseServer":"瀏覽伺服器","url":"URL","protocol":"通訊協定","upload":"上傳","uploadSubmit":"傳送至伺服器","image":"圖像","flash":"Flash","form":"表格","checkbox":"核取方塊","radio":"選�
-按鈕","textField":"文字欄位","textarea":"文字區域","hiddenField":"隱藏欄位","button":"按鈕","select":"選取欄位","imageButton":"影像按鈕","notSet":"<未設定>","id":"ID","name":"名稱","langDir":"語言方向","langDirLtr":"由左至右 (LTR)","langDirRtl":"由右至左 (RTL)","langCode":"語言代碼","longDescr":"完整描述 URL","cssClass":"樣式表類別","advisoryTitle":"標題","cssStyle":"樣式","ok":"確定","cancel":"取消","close":"關閉","preview":"預覽","resize":"調整大小","generalTab":"一般","advancedTab":"進階","validateNumberFailed":"此值不是數值。","confirmNewPage":"現存的修改尚未儲存，要開新檔案？","confirmCancel":"部份選�
-尚未儲存，要關閉對話框？","options":"選�
-","target":"目標","targetNew":"開新視窗 (_blank)","targetTop":"最上層視窗 (_top)","targetSelf":"相同視窗 (_self)","targetParent":"父視窗 (_parent)","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","styles":"樣式","cssClasses":"樣式表類別","width":"寬度","height":"高度","align":"對齊方式","alignLeft":"靠左對齊","alignRight":"靠右對齊","alignCenter":"置中對齊","alignJustify":"左右對齊","alignTop":"頂端","alignMiddle":"中間對齊","alignBottom":"底端","alignNone":"無","invalidValue":"無效值。","invalidHeight":"高度�
-須為數字。","invalidWidth":"寬度�
-須為數字。","invalidCssLength":"「%1」的值應為正數，並可�
-含有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","invalidHtmlLength":"「%1」的值應為正數，並可�
-含有效的 HTML 單位 (px 或 %)。","invalidInlineStyle":"行�
-�樣式的值應�
-含一個以上的變數值組，�
-�格式如「名稱:值」，並以分號區隔之。","cssLengthTooltip":"請輸�
-�數值，單位是像素或有效的 CSS 單位 (px, %, in, cm, mm, em, ex, pt, 或 pc)。","unavailable":"%1<span class=\"cke_accessibility\">，無法使用</span>","keyboard":{"8":"退格鍵","13":"Enter","16":"Shift","17":"Ctrl","18":"Alt","32":"空白鍵","35":"End","36":"Home","46":"刪除","224":"Command 鍵"},"keyboardShortcut":"鍵盤快捷鍵"},"about":{"copy":"Copyright &copy; $1. All rights reserved.","dlgTitle":"關於 CKEditor","help":"檢閱 $1 尋求幫助。","moreInfo":"關於授權資訊，請參閱我們的網站：","title":"關於 CKEditor","userGuide":"CKEditor 使用�
-手冊"},"clipboard":{"copy":"複製","copyError":"瀏覽器的安�
-�性設定不�
-�許編輯器自動執行複製動作。請使用鍵盤快捷鍵 (Ctrl/Cmd+C) 複製。","cut":"剪下","cutError":"瀏覽器的安�
-�性設定不�
-�許編輯器自動執行剪下動作。請使用鏐盤快捷鍵 (Ctrl/Cmd+X) 剪下。","paste":"貼上","pasteArea":"貼上區","pasteMsg":"請使用鍵盤快捷鍵 (<strong>Ctrl/Cmd+V</strong>) 貼到下方區域中並按下「確定」。","securityMsg":"因為瀏覽器的安�
-�性設定，本編輯器無法直接存取您的剪貼簿資料，請您自行在本視窗進行貼上動作。","title":"貼上"},"base64image":{"alt":"替代文字","lockRatio":"固定比例","vSpace":"VSpace","hSpace":"HSpace","border":"框線"},"basicstyles":{"bold":"粗體","italic":"斜體","strike":"刪除線","subscript":"下標","superscript":"上標","underline":"底線"},"bidi":{"ltr":"文字方向從左至右","rtl":"文字方向從右至左"},"blockquote":{"toolbar":"引用段落"},"button":{"selectedLabel":"%1 (已選取)"},"colorbutton":{"auto":"自動","bgColorTitle":"背景顏色","colors":{"000":"黑色","800000":"栗色","8B4513":"鞍褐色","2F4F4F":"暗瓦灰色","008080":"水壓色","000080":"丈青澀","4B0082":"靛青","696969":"深灰色","B22222":"磚�
-色","A52A2A":"褐色","DAA520":"金黃色","006400":"深綠色","40E0D0":"青綠色","0000CD":"藍色","800080":"紫色","808080":"灰色","F00":"�
-色","FF8C00":"深橘色","FFD700":"金色","008000":"綠色","0FF":"藍綠色","00F":"藍色","EE82EE":"紫色","A9A9A9":"暗灰色","FFA07A":"亮鮭�
-","FFA500":"橘色","FFFF00":"黃色","00FF00":"鮮綠色","AFEEEE":"綠松色","ADD8E6":"淺藍色","DDA0DD":"枚�
-色","D3D3D3":"淺灰色","FFF0F5":"淺紫色","FAEBD7":"骨董白","FFFFE0":"淺黃色","F0FFF0":"蜜瓜綠","F0FFFF":"天藍色","F0F8FF":"愛麗斯蘭","E6E6FA":"淺紫色","FFF":"白色","1ABC9C":"Strong Cyan","2ECC71":"Emerald","3498DB":"Bright Blue","9B59B6":"Amethyst","4E5F70":"Grayish Blue","F1C40F":"Vivid Yellow","16A085":"Dark Cyan","27AE60":"Dark Emerald","2980B9":"Strong Blue","8E44AD":"Dark Violet","2C3E50":"Desaturated Blue","F39C12":"Orange","E67E22":"Carrot","E74C3C":"Pale Red","ECF0F1":"Bright Silver","95A5A6":"Light Grayish Cyan","DDD":"Light Gray","D35400":"Pumpkin","C0392B":"Strong Red","BDC3C7":"Silver","7F8C8D":"Grayish Cyan","999":"Dark Gray"},"more":"更多顏色","panelTitle":"顏色","textColorTitle":"文字顏色"},"font":{"fontSize":{"label":"大小","voiceLabel":"字型大小","panelTitle":"字型大小"},"label":"字型","panelTitle":"字型名稱","voiceLabel":"字型"},"image":{"alt":"替代文字","border":"框線","btnUpload":"傳送到伺服器","button2Img":"請問您確定要將「圖片按鈕」轉換成「圖片」嗎？","hSpace":"HSpace","img2Button":"請問您確定要將「圖片」轉換成「圖片按鈕」嗎？","infoTab":"影像資訊","linkTab":"連結","lockRatio":"固定比例","menu":"影像屬性","resetSize":"重設大小","title":"影像屬性","titleButton":"影像按鈕屬性","upload":"上傳","urlMissing":"遺失圖片來源之 URL ","vSpace":"VSpace","validateBorder":"框線�
-須是整數。","validateHSpace":"HSpace �
-須是整數。","validateVSpace":"VSpace �
-須是整數。"},"widget":{"move":"拖曳以移動","label":"%1 小工�
-�"},"image2":{"alt":"替代文字","btnUpload":"傳送至伺服器","captioned":"已加標題之圖片","captionPlaceholder":"標題","infoTab":"影像資訊","lockRatio":"固定比例","menu":"影像屬性","pathName":"圖片","pathNameCaption":"標題","resetSize":"重設大小","resizer":"拖曳以改變大小","title":"影像屬性","uploadTab":"上傳","urlMissing":"遺失圖片來源之 URL ","altMissing":"替代文字遺失。"},"indent":{"indent":"增加縮排","outdent":"減少縮排"},"fakeobjects":{"anchor":"錨點","flash":"Flash 動畫","hiddenfield":"隱藏欄位","iframe":"IFrame","unknown":"無法辨識的物件"},"link":{"acccessKey":"便捷鍵","advanced":"進階","advisoryContentType":"建議�
-�容類型","advisoryTitle":"標題","anchor":{"toolbar":"錨點","menu":"編輯錨點","title":"錨點�
-�容","name":"錨點名稱","errorName":"請輸�
-�錨點名稱","remove":"移除錨點"},"anchorId":"依�
-�件編號","anchorName":"依錨點名稱","charset":"連結資源的字�
-�集","cssClasses":"樣式表類別","download":"Force Download","displayText":"顯示文字","emailAddress":"電子郵件地址","emailBody":"郵件本文","emailSubject":"郵件主旨","id":"ID","info":"連結資訊","langCode":"語言碼","langDir":"語言方向","langDirLTR":"由左至右 (LTR)","langDirRTL":"由右至左 (RTL)","menu":"編輯連結","name":"名稱","noAnchors":"(本文件中無可用之錨點)","noEmail":"請輸�
-�電子郵件","noUrl":"請輸�
-�連結 URL","other":"<�
-�他>","popupDependent":"獨立 (Netscape)","popupFeatures":"快顯視窗功能","popupFullScreen":"�
-�螢幕 (IE)","popupLeft":"左側位置","popupLocationBar":"位置列","popupMenuBar":"功能表列","popupResizable":"可調大小","popupScrollBars":"捲軸","popupStatusBar":"狀�
-�列","popupToolbar":"工�
-�列","popupTop":"頂端位置","rel":"關係","selectAnchor":"選取一個錨點","styles":"樣式","tabIndex":"定位順序","target":"目標","targetFrame":"<框架>","targetFrameName":"目標框架名稱","targetPopup":"<快顯視窗>","targetPopupName":"快顯視窗名稱","title":"連結","toAnchor":"文字中的錨點連結","toEmail":"電子郵件","toUrl":"網址","toolbar":"連結","type":"連結類型","unlink":"取消連結","upload":"上傳"},"list":{"bulletedlist":"插�
-�/移除�
-目符號�
-單","numberedlist":"插�
-�/移除編號�
-單�
-單"},"maximize":{"maximize":"最大化","minimize":"最小化"},"table":{"border":"框線大小","caption":"標題","cell":{"menu":"儲存格","insertBefore":"前方插�
-�儲存格","insertAfter":"後方插�
-�儲存格","deleteCell":"刪除儲存格","merge":"合併儲存格","mergeRight":"向右合併","mergeDown":"向下合併","splitHorizontal":"水平分割儲存格","splitVertical":"垂直分割儲存格","title":"儲存格屬性","cellType":"儲存格類型","rowSpan":"列�
-�長","colSpan":"行�
-�長","wordWrap":"自動斷行","hAlign":"水平對齊","vAlign":"垂直對齊","alignBaseline":"基準線","bgColor":"背景顏色","borderColor":"框線顏色","data":"資料","header":"頁首","yes":"是","no":"否","invalidWidth":"儲存格寬度�
-須為數字。","invalidHeight":"儲存格高度�
-須為數字。","invalidRowSpan":"列�
-�長�
-須是整數。","invalidColSpan":"行�
-�長�
-須是整數。","chooseColor":"選擇"},"cellPad":"儲存格邊距","cellSpace":"儲存格間距","column":{"menu":"行","insertBefore":"左方插�
-�行","insertAfter":"右方插�
-�行","deleteColumn":"刪除行"},"columns":"行","deleteTable":"刪除表格","headers":"頁首","headersBoth":"同時","headersColumn":"第一行","headersNone":"無","headersRow":"第一列","invalidBorder":"框線大小�
-須是整數。","invalidCellPadding":"儲存格邊距�
-須為正數。","invalidCellSpacing":"儲存格間距�
-須為正數。","invalidCols":"行數須為大於 0 的正整數。","invalidHeight":"表格高度�
-須為數字。","invalidRows":"列數須為大於 0 的正整數。","invalidWidth":"表格寬度�
-須為數字。","menu":"表格屬性","row":{"menu":"列","insertBefore":"上方插�
-�列","insertAfter":"下方插�
-�列","deleteRow":"刪除列"},"rows":"列","summary":"總結","title":"表格屬性","toolbar":"表格","widthPc":"百分比","widthPx":"像素","widthUnit":"寬度單位"},"quicktable":{"more":"更多"},"removeformat":{"toolbar":"移除格式"},"sourcearea":{"toolbar":"原始碼"},"toolbar":{"toolbarCollapse":"摺疊工�
-�列","toolbarExpand":"展開工�
-�列","toolbarGroups":{"document":"文件","clipboard":"剪貼簿/復原","editing":"編輯選�
-","forms":"格式","basicstyles":"基本樣式","paragraph":"段落","links":"連結","insert":"插�
-�","styles":"樣式","colors":"顏色","tools":"工�
-�"},"toolbars":"編輯器工�
-�列"},"undo":{"redo":"取消復原","undo":"復原"},"colordialog":{"clear":"�
-除","highlight":"高亮","options":"色彩選�
-","selected":"選取的色彩","title":"選取色彩"}};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/about/dialogs/about.js b/plugins/ckeditor/src/plugins/about/dialogs/about.js
deleted file mode 100644
index 0064354ce..000000000
--- a/plugins/ckeditor/src/plugins/about/dialogs/about.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("about",function(a){a=a.lang.about;var b=CKEDITOR.getUrl(CKEDITOR.plugins.get("about").path+"dialogs/"+(CKEDITOR.env.hidpi?"hidpi/":"")+"logo_ckeditor.png");return{title:CKEDITOR.env.ie?a.dlgTitle:a.title,minWidth:390,minHeight:230,contents:[{id:"tab1",label:"",title:"",expand:!0,padding:0,elements:[{type:"html",html:'\x3cstyle type\x3d"text/css"\x3e.cke_about_container{color:#000 !important;padding:10px 10px 0;margin-top:5px}.cke_about_container p{margin: 0 0 10px;}.cke_about_container .cke_about_logo{height:81px;background-color:#fff;background-image:url('+
-b+");"+(CKEDITOR.env.hidpi?"background-size:163px 58px;":"")+'background-position:center; background-repeat:no-repeat;margin-bottom:10px;}.cke_about_container a{cursor:pointer !important;color:#00B2CE !important;text-decoration:underline !important;}\x3c/style\x3e\x3cdiv class\x3d"cke_about_container"\x3e\x3cdiv class\x3d"cke_about_logo"\x3e\x3c/div\x3e\x3cp\x3eCKEditor '+CKEDITOR.version+" (revision "+CKEDITOR.revision+')\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://ckeditor.com/"\x3ehttp://ckeditor.com\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+
-a.help.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://docs.ckeditor.com/user"\x3e'+a.userGuide+"\x3c/a\x3e")+"\x3c/p\x3e\x3cp\x3e"+a.moreInfo+'\x3cbr\x3e\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://ckeditor.com/about/license"\x3ehttp://ckeditor.com/about/license\x3c/a\x3e\x3c/p\x3e\x3cp\x3e'+a.copy.replace("$1",'\x3ca target\x3d"_blank" rel\x3d"noopener noreferrer" href\x3d"http://cksource.com/"\x3eCKSource\x3c/a\x3e - Frederico Knabben')+
-"\x3c/p\x3e\x3c/div\x3e"}]}],buttons:[CKEDITOR.dialog.cancelButton]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/about/dialogs/hidpi/logo_ckeditor.png b/plugins/ckeditor/src/plugins/about/dialogs/hidpi/logo_ckeditor.png
deleted file mode 100644
index 10cc7368a..000000000
Binary files a/plugins/ckeditor/src/plugins/about/dialogs/hidpi/logo_ckeditor.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/about/dialogs/logo_ckeditor.png b/plugins/ckeditor/src/plugins/about/dialogs/logo_ckeditor.png
deleted file mode 100644
index f186eb87a..000000000
Binary files a/plugins/ckeditor/src/plugins/about/dialogs/logo_ckeditor.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/base64image/LICENSE.md b/plugins/ckeditor/src/plugins/base64image/LICENSE.md
deleted file mode 100644
index 70160ed06..000000000
--- a/plugins/ckeditor/src/plugins/base64image/LICENSE.md
+++ /dev/null
@@ -1,1243 +0,0 @@
-Software License Agreement
-==========================
-
-Base64Image Plugin for CKEditor - Adds images from local client as base64
-string into the source without server side processing. You can also add
-external image urls into the source.
-
-Created by ALL-INKL.COM - Neue Medien Münnich - 04. Feb 2014
-
-Licensed under the terms of any of the following licenses at your
-choice:
-
- - GNU General Public License Version 2 or later (the "GPL")
-   http://www.gnu.org/licenses/gpl.html
-   (See Appendix A)
-
- - GNU Lesser General Public License Version 2.1 or later (the "LGPL")
-   http://www.gnu.org/licenses/lgpl.html
-   (See Appendix B)
-
- - Mozilla Public License Version 1.1 or later (the "MPL")
-   http://www.mozilla.org/MPL/MPL-1.1.html
-   (See Appendix C)
-
-
-Appendix A: The GPL License
----------------------------
-
-GNU GENERAL PUBLIC LICENSE
-Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software-to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-GNU GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-Appendix B: The LGPL License
-----------------------------
-
-GNU LESSER GENERAL PUBLIC LICENSE
-Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software-to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages-typically libraries-of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-GNU LESSER GENERAL PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-END OF TERMS AND CONDITIONS
-
-
-Appendix C: The MPL License
----------------------------
-
-MOZILLA PUBLIC LICENSE
-Version 1.1
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
diff --git a/plugins/ckeditor/src/plugins/base64image/README.md b/plugins/ckeditor/src/plugins/base64image/README.md
deleted file mode 100644
index 348583180..000000000
--- a/plugins/ckeditor/src/plugins/base64image/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Base64Image Plugin for CKEditor 4
-=================================
-
-Created by ALL-INKL.COM - Neue Medien Münnich - 04. Feb 2014
-
-Adds images from local client as base64 string into the source without server
-side processing. You can also add external image urls into the source.
-
-## Requirements
-The Browser must support the JavaScript File API.
-
-## Installation
-
- 1. Download the plugin from http://github.com/nmmf/base64image
-
- 2. Extract (decompress) the downloaded file into the plugins folder of your
-	CKEditor installation.
-	Example: http://example.com/ckeditor/plugins/base64image
-
- 3. Enable the plugin by using the extraPlugins configuration setting.
-	Example: CKEDITOR.config.extraPlugins = "base64image";
diff --git a/plugins/ckeditor/src/plugins/base64image/dialogs/base64image.js b/plugins/ckeditor/src/plugins/base64image/dialogs/base64image.js
deleted file mode 100644
index 731a3f5b0..000000000
--- a/plugins/ckeditor/src/plugins/base64image/dialogs/base64image.js
+++ /dev/null
@@ -1,16 +0,0 @@
-CKEDITOR.dialog.add("base64imageDialog",function(c){function p(b){if("string"!=typeof b||!b)e.getElement().setHtml("");else{var f=new Image;e.getElement().setHtml("Loading...");f.onload=function(){e.getElement().setHtml("");null==i||null==h?(d.setValueOf("tab-properties","width",this.width),d.setValueOf("tab-properties","height",this.height),j=1,0<this.height&&0<this.width&&(j=this.width/this.height),0>=j&&(j=1)):h=i=null;this.id=c.id+"previewimage";this.setAttribute("style","max-width:400px;max-height:100px;");
-this.setAttribute("alt","");try{var b=e.getElement().$;b&&b.appendChild(this)}catch(f){}};f.onerror=function(){e.getElement().setHtml("")};f.onabort=function(){e.getElement().setHtml("")};f.src=b}}function n(b){e.getElement().setHtml("");if("base64"==b)l&&l.setValue(!1,!0),m&&m.setValue(!1,!0);else if("url"==b)l&&l.setValue(!0,!0),m&&m.setValue(!1,!0),q&&p(q.getValue());else if(r){l&&l.setValue(!1,!0);m&&m.setValue(!0,!0);var f=d.getContentElement("tab-source","file"),b=null;try{b=f.getInputElement().$}catch(a){b=
-null}if(b&&("files"in b&&b.files&&0<b.files.length&&b.files[0])&&(!("type"in b.files[0])||b.files[0].type.match("image.*"))&&FileReader)e.getElement().setHtml("Loading..."),f=new FileReader,f.onload=function(){return function(b){e.getElement().setHtml("");p(b.target.result)}}(b.files[0]),f.onerror=function(){e.getElement().setHtml("")},f.onabort=function(){e.getElement().setHtml("")},f.readAsDataURL(b.files[0])}}function s(b){var f=d.getContentElement("tab-properties","width").getValue(),a=d.getContentElement("tab-properties",
-"height").getValue(),c="px",g="px";0<=f.indexOf("%")&&(c="%");0<=a.indexOf("%")&&(g="%");f=parseInt(f,10);a=parseInt(a,10);isNaN(f)&&(f=0);isNaN(a)&&(a=0);var e="px";"width"==b?("%"==c&&(e="%"),a=Math.round(f/j)):("%"==g&&(e="%"),f=Math.round(a*j));"%"==e&&(f+="%",a+="%");d.getContentElement("tab-properties","width").setValue(f);d.getContentElement("tab-properties","height").setValue(a)}function t(b){var a=b.getValue(),c="";0<=a.indexOf("%")&&(c="%");a=parseInt(a,10);isNaN(a)&&(a=0);b.setValue(a+
-c)}var d=null,a=null,i=null,h=null,e=null,l=null,q=null,m=null,j=1,o=!0,r=function(){var a=!1,c=null;try{FileReader&&(c=document.createElement("input"))&&"files"in c&&(a=!0)}catch(d){a=!1}return a}(),u=r?[{type:"hbox",widths:["70px"],children:[{type:"checkbox",id:"urlcheckbox",style:"margin-top:5px",label:c.lang.common.url+":"},{type:"text",id:"url",label:"",onChange:function(){n("url")}}]},{type:"hbox",widths:["70px"],children:[{type:"checkbox",id:"filecheckbox",style:"margin-top:5px",label:c.lang.common.upload+
-":"},{type:"file",id:"file",label:"",onChange:function(){n("file")}}]},{type:"html",id:"preview",html:(new CKEDITOR.template('<div style="text-align:center;"></div>')).output()}]:[{type:"text",id:"url",label:c.lang.common.url,onChange:function(){n("url")}},{type:"html",id:"preview",html:(new CKEDITOR.template('<div style="text-align:center;"></div>')).output()}];return{title:c.lang.common.image,minWidth:450,minHeight:180,onLoad:function(){r&&(l=this.getContentElement("tab-source","urlcheckbox"),m=
-this.getContentElement("tab-source","filecheckbox"),l.getInputElement().on("click",function(){n("url")}),m.getInputElement().on("click",function(){n("file")}));q=this.getContentElement("tab-source","url");e=this.getContentElement("tab-source","preview");this.getContentElement("tab-properties","lock").getInputElement().on("click",function(){(o=this.getValue()?true:false)&&s("width")},this.getContentElement("tab-properties","lock"));this.getContentElement("tab-properties","width").getInputElement().on("keyup",
-function(){o&&s("width")});this.getContentElement("tab-properties","height").getInputElement().on("keyup",function(){o&&s("height")});this.getContentElement("tab-properties","vmargin").getInputElement().on("keyup",function(){t(this)},this.getContentElement("tab-properties","vmargin"));this.getContentElement("tab-properties","hmargin").getInputElement().on("keyup",function(){t(this)},this.getContentElement("tab-properties","hmargin"));this.getContentElement("tab-properties","border").getInputElement().on("keyup",
-function(){t(this)},this.getContentElement("tab-properties","border"))},onShow:function(){e.getElement().setHtml("");d=this;h=i=null;j=1;o=!0;(a=c.getSelection())&&(a=a.getSelectedElement());if(!a||"img"!==a.getName())a=null;d.setValueOf("tab-properties","lock",o);d.setValueOf("tab-properties","vmargin","0");d.setValueOf("tab-properties","hmargin","0");d.setValueOf("tab-properties","border","0");d.setValueOf("tab-properties","align","none");if(a){"string"==typeof a.getAttribute("width")&&(i=a.getAttribute("width"));
-"string"==typeof a.getAttribute("height")&&(h=a.getAttribute("height"));if((null==i||null==h)&&a.$)i=a.$.width,h=a.$.height;null!=i&&null!=h&&(d.setValueOf("tab-properties","width",i),d.setValueOf("tab-properties","height",h),i=parseInt(i,10),h=parseInt(h,10),j=1,!isNaN(i)&&(!isNaN(h)&&0<h&&0<i)&&(j=i/h),0>=j&&(j=1));"string"==typeof a.getAttribute("src")&&(0===a.getAttribute("src").indexOf("data:")?(n("base64"),p(a.getAttribute("src"))):d.setValueOf("tab-source","url",a.getAttribute("src")));"string"==
-typeof a.getAttribute("alt")&&d.setValueOf("tab-properties","alt",a.getAttribute("alt"));"string"==typeof a.getAttribute("hspace")&&d.setValueOf("tab-properties","hmargin",a.getAttribute("hspace"));"string"==typeof a.getAttribute("vspace")&&d.setValueOf("tab-properties","vmargin",a.getAttribute("vspace"));"string"==typeof a.getAttribute("border")&&d.setValueOf("tab-properties","border",a.getAttribute("border"));if("string"==typeof a.getAttribute("align"))switch(a.getAttribute("align")){case "top":case "text-top":d.setValueOf("tab-properties",
-"align","top");break;case "baseline":case "bottom":case "text-bottom":d.setValueOf("tab-properties","align","bottom");break;case "left":d.setValueOf("tab-properties","align","left");break;case "right":d.setValueOf("tab-properties","align","right")}d.selectPage("tab-properties")}},onOk:function(){var b="";try{b=CKEDITOR.document.getById(c.id+"previewimage").$.src}catch(f){b=""}if(!("string"!=typeof b||null==b||""===b)){var e=a?a:c.document.createElement("img");e.setAttribute("src",b);e.setAttribute("alt",
-d.getValueOf("tab-properties","alt").replace(/^\s+/,"").replace(/\s+$/,""));var b={width:["width","width:#;","integer",1],height:["height","height:#;","integer",1],vmargin:["vspace","margin-top:#;margin-bottom:#;","integer",0],hmargin:["hspace","margin-left:#;margin-right:#;","integer",0],align:["align",""],border:["border","border:# solid black;","integer",0]},i=[],g,h,j,k;for(k in b){h=j=g=d.getValueOf("tab-properties",k);unit="px";if("align"==k)switch(g){case "top":case "bottom":b[k][1]="vertical-align:#;";
-break;case "left":case "right":b[k][1]="float:#;";break;default:g=null}"integer"==b[k][2]&&(0<=g.indexOf("%")&&(unit="%"),g=parseInt(g,10),isNaN(g)?g=null:g<b[k][3]&&(g=null),null!=g&&("%"==unit?(j=g+"%",h=g+"%"):(j=g,h=g+"px")));null!=g&&(e.setAttribute(b[k][0],j),i.push(b[k][1].replace(/#/g,h)))}0<i.length&&e.setAttribute("style",i.join(""));a||c.insertElement(e);c.plugins.imageresize&&c.plugins.imageresize.resize(c,e,800,800)}},contents:[{id:"tab-source",label:c.lang.common.generalTab,elements:u},
-{id:"tab-properties",label:c.lang.common.advancedTab,elements:[{type:"text",id:"alt",label:c.lang.base64image.alt},{type:"hbox",widths:["15%","15%","70%"],children:[{type:"text",width:"45px",id:"width",label:c.lang.common.width},{type:"text",width:"45px",id:"height",label:c.lang.common.height},{type:"checkbox",id:"lock",label:c.lang.base64image.lockRatio,style:"margin-top:18px;"}]},{type:"hbox",widths:["23%","30%","30%","17%"],style:"margin-top:10px;",children:[{type:"select",id:"align",label:c.lang.common.align,
-items:[[c.lang.common.notSet,"none"],[c.lang.common.alignTop,"top"],[c.lang.common.alignBottom,"bottom"],[c.lang.common.alignLeft,"left"],[c.lang.common.alignRight,"right"]]},{type:"text",width:"45px",id:"vmargin",label:c.lang.base64image.vSpace},{type:"text",width:"45px",id:"hmargin",label:c.lang.base64image.hSpace},{type:"text",width:"45px",id:"border",label:c.lang.base64image.border}]}]}]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/clipboard/dialogs/paste.js b/plugins/ckeditor/src/plugins/clipboard/dialogs/paste.js
deleted file mode 100644
index 650d6c811..000000000
--- a/plugins/ckeditor/src/plugins/clipboard/dialogs/paste.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("paste",function(c){function k(a){var b=new CKEDITOR.dom.document(a.document),g=b.getBody(),d=b.getById("cke_actscrpt");d&&d.remove();g.setAttribute("contenteditable",!0);g.on(e.mainPasteEvent,function(a){a=e.initPasteDataTransfer(a);f?a!=f&&(f=e.initPasteDataTransfer()):f=a});if(CKEDITOR.env.ie&&8>CKEDITOR.env.version)b.getWindow().on("blur",function(){b.$.selection.empty()});b.on("keydown",function(a){a=a.data;var b;switch(a.getKeystroke()){case 27:this.hide();b=1;break;case 9:case CKEDITOR.SHIFT+
-9:this.changeFocus(1),b=1}b&&a.preventDefault()},this);c.fire("ariaWidget",new CKEDITOR.dom.element(a.frameElement));b.getWindow().getFrame().removeCustomData("pendingFocus")&&g.focus()}var h=c.lang.clipboard,e=CKEDITOR.plugins.clipboard,f;c.on("pasteDialogCommit",function(a){a.data&&c.fire("paste",{type:"auto",dataValue:a.data.dataValue,method:"paste",dataTransfer:a.data.dataTransfer||e.initPasteDataTransfer()})},null,null,1E3);return{title:h.title,minWidth:CKEDITOR.env.ie&&CKEDITOR.env.quirks?370:
-350,minHeight:CKEDITOR.env.quirks?250:245,onShow:function(){this.parts.dialog.$.offsetHeight;this.setupContent();this.parts.title.setHtml(this.customTitle||h.title);this.customTitle=null},onLoad:function(){(CKEDITOR.env.ie7Compat||CKEDITOR.env.ie6Compat)&&"rtl"==c.lang.dir&&this.parts.contents.setStyle("overflow","hidden")},onOk:function(){this.commitContent()},contents:[{id:"general",label:c.lang.common.generalTab,elements:[{type:"html",id:"securityMsg",html:'\x3cdiv style\x3d"white-space:normal;width:340px"\x3e'+
-h.securityMsg+"\x3c/div\x3e"},{type:"html",id:"pasteMsg",html:'\x3cdiv style\x3d"white-space:normal;width:340px"\x3e'+h.pasteMsg+"\x3c/div\x3e"},{type:"html",id:"editing_area",style:"width:100%;height:100%",html:"",focus:function(){var a=this.getInputElement(),b=a.getFrameDocument().getBody();!b||b.isReadOnly()?a.setCustomData("pendingFocus",1):b.focus()},setup:function(){var a=this.getDialog(),b='\x3chtml dir\x3d"'+c.config.contentsLangDirection+'" lang\x3d"'+(c.config.contentsLanguage||c.langCode)+
-'"\x3e\x3chead\x3e\x3cstyle\x3ebody{margin:3px;height:95%;word-break:break-all;}\x3c/style\x3e\x3c/head\x3e\x3cbody\x3e\x3cscript id\x3d"cke_actscrpt" type\x3d"text/javascript"\x3ewindow.parent.CKEDITOR.tools.callFunction('+CKEDITOR.tools.addFunction(k,a)+",this);\x3c/script\x3e\x3c/body\x3e\x3c/html\x3e",g=CKEDITOR.env.air?"javascript:void(0)":CKEDITOR.env.ie&&!CKEDITOR.env.edge?"javascript:void((function(){"+encodeURIComponent("document.open();("+CKEDITOR.tools.fixDomain+")();document.close();")+
-'})())"':"",d=CKEDITOR.dom.element.createFromHtml('\x3ciframe class\x3d"cke_pasteframe" frameborder\x3d"0"  allowTransparency\x3d"true" src\x3d"'+g+'" aria-label\x3d"'+h.pasteArea+'" aria-describedby\x3d"'+a.getContentElement("general","pasteMsg").domId+'"\x3e\x3c/iframe\x3e');f=null;d.on("load",function(a){a.removeListener();a=d.getFrameDocument();a.write(b);c.focusManager.add(a.getBody());CKEDITOR.env.air&&k.call(this,a.getWindow().$)},a);d.setCustomData("dialog",a);a=this.getElement();a.setHtml("");
-a.append(d);if(CKEDITOR.env.ie&&!CKEDITOR.env.edge){var e=CKEDITOR.dom.element.createFromHtml('\x3cspan tabindex\x3d"-1" style\x3d"position:absolute" role\x3d"presentation"\x3e\x3c/span\x3e');e.on("focus",function(){setTimeout(function(){d.$.contentWindow.focus()})});a.append(e);this.focus=function(){e.focus();this.fire("focus")}}this.getInputElement=function(){return d};CKEDITOR.env.ie&&(a.setStyle("display","block"),a.setStyle("height",d.$.offsetHeight+2+"px"))},commit:function(){var a=this.getDialog().getParentEditor(),
-b=this.getInputElement().getFrameDocument().getBody(),c=b.getBogus(),d;c&&c.remove();d=b.getHtml();setTimeout(function(){a.fire("pasteDialogCommit",{dataValue:d,dataTransfer:f||e.initPasteDataTransfer()})},0)}}]}]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.css b/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.css
deleted file mode 100644
index e284ba089..000000000
--- a/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.css
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * @license Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-.cke_colordialog_colorcell {
-	width: 12px; /* All cells have equal width which depends on parent width (in this case table parent). Width works more like max-width. */
-	height: 14px;
-	padding: 1px; /* Padding is replaced by border for focused cells. Prevents 'jumping' when adding borders. */
-}
-
-.cke_colordialog_colorcell.cke_colordialog_focused_light,
-.cke_colordialog_colorcell.cke_colordialog_focused_dark {
-	padding: 0; /* Shrink cell to allow 1px border indicating focus. */
-	border: 1px dotted #000;
-}
-
-.cke_colordialog_colorcell.cke_colordialog_focused_dark {
-	border-color: #FFF;
-}
diff --git a/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.js b/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.js
deleted file mode 100644
index ffd23d407..000000000
--- a/plugins/ckeditor/src/plugins/colordialog/dialogs/colordialog.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("colordialog",function(x){function m(){h.getById(n).removeStyle("background-color");p.getContentElement("picker","selectedColor").setValue("");y()}function z(a){a=a.data.getTarget();var c;"td"==a.getName()&&(c=a.getChild(0).getHtml())&&(y(),f=a,f.setAttribute("aria-selected",!0),f.addClass("cke_colordialog_selected"),p.getContentElement("picker","selectedColor").setValue(c))}function y(){f&&(f.removeClass("cke_colordialog_selected"),f.removeAttribute("aria-selected"),f=null)}function D(a){a=
-a.replace(/^#/,"");for(var c=0,b=[];2>=c;c++)b[c]=parseInt(a.substr(2*c,2),16);return 165<=.2126*b[0]+.7152*b[1]+.0722*b[2]}function A(a){!a.name&&(a=new CKEDITOR.event(a));var c=!/mouse/.test(a.name),b=a.data.getTarget(),g;"td"==b.getName()&&(g=b.getChild(0).getHtml())&&(q(a),c?d=b:B=b,c&&b.addClass(D(g)?"cke_colordialog_focused_light":"cke_colordialog_focused_dark"),r(g))}function q(a){if(a=!/mouse/.test(a.name)&&d)a.removeClass("cke_colordialog_focused_light"),a.removeClass("cke_colordialog_focused_dark");
-d||B||r(!1)}function r(a){a?(h.getById(t).setStyle("background-color",a),h.getById(u).setHtml(a)):(h.getById(t).removeStyle("background-color"),h.getById(u).setHtml("\x26nbsp;"))}function E(a){var c=a.data,b=c.getTarget(),g=c.getKeystroke(),e="rtl"==x.lang.dir;switch(g){case 38:if(a=b.getParent().getPrevious())a=a.getChild([b.getIndex()]),a.focus();c.preventDefault();break;case 40:(a=b.getParent().getNext())&&(a=a.getChild([b.getIndex()]))&&1==a.type&&a.focus();c.preventDefault();break;case 32:case 13:z(a);
-c.preventDefault();break;case e?37:39:(a=b.getNext())?1==a.type&&(a.focus(),c.preventDefault(!0)):(a=b.getParent().getNext())&&(a=a.getChild([0]))&&1==a.type&&(a.focus(),c.preventDefault(!0));break;case e?39:37:if(a=b.getPrevious())a.focus(),c.preventDefault(!0);else if(a=b.getParent().getPrevious())a=a.getLast(),a.focus(),c.preventDefault(!0)}}var v=CKEDITOR.dom.element,h=CKEDITOR.document,e=x.lang.colordialog,p,f,C={type:"html",html:"\x26nbsp;"},d,B,l=function(a){return CKEDITOR.tools.getNextId()+
-"_"+a},t=l("hicolor"),u=l("hicolortext"),n=l("selhicolor"),k;(function(){function a(a,d){for(var w=a;w<a+3;w++){var f=new v(k.$.insertRow(-1));f.setAttribute("role","row");for(var e=d;e<d+3;e++)for(var g=0;6>g;g++)c(f.$,"#"+b[e]+b[g]+b[w])}}function c(a,c){var b=new v(a.insertCell(-1));b.setAttribute("class","ColorCell cke_colordialog_colorcell");b.setAttribute("tabIndex",-1);b.setAttribute("role","gridcell");b.on("keydown",E);b.on("click",z);b.on("focus",A);b.on("blur",q);b.setStyle("background-color",
-c);var d=l("color_table_cell");b.setAttribute("aria-labelledby",d);b.append(CKEDITOR.dom.element.createFromHtml('\x3cspan id\x3d"'+d+'" class\x3d"cke_voice_label"\x3e'+c+"\x3c/span\x3e",CKEDITOR.document))}k=CKEDITOR.dom.element.createFromHtml('\x3ctable tabIndex\x3d"-1" class\x3d"cke_colordialog_table" aria-label\x3d"'+e.options+'" role\x3d"grid" style\x3d"border-collapse:separate;" cellspacing\x3d"0"\x3e\x3ccaption class\x3d"cke_voice_label"\x3e'+e.options+'\x3c/caption\x3e\x3ctbody role\x3d"presentation"\x3e\x3c/tbody\x3e\x3c/table\x3e');
-k.on("mouseover",A);k.on("mouseout",q);var b="00 33 66 99 cc ff".split(" ");a(0,0);a(3,0);a(0,3);a(3,3);var g=new v(k.$.insertRow(-1));g.setAttribute("role","row");c(g.$,"#000000");for(var f=0;16>f;f++){var d=f.toString(16);c(g.$,"#"+d+d+d+d+d+d)}c(g.$,"#ffffff")})();CKEDITOR.document.appendStyleSheet(CKEDITOR.getUrl(CKEDITOR.plugins.get("colordialog").path+"dialogs/colordialog.css"));return{title:e.title,minWidth:360,minHeight:220,onLoad:function(){p=this},onHide:function(){m();d.removeClass("cke_colordialog_focused_light");
-d.removeClass("cke_colordialog_focused_dark");r(!1);d=null},contents:[{id:"picker",label:e.title,accessKey:"I",elements:[{type:"hbox",padding:0,widths:["70%","10%","30%"],children:[{type:"html",html:"\x3cdiv\x3e\x3c/div\x3e",onLoad:function(){CKEDITOR.document.getById(this.domId).append(k)},focus:function(){(d||this.getElement().getElementsByTag("td").getItem(0)).focus()}},C,{type:"vbox",padding:0,widths:["70%","5%","25%"],children:[{type:"html",html:"\x3cspan\x3e"+e.highlight+'\x3c/span\x3e\x3cdiv id\x3d"'+
-t+'" style\x3d"border: 1px solid; height: 74px; width: 74px;"\x3e\x3c/div\x3e\x3cdiv id\x3d"'+u+'"\x3e\x26nbsp;\x3c/div\x3e\x3cspan\x3e'+e.selected+'\x3c/span\x3e\x3cdiv id\x3d"'+n+'" style\x3d"border: 1px solid; height: 20px; width: 74px;"\x3e\x3c/div\x3e'},{type:"text",label:e.selected,labelStyle:"display:none",id:"selectedColor",style:"width: 76px;margin-top:4px",onChange:function(){try{h.getById(n).setStyle("background-color",this.getValue())}catch(a){m()}}},C,{type:"button",id:"clear",label:e.clear,
-onClick:m}]}]}]}]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/dialog/dialogDefinition.js b/plugins/ckeditor/src/plugins/dialog/dialogDefinition.js
deleted file mode 100644
index cb8cdfcd3..000000000
--- a/plugins/ckeditor/src/plugins/dialog/dialogDefinition.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
diff --git a/plugins/ckeditor/src/plugins/icons.png b/plugins/ckeditor/src/plugins/icons.png
deleted file mode 100644
index 06ef8f78a..000000000
Binary files a/plugins/ckeditor/src/plugins/icons.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/icons_hidpi.png b/plugins/ckeditor/src/plugins/icons_hidpi.png
deleted file mode 100644
index 2497f4f19..000000000
Binary files a/plugins/ckeditor/src/plugins/icons_hidpi.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/image/dialogs/image.js b/plugins/ckeditor/src/plugins/image/dialogs/image.js
deleted file mode 100644
index df428200d..000000000
--- a/plugins/ckeditor/src/plugins/image/dialogs/image.js
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){var v=function(d,l){function v(){var a=arguments,b=this.getContentElement("advanced","txtdlgGenStyle");b&&b.commit.apply(b,a);this.foreach(function(b){b.commit&&"txtdlgGenStyle"!=b.id&&b.commit.apply(b,a)})}function k(a){if(!w){w=1;var b=this.getDialog(),c=b.imageElement;if(c){this.commit(1,c);a=[].concat(a);for(var d=a.length,f,g=0;g<d;g++)(f=b.getContentElement.apply(b,a[g].split(":")))&&f.setup(1,c)}w=0}}var m=/^\s*(\d+)((px)|\%)?\s*$/i,z=/(^\s*(\d+)((px)|\%)?\s*$)|^$/i,r=/^\d+px$/,
-A=function(){var a=this.getValue(),b=this.getDialog(),c=a.match(m);c&&("%"==c[2]&&n(b,!1),a=c[1]);b.lockRatio&&(c=b.originalElement,"true"==c.getCustomData("isReady")&&("txtHeight"==this.id?(a&&"0"!=a&&(a=Math.round(a/c.$.height*c.$.width)),isNaN(a)||b.setValueOf("info","txtWidth",a)):(a&&"0"!=a&&(a=Math.round(a/c.$.width*c.$.height)),isNaN(a)||b.setValueOf("info","txtHeight",a))));e(b)},e=function(a){if(!a.originalElement||!a.preview)return 1;a.commitContent(4,a.preview);return 0},w,n=function(a,
-b){if(!a.getContentElement("info","ratioLock"))return null;var c=a.originalElement;if(!c)return null;if("check"==b){if(!a.userlockRatio&&"true"==c.getCustomData("isReady")){var d=a.getValueOf("info","txtWidth"),f=a.getValueOf("info","txtHeight"),c=1E3*c.$.width/c.$.height,g=1E3*d/f;a.lockRatio=!1;d||f?isNaN(c)||isNaN(g)||Math.round(c)!=Math.round(g)||(a.lockRatio=!0):a.lockRatio=!0}}else void 0!==b?a.lockRatio=b:(a.userlockRatio=1,a.lockRatio=!a.lockRatio);d=CKEDITOR.document.getById(t);a.lockRatio?
-d.removeClass("cke_btn_unlocked"):d.addClass("cke_btn_unlocked");d.setAttribute("aria-checked",a.lockRatio);CKEDITOR.env.hc&&d.getChild(0).setHtml(a.lockRatio?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢");return a.lockRatio},B=function(a,b){var c=a.originalElement;if("true"==c.getCustomData("isReady")){var d=a.getContentElement("info","txtWidth"),f=a.getContentElement("info","txtHeight"),g;b?c=g=0:(g=c.$.width,c=c.$.height);d&&d.setValue(g);f&&f.setValue(c)}e(a)},C=function(a,b){function c(a,b){var c=
-a.match(m);return c?("%"==c[2]&&(c[1]+="%",n(d,!1)),c[1]):b}if(1==a){var d=this.getDialog(),f="",g="txtWidth"==this.id?"width":"height",e=b.getAttribute(g);e&&(f=c(e,f));f=c(b.getStyle(g),f);this.setValue(f)}},x,u=function(){var a=this.originalElement,b=CKEDITOR.document.getById(p);a.setCustomData("isReady","true");a.removeListener("load",u);a.removeListener("error",h);a.removeListener("abort",h);b&&b.setStyle("display","none");this.dontResetSize||B(this,!1===d.config.image_prefillDimensions);this.firstLoad&&
-CKEDITOR.tools.setTimeout(function(){n(this,"check")},0,this);this.dontResetSize=this.firstLoad=!1;e(this)},h=function(){var a=this.originalElement,b=CKEDITOR.document.getById(p);a.removeListener("load",u);a.removeListener("error",h);a.removeListener("abort",h);a=CKEDITOR.getUrl(CKEDITOR.plugins.get("image").path+"images/noimage.png");this.preview&&this.preview.setAttribute("src",a);b&&b.setStyle("display","none");n(this,!1)},q=function(a){return CKEDITOR.tools.getNextId()+"_"+a},t=q("btnLockSizes"),
-y=q("btnResetSize"),p=q("ImagePreviewLoader"),E=q("previewLink"),D=q("previewImage");return{title:d.lang.image["image"==l?"title":"titleButton"],minWidth:"moono-lisa"==(CKEDITOR.skinName||d.config.skin)?500:420,minHeight:360,onShow:function(){this.linkEditMode=this.imageEditMode=this.linkElement=this.imageElement=!1;this.lockRatio=!0;this.userlockRatio=0;this.dontResetSize=!1;this.firstLoad=!0;this.addLink=!1;var a=this.getParentEditor(),b=a.getSelection(),c=(b=b&&b.getSelectedElement())&&a.elementPath(b).contains("a",
-1),d=CKEDITOR.document.getById(p);d&&d.setStyle("display","none");x=new CKEDITOR.dom.element("img",a.document);this.preview=CKEDITOR.document.getById(D);this.originalElement=a.document.createElement("img");this.originalElement.setAttribute("alt","");this.originalElement.setCustomData("isReady","false");c&&(this.linkElement=c,this.addLink=this.linkEditMode=!0,a=c.getChildren(),1==a.count()&&(d=a.getItem(0),d.type==CKEDITOR.NODE_ELEMENT&&(d.is("img")||d.is("input"))&&(this.imageElement=a.getItem(0),
-this.imageElement.is("img")?this.imageEditMode="img":this.imageElement.is("input")&&(this.imageEditMode="input"))),"image"==l&&this.setupContent(2,c));if(this.customImageElement)this.imageEditMode="img",this.imageElement=this.customImageElement,delete this.customImageElement;else if(b&&"img"==b.getName()&&!b.data("cke-realelement")||b&&"input"==b.getName()&&"image"==b.getAttribute("type"))this.imageEditMode=b.getName(),this.imageElement=b;this.imageEditMode&&(this.cleanImageElement=this.imageElement,
-this.imageElement=this.cleanImageElement.clone(!0,!0),this.setupContent(1,this.imageElement));n(this,!0);CKEDITOR.tools.trim(this.getValueOf("info","txtUrl"))||(this.preview.removeAttribute("src"),this.preview.setStyle("display","none"))},onOk:function(){if(this.imageEditMode){var a=this.imageEditMode;"image"==l&&"input"==a&&confirm(d.lang.image.button2Img)?(this.imageElement=d.document.createElement("img"),this.imageElement.setAttribute("alt",""),d.insertElement(this.imageElement)):"image"!=l&&"img"==
-a&&confirm(d.lang.image.img2Button)?(this.imageElement=d.document.createElement("input"),this.imageElement.setAttributes({type:"image",alt:""}),d.insertElement(this.imageElement)):(this.imageElement=this.cleanImageElement,delete this.cleanImageElement)}else"image"==l?this.imageElement=d.document.createElement("img"):(this.imageElement=d.document.createElement("input"),this.imageElement.setAttribute("type","image")),this.imageElement.setAttribute("alt","");this.linkEditMode||(this.linkElement=d.document.createElement("a"));
-this.commitContent(1,this.imageElement);this.commitContent(2,this.linkElement);this.imageElement.getAttribute("style")||this.imageElement.removeAttribute("style");this.imageEditMode?!this.linkEditMode&&this.addLink?(d.insertElement(this.linkElement),this.imageElement.appendTo(this.linkElement)):this.linkEditMode&&!this.addLink&&(d.getSelection().selectElement(this.linkElement),d.insertElement(this.imageElement)):this.addLink?this.linkEditMode?this.linkElement.equals(d.getSelection().getSelectedElement())?
-(this.linkElement.setHtml(""),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement):(d.insertElement(this.linkElement),this.linkElement.append(this.imageElement,!1)):d.insertElement(this.imageElement)},onLoad:function(){"image"!=l&&this.hidePage("Link");var a=this._.element.getDocument();this.getContentElement("info","ratioLock")&&(this.addFocusable(a.getById(y),5),this.addFocusable(a.getById(t),5));this.commitContent=v},onHide:function(){this.preview&&this.commitContent(8,
-this.preview);this.originalElement&&(this.originalElement.removeListener("load",u),this.originalElement.removeListener("error",h),this.originalElement.removeListener("abort",h),this.originalElement.remove(),this.originalElement=!1);delete this.imageElement},contents:[{id:"info",label:d.lang.image.infoTab,accessKey:"I",elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["280px","110px"],align:"right",className:"cke_dialog_image_url",children:[{id:"txtUrl",type:"text",label:d.lang.common.url,
-required:!0,onChange:function(){var a=this.getDialog(),b=this.getValue();if(0<b.length){var a=this.getDialog(),c=a.originalElement;a.preview&&a.preview.removeStyle("display");c.setCustomData("isReady","false");var d=CKEDITOR.document.getById(p);d&&d.setStyle("display","");c.on("load",u,a);c.on("error",h,a);c.on("abort",h,a);c.setAttribute("src",b);a.preview&&(x.setAttribute("src",b),a.preview.setAttribute("src",x.$.src),e(a))}else a.preview&&(a.preview.removeAttribute("src"),a.preview.setStyle("display",
-"none"))},setup:function(a,b){if(1==a){var c=b.data("cke-saved-src")||b.getAttribute("src");this.getDialog().dontResetSize=!0;this.setValue(c);this.setInitValue()}},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())?(b.data("cke-saved-src",this.getValue()),b.setAttribute("src",this.getValue())):8==a&&(b.setAttribute("src",""),b.removeAttribute("src"))},validate:CKEDITOR.dialog.validate.notEmpty(d.lang.image.urlMissing)},{type:"button",id:"browse",style:"display:inline-block;margin-top:14px;",
-align:"center",label:d.lang.common.browseServer,hidden:!0,filebrowser:"info:txtUrl"}]}]},{id:"txtAlt",type:"text",label:d.lang.image.alt,accessKey:"T","default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("alt"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("alt",this.getValue()):4==a?b.setAttribute("alt",this.getValue()):8==a&&b.removeAttribute("alt")}},{type:"hbox",children:[{id:"basic",type:"vbox",children:[{type:"hbox",
-requiredContent:"img{width,height}",widths:["50%","50%"],children:[{type:"vbox",padding:1,children:[{type:"text",width:"45px",id:"txtWidth",label:d.lang.common.width,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||alert(d.lang.common.invalidWidth);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("width",CKEDITOR.tools.cssLength(c)):
-b.removeStyle("width"),b.removeAttribute("width")):4==a?c.match(m)?b.setStyle("width",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("width",c.$.width+"px")):8==a&&(b.removeAttribute("width"),b.removeStyle("width"))}},{type:"text",id:"txtHeight",width:"45px",label:d.lang.common.height,onKeyUp:A,onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:function(){var a=this.getValue().match(z);(a=!(!a||0===parseInt(a[1],10)))||
-alert(d.lang.common.invalidHeight);return a},setup:C,commit:function(a,b){var c=this.getValue();1==a?(c&&d.activeFilter.check("img{width,height}")?b.setStyle("height",CKEDITOR.tools.cssLength(c)):b.removeStyle("height"),b.removeAttribute("height")):4==a?c.match(m)?b.setStyle("height",CKEDITOR.tools.cssLength(c)):(c=this.getDialog().originalElement,"true"==c.getCustomData("isReady")&&b.setStyle("height",c.$.height+"px")):8==a&&(b.removeAttribute("height"),b.removeStyle("height"))}}]},{id:"ratioLock",
-type:"html",className:"cke_dialog_image_ratiolock",style:"margin-top:30px;width:40px;height:40px;",onLoad:function(){var a=CKEDITOR.document.getById(y),b=CKEDITOR.document.getById(t);a&&(a.on("click",function(a){B(this);a.data&&a.data.preventDefault()},this.getDialog()),a.on("mouseover",function(){this.addClass("cke_btn_over")},a),a.on("mouseout",function(){this.removeClass("cke_btn_over")},a));b&&(b.on("click",function(a){n(this);var b=this.originalElement,d=this.getValueOf("info","txtWidth");"true"==
-b.getCustomData("isReady")&&d&&(b=b.$.height/b.$.width*d,isNaN(b)||(this.setValueOf("info","txtHeight",Math.round(b)),e(this)));a.data&&a.data.preventDefault()},this.getDialog()),b.on("mouseover",function(){this.addClass("cke_btn_over")},b),b.on("mouseout",function(){this.removeClass("cke_btn_over")},b))},html:'\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"'+t+'" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+
-d.lang.image.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+d.lang.image.resetSize+'" class\x3d"cke_btn_reset" id\x3d"'+y+'" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+d.lang.image.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e"}]},{type:"vbox",padding:1,children:[{type:"text",id:"txtBorder",requiredContent:"img{border-width}",width:"60px",label:d.lang.image.border,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,
-"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateBorder),setup:function(a,b){if(1==a){var c;c=(c=(c=b.getStyle("border-width"))&&c.match(/^(\d+px)(?: \1 \1 \1)?$/))&&parseInt(c[1],10);isNaN(parseInt(c,10))&&(c=b.getAttribute("border"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&b.removeStyle("border"):(b.setStyle("border-width",CKEDITOR.tools.cssLength(c)),b.setStyle("border-style",
-"solid")),1==a&&b.removeAttribute("border")):8==a&&(b.removeAttribute("border"),b.removeStyle("border-width"),b.removeStyle("border-style"),b.removeStyle("border-color"))}},{type:"text",id:"txtHSpace",requiredContent:"img{margin-left,margin-right}",width:"60px",label:d.lang.image.hSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateHSpace),setup:function(a,b){if(1==a){var c,
-d;c=b.getStyle("margin-left");d=b.getStyle("margin-right");c=c&&c.match(r);d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("hspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-left"),b.removeStyle("margin-right")):(b.setStyle("margin-left",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-right",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("hspace")):
-8==a&&(b.removeAttribute("hspace"),b.removeStyle("margin-left"),b.removeStyle("margin-right"))}},{type:"text",id:"txtVSpace",requiredContent:"img{margin-top,margin-bottom}",width:"60px",label:d.lang.image.vSpace,"default":"",onKeyUp:function(){e(this.getDialog())},onChange:function(){k.call(this,"advanced:txtdlgGenStyle")},validate:CKEDITOR.dialog.validate.integer(d.lang.image.validateVSpace),setup:function(a,b){if(1==a){var c,d;c=b.getStyle("margin-top");d=b.getStyle("margin-bottom");c=c&&c.match(r);
-d=d&&d.match(r);c=parseInt(c,10);d=parseInt(d,10);c=c==d&&c;isNaN(parseInt(c,10))&&(c=b.getAttribute("vspace"));this.setValue(c)}},commit:function(a,b){var c=parseInt(this.getValue(),10);1==a||4==a?(isNaN(c)?!c&&this.isChanged()&&(b.removeStyle("margin-top"),b.removeStyle("margin-bottom")):(b.setStyle("margin-top",CKEDITOR.tools.cssLength(c)),b.setStyle("margin-bottom",CKEDITOR.tools.cssLength(c))),1==a&&b.removeAttribute("vspace")):8==a&&(b.removeAttribute("vspace"),b.removeStyle("margin-top"),b.removeStyle("margin-bottom"))}},
-{id:"cmbAlign",requiredContent:"img{float}",type:"select",widths:["35%","65%"],style:"width:90px",label:d.lang.common.align,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.alignLeft,"left"],[d.lang.common.alignRight,"right"]],onChange:function(){e(this.getDialog());k.call(this,"advanced:txtdlgGenStyle")},setup:function(a,b){if(1==a){var c=b.getStyle("float");switch(c){case "inherit":case "none":c=""}!c&&(c=(b.getAttribute("align")||"").toLowerCase());this.setValue(c)}},commit:function(a,
-b){var c=this.getValue();if(1==a||4==a){if(c?b.setStyle("float",c):b.removeStyle("float"),1==a)switch(c=(b.getAttribute("align")||"").toLowerCase(),c){case "left":case "right":b.removeAttribute("align")}}else 8==a&&b.removeStyle("float")}}]}]},{type:"vbox",height:"250px",children:[{type:"html",id:"htmlPreview",style:"width:95%;",html:"\x3cdiv\x3e"+CKEDITOR.tools.htmlEncode(d.lang.common.preview)+'\x3cbr\x3e\x3cdiv id\x3d"'+p+'" class\x3d"ImagePreviewLoader" style\x3d"display:none"\x3e\x3cdiv class\x3d"loading"\x3e\x26nbsp;\x3c/div\x3e\x3c/div\x3e\x3cdiv class\x3d"ImagePreviewBox"\x3e\x3ctable\x3e\x3ctr\x3e\x3ctd\x3e\x3ca href\x3d"javascript:void(0)" target\x3d"_blank" onclick\x3d"return false;" id\x3d"'+
-E+'"\x3e\x3cimg id\x3d"'+D+'" alt\x3d"" /\x3e\x3c/a\x3e'+(d.config.image_previewText||"Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas feugiat consequat diam. Maecenas metus. Vivamus diam purus, cursus a, commodo non, facilisis vitae, nulla. Aenean dictum lacinia tortor. Nunc iaculis, nibh non iaculis aliquam, orci felis euismod neque, sed ornare massa mauris sed velit. Nulla pretium mi et risus. Fusce mi pede, tempor id, cursus ac, ullamcorper nec, enim. Sed tortor. Curabitur molestie. Duis velit augue, condimentum at, ultrices a, luctus ut, orci. Donec pellentesque egestas eros. Integer cursus, augue in cursus faucibus, eros pede bibendum sem, in tempus tellus justo quis ligula. Etiam eget tortor. Vestibulum rutrum, est ut placerat elementum, lectus nisl aliquam velit, tempor aliquam eros nunc nonummy metus. In eros metus, gravida a, gravida sed, lobortis id, turpis. Ut ultrices, ipsum at venenatis fringilla, sem nulla lacinia tellus, eget aliquet turpis mauris non enim. Nam turpis. Suspendisse lacinia. Curabitur ac tortor ut ipsum egestas elementum. Nunc imperdiet gravida mauris.")+
-"\x3c/td\x3e\x3c/tr\x3e\x3c/table\x3e\x3c/div\x3e\x3c/div\x3e"}]}]}]},{id:"Link",requiredContent:"a[href]",label:d.lang.image.linkTab,padding:0,elements:[{id:"txtUrl",type:"text",label:d.lang.common.url,style:"width: 100%","default":"",setup:function(a,b){if(2==a){var c=b.data("cke-saved-href");c||(c=b.getAttribute("href"));this.setValue(c)}},commit:function(a,b){if(2==a&&(this.getValue()||this.isChanged())){var c=this.getValue();b.data("cke-saved-href",c);b.setAttribute("href",c);this.getValue()||
-!d.config.image_removeLinkByEmptyURL?this.getDialog().addLink=!0:this.getDialog().addLink=!1}}},{type:"button",id:"browse",className:"cke_dialog_image_browse",filebrowser:{action:"Browse",target:"Link:txtUrl",url:d.config.filebrowserImageBrowseLinkUrl},style:"float:right",hidden:!0,label:d.lang.common.browseServer},{id:"cmbTarget",type:"select",requiredContent:"a[target]",label:d.lang.common.target,"default":"",items:[[d.lang.common.notSet,""],[d.lang.common.targetNew,"_blank"],[d.lang.common.targetTop,
-"_top"],[d.lang.common.targetSelf,"_self"],[d.lang.common.targetParent,"_parent"]],setup:function(a,b){2==a&&this.setValue(b.getAttribute("target")||"")},commit:function(a,b){2==a&&(this.getValue()||this.isChanged())&&b.setAttribute("target",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:d.lang.image.upload,elements:[{type:"file",id:"upload",label:d.lang.image.btnUpload,style:"height:40px",size:38},{type:"fileButton",id:"uploadButton",filebrowser:"info:txtUrl",label:d.lang.image.btnUpload,
-"for":["Upload","upload"]}]},{id:"advanced",label:d.lang.common.advancedTab,elements:[{type:"hbox",widths:["50%","25%","25%"],children:[{type:"text",id:"linkId",requiredContent:"img[id]",label:d.lang.common.id,setup:function(a,b){1==a&&this.setValue(b.getAttribute("id"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("id",this.getValue())}},{id:"cmbLangDir",type:"select",requiredContent:"img[dir]",style:"width : 100px;",label:d.lang.common.langDir,"default":"",items:[[d.lang.common.notSet,
-""],[d.lang.common.langDirLtr,"ltr"],[d.lang.common.langDirRtl,"rtl"]],setup:function(a,b){1==a&&this.setValue(b.getAttribute("dir"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("dir",this.getValue())}},{type:"text",id:"txtLangCode",requiredContent:"img[lang]",label:d.lang.common.langCode,"default":"",setup:function(a,b){1==a&&this.setValue(b.getAttribute("lang"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("lang",this.getValue())}}]},
-{type:"text",id:"txtGenLongDescr",requiredContent:"img[longdesc]",label:d.lang.common.longDescr,setup:function(a,b){1==a&&this.setValue(b.getAttribute("longDesc"))},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("longDesc",this.getValue())}},{type:"hbox",widths:["50%","50%"],children:[{type:"text",id:"txtGenClass",requiredContent:"img(cke-xyz)",label:d.lang.common.cssClass,"default":"",setup:function(a,b){1==a&&this.setValue(b.getAttribute("class"))},commit:function(a,
-b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("class",this.getValue())}},{type:"text",id:"txtGenTitle",requiredContent:"img[title]",label:d.lang.common.advisoryTitle,"default":"",onChange:function(){e(this.getDialog())},setup:function(a,b){1==a&&this.setValue(b.getAttribute("title"))},commit:function(a,b){1==a?(this.getValue()||this.isChanged())&&b.setAttribute("title",this.getValue()):4==a?b.setAttribute("title",this.getValue()):8==a&&b.removeAttribute("title")}}]},{type:"text",id:"txtdlgGenStyle",
-requiredContent:"img{cke-xyz}",label:d.lang.common.cssStyle,validate:CKEDITOR.dialog.validate.inlineStyle(d.lang.common.invalidInlineStyle),"default":"",setup:function(a,b){if(1==a){var c=b.getAttribute("style");!c&&b.$.style.cssText&&(c=b.$.style.cssText);this.setValue(c);var d=b.$.style.height,c=b.$.style.width,d=(d?d:"").match(m),c=(c?c:"").match(m);this.attributesInStyle={height:!!d,width:!!c}}},onChange:function(){k.call(this,"info:cmbFloat info:cmbAlign info:txtVSpace info:txtHSpace info:txtBorder info:txtWidth info:txtHeight".split(" "));
-e(this)},commit:function(a,b){1==a&&(this.getValue()||this.isChanged())&&b.setAttribute("style",this.getValue())}}]}]}};CKEDITOR.dialog.add("image",function(d){return v(d,"image")});CKEDITOR.dialog.add("imagebutton",function(d){return v(d,"imagebutton")})})();
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/image/images/noimage.png b/plugins/ckeditor/src/plugins/image/images/noimage.png
deleted file mode 100644
index 74c6ee926..000000000
Binary files a/plugins/ckeditor/src/plugins/image/images/noimage.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/image2/dialogs/image2.js b/plugins/ckeditor/src/plugins/image2/dialogs/image2.js
deleted file mode 100644
index b9026ccd0..000000000
--- a/plugins/ckeditor/src/plugins/image2/dialogs/image2.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("image2",function(f){function C(){var a=this.getValue().match(D);(a=!(!a||0===parseInt(a[1],10)))||alert(c["invalid"+CKEDITOR.tools.capitalize(this.id)]);return a}function N(){function a(a,c){q.push(b.once(a,function(a){for(var b;b=q.pop();)b.removeListener();c(a)}))}var b=r.createElement("img"),q=[];return function(q,c,e){a("load",function(){var a=E(b);c.call(e,b,a.width,a.height)});a("error",function(){c(null)});a("abort",function(){c(null)});b.setAttribute("src",(w.baseHref||
-"")+q+"?"+Math.random().toString(16).substring(2))}}function F(){var a=this.getValue();t(!1);a!==x.data.src?(G(a,function(a,b,c){t(!0);if(!a)return k(!1);g.setValue(!1===f.config.image2_prefillDimensions?0:b);h.setValue(!1===f.config.image2_prefillDimensions?0:c);u=b;v=c;k(H.checkHasNaturalRatio(a))}),l=!0):l?(t(!0),g.setValue(m),h.setValue(n),l=!1):t(!0)}function I(){if(e){var a=this.getValue();if(a&&(a.match(D)||k(!1),"0"!==a)){var b="width"==this.id,c=m||u,d=n||v,a=b?Math.round(a/c*d):Math.round(a/
-d*c);isNaN(a)||(b?h:g).setValue(a)}}}function k(a){if(d){if("boolean"==typeof a){if(y)return;e=a}else a=g.getValue(),y=!0,(e=!e)&&a&&(a*=n/m,isNaN(a)||h.setValue(Math.round(a)));d[e?"removeClass":"addClass"]("cke_btn_unlocked");d.setAttribute("aria-checked",e);CKEDITOR.env.hc&&d.getChild(0).setHtml(e?CKEDITOR.env.ie?"■":"▣":CKEDITOR.env.ie?"□":"▢")}}function t(a){a=a?"enable":"disable";g[a]();h[a]()}var D=/(^\s*(\d+)(px)?\s*$)|^$/i,J=CKEDITOR.tools.getNextId(),K=CKEDITOR.tools.getNextId(),b=f.lang.image2,
-c=f.lang.common,O=(new CKEDITOR.template('\x3cdiv\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.lockRatio+'" class\x3d"cke_btn_locked" id\x3d"{lockButtonId}" role\x3d"checkbox"\x3e\x3cspan class\x3d"cke_icon"\x3e\x3c/span\x3e\x3cspan class\x3d"cke_label"\x3e'+b.lockRatio+'\x3c/span\x3e\x3c/a\x3e\x3ca href\x3d"javascript:void(0)" tabindex\x3d"-1" title\x3d"'+b.resetSize+'" class\x3d"cke_btn_reset" id\x3d"{resetButtonId}" role\x3d"button"\x3e\x3cspan class\x3d"cke_label"\x3e'+
-b.resetSize+"\x3c/span\x3e\x3c/a\x3e\x3c/div\x3e")).output({lockButtonId:J,resetButtonId:K}),H=CKEDITOR.plugins.image2,w=f.config,z=!(!w.filebrowserImageBrowseUrl&&!w.filebrowserBrowseUrl),A=f.widgets.registered.image.features,E=H.getNatural,r,x,L,G,m,n,u,v,l,e,y,d,p,g,h,B,M=[{id:"src",type:"text",label:c.url,onKeyup:F,onChange:F,setup:function(a){this.setValue(a.data.src)},commit:function(a){a.setData("src",this.getValue())},validate:CKEDITOR.dialog.validate.notEmpty(b.urlMissing)}];z&&M.push({type:"button",
-id:"browse",style:"display:inline-block;margin-top:14px;",align:"center",label:f.lang.common.browseServer,hidden:!0,filebrowser:"info:src"});return{title:b.title,minWidth:250,minHeight:100,onLoad:function(){r=this._.element.getDocument();G=N()},onShow:function(){x=this.widget;L=x.parts.image;l=y=e=!1;B=E(L);u=m=B.width;v=n=B.height},contents:[{id:"info",label:b.infoTab,elements:[{type:"vbox",padding:0,children:[{type:"hbox",widths:["100%"],className:"cke_dialog_image_url",children:M}]},{id:"alt",
-type:"text",label:b.alt,setup:function(a){this.setValue(a.data.alt)},commit:function(a){a.setData("alt",this.getValue())},validate:!0===f.config.image2_altRequired?CKEDITOR.dialog.validate.notEmpty(b.altMissing):null},{type:"hbox",widths:["25%","25%","50%"],requiredContent:A.dimension.requiredContent,children:[{type:"text",width:"45px",id:"width",label:c.width,validate:C,onKeyUp:I,onLoad:function(){g=this},setup:function(a){this.setValue(a.data.width)},commit:function(a){a.setData("width",this.getValue())}},
-{type:"text",id:"height",width:"45px",label:c.height,validate:C,onKeyUp:I,onLoad:function(){h=this},setup:function(a){this.setValue(a.data.height)},commit:function(a){a.setData("height",this.getValue())}},{id:"lock",type:"html",style:"margin-top:18px;width:40px;height:20px;",onLoad:function(){function a(a){a.on("mouseover",function(){this.addClass("cke_btn_over")},a);a.on("mouseout",function(){this.removeClass("cke_btn_over")},a)}var b=this.getDialog();d=r.getById(J);p=r.getById(K);d&&(b.addFocusable(d,
-4+z),d.on("click",function(a){k();a.data&&a.data.preventDefault()},this.getDialog()),a(d));p&&(b.addFocusable(p,5+z),p.on("click",function(a){l?(g.setValue(u),h.setValue(v)):(g.setValue(m),h.setValue(n));a.data&&a.data.preventDefault()},this),a(p))},setup:function(a){k(a.data.lock)},commit:function(a){a.setData("lock",e)},html:O}]},{type:"hbox",id:"alignment",requiredContent:A.align.requiredContent,children:[{id:"align",type:"radio",items:[[c.alignNone,"none"],[c.alignLeft,"left"],[c.alignCenter,
-"center"],[c.alignRight,"right"]],label:c.align,setup:function(a){this.setValue(a.data.align)},commit:function(a){a.setData("align",this.getValue())}}]},{id:"hasCaption",type:"checkbox",label:b.captioned,requiredContent:A.caption.requiredContent,setup:function(a){this.setValue(a.data.hasCaption)},commit:function(a){a.setData("hasCaption",this.getValue())}}]},{id:"Upload",hidden:!0,filebrowser:"uploadButton",label:b.uploadTab,elements:[{type:"file",id:"upload",label:b.btnUpload,style:"height:40px"},
-{type:"fileButton",id:"uploadButton",filebrowser:"info:src",label:b.btnUpload,"for":["Upload","upload"]}]}]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/link/dialogs/anchor.js b/plugins/ckeditor/src/plugins/link/dialogs/anchor.js
deleted file mode 100644
index a3607f0e6..000000000
--- a/plugins/ckeditor/src/plugins/link/dialogs/anchor.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-CKEDITOR.dialog.add("anchor",function(c){function d(a,b){return a.createFakeElement(a.document.createElement("a",{attributes:b}),"cke_anchor","anchor")}return{title:c.lang.link.anchor.title,minWidth:300,minHeight:60,onOk:function(){var a=CKEDITOR.tools.trim(this.getValueOf("info","txtName")),a={id:a,name:a,"data-cke-saved-name":a};if(this._.selectedElement)this._.selectedElement.data("cke-realelement")?(a=d(c,a),a.replace(this._.selectedElement),CKEDITOR.env.ie&&c.getSelection().selectElement(a)):
-this._.selectedElement.setAttributes(a);else{var b=c.getSelection(),b=b&&b.getRanges()[0];b.collapsed?(a=d(c,a),b.insertNode(a)):(CKEDITOR.env.ie&&9>CKEDITOR.env.version&&(a["class"]="cke_anchor"),a=new CKEDITOR.style({element:"a",attributes:a}),a.type=CKEDITOR.STYLE_INLINE,c.applyStyle(a))}},onHide:function(){delete this._.selectedElement},onShow:function(){var a=c.getSelection(),b=a.getSelectedElement(),d=b&&b.data("cke-realelement"),e=d?CKEDITOR.plugins.link.tryRestoreFakeAnchor(c,b):CKEDITOR.plugins.link.getSelectedLink(c);
-if(e){this._.selectedElement=e;var f=e.data("cke-saved-name");this.setValueOf("info","txtName",f||"");!d&&a.selectElement(e);b&&(this._.selectedElement=b)}this.getContentElement("info","txtName").focus()},contents:[{id:"info",label:c.lang.link.anchor.title,accessKey:"I",elements:[{type:"text",id:"txtName",label:c.lang.link.anchor.name,required:!0,validate:function(){return this.getValue()?!0:(alert(c.lang.link.anchor.errorName),!1)}}]}]}});
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/link/dialogs/link.js b/plugins/ckeditor/src/plugins/link/dialogs/link.js
deleted file mode 100644
index 14a41902f..000000000
--- a/plugins/ckeditor/src/plugins/link/dialogs/link.js
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){CKEDITOR.dialog.add("link",function(e){var m=CKEDITOR.plugins.link,p,q=function(){var a=this.getDialog(),b=a.getContentElement("target","popupFeatures"),a=a.getContentElement("target","linkTargetName"),n=this.getValue();if(b&&a)switch(b=b.getElement(),b.hide(),a.setValue(""),n){case "frame":a.setLabel(e.lang.link.targetFrameName);a.getElement().show();break;case "popup":b.show();a.setLabel(e.lang.link.targetPopupName);a.getElement().show();break;default:a.setValue(n),a.getElement().hide()}},
-h=function(a){a.target&&this.setValue(a.target[this.id]||"")},f=function(a){a.advanced&&this.setValue(a.advanced[this.id]||"")},k=function(a){a.target||(a.target={});a.target[this.id]=this.getValue()||""},l=function(a){a.advanced||(a.advanced={});a.advanced[this.id]=this.getValue()||""},c=e.lang.common,b=e.lang.link,g;return{title:b.title,minWidth:"moono-lisa"==(CKEDITOR.skinName||e.config.skin)?450:350,minHeight:240,contents:[{id:"info",label:b.info,title:b.info,elements:[{type:"text",id:"linkDisplayText",
-label:b.displayText,setup:function(){this.enable();this.setValue(e.getSelection().getSelectedText());p=this.getValue()},commit:function(a){a.linkText=this.isEnabled()?this.getValue():""}},{id:"linkType",type:"select",label:b.type,"default":"url",items:[[b.toUrl,"url"],[b.toAnchor,"anchor"],[b.toEmail,"email"]],onChange:function(){var a=this.getDialog(),b=["urlOptions","anchorOptions","emailOptions"],n=this.getValue(),d=a.definition.getContents("upload"),d=d&&d.hidden;"url"==n?(e.config.linkShowTargetTab&&
-a.showPage("target"),d||a.showPage("upload")):(a.hidePage("target"),d||a.hidePage("upload"));for(d=0;d<b.length;d++){var c=a.getContentElement("info",b[d]);c&&(c=c.getElement().getParent().getParent(),b[d]==n+"Options"?c.show():c.hide())}a.layout()},setup:function(a){this.setValue(a.type||"url")},commit:function(a){a.type=this.getValue()}},{type:"vbox",id:"urlOptions",children:[{type:"hbox",widths:["25%","75%"],children:[{id:"protocol",type:"select",label:c.protocol,"default":"http://",items:[["http://‎",
-"http://"],["https://‎","https://"],["ftp://‎","ftp://"],["news://‎","news://"],[b.other,""]],setup:function(a){a.url&&this.setValue(a.url.protocol||"")},commit:function(a){a.url||(a.url={});a.url.protocol=this.getValue()}},{type:"text",id:"url",label:c.url,required:!0,onLoad:function(){this.allowOnChange=!0},onKeyUp:function(){this.allowOnChange=!1;var a=this.getDialog().getContentElement("info","protocol"),b=this.getValue(),c=/^((javascript:)|[#\/\.\?])/i,d=/^(http|https|ftp|news):\/\/(?=.)/i.exec(b);
-d?(this.setValue(b.substr(d[0].length)),a.setValue(d[0].toLowerCase())):c.test(b)&&a.setValue("");this.allowOnChange=!0},onChange:function(){if(this.allowOnChange)this.onKeyUp()},validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"url"!=a.getValueOf("info","linkType")?!0:!e.config.linkJavaScriptLinksAllowed&&/javascript\:/.test(this.getValue())?(alert(c.invalidValue),!1):this.getDialog().fakeObj?!0:CKEDITOR.dialog.validate.notEmpty(b.noUrl).apply(this)},setup:function(a){this.allowOnChange=
-!1;a.url&&this.setValue(a.url.url);this.allowOnChange=!0},commit:function(a){this.onChange();a.url||(a.url={});a.url.url=this.getValue();this.allowOnChange=!1}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().show()}},{type:"button",id:"browse",hidden:"true",filebrowser:"info:url",label:c.browseServer}]},{type:"vbox",id:"anchorOptions",width:260,align:"center",padding:0,children:[{type:"fieldset",id:"selectAnchorText",label:b.selectAnchor,setup:function(){g=
-m.getEditorAnchors(e);this.getElement()[g&&g.length?"show":"hide"]()},children:[{type:"hbox",id:"selectAnchor",children:[{type:"select",id:"anchorName","default":"",label:b.anchorName,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(g)for(var b=0;b<g.length;b++)g[b].name&&this.add(g[b].name);a.anchor&&this.setValue(a.anchor.name);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.focus()},commit:function(a){a.anchor||(a.anchor={});
-a.anchor.name=this.getValue()}},{type:"select",id:"anchorId","default":"",label:b.anchorId,style:"width: 100%;",items:[[""]],setup:function(a){this.clear();this.add("");if(g)for(var b=0;b<g.length;b++)g[b].id&&this.add(g[b].id);a.anchor&&this.setValue(a.anchor.id)},commit:function(a){a.anchor||(a.anchor={});a.anchor.id=this.getValue()}}],setup:function(){this.getElement()[g&&g.length?"show":"hide"]()}}]},{type:"html",id:"noAnchors",style:"text-align: center;",html:'\x3cdiv role\x3d"note" tabIndex\x3d"-1"\x3e'+
-CKEDITOR.tools.htmlEncode(b.noAnchors)+"\x3c/div\x3e",focus:!0,setup:function(){this.getElement()[g&&g.length?"hide":"show"]()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}},{type:"vbox",id:"emailOptions",padding:1,children:[{type:"text",id:"emailAddress",label:b.emailAddress,required:!0,validate:function(){var a=this.getDialog();return a.getContentElement("info","linkType")&&"email"==a.getValueOf("info","linkType")?CKEDITOR.dialog.validate.notEmpty(b.noEmail).apply(this):
-!0},setup:function(a){a.email&&this.setValue(a.email.address);(a=this.getDialog().getContentElement("info","linkType"))&&"email"==a.getValue()&&this.select()},commit:function(a){a.email||(a.email={});a.email.address=this.getValue()}},{type:"text",id:"emailSubject",label:b.emailSubject,setup:function(a){a.email&&this.setValue(a.email.subject)},commit:function(a){a.email||(a.email={});a.email.subject=this.getValue()}},{type:"textarea",id:"emailBody",label:b.emailBody,rows:3,"default":"",setup:function(a){a.email&&
-this.setValue(a.email.body)},commit:function(a){a.email||(a.email={});a.email.body=this.getValue()}}],setup:function(){this.getDialog().getContentElement("info","linkType")||this.getElement().hide()}}]},{id:"target",requiredContent:"a[target]",label:b.target,title:b.target,elements:[{type:"hbox",widths:["50%","50%"],children:[{type:"select",id:"linkTargetType",label:c.target,"default":"notSet",style:"width : 100%;",items:[[c.notSet,"notSet"],[b.targetFrame,"frame"],[b.targetPopup,"popup"],[c.targetNew,
-"_blank"],[c.targetTop,"_top"],[c.targetSelf,"_self"],[c.targetParent,"_parent"]],onChange:q,setup:function(a){a.target&&this.setValue(a.target.type||"notSet");q.call(this)},commit:function(a){a.target||(a.target={});a.target.type=this.getValue()}},{type:"text",id:"linkTargetName",label:b.targetFrameName,"default":"",setup:function(a){a.target&&this.setValue(a.target.name)},commit:function(a){a.target||(a.target={});a.target.name=this.getValue().replace(/([^\x00-\x7F]|\s)/gi,"")}}]},{type:"vbox",
-width:"100%",align:"center",padding:2,id:"popupFeatures",children:[{type:"fieldset",label:b.popupFeatures,children:[{type:"hbox",children:[{type:"checkbox",id:"resizable",label:b.popupResizable,setup:h,commit:k},{type:"checkbox",id:"status",label:b.popupStatusBar,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"location",label:b.popupLocationBar,setup:h,commit:k},{type:"checkbox",id:"toolbar",label:b.popupToolbar,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"menubar",
-label:b.popupMenuBar,setup:h,commit:k},{type:"checkbox",id:"fullscreen",label:b.popupFullScreen,setup:h,commit:k}]},{type:"hbox",children:[{type:"checkbox",id:"scrollbars",label:b.popupScrollBars,setup:h,commit:k},{type:"checkbox",id:"dependent",label:b.popupDependent,setup:h,commit:k}]},{type:"hbox",children:[{type:"text",widths:["50%","50%"],labelLayout:"horizontal",label:c.width,id:"width",setup:h,commit:k},{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:b.popupLeft,id:"left",
-setup:h,commit:k}]},{type:"hbox",children:[{type:"text",labelLayout:"horizontal",widths:["50%","50%"],label:c.height,id:"height",setup:h,commit:k},{type:"text",labelLayout:"horizontal",label:b.popupTop,widths:["50%","50%"],id:"top",setup:h,commit:k}]}]}]}]},{id:"upload",label:b.upload,title:b.upload,hidden:!0,filebrowser:"uploadButton",elements:[{type:"file",id:"upload",label:c.upload,style:"height:40px",size:29},{type:"fileButton",id:"uploadButton",label:c.uploadSubmit,filebrowser:"info:url","for":["upload",
-"upload"]}]},{id:"advanced",label:b.advanced,title:b.advanced,elements:[{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",id:"advId",requiredContent:"a[id]",label:b.id,setup:f,commit:l},{type:"select",id:"advLangDir",requiredContent:"a[dir]",label:b.langDir,"default":"",style:"width:110px",items:[[c.notSet,""],[b.langDirLTR,"ltr"],[b.langDirRTL,"rtl"]],setup:f,commit:l},{type:"text",id:"advAccessKey",requiredContent:"a[accesskey]",width:"80px",label:b.acccessKey,
-maxLength:1,setup:f,commit:l}]},{type:"hbox",widths:["45%","35%","20%"],children:[{type:"text",label:b.name,id:"advName",requiredContent:"a[name]",setup:f,commit:l},{type:"text",label:b.langCode,id:"advLangCode",requiredContent:"a[lang]",width:"110px","default":"",setup:f,commit:l},{type:"text",label:b.tabIndex,id:"advTabIndex",requiredContent:"a[tabindex]",width:"80px",maxLength:5,setup:f,commit:l}]}]},{type:"vbox",padding:1,children:[{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.advisoryTitle,
-requiredContent:"a[title]","default":"",id:"advTitle",setup:f,commit:l},{type:"text",label:b.advisoryContentType,requiredContent:"a[type]","default":"",id:"advContentType",setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",label:b.cssClasses,requiredContent:"a(cke-xyz)","default":"",id:"advCSSClasses",setup:f,commit:l},{type:"text",label:b.charset,requiredContent:"a[charset]","default":"",id:"advCharset",setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"text",
-label:b.rel,requiredContent:"a[rel]","default":"",id:"advRel",setup:f,commit:l},{type:"text",label:b.styles,requiredContent:"a{cke-xyz}","default":"",id:"advStyles",validate:CKEDITOR.dialog.validate.inlineStyle(e.lang.common.invalidInlineStyle),setup:f,commit:l}]},{type:"hbox",widths:["45%","55%"],children:[{type:"checkbox",id:"download",requiredContent:"a[download]",label:b.download,setup:function(a){void 0!==a.download&&this.setValue("checked","checked")},commit:function(a){this.getValue()&&(a.download=
-this.getValue())}}]}]}]}],onShow:function(){var a=this.getParentEditor(),b=a.getSelection(),c=b.getSelectedElement(),d=this.getContentElement("info","linkDisplayText").getElement().getParent().getParent(),e=null;(e=m.getSelectedLink(a))&&e.hasAttribute("href")?c||(b.selectElement(e),c=e):e=null;m.showDisplayTextForElement(c,a)?d.show():d.hide();a=m.parseLinkAttributes(a,e);this._.selectedElement=e;this.setupContent(a)},onOk:function(){var a={};this.commitContent(a);var b=e.getSelection(),c=m.getLinkAttributes(e,
-a);if(this._.selectedElement){var d=this._.selectedElement,g=d.data("cke-saved-href"),h=d.getHtml(),f;d.setAttributes(c.set);d.removeAttributes(c.removed);if(a.linkText&&p!=a.linkText)f=a.linkText;else if(g==h||"email"==a.type&&-1!=h.indexOf("@"))f="email"==a.type?a.email.address:c.set["data-cke-saved-href"];f&&(d.setText(f),b.selectElement(d));delete this._.selectedElement}else{b=b.getRanges()[0];b.collapsed?(a=new CKEDITOR.dom.text(a.linkText||("email"==a.type?a.email.address:c.set["data-cke-saved-href"]),
-e.document),b.insertNode(a),b.selectNodeContents(a)):p!==a.linkText&&(a=new CKEDITOR.dom.text(a.linkText,e.document),b.shrink(CKEDITOR.SHRINK_TEXT),e.editable().extractHtmlFromRange(b),b.insertNode(a));a=b._find("a");for(d=0;d<a.length;d++)a[d].remove(!0);c=new CKEDITOR.style({element:"a",attributes:c.set});c.type=CKEDITOR.STYLE_INLINE;c.applyToRange(b,e);b.select()}},onLoad:function(){e.config.linkShowAdvancedTab||this.hidePage("advanced");e.config.linkShowTargetTab||this.hidePage("target")},onFocus:function(){var a=
-this.getContentElement("info","linkType");a&&"url"==a.getValue()&&(a=this.getContentElement("info","url"),a.select())}}})})();
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/link/images/anchor.png b/plugins/ckeditor/src/plugins/link/images/anchor.png
deleted file mode 100644
index d94adb413..000000000
Binary files a/plugins/ckeditor/src/plugins/link/images/anchor.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/link/images/hidpi/anchor.png b/plugins/ckeditor/src/plugins/link/images/hidpi/anchor.png
deleted file mode 100644
index 186c3e916..000000000
Binary files a/plugins/ckeditor/src/plugins/link/images/hidpi/anchor.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain-rtl.png b/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain-rtl.png
deleted file mode 100644
index adf4af3c9..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain-rtl.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain.png b/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain.png
deleted file mode 100644
index b4d0a15a4..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/icons/hidpi/plain.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/icons/plain-rtl.png b/plugins/ckeditor/src/plugins/plain/icons/plain-rtl.png
deleted file mode 100644
index 27d1ba881..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/icons/plain-rtl.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/icons/plain.png b/plugins/ckeditor/src/plugins/plain/icons/plain.png
deleted file mode 100644
index e44db3798..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/icons/plain.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain-rtl.png b/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain-rtl.png
deleted file mode 100644
index adf4af3c9..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain-rtl.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain.png b/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain.png
deleted file mode 100644
index b4d0a15a4..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/plain/icons/hidpi/plain.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/plain/icons/plain-rtl.png b/plugins/ckeditor/src/plugins/plain/plain/icons/plain-rtl.png
deleted file mode 100644
index 27d1ba881..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/plain/icons/plain-rtl.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/plain/icons/plain.png b/plugins/ckeditor/src/plugins/plain/plain/icons/plain.png
deleted file mode 100644
index e44db3798..000000000
Binary files a/plugins/ckeditor/src/plugins/plain/plain/icons/plain.png and /dev/null differ
diff --git a/plugins/ckeditor/src/plugins/plain/plain/plugin.js b/plugins/ckeditor/src/plugins/plain/plain/plugin.js
deleted file mode 100644
index a88e9702e..000000000
--- a/plugins/ckeditor/src/plugins/plain/plain/plugin.js
+++ /dev/null
@@ -1,170 +0,0 @@
-
-(function() {
-
-	var
-		selectRange = function (el, start, end) {
-			if (!el) {
-				return;
-			}
-			if (end === undefined) {
-				end = start;
-			}
-			if('selectionStart' in el) {
-				el.selectionStart = start;
-				el.selectionEnd = end;
-			} else if(el.setSelectionRange) {
-				el.setSelectionRange(start, end);
-			} else if(el.createTextRange) {
-				var range = el.createTextRange();
-				range.collapse(true);
-				range.moveEnd('character', end);
-				range.moveStart('character', start);
-				range.select();
-			}
-		},
-		toTop = function (el) {
-			selectRange(el, 0);
-			if (el) {
-				el.scrollTop = 0;
-			}
-		}
-	;
-
-	CKEDITOR.plugins.add('plain', {
-		lang: '',
-		icons: 'plain',
-		hidpi: true,
-		init: function(editor)
-		{
-			if (editor.elementMode === CKEDITOR.ELEMENT_MODE_INLINE) {
-				return;
-			}
-
-			editor.__textUtils = {
-				plainToHtml: data => rl.Utils.plainToHtml(data, true),
-				htmlToPlain: data => rl.Utils.htmlToPlain(data, true)
-			};
-
-			var plain = CKEDITOR.plugins.plain;
-			editor.addMode('plain', function(callback) {
-
-				var
-					contentsSpace = editor.ui.space('contents'),
-					textarea = contentsSpace.getDocument().createElement('textarea')
-				;
-
-				textarea.setStyles(
-					CKEDITOR.tools.extend({
-						width: CKEDITOR.env.ie7Compat ? '99%' : '100%',
-						height: '100%',
-						resize: 'none',
-						outline: 'none',
-						'text-align': 'left'
-					},
-					CKEDITOR.tools.cssVendorPrefix('tab-size', 4)))
-				;
-
-				textarea.setAttribute('dir', 'ltr');
-				textarea.addClass('cke_plain');
-
-				CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(textarea);
-
-				contentsSpace.append(textarea);
-
-				var editable = editor.editable(new plainEditable(editor, textarea));
-
-				editable.setData(editor.getData(1));
-				editor.__plain = editable;
-				editor.__textarea = textarea.$;
-
-				if (CKEDITOR.env.ie) {
-					editable.attachListener(editor, 'resize', onResize, editable);
-					editable.attachListener(CKEDITOR.document.getWindow(), 'resize', onResize, editable);
-					CKEDITOR.tools.setTimeout(onResize, 0, editable);
-				}
-
-				editor.fire('ariaWidget', this);
-				callback();
-			});
-
-			editor.addCommand('plain', plain.commands.plain);
-
-			if (editor.ui.addButton) {
-				editor.ui.addButton('plain', {
-					label: window.rl && window.rl.i18n ? window.rl.i18n('EDITOR/TEXT_SWITCHER_PLAINT_TEXT') : 'Plain',
-					command: 'plain',
-					toolbar: 'spec,10'
-				});
-			}
-
-			editor.on('mode', function() {
-				editor.getCommand('plain').setState(editor.mode === 'plain' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF);
-				editor.editable().addClass('cke_enable_context_menu');
-
-				editor.focus();
-
-				if (editor.mode === 'plain') {
-					toTop(editor.__textarea);
-				}
-			});
-
-			function onResize() {
-				this.hide();
-				this.setStyle('height', this.getParent().$.clientHeight + 'px');
-				this.setStyle('width', this.getParent().$.clientWidth + 'px');
-				this.show();
-			}
-		}
-	});
-
-	var plainEditable = CKEDITOR.tools.createClass({
-		base: CKEDITOR.editable,
-		proto: {
-			setData: function(data) {
-				this.setValue(this.editor.__textUtils.htmlToPlain(data));
-				this.editor.fire('dataReady');
-			},
-			setRawData: function(data) {
-				this.setValue(data);
-				this.editor.fire('dataReady');
-			},
-			getData: function() {
-				return this.editor.__textUtils.plainToHtml(this.getValue());
-			},
-			getRawData: function() {
-				return this.getValue();
-			},
-			insertHtml: function() {},
-			insertElement: function() {},
-			insertText: function() {},
-			setReadOnly: function( isReadOnly ) {
-				this[(isReadOnly ? 'set' : 'remove') + 'Attribute' ]('readOnly', 'readonly');
-			},
-			detach: function() {
-				plainEditable.baseProto.detach.call( this );
-				this.clearCustomData();
-				this.remove();
-			}
-		}
-	});
-
-	CKEDITOR.plugins.plain = {
-		commands: {
-			plain: {
-				modes: {
-					wysiwyg: 1, plain: 1
-				},
-				editorFocus: true,
-				readOnly: false,
-				exec: function(editor) {
-					if (editor.mode === 'wysiwyg') {
-						editor.fire('saveSnapshot');
-					}
-					editor.getCommand('plain').setState(CKEDITOR.TRISTATE_DISABLED);
-					editor.setMode(editor.mode === 'plain' ? 'wysiwyg' : 'plain');
-				},
-				canUndo: false
-			}
-		}
-	};
-}());
diff --git a/plugins/ckeditor/src/plugins/plain/plugin.js b/plugins/ckeditor/src/plugins/plain/plugin.js
deleted file mode 100644
index a88e9702e..000000000
--- a/plugins/ckeditor/src/plugins/plain/plugin.js
+++ /dev/null
@@ -1,170 +0,0 @@
-
-(function() {
-
-	var
-		selectRange = function (el, start, end) {
-			if (!el) {
-				return;
-			}
-			if (end === undefined) {
-				end = start;
-			}
-			if('selectionStart' in el) {
-				el.selectionStart = start;
-				el.selectionEnd = end;
-			} else if(el.setSelectionRange) {
-				el.setSelectionRange(start, end);
-			} else if(el.createTextRange) {
-				var range = el.createTextRange();
-				range.collapse(true);
-				range.moveEnd('character', end);
-				range.moveStart('character', start);
-				range.select();
-			}
-		},
-		toTop = function (el) {
-			selectRange(el, 0);
-			if (el) {
-				el.scrollTop = 0;
-			}
-		}
-	;
-
-	CKEDITOR.plugins.add('plain', {
-		lang: '',
-		icons: 'plain',
-		hidpi: true,
-		init: function(editor)
-		{
-			if (editor.elementMode === CKEDITOR.ELEMENT_MODE_INLINE) {
-				return;
-			}
-
-			editor.__textUtils = {
-				plainToHtml: data => rl.Utils.plainToHtml(data, true),
-				htmlToPlain: data => rl.Utils.htmlToPlain(data, true)
-			};
-
-			var plain = CKEDITOR.plugins.plain;
-			editor.addMode('plain', function(callback) {
-
-				var
-					contentsSpace = editor.ui.space('contents'),
-					textarea = contentsSpace.getDocument().createElement('textarea')
-				;
-
-				textarea.setStyles(
-					CKEDITOR.tools.extend({
-						width: CKEDITOR.env.ie7Compat ? '99%' : '100%',
-						height: '100%',
-						resize: 'none',
-						outline: 'none',
-						'text-align': 'left'
-					},
-					CKEDITOR.tools.cssVendorPrefix('tab-size', 4)))
-				;
-
-				textarea.setAttribute('dir', 'ltr');
-				textarea.addClass('cke_plain');
-
-				CKEDITOR.plugins.clipboard.preventDefaultDropOnElement(textarea);
-
-				contentsSpace.append(textarea);
-
-				var editable = editor.editable(new plainEditable(editor, textarea));
-
-				editable.setData(editor.getData(1));
-				editor.__plain = editable;
-				editor.__textarea = textarea.$;
-
-				if (CKEDITOR.env.ie) {
-					editable.attachListener(editor, 'resize', onResize, editable);
-					editable.attachListener(CKEDITOR.document.getWindow(), 'resize', onResize, editable);
-					CKEDITOR.tools.setTimeout(onResize, 0, editable);
-				}
-
-				editor.fire('ariaWidget', this);
-				callback();
-			});
-
-			editor.addCommand('plain', plain.commands.plain);
-
-			if (editor.ui.addButton) {
-				editor.ui.addButton('plain', {
-					label: window.rl && window.rl.i18n ? window.rl.i18n('EDITOR/TEXT_SWITCHER_PLAINT_TEXT') : 'Plain',
-					command: 'plain',
-					toolbar: 'spec,10'
-				});
-			}
-
-			editor.on('mode', function() {
-				editor.getCommand('plain').setState(editor.mode === 'plain' ? CKEDITOR.TRISTATE_ON : CKEDITOR.TRISTATE_OFF);
-				editor.editable().addClass('cke_enable_context_menu');
-
-				editor.focus();
-
-				if (editor.mode === 'plain') {
-					toTop(editor.__textarea);
-				}
-			});
-
-			function onResize() {
-				this.hide();
-				this.setStyle('height', this.getParent().$.clientHeight + 'px');
-				this.setStyle('width', this.getParent().$.clientWidth + 'px');
-				this.show();
-			}
-		}
-	});
-
-	var plainEditable = CKEDITOR.tools.createClass({
-		base: CKEDITOR.editable,
-		proto: {
-			setData: function(data) {
-				this.setValue(this.editor.__textUtils.htmlToPlain(data));
-				this.editor.fire('dataReady');
-			},
-			setRawData: function(data) {
-				this.setValue(data);
-				this.editor.fire('dataReady');
-			},
-			getData: function() {
-				return this.editor.__textUtils.plainToHtml(this.getValue());
-			},
-			getRawData: function() {
-				return this.getValue();
-			},
-			insertHtml: function() {},
-			insertElement: function() {},
-			insertText: function() {},
-			setReadOnly: function( isReadOnly ) {
-				this[(isReadOnly ? 'set' : 'remove') + 'Attribute' ]('readOnly', 'readonly');
-			},
-			detach: function() {
-				plainEditable.baseProto.detach.call( this );
-				this.clearCustomData();
-				this.remove();
-			}
-		}
-	});
-
-	CKEDITOR.plugins.plain = {
-		commands: {
-			plain: {
-				modes: {
-					wysiwyg: 1, plain: 1
-				},
-				editorFocus: true,
-				readOnly: false,
-				exec: function(editor) {
-					if (editor.mode === 'wysiwyg') {
-						editor.fire('saveSnapshot');
-					}
-					editor.getCommand('plain').setState(CKEDITOR.TRISTATE_DISABLED);
-					editor.setMode(editor.mode === 'plain' ? 'wysiwyg' : 'plain');
-				},
-				canUndo: false
-			}
-		}
-	};
-}());
diff --git a/plugins/ckeditor/src/plugins/quicktable/CHANGELOG.md b/plugins/ckeditor/src/plugins/quicktable/CHANGELOG.md
deleted file mode 100644
index ec77b8171..000000000
--- a/plugins/ckeditor/src/plugins/quicktable/CHANGELOG.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Quicktable plugin for ckeditor 4.x
-==========
-###Version 1.0.5
-- If the border gets disabled (`config.qtBorder = 0`) it isn't necessary to set the qtClass to `cke_show_border` anymore
-	- Event `removeFormatCleanup` is fired if table gets inserted into the editor
-- Small changes to the preview table design (no table border, cellspacing and cellpadding of 1)
-- Adding option for preview table cell border
-- Adding option for preview table cell background on hover
-- Adding option for preview table cell size
-
-###Version 1.0.4
-- fix refactoring errors (table dimensions didn't get updated anymore)
-	```javascript
-	Cannot read property 'setText' of undefined
-	```
-	```javascript
-	Cannot read property '$' of undefined
-	```
-
-###Version 1.0.3
-- short option values *(older ones are not supported anymore)*
-- modify compiled sample so it refers to local ckeditor
-- updated configuration sample
-- example includes 2 editors (default and custom configuration)
-- code refactoring to decrease code complexity and count of statements
-
-###Version 1.0.2
-- Adding cellspacing option
-- Adding cellpadding option
-- Change default width to table plugin default width
-
-###Version 1.0.1
-- change the sample to use ckeditor cdn
-- adding a new class option to set the table attribute class
-- change the style option type from string to object (for easier configuration)
-
-###Version 1.0.0
-- Initial Release
diff --git a/plugins/ckeditor/src/plugins/quicktable/Gruntfile.js b/plugins/ckeditor/src/plugins/quicktable/Gruntfile.js
deleted file mode 100644
index c80622f88..000000000
--- a/plugins/ckeditor/src/plugins/quicktable/Gruntfile.js
+++ /dev/null
@@ -1,5 +0,0 @@
-var fs=require("fs");
-module.exports=function(a){function b(b,d){fs.readFile(b,"utf8",function(f,g){if(f)return a.log.writeln(f);for(var e=g,c=0;c<d.length;c++)e=e.replace(d[c][0],d[c][1]);fs.writeFile(b,e,"utf8",function(b){if(b)return a.log.writeln(b)})})}a.initConfig({pkg:a.file.readJSON("package.json"),jshint:{all:["lang/*.js","*.js","*.json"],options:{jshintrc:".jshintrc"}},lint5:{dirPath:"samples",templates:["quicktable.html"]},compress:{main:{options:{archive:"release/<%= pkg.name %>-<%= pkg.version %>.zip",level:9,
-pretty:!0},files:[{src:"** !node_modules/** !release/** !.* !*.log !Gruntfile.js !package.json !LICENSE !*.md !template.jst !*.zip".split(" "),dest:"<%= pkg.name %>/"}]}},markdown:{all:{files:[{expand:!0,src:"*.md",dest:"release/docs/",ext:".html"}],options:{template:"template.jst",markdownOptions:{gfm:!0,highlight:"manual"}}}}});a.loadNpmTasks("grunt-markdown");a.loadNpmTasks("grunt-contrib-compress");a.loadNpmTasks("grunt-lint5");a.loadNpmTasks("grunt-contrib-jshint");a.registerTask("test",["jshint",
-"lint5"]);a.registerTask("build-only",["beforeCompress","compress","afterCompress"]);a.registerTask("build",["test","beforeCompress","compress","afterCompress","markdown"]);a.registerTask("default",["test"]);a.registerTask("beforeCompress","Running before Compression",function(){b("samples/quicktable.html",[[/http\:\/\/cdn.ckeditor.com\/4.4.3\/full-all\//g,"../../../"],[/language: 'en'/g,"// language: 'en'"],[/<\!-- REMOVE BEGIN --\>/g,"<\!-- REMOVE BEGIN --\><\!--"]])});a.registerTask("afterCompress",
-"Running after Compression",function(){b("samples/quicktable.html",[[/\.\.\/\.\.\/\.\.\//g,"http://cdn.ckeditor.com/4.4.3/full-all/"],[/\/\/ language: 'en'/g,"language: 'en'"],[/<\!-- REMOVE BEGIN --\><\!--/g,"<\!-- REMOVE BEGIN --\>"]])})};
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/quicktable/README.md b/plugins/ckeditor/src/plugins/quicktable/README.md
deleted file mode 100644
index 23a01e867..000000000
--- a/plugins/ckeditor/src/plugins/quicktable/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-quicktable
-==========
-[![Build Status](https://travis-ci.org/ufdada/quicktable.svg?branch=master)](https://travis-ci.org/ufdada/quicktable)
-[![devDependency Status](https://david-dm.org/ufdada/quicktable/dev-status.svg)](https://david-dm.org/ufdada/quicktable#info=devDependencies)
-###A quicktable plugin for ckeditor 4
-
-This plugin adds a quicktable feature to the existing table plugin.
-
-The original code was submitted by [danyaPostfactum](https://github.com/danyaPostfactum) as a pull request for the table plugin.
-I just extracted the code and made a seperate plugin out of it and added some options to it (see sample in plugin directory)
-
-__*The original table plugin is required for this to work!*__
-
-####Building:
-This requires **node.js** and **npm** to be installed.
-
-Then open the directory with the *git-shell* and type `npm install` to install the required packages.
-
-After that you can execute grunt with the following options:
-
-1. `grunt test`
- - Linting the js and html files (check for syntax errors etc.). See [JS Hint Configuration File](https://raw.githubusercontent.com/ufdada/quicktable/master/.jshintrc) for options __*(default)*__
-2. `grunt build`
- - `grunt test` and compressing the plugin into a zip file. The zip file is located in the *release* directory.
-3. `grunt build-only`
- - Just generating the zip file without linting and markdown compile *(not recommended)*
-
-####Installation:
-Just copy the whole directory (quicktable) in the plugins directory
-
-####Configuration:
-
-```javascript
-	CKEDITOR.replace( 'editor1', {
-		qtRows: 20, // Count of rows in the quicktable (default: 8)
-		qtColumns: 20, // Count of columns in the quicktable (default: 10)
-		qtBorder: '1', // Border of the inserted table (default: '1')
-		qtWidth: '90%', // Width of the inserted table (default: '500px')
-		qtStyle: { 'border-collapse' : 'collapse' }, // Content of the style-attribute of the inserted table (default: null)
-		qtClass: 'test', // Class of the inserted table (default: '')
-		qtCellPadding: '0', // Cell padding of the inserted table (default: '1')
-		qtCellSpacing: '0', // Cell spacing of the inserted table (default: '1')
-		qtPreviewBorder: '4px double black', // Border of the preview table (default: '1px solid #aaa')
-		qtPreviewSize: '4px', // Cell size of the preview table (default: '14px')
-		qtPreviewBackground: '#c8def4' // Cell background of the preview table on hover (default: '#e5e5e5')
-	});
-```
-
-####Known Issues:
-- Some missing translations
-
-For more Information see original post [here](https://github.com/ckeditor/ckeditor-dev/pull/92)
diff --git a/plugins/ckeditor/src/plugins/quicktable/package.json b/plugins/ckeditor/src/plugins/quicktable/package.json
deleted file mode 100644
index 9eb5c2fcf..000000000
--- a/plugins/ckeditor/src/plugins/quicktable/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "quicktable",
-  "description": "A quicktable plugin for ckeditor 4",
-  "version": "1.0.5",
-  "keywords": [
-    "quicktable",
-    "ckeditor"
-  ],
-  "homepage": "https://github.com/ufdada/quicktable",
-  "author": {
-    "name": "ufdada"
-  },
-  "scripts": {
-    "test": "grunt test"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ufdada/quicktable.git"
-  },
-  "bugs": {
-    "url": "https://github.com/ufdada/quicktable/issues"
-  },
-  "license": "LGPL",
-  "devDependencies": {
-    "grunt": "0.4.5",
-    "grunt-contrib-compress": "0.10.0",
-    "grunt-contrib-jshint": "0.10.0",
-    "grunt-lint5": "0.3.0",
-    "grunt-markdown": "0.6.1"
-  }
-}
diff --git a/plugins/ckeditor/src/plugins/quicktable/template.jst b/plugins/ckeditor/src/plugins/quicktable/template.jst
deleted file mode 100644
index b22a7fc05..000000000
--- a/plugins/ckeditor/src/plugins/quicktable/template.jst
+++ /dev/null
@@ -1,469 +0,0 @@
-<!DOCTYPE  html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    
-    <title>doc</title>
-    <style>
-      /*github.com style (c) Vasily Polovnyov <vast@whiteants.net>*/
-      pre code {
-        display: block; padding: 0.5em;
-        color: #333;
-        background: #f8f8ff
-      }
-      pre .comment,
-      pre .template_comment,
-      pre .diff .header,
-      pre .javadoc {
-        color: #998;
-        font-style: italic
-      }
-      pre .keyword,
-      pre .css .rule .keyword,
-      pre .winutils,
-      pre .javascript .title,
-      pre .nginx .title,
-      pre .subst,
-      pre .request,
-      pre .status {
-        color: #333;
-        font-weight: bold
-      }
-      pre .number,
-      pre .hexcolor,
-      pre .ruby .constant {
-        color: #099;
-      }
-      pre .string,
-      pre .tag .value,
-      pre .phpdoc,
-      pre .tex .formula {
-        color: #d14
-      }
-      pre .title,
-      pre .id {
-        color: #900;
-        font-weight: bold
-      }
-      pre .javascript .title,
-      pre .lisp .title,
-      pre .clojure .title,
-      pre .subst {
-        font-weight: normal
-      }
-      pre .class .title,
-      pre .haskell .type,
-      pre .vhdl .literal,
-      pre .tex .command {
-        color: #458;
-        font-weight: bold
-      }
-      pre .tag,
-      pre .tag .title,
-      pre .rules .property,
-      pre .django .tag .keyword {
-        color: #000080;
-        font-weight: normal
-      }
-      pre .attribute,
-      pre .variable,
-      pre .lisp .body {
-        color: #008080
-      }
-      pre .regexp {
-        color: #009926
-      }
-      pre .class {
-        color: #458;
-        font-weight: bold
-      }
-      pre .symbol,
-      pre .ruby .symbol .string,
-      pre .lisp .keyword,
-      pre .tex .special,
-      pre .prompt {
-        color: #990073
-      }
-      pre .built_in,
-      pre .lisp .title,
-      pre .clojure .built_in {
-        color: #0086b3
-      }
-      pre .preprocessor,
-      pre .pi,
-      pre .doctype,
-      pre .shebang,
-      pre .cdata {
-        color: #999;
-        font-weight: bold
-      }
-      pre .deletion {
-        background: #fdd
-      }
-      pre .addition {
-        background: #dfd
-      }
-      pre .diff .change {
-        background: #0086b3
-      }
-      pre .chunk {
-        color: #aaa
-      }
-	body {
-		font-family: Helvetica, arial, sans-serif;
-		font-size: 14px;
-		line-height: 1.6;
-		padding-top: 10px;
-		padding-bottom: 10px;
-		background-color: white;
-		padding: 30px;
-	}
-
-	body > *:first-child {
-		margin-top: 0 !important;
-	}
-	body > *:last-child {
-		margin-bottom: 0 !important;
-	}
-
-	a {
-		color: #4183C4;
-		text-decoration: none;
-	}
-	a:hover {
-		text-decoration: underline;
-	}
-	a.absent {
-		color: #cc0000;
-	}
-	a.anchor {
-		display: block;
-		padding-left: 30px;
-		margin-left: -30px;
-		cursor: pointer;
-		position: absolute;
-		top: 0;
-		left: 0;
-		bottom: 0;
-	}
-
-	h1, h2, h3, h4, h5, h6 {
-		margin: 1em 0 15px;
-		padding: 0;
-		font-weight: bold;
-		-webkit-font-smoothing: antialiased;
-		cursor: text;
-		position: relative;
-	}
-
-	h1:hover a.anchor, h2:hover a.anchor, h3:hover a.anchor, h4:hover a.anchor, h5:hover a.anchor, h6:hover a.anchor {
-		background: url("../../images/modules/styleguide/para.png") no-repeat 10px center;
-		text-decoration: none;
-	}
-
-	h1 tt, h1 code {
-		font-size: inherit;
-	}
-
-	h2 tt, h2 code {
-		font-size: inherit;
-	}
-
-	h3 tt, h3 code {
-		font-size: inherit;
-	}
-
-	h4 tt, h4 code {
-		font-size: inherit;
-	}
-
-	h5 tt, h5 code {
-		font-size: inherit;
-	}
-
-	h6 tt, h6 code {
-		font-size: inherit;
-	}
-
-	h1 {
-		font-size: 2.5em;
-		color: black;
-		border-bottom: 1px solid #ddd;
-	}
-
-	h2 {
-		font-size: 2em;
-		border-bottom: 1px solid #cccccc;
-		color: black;
-	}
-
-	h3 {
-		font-size: 1.5em;
-	}
-
-	h4 {
-		font-size: 1.2em;
-	}
-
-	h5 {
-		font-size: 1em;
-	}
-
-	h6 {
-		color: #777777;
-		font-size: 1em;
-	}
-
-	p, blockquote, ul, ol, dl, li, table, pre {
-		/* margin: 15px 0; */
-	}
-
-	hr {
-		background: transparent url("../../images/modules/pulls/dirty-shade.png") repeat-x 0 0;
-		border: 0 none;
-		color: #cccccc;
-		height: 4px;
-		padding: 0;
-	}
-
-	body > h2:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h1:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h1:first-child + h2 {
-		margin-top: 0;
-		padding-top: 0;
-	}
-	body > h3:first-child, body > h4:first-child, body > h5:first-child, body > h6:first-child {
-		margin-top: 0;
-		padding-top: 0;
-	}
-
-	a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
-		margin-top: 0;
-		padding-top: 0;
-	}
-
-	h1 p, h2 p, h3 p, h4 p, h5 p, h6 p {
-		margin-top: 0;
-	}
-
-	li p.first {
-		display: inline-block;
-	}
-
-	ul, ol {
-		padding-left: 30px;
-	}
-
-	ul :first-child, ol :first-child {
-		margin-top: 0;
-	}
-
-	ul :last-child, ol :last-child {
-		margin-bottom: 0;
-	}
-
-	dl {
-		padding: 0;
-	}
-	dl dt {
-		font-size: 14px;
-		font-weight: bold;
-		font-style: italic;
-		padding: 0;
-		margin: 15px 0 5px;
-	}
-	dl dt:first-child {
-		padding: 0;
-	}
-	dl dt > :first-child {
-		margin-top: 0;
-	}
-	dl dt > :last-child {
-		margin-bottom: 0;
-	}
-	dl dd {
-		margin: 0 0 15px;
-		padding: 0 15px;
-	}
-	dl dd > :first-child {
-		margin-top: 0;
-	}
-	dl dd > :last-child {
-		margin-bottom: 0;
-	}
-
-	blockquote {
-		border-left: 4px solid #dddddd;
-		padding: 0 15px;
-		color: #777777;
-	}
-	blockquote > :first-child {
-		margin-top: 0;
-	}
-	blockquote > :last-child {
-		margin-bottom: 0;
-	}
-
-	table {
-		padding: 0;
-	}
-	table tr {
-		border-top: 1px solid #cccccc;
-		background-color: white;
-		margin: 0;
-		padding: 0;
-	}
-	table tr:nth-child(2n) {
-		background-color: #f8f8f8;
-	}
-	table tr th {
-		font-weight: bold;
-		border: 1px solid #cccccc;
-		text-align: left;
-		margin: 0;
-		padding: 6px 13px;
-	}
-	table tr td {
-		border: 1px solid #cccccc;
-		text-align: left;
-		margin: 0;
-		padding: 6px 13px;
-	}
-	table tr th :first-child, table tr td :first-child {
-		margin-top: 0;
-	}
-	table tr th :last-child, table tr td :last-child {
-		margin-bottom: 0;
-	}
-
-	img {
-		max-width: 100%;
-	}
-
-	span.frame {
-		display: block;
-		overflow: hidden;
-	}
-	span.frame > span {
-		border: 1px solid #dddddd;
-		display: block;
-		float: left;
-		overflow: hidden;
-		margin: 13px 0 0;
-		padding: 7px;
-		width: auto;
-	}
-	span.frame span img {
-		display: block;
-		float: left;
-	}
-	span.frame span span {
-		clear: both;
-		color: #333333;
-		display: block;
-		padding: 5px 0 0;
-	}
-	span.align-center {
-		display: block;
-		overflow: hidden;
-		clear: both;
-	}
-	span.align-center > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px auto 0;
-		text-align: center;
-	}
-	span.align-center span img {
-		margin: 0 auto;
-		text-align: center;
-	}
-	span.align-right {
-		display: block;
-		overflow: hidden;
-		clear: both;
-	}
-	span.align-right > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px 0 0;
-		text-align: right;
-	}
-	span.align-right span img {
-		margin: 0;
-		text-align: right;
-	}
-	span.float-left {
-		display: block;
-		margin-right: 13px;
-		overflow: hidden;
-		float: left;
-	}
-	span.float-left span {
-		margin: 13px 0 0;
-	}
-	span.float-right {
-		display: block;
-		margin-left: 13px;
-		overflow: hidden;
-		float: right;
-	}
-	span.float-right > span {
-		display: block;
-		overflow: hidden;
-		margin: 13px auto 0;
-		text-align: right;
-	}
-
-	code, tt {
-		margin: 0 2px;
-		padding: 0 5px;
-		white-space: nowrap;
-		border: 1px solid #eaeaea;
-		background-color: #f8f8f8;
-		border-radius: 3px;
-	}
-
-	pre code {
-		margin: 0;
-		padding: 0;
-		white-space: pre;
-		border: none;
-		background: transparent;
-	}
-
-	.highlight pre {
-		background-color: #f8f8f8;
-		border: 1px solid #cccccc;
-		font-size: 13px;
-		line-height: 19px;
-		overflow: auto;
-		padding: 6px 10px;
-		border-radius: 3px;
-	}
-
-	pre {
-		background-color: #f8f8f8;
-		border: 1px solid #cccccc;
-		font-size: 13px;
-		line-height: 19px;
-		overflow: auto;
-		padding: 6px 10px;
-		border-radius: 3px;
-	}
-	pre code, pre tt {
-		background-color: transparent;
-		border: none;
-	}
-    </style>
-  </head>
-  <body>  
-    <%=content%>
-  </body>
-</html>
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/signature/plugin.js b/plugins/ckeditor/src/plugins/signature/plugin.js
deleted file mode 100644
index 8a7fd37e1..000000000
--- a/plugins/ckeditor/src/plugins/signature/plugin.js
+++ /dev/null
@@ -1,141 +0,0 @@
-
-(function(CKEDITOR) {
-
-	'use strict';
-
-	var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore) {
-
-		var
-			skipInsert = false,
-			isEmptyText = false,
-			newLine = (isHtml ? '<br />' : "\n"),
-			clearHtmlLine = function(html) {
-				return editor.__textUtils.htmlToPlain(html).trim();
-			};
-
-		isEmptyText = !text.trim();
-		if (!isEmptyText && isHtml)
-		{
-			isEmptyText = !clearHtmlLine(text);
-		}
-
-		if (editor.__previos_signature && !isEmptyText)
-		{
-			if (isHtml && !editor.__previos_signature_is_html)
-			{
-				editor.__previos_signature = editor.__textUtils.plainToHtml(editor.__previos_signature);
-				editor.__previos_signature_is_html = true;
-			}
-			else if (!isHtml && editor.__previos_signature_is_html)
-			{
-				editor.__previos_signature = editor.__textUtils.htmlToPlain(editor.__previos_signature);
-				editor.__previos_signature_is_html = false;
-			}
-
-			skipInsert = false;
-			if (isHtml)
-			{
-				var clearSig = clearHtmlLine(editor.__previos_signature);
-				text = text.replace(/<signature>([\s\S]*)<\/signature>/igm, function(all){
-					var c = clearSig === clearHtmlLine(all);
-					if (!c) {
-						skipInsert = true;
-					}
-					return c ? '' : all;
-				});
-			}
-			else
-			{
-				var textLen = text.length;
-				text = text
-					.replace('' + editor.__previos_signature, '')
-					.replace('' + editor.__previos_signature, '');
-
-				if (textLen === text.length)
-				{
-					skipInsert = true;
-				}
-			}
-		}
-
-		if (!skipInsert)
-		{
-			signature = newLine + newLine + (isHtml ? '<signature>' : '') + signature + (isHtml ? '</signature>' : '');
-
-			text = insertBefore ? signature + text : text + signature;
-
-			if (10 < signature.length)
-			{
-				editor.__previos_signature = signature;
-				editor.__previos_signature_is_html = isHtml;
-			}
-		}
-
-		return text;
-	};
-
-	CKEDITOR.plugins.add('signature', {
-		init: function(editor) {
-			editor.addCommand('insertSignature', {
-				modes: {wysiwyg: 1, plain: 1},
-				exec: function(editor, cfg) {
-
-					if (cfg && cfg.clearCache)
-					{
-						editor.__previos_signature = undefined;
-						editor.__previos_signature_is_html = undefined;
-						return true;
-					}
-
-					var
-						bIsHtml = false,
-						bInsertBefore = false,
-						sSignature = '',
-						sResultSignature = '';
-
-					if (cfg)
-					{
-						bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
-						bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
-						sSignature = undefined === cfg.signature ? '' : cfg.signature;
-					}
-
-					sResultSignature = sSignature;
-
-					try
-					{
-						if ('plain' === editor.mode && editor.__plain && editor.__textUtils)
-						{
-							if (editor.__textUtils && editor.__textUtils.htmlToPlain)
-							{
-								if (bIsHtml)
-								{
-									sResultSignature = editor.__textUtils.htmlToPlain(sResultSignature);
-								}
-							}
-
-							editor.__plain.setRawData(
-								rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
-
-						}
-						else
-						{
-							if (editor.__textUtils && editor.__textUtils.plainToHtml)
-							{
-								if (!bIsHtml)
-								{
-									sResultSignature = editor.__textUtils.plainToHtml(sResultSignature);
-								}
-							}
-
-							editor.setData(
-								rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore));
-						}
-					}
-					catch (e) {}
-				}
-			});
-		}
-	});
-
-}(CKEDITOR));
diff --git a/plugins/ckeditor/src/plugins/signature/signature/plugin.js b/plugins/ckeditor/src/plugins/signature/signature/plugin.js
deleted file mode 100644
index 8a7fd37e1..000000000
--- a/plugins/ckeditor/src/plugins/signature/signature/plugin.js
+++ /dev/null
@@ -1,141 +0,0 @@
-
-(function(CKEDITOR) {
-
-	'use strict';
-
-	var rl_signature_replacer = function(editor, text, signature, isHtml, insertBefore) {
-
-		var
-			skipInsert = false,
-			isEmptyText = false,
-			newLine = (isHtml ? '<br />' : "\n"),
-			clearHtmlLine = function(html) {
-				return editor.__textUtils.htmlToPlain(html).trim();
-			};
-
-		isEmptyText = !text.trim();
-		if (!isEmptyText && isHtml)
-		{
-			isEmptyText = !clearHtmlLine(text);
-		}
-
-		if (editor.__previos_signature && !isEmptyText)
-		{
-			if (isHtml && !editor.__previos_signature_is_html)
-			{
-				editor.__previos_signature = editor.__textUtils.plainToHtml(editor.__previos_signature);
-				editor.__previos_signature_is_html = true;
-			}
-			else if (!isHtml && editor.__previos_signature_is_html)
-			{
-				editor.__previos_signature = editor.__textUtils.htmlToPlain(editor.__previos_signature);
-				editor.__previos_signature_is_html = false;
-			}
-
-			skipInsert = false;
-			if (isHtml)
-			{
-				var clearSig = clearHtmlLine(editor.__previos_signature);
-				text = text.replace(/<signature>([\s\S]*)<\/signature>/igm, function(all){
-					var c = clearSig === clearHtmlLine(all);
-					if (!c) {
-						skipInsert = true;
-					}
-					return c ? '' : all;
-				});
-			}
-			else
-			{
-				var textLen = text.length;
-				text = text
-					.replace('' + editor.__previos_signature, '')
-					.replace('' + editor.__previos_signature, '');
-
-				if (textLen === text.length)
-				{
-					skipInsert = true;
-				}
-			}
-		}
-
-		if (!skipInsert)
-		{
-			signature = newLine + newLine + (isHtml ? '<signature>' : '') + signature + (isHtml ? '</signature>' : '');
-
-			text = insertBefore ? signature + text : text + signature;
-
-			if (10 < signature.length)
-			{
-				editor.__previos_signature = signature;
-				editor.__previos_signature_is_html = isHtml;
-			}
-		}
-
-		return text;
-	};
-
-	CKEDITOR.plugins.add('signature', {
-		init: function(editor) {
-			editor.addCommand('insertSignature', {
-				modes: {wysiwyg: 1, plain: 1},
-				exec: function(editor, cfg) {
-
-					if (cfg && cfg.clearCache)
-					{
-						editor.__previos_signature = undefined;
-						editor.__previos_signature_is_html = undefined;
-						return true;
-					}
-
-					var
-						bIsHtml = false,
-						bInsertBefore = false,
-						sSignature = '',
-						sResultSignature = '';
-
-					if (cfg)
-					{
-						bIsHtml = undefined === cfg.isHtml ? false : !!cfg.isHtml;
-						bInsertBefore = undefined === cfg.insertBefore ? false : !!cfg.insertBefore;
-						sSignature = undefined === cfg.signature ? '' : cfg.signature;
-					}
-
-					sResultSignature = sSignature;
-
-					try
-					{
-						if ('plain' === editor.mode && editor.__plain && editor.__textUtils)
-						{
-							if (editor.__textUtils && editor.__textUtils.htmlToPlain)
-							{
-								if (bIsHtml)
-								{
-									sResultSignature = editor.__textUtils.htmlToPlain(sResultSignature);
-								}
-							}
-
-							editor.__plain.setRawData(
-								rl_signature_replacer(editor, editor.__plain.getRawData(), sResultSignature, false, bInsertBefore));
-
-						}
-						else
-						{
-							if (editor.__textUtils && editor.__textUtils.plainToHtml)
-							{
-								if (!bIsHtml)
-								{
-									sResultSignature = editor.__textUtils.plainToHtml(sResultSignature);
-								}
-							}
-
-							editor.setData(
-								rl_signature_replacer(editor, editor.getData(), sResultSignature, true, bInsertBefore));
-						}
-					}
-					catch (e) {}
-				}
-			});
-		}
-	});
-
-}(CKEDITOR));
diff --git a/plugins/ckeditor/src/plugins/table/dialogs/table.js b/plugins/ckeditor/src/plugins/table/dialogs/table.js
deleted file mode 100644
index 7387effda..000000000
--- a/plugins/ckeditor/src/plugins/table/dialogs/table.js
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-(function(){function v(a){for(var f=0,n=0,l=0,p,e=a.$.rows.length;l<e;l++){p=a.$.rows[l];for(var d=f=0,b,c=p.cells.length;d<c;d++)b=p.cells[d],f+=b.colSpan;f>n&&(n=f)}return n}function r(a){return function(){var f=this.getValue(),f=!!(CKEDITOR.dialog.validate.integer()(f)&&0<f);f||(alert(a),this.select());return f}}function q(a,f){var n=function(e){return new CKEDITOR.dom.element(e,a.document)},q=a.editable(),p=a.plugins.dialogadvtab;return{title:a.lang.table.title,minWidth:310,minHeight:CKEDITOR.env.ie?
-310:280,onLoad:function(){var e=this,a=e.getContentElement("advanced","advStyles");if(a)a.on("change",function(){var a=this.getStyle("width",""),c=e.getContentElement("info","txtWidth");c&&c.setValue(a,!0);a=this.getStyle("height","");(c=e.getContentElement("info","txtHeight"))&&c.setValue(a,!0)})},onShow:function(){var e=a.getSelection(),d=e.getRanges(),b,c=this.getContentElement("info","txtRows"),g=this.getContentElement("info","txtCols"),t=this.getContentElement("info","txtWidth"),m=this.getContentElement("info",
-"txtHeight");"tableProperties"==f&&((e=e.getSelectedElement())&&e.is("table")?b=e:0<d.length&&(CKEDITOR.env.webkit&&d[0].shrink(CKEDITOR.NODE_ELEMENT),b=a.elementPath(d[0].getCommonAncestor(!0)).contains("table",1)),this._.selectedElement=b);b?(this.setupContent(b),c&&c.disable(),g&&g.disable()):(c&&c.enable(),g&&g.enable());t&&t.onChange();m&&m.onChange()},onOk:function(){var e=a.getSelection(),d=this._.selectedElement&&e.createBookmarks(),b=this._.selectedElement||n("table"),c={};this.commitContent(c,
-b);if(c.info){c=c.info;if(!this._.selectedElement)for(var g=b.append(n("tbody")),f=parseInt(c.txtRows,10)||0,m=parseInt(c.txtCols,10)||0,k=0;k<f;k++)for(var h=g.append(n("tr")),l=0;l<m;l++)h.append(n("td")).appendBogus();f=c.selHeaders;if(!b.$.tHead&&("row"==f||"both"==f)){h=b.getElementsByTag("thead").getItem(0);g=b.getElementsByTag("tbody").getItem(0);m=g.getElementsByTag("tr").getItem(0);h||(h=new CKEDITOR.dom.element("thead"),h.insertBefore(g));for(k=0;k<m.getChildCount();k++)g=m.getChild(k),
-g.type!=CKEDITOR.NODE_ELEMENT||g.data("cke-bookmark")||(g.renameNode("th"),g.setAttribute("scope","col"));h.append(m.remove())}if(null!==b.$.tHead&&"row"!=f&&"both"!=f){h=new CKEDITOR.dom.element(b.$.tHead);g=b.getElementsByTag("tbody").getItem(0);for(l=g.getFirst();0<h.getChildCount();){m=h.getFirst();for(k=0;k<m.getChildCount();k++)g=m.getChild(k),g.type==CKEDITOR.NODE_ELEMENT&&(g.renameNode("td"),g.removeAttribute("scope"));m.insertBefore(l)}h.remove()}if(!this.hasColumnHeaders&&("col"==f||"both"==
-f))for(h=0;h<b.$.rows.length;h++)g=new CKEDITOR.dom.element(b.$.rows[h].cells[0]),g.renameNode("th"),g.setAttribute("scope","row");if(this.hasColumnHeaders&&"col"!=f&&"both"!=f)for(k=0;k<b.$.rows.length;k++)h=new CKEDITOR.dom.element(b.$.rows[k]),"tbody"==h.getParent().getName()&&(g=new CKEDITOR.dom.element(h.$.cells[0]),g.renameNode("td"),g.removeAttribute("scope"));c.txtHeight?b.setStyle("height",c.txtHeight):b.removeStyle("height");c.txtWidth?b.setStyle("width",c.txtWidth):b.removeStyle("width");
-b.getAttribute("style")||b.removeAttribute("style")}if(this._.selectedElement)try{e.selectBookmarks(d)}catch(p){}else a.insertElement(b),setTimeout(function(){var e=new CKEDITOR.dom.element(b.$.rows[0].cells[0]),c=a.createRange();c.moveToPosition(e,CKEDITOR.POSITION_AFTER_START);c.select()},0)},contents:[{id:"info",label:a.lang.table.title,elements:[{type:"hbox",widths:[null,null],styles:["vertical-align:top"],children:[{type:"vbox",padding:0,children:[{type:"text",id:"txtRows","default":3,label:a.lang.table.rows,
-required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidRows),setup:function(e){this.setValue(e.$.rows.length)},commit:l},{type:"text",id:"txtCols","default":2,label:a.lang.table.columns,required:!0,controlStyle:"width:5em",validate:r(a.lang.table.invalidCols),setup:function(e){this.setValue(v(e))},commit:l},{type:"html",html:"\x26nbsp;"},{type:"select",id:"selHeaders",requiredContent:"th","default":"",label:a.lang.table.headers,items:[[a.lang.table.headersNone,""],[a.lang.table.headersRow,
-"row"],[a.lang.table.headersColumn,"col"],[a.lang.table.headersBoth,"both"]],setup:function(e){var a=this.getDialog();a.hasColumnHeaders=!0;for(var b=0;b<e.$.rows.length;b++){var c=e.$.rows[b].cells[0];if(c&&"th"!=c.nodeName.toLowerCase()){a.hasColumnHeaders=!1;break}}null!==e.$.tHead?this.setValue(a.hasColumnHeaders?"both":"row"):this.setValue(a.hasColumnHeaders?"col":"")},commit:l},{type:"text",id:"txtBorder",requiredContent:"table[border]","default":a.filter.check("table[border]")?1:0,label:a.lang.table.border,
-controlStyle:"width:3em",validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidBorder),setup:function(a){this.setValue(a.getAttribute("border")||"")},commit:function(a,d){this.getValue()?d.setAttribute("border",this.getValue()):d.removeAttribute("border")}},{id:"cmbAlign",type:"select",requiredContent:"table[align]","default":"",label:a.lang.common.align,items:[[a.lang.common.notSet,""],[a.lang.common.alignLeft,"left"],[a.lang.common.alignCenter,"center"],[a.lang.common.alignRight,"right"]],
-setup:function(a){this.setValue(a.getAttribute("align")||"")},commit:function(a,d){this.getValue()?d.setAttribute("align",this.getValue()):d.removeAttribute("align")}}]},{type:"vbox",padding:0,children:[{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtWidth",requiredContent:"table{width}",controlStyle:"width:5em",label:a.lang.common.width,title:a.lang.common.cssLengthTooltip,"default":a.filter.check("table{width}")?500>q.getSize("width")?"100%":500:0,getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
-a.lang.common.width)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("width",this.getValue())},setup:function(a){a=a.getStyle("width");this.setValue(a)},commit:l}]},{type:"hbox",widths:["5em"],children:[{type:"text",id:"txtHeight",requiredContent:"table{height}",controlStyle:"width:5em",label:a.lang.common.height,title:a.lang.common.cssLengthTooltip,"default":"",getValue:u,validate:CKEDITOR.dialog.validate.cssLength(a.lang.common.invalidCssLength.replace("%1",
-a.lang.common.height)),onChange:function(){var a=this.getDialog().getContentElement("advanced","advStyles");a&&a.updateStyle("height",this.getValue())},setup:function(a){(a=a.getStyle("height"))&&this.setValue(a)},commit:l}]},{type:"html",html:"\x26nbsp;"},{type:"text",id:"txtCellSpace",requiredContent:"table[cellspacing]",controlStyle:"width:3em",label:a.lang.table.cellSpace,"default":a.filter.check("table[cellspacing]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellSpacing),
-setup:function(a){this.setValue(a.getAttribute("cellSpacing")||"")},commit:function(a,d){this.getValue()?d.setAttribute("cellSpacing",this.getValue()):d.removeAttribute("cellSpacing")}},{type:"text",id:"txtCellPad",requiredContent:"table[cellpadding]",controlStyle:"width:3em",label:a.lang.table.cellPad,"default":a.filter.check("table[cellpadding]")?1:0,validate:CKEDITOR.dialog.validate.number(a.lang.table.invalidCellPadding),setup:function(a){this.setValue(a.getAttribute("cellPadding")||"")},commit:function(a,
-d){this.getValue()?d.setAttribute("cellPadding",this.getValue()):d.removeAttribute("cellPadding")}}]}]},{type:"html",align:"right",html:""},{type:"vbox",padding:0,children:[{type:"text",id:"txtCaption",requiredContent:"caption",label:a.lang.table.caption,setup:function(a){this.enable();a=a.getElementsByTag("caption");if(0<a.count()){a=a.getItem(0);var d=a.getFirst(CKEDITOR.dom.walker.nodeType(CKEDITOR.NODE_ELEMENT));d&&!d.equals(a.getBogus())?(this.disable(),this.setValue(a.getText())):(a=CKEDITOR.tools.trim(a.getText()),
-this.setValue(a))}},commit:function(e,d){if(this.isEnabled()){var b=this.getValue(),c=d.getElementsByTag("caption");if(b)0<c.count()?(c=c.getItem(0),c.setHtml("")):(c=new CKEDITOR.dom.element("caption",a.document),d.append(c,!0)),c.append(new CKEDITOR.dom.text(b,a.document));else if(0<c.count())for(b=c.count()-1;0<=b;b--)c.getItem(b).remove()}}},{type:"text",id:"txtSummary",bidi:!0,requiredContent:"table[summary]",label:a.lang.table.summary,setup:function(a){this.setValue(a.getAttribute("summary")||
-"")},commit:function(a,d){this.getValue()?d.setAttribute("summary",this.getValue()):d.removeAttribute("summary")}}]}]},p&&p.createAdvancedTab(a,null,"table")]}}var u=CKEDITOR.tools.cssLength,l=function(a){var f=this.id;a.info||(a.info={});a.info[f]=this.getValue()};CKEDITOR.dialog.add("table",function(a){return q(a,"table")});CKEDITOR.dialog.add("tableProperties",function(a){return q(a,"tableProperties")})})();
\ No newline at end of file
diff --git a/plugins/ckeditor/src/plugins/widget/images/handle.png b/plugins/ckeditor/src/plugins/widget/images/handle.png
deleted file mode 100644
index ba8cda5b3..000000000
Binary files a/plugins/ckeditor/src/plugins/widget/images/handle.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/dialog.css b/plugins/ckeditor/src/skins/moono-lisa/dialog.css
deleted file mode 100644
index 4806c2b2a..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/dialog.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/dialog_ie.css b/plugins/ckeditor/src/skins/moono-lisa/dialog_ie.css
deleted file mode 100644
index a5522cc25..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/dialog_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/dialog_ie8.css b/plugins/ckeditor/src/skins/moono-lisa/dialog_ie8.css
deleted file mode 100644
index 8833e5cad..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/dialog_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}a.cke_dialog_ui_button{min-height:18px}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{min-height:18px}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus{padding-top:4px;padding-bottom:2px}select.cke_dialog_ui_input_select{width:100%!important}select.cke_dialog_ui_input_select:focus{margin-left:1px;width:100%!important;padding-top:2px;padding-bottom:2px}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/dialog_iequirks.css b/plugins/ckeditor/src/skins/moono-lisa/dialog_iequirks.css
deleted file mode 100644
index 590c5c227..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/dialog_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_dialog{visibility:visible}.cke_dialog_body{z-index:1;background:#fff}.cke_dialog strong{font-weight:bold}.cke_dialog_title{font-weight:bold;font-size:12px;cursor:move;position:relative;color:#484848;border-bottom:1px solid #d1d1d1;padding:12px 19px 12px 12px;background:#f8f8f8;letter-spacing:.3px}.cke_dialog_spinner{border-radius:50%;width:12px;height:12px;overflow:hidden;text-indent:-9999em;border:2px solid rgba(102,102,102,0.2);border-left-color:rgba(102,102,102,1);-webkit-animation:dialog_spinner 1s infinite linear;animation:dialog_spinner 1s infinite linear}.cke_browser_ie8 .cke_dialog_spinner,.cke_browser_ie9 .cke_dialog_spinner{background:url(images/spinner.gif) center top no-repeat;width:16px;height:16px;border:0}@-webkit-keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes dialog_spinner{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.cke_dialog_contents{background-color:#fff;overflow:auto;padding:15px 10px 5px 10px;margin-top:43px;border-top:1px solid #d1d1d1}.cke_dialog_contents_body{overflow:auto;padding:9px 10px 5px 10px;margin-top:22px}.cke_dialog_footer{text-align:right;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_rtl .cke_dialog_footer{text-align:left}.cke_hc .cke_dialog_footer{outline:0;border-top:1px solid #fff}.cke_dialog .cke_resizer{margin-top:22px}.cke_dialog .cke_resizer_rtl{margin-left:5px}.cke_dialog .cke_resizer_ltr{margin-right:5px}.cke_dialog_tabs{height:33px;display:inline-block;margin:9px 0 0;position:absolute;z-index:2;left:11px}.cke_rtl .cke_dialog_tabs{left:auto;right:11px}a.cke_dialog_tab{height:25px;padding:4px 8px;display:inline-block;cursor:pointer;line-height:26px;outline:0;color:#484848;border:1px solid #d1d1d1;border-radius:3px 3px 0 0;background:#f8f8f8;min-width:90px;text-align:center;margin-left:-1px;letter-spacing:.3px}a.cke_dialog_tab:hover{background-color:#fff}a.cke_dialog_tab:focus{border:2px solid #139ff7;border-bottom-color:#d1d1d1;padding:3px 7px;position:relative;z-index:1}a.cke_dialog_tab_selected{background:#fff;border-bottom-color:#fff;cursor:default;filter:none}a.cke_dialog_tab_selected:hover,a.cke_dialog_tab_selected:focus{border-bottom-color:#fff}.cke_hc a.cke_dialog_tab:hover,.cke_hc a.cke_dialog_tab:focus,.cke_hc a.cke_dialog_tab_selected{border:3px solid;padding:2px 6px}a.cke_dialog_tab_disabled{color:#bababa;cursor:default}.cke_single_page .cke_dialog_tabs{display:none}.cke_single_page .cke_dialog_contents{padding-top:5px;margin-top:0;border-top:0}a.cke_dialog_close_button{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:16px;width:16px;top:11px;z-index:5;opacity:.7;filter:alpha(opacity = 70)}.cke_rtl .cke_dialog_close_button{left:12px}.cke_ltr .cke_dialog_close_button{right:12px}.cke_hc a.cke_dialog_close_button{background-image:none}.cke_hidpi a.cke_dialog_close_button{background-image:url(images/hidpi/close.png);background-size:16px}a.cke_dialog_close_button:hover{opacity:1;filter:alpha(opacity = 100)}a.cke_dialog_close_button span{display:none}.cke_hc a.cke_dialog_close_button span{display:inline;cursor:pointer;font-weight:bold;position:relative;top:3px}div.cke_disabled .cke_dialog_ui_labeled_content div *{background-color:#ddd;cursor:default}.cke_dialog_ui_vbox table,.cke_dialog_ui_hbox table{margin:auto}.cke_dialog_ui_vbox_child{padding:5px 0}.cke_dialog_ui_hbox{width:100%;margin-top:12px}.cke_dialog_ui_hbox_first,.cke_dialog_ui_hbox_child,.cke_dialog_ui_hbox_last{vertical-align:top}.cke_ltr .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_ui_hbox_child{padding-right:10px}.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_child{padding-left:10px}.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_ltr .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-right:5px}.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_footer_buttons .cke_dialog_ui_hbox_child{padding-left:5px;padding-right:0}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:1px solid}textarea.cke_dialog_ui_input_textarea{overflow:auto;resize:none}input.cke_dialog_ui_input_text,input.cke_dialog_ui_input_password,textarea.cke_dialog_ui_input_textarea{background-color:#fff;border:1px solid #bcbcbc;padding:4px 6px;outline:0;width:100%;*width:95%;box-sizing:border-box;border-radius:2px;min-height:28px;margin-left:1px}input.cke_dialog_ui_input_text:hover,input.cke_dialog_ui_input_password:hover,textarea.cke_dialog_ui_input_textarea:hover{border:1px solid #aeb3b9}input.cke_dialog_ui_input_text:focus,input.cke_dialog_ui_input_password:focus,textarea.cke_dialog_ui_input_textarea:focus,select.cke_dialog_ui_input_select:focus{outline:0;border:2px solid #139ff7}input.cke_dialog_ui_input_text:focus{padding-left:5px}textarea.cke_dialog_ui_input_textarea:focus{padding:3px 5px}select.cke_dialog_ui_input_select:focus{margin:0;width:100%!important}input.cke_dialog_ui_checkbox_input,input.cke_dialog_ui_radio_input{margin-left:1px;margin-right:2px}input.cke_dialog_ui_checkbox_input:focus,input.cke_dialog_ui_checkbox_input:active,input.cke_dialog_ui_radio_input:focus,input.cke_dialog_ui_radio_input:active{border:0;outline:2px solid #139ff7}a.cke_dialog_ui_button{display:inline-block;*display:inline;*zoom:1;padding:4px 1px;margin:0;text-align:center;color:#484848;vertical-align:middle;cursor:pointer;border:1px solid #bcbcbc;border-radius:2px;background:#f8f8f8;letter-spacing:.3px;line-height:18px;box-sizing:border-box}.cke_hc a.cke_dialog_ui_button{border-width:3px}span.cke_dialog_ui_button{padding:0 10px;cursor:pointer}a.cke_dialog_ui_button:hover{background:#fff}a.cke_dialog_ui_button:focus,a.cke_dialog_ui_button:active{border:2px solid #139ff7;outline:0;padding:3px 0}.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button:focus,.cke_hc a.cke_dialog_ui_button:active{border:3px solid}.cke_dialog_footer_buttons a.cke_dialog_ui_button span{color:inherit;font-size:12px;font-weight:bold;padding:0 12px}a.cke_dialog_ui_button_ok{color:#fff;background:#09863e;border:1px solid #09863e}.cke_hc a.cke_dialog_ui_button{border:3px solid #bcbcbc}a.cke_dialog_ui_button_ok:hover{background:#53aa78;border-color:#53aa78}a.cke_dialog_ui_button_ok:focus{box-shadow:inset 0 0 0 2px #FFF}a.cke_dialog_ui_button_ok:focus,a.cke_dialog_ui_button_ok:active{border-color:#139ff7}.cke_hc a.cke_dialog_ui_button_ok:hover,.cke_hc a.cke_dialog_ui_button_ok:focus,.cke_hc a.cke_dialog_ui_button_ok:active{border-color:#484848}a.cke_dialog_ui_button_ok.cke_disabled{background:#d1d1d1;border-color:#d1d1d1;cursor:default}a.cke_dialog_ui_button_ok.cke_disabled span{cursor:default}.cke_dialog_footer_buttons{display:inline-table;margin:5px;width:auto;position:relative;vertical-align:middle}div.cke_dialog_ui_input_select{display:table}select.cke_dialog_ui_input_select{height:28px;line-height:28px;background-color:#fff;border:1px solid #bcbcbc;padding:3px 3px 3px 6px;outline:0;border-radius:2px;margin:0 1px;box-sizing:border-box;width:calc(100% - 2px)!important}.cke_dialog_ui_input_file{width:100%;height:25px}.cke_hc .cke_dialog_ui_labeled_content input:focus,.cke_hc .cke_dialog_ui_labeled_content select:focus,.cke_hc .cke_dialog_ui_labeled_content textarea:focus{outline:1px dotted}.cke_dialog_ui_labeled_label{margin-left:1px}.cke_dialog .cke_dark_background{background-color:transparent}.cke_dialog .cke_light_background{background-color:#ebebeb}.cke_dialog .cke_centered{text-align:center}.cke_dialog a.cke_btn_reset{float:right;background:url(images/refresh.png) top left no-repeat;width:16px;height:16px;border:1px none;font-size:1px}.cke_hidpi .cke_dialog a.cke_btn_reset{background-size:16px;background-image:url(images/hidpi/refresh.png)}.cke_rtl .cke_dialog a.cke_btn_reset{float:left}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked{float:left;width:16px;height:16px;background-repeat:no-repeat;border:none 1px;font-size:1px}.cke_dialog a.cke_btn_locked,.cke_dialog a.cke_btn_unlocked,.cke_dialog a.cke_btn_reset{margin:2px}.cke_dialog a.cke_btn_locked{background-image:url(images/lock.png)}.cke_dialog a.cke_btn_unlocked{background-image:url(images/lock-open.png)}.cke_rtl .cke_dialog a.cke_btn_locked,.cke_rtl .cke_dialog a.cke_btn_unlocked{float:right}.cke_hidpi .cke_dialog a.cke_btn_unlocked,.cke_hidpi .cke_dialog a.cke_btn_locked{background-size:16px}.cke_hidpi .cke_dialog a.cke_btn_locked{background-image:url(images/hidpi/lock.png)}.cke_hidpi .cke_dialog a.cke_btn_unlocked{background-image:url(images/hidpi/lock-open.png)}.cke_dialog a.cke_btn_locked .cke_icon{display:none}.cke_dialog a.cke_btn_over,.cke_dialog a.cke_btn_locked:hover,.cke_dialog a.cke_btn_locked:focus,.cke_dialog a.cke_btn_locked:active,.cke_dialog a.cke_btn_unlocked:hover,.cke_dialog a.cke_btn_unlocked:focus,.cke_dialog a.cke_btn_unlocked:active,.cke_dialog a.cke_btn_reset:hover,.cke_dialog a.cke_btn_reset:focus,.cke_dialog a.cke_btn_reset:active{cursor:pointer;outline:0;margin:0;border:2px solid #139ff7}.cke_dialog fieldset{border:1px solid #bcbcbc}.cke_dialog fieldset legend{padding:0 6px}.cke_dialog_ui_checkbox,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{display:inline-block}.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox{padding-top:5px}.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input,.cke_dialog fieldset .cke_dialog_ui_vbox .cke_dialog_ui_checkbox .cke_dialog_ui_checkbox_input+label{vertical-align:middle}.cke_dialog .ImagePreviewBox{border:1px ridge #bcbcbc;overflow:scroll;height:200px;width:300px;padding:2px;background-color:white}.cke_dialog .ImagePreviewBox table td{white-space:normal}.cke_dialog .ImagePreviewLoader{position:absolute;white-space:normal;overflow:hidden;height:160px;width:230px;margin:2px;padding:2px;opacity:.9;filter:alpha(opacity = 90);background-color:#e4e4e4}.cke_dialog .FlashPreviewBox{white-space:normal;border:1px solid #bcbcbc;overflow:auto;height:160px;width:390px;padding:2px;background-color:white}.cke_dialog .cke_pastetext{width:346px;height:170px}.cke_dialog .cke_pastetext textarea{width:340px;height:170px;resize:none}.cke_dialog iframe.cke_pasteframe{width:346px;height:130px;background-color:white;border:1px solid #aeb3b9;border-radius:3px}.cke_dialog .cke_hand{cursor:pointer}.cke_disabled{color:#a0a0a0}.cke_dialog_body .cke_label{display:none}.cke_dialog_body label{display:inline;cursor:default;letter-spacing:.3px}.cke_dialog_body label+.cke_dialog_ui_labeled_content{margin-top:2px}.cke_dialog_contents_body .cke_dialog_ui_text,.cke_dialog_contents_body .cke_dialog_ui_select,.cke_dialog_contents_body .cke_dialog_ui_hbox_last>a.cke_dialog_ui_button{margin-top:4px}a.cke_smile{overflow:hidden;display:block;text-align:center;padding:.3em 0}a.cke_smile img{vertical-align:middle}a.cke_specialchar{cursor:inherit;display:block;height:1.25em;padding:.2em .3em;text-align:center}a.cke_smile,a.cke_specialchar{border:2px solid transparent}a.cke_smile:hover,a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:hover,a.cke_specialchar:focus,a.cke_specialchar:active{background:#fff;outline:0}a.cke_smile:hover,a.cke_specialchar:hover{border-color:#888}a.cke_smile:focus,a.cke_smile:active,a.cke_specialchar:focus,a.cke_specialchar:active{border-color:#139ff7}.cke_dialog_contents a.colorChooser{display:block;margin-top:6px;margin-left:10px;width:80px}.cke_rtl .cke_dialog_contents a.colorChooser{margin-right:10px}.cke_iframe_shim{display:block;position:absolute;top:0;left:0;z-index:-1;filter:alpha(opacity = 0);width:100%;height:100%}.cke_dialog_contents_body .cke_accessibility_legend{margin:2px 7px 2px 2px}.cke_dialog_contents_body .cke_accessibility_legend:focus,.cke_dialog_contents_body .cke_accessibility_legend:active{outline:0;border:2px solid #139ff7;margin:0 5px 0 0}.cke_dialog_contents_body input[type=file]:focus,.cke_dialog_contents_body input[type=file]:active{border:2px solid #139ff7}.cke_dialog_find_fieldset{margin-top:10px!important}.cke_dialog_image_ratiolock{margin-top:52px!important}.cke_dialog_forms_select_order label.cke_dialog_ui_labeled_label{margin-left:0}.cke_dialog_forms_select_order div.cke_dialog_ui_input_select{width:100%}.cke_dialog_forms_select_order_txtsize .cke_dialog_ui_hbox_last{padding-top:4px}.cke_dialog_image_url .cke_dialog_ui_hbox_last,.cke_dialog_flash_url .cke_dialog_ui_hbox_last{vertical-align:bottom}a.cke_dialog_ui_button.cke_dialog_image_browse{margin-top:10px}.cke_dialog_contents_body .cke_tpl_list{border:#bcbcbc 1px solid;margin:1px}.cke_dialog_contents_body .cke_tpl_list:focus,.cke_dialog_contents_body .cke_tpl_list:active{outline:0;margin:0;border:2px solid #139ff7}.cke_dialog_contents_body .cke_tpl_list a:focus,.cke_dialog_contents_body .cke_tpl_list a:active{outline:0}.cke_dialog_contents_body .cke_tpl_list a:focus .cke_tpl_item,.cke_dialog_contents_body .cke_tpl_list a:active .cke_tpl_item{border:2px solid #139ff7;padding:6px}.cke_rtl input.cke_dialog_ui_input_text,.cke_rtl input.cke_dialog_ui_input_password{padding-right:2px}.cke_rtl div.cke_dialog_ui_input_text,.cke_rtl div.cke_dialog_ui_input_password{padding-left:2px}.cke_rtl div.cke_dialog_ui_input_text{padding-right:1px}.cke_rtl .cke_dialog_ui_vbox_child,.cke_rtl .cke_dialog_ui_hbox_child,.cke_rtl .cke_dialog_ui_hbox_first,.cke_rtl .cke_dialog_ui_hbox_last{padding-right:2px!important}.cke_hc .cke_dialog_title,.cke_hc .cke_dialog_footer,.cke_hc a.cke_dialog_tab,.cke_hc a.cke_dialog_ui_button,.cke_hc a.cke_dialog_ui_button:hover,.cke_hc a.cke_dialog_ui_button_ok,.cke_hc a.cke_dialog_ui_button_ok:hover{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_hc div.cke_dialog_ui_input_text,.cke_hc div.cke_dialog_ui_input_password,.cke_hc div.cke_dialog_ui_input_textarea,.cke_hc div.cke_dialog_ui_input_select,.cke_hc div.cke_dialog_ui_input_file{border:0}.cke_dialog_footer{filter:""}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/editor.css b/plugins/ckeditor/src/skins/moono-lisa/editor.css
deleted file mode 100644
index 42bdb1134..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/editor.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__base64image_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__base64image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/editor_gecko.css b/plugins/ckeditor/src/skins/moono-lisa/editor_gecko.css
deleted file mode 100644
index 61775f352..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/editor_gecko.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}.cke_bottom{padding-bottom:3px}.cke_combo_text{margin-bottom:-1px;margin-top:1px}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__base64image_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__base64image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/editor_ie.css b/plugins/ckeditor/src/skins/moono-lisa/editor_ie.css
deleted file mode 100644
index 016aaa055..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/editor_ie.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__base64image_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__base64image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/editor_ie8.css b/plugins/ckeditor/src/skins/moono-lisa/editor_ie8.css
deleted file mode 100644
index 3a074c9c6..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/editor_ie8.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_toolbox_collapser .cke_arrow{border-width:4px}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{border-width:3px}.cke_toolbox_collapser .cke_arrow{margin-top:0}.cke_toolbar{position:relative}.cke_rtl .cke_toolbar_end{right:auto;left:0}.cke_toolbar_end:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:1px;right:2px}.cke_rtl .cke_toolbar_end:after{right:auto;left:2px}.cke_hc .cke_toolbar_end:after{top:2px;right:5px;border-color:#000}.cke_hc.cke_rtl .cke_toolbar_end:after{right:auto;left:5px}.cke_combo+.cke_toolbar_end:after,.cke_toolbar.cke_toolbar_last .cke_toolbar_end:after{content:none;border:0}.cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:0}.cke_rtl .cke_combo+.cke_toolgroup+.cke_toolbar_end:after{right:auto;left:0}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__base64image_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__base64image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/editor_iequirks.css b/plugins/ckeditor/src/skins/moono-lisa/editor_iequirks.css
deleted file mode 100644
index 4070c5227..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/editor_iequirks.css
+++ /dev/null
@@ -1,5 +0,0 @@
-/*
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-For licensing, see LICENSE.md or http://ckeditor.com/license
-*/
-.cke_reset{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none}.cke_reset_all,.cke_reset_all *,.cke_reset_all a,.cke_reset_all textarea{margin:0;padding:0;border:0;background:transparent;text-decoration:none;width:auto;height:auto;vertical-align:baseline;box-sizing:content-box;position:static;transition:none;border-collapse:collapse;font:normal normal normal 12px Arial,Helvetica,Tahoma,Verdana,Sans-Serif;color:#000;text-align:left;white-space:nowrap;cursor:auto;float:none}.cke_reset_all .cke_rtl *{text-align:right}.cke_reset_all iframe{vertical-align:inherit}.cke_reset_all textarea{white-space:pre-wrap}.cke_reset_all textarea,.cke_reset_all input[type="text"],.cke_reset_all input[type="password"]{cursor:text}.cke_reset_all textarea[disabled],.cke_reset_all input[type="text"][disabled],.cke_reset_all input[type="password"][disabled]{cursor:default}.cke_reset_all fieldset{padding:10px;border:2px groove #e0dfe3}.cke_reset_all select{box-sizing:border-box}.cke_reset_all table{table-layout:auto}.cke_chrome{display:block;border:1px solid #d1d1d1;padding:0}.cke_inner{display:block;background:#fff;padding:0;-webkit-touch-callout:none}.cke_float{border:0}.cke_float .cke_inner{padding-bottom:0}.cke_top,.cke_contents,.cke_bottom{display:block;overflow:hidden}.cke_top{border-bottom:1px solid #d1d1d1;background:#f8f8f8;padding:6px 8px 2px;white-space:normal}.cke_float .cke_top{border:1px solid #d1d1d1}.cke_bottom{padding:6px 8px 2px;position:relative;border-top:1px solid #d1d1d1;background:#f8f8f8}.cke_browser_ios .cke_contents{overflow-y:auto;-webkit-overflow-scrolling:touch}.cke_resizer{width:0;height:0;overflow:hidden;border-width:10px 10px 0 0;border-color:transparent #bcbcbc transparent transparent;border-style:dashed solid dashed dashed;font-size:0;vertical-align:bottom;margin-top:6px;margin-bottom:2px}.cke_hc .cke_resizer{font-size:15px;width:auto;height:auto;border-width:0}.cke_resizer_ltr{cursor:se-resize;float:right;margin-right:-4px}.cke_resizer_rtl{border-width:10px 0 0 10px;border-color:transparent transparent transparent #bcbcbc;border-style:dashed dashed dashed solid;cursor:sw-resize;float:left;margin-left:-4px;right:auto}.cke_wysiwyg_div{display:block;height:100%;overflow:auto;padding:0 8px;outline-style:none;box-sizing:border-box}.cke_panel{visibility:visible;width:120px;height:100px;overflow:hidden;background-color:#fff;border:1px solid #d1d1d1}.cke_menu_panel{padding:0;margin:0}.cke_combopanel{width:150px;height:170px}.cke_panel_frame{width:100%;height:100%;font-size:12px;overflow:auto;overflow-x:hidden}.cke_panel_container{overflow-y:auto;overflow-x:hidden}.cke_panel_block:focus{outline:0}.cke_panel_list{margin:0;padding:0;list-style-type:none;white-space:nowrap}.cke_panel_listItem{margin:0;padding:0}.cke_panel_listItem a{padding:6px 7px;display:block;color:inherit!important;text-decoration:none;overflow:hidden;text-overflow:ellipsis}.cke_hc .cke_panel_listItem a{border-style:none}.cke_panel_listItem.cke_selected a,.cke_panel_listItem a:hover,.cke_panel_listItem a:focus,.cke_panel_listItem a:active{background-color:#e9e9e9}.cke_panel_listItem a:focus{outline:1px dotted #000}.cke_hc .cke_panel_listItem a:hover,.cke_hc .cke_panel_listItem a:focus,.cke_hc .cke_panel_listItem a:active{border:2px solid;padding:4px 5px}.cke_panel_listItem p,.cke_panel_listItem h1,.cke_panel_listItem h2,.cke_panel_listItem h3,.cke_panel_listItem h4,.cke_panel_listItem h5,.cke_panel_listItem h6,.cke_panel_listItem pre{margin-top:0;margin-bottom:0}.cke_panel_grouptitle{cursor:default;font-size:11px;font-weight:bold;white-space:nowrap;margin:0;padding:6px 6px 7px 6px;color:#484848;border-bottom:1px solid #d1d1d1;background:#f8f8f8}.cke_colorblock{padding:10px;font-size:11px;font-family:'Microsoft Sans Serif',Tahoma,Arial,Verdana,Sans-Serif}.cke_colorblock,.cke_colorblock a{text-decoration:none;color:#000}a.cke_colorbox{padding:2px;float:left;width:20px;height:20px}.cke_rtl a.cke_colorbox{float:right}a:hover.cke_colorbox,a:focus.cke_colorbox,a:active.cke_colorbox{outline:0;padding:0;border:2px solid #139ff7}a:hover.cke_colorbox{border-color:#bcbcbc}span.cke_colorbox{width:20px;height:20px;float:left}.cke_rtl span.cke_colorbox{float:right}a.cke_colorauto,a.cke_colormore{border:#fff 1px solid;padding:3px;display:block;cursor:pointer}a.cke_colorauto{padding:0;border:1px solid transparent;margin-bottom:6px;height:26px;line-height:26px}a.cke_colormore{margin-top:10px;height:20px;line-height:19px}a:hover.cke_colorauto,a:hover.cke_colormore,a:focus.cke_colorauto,a:focus.cke_colormore,a:active.cke_colorauto,a:active.cke_colormore{outline:0;border:#139ff7 1px solid;background-color:#f8f8f8}a:hover.cke_colorauto,a:hover.cke_colormore{border-color:#bcbcbc}.cke_colorauto span.cke_colorbox{width:18px;height:18px;border:1px solid #808080;margin-left:1px;margin-top:3px}.cke_rtl .cke_colorauto span.cke_colorbox{margin-left:0;margin-right:1px}span.cke_colorbox[style*="#ffffff"],span.cke_colorbox[style*="#FFFFFF"],span.cke_colorbox[style="background-color:#fff"],span.cke_colorbox[style="background-color:#FFF"],span.cke_colorbox[style*="rgb(255,255,255)"],span.cke_colorbox[style*="rgb(255, 255, 255)"]{border:1px solid #808080;width:18px;height:18px}.cke_toolbar{float:left}.cke_rtl .cke_toolbar{float:right}.cke_toolgroup{border:0;float:left;margin:1px 2px 6px 0;padding-right:3px}.cke_rtl .cke_toolgroup{float:right;margin:1px 0 6px 2px;padding-left:3px;padding-right:0}.cke_hc .cke_toolgroup{margin-right:5px;margin-bottom:5px}.cke_hc.cke_rtl .cke_toolgroup{margin-right:0;margin-left:5px}a.cke_button{display:inline-block;height:18px;padding:4px 6px;outline:0;cursor:default;float:left;border:0;position:relative}.cke_rtl a.cke_button{float:right}.cke_hc a.cke_button{border:1px solid black;padding:3px 5px;margin:0 3px 5px 0}.cke_hc.cke_rtl a.cke_button{margin:0 0 5px 3px}a.cke_button_on{background:#fff;border:1px #bcbcbc solid;padding:3px 5px}a.cke_button_off:hover,a.cke_button_off:focus,a.cke_button_off:active{background:#e5e5e5;border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active{background:#e5e5e5;border:3px solid #000;padding:1px 3px}a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{border:0;padding:4px 6px;background-color:transparent}a.cke_button_disabled:focus{border:1px #bcbcbc solid;padding:3px 5px}.cke_hc a.cke_button_disabled:hover,.cke_hc a.cke_button_disabled:focus,.cke_hc a.cke_button_disabled:active{border:1px solid #acacac;padding:3px 5px;margin:0 3px 5px 0}.cke_hc a.cke_button_disabled:focus{border:3px solid #000;padding:1px 3px}.cke_hc.cke_rtl a.cke_button_disabled:hover,.cke_hc.cke_rtl a.cke_button_disabled:focus,.cke_hc.cke_rtl a.cke_button_disabled:active{margin:0 0 5px 3px}a.cke_button_disabled .cke_button_icon,a.cke_button_disabled .cke_button_arrow{opacity:.3}.cke_hc a.cke_button_disabled{border-color:#acacac}.cke_hc a.cke_button_disabled .cke_button_icon,.cke_hc a.cke_button_disabled .cke_button_label{opacity:.5}.cke_toolgroup a.cke_button:last-child:after,.cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:4px;top:0;right:-3px}.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-right:0;right:auto;border-left:1px solid #bcbcbc;top:0;left:-3px}.cke_hc .cke_toolgroup a.cke_button:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{border-color:#000;top:0;right:-7px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_disabled:hover:last-child:after{top:0;right:auto;left:-7px}.cke_toolgroup a.cke_button:hover:last-child:after,.cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:-4px}.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-1px;right:auto;left:-4px}.cke_hc .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:-9px}.cke_hc.cke_rtl .cke_toolgroup a.cke_button:hover:last-child:after,.cke_hc.cke_rtl .cke_toolgroup a.cke_button.cke_button_on:last-child:after{top:-2px;right:auto;left:-9px}.cke_toolbar.cke_toolbar_last .cke_toolgroup a.cke_button:last-child:after{content:none;border:0;width:0;height:0}.cke_button_icon{cursor:inherit;background-repeat:no-repeat;margin-top:1px;width:16px;height:16px;float:left;display:inline-block}.cke_rtl .cke_button_icon{float:right}.cke_hc .cke_button_icon{display:none}.cke_button_label{display:none;padding-left:3px;margin-top:1px;line-height:17px;vertical-align:middle;float:left;cursor:default;color:#484848}.cke_rtl .cke_button_label{padding-right:3px;padding-left:0;float:right}.cke_hc .cke_button_label{padding:0;display:inline-block;font-size:12px}.cke_button_arrow{display:inline-block;margin:8px 0 0 1px;width:0;height:0;cursor:default;vertical-align:top;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_rtl .cke_button_arrow{margin-right:5px;margin-left:0}.cke_hc .cke_button_arrow{font-size:10px;margin:3px 0 0 3px;width:auto;border:0}.cke_toolbar_separator{float:left;background-color:#bcbcbc;margin:4px 2px 0 2px;height:18px;width:1px}.cke_rtl .cke_toolbar_separator{float:right}.cke_hc .cke_toolbar_separator{background-color:#000;margin-left:2px;margin-right:5px;margin-bottom:9px}.cke_hc.cke_rtl .cke_toolbar_separator{margin-left:5px;margin-right:2px}.cke_toolbar_break{display:block;clear:left}.cke_rtl .cke_toolbar_break{clear:right}a.cke_toolbox_collapser{width:12px;height:11px;float:right;margin:11px 0 0;font-size:0;cursor:default;text-align:center;border:1px solid #bcbcbc}.cke_rtl .cke_toolbox_collapser{float:left}.cke_toolbox_collapser:hover{background:#e5e5e5}.cke_toolbox_collapser.cke_toolbox_collapser_min{margin:0 2px 4px}.cke_toolbox_collapser .cke_arrow{display:inline-block;height:0;width:0;font-size:0;margin-top:1px;border:3px solid transparent;border-bottom-color:#484848}.cke_toolbox_collapser.cke_toolbox_collapser_min .cke_arrow{margin-top:4px;border-bottom-color:transparent;border-top-color:#484848}.cke_hc .cke_toolbox_collapser .cke_arrow{font-size:8px;width:auto;border:0;margin-top:0}.cke_menuitem span{cursor:default}.cke_menubutton{display:block}.cke_hc .cke_menubutton{padding:2px}.cke_menubutton:hover,.cke_menubutton:focus,.cke_menubutton:active{background-color:#e9e9e9;display:block;outline:1px dotted}.cke_menubutton:hover{outline:0}.cke_hc .cke_menubutton:hover,.cke_hc .cke_menubutton:focus,.cke_hc .cke_menubutton:active{border:2px solid;padding:0}.cke_menubutton_disabled:hover,.cke_menubutton_disabled:focus,.cke_menubutton_disabled:active{background-color:transparent;outline:0}.cke_menubutton_inner{display:table-row}.cke_menubutton_icon,.cke_menubutton_label,.cke_menuarrow{display:table-cell}.cke_menubutton_icon{background-color:#f8f8f8;padding:6px 4px}.cke_hc .cke_menubutton_icon{height:16px;width:0;padding:4px 0}.cke_menubutton:hover .cke_menubutton_icon,.cke_menubutton:focus .cke_menubutton_icon,.cke_menubutton:active .cke_menubutton_icon{background-color:#e9e9e9}.cke_menubutton_disabled:hover .cke_menubutton_icon,.cke_menubutton_disabled:focus .cke_menubutton_icon,.cke_menubutton_disabled:active .cke_menubutton_icon{background-color:#f8f8f8;outline:0}.cke_menuitem .cke_menubutton_on{background-color:#e9e9e9;border:1px solid #dedede;outline:0}.cke_menubutton_on .cke_menubutton_icon{padding-right:3px;background-color:#e9e9e9}.cke_menubutton_label{padding:0 5px;background-color:transparent;width:100%;vertical-align:middle}.cke_menubutton_shortcut{color:#979797}.cke_menubutton_disabled .cke_menubutton_label{opacity:.3;filter:alpha(opacity=30)}.cke_panel_frame .cke_menubutton_label{display:none}.cke_menuseparator{background-color:#d1d1d1;height:1px}.cke_menuarrow{background:transparent url(images/arrow.png) no-repeat 0 10px;padding:0 5px}.cke_rtl .cke_menuarrow{background-position:5px -13px;background-repeat:no-repeat}.cke_hc .cke_menuarrow{background-image:none}.cke_menuarrow span{display:none}.cke_hc .cke_menuarrow span{vertical-align:middle;display:inline}.cke_combo{display:inline-block;float:left;position:relative;margin-bottom:5px}.cke_rtl .cke_combo{float:right}.cke_hc .cke_combo{margin-top:1px;margin-bottom:10px}.cke_combo:after{content:"";position:absolute;height:18px;width:0;border-right:1px solid #bcbcbc;margin-top:5px;top:0;right:0}.cke_rtl .cke_combo:after{border-right:0;border-left:1px solid #bcbcbc;right:auto;left:0}.cke_hc .cke_combo:after{border-color:#000}a.cke_combo_button{cursor:default;display:inline-block;float:left;margin:0;padding:1px}.cke_rtl a.cke_combo_button{float:right}.cke_hc a.cke_combo_button{padding:4px}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:hover,.cke_combo_off a.cke_combo_button:focus,.cke_combo_off a.cke_combo_button:active{background:#e5e5e5;border:1px solid #bcbcbc;padding:0 0 0 1px;margin-left:-1px}.cke_combo_off a.cke_combo_button:focus{outline:0}.cke_combo_on a.cke_combo_button,.cke_combo_off a.cke_combo_button:active{background:#fff}.cke_rtl .cke_combo_on a.cke_combo_button,.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:0 1px 0 0;margin-left:0;margin-right:-1px}.cke_hc .cke_combo_on a.cke_combo_button,.cke_hc .cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_combo_off a.cke_combo_button:active{border:3px solid #000;padding:1px 1px 1px 2px}.cke_hc.cke_rtl .cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_combo_off a.cke_combo_button:active{padding:1px 2px 1px 1px}.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 0 0 3px;margin-left:-3px}.cke_rtl .cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_rtl .cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0 3px 0 0;margin-left:0;margin-right:-3px}.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 1px 1px 7px;margin-left:-6px}.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc.cke_rtl .cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px 7px 1px 1px;margin-left:0;margin-right:-6px}.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:0;margin:0}.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbox .cke_toolbar:first-child>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_on a.cke_combo_button,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:hover,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:focus,.cke_hc .cke_toolbar_break+.cke_toolbar>.cke_toolbar_start+.cke_combo_off a.cke_combo_button:active{padding:1px;margin:0}.cke_toolbar .cke_combo+.cke_toolbar_end,.cke_toolbar .cke_combo+.cke_toolgroup{margin-right:0;margin-left:2px}.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:2px}.cke_hc .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:5px}.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolbar_end,.cke_hc.cke_rtl .cke_toolbar .cke_combo+.cke_toolgroup{margin-left:0;margin-right:5px}.cke_toolbar.cke_toolbar_last .cke_combo:nth-last-child(-n+2):after{content:none;border:0;width:0;height:0}.cke_combo_text{line-height:26px;padding-left:10px;text-overflow:ellipsis;overflow:hidden;float:left;cursor:default;color:#484848;width:60px}.cke_rtl .cke_combo_text{float:right;text-align:right;padding-left:0;padding-right:10px}.cke_hc .cke_combo_text{line-height:18px;font-size:12px}.cke_combo_open{cursor:default;display:inline-block;font-size:0;height:19px;line-height:17px;margin:1px 10px 1px;width:5px}.cke_hc .cke_combo_open{height:12px}.cke_combo_arrow{cursor:default;margin:11px 0 0;float:left;height:0;width:0;font-size:0;border-left:3px solid transparent;border-right:3px solid transparent;border-top:3px solid #484848}.cke_hc .cke_combo_arrow{font-size:10px;width:auto;border:0;margin-top:3px}.cke_combo_label{display:none;float:left;line-height:26px;vertical-align:top;margin-right:5px}.cke_rtl .cke_combo_label{float:right;margin-left:5px;margin-right:0}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{opacity:.3}.cke_path{float:left;margin:-2px 0 2px}a.cke_path_item,span.cke_path_empty{display:inline-block;float:left;padding:3px 4px;margin-right:2px;cursor:default;text-decoration:none;outline:0;border:0;color:#484848;font-weight:bold;font-size:11px}.cke_rtl .cke_path,.cke_rtl .cke_path_item,.cke_rtl .cke_path_empty{float:right}a.cke_path_item:hover,a.cke_path_item:focus,a.cke_path_item:active{background-color:#e5e5e5}.cke_hc a.cke_path_item:hover,.cke_hc a.cke_path_item:focus,.cke_hc a.cke_path_item:active{border:2px solid;padding:1px 2px}.cke_button__source_label,.cke_button__sourcedialog_label{display:inline}.cke_combopanel__fontsize{width:135px}textarea.cke_source{font-family:'Courier New',Monospace;font-size:small;background-color:#fff;white-space:pre-wrap;border:0;padding:0;margin:0;display:block}.cke_wysiwyg_frame,.cke_wysiwyg_div{background-color:#fff}.cke_notifications_area{pointer-events:none}.cke_notification{pointer-events:auto;position:relative;margin:10px;width:300px;color:white;text-align:center;opacity:.95;filter:alpha(opacity = 95);-webkit-animation:fadeIn .7s;animation:fadeIn .7s}.cke_notification_message a{color:#12306f}@-webkit-keyframes fadeIn{from{opacity:.4}to{opacity:.95}}@keyframes fadeIn{from{opacity:.4}to{opacity:.95}}.cke_notification_success{background:#72b572;border:1px solid #63a563}.cke_notification_warning{background:#c83939;border:1px solid #902b2b}.cke_notification_info{background:#2e9ad0;border:1px solid #0f74a8}.cke_notification_info span.cke_notification_progress{background-color:#0f74a8;display:block;padding:0;margin:0;height:100%;overflow:hidden;position:absolute;z-index:1}.cke_notification_message{position:relative;margin:4px 23px 3px;font-family:Arial,Helvetica,sans-serif;font-size:12px;line-height:18px;z-index:4;text-overflow:ellipsis;overflow:hidden}.cke_notification_close{background-image:url(images/close.png);background-repeat:no-repeat;background-position:50%;position:absolute;cursor:pointer;text-align:center;height:20px;width:20px;top:1px;right:1px;padding:0;margin:0;z-index:5;opacity:.6;filter:alpha(opacity = 60)}.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_notification_close span{display:none}.cke_notification_warning a.cke_notification_close{opacity:.8;filter:alpha(opacity = 80)}.cke_notification_warning a.cke_notification_close:hover{opacity:1;filter:alpha(opacity = 100)}.cke_chrome{visibility:inherit}.cke_voice_label{display:none}legend.cke_voice_label{display:none}a.cke_button_disabled,a.cke_button_disabled:hover,a.cke_button_disabled:focus,a.cke_button_disabled:active{filter:alpha(opacity = 30)}.cke_button_disabled .cke_button_icon{filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#00ffffff,endColorstr=#00ffffff)}.cke_button_off:hover,.cke_button_off:focus,.cke_button_off:active{filter:alpha(opacity = 100)}.cke_combo_disabled .cke_combo_inlinelabel,.cke_combo_disabled .cke_combo_open{filter:alpha(opacity = 30)}.cke_toolbox_collapser{border:1px solid #a6a6a6}.cke_toolbox_collapser .cke_arrow{margin-top:1px}.cke_hc .cke_top,.cke_hc .cke_bottom,.cke_hc .cke_combo_button,.cke_hc a.cke_combo_button:hover,.cke_hc a.cke_combo_button:focus,.cke_hc .cke_toolgroup,.cke_hc .cke_button_on,.cke_hc a.cke_button_off:hover,.cke_hc a.cke_button_off:focus,.cke_hc a.cke_button_off:active,.cke_hc .cke_toolbox_collapser,.cke_hc .cke_toolbox_collapser:hover,.cke_hc .cke_panel_grouptitle{filter:progid:DXImageTransform.Microsoft.gradient(enabled=false)}.cke_top,.cke_contents,.cke_bottom{width:100%}.cke_button_arrow{font-size:0}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_button,.cke_rtl .cke_button *,.cke_rtl .cke_combo,.cke_rtl .cke_combo *,.cke_rtl .cke_path_item,.cke_rtl .cke_path_item *,.cke_rtl .cke_path_empty{float:none}.cke_rtl .cke_toolgroup,.cke_rtl .cke_toolbar_separator,.cke_rtl .cke_combo_button,.cke_rtl .cke_combo_button *,.cke_rtl .cke_button,.cke_rtl .cke_button_icon{display:inline-block;vertical-align:top}.cke_rtl .cke_button_icon{float:none}.cke_resizer{width:10px}.cke_source{white-space:normal}.cke_bottom{position:static}.cke_colorbox{font-size:0}.cke_button__about_icon {background: url(icons.png?t=20af917) no-repeat 0 -0px !important;}.cke_rtl .cke_button__copy_icon, .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -24px !important;}.cke_ltr .cke_button__copy_icon {background: url(icons.png?t=20af917) no-repeat 0 -48px !important;}.cke_rtl .cke_button__cut_icon, .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -72px !important;}.cke_ltr .cke_button__cut_icon {background: url(icons.png?t=20af917) no-repeat 0 -96px !important;}.cke_rtl .cke_button__paste_icon, .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -120px !important;}.cke_ltr .cke_button__paste_icon {background: url(icons.png?t=20af917) no-repeat 0 -144px !important;}.cke_button__base64image_icon {background: url(icons.png?t=20af917) no-repeat 0 -168px !important;}.cke_button__bold_icon {background: url(icons.png?t=20af917) no-repeat 0 -192px !important;}.cke_button__italic_icon {background: url(icons.png?t=20af917) no-repeat 0 -216px !important;}.cke_button__strike_icon {background: url(icons.png?t=20af917) no-repeat 0 -240px !important;}.cke_button__subscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -264px !important;}.cke_button__superscript_icon {background: url(icons.png?t=20af917) no-repeat 0 -288px !important;}.cke_button__underline_icon {background: url(icons.png?t=20af917) no-repeat 0 -312px !important;}.cke_button__bidiltr_icon {background: url(icons.png?t=20af917) no-repeat 0 -336px !important;}.cke_button__bidirtl_icon {background: url(icons.png?t=20af917) no-repeat 0 -360px !important;}.cke_button__blockquote_icon {background: url(icons.png?t=20af917) no-repeat 0 -384px !important;}.cke_button__bgcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -408px !important;}.cke_button__textcolor_icon {background: url(icons.png?t=20af917) no-repeat 0 -432px !important;}.cke_button__image_icon {background: url(icons.png?t=20af917) no-repeat 0 -456px !important;}.cke_rtl .cke_button__indent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -480px !important;}.cke_ltr .cke_button__indent_icon {background: url(icons.png?t=20af917) no-repeat 0 -504px !important;}.cke_rtl .cke_button__outdent_icon, .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -528px !important;}.cke_ltr .cke_button__outdent_icon {background: url(icons.png?t=20af917) no-repeat 0 -552px !important;}.cke_rtl .cke_button__anchor_icon, .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -576px !important;}.cke_ltr .cke_button__anchor_icon {background: url(icons.png?t=20af917) no-repeat 0 -600px !important;}.cke_button__link_icon {background: url(icons.png?t=20af917) no-repeat 0 -624px !important;}.cke_button__unlink_icon {background: url(icons.png?t=20af917) no-repeat 0 -648px !important;}.cke_rtl .cke_button__bulletedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -672px !important;}.cke_ltr .cke_button__bulletedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -696px !important;}.cke_rtl .cke_button__numberedlist_icon, .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -720px !important;}.cke_ltr .cke_button__numberedlist_icon {background: url(icons.png?t=20af917) no-repeat 0 -744px !important;}.cke_button__maximize_icon {background: url(icons.png?t=20af917) no-repeat 0 -768px !important;}.cke_button__table_icon {background: url(icons.png?t=20af917) no-repeat 0 -792px !important;}.cke_button__removeformat_icon {background: url(icons.png?t=20af917) no-repeat 0 -816px !important;}.cke_rtl .cke_button__source_icon, .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -840px !important;}.cke_ltr .cke_button__source_icon {background: url(icons.png?t=20af917) no-repeat 0 -864px !important;}.cke_rtl .cke_button__redo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -888px !important;}.cke_ltr .cke_button__redo_icon {background: url(icons.png?t=20af917) no-repeat 0 -912px !important;}.cke_rtl .cke_button__undo_icon, .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -936px !important;}.cke_ltr .cke_button__undo_icon {background: url(icons.png?t=20af917) no-repeat 0 -960px !important;}.cke_hidpi .cke_button__about_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -0px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__copy_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -24px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__copy_icon,.cke_ltr.cke_hidpi .cke_button__copy_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -48px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__cut_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -72px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__cut_icon,.cke_ltr.cke_hidpi .cke_button__cut_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -96px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__paste_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -120px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__paste_icon,.cke_ltr.cke_hidpi .cke_button__paste_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -144px !important;background-size: 16px !important;}.cke_hidpi .cke_button__base64image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -168px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bold_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -192px !important;background-size: 16px !important;}.cke_hidpi .cke_button__italic_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -216px !important;background-size: 16px !important;}.cke_hidpi .cke_button__strike_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -240px !important;background-size: 16px !important;}.cke_hidpi .cke_button__subscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -264px !important;background-size: 16px !important;}.cke_hidpi .cke_button__superscript_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -288px !important;background-size: 16px !important;}.cke_hidpi .cke_button__underline_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -312px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidiltr_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -336px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bidirtl_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -360px !important;background-size: 16px !important;}.cke_hidpi .cke_button__blockquote_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -384px !important;background-size: 16px !important;}.cke_hidpi .cke_button__bgcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -408px !important;background-size: 16px !important;}.cke_hidpi .cke_button__textcolor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -432px !important;background-size: 16px !important;}.cke_hidpi .cke_button__image_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -456px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__indent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -480px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__indent_icon,.cke_ltr.cke_hidpi .cke_button__indent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -504px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__outdent_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -528px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__outdent_icon,.cke_ltr.cke_hidpi .cke_button__outdent_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -552px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__anchor_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -576px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__anchor_icon,.cke_ltr.cke_hidpi .cke_button__anchor_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -600px !important;background-size: 16px !important;}.cke_hidpi .cke_button__link_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -624px !important;background-size: 16px !important;}.cke_hidpi .cke_button__unlink_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -648px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__bulletedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -672px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__bulletedlist_icon,.cke_ltr.cke_hidpi .cke_button__bulletedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -696px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__numberedlist_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -720px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__numberedlist_icon,.cke_ltr.cke_hidpi .cke_button__numberedlist_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -744px !important;background-size: 16px !important;}.cke_hidpi .cke_button__maximize_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -768px !important;background-size: 16px !important;}.cke_hidpi .cke_button__table_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -792px !important;background-size: 16px !important;}.cke_hidpi .cke_button__removeformat_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -816px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__source_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -840px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__source_icon,.cke_ltr.cke_hidpi .cke_button__source_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -864px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__redo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -888px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__redo_icon,.cke_ltr.cke_hidpi .cke_button__redo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -912px !important;background-size: 16px !important;}.cke_rtl.cke_hidpi .cke_button__undo_icon, .cke_hidpi .cke_mixed_dir_content .cke_rtl .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -936px !important;background-size: 16px !important;}.cke_hidpi .cke_ltr .cke_button__undo_icon,.cke_ltr.cke_hidpi .cke_button__undo_icon {background: url(icons_hidpi.png?t=20af917) no-repeat 0 -960px !important;background-size: 16px !important;}
\ No newline at end of file
diff --git a/plugins/ckeditor/src/skins/moono-lisa/icons.png b/plugins/ckeditor/src/skins/moono-lisa/icons.png
deleted file mode 100644
index 06ef8f78a..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/icons.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/icons_hidpi.png b/plugins/ckeditor/src/skins/moono-lisa/icons_hidpi.png
deleted file mode 100644
index 2497f4f19..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/icons_hidpi.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/arrow.png b/plugins/ckeditor/src/skins/moono-lisa/images/arrow.png
deleted file mode 100644
index d72b5f3b8..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/arrow.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/close.png b/plugins/ckeditor/src/skins/moono-lisa/images/close.png
deleted file mode 100644
index 40caa6ddf..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/close.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/close.png b/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/close.png
deleted file mode 100644
index fa00f4fce..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/close.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock-open.png b/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock-open.png
deleted file mode 100644
index c89978907..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock-open.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock.png b/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock.png
deleted file mode 100644
index 25ad0f4a3..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/lock.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/refresh.png b/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/refresh.png
deleted file mode 100644
index 117a2d4a4..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/hidpi/refresh.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/lock-open.png b/plugins/ckeditor/src/skins/moono-lisa/images/lock-open.png
deleted file mode 100644
index 42df5f411..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/lock-open.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/lock.png b/plugins/ckeditor/src/skins/moono-lisa/images/lock.png
deleted file mode 100644
index bde67727d..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/lock.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/refresh.png b/plugins/ckeditor/src/skins/moono-lisa/images/refresh.png
deleted file mode 100644
index e363764e3..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/refresh.png and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/images/spinner.gif b/plugins/ckeditor/src/skins/moono-lisa/images/spinner.gif
deleted file mode 100644
index d898d41fa..000000000
Binary files a/plugins/ckeditor/src/skins/moono-lisa/images/spinner.gif and /dev/null differ
diff --git a/plugins/ckeditor/src/skins/moono-lisa/readme.md b/plugins/ckeditor/src/skins/moono-lisa/readme.md
deleted file mode 100644
index d4c68119d..000000000
--- a/plugins/ckeditor/src/skins/moono-lisa/readme.md
+++ /dev/null
@@ -1,46 +0,0 @@
-"Moono-lisa" Skin
-=================
-
-This skin has been made a **default skin** starting from CKEditor 4.6.0 and is maintained by the core developers.
-
-For more information about skins, please check the [CKEditor Skin SDK](http://docs.cksource.com/CKEditor_4.x/Skin_SDK)
-documentation.
-
-Features
--------------------
-"Moono-lisa" is a monochromatic skin, which offers a modern, flat and minimalistic look which blends very well in modern design.
-It comes with the following features:
-
-- Chameleon feature with brightness.
-- High-contrast compatibility.
-- Graphics source provided in SVG.
-
-Directory Structure
--------------------
-
-CSS parts:
-- **editor.css**: the main CSS file. It's simply loading several other files, for easier maintenance,
-- **mainui.css**: the file contains styles of entire editor outline structures,
-- **toolbar.css**: the file contains styles of the editor toolbar space (top),
-- **richcombo.css**: the file contains styles of the rich combo ui elements on toolbar,
-- **panel.css**: the file contains styles of the rich combo drop-down, it's not loaded
-until the first panel open up,
-- **elementspath.css**: the file contains styles of the editor elements path bar (bottom),
-- **menu.css**: the file contains styles of all editor menus including context menu and button drop-down,
-it's not loaded until the first menu open up,
-- **dialog.css**: the CSS files for the dialog UI, it's not loaded until the first dialog open,
-- **reset.css**: the file defines the basis of style resets among all editor UI spaces,
-- **preset.css**: the file defines the default styles of some UI elements reflecting the skin preference,
-- **editor_XYZ.css** and **dialog_XYZ.css**: browser specific CSS hacks.
-
-Other parts:
-- **skin.js**: the only JavaScript part of the skin that registers the skin, its browser specific files and its icons and defines the Chameleon feature,
-- **images/**: contains a fill general used images,
-- **dev/**: contains SVG and PNG source of the skin icons.
-
-License
--------
-
-Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
-
-For licensing, see LICENSE.md or [http://ckeditor.com/license](http://ckeditor.com/license)
diff --git a/plugins/ckeditor/src/styles.js b/plugins/ckeditor/src/styles.js
deleted file mode 100644
index e1cd4d4f0..000000000
--- a/plugins/ckeditor/src/styles.js
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Copyright (c) 2003-2017, CKSource - Frederico Knabben. All rights reserved.
- * For licensing, see LICENSE.md or http://ckeditor.com/license
- */
-
-// This file contains style definitions that can be used by CKEditor plugins.
-//
-// The most common use for it is the "stylescombo" plugin which shows the Styles drop-down
-// list containing all styles in the editor toolbar. Other plugins, like
-// the "div" plugin, use a subset of the styles for their features.
-//
-// If you do not have plugins that depend on this file in your editor build, you can simply
-// ignore it. Otherwise it is strongly recommended to customize this file to match your
-// website requirements and design properly.
-//
-// For more information refer to: http://docs.ckeditor.com/#!/guide/dev_styles-section-style-rules
-
-CKEDITOR.stylesSet.add( 'default', [
-	/* Block styles */
-
-	// These styles are already available in the "Format" drop-down list ("format" plugin),
-	// so they are not needed here by default. You may enable them to avoid
-	// placing the "Format" combo in the toolbar, maintaining the same features.
-	/*
-	{ name: 'Paragraph',		element: 'p' },
-	{ name: 'Heading 1',		element: 'h1' },
-	{ name: 'Heading 2',		element: 'h2' },
-	{ name: 'Heading 3',		element: 'h3' },
-	{ name: 'Heading 4',		element: 'h4' },
-	{ name: 'Heading 5',		element: 'h5' },
-	{ name: 'Heading 6',		element: 'h6' },
-	{ name: 'Preformatted Text',element: 'pre' },
-	{ name: 'Address',			element: 'address' },
-	*/
-
-	{ name: 'Italic Title',		element: 'h2', styles: { 'font-style': 'italic' } },
-	{ name: 'Subtitle',			element: 'h3', styles: { 'color': '#aaa', 'font-style': 'italic' } },
-	{
-		name: 'Special Container',
-		element: 'div',
-		styles: {
-			padding: '5px 10px',
-			background: '#eee',
-			border: '1px solid #ccc'
-		}
-	},
-
-	/* Inline styles */
-
-	// These are core styles available as toolbar buttons. You may opt enabling
-	// some of them in the Styles drop-down list, removing them from the toolbar.
-	// (This requires the "stylescombo" plugin.)
-	/*
-	{ name: 'Strong',			element: 'strong', overrides: 'b' },
-	{ name: 'Emphasis',			element: 'em'	, overrides: 'i' },
-	{ name: 'Underline',		element: 'u' },
-	{ name: 'Strikethrough',	element: 'strike' },
-	{ name: 'Subscript',		element: 'sub' },
-	{ name: 'Superscript',		element: 'sup' },
-	*/
-
-	{ name: 'Marker',			element: 'span', attributes: { 'class': 'marker' } },
-
-	{ name: 'Big',				element: 'big' },
-	{ name: 'Small',			element: 'small' },
-	{ name: 'Typewriter',		element: 'tt' },
-
-	{ name: 'Computer Code',	element: 'code' },
-	{ name: 'Keyboard Phrase',	element: 'kbd' },
-	{ name: 'Sample Text',		element: 'samp' },
-	{ name: 'Variable',			element: 'var' },
-
-	{ name: 'Deleted Text',		element: 'del' },
-	{ name: 'Inserted Text',	element: 'ins' },
-
-	{ name: 'Cited Work',		element: 'cite' },
-	{ name: 'Inline Quotation',	element: 'q' },
-
-	{ name: 'Language: RTL',	element: 'span', attributes: { 'dir': 'rtl' } },
-	{ name: 'Language: LTR',	element: 'span', attributes: { 'dir': 'ltr' } },
-
-	/* Object styles */
-
-	{
-		name: 'Styled Image (left)',
-		element: 'img',
-		attributes: { 'class': 'left' }
-	},
-
-	{
-		name: 'Styled Image (right)',
-		element: 'img',
-		attributes: { 'class': 'right' }
-	},
-
-	{
-		name: 'Compact Table',
-		element: 'table',
-		attributes: {
-			cellpadding: '5',
-			cellspacing: '0',
-			border: '1',
-			bordercolor: '#ccc'
-		},
-		styles: {
-			'border-collapse': 'collapse'
-		}
-	},
-
-	{ name: 'Borderless Table',		element: 'table',	styles: { 'border-style': 'hidden', 'background-color': '#E6E6FA' } },
-	{ name: 'Square Bulleted List',	element: 'ul',		styles: { 'list-style-type': 'square' } },
-
-	/* Widget styles */
-
-	{ name: 'Clean Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-clean' } },
-	{ name: 'Grayscale Image', type: 'widget', widget: 'image', attributes: { 'class': 'image-grayscale' } },
-
-	{ name: 'Featured Snippet', type: 'widget', widget: 'codeSnippet', attributes: { 'class': 'code-featured' } },
-
-	{ name: 'Featured Formula', type: 'widget', widget: 'mathjax', attributes: { 'class': 'math-featured' } },
-
-	{ name: '240p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p', type: 'widget', widget: 'embedSemantic', attributes: { 'class': 'embed-1080p' }, group: 'size' },
-
-	// Adding space after the style name is an intended workaround. For now, there
-	// is no option to create two styles with the same name for different widget types. See #16664.
-	{ name: '240p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-240p' }, group: 'size' },
-	{ name: '360p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-360p' }, group: 'size' },
-	{ name: '480p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-480p' }, group: 'size' },
-	{ name: '720p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-720p' }, group: 'size' },
-	{ name: '1080p ', type: 'widget', widget: 'embed', attributes: { 'class': 'embed-1080p' }, group: 'size' }
-
-] );
-
diff --git a/plugins/ckeditor/style.css b/plugins/ckeditor/style.css
deleted file mode 100644
index 28968c386..000000000
--- a/plugins/ckeditor/style.css
+++ /dev/null
@@ -1,207 +0,0 @@
-/*.cke_button__sourcedialog_label {
-	display: none;
-}*/
-
-.cke, .cke_inner {
-	min-height: 99%;
-}
-
-.cke_chrome {
-	border: 1px solid #ccc;
-}
-
-.cke_toolgroup {
-	padding-right: 0;
-	background: #FBFBFB;
-}
-
-.cke_toolgroup, .cke_combo_button {
-	border: 1px solid #A6A6A6;
-}
-
-.cke_top {
-	padding: 2px;
-	box-shadow: none;
-	border-bottom: 1px solid #b6b6b6;
-	background: #F0F0F0;
-}
-
-.cke_combo_on a.cke_combo_button,
-.cke_combo_off a.cke_combo_button:hover,
-.cke_combo_off a.cke_combo_button:focus,
-.cke_combo_off a.cke_combo_button:active {
-	padding: 1px;
-	margin-left: 0;
-}
-
-a.cke_button:last-child::after,
-a.cke_button.cke_button_disabled:hover:last-child::after {
-	border: none;
-	height: 0;
-	width: 0;
-	margin: 0;
-	padding: 0;
-}
-
-.cke_button_on {
-	background: #ddd;
-}
-
-.cke_combo {
-	margin-top: 1px;
-}
-
-.cke_combo__fontsize {
-	margin-left: 3px;
-}
-
-.cke_combo__fontsize .cke_combo_text {
-	width: 40px;
-}
-
-.cke_combo_text {
-	line-height: 24px;
-	padding-left: 8px;
-}
-
-.cke_combo_button {
-	background: #FBFBFB;
-}
-
-.cke_source {
-	font-family: var(--fontMono);
-	padding: 10px;
-	padding-right: 0;
-	box-shadow: none;
-}
-
-.cke_plain {
-
-	background-color: #fff;
-	outline: none;
-	overflow: auto;
-	z-index: 1;
-	margin: 0;
-	border: 0;
-
-	padding: 10px;
-	padding-right: 0;
-	white-space: pre-wrap;
-	font-family: var(--fontMono), monospace;
-	font-size: 13px;
-	line-height: 16px;
-	color: #333;
-	resize: none;
-
-	border-radius: 0;
-	box-shadow: none;
-	box-sizing: border-box;
-}
-
-.cke_plain:focus, .cke_source:focus {
-	border: 0;
-}
-
-.b-compose .cke_chrome {
-	border-right: 0;
-	border-left: 0;
-	border-bottom: 0;
-	box-shadow: none;
-}
-
-.cke_inner,
-.cke_wysiwyg_div {
-	background: transparent !important;
-}
-
-.cke_wysiwyg_div ul {
-	padding-left: 40px;
-}
-.cke_wysiwyg_div ul li {
-	list-style-type: disc;
-}
-
-.cke_wysiwyg_div ol {
-	padding-left: 40px;
-}
-.cke_wysiwyg_div ol li {
-	list-style-type: decimal;
-}
-
-.cke_wysiwyg_div pre,
-.cke_wysiwyg_div code {
-		margin: 0;
-		padding: 0;
-		background: #fff;
-		border: none;
-		border-radius: 0;
-		font-family: var(--fontMono);
-		display: block;
-		word-break: normal;
-		word-wrap: break-word;
-		background-color: #f9f9f9;
-	}
-
-.cke_wysiwyg_div code {
-	display: inline;
-	padding: 2px 5px;
-}
-
-.cke_wysiwyg_div pre {
-	padding: 5px 10px;
-	border-radius: 5px;
-	background-color: #f9f9f9;
-}
-
-.cke_wysiwyg_div pre > code {
-	padding: 0;
-}
-
-.cke_wysiwyg_div blockquote {
-	border: 0;
-	border-left: solid 2px #444;
-	margin: 5px 0 5px 5px;
-	padding-left: 5px;
-}
-
-.cke_wysiwyg_div blockquote p {
-	margin: 0 0 10px;
-	font-size: 14px;
-	line-height: 20px;
-}
-
-.cke_wysiwyg_div img {
-	vertical-align: bottom;
-}
-
-.cke_dialog {
-	z-index: 99999;
-}
-
-.cke_dialog_ui_labeled_content {
-	margin-top: 5px;
-	margin-bottom: 5px;
-}
-
-.cke_dialog_ui_input_select,
-.cke_dialog_ui_input_text,
-.cke_dialog_ui_input_textarea {
-		box-shadow: none;
-		border-radius: 2px;
-}
-.cke_dialog_ui_input_select:focus,
-.cke_dialog_ui_input_text:focus,
-.cke_dialog_ui_input_textarea:focus {
-	outline: 0;
-	border: 1px solid #999;
-}
-
-.cke_dialog_ui_input_select,
-.cke_dialog_ui_input_text {
-	height: 25px;
-	line-height: 25px;
-}
-
-.RL-PopupsCompose[data-wysiwyg*=Forced] .cke_button__plain {
-	display: none;
-}
diff --git a/plugins/compact-composer/css/composer.css b/plugins/compact-composer/css/composer.css
new file mode 100644
index 000000000..c2afc31c6
--- /dev/null
+++ b/plugins/compact-composer/css/composer.css
@@ -0,0 +1,97 @@
+/* Prevent collapse of empty elements so that the caret can be placed in there */
+.CompactComposer *:empty::before {
+    content: "\200B";
+}
+
+.CompactComposer .squire-toolbar {
+    padding-top: 4px;
+    padding-bottom: 0;
+    overflow: visible;
+    z-index: 200;
+    white-space: normal;
+    min-height: auto;
+}
+
+.CompactComposer .squire-toolbar > .btn-group {
+    margin-bottom: 4px;
+}
+
+.CompactComposer .squire-toolbar > .btn-group > a.btn,
+.CompactComposer .squire-toolbar button.btn,
+.CompactComposer .squire-toolbar select.btn {
+    line-height: 20px;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    min-height: 24px;
+}
+
+.squire-toolbar-menu-item {
+    display: flex;
+    align-items: center;
+    gap: .25em;
+    margin: .1em !important;
+    cursor: pointer;
+    padding: .25em;
+}
+
+.squire-toolbar-menu-item.active {
+    background-color: rgba(128, 128, 128, .1);
+}
+
+.squire-toolbar-menu-item:hover {
+    background-color: rgba(128, 128, 128, .2);
+}
+
+.squire-toolbar-svg-icon {
+    display: block;
+    fill: var(--dialog-clr, #333);
+}
+.squire-toolbar-menu .squire-toolbar-svg-icon {
+    display: block;
+    fill: var(--dropdown-menu-color, inherit);
+}
+
+.squire2-mode-wysiwyg .squire-plain,
+.squire2-mode-source .squire-wysiwyg,
+.squire2-mode-plain .squire-wysiwyg {
+    display: none;
+}
+
+.squire2-mode-source .squire-plain,
+.squire2-mode-plain .squire-plain {
+    display: block;
+}
+
+.CompactComposer .squire-toolbar > .squire-toolbar-menu-wrap:last-child {
+    float: right;
+}
+
+.CompactComposer .squire-toolbar.mode-plain .squire-html-mode-item {
+    display: none;
+}
+
+#V-PopupsCompose .attachmentAreaParent.compact {
+    height: auto;
+    min-height: auto;
+    padding: 0;
+    overflow: auto;
+    flex: 1 0 auto;
+    max-height: 12em;
+    margin: 0;
+}
+
+#V-PopupsCompose .compact > .b-attachment-place {
+    position: static;
+    display: none;
+    margin: .375em;
+    line-height: 4em;
+}
+
+#V-PopupsCompose .compact > .b-attachment-place.dragAndDropOver {
+    display: block;
+}
+
+#V-PopupsCompose .compact .attachmentList {
+    margin: 0;
+    padding: 0;
+}
diff --git a/plugins/compact-composer/index.php b/plugins/compact-composer/index.php
new file mode 100644
index 000000000..c9a1be1f5
--- /dev/null
+++ b/plugins/compact-composer/index.php
@@ -0,0 +1,22 @@
+<?php
+
+class CompactComposerPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Compact Composer',
+		AUTHOR = 'Sergey Mosin',
+		URL = 'https://github.com/the-djmaze/snappymail/pull/1466',
+		VERSION = '1.0.6',
+		RELEASE = '2024-08-08',
+		REQUIRED = '2.34.0',
+		LICENSE = 'AGPL v3',
+		DESCRIPTION = 'WYSIWYG editor with a compact toolbar';
+
+	public function Init(): void
+	{
+		$this->addCss('css/composer.css');
+		$this->addJs('js/squire-raw.js');
+		$this->addJs('js/parsel.js');
+		$this->addJs('js/CompactComposer.js');
+	}
+}
diff --git a/plugins/compact-composer/js/CompactComposer.js b/plugins/compact-composer/js/CompactComposer.js
new file mode 100644
index 000000000..15ff25d03
--- /dev/null
+++ b/plugins/compact-composer/js/CompactComposer.js
@@ -0,0 +1,1002 @@
+/* eslint max-len: 0 */
+(win => {
+
+	const rl = win.rl;
+
+	if (!rl) {
+		return;
+	}
+
+	rl.registerWYSIWYG('CompactComposer', (owner, container, onReady) => {
+		const editor = new CompactComposer(container);
+		onReady(editor);
+	});
+
+	const doc = win.document;
+
+	addEventListener('rl-view-model', e => {
+		const vm = e.detail;
+		if ('PopupsCompose' === vm.viewModelTemplateID && rl.settings.get('editorWysiwyg') === 'CompactComposer') {
+			// add visible binding to the label
+			const bodyLabel = vm.querySelector('.tabs label[for="tab-body"]');
+			bodyLabel.dataset.bind = 'visible: canMailvelope';
+			// re-apply the binding
+			const labelNext = bodyLabel.nextElementSibling;
+			ko.removeNode(bodyLabel);
+			labelNext.parentElement.insertBefore(bodyLabel, labelNext);
+			ko.applyBindingAccessorsToNode(bodyLabel, null, vm);
+
+			// Now move the attachments tab to the bottom of the screen
+			const area = vm.querySelector('.tabs .attachmentAreaParent');
+			vm.querySelector('.tabs input[value="attachments"]').remove();
+			vm.querySelector('.tabs label[for="tab-attachments"]').remove();
+			area.querySelector('.no-attachments-desc').remove();
+			area.classList.add('compact');
+			vm.viewModelDom.append(area);
+			// Add and re-apply the bindings for the attachment-place
+			const place = area.querySelector('.b-attachment-place');
+			ko.removeNode(place);
+			area.insertBefore(place, area.firstElementChild);
+			place.dataset.bind = 'visible: addAttachmentEnabled(), css: {dragAndDropOver: dragAndDropVisible}';
+			ko.applyBindingAccessorsToNode(place, null, vm);
+			// There is a better way to do this probably,
+			// but we need this for drag and drop to work
+			e.detail.attachmentsArea = e.detail.bodyArea;
+		}
+	});
+
+	const
+		// TODO: labels translations
+		i18n = (str, def) => rl.i18n(str) || def,
+
+		ctrlKey = shortcuts.getMetaKey() + ' + ',
+
+		createElement = name => doc.createElement(name),
+
+		tpl = createElement('template'),
+
+		trimLines = html => html.trim().replace(/^(<div>\s*<br\s*\/?>\s*<\/div>)+/, '').trim(),
+		htmlToPlain = html => rl.Utils.htmlToPlain(html).trim(),
+		plainToHtml = text => rl.Utils.plainToHtml(text),
+
+		getFragmentOfChildren = parent => {
+			let frag = doc.createDocumentFragment();
+			frag.append(...parent.childNodes);
+			return frag;
+		},
+
+		/**
+		 * @param {Array} data
+		 * @param {String} prop
+		 */
+		getByProp = (data, prop) => {
+			for (let i = 0; i < data.length; i++) {
+				const outer = data[i];
+				if (outer.hasOwnProperty(prop)) {
+					return outer;
+				}
+				if (outer.items && Array.isArray(outer.items)) {
+					const item = outer.items.find(item => item.prop === prop);
+					if (item) {
+						return item;
+					}
+				}
+			}
+			throw new Error('item with prop ' + prop + ' not found');
+		},
+
+		SquireDefaultConfig = {
+			/*
+					addLinks: true // allow_smart_html_links
+			*/
+			sanitizeToDOMFragment: (html) => {
+				tpl.innerHTML = (html || '')
+					.replace(/<\/?(BODY|HTML)[^>]*>/gi, '')
+					.replace(/<!--[^>]+-->/g, '')
+					.replace(/<span[^>]*>\s*<\/span>/gi, '')
+					.trim();
+				tpl.querySelectorAll('a:empty,span:empty').forEach(el => el.remove());
+				return tpl.content;
+			}
+		},
+
+		pasteImageHandler = (e, squire) => {
+
+			const items = [...e.detail.clipboardData.items];
+			const imageItems = items.filter((item) => /image/.test(item.type));
+			if (!imageItems.length) {
+				return false;
+			}
+			let reader = new FileReader();
+			reader.onload = (loadEvent) => {
+				squire.insertImage(loadEvent.target.result);
+			};
+			reader.readAsDataURL(imageItems[0].getAsFile());
+		};
+
+
+	class CompactComposer {
+		constructor(container) {
+			const
+				plain = createElement('textarea'),
+				wysiwyg = createElement('div'),
+				toolbar = createElement('div'),
+				squire = new win.Squire2(wysiwyg, SquireDefaultConfig);
+
+			this.container = container;
+			container.classList.add('CompactComposer');
+
+			plain.className = 'squire-plain';
+			wysiwyg.className = 'squire-wysiwyg';
+			wysiwyg.dir = 'auto';
+			this.mode = ''; // 'plain' | 'wysiwyg'
+			this.squire = squire;
+			this.plain = plain;
+			this.wysiwyg = wysiwyg;
+			this.toolbar = toolbar;
+
+			toolbar.className = 'squire-toolbar btn-toolbar';
+			const actions = this.makeActions(squire, toolbar);
+
+			this.squire.addEventListener('willPaste', (event) => {
+				// https://github.com/fastmail/Squire?tab=readme-ov-file#addeventlistener
+				// The content that will be inserted is available as either the fragment property, or the text property for plain text, on the detail property of the event. You can modify this text/fragment in your event handler to change what will be pasted
+				tpl.innerHTML = rl.Utils.cleanHtml(event.detail.html).html;
+				event.detail.fragment = tpl.content;
+			});
+			this.squire.addEventListener('pasteImage', (e) => {
+				pasteImageHandler(e, squire);
+			});
+
+			wysiwyg.addEventListener('focus', () => {
+				const range = this.squire.getSelection();
+				if (range.collapsed && range.startContainer === wysiwyg) {
+					// when the caret is directly in the wysiwyg a bunch of stuff
+					// (like lists, blockquotes, etc...) do not work,
+					// so we need to place it inside the nearest element
+					if (wysiwyg.children[range.startOffset] !== undefined) {
+						const newRange = document.createRange();
+						newRange.setStart(wysiwyg.children[range.startOffset], 0);
+						this.squire.setSelection(newRange);
+					}
+				}
+			});
+
+//		squire.addEventListener('focus', () => shortcuts.off());
+//		squire.addEventListener('blur', () => shortcuts.on());
+
+			container.append(toolbar, wysiwyg, plain);
+
+			const fontFamilySelect = getByProp(actions, 'fontFamily').element;
+
+			const fontSizeAction = getByProp(actions, 'fontSize');
+
+			/**
+			 * @param {string} fontName
+			 * @return {string}
+			 */
+			const normalizeFontName = (fontName) => fontName.trim().replace(/(^["']*|["']*$)/g, '').trim().toLowerCase();
+
+			/** @type {string[]} - lower cased array of available font families*/
+			const fontFamiliesLowerCase = Object.values(fontFamilySelect.options).map(option => option.value.toLowerCase());
+
+			/**
+			 * A theme might have CSS like div.squire-wysiwyg[contenteditable="true"] {
+			 * font-family: 'Times New Roman', Times, serif; }
+			 * so let's find the best match squire.getRoot()'s font
+			 * it will also help to properly handle generic font names like 'sans-serif'
+			 * @type {number}
+			 */
+			let defaultFontFamilyIndex = 0;
+			const squireRootFonts = getComputedStyle(squire.getRoot()).fontFamily.split(',').map(normalizeFontName);
+			fontFamiliesLowerCase.some((family, index) => {
+				const matchFound = family.split(',').some(availableFontName => {
+					const normalizedFontName = normalizeFontName(availableFontName);
+					return squireRootFonts.some(squireFontName => squireFontName === normalizedFontName);
+				});
+				if (matchFound) {
+					defaultFontFamilyIndex = index;
+				}
+				return matchFound;
+			});
+
+			/**
+			 * Instead of comparing whole 'font-family' strings,
+			 * we are going to look for individual font names, because we might be
+			 * editing a Draft started in another email client for example
+			 *
+			 * @type {Object.<string,number>}
+			 */
+			const fontNamesMap = {};
+			/**
+			 * @param {string} fontFamily
+			 * @param {number} index
+			 */
+			const processFontFamilyString = (fontFamily, index) => {
+				fontFamily.split(',').forEach(fontName => {
+					const key = normalizeFontName(fontName);
+					if (fontNamesMap[key] === undefined) {
+						fontNamesMap[key] = index;
+					}
+				});
+			};
+			// first deal with the default font family
+			processFontFamilyString(fontFamiliesLowerCase[defaultFontFamilyIndex], defaultFontFamilyIndex);
+			// and now with the rest of the font families
+			fontFamiliesLowerCase.forEach((fontFamily, index) => {
+				if (index !== defaultFontFamilyIndex) {
+					processFontFamilyString(fontFamily, index);
+				}
+			});
+
+			// -----
+
+			let ignoreNextSelectEvent = false;
+
+			squire.addEventListener('pathChange', e => {
+
+				const tokensMap = this.buildTokensMap(e.detail);
+
+				if (tokensMap.has('__selection__')) {
+					ignoreNextSelectEvent = false;
+					return;
+				}
+				this.indicators.forEach((indicator) => {
+					indicator.element.classList.toggle('active', indicator.selectors.some(selector => tokensMap.has(selector)));
+				});
+
+				let familySelectedIndex = defaultFontFamilyIndex;
+				const fontFamily = tokensMap.get('__font_family__');
+				if (fontFamily) {
+					familySelectedIndex = -1; // show empty select if we don't know the font
+					const fontNames = fontFamily.split(',');
+					for (let i = 0; i < fontNames.length; i++) {
+						const index = fontNamesMap[normalizeFontName(fontNames[i])];
+						if (index !== undefined) {
+							familySelectedIndex = index;
+							break;
+						}
+					}
+				}
+				fontFamilySelect.selectedIndex = familySelectedIndex;
+
+				let sizeSelectedIndex = fontSizeAction.defaultValueIndex;
+				const fontSize = tokensMap.get('__font_size__');
+				if (fontSize) {
+					// -1 is ok because it will just show a blank <select>
+					sizeSelectedIndex = fontSizeAction.items.indexOf(fontSize);
+				}
+				fontSizeAction.element.selectedIndex = sizeSelectedIndex;
+
+				ignoreNextSelectEvent = true;
+			});
+
+			squire.addEventListener('select', e => {
+				if (ignoreNextSelectEvent) {
+					ignoreNextSelectEvent = false;
+					return;
+				}
+
+				if (e.detail.range.collapsed) {
+					return;
+				}
+
+				this.indicators.forEach((indicator) => {
+					indicator.element.classList.toggle('active', indicator.selectors.some(selector => squire.hasFormat(selector)));
+				});
+			});
+
+			/*
+					squire.addEventListener('cursor', e => {
+						console.dir({cursor:e.range});
+					});
+					squire.addEventListener('select', e => {
+						console.dir({select:e.range});
+					});
+			*/
+		}
+
+		/**
+		 * @param {Squire} squire
+		 * @param {HTMLDivElement} toolbar
+		 * @returns {Array}
+		 * @private
+		 */
+		makeActions(squire, toolbar) {
+
+			const clr = this.makeClr();
+			const doClr = name => input => {
+				// https://github.com/the-djmaze/snappymail/issues/826
+				clr.style.left = (input.offsetLeft + input.parentNode.offsetLeft) + 'px';
+				clr.style.width = input.offsetWidth + 'px';
+
+				// firefox does not call "onchange" for #000 if we use clr.value=''
+				clr.value = '#00ff0c';
+				clr.onchange = () => {
+					switch (name) {
+						case 'color':
+							squire.setTextColor(clr.value);
+							break;
+						case 'backgroundColor':
+							squire.setHighlightColor(clr.value);
+							break;
+						default:
+							console.error('invalid name:', name);
+					}
+				};
+				// Chrome 110+ https://github.com/the-djmaze/snappymail/issues/1199
+//				clr.oninput = () => squire.setStyle({[name]:clr.value});
+				setTimeout(() => clr.click(), 1);
+			};
+			toolbar.append(clr);
+
+			const browseImage = createElement('input');
+			browseImage.type = 'file';
+			browseImage.accept = 'image/*';
+			browseImage.style.display = 'none';
+			browseImage.onchange = () => {
+				if (browseImage.files.length) {
+					let reader = new FileReader();
+					reader.readAsDataURL(browseImage.files[0]);
+					reader.onloadend = () => reader.result && squire.insertImage(reader.result);
+				}
+			};
+
+			const actions = [
+				{
+					type: 'group',
+					items: [
+						{
+							type: 'select',
+							label: 'Font',
+							cmd: s => squire.setFontFace(s.value),
+							prop: 'fontFamily',
+							items: {
+								'sans-serif': {
+									Arial: '\'Nimbus Sans L\', \'Liberation sans\', \'Arial Unicode MS\', Arial, Helvetica, Garuda, Utkal, FreeSans, sans-serif',
+									Tahoma: '\'Luxi Sans\', Tahoma, Loma, Geneva, Meera, sans-serif',
+									Trebuchet: '\'DejaVu Sans Condensed\', Trebuchet, \'Trebuchet MS\', sans-serif',
+									Lucida: '\'Lucida Sans Unicode\', \'Lucida Sans\', \'DejaVu Sans\', \'Bitstream Vera Sans\', \'DejaVu LGC Sans\', sans-serif',
+									Verdana: '\'DejaVu Sans\', Verdana, Geneva, \'Bitstream Vera Sans\', \'DejaVu LGC Sans\', sans-serif'
+								},
+								monospace: {
+									Courier: '\'Liberation Mono\', \'Courier New\', FreeMono, Courier, monospace',
+									Lucida: '\'DejaVu Sans Mono\', \'DejaVu LGC Sans Mono\', \'Bitstream Vera Sans Mono\', \'Lucida Console\', Monaco, monospace'
+								},
+								sans: {
+									Times: '\'Nimbus Roman No9 L\', \'Times New Roman\', Times, FreeSerif, serif',
+									Palatino: '\'Bitstream Charter\', \'Palatino Linotype\', Palatino, Palladio, \'URW Palladio L\', \'Book Antiqua\', Times, serif',
+									Georgia: '\'URW Palladio L\', Georgia, Times, serif'
+								}
+							}
+						},
+						{
+							type: 'select',
+							label: 'Font size',
+							cmd: s => squire.setFontSize(s.value),
+							prop: 'fontSize',
+							items: ['11px', '13px', '16px', '20px', '24px', '30px'],
+							defaultValueIndex: 2
+						}
+					]
+				},
+				{
+					type: 'menu',
+					label: 'Colors',
+					icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m8 7.75c0.713 0 1.25-0.559 1.25-1.25 0-0.691-0.54-1.25-1.25-1.25-0.71 0-1.25 0.556-1.25 1.25 0 0.694 0.537 1.25 1.25 1.25zm6.5 3c0.713 0 1.25-0.559 1.25-1.25 0-0.691-0.54-1.25-1.25-1.25s-1.25 0.556-1.25 1.25c0 0.694 0.537 1.25 1.25 1.25zm-9 0c0.713 0 1.25-0.559 1.25-1.25 0-0.691-0.54-1.25-1.25-1.25s-1.25 0.556-1.25 1.25c0 0.694 0.537 1.25 1.25 1.25zm4.5 7.25c-4.47 0-8-3.63-8-8 0-4.81 3.97-8 8.17-8 4.12 0 7.83 3.02 7.83 7.21 0 2.83-2.2 4.79-4.79 4.79h-1.42c-0.277 0-0.417 0.2-0.417 0.375 0 0.208 0.104 0.382 0.312 0.521 0.208 0.139 0.312 0.507 0.312 1.1 0 1.09-0.858 2-2 2zm2-10.2c0.713 0 1.25-0.559 1.25-1.25s-0.54-1.25-1.25-1.25-1.25 0.556-1.25 1.25 0.537 1.25 1.25 1.25zm-2 8.75c0.477 0 0.737-0.739 0.188-1.08-0.226-0.142-0.312-0.514-0.312-1.04 0-1.18 0.934-1.88 1.9-1.88h1.44c2.09-0.032 3.27-1.65 3.29-3.29 0-3.19-2.79-5.71-6.33-5.71-3.74 0-6.67 2.89-6.67 6.5 0 3.49 2.68 6.45 6.5 6.5z"/></svg>',
+					items: [
+						{
+							type: 'menu_item',
+							label: 'Text Color',
+							cmd: doClr('color'),
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m3 18v-3h14v3zm2.35-5 3.75-10h1.79l3.75 10h-1.73l-0.896-2.56h-4.02l-0.917 2.56zm3.15-4h3l-1.46-4.04h-0.0833z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Background Color',
+							cmd: doClr('backgroundColor'),
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m7.22 16.6-4.87-4.85q-0.166-0.166-0.26-0.364-0.0936-0.198-0.0936-0.427t0.0936-0.447q0.0936-0.218 0.26-0.385l4.6-4.6-2.52-2.52 1.06-1.06 8.18 8.18q0.166 0.166 0.25 0.375 0.0832 0.208 0.0832 0.437 0 0.229-0.0832 0.437-0.0832 0.208-0.25 0.375l-4.85 4.85q-0.166 0.166-0.375 0.26-0.208 0.0936-0.437 0.0936-0.229-0.0208-0.427-0.104-0.198-0.0832-0.364-0.25zm0.791-10-4.35 4.35v-0.0208 0.0208h8.7v-0.0208 0.0208zm8.18 10.3q-0.77 0-1.3-0.52-0.531-0.52-0.531-1.29 0-0.499 0.229-0.967 0.229-0.468 0.541-0.884l1.06-1.33 1.04 1.33q0.291 0.416 0.531 0.884 0.239 0.468 0.239 0.967 0 0.77-0.531 1.29-0.531 0.52-1.28 0.52z"/></svg>'
+						}
+					]
+				},
+				{
+					type: 'group',
+					items: [
+						{
+							type: 'button',
+							label: 'Bold',
+							cmd: () => this.doAction('bold', 'B'),
+							key: 'B',
+							matches: 'B,STRONT',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m5.53 16v-12h4.75q1.4 0 2.57 0.861 1.18 0.861 1.18 2.39 0 1.06-0.469 1.66t-0.885 0.865q0.542 0.249 1.17 0.895 0.625 0.646 0.625 1.9 0 1.9-1.4 2.67-1.4 0.771-2.62 0.771zm2.65-2.46h2.18q1.01 0 1.21-0.51t0.208-0.74q0-0.229-0.219-0.74-0.219-0.51-1.28-0.51h-2.1zm0-4.83h1.94q0.688 0 1.01-0.365 0.323-0.365 0.323-0.781 0-0.5-0.356-0.812-0.356-0.312-0.923-0.312h-1.99z"/></svg>'
+						},
+						{
+							type: 'button',
+							label: 'Italic',
+							cmd: () => this.doAction('italic', 'I'),
+							key: 'I',
+							matches: 'I,EM',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m4.5 16v-2h3.33l2.58-8h-3.42v-2h8.5v2h-3.08l-2.58 8h3.17v2z"/></svg>'
+						},
+						{
+							type: 'button',
+							label: 'Underline',
+							cmd: () => this.doAction('underline', 'U'),
+							key: 'U',
+							matches: 'U',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m5 17v-1.5h10v1.5zm5-3q-2 0-3.09-1.24t-1.09-3.28v-6.48h2.03v6.61q0 1.1 0.551 1.79 0.551 0.688 1.61 0.688 1.06 0 1.61-0.688 0.55-0.688 0.55-1.79v-6.61h2.02v6.48q0 2.04-1.09 3.28t-3.09 1.24z"/></svg>'
+						}
+					]
+				},
+				{
+					type: 'group',
+					items: [
+						{
+							type: 'button',
+							label: 'Ordered List',
+							cmd: () => this.doList('OL'),
+							key: 'Shift + 8',
+							matches: 'OL',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m3 17v-1h2v-0.5h-1v-1h1v-0.5h-2v-1h2.5q0.212 0 0.356 0.144t0.144 0.356v1q0 0.212-0.144 0.356t-0.356 0.144q0.212 0 0.356 0.144t0.144 0.356v1q0 0.212-0.144 0.356t-0.356 0.144zm0-5v-2q0-0.212 0.144-0.356t0.356-0.144h1.5v-0.5h-2v-1h2.5q0.212 0 0.356 0.144t0.144 0.356v1.5q0 0.212-0.144 0.356t-0.356 0.144h-1.5v0.5h2v1zm1-5v-3h-1v-1h2v4zm3.5 8v-1.5h9.5v1.5zm0-4.25v-1.5h9.5v1.5zm0-4.25v-1.5h9.5v1.5z"/></svg>'
+						},
+						{
+							type: 'button',
+							label: 'List',
+							cmd: () => this.doList('UL'),
+							key: 'Shift + 9',
+							matches: 'UL',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m7.5 15v-1.5h9.5v1.5zm0-4.25v-1.5h9.5v1.5zm0-4.25v-1.5h9.5v1.5zm-3 9.25q-0.621 0-1.06-0.442-0.438-0.442-0.438-1.06 0-0.621 0.442-1.06 0.442-0.438 1.06-0.438 0.621 0 1.06 0.442 0.438 0.442 0.438 1.06 0 0.621-0.442 1.06-0.442 0.438-1.06 0.438zm0-4.25q-0.621 0-1.06-0.442-0.438-0.442-0.438-1.06 0-0.621 0.442-1.06 0.442-0.438 1.06-0.438 0.621 0 1.06 0.442 0.438 0.442 0.438 1.06 0 0.621-0.442 1.06-0.442 0.438-1.06 0.438zm0-4.25q-0.621 0-1.06-0.442-0.438-0.442-0.438-1.06 0-0.621 0.442-1.06 0.442-0.438 1.06-0.438 0.621 0 1.06 0.442 0.438 0.442 0.438 1.06 0 0.621-0.442 1.06-0.442 0.438-1.06 0.438z"/></svg>'
+						},
+						{
+							type: 'button',
+							label: 'Decrease Indent',
+							cmd: () => this.changeLevel('decrease'),
+							key: ']',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m3 17v-1.5h14v1.5zm6-3.12v-1.5h8v1.5zm0-3.12v-1.5h8v1.5zm0-3.12v-1.5h8v1.5zm-6-3.12v-1.5h14v1.5zm4 8.5v-6l-4 3z"/></svg>'
+						},
+						{
+							type: 'button',
+							label: 'Increase Indent',
+							cmd: () => this.changeLevel('increase'),
+							key: '[',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m3 17v-1.5h14v1.5zm6-3.12v-1.5h8v1.5zm0-3.12v-1.5h8v1.5zm0-3.12v-1.5h8v1.5zm-6-3.12v-1.5h14v1.5zm0 8.5v-6l4 3z"/></svg>'
+						}
+					]
+				},
+				{
+					type: 'menu',
+					rightEdge: true,
+					label: 'Insert Image',
+					icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m15 1v2h-2v2h2v2h2v-2h2v-2h-2v-2zm-12 2c-1.09 0-2 0.909-2 2v10c0 1.09 0.909 2 2 2h14c1.09 0 2-0.909 2-2v-5h-1.75v5.25h-14.5v-10.5h7.25v-1.75zm9 6-3 4-2-3-3 4h12z"/></svg>',
+					items: [
+						{
+							type: 'menu_item',
+							label: 'Image File',
+							cmd: () => browseImage.click(),
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m7 11h8l-2.62-3.5-1.88 2.5-1.37-1.83zm-4.5 6q-0.604 0-1.05-0.448t-0.448-1.05v-10h1.5v10h13.5v1.5zm3-3q-0.604 0-1.05-0.448-0.448-0.448-0.448-1.05v-9q0-0.619 0.448-1.06t1.05-0.441h3.52l2 2h5.48q0.619 0 1.06 0.441 0.441 0.441 0.441 1.06v7q0 0.604-0.441 1.05-0.441 0.448-1.06 0.448zm0-1.5h11v-7h-6.08l-2-2h-2.92zm0 0v-9z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'From URL',
+							cmd: () => {
+								//TODO: check is if an IMG node is in range already
+								const src = prompt('Image', 'https://');
+								if (src) {
+									this.squire.insertImage(src);
+								}
+							},
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m11.9 8h-1.88c-0.692 0-1.28-0.244-1.77-0.732-0.488-0.488-0.731-1.08-0.731-1.77s0.244-1.28 0.731-1.77 1.08-0.729 1.77-0.729h1.88v0.938h-1.88c-0.434 0-0.803 0.152-1.11 0.456s-0.456 0.673-0.456 1.11 0.152 0.803 0.456 1.11 0.607 0.456 1.11 0.456h1.88zm-1.25-2.03v-0.938h3.75v0.938zm2.5 2.03v-0.938h1.88c0.434 0 0.803-0.152 1.11-0.456s0.456-0.673 0.456-1.11-0.152-0.803-0.456-1.11-0.673-0.456-1.11-0.456h-1.88v-0.938h1.88c0.692 0 1.28 0.244 1.77 0.732 0.488 0.488 0.731 1.08 0.731 1.77 0 0.692-0.244 1.28-0.731 1.77-0.488 0.486-1.08 0.729-1.77 0.729zm3.38 2v5.5c0 0.403-0.147 0.753-0.441 1.05s-0.647 0.448-1.06 0.448h-11c-0.412 0-0.766-0.149-1.06-0.448s-0.441-0.649-0.441-1.05v-9.25c0-0.403 0.147-0.753 0.441-1.05s0.649-0.407 1.06-0.448h1.5v1.5h-1.5v9.25h11v-5.5zm-11.5 4h9l-3-4-2.25 3-1.5-2z"/></svg>'
+						}
+					]
+				},
+				{
+					// this is a special case: we move the "attach" button group to the toolbar
+					// TODO: there is probably a better way of doing this in the template
+					// TODO: move Encrypt/Sign button group ?
+					type: 'move_parent',
+					label: 'Attach File',
+					id: 'composeUploadButton',
+					icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m12.5 9.5v-4.5h1.5v4.5zm-3.5 5.44c-1.02-0.272-1.5-1.15-1.5-2.02v-7.92h1.5zm0.5 3.06c-2.59 0-4.5-2.11-4.5-4.65v-8.1c0-1.95 1.55-3.25 3.25-3.25 1.85 0 3.25 1.51 3.25 3.4v6.35h-1.5v-6.5c0-1.09-0.883-1.75-1.75-1.75-1.06 0-1.75 0.906-1.75 1.79v8.21c0 2.63 3.33 4.15 5.25 1.96v1.94c-0.706 0.428-1.56 0.604-2.25 0.604zm3.75-1v-2.25h-2.25v-1.5h2.25v-2.25h1.5v2.25h2.25v1.5h-2.25v2.25z"/></svg>'
+				},
+				{
+					type: 'menu_more',
+					label: 'More',
+					rightEdge: true,
+					showInPlainMode: true,
+					icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m2 4v2h16v-2zm0 5v2h16v-2zm0 5v2h16v-2z"/></svg>',
+					items: [
+						{
+							type: 'menu_item',
+							label: 'Undo',
+							cmd: () => squire.undo(),
+							key: 'Z',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m4.82 9.3c1.45-1.26 3.32-2.03 5.4-2.03 3.64 0 6.71 2.37 7.79 5.65l-1.85 0.61c-0.821-2.49-3.17-4.3-5.94-4.3-1.52 0-2.92 0.563-4 1.47l2.83 2.83h-7.04v-7.04z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Redo',
+							cmd: () => squire.redo(),
+							key: 'Y',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m15.2 9.3c-1.45-1.26-3.32-2.03-5.4-2.03-3.64 0-6.71 2.37-7.79 5.65l1.85 0.61c0.821-2.49 3.17-4.3 5.94-4.3 1.52 0 2.92 0.563 4 1.47l-2.83 2.83h7.04v-7.04z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Blockquote',
+							cmd: () => {
+								if (!['UL', 'OL', 'BLOCKQUOTE'].some(listTag => this.squire.hasFormat(listTag))) {
+									this.changeLevel('increase');
+								}
+							},
+							matches: 'BLOCKQUOTE',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m4 3c-0.554 0-1 0.446-1 1s0.446 1 1 1h12c0.554 0 1-0.446 1-1s-0.446-1-1-1h-12zm0 6c-0.554 0-1 0.446-1 1v6c0 0.554 0.446 1 1 1s1-0.446 1-1v-6c0-0.554-0.446-1-1-1zm5 0c-0.554 0-1 0.446-1 1s0.446 1 1 1h7c0.554 0 1-0.446 1-1s-0.446-1-1-1h-7zm0 6c-0.554 0-1 0.446-1 1s0.446 1 1 1h7c0.554 0 1-0.446 1-1s-0.446-1-1-1h-7z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Link',
+							cmd: () => {
+								/** @type {Range} range */
+								const range = this.squire.getSelection();
+								let linkNode;
+								if (range.collapsed || range.startContainer.parentNode === range.endContainer.parentNode) {
+									const root = this.squire.getRoot();
+									for (let node = range.startContainer; node !== root; node = node.parentNode) {
+										if (node.tagName === 'A') {
+											range.selectNode(node);
+											linkNode = node;
+											break;
+										}
+									}
+								}
+								const url = prompt('Link', linkNode?.href || 'https://');
+								if (url != null) {
+									if (url.length) {
+										if (range.collapsed === false) {
+											// squire breaks the wrapping node, so if we have a <b>
+											// inside the selection it will create something like this:
+											// <a>t</a><b><a>ex</a></b><a>t</a> and we don't want that
+											// TODO: this could be more elegant
+											this.squire.removeAllFormatting(range);
+										}
+										this.squire.makeLink(url);
+									} else if (linkNode) {
+										this.squire.removeLink();
+									}
+								}
+							},
+							matches: 'A',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m15.4 16.7c-0.509 0.521-1.13 0.781-1.87 0.781-0.735 0-1.36-0.256-1.87-0.771l-1.91-1.91c-0.515-0.515-0.771-1.14-0.771-1.87 0-0.743 0.267-1.38 0.801-1.9l-0.809-0.809c-0.525 0.533-1.16 0.801-1.91 0.801-0.735 0-1.36-0.255-1.87-0.763l-1.9-1.89c-0.521-0.509-0.781-1.13-0.781-1.87-6e-7 -0.735 0.255-1.36 0.763-1.87l1.34-1.35c0.509-0.521 1.13-0.781 1.87-0.781 0.735 1.6e-4 1.36 0.256 1.87 0.771l1.91 1.91c0.515 0.515 0.772 1.14 0.772 1.87 0 0.739-0.265 1.37-0.792 1.9l0.809 0.809c0.524-0.527 1.16-0.792 1.9-0.792 0.735 0 1.36 0.255 1.87 0.763l1.9 1.89c0.521 0.509 0.781 1.13 0.781 1.87 0 0.735-0.255 1.36-0.763 1.87zm-1.25-1.24 1.34-1.35c0.165-0.178 0.248-0.385 0.248-0.624 0-0.245-0.0862-0.455-0.258-0.626l-1.9-1.89c-0.172-0.172-0.38-0.257-0.625-0.257-0.249-3.1e-5 -0.466 0.0966-0.653 0.286l0.577 0.577c0.353 0.353 0.353 0.922 0 1.28-0.353 0.353-0.922 0.353-1.28 0l-0.577-0.577c-0.184 0.182-0.278 0.401-0.278 0.654 0 0.251 0.0824 0.459 0.248 0.624l1.91 1.91c0.172 0.171 0.38 0.257 0.625 0.257 0.239 0 0.444-0.0849 0.615-0.257zm-6.43-6.5-0.577-0.577c-0.353-0.353-0.353-0.922 0-1.28 0.353-0.353 0.922-0.353 1.28 0l0.575 0.575c0.184-0.18 0.279-0.394 0.279-0.643-6e-7 -0.245-0.0849-0.454-0.257-0.625l-1.91-1.91c-0.172-0.172-0.38-0.257-0.625-0.257-0.239 0-0.444 0.0852-0.615 0.257l-1.34 1.35c-0.159 0.172-0.238 0.379-0.238 0.624 2e-7 0.251 0.0811 0.46 0.247 0.625l1.9 1.89c0.172 0.172 0.38 0.257 0.625 0.257 0.253-9e-7 0.473-0.0991 0.661-0.295z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Strikethrough',
+							cmd: () => this.doAction('strikethrough', 'S'),
+							key: 'Shift + 7',
+							matches: 'S',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m10.1 15.9q-1.5 0-2.62-0.875t-1.5-2.31l1.69-0.688q0.333 1.06 0.969 1.6 0.635 0.542 1.51 0.542 0.937 0 1.49-0.448 0.552-0.448 0.552-1.2 0-0.333-0.125-0.615t-0.375-0.51h2.15q0.104 0.229 0.135 0.49t0.0312 0.615q0 1.5-1.08 2.45-1.08 0.948-2.81 0.948zm-8.12-6v-1.5h16v1.5zm8-6q1.33 0 2.21 0.562t1.42 1.79l-1.62 0.708q-0.229-0.625-0.76-1.01-0.531-0.385-1.2-0.385-0.771 0-1.28 0.375-0.51 0.375-0.552 0.958h-1.81q0.0417-1.31 1.06-2.16 1.02-0.844 2.54-0.844z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Superscript',
+							cmd: () => this.doAction('superscript', 'SUP'),
+							key: 'Shift + 6',
+							matches: 'SUP',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m13.4 8v-1.99q0-0.424 0.288-0.715 0.288-0.291 0.712-0.292h1v-1h-2v-1h2q0.425 0 0.712 0.287 0.288 0.286 0.288 0.71v0.997q0 0.424-0.288 0.715-0.288 0.292-0.712 0.292h-1v1h2v1zm-9.38 8 3.31-5.21-3.08-4.79h1.89l2.21 3.56h0.0833l2.21-3.56h1.9l-3.1 4.79 3.33 5.21h-1.9l-2.44-3.88h-0.0833l-2.44 3.88z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Subscript',
+							cmd: () => this.doAction('subscript', 'SUB'),
+							key: 'Shift + 5',
+							matches: 'SUB',
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m13.4 18v-1.99q0-0.424 0.288-0.715 0.288-0.292 0.712-0.292h1v-1h-2v-1h2q0.425 0 0.712 0.287 0.288 0.286 0.288 0.71v0.997q0 0.424-0.288 0.715-0.288 0.292-0.712 0.292h-1v1h2v1zm-9.38-3 3.31-5.21-3.08-4.79h1.89l2.21 3.56h0.0833l2.21-3.56h1.9l-3.1 4.79 3.33 5.21h-1.9l-2.44-3.88h-0.0833l-2.44 3.88z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Left to Right',
+							cmd: () => squire.setTextDirection('ltr'),
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m8 12v-4q-1.25 0-2.12-0.875-0.875-0.875-0.875-2.12t0.875-2.12q0.875-0.875 2.11-0.875h6.01v1.5h-1.5v8.5h-1.5v-8.5h-1.5v8.5zm6 6-1.06-1.06 1.19-1.19h-11.1v-1.5h11.1l-1.19-1.19 1.06-1.06 3 3zm-6-11.5v-3q-0.625 0-1.06 0.442-0.438 0.442-0.438 1.06 0 0.621 0.441 1.06 0.441 0.437 1.06 0.437z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Right to Left',
+							cmd: () => squire.setTextDirection('rtl'),
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m6 18-3-3 3-3 1.06 1.06-1.19 1.19h11.1v1.5h-11.1l1.19 1.19zm2-6v-4q-1.25 0-2.12-0.875-0.875-0.875-0.875-2.12t0.875-2.12q0.875-0.875 2.11-0.875h6.01v1.5h-1.5v8.5h-1.5v-8.5h-1.5v8.5zm0-5.5v-3q-0.625 0-1.06 0.442-0.438 0.442-0.438 1.06 0 0.621 0.441 1.06 0.441 0.437 1.06 0.437z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'HTML Mode',
+							id: 'menu-item-mode-wysiwyg',
+							cmd: () => this.setModeCmd('wysiwyg'),
+							showInPlainMode: true,
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v3h1v-2h2v-1zm13 0v1h2v2h1v-3zm-9 3v10h2v-4h4v4h2v-10h-2v4h-4v-4zm-4 10v3h3v-1h-2v-2zm15 0v2h-2v1h3v-3z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Edit Source',
+							id: 'menu-item-mode-source',
+							cmd: () => this.setModeCmd('source'),
+							showInPlainMode: true,
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m12 2.83c-0.478-0.138-0.976 0.141-1.11 0.619l-3.6 12.6c-0.138 0.478 0.141 0.976 0.619 1.11 0.478 0.138 0.976-0.141 1.11-0.619l3.6-12.6c0.138-0.478-0.141-0.976-0.619-1.11zm2.27 4.65 2.51 2.51-2.51 2.51c-0.352 0.352-0.352 0.923 0 1.27 0.352 0.352 0.923 0.352 1.27 0l3.15-3.15c0.352-0.352 0.352-0.923 0-1.27l-3.15-3.15c-0.352-0.352-0.923-0.352-1.27-0.00141-0.35 0.35-0.35 0.921 0.00141 1.27zm-8.63-1.27c-0.352-0.352-0.923-0.352-1.27 0l-3.15 3.15c-0.352 0.352-0.352 0.923 0 1.27l3.15 3.15c0.352 0.352 0.923 0.352 1.27 0 0.352-0.352 0.352-0.923 0-1.27l-2.51-2.51 2.51-2.51c0.352-0.352 0.352-0.923 0-1.27z"/></svg>'
+						},
+						{
+							type: 'menu_item',
+							label: 'Plain Text Mode',
+							id: 'menu-item-mode-plain',
+							cmd: () => this.setModeCmd('plain'),
+							showInPlainMode: true,
+							icon: '<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg"><path d="m2 2v3h1v-2h2v-1zm13 0v1h2v2h1v-3zm-9 3v2h3v8h2v-8h3v-2zm-4 10v3h3v-1h-2v-2zm15 0v2h-2v1h3v-3z"/></svg>'
+						}
+					]
+				}
+			];
+// 				// clear: {
+// 				// 	removeStyle: {
+// 				// 		html: '⎚',
+// 				// 		cmd: () => squire.setStyle()
+// 				// 	}
+// 				// }
+
+			dispatchEvent(new CustomEvent('squire2-toolbar', {
+				detail: {
+					squire: this,
+					actions: actions
+				}
+			}));
+			this.indicators = this.addActionsToParent(actions, toolbar);
+			return actions;
+		}
+
+		/**
+		 * @private
+		 */
+		makeClr() {
+			/**@type {HTMLInputElement} clr*/
+			const clr = createElement('input');
+			clr.type = 'color';
+			// Chrome https://github.com/the-djmaze/snappymail/issues/1199
+			let clrid = 'squire-colors',
+				colorlist = doc.getElementById(clrid),
+				add = hex => colorlist.append(new Option(hex));
+			if (!colorlist) {
+				colorlist = createElement('datalist');
+				colorlist.id = clrid;
+				// Color blind safe Tableau 10 by Maureen Stone
+				add('#4E79A7');
+				add('#F28E2B');
+				add('#E15759');
+				add('#76B7B2');
+				add('#59A14F');
+				add('#EDC948');
+				add('#B07AA1');
+				add('#FF9DA7');
+				add('#9C755F');
+				add('#BAB0AC');
+				doc.body.append(colorlist);
+			}
+			clr.setAttribute('list', clrid);
+			return clr;
+		}
+
+		/**
+		 * @param {Array} items
+		 * @param {HTMLElement} parent
+		 * @private
+		 */
+		addActionsToParent(items, parent) {
+			const indicators = [];
+			items.forEach(item => {
+				let element, event;
+				switch (item.type) {
+					case 'group':
+						const group = createElement('div');
+						group.className = 'btn-group';
+						if (!item.showInPlainMode) {
+							group.className += ' squire-html-mode-item';
+						}
+						if (item.items) {
+							indicators.push(...this.addActionsToParent(item.items, group));
+						}
+						parent.append(group);
+						return indicators;
+					case 'menu':
+					case 'menu_more':
+						const menuWrap = createElement('div');
+						menuWrap.className = 'btn-group dropdown squire-toolbar-menu-wrap';
+						menuWrap.title = item.label;
+						if (!item.showInPlainMode) {
+							menuWrap.className += ' squire-html-mode-item';
+						}
+						const menuBtn = createElement('button');
+						menuBtn.type = 'button';
+						menuBtn.className = 'btn dropdown-toggle';
+						if (item.icon !== '') {
+							menuBtn.innerHTML = item.icon;
+							menuBtn.firstElementChild.setAttribute('class', 'squire-toolbar-svg-icon');
+						} else {
+							menuBtn.className += ' fontastic';
+							menuBtn.textContent = '☰';
+						}
+						menuWrap.appendChild(menuBtn);
+
+						const menu = createElement('ul');
+						menu.className = 'dropdown-menu squire-toolbar-menu';
+						if (item.rightEdge) {
+							menu.className += ' right-edge';
+						}
+						menu.setAttribute('role', 'menu');
+
+						if (item.items) {
+							indicators.push(...this.addActionsToParent(item.items, menu));
+						}
+						menuWrap.appendChild(menu);
+						parent.append(menuWrap);
+						ko.applyBindingAccessorsToNode(menuWrap, { registerBootstrapDropdown: true });
+						item.element = menuWrap;
+						return indicators;
+					case 'move_parent':
+						// we only move into main composer not the signature composer
+						if (this.container.className.indexOf('e-signature-place') === -1) {
+							element = doc.getElementById(item.id);
+							if (element) {
+								element.className = 'btn';
+								if (item.icon) {
+									element.innerHTML = item.icon;
+									element.firstElementChild.setAttribute('class', 'squire-toolbar-svg-icon');
+								}
+								if (item.label) {
+									element.title = item.label;
+								}
+								element.parentElement.className += ' ' + item.id + '-parent';
+								parent.append(element.parentElement);
+							}
+						}
+						return [];
+					case 'button':
+						element = createElement('button');
+						element.type = 'button';
+						element.className = 'btn';
+						element.innerHTML = item.icon;
+						element.firstElementChild.setAttribute('class', 'squire-toolbar-svg-icon');
+						event = 'click';
+						break;
+					case 'select':
+						element = createElement('select');
+						element.className = 'btn';
+						element.innerHTML = item.icon;
+						event = 'input';
+						if (Array.isArray(item.items)) {
+							item.items.forEach(value => {
+								value = Array.isArray(value) ? value : [value, value];
+								const option = new Option(value[0], value[1]);
+								option.style[item.prop] = value[1];
+								element.append(option);
+							});
+						} else {
+							Object.entries(item.items).forEach(([label, options]) => {
+								const optgroup = createElement('optgroup');
+								optgroup.label = label;
+								Object.entries(options).forEach(([text, value]) => {
+									const option = new Option(text, value);
+									option.style[item.prop] = value;
+									optgroup.append(option);
+								});
+								element.append(optgroup);
+							});
+						}
+						if (item.defaultValueIndex) {
+							element.selectedIndex = item.defaultValueIndex;
+						}
+						item.element = element;
+						break;
+					case 'menu_item':
+						element = createElement('li');
+						element.className = 'squire-toolbar-menu-item';
+						if (!item.showInPlainMode) {
+							element.className += ' squire-html-mode-item';
+						}
+						element.innerHTML = item.icon + '<span>' + item.label + '</span>';
+						element.firstElementChild.setAttribute('class', 'squire-toolbar-svg-icon squire-toolbar-menu-item-icon');
+						event = 'click';
+						break;
+				}
+
+				element.title = item.label + (item.key ? ' (' + ctrlKey + item.key + ')' : '');
+				element.tabIndex = -1;
+				element.addEventListener(event, () => item.cmd(element));
+				if (item.id) {
+					element.id = item.id;
+				}
+				if (item.matches) {
+					indicators.push({
+						element: element,
+						selectors: item.matches.split(',')
+					});
+				}
+				parent.append(element);
+			});
+			return indicators;
+		}
+
+		/**
+		 * Plugins might add their own pathChange listeners therefore they should
+		 * use this utility function. @see example below
+		 * @param {Object} eventDetail detail of pathChange event
+		 * @returns {Map<any, any>}
+		 */
+		buildTokensMap(eventDetail) {
+			if (!eventDetail.tokensMap) {
+				const tokensMap = new Map();
+				if (eventDetail.path !== '(selection)') {
+					window.parsel.tokenize(eventDetail.path).forEach(token => {
+						if (token.type === 'type') {
+							// token.name is a tag like B, I, UL, etc...
+							tokensMap.set(token.name, '1');
+						} else if (token.name === 'fontFamily') {
+							// token.value can be a string like '"LucidaSansUnicode","DejaVuSans","BitstreamVeraSans",sans-serif'
+							tokensMap.set('__font_family__', token.value);
+						} else if (token.name === 'fontSize') {
+							// token.value can be a string like '24px' or 'Large'
+							tokensMap.set('__font_size__', token.value);
+						}
+					});
+				} else {
+					tokensMap.set('__selection__', '1');
+				}
+				eventDetail.tokensMap = tokensMap;
+			}
+			return eventDetail.tokensMap;
+		}
+
+		doAction(name, tag) {
+			if (tag && this.squire.hasFormat(tag)) {
+				// ex: bold -> removeBold
+				name = 'remove' + name.charAt(0).toUpperCase() + name.slice(1);
+			}
+			this.squire[name]();
+		}
+
+		doList(type) {
+			if (this.squire.hasFormat(type)) {
+				this.squire.removeList();
+				return;
+			}
+			if (type === 'UL') {
+				this.squire.makeUnorderedList();
+			} else if (type === 'OL') {
+				this.squire.makeOrderedList();
+			}
+		}
+
+		changeLevel(incDec) {
+			const type = ['UL', 'OL'].some(listTag => this.squire.hasFormat(listTag))
+				? 'List'
+				: 'Quote';
+			this.squire[incDec + type + 'Level']();
+		}
+
+		/*
+			testPresenceinSelection(format, validation) {
+				return validation.test(this.squire.getPath()) || this.squire.hasFormat(format);
+			}
+		*/
+
+		setModeCmd(mode) {
+			this.setMode(mode);
+			setTimeout(() => this.focus(), 1);
+		}
+
+		setMode(mode) {
+			if (this.mode !== mode) {
+				let cl = this.container.classList,
+					source = 'source' === this.mode;
+				cl.remove('squire2-mode-' + this.mode);
+				if ('plain' === mode) {
+					this.plain.value = htmlToPlain(source ? this.plain.value : this.squire.getHTML(), true);
+					this.toolbar.classList.add('mode-plain');
+				} else if ('source' === mode) {
+					this.plain.value = this.squire.getHTML();
+					this.toolbar.classList.add('mode-plain');
+				} else {
+					this.setData(source ? this.plain.value : plainToHtml(this.plain.value, true));
+					mode = 'wysiwyg';
+					this.toolbar.classList.remove('mode-plain');
+				}
+
+				doc.getElementById('menu-item-mode-' + this.mode)?.classList.remove('active');
+				doc.getElementById('menu-item-mode-' + mode).classList.add('active');
+
+				this.mode = mode;
+				cl.add('squire2-mode-' + mode);
+				this.onModeChange?.();
+			}
+		}
+
+		on(type, fn) {
+			if ('mode' === type) {
+				this.onModeChange = fn;
+			} else {
+				this.squire.addEventListener(type, fn);
+				this.plain.addEventListener(type, fn);
+			}
+		}
+
+		execCommand(cmd, cfg) {
+			if ('insertSignature' === cmd) {
+				cfg = Object.assign({
+					clearCache: false,
+					isHtml: false,
+					insertBefore: false,
+					signature: ''
+				}, cfg);
+
+				if (cfg.clearCache) {
+					this._prev_txt_sig = null;
+				} else try {
+					const signature = cfg.isHtml ? htmlToPlain(cfg.signature) : cfg.signature;
+					if ('plain' === this.mode) {
+						let
+							text = this.plain.value,
+							prevSignature = this._prev_txt_sig;
+						if (prevSignature) {
+							text = text.replace(prevSignature, '').trim();
+						}
+						this.plain.value = cfg.insertBefore ? '\n\n' + signature + '\n\n' + text : text + '\n\n' + signature;
+					} else {
+						const squire = this.squire,
+							root = squire.getRoot(),
+							div = createElement('div');
+						div.className = 'rl-signature';
+						div.innerHTML = cfg.isHtml ? cfg.signature : plainToHtml(cfg.signature);
+						root.querySelectorAll('div.rl-signature').forEach(node => node.remove());
+						cfg.insertBefore ? root.prepend(div) : root.append(div);
+						// Move cursor above signature
+						for (let i = 0; i < 2; i++) {
+							const divbr = createElement('div');
+							divbr.append(createElement('br'));
+							div.before(divbr);
+						}
+					}
+					this._prev_txt_sig = signature;
+				} catch (e) {
+					console.error(e);
+				}
+			}
+		}
+
+		getData() {
+			return 'source' === this.mode ? this.plain.value : trimLines(this.squire.getHTML());
+		}
+
+		setData(html) {
+//		this.plain.value = html;
+			const squire = this.squire;
+			squire.setHTML(trimLines(html));
+			const node = squire.getRoot(),
+				range = squire.getSelection();
+			range.setStart(node, 0);
+			range.setEnd(node, 0);
+			squire.setSelection(range);
+		}
+
+		getPlainData() {
+			return this.plain.value;
+		}
+
+		setPlainData(text) {
+			this.plain.value = text;
+		}
+
+		blur() {
+			this.squire.blur();
+		}
+
+		focus() {
+			if ('wysiwyg' === this.mode) {
+				this.squire.focus();
+			} else {
+				this.plain.focus();
+				this.plain.setSelectionRange(0, 0);
+			}
+		}
+	}
+})(window);
diff --git a/plugins/compact-composer/js/parsel.js b/plugins/compact-composer/js/parsel.js
new file mode 100644
index 000000000..bb207bcce
--- /dev/null
+++ b/plugins/compact-composer/js/parsel.js
@@ -0,0 +1,413 @@
+var parsel = (function (exports) {
+	'use strict';
+
+	const TOKENS = {
+		attribute: /\[\s*(?:(?<namespace>\*|[-\w\P{ASCII}]*)\|)?(?<name>[-\w\P{ASCII}]+)\s*(?:(?<operator>\W?=)\s*(?<value>.+?)\s*(\s(?<caseSensitive>[iIsS]))?\s*)?\]/gu,
+		id: /#(?<name>[-\w\P{ASCII}]+)/gu,
+		class: /\.(?<name>[-\w\P{ASCII}]+)/gu,
+		comma: /\s*,\s*/g,
+		combinator: /\s*[\s>+~]\s*/g,
+		'pseudo-element': /::(?<name>[-\w\P{ASCII}]+)(?:\((?<argument>¶*)\))?/gu,
+		'pseudo-class': /:(?<name>[-\w\P{ASCII}]+)(?:\((?<argument>¶*)\))?/gu,
+		universal: /(?:(?<namespace>\*|[-\w\P{ASCII}]*)\|)?\*/gu,
+		type: /(?:(?<namespace>\*|[-\w\P{ASCII}]*)\|)?(?<name>[-\w\P{ASCII}]+)/gu, // this must be last
+	};
+	const TRIM_TOKENS = new Set(['combinator', 'comma']);
+	const RECURSIVE_PSEUDO_CLASSES = new Set([
+		'not',
+		'is',
+		'where',
+		'has',
+		'matches',
+		'-moz-any',
+		'-webkit-any',
+		'nth-child',
+		'nth-last-child',
+	]);
+	const nthChildRegExp = /(?<index>[\dn+-]+)\s+of\s+(?<subtree>.+)/;
+	const RECURSIVE_PSEUDO_CLASSES_ARGS = {
+		'nth-child': nthChildRegExp,
+		'nth-last-child': nthChildRegExp,
+	};
+	const getArgumentPatternByType = (type) => {
+		switch (type) {
+			case 'pseudo-element':
+			case 'pseudo-class':
+				return new RegExp(TOKENS[type].source.replace('(?<argument>¶*)', '(?<argument>.*)'), 'gu');
+			default:
+				return TOKENS[type];
+		}
+	};
+	function gobbleParens(text, offset) {
+		let nesting = 0;
+		let result = '';
+		for (; offset < text.length; offset++) {
+			const char = text[offset];
+			switch (char) {
+				case '(':
+					++nesting;
+					break;
+				case ')':
+					--nesting;
+					break;
+			}
+			result += char;
+			if (nesting === 0) {
+				return result;
+			}
+		}
+		return result;
+	}
+	function tokenizeBy(text, grammar = TOKENS) {
+		if (!text) {
+			return [];
+		}
+		const tokens = [text];
+		for (const [type, pattern] of Object.entries(grammar)) {
+			for (let i = 0; i < tokens.length; i++) {
+				const token = tokens[i];
+				if (typeof token !== 'string') {
+					continue;
+				}
+				pattern.lastIndex = 0;
+				const match = pattern.exec(token);
+				if (!match) {
+					continue;
+				}
+				const from = match.index - 1;
+				const args = [];
+				const content = match[0];
+				const before = token.slice(0, from + 1);
+				if (before) {
+					args.push(before);
+				}
+				args.push({
+					...match.groups,
+					type,
+					content,
+				});
+				const after = token.slice(from + content.length + 1);
+				if (after) {
+					args.push(after);
+				}
+				tokens.splice(i, 1, ...args);
+			}
+		}
+		let offset = 0;
+		for (const token of tokens) {
+			switch (typeof token) {
+				case 'string':
+					throw new Error(`Unexpected sequence ${token} found at index ${offset}`);
+				case 'object':
+					offset += token.content.length;
+					token.pos = [offset - token.content.length, offset];
+					if (TRIM_TOKENS.has(token.type)) {
+						token.content = token.content.trim() || ' ';
+					}
+					break;
+			}
+		}
+		return tokens;
+	}
+	const STRING_PATTERN = /(['"])([^\\\n]+?)\1/g;
+	const ESCAPE_PATTERN = /\\./g;
+	function tokenize(selector, grammar = TOKENS) {
+		// Prevent leading/trailing whitespaces from being interpreted as combinators
+		selector = selector.trim();
+		if (selector === '') {
+			return [];
+		}
+		const replacements = [];
+		// Replace escapes with placeholders.
+		selector = selector.replace(ESCAPE_PATTERN, (value, offset) => {
+			replacements.push({ value, offset });
+			return '\uE000'.repeat(value.length);
+		});
+		// Replace strings with placeholders.
+		selector = selector.replace(STRING_PATTERN, (value, quote, content, offset) => {
+			replacements.push({ value, offset });
+			return `${quote}${'\uE001'.repeat(content.length)}${quote}`;
+		});
+		// Replace parentheses with placeholders.
+		{
+			let pos = 0;
+			let offset;
+			while ((offset = selector.indexOf('(', pos)) > -1) {
+				const value = gobbleParens(selector, offset);
+				replacements.push({ value, offset });
+				selector = `${selector.substring(0, offset)}(${'¶'.repeat(value.length - 2)})${selector.substring(offset + value.length)}`;
+				pos = offset + value.length;
+			}
+		}
+		// Now we have no nested structures and we can parse with regexes
+		const tokens = tokenizeBy(selector, grammar);
+		// Replace placeholders in reverse order.
+		const changedTokens = new Set();
+		for (const replacement of replacements.reverse()) {
+			for (const token of tokens) {
+				const { offset, value } = replacement;
+				if (!(token.pos[0] <= offset &&
+					offset + value.length <= token.pos[1])) {
+					continue;
+				}
+				const { content } = token;
+				const tokenOffset = offset - token.pos[0];
+				token.content =
+					content.slice(0, tokenOffset) +
+					value +
+					content.slice(tokenOffset + value.length);
+				if (token.content !== content) {
+					changedTokens.add(token);
+				}
+			}
+		}
+		// Update changed tokens.
+		for (const token of changedTokens) {
+			const pattern = getArgumentPatternByType(token.type);
+			if (!pattern) {
+				throw new Error(`Unknown token type: ${token.type}`);
+			}
+			pattern.lastIndex = 0;
+			const match = pattern.exec(token.content);
+			if (!match) {
+				throw new Error(`Unable to parse content for ${token.type}: ${token.content}`);
+			}
+			Object.assign(token, match.groups);
+		}
+		return tokens;
+	}
+	/**
+	 *  Convert a flat list of tokens into a tree of complex & compound selectors
+	 */
+	function nestTokens(tokens, { list = true } = {}) {
+		if (list && tokens.find((t) => t.type === 'comma')) {
+			const selectors = [];
+			const temp = [];
+			for (let i = 0; i < tokens.length; i++) {
+				if (tokens[i].type === 'comma') {
+					if (temp.length === 0) {
+						throw new Error('Incorrect comma at ' + i);
+					}
+					selectors.push(nestTokens(temp, { list: false }));
+					temp.length = 0;
+				}
+				else {
+					temp.push(tokens[i]);
+				}
+			}
+			if (temp.length === 0) {
+				throw new Error('Trailing comma');
+			}
+			else {
+				selectors.push(nestTokens(temp, { list: false }));
+			}
+			return { type: 'list', list: selectors };
+		}
+		for (let i = tokens.length - 1; i >= 0; i--) {
+			let token = tokens[i];
+			if (token.type === 'combinator') {
+				let left = tokens.slice(0, i);
+				let right = tokens.slice(i + 1);
+				return {
+					type: 'complex',
+					combinator: token.content,
+					left: nestTokens(left),
+					right: nestTokens(right),
+				};
+			}
+		}
+		switch (tokens.length) {
+			case 0:
+				throw new Error('Could not build AST.');
+			case 1:
+				// If we're here, there are no combinators, so it's just a list.
+				return tokens[0];
+			default:
+				return {
+					type: 'compound',
+					list: [...tokens], // clone to avoid pointers messing up the AST
+				};
+		}
+	}
+	/**
+	 * Traverse an AST in depth-first order
+	 */
+	function* flatten(node,
+	                  /**
+	                   * @internal
+	                   */
+	                  parent) {
+		switch (node.type) {
+			case 'list':
+				for (let child of node.list) {
+					yield* flatten(child, node);
+				}
+				break;
+			case 'complex':
+				yield* flatten(node.left, node);
+				yield* flatten(node.right, node);
+				break;
+			case 'compound':
+				yield* node.list.map((token) => [token, node]);
+				break;
+			default:
+				yield [node, parent];
+		}
+	}
+	/**
+	 * Traverse an AST (or part thereof), in depth-first order
+	 */
+	function walk(node, visit,
+	              /**
+	               * @internal
+	               */
+	              parent) {
+		if (!node) {
+			return;
+		}
+		for (const [token, ast] of flatten(node, parent)) {
+			visit(token, ast);
+		}
+	}
+	/**
+	 * Parse a CSS selector
+	 *
+	 * @param selector - The selector to parse
+	 * @param options.recursive - Whether to parse the arguments of pseudo-classes like :is(), :has() etc. Defaults to true.
+	 * @param options.list - Whether this can be a selector list (A, B, C etc). Defaults to true.
+	 */
+	function parse(selector, { recursive = true, list = true } = {}) {
+		const tokens = tokenize(selector);
+		if (!tokens) {
+			return;
+		}
+		const ast = nestTokens(tokens, { list });
+		if (!recursive) {
+			return ast;
+		}
+		for (const [token] of flatten(ast)) {
+			if (token.type !== 'pseudo-class' || !token.argument) {
+				continue;
+			}
+			if (!RECURSIVE_PSEUDO_CLASSES.has(token.name)) {
+				continue;
+			}
+			let argument = token.argument;
+			const childArg = RECURSIVE_PSEUDO_CLASSES_ARGS[token.name];
+			if (childArg) {
+				const match = childArg.exec(argument);
+				if (!match) {
+					continue;
+				}
+				Object.assign(token, match.groups);
+				argument = match.groups['subtree'];
+			}
+			if (!argument) {
+				continue;
+			}
+			Object.assign(token, {
+				subtree: parse(argument, {
+					recursive: true,
+					list: true,
+				}),
+			});
+		}
+		return ast;
+	}
+	/**
+	 * Converts the given list or (sub)tree to a string.
+	 */
+	function stringify(listOrNode) {
+		let tokens;
+		if (Array.isArray(listOrNode)) {
+			tokens = listOrNode;
+		}
+		else {
+			tokens = [...flatten(listOrNode)].map(([token]) => token);
+		}
+		return tokens.map(token => token.content).join('');
+	}
+	/**
+	 * To convert the specificity array to a number
+	 */
+	function specificityToNumber(specificity, base) {
+		base = base || Math.max(...specificity) + 1;
+		return (specificity[0] * (base << 1) + specificity[1] * base + specificity[2]);
+	}
+	/**
+	 * Calculate specificity of a selector.
+	 *
+	 * If the selector is a list, the max specificity is returned.
+	 */
+	function specificity(selector) {
+		let ast = selector;
+		if (typeof ast === 'string') {
+			ast = parse(ast, { recursive: true });
+		}
+		if (!ast) {
+			return [];
+		}
+		if (ast.type === 'list' && 'list' in ast) {
+			let base = 10;
+			const specificities = ast.list.map((ast) => {
+				const sp = specificity(ast);
+				base = Math.max(base, ...specificity(ast));
+				return sp;
+			});
+			const numbers = specificities.map((ast) => specificityToNumber(ast, base));
+			return specificities[numbers.indexOf(Math.max(...numbers))];
+		}
+		const ret = [0, 0, 0];
+		for (const [token] of flatten(ast)) {
+			switch (token.type) {
+				case 'id':
+					ret[0]++;
+					break;
+				case 'class':
+				case 'attribute':
+					ret[1]++;
+					break;
+				case 'pseudo-element':
+				case 'type':
+					ret[2]++;
+					break;
+				case 'pseudo-class':
+					if (token.name === 'where') {
+						break;
+					}
+					if (!RECURSIVE_PSEUDO_CLASSES.has(token.name) ||
+						!token.subtree) {
+						ret[1]++;
+						break;
+					}
+					const sub = specificity(token.subtree);
+					sub.forEach((s, i) => (ret[i] += s));
+					// :nth-child() & :nth-last-child() add (0, 1, 0) to the specificity of their most complex selector
+					if (token.name === 'nth-child' ||
+						token.name === 'nth-last-child') {
+						ret[1]++;
+					}
+			}
+		}
+		return ret;
+	}
+
+	exports.RECURSIVE_PSEUDO_CLASSES = RECURSIVE_PSEUDO_CLASSES;
+	exports.RECURSIVE_PSEUDO_CLASSES_ARGS = RECURSIVE_PSEUDO_CLASSES_ARGS;
+	exports.TOKENS = TOKENS;
+	exports.TRIM_TOKENS = TRIM_TOKENS;
+	exports.flatten = flatten;
+	exports.gobbleParens = gobbleParens;
+	exports.parse = parse;
+	exports.specificity = specificity;
+	exports.specificityToNumber = specificityToNumber;
+	exports.stringify = stringify;
+	exports.tokenize = tokenize;
+	exports.tokenizeBy = tokenizeBy;
+	exports.walk = walk;
+
+	Object.defineProperty(exports, '__esModule', { value: true });
+
+	return exports;
+
+}({}));
diff --git a/plugins/compact-composer/js/squire-raw.js b/plugins/compact-composer/js/squire-raw.js
new file mode 100644
index 000000000..512387eaa
--- /dev/null
+++ b/plugins/compact-composer/js/squire-raw.js
@@ -0,0 +1,4120 @@
+"use strict";
+// v2.3.2
+(() => {
+  // source/node/TreeIterator.ts
+  var SHOW_ELEMENT = 1;
+  var SHOW_TEXT = 4;
+  var SHOW_ELEMENT_OR_TEXT = 5;
+  var always = () => true;
+  var TreeIterator = class {
+    constructor(root, nodeType, filter) {
+      this.root = root;
+      this.currentNode = root;
+      this.nodeType = nodeType;
+      this.filter = filter || always;
+    }
+    isAcceptableNode(node) {
+      const nodeType = node.nodeType;
+      const nodeFilterType = nodeType === Node.ELEMENT_NODE ? SHOW_ELEMENT : nodeType === Node.TEXT_NODE ? SHOW_TEXT : 0;
+      return !!(nodeFilterType & this.nodeType) && this.filter(node);
+    }
+    nextNode() {
+      const root = this.root;
+      let current = this.currentNode;
+      let node;
+      while (true) {
+        node = current.firstChild;
+        while (!node && current) {
+          if (current === root) {
+            break;
+          }
+          node = current.nextSibling;
+          if (!node) {
+            current = current.parentNode;
+          }
+        }
+        if (!node) {
+          return null;
+        }
+        if (this.isAcceptableNode(node)) {
+          this.currentNode = node;
+          return node;
+        }
+        current = node;
+      }
+    }
+    previousNode() {
+      const root = this.root;
+      let current = this.currentNode;
+      let node;
+      while (true) {
+        if (current === root) {
+          return null;
+        }
+        node = current.previousSibling;
+        if (node) {
+          while (current = node.lastChild) {
+            node = current;
+          }
+        } else {
+          node = current.parentNode;
+        }
+        if (!node) {
+          return null;
+        }
+        if (this.isAcceptableNode(node)) {
+          this.currentNode = node;
+          return node;
+        }
+        current = node;
+      }
+    }
+    // Previous node in post-order.
+    previousPONode() {
+      const root = this.root;
+      let current = this.currentNode;
+      let node;
+      while (true) {
+        node = current.lastChild;
+        while (!node && current) {
+          if (current === root) {
+            break;
+          }
+          node = current.previousSibling;
+          if (!node) {
+            current = current.parentNode;
+          }
+        }
+        if (!node) {
+          return null;
+        }
+        if (this.isAcceptableNode(node)) {
+          this.currentNode = node;
+          return node;
+        }
+        current = node;
+      }
+    }
+  };
+
+  // source/Constants.ts
+  var ELEMENT_NODE = 1;
+  var TEXT_NODE = 3;
+  var DOCUMENT_FRAGMENT_NODE = 11;
+  var ZWS = "\u200B";
+  var ua = navigator.userAgent;
+  var isMac = /Mac OS X/.test(ua);
+  var isWin = /Windows NT/.test(ua);
+  var isIOS = /iP(?:ad|hone|od)/.test(ua) || isMac && !!navigator.maxTouchPoints;
+  var isAndroid = /Android/.test(ua);
+  var isGecko = /Gecko\//.test(ua);
+  var isLegacyEdge = /Edge\//.test(ua);
+  var isWebKit = !isLegacyEdge && /WebKit\//.test(ua);
+  var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
+  var cantFocusEmptyTextNodes = isWebKit;
+  var supportsInputEvents = "onbeforeinput" in document && "inputType" in new InputEvent("input");
+  var notWS = /[^ \t\r\n]/;
+
+  // source/node/Category.ts
+  var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|EL|FN)|EM|FONT|HR|I(?:FRAME|MG|NPUT|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:AMP|MALL|PAN|TR(?:IKE|ONG)|U[BP])?|TIME|U|VAR|WBR)$/;
+  var leafNodeNames = /* @__PURE__ */ new Set(["BR", "HR", "IFRAME", "IMG", "INPUT"]);
+  var UNKNOWN = 0;
+  var INLINE = 1;
+  var BLOCK = 2;
+  var CONTAINER = 3;
+  var cache = /* @__PURE__ */ new WeakMap();
+  var resetNodeCategoryCache = () => {
+    cache = /* @__PURE__ */ new WeakMap();
+  };
+  var isLeaf = (node) => {
+    return leafNodeNames.has(node.nodeName);
+  };
+  var getNodeCategory = (node) => {
+    switch (node.nodeType) {
+      case TEXT_NODE:
+        return INLINE;
+      case ELEMENT_NODE:
+      case DOCUMENT_FRAGMENT_NODE:
+        if (cache.has(node)) {
+          return cache.get(node);
+        }
+        break;
+      default:
+        return UNKNOWN;
+    }
+    let nodeCategory;
+    if (!Array.from(node.childNodes).every(isInline)) {
+      nodeCategory = CONTAINER;
+    } else if (inlineNodeNames.test(node.nodeName)) {
+      nodeCategory = INLINE;
+    } else {
+      nodeCategory = BLOCK;
+    }
+    cache.set(node, nodeCategory);
+    return nodeCategory;
+  };
+  var isInline = (node) => {
+    return getNodeCategory(node) === INLINE;
+  };
+  var isBlock = (node) => {
+    return getNodeCategory(node) === BLOCK;
+  };
+  var isContainer = (node) => {
+    return getNodeCategory(node) === CONTAINER;
+  };
+
+  // source/node/Node.ts
+  var createElement = (tag, props, children) => {
+    const el = document.createElement(tag);
+    if (props instanceof Array) {
+      children = props;
+      props = null;
+    }
+    if (props) {
+      for (const attr in props) {
+        const value = props[attr];
+        if (value !== void 0) {
+          el.setAttribute(attr, value);
+        }
+      }
+    }
+    if (children) {
+      children.forEach((node) => el.appendChild(node));
+    }
+    return el;
+  };
+  var areAlike = (node, node2) => {
+    if (isLeaf(node)) {
+      return false;
+    }
+    if (node.nodeType !== node2.nodeType || node.nodeName !== node2.nodeName) {
+      return false;
+    }
+    if (node instanceof HTMLElement && node2 instanceof HTMLElement) {
+      return node.nodeName !== "A" && node.className === node2.className && node.style.cssText === node2.style.cssText;
+    }
+    return true;
+  };
+  var hasTagAttributes = (node, tag, attributes) => {
+    if (node.nodeName !== tag) {
+      return false;
+    }
+    for (const attr in attributes) {
+      if (!("getAttribute" in node) || node.getAttribute(attr) !== attributes[attr]) {
+        return false;
+      }
+    }
+    return true;
+  };
+  var getNearest = (node, root, tag, attributes) => {
+    while (node && node !== root) {
+      if (hasTagAttributes(node, tag, attributes)) {
+        return node;
+      }
+      node = node.parentNode;
+    }
+    return null;
+  };
+  var getNodeBeforeOffset = (node, offset) => {
+    let children = node.childNodes;
+    while (offset && node instanceof Element) {
+      node = children[offset - 1];
+      children = node.childNodes;
+      offset = children.length;
+    }
+    return node;
+  };
+  var getNodeAfterOffset = (node, offset) => {
+    let returnNode = node;
+    if (returnNode instanceof Element) {
+      const children = returnNode.childNodes;
+      if (offset < children.length) {
+        returnNode = children[offset];
+      } else {
+        while (returnNode && !returnNode.nextSibling) {
+          returnNode = returnNode.parentNode;
+        }
+        if (returnNode) {
+          returnNode = returnNode.nextSibling;
+        }
+      }
+    }
+    return returnNode;
+  };
+  var getLength = (node) => {
+    return node instanceof Element || node instanceof DocumentFragment ? node.childNodes.length : node instanceof CharacterData ? node.length : 0;
+  };
+  var empty = (node) => {
+    const frag = document.createDocumentFragment();
+    let child = node.firstChild;
+    while (child) {
+      frag.appendChild(child);
+      child = node.firstChild;
+    }
+    return frag;
+  };
+  var detach = (node) => {
+    const parent = node.parentNode;
+    if (parent) {
+      parent.removeChild(node);
+    }
+    return node;
+  };
+  var replaceWith = (node, node2) => {
+    const parent = node.parentNode;
+    if (parent) {
+      parent.replaceChild(node2, node);
+    }
+  };
+
+  // source/node/Whitespace.ts
+  var notWSTextNode = (node) => {
+    return node instanceof Element ? node.nodeName === "BR" : (
+      // okay if data is 'undefined' here.
+      notWS.test(node.data)
+    );
+  };
+  var isLineBreak = (br, isLBIfEmptyBlock) => {
+    let block = br.parentNode;
+    while (isInline(block)) {
+      block = block.parentNode;
+    }
+    const walker = new TreeIterator(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      notWSTextNode
+    );
+    walker.currentNode = br;
+    return !!walker.nextNode() || isLBIfEmptyBlock && !walker.previousNode();
+  };
+  var removeZWS = (root, keepNode) => {
+    const walker = new TreeIterator(root, SHOW_TEXT);
+    let textNode;
+    let index;
+    while (textNode = walker.nextNode()) {
+      while ((index = textNode.data.indexOf(ZWS)) > -1 && // eslint-disable-next-line no-unmodified-loop-condition
+      (!keepNode || textNode.parentNode !== keepNode)) {
+        if (textNode.length === 1) {
+          let node = textNode;
+          let parent = node.parentNode;
+          while (parent) {
+            parent.removeChild(node);
+            walker.currentNode = parent;
+            if (!isInline(parent) || getLength(parent)) {
+              break;
+            }
+            node = parent;
+            parent = node.parentNode;
+          }
+          break;
+        } else {
+          textNode.deleteData(index, 1);
+        }
+      }
+    }
+  };
+
+  // source/range/Boundaries.ts
+  var START_TO_START = 0;
+  var START_TO_END = 1;
+  var END_TO_END = 2;
+  var END_TO_START = 3;
+  var isNodeContainedInRange = (range, node, partial) => {
+    const nodeRange = document.createRange();
+    nodeRange.selectNode(node);
+    if (partial) {
+      const nodeEndBeforeStart = range.compareBoundaryPoints(END_TO_START, nodeRange) > -1;
+      const nodeStartAfterEnd = range.compareBoundaryPoints(START_TO_END, nodeRange) < 1;
+      return !nodeEndBeforeStart && !nodeStartAfterEnd;
+    } else {
+      const nodeStartAfterStart = range.compareBoundaryPoints(START_TO_START, nodeRange) < 1;
+      const nodeEndBeforeEnd = range.compareBoundaryPoints(END_TO_END, nodeRange) > -1;
+      return nodeStartAfterStart && nodeEndBeforeEnd;
+    }
+  };
+  var moveRangeBoundariesDownTree = (range) => {
+    let { startContainer, startOffset, endContainer, endOffset } = range;
+    while (!(startContainer instanceof Text)) {
+      let child = startContainer.childNodes[startOffset];
+      if (!child || isLeaf(child)) {
+        if (startOffset) {
+          child = startContainer.childNodes[startOffset - 1];
+          if (child instanceof Text) {
+            let textChild = child;
+            let prev;
+            while (!textChild.length && (prev = textChild.previousSibling) && prev instanceof Text) {
+              textChild.remove();
+              textChild = prev;
+            }
+            startContainer = textChild;
+            startOffset = textChild.data.length;
+          }
+        }
+        break;
+      }
+      startContainer = child;
+      startOffset = 0;
+    }
+    if (endOffset) {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.childNodes[endOffset - 1];
+        if (!child || isLeaf(child)) {
+          if (child && child.nodeName === "BR" && !isLineBreak(child, false)) {
+            endOffset -= 1;
+            continue;
+          }
+          break;
+        }
+        endContainer = child;
+        endOffset = getLength(endContainer);
+      }
+    } else {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.firstChild;
+        if (!child || isLeaf(child)) {
+          break;
+        }
+        endContainer = child;
+      }
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundariesUpTree = (range, startMax, endMax, root) => {
+    let startContainer = range.startContainer;
+    let startOffset = range.startOffset;
+    let endContainer = range.endContainer;
+    let endOffset = range.endOffset;
+    let parent;
+    if (!startMax) {
+      startMax = range.commonAncestorContainer;
+    }
+    if (!endMax) {
+      endMax = startMax;
+    }
+    while (!startOffset && startContainer !== startMax && startContainer !== root) {
+      parent = startContainer.parentNode;
+      startOffset = Array.from(parent.childNodes).indexOf(
+        startContainer
+      );
+      startContainer = parent;
+    }
+    while (true) {
+      if (endContainer === endMax || endContainer === root) {
+        break;
+      }
+      if (endContainer.nodeType !== TEXT_NODE && endContainer.childNodes[endOffset] && endContainer.childNodes[endOffset].nodeName === "BR" && !isLineBreak(endContainer.childNodes[endOffset], false)) {
+        endOffset += 1;
+      }
+      if (endOffset !== getLength(endContainer)) {
+        break;
+      }
+      parent = endContainer.parentNode;
+      endOffset = Array.from(parent.childNodes).indexOf(endContainer) + 1;
+      endContainer = parent;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundaryOutOf = (range, tag, root) => {
+    let parent = getNearest(range.endContainer, root, tag);
+    if (parent && (parent = parent.parentNode)) {
+      const clone = range.cloneRange();
+      moveRangeBoundariesUpTree(clone, parent, parent, root);
+      if (clone.endContainer === parent) {
+        range.setStart(clone.endContainer, clone.endOffset);
+        range.setEnd(clone.endContainer, clone.endOffset);
+      }
+    }
+    return range;
+  };
+
+  // source/node/MergeSplit.ts
+  var fixCursor = (node) => {
+    let fixer = null;
+    if (node instanceof Text) {
+      return node;
+    }
+    if (isInline(node)) {
+      let child = node.firstChild;
+      if (cantFocusEmptyTextNodes) {
+        while (child && child instanceof Text && !child.data) {
+          node.removeChild(child);
+          child = node.firstChild;
+        }
+      }
+      if (!child) {
+        if (cantFocusEmptyTextNodes) {
+          fixer = document.createTextNode(ZWS);
+        } else {
+          fixer = document.createTextNode("");
+        }
+      }
+    } else if ((node instanceof Element || node instanceof DocumentFragment) && !node.querySelector("BR")) {
+      fixer = createElement("BR");
+      let parent = node;
+      let child;
+      while ((child = parent.lastElementChild) && !isInline(child)) {
+        parent = child;
+      }
+      node = parent;
+    }
+    if (fixer) {
+      try {
+        node.appendChild(fixer);
+      } catch (error) {
+      }
+    }
+    return node;
+  };
+  var fixContainer = (container, root) => {
+    let wrapper = null;
+    Array.from(container.childNodes).forEach((child) => {
+      const isBR = child.nodeName === "BR";
+      if (!isBR && isInline(child)) {
+        if (!wrapper) {
+          wrapper = createElement("DIV");
+        }
+        wrapper.appendChild(child);
+      } else if (isBR || wrapper) {
+        if (!wrapper) {
+          wrapper = createElement("DIV");
+        }
+        fixCursor(wrapper);
+        if (isBR) {
+          container.replaceChild(wrapper, child);
+        } else {
+          container.insertBefore(wrapper, child);
+        }
+        wrapper = null;
+      }
+      if (isContainer(child)) {
+        fixContainer(child, root);
+      }
+    });
+    if (wrapper) {
+      container.appendChild(fixCursor(wrapper));
+    }
+    return container;
+  };
+  var split = (node, offset, stopNode, root) => {
+    if (node instanceof Text && node !== stopNode) {
+      if (typeof offset !== "number") {
+        throw new Error("Offset must be a number to split text node!");
+      }
+      if (!node.parentNode) {
+        throw new Error("Cannot split text node with no parent!");
+      }
+      return split(node.parentNode, node.splitText(offset), stopNode, root);
+    }
+    let nodeAfterSplit = typeof offset === "number" ? offset < node.childNodes.length ? node.childNodes[offset] : null : offset;
+    const parent = node.parentNode;
+    if (!parent || node === stopNode || !(node instanceof Element)) {
+      return nodeAfterSplit;
+    }
+    const clone = node.cloneNode(false);
+    while (nodeAfterSplit) {
+      const next = nodeAfterSplit.nextSibling;
+      clone.appendChild(nodeAfterSplit);
+      nodeAfterSplit = next;
+    }
+    if (node instanceof HTMLOListElement && getNearest(node, root, "BLOCKQUOTE")) {
+      clone.start = (+node.start || 1) + node.childNodes.length - 1;
+    }
+    fixCursor(node);
+    fixCursor(clone);
+    parent.insertBefore(clone, node.nextSibling);
+    return split(parent, clone, stopNode, root);
+  };
+  var _mergeInlines = (node, fakeRange) => {
+    const children = node.childNodes;
+    let l = children.length;
+    const frags = [];
+    while (l--) {
+      const child = children[l];
+      const prev = l ? children[l - 1] : null;
+      if (prev && isInline(child) && areAlike(child, prev)) {
+        if (fakeRange.startContainer === child) {
+          fakeRange.startContainer = prev;
+          fakeRange.startOffset += getLength(prev);
+        }
+        if (fakeRange.endContainer === child) {
+          fakeRange.endContainer = prev;
+          fakeRange.endOffset += getLength(prev);
+        }
+        if (fakeRange.startContainer === node) {
+          if (fakeRange.startOffset > l) {
+            fakeRange.startOffset -= 1;
+          } else if (fakeRange.startOffset === l) {
+            fakeRange.startContainer = prev;
+            fakeRange.startOffset = getLength(prev);
+          }
+        }
+        if (fakeRange.endContainer === node) {
+          if (fakeRange.endOffset > l) {
+            fakeRange.endOffset -= 1;
+          } else if (fakeRange.endOffset === l) {
+            fakeRange.endContainer = prev;
+            fakeRange.endOffset = getLength(prev);
+          }
+        }
+        detach(child);
+        if (child instanceof Text) {
+          prev.appendData(child.data);
+        } else {
+          frags.push(empty(child));
+        }
+      } else if (child instanceof Element) {
+        let frag;
+        while (frag = frags.pop()) {
+          child.appendChild(frag);
+        }
+        _mergeInlines(child, fakeRange);
+      }
+    }
+  };
+  var mergeInlines = (node, range) => {
+    const element = node instanceof Text ? node.parentNode : node;
+    if (element instanceof Element) {
+      const fakeRange = {
+        startContainer: range.startContainer,
+        startOffset: range.startOffset,
+        endContainer: range.endContainer,
+        endOffset: range.endOffset
+      };
+      _mergeInlines(element, fakeRange);
+      range.setStart(fakeRange.startContainer, fakeRange.startOffset);
+      range.setEnd(fakeRange.endContainer, fakeRange.endOffset);
+    }
+  };
+  var mergeWithBlock = (block, next, range, root) => {
+    let container = next;
+    let parent;
+    let offset;
+    while ((parent = container.parentNode) && parent !== root && parent instanceof Element && parent.childNodes.length === 1) {
+      container = parent;
+    }
+    detach(container);
+    offset = block.childNodes.length;
+    const last = block.lastChild;
+    if (last && last.nodeName === "BR") {
+      block.removeChild(last);
+      offset -= 1;
+    }
+    block.appendChild(empty(next));
+    range.setStart(block, offset);
+    range.collapse(true);
+    mergeInlines(block, range);
+  };
+  var mergeContainers = (node, root) => {
+    const prev = node.previousSibling;
+    const first = node.firstChild;
+    const isListItem = node.nodeName === "LI";
+    if (isListItem && (!first || !/^[OU]L$/.test(first.nodeName))) {
+      return;
+    }
+    if (prev && areAlike(prev, node)) {
+      if (!isContainer(prev)) {
+        if (isListItem) {
+          const block = createElement("DIV");
+          block.appendChild(empty(prev));
+          prev.appendChild(block);
+        } else {
+          return;
+        }
+      }
+      detach(node);
+      const needsFix = !isContainer(node);
+      prev.appendChild(empty(node));
+      if (needsFix) {
+        fixContainer(prev, root);
+      }
+      if (first) {
+        mergeContainers(first, root);
+      }
+    } else if (isListItem) {
+      const block = createElement("DIV");
+      node.insertBefore(block, first);
+      fixCursor(block);
+    }
+  };
+
+  // source/Clean.ts
+  var styleToSemantic = {
+    "font-weight": {
+      regexp: /^bold|^700/i,
+      replace() {
+        return createElement("B");
+      }
+    },
+    "font-style": {
+      regexp: /^italic/i,
+      replace() {
+        return createElement("I");
+      }
+    },
+    "font-family": {
+      regexp: notWS,
+      replace(classNames, family) {
+        return createElement("SPAN", {
+          class: classNames.fontFamily,
+          style: "font-family:" + family
+        });
+      }
+    },
+    "font-size": {
+      regexp: notWS,
+      replace(classNames, size) {
+        return createElement("SPAN", {
+          class: classNames.fontSize,
+          style: "font-size:" + size
+        });
+      }
+    },
+    "text-decoration": {
+      regexp: /^underline/i,
+      replace() {
+        return createElement("U");
+      }
+    }
+  };
+  var replaceStyles = (node, _, config) => {
+    const style = node.style;
+    let newTreeBottom;
+    let newTreeTop;
+    for (const attr in styleToSemantic) {
+      const converter = styleToSemantic[attr];
+      const css = style.getPropertyValue(attr);
+      if (css && converter.regexp.test(css)) {
+        const el = converter.replace(config.classNames, css);
+        if (el.nodeName === node.nodeName && el.className === node.className) {
+          continue;
+        }
+        if (!newTreeTop) {
+          newTreeTop = el;
+        }
+        if (newTreeBottom) {
+          newTreeBottom.appendChild(el);
+        }
+        newTreeBottom = el;
+        node.style.removeProperty(attr);
+      }
+    }
+    if (newTreeTop && newTreeBottom) {
+      newTreeBottom.appendChild(empty(node));
+      if (node.style.cssText) {
+        node.appendChild(newTreeTop);
+      } else {
+        replaceWith(node, newTreeTop);
+      }
+    }
+    return newTreeBottom || node;
+  };
+  var replaceWithTag = (tag) => {
+    return (node, parent) => {
+      const el = createElement(tag);
+      const attributes = node.attributes;
+      for (let i = 0, l = attributes.length; i < l; i += 1) {
+        const attribute = attributes[i];
+        el.setAttribute(attribute.name, attribute.value);
+      }
+      parent.replaceChild(el, node);
+      el.appendChild(empty(node));
+      return el;
+    };
+  };
+  var fontSizes = {
+    "1": "10",
+    "2": "13",
+    "3": "16",
+    "4": "18",
+    "5": "24",
+    "6": "32",
+    "7": "48"
+  };
+  var stylesRewriters = {
+    STRONG: replaceWithTag("B"),
+    EM: replaceWithTag("I"),
+    INS: replaceWithTag("U"),
+    STRIKE: replaceWithTag("S"),
+    SPAN: replaceStyles,
+    FONT: (node, parent, config) => {
+      const font = node;
+      const face = font.face;
+      const size = font.size;
+      let color = font.color;
+      const classNames = config.classNames;
+      let fontSpan;
+      let sizeSpan;
+      let colorSpan;
+      let newTreeBottom;
+      let newTreeTop;
+      if (face) {
+        fontSpan = createElement("SPAN", {
+          class: classNames.fontFamily,
+          style: "font-family:" + face
+        });
+        newTreeTop = fontSpan;
+        newTreeBottom = fontSpan;
+      }
+      if (size) {
+        sizeSpan = createElement("SPAN", {
+          class: classNames.fontSize,
+          style: "font-size:" + fontSizes[size] + "px"
+        });
+        if (!newTreeTop) {
+          newTreeTop = sizeSpan;
+        }
+        if (newTreeBottom) {
+          newTreeBottom.appendChild(sizeSpan);
+        }
+        newTreeBottom = sizeSpan;
+      }
+      if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
+        if (color.charAt(0) !== "#") {
+          color = "#" + color;
+        }
+        colorSpan = createElement("SPAN", {
+          class: classNames.color,
+          style: "color:" + color
+        });
+        if (!newTreeTop) {
+          newTreeTop = colorSpan;
+        }
+        if (newTreeBottom) {
+          newTreeBottom.appendChild(colorSpan);
+        }
+        newTreeBottom = colorSpan;
+      }
+      if (!newTreeTop || !newTreeBottom) {
+        newTreeTop = newTreeBottom = createElement("SPAN");
+      }
+      parent.replaceChild(newTreeTop, font);
+      newTreeBottom.appendChild(empty(font));
+      return newTreeBottom;
+    },
+    TT: (node, parent, config) => {
+      const el = createElement("SPAN", {
+        class: config.classNames.fontFamily,
+        style: 'font-family:menlo,consolas,"courier new",monospace'
+      });
+      parent.replaceChild(el, node);
+      el.appendChild(empty(node));
+      return el;
+    }
+  };
+  var allowedBlock = /^(?:A(?:DDRESS|RTICLE|SIDE|UDIO)|BLOCKQUOTE|CAPTION|D(?:[DLT]|IV)|F(?:IGURE|IGCAPTION|OOTER)|H[1-6]|HEADER|L(?:ABEL|EGEND|I)|O(?:L|UTPUT)|P(?:RE)?|SECTION|T(?:ABLE|BODY|D|FOOT|H|HEAD|R)|COL(?:GROUP)?|UL)$/;
+  var blacklist = /^(?:HEAD|META|STYLE)/;
+  var cleanTree = (node, config, preserveWS) => {
+    const children = node.childNodes;
+    let nonInlineParent = node;
+    while (isInline(nonInlineParent)) {
+      nonInlineParent = nonInlineParent.parentNode;
+    }
+    const walker = new TreeIterator(
+      nonInlineParent,
+      SHOW_ELEMENT_OR_TEXT
+    );
+    for (let i = 0, l = children.length; i < l; i += 1) {
+      let child = children[i];
+      const nodeName = child.nodeName;
+      const rewriter = stylesRewriters[nodeName];
+      if (child instanceof HTMLElement) {
+        const childLength = child.childNodes.length;
+        if (rewriter) {
+          child = rewriter(child, node, config);
+        } else if (blacklist.test(nodeName)) {
+          node.removeChild(child);
+          i -= 1;
+          l -= 1;
+          continue;
+        } else if (!allowedBlock.test(nodeName) && !isInline(child)) {
+          i -= 1;
+          l += childLength - 1;
+          node.replaceChild(empty(child), child);
+          continue;
+        }
+        if (childLength) {
+          cleanTree(child, config, preserveWS || nodeName === "PRE");
+        }
+      } else {
+        if (child instanceof Text) {
+          let data = child.data;
+          const startsWithWS = !notWS.test(data.charAt(0));
+          const endsWithWS = !notWS.test(data.charAt(data.length - 1));
+          if (preserveWS || !startsWithWS && !endsWithWS) {
+            continue;
+          }
+          if (startsWithWS) {
+            walker.currentNode = child;
+            let sibling;
+            while (sibling = walker.previousPONode()) {
+              if (sibling.nodeName === "IMG" || sibling instanceof Text && notWS.test(sibling.data)) {
+                break;
+              }
+              if (!isInline(sibling)) {
+                sibling = null;
+                break;
+              }
+            }
+            data = data.replace(/^[ \t\r\n]+/g, sibling ? " " : "");
+          }
+          if (endsWithWS) {
+            walker.currentNode = child;
+            let sibling;
+            while (sibling = walker.nextNode()) {
+              if (sibling.nodeName === "IMG" || sibling instanceof Text && notWS.test(sibling.data)) {
+                break;
+              }
+              if (!isInline(sibling)) {
+                sibling = null;
+                break;
+              }
+            }
+            data = data.replace(/[ \t\r\n]+$/g, sibling ? " " : "");
+          }
+          if (data) {
+            child.data = data;
+            continue;
+          }
+        }
+        node.removeChild(child);
+        i -= 1;
+        l -= 1;
+      }
+    }
+    return node;
+  };
+  var removeEmptyInlines = (node) => {
+    const children = node.childNodes;
+    let l = children.length;
+    while (l--) {
+      const child = children[l];
+      if (child instanceof Element && !isLeaf(child)) {
+        removeEmptyInlines(child);
+        if (isInline(child) && !child.firstChild) {
+          node.removeChild(child);
+        }
+      } else if (child instanceof Text && !child.data) {
+        node.removeChild(child);
+      }
+    }
+  };
+  var cleanupBRs = (node, root, keepForBlankLine) => {
+    const brs = node.querySelectorAll("BR");
+    const brBreaksLine = [];
+    let l = brs.length;
+    for (let i = 0; i < l; i += 1) {
+      brBreaksLine[i] = isLineBreak(brs[i], keepForBlankLine);
+    }
+    while (l--) {
+      const br = brs[l];
+      const parent = br.parentNode;
+      if (!parent) {
+        continue;
+      }
+      if (!brBreaksLine[l]) {
+        detach(br);
+      } else if (!isInline(parent)) {
+        fixContainer(parent, root);
+      }
+    }
+  };
+  var escapeHTML = (text) => {
+    return text.split("&").join("&amp;").split("<").join("&lt;").split(">").join("&gt;").split('"').join("&quot;");
+  };
+
+  // source/node/Block.ts
+  var getBlockWalker = (node, root) => {
+    const walker = new TreeIterator(root, SHOW_ELEMENT, isBlock);
+    walker.currentNode = node;
+    return walker;
+  };
+  var getPreviousBlock = (node, root) => {
+    const block = getBlockWalker(node, root).previousNode();
+    return block !== root ? block : null;
+  };
+  var getNextBlock = (node, root) => {
+    const block = getBlockWalker(node, root).nextNode();
+    return block !== root ? block : null;
+  };
+  var isEmptyBlock = (block) => {
+    return !block.textContent && !block.querySelector("IMG");
+  };
+
+  // source/range/Block.ts
+  var getStartBlockOfRange = (range, root) => {
+    const container = range.startContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      const node = getNodeBeforeOffset(container, range.startOffset);
+      block = getNextBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var getEndBlockOfRange = (range, root) => {
+    const container = range.endContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      let node = getNodeAfterOffset(container, range.endOffset);
+      if (!node || !root.contains(node)) {
+        node = root;
+        let child;
+        while (child = node.lastChild) {
+          node = child;
+        }
+      }
+      block = getPreviousBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var isContent = (node) => {
+    return node instanceof Text ? notWS.test(node.data) : node.nodeName === "IMG";
+  };
+  var rangeDoesStartAtBlockBoundary = (range, root) => {
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let nodeAfterCursor;
+    if (startContainer instanceof Text) {
+      const text = startContainer.data;
+      for (let i = startOffset; i > 0; i -= 1) {
+        if (text.charAt(i - 1) !== ZWS) {
+          return false;
+        }
+      }
+      nodeAfterCursor = startContainer;
+    } else {
+      nodeAfterCursor = getNodeAfterOffset(startContainer, startOffset);
+      if (nodeAfterCursor && !root.contains(nodeAfterCursor)) {
+        nodeAfterCursor = null;
+      }
+      if (!nodeAfterCursor) {
+        nodeAfterCursor = getNodeBeforeOffset(startContainer, startOffset);
+        if (nodeAfterCursor instanceof Text && nodeAfterCursor.length) {
+          return false;
+        }
+      }
+    }
+    const block = getStartBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = new TreeIterator(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = nodeAfterCursor;
+    return !contentWalker.previousNode();
+  };
+  var rangeDoesEndAtBlockBoundary = (range, root) => {
+    const endContainer = range.endContainer;
+    const endOffset = range.endOffset;
+    let currentNode;
+    if (endContainer instanceof Text) {
+      const text = endContainer.data;
+      const length = text.length;
+      for (let i = endOffset; i < length; i += 1) {
+        if (text.charAt(i) !== ZWS) {
+          return false;
+        }
+      }
+      currentNode = endContainer;
+    } else {
+      currentNode = getNodeBeforeOffset(endContainer, endOffset);
+    }
+    const block = getEndBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = new TreeIterator(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = currentNode;
+    return !contentWalker.nextNode();
+  };
+  var expandRangeToBlockBoundaries = (range, root) => {
+    const start = getStartBlockOfRange(range, root);
+    const end = getEndBlockOfRange(range, root);
+    let parent;
+    if (start && end) {
+      parent = start.parentNode;
+      range.setStart(parent, Array.from(parent.childNodes).indexOf(start));
+      parent = end.parentNode;
+      range.setEnd(parent, Array.from(parent.childNodes).indexOf(end) + 1);
+    }
+  };
+
+  // source/range/InsertDelete.ts
+  function createRange(startContainer, startOffset, endContainer, endOffset) {
+    const range = document.createRange();
+    range.setStart(startContainer, startOffset);
+    if (endContainer && typeof endOffset === "number") {
+      range.setEnd(endContainer, endOffset);
+    } else {
+      range.setEnd(startContainer, startOffset);
+    }
+    return range;
+  }
+  var insertNodeInRange = (range, node) => {
+    let { startContainer, startOffset, endContainer, endOffset } = range;
+    let children;
+    if (startContainer instanceof Text) {
+      const parent = startContainer.parentNode;
+      children = parent.childNodes;
+      if (startOffset === startContainer.length) {
+        startOffset = Array.from(children).indexOf(startContainer) + 1;
+        if (range.collapsed) {
+          endContainer = parent;
+          endOffset = startOffset;
+        }
+      } else {
+        if (startOffset) {
+          const afterSplit = startContainer.splitText(startOffset);
+          if (endContainer === startContainer) {
+            endOffset -= startOffset;
+            endContainer = afterSplit;
+          } else if (endContainer === parent) {
+            endOffset += 1;
+          }
+          startContainer = afterSplit;
+        }
+        startOffset = Array.from(children).indexOf(
+          startContainer
+        );
+      }
+      startContainer = parent;
+    } else {
+      children = startContainer.childNodes;
+    }
+    const childCount = children.length;
+    if (startOffset === childCount) {
+      startContainer.appendChild(node);
+    } else {
+      startContainer.insertBefore(node, children[startOffset]);
+    }
+    if (startContainer === endContainer) {
+      endOffset += children.length - childCount;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var extractContentsOfRange = (range, common, root) => {
+    const frag = document.createDocumentFragment();
+    if (range.collapsed) {
+      return frag;
+    }
+    if (!common) {
+      common = range.commonAncestorContainer;
+    }
+    if (common instanceof Text) {
+      common = common.parentNode;
+    }
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let endContainer = split(range.endContainer, range.endOffset, common, root);
+    let endOffset = 0;
+    let node = split(startContainer, startOffset, common, root);
+    while (node && node !== endContainer) {
+      const next = node.nextSibling;
+      frag.appendChild(node);
+      node = next;
+    }
+    node = endContainer && endContainer.previousSibling;
+    if (node && node instanceof Text && endContainer instanceof Text) {
+      endOffset = node.length;
+      node.appendData(endContainer.data);
+      detach(endContainer);
+      endContainer = node;
+    }
+    range.setStart(startContainer, startOffset);
+    if (endContainer) {
+      range.setEnd(endContainer, endOffset);
+    } else {
+      range.setEnd(common, common.childNodes.length);
+    }
+    fixCursor(common);
+    return frag;
+  };
+  var getAdjacentInlineNode = (iterator, method, node) => {
+    iterator.currentNode = node;
+    let nextNode;
+    while (nextNode = iterator[method]()) {
+      if (nextNode instanceof Text || isLeaf(nextNode)) {
+        return nextNode;
+      }
+      if (!isInline(nextNode)) {
+        return null;
+      }
+    }
+    return null;
+  };
+  var deleteContentsOfRange = (range, root) => {
+    const startBlock = getStartBlockOfRange(range, root);
+    let endBlock = getEndBlockOfRange(range, root);
+    const needsMerge = startBlock !== endBlock;
+    if (startBlock && endBlock) {
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, startBlock, endBlock, root);
+    }
+    const frag = extractContentsOfRange(range, null, root);
+    moveRangeBoundariesDownTree(range);
+    if (needsMerge) {
+      endBlock = getEndBlockOfRange(range, root);
+      if (startBlock && endBlock && startBlock !== endBlock) {
+        mergeWithBlock(startBlock, endBlock, range, root);
+      }
+    }
+    if (startBlock) {
+      fixCursor(startBlock);
+    }
+    const child = root.firstChild;
+    if (!child || child.nodeName === "BR") {
+      fixCursor(root);
+      if (root.firstChild) {
+        range.selectNodeContents(root.firstChild);
+      }
+    }
+    range.collapse(true);
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    const iterator = new TreeIterator(root, SHOW_ELEMENT_OR_TEXT);
+    let afterNode = startContainer;
+    let afterOffset = startOffset;
+    if (!(afterNode instanceof Text) || afterOffset === afterNode.data.length) {
+      afterNode = getAdjacentInlineNode(iterator, "nextNode", afterNode);
+      afterOffset = 0;
+    }
+    let beforeNode = startContainer;
+    let beforeOffset = startOffset - 1;
+    if (!(beforeNode instanceof Text) || beforeOffset === -1) {
+      beforeNode = getAdjacentInlineNode(
+        iterator,
+        "previousPONode",
+        afterNode || (startContainer instanceof Text ? startContainer : startContainer.childNodes[startOffset] || startContainer)
+      );
+      if (beforeNode instanceof Text) {
+        beforeOffset = beforeNode.data.length;
+      }
+    }
+    let node = null;
+    let offset = 0;
+    if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " && rangeDoesStartAtBlockBoundary(range, root)) {
+      node = afterNode;
+      offset = afterOffset;
+    } else if (beforeNode instanceof Text && beforeNode.data.charAt(beforeOffset) === " ") {
+      if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " || rangeDoesEndAtBlockBoundary(range, root)) {
+        node = beforeNode;
+        offset = beforeOffset;
+      }
+    }
+    if (node) {
+      node.replaceData(offset, 1, "\xA0");
+    }
+    range.setStart(startContainer, startOffset);
+    range.collapse(true);
+    return frag;
+  };
+  var insertTreeFragmentIntoRange = (range, frag, root) => {
+    const firstInFragIsInline = frag.firstChild && isInline(frag.firstChild);
+    let node;
+    fixContainer(frag, root);
+    node = frag;
+    while (node = getNextBlock(node, root)) {
+      fixCursor(node);
+    }
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+    }
+    moveRangeBoundariesDownTree(range);
+    range.collapse(false);
+    const stopPoint = getNearest(range.endContainer, root, "BLOCKQUOTE") || root;
+    let block = getStartBlockOfRange(range, root);
+    let blockContentsAfterSplit = null;
+    const firstBlockInFrag = getNextBlock(frag, frag);
+    const replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock(block);
+    if (block && firstBlockInFrag && !replaceBlock && // Don't merge table cells or PRE elements into block
+      !getNearest(firstBlockInFrag, frag, "PRE") && !getNearest(firstBlockInFrag, frag, "TABLE")) {
+      moveRangeBoundariesUpTree(range, block, block, root);
+      range.collapse(true);
+      let container = range.endContainer;
+      let offset = range.endOffset;
+      cleanupBRs(block, root, false);
+      if (isInline(container)) {
+        const nodeAfterSplit = split(
+          container,
+          offset,
+          getPreviousBlock(container, root) || root,
+          root
+        );
+        container = nodeAfterSplit.parentNode;
+        offset = Array.from(container.childNodes).indexOf(
+          nodeAfterSplit
+        );
+      }
+      if (
+        /*isBlock( container ) && */
+        offset !== getLength(container)
+      ) {
+        blockContentsAfterSplit = document.createDocumentFragment();
+        while (node = container.childNodes[offset]) {
+          blockContentsAfterSplit.appendChild(node);
+        }
+      }
+      mergeWithBlock(container, firstBlockInFrag, range, root);
+      offset = Array.from(container.parentNode.childNodes).indexOf(
+        container
+      ) + 1;
+      container = container.parentNode;
+      range.setEnd(container, offset);
+    }
+    if (getLength(frag)) {
+      if (replaceBlock && block) {
+        range.setEndBefore(block);
+        range.collapse(false);
+        detach(block);
+      }
+      moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
+      let nodeAfterSplit = split(
+        range.endContainer,
+        range.endOffset,
+        stopPoint,
+        root
+      );
+      const nodeBeforeSplit = nodeAfterSplit ? nodeAfterSplit.previousSibling : stopPoint.lastChild;
+      stopPoint.insertBefore(frag, nodeAfterSplit);
+      if (nodeAfterSplit) {
+        range.setEndBefore(nodeAfterSplit);
+      } else {
+        range.setEnd(stopPoint, getLength(stopPoint));
+      }
+      block = getEndBlockOfRange(range, root);
+      moveRangeBoundariesDownTree(range);
+      const container = range.endContainer;
+      const offset = range.endOffset;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      nodeAfterSplit = nodeBeforeSplit && nodeBeforeSplit.nextSibling;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      range.setEnd(container, offset);
+    }
+    if (blockContentsAfterSplit && block) {
+      const tempRange = range.cloneRange();
+      fixCursor(blockContentsAfterSplit);
+      mergeWithBlock(block, blockContentsAfterSplit, tempRange, root);
+      range.setEnd(tempRange.endContainer, tempRange.endOffset);
+    }
+    moveRangeBoundariesDownTree(range);
+  };
+
+  // source/range/Contents.ts
+  var getTextContentsOfRange = (range) => {
+    if (range.collapsed) {
+      return "";
+    }
+    const startContainer = range.startContainer;
+    const endContainer = range.endContainer;
+    const walker = new TreeIterator(
+      range.commonAncestorContainer,
+      SHOW_ELEMENT_OR_TEXT,
+      (node2) => {
+        return isNodeContainedInRange(range, node2, true);
+      }
+    );
+    walker.currentNode = startContainer;
+    let node = startContainer;
+    let textContent = "";
+    let addedTextInBlock = false;
+    let value;
+    if (!(node instanceof Element) && !(node instanceof Text) || !walker.filter(node)) {
+      node = walker.nextNode();
+    }
+    while (node) {
+      if (node instanceof Text) {
+        value = node.data;
+        if (value && /\S/.test(value)) {
+          if (node === endContainer) {
+            value = value.slice(0, range.endOffset);
+          }
+          if (node === startContainer) {
+            value = value.slice(range.startOffset);
+          }
+          textContent += value;
+          addedTextInBlock = true;
+        }
+      } else if (node.nodeName === "BR" || addedTextInBlock && !isInline(node)) {
+        textContent += "\n";
+        addedTextInBlock = false;
+      }
+      node = walker.nextNode();
+    }
+    textContent = textContent.replace(/ /g, " ");
+    return textContent;
+  };
+
+  // source/Clipboard.ts
+  var indexOf = Array.prototype.indexOf;
+  var extractRangeToClipboard = (event, range, root, removeRangeFromDocument, toCleanHTML, toPlainText, plainTextOnly) => {
+    const clipboardData = event.clipboardData;
+    if (isLegacyEdge || !clipboardData) {
+      return false;
+    }
+    let text = toPlainText ? "" : getTextContentsOfRange(range);
+    const startBlock = getStartBlockOfRange(range, root);
+    const endBlock = getEndBlockOfRange(range, root);
+    let copyRoot = root;
+    if (startBlock === endBlock && (startBlock == null ? void 0 : startBlock.contains(range.commonAncestorContainer))) {
+      copyRoot = startBlock;
+    }
+    let contents;
+    if (removeRangeFromDocument) {
+      contents = deleteContentsOfRange(range, root);
+    } else {
+      range = range.cloneRange();
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, copyRoot, copyRoot, root);
+      contents = range.cloneContents();
+    }
+    let parent = range.commonAncestorContainer;
+    if (parent instanceof Text) {
+      parent = parent.parentNode;
+    }
+    while (parent && parent !== copyRoot) {
+      const newContents = parent.cloneNode(false);
+      newContents.appendChild(contents);
+      contents = newContents;
+      parent = parent.parentNode;
+    }
+    let html;
+    if (contents.childNodes.length === 1 && contents.childNodes[0] instanceof Text) {
+      text = contents.childNodes[0].data.replace(/ /g, " ");
+      plainTextOnly = true;
+    } else {
+      const node = createElement("DIV");
+      node.appendChild(contents);
+      html = node.innerHTML;
+      if (toCleanHTML) {
+        html = toCleanHTML(html);
+      }
+    }
+    if (toPlainText && html !== void 0) {
+      text = toPlainText(html);
+    }
+    if (isWin) {
+      text = text.replace(/\r?\n/g, "\r\n");
+    }
+    if (!plainTextOnly && html && text !== html) {
+      html = "<!-- squire -->" + html;
+      clipboardData.setData("text/html", html);
+    }
+    clipboardData.setData("text/plain", text);
+    event.preventDefault();
+    return true;
+  };
+  var _onCut = function(event) {
+    const range = this.getSelection();
+    const root = this._root;
+    if (range.collapsed) {
+      event.preventDefault();
+      return;
+    }
+    this.saveUndoState(range);
+    const handled = extractRangeToClipboard(
+      event,
+      range,
+      root,
+      true,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+    if (!handled) {
+      setTimeout(() => {
+        try {
+          this._ensureBottomLine();
+        } catch (error) {
+          this._config.didError(error);
+        }
+      }, 0);
+    }
+    this.setSelection(range);
+  };
+  var _onCopy = function(event) {
+    extractRangeToClipboard(
+      event,
+      this.getSelection(),
+      this._root,
+      false,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+  };
+  var _monitorShiftKey = function(event) {
+    this._isShiftDown = event.shiftKey;
+  };
+  var _onPaste = function(event) {
+    const clipboardData = event.clipboardData;
+    const items = clipboardData == null ? void 0 : clipboardData.items;
+    const choosePlain = this._isShiftDown;
+    let hasRTF = false;
+    let hasImage = false;
+    let plainItem = null;
+    let htmlItem = null;
+    if (items) {
+      let l = items.length;
+      while (l--) {
+        const item = items[l];
+        const type = item.type;
+        if (type === "text/html") {
+          htmlItem = item;
+        } else if (type === "text/plain" || type === "text/uri-list") {
+          plainItem = item;
+        } else if (type === "text/rtf") {
+          hasRTF = true;
+        } else if (/^image\/.*/.test(type)) {
+          hasImage = true;
+        }
+      }
+      if (hasImage && !(hasRTF && htmlItem)) {
+        event.preventDefault();
+        this.fireEvent("pasteImage", {
+          clipboardData
+        });
+        return;
+      }
+      if (!isLegacyEdge) {
+        event.preventDefault();
+        if (htmlItem && (!choosePlain || !plainItem)) {
+          htmlItem.getAsString((html) => {
+            this.insertHTML(html, true);
+          });
+        } else if (plainItem) {
+          plainItem.getAsString((text) => {
+            let isLink = false;
+            const range2 = this.getSelection();
+            if (!range2.collapsed && notWS.test(range2.toString())) {
+              const match = this.linkRegExp.exec(text);
+              isLink = !!match && match[0].length === text.length;
+            }
+            if (isLink) {
+              this.makeLink(text);
+            } else {
+              this.insertPlainText(text, true);
+            }
+          });
+        }
+        return;
+      }
+    }
+    const types = clipboardData == null ? void 0 : clipboardData.types;
+    if (!isLegacyEdge && types && (indexOf.call(types, "text/html") > -1 || !isGecko && indexOf.call(types, "text/plain") > -1 && indexOf.call(types, "text/rtf") < 0)) {
+      event.preventDefault();
+      let data;
+      if (!choosePlain && (data = clipboardData.getData("text/html"))) {
+        this.insertHTML(data, true);
+      } else if ((data = clipboardData.getData("text/plain")) || (data = clipboardData.getData("text/uri-list"))) {
+        this.insertPlainText(data, true);
+      }
+      return;
+    }
+    const body = document.body;
+    const range = this.getSelection();
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    const endContainer = range.endContainer;
+    const endOffset = range.endOffset;
+    let pasteArea = createElement("DIV", {
+      contenteditable: "true",
+      style: "position:fixed; overflow:hidden; top:0; right:100%; width:1px; height:1px;"
+    });
+    body.appendChild(pasteArea);
+    range.selectNodeContents(pasteArea);
+    this.setSelection(range);
+    setTimeout(() => {
+      try {
+        let html = "";
+        let next = pasteArea;
+        let first;
+        while (pasteArea = next) {
+          next = pasteArea.nextSibling;
+          detach(pasteArea);
+          first = pasteArea.firstChild;
+          if (first && first === pasteArea.lastChild && first instanceof HTMLDivElement) {
+            pasteArea = first;
+          }
+          html += pasteArea.innerHTML;
+        }
+        this.setSelection(
+          createRange(
+            startContainer,
+            startOffset,
+            endContainer,
+            endOffset
+          )
+        );
+        if (html) {
+          this.insertHTML(html, true);
+        }
+      } catch (error) {
+        this._config.didError(error);
+      }
+    }, 0);
+  };
+  var _onDrop = function(event) {
+    if (!event.dataTransfer) {
+      return;
+    }
+    const types = event.dataTransfer.types;
+    let l = types.length;
+    let hasPlain = false;
+    let hasHTML = false;
+    while (l--) {
+      switch (types[l]) {
+        case "text/plain":
+          hasPlain = true;
+          break;
+        case "text/html":
+          hasHTML = true;
+          break;
+        default:
+          return;
+      }
+    }
+    if (hasHTML || hasPlain && this.saveUndoState) {
+      this.saveUndoState();
+    }
+  };
+
+  // source/keyboard/Enter.ts
+  var Enter = (self, event, range) => {
+    event.preventDefault();
+    self.splitBlock(event.shiftKey, range);
+  };
+
+  // source/keyboard/KeyHelpers.ts
+  var afterDelete = (self, range) => {
+    try {
+      if (!range) {
+        range = self.getSelection();
+      }
+      let node = range.startContainer;
+      if (node instanceof Text) {
+        node = node.parentNode;
+      }
+      let parent = node;
+      while (isInline(parent) && (!parent.textContent || parent.textContent === ZWS)) {
+        node = parent;
+        parent = node.parentNode;
+      }
+      if (node !== parent) {
+        range.setStart(
+          parent,
+          Array.from(parent.childNodes).indexOf(node)
+        );
+        range.collapse(true);
+        parent.removeChild(node);
+        if (!isBlock(parent)) {
+          parent = getPreviousBlock(parent, self._root) || self._root;
+        }
+        fixCursor(parent);
+        moveRangeBoundariesDownTree(range);
+      }
+      if (node === self._root && (node = node.firstChild) && node.nodeName === "BR") {
+        detach(node);
+      }
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } catch (error) {
+      self._config.didError(error);
+    }
+  };
+  var detachUneditableNode = (node, root) => {
+    let parent;
+    while (parent = node.parentNode) {
+      if (parent === root || parent.isContentEditable) {
+        break;
+      }
+      node = parent;
+    }
+    detach(node);
+  };
+  var linkifyText = (self, textNode, offset) => {
+    if (getNearest(textNode, self._root, "A")) {
+      return;
+    }
+    const data = textNode.data || "";
+    const searchFrom = Math.max(
+      data.lastIndexOf(" ", offset - 1),
+      data.lastIndexOf("\xA0", offset - 1)
+    ) + 1;
+    const searchText = data.slice(searchFrom, offset);
+    const match = self.linkRegExp.exec(searchText);
+    if (match) {
+      const selection = self.getSelection();
+      self._docWasChanged();
+      self._recordUndoState(selection);
+      self._getRangeAndRemoveBookmark(selection);
+      const index = searchFrom + match.index;
+      const endIndex = index + match[0].length;
+      const needsSelectionUpdate = selection.startContainer === textNode;
+      const newSelectionOffset = selection.startOffset - endIndex;
+      if (index) {
+        textNode = textNode.splitText(index);
+      }
+      const defaultAttributes = self._config.tagAttributes.a;
+      const link = createElement(
+        "A",
+        Object.assign(
+          {
+            href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+          },
+          defaultAttributes
+        )
+      );
+      link.textContent = data.slice(index, endIndex);
+      textNode.parentNode.insertBefore(link, textNode);
+      textNode.data = data.slice(endIndex);
+      if (needsSelectionUpdate) {
+        selection.setStart(textNode, newSelectionOffset);
+        selection.setEnd(textNode, newSelectionOffset);
+      }
+      self.setSelection(selection);
+    }
+  };
+
+  // source/keyboard/Backspace.ts
+  var Backspace = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesStartAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      const startBlock = getStartBlockOfRange(range, root);
+      if (!startBlock) {
+        return;
+      }
+      let current = startBlock;
+      fixContainer(current.parentNode, root);
+      const previous = getPreviousBlock(current, root);
+      if (previous) {
+        if (!previous.isContentEditable) {
+          detachUneditableNode(previous, root);
+          return;
+        }
+        mergeWithBlock(previous, current, range, root);
+        current = previous.parentNode;
+        while (current !== root && !current.nextSibling) {
+          current = current.parentNode;
+        }
+        if (current !== root && (current = current.nextSibling)) {
+          mergeContainers(current, root);
+        }
+        self.setSelection(range);
+      } else if (current) {
+        if (getNearest(current, root, "UL") || getNearest(current, root, "OL")) {
+          self.decreaseListLevel(range);
+          return;
+        } else if (getNearest(current, root, "BLOCKQUOTE")) {
+          self.removeQuote(range);
+          return;
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      moveRangeBoundariesDownTree(range);
+      const text = range.startContainer;
+      const offset = range.startOffset;
+      const a = text.parentNode;
+      if (text instanceof Text && a instanceof HTMLAnchorElement && offset && a.href.includes(text.data)) {
+        text.deleteData(offset - 1, 1);
+        self.setSelection(range);
+        self.removeLink();
+        event.preventDefault();
+      } else {
+        self.setSelection(range);
+        setTimeout(() => {
+          afterDelete(self);
+        }, 0);
+      }
+    }
+  };
+
+  // source/keyboard/Delete.ts
+  var Delete = (self, event, range) => {
+    const root = self._root;
+    let current;
+    let next;
+    let originalRange;
+    let cursorContainer;
+    let cursorOffset;
+    let nodeAfterCursor;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      current = getStartBlockOfRange(range, root);
+      if (!current) {
+        return;
+      }
+      fixContainer(current.parentNode, root);
+      next = getNextBlock(current, root);
+      if (next) {
+        if (!next.isContentEditable) {
+          detachUneditableNode(next, root);
+          return;
+        }
+        mergeWithBlock(current, next, range, root);
+        next = current.parentNode;
+        while (next !== root && !next.nextSibling) {
+          next = next.parentNode;
+        }
+        if (next !== root && (next = next.nextSibling)) {
+          mergeContainers(next, root);
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      originalRange = range.cloneRange();
+      moveRangeBoundariesUpTree(range, root, root, root);
+      cursorContainer = range.endContainer;
+      cursorOffset = range.endOffset;
+      if (cursorContainer instanceof Element) {
+        nodeAfterCursor = cursorContainer.childNodes[cursorOffset];
+        if (nodeAfterCursor && nodeAfterCursor.nodeName === "IMG") {
+          event.preventDefault();
+          detach(nodeAfterCursor);
+          moveRangeBoundariesDownTree(range);
+          afterDelete(self, range);
+          return;
+        }
+      }
+      self.setSelection(originalRange);
+      setTimeout(() => {
+        afterDelete(self);
+      }, 0);
+    }
+  };
+
+  // source/keyboard/Tab.ts
+  var Tab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      let node = getStartBlockOfRange(range, root);
+      let parent;
+      while (parent = node.parentNode) {
+        if (parent.nodeName === "UL" || parent.nodeName === "OL") {
+          event.preventDefault();
+          self.increaseListLevel(range);
+          break;
+        }
+        node = parent;
+      }
+    }
+  };
+  var ShiftTab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      const node = range.startContainer;
+      if (getNearest(node, root, "UL") || getNearest(node, root, "OL")) {
+        event.preventDefault();
+        self.decreaseListLevel(range);
+      }
+    }
+  };
+
+  // source/keyboard/Space.ts
+  var Space = (self, event, range) => {
+    var _a;
+    let node;
+    const root = self._root;
+    self._recordUndoState(range);
+    self._getRangeAndRemoveBookmark(range);
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      const block = getStartBlockOfRange(range, root);
+      if (block && block.nodeName !== "PRE") {
+        const text = (_a = block.textContent) == null ? void 0 : _a.trimEnd().replace(ZWS, "");
+        if (text === "*" || text === "1.") {
+          event.preventDefault();
+          self.insertPlainText(" ", false);
+          self._docWasChanged();
+          self.saveUndoState(range);
+          const walker = new TreeIterator(block, SHOW_TEXT);
+          let textNode;
+          while (textNode = walker.nextNode()) {
+            detach(textNode);
+          }
+          if (text === "*") {
+            self.makeUnorderedList();
+          } else {
+            self.makeOrderedList();
+          }
+          return;
+        }
+      }
+    }
+    node = range.endContainer;
+    if (range.endOffset === getLength(node)) {
+      do {
+        if (node.nodeName === "A") {
+          range.setStartAfter(node);
+          break;
+        }
+      } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+    }
+    if (self._config.addLinks) {
+      const linkRange = range.cloneRange();
+      moveRangeBoundariesDownTree(linkRange);
+      const textNode = linkRange.startContainer;
+      const offset = linkRange.startOffset;
+      setTimeout(() => {
+        linkifyText(self, textNode, offset);
+      }, 0);
+    }
+    self.setSelection(range);
+  };
+
+  // source/keyboard/KeyHandlers.ts
+  var _onKey = function(event) {
+    if (event.defaultPrevented || event.isComposing) {
+      return;
+    }
+    let key = event.key;
+    let modifiers = "";
+    const code = event.code;
+    if (/^Digit\d$/.test(code)) {
+      key = code.slice(-1);
+    }
+    if (key !== "Backspace" && key !== "Delete") {
+      if (event.altKey) {
+        modifiers += "Alt-";
+      }
+      if (event.ctrlKey) {
+        modifiers += "Ctrl-";
+      }
+      if (event.metaKey) {
+        modifiers += "Meta-";
+      }
+      if (event.shiftKey) {
+        modifiers += "Shift-";
+      }
+    }
+    if (isWin && event.shiftKey && key === "Delete") {
+      modifiers += "Shift-";
+    }
+    key = modifiers + key;
+    const range = this.getSelection();
+    if (this._keyHandlers[key]) {
+      this._keyHandlers[key](this, event, range);
+    } else if (!range.collapsed && !event.ctrlKey && !event.metaKey && key.length === 1) {
+      this.saveUndoState(range);
+      deleteContentsOfRange(range, this._root);
+      this._ensureBottomLine();
+      this.setSelection(range);
+      this._updatePath(range, true);
+    }
+  };
+  var keyHandlers = {
+    "Backspace": Backspace,
+    "Delete": Delete,
+    "Tab": Tab,
+    "Shift-Tab": ShiftTab,
+    " ": Space,
+    "ArrowLeft"(self) {
+      self._removeZWS();
+    },
+    "ArrowRight"(self, event, range) {
+      self._removeZWS();
+      const root = self.getRoot();
+      if (rangeDoesEndAtBlockBoundary(range, root)) {
+        moveRangeBoundariesDownTree(range);
+        let node = range.endContainer;
+        do {
+          if (node.nodeName === "CODE") {
+            let next = node.nextSibling;
+            if (!(next instanceof Text)) {
+              const textNode = document.createTextNode("\xA0");
+              node.parentNode.insertBefore(textNode, next);
+              next = textNode;
+            }
+            range.setStart(next, 1);
+            self.setSelection(range);
+            event.preventDefault();
+            break;
+          }
+        } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+      }
+    }
+  };
+  if (!supportsInputEvents) {
+    keyHandlers.Enter = Enter;
+    keyHandlers["Shift-Enter"] = Enter;
+  }
+  if (!isMac && !isIOS) {
+    keyHandlers.PageUp = (self) => {
+      self.moveCursorToStart();
+    };
+    keyHandlers.PageDown = (self) => {
+      self.moveCursorToEnd();
+    };
+  }
+  var mapKeyToFormat = (tag, remove) => {
+    remove = remove || null;
+    return (self, event) => {
+      event.preventDefault();
+      const range = self.getSelection();
+      if (self.hasFormat(tag, null, range)) {
+        self.changeFormat(null, { tag }, range);
+      } else {
+        self.changeFormat({ tag }, remove, range);
+      }
+    };
+  };
+  keyHandlers[ctrlKey + "b"] = mapKeyToFormat("B");
+  keyHandlers[ctrlKey + "i"] = mapKeyToFormat("I");
+  keyHandlers[ctrlKey + "u"] = mapKeyToFormat("U");
+  keyHandlers[ctrlKey + "Shift-7"] = mapKeyToFormat("S");
+  keyHandlers[ctrlKey + "Shift-5"] = mapKeyToFormat("SUB", { tag: "SUP" });
+  keyHandlers[ctrlKey + "Shift-6"] = mapKeyToFormat("SUP", { tag: "SUB" });
+  keyHandlers[ctrlKey + "Shift-8"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (!/(?:^|>)UL/.test(path)) {
+      self.makeUnorderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "Shift-9"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (!/(?:^|>)OL/.test(path)) {
+      self.makeOrderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "["] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.decreaseQuoteLevel();
+    } else {
+      self.decreaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "]"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.increaseQuoteLevel();
+    } else {
+      self.increaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "d"] = (self, event) => {
+    event.preventDefault();
+    self.toggleCode();
+  };
+  keyHandlers[ctrlKey + "z"] = (self, event) => {
+    event.preventDefault();
+    self.undo();
+  };
+  keyHandlers[ctrlKey + "y"] = // Depending on platform, the Shift may cause the key to come through as
+    // upper case, but sometimes not. Just add both as shortcuts — the browser
+    // will only ever fire one or the other.
+    keyHandlers[ctrlKey + "Shift-z"] = keyHandlers[ctrlKey + "Shift-Z"] = (self, event) => {
+      event.preventDefault();
+      self.redo();
+    };
+
+  // source/Editor.ts
+  var Squire = class {
+    constructor(root, config) {
+      /**
+       * Subscribing to these events won't automatically add a listener to the
+       * document node, since these events are fired in a custom manner by the
+       * editor code.
+       */
+      this.customEvents = /* @__PURE__ */ new Set([
+        "pathChange",
+        "select",
+        "input",
+        "pasteImage",
+        "undoStateChange"
+      ]);
+      // ---
+      this.startSelectionId = "squire-selection-start";
+      this.endSelectionId = "squire-selection-end";
+      /*
+      linkRegExp = new RegExp(
+          // Only look on boundaries
+          '\\b(?:' +
+          // Capture group 1: URLs
+          '(' +
+              // Add links to URLS
+              // Starts with:
+              '(?:' +
+                  // http(s):// or ftp://
+                  '(?:ht|f)tps?:\\/\\/' +
+                  // or
+                  '|' +
+                  // www.
+                  'www\\d{0,3}[.]' +
+                  // or
+                  '|' +
+                  // foo90.com/
+                  '[a-z0-9][a-z0-9.\\-]*[.][a-z]{2,}\\/' +
+              ')' +
+              // Then we get one or more:
+              '(?:' +
+                  // Run of non-spaces, non ()<>
+                  '[^\\s()<>]+' +
+                  // or
+                  '|' +
+                  // balanced parentheses (one level deep only)
+                  '\\([^\\s()<>]+\\)' +
+              ')+' +
+              // And we finish with
+              '(?:' +
+                  // Not a space or punctuation character
+                  '[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]' +
+                  // or
+                  '|' +
+                  // Balanced parentheses.
+                  '\\([^\\s()<>]+\\)' +
+              ')' +
+          // Capture group 2: Emails
+          ')|(' +
+              // Add links to emails
+              '[\\w\\-.%+]+@(?:[\\w\\-]+\\.)+[a-z]{2,}\\b' +
+              // Allow query parameters in the mailto: style
+              '(?:' +
+                  '[?][^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+' +
+                  '(?:&[^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+)*' +
+              ')?' +
+          '))',
+          'i'
+      );
+      */
+      this.linkRegExp = /\b(?:((?:(?:ht|f)tps?:\/\/|www\d{0,3}[.]|[a-z0-9][a-z0-9.\-]*[.][a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()\[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w\-]+\.)+[a-z]{2,}\b(?:[?][^&?\s]+=[^\s?&`!()\[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()\[\]{};:'".,<>«»“”‘’]+)*)?))/i;
+      this.tagAfterSplit = {
+        DT: "DD",
+        DD: "DT",
+        LI: "LI",
+        PRE: "PRE"
+      };
+      this._root = root;
+      this._config = this._makeConfig(config);
+      this._isFocused = false;
+      this._lastSelection = createRange(root, 0);
+      this._willRestoreSelection = false;
+      this._mayHaveZWS = false;
+      this._lastAnchorNode = null;
+      this._lastFocusNode = null;
+      this._path = "";
+      this._events = /* @__PURE__ */ new Map();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+      this._isInUndoState = false;
+      this._ignoreChange = false;
+      this._ignoreAllChanges = false;
+      this.addEventListener("selectionchange", this._updatePathOnEvent);
+      this.addEventListener("blur", this._enableRestoreSelection);
+      this.addEventListener("mousedown", this._disableRestoreSelection);
+      this.addEventListener("touchstart", this._disableRestoreSelection);
+      this.addEventListener("focus", this._restoreSelection);
+      this.addEventListener("blur", this._removeZWS);
+      this._isShiftDown = false;
+      this.addEventListener("cut", _onCut);
+      this.addEventListener("copy", _onCopy);
+      this.addEventListener("paste", _onPaste);
+      this.addEventListener("drop", _onDrop);
+      this.addEventListener(
+        "keydown",
+        _monitorShiftKey
+      );
+      this.addEventListener("keyup", _monitorShiftKey);
+      this.addEventListener("keydown", _onKey);
+      this._keyHandlers = Object.create(keyHandlers);
+      const mutation = new MutationObserver(() => this._docWasChanged());
+      mutation.observe(root, {
+        childList: true,
+        attributes: true,
+        characterData: true,
+        subtree: true
+      });
+      this._mutation = mutation;
+      root.setAttribute("contenteditable", "true");
+      this.addEventListener(
+        "beforeinput",
+        this._beforeInput
+      );
+      this.setHTML("");
+    }
+    destroy() {
+      this._events.forEach((_, type) => {
+        this.removeEventListener(type);
+      });
+      this._mutation.disconnect();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+    }
+    _makeConfig(userConfig) {
+      const config = {
+        blockTag: "DIV",
+        blockAttributes: null,
+        tagAttributes: {},
+        classNames: {
+          color: "color",
+          fontFamily: "font",
+          fontSize: "size",
+          highlight: "highlight"
+        },
+        undo: {
+          documentSizeThreshold: -1,
+          // -1 means no threshold
+          undoLimit: -1
+          // -1 means no limit
+        },
+        addLinks: true,
+        willCutCopy: null,
+        toPlainText: null,
+        sanitizeToDOMFragment: (html) => {
+          const frag = DOMPurify.sanitize(html, {
+            ALLOW_UNKNOWN_PROTOCOLS: true,
+            WHOLE_DOCUMENT: false,
+            RETURN_DOM: true,
+            RETURN_DOM_FRAGMENT: true,
+            FORCE_BODY: false
+          });
+          return frag ? document.importNode(frag, true) : document.createDocumentFragment();
+        },
+        didError: (error) => console.log(error)
+      };
+      if (userConfig) {
+        Object.assign(config, userConfig);
+        config.blockTag = config.blockTag.toUpperCase();
+      }
+      return config;
+    }
+    setKeyHandler(key, fn) {
+      this._keyHandlers[key] = fn;
+      return this;
+    }
+    _beforeInput(event) {
+      switch (event.inputType) {
+        case "insertLineBreak":
+          event.preventDefault();
+          this.splitBlock(true);
+          break;
+        case "insertParagraph":
+          event.preventDefault();
+          this.splitBlock(false);
+          break;
+        case "insertOrderedList":
+          event.preventDefault();
+          this.makeOrderedList();
+          break;
+        case "insertUnoderedList":
+          event.preventDefault();
+          this.makeUnorderedList();
+          break;
+        case "historyUndo":
+          event.preventDefault();
+          this.undo();
+          break;
+        case "historyRedo":
+          event.preventDefault();
+          this.redo();
+          break;
+        case "formatBold":
+          event.preventDefault();
+          this.bold();
+          break;
+        case "formaItalic":
+          event.preventDefault();
+          this.italic();
+          break;
+        case "formatUnderline":
+          event.preventDefault();
+          this.underline();
+          break;
+        case "formatStrikeThrough":
+          event.preventDefault();
+          this.strikethrough();
+          break;
+        case "formatSuperscript":
+          event.preventDefault();
+          this.superscript();
+          break;
+        case "formatSubscript":
+          event.preventDefault();
+          this.subscript();
+          break;
+        case "formatJustifyFull":
+        case "formatJustifyCenter":
+        case "formatJustifyRight":
+        case "formatJustifyLeft": {
+          event.preventDefault();
+          let alignment = event.inputType.slice(13).toLowerCase();
+          if (alignment === "full") {
+            alignment = "justify";
+          }
+          this.setTextAlignment(alignment);
+          break;
+        }
+        case "formatRemove":
+          event.preventDefault();
+          this.removeAllFormatting();
+          break;
+        case "formatSetBlockTextDirection": {
+          event.preventDefault();
+          let dir = event.data;
+          if (dir === "null") {
+            dir = null;
+          }
+          this.setTextDirection(dir);
+          break;
+        }
+        case "formatBackColor":
+          event.preventDefault();
+          this.setHighlightColor(event.data);
+          break;
+        case "formatFontColor":
+          event.preventDefault();
+          this.setTextColor(event.data);
+          break;
+        case "formatFontName":
+          event.preventDefault();
+          this.setFontFace(event.data);
+          break;
+      }
+    }
+    // --- Events
+    handleEvent(event) {
+      this.fireEvent(event.type, event);
+    }
+    fireEvent(type, detail) {
+      let handlers = this._events.get(type);
+      if (/^(?:focus|blur)/.test(type)) {
+        const isFocused = this._root === document.activeElement;
+        if (type === "focus") {
+          if (!isFocused || this._isFocused) {
+            return this;
+          }
+          this._isFocused = true;
+        } else {
+          if (isFocused || !this._isFocused) {
+            return this;
+          }
+          this._isFocused = false;
+        }
+      }
+      if (handlers) {
+        const event = detail instanceof Event ? detail : new CustomEvent(type, {
+          detail
+        });
+        handlers = handlers.slice();
+        for (const handler of handlers) {
+          try {
+            if ("handleEvent" in handler) {
+              handler.handleEvent(event);
+            } else {
+              handler.call(this, event);
+            }
+          } catch (error) {
+            this._config.didError(error);
+          }
+        }
+      }
+      return this;
+    }
+    addEventListener(type, fn) {
+      let handlers = this._events.get(type);
+      let target = this._root;
+      if (!handlers) {
+        handlers = [];
+        this._events.set(type, handlers);
+        if (!this.customEvents.has(type)) {
+          if (type === "selectionchange") {
+            target = document;
+          }
+          target.addEventListener(type, this, true);
+        }
+      }
+      handlers.push(fn);
+      return this;
+    }
+    removeEventListener(type, fn) {
+      const handlers = this._events.get(type);
+      let target = this._root;
+      if (handlers) {
+        if (fn) {
+          let l = handlers.length;
+          while (l--) {
+            if (handlers[l] === fn) {
+              handlers.splice(l, 1);
+            }
+          }
+        } else {
+          handlers.length = 0;
+        }
+        if (!handlers.length) {
+          this._events.delete(type);
+          if (!this.customEvents.has(type)) {
+            if (type === "selectionchange") {
+              target = document;
+            }
+            target.removeEventListener(type, this, true);
+          }
+        }
+      }
+      return this;
+    }
+    // --- Focus
+    focus() {
+      this._root.focus({ preventScroll: true });
+      return this;
+    }
+    blur() {
+      this._root.blur();
+      return this;
+    }
+    // --- Selection and bookmarking
+    _enableRestoreSelection() {
+      this._willRestoreSelection = true;
+    }
+    _disableRestoreSelection() {
+      this._willRestoreSelection = false;
+    }
+    _restoreSelection() {
+      if (this._willRestoreSelection) {
+        this.setSelection(this._lastSelection);
+      }
+    }
+    // ---
+    _removeZWS() {
+      if (!this._mayHaveZWS) {
+        return;
+      }
+      removeZWS(this._root);
+      this._mayHaveZWS = false;
+    }
+    _saveRangeToBookmark(range) {
+      let startNode = createElement("INPUT", {
+        id: this.startSelectionId,
+        type: "hidden"
+      });
+      let endNode = createElement("INPUT", {
+        id: this.endSelectionId,
+        type: "hidden"
+      });
+      let temp;
+      insertNodeInRange(range, startNode);
+      range.collapse(false);
+      insertNodeInRange(range, endNode);
+      if (startNode.compareDocumentPosition(endNode) & Node.DOCUMENT_POSITION_PRECEDING) {
+        startNode.id = this.endSelectionId;
+        endNode.id = this.startSelectionId;
+        temp = startNode;
+        startNode = endNode;
+        endNode = temp;
+      }
+      range.setStartAfter(startNode);
+      range.setEndBefore(endNode);
+    }
+    _getRangeAndRemoveBookmark(range) {
+      const root = this._root;
+      const start = root.querySelector("#" + this.startSelectionId);
+      const end = root.querySelector("#" + this.endSelectionId);
+      if (start && end) {
+        let startContainer = start.parentNode;
+        let endContainer = end.parentNode;
+        const startOffset = Array.from(startContainer.childNodes).indexOf(
+          start
+        );
+        let endOffset = Array.from(endContainer.childNodes).indexOf(end);
+        if (startContainer === endContainer) {
+          endOffset -= 1;
+        }
+        start.remove();
+        end.remove();
+        if (!range) {
+          range = document.createRange();
+        }
+        range.setStart(startContainer, startOffset);
+        range.setEnd(endContainer, endOffset);
+        mergeInlines(startContainer, range);
+        if (startContainer !== endContainer) {
+          mergeInlines(endContainer, range);
+        }
+        if (range.collapsed) {
+          startContainer = range.startContainer;
+          if (startContainer instanceof Text) {
+            endContainer = startContainer.childNodes[range.startOffset];
+            if (!endContainer || !(endContainer instanceof Text)) {
+              endContainer = startContainer.childNodes[range.startOffset - 1];
+            }
+            if (endContainer && endContainer instanceof Text) {
+              range.setStart(endContainer, 0);
+              range.collapse(true);
+            }
+          }
+        }
+      }
+      return range || null;
+    }
+    getSelection() {
+      const selection = window.getSelection();
+      const root = this._root;
+      let range = null;
+      if (this._isFocused && selection && selection.rangeCount) {
+        range = selection.getRangeAt(0).cloneRange();
+        const startContainer = range.startContainer;
+        const endContainer = range.endContainer;
+        if (startContainer && isLeaf(startContainer)) {
+          range.setStartBefore(startContainer);
+        }
+        if (endContainer && isLeaf(endContainer)) {
+          range.setEndBefore(endContainer);
+        }
+      }
+      if (range && root.contains(range.commonAncestorContainer)) {
+        this._lastSelection = range;
+      } else {
+        range = this._lastSelection;
+        if (!document.contains(range.commonAncestorContainer)) {
+          range = null;
+        }
+      }
+      if (!range) {
+        range = createRange(root.firstElementChild || root, 0);
+      }
+      return range;
+    }
+    setSelection(range) {
+      this._lastSelection = range;
+      if (!this._isFocused) {
+        this._enableRestoreSelection();
+      } else {
+        const selection = window.getSelection();
+        if (selection) {
+          if ("setBaseAndExtent" in Selection.prototype) {
+            selection.setBaseAndExtent(
+              range.startContainer,
+              range.startOffset,
+              range.endContainer,
+              range.endOffset
+            );
+          } else {
+            selection.removeAllRanges();
+            selection.addRange(range);
+          }
+        }
+      }
+      return this;
+    }
+    // ---
+    _moveCursorTo(toStart) {
+      const root = this._root;
+      const range = createRange(root, toStart ? 0 : root.childNodes.length);
+      moveRangeBoundariesDownTree(range);
+      this.setSelection(range);
+      return this;
+    }
+    moveCursorToStart() {
+      return this._moveCursorTo(true);
+    }
+    moveCursorToEnd() {
+      return this._moveCursorTo(false);
+    }
+    // ---
+    getCursorPosition() {
+      const range = this.getSelection();
+      let rect = range.getBoundingClientRect();
+      if (rect && !rect.top) {
+        this._ignoreChange = true;
+        const node = createElement("SPAN");
+        node.textContent = ZWS;
+        insertNodeInRange(range, node);
+        rect = node.getBoundingClientRect();
+        const parent = node.parentNode;
+        parent.removeChild(node);
+        mergeInlines(parent, range);
+      }
+      return rect;
+    }
+    // --- Path
+    getPath() {
+      return this._path;
+    }
+    _updatePathOnEvent() {
+      if (this._isFocused) {
+        this._updatePath(this.getSelection());
+      }
+    }
+    _updatePath(range, force) {
+      const anchor = range.startContainer;
+      const focus = range.endContainer;
+      let newPath;
+      if (force || anchor !== this._lastAnchorNode || focus !== this._lastFocusNode) {
+        this._lastAnchorNode = anchor;
+        this._lastFocusNode = focus;
+        newPath = anchor && focus ? anchor === focus ? this._getPath(focus) : "(selection)" : "";
+        if (this._path !== newPath || anchor !== focus) {
+          this._path = newPath;
+          this.fireEvent("pathChange", {
+            path: newPath
+          });
+        }
+      }
+      this.fireEvent(range.collapsed ? "cursor" : "select", {
+        range
+      });
+    }
+    _getPath(node) {
+      const root = this._root;
+      const config = this._config;
+      let path = "";
+      if (node && node !== root) {
+        const parent = node.parentNode;
+        path = parent ? this._getPath(parent) : "";
+        if (node instanceof HTMLElement) {
+          const id = node.id;
+          const classList = node.classList;
+          const classNames = Array.from(classList).sort();
+          const dir = node.dir;
+          const styleNames = config.classNames;
+          path += (path ? ">" : "") + node.nodeName;
+          if (id) {
+            path += "#" + id;
+          }
+          if (classNames.length) {
+            path += ".";
+            path += classNames.join(".");
+          }
+          if (dir) {
+            path += "[dir=" + dir + "]";
+          }
+          if (classList.contains(styleNames.highlight)) {
+            path += "[backgroundColor=" + node.style.backgroundColor.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.color)) {
+            path += "[color=" + node.style.color.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontFamily)) {
+            path += "[fontFamily=" + node.style.fontFamily.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontSize)) {
+            path += "[fontSize=" + node.style.fontSize + "]";
+          }
+        }
+      }
+      return path;
+    }
+    // --- History
+    modifyDocument(modificationFn) {
+      const mutation = this._mutation;
+      if (mutation) {
+        if (mutation.takeRecords().length) {
+          this._docWasChanged();
+        }
+        mutation.disconnect();
+      }
+      this._ignoreAllChanges = true;
+      modificationFn();
+      this._ignoreAllChanges = false;
+      if (mutation) {
+        mutation.observe(this._root, {
+          childList: true,
+          attributes: true,
+          characterData: true,
+          subtree: true
+        });
+        this._ignoreChange = false;
+      }
+      return this;
+    }
+    _docWasChanged() {
+      resetNodeCategoryCache();
+      this._mayHaveZWS = true;
+      if (this._ignoreAllChanges) {
+        return;
+      }
+      if (this._ignoreChange) {
+        this._ignoreChange = false;
+        return;
+      }
+      if (this._isInUndoState) {
+        this._isInUndoState = false;
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: false
+        });
+      }
+      this.fireEvent("input");
+    }
+    /**
+     * Leaves bookmark.
+     */
+    _recordUndoState(range, replace) {
+      const isInUndoState = this._isInUndoState;
+      if (!isInUndoState || replace) {
+        let undoIndex = this._undoIndex + 1;
+        const undoStack = this._undoStack;
+        const undoConfig = this._config.undo;
+        const undoThreshold = undoConfig.documentSizeThreshold;
+        const undoLimit = undoConfig.undoLimit;
+        if (undoIndex < this._undoStackLength) {
+          undoStack.length = this._undoStackLength = undoIndex;
+        }
+        if (range) {
+          this._saveRangeToBookmark(range);
+        }
+        if (isInUndoState) {
+          return this;
+        }
+        const html = this._getRawHTML();
+        if (replace) {
+          undoIndex -= 1;
+        }
+        if (undoThreshold > -1 && html.length * 2 > undoThreshold) {
+          if (undoLimit > -1 && undoIndex > undoLimit) {
+            undoStack.splice(0, undoIndex - undoLimit);
+            undoIndex = undoLimit;
+            this._undoStackLength = undoLimit;
+          }
+        }
+        undoStack[undoIndex] = html;
+        this._undoIndex = undoIndex;
+        this._undoStackLength += 1;
+        this._isInUndoState = true;
+      }
+      return this;
+    }
+    saveUndoState(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      this._getRangeAndRemoveBookmark(range);
+      return this;
+    }
+    undo() {
+      if (this._undoIndex !== 0 || !this._isInUndoState) {
+        this._recordUndoState(this.getSelection(), false);
+        this._undoIndex -= 1;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this._isInUndoState = true;
+        this.fireEvent("undoStateChange", {
+          canUndo: this._undoIndex !== 0,
+          canRedo: true
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    redo() {
+      const undoIndex = this._undoIndex;
+      const undoStackLength = this._undoStackLength;
+      if (undoIndex + 1 < undoStackLength && this._isInUndoState) {
+        this._undoIndex += 1;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: undoIndex + 2 < undoStackLength
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    // --- Get and set data
+    getRoot() {
+      return this._root;
+    }
+    _getRawHTML() {
+      return this._root.innerHTML;
+    }
+    _setRawHTML(html) {
+      const root = this._root;
+      root.innerHTML = html;
+      let node = root;
+      const child = node.firstChild;
+      if (!child || child.nodeName === "BR") {
+        const block = this.createDefaultBlock();
+        if (child) {
+          node.replaceChild(block, child);
+        } else {
+          node.appendChild(block);
+        }
+      } else {
+        while (node = getNextBlock(node, root)) {
+          fixCursor(node);
+        }
+      }
+      this._ignoreChange = true;
+      return this;
+    }
+    getHTML(withBookmark) {
+      let range;
+      if (withBookmark) {
+        range = this.getSelection();
+        this._saveRangeToBookmark(range);
+      }
+      const html = this._getRawHTML().replace(/\u200B/g, "");
+      if (withBookmark) {
+        this._getRangeAndRemoveBookmark(range);
+      }
+      return html;
+    }
+    setHTML(html) {
+      const frag = this._config.sanitizeToDOMFragment(html, this);
+      const root = this._root;
+      cleanTree(frag, this._config);
+      cleanupBRs(frag, root, false);
+      fixContainer(frag, root);
+      let node = frag;
+      let child = node.firstChild;
+      if (!child || child.nodeName === "BR") {
+        const block = this.createDefaultBlock();
+        if (child) {
+          node.replaceChild(block, child);
+        } else {
+          node.appendChild(block);
+        }
+      } else {
+        while (node = getNextBlock(node, root)) {
+          fixCursor(node);
+        }
+      }
+      this._ignoreChange = true;
+      while (child = root.lastChild) {
+        root.removeChild(child);
+      }
+      root.appendChild(frag);
+      this._undoIndex = -1;
+      this._undoStack.length = 0;
+      this._undoStackLength = 0;
+      this._isInUndoState = false;
+      const range = this._getRangeAndRemoveBookmark() || createRange(root.firstElementChild || root, 0);
+      this.saveUndoState(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    /**
+     * Insert HTML at the cursor location. If the selection is not collapsed
+     * insertTreeFragmentIntoRange will delete the selection so that it is
+     * replaced by the html being inserted.
+     */
+    insertHTML(html, isPaste) {
+      const config = this._config;
+      let frag = config.sanitizeToDOMFragment(html, this);
+      const range = this.getSelection();
+      this.saveUndoState(range);
+      try {
+        const root = this._root;
+        if (config.addLinks) {
+          this.addDetectedLinks(frag, frag);
+        }
+        cleanTree(frag, this._config);
+        cleanupBRs(frag, root, false);
+        removeEmptyInlines(frag);
+        frag.normalize();
+        let node = frag;
+        while (node = getNextBlock(node, frag)) {
+          fixCursor(node);
+        }
+        let doInsert = true;
+        if (isPaste) {
+          const event = new CustomEvent("willPaste", {
+            cancelable: true,
+            detail: {
+              html,
+              fragment: frag
+            }
+          });
+          this.fireEvent("willPaste", event);
+          frag = event.detail.fragment;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          insertTreeFragmentIntoRange(range, frag, root);
+          range.collapse(false);
+          moveRangeBoundaryOutOf(range, "A", root);
+          this._ensureBottomLine();
+        }
+        this.setSelection(range);
+        this._updatePath(range, true);
+        if (isPaste) {
+          this.focus();
+        }
+      } catch (error) {
+        this._config.didError(error);
+      }
+      return this;
+    }
+    insertElement(el, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      range.collapse(true);
+      if (isInline(el)) {
+        insertNodeInRange(range, el);
+        range.setStartAfter(el);
+      } else {
+        const root = this._root;
+        const startNode = getStartBlockOfRange(
+          range,
+          root
+        );
+        let splitNode = startNode || root;
+        let nodeAfterSplit = null;
+        while (splitNode !== root && !splitNode.nextSibling) {
+          splitNode = splitNode.parentNode;
+        }
+        if (splitNode !== root) {
+          const parent = splitNode.parentNode;
+          nodeAfterSplit = split(
+            parent,
+            splitNode.nextSibling,
+            root,
+            root
+          );
+        }
+        if (startNode && isEmptyBlock(startNode)) {
+          detach(startNode);
+        }
+        root.insertBefore(el, nodeAfterSplit);
+        const blankLine = this.createDefaultBlock();
+        root.insertBefore(blankLine, nodeAfterSplit);
+        range.setStart(blankLine, 0);
+        range.setEnd(blankLine, 0);
+        moveRangeBoundariesDownTree(range);
+      }
+      this.focus();
+      this.setSelection(range);
+      this._updatePath(range);
+      return this;
+    }
+    insertImage(src, attributes) {
+      const img = createElement(
+        "IMG",
+        Object.assign(
+          {
+            src
+          },
+          attributes
+        )
+      );
+      this.insertElement(img);
+      return img;
+    }
+    insertPlainText(plainText, isPaste) {
+      const range = this.getSelection();
+      if (range.collapsed && getNearest(range.startContainer, this._root, "PRE")) {
+        const startContainer = range.startContainer;
+        let offset = range.startOffset;
+        let textNode;
+        if (!startContainer || !(startContainer instanceof Text)) {
+          const text = document.createTextNode("");
+          startContainer.insertBefore(
+            text,
+            startContainer.childNodes[offset]
+          );
+          textNode = text;
+          offset = 0;
+        } else {
+          textNode = startContainer;
+        }
+        let doInsert = true;
+        if (isPaste) {
+          const event = new CustomEvent("willPaste", {
+            cancelable: true,
+            detail: {
+              text: plainText
+            }
+          });
+          this.fireEvent("willPaste", event);
+          plainText = event.detail.text;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          textNode.insertData(offset, plainText);
+          range.setStart(textNode, offset + plainText.length);
+          range.collapse(true);
+        }
+        this.setSelection(range);
+        return this;
+      }
+      const lines = plainText.split("\n");
+      const config = this._config;
+      const tag = config.blockTag;
+      const attributes = config.blockAttributes;
+      const closeBlock = "</" + tag + ">";
+      let openBlock = "<" + tag;
+      for (const attr in attributes) {
+        openBlock += " " + attr + '="' + escapeHTML(attributes[attr]) + '"';
+      }
+      openBlock += ">";
+      for (let i = 0, l = lines.length; i < l; i += 1) {
+        let line = lines[i];
+        line = escapeHTML(line).replace(/ (?=(?: |$))/g, "&nbsp;");
+        if (i) {
+          line = openBlock + (line || "<BR>") + closeBlock;
+        }
+        lines[i] = line;
+      }
+      return this.insertHTML(lines.join(""), isPaste);
+    }
+    getSelectedText(range) {
+      return getTextContentsOfRange(range || this.getSelection());
+    }
+    // --- Inline formatting
+    /**
+     * Extracts the font-family and font-size (if any) of the element
+     * holding the cursor. If there's a selection, returns an empty object.
+     */
+    getFontInfo(range) {
+      const fontInfo = {
+        color: void 0,
+        backgroundColor: void 0,
+        fontFamily: void 0,
+        fontSize: void 0
+      };
+      if (!range) {
+        range = this.getSelection();
+      }
+      moveRangeBoundariesDownTree(range);
+      let seenAttributes = 0;
+      let element = range.commonAncestorContainer;
+      if (range.collapsed || element instanceof Text) {
+        if (element instanceof Text) {
+          element = element.parentNode;
+        }
+        while (seenAttributes < 4 && element) {
+          const style = element.style;
+          if (style) {
+            const color = style.color;
+            if (!fontInfo.color && color) {
+              fontInfo.color = color;
+              seenAttributes += 1;
+            }
+            const backgroundColor = style.backgroundColor;
+            if (!fontInfo.backgroundColor && backgroundColor) {
+              fontInfo.backgroundColor = backgroundColor;
+              seenAttributes += 1;
+            }
+            const fontFamily = style.fontFamily;
+            if (!fontInfo.fontFamily && fontFamily) {
+              fontInfo.fontFamily = fontFamily;
+              seenAttributes += 1;
+            }
+            const fontSize = style.fontSize;
+            if (!fontInfo.fontSize && fontSize) {
+              fontInfo.fontSize = fontSize;
+              seenAttributes += 1;
+            }
+          }
+          element = element.parentNode;
+        }
+      }
+      return fontInfo;
+    }
+    /**
+     * Looks for matching tag and attributes, so won't work if <strong>
+     * instead of <b> etc.
+     */
+    hasFormat(tag, attributes, range) {
+      tag = tag.toUpperCase();
+      if (!attributes) {
+        attributes = {};
+      }
+      if (!range) {
+        range = this.getSelection();
+      }
+      if (!range.collapsed && range.startContainer instanceof Text && range.startOffset === range.startContainer.length && range.startContainer.nextSibling) {
+        range.setStartBefore(range.startContainer.nextSibling);
+      }
+      if (!range.collapsed && range.endContainer instanceof Text && range.endOffset === 0 && range.endContainer.previousSibling) {
+        range.setEndAfter(range.endContainer.previousSibling);
+      }
+      const root = this._root;
+      const common = range.commonAncestorContainer;
+      if (getNearest(common, root, tag, attributes)) {
+        return true;
+      }
+      if (common instanceof Text) {
+        return false;
+      }
+      const walker = new TreeIterator(common, SHOW_TEXT, (node2) => {
+        return isNodeContainedInRange(range, node2, true);
+      });
+      let seenNode = false;
+      let node;
+      while (node = walker.nextNode()) {
+        if (!getNearest(node, root, tag, attributes)) {
+          return false;
+        }
+        seenNode = true;
+      }
+      return seenNode;
+    }
+    changeFormat(add, remove, range, partial) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this.saveUndoState(range);
+      if (remove) {
+        range = this._removeFormat(
+          remove.tag.toUpperCase(),
+          remove.attributes || {},
+          range,
+          partial
+        );
+      }
+      if (add) {
+        range = this._addFormat(
+          add.tag.toUpperCase(),
+          add.attributes || {},
+          range
+        );
+      }
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _addFormat(tag, attributes, range) {
+      const root = this._root;
+      if (range.collapsed) {
+        const el = fixCursor(createElement(tag, attributes));
+        insertNodeInRange(range, el);
+        const focusNode = el.firstChild || el;
+        const focusOffset = focusNode instanceof Text ? focusNode.length : 0;
+        range.setStart(focusNode, focusOffset);
+        range.collapse(true);
+        let block = el;
+        while (isInline(block)) {
+          block = block.parentNode;
+        }
+        removeZWS(block, el);
+      } else {
+        const walker = new TreeIterator(
+          range.commonAncestorContainer,
+          SHOW_ELEMENT_OR_TEXT,
+          (node) => {
+            return (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") && isNodeContainedInRange(range, node, true);
+          }
+        );
+        let { startContainer, startOffset, endContainer, endOffset } = range;
+        walker.currentNode = startContainer;
+        if (!(startContainer instanceof Element) && !(startContainer instanceof Text) || !walker.filter(startContainer)) {
+          const next = walker.nextNode();
+          if (!next) {
+            return range;
+          }
+          startContainer = next;
+          startOffset = 0;
+        }
+        do {
+          let node = walker.currentNode;
+          const needsFormat = !getNearest(node, root, tag, attributes);
+          if (needsFormat) {
+            if (node === endContainer && node.length > endOffset) {
+              node.splitText(endOffset);
+            }
+            if (node === startContainer && startOffset) {
+              node = node.splitText(startOffset);
+              if (endContainer === startContainer) {
+                endContainer = node;
+                endOffset -= startOffset;
+              } else if (endContainer === startContainer.parentNode) {
+                endOffset += 1;
+              }
+              startContainer = node;
+              startOffset = 0;
+            }
+            const el = createElement(tag, attributes);
+            replaceWith(node, el);
+            el.appendChild(node);
+          }
+        } while (walker.nextNode());
+        range = createRange(
+          startContainer,
+          startOffset,
+          endContainer,
+          endOffset
+        );
+      }
+      return range;
+    }
+    _removeFormat(tag, attributes, range, partial) {
+      this._saveRangeToBookmark(range);
+      let fixer;
+      if (range.collapsed) {
+        if (cantFocusEmptyTextNodes) {
+          fixer = document.createTextNode(ZWS);
+        } else {
+          fixer = document.createTextNode("");
+        }
+        insertNodeInRange(range, fixer);
+      }
+      let root = range.commonAncestorContainer;
+      while (isInline(root)) {
+        root = root.parentNode;
+      }
+      const startContainer = range.startContainer;
+      const startOffset = range.startOffset;
+      const endContainer = range.endContainer;
+      const endOffset = range.endOffset;
+      const toWrap = [];
+      const examineNode = (node, exemplar) => {
+        if (isNodeContainedInRange(range, node, false)) {
+          return;
+        }
+        let child;
+        let next;
+        if (!isNodeContainedInRange(range, node, true)) {
+          if (!(node instanceof HTMLInputElement) && (!(node instanceof Text) || node.data)) {
+            toWrap.push([exemplar, node]);
+          }
+          return;
+        }
+        if (node instanceof Text) {
+          if (node === endContainer && endOffset !== node.length) {
+            toWrap.push([exemplar, node.splitText(endOffset)]);
+          }
+          if (node === startContainer && startOffset) {
+            node.splitText(startOffset);
+            toWrap.push([exemplar, node]);
+          }
+        } else {
+          for (child = node.firstChild; child; child = next) {
+            next = child.nextSibling;
+            examineNode(child, exemplar);
+          }
+        }
+      };
+      const formatTags = Array.from(
+        root.getElementsByTagName(tag)
+      ).filter((el) => {
+        return isNodeContainedInRange(range, el, true) && hasTagAttributes(el, tag, attributes);
+      });
+      if (!partial) {
+        formatTags.forEach((node) => {
+          examineNode(node, node);
+        });
+      }
+      toWrap.forEach(([el, node]) => {
+        el = el.cloneNode(false);
+        replaceWith(node, el);
+        el.appendChild(node);
+      });
+      formatTags.forEach((el) => {
+        replaceWith(el, empty(el));
+      });
+      if (cantFocusEmptyTextNodes && fixer) {
+        fixer = fixer.parentNode;
+        let block = fixer;
+        while (block && isInline(block)) {
+          block = block.parentNode;
+        }
+        if (block) {
+          removeZWS(block, fixer);
+        }
+      }
+      this._getRangeAndRemoveBookmark(range);
+      if (fixer) {
+        range.collapse(false);
+      }
+      mergeInlines(root, range);
+      return range;
+    }
+    // ---
+    bold() {
+      return this.changeFormat({ tag: "B" });
+    }
+    removeBold() {
+      return this.changeFormat(null, { tag: "B" });
+    }
+    italic() {
+      return this.changeFormat({ tag: "I" });
+    }
+    removeItalic() {
+      return this.changeFormat(null, { tag: "I" });
+    }
+    underline() {
+      return this.changeFormat({ tag: "U" });
+    }
+    removeUnderline() {
+      return this.changeFormat(null, { tag: "U" });
+    }
+    strikethrough() {
+      return this.changeFormat({ tag: "S" });
+    }
+    removeStrikethrough() {
+      return this.changeFormat(null, { tag: "S" });
+    }
+    subscript() {
+      return this.changeFormat({ tag: "SUB" }, { tag: "SUP" });
+    }
+    removeSubscript() {
+      return this.changeFormat(null, { tag: "SUB" });
+    }
+    superscript() {
+      return this.changeFormat({ tag: "SUP" }, { tag: "SUB" });
+    }
+    removeSuperscript() {
+      return this.changeFormat(null, { tag: "SUP" });
+    }
+    // ---
+    makeLink(url, attributes) {
+      const range = this.getSelection();
+      if (range.collapsed) {
+        let protocolEnd = url.indexOf(":") + 1;
+        if (protocolEnd) {
+          while (url[protocolEnd] === "/") {
+            protocolEnd += 1;
+          }
+        }
+        insertNodeInRange(
+          range,
+          document.createTextNode(url.slice(protocolEnd))
+        );
+      }
+      attributes = Object.assign(
+        {
+          href: url
+        },
+        this._config.tagAttributes.a,
+        attributes
+      );
+      return this.changeFormat(
+        {
+          tag: "A",
+          attributes
+        },
+        {
+          tag: "A"
+        },
+        range
+      );
+    }
+    removeLink() {
+      return this.changeFormat(
+        null,
+        {
+          tag: "A"
+        },
+        this.getSelection(),
+        true
+      );
+    }
+    addDetectedLinks(searchInNode, root) {
+      const walker = new TreeIterator(
+        searchInNode,
+        SHOW_TEXT,
+        (node2) => !getNearest(node2, root || this._root, "A")
+      );
+      const linkRegExp = this.linkRegExp;
+      const defaultAttributes = this._config.tagAttributes.a;
+      let node;
+      while (node = walker.nextNode()) {
+        const parent = node.parentNode;
+        let data = node.data;
+        let match;
+        while (match = linkRegExp.exec(data)) {
+          const index = match.index;
+          const endIndex = index + match[0].length;
+          if (index) {
+            parent.insertBefore(
+              document.createTextNode(data.slice(0, index)),
+              node
+            );
+          }
+          const child = createElement(
+            "A",
+            Object.assign(
+              {
+                href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+              },
+              defaultAttributes
+            )
+          );
+          child.textContent = data.slice(index, endIndex);
+          parent.insertBefore(child, node);
+          node.data = data = data.slice(endIndex);
+        }
+      }
+      return this;
+    }
+    // ---
+    setFontFace(name) {
+      const className = this._config.classNames.fontFamily;
+      return this.changeFormat(
+        name ? {
+          tag: "SPAN",
+          attributes: {
+            class: className,
+            style: "font-family: " + name + ", sans-serif;"
+          }
+        } : null,
+        {
+          tag: "SPAN",
+          attributes: { class: className }
+        }
+      );
+    }
+    setFontSize(size) {
+      const className = this._config.classNames.fontSize;
+      return this.changeFormat(
+        size ? {
+          tag: "SPAN",
+          attributes: {
+            class: className,
+            style: "font-size: " + (typeof size === "number" ? size + "px" : size)
+          }
+        } : null,
+        {
+          tag: "SPAN",
+          attributes: { class: className }
+        }
+      );
+    }
+    setTextColor(color) {
+      const className = this._config.classNames.color;
+      return this.changeFormat(
+        color ? {
+          tag: "SPAN",
+          attributes: {
+            class: className,
+            style: "color:" + color
+          }
+        } : null,
+        {
+          tag: "SPAN",
+          attributes: { class: className }
+        }
+      );
+    }
+    setHighlightColor(color) {
+      const className = this._config.classNames.highlight;
+      return this.changeFormat(
+        color ? {
+          tag: "SPAN",
+          attributes: {
+            class: className,
+            style: "background-color:" + color
+          }
+        } : null,
+        {
+          tag: "SPAN",
+          attributes: { class: className }
+        }
+      );
+    }
+    // --- Block formatting
+    _ensureBottomLine() {
+      const root = this._root;
+      const last = root.lastElementChild;
+      if (!last || last.nodeName !== this._config.blockTag || !isBlock(last)) {
+        root.appendChild(this.createDefaultBlock());
+      }
+    }
+    createDefaultBlock(children) {
+      const config = this._config;
+      return fixCursor(
+        createElement(config.blockTag, config.blockAttributes, children)
+      );
+    }
+    splitBlock(lineBreakOnly, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      let block;
+      let parent;
+      let node;
+      let nodeAfterSplit;
+      this._recordUndoState(range);
+      this._removeZWS();
+      this._getRangeAndRemoveBookmark(range);
+      if (!range.collapsed) {
+        deleteContentsOfRange(range, root);
+      }
+      if (this._config.addLinks) {
+        moveRangeBoundariesDownTree(range);
+        const textNode = range.startContainer;
+        const offset2 = range.startOffset;
+        setTimeout(() => {
+          linkifyText(this, textNode, offset2);
+        }, 0);
+      }
+      block = getStartBlockOfRange(range, root);
+      if (block && (parent = getNearest(block, root, "PRE"))) {
+        moveRangeBoundariesDownTree(range);
+        node = range.startContainer;
+        const offset2 = range.startOffset;
+        if (!(node instanceof Text)) {
+          node = document.createTextNode("");
+          parent.insertBefore(node, parent.firstChild);
+        }
+        if (!lineBreakOnly && node instanceof Text && (node.data.charAt(offset2 - 1) === "\n" || rangeDoesStartAtBlockBoundary(range, root)) && (node.data.charAt(offset2) === "\n" || rangeDoesEndAtBlockBoundary(range, root))) {
+          node.deleteData(offset2 && offset2 - 1, offset2 ? 2 : 1);
+          nodeAfterSplit = split(
+            node,
+            offset2 && offset2 - 1,
+            root,
+            root
+          );
+          node = nodeAfterSplit.previousSibling;
+          if (!node.textContent) {
+            detach(node);
+          }
+          node = this.createDefaultBlock();
+          nodeAfterSplit.parentNode.insertBefore(node, nodeAfterSplit);
+          if (!nodeAfterSplit.textContent) {
+            detach(nodeAfterSplit);
+          }
+          range.setStart(node, 0);
+        } else {
+          node.insertData(offset2, "\n");
+          fixCursor(parent);
+          if (node.length === offset2 + 1) {
+            range.setStartAfter(node);
+          } else {
+            range.setStart(node, offset2 + 1);
+          }
+        }
+        range.collapse(true);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        this._docWasChanged();
+        return this;
+      }
+      if (!block || lineBreakOnly || /^T[HD]$/.test(block.nodeName)) {
+        moveRangeBoundaryOutOf(range, "A", root);
+        insertNodeInRange(range, createElement("BR"));
+        range.collapse(false);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        return this;
+      }
+      if (parent = getNearest(block, root, "LI")) {
+        block = parent;
+      }
+      if (isEmptyBlock(block)) {
+        if (getNearest(block, root, "UL") || getNearest(block, root, "OL")) {
+          this.decreaseListLevel(range);
+          return this;
+        } else if (getNearest(block, root, "BLOCKQUOTE")) {
+          this.replaceWithBlankLine(range);
+          return this;
+        }
+      }
+      node = range.startContainer;
+      const offset = range.startOffset;
+      let splitTag = this.tagAfterSplit[block.nodeName];
+      nodeAfterSplit = split(
+        node,
+        offset,
+        block.parentNode,
+        this._root
+      );
+      const config = this._config;
+      let splitProperties = null;
+      if (!splitTag) {
+        splitTag = config.blockTag;
+        splitProperties = config.blockAttributes;
+      }
+      if (!hasTagAttributes(nodeAfterSplit, splitTag, splitProperties)) {
+        block = createElement(splitTag, splitProperties);
+        if (nodeAfterSplit.dir) {
+          block.dir = nodeAfterSplit.dir;
+        }
+        replaceWith(nodeAfterSplit, block);
+        block.appendChild(empty(nodeAfterSplit));
+        nodeAfterSplit = block;
+      }
+      removeZWS(block);
+      removeEmptyInlines(block);
+      fixCursor(block);
+      while (nodeAfterSplit instanceof Element) {
+        let child = nodeAfterSplit.firstChild;
+        let next;
+        if (nodeAfterSplit.nodeName === "A" && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
+          child = document.createTextNode("");
+          replaceWith(nodeAfterSplit, child);
+          nodeAfterSplit = child;
+          break;
+        }
+        while (child && child instanceof Text && !child.data) {
+          next = child.nextSibling;
+          if (!next || next.nodeName === "BR") {
+            break;
+          }
+          detach(child);
+          child = next;
+        }
+        if (!child || child.nodeName === "BR" || child instanceof Text) {
+          break;
+        }
+        nodeAfterSplit = child;
+      }
+      range = createRange(nodeAfterSplit, 0);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    forEachBlock(fn, mutates, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      if (mutates) {
+        this.saveUndoState(range);
+      }
+      const root = this._root;
+      let start = getStartBlockOfRange(range, root);
+      const end = getEndBlockOfRange(range, root);
+      if (start && end) {
+        do {
+          if (fn(start) || start === end) {
+            break;
+          }
+        } while (start = getNextBlock(start, root));
+      }
+      if (mutates) {
+        this.setSelection(range);
+        this._updatePath(range, true);
+      }
+      return this;
+    }
+    modifyBlocks(modify, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const root = this._root;
+      expandRangeToBlockBoundaries(range, root);
+      moveRangeBoundariesUpTree(range, root, root, root);
+      const frag = extractContentsOfRange(range, root, root);
+      if (!range.collapsed) {
+        let node = range.endContainer;
+        if (node === root) {
+          range.collapse(false);
+        } else {
+          while (node.parentNode !== root) {
+            node = node.parentNode;
+          }
+          range.setStartBefore(node);
+          range.collapse(true);
+        }
+      }
+      insertNodeInRange(range, modify.call(this, frag));
+      if (range.endOffset < range.endContainer.childNodes.length) {
+        mergeContainers(
+          range.endContainer.childNodes[range.endOffset],
+          root
+        );
+      }
+      mergeContainers(
+        range.startContainer.childNodes[range.startOffset],
+        root
+      );
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    // ---
+    setTextAlignment(alignment) {
+      this.forEachBlock((block) => {
+        const className = block.className.split(/\s+/).filter((klass) => {
+          return !!klass && !/^align/.test(klass);
+        }).join(" ");
+        if (alignment) {
+          block.className = className + " align-" + alignment;
+          block.style.textAlign = alignment;
+        } else {
+          block.className = className;
+          block.style.textAlign = "";
+        }
+      }, true);
+      return this.focus();
+    }
+    setTextDirection(direction) {
+      this.forEachBlock((block) => {
+        if (direction) {
+          block.dir = direction;
+        } else {
+          block.removeAttribute("dir");
+        }
+      }, true);
+      return this.focus();
+    }
+    // ---
+    _getListSelection(range, root) {
+      let list = range.commonAncestorContainer;
+      let startLi = range.startContainer;
+      let endLi = range.endContainer;
+      while (list && list !== root && !/^[OU]L$/.test(list.nodeName)) {
+        list = list.parentNode;
+      }
+      if (!list || list === root) {
+        return null;
+      }
+      if (startLi === list) {
+        startLi = startLi.childNodes[range.startOffset];
+      }
+      if (endLi === list) {
+        endLi = endLi.childNodes[range.endOffset];
+      }
+      while (startLi && startLi.parentNode !== list) {
+        startLi = startLi.parentNode;
+      }
+      while (endLi && endLi.parentNode !== list) {
+        endLi = endLi.parentNode;
+      }
+      return [list, startLi, endLi];
+    }
+    increaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi || startLi === list.firstChild) {
+        return this.focus();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const type = list.nodeName;
+      let newParent = startLi.previousSibling;
+      let listAttrs;
+      let next;
+      if (newParent.nodeName !== type) {
+        listAttrs = this._config.tagAttributes[type.toLowerCase()];
+        newParent = createElement(type, listAttrs);
+        list.insertBefore(newParent, startLi);
+      }
+      do {
+        next = startLi === endLi ? null : startLi.nextSibling;
+        newParent.appendChild(startLi);
+      } while (startLi = next);
+      next = newParent.nextSibling;
+      if (next) {
+        mergeContainers(next, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    decreaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi) {
+        startLi = list.firstChild;
+      }
+      if (!endLi) {
+        endLi = list.lastChild;
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      let next;
+      let insertBefore = null;
+      if (startLi) {
+        let newParent = list.parentNode;
+        insertBefore = !endLi.nextSibling ? list.nextSibling : split(list, endLi.nextSibling, newParent, root);
+        if (newParent !== root && newParent.nodeName === "LI") {
+          newParent = newParent.parentNode;
+          while (insertBefore) {
+            next = insertBefore.nextSibling;
+            endLi.appendChild(insertBefore);
+            insertBefore = next;
+          }
+          insertBefore = list.parentNode.nextSibling;
+        }
+        const makeNotList = !/^[OU]L$/.test(newParent.nodeName);
+        do {
+          next = startLi === endLi ? null : startLi.nextSibling;
+          list.removeChild(startLi);
+          if (makeNotList && startLi.nodeName === "LI") {
+            startLi = this.createDefaultBlock([empty(startLi)]);
+          }
+          newParent.insertBefore(startLi, insertBefore);
+        } while (startLi = next);
+      }
+      if (!list.firstChild) {
+        detach(list);
+      }
+      if (insertBefore) {
+        mergeContainers(insertBefore, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _makeList(frag, type) {
+      const walker = getBlockWalker(frag, this._root);
+      const tagAttributes = this._config.tagAttributes;
+      const listAttrs = tagAttributes[type.toLowerCase()];
+      const listItemAttrs = tagAttributes.li;
+      let node;
+      while (node = walker.nextNode()) {
+        if (node.parentNode instanceof HTMLLIElement) {
+          node = node.parentNode;
+          walker.currentNode = node.lastChild;
+        }
+        if (!(node instanceof HTMLLIElement)) {
+          const newLi = createElement("LI", listItemAttrs);
+          if (node.dir) {
+            newLi.dir = node.dir;
+          }
+          const prev = node.previousSibling;
+          if (prev && prev.nodeName === type) {
+            prev.appendChild(newLi);
+            detach(node);
+          } else {
+            replaceWith(node, createElement(type, listAttrs, [newLi]));
+          }
+          newLi.appendChild(empty(node));
+          walker.currentNode = newLi;
+        } else {
+          node = node.parentNode;
+          const tag = node.nodeName;
+          if (tag !== type && /^[OU]L$/.test(tag)) {
+            replaceWith(
+              node,
+              createElement(type, listAttrs, [empty(node)])
+            );
+          }
+        }
+      }
+      return frag;
+    }
+    makeUnorderedList() {
+      this.modifyBlocks((frag) => this._makeList(frag, "UL"));
+      return this.focus();
+    }
+    makeOrderedList() {
+      this.modifyBlocks((frag) => this._makeList(frag, "OL"));
+      return this.focus();
+    }
+    removeList() {
+      this.modifyBlocks((frag) => {
+        const lists = frag.querySelectorAll("UL, OL");
+        const items = frag.querySelectorAll("LI");
+        const root = this._root;
+        for (let i = 0, l = lists.length; i < l; i += 1) {
+          const list = lists[i];
+          const listFrag = empty(list);
+          fixContainer(listFrag, root);
+          replaceWith(list, listFrag);
+        }
+        for (let i = 0, l = items.length; i < l; i += 1) {
+          const item = items[i];
+          if (isBlock(item)) {
+            replaceWith(item, this.createDefaultBlock([empty(item)]));
+          } else {
+            fixContainer(item, root);
+            replaceWith(item, empty(item));
+          }
+        }
+        return frag;
+      });
+      return this.focus();
+    }
+    // ---
+    increaseQuoteLevel(range) {
+      this.modifyBlocks(
+        (frag) => createElement(
+          "BLOCKQUOTE",
+          this._config.tagAttributes.blockquote,
+          [frag]
+        ),
+        range
+      );
+      return this.focus();
+    }
+    decreaseQuoteLevel(range) {
+      this.modifyBlocks((frag) => {
+        Array.from(frag.querySelectorAll("blockquote")).filter((el) => {
+          return !getNearest(el.parentNode, frag, "BLOCKQUOTE");
+        }).forEach((el) => {
+          replaceWith(el, empty(el));
+        });
+        return frag;
+      }, range);
+      return this.focus();
+    }
+    removeQuote(range) {
+      this.modifyBlocks((frag) => {
+        Array.from(frag.querySelectorAll("blockquote")).forEach(
+          (el) => {
+            replaceWith(el, empty(el));
+          }
+        );
+        return frag;
+      }, range);
+      return this.focus();
+    }
+    replaceWithBlankLine(range) {
+      this.modifyBlocks(
+        () => this.createDefaultBlock([
+          createElement("INPUT", {
+            id: this.startSelectionId,
+            type: "hidden"
+          }),
+          createElement("INPUT", {
+            id: this.endSelectionId,
+            type: "hidden"
+          })
+        ]),
+        range
+      );
+      return this.focus();
+    }
+    // ---
+    code() {
+      const range = this.getSelection();
+      if (range.collapsed || isContainer(range.commonAncestorContainer)) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const output = document.createDocumentFragment();
+          const blockWalker = getBlockWalker(frag, root);
+          let node;
+          while (node = blockWalker.nextNode()) {
+            let nodes = node.querySelectorAll("BR");
+            const brBreaksLine = [];
+            let l = nodes.length;
+            for (let i = 0; i < l; i += 1) {
+              brBreaksLine[i] = isLineBreak(nodes[i], false);
+            }
+            while (l--) {
+              const br = nodes[l];
+              if (!brBreaksLine[l]) {
+                detach(br);
+              } else {
+                replaceWith(br, document.createTextNode("\n"));
+              }
+            }
+            nodes = node.querySelectorAll("CODE");
+            l = nodes.length;
+            while (l--) {
+              replaceWith(nodes[l], empty(nodes[l]));
+            }
+            if (output.childNodes.length) {
+              output.appendChild(document.createTextNode("\n"));
+            }
+            output.appendChild(empty(node));
+          }
+          const textWalker = new TreeIterator(output, SHOW_TEXT);
+          while (node = textWalker.nextNode()) {
+            node.data = node.data.replace(/ /g, " ");
+          }
+          output.normalize();
+          return fixCursor(
+            createElement("PRE", this._config.tagAttributes.pre, [
+              output
+            ])
+          );
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(
+          {
+            tag: "CODE",
+            attributes: this._config.tagAttributes.code
+          },
+          null,
+          range
+        );
+      }
+      return this;
+    }
+    removeCode() {
+      const range = this.getSelection();
+      const ancestor = range.commonAncestorContainer;
+      const inPre = getNearest(ancestor, this._root, "PRE");
+      if (inPre) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const pres = frag.querySelectorAll("PRE");
+          let l = pres.length;
+          while (l--) {
+            const pre = pres[l];
+            const walker = new TreeIterator(pre, SHOW_TEXT);
+            let node;
+            while (node = walker.nextNode()) {
+              let value = node.data;
+              value = value.replace(/ (?= )/g, "\xA0");
+              const contents = document.createDocumentFragment();
+              let index;
+              while ((index = value.indexOf("\n")) > -1) {
+                contents.appendChild(
+                  document.createTextNode(value.slice(0, index))
+                );
+                contents.appendChild(createElement("BR"));
+                value = value.slice(index + 1);
+              }
+              node.parentNode.insertBefore(contents, node);
+              node.data = value;
+            }
+            fixContainer(pre, root);
+            replaceWith(pre, empty(pre));
+          }
+          return frag;
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(null, { tag: "CODE" }, range);
+      }
+      return this;
+    }
+    toggleCode() {
+      if (this.hasFormat("PRE") || this.hasFormat("CODE")) {
+        this.removeCode();
+      } else {
+        this.code();
+      }
+      return this;
+    }
+    // ---
+    _removeFormatting(root, clean) {
+      for (let node = root.firstChild, next; node; node = next) {
+        next = node.nextSibling;
+        if (isInline(node)) {
+          if (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") {
+            clean.appendChild(node);
+            continue;
+          }
+        } else if (isBlock(node)) {
+          clean.appendChild(
+            this.createDefaultBlock([
+              this._removeFormatting(
+                node,
+                document.createDocumentFragment()
+              )
+            ])
+          );
+          continue;
+        }
+        this._removeFormatting(node, clean);
+      }
+      return clean;
+    }
+    removeAllFormatting(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      if (range.collapsed) {
+        return this.focus();
+      }
+      const root = this._root;
+      let stopNode = range.commonAncestorContainer;
+      while (stopNode && !isBlock(stopNode)) {
+        stopNode = stopNode.parentNode;
+      }
+      if (!stopNode) {
+        expandRangeToBlockBoundaries(range, root);
+        stopNode = root;
+      }
+      if (stopNode instanceof Text) {
+        return this.focus();
+      }
+      this.saveUndoState(range);
+      moveRangeBoundariesUpTree(range, stopNode, stopNode, root);
+      const startContainer = range.startContainer;
+      let startOffset = range.startOffset;
+      const endContainer = range.endContainer;
+      let endOffset = range.endOffset;
+      const formattedNodes = document.createDocumentFragment();
+      const cleanNodes = document.createDocumentFragment();
+      const nodeAfterSplit = split(endContainer, endOffset, stopNode, root);
+      let nodeInSplit = split(startContainer, startOffset, stopNode, root);
+      let nextNode;
+      while (nodeInSplit !== nodeAfterSplit) {
+        nextNode = nodeInSplit.nextSibling;
+        formattedNodes.appendChild(nodeInSplit);
+        nodeInSplit = nextNode;
+      }
+      this._removeFormatting(formattedNodes, cleanNodes);
+      cleanNodes.normalize();
+      nodeInSplit = cleanNodes.firstChild;
+      nextNode = cleanNodes.lastChild;
+      if (nodeInSplit) {
+        stopNode.insertBefore(cleanNodes, nodeAfterSplit);
+        const childNodes = Array.from(stopNode.childNodes);
+        startOffset = childNodes.indexOf(nodeInSplit);
+        endOffset = nextNode ? childNodes.indexOf(nextNode) + 1 : 0;
+      } else if (nodeAfterSplit) {
+        const childNodes = Array.from(stopNode.childNodes);
+        startOffset = childNodes.indexOf(nodeAfterSplit);
+        endOffset = startOffset;
+      }
+      range.setStart(stopNode, startOffset);
+      range.setEnd(stopNode, endOffset);
+      mergeInlines(stopNode, range);
+      moveRangeBoundariesDownTree(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+  };
+
+  // source/Legacy.ts
+  window.Squire2 = Squire;
+})();
diff --git a/plugins/compact-composer/screenshots/Screenshot1.png b/plugins/compact-composer/screenshots/Screenshot1.png
new file mode 100644
index 000000000..8e12904df
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot1.png differ
diff --git a/plugins/compact-composer/screenshots/Screenshot2.png b/plugins/compact-composer/screenshots/Screenshot2.png
new file mode 100644
index 000000000..81faa3889
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot2.png differ
diff --git a/plugins/compact-composer/screenshots/Screenshot3.png b/plugins/compact-composer/screenshots/Screenshot3.png
new file mode 100644
index 000000000..e8911800b
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot3.png differ
diff --git a/plugins/compact-composer/screenshots/Screenshot4.png b/plugins/compact-composer/screenshots/Screenshot4.png
new file mode 100644
index 000000000..72c4f8596
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot4.png differ
diff --git a/plugins/compact-composer/screenshots/Screenshot5.png b/plugins/compact-composer/screenshots/Screenshot5.png
new file mode 100644
index 000000000..85aa6d66f
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot5.png differ
diff --git a/plugins/compact-composer/screenshots/Screenshot6.png b/plugins/compact-composer/screenshots/Screenshot6.png
new file mode 100644
index 000000000..e2d140e4e
Binary files /dev/null and b/plugins/compact-composer/screenshots/Screenshot6.png differ
diff --git a/plugins/contacts-suggestions-example/ContactsExampleSuggestions.php b/plugins/contacts-suggestions-example/ContactsExampleSuggestions.php
deleted file mode 100644
index c87ed2f61..000000000
--- a/plugins/contacts-suggestions-example/ContactsExampleSuggestions.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-class ContactsExampleSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
-{
-	/**
-	 * @param \RainLoop\Model\Account $oAccount
-	 * @param string $sQuery
-	 * @param int $iLimit = 20
-	 *
-	 * @return array
-	 */
-	public function Process(RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
-	{
-		$aResult = array(
-			array($oAccount->Email(), ''),
-			array('email@domain.com', 'name')
-		);
-
-		return $aResult;
-	}
-}
diff --git a/plugins/contacts-suggestions-example/index.php b/plugins/contacts-suggestions-example/index.php
deleted file mode 100644
index 3e505c455..000000000
--- a/plugins/contacts-suggestions-example/index.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-class ContactsSuggestionsExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Custom Contacts Suggestions Example',
-		CATEGORY = 'General',
-		DESCRIPTION = 'Custom contacts suggestions example';
-
-	public function Init() : void
-	{
-		$this->addHook('main.fabrica', 'MainFabrica');
-	}
-
-	/**
-	 * @param string $sName
-	 * @param mixed $mResult
-	 */
-	public function MainFabrica($sName, &$mResult)
-	{
-		switch ($sName)
-		{
-			case 'suggestions':
-
-				if (!\is_array($mResult))
-				{
-					$mResult = array();
-				}
-
-				include_once __DIR__.'/ContactsExampleSuggestions.php';
-				$mResult[] = new ContactsExampleSuggestions();
-				break;
-		}
-	}
-}
diff --git a/plugins/custom-admin-settings-tab/index.php b/plugins/custom-admin-settings-tab/index.php
deleted file mode 100644
index 306db50fa..000000000
--- a/plugins/custom-admin-settings-tab/index.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-class CustomAdminSettingsTabPlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Custom Admin Settings',
-		CATEGORY = 'General',
-		DESCRIPTION = 'Custom admin settings example';
-
-	/**
-	 * @return void
-	 */
-	public function Init() : void
-	{
-		$this->UseLangs(true); // start use langs folder
-
-		$this->addJs('js/CustomAdminSettings.js', true); // add js file
-
-		$this->addJsonHook('JsonAdminGetData', 'JsonAdminGetData');
-
-		$this->addTemplate('templates/PluginCustomAdminSettingsTab.html', true);
-	}
-
-	/**
-	 * @return array
-	 */
-	public function JsonAdminGetData()
-	{
-		return $this->jsonResponse(__FUNCTION__, array(
-			'PHP' => phpversion()
-		));
-	}
-}
-
diff --git a/plugins/custom-admin-settings-tab/js/CustomAdminSettings.js b/plugins/custom-admin-settings-tab/js/CustomAdminSettings.js
deleted file mode 100644
index 20bd0d6f5..000000000
--- a/plugins/custom-admin-settings-tab/js/CustomAdminSettings.js
+++ /dev/null
@@ -1,44 +0,0 @@
-
-(function () {
-
-	if (!window.rl)
-	{
-		return;
-	}
-
-	/**
-	 * @constructor
-	 */
-	function CustomAdminSettings()
-	{
-		this.php = ko.observable('');
-
-		this.loading = ko.observable(false);
-	}
-
-	CustomAdminSettings.prototype.onBuild = function () // special function
-	{
-		var self = this;
-
-		this.loading(true);
-
-		rl.pluginRemoteRequest((iError, oData) => {
-
-			self.loading(false);
-
-			if (!iError) {
-				self.php(oData.Result.PHP || '');
-			}
-
-			if (rl.Enums.StorageResultType.Abort === iError) {
-				// show abort
-			}
-
-		}, 'JsonAdminGetData');
-
-	};
-
-	rl.addSettingsViewModelForAdmin(CustomAdminSettings, 'PluginCustomAdminSettingsTab',
-		'SETTINGS_CUSTOM_ADMIN_CUSTOM_TAB_PLUGIN/TAB_NAME', 'custom');
-
-}());
diff --git a/plugins/custom-admin-settings-tab/langs/en.ini b/plugins/custom-admin-settings-tab/langs/en.ini
deleted file mode 100644
index 3d81ab706..000000000
--- a/plugins/custom-admin-settings-tab/langs/en.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[SETTINGS_CUSTOM_ADMIN_CUSTOM_TAB_PLUGIN]
-TAB_NAME = "Custom Extension Tab"
-LEGEND_CUSTOM = "Custom Extension Tab (Example)"
-LABEL_PHP_VERSION = "PHP version"
diff --git a/plugins/custom-admin-settings-tab/langs/ru.ini b/plugins/custom-admin-settings-tab/langs/ru.ini
deleted file mode 100644
index 71fcee232..000000000
--- a/plugins/custom-admin-settings-tab/langs/ru.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[SETTINGS_CUSTOM_ADMIN_CUSTOM_TAB_PLUGIN]
-TAB_NAME = "Плагин"
-LEGEND_CUSTOM = "Плагин (Пример)"
-LABEL_PHP_VERSION = "PHP версия"
\ No newline at end of file
diff --git a/plugins/custom-auth-example/index.php b/plugins/custom-auth-example/index.php
deleted file mode 100644
index 242443500..000000000
--- a/plugins/custom-auth-example/index.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-class CustomAuthExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Custom Auth Example Extension',
-		VERSION = '2.1',
-		REQUIRED = '2.5.0',
-		CATEGORY = 'Login',
-		DESCRIPTION = 'Custom auth mechanism example';
-
-	public function Init() : void
-	{
-		$this->addHook('login.credentials', 'FilterLoginCredentials');
-	}
-
-	/**
-	 * @param string $sEmail
-	 * @param string $sLogin
-	 * @param string $sPassword
-	 *
-	 * @throws \RainLoop\Exceptions\ClientException
-	 */
-	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
-	{
-		// Your custom php logic
-		// You may change login credentials
-		if ('demo@snappymail.eu' === $sEmail)
-		{
-			$sEmail = 'user@snappymail.eu';
-			$sLogin = 'user@snappymail.eu';
-			$sPassword = 'super-puper-password';
-		}
-		else
-		{
-			// or throw auth exeption
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
-			// or
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountNotAllowed);
-			// or
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainNotAllowed);
-		}
-	}
-}
diff --git a/plugins/custom-login-mapping/index.php b/plugins/custom-login-mapping/index.php
index 2c76390b4..e7d287b5f 100644
--- a/plugins/custom-login-mapping/index.php
+++ b/plugins/custom-login-mapping/index.php
@@ -4,58 +4,53 @@ class CustomLoginMappingPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Custom Login Mapping',
-		VERSION = '2.1',
-		RELEASE = '2021-04-21',
-		REQUIRED = '2.5.0',
+		VERSION = '2.3',
+		RELEASE = '2024-09-21',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Enables custom usernames by email address.';
 
 	public function Init() : void
 	{
+		// Happens only at DoLogin | ServiceSso | DoAccountSetup
 		$this->addHook('login.credentials', 'FilterLoginCredentials');
 	}
 
 	/**
 	 * @param string $sEmail
-	 * @param string $sLogin
+	 * @param string $sImapUser
 	 * @param string $sPassword
+	 * @param string $sSmtpUser
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
 	{
 		$sMapping = \trim($this->Config()->Get('plugin', 'mapping', ''));
-		if (!empty($sMapping))
-		{
+		if (!empty($sMapping)) {
 			$aLines = \explode("\n", \preg_replace('/[\r\n\t\s]+/', "\n", $sMapping));
-			foreach ($aLines as $sLine)
-			{
-				if (false !== strpos($sLine, ':'))
-				{
-					$aData = \explode(':', $sLine, 2);
-					if (is_array($aData) && !empty($aData[0]) && isset($aData[1]))
-					{
-						$aData = \array_map('trim', $aData);
-						if ($sEmail === $aData[0] && 0 < strlen($aData[1]))
-						{
-							$sLogin = $aData[1];
-						}
+			foreach ($aLines as $sLine) {
+				$aData = \explode(':', $sLine, 3);
+				if (\is_array($aData) && isset($aData[1]) && \trim($aData[0]) === $sEmail) {
+					$aData = \array_map('trim', $aData);
+					if (\strlen($aData[1])) {
+						$sImapUser = $aData[1];
+					}
+					if (isset($aData[2]) && \strlen($aData[2])) {
+						$sSmtpUser = $aData[2];
 					}
 				}
 			}
 		}
 	}
 
-	/**
-	 * @return array
-	 */
 	protected function configMapping() : array
 	{
 		return array(
 			\RainLoop\Plugins\Property::NewInstance('mapping')->SetLabel('Mapping')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
-				->SetDescription('email:login mapping')
-				->SetDefaultValue("user@domain.com:user.bob\nadmin@domain.com:user.john")
+				->SetDescription('email:imap-login:smtp-login mapping')
+				->SetDefaultValue("user@domain.com:imapuser.bob:smtpuser.bob\nadmin@domain.com:imapuser.john")
 		);
 	}
 }
diff --git a/plugins/custom-settings-tab/index.php b/plugins/custom-settings-tab/index.php
deleted file mode 100644
index cee8ecf12..000000000
--- a/plugins/custom-settings-tab/index.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-class CustomSettingsTabPlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Custom Settings Tab',
-		CATEGORY = 'General',
-		DESCRIPTION = 'Example extension for custom settings tabs';
-
-	/**
-	 * @return void
-	 */
-	public function Init() : void
-	{
-		$this->UseLangs(true); // start use langs folder
-
-		$this->addJs('js/CustomUserSettings.js'); // add js file
-
-		$this->addJsonHook('JsonGetCustomUserData', 'JsonGetCustomUserData');
-		$this->addJsonHook('JsonSaveCustomUserData', 'JsonSaveCustomUserData');
-
-		$this->addTemplate('templates/PluginCustomSettingsTab.html');
-	}
-
-	/**
-	 * @return array
-	 */
-	public function JsonGetCustomUserData()
-	{
-		$aSettings = $this->getUserSettings();
-
-		$sUserFacebook = isset($aSettings['UserFacebook']) ? $aSettings['UserFacebook'] : '';
-		$sUserSkype = isset($aSettings['UserSkype']) ? $aSettings['UserSkype'] : '';
-
-		// or get user's data from your custom storage ( DB / LDAP / ... ).
-
-		\sleep(1);
-		return $this->jsonResponse(__FUNCTION__, array(
-			'UserFacebook' => $sUserFacebook,
-			'UserSkype' => $sUserSkype
-		));
-	}
-
-	/**
-	 * @return array
-	 */
-	public function JsonSaveCustomUserData()
-	{
-		$sUserFacebook = $this->jsonParam('UserFacebook');
-		$sUserSkype = $this->jsonParam('UserSkype');
-
-		// or put user's data to your custom storage ( DB / LDAP / ... ).
-
-		\sleep(1);
-		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings(array(
-			'UserFacebook' => $sUserFacebook,
-			'UserSkype' => $sUserSkype
-		)));
-	}
-
-}
-
diff --git a/plugins/custom-settings-tab/js/CustomUserSettings.js b/plugins/custom-settings-tab/js/CustomUserSettings.js
deleted file mode 100644
index 85b7f5241..000000000
--- a/plugins/custom-settings-tab/js/CustomUserSettings.js
+++ /dev/null
@@ -1,81 +0,0 @@
-
-(function () {
-
-	if (!window.rl)
-	{
-		return;
-	}
-
-	/**
-	 * @constructor
-	 */
-	function CustomUserSettings()
-	{
-		this.userSkype = ko.observable('');
-		this.userFacebook = ko.observable('');
-
-		this.loading = ko.observable(false);
-		this.saving = ko.observable(false);
-
-		this.savingOrLoading = ko.computed(function () {
-			return this.loading() || this.saving();
-		}, this);
-	}
-
-	CustomUserSettings.prototype.customJsonSaveData = function ()
-	{
-		var self = this;
-
-		if (this.saving())
-		{
-			return false;
-		}
-
-		this.saving(true);
-
-		rl.pluginRemoteRequest((iError, oData) => {
-
-			self.saving(false);
-
-			if (!iError)
-			{
-				// true
-			}
-			else if (rl.Enums.StorageResultType.Abort === iError) {
-				// show abort
-			}
-			else
-			{
-				// false
-			}
-
-		}, 'JsonSaveCustomUserData', {
-			'UserSkype': this.userSkype(),
-			'UserFacebook': this.userFacebook()
-		});
-	};
-
-	CustomUserSettings.prototype.onBuild = function () // special function
-	{
-		var self = this;
-
-		this.loading(true);
-
-		rl.pluginRemoteRequest((iError, oData) => {
-
-			self.loading(false);
-
-			if (!iError)
-			{
-				self.userSkype(oData.Result.UserSkype || '');
-				self.userFacebook(oData.Result.UserFacebook || '');
-			}
-
-		}, 'JsonGetCustomUserData');
-
-	};
-
-	rl.addSettingsViewModel(CustomUserSettings, 'PluginCustomSettingsTab',
-		'SETTINGS_CUSTOM_PLUGIN/TAB_NAME', 'custom');
-
-}());
diff --git a/plugins/custom-settings-tab/langs/en.ini b/plugins/custom-settings-tab/langs/en.ini
deleted file mode 100644
index cb517b757..000000000
--- a/plugins/custom-settings-tab/langs/en.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[SETTINGS_CUSTOM_PLUGIN]
-TAB_NAME = "Custom Extension"
-LEGEND_CUSTOM = "Custom Extension (Example)"
-LABEL_SKYPE = "Skype"
-LABEL_FACEBOOK = "Facebook"
-BUTTON_SAVE = "Save"
diff --git a/plugins/custom-settings-tab/langs/ru.ini b/plugins/custom-settings-tab/langs/ru.ini
deleted file mode 100644
index 6b275600c..000000000
--- a/plugins/custom-settings-tab/langs/ru.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[SETTINGS_CUSTOM_PLUGIN]
-TAB_NAME = "Плагин"
-LEGEND_CUSTOM = "Плагин (Пример)"
-LABEL_SKYPE = "Skype"
-LABEL_FACEBOOK = "Facebook"
-BUTTON_SAVE = "Сохранить"
\ No newline at end of file
diff --git a/plugins/demo-account/demo.js b/plugins/demo-account/demo.js
new file mode 100644
index 000000000..97edc3357
--- /dev/null
+++ b/plugins/demo-account/demo.js
@@ -0,0 +1,24 @@
+(rl => {
+	if (rl) {
+/*
+		addEventListener('rl-view-model', e => {
+			const view = e.detail;
+			if (view && 'Login' === view.viewModelTemplateID) {
+				view.email(rl.settings.get('DemoEmail'));
+				view.password('DemoPassword');
+			}
+		});
+*/
+		addEventListener('rl-vm-visible', e => {
+			const view = e.detail;
+			if (view && 'PopupsCompose' === view.viewModelTemplateID) {
+				view.to('<' + rl.settings.get('Email') + '>');
+//				view.to(view.from());
+			}
+			if (view && 'PopupsAsk' === view.viewModelTemplateID) {
+				view.passphrase('demo');
+			}
+		});
+	}
+
+})(window.rl);
diff --git a/plugins/demo-account/index.php b/plugins/demo-account/index.php
index b9ad74d1d..74a8cc675 100644
--- a/plugins/demo-account/index.php
+++ b/plugins/demo-account/index.php
@@ -5,7 +5,7 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 	const
 		NAME     = 'Demo Account Extension',
 		CATEGORY = 'Login',
-		REQUIRED = '2.14.0',
+		REQUIRED = '2.23',
 		DESCRIPTION = 'Extension to enable a demo account';
 
 	/**
@@ -13,9 +13,12 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 	 */
 	public function Init() : void
 	{
+		$this->addJs('demo.js');
+
 		$this->addHook('filter.app-data', 'FilterAppData');
 		$this->addHook('filter.action-params', 'FilterActionParams');
-		$this->addHook('json.action-pre-call', 'JsonActionPreCall');
+		$this->addHook('json.before-accountsetup', 'BeforeAccountSetup');
+		$this->addHook('json.after-accountsandidentities', 'AfterAccountsAndIdentities');
 		$this->addHook('filter.send-message', 'FilterSendMessage');
 		$this->addHook('main.fabrica', 'MainFabrica');
 	}
@@ -40,9 +43,9 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 	 */
 	public function FilterAppData($bAdmin, &$aResult)
 	{
-		if (!$bAdmin && \is_array($aResult) && isset($aResult['Auth']) && !$aResult['Auth']) {
+		if (!$bAdmin && \is_array($aResult) && empty($aResult['Auth'])) {
 			$aResult['DevEmail'] = $this->Config()->Get('plugin', 'email', $aResult['DevEmail']);
-			$aResult['DevPassword'] = APP_DUMMY;
+			$aResult['DevPassword'] = '********';
 		}
 	}
 
@@ -57,6 +60,17 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 		 && $this->Config()->Get('plugin', 'email') === $aActionParams['Email']) {
 			$aActionParams['Password'] = $this->Config()->Get('plugin', 'password');
 		}
+		else if ('DoFolderCreate' === $sMethodName || 'DoFolderRename' === $sMethodName) {
+			// Block spam https://github.com/the-djmaze/snappymail/issues/371
+			$latin = transliterator_transliterate('Any-Latin; Latin-ASCII; Lower()', $aActionParams['folder']);
+			if (false !== \strpos($latin, 'nigger')) {
+				\error_log("blocked {$sMethodName} {$aActionParams['folder']}");
+				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
+			}
+		}
+		else if ('DoFolderClear' === $sMethodName || 'DoMessageDelete' === $sMethodName) {
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
+		}
 	}
 
 	/**
@@ -70,10 +84,104 @@ class DemoAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return ($oAccount && $oAccount->Email() === $this->Config()->Get('plugin', 'email'));
 	}
 
-	public function JsonActionPreCall($sAction)
+	public function BeforeAccountSetup()
 	{
-		if ('AccountSetup' === $sAction && $this->isDemoAccount()) {
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
+		throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DemoAccountError);
+	}
+
+	public function AfterAccountsAndIdentities(&$aResponse)
+	{
+		foreach ($aResponse['Result']['Identities'] as &$idenity) {
+			$idenity['smimeKey'] = '-----BEGIN ENCRYPTED PRIVATE KEY-----
+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
+/ZYVVu8GG0wUcrvQizogAg==
+-----END ENCRYPTED PRIVATE KEY-----
+';
+			$idenity['smimeCertificate'] = '-----BEGIN CERTIFICATE-----
+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
+r7HREQ/4hof+B0bTZCma/l0n
+-----END CERTIFICATE-----
+';
 		}
 	}
 
diff --git a/plugins/demo-account/storage.php b/plugins/demo-account/storage.php
index 89d7be7f7..511bf4226 100644
--- a/plugins/demo-account/storage.php
+++ b/plugins/demo-account/storage.php
@@ -31,7 +31,27 @@ class DemoStorage extends \RainLoop\Providers\Storage\FileStorage
 			}
 		}
 
-		$sDataPath .= '/' . \RainLoop\Utils::fixName(\RainLoop\Utils::GetConnectionToken());
+		// $_COOKIE['smtoken']
+		if (empty($_COOKIE['smctoken'])) {
+			\SnappyMail\Cookies::set('smctoken', \base64_encode(\random_bytes(16)), 0, false);
+		}
+		$sDataPath .= '/' . \MailSo\Base\Utils::SecureFileName($_COOKIE['smctoken']);
+		if (!\is_dir($sDataPath) && \mkdir($sDataPath, 0700, true)) {
+			\file_put_contents("{$sDataPath}/settings",'{"RemoveColors":true,"ListInlineAttachments":true,"listGrouped":true}');
+			\file_put_contents("{$sDataPath}/settings_local",'{"UseThreads":true}');
+			if (\mkdir($sDataPath.'/.gnupg/private-keys-v1.d', 0700, true)) {
+				// AES
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/3106F4281F98D820114228FEF16B5BA0D78AA005.key"));
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/82CA239C482423D364BFD6DFC3E400B3B98AD66F.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/82CA239C482423D364BFD6DFC3E400B3B98AD66F.key"));
+				// ECC
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/5A1A6C7310D0508C68E8E74F15068301E83FD1AE.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/5A1A6C7310D0508C68E8E74F15068301E83FD1AE.key"));
+				\file_put_contents("{$sDataPath}/.gnupg/private-keys-v1.d/886921A7E06BE56F8E8C51797BB476BB26DF21BF.key",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/private-keys-v1.d/886921A7E06BE56F8E8C51797BB476BB26DF21BF.key"));
+
+				\file_put_contents("{$sDataPath}/.gnupg/pubring.kbx",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/pubring.kbx"));
+				\file_put_contents("{$sDataPath}/.gnupg/trustdb.gpg",file_get_contents("{$this->sDataPath}/demo.pgp/.gnupg/trustdb.gpg"));
+			}
+		}
+
 		if (StorageType::SIGN_ME === $iStorageType) {
 			$sDataPath .= '/.sign_me';
 		} else if (StorageType::SESSION === $iStorageType) {
diff --git a/plugins/example/ContactSuggestions.php b/plugins/example/ContactSuggestions.php
new file mode 100644
index 000000000..1bd3e17aa
--- /dev/null
+++ b/plugins/example/ContactSuggestions.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Plugins\Example;
+
+class ContactSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
+{
+//	use \MailSo\Log\Inherit;
+
+	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20) : array
+	{
+		return array(
+			array($oAccount->Email(), ''),
+			array('email@domain.com', 'name')
+		);
+	}
+}
diff --git a/plugins/example/LICENSE b/plugins/example/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/example/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/example/example.js b/plugins/example/example.js
index b1e323970..7d66ec9d8 100644
--- a/plugins/example/example.js
+++ b/plugins/example/example.js
@@ -1,22 +1,159 @@
 (rl => {
-	addEventListener('rl-view-model', e => {
+	/**
+	 * ViewModel class                    | class.viewModelTemplateID
+	 *   User & Admin:
+	 *     AskPopupView                   | PopupsAsk
+	 *     LanguagesPopupView             | PopupsLanguages
+	 *   User:
+	 *     LoginUserView                  | Login
+	 *     SystemDropDownUserView         | SystemDropDown
+	 *     MailFolderList                 | MailFolderList
+	 *     MailMessageList                | MailMessageList
+	 *     MailMessageView                | MailMessageView
+	 *     SettingsMenuUserView           | SettingsMenu
+	 *     SettingsPaneUserView           | SettingsPane
+	 *     UserSettingsAccounts           | SettingsAccounts
+	 *     UserSettingsContacts           | SettingsContacts
+	 *     UserSettingsFilters            | SettingsFilters
+	 *     UserSettingsFolders            | SettingsFolders
+	 *     UserSettingsGeneral            | SettingsGeneral
+	 *     UserSettingsSecurity           | SettingsSecurity
+	 *     UserSettingsThemes             | SettingsThemes
+	 *     AccountPopupView               | PopupsAccount
+	 *     AdvancedSearchPopupView        | PopupsAdvancedSearch
+	 *     ComposePopupView               | PopupsCompose
+	 *     ContactsPopupView              | PopupsContacts
+	 *     FolderPopupView                | PopupsFolder
+	 *     FolderClearPopupView           | PopupsFolderClear
+	 *     FolderCreatePopupView          | PopupsFolderCreate
+	 *     FolderSystemPopupView          | PopupsFolderSystem
+	 *     IdentityPopupView              | PopupsIdentity
+	 *     KeyboardShortcutsHelpPopupView | PopupsKeyboardShortcutsHelp
+	 *     OpenPgpGeneratePopupView       | PopupsOpenPgpGenerate
+	 *     OpenPgpImportPopupView         | PopupsOpenPgpImport
+	 *     OpenPgpKeyPopupView            | PopupsOpenPgpKey
+	 *     SMimeImportPopupView           | PopupsSMimeImport
+	 *   Admin:
+	 *     AdminLoginView                 | AdminLogin
+	 *     MenuSettingsAdminView          | AdminMenu
+	 *     PaneSettingsAdminView          | AdminPane
+	 *     AdminSettingsAbout             | AdminSettingsAbout
+	 *     AdminSettingsBranding          | AdminSettingsBranding
+	 *     AdminSettingsConfig            | AdminSettingsConfig
+	 *     AdminSettingsContacts          | AdminSettingsContacts
+	 *     AdminSettingsDomains           | AdminSettingsDomains
+	 *     AdminSettingsGeneral           | AdminSettingsGeneral
+	 *     AdminSettingsLogin             | AdminSettingsLogin
+	 *     AdminSettingsPackages          | AdminSettingsPackages
+	 *     AdminSettingsSecurity          | AdminSettingsSecurity
+	 *     DomainPopupView                | PopupsDomain
+	 *     DomainAliasPopupView           | PopupsDomainAlias
+	 *     PluginPopupView                | PopupsPlugin
+	 */
+
+	/**
+	 * Happens immediately after the ViewModel constructor
+	 * event.detail contains the ViewModel class
+	 */
+	addEventListener('rl-view-model.create', event => {
 		console.dir({
-			'rl-view-model': e.detail
+			'rl-view-model.create': event.detail
 		});
 	});
 
 	/**
-	 * e.detail value is one of:
+	 * Happens after the full build (vm.onBuild()) and contains viewModelDom
+	 * event.detail contains the ViewModel class
+	 */
+	addEventListener('rl-view-model', event => {
+		console.dir({
+			'rl-view-model': event.detail
+		});
+	});
+
+	/**
+	 * event.detail value is one of:
 	 *     0 = NoPreview
 	 *     1 = SidePreview
 	 *     2 = BottomPreview
 	 */
-	addEventListener('rl-layout', e => {
+	addEventListener('rl-layout', event => {
 		console.dir({
-			'rl-layout': e.detail
+			'rl-layout': event.detail
 		});
 	});
 
+	/**
+	 * event.detail contains the FormData
+	 * cancelable using event.preventDefault()
+	 */
+	addEventListener('sm-admin-login', event => {
+		console.dir({
+			'sm-admin-login': event.detail
+		});
+	});
+
+	/**
+	 * event.detail contains { error: int, data: {JSON response} }
+	 */
+	addEventListener('sm-admin-login-response', event => {
+		console.dir({
+			'sm-admin-login-response': event.detail
+		});
+	});
+
+	/**
+	 * event.detail contains the FormData
+	 * cancelable using event.preventDefault()
+	 */
+	addEventListener('sm-user-login', event => {
+		console.dir({
+			'sm-user-login': event.detail
+		});
+	});
+
+	/**
+	 * event.detail contains { error: int, data: {JSON response} }
+	 */
+	addEventListener('sm-user-login-response', event => {
+		console.dir({
+			'sm-user-login-response': event.detail
+		});
+	});
+
+	/**
+	 * event.detail contains the screenname
+	 * cancelable using event.preventDefault()
+	 * Options are:
+	 * - login (user or admin login screen)
+	 * - mailbox (user folders and messages, also like: mailbox/INBOX/test, mailbox/Sent)
+	 * - settings (user settings like: settings/accounts, settings/general, settings/filters)
+	 * - one of the admin sections (like: settings, domains, branding)
+	 */
+	addEventListener('sm-show-screen', event => {
+		console.dir({
+			'sm-show-screen': event.detail
+		});
+	});
+
+	/**
+	 * Use to show a specific message.
+	 */
+/*
+	dispatchEvent(
+		new CustomEvent(
+			'mailbox.message.show',
+			{
+				detail: {
+					folder: 'INBOX',
+					uid: 1
+				},
+				cancelable: false
+			}
+		)
+	);
+*/
+
 	class ExamplePopupView extends rl.pluginPopupView {
 		constructor() {
 			super('Example');
@@ -50,6 +187,7 @@
 		afterHide() {}
 	}
 
-	ExamplePopupView.showModal(['param1', 'param2']);
+	/** Show the modal popup */
+//	ExamplePopupView.showModal(['param1', 'param2']);
 
 })(window.rl);
diff --git a/plugins/example/index.php b/plugins/example/index.php
index 207e39949..761de22b4 100644
--- a/plugins/example/index.php
+++ b/plugins/example/index.php
@@ -1,7 +1,18 @@
 <?php
 
+use RainLoop\Model\Account;
+use MailSo\Imap\ImapClient;
+use MailSo\Imap\Settings as ImapSettings;
+use MailSo\Sieve\SieveClient;
+use MailSo\Sieve\Settings as SieveSettings;
+use MailSo\Smtp\SmtpClient;
+use MailSo\Smtp\Settings as SmtpSettings;
+use MailSo\Mime\Message as MimeMessage;
+
 class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 {
+//	use \MailSo\Log\Inherit;
+
 	const
 		NAME     = 'Example',
 		AUTHOR   = 'SnappyMail',
@@ -13,9 +24,10 @@ class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 		LICENSE  = 'MIT',
 		DESCRIPTION = '';
 
-/*
 	public function Init() : void
 	{
+		$this->addHook('main.fabrica', 'MainFabrica');
+/*
 		$this->addCss(string $sFile, bool $bAdminScope = false);
 		$this->addJs(string $sFile, bool $bAdminScope = false);
 		$this->addHook(string $sHookName, string $sFunctionName);
@@ -29,10 +41,369 @@ class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 
 		$this->addTemplate(string $sFile, bool $bAdminScope = false);
 		$this->addTemplateHook(string $sName, string $sPlace, string $sLocalTemplateName, bool $bPrepend = false);
-	}
 */
 
 /*
+		$this->addHook("json.before-{actionname}",          "jsonBefore{actionname}");
+		$this->addHook("json.after-{actionname}",           "jsonAfter{actionname}");
+
+		$this->addHook('login.credentials.step-1',          'loginCredentialsStep1');
+		$this->addHook('login.credentials.step-2',          'loginCredentialsStep2');
+		$this->addHook('login.credentials',                 'loginCredentials');
+		$this->addHook('login.success',                     'loginSuccess');
+		$this->addHook('imap.before-connect',               'imapBeforeConnect');
+		$this->addHook('imap.after-connect',                'imapAfterConnect');
+		$this->addHook('imap.before-login',                 'imapBeforeLogin');
+		$this->addHook('imap.after-login',                  'imapAfterLogin');
+		$this->addHook('imap.message-headers',              'imapMessageHeaders');
+		$this->addHook('sieve.before-connect',              'sieveBeforeConnect');
+		$this->addHook('sieve.after-connect',               'sieveAfterConnect');
+		$this->addHook('sieve.before-login',                'sieveBeforeLogin');
+		$this->addHook('sieve.after-login',                 'sieveAfterLogin');
+		$this->addHook('smtp.before-connect',               'smtpBeforeConnect');
+		$this->addHook('smtp.after-connect',                'smtpAfterConnect');
+		$this->addHook('smtp.before-login',                 'smtpBeforeLogin');
+		$this->addHook('smtp.after-login',                  'smtpAfterLogin');
+		$this->addHook('filter.account',                    'filterAccount');
+		$this->addHook('filter.action-params',              'filterActionParams');
+		$this->addHook('filter.app-data',                   'filterAppData');
+		$this->addHook('filter.application-config',         'filterApplicationConfig');
+		$this->addHook('filter.build-message',              'filterBuildMessage');
+		$this->addHook('filter.build-read-receipt-message', 'filterBuildReadReceiptMessage');
+		$this->addHook('filter.domain',                     'filterDomain');
+		$this->addHook('filter.fabrica',                    'filterFabrica');
+		$this->addHook('filter.http-paths',                 'filterHttpPaths');
+		$this->addHook('filter.language',                   'filterLanguage');
+		$this->addHook('filter.message-html',               'filterMessageHtml');
+		$this->addHook('filter.message-plain',              'filterMessagePlain');
+		$this->addHook('filter.message-rcpt',               'filterMessageRcpt');
+		$this->addHook('filter.read-receipt-message-plain', 'filterReadReceiptMessagePlain');
+		$this->addHook('filter.result-message',             'filterResultMessage');
+		$this->addHook('filter.save-message',               'filterSaveMessage');
+		$this->addHook('filter.send-message',               'filterSendMessage');
+		$this->addHook('filter.send-message-stream',        'filterSendMessageStream');
+		$this->addHook('filter.send-read-receipt-message',  'filterSendReadReceiptMessage');
+		$this->addHook('filter.smtp-from',                  'filterSmtpFrom');
+		$this->addHook('filter.smtp-hidden-rcpt',           'filterSmtpHiddenRcpt');
+		$this->addHook('filter.smtp-message-stream',        'filterSmtpMessageStream');
+		$this->addHook('filter.upload-response',            'filterUploadResponse');
+		$this->addHook('json.attachments',                  'jsonAttachments');
+		$this->addHook('json.suggestions-input-parameters', 'jsonSuggestionsInputParameters');
+		$this->addHook('main.content-security-policy',      'mainContentSecurityPolicy');
+		$this->addHook('main.fabrica',                      'mainFabrica');
+		$this->addHook('service.app-delay-start-begin',     'serviceAppDelayStartBegin');
+		$this->addHook('service.app-delay-start-end',       'serviceAppDelayStartEnd');
+*/
+
+		$this->UseLangs(true); // start use langs folder
+
+		$this->addJs('example.js'); // add js file
+		$this->addJs('example.js', true); // add js file
+
+		// User Settings tab
+		$this->addJs('js/ExampleUserSettings.js'); // add js file
+		$this->addJsonHook('JsonGetExampleUserData', 'JsonGetExampleUserData');
+		$this->addJsonHook('JsonSaveExampleUserData', 'JsonSaveExampleUserData');
+		$this->addTemplate('templates/ExampleUserSettingsTab.html');
+
+		// Admin Settings tab
+		$this->addJs('js/ExampleAdminSettings.js', true); // add js file
+		$this->addJsonHook('JsonAdminGetData', 'JsonAdminGetData', true);
+		$this->addTemplate('templates/ExampleAdminSettingsTab.html', true);
+	}
+
+	/**
+	 * @param mixed $mResult
+	 */
+	public function MainFabrica(string $sName, &$mResult)
+	{
+		switch ($sName) {
+			case 'files':
+			case 'storage':
+			case 'storage-local':
+			case 'settings':
+			case 'settings-local':
+			case 'login':
+			case 'domain':
+			case 'filters':
+			case 'address-book':
+			case 'identities':
+				break;
+
+			case 'suggestions':
+				if (!\is_array($mResult)) {
+					$mResult = array();
+				}
+				require_once __DIR__ . '/ContactsSuggestions.php';
+				$mResult[] = new \Plugins\Example\ContactSuggestions();
+				break;
+		}
+	}
+
+	public function JsonAdminGetData()
+	{
+		if (!($this->Manager()->Actions() instanceof \RainLoop\ActionsAdmin)
+		 || !$this->Manager()->Actions()->IsAdminLoggined()
+		) {
+			return $this->jsonResponse(__FUNCTION__, false);
+		}
+		return $this->jsonResponse(__FUNCTION__, array(
+			'PHP' => \phpversion()
+		));
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sLogin
+	 * @param string $sPassword
+	 *
+	 * @throws \RainLoop\Exceptions\ClientException
+	 */
+	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	{
+		// Your custom php logic
+		// You may change login credentials
+		if ('demo@snappymail.eu' === $sEmail)
+		{
+			$sEmail = 'user@snappymail.eu';
+			$sLogin = 'user@snappymail.eu';
+			$sPassword = 'super-duper-password';
+		}
+		else
+		{
+			// or throw auth exeption
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
+			// or
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountNotAllowed);
+			// or
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainNotAllowed);
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function JsonGetExampleUserData()
+	{
+		$aSettings = $this->getUserSettings();
+
+		$sUserFacebook = isset($aSettings['UserFacebook']) ? $aSettings['UserFacebook'] : '';
+		$sUserSkype = isset($aSettings['UserSkype']) ? $aSettings['UserSkype'] : '';
+
+		// or get user's data from your custom storage ( DB / LDAP / ... ).
+
+		\sleep(1);
+		return $this->jsonResponse(__FUNCTION__, array(
+			'UserFacebook' => $sUserFacebook,
+			'UserSkype' => $sUserSkype
+		));
+	}
+
+	/**
+	 * @return array
+	 */
+	public function JsonSaveExampleUserData()
+	{
+		$sUserFacebook = $this->jsonParam('UserFacebook');
+		$sUserSkype = $this->jsonParam('UserSkype');
+
+		// or put user's data to your custom storage ( DB / LDAP / ... ).
+
+		\sleep(1);
+		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings(array(
+			'UserFacebook' => $sUserFacebook,
+			'UserSkype' => $sUserSkype
+		)));
+	}
+
+/*
+	public function jsonBefore{actionname}(){};
+	public function jsonAfter{actionname}(array &$aResponse){};
+
+	public function loginCredentialsStep1(string &$sEmail)
+	{
+	}
+
+	public function loginCredentialsStep2(string &$sEmail, string &$sPassword)
+	{
+	}
+
+	public function loginCredentials(string &$sEmail, string &$sLogin, string &$sPassword)
+	{
+	}
+
+	public function loginSuccess(\RainLoop\Model\MainAccount $oAccount)
+	{
+	}
+
+	public function imapBeforeConnect(Account $oAccount, ImapClient $oImapClient, ImapSettings $oSettings)
+	{
+	}
+
+	public function imapAfterConnect(Account $oAccount, ImapClient $oImapClient, ImapSettings $oSettings)
+	{
+	}
+
+	public function imapBeforeLogin(Account $oAccount, ImapClient $oImapClient, ImapSettings $oSettings)
+	{
+	}
+
+	public function imapAfterLogin(Account $oAccount, ImapClient $oImapClient, bool $bSuccess, ImapSettings $oSettings)
+	{
+	}
+
+	public function imapMessageHeaders(array &$aHeaders)
+	{
+	}
+
+	public function sieveBeforeConnect(Account $oAccount, SieveClient $oSieveClient, SieveSettings $oSettings)
+	{
+	}
+
+	public function sieveAfterConnect(Account $oAccount, SieveClient $oSieveClient, SieveSettings $oSettings)
+	{
+	}
+
+	public function sieveBeforeLogin(Account $oAccount, SieveClient $oSieveClient, SieveSettings $oSettings)
+	{
+	}
+
+	public function sieveAfterLogin(Account $oAccount, SieveClient $oSieveClient, bool $bSuccess, SieveSettings $oSettings)
+	{
+	}
+
+	public function smtpBeforeConnect(Account $oAccount, SmtpClient $oSmtpClient, SmtpSettings $oSettings)
+	{
+	}
+
+	public function smtpAfterConnect(Account $oAccount, SmtpClient $oSmtpClient, SmtpSettings $oSettings)
+	{
+	}
+
+	public function smtpBeforeLogin(Account $oAccount, SmtpClient $oSmtpClient, SmtpSettings $oSettings)
+	{
+	}
+
+	public function smtpAfterLogin(Account $oAccount, SmtpClient $oSmtpClient, bool $bSuccess, SmtpSettings $oSettings)
+	{
+	}
+
+	public function filterAccount(Account $oAccount)
+	{
+	}
+
+	public function filterActionParams(string $sMethodName, array &$aCurrentActionParams)
+	{
+	}
+
+	public function filterAppData(bool $bAdmin, array &$aAppData)
+	{
+	}
+
+	public function filterApplicationConfig(\RainLoop\Config\Application $oConfig)
+	{
+	}
+
+	public function filterBuildMessage(MimeMessage $oMessage)
+	{
+	}
+
+	public function filterBuildReadReceiptMessage(MimeMessage $oMessage, Account $oAccount)
+	{
+	}
+
+	public function filterDomain(\RainLoop\Model\Domain $oDomain)
+	{
+	}
+
+	public function filterFabrica(string $sName, mixed &$mResult, Account $oAccount)
+	{
+	}
+
+	public function filterHttpPaths(array &$aPaths)
+	{
+	}
+
+	public function filterLanguage(string &$sLanguage, bool $bAdmin)
+	{
+	}
+
+	public function filterMessageHtml(Account $oAccount, MimeMessage $oMessage, string &$sTextConverted)
+	{
+	}
+
+	public function filterMessagePlain(Account $oAccount, MimeMessage $oMessage, string &$sTextConverted)
+	{
+	}
+
+	public function filterMessageRcpt(Account $oAccount, \MailSo\Mime\EmailCollection $oRcpt)
+	{
+	}
+
+	public function filterReadReceiptMessagePlain(Account $oAccount, MimeMessage $oMessage, string &$sText)
+	{
+	}
+
+	public function filterResultMessage(MimeMessage $oMessage)
+	{
+	}
+
+	public function filterSaveMessage(MimeMessage $oMessage)
+	{
+	}
+
+	public function filterSendMessage(MimeMessage $oMessage)
+	{
+	}
+
+	public function filterSendMessageStream(Account $oAccount, resource &$rMessageStream, int &$iMessageStreamSize)
+	{
+	}
+
+	public function filterSendReadReceiptMessage(MimeMessage $oMessage, Account $oAccount)
+	{
+	}
+
+	public function filterSmtpFrom(Account $oAccount, MimeMessage $oMessage, string &$sFrom)
+	{
+	}
+
+	public function filterSmtpHiddenRcpt(Account $oAccount, MimeMessage $oMessage, array &$aHiddenRcpt)
+	{
+	}
+
+	public function filterSmtpMessageStream(Account $oAccount, resource &$rMessageStream, int &$iMessageStreamSize)
+	{
+	}
+
+	public function filterUploadResponse(array &$aResponse)
+	{
+	}
+
+	public function jsonAttachments(\SnappyMail\AttachmentsAction $oData)
+	{
+	}
+
+	public function jsonSuggestionsInputParameters(string &$sQuery, int &$iLimit, Account $oAccount)
+	{
+	}
+
+	public function mainContentSecurityPolicy(\SnappyMail\HTTP\CSP $oCSP)
+	{
+	}
+
+	public function mainFabrica(string $sName, mixed &$mResult)
+	{
+	}
+
+	public function serviceAppDelayStartBegin()
+	{
+	}
+
+	public function serviceAppDelayStartEnd()
+	{
+	}
+
 	public function Config() : \RainLoop\Config\Plugin
 	public function Description() : string
 	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig) : void
@@ -53,7 +424,6 @@ class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	protected function configMapping() : array
 	protected function jsonResponse(string $sFunctionName, $mData)
-	protected function replaceTemplate(string $sFile, bool $bAdminScope = false) : self
 
 	$this->Manager()
 	$this->Manager()->Actions()
@@ -67,7 +437,7 @@ class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 	$this->Manager()->CompileCss(bool $bAdminScope = false) : string
 	$this->Manager()->CompileJs(bool $bAdminScope = false) : string
 	$this->Manager()->CompileTemplate(array &$aList, bool $bAdminScope = false) : void
-	$this->Manager()->InitAppData(bool $bAdmin, array &$aAppData, ?\RainLoop\Model\Account $oAccount = null) : self
+	$this->Manager()->InitAppData(bool $bAdmin, array &$aAppData, ?Account $oAccount = null) : self
 	$this->Manager()->AddHook(string $sHookName, $mCallbak) : self
 	$this->Manager()->AddCss(string $sFile, bool $bAdminScope = false) : self
 	$this->Manager()->AddJs(string $sFile, bool $bAdminScope = false) : self
@@ -85,8 +455,7 @@ class ExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 	$this->Manager()->ReadLang(string $sLang, array &$aLang) : self
 	$this->Manager()->IsEnabled() : bool
 	$this->Manager()->Count() : int
-	$this->Manager()->SetLogger(\MailSo\Log\Logger $oLogger) : self
-	$this->Manager()->WriteLog(string $sDesc, int $iType = \MailSo\Log\Enumerations\Type::INFO) : void
-	$this->Manager()->WriteException(string $sDesc, int $iType = \MailSo\Log\Enumerations\Type::INFO) : void
+	$this->Manager()->WriteLog(string $sDesc, int $iType = \LOG_INFO) : void
+	$this->Manager()->WriteException(string $sDesc, int $iType = \LOG_INFO) : void
 */
 }
diff --git a/plugins/example/js/ExampleAdminSettings.js b/plugins/example/js/ExampleAdminSettings.js
new file mode 100644
index 000000000..5a52ecfda
--- /dev/null
+++ b/plugins/example/js/ExampleAdminSettings.js
@@ -0,0 +1,37 @@
+
+(rl => { if (rl) {
+
+	class ExampleAdminSettings
+	{
+		constructor()
+		{
+			this.php = ko.observable('');
+			this.loading = ko.observable(false);
+		}
+
+		onBuild()
+		{
+			this.loading(true);
+
+			rl.pluginRemoteRequest((iError, oData) => {
+
+				this.loading(false);
+
+				if (iError) {
+					console.error({
+						iError: iError,
+						oData: oData
+					});
+				} else {
+					this.php(oData.Result.PHP || '');
+				}
+
+			}, 'JsonAdminGetData');
+
+		}
+	}
+
+	rl.addSettingsViewModelForAdmin(ExampleAdminSettings, 'ExampleAdminSettingsTab',
+		'SETTINGS_EXAMPLE_ADMIN_EXAMPLE_TAB_PLUGIN/TAB_NAME', 'Example');
+
+}})(window.rl);
diff --git a/plugins/example/js/ExampleUserSettings.js b/plugins/example/js/ExampleUserSettings.js
new file mode 100644
index 000000000..839e9e84a
--- /dev/null
+++ b/plugins/example/js/ExampleUserSettings.js
@@ -0,0 +1,68 @@
+
+(rl => { if (rl) {
+
+	class ExampleUserSettings
+	{
+		constructor()
+		{
+			this.userSkype = ko.observable('');
+			this.userFacebook = ko.observable('');
+
+			this.loading = ko.observable(false);
+			this.saving = ko.observable(false);
+
+			this.savingOrLoading = ko.computed(() => {
+				return this.loading() || this.saving();
+			});
+		}
+
+		exampleJsonSaveData()
+		{
+			if (!this.saving()) {
+				this.saving(true);
+
+				rl.pluginRemoteRequest((iError, oData) => {
+
+					this.saving(false);
+
+					if (iError) {
+						console.error({
+							iError: iError,
+							oData: oData
+						});
+					} else {
+						console.dir({
+							iError: iError,
+							oData: oData
+						});
+					}
+
+				}, 'JsonSaveExampleUserData', {
+					'UserSkype': this.userSkype(),
+					'UserFacebook': this.userFacebook()
+				});
+			}
+		}
+
+		onBuild()
+		{
+			this.loading(true);
+
+			rl.pluginRemoteRequest((iError, oData) => {
+
+				this.loading(false);
+
+				if (!iError) {
+					self.userSkype(oData.Result.UserSkype || '');
+					self.userFacebook(oData.Result.UserFacebook || '');
+				}
+
+			}, 'JsonGetExampleUserData');
+
+		}
+	}
+
+	rl.addSettingsViewModel(ExampleUserSettings, 'ExampleUserSettingsTab',
+		'SETTINGS_EXAMPLE_PLUGIN/TAB_NAME', 'Example');
+
+}})(window.rl);
diff --git a/plugins/example/langs/en.json b/plugins/example/langs/en.json
new file mode 100644
index 000000000..9c5f0c84c
--- /dev/null
+++ b/plugins/example/langs/en.json
@@ -0,0 +1,15 @@
+{
+	"SETTINGS_EXAMPLE_ADMIN_EXAMPLE_TAB_PLUGIN": {
+		"TAB_NAME": "Example Extension Tab",
+		"LEGEND_EXAMPLE": "Example Extension Tab (Example)",
+		"LABEL_PHP_VERSION": "PHP version"
+	},
+	"SETTINGS_EXAMPLE_PLUGIN": {
+		"TAB_NAME": "Example Extension",
+		"LEGEND_EXAMPLE": "Example Extension (Example)",
+		"LABEL_PHP_VERSION": "PHP version",
+		"LABEL_SKYPE": "Skype",
+		"LABEL_FACEBOOK": "Facebook",
+		"BUTTON_SAVE": "Save"
+	}
+}
diff --git a/plugins/custom-admin-settings-tab/templates/PluginCustomAdminSettingsTab.html b/plugins/example/templates/ExampleAdminSettingsTab.html
similarity index 64%
rename from plugins/custom-admin-settings-tab/templates/PluginCustomAdminSettingsTab.html
rename to plugins/example/templates/ExampleAdminSettingsTab.html
index cab9229a7..8fc98c5fc 100644
--- a/plugins/custom-admin-settings-tab/templates/PluginCustomAdminSettingsTab.html
+++ b/plugins/example/templates/ExampleAdminSettingsTab.html
@@ -1,17 +1,17 @@
 <div>
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_CUSTOM_ADMIN_CUSTOM_TAB_PLUGIN/LEGEND_CUSTOM"></span>
+			<span class="i18n" data-i18n="SETTINGS_EXAMPLE_ADMIN_EXAMPLE_TAB_PLUGIN/LEGEND_EXAMPLE"></span>
 			&nbsp;&nbsp;&nbsp;
 			<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: loading"></i>
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_CUSTOM_ADMIN_CUSTOM_TAB_PLUGIN/LABEL_PHP_VERSION"></span>
+				<span class="i18n" data-i18n="SETTINGS_EXAMPLE_ADMIN_EXAMPLE_TAB_PLUGIN/LABEL_PHP_VERSION"></span>
 			</label>
 			<div class="controls" style="padding-top: 5px">
 				<b data-bind="text: php"></b>
 			</div>
 		</div>
 	</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/plugins/custom-settings-tab/templates/PluginCustomSettingsTab.html b/plugins/example/templates/ExampleUserSettingsTab.html
similarity index 66%
rename from plugins/custom-settings-tab/templates/PluginCustomSettingsTab.html
rename to plugins/example/templates/ExampleUserSettingsTab.html
index 1b688168b..3bbfad069 100644
--- a/plugins/custom-settings-tab/templates/PluginCustomSettingsTab.html
+++ b/plugins/example/templates/ExampleUserSettingsTab.html
@@ -1,13 +1,13 @@
 <div>
 	<div class="form-horizontal">
 		<div class="legend">
-			<span class="i18n" data-i18n="SETTINGS_CUSTOM_PLUGIN/LEGEND_CUSTOM"></span>
+			<span class="i18n" data-i18n="SETTINGS_EXAMPLE_PLUGIN/LEGEND_EXAMPLE"></span>
 			&nbsp;&nbsp;&nbsp;
 			<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: loading"></i>
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_CUSTOM_PLUGIN/LABEL_SKYPE"></span>
+				<span class="i18n" data-i18n="SETTINGS_EXAMPLE_PLUGIN/LABEL_SKYPE"></span>
 			</label>
 			<div class="controls">
 				<input type="text" data-bind="value: userSkype, enable: !savingOrLoading()" />
@@ -15,7 +15,7 @@
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span class="i18n" data-i18n="SETTINGS_CUSTOM_PLUGIN/LABEL_FACEBOOK"></span>
+				<span class="i18n" data-i18n="SETTINGS_EXAMPLE_PLUGIN/LABEL_FACEBOOK"></span>
 			</label>
 			<div class="controls">
 				<input type="text" data-bind="value: userFacebook, enable: !savingOrLoading()" />
@@ -23,10 +23,10 @@
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<button class="btn" data-bind="click: customJsonSaveData, enable: !savingOrLoading()">
+				<button class="btn" data-bind="click: exampleJsonSaveData, enable: !savingOrLoading()">
 					<i data-bind="css: {'icon-floppy': !saving(), 'icon-spinner animated': saving()}" class="icon-floppy"></i>
 					&nbsp;&nbsp;
-					<span class="i18n" data-i18n="SETTINGS_CUSTOM_PLUGIN/BUTTON_SAVE"></span>
+					<span class="i18n" data-i18n="SETTINGS_EXAMPLE_PLUGIN/BUTTON_SAVE"></span>
 				</button>
 			</div>
 		</div>
diff --git a/plugins/haveibeenpwned/hibp.js b/plugins/haveibeenpwned/hibp.js
new file mode 100644
index 000000000..98c8c5d06
--- /dev/null
+++ b/plugins/haveibeenpwned/hibp.js
@@ -0,0 +1,25 @@
+(doc => {
+
+	addEventListener('rl-view-model.create', event => {
+		if ('SettingsSecurity' === event.detail.viewModelTemplateID) {
+			const template = doc.getElementById('SettingsSecurity'),
+				details = doc.createElement('details'),
+				summary = doc.createElement('summary'),
+				button = doc.createElement('button');
+			summary.textContent = "Have i been pwned?"
+			button.dataset.bind = "click:HibpCheck";
+			button.textContent = "Check";
+			details.append(summary, button);
+			template.content.append(details);
+
+			event.detail.HibpCheck = () => {
+				// JsonHibpCheck
+				rl.pluginRemoteRequest((iError, oData) => {
+					console.dir({iError, oData});
+				}, 'HibpCheck');
+
+			};
+		}
+	});
+
+})(document);
diff --git a/plugins/haveibeenpwned/index.php b/plugins/haveibeenpwned/index.php
new file mode 100644
index 000000000..7e22f707d
--- /dev/null
+++ b/plugins/haveibeenpwned/index.php
@@ -0,0 +1,57 @@
+<?php
+/**
+ * https://haveibeenpwned.com/API/v3
+ */
+
+use SnappyMail\Hibp;
+use SnappyMail\SensitiveString;
+
+class HaveibeenpwnedPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+//	use \MailSo\Log\Inherit;
+
+	const
+		NAME     = 'Have i been pwned',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '0.1',
+		RELEASE  = '2024-04-22',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'General',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Check if your passphrase or email address is in a data breach';
+
+	public function Init() : void
+	{
+//		$this->UseLangs(true);
+		$this->addJs('hibp.js');
+		$this->addJsonHook('HibpCheck');
+	}
+
+	public function HibpCheck()
+	{
+//		$oAccount = $this->Manager()->Actions()->GetAccount();
+		$oAccount = $this->Manager()->Actions()->getAccountFromToken();
+//		$oAccount = \RainLoop\Api::Actions()->getAccountFromToken();
+
+		$api_key = \trim($this->Config()->Get('plugin', 'hibp-api-key', ''));
+		$breaches = $api_key ? Hibp::account($api_key, $oAccount->Email()) : null;
+
+		$pwned = Hibp::password(new SensitiveString($oAccount->ImapPass()));
+
+		return $this->jsonResponse(__FUNCTION__, array(
+			'pwned' => $pwned,
+			'breaches' => $breaches
+		));
+	}
+
+	public function configMapping() : array
+	{
+		return [
+			\RainLoop\Plugins\Property::NewInstance("hibp-api-key")
+				->SetLabel('API key')
+				->SetDescription('https://haveibeenpwned.com/API/Key')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+		];
+	}
+}
diff --git a/plugins/ics-viewer/LICENSE b/plugins/ics-viewer/LICENSE
new file mode 100644
index 000000000..9e5e56cdd
--- /dev/null
+++ b/plugins/ics-viewer/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 SnappyMail
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/ics-viewer/ical.js b/plugins/ics-viewer/ical.js
new file mode 100644
index 000000000..97ec65305
--- /dev/null
+++ b/plugins/ics-viewer/ical.js
@@ -0,0 +1,9526 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+ICAL = (() => {
+
+/**
+ * Represents the BINARY value type, which contains extra methods for encoding and decoding.
+ *
+ * @memberof ICAL
+ */
+class Binary {
+  /**
+   * Creates a binary value from the given string.
+   *
+   * @param {String} aString        The binary value string
+   * @return {Binary}               The binary value instance
+   */
+  static fromString(aString) {
+    return new Binary(aString);
+  }
+
+  /**
+   * Creates a new ICAL.Binary instance
+   *
+   * @param {String} aValue     The binary data for this value
+   */
+  constructor(aValue) {
+    this.value = aValue;
+  }
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @default "binary"
+   * @constant
+   */
+  icaltype = "binary";
+
+  /**
+   * Base64 decode the current value
+   *
+   * @return {String}         The base64-decoded value
+   */
+  decodeValue() {
+    return this._b64_decode(this.value);
+  }
+
+  /**
+   * Encodes the passed parameter with base64 and sets the internal
+   * value to the result.
+   *
+   * @param {String} aValue      The raw binary value to encode
+   */
+  setEncodedValue(aValue) {
+    this.value = this._b64_encode(aValue);
+  }
+
+  _b64_encode(data) {
+    // http://kevin.vanzonneveld.net
+    // +   original by: Tyler Akins (http://rumkin.com)
+    // +   improved by: Bayron Guevara
+    // +   improved by: Thunder.m
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   bugfixed by: Pellentesque Malesuada
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   improved by: Rafał Kukawski (http://kukawski.pl)
+    // *     example 1: base64_encode('Kevin van Zonneveld');
+    // *     returns 1: 'S2V2aW4gdmFuIFpvbm5ldmVsZA=='
+    // mozilla has this native
+    // - but breaks in 2.0.0.12!
+    //if (typeof this.window['atob'] == 'function') {
+    //    return atob(data);
+    //}
+    let b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+              "abcdefghijklmnopqrstuvwxyz0123456789+/=";
+    let o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+      ac = 0,
+      enc = "",
+      tmp_arr = [];
+
+    if (!data) {
+      return data;
+    }
+
+    do { // pack three octets into four hexets
+      o1 = data.charCodeAt(i++);
+      o2 = data.charCodeAt(i++);
+      o3 = data.charCodeAt(i++);
+
+      bits = o1 << 16 | o2 << 8 | o3;
+
+      h1 = bits >> 18 & 0x3f;
+      h2 = bits >> 12 & 0x3f;
+      h3 = bits >> 6 & 0x3f;
+      h4 = bits & 0x3f;
+
+      // use hexets to index into b64, and append result to encoded string
+      tmp_arr[ac++] = b64.charAt(h1) + b64.charAt(h2) + b64.charAt(h3) + b64.charAt(h4);
+    } while (i < data.length);
+
+    enc = tmp_arr.join('');
+
+    let r = data.length % 3;
+
+    return (r ? enc.slice(0, r - 3) : enc) + '==='.slice(r || 3);
+
+  }
+
+  _b64_decode(data) {
+    // http://kevin.vanzonneveld.net
+    // +   original by: Tyler Akins (http://rumkin.com)
+    // +   improved by: Thunder.m
+    // +      input by: Aman Gupta
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +   bugfixed by: Onno Marsman
+    // +   bugfixed by: Pellentesque Malesuada
+    // +   improved by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // +      input by: Brett Zamir (http://brett-zamir.me)
+    // +   bugfixed by: Kevin van Zonneveld (http://kevin.vanzonneveld.net)
+    // *     example 1: base64_decode('S2V2aW4gdmFuIFpvbm5ldmVsZA==');
+    // *     returns 1: 'Kevin van Zonneveld'
+    // mozilla has this native
+    // - but breaks in 2.0.0.12!
+    //if (typeof this.window['btoa'] == 'function') {
+    //    return btoa(data);
+    //}
+    let b64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
+              "abcdefghijklmnopqrstuvwxyz0123456789+/=";
+    let o1, o2, o3, h1, h2, h3, h4, bits, i = 0,
+      ac = 0,
+      dec = "",
+      tmp_arr = [];
+
+    if (!data) {
+      return data;
+    }
+
+    data += '';
+
+    do { // unpack four hexets into three octets using index points in b64
+      h1 = b64.indexOf(data.charAt(i++));
+      h2 = b64.indexOf(data.charAt(i++));
+      h3 = b64.indexOf(data.charAt(i++));
+      h4 = b64.indexOf(data.charAt(i++));
+
+      bits = h1 << 18 | h2 << 12 | h3 << 6 | h4;
+
+      o1 = bits >> 16 & 0xff;
+      o2 = bits >> 8 & 0xff;
+      o3 = bits & 0xff;
+
+      if (h3 == 64) {
+        tmp_arr[ac++] = String.fromCharCode(o1);
+      } else if (h4 == 64) {
+        tmp_arr[ac++] = String.fromCharCode(o1, o2);
+      } else {
+        tmp_arr[ac++] = String.fromCharCode(o1, o2, o3);
+      }
+    } while (i < data.length);
+
+    dec = tmp_arr.join('');
+
+    return dec;
+  }
+
+  /**
+   * The string representation of this value
+   * @return {String}
+   */
+  toString() {
+    return this.value;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const DURATION_LETTERS = /([PDWHMTS]{1,1})/;
+const DATA_PROPS_TO_COPY = ["weeks", "days", "hours", "minutes", "seconds", "isNegative"];
+
+/**
+ * This class represents the "duration" value type, with various calculation
+ * and manipulation methods.
+ *
+ * @memberof ICAL
+ */
+class Duration {
+  /**
+   * Returns a new ICAL.Duration instance from the passed seconds value.
+   *
+   * @param {Number} aSeconds       The seconds to create the instance from
+   * @return {Duration}             The newly created duration instance
+   */
+  static fromSeconds(aSeconds) {
+    return (new Duration()).fromSeconds(aSeconds);
+  }
+
+  /**
+   * Checks if the given string is an iCalendar duration value.
+   *
+   * @param {String} value      The raw ical value
+   * @return {Boolean}          True, if the given value is of the
+   *                              duration ical type
+   */
+  static isValueString(string) {
+    return (string[0] === 'P' || string[1] === 'P');
+  }
+
+  /**
+   * Creates a new {@link ICAL.Duration} instance from the passed string.
+   *
+   * @param {String} aStr       The string to parse
+   * @return {Duration}         The created duration instance
+   */
+  static fromString(aStr) {
+    let pos = 0;
+    let dict = Object.create(null);
+    let chunks = 0;
+
+    while ((pos = aStr.search(DURATION_LETTERS)) !== -1) {
+      let type = aStr[pos];
+      let numeric = aStr.slice(0, Math.max(0, pos));
+      aStr = aStr.slice(pos + 1);
+
+      chunks += parseDurationChunk(type, numeric, dict);
+    }
+
+    if (chunks < 2) {
+      // There must be at least a chunk with "P" and some unit chunk
+      throw new Error(
+        'invalid duration value: Not enough duration components in "' + aStr + '"'
+      );
+    }
+
+    return new Duration(dict);
+  }
+
+  /**
+   * Creates a new ICAL.Duration instance from the given data object.
+   *
+   * @param {Object} aData                An object with members of the duration
+   * @param {Number=} aData.weeks         Duration in weeks
+   * @param {Number=} aData.days          Duration in days
+   * @param {Number=} aData.hours         Duration in hours
+   * @param {Number=} aData.minutes       Duration in minutes
+   * @param {Number=} aData.seconds       Duration in seconds
+   * @param {Boolean=} aData.isNegative   If true, the duration is negative
+   * @return {Duration}                   The createad duration instance
+   */
+  static fromData(aData) {
+    return new Duration(aData);
+  }
+
+  /**
+   * Creates a new ICAL.Duration instance.
+   *
+   * @param {Object} data                 An object with members of the duration
+   * @param {Number=} data.weeks          Duration in weeks
+   * @param {Number=} data.days           Duration in days
+   * @param {Number=} data.hours          Duration in hours
+   * @param {Number=} data.minutes        Duration in minutes
+   * @param {Number=} data.seconds        Duration in seconds
+   * @param {Boolean=} data.isNegative    If true, the duration is negative
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.fromData(data);
+  }
+
+  /**
+   * The weeks in this duration
+   * @type {Number}
+   * @default 0
+   */
+  weeks = 0;
+
+  /**
+   * The days in this duration
+   * @type {Number}
+   * @default 0
+   */
+  days = 0;
+
+  /**
+   * The days in this duration
+   * @type {Number}
+   * @default 0
+   */
+  hours = 0;
+
+  /**
+   * The minutes in this duration
+   * @type {Number}
+   * @default 0
+   */
+  minutes = 0;
+
+  /**
+   * The seconds in this duration
+   * @type {Number}
+   * @default 0
+   */
+  seconds = 0;
+
+  /**
+   * The seconds in this duration
+   * @type {Boolean}
+   * @default false
+   */
+  isNegative = false;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalduration"
+   */
+  icalclass = "icalduration";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "duration"
+   */
+  icaltype = "duration";
+
+  /**
+   * Returns a clone of the duration object.
+   *
+   * @return {Duration}      The cloned object
+   */
+  clone() {
+    return Duration.fromData(this);
+  }
+
+  /**
+   * The duration value expressed as a number of seconds.
+   *
+   * @return {Number}             The duration value in seconds
+   */
+  toSeconds() {
+    let seconds = this.seconds + 60 * this.minutes + 3600 * this.hours +
+                  86400 * this.days + 7 * 86400 * this.weeks;
+    return (this.isNegative ? -seconds : seconds);
+  }
+
+  /**
+   * Reads the passed seconds value into this duration object. Afterwards,
+   * members like {@link ICAL.Duration#days days} and {@link ICAL.Duration#weeks weeks} will be set up
+   * accordingly.
+   *
+   * @param {Number} aSeconds     The duration value in seconds
+   * @return {Duration}           Returns this instance
+   */
+  fromSeconds(aSeconds) {
+    let secs = Math.abs(aSeconds);
+
+    this.isNegative = (aSeconds < 0);
+    this.days = trunc(secs / 86400);
+
+    // If we have a flat number of weeks, use them.
+    if (this.days % 7 == 0) {
+      this.weeks = this.days / 7;
+      this.days = 0;
+    } else {
+      this.weeks = 0;
+    }
+
+    secs -= (this.days + 7 * this.weeks) * 86400;
+
+    this.hours = trunc(secs / 3600);
+    secs -= this.hours * 3600;
+
+    this.minutes = trunc(secs / 60);
+    secs -= this.minutes * 60;
+
+    this.seconds = secs;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData                An object with members of the duration
+   * @param {Number=} aData.weeks         Duration in weeks
+   * @param {Number=} aData.days          Duration in days
+   * @param {Number=} aData.hours         Duration in hours
+   * @param {Number=} aData.minutes       Duration in minutes
+   * @param {Number=} aData.seconds       Duration in seconds
+   * @param {Boolean=} aData.isNegative   If true, the duration is negative
+   */
+  fromData(aData) {
+    for (let prop of DATA_PROPS_TO_COPY) {
+      if (aData && prop in aData) {
+        this[prop] = aData[prop];
+      } else {
+        this[prop] = 0;
+      }
+    }
+  }
+
+  /**
+   * Resets the duration instance to the default values, i.e. PT0S
+   */
+  reset() {
+    this.isNegative = false;
+    this.weeks = 0;
+    this.days = 0;
+    this.hours = 0;
+    this.minutes = 0;
+    this.seconds = 0;
+  }
+
+  /**
+   * Compares the duration instance with another one.
+   *
+   * @param {Duration} aOther             The instance to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(aOther) {
+    let thisSeconds = this.toSeconds();
+    let otherSeconds = aOther.toSeconds();
+    return (thisSeconds > otherSeconds) - (thisSeconds < otherSeconds);
+  }
+
+  /**
+   * Normalizes the duration instance. For example, a duration with a value
+   * of 61 seconds will be normalized to 1 minute and 1 second.
+   */
+  normalize() {
+    this.fromSeconds(this.toSeconds());
+  }
+
+  /**
+   * The string representation of this duration.
+   * @return {String}
+   */
+  toString() {
+    if (this.toSeconds() == 0) {
+      return "PT0S";
+    } else {
+      let str = "";
+      if (this.isNegative) str += "-";
+      str += "P";
+      if (this.weeks) str += this.weeks + "W";
+      if (this.days) str += this.days + "D";
+
+      if (this.hours || this.minutes || this.seconds) {
+        str += "T";
+        if (this.hours) str += this.hours + "H";
+        if (this.minutes) str += this.minutes + "M";
+        if (this.seconds) str += this.seconds + "S";
+      }
+      return str;
+    }
+  }
+
+  /**
+   * The iCalendar string representation of this duration.
+   * @return {String}
+   */
+  toICALString() {
+    return this.toString();
+  }
+}
+
+/**
+ * Internal helper function to handle a chunk of a duration.
+ *
+ * @private
+ * @param {String} letter type of duration chunk
+ * @param {String} number numeric value or -/+
+ * @param {Object} dict target to assign values to
+ */
+function parseDurationChunk(letter, number, object) {
+  let type;
+  switch (letter) {
+    case 'P':
+      if (number && number === '-') {
+        object.isNegative = true;
+      } else {
+        object.isNegative = false;
+      }
+      // period
+      break;
+    case 'D':
+      type = 'days';
+      break;
+    case 'W':
+      type = 'weeks';
+      break;
+    case 'H':
+      type = 'hours';
+      break;
+    case 'M':
+      type = 'minutes';
+      break;
+    case 'S':
+      type = 'seconds';
+      break;
+    default:
+      // Not a valid chunk
+      return 0;
+  }
+
+  if (type) {
+    if (!number && number !== 0) {
+      throw new Error(
+        'invalid duration value: Missing number before "' + letter + '"'
+      );
+    }
+    let num = parseInt(number, 10);
+    if (isStrictlyNaN(num)) {
+      throw new Error(
+        'invalid duration value: Invalid number "' + number + '" before "' + letter + '"'
+      );
+    }
+    object[type] = num;
+  }
+
+  return 1;
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ */
+
+/**
+ * @classdesc
+ * iCalendar Time representation (similar to JS Date object).  Fully
+ * independent of system (OS) timezone / time.  Unlike JS Date, the month
+ * January is 1, not zero.
+ *
+ * @example
+ * var time = new ICAL.Time({
+ *   year: 2012,
+ *   month: 10,
+ *   day: 11
+ *   minute: 0,
+ *   second: 0,
+ *   isDate: false
+ * });
+ *
+ *
+ * @memberof ICAL
+*/
+class Time {
+  static _dowCache = {};
+  static _wnCache = {};
+
+  /**
+   * Returns the days in the given month
+   *
+   * @param {Number} month      The month to check
+   * @param {Number} year       The year to check
+   * @return {Number}           The number of days in the month
+   */
+  static daysInMonth(month, year) {
+    let _daysInMonth = [0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
+    let days = 30;
+
+    if (month < 1 || month > 12) return days;
+
+    days = _daysInMonth[month];
+
+    if (month == 2) {
+      days += Time.isLeapYear(year);
+    }
+
+    return days;
+  }
+
+  /**
+   * Checks if the year is a leap year
+   *
+   * @param {Number} year       The year to check
+   * @return {Boolean}          True, if the year is a leap year
+   */
+  static isLeapYear(year) {
+    if (year <= 1752) {
+      return ((year % 4) == 0);
+    } else {
+      return (((year % 4 == 0) && (year % 100 != 0)) || (year % 400 == 0));
+    }
+  }
+
+  /**
+   * Create a new ICAL.Time from the day of year and year. The date is returned
+   * in floating timezone.
+   *
+   * @param {Number} aDayOfYear     The day of year
+   * @param {Number} aYear          The year to create the instance in
+   * @return {Time}                 The created instance with the calculated date
+   */
+  static fromDayOfYear(aDayOfYear, aYear) {
+    let year = aYear;
+    let doy = aDayOfYear;
+    let tt = new Time();
+    tt.auto_normalize = false;
+    let is_leap = (Time.isLeapYear(year) ? 1 : 0);
+
+    if (doy < 1) {
+      year--;
+      is_leap = (Time.isLeapYear(year) ? 1 : 0);
+      doy += Time.daysInYearPassedMonth[is_leap][12];
+      return Time.fromDayOfYear(doy, year);
+    } else if (doy > Time.daysInYearPassedMonth[is_leap][12]) {
+      is_leap = (Time.isLeapYear(year) ? 1 : 0);
+      doy -= Time.daysInYearPassedMonth[is_leap][12];
+      year++;
+      return Time.fromDayOfYear(doy, year);
+    }
+
+    tt.year = year;
+    tt.isDate = true;
+
+    for (let month = 11; month >= 0; month--) {
+      if (doy > Time.daysInYearPassedMonth[is_leap][month]) {
+        tt.month = month + 1;
+        tt.day = doy - Time.daysInYearPassedMonth[is_leap][month];
+        break;
+      }
+    }
+
+    tt.auto_normalize = true;
+    return tt;
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date string, e.g 2015-01-02.
+   *
+   * @deprecated                Use {@link ICAL.Time.fromDateString} instead
+   * @param {String} str        The string to create from
+   * @return {Time}             The date/time instance
+   */
+  static fromStringv2(str) {
+    return new Time({
+      year: parseInt(str.slice(0, 4), 10),
+      month: parseInt(str.slice(5, 7), 10),
+      day: parseInt(str.slice(8, 10), 10),
+      isDate: true
+    });
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date string, e.g 2015-01-02.
+   *
+   * @param {String} aValue     The string to create from
+   * @return {Time}             The date/time instance
+   */
+  static fromDateString(aValue) {
+    // Dates should have no timezone.
+    // Google likes to sometimes specify Z on dates
+    // we specifically ignore that to avoid issues.
+
+    // YYYY-MM-DD
+    // 2012-10-10
+    return new Time({
+      year: strictParseInt(aValue.slice(0, 4)),
+      month: strictParseInt(aValue.slice(5, 7)),
+      day: strictParseInt(aValue.slice(8, 10)),
+      isDate: true
+    });
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date-time string, e.g
+   * 2015-01-02T03:04:05. If a property is specified, the timezone is set up
+   * from the property's TZID parameter.
+   *
+   * @param {String} aValue         The string to create from
+   * @param {Property=} prop        The property the date belongs to
+   * @return {Time}                 The date/time instance
+   */
+  static fromDateTimeString(aValue, prop) {
+    if (aValue.length < 19) {
+      throw new Error(
+        'invalid date-time value: "' + aValue + '"'
+      );
+    }
+
+    let zone;
+    let zoneId;
+
+    if (aValue[19] && aValue[19] === 'Z') {
+      zone = Timezone.utcTimezone;
+    } else if (prop) {
+      zoneId = prop.getParameter('tzid');
+
+      if (prop.parent) {
+        if (prop.parent.name === 'standard' || prop.parent.name === 'daylight') {
+          // Per RFC 5545 3.8.2.4 and 3.8.2.2, start/end date-times within
+          // these components MUST be specified in local time.
+          zone = Timezone.localTimezone;
+        } else if (zoneId) {
+          // If the desired time zone is defined within the component tree,
+          // fetch its definition and prefer that.
+          zone = prop.parent.getTimeZoneByID(zoneId);
+        }
+      }
+    }
+
+    const timeData = {
+      year: strictParseInt(aValue.slice(0, 4)),
+      month: strictParseInt(aValue.slice(5, 7)),
+      day: strictParseInt(aValue.slice(8, 10)),
+      hour: strictParseInt(aValue.slice(11, 13)),
+      minute: strictParseInt(aValue.slice(14, 16)),
+      second: strictParseInt(aValue.slice(17, 19)),
+    };
+
+    // Although RFC 5545 requires that all TZIDs used within a file have a
+    // corresponding time zone definition, we may not be parsing the full file
+    // or we may be dealing with a non-compliant file; in either case, we can
+    // check our own time zone service for the TZID in a last-ditch effort.
+    if (zoneId && !zone) {
+      timeData.timezone = zoneId;
+    }
+
+    // 2012-10-10T10:10:10(Z)?
+    return new Time(timeData, zone);
+  }
+
+  /**
+   * Returns a new ICAL.Time instance from a date or date-time string,
+   *
+   * @param {String} aValue         The string to create from
+   * @param {Property=} prop        The property the date belongs to
+   * @return {Time}                 The date/time instance
+   */
+  static fromString(aValue, aProperty) {
+    if (aValue.length > 10) {
+      return Time.fromDateTimeString(aValue, aProperty);
+    } else {
+      return Time.fromDateString(aValue);
+    }
+  }
+
+  /**
+   * Creates a new ICAL.Time instance from the given Javascript Date.
+   *
+   * @param {?Date} aDate             The Javascript Date to read, or null to reset
+   * @param {Boolean} [useUTC=false]  If true, the UTC values of the date will be used
+   */
+  static fromJSDate(aDate, useUTC) {
+    let tt = new Time();
+    return tt.fromJSDate(aDate, useUTC);
+  }
+
+  /**
+   * Creates a new ICAL.Time instance from the the passed data object.
+   *
+   * @param {Object} aData            Time initialization
+   * @param {Number=} aData.year      The year for this date
+   * @param {Number=} aData.month     The month for this date
+   * @param {Number=} aData.day       The day for this date
+   * @param {Number=} aData.hour      The hour for this date
+   * @param {Number=} aData.minute    The minute for this date
+   * @param {Number=} aData.second    The second for this date
+   * @param {Boolean=} aData.isDate   If true, the instance represents a date
+   *                                    (as opposed to a date-time)
+   * @param {Timezone=} aZone         Timezone this position occurs in
+   */
+  static fromData = function fromData(aData, aZone) {
+    let t = new Time();
+    return t.fromData(aData, aZone);
+  };
+
+  /**
+   * Creates a new ICAL.Time instance from the current moment.
+   * The instance is “floating” - has no timezone relation.
+   * To create an instance considering the time zone, call
+   * ICAL.Time.fromJSDate(new Date(), true)
+   * @return {Time}
+   */
+  static now() {
+    return Time.fromJSDate(new Date(), false);
+  }
+
+  /**
+   * Returns the date on which ISO week number 1 starts.
+   *
+   * @see Time#weekNumber
+   * @param {Number} aYear                  The year to search in
+   * @param {weekDay=} aWeekStart           The week start weekday, used for calculation.
+   * @return {Time}                         The date on which week number 1 starts
+   */
+  static weekOneStarts(aYear, aWeekStart) {
+    let t = Time.fromData({
+      year: aYear,
+      month: 1,
+      day: 1,
+      isDate: true
+    });
+
+    let dow = t.dayOfWeek();
+    let wkst = aWeekStart || Time.DEFAULT_WEEK_START;
+    if (dow > Time.THURSDAY) {
+      t.day += 7;
+    }
+    if (wkst > Time.THURSDAY) {
+      t.day -= 7;
+    }
+
+    t.day -= dow - wkst;
+
+    return t;
+  }
+
+  /**
+   * Get the dominical letter for the given year. Letters range from A - G for
+   * common years, and AG to GF for leap years.
+   *
+   * @param {Number} yr           The year to retrieve the letter for
+   * @return {String}             The dominical letter.
+   */
+  static getDominicalLetter(yr) {
+    let LTRS = "GFEDCBA";
+    let dom = (yr + (yr / 4 | 0) + (yr / 400 | 0) - (yr / 100 | 0) - 1) % 7;
+    let isLeap = Time.isLeapYear(yr);
+    if (isLeap) {
+      return LTRS[(dom + 6) % 7] + LTRS[dom];
+    } else {
+      return LTRS[dom];
+    }
+  }
+
+  static #epochTime = null;
+  /**
+   * January 1st, 1970 as an ICAL.Time.
+   * @type {Time}
+   * @constant
+   * @instance
+   */
+  static get epochTime() {
+    if (!this.#epochTime) {
+      this.#epochTime = Time.fromData({
+        year: 1970,
+        month: 1,
+        day: 1,
+        hour: 0,
+        minute: 0,
+        second: 0,
+        isDate: false,
+        timezone: "Z"
+      });
+    }
+    return this.#epochTime;
+  }
+
+  static _cmp_attr(a, b, attr) {
+    if (a[attr] > b[attr]) return 1;
+    if (a[attr] < b[attr]) return -1;
+    return 0;
+  }
+
+  /**
+   * The days that have passed in the year after a given month. The array has
+   * two members, one being an array of passed days for non-leap years, the
+   * other analog for leap years.
+   * @example
+   * var isLeapYear = ICAL.Time.isLeapYear(year);
+   * var passedDays = ICAL.Time.daysInYearPassedMonth[isLeapYear][month];
+   * @type {Array.<Array.<Number>>}
+   */
+  static daysInYearPassedMonth = [
+    [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365],
+    [0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366]
+  ];
+
+  static SUNDAY = 1;
+  static MONDAY = 2;
+  static TUESDAY = 3;
+  static WEDNESDAY = 4;
+  static THURSDAY = 5;
+  static FRIDAY = 6;
+  static SATURDAY = 7;
+
+  /**
+   * The default weekday for the WKST part.
+   * @constant
+   * @default ICAL.Time.MONDAY
+   */
+  static DEFAULT_WEEK_START = 2; // MONDAY
+
+  /**
+   * Creates a new ICAL.Time instance.
+   *
+   * @param {Object} data           Time initialization
+   * @param {Number=} data.year     The year for this date
+   * @param {Number=} data.month    The month for this date
+   * @param {Number=} data.day      The day for this date
+   * @param {Number=} data.hour     The hour for this date
+   * @param {Number=} data.minute   The minute for this date
+   * @param {Number=} data.second   The second for this date
+   * @param {Boolean=} data.isDate  If true, the instance represents a date (as
+   *                                  opposed to a date-time)
+   * @param {Timezone} zone         timezone this position occurs in
+   */
+  constructor(data, zone) {
+    this.wrappedJSObject = this;
+    let time = this._time = Object.create(null);
+
+    /* time defaults */
+    time.year = 0;
+    time.month = 1;
+    time.day = 1;
+    time.hour = 0;
+    time.minute = 0;
+    time.second = 0;
+    time.isDate = false;
+
+    this.fromData(data, zone);
+  }
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icaltime"
+   */
+  icalclass = "icaltime";
+  _cachedUnixTime = null;
+
+  /**
+   * The type name, to be used in the jCal object. This value may change and
+   * is strictly defined by the {@link ICAL.Time#isDate isDate} member.
+   * @type {String}
+   * @default "date-time"
+   */
+  get icaltype() {
+    return this.isDate ? 'date' : 'date-time';
+  }
+
+  /**
+   * The timezone for this time.
+   * @type {Timezone}
+   */
+  zone = null;
+
+  /**
+   * Internal uses to indicate that a change has been made and the next read
+   * operation must attempt to normalize the value (for example changing the
+   * day to 33).
+   *
+   * @type {Boolean}
+   * @private
+   */
+  _pendingNormalization = false;
+
+  /**
+   * Returns a clone of the time object.
+   *
+   * @return {Time}              The cloned object
+   */
+  clone() {
+    return new Time(this._time, this.zone);
+  }
+
+  /**
+   * Reset the time instance to epoch time
+   */
+  reset() {
+    this.fromData(Time.epochTime);
+    this.zone = Timezone.utcTimezone;
+  }
+
+  /**
+   * Reset the time instance to the given date/time values.
+   *
+   * @param {Number} year             The year to set
+   * @param {Number} month            The month to set
+   * @param {Number} day              The day to set
+   * @param {Number} hour             The hour to set
+   * @param {Number} minute           The minute to set
+   * @param {Number} second           The second to set
+   * @param {Timezone} timezone       The timezone to set
+   */
+  resetTo(year, month, day, hour, minute, second, timezone) {
+    this.fromData({
+      year: year,
+      month: month,
+      day: day,
+      hour: hour,
+      minute: minute,
+      second: second,
+      zone: timezone
+    });
+  }
+
+  /**
+   * Set up the current instance from the Javascript date value.
+   *
+   * @param {?Date} aDate             The Javascript Date to read, or null to reset
+   * @param {Boolean} [useUTC=false]  If true, the UTC values of the date will be used
+   */
+  fromJSDate(aDate, useUTC) {
+    if (!aDate) {
+      this.reset();
+    } else {
+      if (useUTC) {
+        this.zone = Timezone.utcTimezone;
+        this.year = aDate.getUTCFullYear();
+        this.month = aDate.getUTCMonth() + 1;
+        this.day = aDate.getUTCDate();
+        this.hour = aDate.getUTCHours();
+        this.minute = aDate.getUTCMinutes();
+        this.second = aDate.getUTCSeconds();
+      } else {
+        this.zone = Timezone.localTimezone;
+        this.year = aDate.getFullYear();
+        this.month = aDate.getMonth() + 1;
+        this.day = aDate.getDate();
+        this.hour = aDate.getHours();
+        this.minute = aDate.getMinutes();
+        this.second = aDate.getSeconds();
+      }
+    }
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData            Time initialization
+   * @param {Number=} aData.year      The year for this date
+   * @param {Number=} aData.month     The month for this date
+   * @param {Number=} aData.day       The day for this date
+   * @param {Number=} aData.hour      The hour for this date
+   * @param {Number=} aData.minute    The minute for this date
+   * @param {Number=} aData.second    The second for this date
+   * @param {Boolean=} aData.isDate   If true, the instance represents a date
+   *                                    (as opposed to a date-time)
+   * @param {Timezone=} aZone         Timezone this position occurs in
+   */
+  fromData(aData, aZone) {
+    if (aData) {
+      for (let [key, value] of Object.entries(aData)) {
+          // ical type cannot be set
+          if (key === 'icaltype') continue;
+        this[key] = value;
+      }
+    }
+
+    if (aZone) {
+      this.zone = aZone;
+    }
+
+    if (aData && !("isDate" in aData)) {
+      this.isDate = !("hour" in aData);
+    } else if (aData && ("isDate" in aData)) {
+      this.isDate = aData.isDate;
+    }
+
+    if (aData && "timezone" in aData) {
+      let zone = TimezoneService.get(
+        aData.timezone
+      );
+
+      this.zone = zone || Timezone.localTimezone;
+    }
+
+    if (aData && "zone" in aData) {
+      this.zone = aData.zone;
+    }
+
+    if (!this.zone) {
+      this.zone = Timezone.localTimezone;
+    }
+
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Calculate the day of week.
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {weekDay}
+   */
+  dayOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let dowCacheKey = (this.year << 12) + (this.month << 8) + (this.day << 3) + firstDow;
+    if (dowCacheKey in Time._dowCache) {
+      return Time._dowCache[dowCacheKey];
+    }
+
+    // Using Zeller's algorithm
+    let q = this.day;
+    let m = this.month + (this.month < 3 ? 12 : 0);
+    let Y = this.year - (this.month < 3 ? 1 : 0);
+
+    let h = (q + Y + trunc(((m + 1) * 26) / 10) + trunc(Y / 4));
+    { // eslint-disable-line no-constant-condition
+      h += trunc(Y / 100) * 6 + trunc(Y / 400);
+    }
+
+    // Normalize to 1 = wkst
+    h = ((h + 7 - firstDow) % 7) + 1;
+    Time._dowCache[dowCacheKey] = h;
+    return h;
+  }
+
+  /**
+   * Calculate the day of year.
+   * @return {Number}
+   */
+  dayOfYear() {
+    let is_leap = (Time.isLeapYear(this.year) ? 1 : 0);
+    let diypm = Time.daysInYearPassedMonth;
+    return diypm[is_leap][this.month - 1] + this.day;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * week. The resulting ICAL.Time instance is of icaltype date, even if this
+   * is a date-time.
+   *
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Time}      The start of the week (cloned)
+   */
+  startOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let result = this.clone();
+    result.day -= ((this.dayOfWeek() + 7 - firstDow) % 7);
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the week.
+   * The resulting ICAL.Time instance is of icaltype date, even if this is a
+   * date-time.
+   *
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Time}      The end of the week (cloned)
+   */
+  endOfWeek(aWeekStart) {
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let result = this.clone();
+    result.day += (7 - this.dayOfWeek() + firstDow - Time.SUNDAY) % 7;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * month. The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The start of the month (cloned)
+   */
+  startOfMonth() {
+    let result = this.clone();
+    result.day = 1;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the
+   * month.  The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The end of the month (cloned)
+   */
+  endOfMonth() {
+    let result = this.clone();
+    result.day = Time.daysInMonth(result.month, result.year);
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, rewound to the start of the
+   * year. The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The start of the year (cloned)
+   */
+  startOfYear() {
+    let result = this.clone();
+    result.day = 1;
+    result.month = 1;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * Returns a copy of the current date/time, shifted to the end of the
+   * year.  The resulting ICAL.Time instance is of icaltype date, even if
+   * this is a date-time.
+   *
+   * @return {Time}      The end of the year (cloned)
+   */
+  endOfYear() {
+    let result = this.clone();
+    result.day = 31;
+    result.month = 12;
+    result.isDate = true;
+    result.hour = 0;
+    result.minute = 0;
+    result.second = 0;
+    return result;
+  }
+
+  /**
+   * First calculates the start of the week, then returns the day of year for
+   * this date. If the day falls into the previous year, the day is zero or negative.
+   *
+   * @param {weekDay=} aFirstDayOfWeek
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Number}     The calculated day of year
+   */
+  startDoyWeek(aFirstDayOfWeek) {
+    let firstDow = aFirstDayOfWeek || Time.SUNDAY;
+    let delta = this.dayOfWeek() - firstDow;
+    if (delta < 0) delta += 7;
+    return this.dayOfYear() - delta;
+  }
+
+  /**
+   * Get the dominical letter for the current year. Letters range from A - G
+   * for common years, and AG to GF for leap years.
+   *
+   * @param {Number} yr           The year to retrieve the letter for
+   * @return {String}             The dominical letter.
+   */
+  getDominicalLetter() {
+    return Time.getDominicalLetter(this.year);
+  }
+
+  /**
+   * Finds the nthWeekDay relative to the current month (not day).  The
+   * returned value is a day relative the month that this month belongs to so
+   * 1 would indicate the first of the month and 40 would indicate a day in
+   * the following month.
+   *
+   * @param {Number} aDayOfWeek   Day of the week see the day name constants
+   * @param {Number} aPos         Nth occurrence of a given week day values
+   *        of 1 and 0 both indicate the first weekday of that type. aPos may
+   *        be either positive or negative
+   *
+   * @return {Number} numeric value indicating a day relative
+   *                   to the current month of this time object
+   */
+  nthWeekDay(aDayOfWeek, aPos) {
+    let daysInMonth = Time.daysInMonth(this.month, this.year);
+    let weekday;
+    let pos = aPos;
+
+    let start = 0;
+
+    let otherDay = this.clone();
+
+    if (pos >= 0) {
+      otherDay.day = 1;
+
+      // because 0 means no position has been given
+      // 1 and 0 indicate the same day.
+      if (pos != 0) {
+        // remove the extra numeric value
+        pos--;
+      }
+
+      // set current start offset to current day.
+      start = otherDay.day;
+
+      // find the current day of week
+      let startDow = otherDay.dayOfWeek();
+
+      // calculate the difference between current
+      // day of the week and desired day of the week
+      let offset = aDayOfWeek - startDow;
+
+
+      // if the offset goes into the past
+      // week we add 7 so it goes into the next
+      // week. We only want to go forward in time here.
+      if (offset < 0)
+        // this is really important otherwise we would
+        // end up with dates from in the past.
+        offset += 7;
+
+      // add offset to start so start is the same
+      // day of the week as the desired day of week.
+      start += offset;
+
+      // because we are going to add (and multiply)
+      // the numeric value of the day we subtract it
+      // from the start position so not to add it twice.
+      start -= aDayOfWeek;
+
+      // set week day
+      weekday = aDayOfWeek;
+    } else {
+
+      // then we set it to the last day in the current month
+      otherDay.day = daysInMonth;
+
+      // find the ends weekday
+      let endDow = otherDay.dayOfWeek();
+
+      pos++;
+
+      weekday = (endDow - aDayOfWeek);
+
+      if (weekday < 0) {
+        weekday += 7;
+      }
+
+      weekday = daysInMonth - weekday;
+    }
+
+    weekday += pos * 7;
+
+    return start + weekday;
+  }
+
+  /**
+   * Checks if current time is the nth weekday, relative to the current
+   * month.  Will always return false when rule resolves outside of current
+   * month.
+   *
+   * @param {weekDay} aDayOfWeek                 Day of week to check
+   * @param {Number} aPos                        Relative position
+   * @return {Boolean}                           True, if it is the nth weekday
+   */
+  isNthWeekDay(aDayOfWeek, aPos) {
+    let dow = this.dayOfWeek();
+
+    if (aPos === 0 && dow === aDayOfWeek) {
+      return true;
+    }
+
+    // get pos
+    let day = this.nthWeekDay(aDayOfWeek, aPos);
+
+    if (day === this.day) {
+      return true;
+    }
+
+    return false;
+  }
+
+  /**
+   * Calculates the ISO 8601 week number. The first week of a year is the
+   * week that contains the first Thursday. The year can have 53 weeks, if
+   * January 1st is a Friday.
+   *
+   * Note there are regions where the first week of the year is the one that
+   * starts on January 1st, which may offset the week number. Also, if a
+   * different week start is specified, this will also affect the week
+   * number.
+   *
+   * @see Time.weekOneStarts
+   * @param {weekDay} aWeekStart                  The weekday the week starts with
+   * @return {Number}                             The ISO week number
+   */
+  weekNumber(aWeekStart) {
+    let wnCacheKey = (this.year << 12) + (this.month << 8) + (this.day << 3) + aWeekStart;
+    if (wnCacheKey in Time._wnCache) {
+      return Time._wnCache[wnCacheKey];
+    }
+    // This function courtesty of Julian Bucknall, published under the MIT license
+    // http://www.boyet.com/articles/publishedarticles/calculatingtheisoweeknumb.html
+    // plus some fixes to be able to use different week starts.
+    let week1;
+
+    let dt = this.clone();
+    dt.isDate = true;
+    let isoyear = this.year;
+
+    if (dt.month == 12 && dt.day > 25) {
+      week1 = Time.weekOneStarts(isoyear + 1, aWeekStart);
+      if (dt.compare(week1) < 0) {
+        week1 = Time.weekOneStarts(isoyear, aWeekStart);
+      } else {
+        isoyear++;
+      }
+    } else {
+      week1 = Time.weekOneStarts(isoyear, aWeekStart);
+      if (dt.compare(week1) < 0) {
+        week1 = Time.weekOneStarts(--isoyear, aWeekStart);
+      }
+    }
+
+    let daysBetween = (dt.subtractDate(week1).toSeconds() / 86400);
+    let answer = trunc(daysBetween / 7) + 1;
+    Time._wnCache[wnCacheKey] = answer;
+    return answer;
+  }
+
+  /**
+   * Adds the duration to the current time. The instance is modified in
+   * place.
+   *
+   * @param {Duration} aDuration         The duration to add
+   */
+  addDuration(aDuration) {
+    let mult = (aDuration.isNegative ? -1 : 1);
+
+    // because of the duration optimizations it is much
+    // more efficient to grab all the values up front
+    // then set them directly (which will avoid a normalization call).
+    // So we don't actually normalize until we need it.
+    let second = this.second;
+    let minute = this.minute;
+    let hour = this.hour;
+    let day = this.day;
+
+    second += mult * aDuration.seconds;
+    minute += mult * aDuration.minutes;
+    hour += mult * aDuration.hours;
+    day += mult * aDuration.days;
+    day += mult * 7 * aDuration.weeks;
+
+    this.second = second;
+    this.minute = minute;
+    this.hour = hour;
+    this.day = day;
+
+    this._cachedUnixTime = null;
+  }
+
+  /**
+   * Subtract the date details (_excluding_ timezone).  Useful for finding
+   * the relative difference between two time objects excluding their
+   * timezone differences.
+   *
+   * @param {Time} aDate     The date to subtract
+   * @return {Duration}      The difference as a duration
+   */
+  subtractDate(aDate) {
+    let unixTime = this.toUnixTime() + this.utcOffset();
+    let other = aDate.toUnixTime() + aDate.utcOffset();
+    return Duration.fromSeconds(unixTime - other);
+  }
+
+  /**
+   * Subtract the date details, taking timezones into account.
+   *
+   * @param {Time} aDate  The date to subtract
+   * @return {Duration}   The difference in duration
+   */
+  subtractDateTz(aDate) {
+    let unixTime = this.toUnixTime();
+    let other = aDate.toUnixTime();
+    return Duration.fromSeconds(unixTime - other);
+  }
+
+  /**
+   * Compares the ICAL.Time instance with another one.
+   *
+   * @param {Duration} aOther        The instance to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(other) {
+    let a = this.toUnixTime();
+    let b = other.toUnixTime();
+
+    if (a > b) return 1;
+    if (b > a) return -1;
+    return 0;
+  }
+
+  /**
+   * Compares only the date part of this instance with another one.
+   *
+   * @param {Duration} other              The instance to compare with
+   * @param {Timezone} tz                 The timezone to compare in
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compareDateOnlyTz(other, tz) {
+    let a = this.convertToZone(tz);
+    let b = other.convertToZone(tz);
+    let rc = 0;
+
+    if ((rc = Time._cmp_attr(a, b, "year")) != 0) return rc;
+    if ((rc = Time._cmp_attr(a, b, "month")) != 0) return rc;
+    if ((rc = Time._cmp_attr(a, b, "day")) != 0) return rc;
+
+    return rc;
+  }
+
+  /**
+   * Convert the instance into another timezone. The returned ICAL.Time
+   * instance is always a copy.
+   *
+   * @param {Timezone} zone      The zone to convert to
+   * @return {Time}              The copy, converted to the zone
+   */
+  convertToZone(zone) {
+    let copy = this.clone();
+    let zone_equals = (this.zone.tzid == zone.tzid);
+
+    if (!this.isDate && !zone_equals) {
+      Timezone.convert_time(copy, this.zone, zone);
+    }
+
+    copy.zone = zone;
+    return copy;
+  }
+
+  /**
+   * Calculates the UTC offset of the current date/time in the timezone it is
+   * in.
+   *
+   * @return {Number}     UTC offset in seconds
+   */
+  utcOffset() {
+    if (this.zone == Timezone.localTimezone ||
+        this.zone == Timezone.utcTimezone) {
+      return 0;
+    } else {
+      return this.zone.utcOffset(this);
+    }
+  }
+
+  /**
+   * Returns an RFC 5545 compliant ical representation of this object.
+   *
+   * @return {String} ical date/date-time
+   */
+  toICALString() {
+    let string = this.toString();
+
+    if (string.length > 10) {
+      return design$1.icalendar.value['date-time'].toICAL(string);
+    } else {
+      return design$1.icalendar.value.date.toICAL(string);
+    }
+  }
+
+  /**
+   * The string representation of this date/time, in jCal form
+   * (including : and - separators).
+   * @return {String}
+   */
+  toString() {
+    let result = this.year + '-' +
+                 pad2(this.month) + '-' +
+                 pad2(this.day);
+
+    if (!this.isDate) {
+        result += 'T' + pad2(this.hour) + ':' +
+                  pad2(this.minute) + ':' +
+                  pad2(this.second);
+
+      if (this.zone === Timezone.utcTimezone) {
+        result += 'Z';
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Converts the current instance to a Javascript date
+   * @return {Date}
+   */
+  toJSDate() {
+    if (this.zone == Timezone.localTimezone) {
+      if (this.isDate) {
+        return new Date(this.year, this.month - 1, this.day);
+      } else {
+        return new Date(this.year, this.month - 1, this.day,
+                        this.hour, this.minute, this.second, 0);
+      }
+    } else {
+      return new Date(this.toUnixTime() * 1000);
+    }
+  }
+
+  _normalize() {
+    if (this._time.isDate) {
+      this._time.hour = 0;
+      this._time.minute = 0;
+      this._time.second = 0;
+    }
+    this.adjust(0, 0, 0, 0);
+
+    return this;
+  }
+
+  /**
+   * Adjust the date/time by the given offset
+   *
+   * @param {Number} aExtraDays       The extra amount of days
+   * @param {Number} aExtraHours      The extra amount of hours
+   * @param {Number} aExtraMinutes    The extra amount of minutes
+   * @param {Number} aExtraSeconds    The extra amount of seconds
+   * @param {Number=} aTime           The time to adjust, defaults to the
+   *                                    current instance.
+   */
+  adjust(aExtraDays, aExtraHours, aExtraMinutes, aExtraSeconds, aTime) {
+
+    let minutesOverflow, hoursOverflow,
+        daysOverflow = 0, yearsOverflow = 0;
+
+    let second, minute, hour, day;
+    let daysInMonth;
+
+    let time = aTime || this._time;
+
+    if (!time.isDate) {
+      second = time.second + aExtraSeconds;
+      time.second = second % 60;
+      minutesOverflow = trunc(second / 60);
+      if (time.second < 0) {
+        time.second += 60;
+        minutesOverflow--;
+      }
+
+      minute = time.minute + aExtraMinutes + minutesOverflow;
+      time.minute = minute % 60;
+      hoursOverflow = trunc(minute / 60);
+      if (time.minute < 0) {
+        time.minute += 60;
+        hoursOverflow--;
+      }
+
+      hour = time.hour + aExtraHours + hoursOverflow;
+
+      time.hour = hour % 24;
+      daysOverflow = trunc(hour / 24);
+      if (time.hour < 0) {
+        time.hour += 24;
+        daysOverflow--;
+      }
+    }
+
+
+    // Adjust month and year first, because we need to know what month the day
+    // is in before adjusting it.
+    if (time.month > 12) {
+      yearsOverflow = trunc((time.month - 1) / 12);
+    } else if (time.month < 1) {
+      yearsOverflow = trunc(time.month / 12) - 1;
+    }
+
+    time.year += yearsOverflow;
+    time.month -= 12 * yearsOverflow;
+
+    // Now take care of the days (and adjust month if needed)
+    day = time.day + aExtraDays + daysOverflow;
+
+    if (day > 0) {
+      for (;;) {
+        daysInMonth = Time.daysInMonth(time.month, time.year);
+        if (day <= daysInMonth) {
+          break;
+        }
+
+        time.month++;
+        if (time.month > 12) {
+          time.year++;
+          time.month = 1;
+        }
+
+        day -= daysInMonth;
+      }
+    } else {
+      while (day <= 0) {
+        if (time.month == 1) {
+          time.year--;
+          time.month = 12;
+        } else {
+          time.month--;
+        }
+
+        day += Time.daysInMonth(time.month, time.year);
+      }
+    }
+
+    time.day = day;
+
+    this._cachedUnixTime = null;
+    return this;
+  }
+
+  /**
+   * Sets up the current instance from unix time, the number of seconds since
+   * January 1st, 1970.
+   *
+   * @param {Number} seconds      The seconds to set up with
+   */
+  fromUnixTime(seconds) {
+    this.zone = Timezone.utcTimezone;
+    // We could use `fromJSDate` here, but this is about twice as fast.
+    // We could also clone `epochTime` and use `adjust` for a more
+    // ical.js-centric approach, but this is about 100 times as fast.
+    let date = new Date(seconds * 1000);
+    this.year = date.getUTCFullYear();
+    this.month = date.getUTCMonth() + 1;
+    this.day = date.getUTCDate();
+    if (this._time.isDate) {
+      this.hour = 0;
+      this.minute = 0;
+      this.second = 0;
+    } else {
+      this.hour = date.getUTCHours();
+      this.minute = date.getUTCMinutes();
+      this.second = date.getUTCSeconds();
+    }
+
+    this._cachedUnixTime = null;
+  }
+
+  /**
+   * Converts the current instance to seconds since January 1st 1970.
+   *
+   * @return {Number}         Seconds since 1970
+   */
+  toUnixTime() {
+    if (this._cachedUnixTime !== null) {
+      return this._cachedUnixTime;
+    }
+    let offset = this.utcOffset();
+
+    // we use the offset trick to ensure
+    // that we are getting the actual UTC time
+    let ms = Date.UTC(
+      this.year,
+      this.month - 1,
+      this.day,
+      this.hour,
+      this.minute,
+      this.second - offset
+    );
+
+    // seconds
+    this._cachedUnixTime = ms / 1000;
+    return this._cachedUnixTime;
+  }
+
+  /**
+   * Converts time to into Object which can be serialized then re-created
+   * using the constructor.
+   *
+   * @example
+   * // toJSON will automatically be called
+   * var json = JSON.stringify(mytime);
+   *
+   * var deserialized = JSON.parse(json);
+   *
+   * var time = new ICAL.Time(deserialized);
+   *
+   * @return {Object}
+   */
+  toJSON() {
+    let copy = [
+      'year',
+      'month',
+      'day',
+      'hour',
+      'minute',
+      'second',
+      'isDate'
+    ];
+
+    let result = Object.create(null);
+
+    let i = 0;
+    let len = copy.length;
+    let prop;
+
+    for (; i < len; i++) {
+      prop = copy[i];
+      result[prop] = this[prop];
+    }
+
+    if (this.zone) {
+      result.timezone = this.zone.tzid;
+    }
+
+    return result;
+  }
+}
+
+(function setupNormalizeAttributes() {
+  // This needs to run before any instances are created!
+  function defineAttr(attr) {
+    Object.defineProperty(Time.prototype, attr, {
+      get: function getTimeAttr() {
+        if (this._pendingNormalization) {
+          this._normalize();
+          this._pendingNormalization = false;
+        }
+
+        return this._time[attr];
+      },
+      set: function setTimeAttr(val) {
+        // Check if isDate will be set and if was not set to normalize date.
+        // This avoids losing days when seconds, minutes and hours are zeroed
+        // what normalize will do when time is a date.
+        if (attr === "isDate" && val && !this._time.isDate) {
+          this.adjust(0, 0, 0, 0);
+        }
+        this._cachedUnixTime = null;
+        this._pendingNormalization = true;
+        this._time[attr] = val;
+      }
+    });
+
+  }
+
+    defineAttr("year");
+    defineAttr("month");
+    defineAttr("day");
+    defineAttr("hour");
+    defineAttr("minute");
+    defineAttr("second");
+    defineAttr("isDate");
+})();
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").parserState} parserState
+ * Imports the 'parserState' type from the "types.js" module
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+const CHAR = /[^ \t]/;
+const VALUE_DELIMITER = ':';
+const PARAM_DELIMITER = ';';
+const PARAM_NAME_DELIMITER = '=';
+const DEFAULT_VALUE_TYPE$1 = 'unknown';
+const DEFAULT_PARAM_TYPE = 'text';
+const RFC6868_REPLACE_MAP$1 = { "^'": '"', "^n": "\n", "^^": "^" };
+
+/**
+ * Parses iCalendar or vCard data into a raw jCal object. Consult
+ * documentation on the {@tutorial layers|layers of parsing} for more
+ * details.
+ *
+ * @function ICAL.parse
+ * @memberof ICAL
+ * @variation function
+ * @todo Fix the API to be more clear on the return type
+ * @param {String} input      The string data to parse
+ * @return {Object|Object[]}  A single jCal object, or an array thereof
+ */
+function parse(input) {
+  let state = {};
+  let root = state.component = [];
+
+  state.stack = [root];
+
+  parse._eachLine(input, function(err, line) {
+    parse._handleContentLine(line, state);
+  });
+
+
+  // when there are still items on the stack
+  // throw a fatal error, a component was not closed
+  // correctly in that case.
+  if (state.stack.length > 1) {
+    throw new ParserError(
+      'invalid ical body. component began but did not end'
+    );
+  }
+
+  state = null;
+
+  return (root.length == 1 ? root[0] : root);
+}
+
+/**
+ * Parse an iCalendar property value into the jCal for a single property
+ *
+ * @function ICAL.parse.property
+ * @param {String} str
+ *   The iCalendar property string to parse
+ * @param {designSet=} designSet
+ *   The design data to use for this property
+ * @return {Object}
+ *   The jCal Object containing the property
+ */
+parse.property = function(str, designSet) {
+  let state = {
+    component: [[], []],
+    designSet: designSet || design$1.defaultSet
+  };
+  parse._handleContentLine(str, state);
+  return state.component[1][0];
+};
+
+/**
+ * Convenience method to parse a component. You can use ICAL.parse() directly
+ * instead.
+ *
+ * @function ICAL.parse.component
+ * @see ICAL.parse(function)
+ * @param {String} str    The iCalendar component string to parse
+ * @return {Object}       The jCal Object containing the component
+ */
+parse.component = function(str) {
+  return parse(str);
+};
+
+
+/**
+ * An error that occurred during parsing.
+ *
+ * @param {String} message        The error message
+ * @memberof ICAL.parse
+ * @extends {Error}
+ */
+class ParserError extends Error {
+  name = this.constructor.name;
+}
+
+// classes & constants
+parse.ParserError = ParserError;
+
+
+/**
+ * Handles a single line of iCalendar/vCard, updating the state.
+ *
+ * @private
+ * @function ICAL.parse._handleContentLine
+ * @param {String} line          The content line to process
+ * @param {parserState} state    The current state of the line parsing
+ */
+parse._handleContentLine = function(line, state) {
+  // break up the parts of the line
+  let valuePos = line.indexOf(VALUE_DELIMITER);
+  let paramPos = line.indexOf(PARAM_DELIMITER);
+
+  let lastParamIndex;
+  let lastValuePos;
+
+  // name of property or begin/end
+  let name;
+  let value;
+  // params is only overridden if paramPos !== -1.
+  // we can't do params = params || {} later on
+  // because it sacrifices ops.
+  let params = {};
+
+  /**
+   * Different property cases
+   *
+   *
+   * 1. RRULE:FREQ=foo
+   *    // FREQ= is not a param but the value
+   *
+   * 2. ATTENDEE;ROLE=REQ-PARTICIPANT;
+   *    // ROLE= is a param because : has not happened yet
+   */
+    // when the parameter delimiter is after the
+    // value delimiter then it is not a parameter.
+
+  if ((paramPos !== -1 && valuePos !== -1)) {
+    // when the parameter delimiter is after the
+    // value delimiter then it is not a parameter.
+    if (paramPos > valuePos) {
+      paramPos = -1;
+    }
+  }
+
+  let parsedParams;
+  if (paramPos !== -1) {
+    name = line.slice(0, Math.max(0, paramPos)).toLowerCase();
+    parsedParams = parse._parseParameters(line.slice(Math.max(0, paramPos)), 0, state.designSet);
+    if (parsedParams[2] == -1) {
+      throw new ParserError("Invalid parameters in '" + line + "'");
+    }
+    params = parsedParams[0];
+    lastParamIndex = parsedParams[1].length + parsedParams[2] + paramPos;
+    if ((lastValuePos =
+      line.slice(Math.max(0, lastParamIndex)).indexOf(VALUE_DELIMITER)) !== -1) {
+      value = line.slice(Math.max(0, lastParamIndex + lastValuePos + 1));
+    } else {
+      throw new ParserError("Missing parameter value in '" + line + "'");
+    }
+  } else if (valuePos !== -1) {
+    // without parmeters (BEGIN:VCAENDAR, CLASS:PUBLIC)
+    name = line.slice(0, Math.max(0, valuePos)).toLowerCase();
+    value = line.slice(Math.max(0, valuePos + 1));
+
+    if (name === 'begin') {
+      let newComponent = [value.toLowerCase(), [], []];
+      if (state.stack.length === 1) {
+        state.component.push(newComponent);
+      } else {
+        state.component[2].push(newComponent);
+      }
+      state.stack.push(state.component);
+      state.component = newComponent;
+      if (!state.designSet) {
+        state.designSet = design$1.getDesignSet(state.component[0]);
+      }
+      return;
+    } else if (name === 'end') {
+      state.component = state.stack.pop();
+      return;
+    }
+    // If it is not begin/end, then this is a property with an empty value,
+    // which should be considered valid.
+  } else {
+    /**
+     * Invalid line.
+     * The rational to throw an error is we will
+     * never be certain that the rest of the file
+     * is sane and it is unlikely that we can serialize
+     * the result correctly either.
+     */
+    throw new ParserError(
+      'invalid line (no token ";" or ":") "' + line + '"'
+    );
+  }
+
+  let valueType;
+  let multiValue = false;
+  let structuredValue = false;
+  let propertyDetails;
+  let splitName;
+  let ungroupedName;
+
+  // fetch the ungrouped part of the name
+  if (state.designSet.propertyGroups && name.indexOf('.') !== -1) {
+    splitName = name.split('.');
+    params.group = splitName[0];
+    ungroupedName = splitName[1];
+  } else {
+    ungroupedName = name;
+  }
+
+  if (ungroupedName in state.designSet.property) {
+    propertyDetails = state.designSet.property[ungroupedName];
+
+    if ('multiValue' in propertyDetails) {
+      multiValue = propertyDetails.multiValue;
+    }
+
+    if ('structuredValue' in propertyDetails) {
+      structuredValue = propertyDetails.structuredValue;
+    }
+
+    if (value && 'detectType' in propertyDetails) {
+      valueType = propertyDetails.detectType(value);
+    }
+  }
+
+  // attempt to determine value
+  if (!valueType) {
+    if (!('value' in params)) {
+      if (propertyDetails) {
+        valueType = propertyDetails.defaultType;
+      } else {
+        valueType = DEFAULT_VALUE_TYPE$1;
+      }
+    } else {
+      // possible to avoid this?
+      valueType = params.value.toLowerCase();
+    }
+  }
+
+  delete params.value;
+
+  /**
+   * Note on `var result` juggling:
+   *
+   * I observed that building the array in pieces has adverse
+   * effects on performance, so where possible we inline the creation.
+   * It is a little ugly but resulted in ~2000 additional ops/sec.
+   */
+
+  let result;
+  if (multiValue && structuredValue) {
+    value = parse._parseMultiValue(value, structuredValue, valueType, [], multiValue, state.designSet, structuredValue);
+    result = [ungroupedName, params, valueType, value];
+  } else if (multiValue) {
+    result = [ungroupedName, params, valueType];
+    parse._parseMultiValue(value, multiValue, valueType, result, null, state.designSet, false);
+  } else if (structuredValue) {
+    value = parse._parseMultiValue(value, structuredValue, valueType, [], null, state.designSet, structuredValue);
+    result = [ungroupedName, params, valueType, value];
+  } else {
+    value = parse._parseValue(value, valueType, state.designSet, false);
+    result = [ungroupedName, params, valueType, value];
+  }
+  // rfc6350 requires that in vCard 4.0 the first component is the VERSION
+  // component with as value 4.0, note that 3.0 does not have this requirement.
+  if (state.component[0] === 'vcard' && state.component[1].length === 0 &&
+          !(name === 'version' && value === '4.0')) {
+    state.designSet = design$1.getDesignSet("vcard3");
+  }
+  state.component[1].push(result);
+};
+
+/**
+ * Parse a value from the raw value into the jCard/jCal value.
+ *
+ * @private
+ * @function ICAL.parse._parseValue
+ * @param {String} value          Original value
+ * @param {String} type           Type of value
+ * @param {Object} designSet      The design data to use for this value
+ * @return {Object} varies on type
+ */
+parse._parseValue = function(value, type, designSet, structuredValue) {
+  if (type in designSet.value && 'fromICAL' in designSet.value[type]) {
+    return designSet.value[type].fromICAL(value, structuredValue);
+  }
+  return value;
+};
+
+/**
+ * Parse parameters from a string to object.
+ *
+ * @function ICAL.parse._parseParameters
+ * @private
+ * @param {String} line           A single unfolded line
+ * @param {Number} start         Position to start looking for properties
+ * @param {Object} designSet      The design data to use for this property
+ * @return {Object} key/value pairs
+ */
+parse._parseParameters = function(line, start, designSet) {
+  let lastParam = start;
+  let pos = 0;
+  let delim = PARAM_NAME_DELIMITER;
+  let result = {};
+  let name, lcname;
+  let value, valuePos = -1;
+  let type, multiValue, mvdelim;
+
+  // find the next '=' sign
+  // use lastParam and pos to find name
+  // check if " is used if so get value from "->"
+  // then increment pos to find next ;
+
+  while ((pos !== false) &&
+         (pos = line.indexOf(delim, pos + 1)) !== -1) {
+
+    name = line.slice(lastParam + 1, pos);
+    if (name.length == 0) {
+      throw new ParserError("Empty parameter name in '" + line + "'");
+    }
+    lcname = name.toLowerCase();
+    mvdelim = false;
+    multiValue = false;
+
+    if (lcname in designSet.param && designSet.param[lcname].valueType) {
+      type = designSet.param[lcname].valueType;
+    } else {
+      type = DEFAULT_PARAM_TYPE;
+    }
+
+    if (lcname in designSet.param) {
+      multiValue = designSet.param[lcname].multiValue;
+      if (designSet.param[lcname].multiValueSeparateDQuote) {
+        mvdelim = parse._rfc6868Escape('"' + multiValue + '"');
+      }
+    }
+
+    let nextChar = line[pos + 1];
+    if (nextChar === '"') {
+      valuePos = pos + 2;
+      pos = line.indexOf('"', valuePos);
+      if (multiValue && pos != -1) {
+          let extendedValue = true;
+          while (extendedValue) {
+            if (line[pos + 1] == multiValue && line[pos + 2] == '"') {
+              pos = line.indexOf('"', pos + 3);
+            } else {
+              extendedValue = false;
+            }
+          }
+        }
+      if (pos === -1) {
+        throw new ParserError(
+          'invalid line (no matching double quote) "' + line + '"'
+        );
+      }
+      value = line.slice(valuePos, pos);
+      lastParam = line.indexOf(PARAM_DELIMITER, pos);
+      let propValuePos = line.indexOf(VALUE_DELIMITER, pos);
+      // if either no next parameter or delimeter in property value, let's stop here
+      if (lastParam === -1 || (propValuePos !== -1 && lastParam > propValuePos)) {
+        pos = false;
+      }
+    } else {
+      valuePos = pos + 1;
+
+      // move to next ";"
+      let nextPos = line.indexOf(PARAM_DELIMITER, valuePos);
+      let propValuePos = line.indexOf(VALUE_DELIMITER, valuePos);
+      if (propValuePos !== -1 && nextPos > propValuePos) {
+        // this is a delimiter in the property value, let's stop here
+        nextPos = propValuePos;
+        pos = false;
+      } else if (nextPos === -1) {
+        // no ";"
+        if (propValuePos === -1) {
+          nextPos = line.length;
+        } else {
+          nextPos = propValuePos;
+        }
+        pos = false;
+      } else {
+        lastParam = nextPos;
+        pos = nextPos;
+      }
+
+      value = line.slice(valuePos, nextPos);
+    }
+
+    const length_before = value.length;
+    value = parse._rfc6868Escape(value);
+    valuePos += length_before - value.length;
+    if (multiValue) {
+      let delimiter = mvdelim || multiValue;
+      value = parse._parseMultiValue(value, delimiter, type, [], null, designSet);
+    } else {
+      value = parse._parseValue(value, type, designSet);
+    }
+
+    if (multiValue && (lcname in result)) {
+      if (Array.isArray(result[lcname])) {
+        result[lcname].push(value);
+      } else {
+        result[lcname] = [
+          result[lcname],
+          value
+        ];
+      }
+    } else {
+      result[lcname] = value;
+    }
+  }
+  return [result, value, valuePos];
+};
+
+/**
+ * Internal helper for rfc6868. Exposing this on ICAL.parse so that
+ * hackers can disable the rfc6868 parsing if the really need to.
+ *
+ * @function ICAL.parse._rfc6868Escape
+ * @param {String} val        The value to escape
+ * @return {String}           The escaped value
+ */
+parse._rfc6868Escape = function(val) {
+  return val.replace(/\^['n^]/g, function(x) {
+    return RFC6868_REPLACE_MAP$1[x];
+  });
+};
+
+/**
+ * Parse a multi value string. This function is used either for parsing
+ * actual multi-value property's values, or for handling parameter values. It
+ * can be used for both multi-value properties and structured value properties.
+ *
+ * @private
+ * @function ICAL.parse._parseMultiValue
+ * @param {String} buffer           The buffer containing the full value
+ * @param {String} delim            The multi-value delimiter
+ * @param {String} type             The value type to be parsed
+ * @param {Array.<?>} result        The array to append results to, varies on value type
+ * @param {String} innerMulti       The inner delimiter to split each value with
+ * @param {designSet} designSet     The design data for this value
+ * @return {?|Array.<?>}            Either an array of results, or the first result
+ */
+parse._parseMultiValue = function(buffer, delim, type, result, innerMulti, designSet, structuredValue) {
+  let pos = 0;
+  let lastPos = 0;
+  let value;
+  if (delim.length === 0) {
+    return buffer;
+  }
+
+  // split each piece
+  while ((pos = unescapedIndexOf(buffer, delim, lastPos)) !== -1) {
+    value = buffer.slice(lastPos, pos);
+    if (innerMulti) {
+      value = parse._parseMultiValue(value, innerMulti, type, [], null, designSet, structuredValue);
+    } else {
+      value = parse._parseValue(value, type, designSet, structuredValue);
+    }
+    result.push(value);
+    lastPos = pos + delim.length;
+  }
+
+  // on the last piece take the rest of string
+  value = buffer.slice(lastPos);
+  if (innerMulti) {
+    value = parse._parseMultiValue(value, innerMulti, type, [], null, designSet, structuredValue);
+  } else {
+    value = parse._parseValue(value, type, designSet, structuredValue);
+  }
+  result.push(value);
+
+  return result.length == 1 ? result[0] : result;
+};
+
+/**
+ * Process a complete buffer of iCalendar/vCard data line by line, correctly
+ * unfolding content. Each line will be processed with the given callback
+ *
+ * @private
+ * @function ICAL.parse._eachLine
+ * @param {String} buffer                         The buffer to process
+ * @param {function(?String, String)} callback    The callback for each line
+ */
+parse._eachLine = function(buffer, callback) {
+  let len = buffer.length;
+  let lastPos = buffer.search(CHAR);
+  let pos = lastPos;
+  let line;
+  let firstChar;
+
+  let newlineOffset;
+
+  do {
+    pos = buffer.indexOf('\n', lastPos) + 1;
+
+    if (pos > 1 && buffer[pos - 2] === '\r') {
+      newlineOffset = 2;
+    } else {
+      newlineOffset = 1;
+    }
+
+    if (pos === 0) {
+      pos = len;
+      newlineOffset = 0;
+    }
+
+    firstChar = buffer[lastPos];
+
+    if (firstChar === ' ' || firstChar === '\t') {
+      // add to line
+      line += buffer.slice(lastPos + 1, pos - newlineOffset);
+    } else {
+      if (line)
+        callback(null, line);
+      // push line
+      line = buffer.slice(lastPos, pos - newlineOffset);
+    }
+
+    lastPos = pos;
+  } while (pos !== len);
+
+  // extra ending line
+  line = line.trim();
+
+  if (line.length)
+    callback(null, line);
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const OPTIONS = ["tzid", "location", "tznames", "latitude", "longitude"];
+
+/**
+ * Timezone representation.
+ *
+ * @example
+ * var vcalendar;
+ * var timezoneComp = vcalendar.getFirstSubcomponent('vtimezone');
+ * var tzid = timezoneComp.getFirstPropertyValue('tzid');
+ *
+ * var timezone = new ICAL.Timezone({
+ *   component: timezoneComp,
+ *   tzid
+ * });
+ *
+ * @memberof ICAL
+ */
+class Timezone {
+  static _compare_change_fn(a, b) {
+    if (a.year < b.year) return -1;
+    else if (a.year > b.year) return 1;
+
+    if (a.month < b.month) return -1;
+    else if (a.month > b.month) return 1;
+
+    if (a.day < b.day) return -1;
+    else if (a.day > b.day) return 1;
+
+    if (a.hour < b.hour) return -1;
+    else if (a.hour > b.hour) return 1;
+
+    if (a.minute < b.minute) return -1;
+    else if (a.minute > b.minute) return 1;
+
+    if (a.second < b.second) return -1;
+    else if (a.second > b.second) return 1;
+
+    return 0;
+  }
+
+  /**
+   * Convert the date/time from one zone to the next.
+   *
+   * @param {Time} tt                  The time to convert
+   * @param {Timezone} from_zone       The source zone to convert from
+   * @param {Timezone} to_zone         The target zone to convert to
+   * @return {Time}                    The converted date/time object
+   */
+  static convert_time(tt, from_zone, to_zone) {
+    if (tt.isDate ||
+        from_zone.tzid == to_zone.tzid ||
+        from_zone == Timezone.localTimezone ||
+        to_zone == Timezone.localTimezone) {
+      tt.zone = to_zone;
+      return tt;
+    }
+
+    let utcOffset = from_zone.utcOffset(tt);
+    tt.adjust(0, 0, 0, - utcOffset);
+
+    utcOffset = to_zone.utcOffset(tt);
+    tt.adjust(0, 0, 0, utcOffset);
+
+    return null;
+  }
+
+  /**
+   * Creates a new ICAL.Timezone instance from the passed data object.
+   *
+   * @param {Component|Object} aData options for class
+   * @param {String|Component} aData.component
+   *        If aData is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} aData.tzid      The timezone identifier
+   * @param {String} aData.location  The timezone locationw
+   * @param {String} aData.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} aData.latitude  The latitude of the timezone
+   * @param {Number} aData.longitude The longitude of the timezone
+   */
+  static fromData(aData) {
+    let tt = new Timezone();
+    return tt.fromData(aData);
+  }
+
+  /**
+   * The instance describing the UTC timezone
+   * @type {Timezone}
+   * @constant
+   * @instance
+   */
+  static #utcTimezone = null;
+  static get utcTimezone() {
+    if (!this.#utcTimezone) {
+      this.#utcTimezone = Timezone.fromData({
+        tzid: "UTC"
+      });
+    }
+    return this.#utcTimezone;
+  }
+
+  /**
+   * The instance describing the local timezone
+   * @type {Timezone}
+   * @constant
+   * @instance
+   */
+  static #localTimezone = null;
+  static get localTimezone() {
+    if (!this.#localTimezone) {
+      this.#localTimezone = Timezone.fromData({
+        tzid: "floating"
+      });
+    }
+    return this.#localTimezone;
+  }
+
+  /**
+   * Adjust a timezone change object.
+   * @private
+   * @param {Object} change     The timezone change object
+   * @param {Number} days       The extra amount of days
+   * @param {Number} hours      The extra amount of hours
+   * @param {Number} minutes    The extra amount of minutes
+   * @param {Number} seconds    The extra amount of seconds
+   */
+  static adjust_change(change, days, hours, minutes, seconds) {
+    return Time.prototype.adjust.call(
+      change,
+      days,
+      hours,
+      minutes,
+      seconds,
+      change
+    );
+  }
+
+  static _minimumExpansionYear = -1;
+  static EXTRA_COVERAGE = 5;
+
+  /**
+   * Creates a new ICAL.Timezone instance, by passing in a tzid and component.
+   *
+   * @param {Component|Object} data options for class
+   * @param {String|Component} data.component
+   *        If data is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} data.tzid      The timezone identifier
+   * @param {String} data.location  The timezone locationw
+   * @param {String} data.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} data.latitude  The latitude of the timezone
+   * @param {Number} data.longitude The longitude of the timezone
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.fromData(data);
+  }
+
+
+  /**
+   * Timezone identifier
+   * @type {String}
+   */
+  tzid = "";
+
+  /**
+   * Timezone location
+   * @type {String}
+   */
+  location = "";
+
+  /**
+   * Alternative timezone name, for the string representation
+   * @type {String}
+   */
+  tznames = "";
+
+  /**
+   * The primary latitude for the timezone.
+   * @type {Number}
+   */
+  latitude = 0.0;
+
+  /**
+   * The primary longitude for the timezone.
+   * @type {Number}
+   */
+  longitude = 0.0;
+
+  /**
+   * The vtimezone component for this timezone.
+   * @type {Component}
+   */
+  component = null;
+
+  /**
+   * The year this timezone has been expanded to. All timezone transition
+   * dates until this year are known and can be used for calculation
+   *
+   * @private
+   * @type {Number}
+   */
+  expandedUntilYear = 0;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icaltimezone"
+   */
+  icalclass = "icaltimezone";
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Component|Object} aData options for class
+   * @param {String|Component} aData.component
+   *        If aData is a simple object, then this member can be set to either a
+   *        string containing the component data, or an already parsed
+   *        ICAL.Component
+   * @param {String} aData.tzid      The timezone identifier
+   * @param {String} aData.location  The timezone locationw
+   * @param {String} aData.tznames   An alternative string representation of the
+   *                                  timezone
+   * @param {Number} aData.latitude  The latitude of the timezone
+   * @param {Number} aData.longitude The longitude of the timezone
+   */
+  fromData(aData) {
+    this.expandedUntilYear = 0;
+    this.changes = [];
+
+    if (aData instanceof Component) {
+      // Either a component is passed directly
+      this.component = aData;
+    } else {
+      // Otherwise the component may be in the data object
+      if (aData && "component" in aData) {
+        if (typeof aData.component == "string") {
+          // If a string was passed, parse it as a component
+          let jCal = parse(aData.component);
+          this.component = new Component(jCal);
+        } else if (aData.component instanceof Component) {
+          // If it was a component already, then just set it
+          this.component = aData.component;
+        } else {
+          // Otherwise just null out the component
+          this.component = null;
+        }
+      }
+
+      // Copy remaining passed properties
+      for (let prop of OPTIONS) {
+        if (aData && prop in aData) {
+          this[prop] = aData[prop];
+        }
+      }
+    }
+
+    // If we have a component but no TZID, attempt to get it from the
+    // component's properties.
+    if (this.component instanceof Component && !this.tzid) {
+      this.tzid = this.component.getFirstPropertyValue('tzid');
+    }
+
+    return this;
+  }
+
+  /**
+   * Finds the utcOffset the given time would occur in this timezone.
+   *
+   * @param {Time} tt         The time to check for
+   * @return {Number}         utc offset in seconds
+   */
+  utcOffset(tt) {
+    if (this == Timezone.utcTimezone || this == Timezone.localTimezone) {
+      return 0;
+    }
+
+    this._ensureCoverage(tt.year);
+
+    if (!this.changes.length) {
+      return 0;
+    }
+
+    let tt_change = {
+      year: tt.year,
+      month: tt.month,
+      day: tt.day,
+      hour: tt.hour,
+      minute: tt.minute,
+      second: tt.second
+    };
+
+    let change_num = this._findNearbyChange(tt_change);
+    let change_num_to_use = -1;
+    let step = 1;
+
+    // TODO: replace with bin search?
+    for (;;) {
+      let change = clone(this.changes[change_num], true);
+      if (change.utcOffset < change.prevUtcOffset) {
+        Timezone.adjust_change(change, 0, 0, 0, change.utcOffset);
+      } else {
+        Timezone.adjust_change(change, 0, 0, 0,
+                                        change.prevUtcOffset);
+      }
+
+      let cmp = Timezone._compare_change_fn(tt_change, change);
+
+      if (cmp >= 0) {
+        change_num_to_use = change_num;
+      } else {
+        step = -1;
+      }
+
+      if (step == -1 && change_num_to_use != -1) {
+        break;
+      }
+
+      change_num += step;
+
+      if (change_num < 0) {
+        return 0;
+      }
+
+      if (change_num >= this.changes.length) {
+        break;
+      }
+    }
+
+    let zone_change = this.changes[change_num_to_use];
+    let utcOffset_change = zone_change.utcOffset - zone_change.prevUtcOffset;
+
+    if (utcOffset_change < 0 && change_num_to_use > 0) {
+      let tmp_change = clone(zone_change, true);
+      Timezone.adjust_change(tmp_change, 0, 0, 0, tmp_change.prevUtcOffset);
+
+      if (Timezone._compare_change_fn(tt_change, tmp_change) < 0) {
+        let prev_zone_change = this.changes[change_num_to_use - 1];
+
+        let want_daylight = false; // TODO
+
+        if (zone_change.is_daylight != want_daylight &&
+            prev_zone_change.is_daylight == want_daylight) {
+          zone_change = prev_zone_change;
+        }
+      }
+    }
+
+    // TODO return is_daylight?
+    return zone_change.utcOffset;
+  }
+
+  _findNearbyChange(change) {
+    // find the closest match
+    let idx = binsearchInsert(
+      this.changes,
+      change,
+      Timezone._compare_change_fn
+    );
+
+    if (idx >= this.changes.length) {
+      return this.changes.length - 1;
+    }
+
+    return idx;
+  }
+
+  _ensureCoverage(aYear) {
+    if (Timezone._minimumExpansionYear == -1) {
+      let today = Time.now();
+      Timezone._minimumExpansionYear = today.year;
+    }
+
+    let changesEndYear = aYear;
+    if (changesEndYear < Timezone._minimumExpansionYear) {
+      changesEndYear = Timezone._minimumExpansionYear;
+    }
+
+    changesEndYear += Timezone.EXTRA_COVERAGE;
+
+    if (!this.changes.length || this.expandedUntilYear < aYear) {
+      let subcomps = this.component.getAllSubcomponents();
+      let compLen = subcomps.length;
+      let compIdx = 0;
+
+      for (; compIdx < compLen; compIdx++) {
+        this._expandComponent(
+          subcomps[compIdx], changesEndYear, this.changes
+        );
+      }
+
+      this.changes.sort(Timezone._compare_change_fn);
+      this.expandedUntilYear = changesEndYear;
+    }
+  }
+
+  _expandComponent(aComponent, aYear, changes) {
+    if (!aComponent.hasProperty("dtstart") ||
+        !aComponent.hasProperty("tzoffsetto") ||
+        !aComponent.hasProperty("tzoffsetfrom")) {
+      return null;
+    }
+
+    let dtstart = aComponent.getFirstProperty("dtstart").getFirstValue();
+    let change;
+
+    function convert_tzoffset(offset) {
+      return offset.factor * (offset.hours * 3600 + offset.minutes * 60);
+    }
+
+    function init_changes() {
+      let changebase = {};
+      changebase.is_daylight = (aComponent.name == "daylight");
+      changebase.utcOffset = convert_tzoffset(
+        aComponent.getFirstProperty("tzoffsetto").getFirstValue()
+      );
+
+      changebase.prevUtcOffset = convert_tzoffset(
+        aComponent.getFirstProperty("tzoffsetfrom").getFirstValue()
+      );
+
+      return changebase;
+    }
+
+    if (!aComponent.hasProperty("rrule") && !aComponent.hasProperty("rdate")) {
+      change = init_changes();
+      change.year = dtstart.year;
+      change.month = dtstart.month;
+      change.day = dtstart.day;
+      change.hour = dtstart.hour;
+      change.minute = dtstart.minute;
+      change.second = dtstart.second;
+
+      Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+      changes.push(change);
+    } else {
+      let props = aComponent.getAllProperties("rdate");
+      for (let rdate of props) {
+        let time = rdate.getFirstValue();
+        change = init_changes();
+
+        change.year = time.year;
+        change.month = time.month;
+        change.day = time.day;
+
+        if (time.isDate) {
+          change.hour = dtstart.hour;
+          change.minute = dtstart.minute;
+          change.second = dtstart.second;
+
+          if (dtstart.zone != Timezone.utcTimezone) {
+            Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          }
+        } else {
+          change.hour = time.hour;
+          change.minute = time.minute;
+          change.second = time.second;
+
+          if (time.zone != Timezone.utcTimezone) {
+            Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          }
+        }
+
+        changes.push(change);
+      }
+
+      let rrule = aComponent.getFirstProperty("rrule");
+
+      if (rrule) {
+        rrule = rrule.getFirstValue();
+        change = init_changes();
+
+        if (rrule.until && rrule.until.zone == Timezone.utcTimezone) {
+          rrule.until.adjust(0, 0, 0, change.prevUtcOffset);
+          rrule.until.zone = Timezone.localTimezone;
+        }
+
+        let iterator = rrule.iterator(dtstart);
+
+        let occ;
+        while ((occ = iterator.next())) {
+          change = init_changes();
+          if (occ.year > aYear || !occ) {
+            break;
+          }
+
+          change.year = occ.year;
+          change.month = occ.month;
+          change.day = occ.day;
+          change.hour = occ.hour;
+          change.minute = occ.minute;
+          change.second = occ.second;
+          change.isDate = occ.isDate;
+
+          Timezone.adjust_change(change, 0, 0, 0, -change.prevUtcOffset);
+          changes.push(change);
+        }
+      }
+    }
+
+    return changes;
+  }
+
+  /**
+   * The string representation of this timezone.
+   * @return {String}
+   */
+  toString() {
+    return (this.tznames ? this.tznames : this.tzid);
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+let zones = null;
+
+/**
+ * @classdesc
+ * Singleton class to contain timezones.  Right now it is all manual registry in
+ * the future we may use this class to download timezone information or handle
+ * loading pre-expanded timezones.
+ *
+ * @exports module:ICAL.TimezoneService
+ * @memberof ICAL
+ */
+const TimezoneService = {
+  get count() {
+    if (zones === null) {
+      return 0;
+    }
+
+    return Object.keys(zones).length;
+  },
+
+  reset: function() {
+    zones = Object.create(null);
+    let utc = Timezone.utcTimezone;
+
+    zones.Z = utc;
+    zones.UTC = utc;
+    zones.GMT = utc;
+  },
+  _hard_reset: function() {
+    zones = null;
+  },
+
+  /**
+   * Checks if timezone id has been registered.
+   *
+   * @param {String} tzid     Timezone identifier (e.g. America/Los_Angeles)
+   * @return {Boolean}        False, when not present
+   */
+  has: function(tzid) {
+    if (zones === null) {
+      return false;
+    }
+
+    return !!zones[tzid];
+  },
+
+  /**
+   * Returns a timezone by its tzid if present.
+   *
+   * @param {String} tzid               Timezone identifier (e.g. America/Los_Angeles)
+   * @return {Timezone | undefined}     The timezone, or undefined if not found
+   */
+  get: function(tzid) {
+    if (zones === null) {
+      this.reset();
+    }
+
+    return zones[tzid];
+  },
+
+  /**
+   * Registers a timezone object or component.
+   *
+   * @param {Component|Timezone} timezone
+   *        The initialized zone or vtimezone.
+   *
+   * @param {String=} name
+   *        The name of the timezone. Defaults to the component's TZID if not
+   *        passed.
+   */
+  register: function(timezone, name) {
+    if (zones === null) {
+      this.reset();
+    }
+
+    // This avoids a breaking change by the change of argument order
+    // TODO remove in v3
+    if (typeof timezone === "string" && name instanceof Timezone) {
+      [timezone, name] = [name, timezone];
+    }
+
+    if (!name) {
+      if (timezone instanceof Timezone) {
+        name = timezone.tzid;
+      } else {
+        if (timezone.name === 'vtimezone') {
+          timezone = new Timezone(timezone);
+          name = timezone.tzid;
+        }
+      }
+    }
+
+    if (!name) {
+      throw new TypeError("Neither a timezone nor a name was passed");
+    }
+
+    if (timezone instanceof Timezone) {
+      zones[name] = timezone;
+    } else {
+      throw new TypeError('timezone must be ICAL.Timezone or ICAL.Component');
+    }
+  },
+
+  /**
+   * Removes a timezone by its tzid from the list.
+   *
+   * @param {String} tzid     Timezone identifier (e.g. America/Los_Angeles)
+   * @return {?Timezone}      The removed timezone, or null if not registered
+   */
+  remove: function(tzid) {
+    if (zones === null) {
+      return null;
+    }
+
+    return (delete zones[tzid]);
+  }
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Helper functions used in various places within ical.js
+ * @module ICAL.helpers
+ */
+
+/**
+ * Compiles a list of all referenced TZIDs in all subcomponents and
+ * removes any extra VTIMEZONE subcomponents. In addition, if any TZIDs
+ * are referenced by a component, but a VTIMEZONE does not exist,
+ * an attempt will be made to generate a VTIMEZONE using ICAL.TimezoneService.
+ *
+ * @param {Component} vcal     The top-level VCALENDAR component.
+ * @return {Component}         The ICAL.Component that was passed in.
+ */
+function updateTimezones(vcal) {
+  let allsubs, properties, vtimezones, reqTzid, i;
+
+  if (!vcal || vcal.name !== "vcalendar") {
+    //not a top-level vcalendar component
+    return vcal;
+  }
+
+  //Store vtimezone subcomponents in an object reference by tzid.
+  //Store properties from everything else in another array
+  allsubs = vcal.getAllSubcomponents();
+  properties = [];
+  vtimezones = {};
+  for (i = 0; i < allsubs.length; i++) {
+    if (allsubs[i].name === "vtimezone") {
+      let tzid = allsubs[i].getFirstProperty("tzid").getFirstValue();
+      vtimezones[tzid] = allsubs[i];
+    } else {
+      properties = properties.concat(allsubs[i].getAllProperties());
+    }
+  }
+
+  //create an object with one entry for each required tz
+  reqTzid = {};
+  for (i = 0; i < properties.length; i++) {
+    let tzid = properties[i].getParameter("tzid");
+    if (tzid) {
+      reqTzid[tzid] = true;
+    }
+  }
+
+  //delete any vtimezones that are not on the reqTzid list.
+  for (let [tzid, comp] of Object.entries(vtimezones)) {
+    if (!reqTzid[tzid]) {
+      vcal.removeSubcomponent(comp);
+    }
+  }
+
+  //create any missing, but registered timezones
+  for (let tzid of Object.keys(reqTzid)) {
+    if (!vtimezones[tzid] && TimezoneService.has(tzid)) {
+      vcal.addSubcomponent(TimezoneService.get(tzid).component);
+    }
+  }
+
+  return vcal;
+}
+
+/**
+ * Checks if the given type is of the number type and also NaN.
+ *
+ * @param {Number} number     The number to check
+ * @return {Boolean}          True, if the number is strictly NaN
+ */
+function isStrictlyNaN(number) {
+  return typeof(number) === 'number' && isNaN(number);
+}
+
+/**
+ * Parses a string value that is expected to be an integer, when the valid is
+ * not an integer throws a decoration error.
+ *
+ * @param {String} string     Raw string input
+ * @return {Number}           Parsed integer
+ */
+function strictParseInt(string) {
+  let result = parseInt(string, 10);
+
+  if (isStrictlyNaN(result)) {
+    throw new Error(
+      'Could not extract integer from "' + string + '"'
+    );
+  }
+
+  return result;
+}
+
+/**
+ * Creates or returns a class instance of a given type with the initialization
+ * data if the data is not already an instance of the given type.
+ *
+ * @example
+ * var time = new ICAL.Time(...);
+ * var result = ICAL.helpers.formatClassType(time, ICAL.Time);
+ *
+ * (result instanceof ICAL.Time)
+ * // => true
+ *
+ * result = ICAL.helpers.formatClassType({}, ICAL.Time);
+ * (result isntanceof ICAL.Time)
+ * // => true
+ *
+ *
+ * @param {Object} data       object initialization data
+ * @param {Object} type       object type (like ICAL.Time)
+ * @return {?}                An instance of the found type.
+ */
+function formatClassType(data, type) {
+  if (typeof(data) === 'undefined') {
+    return undefined;
+  }
+
+  if (data instanceof type) {
+    return data;
+  }
+  return new type(data);
+}
+
+/**
+ * Identical to indexOf but will only match values when they are not preceded
+ * by a backslash character.
+ *
+ * @param {String} buffer         String to search
+ * @param {String} search         Value to look for
+ * @param {Number} pos            Start position
+ * @return {Number}               The position, or -1 if not found
+ */
+function unescapedIndexOf(buffer, search, pos) {
+  while ((pos = buffer.indexOf(search, pos)) !== -1) {
+    if (pos > 0 && buffer[pos - 1] === '\\') {
+      pos += 1;
+    } else {
+      return pos;
+    }
+  }
+  return -1;
+}
+
+/**
+ * Find the index for insertion using binary search.
+ *
+ * @param {Array} list            The list to search
+ * @param {?} seekVal             The value to insert
+ * @param {function(?,?)} cmpfunc The comparison func, that can
+ *                                  compare two seekVals
+ * @return {Number}               The insert position
+ */
+function binsearchInsert(list, seekVal, cmpfunc) {
+  if (!list.length)
+    return 0;
+
+  let low = 0, high = list.length - 1,
+      mid, cmpval;
+
+  while (low <= high) {
+    mid = low + Math.floor((high - low) / 2);
+    cmpval = cmpfunc(seekVal, list[mid]);
+
+    if (cmpval < 0)
+      high = mid - 1;
+    else if (cmpval > 0)
+      low = mid + 1;
+    else
+      break;
+  }
+
+  if (cmpval < 0)
+    return mid; // insertion is displacing, so use mid outright.
+  else if (cmpval > 0)
+    return mid + 1;
+  else
+    return mid;
+}
+
+/**
+ * Clone the passed object or primitive. By default a shallow clone will be
+ * executed.
+ *
+ * @param {*} aSrc            The thing to clone
+ * @param {Boolean=} aDeep    If true, a deep clone will be performed
+ * @return {*}                The copy of the thing
+ */
+function clone(aSrc, aDeep) {
+  if (!aSrc || typeof aSrc != "object") {
+    return aSrc;
+  } else if (aSrc instanceof Date) {
+    return new Date(aSrc.getTime());
+  } else if ("clone" in aSrc) {
+    return aSrc.clone();
+  } else if (Array.isArray(aSrc)) {
+    let arr = [];
+    for (let i = 0; i < aSrc.length; i++) {
+      arr.push(aDeep ? clone(aSrc[i], true) : aSrc[i]);
+    }
+    return arr;
+  } else {
+    let obj = {};
+    for (let [name, value] of Object.entries(aSrc)) {
+      if (aDeep) {
+        obj[name] = clone(value, true);
+      } else {
+        obj[name] = value;
+      }
+    }
+    return obj;
+  }
+}
+
+/**
+ * Performs iCalendar line folding. A line ending character is inserted and
+ * the next line begins with a whitespace.
+ *
+ * @example
+ * SUMMARY:This line will be fold
+ *  ed right in the middle of a word.
+ *
+ * @param {String} aLine      The line to fold
+ * @return {String}           The folded line
+ */
+function foldline(aLine) {
+  let result = "";
+  let line = aLine || "", pos = 0, line_length = 0;
+  //pos counts position in line for the UTF-16 presentation
+  //line_length counts the bytes for the UTF-8 presentation
+  while (line.length) {
+    let cp = line.codePointAt(pos);
+    if (cp < 128) ++line_length;
+    else if (cp < 2048) line_length += 2;//needs 2 UTF-8 bytes
+    else if (cp < 65536) line_length += 3;
+    else line_length += 4; //cp is less than 1114112
+    if (line_length < ICALmodule.foldLength + 1)
+      pos += cp > 65535 ? 2 : 1;
+    else {
+      result += ICALmodule.newLineChar + " " + line.slice(0, Math.max(0, pos));
+      line = line.slice(Math.max(0, pos));
+      pos = line_length = 0;
+    }
+  }
+  return result.slice(ICALmodule.newLineChar.length + 1);
+}
+
+/**
+ * Pads the given string or number with zeros so it will have at least two
+ * characters.
+ *
+ * @param {String|Number} data    The string or number to pad
+ * @return {String}               The number padded as a string
+ */
+function pad2(data) {
+  if (typeof(data) !== 'string') {
+    // handle fractions.
+    if (typeof(data) === 'number') {
+      data = parseInt(data);
+    }
+    data = String(data);
+  }
+
+  let len = data.length;
+
+  switch (len) {
+    case 0:
+      return '00';
+    case 1:
+      return '0' + data;
+    default:
+      return data;
+  }
+}
+
+/**
+ * Truncates the given number, correctly handling negative numbers.
+ *
+ * @param {Number} number     The number to truncate
+ * @return {Number}           The truncated number
+ */
+function trunc(number) {
+  return (number < 0 ? Math.ceil(number) : Math.floor(number));
+}
+
+/**
+ * Poor-man's cross-browser object extension. Doesn't support all the
+ * features, but enough for our usage. Note that the target's properties are
+ * not overwritten with the source properties.
+ *
+ * @example
+ * var child = ICAL.helpers.extend(parent, {
+ *   "bar": 123
+ * });
+ *
+ * @param {Object} source     The object to extend
+ * @param {Object} target     The object to extend with
+ * @return {Object}           Returns the target.
+ */
+function extend(source, target) {
+  for (let key in source) {
+    let descr = Object.getOwnPropertyDescriptor(source, key);
+    if (descr && !Object.getOwnPropertyDescriptor(target, key)) {
+      Object.defineProperty(target, key, descr);
+    }
+  }
+  return target;
+}
+
+var helpers = /*#__PURE__*/Object.freeze({
+  __proto__: null,
+  updateTimezones: updateTimezones,
+  isStrictlyNaN: isStrictlyNaN,
+  strictParseInt: strictParseInt,
+  formatClassType: formatClassType,
+  unescapedIndexOf: unescapedIndexOf,
+  binsearchInsert: binsearchInsert,
+  clone: clone,
+  foldline: foldline,
+  pad2: pad2,
+  trunc: trunc,
+  extend: extend
+});
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This class represents the "utc-offset" value type, with various calculation and manipulation
+ * methods.
+ *
+ * @memberof ICAL
+ */
+class UtcOffset {
+  /**
+   * Creates a new {@link ICAL.UtcOffset} instance from the passed string.
+   *
+   * @param {String} aString    The string to parse
+   * @return {Duration}         The created utc-offset instance
+   */
+  static fromString(aString) {
+    // -05:00
+    let options = {};
+    //TODO: support seconds per rfc5545 ?
+    options.factor = (aString[0] === '+') ? 1 : -1;
+    options.hours = strictParseInt(aString.slice(1, 3));
+    options.minutes = strictParseInt(aString.slice(4, 6));
+
+    return new UtcOffset(options);
+  }
+
+  /**
+   * Creates a new {@link ICAL.UtcOffset} instance from the passed seconds
+   * value.
+   *
+   * @param {Number} aSeconds       The number of seconds to convert
+   */
+  static fromSeconds(aSeconds) {
+    let instance = new UtcOffset();
+    instance.fromSeconds(aSeconds);
+    return instance;
+  }
+
+  /**
+   * Creates a new ICAL.UtcOffset instance.
+   *
+   * @param {Object} aData          An object with members of the utc offset
+   * @param {Number=} aData.hours   The hours for the utc offset
+   * @param {Number=} aData.minutes The minutes in the utc offset
+   * @param {Number=} aData.factor  The factor for the utc-offset, either -1 or 1
+   */
+  constructor(aData) {
+    this.fromData(aData);
+  }
+
+  /**
+   * The hours in the utc-offset
+   * @type {Number}
+   */
+  hours = 0;
+
+  /**
+   * The minutes in the utc-offset
+   * @type {Number}
+   */
+  minutes = 0;
+
+  /**
+   * The sign of the utc offset, 1 for positive offset, -1 for negative
+   * offsets.
+   * @type {Number}
+   */
+  factor = 1;
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "utc-offset"
+   */
+  icaltype = "utc-offset";
+
+  /**
+   * Returns a clone of the utc offset object.
+   *
+   * @return {UtcOffset}     The cloned object
+   */
+  clone() {
+    return UtcOffset.fromSeconds(this.toSeconds());
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} aData          An object with members of the utc offset
+   * @param {Number=} aData.hours   The hours for the utc offset
+   * @param {Number=} aData.minutes The minutes in the utc offset
+   * @param {Number=} aData.factor  The factor for the utc-offset, either -1 or 1
+   */
+  fromData(aData) {
+    if (aData) {
+      for (let [key, value] of Object.entries(aData)) {
+        this[key] = value;
+      }
+    }
+    this._normalize();
+  }
+
+  /**
+   * Sets up the current instance from the given seconds value. The seconds
+   * value is truncated to the minute. Offsets are wrapped when the world
+   * ends, the hour after UTC+14:00 is UTC-12:00.
+   *
+   * @param {Number} aSeconds         The seconds to convert into an offset
+   */
+  fromSeconds(aSeconds) {
+    let secs = Math.abs(aSeconds);
+
+    this.factor = aSeconds < 0 ? -1 : 1;
+    this.hours = trunc(secs / 3600);
+
+    secs -= (this.hours * 3600);
+    this.minutes = trunc(secs / 60);
+    return this;
+  }
+
+  /**
+   * Convert the current offset to a value in seconds
+   *
+   * @return {Number}                 The offset in seconds
+   */
+  toSeconds() {
+    return this.factor * (60 * this.minutes + 3600 * this.hours);
+  }
+
+  /**
+   * Compare this utc offset with another one.
+   *
+   * @param {UtcOffset} other             The other offset to compare with
+   * @return {Number}                     -1, 0 or 1 for less/equal/greater
+   */
+  compare(other) {
+    let a = this.toSeconds();
+    let b = other.toSeconds();
+    return (a > b) - (b > a);
+  }
+
+  _normalize() {
+    // Range: 97200 seconds (with 1 hour inbetween)
+    let secs = this.toSeconds();
+    let factor = this.factor;
+    while (secs < -43200) { // = UTC-12:00
+      secs += 97200;
+    }
+    while (secs > 50400) { // = UTC+14:00
+      secs -= 97200;
+    }
+
+    this.fromSeconds(secs);
+
+    // Avoid changing the factor when on zero seconds
+    if (secs == 0) {
+      this.factor = factor;
+    }
+  }
+
+  /**
+   * The iCalendar string representation of this utc-offset.
+   * @return {String}
+   */
+  toICALString() {
+    return design$1.icalendar.value['utc-offset'].toICAL(this.toString());
+  }
+
+  /**
+   * The string representation of this utc-offset.
+   * @return {String}
+   */
+  toString() {
+    return (this.factor == 1 ? "+" : "-") + pad2(this.hours) + ':' + pad2(this.minutes);
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Describes a vCard time, which has slight differences to the ICAL.Time.
+ * Properties can be null if not specified, for example for dates with
+ * reduced accuracy or truncation.
+ *
+ * Note that currently not all methods are correctly re-implemented for
+ * VCardTime. For example, comparison will have undefined results when some
+ * members are null.
+ *
+ * Also, normalization is not yet implemented for this class!
+ *
+ * @memberof ICAL
+ * @extends {ICAL.Time}
+ */
+class VCardTime extends Time {
+  /**
+   * Returns a new ICAL.VCardTime instance from a date and/or time string.
+   *
+   * @param {String} aValue     The string to create from
+   * @param {String} aIcalType  The type for this instance, e.g. date-and-or-time
+   * @return {VCardTime}        The date/time instance
+   */
+  static fromDateAndOrTimeString(aValue, aIcalType) {
+    function part(v, s, e) {
+      return v ? strictParseInt(v.slice(s, s + e)) : null;
+    }
+    let parts = aValue.split('T');
+    let dt = parts[0], tmz = parts[1];
+    let splitzone = tmz ? design$1.vcard.value.time._splitZone(tmz) : [];
+    let zone = splitzone[0], tm = splitzone[1];
+
+    let dtlen = dt ? dt.length : 0;
+    let tmlen = tm ? tm.length : 0;
+
+    let hasDashDate = dt && dt[0] == '-' && dt[1] == '-';
+    let hasDashTime = tm && tm[0] == '-';
+
+    let o = {
+      year: hasDashDate ? null : part(dt, 0, 4),
+      month: hasDashDate && (dtlen == 4 || dtlen == 7) ? part(dt, 2, 2) : dtlen == 7 ? part(dt, 5, 2) : dtlen == 10 ? part(dt, 5, 2) : null,
+      day: dtlen == 5 ? part(dt, 3, 2) : dtlen == 7 && hasDashDate ? part(dt, 5, 2) : dtlen == 10 ? part(dt, 8, 2) : null,
+
+      hour: hasDashTime ? null : part(tm, 0, 2),
+      minute: hasDashTime && tmlen == 3 ? part(tm, 1, 2) : tmlen > 4 ? hasDashTime ? part(tm, 1, 2) : part(tm, 3, 2) : null,
+      second: tmlen == 4 ? part(tm, 2, 2) : tmlen == 6 ? part(tm, 4, 2) : tmlen == 8 ? part(tm, 6, 2) : null
+    };
+
+    if (zone == 'Z') {
+      zone = Timezone.utcTimezone;
+    } else if (zone && zone[3] == ':') {
+      zone = UtcOffset.fromString(zone);
+    } else {
+      zone = null;
+    }
+
+    return new VCardTime(o, zone, aIcalType);
+  }
+
+
+  /**
+   * Creates a new ICAL.VCardTime instance.
+   *
+   * @param {Object} data                           The data for the time instance
+   * @param {Number=} data.year                     The year for this date
+   * @param {Number=} data.month                    The month for this date
+   * @param {Number=} data.day                      The day for this date
+   * @param {Number=} data.hour                     The hour for this date
+   * @param {Number=} data.minute                   The minute for this date
+   * @param {Number=} data.second                   The second for this date
+   * @param {Timezone|UtcOffset} zone               The timezone to use
+   * @param {String} icaltype                       The type for this date/time object
+   */
+  constructor(data, zone, icaltype) {
+    super(data, zone);
+    this.icaltype = icaltype || "date-and-or-time";
+  }
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "vcardtime"
+   */
+  icalclass = "vcardtime";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @type {String}
+   * @default "date-and-or-time"
+   */
+  icaltype = "date-and-or-time";
+
+  /**
+   * Returns a clone of the vcard date/time object.
+   *
+   * @return {VCardTime}     The cloned object
+   */
+  clone() {
+    return new VCardTime(this._time, this.zone, this.icaltype);
+  }
+
+  _normalize() {
+    return this;
+  }
+
+  /**
+   * @inheritdoc
+   */
+  utcOffset() {
+    if (this.zone instanceof UtcOffset) {
+      return this.zone.toSeconds();
+    } else {
+      return Time.prototype.utcOffset.apply(this, arguments);
+    }
+  }
+
+  /**
+   * Returns an RFC 6350 compliant representation of this object.
+   *
+   * @return {String}         vcard date/time string
+   */
+  toICALString() {
+    return design$1.vcard.value[this.icaltype].toICAL(this.toString());
+  }
+
+  /**
+   * The string representation of this date/time, in jCard form
+   * (including : and - separators).
+   * @return {String}
+   */
+  toString() {
+    let y = this.year, m = this.month, d = this.day;
+    let h = this.hour, mm = this.minute, s = this.second;
+
+    let hasYear = y !== null, hasMonth = m !== null, hasDay = d !== null;
+    let hasHour = h !== null, hasMinute = mm !== null, hasSecond = s !== null;
+
+    let datepart = (hasYear ? pad2(y) + (hasMonth || hasDay ? '-' : '') : (hasMonth || hasDay ? '--' : '')) +
+                   (hasMonth ? pad2(m) : '') +
+                   (hasDay ? '-' + pad2(d) : '');
+    let timepart = (hasHour ? pad2(h) : '-') + (hasHour && hasMinute ? ':' : '') +
+                   (hasMinute ? pad2(mm) : '') + (!hasHour && !hasMinute ? '-' : '') +
+                   (hasMinute && hasSecond ? ':' : '') +
+                   (hasSecond ? pad2(s) : '');
+
+    let zone;
+    if (this.zone === Timezone.utcTimezone) {
+      zone = 'Z';
+    } else if (this.zone instanceof UtcOffset) {
+      zone = this.zone.toString();
+    } else if (this.zone === Timezone.localTimezone) {
+      zone = '';
+    } else if (this.zone instanceof Timezone) {
+      let offset = UtcOffset.fromSeconds(this.zone.utcOffset(this));
+      zone = offset.toString();
+    } else {
+      zone = '';
+    }
+
+    switch (this.icaltype) {
+      case "time":
+        return timepart + zone;
+      case "date-and-or-time":
+      case "date-time":
+        return datepart + (timepart == '--' ? '' : 'T' + timepart + zone);
+      case "date":
+        return datepart;
+    }
+    return null;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ */
+
+/**
+ * An iterator for a single recurrence rule. This class usually doesn't have to be instanciated
+ * directly, the convenience method {@link ICAL.Recur#iterator} can be used.
+ *
+ * @memberof ICAL
+ */
+class RecurIterator {
+  static _indexMap = {
+    "BYSECOND": 0,
+    "BYMINUTE": 1,
+    "BYHOUR": 2,
+    "BYDAY": 3,
+    "BYMONTHDAY": 4,
+    "BYYEARDAY": 5,
+    "BYWEEKNO": 6,
+    "BYMONTH": 7,
+    "BYSETPOS": 8
+  };
+
+  static _expandMap = {
+    "SECONDLY": [1, 1, 1, 1, 1, 1, 1, 1],
+    "MINUTELY": [2, 1, 1, 1, 1, 1, 1, 1],
+    "HOURLY": [2, 2, 1, 1, 1, 1, 1, 1],
+    "DAILY": [2, 2, 2, 1, 1, 1, 1, 1],
+    "WEEKLY": [2, 2, 2, 2, 3, 3, 1, 1],
+    "MONTHLY": [2, 2, 2, 2, 2, 3, 3, 1],
+    "YEARLY": [2, 2, 2, 2, 2, 2, 2, 2]
+  };
+
+  static UNKNOWN = 0;
+  static CONTRACT = 1;
+  static EXPAND = 2;
+  static ILLEGAL = 3;
+
+  /**
+   * Creates a new ICAL.RecurIterator instance. The options object may contain additional members
+   * when resuming iteration from a previous run.
+   *
+   * @param {Object} options                The iterator options
+   * @param {Recur} options.rule            The rule to iterate.
+   * @param {Time} options.dtstart          The start date of the event.
+   * @param {Boolean=} options.initialized  When true, assume that options are
+   *        from a previously constructed iterator. Initialization will not be
+   *        repeated.
+   */
+  constructor(options) {
+    this.fromData(options);
+  }
+
+  /**
+   * True when iteration is finished.
+   * @type {Boolean}
+   */
+  completed = false;
+
+  /**
+   * The rule that is being iterated
+   * @type {Recur}
+   */
+  rule = null;
+
+  /**
+   * The start date of the event being iterated.
+   * @type {Time}
+   */
+  dtstart = null;
+
+  /**
+   * The last occurrence that was returned from the
+   * {@link RecurIterator#next} method.
+   * @type {Time}
+   */
+  last = null;
+
+  /**
+   * The sequence number from the occurrence
+   * @type {Number}
+   */
+  occurrence_number = 0;
+
+  /**
+   * The indices used for the {@link ICAL.RecurIterator#by_data} object.
+   * @type {Object}
+   * @private
+   */
+  by_indices = null;
+
+  /**
+   * If true, the iterator has already been initialized
+   * @type {Boolean}
+   * @private
+   */
+  initialized = false;
+
+  /**
+   * The initializd by-data.
+   * @type {Object}
+   * @private
+   */
+  by_data = null;
+
+  /**
+   * The expanded yeardays
+   * @type {Array}
+   * @private
+   */
+  days = null;
+
+  /**
+   * The index in the {@link ICAL.RecurIterator#days} array.
+   * @type {Number}
+   * @private
+   */
+  days_index = 0;
+
+  /**
+   * Initialize the recurrence iterator from the passed data object. This
+   * method is usually not called directly, you can initialize the iterator
+   * through the constructor.
+   *
+   * @param {Object} options                The iterator options
+   * @param {Recur} options.rule            The rule to iterate.
+   * @param {Time} options.dtstart          The start date of the event.
+   * @param {Boolean=} options.initialized  When true, assume that options are
+   *        from a previously constructed iterator. Initialization will not be
+   *        repeated.
+   */
+  fromData(options) {
+    this.rule = formatClassType(options.rule, Recur);
+
+    if (!this.rule) {
+      throw new Error('iterator requires a (ICAL.Recur) rule');
+    }
+
+    this.dtstart = formatClassType(options.dtstart, Time);
+
+    if (!this.dtstart) {
+      throw new Error('iterator requires a (ICAL.Time) dtstart');
+    }
+
+    if (options.by_data) {
+      this.by_data = options.by_data;
+    } else {
+      this.by_data = clone(this.rule.parts, true);
+    }
+
+    if (options.occurrence_number)
+      this.occurrence_number = options.occurrence_number;
+
+    this.days = options.days || [];
+    if (options.last) {
+      this.last = formatClassType(options.last, Time);
+    }
+
+    this.by_indices = options.by_indices;
+
+    if (!this.by_indices) {
+      this.by_indices = {
+        "BYSECOND": 0,
+        "BYMINUTE": 0,
+        "BYHOUR": 0,
+        "BYDAY": 0,
+        "BYMONTH": 0,
+        "BYWEEKNO": 0,
+        "BYMONTHDAY": 0
+      };
+    }
+
+    this.initialized = options.initialized || false;
+
+    if (!this.initialized) {
+      try {
+        this.init();
+      } catch (e) {
+        if (e instanceof InvalidRecurrenceRuleError) {
+          // Init may error if there are no possible recurrence instances from
+          // the rule, but we don't want to bubble this error up. Instead, we
+          // create an empty iterator.
+          this.completed = true;
+        } else {
+          // Propagate other errors to consumers.
+          throw e;
+        }
+      }
+    }
+  }
+
+  /**
+   * Initialize the iterator
+   * @private
+   */
+  init() {
+    this.initialized = true;
+    this.last = this.dtstart.clone();
+    let parts = this.by_data;
+
+    if ("BYDAY" in parts) {
+      // libical does this earlier when the rule is loaded, but we postpone to
+      // now so we can preserve the original order.
+      this.sort_byday_rules(parts.BYDAY);
+    }
+
+    // If the BYYEARDAY appares, no other date rule part may appear
+    if ("BYYEARDAY" in parts) {
+      if ("BYMONTH" in parts || "BYWEEKNO" in parts ||
+          "BYMONTHDAY" in parts || "BYDAY" in parts) {
+        throw new Error("Invalid BYYEARDAY rule");
+      }
+    }
+
+    // BYWEEKNO and BYMONTHDAY rule parts may not both appear
+    if ("BYWEEKNO" in parts && "BYMONTHDAY" in parts) {
+      throw new Error("BYWEEKNO does not fit to BYMONTHDAY");
+    }
+
+    // For MONTHLY recurrences (FREQ=MONTHLY) neither BYYEARDAY nor
+    // BYWEEKNO may appear.
+    if (this.rule.freq == "MONTHLY" &&
+        ("BYYEARDAY" in parts || "BYWEEKNO" in parts)) {
+      throw new Error("For MONTHLY recurrences neither BYYEARDAY nor BYWEEKNO may appear");
+    }
+
+    // For WEEKLY recurrences (FREQ=WEEKLY) neither BYMONTHDAY nor
+    // BYYEARDAY may appear.
+    if (this.rule.freq == "WEEKLY" &&
+        ("BYYEARDAY" in parts || "BYMONTHDAY" in parts)) {
+      throw new Error("For WEEKLY recurrences neither BYMONTHDAY nor BYYEARDAY may appear");
+    }
+
+    // BYYEARDAY may only appear in YEARLY rules
+    if (this.rule.freq != "YEARLY" && "BYYEARDAY" in parts) {
+      throw new Error("BYYEARDAY may only appear in YEARLY rules");
+    }
+
+    this.last.second = this.setup_defaults("BYSECOND", "SECONDLY", this.dtstart.second);
+    this.last.minute = this.setup_defaults("BYMINUTE", "MINUTELY", this.dtstart.minute);
+    this.last.hour = this.setup_defaults("BYHOUR", "HOURLY", this.dtstart.hour);
+    this.last.day = this.setup_defaults("BYMONTHDAY", "DAILY", this.dtstart.day);
+    this.last.month = this.setup_defaults("BYMONTH", "MONTHLY", this.dtstart.month);
+
+    if (this.rule.freq == "WEEKLY") {
+      if ("BYDAY" in parts) {
+        let [, dow] = this.ruleDayOfWeek(parts.BYDAY[0], this.rule.wkst);
+        let wkdy = dow - this.last.dayOfWeek(this.rule.wkst);
+        if ((this.last.dayOfWeek(this.rule.wkst) < dow && wkdy >= 0) || wkdy < 0) {
+          // Initial time is after first day of BYDAY data
+          this.last.day += wkdy;
+        }
+      } else {
+        let dayName = Recur.numericDayToIcalDay(this.dtstart.dayOfWeek());
+        parts.BYDAY = [dayName];
+      }
+    }
+
+    if (this.rule.freq == "YEARLY") {
+      // Some yearly recurrence rules may be specific enough to not actually
+      // occur on a yearly basis, e.g. the 29th day of February or the fifth
+      // Monday of a given month. The standard isn't clear on the intended
+      // behavior in these cases, but `libical` at least will iterate until it
+      // finds a matching year.
+      // CAREFUL: Some rules may specify an occurrence that can never happen,
+      // e.g. the first Monday of April so long as it falls on the 15th
+      // through the 21st. Detecting these is non-trivial, so ensure that we
+      // stop iterating at some point.
+      const untilYear = this.rule.until ? this.rule.until.year : 20000;
+      while (this.last.year <= untilYear) {
+        this.expand_year_days(this.last.year);
+        if (this.days.length > 0) {
+          break;
+        }
+        this.increment_year(this.rule.interval);
+      }
+
+      if (this.days.length == 0) {
+        throw new InvalidRecurrenceRuleError();
+      }
+
+      this._nextByYearDay();
+    }
+
+    if (this.rule.freq == "MONTHLY") {
+      if (this.has_by_data("BYDAY")) {
+        let tempLast = null;
+        let initLast = this.last.clone();
+        let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+
+        // Check every weekday in BYDAY with relative dow and pos.
+        for (let bydow of this.by_data.BYDAY) {
+          this.last = initLast.clone();
+          let [pos, dow] = this.ruleDayOfWeek(bydow);
+          let dayOfMonth = this.last.nthWeekDay(dow, pos);
+
+          // If |pos| >= 6, the byday is invalid for a monthly rule.
+          if (pos >= 6 || pos <= -6) {
+            throw new Error("Malformed values in BYDAY part");
+          }
+
+          // If a Byday with pos=+/-5 is not in the current month it
+          // must be searched in the next months.
+          if (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+            // Skip if we have already found a "last" in this month.
+            if (tempLast && tempLast.month == initLast.month) {
+              continue;
+            }
+            while (dayOfMonth > daysInMonth || dayOfMonth <= 0) {
+              this.increment_month();
+              daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+              dayOfMonth = this.last.nthWeekDay(dow, pos);
+            }
+          }
+
+          this.last.day = dayOfMonth;
+          if (!tempLast || this.last.compare(tempLast) < 0) {
+            tempLast = this.last.clone();
+          }
+        }
+        this.last = tempLast.clone();
+
+        //XXX: This feels like a hack, but we need to initialize
+        //     the BYMONTHDAY case correctly and byDayAndMonthDay handles
+        //     this case. It accepts a special flag which will avoid incrementing
+        //     the initial value without the flag days that match the start time
+        //     would be missed.
+        if (this.has_by_data('BYMONTHDAY')) {
+          this._byDayAndMonthDay(true);
+        }
+
+        if (this.last.day > daysInMonth || this.last.day == 0) {
+          throw new Error("Malformed values in BYDAY part");
+        }
+      } else if (this.has_by_data("BYMONTHDAY")) {
+        // Change the day value so that normalisation won't change the month.
+        this.last.day = 1;
+
+        // Get a sorted list of days in the starting month that match the rule.
+        let normalized = this.normalizeByMonthDayRules(
+          this.last.year,
+          this.last.month,
+          this.rule.parts.BYMONTHDAY
+        ).filter(d => d >= this.last.day);
+
+        if (normalized.length) {
+          // There's at least one valid day, use it.
+          this.last.day = normalized[0];
+          this.by_data.BYMONTHDAY = normalized;
+        } else {
+          // There's no occurrence in this month, find the next valid month.
+          // The longest possible sequence of skipped months is February-April-June,
+          // so we might need to call next_month up to three times.
+          if (!this.next_month() && !this.next_month() && !this.next_month()) {
+            throw new Error("No possible occurrences");
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Retrieve the next occurrence from the iterator.
+   * @return {Time}
+   */
+  next(again = false) {
+    let before = (this.last ? this.last.clone() : null);
+
+    if ((this.rule.count && this.occurrence_number >= this.rule.count) ||
+        (this.rule.until && this.last.compare(this.rule.until) > 0)) {
+      this.completed = true;
+    }
+
+    if (this.completed) {
+      return null;
+    }
+
+    if (this.occurrence_number == 0 && this.last.compare(this.dtstart) >= 0) {
+      // First of all, give the instance that was initialized
+      this.occurrence_number++;
+      return this.last;
+    }
+
+    let valid;
+    do {
+      valid = 1;
+
+      switch (this.rule.freq) {
+      case "SECONDLY":
+        this.next_second();
+        break;
+      case "MINUTELY":
+        this.next_minute();
+        break;
+      case "HOURLY":
+        this.next_hour();
+        break;
+      case "DAILY":
+        this.next_day();
+        break;
+      case "WEEKLY":
+        this.next_week();
+        break;
+      case "MONTHLY":
+        valid = this.next_month();
+        break;
+      case "YEARLY":
+        this.next_year();
+        break;
+
+      default:
+        return null;
+      }
+    } while (!this.check_contracting_rules() ||
+             this.last.compare(this.dtstart) < 0 ||
+             !valid);
+
+    if (this.last.compare(before) == 0) {
+      if (again) {
+        throw new Error("Same occurrence found twice, protecting you from death by recursion");
+      }
+      this.next(true);
+    }
+
+    if (this.rule.until && this.last.compare(this.rule.until) > 0) {
+      this.completed = true;
+      return null;
+    } else {
+      this.occurrence_number++;
+      return this.last;
+    }
+  }
+
+  next_second() {
+    return this.next_generic("BYSECOND", "SECONDLY", "second", "minute");
+  }
+
+  increment_second(inc) {
+    return this.increment_generic(inc, "second", 60, "minute");
+  }
+
+  next_minute() {
+    return this.next_generic("BYMINUTE", "MINUTELY",
+                             "minute", "hour", "next_second");
+  }
+
+  increment_minute(inc) {
+    return this.increment_generic(inc, "minute", 60, "hour");
+  }
+
+  next_hour() {
+    return this.next_generic("BYHOUR", "HOURLY", "hour",
+                             "monthday", "next_minute");
+  }
+
+  increment_hour(inc) {
+    this.increment_generic(inc, "hour", 24, "monthday");
+  }
+
+  next_day() {
+    let this_freq = (this.rule.freq == "DAILY");
+
+    if (this.next_hour() == 0) {
+      return 0;
+    }
+
+    if (this_freq) {
+      this.increment_monthday(this.rule.interval);
+    } else {
+      this.increment_monthday(1);
+    }
+
+    return 0;
+  }
+
+  next_week() {
+    let end_of_data = 0;
+
+    if (this.next_weekday_by_week() == 0) {
+      return end_of_data;
+    }
+
+    if (this.has_by_data("BYWEEKNO")) {
+      this.by_indices.BYWEEKNO++;
+
+      if (this.by_indices.BYWEEKNO == this.by_data.BYWEEKNO.length) {
+        this.by_indices.BYWEEKNO = 0;
+        end_of_data = 1;
+      }
+
+      // HACK should be first month of the year
+      this.last.month = 1;
+      this.last.day = 1;
+
+      let week_no = this.by_data.BYWEEKNO[this.by_indices.BYWEEKNO];
+
+      this.last.day += 7 * week_no;
+
+      if (end_of_data) {
+        this.increment_year(1);
+      }
+    } else {
+      // Jump to the next week
+      this.increment_monthday(7 * this.rule.interval);
+    }
+
+    return end_of_data;
+  }
+
+  /**
+   * Normalize each by day rule for a given year/month.
+   * Takes into account ordering and negative rules
+   *
+   * @private
+   * @param {Number} year         Current year.
+   * @param {Number} month        Current month.
+   * @param {Array}  rules        Array of rules.
+   *
+   * @return {Array} sorted and normalized rules.
+   *                 Negative rules will be expanded to their
+   *                 correct positive values for easier processing.
+   */
+  normalizeByMonthDayRules(year, month, rules) {
+    let daysInMonth = Time.daysInMonth(month, year);
+
+    // XXX: This is probably bad for performance to allocate
+    //      a new array for each month we scan, if possible
+    //      we should try to optimize this...
+    let newRules = [];
+
+    let ruleIdx = 0;
+    let len = rules.length;
+    let rule;
+
+    for (; ruleIdx < len; ruleIdx++) {
+      rule = parseInt(rules[ruleIdx], 10);
+      if (isNaN(rule)) {
+        throw new Error('Invalid BYMONTHDAY value');
+      }
+
+      // if this rule falls outside of given
+      // month discard it.
+      if (Math.abs(rule) > daysInMonth) {
+        continue;
+      }
+
+      // negative case
+      if (rule < 0) {
+        // we add (not subtract it is a negative number)
+        // one from the rule because 1 === last day of month
+        rule = daysInMonth + (rule + 1);
+      } else if (rule === 0) {
+        // skip zero: it is invalid.
+        continue;
+      }
+
+      // only add unique items...
+      if (newRules.indexOf(rule) === -1) {
+        newRules.push(rule);
+      }
+
+    }
+
+    // unique and sort
+    return newRules.sort(function(a, b) { return a - b; });
+  }
+
+  /**
+   * NOTES:
+   * We are given a list of dates in the month (BYMONTHDAY) (23, etc..)
+   * Also we are given a list of days (BYDAY) (MO, 2SU, etc..) when
+   * both conditions match a given date (this.last.day) iteration stops.
+   *
+   * @private
+   * @param {Boolean=} isInit     When given true will not increment the
+   *                                current day (this.last).
+   */
+  _byDayAndMonthDay(isInit) {
+    let byMonthDay; // setup in initMonth
+    let byDay = this.by_data.BYDAY;
+
+    let date;
+    let dateIdx = 0;
+    let dateLen; // setup in initMonth
+    let dayLen = byDay.length;
+
+    // we are not valid by default
+    let dataIsValid = 0;
+
+    let daysInMonth;
+    let self = this;
+    // we need a copy of this, because a DateTime gets normalized
+    // automatically if the day is out of range. At some points we
+    // set the last day to 0 to start counting.
+    let lastDay = this.last.day;
+
+    function initMonth() {
+      daysInMonth = Time.daysInMonth(
+        self.last.month, self.last.year
+      );
+
+      byMonthDay = self.normalizeByMonthDayRules(
+        self.last.year,
+        self.last.month,
+        self.by_data.BYMONTHDAY
+      );
+
+      dateLen = byMonthDay.length;
+
+      // For the case of more than one occurrence in one month
+      // we have to be sure to start searching after the last
+      // found date or at the last BYMONTHDAY, unless we are
+      // initializing the iterator because in this case we have
+      // to consider the last found date too.
+      while (byMonthDay[dateIdx] <= lastDay &&
+             !(isInit && byMonthDay[dateIdx] == lastDay) &&
+             dateIdx < dateLen - 1) {
+        dateIdx++;
+      }
+    }
+
+    function nextMonth() {
+      // since the day is incremented at the start
+      // of the loop below, we need to start at 0
+      lastDay = 0;
+      self.increment_month();
+      dateIdx = 0;
+      initMonth();
+    }
+
+    initMonth();
+
+    // should come after initMonth
+    if (isInit) {
+      lastDay -= 1;
+    }
+
+    // Use a counter to avoid an infinite loop with malformed rules.
+    // Stop checking after 4 years so we consider also a leap year.
+    let monthsCounter = 48;
+
+    while (!dataIsValid && monthsCounter) {
+      monthsCounter--;
+      // increment the current date. This is really
+      // important otherwise we may fall into the infinite
+      // loop trap. The initial date takes care of the case
+      // where the current date is the date we are looking
+      // for.
+      date = lastDay + 1;
+
+      if (date > daysInMonth) {
+        nextMonth();
+        continue;
+      }
+
+      // find next date
+      let next = byMonthDay[dateIdx++];
+
+      // this logic is dependent on the BYMONTHDAYS
+      // being in order (which is done by #normalizeByMonthDayRules)
+      if (next >= date) {
+        // if the next month day is in the future jump to it.
+        lastDay = next;
+      } else {
+        // in this case the 'next' monthday has past
+        // we must move to the month.
+        nextMonth();
+        continue;
+      }
+
+      // Now we can loop through the day rules to see
+      // if one matches the current month date.
+      for (let dayIdx = 0; dayIdx < dayLen; dayIdx++) {
+        let parts = this.ruleDayOfWeek(byDay[dayIdx]);
+        let pos = parts[0];
+        let dow = parts[1];
+
+        this.last.day = lastDay;
+        if (this.last.isNthWeekDay(dow, pos)) {
+          // when we find the valid one we can mark
+          // the conditions as met and break the loop.
+          // (Because we have this condition above
+          //  it will also break the parent loop).
+          dataIsValid = 1;
+          break;
+        }
+      }
+
+      // It is completely possible that the combination
+      // cannot be matched in the current month.
+      // When we reach the end of possible combinations
+      // in the current month we iterate to the next one.
+      // since dateIdx is incremented right after getting
+      // "next", we don't need dateLen -1 here.
+      if (!dataIsValid && dateIdx === dateLen) {
+        nextMonth();
+        continue;
+      }
+    }
+
+    if (monthsCounter <= 0) {
+      // Checked 4 years without finding a Byday that matches
+      // a Bymonthday. Maybe the rule is not correct.
+      throw new Error("Malformed values in BYDAY combined with BYMONTHDAY parts");
+    }
+
+
+    return dataIsValid;
+  }
+
+  next_month() {
+    let data_valid = 1;
+
+    if (this.next_hour() == 0) {
+      return data_valid;
+    }
+
+    if (this.has_by_data("BYDAY") && this.has_by_data("BYMONTHDAY")) {
+      data_valid = this._byDayAndMonthDay();
+    } else if (this.has_by_data("BYDAY")) {
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      let setpos = 0;
+      let setpos_total = 0;
+
+      if (this.has_by_data("BYSETPOS")) {
+        let last_day = this.last.day;
+        for (let day = 1; day <= daysInMonth; day++) {
+          this.last.day = day;
+          if (this.is_day_in_byday(this.last)) {
+            setpos_total++;
+            if (day <= last_day) {
+              setpos++;
+            }
+          }
+        }
+        this.last.day = last_day;
+      }
+
+      data_valid = 0;
+      let day;
+      for (day = this.last.day + 1; day <= daysInMonth; day++) {
+        this.last.day = day;
+
+        if (this.is_day_in_byday(this.last)) {
+          if (!this.has_by_data("BYSETPOS") ||
+              this.check_set_position(++setpos) ||
+              this.check_set_position(setpos - setpos_total - 1)) {
+
+            data_valid = 1;
+            break;
+          }
+        }
+      }
+
+      if (day > daysInMonth) {
+        this.last.day = 1;
+        this.increment_month();
+
+        if (this.is_day_in_byday(this.last)) {
+          if (!this.has_by_data("BYSETPOS") || this.check_set_position(1)) {
+            data_valid = 1;
+          }
+        } else {
+          data_valid = 0;
+        }
+      }
+    } else if (this.has_by_data("BYMONTHDAY")) {
+      this.by_indices.BYMONTHDAY++;
+
+      if (this.by_indices.BYMONTHDAY >= this.by_data.BYMONTHDAY.length) {
+        this.by_indices.BYMONTHDAY = 0;
+        this.increment_month();
+        if (this.by_indices.BYMONTHDAY >= this.by_data.BYMONTHDAY.length) {
+          return 0;
+        }
+      }
+
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      let day = this.by_data.BYMONTHDAY[this.by_indices.BYMONTHDAY];
+
+      if (day < 0) {
+        day = daysInMonth + day + 1;
+      }
+
+      if (day > daysInMonth) {
+        this.last.day = 1;
+        data_valid = this.is_day_in_byday(this.last);
+      } else {
+        this.last.day = day;
+      }
+    } else {
+      this.increment_month();
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      if (this.by_data.BYMONTHDAY[0] > daysInMonth) {
+        data_valid = 0;
+      } else {
+        this.last.day = this.by_data.BYMONTHDAY[0];
+      }
+    }
+
+    return data_valid;
+  }
+
+  next_weekday_by_week() {
+    let end_of_data = 0;
+
+    if (this.next_hour() == 0) {
+      return end_of_data;
+    }
+
+    if (!this.has_by_data("BYDAY")) {
+      return 1;
+    }
+
+    for (;;) {
+      let tt = new Time();
+      this.by_indices.BYDAY++;
+
+      if (this.by_indices.BYDAY == Object.keys(this.by_data.BYDAY).length) {
+        this.by_indices.BYDAY = 0;
+        end_of_data = 1;
+      }
+
+      let coded_day = this.by_data.BYDAY[this.by_indices.BYDAY];
+      let parts = this.ruleDayOfWeek(coded_day);
+      let dow = parts[1];
+
+      dow -= this.rule.wkst;
+
+      if (dow < 0) {
+        dow += 7;
+      }
+
+      tt.year = this.last.year;
+      tt.month = this.last.month;
+      tt.day = this.last.day;
+
+      let startOfWeek = tt.startDoyWeek(this.rule.wkst);
+
+      if (dow + startOfWeek < 1) {
+        // The selected date is in the previous year
+        if (!end_of_data) {
+          continue;
+        }
+      }
+
+      let next = Time.fromDayOfYear(startOfWeek + dow, this.last.year);
+
+      /**
+       * The normalization horrors below are due to
+       * the fact that when the year/month/day changes
+       * it can effect the other operations that come after.
+       */
+      this.last.year = next.year;
+      this.last.month = next.month;
+      this.last.day = next.day;
+
+      return end_of_data;
+    }
+  }
+
+  next_year() {
+    if (this.next_hour() == 0) {
+      return 0;
+    }
+
+    if (++this.days_index == this.days.length) {
+      this.days_index = 0;
+      do {
+        this.increment_year(this.rule.interval);
+        if (this.has_by_data("BYMONTHDAY")) {
+          this.by_data.BYMONTHDAY = this.normalizeByMonthDayRules(
+            this.last.year,
+            this.last.month,
+            this.rule.parts.BYMONTHDAY
+          );
+        }
+        this.expand_year_days(this.last.year);
+      } while (this.days.length == 0);
+    }
+
+    this._nextByYearDay();
+
+    return 1;
+  }
+
+  _nextByYearDay() {
+    let doy = this.days[this.days_index];
+    let year = this.last.year;
+    if (doy < 1) {
+        // Time.fromDayOfYear(doy, year) indexes relative to the
+        // start of the given year. That is different from the
+        // semantics of BYYEARDAY where negative indexes are an
+        // offset from the end of the given year.
+        doy += 1;
+        year += 1;
+    }
+    let next = Time.fromDayOfYear(doy, year);
+    this.last.day = next.day;
+    this.last.month = next.month;
+  }
+
+  /**
+   * @param dow (eg: '1TU', '-1MO')
+   * @param {weekDay=} aWeekStart The week start weekday
+   * @return [pos, numericDow] (eg: [1, 3]) numericDow is relative to aWeekStart
+   */
+  ruleDayOfWeek(dow, aWeekStart) {
+    let matches = dow.match(/([+-]?[0-9])?(MO|TU|WE|TH|FR|SA|SU)/);
+    if (matches) {
+      let pos = parseInt(matches[1] || 0, 10);
+      dow = Recur.icalDayToNumericDay(matches[2], aWeekStart);
+      return [pos, dow];
+    } else {
+      return [0, 0];
+    }
+  }
+
+  next_generic(aRuleType, aInterval, aDateAttr, aFollowingAttr, aPreviousIncr) {
+    let has_by_rule = (aRuleType in this.by_data);
+    let this_freq = (this.rule.freq == aInterval);
+    let end_of_data = 0;
+
+    if (aPreviousIncr && this[aPreviousIncr]() == 0) {
+      return end_of_data;
+    }
+
+    if (has_by_rule) {
+      this.by_indices[aRuleType]++;
+      let dta = this.by_data[aRuleType];
+
+      if (this.by_indices[aRuleType] == dta.length) {
+        this.by_indices[aRuleType] = 0;
+        end_of_data = 1;
+      }
+      this.last[aDateAttr] = dta[this.by_indices[aRuleType]];
+    } else if (this_freq) {
+      this["increment_" + aDateAttr](this.rule.interval);
+    }
+
+    if (has_by_rule && end_of_data && this_freq) {
+      this["increment_" + aFollowingAttr](1);
+    }
+
+    return end_of_data;
+  }
+
+  increment_monthday(inc) {
+    for (let i = 0; i < inc; i++) {
+      let daysInMonth = Time.daysInMonth(this.last.month, this.last.year);
+      this.last.day++;
+
+      if (this.last.day > daysInMonth) {
+        this.last.day -= daysInMonth;
+        this.increment_month();
+      }
+    }
+  }
+
+  increment_month() {
+    this.last.day = 1;
+    if (this.has_by_data("BYMONTH")) {
+      this.by_indices.BYMONTH++;
+
+      if (this.by_indices.BYMONTH == this.by_data.BYMONTH.length) {
+        this.by_indices.BYMONTH = 0;
+        this.increment_year(1);
+      }
+
+      this.last.month = this.by_data.BYMONTH[this.by_indices.BYMONTH];
+    } else {
+      if (this.rule.freq == "MONTHLY") {
+        this.last.month += this.rule.interval;
+      } else {
+        this.last.month++;
+      }
+
+      this.last.month--;
+      let years = trunc(this.last.month / 12);
+      this.last.month %= 12;
+      this.last.month++;
+
+      if (years != 0) {
+        this.increment_year(years);
+      }
+    }
+
+    if (this.has_by_data("BYMONTHDAY")) {
+      this.by_data.BYMONTHDAY = this.normalizeByMonthDayRules(
+        this.last.year,
+        this.last.month,
+        this.rule.parts.BYMONTHDAY
+      );
+    }
+  }
+
+  increment_year(inc) {
+    // Don't jump into the next month if this.last is Feb 29.
+    this.last.day = 1;
+    this.last.year += inc;
+  }
+
+  increment_generic(inc, aDateAttr, aFactor, aNextIncrement) {
+    this.last[aDateAttr] += inc;
+    let nextunit = trunc(this.last[aDateAttr] / aFactor);
+    this.last[aDateAttr] %= aFactor;
+    if (nextunit != 0) {
+      this["increment_" + aNextIncrement](nextunit);
+    }
+  }
+
+  has_by_data(aRuleType) {
+    return (aRuleType in this.rule.parts);
+  }
+
+  expand_year_days(aYear) {
+    let t = new Time();
+    this.days = [];
+
+    // We need our own copy with a few keys set
+    let parts = {};
+    let rules = ["BYDAY", "BYWEEKNO", "BYMONTHDAY", "BYMONTH", "BYYEARDAY"];
+    for (let part of rules) {
+      if (part in this.rule.parts) {
+        parts[part] = this.rule.parts[part];
+      }
+    }
+
+    if ("BYMONTH" in parts && "BYWEEKNO" in parts) {
+      let valid = 1;
+      let validWeeks = {};
+      t.year = aYear;
+      t.isDate = true;
+
+      for (let monthIdx = 0; monthIdx < this.by_data.BYMONTH.length; monthIdx++) {
+        let month = this.by_data.BYMONTH[monthIdx];
+        t.month = month;
+        t.day = 1;
+        let first_week = t.weekNumber(this.rule.wkst);
+        t.day = Time.daysInMonth(month, aYear);
+        let last_week = t.weekNumber(this.rule.wkst);
+        for (monthIdx = first_week; monthIdx < last_week; monthIdx++) {
+          validWeeks[monthIdx] = 1;
+        }
+      }
+
+      for (let weekIdx = 0; weekIdx < this.by_data.BYWEEKNO.length && valid; weekIdx++) {
+        let weekno = this.by_data.BYWEEKNO[weekIdx];
+        if (weekno < 52) {
+          valid &= validWeeks[weekIdx];
+        } else {
+          valid = 0;
+        }
+      }
+
+      if (valid) {
+        delete parts.BYMONTH;
+      } else {
+        delete parts.BYWEEKNO;
+      }
+    }
+
+    let partCount = Object.keys(parts).length;
+
+    if (partCount == 0) {
+      let t1 = this.dtstart.clone();
+      t1.year = this.last.year;
+      this.days.push(t1.dayOfYear());
+    } else if (partCount == 1 && "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let t2 = this.dtstart.clone();
+        t2.year = aYear;
+        t2.month = month;
+        t2.isDate = true;
+        this.days.push(t2.dayOfYear());
+      }
+    } else if (partCount == 1 && "BYMONTHDAY" in parts) {
+      for (let monthday of this.by_data.BYMONTHDAY) {
+        let t3 = this.dtstart.clone();
+        if (monthday < 0) {
+          let daysInMonth = Time.daysInMonth(t3.month, aYear);
+          monthday = monthday + daysInMonth + 1;
+        }
+        t3.day = monthday;
+        t3.year = aYear;
+        t3.isDate = true;
+        this.days.push(t3.dayOfYear());
+      }
+    } else if (partCount == 2 &&
+               "BYMONTHDAY" in parts &&
+               "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let daysInMonth = Time.daysInMonth(month, aYear);
+        for (let monthday of this.by_data.BYMONTHDAY) {
+          if (monthday < 0) {
+            monthday = monthday + daysInMonth + 1;
+          }
+          t.day = monthday;
+          t.month = month;
+          t.year = aYear;
+          t.isDate = true;
+
+          this.days.push(t.dayOfYear());
+        }
+      }
+    } else if (partCount == 1 && "BYWEEKNO" in parts) ; else if (partCount == 2 &&
+               "BYWEEKNO" in parts &&
+               "BYMONTHDAY" in parts) ; else if (partCount == 1 && "BYDAY" in parts) {
+      this.days = this.days.concat(this.expand_by_day(aYear));
+    } else if (partCount == 2 && "BYDAY" in parts && "BYMONTH" in parts) {
+      for (let month of this.by_data.BYMONTH) {
+        let daysInMonth = Time.daysInMonth(month, aYear);
+
+        t.year = aYear;
+        t.month = month;
+        t.day = 1;
+        t.isDate = true;
+
+        let first_dow = t.dayOfWeek();
+        let doy_offset = t.dayOfYear() - 1;
+
+        t.day = daysInMonth;
+        let last_dow = t.dayOfWeek();
+
+        if (this.has_by_data("BYSETPOS")) {
+          let by_month_day = [];
+          for (let day = 1; day <= daysInMonth; day++) {
+            t.day = day;
+            if (this.is_day_in_byday(t)) {
+              by_month_day.push(day);
+            }
+          }
+
+          for (let spIndex = 0; spIndex < by_month_day.length; spIndex++) {
+            if (this.check_set_position(spIndex + 1) ||
+                this.check_set_position(spIndex - by_month_day.length)) {
+              this.days.push(doy_offset + by_month_day[spIndex]);
+            }
+          }
+        } else {
+          for (let coded_day of this.by_data.BYDAY) {
+            let bydayParts = this.ruleDayOfWeek(coded_day);
+            let pos = bydayParts[0];
+            let dow = bydayParts[1];
+            let month_day;
+
+            let first_matching_day = ((dow + 7 - first_dow) % 7) + 1;
+            let last_matching_day = daysInMonth - ((last_dow + 7 - dow) % 7);
+
+            if (pos == 0) {
+              for (let day = first_matching_day; day <= daysInMonth; day += 7) {
+                this.days.push(doy_offset + day);
+              }
+            } else if (pos > 0) {
+              month_day = first_matching_day + (pos - 1) * 7;
+
+              if (month_day <= daysInMonth) {
+                this.days.push(doy_offset + month_day);
+              }
+            } else {
+              month_day = last_matching_day + (pos + 1) * 7;
+
+              if (month_day > 0) {
+                this.days.push(doy_offset + month_day);
+              }
+            }
+          }
+        }
+      }
+      // Return dates in order of occurrence (1,2,3,...) instead
+      // of by groups of weekdays (1,8,15,...,2,9,16,...).
+      this.days.sort(function(a, b) { return a - b; }); // Comparator function allows to sort numbers.
+    } else if (partCount == 2 && "BYDAY" in parts && "BYMONTHDAY" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+        if (this.by_data.BYMONTHDAY.indexOf(tt.day) >= 0) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 3 &&
+               "BYDAY" in parts &&
+               "BYMONTHDAY" in parts &&
+               "BYMONTH" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+
+        if (this.by_data.BYMONTH.indexOf(tt.month) >= 0 &&
+            this.by_data.BYMONTHDAY.indexOf(tt.day) >= 0) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 2 && "BYDAY" in parts && "BYWEEKNO" in parts) {
+      let expandedDays = this.expand_by_day(aYear);
+
+      for (let day of expandedDays) {
+        let tt = Time.fromDayOfYear(day, aYear);
+        let weekno = tt.weekNumber(this.rule.wkst);
+
+        if (this.by_data.BYWEEKNO.indexOf(weekno)) {
+          this.days.push(day);
+        }
+      }
+    } else if (partCount == 3 &&
+               "BYDAY" in parts &&
+               "BYWEEKNO" in parts &&
+               "BYMONTHDAY" in parts) ; else if (partCount == 1 && "BYYEARDAY" in parts) {
+      this.days = this.days.concat(this.by_data.BYYEARDAY);
+    } else {
+      this.days = [];
+    }
+
+    let daysInYear = Time.isLeapYear(aYear) ? 366 : 365;
+    this.days.sort((a, b) => {
+      if (a < 0) a += daysInYear + 1;
+      if (b < 0) b += daysInYear + 1;
+      return a - b;
+    });
+
+    return 0;
+  }
+
+  expand_by_day(aYear) {
+
+    let days_list = [];
+    let tmp = this.last.clone();
+
+    tmp.year = aYear;
+    tmp.month = 1;
+    tmp.day = 1;
+    tmp.isDate = true;
+
+    let start_dow = tmp.dayOfWeek();
+
+    tmp.month = 12;
+    tmp.day = 31;
+    tmp.isDate = true;
+
+    let end_dow = tmp.dayOfWeek();
+    let end_year_day = tmp.dayOfYear();
+
+    for (let day of this.by_data.BYDAY) {
+      let parts = this.ruleDayOfWeek(day);
+      let pos = parts[0];
+      let dow = parts[1];
+
+      if (pos == 0) {
+        let tmp_start_doy = ((dow + 7 - start_dow) % 7) + 1;
+
+        for (let doy = tmp_start_doy; doy <= end_year_day; doy += 7) {
+          days_list.push(doy);
+        }
+
+      } else if (pos > 0) {
+        let first;
+        if (dow >= start_dow) {
+          first = dow - start_dow + 1;
+        } else {
+          first = dow - start_dow + 8;
+        }
+
+        days_list.push(first + (pos - 1) * 7);
+      } else {
+        let last;
+        pos = -pos;
+
+        if (dow <= end_dow) {
+          last = end_year_day - end_dow + dow;
+        } else {
+          last = end_year_day - end_dow + dow - 7;
+        }
+
+        days_list.push(last - (pos - 1) * 7);
+      }
+    }
+    return days_list;
+  }
+
+  is_day_in_byday(tt) {
+    if (this.by_data.BYDAY) {
+      for (let day of this.by_data.BYDAY) {
+        let parts = this.ruleDayOfWeek(day);
+        let pos = parts[0];
+        let dow = parts[1];
+        let this_dow = tt.dayOfWeek();
+
+        if ((pos == 0 && dow == this_dow) ||
+            (tt.nthWeekDay(dow, pos) == tt.day)) {
+          return 1;
+        }
+      }
+    }
+
+    return 0;
+  }
+
+  /**
+   * Checks if given value is in BYSETPOS.
+   *
+   * @private
+   * @param {Numeric} aPos position to check for.
+   * @return {Boolean} false unless BYSETPOS rules exist
+   *                   and the given value is present in rules.
+   */
+  check_set_position(aPos) {
+    if (this.has_by_data('BYSETPOS')) {
+      let idx = this.by_data.BYSETPOS.indexOf(aPos);
+      // negative numbers are not false-y
+      return idx !== -1;
+    }
+    return false;
+  }
+
+  sort_byday_rules(aRules) {
+    for (let i = 0; i < aRules.length; i++) {
+      for (let j = 0; j < i; j++) {
+        let one = this.ruleDayOfWeek(aRules[j], this.rule.wkst)[1];
+        let two = this.ruleDayOfWeek(aRules[i], this.rule.wkst)[1];
+
+        if (one > two) {
+          let tmp = aRules[i];
+          aRules[i] = aRules[j];
+          aRules[j] = tmp;
+        }
+      }
+    }
+  }
+
+  check_contract_restriction(aRuleType, v) {
+    let indexMapValue = RecurIterator._indexMap[aRuleType];
+    let ruleMapValue = RecurIterator._expandMap[this.rule.freq][indexMapValue];
+    let pass = false;
+
+    if (aRuleType in this.by_data &&
+        ruleMapValue == RecurIterator.CONTRACT) {
+
+      let ruleType = this.by_data[aRuleType];
+
+      for (let bydata of ruleType) {
+        if (bydata == v) {
+          pass = true;
+          break;
+        }
+      }
+    } else {
+      // Not a contracting byrule or has no data, test passes
+      pass = true;
+    }
+    return pass;
+  }
+
+  check_contracting_rules() {
+    let dow = this.last.dayOfWeek();
+    let weekNo = this.last.weekNumber(this.rule.wkst);
+    let doy = this.last.dayOfYear();
+
+    return (this.check_contract_restriction("BYSECOND", this.last.second) &&
+            this.check_contract_restriction("BYMINUTE", this.last.minute) &&
+            this.check_contract_restriction("BYHOUR", this.last.hour) &&
+            this.check_contract_restriction("BYDAY", Recur.numericDayToIcalDay(dow)) &&
+            this.check_contract_restriction("BYWEEKNO", weekNo) &&
+            this.check_contract_restriction("BYMONTHDAY", this.last.day) &&
+            this.check_contract_restriction("BYMONTH", this.last.month) &&
+            this.check_contract_restriction("BYYEARDAY", doy));
+  }
+
+  setup_defaults(aRuleType, req, deftime) {
+    let indexMapValue = RecurIterator._indexMap[aRuleType];
+    let ruleMapValue = RecurIterator._expandMap[this.rule.freq][indexMapValue];
+
+    if (ruleMapValue != RecurIterator.CONTRACT) {
+      if (!(aRuleType in this.by_data)) {
+        this.by_data[aRuleType] = [deftime];
+      }
+      if (this.rule.freq != req) {
+        return this.by_data[aRuleType][0];
+      }
+    }
+    return deftime;
+  }
+
+  /**
+   * Convert iterator into a serialize-able object.  Will preserve current
+   * iteration sequence to ensure the seamless continuation of the recurrence
+   * rule.
+   * @return {Object}
+   */
+  toJSON() {
+    let result = Object.create(null);
+
+    result.initialized = this.initialized;
+    result.rule = this.rule.toJSON();
+    result.dtstart = this.dtstart.toJSON();
+    result.by_data = this.by_data;
+    result.days = this.days;
+    result.last = this.last.toJSON();
+    result.by_indices = this.by_indices;
+    result.occurrence_number = this.occurrence_number;
+
+    return result;
+  }
+}
+
+/**
+ * An error indicating that a recurrence rule is invalid and produces no
+ * occurrences.
+ *
+ * @extends {Error}
+ * @class
+ */
+class InvalidRecurrenceRuleError extends Error {
+  constructor() {
+    super("Recurrence rule has no valid occurrences");
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").weekDay} weekDay
+ * Imports the 'weekDay' type from the "types.js" module
+ * @typedef {import("./types.js").frequencyValues} frequencyValues
+ * Imports the 'frequencyValues' type from the "types.js" module
+ */
+
+const VALID_DAY_NAMES = /^(SU|MO|TU|WE|TH|FR|SA)$/;
+const VALID_BYDAY_PART = /^([+-])?(5[0-3]|[1-4][0-9]|[1-9])?(SU|MO|TU|WE|TH|FR|SA)$/;
+const DOW_MAP = {
+  SU: Time.SUNDAY,
+  MO: Time.MONDAY,
+  TU: Time.TUESDAY,
+  WE: Time.WEDNESDAY,
+  TH: Time.THURSDAY,
+  FR: Time.FRIDAY,
+  SA: Time.SATURDAY
+};
+
+const REVERSE_DOW_MAP = Object.fromEntries(Object.entries(DOW_MAP).map(entry => entry.reverse()));
+
+const ALLOWED_FREQ = ['SECONDLY', 'MINUTELY', 'HOURLY',
+                      'DAILY', 'WEEKLY', 'MONTHLY', 'YEARLY'];
+
+/**
+ * This class represents the "recur" value type, used for example by RRULE. It provides methods to
+ * calculate occurrences among others.
+ *
+ * @memberof ICAL
+ */
+class Recur {
+  /**
+   * Creates a new {@link ICAL.Recur} instance from the passed string.
+   *
+   * @param {String} string         The string to parse
+   * @return {Recur}                The created recurrence instance
+   */
+  static fromString(string) {
+    let data = this._stringToData(string, false);
+    return new Recur(data);
+  }
+
+  /**
+   * Creates a new {@link ICAL.Recur} instance using members from the passed
+   * data object.
+   *
+   * @param {Object} aData                              An object with members of the recurrence
+   * @param {frequencyValues=} aData.freq               The frequency value
+   * @param {Number=} aData.interval                    The INTERVAL value
+   * @param {weekDay=} aData.wkst                       The week start value
+   * @param {Time=} aData.until                         The end of the recurrence set
+   * @param {Number=} aData.count                       The number of occurrences
+   * @param {Array.<Number>=} aData.bysecond            The seconds for the BYSECOND part
+   * @param {Array.<Number>=} aData.byminute            The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} aData.byhour              The hours for the BYHOUR part
+   * @param {Array.<String>=} aData.byday               The BYDAY values
+   * @param {Array.<Number>=} aData.bymonthday          The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} aData.byyearday           The days for the BYYEARDAY part
+   * @param {Array.<Number>=} aData.byweekno            The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} aData.bymonth             The month for the BYMONTH part
+   * @param {Array.<Number>=} aData.bysetpos            The positionals for the BYSETPOS part
+   */
+  static fromData(aData) {
+    return new Recur(aData);
+  }
+
+  /**
+   * Converts a recurrence string to a data object, suitable for the fromData
+   * method.
+   *
+   * @private
+   * @param {String} string     The string to parse
+   * @param {Boolean} fmtIcal   If true, the string is considered to be an
+   *                              iCalendar string
+   * @return {Recur}            The recurrence instance
+   */
+  static _stringToData(string, fmtIcal) {
+    let dict = Object.create(null);
+
+    // split is slower in FF but fast enough.
+    // v8 however this is faster then manual split?
+    let values = string.split(';');
+    let len = values.length;
+
+    for (let i = 0; i < len; i++) {
+      let parts = values[i].split('=');
+      let ucname = parts[0].toUpperCase();
+      let lcname = parts[0].toLowerCase();
+      let name = (fmtIcal ? lcname : ucname);
+      let value = parts[1];
+
+      if (ucname in partDesign) {
+        let partArr = value.split(',');
+        let partSet = new Set();
+
+        for (let part of partArr) {
+          partSet.add(partDesign[ucname](part));
+        }
+        partArr = [...partSet];
+
+        dict[name] = (partArr.length == 1 ? partArr[0] : partArr);
+      } else if (ucname in optionDesign) {
+        optionDesign[ucname](value, dict, fmtIcal);
+      } else {
+        // Don't swallow unknown values. Just set them as they are.
+        dict[lcname] = value;
+      }
+    }
+
+    return dict;
+  }
+
+  /**
+   * Convert an ical representation of a day (SU, MO, etc..)
+   * into a numeric value of that day.
+   *
+   * @param {String} string     The iCalendar day name
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {Number}           Numeric value of given day
+   */
+  static icalDayToNumericDay(string, aWeekStart) {
+    //XXX: this is here so we can deal
+    //     with possibly invalid string values.
+    let firstDow = aWeekStart || Time.SUNDAY;
+    return ((DOW_MAP[string] - firstDow + 7) % 7) + 1;
+  }
+
+  /**
+   * Convert a numeric day value into its ical representation (SU, MO, etc..)
+   *
+   * @param {Number} num        Numeric value of given day
+   * @param {weekDay=} aWeekStart
+   *        The week start weekday, defaults to SUNDAY
+   * @return {String}           The ICAL day value, e.g SU,MO,...
+   */
+  static numericDayToIcalDay(num, aWeekStart) {
+    //XXX: this is here so we can deal with possibly invalid number values.
+    //     Also, this allows consistent mapping between day numbers and day
+    //     names for external users.
+    let firstDow = aWeekStart || Time.SUNDAY;
+    let dow = (num + firstDow - Time.SUNDAY);
+    if (dow > 7) {
+      dow -= 7;
+    }
+    return REVERSE_DOW_MAP[dow];
+  }
+
+  /**
+   * Create a new instance of the Recur class.
+   *
+   * @param {Object} data                               An object with members of the recurrence
+   * @param {frequencyValues=} data.freq                The frequency value
+   * @param {Number=} data.interval                     The INTERVAL value
+   * @param {weekDay=} data.wkst                        The week start value
+   * @param {Time=} data.until                          The end of the recurrence set
+   * @param {Number=} data.count                        The number of occurrences
+   * @param {Array.<Number>=} data.bysecond             The seconds for the BYSECOND part
+   * @param {Array.<Number>=} data.byminute             The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} data.byhour               The hours for the BYHOUR part
+   * @param {Array.<String>=} data.byday                The BYDAY values
+   * @param {Array.<Number>=} data.bymonthday           The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} data.byyearday            The days for the BYYEARDAY part
+   * @param {Array.<Number>=} data.byweekno             The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} data.bymonth              The month for the BYMONTH part
+   * @param {Array.<Number>=} data.bysetpos             The positionals for the BYSETPOS part
+   */
+  constructor(data) {
+    this.wrappedJSObject = this;
+    this.parts = {};
+
+    if (data && typeof(data) === 'object') {
+      this.fromData(data);
+    }
+  }
+
+  /**
+   * An object holding the BY-parts of the recurrence rule
+   * @memberof ICAL.Recur
+   * @typedef {Object} byParts
+   * @property {Array.<Number>=} BYSECOND            The seconds for the BYSECOND part
+   * @property {Array.<Number>=} BYMINUTE            The minutes for the BYMINUTE part
+   * @property {Array.<Number>=} BYHOUR              The hours for the BYHOUR part
+   * @property {Array.<String>=} BYDAY               The BYDAY values
+   * @property {Array.<Number>=} BYMONTHDAY          The days for the BYMONTHDAY part
+   * @property {Array.<Number>=} BYYEARDAY           The days for the BYYEARDAY part
+   * @property {Array.<Number>=} BYWEEKNO            The weeks for the BYWEEKNO part
+   * @property {Array.<Number>=} BYMONTH             The month for the BYMONTH part
+   * @property {Array.<Number>=} BYSETPOS            The positionals for the BYSETPOS part
+   */
+
+  /**
+   * An object holding the BY-parts of the recurrence rule
+   * @type {byParts}
+   */
+  parts = null;
+
+  /**
+   * The interval value for the recurrence rule.
+   * @type {Number}
+   */
+  interval = 1;
+
+  /**
+   * The week start day
+   *
+   * @type {weekDay}
+   * @default ICAL.Time.MONDAY
+   */
+  wkst = Time.MONDAY;
+
+  /**
+   * The end of the recurrence
+   * @type {?Time}
+   */
+  until = null;
+
+  /**
+   * The maximum number of occurrences
+   * @type {?Number}
+   */
+  count = null;
+
+  /**
+   * The frequency value.
+   * @type {frequencyValues}
+   */
+  freq = null;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalrecur"
+   */
+  icalclass = "icalrecur";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "recur"
+   */
+  icaltype = "recur";
+
+  /**
+   * Create a new iterator for this recurrence rule. The passed start date
+   * must be the start date of the event, not the start of the range to
+   * search in.
+   *
+   * @example
+   * let recur = comp.getFirstPropertyValue('rrule');
+   * let dtstart = comp.getFirstPropertyValue('dtstart');
+   * let iter = recur.iterator(dtstart);
+   * for (let next = iter.next(); next; next = iter.next()) {
+   *   if (next.compare(rangeStart) < 0) {
+   *     continue;
+   *   }
+   *   console.log(next.toString());
+   * }
+   *
+   * @param {Time} aStart        The item's start date
+   * @return {RecurIterator}     The recurrence iterator
+   */
+  iterator(aStart) {
+    return new RecurIterator({
+      rule: this,
+      dtstart: aStart
+    });
+  }
+
+  /**
+   * Returns a clone of the recurrence object.
+   *
+   * @return {Recur}      The cloned object
+   */
+  clone() {
+    return new Recur(this.toJSON());
+  }
+
+  /**
+   * Checks if the current rule is finite, i.e. has a count or until part.
+   *
+   * @return {Boolean}        True, if the rule is finite
+   */
+  isFinite() {
+    return !!(this.count || this.until);
+  }
+
+  /**
+   * Checks if the current rule has a count part, and not limited by an until
+   * part.
+   *
+   * @return {Boolean}        True, if the rule is by count
+   */
+  isByCount() {
+    return !!(this.count && !this.until);
+  }
+
+  /**
+   * Adds a component (part) to the recurrence rule. This is not a component
+   * in the sense of {@link ICAL.Component}, but a part of the recurrence
+   * rule, i.e. BYMONTH.
+   *
+   * @param {String} aType            The name of the component part
+   * @param {Array|String} aValue     The component value
+   */
+  addComponent(aType, aValue) {
+    let ucname = aType.toUpperCase();
+    if (ucname in this.parts) {
+      this.parts[ucname].push(aValue);
+    } else {
+      this.parts[ucname] = [aValue];
+    }
+  }
+
+  /**
+   * Sets the component value for the given by-part.
+   *
+   * @param {String} aType        The component part name
+   * @param {Array} aValues       The component values
+   */
+  setComponent(aType, aValues) {
+    this.parts[aType.toUpperCase()] = aValues.slice();
+  }
+
+  /**
+   * Gets (a copy) of the requested component value.
+   *
+   * @param {String} aType        The component part name
+   * @return {Array}              The component part value
+   */
+  getComponent(aType) {
+    let ucname = aType.toUpperCase();
+    return (ucname in this.parts ? this.parts[ucname].slice() : []);
+  }
+
+  /**
+   * Retrieves the next occurrence after the given recurrence id. See the
+   * guide on {@tutorial terminology} for more details.
+   *
+   * NOTE: Currently, this method iterates all occurrences from the start
+   * date. It should not be called in a loop for performance reasons. If you
+   * would like to get more than one occurrence, you can iterate the
+   * occurrences manually, see the example on the
+   * {@link ICAL.Recur#iterator iterator} method.
+   *
+   * @param {Time} aStartTime        The start of the event series
+   * @param {Time} aRecurrenceId     The date of the last occurrence
+   * @return {Time}                  The next occurrence after
+   */
+  getNextOccurrence(aStartTime, aRecurrenceId) {
+    let iter = this.iterator(aStartTime);
+    let next;
+
+    do {
+      next = iter.next();
+    } while (next && next.compare(aRecurrenceId) <= 0);
+
+    if (next && aRecurrenceId.zone) {
+      next.zone = aRecurrenceId.zone;
+    }
+
+    return next;
+  }
+
+  /**
+   * Sets up the current instance using members from the passed data object.
+   *
+   * @param {Object} data                               An object with members of the recurrence
+   * @param {frequencyValues=} data.freq                The frequency value
+   * @param {Number=} data.interval                     The INTERVAL value
+   * @param {weekDay=} data.wkst                        The week start value
+   * @param {Time=} data.until                          The end of the recurrence set
+   * @param {Number=} data.count                        The number of occurrences
+   * @param {Array.<Number>=} data.bysecond             The seconds for the BYSECOND part
+   * @param {Array.<Number>=} data.byminute             The minutes for the BYMINUTE part
+   * @param {Array.<Number>=} data.byhour               The hours for the BYHOUR part
+   * @param {Array.<String>=} data.byday                The BYDAY values
+   * @param {Array.<Number>=} data.bymonthday           The days for the BYMONTHDAY part
+   * @param {Array.<Number>=} data.byyearday            The days for the BYYEARDAY part
+   * @param {Array.<Number>=} data.byweekno             The weeks for the BYWEEKNO part
+   * @param {Array.<Number>=} data.bymonth              The month for the BYMONTH part
+   * @param {Array.<Number>=} data.bysetpos             The positionals for the BYSETPOS part
+   */
+  fromData(data) {
+    for (let key in data) {
+      let uckey = key.toUpperCase();
+
+      if (uckey in partDesign) {
+        if (Array.isArray(data[key])) {
+          this.parts[uckey] = data[key];
+        } else {
+          this.parts[uckey] = [data[key]];
+        }
+      } else {
+        this[key] = data[key];
+      }
+    }
+
+    if (this.interval && typeof this.interval != "number") {
+      optionDesign.INTERVAL(this.interval, this);
+    }
+
+    if (this.wkst && typeof this.wkst != "number") {
+      this.wkst = Recur.icalDayToNumericDay(this.wkst);
+    }
+
+    if (this.until && !(this.until instanceof Time)) {
+      this.until = Time.fromString(this.until);
+    }
+  }
+
+  /**
+   * The jCal representation of this recurrence type.
+   * @return {Object}
+   */
+  toJSON() {
+    let res = Object.create(null);
+    res.freq = this.freq;
+
+    if (this.count) {
+      res.count = this.count;
+    }
+
+    if (this.interval > 1) {
+      res.interval = this.interval;
+    }
+
+    for (let [k, kparts] of Object.entries(this.parts)) {
+      if (Array.isArray(kparts) && kparts.length == 1) {
+        res[k.toLowerCase()] = kparts[0];
+      } else {
+        res[k.toLowerCase()] = clone(kparts);
+      }
+    }
+
+    if (this.until) {
+      res.until = this.until.toString();
+    }
+    if ('wkst' in this && this.wkst !== Time.DEFAULT_WEEK_START) {
+      res.wkst = Recur.numericDayToIcalDay(this.wkst);
+    }
+    return res;
+  }
+
+  /**
+   * The string representation of this recurrence rule.
+   * @return {String}
+   */
+  toString() {
+    // TODO retain order
+    let str = "FREQ=" + this.freq;
+    if (this.count) {
+      str += ";COUNT=" + this.count;
+    }
+    if (this.interval > 1) {
+      str += ";INTERVAL=" + this.interval;
+    }
+    for (let [k, v] of Object.entries(this.parts)) {
+      str += ";" + k + "=" + v;
+    }
+    if (this.until) {
+      str += ';UNTIL=' + this.until.toICALString();
+    }
+    if ('wkst' in this && this.wkst !== Time.DEFAULT_WEEK_START) {
+      str += ';WKST=' + Recur.numericDayToIcalDay(this.wkst);
+    }
+    return str;
+  }
+}
+
+function parseNumericValue(type, min, max, value) {
+  let result = value;
+
+  if (value[0] === '+') {
+    result = value.slice(1);
+  }
+
+  result = strictParseInt(result);
+
+  if (min !== undefined && value < min) {
+    throw new Error(
+      type + ': invalid value "' + value + '" must be > ' + min
+    );
+  }
+
+  if (max !== undefined && value > max) {
+    throw new Error(
+      type + ': invalid value "' + value + '" must be < ' + min
+    );
+  }
+
+  return result;
+}
+
+const optionDesign = {
+  FREQ: function(value, dict, fmtIcal) {
+    // yes this is actually equal or faster then regex.
+    // upside here is we can enumerate the valid values.
+    if (ALLOWED_FREQ.indexOf(value) !== -1) {
+      dict.freq = value;
+    } else {
+      throw new Error(
+        'invalid frequency "' + value + '" expected: "' +
+        ALLOWED_FREQ.join(', ') + '"'
+      );
+    }
+  },
+
+  COUNT: function(value, dict, fmtIcal) {
+    dict.count = strictParseInt(value);
+  },
+
+  INTERVAL: function(value, dict, fmtIcal) {
+    dict.interval = strictParseInt(value);
+    if (dict.interval < 1) {
+      // 0 or negative values are not allowed, some engines seem to generate
+      // it though. Assume 1 instead.
+      dict.interval = 1;
+    }
+  },
+
+  UNTIL: function(value, dict, fmtIcal) {
+    if (value.length > 10) {
+      dict.until = design$1.icalendar.value['date-time'].fromICAL(value);
+    } else {
+      dict.until = design$1.icalendar.value.date.fromICAL(value);
+    }
+    if (!fmtIcal) {
+      dict.until = Time.fromString(dict.until);
+    }
+  },
+
+  WKST: function(value, dict, fmtIcal) {
+    if (VALID_DAY_NAMES.test(value)) {
+      dict.wkst = Recur.icalDayToNumericDay(value);
+    } else {
+      throw new Error('invalid WKST value "' + value + '"');
+    }
+  }
+};
+
+const partDesign = {
+  BYSECOND: parseNumericValue.bind(undefined, 'BYSECOND', 0, 60),
+  BYMINUTE: parseNumericValue.bind(undefined, 'BYMINUTE', 0, 59),
+  BYHOUR: parseNumericValue.bind(undefined, 'BYHOUR', 0, 23),
+  BYDAY: function(value) {
+    if (VALID_BYDAY_PART.test(value)) {
+      return value;
+    } else {
+      throw new Error('invalid BYDAY value "' + value + '"');
+    }
+  },
+  BYMONTHDAY: parseNumericValue.bind(undefined, 'BYMONTHDAY', -31, 31),
+  BYYEARDAY: parseNumericValue.bind(undefined, 'BYYEARDAY', -366, 366),
+  BYWEEKNO: parseNumericValue.bind(undefined, 'BYWEEKNO', -53, 53),
+  BYMONTH: parseNumericValue.bind(undefined, 'BYMONTH', 1, 12),
+  BYSETPOS: parseNumericValue.bind(undefined, 'BYSETPOS', -366, 366)
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").jCalComponent} jCalComponent
+ * Imports the 'occurrenceDetails' type from the "types.js" module
+ */
+
+/**
+ * This class represents the "period" value type, with various calculation and manipulation methods.
+ *
+ * @memberof ICAL
+ */
+class Period {
+  /**
+   * Creates a new {@link ICAL.Period} instance from the passed string.
+   *
+   * @param {String} str            The string to parse
+   * @param {Property} prop         The property this period will be on
+   * @return {Period}               The created period instance
+   */
+  static fromString(str, prop) {
+    let parts = str.split('/');
+
+    if (parts.length !== 2) {
+      throw new Error(
+        'Invalid string value: "' + str + '" must contain a "/" char.'
+      );
+    }
+
+    let options = {
+      start: Time.fromDateTimeString(parts[0], prop)
+    };
+
+    let end = parts[1];
+
+    if (Duration.isValueString(end)) {
+      options.duration = Duration.fromString(end);
+    } else {
+      options.end = Time.fromDateTimeString(end, prop);
+    }
+
+    return new Period(options);
+  }
+
+  /**
+   * Creates a new {@link ICAL.Period} instance from the given data object.
+   * The passed data object cannot contain both and end date and a duration.
+   *
+   * @param {Object} aData                  An object with members of the period
+   * @param {Time=} aData.start             The start of the period
+   * @param {Time=} aData.end               The end of the period
+   * @param {Duration=} aData.duration      The duration of the period
+   * @return {Period}                       The period instance
+   */
+  static fromData(aData) {
+    return new Period(aData);
+  }
+
+  /**
+   * Returns a new period instance from the given jCal data array. The first
+   * member is always the start date string, the second member is either a
+   * duration or end date string.
+   *
+   * @param {jCalComponent} aData           The jCal data array
+   * @param {Property} aProp                The property this jCal data is on
+   * @param {Boolean} aLenient              If true, data value can be both date and date-time
+   * @return {Period}                       The period instance
+   */
+  static fromJSON(aData, aProp, aLenient) {
+    function fromDateOrDateTimeString(aValue, dateProp) {
+      if (aLenient) {
+        return Time.fromString(aValue, dateProp);
+      } else {
+        return Time.fromDateTimeString(aValue, dateProp);
+      }
+    }
+
+    if (Duration.isValueString(aData[1])) {
+      return Period.fromData({
+        start: fromDateOrDateTimeString(aData[0], aProp),
+        duration: Duration.fromString(aData[1])
+      });
+    } else {
+      return Period.fromData({
+        start: fromDateOrDateTimeString(aData[0], aProp),
+        end: fromDateOrDateTimeString(aData[1], aProp)
+      });
+    }
+  }
+
+  /**
+   * Creates a new ICAL.Period instance. The passed data object cannot contain both and end date and
+   * a duration.
+   *
+   * @param {Object} aData                  An object with members of the period
+   * @param {Time=} aData.start             The start of the period
+   * @param {Time=} aData.end               The end of the period
+   * @param {Duration=} aData.duration      The duration of the period
+   */
+  constructor(aData) {
+    this.wrappedJSObject = this;
+
+    if (aData && 'start' in aData) {
+      if (aData.start && !(aData.start instanceof Time)) {
+        throw new TypeError('.start must be an instance of ICAL.Time');
+      }
+      this.start = aData.start;
+    }
+
+    if (aData && aData.end && aData.duration) {
+      throw new Error('cannot accept both end and duration');
+    }
+
+    if (aData && 'end' in aData) {
+      if (aData.end && !(aData.end instanceof Time)) {
+        throw new TypeError('.end must be an instance of ICAL.Time');
+      }
+      this.end = aData.end;
+    }
+
+    if (aData && 'duration' in aData) {
+      if (aData.duration && !(aData.duration instanceof Duration)) {
+        throw new TypeError('.duration must be an instance of ICAL.Duration');
+      }
+      this.duration = aData.duration;
+    }
+  }
+
+
+  /**
+   * The start of the period
+   * @type {Time}
+   */
+  start = null;
+
+  /**
+   * The end of the period
+   * @type {Time}
+   */
+  end = null;
+
+  /**
+   * The duration of the period
+   * @type {Duration}
+   */
+  duration = null;
+
+  /**
+   * The class identifier.
+   * @constant
+   * @type {String}
+   * @default "icalperiod"
+   */
+  icalclass = "icalperiod";
+
+  /**
+   * The type name, to be used in the jCal object.
+   * @constant
+   * @type {String}
+   * @default "period"
+   */
+  icaltype = "period";
+
+  /**
+   * Returns a clone of the duration object.
+   *
+   * @return {Period}      The cloned object
+   */
+  clone() {
+    return Period.fromData({
+      start: this.start ? this.start.clone() : null,
+      end: this.end ? this.end.clone() : null,
+      duration: this.duration ? this.duration.clone() : null
+    });
+  }
+
+  /**
+   * Calculates the duration of the period, either directly or by subtracting
+   * start from end date.
+   *
+   * @return {Duration}      The calculated duration
+   */
+  getDuration() {
+    if (this.duration) {
+      return this.duration;
+    } else {
+      return this.end.subtractDate(this.start);
+    }
+  }
+
+  /**
+   * Calculates the end date of the period, either directly or by adding
+   * duration to start date.
+   *
+   * @return {Time}          The calculated end date
+   */
+  getEnd() {
+    if (this.end) {
+      return this.end;
+    } else {
+      let end = this.start.clone();
+      end.addDuration(this.duration);
+      return end;
+    }
+  }
+
+  /**
+   * The string representation of this period.
+   * @return {String}
+   */
+  toString() {
+    return this.start + "/" + (this.end || this.duration);
+  }
+
+  /**
+   * The jCal representation of this period type.
+   * @return {Object}
+   */
+  toJSON() {
+    return [this.start.toString(), (this.end || this.duration).toString()];
+  }
+
+  /**
+   * The iCalendar string representation of this period.
+   * @return {String}
+   */
+  toICALString() {
+    return this.start.toICALString() + "/" +
+           (this.end || this.duration).toICALString();
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+/** @module ICAL.design */
+
+const FROM_ICAL_NEWLINE = /\\\\|\\;|\\,|\\[Nn]/g;
+const TO_ICAL_NEWLINE = /\\|;|,|\n/g;
+const FROM_VCARD_NEWLINE = /\\\\|\\,|\\[Nn]/g;
+const TO_VCARD_NEWLINE = /\\|,|\n/g;
+
+function createTextType(fromNewline, toNewline) {
+  let result = {
+    matches: /.*/,
+
+    fromICAL: function(aValue, structuredEscape) {
+      return replaceNewline(aValue, fromNewline, structuredEscape);
+    },
+
+    toICAL: function(aValue, structuredEscape) {
+      let regEx = toNewline;
+      if (structuredEscape)
+         regEx = new RegExp(regEx.source + '|' + structuredEscape, regEx.flags);
+      return aValue.replace(regEx, function(str) {
+        switch (str) {
+        case "\\":
+          return "\\\\";
+        case ";":
+          return "\\;";
+        case ",":
+          return "\\,";
+        case "\n":
+          return "\\n";
+        /* c8 ignore next 2 */
+        default:
+          return str;
+        }
+      });
+    }
+  };
+  return result;
+}
+
+// default types used multiple times
+const DEFAULT_TYPE_TEXT = { defaultType: "text" };
+const DEFAULT_TYPE_TEXT_MULTI = { defaultType: "text", multiValue: "," };
+const DEFAULT_TYPE_TEXT_STRUCTURED = { defaultType: "text", structuredValue: ";" };
+const DEFAULT_TYPE_INTEGER = { defaultType: "integer" };
+const DEFAULT_TYPE_DATETIME_DATE = { defaultType: "date-time", allowedTypes: ["date-time", "date"] };
+const DEFAULT_TYPE_DATETIME = { defaultType: "date-time" };
+const DEFAULT_TYPE_URI = { defaultType: "uri" };
+const DEFAULT_TYPE_UTCOFFSET = { defaultType: "utc-offset" };
+const DEFAULT_TYPE_RECUR = { defaultType: "recur" };
+const DEFAULT_TYPE_DATE_ANDOR_TIME = { defaultType: "date-and-or-time", allowedTypes: ["date-time", "date", "text"] };
+
+function replaceNewlineReplace(string) {
+  switch (string) {
+    case "\\\\":
+      return "\\";
+    case "\\;":
+      return ";";
+    case "\\,":
+      return ",";
+    case "\\n":
+    case "\\N":
+      return "\n";
+    /* c8 ignore next 2 */
+    default:
+      return string;
+  }
+}
+
+function replaceNewline(value, newline, structuredEscape) {
+  // avoid regex when possible.
+  if (value.indexOf('\\') === -1) {
+    return value;
+  }
+  if (structuredEscape)
+     newline = new RegExp(newline.source + '|\\\\' + structuredEscape, newline.flags);
+  return value.replace(newline, replaceNewlineReplace);
+}
+
+let commonProperties = {
+  "categories": DEFAULT_TYPE_TEXT_MULTI,
+  "url": DEFAULT_TYPE_URI,
+  "version": DEFAULT_TYPE_TEXT,
+  "uid": DEFAULT_TYPE_TEXT
+};
+
+let commonValues = {
+  "boolean": {
+    values: ["TRUE", "FALSE"],
+
+    fromICAL: function(aValue) {
+      switch (aValue) {
+        case 'TRUE':
+          return true;
+        case 'FALSE':
+          return false;
+        default:
+          //TODO: parser warning
+          return false;
+      }
+    },
+
+    toICAL: function(aValue) {
+      if (aValue) {
+        return 'TRUE';
+      }
+      return 'FALSE';
+    }
+
+  },
+  float: {
+    matches: /^[+-]?\d+\.\d+$/,
+
+    fromICAL: function(aValue) {
+      let parsed = parseFloat(aValue);
+      if (isStrictlyNaN(parsed)) {
+        // TODO: parser warning
+        return 0.0;
+      }
+      return parsed;
+    },
+
+    toICAL: function(aValue) {
+      return String(aValue);
+    }
+  },
+  integer: {
+    fromICAL: function(aValue) {
+      let parsed = parseInt(aValue);
+      if (isStrictlyNaN(parsed)) {
+        return 0;
+      }
+      return parsed;
+    },
+
+    toICAL: function(aValue) {
+      return String(aValue);
+    }
+  },
+  "utc-offset": {
+    toICAL: function(aValue) {
+      if (aValue.length < 7) {
+        // no seconds
+        // -0500
+        return aValue.slice(0, 3) +
+               aValue.slice(4, 6);
+      } else {
+        // seconds
+        // -050000
+        return aValue.slice(0, 3) +
+               aValue.slice(4, 6) +
+               aValue.slice(7, 9);
+      }
+    },
+
+    fromICAL: function(aValue) {
+      if (aValue.length < 6) {
+        // no seconds
+        // -05:00
+        return aValue.slice(0, 3) + ':' +
+               aValue.slice(3, 5);
+      } else {
+        // seconds
+        // -05:00:00
+        return aValue.slice(0, 3) + ':' +
+               aValue.slice(3, 5) + ':' +
+               aValue.slice(5, 7);
+      }
+    },
+
+    decorate: function(aValue) {
+      return UtcOffset.fromString(aValue);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  }
+};
+
+let icalParams = {
+  // Although the syntax is DQUOTE uri DQUOTE, I don't think we should
+  // enforce anything aside from it being a valid content line.
+  //
+  // At least some params require - if multi values are used - DQUOTEs
+  // for each of its values - e.g. delegated-from="uri1","uri2"
+  // To indicate this, I introduced the new k/v pair
+  // multiValueSeparateDQuote: true
+  //
+  // "ALTREP": { ... },
+
+  // CN just wants a param-value
+  // "CN": { ... }
+
+  "cutype": {
+    values: ["INDIVIDUAL", "GROUP", "RESOURCE", "ROOM", "UNKNOWN"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+
+  "delegated-from": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  "delegated-to": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  // "DIR": { ... }, // See ALTREP
+  "encoding": {
+    values: ["8BIT", "BASE64"]
+  },
+  // "FMTTYPE": { ... }, // See ALTREP
+  "fbtype": {
+    values: ["FREE", "BUSY", "BUSY-UNAVAILABLE", "BUSY-TENTATIVE"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  // "LANGUAGE": { ... }, // See ALTREP
+  "member": {
+    valueType: "cal-address",
+    multiValue: ",",
+    multiValueSeparateDQuote: true
+  },
+  "partstat": {
+    // TODO These values are actually different per-component
+    values: ["NEEDS-ACTION", "ACCEPTED", "DECLINED", "TENTATIVE",
+             "DELEGATED", "COMPLETED", "IN-PROCESS"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "range": {
+    values: ["THISANDFUTURE"]
+  },
+  "related": {
+    values: ["START", "END"]
+  },
+  "reltype": {
+    values: ["PARENT", "CHILD", "SIBLING"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "role": {
+    values: ["REQ-PARTICIPANT", "CHAIR",
+             "OPT-PARTICIPANT", "NON-PARTICIPANT"],
+    allowXName: true,
+    allowIanaToken: true
+  },
+  "rsvp": {
+    values: ["TRUE", "FALSE"]
+  },
+  "sent-by": {
+    valueType: "cal-address"
+  },
+  "tzid": {
+    matches: /^\//
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["binary", "boolean", "cal-address", "date", "date-time",
+             "duration", "float", "integer", "period", "recur", "text",
+             "time", "uri", "utc-offset"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+// When adding a value here, be sure to add it to the parameter types!
+const icalValues = extend(commonValues, {
+  text: createTextType(FROM_ICAL_NEWLINE, TO_ICAL_NEWLINE),
+
+  uri: {
+    // TODO
+    /* ... */
+  },
+
+  "binary": {
+    decorate: function(aString) {
+      return Binary.fromString(aString);
+    },
+
+    undecorate: function(aBinary) {
+      return aBinary.toString();
+    }
+  },
+  "cal-address": {
+    // needs to be an uri
+  },
+  "date": {
+    decorate: function(aValue, aProp) {
+      if (design.strict) {
+        return Time.fromDateString(aValue, aProp);
+      } else {
+        return Time.fromString(aValue, aProp);
+      }
+    },
+
+    /**
+     * undecorates a time object.
+     */
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      // from: 20120901
+      // to: 2012-09-01
+      if (!design.strict && aValue.length >= 15) {
+        // This is probably a date-time, e.g. 20120901T130000Z
+        return icalValues["date-time"].fromICAL(aValue);
+      } else {
+        return aValue.slice(0, 4) + '-' +
+               aValue.slice(4, 6) + '-' +
+               aValue.slice(6, 8);
+      }
+    },
+
+    toICAL: function(aValue) {
+      // from: 2012-09-01
+      // to: 20120901
+      let len = aValue.length;
+
+      if (len == 10) {
+        return aValue.slice(0, 4) +
+               aValue.slice(5, 7) +
+               aValue.slice(8, 10);
+      } else if (len >= 19) {
+        return icalValues["date-time"].toICAL(aValue);
+      } else {
+        //TODO: serialize warning?
+        return aValue;
+      }
+
+    }
+  },
+  "date-time": {
+    fromICAL: function(aValue) {
+      // from: 20120901T130000
+      // to: 2012-09-01T13:00:00
+      if (!design.strict && aValue.length == 8) {
+        // This is probably a date, e.g. 20120901
+        return icalValues.date.fromICAL(aValue);
+      } else {
+        let result = aValue.slice(0, 4) + '-' +
+                     aValue.slice(4, 6) + '-' +
+                     aValue.slice(6, 8) + 'T' +
+                     aValue.slice(9, 11) + ':' +
+                     aValue.slice(11, 13) + ':' +
+                     aValue.slice(13, 15);
+
+        if (aValue[15] && aValue[15] === 'Z') {
+          result += 'Z';
+        }
+
+        return result;
+      }
+    },
+
+    toICAL: function(aValue) {
+      // from: 2012-09-01T13:00:00
+      // to: 20120901T130000
+      let len = aValue.length;
+
+      if (len == 10 && !design.strict) {
+        return icalValues.date.toICAL(aValue);
+      } else if (len >= 19) {
+        let result = aValue.slice(0, 4) +
+                     aValue.slice(5, 7) +
+                     // grab the (DDTHH) segment
+                     aValue.slice(8, 13) +
+                     // MM
+                     aValue.slice(14, 16) +
+                     // SS
+                     aValue.slice(17, 19);
+
+        if (aValue[19] && aValue[19] === 'Z') {
+          result += 'Z';
+        }
+        return result;
+      } else {
+        // TODO: error
+        return aValue;
+      }
+    },
+
+    decorate: function(aValue, aProp) {
+      if (design.strict) {
+        return Time.fromDateTimeString(aValue, aProp);
+      } else {
+        return Time.fromString(aValue, aProp);
+      }
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  },
+  duration: {
+    decorate: function(aValue) {
+      return Duration.fromString(aValue);
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  },
+  period: {
+    fromICAL: function(string) {
+      let parts = string.split('/');
+      parts[0] = icalValues['date-time'].fromICAL(parts[0]);
+
+      if (!Duration.isValueString(parts[1])) {
+        parts[1] = icalValues['date-time'].fromICAL(parts[1]);
+      }
+
+      return parts;
+    },
+
+    toICAL: function(parts) {
+      parts = parts.slice();
+      if (!design.strict && parts[0].length == 10) {
+        parts[0] = icalValues.date.toICAL(parts[0]);
+      } else {
+        parts[0] = icalValues['date-time'].toICAL(parts[0]);
+      }
+
+      if (!Duration.isValueString(parts[1])) {
+        if (!design.strict && parts[1].length == 10) {
+          parts[1] = icalValues.date.toICAL(parts[1]);
+        } else {
+          parts[1] = icalValues['date-time'].toICAL(parts[1]);
+        }
+      }
+
+      return parts.join("/");
+    },
+
+    decorate: function(aValue, aProp) {
+      return Period.fromJSON(aValue, aProp, !design.strict);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toJSON();
+    }
+  },
+  recur: {
+    fromICAL: function(string) {
+      return Recur._stringToData(string, true);
+    },
+
+    toICAL: function(data) {
+      let str = "";
+      for (let [k, val] of Object.entries(data)) {
+        if (k == "until") {
+          if (val.length > 10) {
+            val = icalValues['date-time'].toICAL(val);
+          } else {
+            val = icalValues.date.toICAL(val);
+          }
+        } else if (k == "wkst") {
+          if (typeof val === 'number') {
+            val = Recur.numericDayToIcalDay(val);
+          }
+        } else if (Array.isArray(val)) {
+          val = val.join(",");
+        }
+        str += k.toUpperCase() + "=" + val + ";";
+      }
+      return str.slice(0, Math.max(0, str.length - 1));
+    },
+
+    decorate: function decorate(aValue) {
+      return Recur.fromData(aValue);
+    },
+
+    undecorate: function(aRecur) {
+      return aRecur.toJSON();
+    }
+  },
+
+  time: {
+    fromICAL: function(aValue) {
+      // from: MMHHSS(Z)?
+      // to: HH:MM:SS(Z)?
+      if (aValue.length < 6) {
+        // TODO: parser exception?
+        return aValue;
+      }
+
+      // HH::MM::SSZ?
+      let result = aValue.slice(0, 2) + ':' +
+                   aValue.slice(2, 4) + ':' +
+                   aValue.slice(4, 6);
+
+      if (aValue[6] === 'Z') {
+        result += 'Z';
+      }
+
+      return result;
+    },
+
+    toICAL: function(aValue) {
+      // from: HH:MM:SS(Z)?
+      // to: MMHHSS(Z)?
+      if (aValue.length < 8) {
+        //TODO: error
+        return aValue;
+      }
+
+      let result = aValue.slice(0, 2) +
+                   aValue.slice(3, 5) +
+                   aValue.slice(6, 8);
+
+      if (aValue[8] === 'Z') {
+        result += 'Z';
+      }
+
+      return result;
+    }
+  }
+});
+
+let icalProperties = extend(commonProperties, {
+
+  "action": DEFAULT_TYPE_TEXT,
+  "attach": { defaultType: "uri" },
+  "attendee": { defaultType: "cal-address" },
+  "calscale": DEFAULT_TYPE_TEXT,
+  "class": DEFAULT_TYPE_TEXT,
+  "comment": DEFAULT_TYPE_TEXT,
+  "completed": DEFAULT_TYPE_DATETIME,
+  "contact": DEFAULT_TYPE_TEXT,
+  "created": DEFAULT_TYPE_DATETIME,
+  "description": DEFAULT_TYPE_TEXT,
+  "dtend": DEFAULT_TYPE_DATETIME_DATE,
+  "dtstamp": DEFAULT_TYPE_DATETIME,
+  "dtstart": DEFAULT_TYPE_DATETIME_DATE,
+  "due": DEFAULT_TYPE_DATETIME_DATE,
+  "duration": { defaultType: "duration" },
+  "exdate": {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    multiValue: ','
+  },
+  "exrule": DEFAULT_TYPE_RECUR,
+  "freebusy": { defaultType: "period", multiValue: "," },
+  "geo": { defaultType: "float", structuredValue: ";" },
+  "last-modified": DEFAULT_TYPE_DATETIME,
+  "location": DEFAULT_TYPE_TEXT,
+  "method": DEFAULT_TYPE_TEXT,
+  "organizer": { defaultType: "cal-address" },
+  "percent-complete": DEFAULT_TYPE_INTEGER,
+  "priority": DEFAULT_TYPE_INTEGER,
+  "prodid": DEFAULT_TYPE_TEXT,
+  "related-to": DEFAULT_TYPE_TEXT,
+  "repeat": DEFAULT_TYPE_INTEGER,
+  "rdate": {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date", "period"],
+    multiValue: ',',
+    detectType: function(string) {
+      if (string.indexOf('/') !== -1) {
+        return 'period';
+      }
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+  "recurrence-id": DEFAULT_TYPE_DATETIME_DATE,
+  "resources": DEFAULT_TYPE_TEXT_MULTI,
+  "request-status": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "rrule": DEFAULT_TYPE_RECUR,
+  "sequence": DEFAULT_TYPE_INTEGER,
+  "status": DEFAULT_TYPE_TEXT,
+  "summary": DEFAULT_TYPE_TEXT,
+  "transp": DEFAULT_TYPE_TEXT,
+  "trigger": { defaultType: "duration", allowedTypes: ["duration", "date-time"] },
+  "tzoffsetfrom": DEFAULT_TYPE_UTCOFFSET,
+  "tzoffsetto": DEFAULT_TYPE_UTCOFFSET,
+  "tzurl": DEFAULT_TYPE_URI,
+  "tzid": DEFAULT_TYPE_TEXT,
+  "tzname": DEFAULT_TYPE_TEXT
+});
+
+// When adding a value here, be sure to add it to the parameter types!
+const vcardValues = extend(commonValues, {
+  text: createTextType(FROM_VCARD_NEWLINE, TO_VCARD_NEWLINE),
+  uri: createTextType(FROM_VCARD_NEWLINE, TO_VCARD_NEWLINE),
+
+  date: {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date");
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+    fromICAL: function(aValue) {
+      if (aValue.length == 8) {
+        return icalValues.date.fromICAL(aValue);
+      } else if (aValue[0] == '-' && aValue.length == 6) {
+        return aValue.slice(0, 4) + '-' + aValue.slice(4);
+      } else {
+        return aValue;
+      }
+    },
+    toICAL: function(aValue) {
+      if (aValue.length == 10) {
+        return icalValues.date.toICAL(aValue);
+      } else if (aValue[0] == '-' && aValue.length == 7) {
+        return aValue.slice(0, 4) + aValue.slice(5);
+      } else {
+        return aValue;
+      }
+    }
+  },
+
+  time: {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString("T" + aValue, "time");
+    },
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+    fromICAL: function(aValue) {
+      let splitzone = vcardValues.time._splitZone(aValue, true);
+      let zone = splitzone[0], value = splitzone[1];
+
+      //console.log("SPLIT: ",splitzone);
+
+      if (value.length == 6) {
+        value = value.slice(0, 2) + ':' +
+                value.slice(2, 4) + ':' +
+                value.slice(4, 6);
+      } else if (value.length == 4 && value[0] != '-') {
+        value = value.slice(0, 2) + ':' + value.slice(2, 4);
+      } else if (value.length == 5) {
+        value = value.slice(0, 3) + ':' + value.slice(3, 5);
+      }
+
+      if (zone.length == 5 && (zone[0] == '-' || zone[0] == '+')) {
+        zone = zone.slice(0, 3) + ':' + zone.slice(3);
+      }
+
+      return value + zone;
+    },
+
+    toICAL: function(aValue) {
+      let splitzone = vcardValues.time._splitZone(aValue);
+      let zone = splitzone[0], value = splitzone[1];
+
+      if (value.length == 8) {
+        value = value.slice(0, 2) +
+                value.slice(3, 5) +
+                value.slice(6, 8);
+      } else if (value.length == 5 && value[0] != '-') {
+        value = value.slice(0, 2) + value.slice(3, 5);
+      } else if (value.length == 6) {
+        value = value.slice(0, 3) + value.slice(4, 6);
+      }
+
+      if (zone.length == 6 && (zone[0] == '-' || zone[0] == '+')) {
+        zone = zone.slice(0, 3) + zone.slice(4);
+      }
+
+      return value + zone;
+    },
+
+    _splitZone: function(aValue, isFromIcal) {
+      let lastChar = aValue.length - 1;
+      let signChar = aValue.length - (isFromIcal ? 5 : 6);
+      let sign = aValue[signChar];
+      let zone, value;
+
+      if (aValue[lastChar] == 'Z') {
+        zone = aValue[lastChar];
+        value = aValue.slice(0, Math.max(0, lastChar));
+      } else if (aValue.length > 6 && (sign == '-' || sign == '+')) {
+        zone = aValue.slice(signChar);
+        value = aValue.slice(0, Math.max(0, signChar));
+      } else {
+        zone = "";
+        value = aValue;
+      }
+
+      return [zone, value];
+    }
+  },
+
+  "date-time": {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date-time");
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      return vcardValues['date-and-or-time'].fromICAL(aValue);
+    },
+
+    toICAL: function(aValue) {
+      return vcardValues['date-and-or-time'].toICAL(aValue);
+    }
+  },
+
+  "date-and-or-time": {
+    decorate: function(aValue) {
+      return VCardTime.fromDateAndOrTimeString(aValue, "date-and-or-time");
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    },
+
+    fromICAL: function(aValue) {
+      let parts = aValue.split('T');
+      return (parts[0] ? vcardValues.date.fromICAL(parts[0]) : '') +
+             (parts[1] ? 'T' + vcardValues.time.fromICAL(parts[1]) : '');
+    },
+
+    toICAL: function(aValue) {
+      let parts = aValue.split('T');
+      return vcardValues.date.toICAL(parts[0]) +
+             (parts[1] ? 'T' + vcardValues.time.toICAL(parts[1]) : '');
+
+    }
+  },
+  timestamp: icalValues['date-time'],
+  "language-tag": {
+    matches: /^[a-zA-Z0-9-]+$/ // Could go with a more strict regex here
+  },
+  "phone-number": {
+    fromICAL: function(aValue) {
+      return Array.from(aValue).filter(function(c) {
+          return c === '\\' ? undefined : c;
+        }).join('');
+    },
+    toICAL: function(aValue) {
+      return Array.from(aValue).map(function(c) {
+        return c === ',' || c === ";" ? '\\' + c : c;
+      }).join('');
+    }
+  }
+});
+
+let vcardParams = {
+  "type": {
+    valueType: "text",
+    multiValue: ","
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["text", "uri", "date", "time", "date-time", "date-and-or-time",
+             "timestamp", "boolean", "integer", "float", "utc-offset",
+             "language-tag"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+let vcardProperties = extend(commonProperties, {
+  "adr": { defaultType: "text", structuredValue: ";", multiValue: "," },
+  "anniversary": DEFAULT_TYPE_DATE_ANDOR_TIME,
+  "bday": DEFAULT_TYPE_DATE_ANDOR_TIME,
+  "caladruri": DEFAULT_TYPE_URI,
+  "caluri": DEFAULT_TYPE_URI,
+  "clientpidmap": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "email": DEFAULT_TYPE_TEXT,
+  "fburl": DEFAULT_TYPE_URI,
+  "fn": DEFAULT_TYPE_TEXT,
+  "gender": DEFAULT_TYPE_TEXT_STRUCTURED,
+  "geo": DEFAULT_TYPE_URI,
+  "impp": DEFAULT_TYPE_URI,
+  "key": DEFAULT_TYPE_URI,
+  "kind": DEFAULT_TYPE_TEXT,
+  "lang": { defaultType: "language-tag" },
+  "logo": DEFAULT_TYPE_URI,
+  "member": DEFAULT_TYPE_URI,
+  "n": { defaultType: "text", structuredValue: ";", multiValue: "," },
+  "nickname": DEFAULT_TYPE_TEXT_MULTI,
+  "note": DEFAULT_TYPE_TEXT,
+  "org": { defaultType: "text", structuredValue: ";" },
+  "photo": DEFAULT_TYPE_URI,
+  "related": DEFAULT_TYPE_URI,
+  "rev": { defaultType: "timestamp" },
+  "role": DEFAULT_TYPE_TEXT,
+  "sound": DEFAULT_TYPE_URI,
+  "source": DEFAULT_TYPE_URI,
+  "tel": { defaultType: "uri", allowedTypes: ["uri", "text"] },
+  "title": DEFAULT_TYPE_TEXT,
+  "tz": { defaultType: "text", allowedTypes: ["text", "utc-offset", "uri"] },
+  "xml": DEFAULT_TYPE_TEXT
+});
+
+let vcard3Values = extend(commonValues, {
+  binary: icalValues.binary,
+  date: vcardValues.date,
+  "date-time": vcardValues["date-time"],
+  "phone-number": vcardValues["phone-number"],
+  uri: icalValues.uri,
+  text: icalValues.text,
+  time: icalValues.time,
+  vcard: icalValues.text,
+  "utc-offset": {
+    toICAL: function(aValue) {
+      return aValue.slice(0, 7);
+    },
+
+    fromICAL: function(aValue) {
+      return aValue.slice(0, 7);
+    },
+
+    decorate: function(aValue) {
+      return UtcOffset.fromString(aValue);
+    },
+
+    undecorate: function(aValue) {
+      return aValue.toString();
+    }
+  }
+});
+
+let vcard3Params = {
+  "type": {
+    valueType: "text",
+    multiValue: ","
+  },
+  "value": {
+    // since the value here is a 'type' lowercase is used.
+    values: ["text", "uri", "date", "date-time", "phone-number", "time",
+             "boolean", "integer", "float", "utc-offset", "vcard", "binary"],
+    allowXName: true,
+    allowIanaToken: true
+  }
+};
+
+let vcard3Properties = extend(commonProperties, {
+  fn: DEFAULT_TYPE_TEXT,
+  n: { defaultType: "text", structuredValue: ";", multiValue: "," },
+  nickname: DEFAULT_TYPE_TEXT_MULTI,
+  photo: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+  bday: {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    detectType: function(string) {
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+
+  adr: { defaultType: "text", structuredValue: ";", multiValue: "," },
+  label: DEFAULT_TYPE_TEXT,
+
+  tel: { defaultType: "phone-number" },
+  email: DEFAULT_TYPE_TEXT,
+  mailer: DEFAULT_TYPE_TEXT,
+
+  tz: { defaultType: "utc-offset", allowedTypes: ["utc-offset", "text"] },
+  geo: { defaultType: "float", structuredValue: ";" },
+
+  title: DEFAULT_TYPE_TEXT,
+  role: DEFAULT_TYPE_TEXT,
+  logo: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+  agent: { defaultType: "vcard", allowedTypes: ["vcard", "text", "uri"] },
+  org: DEFAULT_TYPE_TEXT_STRUCTURED,
+
+  note: DEFAULT_TYPE_TEXT_MULTI,
+  prodid: DEFAULT_TYPE_TEXT,
+  rev: {
+    defaultType: "date-time",
+    allowedTypes: ["date-time", "date"],
+    detectType: function(string) {
+      return (string.indexOf('T') === -1) ? 'date' : 'date-time';
+    }
+  },
+  "sort-string": DEFAULT_TYPE_TEXT,
+  sound: { defaultType: "binary", allowedTypes: ["binary", "uri"] },
+
+  class: DEFAULT_TYPE_TEXT,
+  key: { defaultType: "binary", allowedTypes: ["binary", "text"] }
+});
+
+/**
+ * iCalendar design set
+ * @type {designSet}
+ */
+let icalSet = {
+  value: icalValues,
+  param: icalParams,
+  property: icalProperties,
+  propertyGroups: false
+};
+
+/**
+ * vCard 4.0 design set
+ * @type {designSet}
+ */
+let vcardSet = {
+  value: vcardValues,
+  param: vcardParams,
+  property: vcardProperties,
+  propertyGroups: true
+};
+
+/**
+ * vCard 3.0 design set
+ * @type {designSet}
+ */
+let vcard3Set = {
+  value: vcard3Values,
+  param: vcard3Params,
+  property: vcard3Properties,
+  propertyGroups: true
+};
+
+/**
+ * The design data, used by the parser to determine types for properties and
+ * other metadata needed to produce correct jCard/jCal data.
+ *
+ * @alias ICAL.design
+ * @exports module:ICAL.design
+ */
+const design = {
+  /**
+   * Can be set to false to make the parser more lenient.
+   */
+  strict: true,
+
+  /**
+   * The default set for new properties and components if none is specified.
+   * @type {designSet}
+   */
+  defaultSet: icalSet,
+
+  /**
+   * The default type for unknown properties
+   * @type {String}
+   */
+  defaultType: 'unknown',
+
+  /**
+   * Holds the design set for known top-level components
+   *
+   * @type {Object}
+   * @property {designSet} vcard       vCard VCARD
+   * @property {designSet} vevent      iCalendar VEVENT
+   * @property {designSet} vtodo       iCalendar VTODO
+   * @property {designSet} vjournal    iCalendar VJOURNAL
+   * @property {designSet} valarm      iCalendar VALARM
+   * @property {designSet} vtimezone   iCalendar VTIMEZONE
+   * @property {designSet} daylight    iCalendar DAYLIGHT
+   * @property {designSet} standard    iCalendar STANDARD
+   *
+   * @example
+   * let propertyName = 'fn';
+   * let componentDesign = ICAL.design.components.vcard;
+   * let propertyDetails = componentDesign.property[propertyName];
+   * if (propertyDetails.defaultType == 'text') {
+   *   // Yep, sure is...
+   * }
+   */
+  components: {
+    vcard: vcardSet,
+    vcard3: vcard3Set,
+    vevent: icalSet,
+    vtodo: icalSet,
+    vjournal: icalSet,
+    valarm: icalSet,
+    vtimezone: icalSet,
+    daylight: icalSet,
+    standard: icalSet
+  },
+
+
+  /**
+   * The design set for iCalendar (rfc5545/rfc7265) components.
+   * @type {designSet}
+   */
+  icalendar: icalSet,
+
+  /**
+   * The design set for vCard (rfc6350/rfc7095) components.
+   * @type {designSet}
+   */
+  vcard: vcardSet,
+
+  /**
+   * The design set for vCard (rfc2425/rfc2426/rfc7095) components.
+   * @type {designSet}
+   */
+  vcard3: vcard3Set,
+
+  /**
+   * Gets the design set for the given component name.
+   *
+   * @param {String} componentName        The name of the component
+   * @return {designSet}      The design set for the component
+   */
+  getDesignSet: function(componentName) {
+    let isInDesign = componentName && componentName in design.components;
+    return isInDesign ? design.components[componentName] : design.defaultSet;
+  }
+};
+var design$1 = design;
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ *
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ */
+
+const LINE_ENDING = '\r\n';
+const DEFAULT_VALUE_TYPE = 'unknown';
+const RFC6868_REPLACE_MAP = { '"': "^'", "\n": "^n", "^": "^^" };
+
+/**
+ * Convert a full jCal/jCard array into a iCalendar/vCard string.
+ *
+ * @function ICAL.stringify
+ * @variation function
+ * @param {Array} jCal    The jCal/jCard document
+ * @return {String}       The stringified iCalendar/vCard document
+ */
+function stringify(jCal) {
+  if (typeof jCal[0] == "string") {
+    // This is a single component
+    jCal = [jCal];
+  }
+
+  let i = 0;
+  let len = jCal.length;
+  let result = '';
+
+  for (; i < len; i++) {
+    result += stringify.component(jCal[i]) + LINE_ENDING;
+  }
+
+  return result;
+}
+
+/**
+ * Converts an jCal component array into a ICAL string.
+ * Recursive will resolve sub-components.
+ *
+ * Exact component/property order is not saved all
+ * properties will come before subcomponents.
+ *
+ * @function ICAL.stringify.component
+ * @param {Array} component
+ *        jCal/jCard fragment of a component
+ * @param {designSet} designSet
+ *        The design data to use for this component
+ * @return {String}       The iCalendar/vCard string
+ */
+stringify.component = function(component, designSet) {
+  let name = component[0].toUpperCase();
+  let result = 'BEGIN:' + name + LINE_ENDING;
+
+  let props = component[1];
+  let propIdx = 0;
+  let propLen = props.length;
+
+  let designSetName = component[0];
+  // rfc6350 requires that in vCard 4.0 the first component is the VERSION
+  // component with as value 4.0, note that 3.0 does not have this requirement.
+  if (designSetName === 'vcard' && component[1].length > 0 &&
+          !(component[1][0][0] === "version" && component[1][0][3] === "4.0")) {
+    designSetName = "vcard3";
+  }
+  designSet = designSet || design$1.getDesignSet(designSetName);
+
+  for (; propIdx < propLen; propIdx++) {
+    result += stringify.property(props[propIdx], designSet) + LINE_ENDING;
+  }
+
+  // Ignore subcomponents if none exist, e.g. in vCard.
+  let comps = component[2] || [];
+  let compIdx = 0;
+  let compLen = comps.length;
+
+  for (; compIdx < compLen; compIdx++) {
+    result += stringify.component(comps[compIdx], designSet) + LINE_ENDING;
+  }
+
+  result += 'END:' + name;
+  return result;
+};
+
+/**
+ * Converts a single jCal/jCard property to a iCalendar/vCard string.
+ *
+ * @function ICAL.stringify.property
+ * @param {Array} property
+ *        jCal/jCard property array
+ * @param {designSet} designSet
+ *        The design data to use for this property
+ * @param {Boolean} noFold
+ *        If true, the line is not folded
+ * @return {String}       The iCalendar/vCard string
+ */
+stringify.property = function(property, designSet, noFold) {
+  let name = property[0].toUpperCase();
+  let jsName = property[0];
+  let params = property[1];
+
+  if (!designSet) {
+    designSet = design$1.defaultSet;
+  }
+
+  let groupName = params.group;
+  let line;
+  if (designSet.propertyGroups && groupName) {
+    line = groupName.toUpperCase() + "." + name;
+  } else {
+    line = name;
+  }
+
+  for (let [paramName, value] of Object.entries(params)) {
+    if (designSet.propertyGroups && paramName == 'group') {
+      continue;
+    }
+
+    let paramDesign = designSet.param[paramName];
+    let multiValue = paramDesign && paramDesign.multiValue;
+    if (multiValue && Array.isArray(value)) {
+      value = value.map(function(val) {
+        val = stringify._rfc6868Unescape(val);
+        val = stringify.paramPropertyValue(val, paramDesign.multiValueSeparateDQuote);
+        return val;
+      });
+      value = stringify.multiValue(value, multiValue, "unknown", null, designSet);
+    } else {
+      value = stringify._rfc6868Unescape(value);
+      value = stringify.paramPropertyValue(value);
+    }
+
+    line += ';' + paramName.toUpperCase() + '=' + value;
+  }
+
+  if (property.length === 3) {
+    // If there are no values, we must assume a blank value
+    return line + ':';
+  }
+
+  let valueType = property[2];
+
+  let propDetails;
+  let multiValue = false;
+  let structuredValue = false;
+  let isDefault = false;
+
+  if (jsName in designSet.property) {
+    propDetails = designSet.property[jsName];
+
+    if ('multiValue' in propDetails) {
+      multiValue = propDetails.multiValue;
+    }
+
+    if (('structuredValue' in propDetails) && Array.isArray(property[3])) {
+      structuredValue = propDetails.structuredValue;
+    }
+
+    if ('defaultType' in propDetails) {
+      if (valueType === propDetails.defaultType) {
+        isDefault = true;
+      }
+    } else {
+      if (valueType === DEFAULT_VALUE_TYPE) {
+        isDefault = true;
+      }
+    }
+  } else {
+    if (valueType === DEFAULT_VALUE_TYPE) {
+      isDefault = true;
+    }
+  }
+
+  // push the VALUE property if type is not the default
+  // for the current property.
+  if (!isDefault) {
+    // value will never contain ;/:/, so we don't escape it here.
+    line += ';VALUE=' + valueType.toUpperCase();
+  }
+
+  line += ':';
+
+  if (multiValue && structuredValue) {
+    line += stringify.multiValue(
+      property[3], structuredValue, valueType, multiValue, designSet, structuredValue
+    );
+  } else if (multiValue) {
+    line += stringify.multiValue(
+      property.slice(3), multiValue, valueType, null, designSet, false
+    );
+  } else if (structuredValue) {
+    line += stringify.multiValue(
+      property[3], structuredValue, valueType, null, designSet, structuredValue
+    );
+  } else {
+    line += stringify.value(property[3], valueType, designSet, false);
+  }
+
+  return noFold ? line : foldline(line);
+};
+
+/**
+ * Handles escaping of property values that may contain:
+ *
+ *    COLON (:), SEMICOLON (;), or COMMA (,)
+ *
+ * If any of the above are present the result is wrapped
+ * in double quotes.
+ *
+ * @function ICAL.stringify.paramPropertyValue
+ * @param {String} value      Raw property value
+ * @param {boolean} force     If value should be escaped even when unnecessary
+ * @return {String}           Given or escaped value when needed
+ */
+stringify.paramPropertyValue = function(value, force) {
+  if (!force &&
+      (value.indexOf(',') === -1) &&
+      (value.indexOf(':') === -1) &&
+      (value.indexOf(';') === -1)) {
+
+    return value;
+  }
+
+  return '"' + value + '"';
+};
+
+/**
+ * Converts an array of ical values into a single
+ * string based on a type and a delimiter value (like ",").
+ *
+ * @function ICAL.stringify.multiValue
+ * @param {Array} values      List of values to convert
+ * @param {String} delim      Used to join the values (",", ";", ":")
+ * @param {String} type       Lowecase ical value type
+ *        (like boolean, date-time, etc..)
+ * @param {?String} innerMulti If set, each value will again be processed
+ *        Used for structured values
+ * @param {designSet} designSet
+ *        The design data to use for this property
+ *
+ * @return {String}           iCalendar/vCard string for value
+ */
+stringify.multiValue = function(values, delim, type, innerMulti, designSet, structuredValue) {
+  let result = '';
+  let len = values.length;
+  let i = 0;
+
+  for (; i < len; i++) {
+    if (innerMulti && Array.isArray(values[i])) {
+      result += stringify.multiValue(values[i], innerMulti, type, null, designSet, structuredValue);
+    } else {
+      result += stringify.value(values[i], type, designSet, structuredValue);
+    }
+
+    if (i !== (len - 1)) {
+      result += delim;
+    }
+  }
+
+  return result;
+};
+
+/**
+ * Processes a single ical value runs the associated "toICAL" method from the
+ * design value type if available to convert the value.
+ *
+ * @function ICAL.stringify.value
+ * @param {String|Number} value       A formatted value
+ * @param {String} type               Lowercase iCalendar/vCard value type
+ *  (like boolean, date-time, etc..)
+ * @return {String}                   iCalendar/vCard value for single value
+ */
+stringify.value = function(value, type, designSet, structuredValue) {
+  if (type in designSet.value && 'toICAL' in designSet.value[type]) {
+    return designSet.value[type].toICAL(value, structuredValue);
+  }
+  return value;
+};
+
+/**
+ * Internal helper for rfc6868. Exposing this on ICAL.stringify so that
+ * hackers can disable the rfc6868 parsing if the really need to.
+ *
+ * @param {String} val        The value to unescape
+ * @return {String}           The escaped value
+ */
+stringify._rfc6868Unescape = function(val) {
+  return val.replace(/[\n^"]/g, function(x) {
+    return RFC6868_REPLACE_MAP[x];
+  });
+};
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+const NAME_INDEX$1 = 0;
+const PROP_INDEX = 1;
+const TYPE_INDEX = 2;
+const VALUE_INDEX = 3;
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ * @typedef {import("./types.js").Geo} Geo
+ * Imports the 'Geo' type from the "types.js" module
+ */
+
+/**
+ * Provides a layer on top of the raw jCal object for manipulating a single property, with its
+ * parameters and value.
+ *
+ * @memberof ICAL
+ */
+class Property {
+  /**
+   * Create an {@link ICAL.Property} by parsing the passed iCalendar string.
+   *
+   * @param {String} str            The iCalendar string to parse
+   * @param {designSet=} designSet  The design data to use for this property
+   * @return {Property}             The created iCalendar property
+   */
+  static fromString(str, designSet) {
+    return new Property(parse.property(str, designSet));
+  }
+
+  /**
+   * Creates a new ICAL.Property instance.
+   *
+   * It is important to note that mutations done in the wrapper directly mutate the jCal object used
+   * to initialize.
+   *
+   * Can also be used to create new properties by passing the name of the property (as a String).
+   *
+   * @param {Array|String} jCal         Raw jCal representation OR the new name of the property
+   * @param {Component=} parent         Parent component
+   */
+  constructor(jCal, parent) {
+    this._parent = parent || null;
+
+    if (typeof(jCal) === 'string') {
+      // We are creating the property by name and need to detect the type
+      this.jCal = [jCal, {}, design$1.defaultType];
+      this.jCal[TYPE_INDEX] = this.getDefaultType();
+    } else {
+      this.jCal = jCal;
+    }
+    this._updateType();
+  }
+
+  /**
+   * The value type for this property
+   * @type {String}
+   */
+  get type() {
+    return this.jCal[TYPE_INDEX];
+  }
+
+  /**
+   * The name of this property, in lowercase.
+   * @type {String}
+   */
+  get name() {
+    return this.jCal[NAME_INDEX$1];
+  }
+
+  /**
+   * The parent component for this property.
+   * @type {Component}
+   */
+  get parent() {
+    return this._parent;
+  }
+
+  set parent(p) {
+    // Before setting the parent, check if the design set has changed. If it
+    // has, we later need to update the type if it was unknown before.
+    let designSetChanged = !this._parent || (p && p._designSet != this._parent._designSet);
+
+    this._parent = p;
+
+    if (this.type == design$1.defaultType && designSetChanged) {
+      this.jCal[TYPE_INDEX] = this.getDefaultType();
+      this._updateType();
+    }
+  }
+
+  /**
+   * The design set for this property, e.g. icalendar vs vcard
+   *
+   * @type {designSet}
+   * @private
+   */
+  get _designSet() {
+    return this.parent ? this.parent._designSet : design$1.defaultSet;
+  }
+
+  /**
+   * Updates the type metadata from the current jCal type and design set.
+   *
+   * @private
+   */
+  _updateType() {
+    let designSet = this._designSet;
+
+    if (this.type in designSet.value) {
+      if ('decorate' in designSet.value[this.type]) {
+        this.isDecorated = true;
+      } else {
+        this.isDecorated = false;
+      }
+
+      if (this.name in designSet.property) {
+        this.isMultiValue = ('multiValue' in designSet.property[this.name]);
+        this.isStructuredValue = ('structuredValue' in designSet.property[this.name]);
+      }
+    }
+  }
+
+  /**
+   * Hydrate a single value. The act of hydrating means turning the raw jCal
+   * value into a potentially wrapped object, for example {@link ICAL.Time}.
+   *
+   * @private
+   * @param {Number} index        The index of the value to hydrate
+   * @return {?Object}             The decorated value.
+   */
+  _hydrateValue(index) {
+    if (this._values && this._values[index]) {
+      return this._values[index];
+    }
+
+    // for the case where there is no value.
+    if (this.jCal.length <= (VALUE_INDEX + index)) {
+      return null;
+    }
+
+    if (this.isDecorated) {
+      if (!this._values) {
+        this._values = [];
+      }
+      return (this._values[index] = this._decorate(
+        this.jCal[VALUE_INDEX + index]
+      ));
+    } else {
+      return this.jCal[VALUE_INDEX + index];
+    }
+  }
+
+  /**
+   * Decorate a single value, returning its wrapped object. This is used by
+   * the hydrate function to actually wrap the value.
+   *
+   * @private
+   * @param {?} value         The value to decorate
+   * @return {Object}         The decorated value
+   */
+  _decorate(value) {
+    return this._designSet.value[this.type].decorate(value, this);
+  }
+
+  /**
+   * Undecorate a single value, returning its raw jCal data.
+   *
+   * @private
+   * @param {Object} value         The value to undecorate
+   * @return {?}                   The undecorated value
+   */
+  _undecorate(value) {
+    return this._designSet.value[this.type].undecorate(value, this);
+  }
+
+  /**
+   * Sets the value at the given index while also hydrating it. The passed
+   * value can either be a decorated or undecorated value.
+   *
+   * @private
+   * @param {?} value             The value to set
+   * @param {Number} index        The index to set it at
+   */
+  _setDecoratedValue(value, index) {
+    if (!this._values) {
+      this._values = [];
+    }
+
+    if (typeof(value) === 'object' && 'icaltype' in value) {
+      // decorated value
+      this.jCal[VALUE_INDEX + index] = this._undecorate(value);
+      this._values[index] = value;
+    } else {
+      // undecorated value
+      this.jCal[VALUE_INDEX + index] = value;
+      this._values[index] = this._decorate(value);
+    }
+  }
+
+  /**
+   * Gets a parameter on the property.
+   *
+   * @param {String}        name   Parameter name (lowercase)
+   * @return {Array|String}        Parameter value
+   */
+  getParameter(name) {
+    if (name in this.jCal[PROP_INDEX]) {
+      return this.jCal[PROP_INDEX][name];
+    } else {
+      return undefined;
+    }
+  }
+
+  /**
+   * Gets first parameter on the property.
+   *
+   * @param {String}        name   Parameter name (lowercase)
+   * @return {String}        Parameter value
+   */
+  getFirstParameter(name) {
+    let parameters = this.getParameter(name);
+
+    if (Array.isArray(parameters)) {
+      return parameters[0];
+    }
+
+    return parameters;
+  }
+
+  /**
+   * Sets a parameter on the property.
+   *
+   * @param {String}       name     The parameter name
+   * @param {Array|String} value    The parameter value
+   */
+  setParameter(name, value) {
+    let lcname = name.toLowerCase();
+    if (typeof value === "string" &&
+        lcname in this._designSet.param &&
+        'multiValue' in this._designSet.param[lcname]) {
+        value = [value];
+    }
+    this.jCal[PROP_INDEX][name] = value;
+  }
+
+  /**
+   * Removes a parameter
+   *
+   * @param {String} name     The parameter name
+   */
+  removeParameter(name) {
+    delete this.jCal[PROP_INDEX][name];
+  }
+
+  /**
+   * Get the default type based on this property's name.
+   *
+   * @return {String}     The default type for this property
+   */
+  getDefaultType() {
+    let name = this.jCal[NAME_INDEX$1];
+    let designSet = this._designSet;
+
+    if (name in designSet.property) {
+      let details = designSet.property[name];
+      if ('defaultType' in details) {
+        return details.defaultType;
+      }
+    }
+    return design$1.defaultType;
+  }
+
+  /**
+   * Sets type of property and clears out any existing values of the current
+   * type.
+   *
+   * @param {String} type     New iCAL type (see design.*.values)
+   */
+  resetType(type) {
+    this.removeAllValues();
+    this.jCal[TYPE_INDEX] = type;
+    this._updateType();
+  }
+
+  /**
+   * Finds the first property value.
+   *
+   * @return {Binary | Duration | Period |
+   * Recur | Time | UtcOffset | Geo | string | null}         First property value
+   */
+  getFirstValue() {
+    return this._hydrateValue(0);
+  }
+
+  /**
+   * Gets all values on the property.
+   *
+   * NOTE: this creates an array during each call.
+   *
+   * @return {Array}          List of values
+   */
+  getValues() {
+    let len = this.jCal.length - VALUE_INDEX;
+
+    if (len < 1) {
+      // it is possible for a property to have no value.
+      return [];
+    }
+
+    let i = 0;
+    let result = [];
+
+    for (; i < len; i++) {
+      result[i] = this._hydrateValue(i);
+    }
+
+    return result;
+  }
+
+  /**
+   * Removes all values from this property
+   */
+  removeAllValues() {
+    if (this._values) {
+      this._values.length = 0;
+    }
+    this.jCal.length = 3;
+  }
+
+  /**
+   * Sets the values of the property.  Will overwrite the existing values.
+   * This can only be used for multi-value properties.
+   *
+   * @param {Array} values    An array of values
+   */
+  setValues(values) {
+    if (!this.isMultiValue) {
+      throw new Error(
+        this.name + ': does not not support mulitValue.\n' +
+        'override isMultiValue'
+      );
+    }
+
+    let len = values.length;
+    let i = 0;
+    this.removeAllValues();
+
+    if (len > 0 &&
+        typeof(values[0]) === 'object' &&
+        'icaltype' in values[0]) {
+      this.resetType(values[0].icaltype);
+    }
+
+    if (this.isDecorated) {
+      for (; i < len; i++) {
+        this._setDecoratedValue(values[i], i);
+      }
+    } else {
+      for (; i < len; i++) {
+        this.jCal[VALUE_INDEX + i] = values[i];
+      }
+    }
+  }
+
+  /**
+   * Sets the current value of the property. If this is a multi-value
+   * property, all other values will be removed.
+   *
+   * @param {String|Object} value     New property value.
+   */
+  setValue(value) {
+    this.removeAllValues();
+    if (typeof(value) === 'object' && 'icaltype' in value) {
+      this.resetType(value.icaltype);
+    }
+
+    if (this.isDecorated) {
+      this._setDecoratedValue(value, 0);
+    } else {
+      this.jCal[VALUE_INDEX] = value;
+    }
+  }
+
+  /**
+   * Returns the Object representation of this component. The returned object
+   * is a live jCal object and should be cloned if modified.
+   * @return {Object}
+   */
+  toJSON() {
+    return this.jCal;
+  }
+
+  /**
+   * The string representation of this component.
+   * @return {String}
+   */
+  toICALString() {
+    return stringify.property(
+      this.jCal, this._designSet, true
+    );
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").designSet} designSet
+ * Imports the 'designSet' type from the "types.js" module
+ * @typedef {import("./types.js").Geo} Geo
+ * Imports the 'Geo' type from the "types.js" module
+ */
+
+const NAME_INDEX = 0;
+const PROPERTY_INDEX = 1;
+const COMPONENT_INDEX = 2;
+
+/**
+ * Wraps a jCal component, adding convenience methods to add, remove and update subcomponents and
+ * properties.
+ *
+ * @memberof ICAL
+ */
+class Component {
+  /**
+   * Create an {@link ICAL.Component} by parsing the passed iCalendar string.
+   *
+   * @param {String} str        The iCalendar string to parse
+   */
+  static fromString(str) {
+    return new Component(parse.component(str));
+  }
+
+  /**
+   * Creates a new Component instance.
+   *
+   * @param {Array|String} jCal         Raw jCal component data OR name of new
+   *                                      component
+   * @param {Component=} parent     Parent component to associate
+   */
+  constructor(jCal, parent) {
+    if (typeof(jCal) === 'string') {
+      // jCal spec (name, properties, components)
+      jCal = [jCal, [], []];
+    }
+
+    // mostly for legacy reasons.
+    this.jCal = jCal;
+
+    this.parent = parent || null;
+
+    if (!this.parent && this.name === 'vcalendar') {
+      this._timezoneCache = new Map();
+    }
+  }
+
+  /**
+   * Hydrated properties are inserted into the _properties array at the same
+   * position as in the jCal array, so it is possible that the array contains
+   * undefined values for unhydrdated properties. To avoid iterating the
+   * array when checking if all properties have been hydrated, we save the
+   * count here.
+   *
+   * @type {Number}
+   * @private
+   */
+  _hydratedPropertyCount = 0;
+
+  /**
+   * The same count as for _hydratedPropertyCount, but for subcomponents
+   *
+   * @type {Number}
+   * @private
+   */
+  _hydratedComponentCount = 0;
+
+  /**
+   * A cache of hydrated time zone objects which may be used by consumers, keyed
+   * by time zone ID.
+   *
+   * @type {Map}
+   * @private
+   */
+  _timezoneCache = null;
+
+  /**
+   * @private
+   */
+  _components = null;
+
+  /**
+   * @private
+   */
+  _properties = null;
+
+  /**
+   * The name of this component
+   *
+   * @type {String}
+   */
+  get name() {
+    return this.jCal[NAME_INDEX];
+  }
+
+  /**
+   * The design set for this component, e.g. icalendar vs vcard
+   *
+   * @type {designSet}
+   * @private
+   */
+  get _designSet() {
+    let parentDesign = this.parent && this.parent._designSet;
+    return parentDesign || design$1.getDesignSet(this.name);
+  }
+
+  /**
+   * @private
+   */
+  _hydrateComponent(index) {
+    if (!this._components) {
+      this._components = [];
+      this._hydratedComponentCount = 0;
+    }
+
+    if (this._components[index]) {
+      return this._components[index];
+    }
+
+    let comp = new Component(
+      this.jCal[COMPONENT_INDEX][index],
+      this
+    );
+
+    this._hydratedComponentCount++;
+    return (this._components[index] = comp);
+  }
+
+  /**
+   * @private
+   */
+  _hydrateProperty(index) {
+    if (!this._properties) {
+      this._properties = [];
+      this._hydratedPropertyCount = 0;
+    }
+
+    if (this._properties[index]) {
+      return this._properties[index];
+    }
+
+    let prop = new Property(
+      this.jCal[PROPERTY_INDEX][index],
+      this
+    );
+
+    this._hydratedPropertyCount++;
+    return (this._properties[index] = prop);
+  }
+
+  /**
+   * Finds first sub component, optionally filtered by name.
+   *
+   * @param {String=} name        Optional name to filter by
+   * @return {?Component}     The found subcomponent
+   */
+  getFirstSubcomponent(name) {
+    if (name) {
+      let i = 0;
+      let comps = this.jCal[COMPONENT_INDEX];
+      let len = comps.length;
+
+      for (; i < len; i++) {
+        if (comps[i][NAME_INDEX] === name) {
+          let result = this._hydrateComponent(i);
+          return result;
+        }
+      }
+    } else {
+      if (this.jCal[COMPONENT_INDEX].length) {
+        return this._hydrateComponent(0);
+      }
+    }
+
+    // ensure we return a value (strict mode)
+    return null;
+  }
+
+  /**
+   * Finds all sub components, optionally filtering by name.
+   *
+   * @param {String=} name            Optional name to filter by
+   * @return {Component[]}       The found sub components
+   */
+  getAllSubcomponents(name) {
+    let jCalLen = this.jCal[COMPONENT_INDEX].length;
+    let i = 0;
+
+    if (name) {
+      let comps = this.jCal[COMPONENT_INDEX];
+      let result = [];
+
+      for (; i < jCalLen; i++) {
+        if (name === comps[i][NAME_INDEX]) {
+          result.push(
+            this._hydrateComponent(i)
+          );
+        }
+      }
+      return result;
+    } else {
+      if (!this._components ||
+          (this._hydratedComponentCount !== jCalLen)) {
+        for (; i < jCalLen; i++) {
+          this._hydrateComponent(i);
+        }
+      }
+
+      return this._components || [];
+    }
+  }
+
+  /**
+   * Returns true when a named property exists.
+   *
+   * @param {String} name     The property name
+   * @return {Boolean}        True, when property is found
+   */
+  hasProperty(name) {
+    let props = this.jCal[PROPERTY_INDEX];
+    let len = props.length;
+
+    let i = 0;
+    for (; i < len; i++) {
+      // 0 is property name
+      if (props[i][NAME_INDEX] === name) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * Finds the first property, optionally with the given name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {?Property}     The found property
+   */
+  getFirstProperty(name) {
+    if (name) {
+      let i = 0;
+      let props = this.jCal[PROPERTY_INDEX];
+      let len = props.length;
+
+      for (; i < len; i++) {
+        if (props[i][NAME_INDEX] === name) {
+          let result = this._hydrateProperty(i);
+          return result;
+        }
+      }
+    } else {
+      if (this.jCal[PROPERTY_INDEX].length) {
+        return this._hydrateProperty(0);
+      }
+    }
+
+    return null;
+  }
+
+  /**
+   * Returns first property's value, if available.
+   *
+   * @param {String=} name                    Lowercase property name
+   * @return {Binary | Duration | Period |
+   * Recur | Time | UtcOffset | Geo | string | null}         The found property value.
+   */
+  getFirstPropertyValue(name) {
+    let prop = this.getFirstProperty(name);
+    if (prop) {
+      return prop.getFirstValue();
+    }
+
+    return null;
+  }
+
+  /**
+   * Get all properties in the component, optionally filtered by name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {Property[]}    List of properties
+   */
+  getAllProperties(name) {
+    let jCalLen = this.jCal[PROPERTY_INDEX].length;
+    let i = 0;
+
+    if (name) {
+      let props = this.jCal[PROPERTY_INDEX];
+      let result = [];
+
+      for (; i < jCalLen; i++) {
+        if (name === props[i][NAME_INDEX]) {
+          result.push(
+            this._hydrateProperty(i)
+          );
+        }
+      }
+      return result;
+    } else {
+      if (!this._properties ||
+          (this._hydratedPropertyCount !== jCalLen)) {
+        for (; i < jCalLen; i++) {
+          this._hydrateProperty(i);
+        }
+      }
+
+      return this._properties || [];
+    }
+  }
+
+  /**
+   * @private
+   */
+  _removeObjectByIndex(jCalIndex, cache, index) {
+    cache = cache || [];
+    // remove cached version
+    if (cache[index]) {
+      let obj = cache[index];
+      if ("parent" in obj) {
+          obj.parent = null;
+      }
+    }
+
+    cache.splice(index, 1);
+
+    // remove it from the jCal
+    this.jCal[jCalIndex].splice(index, 1);
+  }
+
+  /**
+   * @private
+   */
+  _removeObject(jCalIndex, cache, nameOrObject) {
+    let i = 0;
+    let objects = this.jCal[jCalIndex];
+    let len = objects.length;
+    let cached = this[cache];
+
+    if (typeof(nameOrObject) === 'string') {
+      for (; i < len; i++) {
+        if (objects[i][NAME_INDEX] === nameOrObject) {
+          this._removeObjectByIndex(jCalIndex, cached, i);
+          return true;
+        }
+      }
+    } else if (cached) {
+      for (; i < len; i++) {
+        if (cached[i] && cached[i] === nameOrObject) {
+          this._removeObjectByIndex(jCalIndex, cached, i);
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+
+  /**
+   * @private
+   */
+  _removeAllObjects(jCalIndex, cache, name) {
+    let cached = this[cache];
+
+    // Unfortunately we have to run through all children to reset their
+    // parent property.
+    let objects = this.jCal[jCalIndex];
+    let i = objects.length - 1;
+
+    // descending search required because splice
+    // is used and will effect the indices.
+    for (; i >= 0; i--) {
+      if (!name || objects[i][NAME_INDEX] === name) {
+        this._removeObjectByIndex(jCalIndex, cached, i);
+      }
+    }
+  }
+
+  /**
+   * Adds a single sub component.
+   *
+   * @param {Component} component        The component to add
+   * @return {Component}                 The passed in component
+   */
+  addSubcomponent(component) {
+    if (!this._components) {
+      this._components = [];
+      this._hydratedComponentCount = 0;
+    }
+
+    if (component.parent) {
+      component.parent.removeSubcomponent(component);
+    }
+
+    let idx = this.jCal[COMPONENT_INDEX].push(component.jCal);
+    this._components[idx - 1] = component;
+    this._hydratedComponentCount++;
+    component.parent = this;
+    return component;
+  }
+
+  /**
+   * Removes a single component by name or the instance of a specific
+   * component.
+   *
+   * @param {Component|String} nameOrComp    Name of component, or component
+   * @return {Boolean}                            True when comp is removed
+   */
+  removeSubcomponent(nameOrComp) {
+    let removed = this._removeObject(COMPONENT_INDEX, '_components', nameOrComp);
+    if (removed) {
+      this._hydratedComponentCount--;
+    }
+    return removed;
+  }
+
+  /**
+   * Removes all components or (if given) all components by a particular
+   * name.
+   *
+   * @param {String=} name            Lowercase component name
+   */
+  removeAllSubcomponents(name) {
+    let removed = this._removeAllObjects(COMPONENT_INDEX, '_components', name);
+    this._hydratedComponentCount = 0;
+    return removed;
+  }
+
+  /**
+   * Adds an {@link ICAL.Property} to the component.
+   *
+   * @param {Property} property      The property to add
+   * @return {Property}              The passed in property
+   */
+  addProperty(property) {
+    if (!(property instanceof Property)) {
+      throw new TypeError('must be instance of ICAL.Property');
+    }
+
+    if (!this._properties) {
+      this._properties = [];
+      this._hydratedPropertyCount = 0;
+    }
+
+    if (property.parent) {
+      property.parent.removeProperty(property);
+    }
+
+    let idx = this.jCal[PROPERTY_INDEX].push(property.jCal);
+    this._properties[idx - 1] = property;
+    this._hydratedPropertyCount++;
+    property.parent = this;
+    return property;
+  }
+
+  /**
+   * Helper method to add a property with a value to the component.
+   *
+   * @param {String}               name         Property name to add
+   * @param {String|Number|Object} value        Property value
+   * @return {Property}                    The created property
+   */
+  addPropertyWithValue(name, value) {
+    let prop = new Property(name);
+    prop.setValue(value);
+
+    this.addProperty(prop);
+
+    return prop;
+  }
+
+  /**
+   * Helper method that will update or create a property of the given name
+   * and sets its value. If multiple properties with the given name exist,
+   * only the first is updated.
+   *
+   * @param {String}               name         Property name to update
+   * @param {String|Number|Object} value        Property value
+   * @return {Property}                    The created property
+   */
+  updatePropertyWithValue(name, value) {
+    let prop = this.getFirstProperty(name);
+
+    if (prop) {
+      prop.setValue(value);
+    } else {
+      prop = this.addPropertyWithValue(name, value);
+    }
+
+    return prop;
+  }
+
+  /**
+   * Removes a single property by name or the instance of the specific
+   * property.
+   *
+   * @param {String|Property} nameOrProp     Property name or instance to remove
+   * @return {Boolean}                            True, when deleted
+   */
+  removeProperty(nameOrProp) {
+    let removed = this._removeObject(PROPERTY_INDEX, '_properties', nameOrProp);
+    if (removed) {
+      this._hydratedPropertyCount--;
+    }
+    return removed;
+  }
+
+  /**
+   * Removes all properties associated with this component, optionally
+   * filtered by name.
+   *
+   * @param {String=} name        Lowercase property name
+   * @return {Boolean}            True, when deleted
+   */
+  removeAllProperties(name) {
+    let removed = this._removeAllObjects(PROPERTY_INDEX, '_properties', name);
+    this._hydratedPropertyCount = 0;
+    return removed;
+  }
+
+  /**
+   * Returns the Object representation of this component. The returned object
+   * is a live jCal object and should be cloned if modified.
+   * @return {Object}
+   */
+  toJSON() {
+    return this.jCal;
+  }
+
+  /**
+   * The string representation of this component.
+   * @return {String}
+   */
+  toString() {
+    return stringify.component(
+      this.jCal, this._designSet
+    );
+  }
+
+  /**
+   * Retrieve a time zone definition from the component tree, if any is present.
+   * If the tree contains no time zone definitions or the TZID cannot be
+   * matched, returns null.
+   *
+   * @param {String} tzid     The ID of the time zone to retrieve
+   * @return {Timezone}  The time zone corresponding to the ID, or null
+   */
+  getTimeZoneByID(tzid) {
+    // VTIMEZONE components can only appear as a child of the VCALENDAR
+    // component; walk the tree if we're not the root.
+    if (this.parent) {
+      return this.parent.getTimeZoneByID(tzid);
+    }
+
+    // If there is no time zone cache, we are probably parsing an incomplete
+    // file and will have no time zone definitions.
+    if (!this._timezoneCache) {
+      return null;
+    }
+
+    if (this._timezoneCache.has(tzid)) {
+      return this._timezoneCache.get(tzid);
+    }
+
+    // If the time zone is not already cached, hydrate it from the
+    // subcomponents.
+    const zones = this.getAllSubcomponents('vtimezone');
+    for (const zone of zones) {
+      if (zone.getFirstProperty('tzid').getFirstValue() === tzid) {
+        const hydratedZone = new Timezone({
+          component: zone,
+          tzid: tzid,
+        });
+
+        this._timezoneCache.set(tzid, hydratedZone);
+
+        return hydratedZone;
+      }
+    }
+
+    // Per the standard, we should always have a time zone defined in a file
+    // for any referenced TZID, but don't blow up if the file is invalid.
+    return null;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * Primary class for expanding recurring rules.  Can take multiple rrules, rdates, exdate(s) and
+ * iterate (in order) over each next occurrence.
+ *
+ * Once initialized this class can also be serialized saved and continue iteration from the last
+ * point.
+ *
+ * NOTE: it is intended that this class is to be used with {@link ICAL.Event} which handles recurrence
+ * exceptions.
+ *
+ * @example
+ * // assuming event is a parsed ical component
+ * var event;
+ *
+ * var expand = new ICAL.RecurExpansion({
+ *   component: event,
+ *   dtstart: event.getFirstPropertyValue('dtstart')
+ * });
+ *
+ * // remember there are infinite rules so it is a good idea to limit the scope of the iterations
+ * // then resume later on.
+ *
+ * // next is always an ICAL.Time or null
+ * var next;
+ *
+ * while (someCondition && (next = expand.next())) {
+ *   // do something with next
+ * }
+ *
+ * // save instance for later
+ * var json = JSON.stringify(expand);
+ *
+ * //...
+ *
+ * // NOTE: if the component's properties have changed you will need to rebuild the class and start
+ * // over. This only works when the component's recurrence info is the same.
+ * var expand = new ICAL.RecurExpansion(JSON.parse(json));
+ *
+ * @memberof ICAL
+ */
+class RecurExpansion {
+  /**
+   * Creates a new ICAL.RecurExpansion instance.
+   *
+   * The options object can be filled with the specified initial values. It can also contain
+   * additional members, as a result of serializing a previous expansion state, as shown in the
+   * example.
+   *
+   * @param {Object} options
+   *        Recurrence expansion options
+   * @param {Time} options.dtstart
+   *        Start time of the event
+   * @param {Component=} options.component
+   *        Component for expansion, required if not resuming.
+   */
+  constructor(options) {
+    this.ruleDates = [];
+    this.exDates = [];
+    this.fromData(options);
+  }
+
+  /**
+   * True when iteration is fully completed.
+   * @type {Boolean}
+   */
+  complete = false;
+
+  /**
+   * Array of rrule iterators.
+   *
+   * @type {RecurIterator[]}
+   * @private
+   */
+  ruleIterators = null;
+
+  /**
+   * Array of rdate instances.
+   *
+   * @type {Time[]}
+   * @private
+   */
+  ruleDates = null;
+
+  /**
+   * Array of exdate instances.
+   *
+   * @type {Time[]}
+   * @private
+   */
+  exDates = null;
+
+  /**
+   * Current position in ruleDates array.
+   * @type {Number}
+   * @private
+   */
+  ruleDateInc = 0;
+
+  /**
+   * Current position in exDates array
+   * @type {Number}
+   * @private
+   */
+  exDateInc = 0;
+
+  /**
+   * Current negative date.
+   *
+   * @type {Time}
+   * @private
+   */
+  exDate = null;
+
+  /**
+   * Current additional date.
+   *
+   * @type {Time}
+   * @private
+   */
+  ruleDate = null;
+
+  /**
+   * Start date of recurring rules.
+   *
+   * @type {Time}
+   */
+  dtstart = null;
+
+  /**
+   * Last expanded time
+   *
+   * @type {Time}
+   */
+  last = null;
+
+  /**
+   * Initialize the recurrence expansion from the data object. The options
+   * object may also contain additional members, see the
+   * {@link ICAL.RecurExpansion constructor} for more details.
+   *
+   * @param {Object} options
+   *        Recurrence expansion options
+   * @param {Time} options.dtstart
+   *        Start time of the event
+   * @param {Component=} options.component
+   *        Component for expansion, required if not resuming.
+   */
+  fromData(options) {
+    let start = formatClassType(options.dtstart, Time);
+
+    if (!start) {
+      throw new Error('.dtstart (ICAL.Time) must be given');
+    } else {
+      this.dtstart = start;
+    }
+
+    if (options.component) {
+      this._init(options.component);
+    } else {
+      this.last = formatClassType(options.last, Time) || start.clone();
+
+      if (!options.ruleIterators) {
+        throw new Error('.ruleIterators or .component must be given');
+      }
+
+      this.ruleIterators = options.ruleIterators.map(function(item) {
+        return formatClassType(item, RecurIterator);
+      });
+
+      this.ruleDateInc = options.ruleDateInc;
+      this.exDateInc = options.exDateInc;
+
+      if (options.ruleDates) {
+        this.ruleDates = options.ruleDates.map(item => formatClassType(item, Time));
+        this.ruleDate = this.ruleDates[this.ruleDateInc];
+      }
+
+      if (options.exDates) {
+        this.exDates = options.exDates.map(item => formatClassType(item, Time));
+        this.exDate = this.exDates[this.exDateInc];
+      }
+
+      if (typeof(options.complete) !== 'undefined') {
+        this.complete = options.complete;
+      }
+    }
+  }
+
+  /**
+   * Retrieve the next occurrence in the series.
+   * @return {Time}
+   */
+  next() {
+    let iter;
+    let next;
+    let compare;
+
+    let maxTries = 500;
+    let currentTry = 0;
+
+    while (true) {
+      if (currentTry++ > maxTries) {
+        throw new Error(
+          'max tries have occurred, rule may be impossible to fulfill.'
+        );
+      }
+
+      next = this.ruleDate;
+      iter = this._nextRecurrenceIter(this.last);
+
+      // no more matches
+      // because we increment the rule day or rule
+      // _after_ we choose a value this should be
+      // the only spot where we need to worry about the
+      // end of events.
+      if (!next && !iter) {
+        // there are no more iterators or rdates
+        this.complete = true;
+        break;
+      }
+
+      // no next rule day or recurrence rule is first.
+      if (!next || (iter && next.compare(iter.last) > 0)) {
+        // must be cloned, recur will reuse the time element.
+        next = iter.last.clone();
+        // move to next so we can continue
+        iter.next();
+      }
+
+      // if the ruleDate is still next increment it.
+      if (this.ruleDate === next) {
+        this._nextRuleDay();
+      }
+
+      this.last = next;
+
+      // check the negative rules
+      if (this.exDate) {
+        compare = this.exDate.compare(this.last);
+
+        if (compare < 0) {
+          this._nextExDay();
+        }
+
+        // if the current rule is excluded skip it.
+        if (compare === 0) {
+          this._nextExDay();
+          continue;
+        }
+      }
+
+      //XXX: The spec states that after we resolve the final
+      //     list of dates we execute exdate this seems somewhat counter
+      //     intuitive to what I have seen most servers do so for now
+      //     I exclude based on the original date not the one that may
+      //     have been modified by the exception.
+      return this.last;
+    }
+  }
+
+  /**
+   * Converts object into a serialize-able format. This format can be passed
+   * back into the expansion to resume iteration.
+   * @return {Object}
+   */
+  toJSON() {
+    function toJSON(item) {
+      return item.toJSON();
+    }
+
+    let result = Object.create(null);
+    result.ruleIterators = this.ruleIterators.map(toJSON);
+
+    if (this.ruleDates) {
+      result.ruleDates = this.ruleDates.map(toJSON);
+    }
+
+    if (this.exDates) {
+      result.exDates = this.exDates.map(toJSON);
+    }
+
+    result.ruleDateInc = this.ruleDateInc;
+    result.exDateInc = this.exDateInc;
+    result.last = this.last.toJSON();
+    result.dtstart = this.dtstart.toJSON();
+    result.complete = this.complete;
+
+    return result;
+  }
+
+  /**
+   * Extract all dates from the properties in the given component. The
+   * properties will be filtered by the property name.
+   *
+   * @private
+   * @param {Component} component             The component to search in
+   * @param {String} propertyName             The property name to search for
+   * @return {Time[]}                         The extracted dates.
+   */
+  _extractDates(component, propertyName) {
+    let result = [];
+    let props = component.getAllProperties(propertyName);
+
+    for (let i = 0, len = props.length; i < len; i++) {
+      for (let prop of props[i].getValues()) {
+        let idx = binsearchInsert(
+          result,
+          prop,
+          (a, b) => a.compare(b)
+        );
+
+        // ordered insert
+        result.splice(idx, 0, prop);
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Initialize the recurrence expansion.
+   *
+   * @private
+   * @param {Component} component    The component to initialize from.
+   */
+  _init(component) {
+    this.ruleIterators = [];
+
+    this.last = this.dtstart.clone();
+
+    // to provide api consistency non-recurring
+    // events can also use the iterator though it will
+    // only return a single time.
+    if (!component.hasProperty('rdate') &&
+        !component.hasProperty('rrule') &&
+        !component.hasProperty('recurrence-id')) {
+      this.ruleDate = this.last.clone();
+      this.complete = true;
+      return;
+    }
+
+    if (component.hasProperty('rdate')) {
+      this.ruleDates = this._extractDates(component, 'rdate');
+
+      // special hack for cases where first rdate is prior
+      // to the start date. We only check for the first rdate.
+      // This is mostly for google's crazy recurring date logic
+      // (contacts birthdays).
+      if ((this.ruleDates[0]) &&
+          (this.ruleDates[0].compare(this.dtstart) < 0)) {
+
+        this.ruleDateInc = 0;
+        this.last = this.ruleDates[0].clone();
+      } else {
+        this.ruleDateInc = binsearchInsert(
+          this.ruleDates,
+          this.last,
+          (a, b) => a.compare(b)
+        );
+      }
+
+      this.ruleDate = this.ruleDates[this.ruleDateInc];
+    }
+
+    if (component.hasProperty('rrule')) {
+      let rules = component.getAllProperties('rrule');
+      let i = 0;
+      let len = rules.length;
+
+      let rule;
+      let iter;
+
+      for (; i < len; i++) {
+        rule = rules[i].getFirstValue();
+        iter = rule.iterator(this.dtstart);
+        this.ruleIterators.push(iter);
+
+        // increment to the next occurrence so future
+        // calls to next return times beyond the initial iteration.
+        // XXX: I find this suspicious might be a bug?
+        iter.next();
+      }
+    }
+
+    if (component.hasProperty('exdate')) {
+      this.exDates = this._extractDates(component, 'exdate');
+      // if we have a .last day we increment the index to beyond it.
+      this.exDateInc = binsearchInsert(
+        this.exDates,
+        this.last,
+        (a, b) => a.compare(b)
+      );
+
+      this.exDate = this.exDates[this.exDateInc];
+    }
+  }
+
+  /**
+   * Advance to the next exdate
+   * @private
+   */
+  _nextExDay() {
+    this.exDate = this.exDates[++this.exDateInc];
+  }
+
+  /**
+   * Advance to the next rule date
+   * @private
+   */
+  _nextRuleDay() {
+    this.ruleDate = this.ruleDates[++this.ruleDateInc];
+  }
+
+  /**
+   * Find and return the recurrence rule with the most recent event and
+   * return it.
+   *
+   * @private
+   * @return {?RecurIterator}    Found iterator.
+   */
+  _nextRecurrenceIter() {
+    let iters = this.ruleIterators;
+
+    if (iters.length === 0) {
+      return null;
+    }
+
+    let len = iters.length;
+    let iter;
+    let iterTime;
+    let iterIdx = 0;
+    let chosenIter;
+
+    // loop through each iterator
+    for (; iterIdx < len; iterIdx++) {
+      iter = iters[iterIdx];
+      iterTime = iter.last;
+
+      // if iteration is complete
+      // then we must exclude it from
+      // the search and remove it.
+      if (iter.completed) {
+        len--;
+        if (iterIdx !== 0) {
+          iterIdx--;
+        }
+        iters.splice(iterIdx, 1);
+        continue;
+      }
+
+      // find the most recent possible choice
+      if (!chosenIter || chosenIter.last.compare(iterTime) > 0) {
+        // that iterator is saved
+        chosenIter = iter;
+      }
+    }
+
+    // the chosen iterator is returned but not mutated
+    // this iterator contains the most recent event.
+    return chosenIter;
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * This lets typescript resolve our custom types in the
+ * generated d.ts files (jsdoc typedefs are converted to typescript types).
+ * Ignore prevents the typedefs from being documented more than once.
+ * @ignore
+ * @typedef {import("./types.js").frequencyValues} frequencyValues
+ * Imports the 'frequencyValues' type from the "types.js" module
+ * @typedef {import("./types.js").occurrenceDetails} occurrenceDetails
+ * Imports the 'occurrenceDetails' type from the "types.js" module
+ */
+
+/**
+ * ICAL.js is organized into multiple layers. The bottom layer is a raw jCal
+ * object, followed by the component/property layer. The highest level is the
+ * event representation, which this class is part of. See the
+ * {@tutorial layers} guide for more details.
+ *
+ * @memberof ICAL
+ */
+class Event {
+  /**
+   * Creates a new ICAL.Event instance.
+   *
+   * @param {Component=} component              The ICAL.Component to base this event on
+   * @param {Object} [options]                  Options for this event
+   * @param {Boolean=} options.strictExceptions  When true, will verify exceptions are related by
+   *                                              their UUID
+   * @param {Array<Component|Event>=} options.exceptions
+   *          Exceptions to this event, either as components or events. If not
+   *            specified exceptions will automatically be set in relation of
+   *            component's parent
+   */
+  constructor(component, options) {
+    if (!(component instanceof Component)) {
+      options = component;
+      component = null;
+    }
+
+    if (component) {
+      this.component = component;
+    } else {
+      this.component = new Component('vevent');
+    }
+
+    this._rangeExceptionCache = Object.create(null);
+    this.exceptions = Object.create(null);
+    this.rangeExceptions = [];
+
+    if (options && options.strictExceptions) {
+      this.strictExceptions = options.strictExceptions;
+    }
+
+    if (options && options.exceptions) {
+      options.exceptions.forEach(this.relateException, this);
+    } else if (this.component.parent && !this.isRecurrenceException()) {
+      this.component.parent.getAllSubcomponents('vevent').forEach(function(event) {
+        if (event.hasProperty('recurrence-id')) {
+          this.relateException(event);
+        }
+      }, this);
+    }
+  }
+
+
+  static THISANDFUTURE = 'THISANDFUTURE';
+
+  /**
+   * List of related event exceptions.
+   *
+   * @type {Event[]}
+   */
+  exceptions = null;
+
+  /**
+   * When true, will verify exceptions are related by their UUID.
+   *
+   * @type {Boolean}
+   */
+  strictExceptions = false;
+
+  /**
+   * Relates a given event exception to this object.  If the given component
+   * does not share the UID of this event it cannot be related and will throw
+   * an exception.
+   *
+   * If this component is an exception it cannot have other exceptions
+   * related to it.
+   *
+   * @param {Component|Event} obj       Component or event
+   */
+  relateException(obj) {
+    if (this.isRecurrenceException()) {
+      throw new Error('cannot relate exception to exceptions');
+    }
+
+    if (obj instanceof Component) {
+      obj = new Event(obj);
+    }
+
+    if (this.strictExceptions && obj.uid !== this.uid) {
+      throw new Error('attempted to relate unrelated exception');
+    }
+
+    let id = obj.recurrenceId.toString();
+
+    // we don't sort or manage exceptions directly
+    // here the recurrence expander handles that.
+    this.exceptions[id] = obj;
+
+    // index RANGE=THISANDFUTURE exceptions so we can
+    // look them up later in getOccurrenceDetails.
+    if (obj.modifiesFuture()) {
+      let item = [
+        obj.recurrenceId.toUnixTime(), id
+      ];
+
+      // we keep them sorted so we can find the nearest
+      // value later on...
+      let idx = binsearchInsert(
+        this.rangeExceptions,
+        item,
+        compareRangeException
+      );
+
+      this.rangeExceptions.splice(idx, 0, item);
+    }
+  }
+
+  /**
+   * Checks if this record is an exception and has the RANGE=THISANDFUTURE
+   * value.
+   *
+   * @return {Boolean}        True, when exception is within range
+   */
+  modifiesFuture() {
+    if (!this.component.hasProperty('recurrence-id')) {
+      return false;
+    }
+
+    let range = this.component.getFirstProperty('recurrence-id').getParameter('range');
+    return range === Event.THISANDFUTURE;
+  }
+
+  /**
+   * Finds the range exception nearest to the given date.
+   *
+   * @param {Time} time   usually an occurrence time of an event
+   * @return {?Event}     the related event/exception or null
+   */
+  findRangeException(time) {
+    if (!this.rangeExceptions.length) {
+      return null;
+    }
+
+    let utc = time.toUnixTime();
+    let idx = binsearchInsert(
+      this.rangeExceptions,
+      [utc],
+      compareRangeException
+    );
+
+    idx -= 1;
+
+    // occurs before
+    if (idx < 0) {
+      return null;
+    }
+
+    let rangeItem = this.rangeExceptions[idx];
+
+    /* c8 ignore next 4 */
+    if (utc < rangeItem[0]) {
+      // sanity check only
+      return null;
+    }
+
+    return rangeItem[1];
+  }
+
+  /**
+   * Returns the occurrence details based on its start time.  If the
+   * occurrence has an exception will return the details for that exception.
+   *
+   * NOTE: this method is intend to be used in conjunction
+   *       with the {@link ICAL.Event#iterator iterator} method.
+   *
+   * @param {Time} occurrence               time occurrence
+   * @return {occurrenceDetails}            Information about the occurrence
+   */
+  getOccurrenceDetails(occurrence) {
+    let id = occurrence.toString();
+    let utcId = occurrence.convertToZone(Timezone.utcTimezone).toString();
+    let item;
+    let result = {
+      //XXX: Clone?
+      recurrenceId: occurrence
+    };
+
+    if (id in this.exceptions) {
+      item = result.item = this.exceptions[id];
+      result.startDate = item.startDate;
+      result.endDate = item.endDate;
+      result.item = item;
+    } else if (utcId in this.exceptions) {
+      item = this.exceptions[utcId];
+      result.startDate = item.startDate;
+      result.endDate = item.endDate;
+      result.item = item;
+    } else {
+      // range exceptions (RANGE=THISANDFUTURE) have a
+      // lower priority then direct exceptions but
+      // must be accounted for first. Their item is
+      // always the first exception with the range prop.
+      let rangeExceptionId = this.findRangeException(
+        occurrence
+      );
+      let end;
+
+      if (rangeExceptionId) {
+        let exception = this.exceptions[rangeExceptionId];
+
+        // range exception must modify standard time
+        // by the difference (if any) in start/end times.
+        result.item = exception;
+
+        let startDiff = this._rangeExceptionCache[rangeExceptionId];
+
+        if (!startDiff) {
+          let original = exception.recurrenceId.clone();
+          let newStart = exception.startDate.clone();
+
+          // zones must be same otherwise subtract may be incorrect.
+          original.zone = newStart.zone;
+          startDiff = newStart.subtractDate(original);
+
+          this._rangeExceptionCache[rangeExceptionId] = startDiff;
+        }
+
+        let start = occurrence.clone();
+        start.zone = exception.startDate.zone;
+        start.addDuration(startDiff);
+
+        end = start.clone();
+        end.addDuration(exception.duration);
+
+        result.startDate = start;
+        result.endDate = end;
+      } else {
+        // no range exception standard expansion
+        end = occurrence.clone();
+        end.addDuration(this.duration);
+
+        result.endDate = end;
+        result.startDate = occurrence;
+        result.item = this;
+      }
+    }
+
+    return result;
+  }
+
+  /**
+   * Builds a recur expansion instance for a specific point in time (defaults
+   * to startDate).
+   *
+   * @param {Time=} startTime     Starting point for expansion
+   * @return {RecurExpansion}    Expansion object
+   */
+  iterator(startTime) {
+    return new RecurExpansion({
+      component: this.component,
+      dtstart: startTime || this.startDate
+    });
+  }
+
+  /**
+   * Checks if the event is recurring
+   *
+   * @return {Boolean}        True, if event is recurring
+   */
+  isRecurring() {
+    let comp = this.component;
+    return comp.hasProperty('rrule') || comp.hasProperty('rdate');
+  }
+
+  /**
+   * Checks if the event describes a recurrence exception. See
+   * {@tutorial terminology} for details.
+   *
+   * @return {Boolean}    True, if the event describes a recurrence exception
+   */
+  isRecurrenceException() {
+    return this.component.hasProperty('recurrence-id');
+  }
+
+  /**
+   * Returns the types of recurrences this event may have.
+   *
+   * Returned as an object with the following possible keys:
+   *
+   *    - YEARLY
+   *    - MONTHLY
+   *    - WEEKLY
+   *    - DAILY
+   *    - MINUTELY
+   *    - SECONDLY
+   *
+   * @return {Object.<frequencyValues, Boolean>}
+   *          Object of recurrence flags
+   */
+  getRecurrenceTypes() {
+    let rules = this.component.getAllProperties('rrule');
+    let i = 0;
+    let len = rules.length;
+    let result = Object.create(null);
+
+    for (; i < len; i++) {
+      let value = rules[i].getFirstValue();
+      result[value.freq] = true;
+    }
+
+    return result;
+  }
+
+  /**
+   * The uid of this event
+   * @type {String}
+   */
+  get uid() {
+    return this._firstProp('uid');
+  }
+
+  set uid(value) {
+    this._setProp('uid', value);
+  }
+
+  /**
+   * The start date
+   * @type {Time}
+   */
+  get startDate() {
+    return this._firstProp('dtstart');
+  }
+
+  set startDate(value) {
+    this._setTime('dtstart', value);
+  }
+
+  /**
+   * The end date. This can be the result directly from the property, or the
+   * end date calculated from start date and duration. Setting the property
+   * will remove any duration properties.
+   * @type {Time}
+   */
+  get endDate() {
+    let endDate = this._firstProp('dtend');
+    if (!endDate) {
+        let duration = this._firstProp('duration');
+        endDate = this.startDate.clone();
+        if (duration) {
+            endDate.addDuration(duration);
+        } else if (endDate.isDate) {
+            endDate.day += 1;
+        }
+    }
+    return endDate;
+  }
+
+  set endDate(value) {
+    if (this.component.hasProperty('duration')) {
+      this.component.removeProperty('duration');
+    }
+    this._setTime('dtend', value);
+  }
+
+  /**
+   * The duration. This can be the result directly from the property, or the
+   * duration calculated from start date and end date. Setting the property
+   * will remove any `dtend` properties.
+   * @type {Duration}
+   */
+  get duration() {
+    let duration = this._firstProp('duration');
+    if (!duration) {
+      return this.endDate.subtractDateTz(this.startDate);
+    }
+    return duration;
+  }
+
+  set duration(value) {
+    if (this.component.hasProperty('dtend')) {
+      this.component.removeProperty('dtend');
+    }
+
+    this._setProp('duration', value);
+  }
+
+  /**
+   * The location of the event.
+   * @type {String}
+   */
+  get location() {
+    return this._firstProp('location');
+  }
+
+  set location(value) {
+    this._setProp('location', value);
+  }
+
+  /**
+   * The attendees in the event
+   * @type {Property[]}
+   */
+  get attendees() {
+    //XXX: This is way lame we should have a better
+    //     data structure for this later.
+    return this.component.getAllProperties('attendee');
+  }
+
+  /**
+   * The event summary
+   * @type {String}
+   */
+  get summary() {
+    return this._firstProp('summary');
+  }
+
+  set summary(value) {
+    this._setProp('summary', value);
+  }
+
+  /**
+   * The event description.
+   * @type {String}
+   */
+  get description() {
+    return this._firstProp('description');
+  }
+
+  set description(value) {
+    this._setProp('description', value);
+  }
+
+  /**
+   * The event color from [rfc7986](https://datatracker.ietf.org/doc/html/rfc7986)
+   * @type {String}
+   */
+  get color() {
+    return this._firstProp('color');
+  }
+
+  set color(value) {
+    this._setProp('color', value);
+  }
+
+  /**
+   * The organizer value as an uri. In most cases this is a mailto: uri, but
+   * it can also be something else, like urn:uuid:...
+   * @type {String}
+   */
+  get organizer() {
+    return this._firstProp('organizer');
+  }
+
+  set organizer(value) {
+    this._setProp('organizer', value);
+  }
+
+  /**
+   * The sequence value for this event. Used for scheduling
+   * see {@tutorial terminology}.
+   * @type {Number}
+   */
+  get sequence() {
+    return this._firstProp('sequence');
+  }
+
+  set sequence(value) {
+    this._setProp('sequence', value);
+  }
+
+  /**
+   * The recurrence id for this event. See {@tutorial terminology} for details.
+   * @type {Time}
+   */
+  get recurrenceId() {
+    return this._firstProp('recurrence-id');
+  }
+
+  set recurrenceId(value) {
+    this._setTime('recurrence-id', value);
+  }
+
+  /**
+   * Set/update a time property's value.
+   * This will also update the TZID of the property.
+   *
+   * TODO: this method handles the case where we are switching
+   * from a known timezone to an implied timezone (one without TZID).
+   * This does _not_ handle the case of moving between a known
+   *  (by TimezoneService) timezone to an unknown timezone...
+   *
+   * We will not add/remove/update the VTIMEZONE subcomponents
+   *  leading to invalid ICAL data...
+   * @private
+   * @param {String} propName     The property name
+   * @param {Time} time           The time to set
+   */
+  _setTime(propName, time) {
+    let prop = this.component.getFirstProperty(propName);
+
+    if (!prop) {
+      prop = new Property(propName);
+      this.component.addProperty(prop);
+    }
+
+    // utc and local don't get a tzid
+    if (
+      time.zone === Timezone.localTimezone ||
+      time.zone === Timezone.utcTimezone
+    ) {
+      // remove the tzid
+      prop.removeParameter('tzid');
+    } else {
+      prop.setParameter('tzid', time.zone.tzid);
+    }
+
+    prop.setValue(time);
+  }
+
+  _setProp(name, value) {
+    this.component.updatePropertyWithValue(name, value);
+  }
+
+  _firstProp(name) {
+    return this.component.getFirstPropertyValue(name);
+  }
+
+  /**
+   * The string representation of this event.
+   * @return {String}
+   */
+  toString() {
+    return this.component.toString();
+  }
+}
+
+function compareRangeException(a, b) {
+  if (a[0] > b[0]) return 1;
+  if (b[0] > a[0]) return -1;
+  return 0;
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * The ComponentParser is used to process a String or jCal Object,
+ * firing callbacks for various found components, as well as completion.
+ *
+ * @example
+ * var options = {
+ *   // when false no events will be emitted for type
+ *   parseEvent: true,
+ *   parseTimezone: true
+ * };
+ *
+ * var parser = new ICAL.ComponentParser(options);
+ *
+ * parser.onevent(eventComponent) {
+ *   //...
+ * }
+ *
+ * // ontimezone, etc...
+ *
+ * parser.oncomplete = function() {
+ *
+ * };
+ *
+ * parser.process(stringOrComponent);
+ *
+ * @memberof ICAL
+ */
+class ComponentParser {
+  /**
+   * Creates a new ICAL.ComponentParser instance.
+   *
+   * @param {Object=} options                   Component parser options
+   * @param {Boolean} options.parseEvent        Whether events should be parsed
+   * @param {Boolean} options.parseTimezeone    Whether timezones should be parsed
+   */
+  constructor(options) {
+    if (typeof(options) === 'undefined') {
+      options = {};
+    }
+
+    for (let [key, value] of Object.entries(options)) {
+      this[key] = value;
+    }
+  }
+
+  /**
+   * When true, parse events
+   *
+   * @type {Boolean}
+   */
+  parseEvent = true;
+
+  /**
+   * When true, parse timezones
+   *
+   * @type {Boolean}
+   */
+  parseTimezone = true;
+
+
+  /* SAX like events here for reference */
+
+  /**
+   * Fired when parsing is complete
+   * @callback
+   */
+  oncomplete = /* c8 ignore next */ function() {};
+
+  /**
+   * Fired if an error occurs during parsing.
+   *
+   * @callback
+   * @param {Error} err details of error
+   */
+  onerror = /* c8 ignore next */ function(err) {};
+
+  /**
+   * Fired when a top level component (VTIMEZONE) is found
+   *
+   * @callback
+   * @param {Timezone} component     Timezone object
+   */
+  ontimezone = /* c8 ignore next */ function(component) {};
+
+  /**
+   * Fired when a top level component (VEVENT) is found.
+   *
+   * @callback
+   * @param {Event} component    Top level component
+   */
+  onevent = /* c8 ignore next */ function(component) {};
+
+  /**
+   * Process a string or parse ical object.  This function itself will return
+   * nothing but will start the parsing process.
+   *
+   * Events must be registered prior to calling this method.
+   *
+   * @param {Component|String|Object} ical      The component to process,
+   *        either in its final form, as a jCal Object, or string representation
+   */
+  process(ical) {
+    //TODO: this is sync now in the future we will have a incremental parser.
+    if (typeof(ical) === 'string') {
+      ical = parse(ical);
+    }
+
+    if (!(ical instanceof Component)) {
+      ical = new Component(ical);
+    }
+
+    let components = ical.getAllSubcomponents();
+    let i = 0;
+    let len = components.length;
+    let component;
+
+    for (; i < len; i++) {
+      component = components[i];
+
+      switch (component.name) {
+        case 'vtimezone':
+          if (this.parseTimezone) {
+            let tzid = component.getFirstPropertyValue('tzid');
+            if (tzid) {
+              this.ontimezone(new Timezone({
+                tzid: tzid,
+                component: component
+              }));
+            }
+          }
+          break;
+        case 'vevent':
+          if (this.parseEvent) {
+            this.onevent(new Event(component));
+          }
+          break;
+        default:
+          continue;
+      }
+    }
+
+    //XXX: ideally we should do a "nextTick" here
+    //     so in all cases this is actually async.
+    this.oncomplete();
+  }
+}
+
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch */
+
+/**
+ * The main ICAL module. Provides access to everything else.
+ *
+ * @alias ICAL
+ * @namespace ICAL
+ * @property {ICAL.design} design
+ * @property {ICAL.helpers} helpers
+ */
+var ICALmodule = {
+  /**
+   * The number of characters before iCalendar line folding should occur
+   * @type {Number}
+   * @default 75
+   */
+  foldLength: 75,
+
+  debug: false,
+
+  /**
+   * The character(s) to be used for a newline. The default value is provided by
+   * rfc5545.
+   * @type {String}
+   * @default "\r\n"
+   */
+  newLineChar: '\r\n',
+
+  Binary,
+  Component,
+  ComponentParser,
+  Duration,
+  Event,
+  Period,
+  Property,
+  Recur,
+  RecurExpansion,
+  RecurIterator,
+  Time,
+  Timezone,
+  TimezoneService,
+  UtcOffset,
+  VCardTime,
+
+  parse,
+  stringify,
+
+  design: design$1,
+  helpers
+};
+
+return ICALmodule;
+
+})();
diff --git a/plugins/ics-viewer/index.php b/plugins/ics-viewer/index.php
new file mode 100644
index 000000000..4100593b2
--- /dev/null
+++ b/plugins/ics-viewer/index.php
@@ -0,0 +1,22 @@
+<?php
+
+class ICSViewerPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'ICS Viewer',
+		AUTHOR = 'PhieF',
+		VERSION = '1.1',
+		RELEASE  = '2026-10-22',
+		CATEGORY = 'Messages',
+		DESCRIPTION = 'Display ICS attachment using ical lib, or JSON-LD details, based on viewICS',
+		REQUIRED = '2.34.0';
+
+	public function Init() : void
+	{
+//		$this->UseLangs(true);
+		$this->addJs('message.js');
+		$this->addJs('windowsZones.js');
+		// Load https://github.com/kewisch/ical.js/releases
+		$this->addJs('ical.js');
+	}
+}
diff --git a/plugins/ics-viewer/message.js b/plugins/ics-viewer/message.js
new file mode 100644
index 000000000..b0adc469d
--- /dev/null
+++ b/plugins/ics-viewer/message.js
@@ -0,0 +1,143 @@
+(rl => {
+	const templateId = 'MailMessageView';
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				view = e.detail,
+				attachmentsPlace = template.content.querySelector('.attachmentsPlace'),
+				dateRegEx = /(TZID=(?<tz>[^:]+):)?(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/,
+				parseDate = str => {
+					let parts = dateRegEx.exec(str)?.groups,
+						options = {dateStyle: 'long', timeStyle: 'short'},
+						date = (parts ? new Date(
+							parseInt(parts.year, 10),
+							parseInt(parts.month, 10) - 1,
+							parseInt(parts.day, 10),
+							parseInt(parts.hour, 10),
+							parseInt(parts.minute, 10),
+							parseInt(parts.second, 10)
+						) : new Date(str));
+					parts?.tz && (options.timeZone = windowsVTIMEZONEs[parts.tz] || parts.tz);
+					try {
+						return date.format(options);
+					} catch (e) {
+						console.error(e);
+						if (options.timeZone) {
+							options.timeZone = undefined;
+							return date.format(options);
+						}
+					}
+				};
+
+			attachmentsPlace.after(Element.fromHTML(`
+			<details data-bind="if: ICSViewer, visible: ICSViewer">
+				<summary data-icon="📅" data-bind="text: ICSViewer().SUMMARY"></summary>
+				<table><tbody style="white-space:pre">
+					<tr data-bind="visible: ICSViewer().ORGANIZER_TXT"><td>Organizer: </td><td><a data-bind="text: ICSViewer().ORGANIZER_TXT, attr: { href: ICSViewer().ORGANIZER_MAIL }"></a></td></tr>
+					<tr><td>Start: </td><td data-bind="text: ICSViewer().DTSTART"></td></tr>
+					<tr><td>End: </td><td data-bind="text: ICSViewer().DTEND"></td></tr>
+					<tr data-bind="visible: ICSViewer().LOCATION"><td>Location: </td><td data-bind="text: ICSViewer().LOCATION"></td></tr>
+<!--				<tr><td>Transparency</td><td data-bind="text: ICSViewer().TRANSP"></td></tr>-->
+					<tr><td>Attendees: </td><td data-bind="foreach: ICSViewer().ATTENDEE"><span data-bind="text: $data.replace(/;/g,';\\n')"></span> </td>
+
+				</tbody></table>
+			</details>`));
+
+			view.ICSViewer = ko.observable(null);
+
+			view.saveICS = () => {
+				let VEVENT = view.VEVENT();
+				if (VEVENT) {
+					if (rl.nextcloud && VEVENT.rawText) {
+						rl.nextcloud.selectCalendar()
+							.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
+					} else {
+						// TODO
+					}
+				}
+			}
+
+			/**
+			 * TODO
+			 */
+			view.message.subscribe(msg => {
+				view.ICSViewer(null);
+				if (msg) {
+					// JSON-LD after parsing HTML
+					// See http://schema.org/
+					msg.linkedData.subscribe(data => {
+						if (!view.ICSViewer()) {
+							data.forEach(item => {
+								if (item["ical:summary"]) {
+									let VEVENT = {
+										SUMMARY: item["ical:summary"],
+										DTSTART: parseDate(item["ical:dtstart"]),
+//										DTEND: parseDate(item["ical:dtend"]),
+//										TRANSP: item["ical:transp"],
+//										LOCATION: item["ical:location"],
+										ATTENDEE: []
+									}
+									view.ICSViewer(VEVENT);
+									return;
+								}
+							});
+						}
+					});
+					// ICS attachment.
+					// attachments is a ko.observableArray, so it must be
+					// unwrapped before array methods are used on it.
+					// A scheduling mail does not always carry a text/calendar
+					// attachment either: the part is often inline inside
+					// multipart/alternative and repeated as application/ics.
+					let ics = (msg.attachments() || []).find(attachment =>
+						'text/calendar' == attachment.mimeType
+						|| 'application/ics' == attachment.mimeType
+						|| 'text/x-vcalendar' == attachment.mimeType
+						|| /\.ics$/i.test(attachment.fileName || ''));
+					if (ics && ics.download) {
+
+						// fetch it and parse the VEVENT
+						rl.fetch(ics.linkDownload())
+						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+						.then(text => {
+							let jcalData = ICAL.parse(text)
+							var comp = new ICAL.Component(jcalData);
+							var vevent = comp.getFirstSubcomponent("vevent");
+							var event = new ICAL.Event(vevent);
+							let VEVENT = {};
+							if (event.organizer && event.organizer.startsWith("mailto:")) {
+								VEVENT.ORGANIZER_TXT = event.organizer.substr(7)
+								VEVENT.ORGANIZER_MAIL = event.organizer
+							} else
+								VEVENT.ORGANIZER_TXT = event.organizer
+							VEVENT.SUMMARY = event.summary;
+							VEVENT.DTSTART = parseDate(vevent.getFirstPropertyValue("dtstart"));
+							VEVENT.DTEND = parseDate(vevent.getFirstPropertyValue("dtend"));
+							VEVENT.LOCATION = event.location;
+							VEVENT.ATTENDEE = []
+							for (let attendee of event.attendees) {
+								VEVENT.ATTENDEE.push(attendee.getFirstParameter("cn"));
+							}
+
+							if (VEVENT) {
+								VEVENT.rawText = text;
+								VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
+								VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
+								VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
+								console.dir({
+									isCancelled: VEVENT.isCancelled(),
+									shouldReply: VEVENT.shouldReply()
+								});
+								view.ICSViewer(VEVENT);
+							}
+						});
+					}
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/ics-viewer/style.css b/plugins/ics-viewer/style.css
new file mode 100644
index 000000000..b3a4e5c8c
--- /dev/null
+++ b/plugins/ics-viewer/style.css
@@ -0,0 +1,44 @@
+
+/**
+ * .SML-@type where @type is the value of the JSON-LD "@type":
+ * See http://schema.org/
+ */
+
+.SML-FlightReservation {
+}
+
+	.SML-Airline {
+	}
+
+	.SML-Airport {
+	}
+
+	.SML-Flight {
+	}
+
+.SML-FoodEstablishmentReservation {
+}
+
+	.SML-FoodEstablishment {
+	}
+
+.SML-ParcelDelivery {
+}
+
+	.SML-Order {
+	}
+
+	.SML-Organization {
+	}
+
+	.SML-Product {
+	}
+
+	.SML-PostalAddress {
+	}
+
+.SML-Person {
+}
+
+.SML-PromotionCard {
+}
diff --git a/plugins/ics-viewer/windowsZones.js b/plugins/ics-viewer/windowsZones.js
new file mode 100644
index 000000000..1c2c915c3
--- /dev/null
+++ b/plugins/ics-viewer/windowsZones.js
@@ -0,0 +1,738 @@
+// Windows timezones (Subset from https://github.com/unicode-cldr/cldr-core/blob/master/supplemental/windowsZones.json)
+const windowsVTIMEZONEs = {
+	"_unicodeVersion": "13.0.0",
+	"_cldrVersion": "37",
+	// Windows : [IANA...]
+	"Afghanistan Standard Time": [
+		"Asia/Kabul"
+	],
+	"Alaskan Standard Time": [
+		"America/Anchorage"/*,
+		"America/Juneau",
+		"America/Metlakatla",
+		"America/Nome",
+		"America/Sitka",
+		"America/Yakutat"*/
+	],
+	"Aleutian Standard Time": [
+		"America/Adak"
+	],
+	"Altai Standard Time": [
+		"Asia/Barnaul"
+	],
+	"Arab Standard Time": [
+		"Asia/Aden"/*,
+		"Asia/Bahrain",
+		"Asia/Kuwait",
+		"Asia/Qatar",
+		"Asia/Riyadh"
+	*/],
+	"Arabian Standard Time": [
+		"Asia/Dubai"/*,
+		"Asia/Muscat",
+		"Etc/GMT-4"
+	*/],
+	"Arabic Standard Time": [
+		"Asia/Baghdad"
+	],
+	"Argentina Standard Time": [
+		"America/Argentina/La_Rioja"/*,
+		"America/Argentina/Rio_Gallegos",
+		"America/Argentina/Salta",
+		"America/Argentina/San_Juan",
+		"America/Argentina/San_Luis",
+		"America/Argentina/Tucuman",
+		"America/Argentina/Ushuaia",
+		"America/Buenos_Aires",
+		"America/Catamarca",
+		"America/Cordoba",
+		"America/Jujuy",
+		"America/Mendoza"
+	*/],
+	"Astrakhan Standard Time": [
+		"Europe/Astrakhan"/*,
+		"Europe/Ulyanovsk"
+	*/],
+	"Atlantic Standard Time": [
+		"America/Glace_Bay"/*,
+		"America/Goose_Bay",
+		"America/Halifax",
+		"America/Moncton",
+		"America/Thule",
+		"Atlantic/Bermuda"
+	*/],
+	"AUS Central Standard Time": [
+		"Australia/Darwin"
+	],
+	"Aus Central W. Standard Time": [
+		"Australia/Eucla"
+	],
+	"AUS Eastern Standard Time": [
+		"Australia/Melbourne"/*,
+		"Australia/Sydney"
+	*/],
+	"Azerbaijan Standard Time": [
+		"Asia/Baku"
+	],
+	"Azores Standard Time": [
+		"America/Scoresbysund"/*,
+		"Atlantic/Azores"
+	*/],
+	"Bahia Standard Time": [
+		"America/Bahia"
+	],
+	"Bangladesh Standard Time": [
+		"Asia/Dhaka"/*,
+		"Asia/Thimphu"
+	*/],
+	"Belarus Standard Time": [
+		"Europe/Minsk"
+	],
+	"Bougainville Standard Time": [
+		"Pacific/Bougainville"
+	],
+	"Canada Central Standard Time": [
+		"America/Regina"/*,
+		"America/Swift_Current"
+	*/],
+	"Cape Verde Standard Time": [
+		"Atlantic/Cape_Verde"/*,
+		"Etc/GMT+1"
+	*/],
+	"Caucasus Standard Time": [
+		"Asia/Yerevan"
+	],
+	"Cen. Australia Standard Time": [
+		"Australia/Adelaide"/*,
+		"Australia/Broken_Hill"
+	*/],
+	"Central America Standard Time": [
+		"America/Belize"/*,
+		"America/Costa_Rica",
+		"America/El_Salvador",
+		"America/Guatemala",
+		"America/Managua",
+		"America/Tegucigalpa",
+		"Pacific/Galapagos",
+		"Etc/GMT+6"
+	*/],
+	"Central Asia Standard Time": [
+		"Asia/Almaty"/*,
+		"Asia/Bishkek",
+		"Asia/Qostanay",
+		"Asia/Urumqi",
+		"Indian/Chagos",
+		"Antarctica/Vostok",
+		"Etc/GMT-6"
+	*/],
+	"Central Brazilian Standard Time": [
+		"America/Campo_Grande"/*,
+		"America/Cuiaba"
+	*/],
+	"Central Europe Standard Time": [
+		"Europe/Belgrade"/*,
+		"Europe/Bratislava",
+		"Europe/Budapest",
+		"Europe/Ljubljana",
+		"Europe/Podgorica",
+		"Europe/Prague",
+		"Europe/Tirane"
+	*/],
+	"Central European Standard Time": [
+		"Europe/Sarajevo"/*,
+		"Europe/Skopje",
+		"Europe/Warsaw",
+		"Europe/Zagreb"
+	*/],
+	"Central Pacific Standard Time": [
+		"Pacific/Efate"/*,
+		"Pacific/Guadalcanal",
+		"Pacific/Noumea",
+		"Pacific/Ponape Pacific/Kosrae",
+		"Antarctica/Macquarie",
+		"Etc/GMT-11"
+	*/],
+	"Central Standard Time": [
+		"America/Chicago"/*,
+		"America/Indiana/Knox",
+		"America/Indiana/Tell_City",
+		"America/Matamoros",
+		"America/Menominee",
+		"America/North_Dakota/Beulah",
+		"America/North_Dakota/Center",
+		"America/North_Dakota/New_Salem",
+		"America/Rainy_River",
+		"America/Rankin_Inlet",
+		"America/Resolute",
+		"America/Winnipeg",
+		"CST6CDT"
+	*/],
+	"Central Standard Time (Mexico)": [
+		"America/Bahia_Banderas"/*,
+		"America/Merida",
+		"America/Mexico_City",
+		"America/Monterrey"
+	*/],
+	"Chatham Islands Standard Time": [
+		"Pacific/Chatham"
+	],
+	"China Standard Time": [
+		"Asia/Hong_Kong"/*,
+		"Asia/Macau",
+		"Asia/Shanghai"
+	*/],
+	"Cuba Standard Time": [
+		"America/Havana"
+	],
+	"Dateline Standard Time": [
+		"Etc/GMT+12"
+	],
+	"E. Africa Standard Time": [
+		"Africa/Addis_Ababa"/*,
+		"Africa/Asmera",
+		"Africa/Dar_es_Salaam",
+		"Africa/Djibouti",
+		"Africa/Juba",
+		"Africa/Kampala",
+		"Africa/Mogadishu",
+		"Africa/Nairobi",
+		"Indian/Antananarivo",
+		"Indian/Comoro",
+		"Indian/Mayotte",
+		"Antarctica/Syowa",
+		"Etc/GMT-3"
+	*/],
+	"E. Australia Standard Time": [
+		"Australia/Brisbane"/*,
+		"Australia/Lindeman"
+	*/],
+	"E. Europe Standard Time": [
+		"Europe/Chisinau"
+	],
+	"E. South America Standard Time": [
+		"America/Sao_Paulo"
+	],
+	"Easter Island Standard Time": [
+		"Pacific/Easter"
+	],
+	"Eastern Standard Time": [
+		"America/Detroit"/*,
+		"America/Indiana/Petersburg",
+		"America/Indiana/Vincennes",
+		"America/Indiana/Winamac",
+		"America/Iqaluit",
+		"America/Kentucky/Monticello",
+		"America/Louisville",
+		"America/Montreal",
+		"America/Nassau",
+		"America/New_York",
+		"America/Nipigon",
+		"America/Pangnirtung",
+		"America/Thunder_Bay",
+		"America/Toronto",
+		"EST5EDT"
+	*/],
+	"Eastern Standard Time (Mexico)": [
+		"America/Cancun"
+	],
+	"Egypt Standard Time": [
+		"Africa/Cairo"
+	],
+	"Ekaterinburg Standard Time": [
+		"Asia/Yekaterinburg"
+	],
+	"Fiji Standard Time": [
+		"Pacific/Fiji"
+	],
+	"FLE Standard Time": [
+		"Europe/Helsinki"/*,
+		"Europe/Kiev",
+		"Europe/Mariehamn",
+		"Europe/Riga",
+		"Europe/Sofia",
+		"Europe/Tallinn",
+		"Europe/Uzhgorod",
+		"Europe/Vilnius",
+		"Europe/Zaporozhye"
+	*/],
+	"Georgian Standard Time": [
+		"Asia/Tbilisi"
+	],
+	"GMT Standard Time": [
+		"Atlantic/Canary"/*,
+		"Atlantic/Faeroe",
+		"Atlantic/Madeira",
+		"Europe/Dublin",
+		"Europe/Guernsey",
+		"Europe/Isle_of_Man",
+		"Europe/Jersey",
+		"Europe/Lisbon",
+		"Europe/London"
+	*/],
+	"Greenland Standard Time": [
+		"America/Godthab"
+	],
+	"Greenwich Standard Time": [
+		"Africa/Abidjan"/*,
+		"Africa/Accra",
+		"Africa/Bamako",
+		"Africa/Banjul",
+		"Africa/Bissau",
+		"Africa/Conakry",
+		"Africa/Dakar",
+		"Africa/Freetown",
+		"Africa/Lome",
+		"Africa/Monrovia",
+		"Africa/Nouakchott",
+		"Africa/Ouagadougou",
+		"Atlantic/Reykjavik",
+		"Atlantic/St_Helena"
+	*/],
+	"GTB Standard Time": [
+		"Asia/Nicosia"/*,
+		"Asia/Famagusta",
+		"Europe/Athens",
+		"Europe/Bucharest"
+	*/],
+	"Haiti Standard Time": [
+		"America/Port-au-Prince"
+	],
+	"Hawaiian Standard Time": [
+		"Pacific/Honolulu"/*,
+		"Pacific/Johnston",
+		"Pacific/Rarotonga",
+		"Pacific/Tahiti",
+		"Etc/GMT+10"
+	*/],
+	"India Standard Time": [
+		"Asia/Calcutta"
+	],
+	"Iran Standard Time": [
+		"Asia/Tehran"
+	],
+	"Israel Standard Time": [
+		"Asia/Jerusalem"
+	],
+	"Jordan Standard Time": [
+		"Asia/Amman"
+	],
+	"Kaliningrad Standard Time": [
+		"Europe/Kaliningrad"
+	],
+	"Korea Standard Time": [
+		"Asia/Seoul"
+	],
+	"Libya Standard Time": [
+		"Africa/Tripoli"
+	],
+	"Line Islands Standard Time": [
+		"Pacific/Kiritimati"/*,
+		"Etc/GMT-14"
+	*/],
+	"Lord Howe Standard Time": [
+		"Australia/Lord_Howe"
+	],
+	"Magadan Standard Time": [
+		"Asia/Magadan"
+	],
+	"Magallanes Standard Time": [
+		"America/Punta_Arenas"
+	],
+	"Marquesas Standard Time": [
+		"Pacific/Marquesas"
+	],
+	"Mauritius Standard Time": [
+		"Indian/Mauritius"/*,
+		"Indian/Mahe",
+		"Indian/Reunion"
+	*/],
+	"Middle East Standard Time": [
+		"Asia/Beirut"
+	],
+	"Montevideo Standard Time": [
+		"America/Montevideo"
+	],
+	"Morocco Standard Time": [
+		"Africa/Casablanca"/*,
+		"Africa/El_Aaiun"
+	*/],
+	"Mountain Standard Time": [
+		"America/Boise"/*,
+		"America/Cambridge_Bay",
+		"America/Denver",
+		"America/Edmonton",
+		"America/Inuvik",
+		"America/Ojinaga",
+		"America/Yellowknife",
+		"MST7MDT"
+	*/],
+	"Mountain Standard Time (Mexico)": [
+		"America/Chihuahua"/*,
+		"America/Mazatlan"
+	*/],
+	"Myanmar Standard Time": [
+		"Asia/Rangoon"/*,
+		"Indian/Cocos"
+	*/],
+	"N. Central Asia Standard Time": [
+		"Asia/Novosibirsk"
+	],
+	"Namibia Standard Time": [
+		"Africa/Windhoek"
+	],
+	"Nepal Standard Time": [
+		"Asia/Katmandu"
+	],
+	"New Zealand Standard Time": [
+		"Pacific/Auckland"/*,
+		"Antarctica/McMurdo"
+	*/],
+	"Newfoundland Standard Time": [
+		"America/St_Johns"
+	],
+	"Norfolk Standard Time": [
+		"Pacific/Norfolk"
+	],
+	"North Asia East Standard Time": [
+		"Asia/Irkutsk"
+	],
+	"North Asia Standard Time": [
+		"Asia/Krasnoyarsk"/*,
+		"Asia/Novokuznetsk"
+	*/],
+	"North Korea Standard Time": [
+		"Asia/Pyongyang"
+	],
+	"Omsk Standard Time": [
+		"Asia/Omsk"
+	],
+	"Pacific SA Standard Time": [
+		"America/Santiago"
+	],
+	"Pacific Standard Time": [
+		"America/Los_Angeles"/*,
+		"America/Dawson",
+		"America/Vancouver",
+		"America/Whitehorse",
+		"PST8PDT"
+	*/],
+	"Pacific Standard Time (Mexico)": [
+		"America/Tijuana"/*,
+		"America/Santa_Isabel"
+	*/],
+	"Pakistan Standard Time": [
+		"Asia/Karachi"
+	],
+	"Paraguay Standard Time": [
+		"America/Asuncion"
+	],
+	"Qyzylorda Standard Time": [
+		"Asia/Qyzylorda"
+	],
+	"Romance Standard Time": [
+		"Europe/Paris"/*,
+		"Europe/Brussels",
+		"Europe/Copenhagen",
+		"Europe/Madrid",
+		"Africa/Ceuta"
+	*/],
+	"Russia Time Zone 3": [
+		"Europe/Samara"
+	],
+	"Russia Time Zone 10": [
+		"Asia/Srednekolymsk"
+	],
+	"Russia Time Zone 11": [
+		"Asia/Kamchatka"/*,
+		"Asia/Anadyr"
+	*/],
+	"Russian Standard Time": [
+		"Europe/Moscow"/*,
+		"Europe/Kirov",
+		"Europe/Simferopol"
+	*/],
+	"SA Eastern Standard Time": [
+		"America/Belem"/*,
+		"America/Cayenne",
+		"America/Fortaleza",
+		"America/Maceio",
+		"America/Paramaribo",
+		"America/Recife",
+		"America/Santarem",
+		"Atlantic/Stanley",
+		"Antarctica/Palmer",
+		"Antarctica/Rothera",
+		"Etc/GMT+3"
+	*/],
+	"SA Pacific Standard Time": [
+		"America/Bogota"/*,
+		"America/Cayman",
+		"America/Coral_Harbour",
+		"America/Eirunepe",
+		"America/Guayaquil",
+		"America/Jamaica",
+		"America/Lima",
+		"America/Panama",
+		"America/Rio_Branco",
+		"Etc/GMT+5"
+	*/],
+	"SA Western Standard Time": [
+		"America/Anguilla"/*,
+		"America/Antigua",
+		"America/Aruba",
+		"America/Barbados",
+		"America/Blanc-Sablon",
+		"America/Boa_Vista",
+		"America/Curacao",
+		"America/Dominica",
+		"America/Grenada",
+		"America/Guadeloupe",
+		"America/Guyana",
+		"America/Kralendijk",
+		"America/La_Paz",
+		"America/Lower_Princes",
+		"America/Manaus",
+		"America/Marigot",
+		"America/Martinique",
+		"America/Montserrat",
+		"America/Port_of_Spain",
+		"America/Porto_Velho",
+		"America/Puerto_Rico",
+		"America/Santo_Domingo",
+		"America/St_Barthelemy",
+		"America/St_Kitts",
+		"America/St_Lucia",
+		"America/St_Thomas",
+		"America/St_Vincent",
+		"America/Tortola",
+		"Etc/GMT+4"
+	*/],
+	"Saint Pierre Standard Time": [
+		"America/Miquelon"
+	],
+	"Sakhalin Standard Time": [
+		"Asia/Sakhalin"
+	],
+	"Samoa Standard Time": [
+		"Pacific/Apia"
+	],
+	"Sao Tome Standard Time": [
+		"Africa/Sao_Tome"
+	],
+	"Saratov Standard Time": [
+		"Europe/Saratov"
+	],
+	"SE Asia Standard Time": [
+		"Asia/Bangkok"/*,
+		"Asia/Jakarta",
+		"Asia/Phnom_Penh",
+		"Asia/Pontianak",
+		"Asia/Saigon",
+		"Asia/Vientiane",
+		"Indian/Christmas",
+		"Antarctica/Davis",
+		"Etc/GMT-7"
+	*/],
+	"Singapore Standard Time": [
+		"Asia/Singapore"/*,
+		"Asia/Brunei",
+		"Asia/Kuala_Lumpur",
+		"Asia/Kuching",
+		"Asia/Makassar",
+		"Asia/Manila",
+		"Antarctica/Casey",
+		"Etc/GMT-8"
+	*/],
+	"South Africa Standard Time": [
+		"Africa/Johannesburg"/*,
+		"Africa/Blantyre",
+		"Africa/Bujumbura",
+		"Africa/Gaborone",
+		"Africa/Harare",
+		"Africa/Kigali",
+		"Africa/Lubumbashi",
+		"Africa/Lusaka",
+		"Africa/Maputo",
+		"Africa/Maseru",
+		"Africa/Mbabane",
+		"Etc/GMT-2"
+	*/],
+	"Sri Lanka Standard Time": [
+		"Asia/Colombo"
+	],
+	"Sudan Standard Time": [
+		"Africa/Khartoum"
+	],
+	"Syria Standard Time": [
+		"Asia/Damascus"
+	],
+	"Taipei Standard Time": [
+		"Asia/Taipei"
+	],
+	"Tasmania Standard Time": [
+		"Australia/Currie"/*,
+		"Australia/Hobart"
+	*/],
+	"Tocantins Standard Time": [
+		"America/Araguaina"
+	],
+	"Tokyo Standard Time": [
+		"Asia/Tokyo"/*,
+		"Asia/Dili",
+		"Asia/Jayapura",
+		"Pacific/Palau",
+		"Etc/GMT-9"
+	*/],
+	"Tomsk Standard Time": [
+		"Asia/Tomsk"
+	],
+	"Tonga Standard Time": [
+		"Pacific/Tongatapu"
+	],
+	"Transbaikal Standard Time": [
+		"Asia/Chita"
+	],
+	"Turkey Standard Time": [
+		"Europe/Istanbul"
+	],
+	"Turks And Caicos Standard Time": [
+		"America/Grand_Turk"
+	],
+	"Ulaanbaatar Standard Time": [
+		"Asia/Ulaanbaatar"/*,
+		"Asia/Choibalsan"
+	*/],
+	"US Eastern Standard Time": [
+		"America/Indianapolis"/*,
+		"America/Indiana/Marengo",
+		"America/Indiana/Vevay"
+	*/],
+	"US Mountain Standard Time": [
+		"America/Phoenix"/*,
+		"America/Creston",
+		"America/Dawson_Creek",
+		"America/Fort_Nelson",
+		"America/Hermosillo",
+		"Etc/GMT+7"
+	*/],
+	"UTC": [
+		"Etc/GMT"/*,
+		"America/Danmarkshavn",
+		"Etc/UTC"
+	*/],
+	"UTC-02": [
+		"Etc/GMT+2"/*,
+		"America/Noronha",
+		"Atlantic/South_Georgia"
+	*/],
+	"UTC-08": [
+		"Etc/GMT+8"/*,
+		"Pacific/Pitcairn"
+	*/],
+	"UTC-09": [
+		"Etc/GMT+9"/*,
+		"Pacific/Gambier"
+	*/],
+	"UTC-11": [
+		"Etc/GMT+11"/*,
+		"Pacific/Midway",
+		"Pacific/Niue",
+		"Pacific/Pago_Pago"
+	*/],
+	"UTC+12": [
+		"Etc/GMT-12"/*,
+		"Pacific/Funafuti",
+		"Pacific/Kwajalein",
+		"Pacific/Majuro",
+		"Pacific/Nauru",
+		"Pacific/Tarawa",
+		"Pacific/Wake",
+		"Pacific/Wallis"
+	*/],
+	"UTC+13": [
+		"Etc/GMT-13"/*,
+		"Pacific/Enderbury",
+		"Pacific/Fakaofo"
+	*/],
+	"Venezuela Standard Time": [
+		"America/Caracas"
+	],
+	"Vladivostok Standard Time": [
+		"Asia/Vladivostok"/*,
+		"Asia/Ust-Nera"
+	*/],
+	"Volgograd Standard Time": [
+		"Europe/Volgograd"
+	],
+	"W. Australia Standard Time": [
+		"Australia/Perth"
+	],
+	"W. Central Africa Standard Time": [
+		"Africa/Algiers"/*,
+		"Africa/Bangui",
+		"Africa/Brazzaville",
+		"Africa/Douala",
+		"Africa/Kinshasa",
+		"Africa/Lagos",
+		"Africa/Libreville",
+		"Africa/Luanda",
+		"Africa/Malabo",
+		"Africa/Ndjamena",
+		"Africa/Niamey",
+		"Africa/Porto-Novo",
+		"Africa/Tunis",
+		"Etc/GMT-1"
+	*/],
+	"W. Europe Standard Time": [
+		"Europe/Amsterdam"/*,
+		"Europe/Andorra",
+		"Europe/Berlin",
+		"Europe/Busingen",
+		"Europe/Gibraltar",
+		"Europe/Luxembourg",
+		"Europe/Malta",
+		"Europe/Monaco",
+		"Europe/Oslo",
+		"Europe/Rome",
+		"Europe/San_Marino",
+		"Europe/Stockholm",
+		"Europe/Vaduz",
+		"Europe/Vatican",
+		"Europe/Vienna",
+		"Europe/Zurich",
+		"Arctic/Longyearbyen"
+	*/],
+	"W. Mongolia Standard Time": [
+		"Asia/Hovd"
+	],
+	"West Asia Standard Time": [
+		"Asia/Aqtau"/*,
+		"Asia/Aqtobe",
+		"Asia/Ashgabat",
+		"Asia/Atyrau",
+		"Asia/Dushanbe",
+		"Asia/Oral",
+		"Asia/Samarkand",
+		"Asia/Tashkent",
+		"Indian/Kerguelen",
+		"Indian/Maldives",
+		"Antarctica/Mawson",
+		"Etc/GMT-5"
+	*/],
+	"West Bank Standard Time": [
+		"Asia/Gaza"/*,
+		"Asia/Hebron"
+	*/],
+	"West Pacific Standard Time": [
+		"Pacific/Guam"/*,
+		"Pacific/Port_Moresby",
+		"Pacific/Saipan",
+		"Pacific/Truk",
+		"Antarctica/DumontDUrville",
+		"Etc/GMT-10"
+	*/],
+	"Yakutsk Standard Time": [
+		"Asia/Khandyga"/*,
+		"Asia/Yakutsk"
+	*/],
+};
diff --git a/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php b/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php
new file mode 100644
index 000000000..9a379ff26
--- /dev/null
+++ b/plugins/imap-contacts-suggestions/ImapContactsSuggestions.php
@@ -0,0 +1,44 @@
+<?php
+
+class ImapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
+{
+	// TODO: make setting
+	public $sFolderName = 'INBOX';
+
+	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
+	{
+		$sQuery = \trim($sQuery);
+		if (2 > \strlen($sQuery)) {
+			return [];
+		}
+
+		$oActions = \RainLoop\Api::Actions();
+		$oMailClient = $oActions->MailClient();
+		if (!$oMailClient->IsLoggined()) {
+			$oAccount = $oActions->getAccountFromToken();
+			$oAccount->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oActions->Config());
+		}
+		$oImapClient = $oMailClient->ImapClient();
+
+		$oImapClient->FolderSelect($this->sFolderName);
+
+		$sQuery = \MailSo\Imap\SearchCriterias::escapeSearchString($oImapClient, $sQuery);
+		$aUids = \array_slice(
+			$oImapClient->MessageSearch("FROM {$sQuery}"),
+			0, $iLimit
+		);
+
+		$aResult = [];
+		if ($aUids) {
+			foreach ($oImapClient->Fetch(['BODY.PEEK[HEADER.FIELDS (FROM)]'], \implode(',', $aUids), true) as $oFetchResponse) {
+				$oHeaders = new \MailSo\Mime\HeaderCollection($oFetchResponse->GetHeaderFieldsValue());
+				$oFrom = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::FROM_, true);
+				foreach ($oFrom as $oMail) {
+					$aResult[] = [$oMail->GetEmail(), $oMail->GetDisplayName()];
+				}
+			}
+		}
+
+		return $aResult;
+	}
+}
diff --git a/plugins/imap-contacts-suggestions/LICENSE b/plugins/imap-contacts-suggestions/LICENSE
new file mode 100644
index 000000000..4aed64b3a
--- /dev/null
+++ b/plugins/imap-contacts-suggestions/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/imap-contacts-suggestions/index.php b/plugins/imap-contacts-suggestions/index.php
new file mode 100644
index 000000000..559e77770
--- /dev/null
+++ b/plugins/imap-contacts-suggestions/index.php
@@ -0,0 +1,39 @@
+<?php
+
+class ImapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Contacts suggestions (IMAP folder)',
+		VERSION = '2.36',
+		RELEASE  = '2024-03-19',
+		CATEGORY = 'Contacts',
+		DESCRIPTION = 'Get contacts suggestions from IMAP INBOX folder.',
+		REQUIRED = '2.36.0';
+
+	public function Init() : void
+	{
+		$this->addHook('main.fabrica', 'MainFabrica');
+	}
+
+	public function Supported() : string
+	{
+		return '';
+	}
+
+	/**
+	 * @param mixed $mResult
+	 */
+	public function MainFabrica(string $sName, &$mResult)
+	{
+		if ('suggestions' === $sName) {
+			if (!\is_array($mResult)) {
+				$mResult = array();
+			}
+//			$sFolder = \trim($this->Config()->Get('plugin', 'mailbox', 'INBOX'));
+//			if ($sFolder) {
+				include_once __DIR__ . '/ImapContactsSuggestions.php';
+				$mResult[] = new ImapContactsSuggestions();
+//			}
+		}
+	}
+}
diff --git a/plugins/kolab/KolabAddressBook.php b/plugins/kolab/KolabAddressBook.php
new file mode 100644
index 000000000..c934af1d7
--- /dev/null
+++ b/plugins/kolab/KolabAddressBook.php
@@ -0,0 +1,396 @@
+<?php
+
+use RainLoop\Providers\AddressBook\Classes\Contact;
+use Sabre\VObject\Component\VCard;
+
+class KolabAddressBook implements \RainLoop\Providers\AddressBook\AddressBookInterface
+{
+	use \RainLoop\Providers\AddressBook\CardDAV;
+
+	protected
+		$oImapClient,
+		$sFolderName;
+
+	function __construct(string $sFolderName)
+	{
+		$metadata = $this->ImapClient()->FolderGetMetadata($sFolderName, [\MailSo\Imap\Enumerations\MetadataKeys::KOLAB_CTYPE]);
+		if (!$metadata || 'contact' !== \array_shift($metadata)) {
+			$sFolderName = '';
+//			throw new \Exception("Invalid kolab contact folder: {$sFolderName}");
+		}
+
+		$this->sFolderName = $sFolderName;
+	}
+
+	protected function MailClient() : \MailSo\Mail\MailClient
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oMailClient = $oActions->MailClient();
+		if (!$oMailClient->IsLoggined()) {
+			$oActions->getAccountFromToken()->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oActions->Config());
+		}
+		return $oMailClient;
+	}
+
+	protected function ImapClient() : \MailSo\Imap\ImapClient
+	{
+		if (!$this->oImapClient) {
+			$this->oImapClient = $this->MailClient()->ImapClient();
+		}
+		return $this->oImapClient;
+	}
+
+	protected function SelectFolder() : bool
+	{
+		$sFolderName = $this->sFolderName;
+		if ($sFolderName) {
+			try {
+				$this->ImapClient()->FolderSelect($sFolderName);
+				return true;
+			} catch (\Throwable $e) {
+				\trigger_error("KolabAddressBook {$sFolderName} error: {$e->getMessage()}");
+			}
+		}
+		return false;
+	}
+
+	protected function fetchXCardFromMessage(\MailSo\Mail\Message $oMessage) : ?VCard
+	{
+		$xCard = null;
+		try {
+			foreach ($oMessage->Attachments() ?: [] as $oAttachment)  {
+				if ('application/vcard+xml' === $oAttachment->ContentType()) {
+					$result = $this->MailClient()->MessageMimeStream(function ($rResource) use (&$xCard) {
+						if (\is_resource($rResource)) {
+							$xCard = \Sabre\VObject\Reader::readXML($rResource);
+						}
+					}, $this->sFolderName, $oMessage->Uid(), $oAttachment->PartID());
+					break;
+				}
+			}
+		} catch (\Throwable $e) {
+			\error_log("KolabAddressBook message {$oMessage->Uid()} error: {$e->getMessage()}");
+		}
+		return $xCard;
+	}
+
+	protected function MessageAsContact(\MailSo\Mail\Message $oMessage) : Contact
+	{
+		$oContact = new Contact;
+		$oContact->id = $oMessage->Uid();
+		$oContact->Changed = $oMessage->HeaderTimeStampInUTC();
+
+		// Fetch xCard attachment and populate $oContact with it
+		$xCard = $this->fetchXCardFromMessage($oMessage);
+		if ($xCard) {
+			$oContact->setVCard($xCard);
+		}
+
+		// Reset, else it is 'urn:uuid:01234567-89AB-CDEF-0123-456789ABCDEF'
+		$oContact->IdContactStr = $oMessage->Subject();
+		$oContact->IdContactStr = \str_replace('urn:uuid:', '', $oContact->IdContactStr);
+
+		return $oContact;
+	}
+
+	public function IsSupported() : bool
+	{
+		// Check $this->ImapClient()->hasCapability('METADATA')
+		return true;
+	}
+
+	public function SetEmail(string $sEmail) : bool
+	{
+		return true;
+	}
+
+	/**
+	 * Sync with davClient
+	 */
+	public function Sync() : bool
+	{
+		// TODO
+		return false;
+	}
+
+	public function Export(string $sType = 'vcf') : bool
+	{
+		$rCsv = 'csv' === $sType ? \fopen('php://output', 'w') : null;
+		$bCsvHeader = true;
+
+		if (!\strlen($this->sFolderName)) {
+//			return false;
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList);
+		}
+
+		$this->ImapClient();
+
+		try
+		{
+			$oParams = new \MailSo\Mail\MessageListParams;
+			$oParams->sFolderName = $this->sFolderName;
+//			$oParams->iOffset = 0;
+			$oParams->iLimit = 999; // Is the max
+			$oMessageList = $this->MailClient()->MessageList($oParams);
+			foreach ($oMessageList as $oMessage) {
+				try {
+					if ($rCsv) {
+						$oContact = $this->MessageAsContact($oMessage);
+						\RainLoop\Providers\AddressBook\Utils::VCardToCsv($rCsv, $oContact->vCard, $bCsvHeader);
+						$bCsvHeader = false;
+					} else if ($xCard = $this->fetchXCardFromMessage($oMessage)) {
+						echo $xCard->serialize();
+					}
+				} catch (\Throwable $oExc) {
+					$this->oLogger && $this->oLogger->WriteException($oExc);
+				}
+			}
+		}
+		catch (\Throwable $oException)
+		{
+			throw $oException;
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException);
+		}
+		return true;
+	}
+
+	public function ContactSave(Contact $oContact) : bool
+	{
+		if (!$this->SelectFolder()) {
+			return false;
+		}
+
+		$id = \intval($oContact->id);
+		$sUID = '';
+
+		$oVCard = $oContact->vCard;
+
+		$oPrevMessage = $this->MailClient()->Message($this->sFolderName, $id);
+		if ($oPrevMessage) {
+			$sUID = $oPrevMessage->Subject();
+			if (!$sUID) {
+				$oVCard = $this->fetchXCardFromMessage($oPrevMessage);
+				$sUID = \str_replace('urn:uuid:', '', $oVCard->UID);
+			}
+		} else {
+			$id = 0;
+		}
+
+		if (!$sUID || !\SnappyMail\UUID::isValid($sUID)) {
+			$sUID = \SnappyMail\UUID::generate();
+		}
+		$oVCard->UID = new \Sabre\VObject\Property\Uri($oVCard, 'uid', 'urn:uuid:' . $sUID);
+		$oContact->IdContactStr = $sUID;
+
+		if (!\count($oVCard->select('x-kolab-version'))) {
+			$oVCard->add(new \Sabre\VObject\Property\Text($oVCard, 'x-kolab-version', '3.1.0'));
+		}
+
+		$oVCard->VERSION = '3.0';
+//		$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
+		$oVCard->KIND = 'individual';
+
+		$oMessage = new \MailSo\Mime\Message();
+		$oMessage->DoesNotAddDefaultXMailer();
+		$oMessage->messageIdRequired = false;
+
+		$sEmail = '';
+		if ($oVCard && isset($oVCard->EMAIL)) {
+			foreach ($oVCard->EMAIL as $oProp) {
+				$oTypes = $oProp ? $oProp['TYPE'] : null;
+				$sValue = $oProp ? \trim($oProp->getValue()) : '';
+				if ($sValue && (!$sEmail || ($oTypes && $oTypes->has('PREF')))) {
+					$sEmail = $sValue;
+				}
+			}
+			if ($sEmail) {
+				$oMessage->SetFrom(new \MailSo\Mime\Email($sEmail, (string) $oVCard->FN));
+			}
+		}
+
+		$oMessage->SetSubject($sUID);
+//		$oMessage->SetDate(\time());
+		$oMessage->SetCustomHeader('X-Kolab-Type', 'application/x-vnd.kolab.contact');
+		$oMessage->SetCustomHeader('X-Kolab-Mime-Version', '3.0');
+		$oMessage->SetCustomHeader('User-Agent', 'SnappyMail');
+
+		$oPart = new \MailSo\Mime\Part;
+		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="us-ascii"');
+		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+		$oPart->Body = "This is a Kolab Groupware object.\r\n"
+			. "To view this object you will need an email client that can understand the Kolab Groupware format.\r\n"
+			. "For a list of such email clients please visit\r\n"
+			. "https://en.wikipedia.org/wiki/Kolab\r\n";
+		$oMessage->SubParts->append($oPart);
+
+		// Now the vCard
+		$oPart = new \MailSo\Mime\Part;
+		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/vcard+xml; name="kolab.xml"');
+		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment; filename="kolab.xml"');
+		$oPart->Body = \quoted_printable_encode(\preg_replace('/\r?\n/s', "\r\n",
+			\str_replace('encoding="UTF-8"', 'encoding="UTF-8" standalone="no" ', \Sabre\VObject\Writer::writeXml($oVCard))
+		));
+		$oMessage->SubParts->append($oPart);
+
+		// Store Message
+		$rMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
+		$iMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
+			$oMessage->ToStream(false), array($rMessageStream), 8192, true, true);
+		if (false !== $iMessageStreamSize) {
+			\rewind($rMessageStream);
+			$this->ImapClient()->MessageReplaceStream($this->sFolderName, $id, $rMessageStream, $iMessageStreamSize);
+		}
+
+		return true;
+	}
+
+	public function DeleteContacts(array $aContactIds) : bool
+	{
+		try {
+			$this->MailClient()->MessageDelete(
+				$this->sFolderName,
+				new \MailSo\Imap\SequenceSet($aContactIds)
+			);
+/*
+			// Delete remote when Mode = read + write
+			if (1 === $oConfig['Mode']) {
+				$oClient = $this->getDavClient();
+				if ($oClient) {
+					$sPath = $oClient->__UrlPath__;
+					$aRemoteSyncData = $this->prepareDavSyncData($oClient, $sPath);
+					if ($aRemoteSyncData && isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) {
+						$this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']);
+					}
+				}
+			}
+*/
+			return true;
+		} catch (\Throwable $e) {
+		}
+		return false;
+	}
+
+	public function DeleteAllContacts(string $sEmail) : bool
+	{
+		// Called by \RainLoop\Api::ClearUserData()
+		// Not needed as the contacts are inside IMAP mailbox
+//		$this->MailClient()->FolderClear($this->sFolderName);
+		return false;
+	}
+
+	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array
+	{
+		if (!\strlen($this->sFolderName)) {
+//			return [];
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList);
+		}
+
+		$this->ImapClient();
+
+		$aResult = [];
+
+		try
+		{
+			$oParams = new \MailSo\Mail\MessageListParams;
+			$oParams->sFolderName = $this->sFolderName;
+			$oParams->iOffset = $iOffset;
+			$oParams->iLimit = $iLimit;
+			if ($sSearch) {
+				$oParams->sSearch = 'from='.$sSearch;
+			}
+			$oParams->sSort = 'FROM';
+
+			$oMessageList = $this->MailClient()->MessageList($oParams);
+			foreach ($oMessageList as $oMessage) {
+				$aResult[] = $this->MessageAsContact($oMessage);
+			}
+		}
+		catch (\Throwable $oException)
+		{
+			throw $oException;
+			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::CantGetMessageList, $oException);
+		}
+
+		return $aResult;
+	}
+
+	public function GetContactByEmail(string $sEmail) : ?Contact
+	{
+		// TODO
+		return null;
+	}
+
+	public function GetContactByID($mID, bool $bIsStrID = false) : ?Contact
+	{
+		if ($bIsStrID) {
+			$oMessage = null;
+		} else {
+			$oMessage = $this->MailClient()->Message($this->sFolderName, $mID);
+		}
+		return $oMessage ? $this->MessageAsContact($oMessage) : null;
+	}
+
+	public function GetSuggestions(string $sSearch, int $iLimit = 20) : array
+	{
+		$sSearch = \trim($sSearch);
+		if (2 > \strlen($sSearch) || !$this->SelectFolder()) {
+			return [];
+		}
+
+		$sSearch = \MailSo\Imap\SearchCriterias::escapeSearchString($this->ImapClient(), $sSearch);
+		$aUids = \array_slice(
+			$this->ImapClient()->MessageSearch("FROM {$sSearch}"),
+			0, $iLimit
+		);
+
+		$aResult = [];
+		foreach ($this->ImapClient()->Fetch(['BODY.PEEK[HEADER.FIELDS (FROM)]'], \implode(',', $aUids), true) as $oFetchResponse) {
+			$oHeaders = new \MailSo\Mime\HeaderCollection($oFetchResponse->GetHeaderFieldsValue());
+			$oFrom = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::FROM_, true);
+			foreach ($oFrom as $oMail) {
+				$aResult[] = [$oMail->GetEmail(), $oMail->GetDisplayName()];
+			}
+		}
+
+		return $aResult;
+	}
+
+	public function IncFrec(array $aEmails, bool $bCreateAuto = true) : bool
+	{
+		if ($bCreateAuto) {
+			foreach ($aEmails as $sEmail => $sAddress) {
+				$sSearch = \MailSo\Imap\SearchCriterias::escapeSearchString($this->ImapClient(), $sEmail);
+				if (!$this->ImapClient()->MessageSearch("FROM {$sSearch}")) {
+					$oVCard = new VCard;
+					$oVCard->add('EMAIL', $sEmail);
+					$sFullName = \trim(\MailSo\Mime\Email::Parse(\trim($sAddress))->GetDisplayName());
+					if ('' !== $sFullName) {
+						$sFirst = $sLast = '';
+						if (false !== \strpos($sFullName, ' ')) {
+							$aNames = \explode(' ', $sFullName, 2);
+							$sFirst = isset($aNames[0]) ? $aNames[0] : '';
+							$sLast = isset($aNames[1]) ? $aNames[1] : '';
+						} else {
+							$sFirst = $sFullName;
+						}
+						if (\strlen($sFirst) || \strlen($sLast)) {
+							$oVCard->N = array($sLast, $sFirst, '', '', '');
+						}
+					}
+					$oContact = new Contact();
+					$oContact->setVCard($oVCard);
+					$this->ContactSave($oContact);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+
+	public function Test() : string
+	{
+		// Nothing to test
+		return '';
+	}
+}
diff --git a/plugins/kolab/LICENSE b/plugins/kolab/LICENSE
new file mode 100644
index 000000000..4aed64b3a
--- /dev/null
+++ b/plugins/kolab/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/kolab/index.php b/plugins/kolab/index.php
new file mode 100644
index 000000000..e0a9063aa
--- /dev/null
+++ b/plugins/kolab/index.php
@@ -0,0 +1,94 @@
+<?php
+
+class KolabPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Kolab',
+		VERSION = '2.37',
+		RELEASE  = '2024-03-29',
+		CATEGORY = 'Contacts',
+		DESCRIPTION = 'Use an Address Book of Kolab.',
+		REQUIRED = '2.36.0';
+
+	public function Init() : void
+	{
+//		\RainLoop\Api::Config()->Set('contacts', 'enable', true);
+		if (\RainLoop\Api::Config()->Get('contacts', 'enable', false)) {
+			$this->UseLangs(true);
+
+			$this->addHook('filter.app-data', 'FilterAppData');
+			$this->addHook('main.fabrica', 'MainFabrica');
+
+			$this->addJs('js/settings.js');
+			$this->addTemplate('templates/KolabSettings.html');
+			$this->addJsonHook('KolabFolder', 'DoKolabFolder');
+		}
+	}
+
+	public function Supported() : string
+	{
+		return '';
+	}
+
+	private function Account() : \RainLoop\Model\Account
+	{
+		return \RainLoop\Api::Actions()->getAccountFromToken();
+	}
+
+	private function SettingsProvider() : \RainLoop\Providers\Settings
+	{
+		return \RainLoop\Api::Actions()->SettingsProvider(true);
+	}
+
+	private function Settings() : \RainLoop\Settings
+	{
+		return $this->SettingsProvider()->Load($this->Account());
+	}
+
+	public function DoKolabFolder() : array
+	{
+//		\error_log(\print_r($this->Manager()->Actions()->GetActionParams(), 1));
+		$sValue = $this->jsonParam('contact');
+		$oSettings = $this->Settings();
+		if (\is_string($sValue)) {
+			$oSettings->SetConf('KolabContactFolder', $sValue);
+			$this->SettingsProvider()->Save($this->Account(), $oSettings);
+		}
+		return $this->jsonResponse(__FUNCTION__, true);
+	}
+
+	public function FilterAppData($bAdmin, &$aResult) : void
+	{
+//		if ImapClient->hasCapability('METADATA')
+		if (!$bAdmin && \is_array($aResult) && !empty($aResult['Auth'])) {
+			$aResult['Capa']['Kolab'] = true;
+			$aResult['KolabContactFolder'] = (string) $this->Settings()->GetConf('KolabContactFolder', '');
+		}
+	}
+
+	/**
+	 * @param mixed $mResult
+	 */
+	public function MainFabrica(string $sName, &$mResult)
+	{
+/*
+		if ('suggestions' === $sName) {
+			if (!\is_array($mResult)) {
+				$mResult = array();
+			}
+//			$sFolder = \trim($this->Config()->Get('plugin', 'mailbox', ''));
+//			if ($sFolder) {
+				require_once __DIR__ . '/KolabContactsSuggestions.php';
+				$mResult[] = new KolabContactsSuggestions();
+//			}
+		}
+*/
+		if ('address-book' === $sName) {
+			$sFolderName = $this->Settings()->GetConf('KolabContactFolder', '');
+			if ($sFolderName) {
+				require_once __DIR__ . '/KolabAddressBook.php';
+				$mResult = new KolabAddressBook($sFolderName);
+			}
+		}
+	}
+}
diff --git a/plugins/kolab/js/settings.js b/plugins/kolab/js/settings.js
new file mode 100644
index 000000000..1f83fb0bd
--- /dev/null
+++ b/plugins/kolab/js/settings.js
@@ -0,0 +1,54 @@
+(rl => {
+
+const getFolders = type => {
+	const
+		aResult = [{
+			id: '',
+			name: '',
+		}],
+		foldersWalk = folders => {
+			folders.forEach(oItem => {
+				if (type === oItem.kolabType()) {
+					aResult.push({
+						id: oItem.fullName,
+						name: oItem.fullName
+					});
+				}
+				if (oItem.subFolders.length) {
+					foldersWalk(oItem.subFolders());
+				}
+			});
+		};
+	foldersWalk(rl.app.folderList());
+	return aResult;
+};
+
+
+class KolabSettings /* extends AbstractViewSettings */
+{
+	constructor() {
+		this.contactFolder = ko.observable(rl.settings.get('KolabContactFolder'));
+//		rl.app.FolderUserStore.hasCapability('METADATA');
+		this.contactFolder.subscribe(value => {
+			rl.pluginRemoteRequest(()=>{}, 'KolabFolder', {
+				contact: value
+			});
+		});
+		this.contactFoldersList = ko.computed(() => getFolders('contact'), {'pure':true});
+//		this.eventFoldersList = ko.computed(() => getFolders('event'), {'pure':true});
+//		this.taskFoldersList = ko.computed(() => getFolders('task'), {'pure':true});
+//		this.noteFoldersList = ko.computed(() => getFolders('note'), {'pure':true});
+//		this.fileFoldersList = ko.computed(() => getFolders('file'), {'pure':true});
+//		this.journalFoldersList = ko.computed(() => getFolders('journal'), {'pure':true});
+//		this.configFoldersList = ko.computed(() => getFolders('configuration'), {'pure':true});
+	}
+}
+
+rl.addSettingsViewModel(
+	KolabSettings,
+	'KolabSettings',
+	'Kolab',
+	'kolab'
+);
+
+})(window.rl);
diff --git a/plugins/kolab/langs/ar.json b/plugins/kolab/langs/ar.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/ar.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/bg.json b/plugins/kolab/langs/bg.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/bg.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/cs.json b/plugins/kolab/langs/cs.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/cs.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/da.json b/plugins/kolab/langs/da.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/da.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/de.json b/plugins/kolab/langs/de.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/de.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/el.json b/plugins/kolab/langs/el.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/el.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/en.json b/plugins/kolab/langs/en.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/en.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/es.json b/plugins/kolab/langs/es.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/es.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/et.json b/plugins/kolab/langs/et.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/et.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/fa.json b/plugins/kolab/langs/fa.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/fa.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/fi.json b/plugins/kolab/langs/fi.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/fi.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/fr.json b/plugins/kolab/langs/fr.json
new file mode 100644
index 000000000..da740ca95
--- /dev/null
+++ b/plugins/kolab/langs/fr.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Dossier Contacts"
+	}
+}
diff --git a/plugins/kolab/langs/hu.json b/plugins/kolab/langs/hu.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/hu.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/id.json b/plugins/kolab/langs/id.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/id.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/is.json b/plugins/kolab/langs/is.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/is.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/it.json b/plugins/kolab/langs/it.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/it.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/ja.json b/plugins/kolab/langs/ja.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/ja.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/ko.json b/plugins/kolab/langs/ko.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/ko.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/lt.json b/plugins/kolab/langs/lt.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/lt.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/lv.json b/plugins/kolab/langs/lv.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/lv.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/nb.json b/plugins/kolab/langs/nb.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/nb.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/nl.json b/plugins/kolab/langs/nl.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/nl.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/pl.json b/plugins/kolab/langs/pl.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/pl.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/pt.json b/plugins/kolab/langs/pt.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/pt.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/ro.json b/plugins/kolab/langs/ro.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/ro.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/ru.json b/plugins/kolab/langs/ru.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/ru.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/sk.json b/plugins/kolab/langs/sk.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/sk.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/sl.json b/plugins/kolab/langs/sl.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/sl.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/sv.json b/plugins/kolab/langs/sv.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/sv.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/tr.json b/plugins/kolab/langs/tr.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/tr.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/uk.json b/plugins/kolab/langs/uk.json
new file mode 100644
index 000000000..39fe71e65
--- /dev/null
+++ b/plugins/kolab/langs/uk.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "Contacts Folder"
+	}
+}
diff --git a/plugins/kolab/langs/zh-TW.json b/plugins/kolab/langs/zh-TW.json
new file mode 100644
index 000000000..a635a4ef5
--- /dev/null
+++ b/plugins/kolab/langs/zh-TW.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "聯絡人名刺夾"
+	}
+}
diff --git a/plugins/kolab/langs/zh.json b/plugins/kolab/langs/zh.json
new file mode 100644
index 000000000..25cbc5656
--- /dev/null
+++ b/plugins/kolab/langs/zh.json
@@ -0,0 +1,5 @@
+{
+	"KOLAB": {
+		"CONTACTS_FOLDER": "联系人文件夹"
+	}
+}
diff --git a/plugins/kolab/templates/KolabSettings.html b/plugins/kolab/templates/KolabSettings.html
new file mode 100644
index 000000000..71cd3cc93
--- /dev/null
+++ b/plugins/kolab/templates/KolabSettings.html
@@ -0,0 +1,12 @@
+<div class="b-settings-kolab form-horizontal">
+	<div class="legend">Kolab</div>
+	<div class="form-horizontal">
+
+		<div class="control-group">
+			<label data-i18n="KOLAB/CONTACTS_FOLDER"></label>
+			<select data-bind="options: contactFoldersList, value: contactFolder,
+				optionsText: 'name', optionsValue: 'id'"></select>
+		</div>
+
+	</div>
+</div>
diff --git a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
index 8a10443b2..aa5907753 100644
--- a/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
+++ b/plugins/ldap-contacts-suggestions/LdapContactsSuggestions.php
@@ -2,60 +2,27 @@
 
 class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
 {
-	/**
-	 * @var string
-	 */
-	private $sLdapUri = 'ldap://localhost:389';
+	use \MailSo\Log\Inherit;
 
-	/**
-	 * @var bool
-	 */
-	private $bUseStartTLS = True;
+	private string $sLdapUri = 'ldap://localhost:389';
 
-	/**
-	 * @var string
-	 */
-	private $sBindDn = null;
+	private bool $bUseStartTLS = true;
 
-	/**
-	 * @var string
-	 */
-	private $sBindPassword = null;
+	private string $sBindDn = '';
 
-	/**
-	 * @var string
-	 */
-	private $sBaseDn = 'ou=People,dc=example,dc=com';
+	private string $sBindPassword = '';
 
-	/**
-	 * @var string
-	 */
-	private $sObjectClasses = 'inetOrgPerson';
+	private string $sBaseDn = 'ou=People,dc=example,dc=com';
 
-	/**
-	 * @var string
-	 */
-	private $sUidAttributes = 'uid';
+	private string $sObjectClasses = 'inetOrgPerson';
 
-	/**
-	 * @var string
-	 */
-	private $sNameAttributes = 'displayName,cn,givenName,sn';
+	private string $sUidAttributes = 'uid';
 
-	/**
-	 * @var string
-	 */
-	private $sEmailAttributes = 'mailAddress,mail,mailAlternateAddress,mailAlias';
+	private string $sNameAttributes = 'displayName,cn,givenName,sn';
 
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	private $oLogger = null;
+	private string $sEmailAttributes = 'mailAddress,mail,mailAlternateAddress,mailAlias';
 
-	/**
-	 * @var string
-	 */
-	private $sAllowedEmails = '*';
+	private string $sAllowedEmails = '*';
 
 	/**
 	 * @param string $sLdapUri
@@ -75,8 +42,7 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 	{
 		$this->sLdapUri = $sLdapUri;
 		$this->bUseStartTLS = $bUseStartTLS;
-		if (0 < \strlen($sBindDn))
-		{
+		if (\strlen($sBindDn)) {
 			$this->sBindDn = $sBindDn;
 			$this->sBindPassword = $sBindPassword;
 		}
@@ -90,142 +56,51 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 		return $this;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account $oAccount
-	 * @param string $sQuery
-	 * @param int $iLimit = 20
-	 *
-	 * @return array
-	 */
-	public function Process(RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
+	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
 	{
 		$sQuery = \trim($sQuery);
 
-		if (2 > \strlen($sQuery))
-		{
-			return array();
-		}
-		else if (!$oAccount || !\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->sAllowedEmails))
+		if (2 > \strlen($sQuery)
+		 || !$oAccount
+		 || !\RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $this->sAllowedEmails))
 		{
 			return array();
 		}
 
-		$aResult = $this->ldapSearch($oAccount, $sQuery);
-
-		$aResult = \RainLoop\Utils::RemoveSuggestionDuplicates($aResult);
-		if ($iLimit < \count($aResult))
-		{
-			$aResult = \array_slice($aResult, 0, $iLimit);
-		}
-
-		return $aResult;
-	}
-
-	/**
-	 * @param array $aLdapItem
-	 * @param array $aEmailAttributes
-	 * @param array $aNameAttributes
-	 * @param array $aUidAttributes
-	 *
-	 * @return array
-	 */
-	private function findNameAndEmail($aLdapItem, $aEmailAttributes, $aNameAttributes, $aUidAttributes)
-	{
-		$sEmail = $sName = $sUid = '';
-		if ($aLdapItem)
-		{
-			foreach ($aEmailAttributes as $sField)
-			{
-				$sField = \strtolower($sField);
-				if (!empty($aLdapItem[$sField][0]))
-				{
-					$sEmail = \trim($aLdapItem[$sField][0]);
-					if (!empty($sEmail))
-					{
-						break;
-					}
-				}
-			}
-
-			foreach ($aNameAttributes as $sField)
-			{
-				$sField = \strtolower($sField);
-				if (!empty($aLdapItem[$sField][0]))
-				{
-					$sName = \trim($aLdapItem[$sField][0]);
-					if (!empty($sName))
-					{
-						break;
-					}
-				}
-			}
-
-			foreach ($aUidAttributes as $sField)
-			{
-				$sField = \strtolower($sField);
-				if (!empty($aLdapItem[$sField][0]))
-				{
-					$sUid = \trim($aLdapItem[$sField][0]);
-					if (!empty($sUid))
-					{
-						break;
-					}
-				}
-			}
-		}
-
-		return array($sEmail, $sName, $sUid);
-	}
-
-	/**
-	 * @param \RainLoop\Model\Account $oAccount
-	 * @param string $sQuery
-	 *
-	 * @return array
-	 */
-	private function ldapSearch($oAccount, $sQuery)
-	{
 		$sSearchEscaped = $this->escape($sQuery);
 
 		$aResult = array();
 		$oCon = @\ldap_connect($this->sLdapUri);
-		if ($oCon)
-		{
-			$this->oLogger->Write('ldap_connect: connected', \MailSo\Log\Enumerations\Type::INFO, 'LDAP');
+		if ($oCon) {
+			$this->logWrite('ldap_connect: connected', \LOG_INFO, 'LDAP');
 
 			@\ldap_set_option($oCon, LDAP_OPT_PROTOCOL_VERSION, 3);
 
-			if ($this->bUseStartTLS && !@\ldap_start_tls($oCon))
-			{
+			if ($this->bUseStartTLS && !@\ldap_start_tls($oCon)) {
 				$this->logLdapError($oCon, 'ldap_start_tls');
 				return $aResult;
 			}
 
-			if (!@\ldap_bind($oCon, $this->sBindDn, $this->sBindPassword))
-			{
-				if (is_null($this->sBindDn))
-				{
+			if (!@\ldap_bind($oCon, $this->sBindDn, $this->sBindPassword)) {
+				if (\is_null($this->sBindDn)) {
 					$this->logLdapError($oCon, 'ldap_bind (anonymous)');
-				}
-				else
-				{
+				} else {
 					$this->logLdapError($oCon, 'ldap_bind');
 				}
-
 				return $aResult;
 			}
 
-			$sDomain = \MailSo\Base\Utils::GetDomainFromEmail($oAccount->Email());
+			$sDomain = \MailSo\Base\Utils::getEmailAddressDomain($oAccount->Email());
 			$sBaseDn = \strtr($this->sBaseDn, array(
 				'{domain}' => $sDomain,
 				'{domain:dc}' => 'dc='.\strtr($sDomain, array('.' => ',dc=')),
 				'{email}' => $oAccount->Email(),
-				'{email:user}' => \MailSo\Base\Utils::GetAccountNameFromEmail($oAccount->Email()),
+				'{email:user}' => \MailSo\Base\Utils::getEmailAddressLocalPart($oAccount->Email()),
 				'{email:domain}' => $sDomain,
-				'{login}' => $oAccount->Login(),
-				'{imap:login}' => $oAccount->Login(),
-				'{imap:host}' => $oAccount->DomainIncHost(),
-				'{imap:port}' => $oAccount->DomainIncPort()
+				'{login}' => $oAccount->IncLogin(),
+				'{imap:login}' => $oAccount->IncLogin(),
+				'{imap:host}' => $oAccount->Domain()->ImapSettings()->host,
+				'{imap:port}' => $oAccount->Domain()->ImapSettings()->port
 			));
 
 			$aObjectClasses = empty($this->sObjectClasses) ? array() : \explode(',', $this->sObjectClasses);
@@ -242,11 +117,9 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 
 			$iObjCount = 0;
 			$sObjFilter = '';
-			foreach ($aObjectClasses as $sItem)
-			{
-				if (!empty($sItem))
-				{
-					$iObjCount++;
+			foreach ($aObjectClasses as $sItem) {
+				if (!empty($sItem)) {
+					++$iObjCount;
 					$sObjFilter .= '(objectClass='.$sItem.')';
 				}
 			}
@@ -254,10 +127,8 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 
 			$aItems = array();
 			$sSubFilter = '';
-			foreach ($aFields as $sItem)
-			{
-				if (!empty($sItem))
-				{
+			foreach ($aFields as $sItem) {
+				if (!empty($sItem)) {
 					$aItems[] = $sItem;
 					$sSubFilter .= '('.$sItem.'=*'.$sSearchEscaped.'*)';
 				}
@@ -268,47 +139,91 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 			$sFilter .= (1 < count($aItems) ? '(|' : '').$sSubFilter.(1 < count($aItems) ? ')' : '');
 			$sFilter .= ')';
 
-			$this->oLogger->Write('ldap_search: start: '.$sBaseDn.' / '.$sFilter, \MailSo\Log\Enumerations\Type::INFO, 'LDAP');
-			$oS = @\ldap_search($oCon, $sBaseDn, $sFilter, $aItems, 0, 30, 30);
-			if ($oS)
-			{
-				$aEntries = @\ldap_get_entries($oCon, $oS);
-				if (is_array($aEntries))
-				{
-					if (isset($aEntries['count']))
-					{
-						unset($aEntries['count']);
-					}
+			// A directory rarely keeps everything worth suggesting in one branch:
+			// meeting rooms and other bookable resources commonly live outside
+			// the people branch. Searching a single subtree either misses them,
+			// or - if the base is widened to the domain root - drags every
+			// service account into the suggestion list. Base DNs are therefore
+			// separated by '|', which cannot appear unescaped in a DN, so an
+			// existing single-branch configuration keeps working unchanged.
+			$aBaseDns = \array_filter(\array_map('trim', \explode('|', $sBaseDn)), 'strlen');
 
-					foreach ($aEntries as $aItem)
-					{
-						if ($aItem)
-						{
-							$sName = $sEmail = '';
-							list ($sEmail, $sName) = $this->findNameAndEmail($aItem, $aEmails, $aNames, $aUIDs);
-							if (!empty($sEmail))
-							{
-								$aResult[] = array($sEmail, $sName);
+			foreach ($aBaseDns as $sOneBaseDn) {
+				$this->logWrite('ldap_search: start: '.$sOneBaseDn.' / '.$sFilter, \LOG_INFO, 'LDAP');
+				$oS = @\ldap_search($oCon, $sOneBaseDn, $sFilter, $aItems, 0, 30, 30);
+				if ($oS) {
+					$aEntries = @\ldap_get_entries($oCon, $oS);
+					if (is_array($aEntries)) {
+						if (isset($aEntries['count'])) {
+							unset($aEntries['count']);
+						}
+
+						foreach ($aEntries as $aItem) {
+							if ($aItem) {
+								$sName = $sEmail = '';
+								list ($sEmail, $sName) = $this->findNameAndEmail($aItem, $aEmails, $aNames, $aUIDs);
+								if (!empty($sEmail)) {
+									$aResult[] = array($sEmail, $sName);
+								}
 							}
 						}
+					} else {
+						$this->logLdapError($oCon, 'ldap_get_entries');
 					}
-				}
-				else
-				{
-					$this->logLdapError($oCon, 'ldap_get_entries');
+				} else {
+					// One unreachable branch must not silence the others.
+					$this->logLdapError($oCon, 'ldap_search ('.$sOneBaseDn.')');
 				}
 			}
-			else
-			{
-				$this->logLdapError($oCon, 'ldap_search');
-			}
-		}
-		else
-		{
-			return $aResult;
 		}
 
-		return $aResult;
+		return \array_slice($aResult, 0, $iLimit);
+	}
+
+	/**
+	 * @param array $aLdapItem
+	 * @param array $aEmailAttributes
+	 * @param array $aNameAttributes
+	 * @param array $aUidAttributes
+	 *
+	 * @return array
+	 */
+	private function findNameAndEmail($aLdapItem, $aEmailAttributes, $aNameAttributes, $aUidAttributes)
+	{
+		$sEmail = $sName = $sUid = '';
+		if ($aLdapItem) {
+			foreach ($aEmailAttributes as $sField) {
+				$sField = \strtolower($sField);
+				if (!empty($aLdapItem[$sField][0])) {
+					$sEmail = \trim($aLdapItem[$sField][0]);
+					if (!empty($sEmail)) {
+						break;
+					}
+				}
+			}
+
+			foreach ($aNameAttributes as $sField) {
+				$sField = \strtolower($sField);
+				if (!empty($aLdapItem[$sField][0])) {
+					$sName = \trim($aLdapItem[$sField][0]);
+					if (!empty($sName)) {
+						break;
+					}
+				}
+			}
+
+			foreach ($aUidAttributes as $sField) {
+				$sField = \strtolower($sField);
+				if (!empty($aLdapItem[$sField][0])) {
+					$sUid = \trim($aLdapItem[$sField][0]);
+					if (!empty($sUid)) {
+						break;
+					}
+				}
+			}
+		}
+
+		return array($sEmail, $sName, $sUid);
 	}
 
 	/**
@@ -321,8 +236,7 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 		$aNewChars = array();
 		$aChars = array('\\', '*', '(', ')', \chr(0));
 
-		foreach ($aChars as $iIndex => $sValue)
-		{
+		foreach ($aChars as $iIndex => $sValue) {
 			$aNewChars[$iIndex] = '\\'.\str_pad(\dechex(\ord($sValue)), 2, '0');
 		}
 
@@ -337,28 +251,10 @@ class LdapContactsSuggestions implements \RainLoop\Providers\Suggestions\ISugges
 	 */
 	public function logLdapError($oCon, $sCmd)
 	{
-		if ($this->oLogger)
-		{
+		if ($this->oLogger) {
 			$sError = $oCon ? @\ldap_error($oCon) : '';
 			$iErrno = $oCon ? @\ldap_errno($oCon) : 0;
-
-			$this->oLogger->Write($sCmd.' error: '.$sError.' ('.$iErrno.')',
-				\MailSo\Log\Enumerations\Type::WARNING, 'LDAP');
+			$this->logWrite($sCmd.' error: '.$sError.' ('.$iErrno.')', \LOG_WARNING, 'LDAP');
 		}
 	}
-
-	/**
-	 * @param \MailSo\Log\Logger $oLogger
-	 *
-	 * @return \LdapContactsSuggestions
-	 */
-	public function SetLogger($oLogger)
-	{
-		if ($oLogger instanceof \MailSo\Log\Logger)
-		{
-			$this->oLogger = $oLogger;
-		}
-
-		return $this;
-	}
 }
diff --git a/plugins/ldap-contacts-suggestions/index.php b/plugins/ldap-contacts-suggestions/index.php
index f24812f52..5ef78593c 100644
--- a/plugins/ldap-contacts-suggestions/index.php
+++ b/plugins/ldap-contacts-suggestions/index.php
@@ -3,9 +3,11 @@
 class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
-		NAME = 'Contacts suggestions (LDAP)',
-		VERSION = '2.1',
-		CATEGORY = 'Security',
+		NAME     = 'Contacts suggestions (LDAP)',
+		VERSION  = '2.15',
+		RELEASE  = '2026-08-19',
+		REQUIRED = '2.35.3',
+		CATEGORY = 'Contacts',
 		DESCRIPTION = 'Get contacts suggestions from LDAP.';
 
 	public function Init() : void
@@ -13,9 +15,6 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addHook('main.fabrica', 'MainFabrica');
 	}
 
-	/**
-	 * @return string
-	 */
 	public function Supported() : string
 	{
 		if (!\function_exists('ldap_connect'))
@@ -32,43 +31,38 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 	 */
 	public function MainFabrica($sName, &$mResult)
 	{
-		switch ($sName)
-		{
-			case 'suggestions':
+		if ('suggestions' == $sName) {
+			if (!\is_array($mResult)) {
+				$mResult = array();
+			}
 
-				if (!\is_array($mResult))
-				{
-					$mResult = array();
-				}
+			$sLdapUri = \trim($this->Config()->Get('plugin', 'ldap_uri', ''));
+			$sBaseDn = \trim($this->Config()->Get('plugin', 'base_dn', ''));
+			$sObjectClasses = \trim($this->Config()->Get('plugin', 'object_classes', ''));
+			$sEmailAttributes = \trim($this->Config()->Get('plugin', 'mail_attributes', ''));
 
-				$sLdapUri = \trim($this->Config()->Get('plugin', 'ldap_uri', ''));
-				$bUseStartTLS = (bool) $this->Config()->Get('plugin', 'use_start_tls', True);
-				$sBindDn = \trim($this->Config()->Get('plugin', 'bind_dn', ''));
-				$sBindPassword = \trim($this->Config()->Get('plugin', 'bind_password', ''));
-				$sBaseDn = \trim($this->Config()->Get('plugin', 'base_dn', ''));
-				$sObjectClasses = \trim($this->Config()->Get('plugin', 'object_classes', ''));
-				$sUidAttributes = \trim($this->Config()->Get('plugin', 'uid_attributes', ''));
-				$sNameAttributes = \trim($this->Config()->Get('plugin', 'name_attributes', ''));
-				$sEmailAttributes = \trim($this->Config()->Get('plugin', 'mail_attributes', ''));
-				$sAllowedEmails = \trim($this->Config()->Get('plugin', 'allowed_emails', ''));
+			if (\strlen($sLdapUri) && \strlen($sBaseDn) && \strlen($sObjectClasses) && \strlen($sEmailAttributes)) {
+				require_once __DIR__.'/LdapContactsSuggestions.php';
 
-				if (0 < \strlen($sLdapUri) && 0 < \strlen($sBaseDn) && 0 < \strlen($sObjectClasses) && 0 < \strlen($sEmailAttributes))
-				{
-					include_once __DIR__.'/LdapContactsSuggestions.php';
+				$oProvider = new LdapContactsSuggestions();
+				$oProvider->SetConfig(
+					$sLdapUri,
+					(bool) $this->Config()->Get('plugin', 'use_start_tls', true),
+					\trim($this->Config()->Get('plugin', 'bind_dn', '')),
+					\trim($this->Config()->Get('plugin', 'bind_password', '')),
+					$sBaseDn,
+					$sObjectClasses,
+					\trim($this->Config()->Get('plugin', 'uid_attributes', '')),
+					\trim($this->Config()->Get('plugin', 'name_attributes', '')),
+					$sEmailAttributes,
+					\trim($this->Config()->Get('plugin', 'allowed_emails', ''))
+				);
 
-					$oProvider = new LdapContactsSuggestions();
-					$oProvider->SetConfig($sLdapUri, $bUseStartTLS, $sBindDn, $sBindPassword, $sBaseDn, $sObjectClasses, $sUidAttributes, $sNameAttributes, $sEmailAttributes, $sAllowedEmails);
-
-					$mResult[] = $oProvider;
-				}
-
-				break;
+				$mResult[] = $oProvider;
+			}
 		}
 	}
 
-	/**
-	 * @return array
-	 */
 	protected function configMapping() : array
 	{
 		return array(
@@ -85,9 +79,9 @@ class LdapContactsSuggestionsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::PASSWORD)
 				->SetDefaultValue(''),
 			\RainLoop\Plugins\Property::NewInstance('base_dn')->SetLabel('Search base DN')
-				->SetDescription('DN to use as the search base. Supported tokens: {domain}, {domain:dc}, {email}, {email:user}, {email:domain}, {login}, {imap:login}, {imap:host}, {imap:port}')
+				->SetDescription('DN to use as the search base. Supported tokens: {domain}, {domain:dc}, {email}, {email:user}, {email:domain}, {login}, {imap:login}, {imap:host}, {imap:port} Several branches may be given, separated by | - useful when meeting rooms or other resources live outside the people branch.')
 				->SetDefaultValue('ou=People,dc=example,dc=com'),
-			\RainLoop\Plugins\Property::NewInstance('object_classes')->SetLabel('objectClasses to use')
+			\RainLoop\Plugins\Property::NewInstance('object_classes')->SetLabel('objectClasses')
 				->SetDescription('LDAP objectClasses to search for, comma separated list')
 				->SetDefaultValue('inetOrgPerson'),
 			\RainLoop\Plugins\Property::NewInstance('uid_attributes')->SetLabel('uid attributes')
diff --git a/plugins/ldap-identities/LdapConfig.php b/plugins/ldap-identities/LdapConfig.php
index d737e7370..c55f88bcb 100644
--- a/plugins/ldap-identities/LdapConfig.php
+++ b/plugins/ldap-identities/LdapConfig.php
@@ -7,6 +7,8 @@ class LdapConfig
 {
 	public const CONFIG_SERVER = "server";
 	public const CONFIG_PROTOCOL_VERSION = "server_version";
+	public const CONFIG_STARTTLS = "starttls";
+	public const CONFIG_MAIL_PREFIX = "mail_prefix";
 
 	public const CONFIG_BIND_USER = "bind_user";
 	public const CONFIG_BIND_PASSWORD = "bind_password";
@@ -28,6 +30,8 @@ class LdapConfig
 
 	public $server;
 	public $protocol;
+	public $starttls;
+	public $mail_prefix;
 	public $bind_user;
 	public $bind_password;
 	public $user_base;
@@ -48,6 +52,8 @@ class LdapConfig
 		$ldap = new self();
 		$ldap->server = trim($config->Get("plugin", self::CONFIG_SERVER));
 		$ldap->protocol = (int)trim($config->Get("plugin", self::CONFIG_PROTOCOL_VERSION, 3));
+		$ldap->starttls = (bool)trim($config->Get("plugin", self::CONFIG_STARTTLS));
+		$ldap->mail_prefix = trim($config->Get("plugin", self::CONFIG_MAIL_PREFIX));
 		$ldap->bind_user = trim($config->Get("plugin", self::CONFIG_BIND_USER));
 		$ldap->bind_password = trim($config->Get("plugin", self::CONFIG_BIND_PASSWORD));
 		$ldap->user_base = trim($config->Get("plugin", self::CONFIG_USER_BASE));
diff --git a/plugins/ldap-identities/LdapException.php b/plugins/ldap-identities/LdapException.php
index 2abaf07a8..df489e577 100644
--- a/plugins/ldap-identities/LdapException.php
+++ b/plugins/ldap-identities/LdapException.php
@@ -1,5 +1,5 @@
 <?php
 
-class LdapException extends \RainLoop\Exceptions\Exception
+class LdapException extends \RainLoop\Exceptions\ClientException
 {
 }
\ No newline at end of file
diff --git a/plugins/ldap-identities/LdapIdentities.php b/plugins/ldap-identities/LdapIdentities.php
index 887f94bed..4cc3e69d0 100644
--- a/plugins/ldap-identities/LdapIdentities.php
+++ b/plugins/ldap-identities/LdapIdentities.php
@@ -1,6 +1,5 @@
 <?php
 
-use MailSo\Log\Enumerations\Type;
 use MailSo\Log\Logger;
 use RainLoop\Model\Account;
 use RainLoop\Model\Identity;
@@ -40,7 +39,7 @@ class LdapIdentities implements IIdentities
 		// Check if LDAP is available
 		if (!extension_loaded('ldap') || !function_exists('ldap_connect')) {
 			$this->ldapAvailable = false;
-			$logger->Write("The LDAP extension is not available!", Type::WARNING, self::LOG_KEY);
+			$logger->Write("The LDAP extension is not available!", \LOG_WARNING, self::LOG_KEY);
 			return;
 		}
 
@@ -70,17 +69,18 @@ class LdapIdentities implements IIdentities
 				$this->config->user_base,
 				$this->config->user_objectclass,
 				$this->config->user_field_name,
-				$this->config->user_field_mail
+				$this->config->user_field_mail,
+				$this->config->mail_prefix
 			);
 		} catch (LdapException $e) {
 			return []; // exceptions are only thrown from the handleerror function that does logging already
 		}
 
 		if (count($userResults) < 1) {
-			$this->logger->Write("Could not find user $username", Type::NOTICE, self::LOG_KEY);
+			$this->logger->Write("Could not find user $username", \LOG_NOTICE, self::LOG_KEY);
 			return [];
 		} else if (count($userResults) > 1) {
-			$this->logger->Write("Found multiple matches for user $username", Type::WARNING, self::LOG_KEY);
+			$this->logger->Write("Found multiple matches for user $username", \LOG_WARNING, self::LOG_KEY);
 		}
 
 		$userResult = $userResults[0];
@@ -105,7 +105,8 @@ class LdapIdentities implements IIdentities
 				$this->config->group_base,
 				$this->config->group_objectclass,
 				$this->config->group_field_name,
-				$this->config->group_field_mail
+				$this->config->group_field_mail,
+				$this->config->mail_prefix
 			);
 		} catch (LdapException $e) {
 			return []; // exceptions are only thrown from the handleerror function that does logging already
@@ -130,11 +131,11 @@ class LdapIdentities implements IIdentities
 
 	/**
 	 * @inheritDoc
-	 * @throws \RainLoop\Exceptions\Exception
+	 * @throws \RainLoop\Exceptions\ClientException
 	 */
 	public function SetIdentities(Account $account, array $identities): void
 	{
-		throw new \RainLoop\Exceptions\Exception("Ldap identities provider does not support storage");
+		throw new \RainLoop\Exceptions\ClientException("Ldap identities provider does not support storage");
 	}
 
 	/**
@@ -179,6 +180,15 @@ class LdapIdentities implements IIdentities
 			return false;
 		}
 
+		// Activate StartTLS
+		if ($this->config->starttls) {
+			$starttlsResult = ldap_start_tls($ldap);
+			if (!$starttlsResult) {
+				$this->ldapAvailable = false;
+				return false;
+			}
+		}
+		
 		$this->ldap = $ldap;
 		$this->ldapConnected = true;
 		return true;
@@ -219,7 +229,7 @@ class LdapIdentities implements IIdentities
 		$errorMsg = @ldap_error($this->ldap);
 
 		$message = empty($op) ? "LDAP Error: {$errorMsg} ({$errorNo})" : "LDAP Error during {$op}: {$errorMsg} ({$errorNo})";
-		$this->logger->Write($message, Type::ERROR, self::LOG_KEY);
+		$this->logger->Write($message, \LOG_ERR, self::LOG_KEY);
 		throw new LdapException($message, $errorNo);
 	}
 
@@ -233,7 +243,7 @@ class LdapIdentities implements IIdentities
 	 * @return LdapResult[]
 	 * @throws LdapException
 	 */
-	private function FindLdapResults(string $searchField, string $searchValue, string $searchBase, string $objectClass, string $nameField, string $mailField): array
+	private function FindLdapResults(string $searchField, string $searchValue, string $searchBase, string $objectClass, string $nameField, string $mailField, string $mailPrefix): array
 	{
 		$this->EnsureBound();
 
@@ -253,6 +263,8 @@ class LdapIdentities implements IIdentities
 			return [];
 		}
 
+		$entries = $this->CleanupMailAddresses($entries, $mailField, $mailPrefix);
+
 		$results = [];
 		for ($i = 0; $i < $entries["count"]; $i++) {
 			$entry = $entries[$i];
@@ -268,6 +280,49 @@ class LdapIdentities implements IIdentities
 		return $results;
 	}
 
+	// Function CleanupMailAddresses(): If a prefix is given this function removes addresses without / with the wrong prefix and then the prefix itself from all remaining values.
+	// This is usefull for example for importing Active Directory LDAP entry "proxyAddresses" which can hold different address types with prefixes like "X400:", "smtp:" "sip:" and others.
+
+	/**
+	@param array $entries
+	@param string $mailField
+	@paraam string $mailPrefix
+	@return array
+	*/
+	private function CleanupMailAddresses(array $entries, string $mailField, string $mailPrefix)
+	{
+		if (!empty($mailPrefix)) {
+			for ($i = 0; $i < $entries["count"]; $i++) {
+				// Remove addresses without the given prefix
+				$entries[$i]["$mailField"] = array_filter($entries[$i]["$mailField"],
+												function($prefixMail)
+												{
+													// $mailPrefix can't be used here, because it's nailed to the CleanupMailAddresses function and can't be passed to the array_filter function afaik.
+													// Ideas to avoid this are welcome.
+													if (stripos($prefixMail, $this->config->mail_prefix) === 0) {
+														return TRUE;
+													}
+													return FALSE;
+												}
+											);
+				// Set "count" to new value
+				$newcount = count($entries[$i]["$mailField"]);
+				if (array_key_exists("count", $entries[$i]["$mailField"])) {
+					$newcount = $newcount - 1;
+				}
+				$entries[$i]["$mailField"]["count"] = $newcount;
+
+				// Remove the prefix
+				for ($j = 0; $j < $entries[$i]["$mailField"]["count"]; $j++) {
+					$mailPrefixLen = mb_strlen($mailPrefix);
+					$entries[$i]["$mailField"][$j] = substr($entries[$i]["$mailField"][$j], $mailPrefixLen);
+				}
+			}
+		}
+
+		return $entries;
+	}
+
 	/**
 	 * @param array $entry
 	 * @param string $attribute
@@ -279,14 +334,14 @@ class LdapIdentities implements IIdentities
 	{
 		if (!isset($entry[$attribute])) {
 			if ($required)
-				$this->logger->Write("Attribute $attribute not found on object {$entry['dn']} while required", Type::NOTICE, self::LOG_KEY);
+				$this->logger->Write("Attribute $attribute not found on object {$entry['dn']} while required", \LOG_NOTICE, self::LOG_KEY);
 
 			return $single ? "" : [];
 		}
 
 		if ($single) {
 			if ($entry[$attribute]["count"] > 1)
-				$this->logger->Write("Attribute $attribute is multivalues while only a single value is expected", Type::NOTICE, self::LOG_KEY);
+				$this->logger->Write("Attribute $attribute is multivalues while only a single value is expected", \LOG_NOTICE, self::LOG_KEY);
 
 			return $entry[$attribute][0];
 		}
diff --git a/plugins/ldap-identities/index.php b/plugins/ldap-identities/index.php
index 2fc18ebd5..4ac3f2faf 100644
--- a/plugins/ldap-identities/index.php
+++ b/plugins/ldap-identities/index.php
@@ -8,11 +8,11 @@ class LdapIdentitiesPlugin extends AbstractPlugin
 {
 	const
 		NAME     = 'LDAP Identities',
-		VERSION  = '2.0',
+		VERSION  = '2.3',
 		AUTHOR   = 'FWest98',
 		URL      = 'https://github.com/FWest98',
-		RELEASE  = '2020-11-11',
-		REQUIRED = '2.1.0',
+		RELEASE  = '2024-02-27',
+		REQUIRED = '2.20.0',
 		CATEGORY = 'Accounts',
 		DESCRIPTION = 'Adds functionality to import account identities from LDAP.';
 
@@ -58,6 +58,18 @@ class LdapIdentitiesPlugin extends AbstractPlugin
 				->SetType(PluginPropertyType::SELECTION)
 				->SetDefaultValue([2, 3]),
 
+			Property::NewInstance(LdapConfig::CONFIG_STARTTLS)
+				->SetLabel("Use StartTLS")
+				->SetType(PluginPropertyType::BOOL)
+				->SetDescription("Whether or not to use TLS encrypted connection")
+				->SetDefaultValue(true),
+
+			Property::NewInstance(LdapConfig::CONFIG_MAIL_PREFIX)
+				->SetLabel("Email prefix")
+				->SetType(PluginPropertyType::STRING)
+				->SetDescription("Only addresses with this prefix will be used as identity. The prefix is removed from the identity list.\nThis is useful for example to import identities from Exchange, which stores mail addresses in the ProxyAddresses attribut of Active Directory with \"smtp:\" as prefix. (e.g. \"smtp:john.doe@topsecret.info\")\n-> To use addresses set by Exchange use \"smtp:\" as prefix.")
+				->SetDefaultValue(""),
+
 			Property::NewInstance(LdapConfig::CONFIG_BIND_USER)
 				->SetLabel("Bind User DN")
 				->SetDescription("The user to use for binding to the LDAP server. Should be a DN or RDN. Leave empty for anonymous bind")
diff --git a/plugins/ldap-login-mapping/LICENSE b/plugins/ldap-login-mapping/LICENSE
new file mode 100644
index 000000000..335b3845a
--- /dev/null
+++ b/plugins/ldap-login-mapping/LICENSE
@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 RainLoop Team
+Copyright (c) 2018 <ludovic.pouzenc@mines-albi.fr>
+Copyright (c) 2022 <zephone@protonmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/ldap-login-mapping/README b/plugins/ldap-login-mapping/README
new file mode 100644
index 000000000..59e065d6b
--- /dev/null
+++ b/plugins/ldap-login-mapping/README
@@ -0,0 +1 @@
+This plugins allows to authenticate using LDAP mail field, yet login field would still be used for IMAP and SMTP authentication.
diff --git a/plugins/ldap-login-mapping/VERSION b/plugins/ldap-login-mapping/VERSION
new file mode 100644
index 000000000..cd5ac039d
--- /dev/null
+++ b/plugins/ldap-login-mapping/VERSION
@@ -0,0 +1 @@
+2.0
diff --git a/plugins/ldap-login-mapping/index.php b/plugins/ldap-login-mapping/index.php
new file mode 100644
index 000000000..ea00ee759
--- /dev/null
+++ b/plugins/ldap-login-mapping/index.php
@@ -0,0 +1,254 @@
+<?php
+
+use RainLoop\Enumerations\PluginPropertyType;
+use RainLoop\Plugins\AbstractPlugin;
+use RainLoop\Plugins\Property;
+
+class LDAPLoginMappingPlugin extends AbstractPlugin
+{
+	const
+		NAME     = 'LDAP login mapping',
+		VERSION  = '2.4',
+		AUTHOR   = 'RainLoop Team, Ludovic Pouzenc<ludovic@pouzenc.fr>, ZephOne<zephone@protonmail.com>',
+		RELEASE  = '2025-01-09',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		DESCRIPTION = 'This plugins allows to authenticate using LDAP mail field, yet login field would still be used for IMAP and SMTP authentication';
+	/**
+	 * @var array
+	 */
+	private $aDomains = array();
+
+	/**
+	 * @var string
+	 */
+	private $sSearchDomain = '';
+
+	/**
+	 * @var string
+	 */
+	private $sHostName = '127.0.0.1';
+
+	/**
+	 * @var int
+	 */
+	private $iHostPort = 389;
+
+	/**
+	 * @var string
+	 */
+	private $sUsersDn = '';
+
+	/**
+	 * @var string
+	 */
+	private $sObjectClass = 'inetOrgPerson';
+
+	/**
+	 * @var string
+	 */
+	private $sLoginField = 'uid';
+
+	/**
+	 * @var string
+	 */
+	private $sEmailField = 'mail';
+
+	/**
+	 * @var \MailSo\Log\Logger
+	 */
+	private $oLogger = null;
+
+	public function Init(): void
+	{
+		$this->addHook('login.credentials', 'FilterLoginСredentials');
+	}
+
+	/**
+	 * @return string
+	 */
+	public function Supported(): string
+	{
+		if (!\function_exists('ldap_connect'))
+		{
+			return 'The LDAP PHP extension must be installed to use this plugin';
+		}
+
+		return '';
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sImapUser
+	 * @param string $sPassword
+	 * @param string $sSmtpUser
+	 *
+	 * @throws \RainLoop\Exceptions\ClientException
+	 */
+	public function FilterLoginСredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		$this->oLogger = \RainLoop\Api::Logger();
+
+		$this->aDomains = explode(',', $this->Config()->Get('plugin', 'domains', ''));
+		$this->sSearchDomain = trim($this->Config()->Get('plugin', 'search_domain', ''));
+		$this->sHostName = trim($this->Config()->Get('plugin', 'hostname', ''));
+		$this->iHostPort = (int) $this->Config()->Get('plugin', 'port', 389);
+		$this->sUsersDn = trim($this->Config()->Get('plugin', 'users_dn', ''));
+		$this->sObjectClass = trim($this->Config()->Get('plugin', 'object_class', ''));
+		$this->sLoginField = trim($this->Config()->Get('plugin', 'login_field', ''));
+		$this->sEmailField = trim($this->Config()->Get('plugin', 'mail_field', ''));
+
+		if (0 < \strlen($this->sObjectClass) && 0 < \strlen($this->sEmailField))
+		{
+			$sIP = $_SERVER['REMOTE_ADDR'];
+			$sResult = $this->ldapSearch($sEmail);
+			if ( is_array($sResult) ) {
+				$sImapUser = $sResult['login'];
+				$sSmtpUser = $sResult['login'];
+				$sEmail = $sResult['email'];
+			}
+			syslog(LOG_WARNING, "plugins/ldap-login-mapping/index.php:FilterLoginCredentials() auth try: $sIP/$sEmail, resolved as $sImapUser/$sEmail");
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping(): array
+	{
+		return [
+			Property::NewInstance('domains')
+				->SetLabel('LDAP enabled domains')
+				->SetDefaultValue('example1.com,example2.com'),
+
+			Property::NewInstance('search_domain')
+				->SetLabel('Forced domain')
+				->SetDescription('Force this domain email for LDAP search')
+				->SetDefaultValue('example.com'),
+
+			Property::NewInstance('hostname')
+				->SetLabel('LDAP hostname')
+				->SetDefaultValue('127.0.0.1'),
+
+			Property::NewInstance('port')
+				->SetLabel('LDAP port')
+				->SetType(PluginPropertyType::INT)
+				->SetDefaultValue(389),
+
+			Property::NewInstance('users_dn')
+				->SetLabel('Search base DN')
+				->SetDescription('LDAP users search base DN. No tokens.')
+				->SetDefaultValue('ou=People,dc=domain,dc=com'),
+
+			Property::NewInstance('object_class')
+				->SetLabel('objectClass value')
+				->SetDefaultValue('inetOrgPerson'),
+
+			Property::NewInstance('login_field')
+				->SetLabel('Login field')
+				->SetDefaultValue('uid'),
+
+			Property::NewInstance('mail_field')
+				->SetLabel('Mail field')
+				->SetDefaultValue('mail'),
+		];
+	}
+
+	/**
+	 * @param string $sEmailOrLogin
+	 *
+	 * @return string
+	 */
+	private function ldapSearch($sEmail)
+	{
+		$bFound = FALSE;
+		foreach ( $this->aDomains as $sDomain ) {
+			$sRegex = '/^[a-z0-9._-]+@' . preg_quote(trim($sDomain)) . '$/i';
+			$this->oLogger->Write('DEBUG regex ' . $sRegex, \LOG_INFO, 'LDAP');
+			if ( preg_match($sRegex, $sEmail) === 1) {
+				$bFound = TRUE;
+				break;
+			}
+		}
+		if ( !$bFound ) {
+			$this->oLogger->Write(
+				'preg_match: no match in "' . $sEmail . '" for /^[a-z0-9._-]+@{configured-domains}$/i',
+				\LOG_INFO,
+				'LDAP');
+			return FALSE;
+		}
+		$sLogin = \MailSo\Base\Utils::getEmailAddressLocalPart($sEmail);
+
+		$this->oLogger->Write('ldap_connect: trying...', \LOG_INFO, 'LDAP');
+
+		$oCon = @\ldap_connect($this->sHostName, $this->iHostPort);
+		if (!$oCon) return FALSE;
+
+		$this->oLogger->Write('ldap_connect: connected', \LOG_INFO, 'LDAP');
+
+		@\ldap_set_option($oCon, LDAP_OPT_PROTOCOL_VERSION, 3);
+
+		if (!@\ldap_bind($oCon)) {
+			$this->logLdapError($oCon, 'ldap_bind');
+			return FALSE;
+		}
+		$sSearchDn = $this->sUsersDn;
+		$aItems = array($this->sLoginField, $this->sEmailField);
+		if ( 0 < \strlen($this->sSearchDomain) ) {
+			$sFilter = '(&(objectclass='.$this->sObjectClass.')(|('.$this->sEmailField.'='.$sLogin.'@'.$this->sSearchDomain.')('.$this->sLoginField.'='.$sLogin.')))';
+
+		} else {
+			$sFilter = '(&(objectclass='.$this->sObjectClass.')(|('.$this->sEmailField.'='.$sEmail.')('.$this->sLoginField.'='.$sLogin.')))';
+		}
+		$this->oLogger->Write('ldap_search: start: '.$sSearchDn.' / '.$sFilter, \LOG_INFO, 'LDAP');
+		$oS = @\ldap_search($oCon, $sSearchDn, $sFilter, $aItems, 0, 30, 30);
+		if (!$oS) {
+			$this->logLdapError($oCon, 'ldap_search');
+			return FALSE;
+		}
+		$aEntries = @\ldap_get_entries($oCon, $oS);
+		if (!is_array($aEntries)) {
+			$this->logLdapError($oCon, 'ldap_get_entries');
+			return FALSE;
+		}
+		if (!isset($aEntries[0])) {
+			$this->logLdapError($oCon, 'ldap_get_entries (no result)');
+			return FALSE;
+		}
+		if (!isset($aEntries[0][$this->sLoginField][0])) {
+			$this->logLdapError($oCon, 'ldap_get_entries (no login)');
+			return FALSE;
+		}
+		if (!isset($aEntries[0][$this->sEmailField][0])) {
+			$this->logLdapError($oCon, 'ldap_get_entries (no mail)');
+			return FALSE;
+		}
+		$sLogin = $aEntries[0][$this->sLoginField][0];
+		$sEmail = $aEntries[0][$this->sEmailField][0];
+		$this->oLogger->Write('ldap_search: found "' . $this->sLoginField . ': '.$sLogin . '" and "' . $this->sEmailField . ': '.$sEmail . '"');
+
+		return array(
+			'login' => $sLogin,
+			'email' => $sEmail,
+		);
+	}
+
+	/**
+	 * @param mixed $oCon
+	 * @param string $sCmd
+	 *
+	 * @return string
+	 */
+	private function logLdapError($oCon, $sCmd)
+	{
+		if ($this->oLogger)
+		{
+			$sError = $oCon ? @\ldap_error($oCon) : '';
+			$iErrno = $oCon ? @\ldap_errno($oCon) : 0;
+
+			$this->oLogger->Write($sCmd.' error: '.$sError.' ('.$iErrno.')',
+				\LOG_WARNING, 'LDAP');
+		}
+	}
+
+}
diff --git a/plugins/ldap-mail-accounts/LdapMailAccounts.php b/plugins/ldap-mail-accounts/LdapMailAccounts.php
new file mode 100644
index 000000000..5dc0c4eb6
--- /dev/null
+++ b/plugins/ldap-mail-accounts/LdapMailAccounts.php
@@ -0,0 +1,532 @@
+<?php
+
+use RainLoop\Enumerations\Capa;
+use MailSo\Log\Logger;
+use RainLoop\Actions;
+use RainLoop\Model\AdditionalAccount;
+use RainLoop\Model\MainAccount;
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+
+class LdapMailAccounts
+{
+	/** @var resource */
+	private $ldap;
+
+	/** @var bool */
+	private $ldapAvailable = true;
+	/** @var bool */
+	private $ldapConnected = false;
+	/** @var bool */
+	private $ldapBound = false;
+
+	/** @var LdapMailAccountsConfig */
+	private $config;
+
+	/** @var Logger */
+	private $logger;
+
+	private const LOG_KEY = "LDAP MAIL ACCOUNTS PLUGIN";
+
+	/**
+	 * LdapMailAccount constructor.
+	 *
+	 * @param LdapMailAccountsConfig $config LdapMailAccountsConfig object containing the admin configuration for this plugin
+	 * @param Logger $logger Used to write to the logfile
+	 */
+	public function __construct(LdapMailAccountsConfig $config, Logger $logger)
+	{
+		$this->config = $config;
+		$this->logger = $logger;
+
+		// Check if LDAP is available
+		if (!extension_loaded('ldap') || !function_exists('ldap_connect')) {
+			$this->ldapAvailable = false;
+			$logger->Write("The LDAP extension is not available!", \LOG_WARNING, self::LOG_KEY);
+			return;
+		}
+
+		$this->Connect();
+	}
+
+
+	/**
+	 * @inheritDoc
+	 *
+	 * Overwrite the MainAccount mail address by looking up the new one in the ldap directory
+	 *
+	 * The ldap search string has to be configured in the plugin configuration of the extension (in the SnappyMail Admin Panel)
+	 *
+	 * @param string &$sEmail
+	 */
+	public function overwriteEmail(&$sEmail)
+	{
+		try {
+			$this->EnsureBound();
+		} catch (LdapMailAccountsException $e) {
+			return false; // exceptions are only thrown from the handle error function that does logging already
+		}
+
+		// Try to get account information. IncLogin() returns the username of the user
+		// and removes the domainname if this was configured inside the domain config.
+		$username = $sEmail;
+		$oActions = \RainLoop\Api::Actions();
+		$oDomain = $oActions->DomainProvider()->Load(\MailSo\Base\Utils::getEmailAddressDomain($sEmail), true);
+		if ($oDomain->ImapSettings()->shortLogin){
+			$username = @ldap_escape($this->RemoveEventualDomainPart($sEmail), "", LDAP_ESCAPE_FILTER);
+		}
+
+		$searchString = $this->config->search_string;
+
+		// Replace placeholders inside the ldap search string with actual values
+		$searchString = str_replace("#USERNAME#", $username, $searchString);
+		$searchString = str_replace("#BASE_DN#", $this->config->base, $searchString);
+
+		$this->logger->Write("ldap search string after replacement of placeholders: $searchString", \LOG_NOTICE, self::LOG_KEY);
+
+		try {
+			$mailAddressResults = $this->FindLdapResults(
+				$this->config->field_search,
+				$searchString,
+				$this->config->base,
+				$this->config->objectclass,
+				$this->config->field_name,
+				$this->config->field_username,
+				$this->config->field_domain,
+				true,
+				$this->config->field_mail_address_main_account,
+			);
+		}
+		catch (LdapMailAccountsException $e) {
+			return false; // exceptions are only thrown from the handle error function that does logging already
+		}
+		if (count($mailAddressResults) < 1) {
+			$this->logger->Write("Could not find user $username in LDAP! Overwriting of main mail address not possible.", \LOG_NOTICE, self::LOG_KEY);
+			return false;
+		}
+
+		foreach($mailAddressResults as $mailAddressResult)
+		{
+			if($mailAddressResult->username === $username)	{
+				//$sImapUser and $sSmtpUser are already set to be the same as $sEmail by function "resolveLoginCredentials" in /RainLoop/Actions/UserAuth.php
+				//that called this hook, so we just have to overwrite the mail address
+				$sEmail = $mailAddressResult->mailMainAccount;
+			}
+		}
+	}
+
+	/**
+	 * @inheritDoc
+	 *
+	 * Add additional mail accounts to the given primary account by looking up the ldap directory
+	 *
+	 * The ldap search string has to be configured in the plugin configuration of the extension (in the SnappyMail Admin Panel)
+	 *
+	 * @param MainAccount $oAccount
+	 * @return bool true if additional accounts have been added or no additional accounts where found in ldap. false if an error occured
+	 */
+	public function AddLdapMailAccounts(MainAccount $oAccount): bool
+	{
+		try {
+			$this->EnsureBound();
+		} catch (LdapMailAccountsException $e) {
+			return false; // exceptions are only thrown from the handle error function that does logging already
+		}
+
+		//Basing on https://github.com/the-djmaze/snappymail/issues/616
+
+		$oActions = \RainLoop\Api::Actions();
+
+		//Check if SnappyMail is configured to allow additional accounts
+		if (!$oActions->GetCapa(Capa::ADDITIONAL_ACCOUNTS)) {
+			return $oActions->FalseResponse(__FUNCTION__);
+		}
+
+		// Try to get account information. ImapUser() returns the username of the user
+		// and removes the domainname if this was configured inside the domain config.
+		$username = @ldap_escape($oAccount->ImapUser(), "", LDAP_ESCAPE_FILTER);
+		
+		$searchString = $this->config->search_string;
+
+		// Replace placeholders inside the ldap search string with actual values
+		$searchString = str_replace("#USERNAME#", $username, $searchString);
+		$searchString = str_replace("#BASE_DN#", $this->config->base, $searchString);
+
+		$this->logger->Write("ldap search string after replacement of placeholders: $searchString", \LOG_NOTICE, self::LOG_KEY);
+
+		try {
+			$mailAddressResults = $this->FindLdapResults(
+				$this->config->field_search,
+				$searchString,
+				$this->config->base,
+				$this->config->objectclass,
+				$this->config->field_name,
+				$this->config->field_username,
+				$this->config->field_domain,
+				false,
+				$this->config->field_mail_address_additional_account
+			);
+		}
+		catch (LdapMailAccountsException $e) {
+			return false; // exceptions are only thrown from the handle error function that does logging already
+		}
+
+		if (count($mailAddressResults) < 1) {
+			$this->logger->Write("Could not find user $username", \LOG_NOTICE, self::LOG_KEY);
+			return false;
+		}
+
+		$aAccounts = $oActions->GetAccounts($oAccount);
+
+		//Search for accounts with suffix " (LDAP)" at the end of the name that were created by this plugin and initially remove them from the
+		//account array. This only removes the visibility but does not delete the config done by the user. So if a user looses access to a
+		//mailbox the user will not see the account anymore but the configuration can be restored when the user regains access to it
+		foreach($aAccounts as $key => $aAccount)
+		{
+			if (preg_match("/\s\(LDAP\)$/", $aAccount['name']))
+			{
+				unset($aAccounts[$key]);
+			}
+		}
+
+		//SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file .cryptkey
+		//When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
+		//On a password change using ldap (or when the password has been forgotten by the user) this makes us some problems. Therefore overwrite
+		//the .cryptkey file in order to always accept the actual ldap password of the user. This has side effects on pgp keys! 
+		//See https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061
+		if ($this->config->bool_overwrite_cryptkey) {
+			if (!$oActions->StorageProvider()->Put($oAccount, StorageType::ROOT, '.cryptkey', "")) {
+				$this->logger->Write("Could not overwrite the .cryptkey file!", \LOG_WARNING, self::LOG_KEY);
+				return $oActions->FalseResponse(__FUNCTION__);
+			}
+		}
+
+		if (count($mailAddressResults) == 1) {
+			$this->logger->Write("Found only one match for user $username, no additional mail adresses found", \LOG_NOTICE, self::LOG_KEY);
+			//Write back the accounts even if no additional account was found. This ensures, that previous additional accounts are always removed
+			$oActions->SetAccounts($oAccount, $aAccounts);
+			return true;
+		}
+
+		foreach($mailAddressResults as $mailAddressResult)
+		{
+			$sUsername = $mailAddressResult->username;
+			$sDomain = $mailAddressResult->domain;
+			$sName = $mailAddressResult->name;
+			$sEmail = $mailAddressResult->mailAdditionalAccount;
+
+			//Check if the domain of the found mail address is in the list of configured domains
+			if ($oActions->DomainProvider()->Load($sDomain, true))
+			{
+				//only execute if the found account isn't already in the list of additional accounts
+				//and if the found account is different from the main account.
+				//The check if the address is different from the one of the main account when using the Nextcloud integration needs
+				//to be done twice: directly on the mail address (when Nextcloud is configured to log the user in by mail address)
+				//or on "$sUsername@$sDomain" for the case Nextcloud logs the user in to SnappyMail by his username and a default domain.
+				if (!isset($aAccounts[$sEmail]) && $oAccount->Email() !== $sEmail && $oAccount->Email() !== "$sUsername@$sDomain")
+				{
+					//Try to login the user with the same password as the primary account has
+					//if this fails the user will see the new mail addresses but will be asked for the correct password
+					$sPass = new \SnappyMail\SensitiveString($oAccount->IncPassword());
+					//After creating the accounts here $sUsername is used as username to login to the IMAP server (see Account.php)
+					//$oNewAccount = RainLoop\Model\AdditionalAccount::NewInstanceFromCredentials($oActions, $sEmail, $sUsername, $sPass);
+
+					$oDomain = $oActions->DomainProvider()->Load($sDomain, false);
+
+					$oNewAccount = new AdditionalAccount;			
+					$oNewAccount->setCredentials(
+						$oDomain,
+						$sEmail,
+						$sUsername,
+						$sPass,
+						$sUsername
+					);
+
+					$aAccounts[$sEmail] = $oNewAccount->asTokenArray($oAccount);
+				}
+
+				//Always inject/update the found mailbox names into the array (also if the mailbox already existed)
+				if (isset($aAccounts[$sEmail]))
+				{
+					$aAccounts[$sEmail]['name'] = $sName . " (LDAP)";
+				}
+			}
+			else {
+				$this->logger->Write("Domain $sDomain is not part of configured domains in SnappyMail Admin Panel - mail address $sEmail will not be added.", \LOG_NOTICE, self::LOG_KEY);
+			}
+		}
+
+		if ($aAccounts)
+		{
+			$oActions->SetAccounts($oAccount, $aAccounts);
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Checks if a connection to the LDAP was possible
+	 *
+	 * @throws LdapMailAccountsException
+	 *
+	 * */
+	private function EnsureConnected(): void
+	{
+		if ($this->ldapConnected) return;
+
+		$res = $this->Connect();
+		if (!$res)
+			$this->HandleLdapError("Connect");
+	}
+
+	/**
+	 * Connect to the LDAP using the server address and protocol version defined inside the configuration of the plugin
+	 */
+	private function Connect(): bool
+	{
+		// Set up connection
+		$ldap = @ldap_connect($this->config->server);
+		if ($ldap === false) {
+			$this->ldapAvailable = false;
+			return false;
+		}
+
+		// Set protocol version
+		$option = @ldap_set_option($ldap, LDAP_OPT_PROTOCOL_VERSION, $this->config->protocol);
+		if (!$option) {
+			$this->ldapAvailable = false;
+			return false;
+		}
+
+		$this->ldap = $ldap;
+		$this->ldapConnected = true;
+		return true;
+	}
+
+	/**
+	 * Ensures the plugin has been authenticated at the LDAP
+	 *
+	 * @throws LdapMailAccountsException
+	 *
+	 * */
+	private function EnsureBound(): void
+	{
+		if ($this->ldapBound) return;
+		$this->EnsureConnected();
+
+		$res = $this->Bind();
+		if (!$res)
+			$this->HandleLdapError("Bind");
+	}
+
+	/**
+	 * Authenticates the plugin at the LDAP using the username and password defined inside the configuration of the plugin
+	 *
+	 * @return bool true if authentication was successful
+	 */
+	private function Bind(): bool
+	{
+		// Bind to LDAP here
+		$bindResult = @ldap_bind($this->ldap, $this->config->bind_user, $this->config->bind_password);
+		if (!$bindResult) {
+			$this->ldapAvailable = false;
+			return false;
+		}
+
+		$this->ldapBound = true;
+		return true;
+	}
+
+	/**
+	 * Handles and logs an eventual LDAP error
+	 *
+	 * @param string $op
+	 * @throws LdapMailAccountsException
+	 */
+	private function HandleLdapError(string $op = ""): void
+	{
+		// Obtain LDAP error and write logs
+		$errorNo = @ldap_errno($this->ldap);
+		$errorMsg = @ldap_error($this->ldap);
+
+		$message = empty($op) ? "LDAP Error: {$errorMsg} ({$errorNo})" : "LDAP Error during {$op}: {$errorMsg} ({$errorNo})";
+		$this->logger->Write($message, \LOG_ERR, self::LOG_KEY);
+		throw new LdapMailAccountsException($message, $errorNo);
+	}
+
+	/**
+	 * Looks up the LDAP for additional mail accounts
+	 *
+	 * The search for additional mail accounts is done by a ldap search using the defined fields inside the configuration of the plugin (SnappyMail Admin Panel)
+	 *
+	 * @param string $searchField
+	 * @param string $searchString
+	 * @param string $searchBase
+	 * @param string $objectClass
+	 * @param string $nameField
+	 * @param string $usernameField
+	 * @param string $domainField
+	 * @param bool $overwriteMailMainAccount true if the mail address of the main account should be looked up for overwriting. false if additional mail accounts should be searched
+	 * @param string $mailAddressField The field containing the mail address (of main account or additional mail account)
+	 * @return LdapMailAccountResult[]
+	 * @throws LdapMailAccountsException
+	 */
+	private function FindLdapResults(
+		string $searchField,
+		string $searchString,
+		string $searchBase,
+		string $objectClass,
+		string $nameField,
+		string $usernameField,
+		string $domainField,
+		bool $overwriteMailMainAccount,
+		string $mailAddressField): array
+	{
+		$this->EnsureBound();
+		$nameField = strtolower($nameField);
+		$usernameField = strtolower($usernameField);
+		$domainField = strtolower($domainField);
+
+		$filter = "(&(objectclass=$objectClass)($searchField=$searchString))";
+		$this->logger->Write("Used ldap filter to search for mail account(s): $filter", \LOG_NOTICE, self::LOG_KEY);
+
+		//Set together the attributes to search inside the LDAP
+		$ldapAttributes = ['dn', $usernameField, $nameField, $domainField, $mailAddressField];
+
+		$ldapResult = @ldap_search($this->ldap, $searchBase, $filter, $ldapAttributes);
+		if (!$ldapResult) {
+			$this->HandleLdapError("Fetch $objectClass");
+			return [];
+		}
+
+		$entries = @ldap_get_entries($this->ldap, $ldapResult);
+		if (!$entries) {
+			$this->HandleLdapError("Fetch $objectClass");
+			return [];
+		}
+
+		// Save the found ldap entries into a LdapMailAccountResult object and return them
+		$results = [];
+		for ($i = 0; $i < $entries["count"]; $i++) {
+			$entry = $entries[$i];
+
+			$result = new LdapMailAccountResult();
+			$result->dn = $entry["dn"];
+			$result->name = $this->LdapGetAttribute($entry, $nameField, true, true);
+
+			$result->username = $this->LdapGetAttribute($entry, $usernameField, true, true);
+			$result->username = $this->RemoveEventualDomainPart($result->username);
+
+			$result->domain = $this->LdapGetAttribute($entry, $domainField, true, true);
+			$result->domain = $this->RemoveEventualLocalPart($result->domain);
+
+			if($overwriteMailMainAccount) {
+				$result->mailMainAccount = $this->LdapGetAttribute($entry, $mailAddressField, true, true);
+			}
+			else {
+				$result->mailAdditionalAccount = $this->LdapGetAttribute($entry, $mailAddressField, true, true);
+			}
+
+			$results[] = $result;
+		}
+
+		return $results;
+	}
+
+	/**
+	 * Removes an eventually found domain-part of an email address
+	 *
+	 * If the input string contains an '@' character the function returns the local-part before the '@'\
+	 * If no '@' character can be found the input string is returned.
+	 *
+	 * @param string $sInput
+	 * @return string
+	 */
+	public static function RemoveEventualDomainPart(string $sInput) : string
+	{
+		// Copy of \MailSo\Base\Utils::getEmailAddressLocalPart to make sure that also after eventual future
+		// updates the input string gets returned when no '@' is found (getEmailAddressDomain already doesn't do this)
+		$sResult = '';
+		if (\strlen($sInput))
+		{
+			$iPos = \strrpos($sInput, '@');
+			$sResult = (false === $iPos) ? $sInput : \substr($sInput, 0, $iPos);
+		}
+
+		return $sResult;
+	}
+
+
+	/**
+	 * Removes an eventually found local-part of an email address
+	 *
+	 * If the input string contains an '@' character the function returns the domain-part behind the '@'\
+	 * If no '@' character can be found the input string is returned.
+	 *
+	 * @param string $sInput
+	 * @return string
+	 */
+	public static function RemoveEventualLocalPart(string $sInput) : string
+	{
+		$sResult = '';
+		if (\strlen($sInput))
+		{
+			$iPos = \strrpos($sInput, '@');
+			$sResult = (false === $iPos) ? $sInput : \substr($sInput, $iPos + 1);
+		}
+
+		return $sResult;
+	}
+
+
+	/**
+	 * Gets LDAP attributes out of the input array
+	 *
+	 * @param array $entry Array containing the result of a ldap search
+	 * @param string $attribute The name of the attribute to return
+	 * @param bool $single If true the function checks if exact one value for this attribute is inside the input array. If false an array is returned. Default true.
+	 * @param bool $required If true the attribute has to exist inside the input array. Default false.
+	 * @return string|string[]
+	 */
+	private function LdapGetAttribute(array $entry, string $attribute, bool $single = true, bool $required = false)
+	{
+		if (!isset($entry[$attribute])) {
+			if ($required)
+				$this->logger->Write("Attribute $attribute not found on object {$entry['dn']} while required", \LOG_NOTICE, self::LOG_KEY);
+
+			return $single ? "" : [];
+		}
+
+		if ($single) {
+			if ($entry[$attribute]["count"] > 1)
+				$this->logger->Write("Attribute $attribute is multivalues while only a single value is expected", \LOG_NOTICE, self::LOG_KEY);
+
+			return $entry[$attribute][0];
+		}
+
+		$result = $entry[$attribute];
+		unset($result["count"]);
+		return array_values($result);
+	}
+}
+
+class LdapMailAccountResult
+{
+	/** @var string */
+	public $dn;
+
+	/** @var string */
+	public $name;
+
+	/** @var string */
+	public $username;
+
+	/** @var string */
+	public $domain;
+
+	/** @var string */
+	public $mailMainAccount;
+
+	/** @var string */
+	public $mailAdditionalAccount;
+}
diff --git a/plugins/ldap-mail-accounts/LdapMailAccountsConfig.php b/plugins/ldap-mail-accounts/LdapMailAccountsConfig.php
new file mode 100644
index 000000000..8b674e4f2
--- /dev/null
+++ b/plugins/ldap-mail-accounts/LdapMailAccountsConfig.php
@@ -0,0 +1,63 @@
+<?php
+
+
+use RainLoop\Config\Plugin;
+
+class LdapMailAccountsConfig
+{
+	public const CONFIG_SERVER = "server";
+	public const CONFIG_PROTOCOL_VERSION = "server_version";
+
+	public const CONFIG_BIND_USER = "bind_user";
+	public const CONFIG_BIND_PASSWORD = "bind_password";
+
+	public const CONFIG_BASE = "base";
+	public const CONFIG_OBJECTCLASS = "objectclass";
+	public const CONFIG_FIELD_NAME = "field_name";
+	public const CONFIG_FIELD_SEARCH = "field_search";
+	public const CONFIG_FIELD_USERNAME = "field_username";
+	public const CONFIG_SEARCH_STRING = "search_string";
+	public const CONFIG_FIELD_MAIL_DOMAIN = "field_domain";
+	public const CONFIG_FIELD_MAIL_ADDRESS_ADDITIONAL_ACCOUNT = "field_mail_address_additional_account";
+	public const CONFIG_BOOL_OVERWRITE_MAIL_ADDRESS_MAIN_ACCOUNT = "bool_overwrite_mail_address_main_account";
+	public const CONFIG_FIELD_MAIL_ADDRESS_MAIN_ACCOUNT = "field_mail_address_main_account";
+	public const CONFIG_BOOL_OVERWRITE_CRYPTKEY = "bool_overwrite_cryptkey";
+
+	public $server;
+	public $protocol;
+	public $bind_user;
+	public $bind_password;
+	public $base;
+	public $objectclass;
+	public $field_name;
+	public $field_search;
+	public $field_username;
+	public $search_string;
+	public $field_domain;
+	public $field_mail_address_main_account;
+	public $field_mail_address_additional_account;
+	public $bool_overwrite_mail_address_main_account;
+	public $bool_overwrite_cryptkey;
+
+	public static function MakeConfig(Plugin $config): LdapMailAccountsConfig
+	{
+		$ldap = new self();
+		$ldap->server = trim($config->Get("plugin", self::CONFIG_SERVER));
+		$ldap->protocol = (int)trim($config->Get("plugin", self::CONFIG_PROTOCOL_VERSION, 3));
+		$ldap->bind_user = trim($config->Get("plugin", self::CONFIG_BIND_USER));
+		$ldap->bind_password = trim($config->Get("plugin", self::CONFIG_BIND_PASSWORD));
+		$ldap->base = trim($config->Get("plugin", self::CONFIG_BASE));
+		$ldap->objectclass = trim($config->Get("plugin", self::CONFIG_OBJECTCLASS));
+		$ldap->field_name = trim($config->Get("plugin", self::CONFIG_FIELD_NAME));
+		$ldap->field_search = trim($config->Get("plugin", self::CONFIG_FIELD_SEARCH));
+		$ldap->field_username = trim($config->Get("plugin", self::CONFIG_FIELD_USERNAME));
+		$ldap->search_string = trim($config->Get("plugin", self::CONFIG_SEARCH_STRING));
+		$ldap->field_domain = trim($config->Get("plugin", self::CONFIG_FIELD_MAIL_DOMAIN));
+		$ldap->field_mail_address_additional_account = trim($config->Get("plugin", self::CONFIG_FIELD_MAIL_ADDRESS_ADDITIONAL_ACCOUNT));
+		$ldap->bool_overwrite_mail_address_main_account = $config->Get("plugin", self::CONFIG_BOOL_OVERWRITE_MAIL_ADDRESS_MAIN_ACCOUNT);
+		$ldap->field_mail_address_main_account = trim($config->Get("plugin", self::CONFIG_FIELD_MAIL_ADDRESS_MAIN_ACCOUNT));
+		$ldap->bool_overwrite_cryptkey = $config->Get("plugin", self::CONFIG_BOOL_OVERWRITE_CRYPTKEY);
+
+		return $ldap;
+	}
+}
\ No newline at end of file
diff --git a/plugins/ldap-mail-accounts/LdapMailAccountsException.php b/plugins/ldap-mail-accounts/LdapMailAccountsException.php
new file mode 100644
index 000000000..3135cc14b
--- /dev/null
+++ b/plugins/ldap-mail-accounts/LdapMailAccountsException.php
@@ -0,0 +1,5 @@
+<?php
+
+class LdapMailAccountsException extends \RainLoop\Exceptions\ClientException
+{
+}
\ No newline at end of file
diff --git a/plugins/ldap-mail-accounts/README.md b/plugins/ldap-mail-accounts/README.md
new file mode 100644
index 000000000..d26d6302d
--- /dev/null
+++ b/plugins/ldap-mail-accounts/README.md
@@ -0,0 +1,29 @@
+## LDAP Mail Accounts Plugin for SnappyMail
+
+### Description
+This plugin can be used to add additional mail accounts to SnappyMail when a user logs in successfully. The list of additional accounts is retrieved by a ldap query that can be configured inside the plugin settings.\
+On a successful login the username of the SnappyMail user is passed to the plugin and will be searched in the ldap. If additional mail accounts are found, the username and domain-part of those will be used to add the new mail account. The plugin tries to log in the user with the same password used to login to SnappyMail - if this fails SnappyMail asks the user to insert his credentials.
+
+Version 2.0.0 changes the way additional mail accounts get their e-mail address: the mail address connected with additional mail accounts is now always the address found inside the ldap.
+Now it is also possible to overwrite the mail address of the main account: if a user logs into SnappyMail with a username and SnappyMail added the configured default domain the mail address of the main account could have been some not existing address like "username@default-domain.com". This could have happend when using the Nextcloud SnappyMail integration that offers an automatic login using the Nextcloud username.
+The plugin now can be configured to overwrite the username or mail address used at login with a mail address found inside ldap.
+
+Version 2.2.0 adds compatibility with SnappyMail 2.36.1 and later where some changes were introduced that made the plugin unusable. This version also adds the possibility to delete the .cryptkey file on evere login. For more information see the `Configuration` section below.
+
+### Configuration
+- Install and activate the plugin using the SnappyMail Admin Panel -> menu Extensions.
+- Click on the gear symbol beside the plugin to open the configration dialog.
+    - Insert the connection data to access your LDAP. Leave username and password empty for an anonymous login.
+    - The fields `Object class`, `Base DN`, `Search field` and `LDAP search string` are used to put together a ldap search filter which will return the additional mail accounts of a user:\
+    `(&(objectclass=<YOUR OBJECT CLASS>)(<YOUR SEARCH FIELD>=<YOUR SEARCH STRING>))`.\
+    This filter will be executed on the `Base DN` you have defined. `LDAP search string` can contain the placeholders `#USERNAME#` (will be replaced with the username the user logged in to Snappymail) and `#BASE_DN#` (will be replaced with the value you inserted into the field `Base DN` inside the plugin settings). This will allow you to create more complex search strings like `uid=#USERNAME#`.
+    - `Username field`, `Domain name field of additional account`, `Mail address field for additional account` and `Additional account name field` are used to define the ldap attributes to read when the ldap search was successful. For example insert `mail` into the `Username field` and the `Domain name field of additional account` to use the [local-part](https://en.wikipedia.org/wiki/Email_address#Local-part) of the mail address as username and the [domain-part](https://en.wikipedia.org/wiki/Email_address#Domain) as domain for the additional account.\
+    `Username field` and `Domain name field of additional account` before use get checked by the plugin if they contain a mail address and if true only the local-part or domain-part is returned. If no `@` is found the content of the found ldap attribute is returned without modification. This can be usefull if your user should login with something different than the mail address (a username that is diffrent from the local-part of the mail address).
+
+    Section `Overwrite mail address of main account` can be used to overwrite the username or mail address used at login with a value found in ldap. If activated, the username or mail address used at login will be looked up inside the `Username field` in ldap (for details see how a search for additional accounts is made). If the username is found, the value of the field `Mail address field for main account` will be used to overwrite the mail address of the main account.
+
+    `Overwrite user cryptkey` can be activated to prevent SnappyMail from asking the user for his old LDAP password when this password was changed or reseted. SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file `.cryptkey`. When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
+	On a password change using ldap (or when the password has been forgotten by the user) this makes problems and asks the user to insert the old password. Therefore activating this option overwrites the .cryptkey file on login in order to always accept the actual ldap password of the user.
+	**ATTENTION:** This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore! See https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061 . This has also an impact on additional mail accounts that aren't created by this plugin because without the cryptkey saved passwords of additional mail accounts can not be decrypted anymore.
+
+**Important:** SnappyMail normally needs a mail address as username. This plugin handles some special circumstances (login with an ldap username, not a mail address) so that you can login to your IMAP server with the ldap username but send mails with a mail address connected to this ldap user.
diff --git a/plugins/ldap-mail-accounts/index.php b/plugins/ldap-mail-accounts/index.php
new file mode 100644
index 000000000..bc53ad4f4
--- /dev/null
+++ b/plugins/ldap-mail-accounts/index.php
@@ -0,0 +1,192 @@
+<?php
+
+use RainLoop\Enumerations\Capa;
+use RainLoop\Enumerations\PluginPropertyType;
+use RainLoop\Plugins\AbstractPlugin;
+use RainLoop\Plugins\Property;
+use RainLoop\Model\MainAccount;
+use RainLoop\Actions;
+
+
+class LdapMailAccountsPlugin extends AbstractPlugin
+{
+	const
+		NAME     = 'LDAP Mail Accounts',
+		VERSION  = '2.2.1',
+		AUTHOR   = 'cm-schl',
+		URL      = 'https://github.com/cm-sch',
+		RELEASE  = '2024-09-20',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Accounts',
+		DESCRIPTION = 'Add additional mail accounts the SnappyMail user has access to by a LDAP query. Basing on the work of FWest98 (https://github.com/FWest98).';
+
+	public function __construct()
+	{
+		include_once __DIR__ . '/LdapMailAccounts.php';
+		include_once __DIR__ . '/LdapMailAccountsConfig.php';
+		include_once __DIR__ . '/LdapMailAccountsException.php';
+
+		parent::__construct();
+	}
+
+	public function Init(): void
+	{
+		$this->addHook("login.success", 'AddAdditionalLdapMailAccounts');
+		$this->addHook('login.credentials', 'overwriteMainAccountEmail');
+	}
+
+	// Function gets called by RainLoop/Actions/UserAuth.php
+	/**
+	 * Overwrite the MainAccount mail address by looking up the new one in the ldap directory
+	 *
+	 * @param string &$sEmail
+	 * @param string &$sImapUser
+	 * @param string &$sPassword
+	 * @param string &$sSmtpUser
+	 */
+	public function overwriteMainAccountEmail(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		$this->Manager()->Actions()->Logger()->Write("Login DATA: login: $sImapUser email: $sEmail", \LOG_WARNING, "LDAP MAIL ACCOUNTS PLUGIN");
+
+		// Set up config
+		$config = LdapMailAccountsConfig::MakeConfig($this->Config());
+
+		if ($config->bool_overwrite_mail_address_main_account)
+		{
+			$oldapMailAccounts = new LdapMailAccounts($config, $this->Manager()->Actions()->Logger());
+			$oldapMailAccounts->overwriteEmail($sEmail);
+		}
+
+		$this->Manager()->Actions()->Logger()->Write("Login DATA: login: $sImapUser email: $sEmail", \LOG_WARNING, "LDAP MAIL ACCOUNTS PLUGIN");
+	}
+
+	// Function gets called by RainLoop/Actions/User.php
+	/**
+	 * Add additional mail accounts to the webinterface of the user by looking up the ldap directory
+	 *
+	 * @param MainAccount $oAccount
+	 */
+	public function AddAdditionalLdapMailAccounts(MainAccount $oAccount)
+	{
+		// Set up config
+		$config = LdapMailAccountsConfig::MakeConfig($this->Config());
+		$oldapMailAccounts = new LdapMailAccounts($config, $this->Manager()->Actions()->Logger());
+		$oldapMailAccounts->AddLdapMailAccounts($oAccount);
+	}
+
+	/**
+	 * Defines the content of the plugin configuration page inside the Admin Panel of SnappyMail
+	 */
+	protected function configMapping(): array
+	{
+		$groupOverwriteMainAccount = new \RainLoop\Plugins\PropertyCollection('Overwrite mail address of main account');
+		$groupOverwriteMainAccount->exchangeArray([
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_BOOL_OVERWRITE_MAIL_ADDRESS_MAIN_ACCOUNT)->SetLabel('Enabled')
+			->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+			->SetDefaultValue(false),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_MAIL_ADDRESS_MAIN_ACCOUNT)
+				->SetLabel("Mail address field for main account")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The ldap field containing the mail address to use on the SnappyMail main account.
+					\nThe value found inside ldap will overwrite the mail address of the SnappyMail main account (the account the user logged in at SnappyMail)
+					\nThe mail address used at login will still be used to login to the servers.")
+				->SetDefaultValue("mail"),
+		]);
+
+		$groupAdditionalSettings = new \RainLoop\Plugins\PropertyCollection('Additional settings');
+		$groupAdditionalSettings->exchangeArray([
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_BOOL_OVERWRITE_CRYPTKEY)->SetLabel('Overwrite user cryptkey')
+			->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+			->SetDescription("SnappyMail saves the passwords of the additional accounts by encrypting them using a cryptkey that is saved in the file \".cryptkey\". When the password of the main account changes, SnappyMail asks the user for the old password to reencrypt the keys with the new userpassword.
+				\nOn a password change using ldap (or when the password has been forgotten by the user) this makes problems and asks the user to insert the old password. Therefore activating this option overwrites the .cryptkey file on login in order to always accept the actual ldap password of the user.
+				\nATTENTION: This has side effects on pgp keys because these are also secured by the cryptkey and could therefore not be accessible anymore!
+				\nSee https://github.com/the-djmaze/snappymail/issues/1570#issuecomment-2085528061")
+			->SetDefaultValue(false),
+		]);
+
+		return [
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_SERVER)
+				->SetLabel("LDAP Server URL")
+				->SetPlaceholder("ldap://server:port")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_PROTOCOL_VERSION)
+				->SetLabel("LDAP Protocol Version")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::SELECTION)
+				->SetDefaultValue([2, 3]),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_BIND_USER)
+				->SetLabel("LDAP Username")
+				->SetDescription("The user to use for binding to the LDAP server. Should be a DN or RDN. Leave empty for anonymous bind.")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_BIND_PASSWORD)
+				->SetLabel("LDAP Password")
+				->SetDescription("Leave empty for anonymous bind.")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::PASSWORD),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_OBJECTCLASS)
+				->SetLabel("Object class")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The object class to use when searching for additional mail accounts of the logged in SnappyMail user")
+				->SetDefaultValue("user"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_BASE)
+				->SetLabel("Base DN")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The base DN to search in for additional mail accounts of the logged in SnappyMail user"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_SEARCH)
+				->SetLabel("Search field")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The name of the ldap attribute that has to contain the here defined 'LDAP search string'.")
+				->SetDefaultValue("member"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_SEARCH_STRING)
+				->SetLabel("LDAP search string")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The search string used to find ldap objects of mail accounts the user has access to.
+					\nPossible placeholers:\n#USERNAME# - replaced with the username of the actual SnappyMail user
+					\n#BASE_DN# - replaced with the value inside the field 'User base DN'.")
+				->SetDefaultValue("uid=#USERNAME#"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_USERNAME)
+				->SetLabel("Username field")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("Used when searching for additional accounts or when overwriting the mail address of the main account.
+					\nThe field containing the username of the mail account.
+					\nWhen looking up additional accounts:
+					\nIf this field contains an email address, only the local-part before the @ is used. The domain part is retrieved configuring the field below. This username gets used by SnappyMail to login to the additional mail account
+					\nWhen overwriting the main account mail address:
+					\nThe username from SnappyMail login gets used to search an LDAP entry containig a field with the same username.")
+				->SetDefaultValue("uid"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_MAIL_DOMAIN)
+				->SetLabel("Domain name field of additional account")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The field containing the domain name of the found additional mail account.
+					\nThis domain gets looked up by SnappyMail to choose the right connection parameters at logging in to the additional mail account.
+					\nIf this field contains an email address, only the domain-part after the @ is used.")
+				->SetDefaultValue("mail"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_MAIL_ADDRESS_ADDITIONAL_ACCOUNT)
+				->SetLabel("Mail address field for additional account")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The ldap field containing the mail address to use on the found additional mail account.
+					\nThe value found inside ldap will be used as mail address of the additional mail accounts created by this plugin.
+					\nIn most cases this could be the same ldap field as in \"Domain name field of additional account\"")
+				->SetDefaultValue("mail"),
+
+			\RainLoop\Plugins\Property::NewInstance(LdapMailAccountsConfig::CONFIG_FIELD_NAME)
+				->SetLabel("Additional account name field")
+				->SetType(RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetDescription("The field containing the default sender name of the found additional mail account.")
+				->SetDefaultValue("displayName"),
+
+			$groupOverwriteMainAccount,
+
+			$groupAdditionalSettings
+		];
+	}
+}
diff --git a/plugins/login-autoconfig/LICENSE b/plugins/login-autoconfig/LICENSE
new file mode 100644
index 000000000..61aa05084
--- /dev/null
+++ b/plugins/login-autoconfig/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2024 SnappyMail
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-autoconfig/index.php b/plugins/login-autoconfig/index.php
new file mode 100644
index 000000000..ba23a9b92
--- /dev/null
+++ b/plugins/login-autoconfig/index.php
@@ -0,0 +1,78 @@
+<?php
+/**
+ * https://datatracker.ietf.org/doc/draft-bucksch-autoconfig/
+ */
+
+use MailSo\Net\Enumerations\ConnectionSecurityType;
+
+class LoginAutoconfigPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login Autoconfig',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.1',
+		RELEASE  = '2024-03-12',
+		REQUIRED = '2.35.3',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Tries to login using the domain autoconfig';
+
+	public function Init() : void
+	{
+		$this->addHook('login.credentials.step-1', 'detect');
+	}
+
+	public function detect(string $sEmail) : void
+	{
+		if (\str_contains($sEmail, '@')) {
+			$oProvider = $this->Manager()->Actions()->DomainProvider();
+			$sDomain = \MailSo\Base\Utils::getEmailAddressDomain($sEmail);
+			$oDomain = $oProvider->Load($sDomain, false);
+			if (!$oDomain) {
+				$result = \RainLoop\Providers\Domain\Autoconfig::discover($sEmail);
+				if ($result) {
+					$typeIMAP = ConnectionSecurityType::AUTO_DETECT;
+					if ('STARTTLS' === $result['incomingServer'][0]['socketType']) {
+						$typeIMAP = ConnectionSecurityType::STARTTLS;
+					} else if ('SSL' === $result['incomingServer'][0]['socketType']) {
+						$typeIMAP = ConnectionSecurityType::SSL;
+					}
+					$typeSMTP = ConnectionSecurityType::AUTO_DETECT;
+					if ('STARTTLS' === $result['outgoingServer'][0]['socketType']) {
+						$typeSMTP = ConnectionSecurityType::STARTTLS;
+					} else if ('SSL' === $result['outgoingServer'][0]['socketType']) {
+						$typeSMTP = ConnectionSecurityType::SSL;
+					}
+					$oDomain = \RainLoop\Model\Domain::fromArray($sDomain, [
+						'IMAP' => [
+							'host' => $result['incomingServer'][0]['hostname'],
+							'port' => $result['incomingServer'][0]['port'],
+							'type' => $typeIMAP,
+							'shortLogin' => '%EMAILADDRESS%' !== $result['incomingServer'][0]['username'],
+//							'ssl' => []
+						],
+						'SMTP' => [
+							'host' => $result['outgoingServer'][0]['hostname'],
+							'port' => $result['outgoingServer'][0]['port'],
+							'type' => $typeSMTP,
+							'shortLogin' => '%EMAILADDRESS%' !== $result['outgoingServer'][0]['username'],
+//							'useAuth' => !empty($result['authentication']),
+						],
+						'Sieve' => [
+							'host' => $result['incomingServer'][0]['hostname'],
+							'port' => $result['incomingServer'][0]['port'],
+							'type' => $typeIMAP,
+							'shortLogin' => '%EMAILADDRESS%' !== $result['incomingServer'][0]['username'],
+							'enabled' => false
+						],
+						'whiteList' => ''
+					]);
+					$oProvider->Save($oDomain);
+					\SnappyMail\Log::notice('Autoconfig', "Domain setup for '{$sDomain}' is created and active");
+				}
+			}
+		}
+	}
+
+}
diff --git a/plugins/login-cpanel/LICENSE b/plugins/login-cpanel/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-cpanel/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-cpanel/index.php b/plugins/login-cpanel/index.php
new file mode 100644
index 000000000..9bc5ebf7a
--- /dev/null
+++ b/plugins/login-cpanel/index.php
@@ -0,0 +1,77 @@
+<?php
+
+class LogincPanelPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login cPanel',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.4',
+		RELEASE  = '2024-03-27',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Tries to login using the cPanel $_ENV["REMOTE_*"] variables';
+
+	public function Init() : void
+	{
+		$this->addPartHook('cPanelAutoLogin', 'AutoLogin');
+		$this->addHook('filter.app-data', 'FilterAppData');
+		$this->addHook('login.credentials', 'FilterLoginCredentials');
+	}
+
+	public function FilterAppData($bAdmin, &$aResult)
+	{
+		if (!$bAdmin && \is_array($aResult) && empty($aResult['Auth']) && isset($_ENV['REMOTE_USER'])) {
+			$aResult['DevEmail'] = $_ENV['REMOTE_USER'];
+//			$aResult['DevPassword'] = $_ENV['REMOTE_PASSWORD'];
+		}
+	}
+
+	private static bool $login = false;
+	public function AutoLogin() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+
+		$oException = null;
+		$oAccount = null;
+
+		$sEmail = $_ENV['REMOTE_USER'] ?? '';
+		$sPassword = $_ENV['REMOTE_PASSWORD'] ?? '';
+
+		if (\strlen($sEmail) && \strlen($sPassword)) {
+			try
+			{
+				static::$login = true;
+				$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+			}
+			catch (\Throwable $oException)
+			{
+				$oLogger = $oActions->Logger();
+				$oLogger && $oLogger->WriteException($oException);
+			}
+		}
+
+		\MailSo\Base\Http::Location('./');
+		return true;
+	}
+
+	public function FilterLoginCredentials(&$sEmail, &$sImapUser, &$sPassword, &$sSmtpUser)
+	{
+		// cPanel https://github.com/the-djmaze/snappymail/issues/697
+//		 && !empty($_ENV['CPANEL'])
+		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
+			if (empty($_ENV['REMOTE_TEMP_USER'])) {
+				$iPos = \strpos($sPassword, '[::cpses::]');
+				if ($iPos) {
+					$_ENV['REMOTE_TEMP_USER'] = \substr($sPassword, 0, $iPos);
+				}
+			}
+			if (!empty($_ENV['REMOTE_TEMP_USER'])) {
+				$sImapUser = $_ENV['REMOTE_USER'] . '/' . $_ENV['REMOTE_TEMP_USER'];
+				$sSmtpUser = $_ENV['REMOTE_USER'] . '/' . $_ENV['REMOTE_TEMP_USER'];
+			}
+		}
+	}
+
+}
diff --git a/plugins/login-external-sso/LICENSE b/plugins/login-external-sso/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-external-sso/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-external-sso/index.php b/plugins/login-external-sso/index.php
new file mode 100644
index 000000000..f3a215b04
--- /dev/null
+++ b/plugins/login-external-sso/index.php
@@ -0,0 +1,56 @@
+<?php
+
+class LoginExternalSsoPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login External SSO',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.0',
+		RELEASE  = '2022-11-11',
+		REQUIRED = '2.21.0',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Login with $_POST "Email", "Password" and "SsoKey". It returns an SSO hash to use with "?Sso&hash="';
+
+	public function Init() : void
+	{
+		$this->addPartHook('ExternalSso', 'ServiceExternalSso');
+	}
+
+	public function ServiceExternalSso() : string
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->Http()->ServerNoCache();
+		$sKey = $this->Config()->Get('plugin', 'key', '');
+		$sEmail = isset($_POST['Email']) ? $_POST['Email'] : '';
+		$sPassword = isset($_POST['Password']) ? $_POST['Password'] : '';
+		if ($sEmail && $sPassword && $sKey && isset($_POST['SsoKey']) && $_POST['SsoKey'] == $sKey) {
+			$sResult = \RainLoop\Api::CreateUserSsoHash($sEmail, $sPassword);
+			if (isset($_POST['Output']) && 'json' === \strtolower($_POST['Output'])) {
+				\header('Content-Type: application/json; charset=utf-8');
+				echo \json_encode(array(
+					'Action' => 'ExternalSso',
+					'Result' => $sResult
+				));
+			} else {
+				\header('Content-Type: text/plain');
+				echo $sResult;
+			}
+		}
+		return true;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function configMapping() : array
+	{
+		return array(
+			// Was application.ini external_sso_key
+			\RainLoop\Plugins\Property::NewInstance('key')->SetLabel('SSO key')
+				->SetDefaultValue(''),
+		);
+	}
+
+}
diff --git a/plugins/login-external/LICENSE b/plugins/login-external/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-external/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-external/index.php b/plugins/login-external/index.php
new file mode 100644
index 000000000..9929d5b2e
--- /dev/null
+++ b/plugins/login-external/index.php
@@ -0,0 +1,69 @@
+<?php
+
+class LoginExternalPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login External',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.4',
+		RELEASE  = '2024-07-01',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Login with $_POST["Email"] and $_POST["Password"] from anywhere';
+
+	public function Init() : void
+	{
+		$this->addPartHook('ExternalLogin', 'ServiceExternalLogin');
+	}
+
+	public function ServiceExternalLogin() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->Http()->ServerNoCache();
+
+		$oAccount = null;
+		$oException = null;
+
+		$sEmail = isset($_POST['Email']) ? $_POST['Email'] : '';
+		$sPassword = isset($_POST['Password']) ? $_POST['Password'] : '';
+
+		try
+		{
+			// Convert password to SensitiveString type
+			$oPassword = new \SnappyMail\SensitiveString($sPassword);
+			$oAccount = $oActions->LoginProcess($sEmail, $oPassword);
+			if (!$oAccount instanceof \RainLoop\Model\MainAccount) {
+				$oAccount = null;
+				\SnappyMail\LOG::info(\get_class($this), 'LoginProcess failed');
+			}
+		}
+		catch (\Throwable $oException)
+		{
+			$oLogger = $oActions->Logger();
+			$oLogger && $oLogger->WriteException($oException);
+		}
+
+		if (isset($_POST['Output']) && 'json' === \strtolower($_POST['Output'])) {
+			\header('Content-Type: application/json; charset=utf-8');
+			$aResult = array(
+				'Action' => 'ExternalLogin',
+				'Result' => $oAccount ? true : false,
+				'ErrorCode' => 0
+			);
+			if (!$oAccount) {
+				if ($oException instanceof \RainLoop\Exceptions\ClientException) {
+					$aResult['ErrorCode'] = $oException->getCode();
+				} else {
+					$aResult['ErrorCode'] = \RainLoop\Notifications::AuthError;
+				}
+			}
+			echo \json_encode($aResult);
+		} else {
+			\MailSo\Base\Http::Location('./');
+		}
+		return true;
+	}
+
+}
diff --git a/plugins/login-gmail/LoginOAuth2.js b/plugins/login-gmail/LoginOAuth2.js
new file mode 100644
index 000000000..efee7ad60
--- /dev/null
+++ b/plugins/login-gmail/LoginOAuth2.js
@@ -0,0 +1,46 @@
+(rl => {
+	const client_id = rl.pluginSettingsGet('login-gmail', 'client_id'),
+		login = () => {
+			document.location = 'https://accounts.google.com/o/oauth2/auth?' + (new URLSearchParams({
+				response_type: 'code',
+				client_id: client_id,
+				redirect_uri: document.location.href + '?LoginGMail',
+				scope: [
+					// Primary Google Account email address
+					'https://www.googleapis.com/auth/userinfo.email',
+					// Personal info
+					'https://www.googleapis.com/auth/userinfo.profile',
+					// Associate personal info
+					'openid',
+					// Access IMAP and SMTP through OAUTH
+					'https://mail.google.com/'
+				].join(' '),
+				state: 'gmail', // + rl.settings.app('token') + localStorage.getItem('smctoken')
+				// Force authorize screen, so we always get a refresh_token
+				access_type: 'offline',
+				prompt: 'consent'
+			}));
+		};
+
+	if (client_id) {
+		addEventListener('sm-user-login', e => {
+			if (event.detail.get('Email').includes('@gmail.com')) {
+				e.preventDefault();
+				login();
+			}
+		});
+
+		addEventListener('rl-view-model', e => {
+			if ('Login' === e.detail.viewModelTemplateID) {
+				const
+					container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
+					btn = Element.fromHTML('<button type="button">GMail</button>'),
+					div = Element.fromHTML('<div class="controls"></div>');
+				btn.onclick = login;
+				div.append(btn);
+				container && container.append(div);
+			}
+		});
+	}
+
+})(window.rl);
diff --git a/plugins/login-gmail/index.php b/plugins/login-gmail/index.php
new file mode 100644
index 000000000..a6b8d3f9d
--- /dev/null
+++ b/plugins/login-gmail/index.php
@@ -0,0 +1,223 @@
+<?php
+
+/**
+ * https://developers.google.com/gmail/imap/imap-smtp
+ * https://developers.google.com/gmail/imap/xoauth2-protocol
+ * https://console.cloud.google.com/apis/dashboard
+ */
+
+use RainLoop\Model\MainAccount;
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+
+class LoginGMailPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login GMail OAuth2',
+		VERSION  = '2.37',
+		RELEASE  = '2024-07-15',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		DESCRIPTION = 'GMail IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
+
+	const
+		LOGIN_URI = 'https://accounts.google.com/o/oauth2/auth',
+		TOKEN_URI = 'https://accounts.google.com/o/oauth2/token';
+
+	private static ?array $auth = null;
+
+	public function Init() : void
+	{
+		$this->UseLangs(true);
+		$this->addJs('LoginOAuth2.js');
+		$this->addHook('imap.before-login', 'clientLogin');
+		$this->addHook('smtp.before-login', 'clientLogin');
+		$this->addHook('sieve.before-login', 'clientLogin');
+
+		$this->addPartHook('LoginGMail', 'ServiceLoginGMail');
+
+		// Prevent Disallowed Sec-Fetch Dest: document Mode: navigate Site: cross-site User: true
+		$this->addHook('filter.http-paths', 'httpPaths');
+	}
+
+	public function httpPaths(array $aPaths) : void
+	{
+		if (!empty($aPaths[0]) && 'LoginGMail' === $aPaths[0]) {
+			$oConfig = \RainLoop\Api::Config();
+			$oConfig->Set('security', 'secfetch_allow',
+				\trim($oConfig->Get('security', 'secfetch_allow', '') . ';site=cross-site', ';')
+			);
+		}
+	}
+
+	public function ServiceLoginGMail() : string
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oHttp = $oActions->Http();
+		$oHttp->ServerNoCache();
+
+		$uri = \preg_replace('/.LoginGMail.*$/D', '', $_SERVER['REQUEST_URI']);
+
+		try
+		{
+			if (isset($_GET['error'])) {
+				throw new \RuntimeException($_GET['error']);
+			}
+			if (isset($_GET['code']) && isset($_GET['state']) && 'gmail' === $_GET['state']) {
+				$oGMail = $this->gmailConnector();
+			}
+			if (empty($oGMail)) {
+				$oActions->Location($uri);
+				exit;
+			}
+
+			$iExpires = \time();
+			$aResponse = $oGMail->getAccessToken(
+				static::TOKEN_URI,
+				'authorization_code',
+				array(
+					'code' => $_GET['code'],
+					'redirect_uri' => $oHttp->GetFullUrl().'?LoginGMail'
+				)
+			);
+			if (200 != $aResponse['code']) {
+				if (isset($aResponse['result']['error'])) {
+					throw new \RuntimeException(
+						$aResponse['code']
+						. ': '
+						. $aResponse['result']['error']
+						. ' / '
+						. $aResponse['result']['error_description']
+					);
+				}
+				throw new \RuntimeException("HTTP: {$aResponse['code']}");
+			}
+			$aResponse = $aResponse['result'];
+			if (empty($aResponse['access_token'])) {
+				throw new \RuntimeException('access_token missing');
+			}
+			if (empty($aResponse['refresh_token'])) {
+				throw new \RuntimeException('refresh_token missing');
+			}
+
+			$sAccessToken = $aResponse['access_token'];
+			$iExpires += $aResponse['expires_in'];
+
+			$oGMail->setAccessToken($sAccessToken);
+			$aUserInfo = $oGMail->fetch('https://www.googleapis.com/oauth2/v2/userinfo');
+			if (200 != $aUserInfo['code']) {
+				throw new \RuntimeException("HTTP: {$aResponse['code']}");
+			}
+			$aUserInfo = $aUserInfo['result'];
+			if (empty($aUserInfo['id'])) {
+				throw new \RuntimeException('unknown id');
+			}
+			if (empty($aUserInfo['email'])) {
+				throw new \RuntimeException('unknown email address');
+			}
+
+			static::$auth = [
+				'access_token' => $sAccessToken,
+				'refresh_token' => $aResponse['refresh_token'],
+				'expires_in' => $aResponse['expires_in'],
+				'expires' => $iExpires
+			];
+
+			$oPassword = new \SnappyMail\SensitiveString($aUserInfo['id']);
+			$oAccount = $oActions->LoginProcess($aUserInfo['email'], $oPassword);
+//			$oAccount = MainAccount::NewInstanceFromCredentials($oActions, $aUserInfo['email'], $aUserInfo['email'], $oPassword, true);
+			if ($oAccount) {
+//				$oActions->SetMainAuthAccount($oAccount);
+//				$oActions->SetAuthToken($oAccount);
+				$oActions->StorageProvider()->Put($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken(),
+					\SnappyMail\Crypt::EncryptToJSON(static::$auth, $oAccount->CryptKey())
+				);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$oActions->Logger()->WriteException($oException, \LOG_ERR);
+		}
+		$oActions->Location($uri);
+		exit;
+	}
+
+	public function configMapping() : array
+	{
+		return [
+			\RainLoop\Plugins\Property::NewInstance('client_id')
+				->SetLabel('Client ID')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetAllowedInJs()
+				->SetDescription('https://github.com/the-djmaze/snappymail/wiki/FAQ#gmail'),
+			\RainLoop\Plugins\Property::NewInstance('client_secret')
+				->SetLabel('Client Secret')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+				->SetEncrypted()
+		];
+	}
+
+	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
+	{
+		if ($oAccount instanceof MainAccount && \str_ends_with($oAccount->Email(), '@gmail.com')) {
+			$oActions = \RainLoop\Api::Actions();
+			try {
+				$aData = static::$auth ?: \SnappyMail\Crypt::DecryptFromJSON(
+					$oActions->StorageProvider()->Get($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken()),
+					$oAccount->CryptKey()
+				);
+			} catch (\Throwable $oException) {
+//				$oActions->Logger()->WriteException($oException, \LOG_ERR);
+				return;
+			}
+			if (!empty($aData['expires']) && !empty($aData['access_token']) && !empty($aData['refresh_token'])) {
+				if (\time() >= $aData['expires']) {
+					$iExpires = \time();
+					$oGMail = $this->gmailConnector();
+					if ($oGMail) {
+						$aRefreshTokenResponse = $oGMail->getAccessToken(
+							static::TOKEN_URI,
+							'refresh_token',
+							array('refresh_token' => $aData['refresh_token'])
+						);
+						if (!empty($aRefreshTokenResponse['result']['access_token'])) {
+							$aData['access_token'] = $aRefreshTokenResponse['result']['access_token'];
+							$aResponse['expires'] = $iExpires + $aResponse['expires_in'];
+							$oActions->StorageProvider()->Put($oAccount, StorageType::SESSION, \RainLoop\Utils::GetSessionToken(),
+								\SnappyMail\Crypt::EncryptToJSON($aData, $oAccount->CryptKey())
+							);
+						}
+					}
+				}
+				$oSettings->passphrase = $aData['access_token'];
+				\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
+			}
+		}
+	}
+
+	protected function gmailConnector() : ?\OAuth2\Client
+	{
+		$client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
+		$client_secret = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
+		if ($client_id && $client_secret) {
+			try
+			{
+				$oGMail = new \OAuth2\Client($client_id, $client_secret);
+				$oActions = \RainLoop\Api::Actions();
+				$sProxy = $oActions->Config()->Get('labs', 'curl_proxy', '');
+				if (\strlen($sProxy)) {
+					$oGMail->setCurlOption(CURLOPT_PROXY, $sProxy);
+					$sProxyAuth = $oActions->Config()->Get('labs', 'curl_proxy_auth', '');
+					if (\strlen($sProxyAuth)) {
+						$oGMail->setCurlOption(CURLOPT_PROXYUSERPWD, $sProxyAuth);
+					}
+				}
+				return $oGMail;
+			}
+			catch (\Exception $oException)
+			{
+				$oActions->Logger()->WriteException($oException, \LOG_ERR);
+			}
+		}
+		return null;
+	}
+}
diff --git a/plugins/login-http/LICENSE b/plugins/login-http/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-http/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-http/index.php b/plugins/login-http/index.php
new file mode 100644
index 000000000..9b53c0cb5
--- /dev/null
+++ b/plugins/login-http/index.php
@@ -0,0 +1,39 @@
+<?php
+
+class LoginHttpPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login HTTP',
+		AUTHOR   = 'Alterative Editions',
+		URL      = 'https://alterative.fr/',
+		VERSION  = '1.0',
+		RELEASE  = '2026-02-09',
+		REQUIRED = '2.21.0',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Automatic HTTP Login : uses PHP_AUTH_USER & PHP_AUTH_PW for IMAP connection';
+
+	public function Init() : void
+	{
+		$this->addPartHook('ExternalHTTP', 'ServiceExternalHTTP');
+	}
+
+	public function ServiceExternalHTTP() : string
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oActions->Http()->ServerNoCache();
+		$sUser=$_SERVER['PHP_AUTH_USER'] ?? '';
+		$sPassword=$_SERVER['PHP_AUTH_PW'] ?? '';
+		try {
+                	$oAccount = $oActions->LoginProcess($sUser, new \SnappyMail\SensitiveString($sPassword));
+                if ($oAccount) {
+                    \MailSo\Base\Http::Location('./');
+                    return true;
+                }
+            } catch (\Throwable $e) {
+                // Log l'erreur si besoin
+            }
+                \MailSo\Base\Http::Location('./?ExternalHTTP');
+		return true;
+	}
+}
diff --git a/plugins/login-o365/LoginOAuth2.js b/plugins/login-o365/LoginOAuth2.js
new file mode 100644
index 000000000..392c0e7b1
--- /dev/null
+++ b/plugins/login-o365/LoginOAuth2.js
@@ -0,0 +1,91 @@
+((rl) => {
+  const client_id = rl.pluginSettingsGet("login-o365", "client_id"),
+    allowAnyDomain = !!rl.pluginSettingsGet("login-o365", "allow_any_domain"),
+    isSupportedEmail = (email) => {
+      email = (email || "").toLowerCase();
+      if (!email.includes("@")) return false;
+      if (allowAnyDomain) return true;
+      return /@(outlook\.com|hotmail\.com|live\.com)$/.test(email);
+    },
+    startOAuth = (op, opts = {}) => {
+      const email = (opts.email || "").toLowerCase();
+      const name = opts.name || "";
+      const returnHash = opts.return || "";
+
+      // Server mints a signed state + correct redirect_uri and returns full authUrl.
+      rl.pluginRemoteRequest((iError, data) => {
+        const url = data?.Result?.authUrl;
+        if (!iError && url) {
+          document.location = url;
+        }
+      }, "LoginO365AuthUrl", {
+        op: op,
+        email: email,
+        name: name,
+        return: returnHash,
+      });
+    };
+
+  if (client_id) {
+    addEventListener("sm-user-login", (e) => {
+      const email = (e.detail.get("Email") || "").toLowerCase();
+      if (isSupportedEmail(email)) {
+        e.preventDefault();
+        startOAuth("login", { email });
+      }
+    });
+
+    addEventListener("rl-view-model", (e) => {
+      if ("Login" === e.detail.viewModelTemplateID) {
+        const
+		  container = e.detail.viewModelDom.querySelector("#plugin-Login-BottomControlGroup"),
+          btn = Element.fromHTML('<button type="button">Outlook</button>'),
+          div = Element.fromHTML('<div class="controls"></div>');
+        btn.onclick = () => {
+          // Best-effort: try to read the email field if present.
+          const input = e.detail.viewModelDom.querySelector('input[type="email"], input[name="Email"], input[name="email"], input');
+          const email = (input?.value || "").toLowerCase();
+          if (!email || isSupportedEmail(email)) {
+            startOAuth("login", { email });
+          }
+        };
+        div.append(btn);
+        container && container.append(div);
+      }
+
+      // "Add account" popup (Settings → Accounts → Add account)
+      if ("PopupsAccount" === e.detail.viewModelTemplateID) {
+        // Only for the "Add account" mode, not "Edit account".
+        if (typeof e.detail.isNew === "function" && !e.detail.isNew()) {
+          return;
+        }
+        const root = e.detail.viewModelDom;
+        if (!root) return;
+
+        const footer = root.querySelector("footer");
+        const form = root.querySelector("#accountform");
+        const addButton = root.querySelector("button.buttonAddAccount");
+        if (!footer || !form || !addButton) return;
+
+        // Avoid inserting duplicates when view model is re-rendered.
+        if (root.querySelector(".plugin-o365-add-account")) return;
+
+        const btn = Element.fromHTML(
+          '<button type="button" class="btn plugin-o365-add-account" style="margin-left: 6px;">Outlook</button>'
+        );
+
+        btn.onclick = () => {
+          const email = (form.querySelector('input[name="email"]')?.value || "").trim().toLowerCase();
+          const name = (form.querySelector('input[name="name"]')?.value || "").trim();
+          if (!email || !isSupportedEmail(email)) {
+            return;
+          }
+          startOAuth("add", { email, name, return: document.location.hash || "#/settings/accounts" });
+        };
+
+        // Put the button next to the default Add Account submit button.
+        footer.insertBefore(btn, addButton.nextSibling);
+      }
+    });
+  }
+})(window.rl);
diff --git a/plugins/login-o365/index.php b/plugins/login-o365/index.php
new file mode 100644
index 000000000..bb8ae7b69
--- /dev/null
+++ b/plugins/login-o365/index.php
@@ -0,0 +1,695 @@
+<?php
+/**
+ * SnappyMail login-o365 plugin
+ * You need to register an app in Azure portal and add
+ * a secret, redirect URIs and the following API permissions:
+ *     https://outlook.office.com/IMAP.AccessAsUser.All
+ *     https://outlook.office.com/SMTP.Send
+ *     openid offline_access email profile
+ * https://learn.microsoft.com/en-us/entra/identity-platform/reply-url#query-parameter-support-in-redirect-uris
+ * Query: redirect_uri=https://{DOMAIN}/?LoginO365
+ * Path:  redirect_uri=https://{DOMAIN}/LoginO365
+ * 
+ * If running behind nginx reverse proxy you might
+ * need to add the following to your nginx config:
+ * location = /LoginO365 {
+ *     return 302 /?LoginO365&$args;
+ * }
+ */
+
+use RainLoop\Model\MainAccount;
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+
+class LoginO365Plugin extends \RainLoop\Plugins\AbstractPlugin
+{
+    const
+        NAME     = 'Office365/Outlook OAuth2',
+        VERSION  = '0.4',
+        RELEASE  = '2025-12-22',
+        REQUIRED = '2.36.1',
+        CATEGORY = 'Login',
+        DESCRIPTION = 'Office365/Outlook IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
+
+    // v2 endpoints
+    const
+        AUTH_URI  = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/authorize',
+        TOKEN_URI = 'https://login.microsoftonline.com/{{tenant}}/oauth2/v2.0/token';
+
+    /**
+     * In-request cache of decrypted token bundles, keyed by lowercase email.
+     * This avoids re-decrypting the same blob multiple times during a single request.
+     *
+     * Shape:
+     *   [
+     *     'user@outlook.com' => ['access_token'=>..., 'refresh_token'=>..., 'expires'=>..., 'expires_in'=>...],
+     *     ...
+     *   ]
+     */
+    private static array $auth = [];
+
+    public function Init() : void
+    {
+        $this->UseLangs(true);
+        $this->addJs('LoginOAuth2.js');
+        $this->addHook('imap.before-login', 'clientLogin');
+        $this->addHook('smtp.before-login', 'clientLogin');
+        $this->addHook('sieve.before-login', 'clientLogin');
+
+        $this->addPartHook('LoginO365', 'ServiceLoginO365');
+        // Used by JS to obtain an auth URL with signed state (for both login + add-account flows).
+        $this->addJsonHook('LoginO365AuthUrl', 'DoLoginO365AuthUrl');
+
+        // Prevent Disallowed Sec-Fetch Dest: document Mode: navigate Site: cross-site User: true
+        $this->addHook('filter.http-paths', 'httpPaths');
+
+        // Cleanup: when an additional account is removed, also remove its encrypted refresh token bundle.
+        $this->addHook('json.after-AccountDelete', 'afterAccountDelete');
+    }
+
+    public function httpPaths(array &$aPaths) : void
+    {
+        if (!empty($_SERVER['PATH_INFO']) && \str_ends_with($_SERVER['PATH_INFO'], 'LoginO365')) {
+            $aPaths = ['LoginO365'];
+        }
+
+        if (!empty($aPaths[0]) && 'LoginO365' === $aPaths[0]) {
+            $oConfig = \RainLoop\Api::Config();
+            $oConfig->Set('security', 'secfetch_allow',
+                \trim($oConfig->Get('security', 'secfetch_allow', '') . ';site=cross-site', ';')
+            );
+        }
+    }
+
+    public function ServiceLoginO365() : string
+    {
+        $oActions = \RainLoop\Api::Actions();
+        $oHttp = $oActions->Http();
+        $oHttp->ServerNoCache();
+
+        try
+		{
+            if (isset($_GET['error'])) {
+                $desc = $_GET['error_description'] ?? '';
+                throw new \RuntimeException("{$_GET['error']}: {$desc}");
+            }
+
+            // Must have code + state
+            if (!isset($_GET['code']) || empty($_GET['state'])) {
+                $oActions->Location(\RainLoop\Utils::WebPath());
+                exit;
+            }
+
+            $oO365 = $this->o365Connector();
+            if (!$oO365) {
+                $oActions->Location(\RainLoop\Utils::WebPath());
+                exit;
+            }
+
+            $iNow = \time();
+
+            $redirectUri = $this->redirectUri();
+
+            $tenant = $this->Config()->Get('plugin', 'tenant', 'common');
+
+            $state = (string) $_GET['state'];
+            $statePayload = $this->verifyAndConsumeState($state);
+            if (!$statePayload) {
+                $oActions->Location(\RainLoop\Utils::WebPath());
+                exit;
+            }
+
+            $aTokenWrap = $oO365->getAccessToken(
+                \str_replace('{{tenant}}', $tenant, static::TOKEN_URI),
+                'authorization_code',
+                [
+                    'code' => $_GET['code'],
+                    'redirect_uri' => $redirectUri
+                ]
+            );
+
+            if (!\is_array($aTokenWrap) || !isset($aTokenWrap['code'])) {
+                throw new \RuntimeException('Token request failed: ' . \json_encode($aTokenWrap));
+            }
+            if (200 !== (int)$aTokenWrap['code']) {
+                $err = $aTokenWrap['result']['error'] ?? '';
+                $desc = $aTokenWrap['result']['error_description'] ?? '';
+                throw new \RuntimeException("Token HTTP {$aTokenWrap['code']}: {$err} / {$desc}");
+            }
+
+            $aToken = $aTokenWrap['result'] ?? [];
+            $accessToken = $aToken['access_token'] ?? '';
+            $refreshToken = $aToken['refresh_token'] ?? '';
+            $expiresIn = (int)($aToken['expires_in'] ?? 0);
+            $idToken = $aToken['id_token'] ?? '';
+
+            if ($accessToken === '') {
+                throw new \RuntimeException('access_token missing');
+            }
+
+            if ($refreshToken === '') {
+                throw new \RuntimeException('refresh_token missing');
+            }
+            if ($idToken === '') {
+                // We rely on id_token to get email/sub without Graph.
+                throw new \RuntimeException('id_token missing (add openid email profile scopes)');
+            }
+
+            // Parse id_token (JWT) to get identity (sub + email)
+            $claims = $this->decodeJwtPayload($idToken);
+            if (!\is_array($claims)) {
+                throw new \RuntimeException('Cannot decode id_token payload');
+            }
+
+            $email = $claims['email'] ?? ($claims['preferred_username'] ?? ($claims['upn'] ?? ''));
+            $sub = $claims['sub'] ?? '';
+
+            if ($sub === '') {
+                throw new \RuntimeException('unknown id from id_token');
+            }
+            if ($email === '') {
+                throw new \RuntimeException('unknown email address from id_token');
+            }
+
+            if (!$this->isSupportedEmail(\strtolower($email))) {
+                throw new \RuntimeException('Unsupported email domain for this plugin');
+            }
+
+            $tokenBundle = [
+                'access_token' => $accessToken,
+                'refresh_token' => $refreshToken,
+                'expires_in' => $expiresIn,
+                'expires' => $iNow + $expiresIn
+            ];
+
+            $op = $statePayload['op'] ?? 'login';
+            if ('add' === $op) {
+                $oMainAccount = $oActions->getMainAccountFromToken(false);
+                if (!$oMainAccount) {
+                    throw new \RuntimeException('Add-account flow requires logged in main account');
+                }
+                if (!empty($statePayload['main']) && $statePayload['main'] !== $oMainAccount->Email()) {
+                    throw new \RuntimeException('Add-account state does not match current main account');
+                }
+
+                // Store token bundle encrypted with MAIN account crypt key (never store refresh_token unencrypted).
+                // This is later used by imap/smtp/sieve.before-login for *additional* accounts.
+                $this->storeAccountTokens($oMainAccount, $email, $tokenBundle);
+
+                // Create/validate an AdditionalAccount entry exactly like SnappyMail expects in "additionalaccounts".
+                // We set the "password" to the OAuth subject (sub) as an opaque secret; the plugin will inject XOAUTH2.
+                $oPassword = new \SnappyMail\SensitiveString($sub);
+                $oAdditional = $oActions->LoginProcess($email, $oPassword, false);
+                if (!$oAdditional instanceof \RainLoop\Model\AdditionalAccount) {
+                    throw new \RuntimeException('Failed to create additional account');
+                }
+
+                $asciiEmail = \SnappyMail\IDN::emailToAscii($oAdditional->Email());
+                if ($asciiEmail === $oMainAccount->Email()) {
+                    throw new \RuntimeException('Cannot add main account as additional');
+                }
+
+                $aAccounts = $oActions->GetAccounts($oMainAccount);
+                $aEntry = $oAdditional->asTokenArray($oMainAccount);
+                if (!empty($statePayload['name']) && \is_string($statePayload['name'])) {
+                    $aEntry['name'] = \trim($statePayload['name']);
+                } else if (isset($aAccounts[$asciiEmail]['name'])) {
+                    // Preserve previous custom label if re-adding/updating.
+                    $aEntry['name'] = (string) $aAccounts[$asciiEmail]['name'];
+                }
+                $aAccounts[$asciiEmail] = $aEntry;
+                $oActions->SetAccounts($oMainAccount, $aAccounts);
+
+                // Cache for this request (used during LoginProcess() above and any subsequent logins).
+                static::$auth[\strtolower($asciiEmail)] = $tokenBundle;
+
+                $returnHash = '';
+                if (!empty($statePayload['return']) && \is_string($statePayload['return']) && \str_starts_with($statePayload['return'], '#')) {
+                    $returnHash = $statePayload['return'];
+                }
+                $oActions->Location(\RainLoop\Utils::WebPath() . $returnHash);
+                exit;
+            }
+
+            // Default: "login" flow (preserve existing behavior)
+            static::$auth[\strtolower($email)] = $tokenBundle;
+
+            // SnappyMail uses password as opaque string; plugin injects XOAUTH2 later.
+            $oPassword = new \SnappyMail\SensitiveString($sub);
+            $oAccount = $oActions->LoginProcess($email, $oPassword);
+
+            if ($oAccount) {
+                $oActions->StorageProvider()->Put(
+                    $oAccount,
+                    StorageType::SESSION,
+                    \RainLoop\Utils::GetSessionToken(),
+                    \SnappyMail\Crypt::EncryptToJSON($tokenBundle, $oAccount->CryptKey())
+                );
+            }
+        }
+        catch (\Throwable $e) {
+            $oActions->Logger()->WriteException($e, \LOG_ERR);
+        }
+
+        $oActions->Location(\RainLoop\Utils::WebPath());
+        exit;
+    }
+
+    public function configMapping() : array
+    {
+        return [
+            \RainLoop\Plugins\Property::NewInstance('client_id')
+                ->SetLabel('Client ID')
+                ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+                ->SetAllowedInJs(),
+            \RainLoop\Plugins\Property::NewInstance('client_secret')
+                ->SetLabel('Client Secret')
+                ->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING)
+                ->SetEncrypted(),
+            \RainLoop\Plugins\Property::NewInstance('tenant')
+                ->SetLabel('Tenant')
+                ->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
+                ->SetDefaultValue(['common','consumers','organizations'])
+                ->SetAllowedInJs(),
+            \RainLoop\Plugins\Property::NewInstance('personal')
+                // When true: redirect URI uses query parameter form "/?LoginO365" (Azure supports it).
+                // When false: redirect URI uses path form "/LoginO365" (useful behind reverse proxies).
+                ->SetLabel('Use "/?LoginO365" redirect URI')
+                ->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+                ->SetDefaultValue(false)
+                ->SetAllowedInJs(),
+            \RainLoop\Plugins\Property::NewInstance('allow_any_domain')
+                ->SetLabel('Allow any domain (not only outlook.com/hotmail.com/live.com)')
+                ->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+                ->SetDefaultValue(false)
+                ->SetAllowedInJs()
+        ];
+    }
+
+    public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
+    {
+        $email = \strtolower($oAccount->Email());
+
+        if (!$this->isSupportedEmail($email)) {
+            return;
+        }
+
+        $oActions = \RainLoop\Api::Actions();
+
+        $aData = static::$auth[$email] ?? null;
+        if (!$aData) {
+            try {
+                if ($oAccount instanceof MainAccount) {
+                    $blob = $oActions->StorageProvider()->Get(
+                        $oAccount,
+                        StorageType::SESSION,
+                        \RainLoop\Utils::GetSessionToken()
+                    );
+                    $aData = \SnappyMail\Crypt::DecryptFromJSON($blob, $oAccount->CryptKey());
+                } else if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
+                    $oMain = $oActions->getMainAccountFromToken(false);
+                    if (!$oMain) {
+                        return;
+                    }
+                    $blob = $oActions->StorageProvider()->Get(
+                        $oMain,
+                        StorageType::CONFIG,
+                        $this->tokenStorageKey($email)
+                    );
+                    $aData = \SnappyMail\Crypt::DecryptFromJSON($blob, $oMain->CryptKey());
+                }
+            } catch (\Throwable $e) {
+                return;
+            }
+        }
+
+        if (empty($aData['access_token']) || empty($aData['refresh_token']) || empty($aData['expires'])) {
+            return;
+        }
+
+        // Refresh if expired (or close to expiry)
+        if (\time() >= ((int)$aData['expires'] - 30)) {
+            $oO365 = $this->o365Connector();
+            if ($oO365) {
+                $tenant = $this->Config()->Get('plugin', 'tenant', 'common');
+                $aRefreshWrap = $oO365->getAccessToken(
+                    \str_replace('{{tenant}}', $tenant, static::TOKEN_URI),
+                    'refresh_token',
+                    ['refresh_token' => $aData['refresh_token']]
+                );
+
+                if (\is_array($aRefreshWrap) && isset($aRefreshWrap['code']) && 200 === (int)$aRefreshWrap['code']) {
+                    $r = $aRefreshWrap['result'] ?? [];
+                    if (!empty($r['access_token'])) {
+                        $aData['access_token'] = $r['access_token'];
+                    }
+                    if (!empty($r['refresh_token'])) {
+                        $aData['refresh_token'] = $r['refresh_token'];
+                    }
+                    $expiresIn = (int)($r['expires_in'] ?? 0);
+                    if ($expiresIn > 0) {
+                        $aData['expires'] = \time() + $expiresIn;
+                        $aData['expires_in'] = $expiresIn;
+                    }
+
+                    // Persist updated bundle (encrypted).
+                    if ($oAccount instanceof MainAccount) {
+                        $oActions->StorageProvider()->Put(
+                            $oAccount,
+                            StorageType::SESSION,
+                            \RainLoop\Utils::GetSessionToken(),
+                            \SnappyMail\Crypt::EncryptToJSON($aData, $oAccount->CryptKey())
+                        );
+                    } else if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
+                        $oMain = $oActions->getMainAccountFromToken(false);
+                        if ($oMain) {
+                            $oActions->StorageProvider()->Put(
+                                $oMain,
+                                StorageType::CONFIG,
+                                $this->tokenStorageKey($email),
+                                \SnappyMail\Crypt::EncryptToJSON($aData, $oMain->CryptKey())
+                            );
+                        }
+                    }
+                }
+            }
+        }
+
+        static::$auth[$email] = $aData;
+
+        // Inject XOAUTH2/OAUTHBEARER
+        $oSettings->passphrase = $aData['access_token'];
+        \array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
+    }
+
+    /**
+     * Server-side cleanup hook: after a successful AccountDelete, remove stored token bundle for that email.
+     * This prevents leaving encrypted refresh tokens behind when an additional account is removed.
+     */
+    public function afterAccountDelete(array &$aResponse) : void
+    {
+        if (empty($aResponse['Result'])) {
+            return;
+        }
+        $oActions = \RainLoop\Api::Actions();
+        $oMain = $oActions->getMainAccountFromToken(false);
+        if (!$oMain) {
+            return;
+        }
+        $email = \strtolower(\SnappyMail\IDN::emailToAscii(\trim((string) $oActions->GetActionParam('emailToDelete', ''))));
+        if ($email && $this->isSupportedEmail($email)) {
+            $oActions->StorageProvider()->Clear($oMain, StorageType::CONFIG, $this->tokenStorageKey($email));
+        }
+    }
+
+    protected function o365Connector() : ?\OAuth2\Client
+    {
+        $client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
+        $client_secret = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
+
+        if ($client_id && $client_secret) {
+            try {
+                $oO365 = new \OAuth2\Client($client_id, $client_secret);
+
+                $oActions = \RainLoop\Api::Actions();
+                $sProxy = $oActions->Config()->Get('labs', 'curl_proxy', '');
+                if (\strlen($sProxy)) {
+                    $oO365->setCurlOption(CURLOPT_PROXY, $sProxy);
+                    $sProxyAuth = $oActions->Config()->Get('labs', 'curl_proxy_auth', '');
+                    if (\strlen($sProxyAuth)) {
+                        $oO365->setCurlOption(CURLOPT_PROXYUSERPWD, $sProxyAuth);
+                    }
+                }
+
+                return $oO365;
+            } catch (\Throwable $e) {
+                \RainLoop\Api::Actions()->Logger()->WriteException($e, \LOG_ERR);
+            }
+        }
+
+        return null;
+    }
+
+    private function decodeJwtPayload(string $jwt) : ?array
+    {
+        $parts = \explode('.', $jwt);
+        if (\count($parts) < 2) {
+            return null;
+        }
+        $payload = $parts[1];
+        $payload .= \str_repeat('=', (4 - (\strlen($payload) % 4)) % 4);
+        $json = \base64_decode(\strtr($payload, '-_', '+/'));
+        if ($json === false) {
+            return null;
+        }
+        $data = \json_decode($json, true);
+        return \is_array($data) ? $data : null;
+    }
+
+    /**
+     * JSON action called by JS to obtain an MS authorize URL with signed state.
+     * This avoids exposing any signing secret to JS and keeps redirect_uri consistent with server logic.
+     */
+    public function DoLoginO365AuthUrl() : array
+    {
+        $oActions = \RainLoop\Api::Actions();
+
+        $op = (string) $this->jsonParam('op', 'login');
+        if (!\in_array($op, ['login', 'add'], true)) {
+            return $this->jsonResponse(__FUNCTION__, false);
+        }
+
+        $email = \strtolower(\trim((string) $this->jsonParam('email', '')));
+        $name = \trim((string) $this->jsonParam('name', ''));
+        $returnHash = (string) $this->jsonParam('return', '');
+
+        if ($returnHash && !\str_starts_with($returnHash, '#')) {
+            $returnHash = '';
+        }
+
+        // For add-account flow, require a logged-in main account (we must write to its additionalaccounts storage).
+        $oMainAccount = null;
+        if ('add' === $op) {
+            $oMainAccount = $oActions->getMainAccountFromToken(false);
+            if (!$oMainAccount) {
+                return $this->jsonResponse(__FUNCTION__, false);
+            }
+        }
+
+        // Optional server-side guard: only permit supported consumer domains unless configured otherwise.
+        if ($email && !$this->isSupportedEmail($email)) {
+            return $this->jsonResponse(__FUNCTION__, false);
+        }
+
+        $oConfig = $this->Config();
+        $client_id = \trim($oConfig->Get('plugin', 'client_id', ''));
+        if (!$client_id) {
+            return $this->jsonResponse(__FUNCTION__, false);
+        }
+
+        $nonce = $this->b64url(\random_bytes(16));
+        // Store nonce server-side to prevent replay; consumed on callback.
+        $oActions->StorageProvider()->Put(
+            null,
+            StorageType::NOBODY,
+            $this->stateNonceKey($nonce),
+            (string) \time()
+        );
+
+        $payload = [
+            'v' => 1,
+            'op' => $op,
+            'csrf' => \RainLoop\Utils::GetCsrfToken(),
+            'nonce' => $nonce,
+            'ts' => \time()
+        ];
+        if ('add' === $op && $oMainAccount) {
+            $payload['main'] = $oMainAccount->Email();
+            if ($name) {
+                $payload['name'] = \substr($name, 0, 100);
+            }
+            if ($returnHash) {
+                $payload['return'] = \substr($returnHash, 0, 200);
+            }
+        }
+
+        $state = $this->signState($payload);
+        $tenant = $oConfig->Get('plugin', 'tenant', 'common');
+        $redirectUri = $this->redirectUri();
+
+        $params = [
+                'response_type' => 'code',
+                'client_id' => $client_id,
+                'redirect_uri' => $redirectUri,
+                'scope' => \implode(' ', [
+                    'openid',
+                    'offline_access',
+                    'email',
+                    'profile',
+                    'https://outlook.office.com/IMAP.AccessAsUser.All',
+                    'https://outlook.office.com/SMTP.Send',
+                ]),
+                'state' => $state,
+                // Helps MS UI prefill, but does not change server-side validation.
+        ];
+        if ($email) {
+            $params['login_hint'] = $email;
+        }
+        $authUrl = \str_replace('{{tenant}}', $tenant, static::AUTH_URI)
+            . '?'
+            . \http_build_query($params, '', '&', PHP_QUERY_RFC3986);
+
+        return $this->jsonResponse(__FUNCTION__, [
+            'authUrl' => $authUrl
+        ]);
+    }
+
+    private function isSupportedEmail(string $email) : bool
+    {
+        if ((bool)$this->Config()->Get('plugin', 'allow_any_domain', false)) {
+            return \str_contains($email, '@');
+        }
+        return \str_ends_with($email, '@hotmail.com')
+            || \str_ends_with($email, '@outlook.com')
+            || \str_ends_with($email, '@live.com');
+    }
+
+    /**
+     * Build absolute base URL (works behind nginx reverse proxy).
+     */
+    private function baseUrl() : string
+    {
+        $scheme = (!empty($_SERVER['HTTP_X_FORWARDED_PROTO']))
+            ? $_SERVER['HTTP_X_FORWARDED_PROTO']
+            : ((!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off') ? 'https' : 'http');
+
+        $host = $_SERVER['HTTP_HOST'] ?? $_SERVER['SERVER_NAME'] ?? '';
+        if (!$host) {
+            throw new \RuntimeException('Cannot determine HTTP_HOST');
+        }
+        return $scheme . '://' . $host;
+    }
+
+    /**
+     * Redirect URI used for the Azure app registration.
+     * When plugin.personal=true -> "/?LoginO365"
+     * When plugin.personal=false -> "/LoginO365"
+     */
+    private function redirectUri() : string
+    {
+        $base = \rtrim($this->baseUrl(), '/');
+        $useQuery = (bool)$this->Config()->Get('plugin', 'personal', false);
+        return $useQuery ? ($base . '/?LoginO365') : ($base . '/LoginO365');
+    }
+
+    private function tokenStorageKey(string $emailLower) : string
+    {
+        // Stored under MAIN account StorageType::CONFIG (encrypted with main CryptKey).
+        // Email is hashed to avoid path/encoding issues across storage backends.
+        return 'login-o365.tokens.' . \sha1($emailLower);
+    }
+
+    private function storeAccountTokens(MainAccount $oMainAccount, string $email, array $tokenBundle) : void
+    {
+        $emailLower = \strtolower(\SnappyMail\IDN::emailToAscii($email));
+        \RainLoop\Api::Actions()->StorageProvider()->Put(
+            $oMainAccount,
+            StorageType::CONFIG,
+            $this->tokenStorageKey($emailLower),
+            \SnappyMail\Crypt::EncryptToJSON($tokenBundle, $oMainAccount->CryptKey())
+        );
+    }
+
+    private function stateNonceKey(string $nonce) : string
+    {
+        return 'login-o365.state.' . $nonce;
+    }
+
+    private function b64url(string $bin) : string
+    {
+        return \rtrim(\strtr(\base64_encode($bin), '+/', '-_'), '=');
+    }
+
+    private function b64urlDecode(string $b64url) /*: string|false*/
+    {
+        $pad = (4 - (\strlen($b64url) % 4)) % 4;
+        return \base64_decode(\strtr($b64url . \str_repeat('=', $pad), '-_', '+/'), true);
+    }
+
+    private function stateHmacKey() : string
+    {
+        // Uses the plugin client_secret (server-side only) as HMAC key.
+        // This prevents any user-controlled tampering of the state payload.
+        $key = \trim($this->Config()->getDecrypted('plugin', 'client_secret', ''));
+        if (!$key) {
+            // Fallback for misconfiguration; keeps behavior deterministic.
+            $key = 'login-o365';
+        }
+        return $key;
+    }
+
+    private function signState(array $payload) : string
+    {
+        $json = \json_encode($payload);
+        if (!$json) {
+            $json = '{}';
+        }
+        $payloadB64 = $this->b64url($json);
+        $sig = \hash_hmac('sha256', $payloadB64, $this->stateHmacKey(), true);
+        return $payloadB64 . '.' . $this->b64url($sig);
+    }
+
+    /**
+     * Verify signature + CSRF + nonce, then consumes nonce to prevent replay.
+     * Returns decoded payload on success, null on failure.
+     */
+    private function verifyAndConsumeState(string $state) : ?array
+    {
+        $parts = \explode('.', $state, 2);
+        if (2 !== \count($parts)) {
+            return null;
+        }
+        [$payloadB64, $sigB64] = $parts;
+        $sig = $this->b64urlDecode($sigB64);
+        if ($sig === false) {
+            return null;
+        }
+
+        $expected = \hash_hmac('sha256', $payloadB64, $this->stateHmacKey(), true);
+        if (!\hash_equals($expected, $sig)) {
+            return null;
+        }
+
+        $payloadJson = $this->b64urlDecode($payloadB64);
+        if ($payloadJson === false) {
+            return null;
+        }
+        $payload = \json_decode($payloadJson, true);
+        if (!\is_array($payload) || empty($payload['csrf']) || empty($payload['nonce']) || empty($payload['op'])) {
+            return null;
+        }
+
+        // Must match the current browser session.
+        if ($payload['csrf'] !== \RainLoop\Utils::GetCsrfToken()) {
+            return null;
+        }
+
+        // Replay protection: nonce must exist server-side and is consumed once.
+        $oActions = \RainLoop\Api::Actions();
+        $key = $this->stateNonceKey((string) $payload['nonce']);
+        $seen = $oActions->StorageProvider()->Get(null, StorageType::NOBODY, $key);
+        if (!$seen) {
+            return null;
+        }
+
+        $ts = (int) ($payload['ts'] ?? 0);
+        if ($ts && \abs(\time() - $ts) > 900) { // 15 minutes
+            // Expired: clear nonce to avoid accumulating stale entries.
+            $oActions->StorageProvider()->Clear(null, StorageType::NOBODY, $key);
+            return null;
+        }
+
+        $oActions->StorageProvider()->Clear(null, StorageType::NOBODY, $key);
+
+        return $payload;
+    }
+}
\ No newline at end of file
diff --git a/plugins/login-oauth2/OAuth2/Client.php b/plugins/login-oauth2/OAuth2/Client.php
new file mode 100644
index 000000000..176240d5b
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/Client.php
@@ -0,0 +1,526 @@
+<?php
+/**
+ * Note : Code is released under the GNU LGPL
+ *
+ * Please do not change the header of this file
+ *
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * Lesser General Public License as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License for more details.
+ */
+
+/**
+ * Light PHP wrapper for the OAuth 2.0 protocol.
+ *
+ * This client is based on the OAuth2 specification draft v2.15
+ * http://tools.ietf.org/html/draft-ietf-oauth-v2-15
+ *
+ * @author      Pierrick Charron <pierrick@webstart.fr>
+ * @author      Anis Berejeb <anis.berejeb@gmail.com>
+ * @version     1.3.1-dev
+ */
+namespace OAuth2;
+
+class Client
+{
+    /**
+     * Different AUTH method
+     */
+    const AUTH_TYPE_URI                 = 0;
+    const AUTH_TYPE_AUTHORIZATION_BASIC = 1;
+    const AUTH_TYPE_FORM                = 2;
+
+    /**
+     * Different Access token type
+     */
+    const ACCESS_TOKEN_URI      = 0;
+    const ACCESS_TOKEN_BEARER   = 1;
+    const ACCESS_TOKEN_OAUTH    = 2;
+    const ACCESS_TOKEN_MAC      = 3;
+
+    /**
+    * Different Grant types
+    */
+    const GRANT_TYPE_AUTH_CODE          = 'authorization_code';
+    const GRANT_TYPE_PASSWORD           = 'password';
+    const GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials';
+    const GRANT_TYPE_REFRESH_TOKEN      = 'refresh_token';
+
+    /**
+     * HTTP Methods
+     */
+    const HTTP_METHOD_GET    = 'GET';
+    const HTTP_METHOD_POST   = 'POST';
+    const HTTP_METHOD_PUT    = 'PUT';
+    const HTTP_METHOD_DELETE = 'DELETE';
+    const HTTP_METHOD_HEAD   = 'HEAD';
+    const HTTP_METHOD_PATCH   = 'PATCH';
+
+    /**
+     * HTTP Form content types
+     */
+    const HTTP_FORM_CONTENT_TYPE_APPLICATION = 0;
+    const HTTP_FORM_CONTENT_TYPE_MULTIPART = 1;
+
+    /**
+     * Client ID
+     *
+     * @var string
+     */
+    protected $client_id = null;
+
+    /**
+     * Client Secret
+     *
+     * @var string
+     */
+    protected $client_secret = null;
+
+    /**
+     * Client Authentication method
+     *
+     * @var int
+     */
+    protected $client_auth = self::AUTH_TYPE_URI;
+
+    /**
+     * Access Token
+     *
+     * @var string
+     */
+    protected $access_token = null;
+
+    /**
+     * Access Token Type
+     *
+     * @var int
+     */
+    protected $access_token_type = self::ACCESS_TOKEN_URI;
+
+    /**
+     * Access Token Secret
+     *
+     * @var string
+     */
+    protected $access_token_secret = null;
+
+    /**
+     * Access Token crypt algorithm
+     *
+     * @var string
+     */
+    protected $access_token_algorithm = null;
+
+    /**
+     * Access Token Parameter name
+     *
+     * @var string
+     */
+    protected $access_token_param_name = 'access_token';
+
+    /**
+     * The path to the certificate file to use for https connections
+     *
+     * @var string  Defaults to .
+     */
+    protected $certificate_file = null;
+
+    /**
+     * cURL options
+     *
+     * @var array
+     */
+    protected $curl_options = array();
+
+    /**
+     * Construct
+     *
+     * @param string $client_id Client ID
+     * @param string $client_secret Client Secret
+     * @param int    $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @param string $certificate_file Indicates if we want to use a certificate file to trust the server. Optional, defaults to null.
+     * @return void
+     */
+    public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null)
+    {
+        if (!extension_loaded('curl')) {
+            throw new Exception('The PHP exention curl must be installed to use this library.', Exception::CURL_NOT_FOUND);
+        }
+
+        $this->client_id     = $client_id;
+        $this->client_secret = $client_secret;
+        $this->client_auth   = $client_auth;
+        $this->certificate_file = $certificate_file;
+        if (!empty($this->certificate_file)  && !is_file($this->certificate_file)) {
+            throw new InvalidArgumentException('The certificate file was not found', InvalidArgumentException::CERTIFICATE_NOT_FOUND);
+        }
+    }
+
+    /**
+     * Get the client Id
+     *
+     * @return string Client ID
+     */
+    public function getClientId()
+    {
+        return $this->client_id;
+    }
+
+    /**
+     * Get the client Secret
+     *
+     * @return string Client Secret
+     */
+    public function getClientSecret()
+    {
+        return $this->client_secret;
+    }
+
+    /**
+     * getAuthenticationUrl
+     *
+     * @param string $auth_endpoint Url of the authentication endpoint
+     * @param string $redirect_uri  Redirection URI
+     * @param array  $extra_parameters  Array of extra parameters like scope or state (Ex: array('scope' => null, 'state' => ''))
+     * @return string URL used for authentication
+     */
+    public function getAuthenticationUrl($auth_endpoint, $redirect_uri, array $extra_parameters = array())
+    {
+        $parameters = array_merge(array(
+            'response_type' => 'code',
+            'client_id'     => $this->client_id,
+            'redirect_uri'  => $redirect_uri
+        ), $extra_parameters);
+        return $auth_endpoint . '?' . http_build_query($parameters, '', '&');
+    }
+
+    /**
+     * getAccessToken
+     *
+     * @param string $token_endpoint    Url of the token endpoint
+     * @param string $grant_type        Grant Type ('authorization_code', 'password', 'client_credentials', 'refresh_token', or a custom code (@see GrantType Classes)
+     * @param array  $parameters        Array sent to the server (depend on which grant type you're using)
+     * @param array  $extra_headers     Array of extra headers
+     * @return array Array of parameters required by the grant_type (CF SPEC)
+     */
+    public function getAccessToken($token_endpoint, $grant_type, array $parameters, array $extra_headers = array())
+    {
+        if (!$grant_type) {
+            throw new InvalidArgumentException('The grant_type is mandatory.', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeClassName = $this->convertToCamelCase($grant_type);
+        $grantTypeClass =  __NAMESPACE__ . '\\GrantType\\' . $grantTypeClassName;
+        if (!class_exists($grantTypeClass)) {
+            throw new InvalidArgumentException('Unknown grant type \'' . $grant_type . '\'', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeObject = new $grantTypeClass();
+        $grantTypeObject->validateParameters($parameters);
+        if (!defined($grantTypeClass . '::GRANT_TYPE')) {
+            throw new Exception('Unknown constant GRANT_TYPE for class ' . $grantTypeClassName, Exception::GRANT_TYPE_ERROR);
+        }
+        $parameters['grant_type'] = $grantTypeClass::GRANT_TYPE;
+        $http_headers = $extra_headers;
+        switch ($this->client_auth) {
+            case self::AUTH_TYPE_URI:
+            case self::AUTH_TYPE_FORM:
+                $parameters['client_id'] = $this->client_id;
+                $parameters['client_secret'] = $this->client_secret;
+                break;
+            case self::AUTH_TYPE_AUTHORIZATION_BASIC:
+                $parameters['client_id'] = $this->client_id;
+                $http_headers['Authorization'] = 'Basic ' . base64_encode($this->client_id .  ':' . $this->client_secret);
+                break;
+            default:
+                throw new Exception('Unknown client auth type.', Exception::INVALID_CLIENT_AUTHENTICATION_TYPE);
+                break;
+        }
+
+        return $this->executeRequest($token_endpoint, $parameters, self::HTTP_METHOD_POST, $http_headers, self::HTTP_FORM_CONTENT_TYPE_APPLICATION);
+    }
+
+    /**
+     * setToken
+     *
+     * @param string $token Set the access token
+     * @return void
+     */
+    public function setAccessToken($token)
+    {
+        $this->access_token = $token;
+    }
+
+    /**
+     * Check if there is an access token present
+     *
+     * @return bool Whether the access token is present
+     */
+    public function hasAccessToken()
+    {
+        return !!$this->access_token;
+    }
+
+    /**
+     * Set the client authentication type
+     *
+     * @param string $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @return void
+     */
+    public function setClientAuthType($client_auth)
+    {
+        $this->client_auth = $client_auth;
+    }
+
+    /**
+     * Set an option for the curl transfer
+     *
+     * @param int   $option The CURLOPT_XXX option to set
+     * @param mixed $value  The value to be set on option
+     * @return void
+     */
+    public function setCurlOption($option, $value)
+    {
+        $this->curl_options[$option] = $value;
+    }
+
+    /**
+     * Set multiple options for a cURL transfer
+     *
+     * @param array $options An array specifying which options to set and their values
+     * @return void
+     */
+    public function setCurlOptions($options)
+    {
+        $this->curl_options = array_merge($this->curl_options, $options);
+    }
+
+    /**
+     * Set the access token type
+     *
+     * @param int $type Access token type (ACCESS_TOKEN_BEARER, ACCESS_TOKEN_MAC, ACCESS_TOKEN_URI)
+     * @param string $secret The secret key used to encrypt the MAC header
+     * @param string $algorithm Algorithm used to encrypt the signature
+     * @return void
+     */
+    public function setAccessTokenType($type, $secret = null, $algorithm = null)
+    {
+        $this->access_token_type = $type;
+        $this->access_token_secret = $secret;
+        $this->access_token_algorithm = $algorithm;
+    }
+
+    /**
+     * Fetch a protected ressource
+     *
+     * @param string $protected_ressource_url Protected resource URL
+     * @param array  $parameters Array of parameters
+     * @param string $http_method HTTP Method to use (POST, PUT, GET, HEAD, DELETE)
+     * @param array  $http_headers HTTP headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    public function fetch($protected_resource_url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = array(), $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        if ($this->access_token) {
+            switch ($this->access_token_type) {
+                case self::ACCESS_TOKEN_URI:
+                    if (is_array($parameters)) {
+                        $parameters[$this->access_token_param_name] = $this->access_token;
+                    } else {
+                        throw new InvalidArgumentException(
+                            'You need to give parameters as array if you want to give the token within the URI.',
+                            InvalidArgumentException::REQUIRE_PARAMS_AS_ARRAY
+                        );
+                    }
+                    break;
+                case self::ACCESS_TOKEN_BEARER:
+                    $http_headers['Authorization'] = 'Bearer ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_OAUTH:
+                    $http_headers['Authorization'] = 'OAuth ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_MAC:
+                    $http_headers['Authorization'] = 'MAC ' . $this->generateMACSignature($protected_resource_url, $parameters, $http_method);
+                    break;
+                default:
+                    throw new Exception('Unknown access token type.', Exception::INVALID_ACCESS_TOKEN_TYPE);
+                    break;
+            }
+        }
+        return $this->executeRequest($protected_resource_url, $parameters, $http_method, $http_headers, $form_content_type);
+    }
+
+    /**
+     * Generate the MAC signature
+     *
+     * @param string $url Called URL
+     * @param array  $parameters Parameters
+     * @param string $http_method Http Method
+     * @return string
+     */
+    private function generateMACSignature($url, $parameters, $http_method)
+    {
+        $timestamp = time();
+        $nonce = uniqid();
+        $parsed_url = parse_url($url);
+        if (!isset($parsed_url['port']))
+        {
+            $parsed_url['port'] = ($parsed_url['scheme'] == 'https') ? 443 : 80;
+        }
+        if ($http_method == self::HTTP_METHOD_GET) {
+            if (is_array($parameters)) {
+                $parsed_url['path'] .= '?' . http_build_query($parameters, '', '&');
+            } elseif ($parameters) {
+                $parsed_url['path'] .= '?' . $parameters;
+            }
+        }
+
+        $signature = base64_encode(hash_hmac($this->access_token_algorithm,
+                    $timestamp . "\n"
+                    . $nonce . "\n"
+                    . $http_method . "\n"
+                    . $parsed_url['path'] . "\n"
+                    . $parsed_url['host'] . "\n"
+                    . $parsed_url['port'] . "\n\n"
+                    , $this->access_token_secret, true));
+
+        return 'id="' . $this->access_token . '", ts="' . $timestamp . '", nonce="' . $nonce . '", mac="' . $signature . '"';
+    }
+
+    /**
+     * Execute a request (with curl)
+     *
+     * @param string $url URL
+     * @param mixed  $parameters Array of parameters
+     * @param string $http_method HTTP Method
+     * @param array  $http_headers HTTP Headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, ?array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        $curl_options = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_CUSTOMREQUEST  => $http_method
+        );
+
+        switch($http_method) {
+            case self::HTTP_METHOD_POST:
+                $curl_options[CURLOPT_POST] = true;
+                /* No break */
+            case self::HTTP_METHOD_PUT:
+			case self::HTTP_METHOD_PATCH:
+
+                /**
+                 * Passing an array to CURLOPT_POSTFIELDS will encode the data as multipart/form-data,
+                 * while passing a URL-encoded string will encode the data as application/x-www-form-urlencoded.
+                 * http://php.net/manual/en/function.curl-setopt.php
+                 */
+                if(is_array($parameters) && self::HTTP_FORM_CONTENT_TYPE_APPLICATION === $form_content_type) {
+                    $parameters = http_build_query($parameters, '', '&');
+                }
+                $curl_options[CURLOPT_POSTFIELDS] = $parameters;
+                break;
+            case self::HTTP_METHOD_HEAD:
+                $curl_options[CURLOPT_NOBODY] = true;
+                /* No break */
+            case self::HTTP_METHOD_DELETE:
+            case self::HTTP_METHOD_GET:
+                if (is_array($parameters) && count($parameters) > 0) {
+                    $url .= '?' . http_build_query($parameters, '', '&');
+                } elseif ($parameters) {
+                    $url .= '?' . $parameters;
+                }
+                break;
+            default:
+                break;
+        }
+
+        $curl_options[CURLOPT_URL] = $url;
+
+        if (is_array($http_headers)) {
+            $header = array();
+            foreach($http_headers as $key => $parsed_urlvalue) {
+                $header[] = "$key: $parsed_urlvalue";
+            }
+            $curl_options[CURLOPT_HTTPHEADER] = $header;
+        }
+
+        $ch = curl_init();
+        curl_setopt_array($ch, $curl_options);
+        // https handling
+        if (!empty($this->certificate_file)) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+            curl_setopt($ch, CURLOPT_CAINFO, $this->certificate_file);
+        } else {
+            // bypass ssl verification
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        }
+        if (!empty($this->curl_options)) {
+            curl_setopt_array($ch, $this->curl_options);
+        }
+        $result = curl_exec($ch);
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        if ($curl_error = curl_error($ch)) {
+            throw new Exception($curl_error, Exception::CURL_ERROR);
+        } else {
+            $json_decode = json_decode($result, true);
+        }
+        curl_close($ch);
+
+        return array(
+            'result' => (null === $json_decode) ? $result : $json_decode,
+            'code' => $http_code,
+            'content_type' => $content_type
+        );
+    }
+
+    /**
+     * Set the name of the parameter that carry the access token
+     *
+     * @param string $name Token parameter name
+     * @return void
+     */
+    public function setAccessTokenParamName($name)
+    {
+        $this->access_token_param_name = $name;
+    }
+
+    /**
+     * Converts the class name to camel case
+     *
+     * @param  mixed  $grant_type  the grant type
+     * @return string
+     */
+    private function convertToCamelCase($grant_type)
+    {
+        $parts = explode('_', $grant_type);
+        array_walk($parts, function(&$item) { $item = ucfirst($item);});
+        return implode('', $parts);
+    }
+}
+
+class Exception extends \Exception
+{
+    const CURL_NOT_FOUND                     = 0x01;
+    const CURL_ERROR                         = 0x02;
+    const GRANT_TYPE_ERROR                   = 0x03;
+    const INVALID_CLIENT_AUTHENTICATION_TYPE = 0x04;
+    const INVALID_ACCESS_TOKEN_TYPE          = 0x05;
+}
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+    const INVALID_GRANT_TYPE      = 0x01;
+    const CERTIFICATE_NOT_FOUND   = 0x02;
+    const REQUIRE_PARAMS_AS_ARRAY = 0x03;
+    const MISSING_PARAMETER       = 0x04;
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php b/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php
new file mode 100644
index 000000000..f3436e4c5
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/AuthorizationCode.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Authorization code  Grant Type Validator
+ */
+class AuthorizationCode implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'authorization_code'.
+     */
+    const GRANT_TYPE = 'authorization_code';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['code']))
+        {
+            throw new InvalidArgumentException(
+                'The \'code\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['redirect_uri']))
+        {
+            throw new InvalidArgumentException(
+                'The \'redirect_uri\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php b/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php
new file mode 100644
index 000000000..c6c81f84b
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/ClientCredentials.php
@@ -0,0 +1,25 @@
+<?php
+namespace OAuth2\GrantType;
+
+/**
+ * Client Credentials Parameters 
+ */
+class ClientCredentials implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     * 
+     * @var string  Defaults to 'client_credentials'. 
+     */
+    const GRANT_TYPE = 'client_credentials';
+
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php b/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php
new file mode 100644
index 000000000..60631922f
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/IGrantType.php
@@ -0,0 +1,15 @@
+<?php
+namespace OAuth2\GrantType;
+/**
+ * Specific GrantType Interface
+ */
+interface IGrantType 
+{
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters);
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/Password.php b/plugins/login-oauth2/OAuth2/GrantType/Password.php
new file mode 100644
index 000000000..8972409c9
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/Password.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Password Parameters
+ */
+class Password implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'password'.
+     */
+    const GRANT_TYPE = 'password';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['username']))
+        {
+            throw new InvalidArgumentException(
+                'The \'username\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['password']))
+        {
+            throw new InvalidArgumentException(
+                'The \'password\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php b/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php
new file mode 100644
index 000000000..12fccb04e
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/GrantType/RefreshToken.php
@@ -0,0 +1,34 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Refresh Token  Parameters
+ */
+class RefreshToken implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'refresh_token'.
+     */
+    const GRANT_TYPE = 'refresh_token';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['refresh_token']))
+        {
+            throw new InvalidArgumentException(
+                'The \'refresh_token\' parameter must be defined for the refresh token grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/plugins/login-oauth2/OAuth2/LICENSE b/plugins/login-oauth2/OAuth2/LICENSE
new file mode 100644
index 000000000..8000a6faa
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/LICENSE
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+    USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random
+  Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/plugins/login-oauth2/OAuth2/README.md b/plugins/login-oauth2/OAuth2/README.md
new file mode 100644
index 000000000..9de3570e0
--- /dev/null
+++ b/plugins/login-oauth2/OAuth2/README.md
@@ -0,0 +1,105 @@
+# Light PHP wrapper for the OAuth 2.0
+
+[![Latest Stable Version](https://poser.pugx.org/adoy/fastcgi-client/v/stable)](https://packagist.org/packages/adoy/fastcgi-client)
+[![GitHub](https://img.shields.io/github/license/adoy/PHP-OAuth2)](LICENSE)
+[![Total Downloads](https://poser.pugx.org/adoy/fastcgi-client/downloads)](https://packagist.org/packages/adoy/fastcgi-client)
+
+
+## How can I use it ?
+
+```php
+<?php
+
+require('Client.php');
+require('GrantType/IGrantType.php');
+require('GrantType/AuthorizationCode.php');
+
+const CLIENT_ID     = 'your client id';
+const CLIENT_SECRET = 'your client secret';
+
+const REDIRECT_URI           = 'http://url/of/this.php';
+const AUTHORIZATION_ENDPOINT = 'https://graph.facebook.com/oauth/authorize';
+const TOKEN_ENDPOINT         = 'https://graph.facebook.com/oauth/access_token';
+
+$client = new OAuth2\Client(CLIENT_ID, CLIENT_SECRET);
+if (!isset($_GET['code']))
+{
+    $auth_url = $client->getAuthenticationUrl(AUTHORIZATION_ENDPOINT, REDIRECT_URI);
+    header('Location: ' . $auth_url);
+    die('Redirect');
+}
+else
+{
+    $params = array('code' => $_GET['code'], 'redirect_uri' => REDIRECT_URI);
+    $response = $client->getAccessToken(TOKEN_ENDPOINT, 'authorization_code', $params);
+    parse_str($response['result'], $info);
+    $client->setAccessToken($info['access_token']);
+    $response = $client->fetch('https://graph.facebook.com/me');
+    var_dump($response, $response['result']);
+}
+```
+
+## How can I add a new Grant Type ?
+
+Simply write a new class in the namespace OAuth2\GrantType. You can place the class file under GrantType.
+Here is an example :
+
+```php
+<?php
+
+namespace OAuth2\GrantType;
+
+/**
+ * MyCustomGrantType Grant Type
+ */
+class MyCustomGrantType implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'my_custom_grant_type'.
+     */
+    const GRANT_TYPE = 'my_custom_grant_type';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['first_mandatory_parameter']))
+        {
+            throw new \Exception('The \'first_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+        elseif (!isset($parameters['second_mandatory_parameter']))
+        {
+            throw new \Exception('The \'seconde_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+    }
+}
+```
+
+call the OAuth client getAccessToken with the grantType you defined in the GRANT_TYPE constant, As following :
+
+```
+$response = $client->getAccessToken(TOKEN_ENDPOINT, 'my_custom_grant_type', $params);
+```
+
+## LICENSE
+
+This Code is released under the GNU LGPL
+
+Please do not change the header of the file(s).
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU Lesser General Public License for more details.
diff --git a/plugins/login-oauth2/index.php b/plugins/login-oauth2/index.php
index 2c266833d..99351c81b 100644
--- a/plugins/login-oauth2/index.php
+++ b/plugins/login-oauth2/index.php
@@ -4,9 +4,9 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'OAuth2',
-		VERSION  = '1.0',
-		RELEASE  = '2021-11-12',
-		REQUIRED = '2.9.1',
+		VERSION  = '1.3',
+		RELEASE  = '2024-03-27',
+		REQUIRED = '2.36.1',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'IMAP, Sieve & SMTP login using RFC 7628 OAuth2';
 
@@ -19,19 +19,26 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 	{
 		$this->UseLangs(true);
 		$this->addJs('LoginOAuth2.js');
-//		$this->addHook('imap.before-connect', array($this, $oImapClient, &$aCredentials));
-//		$this->addHook('imap.after-connect', array($this, $oImapClient, $aCredentials));
+//		$this->addHook('imap.before-connect', array($this, $oImapClient, $oSettings));
+//		$this->addHook('imap.after-connect', array($this, $oImapClient, $oSettings));
 		$this->addHook('imap.before-login', 'clientLogin');
-//		$this->addHook('imap.after-login', array($this, $oImapClient, $aCredentials));
-//		$this->addHook('smtp.before-connect', array($this, $oSmtpClient, &$aCredentials));
-//		$this->addHook('smtp.after-connect', array($this, $oSmtpClient, $aCredentials));
+//		$this->addHook('imap.after-login', array($this, $oImapClient, $oSettings));
+//		$this->addHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
+//		$this->addHook('smtp.after-connect', array($this, $oSmtpClient, $oSettings));
 		$this->addHook('smtp.before-login', 'clientLogin');
-//		$this->addHook('smtp.after-login', array($this, $oSmtpClient, $aCredentials));
-//		$this->addHook('sieve.before-connect', array($this, $oSieveClient, &$aCredentials));
-//		$this->addHook('sieve.after-connect', array($this, $oSieveClient, $aCredentials));
+//		$this->addHook('smtp.after-login', array($this, $oSmtpClient, $oSettings));
+//		$this->addHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
+//		$this->addHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));
 		$this->addHook('sieve.before-login', 'clientLogin');
-//		$this->addHook('sieve.after-login', array($this, $oSieveClient, $aCredentials));
+//		$this->addHook('sieve.after-login', array($this, $oSieveClient, $oSettings));
 		$this->addHook('filter.account', 'filterAccount');
+
+//		set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__);
+		spl_autoload_register(function($classname){
+			if (str_starts_with($classname, 'OAuth2\\')) {
+				include_once __DIR__ . strtr("\\{$sClassName}", '\\', DIRECTORY_SEPARATOR) . '.php';
+			}
+		});
 	}
 
 	public function configMapping() : array
@@ -46,9 +53,9 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		];
 	}
 
-	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, array &$aCredentials) : void
+	public function clientLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
 	{
-		$sPassword = $aCredentials['Password'];
+		$sPassword = $oSettings->passphrase;
 		$iGatLen = \strlen(static::GMAIL_TOKENS_PREFIX);
 		if ($sPassword && static::GMAIL_TOKENS_PREFIX === \substr($sPassword, 0, $iGatLen)) {
 			$aTokens = \json_decode(\substr($sPassword, $iGatLen));
@@ -56,8 +63,8 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 			$sRefreshToken = !empty($aTokens[1]) ? $aTokens[1] : '';
 		}
 		if ($sAccessToken && $sRefreshToken) {
-			$aCredentials['Password'] = $this->gmailRefreshToken($sAccessToken, $sRefreshToken);
-			\array_unshift($aCredentials['SASLMechanisms'], 'OAUTHBEARER', 'XOAUTH2');
+			$oSettings->passphrase = $this->gmailRefreshToken($sAccessToken, $sRefreshToken);
+			\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER', 'XOAUTH2');
 		}
 	}
 
@@ -70,8 +77,8 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 			 * So we need to securely save a cryptkey.
 			 * Encrypted using the old/new refresh token is an option:
 			 *   1. decrypt cryptkey with the old refresh token
-			 *   2. $oAccount->SetCryptKey('cryptkey')
-			 *   3. encrypt cryptkey with the new refresh token
+			 *   2. encrypt cryptkey with the new refresh token
+			 *   = $oAccount->resealCryptKey(new \SnappyMail\SensitiveString('old refresh token'))
 			 */
 		}
 	}
@@ -82,9 +89,8 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		$iErrorCode = \RainLoop\Notifications::UnknownError;
 		try
 		{
-			$oAccount = $oActions->LoginProcess($sEmail, $sPassword, '', '', false, true);
+			$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
 			if ($oAccount instanceof \RainLoop\Model\Account) {
-				$oActions->AuthToken($oAccount);
 				$iErrorCode = 0;
 			} else {
 				$oAccount = null;
@@ -175,10 +181,10 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		$client_id = \trim($this->Config()->Get('plugin', 'client_id', ''));
 		$client_secret = \trim($this->Config()->Get('plugin', 'client_secret', ''));
 		if ($client_id && $client_secret) {
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/Client.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/IGrantType.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/AuthorizationCode.php';
-			include_once APP_VERSION_ROOT_PATH.'app/libraries/PHP-OAuth2/GrantType/RefreshToken.php';
+//			include_once __DIR__ . '/OAuth2/Client.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/IGrantType.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/AuthorizationCode.php';
+//			include_once __DIR__ . '/OAuth2/GrantType/RefreshToken.php';
 
 			try
 			{
@@ -194,7 +200,7 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 			}
 			catch (\Exception $oException)
 			{
-				$oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+				$oActions->Logger()->WriteException($oException, \LOG_ERR);
 			}
 		}
 
@@ -292,7 +298,7 @@ class LoginOAuth2Plugin extends \RainLoop\Plugins\AbstractPlugin
 		}
 		catch (\Exception $oException)
 		{
-			$oActions->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+			$oActions->Logger()->WriteException($oException, \LOG_ERR);
 		}
 
 		$oActions = \RainLoop::Actions();
diff --git a/plugins/proxyauth-login-example/LICENSE b/plugins/login-override/LICENSE
similarity index 100%
rename from plugins/proxyauth-login-example/LICENSE
rename to plugins/login-override/LICENSE
diff --git a/plugins/login-override/index.php b/plugins/login-override/index.php
new file mode 100644
index 000000000..cef399dd9
--- /dev/null
+++ b/plugins/login-override/index.php
@@ -0,0 +1,86 @@
+<?php
+
+class LoginOverridePlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Login Override',
+		VERSION = '2.4',
+		RELEASE = '2024-09-20',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Filters',
+		DESCRIPTION = 'Override IMAP/SMTP login credentials for specific users.';
+
+	public function Init() : void
+	{
+		$this->addHook('login.credentials', 'MapEmailAddress');
+		$this->addHook('imap.before-login', 'MapImapCredentials');
+		$this->addHook('smtp.before-login', 'MapSmtpCredentials');
+	}
+
+	public function MapEmailAddress(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		$sMapping = \trim($this->Config()->Get('plugin', 'email_mapping', ''));
+		if (!empty($sMapping)) {
+			$aList = \preg_split('/\\R/', $sMapping);
+			foreach ($aList as $sLine) {
+				$aData = \explode(':', $sLine, 2);
+				if (!empty($aData[1]) && $sEmail === \trim($aData[0])) {
+					$sEmail = \trim($aData[1]);
+					break;
+				}
+			}
+		}
+	}
+
+	public function MapImapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oSmtpClient, \MailSo\Imap\Settings $oSettings)
+	{
+		static::MapCredentials($oAccount, $oSettings, $this->Config()->getDecrypted('plugin', 'imap_mapping', ''));
+	}
+
+	public function MapSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
+	{
+		static::MapCredentials($oAccount, $oSettings, $this->Config()->getDecrypted('plugin', 'smtp_mapping', ''));
+	}
+
+	private static function MapCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Net\ConnectSettings $oSettings, string $sMapping)
+	{
+		$sEmail = $oAccount->Email();
+		$aList = \preg_split('/\\R/', \trim($sMapping));
+		foreach ($aList as $line) {
+			$line = \explode(':', $line, 3);
+			if (!empty($line[0]) && $line[0] === $sEmail) {
+				if (!empty($line[1])) {
+					$oSettings->username = $line[1];
+				}
+				if (!empty($line[2])) {
+					$oSettings->passphrase = $line[2];
+				}
+				break;
+			}
+		}
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('email_mapping')
+				->SetLabel('Email mapping')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Changes email address as login@example.com:email@example.com')
+				->SetDefaultValue('john-user1@example.com:john.doe@example.com')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('imap_mapping')
+				->SetLabel('IMAP mapping')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Each line as email:loginname:password, loginname or password may be empty to use default')
+				->SetDefaultValue('user@example.com:user1:password1')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('smtp_mapping')
+				->SetLabel('SMTP mapping')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Each line as email:loginname:password, loginname or password may be empty to use default')
+				->SetDefaultValue('user@example.com:user1:password1')
+				->SetEncrypted()
+		);
+	}
+}
diff --git a/plugins/login-proxyauth-example/LICENSE b/plugins/login-proxyauth-example/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-proxyauth-example/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-proxyauth-example/index.php b/plugins/login-proxyauth-example/index.php
new file mode 100644
index 000000000..7b3ebcf4b
--- /dev/null
+++ b/plugins/login-proxyauth-example/index.php
@@ -0,0 +1,33 @@
+<?php
+
+class LoginProxyauthExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login PROXYAUTH',
+		VERSION  = '1.0',
+		RELEASE  = '2024-03-12',
+		REQUIRED = '2.35.3',
+		CATEGORY = 'Login',
+		DESCRIPTION = 'IMAP login using PROXYAUTH';
+
+	public function Init() : void
+	{
+		$this->addHook('imap.before-login', 'beforeLogin');
+		$this->addHook('imap.after-login', 'afterLogin');
+	}
+
+	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oImapClient, \MailSo\Net\ConnectSettings $oSettings) : void
+	{
+		if ('example.com' === $oAccount->Domain()->Name()) {
+			$oSettings->username = 'AdminUsername';
+			$oSettings->passphrase = 'AdminPassword';
+		}
+	}
+
+	public function afterLogin(\RainLoop\Model\Account $oAccount, \MailSo\Imap\ImapClient $oImapClient, bool $bSuccess)
+	{
+		if ($bSuccess && 'example.com' === $oAccount->Domain()->Name()) {
+			$oImapClient->SendRequestGetResponse('PROXYAUTH', array($oImapClient->EscapeString($oAccount->IncLogin())));
+		}
+	}
+}
diff --git a/plugins/login-register/index.php b/plugins/login-register/index.php
index ff149c791..7d7a62e11 100644
--- a/plugins/login-register/index.php
+++ b/plugins/login-register/index.php
@@ -4,9 +4,9 @@ class LoginRegisterPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Register and Forgot',
-		VERSION  = '2.1',
-		RELEASE  = '2021-10-04',
-		REQUIRED = '2.5.2',
+		VERSION  = '2.2',
+		RELEASE  = '2024-03-29',
+		REQUIRED = '2.36.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Links on login screen for registration and forgotten password';
 
diff --git a/plugins/login-register/langs/ar-SA.json b/plugins/login-register/langs/ar.json
similarity index 100%
rename from plugins/login-register/langs/ar-SA.json
rename to plugins/login-register/langs/ar.json
diff --git a/plugins/login-register/langs/bg-BG.json b/plugins/login-register/langs/bg.json
similarity index 100%
rename from plugins/login-register/langs/bg-BG.json
rename to plugins/login-register/langs/bg.json
diff --git a/plugins/login-register/langs/cs-CZ.json b/plugins/login-register/langs/cs.json
similarity index 100%
rename from plugins/login-register/langs/cs-CZ.json
rename to plugins/login-register/langs/cs.json
diff --git a/plugins/login-register/langs/da-DK.json b/plugins/login-register/langs/da.json
similarity index 100%
rename from plugins/login-register/langs/da-DK.json
rename to plugins/login-register/langs/da.json
diff --git a/plugins/login-register/langs/de-DE.json b/plugins/login-register/langs/de.json
similarity index 100%
rename from plugins/login-register/langs/de-DE.json
rename to plugins/login-register/langs/de.json
diff --git a/plugins/login-register/langs/el-GR.json b/plugins/login-register/langs/el.json
similarity index 100%
rename from plugins/login-register/langs/el-GR.json
rename to plugins/login-register/langs/el.json
diff --git a/plugins/login-register/langs/es-ES.json b/plugins/login-register/langs/es.json
similarity index 100%
rename from plugins/login-register/langs/es-ES.json
rename to plugins/login-register/langs/es.json
diff --git a/plugins/login-register/langs/et-EE.json b/plugins/login-register/langs/et.json
similarity index 100%
rename from plugins/login-register/langs/et-EE.json
rename to plugins/login-register/langs/et.json
diff --git a/plugins/login-register/langs/fa-IR.json b/plugins/login-register/langs/fa.json
similarity index 100%
rename from plugins/login-register/langs/fa-IR.json
rename to plugins/login-register/langs/fa.json
diff --git a/plugins/login-register/langs/fi-FI.json b/plugins/login-register/langs/fi.json
similarity index 100%
rename from plugins/login-register/langs/fi-FI.json
rename to plugins/login-register/langs/fi.json
diff --git a/plugins/login-register/langs/fr-FR.json b/plugins/login-register/langs/fr.json
similarity index 51%
rename from plugins/login-register/langs/fr-FR.json
rename to plugins/login-register/langs/fr.json
index 3f0c91586..d317903f8 100644
--- a/plugins/login-register/langs/fr-FR.json
+++ b/plugins/login-register/langs/fr.json
@@ -4,7 +4,7 @@
 		"LABEL_REGISTRATION": "S'enregistrer"
 	},
 	"TAB_LOGIN": {
-		"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
-		"LABEL_REGISTRATION_LINK_URL": "Register url"
+		"LABEL_FORGOT_PASSWORD_LINK_URL": "URL du mot de passe oublié",
+		"LABEL_REGISTRATION_LINK_URL": "URL d'enregistrement"
 	}
 }
diff --git a/plugins/login-register/langs/hu-HU.json b/plugins/login-register/langs/hu.json
similarity index 100%
rename from plugins/login-register/langs/hu-HU.json
rename to plugins/login-register/langs/hu.json
diff --git a/plugins/login-register/langs/id-ID.json b/plugins/login-register/langs/id.json
similarity index 100%
rename from plugins/login-register/langs/id-ID.json
rename to plugins/login-register/langs/id.json
diff --git a/plugins/login-register/langs/is-IS.json b/plugins/login-register/langs/is.json
similarity index 100%
rename from plugins/login-register/langs/is-IS.json
rename to plugins/login-register/langs/is.json
diff --git a/plugins/login-register/langs/it-IT.json b/plugins/login-register/langs/it.json
similarity index 100%
rename from plugins/login-register/langs/it-IT.json
rename to plugins/login-register/langs/it.json
diff --git a/plugins/login-register/langs/ja-JP.json b/plugins/login-register/langs/ja.json
similarity index 100%
rename from plugins/login-register/langs/ja-JP.json
rename to plugins/login-register/langs/ja.json
diff --git a/plugins/login-register/langs/ko-KR.json b/plugins/login-register/langs/ko.json
similarity index 100%
rename from plugins/login-register/langs/ko-KR.json
rename to plugins/login-register/langs/ko.json
diff --git a/plugins/login-register/langs/lt-LT.json b/plugins/login-register/langs/lt.json
similarity index 100%
rename from plugins/login-register/langs/lt-LT.json
rename to plugins/login-register/langs/lt.json
diff --git a/plugins/login-register/langs/lv-LV.json b/plugins/login-register/langs/lv.json
similarity index 100%
rename from plugins/login-register/langs/lv-LV.json
rename to plugins/login-register/langs/lv.json
diff --git a/plugins/login-register/langs/nb-NO.json b/plugins/login-register/langs/nb.json
similarity index 100%
rename from plugins/login-register/langs/nb-NO.json
rename to plugins/login-register/langs/nb.json
diff --git a/plugins/login-register/langs/nl-NL.json b/plugins/login-register/langs/nl.json
similarity index 100%
rename from plugins/login-register/langs/nl-NL.json
rename to plugins/login-register/langs/nl.json
diff --git a/plugins/login-register/langs/pl-PL.json b/plugins/login-register/langs/pl.json
similarity index 100%
rename from plugins/login-register/langs/pl-PL.json
rename to plugins/login-register/langs/pl.json
diff --git a/plugins/login-register/langs/pt-PT.json b/plugins/login-register/langs/pt-PT.json
deleted file mode 100644
index a667b32c1..000000000
--- a/plugins/login-register/langs/pt-PT.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-	"LOGIN": {
-		"LABEL_FORGOT_PASSWORD": "Esqueci-me da palavra-passe",
-		"LABEL_REGISTRATION": "Registo"
-	},
-	"TAB_LOGIN": {
-		"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
-		"LABEL_REGISTRATION_LINK_URL": "Register url"
-	}
-}
diff --git a/plugins/login-register/langs/pt-BR.json b/plugins/login-register/langs/pt.json
similarity index 100%
rename from plugins/login-register/langs/pt-BR.json
rename to plugins/login-register/langs/pt.json
diff --git a/plugins/login-register/langs/ro-RO.json b/plugins/login-register/langs/ro.json
similarity index 100%
rename from plugins/login-register/langs/ro-RO.json
rename to plugins/login-register/langs/ro.json
diff --git a/plugins/login-register/langs/ru-RU.json b/plugins/login-register/langs/ru.json
similarity index 100%
rename from plugins/login-register/langs/ru-RU.json
rename to plugins/login-register/langs/ru.json
diff --git a/plugins/login-register/langs/sk-SK.json b/plugins/login-register/langs/sk.json
similarity index 100%
rename from plugins/login-register/langs/sk-SK.json
rename to plugins/login-register/langs/sk.json
diff --git a/plugins/login-register/langs/sl-SI.json b/plugins/login-register/langs/sl.json
similarity index 100%
rename from plugins/login-register/langs/sl-SI.json
rename to plugins/login-register/langs/sl.json
diff --git a/plugins/login-register/langs/sv-SE.json b/plugins/login-register/langs/sv.json
similarity index 100%
rename from plugins/login-register/langs/sv-SE.json
rename to plugins/login-register/langs/sv.json
diff --git a/plugins/login-register/langs/tr-TR.json b/plugins/login-register/langs/tr.json
similarity index 100%
rename from plugins/login-register/langs/tr-TR.json
rename to plugins/login-register/langs/tr.json
diff --git a/plugins/login-register/langs/uk-UA.json b/plugins/login-register/langs/uk.json
similarity index 100%
rename from plugins/login-register/langs/uk-UA.json
rename to plugins/login-register/langs/uk.json
diff --git a/plugins/login-register/langs/zh-CN.json b/plugins/login-register/langs/zh.json
similarity index 51%
rename from plugins/login-register/langs/zh-CN.json
rename to plugins/login-register/langs/zh.json
index a1c5787c0..08823a0cb 100644
--- a/plugins/login-register/langs/zh-CN.json
+++ b/plugins/login-register/langs/zh.json
@@ -4,7 +4,7 @@
 		"LABEL_REGISTRATION": "注册"
 	},
 	"TAB_LOGIN": {
-		"LABEL_FORGOT_PASSWORD_LINK_URL": "Forgot password url",
-		"LABEL_REGISTRATION_LINK_URL": "Register url"
+		"LABEL_FORGOT_PASSWORD_LINK_URL": "忘记密码 Url",
+		"LABEL_REGISTRATION_LINK_URL": "注册 Url"
 	}
 }
diff --git a/plugins/login-remote/LICENSE b/plugins/login-remote/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/login-remote/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/login-remote/index.php b/plugins/login-remote/index.php
new file mode 100644
index 000000000..fe5bb7282
--- /dev/null
+++ b/plugins/login-remote/index.php
@@ -0,0 +1,78 @@
+<?php
+
+class LoginRemotePlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Login Remote',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '1.6',
+		RELEASE  = '2026-10-22',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Tries to login using the $_ENV["REMOTE_*"] variables';
+
+	public function Init() : void
+	{
+		$this->addPartHook('RemoteAutoLogin', 'ServiceRemoteAutoLogin');
+		$this->addHook('filter.app-data', 'FilterAppData');
+		$this->addHook('login.credentials', 'FilterLoginCredentials');
+	}
+
+	public function FilterAppData($bAdmin, &$aResult)
+	{
+		if (!$bAdmin && \is_array($aResult) && empty($aResult['Auth']) && isset($_ENV['REMOTE_USER'])) {
+			$aResult['DevEmail'] = $_ENV['REMOTE_USER'];
+//			$aResult['DevPassword'] = $_ENV['REMOTE_PASSWORD'];
+		}
+	}
+
+	private static bool $login = false;
+	public function ServiceRemoteAutoLogin() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+
+		$oException = null;
+		$oAccount = null;
+
+		$sEmail = $_ENV['REMOTE_USER'] ?? '';
+		$sPassword = $_ENV['REMOTE_PASSWORD'] ?? '';
+
+		if (\strlen($sEmail) && \strlen($sPassword)) {
+			try
+			{
+				static::$login = true;
+				$sPassword = new \SnappyMail\SensitiveString($sPassword);
+				$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+			}
+			catch (\Throwable $oException)
+			{
+				$oLogger = $oActions->Logger();
+				$oLogger && $oLogger->WriteException($oException);
+			}
+		}
+
+		\MailSo\Base\Http::Location('./');
+		return true;
+	}
+
+	public function FilterLoginCredentials(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		// cPanel https://github.com/the-djmaze/snappymail/issues/697
+//		 && !empty($_ENV['CPANEL'])
+		if (static::$login/* && $sImapUser == $_ENV['REMOTE_USER']*/) {
+			if (empty($_ENV['REMOTE_TEMP_USER'])) {
+				$iPos = \strpos($sPassword, '[::cpses::]');
+				if ($iPos) {
+					$_ENV['REMOTE_TEMP_USER'] = \substr($sPassword, 0, $iPos);
+				}
+			}
+			if (!empty($_ENV['REMOTE_TEMP_USER'])) {
+				$sImapUser = $_ENV['REMOTE_USER'] . '/' . $_ENV['REMOTE_TEMP_USER'];
+				$sSmtpUser = $_ENV['REMOTE_USER'] . '/' . $_ENV['REMOTE_TEMP_USER'];
+			}
+		}
+	}
+
+}
diff --git a/plugins/login-virtuser/index.php b/plugins/login-virtuser/index.php
new file mode 100644
index 000000000..88207baec
--- /dev/null
+++ b/plugins/login-virtuser/index.php
@@ -0,0 +1,71 @@
+<?php
+
+class LoginVirtuserPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Virtuser Login',
+		AUTHOR = 'v20z',
+		URL     = 'https://github.com/the-djmaze/snappymail/issues/1691',
+		VERSION = '0.2',
+		RELEASE = '2024-09-20',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		DESCRIPTION = 'File based Email-to-User lookup.';
+
+	public function Init() : void
+	{
+		$this->addHook('login.credentials', 'ParseVirtuserFiles');
+	}
+
+	/**
+	 * @param string $sEmail
+	 * @param string $sImapUser
+	 * @param string $sPassword
+	 * @param string $sSmtpUser
+	 *
+	 * @throws \RainLoop\Exceptions\ClientException
+	 */
+	public function ParseVirtuserFiles(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		$sFiles = \trim($this->Config()->Get('plugin', 'virtuser_files', ''));
+		if (!empty($sFiles))
+		{
+			$aFiles = \explode("\n", \preg_replace('/[\r\n\t\s]+/', "\n", $sFiles));
+			foreach ($aFiles as $sFile)
+			{
+				$fContent = file("$sFile");
+				if (empty($fContent)) {
+					continue;
+				}
+
+				foreach($fContent as $sLine) {
+					$sLine = trim($sLine);
+					if (empty($sLine) || $sLine[0] == '#') {
+						continue;
+					}
+
+					$aData = preg_split( '/[[:blank:]]+/', $sLine, 3, PREG_SPLIT_NO_EMPTY);
+					if (is_array($aData) && !empty($aData[0]) && isset($aData[1])) {
+						if ($sEmail === $aData[0] && 0 < strlen($aData[1])) {
+							$sImapUser = $aData[1];
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('virtuser_files')->SetLabel('Virtuser files')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Each line is an absolute path to virtuser file')
+				->SetDefaultValue("/etc/postfix/virtual\n/etc/mail/virtusertable")
+		);
+	}
+}
diff --git a/plugins/mailbox-detect/index.php b/plugins/mailbox-detect/index.php
new file mode 100644
index 000000000..04ffe68d0
--- /dev/null
+++ b/plugins/mailbox-detect/index.php
@@ -0,0 +1,228 @@
+<?php
+
+use MailSo\Imap\Enumerations\FolderType;
+use MailSo\Imap\Enumerations\MetadataKeys;
+
+class MailboxDetectPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'MailboxDetect',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '2.6',
+		RELEASE  = '2023-03-13',
+		REQUIRED = '2.27.0',
+		CATEGORY = 'General',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Autodetect system folders and/or create them when needed';
+
+	public function Init() : void
+	{
+		$this->addHook('json.after-folders', 'AfterFolders');
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('autocreate_system_folders')->SetLabel('Autocreate system folders')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false),
+		);
+	}
+
+	protected function Logger() : \MailSo\Log\Logger
+	{
+		return $this->Manager()->Actions()->Logger();
+	}
+
+	public function AfterFolders(array &$aResponse)
+	{
+		if (!empty($aResponse['Result']['@Collection'])) {
+			$oActions = \RainLoop\Api::Actions();
+			$oAccount = $oActions->getAccountFromToken();
+			if (!$oAccount) {
+				$this->Logger()->Write('No Account');
+				return;
+			}
+			$oSettingsLocal = $oActions->SettingsProvider(true)->Load($oAccount);
+			$roles = [
+				'inbox'   => false,
+				'sent'    => !!$oSettingsLocal->GetConf('SentFolder', ''),
+				'drafts'  => !!$oSettingsLocal->GetConf('DraftsFolder', ''),
+				'junk'    => !!$oSettingsLocal->GetConf('JunkFolder', ''),
+				'trash'   => !!$oSettingsLocal->GetConf('TrashFolder', ''),
+				'archive' => !!$oSettingsLocal->GetConf('ArchiveFolder', '')
+			];
+			$types = [
+				FolderType::SENT => 'sent',
+				FolderType::DRAFTS => 'drafts',
+				FolderType::JUNK => 'junk',
+				FolderType::TRASH => 'trash',
+				FolderType::ARCHIVE => 'archive'
+			];
+			$found = [
+				'inbox'   => [],
+				'sent'    => [],
+				'drafts'  => [],
+				'junk'    => [],
+				'trash'   => [],
+				'archive' => []
+			];
+			$aMap = $this->systemFoldersNames($oAccount);
+			$sDelimiter = '';
+			foreach ($aResponse['Result']['@Collection'] as $i => $folder) {
+				$sDelimiter || ($sDelimiter = $folder['delimiter']);
+				if ($folder['role']) {
+					$roles[$folder['role']] = true;
+				} else if (\in_array('\\sentmail', $folder['attributes'])) {
+					$found['sent'][] = $i;
+				} else if (\in_array('\\spam', $folder['attributes'])) {
+					$found['junk'][] = $i;
+				} else if (\in_array('\\bin', $folder['attributes'])) {
+					$found['trash'][] = $i;
+				} else if (\in_array('\\starred', $folder['attributes'])) {
+					$found['flagged'][] = $i;
+				} else {
+					// Kolab
+					$kolab = $folder['metadata'][MetadataKeys::KOLAB_CTYPE]
+						?? $folder['metadata'][MetadataKeys::KOLAB_CTYPE_SHARED]
+						?? '';
+					if ('mail.inbox' === $kolab) {
+						$found['inbox'][] = $i;
+					} else if ('mail.sentitems' === $kolab /*|| 'mail.outbox' === $kolab*/) {
+						$found['sent'][] = $i;
+					} else if ('mail.drafts' === $kolab) {
+						$found['drafts'][] = $i;
+					} else if ('mail.junkemail' === $kolab) {
+						$found['junk'][] = $i;
+					} else if ('mail.wastebasket' === $kolab) {
+						$found['trash'][] = $i;
+					} else {
+						$iFolderType = 0;
+						if (isset($aMap[$folder['fullName']])) {
+							$iFolderType = $aMap[$folder['fullName']];
+						} else if (isset($aMap[$folder['name']]) || isset($aMap["INBOX{$folder['delimiter']}{$folder['name']}"])) {
+							$iFolderType = $aMap[$folder['name']];
+						}
+						if ($iFolderType && isset($types[$iFolderType])) {
+							$found[$types[$iFolderType]][] = $i;
+						}
+					}
+				}
+			}
+			foreach ($roles as $role => $hasRole) {
+				if ($hasRole) {
+					unset($found[$role]);
+				}
+			}
+			if ($found) {
+				foreach ($found as $role => $folders) {
+					if (isset($folders[0])) {
+						// Set the first as default
+						$aFolder = &$aResponse['Result']['@Collection'][$folders[0]];
+						$this->Logger()->Write("Set {$role} mailbox to {$aFolder['fullName']}");
+						$aFolder['role'] = $role;
+					} else if ($this->Config()->Get('plugin', 'autocreate_system_folders', false)) {
+						try
+						{
+							$sParent = \substr($aResponse['Result']['namespace'], 0, -1);
+							$sFolderNameToCreate = \ucfirst($role);
+/*
+							$this->Manager()->RunHook('filter.folders-system-types', array($oAccount, &$aList));
+							$iPos = \strrpos($sFolderNameToCreate, $sDelimiter);
+							if (false !== $iPos) {
+								$mNewParent = \substr($sFolderNameToCreate, 0, $iPos);
+								$mNewFolderNameToCreate = \substr($sFolderNameToCreate, $iPos + 1);
+								if (\strlen($mNewFolderNameToCreate)) {
+									$sFolderNameToCreate = $mNewFolderNameToCreate;
+								}
+
+								if (\strlen($mNewParent)) {
+									$sParent = \strlen($sParent) ? $sParent.$sDelimiter.$mNewParent : $mNewParent;
+								}
+							}
+*/
+							$this->Logger()->Write("Create {$role} mailbox {$sFolderNameToCreate}");
+							$aFolder = $oActions->MailClient()->FolderCreate(
+								$sFolderNameToCreate,
+								$sParent,
+								true,
+								$sDelimiter
+							)->jsonSerialize();
+							$aFolder['role'] = $role;
+							$aResponse['Result']['@Collection'][] = $aFolder;
+						}
+						catch (\Throwable $oException)
+						{
+							$this->Logger()->WriteException($oException);
+						}
+					} else {
+						$this->Logger()->Write("Mailbox for {$role} not created");
+					}
+				}
+			}
+		}
+	}
+
+	/**
+	 * @staticvar array $aCache
+	 */
+	private function systemFoldersNames(\RainLoop\Model\Account $oAccount) : array
+	{
+		static $aCache = null;
+		if (null === $aCache) {
+			$aCache = array(
+				'Sent' => FolderType::SENT,
+				'Send' => FolderType::SENT,
+				'Outbox' => FolderType::SENT,
+				'Out box' => FolderType::SENT,
+				'Sent Item' => FolderType::SENT,
+				'Sent Items' => FolderType::SENT,
+				'Send Item' => FolderType::SENT,
+				'Send Items' => FolderType::SENT,
+				'Sent Mail' => FolderType::SENT,
+				'Sent Mails' => FolderType::SENT,
+				'Send Mail' => FolderType::SENT,
+				'Send Mails' => FolderType::SENT,
+
+				'Drafts' => FolderType::DRAFTS,
+				'Draft' => FolderType::DRAFTS,
+				'Draft Mail' => FolderType::DRAFTS,
+				'Draft Mails' => FolderType::DRAFTS,
+				'Drafts Mail' => FolderType::DRAFTS,
+				'Drafts Mails' => FolderType::DRAFTS,
+
+				'Junk' => FolderType::JUNK,
+				'Junk E-mail' => FolderType::JUNK,
+				'Spam' => FolderType::JUNK,
+				'Spams' => FolderType::JUNK,
+				'Bulk Mail' => FolderType::JUNK,
+				'Bulk Mails' => FolderType::JUNK,
+
+				'Trash' => FolderType::TRASH,
+				'Deleted' => FolderType::TRASH,
+				'Deleted Items' => FolderType::TRASH,
+				'Bin' => FolderType::TRASH,
+
+				'Archive' => FolderType::ARCHIVE,
+				'Archives' => FolderType::ARCHIVE,
+
+				'All' => FolderType::ALL,
+				'All Mail' => FolderType::ALL,
+				'All Mails' => FolderType::ALL,
+			);
+
+			$aNewCache = array();
+			foreach ($aCache as $sKey => $iType) {
+				$aNewCache[$sKey] = $iType;
+				$aNewCache[\str_replace(' ', '', $sKey)] = $iType;
+			}
+
+			$aCache = $aNewCache;
+
+			$this->Manager()->RunHook('filter.system-folders-names', array($oAccount, &$aCache));
+		}
+
+		return $aCache;
+	}
+}
diff --git a/plugins/nextcloud/LICENSE b/plugins/nextcloud/LICENSE
new file mode 100644
index 000000000..9e5e56cdd
--- /dev/null
+++ b/plugins/nextcloud/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 SnappyMail
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/nextcloud/NextcloudContactsSuggestions.php b/plugins/nextcloud/NextcloudContactsSuggestions.php
new file mode 100644
index 000000000..34d1cbe49
--- /dev/null
+++ b/plugins/nextcloud/NextcloudContactsSuggestions.php
@@ -0,0 +1,80 @@
+<?php
+
+class NextcloudContactsSuggestions implements \RainLoop\Providers\Suggestions\ISuggestions
+{
+	use \MailSo\Log\Inherit;
+
+	private bool $ignoreSystemAddressbook;
+
+	function __construct(bool $ignoreSystemAddressbook = true)
+	{
+		$this->ignoreSystemAddressbook = $ignoreSystemAddressbook;
+	}
+
+	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20): array
+	{
+		try
+		{
+			$sQuery = \trim($sQuery);
+			if ('' === $sQuery) {
+				return [];
+			}
+
+			$cm = \OC::$server->getContactsManager();
+			if (!$cm || !$cm->isEnabled()) {
+				return [];
+			}
+
+			// Unregister system addressbook so as to return only contacts in user's addressbooks
+			if ($this->ignoreSystemAddressbook) {
+				foreach($cm->getUserAddressBooks() as $addressBook) {
+					if($addressBook->isSystemAddressBook()) {
+						 $cm->unregisterAddressBook($addressBook);
+					}
+				}
+			}
+
+			$aSearchResult = $cm->search($sQuery, array('FN', 'NICKNAME', 'TITLE', 'EMAIL'));
+
+			//$this->oLogger->WriteDump($aSearchResult);
+
+			if (\is_array($aSearchResult) && 0 < \count($aSearchResult)) {
+				$iInputLimit = $iLimit;
+				$aResult = array();
+				foreach ($aSearchResult as $aContact) {
+					if (0 >= $iLimit) {
+						break;
+					}
+					if (!empty($aContact['UID'])) {
+						$sUid = $aContact['UID'];
+						$mEmails = isset($aContact['EMAIL']) ? $aContact['EMAIL'] : '';
+
+						$sFullName = isset($aContact['FN']) ? \trim($aContact['FN']) : '';
+						if (empty($sFullName) && isset($aContact['NICKNAME'])) {
+							$sFullName = \trim($aContact['NICKNAME']);
+						}
+
+						if (!\is_array($mEmails)) {
+							$mEmails = array($mEmails);
+						}
+
+						foreach ($mEmails as $sEmail) {
+							$sHash = $sFullName.'|'.$sEmail;
+							if (!isset($aResult[$sHash])) {
+								$aResult[$sHash] = array($sEmail, $sFullName);
+								--$iLimit;
+							}
+						}
+					}
+				}
+				return \array_slice(\array_values($aResult), 0, $iInputLimit);
+			}
+		}
+		catch (\Exception $oException)
+		{
+			$this->logException($oException);
+		}
+
+		return [];
+	}
+}
diff --git a/plugins/nextcloud/index.php b/plugins/nextcloud/index.php
new file mode 100644
index 000000000..9999577cd
--- /dev/null
+++ b/plugins/nextcloud/index.php
@@ -0,0 +1,418 @@
+<?php
+
+use OCA\SnappyMail\Util\SnappyMailHelper;
+
+class NextcloudPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Nextcloud',
+		VERSION = '2.38.1',
+		RELEASE  = '2024-10-08',
+		CATEGORY = 'Integrations',
+		DESCRIPTION = 'Integrate with Nextcloud v20+',
+		REQUIRED = '2.38.0';
+
+	public function Init() : void
+	{
+		if (static::IsIntegrated()) {
+			\SnappyMail\Log::debug('Nextcloud', 'integrated');
+			$this->UseLangs(true);
+
+			$this->addHook('main.fabrica', 'MainFabrica');
+			$this->addHook('filter.app-data', 'FilterAppData');
+			$this->addHook('filter.language', 'FilterLanguage');
+
+			$this->addCss('style.css');
+
+			$this->addJs('js/webdav.js');
+
+			$this->addJs('js/message.js');
+			$this->addHook('json.attachments', 'DoAttachmentsActions');
+			$this->addJsonHook('NextcloudSaveMsg', 'NextcloudSaveMsg');
+
+			$this->addJs('js/composer.js');
+			$this->addJsonHook('NextcloudAttachFile', 'NextcloudAttachFile');
+
+			$this->addJs('js/messagelist.js');
+
+			$this->addTemplate('templates/PopupsNextcloudFiles.html');
+			$this->addTemplate('templates/PopupsNextcloudCalendars.html');
+
+//			$this->addHook('login.credentials.step-2', 'loginCredentials2');
+//			$this->addHook('login.credentials', 'loginCredentials');
+			$this->addHook('imap.before-login', 'beforeLogin');
+			$this->addHook('smtp.before-login', 'beforeLogin');
+			$this->addHook('sieve.before-login', 'beforeLogin');
+		} else {
+			\SnappyMail\Log::debug('Nextcloud', 'NOT integrated');
+			// SnappyMailHelper::getConfig()->getAppValue('snappymail', 'snappymail-no-embed');
+			$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
+		}
+	}
+
+	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
+	{
+		if (\method_exists($CSP, 'add')) {
+			$CSP->add('frame-ancestors', "'self'");
+		}
+	}
+
+	public function Supported() : string
+	{
+		return static::IsIntegrated() ? '' : 'Nextcloud not found to use this plugin';
+	}
+
+	public static function IsIntegrated()
+	{
+		return \class_exists('OC') && isset(\OC::$server);
+	}
+
+	public static function IsLoggedIn()
+	{
+		return static::IsIntegrated() && SnappyMailHelper::getUserSession()->isLoggedIn();
+	}
+
+	public function loginCredentials(string &$sEmail, string &$sLogin, ?string &$sPassword = null) : void
+	{
+		/**
+		 * This has an issue.
+		 * When user changes email address, all settings are gone as the new
+		 * _data_/_default_/storage/{domain}/{local-part} is used
+		 */
+//		$ocUser = SnappyMailHelper::getUser();
+//		$sEmail = $ocUser->getEMailAddress() ?: $ocUser->getPrimaryEMailAddress() ?: $sEmail;
+	}
+
+	public function loginCredentials2(string &$sEmail, ?string &$sPassword = null) : void
+	{
+		$ocUser = SnappyMailHelper::getUser();
+		$sEmail = $ocUser->getEMailAddress() ?: $ocUser->getPrimaryEMailAddress() ?: $sEmail;
+	}
+
+	public function beforeLogin(\RainLoop\Model\Account $oAccount, \MailSo\Net\NetClient $oClient, \MailSo\Net\ConnectSettings $oSettings) : void
+	{
+		// Only login with OIDC access token if
+		// it is enabled in config, the user is currently logged in with OIDC,
+		// the current snappymail account is the OIDC account and no account defined explicitly
+		if ($oAccount instanceof \RainLoop\Model\MainAccount
+		 && SnappyMailHelper::isOIDCLogin()
+//		 && $oClient->supportsAuthType('OAUTHBEARER') // v2.28
+		 && \str_starts_with($oSettings->passphrase, 'oidc_login|')
+		) {
+//			$oSettings->passphrase = SnappyMailHelper::getSessionValue('snappymail-passphrase');
+			$oSettings->passphrase = SnappyMailHelper::getSessionValue('oidc_access_token');
+			\array_unshift($oSettings->SASLMechanisms, 'OAUTHBEARER');
+		}
+	}
+
+	/*
+	\OC::$server->getCalendarManager();
+	\OC::$server->getLDAPProvider();
+	*/
+
+	public function NextcloudAttachFile() : array
+	{
+		$aResult = [
+			'success' => false,
+			'tempName' => ''
+		];
+		$sFile = $this->jsonParam('file', '');
+		$oFiles = \OCP\Files::getStorage('files');
+		if ($oFiles && $oFiles->is_file($sFile) && $fp = $oFiles->fopen($sFile, 'rb')) {
+			$oActions = \RainLoop\Api::Actions();
+			$oAccount = $oActions->getAccountFromToken();
+			if ($oAccount) {
+				$sSavedName = 'nextcloud-file-' . \sha1($sFile . \microtime());
+				if (!$oActions->FilesProvider()->PutFile($oAccount, $sSavedName, $fp)) {
+					$aResult['error'] = 'failed';
+				} else {
+					$aResult['tempName'] = $sSavedName;
+					$aResult['success'] = true;
+				}
+			}
+		}
+		return $this->jsonResponse(__FUNCTION__, $aResult);
+	}
+
+	public function NextcloudSaveMsg() : array
+	{
+		$sSaveFolder = \ltrim($this->jsonParam('folder', ''), '/');
+//		$aValues = \RainLoop\Api::Actions()->decodeRawKey($this->jsonParam('msgHash', ''));
+		$msgHash = $this->jsonParam('msgHash', '');
+		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($msgHash), true);
+		$aResult = [
+			'folder' => '',
+			'filename' => '',
+			'success' => false
+		];
+		if ($sSaveFolder && !empty($aValues['folder']) && !empty($aValues['uid'])) {
+			$oActions = \RainLoop\Api::Actions();
+			$oMailClient = $oActions->MailClient();
+			if (!$oMailClient->IsLoggined()) {
+				$oAccount = $oActions->getAccountFromToken();
+				$oAccount->ImapConnectAndLogin($oActions->Plugins(), $oMailClient->ImapClient(), $oActions->Config());
+			}
+
+			$sSaveFolder = $sSaveFolder ?: 'Emails';
+			$oFiles = \OCP\Files::getStorage('files');
+			if ($oFiles) {
+				$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
+			}
+			$aResult['folder'] = $sSaveFolder;
+			$aResult['filename'] = \MailSo\Base\Utils::SecureFileName(
+				\mb_substr($this->jsonParam('filename', '') ?: \date('YmdHis'), 0, 100)
+			) . '.' . \md5($msgHash) . '.eml';
+
+
+			$oMailClient->MessageMimeStream(
+				function ($rResource) use ($oFiles, $aResult) {
+					if (\is_resource($rResource)) {
+						$aResult['success'] = $oFiles->file_put_contents("{$aResult['folder']}/{$aResult['filename']}", $rResource);
+					}
+				},
+				(string) $aValues['folder'],
+				(int) $aValues['uid'],
+				isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : ''
+			);
+		}
+
+		return $this->jsonResponse(__FUNCTION__, $aResult);
+	}
+
+	public function DoAttachmentsActions(\SnappyMail\AttachmentsAction $data)
+	{
+		if (static::isLoggedIn() && 'nextcloud' === $data->action) {
+			$oFiles = \OCP\Files::getStorage('files');
+			if ($oFiles && \method_exists($oFiles, 'file_put_contents')) {
+				$sSaveFolder = \ltrim($this->jsonParam('NcFolder', ''), '/');
+				$sSaveFolder = $sSaveFolder ?: 'Attachments';
+				$oFiles->is_dir($sSaveFolder) || $oFiles->mkdir($sSaveFolder);
+				$data->result = true;
+				foreach ($data->items as $aItem) {
+					$sSavedFileName = empty($aItem['fileName']) ? 'file.dat' : $aItem['fileName'];
+					if (!empty($aItem['data'])) {
+						$sSavedFileNameFull = static::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, $oFiles);
+						if (!$oFiles->file_put_contents($sSavedFileNameFull, $aItem['data'])) {
+							$data->result = false;
+						}
+					} else if (!empty($aItem['fileHash'])) {
+						$fFile = $data->filesProvider->GetFile($data->account, $aItem['fileHash'], 'rb');
+						if (\is_resource($fFile)) {
+							$sSavedFileNameFull = static::SmartFileExists($sSaveFolder.'/'.$sSavedFileName, $oFiles);
+							if (!$oFiles->file_put_contents($sSavedFileNameFull, $fFile)) {
+								$data->result = false;
+							}
+							if (\is_resource($fFile)) {
+								\fclose($fFile);
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	public function FilterAppData($bAdmin, &$aResult) : void
+	{
+		if (!$bAdmin && \is_array($aResult)) {
+			$ocUser = SnappyMailHelper::getUser();
+			$sUID = $ocUser->getUID();
+			$oUrlGen = \OC::$server->getURLGenerator();
+			$sWebDAV = $oUrlGen->getAbsoluteURL($oUrlGen->linkTo('', 'remote.php') . '/dav');
+//			$sWebDAV = \OCP\Util::linkToRemote('dav');
+			$aResult['Nextcloud'] = [
+				'UID' => $sUID,
+				'WebDAV' => $sWebDAV,
+				'CalDAV' => $this->Config()->Get('plugin', 'calendar', false)
+//				'WebDAV_files' => $sWebDAV . '/files/' . $sUID
+			];
+			if (empty($aResult['Auth'])) {
+				$config = SnappyMailHelper::getConfig();
+				$sEmail = '';
+				// Only store the user's password in the current session if they have
+				// enabled auto-login using Nextcloud username or email address.
+				if ($config->getAppValue('snappymail', 'snappymail-autologin', false)) {
+					$sEmail = $sUID;
+				} else if ($config->getAppValue('snappymail', 'snappymail-autologin-with-email', false)) {
+					$sEmail = $config->getUserValue($sUID, 'settings', 'email', '');
+				} else {
+					\SnappyMail\Log::debug('Nextcloud', 'snappymail-autologin is off');
+				}
+				// If the user has set credentials for SnappyMail in their personal
+				// settings, override everything before and use those instead.
+				$sCustomEmail = $config->getUserValue($sUID, 'snappymail', 'snappymail-email', '');
+				if ($sCustomEmail) {
+					$sEmail = $sCustomEmail;
+				}
+				if (!$sEmail) {
+					$sEmail = $ocUser->getEMailAddress();
+//						?: $ocUser->getPrimaryEMailAddress();
+				}
+/*
+				if ($config->getAppValue('snappymail', 'snappymail-autologin-oidc', false)) {
+					if (SnappyMailHelper::getSessionValue('is_oidc')) {
+						$sEmail = "{$sUID}@nextcloud";
+						$aResult['DevPassword'] = SnappyMailHelper::getSessionValue('oidc_access_token');
+					} else {
+						\SnappyMail\Log::debug('Nextcloud', 'Not an OIDC login');
+					}
+				} else {
+					\SnappyMail\Log::debug('Nextcloud', 'OIDC is off');
+				}
+*/
+				$aResult['DevEmail'] = $sEmail ?: '';
+			} else if (!empty($aResult['ContactsSync'])) {
+				$bSave = false;
+				if (empty($aResult['ContactsSync']['Url'])) {
+					$aResult['ContactsSync']['Url'] = "{$sWebDAV}/addressbooks/users/{$sUID}/contacts/";
+					$bSave = true;
+				}
+				if (empty($aResult['ContactsSync']['User'])) {
+					$aResult['ContactsSync']['User'] = $sUID;
+					$bSave = true;
+				}
+				$pass = SnappyMailHelper::getSessionValue('snappymail-passphrase');
+				if ($pass/* && empty($aResult['ContactsSync']['Password'])*/) {
+					$pass = \SnappyMail\Crypt::DecryptUrlSafe($pass, $sUID);
+					if ($pass) {
+						$aResult['ContactsSync']['Password'] = $pass;
+						$bSave = true;
+					}
+				}
+				if ($bSave) {
+					$oActions = \RainLoop\Api::Actions();
+					$oActions->setContactsSyncData(
+						$oActions->getAccountFromToken(),
+						array(
+							'Mode' => $aResult['ContactsSync']['Mode'],
+							'User' => $aResult['ContactsSync']['User'],
+							'Password' => $aResult['ContactsSync']['Password'],
+							'Url' => $aResult['ContactsSync']['Url']
+						)
+					);
+				}
+			}
+		}
+	}
+
+	public function FilterLanguage(&$sLanguage, $bAdmin) : void
+	{
+		if (!\RainLoop\Api::Config()->Get('webmail', 'allow_languages_on_settings', true)) {
+			$aResultLang = \SnappyMail\L10n::getLanguages($bAdmin);
+			$userId = SnappyMailHelper::getUID();
+			$userLang = SnappyMailHelper::getConfig()->getUserValue($userId, 'core', 'lang', 'en');
+			$userLang = \strtr($userLang, '_', '-');
+			$sLanguage = $this->determineLocale($userLang, $aResultLang);
+			// Check if $sLanguage is null
+			if (!$sLanguage) {
+				$sLanguage = 'en'; // Assign 'en' if $sLanguage is null
+			}
+		}
+	}
+
+	/**
+	 * Determine locale from user language.
+	 *
+	 * @param string $langCode The name of the input.
+	 * @param array  $languagesArray The value of the array.
+	 *
+	 * @return string return locale
+	 */
+	private function determineLocale(string $langCode, array $languagesArray) : ?string
+	{
+		// Direct check for the language code
+		if (\in_array($langCode, $languagesArray)) {
+			return $langCode;
+		}
+
+		// Check without country code
+		if (\str_contains($langCode, '-')) {
+			$langCode = \explode('-', $langCode)[0];
+			if (\in_array($langCode, $languagesArray)) {
+				return $langCode;
+			}
+		}
+
+		// Check with uppercase country code
+		$langCodeWithUpperCase = $langCode . '-' . \strtoupper($langCode);
+		if (\in_array($langCodeWithUpperCase, $languagesArray)) {
+			return $langCodeWithUpperCase;
+		}
+
+		// If no match is found
+		return null;
+	}
+
+	/**
+	 * @param mixed $mResult
+	 */
+	public function MainFabrica(string $sName, &$mResult)
+	{
+		if (static::isLoggedIn()) {
+			if ('suggestions' === $sName && $this->Config()->Get('plugin', 'suggestions', true)) {
+				if (!\is_array($mResult)) {
+					$mResult = array();
+				}
+				include_once __DIR__ . '/NextcloudContactsSuggestions.php';
+				$mResult[] = new NextcloudContactsSuggestions(
+					$this->Config()->Get('plugin', 'ignoreSystemAddressbook', true)
+				);
+			}
+/*
+			if ($this->Config()->Get('plugin', 'storage', false) && ('storage' === $sName || 'storage-local' === $sName)) {
+				require_once __DIR__ . '/storage.php';
+				$oDriver = new \NextcloudStorage(APP_PRIVATE_DATA.'storage', $sName === 'storage-local');
+			}
+*/
+		}
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('suggestions')->SetLabel('Suggestions')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(true),
+			\RainLoop\Plugins\Property::NewInstance('ignoreSystemAddressbook')->SetLabel('Ignore system addressbook')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(true),
+/*
+			\RainLoop\Plugins\Property::NewInstance('storage')->SetLabel('Use Nextcloud user ID in config storage path')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+*/
+			\RainLoop\Plugins\Property::NewInstance('calendar')->SetLabel('Enable "Put ICS in calendar"')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDefaultValue(false)
+		);
+	}
+
+	private static function SmartFileExists(string $sFilePath, $oFiles) : string
+	{
+		$sFilePath = \str_replace('\\', '/', \trim($sFilePath));
+
+		if (!$oFiles->file_exists($sFilePath)) {
+			return $sFilePath;
+		}
+
+		$aFileInfo = \pathinfo($sFilePath);
+
+		$iIndex = 0;
+
+		while (true) {
+			++$iIndex;
+			$sFilePathNew = $aFileInfo['dirname'].'/'.
+				\preg_replace('/\(\d{1,2}\)$/', '', $aFileInfo['filename']).
+				' ('.$iIndex.')'.
+				(empty($aFileInfo['extension']) ? '' : '.'.$aFileInfo['extension'])
+			;
+			if (!$oFiles->file_exists($sFilePathNew)) {
+				return $sFilePathNew;
+			}
+			if (10 < $iIndex) {
+				break;
+			}
+		}
+		return $sFilePath;
+	}
+}
diff --git a/plugins/nextcloud/js/composer.js b/plugins/nextcloud/js/composer.js
new file mode 100644
index 000000000..5c2ab7662
--- /dev/null
+++ b/plugins/nextcloud/js/composer.js
@@ -0,0 +1,68 @@
+(rl => {
+//	if (rl.settings.get('Nextcloud'))
+
+	addEventListener('rl-view-model.create', e => {
+		if ('PopupsCompose' === e.detail.viewModelTemplateID) {
+			let view = e.detail;
+			view.nextcloudAttach = () => {
+				rl.nextcloud.selectFiles().then(files => {
+					let urls = [];
+					files && files.forEach(file => {
+						if (file.name) {
+							let attachment = view.addAttachmentHelper(
+									Jua?.randomId(),
+									file.name.replace(/^.*\/([^/]+)$/, '$1'),
+									file.size
+								);
+
+							rl.pluginRemoteRequest(
+								(iError, data) => {
+									attachment.uploading(false).complete(true);
+									if (iError) {
+										attachment.error(data?.Result?.error || 'failed');
+									} else {
+										attachment.tempName(data.Result.tempName);
+									}
+								},
+								'NextcloudAttachFile',
+								{
+									'file': file.name
+								}
+							);
+						} else if (file.url) {
+							urls.push(file.url);
+						}
+					});
+					if (urls.length) {
+						// TODO: other editors and text/plain
+						// https://github.com/the-djmaze/snappymail/issues/981
+						view.oEditor.editor.squire.insertHTML(urls.join("<br>"));
+					}
+				});
+			};
+		}
+	});
+
+	let template = document.getElementById('PopupsCompose');
+	const uploadBtn = template.content.querySelector('#composeUploadButton');
+	if (uploadBtn) {
+		uploadBtn.after(Element.fromHTML(`<a class="btn fontastic" data-bind="click: nextcloudAttach"
+			data-i18n="[title]NEXTCLOUD/ATTACH_FILES">◦◯◦</a>`));
+	}
+
+/**
+	https://docs.nextcloud.com/server/latest/developer_manual/client_apis/OCS/ocs-share-api.html
+	POST /ocs/v2.php/apps/files_sharing/api/v1/shares
+	JSON {
+		"path":"/Nextcloud intro.mp4",
+		"shareType":3, // public link
+		"shareWith":"user@example.com",
+//		"publicUpload":false,
+//		"password":null,
+//		"permissions":1, // default
+//		"expireDate":"YYYY-MM-DD",
+//		"note":"Especially for you"
+	}
+*/
+
+})(window.rl);
diff --git a/plugins/nextcloud/js/message.js b/plugins/nextcloud/js/message.js
new file mode 100644
index 000000000..f5154b745
--- /dev/null
+++ b/plugins/nextcloud/js/message.js
@@ -0,0 +1,188 @@
+(rl => {
+//	if (rl.settings.get('Nextcloud'))
+	const templateId = 'MailMessageView';
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				cfg = rl.settings.get('Nextcloud'),
+				attachmentsControls = template.content.querySelector('.attachmentsControls'),
+				msgMenu = template.content.querySelector('#more-view-dropdown-id + menu');
+
+			if (attachmentsControls) {
+				attachmentsControls.append(Element.fromHTML(`<span>
+					<i class="fontastic iconcolor-red" data-bind="visible: saveNextcloudError">✖</i>
+					<i class="fontastic" data-bind="visible: !saveNextcloudError(),
+						css: {'icon-spinner': saveNextcloudLoading()}">💾</i>
+					<span class="g-ui-link" data-bind="click: saveNextcloud" data-i18n="NEXTCLOUD/SAVE_ATTACHMENTS"></span>
+				</span>`));
+
+				// https://github.com/nextcloud/calendar/issues/4684
+				if (cfg.CalDAV) {
+					attachmentsControls.append(Element.fromHTML(`<span data-bind="visible: nextcloudICS" data-icon="📅">
+						<span class="g-ui-link" data-bind="click: nextcloudSaveICS" data-i18n="NEXTCLOUD/SAVE_ICS"></span>
+					</span>`));
+				}
+			}
+/*
+			// https://github.com/the-djmaze/snappymail/issues/592
+			if (cfg.CalDAV) {
+				const attachmentsPlace = template.content.querySelector('.attachmentsPlace');
+				attachmentsPlace.after(Element.fromHTML(`
+				<table data-bind="if: nextcloudICS, visible: nextcloudICS"><tbody style="white-space:pre">
+					<tr><td>Summary</td><td data-icon="📅" data-bind="text: nextcloudICS().SUMMARY"></td></tr>
+					<tr><td>Organizer</td><td data-bind="text: nextcloudICS().ORGANIZER"></td></tr>
+					<tr><td>Start</td><td data-bind="text: nextcloudICS().DTSTART"></td></tr>
+					<tr><td>End</td><td data-bind="text: nextcloudICS().DTEND"></td></tr>
+					<tr><td>Transparency</td><td data-bind="text: nextcloudICS().TRANSP"></td></tr>
+					<tr data-bind="foreach: nextcloudICS().ATTENDEE">
+						<td></td><td data-bind="text: $data.replace(/;/g,';\\n')"></td>
+					</tr>
+				</tbody></table>`));
+			}
+*/
+			if (msgMenu) {
+				msgMenu.append(Element.fromHTML(`<li role="presentation">
+					<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsg" data-i18n="NEXTCLOUD/SAVE_EML"></a>
+				</li>`));
+			}
+
+			let view = e.detail;
+			view.saveNextcloudError = ko.observable(false).extend({ falseTimeout: 7000 });
+			view.saveNextcloudLoading = ko.observable(false);
+			view.saveNextcloud = () => {
+				const
+					hashes = (view.message()?.attachments || [])
+					.map(item => item?.checked() /*&& !item?.isLinked()*/ ? item.download : '')
+					.filter(v => v);
+				if (hashes.length) {
+					view.saveNextcloudLoading(true);
+					rl.nextcloud.selectFolder().then(folder => {
+						if (folder) {
+							rl.fetchJSON('./?/Json/&q[]=/0/', {}, {
+								Action: 'AttachmentsActions',
+								target: 'nextcloud',
+								hashes: hashes,
+								NcFolder: folder
+							})
+							.then(result => {
+								view.saveNextcloudLoading(false);
+								if (result?.Result) {
+									// success
+								} else {
+									view.saveNextcloudError(true);
+								}
+							})
+							.catch(() => {
+								view.saveNextcloudLoading(false);
+								view.saveNextcloudError(true);
+							});
+						} else {
+							view.saveNextcloudLoading(false);
+						}
+					});
+				}
+			};
+
+			view.nextcloudSaveMsg = () => {
+				rl.nextcloud.selectFolder().then(folder => {
+					let msg = view.message();
+					folder && rl.pluginRemoteRequest(
+						(iError, data) => {
+							console.dir({
+								iError:iError,
+								data:data
+							});
+						},
+						'NextcloudSaveMsg',
+						{
+							'msgHash': msg.requestHash,
+							'folder': folder,
+							'filename': msg.subject()
+						}
+					);
+				});
+			};
+
+			view.nextcloudICS = ko.observable(null);
+
+			view.nextcloudSaveICS = () => {
+				let VEVENT = view.nextcloudICS();
+				VEVENT && rl.nextcloud.selectCalendar()
+				.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
+			}
+
+			/**
+			 * TODO
+			 */
+			view.message.subscribe(msg => {
+				view.nextcloudICS(null);
+				if (msg && cfg.CalDAV) {
+//					let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType);
+					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
+					if (ics && ics.download) {
+						// fetch it and parse the VEVENT
+						rl.fetch(ics.linkDownload())
+						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+						.then(text => {
+							let VEVENT,
+								VALARM,
+								multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE',
+									'EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE'],
+								lines = text.split(/\r?\n/),
+								i = lines.length;
+							while (i--) {
+								let line = lines[i];
+								if (VEVENT) {
+									while (line.startsWith(' ') && i--) {
+										line = lines[i] + line.slice(1);
+									}
+									if (line.startsWith('END:VALARM')) {
+										VALARM = {};
+										continue;
+									} else if (line.startsWith('BEGIN:VALARM')) {
+										VEVENT.VALARM || (VEVENT.VALARM = []);
+										VEVENT.VALARM.push(VALARM);
+										VALARM = null;
+										continue;
+									} else if (line.startsWith('BEGIN:VEVENT')) {
+										break;
+									}
+									line = line.match(/^([^:;]+)[:;](.+)$/);
+									if (line) {
+										if (VALARM) {
+											VALARM[line[1]] = line[2];
+										} else if (multiple.includes(line[1]) || 'X-' == line[1].slice(0,2)) {
+											VEVENT[line[1]] || (VEVENT[line[1]] = []);
+											VEVENT[line[1]].push(line[2]);
+										} else {
+											VEVENT[line[1]] = line[2];
+										}
+									}
+								} else if (line.startsWith('END:VEVENT')) {
+									VEVENT = {};
+								}
+							}
+//							METHOD:REPLY || METHOD:REQUEST
+//							console.dir({VEVENT:VEVENT});
+							if (VEVENT) {
+								VEVENT.rawText = text;
+								VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
+								VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
+								VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
+								console.dir({
+									isCancelled: VEVENT.isCancelled(),
+									shouldReply: VEVENT.shouldReply()
+								});
+								view.nextcloudICS(VEVENT);
+							}
+						});
+					}
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/nextcloud/js/messagelist.js b/plugins/nextcloud/js/messagelist.js
new file mode 100644
index 000000000..8b8681afa
--- /dev/null
+++ b/plugins/nextcloud/js/messagelist.js
@@ -0,0 +1,39 @@
+(rl => {
+//	if (rl.settings.get('Nextcloud'))
+
+	addEventListener('rl-view-model.create', e => {
+		if ('MailMessageList' === e.detail.viewModelTemplateID) {
+			let view = e.detail;
+			view.nextcloudSaveMsgs = () => {
+				view.messageList.hasChecked()
+				 && rl.nextcloud.selectFolder().then(folder => {
+					folder && view.messageList.forEach(msg => {
+						msg.checked() && rl.pluginRemoteRequest(
+							(iError, data) => {
+								console.dir({
+									iError:iError,
+									data:data
+								});
+							},
+							'NextcloudSaveMsg',
+							{
+								'msgHash': msg.requestHash,
+								'folder': folder,
+								'filename': msg.subject()
+							}
+						);
+					});
+				});
+			};
+		}
+	});
+
+	const msgMenu = document.getElementById('MailMessageList')
+		.content.querySelector('#more-list-dropdown-id + menu [data-bind*="forwardCommand"]');
+	if (msgMenu) {
+		msgMenu.after(Element.fromHTML(`<li role="presentation" data-bind="css:{disabled:!messageList.hasChecked()}">
+			<a href="#" tabindex="-1" data-icon="📥" data-bind="click: nextcloudSaveMsgs" data-i18n="NEXTCLOUD/SAVE_EML"></a>
+		</li>`));
+	}
+
+})(window.rl);
diff --git a/plugins/nextcloud/js/webdav.js b/plugins/nextcloud/js/webdav.js
new file mode 100644
index 000000000..24aa1f226
--- /dev/null
+++ b/plugins/nextcloud/js/webdav.js
@@ -0,0 +1,502 @@
+(rl => {
+
+const
+	nsDAV = 'DAV:',
+	nsNC = 'http://nextcloud.org/ns',
+	nsOC = 'http://owncloud.org/ns',
+	nsOCS = 'http://open-collaboration-services.org/ns',
+	nsCalDAV = 'urn:ietf:params:xml:ns:caldav',
+
+	OC = () => parent.OC,
+
+	// Nextcloud 19 deprecated generateUrl, but screw `import { generateUrl } from "@nextcloud/router"`
+	shareUrl = () => OC().webroot + '/ocs/v2.php/apps/files_sharing/api/v1/shares',
+	generateUrl = path => OC().webroot + (OC().config.modRewriteWorking ? '' : '/index.php') + path,
+	generateRemoteUrl = path => location.protocol + '//' + location.host + generateUrl(path),
+
+//	shareTypes = {0 = user, 1 = group, 3 = public link}
+
+	propfindFiles = `<?xml version="1.0"?>
+<propfind xmlns="DAV:" xmlns:oc="${nsOC}" xmlns:ocs="${nsOCS}" xmlns:nc="${nsNC}">
+	<prop>
+		<oc:fileid/>
+		<oc:size/>
+		<resourcetype/>
+		<getcontentlength/>
+		<ocs:share-permissions/>
+		<oc:share-types/>
+	</prop>
+</propfind>`,
+
+	propfindCal = `<?xml version="1.0"?>
+<d:propfind xmlns:d="DAV:" xmlns:x1="http://apple.com/ns/ical/">
+	<d:prop>
+		<d:resourcetype/>
+		<d:current-user-privilege-set/>
+		<d:displayname/>
+		<x1:calendar-color/>
+	</d:prop>
+</d:propfind>`,
+
+	xmlParser = new DOMParser(),
+	pathRegex = /.*\/remote.php\/dav\/[^/]+\/[^/]+/g,
+
+	getElementsByTagName = (parent, namespace, localName) => parent.getElementsByTagNameNS(namespace, localName),
+	getDavElementsByTagName = (parent, localName) => getElementsByTagName(parent, nsDAV, localName),
+	getDavElementByTagName = (parent, localName) => getDavElementsByTagName(parent, localName)?.item(0),
+	getElementByTagName = (parent, localName) => +parent.getElementsByTagName(localName)?.item(0),
+
+	ncFetch = (path, options) => {
+		if (!OC().requestToken) {
+			return Promise.reject(new Error('OC.requestToken missing'));
+		}
+		options = Object.assign({
+			mode: 'same-origin',
+			cache: 'no-cache',
+			redirect: 'error',
+			credentials: 'same-origin',
+			headers: {}
+		}, options);
+		options.headers.requesttoken = OC().requestToken;
+		return fetch(path, options);
+	},
+
+	davFetch = (mode, path, options) => {
+		let cfg = rl.settings.get('Nextcloud');
+//		cfg.UID = document.head.dataset.user
+		return ncFetch(cfg.WebDAV + '/' + mode + '/' + cfg.UID + path, options);
+	},
+
+	davFetchFiles = (path, options) => davFetch('files', path, options),
+
+	createDirectory = path => davFetchFiles(path, { method: 'MKCOL' }),
+
+	fetchFiles = path => {
+		if (!OC().requestToken) {
+			return Promise.reject(new Error('OC.requestToken missing'));
+		}
+		return davFetchFiles(path, {
+			method: 'PROPFIND',
+			headers: {
+				'Content-Type': 'application/xml; charset=utf-8'
+			},
+			body: propfindFiles
+		})
+		.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+		.then(text => {
+			const
+				elemList = [],
+				responseList = getDavElementsByTagName(
+					xmlParser.parseFromString(text, 'application/xml').documentElement,
+					'response'
+				);
+			path = path.replace(/\/$/, '');
+			for (let i = 0; i < responseList.length; ++i) {
+				const
+					e = responseList.item(i),
+					elem = {
+						name: decodeURIComponent(getDavElementByTagName(e, 'href').textContent
+							.replace(pathRegex, '').replace(/\/$/, '')),
+						isFile: false
+					};
+				if (getDavElementsByTagName(getDavElementByTagName(e, 'resourcetype'), 'collection').length) {
+					// skip current directory
+					if (elem.name === path) {
+						continue;
+					}
+				} else {
+					elem.isFile = true;
+					elem.id = e.getElementsByTagNameNS(nsOC, 'fileid')?.item(0)?.textContent;
+					elem.size = getDavElementByTagName(e, 'getcontentlength')?.textContent
+						|| getElementByTagName(e, 'oc:size')?.textContent;
+					elem.shared = [...e.getElementsByTagNameNS(nsOC, 'share-type')].some(node => '3' == node.textContent);
+				}
+				elemList.push(elem);
+			}
+			// https://github.com/the-djmaze/snappymail/issues/1177
+//			elemList.sort((a, b) => a.isFile != b.isFile ? (a.isFile ? 1 : -1) : a.name.localeCompare(b.name));
+			return Promise.resolve(elemList);
+		});
+	},
+
+	buildTree = (view, parent, items, path) => {
+		if (items.length) {
+			try {
+				// https://github.com/the-djmaze/snappymail/issues/1109
+				let collator = new Intl.Collator(undefined, {numeric: true, sensitivity: 'base'});
+				items.sort((a, b) => collator.compare(a.name, b.name));
+			} catch (e) {
+				console.error(e);
+			}
+			items.forEach(item => {
+				if (!item.isFile) {
+					let li = document.createElement('li'),
+						details = document.createElement('details'),
+						summary = document.createElement('summary'),
+						ul = document.createElement('ul');
+					details.addEventListener('toggle', () => {
+						ul.children.length
+						|| fetchFiles(item.name).then(items => buildTree(view, ul, items, item.name));
+					});
+					summary.textContent = item.name.replace(/^.*\/([^/]+)$/, '$1');
+					summary.dataset.icon = '📁';
+					if (!view.files()) {
+						let btn = document.createElement('button');
+						btn.name = 'select';
+						btn.textContent = 'select';
+						btn.className = 'button-vue';
+						summary.append(btn);
+						summary.item_name = item.name;
+					}
+					details.append(summary);
+					details.append(ul);
+//					a.append('- ' + item.name.replace(/^\/+/, ''));
+					li.append(details);
+					parent.append(li);
+				}
+			});
+			if (view.files()) {
+				items.forEach(item => {
+					if (item.isFile) {
+						let li = document.createElement('li'),
+							cb = document.createElement('input');
+
+						li.item = item;
+						li.textContent = item.name.replace(/^.*\/([^/]+)$/, '$1');
+						li.dataset.icon = '🗎';
+
+						cb.type = 'checkbox';
+						li.append(cb);
+
+						parent.append(li);
+					}
+				});
+			}
+		}
+		if (!view.files()) {
+			let li = document.createElement('li'),
+				input = document.createElement('input'),
+				btn = document.createElement('button');
+			btn.name = 'create';
+			btn.textContent = 'create & select';
+			btn.className = 'button-vue';
+			btn.input = input;
+			li.item_path = path;
+			li.append(input);
+			li.append(btn);
+			parent.append(li);
+		}
+	};
+
+class NextcloudFilesPopupView extends rl.pluginPopupView {
+	constructor() {
+		super('NextcloudFiles');
+		this.addObservables({
+			files: false
+		});
+	}
+
+	attach() {
+		this.select = [];
+		this.tree.querySelectorAll('input').forEach(input =>
+			input.checked && this.select.push(input.parentNode.item)
+		);
+		this.close();
+	}
+
+	shareInternal() {
+		this.select = [];
+		this.tree.querySelectorAll('input').forEach(input =>
+			input.checked && this.select.push({url:generateRemoteUrl(`/f/${input.parentNode.item.id}`)})
+		);
+		this.close();
+	}
+
+	sharePublic() {
+		const inputs = [...this.tree.querySelectorAll('input')],
+			loop = () => {
+				if (!inputs.length) {
+					this.close();
+					return;
+				}
+				const input = inputs.pop();
+				if (!input.checked) {
+					loop();
+				} else {
+					const item = input.parentNode.item;
+					if (item.shared) {
+						ncFetch(
+							shareUrl() + `?format=json&path=${encodeURIComponent(item.name)}&reshares=true`
+						)
+						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
+						.then(json => {
+							this.select.push({url:json.ocs.data[0].url});
+							loop();
+//							json.data[0].password
+						});
+					} else {
+						ncFetch(
+							shareUrl(),
+							{
+								method:'POST',
+								headers: {
+									Accept: 'application/json',
+									'Content-Type': 'application/json'
+								},
+								body: JSON.stringify({
+									path:item.name,
+									shareType:3,
+									attributes:"[]"
+								})
+							}
+						)
+						.then(response => (response.status < 400) ? response.json() : Promise.reject(new Error({ response })))
+						.then(json => {
+//							PUT /ocs/v2.php/apps/files_sharing/api/v1/shares/2 {"password":"ABC09"}
+							this.select.push({url:json.ocs.data.url});
+							loop();
+						});
+					}
+				}
+			};
+
+		this.select = [];
+		loop();
+	}
+
+	onBuild(dom) {
+		this.tree = dom.querySelector('#sm-nc-files-tree');
+		this.tree.addEventListener('click', event => {
+			let el = event.target;
+			if (el.matches('button')) {
+				let parent = el.parentNode;
+				if ('select' == el.name) {
+					this.select = parent.item_name;
+					this.close();
+				} else if ('create' == el.name) {
+					let name = el.input.value.replace(/[|\\?*<":>+[]\/&\s]/g, '');
+					if (name.length) {
+						name = parent.item_path + '/' + name;
+						createDirectory(name).then(response => {
+							if (response.status == 201) {
+								this.select = name;
+								this.close();
+							}
+						});
+					}
+				}
+			}
+		});
+	}
+
+	// Happens after showModal()
+	beforeShow(files, fResolve) {
+		this.select = '';
+		this.files(!!files);
+		this.fResolve = fResolve;
+
+		this.tree.innerHTML = '';
+		fetchFiles('/').then(items => {
+			buildTree(this, this.tree, items, '/');
+		}).catch(err => console.error(err))
+	}
+
+	onHide() {
+		this.fResolve(this.select);
+	}
+/*
+beforeShow() {} // Happens before showModal()
+onShow() {}     // Happens after  showModal()
+afterShow() {}  // Happens after  showModal() animation transitionend
+onHide() {}     // Happens before animation transitionend
+afterHide() {}  // Happens after  animation transitionend
+close() {}
+*/
+}
+
+class NextcloudCalendarsPopupView extends rl.pluginPopupView {
+	constructor() {
+		super('NextcloudCalendars');
+	}
+
+	onBuild(dom) {
+		this.tree = dom.querySelector('#sm-nc-calendars');
+		this.tree.addEventListener('click', event => {
+			let el = event.target;
+			if (el.matches('button')) {
+				this.select = el.href;
+				this.close();
+			}
+		});
+	}
+	createCalendarListItem(calendarData, treeElement) {
+		const {
+			displayName,
+			href,
+			calendarColor
+		} = calendarData;
+
+		const li = document.createElement('li');
+		li.style.display = 'flex';
+
+		const span = document.createElement('span');
+		span.setAttribute('role', 'img');
+		span.className = 'material-design-icon checkbox-blank-circle-icon';
+		span.style.fill = calendarColor;
+		span.style.width = '20px';
+		span.style.height = '20px';
+
+		const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
+		svg.setAttribute('width', '20');
+		svg.setAttribute('height', '20');
+		svg.setAttribute('viewBox', '0 0 24 24');
+
+		const path = document.createElementNS('http://www.w3.org/2000/svg', 'path');
+		path.setAttribute('d', 'M12,2A10,10 0 0,0 2,12A10,10 0 0,0 12,22A10,10 0 0,0 22,12A10,10 0 0,0 12,2Z');
+		svg.appendChild(path);
+
+		span.appendChild(svg);
+
+		const button = document.createElement('button');
+		button.className = 'button-vue';
+		button.style.backgroundColor = 'transparent';
+		button.style.border = '0';
+		button.style.fontSize = 'large';
+		button.style.padding = '0';
+		button.style.cursor = 'pointer';
+		button.style.marginLeft = '5px';
+		button.href = href.replace(pathRegex, '').replace(/\/$/, '');
+		button.textContent = displayName;
+		button.style.color = '#1968DF';
+
+		li.appendChild(span);
+		li.appendChild(button);
+
+		treeElement.appendChild(li);
+	}
+	// Happens after showModal()
+	beforeShow(fResolve) {
+		this.select = '';
+		this.fResolve = fResolve;
+		this.tree.innerHTML = '';
+		davFetch('calendars', '/', {
+			method: 'PROPFIND',
+			headers: {
+				'Content-Type': 'application/xml; charset=utf-8'
+			},
+			body: propfindCal
+		})
+		.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+		.then(text => {
+			// Parse the XML text
+			const xmlDoc = xmlParser.parseFromString(text, 'application/xml').documentElement;
+			const responseList = getElementsInNamespaces(xmlDoc, 'response');
+			for (let i = 0; i < responseList.length; ++i) {
+				const e = responseList[i];
+				if (getDavElementByTagName(e, 'resourcetype').getElementsByTagNameNS(nsCalDAV, 'calendar').length) {
+					const displayNameElement = getElementsInNamespaces(e, 'displayname')[0];
+					const displayName = displayNameElement ? displayNameElement.textContent.trim() : '';
+
+					const hrefElement = getElementsInNamespaces(e, 'href')[0];
+					const href = hrefElement ? hrefElement.textContent.trim() : '';
+
+					const calendarColorElement = getElementsInNamespaces(e, 'calendar-color')[0];
+					const calendarColor = calendarColorElement ? calendarColorElement.textContent.trim() : '#000000';
+
+					// Create an object to hold calendar data
+					const calendarData = {
+						displayName,
+						href,
+						calendarColor
+					};
+
+					// Call the function to create and append the list item
+					this.createCalendarListItem(calendarData, this.tree);
+				}
+			}
+		})
+		.catch(err => console.error(err));
+	}
+
+	onHide() {
+		this.fResolve(this.select);
+	}
+/*
+beforeShow() {} // Happens before showModal()
+onShow() {}     // Happens after  showModal()
+afterShow() {}  // Happens after  showModal() animation transitionend
+onHide() {}     // Happens before animation transitionend
+afterHide() {}  // Happens after  animation transitionend
+close() {}
+*/
+}
+
+rl.nextcloud = {
+	selectCalendar: () =>
+		new Promise(resolve => {
+			NextcloudCalendarsPopupView.showModal([
+				href => resolve(href),
+			]);
+		}),
+
+	calendarPut: (path, event) => {
+		davFetch('calendars', path + '/' + event.UID + '.ics', {
+			method: 'PUT',
+			headers: {
+				'Content-Type': 'text/calendar'
+			},
+			// Validation error in iCalendar: A calendar object on a CalDAV server MUST NOT have a METHOD property.
+			body: event.rawText
+				.replace('METHOD:', 'X-METHOD:')
+				// https://github.com/nextcloud/calendar/issues/4684
+				.replace('ATTENDEE:', 'X-ATTENDEE:')
+				.replace('ORGANIZER:', 'X-ORGANIZER:')
+				.replace(/RSVP=TRUE/g, 'RSVP=FALSE')
+				.replace(/\r?\n/g, '\r\n')
+		})
+		.then(response => {
+			if (201 == response.status) {
+				// Created
+			} else if (204 == response.status) {
+				// Not modified
+			} else {
+//				response.text().then(text => console.error({status:response.status, body:text}));
+				Promise.reject(new Error({ response }));
+			}
+		});
+	},
+
+	selectFolder: () =>
+		new Promise(resolve => {
+			NextcloudFilesPopupView.showModal([
+				false,
+				folder => resolve(folder),
+			]);
+		}),
+
+	selectFiles: () =>
+		new Promise(resolve => {
+			NextcloudFilesPopupView.showModal([
+				true,
+				files => resolve(files),
+			]);
+		})
+};
+
+})(window.rl);
+
+function getElementsInNamespaces(xmlDocument, tagName) {
+	const namespaces = {
+		d: 'DAV:',
+		x1: 'http://apple.com/ns/ical/',
+	};
+	const results = [];
+	for (const prefix in namespaces) {
+		const namespaceURI = namespaces[prefix];
+		const elements = xmlDocument.getElementsByTagNameNS(namespaceURI, tagName);
+		for (const element of elements) {
+			results.push(element);
+		}
+	}
+	return results;
+}
diff --git a/plugins/nextcloud/langs/de.json b/plugins/nextcloud/langs/de.json
new file mode 100644
index 000000000..5f43f1357
--- /dev/null
+++ b/plugins/nextcloud/langs/de.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Speichern Sie in Nextcloud",
+		"SAVE_EML": "Als .eml in Nextcloud speichern",
+		"SAVE_ICS": "Kalender eintragen",
+		"SELECT_FOLDER": "Ordner auswählen",
+		"SELECT_FILES": "Datei(en) auswählen",
+		"ATTACH_FILES": "Nextcloud-Dateien anhängen",
+		"SELECT_CALENDAR": "Kalender auswählen",
+		"FILE_ATTACH": "anfügen",
+		"FILE_INTERNAL": "intern",
+		"FILE_PUBLIC": "öffentlich"
+	}
+}
diff --git a/plugins/nextcloud/langs/en.json b/plugins/nextcloud/langs/en.json
new file mode 100644
index 000000000..2c19d11c2
--- /dev/null
+++ b/plugins/nextcloud/langs/en.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Save in Nextcloud",
+		"SAVE_EML": "Save as .eml in Nextcloud",
+		"SAVE_ICS": "Add to calendar",
+		"SELECT_FOLDER": "Select folder",
+		"SELECT_FILES": "Select file(s)",
+		"ATTACH_FILES": "Attach Nextcloud files",
+		"SELECT_CALENDAR": "Select calendar",
+		"FILE_ATTACH": "attach",
+		"FILE_INTERNAL": "internal",
+		"FILE_PUBLIC": "public"
+	}
+}
diff --git a/plugins/nextcloud/langs/pl.json b/plugins/nextcloud/langs/pl.json
new file mode 100644
index 000000000..82e0d4f18
--- /dev/null
+++ b/plugins/nextcloud/langs/pl.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Zapisz w Nextcloudzie",
+		"SAVE_EML": "Zapisz jako .eml w Nextcloudzie",
+		"SAVE_ICS": "Dodaj do Kalendarza",
+		"SELECT_FOLDER": "Wybierz folder",
+		"SELECT_FILES": "Wybierz plik(i)",
+		"ATTACH_FILES": "Dodaj załącznik z Nextclouda",
+		"SELECT_CALENDAR": "Wybierz kalendarz",
+		"FILE_ATTACH": "dołącz",
+		"FILE_INTERNAL": "link wewnętrzny",
+		"FILE_PUBLIC": "link publiczny"
+	}
+}
diff --git a/plugins/nextcloud/langs/ru.json b/plugins/nextcloud/langs/ru.json
new file mode 100644
index 000000000..a8b28372d
--- /dev/null
+++ b/plugins/nextcloud/langs/ru.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "Сохранить в Nextcloud",
+		"SAVE_EML": "Сохранить как .eml в Nextcloud",
+		"SAVE_ICS": "Вставить в календарь",
+		"SELECT_FOLDER": "Выбрите папку",
+		"SELECT_FILES": "Выберите файл(ы)",
+		"ATTACH_FILES": "Прикрепить файлы из Nextcloud",
+		"SELECT_CALENDAR": "Выбрать календарь",
+		"FILE_ATTACH": "Прикрепить с ПК",
+		"FILE_INTERNAL": "Внутреняя",
+		"FILE_PUBLIC": "Публичная"
+	}
+}
diff --git a/plugins/nextcloud/langs/zh-TW.json b/plugins/nextcloud/langs/zh-TW.json
new file mode 100644
index 000000000..292d02286
--- /dev/null
+++ b/plugins/nextcloud/langs/zh-TW.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "儲存到 Nextcloud",
+		"SAVE_EML": "以 .eml 檔案儲存到 Nextcloud",
+		"SAVE_ICS": "新增到日曆",
+		"SELECT_FOLDER": "選擇檔案夾",
+		"SELECT_FILES": "選擇檔案",
+		"ATTACH_FILES": "新增 Nextcloud 檔案",
+		"SELECT_CALENDAR": "選擇日曆",
+		"FILE_ATTACH": "附加",
+		"FILE_INTERNAL": "內部",
+		"FILE_PUBLIC": "公開"
+	}
+}
diff --git a/plugins/nextcloud/langs/zh.json b/plugins/nextcloud/langs/zh.json
new file mode 100644
index 000000000..39b20ac2e
--- /dev/null
+++ b/plugins/nextcloud/langs/zh.json
@@ -0,0 +1,14 @@
+{
+	"NEXTCLOUD": {
+		"SAVE_ATTACHMENTS": "保存到 Nextcloud",
+		"SAVE_EML": "以 .eml 文件保存到 Nextcloud",
+		"SAVE_ICS": "添加到日历",
+		"SELECT_FOLDER": "选择文件夹",
+		"SELECT_FILES": "选择文件",
+		"ATTACH_FILES": "添加 Nextcloud 文件",
+		"SELECT_CALENDAR": "选择日历",
+		"FILE_ATTACH": "附加",
+		"FILE_INTERNAL": "内部",
+		"FILE_PUBLIC": "公开"
+	}
+}
diff --git a/plugins/nextcloud/storage.php b/plugins/nextcloud/storage.php
new file mode 100644
index 000000000..90b5f313e
--- /dev/null
+++ b/plugins/nextcloud/storage.php
@@ -0,0 +1,22 @@
+<?php
+
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+
+class NextcloudStorage extends \RainLoop\Providers\Storage\FileStorage
+{
+	/**
+	 * @param \RainLoop\Model\Account|string|null $mAccount
+	 */
+	public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string
+	{
+		$sDataPath = parent::GenerateFilePath($mAccount, $iStorageType, $bMkDir);
+		if (StorageType::CONFIG === $iStorageType) {
+			$sUID = \OCA\SnappyMail\Util\SnappyMailHelper::getUID();
+			$sDataPath .= ".config/{$sUID}/";
+			if ($bMkDir && !\is_dir($sDataPath) && !\mkdir($sDataPath, 0700, true)) {
+				throw new \RainLoop\Exceptions\Exception('Can\'t make storage directory "'.$sDataPath.'"');
+			}
+		}
+		return $sDataPath;
+	}
+}
diff --git a/plugins/nextcloud/style.css b/plugins/nextcloud/style.css
new file mode 100644
index 000000000..4dd142992
--- /dev/null
+++ b/plugins/nextcloud/style.css
@@ -0,0 +1,17 @@
+#V-PopupsNextcloudFiles li:hover {
+	background-color: var(--color-background-hover);
+}
+#V-PopupsNextcloudFiles li {
+	clear: right;
+	line-height: 2.5em;
+}
+#V-PopupsNextcloudFiles li input,
+#V-PopupsNextcloudFiles li button {
+	cursor: pointer;
+	float: right;
+	margin: 0 0 0 0.5em;
+}
+
+#rl-app .squire-wysiwyg a {
+	text-decoration: underline;
+}
diff --git a/plugins/nextcloud/templates/PopupsNextcloudCalendars.html b/plugins/nextcloud/templates/PopupsNextcloudCalendars.html
new file mode 100644
index 000000000..879340c8f
--- /dev/null
+++ b/plugins/nextcloud/templates/PopupsNextcloudCalendars.html
@@ -0,0 +1,7 @@
+<header>
+	<a class="close" href="#" data-bind="click: close">×</a>
+	<h3 data-i18n="NEXTCLOUD/SELECT_CALENDAR"></h3>
+</header>
+<div class="modal-body form-horizontal">
+	<ul id="sm-nc-calendars"></ul>
+</div>
diff --git a/plugins/nextcloud/templates/PopupsNextcloudFiles.html b/plugins/nextcloud/templates/PopupsNextcloudFiles.html
new file mode 100644
index 000000000..dcc03d7e8
--- /dev/null
+++ b/plugins/nextcloud/templates/PopupsNextcloudFiles.html
@@ -0,0 +1,18 @@
+<header>
+	<a class="close" href="#" data-bind="click: close">×</a>
+	<h3 data-i18n="NEXTCLOUD/SELECT_FOLDER" data-bind="hidden:files"></h3>
+	<h3 data-i18n="NEXTCLOUD/SELECT_FILES" data-bind="visible:files"></h3>
+</header>
+<div class="modal-body form-horizontal">
+<!--
+	TODO: built tree of directories and optional files
+	In case of directories: radiobutton to select one OR click selects
+	In case of files: checkbox to select (multiple)
+-->
+	<ul id="sm-nc-files-tree"></ul>
+</div>
+<footer data-bind="visible:files">
+	<button data-bind="click:attach" name="select" data-icon="📎" class="button-vue" data-i18n="NEXTCLOUD/FILE_ATTACH">attach</button>
+	<button data-bind="click:shareInternal" name="share-internal" data-icon="🔗" class="button-vue" data-i18n="NEXTCLOUD/FILE_INTERNAL">internal</button>
+	<button data-bind="click:sharePublic" name="share-public" data-icon="🔗" class="button-vue" data-i18n="NEXTCLOUD/FILE_PUBLIC">public</button>
+</footer>
diff --git a/plugins/override-smtp-credentials/index.php b/plugins/override-smtp-credentials/index.php
index ef9d6057e..e524bef71 100644
--- a/plugins/override-smtp-credentials/index.php
+++ b/plugins/override-smtp-credentials/index.php
@@ -4,55 +4,71 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Override SMTP Credentials',
-		VERSION = '2.2',
-		RELEASE = '2022-04-13',
-		REQUIRED = '2.5.0',
+		VERSION = '2.5',
+		RELEASE = '2024-03-12',
+		REQUIRED = '2.35.3',
 		CATEGORY = 'Filters',
 		DESCRIPTION = 'Override SMTP credentials for specific users.';
 
 	public function Init() : void
 	{
-		$this->addHook('smtp.before-connect', 'FilterSmtpCredentials');
+		$this->addHook('smtp.before-connect', 'FilterSmtpConnect');
 		$this->addHook('smtp.before-login', 'FilterSmtpCredentials');
 	}
 
 	/**
 	 * @param \RainLoop\Model\Account $oAccount
 	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
-	 * @param array $aSmtpCredentials
+	 * @param \MailSo\Smtp\Settings $oSettings
 	 */
-	public function FilterSmtpCredentials($oAccount, $oSmtpClient, &$aSmtpCredentials)
+	public function FilterSmtpConnect(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
 	{
-		if ($oAccount instanceof \RainLoop\Model\Account && \is_array($aSmtpCredentials))
-		{
-			$sEmail = $oAccount->Email();
-
+		$sEmail = $oAccount->Email();
+		$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
+		$sFoundValue = '';
+		if (\strlen($sWhiteList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList, $sFoundValue)) {
+			\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} matched {$sFoundValue}");
+			$oSettings->usePhpMail = false;
 			$sHost = \trim($this->Config()->Get('plugin', 'smtp_host', ''));
-			$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
-
-			if (0 < strlen($sWhiteList) && 0 < \strlen($sHost) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList))
-			{
-				$aSmtpCredentials['Host'] = $sHost;
-				$aSmtpCredentials['Port'] = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
-
+			if (\strlen($sHost)) {
+				$oSettings->host = $sHost;
+				$oSettings->port = (int) $this->Config()->Get('plugin', 'smtp_port', 25);
 				$sSecure = \trim($this->Config()->Get('plugin', 'smtp_secure', 'None'));
 				switch ($sSecure)
 				{
 					case 'SSL':
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
+						$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::SSL;
 						break;
 					case 'TLS':
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
+					case 'STARTTLS':
+						$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS;
+						break;
+					case 'Detect':
+						$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT;
 						break;
 					default:
-						$aSmtpCredentials['Secure'] = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
+						$oSettings->type = MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
 						break;
 				}
-
-				$aSmtpCredentials['UseAuth'] = (bool) $this->Config()->Get('plugin', 'smtp_auth', true);
-				$aSmtpCredentials['Login'] = \trim($this->Config()->Get('plugin', 'smtp_user', ''));
-				$aSmtpCredentials['Password'] = (string) $this->Config()->Get('plugin', 'smtp_password', '');
 			}
+		} else {
+			\SnappyMail\LOG::debug('SMTP Override', "{$sEmail} no match");
+		}
+	}
+
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
+	 * @param \MailSo\Smtp\Settings $oSettings
+	 */
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
+	{
+		$sWhiteList = \trim($this->Config()->Get('plugin', 'override_users', ''));
+		$sFoundValue = '';
+		if (\strlen($sWhiteList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($oAccount->Email(), $sWhiteList, $sFoundValue)) {
+			$oSettings->useAuth = (bool) $this->Config()->Get('plugin', 'smtp_auth', true);
+			$oSettings->username = \trim($this->Config()->Get('plugin', 'smtp_user', ''));
+			$oSettings->passphrase = (string) $this->Config()->Get('plugin', 'smtp_password', '');
 		}
 	}
 
@@ -69,7 +85,7 @@ class OverrideSmtpCredentialsPlugin extends \RainLoop\Plugins\AbstractPlugin
 				->SetDefaultValue(25),
 			\RainLoop\Plugins\Property::NewInstance('smtp_secure')->SetLabel('SMTP Secure')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
-				->SetDefaultValue(array('None', 'SSL', 'TLS')),
+				->SetDefaultValue(array('None', 'Detect', 'SSL', 'STARTTLS')),
 			\RainLoop\Plugins\Property::NewInstance('smtp_auth')->SetLabel('Use auth')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDefaultValue(true),
diff --git a/plugins/proxy-auth/LICENSE b/plugins/proxy-auth/LICENSE
new file mode 100644
index 000000000..172df18fd
--- /dev/null
+++ b/plugins/proxy-auth/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2023 Philipp Mundhenk
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/proxy-auth/README.md b/plugins/proxy-auth/README.md
new file mode 100644
index 000000000..c9db401e6
--- /dev/null
+++ b/plugins/proxy-auth/README.md
@@ -0,0 +1,91 @@
+# SnappyMail Proxy Auth
+
+This plugin allows to authenticate a user through the remote user header, effectively allowing single-sign on.
+This is achieved through "master user"-like functionality.
+
+## Example Configuration
+
+The exact setup depends on your mailserver, reverse proxy, authentication solution, etc.
+The following example is for Traefik with Authelia and Dovecot as mailserver.
+
+### SnappyMail
+
+The following steps are require in SnappyMail:
+
+- To open SnappyMail through a reverse proxy server (with redirect of authentication system), make sure to enable the correct secfetch policies: ```mode=navigate,dest=document,site=cross-site,user=true;mode=navigate,dest=document,site=same-site,user=true``` in the admin panel -> Config -> Security -> secfetch_allow.
+- Activate plugin in admin panel -> Extensions
+- Configure the plugin with the required data:
+   - Master User Separator is dependent on Dovecot config (see below)
+   - Master User is dependent on Dovecot config (see below)
+   - Master User Password is dependent on Dovecot config (see below)
+   - Header Name is dependent on authentication solution. This is the header containing the name of currently logged in user. In case of Authelia, this is "Remote-User".
+   - Automatic Login: Automatically logs in the user of user header is present (see below)
+
+> **Security note**
+>
+> This plugin trusts the configured request header as proof of identity. Anyone who can reach the SnappyMail container directly and set that header can log in as any user. You **must** ensure that SnappyMail is only reachable through your reverse proxy / SSO chain (e.g. via the docker network, a firewall, or by binding SnappyMail to a non-public interface) and that the upstream proxy strips any client-supplied value of the header before forwarding. The plugin itself does no source-IP validation — earlier versions had a `check_proxy` option, but it inspected the forwarded client IP (the end user's IP) and therefore did not actually verify that the request came from the proxy. It has been removed; gate access at the network layer instead.
+
+This concludes the setup of SnappyMail.
+
+### Dovecot
+
+In Dovecot, you need to enable Master User.
+Enable ```!include auth-master.conf.ext``` in /etc/dovecot/conf.d/10-auth.conf.
+In Dovecot 2.3, the file /etc/dovecot/conf.d/auth-master.conf.ext should contain:
+```
+passdb {
+  driver = passwd-file
+  master = yes
+  args = /etc/dovecot/master-users
+  pass = yes
+}
+```
+
+In Dovecot 2.4, the file /etc/dovecot/conf.d/auth-master.conf.ext should contain:
+```
+passdb passwd-file {
+  master = yes
+  passwd_file_path = /etc/dovecot/master-users
+  result_success = continue
+}
+```
+
+You then need to create a master user in /etc/dovecot/master-users:
+```
+admin:PASSWORD::::::allow_nets=local,172.17.0.0/16
+```
+where the encrypted password ```PASSWORD``` can be created from a cleartext password with ```doveadm pw -s CRYPT```.
+It should start with ```{CRYPT}```.
+Username and password need to configured in the SnappyMail ProxyAuth plugin (see above).
+
+You likely also want to limit the access by an IP address filter, e.g., to ```local,172.17.0.0/16```, if you are running Postfix (```local```) and within a default Docker environment (```172.17.0.0/16```).
+Otherwise, master user login (assuming password is known) is possible from every connectable system.
+This is an unnecessary security risk.
+
+Additionally, you need to set the master user separator in /etc/dovecot/conf.d/10-auth.conf, e.g., ```auth_master_user_separator = *```.
+The separator needs to be configured in the SnappyMail ProxyAuth plugin (see above).
+
+## Test
+
+Once configured correctly, you should be able to access SnappyMail through your reverse proxy at ```https://snappymail.tld/?ProxyAuth```.
+If your reverse proxy provides the username in the configured header (e.g., Remote-User), you will automatically be logged in to your account.
+If not, you will be redirected to the login page.
+
+## Automatic Login
+
+By default, automatic login is activated.
+Behind the scenes, this checks for the existence of the configured user header (through ```/?UserHeaderSet```) and automatically redirects to ```https://snappymail.tld/?ProxyAuth```, trying to log in the user.
+Note that due to this implementation, logout is impossible, as once logged out, the user will automatically be logged in again.
+The user is always considered logged in, as authentication is handled through reverse proxy and authentication system.
+
+Auto login can be disabled in the plugin settings.
+You can also change the logout link in admin panel -> Config -> custom_logout_link to the one of your authentication system, e.g., ```https://auth.yourdomain.com/logout```.
+In this case, you can log out from your overall system via SnappyMail.
+
+## Troubleshooting
+
+### IMAP `AUTHENTICATIONFAILED` after a container rebuild / upgrade
+
+The master user/password fields are encrypted at rest using SnappyMail's `APP_SALT`. If that salt is regenerated (e.g., the data volume was reset, the container was rebuilt without persisting `_data_`, or the salt file was rotated), the values in `plugin-proxy-auth.json` can no longer be decrypted. `getDecrypted()` then silently returns `null`, an empty password is passed to IMAP, and Dovecot rejects the login with `AUTHENTICATIONFAILED`.
+
+Fix: open admin panel -> Extensions -> Proxy Auth, re-enter the Master User and Master Password (and any other previously-set encrypted fields), and save. The values will be re-encrypted under the current salt.
diff --git a/plugins/proxy-auth/index.php b/plugins/proxy-auth/index.php
new file mode 100644
index 000000000..36db5d9c2
--- /dev/null
+++ b/plugins/proxy-auth/index.php
@@ -0,0 +1,139 @@
+<?php
+
+class ProxyAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME     = 'Proxy Auth',
+		AUTHOR   = 'Philipp',
+		URL      = 'https://www.mundhenk.org/',
+		VERSION  = '0.7',
+		RELEASE  = '2026-05-17',
+		REQUIRED = '2.36.1',
+		CATEGORY = 'Login',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'Uses HTTP Remote-User and (Dovecot) master user for login';
+
+	public function Init() : void
+	{
+		$this->addJs('js/auto-login.js');
+		$this->addPartHook('ProxyAuth', 'ServiceProxyAuth');
+		$this->addPartHook('UserHeaderSet', 'ServiceUserHeaderSet');
+		$this->addHook('login.credentials', 'MapEmailAddress');
+	}
+
+	public function MapEmailAddress(string &$sEmail, string &$sImapUser, string &$sPassword, string &$sSmtpUser)
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oLogger = $oActions->Logger();
+		$sPrefix = "ProxyAuth";
+		$sLevel = LOG_DEBUG;
+		$sMsg = "sEmail= " . $sEmail;
+		$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+		$sMasterUser = \trim($this->Config()->getDecrypted('plugin', 'master_user', ''));
+		$sMasterSeparator = \trim($this->Config()->getDecrypted('plugin', 'master_separator', ''));
+
+		/* remove superuser from email for proper UI */
+		if (static::$login) {
+			$sEmail = str_replace($sMasterUser, "", $sEmail);
+			$sEmail = str_replace($sMasterSeparator, "", $sEmail);
+		}
+	}
+
+	private static bool $login = false;
+	public function ServiceProxyAuth() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+
+		$oException = null;
+		$oAccount = null;
+
+		$oLogger = $oActions->Logger();
+		$sLevel = LOG_DEBUG;
+		$sPrefix = "ProxyAuth";
+
+		$sMasterUser = \trim($this->Config()->getDecrypted('plugin', 'master_user', ''));
+		$sMasterSeparator = \trim($this->Config()->getDecrypted('plugin', 'master_separator', ''));
+		$sHeaderName = \trim($this->Config()->getDecrypted('plugin', 'header_name', ''));
+
+		$sRemoteUser = $this->Manager()->Actions()->Http()->GetHeader($sHeaderName);
+		$sMsg = "Remote User: " . $sRemoteUser;
+		$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+		/* create master user login from remote user header and settings */
+		$sEmail = $sRemoteUser . $sMasterSeparator . $sMasterUser;
+		$sPassword = new \SnappyMail\SensitiveString(\trim($this->Config()->getDecrypted('plugin', 'master_password', '')));
+
+		try
+		{
+			static::$login = true;
+			$oAccount = $oActions->LoginProcess($sEmail, $sPassword);
+		}
+		catch (\Throwable $oException)
+		{
+			$oLogger = $oActions->Logger();
+			$oLogger && $oLogger->WriteException($oException);
+		}
+
+		\MailSo\Base\Http::Location('./');
+		return true;
+	}
+
+	public function ServiceUserHeaderSet() : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+
+		$oLogger = $oActions->Logger();
+		$sLevel = LOG_DEBUG;
+		$sPrefix = "ProxyAuth";
+
+		$sHeaderName = \trim($this->Config()->getDecrypted('plugin', 'header_name', ''));
+
+		$sRemoteUser = $this->Manager()->Actions()->Http()->GetHeader($sHeaderName);
+		$sMsg = "Remote User: " . $sRemoteUser;
+		$oLogger->Write($sMsg, $sLevel, $sPrefix);
+
+		if (strlen($sRemoteUser) > 0) {
+			\MailSo\Base\Http::StatusHeader('200');
+		} else {
+			\MailSo\Base\Http::StatusHeader('401');
+		}
+		return true;
+	}
+
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('master_separator')
+				->SetLabel('Master User separator')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Sets the master user separator (format: <username><separator><master username>)')
+				->SetDefaultValue('*')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('master_user')
+				->SetLabel('Master User')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Username of master user')
+				->SetDefaultValue('admin')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('master_password')
+				->SetLabel('Master Password')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Password for master user')
+				->SetDefaultValue('adminpassword')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('header_name')
+				->SetLabel('Header Name')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('Name of header containing username')
+				->SetDefaultValue('Remote-User')
+				->SetEncrypted(),
+			\RainLoop\Plugins\Property::NewInstance('auto_login')
+				->SetAllowedInJs(true)
+				->SetLabel('Activate automatic login')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDescription('Activates automatic login, if User Header is set (note: Use custom_logout_link to enable logout, see plugin README)')
+				->SetDefaultValue(true)
+		);
+	}
+}
diff --git a/plugins/proxy-auth/js/auto-login.js b/plugins/proxy-auth/js/auto-login.js
new file mode 100644
index 000000000..ba5e0e617
--- /dev/null
+++ b/plugins/proxy-auth/js/auto-login.js
@@ -0,0 +1,32 @@
+(rl => {
+
+    rl && addEventListener('rl-view-model', e => {
+        const id = e.detail.viewModelTemplateID;
+        if (e.detail && ('Login' === id)) {
+	    let
+		auto_login = window.rl.pluginSettingsGet('proxy-auth', 'auto_login');
+            ;
+
+            const
+                ForwardProxyAuth = () => {
+		    if (auto_login) {
+                        var xhr = new XMLHttpRequest();
+                        xhr.open("GET", "?UserHeaderSet", true);
+
+                        xhr.onreadystatechange = function () {
+                            if (xhr.readyState == 4 && xhr.status == 200) {
+                                window.location.href = "?ProxyAuth";
+                            }
+                        };
+
+                        xhr.send();
+                    }
+                };
+
+            window.ForwardProxyAuth = ForwardProxyAuth;
+
+            ForwardProxyAuth();
+        }
+    });
+})(window.rl);
+
diff --git a/plugins/proxyauth-login-example/index.php b/plugins/proxyauth-login-example/index.php
deleted file mode 100644
index afa590482..000000000
--- a/plugins/proxyauth-login-example/index.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-class ProxyauthLoginExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
-{
-	const
-		NAME     = 'Proxy Auth Login Example',
-		VERSION = '2.1',
-		REQUIRED = '2.5.0',
-		CATEGORY = 'General',
-		DESCRIPTION = '';
-
-	public function Init() : void
-	{
-		$this->addHook('login.success', 'EventLoginPostLoginProvide');
-	}
-
-	/**
-	 * @param string $sLogin
-	 * @param string $sPassword
-	 */
-	public function isValidAccount($sLogin, $sPassword)
-	{
-		return !empty($sLogin) && !empty($sPassword);
-	}
-
-	/**
-	 * @param \RainLoop\Model\Account $oAccount
-	 */
-	public function EventLoginPostLoginProvide(&$oAccount)
-	{
-		if ($oAccount instanceof \RainLoop\Model\Account)
-		{
-			// Verify logic
-			$bValid = $this->isValidAccount($oAccount->Login(), $oAccount->Password());
-
-			/**
-			 * $oAccount->Email();			// Email (It is not a IMAP login)
-			 * $oAccount->Login();			// IMAP login
-			 * $oAccount->Password();		// IMAP password
-			 * $oAccount->DomainIncHost();  // IMAP host
-			 *
-			 * @see \RainLoo\Model\Account for more
-			 */
-
-			if (!$bValid) // if verify failed
-			{
-				// throw a Auth Error Exception
-				throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AuthError);
-			}
-			else // Or setup your proxyauth admin account credentials
-			{
-				$oAccount->SetProxyAuthUser('admin@domain.com');
-				$oAccount->SetProxyAuthPassword('secret-admin-password');
-			}
-		}
-	}
-}
diff --git a/plugins/recaptcha/index.php b/plugins/recaptcha/index.php
index a0fd55ffe..9245bd512 100644
--- a/plugins/recaptcha/index.php
+++ b/plugins/recaptcha/index.php
@@ -6,9 +6,9 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 		NAME     = 'reCaptcha',
 		AUTHOR   = 'SnappyMail',
 		URL      = 'https://snappymail.eu/',
-		VERSION  = '2.12.1',
-		RELEASE  = '2022-02-14',
-		REQUIRED = '2.12.1',
+		VERSION  = '2.16',
+		RELEASE  = '2024-03-12',
+		REQUIRED = '2.35.3',
 		CATEGORY = 'General',
 		LICENSE  = 'MIT',
 		DESCRIPTION = 'A CAPTCHA (v2) is a program that can generate and grade tests that humans can pass but current computer programs cannot. For example, humans can read distorted text as the one shown below, but current computer programs can\'t. More info at https://developers.google.com/recaptcha';
@@ -22,8 +22,8 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 		$this->addJs('js/recaptcha.js');
 
-		$this->addHook('json.action-pre-call', 'AjaxActionPreCall');
-		$this->addHook('filter.json-response', 'FilterAjaxResponse');
+		$this->addHook('json.before-login', 'BeforeLogin');
+		$this->addHook('json.after-login', 'AfterLogin');
 		$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
 	}
 
@@ -64,7 +64,7 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$oCacher = $this->Manager()->Actions()->Cacher();
 			$sLimit = $oCacher && $oCacher->IsInited() ? $oCacher->Get($this->getCaptchaCacherKey()) : '0';
 
-			if (\strlen($sLimit) && \is_numeric($sLimit)) {
+			if (\is_numeric($sLimit)) {
 				$iConfigLimit -= (int) $sLimit;
 			}
 		}
@@ -82,16 +82,13 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 		}
 	}
 
-	/**
-	 * @param string $sAction
-	 */
-	public function AjaxActionPreCall(string $sAction)
+	public function BeforeLogin()
 	{
-		if ('Login' === $sAction && 0 >= $this->getLimit()) {
+		if (0 >= $this->getLimit()) {
 			$bResult = false;
 
 			$HTTP = \SnappyMail\HTTP\Request::factory();
-			$oResponse = $HTTP->doRequest('POST', 'https://www.google.com/recaptcha/api/siteverify', array(
+			$oResponse = $HTTP->doRequest('POST', 'https://www.recaptcha.net/recaptcha/api/siteverify', array(
 				'secret' => $this->Config()->Get('plugin', 'private_key', ''),
 				'response' => $this->Manager()->Actions()->GetActionParam('RecaptchaResponse', '')
 			));
@@ -112,28 +109,28 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	/**
 	 * @param string $sAction
-	 * @param array $aResponseItem
+	 * @param array $aResponse
 	 */
-	public function FilterAjaxResponse(string $sAction, array &$aResponseItem)
+	public function AfterLogin(array &$aResponse)
 	{
-		if ('Login' === $sAction && $aResponseItem && isset($aResponseItem['Result'])) {
+		if (isset($aResponse['Result'])) {
 			$oCacher = $this->Manager()->Actions()->Cacher();
 			$iConfigLimit = (int) $this->Config()->Get('plugin', 'error_limit', 0);
 
 			$sKey = $this->getCaptchaCacherKey();
 
 			if (0 < $iConfigLimit && $oCacher && $oCacher->IsInited()) {
-				if (false === $aResponseItem['Result']) {
+				if (false === $aResponse['Result']) {
 					$iLimit = 0;
 					$sLimut = $oCacher->Get($sKey);
-					if (\strlen($sLimut) && \is_numeric($sLimut)) {
+					if (\is_numeric($sLimut)) {
 						$iLimit = (int) $sLimut;
 					}
 
 					$oCacher->Set($sKey, ++$iLimit);
 
 					if ($iConfigLimit <= $iLimit) {
-						$aResponseItem['Captcha'] = true;
+						$aResponse['Captcha'] = true;
 					}
 				} else {
 					$oCacher->Delete($sKey);
@@ -144,10 +141,9 @@ class RecaptchaPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
 	{
-		$CSP->script[] = 'https://www.google.com/recaptcha/';
-		$CSP->script[] = 'https://www.gstatic.com/recaptcha/';
-		$CSP->frame[] = 'https://www.google.com/recaptcha/';
-		$CSP->frame[] = 'https://recaptcha.google.com/recaptcha/';
+		$CSP->add('script-src', 'https://www.gstatic.com/recaptcha/');
+		$CSP->add('script-src', 'https://www.recaptcha.net/recaptcha/');
+		$CSP->add('frame-src', 'https://www.recaptcha.net/recaptcha/');
 	}
 
 }
diff --git a/plugins/recaptcha/js/recaptcha.js b/plugins/recaptcha/js/recaptcha.js
index 246d7adc2..591d26598 100644
--- a/plugins/recaptcha/js/recaptcha.js
+++ b/plugins/recaptcha/js/recaptcha.js
@@ -36,7 +36,7 @@
 					} else if (!script) {
 						script = doc.createElement('script');
 //						script.onload = ShowRecaptcha;
-						script.src = 'https://www.google.com/recaptcha/api.js?onload=ShowRecaptcha&render=explicit&hl=' + doc.documentElement.lang;
+						script.src = 'https://www.recaptcha.net/recaptcha/api.js?onload=ShowRecaptcha&render=explicit&hl=' + doc.documentElement.lang;
 						doc.head.append(script);
 					}
 				};
diff --git a/plugins/search-filters/index.php b/plugins/search-filters/index.php
new file mode 100644
index 000000000..f48cae1ae
--- /dev/null
+++ b/plugins/search-filters/index.php
@@ -0,0 +1,245 @@
+<?php
+
+class SearchFiltersPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	public const
+		NAME = 'Search Filters',
+		AUTHOR = 'AbdoBnHesham',
+		URL    = 'https://github.com/the-djmaze/snappymail/pull/1673',
+		VERSION = '0.3',
+		RELEASE = '2026-10-22',
+		REQUIRED = '2.36.3',
+		CATEGORY = 'General',
+		LICENSE = 'MIT',
+		DESCRIPTION = 'Add filters to search queries';
+
+	public function Init(): void
+	{
+		$this->UseLangs(true);
+
+		$this->addHook('imap.after-login', 'ApplyFilters');
+
+		$this->addTemplate('templates/STabSearchFilters.html');
+
+		$this->addTemplate('templates/PopupsSearchFilters.html');
+		$this->addTemplate('templates/PopupsSTabAdvancedSearch.html');
+		$this->addJs('js/SearchFilters.js');
+
+		$this->addJsonHook('SGetFilters', 'GetFilters');
+		$this->addJsonHook('SAddEditFilter', 'AddEditFilter');
+		$this->addJsonHook('SUpdateSearchQ', 'UpdateSearchQ');
+		$this->addJsonHook('SDeleteFilter', 'DeleteFilter');
+	}
+
+	public function ApplyFilters(
+		\RainLoop\Model\Account $oAccount,
+		\MailSo\Imap\ImapClient $oImapClient,
+		bool $bSuccess,
+		\MailSo\Imap\Settings $oSettings
+	) {
+		if (!$bSuccess) {
+			return;
+		}
+
+		$aSettings = $this->getUserSettings();
+		if (empty($aSettings['SFilters'])) {
+			$aSettings['SFilters'] = [];
+			$this->saveUserSettings($aSettings);
+			return;
+		}
+
+		$Filters = $aSettings['SFilters'];
+
+		foreach ($Filters as $filter) {
+			$this->Manager()->logWrite(json_encode(['filter' => $filter]), LOG_WARNING);
+
+			$searchQ = $filter['searchQ'];
+
+			// obsługa keyword (multi-folder)
+			if (stripos($searchQ, 'keyword=') !== false) {
+				$oMailClient = $this->Manager()->Actions()->MailClient();
+
+				// Pobieramy wszystkie foldery top-level
+				$folders = $oMailClient->Folders('', false, '');
+				foreach ($folders as $f) {
+					$folder = $f->FullName ?? null;
+					if (!$folder) continue;
+
+					$uids = $this->searchMessages($oImapClient, $searchQ, $folder);
+					if (!empty($uids)) {
+						$this->applyActions($oImapClient, $filter, $uids, $folder);
+					}
+				}
+
+				continue; // przechodzimy do następnego filtra
+			}
+
+			// normalny search w INBOX
+			$uids = $this->searchMessages($oImapClient, $searchQ, 'INBOX');
+			if (!empty($uids)) {
+				$this->applyActions($oImapClient, $filter, $uids, 'INBOX');
+			}
+		}
+	}
+
+	private function searchMessages(
+		\MailSo\Imap\ImapClient $imapClient,
+		string $search,
+		string $folder = "INBOX"
+	): array {
+		try {
+			$bUseCache = false;
+			$oSearchCriterias = \MailSo\Imap\SearchCriterias::fromString(
+				$imapClient,
+				$folder,
+				$search,
+				true,
+				$bUseCache
+			);
+
+			$imapClient->FolderSelect($folder);
+			return $imapClient->MessageSearch($oSearchCriterias, true);
+
+		} catch (\Throwable $e) {
+			$this->Manager()->logWrite(
+				'SearchFilters IMAP error in folder "' . $folder .
+				'" for search "' . $search . '": ' . $e->getMessage(),
+				LOG_ERR
+			);
+			return [];
+		}
+	}
+
+	private function applyActions(
+		\MailSo\Imap\ImapClient $imapClient,
+		array $filter,
+		array $uids,
+		string $folder
+	) {
+		// Mark as read/seen
+		if (!empty($filter['fSeen'])) {
+			foreach ($uids as $uid) {
+				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
+				$this->Manager()->Actions()->MailClient()->MessageSetFlag(
+					$folder,
+					$oRange,
+					\MailSo\Imap\Enumerations\MessageFlag::SEEN
+				);
+			}
+		}
+
+		// Flag/Star message
+		if (!empty($filter['fFlag'])) {
+			foreach ($uids as $uid) {
+				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
+				$this->Manager()->Actions()->MailClient()->MessageSetFlag(
+					$folder,
+					$oRange,
+					\MailSo\Imap\Enumerations\MessageFlag::FLAGGED
+				);
+			}
+		}
+
+		// Move to folder
+		if (!empty($filter['fFolder']) && $filter['fFolder'] !== -1) {
+			foreach ($uids as $uid) {
+				$oRange = new \MailSo\Imap\SequenceSet([$uid]);
+				$imapClient->MessageMove('INBOX', $filter['fFolder'], $oRange);
+			}
+		}
+	}
+
+	public function GetFilters()
+	{
+		$aSettings = $this->getUserSettings();
+		$Filters = $aSettings['SFilters'] ?? [];
+
+		$Search = $this->jsonParam('SSearchQ');
+		if (!$Search) {
+			return $this->jsonResponse(__FUNCTION__, ['SFilters' => $Filters]);
+		}
+
+		$Filter = null;
+		foreach ($aSettings['SFilters'] as $filter) {
+			if ($filter['searchQ'] == $Search) {
+				$Filter = $filter;
+			}
+		}
+
+		return $this->jsonResponse(__FUNCTION__, ['SFilter' => $Filter]);
+	}
+
+	public function AddEditFilter()
+	{
+		$SFilter = $this->jsonParam('SFilter');
+		$newFilter = [
+			'searchQ' => $SFilter['searchQ'],
+			'priority' => $SFilter['priority'] ?? 1,
+			'fFolder' => $SFilter['fFolder'],
+			'fSeen' => $SFilter['fSeen'],
+			'fFlag' => $SFilter['fFlag'],
+		];
+
+		$aSettings = $this->getUserSettings();
+		$aSettings['SFilters'] = $aSettings['SFilters'] ?? [];
+
+		$foundIndex = null;
+		foreach ($aSettings['SFilters'] as $index => $filter) {
+			if ($filter['searchQ'] == $SFilter['searchQ']) {
+				if ($filter['priority'] != $SFilter['priority']) {
+					array_splice($aSettings['SFilters'], $index, 1);
+				} else {
+					$foundIndex = $index;
+				}
+			}
+		}
+
+		if ($foundIndex === null) {
+			$insertIndex = 0;
+			foreach ($aSettings['SFilters'] as $index => $filter)
+				if ($filter['priority'] >= $newFilter['priority'])
+					$insertIndex = $index + 1;
+				else
+					break;
+
+			array_splice($aSettings['SFilters'], $insertIndex, 0, [$newFilter]);
+		} else {
+			$aSettings['SFilters'][$foundIndex] = $newFilter;
+		}
+		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings($aSettings));
+	}
+
+	public function UpdateSearchQ()
+	{
+		$SFilter = $this->jsonParam('SFilter');
+
+		$aSettings = $this->getUserSettings();
+		$aSettings['SFilters'] = $aSettings['SFilters'] ?? [];
+
+		foreach ($aSettings['SFilters'] as $index => $filter) {
+			if ($filter['searchQ'] == $SFilter['oldSearchQ']) {
+				$filter['searchQ'] = $SFilter['searchQ'];
+				$aSettings['SFilters'][$index] = $filter;
+				break;
+			}
+		}
+
+		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings($aSettings));
+	}
+
+	public function DeleteFilter()
+	{
+		$Search = $this->jsonParam('SSearchQ');
+
+		$aSettings = $this->getUserSettings();
+		$aSettings['SFilters'] = $aSettings['SFilters'] ?? [];
+
+		foreach ($aSettings['SFilters'] as $index => $filter) {
+			if ($filter['searchQ'] == $Search) {
+				array_splice($aSettings['SFilters'], $index, 1);
+			}
+		}
+
+		return $this->jsonResponse(__FUNCTION__, $this->saveUserSettings($aSettings));
+	}
+}
diff --git a/plugins/search-filters/js/SearchFilters.js b/plugins/search-filters/js/SearchFilters.js
new file mode 100644
index 000000000..d2d5385f2
--- /dev/null
+++ b/plugins/search-filters/js/SearchFilters.js
@@ -0,0 +1,340 @@
+((rl) => {
+	const Folders = ko.computed(() => {
+		const
+			aResult = [{
+				id: -1,
+				name: ''
+			}],
+			sDeepPrefix = '\u00A0\u00A0\u00A0',
+			showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
+			foldersWalk = folders => {
+				folders.forEach(oItem => {
+					if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
+						aResult.push({
+							id: oItem.fullName,
+							name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName()
+						});
+					}
+
+					if (oItem.subFolders.length) {
+						foldersWalk(oItem.subFolders());
+					}
+				});
+			};
+		foldersWalk(rl.app.folderList());
+		return aResult;
+	});
+
+	const Priorities = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
+	const searchQ = ko.observable(''),
+		priority = ko.observable(1),
+		oldSearchQ = ko.observable(''),
+		fFolder = ko.observable(''),
+		fSeen = ko.observable(false),
+		fFlag = ko.observable(false),
+		ioFilters = ko.observableArray([]);
+
+	const i18n = (val) => rl.i18n(`SFILTERS/${val}`);
+
+	const ServerActions = {
+		GetFilters(loading) {
+			ioFilters([]);
+			rl.pluginRemoteRequest((iError, oData) => {
+				if (iError) return console.error(iError);
+
+				oData.Result.SFilters.forEach((f) => ioFilters.push(ko.observable(f)));
+
+				if (loading) loading(false);
+			}, 'SGetFilters');
+		},
+		GetFilter() {
+			rl.pluginRemoteRequest(
+				(iError, oData) => {
+					if (iError) return console.error(iError);
+
+					const filter = oData.Result.SFilter || {};
+					priority(filter.priority || 1);
+					fFolder(filter.fFolder);
+					fSeen(filter.fSeen);
+					fFlag(filter.fFlag);
+				},
+				'SGetFilters',
+				{
+					SSearchQ: searchQ()
+				}
+			);
+		},
+		AddOrEditFilter() {
+			rl.pluginRemoteRequest(
+				(iError, oData) => {
+					if (!iError) this.GetFilters();
+				},
+				'SAddEditFilter',
+				{
+					SFilter: {
+						searchQ: oldSearchQ() || searchQ(),
+						priority: priority(),
+						fFolder: fFolder(),
+						fSeen: fSeen(),
+						fFlag: fFlag()
+					}
+				}
+			);
+		},
+		UpdateSearchQ(newSearchQ) {
+			rl.pluginRemoteRequest(
+				(iError, oData) => {
+					if (!iError) this.GetFilters();
+				},
+				'SUpdateSearchQ',
+				{
+					SFilter: {
+						oldSearchQ: oldSearchQ(),
+						searchQ: newSearchQ
+					}
+				}
+			);
+		},
+		RemoveFilter(searchQToRemove) {
+			rl.pluginRemoteRequest(
+				(iError, oData) => {
+					if (iError) return console.error(iError, oData);
+					const index = ioFilters().findIndex((f) => f.searchQ() === searchQToRemove);
+					ioFilters.splice(index, 1);
+				},
+				'SDeleteFilter',
+				{
+					SSearchQ: searchQToRemove
+				}
+			);
+		}
+	};
+
+	addEventListener('rl-view-model', (event) => {
+		const advS = event.detail;
+		if (advS.viewModelTemplateID == 'PopupsAdvancedSearch') {
+			const button = document.createElement('button');
+			button.setAttribute('class', 'btn');
+			button.setAttribute('data-i18n', 'SFILTERS/CREATE_FILTER');
+			button.addEventListener('click', function () {
+				searchQ(advS.buildSearchString());
+				if (searchQ()) SearchFiltersPopupView.showModal();
+			});
+
+			const footer = advS.querySelector('footer');
+			footer.style.display = 'flex';
+			footer.style.justifyContent = 'space-between';
+
+			footer.prepend(button);
+		}
+	});
+
+	class SearchFiltersSettingsTab {
+		constructor() {
+			this.folders = Folders;
+			this.Priorities = Priorities;
+			this.ioFilters = ioFilters;
+
+			this.loading = ko.observable(false);
+			this.saving = ko.observable(false);
+
+			this.i18n = i18n;
+
+			this.savingOrLoading = ko.computed(() => {
+				return this.loading() || this.saving();
+			});
+		}
+
+		edit(filter) {
+			oldSearchQ(filter.searchQ);
+			searchQ(filter.searchQ);
+			priority(filter.priority || 1);
+			fFolder(filter.fFolder);
+			fSeen(filter.fSeen);
+			fFlag(filter.fFlag);
+			AdvancedSearchPopupView.showModal();
+		}
+
+		remove(filter) {
+			ServerActions.RemoveFilter(filter.searchQ);
+		}
+
+		onShow() {
+			this.clear();
+			this.loading(true);
+			ServerActions.GetFilters(this.loading);
+		}
+
+		clear() {
+			this.ioFilters([]);
+			this.loading(false);
+			this.saving(false);
+		}
+	}
+
+	rl.addSettingsViewModel(SearchFiltersSettingsTab, 'STabSearchFilters', 'Search Filters', 'searchfilters');
+
+	class SearchFiltersPopupView extends rl.pluginPopupView {
+		constructor() {
+			super('SearchFilters');
+
+			this.folders = Folders;
+			this.Priorities = Priorities;
+
+			this.priority = priority;
+			this.fFolder = fFolder;
+			this.fSeen = fSeen;
+			this.fFlag = fFlag;
+
+			this.usefFolder = ko.observable(false);
+			this.fFolder.subscribe((v) => this.usefFolder(!!v));
+		}
+
+		submitForm() {
+			if (!this.usefFolder()) fFolder('');
+			ServerActions.AddOrEditFilter();
+			this.close();
+		}
+
+		beforeShow() {
+			if (!oldSearchQ()) {
+				ServerActions.GetFilter();
+			} else {
+				this.usefFolder(!!fFolder());
+			}
+		}
+	}
+
+	class AdvancedSearchPopupView extends rl.pluginPopupView {
+		constructor() {
+			super('STabAdvancedSearch');
+
+			this.addObservables({
+				from: '',
+				to: '',
+				subject: '',
+				text: '',
+				repliedValue: -1,
+				selectedDateValue: -1,
+				selectedTreeValue: '',
+
+				hasAttachment: false,
+				starred: false,
+				unseen: false
+			});
+
+			this.addComputables({
+				repliedOptions: () => {
+					return [
+						{ id: -1, name: '' },
+						{ id: 1, name: rl.i18n('GLOBAL/YES') },
+						{ id: 0, name: rl.i18n('GLOBAL/NO') }
+					];
+				},
+
+				selectedDates: () => {
+					let prefix = 'SEARCH/DATE_';
+					return [
+						{ id: -1, name: rl.i18n(prefix + 'ALL') },
+						{ id: 3, name: rl.i18n(prefix + '3_DAYS') },
+						{ id: 7, name: rl.i18n(prefix + '7_DAYS') },
+						{ id: 30, name: rl.i18n(prefix + 'MONTH') },
+						{ id: 90, name: rl.i18n(prefix + '3_MONTHS') },
+						{ id: 180, name: rl.i18n(prefix + '6_MONTHS') },
+						{ id: 365, name: rl.i18n(prefix + 'YEAR') }
+					];
+				},
+
+				selectedTree: () => {
+					let prefix = 'SEARCH/SUBFOLDERS_';
+					return [
+						{ id: '', name: rl.i18n(prefix + 'NONE') },
+						{ id: 'subtree-one', name: rl.i18n(prefix + 'SUBTREE_ONE') },
+						{ id: 'subtree', name: rl.i18n(prefix + 'SUBTREE') }
+					];
+				}
+			});
+		}
+
+		submitForm() {
+			const newSearchQ = this.buildSearchString();
+			if (newSearchQ != oldSearchQ()) ServerActions.UpdateSearchQ(newSearchQ);
+			this.close();
+		}
+
+		editFilters() {
+			SearchFiltersPopupView.showModal();
+		}
+
+		buildSearchString() {
+			const self = this,
+				data = new FormData(),
+				append = (key, value) => value.length && data.append(key, value);
+
+			append('from', self.from().trim());
+			append('to', self.to().trim());
+			append('subject', self.subject().trim());
+			append('text', self.text().trim());
+			append('in', self.selectedTreeValue());
+			if (-1 < self.selectedDateValue()) {
+				let d = new Date();
+				d.setDate(d.getDate() - self.selectedDateValue());
+				append('since', d.toISOString().split('T')[0]);
+			}
+
+			let result = decodeURIComponent(new URLSearchParams(data).toString());
+
+			if (self.hasAttachment()) {
+				result += '&attachment';
+			}
+			if (self.unseen()) {
+				result += '&unseen';
+			}
+			if (self.starred()) {
+				result += '&flagged';
+			}
+			if (1 == self.repliedValue()) {
+				result += '&answered';
+			}
+			if (0 == self.repliedValue()) {
+				result += '&unanswered';
+			}
+
+			return result.replace(/^&+/, '');
+		}
+
+		onShow() {
+			const pString = (value) => (null != value ? '' + value : '');
+
+			const self = this,
+				params = new URLSearchParams('?' + searchQ());
+			self.from(pString(params.get('from')));
+			self.to(pString(params.get('to')));
+			self.subject(pString(params.get('subject')));
+			self.text(pString(params.get('text')));
+			self.selectedTreeValue(pString(params.get('in')));
+			self.selectedDateValue(-1);
+			self.hasAttachment(params.has('attachment'));
+			self.starred(params.has('flagged'));
+			self.unseen(params.has('unseen'));
+			if (params.has('answered')) {
+				self.repliedValue(1);
+			} else if (params.has('unanswered')) {
+				self.repliedValue(0);
+			}
+		}
+
+		clear() {
+			oldSearchQ('');
+			searchQ('');
+			fFolder('');
+			priority(1);
+			fSeen(false);
+			fFlag(false);
+		}
+
+		onHide() {
+			this.clear();
+		}
+	}
+})(window.rl);
diff --git a/plugins/search-filters/langs/en.json b/plugins/search-filters/langs/en.json
new file mode 100644
index 000000000..6fb25bbf3
--- /dev/null
+++ b/plugins/search-filters/langs/en.json
@@ -0,0 +1,21 @@
+{
+	"SFILTERS": {
+		"WHEN_MESSAGE_MATCH_SEARCH_CRITERIA": "When a message is an exact match for your search criteria:",
+		"FILTERS": "Filters",
+		"FILTER": "Filter",
+		"MOVE_TO_FOLDER": "Move to folder: ",
+		"CREATE_FILTER": "Create filter",
+		"EDIT_FILTERS": "Edit filters",
+		"MATCHES": "Matches: ",
+		"DO_THIS": "Do this: ",
+		"SAVE": "Save",
+		"EDIT": "Edit",
+		"REMOVE": "Remove",
+		"NO_FILTERS": "You haven't added any filters yet.",
+		"THE_FOLLOWING_FILTERS_ARE_APPLIED": "The following filters are applied to all incoming mail: ",
+		"MARK_AS_READ": "Mark as read",
+		"STAR_IT": "Star it",
+		"PRIORITY_LABLE": "Priority points, Higher means it'll apply first",
+		"PRIORITY_POINTS": "Priority points"
+	}
+}
\ No newline at end of file
diff --git a/plugins/search-filters/templates/PopupsSTabAdvancedSearch.html b/plugins/search-filters/templates/PopupsSTabAdvancedSearch.html
new file mode 100644
index 000000000..d1a260551
--- /dev/null
+++ b/plugins/search-filters/templates/PopupsSTabAdvancedSearch.html
@@ -0,0 +1,82 @@
+<header>
+	<a href="#" class="close" data-bind="click: close">×</a>
+	<h3 data-i18n="SEARCH/TITLE_ADV"></h3>
+</header>
+<form id="advsearchform" class="modal-body form-horizontal" action="#/" autocomplete="off" spellcheck="false"
+	data-bind="submit: submitForm">
+	<div>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/FROM"></label>
+			<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
+				data-bind="value: from">
+		</div>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/TO"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" data-bind="value: to">
+		</div>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/SUBJECT"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" data-bind="value: subject">
+		</div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/TEXT"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" data-bind="value: text">
+		</div>
+	</div>
+	<div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/DATE"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: selectedDates,
+					value: selectedDateValue,
+					optionsText: 'name',
+					optionsValue: 'id'
+				}
+			}"></div>
+		</div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/REPLIED"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: repliedOptions,
+					value: repliedValue,
+					optionsText: 'name',
+					optionsValue: 'id'
+				}
+			}"></div>
+		</div>
+		<div class="control-group">
+			<label></label>
+			<div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'SEARCH/UNSEEN',
+						value: unseen
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'SEARCH/FLAGGED',
+						value: starred
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'SEARCH/HAS_ATTACHMENT',
+						value: hasAttachment
+					}
+				}"></div>
+			</div>
+		</div>
+	</div>
+</form>
+<footer style="display: flex; justify-content: space-between;">
+	<button class="btn" data-i18n="SFILTERS/EDIT_FILTERS" data-bind="click: editFilters"></button>
+	<button form="advsearchform" class="btn" data-icon="✔" data-i18n="SFILTERS/SAVE"></button>
+</footer>
\ No newline at end of file
diff --git a/plugins/search-filters/templates/PopupsSearchFilters.html b/plugins/search-filters/templates/PopupsSearchFilters.html
new file mode 100644
index 000000000..c85ca8914
--- /dev/null
+++ b/plugins/search-filters/templates/PopupsSearchFilters.html
@@ -0,0 +1,54 @@
+<header>
+	<a href="#" class="close" data-bind="click: close">×</a>
+	<h3 data-i18n="SFILTERS/WHEN_MESSAGE_MATCH_SEARCH_CRITERIA"></h3>
+</header>
+<form id="search-filters-form" class="modal-body form-horizontal" action="#/" autocomplete="off" spellcheck="false"
+	data-bind="submit: submitForm">
+	<div>
+		<div class="control-group">
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SFILTERS/MOVE_TO_FOLDER',
+					value: usefFolder
+				}
+			}"></div>
+			<select data-bind="
+				options: folders,
+				value: fFolder,
+				optionsText: 'name',
+				optionsValue: 'id',
+				enable: usefFolder
+			"></select>
+		</div>
+		<div class="control-group">
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SFILTERS/MARK_AS_READ',
+					value: fSeen
+				}
+			}"></div>
+		</div>
+		<div class="control-group">
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SFILTERS/STAR_IT',
+					value: fFlag
+				}
+			}"></div>
+		</div>
+		<div class="control-group">
+			<label for="priority" data-i18n="SFILTERS/PRIORITY_LABLE"></label>
+			<select data-bind="
+				options: Priorities,
+				value: priority,
+			"></select>
+		</div>
+	</div>
+</form>
+<footer>
+	<button form="search-filters-form" class="btn buttonSearchFilters" data-icon="✔"
+		data-i18n="SFILTERS/CREATE_FILTER"></button>
+</footer>
diff --git a/plugins/search-filters/templates/STabSearchFilters.html b/plugins/search-filters/templates/STabSearchFilters.html
new file mode 100644
index 000000000..d006da345
--- /dev/null
+++ b/plugins/search-filters/templates/STabSearchFilters.html
@@ -0,0 +1,39 @@
+<div>
+	<div class="form-horizontal">
+		<div class="legend">
+			<span data-i18n="SFILTERS/THE_FOLLOWING_FILTERS_ARE_APPLIED"></span>
+			&nbsp;&nbsp;&nbsp;
+			<i class="icon-spinner animated" style="margin-top: 5px" data-bind="visible: loading"></i>
+		</div>
+
+		<div data-bind="visible: ioFilters().length == 0">
+			<span data-i18n="SFILTERS/NO_FILTERS"> </span>
+		</div>
+
+		<!-- ko foreach: ioFilters -->
+		<label class="control-label">
+			<span data-bind="text: $root.i18n('MATCHES')"> </span>
+			<span data-bind="text: searchQ"></span>
+			&nbsp;
+			<span data-bind="text: $root.i18n('PRIORITY_POINTS')"></span>
+			:
+			&nbsp;
+			<span data-bind="text: priority"></span>
+			<br>
+			<span data-bind="text: $root.i18n('DO_THIS')"></span>
+			<span data-bind="visible: fFolder, text: $root.i18n('MOVE_TO_FOLDER')"></span>
+			<span data-bind="visible: fFolder, text: fFolder"></span>
+			&nbsp;
+			<span data-bind="visible: fSeen, text: $root.i18n('MARK_AS_READ')"></span>
+			&nbsp;
+			<span data-bind="visible: fFlag, text: $root.i18n('STAR_IT')"></span>
+		</label>
+		<div class="controls">
+			<button class="btn" data-bind="click: $root.edit, text: $root.i18n('EDIT')"></button>
+			<button class="btn" data-bind="click: $root.remove, text: $root.i18n('REMOVE')"></button>
+		</div>
+		<br>
+		<!-- /ko -->
+
+	</div>
+</div>
\ No newline at end of file
diff --git a/plugins/send-save-in/LICENSE b/plugins/send-save-in/LICENSE
new file mode 100644
index 000000000..f709b02e2
--- /dev/null
+++ b/plugins/send-save-in/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2016 RainLoop Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/send-save-in/index.php b/plugins/send-save-in/index.php
new file mode 100644
index 000000000..2289c18f3
--- /dev/null
+++ b/plugins/send-save-in/index.php
@@ -0,0 +1,23 @@
+<?php
+
+class SendSaveInPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+//	use \MailSo\Log\Inherit;
+
+	const
+		NAME     = 'Send Save In',
+		AUTHOR   = 'SnappyMail',
+		URL      = 'https://snappymail.eu/',
+		VERSION  = '0.1',
+		RELEASE  = '2024-10-08',
+		REQUIRED = '2.38.1',
+		CATEGORY = 'General',
+		LICENSE  = 'MIT',
+		DESCRIPTION = 'When composing a message, select the save folder';
+
+	public function Init() : void
+	{
+//		$this->UseLangs(true); // start use langs folder
+		$this->addJs('savein.js');
+	}
+}
diff --git a/plugins/send-save-in/savein.js b/plugins/send-save-in/savein.js
new file mode 100644
index 000000000..b95e18892
--- /dev/null
+++ b/plugins/send-save-in/savein.js
@@ -0,0 +1,75 @@
+(rl => {
+	const templateId = 'PopupsCompose',
+		folderListOptionsBuilder = () => {
+			const
+				aResult = [{
+					id: '',
+					name: '',
+					system: false,
+					disabled: false
+				}],
+				sDeepPrefix = '\u00A0\u00A0\u00A0',
+				showUnsubscribed = true/*!SettingsUserStore.hideUnsubscribed()*/,
+
+				foldersWalk = folders => {
+					folders.forEach(oItem => {
+						if (showUnsubscribed || oItem.hasSubscriptions() || !oItem.exists) {
+							aResult.push({
+								id: oItem.fullName,
+								name: sDeepPrefix.repeat(oItem.deep) + oItem.detailedName(),
+								system: false,
+								disabled: !oItem.selectable()
+							});
+						}
+
+						if (oItem.subFolders.length) {
+							foldersWalk(oItem.subFolders());
+						}
+					});
+				};
+
+
+			// FolderUserStore.folderList()
+			foldersWalk(rl.app.folderList() || []);
+
+			return aResult;
+		};
+
+	let oldSentFolderFn;
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+			const view = e.detail; // ComposePopupView
+
+			view.sentFolderValue = ko.observable('');
+			view.sentFolderSelectList = ko.computed(folderListOptionsBuilder, {'pure':true});
+			view.defaultOptionsAfterRender = (domItem, item) =>
+				item && undefined !== item.disabled && domItem?.classList.toggle('disabled', domItem.disabled = item.disabled);
+
+			oldSentFolderFn = view.sentFolder.bind(view);
+			view.sentFolder = () => view.sentFolderValue() || oldSentFolderFn();
+
+			document.getElementById(templateId).content.querySelector('.b-header tbody').append(Element.fromHTML(`
+			<tr>
+				<td>Store in</td>
+				<td>
+					<select class="span3" data-bind="options: sentFolderSelectList, value: sentFolderValue,
+						optionsText: 'name', optionsValue: 'id', optionsAfterRender: defaultOptionsAfterRender"></select>
+					(When send, store a copy of the message in the selected folder)
+				</td>
+			</tr>`));
+
+			view.currentIdentity.subscribe(()=>{
+				view.sentFolderValue(oldSentFolderFn());
+			});
+		}
+	});
+
+	addEventListener('rl-vm-visible', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+			const view = e.detail; // ComposePopupView
+			view.sentFolderValue(oldSentFolderFn());
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/custom-auth-example/LICENSE b/plugins/set-remote-addr/LICENSE
similarity index 100%
rename from plugins/custom-auth-example/LICENSE
rename to plugins/set-remote-addr/LICENSE
diff --git a/plugins/set-remote-addr/index.php b/plugins/set-remote-addr/index.php
new file mode 100644
index 000000000..dbc10f8a6
--- /dev/null
+++ b/plugins/set-remote-addr/index.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Can be used for proxies, like Nginx  with:
+ *     proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+ * It's an alternative to application.ini http_client_ip_check_proxy
+ */
+
+class SetRemoteAddrPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'Set REMOTE_ADDR',
+		VERSION = '2.0',
+		DESCRIPTION = 'Sets the $_SERVER[\'REMOTE_ADDR\'] value from HTTP_CLIENT_IP/HTTP_X_FORWARDED_FOR';
+
+	public function Init() : void
+	{
+		if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+			$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_CLIENT_IP'];
+		} else if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+			$_SERVER['REMOTE_ADDR'] = $_SERVER['HTTP_X_FORWARDED_FOR'];
+		}
+	}
+}
diff --git a/plugins/smtp-use-from-adr-account/README b/plugins/smtp-use-from-adr-account/README
new file mode 100644
index 000000000..e4a141007
--- /dev/null
+++ b/plugins/smtp-use-from-adr-account/README
@@ -0,0 +1,5 @@
+What does it do?
+
+You can configure multible identities, but if you send eMails it depends on the smtp server whether it accepts sending mails for an foreign eMail-Adress.
+By default, the smtp server of the account currently displayed in the interface is used.
+The plugin checks if you use a different From-Adress (identity). Then it searchs for a matching account (for the user) and rewrites smpt-config and credentials.
diff --git a/plugins/smtp-use-from-adr-account/index.php b/plugins/smtp-use-from-adr-account/index.php
new file mode 100644
index 000000000..cea9eab3b
--- /dev/null
+++ b/plugins/smtp-use-from-adr-account/index.php
@@ -0,0 +1,115 @@
+<?php
+
+class SmtpUseFromAdrAccountPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+
+	const
+		NAME = 'Use From-Address-Account for smtp',
+		AUTHOR   = 'attike',
+		URL      = 'https://github.com/attike',
+		VERSION  = '1.1',
+		RELEASE  = '2024-03-12',
+		REQUIRED = '2.35.3',
+		CATEGORY = 'Filters',
+		DESCRIPTION = 'Set smpt-config and -credentials based on selected from-address-account';
+
+	public $aFromAccount = array();
+
+	public function Init() : void
+	{
+		$this->addHook('filter.smtp-from', 'FilterDetectFrom');
+		$this->addHook('smtp.before-connect', 'FilterSmtpConnect');
+		$this->addHook('smtp.before-login', 'FilterSmtpCredentials');
+	}
+
+	/**
+	 * \RainLoop\Model\Account $oAccount
+	 * \MailSo\Mime\Message $oMessage
+	 * string &$sFrom
+	 */
+	public function FilterDetectFrom(\RainLoop\Model\Account $oAccount, \MailSo\Mime\Message $oMessage, string &$sFrom)
+	{
+		$sWhiteList = \trim($this->Config()->Get('plugin', 'from_adress_pattern', ''));
+		$sFoundValue = '';
+		if (\strlen($sWhiteList) && \RainLoop\Plugins\Helper::ValidateWildcardValues($sFrom, $sWhiteList, $sFoundValue) && $sFrom != $oAccount->Email()) {
+			\SnappyMail\LOG::info(get_class($this) ,'From address different from account recognized: '. $oAccount->Email().' -> '.$sFrom . '(~ '.$sFoundValue.')');
+			$oMainAccount;
+			$oFromAccount;
+			if ($oAccount instanceof \RainLoop\Model\MainAccount ) {
+				$oMainAccount=$oAccount;
+			} else {
+				$oMainAccount=$this->Manager()->Actions()->getMainAccountFromToken();
+				if ($oMainAccount->Email() == $sFrom) {
+					$this->aFromAccount[$oAccount->Email()]=$oMainAccount;
+					return;
+				}
+			}
+			$aAccounts = $this->Manager()->Actions()->getAccounts($oMainAccount);
+			foreach ($aAccounts as &$value) {
+					$oValue=\RainLoop\Model\AdditionalAccount::NewInstanceFromTokenArray($this->Manager()->Actions(), $value);
+					if ($oValue->Email()==$sFrom) {
+							$oFromAccount = $oValue;
+							break;
+					}
+			}
+			if (is_null($oFromAccount)){
+				\SnappyMail\LOG::info(get_class($this),'No Account found for '. $sFrom);
+				if ($this->Config()->Get('plugin', 'throw_notfound_exception', true)) {
+					throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::AccountDoesNotExist);
+				}
+				return;
+			}
+			$this->aFromAccount[$oAccount->Email()]=$oFromAccount;
+		}
+	}
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
+	 * @param \MailSo\Smtp\Settings $oSettings
+	 */
+	public function FilterSmtpConnect(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
+	{
+		if ( isset($this->aFromAccount[$oAccount->Email()]) ) {
+			$oFromAccount = $this->aFromAccount[$oAccount->Email()];
+			$oSettings->host = $oFromAccount->Domain()->SmtpSettings()->host;
+			$oSettings->port = (int) $oFromAccount->Domain()->SmtpSettings()->port;
+			$oSettings->type = $oFromAccount->Domain()->SmtpSettings()->type;
+			\SnappyMail\LOG::info(get_class($this),'Smtp config rewrite: '. $oSettings->host);
+		}
+	}
+
+	/**
+	 * @param \RainLoop\Model\Account $oAccount
+	 * @param \MailSo\Smtp\SmtpClient $oSmtpClient
+	 * @param \MailSo\Smtp\Settings $oSettings
+	 */
+	public function FilterSmtpCredentials(\RainLoop\Model\Account $oAccount, \MailSo\Smtp\SmtpClient $oSmtpClient, \MailSo\Smtp\Settings $oSettings)
+	{
+		if ( isset($this->aFromAccount[$oAccount->Email()]) ) {
+			$oFromAccount = $this->aFromAccount[$oAccount->Email()];
+			unset($this->aFromAccount[$oAccount->Email()]);
+			$oSettings->useAuth = $oFromAccount->Domain()->SmtpSettings()->useAuth;
+			$oSettings->username = $oFromAccount->OutLogin();
+			$oSettings->passphrase = $oFromAccount->IncPassword();
+			\SnappyMail\LOG::info(get_class($this),'user/pwd rewrite: '. $oFromAccount->Email());
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('from_adress_pattern')->SetLabel('From-Address pattern')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
+				->SetDescription('space as delimiter, wildcard supported.')
+				->SetDefaultValue('user@example.com *@example2.com'),
+			\RainLoop\Plugins\Property::NewInstance('throw_notfound_exception')->SetLabel('Throw Exception, if from-adr is not found as account')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
+				->SetDescription('it is not possible to send eMails in this case, regardless of whether the smtp-server would do it')
+				->SetDefaultValue(true)
+		);
+	}
+
+}
diff --git a/plugins/snowfall-on-login-screen/index.php b/plugins/snowfall-on-login-screen/index.php
index 065716af8..b3ccb1d41 100644
--- a/plugins/snowfall-on-login-screen/index.php
+++ b/plugins/snowfall-on-login-screen/index.php
@@ -4,7 +4,7 @@ class SnowfallOnLoginScreenPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Snowfall on login screen',
-		VERSION = '2.0',
+		VERSION = '2.1',
 		CATEGORY = 'Fun',
 		DESCRIPTION = 'Snowfall on login screen (just for fun).';
 
diff --git a/plugins/snowfall-on-login-screen/js/include.js b/plugins/snowfall-on-login-screen/js/include.js
index 5a461d625..e8adf5505 100644
--- a/plugins/snowfall-on-login-screen/js/include.js
+++ b/plugins/snowfall-on-login-screen/js/include.js
@@ -1,12 +1,17 @@
 
 if (!/iphone|ipod|ipad|android/i.test(navigator.userAgent))
 {
-	document.addEventListener('DOMContentLoaded', () => {
-		if (window.snowFall && window.rl && !rl.settings.get('Auth'))
-		{
-			window.snowFall.snow(document.getElementsByTagName('body'), {
-				shadow: true, round: true,  minSize: 2, maxSize: 5
-			});
-		}
-	});
+	if (window.snowFall && window.rl)
+	{
+		let body = document.body;
+		addEventListener('sm-show-screen', e => {
+			if ('login' == e.detail) {
+				window.snowFall.snow(body, {
+					shadow: true, round: true,  minSize: 2, maxSize: 5
+				});
+			} else if (body.snow) {
+				body.snow.clear();
+			}
+		});
+	}
 }
diff --git a/plugins/snowfall-on-login-screen/js/snowfall.js b/plugins/snowfall-on-login-screen/js/snowfall.js
index 6fa0c799e..671b44e50 100644
--- a/plugins/snowfall-on-login-screen/js/snowfall.js
+++ b/plugins/snowfall-on-login-screen/js/snowfall.js
@@ -47,7 +47,7 @@
 */
 
 // Paul Irish requestAnimationFrame polyfill
-(function(window) {
+(window => {
     var lastTime = 0;
     var vendors = ['webkit', 'moz'];
     for(var x = 0; x < vendors.length && !window.requestAnimationFrame; ++x) {
@@ -57,11 +57,10 @@
     }
 
     if (!window.requestAnimationFrame)
-        window.requestAnimationFrame = function(callback, element) {
+        window.requestAnimationFrame = callback => {
             var currTime = new Date().getTime();
             var timeToCall = window.Math.max(0, 16 - (currTime - lastTime));
-            var id = window.setTimeout(function() { callback(currTime + timeToCall); },
-              timeToCall);
+            var id = window.setTimeout(() => callback(currTime + timeToCall), timeToCall);
             lastTime = currTime + timeToCall;
             return id;
         };
@@ -70,7 +69,7 @@
         window.cancelAnimationFrame = function(id) {
             clearTimeout(id);
         };
-}(window));
+})(window);
 
 var snowFall = (function(){
 	function jSnow(){
@@ -248,28 +247,14 @@ var snowFall = (function(){
 				cancelAnimationFrame(snowTimeout);
 			}
 		};
-	};
+	}
 	return{
-		snow : function(elements, options){
+		snow : (elements, options) => {
 			if(typeof(options) === 'string'){
-				if(elements.length > 0){
-					for(var i = 0; i < elements.length; i++){
-						if(elements[i].snow){
-							elements[i].snow.clear();
-						}
-					}
-				}else{
-					elements.snow.clear();
-				}
+				elements.snow.clear();
 			}else{
-				if(elements.length > 0){
-					for(var i = 0; i < elements.length; i++){
-						new jSnow().snow(elements[i], options);
-					}
-				}else{
-					new jSnow().snow(elements, options);
-				}
+				new jSnow().snow(elements, options);
 			}
 		}
 	};
-})();
\ No newline at end of file
+})();
diff --git a/plugins/two-factor-auth/index.php b/plugins/two-factor-auth/index.php
index f9e7da5eb..21b449daa 100644
--- a/plugins/two-factor-auth/index.php
+++ b/plugins/two-factor-auth/index.php
@@ -1,15 +1,16 @@
 <?php
 
 use \RainLoop\Exceptions\ClientException;
+use \RainLoop\Model\Account;
 use \RainLoop\Model\MainAccount;
 
 class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME     = 'Two Factor Authentication',
-		VERSION  = '2.13.3',
-		RELEASE  = '2022-03-04',
-		REQUIRED = '2.13.2',
+		VERSION  = '2.19.0',
+		RELEASE  = '2024-03-29',
+		REQUIRED = '2.36.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Provides support for TOTP 2FA';
 
@@ -21,6 +22,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addJs('js/TwoFactorAuthSettings.js');
 
 		$this->addHook('login.success', 'DoLogin');
+		$this->addHook('filter.app-data', 'FilterAppData');
 
 		$this->addJsonHook('GetTwoFactorInfo', 'DoGetTwoFactorInfo');
 		$this->addJsonHook('CreateTwoFactorSecret', 'DoCreateTwoFactorSecret');
@@ -33,11 +35,34 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$this->addTemplate('templates/PopupsTwoFactorAuthTest.html');
 	}
 
+	public function configMapping() : array
+	{
+		return [
+			\RainLoop\Plugins\Property::NewInstance("force_two_factor_auth")
+//				->SetLabel('PLUGIN_TWO_FACTOR/LABEL_FORCE')
+				->SetLabel('Enforce 2-Step Verification')
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL),
+		];
+	}
+
+	public function FilterAppData($bAdmin, &$aResult)
+	{
+		if (!$bAdmin && \is_array($aResult)/* && isset($aResult['Auth']) && !$aResult['Auth']*/) {
+			$aResult['RequireTwoFactor'] = (bool) $this->Config()->Get('plugin', 'force_two_factor_auth', false);
+
+			$aResult['SetupTwoFactor'] = false;
+			if ($aResult['RequireTwoFactor'] && !empty($aResult['Auth'])) {
+				$aData = $this->getTwoFactorInfo($this->getMainAccountFromToken());
+				$aResult['SetupTwoFactor'] = empty($aData['IsSet']) || empty($aData['Enable']) || empty($aData['Secret']);
+			}
+		}
+	}
+
 	public function DoLogin(MainAccount $oAccount)
 	{
 		if ($this->TwoFactorAuthProvider($oAccount)) {
 			$aData = $this->getTwoFactorInfo($oAccount);
-			if ($aData && isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable']) {
+			if (isset($aData['IsSet'], $aData['Enable']) && !empty($aData['Secret']) && $aData['IsSet'] && $aData['Enable']) {
 				$sCode = \trim($this->jsonParam('totp_code', ''));
 				if (empty($sCode)) {
 					$this->Logger()->Write("TFA: Code required for {$oAccount->Email()}");
@@ -49,7 +74,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 					$aBackupCodes = \explode(' ', \trim(\preg_replace('/[^\d]+/', ' ', $aData['BackupCodes'])));
 					$bUseBackupCode = \in_array($sCode, $aBackupCodes);
 					if ($bUseBackupCode) {
-						$this->removeBackupCodeFromTwoFactorInfo($oAccount->Email(), $sCode);
+						$this->removeBackupCodeFromTwoFactorInfo($oAccount, $sCode);
 					}
 				}
 
@@ -86,11 +111,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 		$sSecret = $this->TwoFactorAuthProvider($oAccount)->CreateSecret();
 
-		$aCodes = array();
-		for ($iIndex = 9; $iIndex > 0; $iIndex--)
-		{
-			$aCodes[] = \rand(100000000, 900000000);
-		}
+		$aCodes = \array_map(function(){return \rand(100000000, 900000000);}, \array_fill(0, 8, null));
 
 		$this->StorageProvider()->Put($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
@@ -99,6 +120,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 				'User' => $sEmail,
 				'Enable' => false,
 				'Secret' => $sSecret,
+				'QRCode' => static::getQRCode($oAccount, $sSecret),
 				'BackupCodes' => \implode(' ', $aCodes)
 			))
 		);
@@ -106,6 +128,18 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $this->jsonResponse(__FUNCTION__, $this->getTwoFactorInfo($oAccount));
 	}
 
+	private static function getQRCode(MainAccount $oAccount, string $secret) : string
+	{
+		$email = \rawurlencode($oAccount->Email());
+//		$issuer = \rawurlencode(\RainLoop\Api::Config()->Get('webmail', 'title', 'SnappyMail'));
+		$QR = \SnappyMail\QRCode::getMinimumQRCode(
+//			"otpauth://totp/{$issuer}:{$email}?secret={$secret}&issuer={$issuer}",
+			"otpauth://totp/{$email}?secret={$secret}",
+			\SnappyMail\QRCode::ERROR_CORRECT_LEVEL_M
+		);
+		return $QR->__toString();
+	}
+
 	public function DoShowTwoFactorSecret() : array
 	{
 		$oAccount = $this->getMainAccountFromToken();
@@ -117,14 +151,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		$aResult = $this->getTwoFactorInfo($oAccount);
 		unset($aResult['BackupCodes']);
 
-		$name = \rawurlencode($oAccount->Email());
-//		$issuer = \rawurlencode(\RainLoop\API::Config()->Get('webmail', 'title', 'SnappyMail'));
-		$QR = \SnappyMail\QRCode::getMinimumQRCode(
-//			"otpauth://totp/{$issuer}:{$name}?secret={$aResult['Secret']}&issuer={$issuer}",
-			"otpauth://totp/{$name}?secret={$aResult['Secret']}",
-			\SnappyMail\QRCode::ERROR_CORRECT_LEVEL_M
-		);
-		$aResult['QRCode'] = $QR->__toString();
+		$aResult['QRCode'] = static::getQRCode($oAccount, $aResult['Secret']);
 
 		return $this->jsonResponse(__FUNCTION__, $aResult);
 	}
@@ -137,18 +164,17 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 			return $this->jsonResponse(__FUNCTION__, false);
 		}
 
-		$oSettings = $this->Manager()->Actions()->SettingsProvider()->Load($oAccount);
-		if ($this->Manager()->Actions()->HasActionParam('EnableTwoFactor')) {
-			$sValue = $this->GetActionParam('EnableTwoFactor', '');
-			$oSettings->SetConf('EnableTwoFactor', !empty($sValue));
+		$oActions = $this->Manager()->Actions();
+		if ($oActions->HasActionParam('EnableTwoFactor')) {
+			$sValue = $oActions->GetActionParam('EnableTwoFactor', '');
+			$oActions->SettingsProvider()->Load($oAccount)->SetConf('EnableTwoFactor', !empty($sValue));
 		}
 
 		$sEmail = $oAccount->Email();
 
 		$bResult = false;
 		$mData = $this->getTwoFactorInfo($oAccount);
-		if (isset($mData['Secret'], $mData['BackupCodes']))
-		{
+		if (isset($mData['Secret'], $mData['BackupCodes'])) {
 			$bResult = $this->StorageProvider()->Put($oAccount,
 				\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 				'two_factor',
@@ -210,7 +236,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 		return $this->Manager()->Actions()->StorageProvider();
 	}
 
-	private $oTwoFactorAuthProvider;
+	private $oTwoFactorAuthProvider = null;
 	protected function TwoFactorAuthProvider(MainAccount $oAccount) : ?TwoFactorAuthInterface
 	{
 		if (!$this->oTwoFactorAuthProvider) {
@@ -232,12 +258,10 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 			'IsSet' => false,
 			'Enable' => false,
 			'Secret' => '',
-			'UrlTitle' => '',
 			'BackupCodes' => ''
 		);
 
-		if (!empty($sEmail))
-		{
+		if (!empty($sEmail)) {
 			$aResult['User'] = $sEmail;
 
 			$sData = $this->StorageProvider()->Get($oAccount,
@@ -245,8 +269,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 				'two_factor'
 			);
 
-			if ($sData)
-			{
+			if ($sData) {
 				$mData = static::DecodeKeyValues($sData);
 			}
 		}
@@ -259,23 +282,15 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$aResult['Enable'] = isset($mData['Enable']) ? !!$mData['Enable'] : false;
 			$aResult['Secret'] = $mData['Secret'];
 			$aResult['BackupCodes'] = $mData['BackupCodes'];
-			$aResult['UrlTitle'] = $this->Config()->Get('webmail', 'title', '');
+			$aResult['QRCode'] = static::getQRCode($oAccount, $mData['Secret']);
 		}
 
-		if ($bRemoveSecret)
-		{
-			if (isset($aResult['Secret']))
-			{
+		if ($bRemoveSecret) {
+			if (isset($aResult['Secret'])) {
 				unset($aResult['Secret']);
 			}
 
-			if (isset($aResult['UrlTitle']))
-			{
-				unset($aResult['UrlTitle']);
-			}
-
-			if (isset($aResult['BackupCodes']))
-			{
+			if (isset($aResult['BackupCodes'])) {
 				unset($aResult['BackupCodes']);
 			}
 		}
@@ -285,8 +300,7 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 
 	protected function removeBackupCodeFromTwoFactorInfo(MainAccount $oAccount, string $sCode) : bool
 	{
-		if (!$oAccount || empty($sCode))
-		{
+		if (!$oAccount || empty($sCode)) {
 			return false;
 		}
 
@@ -295,12 +309,10 @@ class TwoFactorAuthPlugin extends \RainLoop\Plugins\AbstractPlugin
 			'two_factor'
 		);
 
-		if ($sData)
-		{
+		if ($sData) {
 			$mData = static::DecodeKeyValues($sData);
 
-			if (!empty($mData['BackupCodes']))
-			{
+			if (!empty($mData['BackupCodes'])) {
 				$sBackupCodes = \preg_replace('/[^\d]+/', ' ', ' '.$mData['BackupCodes'].' ');
 				$sBackupCodes = \str_replace(' '.$sCode.' ', '', $sBackupCodes);
 
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
index 98ac5fac4..aa71747c2 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthLogin.js
@@ -1,16 +1,23 @@
 
 (rl => {
 
-	rl && addEventListener('rl-view-model', e => {
-		if (e.detail && 'Login' === e.detail.viewModelTemplateID) {
+	const
+		forceTOTP = () => {
+			if (rl.settings.get('SetupTwoFactor')) {
+				setTimeout(() => document.location.hash = '#/settings/two-factor-auth', 50);
+			}
+		};
+
+	addEventListener('rl-view-model', e => {
+		if ('Login' === e.detail.viewModelTemplateID) {
 			const container = e.detail.viewModelDom.querySelector('#plugin-Login-BottomControlGroup'),
-				placeholder = 'LOGIN/LABEL_TWO_FACTOR_CODE';
+				placeholder = 'PLUGIN_2FA/LABEL_TWO_FACTOR_CODE';
 			if (container) {
 				container.prepend(Element.fromHTML('<div class="controls">'
 					+ '<span class="fontastic">⏱</span>'
 					+ '<input name="totp_code" type="text" class="input-block-level"'
 					+ ' pattern="[0-9]*" inputmode="numeric"'
-					+ ' autocomplete="off" autocorrect="off" autocapitalize="none" spellcheck="false"'
+					+ ' autocomplete="one-time-code" autocorrect="off" autocapitalize="none"'
 					+ ' data-bind="textInput: totp, disable: submitRequest" data-i18n="[placeholder]'+placeholder
 					+ '" placeholder="'+rl.i18n(placeholder)+'">'
 				+ '</div>'));
@@ -18,4 +25,12 @@
 		}
 	});
 
+	// https://github.com/the-djmaze/snappymail/issues/349
+	addEventListener('sm-show-screen', e => {
+		if (!e.detail.startsWith('settings') && rl.settings.get('SetupTwoFactor')) {
+			e.preventDefault();
+			forceTOTP();
+		}
+	});
+
 })(window.rl);
diff --git a/plugins/two-factor-auth/js/TwoFactorAuthSettings.js b/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
index 8f043fd79..79d8c6bb5 100644
--- a/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
+++ b/plugins/two-factor-auth/js/TwoFactorAuthSettings.js
@@ -56,11 +56,12 @@ class TwoFactorAuthSettings
 					value = !!value;
 					if (value && this.twoFactorTested()) {
 						this.viewEnable_(value);
-						Remote.enableTwoFactor(fn, value);
+						Remote.enableTwoFactor(iError => {
+							fn(iError);
+							rl.settings.get('RequireTwoFactor') && rl.settings.set('SetupTwoFactor', !!iError);
+						}, value);
 					} else {
-						if (!value) {
-							this.viewEnable_(value);
-						}
+						value || this.viewEnable_(value);
 						Remote.enableTwoFactor(fn, false);
 					}
 				}
@@ -70,12 +71,12 @@ class TwoFactorAuthSettings
 //				translatorTrigger();
 				return this.twoFactorTested() || this.viewEnable_()
 					? ''
-					: rl.i18n('POPUPS_TWO_FACTOR_CFG/TWO_FACTOR_SECRET_TEST_BEFORE_DESC');
+					: rl.i18n('PLUGIN_2FA/TWO_FACTOR_SECRET_TEST_BEFORE_DESC');
 			},
 
 			viewTwoFactorStatus: () => {
 //				translatorTrigger();
-				return rl.i18n('POPUPS_TWO_FACTOR_CFG/TWO_FACTOR_SECRET_'
+				return rl.i18n('PLUGIN_2FA/TWO_FACTOR_SECRET_'
 					+ (this.twoFactorStatus() ? '' : 'NOT_')
 					+ 'CONFIGURED_DESC'
 				);
@@ -105,7 +106,12 @@ class TwoFactorAuthSettings
 	}
 
 	testTwoFactor() {
-		TwoFactorAuthTestPopupView.showModal([this.twoFactorTested]);
+		TwoFactorAuthTestPopupView.showModal([
+			() => {
+				this.twoFactorTested(true);
+				this.viewEnable(true);
+			}
+		]);
 	}
 
 	clearTwoFactor() {
@@ -187,22 +193,22 @@ class TwoFactorAuthTestPopupView extends rl.pluginPopupView {
 		Remote.verifyCode(iError => {
 			this.testing(false);
 			this.codeStatus(!iError);
-			this.twoFactorTested(!iError);
+			iError || (this.onSuccess() | this.close());
 		}, this.code());
 	}
 
-	onShow(twoFactorTested) {
+	onShow(onSuccess) {
 		this.code('');
 		this.codeStatus(null);
 		this.testing(false);
-		this.twoFactorTested = twoFactorTested;
+		this.onSuccess = onSuccess;
 	}
 }
 
 rl.addSettingsViewModel(
 	TwoFactorAuthSettings,
 	'TwoFactorAuthSettings',
-	'POPUPS_TWO_FACTOR_CFG/LEGEND_TWO_FACTOR_AUTH',
+	'PLUGIN_2FA/LEGEND_TWO_FACTOR_AUTH',
 	'two-factor-auth'
 );
 
diff --git a/plugins/two-factor-auth/langs/cs.ini b/plugins/two-factor-auth/langs/cs.ini
new file mode 100644
index 000000000..2324476fc
--- /dev/null
+++ b/plugins/two-factor-auth/langs/cs.ini
@@ -0,0 +1,20 @@
+[PLUGIN_2FA]
+LEGEND_TWO_FACTOR_AUTH = "Dvoufázové ověření"
+LABEL_ENABLE_TWO_FACTOR = "Povolit dvoufázové ověření"
+LABEL_TWO_FACTOR_USER = "Uživatel"
+LABEL_TWO_FACTOR_STATUS = "Stav"
+LABEL_TWO_FACTOR_SECRET = "Tajný klíč"
+LABEL_TWO_FACTOR_BACKUP_CODES = "Backup codes"
+BUTTON_CREATE = "Create a secret"
+BUTTON_ACTIVATE = "Activate"
+LINK_TEST = "test"
+BUTTON_SHOW_SECRET = "Show Secret"
+BUTTON_HIDE_SECRET = "Hide Secret"
+TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured"
+TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured"
+TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually."
+TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive."
+TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test."
+TITLE_TEST_CODE = "2-Step verification test"
+LABEL_CODE = "Code"
+LABEL_TWO_FACTOR_CODE = "Verification Code"
diff --git a/plugins/two-factor-auth/langs/de_DE.ini b/plugins/two-factor-auth/langs/de.ini
similarity index 95%
rename from plugins/two-factor-auth/langs/de_DE.ini
rename to plugins/two-factor-auth/langs/de.ini
index 9e050e280..90ad5d35c 100644
--- a/plugins/two-factor-auth/langs/de_DE.ini
+++ b/plugins/two-factor-auth/langs/de.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "Zwei-Faktor-Authentifizierung"
 LABEL_ENABLE_TWO_FACTOR = "Zwei-Faktor-Authentifizierung aktivieren"
 LABEL_TWO_FACTOR_USER = "Benutzer"
@@ -15,8 +15,6 @@ TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nicht konfiguriert"
 TWO_FACTOR_SECRET_DESC = "Importieren Sie diese Information in Ihre Google-Authenticator-Anwendung (oder andere TOTP-Anwendung), indem Sie den unten bereitgestellten QR-Code verwenden oder den Code manuell eingeben."
 TWO_FACTOR_BACKUP_CODES_DESC = "Sollten Sie keine Codes über den Google Authenticator erhalten, können Sie einen Sicherungscode zur Anmeldung verwenden. Der Sicherungscode wird inaktiv, sobald Sie ihn zur Anmeldung verwendet haben."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Sie können diese Einstellung nicht ohne vorherigen Test verändern."
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "Zwei-Faktor-Authentifizierung"
 LABEL_CODE = "Code"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "Verifizierungscode"
diff --git a/plugins/two-factor-auth/langs/en.ini b/plugins/two-factor-auth/langs/en.ini
index 4133b4fdb..003a50a31 100644
--- a/plugins/two-factor-auth/langs/en.ini
+++ b/plugins/two-factor-auth/langs/en.ini
@@ -1,7 +1,4 @@
-[POPUPS_TWO_FACTOR_TEST]
-TITLE_TEST_CODE = "2-Step verification test"
-LABEL_CODE = "Code"
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "2-Step Verification (TOTP)"
 LABEL_ENABLE_TWO_FACTOR = "Enable 2-Step verification"
 LABEL_TWO_FACTOR_USER = "User"
@@ -15,8 +12,9 @@ BUTTON_SHOW_SECRET = "Show Secret"
 BUTTON_HIDE_SECRET = "Hide Secret"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configured"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Not configured"
-TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually.\n"
-TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive.\n"
+TWO_FACTOR_SECRET_DESC = "Import this info into your Google Authenticator client (or other TOTP client) using the provided QR code below or by entering the code manually."
+TWO_FACTOR_BACKUP_CODES_DESC = "If you can't receive codes via Google Authenticator (or other TOTP client), you can use backup codes to sign in. After you’ve used a backup code to sign in, it will become inactive."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test."
-[LOGIN]
+TITLE_TEST_CODE = "2-Step verification test"
+LABEL_CODE = "Code"
 LABEL_TWO_FACTOR_CODE = "Verification Code"
diff --git a/plugins/two-factor-auth/langs/es_ES.ini b/plugins/two-factor-auth/langs/es.ini
similarity index 95%
rename from plugins/two-factor-auth/langs/es_ES.ini
rename to plugins/two-factor-auth/langs/es.ini
index e57238d9d..85fe09191 100644
--- a/plugins/two-factor-auth/langs/es_ES.ini
+++ b/plugins/two-factor-auth/langs/es.ini
@@ -1,7 +1,4 @@
-[POPUPS_TWO_FACTOR_TEST]
-TITLE_TEST_CODE = "Prueba de verificación de 2 pasos"
-LABEL_CODE = "Código"
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "Verificación de 2 Pasos"
 LABEL_ENABLE_TWO_FACTOR = "Activar la verificación de 2 pasos"
 LABEL_TWO_FACTOR_USER = "Usuario"
@@ -18,5 +15,6 @@ TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "No configurado"
 TWO_FACTOR_SECRET_DESC = "Importar esta información en su cliente Google Authenticator (u otro cliente TOTP) utilizando el código QR ​​se indica debajo o introduciendo el código manualmente."
 TWO_FACTOR_BACKUP_CODES_DESC = "Si usted no puede recibir los códigos a través de Google Authenticator, puede utilizar códigos de copia de seguridad para firmar pulg Después de que usted ha utilizado un código de copia de seguridad para iniciar sesión, se convertirá en inactiva."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "You can't change this setting before test."
-[LOGIN]
+TITLE_TEST_CODE = "Prueba de verificación de 2 pasos"
+LABEL_CODE = "Código"
 LABEL_TWO_FACTOR_CODE = "Código de verificación"
diff --git a/plugins/two-factor-auth/langs/fr_FR.ini b/plugins/two-factor-auth/langs/fr.ini
similarity index 95%
rename from plugins/two-factor-auth/langs/fr_FR.ini
rename to plugins/two-factor-auth/langs/fr.ini
index 4e816a027..82cbd64dc 100644
--- a/plugins/two-factor-auth/langs/fr_FR.ini
+++ b/plugins/two-factor-auth/langs/fr.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "Authentification en deux étapes"
 LABEL_ENABLE_TWO_FACTOR = "Activer l'authentification en deux étapes"
 LABEL_TWO_FACTOR_USER = "Utilisateur"
@@ -15,8 +15,6 @@ TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Non configuré"
 TWO_FACTOR_SECRET_DESC = "Importez ces informations dans votre client Google Authenticator (ou un autre client TOTP) en utilisant le code QR fourni ci-dessous ou en entrant les valeurs manuellement."
 TWO_FACTOR_BACKUP_CODES_DESC = "Si vous ne pouvez pas recevoir les codes par Google Authenticator, vous pouvez utiliser les codes de sauvegarde pour vous connecter. Après avoir fait cela, il deviendra inactif."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Vous ne pouvez pas modifier ce paramètre avant de l'avoir essayé."
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "Test d'authentification en deux étapes"
 LABEL_CODE = "Code"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "Code de vérification"
diff --git a/plugins/two-factor-auth/langs/hu-HU.ini b/plugins/two-factor-auth/langs/hu.ini
similarity index 86%
rename from plugins/two-factor-auth/langs/hu-HU.ini
rename to plugins/two-factor-auth/langs/hu.ini
index 62c83aa2c..a847b1be4 100644
--- a/plugins/two-factor-auth/langs/hu-HU.ini
+++ b/plugins/two-factor-auth/langs/hu.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "2 lépcsős hitelesítés"
 LABEL_ENABLE_TWO_FACTOR = "2 lépcsős hitelesítés engedélyezése"
 LABEL_TWO_FACTOR_USER = "Felhasználó"
@@ -12,11 +12,9 @@ BUTTON_SHOW_SECRET = "Titok megjelenítése"
 BUTTON_HIDE_SECRET = "Titok elrejtése"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Beállítva"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nincs beállítva"
-TWO_FACTOR_SECRET_DESC = "Importáld ezt az infót a Google Authenticator kliensedbe (vagy más TOTP kliensbe) az alábbi QR kód használatával vagy a kód manuális megadatásával.\n"
-TWO_FACTOR_BACKUP_CODES_DESC = "Ha nem kapod meg a kódokat a Google Authenticator kliensből (vagy más TOTP kliensből), akkor a bejelentkezéshez használhatod a biztonsági kódot. A biztonsági kód használata után inaktívvá válik.\n"
+TWO_FACTOR_SECRET_DESC = "Importáld ezt az infót a Google Authenticator kliensedbe (vagy más TOTP kliensbe) az alábbi QR kód használatával vagy a kód manuális megadatásával."
+TWO_FACTOR_BACKUP_CODES_DESC = "Ha nem kapod meg a kódokat a Google Authenticator kliensből (vagy más TOTP kliensből), akkor a bejelentkezéshez használhatod a biztonsági kódot. A biztonsági kód használata után inaktívvá válik."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Tesztelés nélkül nem lehet megváltoztatni ezt a beállítást."
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "2-lépéses hitelesítés teszt"
 LABEL_CODE = "Kód"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "Megerősítő kód"
diff --git a/plugins/two-factor-auth/langs/it_IT.ini b/plugins/two-factor-auth/langs/it.ini
similarity index 90%
rename from plugins/two-factor-auth/langs/it_IT.ini
rename to plugins/two-factor-auth/langs/it.ini
index a8252fedc..fbd44f45d 100644
--- a/plugins/two-factor-auth/langs/it_IT.ini
+++ b/plugins/two-factor-auth/langs/it.ini
@@ -1,7 +1,4 @@
-[POPUPS_TWO_FACTOR_TEST]
-TITLE_TEST_CODE = "Test di verifica a 2 fattori"
-LABEL_CODE = "Codice"
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "Verifica a 2 Fattori"
 LABEL_ENABLE_TWO_FACTOR = "Abilita la verifica a 2 fattori"
 LABEL_TWO_FACTOR_USER = "Utente"
@@ -15,8 +12,9 @@ BUTTON_SHOW_SECRET = "Mostra la chiave segreta"
 BUTTON_HIDE_SECRET = "Nascondi la chiave segreta"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "Configurato"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Non configurato"
-TWO_FACTOR_SECRET_DESC = "Importa queste informazioni nella tua app Google Authenticator (o un altro programma per l'autenticazione a due fattori) utilizzando il codice QR fornito qui sotto o inserendo il codice manualmente.\n"
-TWO_FACTOR_BACKUP_CODES_DESC = "Se non riesci a ricevere i codici tramite Google Authenticator (o un altro programma per l'autenticazione a due fattori), puoi utilizzare i codici di backup per accedere. Dopo che hai utilizzato un codice di backup per accedere, diventerà inattivo.\n"
+TWO_FACTOR_SECRET_DESC = "Importa queste informazioni nella tua app Google Authenticator (o un altro programma per l'autenticazione a due fattori) utilizzando il codice QR fornito qui sotto o inserendo il codice manualmente."
+TWO_FACTOR_BACKUP_CODES_DESC = "Se non riesci a ricevere i codici tramite Google Authenticator (o un altro programma per l'autenticazione a due fattori), puoi utilizzare i codici di backup per accedere. Dopo che hai utilizzato un codice di backup per accedere, diventerà inattivo."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Non puoi modificare questa impostazione prima del test."
-[LOGIN]
+TITLE_TEST_CODE = "Test di verifica a 2 fattori"
+LABEL_CODE = "Codice"
 LABEL_TWO_FACTOR_CODE = "Codice di Verifica"
diff --git a/plugins/two-factor-auth/langs/nl_NL.ini b/plugins/two-factor-auth/langs/nl.ini
similarity index 93%
rename from plugins/two-factor-auth/langs/nl_NL.ini
rename to plugins/two-factor-auth/langs/nl.ini
index d48c636d7..425558d5f 100644
--- a/plugins/two-factor-auth/langs/nl_NL.ini
+++ b/plugins/two-factor-auth/langs/nl.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "2-Stap verificatie"
 LABEL_ENABLE_TWO_FACTOR = "Gebruik 2-Stap verificatie"
 LABEL_TWO_FACTOR_USER = "Gebruikersnaam"
@@ -6,7 +6,7 @@ LABEL_TWO_FACTOR_STATUS = "Status"
 LABEL_TWO_FACTOR_SECRET = "Geheime sleutel"
 LABEL_TWO_FACTOR_BACKUP_CODES = "Backup codes"
 BUTTON_CREATE = "Nieuwe geheime sleutel aanmaken"
-BUTTON_ACTIVATE = "Activate"
+BUTTON_ACTIVATE = "Activeren"
 LINK_TEST = "test"
 BUTTON_SHOW_SECRET = "Bekijk geheime sleutel"
 BUTTON_HIDE_SECRET = "Verberg geheime sleutel"
@@ -15,8 +15,6 @@ TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Niet geconfigureerd"
 TWO_FACTOR_SECRET_DESC = "Importeer deze informatie in uw Google Authenticator-client (of andere TOTP-client) door gebruik te maken van de QR code hier beneden of door de code handmatig in te voeren."
 TWO_FACTOR_BACKUP_CODES_DESC = "Als u geen codes ontvangt via de Google Authenticator kunt u de backup codes gebruiken om in te loggen. Na gebruik van de backup code wordt deze inactief."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "U kunt 2-stap verificatie niet activeren voordat u het succesvol getest heeft."
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "2-Stap verificatie test"
 LABEL_CODE = "Code"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "Verificatie Code"
diff --git a/plugins/two-factor-auth/langs/pl.ini b/plugins/two-factor-auth/langs/pl.ini
new file mode 100644
index 000000000..2e00f7683
--- /dev/null
+++ b/plugins/two-factor-auth/langs/pl.ini
@@ -0,0 +1,20 @@
+[PLUGIN_2FA]
+LEGEND_TWO_FACTOR_AUTH = "2FA (TOTP)"
+LABEL_ENABLE_TWO_FACTOR = "Włącz weryfikację 2-stopniową"
+LABEL_TWO_FACTOR_USER = "Użytkownik"
+LABEL_TWO_FACTOR_STATUS = "Status"
+LABEL_TWO_FACTOR_SECRET = "Twój sekretny klucz"
+LABEL_TWO_FACTOR_BACKUP_CODES = "Kody zapasowe"
+BUTTON_CREATE = "Utwórz sekretny klucz"
+BUTTON_ACTIVATE = "Aktywuj"
+LINK_TEST = "Testuj"
+BUTTON_SHOW_SECRET = "Pokaż Twój sekretny klucz"
+BUTTON_HIDE_SECRET = "Ukryj klucz"
+TWO_FACTOR_SECRET_CONFIGURED_DESC = "Skonfigurowano"
+TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Nieskonfigurowano"
+TWO_FACTOR_SECRET_DESC = "Zaimportuj tę infomację do aplikacji Google Authenticator (lub innego klienta TOTP) używając kodu QR poniżej lub wpisz sekretny klucz ręcznie."
+TWO_FACTOR_BACKUP_CODES_DESC = "Jeśli nie możesz uzyskać kodów poprzez aplikację Google Authenticator (lub innego klienta TOTP), możesz użyć kodów zapasowych aby się zalogować. Po użyciu kodu zapasowego do zalogowania, stanie się on nieaktywny."
+TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Nie możesz zmienić tego ustawienia przed testem."
+TITLE_TEST_CODE = "Test weryfikacji 2-stopniowej"
+LABEL_CODE = "Kod"
+LABEL_TWO_FACTOR_CODE = "Kod weryfikacyjny"
diff --git a/plugins/two-factor-auth/langs/sv-SE.ini b/plugins/two-factor-auth/langs/sv.ini
similarity index 95%
rename from plugins/two-factor-auth/langs/sv-SE.ini
rename to plugins/two-factor-auth/langs/sv.ini
index 479151159..7ffd23f21 100644
--- a/plugins/two-factor-auth/langs/sv-SE.ini
+++ b/plugins/two-factor-auth/langs/sv.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "Tvåstegsverifiering (TOTP)"
 LABEL_ENABLE_TWO_FACTOR = "Aktivera tvåstegsverifiering"
 LABEL_TWO_FACTOR_USER = "Användare"
@@ -15,8 +15,6 @@ TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Inte konfigurarad"
 TWO_FACTOR_SECRET_DESC = "Importera denna information till din Google Authenticator klient (eller annan TOTP klient) med denna QR kod eller manuellt med koden här nedan."
 TWO_FACTOR_BACKUP_CODES_DESC = "Om du inte kan ta emot koderna med Google Authenticator, så använd backupkoderna för att logga in. När du använt backupkoderna för att logga in så blir dom inaktiva."
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Du kan inte ändra denna inställning innan test."
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "Tvåstegsverifieringstest"
 LABEL_CODE = "Kod"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "Verifikationskod"
diff --git a/plugins/two-factor-auth/langs/uk.ini b/plugins/two-factor-auth/langs/uk.ini
new file mode 100644
index 000000000..5f09cfb09
--- /dev/null
+++ b/plugins/two-factor-auth/langs/uk.ini
@@ -0,0 +1,20 @@
+[PLUGIN_2FA]
+LEGEND_TWO_FACTOR_AUTH = "2-етапна перевірка (TOTP)"
+LABEL_ENABLE_TWO_FACTOR = "Увімкнути 2-етапну перевірку"
+LABEL_TWO_FACTOR_USER = "Ім'я користувача"
+LABEL_TWO_FACTOR_STATUS = "Статус"
+LABEL_TWO_FACTOR_SECRET = "Ключ"
+LABEL_TWO_FACTOR_BACKUP_CODES = "Резервні коди"
+BUTTON_CREATE = "Create a secret"
+BUTTON_ACTIVATE = "Activate"
+LINK_TEST = "Тестувати"
+BUTTON_SHOW_SECRET = "Показати ключ"
+BUTTON_HIDE_SECRET = "Приховати ключ"
+TWO_FACTOR_SECRET_CONFIGURED_DESC = "Налаштовано"
+TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "Не налаштовано"
+TWO_FACTOR_SECRET_DESC = "Імпортуйте цю інформацію у свій клієнт Google Authenticator (або інший клієнт TOTP), використовуючи наданий нижче QR-код або ввівши код вручну"
+TWO_FACTOR_BACKUP_CODES_DESC = "Якщо ви не можете отримати код через Google Authenticator (або інший клієнт TOTP), ви можете скористатися резервними кодами для входу. Після того, як ви використаєте резервний код для входу, він стане неактивним. Закреслюйте його"
+TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "Ви не можете змінити це налаштування перед тестуванням."
+TITLE_TEST_CODE = "Тест 2-етапної перевірки"
+LABEL_CODE = "Код"
+LABEL_TWO_FACTOR_CODE = "Код підтвердження"
diff --git a/plugins/two-factor-auth/langs/zh_CN.ini b/plugins/two-factor-auth/langs/zh.ini
similarity index 87%
rename from plugins/two-factor-auth/langs/zh_CN.ini
rename to plugins/two-factor-auth/langs/zh.ini
index 948a6d886..87c530e92 100644
--- a/plugins/two-factor-auth/langs/zh_CN.ini
+++ b/plugins/two-factor-auth/langs/zh.ini
@@ -1,4 +1,4 @@
-[POPUPS_TWO_FACTOR_CFG]
+[PLUGIN_2FA]
 LEGEND_TWO_FACTOR_AUTH = "两步验证 (TOTP)"
 LABEL_ENABLE_TWO_FACTOR = "启用两步验证"
 LABEL_TWO_FACTOR_USER = "用户"
@@ -12,11 +12,9 @@ BUTTON_SHOW_SECRET = "显示密钥"
 BUTTON_HIDE_SECRET = "隐藏密钥"
 TWO_FACTOR_SECRET_CONFIGURED_DESC = "已设置"
 TWO_FACTOR_SECRET_NOT_CONFIGURED_DESC = "未设置"
-TWO_FACTOR_SECRET_DESC = "将下面的信息导入 Google Authenticator (或其他 TOTP 客户端)。 扫描下面的二维码或手动输入密钥。\n"
-TWO_FACTOR_BACKUP_CODES_DESC = "如果你无法从验证器获取验证码，你可以使用备用代码登录。 当你使用过某一个备用代码后，它将会失效。\n"
+TWO_FACTOR_SECRET_DESC = "将下面的信息导入 Google Authenticator (或其他 TOTP 客户端)。 扫描下面的二维码或手动输入密钥。"
+TWO_FACTOR_BACKUP_CODES_DESC = "如果你无法从验证器获取验证码，你可以使用备用代码登录。 当你使用过某一个备用代码后，它将会失效。"
 TWO_FACTOR_SECRET_TEST_BEFORE_DESC = "完成测试前你无法更改此设置。"
-[POPUPS_TWO_FACTOR_TEST]
 TITLE_TEST_CODE = "两步验证测试"
 LABEL_CODE = "代码"
-[LOGIN]
 LABEL_TWO_FACTOR_CODE = "验证码"
diff --git a/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html b/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
index 556a324ef..f6242c74d 100644
--- a/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
+++ b/plugins/two-factor-auth/templates/PopupsTwoFactorAuthTest.html
@@ -1,10 +1,10 @@
 <header>
 	<a class="close" href="#" data-bind="click: close">×</a>
-	<h3 data-i18n="POPUPS_TWO_FACTOR_TEST/TITLE_TEST_CODE"></h3>
+	<h3 data-i18n="PLUGIN_2FA/TITLE_TEST_CODE"></h3>
 </header>
 <div class="modal-body form-horizontal">
 	<div class="control-group">
-		<label data-i18n="POPUPS_TWO_FACTOR_TEST/LABEL_CODE"></label>
+		<label data-i18n="PLUGIN_2FA/LABEL_CODE"></label>
 		<input type="text" class="uiInput inputName"
 			autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
 			data-bind="textInput: code, onEnter: testCodeCommand" />
diff --git a/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html b/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
index 5e8a3e943..95569afd0 100644
--- a/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
+++ b/plugins/two-factor-auth/templates/TwoFactorAuthSettings.html
@@ -1,5 +1,5 @@
 <div class="b-settings-two-factor form-horizontal">
-	<div class="legend" data-i18n="POPUPS_TWO_FACTOR_CFG/LEGEND_TWO_FACTOR_AUTH"></div>
+	<div class="legend" data-i18n="PLUGIN_2FA/LEGEND_TWO_FACTOR_AUTH"></div>
 	<div class="form-horizontal">
 		<div class="control-group" data-bind="visible: twoFactorStatus">
 			<div class="controls">
@@ -7,7 +7,7 @@
 					<div data-bind="component: {
 						name: 'Checkbox',
 						params: {
-							label: 'POPUPS_TWO_FACTOR_CFG/LABEL_ENABLE_TWO_FACTOR',
+							label: 'PLUGIN_2FA/LABEL_ENABLE_TWO_FACTOR',
 							enable: twoFactorAllowedEnable,
 							value: viewEnable,
 							inline: true
@@ -16,12 +16,12 @@
 				</div>
 				&nbsp;&nbsp;&nbsp;
 				<span class="g-ui-link" data-bind="click: testTwoFactor, visible: twoFactorStatus"
-					data-i18n="POPUPS_TWO_FACTOR_CFG/LINK_TEST"></span>
+					data-i18n="PLUGIN_2FA/LINK_TEST"></span>
 			</div>
 		</div>
 		<div class="control-group">
 			<label class="control-label">
-				<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_USER"></span>
+				<span data-i18n="PLUGIN_2FA/LABEL_TWO_FACTOR_USER"></span>
 			</label>
 			<div class="controls" style="padding-top: 5px;">
 				<strong data-bind="text: viewUser"></strong>
@@ -31,34 +31,34 @@
 			<div class="controls" style="padding-top: 5px;">
 				<strong data-bind="visible: secreting">...</strong>
 				<span class="g-ui-link" data-bind="click: showSecret, visible: !secreting()"
-					data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_SHOW_SECRET"></span>
+					data-i18n="PLUGIN_2FA/BUTTON_SHOW_SECRET"></span>
 			</div>
 		</div>
 		<div class="control-group" data-bind="visible: '' !== viewSecret()">
 			<label class="control-label">
-				<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_SECRET"></span>
+				<span data-i18n="PLUGIN_2FA/LABEL_TWO_FACTOR_SECRET"></span>
 			</label>
 			<div class="controls" style="padding-top: 5px;">
 				<strong data-bind="text: viewSecret" style="user-select:text"></strong>
 				&nbsp;&nbsp;
-				<span class="g-ui-link" data-bind="click: hideSecret" data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_HIDE_SECRET"></span>
+				<span class="g-ui-link" data-bind="click: hideSecret" data-i18n="PLUGIN_2FA/BUTTON_HIDE_SECRET"></span>
 				<br />
 				<br />
 				<blockquote>
-					<p class="muted width100-on-mobile" style="width: 550px" data-i18n="POPUPS_TWO_FACTOR_CFG/TWO_FACTOR_SECRET_DESC"></p>
+					<p class="muted width100-on-mobile" style="width: 550px" data-i18n="PLUGIN_2FA/TWO_FACTOR_SECRET_DESC"></p>
 				</blockquote>
-				<pre data-bind="text: viewQRCode" style="line-height:1;letter-spacing:-1px"></pre>
+				<pre data-bind="text: viewQRCode" style="line-height:1.1;letter-spacing:-1px;font-family:monospace"></pre>
 			</div>
 		</div>
 		<div class="control-group" data-bind="visible: '' !== viewBackupCodes()">
 			<label class="control-label">
-				<span data-i18n="POPUPS_TWO_FACTOR_CFG/LABEL_TWO_FACTOR_BACKUP_CODES"></span>
+				<span data-i18n="PLUGIN_2FA/LABEL_TWO_FACTOR_BACKUP_CODES"></span>
 			</label>
 			<div class="controls" style="padding-top: 5px;">
 				<pre data-bind="text: viewBackupCodes" style="user-select: text; width: 230px; word-break: break-word;"></pre>
 				<br />
 				<blockquote>
-					<p class="muted width100-on-mobile" style="width: 550px" data-i18n="POPUPS_TWO_FACTOR_CFG/TWO_FACTOR_BACKUP_CODES_DESC"></p>
+					<p class="muted width100-on-mobile" style="width: 550px" data-i18n="PLUGIN_2FA/TWO_FACTOR_BACKUP_CODES_DESC"></p>
 				</blockquote>
 			</div>
 		</div>
@@ -70,7 +70,7 @@
 	</a>
 	<a class="btn" data-bind="click: createTwoFactor, visible: !twoFactorStatus()">
 		<i class="fontastic" data-bind="css: {'icon-spinner': processing()}">▶</i>
-		<span data-i18n="POPUPS_TWO_FACTOR_CFG/BUTTON_ACTIVATE"></span>
+		<span data-i18n="PLUGIN_2FA/BUTTON_ACTIVATE"></span>
 	</a>
 <!--
 	<a class="btn" data-bind="click: close, visible: viewEnable()">
diff --git a/plugins/video-on-login-screen/LICENSE b/plugins/video-on-login-screen/LICENSE
new file mode 100755
index 000000000..44b915a0c
--- /dev/null
+++ b/plugins/video-on-login-screen/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2023 SnappyMail Team
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/video-on-login-screen/README b/plugins/video-on-login-screen/README
new file mode 100755
index 000000000..ec8c5bbdb
--- /dev/null
+++ b/plugins/video-on-login-screen/README
@@ -0,0 +1 @@
+Fullscreen background video on login screen.
\ No newline at end of file
diff --git a/plugins/video-on-login-screen/VERSION b/plugins/video-on-login-screen/VERSION
new file mode 100755
index 000000000..b123147e2
--- /dev/null
+++ b/plugins/video-on-login-screen/VERSION
@@ -0,0 +1 @@
+1.1
\ No newline at end of file
diff --git a/plugins/video-on-login-screen/index.php b/plugins/video-on-login-screen/index.php
new file mode 100755
index 000000000..26f29b953
--- /dev/null
+++ b/plugins/video-on-login-screen/index.php
@@ -0,0 +1,44 @@
+<?php
+
+class VideoOnLoginScreenPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+	NAME = 'Video On Login Screen',
+	VERSION = '0.1',
+	RELEASE = '2023-11-09',
+	REQUIRED = '2.5.0',
+	CATEGORY = 'Login',
+	DESCRIPTION = 'Play a simple video on the login screen.';
+
+	/**
+	 * @return void
+	 */
+	public function Init() : void
+	{
+		$this->addJs('js/video-on-login.js');
+		$this->addHook('main.content-security-policy', 'ContentSecurityPolicy');
+	}
+
+	/**
+	 * @return array
+	 */
+	protected function configMapping() : array
+	{
+		return array(
+			\RainLoop\Plugins\Property::NewInstance('mp4_file')->SetLabel('Url to a mp4 file')
+				->SetPlaceholder('http://')
+				->SetAllowedInJs(true)
+				->SetDefaultValue(''),
+			\RainLoop\Plugins\Property::NewInstance('playback_rate')->SetLabel('Playback rate')
+				->SetAllowedInJs(true)
+				->SetType(\RainLoop\Enumerations\PluginPropertyType::SELECTION)
+				->SetDefaultValue(array('100%', '25%', '50%', '75%', '125%', '150%', '200%')),
+		);
+	}
+
+	public function ContentSecurityPolicy(\SnappyMail\HTTP\CSP $CSP)
+	{
+		$vSource = $this->Config()->Get('plugin', 'mp4_file', 'self');
+		$CSP->add('media-src', $vSource);
+	}
+}
diff --git a/plugins/video-on-login-screen/js/video-on-login.js b/plugins/video-on-login-screen/js/video-on-login.js
new file mode 100755
index 000000000..d5d497a62
--- /dev/null
+++ b/plugins/video-on-login-screen/js/video-on-login.js
@@ -0,0 +1,107 @@
+(rl => {
+
+	rl && addEventListener('rl-view-model', e => {
+		const id = e.detail.viewModelTemplateID;
+		if (e.detail && ('AdminLogin' === id || 'Login' === id)) {
+			let
+				nId = null,
+				script;
+
+			let
+				iRate = 1,
+				sRate = window.rl.pluginSettingsGet('video-on-login-screen', 'playback_rate')
+			;
+
+			switch (sRate)
+			{
+				case '25%':
+					iRate = 0.25;
+					break;
+				case '50%':
+					iRate = 0.5;
+					break;
+				case '75%':
+					iRate = 0.75;
+					break;
+				case '125%':
+					iRate = 1.25;
+					break;
+				case '150%':
+					iRate = 1.5;
+					break;
+				case '200%':
+					iRate = 2;
+					break;
+			}
+			const
+				mode = 'Login' === id ? 'user' : 'admin',
+
+				doc = document,
+				loginContainer = doc.querySelectorAll('#V-Login #V-AdminLogin'),
+				container = doc.querySelector('#rl-content'),
+
+				ShowVideo = () => {
+					if (loginContainer) {
+						var stEl = doc.createElement('style');
+						stEl.innerHTML =
+							`
+							#video-el {
+								z-index: -1;
+								overflow: hidden;
+								position: absolute;
+								left: 0;
+								right: 0;
+								top: 0;
+								bottom: 0;
+								margin: auto;
+								height: 100vh;
+								width: 100%;
+								object-fit: cover;
+							}
+							`
+						var ref = doc.querySelector('script');
+						ref.parentNode.insertBefore(stEl, ref);
+
+						const oEl = doc.createElement('div');
+						oEl.className = 'video-div';
+						const vEl = doc.createElement('video');
+						vEl.setAttribute('loop', true);
+						vEl.setAttribute('playsinline', '');
+						vEl.setAttribute('muted', '');
+						vEl.setAttribute('autoplay', '');
+						vEl.muted = true;
+						vEl.setAttribute('playbackRate', iRate);
+						vEl.setAttribute('id', 'video-el');
+						oEl.appendChild(vEl);
+						const sEl = doc.createElement('source');
+						sEl.setAttribute('src', rl.pluginSettingsGet('video-on-login-screen', 'mp4_file'));
+						sEl.setAttribute('type', 'video/mp4');
+						vEl.appendChild(sEl);
+
+						container.before(oEl);
+
+					}
+				},
+
+				DestroyVideo = () => {
+					const vEl = doc.querySelector('#video-el');
+					if (vEl) {
+						vEl.parentElement.removeChild(vEl);
+					}
+				};
+
+			window.ShowVideo = ShowVideo;
+
+			window.DestroyVideo = DestroyVideo;
+
+			ShowVideo();
+
+			addEventListener(`sm-${mode}-login-response`, e => {
+				if (!e.detail.error) {
+					DestroyVideo();
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/view-ics/LICENSE b/plugins/view-ics/LICENSE
new file mode 100644
index 000000000..9e5e56cdd
--- /dev/null
+++ b/plugins/view-ics/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2022 SnappyMail
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/plugins/view-ics/ical.js b/plugins/view-ics/ical.js
new file mode 100644
index 000000000..9813ebe7c
--- /dev/null
+++ b/plugins/view-ics/ical.js
@@ -0,0 +1,869 @@
+// https://www.rfc-editor.org/rfc/rfc5545
+
+(rl => {
+
+	const
+		paramRegEx = /;([a-zA-Z0-9-]+)=([^";:,]*|"[^"]*")/g,
+		// eslint-disable-next-line max-len
+		dateRegEx = /(?<year>[0-9]{4})(?<month>[0-9]{2})(?<day>[0-9]{2})T(?<hour>[0-9]{2})(?<minute>[0-9]{2})(?<second>[0-9]{2})(?<utc>Z?)/,
+		parseDate = (str, tz) => {
+			let parts = dateRegEx.exec(str)?.groups,
+				options = {dateStyle: 'long', timeStyle: 'short'},
+				date = (parts ? new Date(
+					parseInt(parts.year, 10),
+					parseInt(parts.month, 10) - 1,
+					parseInt(parts.day, 10),
+					parseInt(parts.hour, 10),
+					parseInt(parts.minute, 10),
+					parseInt(parts.second, 10)
+				) : new Date(str));
+			tz && (options.timeZone = windowsVTIMEZONEs[tz] || tz);
+			try {
+				return date.format(options);
+			} catch (e) {
+				console.error(e);
+				if (options.timeZone) {
+					options.timeZone = undefined;
+					return date.format(options);
+				}
+			}
+		};
+
+	class Property extends String
+	{
+		constructor(name, value, params) {
+			super(value);
+			this.name = name;
+//			this.value = value;
+			this.params = {};
+			if (params) {
+				for (const param of params.matchAll(paramRegEx)) {
+					if (param[2]) {
+						this.params[param[1]] = param[2].replace(/^"|"$/);
+					}
+				}
+			}
+		}
+/*
+		includes(...params) {
+			return this.value.includes(...params);
+		}
+		replace(...params) {
+			return this.value.replace(...params);
+		}
+		toString() {
+			return this.value;
+		}
+*/
+		static fromString(data) {
+			// Parse component property 'name *(";" param ) ":" value'
+			const match = data.match(/^([a-zA-Z0-9-]+)((?:;[a-zA-Z0-9-]+=(?:[^";:,]*|"[^"]*"))*):(.+)$/);
+			return match && new Property(match[1], match[3], match[2]);
+		}
+	}
+
+	rl.ICS = {
+
+		parseDate: parseDate,
+
+		parseEvent(text) {
+			let VEVENT,
+				VALARM,
+				multiple = ['ATTACH','ATTENDEE','CATEGORIES','COMMENT','CONTACT','EXDATE',
+					'EXRULE','RSTATUS','RELATED','RESOURCES','RDATE','RRULE'],
+				lines = text.split(/\r?\n/),
+				i = lines.length;
+			while (i--) {
+				let line = lines[i], prop;
+				if (VEVENT) {
+					while (line.startsWith(' ') && i--) {
+						line = lines[i] + line.slice(1);
+					}
+					if (line.startsWith('END:VALARM')) {
+						// Start parsing Alarm Component
+						VALARM = {};
+						continue;
+					} else if (line.startsWith('BEGIN:VALARM')) {
+						// End parsing Alarm Component
+						VEVENT.VALARM || (VEVENT.VALARM = []);
+						VEVENT.VALARM.push(VALARM);
+						VALARM = null;
+						continue;
+					} else if (line.startsWith('BEGIN:VEVENT')) {
+						// End parsing
+						break;
+					}
+					prop = Property.fromString(line);
+					if (prop) {
+						if (VALARM) {
+							VALARM[prop.name] = prop;
+						} else if (multiple.includes(prop.name) || 'X-' == prop.name.slice(0,2)) {
+							VEVENT[prop.name] || (VEVENT[prop.name] = []);
+							VEVENT[prop.name].push(prop);
+						} else {
+							if ('DTSTART' === prop.name || 'DTEND' === prop.name) {
+								prop = parseDate(prop, prop.params.TZID);
+							}
+							VEVENT[prop.name] = prop;
+						}
+					}
+				} else if (line.startsWith('END:VEVENT')) {
+					// Start parsing Event Component
+					VEVENT = {};
+				}
+			}
+//			METHOD:REPLY || METHOD:REQUEST
+			if (VEVENT) {
+				VEVENT.rawText = text;
+				VEVENT.isCancelled = () => VEVENT.STATUS?.includes('CANCELLED');
+				VEVENT.isConfirmed = () => VEVENT.STATUS?.includes('CONFIRMED');
+				VEVENT.shouldReply = () => VEVENT.METHOD?.includes('REPLY');
+				console.dir({
+					VEVENT,
+					isCancelled: VEVENT.isCancelled(),
+					shouldReply: VEVENT.shouldReply()
+				});
+			}
+
+			return VEVENT;
+		}
+	};
+
+	// Microsoft Windows timezones
+	// Subset from https://github.com/unicode-cldr/cldr-core/blob/master/supplemental/windowsZones.json
+	const windowsVTIMEZONEs = {
+		// Windows : [IANA...]
+		"Afghanistan Standard Time": [
+			"Asia/Kabul"
+		],
+		"Alaskan Standard Time": [
+			"America/Anchorage"/*,
+			"America/Juneau",
+			"America/Metlakatla",
+			"America/Nome",
+			"America/Sitka",
+			"America/Yakutat"*/
+		],
+		"Aleutian Standard Time": [
+			"America/Adak"
+		],
+		"Altai Standard Time": [
+			"Asia/Barnaul"
+		],
+		"Arab Standard Time": [
+			"Asia/Aden"/*,
+			"Asia/Bahrain",
+			"Asia/Kuwait",
+			"Asia/Qatar",
+			"Asia/Riyadh"
+		*/],
+		"Arabian Standard Time": [
+			"Asia/Dubai"/*,
+			"Asia/Muscat",
+			"Etc/GMT-4"
+		*/],
+		"Arabic Standard Time": [
+			"Asia/Baghdad"
+		],
+		"Argentina Standard Time": [
+			"America/Argentina/La_Rioja"/*,
+			"America/Argentina/Rio_Gallegos",
+			"America/Argentina/Salta",
+			"America/Argentina/San_Juan",
+			"America/Argentina/San_Luis",
+			"America/Argentina/Tucuman",
+			"America/Argentina/Ushuaia",
+			"America/Buenos_Aires",
+			"America/Catamarca",
+			"America/Cordoba",
+			"America/Jujuy",
+			"America/Mendoza"
+		*/],
+		"Astrakhan Standard Time": [
+			"Europe/Astrakhan"/*,
+			"Europe/Ulyanovsk"
+		*/],
+		"Atlantic Standard Time": [
+			"America/Glace_Bay"/*,
+			"America/Goose_Bay",
+			"America/Halifax",
+			"America/Moncton",
+			"America/Thule",
+			"Atlantic/Bermuda"
+		*/],
+		"AUS Central Standard Time": [
+			"Australia/Darwin"
+		],
+		"Aus Central W. Standard Time": [
+			"Australia/Eucla"
+		],
+		"AUS Eastern Standard Time": [
+			"Australia/Melbourne"/*,
+			"Australia/Sydney"
+		*/],
+		"Azerbaijan Standard Time": [
+			"Asia/Baku"
+		],
+		"Azores Standard Time": [
+			"America/Scoresbysund"/*,
+			"Atlantic/Azores"
+		*/],
+		"Bahia Standard Time": [
+			"America/Bahia"
+		],
+		"Bangladesh Standard Time": [
+			"Asia/Dhaka"/*,
+			"Asia/Thimphu"
+		*/],
+		"Belarus Standard Time": [
+			"Europe/Minsk"
+		],
+		"Bougainville Standard Time": [
+			"Pacific/Bougainville"
+		],
+		"Canada Central Standard Time": [
+			"America/Regina"/*,
+			"America/Swift_Current"
+		*/],
+		"Cape Verde Standard Time": [
+			"Atlantic/Cape_Verde"/*,
+			"Etc/GMT+1"
+		*/],
+		"Caucasus Standard Time": [
+			"Asia/Yerevan"
+		],
+		"Cen. Australia Standard Time": [
+			"Australia/Adelaide"/*,
+			"Australia/Broken_Hill"
+		*/],
+		"Central America Standard Time": [
+			"America/Belize"/*,
+			"America/Costa_Rica",
+			"America/El_Salvador",
+			"America/Guatemala",
+			"America/Managua",
+			"America/Tegucigalpa",
+			"Pacific/Galapagos",
+			"Etc/GMT+6"
+		*/],
+		"Central Asia Standard Time": [
+			"Asia/Almaty"/*,
+			"Asia/Bishkek",
+			"Asia/Qostanay",
+			"Asia/Urumqi",
+			"Indian/Chagos",
+			"Antarctica/Vostok",
+			"Etc/GMT-6"
+		*/],
+		"Central Brazilian Standard Time": [
+			"America/Campo_Grande"/*,
+			"America/Cuiaba"
+		*/],
+		"Central Europe Standard Time": [
+			"Europe/Belgrade"/*,
+			"Europe/Bratislava",
+			"Europe/Budapest",
+			"Europe/Ljubljana",
+			"Europe/Podgorica",
+			"Europe/Prague",
+			"Europe/Tirane"
+		*/],
+		"Central European Standard Time": [
+			"Europe/Sarajevo"/*,
+			"Europe/Skopje",
+			"Europe/Warsaw",
+			"Europe/Zagreb"
+		*/],
+		"Central Pacific Standard Time": [
+			"Pacific/Efate"/*,
+			"Pacific/Guadalcanal",
+			"Pacific/Noumea",
+			"Pacific/Ponape Pacific/Kosrae",
+			"Antarctica/Macquarie",
+			"Etc/GMT-11"
+		*/],
+		"Central Standard Time": [
+			"America/Chicago"/*,
+			"America/Indiana/Knox",
+			"America/Indiana/Tell_City",
+			"America/Matamoros",
+			"America/Menominee",
+			"America/North_Dakota/Beulah",
+			"America/North_Dakota/Center",
+			"America/North_Dakota/New_Salem",
+			"America/Rainy_River",
+			"America/Rankin_Inlet",
+			"America/Resolute",
+			"America/Winnipeg",
+			"CST6CDT"
+		*/],
+		"Central Standard Time (Mexico)": [
+			"America/Bahia_Banderas"/*,
+			"America/Merida",
+			"America/Mexico_City",
+			"America/Monterrey"
+		*/],
+		"Chatham Islands Standard Time": [
+			"Pacific/Chatham"
+		],
+		"China Standard Time": [
+			"Asia/Hong_Kong"/*,
+			"Asia/Macau",
+			"Asia/Shanghai"
+		*/],
+		"Cuba Standard Time": [
+			"America/Havana"
+		],
+		"Dateline Standard Time": [
+			"Etc/GMT+12"
+		],
+		"E. Africa Standard Time": [
+			"Africa/Addis_Ababa"/*,
+			"Africa/Asmera",
+			"Africa/Dar_es_Salaam",
+			"Africa/Djibouti",
+			"Africa/Juba",
+			"Africa/Kampala",
+			"Africa/Mogadishu",
+			"Africa/Nairobi",
+			"Indian/Antananarivo",
+			"Indian/Comoro",
+			"Indian/Mayotte",
+			"Antarctica/Syowa",
+			"Etc/GMT-3"
+		*/],
+		"E. Australia Standard Time": [
+			"Australia/Brisbane"/*,
+			"Australia/Lindeman"
+		*/],
+		"E. Europe Standard Time": [
+			"Europe/Chisinau"
+		],
+		"E. South America Standard Time": [
+			"America/Sao_Paulo"
+		],
+		"Easter Island Standard Time": [
+			"Pacific/Easter"
+		],
+		"Eastern Standard Time": [
+			"America/Detroit"/*,
+			"America/Indiana/Petersburg",
+			"America/Indiana/Vincennes",
+			"America/Indiana/Winamac",
+			"America/Iqaluit",
+			"America/Kentucky/Monticello",
+			"America/Louisville",
+			"America/Montreal",
+			"America/Nassau",
+			"America/New_York",
+			"America/Nipigon",
+			"America/Pangnirtung",
+			"America/Thunder_Bay",
+			"America/Toronto",
+			"EST5EDT"
+		*/],
+		"Eastern Standard Time (Mexico)": [
+			"America/Cancun"
+		],
+		"Egypt Standard Time": [
+			"Africa/Cairo"
+		],
+		"Ekaterinburg Standard Time": [
+			"Asia/Yekaterinburg"
+		],
+		"Fiji Standard Time": [
+			"Pacific/Fiji"
+		],
+		"FLE Standard Time": [
+			"Europe/Helsinki"/*,
+			"Europe/Kiev",
+			"Europe/Mariehamn",
+			"Europe/Riga",
+			"Europe/Sofia",
+			"Europe/Tallinn",
+			"Europe/Uzhgorod",
+			"Europe/Vilnius",
+			"Europe/Zaporozhye"
+		*/],
+		"Georgian Standard Time": [
+			"Asia/Tbilisi"
+		],
+		"GMT Standard Time": [
+			"Atlantic/Canary"/*,
+			"Atlantic/Faeroe",
+			"Atlantic/Madeira",
+			"Europe/Dublin",
+			"Europe/Guernsey",
+			"Europe/Isle_of_Man",
+			"Europe/Jersey",
+			"Europe/Lisbon",
+			"Europe/London"
+		*/],
+		"Greenland Standard Time": [
+			"America/Godthab"
+		],
+		"Greenwich Standard Time": [
+			"Africa/Abidjan"/*,
+			"Africa/Accra",
+			"Africa/Bamako",
+			"Africa/Banjul",
+			"Africa/Bissau",
+			"Africa/Conakry",
+			"Africa/Dakar",
+			"Africa/Freetown",
+			"Africa/Lome",
+			"Africa/Monrovia",
+			"Africa/Nouakchott",
+			"Africa/Ouagadougou",
+			"Atlantic/Reykjavik",
+			"Atlantic/St_Helena"
+		*/],
+		"GTB Standard Time": [
+			"Asia/Nicosia"/*,
+			"Asia/Famagusta",
+			"Europe/Athens",
+			"Europe/Bucharest"
+		*/],
+		"Haiti Standard Time": [
+			"America/Port-au-Prince"
+		],
+		"Hawaiian Standard Time": [
+			"Pacific/Honolulu"/*,
+			"Pacific/Johnston",
+			"Pacific/Rarotonga",
+			"Pacific/Tahiti",
+			"Etc/GMT+10"
+		*/],
+		"India Standard Time": [
+			"Asia/Calcutta"
+		],
+		"Iran Standard Time": [
+			"Asia/Tehran"
+		],
+		"Israel Standard Time": [
+			"Asia/Jerusalem"
+		],
+		"Jordan Standard Time": [
+			"Asia/Amman"
+		],
+		"Kaliningrad Standard Time": [
+			"Europe/Kaliningrad"
+		],
+		"Korea Standard Time": [
+			"Asia/Seoul"
+		],
+		"Libya Standard Time": [
+			"Africa/Tripoli"
+		],
+		"Line Islands Standard Time": [
+			"Pacific/Kiritimati"/*,
+			"Etc/GMT-14"
+		*/],
+		"Lord Howe Standard Time": [
+			"Australia/Lord_Howe"
+		],
+		"Magadan Standard Time": [
+			"Asia/Magadan"
+		],
+		"Magallanes Standard Time": [
+			"America/Punta_Arenas"
+		],
+		"Marquesas Standard Time": [
+			"Pacific/Marquesas"
+		],
+		"Mauritius Standard Time": [
+			"Indian/Mauritius"/*,
+			"Indian/Mahe",
+			"Indian/Reunion"
+		*/],
+		"Middle East Standard Time": [
+			"Asia/Beirut"
+		],
+		"Montevideo Standard Time": [
+			"America/Montevideo"
+		],
+		"Morocco Standard Time": [
+			"Africa/Casablanca"/*,
+			"Africa/El_Aaiun"
+		*/],
+		"Mountain Standard Time": [
+			"America/Boise"/*,
+			"America/Cambridge_Bay",
+			"America/Denver",
+			"America/Edmonton",
+			"America/Inuvik",
+			"America/Ojinaga",
+			"America/Yellowknife",
+			"MST7MDT"
+		*/],
+		"Mountain Standard Time (Mexico)": [
+			"America/Chihuahua"/*,
+			"America/Mazatlan"
+		*/],
+		"Myanmar Standard Time": [
+			"Asia/Rangoon"/*,
+			"Indian/Cocos"
+		*/],
+		"N. Central Asia Standard Time": [
+			"Asia/Novosibirsk"
+		],
+		"Namibia Standard Time": [
+			"Africa/Windhoek"
+		],
+		"Nepal Standard Time": [
+			"Asia/Katmandu"
+		],
+		"New Zealand Standard Time": [
+			"Pacific/Auckland"/*,
+			"Antarctica/McMurdo"
+		*/],
+		"Newfoundland Standard Time": [
+			"America/St_Johns"
+		],
+		"Norfolk Standard Time": [
+			"Pacific/Norfolk"
+		],
+		"North Asia East Standard Time": [
+			"Asia/Irkutsk"
+		],
+		"North Asia Standard Time": [
+			"Asia/Krasnoyarsk"/*,
+			"Asia/Novokuznetsk"
+		*/],
+		"North Korea Standard Time": [
+			"Asia/Pyongyang"
+		],
+		"Omsk Standard Time": [
+			"Asia/Omsk"
+		],
+		"Pacific SA Standard Time": [
+			"America/Santiago"
+		],
+		"Pacific Standard Time": [
+			"America/Los_Angeles"/*,
+			"America/Dawson",
+			"America/Vancouver",
+			"America/Whitehorse",
+			"PST8PDT"
+		*/],
+		"Pacific Standard Time (Mexico)": [
+			"America/Tijuana"/*,
+			"America/Santa_Isabel"
+		*/],
+		"Pakistan Standard Time": [
+			"Asia/Karachi"
+		],
+		"Paraguay Standard Time": [
+			"America/Asuncion"
+		],
+		"Qyzylorda Standard Time": [
+			"Asia/Qyzylorda"
+		],
+		"Romance Standard Time": [
+			"Europe/Paris"/*,
+			"Europe/Brussels",
+			"Europe/Copenhagen",
+			"Europe/Madrid",
+			"Africa/Ceuta"
+		*/],
+		"Russia Time Zone 3": [
+			"Europe/Samara"
+		],
+		"Russia Time Zone 10": [
+			"Asia/Srednekolymsk"
+		],
+		"Russia Time Zone 11": [
+			"Asia/Kamchatka"/*,
+			"Asia/Anadyr"
+		*/],
+		"Russian Standard Time": [
+			"Europe/Moscow"/*,
+			"Europe/Kirov",
+			"Europe/Simferopol"
+		*/],
+		"SA Eastern Standard Time": [
+			"America/Belem"/*,
+			"America/Cayenne",
+			"America/Fortaleza",
+			"America/Maceio",
+			"America/Paramaribo",
+			"America/Recife",
+			"America/Santarem",
+			"Atlantic/Stanley",
+			"Antarctica/Palmer",
+			"Antarctica/Rothera",
+			"Etc/GMT+3"
+		*/],
+		"SA Pacific Standard Time": [
+			"America/Bogota"/*,
+			"America/Cayman",
+			"America/Coral_Harbour",
+			"America/Eirunepe",
+			"America/Guayaquil",
+			"America/Jamaica",
+			"America/Lima",
+			"America/Panama",
+			"America/Rio_Branco",
+			"Etc/GMT+5"
+		*/],
+		"SA Western Standard Time": [
+			"America/Anguilla"/*,
+			"America/Antigua",
+			"America/Aruba",
+			"America/Barbados",
+			"America/Blanc-Sablon",
+			"America/Boa_Vista",
+			"America/Curacao",
+			"America/Dominica",
+			"America/Grenada",
+			"America/Guadeloupe",
+			"America/Guyana",
+			"America/Kralendijk",
+			"America/La_Paz",
+			"America/Lower_Princes",
+			"America/Manaus",
+			"America/Marigot",
+			"America/Martinique",
+			"America/Montserrat",
+			"America/Port_of_Spain",
+			"America/Porto_Velho",
+			"America/Puerto_Rico",
+			"America/Santo_Domingo",
+			"America/St_Barthelemy",
+			"America/St_Kitts",
+			"America/St_Lucia",
+			"America/St_Thomas",
+			"America/St_Vincent",
+			"America/Tortola",
+			"Etc/GMT+4"
+		*/],
+		"Saint Pierre Standard Time": [
+			"America/Miquelon"
+		],
+		"Sakhalin Standard Time": [
+			"Asia/Sakhalin"
+		],
+		"Samoa Standard Time": [
+			"Pacific/Apia"
+		],
+		"Sao Tome Standard Time": [
+			"Africa/Sao_Tome"
+		],
+		"Saratov Standard Time": [
+			"Europe/Saratov"
+		],
+		"SE Asia Standard Time": [
+			"Asia/Bangkok"/*,
+			"Asia/Jakarta",
+			"Asia/Phnom_Penh",
+			"Asia/Pontianak",
+			"Asia/Saigon",
+			"Asia/Vientiane",
+			"Indian/Christmas",
+			"Antarctica/Davis",
+			"Etc/GMT-7"
+		*/],
+		"Singapore Standard Time": [
+			"Asia/Singapore"/*,
+			"Asia/Brunei",
+			"Asia/Kuala_Lumpur",
+			"Asia/Kuching",
+			"Asia/Makassar",
+			"Asia/Manila",
+			"Antarctica/Casey",
+			"Etc/GMT-8"
+		*/],
+		"South Africa Standard Time": [
+			"Africa/Johannesburg"/*,
+			"Africa/Blantyre",
+			"Africa/Bujumbura",
+			"Africa/Gaborone",
+			"Africa/Harare",
+			"Africa/Kigali",
+			"Africa/Lubumbashi",
+			"Africa/Lusaka",
+			"Africa/Maputo",
+			"Africa/Maseru",
+			"Africa/Mbabane",
+			"Etc/GMT-2"
+		*/],
+		"Sri Lanka Standard Time": [
+			"Asia/Colombo"
+		],
+		"Sudan Standard Time": [
+			"Africa/Khartoum"
+		],
+		"Syria Standard Time": [
+			"Asia/Damascus"
+		],
+		"Taipei Standard Time": [
+			"Asia/Taipei"
+		],
+		"Tasmania Standard Time": [
+			"Australia/Currie"/*,
+			"Australia/Hobart"
+		*/],
+		"Tocantins Standard Time": [
+			"America/Araguaina"
+		],
+		"Tokyo Standard Time": [
+			"Asia/Tokyo"/*,
+			"Asia/Dili",
+			"Asia/Jayapura",
+			"Pacific/Palau",
+			"Etc/GMT-9"
+		*/],
+		"Tomsk Standard Time": [
+			"Asia/Tomsk"
+		],
+		"Tonga Standard Time": [
+			"Pacific/Tongatapu"
+		],
+		"Transbaikal Standard Time": [
+			"Asia/Chita"
+		],
+		"Turkey Standard Time": [
+			"Europe/Istanbul"
+		],
+		"Turks And Caicos Standard Time": [
+			"America/Grand_Turk"
+		],
+		"Ulaanbaatar Standard Time": [
+			"Asia/Ulaanbaatar"/*,
+			"Asia/Choibalsan"
+		*/],
+		"US Eastern Standard Time": [
+			"America/Indianapolis"/*,
+			"America/Indiana/Marengo",
+			"America/Indiana/Vevay"
+		*/],
+		"US Mountain Standard Time": [
+			"America/Phoenix"/*,
+			"America/Creston",
+			"America/Dawson_Creek",
+			"America/Fort_Nelson",
+			"America/Hermosillo",
+			"Etc/GMT+7"
+		*/],
+		"UTC": [
+			"Etc/GMT"/*,
+			"America/Danmarkshavn",
+			"Etc/UTC"
+		*/],
+		"UTC-02": [
+			"Etc/GMT+2"/*,
+			"America/Noronha",
+			"Atlantic/South_Georgia"
+		*/],
+		"UTC-08": [
+			"Etc/GMT+8"/*,
+			"Pacific/Pitcairn"
+		*/],
+		"UTC-09": [
+			"Etc/GMT+9"/*,
+			"Pacific/Gambier"
+		*/],
+		"UTC-11": [
+			"Etc/GMT+11"/*,
+			"Pacific/Midway",
+			"Pacific/Niue",
+			"Pacific/Pago_Pago"
+		*/],
+		"UTC+12": [
+			"Etc/GMT-12"/*,
+			"Pacific/Funafuti",
+			"Pacific/Kwajalein",
+			"Pacific/Majuro",
+			"Pacific/Nauru",
+			"Pacific/Tarawa",
+			"Pacific/Wake",
+			"Pacific/Wallis"
+		*/],
+		"UTC+13": [
+			"Etc/GMT-13"/*,
+			"Pacific/Enderbury",
+			"Pacific/Fakaofo"
+		*/],
+		"Venezuela Standard Time": [
+			"America/Caracas"
+		],
+		"Vladivostok Standard Time": [
+			"Asia/Vladivostok"/*,
+			"Asia/Ust-Nera"
+		*/],
+		"Volgograd Standard Time": [
+			"Europe/Volgograd"
+		],
+		"W. Australia Standard Time": [
+			"Australia/Perth"
+		],
+		"W. Central Africa Standard Time": [
+			"Africa/Algiers"/*,
+			"Africa/Bangui",
+			"Africa/Brazzaville",
+			"Africa/Douala",
+			"Africa/Kinshasa",
+			"Africa/Lagos",
+			"Africa/Libreville",
+			"Africa/Luanda",
+			"Africa/Malabo",
+			"Africa/Ndjamena",
+			"Africa/Niamey",
+			"Africa/Porto-Novo",
+			"Africa/Tunis",
+			"Etc/GMT-1"
+		*/],
+		"W. Europe Standard Time": [
+			"Europe/Amsterdam"/*,
+			"Europe/Andorra",
+			"Europe/Berlin",
+			"Europe/Busingen",
+			"Europe/Gibraltar",
+			"Europe/Luxembourg",
+			"Europe/Malta",
+			"Europe/Monaco",
+			"Europe/Oslo",
+			"Europe/Rome",
+			"Europe/San_Marino",
+			"Europe/Stockholm",
+			"Europe/Vaduz",
+			"Europe/Vatican",
+			"Europe/Vienna",
+			"Europe/Zurich",
+			"Arctic/Longyearbyen"
+		*/],
+		"W. Mongolia Standard Time": [
+			"Asia/Hovd"
+		],
+		"West Asia Standard Time": [
+			"Asia/Aqtau"/*,
+			"Asia/Aqtobe",
+			"Asia/Ashgabat",
+			"Asia/Atyrau",
+			"Asia/Dushanbe",
+			"Asia/Oral",
+			"Asia/Samarkand",
+			"Asia/Tashkent",
+			"Indian/Kerguelen",
+			"Indian/Maldives",
+			"Antarctica/Mawson",
+			"Etc/GMT-5"
+		*/],
+		"West Bank Standard Time": [
+			"Asia/Gaza"/*,
+			"Asia/Hebron"
+		*/],
+		"West Pacific Standard Time": [
+			"Pacific/Guam"/*,
+			"Pacific/Port_Moresby",
+			"Pacific/Saipan",
+			"Pacific/Truk",
+			"Antarctica/DumontDUrville",
+			"Etc/GMT-10"
+		*/],
+		"Yakutsk Standard Time": [
+			"Asia/Khandyga"/*,
+			"Asia/Yakutsk"
+		*/],
+	};
+})(window.rl);
diff --git a/plugins/view-ics/index.php b/plugins/view-ics/index.php
new file mode 100644
index 000000000..f12253bc7
--- /dev/null
+++ b/plugins/view-ics/index.php
@@ -0,0 +1,19 @@
+<?php
+
+class ViewICSPlugin extends \RainLoop\Plugins\AbstractPlugin
+{
+	const
+		NAME = 'View ICS',
+		VERSION = '2.2',
+		RELEASE  = '2024-06-29',
+		CATEGORY = 'Messages',
+		DESCRIPTION = 'Display ICS attachment or JSON-LD details',
+		REQUIRED = '2.34.0';
+
+	public function Init() : void
+	{
+//		$this->UseLangs(true);
+		$this->addJs('ical.js');
+		$this->addJs('message.js');
+	}
+}
diff --git a/plugins/view-ics/message.js b/plugins/view-ics/message.js
new file mode 100644
index 000000000..551cccff9
--- /dev/null
+++ b/plugins/view-ics/message.js
@@ -0,0 +1,85 @@
+(rl => {
+	const templateId = 'MailMessageView';
+
+	addEventListener('rl-view-model.create', e => {
+		if (templateId === e.detail.viewModelTemplateID) {
+
+			const
+				template = document.getElementById(templateId),
+				view = e.detail,
+				attachmentsPlace = template.content.querySelector('.attachmentsPlace');
+
+			attachmentsPlace.after(Element.fromHTML(`
+			<details data-bind="if: viewICS, visible: viewICS">
+				<summary data-icon="📅" data-bind="text: viewICS().SUMMARY"></summary>
+				<table><tbody style="white-space:pre">
+					<tr data-bind="visible: viewICS().ORGANIZER"><td>Organizer</td><td data-bind="text: viewICS().ORGANIZER"></td></tr>
+					<tr><td>Start</td><td data-bind="text: viewICS().DTSTART"></td></tr>
+					<tr><td>End</td><td data-bind="text: viewICS().DTEND"></td></tr>
+<!--				<tr><td>Transparency</td><td data-bind="text: viewICS().TRANSP"></td></tr>-->
+					<tr data-bind="foreach: viewICS().ATTENDEE">
+						<td></td><td data-bind="text: $data.replace(/;/g,';\\n')"></td>
+					</tr>
+				</tbody></table>
+			</details>`));
+
+			view.viewICS = ko.observable(null);
+
+			view.saveICS = () => {
+				let VEVENT = view.VEVENT();
+				if (VEVENT) {
+					if (rl.nextcloud && VEVENT.rawText) {
+						rl.nextcloud.selectCalendar()
+							.then(href => href && rl.nextcloud.calendarPut(href, VEVENT));
+					} else {
+						// TODO
+					}
+				}
+			}
+
+			/**
+			 * TODO
+			 */
+			view.message.subscribe(msg => {
+				view.viewICS(null);
+				if (msg) {
+					// JSON-LD after parsing HTML
+					// See http://schema.org/
+					msg.linkedData.subscribe(data => {
+						if (!view.viewICS()) {
+							data.forEach(item => {
+								if (item["ical:summary"]) {
+									let VEVENT = {
+										SUMMARY: item["ical:summary"],
+										DTSTART: rl.ICS.parseDate(item["ical:dtstart"]),
+//										DTEND: rl.ICS.parseDate(item["ical:dtend"]),
+//										TRANSP: item["ical:transp"],
+//										LOCATION: item["ical:location"],
+										ATTENDEE: []
+									}
+									view.viewICS(VEVENT);
+									return;
+								}
+							});
+						}
+					});
+					// ICS attachment
+//					let ics = msg.attachments.find(attachment => 'application/ics' == attachment.mimeType);
+					let ics = msg.attachments.find(attachment => 'text/calendar' == attachment.mimeType);
+					if (ics && ics.download) {
+						// fetch it and parse the VEVENT
+						rl.fetch(ics.linkDownload())
+						.then(response => (response.status < 400) ? response.text() : Promise.reject(new Error({ response })))
+						.then(text => {
+							let VEVENT = rl.ICS.parseEvent(text);
+							if (VEVENT) {
+								view.viewICS(VEVENT);
+							}
+						});
+					}
+				}
+			});
+		}
+	});
+
+})(window.rl);
diff --git a/plugins/view-ics/style.css b/plugins/view-ics/style.css
new file mode 100644
index 000000000..b3a4e5c8c
--- /dev/null
+++ b/plugins/view-ics/style.css
@@ -0,0 +1,44 @@
+
+/**
+ * .SML-@type where @type is the value of the JSON-LD "@type":
+ * See http://schema.org/
+ */
+
+.SML-FlightReservation {
+}
+
+	.SML-Airline {
+	}
+
+	.SML-Airport {
+	}
+
+	.SML-Flight {
+	}
+
+.SML-FoodEstablishmentReservation {
+}
+
+	.SML-FoodEstablishment {
+	}
+
+.SML-ParcelDelivery {
+}
+
+	.SML-Order {
+	}
+
+	.SML-Organization {
+	}
+
+	.SML-Product {
+	}
+
+	.SML-PostalAddress {
+	}
+
+.SML-Person {
+}
+
+.SML-PromotionCard {
+}
diff --git a/plugins/white-list/index.php b/plugins/white-list/index.php
index efad99ea8..2b91b8bcc 100644
--- a/plugins/white-list/index.php
+++ b/plugins/white-list/index.php
@@ -4,35 +4,31 @@ class WhiteListPlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
 		NAME = 'Whitelist',
-		VERSION = '2.1',
-		RELEASE = '2021-04-21',
+		VERSION = '2.2',
+		RELEASE = '2024-03-04',
 		REQUIRED = '2.5.0',
 		CATEGORY = 'Login',
 		DESCRIPTION = 'Simple login whitelist (with wildcard and exceptions functionality).';
 
 	public function Init() : void
 	{
-		$this->addHook('login.credentials', 'FilterLoginCredentials');
+		$this->addHook('login.credentials.step-1', 'FilterLoginCredentials');
 	}
 
 	/**
-	 * @param string $sEmail
-	 * @param string $sLogin
-	 * @param string $sPassword
-	 *
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function FilterLoginCredentials(&$sEmail, &$sLogin, &$sPassword)
+	public function FilterLoginCredentials(string &$sEmail)
 	{
 		$sWhiteList = \trim($this->Config()->Get('plugin', 'white_list', ''));
-		if (0 < strlen($sWhiteList) && !\RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList))
-		{
+		if (\strlen($sWhiteList) && !\RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sWhiteList)) {
 			$sExceptions = \trim($this->Config()->Get('plugin', 'exceptions', ''));
-			if (0 === \strlen($sExceptions) || !\RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sExceptions))
-			{
+			if (!\strlen($sExceptions) || \RainLoop\Plugins\Helper::ValidateWildcardValues($sEmail, $sExceptions)) {
 				throw new \RainLoop\Exceptions\ClientException(
-					$this->Config()->Get('plugin', 'auth_error', true) ?
-						\RainLoop\Notifications::AuthError : \RainLoop\Notifications::AccountNotAllowed);
+					$this->Config()->Get('plugin', 'auth_error', false)
+					? \RainLoop\Notifications::AuthError
+					: \RainLoop\Notifications::AccountNotAllowed
+				);
 			}
 		}
 	}
@@ -46,7 +42,7 @@ class WhiteListPlugin extends \RainLoop\Plugins\AbstractPlugin
 			\RainLoop\Plugins\Property::NewInstance('auth_error')->SetLabel('Auth Error')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::BOOL)
 				->SetDescription('Throw an authentication error instead of an access error.')
-				->SetDefaultValue(true),
+				->SetDefaultValue(false),
 			\RainLoop\Plugins\Property::NewInstance('white_list')->SetLabel('White List')
 				->SetType(\RainLoop\Enumerations\PluginPropertyType::STRING_TEXT)
 				->SetDescription('Emails white list, space as delimiter, wildcard supported.')
diff --git a/plugins/wysiwyg-example/example.js b/plugins/wysiwyg-example/example.js
new file mode 100644
index 000000000..a26fe5158
--- /dev/null
+++ b/plugins/wysiwyg-example/example.js
@@ -0,0 +1,82 @@
+(rl => {
+	class Example
+	{
+		constructor(owner, editor) {
+			this.mode = 'wysiwyg';
+			this.owner = owner;
+			this.editor = editor;
+console.dir({editor});
+		}
+
+		setMode(mode) {
+			console.log(`WYSIWYG-Example.setMode(${mode})`);
+			this.mode = mode;
+		}
+
+		on(type, fn) {
+			console.log(`WYSIWYG-Example.on(${type}, ${fn})`);
+		}
+
+		execCommand(cmd, cfg) {
+			console.log(`WYSIWYG-Example.execCommand(${cmd}, ${cfg})`);
+/*
+			execCommand('insertSignature', {
+				clearCache: true
+			}));
+
+			execCommand('insertSignature', {
+				isHtml: html,
+				insertBefore: insertBefore,
+				signature: signature
+			}));
+*/
+		}
+
+		getData() {
+			console.log(`WYSIWYG-Example.getData()`);
+			return this.editor.innerHTML;
+		}
+
+		setData(html) {
+			console.log(`WYSIWYG-Example.setData(${html})`);
+			this.editor.innerHTML = html;
+		}
+
+		getPlainData() {
+			console.log(`WYSIWYG-Example.getPlainData()`);
+			return this.editor.innerText;
+		}
+
+		setPlainData(text) {
+			console.log(`WYSIWYG-Example.setPlainData(${text})`);
+			return this.editor.textContent = text;
+		}
+
+		blur() {
+			console.log(`WYSIWYG-Example.blur()`);
+			this.editor.blur();
+		}
+
+		focus() {
+			console.log(`WYSIWYG-Example.focus()`);
+		}
+	}
+
+	if (rl) {
+		const path = rl.settings.app('webVersionPath'),
+			script = document.createElement('script');
+		script.src = path + 'static/wysiwyg-example/example.min.js';
+		document.head.append(script);
+
+		/**
+		 * owner = HtmlEditor
+		 * container = HTMLElement
+		 * onReady = callback(SMQuill)
+		 */
+		rl.registerWYSIWYG('Example', (owner, container, onReady) => {
+			const editor = new Example(owner, container);
+			onReady(editor);
+		});
+	}
+
+})(window.rl);
diff --git a/plugins/ckeditor/index.php b/plugins/wysiwyg-example/index.php
similarity index 58%
rename from plugins/ckeditor/index.php
rename to plugins/wysiwyg-example/index.php
index fe68dcc9c..c52d411f3 100644
--- a/plugins/ckeditor/index.php
+++ b/plugins/wysiwyg-example/index.php
@@ -1,17 +1,17 @@
 <?php
 
-class CKEditorPlugin extends \RainLoop\Plugins\AbstractPlugin
+class WysiwygExamplePlugin extends \RainLoop\Plugins\AbstractPlugin
 {
 	const
-		NAME = 'CKEditor',
-		VERSION = '2.2',
-		RELEASE = '2021-08-17',
-		REQUIRED = '2.6.2',
-		DESCRIPTION = 'Use CKEditor instead of Squire as WYSIWYG';
+		NAME = 'WYSIWYG Example',
+		VERSION = '1.0',
+		RELEASE = '2024-01-30',
+		REQUIRED = '2.34.0',
+		DESCRIPTION = 'Add Example as WYSIWYG editor option';
 
 	public function Init() : void
 	{
-		$path = APP_VERSION_ROOT_PATH . 'static/ckeditor';
+		$path = APP_VERSION_ROOT_PATH . 'static/wysiwyg-example';
 
 		// Apache AH00037: Symbolic link not allowed or link target not accessible
 		// That's why we clone the source
@@ -20,7 +20,7 @@ class CKEditorPlugin extends \RainLoop\Plugins\AbstractPlugin
 			// $active = \symlink(__DIR__ . '/src', $path);
 			\mkdir($path, 0755);
 			$iterator = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator(__DIR__ . '/src', \RecursiveDirectoryIterator::SKIP_DOTS),
+				new \RecursiveDirectoryIterator(__DIR__ . '/static', \RecursiveDirectoryIterator::SKIP_DOTS),
 				\RecursiveIteratorIterator::SELF_FIRST
 			);
 			foreach ($iterator as $item) {
@@ -33,9 +33,9 @@ class CKEditorPlugin extends \RainLoop\Plugins\AbstractPlugin
 			umask($old_mask);
 		}
 
-		if (\is_file("{$path}/ckeditor.js")) {
-			$this->addCss('style.css');
-			$this->addJs('ckeditor.js');
+		if (\is_file("{$path}/example.min.js")) {
+//			$this->addCss('style.css');
+			$this->addJs('example.js');
 		}
 	}
 }
diff --git a/plugins/wysiwyg-example/static/example.min.js b/plugins/wysiwyg-example/static/example.min.js
new file mode 100644
index 000000000..8d1c8b69c
--- /dev/null
+++ b/plugins/wysiwyg-example/static/example.min.js
@@ -0,0 +1 @@
+ 
diff --git a/public_html/translate.php b/public_html/translate.php
new file mode 100644
index 000000000..30f6613ea
--- /dev/null
+++ b/public_html/translate.php
@@ -0,0 +1,197 @@
+<?php
+
+$lang = (empty($_GET['lang']) || !preg_match('/^[a-z]{2}(-[A-Z]{2})?$/D',$_GET['lang'])) ? '' : $_GET['lang'];
+
+function toJSON($data)
+{
+	foreach ($data as $section => $values) {
+		if (is_array($values)) {
+			foreach ($values as $key => $value) {
+				$data[$section][$key] = preg_replace('/\\R/', "\n", trim($value));
+			}
+		} else if ('LANG_DIR' === $section) {
+			$data[$section] = $values;
+		}
+	}
+	return str_replace('    ', "\t", json_encode($data, JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE));
+}
+
+if ('POST' === $_SERVER['REQUEST_METHOD']) {
+	try {
+		$file = tempnam(sys_get_temp_dir(), '');
+		$zip = new ZipArchive();
+		if (!$zip->open($file, ZIPARCHIVE::CREATE)) {
+			exit("Failed to create zip");
+		}
+		if (!$lang) {
+			$lang = (empty($_POST['lang']) || !preg_match('/^[a-z]{2}(-[A-Z]{2})?$/D',$_POST['lang']))
+				? 'new' : $_POST['lang'];
+		}
+		$zip->addFromString("{$lang}/admin.json", toJSON($_POST['admin']));
+		$zip->addFromString("{$lang}/user.json", toJSON($_POST['user']));
+		$zip->close();
+		header('Content-Type: application/zip');
+		header('Content-disposition: attachment; filename="snappymail-'.$lang.'.zip"');
+		header('Content-Length: ' . filesize($file));
+		readfile($file);
+	} catch (\Throwable $e) {
+		echo $e->getMessage();
+	}
+	unlink($file);
+	exit;
+}
+
+// /home/rainloop/public_html/snappymail/v/0.0.0/static/js
+$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+require 'demo/index.php';
+
+$root = APP_VERSION_ROOT_PATH . 'app/localization';
+
+$en = [
+	'user' => '',
+	'admin' => '',
+//	'static' => '',
+];
+foreach ($en as $name => $data) {
+	$en[$name] = json_decode(file_get_contents("{$root}/en/{$name}.json"), true);
+}
+
+$languages = ['<option></option>'];
+foreach (glob("{$root}/*", GLOB_ONLYDIR) as $dir) {
+	$name = basename($dir);
+	if ('en' !== $name) {
+		$languages[$name] = "<option value='{$name}'".($lang == $name ? ' selected' : '').">{$name}</option>";
+	}
+}
+ksort($languages);
+
+$lang_names = json_decode(file_get_contents("{$root}/langs.json"), true)['LANGS_NAMES_EN'];
+
+$other_langs = [];
+foreach ($lang_names as $key => $name) {
+	if ('en' !== $key && !isset($languages[$key])) {
+		$other_langs[$key] = "<option value='{$key}'".($lang == $key ? ' selected' : '').">{$name}</option>";
+	}
+}
+
+//print_r($languages);
+
+echo '<!DOCTYPE html>
+<html><head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width">
+	<title>Translate</title>
+	<style>
+	table {
+		width:100%;
+	}
+	th {
+		background-color:#000;
+		color:#fff;
+		font-size:2em;
+		width:50%;
+	}
+	tr.section td {
+		background-color:#ddd;
+	}
+	tr:not(.section) td:first-child {
+		padding-left:1em;
+	}
+	tr.untranslated {
+		background:#FC5;
+	}
+	textarea {
+		width: 50vw;
+	}
+	#untranslated:checked + * tbody tr:not(.section):not(.untranslated):not(.file) {
+		display:none;
+	}
+	</style>
+</head><body>
+<h1>Translate: <select onchange="location.href=\'?lang=\'+this.value">'.implode('',$languages).'
+	<optgroup label="Not translated">'.implode('',$other_langs).'</optgroup>
+</select></h1>
+<form action="" method="post">
+<input type="checkbox" id="untranslated"> Show untranslated only
+<table>
+<thead>
+	<tr>
+		<th>en</th>
+		<th>'.($lang ? "{$lang_names[$lang]} ({$lang})" : '<input name="lang" required="" pattern="[a-z]{2}(-[A-Z]{2})?">').'</th>
+	</tr>
+</thead>';
+foreach ($en as $name => $sections) {
+	echo '<tbody><tr class="file"><th colspan="3">'.$name.'</th></tr>';
+	$data = $sections;
+	if ($lang && is_readable("{$root}/{$lang}/{$name}.json")) {
+		$data = json_decode(file_get_contents("{$root}/{$lang}/{$name}.json"), true);
+	}
+	foreach ($sections as $section => $values) {
+		if (is_array($values)) {
+			echo '<tr class="section"><td colspan="3">'.$section.'</td><td></td></tr>';
+			foreach ($values as $key => $value) {
+				echo '<tr'.((empty($data[$section][$key]) || $value == $data[$section][$key]) ? ' class="untranslated"':'').'>';
+//				echo '<td>'.$section.'/'.$key.'</td>';
+				echo '<td>'.htmlspecialchars($value).'</td>';
+				echo '<td><textarea name="'."{$name}[{$section}][{$key}]".'">'.htmlspecialchars($data[$section][$key] ?? '').'</textarea></td>';
+				echo '</tr>';
+			}
+		} else if ('LANG_DIR' === $section) {
+			echo '<tr>';
+			echo '<td>Text direction</td>';
+			echo '<td><select name="'."{$name}[{$section}]".'">
+				<option value="ltr">Left to right</option>
+				<option value="rtl"'.('rtl' === ($data[$section] ?? '') ? ' selected=""' : '').'>Right to left</option>
+			</select></td>';
+			echo '</tr>';
+		}
+	}
+	echo '</tbody>';
+}
+echo '<tfoot><tr><td></td><td><button>Save</button></td></tr></tfoot></table>';
+echo '</form></body></html>';
+
+/*
+<textarea onInput="this.parentNode.dataset.value = this.value">
+*, *::before, *::after {
+	box-sizing: border-box;
+}
+td + td {
+	box-shadow: 4px 4px 0px #000;
+	display: inline-grid;
+	vertical-align: top;
+	align-items: center;
+	position: relative;
+	border: solid 1px;
+	padding: .5em;
+	margin: 5px;
+	align-items: stretch;
+}
+td + td::after, textarea {
+	grid-area: 2 / 1;
+}
+td + td::after, textarea {
+	width: auto;
+	min-width: 1em;
+	grid-area: 1 / 2;
+	font: inherit;
+	padding: 0.25em;
+	margin: 0;
+	resize: none;
+	background: none;
+	appearance: none;
+	border: none;
+}
+td + td::after {
+	content: attr(data-value) ' ';
+	visibility: hidden;
+	white-space: pre-wrap;
+}
+td + td:focus-within {
+	outline: solid 1px blue;
+	box-shadow: 4px 4px 0px blue;
+}
+textarea:focus {
+	outline: none;
+}
+*/
diff --git a/release.php b/release.php
index 7920932cb..4bef9861f 100755
--- a/release.php
+++ b/release.php
@@ -1,262 +1,3 @@
 #!/usr/bin/php
 <?php
-chdir(__DIR__);
-
-$options = getopt('', ['aur','docker','plugins','set-version','skip-gulp','debian','sign']);
-
-if (isset($options['plugins'])) {
-	require(__DIR__ . '/build/plugins.php');
-}
-
-$gulp = trim(`which gulp`);
-if (!$gulp) {
-	exit('gulp not installed, run as root: npm install --global gulp-cli');
-}
-
-$package = json_decode(file_get_contents('package.json'));
-
-/**
- * Update files that contain version
- */
-// cloudron
-$file = __DIR__ . '/integrations/cloudron/Dockerfile';
-file_put_contents($file, preg_replace('/VERSION=[0-9.]+/', "VERSION={$package->version}", file_get_contents($file)));
-$file = __DIR__ . '/integrations/cloudron/DESCRIPTION.md';
-file_put_contents($file, preg_replace('/<upstream>[^<]*</', "<upstream>{$package->version}<", file_get_contents($file)));
-// docker
-$file = __DIR__ . '/.docker/release/files/usr/local/include/application.ini';
-file_put_contents($file, preg_replace('/current = "[0-9.]+"/', "current = \"{$package->version}\"", file_get_contents($file)));
-// nextcloud
-file_put_contents(__DIR__ . '/integrations/nextcloud/snappymail/VERSION', $package->version);
-$file = __DIR__ . '/integrations/nextcloud/snappymail/appinfo/info.xml';
-file_put_contents($file, preg_replace('/<version>[^<]*</', "<version>{$package->version}<", file_get_contents($file)));
-// virtualmin
-$file = __DIR__ . '/integrations/virtualmin/snappymail.pl';
-file_put_contents($file, preg_replace('/return \\( "[0-9]+\\.[0-9]+\\.[0-9]+" \\)/', "return ( \"{$package->version}\" )", file_get_contents($file)));
-
-if (isset($options['set-version'])) {
-	exit;
-}
-
-// Arch User Repository
-// https://aur.archlinux.org/packages/snappymail/
-$options['aur'] = isset($options['aur']);
-
-// Docker build
-$docker = trim(`which docker`);
-$options['docker'] = isset($options['docker']) || (!$options['aur'] && $docker && strtoupper(readline("Build Docker image? (Y/N): ")) === "Y");
-
-$destPath = "build/dist/releases/webmail/{$package->version}/";
-is_dir($destPath) || mkdir($destPath, 0777, true);
-
-$zip_destination = "{$destPath}snappymail-{$package->version}.zip";
-$tar_destination = "{$destPath}snappymail-{$package->version}.tar";
-
-@unlink($zip_destination);
-@unlink($tar_destination);
-@unlink("{$tar_destination}.gz");
-
-if (!isset($options['skip-gulp'])) {
-	echo "\x1b[33;1m === Gulp === \x1b[0m\n";
-	passthru($gulp, $return_var);
-	if ($return_var) {
-		exit("gulp failed with error code {$return_var}\n");
-	}
-
-	$cmddir = escapeshellcmd(__DIR__) . '/snappymail/v/0.0.0/static';
-
-	if ($gzip = trim(`which gzip`)) {
-		echo "\x1b[33;1m === Gzip *.js and *.css === \x1b[0m\n";
-		passthru("{$gzip} -k --best {$cmddir}/js/*.js");
-		passthru("{$gzip} -k --best {$cmddir}/js/min/*.js");
-		passthru("{$gzip} -k --best {$cmddir}/css/admin*.css");
-		passthru("{$gzip} -k --best {$cmddir}/css/app*.css");
-		unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/boot.js.gz');
-		unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/min/boot.min.js.gz');
-	}
-
-	if ($brotli = trim(`which brotli`)) {
-		echo "\x1b[33;1m === Brotli *.js and *.css === \x1b[0m\n";
-		passthru("{$brotli} -k --best {$cmddir}/js/*.js");
-		passthru("{$brotli} -k --best {$cmddir}/js/min/*.js");
-		passthru("{$brotli} -k --best {$cmddir}/css/admin*.css");
-		passthru("{$brotli} -k --best {$cmddir}/css/app*.css");
-		unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/boot.js.br');
-		unlink(__DIR__ . '/snappymail/v/0.0.0/static/js/min/boot.min.js.br');
-	}
-}
-
-// Temporary rename folder to speed up PharData
-//if (!rename('snappymail/v/0.0.0', "snappymail/v/{$package->version}")){
-if (!rename('snappymail/v/0.0.0', "snappymail/v/{$package->version}")) {
-	exit('Failed to temporary rename snappymail/v/0.0.0');
-}
-register_shutdown_function(function(){
-	// Rename folder back to original
-	@rename("snappymail/v/{$GLOBALS['package']->version}", 'snappymail/v/0.0.0');
-});
-
-echo "\x1b[33;1m === Zip/Tar === \x1b[0m\n";
-
-$zip = new ZipArchive();
-if (!$zip->open($zip_destination, ZIPARCHIVE::CREATE)) {
-	exit("Failed to create {$zip_destination}");
-}
-
-$tar = new PharData($tar_destination);
-
-$files = new RecursiveIteratorIterator(new RecursiveDirectoryIterator('snappymail/v'), RecursiveIteratorIterator::SELF_FIRST);
-foreach ($files as $file) {
-	$file = str_replace('\\', '/', $file);
-	//echo "{$file}\n";
-	// Ignore "." and ".." folders
-	if (!in_array(substr($file, strrpos($file, '/')+1), array('.', '..'))) {
-		if (is_dir($file)) {
-			$zip->addEmptyDir($file);
-		} else if (is_file($file)) {
-			$zip->addFile($file);
-		}
-	}
-}
-
-if ($options['docker']) {
-	$tar->buildFromDirectory('./snappymail/', "@v/{$package->version}@");
-} else {
-	$tar->buildFromDirectory('./', "@snappymail/v/{$package->version}@");
-}
-
-$zip->addFile('data/.htaccess');
-$tar->addFile('data/.htaccess');
-
-$zip->addFromString('data/VERSION', $package->version);
-$tar->addFromString('data/VERSION', $package->version);
-
-$zip->addFile('data/README.md');
-$tar->addFile('data/README.md');
-
-if ($options['aur']) {
-	$data = '<?php
-function __get_custom_data_full_path()
-{
-	return \'/var/lib/snappymail\';
-}
-';
-	$zip->addFromString('include.php', $data);
-	$tar->addFromString('include.php', $data);
-} else {
-	$zip->addFile('_include.php');
-	$tar->addFile('_include.php');
-}
-
-$zip->addFile('.htaccess');
-$tar->addFile('.htaccess');
-
-$index = file_get_contents('index.php');
-$index = str_replace('0.0.0', $package->version, $index);
-$zip->addFromString('index.php', $index);
-$tar->addFromString('index.php', $index);
-
-$zip->addFile('README.md');
-$tar->addFile('README.md');
-
-$data = file_get_contents('dev/serviceworker.js');
-//$data = file_get_contents('snappymail/v/0.0.0/static/js/min/serviceworker.min.js');
-$zip->addFromString('serviceworker.js', $data);
-$tar->addFromString('serviceworker.js', $data);
-
-$zip->close();
-
-$tar->compress(Phar::GZ);
-unlink($tar_destination);
-$tar_destination .= '.gz';
-
-echo "{$zip_destination} created\n{$tar_destination} created\n";
-
-rename("snappymail/v/{$package->version}", 'snappymail/v/0.0.0');
-
-file_put_contents("{$destPath}core.json", '{
-	"version": "'.$package->version.'",
-	"file": "../latest.tar.gz",
-	"warnings": []
-}');
-
-// Arch User Repository
-if ($options['aur']) {
-	// extension_loaded('blake2')
-	if (!function_exists('b2sum') && $b2sum = trim(`which b2sum`)) {
-		function b2sum($file) {
-			$file = escapeshellarg($file);
-			exec("b2sum --binary {$file} 2>&1", $output, $exitcode);
-			$output = explode(' ', implode("\n", $output));
-			return $output[0];
-		}
-	}
-
-	$b2sums = function_exists('b2sum') ? [
-		b2sum($tar_destination),
-		b2sum(__DIR__ . '/build/arch/snappymail.sysusers'),
-		b2sum(__DIR__ . '/build/arch/snappymail.tmpfiles')
-	] : [];
-
-	file_put_contents('build/arch/.SRCINFO', 'pkgbase = snappymail
-	pkgdesc = modern PHP webmail client
-	pkgver = '.$package->version.'
-	pkgrel = 1
-	url = https://github.com/the-djmaze/snappymail
-	arch = any
-	license = AGPL3
-	makedepends = php
-	makedepends = nodejs
-	makedepends = yarn
-	makedepends = gulp
-	depends = php-fpm
-	optdepends = mariadb: storage backend for contacts
-	optdepends = php-pgsql: storage backend for contacts
-	optdepends = php-sqlite: storage backend for contacts
-	source = snappymail-'.$package->version.'.tar.gz::https://github.com/the-djmaze/snappymail/archive/v'.$package->version.'.tar.gz
-	source = snappymail.sysusers
-	source = snappymail.tmpfiles
-	b2sums = '.implode("\n	b2sums = ", $b2sums).'
-
-pkgname = snappymail
-');
-
-	$file = __DIR__ . '/build/arch/PKGBUILD';
-	if (is_file($file)) {
-		$PKGBUILD = file_get_contents($file);
-		$PKGBUILD = preg_replace('/pkgver=[0-9.]+/', "pkgver={$package->version}", $PKGBUILD);
-		$PKGBUILD = preg_replace('/b2sums=\\([^)]+\\)/s', "b2sums=('".implode("'\n        '", $b2sums)."')", $PKGBUILD);
-		file_put_contents($file, $PKGBUILD);
-	}
-}
-// Debian Repository
-else if (isset($options['debian'])) {
-	require(__DIR__ . '/build/deb.php');
-}
-// Docker build
-else if ($options['docker']) {
-	echo "\x1b[33;1m === Docker === \x1b[0m\n";
-	copy($zip_destination, "./.docker/release/snappymail-{$package->version}.zip");
-	if ($docker) {
-		passthru("{$docker} build " . __DIR__ . "/.docker/release/ --build-arg FILES_ZIP={$zip_destination} -t snappymail:{$package->version}");
-	} else {
-		echo "Docker not installed!\n";
-	}
-}
-
-if (isset($options['sign'])) {
-	echo "\x1b[33;1m === PGP Sign === \x1b[0m\n";
-	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($tar_destination), $return_var);
-	passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '.escapeshellarg($zip_destination), $return_var);
-	if (isset($options['debian'])) {
-		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --armor --detach-sign '
-			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/" . basename(DEB_DEST_DIR.'.deb')), $return_var);
-		// https://github.com/the-djmaze/snappymail/issues/185#issuecomment-1059420588
-		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 --clearsign --output '
-			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/InRelease") . ' '
-			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);
-		passthru('gpg --local-user 1016E47079145542F8BA133548208BA13290F3EB --digest-algo SHA512 -abs --output '
-			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/Release.gpg") . ' '
-			. escapeshellarg(__DIR__ . "/build/dist/releases/webmail/{$package->version}/Release"), $return_var);
-	}
-}
+require __DIR__ . '/cli/release.php';
diff --git a/rollup.config.js b/rollup.config.js
index 1a7af54f9..574df7b6f 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -46,7 +46,7 @@ let terserConfig = {
 	},
 	keep_classnames: true, // Required for AbstractModel and AbstractCollectionModel
 	compress:{
-		ecma: 6,
+		ecma: 2020,
 		drop_console: true
 /*
 		,hoist_props: false
diff --git a/snappymail/v/0.0.0/app/domains/default.ini b/snappymail/v/0.0.0/app/domains/default.ini
deleted file mode 100644
index 14af4b72a..000000000
--- a/snappymail/v/0.0.0/app/domains/default.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-imap_host = "localhost"
-imap_port = 143
-imap_secure = "None"
-imap_short_login = Off
-sieve_use = Off
-sieve_host = "localhost"
-sieve_port = 4190
-sieve_secure = "None"
-smtp_host = "localhost"
-smtp_port = 25
-smtp_secure = "None"
-smtp_short_login = Off
-smtp_auth = On
-smtp_set_sender = Off
-smtp_php_mail = Off
-white_list = ""
diff --git a/snappymail/v/0.0.0/app/domains/default.json b/snappymail/v/0.0.0/app/domains/default.json
new file mode 100644
index 000000000..291589eea
--- /dev/null
+++ b/snappymail/v/0.0.0/app/domains/default.json
@@ -0,0 +1,91 @@
+{
+    "IMAP": {
+        "host": "localhost",
+        "port": 143,
+        "type": 0,
+        "timeout": 300,
+        "shortLogin": false,
+        "lowerLogin": true,
+        "sasl": [
+            "SCRAM-SHA3-512",
+            "SCRAM-SHA-512",
+            "SCRAM-SHA-256",
+            "SCRAM-SHA-1",
+            "PLAIN",
+            "LOGIN"
+        ],
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        },
+        "disabled_capabilities": [
+            "METADATA",
+            "OBJECTID",
+            "PREVIEW",
+            "STATUS=SIZE"
+        ],
+        "use_expunge_all_on_delete": false,
+        "fast_simple_search": true,
+        "force_select": false,
+        "message_all_headers": false,
+        "message_list_limit": 10000,
+        "search_filter": ""
+    },
+    "SMTP": {
+        "host": "localhost",
+        "port": 25,
+        "type": 0,
+        "timeout": 60,
+        "shortLogin": false,
+        "lowerLogin": true,
+        "sasl": [
+            "SCRAM-SHA3-512",
+            "SCRAM-SHA-512",
+            "SCRAM-SHA-256",
+            "SCRAM-SHA-1",
+            "PLAIN",
+            "LOGIN"
+        ],
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        },
+        "useAuth": false,
+        "setSender": false,
+        "usePhpMail": false
+    },
+    "Sieve": {
+        "host": "localhost",
+        "port": 4190,
+        "type": 0,
+        "timeout": 10,
+        "shortLogin": false,
+        "lowerLogin": true,
+        "sasl": [
+            "SCRAM-SHA3-512",
+            "SCRAM-SHA-512",
+            "SCRAM-SHA-256",
+            "SCRAM-SHA-1",
+            "PLAIN",
+            "LOGIN"
+        ],
+        "ssl": {
+            "verify_peer": false,
+            "verify_peer_name": false,
+            "allow_self_signed": false,
+            "SNI_enabled": true,
+            "disable_compression": true,
+            "security_level": 1
+        },
+        "enabled": false
+    },
+    "whiteList": ""
+}
diff --git a/snappymail/v/0.0.0/app/domains/disabled b/snappymail/v/0.0.0/app/domains/disabled
index 0370511f7..c4d1d2143 100644
--- a/snappymail/v/0.0.0/app/domains/disabled
+++ b/snappymail/v/0.0.0/app/domains/disabled
@@ -1 +1,5 @@
-outlook.com,qq.com,yahoo.com
\ No newline at end of file
+outlook.com
+qq.com
+yahoo.com
+gmail.com
+hotmail.com
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
index 6ea389829..ebc35ba16 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Collection.php
@@ -25,10 +25,7 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		}
 	}
 
-	/**
-	 * @param mixed $mItem
-	 */
-	public function append($mItem, bool $bToTop = false) : void
+	public function append(mixed $mItem, bool $bToTop = false): void
 	{
 		if ($bToTop) {
 			$array = $this->getArrayCopy();
@@ -39,13 +36,18 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		}
 	}
 
-	public function Add($mItem, bool $bToTop = false) : self
+	public function keys(): array
+	{
+		return \array_keys($this->getArrayCopy());
+	}
+
+	public function Add($mItem, bool $bToTop = false): self
 	{
 		$this->append($mItem, $bToTop);
 		return $this;
 	}
 
-	public function Clear() : void
+	public function Clear(): void
 	{
 		$this->exchangeArray([]);
 	}
@@ -59,14 +61,14 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		return $callable($this->getArrayCopy(), ...$arguments);
 	}
 */
-	public function Slice(int $offset, int $length = null, bool $preserve_keys = false)
+	public function Slice(int $offset, ?int $length = null, bool $preserve_keys = false)/*: static*/
 	{
 		return new static(
 			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
 		);
 	}
 
-	public function Crop(int $length = null, int $offset = 0, bool $preserve_keys = false)
+	public function Crop(?int $length = null, int $offset = 0, bool $preserve_keys = false): self
 	{
 		$this->exchangeArray(
 			\array_slice($this->getArrayCopy(), $offset, $length, $preserve_keys)
@@ -74,7 +76,8 @@ abstract class Collection extends \ArrayObject implements \JsonSerializable
 		return $this;
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
 		$aNames = \explode('\\', \get_class($this));
 		return array(
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
index 6d642a188..74bb1cc25 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/DateTimeHelper.php
@@ -23,8 +23,7 @@ abstract class DateTimeHelper
 	public static function GetUtcTimeZoneObject() : \DateTimeZone
 	{
 		static $oDateTimeZone = null;
-		if (null === $oDateTimeZone)
-		{
+		if (null === $oDateTimeZone) {
 			$oDateTimeZone = new \DateTimeZone('UTC');
 		}
 		return $oDateTimeZone;
@@ -32,19 +31,45 @@ abstract class DateTimeHelper
 
 	/**
 	 * Parse date string formated as "Thu, 10 Jun 2010 08:58:33 -0700 (PDT)"
-	 * RFC 2822
+	 * https://www.rfc-editor.org/rfc/rfc2822#section-3.3
 	 */
 	public static function ParseRFC2822DateString(string $sDateTime) : int
 	{
 		$sDateTime = \trim($sDateTime);
-		if (empty($sDateTime))
-		{
+		if (empty($sDateTime)) {
+			\SnappyMail\Log::info('', "No RFC 2822 date to parse");
 			return 0;
 		}
 
-		$sDateTime = \trim(\preg_replace('/ \([a-zA-Z0-9]+\)$/', '', $sDateTime));
-		$oDateTime = \DateTime::createFromFormat(\DateTime::RFC2822, $sDateTime, static::GetUtcTimeZoneObject());
-		return $oDateTime ? $oDateTime->getTimestamp() : 0;
+		// Strip invalid data after zone, https://github.com/the-djmaze/snappymail/issues/1554
+		$sDateTime = \preg_replace('/\s+\([a-zA-Z0-9]+\)$/', '', $sDateTime);
+		// https://github.com/the-djmaze/snappymail/issues/1694#issuecomment-2270983942
+		// Strip day-of-week
+		$sDateTime = \preg_replace('/^[^,]+,/', '', $sDateTime);
+		// Add optional seconds
+		$sDateTime = \preg_replace('/ ([0-9]+:[0-9]+) /', ' $1:00 ', $sDateTime);
+		$sDateTime = \trim($sDateTime);
+		$oDateTime =
+			// Using O (difference to Greenwich time (GMT) without colon between hours and minutes)
+			\DateTime::createFromFormat('d M Y H:i:s O', $sDateTime, static::GetUtcTimeZoneObject())
+			// Using T (obsolete timezone abbreviation)
+			?: \DateTime::createFromFormat('d M Y H:i:s T', $sDateTime, static::GetUtcTimeZoneObject());
+
+		try {
+			$timestamp = $oDateTime->getTimestamp();
+
+			// 398045302 is 1982-08-13 00:08:22, the date RFC 822 was created
+			if (398045302 > $timestamp) {
+				\SnappyMail\Log::notice('', "Failed to parse RFC 2822 date '{$sDateTime}'");
+				return 0;
+			}
+
+			return $timestamp;
+		} catch (\Throwable $error) {
+			// Catch integer overflow or other fatal errors
+			\SnappyMail\Log::notice('', "Failed to parse RFC 2822 date '{$sDateTime}'. {$error->getMessage()}");
+			return 0;
+		}
 	}
 
 	/**
@@ -54,13 +79,12 @@ abstract class DateTimeHelper
 	public static function ParseInternalDateString(string $sDateTime) : int
 	{
 		$sDateTime = \trim($sDateTime);
-		if (empty($sDateTime))
-		{
+		if (empty($sDateTime)) {
 			return 0;
 		}
 
-		if (\preg_match('/^[a-z]{2,4}, /i', $sDateTime)) // RFC2822 ~ "Thu, 10 Jun 2010 08:58:33 -0700 (PDT)"
-		{
+		// RFC2822 ~ "Thu, 10 Jun 2010 08:58:33 -0700 (PDT)"
+		if (\preg_match('/^[a-z]{2,4}, /i', $sDateTime)) {
 			return static::ParseRFC2822DateString($sDateTime);
 		}
 
@@ -74,8 +98,7 @@ abstract class DateTimeHelper
 	public static function ParseDateStringType1(string $sDateTime) : int
 	{
 		$sDateTime = \trim($sDateTime);
-		if (empty($sDateTime))
-		{
+		if (empty($sDateTime)) {
 			return 0;
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Encoding.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Encoding.php
index ad9dc20b8..017744eab 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Encoding.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Enumerations/Encoding.php
@@ -21,7 +21,6 @@ abstract class Encoding
 	const QUOTED_PRINTABLE_LOWER = 'quoted-printable';
 	const QUOTED_PRINTABLE_SHORT = 'Q';
 
-	const BASE64 = 'Base64';
 	const BASE64_LOWER = 'base64';
 	const BASE64_SHORT = 'B';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/InvalidArgumentException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/InvalidArgumentException.php
deleted file mode 100644
index a366b6395..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/InvalidArgumentException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Base\Exceptions;
-
-/**
- * @category MailSo
- * @package Base
- * @subpackage Exceptions
- */
-class InvalidArgumentException extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
index 5bb1cd726..0300d6c48 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/HtmlUtils.php
@@ -22,16 +22,12 @@ abstract class HtmlUtils
 	 */
 	public static function BuildHtml(string $sHtml, array &$aFoundCids, array &$aFoundDataURL, array &$aFoundContentLocationUrls) : string
 	{
-		$bState = true;
-		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
-		{
-			$bState = \libxml_use_internal_errors(true);
-		}
+		$bState = \libxml_use_internal_errors(true);
 
 		$sHtml = \str_replace('<o:p></o:p>', '', $sHtml);
 		$sHtml = \str_replace('<o:p>', '<span>', $sHtml);
 		$sHtml = \str_replace('</o:p>', '</span>', $sHtml);
-
+/*
 		if (\function_exists('tidy_repair_string')) {
 			# http://tidy.sourceforge.net/docs/quickref.html
 			$tidyConfig = array(
@@ -44,7 +40,7 @@ abstract class HtmlUtils
 			);
 			$sHtml = \tidy_repair_string($sHtml, $tidyConfig, 'utf8');
 		}
-
+*/
 		$sHtml = \preg_replace(array(
 			'/<p[^>]*><\/p>/i',
 			'/<!doctype[^>]*>/i',
@@ -86,101 +82,72 @@ abstract class HtmlUtils
 
 		$oDoc->normalizeDocument();
 
-		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_clear_errors'))
-		{
+		if (\MailSo\Base\Utils::FunctionCallable('libxml_clear_errors')) {
 			\libxml_clear_errors();
 		}
 
-		if (\MailSo\Base\Utils::FunctionExistsAndEnabled('libxml_use_internal_errors'))
-		{
-			\libxml_use_internal_errors($bState);
-		}
+		\libxml_use_internal_errors($bState);
 
 		$sHtml = '';
 		$oBody = $oDoc->getElementsByTagName('body')->item(0);
 
 		$aRemoveTags = array(
-			'svg', 'link', 'base', 'meta', 'title', 'x-script', 'script', 'bgsound', 'keygen', 'source',
+			'svg', 'link', 'base', 'meta', 'title', 'script', 'bgsound', 'keygen', 'source',
 			'object', 'embed', 'applet', 'mocha', 'iframe', 'frame', 'frameset', 'video', 'audio', 'area', 'map',
 			'head', 'style'
 		);
-
-		$aRemove = array();
-
-		$aNodes = $oBody->getElementsByTagName('*');
-		foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement)
-		{
-			$sTagNameLower = \strtolower($oElement->tagName);
-
-			if (\in_array($sTagNameLower, $aRemoveTags))
-			{
-				$aRemove[] = @$oElement;
-				continue;
-			}
-
-			if ($oElement->hasAttribute('data-x-src-cid'))
-			{
-				$sCid = $oElement->getAttribute('data-x-src-cid');
-				$oElement->removeAttribute('data-x-src-cid');
-
-				if (!empty($sCid))
-				{
-					$aFoundCids[] = $sCid;
-
-					@$oElement->removeAttribute('src');
-					$oElement->setAttribute('src', 'cid:'.$sCid);
+		foreach ($aRemoveTags as $name) {
+			$aNodes = $oBody->getElementsByTagName($name);
+			foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
+				if (isset($oElement->parentNode)) {
+					@$oElement->parentNode->removeChild($oElement);
 				}
 			}
+		}
 
-			if ($oElement->hasAttribute('data-x-src-location'))
-			{
-				$sSrc = $oElement->getAttribute('data-x-src-location');
-				$oElement->removeAttribute('data-x-src-location');
+		$xpath = new \DomXpath($oDoc);
 
-				if (!empty($sSrc))
-				{
-					$aFoundContentLocationUrls[] = $sSrc;
-
-					@$oElement->removeAttribute('src');
-					$oElement->setAttribute('src', $sSrc);
-				}
+		foreach ($xpath->query('//*[@data-x-src-broken]') as $oElement) {
+			if (isset($oElement->parentNode)) {
+				@$oElement->parentNode->removeChild($oElement);
 			}
+		}
 
-			if ($oElement->hasAttribute('data-x-broken-src'))
-			{
-				$oElement->setAttribute('src', $oElement->getAttribute('data-x-broken-src'));
-				$oElement->removeAttribute('data-x-broken-src');
+		foreach ($xpath->query('//*[@data-x-src-hidden]') as $oElement) {
+			if (isset($oElement->parentNode)) {
+				@$oElement->parentNode->removeChild($oElement);
 			}
+		}
 
-			if ($oElement->hasAttribute('data-x-src'))
-			{
-				$oElement->setAttribute('src', $oElement->getAttribute('data-x-src'));
-				$oElement->removeAttribute('data-x-src');
+		foreach ($xpath->query('//*[@data-x-src-cid]') as $oElement) {
+			$sCid = $oElement->getAttribute('data-x-src-cid');
+			$oElement->removeAttribute('data-x-src-cid');
+			if (!empty($sCid)) {
+				$aFoundCids[] = $sCid;
+				$oElement->setAttribute('src', 'cid:'.$sCid);
 			}
+		}
 
-			// style attribute images
-			$aCid = array();
-			if ($oElement->hasAttribute('data-x-style-cid')) {
-				$aCid = \json_decode($oElement->getAttribute('data-x-style-cid'), true);
-				$oElement->removeAttribute('data-x-style-cid');
-			}
-			if ($oElement->hasAttribute('data-x-style-url')) {
-				$aCid = \array_merge($aCid, \json_decode($oElement->getAttribute('data-x-style-url'), true));
-				$oElement->removeAttribute('data-x-style-url');
-			}
+		foreach ($xpath->query('//*[@data-x-src]') as $oElement) {
+			$oElement->setAttribute('src', $oElement->getAttribute('data-x-src'));
+			$oElement->removeAttribute('data-x-src');
+		}
+
+		// style attribute images
+		foreach ($xpath->query('//*[@data-x-style-url]') as $oElement) {
+			$aCid = \json_decode($oElement->getAttribute('data-x-style-url'), true);
+			$oElement->removeAttribute('data-x-style-url');
 			if ($aCid) {
 				foreach ($aCid as $sCidName => $sCid) {
 					$sCidName = \strtolower(\preg_replace('/([A-Z])/', '-\1', $sCidName));
-					if (\in_array($sCidName, array('background-image', 'list-style-image', 'content')))
-					{
+					if (\in_array($sCidName, array('background-image', 'list-style-image', 'content'))) {
 						$sStyles = $oElement->hasAttribute('style')
 							? \trim(\trim($oElement->getAttribute('style')), ';')
 							: '';
 
 						$sBack = $sCidName.':url(cid:'.$sCid.')';
 						$sStyles = \preg_replace('/'.\preg_quote($sCidName).'\\s*:\\s*[^;]+/i', $sBack, $sStyles);
-						if (false === \strpos($sStyles, $sBack))
-						{
+						if (false === \strpos($sStyles, $sBack)) {
 							$sStyles .= ";{$sBack}";
 						}
 
@@ -189,35 +156,35 @@ abstract class HtmlUtils
 					}
 				}
 			}
+		}
 
-			// Remove all remaining data-* attributes
+		// Remove all remaining data-* attributes
+		foreach ($xpath->query('//*[@*[starts-with(name(), "data-")]]') as $oElement) {
 			if ($oElement->hasAttributes()) {
+				// DOMNamedNodeMap is live: removing the attribute the foreach is
+				// currently on ends the iteration, so exactly one data-* was
+				// removed per element however many it carried. Collect the
+				// names first, then remove.
+				$aNames = [];
 				foreach ($oElement->attributes as $oAttr) {
-					if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5))
-					{
-						$oElement->removeAttribute($oAttr->nodeName);
+					if ('data-' === \substr(\strtolower($oAttr->nodeName), 0, 5)) {
+						$aNames[] = $oAttr->nodeName;
 					}
 				}
-			}
-
-			if ('img' === $sTagNameLower)
-			{
-				$sSrc = $oElement->getAttribute('src');
-				if ('data:image/' === \strtolower(\substr($sSrc, 0, 11)))
-				{
-					$sHash = \md5($sSrc);
-					$aFoundDataURL[$sHash] = $sSrc;
-
-					$oElement->setAttribute('src', 'cid:'.$sHash);
+				foreach ($aNames as $sName) {
+					$oElement->removeAttribute($sName);
 				}
 			}
 		}
 
-		foreach ($aRemove as /* @var $oElement \DOMElement */ $oElement)
-		{
-			if (isset($oElement->parentNode))
-			{
-				@$oElement->parentNode->removeChild($oElement);
+		$sIdRight = \md5(\microtime());
+		$aNodes = $oBody->getElementsByTagName('img');
+		foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement) {
+			$sSrc = $oElement->getAttribute('src');
+			if ('data:image/' === \strtolower(\substr($sSrc, 0, 11))) {
+				$sHash = \md5($sSrc) . '@' . $sIdRight;
+				$aFoundDataURL[$sHash] = $sSrc;
+				$oElement->setAttribute('src', 'cid:'.$sHash);
 			}
 		}
 
@@ -225,87 +192,6 @@ abstract class HtmlUtils
 			. $oDoc->saveHTML($oBody) . '</html>';
 	}
 
-	public static function ConvertPlainToHtml(string $sText, bool $bLinksWithTargetBlank = true) : string
-	{
-		$sText = \trim($sText);
-		if (!\strlen($sText))
-		{
-			return '';
-		}
-
-		$sText = (new \MailSo\Base\LinkFinder)
-			->Text($sText)
-			->UseDefaultWrappers($bLinksWithTargetBlank)
-			->CompileText()
-		;
-
-		$sText = \str_replace("\r", '', $sText);
-
-		$aText = \explode("\n", $sText);
-		unset($sText);
-
-		$bIn = false;
-		$bDo = true;
-		do
-		{
-			$bDo = false;
-			$aNextText = array();
-			foreach ($aText as $sTextLine)
-			{
-				$bStart = 0 === \strpos(\ltrim($sTextLine), '&gt;');
-				if ($bStart && !$bIn)
-				{
-					$bDo = true;
-					$bIn = true;
-					$aNextText[] = '<blockquote>';
-					$aNextText[] = \substr(\ltrim($sTextLine), 4);
-				}
-				else if (!$bStart && $bIn)
-				{
-					$bIn = false;
-					$aNextText[] = '</blockquote>';
-					$aNextText[] = $sTextLine;
-				}
-				else if ($bStart && $bIn)
-				{
-					$aNextText[] = \substr(\ltrim($sTextLine), 4);
-				}
-				else
-				{
-					$aNextText[] = $sTextLine;
-				}
-			}
-
-			if ($bIn)
-			{
-				$bIn = false;
-				$aNextText[] = '</blockquote>';
-			}
-
-			$aText = $aNextText;
-		}
-		while ($bDo);
-
-		$sText = \join("\n", $aText);
-		unset($aText);
-
-		$sText = \preg_replace('/[\n][ ]+/', "\n", $sText);
-//		$sText = \preg_replace('/[\s]+([\s])/', '\\1', $sText);
-
-		$sText = \preg_replace('/<blockquote>[\s]+/i', '<blockquote>', $sText);
-		$sText = \preg_replace('/[\s]+<\/blockquote>/i', '</blockquote>', $sText);
-
-		$sText = \preg_replace('/<\/blockquote>([\n]{0,2})<blockquote>/i', '\\1', $sText);
-		$sText = \preg_replace('/[\n]{3,}/', "\n\n", $sText);
-
-		$sText = \strtr($sText, array(
-			"\t" => "\xC2\xA0\xC2\xA0\xC2\xA0\xC2\xA0",
-			'  ' => "\xC2\xA0\xC2\xA0"
-		));
-
-		return \nl2br($sText);
-	}
-
 	public static function ConvertHtmlToPlain(string $sText) : string
 	{
 		$sText = \MailSo\Base\Utils::StripSpaces($sText);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
index 53c0388db..b4d79017f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Http.php
@@ -23,27 +23,21 @@ class Http
 	public static function SingletonInstance() : self
 	{
 		static $oInstance = null;
-		if (null === $oInstance)
-		{
+		if (null === $oInstance) {
 			$oInstance = new self;
 		}
 
 		return $oInstance;
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	public function GetServer(string $sKey, $mDefault = null)
+	public static function GetServer(string $sKey, mixed $mDefault = null): mixed
 	{
 		return isset($_SERVER[$sKey]) ? $_SERVER[$sKey] : $mDefault;
 	}
 
 	public function GetMethod() : string
 	{
-		return $this->GetServer('REQUEST_METHOD', '');
+		return static::GetServer('REQUEST_METHOD', '');
 	}
 
 	public function IsPost() : bool
@@ -65,9 +59,8 @@ class Http
 
 	public function IsLocalhost(string $sValueToCheck = '') : bool
 	{
-		if (empty($sValueToCheck))
-		{
-			$sValueToCheck = $this->GetServer('REMOTE_ADDR', '');
+		if (empty($sValueToCheck)) {
+			$sValueToCheck = static::GetServer('REMOTE_ADDR', '');
 		}
 
 		return $this->CheckLocalhost($sValueToCheck);
@@ -76,29 +69,23 @@ class Http
 	public function GetRawBody() : string
 	{
 		static $sRawBody = null;
-		if (null === $sRawBody)
-		{
+		if (null === $sRawBody) {
 			$sBody = \file_get_contents('php://input');
 			$sRawBody = (false !== $sBody) ? $sBody : '';
 		}
 		return $sRawBody;
 	}
 
-	public function GetHeader(string $sHeader) : string
+	public static function GetHeader(string $sHeader) : string
 	{
 		$sServerKey = 'HTTP_'.\strtoupper(\str_replace('-', '_', $sHeader));
-		$sResultHeader = $this->GetServer($sServerKey, '');
-
-		if (0 === \strlen($sResultHeader) &&
-			\MailSo\Base\Utils::FunctionExistsAndEnabled('apache_request_headers'))
-		{
+		$sResultHeader = static::GetServer($sServerKey, '');
+		if (!\strlen($sResultHeader) && Utils::FunctionCallable('apache_request_headers')) {
 			$sHeaders = \apache_request_headers();
-			if (isset($sHeaders[$sHeader]))
-			{
+			if (isset($sHeaders[$sHeader])) {
 				$sResultHeader = $sHeaders[$sHeader];
 			}
 		}
-
 		return $sResultHeader;
 	}
 
@@ -109,155 +96,127 @@ class Http
 
 	public function IsSecure(bool $bCheckProxy = true) : bool
 	{
-		$sHttps = \strtolower($this->GetServer('HTTPS', ''));
-		if ('on' === $sHttps || ('' === $sHttps && '443' === (string) $this->GetServer('SERVER_PORT', '')))
-		{
-			return true;
-		}
-
-		if ($bCheckProxy && (
-			('https' === \strtolower($this->GetServer('HTTP_X_FORWARDED_PROTO', ''))) ||
-			('on' === \strtolower($this->GetServer('HTTP_X_FORWARDED_SSL', '')))
-		))
-		{
-			return true;
-		}
-
-		return false;
+		$sHttps = \strtolower(static::GetServer('HTTPS', ''));
+		return ('on' === $sHttps || ('' === $sHttps && '443' === (string) static::GetServer('SERVER_PORT', '')))
+		 || ($bCheckProxy && (
+			('https' === \strtolower(static::GetServer('HTTP_X_FORWARDED_PROTO', ''))) ||
+			('on' === \strtolower(static::GetServer('HTTP_X_FORWARDED_SSL', '')))
+		   ));
 	}
 
-	public function GetHost(bool $bWithRemoteUserData = false, bool $bWithoutWWW = true, bool $bWithoutPort = false) : string
+	public function GetHost(bool $bWithoutWWW = true, bool $bWithoutPort = false) : string
 	{
-		$sHost = $this->GetServer('HTTP_HOST', '');
-		if (0 === \strlen($sHost))
-		{
-			$sName = $this->GetServer('SERVER_NAME');
-			$iPort = (int) $this->GetServer('SERVER_PORT', 80);
-
+		$sHost = static::GetServer('HTTP_HOST', '');
+		if (!\strlen($sHost)) {
+			$sName = static::GetServer('SERVER_NAME', '');
+			$iPort = (int) static::GetServer('SERVER_PORT', 80);
 			$sHost = (\in_array($iPort, array(80, 433))) ? $sName : $sName.':'.$iPort;
 		}
 
-		if ($bWithoutWWW)
-		{
-			$sHost = 'www.' === \substr(\strtolower($sHost), 0, 4) ? \substr($sHost, 4) : $sHost;
+		if ($bWithoutWWW && \str_starts_with($sHost, 'www.')) {
+			$sHost = \substr($sHost, 4);
 		}
 
-		if ($bWithRemoteUserData)
-		{
-			$sUser = \trim($this->GetServer('REMOTE_USER', ''));
-			$sHost = (\strlen($sUser) ? $sUser.'@' : '').$sHost;
-		}
-
-		if ($bWithoutPort)
-		{
-			$sHost = \preg_replace('/:[\d]+$/', '', $sHost);
-		}
-
-		return $sHost;
+		return $bWithoutPort ? \preg_replace('/:\d+$/', '', $sHost) : $sHost;
 	}
 
 	public function GetClientIp(bool $bCheckProxy = false) : string
 	{
-		$sIp = '';
-		if ($bCheckProxy && null !== $this->GetServer('HTTP_CLIENT_IP', null))
-		{
-			$sIp = $this->GetServer('HTTP_CLIENT_IP', '');
+		if ($bCheckProxy && null !== static::GetServer('HTTP_CLIENT_IP', null)) {
+			return static::GetServer('HTTP_CLIENT_IP', '');
 		}
-		else if ($bCheckProxy && null !== $this->GetServer('HTTP_X_FORWARDED_FOR', null))
-		{
-			$sIp = $this->GetServer('HTTP_X_FORWARDED_FOR', '');
+		if ($bCheckProxy && null !== static::GetServer('HTTP_X_FORWARDED_FOR', null)) {
+			return static::GetServer('HTTP_X_FORWARDED_FOR', '');
 		}
-		else
-		{
-			$sIp = $this->GetServer('REMOTE_ADDR', '');
-		}
-
-		return $sIp;
+		return static::GetServer('REMOTE_ADDR', '');
 	}
 
-	public function ServerNotModifiedCache(int $iExpireTime, bool $bSetCacheHeader = true, string $sEtag = '') : bool
+	public static function checkETag(string $ETag) : void
 	{
-		$bResult = false;
-		if (0 < $iExpireTime)
-		{
-			$iUtcTimeStamp = \time();
-			$sIfModifiedSince = $this->GetHeader('If-Modified-Since', '');
-			if (0 === \strlen($sIfModifiedSince))
-			{
-				if ($bSetCacheHeader)
-				{
-					\header('Cache-Control: public');
-					\header('Pragma: public');
-					\header('Last-Modified: '.\gmdate('D, d M Y H:i:s', $iUtcTimeStamp - $iExpireTime).' UTC');
-					\header('Expires: '.\gmdate('D, j M Y H:i:s', $iUtcTimeStamp + $iExpireTime).' UTC');
-
-					if (\strlen($sEtag))
-					{
-						\header('Etag: '.$sEtag);
-					}
-				}
-			}
-			else
-			{
-				static::StatusHeader(304);
-				$bResult = true;
-			}
+		// $ETag . APP_VERSION
+		$sIfNoneMatch = static::GetHeader('If-None-Match');
+		if ($sIfNoneMatch && false !== \strpos($sIfNoneMatch, $ETag)) {
+			static::StatusHeader(304);
+			exit;
+		}
+		$sIfMatch = static::GetHeader('If-Match');
+		if ($sIfMatch && false === \strpos($sIfMatch, $ETag)) {
+			static::StatusHeader(412);
+			exit;
 		}
-
-		return $bResult;
 	}
 
-	/**
-	 * @staticvar boolean $bCache
-	 */
+	public static function setETag(string $ETag) : void
+	{
+		// $ETag . APP_VERSION
+		static::checkETag($ETag);
+		\header("ETag: \"{$ETag}\"");
+	}
+
+	public static function checkLastModified(int $mtime) : void
+	{
+		$sIfModifiedSince = static::GetHeader('If-Modified-Since');
+		if ($sIfModifiedSince && $mtime <= \strtotime($sIfModifiedSince)) {
+			static::StatusHeader(304);
+			exit;
+		}
+		$sIfUnmodifiedSince = static::GetHeader('If-Unmodified-Since');
+		if ($sIfUnmodifiedSince && $mtime > \strtotime($sIfUnmodifiedSince)) {
+			static::StatusHeader(412);
+			exit;
+		}
+	}
+
+	public static function setLastModified(int $mtime) : void
+	{
+		static::checkLastModified($mtime);
+		\header('Last-Modified: '.\gmdate('D, d M Y H:i:s \G\M\T', $mtime)); # DATE_RFC1123
+	}
+
+	private static $bCache = false;
+
 	public function ServerNoCache()
 	{
-		static $bCache = false;
-		if (false === $bCache)
-		{
-			$bCache = true;
+		if (!static::$bCache) {
+			static::$bCache = true;
 			\header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
 			\header('Last-Modified: '.\gmdate('D, d M Y H:i:s').' GMT');
-			\header('Cache-Control: no-store, no-cache, must-revalidate, max-age=0, post-check=0, pre-check=0');
+			\header('Cache-Control: no-store');
 			\header('Pragma: no-cache');
 		}
 	}
 
-	/**
-	 * @staticvar boolean $bCache
-	 */
-	public function ServerUseCache(string $sEtag, int $iLastModified, int $iExpires)
+	public static function ServerUseCache(string $sEtag = '', int $iLastModified = 0, int $iExpires = 0) : void
 	{
-		static $bCache = false;
-		if (false === $bCache)
-		{
-			$bCache = true;
+		if (!static::$bCache) {
+			static::$bCache = true;
 			\header('Cache-Control: private');
-			\header('ETag: '.$sEtag);
-			\header('Last-Modified: '.\gmdate('D, d M Y H:i:s', $iLastModified).' UTC');
-			\header('Expires: '.\gmdate('D, j M Y H:i:s', $iExpires).' UTC');
+			$iExpires && \header('Expires: '.\gmdate('D, j M Y H:i:s', \time() + $iExpires).' UTC');
+			$sEtag && static::setETag($sEtag);
+			$iLastModified && static::setLastModified($iLastModified);
 		}
 	}
 
 	public static function StatusHeader(int $iStatus, string $sCustomStatusText = '') : void
 	{
-		if (99 < $iStatus)
-		{
+		if (99 < $iStatus) {
 			$aStatus = array(
 				200 => 'OK',
 				206 => 'Partial Content',
 				301 => 'Moved Permanently',
+				302 => 'Found',
 				304 => 'Not Modified',
 				400 => 'Bad Request',
 				401 => 'Unauthorized',
 				403 => 'Forbidden',
 				404 => 'Not Found',
 				405 => 'Method Not Allowed',
+				412 => 'Precondition Failed',
 				416 => 'Requested range not satisfiable',
 				500 => 'Internal Server Error'
 			);
 
-			$sHeaderText = (0 === \strlen($sCustomStatusText) && isset($aStatus[$iStatus]) ? $aStatus[$iStatus] : $sCustomStatusText);
+			$sHeaderText = (!\strlen($sCustomStatusText) && isset($aStatus[$iStatus]) ? $aStatus[$iStatus] : $sCustomStatusText);
 
 			\http_response_code($iStatus);
 			if (isset($_SERVER['SERVER_PROTOCOL'])) {
@@ -269,9 +228,34 @@ class Http
 		}
 	}
 
+	public static function Location(string $sUrl, int $iStatus = 302): void
+	{
+		static::StatusHeader($iStatus);
+		\header('Location: ' . $sUrl);
+	}
+
+	public static function setContentDisposition(string $type /* inline|attachment */, array $params)
+	{
+		$parms = array($type);
+		if (isset($params['filename'])) {
+			if (\preg_match('#^[\x01-\x7F]*$#D', $params['filename'])) {
+				$parms[] = "filename=\"{$params['filename']}\"";
+			} else {
+				// RFC 5987
+//				$parms[] = Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut);
+				$parms[] = "filename*=utf-8''" . \rawurlencode($params['filename']);
+			}
+		}
+		if (isset($params['creation-date'])) $parms[] = 'creation-date=' . \date(DATE_RFC822, $params['creation-date']);
+		if (isset($params['modification-date'])) $parms[] = 'modification-date=' . \date(DATE_RFC822, $params['modification-date']);
+		if (isset($params['read-date'])) $parms[] = 'read-date=' . \date(DATE_RFC822, $params['read-date']);
+		if (isset($params['size'])) $parms[] = 'size=' . \intval($params['size']);
+		\header('Content-Disposition: ' . \implode('; ', $parms));
+	}
+
 	public function GetPath() : string
 	{
-		$sUrl = \ltrim(\substr($this->GetServer('SCRIPT_NAME', ''), 0, \strrpos($this->GetServer('SCRIPT_NAME', ''), '/')), '/');
+		$sUrl = \ltrim(\substr(static::GetServer('SCRIPT_NAME', ''), 0, \strrpos(static::GetServer('SCRIPT_NAME', ''), '/')), '/');
 		return '' === $sUrl ? '/' : '/'.$sUrl.'/';
 	}
 
@@ -282,6 +266,6 @@ class Http
 
 	public function GetFullUrl() : string
 	{
-		return $this->GetScheme().'://'.$this->GetHost(true, false).$this->GetPath();
+		return $this->GetScheme().'://'.$this->GetHost(false).$this->GetPath();
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php
deleted file mode 100644
index d6286eb87..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/LinkFinder.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Base;
-
-/**
- * @category MailSo
- * @package Base
- */
-class LinkFinder
-{
-	/**
-	 * @const
-	 */
-	const OPEN_LINK = '@#@link{';
-	const CLOSE_LINK = '}link@#@';
-
-	/**
-	 * @var array
-	 */
-	private $aPrepearPlainStringUrls;
-
-	/**
-	 * @var string
-	 */
-	private $sText;
-
-	/**
-	 * @var mixed
-	 */
-	private $fLinkWrapper;
-
-	/**
-	 * @var int
-	 */
-	private $iHtmlSpecialCharsFlags;
-
-	/**
-	 * @var mixed
-	 */
-	private $fMailWrapper;
-
-	/**
-	 * @var int
-	 */
-	private $iOptimizationLimit;
-
-	function __construct()
-	{
-		$this->iHtmlSpecialCharsFlags = (\defined('ENT_QUOTES') && \defined('ENT_SUBSTITUTE') && \defined('ENT_HTML401'))
-			? ENT_QUOTES | ENT_SUBSTITUTE | ENT_HTML401 : ENT_QUOTES;
-
-		if (\defined('ENT_IGNORE'))
-		{
-			$this->iHtmlSpecialCharsFlags |= ENT_IGNORE;
-		}
-
-		$this->iOptimizationLimit = 300000;
-
-		$this->Clear();
-	}
-
-	public function Clear() : self
-	{
-		$this->aPrepearPlainStringUrls = array();
-		$this->fLinkWrapper = null;
-		$this->fMailWrapper = null;
-		$this->sText = '';
-
-		return $this;
-	}
-
-	public function Text(string $sText) : self
-	{
-		$this->sText = $sText;
-
-		return $this;
-	}
-
-	/**
-	 * @param mixed $fLinkWrapper
-	 */
-	public function LinkWrapper($fLinkWrapper) : self
-	{
-		$this->fLinkWrapper = $fLinkWrapper;
-
-		return $this;
-	}
-
-	/**
-	 * @param mixed $fMailWrapper
-	 */
-	public function MailWrapper($fMailWrapper) : self
-	{
-		$this->fMailWrapper = $fMailWrapper;
-
-		return $this;
-	}
-
-	public function UseDefaultWrappers(bool $bAddTargetBlank = false) : self
-	{
-		$this->fLinkWrapper = function ($sLink) use ($bAddTargetBlank) {
-
-			$sNameLink = $sLink;
-			if (!\preg_match('/^[a-z]{3,5}\:\/\//i', \ltrim($sLink)))
-			{
-				$sLink = 'https://'.\ltrim($sLink);
-			}
-
-			return '<a '.($bAddTargetBlank ? 'target="_blank" ': '').'href="'.$sLink.'">'.$sNameLink.'</a>';
-		};
-
-		$this->fMailWrapper = function ($sEmail) use ($bAddTargetBlank) {
-			return '<a '.($bAddTargetBlank ? 'target="_blank" ': '').'href="mailto:'.$sEmail.'">'.$sEmail.'</a>';
-		};
-
-		return $this;
-	}
-
-	public function CompileText(bool $bUseHtmlSpecialChars = true) : string
-	{
-		$sText = \substr($this->sText, 0, $this->iOptimizationLimit);
-		$sSubText = \substr($this->sText, $this->iOptimizationLimit);
-
-		$this->aPrepearPlainStringUrls = array();
-		if (null !== $this->fLinkWrapper && \is_callable($this->fLinkWrapper))
-		{
-			$sText = $this->findLinks($sText, $this->fLinkWrapper);
-		}
-
-		if (null !== $this->fMailWrapper && \is_callable($this->fMailWrapper))
-		{
-			$sText = $this->findMails($sText, $this->fMailWrapper);
-		}
-
-		$sResult = '';
-		if ($bUseHtmlSpecialChars)
-		{
-			$sResult = \htmlentities($sText.$sSubText, $this->iHtmlSpecialCharsFlags, 'UTF-8');
-		}
-		else
-		{
-			$sResult = $sText.$sSubText;
-		}
-
-		unset($sText, $sSubText);
-
-		if (\count($this->aPrepearPlainStringUrls))
-		{
-			$aPrepearPlainStringUrls = $this->aPrepearPlainStringUrls;
-			$sResult = \preg_replace_callback('/'.\preg_quote(static::OPEN_LINK, '/').
-				'([\d]+)'.\preg_quote(static::CLOSE_LINK, '/').'/',
-					function ($aMatches) use ($aPrepearPlainStringUrls) {
-						$iIndex = (int) $aMatches[1];
-						return isset($aPrepearPlainStringUrls[$iIndex]) ? $aPrepearPlainStringUrls[$iIndex] : '';
-					}, $sResult);
-
-			$this->aPrepearPlainStringUrls = array();
-		}
-
-		return $sResult;
-	}
-
-	/**
-	 * @param mixed $fWrapper
-	 */
-	private function findLinks(string $sText, $fWrapper) : string
-	{
-		$sPattern = '/([\W]|^)((?:https?:\/\/)|(?:svn:\/\/)|(?:git:\/\/)|(?:s?ftps?:\/\/)|(?:www\.))'.
-			'((\S+?)(\\/)?)((?:&gt;)?|[^\w\=\\/;\(\)\[\]]*?)(?=<|\s|$)/imu';
-
-		$aPrepearPlainStringUrls = $this->aPrepearPlainStringUrls;
-		$sText = \preg_replace_callback($sPattern, function ($aMatch) use ($fWrapper, &$aPrepearPlainStringUrls) {
-
-			if (\is_array($aMatch) && 6 < \count($aMatch))
-			{
-				while (\in_array($sChar = \substr($aMatch[3], -1), array(']', ')')))
-				{
-					if (\substr_count($aMatch[3], ']' === $sChar ? '[': '(') - \substr_count($aMatch[3], $sChar) < 0)
-					{
-						$aMatch[3] = \substr($aMatch[3], 0, -1);
-						$aMatch[6] = (']' === $sChar ? ']': ')').$aMatch[6];
-					}
-					else
-					{
-						break;
-					}
-				}
-
-				$sLinkWithWrap = $fWrapper($aMatch[2].$aMatch[3]);
-				if (\is_string($sLinkWithWrap) && \strlen($sLinkWithWrap))
-				{
-					$aPrepearPlainStringUrls[] = \stripslashes($sLinkWithWrap);
-					return $aMatch[1].
-						static::OPEN_LINK.
-						(\count($aPrepearPlainStringUrls) - 1).
-						static::CLOSE_LINK.
-						$aMatch[6];
-				}
-
-				return $aMatch[0];
-			}
-
-			return '';
-
-		}, $sText);
-
-		if (\count($aPrepearPlainStringUrls))
-		{
-			$this->aPrepearPlainStringUrls = $aPrepearPlainStringUrls;
-		}
-
-		return $sText;
-	}
-
-	/**
-	 * @param mixed $fWrapper
-	 */
-	private function findMails(string $sText, $fWrapper) : string
-	{
-		$sPattern = '/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/';
-
-		$aPrepearPlainStringUrls = $this->aPrepearPlainStringUrls;
-		$sText = \preg_replace_callback($sPattern, function ($aMatch) use ($fWrapper, &$aPrepearPlainStringUrls) {
-
-			if (\is_array($aMatch) && isset($aMatch[1]))
-			{
-				$sMailWithWrap = $fWrapper($aMatch[1]);
-				if (\is_string($sMailWithWrap) && \strlen($sMailWithWrap))
-				{
-					$aPrepearPlainStringUrls[] = \stripslashes($sMailWithWrap);
-					return static::OPEN_LINK.
-						(\count($aPrepearPlainStringUrls) - 1).
-						static::CLOSE_LINK;
-				}
-
-				return $aMatch[1];
-			}
-
-			return '';
-
-		}, $sText);
-
-		if (\count($aPrepearPlainStringUrls))
-		{
-			$this->aPrepearPlainStringUrls = $aPrepearPlainStringUrls;
-		}
-
-		return $sText;
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Locale.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Locale.php
index f0a00319d..5c5c15339 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Locale.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Locale.php
@@ -75,40 +75,24 @@ abstract class Locale
 
 	public static function DetectSystemCharset() : string
 	{
-		$sResult = '';
-		$sLocale = \setlocale(LC_ALL, '');
-		$sLocaleLower = \strtolower(\trim($sLocale));
-
-		foreach (static::$aLocaleMapping as $sKey => $sValue)
-		{
-			if (false !== \strpos($sLocaleLower, $sKey) ||
-				false !== \strpos($sLocaleLower, '.'.$sValue))
-			{
-				$sResult = $sValue;
-				break;
+		$sLocale = \strtolower(\trim(\setlocale(LC_ALL, '')));
+		foreach (static::$aLocaleMapping as $sKey => $sValue) {
+			if (\str_contains($sLocale, $sKey) || \str_contains($sLocale, '.'.$sValue)) {
+				return $sValue;
 			}
 		}
-
-		return $sResult;
+		return '';
 	}
 
 	public static function ConvertSystemString(string $sSrt) : string
 	{
 		$sSrt = \trim($sSrt);
-		if (!empty($sSrt) && !Utils::IsUtf8($sSrt))
-		{
+		if (!empty($sSrt) && !Utils::IsUtf8($sSrt)) {
 			$sCharset = static::DetectSystemCharset();
-			if (!empty($sCharset))
-			{
-				$sSrt = Utils::ConvertEncoding(
-					$sSrt, $sCharset, Enumerations\Charset::UTF_8);
-			}
-			else
-			{
-				$sSrt = \utf8_encode($sSrt);
-			}
+			$sSrt = $sCharset
+				? Utils::ConvertEncoding($sSrt, $sCharset, Enumerations\Charset::UTF_8)
+				: \mb_convert_encoding($sSrt, 'UTF-8', 'ISO-8859-1');
 		}
-
 		return $sSrt;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/ResourceRegistry.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/ResourceRegistry.php
index abf864be5..75d3c926d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/ResourceRegistry.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/ResourceRegistry.php
@@ -17,10 +17,7 @@ namespace MailSo\Base;
  */
 abstract class ResourceRegistry
 {
-	/**
-	 * @var array
-	 */
-	public static $Resources = array();
+	public static array $Resources = array();
 
 	/**
 	 * @staticvar bool $bInited
@@ -28,16 +25,12 @@ abstract class ResourceRegistry
 	private static function regResourcesShutdownFunc() : void
 	{
 		static $bInited = false;
-		if (!$bInited)
-		{
+		if (!$bInited) {
 			$bInited = true;
 			\register_shutdown_function(function () {
-				if (\is_array(static::$Resources))
-				{
-					foreach (\array_keys(static::$Resources) as $sKey)
-					{
-						if (\is_resource(static::$Resources[$sKey]))
-						{
+				if (\is_array(static::$Resources)) {
+					foreach (\array_keys(static::$Resources) as $sKey) {
+						if (\is_resource(static::$Resources[$sKey])) {
 							\fclose(static::$Resources[$sKey]);
 						}
 						static::$Resources[$sKey] = null;
@@ -57,8 +50,7 @@ abstract class ResourceRegistry
 		self::regResourcesShutdownFunc();
 
 		$oResult = \fopen('php://temp/maxmemory:'.($iMemoryMaxInMb * 1024 * 1024), 'r+b');
-		if (\is_resource($oResult))
-		{
+		if (\is_resource($oResult)) {
 			static::$Resources[(string) $oResult] = $oResult;
 			return $oResult;
 		}
@@ -72,8 +64,7 @@ abstract class ResourceRegistry
 	public static function CreateMemoryResourceFromString(string $sString)
 	{
 		$oResult = self::CreateMemoryResource();
-		if (\is_resource($oResult))
-		{
+		if (\is_resource($oResult)) {
 			\fwrite($oResult, $sString);
 			\rewind($oResult);
 		}
@@ -86,18 +77,15 @@ abstract class ResourceRegistry
 	 */
 	public static function CloseMemoryResource(&$rResource) : void
 	{
-		if (\is_resource($rResource))
-		{
+		if (\is_resource($rResource)) {
 			$sKey = (string) $rResource;
-			if (isset(static::$Resources[$sKey]))
-			{
+			if (isset(static::$Resources[$sKey])) {
 				\fclose(static::$Resources[$sKey]);
 				static::$Resources[$sKey] = null;
 				unset(static::$Resources[$sKey]);
 			}
 
-			if (\is_resource($rResource))
-			{
+			if (\is_resource($rResource)) {
 				\fclose($rResource);
 			}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamFilters/LineEndings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamFilters/LineEndings.php
index bc9bb6fbb..8fa4ada0d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamFilters/LineEndings.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamFilters/LineEndings.php
@@ -4,6 +4,8 @@ namespace MailSo\Base\StreamFilters;
 
 class LineEndings extends \php_user_filter
 {
+	#[\ReturnTypeWillChange]
+//	public function filter($in, $out, &$consumed, bool $closing): int
 	public function filter($in, $out, &$consumed, $closing)
 	{
 		while ($bucket = \stream_bucket_make_writeable($in)) {
@@ -25,10 +27,13 @@ class LineEndings extends \php_user_filter
 		return PSFS_PASS_ON;
 	}
 
+//	public onClose(): void
+//	public onCreate(): bool
+
 	public static function appendTo($fp)
 	{
 		\stream_filter_append($fp, 'crlf', STREAM_FILTER_ALL);
 	}
 }
 
-\stream_filter_register('crlf', 'MailSo\\Base\\StreamFilters\\LineEndings');
+\stream_filter_register('crlf', LineEndings::class);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
index cec59ad61..7302e953a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Binary.php
@@ -19,55 +19,34 @@ namespace MailSo\Base\StreamWrappers;
  */
 class Binary
 {
+	/** @var resource|null */
+	public $context;
+
 	/**
 	 * @var string
 	 */
 	const STREAM_NAME = 'mailsobinary';
 
-	/**
-	 * @var array
-	 */
-	private static $aStreams = array();
+	private static array $aStreams = array();
 
-	/**
-	 * @var array
-	 */
-	private static $aRememberStreams = array();
+	private static array $aRememberStreams = array();
 
 	/**
 	 * @var resource
 	 */
 	private $rStream;
 
-	/**
-	 * @var string
-	 */
-	private $sFromEncoding;
+	private string $sFromEncoding;
 
-	/**
-	 * @var string
-	 */
-	private $sToEncoding;
+	private string $sToEncoding;
 
-	/**
-	 * @var string
-	 */
-	private $sFunctionName;
+	private string $sFunctionName;
 
-	/**
-	 * @var int
-	 */
-	private $iPos;
+	private int $iPos;
 
-	/**
-	 * @var string
-	 */
-	private $sBuffer;
+	private string $sBuffer;
 
-	/**
-	 * @var string
-	 */
-	private $sReadEndBuffer;
+	private string $sReadEndBuffer;
 
 	public static function GetInlineDecodeOrEncodeFunctionName(string $sContentTransferEncoding, bool $bDecode = true) : string
 	{
@@ -93,8 +72,7 @@ class Binary
 		$sEndBuffer = '';
 		$iQuotedPrintableLen = \strlen($sEncodedString);
 		$iLastSpace = \strrpos($sEncodedString, ' ');
-		if (false !== $iLastSpace && $iLastSpace + 1 < $iQuotedPrintableLen)
-		{
+		if (false !== $iLastSpace && $iLastSpace + 1 < $iQuotedPrintableLen) {
 			$sEndBuffer = \substr($sEncodedString, $iLastSpace + 1);
 			$sEncodedString = \substr($sEncodedString, 0, $iLastSpace + 1);
 		}
@@ -106,10 +84,8 @@ class Binary
 	 */
 	public static function IsStreamRemembed($rStream) : bool
 	{
-		foreach (self::$aRememberStreams as $rRem)
-		{
-			if ($rStream === $rRem)
-			{
+		foreach (self::$aRememberStreams as $rRem) {
+			if ($rStream === $rRem) {
 				return true;
 			}
 		}
@@ -122,8 +98,7 @@ class Binary
 	 */
 	public static function RememberStream($rStream)
 	{
-		if (!self::IsStreamRemembed($rStream))
-		{
+		if (!self::IsStreamRemembed($rStream)) {
 			self::$aRememberStreams[] = $rStream;
 		}
 	}
@@ -134,17 +109,15 @@ class Binary
 	 * @return resource|bool
 	 */
 	public static function CreateStream($rStream,
-		string $sUtilsDecodeOrEncodeFunctionName = null, string $sFromEncoding = null, string $sToEncoding = null)
+		?string $sUtilsDecodeOrEncodeFunctionName = null, ?string $sFromEncoding = null, ?string $sToEncoding = null)
 	{
-		if (null === $sUtilsDecodeOrEncodeFunctionName || !\strlen($sUtilsDecodeOrEncodeFunctionName))
-		{
+		if (null === $sUtilsDecodeOrEncodeFunctionName || !\strlen($sUtilsDecodeOrEncodeFunctionName)) {
 			$sUtilsDecodeOrEncodeFunctionName = 'InlineNullDecode';
 		}
 
 		$sHashName = \md5(\microtime(true).\rand(1000, 9999));
 
-		if (null !== $sFromEncoding && null !== $sToEncoding && $sFromEncoding !== $sToEncoding)
-		{
+		if (null !== $sFromEncoding && null !== $sToEncoding && $sFromEncoding !== $sToEncoding) {
 			$rStream = self::CreateStream($rStream, $sUtilsDecodeOrEncodeFunctionName);
 			$sUtilsDecodeOrEncodeFunctionName = 'InlineConvertDecode';
 		}
@@ -170,6 +143,11 @@ class Binary
 		return \fopen(self::STREAM_NAME.'://'.$sHashName, 'rb');
 	}
 
+	public function stream_cast(int $cast_as) /*: resource*/
+	{
+		return false; // $this->rStream;
+	}
+
 	public function stream_open(string $sPath) : bool
 	{
 		$this->iPos = 0;
@@ -208,27 +186,19 @@ class Binary
 		$sReturn = '';
 		$sFunctionName = $this->sFunctionName;
 
-		if ($iCount > 0)
-		{
-			if ($iCount < \strlen($this->sBuffer))
-			{
+		if ($iCount > 0) {
+			if ($iCount < \strlen($this->sBuffer)) {
 				$sReturn = \substr($this->sBuffer, 0, $iCount);
 				$this->sBuffer = \substr($this->sBuffer, $iCount);
-			}
-			else
-			{
+			} else {
 				$sReturn = $this->sBuffer;
-				while ($iCount > 0)
-				{
-					if (\feof($this->rStream))
-					{
-						if (!\strlen($this->sBuffer.$sReturn))
-						{
+				while ($iCount > 0) {
+					if (\feof($this->rStream)) {
+						if (!\strlen($this->sBuffer.$sReturn)) {
 							return false;
 						}
 
-						if (\strlen($this->sReadEndBuffer))
-						{
+						if (\strlen($this->sReadEndBuffer)) {
 							$sReturn .= self::$sFunctionName($this->sReadEndBuffer,
 								$this->sReadEndBuffer, $this->sFromEncoding, $this->sToEncoding);
 
@@ -237,27 +207,21 @@ class Binary
 
 						$iCount = 0;
 						$this->sBuffer = '';
-					}
-					else
-					{
+					} else {
 						$sReadResult = \fread($this->rStream, 8192);
-						if (false === $sReadResult)
-						{
+						if (false === $sReadResult) {
 							return false;
 						}
 
 						$sReturn .= self::$sFunctionName($this->sReadEndBuffer.$sReadResult,
 							$this->sReadEndBuffer, $this->sFromEncoding, $this->sToEncoding);
 
-						$iDecodeLen = \strlen($sReturn);
-						if ($iCount < $iDecodeLen)
-						{
+						$iDecodeLen = \strlen($sReadResult);
+						if ($iCount < $iDecodeLen) {
 							$this->sBuffer = \substr($sReturn, $iCount);
 							$sReturn = \substr($sReturn, 0, $iCount);
 							$iCount = 0;
-						}
-						else
-						{
+						} else {
 							$iCount -= $iDecodeLen;
 						}
 					}
@@ -311,4 +275,4 @@ class Binary
 	}
 }
 
-\stream_wrapper_register(Binary::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Binary');
+\stream_wrapper_register(Binary::STREAM_NAME, Binary::class);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Literal.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Literal.php
index 9d692059d..f9ab9c645 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Literal.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Literal.php
@@ -18,30 +18,24 @@ namespace MailSo\Base\StreamWrappers;
  */
 class Literal
 {
+	/** @var resource|null */
+	public $context;
+
 	/**
 	 * @var string
 	 */
 	const STREAM_NAME = 'mailsoliteral';
 
-	/**
-	 * @var array
-	 */
-	private static $aStreams = array();
+	private static array $aStreams = array();
 
 	/**
 	 * @var resource
 	 */
 	private $rStream;
 
-	/**
-	 * @var int
-	 */
-	private $iSize;
+	private int $iSize;
 
-	/**
-	 * @var int
-	 */
-	private $iPos;
+	private int $iPos;
 
 	/**
 	 * @param resource $rStream
@@ -57,6 +51,11 @@ class Literal
 		return \fopen(self::STREAM_NAME.'://'.$sHashName, 'rb');
 	}
 
+	public function stream_cast(int $cast_as) /*: resource*/
+	{
+		return false; // $this->rStream;
+	}
+
 	public function stream_open(string $sPath) : bool
 	{
 		$this->iPos = 0;
@@ -87,20 +86,16 @@ class Literal
 	public function stream_read(int $iCount) : string
 	{
 		$sResult = false;
-		if ($this->iSize < $this->iPos + $iCount)
-		{
+		if ($this->iSize < $this->iPos + $iCount) {
 			$iCount = $this->iSize - $this->iPos;
 		}
 
-		if ($iCount > 0)
-		{
+		if ($iCount > 0) {
 			$sReadResult = '';
 			$iRead = $iCount;
-			while (0 < $iRead)
-			{
+			while (0 < $iRead) {
 				$sAddRead = \fread($this->rStream, $iRead);
-				if (false === $sAddRead)
-				{
+				if (false === $sAddRead) {
 					$sReadResult = false;
 					break;
 				}
@@ -110,8 +105,7 @@ class Literal
 				$this->iPos += \strlen($sAddRead);
 			}
 
-			if (false !== $sReadResult)
-			{
+			if (false !== $sReadResult) {
 				$sResult = $sReadResult;
 			}
 		}
@@ -155,8 +149,10 @@ class Literal
 
 	public function stream_seek() : bool
 	{
+//		$this->iPos = $offset;
+//		\fseek($this->rStream, $offset, $whence);
 		return false;
 	}
 }
 
-\stream_wrapper_register(Literal::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Literal');
+\stream_wrapper_register(Literal::STREAM_NAME, Literal::class);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
index 4e6fcd437..267a0240d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/SubStreams.php
@@ -15,43 +15,29 @@ namespace MailSo\Base\StreamWrappers;
  * @category MailSo
  * @package Base
  * @subpackage StreamWrappers
+ * https://www.php.net/streamwrapper
  */
 class SubStreams
 {
+	/** @var resource|null */
+	public $context;
+
 	/**
 	 * @var string
 	 */
 	const STREAM_NAME = 'mailsosubstreams';
 
-	/**
-	 * @var array
-	 */
-	private static $aStreams = array();
+	private static array $aStreams = array();
 
-	/**
-	 * @var array
-	 */
-	private $aSubStreams;
+	private array $aSubStreams;
 
-	/**
-	 * @var int
-	 */
-	private $iIndex;
+	private int $iIndex;
 
-	/**
-	 * @var string
-	 */
-	private $sBuffer;
+	private string $sBuffer;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsEnd;
+	private bool $bIsEnd;
 
-	/**
-	 * @var int
-	 */
-	private $iPos;
+	private int $iPos;
 
 	/**
 	 * @return resource|bool
@@ -68,20 +54,6 @@ class SubStreams
 		return \fopen(self::STREAM_NAME.'://'.$sHashName, 'rb');
 	}
 
-	/**
-	 * @return resource|null
-	 */
-	protected function &getPart()
-	{
-		$nNull = null;
-		if (isset($this->aSubStreams[$this->iIndex]))
-		{
-			return $this->aSubStreams[$this->iIndex];
-		}
-
-		return $nNull;
-	}
-
 	public function stream_open(string $sPath) : bool
 	{
 		$this->aSubStreams = array();
@@ -115,55 +87,42 @@ class SubStreams
 	{
 		$sReturn = '';
 		$mCurrentPart = null;
-		if ($iCount > 0)
-		{
-			if ($iCount < \strlen($this->sBuffer))
-			{
+		if ($iCount > 0) {
+			if ($iCount < \strlen($this->sBuffer)) {
 				$sReturn = \substr($this->sBuffer, 0, $iCount);
 				$this->sBuffer = \substr($this->sBuffer, $iCount);
-			}
-			else
-			{
+			} else {
 				$sReturn = $this->sBuffer;
-				while ($iCount > 0)
-				{
-					$mCurrentPart =& $this->getPart();
-					if (null === $mCurrentPart)
-					{
+				while ($iCount > 0) {
+					$mCurrentPart = isset($this->aSubStreams[$this->iIndex])
+						? $this->aSubStreams[$this->iIndex]
+						: null;
+					if (null === $mCurrentPart) {
 						$this->bIsEnd = true;
 						$this->sBuffer = '';
 						$iCount = 0;
 						break;
 					}
 
-					if (\is_resource($mCurrentPart))
-					{
-						if (!\feof($mCurrentPart))
-						{
+					if (\is_resource($mCurrentPart)) {
+						if (!\feof($mCurrentPart)) {
 							$sReadResult = \fread($mCurrentPart, 8192);
-							if (false === $sReadResult)
-							{
+							if (false === $sReadResult) {
 								return false;
 							}
-
 							$sReturn .= $sReadResult;
+						} else {
+							++$this->iIndex;
+						}
+					}
 
-							$iLen = \strlen($sReturn);
-							if ($iCount < $iLen)
-							{
-								$this->sBuffer = \substr($sReturn, $iCount);
-								$sReturn = \substr($sReturn, 0, $iCount);
-								$iCount = 0;
-							}
-							else
-							{
-								$iCount -= $iLen;
-							}
-						}
-						else
-						{
-							$this->iIndex++;
-						}
+					$iLen = \strlen($sReturn);
+					if ($iCount < $iLen) {
+						$this->sBuffer = \substr($sReturn, $iCount);
+						$sReturn = \substr($sReturn, 0, $iCount);
+						$iCount = 0;
+					} else {
+						$iCount -= $iLen;
 					}
 				}
 			}
@@ -211,8 +170,10 @@ class SubStreams
 
 	public function stream_seek() : bool
 	{
+//		$this->iPos = $offset;
+//		foreach ($this->aSubStreams as $rStream) \fseek($rStream, $offset, $whence);
 		return false;
 	}
 }
 
-\stream_wrapper_register(SubStreams::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\SubStreams');
+\stream_wrapper_register(SubStreams::STREAM_NAME, SubStreams::class);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
index 421895140..a1e6e7e60 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/TempFile.php
@@ -18,6 +18,9 @@ namespace MailSo\Base\StreamWrappers;
  */
 class TempFile
 {
+	/** @var resource|null */
+	public $context;
+
 	/**
 	 * @var string
 	 */
@@ -31,15 +34,19 @@ class TempFile
 	/**
 	 * @var resource
 	 */
-	private $rSream;
+	private $rStream;
 
 	/**
 	 * @return resource|bool
 	 */
 	public static function CreateStream(string $sHash, string &$sFileName = '')
 	{
-		$sFileName = self::STREAM_NAME.'://'.$sHash;
-		return fopen($sFileName, 'r+b');
+		return \fopen(self::STREAM_NAME.'://'.$sHash, 'r+b');
+	}
+
+	public function stream_cast(int $cast_as) /*: resource*/
+	{
+		return $this->rStream;
 	}
 
 	public function stream_open(string $sPath) : bool
@@ -52,17 +59,13 @@ class TempFile
 			self::STREAM_NAME === $aPath['scheme'])
 		{
 			$sHashName = $aPath['host'];
-			if (isset(self::$aStreams[$sHashName]) &&
-				\is_resource(self::$aStreams[$sHashName]))
-			{
-				$this->rSream = self::$aStreams[$sHashName];
-				\fseek($this->rSream, 0);
+			if (isset(self::$aStreams[$sHashName]) && \is_resource(self::$aStreams[$sHashName])) {
+				$this->rStream = self::$aStreams[$sHashName];
+				\fseek($this->rStream, 0);
 				$bResult = true;
-			}
-			else
-			{
-				$this->rSream = \fopen('php://memory', 'r+b');
-				self::$aStreams[$sHashName] = $this->rSream;
+			} else {
+				$this->rStream = \fopen('php://temp', 'r+b');
+				self::$aStreams[$sHashName] = $this->rStream;
 
 				$bResult = true;
 			}
@@ -78,38 +81,38 @@ class TempFile
 
 	public function stream_flush() : bool
 	{
-		return \fflush($this->rSream);
+		return \fflush($this->rStream);
 	}
 
 	public function stream_read(int $iLen) : string
 	{
-		return \fread($this->rSream, $iLen);
+		return \fread($this->rStream, $iLen);
 	}
 
 	public function stream_write(string $sInputString) : int
 	{
-		return \fwrite($this->rSream, $sInputString);
+		return \fwrite($this->rStream, $sInputString);
 	}
 
 	public function stream_tell() : int
 	{
-		return \ftell($this->rSream);
+		return \ftell($this->rStream);
 	}
 
 	public function stream_eof() : bool
 	{
-		return \feof($this->rSream);
+		return \feof($this->rStream);
 	}
 
 	public function stream_stat() : array
 	{
-		return \fstat($this->rSream);
+		return \fstat($this->rStream);
 	}
 
 	public function stream_seek(int $iOffset, int $iWhence = SEEK_SET) : int
 	{
-		return \fseek($this->rSream, $iOffset, $iWhence);
+		return \fseek($this->rStream, $iOffset, $iWhence);
 	}
 }
 
-\stream_wrapper_register(TempFile::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\TempFile');
+\stream_wrapper_register(TempFile::STREAM_NAME, TempFile::class);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Test.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Test.php
deleted file mode 100644
index 75d8e4439..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/StreamWrappers/Test.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Base\StreamWrappers;
-
-/**
- * @category MailSo
- * @package Base
- * @subpackage StreamWrappers
- */
-class Test
-{
-	/**
-	 * @var string
-	 */
-	const STREAM_NAME = 'mailsotest';
-
-	/**
-	 * @var array
-	 */
-	private static $aStreams = array();
-
-	/**
-	 * @var resource
-	 */
-	private $rReadSream;
-
-	/**
-	 *
-	 * @return resource|bool
-	 */
-	public static function CreateStream(string $sRawResponse)
-	{
-		$sHashName = \md5(\microtime(true).\rand(1000, 9999));
-
-		$rConnect = \fopen('php://memory', 'r+b');
-		\fwrite($rConnect, $sRawResponse);
-		\fseek($rConnect, 0);
-
-		self::$aStreams[$sHashName] = $rConnect;
-
-		return \fopen(self::STREAM_NAME.'://'.$sHashName, 'r+b');
-	}
-
-	public function stream_open(string $sPath) : bool
-	{
-		$bResult = false;
-		$aPath = \parse_url($sPath);
-
-		if (isset($aPath['host']) && isset($aPath['scheme']) &&
-			\strlen($aPath['host']) && \strlen($aPath['scheme']) &&
-			self::STREAM_NAME === $aPath['scheme'])
-		{
-			$sHashName = $aPath['host'];
-			if (isset(self::$aStreams[$sHashName]) &&
-				\is_resource(self::$aStreams[$sHashName]))
-			{
-				$this->rReadSream = self::$aStreams[$sHashName];
-				$bResult = true;
-			}
-		}
-
-		return $bResult;
-	}
-
-	public function stream_read(int $iCount) : string
-	{
-		return \fread($this->rReadSream, $iCount);
-	}
-
-	public function stream_write(string $sInputString) : int
-	{
-		return \strlen($sInputString);
-	}
-
-	public function stream_tell() : int
-	{
-		return \ftell($this->rReadSream);
-	}
-
-	public function stream_eof() : bool
-	{
-		return \feof($this->rReadSream);
-	}
-
-	public function stream_stat() : array
-	{
-		return \fstat($this->rReadSream);
-	}
-
-	public function stream_seek() : bool
-	{
-		return false;
-	}
-}
-
-\stream_wrapper_register(Test::STREAM_NAME, '\\MailSo\\Base\\StreamWrappers\\Test');
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
index cd9548049..f16598be8 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Utils.php
@@ -59,10 +59,7 @@ abstract class Utils
 				return 'iso-8859-8';
 		}
 
-		$sEncoding = \preg_replace('/^cp-([\d])/', 'cp$1', $sEncoding);
-		$sEncoding = \preg_replace('/^windows?12/', 'windows-12', $sEncoding);
-
-		return $sEncoding;
+		return \preg_replace('/^(cp|windows)-?(12[\d]*)/i', 'windows-$2', $sEncoding);
 	}
 
 	public static function NormalizeCharsetByValue(string $sCharset, string $sValue) : string
@@ -80,58 +77,11 @@ abstract class Utils
 		return $sCharset;
 	}
 
-	/**
-	 * @param function $fFileExistsCallback = null
-	 */
-	public static function SmartFileExists(string $sFilePath, $fFileExistsCallback = null) : string
-	{
-		$sFilePath = \str_replace('\\', '/', \trim($sFilePath));
-		if (!$fFileExistsCallback)
-		{
-			$fFileExistsCallback = function ($sPath) {
-				return \file_exists($sPath);
-			};
-		}
-
-		if (!$fFileExistsCallback($sFilePath))
-		{
-			return $sFilePath;
-		}
-
-		$aFileInfo = \pathinfo($sFilePath);
-
-		$iIndex = 0;
-
-		do
-		{
-			$iIndex++;
-
-			$sFilePathNew = $aFileInfo['dirname'].'/'.
-				\preg_replace('/\(\d{1,2}\)$/', '', $aFileInfo['filename']).
-				' ('.$iIndex.')'.
-				(empty($aFileInfo['extension']) ? '' : '.'.$aFileInfo['extension'])
-			;
-
-			if (!$fFileExistsCallback($sFilePathNew))
-			{
-				$sFilePath = $sFilePathNew;
-				break;
-			}
-			else if (10 < $iIndex)
-			{
-				break;
-			}
-		}
-		while (true);
-
-		return $sFilePath;
-	}
-
 	public static function MbSupportedEncoding(string $sEncoding) : bool
 	{
 		static $aSupportedEncodings = null;
 		if (null === $aSupportedEncodings) {
-			$aSupportedEncodings = \mb_list_encodings();
+			$aSupportedEncodings = \array_diff(\mb_list_encodings(), ['BASE64','UUENCODE','HTML-ENTITIES','Quoted-Printable']);
 			$aSupportedEncodings = \array_map('strtoupper', \array_unique(
 				\array_merge(
 					$aSupportedEncodings,
@@ -147,58 +97,65 @@ abstract class Utils
 		return \in_array(\strtoupper($sEncoding), $aSupportedEncodings);
 	}
 
-	public static function MbConvertEncoding(string $sInputString, ?string $sInputFromEncoding, string $sInputToEncoding) : string
+	private static $RenameEncoding = [
+		'SHIFT_JIS' => 'SJIS'
+	];
+
+	public static function MbConvertEncoding(string $sInputString, ?string $sFromEncoding, string $sToEncoding) : string
 	{
-		if ($sInputFromEncoding) {
-			$sInputFromEncoding = \strtoupper($sInputFromEncoding);
-			if (!static::MbSupportedEncoding($sInputFromEncoding)) {
-				$sInputFromEncoding = null;
-//				return $sInputString;
+		$sToEncoding = \strtoupper($sToEncoding);
+		if ($sFromEncoding) {
+			$sFromEncoding = \strtoupper($sFromEncoding);
+			if (isset(static::$RenameEncoding[$sFromEncoding])) {
+				$sFromEncoding = static::$RenameEncoding[$sFromEncoding];
+			}
 /*
-				if (\function_exists('iconv')) {
-					return \iconv($sInputFromEncoding, $sInputToEncoding, $sInputString);
+			if ('UTF-8' === $sFromEncoding && $sToEncoding === 'UTF7-IMAP' && \is_callable('imap_utf8_to_mutf7')) {
+				$sResult = \imap_utf8_to_mutf7($sInputString);
+				if (false !== $sResult) {
+					return $sResult;
 				}
+			}
+
+			if ('BASE64' === $sFromEncoding) {
+				static::Base64Decode($sFromEncoding);
+				$sFromEncoding = null;
+			} else if ('UUENCODE' === $sFromEncoding) {
+				\convert_uudecode($sFromEncoding);
+				$sFromEncoding = null;
+			} else if ('QUOTED-PRINTABLE' === $sFromEncoding) {
+				\quoted_printable_decode($sFromEncoding);
+				$sFromEncoding = null;
+			} else
 */
+			if (!static::MbSupportedEncoding($sFromEncoding)) {
+				if (\function_exists('iconv')) {
+					$sResult = \iconv($sFromEncoding, "{$sToEncoding}//IGNORE", $sInputString);
+					return (false !== $sResult) ? $sResult : $sInputString;
+				}
+				\error_log("Unsupported encoding {$sFromEncoding}");
+				$sFromEncoding = null;
+//				return $sInputString;
 			}
 		}
 
 		\mb_substitute_character('none');
-		$sResult = \mb_convert_encoding($sInputString, \strtoupper($sInputToEncoding), $sInputFromEncoding);
+		$sResult = \mb_convert_encoding($sInputString, $sToEncoding, $sFromEncoding);
 		\mb_substitute_character(0xFFFD);
 
 		return (false !== $sResult) ? $sResult : $sInputString;
 	}
 
-	public static function ConvertEncoding(string $sInputString, string $sInputFromEncoding, string $sInputToEncoding) : string
+	public static function ConvertEncoding(string $sInputString, string $sFromEncoding, string $sToEncoding) : string
 	{
-		$sResult = $sInputString;
+		$sFromEncoding = static::NormalizeCharset($sFromEncoding);
+		$sToEncoding = static::NormalizeCharset($sToEncoding);
 
-		$sFromEncoding = static::NormalizeCharset($sInputFromEncoding);
-		$sToEncoding = static::NormalizeCharset($sInputToEncoding);
-
-		if ('' === \trim($sResult) || ($sFromEncoding === $sToEncoding && Enumerations\Charset::UTF_8 !== $sFromEncoding))
+		if ('' === \trim($sInputString) || ($sFromEncoding === $sToEncoding && Enumerations\Charset::UTF_8 !== $sFromEncoding))
 		{
 			return $sInputString;
 		}
 
-		if ($sToEncoding === Enumerations\Charset::UTF_8) {
-			if ($sFromEncoding === Enumerations\Charset::ISO_8859_1) {
-				return \utf8_encode($sInputString);
-			}
-			if ($sFromEncoding === 'utf7-imap') {
-				return static::Utf7ModifiedToUtf8($sInputString);
-			}
-		}
-
-		if ($sFromEncoding === Enumerations\Charset::UTF_8) {
-			if ($sToEncoding === Enumerations\Charset::ISO_8859_1) {
-				return \utf8_decode($sInputString);
-			}
-			if ($sToEncoding === 'utf7-imap') {
-				return static::Utf8ToUtf7Modified($sInputString);
-			}
-		}
-
 		return static::MbConvertEncoding($sInputString, $sFromEncoding, $sToEncoding);
 	}
 
@@ -208,17 +165,6 @@ abstract class Utils
 			|| !\preg_match('/[^\x09\x10\x13\x0A\x0D\x20-\x7E]/', $sValue);
 	}
 
-	public static function StrMailDomainToLower(string $sValue) : string
-	{
-		$aParts = \explode('@', $sValue);
-		$iLast = \count($aParts) - 1;
-		if ($iLast) {
-			$aParts[$iLast] = \mb_strtolower($aParts[$iLast]);
-		}
-
-		return \implode('@', $aParts);
-	}
-
 	public static function StripSpaces(string $sValue) : string
 	{
 		return static::Trim(
@@ -233,17 +179,16 @@ abstract class Utils
 	public static function FormatFileSize(int $iSize, int $iRound = 0) : string
 	{
 		$aSizes = array('B', 'KB', 'MB');
-		for ($iIndex = 0; $iSize > 1024 && isset($aSizes[$iIndex + 1]); $iIndex++)
-		{
+		for ($iIndex = 0; $iSize > 1024 && isset($aSizes[$iIndex + 1]); ++$iIndex) {
 			$iSize /= 1024;
 		}
 		return \round($iSize, $iRound).$aSizes[$iIndex];
 	}
 
-	public static function DecodeEncodingValue(string $sEncodedValue, string $sEncodeingType) : string
+	public static function DecodeEncodingValue(string $sEncodedValue, string $sEncodingType) : string
 	{
 		$sResult = $sEncodedValue;
-		switch (\strtolower($sEncodeingType))
+		switch (\strtolower($sEncodingType))
 		{
 			case 'q':
 			case 'quoted_printable':
@@ -263,15 +208,13 @@ abstract class Utils
 		return \preg_replace('/ ([\r]?[\n])/m', ' ', $sInputValue);
 	}
 
-	public static function DecodeHeaderValue(string $sEncodedValue, string $sIncomingCharset = '', string $sForcedIncomingCharset = '') : string
+	public static function DecodeHeaderValue(string $sEncodedValue, string $sIncomingCharset = '') : string
 	{
 		$sValue = $sEncodedValue;
-		if (\strlen($sIncomingCharset))
-		{
+		if (\strlen($sIncomingCharset)) {
 			$sIncomingCharset = static::NormalizeCharsetByValue($sIncomingCharset, $sValue);
 
-			$sValue = static::ConvertEncoding($sValue, $sIncomingCharset,
-				Enumerations\Charset::UTF_8);
+			$sValue = static::ConvertEncoding($sValue, $sIncomingCharset, Enumerations\Charset::UTF_8);
 		}
 
 		$sValue = \preg_replace('/\?=[\n\r\t\s]{1,5}=\?/m', '?==?', $sValue);
@@ -282,15 +225,11 @@ abstract class Utils
 //		\preg_match_all('/=\?[^\?]+\?[q|b|Q|B]\?[^\?]*?\?=/', $sValue, $aMatch);
 		\preg_match_all('/=\?[^\?]+\?[q|b|Q|B]\?.*?\?=/', $sValue, $aMatch);
 
-		if (isset($aMatch[0]) && \is_array($aMatch[0]))
-		{
-			for ($iIndex = 0, $iLen = \count($aMatch[0]); $iIndex < $iLen; $iIndex++)
-			{
-				if (isset($aMatch[0][$iIndex]))
-				{
+		if (isset($aMatch[0]) && \is_array($aMatch[0])) {
+			for ($iIndex = 0, $iLen = \count($aMatch[0]); $iIndex < $iLen; ++$iIndex) {
+				if (isset($aMatch[0][$iIndex])) {
 					$iPos = \strpos($aMatch[0][$iIndex], '*');
-					if (false !== $iPos)
-					{
+					if (false !== $iPos) {
 						$aMatch[0][$iIndex][0] = \substr($aMatch[0][$iIndex][0], 0, $iPos);
 					}
 				}
@@ -304,11 +243,9 @@ abstract class Utils
 		$sMainCharset = '';
 		$bOneCharset = true;
 
-		for ($iIndex = 0, $iLen = \count($aEncodeArray); $iIndex < $iLen; $iIndex++)
-		{
+		for ($iIndex = 0, $iLen = \count($aEncodeArray); $iIndex < $iLen; ++$iIndex) {
 			$aTempArr = array('', $aEncodeArray[$iIndex]);
-			if ('=?' === \substr(\trim($aTempArr[1]), 0, 2))
-			{
+			if ('=?' === \substr(\trim($aTempArr[1]), 0, 2)) {
 				$iPos = \strpos($aTempArr[1], '?', 2);
 				$aTempArr[0] = \substr($aTempArr[1], 2, $iPos - 2);
 				$sEncType = \strtoupper($aTempArr[1][$iPos + 1]);
@@ -327,17 +264,12 @@ abstract class Utils
 				}
 			}
 
-			if (\strlen($aTempArr[0]))
-			{
-				$sCharset = \strlen($sForcedIncomingCharset) ? $sForcedIncomingCharset : $aTempArr[0];
-				$sCharset = static::NormalizeCharset($sCharset, true);
+			if (\strlen($aTempArr[0])) {
+				$sCharset = static::NormalizeCharset($aTempArr[0], true);
 
-				if ('' === $sMainCharset)
-				{
+				if ('' === $sMainCharset) {
 					$sMainCharset = $sCharset;
-				}
-				else if ($sMainCharset !== $sCharset)
-				{
+				} else if ($sMainCharset !== $sCharset) {
 					$bOneCharset = false;
 				}
 			}
@@ -351,14 +283,10 @@ abstract class Utils
 			unset($aTempArr);
 		}
 
-		for ($iIndex = 0, $iLen = \count($aParts); $iIndex < $iLen; $iIndex++)
-		{
-			if ($bOneCharset)
-			{
+		for ($iIndex = 0, $iLen = \count($aParts); $iIndex < $iLen; ++$iIndex) {
+			if ($bOneCharset) {
 				$sValue = \str_replace($aParts[$iIndex][0], $aParts[$iIndex][1], $sValue);
-			}
-			else
-			{
+			} else {
 				$aParts[$iIndex][2] = static::NormalizeCharsetByValue($aParts[$iIndex][2], $aParts[$iIndex][1]);
 
 				$sValue = \str_replace($aParts[$iIndex][0],
@@ -367,8 +295,7 @@ abstract class Utils
 			}
 		}
 
-		if ($bOneCharset && \strlen($sMainCharset))
-		{
+		if ($bOneCharset && \strlen($sMainCharset)) {
 			$sMainCharset = static::NormalizeCharsetByValue($sMainCharset, $sValue);
 			$sValue = static::ConvertEncoding($sValue, $sMainCharset, Enumerations\Charset::UTF_8);
 		}
@@ -380,8 +307,7 @@ abstract class Utils
 	{
 		$sResultHeaders = $sIncHeaders;
 
-		if ($aHeadersToRemove)
-		{
+		if ($aHeadersToRemove) {
 			$aHeadersToRemove = \array_map('strtolower', $aHeadersToRemove);
 
 			$sIncHeaders = \preg_replace('/[\r\n]+/', "\n", $sIncHeaders);
@@ -390,31 +316,21 @@ abstract class Utils
 			$bSkip = false;
 			$aResult = array();
 
-			foreach ($aHeaders as $sLine)
-			{
-				if (\strlen($sLine))
-				{
+			foreach ($aHeaders as $sLine) {
+				if (\strlen($sLine)) {
 					$sFirst = \substr($sLine,0,1);
-					if (' ' === $sFirst || "\t" === $sFirst)
-					{
-						if (!$bSkip)
-						{
+					if (' ' === $sFirst || "\t" === $sFirst) {
+						if (!$bSkip) {
 							$aResult[] = $sLine;
 						}
-					}
-					else
-					{
+					} else {
 						$bSkip = false;
 						$aParts = \explode(':', $sLine, 2);
 
-						if (!empty($aParts) && !empty($aParts[0]))
-						{
-							if (\in_array(\strtolower(\trim($aParts[0])), $aHeadersToRemove))
-							{
+						if (!empty($aParts) && !empty($aParts[0])) {
+							if (\in_array(\strtolower(\trim($aParts[0])), $aHeadersToRemove)) {
 								$bSkip = true;
-							}
-							else
-							{
+							} else {
 								$aResult[] = $sLine;
 							}
 						}
@@ -428,23 +344,23 @@ abstract class Utils
 		return $sResultHeaders;
 	}
 
-	public static function EncodeUnencodedValue(string $sEncodeType, string $sValue) : string
+	/**
+	 * https://datatracker.ietf.org/doc/html/rfc2047
+	 */
+	public static function EncodeHeaderValue(string $sValue, string $sEncodeType = 'B') : string
 	{
 		$sValue = \trim($sValue);
-		if (\strlen($sValue) && !static::IsAscii($sValue))
-		{
+		if (\strlen($sValue) && !static::IsAscii($sValue)) {
 			switch (\strtoupper($sEncodeType))
 			{
 				case 'B':
-					$sValue = '=?'.\strtolower(Enumerations\Charset::UTF_8).
+					return '=?'.\strtolower(Enumerations\Charset::UTF_8).
 						'?B?'.\base64_encode($sValue).'?=';
-					break;
 
 				case 'Q':
-					$sValue = '=?'.\strtolower(Enumerations\Charset::UTF_8).
+					return '=?'.\strtolower(Enumerations\Charset::UTF_8).
 						'?Q?'.\str_replace(array('?', ' ', '_'), array('=3F', '_', '=5F'),
 							\quoted_printable_encode($sValue)).'?=';
-					break;
 			}
 		}
 
@@ -453,7 +369,7 @@ abstract class Utils
 
 	public static function AttributeRfc2231Encode(string $sAttrName, string $sValue, string $sCharset = 'utf-8', string $sLang = '', int $iLen = 1000) : string
 	{
-		$sValue = \strtoupper($sCharset).'\''.$sLang.'\''.
+		$sValue = \strtoupper($sCharset)."'{$sLang}'".
 			\preg_replace_callback('/[\x00-\x20*\'%()<>@,;:\\\\"\/[\]?=\x80-\xFF]/', function ($match) {
 				return \rawurlencode($match[0]);
 			}, $sValue);
@@ -461,28 +377,22 @@ abstract class Utils
 		$iNlen = \strlen($sAttrName);
 		$iVlen = \strlen($sValue);
 
-		if (\strlen($sAttrName) + $iVlen > $iLen - 3)
-		{
+		if (\strlen($sAttrName) + $iVlen > $iLen - 3) {
 			$sections = array();
 			$section = 0;
 
-			for ($i = 0, $j = 0; $i < $iVlen; $i += $j)
-			{
+			for ($i = 0, $j = 0; $i < $iVlen; $i += $j) {
 				$j = $iLen - $iNlen - \strlen($section) - 4;
 				$sections[$section++] = \substr($sValue, $i, $j);
 			}
 
-			for ($i = 0, $n = $section; $i < $n; $i++)
-			{
+			for ($i = 0, $n = $section; $i < $n; ++$i) {
 				$sections[$i] = ' '.$sAttrName.'*'.$i.'*='.$sections[$i];
 			}
 
 			return \implode(";\r\n", $sections);
 		}
-		else
-		{
-			return $sAttrName.'*='.$sValue;
-		}
+		return $sAttrName.'*='.$sValue;
 	}
 
 	public static function EncodeHeaderUtf8AttributeValue(string $sAttrName, string $sValue) : string
@@ -490,43 +400,39 @@ abstract class Utils
 		$sAttrName = \trim($sAttrName);
 		$sValue = \trim($sValue);
 
-		if (\strlen($sValue) && !static::IsAscii($sValue))
-		{
+		if (\strlen($sValue) && !static::IsAscii($sValue)) {
 			$sValue = static::AttributeRfc2231Encode($sAttrName, $sValue);
-		}
-		else
-		{
+		} else {
 			$sValue = $sAttrName.'="'.\str_replace('"', '\\"', $sValue).'"';
 		}
 
 		return \trim($sValue);
 	}
 
+	/**
+	 * @deprecated use getEmailAddressLocalPart
+	 */
 	public static function GetAccountNameFromEmail(string $sEmail) : string
 	{
-		$sResult = '';
-		if (\strlen($sEmail))
-		{
-			$iPos = \strrpos($sEmail, '@');
-			$sResult = (false === $iPos) ? $sEmail : \substr($sEmail, 0, $iPos);
-		}
-
-		return $sResult;
+		return static::getEmailAddressLocalPart($sEmail);
+	}
+	public static function getEmailAddressLocalPart(string $sEmail) : string
+	{
+		$iPos = \strrpos($sEmail, '@');
+		return (false === $iPos) ? $sEmail : \substr($sEmail, 0, $iPos);
 	}
 
+	/**
+	 * @deprecated use getEmailAddressDomain
+	 */
 	public static function GetDomainFromEmail(string $sEmail) : string
 	{
-		$sResult = '';
-		if (\strlen($sEmail))
-		{
-			$iPos = \strrpos($sEmail, '@');
-			if (false !== $iPos && 0 < $iPos)
-			{
-				$sResult = \substr($sEmail, $iPos + 1);
-			}
-		}
-
-		return $sResult;
+		return static::getEmailAddressDomain($sEmail);
+	}
+	public static function getEmailAddressDomain(string $sEmail) : string
+	{
+		$iPos = \strrpos($sEmail, '@');
+		return (false === $iPos) ? '' : \substr($sEmail, $iPos + 1);
 	}
 
 	public static function GetClearDomainName(string $sDomain) : string
@@ -544,243 +450,13 @@ abstract class Utils
 		return false === $iLast ? '' : \strtolower(\substr($sFileName, $iLast + 1));
 	}
 
-	public static function MimeContentType(string $sFileName) : string
-	{
-		$sResult = 'application/octet-stream';
-		$sFileName = \trim(\strtolower($sFileName));
-
-		if ('winmail.dat' === $sFileName)
-		{
-			return 'application/ms-tnef';
-		}
-
-		$aMimeTypes = array(
-
-			'eml'	=> 'message/rfc822',
-			'mime'	=> 'message/rfc822',
-			'txt'	=> 'text/plain',
-			'text'	=> 'text/plain',
-			'def'	=> 'text/plain',
-			'list'	=> 'text/plain',
-			'in'	=> 'text/plain',
-			'ini'	=> 'text/plain',
-			'log'	=> 'text/plain',
-			'sql'	=> 'text/plain',
-			'cfg'	=> 'text/plain',
-			'conf'	=> 'text/plain',
-			'rtx'	=> 'text/richtext',
-			'vcard'	=> 'text/vcard',
-			'vcf'	=> 'text/vcard',
-			'htm'	=> 'text/html',
-			'html'	=> 'text/html',
-			'csv'	=> 'text/csv',
-			'ics'	=> 'text/calendar',
-			'ifb'	=> 'text/calendar',
-			'xml'	=> 'text/xml',
-			'json'	=> 'application/json',
-			'swf'	=> 'application/x-shockwave-flash',
-			'hlp'	=> 'application/winhlp',
-			'wgt'	=> 'application/widget',
-			'chm'	=> 'application/vnd.ms-htmlhelp',
-			'asc'   => 'application/pgp-signature',
-			'p10'	=> 'application/pkcs10',
-			'p7c'	=> 'application/pkcs7-mime',
-			'p7m'	=> 'application/pkcs7-mime',
-			'p7s'	=> 'application/pkcs7-signature',
-			'torrent'	=> 'application/x-bittorrent',
-
-			// scripts
-			'js'	=> 'application/javascript',
-			'pl'	=> 'text/perl',
-			'css'	=> 'text/css',
-			'asp'	=> 'text/asp',
-			'php'	=> 'application/x-php',
-
-			// images
-			'png'	=> 'image/png',
-			'jpg'	=> 'image/jpeg',
-			'jpeg'	=> 'image/jpeg',
-			'jpe'	=> 'image/jpeg',
-			'jfif'	=> 'image/jpeg',
-			'gif'	=> 'image/gif',
-			'bmp'	=> 'image/bmp',
-			'cgm'	=> 'image/cgm',
-			'ief'	=> 'image/ief',
-			'ico'	=> 'image/x-icon',
-			'tif'	=> 'image/tiff',
-			'tiff'	=> 'image/tiff',
-			'svg'	=> 'image/svg+xml',
-			'svgz'	=> 'image/svg+xml',
-			'djv'	=> 'image/vnd.djvu',
-			'djvu'	=> 'image/vnd.djvu',
-			'webp'	=> 'image/webp',
-
-			// archives
-			'zip'	=> 'application/zip',
-			'7z'	=> 'application/x-7z-compressed',
-			'rar'	=> 'application/x-rar-compressed',
-			'exe'	=> 'application/x-msdownload',
-			'dll'	=> 'application/x-msdownload',
-			'scr'	=> 'application/x-msdownload',
-			'com'	=> 'application/x-msdownload',
-			'bat'	=> 'application/x-msdownload',
-			'msi'	=> 'application/x-msdownload',
-			'cab'	=> 'application/vnd.ms-cab-compressed',
-			'gz'	=> 'application/x-gzip',
-			'tgz'	=> 'application/x-gzip',
-			'bz'	=> 'application/x-bzip',
-			'bz2'	=> 'application/x-bzip2',
-			'deb'	=> 'application/x-debian-package',
-			'tar'	=> 'application/x-tar',
-
-			// fonts
-			'psf'	=> 'application/x-font-linux-psf',
-			'otf'	=> 'application/x-font-otf',
-			'pcf'	=> 'application/x-font-pcf',
-			'snf'	=> 'application/x-font-snf',
-			'ttf'	=> 'application/x-font-ttf',
-			'ttc'	=> 'application/x-font-ttf',
-
-			// audio
-			'aac'	=> 'audio/aac',
-			'flac'	=> 'audio/flac',
-			'mp3'	=> 'audio/mpeg',
-			'aif'	=> 'audio/aiff',
-			'aifc'	=> 'audio/aiff',
-			'aiff'	=> 'audio/aiff',
-			'wav'	=> 'audio/x-wav',
-			'midi'	=> 'audio/midi',
-			'mp4a'	=> 'audio/mp4',
-			'ogg'	=> 'audio/ogg',
-			'weba'	=> 'audio/webm',
-			'm3u'	=> 'audio/x-mpegurl',
-
-			// video
-			'qt'	=> 'video/quicktime',
-			'mov'	=> 'video/quicktime',
-			'avi'	=> 'video/x-msvideo',
-			'mpg'	=> 'video/mpeg',
-			'mpeg'	=> 'video/mpeg',
-			'mpe'	=> 'video/mpeg',
-			'm1v'	=> 'video/mpeg',
-			'm2v'	=> 'video/mpeg',
-			'3gp'	=> 'video/3gpp',
-			'3g2'	=> 'video/3gpp2',
-			'h261'	=> 'video/h261',
-			'h263'	=> 'video/h263',
-			'h264'	=> 'video/h264',
-			'jpgv'	=> 'video/jpgv',
-			'mp4'	=> 'video/mp4',
-			'mp4v'	=> 'video/mp4',
-			'mpg4'	=> 'video/mp4',
-			'ogv'	=> 'video/ogg',
-			'webm'	=> 'video/webm',
-			'm4v'	=> 'video/x-m4v',
-			'asf'	=> 'video/x-ms-asf',
-			'asx'	=> 'video/x-ms-asf',
-			'wm'	=> 'video/x-ms-wm',
-			'wmv'	=> 'video/x-ms-wmv',
-			'wmx'	=> 'video/x-ms-wmx',
-			'wvx'	=> 'video/x-ms-wvx',
-			'movie'	=> 'video/x-sgi-movie',
-
-			// adobe
-			'pdf'	=> 'application/pdf',
-			'psd'	=> 'image/vnd.adobe.photoshop',
-			'ai'	=> 'application/postscript',
-			'eps'	=> 'application/postscript',
-			'ps'	=> 'application/postscript',
-
-			// ms office
-			'doc'	=> 'application/msword',
-			'dot'	=> 'application/msword',
-			'rtf'	=> 'application/rtf',
-			'xls'	=> 'application/vnd.ms-excel',
-			'ppt'	=> 'application/vnd.ms-powerpoint',
-			'docx'	=> 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-			'xlsx'	=> 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-			'dotx'	=> 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
-			'pptx'	=> 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-
-			// open office
-			'odt'	=> 'application/vnd.oasis.opendocument.text',
-			'ods'	=> 'application/vnd.oasis.opendocument.spreadsheet',
-			'odp'	=> 'application/vnd.oasis.opendocument.presentation'
-
-		);
-
-		$sExt = static::GetFileExtension($sFileName);
-		if (\strlen($sExt) && isset($aMimeTypes[$sExt]))
-		{
-			$sResult = $aMimeTypes[$sExt];
-		}
-
-		return $sResult;
-	}
-
-	public static function ContentTypeType(string $sContentType, string $sFileName) : string
-	{
-		$sContentType = \strtolower($sContentType);
-		if (0 === \strpos($sContentType, 'image/')) {
-			return 'image';
-		}
-
-		switch ($sContentType)
-		{
-			case 'application/zip':
-			case 'application/x-7z-compressed':
-			case 'application/x-rar-compressed':
-			case 'application/x-msdownload':
-			case 'application/vnd.ms-cab-compressed':
-			case 'application/gzip':
-			case 'application/x-gzip':
-			case 'application/x-bzip':
-			case 'application/x-bzip2':
-			case 'application/x-debian-package':
-			case 'application/x-tar':
-				return 'archive';
-
-			case 'application/msword':
-			case 'application/rtf':
-			case 'application/vnd.ms-excel':
-			case 'application/vnd.ms-powerpoint':
-			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
-			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
-			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.template':
-			case 'application/vnd.openxmlformats-officedocument.presentationml.presentation':
-			case 'application/vnd.oasis.opendocument.text':
-			case 'application/vnd.oasis.opendocument.spreadsheet':
-				return 'doc';
-
-			case 'application/pdf':
-			case 'application/x-pdf':
-				return 'pdf';
-		}
-
-		switch (\strtolower(static::GetFileExtension($sFileName)))
-		{
-			case 'zip':
-			case '7z':
-			case 'rar':
-			case 'tar':
-			case 'tgz':
-				return 'archive';
-
-			case 'pdf':
-				return 'pdf';
-		}
-
-		return '';
-	}
-
 	/**
 	 * @staticvar bool $bValidateAction
 	 */
 	public static function ResetTimeLimit(int $iTimeToReset = 15, int $iTimeToAdd = 120) : bool
 	{
 		$iTime = \time();
-		if ($iTime < $_SERVER['REQUEST_TIME_FLOAT'] + 5)
-		{
+		if ($iTime < $_SERVER['REQUEST_TIME_FLOAT'] + 5) {
 			// do nothing first 5s
 			return true;
 		}
@@ -788,18 +464,15 @@ abstract class Utils
 		static $bValidateAction = null;
 		static $iResetTimer = null;
 
-		if (null === $bValidateAction)
-		{
+		if (null === $bValidateAction) {
 			$iResetTimer = 0;
 
-			$bValidateAction = static::FunctionExistsAndEnabled('set_time_limit');
+			$bValidateAction = static::FunctionCallable('set_time_limit');
 		}
 
-		if ($bValidateAction && $iTimeToReset < $iTime - $iResetTimer)
-		{
+		if ($bValidateAction && $iTimeToReset < $iTime - $iResetTimer) {
 			$iResetTimer = $iTime;
-			if (!\set_time_limit($iTimeToAdd))
-			{
+			if (!\set_time_limit($iTimeToAdd)) {
 				$bValidateAction = false;
 				return false;
 			}
@@ -810,71 +483,13 @@ abstract class Utils
 		return false;
 	}
 
-	public static function ClearArrayUtf8Values(array &$aInput)
-	{
-		foreach ($aInput as $mKey => $mItem)
-		{
-			if (\is_string($mItem))
-			{
-				$aInput[$mKey] = static::Utf8Clear($mItem);
-			}
-			else if (\is_array($mItem))
-			{
-				static::ClearArrayUtf8Values($mItem);
-				$aInput[$mKey] = $mItem;
-			}
-		}
-	}
-
 	/**
-	 * @param mixed $mInput
+	 * Replace control characters, ampersand and reserved characters (based on Win95 VFAT)
+	 * en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
 	 */
-	public static function Php2js($mInput, ?\MailSo\Log\Logger $oLogger = null) : string
+	public static function SecureFileName(string $sFileName) : string
 	{
-		$sResult = \json_encode($mInput, JSON_UNESCAPED_UNICODE);
-		if (!\is_string($sResult) || '' === $sResult)
-		{
-			if (!$oLogger && \MailSo\Log\Logger::IsSystemEnabled())
-			{
-				$oLogger = \MailSo\Config::$SystemLogger;
-			}
-
-			if ($oLogger)
-			{
-				$oLogger->Write('json_encode: '.\trim(
-						(static::FunctionExistsAndEnabled('json_last_error') ? ' [Error Code: '.\json_last_error().']' : '').
-						(static::FunctionExistsAndEnabled('json_last_error_msg') ? ' [Error Message: '.\json_last_error_msg().']' : '')
-					), \MailSo\Log\Enumerations\Type::WARNING, 'JSON'
-				);
-			}
-
-			if (\is_array($mInput))
-			{
-				if ($oLogger)
-				{
-					$oLogger->WriteDump($mInput, \MailSo\Log\Enumerations\Type::INFO, 'JSON');
-					$oLogger->Write('Trying to clear Utf8 before json_encode', \MailSo\Log\Enumerations\Type::INFO, 'JSON');
-				}
-
-				static::ClearArrayUtf8Values($mInput);
-				$sResult = \json_encode($mInput, JSON_UNESCAPED_UNICODE);
-			}
-		}
-
-		return $sResult;
-	}
-
-	public static function ClearFileName(string $sFileName) : string
-	{
-		return static::Trim(static::ClearNullBite(
-			static::StripSpaces(
-				\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sFileName))));
-	}
-
-	public static function ClearXss(string $sValue) : string
-	{
-		return static::Trim(static::ClearNullBite(
-			\str_replace(array('"', '/', '\\', '*', '?', '<', '>', '|', ':'), ' ', $sValue)));
+		return \preg_replace('#[|\\\\?*<":>+\\[\\]/&\\pC]#su', '-', $sFileName);
 	}
 
 	public static function Trim(string $sValue) : string
@@ -884,24 +499,7 @@ abstract class Utils
 
 	public static function RecRmDir(string $sDir) : bool
 	{
-		\clearstatcache();
-		if (\is_dir($sDir)) {
-			$iterator = new \RecursiveIteratorIterator(
-				new \RecursiveDirectoryIterator($sDir, \FilesystemIterator::SKIP_DOTS),
-				\RecursiveIteratorIterator::CHILD_FIRST);
-			foreach ($iterator as $path) {
-				if ($path->isDir()) {
-					\rmdir($path);
-				} else {
-					\unlink($path);
-				}
-			}
-			\clearstatcache();
-//			\realpath_cache_size() && \clearstatcache(true);
-			return \rmdir($sDir);
-		}
-
-		return false;
+		return static::RecTimeDirRemove($sDir, 0);
 	}
 
 	public static function RecTimeDirRemove(string $sDir, int $iTime2Kill) : bool
@@ -913,9 +511,10 @@ abstract class Utils
 				new \RecursiveDirectoryIterator($sDir, \FilesystemIterator::SKIP_DOTS),
 				\RecursiveIteratorIterator::CHILD_FIRST);
 			foreach ($iterator as $path) {
-				if ($path->isFile() && $path->getMTime() < $iTime) {
+				if ($path->isFile() && (!$iTime2Kill || $path->getMTime() < $iTime)) {
+					\is_callable('opcache_invalidate') && \opcache_invalidate($path, true);
 					\unlink($path);
-				} else if ($path->isDir() && !(new \FilesystemIterator($path))->valid()) {
+				} else if ($path->isDir() && (!$iTime2Kill || !(new \FilesystemIterator($path))->valid())) {
 					\rmdir($path);
 				}
 			}
@@ -927,26 +526,6 @@ abstract class Utils
 		return false;
 	}
 
-	public static function Utf8Truncate(string $sUtfString, int $iLength) : string
-	{
-		if (\strlen($sUtfString) <= $iLength)
-		{
-			return $sUtfString;
-		}
-
-		while ($iLength >= 0)
-		{
-			if ((\ord($sUtfString[$iLength]) < 0x80) || (\ord($sUtfString[$iLength]) >= 0xC0))
-			{
-				return \substr($sUtfString, 0, $iLength);
-			}
-
-			$iLength--;
-		}
-
-		return '';
-	}
-
 	public static function Utf8Clear(?string $sUtfString) : string
 	{
 		if (!\strlen($sUtfString)) {
@@ -971,24 +550,19 @@ abstract class Utils
 	public static function Base64Decode(string $sString) : string
 	{
 		$sResultString = \base64_decode($sString, true);
-		if (false === $sResultString)
-		{
+		if (false === $sResultString) {
 			$sString = \str_replace(array(' ', "\r", "\n", "\t"), '', $sString);
 			$sString = \preg_replace('/[^a-zA-Z0-9=+\/](.*)$/', '', $sString);
 
-			if (false !== \strpos(\trim(\trim($sString), '='), '='))
-			{
+			if (false !== \strpos(\trim(\trim($sString), '='), '=')) {
 				$sString = \preg_replace('/=([^=])/', '= $1', $sString);
 				$aStrings = \explode(' ', $sString);
-				foreach ($aStrings as $iIndex => $sParts)
-				{
+				foreach ($aStrings as $iIndex => $sParts) {
 					$aStrings[$iIndex] = \base64_decode($sParts);
 				}
 
 				$sResultString = \implode('', $aStrings);
-			}
-			else
-			{
+			} else {
 				$sResultString = \base64_decode($sString);
 			}
 		}
@@ -1003,36 +577,7 @@ abstract class Utils
 
 	public static function UrlSafeBase64Decode(string $sValue) : string
 	{
-		return \base64_decode(\strtr($sValue, '-_', '+/'), '=');
-	}
-
-	public static function ParseFetchSequence(string $sSequence) : array
-	{
-		$aResult = array();
-		$sSequence = \trim($sSequence);
-		if (\strlen($sSequence))
-		{
-			$aSequence = \explode(',', $sSequence);
-			foreach ($aSequence as $sItem)
-			{
-				if (false === \strpos($sItem, ':'))
-				{
-					$aResult[] = (int) $sItem;
-				}
-				else
-				{
-					$aItems = \explode(':', $sItem);
-					$iMax = \max($aItems[0], $aItems[1]);
-
-					for ($iIndex = $aItems[0]; $iIndex <= $iMax; $iIndex++)
-					{
-						$aResult[] = (int) $iIndex;
-					}
-				}
-			}
-		}
-
-		return $aResult;
+		return \base64_decode(\strtr($sValue, '-_', '+/'), true);
 	}
 
 	/**
@@ -1040,23 +585,16 @@ abstract class Utils
 	 */
 	public static function FpassthruWithTimeLimitReset($fResource, int $iBufferLen = 8192) : bool
 	{
-		$bResult = false;
-		if (\is_resource($fResource))
-		{
-			while (!\feof($fResource))
-			{
+		$bResult = \is_resource($fResource);
+		if ($bResult) {
+			while (!\feof($fResource)) {
 				$sBuffer = \fread($fResource, $iBufferLen);
-				if (false !== $sBuffer)
-				{
-					echo $sBuffer;
-					static::ResetTimeLimit();
-					continue;
+				if (false === $sBuffer) {
+					break;
 				}
-
-				break;
+				echo $sBuffer;
+				static::ResetTimeLimit();
 			}
-
-			$bResult = true;
 		}
 
 		return $bResult;
@@ -1064,89 +602,62 @@ abstract class Utils
 
 	/**
 	 * @param resource $rRead
+	 * @param resource $rWrite
 	 */
-	public static function MultipleStreamWriter($rRead, array $aWrite, int $iBufferLen = 8192, bool $bResetTimeLimit = true, bool $bFixCrLf = false, bool $bRewindOnComplete = false) : int
+	public static function WriteStream($rRead, $rWrite, int $iBufferLen = 8192, bool $bFixCrLf = false, bool $bRewindOnComplete = false) : int
 	{
-		$mResult = false;
-		if (\is_resource($rRead) && \count($aWrite))
-		{
-			$mResult = 0;
-			while (!\feof($rRead))
-			{
-				$sBuffer = \fread($rRead, $iBufferLen);
-				if (false === $sBuffer)
-				{
-					$mResult = false;
-					break;
-				}
-
-				if ('' === $sBuffer)
-				{
-					break;
-				}
-
-				if ($bFixCrLf)
-				{
-					$sBuffer = \str_replace("\n", "\r\n", \str_replace("\r", '', $sBuffer));
-				}
-
-				$mResult += \strlen($sBuffer);
-
-				foreach ($aWrite as $rWriteStream)
-				{
-					$mWriteResult = \fwrite($rWriteStream, $sBuffer);
-					if (false === $mWriteResult)
-					{
-						$mResult = false;
-						break 2;
-					}
-				}
-
-				if ($bResetTimeLimit)
-				{
-					static::ResetTimeLimit();
-				}
-			}
+		if (!\is_resource($rRead) || !\is_resource($rWrite)) {
+			return -1;
 		}
 
-		if ($mResult && $bRewindOnComplete)
-		{
-			foreach ($aWrite as $rWriteStream)
-			{
-				if (\is_resource($rWriteStream))
-				{
-					\rewind($rWriteStream);
-				}
+		$iResult = 0;
+
+		while (!\feof($rRead)) {
+			$sBuffer = \fread($rRead, $iBufferLen);
+			if (false === $sBuffer) {
+				return -1;
 			}
+
+			if ('' === $sBuffer) {
+				break;
+			}
+
+			if ($bFixCrLf) {
+				$sBuffer = \str_replace("\n", "\r\n", \str_replace("\r", '', $sBuffer));
+			}
+
+			$iResult += \strlen($sBuffer);
+
+			if (false === \fwrite($rWrite, $sBuffer)) {
+				return -1;
+			}
+
+			static::ResetTimeLimit();
 		}
 
-		return $mResult;
+		if ($bRewindOnComplete) {
+			\rewind($rWrite);
+		}
+
+		return $iResult;
 	}
 
 	public static function Utf7ModifiedToUtf8(string $sStr) : string
 	{
-		$sResult = \is_callable('imap_mutf7_to_utf8')
-			? \imap_mutf7_to_utf8($sStr)
-			: \mb_convert_encoding($sStr, 'UTF-8', 'UTF7-IMAP');
-//			static::MbConvertEncoding($sStr, 'UTF7-IMAP', 'UTF-8');
-//		$sResult = \UConverter::transcode($sStr, \UConverter::UTF8, \UConverter::IMAP_MAILBOX);
-		return (false === $sResult) ? $sStr : $sResult;
+		// imap_mutf7_to_utf8() doesn't support U+10000 and up,
+		// thats why mb_convert_encoding is used
+		return static::MbConvertEncoding($sStr, 'UTF7-IMAP', 'UTF-8');
 	}
 
 	public static function Utf8ToUtf7Modified(string $sStr) : string
 	{
-		$sResult = \is_callable('imap_utf8_to_mutf7')
-			? \imap_utf8_to_mutf7($sStr)
-			: \mb_convert_encoding($sStr, 'UTF7-IMAP', 'UTF-8');
-//			static::MbConvertEncoding($sStr, 'UTF-8', 'UTF7-IMAP');
-//		$sResult = \UConverter::transcode($sStr, \UConverter::IMAP_MAILBOX, \UConverter::UTF8);
-		return (false === $sResult) ? $sStr : $sResult;
+		return static::MbConvertEncoding($sStr, 'UTF-8', 'UTF7-IMAP');
 	}
 
-	public static function FunctionsExistAndEnabled(array $aFunctionNames) : bool
+	public static function FunctionsCallable(array $aFunctionNames) : bool
 	{
 		foreach ($aFunctionNames as $sFunctionName) {
-			if (!static::FunctionExistsAndEnabled($sFunctionName)) {
+			if (!static::FunctionCallable($sFunctionName)) {
 				return false;
 			}
 		}
@@ -1154,7 +665,7 @@ abstract class Utils
 	}
 
 	private static $disabled_functions = null;
-	public static function FunctionExistsAndEnabled(string $sFunctionName) : bool
+	public static function FunctionCallable(string $sFunctionName) : bool
 	{
 		if (null === static::$disabled_functions) {
 			static::$disabled_functions = \array_map('trim', \explode(',', \ini_get('disable_functions')));
@@ -1168,81 +679,62 @@ abstract class Utils
 //			&& \is_callable($mFunctionNameOrNames);
 	}
 
-	public static function ClearNullBite($mValue) : string
-	{
-		return \str_replace('%00', '', $mValue);
-	}
-
-	public static function CharsetDetect(string $sStr) : string
-	{
-		$mResult = '';
-		if (!static::IsAscii($sStr))
-		{
-			$mResult = \mb_detect_encoding($sStr, 'auto', true);
-		}
-
-		return \is_string($mResult) && \strlen($mResult) ? $mResult : '';
-	}
-
 	public static function Sha1Rand(string $sAdditionalSalt = '') : string
 	{
 		return \sha1($sAdditionalSalt . \random_bytes(16));
 	}
 
-	public static function ValidateDomain(string $sDomain, bool $bSimple = false) : bool
-	{
-		$aMatch = array();
-		if ($bSimple)
-		{
-			return \preg_match('/.+(\.[a-zA-Z]+)$/', $sDomain, $aMatch) && !empty($aMatch[1]);
-		}
-
-		return \preg_match('/.+(\.[a-zA-Z]+)$/', $sDomain, $aMatch) && !empty($aMatch[1]) && \in_array($aMatch[1], \explode(' ',
-			'.academy .actor .agency .audio .bar .beer .bike .blue .boutique .cab .camera .camp .capital .cards .careers .cash .catering .center .cheap .city .cleaning .clinic .clothing .club .coffee .community .company .computer .construction .consulting .contractors .cool .credit .dance .dating .democrat .dental .diamonds .digital .direct .directory .discount .domains .education .email .energy .equipment .estate .events .expert .exposed .fail .farm .fish .fitness .florist .fund .futbol .gallery .gift .glass .graphics .guru .help .holdings .holiday .host .hosting .house .institute .international .kitchen .land .life .lighting .limo .link .management .market .marketing .media .menu .moda .partners .parts .photo .photography .photos .pics .pink .press .productions .pub .red .rentals .repair .report .rest .sexy .shoes .social .solar .solutions .space .support .systems .tattoo .tax .technology .tips .today .tools .town .toys .trade .training .university .uno .vacations .vision .vodka .voyage .watch .webcam .wiki .work .works .wtf .zone .aero .asia .biz .cat .com .coop .edu .gov .info .int .jobs .mil .mobi .museum .name .net .org .pro .tel .travel .xxx .xyz '.
-			'.ac .ad .ae .af .ag .ai .al .am .an .ao .aq .ar .as .at .au .aw .ax .az .ba .bb .bd .be .bf .bg .bh .bi .bj .bm .bn .bo .br .bs .bt .bv .bw .by .bz .ca .cc .cd .cf .cg .ch .ci .ck .cl .cm .cn .co .cr .cs .cu .cv .cx .cy .cz .dd .de .dj .dk .dm .do .dz .ec .ee .eg .er .es .et .eu .fi .fj .fk .fm .fo .fr .ga .gb .gd .ge .gf .gg .gh .gi .gl .gm .gn .gp .gq .gr .gs .gt .gu .gw .gy .hk .hm .hn .hr .ht .hu .id .ie .il .im .in .io .iq .ir .is .it .je .jm .jo .jp .ke .kg .kh .ki .km .kn .kp .kr .kw .ky .kz .la .lb .lc .li .lk .lr .ls .lt .lu .lv .ly .ma .mc .md .me .mg .mh .mk .ml .mm .mn .mo .mp .mq .mr .ms .mt .mu .mv .mw .mx .my .mz .na .nc .ne .nf .ng .ni .nl .no .np .nr .nu .nz .om .pa .pe .pf .pg .ph .pk .pl .pm .pn .pr .ps .pt .pw .py .qa .re .ro .rs .ru . .rw .sa .sb .sc .sd .se .sg .sh .si .sj .sk .sl .sm .sn .so .sr .st .su .sv .sy .sz .tc .td .tf .tg .th .tj .tk .tl .tm .tn .to .tp .tr .tt .tv .tw .tz .ua .ug .uk .us .uy .uz .va .vc .ve .vg .vi .vn .vu .wf .ws .ye .yt .za .zm .zw'
-		));
-	}
-
 	public static function ValidateIP(string $sIp) : bool
 	{
 		return !empty($sIp) && $sIp === \filter_var($sIp, FILTER_VALIDATE_IP);
 	}
 
-	public static function IdnToUtf8(string $sStr, bool $bLowerIfAscii = false) : string
+	/**
+	 * @deprecated
+	 */
+	public static function IdnToUtf8(string $sStr) : string
 	{
-		if (\strlen($sStr) && \preg_match('/(^|\.|@)xn--/i', $sStr))
-		{
-			try
-			{
-				$sStr = \SnappyMail\IDN::anyToUtf8($sStr);
-			}
-			catch (\Throwable $oException) {}
+		$trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+		\SnappyMail\Log::warning('MailSo', "Deprecated function IdnToUtf8 called at {$trace['file']}#{$trace['line']}");
+		if (\preg_match('/(^|\.|@)xn--/i', $sStr)) {
+			$sStr = \str_contains($sStr, '@')
+			? \SnappyMail\IDN::emailToUtf8($string)
+			: \idn_to_utf8($string);
 		}
-
-		return $bLowerIfAscii ? static::StrMailDomainToLower($sStr) : $sStr;
+		return $sStr;
 	}
 
-	public static function IdnToAscii(string $sStr, bool $bLowerIfAscii = false) : string
+	/**
+	 * @deprecated
+	 */
+	public static function IdnToAscii(string $sStr, bool $bLowerCase = false) : string
 	{
-		$sStr = $bLowerIfAscii ? static::StrMailDomainToLower($sStr) : $sStr;
-
-		$sUser = '';
-		$sDomain = $sStr;
-		if (false !== \strpos($sStr, '@'))
-		{
-			$sUser = static::GetAccountNameFromEmail($sStr);
-			$sDomain = static::GetDomainFromEmail($sStr);
+		$trace = \debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2)[1];
+		\SnappyMail\Log::warning('MailSo', "Deprecated function IdnToAscii called at {$trace['file']}#{$trace['line']}");
+		$aParts = \explode('@', $sStr);
+		$sDomain = \array_pop($aParts);
+		if (\preg_match('/[^\x20-\x7E]/', $sDomain)) {
+			$sDomain = \idn_to_ascii($string);
 		}
+		if ($bLowerCase) {
+			$sDomain = \strtolower($sDomain);
+		}
+		$aParts[] = $sDomain;
+		return \implode('@', $aParts);
+	}
 
-		if (\strlen($sDomain) && \preg_match('/[^\x20-\x7E]/', $sDomain))
-		{
-			try
-			{
-				$sDomain = \SnappyMail\IDN::anyToAscii($sDomain);
+	public static function mkdir(string $directory) : void
+	{
+		if (!\is_dir($directory)) {
+			if (!\mkdir($directory, 0700, true)) {
+				throw new \RuntimeException("Failed to create directory {$directory}");
 			}
-			catch (\Throwable $oException) {}
+			\clearstatcache();
 		}
-
-		return ('' === $sUser ? '' : $sUser.'@').$sDomain;
+/*
+		if (!\is_writable($directory)) {
+			throw new \Exception("Failed to access directory {$directory}");
+		}
+*/
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Validator.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Validator.php
deleted file mode 100644
index aed776de4..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Validator.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Base;
-
-/**
- * @category MailSo
- * @package Base
- */
-class Validator
-{
-	public static function RangeInt(int $iNumber, int $iMin = null, int $iMax = null) : bool
-	{
-		return (null === $iMin || $iNumber >= $iMin) && (null === $iMax || $iNumber <= $iMax);
-	}
-
-	public static function PortInt(int $iPort) : bool
-	{
-		return static::RangeInt($iPort, 0, 65535);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Xxtea.php b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Xxtea.php
index 2db251a86..cea141a1c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Xxtea.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Base/Xxtea.php
@@ -22,10 +22,8 @@ class Xxtea
 	{
 		$aV = self::str2long($sString, true);
 		$aK = self::str2long($sKey, false);
-		if (\count($aK) < 4)
-		{
-			for ($iIndex = \count($aK); $iIndex < 4; $iIndex++)
-			{
+		if (\count($aK) < 4) {
+			for ($iIndex = \count($aK); $iIndex < 4; $iIndex++) {
 				$aK[$iIndex] = 0;
 			}
 		}
@@ -36,12 +34,10 @@ class Xxtea
 		$iDelta = 0x9E3779B9;
 		$iQ = \floor(6 + 52 / ($iN + 1));
 		$iSum = 0;
-		while (0 < $iQ--)
-		{
+		while (0 < $iQ--) {
 			$iSum = self::int32($iSum + $iDelta);
 			$iE = $iSum >> 2 & 3;
-			for ($iPIndex = 0; $iPIndex < $iN; $iPIndex++)
-			{
+			for ($iPIndex = 0; $iPIndex < $iN; ++$iPIndex) {
 				$iY = $aV[$iPIndex + 1];
 				$iMx = self::int32((($iZ >> 5 & 0x07ffffff) ^ $iY << 2) +
 					(($iY >> 3 & 0x1fffffff) ^ $iZ << 4)) ^ self::int32(($iSum ^ $iY) + ($aK[$iPIndex & 3 ^ $iE] ^ $iZ));
@@ -61,10 +57,8 @@ class Xxtea
 		$aV = self::str2long($sEncryptedString, false);
 		$aK = self::str2long($sKey, false);
 
-		if (\count($aK) < 4)
-		{
-			for ($iIndex = \count($aK); $iIndex < 4; $iIndex++)
-			{
+		if (\count($aK) < 4) {
+			for ($iIndex = \count($aK); $iIndex < 4; ++$iIndex) {
 				$aK[$iIndex] = 0;
 			}
 		}
@@ -76,11 +70,9 @@ class Xxtea
 		$iDelta = 0x9E3779B9;
 		$iQ = \floor(6 + 52 / ($iN + 1));
 		$iSum = self::int32($iQ * $iDelta);
-		while ($iSum != 0)
-		{
+		while ($iSum != 0) {
 			$iE = $iSum >> 2 & 3;
-			for ($iPIndex = $iN; $iPIndex > 0; $iPIndex--)
-			{
+			for ($iPIndex = $iN; $iPIndex > 0; --$iPIndex) {
 				$iZ = $aV[$iPIndex - 1];
 				$iMx = self::int32((($iZ >> 5 & 0x07ffffff) ^ $iY << 2) +
 					(($iY >> 3 & 0x1fffffff) ^ $iZ << 4)) ^ self::int32(($iSum ^ $iY) + ($aK[$iPIndex & 3 ^ $iE] ^ $iZ));
@@ -100,33 +92,25 @@ class Xxtea
 	{
 		$iLen = \count($aV);
 		$iN = ($iLen - 1) << 2;
-		if ($aW)
-		{
+		if ($aW) {
 			$iM = $aV[$iLen - 1];
-			if (($iM < $iN - 3) || ($iM > $iN))
-			{
+			if (($iM < $iN - 3) || ($iM > $iN)) {
 				return false;
 			}
 			$iN = $iM;
 		}
 		$aS = array();
-		for ($iIndex = 0; $iIndex < $iLen; $iIndex++)
-		{
+		for ($iIndex = 0; $iIndex < $iLen; ++$iIndex) {
 			$aS[$iIndex] = \pack('V', $aV[$iIndex]);
 		}
-		if ($aW)
-		{
-			return \substr(\join('', $aS), 0, $iN);
-		}
-		return \join('', $aS);
+		return $aW ? \substr(\join('', $aS), 0, $iN) : \join('', $aS);
 	}
 
 	private static function str2long(string $sS, string $sW) : array
 	{
 		$aV = \unpack('V*', $sS . \str_repeat("\0", (4 - \strlen($sS) % 4) & 3));
 		$aV = \array_values($aV);
-		if ($sW)
-		{
+		if ($sW) {
 			$aV[\count($aV)] = \strlen($sS);
 		}
 		return $aV;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/CacheClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/CacheClient.php
index 3e2de5bfa..d42b9f09b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/CacheClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/CacheClient.php
@@ -22,16 +22,7 @@ class CacheClient
 	 */
 	private $oDriver;
 
-	/**
-	 * @var string
-	 */
-	private $sCacheIndex;
-
-	function __construct()
-	{
-		$this->oDriver = null;
-		$this->sCacheIndex = '';
-	}
+	private string $sCacheIndex = '';
 
 	public function Set(string $sKey, string $sValue) : bool
 	{
@@ -58,20 +49,20 @@ class CacheClient
 		return '1' === $this->Get($sKey.'/LOCK');
 	}
 
-	public function Get(string $sKey, bool $bClearAfterGet = false)
+	public function Exists(string $sKey) : bool
 	{
-		$sValue = '';
+		return $this->oDriver && $this->oDriver->Exists($sKey.$this->sCacheIndex);
+	}
 
-		if ($this->oDriver)
-		{
+	public function Get(string $sKey, bool $bClearAfterGet = false) : ?string
+	{
+		$sValue = null;
+		if ($this->oDriver) {
 			$sValue = $this->oDriver->Get($sKey.$this->sCacheIndex);
+			if ($bClearAfterGet) {
+				$this->Delete($sKey);
+			}
 		}
-
-		if ($bClearAfterGet)
-		{
-			$this->Delete($sKey);
-		}
-
 		return $sValue;
 	}
 
@@ -79,8 +70,7 @@ class CacheClient
 	{
 		$iTimer = 0;
 		$sValue = $this->Get($sKey.'/TIMER');
-		if (\strlen($sValue) && is_numeric($sValue))
-		{
+		if (\strlen($sValue) && \is_numeric($sValue)) {
 			$iTimer = (int) $sValue;
 		}
 
@@ -89,8 +79,7 @@ class CacheClient
 
 	public function Delete(string $sKey) : self
 	{
-		if ($this->oDriver)
-		{
+		if ($this->oDriver) {
 			$this->oDriver->Delete($sKey.$this->sCacheIndex);
 		}
 
@@ -111,7 +100,7 @@ class CacheClient
 
 	public function IsInited() : bool
 	{
-		return $this->oDriver instanceof DriverInterface;
+		return !!$this->oDriver;
 	}
 
 	public function SetCacheIndex(string $sCacheIndex) : self
@@ -123,11 +112,9 @@ class CacheClient
 
 	public function Verify(bool $bCache = false) : bool
 	{
-		if ($this->oDriver)
-		{
+		if ($this->oDriver) {
 			$sCacheData = \gmdate('Y-m-d-H');
-			if ($bCache && $sCacheData === $this->Get('__verify_key__'))
-			{
+			if ($bCache && $sCacheData === $this->Get('__verify_key__')) {
 				return true;
 			}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/DriverInterface.php b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/DriverInterface.php
index ae7fa478f..893a58ad1 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/DriverInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/DriverInterface.php
@@ -17,9 +17,13 @@ namespace MailSo\Cache;
  */
 interface DriverInterface
 {
+	public function setPrefix(string $sKeyPrefix) : void;
+
 	public function Set(string $sKey, string $sValue) : bool;
 
-	public function Get(string $sKey) : string;
+	public function Exists(string $sKey) : bool;
+
+	public function Get(string $sKey) : ?string;
 
 	public function Delete(string $sKey) : void;
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
index 0c32dc0e6..ab427131c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Cache/Drivers/File.php
@@ -18,30 +18,28 @@ namespace MailSo\Cache\Drivers;
  */
 class File implements \MailSo\Cache\DriverInterface
 {
-	/**
-	 * @var string
-	 */
-	private $sCacheFolder;
+	private string $sCacheFolder;
 
-	/**
-	 * @var string
-	 */
-	private $sKeyPrefix;
+	private string $sKeyPrefix = '';
 
-	function __construct(string $sCacheFolder, string $sKeyPrefix = '')
+	function __construct(string $sCacheFolder)
 	{
-		$this->sCacheFolder = $sCacheFolder;
-		$this->sCacheFolder = rtrim(trim($this->sCacheFolder), '\\/').'/';
+		$this->sCacheFolder = \rtrim(\trim($sCacheFolder), '\\/').'/';
+		\MailSo\Base\Utils::mkdir($this->sCacheFolder);
 
-		$this->sKeyPrefix = $sKeyPrefix;
-		if (!empty($this->sKeyPrefix))
-		{
-			$this->sKeyPrefix = \str_pad(\preg_replace('/[^a-zA-Z0-9_]/', '_',
-				rtrim(trim($this->sKeyPrefix), '\\/')), 5, '_');
+		// http://www.brynosaurus.com/cachedir/
+		$tag = $this->sCacheFolder . 'CACHEDIR.TAG';
+		\is_file($tag) || \file_put_contents($tag, 'Signature: 8a477f597d28d172789f06886806bc55');
+	}
 
+	public function setPrefix(string $sKeyPrefix) : void
+	{
+		if (!empty($sKeyPrefix)) {
+			$sKeyPrefix = \str_pad(\preg_replace('/[^a-zA-Z0-9_]/', '_',
+				\rtrim(\trim($sKeyPrefix), '\\/')), 5, '_');
 			$this->sKeyPrefix = '__/'.
-				\substr($this->sKeyPrefix, 0, 2).'/'.\substr($this->sKeyPrefix, 2, 2).'/'.
-				$this->sKeyPrefix.'/';
+				\substr($sKeyPrefix, 0, 2).'/'.\substr($sKeyPrefix, 2, 2).'/'.
+				$sKeyPrefix.'/';
 		}
 	}
 
@@ -51,53 +49,51 @@ class File implements \MailSo\Cache\DriverInterface
 		return '' === $sPath ? false : false !== \file_put_contents($sPath, $sValue);
 	}
 
-	public function Get(string $sKey) : string
+	public function Exists(string $sKey) : bool
 	{
-		$sValue = '';
 		$sPath = $this->generateCachedFileName($sKey);
-		if ('' !== $sPath && \file_exists($sPath))
-		{
+		return '' !== $sPath && \file_exists($sPath);
+	}
+
+	public function Get(string $sKey) : ?string
+	{
+		$sValue = null;
+		$sPath = $this->generateCachedFileName($sKey);
+		if ('' !== $sPath && \file_exists($sPath)) {
 			$sValue = \file_get_contents($sPath);
 		}
-
-		return \is_string($sValue) ? $sValue : '';
+		return \is_string($sValue) ? $sValue : null;
 	}
 
 	public function Delete(string $sKey) : void
 	{
 		$sPath = $this->generateCachedFileName($sKey);
-		if ('' !== $sPath && \file_exists($sPath))
-		{
+		if ('' !== $sPath && \file_exists($sPath)) {
 			\unlink($sPath);
 		}
 	}
 
 	public function GC(int $iTimeToClearInHours = 24) : bool
 	{
-		if (0 === $iTimeToClearInHours) {
-			\MailSo\Base\Utils::RecRmDir($this->sCacheFolder);
-		} else {
-			\MailSo\Base\Utils::RecTimeDirRemove($this->sCacheFolder, 3600 * $iTimeToClearInHours);
-		}
+		\MailSo\Base\Utils::RecTimeDirRemove($this->sCacheFolder, 3600 * $iTimeToClearInHours);
 		return true;
 	}
 
 	private function generateCachedFileName(string $sKey, bool $bMkDir = false) : string
 	{
 		$sFilePath = '';
-		if (3 < \strlen($sKey))
-		{
+		if (3 < \strlen($sKey)) {
 			$sKeyPath = \sha1($sKey);
-			$sKeyPath = \substr($sKeyPath, 0, 2).'/'.\substr($sKeyPath, 2, 2).'/'.$sKeyPath;
-
-			$sFilePath = $this->sCacheFolder.$this->sKeyPrefix.$sKeyPath;
-			$dir = \dirname($sFilePath);
-			if ($bMkDir && !\is_dir($dir) && !\mkdir($dir, 0700, true))
-			{
-				$sFilePath = '';
+			$sFilePath = $this->sCacheFolder . $this->sKeyPrefix
+				. \substr($sKeyPath, 0, 2) . '/' . \substr($sKeyPath, 2, 2) . '/' . $sKeyPath;
+			if ($bMkDir) {
+				$dir = \dirname($sFilePath);
+				if (!\is_dir($dir) && !\mkdir($dir, 0700, true)) {
+					\error_log("mkdir({$dir}) failed");
+					$sFilePath = '';
+				}
 			}
 		}
-
 		return $sFilePath;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Config.php b/snappymail/v/0.0.0/app/libraries/MailSo/Config.php
index cdaf705eb..c09480bb0 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Config.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Config.php
@@ -16,68 +16,5 @@ namespace MailSo;
  */
 class Config
 {
-	/**
-	 * @var int
-	 */
-	public static $MessageListFastSimpleSearch = true;
-
-	/**
-	 * @var int
-	 */
-	public static $MessageListCountLimitTrigger = 0;
-
-	/**
-	 * @var bool
-	 */
-	public static $MessageListUndeletedOnly = true;
-
-	/**
-	 * @var int
-	 */
-	public static $MessageListDateFilter = 0;
-
-	/**
-	 * @var string
-	 */
-	public static $MessageListPermanentFilter = '';
-
-	/**
-	 * @var int
-	 */
-	public static $LargeThreadLimit = 50;
-
-	/**
-	 * @var bool
-	 */
-	public static $MessageAllHeaders = false;
-
-	/**
-	 * @var bool
-	 */
-	public static $LogSimpleLiterals = false;
-
-	/**
-	 * @var bool
-	 */
-	public static $CheckNewMessages = true;
-
-	/**
-	 * @var bool
-	 */
-	public static $PreferStartTlsIfAutoDetect = true;
-
-	/**
-	 * @var string
-	 */
-	public static $BoundaryPrefix = '_Part_';
-
-	/**
-	 * @var int
-	 */
-	public static $ImapTimeout = 300;
-
-	/**
-	 * @var \MailSo\Log\Logger|null
-	 */
-	public static $SystemLogger = null;
+	public static string $BoundaryPrefix = '_Part_';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Hooks.php b/snappymail/v/0.0.0/app/libraries/MailSo/Hooks.php
deleted file mode 100644
index bcf0b999c..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Hooks.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo;
-
-/**
- * @category MailSo
- */
-class Hooks
-{
-	/**
-	 * @var array
-	 */
-	static $aCallbacks = array();
-
-	static public function Run(string $sName, array $aArg = array()) : void
-	{
-		if (isset(static::$aCallbacks[$sName]))
-		{
-			foreach (static::$aCallbacks[$sName] as $mCallback)
-			{
-				$mCallback(...$aArg);
-			}
-		}
-	}
-
-	/**
-	 * @param mixed $mCallback
-	 */
-	static public function Add(string $sName, $mCallback) : void
-	{
-		if (\is_callable($mCallback))
-		{
-			if (!isset(static::$aCallbacks[$sName]))
-			{
-				static::$aCallbacks[$sName] = array();
-			}
-
-			static::$aCallbacks[$sName][] = $mCallback;
-		}
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
index 080cfffe4..27ead9bb5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/BodyStructure.php
@@ -11,106 +11,89 @@
 
 namespace MailSo\Imap;
 
+use MailSo\Mime\Enumerations\ContentType;
+
 /**
  * @category MailSo
  * @package Imap
  */
-class BodyStructure
+class BodyStructure implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sContentType;
+	private array $aContentTypeParams;
+
+	private string
+		$sCharset = '',
+		$sContentID = '',
+		$sContentTransferEncoding = '',
+		$sContentType = '',
+		$sDescription = '',
+		$sDisposition = '',
+		$sFileName = '',
+		$sLanguage = '',
+		$sLocation = '',
+		$sPartID = '';
+
+	private int $iSize = 0;
 
 	/**
-	 * @var string
+	 * \MailSo\Imap\BodyStructure[]
 	 */
-	private $sCharset;
+	private array $aSubParts;
 
-	/**
-	 * @var array
-	 */
-	private $aBodyParams;
-
-	/**
-	 * @var string
-	 */
-	private $sContentID;
-
-	/**
-	 * @var string
-	 */
-	private $sDescription;
-
-	/**
-	 * @var string
-	 */
-	private $sMailEncodingName;
-
-	/**
-	 * @var string
-	 */
-	private $sDisposition;
-
-	/**
-	 * @var string
-	 */
-	private $sFileName;
-
-	/**
-	 * @var string
-	 */
-	private $sLanguage = '';
-
-	/**
-	 * @var string
-	 */
-	private $sLocation = '';
-
-	/**
-	 * @var int
-	 */
-	private $iSize;
-
-	/**
-	 * @var string
-	 */
-	private $sPartID;
-
-	/**
-	 * @var array
-	 */
-	private $aSubParts;
-
-	public function MailEncodingName() : string
+	public function Charset(): string
 	{
-		return $this->sMailEncodingName;
+		return $this->sCharset;
 	}
 
-	public function PartID() : string
+	public function ContentTransferEncoding(): string
 	{
-		return $this->sPartID;
+		return $this->sContentTransferEncoding;
 	}
 
-	public function FileName() : string
-	{
-		return $this->sFileName;
-	}
-
-	public function ContentType() : string
+	public function ContentType(): string
 	{
 		return $this->sContentType;
 	}
 
-	public function Size() : int
+	public function PartID(): string
 	{
-		return $this->iSize;
+		return $this->sPartID;
 	}
 
-	public function EstimatedSize() : int
+	public function FileName(bool $bCalculateOnEmpty = false): string
+	{
+		$sFileName = \trim($this->sFileName);
+		if (\strlen($sFileName) || !$bCalculateOnEmpty) {
+			return $sFileName;
+		}
+
+		$sIdx = '-' . $this->PartID();
+
+		$sMimeType = $this->sContentType;
+		if ('message/rfc822' === $sMimeType) {
+			return "message{$sIdx}.eml";
+		}
+		if ('text/calendar' === $sMimeType) {
+			return "calendar{$sIdx}.ics";
+		}
+		if ('text/plain' === $sMimeType) {
+			return "part{$sIdx}.txt";
+		}
+		if (\preg_match('@text/(vcard|html|csv|xml|css|asp)@', $sMimeType, $aMatch)
+		 || \preg_match('@image/(png|jpeg|gif|bmp|cgm|ief|tiff|webp)@', $sMimeType, $aMatch)) {
+			return "part{$sIdx}.{$aMatch[1]}";
+		}
+		if (\strlen($sMimeType)) {
+			return \str_replace('/', $sIdx.'.', $sMimeType);
+		}
+
+		return ($this->isInline() ? 'inline' : 'part' ) . $sIdx;
+	}
+
+	public function EstimatedSize(): int
 	{
 		$fCoefficient = 1;
-		switch ($this->sMailEncodingName)
+		switch ($this->sContentTransferEncoding)
 		{
 			case 'base64':
 				$fCoefficient = 0.75;
@@ -123,57 +106,30 @@ class BodyStructure
 		return (int) ($this->iSize * $fCoefficient);
 	}
 
-	public function Charset() : string
-	{
-		return $this->sCharset;
-	}
-
-	public function ContentID() : string
-	{
-		return $this->sContentID;
-	}
-
-	public function ContentLocation() : string
-	{
-		return $this->sLocation;
-	}
-
-	public function SubParts() : array
+	public function SubParts(): array
 	{
 		return $this->aSubParts;
 	}
 
-	public function IsInline() : bool
+	public function isInline(): bool
 	{
 		return 'inline' === $this->sDisposition || \strlen($this->sContentID);
 	}
 
-	public function IsImage() : bool
+	public function isText(): bool
 	{
-		return 'image' === \MailSo\Base\Utils::ContentTypeType($this->sContentType, $this->sFileName);
+		return 'text/html' === $this->sContentType
+			|| 'text/plain' === $this->sContentType
+			// Also the useless AMP content
+			|| 'text/x-amp-html' === $this->sContentType;
 	}
 
-	public function IsArchive() : bool
+	// https://datatracker.ietf.org/doc/html/rfc3156#section-4
+	public function isPgpEncrypted(): bool
 	{
-		return 'archive' === \MailSo\Base\Utils::ContentTypeType($this->sContentType, $this->sFileName);
-	}
-
-	public function IsPdf() : bool
-	{
-		return 'pdf' === \MailSo\Base\Utils::ContentTypeType($this->sContentType, $this->sFileName);
-	}
-
-	public function IsDoc() : bool
-	{
-		return 'doc' === \MailSo\Base\Utils::ContentTypeType($this->sContentType, $this->sFileName);
-	}
-
-	public function IsPgpEncrypted() : bool
-	{
-		// https://datatracker.ietf.org/doc/html/rfc3156#section-4
 		return 'multipart/encrypted' === $this->sContentType
-		 && !empty($this->aBodyParams['protocol'])
-		 && 'application/pgp-encrypted' === \strtolower(\trim($this->aBodyParams['protocol']))
+		 && !empty($this->aContentTypeParams['protocol'])
+		 && 'application/pgp-encrypted' === \strtolower(\trim($this->aContentTypeParams['protocol']))
 		 // The multipart/encrypted body MUST consist of exactly two parts.
 		 && 2 === \count($this->aSubParts)
 		 && 'application/pgp-encrypted' === $this->aSubParts[0]->ContentType()
@@ -181,48 +137,66 @@ class BodyStructure
 //		 && 'Version: 1' === $this->aSubParts[0]->Body()
 	}
 
-	public function IsPgpSigned() : bool
+	// https://datatracker.ietf.org/doc/html/rfc3156#section-5
+	public function isPgpSigned(): bool
 	{
-		// https://datatracker.ietf.org/doc/html/rfc3156#section-5
 		return 'multipart/signed' === $this->sContentType
-		 && !empty($this->aBodyParams['protocol'])
-		 && 'application/pgp-signature' === \strtolower(\trim($this->aBodyParams['protocol']))
+		 && !empty($this->aContentTypeParams['protocol'])
+		 && 'application/pgp-signature' === \strtolower(\trim($this->aContentTypeParams['protocol']))
 		 // The multipart/signed body MUST consist of exactly two parts.
 		 && 2 === \count($this->aSubParts)
-		 && $this->aSubParts[1]->IsPgpSignature();
+		 && 'application/pgp-signature' === $this->aSubParts[1]->ContentType();
 	}
 
-	public function IsPgpSignature() : bool
+	// https://datatracker.ietf.org/doc/html/rfc2633#section-3.3
+	public function isSMimeEncrypted(): bool
 	{
-		return \in_array($this->sContentType, ['application/pgp-signature', 'application/pkcs7-signature']);
+		$type = \strtolower(\trim($this->aContentTypeParams['smime-type'] ?? ''));
+		return ContentType::isPkcs7Mime($this->sContentType)
+		 && !empty($this->aContentTypeParams['smime-type'])
+		 && ('enveloped-data' === $type || 'authenveloped-data' === $type);
 	}
 
-	public function IsAttachBodyPart() : bool
+	// https://www.rfc-editor.org/rfc/rfc8551.html#section-3.5
+	public function isSMimeSigned(): bool
 	{
-		return 'application/pgp-encrypted' !== $this->sContentType
+		return ('multipart/signed' === $this->sContentType
+			&& !empty($this->aContentTypeParams['protocol'])
+			&& ContentType::isPkcs7Signature(\strtolower(\trim($this->aContentTypeParams['protocol'])))
+			// The multipart/signed body MUST consist of exactly two parts.
+			&& 2 === \count($this->aSubParts)
+			&& ContentType::isPkcs7Signature($this->aSubParts[1]->ContentType())
+		) || (ContentType::isPkcs7Mime($this->sContentType)
+			&& !empty($this->aContentTypeParams['smime-type'])
+			&& 'signed-data' === \strtolower(\trim($this->aContentTypeParams['smime-type']))
+		);
+	}
+
+	protected function IsAttachment(/*BodyStructure*/ $oParent): bool
+	{
+//		return 'application/pgp-encrypted' !== $this->sContentType
+		return (!$oParent || !$oParent->isPgpEncrypted())
 		 && (
 			'attachment' === $this->sDisposition || (
 				!\str_starts_with($this->sContentType, 'multipart/')
-				&& 'text/html' !== $this->sContentType
-				&& 'text/plain' !== $this->sContentType
+				&& !$this->isText()
 			)
 		);
 	}
 
-	public function IsFlowedFormat() : bool
+	public function IsFlowedFormat(): bool
 	{
-		return !empty($this->aBodyParams['format'])
-			&& 'flowed' === \strtolower(\trim($this->aBodyParams['format']))
-			&& !\in_array($this->sMailEncodingName, array('base64', 'quoted-printable'));
+		return !empty($this->aContentTypeParams['format'])
+			&& 'flowed' === \strtolower(\trim($this->aContentTypeParams['format']))
+			&& !\in_array($this->sContentTransferEncoding, array('base64', 'quoted-printable'));
 	}
 
-	public function GetHtmlAndPlainParts() : array
+	public function GetHtmlAndPlainParts(): array
 	{
 		$aParts = [];
 
-		$gParts = $this->SearchByCallback(function ($oItem) {
-			return ('text/html' === $oItem->sContentType || 'text/plain' === $oItem->sContentType)
-				&& !$oItem->IsAttachBodyPart();
+		$gParts = $this->SearchByCallback(function ($oItem, $oParent) {
+			return $oItem->isText() && !$oItem->IsAttachment($oParent);
 		});
 		foreach ($gParts as $oPart) {
 			$aParts[] = $oPart;
@@ -231,41 +205,48 @@ class BodyStructure
 		/**
 		 * No text found, is it encrypted?
 		 * If so, just return that.
+		 * Only when \RainLoop\Api::Config()->Get('security', 'openpgp', true)
 		 */
 		if (!$aParts) {
 			$gEncryptedParts = $this->SearchByContentType('multipart/encrypted');
 			foreach ($gEncryptedParts as $oPart) {
-				if ($oPart->IsPgpEncrypted() && $oPart->SubParts()[1]->IsInline()) {
+				if ($oPart->isPgpEncrypted()) {
 					return array($oPart->SubParts()[1]);
 				}
 			}
 		}
 
+		/**
+		 * Still no text found?
+		 * Look in attachments as it could be an X-Mms-Message
+		 * https://github.com/the-djmaze/snappymail/issues/1294
+		 */
+		if (!$aParts) {
+			$gParts = $this->SearchByCallback(fn($oItem) => $oItem->isText());
+			foreach ($gParts as $oPart) {
+				$aParts[] = $oPart;
+			}
+		}
+
 		return $aParts;
 	}
 
-	public function SearchCharset() : string
+	public function SearchCharset(): string
 	{
-		$gParts = $this->SearchByCallback(function ($oPart) {
-			return $oPart->Charset()
-				&& ('text/html' === $oPart->sContentType || 'text/plain' === $oPart->sContentType)
-				&& !$oPart->IsAttachBodyPart();
+		$gParts = $this->SearchByCallback(function ($oPart, $oParent) {
+			return $oPart->Charset() && $oPart->isText() && !$oPart->IsAttachment($oParent);
 		});
 
 		if (!$gParts->valid()) {
-			$gParts = $this->SearchByCallback(function ($oPart) {
-				return $oPart->Charset() && $oPart->IsAttachBodyPart();
+			$gParts = $this->SearchByCallback(function ($oPart, $oParent) {
+				return $oPart->Charset() && $oPart->IsAttachment($oParent);
 			});
 		}
 
 		return $gParts->valid() ? $gParts->current()->Charset() : '';
 	}
 
-	/**
-	 * @param mixed $fCallback
-	 */
-//	public function SearchByCallback($fCallback) : \Generator
-	public function SearchByCallback($fCallback, $parent = null) : iterable
+	public function SearchByCallback(callable $fCallback, /*?BodyStructure*/ $parent = null): iterable
 	{
 		if ($fCallback($this, $parent)) {
 			yield $this;
@@ -275,15 +256,15 @@ class BodyStructure
 		}
 	}
 
-	public function SearchAttachmentsParts() : iterable
+	public function SearchAttachmentsParts(): iterable
 	{
 		return $this->SearchByCallback(function ($oItem, $oParent) {
-//			return $oItem->IsAttachBodyPart();
-			return $oItem->IsAttachBodyPart() && (!$oParent || !$oParent->IsPgpEncrypted());
+//			return $oItem->IsAttachment();
+			return $oItem->IsAttachment($oParent) && (!$oParent || !$oParent->isPgpEncrypted());
 		});
 	}
 
-	public function SearchByContentType(string $sContentType) : iterable
+	public function SearchByContentType(string $sContentType): iterable
 	{
 		$sContentType = \strtolower($sContentType);
 		return $this->SearchByCallback(function ($oItem) use ($sContentType) {
@@ -291,23 +272,25 @@ class BodyStructure
 		});
 	}
 
-	public function GetPartByMimeIndex(string $sMimeIndex) : self
+	public function SearchByContentTypes(array $aContentTypes): iterable
+	{
+		return $this->SearchByCallback(function ($oItem) use ($aContentTypes) {
+			return \in_array($oItem->sContentType, $aContentTypes);
+		});
+	}
+
+	public function GetPartByMimeIndex(string $sMimeIndex): self
 	{
 		$oPart = null;
-		if (\strlen($sMimeIndex))
-		{
-			if ($sMimeIndex === $this->sPartID)
-			{
+		if (\strlen($sMimeIndex)) {
+			if ($sMimeIndex === $this->sPartID) {
 				$oPart = $this;
 			}
 
-			if (null === $oPart)
-			{
-				foreach ($this->aSubParts as /* @var $oSubPart \MailSo\Imap\BodyStructure */ $oSubPart)
-				{
+			if (null === $oPart) {
+				foreach ($this->aSubParts as /* @var $oSubPart \MailSo\Imap\BodyStructure */ $oSubPart) {
 					$oPart = $oSubPart->GetPartByMimeIndex($sMimeIndex);
-					if (null !== $oPart)
-					{
+					if (null !== $oPart) {
 						break;
 					}
 				}
@@ -317,63 +300,46 @@ class BodyStructure
 		return $oPart;
 	}
 
-	private static function decodeAttrParameter(array $aParams, string $sParamName, string $sCharset) : string
+	private static function decodeAttrParameter(array $aParams, string $sParamName, string $sCharset): string
 	{
 		$sResult = '';
-		if (isset($aParams[$sParamName]))
-		{
+		if (isset($aParams[$sParamName])) {
 			$sResult = \MailSo\Base\Utils::DecodeHeaderValue($aParams[$sParamName], $sCharset);
-		}
-		else if (isset($aParams[$sParamName.'*']))
-		{
+		} else if (isset($aParams[$sParamName.'*'])) {
 			$aValueParts = \explode("''", $aParams[$sParamName.'*'], 2);
-			if (2 === \count($aValueParts))
-			{
+			if (2 === \count($aValueParts)) {
 				$sCharset = isset($aValueParts[0]) ? $aValueParts[0] : \MailSo\Base\Enumerations\Charset::UTF_8;
-
 				$sResult = \MailSo\Base\Utils::ConvertEncoding(
 					\urldecode($aValueParts[1]), $sCharset, \MailSo\Base\Enumerations\Charset::UTF_8);
-			}
-			else
-			{
+			} else {
 				$sResult = \urldecode($aParams[$sParamName.'*']);
 			}
-		}
-		else
-		{
+		} else {
 			$sCharset = '';
 			$sCharsetIndex = -1;
 
 			$aFileNames = array();
-			foreach ($aParams as $sName => $sValue)
-			{
+			foreach ($aParams as $sName => $sValue) {
 				$aMatches = array();
-				if (\preg_match('/^'.\preg_quote($sParamName, '/').'\*([0-9]+)\*$/i', $sName, $aMatches))
-				{
+				if (\preg_match('/^'.\preg_quote($sParamName, '/').'\*([0-9]+)\*$/i', $sName, $aMatches)) {
 					$iIndex = (int) $aMatches[1];
-					if ($sCharsetIndex < $iIndex && false !== \strpos($sValue, "''"))
-					{
+					if ($sCharsetIndex < $iIndex && false !== \strpos($sValue, "''")) {
 						$aValueParts = \explode("''", $sValue, 2);
-						if (2 === \count($aValueParts) && \strlen($aValueParts[0]))
-						{
+						if (2 === \count($aValueParts) && \strlen($aValueParts[0])) {
 							$sCharsetIndex = $iIndex;
 							$sCharset = $aValueParts[0];
 							$sValue = $aValueParts[1];
 						}
 					}
-
 					$aFileNames[$iIndex] = $sValue;
 				}
 			}
 
-			if (\count($aFileNames))
-			{
+			if (\count($aFileNames)) {
 				\ksort($aFileNames, SORT_NUMERIC);
 				$sResult = \implode(\array_values($aFileNames));
 				$sResult = \urldecode($sResult);
-
-				if (\strlen($sCharset))
-				{
+				if (\strlen($sCharset)) {
 					$sResult = \MailSo\Base\Utils::ConvertEncoding($sResult,
 						$sCharset, \MailSo\Base\Enumerations\Charset::UTF_8);
 				}
@@ -383,39 +349,34 @@ class BodyStructure
 		return $sResult;
 	}
 
-	public static function NewInstance(array $aBodyStructure, string $sPartID = '') : ?self
+	public static function NewInstance(array $aBodyStructure, string $sPartID = ''): ?self
 	{
-		if (2 > \count($aBodyStructure))
-		{
+		if (2 > \count($aBodyStructure)) {
 			return null;
 		}
 
 		$sContentTypeMain = '';
 		$sContentTypeSub = '';
 		$aSubParts = array();
-		$aBodyParams = array();
-		$sName = '';
+		$aContentTypeParams = array();
+		$sFileName = '';
 		$sCharset = ''; // \MailSo\Base\Enumerations\Charset::UTF_8 ?
 		$sContentID = '';
 		$sDescription = '';
-		$sMailEncodingName = '';
+		$sContentTransferEncoding = '';
 		$iSize = 0;
 		$iExtraItemPos = 0;  // list index of items which have no well-established position (such as 0, 1, 5, etc).
 
-		if (\is_array($aBodyStructure[0]))
-		{
+		if (\is_array($aBodyStructure[0])) {
 			// Process multipart body structure
 			$sContentTypeMain = 'multipart';
 			$sContentTypeSub = 'mixed'; // primary default
 			$sSubPartIDPrefix = '';
-			if (!\strlen($sPartID) || '.' === $sPartID[\strlen($sPartID) - 1])
-			{
+			if (!\strlen($sPartID) || '.' === $sPartID[\strlen($sPartID) - 1]) {
 				// This multi-part is root part of message.
 				$sSubPartIDPrefix = $sPartID;
 				$sPartID .= 'TEXT';
-			}
-			else if (\strlen($sPartID))
-			{
+			} else if (\strlen($sPartID)) {
 				// This multi-part is a part of another multi-part.
 				$sSubPartIDPrefix = $sPartID.'.';
 			}
@@ -427,18 +388,15 @@ class BodyStructure
 		 		("text" "plain" ("charset" "utf-8") …)
 				("text" "html" …)
 			 */
-			while ($iExtraItemPos < \count($aBodyStructure) && \is_array($aBodyStructure[$iExtraItemPos]))
-			{
+			while ($iExtraItemPos < \count($aBodyStructure) && \is_array($aBodyStructure[$iExtraItemPos])) {
 				$oPart = self::NewInstance($aBodyStructure[$iExtraItemPos], $sSubPartIDPrefix.$iIndex);
-				if (!$oPart)
-				{
+				if (!$oPart) {
 					return null;
 				}
 
 				// For multipart, we have no charset info in the part itself. Thus,
 				// obtain charset from nested parts.
-				if (!$sCharset)
-				{
+				if (!$sCharset) {
 					$sCharset = $oPart->Charset();
 				}
 
@@ -451,26 +409,20 @@ class BodyStructure
 			 * Now process the subparts containter like:
 				"alternative" ("boundary" "--boundary_id") …
 			 */
-			if ($iExtraItemPos < \count($aBodyStructure))
-			{
-				if (!\is_string($aBodyStructure[$iExtraItemPos]))
-				{
+			if ($iExtraItemPos < \count($aBodyStructure)) {
+				if (!\is_string($aBodyStructure[$iExtraItemPos])) {
 					return null;
 				}
 				$sContentTypeSub = \strtolower($aBodyStructure[$iExtraItemPos]);
 
 				++$iExtraItemPos;
-				if ($iExtraItemPos < \count($aBodyStructure) && \is_array($aBodyStructure[$iExtraItemPos]))
-				{
-					$aBodyParams = self::getKeyValueListFromArrayList($aBodyStructure[$iExtraItemPos]);
+				if ($iExtraItemPos < \count($aBodyStructure) && \is_array($aBodyStructure[$iExtraItemPos])) {
+					$aContentTypeParams = self::getKeyValueListFromArrayList($aBodyStructure[$iExtraItemPos]);
 				}
 			}
-		}
-		else if (\is_string($aBodyStructure[0]))
-		{
+		} else if (\is_string($aBodyStructure[0])) {
 			// Process simple (singlepart) body structure
-			if (7 > \count($aBodyStructure) || !\is_string($aBodyStructure[1]))
-			{
+			if (7 > \count($aBodyStructure) || !\is_string($aBodyStructure[1])) {
 				return null;
 			}
 
@@ -478,64 +430,54 @@ class BodyStructure
 			$sContentTypeSub = \strtolower($aBodyStructure[1]);
 
 			$aBodyParamList = $aBodyStructure[2];
-			if (\is_array($aBodyParamList))
-			{
-				$aBodyParams = self::getKeyValueListFromArrayList($aBodyParamList);
-				if (isset($aBodyParams['charset']))
-				{
-					$sCharset = $aBodyParams['charset'];
+			if (\is_array($aBodyParamList)) {
+				$aContentTypeParams = self::getKeyValueListFromArrayList($aBodyParamList);
+				if (isset($aContentTypeParams['charset'])) {
+					$sCharset = $aContentTypeParams['charset'];
+				}
+				$sFileName = self::decodeAttrParameter($aContentTypeParams, 'name', $sCharset);
+				if ($sFileName) {
+					$aContentTypeParams['name'] = $sFileName;
 				}
-
-				$sName = self::decodeAttrParameter($aBodyParams, 'name', $sCharset);
 			}
 
-			if (null !== $aBodyStructure[3])
-			{
-				if (!\is_string($aBodyStructure[3]))
-				{
+			if (null !== $aBodyStructure[3]) {
+				if (!\is_string($aBodyStructure[3])) {
 					return null;
 				}
 				$sContentID = $aBodyStructure[3];
 			}
 
-			if (null !== $aBodyStructure[4])
-			{
-				if (!\is_string($aBodyStructure[4]))
-				{
+			if (null !== $aBodyStructure[4]) {
+				if (!\is_string($aBodyStructure[4])) {
 					return null;
 				}
 				$sDescription = $aBodyStructure[4];
 			}
 
-			if (null !== $aBodyStructure[5])
-			{
-				if (!\is_string($aBodyStructure[5]))
-				{
+			if (null !== $aBodyStructure[5]) {
+				if (!\is_string($aBodyStructure[5])) {
 					return null;
 				}
-				$sMailEncodingName = $aBodyStructure[5];
+				$sContentTransferEncoding = $aBodyStructure[5];
 			}
 
-			$iSize = \is_numeric($aBodyStructure[6]) ? (int) $aBodyStructure[6] : -1;
+			$iSize = \is_numeric($aBodyStructure[6]) ? (int) $aBodyStructure[6] : 0;
 
-			if (!\strlen($sPartID) || '.' === $sPartID[\strlen($sPartID) - 1])
-			{
+			if (!\strlen($sPartID) || '.' === $sPartID[\strlen($sPartID) - 1]) {
 				// This is the only sub-part of the message (otherwise, it would be
 				// one of sub-parts of a multi-part, and partID would already be fully set up).
 				$sPartID .= '1';
 			}
 
 			$iExtraItemPos = 7;
-			if ('text' === $sContentTypeMain)
-			{
+			if ('text' === $sContentTypeMain) {
 				/**
 				 * A body type of type TEXT contains, immediately after the basic
 				 * fields, the size of the body in text lines.
 				 */
 				++$iExtraItemPos;
-			}
-			else if ('message' === $sContentTypeMain && 'rfc822' === $sContentTypeSub)
-			{
+			} else if ('message' === $sContentTypeMain && 'rfc822' === $sContentTypeSub) {
 				/**
 				 * A body type of type MESSAGE and subtype RFC822 contains,
 				 * immediately after the basic fields, the envelope structure,
@@ -543,9 +485,7 @@ class BodyStructure
 				 */
 				$iExtraItemPos += 3;
 			}
-		}
-		else
-		{
+		} else {
 			return null;
 		}
 
@@ -553,20 +493,15 @@ class BodyStructure
 		++$iExtraItemPos;
 
 		$sDisposition = '';
-		$sFileName = '';
 
-		if ($iExtraItemPos < \count($aBodyStructure))
-		{
+		if ($iExtraItemPos < \count($aBodyStructure)) {
 			$aDispList = $aBodyStructure[$iExtraItemPos];
-			if (\is_array($aDispList) && 1 < \count($aDispList))
-			{
-				if (!\is_string($aDispList[0]))
-				{
+			if (\is_array($aDispList) && 1 < \count($aDispList)) {
+				if (!\is_string($aDispList[0])) {
 					return null;
 				}
 				$sDisposition = $aDispList[0];
-				if (\is_array($aDispList[1]))
-				{
+				if (\is_array($aDispList[1])) {
 					$aDispositionParams = self::getKeyValueListFromArrayList($aDispList[1]);
 					$sFileName = self::decodeAttrParameter($aDispositionParams, 'filename', $sCharset);
 				}
@@ -575,32 +510,27 @@ class BodyStructure
 		}
 
 		$oStructure = new self;
-		$oStructure->sContentType = \strtolower($sContentTypeMain.'/'.$sContentTypeSub);
+		$oStructure->sContentType = \strtolower(\trim($sContentTypeMain.'/'.$sContentTypeSub));
+		$oStructure->aContentTypeParams = $aContentTypeParams;
 		$oStructure->sCharset = $sCharset;
-		$oStructure->aBodyParams = $aBodyParams;
-		$oStructure->sContentID = $sContentID;
+		$oStructure->sContentID = \trim($sContentID);
 		$oStructure->sDescription = $sDescription;
-		$oStructure->sMailEncodingName = \strtolower($sMailEncodingName);
+		$oStructure->sContentTransferEncoding = \strtolower($sContentTransferEncoding);
 		$oStructure->sDisposition = \strtolower($sDisposition);
-		$oStructure->sFileName = \MailSo\Base\Utils::Utf8Clear($sFileName ?: $sName);
+		$oStructure->sFileName = \MailSo\Base\Utils::Utf8Clear($sFileName);
 		$oStructure->iSize = $iSize;
 		$oStructure->sPartID = $sPartID;
 		$oStructure->aSubParts = $aSubParts;
 
-		if ($iExtraItemPos < \count($aBodyStructure))
-		{
-			if (\is_array($aBodyStructure[$iExtraItemPos]))
-			{
+		if ($iExtraItemPos < \count($aBodyStructure)) {
+			if (\is_array($aBodyStructure[$iExtraItemPos])) {
 				$oStructure->sLanguage = \implode(',', $aBodyStructure[$iExtraItemPos]);
-			}
-			else if (\is_string($aBodyStructure[$iExtraItemPos]))
-			{
+			} else if (\is_string($aBodyStructure[$iExtraItemPos])) {
 				$oStructure->sLanguage = $aBodyStructure[$iExtraItemPos];
 			}
 			++$iExtraItemPos;
 
-			if ($iExtraItemPos < \count($aBodyStructure) && \is_string($aBodyStructure[$iExtraItemPos]))
-			{
+			if ($iExtraItemPos < \count($aBodyStructure) && \is_string($aBodyStructure[$iExtraItemPos])) {
 				$oStructure->sLocation = $aBodyStructure[$iExtraItemPos];
 			}
 		}
@@ -612,16 +542,13 @@ class BodyStructure
 	 * Returns dict with key="charset" and value="US-ASCII" for array ("CHARSET" "US-ASCII").
 	 * Keys are lowercased (StringDictionary itself does this), values are not altered.
 	 */
-	private static function getKeyValueListFromArrayList(array $aList) : array
+	private static function getKeyValueListFromArrayList(array $aList): array
 	{
 		$aDict = array();
 		$iLen = \count($aList);
-		if (0 === ($iLen % 2))
-		{
-			for ($iIndex = 0; $iIndex < $iLen; $iIndex += 2)
-			{
-				if (\is_string($aList[$iIndex]) && \is_string($aList[$iIndex + 1]))
-				{
+		if (0 === ($iLen % 2)) {
+			for ($iIndex = 0; $iIndex < $iLen; $iIndex += 2) {
+				if (\is_string($aList[$iIndex]) && \is_string($aList[$iIndex + 1])) {
 					$aDict[\strtolower($aList[$iIndex])] = $aList[$iIndex + 1];
 				}
 			}
@@ -629,4 +556,19 @@ class BodyStructure
 
 		return $aDict;
 	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return array(
+			'mimeIndex' => $this->sPartID,
+			'mimeType' => $this->sContentType,
+//			'mimeTypeParams' => $this->aContentTypeParams,
+			'fileName' => \MailSo\Base\Utils::SecureFileName($this->FileName(true)),
+			'estimatedSize' => $this->EstimatedSize(),
+			'cId' => $this->sContentID,
+			'contentLocation' => $this->sLocation,
+			'isInline' => $this->isInline()
+		);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/ACL.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/ACL.php
index 86c80b3ac..103bf3b1e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/ACL.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/ACL.php
@@ -19,60 +19,91 @@ use MailSo\Imap\Responses\ACL as ACLResponse;
  */
 trait ACL
 {
+	private $ACLDisabled = false;
+
 	/**
 	 * https://datatracker.ietf.org/doc/html/rfc4314#section-4
 	 */
 	public function ACLAllow(string $sFolderName, string $command) : bool
 	{
-		if ($this->IsSupported('ACL') || $this->IsSupported('RIGHTS=texk')) {
-			if ('MYRIGHTS' === $command) {
+		if ($this->ACLDisabled || !$this->hasCapability('ACL')) {
+			return false;
+		}
+
+		// The "RIGHTS=" capability MUST NOT include any of the rights defined in RFC 2086:
+		// "l", "r", "s", "w", "i", "p", "a", "c", "d", and the digits ("0" .. "9")
+		// So it is: RIGHTS=texk
+//		$mainRights = \str_split($this->CapabilityValue('RIGHTS') ?: '');
+
+		if ('MYRIGHTS' === $command) {
+			// at least one of the "l", "r", "i", "k", "x", "a" rights is required
+			return true;
+		}
+
+		if (\in_array($command, ['GETACL','SETACL','LISTRIGHTS','DELETEACL'])) {
+			return true;
+		}
+
+		$rights = $this->FolderMyRights($sFolderName);
+		if ($rights) {
+			switch ($command)
+			{
+			case 'LIST':
+			case 'LSUB':
+				return $rights->hasRight('LOOKUP');
+			case 'CREATE':
+				return true; // $parent->$rights->hasRight('k');
+			case 'DELETE':
+				return $rights->hasRight('x');
+			case 'RENAME':
+				return $rights->hasRight('k') && $rights->hasRight('x');
+			case 'SELECT':
+			case 'EXAMINE':
+			case 'STATUS':
+				return $rights->hasRight('r');
+			case 'APPEND':
+			case 'COPY':
+				return $rights->hasRight('i');
+			case 'EXPUNGE':
+				return $rights->hasRight('e');
+/*
+			case 'SUBSCRIBE':
+				return $rights->hasRight('l') || true;
+			case 'UNSUBSCRIBE':
 				return true;
-			}
-			$rights = $this->FolderMyRights($sFolderName);
-			if ($rights) {
-				switch ($command)
-				{
-				case 'LIST':
-				case 'LSUB':
-					return $rights->hasRight('LOOKUP');
-				case 'CREATE':
-					return true; // $parent->$rights->hasRight('k');
-				case 'DELETE':
-					return $rights->hasRight('x');
-				case 'RENAME':
-					return $rights->hasRight('k') && $rights->hasRight('x');
-				case 'SELECT':
-				case 'EXAMINE':
-				case 'STATUS':
-					return $rights->hasRight('r');
-				case 'APPEND':
-				case 'COPY':
-					return $rights->hasRight('i');
-				case 'EXPUNGE':
-					return $rights->hasRight('e');
-
-//				case 'SUBSCRIBE':
-//				case 'UNSUBSCRIBE':
-//				case 'CLOSE':
-//				case 'FETCH':
-//				case 'STORE':
-
-				case 'GETACL':
-				case 'SETACL':
-				case 'LISTRIGHTS':
-				case 'DELETEACL':
-					return $rights->hasRight('a');
-				}
+			case 'CLOSE':
+				return $rights->hasRight('e') || true;
+			case 'FETCH':
+				return $rights->hasRight('s') || true;
+			case 'STORE':
+				return $rights->hasRight('s') || $rights->hasRight('w') || $rights->hasRight('t');
+*/
+			case 'GETACL':
+			case 'SETACL':
+			case 'LISTRIGHTS':
+			case 'DELETEACL':
+				return $rights->hasRight('a');
 			}
 		}
-		return !\in_array($command, ['GETACL','SETACL','LISTRIGHTS','DELETEACL','MYRIGHTS']);
+		return true;
+	}
+
+	private function FolderACLRequest(string $sFolderName, string $sCommand, array $aParams) : \MailSo\Imap\ResponseCollection
+	{
+		if ($this->ACLAllow($sFolderName, $sCommand)) try {
+//			\array_unshift($aParams, $this->EscapeFolderName($sFolderName));
+			return $this->SendRequestGetResponse($sCommand, $aParams);
+		} catch (\Throwable $oException) {
+			// Error in IMAP command $sCommand: ACLs disabled
+			$this->ACLDisabled = true;
+			throw $oException;
+		}
 	}
 
 	public function FolderSetACL(string $sFolderName, string $sIdentifier, string $sAccessRights) : void
 	{
-//		if ($this->ACLAllow($sFolderName, 'SETACL')) {
-		$this->SendRequestGetResponse('SETACL', array(
-			$this->EscapeString($sFolderName),
+		$this->FolderACLRequest($sFolderName, 'SETACL', array(
+			$this->EscapeFolderName($sFolderName),
 			$this->EscapeString($sIdentifier),
 			$this->EscapeString($sAccessRights)
 		));
@@ -80,26 +111,39 @@ trait ACL
 
 	public function FolderDeleteACL(string $sFolderName, string $sIdentifier) : void
 	{
-//		if ($this->ACLAllow($sFolderName, 'DELETEACL')) {
-		$this->SendRequestGetResponse('DELETEACL', array(
-			$this->EscapeString($sFolderName),
+		$this->FolderACLRequest($sFolderName, 'DELETEACL', array(
+			$this->EscapeFolderName($sFolderName),
 			$this->EscapeString($sIdentifier)
 		));
 	}
 
 	public function FolderGetACL(string $sFolderName) : array
 	{
-//		if ($this->ACLAllow($sFolderName, 'GETACL')) {
-		$oResponses = $this->SendRequestGetResponse('GETACL', array($this->EscapeString($sFolderName)));
 		$aResult = array();
-		foreach ($oResponses as $oResponse) {
-			if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
-				&& isset($oResponse->ResponseList[4])
-				&& 'ACL' === $oResponse->ResponseList[1]
-				&& $sFolderName === $oResponse->ResponseList[2]
-			)
-			{
-				$aResult[$oResponse->ResponseList[3]] = static::aclRightsToClass(\array_slice($oResponse->ResponseList, 4));
+		$response = $this->FolderMyRights($sFolderName);
+		$aResult[] = $response;
+		if ($response->hasRight('a')) {
+			// Else error: "NOPERM You lack administrator privileges on this mailbox."
+			$oResponses = $this->FolderACLRequest($sFolderName, 'GETACL', array($this->EscapeFolderName($sFolderName)));
+			foreach ($oResponses as $oResponse) {
+				// * ACL INBOX.shared demo@snappymail.eu akxeilprwtscd demo2@snappymail.eu lrwstipekxacd
+				if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
+					&& isset($oResponse->ResponseList[4])
+					&& 'ACL' === $oResponse->ResponseList[1]
+					&& $sFolderName === $oResponse->ResponseList[2]
+				)
+				{
+					$c = \count($oResponse->ResponseList);
+					for ($i = 3; $i < $c; $i += 2) {
+						$response = new ACLResponse(
+							$oResponse->ResponseList[$i],
+							$oResponse->ResponseList[$i+1]
+						);
+						if ($response->identifier() != $this->Settings->username) {
+							$aResult[] = $response;
+						}
+					}
+				}
 			}
 		}
 		return $aResult;
@@ -107,9 +151,8 @@ trait ACL
 
 	public function FolderListRights(string $sFolderName, string $sIdentifier) : ?ACLResponse
 	{
-//		if ($this->ACLAllow($sFolderName, 'LISTRIGHTS')) {
-		$oResponses = $this->SendRequestGetResponse('LISTRIGHTS', array(
-			$this->EscapeString($sFolderName),
+		$oResponses = $this->FolderACLRequest($sFolderName, 'LISTRIGHTS', array(
+			$this->EscapeFolderName($sFolderName),
 			$this->EscapeString($sIdentifier)
 		));
 		foreach ($oResponses as $oResponse) {
@@ -120,16 +163,19 @@ trait ACL
 				&& $sIdentifier === $oResponse->ResponseList[3]
 			)
 			{
-				return static::aclRightsToClass(\array_slice($oResponse->ResponseList, 4));
+				foreach (\array_slice($oResponse->ResponseList, 4) as $rule) {
+					$result = \array_merge($result, \str_split($rule));
+				}
+				return new ACLResponse($sIdentifier, \implode('', \array_unique($result)));
 			}
 		}
 		return null;
 	}
 
-	public function FolderMyRights(string $sFolderName) : ?ACLResponse
+	public function FolderMyRights(string $sFolderName) : ACLResponse
 	{
-//		if ($this->IsSupported('ACL')) {
-		$oResponses = $this->SendRequestGetResponse('MYRIGHTS', array($this->EscapeString($sFolderName)));
+		$oResponses = $this->FolderACLRequest($sFolderName, 'MYRIGHTS', array($this->EscapeFolderName($sFolderName)));
+		$rights = '';
 		foreach ($oResponses as $oResponse) {
 			if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
 				&& isset($oResponse->ResponseList[3])
@@ -137,19 +183,12 @@ trait ACL
 				&& $sFolderName === $oResponse->ResponseList[2]
 			)
 			{
-				return static::aclRightsToClass(\array_slice($oResponse->ResponseList, 3));
+				$rights = $oResponse->ResponseList[3];
+				break;
 			}
 		}
-		return null;
+		$response = new ACLResponse($this->Settings->username, $rights);
+		$response->mine = true;
+		return $response;
 	}
-
-	private static function aclRightsToClass(array $rules) : ACLResponse
-	{
-		$result = array();
-		foreach ($rules as $rule) {
-			$result = \array_merge($result, \str_split($rule));
-		}
-		return new ACLResponse(\array_unique($result));
-	}
-
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
index 4a538d744..7210e6add 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Folders.php
@@ -13,10 +13,12 @@
 namespace MailSo\Imap\Commands;
 
 use MailSo\Imap\Folder;
+use MailSo\Imap\FolderCollection;
 use MailSo\Imap\FolderInformation;
 use MailSo\Imap\SequenceSet;
 use MailSo\Imap\Enumerations\FolderStatus;
-use MailSo\Imap\Enumerations\FolderResponseStatus;
+use MailSo\Imap\Enumerations\MessageFlag;
+use MailSo\Imap\Enumerations\StoreAction;
 
 /**
  * @category MailSo
@@ -25,118 +27,166 @@ use MailSo\Imap\Enumerations\FolderResponseStatus;
 trait Folders
 {
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
 	 */
-	public function FolderCreate(string $sFolderName) : self
+	public function FolderClear(string $sFolderFullName) : void
+	{
+		if (0 < $this->FolderSelect($sFolderFullName)->MESSAGES) {
+			$this->MessageStoreFlag(new SequenceSet('1:*', false),
+				array(MessageFlag::DELETED),
+				StoreAction::ADD_FLAGS_SILENT
+			);
+			$this->FolderExpunge();
+		}
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 */
+	public function FolderCreate(string $sFolderName, bool $bSubscribe = false) : void
 	{
 		$this->SendRequestGetResponse('CREATE', array(
 			$this->EscapeFolderName($sFolderName)
 //			, ['(USE (\Drafts \Sent))'] RFC 6154
 		));
-		return $this;
+		$bSubscribe && $this->FolderSubscribe($sFolderName);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderDelete(string $sFolderName) : self
+	public function FolderDelete(string $sFolderName) : void
 	{
+		if (!$sFolderName || 'INBOX' === $sFolderName) {
+			throw new \ValueError;
+		}
+
+		$oInfo = $this->hasCapability('IMAP4rev2')
+			? $this->FolderExamine($sFolderName)
+			: $this->FolderStatus($sFolderName);
+		if ($oInfo->MESSAGES) {
+			throw new \MailSo\Mail\Exceptions\NonEmptyFolder;
+		}
+
+		$this->FolderUnsubscribe($sFolderName);
+		$this->FolderUnselect();
+
 		// Uncomment will work issue #124 ?
 //		$this->selectOrExamineFolder($sFolderName, true);
-		$this->SendRequestGetResponse('DELETE',
-			array($this->EscapeFolderName($sFolderName)));
+		$this->SendRequestGetResponse('DELETE', [$this->EscapeFolderName($sFolderName)]);
 //		$this->FolderCheck();
-//		$this->FolderUnselect();
 
-		// Will this workaround solve Dovecot issue #124 ?
+		// Will this workaround solve Dovecot issue?
+		// https://github.com/the-djmaze/snappymail/issues/124
 		try {
 			$this->FolderRename($sFolderName, "{$sFolderName}-dummy");
 			$this->FolderRename("{$sFolderName}-dummy", $sFolderName);
-		} catch (\Throwable $e) {
+		} catch (\Throwable $oException) {
+			$this->writeLogException($oException, \LOG_WARNING, false);
 		}
-
-		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderSubscribe(string $sFolderName) : self
+	public function FolderSubscribe(string $sFolderName) : void
 	{
-		$this->SendRequestGetResponse('SUBSCRIBE',
-			array($this->EscapeFolderName($sFolderName)));
-		return $this;
+		$this->SendRequestGetResponse('SUBSCRIBE', [$this->EscapeFolderName($sFolderName)]);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderUnsubscribe(string $sFolderName) : self
+	public function FolderUnsubscribe(string $sFolderName) : void
 	{
-		$this->SendRequestGetResponse('UNSUBSCRIBE',
-			array($this->EscapeFolderName($sFolderName)));
-		return $this;
+		$this->SendRequestGetResponse('UNSUBSCRIBE', [$this->EscapeFolderName($sFolderName)]);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderRename(string $sOldFolderName, string $sNewFolderName) : self
+	public function FolderRename(string $sOldFolderName, string $sNewFolderName) : void
 	{
-		$this->SendRequestGetResponse('RENAME', array(
+		$this->SendRequestGetResponse('RENAME', [
 			$this->EscapeFolderName($sOldFolderName),
-			$this->EscapeFolderName($sNewFolderName)));
-		return $this;
+			$this->EscapeFolderName($sNewFolderName)
+		]);
 	}
 
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function FolderStatus(string $sFolderName) : FolderInformation
+	private function FolderStatusItems() : array
 	{
 		$aStatusItems = array(
-			FolderResponseStatus::MESSAGES,
-			FolderResponseStatus::UNSEEN,
-			FolderResponseStatus::UIDNEXT
+			FolderStatus::MESSAGES,
+			FolderStatus::UNSEEN,
+			FolderStatus::UIDNEXT,
+			FolderStatus::UIDVALIDITY
 		);
-		if ($this->IsSupported('CONDSTORE')) {
-			$aStatusItems[] = FolderResponseStatus::HIGHESTMODSEQ;
+		// RFC 4551 or RFC 5162
+		if ($this->hasCapability('CONDSTORE') || $this->hasCapability('QRESYNC')) {
+			$aStatusItems[] = FolderStatus::HIGHESTMODSEQ;
 		}
-		if ($this->IsSupported('APPENDLIMIT')) {
-			$aStatusItems[] = FolderResponseStatus::APPENDLIMIT;
+		// RFC 7889
+		if ($this->hasCapability('APPENDLIMIT')) {
+			$aStatusItems[] = FolderStatus::APPENDLIMIT;
 		}
-		if ($this->IsSupported('OBJECTID')) {
-			$aStatusItems[] = FolderResponseStatus::MAILBOXID;
+		// RFC 8438
+		if ($this->hasCapability('STATUS=SIZE')) {
+			$aStatusItems[] = FolderStatus::SIZE;
 		}
+		// RFC 8474
+		if ($this->hasCapability('OBJECTID')) {
+			$aStatusItems[] = FolderStatus::MAILBOXID;
+/*
+		} else if ($this->hasCapability('X-DOVECOT')) {
+			$aStatusItems[] = 'X-GUID';
+*/
+		}
+		return $aStatusItems;
+	}
 
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 *
+	 * https://datatracker.ietf.org/doc/html/rfc9051#section-6.3.11
+	 */
+	public function FolderStatus(string $sFolderName, bool $bSelect = false) : FolderInformation
+	{
 		$oFolderInfo = $this->oCurrentFolderInfo;
 		$bReselect = false;
 		$bWritable = false;
-		if ($oFolderInfo && $sFolderName === $oFolderInfo->FolderName) {
+		if ($oFolderInfo && $sFolderName === $oFolderInfo->FullName) {
+			if ($oFolderInfo->hasStatus) {
+				return $oFolderInfo;
+			}
+
 			/**
 			 * There's a long standing IMAP CLIENTBUG where STATUS command is executed
 			 * after SELECT/EXAMINE on same folder (it should not).
 			 * So we must unselect the folder to be able to get the APPENDLIMIT and UNSEEN.
 			 */
 /*
-			if ($this->IsSupported('ESEARCH')) {
-				$aResult = $oFolderInfo->getStatusItems();
-				// SELECT or EXAMINE command then UNSEEN is the message sequence number of the first unseen message
-				$aResult['UNSEEN'] = $this->MessageSimpleESearch('UNSEEN', ['COUNT'])['COUNT'];
-				return $aResult;
+			if ($this->hasCapability('ESEARCH') && !isset($oFolderInfo->UNSEEN)) {
+				$oFolderInfo->UNSEEN = $this->MessageESearch('UNSEEN', ['COUNT'])['COUNT'];
 			}
+			return $oFolderInfo;
 */
 			$bWritable = $oFolderInfo->IsWritable;
 			$bReselect = true;
@@ -144,34 +194,55 @@ trait Folders
 		}
 
 		$oInfo = new FolderInformation($sFolderName, false);
-		$this->SendRequest('STATUS', array($this->EscapeFolderName($sFolderName), $aStatusItems));
+		$this->SendRequest('STATUS', array($this->EscapeFolderName($sFolderName), $this->FolderStatusItems()));
 		foreach ($this->yieldUntaggedResponses() as $oResponse) {
 			$oInfo->setStatusFromResponse($oResponse);
 		}
 
-		if ($bReselect) {
-			$this->selectOrExamineFolder($sFolderName, $bWritable, false);
+		if ($bReselect || $bSelect) {
+			// Don't use FolderExamine, else PERMANENTFLAGS is empty in Dovecot
+			$oFolderInfo = $this->selectOrExamineFolder($sFolderName, $bSelect || $bWritable, false);
+			$oFolderInfo->MESSAGES = \max(0, $oFolderInfo->MESSAGES, $oInfo->MESSAGES);
+			// SELECT or EXAMINE command then UNSEEN is the message sequence number of the first unseen message.
+			// And deprecated in IMAP4rev2, so we set it to the amount of unseen messages
+			$oFolderInfo->UNSEEN = \max(0, $oInfo->UNSEEN);
+			$oFolderInfo->UIDNEXT = \max(0, $oFolderInfo->UIDNEXT, $oInfo->UIDNEXT);
+			$oFolderInfo->UIDVALIDITY = \max(0, $oFolderInfo->UIDVALIDITY, $oInfo->UIDVALIDITY);
+			$oFolderInfo->HIGHESTMODSEQ = \max(0, $oInfo->HIGHESTMODSEQ);
+			$oFolderInfo->APPENDLIMIT = \max(0, $oFolderInfo->APPENDLIMIT, $oInfo->APPENDLIMIT);
+			$oFolderInfo->MAILBOXID = $oFolderInfo->MAILBOXID ?: $oInfo->MAILBOXID;
+//			$oFolderInfo->SIZE = \max($oFolderInfo->SIZE, $oInfo->SIZE);
+//			$oFolderInfo->RECENT = \max(0, $oFolderInfo->RECENT, $oInfo->RECENT);
+			$oFolderInfo->hasStatus = $oInfo->hasStatus;
+			$oInfo = $oFolderInfo;
 		}
 
+		$oInfo->generateETag($this);
 		return $oInfo;
 	}
 
+	public function FolderStatusAndSelect(string $sFolderName) : FolderInformation
+	{
+		return $this->FolderStatus($sFolderName, true);
+	}
+
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderCheck() : self
+	public function FolderCheck() : void
 	{
 		if ($this->IsSelected()) {
 			$this->SendRequestGetResponse('CHECK');
 		}
-		return $this;
 	}
 
 	/**
 	 * This also expunge the mailbox
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	public function FolderClose() : int
 	{
@@ -185,43 +256,41 @@ trait Folders
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderUnselect() : self
+	public function FolderUnselect() : void
 	{
 		if ($this->IsSelected()) {
-			if ($this->IsSupported('UNSELECT')) {
+			if ($this->hasCapability('UNSELECT')) {
 				$this->SendRequestGetResponse('UNSELECT');
-				$this->oCurrentFolderInfo = null;
 			} else {
 				try {
 					$this->SendRequestGetResponse('SELECT', ['""']);
 					// * OK [CLOSED] Previous mailbox closed.
 					// 3 NO [CANNOT] Invalid mailbox name: Name is empty
-				} catch (\MailSo\Imap\Exceptions\NegativeResponseException $e) {
-					if ('NO' === $e->GetResponseStatus()) {
-						$this->oCurrentFolderInfo = null;
-					}
+				} catch (\MailSo\Imap\Exceptions\NegativeResponseException $oException) {
 				}
 			}
 		}
-		return $this;
+		$this->oCurrentFolderInfo = null;
 	}
 
 	/**
 	 * The EXPUNGE command permanently removes all messages that have the
 	 * \Deleted flag set from the currently selected mailbox.
 	 *
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderExpunge(SequenceSet $oUidRange = null) : void
+	public function FolderExpunge(?SequenceSet $oUidRange = null) : void
 	{
 		$sCmd = 'EXPUNGE';
 		$aArguments = array();
 
-		if ($oUidRange && \count($oUidRange) && $oUidRange->UID && $this->IsSupported('UIDPLUS')) {
+		if ($oUidRange && \count($oUidRange) && $oUidRange->UID && $this->hasCapability('UIDPLUS')) {
 			$sCmd = 'UID '.$sCmd;
 			$aArguments = array((string) $oUidRange);
 		}
@@ -234,8 +303,9 @@ trait Folders
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	public function FolderHierarchyDelimiter(string $sFolderName = '') : ?string
 	{
@@ -244,13 +314,14 @@ trait Folders
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderSelect(string $sFolderName, bool $bReSelectSameFolders = false) : FolderInformation
+	public function FolderSelect(string $sFolderName, bool $bForceReselect = false) : FolderInformation
 	{
-		return $this->selectOrExamineFolder($sFolderName, true, $bReSelectSameFolders);
+		return $this->selectOrExamineFolder($sFolderName, true, $bForceReselect);
 	}
 
 	/**
@@ -259,40 +330,44 @@ trait Folders
 	 * No changes to the permanent state of the mailbox, including per-user state,
 	 * are permitted; in particular, EXAMINE MUST NOT cause messages to lose the \Recent flag.
 	 *
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderExamine(string $sFolderName, bool $bReSelectSameFolders = false) : FolderInformation
+	public function FolderExamine(string $sFolderName, bool $bForceReselect = false) : FolderInformation
 	{
-		return $this->selectOrExamineFolder($sFolderName, $this->__FORCE_SELECT_ON_EXAMINE__, $bReSelectSameFolders);
+		return $this->selectOrExamineFolder($sFolderName, $this->Settings->force_select, $bForceReselect);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 *
+	 * REQUIRED IMAP4rev2 untagged responses:  FLAGS, EXISTS, LIST
+	 * REQUIRED IMAP4rev2 OK untagged responses:  PERMANENTFLAGS, UIDNEXT, UIDVALIDITY
 	 */
-	protected function selectOrExamineFolder(string $sFolderName, bool $bIsWritable, bool $bReSelectSameFolders) : FolderInformation
+	protected function selectOrExamineFolder(string $sFolderName, bool $bIsWritable, bool $bForceReselect) : FolderInformation
 	{
-		if (!$bReSelectSameFolders
+		if (!$bForceReselect
 		  && $this->oCurrentFolderInfo
-		  && $sFolderName === $this->oCurrentFolderInfo->FolderName
-		  && $bIsWritable === $this->oCurrentFolderInfo->IsWritable
+		  && $sFolderName === $this->oCurrentFolderInfo->FullName
+		  && ($bIsWritable === $this->oCurrentFolderInfo->IsWritable || $this->oCurrentFolderInfo->IsWritable)
 		) {
 			return $this->oCurrentFolderInfo;
 		}
 
-		if (!\strlen(\trim($sFolderName)))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\strlen(\trim($sFolderName))) {
+			throw new \ValueError;
 		}
 
 		$aSelectParams = array();
 
 /*
 		// RFC 5162
-		if ($this->IsSupported('QRESYNC')) {
+		if ($this->hasCapability('QRESYNC')) {
 			$this->Enable(['QRESYNC', 'CONDSTORE']);
 			- the last known UIDVALIDITY,
 			- the last known modification sequence,
@@ -303,7 +378,7 @@ trait Folders
 		}
 
 		// RFC 4551
-		if ($this->IsSupported('CONDSTORE')) {
+		if ($this->hasCapability('CONDSTORE')) {
 			$aSelectParams[] = 'CONDSTORE';
 		}
 
@@ -333,12 +408,12 @@ trait Folders
 					$key = $oResponse->OptionalResponse[0];
 					if (\count($oResponse->OptionalResponse) > 1) {
 						if ('PERMANENTFLAGS' === $key && \is_array($oResponse->OptionalResponse[1])) {
-							$oResult->PermanentFlags = $oResponse->OptionalResponse[1];
+							$oResult->PermanentFlags = \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oResponse->OptionalResponse[1]);
 						}
 					} else if ('READ-ONLY' === $key) {
-//						$oResult->IsWritable = false;
+						$oResult->IsWritable = false;
 					} else if ('READ-WRITE' === $key) {
-//						$oResult->IsWritable = true;
+						$oResult->IsWritable = true;
 					} else if ('NOMODSEQ' === $key) {
 						// https://datatracker.ietf.org/doc/html/rfc4551#section-3.1.2
 					}
@@ -348,31 +423,38 @@ trait Folders
 				else if (\count($oResponse->ResponseList) > 2
 				 && 'FLAGS' === $oResponse->ResponseList[1]
 				 && \is_array($oResponse->ResponseList[2])) {
-					$oResult->Flags = $oResponse->ResponseList[2];
+					// These could be not permanent, so we don't use them
+//					$oResult->Flags = \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oResponse->ResponseList[2]);
 				}
 			}
 		}
 
+		// SELECT or EXAMINE command then UNSEEN is the message sequence number of the first unseen message.
+		// IMAP4rev2 deprecated
+		$oResult->UNSEEN = null;
+/*
+		if ($this->hasCapability('ESEARCH')) {
+			$oResult->UNSEEN = $this->MessageESearch('UNSEEN', ['COUNT'])['COUNT'];
+		}
+*/
 		$this->oCurrentFolderInfo = $oResult;
 
 		return $oResult;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderList(string $sParentFolderName, string $sListPattern, bool $bIsSubscribeList = false, bool $bUseListStatus = false) : array
+	public function FolderList(string $sParentFolderName, string $sListPattern, bool $bIsSubscribeList = false, bool $bUseListStatus = false) : FolderCollection
 	{
 		$sCmd = 'LIST';
 
 		$aParameters = array();
 		$aReturnParams = array();
 
-		if ($bIsSubscribeList) {
-			// IMAP4rev2 deprecated
-			$sCmd = 'LSUB';
-		} else if ($this->IsSupported('LIST-EXTENDED')) {
+		if ($this->hasCapability('LIST-EXTENDED')) {
 			// RFC 5258
 			$aReturnParams[] = 'SUBSCRIBED';
 //			$aReturnParams[] = 'CHILDREN';
@@ -382,9 +464,12 @@ trait Folders
 //				$aParameters[0] = '()';
 			}
 			// RFC 6154
-			if ($this->IsSupported('SPECIAL-USE')) {
+			if ($this->hasCapability('SPECIAL-USE')) {
 				$aReturnParams[] = 'SPECIAL-USE';
 			}
+		} else if ($bIsSubscribeList) {
+			// IMAP4rev2 deprecated
+			$sCmd = 'LSUB';
 		}
 
 		$aParameters[] = $this->EscapeFolderName($sParentFolderName);
@@ -392,28 +477,9 @@ trait Folders
 //		$aParameters[] = $this->EscapeString(\strlen(\trim($sListPattern)) ? $sListPattern : '*');
 
 		// RFC 5819
-		if ($bUseListStatus && !$bIsSubscribeList && $this->IsSupported('LIST-STATUS'))
-		{
-			$aL = array(
-				FolderStatus::MESSAGES,
-				FolderStatus::UNSEEN,
-				FolderStatus::UIDNEXT
-			);
-			// RFC 4551
-			if ($this->IsSupported('CONDSTORE')) {
-				$aL[] = FolderStatus::HIGHESTMODSEQ;
-			}
-			// RFC 7889
-			if ($this->IsSupported('APPENDLIMIT')) {
-				$aL[] = FolderStatus::APPENDLIMIT;
-			}
-			// RFC 8474
-			if ($this->IsSupported('OBJECTID')) {
-				$aTypes[] = FolderStatus::MAILBOXID;
-			}
-
+		if ($bUseListStatus && !$bIsSubscribeList && $this->hasCapability('LIST-STATUS')) {
 			$aReturnParams[] = 'STATUS';
-			$aReturnParams[] = $aL;
+			$aReturnParams[] = $this->FolderStatusItems();
 		}
 /*
 		// RFC 5738
@@ -426,113 +492,124 @@ trait Folders
 			$aParameters[] = $aReturnParams;
 		}
 
+/*
 		$bPassthru = false;
-		$aReturn = array();
+		if ($bPassthru) {
+			$this->SendRequest($sCmd, $aParameters);
+			$this->streamResponse();
+			return [];
+		}
+*/
 
 		// RFC 5464
-		$bMetadata = !$bIsSubscribeList && $this->IsSupported('METADATA');
-		$aMetadata = null;
-		if ($bMetadata) {
-			// Dovecot supports fetching all METADATA at once
-			$aMetadata = $this->getAllMetadata();
-		}
+		$bMetadata = !$bIsSubscribeList && $this->hasCapability('METADATA');
+		// Dovecot supports fetching all METADATA at once
+		$aMetadata = $bMetadata ? $this->getAllMetadata() : null;
 
 		$this->SendRequest($sCmd, $aParameters);
-		if ($bPassthru) {
-			$this->streamResponse();
-		} else {
-			$sDelimiter = '';
-			$bInbox = false;
-			foreach ($this->yieldUntaggedResponses() as $oResponse) {
-				if ('STATUS' === $oResponse->StatusOrIndex && isset($oResponse->ResponseList[2])) {
-					$sFullName = $this->toUTF8($oResponse->ResponseList[2]);
-					if (!isset($aReturn[$sFullName])) {
-						$aReturn[$sFullName] = new Folder($sFullName);
-					}
-					$aReturn[$sFullName]->setStatusFromResponse($oResponse);
-				}
-				else if ($sCmd === $oResponse->StatusOrIndex && 5 === \count($oResponse->ResponseList)) {
-					try
-					{
-						$sFullName = $this->toUTF8($oResponse->ResponseList[4]);
-
-						/**
-						 * $oResponse->ResponseList[0] = *
-						 * $oResponse->ResponseList[1] = LIST (all) | LSUB (subscribed)
-						 * $oResponse->ResponseList[2] = Flags
-						 * $oResponse->ResponseList[3] = Delimiter
-						 * $oResponse->ResponseList[4] = FullName
-						 */
-						if (!isset($aReturn[$sFullName])) {
-							$oFolder = new Folder($sFullName,
-								$oResponse->ResponseList[3], $oResponse->ResponseList[2]);
-							$aReturn[$sFullName] = $oFolder;
-						} else {
-							$oFolder = $aReturn[$sFullName];
-							$oFolder->setDelimiter($oResponse->ResponseList[3]);
-							$oFolder->setFlags($oResponse->ResponseList[2]);
-						}
-
-						if ($oFolder->IsInbox()) {
-							$bInbox = true;
-						}
-
-						if (!$sDelimiter) {
-							$sDelimiter = $oFolder->Delimiter();
-						}
-
-						if (isset($aMetadata[$oResponse->ResponseList[4]])) {
-							$oFolder->SetAllMetadata($aMetadata[$oResponse->ResponseList[4]]);
-						}
-
-						$aReturn[$sFullName] = $oFolder;
-					}
-					catch (\MailSo\Base\Exceptions\InvalidArgumentException $oException)
-					{
-						$this->writeLogException($oException, \MailSo\Log\Enumerations\Type::WARNING, false);
-					}
-					catch (\Throwable $oException)
-					{
-						$this->writeLogException($oException, \MailSo\Log\Enumerations\Type::WARNING, false);
-					}
+		$aFolders = array();
+		$oFolderCollection = new FolderCollection;
+		$sDelimiter = '';
+		$bInbox = false;
+		foreach ($this->yieldUntaggedResponses() as $oResponse) {
+			if ('STATUS' === $oResponse->StatusOrIndex && isset($oResponse->ResponseList[2])) {
+				$sFullName = $this->toUTF8($oResponse->ResponseList[2]);
+				if (!isset($oFolderCollection[$sFullName])) {
+					$oFolderCollection[$sFullName] = new Folder($sFullName);
 				}
+				$oFolderCollection[$sFullName]->setStatusFromResponse($oResponse);
+				$oFolderCollection[$sFullName]->generateETag($this);
 			}
+			else if ($sCmd === $oResponse->StatusOrIndex && 5 <= \count($oResponse->ResponseList)) {
+				try
+				{
+					$sFullName = $this->toUTF8($oResponse->ResponseList[4]);
 
-			if (!$bInbox && !$sParentFolderName && !isset($aReturn['INBOX'])) {
-				$aReturn['INBOX'] = new Folder('INBOX', $sDelimiter);
+					/**
+					 * $oResponse->ResponseList[0] = *
+					 * $oResponse->ResponseList[1] = LIST (all) | LSUB (subscribed)
+					 * $oResponse->ResponseList[2] = Attribute flags
+					 * $oResponse->ResponseList[3] = Delimiter
+					 * $oResponse->ResponseList[4] = FullName
+					 */
+					if (isset($oFolderCollection[$sFullName])) {
+						$oFolder = $oFolderCollection[$sFullName];
+						$oFolder->setDelimiter($oResponse->ResponseList[3]);
+						$oFolder->setAttributes($oResponse->ResponseList[2]);
+					} else {
+						$oFolder = new Folder($sFullName, $oResponse->ResponseList[3], $oResponse->ResponseList[2]);
+						$oFolderCollection[$sFullName] = $oFolder;
+					}
+
+					$bInbox = $bInbox || $oFolder->IsInbox();
+
+					if (!$sDelimiter) {
+						$sDelimiter = $oFolder->Delimiter();
+					}
+
+					if (isset($aMetadata[$oResponse->ResponseList[4]])) {
+						$oFolder->SetAllMetadata($aMetadata[$oResponse->ResponseList[4]]);
+					}
+				}
+				catch (\Throwable $oException)
+				{
+					$this->writeLogException($oException, \LOG_WARNING, false);
+				}
 			}
 		}
 
+//		$iOptimizationLimit = $this->Settings->folder_list_limit;
+//		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && $oFolderCollection->count() > $iOptimizationLimit;
+
 		// RFC 5464
-		if ($bMetadata && !$aMetadata) {
-			foreach ($aReturn as $oFolder) {
-				try {
+		if ($bMetadata && !$aMetadata /*&& 50 < $oFolderCollection->count()*/) {
+			foreach ($oFolderCollection as $oFolder) {
+//				if (2 > \substr_count($oFolder->FullName, $oFolder->Delimiter()))
+				if ($oFolder->Selectable()) try {
 					$oFolder->SetAllMetadata(
-						$this->getMetadata($oFolder->FullName(), ['/shared', '/private'], ['DEPTH'=>'infinity'])
+						$this->getMetadata($oFolder->FullName, ['/shared', '/private'], ['DEPTH'=>'infinity'])
 					);
-				} catch (\Throwable $e) {
+				} catch (\Throwable $oException) {
 					// Ignore error
 				}
 			}
 		}
+/*
+		// RFC 4314
+		if ($this->hasCapability('ACL')) {
+			foreach ($oFolderCollection as $oFolder) {
+				if ($oFolder->Selectable()) try {
+					$oFolder->myRights = $this->FolderMyRights($oFolder->FullName);
+				} catch (\Throwable $oException) {
+					// BAD Error in IMAP command MYRIGHTS: ACLs disabled
+					break;
+				}
+			}
+		}
+*/
+		if (!$bInbox && !$sParentFolderName && !isset($oFolderCollection['INBOX'])) {
+			$oFolderCollection['INBOX'] = new Folder('INBOX', $sDelimiter);
+		}
 
-		return $aReturn;
+		return $oFolderCollection;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderSubscribeList(string $sParentFolderName, string $sListPattern) : array
+	public function FolderSubscribeList(string $sParentFolderName, string $sListPattern) : FolderCollection
 	{
 		return $this->FolderList($sParentFolderName, $sListPattern, true);
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderStatusList(string $sParentFolderName, string $sListPattern) : array
+	public function FolderStatusList(string $sParentFolderName, string $sListPattern) : FolderCollection
 	{
 		return $this->FolderList($sParentFolderName, $sListPattern, false, true);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
index e35a1f21c..10003e83a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Messages.php
@@ -16,9 +16,9 @@ use MailSo\Imap\FetchResponse;
 use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Imap\ResponseCollection;
 use MailSo\Imap\SequenceSet;
+use MailSo\Imap\Enumerations\MessageFlag;
 use MailSo\Imap\Enumerations\ResponseType;
-use MailSo\Log\Enumerations\Type as LogType;
-use MailSo\Base\Exceptions\InvalidArgumentException;
+use MailSo\Imap\Enumerations\StoreAction;
 
 /**
  * @category MailSo
@@ -27,15 +27,15 @@ use MailSo\Base\Exceptions\InvalidArgumentException;
 trait Messages
 {
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Fetch(array $aInputFetchItems, string $sIndexRange, bool $bIndexIsUid) : array
+	public function FetchIterate(array $aInputFetchItems, string $sIndexRange, bool $bIndexIsUid) : iterable
 	{
-		if (!\strlen(\trim($sIndexRange)))
-		{
-			$this->writeLogException(new InvalidArgumentException, LogType::ERROR, true);
+		if (!\strlen(\trim($sIndexRange))) {
+			$this->writeLogException(new \ValueError('$sIndexRange is empty'), \LOG_ERR);
 		}
 
 		$aReturn = array();
@@ -45,8 +45,7 @@ trait Messages
 				FetchType::UID,
 				FetchType::RFC822_SIZE
 			);
-			foreach ($aInputFetchItems as $mFetchKey)
-			{
+			foreach ($aInputFetchItems as $mFetchKey) {
 				switch ($mFetchKey)
 				{
 					case FetchType::UID:
@@ -78,6 +77,23 @@ trait Messages
 						break;
 				}
 			}
+			if ($this->hasCapability('OBJECTID')) {
+				$aFetchItems[] = FetchType::EMAILID;
+				$aFetchItems[] = FetchType::THREADID;
+			} else if ($this->hasCapability('X-GM-EXT-1')) {
+				// https://developers.google.com/gmail/imap/imap-extensions
+				$aFetchItems[] = 'X-GM-MSGID';
+				$aFetchItems[] = 'X-GM-THRID';
+/*
+			} else if ($this->hasCapability('X-DOVECOT')) {
+				$aFetchItems[] = 'X-GUID';
+*/
+			}
+/*
+			if ($this->hasCapability('X-GM-EXT-1') && \in_array(FetchType::FLAGS, $aFetchItems)) {
+				$aFetchItems[] = 'X-GM-LABELS';
+			}
+*/
 
 			$aParams = array($sIndexRange, $aFetchItems);
 
@@ -96,30 +112,69 @@ trait Messages
 			foreach ($this->yieldUntaggedResponses() as $oResponse) {
 				if (FetchResponse::isValidImapResponse($oResponse)) {
 					if (FetchResponse::hasUidAndSize($oResponse)) {
-						$aReturn[] = new FetchResponse($oResponse);
-					} else if ($this->oLogger) {
-						$this->oLogger->Write('Skipped Imap Response! ['.$oResponse.']', LogType::NOTICE);
+						yield new FetchResponse($oResponse);
+					} else {
+						$this->logWrite('Skipped Imap Response! ['.$oResponse.']', \LOG_NOTICE);
 					}
 				}
 			}
 		} finally {
 			$this->aFetchCallbacks = array();
 		}
+	}
 
+	public function Fetch(array $aInputFetchItems, string $sIndexRange, bool $bIndexIsUid) : array
+	{
+		$aReturn = array();
+		foreach ($this->FetchIterate($aInputFetchItems, $sIndexRange, $bIndexIsUid) as $oFetchResponse) {
+			$aReturn[] = $oFetchResponse;
+		}
 		return $aReturn;
 	}
 
+	public function FetchMessagePart(int $iUid, string $sPartId) : string
+	{
+		if ('TEXT' === $sPartId) {
+			$oFetchResponse = $this->Fetch([
+				FetchType::BODY_PEEK.'['.$sPartId.']',
+				FetchType::BODY_HEADER_PEEK
+			], $iUid, true)[0];
+			$sHeader = $oFetchResponse->GetFetchValue(FetchType::BODY_HEADER);
+		} else {
+			$oFetchResponse = $this->Fetch([
+				FetchType::BODY_PEEK.'['.$sPartId.']',
+				// An empty section specification refers to the entire message, including the header.
+				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
+				FetchType::BODY_PEEK.'['.$sPartId.'.MIME]'
+			], $iUid, true)[0];
+			$sHeader = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.'.MIME]');
+		}
+		return $sHeader . $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']');
+	}
+
 	/**
 	 * Appends message to specified folder
 	 *
-	 * @param resource $rMessageAppendStream
+	 * @param resource $rMessageStream
 	 *
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageAppendStream(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int &$iUid = null, int $iDateTime = 0) : ?int
+	public function MessageAppendStream(string $sFolderName, $rMessageStream, int $iStreamSize, ?array $aFlagsList = null, int $iDateTime = 0) : ?int
 	{
+		if (!\is_resource($rMessageStream)) {
+			throw new \InvalidArgumentException('$rMessageStream must be a resource');
+		}
+		if (!\strlen($sFolderName)) {
+			throw new \ValueError('$sFolderName is empty');
+		}
+		if (1 > $iStreamSize) {
+			throw new \ValueError('$iStreamSize must be higher then 0');
+		}
+
 		$aParams = array(
 			$this->EscapeFolderName($sFolderName),
 			$aFlagsList
@@ -130,7 +185,7 @@ trait Messages
 
 /*
 		// RFC 3516 || RFC 6855 section-4
-		if ($this->IsSupported('BINARY') || $this->IsSupported('UTF8=ACCEPT')) {
+		if ($this->hasCapability('BINARY') || $this->hasCapability('UTF8=ACCEPT')) {
 			$aParams[] = '~{'.$iStreamSize.'}';
 		}
 */
@@ -138,45 +193,55 @@ trait Messages
 
 		$this->SendRequestGetResponse('APPEND', $aParams);
 
-		$this->writeLog('Write to connection stream', LogType::NOTE);
+		return $this->writeMessageStream($rMessageStream);
+	}
 
-		\MailSo\Base\Utils::MultipleStreamWriter($rMessageAppendStream, array($this->ConnectionResource()));
+	private function writeMessageStream($rMessageStream) : ?int
+	{
+		$this->writeLog('Write to connection stream', \LOG_INFO);
+
+		\MailSo\Base\Utils::WriteStream($rMessageStream, $this->ConnectionResource());
 
 		$this->sendRaw('');
-		$oResponse = $this->getResponse();
-
-		if (null !== $iUid) {
-			$oLast = $oResponse->getLast();
-			if ($oLast
-			 && ResponseType::TAGGED === $oLast->ResponseType
-			 && \is_array($oLast->OptionalResponse)
-			 && !empty($oLast->OptionalResponse[2])
-			 && \is_numeric($oLast->OptionalResponse[2])
-			 && 'APPENDUID' === \strtoupper($oLast->OptionalResponse[0])
+		$oResponses = $this->getResponse();
+		/**
+		 * Can be tagged
+			 S: A003 OK [APPENDUID 1 2001] APPEND completed
+		 * Or untagged
+			 S: * OK [APPENDUID 1 2001] Replacement Message ready
+		 */
+		foreach ($oResponses as $oResponse) {
+			if (\is_array($oResponse->OptionalResponse)
+			 && !empty($oResponse->OptionalResponse[2])
+			 && \is_numeric($oResponse->OptionalResponse[2])
+			 && 'APPENDUID' === \strtoupper($oResponse->OptionalResponse[0])
 			) {
-				$iUid = (int) $oLast->OptionalResponse[2];
+				return (int) $oResponse->OptionalResponse[2];
 			}
 		}
 
-		return $iUid;
+		return null;
 	}
 
 	/**
 	 * RFC 3502 MULTIAPPEND
-	public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, array $aFlagsList = null, int &$iUid = null, int $iDateTime = 0) : ?int
+	public function MessageAppendStreams(string $sFolderName, $rMessageAppendStream, int $iStreamSize, ?array $aFlagsList = null, ?int &$iUid = null, int $iDateTime = 0) : ?int
 	*/
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageCopy(string $sToFolder, SequenceSet $oRange) : ResponseCollection
+	public function MessageCopy(string $sFromFolder, string $sToFolder, SequenceSet $oRange) : ResponseCollection
 	{
-		if (!\count($oRange)) {
-			$this->writeLogException(new InvalidArgumentException, LogType::ERROR, true);
+		if (!$sFromFolder || !$sToFolder || !\count($oRange)) {
+			$this->writeLogException(new \ValueError, \LOG_ERR);
 		}
 
+		$this->FolderSelect($sFromFolder);
+
 		return $this->SendRequestGetResponse(
 			$oRange->UID ? 'UID COPY' : 'COPY',
 			array((string) $oRange, $this->EscapeFolderName($sToFolder))
@@ -184,32 +249,112 @@ trait Messages
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageMove(string $sToFolder, SequenceSet $oRange) : ResponseCollection
+	public function MessageMove(string $sFromFolder, string $sToFolder, SequenceSet $oRange) : void
 	{
-		if (!\count($oRange)) {
-			$this->writeLogException(new InvalidArgumentException, LogType::ERROR, true);
+		if (!$sFromFolder || !$sToFolder || !\count($oRange)) {
+			$this->writeLogException(new \ValueError, \LOG_ERR);
 		}
 
-		if (!$this->IsSupported('MOVE')) {
-			$this->writeLogException(
-				new \MailSo\IMAP\Exceptions\RuntimeException('Move is not supported'),
-				LogType::ERROR, true);
+		if ($this->hasCapability('MOVE')) {
+			$this->FolderSelect($sFromFolder);
+			$this->SendRequestGetResponse(
+				$oRange->UID ? 'UID MOVE' : 'MOVE',
+				array((string) $oRange, $this->EscapeFolderName($sToFolder))
+			);
+		} else {
+			$this->MessageCopy($sFromFolder, $sToFolder, $oRange);
+			$this->MessageDelete($sFromFolder, $oRange, true);
 		}
-
-		return $this->SendRequestGetResponse(
-			$oRange->UID ? 'UID MOVE' : 'MOVE',
-			array((string) $oRange, $this->EscapeFolderName($sToFolder))
-		);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 */
+	public function MessageDelete(string $sFolder, SequenceSet $oRange, bool $bExpungeAll = false) : void
+	{
+		if (!$sFolder || !\count($oRange)) {
+			$this->writeLogException(new \ValueError, \LOG_ERR);
+		}
+
+		$this->FolderSelect($sFolder);
+
+		$this->MessageStoreFlag($oRange,
+			array(MessageFlag::DELETED),
+			StoreAction::ADD_FLAGS_SILENT
+		);
+
+		if ($bExpungeAll && $this->Settings->expunge_all_on_delete) {
+			$this->FolderExpunge();
+		} else {
+			$this->FolderExpunge($oRange);
+		}
+	}
+
+	/**
+	 * RFC 8508 REPLACE
+	 * Replaces message in specified folder
+	 * When $iUid < 1 it only appends the message
+	 *
+	 * @param resource $rMessageStream
+	 *
+	 * @throws \InvalidArgumentException
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 */
+	public function MessageReplaceStream(string $sFolderName, int $iUid, $rMessageStream, int $iStreamSize, ?array $aFlagsList = null, int $iDateTime = 0) : ?int
+	{
+		if (1 > $iUid || !$this->hasCapability('REPLACE')) {
+			$this->FolderSelect($sFolderName);
+			$iNewUid = $this->MessageAppendStream($sFolderName, $rMessageStream, $iStreamSize, $aFlagsList, $iDateTime);
+			if ($iUid) {
+				$oRange = new SequenceSet($iUid);
+				$this->MessageStoreFlag($oRange,
+					array(MessageFlag::DELETED),
+					StoreAction::ADD_FLAGS_SILENT
+				);
+				$this->FolderExpunge($oRange);
+			}
+			return $iNewUid;
+		}
+
+		$aParams = array(
+			$iUid,
+			$this->EscapeFolderName($sFolderName),
+			$aFlagsList
+		);
+		if (0 < $iDateTime) {
+			$aParams[] = $this->EscapeString(\gmdate('d-M-Y H:i:s', $iDateTime).' +0000');
+		}
+
+/*
+		// RFC 3516 || RFC 6855 section-4
+		if ($this->hasCapability('BINARY') || $this->hasCapability('UTF8=ACCEPT')) {
+			$aParams[] = '~{'.$iStreamSize.'}';
+		}
+*/
+		$aParams[] = '{'.$iStreamSize.'}';
+
+		$this->SendRequestGetResponse('UID REPLACE', $aParams);
+
+		return $this->writeMessageStream($rMessageStream);
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 * $sStoreAction = \MailSo\Imap\Enumerations\StoreAction::ADD_FLAGS_SILENT
 	 */
 	public function MessageStoreFlag(SequenceSet $oRange, array $aInputStoreItems, string $sStoreAction) : ?ResponseCollection
 	{
@@ -223,6 +368,8 @@ trait Messages
 		 *     $sStoreAction[] = (UNCHANGEDSINCE $modsequence)
 		 */
 
+		$aInputStoreItems = \array_map('\\MailSo\\Base\\Utils::Utf8ToUtf7Modified', $aInputStoreItems);
+
 		return $this->SendRequestGetResponse(
 			$oRange->UID ? 'UID STORE' : 'STORE',
 			array((string) $oRange, $sStoreAction, $aInputStoreItems)
@@ -231,14 +378,15 @@ trait Messages
 
 	/**
 	 * See https://tools.ietf.org/html/rfc5256
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageSimpleSort(array $aSortTypes, string $sSearchCriterias = 'ALL', bool $bReturnUid = true) : array
+	public function MessageSort(array $aSortTypes, string $sSearchCriterias, bool $bReturnUid = true) : array
 	{
 		$oSort = new \MailSo\Imap\Requests\SORT($this);
-		$oSort->sCriterias = $sSearchCriterias;
+		$oSort->sCriterias = $sSearchCriterias ?: 'ALL';
 		$oSort->bUid = $bReturnUid;
 		$oSort->aSortTypes = $aSortTypes;
 		$oSort->SendRequest();
@@ -259,31 +407,36 @@ trait Messages
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageSimpleESearch(string $sSearchCriterias = 'ALL', array $aSearchReturn = null, bool $bReturnUid = true, string $sCharset = '', string $sLimit = '') : array
+	public function MessageESearch(string $sSearchCriterias, ?array $aSearchReturn = null, bool $bReturnUid = true, string $sLimit = '') : array
 	{
 		$oESearch = new \MailSo\Imap\Requests\ESEARCH($this);
-		$oESearch->sCriterias = $sSearchCriterias;
+		$oESearch->sCriterias = $sSearchCriterias ?: 'ALL';
 		$oESearch->aReturn = $aSearchReturn;
 		$oESearch->bUid = $bReturnUid;
 		$oESearch->sLimit = $sLimit;
-		$oESearch->sCharset = $sCharset;
+//		if (!$this->UTF8 && !\mb_check_encoding($sSearchCriterias, 'UTF-8')) {
+		if (!$this->UTF8 && !\MailSo\Base\Utils::IsAscii($sSearchCriterias)) {
+			$oESearch->sCharset = 'UTF-8';
+		}
 		$oESearch->SendRequest();
 		return $this->getSimpleESearchOrESortResult($bReturnUid);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageSimpleESort(array $aSortTypes, string $sSearchCriterias = 'ALL', array $aSearchReturn = ['ALL'], bool $bReturnUid = true, string $sLimit = '') : array
+	public function MessageESort(array $aSortTypes, string $sSearchCriterias, array $aSearchReturn = ['ALL'], bool $bReturnUid = true, string $sLimit = '') : array
 	{
 		$oSort = new \MailSo\Imap\Requests\SORT($this);
-		$oSort->sCriterias = $sSearchCriterias;
+		$oSort->sCriterias = $sSearchCriterias ?: 'ALL';
 		$oSort->bUid = $bReturnUid;
 		$oSort->aSortTypes = $aSortTypes;
 		$oSort->aReturn = $aSearchReturn ?: ['ALL'];
@@ -293,16 +446,18 @@ trait Messages
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageSimpleSearch(string $sSearchCriterias = 'ALL', bool $bReturnUid = true, string $sCharset = '') : array
+	public function MessageSearch(string $sSearchCriterias, bool $bReturnUid = true) : array
 	{
 		$aRequest = array();
-		if (\strlen($sCharset)) {
+//		if (!$this->UTF8 && !\mb_check_encoding($sSearchCriterias, 'UTF-8')) {
+		if (!$this->UTF8 && !\MailSo\Base\Utils::IsAscii($sSearchCriterias)) {
 			$aRequest[] = 'CHARSET';
-			$aRequest[] = \strtoupper($sCharset);
+			$aRequest[] = 'UTF-8';
 		}
 
 		$aRequest[] = !\strlen($sSearchCriterias) || '*' === $sSearchCriterias ? 'ALL' : $sSearchCriterias;
@@ -342,16 +497,22 @@ trait Messages
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageSimpleThread(string $sSearchCriterias = 'ALL', bool $bReturnUid = true) : array
+	public function MessageThread(string $sSearchCriterias, string $sAlgorithm = '', $bReturnUid = true) : iterable
 	{
 		$oThread = new \MailSo\Imap\Requests\THREAD($this);
-		$oThread->sCriterias = $sSearchCriterias;
+		$oThread->sCriterias = $sSearchCriterias ?: 'ALL';
 		$oThread->bUid = $bReturnUid;
-		return $oThread->SendRequestGetResponse();
+		try {
+			$sAlgorithm && $oThread->setAlgorithm($sAlgorithm);
+		} catch (\Throwable $e) {
+			// ignore
+		}
+		yield from $oThread->SendRequestIterateResponse();
 	}
 
 	private function getSimpleESearchOrESortResult(bool $bReturnUid) : array
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Metadata.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Metadata.php
index f0246a18d..43b147fef 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Metadata.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Metadata.php
@@ -24,33 +24,36 @@ trait Metadata
 	 * Dovecot 2.2+ supports fetching all METADATA at once (wildcard).
 	 * RFC 5464 doesn't specify this, but its earlier draft did, and Kolab uses it.
 	 */
+	private ?array $allMetadata = null;
 	public function getAllMetadata() : array
 	{
-		$aReturn = array();
-		try {
-			$arguments = [
-				'(DEPTH infinity)',
-				$this->EscapeString('*')
-			];
-			$arguments[] = '(' . \implode(' ', \array_map([$this, 'EscapeString'], ['/shared', '/private'])) . ')';
-			$this->SendRequest('GETMETADATA', $arguments);
-			foreach ($this->yieldUntaggedResponses() as $oResponse) {
-				if (isset($oResponse->ResponseList[3])
-					&& \is_array($oResponse->ResponseList[3])
-					&& 'METADATA' === $oResponse->ResponseList[1]
-				) {
-					$aMetadata = array();
-					$c = \count($oResponse->ResponseList[3]);
-					for ($i = 0; $i < $c; $i += 2) {
-						$aMetadata[$oResponse->ResponseList[3][$i]] = $oResponse->ResponseList[3][$i+1];
+		if (null === $this->allMetadata) {
+			$this->allMetadata = array();
+			try {
+				$arguments = [
+					'(DEPTH infinity)',
+					$this->EscapeString('*')
+				];
+				$arguments[] = '(' . \implode(' ', \array_map([$this, 'EscapeString'], ['/shared', '/private'])) . ')';
+				$this->SendRequest('GETMETADATA', $arguments);
+				foreach ($this->yieldUntaggedResponses() as $oResponse) {
+					if (isset($oResponse->ResponseList[3])
+						&& \is_array($oResponse->ResponseList[3])
+						&& 'METADATA' === $oResponse->ResponseList[1]
+					) {
+						$aMetadata = array();
+						$c = \count($oResponse->ResponseList[3]);
+						for ($i = 0; $i < $c; $i += 2) {
+							$aMetadata[$oResponse->ResponseList[3][$i]] = $oResponse->ResponseList[3][$i+1];
+						}
+						$this->allMetadata[$this->toUTF8($oResponse->ResponseList[2])] = $aMetadata;
 					}
-					$aReturn[$this->toUTF8($oResponse->ResponseList[2])] = $aMetadata;
 				}
+			} catch (\Throwable $e) {
+				//\SnappyMail\Log::warning('IMAP', $e->getMessage());
 			}
-		} catch (\Throwable $e) {
-			//\SnappyMail\Log::warning('IMAP', $e->getMessage());
 		}
-		return $aReturn;
+		return $this->allMetadata;
 	}
 
 	public function getMetadata(string $sFolderName, array $aEntries, array $aOptions = []) : array
@@ -96,23 +99,23 @@ trait Metadata
 
 	public function ServerGetMetadata(array $aEntries, array $aOptions = []) : array
 	{
-		return $this->IsSupported('METADATA-SERVER')
+		return $this->hasCapability('METADATA-SERVER')
 			? $this->getMetadata('', $aEntries, $aOptions)
 			: [];
 	}
 
 	public function FolderGetMetadata(string $sFolderName, array $aEntries, array $aOptions = []) : array
 	{
-		return $this->IsSupported('METADATA')
+		return $this->hasCapability('METADATA')
 			? $this->getMetadata($sFolderName, $aEntries, $aOptions)
 			: [];
 	}
 
 	public function FolderSetMetadata(string $sFolderName, array $aEntries) : void
 	{
-		if ($this->IsSupported('METADATA')) {
+		if ($this->hasCapability('METADATA')) {
 			if (!$aEntries) {
-				throw new \MailSo\Base\Exceptions\InvalidArgumentException("Wrong argument for SETMETADATA command");
+				throw new \ValueError('Wrong argument for SETMETADATA command');
 			}
 
 			$arguments = [$this->EscapeFolderName($sFolderName)];
@@ -126,4 +129,8 @@ trait Metadata
 		}
 	}
 
+	public function FolderRemoveMetadata($sFolderName, array $aEntries) : void
+	{
+		$this->FolderSetMetadata($sFolderName, \array_fill_keys(\array_keys($aEntries), null));
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php
index eb8fa4223..12cb374d5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/Quota.php
@@ -23,36 +23,37 @@ trait Quota
 	/**
 	 * https://datatracker.ietf.org/doc/html/rfc2087#section-4.2
 	 *
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	public function Quota(string $sRootName = '') : ?array
 	{
-		return $this->IsSupported('QUOTA')
-			? $this->getQuotaResult($this->SendRequestGetResponse("GETQUOTA {$this->EscapeFolderName($sRootName)}"))
-			: null;
+		return $this->getQuota(false, $sRootName);
 	}
 
 	/**
 	 * https://datatracker.ietf.org/doc/html/rfc2087#section-4.3
 	 *
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	public function QuotaRoot(string $sFolderName = 'INBOX') : ?array
 	{
-		return $this->IsSupported('QUOTA')
-			? $this->getQuotaResult($this->SendRequestGetResponse("GETQUOTAROOT {$this->EscapeFolderName($sFolderName)}"))
-			: null;
+		return $this->getQuota(true, $sFolderName);
 	}
 
 	// * QUOTA "User quota" (STORAGE 1284645 2097152)\r\n
-	private function getQuotaResult(\MailSo\Imap\ResponseCollection $oResponseCollection) : array
+	private function getQuota(bool $root, string $sFolderName) : ?array
 	{
-		$aReturn = array(0, 0);
-		foreach ($oResponseCollection as $oResponse) {
-			if (\MailSo\Imap\Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
-				&& 'QUOTA' === $oResponse->StatusOrIndex
+		if (!$this->hasCapability('QUOTA')) {
+			return null;
+		}
+		$aReturn = array(0, 0, 0, 0);
+		$oResponseCollection = $this->SendRequest(($root?'GETQUOTAROOT':'GETQUOTA') . " {$this->EscapeFolderName($sFolderName)}");
+		foreach ($this->yieldUntaggedResponses() as $oResponse) {
+			if ('QUOTA' === $oResponse->StatusOrIndex
 				&& isset($oResponse->ResponseList[3])
 				&& \is_array($oResponse->ResponseList[3])
 				&& 2 < \count($oResponse->ResponseList[3])
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/UrlAuth.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/UrlAuth.php
new file mode 100644
index 000000000..77db79898
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Commands/UrlAuth.php
@@ -0,0 +1,52 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2021 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Imap\Commands;
+
+/**
+ * @category MailSo
+ * @package Imap
+ */
+trait UrlAuth
+{
+	/**
+	 * https://datatracker.ietf.org/doc/html/rfc4467#section-7
+	 */
+	public function RESETKEY(string $sFolderName, string $sMechanism)
+	{
+		$aParams = [];
+		if ($sFolderName) {
+			$aParams[] = $this->EscapeFolderName($sFolderName);
+		}
+		if ($sMechanism) {
+			$aParams[] = $this->EscapeString($sMechanism);
+		}
+		$oResponses = $this->SendRequestGetResponse('RESETKEY', $aParams);
+		return null;
+	}
+
+	public function GENURLAUTH(string $sMechanisms)
+	{
+		$oResponses = $this->SendRequestGetResponse('GENURLAUTH', array(
+			$this->EscapeString($sMechanism)
+		));
+		return null;
+	}
+
+	public function URLFETCH(string $sURLs)
+	{
+		$oResponses = $this->SendRequestGetResponse('URLFETCH', array(
+			$this->EscapeString($sURLs)
+		));
+		return null;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FetchType.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FetchType.php
index 395644833..20b30c6ab 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FetchType.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FetchType.php
@@ -53,18 +53,19 @@ abstract class FetchType
 	const BINARY_SIZE = 'BINARY.SIZE';
 	// RFC 4551
 	const MODSEQ = 'MODSEQ';
+	// RFC 8474
+	const EMAILID = 'EMAILID';
+	const THREADID = 'THREADID';
+	// RFC 8970
+	const PREVIEW = 'PREVIEW';
 
 	public static function BuildBodyCustomHeaderRequest(array $aHeaders, bool $bPeek = true) : string
 	{
-		$sResult = '';
-		if (\count($aHeaders))
-		{
-			$aHeaders = \array_map('strtoupper', \array_map('trim', $aHeaders));
-
-			$sResult = $bPeek ? self::BODY_PEEK : self::BODY;
-			$sResult .= '[HEADER.FIELDS ('.\implode(' ', $aHeaders).')]';
+		if (\count($aHeaders)) {
+			$aHeaders = \array_map(fn($sHeader) => \strtoupper(\trim($sHeader)), $aHeaders);
+			return ($bPeek ? self::BODY_PEEK : self::BODY)
+				. '[HEADER.FIELDS ('.\implode(' ', $aHeaders).')]';
 		}
-
-		return $sResult;
+		return '';
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
deleted file mode 100644
index 6377e96f9..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderResponseStatus.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Imap\Enumerations;
-
-/**
- * @category MailSo
- * @package Imap
- * @subpackage Enumerations
- */
-abstract class FolderResponseStatus
-{
-	// RFC 3501
-	const MESSAGES = 'MESSAGES';
-//	const RECENT = 'RECENT'; // IMAP4rev2 deprecated
-	const UIDNEXT = 'UIDNEXT';
-	const UIDVALIDITY = 'UIDVALIDITY';
-	const UNSEEN = 'UNSEEN';
-	// RFC 4551
-	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
-	// RFC 7889
-	const APPENDLIMIT = 'APPENDLIMIT';
-	// RFC 8474
-	const MAILBOXID = 'MAILBOXID';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
index a651fad9b..e6c3390a3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/FolderStatus.php
@@ -28,6 +28,8 @@ abstract class FolderStatus
 	const HIGHESTMODSEQ = 'HIGHESTMODSEQ';
 	// RFC 7889
 	const APPENDLIMIT = 'APPENDLIMIT';
+	// RFC 8438
+	const SIZE = 'SIZE';
 	// RFC 8474
 	const MAILBOXID = 'MAILBOXID';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
index c2e2c2b69..798a3412a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/MessageFlag.php
@@ -7,6 +7,8 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * https://www.iana.org/assignments/imap-jmap-keywords/imap-jmap-keywords.xhtml
  */
 
 namespace MailSo\Imap\Enumerations;
@@ -18,10 +20,21 @@ namespace MailSo\Imap\Enumerations;
  */
 abstract class MessageFlag
 {
-//	const RECENT = '\\Recent'; // IMAP4rev2 deprecated
-	const SEEN = '\\Seen';
-	const DELETED = '\\Deleted';
-	const FLAGGED = '\\Flagged';
-	const ANSWERED = '\\Answered';
-	const DRAFT = '\\Draft';
+	const
+//		RECENT = '\\Recent', // IMAP4rev2 deprecated
+		SEEN = '\\Seen',
+		DELETED = '\\Deleted',
+		FLAGGED = '\\Flagged',
+		ANSWERED = '\\Answered',
+		DRAFT = '\\Draft',
+		// https://datatracker.ietf.org/doc/html/rfc3503
+		MDNSENT = '$MDNSent',
+		// https://datatracker.ietf.org/doc/html/rfc8457
+		IMPORTANT = '$Important',
+		// https://datatracker.ietf.org/doc/html/rfc5788
+		FORWARDED = '$Forwarded',
+		// https://datatracker.ietf.org/doc/html/rfc9051#section-2.3.2
+		JUNK = '$Junk',
+		NOTJUNK = '$NotJunk',
+		PHISHING = '$Phishing';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
index 4c6d8b44e..172e0e89b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Enumerations/StoreAction.php
@@ -18,8 +18,8 @@ namespace MailSo\Imap\Enumerations;
  */
 abstract class StoreAction
 {
-	const SET_FLAGS = 'FLAGS';
-	const SET_FLAGS_SILENT = 'FLAGS.SILENT';
+//	const SET_FLAGS = 'FLAGS';
+//	const SET_FLAGS_SILENT = 'FLAGS.SILENT';
 	const ADD_FLAGS = '+FLAGS';
 	const ADD_FLAGS_SILENT = '+FLAGS.SILENT';
 	const REMOVE_FLAGS = '-FLAGS';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/Exception.php
deleted file mode 100644
index 02b3e71ef..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/Exception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Imap\Exceptions;
-
-/**
- * @category MailSo
- * @package Imap
- * @subpackage Exceptions
- */
-class Exception extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
index c4e3ff46a..a063a8e2f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseException.php
@@ -16,11 +16,8 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class ResponseException extends \MailSo\Imap\Exceptions\Exception
+class ResponseException extends \MailSo\RuntimeException
 {
-	/**
-	 * @var array
-	 */
 	private $oResponses;
 
 	public function __construct(?\MailSo\Imap\ResponseCollection $oResponses = null, string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
index 2d4d02964..e1419c187 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/ResponseNotFoundException.php
@@ -16,4 +16,4 @@ namespace MailSo\Imap\Exceptions;
  * @package Imap
  * @subpackage Exceptions
  */
-class ResponseNotFoundException extends \MailSo\Imap\Exceptions\Exception {}
+class ResponseNotFoundException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php
deleted file mode 100644
index d2af1b1bf..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Exceptions/RuntimeException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Imap\Exceptions;
-
-/**
- * @category MailSo
- * @package Imap
- * @subpackage Exceptions
- */
-class RuntimeException extends \MailSo\Imap\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
index 56c560d29..5141aa2f6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FetchResponse.php
@@ -17,50 +17,36 @@ namespace MailSo\Imap;
  */
 class FetchResponse
 {
-	/**
-	 * @var \MailSo\Imap\Response
-	 */
-	private $oImapResponse;
+	public Response $oImapResponse;
 
-	/**
-	 * @var array|null
-	 */
-	private $aEnvelopeCache;
+	private ?array $aEnvelopeCache = null;
 
 	function __construct(Response $oImapResponse)
 	{
 		$this->oImapResponse = $oImapResponse;
-		$this->aEnvelopeCache = null;
 	}
 
-	public function GetEnvelope(bool $bForce = false) : ?array
+	public function GetEnvelope(bool $bForce = false): ?array
 	{
-		if (null === $this->aEnvelopeCache || $bForce)
-		{
+		if (null === $this->aEnvelopeCache || $bForce) {
 			$this->aEnvelopeCache = $this->GetFetchValue(Enumerations\FetchType::ENVELOPE);
 		}
 		return $this->aEnvelopeCache;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function GetFetchEnvelopeValue(int $iIndex, ?string $mNullResult = null)
+	public function GetFetchEnvelopeValue(int $iIndex, ?string $mNullResult = null): mixed
 	{
 		return self::findEnvelopeIndex($this->GetEnvelope(), $iIndex, $mNullResult);
 	}
 
-	public function GetFetchEnvelopeEmailCollection(int $iIndex, string $sParentCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1) : ?\MailSo\Mime\EmailCollection
+	public function GetFetchEnvelopeEmailCollection(int $iIndex, string $sParentCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1): ?\MailSo\Mime\EmailCollection
 	{
 		$oResult = null;
 		$aEmails = $this->GetFetchEnvelopeValue($iIndex);
-		if (\is_array($aEmails) && \count($aEmails))
-		{
+		if (\is_array($aEmails) && \count($aEmails)) {
 			$oResult = new \MailSo\Mime\EmailCollection;
-			foreach ($aEmails as $aEmailItem)
-			{
-				if (\is_array($aEmailItem) && 4 === \count($aEmailItem))
-				{
+			foreach ($aEmails as $aEmailItem) {
+				if (\is_array($aEmailItem) && 4 === \count($aEmailItem)) {
 					$sDisplayName = \MailSo\Base\Utils::DecodeHeaderValue(
 						self::findEnvelopeIndex($aEmailItem, 0, ''), $sParentCharset);
 
@@ -70,8 +56,7 @@ class FetchResponse
 					$sLocalPart = self::findEnvelopeIndex($aEmailItem, 2, '');
 					$sDomainPart = self::findEnvelopeIndex($aEmailItem, 3, '');
 
-					if (\strlen($sLocalPart) && \strlen($sDomainPart))
-					{
+					if (\strlen($sLocalPart) && \strlen($sDomainPart)) {
 						$oResult->append(
 							new \MailSo\Mime\Email($sLocalPart.'@'.$sDomainPart, $sDisplayName)
 						);
@@ -83,7 +68,7 @@ class FetchResponse
 		return $oResult;
 	}
 
-	public function GetFetchBodyStructure() : ?BodyStructure
+	public function GetFetchBodyStructure(): ?BodyStructure
 	{
 		$aBodyStructureArray = $this->GetFetchValue(Enumerations\FetchType::BODYSTRUCTURE);
 
@@ -94,9 +79,8 @@ class FetchResponse
 
 	/**
 	 * Like: UID, RFC822.SIZE, MODSEQ, INTERNALDATE, FLAGS, BODYSTRUCTURE
-	 * @return mixed
 	 */
-	public function GetFetchValue(string $sFetchItemName)
+	public function GetFetchValue(string $sFetchItemName): mixed
 	{
 		if (isset($this->oImapResponse->ResponseList[3]) && \is_array($this->oImapResponse->ResponseList[3])) {
 			$bNextIsValue = false;
@@ -116,24 +100,20 @@ class FetchResponse
 
 	/**
 	 * Like: BODY[HEADER.FIELDS (RETURN-PATH RECEIVED MIME-VERSION MESSAGE-ID CONTENT-TYPE FROM TO CC BCC SENDER REPLY-TO DELIVERED-TO IN-REPLY-TO REFERENCES DATE SUBJECT SENSITIVITY X-MSMAIL-PRIORITY IMPORTANCE X-PRIORITY X-DRAFT-INFO RETURN-RECEIPT-TO DISPOSITION-NOTIFICATION-TO X-CONFIRM-READING-TO AUTHENTICATION-RESULTS X-DKIM-AUTHENTICATION-RESULTS LIST-UNSUBSCRIBE X-SPAM-STATUS X-SPAMD-RESULT X-BOGOSITY X-VIRUS X-VIRUS-SCANNED X-VIRUS-STATUS)]
-	 * @return mixed
 	 */
-	public function GetHeaderFieldsValue() : string
+	public function GetHeaderFieldsValue(): string
 	{
 		$bNextIsValue = false;
 
-		if (isset($this->oImapResponse->ResponseList[3]) && \is_array($this->oImapResponse->ResponseList[3]))
-		{
-			foreach ($this->oImapResponse->ResponseList[3] as $mItem)
-			{
-				if ($bNextIsValue)
-				{
+		if (isset($this->oImapResponse->ResponseList[3]) && \is_array($this->oImapResponse->ResponseList[3])) {
+			foreach ($this->oImapResponse->ResponseList[3] as $mItem) {
+				if ($bNextIsValue) {
 					return (string) $mItem;
 				}
 
 				if (\is_string($mItem) && (
 					$mItem === 'BODY[HEADER]' ||
-					0 === \strpos($mItem, 'BODY[HEADER.FIELDS') ||
+					\str_starts_with($mItem, 'BODY[HEADER.FIELDS') ||
 					$mItem === 'BODY[MIME]'))
 				{
 					$bNextIsValue = true;
@@ -144,25 +124,22 @@ class FetchResponse
 		return '';
 	}
 
-	public static function isValidImapResponse(Response $oImapResponse) : bool
+	public static function isValidImapResponse(Response $oImapResponse): bool
 	{
 		return
-			true !== $oImapResponse->IsStatusResponse
+			!$oImapResponse->IsStatusResponse
 			&& Enumerations\ResponseType::UNTAGGED === $oImapResponse->ResponseType
 			&& 3 < \count($oImapResponse->ResponseList) && 'FETCH' === $oImapResponse->ResponseList[2]
 			&& \is_array($oImapResponse->ResponseList[3]);
 	}
 
-	public static function hasUidAndSize(Response $oImapResponse) : bool
+	public static function hasUidAndSize(Response $oImapResponse): bool
 	{
 		return \in_array(Enumerations\FetchType::UID, $oImapResponse->ResponseList[3])
 			&& \in_array(Enumerations\FetchType::RFC822_SIZE, $oImapResponse->ResponseList[3]);
 	}
 
-	/**
-	 * @return mixed
-	 */
-	private static function findEnvelopeIndex(array $aEnvelope, int $iIndex, ?string $mNullResult)
+	private static function findEnvelopeIndex(array $aEnvelope, int $iIndex, ?string $mNullResult): mixed
 	{
 		return (isset($aEnvelope[$iIndex]) && '' !== $aEnvelope[$iIndex])
 			? $aEnvelope[$iIndex] : $mNullResult;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
index f105e7046..b36c183a7 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Folder.php
@@ -11,68 +11,66 @@
 
 namespace MailSo\Imap;
 
+use MailSo\Imap\Enumerations\MetadataKeys;
+
 /**
  * @category MailSo
  * @package Imap
  */
-class Folder
+class Folder implements \JsonSerializable
 {
 	// RFC5258 Response data STATUS items when using LIST-EXTENDED
 	use Traits\Status;
 
-	/**
-	 * @var string
-	 */
-	private $sFullName;
+	private ?string $sDelimiter;
 
-	/**
-	 * @var string
-	 */
-	private $sDelimiter;
-
-	/**
-	 * @var array
-	 */
-	private $aFlagsLowerCase;
+	private array $aAttributes;
 
 	/**
 	 * RFC 5464
 	 */
-	private $aMetadata = array();
+	private array $aMetadata = array();
+
+	public ?Responses\ACL $myRights = null;
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \ValueError
 	 */
-	function __construct(string $sFullName, string $sDelimiter = null, array $aFlags = array())
+	function __construct(string $sFullName, ?string $sDelimiter = null, array $aAttributes = array())
 	{
 		if (!\strlen($sFullName)) {
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+			throw new \ValueError;
 		}
-		$this->sFullName = $sFullName;
+		$this->FullName = $sFullName;
 		$this->setDelimiter($sDelimiter);
-		$this->setFlags($aFlags);
+		$this->setAttributes($aAttributes);
 /*
 		// RFC 5738
-		if (\in_array('\\noutf8', $this->aFlagsLowerCase)) {
+		if (\in_array('\\noutf8', $this->aAttributes)) {
 		}
-		if (\in_array('\\utf8only', $this->aFlagsLowerCase)) {
+		if (\in_array('\\utf8only', $this->aAttributes)) {
 		}
 */
 	}
 
-	public function setFlags(array $aFlags) : void
+	public function setAttributes(array $aAttributes): void
 	{
-		$this->aFlagsLowerCase = \array_map('strtolower', $aFlags);
+		$this->aAttributes = \array_map('mb_strtolower', $aAttributes);
 	}
 
-	public function setDelimiter(?string $sDelimiter) : void
+	public function setSubscribed(): void
+	{
+		$this->aAttributes = \array_unique(\array_merge($this->aAttributes, ['\\subscribed']));
+	}
+
+	public function setDelimiter(?string $sDelimiter): void
 	{
 		$this->sDelimiter = $sDelimiter;
 	}
 
-	public function Name() : string
+	public function Name(): string
 	{
-		$sNameRaw = $this->sFullName;
+		$sNameRaw = $this->FullName;
 		if ($this->sDelimiter) {
 			$aNames = \explode($this->sDelimiter, $sNameRaw);
 			return \end($aNames);
@@ -80,57 +78,109 @@ class Folder
 		return $sNameRaw;
 	}
 
-	public function FullName() : string
-	{
-		return $this->sFullName;
-	}
-
-	public function Delimiter() : ?string
+	public function Delimiter(): ?string
 	{
 		return $this->sDelimiter;
 	}
 
-	public function FlagsLowerCase() : array
+	public function Selectable(): bool
 	{
-		return $this->aFlagsLowerCase;
+		return !\in_array('\\noselect', $this->aAttributes)
+			&& !\in_array('\\nonexistent', $this->aAttributes);
 	}
 
-	public function IsSelectable() : bool
+	public function IsSubscribed(): bool
 	{
-		return !\in_array('\\noselect', $this->aFlagsLowerCase) && !\in_array('\\nonexistent', $this->aFlagsLowerCase);
+		return \in_array('\\subscribed', $this->aAttributes);
 	}
 
-	public function IsInbox() : bool
+	public function IsInbox(): bool
 	{
-		return 'INBOX' === \strtoupper($this->sFullName) || \in_array('\\inbox', $this->aFlagsLowerCase);
+		return 'INBOX' === \strtoupper($this->FullName) || \in_array('\\inbox', $this->aAttributes);
 	}
 
-	/**
-	 * @param mixed $mData
-	 */
-	public function SetMetadata(string $sName, string $sData) : void
+	public function SetMetadata(string $sName, string $sData): void
 	{
 		$this->aMetadata[$sName] = $sData;
 	}
 
-	public function SetAllMetadata(array $aMetadata) : void
+	public function SetAllMetadata(array $aMetadata): void
 	{
 		$this->aMetadata = $aMetadata;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function GetMetadata(string $sName) : ?string
+	public function GetMetadata(string $sName): ?string
 	{
 		return isset($this->aMetadata[$sName]) ? $this->aMetadata[$sName] : null;
 	}
 
-	/**
-	 * @return array
-	 */
-	public function Metadata() : array
+	public function Metadata(): array
 	{
 		return $this->aMetadata;
 	}
+
+	// JMAP RFC 8621
+	public function Role(): ?string
+	{
+		$role = \strtolower($this->GetMetadata(MetadataKeys::SPECIALUSE) ?: '');
+		if (!$role) {
+			$match = \array_intersect([
+				'\\inbox',
+				'\\all',       // '\\allmail'
+				'\\archive',
+				'\\drafts',
+				'\\flagged',   // '\\starred'
+				'\\important',
+				'\\junk',      // '\\spam'
+				'\\sent',      // '\\sentmail'
+				'\\trash',     // '\\bin'
+			], $this->aAttributes);
+			if ($match) {
+				$role = \array_shift($match);
+			}
+			if (!$role && 'INBOX' === \strtoupper($this->FullName)) {
+				return 'inbox';
+			}
+		}
+		return $role ? \ltrim($role, '\\') : null;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$selectable = $this->Selectable();
+		$result = array(
+			'@Object' => 'Object/Folder',
+			'name' => $this->Name(),
+			'fullName' => $this->FullName,
+			'delimiter' => (string) $this->sDelimiter,
+			'attributes' => $this->aAttributes,
+			'metadata' => $this->aMetadata,
+			'uidNext' => $this->UIDNEXT,
+			// https://datatracker.ietf.org/doc/html/rfc8621#section-2
+			'totalEmails' => $this->MESSAGES,
+			'unreadEmails' => $this->UNSEEN,
+			'id' => $this->MAILBOXID,
+			'size' => $this->SIZE,
+			'role' => $this->Role(),
+/*
+			'rights' => $this->myRights,
+			'myRights' => $this->myRights ?: [
+				'mayReadItems'   => $selectable,
+				'mayAddItems'    => $selectable,
+				'mayRemoveItems' => $selectable,
+				'maySetSeen'     => $selectable,
+				'maySetKeywords' => $selectable,
+				'mayCreateChild' => $selectable,
+				'mayRename'      => $selectable,
+				'mayDelete'      => $selectable,
+				'maySubmit'      => $selectable
+			]
+*/
+		);
+		if ($this->etag) {
+			$result['etag'] = $this->etag;
+		}
+		return $result;
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
similarity index 52%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
rename to snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
index 4e82c6af3..6fe2698e3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/FolderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderCollection.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace MailSo\Mail;
+namespace MailSo\Imap;
 
 /**
  * @category MailSo
@@ -17,22 +17,21 @@ namespace MailSo\Mail;
  */
 class FolderCollection extends \MailSo\Base\Collection
 {
-	/**
-	 * @var bool
-	 */
-	public $Optimized = false;
+//	public bool $Optimized = false;
 
-	public $TotalCount = 0;
-
-	public function append($oFolder, bool $bToTop = false) : void
+	public function append($oFolder, bool $bToTop = false): void
 	{
 		assert($oFolder instanceof Folder);
 		parent::append($oFolder, $bToTop);
 	}
 
-	public function FindDelimiter() : string
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		$oFolder = $this['INBOX'] ?? $this[0] ?? null;
-		return $oFolder ? $oFolder->Delimiter() : '/';
+		return array(
+			'@Object' => 'Collection/FolderCollection',
+			'@Collection' => \array_values($this->getArrayCopy()),
+//			'optimized' => $this->Optimized
+		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
index dcedd1860..1609359ac 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/FolderInformation.php
@@ -15,46 +15,71 @@ namespace MailSo\Imap;
  * @category MailSo
  * @package Imap
  */
-class FolderInformation
+class FolderInformation implements \JsonSerializable
 {
 	use Traits\Status;
 
-	/**
-	 * @var string
-	 */
-	public $FolderName;
+	public bool $IsWritable;
 
 	/**
-	 * @var bool
+	 * Message flags
+	 * https://www.rfc-editor.org/rfc/rfc3501#section-7.2.6
+	 * These could be not permanent so we don't use them
 	 */
-	public $IsWritable;
+	public array $Flags = array();
 
 	/**
-	 * @var array
+	 * NOTE: Empty when FolderExamine is used
+	 * https://www.rfc-editor.org/rfc/rfc3501#page-64
 	 */
-	public $Flags = array();
+	public array $PermanentFlags = array();
 
-	/**
-	 * @var array
-	 */
-	public $PermanentFlags = array();
-
-	/**
-	 * https://datatracker.ietf.org/doc/html/rfc3501#section-7.3.1
-	 * @var int
-	 */
-	public $Exists = null;
-
-	function __construct(string $sFolderName, bool $bIsWritable)
+	function __construct(string $sFullName, bool $bIsWritable)
 	{
-		$this->FolderName = $sFolderName;
+		$this->FullName = $sFullName;
 		$this->IsWritable = $bIsWritable;
 	}
 
-	public function IsFlagSupported(string $sFlag) : bool
+	public function IsFlagSupported(string $sFlag): bool
 	{
-		return \in_array('\\*', $this->PermanentFlags) ||
-			\in_array($sFlag, $this->PermanentFlags) ||
-			\in_array($sFlag, $this->Flags);
+		return \in_array('\\*', $this->PermanentFlags)
+			|| \in_array($sFlag, $this->PermanentFlags);
+//			|| \in_array($sFlag, $this->Flags);
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$result = array(
+			'id' => $this->MAILBOXID,
+			'name' => $this->FullName,
+			'uidNext' => $this->UIDNEXT,
+			'uidValidity' => $this->UIDVALIDITY
+		);
+		if (isset($this->MESSAGES)) {
+			$result['totalEmails'] = $this->MESSAGES;
+			$result['unreadEmails'] = $this->UNSEEN;
+		}
+		if (isset($this->HIGHESTMODSEQ)) {
+			$result['highestModSeq'] = $this->HIGHESTMODSEQ;
+		}
+		if (isset($this->APPENDLIMIT)) {
+			$result['appendLimit'] = $this->APPENDLIMIT;
+		}
+		if (isset($this->SIZE)) {
+			$result['size'] = $this->SIZE;
+		}
+		if ($this->etag) {
+			$result['etag'] = $this->etag;
+		}
+/*
+		if ($this->Flags) {
+			$result['flags'] = $this->Flags;
+		}
+*/
+		if ($this->PermanentFlags) {
+			$result['permanentFlags'] = $this->PermanentFlags;
+		}
+		return $result;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
index e55ab992c..2ec335901 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ImapClient.php
@@ -11,6 +11,8 @@
 
 namespace MailSo\Imap;
 
+use MailSo\Net\Enumerations\ConnectionSecurityType;
+
 /**
  * @category MailSo
  * @package Imap
@@ -18,237 +20,216 @@ namespace MailSo\Imap;
 class ImapClient extends \MailSo\Net\NetClient
 {
 	use Traits\ResponseParser;
-//	use Commands\ACL;
+	use Commands\ACL;
 	use Commands\Folders;
 	use Commands\Messages;
 	use Commands\Metadata;
 	use Commands\Quota;
 
-	const
-		TAG_PREFIX = 'TAG';
+	public string $TAG_PREFIX = 'TAG';
 
-	/**
-	 * @var int
-	 */
-	private $iTagCount = 0;
+	private int $iTagCount = 0;
 
-	/**
-	 * @var array
-	 */
-	private $aCapabilityItems = null;
+	private ?array $aCapa = null;
+	private ?array $aCapaRaw = null;
 
-	/**
-	 * @var FolderInformation
-	 */
-	private $oCurrentFolderInfo = null;
+	private ?FolderInformation $oCurrentFolderInfo = null;
 
 	/**
 	 * Used by \MailSo\Mail\MailClient::MessageMimeStream
-	 * @var array
 	 */
-	private $aFetchCallbacks;
+	private array $aFetchCallbacks = array();
+
+	private array $aTagTimeouts = array();
+
+	private bool $bIsLoggined = false;
 
 	/**
-	 * @var array
+	 * RFC 6855 UTF8 mode
 	 */
-	private $aTagTimeouts = array();
+	private bool $UTF8 = false;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsLoggined = false;
-
-	/**
-	 * @var string
-	 */
-	private $sLogginedUser = '';
-
-	/**
-	 * @var bool
-	 */
-	public $__FORCE_SELECT_ON_EXAMINE__ = false;
-
-	/**
-	 * @var bool
-	 */
-	private $UTF8 = false;
-
-	public function GetLogginedUser() : string
+	public function Hash(): string
 	{
-		return $this->sLogginedUser;
+		return \md5('ImapClientHash/'.
+			$this->Settings->username . '@' .
+			$this->Settings->host . ':' .
+			$this->Settings->port
+		);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Connect(string $sServerName, int $iPort = 143,
-		int $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
-		bool $bVerifySsl = false, bool $bAllowSelfSigned = true,
-		string $sClientCert = '') : void
+//	public function Connect(Settings $oSettings): void
+	public function Connect(\MailSo\Net\ConnectSettings $oSettings): void
 	{
 		$this->aTagTimeouts['*'] = \microtime(true);
 
-		parent::Connect($sServerName, $iPort, $iSecurityType, $bVerifySsl, $bAllowSelfSigned, $sClientCert);
+		parent::Connect($oSettings);
 
-		$this->aCapabilityItems = $this->getResponse('*')->getCapabilityResult();
+		$this->setCapabilities($this->getResponse('*'));
 
-		if ($this->IsSupported('STARTTLS') && \MailSo\Net\Enumerations\ConnectionSecurityType::UseStartTLS($this->iSecurityType))
-		{
-			$this->SendRequestGetResponse('STARTTLS');
-			$this->EnableCrypto();
-
-			$this->aCapabilityItems = null;
-		}
-		else if (\MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS === $this->iSecurityType)
-		{
-			$this->writeLogException(
-				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if (ConnectionSecurityType::STARTTLS === $this->Settings->type
+		 || (ConnectionSecurityType::AUTO_DETECT === $this->Settings->type && $this->hasCapability('STARTTLS'))) {
+			$this->StartTLS();
 		}
 	}
 
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function Login(array $aCredentials) : self
+	private function StartTLS(): void
 	{
-		if (!empty($aCredentials['ProxyAuthUser']) && !empty($aCredentials['ProxyAuthPassword'])) {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['ProxyAuthUser']));
-			$sPassword = $aCredentials['ProxyAuthPassword'];
-			$sProxyAuthUser = $aCredentials['Login'];
+		if ($this->hasCapability('STARTTLS')) {
+			$this->SendRequestGetResponse('STARTTLS');
+			$this->EnableCrypto();
+			$this->aCapa = null;
+			$this->aCapaRaw = null;
 		} else {
-			$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['Login']));
-			$sPassword = $aCredentials['Password'];
-			$sProxyAuthUser = '';
-		}
-
-		if (!\strlen($sLogin) || !\strlen($sPassword))
-		{
 			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
+				\LOG_ERR);
+		}
+	}
+
+	public function supportsAuthType(string $sasl_type): bool
+	{
+		return $this->hasCapability("AUTH={$sasl_type}");
+	}
+
+	/**
+	 * @throws \UnexpectedValueException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 */
+	public function Login(Settings $oSettings): self
+	{
+		if ($this->bIsLoggined) {
+			return $this;
 		}
 
-		$this->sLogginedUser = $sLogin;
+		$sLogin = $oSettings->username;
+		$sPassword = $oSettings->passphrase;
 
-		$type = $this->IsSupported('LOGINDISABLED') ? '' : 'LOGIN'; // RFC3501 6.2.3
-		foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
-			if ($this->IsSupported("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
+		if (!\strlen($sLogin) || !\strlen($sPassword)) {
+			$this->writeLogException(new \UnexpectedValueException, \LOG_ERR);
+		}
+
+		$type = '';
+		foreach ($oSettings->SASLMechanisms as $sasl_type) {
+			if ($this->hasCapability("AUTH={$sasl_type}") && \SnappyMail\SASL::isSupported($sasl_type)) {
 				$type = $sasl_type;
 				break;
 			}
 		}
+		// RFC3501 6.2.3
+		if (!$type && \in_array('LOGIN', $oSettings->SASLMechanisms) && !$this->hasCapability('LOGINDISABLED')) {
+			$type = 'LOGIN';
+		}
+		if (!$type) {
+			if (!$this->Encrypted() && $this->hasCapability('STARTTLS')) {
+				$this->StartTLS();
+				return $this->Login($oSettings);
+			}
+			throw new \MailSo\RuntimeException('No supported SASL mechanism found, remote server wants: '
+				. \implode(', ', \array_filter($this->Capability() ?: [], function($var){
+					return \str_starts_with($var, 'AUTH=');
+				}))
+			);
+		}
 
 		$SASL = \SnappyMail\SASL::factory($type);
-		$SASL->base64 = true;
 
 		try
 		{
-			if (0 === \strpos($type, 'SCRAM-'))
+			if ('CRAM-MD5' === $type)
 			{
-				$sAuthzid = $this->getResponseValue($this->SendRequestGetResponse('AUTHENTICATE', array($type)), Enumerations\ResponseType::CONTINUATION);
-				$this->sendRaw($SASL->authenticate($sLogin, $sPassword/*, $sAuthzid*/), true);
-				$sChallenge = $SASL->challenge($this->getResponseValue($this->getResponse(), Enumerations\ResponseType::CONTINUATION));
-				if ($this->oLogger) {
-					$this->oLogger->AddSecret($sChallenge);
-				}
-				$this->sendRaw($sChallenge, true, '*******');
-				$oResponse = $this->getResponse();
-				$SASL->verify($this->getResponseValue($oResponse));
-			}
-			else if ('CRAM-MD5' === $type)
-			{
-				$sChallenge = $this->getResponseValue($this->SendRequestGetResponse('AUTHENTICATE', array($type)), Enumerations\ResponseType::CONTINUATION);
-				$this->oLogger->Write('challenge: '.\base64_decode($sChallenge));
+				$oResponse = $this->SendRequestGetResponse('AUTHENTICATE', array($type));
+				$sChallenge = $this->getResponseValue($oResponse, Enumerations\ResponseType::CONTINUATION);
 				$sAuth = $SASL->authenticate($sLogin, $sPassword, $sChallenge);
-				if ($this->oLogger) {
-					$this->oLogger->AddSecret($sAuth);
-				}
-				$this->sendRaw($sAuth, true, '*******');
+				$this->logMask($sAuth);
+				$this->sendRaw($sAuth);
 				$oResponse = $this->getResponse();
 			}
-			else if ('PLAIN' === $type || 'OAUTHBEARER' === $type)
+			else if ('PLAIN' === $type || 'OAUTHBEARER' === $type || \str_starts_with($type, 'SCRAM-') /*|| 'PLAIN-CLIENTTOKEN' === $type*/)
 			{
 				$sAuth = $SASL->authenticate($sLogin, $sPassword);
-				if ($this->oLogger) {
-					$this->oLogger->AddSecret($sAuth);
-				}
-				if ($this->IsSupported('SASL-IR')) {
-					$oResponse = $this->SendRequestGetResponse('AUTHENTICATE', array($type, $sAuth));
+				$this->logMask($sAuth);
+				if ($this->hasCapability('SASL-IR')) {
+					$this->SendRequest('AUTHENTICATE', array($type, $sAuth));
 				} else {
 					$this->SendRequestGetResponse('AUTHENTICATE', array($type));
-					$this->sendRaw($sAuth, true, '*******');
+					$this->sendRaw($sAuth);
+				}
+				$oResponse = $this->getResponse();
+//				if ($oResponse->getLast()->ResponseType === Enumerations\ResponseType::CONTINUATION)
+				if ($SASL->hasChallenge()) {
+					$sChallenge = $SASL->challenge($this->getResponseValue($oResponse, Enumerations\ResponseType::CONTINUATION));
+					$this->logMask($sChallenge);
+					$this->sendRaw($sChallenge);
+					$oResponse = $this->getResponse();
+					$SASL->verify($this->getResponseValue($oResponse, Enumerations\ResponseType::CONTINUATION));
+					$this->sendRaw('');
 					$oResponse = $this->getResponse();
 				}
 			}
-			else if ('XOAUTH2' === $type)
+			else if ('XOAUTH2' === $type || 'OAUTHBEARER' === $type)
 			{
 				$sAuth = $SASL->authenticate($sLogin, $sPassword);
-				$this->SendRequest('AUTHENTICATE', array($type, $sAuth));
-				$oResponse = $this->getResponse();
+				$this->logMask($sAuth);
+				$oResponse = $this->SendRequestGetResponse('AUTHENTICATE', array($type, $sAuth));
 				$oR = $oResponse->getLast();
 				if ($oR && Enumerations\ResponseType::CONTINUATION === $oR->ResponseType) {
-					if (!empty($oR->ResponseList[1]) && preg_match('/^[a-zA-Z0-9=+\/]+$/', $oR->ResponseList[1])) {
-						$this->Logger()->Write(\base64_decode($oR->ResponseList[1]),
-							\MailSo\Log\Enumerations\Type::WARNING);
+					if (!empty($oR->ResponseList[1]) && \preg_match('/^[a-zA-Z0-9=+\/]+$/', $oR->ResponseList[1])) {
+						$this->logWrite(\base64_decode($oR->ResponseList[1]), \LOG_WARNING);
 					}
 					$this->sendRaw('');
 					$oResponse = $this->getResponse();
 				}
 			}
-			else if ($this->IsSupported('LOGINDISABLED'))
+			else if ($this->hasCapability('LOGINDISABLED'))
 			{
-				$sB64 = $this->getResponseValue($this->SendRequestGetResponse('AUTHENTICATE', array($type)), Enumerations\ResponseType::CONTINUATION);
-				$this->sendRaw($SASL->authenticate($sLogin, $sPassword, $sB64), true);
+				$oResponse = $this->SendRequestGetResponse('AUTHENTICATE', array($type));
+				$sB64 = $this->getResponseValue($oResponse, Enumerations\ResponseType::CONTINUATION);
+				$sAuth = $SASL->authenticate($sLogin, $sPassword, $sB64);
+				$this->logMask($sAuth);
+				$this->sendRaw($sAuth, true);
 				$this->getResponse();
 				$sPass = $SASL->challenge(''/*UGFzc3dvcmQ6*/);
-				if ($this->oLogger) {
-					$this->oLogger->AddSecret($sPass);
-				}
-				$this->sendRaw($sPass, true, '*******');
+				$this->logMask($sPass);
+				$this->sendRaw($sPass);
 				$oResponse = $this->getResponse();
 			}
 			else
 			{
-				if ($this->oLogger)
-				{
-					$this->oLogger->AddSecret($this->EscapeString($sPassword));
-				}
+				$sPassword = $this->EscapeString(\mb_convert_encoding($sPassword, 'ISO-8859-1', 'UTF-8'));
+				$this->logMask($sPassword);
 				$oResponse = $this->SendRequestGetResponse('LOGIN',
 					array(
 						$this->EscapeString($sLogin),
-						$this->EscapeString($sPassword)
+						$sPassword
 					));
 			}
 
-			$this->aCapabilityItems = $oResponse->getCapabilityResult();
+			$this->setCapabilities($oResponse);
 
-			if (\strlen($sProxyAuthUser))
-			{
-				$this->SendRequestGetResponse('PROXYAUTH', array($this->EscapeString($sProxyAuthUser)));
-			}
 /*
 			// TODO: RFC 9051
-			if ($this->IsSupported('IMAP4rev2')) {
+			if ($this->hasCapability('IMAP4rev2')) {
 				$this->Enable('IMAP4rev1');
 			}
 */
 			// RFC 6855 || RFC 5738
-			$this->UTF8 = $this->IsSupported('UTF8=ONLY') || $this->IsSupported('UTF8=ACCEPT');
+			$this->UTF8 = $this->hasCapability('UTF8=ONLY') || $this->hasCapability('UTF8=ACCEPT');
 			if ($this->UTF8) {
-				$this->Enable('ENABLE', 'UTF8=ACCEPT');
+				$this->Enable('UTF8=ACCEPT');
 			}
 		}
 		catch (Exceptions\NegativeResponseException $oException)
 		{
-			$this->writeLogException(
-				new Exceptions\LoginBadCredentialsException(
-					$oException->GetResponses(), '', 0, $oException),
-				\MailSo\Log\Enumerations\Type::NOTICE, true);
+			$this->writeLogException(new Exceptions\LoginBadCredentialsException($oException->GetResponses(), '', 0, $oException));
 		}
 
 		$this->bIsLoggined = true;
@@ -257,54 +238,99 @@ class ImapClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Logout() : void
+	public function Logout(): void
 	{
-		if ($this->bIsLoggined)
-		{
+		if ($this->bIsLoggined) {
 			$this->bIsLoggined = false;
 			$this->SendRequestGetResponse('LOGOUT');
 		}
 	}
 
-	public function IsLoggined() : bool
+	public function IsLoggined(): bool
 	{
 		return $this->IsConnected() && $this->bIsLoggined;
 	}
 
-	public function IsSelected() : bool
+	public function IsSelected(): bool
 	{
 		return $this->IsLoggined() && $this->oCurrentFolderInfo;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Capability() : ?array
+	public function Capability(): ?array
 	{
-		if (!$this->aCapabilityItems) {
-			$this->aCapabilityItems = $this->SendRequestGetResponse('CAPABILITY')
-				->getCapabilityResult();
+		if (!$this->aCapaRaw) {
+			$this->setCapabilities($this->SendRequestGetResponse('CAPABILITY'));
 		}
-		return $this->aCapabilityItems;
+/*
+		$this->aCapa[] = 'X-DOVECOT';
+*/
+		return $this->aCapa;
+	}
+
+	public function Capabilities(): ?array
+	{
+		if (!$this->aCapaRaw) {
+			$this->Capability();
+		}
+		return $this->aCapaRaw;
+	}
+
+	public function CapabilityValue(string $sExtentionName): ?string
+	{
+		$sExtentionName = \trim($sExtentionName) . '=';
+		$aCapabilities = $this->Capability() ?: [];
+		foreach ($aCapabilities as $string) {
+			if (\str_starts_with($string, $sExtentionName)) {
+				return \substr($string, \strlen($sExtentionName));
+			}
+		}
+		return null;
+	}
+
+	private function setCapabilities(ResponseCollection $oResponseCollection): void
+	{
+		$aList = $oResponseCollection->getCapabilityResult();
+		$this->aCapaRaw = $aList;
+		if ($aList) {
+			// Strip unused capabilities
+			$aList = \array_diff($aList, ['PREVIEW=FUZZY', 'SNIPPET=FUZZY', 'SORT=DISPLAY']);
+			// Set raw response capabilities
+			$this->aCapaRaw = $aList;
+			// Set active capabilities
+			$aList = \array_diff($aList, $this->Settings->disabled_capabilities);
+			if (\in_array('THREAD', $this->Settings->disabled_capabilities)) {
+				$aList = \array_filter($aList, function ($item) { return !\str_starts_with($item, 'THREAD='); });
+			}
+		}
+		$this->aCapa = $aList;
 	}
 
 	/**
 	 * Test support for things like:
-	 *     IMAP4rev1 IMAP4rev2 SASL-IR LOGIN-REFERRALS ID ENABLE IDLE SORT SORT=DISPLAY
+	 *     IMAP4rev1 IMAP4rev2 ID UIDPLUS QUOTA ENABLE IDLE
+	 *     SORT SORT=DISPLAY ESEARCH ESORT SEARCHRES WITHIN
 	 *     THREAD=REFERENCES THREAD=REFS THREAD=ORDEREDSUBJECT MULTIAPPEND
-	 *     URL-PARTIAL CATENATE UNSELECT CHILDREN NAMESPACE UIDPLUS LIST-EXTENDED
-	 *     I18NLEVEL=1 CONDSTORE QRESYNC ESEARCH ESORT SEARCHRES WITHIN CONTEXT=SEARCH
-	 *     LIST-STATUS BINARY MOVE SNIPPET=FUZZY PREVIEW=FUZZY STATUS=SIZE LITERAL+ NOTIFY SPECIAL-USE
-	 *     STARTTLS AUTH= LOGIN LOGINDISABLED QUOTA
-	 *     METADATA METADATA-SERVER
+	 *     URL-PARTIAL CATENATE UNSELECT NAMESPACE CONDSTORE
+	 *     CHILDREN LIST-EXTENDED LIST-STATUS STATUS=SIZE
+	 *     I18NLEVEL=1 QRESYNC CONTEXT=SEARCH
+	 *     BINARY MOVE SNIPPET=FUZZY PREVIEW=FUZZY LITERAL+ NOTIFY
+	 *     AUTH= LOGIN LOGINDISABLED LOGIN-REFERRALS SASL-IR STARTTLS
+	 *     METADATA METADATA-SERVER SPECIAL-USE
 	 *
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function IsSupported(string $sExtentionName) : bool
+	public function hasCapability(string $sExtentionName): bool
 	{
 		$sExtentionName = \trim($sExtentionName);
 		return $sExtentionName && \in_array(\strtoupper($sExtentionName), $this->Capability() ?: []);
@@ -313,23 +339,24 @@ class ImapClient extends \MailSo\Net\NetClient
 	/**
 	 * RFC 5161
 	 */
-	public function Enable(/*string|array*/ $mCapabilityNames) : void
+	public function Enable(string|array $mCapabilityNames): void
 	{
 		if (\is_string($mCapabilityNames)) {
 			$mCapabilityNames = [$mCapabilityNames];
 		}
-		if (\is_array($mCapabilityNames)) {
+		if (\is_array($mCapabilityNames) /*&& $this->hasCapability('ENABLE')*/) {
 			$this->SendRequestGetResponse('ENABLE', $mCapabilityNames);
 		}
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function GetNamespace() : ?NamespaceResult
+	public function GetNamespaces(): ?NamespaceResult
 	{
-		if (!$this->IsSupported('NAMESPACE')) {
+		if (!$this->hasCapability('NAMESPACE')) {
 			return null;
 		}
 
@@ -339,15 +366,12 @@ class ImapClient extends \MailSo\Net\NetClient
 				if (Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
 				 && 'NAMESPACE' === $oResponse->StatusOrIndex)
 				{
-					$oReturn = new NamespaceResult;
-					$oReturn->InitByImapResponse($oResponse);
-					return $oReturn;
+					return new NamespaceResult($oResponse);
 				}
 			}
 			throw new Exceptions\ResponseException;
 		} catch (\Throwable $e) {
-			$this->writeLogException($e, \MailSo\Log\Enumerations\Type::ERROR);
-			throw $e;
+			$this->writeLogException($e, \LOG_ERR);
 		}
 	}
 
@@ -358,40 +382,34 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * and that the client will need to discover upload limits for each mailbox,
 	 * as they might differ from mailbox to mailbox.
 	 */
-	public function AppendLimit() : ?int
+	public function AppendLimit(): ?int
 	{
-		if ($this->Capability()) {
-			foreach ($this->aCapabilityItems as $string) {
-				if ('APPENDLIMIT=' === \substr($string, 0, 12)) {
-					return (int) \substr($string, 12);
-				}
-			}
-		}
-		return null;
+		$string = $this->CapabilityValue('APPENDLIMIT');
+		return \is_null($string) ? null : (int) $string;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Noop() : self
+	public function Noop(): self
 	{
 		$this->SendRequestGetResponse('NOOP');
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function SendRequest(string $sCommand, array $aParams = array(), bool $bBreakOnLiteral = false) : string
+	public function SendRequest(string $sCommand, array $aParams = array(), bool $bBreakOnLiteral = false): string
 	{
 		$sCommand = \trim($sCommand);
-		if (!\strlen($sCommand))
-		{
-			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if (!\strlen($sCommand)) {
+			$this->writeLogException(new \ValueError, \LOG_ERR);
 		}
 
 		$this->IsConnected(true);
@@ -400,54 +418,33 @@ class ImapClient extends \MailSo\Net\NetClient
 
 		$sRealCommand = $sTag.' '.$sCommand.$this->prepareParamLine($aParams);
 
-		$sFakeCommand = '';
-		if ($aFakeParams = $this->secureRequestParams($sCommand, $aParams)) {
-			$sFakeCommand = $sTag.' '.$sCommand.$this->prepareParamLine($aFakeParams);
-		}
-
-//		$this->lastCommand = $sFakeCommand ?: $sRealCommand;
-
 		$this->aTagTimeouts[$sTag] = \microtime(true);
 
-		if ($bBreakOnLiteral && !\preg_match('/\d\+\}\r\n/', $sRealCommand))
-		{
+		if ($bBreakOnLiteral && !\preg_match('/\d\+\}\r\n/', $sRealCommand)) {
 			$iPos = \strpos($sRealCommand, "}\r\n");
-			if (false !== $iPos)
-			{
-				$iFakePos = \strpos($sFakeCommand, "}\r\n");
-
-				$this->sendRaw(\substr($sRealCommand, 0, $iPos + 1), true,
-					false !== $iFakePos ? \substr($sFakeCommand, 0, $iFakePos + 3) : '');
-
+			if (false !== $iPos) {
+				$this->sendRaw(\substr($sRealCommand, 0, $iPos + 1));
 				return \substr($sRealCommand, $iPos + 3);
 			}
 		}
 
-		$this->sendRaw($sRealCommand, true, $sFakeCommand);
+		$this->sendRaw($sRealCommand);
 		return '';
 	}
 
-	protected function secureRequestParams(string $sCommand, array $aParams) : ?array
-	{
-		if ('LOGIN' === $sCommand && isset($aParams[1])) {
-			$aParams[1] = '"********"';
-			return $aParams;
-		}
-		return null;
-	}
-
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function SendRequestGetResponse(string $sCommand, array $aParams = array()) : ResponseCollection
+	public function SendRequestGetResponse(string $sCommand, array $aParams = array()): ResponseCollection
 	{
 		$this->SendRequest($sCommand, $aParams);
 		return $this->getResponse();
 	}
 
-	protected function getResponseValue(ResponseCollection $oResponseCollection, int $type = 0) : string
+	protected function getResponseValue(ResponseCollection $oResponseCollection, int $type = 0): string
 	{
 		$oResponse = $oResponseCollection->getLast();
 		if ($oResponse && (!$type || $type === $oResponse->ResponseType)) {
@@ -455,13 +452,9 @@ class ImapClient extends \MailSo\Net\NetClient
 			if ($sResult) {
 				return $sResult;
 			}
-			$this->writeLogException(
-				new Exceptions\LoginException,
-				\MailSo\Log\Enumerations\Type::NOTICE, true);
+			$this->writeLogException(new Exceptions\LoginException);
 		}
-		$this->writeLogException(
-			new Exceptions\LoginException,
-			\MailSo\Log\Enumerations\Type::NOTICE, true);
+		$this->writeLogException(new Exceptions\LoginException);
 	}
 
 	/**
@@ -469,11 +462,11 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * This will reduce CPU time on server and moves it to the client
 	 * And can be used with the new JavaScript AbstractFetchRemote.streamPerLine(fCallback, sGetAdd)
 	 *
-	 * @throws \MailSo\Imap\Exceptions\ResponseNotFoundException
-	 * @throws \MailSo\Imap\Exceptions\InvalidResponseException
-	 * @throws \MailSo\Imap\Exceptions\NegativeResponseException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	protected function streamResponse(string $sEndTag = null) : void
+	protected function streamResponse(?string $sEndTag = null): void
 	{
 		try {
 			if (\is_resource($this->ConnectionResource())) {
@@ -491,12 +484,11 @@ class ImapClient extends \MailSo\Net\NetClient
 				exit;
 			}
 		} catch (\Throwable $e) {
-			$this->writeLogException($e, \MailSo\Log\Enumerations\Type::WARNING);
-			throw $e;
+			$this->writeLogException($e, \LOG_WARNING);
 		}
 	}
 
-	protected function getResponse(string $sEndTag = null) : ResponseCollection
+	protected function getResponse(?string $sEndTag = null): ResponseCollection
 	{
 		try {
 			$oResult = new ResponseCollection;
@@ -508,6 +500,14 @@ class ImapClient extends \MailSo\Net\NetClient
 					$oResponse = $this->partialParseResponse();
 					$oResult->append($oResponse);
 
+					if ($oResponse->IsStatusResponse
+					 && Enumerations\ResponseType::UNTAGGED === $oResponse->ResponseType
+					 && Enumerations\ResponseStatus::PREAUTH === $oResponse->StatusOrIndex
+//					 && (Enumerations\ResponseStatus::PREAUTH === $oResponse->StatusOrIndex || Enumerations\ResponseStatus::BYE === $oResponse->StatusOrIndex)
+					) {
+						break;
+					}
+
 					// RFC 5530
 					if ($sEndTag === $oResponse->Tag && \is_array($oResponse->OptionalResponse) && 'CLIENTBUG' === $oResponse->OptionalResponse[0]) {
 						// The server has detected a client bug.
@@ -516,8 +516,7 @@ class ImapClient extends \MailSo\Net\NetClient
 
 					if ($sEndTag === $oResponse->Tag || Enumerations\ResponseType::CONTINUATION === $oResponse->ResponseType) {
 						if (isset($this->aTagTimeouts[$sEndTag])) {
-							$this->writeLog((\microtime(true) - $this->aTagTimeouts[$sEndTag]).' ('.$sEndTag.')',
-								\MailSo\Log\Enumerations\Type::TIME);
+							$this->writeLog((\microtime(true) - $this->aTagTimeouts[$sEndTag]).' ('.$sEndTag.')', \LOG_DEBUG);
 
 							unset($this->aTagTimeouts[$sEndTag]);
 						}
@@ -530,21 +529,20 @@ class ImapClient extends \MailSo\Net\NetClient
 			$oResult->validate();
 
 		} catch (\Throwable $e) {
-			$this->writeLogException($e, \MailSo\Log\Enumerations\Type::WARNING);
-			throw $e;
+			$this->writeLogException($e, \LOG_WARNING);
 		}
 
 		return $oResult;
 	}
 
-//	public function yieldUntaggedResponses(string $sEndTag = null) : \Generator
-	public function yieldUntaggedResponses(string $sEndTag = null) : iterable
+//	public function yieldUntaggedResponses(): \Generator
+	public function yieldUntaggedResponses(): iterable
 	{
 		try {
 			$oResult = new ResponseCollection;
 
 			if (\is_resource($this->ConnectionResource())) {
-				$sEndTag = $sEndTag ?: $this->getCurrentTag();
+				$sEndTag = $this->getCurrentTag();
 
 				while (true) {
 					$oResponse = $this->partialParseResponse();
@@ -562,8 +560,7 @@ class ImapClient extends \MailSo\Net\NetClient
 
 					if ($sEndTag === $oResponse->Tag || Enumerations\ResponseType::CONTINUATION === $oResponse->ResponseType) {
 						if (isset($this->aTagTimeouts[$sEndTag])) {
-							$this->writeLog((\microtime(true) - $this->aTagTimeouts[$sEndTag]).' ('.$sEndTag.')',
-								\MailSo\Log\Enumerations\Type::TIME);
+							$this->writeLog((\microtime(true) - $this->aTagTimeouts[$sEndTag]).' ('.$sEndTag.')', \LOG_DEBUG);
 
 							unset($this->aTagTimeouts[$sEndTag]);
 						}
@@ -576,46 +573,42 @@ class ImapClient extends \MailSo\Net\NetClient
 			$oResult->validate();
 
 		} catch (\Throwable $e) {
-			$this->writeLogException($e, \MailSo\Log\Enumerations\Type::WARNING);
-			throw $e;
+			$this->writeLogException($e, \LOG_WARNING);
 		}
 	}
 
-	protected function prepareParamLine(array $aParams = array()) : string
+	protected function prepareParamLine(array $aParams = array()): string
 	{
 		$sReturn = '';
-		foreach ($aParams as $mParamItem)
-		{
-			if (\is_array($mParamItem) && \count($mParamItem))
-			{
+		foreach ($aParams as $mParamItem) {
+			if (\is_array($mParamItem) && \count($mParamItem)) {
 				$sReturn .= ' ('.\trim($this->prepareParamLine($mParamItem)).')';
-			}
-			else if (\is_string($mParamItem))
-			{
+			} else if (\is_string($mParamItem)) {
 				$sReturn .= ' '.$mParamItem;
 			}
 		}
 		return $sReturn;
 	}
 
-	protected function getNewTag() : string
+	protected function getNewTag(): string
 	{
 		++$this->iTagCount;
 		return $this->getCurrentTag();
 	}
 
-	protected function getCurrentTag() : string
+	protected function getCurrentTag(): string
 	{
-		return self::TAG_PREFIX.$this->iTagCount;
+		return $this->TAG_PREFIX.$this->iTagCount;
 	}
 
-	public function EscapeString(?string $sStringForEscape) : string
+	public function EscapeString(?string $sStringForEscape): string
 	{
 		if (null === $sStringForEscape) {
 			return 'NIL';
 		}
 /*
 		// literal-string
+		$this->hasCapability('LITERAL+')
 		if (\preg_match('/[\r\n\x00\x80-\xFF]/', $sStringForEscape)) {
 			return \sprintf("{%d}\r\n%s", \strlen($sStringForEscape), $sStringForEscape);
 		}
@@ -624,7 +617,7 @@ class ImapClient extends \MailSo\Net\NetClient
 		return '"' . \addcslashes($sStringForEscape, '\\"') . '"';
 	}
 
-	public function getLogName() : string
+	public function getLogName(): string
 	{
 		return 'IMAP';
 	}
@@ -633,9 +626,9 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * RFC 2971
 	 * Don't have to be logged in to call this command
 	 */
-	public function ServerID() : string
+	public function ServerID(): string
 	{
-		if ($this->IsSupported('ID')) {
+		if ($this->hasCapability('ID')) {
 			foreach ($this->SendRequestGetResponse('ID', [null]) as $oResponse) {
 				if ('ID' === $oResponse->ResponseList[1] && \is_array($oResponse->ResponseList[2])) {
 					$c = \count($oResponse->ResponseList[2]);
@@ -654,10 +647,10 @@ class ImapClient extends \MailSo\Net\NetClient
 	 * RFC 4978
 	 * It is RECOMMENDED that the client uses TLS compression.
 	 *//*
-	public function Compress() : bool
+	public function Compress(): bool
 	{
 		try {
-			if ($this->IsSupported('COMPRESS=DEFLATE')) {
+			if ($this->hasCapability('COMPRESS=DEFLATE')) {
 				$this->SendRequestGetResponse('COMPRESS', ['DEFLATE']);
 				\stream_filter_append($this->ConnectionResource(), 'zlib.inflate');
 				\stream_filter_append($this->ConnectionResource(), 'zlib.deflate', STREAM_FILTER_WRITE, array(
@@ -670,14 +663,13 @@ class ImapClient extends \MailSo\Net\NetClient
 		return false;
 	}*/
 
-	public function EscapeFolderName(string $sFolderName) : string
+	public function EscapeFolderName(string $sFolderName): string
 	{
 		return $this->EscapeString($this->UTF8 ? $sFolderName : \MailSo\Base\Utils::Utf8ToUtf7Modified($sFolderName));
 	}
 
-	public function toUTF8(string $sText) : string
+	public function toUTF8(string $sText): string
 	{
 		return $this->UTF8 ? $sText : \MailSo\Base\Utils::Utf7ModifiedToUtf8($sText);
 	}
-
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
index e0e74a9ab..2d7a50b8a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/NamespaceResult.php
@@ -15,82 +15,71 @@ namespace MailSo\Imap;
  * @category MailSo
  * @package Imap
  */
-class NamespaceResult
+class NamespaceResult implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sPersonal = '';
+	public array
+		$aPersonal = [],
+		$aOtherUsers = [],
+		$aShared = [];
 
-	/**
-	 * @var string
-	 */
-	private $sPersonalDelimiter = '';
-
-	/**
-	 * @var string
-	 */
-	private $sOtherUser = '';
-
-	/**
-	 * @var string
-	 */
-	private $sOtherUserDelimiter = '';
-
-	/**
-	 * @var string
-	 */
-	private $sShared = '';
-
-	/**
-	 * @var string
-	 */
-	private $sSharedDelimiter = '';
-
-	public function InitByImapResponse(\MailSo\Imap\Response $oImapResponse) : self
+	function __construct(Response $oImapResponse)
 	{
-		if ($oImapResponse && $oImapResponse instanceof \MailSo\Imap\Response)
-		{
-			if (isset($oImapResponse->ResponseList[2][0]) &&
-				\is_array($oImapResponse->ResponseList[2][0]) &&
-				2 <= \count($oImapResponse->ResponseList[2][0]))
-			{
-				$this->sPersonal = $oImapResponse->ResponseList[2][0][0];
-				$this->sPersonalDelimiter = $oImapResponse->ResponseList[2][0][1];
-
-				$this->sPersonal = 'INBOX'.$this->sPersonalDelimiter === \substr(\strtoupper($this->sPersonal), 0, 6) ?
-					'INBOX'.$this->sPersonalDelimiter.\substr($this->sPersonal, 6) : $this->sPersonal;
-			}
-
-			if (isset($oImapResponse->ResponseList[3][0]) &&
-				\is_array($oImapResponse->ResponseList[3][0]) &&
-				2 <= \count($oImapResponse->ResponseList[3][0]))
-			{
-				$this->sOtherUser = $oImapResponse->ResponseList[3][0][0];
-				$this->sOtherUserDelimiter = $oImapResponse->ResponseList[3][0][1];
-
-				$this->sOtherUser = 'INBOX'.$this->sOtherUserDelimiter === \substr(\strtoupper($this->sOtherUser), 0, 6) ?
-					'INBOX'.$this->sOtherUserDelimiter.\substr($this->sOtherUser, 6) : $this->sOtherUser;
-			}
-
-			if (isset($oImapResponse->ResponseList[4][0]) &&
-				\is_array($oImapResponse->ResponseList[4][0]) &&
-				2 <= \count($oImapResponse->ResponseList[4][0]))
-			{
-				$this->sShared = $oImapResponse->ResponseList[4][0][0];
-				$this->sSharedDelimiter = $oImapResponse->ResponseList[4][0][1];
-
-				$this->sShared = 'INBOX'.$this->sSharedDelimiter === \substr(\strtoupper($this->sShared), 0, 6) ?
-					'INBOX'.$this->sSharedDelimiter.\substr($this->sShared, 6) : $this->sShared;
+		if (!empty($oImapResponse->ResponseList[2])) {
+			foreach ($oImapResponse->ResponseList[2] as $entry) {
+				if (\is_array($entry) && 2 <= \count($entry)) {
+					$this->aPersonal[] = [
+						'prefix' => \array_shift($entry),
+						'delimiter' => \array_shift($entry),
+						'extension' => $entry
+					];
+				}
+			}
+		}
+		if (!empty($oImapResponse->ResponseList[3])) {
+			foreach ($oImapResponse->ResponseList[3] as $entry) {
+				if (\is_array($entry) && 2 <= \count($entry)) {
+					$this->aOtherUsers[] = [
+						'prefix' => \array_shift($entry),
+						'delimiter' => \array_shift($entry),
+						'extension' => $entry
+					];
+				}
+			}
+		}
+		if (!empty($oImapResponse->ResponseList[4])) {
+			foreach ($oImapResponse->ResponseList[4] as $entry) {
+				if (\is_array($entry) && 2 <= \count($entry)) {
+					$this->aShared[] = [
+						'prefix' => \array_shift($entry),
+						'delimiter' => \array_shift($entry),
+						'extension' => $entry
+					];
+				}
 			}
 		}
-
-		return $this;
 	}
 
-	public function GetPersonalNamespace() : string
+	public function GetPersonalPrefix(): string
 	{
-		return $this->sPersonal;
+		$sPrefix = '';
+		if (isset($this->aPersonal[0])) {
+			$sPrefix = $this->aPersonal[0]['prefix'];
+			$sDelimiter = $this->aPersonal[0]['delimiter'];
+			if ('INBOX'.$sDelimiter === \substr(\strtoupper($sPrefix), 0, 6)) {
+				$sPrefix = 'INBOX'.$sDelimiter.\substr($sPrefix, 6);
+			};
+		}
+		return $sPrefix;
 	}
 
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return array(
+			'@Object' => 'Object/Namespaces',
+			'personal' => $this->aPersonal,
+			'users' => $this->aOtherUsers,
+			'shared' => $this->aShared,
+		);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/ESEARCH.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/ESEARCH.php
index a611aeba8..9a51f8bd5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/ESEARCH.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/ESEARCH.php
@@ -12,18 +12,15 @@
 
 namespace MailSo\Imap\Requests;
 
-use MailSo\Imap\Exceptions\RuntimeException;
-use MailSo\Log\Enumerations\Type;
-
 /**
  * @category MailSo
  * @package Imap
  */
 class ESEARCH extends Request
 {
-	public
-		$sCriterias = 'ALL',
-		$aReturn = [
+	public string $sCriterias = 'ALL';
+
+	public array $aReturn = [
 		/**
 		   ALL
 			  Return all message numbers/UIDs which match the search criteria,
@@ -44,21 +41,23 @@ class ESEARCH extends Request
 			  Return all message numbers/UIDs which match the search criteria,
 			  in the requested sort order, using a sequence-set.
 		 */
-		],
-		$bUid = true,
-		$sLimit = '',
-		$sCharset = '',
-		// https://datatracker.ietf.org/doc/html/rfc7377
-		$aMailboxes = [],
-		$aSubtrees = [],
-		$aSubtreesOne = [];
+		];
+
+	public bool $bUid = true;
+
+	public string $sLimit = '';
+
+	public string $sCharset = '';
+
+	// https://datatracker.ietf.org/doc/html/rfc7377
+	public array $aMailboxes = [];
+	public array $aSubtrees = [];
+	public array $aSubtreesOne = [];
 
 	function __construct(\MailSo\Imap\ImapClient $oImapClient)
 	{
-		if (!$oImapClient->IsSupported('ESEARCH')) {
-			$oImapClient->writeLogException(
-				new RuntimeException('ESEARCH is not supported'),
-				Type::ERROR, true);
+		if (!$oImapClient->hasCapability('ESEARCH')) {
+			$oImapClient->writeLogException(new \MailSo\RuntimeException('ESEARCH is not supported'), \LOG_ERR);
 		}
 		parent::__construct($oImapClient);
 	}
@@ -69,10 +68,8 @@ class ESEARCH extends Request
 		$aRequest = array();
 
 /*		// RFC 6203
-		if (false !== \stripos($this->sCriterias, 'FUZZY') && !$this->oImapClient->IsSupported('SEARCH=FUZZY')) {
-			$this->oImapClient->writeLogException(
-				new RuntimeException('SEARCH=FUZZY is not supported'),
-				Type::ERROR, true);
+		if (false !== \stripos($this->sCriterias, 'FUZZY') && !$this->oImapClient->hasCapability('SEARCH=FUZZY')) {
+			$this->oImapClient->writeLogException(new \MailSo\RuntimeException('SEARCH=FUZZY is not supported'), \LOG_ERR);
 		}
 */
 
@@ -90,10 +87,8 @@ class ESEARCH extends Request
 			$aFolders[] = $this->aSubtreesOne;
 		}
 		if ($aFolders) {
-			if (!$this->oImapClient->IsSupported('MULTISEARCH')) {
-				$this->oImapClient->writeLogException(
-					new RuntimeException('MULTISEARCH is not supported'),
-					Type::ERROR, true);
+			if (!$this->oImapClient->hasCapability('MULTISEARCH')) {
+				$this->oImapClient->writeLogException(new \MailSo\RuntimeException('MULTISEARCH is not supported'), \LOG_ERR);
 			}
 			$sCmd = 'ESEARCH';
 			$aReques[] = 'IN';
@@ -108,12 +103,10 @@ class ESEARCH extends Request
 		$aRequest[] = 'RETURN';
 		if ($this->aReturn) {
 			// RFC 5267 checks
-			if (!$this->oImapClient->IsSupported('CONTEXT=SEARCH')) {
+			if (!$this->oImapClient->hasCapability('CONTEXT=SEARCH')) {
 				foreach ($this->aReturn as $sReturn) {
 					if (\preg_match('/PARTIAL|UPDATE|CONTEXT/i', $sReturn)) {
-						$this->oImapClient->writeLogException(
-							new RuntimeException('CONTEXT=SEARCH is not supported'),
-							Type::ERROR, true);
+						$this->oImapClient->writeLogException(new \MailSo\RuntimeException('CONTEXT=SEARCH is not supported'), \LOG_ERR);
 					}
 				}
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/Request.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/Request.php
index ec5e11f1e..0f8ef9b7e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/Request.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/Request.php
@@ -13,8 +13,7 @@ namespace MailSo\Imap\Requests;
 
 abstract class Request
 {
-	protected
-		$oImapClient;
+	protected \MailSo\Imap\ImapClient $oImapClient;
 
 	function __construct(\MailSo\Imap\ImapClient $oImapClient)
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/SORT.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/SORT.php
index 51cb90d1c..3c34ed67f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/SORT.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/SORT.php
@@ -15,23 +15,25 @@
 
 namespace MailSo\Imap\Requests;
 
-use MailSo\Imap\Exceptions\RuntimeException;
-use MailSo\Log\Enumerations\Type;
-
 /**
  * @category MailSo
  * @package Imap
  */
 class SORT extends Request
 {
-	public
-		$sCriterias = 'ALL',
-		$sCharset = '',
-		$bUid = true,
-		$aSortTypes = [],
-		$sLimit = '',
-		// RFC 5267
-		$aReturn = [
+	// a parenthesized list of sort criteria
+	public string $sCriterias = 'ALL';
+
+	public string $sCharset = '';
+
+	public bool $bUid = true;
+
+	public array $aSortTypes = [];
+
+	public string $sLimit = '';
+
+	// RFC 5267
+	public array $aReturn = [
 		/**
 		   ALL
 			  Return all message numbers/UIDs which match the search criteria,
@@ -51,15 +53,16 @@ class SORT extends Request
 		   PARTIAL 1:500
 			  Return all message numbers/UIDs which match the search criteria,
 			  in the requested sort order, using a sequence-set.
+
+		   SAVE
+			  This option tells the server to remember the result.
 		 */
 		];
 
 	function __construct(\MailSo\Imap\ImapClient $oImapClient)
 	{
-		if (!$oImapClient->IsSupported('SORT')) {
-			$oImapClient->writeLogException(
-				new RuntimeException('SORT is not supported'),
-				Type::ERROR, true);
+		if (!$oImapClient->hasCapability('SORT')) {
+			$oImapClient->writeLogException(new \MailSo\RuntimeException('SORT is not supported'), \LOG_ERR);
 		}
 		parent::__construct($oImapClient);
 	}
@@ -67,26 +70,20 @@ class SORT extends Request
 	public function SendRequest() : string
 	{
 		if (!$this->aSortTypes) {
-			$this->oImapClient->writeLogException(
-				new RuntimeException('SortTypes are missing'),
-				Type::ERROR, true);
+			$this->oImapClient->writeLogException(new \MailSo\RuntimeException('SortTypes are missing'), \LOG_ERR);
 		}
 
 		$aRequest = array();
 
 		if ($this->aReturn) {
 			// RFC 5267 checks
-			if (!$this->oImapClient->IsSupported('ESORT')) {
-				$this->oImapClient->writeLogException(
-					new RuntimeException('ESORT is not supported'),
-					Type::ERROR, true);
+			if (!$this->oImapClient->hasCapability('ESORT')) {
+				$this->oImapClient->writeLogException(new \MailSo\RuntimeException('ESORT is not supported'), \LOG_ERR);
 			}
-			if (!$this->oImapClient->IsSupported('CONTEXT=SORT')) {
+			if (!$this->oImapClient->hasCapability('CONTEXT=SORT')) {
 				foreach ($this->aReturn as $sReturn) {
 					if (\preg_match('/PARTIAL|UPDATE|CONTEXT/i', $sReturn)) {
-						$this->oImapClient->writeLogException(
-							new RuntimeException('CONTEXT=SORT is not supported'),
-							Type::ERROR, true);
+						$this->oImapClient->writeLogException(new \MailSo\RuntimeException('CONTEXT=SORT is not supported'), \LOG_ERR);
 					}
 				}
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
index 017724e5e..511963a20 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Requests/THREAD.php
@@ -20,35 +20,39 @@ namespace MailSo\Imap\Requests;
  */
 class THREAD extends Request
 {
-	public
-		$sAlgorithm = '', // ORDEREDSUBJECT or REFERENCES or REFS
-		$sCriterias = 'ALL',
-		$bUid = true;
+	// ORDEREDSUBJECT or REFERENCES or REFS
+	private string $sAlgorithm = '';
+
+	// a parenthesized list of sort criteria
+	public string $sCriterias = 'ALL';
+
+	public bool $bUid = true;
 
 	function __construct(\MailSo\Imap\ImapClient $oImapClient)
 	{
-		if ($oImapClient->IsSupported('THREAD=REFS')) {
+		if ($oImapClient->hasCapability('THREAD=REFS')) {
 			$this->sAlgorithm = 'REFS';
-		} else if ($oImapClient->IsSupported('THREAD=REFERENCES')) {
+		} else if ($oImapClient->hasCapability('THREAD=REFERENCES')) {
 			$this->sAlgorithm = 'REFERENCES';
-		} else if ($oImapClient->IsSupported('THREAD=ORDEREDSUBJECT')) {
+		} else if ($oImapClient->hasCapability('THREAD=ORDEREDSUBJECT')) {
 			$this->sAlgorithm = 'ORDEREDSUBJECT';
 		} else {
-			$oImapClient->writeLogException(
-				new \MailSo\Imap\Exceptions\RuntimeException('THREAD is not supported'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+			$oImapClient->writeLogException(new \MailSo\RuntimeException('THREAD is not supported'), \LOG_ERR);
 		}
 		parent::__construct($oImapClient);
 	}
 
-	public function SendRequestGetResponse() : array
+	public function setAlgorithm(string $sAlgorithm): void
 	{
-		if (!$this->oImapClient->IsSupported(\strtoupper("THREAD={$this->sAlgorithm}"))) {
-			$this->oImapClient->writeLogException(
-				new \MailSo\Imap\Exceptions\RuntimeException("THREAD={$this->sAlgorithm} is not supported"),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		$sAlgorithm = \strtoupper($sAlgorithm);
+		if (!$this->oImapClient->hasCapability("THREAD={$sAlgorithm}")) {
+			$this->oImapClient->writeLogException(new \MailSo\RuntimeException("THREAD={$sAlgorithm} is not supported"), \LOG_ERR);
 		}
+		$this->sAlgorithm = $sAlgorithm;
+	}
 
+	public function SendRequestIterateResponse(): iterable
+	{
 		$this->oImapClient->SendRequest(
 			($this->bUid ? 'UID THREAD' : 'THREAD'),
 			array(
@@ -58,7 +62,6 @@ class THREAD extends Request
 			)
 		);
 
-		$aReturn = array();
 		foreach ($this->oImapClient->yieldUntaggedResponses() as $oResponse) {
 			$iOffset = ($this->bUid && 'UID' === $oResponse->StatusOrIndex && !empty($oResponse->ResponseList[2]) && 'THREAD' === $oResponse->ResponseList[2]) ? 1 : 0;
 			if (('THREAD' === $oResponse->StatusOrIndex || $iOffset)
@@ -69,44 +72,38 @@ class THREAD extends Request
 				for ($iIndex = 2 + $iOffset; $iIndex < $iLen; ++$iIndex) {
 					$aNewValue = $this->validateThreadItem($oResponse->ResponseList[$iIndex]);
 					if (\is_array($aNewValue)) {
-						$aReturn[] = $aNewValue;
+						yield $aNewValue;
 					}
 				}
 			}
 		}
-		return $aReturn;
 	}
 
-	/**
-	 * @param mixed $mValue
-	 *
-	 * @return mixed
-	 */
-	private function validateThreadItem($mValue)
+	private function validateThreadItem(mixed $mValue): int|array|false
 	{
-		$mResult = false;
 		if (\is_numeric($mValue)) {
-			$mResult = (int) $mValue;
-			if (0 >= $mResult) {
-				$mResult = false;
+			$mValue = (int) $mValue;
+			if (0 < $mValue) {
+				return $mValue;
 			}
 		} else if (\is_array($mValue)) {
 			if (1 === \count($mValue) && \is_numeric($mValue[0])) {
-				$mResult = (int) $mValue[0];
-				if (0 >= $mResult) {
-					$mResult = false;
+				$mValue = (int) $mValue[0];
+				if (0 < $mValue) {
+					return $mValue;
 				}
 			} else {
-				$mResult = array();
+				$aResult = array();
 				foreach ($mValue as $mValueItem) {
-					$mTemp = $this->validateThreadItem($mValueItem);
-					if (false !== $mTemp) {
-						$mResult[] = $mTemp;
+					$mValueItem = $this->validateThreadItem($mValueItem);
+					if ($mValueItem) {
+						$aResult[] = $mValueItem;
 					}
 				}
+				return $aResult;
 			}
 		}
 
-		return $mResult;
+		return false;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Response.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Response.php
index 1afc32c08..1c76dfb2e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Response.php
@@ -19,46 +19,24 @@ use MailSo\Imap\Enumerations\ResponseType;
  */
 class Response
 {
-	/**
-	 * @var array
-	 */
-	public $ResponseList = array();
+	public array $ResponseList = array();
 
-	/**
-	 * @var array | null
-	 */
-	public $OptionalResponse = null;
+	public ?array $OptionalResponse = null;
 
-	/**
-	 * @var string
-	 */
-	public $StatusOrIndex;
+	public ?string $StatusOrIndex = null;
 
-	/**
-	 * @var string
-	 */
-	public $HumanReadable = '';
+	public string $HumanReadable = '';
 
-	/**
-	 * @var bool
-	 */
-	public $IsStatusResponse = false;
+	public bool $IsStatusResponse = false;
 
-	/**
-	 * @var int
-	 */
-	public $ResponseType = 0;
+	public int $ResponseType = 0;
 
-	/**
-	 * @var string
-	 */
-	public $Tag;
+	public ?string $Tag = null;
 
 	private function recToLine(array $aList) : string
 	{
 		$aResult = array();
-		foreach ($aList as $mItem)
-		{
+		foreach ($aList as $mItem) {
 			$aResult[] = \is_array($mItem) ? '('.$this->recToLine($mItem).')' : (string) $mItem;
 		}
 		return \implode(' ', $aResult);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
index 9cd577f98..ba83a0247 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/ResponseCollection.php
@@ -67,9 +67,7 @@ class ResponseCollection extends \MailSo\Base\Collection
 			}
 
 			if (\is_array($aList) && \count($aList)) {
-				$aList = \array_map('strtoupper', $aList);
-				\sort($aList);
-				return $aList;
+				return \array_map('strtoupper', $aList);
 			}
 		}
 		return null;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
index 3604b9e3e..11ce68c0d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Responses/ACL.php
@@ -17,32 +17,58 @@ namespace MailSo\Imap\Responses;
  */
 class ACL implements \JsonSerializable
 {
-	private $rights;
+	public bool $mine = false;
+	private string
+		$identifier,
+		$rights;
 
-	function __construct(array $rights)
+	function __construct(string $identifier, string $rights)
 	{
+		$this->identifier = $identifier;
 		$this->rights = $rights;
 	}
 
+	public function identifier(): string
+	{
+		return $this->identifier;
+	}
+
 	/** PHP 8.1
-	public function hasRight(string|\MailSo\Imap\Enumerations\FolderACL $right)
+	public function hasRight(string|\MailSo\Imap\Enumerations\FolderACL $right): bool
 	{
 		if ($right instanceof \BackedEnum) {
-			return \in_array($right->value, $this->rights);
+			return \str_contains($this->rights, $right->value);
 		}
 	*/
-	public function hasRight(string $right) : bool
+	public function hasRight(string $right): bool
 	{
 		$const = '\\MailSo\\Imap\\Enumerations\\FolderACL::' . \strtoupper($right);
 		if (\defined($const)) {
 			$right = \constant($const);
 		}
-		return \in_array($right, $this->rights);
+		return \str_contains($this->rights, $right);
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		return $this->rights;
+		return [
+			'@Object' => 'Object/FolderACLRights',
+			'identifier' => $this->identifier,
+			'rights' => $this->rights,
+			'mine' => $this->mine,
+/*
+			'mayReadItems'   => ($this->hasRight('l') && $this->hasRight('r')),
+			'mayAddItems'    => $this->hasRight('i'),
+			'mayRemoveItems' => ($this->hasRight('t') && $this->hasRight('e')),
+			'maySetSeen'     => $this->hasRight('s'),
+			'maySetKeywords' => $this->hasRight('w'),
+			'mayCreateChild' => $this->hasRight('k'),
+			'mayRename'      => $this->hasRight('x'),
+			'mayDelete'      => $this->hasRight('x'),
+			'maySubmit'      => $this->hasRight('p')
+*/
+		];
 	}
 
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
index 91178e146..6f8e74db9 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SearchCriterias.php
@@ -16,11 +16,10 @@ namespace MailSo\Imap;
  * @category MailSo
  * @package Mail
  */
-abstract class SearchCriterias
+class SearchCriterias
 {
 	const
-		RegEx = 'in|e?mail|from|to|subject|has|is|date|since|before|text|body|size|larger|bigger|smaller|maxsize|minsize';
-
+		RegEx = 'in|e?mail|from|to|subject|has|is|date|since|before|text|body|size|larger|bigger|smaller|maxsize|minsize|keyword|older_than|newer_than|on|senton|sentsince|sentbefore|header';
 	/**
 		https://datatracker.ietf.org/doc/html/rfc3501#section-6.4.4
 
@@ -56,7 +55,7 @@ abstract class SearchCriterias
 			have a header line with the specified field-name regardless of
 			the contents.
 
-		☐ KEYWORD <flag>
+		✔ KEYWORD <flag>
 			Messages with the specified keyword flag set.
 
 		✔ LARGER <n>
@@ -66,22 +65,22 @@ abstract class SearchCriterias
 		☐ NOT <search-key>
 			Messages that do not match the specified search key.
 
-		☐ ON <date>
+		✔ ON <date>
 			Messages whose internal date (disregarding time and timezone)
 			is within the specified date.
 
 		✔ OR <search-key1> <search-key2>
 			Messages that match either search key.
 
-		☐ SENTBEFORE <date>
+		✔ SENTBEFORE <date>
 			Messages whose [RFC-2822] Date: header (disregarding time and
 			timezone) is earlier than the specified date.
 
-		☐ SENTON <date>
+		✔ SENTON <date>
 			Messages whose [RFC-2822] Date: header (disregarding time and
 			timezone) is within the specified date.
 
-		☐ SENTSINCE <date>
+		✔ SENTSINCE <date>
 			Messages whose [RFC-2822] Date: header (disregarding time and
 			timezone) is within or later than the specified date.
 
@@ -116,8 +115,8 @@ abstract class SearchCriterias
 		✔ UNFLAGGED
 		✔ SEEN
 		✔ UNSEEN
-		☐ ANSWERED
-		☐ UNANSWERED
+		✔ ANSWERED
+		✔ UNANSWERED
 		☐ DELETED
 		☐ UNDELETED
 		☐ DRAFT
@@ -127,17 +126,33 @@ abstract class SearchCriterias
 		X RECENT
 	*/
 
-	public static function fromString(\MailSo\Imap\ImapClient $oImapClient, string $sFolderName, string $sSearch, bool &$bUseCache = true) : string
+	private array $criterias = [];
+	public bool $fuzzy = false;
+
+	function prepend(string $rule)
+	{
+		\array_unshift($this->criterias, $rule);
+	}
+
+	function __toString() : string
+	{
+		if ($this->fuzzy) {
+			$keys = ['BCC','BODY','CC','FROM','SUBJECT','TEXT','TO'];
+			foreach ($this->criterias as $i => $key) {
+				if (\in_array($key, $keys)) {
+					$this->criterias[$i] = "FUZZY {$key}";
+				}
+			}
+		}
+		$sCriteriasResult = \trim(\implode(' ', $this->criterias));
+		return $sCriteriasResult ?: 'ALL';
+	}
+
+	public static function fromString(\MailSo\Imap\ImapClient $oImapClient, string $sFolderName, string $sSearch, bool $bHideDeleted, bool &$bUseCache = true) : self
 	{
-		$bUseCache = true;
 		$iTimeFilter = 0;
 		$aCriteriasResult = array();
 
-		if (0 < \MailSo\Config::$MessageListDateFilter) {
-			$iD = \time() - 3600 * 24 * 30 * \MailSo\Config::$MessageListDateFilter;
-			$iTimeFilter = \gmmktime(1, 1, 1, \gmdate('n', $iD), 1, \gmdate('Y', $iD));
-		}
-
 		$sSearch = \trim($sSearch);
 		if (\strlen($sSearch)) {
 			$aLines = \preg_match('/^('.static::RegEx.'):/i', $sSearch)
@@ -147,7 +162,7 @@ abstract class SearchCriterias
 			if (!$aLines) {
 				$sValue = static::escapeSearchString($oImapClient, $sSearch);
 
-				if (\MailSo\Config::$MessageListFastSimpleSearch) {
+				if ($oImapClient->Settings->fast_simple_search) {
 					$aCriteriasResult[] = 'OR OR OR';
 					$aCriteriasResult[] = 'FROM';
 					$aCriteriasResult[] = $sValue;
@@ -162,7 +177,7 @@ abstract class SearchCriterias
 					$aCriteriasResult[] = $sValue;
 				}
 			} else {
-				if (isset($aLines['IN']) && $oImapClient->IsSupported('MULTISEARCH') && \in_array($aLines['IN'], ['subtree','subtree-one','mailboxes'])) {
+				if (isset($aLines['IN']) && $oImapClient->hasCapability('MULTISEARCH') && \in_array($aLines['IN'], ['subtree','subtree-one','mailboxes'])) {
 					$aCriteriasResult[] = "IN ({$aLines['IN']} \"{$sFolderName}\")";
 				}
 
@@ -186,16 +201,23 @@ abstract class SearchCriterias
 					if (\is_string($sRawValue) && '' === \trim($sRawValue)) {
 						continue;
 					}
-					$sValue = static::escapeSearchString($oImapClient, $sRawValue);
 					switch ($sName) {
 						case 'FROM':
 						case 'SUBJECT':
 						case 'BODY': // $sValue = \trim(\MailSo\Base\Utils::StripSpaces($sValue), '"');
 							$aCriteriasResult[] = $sName;
-							$aCriteriasResult[] = $sValue;
+							$aCriteriasResult[] = static::escapeSearchString($oImapClient, $sRawValue);
+							break;
+						case 'KEYWORD':
+							$aCriteriasResult[] = $sName;
+							$aCriteriasResult[] = static::escapeSearchString(
+								$oImapClient,
+								\MailSo\Base\Utils::Utf8ToUtf7Modified($sRawValue)
+							);
 							break;
 
 						case 'TO':
+							$sValue = static::escapeSearchString($oImapClient, $sRawValue);
 							$aCriteriasResult[] = 'OR';
 							$aCriteriasResult[] = 'TO';
 							$aCriteriasResult[] = $sValue;
@@ -212,10 +234,22 @@ abstract class SearchCriterias
 							$aCriteriasResult[] = 'HEADER Content-Type multipart/report';
 							break;
 
+						case 'HEADER':
+							$aValue = \explode(' ', $sRawValue, 2);
+							$aCriteriasResult[] = 'HEADER '
+								. static::escapeSearchString($oImapClient, $aValue[0])
+								. ' '
+								. static::escapeSearchString($oImapClient, $aValue[1]);
+							break;
+
 						case 'FLAGGED':
 						case 'UNFLAGGED':
 						case 'SEEN':
 						case 'UNSEEN':
+						case 'ANSWERED':
+						case 'UNANSWERED':
+						case 'DELETED':
+						case 'UNDELETED':
 							$aCriteriasResult[] = $sName;
 							$bUseCache = false;
 							break;
@@ -232,10 +266,14 @@ abstract class SearchCriterias
 								$iTimeFilter = \max($iTimeFilter, $sValue);
 							}
 							break;
+						case 'ON':
+						case 'SENTON':
+						case 'SENTSINCE':
+						case 'SENTBEFORE':
 						case 'BEFORE':
 							$sValue = static::parseSearchDate($sRawValue);
 							if ($sValue) {
-								$aCriteriasResult[] = 'BEFORE';
+								$aCriteriasResult[] = $sName;
 								$aCriteriasResult[] = \gmdate('j-M-Y', $sValue);
 							}
 							break;
@@ -265,6 +303,46 @@ abstract class SearchCriterias
 								$aCriteriasResult[] = \gmdate('j-M-Y', $iDateStampTo);
 							}
 							break;
+
+						// https://www.rfc-editor.org/rfc/rfc5032.html
+						case 'OLDER':
+						case 'YOUNGER':
+							// time interval in seconds
+							$sValue = \intval($sRawValue);
+							if (0 < $sValue && $oImapClient->hasCapability('WITHIN')) {
+								$aCriteriasResult[] = $sName;
+								$aCriteriasResult[] = $sValue;
+							}
+							break;
+
+						// https://github.com/the-djmaze/snappymail/issues/625
+						case 'READ':
+						case 'UNREAD':
+							$aCriteriasResult[] = \str_replace('READ', 'SEEN', $sName);
+							$bUseCache = false;
+							break;
+						case 'OLDER_THAN':
+							$oDate = (new \DateTime())->sub(new \DateInterval("P{$sRawValue}"));
+							if ($oImapClient->hasCapability('WITHIN')) {
+								$aCriteriasResult[] = 'OLDER';
+								$aCriteriasResult[] = \time() - $oDate->getTimestamp();
+							} else {
+								$aCriteriasResult[] = 'BEFORE';
+								$aCriteriasResult[] = $oDate->format('j-M-Y');
+							}
+							break;
+						case 'NEWER_THAN':
+							$oDate = (new \DateTime())->sub(new \DateInterval("P{$sRawValue}"));
+							if ($oImapClient->hasCapability('WITHIN')) {
+								$aCriteriasResult[] = 'YOUNGER';
+								$aCriteriasResult[] = \time() - $oDate->getTimestamp();
+							} else {
+								$iTimeFilter = \max(
+									$iTimeFilter,
+									(new \DateTime())->sub(new \DateInterval("P{$sRawValue}"))->getTimestamp()
+								);
+							}
+							break;
 					}
 				}
 			}
@@ -276,27 +354,27 @@ abstract class SearchCriterias
 			$aCriteriasResult[] = \gmdate('j-M-Y', $iTimeFilter);
 		}
 
-		$sCriteriasResult = \trim(\implode(' ', $aCriteriasResult));
-
-		$sCriteriasResult = \trim($sCriteriasResult);
-		if (\MailSo\Config::$MessageListUndeletedOnly) {
-			$sCriteriasResult = \trim($sCriteriasResult.' UNDELETED');
+		if ($bHideDeleted && !\in_array('DELETED', $aCriteriasResult) && !\in_array('UNDELETED', $aCriteriasResult)) {
+			$aCriteriasResult[] = 'UNDELETED';
 		}
 
-		$sCriteriasResult = \trim($sCriteriasResult);
-		if (\MailSo\Config::$MessageListPermanentFilter) {
-			$sCriteriasResult = \trim($sCriteriasResult.' '.\MailSo\Config::$MessageListPermanentFilter);
+		if ($oImapClient->Settings->search_filter) {
+			$aCriteriasResult[] = $oImapClient->Settings->search_filter;
 		}
 
-		$sCriteriasResult = \trim($sCriteriasResult);
-
-		return $sCriteriasResult ?: 'ALL';
+		$search = new self;
+		$search->criterias = $aCriteriasResult;
+		return $search;
 	}
 
-	private static function escapeSearchString(\MailSo\Imap\ImapClient $oImapClient, string $sSearch) : string
+	public static function escapeSearchString(\MailSo\Imap\ImapClient $oImapClient, string $sSearch) : string
 	{
-		return !\MailSo\Base\Utils::IsAscii($sSearch)
-			? '{'.\strlen($sSearch).'}'."\r\n".$sSearch : $oImapClient->EscapeString($sSearch);
+		// https://github.com/the-djmaze/snappymail/issues/836
+//		return $oImapClient->EscapeString($sSearch);
+//		return \MailSo\Base\Utils::IsAscii($sSearch) || $oImapClient->hasCapability('QQMail'))
+		return (\MailSo\Base\Utils::IsAscii($sSearch) || !$oImapClient->hasCapability('LITERAL+'))
+			? $oImapClient->EscapeString($sSearch)
+			: '{'.\strlen($sSearch).'}'."\r\n{$sSearch}";
 	}
 
 	private static function parseSearchDate(string $sDate) : int
@@ -351,11 +429,19 @@ abstract class SearchCriterias
 				case 'FROM':
 				case 'TO':
 				case 'SUBJECT':
+				case 'KEYWORD':
 				case 'IN':
 				case 'SMALLER':
 				case 'LARGER':
 				case 'SINCE':
+				case 'ON':
+				case 'SENTON':
+				case 'SENTSINCE':
+				case 'SENTBEFORE':
 				case 'BEFORE':
+				case 'OLDER':
+				case 'YOUNGER':
+				case 'HEADER':
 					if (\strlen($mValue)) {
 						$aResult[$sName] = $mValue;
 					}
@@ -366,6 +452,10 @@ abstract class SearchCriterias
 				case 'UNFLAGGED':
 				case 'SEEN':
 				case 'UNSEEN':
+				case 'ANSWERED':
+				case 'UNANSWERED':
+				case 'DELETED':
+				case 'UNDELETED':
 					$aResult[$sName] = true;
 					break;
 			}
@@ -383,7 +473,7 @@ abstract class SearchCriterias
 		$aCache = array();
 
 		$sSearch = \MailSo\Base\Utils::StripSpaces($sSearch);
-		$sSearch = \trim(\preg_replace('/('.static::RegEx.'): /i', '\\1:', $sSearch));
+		$sSearch = \trim(\preg_replace('/('.static::RegEx.'):\\s+/i', '\\1:', $sSearch));
 
 		$mMatch = array();
 		if (\preg_match_all('/".*?(?<!\\\)"/', $sSearch, $mMatch)) {
@@ -410,7 +500,7 @@ abstract class SearchCriterias
 			}
 		}
 
-		if (\preg_match_all('/('.static::RegEx.'):([^\s]*)/i', $sSearch, $mMatch)) {
+		if (\preg_match_all('/('.static::RegEx.'):([^\\s]*)/i', $sSearch, $mMatch)) {
 			if (\is_array($mMatch[0])) {
 				foreach ($mMatch[0] as $sToken) {
 					$sSearch = \str_replace($sToken, '', $sSearch);
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
index 538cb6fc2..86f79f957 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/SequenceSet.php
@@ -24,10 +24,13 @@ class SequenceSet /*extends \SplFixedArray*/ implements \Countable
 	/**
 	 * By default the numbers are unique identifiers as this is more reliable.
 	 */
-	public $UID = true;
+	public bool $UID = true;
 
-	private $data = [];
+	private array $data = [];
 
+	/**
+	 * @param mixed $mItems Can be array, string or int
+	 */
 	public function __construct($mItems, bool $uid = true)
 	{
 		if (\is_array($mItems)) {
@@ -50,7 +53,7 @@ class SequenceSet /*extends \SplFixedArray*/ implements \Countable
 		return \in_array($value, $this->data);
 	}
 
-	public function indexOf($value)/*: int|false*/
+	public function indexOf($value): int|false
 	{
 		return \array_search($value, $this->data);
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
new file mode 100644
index 000000000..f8035c32c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Settings.php
@@ -0,0 +1,147 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Imap;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int
+		$port = 143,
+		$timeout = 300,
+		$body_text_limit = 0,
+//		$folder_list_limit = 200,
+		$message_list_limit = 10000,
+		$thread_limit = 50;
+
+	public bool
+		$expunge_all_on_delete = false,
+		$fast_simple_search = true,
+		$fetch_new_messages = true,
+		$force_select = false,
+		$message_all_headers = false;
+
+	public string
+		$search_filter = '',
+		$spam_headers = 'rspamd,spamassassin,bogofilter',
+		$virus_headers = 'rspamd,clamav';
+
+	public array
+		$disabled_capabilities = [];
+
+	public static function fromArray(array $aSettings): self
+	{
+		$object = parent::fromArray($aSettings);
+
+		// Boolean options
+		$options = [
+			'expunge_all_on_delete',
+			'fast_simple_search',
+			'fetch_new_messages',
+			'force_select',
+			'message_all_headers'
+		];
+		foreach ($options as $option) {
+			if (isset($aSettings[$option])) {
+				$object->$option = !empty($aSettings[$option]);
+			}
+		}
+
+		// Integer options
+		$options = [
+//			'body_text_limit',
+//			'folder_list_limit',
+			'message_list_limit',
+//			'thread_limit',
+		];
+		foreach ($options as $option) {
+			if (isset($aSettings[$option])) {
+				$object->$option = \intval($aSettings[$option]);
+			}
+		}
+
+		// String options
+		$options = [
+			'search_filter',
+			'spam_headers',
+			'virus_headers',
+		];
+		foreach ($options as $option) {
+			if (isset($aSettings[$option])) {
+				$object->$option = (string) $aSettings[$option];
+			}
+		}
+
+		if (!empty($aSettings['disabled_capabilities']) && \is_array($aSettings['disabled_capabilities'])) {
+			$object->disabled_capabilities = $aSettings['disabled_capabilities'];
+		}
+		// Convert old disable_* settings
+		if (!empty($aSettings['disable_list_status'])) {
+			$object->disabled_capabilities[] = 'list-status';
+		}
+		if (!empty($aSettings['disable_metadata'])) {
+			// Issue #365: Many folders on Cyrus IMAP breaks login
+			$object->disabled_capabilities[] = 'METADATA';
+		}
+		if (!empty($aSettings['disable_move'])) {
+			$object->disabled_capabilities[] = 'MOVE';
+		}
+		if (!empty($aSettings['disable_sort'])) {
+			$object->disabled_capabilities[] = 'SORT';
+		}
+		if (!empty($aSettings['disable_thread'])) {
+			$object->disabled_capabilities[] = 'THREAD';
+		}
+		if (!empty($aSettings['disable_binary'])) {
+			$object->disabled_capabilities[] = 'BINARY';
+		}
+		if (!empty($aSettings['disable_status_size'])) {
+			// STATUS SIZE can take a significant amount of time, therefore not active by default
+			$object->disabled_capabilities[] = 'STATUS=SIZE';
+		}
+		if (!empty($aSettings['disable_preview'])) {
+			// RFC 8970
+			$object->disabled_capabilities[] = 'PREVIEW';
+		}
+		$object->disabled_capabilities = \array_values(\array_unique($object->disabled_capabilities));
+
+		return $object;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		if (\in_array('SORT', $this->disabled_capabilities)) {
+			$this->disabled_capabilities[] = 'ESORT';
+		}
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/ImapSettings',
+				'use_expunge_all_on_delete' => $this->expunge_all_on_delete,
+//				'body_text_limit' => $this->body_text_limit,
+				'fast_simple_search' => $this->fast_simple_search,
+//				'folder_list_limit' => $this->folder_list_limit,
+				'force_select' => $this->force_select,
+				'message_all_headers' => $this->message_all_headers,
+				'message_list_limit' => $this->message_list_limit,
+				'search_filter' => $this->search_filter,
+				'spam_headers' => $this->spam_headers,
+				'virus_headers' => $this->virus_headers,
+//				'thread_limit' => $this->thread_limit
+				'disabled_capabilities' => \array_values(\array_unique($this->disabled_capabilities))
+			]
+		);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
index 12e1adeb9..34a257717 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/ResponseParser.php
@@ -21,15 +21,9 @@ use MailSo\Imap\Exceptions\ResponseNotFoundException;
  */
 trait ResponseParser
 {
-	/**
-	 * @var int
-	 */
-	private $iResponseBufParsedPos;
+	private int $iResponseBufParsedPos;
 
-	/**
-	 * @var bool
-	 */
-	private $bNeedNext = true;
+	private bool $bNeedNext = true;
 
 	protected function partialParseResponse() : Response
 	{
@@ -66,9 +60,13 @@ trait ResponseParser
 		return !$oImapResponse->IsStatusResponse || 2 < \count($oImapResponse->ResponseList);
 	}
 
+	private $sResponseBuffer = '';
+
 	/**
 	 * @return array|string
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
 	private function partialParseResponseBranch(Response $oImapResponse,
 		bool $bTreatAsAtom,
@@ -84,36 +82,26 @@ trait ResponseParser
 		$bIsGotoDefault = false;
 
 		$sAtomBuilder = $bTreatAsAtom ? '' : null;
-		$aList = array();
-		if ($bRoot)
-		{
-			$aList =& $oImapResponse->ResponseList;
+		$aResponseList = array();
+		if ($bRoot) {
+			$aResponseList =& $oImapResponse->ResponseList;
 		}
 
-		while (true)
-		{
-			if ($this->bNeedNext)
-			{
-				/**
-				 * $this->sResponseBuffer is a single fgets() that ends with \r\n
-				 */
+		while (true) {
+			if ($this->bNeedNext) {
 				$iPos = 0;
-				$this->getNextBuffer();
+				$this->sResponseBuffer = $this->getNextBuffer();
 				$this->iResponseBufParsedPos = $iPos;
 				$this->bNeedNext = false;
 			}
 
 			$sChar = null;
-			if ($bIsGotoDefault)
-			{
+			if ($bIsGotoDefault) {
 				$bIsGotoDefault = false;
-			}
-			else
-			{
+			} else {
 				$iBufferEndIndex = \strlen($this->sResponseBuffer) - 3;
 
-				if ($iPos > $iBufferEndIndex)
-				{
+				if ($iPos > $iBufferEndIndex) {
 					break;
 				}
 
@@ -155,7 +143,7 @@ trait ResponseParser
 					if ($bTreatAsAtom) {
 						$sAtomBuilder .= $sChar . $mResult . ('[' === $sChar ? ']' : ')');
 					} else {
-						$aList[] = $mResult;
+						$aResponseList[] = $mResult;
 						if ($bRoot && $oImapResponse->IsStatusResponse) {
 							$oImapResponse->OptionalResponse = $mResult;
 							$bIsGotoDefault = true;
@@ -176,22 +164,20 @@ trait ResponseParser
 
 						if ($this->partialResponseLiteralCallbacks($sParentToken, $sPreviousAtomUpperCase, $iLiteralLen)) {
 							if (!$bTreatAsAtom) {
-								$aList[] = '';
+								$aResponseList[] = '';
 							}
 						} else {
 							$sLiteral = $this->partialResponseLiteral($iLiteralLen);
 							if (null !== $sLiteral) {
 								if (!$bTreatAsAtom) {
-									$aList[] = $sLiteral;
-									if (\MailSo\Config::$LogSimpleLiterals) {
-										$this->writeLog('{'.$iLiteralLen.'} '.$sLiteral, \MailSo\Log\Enumerations\Type::INFO);
-									}
+									$aResponseList[] = $sLiteral;
+//									$this->writeLog('{'.$iLiteralLen.'} '.$sLiteral, \LOG_INFO);
 								} else {
 									\SnappyMail\Log::notice('IMAP', 'Literal treated as atom and skipped');
 								}
 								unset($sLiteral);
 							} else {
-								$this->writeLog('Can\'t read imap stream', \MailSo\Log\Enumerations\Type::NOTE);
+								$this->writeLog('Can\'t read imap stream', \LOG_WARNING);
 							}
 						}
 
@@ -234,7 +220,7 @@ trait ResponseParser
 							if ($bTreatAsAtom) {
 								$sAtomBuilder .= \stripslashes(\substr($this->sResponseBuffer, $iPos, $iOffset + $iLength - $iPos + 1));
 							} else {
-								$aList[] = \stripslashes(\substr($this->sResponseBuffer, $iPos + 1, $iOffset + $iLength - $iPos - 1));
+								$aResponseList[] = \stripslashes(\substr($this->sResponseBuffer, $iPos + 1, $iOffset + $iLength - $iPos - 1));
 							}
 							$iPos = $iOffset + $iLength + 1;
 							break 2;
@@ -253,16 +239,14 @@ trait ResponseParser
 				default:
 					$iCharBlockStartPos = $iPos;
 
-					if ($bRoot && $oImapResponse->IsStatusResponse)
-					{
+					if ($bRoot && $oImapResponse->IsStatusResponse) {
 						$iPos = $iBufferEndIndex;
 						if ($iPos > $iCharBlockStartPos) {
 							$iCharBlockStartPos += \strspn($this->sResponseBuffer, ' ', $iCharBlockStartPos, $iPos - $iCharBlockStartPos);
 						}
 					}
 
-					while ($iPos <= $iBufferEndIndex)
-					{
+					while ($iPos <= $iBufferEndIndex) {
 						$sCharDef = $this->sResponseBuffer[$iPos];
 						switch (true)
 						{
@@ -270,8 +254,7 @@ trait ResponseParser
 								++$iPos;
 								break;
 							case '[' === $sCharDef:
-								if (null === $sAtomBuilder)
-								{
+								if (null === $sAtomBuilder) {
 									$sAtomBuilder = '';
 								}
 
@@ -283,8 +266,7 @@ trait ResponseParser
 									$oImapResponse, true, $sPreviousAtomUpperCase, '['
 								);
 
-								if (null !== $sListBlock)
-								{
+								if (null !== $sListBlock) {
 									$sAtomBuilder .= $sListBlock.']';
 								}
 
@@ -301,39 +283,31 @@ trait ResponseParser
 						}
 					}
 
-					if ($iPos > $iCharBlockStartPos || null !== $sAtomBuilder)
-					{
+					if ($iPos > $iCharBlockStartPos || null !== $sAtomBuilder) {
 						$sLastCharBlock = \substr($this->sResponseBuffer, $iCharBlockStartPos, $iPos - $iCharBlockStartPos);
-						if (null === $sAtomBuilder)
-						{
-							$aList[] = 'NIL' === $sLastCharBlock ? null : $sLastCharBlock;
+						if (null === $sAtomBuilder) {
+							$aResponseList[] = 'NIL' === $sLastCharBlock ? null : $sLastCharBlock;
 							$sPreviousAtomUpperCase = \strtoupper($sLastCharBlock);
-						}
-						else
-						{
+						} else {
 							$sAtomBuilder .= $sLastCharBlock;
 
-							if (!$bTreatAsAtom)
-							{
-								$aList[] = $sAtomBuilder;
+							if (!$bTreatAsAtom) {
+								$aResponseList[] = $sAtomBuilder;
 								$sPreviousAtomUpperCase = \strtoupper($sAtomBuilder);
 								$sAtomBuilder = null;
 							}
 						}
 
-						if ($bRoot)
-						{
-							if (!isset($oImapResponse->Tag) && 1 === \count($aList))
-							{
-								$oImapResponse->setTag($aList[0]);
-								if ($this->getCurrentTag() === $oImapResponse->Tag)
-								{
+						if ($bRoot) {
+							if (!isset($oImapResponse->Tag) && 1 === \count($aResponseList)) {
+								$oImapResponse->setTag($aResponseList[0]);
+								if ($this->getCurrentTag() === $oImapResponse->Tag) {
 									$oImapResponse->ResponseType = ResponseType::TAGGED;
 								}
 							}
-							else if (!isset($oImapResponse->StatusOrIndex) && 2 === \count($aList))
+							else if (!isset($oImapResponse->StatusOrIndex) && 2 === \count($aResponseList))
 							{
-								$oImapResponse->setStatus($aList[1]);
+								$oImapResponse->setStatus($aResponseList[1]);
 							}
 							else if (ResponseType::CONTINUATION === $oImapResponse->ResponseType
 								|| $oImapResponse->IsStatusResponse)
@@ -347,7 +321,7 @@ trait ResponseParser
 
 		$this->iResponseBufParsedPos = $iPos;
 
-		return $bTreatAsAtom ? $sAtomBuilder : $aList;
+		return $bTreatAsAtom ? $sAtomBuilder : $aResponseList;
 	}
 
 	private function partialResponseLiteral($iLiteralLen) : ?string
@@ -359,7 +333,7 @@ trait ResponseParser
 			$iBLen = \strlen($sAddRead);
 			if (!$iBLen) {
 				$this->writeLog('Literal stream read warning "read '.\strlen($sLiteral).' of '.
-					$iLiteralLen.'" bytes', \MailSo\Log\Enumerations\Type::WARNING);
+					$iLiteralLen.'" bytes', \LOG_WARNING);
 				return null;
 			}
 			$sLiteral .= $sAddRead;
@@ -372,8 +346,7 @@ trait ResponseParser
 
 		$iLiteralSize = \strlen($sLiteral);
 		if ($iLiteralLen !== $iLiteralSize) {
-			$this->writeLog('Literal stream read warning "read '.$iLiteralSize.' of '.
-				$iLiteralLen.'" bytes', \MailSo\Log\Enumerations\Type::WARNING);
+			$this->writeLog('Literal stream read warning "read '.$iLiteralSize.' of '.$iLiteralLen.'" bytes', \LOG_WARNING);
 		}
 		return $sLiteral;
 	}
@@ -385,9 +358,9 @@ trait ResponseParser
 		}
 
 		$sLiteralAtomUpperCasePeek = '';
-		if (0 === \strpos($sLiteralAtomUpperCase, 'BODY')) {
+		if (\str_starts_with($sLiteralAtomUpperCase, 'BODY')) {
 			$sLiteralAtomUpperCasePeek = \str_replace('BODY', 'BODY.PEEK', $sLiteralAtomUpperCase);
-		} else if (0 === \strpos($sLiteralAtomUpperCase, 'BINARY')) {
+		} else if (\str_starts_with($sLiteralAtomUpperCase, 'BINARY')) {
 			$sLiteralAtomUpperCasePeek = \str_replace('BINARY', 'BINARY.PEEK', $sLiteralAtomUpperCase);
 		}
 
@@ -399,31 +372,29 @@ trait ResponseParser
 			return false;
 		}
 
-		$rImapLiteralStream =
-			\MailSo\Base\StreamWrappers\Literal::CreateStream($this->ConnectionResource(), $iLiteralLen);
+		$rImapLiteralStream = \MailSo\Base\StreamWrappers\Literal::CreateStream($this->ConnectionResource(), $iLiteralLen);
 
 		$this->writeLog('Start Callback for '.$sParent.' / '.$sLiteralAtomUpperCase.
-			' - try to read '.$iLiteralLen.' bytes.', \MailSo\Log\Enumerations\Type::NOTE);
+			' - try to read '.$iLiteralLen.' bytes.', \LOG_INFO);
 
 		$this->bRunningCallback = true;
 
 		try
 		{
-			$this->aFetchCallbacks[$sFetchKey]($sParent, $sLiteralAtomUpperCase, $rImapLiteralStream);
+			$this->aFetchCallbacks[$sFetchKey]($sParent, $sLiteralAtomUpperCase, $rImapLiteralStream, $iLiteralLen);
 		}
 		catch (\Throwable $oException)
 		{
-			$this->writeLog('Callback Exception', \MailSo\Log\Enumerations\Type::NOTICE);
-			$this->writeLogException($oException);
+			$this->writeLogException($oException, \LOG_NOTICE, false);
 		}
 
-		if ($rImapLiteralStream) {
+		if (\is_resource($rImapLiteralStream)) {
 			$iNotReadLiteralLen = 0;
 
 			$bFeof = \feof($rImapLiteralStream);
 			$this->writeLog('End Callback for '.$sParent.' / '.$sLiteralAtomUpperCase.
 				' - feof = '.($bFeof ? 'good' : 'BAD'), $bFeof ?
-					\MailSo\Log\Enumerations\Type::NOTE : \MailSo\Log\Enumerations\Type::WARNING);
+					\LOG_INFO : \LOG_WARNING);
 
 			if (!$bFeof) {
 				while (!\feof($rImapLiteralStream)) {
@@ -444,12 +415,10 @@ trait ResponseParser
 			\fclose($rImapLiteralStream);
 
 			if (0 < $iNotReadLiteralLen) {
-				$this->writeLog('Not read literal size is '.$iNotReadLiteralLen.' bytes.',
-					\MailSo\Log\Enumerations\Type::WARNING);
+				$this->writeLog('Not read literal size is '.$iNotReadLiteralLen.' bytes.', \LOG_WARNING);
 			}
 		} else {
-			$this->writeLog('Literal stream is not resource after callback.',
-				\MailSo\Log\Enumerations\Type::WARNING);
+			$this->writeLog('Literal stream is not resource after callback.', \LOG_WARNING);
 		}
 
 		$this->bRunningCallback = false;
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
index 425f5e84f..1fcba3997 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Imap/Traits/Status.php
@@ -22,86 +22,113 @@ namespace MailSo\Imap\Traits;
  */
 trait Status
 {
-	public
-		/**
-		 * The number of messages in the mailbox.
-		 * This response is named EXISTS as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$MESSAGES,
+	public string $FullName;
 
-		/**
-		 * The number of messages with the \Recent flag set.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * IMAP4rev2 deprecated.
-		 * @var int
-		 */
-		$RECENT,
+	public bool $hasStatus = false;
 
-		/**
-		 * The next unique identifier value of the mailbox.
-		 * A 32-bit value
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$UIDNEXT,
+	/**
+	 * The number of messages in the mailbox.
+	 * This response is named EXISTS as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $MESSAGES = null;
 
-		/**
-		 * The unique identifier validity value of the mailbox.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int
-		 */
-		$UIDVALIDITY,
+	/**
+	 * The number of messages with the \Recent flag set.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 * IMAP4rev2 deprecated.
+	 */
+	public ?int $RECENT = null;
 
-		/**
-		 * The number of messages which do not have the \Seen flag set.
-		 * This response also occurs as a result of a IMAP4rev1 SELECT or EXAMINE command,
-		 * but then it is the message sequence number of the first unseen message.
-		 * IMAP4rev2 deprecated on SELECT/EXAMINE.
-		 * @var int
-		 */
-		$UNSEEN,
+	/**
+	 * The next unique identifier value of the mailbox.
+	 * A 32-bit value
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $UIDNEXT = null;
 
-		/**
-		 * RFC 4551
-		 * The highest mod-sequence value of all messages in the mailbox.
-		 * This response also occurs as a result of a SELECT or EXAMINE command.
-		 * @var int 1*DIGIT Positive unsigned 64-bit integer
-		 */
-		$HIGHESTMODSEQ,
+	/**
+	 * The unique identifier validity value of the mailbox.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 */
+	public ?int $UIDVALIDITY = null;
 
-		/**
-		 * RFC 7889
-		 * Message upload size limit.
-		 * @var int
-		 */
-		$APPENDLIMIT,
+	/**
+	 * The number of messages which do not have the \Seen flag set.
+	 * This response also occurs as a result of a IMAP4rev1 SELECT or EXAMINE command,
+	 * but then it is the message sequence number of the first unseen message.
+	 * IMAP4rev2 deprecated on SELECT/EXAMINE.
+	 */
+	public ?int $UNSEEN = null;
 
-		/**
-		 * RFC 8474
-		 * A server-allocated unique identifier for the mailbox.
-		 * This response also occurs as a result of a CREATE, SELECT or EXAMINE command.
-		 * @var string
-		 */
-		$MAILBOXID;
+	/**
+	 * RFC 4551
+	 * The highest mod-sequence value of all messages in the mailbox.
+	 * This response also occurs as a result of a SELECT or EXAMINE command.
+	 * 1*DIGIT Positive unsigned 64-bit integer
+	 */
+	public ?int $HIGHESTMODSEQ = null;
 
-	public function getStatusItems() : array
+	/**
+	 * RFC 7889
+	 * Message upload size limit.
+	 */
+	public ?int $APPENDLIMIT = null;
+
+	/**
+	 * RFC 8474
+	 * A server-allocated unique identifier for the mailbox.
+	 * This response also occurs as a result of a CREATE, SELECT or EXAMINE command.
+	 */
+	public ?string $MAILBOXID = null;
+
+	/**
+	 * RFC 8438
+	 * The total size of the mailbox in octets.
+	 */
+	public ?int $SIZE = null;
+
+	public ?string $etag = null;
+	public function generateETag(\MailSo\Imap\ImapClient $oImapClient) : void
 	{
-		return \array_filter(\get_object_vars($this), function($v, $k){
-			return \property_exists(__TRAIT__, $k);
-		}, ARRAY_FILTER_USE_BOTH);
+		if (!$this->hasStatus) {
+			// UNSEEN undefined when only SELECT/EXAMINE is used
+			\error_log("{$this->FullName} STATUS missing " . \print_r(\debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true));
+			return;
+		}
+		if (!isset($this->MESSAGES, $this->UIDNEXT)) {
+			\error_log("{$this->FullName} MESSAGES or UIDNEXT missing " . \print_r(\debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS),true));
+			return;
+		}
+		$this->etag = \md5('FolderHash/'. \implode('-', [
+			$this->FullName,
+			$this->MESSAGES,
+			$this->UIDNEXT,
+			$this->UIDVALIDITY,
+			$this->UNSEEN,
+			$this->HIGHESTMODSEQ,
+			$oImapClient->Hash()
+		]));
 	}
 
-	public function setStatus(string $name, $value) : bool
+	private function setStatusItem(string $name, $value) : bool
 	{
 		if ('EXISTS' === $name) {
 			$name = 'MESSAGES';
+		} else if ('X-GUID' === $name) {
+			$name = 'MAILBOXID';
 		}
 		if (\property_exists(__TRAIT__, $name)) {
-			if ('MAILBOXID' !== $name) {
-				$value = (int) $value;
+			if ('MAILBOXID' === $name) {
+				$value = \is_array($value) ? \reset($value) : $value;
+				if (\is_string($value)) {
+					$this->MAILBOXID = \base64_encode($value);
+				} else {
+					// Cyrus bug https://github.com/the-djmaze/snappymail/issues/1640
+					\error_log("{$this->FullName} invalid MAILBOXID value. Disable the OBJECTID capability.");
+				}
+			} else {
+				$this->$name = (int) $value;
 			}
-			$this->$name = $value;
 			return true;
 		}
 		return false;
@@ -126,10 +153,8 @@ trait Status
 		$bResult = false;
 
 		// OK untagged responses
-		if (\is_array($oResponse->OptionalResponse)) {
-			if (\count($oResponse->OptionalResponse) > 1) {
-				$bResult = $this->setStatus($oResponse->OptionalResponse[0], $oResponse->OptionalResponse[1]);
-			}
+		if (\is_array($oResponse->OptionalResponse) && \count($oResponse->OptionalResponse) > 1) {
+			$bResult = $this->setStatusItem($oResponse->OptionalResponse[0], $oResponse->OptionalResponse[1]);
 		}
 
 		// untagged responses
@@ -137,18 +162,28 @@ trait Status
 			// LIST or STATUS command
 			if ('STATUS' === $oResponse->ResponseList[1]
 			 && isset($oResponse->ResponseList[3])
-			 && \is_array($oResponse->ResponseList[3])) {
-				$c = \count($oResponse->ResponseList[3]);
+			 && \is_array($oResponse->ResponseList[3])
+			) {
+				$c = \count($oResponse->ResponseList[3]) - 1;
 				for ($i = 0; $i < $c; $i += 2) {
-					$bResult |= $this->setStatus(
-						$oResponse->ResponseList[3][$i],
-						$oResponse->ResponseList[3][$i+1]
-					);
+					if ($c > $i) {
+						$bResult |= $this->setStatusItem(
+							$oResponse->ResponseList[3][$i],
+							$oResponse->ResponseList[3][$i+1]
+						);
+					} else {
+						// https://github.com/the-djmaze/snappymail/issues/1640
+						\error_log("{$this->FullName} STATUS missing value for {$oResponse->ResponseList[3][$i]}");
+					}
 				}
+				$this->hasStatus = $bResult;
 			}
 			// SELECT or EXAMINE command
 			else if (\is_numeric($oResponse->ResponseList[1]) && \is_string($oResponse->ResponseList[2])) {
-				$bResult = $this->setStatus($oResponse->ResponseList[2], $oResponse->ResponseList[1]);
+				// UNSEEN deprecated in IMAP4rev2
+				if ('UNSEEN' !== $oResponse->ResponseList[2]) {
+					$bResult |= $this->setStatusItem($oResponse->ResponseList[2], $oResponse->ResponseList[1]);
+				}
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
index 04da9da03..f7e2cf4dc 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Driver.php
@@ -17,305 +17,96 @@ namespace MailSo\Log;
  */
 abstract class Driver
 {
-	/**
-	 * @var string
-	 */
-	protected $sDatePattern;
-
-	/**
-	 * @var string
-	 */
-	protected $sName;
+	protected string
+		$sDatePattern = 'H:i:s',
+		$sName = '';
 
 	/**
 	 * @var array
 	 */
-	protected $aPrefixes;
+	const PREFIXES = [
+		\LOG_EMERG => '[EMERGENCY]',
+		\LOG_ALERT => '[ALERT]',
+		\LOG_CRIT => '[CRITICAL]',
+		\LOG_ERR => '[ERROR]',
+		\LOG_WARNING => '[WARNING]',
+		\LOG_NOTICE => '[NOTICE]',
+		\LOG_INFO => '[INFO]',
+		\LOG_DEBUG => '[DEBUG]'
+	];
 
-	/**
-	 * @var bool
-	 */
-	protected $bGuidPrefix;
+	protected bool $bGuidPrefix = true;
 
-	/**
-	 * @var DateTimeZone
-	 */
-	protected $oTimeZone;
+	protected \DateTimeZone $oTimeZone;
 
-	/**
-	 * @var bool
-	 */
-	protected $bTimePrefix;
+	protected bool $bTimePrefix = true;
 
-	/**
-	 * @var bool
-	 */
-	protected $bTypedPrefix;
-
-	/**
-	 * @var string
-	 */
-	protected $sNewLine;
-
-	/**
-	 * @var int
-	 */
-	private $iWriteOnTimeoutOnly;
-
-	/**
-	 * @var bool
-	 */
-	private $bWriteOnErrorOnly;
-
-	/**
-	 * @var bool
-	 */
-	private $bWriteOnPhpErrorOnly;
-
-	/**
-	 * @var bool
-	 */
-	private $bFlushCache;
-
-	/**
-	 * @var array
-	 */
-	private $aCache;
+	protected bool $bTypedPrefix = true;
 
 	function __construct()
 	{
-		$this->sDatePattern = 'H:i:s';
-		$this->sName = 'INFO';
-		$this->sNewLine = "\r\n";
-		$this->bTimePrefix = true;
-		$this->bTypedPrefix = true;
-		$this->bGuidPrefix = true;
-
 		$this->oTimeZone = new \DateTimeZone('UTC');
-
-		$this->iWriteOnTimeoutOnly = 0;
-		$this->bWriteOnErrorOnly = false;
-		$this->bWriteOnPhpErrorOnly = false;
-		$this->bFlushCache = false;
-		$this->aCache = array();
-
-		$this->aPrefixes = array(
-			\MailSo\Log\Enumerations\Type::DEBUG => '[DEBUG]',
-			\MailSo\Log\Enumerations\Type::INFO => '[DATA]',
-			\MailSo\Log\Enumerations\Type::SECURE => '[SECURE]',
-			\MailSo\Log\Enumerations\Type::NOTE => '[NOTE]',
-			\MailSo\Log\Enumerations\Type::TIME => '[TIME]',
-			\MailSo\Log\Enumerations\Type::TIME_DELTA => '[TIME]',
-			\MailSo\Log\Enumerations\Type::MEMORY => '[MEMORY]',
-			\MailSo\Log\Enumerations\Type::NOTICE => '[NOTICE]',
-			\MailSo\Log\Enumerations\Type::WARNING => '[WARNING]',
-			\MailSo\Log\Enumerations\Type::ERROR => '[ERROR]',
-
-			\MailSo\Log\Enumerations\Type::NOTICE_PHP => '[NOTICE]',
-			\MailSo\Log\Enumerations\Type::WARNING_PHP => '[WARNING]',
-			\MailSo\Log\Enumerations\Type::ERROR_PHP => '[ERROR]',
-		);
 	}
 
-	public function SetTimeZone(/*\DateTimeZone | string*/ $oTimeZone) : self
+	public function SetTimeZone(\DateTimeZone|string $mTimeZone): self
 	{
-		if ($oTimeZone instanceof \DateTimeZone) {
-			$this->oTimeZone = $oTimeZone;
-		} else {
-			$this->oTimeZone = new \DateTimeZone($oTimeZone);
-		}
+		$this->oTimeZone = $mTimeZone instanceof \DateTimeZone
+			? $mTimeZone
+			: new \DateTimeZone($mTimeZone);
 		return $this;
 	}
 
-	public function DisableGuidPrefix() : self
+	public function DisableGuidPrefix(): self
 	{
 		$this->bGuidPrefix = false;
 		return $this;
 	}
 
-	public function DisableTimePrefix() : self
+	public function DisableTimePrefix(): self
 	{
 		$this->bTimePrefix = false;
 		return $this;
 	}
 
-	public function WriteOnErrorOnly(bool $bValue) : self
-	{
-		$this->bWriteOnErrorOnly = $bValue;
-		return $this;
-	}
-
-	public function WriteOnPhpErrorOnly(bool $bValue) : self
-	{
-		$this->bWriteOnPhpErrorOnly = $bValue;
-		return $this;
-	}
-
-	public function WriteOnTimeoutOnly(int $iTimeout) : self
-	{
-		$this->iWriteOnTimeoutOnly = \max(0, (int) $iTimeout);
-		return $this;
-	}
-
-	public function DisableTypedPrefix() : self
+	public function DisableTypedPrefix(): self
 	{
 		$this->bTypedPrefix = false;
 		return $this;
 	}
 
-	abstract protected function writeImplementation($mDesc) : bool;
+	abstract protected function writeImplementation($mDesc): bool;
 
-	protected function writeEmptyLineImplementation() : bool
-	{
-		return $this->writeImplementation('');
-	}
-
-	protected function loggerLineImplementation(string $sTimePrefix, string $sDesc,
-		int $iType = \MailSo\Log\Enumerations\Type::INFO, string $sName = '') : string
-	{
-		return \ltrim(
-			($this->bTimePrefix ? '['.$sTimePrefix.']' : '').
-			($this->bGuidPrefix ? '['.Logger::Guid().']' : '').
-			($this->bTypedPrefix ? ' '.$this->getTypedPrefix($iType, $sName) : '')
-		).$sDesc;
-	}
-
-	protected function clearImplementation() : bool
+	protected function clearImplementation(): bool
 	{
 		return true;
 	}
 
-	protected function getTimeWithMicroSec() : string
+	protected function getTimeWithMicroSec(): string
 	{
 		return \substr((new \DateTime('now', $this->oTimeZone))->format('Y-m-d H:i:s.u'), 0, -3);
 	}
 
-	protected function getTypedPrefix(int $iType, string $sName = '') : string
+	protected function getTypedPrefix(int $iType, string $sName = ''): string
 	{
 		$sName = \strlen($sName) ? $sName : $this->sName;
-		return isset($this->aPrefixes[$iType]) ? $sName.$this->aPrefixes[$iType].': ' : '';
+		return isset(self::PREFIXES[$iType]) ? $sName . self::PREFIXES[$iType].': ' : '';
 	}
 
-	protected function localWriteImplementation($mDesc, bool $bDiplayCrLf = false) : string
+	final public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false): bool
 	{
-		if ($bDiplayCrLf)
-		{
-			if (\is_array($mDesc))
-			{
-				foreach ($mDesc as &$sLine)
-				{
-					$sLine = \strtr($sLine, array("\r" => '\r', "\n" => '\n'.$this->sNewLine));
-					$sLine = \rtrim($sLine);
-				}
-			}
-			else
-			{
-				$mDesc = \strtr($mDesc, array("\r" => '\r', "\n" => '\n'.$this->sNewLine));
-				$mDesc = \rtrim($mDesc);
-			}
+		$sDesc = \ltrim(
+			($this->bTimePrefix ? '['.$this->getTimeWithMicroSec().']' : '').
+			($this->bGuidPrefix ? '['.Logger::Guid().']' : '').
+			($this->bTypedPrefix ? ' '.$this->getTypedPrefix($iType, $sName) : '')
+		) . $sDesc;
+		if ($bDiplayCrLf) {
+			$sDesc = \rtrim(\strtr($sDesc, array("\r" => '\r', "\n" => '\n'."\n")));
 		}
-
-		return $this->writeImplementation($mDesc);
+		return $this->writeImplementation($sDesc);
 	}
 
-	final public function Write(string $sDesc, int $iType = \MailSo\Log\Enumerations\Type::INFO, string $sName = '', bool $bDiplayCrLf = false)
-	{
-		$bResult = true;
-		if (!$this->bFlushCache && ($this->bWriteOnErrorOnly || $this->bWriteOnPhpErrorOnly || $this->iWriteOnTimeoutOnly))
-		{
-			$bErrorPhp = false;
-
-			$bError = $this->bWriteOnErrorOnly && \in_array($iType, array(
-				\MailSo\Log\Enumerations\Type::NOTICE,
-				\MailSo\Log\Enumerations\Type::NOTICE_PHP,
-				\MailSo\Log\Enumerations\Type::WARNING,
-				\MailSo\Log\Enumerations\Type::WARNING_PHP,
-				\MailSo\Log\Enumerations\Type::ERROR,
-				\MailSo\Log\Enumerations\Type::ERROR_PHP
-			));
-
-			if (!$bError)
-			{
-				$bErrorPhp = $this->bWriteOnPhpErrorOnly && \in_array($iType, array(
-					\MailSo\Log\Enumerations\Type::NOTICE_PHP,
-					\MailSo\Log\Enumerations\Type::WARNING_PHP,
-					\MailSo\Log\Enumerations\Type::ERROR_PHP
-				));
-			}
-
-			if ($bError || $bErrorPhp)
-			{
-				$sFlush = '--- FlushLogCache: '.($bError ? 'WriteOnErrorOnly' : 'WriteOnPhpErrorOnly');
-				if (isset($this->aCache[0]) && empty($this->aCache[0]))
-				{
-					$this->aCache[0] = $sFlush;
-					\array_unshift($this->aCache, '');
-				}
-				else
-				{
-					\array_unshift($this->aCache, $sFlush);
-				}
-
-				$this->aCache[] = '--- FlushLogCache: Trigger';
-				$this->aCache[] = $this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName);
-
-				$this->bFlushCache = true;
-				$bResult = $this->localWriteImplementation($this->aCache, $bDiplayCrLf);
-				$this->aCache = array();
-			}
-			else if ($this->iWriteOnTimeoutOnly && \time() - $_SERVER['REQUEST_TIME_FLOAT'] > $this->iWriteOnTimeoutOnly)
-			{
-				$sFlush = '--- FlushLogCache: WriteOnTimeoutOnly ['.(\time() - $_SERVER['REQUEST_TIME_FLOAT']).'sec]';
-				if (isset($this->aCache[0]) && empty($this->aCache[0]))
-				{
-					$this->aCache[0] = $sFlush;
-					\array_unshift($this->aCache, '');
-				}
-				else
-				{
-					\array_unshift($this->aCache, $sFlush);
-				}
-
-				$this->aCache[] = '--- FlushLogCache: Trigger';
-				$this->aCache[] = $this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName);
-
-				$this->bFlushCache = true;
-				$bResult = $this->localWriteImplementation($this->aCache, $bDiplayCrLf);
-				$this->aCache = array();
-			}
-			else
-			{
-				$this->aCache[] = $this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName);
-			}
-		}
-		else
-		{
-			$bResult = $this->localWriteImplementation(
-				$this->loggerLineImplementation($this->getTimeWithMicroSec(), $sDesc, $iType, $sName), $bDiplayCrLf);
-		}
-
-		return $bResult;
-	}
-
-	public function GetNewLine() : string
-	{
-		return $this->sNewLine;
-	}
-
-	final public function Clear() : bool
+	final public function Clear(): bool
 	{
 		return $this->clearImplementation();
 	}
-
-	final public function WriteEmptyLine() : void
-	{
-		if (!$this->bFlushCache && ($this->bWriteOnErrorOnly || $this->bWriteOnPhpErrorOnly || $this->iWriteOnTimeoutOnly))
-		{
-			$this->aCache[] = '';
-		}
-		else
-		{
-			$this->writeEmptyLineImplementation();
-		}
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Callback.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Callback.php
deleted file mode 100644
index 27b634ad4..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Callback.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Log\Drivers;
-
-/**
- * @category MailSo
- * @package Log
- * @subpackage Drivers
- */
-class Callback extends \MailSo\Log\Driver
-{
-	/**
-	 * @var mixed
-	 */
-	private $fWriteCallback;
-
-	/**
-	 * @var mixed
-	 */
-	private $fClearCallback;
-
-	/**
-	 * @param mixed $fWriteCallback
-	 * @param mixed $fClearCallback
-	 */
-	function __construct($fWriteCallback, $fClearCallback)
-	{
-		parent::__construct();
-
-		$this->fWriteCallback = \is_callable($fWriteCallback) ? $fWriteCallback : null;
-		$this->fClearCallback = \is_callable($fClearCallback) ? $fClearCallback : null;
-	}
-
-	protected function writeImplementation($mDesc) : bool
-	{
-		if ($this->fWriteCallback)
-		{
-			($this->fWriteCallback)($mDesc);
-		}
-
-		return true;
-	}
-
-	protected function clearImplementation() : bool
-	{
-		if ($this->fClearCallback)
-		{
-			($this->fClearCallback)();
-		}
-
-		return true;
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
index 831d743bc..5f4ca9018 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/File.php
@@ -18,41 +18,29 @@ namespace MailSo\Log\Drivers;
  */
 class File extends \MailSo\Log\Driver
 {
-	/**
-	 * @var string
-	 */
-	private $sLoggerFileName;
+	private string $sLoggerFileName;
 
-	function __construct(string $sLoggerFileName, string $sNewLine = "\r\n")
+	function __construct(string $sLoggerFileName)
 	{
 		parent::__construct();
 
-		$this->sLoggerFileName = $sLoggerFileName;
-		$this->sNewLine = $sNewLine;
-	}
-
-	public function SetLoggerFileName(string $sLoggerFileName)
-	{
+		$sLogFileDir = \dirname($sLoggerFileName);
+		if (!\is_dir($sLogFileDir)) {
+			\mkdir($sLogFileDir, 0755, true);
+		}
 		$this->sLoggerFileName = $sLoggerFileName;
 	}
 
 	protected function writeImplementation($mDesc) : bool
 	{
-		return $this->writeToLogFile($mDesc);
+		if (\is_array($mDesc)) {
+			$mDesc = \implode("\n\t", $mDesc);
+		}
+		return \error_log($mDesc . "\n", 3, $this->sLoggerFileName);
 	}
 
 	protected function clearImplementation() : bool
 	{
 		return \unlink($this->sLoggerFileName);
 	}
-
-	private function writeToLogFile($mDesc) : bool
-	{
-		if (\is_array($mDesc))
-		{
-			$mDesc = \implode($this->sNewLine, $mDesc);
-		}
-
-		return \error_log($mDesc.$this->sNewLine, 3, $this->sLoggerFileName);
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php
deleted file mode 100644
index e6a39f16f..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Inline.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Log\Drivers;
-
-/**
- * @category MailSo
- * @package Log
- * @subpackage Drivers
- */
-class Inline extends \MailSo\Log\Driver
-{
-	/**
-	 * @var bool
-	 */
-	private $bHtmlEncodeSpecialChars;
-
-	function __construct(string $sNewLine = "\r\n", bool $bHtmlEncodeSpecialChars = false)
-	{
-		parent::__construct();
-
-		$this->sNewLine = $sNewLine;
-		$this->bHtmlEncodeSpecialChars = $bHtmlEncodeSpecialChars;
-	}
-
-	protected function writeImplementation($mDesc) : bool
-	{
-		if (\is_array($mDesc))
-		{
-			if ($this->bHtmlEncodeSpecialChars)
-			{
-				$mDesc = \array_map(function ($sItem) {
-					return \htmlspecialchars($sItem);
-				}, $mDesc);
-			}
-
-			$mDesc = \implode($this->sNewLine, $mDesc);
-		}
-		else
-		{
-			echo ($this->bHtmlEncodeSpecialChars) ? \htmlspecialchars($mDesc).$this->sNewLine : $mDesc.$this->sNewLine;
-		}
-
-		return true;
-	}
-
-	protected function clearImplementation() : bool
-	{
-		if (\defined('PHP_SAPI') && 'cli' === PHP_SAPI && \MailSo\Base\Utils::FunctionExistsAndEnabled('system'))
-		{
-			\system('clear');
-		}
-
-		return true;
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php
new file mode 100644
index 000000000..89b56d886
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/StderrStream.php
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2023 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Log\Drivers;
+
+/**
+ * @category MailSo
+ * @package Log
+ * @subpackage Drivers
+ */
+class StderrStream extends \MailSo\Log\Driver
+{
+	protected function writeImplementation($mDesc) : bool
+	{
+		if (!\defined('STDERR')) {
+			\define('STDERR', \fopen('php://stderr', 'wb'));
+		}
+		return 0 < \fwrite(STDERR, $mDesc . "\n");
+	}
+
+	protected function clearImplementation() : bool
+	{
+		return true;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
index 842c66ac5..7b45c8550 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Drivers/Syslog.php
@@ -18,7 +18,7 @@ namespace MailSo\Log\Drivers;
  */
 class Syslog extends \MailSo\Log\Driver
 {
-	private $iLogLevel;
+	private int $iLogLevel = 0;
 
 	function __construct()
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Enumerations/Type.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Enumerations/Type.php
index b90347e0a..10bd5f059 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Enumerations/Type.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Enumerations/Type.php
@@ -19,18 +19,14 @@ namespace MailSo\Log\Enumerations;
 abstract class Type
 {
 	const
-		INFO = 0,
-		NOTICE = 1,
-		WARNING = 2,
-		ERROR = 3,
-		SECURE = 4,
-		NOTE = 5,
-		TIME = 6,
-		MEMORY = 7,
-		TIME_DELTA = 8,
-		DEBUG = 9,
-
-		NOTICE_PHP = 11,
-		WARNING_PHP = 12,
-		ERROR_PHP = 13;
+		INFO = \LOG_INFO,       // 6
+		NOTICE = \LOG_NOTICE,   // 5
+		WARNING = \LOG_WARNING, // 4
+		ERROR = \LOG_ERR,       // 3
+		SECURE = \LOG_INFO,
+		NOTE = \LOG_INFO,
+		TIME = \LOG_DEBUG,
+		MEMORY = \LOG_INFO,
+		TIME_DELTA = \LOG_INFO,
+		DEBUG = \LOG_DEBUG;     // 7
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Inherit.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Inherit.php
new file mode 100644
index 000000000..64cef9825
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Inherit.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2014 Usenko Timur
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Log;
+
+/**
+ * @category MailSo
+ * @package Log
+ */
+trait Inherit
+{
+	protected ?Logger $oLogger = null;
+
+	public function Logger(): ?Logger
+	{
+		return $this->oLogger;
+	}
+
+	public function SetLogger(?Logger $oLogger): void
+	{
+		$this->oLogger = $oLogger;
+	}
+
+	public function logWrite(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false): bool
+	{
+		return $this->oLogger && $this->oLogger->Write($sDesc, $iType, $sName, $bDiplayCrLf);
+	}
+
+	public function logException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = ''): void
+	{
+		$this->oLogger && $this->oLogger->WriteException($oException, $iType, $sName);
+	}
+
+	public function logMask(
+		#[\SensitiveParameter]
+		string $sWord
+	): void
+	{
+		$this->oLogger && $this->oLogger->AddSecret($sWord);
+	}
+
+/*
+	public function logWriteDump($mValue, int $iType = \LOG_INFO, string $sName = '') : bool
+	public function logWriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = '') : void
+*/
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
index 9b9e1f5ce..fbc060645 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Log/Logger.php
@@ -17,71 +17,84 @@ namespace MailSo\Log;
  */
 class Logger extends \SplFixedArray
 {
-	private $bUsed = false;
+	private bool $bUsed = false;
 
-	private $aForbiddenTypes = [];
+	private int $iLevel = \LOG_WARNING;
 
-	private $aSecretWords = [];
+	private array $aSecretWords = [];
 
-	private $bShowSecrets = false;
+	private bool $bShowSecrets = false;
 
-	function __construct(bool $bRegPhpErrorHandler = true)
+	private static $SIGNALS = [
+		'SIGABRT',
+		'SIGALRM',
+		'SIGBABY',
+		'SIGBUS',
+		'SIGCHLD',
+		'SIGCLD',
+//		'SIGCONT',
+		'SIGFPE',
+		'SIGHUP',
+		'SIGILL',
+//		'SIGINT',
+		'SIGIO',
+		'SIGIOT',
+//		'SIGKILL',
+		'SIGPIPE',
+		'SIGPOLL',
+		'SIGPROF',
+		'SIGPWR',
+		'SIGQUIT',
+		'SIGSEGV',
+		'SIGSTKFLT',
+//		'SIGSTOP',
+		'SIGSYS',
+		'SIGTERM',
+		'SIGTRAP',
+		'SIGTSTP',
+		'SIGTTIN',
+		'SIGTTOU',
+		'SIGURG',
+		'SIGUSR1',
+		'SIGUSR2',
+		'SIGVTALRM',
+		'SIGWINCH',
+		'SIGXCPU',
+		'SIGXFSZ'
+	];
+
+	function __construct(bool $bMainLogger = false)
 	{
 		parent::__construct();
 
-		if ($bRegPhpErrorHandler)
-		{
-			\set_error_handler(array($this, '__phpErrorHandler'));
-		}
+		if ($bMainLogger) {
+			\set_error_handler([$this, '__phpErrorHandler']);
+			\set_exception_handler([$this, '__phpExceptionHandler']);
+			\register_shutdown_function([$this, '__loggerShutDown']);
 
-		\register_shutdown_function(array($this, '__loggerShutDown'));
-	}
-
-	/**
-	 * @staticvar \MailSo\Log\Logger $oInstance;
-	 */
-	public static function SingletonInstance() : self
-	{
-		static $oInstance = null;
-		if (null === $oInstance)
-		{
-			$oInstance = new self;
-		}
-
-		return $oInstance;
-	}
-
-	public static function IsSystemEnabled() : bool
-	{
-		return !!(\MailSo\Config::$SystemLogger instanceof Logger);
-	}
-
-	/**
-	 * @param mixed $mData
-	 */
-	public static function SystemLog($mData, int $iType = Enumerations\Type::INFO)
-	{
-		if (\MailSo\Config::$SystemLogger instanceof Logger)
-		{
-			\MailSo\Config::$SystemLogger->WriteMixed($mData, $iType);
+			if (\is_callable('pcntl_signal')) {
+				\pcntl_async_signals(true);
+				foreach (static::$SIGNALS as $SIGNAL) {
+					\defined($SIGNAL) && \pcntl_signal(\constant($SIGNAL), [$this, 'signalHandler']);
+				}
+			}
 		}
 	}
 
 	/**
 	 * @staticvar string $sCache;
 	 */
-	public static function Guid() : string
+	public static function Guid(): string
 	{
 		static $sCache = null;
-		if (null === $sCache)
-		{
+		if (null === $sCache) {
 			$sCache = \substr(\MailSo\Base\Utils::Sha1Rand(), -8);
 		}
 
 		return $sCache;
 	}
 
-	public function append($oDriver) : void
+	public function append($oDriver): void
 	{
 		if ($oDriver) {
 			$this->setSize(1);
@@ -89,107 +102,132 @@ class Logger extends \SplFixedArray
 		}
 	}
 
-	public function IsEnabled() : bool
+	public function IsEnabled(): bool
 	{
 		return 0 < $this->count();
 	}
 
-	public function AddSecret(string $sWord) : void
+	public function AddSecret(
+		#[\SensitiveParameter]
+		string $sWord
+	): void
 	{
-		if (\strlen(\trim($sWord)))
-		{
+//		$this->bShowSecrets && $this->Write("AddSecret '{$sWord}'", \LOG_INFO);
+		$sWord = \trim($sWord);
+		if (\strlen($sWord)) {
 			$this->aSecretWords[] = $sWord;
 			$this->aSecretWords = \array_unique($this->aSecretWords);
+			\usort($this->aSecretWords, fn($a,$b) => \strlen($b) - \strlen($a));
 		}
 	}
 
-	public function SetShowSecrets(bool $bShow) : self
+	public function SetShowSecrets(bool $bShow): self
 	{
 		$this->bShowSecrets = $bShow;
 		return $this;
 	}
 
-	public function IsShowSecter() : bool
+	public function ShowSecrets(): bool
 	{
 		return $this->bShowSecrets;
 	}
 
-	public function AddForbiddenType(int $iType) : self
+	public function SetLevel(int $iLevel): self
 	{
-		$this->aForbiddenTypes[$iType] = true;
-
+		$this->iLevel = $iLevel;
 		return $this;
 	}
 
-	public function __phpErrorHandler(int $iErrNo, string $sErrStr, string $sErrFile, int $iErrLine) : bool
+	const PHP_TYPES = array(
+		\E_ERROR => \LOG_ERR,
+		\E_WARNING => \LOG_WARNING,
+		\E_PARSE => \LOG_CRIT,
+		\E_NOTICE => \LOG_NOTICE,
+		\E_CORE_ERROR => \LOG_ERR,
+		\E_CORE_WARNING => \LOG_WARNING,
+		\E_COMPILE_ERROR => \LOG_ERR,
+		\E_COMPILE_WARNING => \LOG_WARNING,
+		\E_USER_ERROR => \LOG_ERR,
+		\E_USER_WARNING => \LOG_WARNING,
+		\E_USER_NOTICE => \LOG_NOTICE,
+//		\E_STRICT => \LOG_CRIT,
+		\E_RECOVERABLE_ERROR => \LOG_ERR,
+		\E_DEPRECATED => \LOG_INFO,
+		\E_USER_DEPRECATED => \LOG_INFO
+	);
+
+	const PHP_TYPE_POSTFIX = array(
+		\E_ERROR => '',
+		\E_WARNING => '',
+		\E_PARSE => '-PARSE',
+		\E_NOTICE => '',
+		\E_CORE_ERROR => '-CORE',
+		\E_CORE_WARNING => '-CORE',
+		\E_COMPILE_ERROR => '-COMPILE',
+		\E_COMPILE_WARNING => '-COMPILE',
+		\E_USER_ERROR => '-USER',
+		\E_USER_WARNING => '-USER',
+		\E_USER_NOTICE => '-USER',
+//		\E_STRICT => '-STRICT',
+		\E_RECOVERABLE_ERROR => '-RECOVERABLE',
+		\E_DEPRECATED => '-DEPRECATED',
+		\E_USER_DEPRECATED => '-USER_DEPRECATED'
+	);
+
+	public function __phpErrorHandler(int $iErrNo, string $sErrStr, string $sErrFile, int $iErrLine): bool
 	{
 		if (\error_reporting() & $iErrNo) {
-			$iType = Enumerations\Type::NOTICE_PHP;
-			switch ($iErrNo)
-			{
-				 case E_USER_ERROR:
-					 $iType = Enumerations\Type::ERROR_PHP;
-					 break;
-				 case E_USER_WARNING:
-					 $iType = Enumerations\Type::WARNING_PHP;
-					 break;
-			}
-/*
-				case E_ERROR:
-				case E_WARNING:
-				case E_PARSE:
-				case E_NOTICE:
-				case E_CORE_ERROR:
-				case E_CORE_WARNING:
-				case E_COMPILE_ERROR:
-				case E_COMPILE_WARNING:
-				case E_USER_NOTICE:
-				case E_STRICT:
-				case E_RECOVERABLE_ERROR:
-				case E_DEPRECATED:
-				case E_USER_DEPRECATED:
-*/
-			$this->Write($sErrFile.' [line:'.$iErrLine.', code:'.$iErrNo.']', $iType, 'PHP');
-			$this->Write('Error: '.$sErrStr, $iType, 'PHP');
+			$this->Write(
+				"{$sErrStr} {$sErrFile} [line:{$iErrLine}, code:{$iErrNo}]",
+				static::PHP_TYPES[$iErrNo],
+				'PHP' . static::PHP_TYPE_POSTFIX[$iErrNo]
+			);
 		}
 		/* forward to standard PHP error handler */
 		return false;
 	}
 
-	public function __loggerShutDown() : void
+	/**
+	 * Called by PHP when an Exception is uncaught
+	 */
+	public function __phpExceptionHandler(\Throwable $oException): void
 	{
-		if ($this->bUsed)
-		{
-			$this->Write('Memory peak usage: '.\MailSo\Base\Utils::FormatFileSize(\memory_get_peak_usage(true), 2),
-				Enumerations\Type::MEMORY);
-			$this->Write('Time delta: '.(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']), Enumerations\Type::TIME_DELTA);
+		$this->Write('Uncaught exception: ' . $oException, \LOG_CRIT);
+		\error_log('Uncaught exception: ' . $oException);
+	}
+
+	public function __loggerShutDown(): void
+	{
+		if ($this->bUsed) {
+			$error = \error_get_last();
+			$error && $this->Write('Last error: '.\json_encode($error));
+			$this->Write('Memory peak usage: '.\MailSo\Base\Utils::FormatFileSize(\memory_get_peak_usage(true), 2));
+			$this->Write('Time delta: '.(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']));
 		}
 	}
 
-	public function WriteEmptyLine() : bool
+	public function signalHandler(int $signo, mixed $siginfo = null): void
 	{
-		$iResult = 1;
-
-		foreach ($this as /* @var $oLogger \MailSo\Log\Driver */ $oLogger)
-		{
-			$iResult = $oLogger->WriteEmptyLine();
+		if (\SIGTERM == $signo) {
+			exit;
+		}
+		foreach (static::$SIGNALS as $SIGNAL) {
+			if (\defined($SIGNAL) && \constant($SIGNAL) == $signo) {
+				$this->Write("Caught {$SIGNAL} ".($siginfo ? \json_encode($siginfo) : ''), \LOG_CRIT, 'PHP');
+				break;
+			}
 		}
-
-		return (bool) $iResult;
 	}
 
-	public function Write(string $sDesc, int $iType = Enumerations\Type::INFO,
-		string $sName = '', bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
+	public function Write(string $sDesc, int $iType = \LOG_INFO, string $sName = '', bool $bDiplayCrLf = false): bool
 	{
-		if (!empty($this->aForbiddenTypes[$iType]))
-		{
+		if ($this->iLevel < $iType) {
 			return true;
 		}
 
 		$this->bUsed = true;
 
-		if ($bSearchSecretWords && !$this->bShowSecrets && \count($this->aSecretWords))
-		{
+		if (!$this->bShowSecrets && $this->aSecretWords) {
 			$sDesc = \str_replace($this->aSecretWords, '*******', $sDesc);
 		}
 
@@ -203,67 +241,26 @@ class Logger extends \SplFixedArray
 		return (bool) $iResult;
 	}
 
-	/**
-	 * @param mixed $oValue
-	 */
-	public function WriteDump($oValue, int $iType = Enumerations\Type::INFO, string $sName = '',
-		bool $bSearchSecretWords = false, bool $bDiplayCrLf = false) : bool
+	public function WriteDump(mixed $mValue, int $iType = \LOG_INFO, string $sName = ''): bool
 	{
-		return $this->Write(\print_r($oValue, true), $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
+		return $this->Write(\print_r($mValue, true), $iType, $sName);
 	}
 
-	public function WriteException(\Throwable $oException, int $iType = Enumerations\Type::NOTICE, string $sName = '',
-		bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
+	private $aExceptions = [];
+
+	public function WriteException(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = ''): void
 	{
-		if ($oException instanceof \Throwable)
-		{
-			if (isset($oException->__LOGINNED__))
-			{
-				return true;
-			}
-
-			$oException->__LOGINNED__ = true;
-
-			return $this->Write((string) $oException, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
+		if (!\in_array($oException, $this->aExceptions)) {
+			$this->Write((string) $oException, $iType, $sName);
+			$this->aExceptions[] = $oException;
 		}
-
-		return false;
 	}
 
-	public function WriteExceptionShort(\Throwable $oException, int $iType = Enumerations\Type::NOTICE, string $sName = '',
-		bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
+	public function WriteExceptionShort(\Throwable $oException, int $iType = \LOG_NOTICE, string $sName = ''): void
 	{
-		if ($oException instanceof \Throwable)
-		{
-			if (isset($oException->__LOGINNED__))
-			{
-				return true;
-			}
-
-			$oException->__LOGINNED__ = true;
-
-			return $this->Write($oException->getMessage(), $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
+		if (!\in_array($oException, $this->aExceptions)) {
+			$this->Write($oException->getMessage(), $iType, $sName);
+			$this->aExceptions[] = $oException;
 		}
-
-		return false;
-	}
-
-	/**
-	 * @param mixed $mData
-	 */
-	public function WriteMixed($mData, int $iType = null, string $sName = '',
-		bool $bSearchSecretWords = true, bool $bDiplayCrLf = false) : bool
-	{
-		$iType = null === $iType ? Enumerations\Type::INFO : $iType;
-		if (\is_array($mData) || \is_object($mData))
-		{
-			if ($mData instanceof \Throwable)
-			{
-				$iType = null === $iType ? Enumerations\Type::NOTICE : $iType;
-				return $this->WriteException($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
-			}
-			return  $this->WriteDump($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
-		}
-		return $this->Write($mData, $iType, $sName, $bSearchSecretWords, $bDiplayCrLf);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
index 93ccb71ae..e56841d90 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Attachment.php
@@ -11,33 +11,28 @@
 
 namespace MailSo\Mail;
 
+use MailSo\Imap\BodyStructure;
+
 /**
  * @category MailSo
  * @package Mail
  */
 class Attachment implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sFolder;
+	private string $sFolder;
 
-	/**
-	 * @var int
-	 */
-	private $iUid;
+	private int $iUid;
 
-	/**
-	 * @var \MailSo\Imap\BodyStructure
-	 */
-	private $oBodyStructure;
+	private ?BodyStructure $oBodyStructure;
 
-	function __construct()
+	function __construct(string $sFolder, int $iUid, BodyStructure $oBodyStructure)
 	{
-		$this->Clear();
+		$this->sFolder = $sFolder;
+		$this->iUid = $iUid;
+		$this->oBodyStructure = $oBodyStructure;
 	}
 
-	public function Clear() : self
+	public function Clear(): self
 	{
 		$this->sFolder = '';
 		$this->iUid = 0;
@@ -46,136 +41,28 @@ class Attachment implements \JsonSerializable
 		return $this;
 	}
 
-	public function Folder() : string
+	public function Folder(): string
 	{
 		return $this->sFolder;
 	}
 
-	public function Uid() : int
+	public function Uid(): int
 	{
 		return $this->iUid;
 	}
 
-	public function MimeIndex() : string
+	public function __call(string $name, array $arguments): mixed
 	{
-		return $this->oBodyStructure ? $this->oBodyStructure->PartID() : '';
+		return $this->oBodyStructure->{$name}(...$arguments);
 	}
 
-	public function FileName(bool $bCalculateOnEmpty = false) : string
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		if (!$this->oBodyStructure) {
-			return '';
-		}
-
-		$sFileName = \trim($this->oBodyStructure->FileName());
-		if (\strlen($sFileName) || !$bCalculateOnEmpty) {
-			return $sFileName;
-		}
-
-		$sIdx = '-' . $this->MimeIndex();
-
-		$sMimeType = \strtolower(\trim($this->MimeType()));
-		if ('message/rfc822' === $sMimeType) {
-			return "message{$sIdx}.eml";
-		}
-		if ('text/calendar' === $sMimeType) {
-			return "calendar{$sIdx}.ics";
-		}
-		if ('text/plain' === $sMimeType) {
-			return "part{$sIdx}.txt";
-		}
-		if (\preg_match('@text/(vcard|html|csv|xml|css|asp)@', $sMimeType, $aMatch)
-		 || \preg_match('@image/(png|jpeg|gif|bmp|cgm|ief|tiff|webp)@', $sMimeType, $aMatch)) {
-			return "part{$sIdx}.{$aMatch[1]}";
-		}
-		if (\strlen($sMimeType)) {
-			return \str_replace('/', $sIdx.'.', $sMimeType);
-		}
-
-		return ($this->oBodyStructure->IsInline() ? 'part' : 'inline' ) . $sIdx;
-	}
-
-	public function MimeType() : string
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->ContentType() : '';
-	}
-
-	public function EncodedSize() : int
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->Size() : 0;
-	}
-
-	public function EstimatedSize() : int
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->EstimatedSize() : 0;
-	}
-
-	public function Cid() : string
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->ContentID() : '';
-	}
-
-	public function ContentLocation() : string
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->ContentLocation() : '';
-	}
-
-	public function IsInline() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsInline() : false;
-	}
-
-	public function IsImage() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsImage() : false;
-	}
-
-	public function IsArchive() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsArchive() : false;
-	}
-
-	public function IsPdf() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsPdf() : false;
-	}
-
-	public function IsDoc() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsDoc() : false;
-	}
-
-	public function IsPgpSignature() : bool
-	{
-		return $this->oBodyStructure ? $this->oBodyStructure->IsPgpSignature() : false;
-	}
-
-	public static function NewBodyStructureInstance(string $sFolder, int $iUid, \MailSo\Imap\BodyStructure $oBodyStructure) : self
-	{
-		return (new self)->InitByBodyStructure($sFolder, $iUid, $oBodyStructure);
-	}
-
-	public function InitByBodyStructure(string $sFolder, int $iUid, \MailSo\Imap\BodyStructure $oBodyStructure) : self
-	{
-		$this->sFolder = $sFolder;
-		$this->iUid = $iUid;
-		$this->oBodyStructure = $oBodyStructure;
-		return $this;
-	}
-
-	public function jsonSerialize()
-	{
-		return array(
+		return \array_merge([
 			'@Object' => 'Object/Attachment',
-			'Folder' => $this->Folder(),
-			'Uid' => (string) $this->Uid(),
-			'MimeIndex' => (string) $this->MimeIndex(),
-			'MimeType' => $this->MimeType(),
-			'FileName' => \MailSo\Base\Utils::ClearFileName(\MailSo\Base\Utils::ClearXss($this->FileName(true))),
-			'EstimatedSize' => $this->EstimatedSize(),
-			'Cid' => $this->Cid(),
-			'ContentLocation' => $this->ContentLocation(),
-			'IsInline' => $this->IsInline()
-		);
+			'folder' => $this->sFolder,
+			'uid' => $this->iUid
+		], $this->oBodyStructure->jsonSerialize());
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php
index 3a056d0d6..0b1992af7 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/AttachmentCollection.php
@@ -22,21 +22,4 @@ class AttachmentCollection extends \MailSo\Base\Collection
 		assert($oAttachment instanceof Attachment);
 		parent::append($oAttachment, $bToTop);
 	}
-
-	public function SpecData() : array
-	{
-		$aResult = array();
-		foreach ($this as $oAttachment) {
-			$aResult[] = array(
-				'@Object' => 'Object/Attachment',
-				'FileName' => $oAttachment->FileName(),
-				'MimeType' => $oAttachment->MimeType(),
-				'IsInline' => $oAttachment->IsInline()
-			);
-		}
-		return array(
-			'@Object' => 'Collection/AttachmentCollection',
-			'@Collection' => $aResult
-		);
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/Exception.php
deleted file mode 100644
index 9bf1c4212..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/Exception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Mail\Exceptions;
-
-/**
- * @category MailSo
- * @package Mail
- * @subpackage Exceptions
- */
-class Exception extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
index bac441385..dd441fe5b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/NonEmptyFolder.php
@@ -16,4 +16,4 @@ namespace MailSo\Mail\Exceptions;
  * @package Mail
  * @subpackage Exceptions
  */
-class NonEmptyFolder extends \MailSo\Mail\Exceptions\RuntimeException {}
+class NonEmptyFolder extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php
deleted file mode 100644
index b006f24f2..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Exceptions/RuntimeException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Mail\Exceptions;
-
-/**
- * @category MailSo
- * @package Mail
- * @subpackage Exceptions
- */
-class RuntimeException extends \MailSo\Mail\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php
deleted file mode 100644
index c437c87c2..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Folder.php
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Mail;
-
-use MailSo\Imap\Enumerations\FolderType;
-use MailSo\Imap\Enumerations\MetadataKeys;
-
-/**
- * @category MailSo
- * @package Mail
- */
-class Folder implements \JsonSerializable
-{
-	/**
-	 * @var bool
-	 */
-	private $bExists;
-
-	/**
-	 * @var bool
-	 */
-	private $bSubscribed;
-
-	/**
-	 * @var \MailSo\Imap\Folder
-	 */
-	private $oImapFolder;
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	function __construct(\MailSo\Imap\Folder $oImapFolder, bool $bSubscribed = true, bool $bExists = true)
-	{
-		$this->oImapFolder = $oImapFolder;
-		$this->bSubscribed = $bSubscribed || \in_array('\\subscribed', $oImapFolder->FlagsLowerCase());
-		$this->bExists = $bExists;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	public static function NewNonExistentInstance(string $sFullName, string $sDelimiter) : self
-	{
-		return new self(
-			new \MailSo\Imap\Folder($sFullName, $sDelimiter, array('\\Noselect')), false, false);
-	}
-
-	public function Name() : string
-	{
-		return $this->oImapFolder->Name();
-	}
-
-	public function FullName() : string
-	{
-		return $this->oImapFolder->FullName();
-	}
-
-	public function NameRaw() : string
-	{
-		return $this->oImapFolder->NameRaw();
-	}
-
-	public function Delimiter() : string
-	{
-		return $this->oImapFolder->Delimiter();
-	}
-
-	public function FlagsLowerCase() : array
-	{
-		return $this->oImapFolder->FlagsLowerCase();
-	}
-
-	public function IsSubscribed() : bool
-	{
-		return $this->bSubscribed;
-	}
-
-	public function IsExists() : bool
-	{
-		return $this->bExists;
-	}
-
-	public function IsSelectable() : bool
-	{
-		return $this->bExists && $this->oImapFolder->IsSelectable();
-	}
-
-	public function Status() : array
-	{
-		return $this->oImapFolder->getStatusItems();
-	}
-
-	public function IsInbox() : bool
-	{
-		return $this->oImapFolder->IsInbox();
-	}
-
-	public function GetFolderListType() : int
-	{
-		$aFlags = $this->oImapFolder->FlagsLowerCase();
-		// RFC 6154
-//		$aFlags[] = \strtolower($this->oImapFolder->GetMetadata(MetadataKeys::SPECIALUSE));
-
-		switch (true)
-		{
-			case \in_array('\\inbox', $aFlags) || 'INBOX' === \strtoupper($this->FullName()):
-				return FolderType::INBOX;
-
-			case \in_array('\\sent', $aFlags):
-			case \in_array('\\sentmail', $aFlags):
-				return FolderType::SENT;
-
-			case \in_array('\\drafts', $aFlags):
-				return FolderType::DRAFTS;
-
-			case \in_array('\\junk', $aFlags):
-			case \in_array('\\spam', $aFlags):
-				return FolderType::JUNK;
-
-			case \in_array('\\trash', $aFlags):
-			case \in_array('\\bin', $aFlags):
-				return FolderType::TRASH;
-
-			case \in_array('\\important', $aFlags):
-				return FolderType::IMPORTANT;
-
-			case \in_array('\\flagged', $aFlags):
-			case \in_array('\\starred', $aFlags):
-				return FolderType::FLAGGED;
-
-			case \in_array('\\archive', $aFlags):
-				return FolderType::ARCHIVE;
-
-			case \in_array('\\all', $aFlags):
-			case \in_array('\\allmail', $aFlags):
-				return FolderType::ALL;
-
-			// TODO
-//			case 'Templates' === $this->FullName():
-//				return FolderType::TEMPLATES;
-		}
-
-		// Kolab
-		$type = $this->GetMetadata(MetadataKeys::KOLAB_CTYPE) ?: $this->GetMetadata(MetadataKeys::KOLAB_CTYPE_SHARED);
-		switch ($type)
-		{
-/*
-			// TODO: Kolab
-			case 'event':
-			case 'event.default':
-				return FolderType::CALENDAR;
-			case 'contact':
-			case 'contact.default':
-				return FolderType::CONTACTS;
-			case 'task':
-			case 'task.default':
-				return FolderType::TASKS;
-			case 'note':
-			case 'note.default':
-				return FolderType::NOTES;
-			case 'file':
-			case 'file.default':
-				return FolderType::FILES;
-			case 'configuration':
-				return FolderType::CONFIGURATION;
-			case 'journal':
-			case 'journal.default':
-				return FolderType::JOURNAL;
-*/
-			case 'mail.inbox':
-				return FolderType::INBOX;
-//			case 'mail.outbox':
-			case 'mail.sentitems':
-				return FolderType::SENT;
-			case 'mail.drafts':
-				return FolderType::DRAFTS;
-			case 'mail.junkemail':
-				return FolderType::JUNK;
-			case 'mail.wastebasket':
-				return FolderType::TRASH;
-		}
-
-		return FolderType::USER;
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function GetMetadata(string $sName) : ?string
-	{
-		return $this->oImapFolder->GetMetadata($sName);
-	}
-
-	public function jsonSerialize()
-	{
-/*
-		$aExtended = null;
-		$aStatus = $this->oImapFolder->getStatusItems();
-		if ($aStatus && isset($aStatus['MESSAGES'], $aStatus['UNSEEN'], $aStatus['UIDNEXT'])) {
-			$aExtended = array(
-				'MessageCount' => (int) $aStatus['MESSAGES'],
-				'MessageUnseenCount' => (int) $aStatus['UNSEEN'],
-				'UidNext' => (int) $aStatus['UIDNEXT'],
-//				'Hash' => $this->MailClient()->GenerateFolderHash(
-//					$this->FullName(), $aStatus['MESSAGES'], $aStatus['UIDNEXT'],
-//						empty($aStatus['HIGHESTMODSEQ']) ? 0 : $aStatus['HIGHESTMODSEQ'])
-			);
-		}
-*/
-		return array(
-			'@Object' => 'Object/Folder',
-			'Name' => $this->Name(),
-			'FullName' => $this->FullName(),
-			'Delimiter' => (string) $this->Delimiter(),
-			'Subscribed' => $this->bSubscribed,
-			'Exists' => $this->bExists,
-			'Selectable' => $this->IsSelectable(),
-			'Flags' => $this->FlagsLowerCase(),
-//			'Extended' => $aExtended,
-			'Metadata' => $this->oImapFolder->Metadata()
-		);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
index e665f259b..ecca5da53 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MailClient.php
@@ -11,11 +11,12 @@
 
 namespace MailSo\Mail;
 
-use MailSo\Imap\Enumerations\FolderResponseStatus;
+use MailSo\Imap\FolderCollection;
+use MailSo\Imap\FolderInformation;
+use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Imap\Enumerations\MessageFlag;
 use MailSo\Imap\Enumerations\StoreAction;
 use MailSo\Imap\SequenceSet;
-use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Mime\Enumerations\Header as MimeHeader;
 use MailSo\Mime\Enumerations\Parameter as MimeParameter;
 
@@ -25,64 +26,32 @@ use MailSo\Mime\Enumerations\Parameter as MimeParameter;
  */
 class MailClient
 {
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	private $oLogger;
+	use \MailSo\Log\Inherit;
 
-	/**
-	 * @var \MailSo\Imap\ImapClient
-	 */
-	private $oImapClient;
+	private \MailSo\Imap\ImapClient $oImapClient;
+
+	private bool $bThreadSort = false;
 
 	function __construct()
 	{
-		$this->oLogger = null;
-
 		$this->oImapClient = new \MailSo\Imap\ImapClient;
-		$this->oImapClient->SetTimeOuts(10, \MailSo\Config::$ImapTimeout);
 	}
 
-	public function ImapClient() : \MailSo\Imap\ImapClient
+	public function ImapClient(): \MailSo\Imap\ImapClient
 	{
 		return $this->oImapClient;
 	}
 
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 */
-	public function Disconnect() : self
+	private function getEnvelopeOrHeadersRequestString(): string
 	{
-		$this->oImapClient->Disconnect();
-		return $this;
-	}
-
-	public function IsConnected() : bool
-	{
-		return $this->oImapClient->IsConnected();
-	}
-
-	public function IsLoggined() : bool
-	{
-		return $this->oImapClient->IsLoggined();
-	}
-
-	public function Capabilities() : array
-	{
-		return $this->oImapClient->Capability();
-	}
-
-	private function getEnvelopeOrHeadersRequestString() : string
-	{
-		if (\MailSo\Config::$MessageAllHeaders)
-		{
+		if ($this->oImapClient->Settings->message_all_headers) {
 			return FetchType::BODY_HEADER_PEEK;
 		}
 
-		return FetchType::BuildBodyCustomHeaderRequest(array(
-			MimeHeader::RETURN_PATH,
-			MimeHeader::RECEIVED,
-			MimeHeader::MIME_VERSION,
+		$aHeaders = array(
+//			MimeHeader::RETURN_PATH,
+//			MimeHeader::RECEIVED,
+//			MimeHeader::MIME_VERSION,
 			MimeHeader::MESSAGE_ID,
 			MimeHeader::CONTENT_TYPE,
 			MimeHeader::FROM_,
@@ -100,61 +69,79 @@ class MailClient
 			MimeHeader::IMPORTANCE,
 			MimeHeader::X_PRIORITY,
 			MimeHeader::X_DRAFT_INFO,
-			MimeHeader::RETURN_RECEIPT_TO,
+//			MimeHeader::RETURN_RECEIPT_TO,
 			MimeHeader::DISPOSITION_NOTIFICATION_TO,
 			MimeHeader::X_CONFIRM_READING_TO,
 			MimeHeader::AUTHENTICATION_RESULTS,
 			MimeHeader::X_DKIM_AUTHENTICATION_RESULTS,
 			MimeHeader::LIST_UNSUBSCRIBE,
-			// SPAM
-			MimeHeader::X_SPAM_STATUS,
-//			MimeHeader::X_SPAM_FLAG,
-			MimeHeader::X_SPAMD_RESULT,
-			MimeHeader::X_BOGOSITY,
-			// Virus
-			MimeHeader::X_VIRUS,
-			MimeHeader::X_VIRUS_SCANNED,
-			MimeHeader::X_VIRUS_STATUS
-		), true);
-//
-//		return FetchType::ENVELOPE;
+			// https://autocrypt.org/level1.html#the-autocrypt-header
+			MimeHeader::AUTOCRYPT
+		);
+
+		// SPAM
+		$spam_headers = \explode(',', $this->oImapClient->Settings->spam_headers);
+		if (\in_array('rspamd', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_SPAMD_RESULT;
+		}
+		if (\in_array('spamassassin', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_SPAM_STATUS;
+			$aHeaders[] = MimeHeader::X_SPAM_FLAG;
+			$aHeaders[] = MimeHeader::X_SPAM_INFO;
+		}
+		if (\in_array('bogofilter', $spam_headers)) {
+			$aHeaders[] = MimeHeader::X_BOGOSITY;
+		}
+
+		// Virus
+		$virus_headers = \explode(',', $this->oImapClient->Settings->virus_headers);
+		if (\in_array('rspamd', $virus_headers)) {
+			$aHeaders[] = MimeHeader::X_VIRUS;
+		}
+		if (\in_array('clamav', $virus_headers)) {
+			$aHeaders[] = MimeHeader::X_VIRUS_SCANNED;
+			$aHeaders[] = MimeHeader::X_VIRUS_STATUS;
+		}
+
+		\RainLoop\Api::Actions()->Plugins()->RunHook('imap.message-headers', array(&$aHeaders));
+
+		return FetchType::BuildBodyCustomHeaderRequest($aHeaders, true);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 * @throws \MailSo\Mail\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
+	 * @throws \MailSo\Mail\Exceptions\*
 	 */
-	public function MessageSetFlag(string $sFolderName, SequenceSet $oRange, string $sMessageFlag, bool $bSetAction = true, bool $bSkipUnsupportedFlag = false) : void
+	public function MessageSetFlag(string $sFolderName, SequenceSet $oRange, string $sMessageFlag, bool $bSetAction = true, bool $bSkipUnsupportedFlag = false): void
 	{
 		if (\count($oRange)) {
-			$oFolderInfo = $this->oImapClient->FolderSelect($sFolderName);
-			if ($oFolderInfo->IsFlagSupported($sMessageFlag)) {
+			if ($this->oImapClient->FolderSelect($sFolderName)->IsFlagSupported($sMessageFlag)) {
 				$sStoreAction = $bSetAction ? StoreAction::ADD_FLAGS_SILENT : StoreAction::REMOVE_FLAGS_SILENT;
 				$this->oImapClient->MessageStoreFlag($oRange, array($sMessageFlag), $sStoreAction);
 			} else if (!$bSkipUnsupportedFlag) {
-				throw new Exceptions\RuntimeException('Message flag "'.$sMessageFlag.'" is not supported.');
+				throw new \MailSo\RuntimeException('Message flag "'.$sMessageFlag.'" is not supported.');
 			}
 		}
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null, int $iBodyTextLimit = 0) : ?Message
+	public function Message(string $sFolderName, int $iIndex, bool $bIndexIsUid = true, ?\MailSo\Cache\CacheClient $oCacher = null): ?Message
 	{
-		if (!\MailSo\Base\Validator::RangeInt($iIndex, 1))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (1 > $iIndex) {
+			throw new \ValueError;
 		}
 
 		$this->oImapClient->FolderExamine($sFolderName);
 
 		$oBodyStructure = null;
-		$oMessage = null;
 
 		$aFetchItems = array(
 			FetchType::UID,
@@ -166,64 +153,43 @@ class MailClient
 		);
 
 		$aFetchResponse = $this->oImapClient->Fetch(array(FetchType::BODYSTRUCTURE), $iIndex, $bIndexIsUid);
-		if (\count($aFetchResponse) && isset($aFetchResponse[0]))
-		{
+		if (\count($aFetchResponse) && isset($aFetchResponse[0])) {
 			$oBodyStructure = $aFetchResponse[0]->GetFetchBodyStructure();
-			if ($oBodyStructure)
-			{
-				foreach ($oBodyStructure->GetHtmlAndPlainParts() as $oPart)
-				{
+			if ($oBodyStructure) {
+				$iBodyTextLimit = $this->oImapClient->Settings->body_text_limit;
+				foreach ($oBodyStructure->GetHtmlAndPlainParts() as $oPart) {
 					$sLine = FetchType::BODY_PEEK.'['.$oPart->PartID().']';
-					if (0 < $iBodyTextLimit && $iBodyTextLimit < $oPart->Size())
-					{
+					if (0 < $iBodyTextLimit && $iBodyTextLimit < $oPart->EstimatedSize()) {
 						$sLine .= "<0.{$iBodyTextLimit}>";
 					}
-
 					$aFetchItems[] = $sLine;
 				}
-/*
-				$gSignatureParts = $oBodyStructure->SearchByContentType('multipart/signed');
-				foreach ($gSignatureParts as $oPart) {
-					if ($oPart->IsPgpSigned()) {
-						// An empty section specification refers to the entire message, including the header.
-						// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
-						$aFetchItems[] = FetchType::BODY_PEEK.'['.$oPart->SubParts()[0]->PartID().'.MIME]';
-						$aFetchItems[] = FetchType::BODY_PEEK.'['.$oPart->SubParts()[0]->PartID().']';
-						$aFetchItems[] = FetchType::BODY_PEEK.'['.$oPart->SubParts()[1]->PartID().']';
-					}
-				}
-*/
 			}
 		}
 
-		if (!$oBodyStructure)
-		{
+		if (!$oBodyStructure) {
 			$aFetchItems[] = FetchType::BODYSTRUCTURE;
 		}
 
 		$aFetchResponse = $this->oImapClient->Fetch($aFetchItems, $iIndex, $bIndexIsUid);
-		if (\count($aFetchResponse))
-		{
-			$oMessage = Message::NewFetchResponseInstance($sFolderName, $aFetchResponse[0], $oBodyStructure);
-		}
 
-		return $oMessage;
+		return \count($aFetchResponse)
+			? Message::fromFetchResponse($sFolderName, $aFetchResponse[0], $oBodyStructure)
+			: null;
 	}
 
 	/**
 	 * Streams mime part to $mCallback
 	 *
-	 * @param mixed $mCallback
-	 *
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageMimeStream($mCallback, string $sFolderName, int $iIndex, string $sMimeIndex) : bool
+	public function MessageMimeStream(callable $mCallback, string $sFolderName, int $iIndex, string $sMimeIndex): bool
 	{
-		if (!\is_callable($mCallback))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\is_callable($mCallback)) {
+			throw new \ValueError;
 		}
 
 		$this->oImapClient->FolderExamine($sFolderName);
@@ -240,20 +206,17 @@ class MailClient
 				: FetchType::BODY_HEADER_PEEK),
 			$iIndex, true);
 
-		if (\count($aFetchResponse))
-		{
+		if (\count($aFetchResponse)) {
 			$sMime = $aFetchResponse[0]->GetFetchValue(
 				\strlen($sMimeIndex)
 					? FetchType::BODY.'['.$sMimeIndex.'.MIME]'
 					: FetchType::BODY_HEADER
 			);
 
-			if (\strlen($sMime))
-			{
+			if (\strlen($sMime)) {
 				$oHeaders = new \MailSo\Mime\HeaderCollection($sMime);
 
-				if (\strlen($sMimeIndex))
-				{
+				if (\strlen($sMimeIndex)) {
 					$sFileName = $oHeaders->ParameterValue(MimeHeader::CONTENT_DISPOSITION, MimeParameter::FILENAME);
 					if (!\strlen($sFileName)) {
 						$sFileName = $oHeaders->ParameterValue(MimeHeader::CONTENT_TYPE, MimeParameter::NAME);
@@ -265,15 +228,13 @@ class MailClient
 
 					// RFC 3516
 					// Should mailserver decode or PHP?
-					if ($sMailEncoding && $this->oImapClient->IsSupported('BINARY')) {
+					if ($sMailEncoding && $this->oImapClient->hasCapability('BINARY')) {
 						$sMailEncoding = '';
 						$sPeek = FetchType::BINARY_PEEK;
 					}
 
 					$sContentType = $oHeaders->ValueByName(MimeHeader::CONTENT_TYPE);
-				}
-				else
-				{
+				} else {
 					$sFileName = ($oHeaders->ValueByName(MimeHeader::SUBJECT) ?: $iIndex) . '.eml';
 
 					$sContentType = 'message/rfc822';
@@ -281,196 +242,66 @@ class MailClient
 			}
 		}
 
-		$aFetchResponse = $this->oImapClient->Fetch(array(
-//			FetchType::BINARY_SIZE.'['.$sMimeIndex.']',
-			// Push in the aFetchCallbacks array and then called by \MailSo\Imap\Traits\ResponseParser::partialResponseLiteralCallbackCallable
-			array(
-				$sPeek.'['.$sMimeIndex.']',
-				function ($sParent, $sLiteralAtomUpperCase, $rImapLiteralStream) use ($mCallback, $sMimeIndex, $sMailEncoding, $sContentType, $sFileName)
-				{
-					if (\strlen($sLiteralAtomUpperCase) && \is_resource($rImapLiteralStream) && 'FETCH' === $sParent)
-					{
-						$mCallback($sMailEncoding
-							? \MailSo\Base\StreamWrappers\Binary::CreateStream($rImapLiteralStream, $sMailEncoding)
-							: $rImapLiteralStream,
-							$sContentType, $sFileName, $sMimeIndex);
-					}
+		$callback = function ($sParent, $sLiteralAtomUpperCase, $rImapLiteralStream)
+			use ($mCallback, $sMimeIndex, $sMailEncoding, $sContentType, $sFileName)
+			{
+				if (\strlen($sLiteralAtomUpperCase) && \is_resource($rImapLiteralStream) && 'FETCH' === $sParent) {
+					$mCallback($sMailEncoding
+						? \MailSo\Base\StreamWrappers\Binary::CreateStream($rImapLiteralStream, $sMailEncoding)
+						: $rImapLiteralStream,
+						$sContentType, $sFileName, $sMimeIndex);
 				}
-			)), $iIndex, true);
+			};
+
+		try {
+			$aFetchResponse = $this->oImapClient->Fetch(array(
+//				FetchType::BINARY_SIZE.'['.$sMimeIndex.']',
+				// Push in the aFetchCallbacks array and then called by \MailSo\Imap\Traits\ResponseParser::partialResponseLiteralCallbackCallable
+				array(
+					$sPeek.'['.$sMimeIndex.']',
+					$callback
+				)), $iIndex, true);
+		} catch (\MailSo\Imap\Exceptions\NegativeResponseException $oException) {
+			if (FetchType::BINARY_PEEK === $sPeek && \preg_match('/UNKNOWN-CTE|PARSE/', $oException->getMessage())) {
+				$this->logException($oException, \LOG_WARNING);
+				$aFetchResponse = $this->oImapClient->Fetch(array(
+					array(
+						FetchType::BODY_PEEK . '[' . $sMimeIndex . ']',
+						$callback
+					)), $iIndex, true);
+			} else {
+				throw $e;
+			}
+		}
 
 		return ($aFetchResponse && 1 === \count($aFetchResponse));
 	}
 
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function MessageDelete(string $sFolder, SequenceSet $oRange, bool $bExpungeAll = false) : self
+	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, ?array $aAppendFlags = null): int
 	{
-		if (!\strlen($sFolder) || !\count($oRange))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$this->oImapClient->FolderSelect($sFolder);
-
-		$this->oImapClient->MessageStoreFlag($oRange,
-			array(MessageFlag::DELETED),
-			StoreAction::ADD_FLAGS_SILENT
-		);
-
-		if ($bExpungeAll) {
-			$this->oImapClient->FolderExpunge();
-		} else {
-			$this->oImapClient->FolderExpunge($oRange);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function MessageMove(string $sFromFolder, string $sToFolder, SequenceSet $oRange, bool $bUseMoveSupported = true, bool $bExpungeAll = false) : self
-	{
-		if (!$sFromFolder || !$sToFolder || !\count($oRange))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$this->oImapClient->FolderSelect($sFromFolder);
-
-		if ($bUseMoveSupported && $this->oImapClient->IsSupported('MOVE'))
-		{
-			$this->oImapClient->MessageMove($sToFolder, $oRange);
-		}
-		else
-		{
-			$this->oImapClient->MessageCopy($sToFolder, $oRange);
-
-			$this->MessageDelete($sFromFolder, $oRange, $bExpungeAll);
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function MessageCopy(string $sFromFolder, string $sToFolder, SequenceSet $oRange) : self
-	{
-		if (!$sFromFolder || !$sToFolder || !\count($oRange))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$this->oImapClient->FolderSelect($sFromFolder);
-		$this->oImapClient->MessageCopy($sToFolder, $oRange);
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function FolderUnselect() : self
-	{
-		if ($this->oImapClient->IsSelected())
-		{
-			$this->oImapClient->FolderUnselect();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @param resource $rMessageStream
-	 */
-	public function MessageAppendStream($rMessageStream, int $iMessageStreamSize, string $sFolderToSave, array $aAppendFlags = null, int &$iUid = null) : self
-	{
-		if (!\is_resource($rMessageStream) || !\strlen($sFolderToSave))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$this->oImapClient->MessageAppendStream(
-			$sFolderToSave, $rMessageStream, $iMessageStreamSize, $aAppendFlags, $iUid);
-
-		return $this;
-	}
-
-	public function MessageAppendFile(string $sMessageFileName, string $sFolderToSave, array $aAppendFlags = null, int &$iUid = null) : self
-	{
-		if (!\is_file($sMessageFileName) || !\is_readable($sMessageFileName))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\is_file($sMessageFileName) || !\is_readable($sMessageFileName)) {
+			throw new \ValueError;
 		}
 
 		$iMessageStreamSize = \filesize($sMessageFileName);
 		$rMessageStream = \fopen($sMessageFileName, 'rb');
 
-		$this->MessageAppendStream($rMessageStream, $iMessageStreamSize, $sFolderToSave, $aAppendFlags, $iUid);
+		$iUid = $this->oImapClient->MessageAppendStream($sFolderToSave, $rMessageStream, $iMessageStreamSize, $aAppendFlags);
 
-		if (\is_resource($rMessageStream))
-		{
-			fclose($rMessageStream);
-		}
+		\fclose($rMessageStream);
 
-		return $this;
-	}
-
-	protected function initFolderValues(string $sFolderName) : array
-	{
-		$aFolderStatus = $this->oImapClient->FolderStatus($sFolderName)->getStatusItems();
-
-		return [
-			\max(0, $aFolderStatus[FolderResponseStatus::MESSAGES] ?: 0),
-
-			\max(0, $aFolderStatus[FolderResponseStatus::UNSEEN] ?: 0),
-
-			\max(0, $aFolderStatus[FolderResponseStatus::UIDNEXT] ?: 0),
-
-			\max(0, $aFolderStatus[FolderResponseStatus::HIGHESTMODSEQ] ?: 0),
-
-			$aFolderStatus[FolderResponseStatus::APPENDLIMIT] ?: $this->oImapClient->AppendLimit(),
-
-			$aFolderStatus[FolderResponseStatus::MAILBOXID] ?: ''
-		];
-	}
-
-	public function GenerateImapClientHash() : string
-	{
-		return \md5('ImapClientHash/'.
-			$this->oImapClient->GetLogginedUser().'@'.
-			$this->oImapClient->GetConnectedHost().':'.
-			$this->oImapClient->GetConnectedPort()
-		);
-	}
-
-	public function GenerateFolderHash(string $sFolder, int $iCount, int $iUidNext, int $iHighestModSeq) : string
-	{
-		return \md5('FolderHash/'.$sFolder.'-'.$iCount.'-'.$iUidNext.'-'.
-			$iHighestModSeq.'-'.$this->GenerateImapClientHash().'-'.
-			\MailSo\Config::$MessageListPermanentFilter
-		);
+		return $iUid;
 	}
 
 	/**
 	 * Returns list of new messages since $iPrevUidNext
 	 * Currently only for INBOX
 	 */
-	private function getFolderNextMessageInformation(string $sFolderName, int $iPrevUidNext, int $iCurrentUidNext) : array
+	private function getFolderNextMessageInformation(string $sFolderName, int $iPrevUidNext, int $iCurrentUidNext): array
 	{
 		$aNewMessages = array();
 
-		if ($iPrevUidNext && $iPrevUidNext != $iCurrentUidNext && 'INBOX' === $sFolderName && \MailSo\Config::$CheckNewMessages)
-		{
+		if ($this->oImapClient->Settings->fetch_new_messages && $iPrevUidNext && $iPrevUidNext != $iCurrentUidNext && 'INBOX' === $sFolderName) {
 			$this->oImapClient->FolderExamine($sFolderName);
 
 			$aFetchResponse = $this->oImapClient->Fetch(array(
@@ -483,12 +314,10 @@ class MailClient
 				))
 			), $iPrevUidNext.':*', true);
 
-			foreach ($aFetchResponse as /* @var $oFetchResponse \MailSo\Imap\FetchResponse */ $oFetchResponse)
-			{
+			foreach ($aFetchResponse as $oFetchResponse) {
 				$aFlags = \array_map('strtolower', $oFetchResponse->GetFetchValue(FetchType::FLAGS));
 
-				if (!\in_array(\strtolower(MessageFlag::SEEN), $aFlags))
-				{
+				if (!\in_array(\strtolower(MessageFlag::SEEN), $aFlags)) {
 					$iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
 
 					$oHeaders = new \MailSo\Mime\HeaderCollection($oFetchResponse->GetHeaderFieldsValue());
@@ -500,10 +329,10 @@ class MailClient
 					}
 
 					$aNewMessages[] = array(
-						'Folder' => $sFolderName,
-						'Uid' => $iUid,
-						'Subject' => $oHeaders->ValueByName(MimeHeader::SUBJECT, !$sContentTypeCharset),
-						'From' => $oHeaders->GetAsEmailCollection(MimeHeader::FROM_, !$sContentTypeCharset)
+						'folder' => $sFolderName,
+						'uid' => $iUid,
+						'subject' => $oHeaders->ValueByName(MimeHeader::SUBJECT, !$sContentTypeCharset),
+						'from' => $oHeaders->GetAsEmailCollection(MimeHeader::FROM_)
 					);
 				}
 			}
@@ -513,379 +342,523 @@ class MailClient
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderInformation(string $sFolderName, int $iPrevUidNext = 0, SequenceSet $oRange = null) : array
+	public function FolderInformation(string $sFolderName, int $iPrevUidNext = 0, ?SequenceSet $oRange = null): array
 	{
-		$aFlags = array();
-
-		list($iCount, $iUnseenCount, $iUidNext, $iHighestModSeq, $iAppendLimit, $sMailboxId) = $this->initFolderValues($sFolderName);
-
-		if ($oRange && \count($oRange))
-		{
-			$this->oImapClient->FolderExamine($sFolderName);
-
-			$aFetchResponse = $this->oImapClient->Fetch(array(
-				FetchType::UID,
-				FetchType::FLAGS
-			), (string) $oRange, $oRange->UID);
-
-			foreach ($aFetchResponse as $oFetchResponse)
-			{
-				$iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
-				$aLowerFlags = \array_map('strtolower', $oFetchResponse->GetFetchValue(FetchType::FLAGS));
-				$aFlags[] = array(
-					'Uid' => $iUid,
-					'Flags' => $aLowerFlags
-				);
+		if ($oRange) {
+//			$aInfo = $this->oImapClient->FolderExamine($sFolderName)->jsonSerialize();
+			$aInfo = $this->oImapClient->FolderStatusAndSelect($sFolderName)->jsonSerialize();
+			$aInfo['messagesFlags'] = array();
+			if (\count($oRange)) {
+				$aFetchResponse = $this->oImapClient->Fetch(array(
+					FetchType::UID,
+					FetchType::FLAGS
+				), (string) $oRange, $oRange->UID);
+				foreach ($aFetchResponse as $oFetchResponse) {
+					$iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
+					$aLowerFlags = \array_map('mb_strtolower', \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $oFetchResponse->GetFetchValue(FetchType::FLAGS)));
+					$aInfo['messagesFlags'][] = array(
+						'uid' => $iUid,
+						'flags' => $aLowerFlags
+					);
+				}
 			}
+		} else {
+			$aInfo = $this->oImapClient->FolderStatus($sFolderName)->jsonSerialize();
 		}
 
-		return array(
-			'Folder' => $sFolderName,
-			'Hash' => $this->GenerateFolderHash($sFolderName, $iCount, $iUidNext, $iHighestModSeq),
-			'MessageCount' => $iCount,
-			'MessageUnseenCount' => $iUnseenCount,
-			'UidNext' => $iUidNext,
-			'MessagesFlags' => $aFlags,
-			'HighestModSeq' => $iHighestModSeq,
-			'AppendLimit' => $iAppendLimit,
-			'MailboxId' => $sMailboxId,
-			'NewMessages' => $this->getFolderNextMessageInformation($sFolderName, $iPrevUidNext, $iUidNext)
-		);
+		if ($iPrevUidNext) {
+			$aInfo['newMessages'] = $this->getFolderNextMessageInformation(
+				$sFolderName,
+				$iPrevUidNext,
+				\intval($aInfo['uidNext'])
+			);
+		}
+
+//		$aInfo['appendLimit'] = $aInfo['appendLimit'] ?: $this->oImapClient->AppendLimit();
+		return $aInfo;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function FolderHash(string $sFolderName) : string
+	public function FolderHash(string $sFolderName): string
 	{
-		list($iCount, $iUnseenCount, $iUidNext, $iHighestModSeq) = $this->initFolderValues($sFolderName);
+		try
+		{
+//			return $this->oImapClient->FolderStatusAndSelect($sFolderName)->etag;
+			return $this->oImapClient->FolderStatus($sFolderName)->etag;
+		}
+		catch (\Throwable $oException)
+		{
+			\SnappyMail\Log::warning('IMAP', "FolderHash({$sFolderName}) Exception: {$oException->getMessage()}");
+		}
+		return '';
+	}
 
-		return $this->GenerateFolderHash($sFolderName, $iCount, $iUidNext, $iHighestModSeq);
+	public function MessageThread(string $sFolderName, string $sMessageID): MessageCollection
+	{
+		$this->oImapClient->FolderExamine($sFolderName);
+
+		$sMessageID = \MailSo\Imap\SearchCriterias::escapeSearchString($this->oImapClient, $sMessageID);
+		$sSearch = "OR HEADER Message-ID {$sMessageID} HEADER References {$sMessageID}";
+		$aResult = [];
+		try
+		{
+			foreach ($this->oImapClient->MessageThread($sSearch) as $mItem) {
+				// Flatten to single level
+				\array_walk_recursive($mItem, fn($a) => $aResult[] = $a);
+			}
+		}
+		catch (\MailSo\RuntimeException $oException)
+		{
+			\SnappyMail\Log::warning('MailClient', 'MessageThread ' . $oException->getMessage());
+			unset($oException);
+		}
+//		$this->logWrite('MessageThreadList: '.\print_r($threads, 1));
+		return $aResult;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageListThreadsMap(string $sFolderName, string $sFolderHash, ?\MailSo\Cache\CacheClient $oCacher) : array
+	protected function ThreadsMap(string $sAlgorithm, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false): array
 	{
-		$sSearchHash = '';
-		if (0 < \MailSo\Config::$MessageListDateFilter)
-		{
-			$iD = \time() - 3600 * 24 * 30 * \MailSo\Config::$MessageListDateFilter;
-			$iTimeFilter = \gmmktime(1, 1, 1, \gmdate('n', $iD), 1, \gmdate('Y', $iD));
+		$oFolderInfo = $oMessageCollection->FolderInfo;
+		$sFolderName = $oFolderInfo->FullName;
 
-			$sSearchHash .= ' SINCE '.\gmdate('j-M-Y', $iTimeFilter);
+		$sSearch = 'ALL';
+//		$sSearch = 'UNDELETED';
+/*
+		$iThreadLimit = $this->oImapClient->Settings->thread_limit;
+		if ($iThreadLimit && $iThreadLimit < $oFolderInfo->MESSAGES) {
+			$sSearch = ($oFolderInfo->MESSAGES - $iThreadLimit) . ':*';
 		}
-
-		if ('' === \trim($sSearchHash))
-		{
-			$sSearchHash = 'ALL';
+*/
+/*
+		$sAlgorithm = '';
+		if ($this->oImapClient->hasCapability('THREAD=REFS')) {
+			$sAlgorithm = 'REFS';
+		} else if ($this->oImapClient->hasCapability('THREAD=REFERENCES')) {
+			$sAlgorithm = 'REFERENCES';
+		} else if ($this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT')) {
+			$sAlgorithm = 'ORDEREDSUBJECT';
 		}
-
-		if ($oCacher && $oCacher->IsInited())
-		{
-			$sSerializedHashKey =
-				'ThreadsMapSorted/'.$sSearchHash.'/'.$sFolderName.'/'.$sFolderHash;
-
-			if ($this->oLogger)
-			{
-				$this->oLogger->Write($sSerializedHashKey);
-			}
+*/
+		$sSerializedHashKey = null;
+		if ($oCacher && $oCacher->IsInited()) {
+			$sSerializedHashKey = "ThreadsMap/{$sAlgorithm}/{$sSearch}/{$oFolderInfo->etag}";
+//			$sSerializedHashKey = "ThreadsMap/{$sAlgorithm}/{$sSearch}/{$iThreadLimit}/{$oFolderInfo->etag}";
 
 			$sSerializedUids = $oCacher->Get($sSerializedHashKey);
-			if (!empty($sSerializedUids))
-			{
+			if (!empty($sSerializedUids)) {
 				$aSerializedUids = \json_decode($sSerializedUids, true);
-				if (isset($aSerializedUids['ThreadsUids']) && \is_array($aSerializedUids['ThreadsUids']))
-				{
-					if ($this->oLogger)
-					{
-						$this->oLogger->Write('Get Serialized Thread UIDS from cache ("'.$sFolderName.'" / '.$sSearchHash.') [count:'.\count($aSerializedUids['ThreadsUids']).']');
-					}
+				if (isset($aSerializedUids['ThreadsUids']) && \is_array($aSerializedUids['ThreadsUids'])) {
+					$oMessageCollection->totalThreads = \count($aSerializedUids['ThreadsUids']);
+					$this->logWrite('Get Threads from cache ("'.$sFolderName.'" / '.$sSearch.') [count:'.\count($aSerializedUids['ThreadsUids']).']');
+					return $aSerializedUids['ThreadsUids'];
+				}
+			}
+/*
+			// Idea to fetch all UID's in background
+			else if (!$bBackground) {
+				$this->logWrite('Set ThreadsMap() as background task ("'.$sFolderName.'" / '.$sSearch.')');
+				\SnappyMail\Shutdown::add(function($oMailClient, $oFolderInfo, $oCacher) {
+					$oFolderInfo->MESSAGES = 0;
+					$oMailClient->ThreadsMap($sAlgorithm, $oMessageCollection, $oCacher, true);
+				}, [$this, $oFolderInfo, $oCacher]);
+				return [];
+			}
+*/
+		}
 
+		$this->oImapClient->FolderExamine($sFolderName);
+
+		$aResult = array();
+		try
+		{
+			foreach ($this->oImapClient->MessageThread($sSearch, $sAlgorithm) as $mItem) {
+				// Flatten to single level
+				$aMap = [];
+				\array_walk_recursive($mItem, function($a) use (&$aMap) { $aMap[] = $a; });
+				$aResult[] = $aMap;
+			}
+		}
+		catch (\MailSo\RuntimeException $oException)
+		{
+			\SnappyMail\Log::warning('MailClient', 'ThreadsMap ' . $oException->getMessage());
+			unset($oException);
+		}
+
+		if ($sSerializedHashKey) {
+			$oCacher->Set($sSerializedHashKey, \json_encode(array('ThreadsUids' => $aResult)));
+			$this->logWrite('Save Threads to cache ("'.$sFolderName.'" / '.$sSearch.') [count:'.\count($aResult).']');
+		}
+
+		$oMessageCollection->totalThreads = \count($aResult);
+		return $aResult;
+	}
+
+	// All threads UID's except the most recent UID of each thread
+	protected function ThreadsOldUids(array $aAllThreads, MessageCollection $oMessageCollection, ?\MailSo\Cache\CacheClient $oCacher, bool $bBackground = false): array
+	{
+		$oFolderInfo = $oMessageCollection->FolderInfo;
+
+		$bThreadSort = $this->bThreadSort && $this->oImapClient->hasCapability('SORT');
+
+		$sSerializedHashKey = null;
+		if ($oCacher && $oCacher->IsInited()) {
+			$sSerializedHashKey = "ThreadsOldUids/{$oFolderInfo->etag}/" . ($bThreadSort ? 'S' : 'N');
+			$sSerializedUids = $oCacher->Get($sSerializedHashKey);
+			if (!empty($sSerializedUids)) {
+				$aSerializedUids = \json_decode($sSerializedUids, true);
+				if (isset($aSerializedUids['ThreadsUids']) && \is_array($aSerializedUids['ThreadsUids'])) {
+					$this->logWrite('Get old Threads UIDs from cache ("'.$oFolderInfo->FullName.'") [count:'.\count($aSerializedUids['ThreadsUids']).']');
 					return $aSerializedUids['ThreadsUids'];
 				}
 			}
 		}
 
-		$this->oImapClient->FolderExamine($sFolderName);
+		$aUids = [];
 
-		$aThreadUids = array();
-		try
-		{
-			$aThreadUids = $this->oImapClient->MessageSimpleThread($sSearchHash);
-		}
-		catch (\MailSo\Imap\Exceptions\RuntimeException $oException)
-		{
-			\SnappyMail\Log::warning('MessageListThreadsMap ' . $oException->getMessage());
-			unset($oException);
-		}
-
-		// Flatten to single levels
-		$aResult = array();
-		foreach ($aThreadUids as $mItem) {
-			$aMap = [];
-			\array_walk_recursive($mItem, function($a) use (&$aMap) { $aMap[] = $a; });
-			$aResult[] = $aMap;
-		}
-
-		if ($oCacher && $oCacher->IsInited() && !empty($sSerializedHashKey))
-		{
-			$oCacher->Set($sSerializedHashKey, \json_encode(array(
-				'ThreadsUids' => $aResult
-			)));
-
-			if ($this->oLogger)
-			{
-				$this->oLogger->Write('Save Serialized Thread UIDS to cache ("'.$sFolderName.'" / '.$sSearchHash.') [count:'.\count($aResult).']');
+		if ($bThreadSort) {
+			$oParams = new MessageListParams;
+			$oParams->sFolderName = $oFolderInfo->FullName;
+			$oParams->sSort = 'DATE';
+			$oParams->bUseSort = true;
+			$oParams->bHideDeleted = false;
+			foreach ($aAllThreads as $aThreadUIDs) {
+				$oParams->oSequenceSet = new \MailSo\Imap\SequenceSet($aThreadUIDs);
+				$aThreadUIDs = $this->GetUids($oParams, $oFolderInfo);
+				if ($aThreadUIDs) {
+					// Remove the most recent UID
+					\array_pop($aThreadUIDs);
+					$aUids = \array_merge($aUids, $aThreadUIDs);
+				}
+			}
+/*
+			// Idea to use one SORT for all threads instead of per thread
+			$aSortUids = \array_reduce($aAllThreads, 'array_merge', []);
+			$oParams->oSequenceSet = new \MailSo\Imap\SequenceSet($aSortUids);
+			$aSortUids = $this->GetUids($oParams, $oFolderInfo);
+			if ($aSortUids) {
+				foreach ($aAllThreads as $aThreadUIDs) {
+					$aThreadUIDs = \array_intersect($aSortUids, $aThreadUIDs);
+					// Remove the most recent UID
+					\array_pop($aThreadUIDs);
+					$aUids = \array_merge($aUids, $aThreadUIDs);
+				}
+			}
+*/
+		} else {
+			// Not the best solution to remove the most recent UID,
+			// as older messages could have a higher UID
+			foreach ($aAllThreads as $aThreadUIDs) {
+				unset($aThreadUIDs[\array_search(\max($aThreadUIDs), $aThreadUIDs)]);
+				$aUids = \array_merge($aUids, $aThreadUIDs);
 			}
 		}
 
-		return $aResult;
+		if ($sSerializedHashKey) {
+			$oCacher->Set($sSerializedHashKey, \json_encode(array('ThreadsUids' => $aUids)));
+			$this->logWrite('Save old Threads UIDs to cache ("'.$oFolderInfo->FullName.'") [count:'.\count($aUids).']');
+		}
+
+		return $aUids;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	protected function MessageListByRequestIndexOrUids(MessageCollection $oMessageCollection, SequenceSet $oRange) : void
+	protected function MessageListByRequestIndexOrUids(MessageCollection $oMessageCollection, SequenceSet $oRange,
+		array &$aAllThreads = [], array &$aUnseenUIDs = []): void
 	{
-		if (\count($oRange))
-		{
-			$aFetchResponse = $this->oImapClient->Fetch(array(
+		if (\count($oRange)) {
+			$aFetchItems = array(
 				FetchType::UID,
 				FetchType::RFC822_SIZE,
 				FetchType::INTERNALDATE,
 				FetchType::FLAGS,
-				FetchType::BODYSTRUCTURE,
-				$this->getEnvelopeOrHeadersRequestString()
-			), (string) $oRange, $oRange->UID);
-
-			if (\count($aFetchResponse))
-			{
-				$aCollection = \array_fill_keys($oRange->getArrayCopy(), null);
-				foreach ($aFetchResponse as /* @var $oFetchResponseItem \MailSo\Imap\FetchResponse */ $oFetchResponseItem) {
-					$id = $oRange->UID
-						? $oFetchResponseItem->GetFetchValue(FetchType::UID)
-						: $this->oImapResponse->ResponseList[1];
-					$aCollection[$id] = Message::NewFetchResponseInstance($oMessageCollection->FolderName, $oFetchResponseItem);
-				}
-				$oMessageCollection->exchangeArray(\array_values(\array_filter($aCollection)));
+				FetchType::BODYSTRUCTURE
+			);
+			if ($this->oImapClient->hasCapability('PREVIEW')) {
+				$aFetchItems[] = FetchType::PREVIEW; // . ' (LAZY)';
 			}
+			$aFetchItems[] = $this->getEnvelopeOrHeadersRequestString();
+			$aFetchIterator = $this->oImapClient->FetchIterate($aFetchItems, (string) $oRange, $oRange->UID);
+			// FETCH does not respond in the id order of the SequenceSet, so we prefill $aCollection for the right sort order.
+			$aCollection = \array_fill_keys($oRange->getArrayCopy(), null);
+			foreach ($aFetchIterator as $oFetchResponse) {
+				$id = $oRange->UID
+					? $oFetchResponse->GetFetchValue(FetchType::UID)
+					: $oFetchResponse->oImapResponse->ResponseList[1];
+				$oMessage = Message::fromFetchResponse($oMessageCollection->FolderName, $oFetchResponse);
+				if ($oMessage) {
+					if ($aAllThreads) {
+						$iUid = $oMessage->Uid;
+						// Find thread and set it.
+						// Used by GUI to delete/move the whole thread or other features
+						foreach ($aAllThreads as $aMap) {
+							if (\in_array($iUid, $aMap)) {
+								$oMessage->SetThreads($aMap);
+								$oMessage->SetThreadUnseen(\array_values(\array_intersect($aUnseenUIDs, $aMap)));
+								break;
+							}
+						}
+					}
+					$aCollection[$id] = $oMessage;
+				}
+			}
+			$oMessageCollection->exchangeArray(\array_values(\array_filter($aCollection)));
 		}
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function IsThreadsSupported() : bool
+	private function GetUids(MessageListParams $oParams, FolderInformation $oInfo, bool $onlyCache = false): ?array
 	{
-		return $this->oImapClient->IsSupported('THREAD=REFS') ||
-			$this->oImapClient->IsSupported('THREAD=REFERENCES') ||
-			$this->oImapClient->IsSupported('THREAD=ORDEREDSUBJECT');
-	}
+		$oCacher = $oParams->oCacher;
+		$sFolderName = $oParams->sFolderName;
 
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
-	 */
-	public function GetUids(?\MailSo\Cache\CacheClient $oCacher, string $sSearch,
-		string $sFolderName, string $sFolderHash,
-		bool $bUseSortIfSupported = false, string $sSort = '') : array
-	{
-		/* TODO: Validate $sSort
-			ARRIVAL
-				Internal date and time of the message.  This differs from the
-				ON criteria in SEARCH, which uses just the internal date.
+		$bUseSort = $oParams->bUseSort && $this->oImapClient->hasCapability('SORT');
+		$aSortTypes = [];
+		if ($bUseSort) {
+			if ($oParams->sSort) {
+				// TODO: $oParams->sortValid($this->oImapClient);
+				$aSortTypes[] = $oParams->sSort;
+			}
+			if (!\str_contains($oParams->sSort, 'DATE')) {
+				// Always also sort DATE descending when DATE is not defined
+				$aSortTypes[] = 'REVERSE DATE';
+			}
+		}
+		$oParams->sSort = \implode(' ', $aSortTypes);
 
-			CC
-				[IMAP] addr-mailbox of the first "cc" address.
+		$bUseCache = $oCacher && $oCacher->IsInited();
+		$oSearchCriterias = \MailSo\Imap\SearchCriterias::fromString(
+			$this->oImapClient,
+			$sFolderName,
+			$oParams->sSearch,
+			$oParams->bHideDeleted,
+			$bUseCache
+		);
+		// Disable? as there are many cases that change the result
+//		$bUseCache = false;
 
-			DATE
-				Sent date and time, as described in section 2.2.
-
-			FROM
-				[IMAP] addr-mailbox of the first "From" address.
-
-			REVERSE
-				Followed by another sort criterion, has the effect of that
-				criterion but in reverse (descending) order.
-				Note: REVERSE only reverses a single criterion, and does not
-				affect the implicit "sequence number" sort criterion if all
-				other criteria are identical.  Consequently, a sort of
-				REVERSE SUBJECT is not the same as a reverse ordering of a
-				SUBJECT sort.  This can be avoided by use of additional
-				criteria, e.g., SUBJECT DATE vs. REVERSE SUBJECT REVERSE
-				DATE.  In general, however, it's better (and faster, if the
-				client has a "reverse current ordering" command) to reverse
-				the results in the client instead of issuing a new SORT.
-
-			SIZE
-				Size of the message in octets.
-
-			SUBJECT
-				Base subject text.
-
-			TO
-				[IMAP] addr-mailbox of the first "To" address.
-
-			RFC 5957:
-				$this->oImapClient->IsSupported('SORT=DISPLAY')
-				DISPLAYFROM, DISPLAYTO
-		 */
-
-		$aResultUids = false;
-		$bUidsFromCacher = false;
-		$bUseCacheAfterSearch = true;
+		$bReturnUid = true;
+		if ($oParams->oSequenceSet) {
+			$bReturnUid = $oParams->oSequenceSet->UID;
+			$oSearchCriterias->prepend(($bReturnUid ? 'UID ' : '') . $oParams->oSequenceSet);
+		}
 
+/*
+		$oSearchCriterias->fuzzy = $oParams->bSearchFuzzy && $this->oImapClient->hasCapability('SEARCH=FUZZY');
+*/
 		$sSerializedHash = '';
 		$sSerializedLog = '';
-
-		$bUseSortIfSupported = $bUseSortIfSupported && !\strlen($sSearch) && $this->oImapClient->IsSupported('SORT');
-
-		$sSearchCriterias = \MailSo\Imap\SearchCriterias::fromString($this->oImapClient, $sFolderName, $sSearch, $bUseCacheAfterSearch);
-		if ($bUseCacheAfterSearch && $oCacher && $oCacher->IsInited())
-		{
-			$sSerializedHash = 'GetUids/'.
-				($bUseSortIfSupported ? 'S' . $sSort : 'N').'/'.
-				$this->GenerateImapClientHash().'/'.
-				$sFolderName.'/'.$sSearchCriterias;
-			$sSerializedLog = '"'.$sFolderName.'" / '.$sSearchCriterias.'';
-
-//			$sSerialized = $oCacher->Get($sSerializedHash);
-			if (!empty($sSerialized))
-			{
+		if ($bUseCache && $oInfo->etag) {
+			$sSerializedHash = 'Get'
+				. ($bReturnUid ? 'UIDS/' : 'IDS/')
+				. "{$oParams->sSort}/{$this->oImapClient->Hash()}/{$sFolderName}/{$oSearchCriterias}";
+			$sSerializedLog = "\"{$sFolderName}\" / {$oParams->sSort} / {$oSearchCriterias}";
+			$sSerialized = $oCacher->Get($sSerializedHash);
+			if (!empty($sSerialized)) {
 				$aSerialized = \json_decode($sSerialized, true);
-				if (\is_array($aSerialized) && isset($aSerialized['FolderHash'], $aSerialized['Uids']) &&
-					$sFolderHash === $aSerialized['FolderHash'] &&
-					\is_array($aSerialized['Uids'])
-				)
-				{
-					if ($this->oLogger)
-					{
-						$this->oLogger->Write('Get Serialized UIDS from cache ('.$sSerializedLog.') [count:'.\count($aSerialized['Uids']).']');
-					}
-
-					$aResultUids = $aSerialized['Uids'];
-					$bUidsFromCacher = true;
+				if (\is_array($aSerialized)
+				 && isset($aSerialized['FolderHash'], $aSerialized['Uids'])
+				 && $oInfo->etag === $aSerialized['FolderHash']
+				 && \is_array($aSerialized['Uids'])
+				) {
+					$this->logWrite('Get Serialized '.($bReturnUid?'UIDS':'IDS').' from cache ('.$sSerializedLog.') [count:'.\count($aSerialized['Uids']).']');
+					return $aSerialized['Uids'];
 				}
 			}
 		}
-
-		if (!\is_array($aResultUids))
-		{
-			if ($bUseSortIfSupported) {
-//				$this->oImapClient->IsSupported('ESORT')
-//				$aResultUids = $this->oImapClient->MessageSimpleESort(array($sSort ?: 'REVERSE DATE'), $sSearchCriterias)['ALL'];
-				$aResultUids = $this->oImapClient->MessageSimpleSort(array($sSort ?: 'REVERSE DATE'), $sSearchCriterias);
-			} else {
-//				$this->oImapClient->IsSupported('ESEARCH')
-//				$aResultUids = $this->oImapClient->MessageSimpleESearch($sSearchCriterias, null, true, \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? '' : 'UTF-8')
-				$aResultUids = $this->oImapClient->MessageSimpleSearch($sSearchCriterias,        true, \MailSo\Base\Utils::IsAscii($sSearchCriterias) ? '' : 'UTF-8');
-			}
-
-			if (!$bUidsFromCacher && $bUseCacheAfterSearch && \is_array($aResultUids) && $oCacher && $oCacher->IsInited() && \strlen($sSerializedHash))
-			{
-				$oCacher->Set($sSerializedHash, \json_encode(array(
-					'FolderHash' => $sFolderHash,
-					'Uids' => $aResultUids
-				)));
-
-				if ($this->oLogger)
-				{
-					$this->oLogger->Write('Save Serialized UIDS to cache ('.$sSerializedLog.') [count:'.\count($aResultUids).']');
-				}
-			}
+		if ($onlyCache) {
+			return null;
 		}
 
-		return \is_array($aResultUids) ? $aResultUids : array();
+		$this->oImapClient->FolderExamine($sFolderName);
+
+		$aResultUids = [];
+		if ($bUseSort) {
+//			$this->oImapClient->hasCapability('ESORT')
+//			$aResultUids = $this->oImapClient->MessageESort($aSortTypes, $oSearchCriterias)['ALL'];
+			$aResultUids = $this->oImapClient->MessageSort($aSortTypes, $oSearchCriterias, $bReturnUid);
+		} else {
+//			$this->oImapClient->hasCapability('ESEARCH')
+//			$aResultUids = $this->oImapClient->MessageESearch($oSearchCriterias, null, $bReturnUid)
+			$aResultUids = $this->oImapClient->MessageSearch($oSearchCriterias,        $bReturnUid);
+		}
+
+		if ($bUseCache) {
+			$oCacher->Set($sSerializedHash, \json_encode(array(
+				'FolderHash' => $oInfo->etag,
+				'Uids' => $aResultUids
+			)));
+
+			$this->logWrite('Save Serialized '.($bReturnUid?'UIDS':'IDS').' to cache ('.$sSerializedLog.') [count:'.\count($aResultUids).']');
+		}
+
+//		$oSequenceSet = new SequenceSet($aResultUids, false);
+//		$oSequenceSet->UID = $bReturnUid;
+//		return $oSequenceSet;
+
+		return $aResultUids;
+	}
+
+	public function MessageListUnseen(MessageListParams $oParams, FolderInformation $oInfo): array
+	{
+		$oUnseenParams = new MessageListParams;
+		$oUnseenParams->sFolderName = $oParams->sFolderName;
+		$oUnseenParams->sSearch = 'unseen';
+//		$oUnseenParams->sSort = $oParams->sSort;
+		$oUnseenParams->oCacher = $oParams->oCacher;
+		$oUnseenParams->bUseSort = false; // $oParams->bUseSort
+		$oUnseenParams->bUseThreads = false; // $oParams->bUseThreads;
+		$oUnseenParams->bHideDeleted = $oParams->bHideDeleted;
+//		$oUnseenParams->iOffset = $oParams->iOffset;
+//		$oUnseenParams->iLimit = $oParams->iLimit;
+//		$oUnseenParams->iPrevUidNext = $oParams->iPrevUidNext;
+//		$oUnseenParams->iThreadUid = $oParams->iThreadUid;
+		return $this->GetUids($oUnseenParams, $oInfo);
 	}
 
 	/**
 	 * Runs SORT/SEARCH when $sSearch is provided
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Imap\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Imap\Exceptions\*
 	 */
-	public function MessageList(MessageListParams $oParams) : MessageCollection
+	public function MessageList(MessageListParams $oParams): MessageCollection
 	{
-		if (!\MailSo\Base\Validator::RangeInt($oParams->iOffset, 0) ||
-			!\MailSo\Base\Validator::RangeInt($oParams->iLimit, 0, 999))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (0 > $oParams->iOffset || 0 > $oParams->iLimit) {
+			throw new \ValueError;
+		}
+		if (10 > $oParams->iLimit) {
+			$oParams->iLimit = 10;
+		} else if (999 < $oParams->iLimit) {
+			$oParams->iLimit = 50;
 		}
 
 		$sSearch = \trim($oParams->sSearch);
 
-		list($iMessageRealCount, $iMessageUnseenCount, $iUidNext, $iHighestModSeq) = $this->initFolderValues($oParams->sFolderName);
-
-		$this->oImapClient->FolderExamine($oParams->sFolderName);
-
 		$oMessageCollection = new MessageCollection;
 		$oMessageCollection->FolderName = $oParams->sFolderName;
 		$oMessageCollection->Offset = $oParams->iOffset;
 		$oMessageCollection->Limit = $oParams->iLimit;
 		$oMessageCollection->Search = $sSearch;
 		$oMessageCollection->ThreadUid = $oParams->iThreadUid;
-		$oMessageCollection->Filtered = '' !== \MailSo\Config::$MessageListPermanentFilter;
+//		$oMessageCollection->Filtered = '' !== $this->oImapClient->Settings->search_filter;
 
-		$aUids = array();
-		$aAllThreads = [];
+		$oInfo = $this->oImapClient->FolderStatusAndSelect($oParams->sFolderName);
+		$oMessageCollection->FolderInfo = $oInfo;
+		$oMessageCollection->totalEmails = $oInfo->MESSAGES;
 
-		$bUseSortIfSupported = $oParams->bUseSortIfSupported && $this->oImapClient->IsSupported('SORT');
-
-		$bUseThreads = $oParams->bUseThreads ?
-			($this->oImapClient->IsSupported('THREAD=REFS') || $this->oImapClient->IsSupported('THREAD=REFERENCES') || $this->oImapClient->IsSupported('THREAD=ORDEREDSUBJECT')) : false;
-
-		if ($oParams->iThreadUid && !$bUseThreads)
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException('THREAD not supported');
+		$oParams->bUseThreads = $oParams->bUseThreads && $this->oImapClient->CapabilityValue('THREAD');
+//			&& ($this->oImapClient->hasCapability('THREAD=REFS') || $this->oImapClient->hasCapability('THREAD=REFERENCES') || $this->oImapClient->hasCapability('THREAD=ORDEREDSUBJECT'));
+		if ($oParams->iThreadUid && !$oParams->bUseThreads) {
+			throw new \ValueError('THREAD not supported');
 		}
 
-		if (!$oParams->oCacher || !($oParams->oCacher instanceof \MailSo\Cache\CacheClient))
-		{
-			$oParams->oCacher = null;
+		if (!$oInfo->MESSAGES || $oParams->iOffset > $oInfo->MESSAGES) {
+			return $oMessageCollection;
 		}
 
-		$oMessageCollection->FolderHash = $this->GenerateFolderHash(
-			$oParams->sFolderName, $iMessageRealCount, $iUidNext, $iHighestModSeq);
-
-		$oMessageCollection->UidNext = $iUidNext;
-
-		if (!$oParams->iThreadUid)
-		{
+		if (!$oParams->iThreadUid) {
 			$oMessageCollection->NewMessages = $this->getFolderNextMessageInformation(
-				$oParams->sFolderName, $oParams->iPrevUidNext, $iUidNext);
+				$oParams->sFolderName, $oParams->iPrevUidNext, $oInfo->UIDNEXT
+			);
 		}
 
-		$bSearch = false;
-		$bMessageListOptimization = 0 < \MailSo\Config::$MessageListCountLimitTrigger &&
-			\MailSo\Config::$MessageListCountLimitTrigger < $iMessageRealCount;
+		$bUseSort = ($oParams->bUseSort || $oParams->sSort) && $this->oImapClient->hasCapability('SORT');
+		$oParams->bUseSort = $bUseSort;
+		$oParams->sSearch = $sSearch;
 
-		if ($bMessageListOptimization)
-		{
-			$bUseSortIfSupported = false;
-			$bUseThreads = false;
+		$aAllThreads = [];
+		$aUnseenUIDs = [];
+		$aUids = null;
+
+		$message_list_limit = $this->oImapClient->Settings->message_list_limit;
+		if (100 > $message_list_limit || $message_list_limit > $oInfo->MESSAGES) {
+			$message_list_limit = 0;
 		}
 
-		if ($iMessageRealCount && !$bMessageListOptimization)
-		{
-			if ($bUseThreads) {
-				$aAllThreads = $this->MessageListThreadsMap($oMessageCollection->FolderName, $oMessageCollection->FolderHash, $oParams->oCacher);
-//				$iThreadLimit = \MailSo\Config::$LargeThreadLimit;
+		// Idea to fetch all UID's in background
+		$oAllParams = clone $oParams;
+		$oAllParams->sSearch = '';
+		$oAllParams->oSequenceSet = null;
+		if ($message_list_limit && !$oParams->iThreadUid && $oParams->oCacher && $oParams->oCacher->IsInited()) {
+			$aUids = $this->GetUids($oAllParams, $oInfo, true);
+			if (null !== $aUids) {
+				$message_list_limit = 0;
+				$oMessageCollection->Sort = $oAllParams->sSort;
+			} else {
+				\SnappyMail\Shutdown::add(function($oMailClient, $oAllParams, $oInfo, $oMessageCollection) {
+					$oMailClient->GetUids($oAllParams, $oInfo);
+					if ($oAllParams->bUseThreads) {
+						$oMailClient->ThreadsMap($oAllParams->sThreadAlgorithm, $oMessageCollection, $oAllParams->oCacher, true);
+					}
+				}, [$this, $oAllParams, $oInfo, $oMessageCollection]);
+			}
+		}
 
-				if ($oParams->iThreadUid)
-				{
-					$aUids = [$oParams->iThreadUid];
+		if ($message_list_limit && !$aUids) {
+//		if ($message_list_limit || (!$this->oImapClient->hasCapability('SORT') && !$this->oImapClient->CapabilityValue('THREAD'))) {
+			// Don't use THREAD for speed
+			$oMessageCollection->Limited = true;
+			$this->logWrite('List optimization (count: '.$oInfo->MESSAGES.', limit:'.$message_list_limit.')');
+			if (\strlen($sSearch)) {
+				// Don't use SORT for speed
+				$oParams->bUseSort = false;
+				$aUids = $this->GetUids($oParams, $oInfo);
+			} else {
+				if ($bUseSort) {
+					// Attempt to sort REVERSE DATE with a bigger range then $oParams->iLimit
+					$end = \min($oInfo->MESSAGES, \max(1, $oInfo->MESSAGES - $oParams->iOffset + $oParams->iLimit));
+					$start = \max(1, $end - ($oParams->iLimit * 3) + 1);
+					$oParams->oSequenceSet = new SequenceSet(\range($end, $start), false);
+					$aRequestIndexes = $this->GetUids($oParams, $oInfo);
+					// Attempt to get the correct $oParams->iLimit slice
+					$aRequestIndexes = \array_slice($aRequestIndexes, $oParams->iOffset ? $oParams->iLimit : 0, $oParams->iLimit);
+				} else {
+					// Fetch ID's from high to low
+					$end = \max(1, $oInfo->MESSAGES - $oParams->iOffset);
+					$start = \max(1, $end - $oParams->iLimit + 1);
+					$aRequestIndexes = \range($end, $start);
+				}
+				$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aRequestIndexes, false));
+			}
+			$oMessageCollection->Sort = $oParams->sSort;
+		} else {
+			if ($oParams->bUseThreads && $oParams->iThreadUid) {
+				$aUids = [$oParams->iThreadUid];
+			} else if (!$aUids) {
+				$aUids = $this->GetUids($oAllParams, $oInfo);
+				$oMessageCollection->Sort = $oAllParams->sSort;
+			}
+
+			if ($oParams->bUseThreads) {
+				$aAllThreads = $this->ThreadsMap($oParams->sThreadAlgorithm, $oMessageCollection, $oParams->oCacher);
+//				$iThreadLimit = $this->oImapClient->Settings->thread_limit;
+				if ($oParams->iThreadUid) {
 					// Only show the selected thread messages
 					foreach ($aAllThreads as $aMap) {
 						if (\in_array($oParams->iThreadUid, $aMap)) {
@@ -893,36 +866,29 @@ class MailClient
 							break;
 						}
 					}
-				}
-				else
-				{
-					$aUids = $this->GetUids($oParams->oCacher, '',
-						$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported, $oParams->sSort);
+					$aAllThreads = [$aUids];
+					// This only speeds up the search when not cached
+//					$oParams->oSequenceSet = new SequenceSet($aUids);
+				} else {
 					// Remove all threaded UID's except the most recent of each thread
-					foreach ($aAllThreads as $aMap) {
-						unset($aMap[\array_key_last($aMap)]);
-						$aUids = \array_diff($aUids, $aMap);
-					}
+					$aUids = \array_diff($aUids, $this->ThreadsOldUids($aAllThreads, $oMessageCollection, $oParams->oCacher));
+					// Get all unseen
+					$aUnseenUIDs = $this->MessageListUnseen($oParams, $oInfo);
 				}
-			} else {
-				$aUids = $this->GetUids($oParams->oCacher, '',
-					$oMessageCollection->FolderName, $oMessageCollection->FolderHash, $bUseSortIfSupported, $oParams->sSort);
 			}
 
-			if ($aUids && \strlen($sSearch))
-			{
-				$aSearchedUids = $this->GetUids($oParams->oCacher, $sSearch,
-					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
-				if ($bUseThreads && !$oParams->iThreadUid) {
-					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids, $aAllThreads) {
-						if (\in_array($iUid, $aSearchedUids)) {
-							return true;
-						}
-						foreach ($aAllThreads as $aMap) {
-							if (\in_array($iUid, $aMap) && \array_intersect($aSearchedUids, $aMap)) {
-								return true;
-							}
+			if ($aUids && \strlen($sSearch)) {
+				$oParams->bUseSort = false;
+				$aSearchedUids = $this->GetUids($oParams, $oInfo);
+				if ($oParams->bUseThreads && !$oParams->iThreadUid) {
+					$matchingThreadUids = [];
+					foreach ($aAllThreads as $aMap) {
+						if (\array_intersect($aSearchedUids, $aMap)) {
+							$matchingThreadUids = \array_merge($matchingThreadUids, $aMap);
 						}
+					}
+					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids, $matchingThreadUids) {
+						return \in_array($iUid, $aSearchedUids) || \in_array($iUid, $matchingThreadUids);
 					});
 				} else {
 					$aUids = \array_filter($aUids, function($iUid) use ($aSearchedUids) {
@@ -930,298 +896,146 @@ class MailClient
 					});
 				}
 			}
-
-			$oMessageCollection->MessageCount = $iMessageRealCount;
-			$oMessageCollection->MessageUnseenCount = $iMessageUnseenCount;
-			$oMessageCollection->MessageResultCount = \count($aUids);
-
-			if (\count($aUids))
-			{
-				$this->MessageListByRequestIndexOrUids(
-					$oMessageCollection,
-					new SequenceSet(\array_slice($aUids, $oParams->iOffset, $oParams->iLimit))
-				);
-			}
-		}
-		else if ($iMessageRealCount)
-		{
-			if ($this->oLogger)
-			{
-				$this->oLogger->Write('List optimization (count: '.$iMessageRealCount.
-					', limit:'.\MailSo\Config::$MessageListCountLimitTrigger.')');
-			}
-
-			$oMessageCollection->MessageCount = $iMessageRealCount;
-			$oMessageCollection->MessageUnseenCount = $iMessageUnseenCount;
-
-			if (\strlen($sSearch))
-			{
-				$aUids = $this->GetUids($oParams->oCacher, $sSearch,
-					$oMessageCollection->FolderName, $oMessageCollection->FolderHash);
-
-				$oMessageCollection->MessageResultCount = \count($aUids);
-				if ($oMessageCollection->MessageResultCount)
-				{
-					$this->MessageListByRequestIndexOrUids(
-						$oMessageCollection,
-						new SequenceSet(\array_slice($aUids, $oParams->iOffset, $oParams->iLimit))
-					);
-				}
-			}
-			else
-			{
-				$oMessageCollection->MessageResultCount = $iMessageRealCount;
-
-				if (1 < $iMessageRealCount)
-				{
-					$aRequestIndexes = \array_slice(\array_reverse(\range(1, $iMessageRealCount)), $oParams->iOffset, $oParams->iLimit);
-				}
-				else
-				{
-					$aRequestIndexes = \array_slice(array(1), $oParams->iOffset, $oParams->iLimit);
-				}
-
-				$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aRequestIndexes, false));
-			}
 		}
 
-		if ($aAllThreads && !$oParams->iThreadUid)
-		{
-			foreach ($oMessageCollection as $oMessage) {
-				$iUid = $oMessage->Uid();
-				// Find thread and set it.
-				// Used by GUI to delete/move the whole thread or other features
-				foreach ($aAllThreads as $aMap) {
-					if (\in_array($iUid, $aMap)) {
-						$oMessage->SetThreads($aMap);
-						break;
-					}
-				}
+		if (\is_array($aUids)) {
+			$oMessageCollection->totalEmails = \count($aUids);
+			if ($oMessageCollection->totalEmails) {
+				$aUids = \array_slice($aUids, $oParams->iOffset, $oParams->iLimit);
+				$this->MessageListByRequestIndexOrUids($oMessageCollection, new SequenceSet($aUids), $aAllThreads, $aUnseenUIDs);
 			}
 		}
 
 		return $oMessageCollection;
 	}
 
-	public function Quota(string $sRootName = '') : ?array
+	public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId): ?int
 	{
-		return $this->oImapClient->Quota($sRootName);
-	}
-
-	public function QuotaRoot(string $sFolderName = 'INBOX') : ?array
-	{
-		return $this->oImapClient->QuotaRoot($sFolderName);
-	}
-
-	public function FindMessageUidByMessageId(string $sFolderName, string $sMessageId) : ?int
-	{
-		if (!\strlen($sMessageId))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\strlen($sMessageId)) {
+			throw new \ValueError;
 		}
 
 		$this->oImapClient->FolderExamine($sFolderName);
 
-		$aUids = $this->oImapClient->MessageSimpleSearch(
-			'HEADER Message-ID '.$sMessageId, true);
+		$aUids = $this->oImapClient->MessageSearch('HEADER Message-ID '.$sMessageId);
 
 		return 1 === \count($aUids) && \is_numeric($aUids[0]) ? (int) $aUids[0] : null;
 	}
 
-	public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus, int $iOptimizationLimit, bool $bUseListStatus) : ?FolderCollection
+	public function Folders(string $sParent, string $sListPattern, bool $bUseListSubscribeStatus): ?FolderCollection
 	{
-		$aImapSubscribedFoldersHelper = null;
-		if ($this->oImapClient->IsSupported('LIST-EXTENDED')) {
-			$bUseListSubscribeStatus = false;
-		} else if ($bUseListSubscribeStatus) {
-			//\SnappyMail\Log::warning('IMAP', 'RFC5258 not supported, using LSUB');
+		$oFolderCollection = $this->oImapClient->FolderStatusList($sParent, $sListPattern);
+		if (!$oFolderCollection->count()) {
+			return null;
+		}
+
+		if ($bUseListSubscribeStatus && !$this->oImapClient->hasCapability('LIST-EXTENDED')) {
+//			$this->logWrite('RFC5258 not supported, using LSUB');
+//			\SnappyMail\Log::warning('IMAP', 'RFC5258 not supported, using LSUB');
 			try
 			{
-				$aSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern);
-				$aImapSubscribedFoldersHelper = array();
-				foreach ($aSubscribedFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder)
-				{
-					$aImapSubscribedFoldersHelper[] = $oImapFolder->FullName();
+				$oSubscribedFolders = $this->oImapClient->FolderSubscribeList($sParent, $sListPattern);
+				foreach ($oSubscribedFolders as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
+					isset($oFolderCollection[$oImapFolder->FullName])
+					&& $oFolderCollection[$oImapFolder->FullName]->setSubscribed();
 				}
 			}
 			catch (\Throwable $oException)
 			{
 				\SnappyMail\Log::error('IMAP', 'FolderSubscribeList: ' . $oException->getMessage());
-			}
-		}
-
-		$aFolders = $bUseListStatus
-			? $this->oImapClient->FolderStatusList($sParent, $sListPattern)
-			: $this->oImapClient->FolderList($sParent, $sListPattern);
-		if (!$aFolders) {
-			return null;
-		}
-
-		$oFolderCollection = new FolderCollection;
-		$oFolderCollection->Optimized = 10 < $iOptimizationLimit && \count($aFolders) > $iOptimizationLimit;
-
-		$sINBOX = 'INBOX';
-		foreach ($aFolders as $sFullName => /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
-			$oMailFolder = new Folder($oImapFolder,
-				($bUseListSubscribeStatus && (null === $aImapSubscribedFoldersHelper || \in_array($sFullName, $aImapSubscribedFoldersHelper)))
-				|| $oImapFolder->IsInbox()
-			);
-			if ($oImapFolder->IsInbox()) {
-				$sINBOX = $sFullName;
-			}
-			$aFolders[$sFullName] = $oMailFolder;
-
-			// Add NonExistent folders
-			$sDelimiter = $oMailFolder->Delimiter();
-			$aFolderExplode = \explode($sDelimiter, $sFullName);
-			\array_pop($aFolderExplode);
-			while ($aFolderExplode) {
-				$sNonExistentFolderFullName = \implode($sDelimiter, $aFolderExplode);
-				if (!isset($aFolders[$sNonExistentFolderFullName])) {
-					try
-					{
-						$aFolders[$sNonExistentFolderFullName] =
-							Folder::NewNonExistentInstance($sNonExistentFolderFullName, $sDelimiter);
-					}
-					catch (\Throwable $oExc)
-					{
-						unset($oExc);
-					}
+				foreach ($oFolderCollection as /* @var $oImapFolder \MailSo\Imap\Folder */ $oImapFolder) {
+					$oImapFolder->setSubscribed();
 				}
-				\array_pop($aFolderExplode);
 			}
 		}
 
-		$oFolderCollection->exchangeArray(\array_values($aFolders));
-
-		$oFolderCollection->TotalCount = \count($aFolders);
-
 		return $oFolderCollection;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \ValueError
 	 */
-	public function FolderCreate(string $sFolderNameInUtf8, string $sFolderParentFullName = '', bool $bSubscribeOnCreation = true, string $sDelimiter = '') : ?Folder
+	public function FolderCreate(string $sFolderNameInUtf8, string $sFolderParentFullName = '', bool $bSubscribeOnCreation = true, string $sDelimiter = ''): ?\MailSo\Imap\Folder
 	{
 		$sFolderNameInUtf8 = \trim($sFolderNameInUtf8);
 		$sFolderParentFullName = \trim($sFolderParentFullName);
 
-		if (!\strlen($sFolderNameInUtf8))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\strlen($sFolderNameInUtf8)) {
+			throw new \ValueError;
 		}
 
-		if (!\strlen($sDelimiter) || \strlen($sFolderParentFullName))
-		{
+		if (!\strlen($sDelimiter) || \strlen($sFolderParentFullName)) {
 			$sDelimiter = $this->oImapClient->FolderHierarchyDelimiter($sFolderParentFullName);
-			if (null === $sDelimiter)
-			{
+			if (null === $sDelimiter) {
 				// TODO: Translate
-				throw new Exceptions\RuntimeException(
+				throw new \MailSo\RuntimeException(
 					\strlen($sFolderParentFullName)
 						? 'Cannot create folder in non-existent parent folder.'
 						: 'Cannot get folder delimiter.');
 			}
 
-			if (\strlen($sDelimiter) && \strlen($sFolderParentFullName))
-			{
+			if (\strlen($sDelimiter) && \strlen($sFolderParentFullName)) {
 				$sFolderParentFullName .= $sDelimiter;
 			}
 		}
 
-		if (\strlen($sDelimiter) && false !== \strpos($sFolderNameInUtf8, $sDelimiter))
-		{
+/*		// Allow non existent parent folders
+		if (\strlen($sDelimiter) && false !== \strpos($sFolderNameInUtf8, $sDelimiter)) {
 			// TODO: Translate
-			throw new Exceptions\RuntimeException(
-				'New folder name contains delimiter.');
+			throw new \MailSo\RuntimeException('New folder name contains delimiter.');
 		}
-
+*/
 		$sFullNameToCreate = $sFolderParentFullName.$sFolderNameInUtf8;
 
-		$this->oImapClient->FolderCreate($sFullNameToCreate);
+		$this->oImapClient->FolderCreate($sFullNameToCreate, $bSubscribeOnCreation);
 
-		if ($bSubscribeOnCreation)
-		{
-			$this->oImapClient->FolderSubscribe($sFullNameToCreate);
+		$aFolders = $this->oImapClient->FolderStatusList($sFullNameToCreate, '');
+		if (isset($aFolders[$sFullNameToCreate])) {
+			$oImapFolder = $aFolders[$sFullNameToCreate];
+			$bSubscribeOnCreation && $oImapFolder->setSubscribed();
+			return $oImapFolder;
 		}
 
-		$aFolders = $this->oImapClient->IsSupported('LIST-STATUS')
-			? $this->oImapClient->FolderStatusList($sFullNameToCreate, '')
-			: $this->oImapClient->FolderList($sFullNameToCreate, '');
-		$oImapFolder = $aFolders[$sFullNameToCreate];
-		return $oImapFolder ? new Folder($oImapFolder, $bSubscribeOnCreation) : null;
+		return null;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \InvalidArgumentException
 	 */
-	public function FolderMove(string $sPrevFolderFullName, string $sNextFolderFullNameInUtf, bool $bSubscribeOnMove = true) : self
+	public function FolderRename(string $sPrevFolderFullName, string $sNewFolderFullName): self
 	{
+		if (!\strlen($sPrevFolderFullName) || !\strlen($sNewFolderFullName)) {
+			throw new \ValueError;
+		}
+
 		if (!$this->oImapClient->FolderHierarchyDelimiter($sPrevFolderFullName)) {
 			// TODO: Translate
-			throw new Exceptions\RuntimeException('Cannot move non-existent folder.');
+			throw new \MailSo\RuntimeException('Cannot rename non-existent folder.');
 		}
-		return $this->folderModify($sPrevFolderFullName, $sNextFolderFullNameInUtf, $bSubscribeOnMove);
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	public function FolderRename(string $sPrevFolderFullName, string $sNewTopFolderNameInUtf, bool $bSubscribeOnRename = true) : string
-	{
-		$sDelimiter = $this->oImapClient->FolderHierarchyDelimiter($sPrevFolderFullName);
-		if (!$sDelimiter) {
+/*
+		if (\strlen($sDelimiter) && false !== \strpos($sNewFolderFullName, $sDelimiter)) {
 			// TODO: Translate
-			throw new Exceptions\RuntimeException('Cannot rename non-existent folder.');
+			throw new \MailSo\RuntimeException('New folder name contains delimiter.');
 		}
+*/
 
-		if (\strlen($sDelimiter) && false !== \strpos($sNewTopFolderNameInUtf, $sDelimiter)) {
-			// TODO: Translate
-			throw new Exceptions\RuntimeException('New folder name contains delimiter.');
-		}
-
-		$iLast = \strrpos($sPrevFolderFullName, $sDelimiter);
-		$sNewFolderFullName = (false === $iLast ? '' : \substr($sPrevFolderFullName, 0, $iLast + 1))
-			. $sNewTopFolderNameInUtf;
-
-		$this->folderModify($sPrevFolderFullName, $sNewFolderFullName, $bSubscribeOnRename);
-
-		return $sNewFolderFullName;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Base\Exceptions\RuntimeException
-	 */
-	protected function folderModify(string $sPrevFolderFullName, string $sNewFolderFullName, bool $bSubscribe) : self
-	{
-		if (!\strlen($sPrevFolderFullName) || !\strlen($sNewFolderFullName))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$aSubscribeFolders = array();
-		if ($bSubscribe)
-		{
-			$aSubscribeFolders = $this->oImapClient->FolderSubscribeList($sPrevFolderFullName, '*');
-			foreach ($aSubscribeFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder)
-			{
-				$this->oImapClient->FolderUnsubscribe($oFolder->FullName());
-			}
-		}
+		/**
+		 * https://datatracker.ietf.org/doc/html/rfc3501#section-6.3.5
+		 *   Does not mention subscriptions
+		 * https://datatracker.ietf.org/doc/html/rfc9051#section-6.3.6
+		 *   Mentions that a server doesn't automatically manage subscriptions
+		 */
+		$oSubscribedFolders = $this->oImapClient->FolderSubscribeList($sPrevFolderFullName, '*');
 
 		$this->oImapClient->FolderRename($sPrevFolderFullName, $sNewFolderFullName);
 
-		foreach ($aSubscribeFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder)
-		{
-			$sFolderFullNameForResubscrine = $oFolder->FullName();
-			if (0 === \strpos($sFolderFullNameForResubscrine, $sPrevFolderFullName))
-			{
-				$sNewFolderFullNameForResubscrine = $sNewFolderFullName.
-					\substr($sFolderFullNameForResubscrine, \strlen($sPrevFolderFullName));
-
-				$this->oImapClient->FolderSubscribe($sNewFolderFullNameForResubscrine);
+		foreach ($oSubscribedFolders as /* @var $oFolder \MailSo\Imap\Folder */ $oFolder) {
+			$sFolderFullNameForResubscribe = $oFolder->FullName;
+			if (\str_starts_with($sFolderFullNameForResubscribe, $sPrevFolderFullName)) {
+				$this->oImapClient->FolderUnsubscribe($sFolderFullNameForResubscribe);
+				$this->oImapClient->FolderSubscribe(
+					$sNewFolderFullName . \substr($sFolderFullNameForResubscribe, \strlen($sPrevFolderFullName))
+				);
 			}
 		}
 
@@ -1229,109 +1043,16 @@ class MailClient
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Mail\Exceptions\RuntimeException
+	 * @throws \InvalidArgumentException
 	 */
-	public function FolderDelete(string $sFolderFullName) : self
+	public function SetLogger(?\MailSo\Log\Logger $oLogger): void
 	{
-		if (!\strlen($sFolderFullName) || 'INBOX' === $sFolderFullName) {
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		if ($this->oImapClient->IsSupported('IMAP4rev2')) {
-			$oInfo = $this->oImapClient->FolderExamine($sFolderFullName);
-		} else {
-			$oInfo = $this->oImapClient->FolderStatus($sFolderFullName);
-		}
-		if ($oInfo->MESSAGES) {
-			throw new Exceptions\NonEmptyFolder;
-		}
-
-		$this->oImapClient->FolderUnsubscribe($sFolderFullName);
-
-		$this->oImapClient->FolderUnselect();
-		$this->oImapClient->FolderDelete($sFolderFullName);
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	public function FolderClear(string $sFolderFullName) : self
-	{
-		$oFolderInformation = $this->oImapClient->FolderSelect($sFolderFullName);
-		if (0 < $oFolderInformation->MESSAGES)
-		{
-			$this->oImapClient->MessageStoreFlag(new SequenceSet('1:*', false),
-				array(MessageFlag::DELETED),
-				StoreAction::ADD_FLAGS_SILENT
-			);
-
-			$this->oImapClient->FolderExpunge();
-		}
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	public function FolderSubscribe(string $sFolderFullName, bool $bSubscribe) : self
-	{
-		if (!\strlen($sFolderFullName))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
-		$this->oImapClient->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sFolderFullName);
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 */
-	public function SetLogger(\MailSo\Log\Logger $oLogger) : self
-	{
-		if (!($oLogger instanceof \MailSo\Log\Logger))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
-		}
-
 		$this->oLogger = $oLogger;
-		$this->oImapClient->SetLogger($this->oLogger);
-
-		return $this;
+		$this->oImapClient->SetLogger($oLogger);
 	}
 
-	public function GetNamespace() : string
+	public function __call(string $name, array $arguments) /*: mixed*/
 	{
-		$oNamespace = $this->oImapClient->GetNamespace();
-		return $oNamespace ? $oNamespace->GetPersonalNamespace() : '';
-	}
-
-	/**
-	 * RFC 5464
-	 */
-
-	public function ServerGetMetadata(array $aEntries, array $aOptions = []) : array
-	{
-		return $this->oImapClient->ServerGetMetadata($aEntries, $aOptions);
-	}
-
-	public function FolderGetMetadata(string $sFolderName, array $aEntries, array $aOptions = []) : array
-	{
-		return $this->oImapClient->FolderGetMetadata($sFolderName, $aEntries, $aOptions);
-	}
-
-	public function FolderSetMetadata(string $sFolderName, array $aEntries) : void
-	{
-		$this->oImapClient->FolderSetMetadata($sFolderName, $aEntries);
-	}
-
-	public function FolderDeleteMetadata($sFolderName, array $aEntries) : void
-	{
-		$this->oImapClient->FolderSetMetadata($sFolderName, \array_fill_keys(\array_keys($aEntries), null));
+		return $this->oImapClient->{$name}(...$arguments);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
index 03a2b1bdb..1c945bae3 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/Message.php
@@ -11,8 +11,10 @@
 
 namespace MailSo\Mail;
 
-use \MailSo\Base\Utils;
-use \MailSo\Imap\Enumerations\FetchType;
+use MailSo\Base\Utils;
+use MailSo\Imap\Enumerations\FetchType;
+use MailSo\Mime\Enumerations\Header as MimeHeader;
+use SnappyMail\GPG\PGP as GPG;
 
 /**
  * @category MailSo
@@ -20,391 +22,211 @@ use \MailSo\Imap\Enumerations\FetchType;
  */
 class Message implements \JsonSerializable
 {
-	private
+	private string
 		$sFolder = '',
-		$iUid = 0,
 		$sSubject = '',
 		$sMessageId = '',
 		$sContentType = '',
-		$iSize = 0,
-		$iSpamScore = 0,
 		$sSpamResult = '',
-		$bIsSpam = false,
-		$bHasVirus = null,
-		$iInternalTimeStampInUTC = 0,
-		$iHeaderTimeStampInUTC = 0,
-		$sHeaderDate = '',
-		$aFlagsLowerCase = [],
+		$InReplyTo = '',
+		$sPlain = '',
+		$sHtml = '',
+		$References = '',
+		$ReadReceipt = '';
 
+	private ?string
 		/**
-		 * @var \MailSo\Mime\EmailCollection
+		 * https://www.rfc-editor.org/rfc/rfc8474#section-5
 		 */
+		$sEmailId = null,
+		$sThreadId = null,
+		/**
+		 * https://www.rfc-editor.org/rfc/rfc8970
+		 */
+		$sPreview = null;
+
+	private int
+		$Uid = 0,
+		$iSize = 0,
+		$SpamScore = 0,
+		$iInternalTimeStampInUTC = 0,
+		$iHeaderTimeStampInUTC = 0;
+
+	private bool
+		$bIsSpam = false;
+
+	private array
+		$SPF = [],
+		$DKIM = [],
+		$DMARC = [],
+//		$aFlags = [],
+		$aFlagsLowerCase = [],
+		$aThreadUIDs = [],
+		$aThreadUnseenUIDs = [];
+
+	private ?array $DraftInfo = null;
+
+	public ?array $pgpSigned = null;
+	private ?array $pgpEncrypted = null;
+
+	public ?array $smimeSigned = null;
+	private ?array $smimeEncrypted = null;
+
+	private ?\MailSo\Mime\EmailCollection
 		$oFrom = null,
 		$oSender = null,
 		$oReplyTo = null,
 		$oDeliveredTo = null,
 		$oTo = null,
 		$oCc = null,
-		$oBcc = null,
+		$oBcc = null;
 
-		$sInReplyTo = '',
+	private ?AttachmentCollection
+		$Attachments = null;
 
-		$sPlain = '',
-		$sHtml = '',
+	private ?\MailSo\Mime\HeaderCollection
+		$Headers = null;
 
-		/**
-		 * @var AttachmentCollection
-		 */
-		$oAttachments = null,
-
-		/**
-		 * @var array
-		 */
-		$aDraftInfo = null,
-
-		$sReferences = '',
-
-		/**
-		 * @var int
-		 */
-		$iPriority,
-
-		$sDeliveryReceipt = '',
-
-		$sReadReceipt = '',
-
-		$aUnsubsribeLinks = array(),
-
-		$aThreads = array(),
-
-		$aPgpSigned = null,
-		$aPgpEncrypted = null;
-
-	function __construct()
+	function __get($k)
 	{
-		$this->iPriority = \MailSo\Mime\Enumerations\MessagePriority::NORMAL;
+		return \property_exists($this, $k) ? $this->$k : null;
 	}
 
-	public function Plain() : string
-	{
-		return $this->sPlain;
-	}
-
-	public function Html() : string
-	{
-		return $this->sHtml;
-	}
-
-	public function PgpSigned() : ?array
-	{
-		return $this->aPgpSigned;
-	}
-
-	public function PgpEncrypted() : ?array
-	{
-		return $this->aPgpEncrypted;
-	}
-
-	public function Folder() : string
-	{
-		return $this->sFolder;
-	}
-
-	public function Uid() : int
-	{
-		return $this->iUid;
-	}
-
-	public function MessageId() : string
-	{
-		return $this->sMessageId;
-	}
-
-	public function Subject() : string
+	public function Subject(): string
 	{
 		return $this->sSubject;
 	}
 
-	public function ContentType() : string
-	{
-		return $this->sContentType;
-	}
-
-	public function Size() : int
-	{
-		return $this->iSize;
-	}
-
-	public function SpamScore() : int
-	{
-		return $this->iSpamScore;
-	}
-
-	private function setSpamScore($value) : void
-	{
-		$this->iSpamScore = \intval(\max(0, \min(100, $value)));
-	}
-
-	public function SpamResult() : string
-	{
-		return $this->sSpamResult;
-	}
-
-	public function IsSpam() : bool
-	{
-		return $this->bIsSpam;
-	}
-
-	/**
-	 * null = not scanned
-	 * true = scanned and infected
-	 * false = scanned and no infection found
-	 */
-	public function HasVirus() : ?bool
-	{
-		return $this->bHasVirus;
-	}
-
-	public function InternalTimeStampInUTC() : int
-	{
-		return $this->iInternalTimeStampInUTC;
-	}
-
-	public function HeaderTimeStampInUTC() : int
-	{
-		return $this->iHeaderTimeStampInUTC;
-	}
-
-	public function HeaderDate() : string
-	{
-		return $this->sHeaderDate;
-	}
-
-	public function FlagsLowerCase() : array
-	{
-		return $this->aFlagsLowerCase;
-	}
-
-	public function From() : ?\MailSo\Mime\EmailCollection
+	public function From(): ?\MailSo\Mime\EmailCollection
 	{
 		return $this->oFrom;
 	}
 
-	public function Priority() : int
+	public function Uid(): int
 	{
-		return $this->iPriority;
+		return $this->Uid;
 	}
 
-	public function Sender() : ?\MailSo\Mime\EmailCollection
+	public function Attachments(): ?AttachmentCollection
 	{
-		return $this->oSender;
+		return $this->Attachments;
 	}
 
-	public function ReplyTo() : ?\MailSo\Mime\EmailCollection
+	public function setPlain(string $value): void
 	{
-		return $this->oReplyTo;
+		$this->sPlain = $value;
 	}
 
-	public function DeliveredTo() : ?\MailSo\Mime\EmailCollection
+	public function setHtml(string $value): void
 	{
-		return $this->oDeliveredTo;
+		$this->sHtml = $value;
 	}
 
-	public function To() : ?\MailSo\Mime\EmailCollection
+	private function setSpamScore($value): void
 	{
-		return $this->oTo;
+		$this->SpamScore = \intval(\max(0, \min(100, $value)));
 	}
 
-	public function Cc() : ?\MailSo\Mime\EmailCollection
+	public function SetThreads(array $aThreadUIDs): void
 	{
-		return $this->oCc;
+		$this->aThreadUIDs = $aThreadUIDs;
 	}
 
-	public function Bcc() : ?\MailSo\Mime\EmailCollection
+	public function SetThreadUnseen(array $aUnseenUIDs): void
 	{
-		return $this->oBcc;
+		$this->aThreadUnseenUIDs = $aUnseenUIDs;
 	}
 
-	public function Attachments() : ?AttachmentCollection
-	{
-		return $this->oAttachments;
-	}
-
-	public function InReplyTo() : string
-	{
-		return $this->sInReplyTo;
-	}
-
-	public function References() : string
-	{
-		return $this->sReferences;
-	}
-
-	public function DeliveryReceipt() : string
-	{
-		return $this->sDeliveryReceipt;
-	}
-
-	public function ReadReceipt() : string
-	{
-		return $this->sReadReceipt;
-	}
-
-	public function UnsubsribeLinks() : array
-	{
-		return $this->aUnsubsribeLinks;
-	}
-
-	public function ReadingConfirmation() : string
-	{
-		return $this->ReadReceipt();
-	}
-
-	public function DraftInfo() : ?array
-	{
-		return $this->aDraftInfo;
-	}
-
-	public function Threads() : array
-	{
-		return $this->aThreads;
-	}
-
-	public function SetThreads(array $aThreads)
-	{
-		$this->aThreads = $aThreads;
-	}
-
-	public static function NewFetchResponseInstance(string $sFolder, \MailSo\Imap\FetchResponse $oFetchResponse, ?\MailSo\Imap\BodyStructure $oBodyStructure = null) : self
+	public static function fromFetchResponse(string $sFolder, \MailSo\Imap\FetchResponse $oFetchResponse, ?\MailSo\Imap\BodyStructure $oBodyStructure = null): self
 	{
 		$oMessage = new self;
 
-		if (!$oBodyStructure)
-		{
+		if (!$oBodyStructure) {
 			$oBodyStructure = $oFetchResponse->GetFetchBodyStructure();
 		}
 
-		$sInternalDate = $oFetchResponse->GetFetchValue(FetchType::INTERNALDATE);
-		$aFlags = $oFetchResponse->GetFetchValue(FetchType::FLAGS);
+		$aFlags = $oFetchResponse->GetFetchValue(FetchType::FLAGS) ?: [];
 
 		$oMessage->sFolder = $sFolder;
-		$oMessage->iUid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
+		$oMessage->Uid = (int) $oFetchResponse->GetFetchValue(FetchType::UID);
 		$oMessage->iSize = (int) $oFetchResponse->GetFetchValue(FetchType::RFC822_SIZE);
-		$oMessage->aFlagsLowerCase = \array_map('strtolower', $aFlags ?: []);
-
-		$oMessage->iInternalTimeStampInUTC =
-			\MailSo\Base\DateTimeHelper::ParseInternalDateString($sInternalDate);
+//		$oMessage->aFlags = $aFlags;
+		$oMessage->aFlagsLowerCase = \array_map('mb_strtolower', \array_map('\\MailSo\\Base\\Utils::Utf7ModifiedToUtf8', $aFlags));
+		$oMessage->iInternalTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseInternalDateString(
+			$oFetchResponse->GetFetchValue(FetchType::INTERNALDATE)
+		);
 
+		// https://www.rfc-editor.org/rfc/rfc8474
+		$aEmailId = $oFetchResponse->GetFetchValue(FetchType::EMAILID);
+		$oMessage->sEmailId = $aEmailId ? $aEmailId[0] : $oFetchResponse->GetFetchValue('X-GM-MSGID');
+//		$oMessage->sEmailId = $oMessage->sEmailId ?: $oFetchResponse->GetFetchValue('X-GUID');
+		$aThreadId = $oFetchResponse->GetFetchValue(FetchType::THREADID);
+		$oMessage->sThreadId = $aThreadId ? $aThreadId[0] : $oFetchResponse->GetFetchValue('X-GM-THRID');
+		$oMessage->sPreview = $oFetchResponse->GetFetchValue(FetchType::PREVIEW) ?: null;
 		$sCharset = $oBodyStructure ? Utils::NormalizeCharset($oBodyStructure->SearchCharset()) : '';
 
 		$sHeaders = $oFetchResponse->GetHeaderFieldsValue();
-		if (\strlen($sHeaders))
-		{
-			$oHeaders = new \MailSo\Mime\HeaderCollection($sHeaders, false, $sCharset);
+		$oHeaders = \strlen($sHeaders) ? new \MailSo\Mime\HeaderCollection($sHeaders, $sCharset) : null;
+		if ($oHeaders) {
+			$oMessage->Headers = $oHeaders;
 
 			$sContentTypeCharset = $oHeaders->ParameterValue(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeHeader::CONTENT_TYPE,
 				\MailSo\Mime\Enumerations\Parameter::CHARSET
 			);
-
-			if (\strlen($sContentTypeCharset))
-			{
+			if (\strlen($sContentTypeCharset)) {
 				$sCharset = Utils::NormalizeCharset($sContentTypeCharset);
 			}
-
-			if (\strlen($sCharset))
-			{
+			if (\strlen($sCharset)) {
 				$oHeaders->SetParentCharset($sCharset);
 			}
 
 			$bCharsetAutoDetect = !\strlen($sCharset);
 
-			$oMessage->sSubject = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::SUBJECT, $bCharsetAutoDetect);
-			$oMessage->sMessageId = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::MESSAGE_ID);
-			$oMessage->sContentType = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE);
+			$oMessage->sSubject = $oHeaders->ValueByName(MimeHeader::SUBJECT, $bCharsetAutoDetect);
+			$oMessage->sMessageId = $oHeaders->ValueByName(MimeHeader::MESSAGE_ID);
+			$oMessage->sContentType = $oHeaders->ValueByName(MimeHeader::CONTENT_TYPE);
 
-			$oMessage->oFrom = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::FROM_, $bCharsetAutoDetect);
-			$oMessage->oTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::TO_, $bCharsetAutoDetect);
-			$oMessage->oCc = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::CC, $bCharsetAutoDetect);
-			$oMessage->oBcc = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::BCC, $bCharsetAutoDetect);
+			$oMessage->oFrom = $oHeaders->GetAsEmailCollection(MimeHeader::FROM_);
+			$oMessage->oTo = $oHeaders->GetAsEmailCollection(MimeHeader::TO_);
+			$oMessage->oCc = $oHeaders->GetAsEmailCollection(MimeHeader::CC);
+			$oMessage->oBcc = $oHeaders->GetAsEmailCollection(MimeHeader::BCC);
 
-			if ($oMessage->oFrom) {
-				$oHeaders->PopulateEmailColectionByDkim($oMessage->oFrom);
-			}
+			$oMessage->oSender = $oHeaders->GetAsEmailCollection(MimeHeader::SENDER);
+			$oMessage->oReplyTo = $oHeaders->GetAsEmailCollection(MimeHeader::REPLY_TO);
+			$oMessage->oDeliveredTo = $oHeaders->GetAsEmailCollection(MimeHeader::DELIVERED_TO);
 
-			$oMessage->oSender = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::SENDER, $bCharsetAutoDetect);
-			$oMessage->oReplyTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::REPLY_TO, $bCharsetAutoDetect);
-			$oMessage->oDeliveredTo = $oHeaders->GetAsEmailCollection(\MailSo\Mime\Enumerations\Header::DELIVERED_TO, $bCharsetAutoDetect);
+			$oMessage->InReplyTo = $oHeaders->ValueByName(MimeHeader::IN_REPLY_TO);
+			$oMessage->References = Utils::StripSpaces(
+				$oHeaders->ValueByName(MimeHeader::REFERENCES));
 
-			$oMessage->sInReplyTo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::IN_REPLY_TO);
-			$oMessage->sReferences = Utils::StripSpaces(
-				$oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::REFERENCES));
-
-			$sHeaderDate = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DATE);
-			$oMessage->sHeaderDate = $sHeaderDate;
-			$oMessage->iHeaderTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($sHeaderDate);
-
-			// Priority
-			$oMessage->iPriority = \MailSo\Mime\Enumerations\MessagePriority::NORMAL;
-			$sPriority = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_MSMAIL_PRIORITY);
-			if (!\strlen($sPriority))
-			{
-				$sPriority = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::IMPORTANCE);
-			}
-			if (!\strlen($sPriority))
-			{
-				$sPriority = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_PRIORITY);
-			}
-			if (\strlen($sPriority))
-			{
-				switch (\str_replace(' ', '', \strtolower($sPriority)))
-				{
-					case 'high':
-					case '1(highest)':
-					case '2(high)':
-					case '1':
-					case '2':
-						$oMessage->iPriority = \MailSo\Mime\Enumerations\MessagePriority::HIGH;
-						break;
-
-					case 'low':
-					case '4(low)':
-					case '5(lowest)':
-					case '4':
-					case '5':
-						$oMessage->iPriority = \MailSo\Mime\Enumerations\MessagePriority::LOW;
-						break;
-				}
-			}
+			$oMessage->iHeaderTimeStampInUTC = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
+				$oHeaders->ValueByName(MimeHeader::DATE)
+			);
 
 			// Delivery Receipt
-			$oMessage->sDeliveryReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::RETURN_RECEIPT_TO));
+//			$oMessage->sDeliveryReceipt = \trim($oHeaders->ValueByName(MimeHeader::RETURN_RECEIPT_TO));
 
 			// Read Receipt
-			$oMessage->sReadReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::DISPOSITION_NOTIFICATION_TO));
-			if (empty($oMessage->sReadReceipt))
-			{
-				$oMessage->sReadReceipt = \trim($oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_CONFIRM_READING_TO));
+			$sReadReceipt = \trim($oHeaders->ValueByName(MimeHeader::DISPOSITION_NOTIFICATION_TO));
+			if (empty($sReadReceipt)) {
+				$sReadReceipt = \trim($oHeaders->ValueByName(MimeHeader::X_CONFIRM_READING_TO));
 			}
+			if ($sReadReceipt) {
+				try
+				{
+					if (!\MailSo\Mime\Email::Parse($sReadReceipt)) {
+						$sReadReceipt = '';
+					}
+				}
+				catch (\Throwable $oException)
+				{
+					$sReadReceipt = '';
+				}
+			}
+			$oMessage->ReadReceipt = $sReadReceipt;
 
-			// Unsubscribe links
-			$oMessage->aUnsubsribeLinks = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::LIST_UNSUBSCRIBE);
-			if (empty($oMessage->aUnsubsribeLinks))
-			{
-				$oMessage->aUnsubsribeLinks = array();
-			}
-			else
-			{
-				$oMessage->aUnsubsribeLinks = explode(',', $oMessage->aUnsubsribeLinks);
-				$oMessage->aUnsubsribeLinks = array_map(
-					function ($link) {
-						return trim($link, ' <>');
-					},
-					$oMessage->aUnsubsribeLinks
-				);
-			}
-
-			if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAMD_RESULT)) {
+			if ($spam = $oHeaders->ValueByName(MimeHeader::X_SPAMD_RESULT)) {
 				if (\preg_match('/\\[([\\d\\.-]+)\\s*\\/\\s*([\\d\\.]+)\\];/', $spam, $match)) {
 					if ($threshold = \floatval($match[2])) {
 						$oMessage->setSpamScore(100 * \floatval($match[1]) / $threshold);
@@ -412,13 +234,13 @@ class Message implements \JsonSerializable
 					}
 				}
 				$oMessage->bIsSpam = false !== \stripos($oMessage->sSubject, '*** SPAM ***');
-			} else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_BOGOSITY)) {
+			} else if ($spam = $oHeaders->ValueByName(MimeHeader::X_BOGOSITY)) {
 				$oMessage->sSpamResult = $spam;
-				$oMessage->bIsSpam = !!\preg_match('/yes|spam/', $spam);
+				$oMessage->bIsSpam = !\str_contains($spam, 'Ham');
 				if (\preg_match('/spamicity=([\\d\\.]+)/', $spam, $spamicity)) {
-					$oMessage->setSpamScore(\floatval($spamicity[1]));
+					$oMessage->setSpamScore(100 * \floatval($spamicity[1]));
 				}
-			} else if ($spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_STATUS)) {
+			} else if ($spam = $oHeaders->ValueByName(MimeHeader::X_SPAM_STATUS)) {
 				$oMessage->sSpamResult = $spam;
 				if (\preg_match('/(?:hits|score)=([\\d\\.-]+)/', $spam, $value)
 				 && \preg_match('/required=([\\d\\.-]+)/', $spam, $required)) {
@@ -427,26 +249,21 @@ class Message implements \JsonSerializable
 						$oMessage->sSpamResult = "{$value[1]} / {$required[1]}";
 					}
 				}
-				$oMessage->bIsSpam = 'Yes' === \substr($spam, 0, 3);
-//				$spam = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_SPAM_FLAG);
-//				$oMessage->bIsSpam = false !== \stripos($spam, 'YES');
-			}
-
-			if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS)) {
-				$oMessage->bHasVirus = true;
-			}
-			if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS_STATUS)) {
-				if (false !== \stripos($spam, 'infected')) {
-					$oMessage->bHasVirus = true;
-				} else if (false !== \stripos($spam, 'clean')) {
-					$oMessage->bHasVirus = false;
+				// https://github.com/the-djmaze/snappymail/issues/1228
+				else if (\preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $spam, $value)
+				  || \preg_match('@([\\d\\.]+)/([\\d\\.]+)@', $oHeaders->ValueByName(MimeHeader::X_SPAM_INFO), $value)
+				) {
+					if ($threshold = \floatval($value[2])) {
+						$oMessage->setSpamScore(100 * \floatval($value[1]) / $threshold);
+						$oMessage->sSpamResult = "{$value[1]} / {$value[2]}";
+					}
 				}
-			}
-			if ($virus = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_VIRUS_SCANNED)) {
-				$oMessage->sVirusScanned = $virus;
+
+				$oMessage->bIsSpam = 'Yes' === \substr($spam, 0, 3)
+					|| false !== \stripos($oHeaders->ValueByName(MimeHeader::X_SPAM_FLAG), 'YES');
 			}
 
-			$sDraftInfo = $oHeaders->ValueByName(\MailSo\Mime\Enumerations\Header::X_DRAFT_INFO);
+			$sDraftInfo = $oHeaders->ValueByName(MimeHeader::X_DRAFT_INFO);
 			if (\strlen($sDraftInfo)) {
 				$sType = '';
 				$sFolder = '';
@@ -469,7 +286,23 @@ class Message implements \JsonSerializable
 				}
 
 				if (\strlen($sType) && \strlen($sFolder) && $iUid) {
-					$oMessage->aDraftInfo = array($sType, $iUid, $sFolder);
+					$oMessage->DraftInfo = array($sType, $iUid, $sFolder);
+				}
+			}
+
+			$aAuth = $oHeaders->AuthStatuses();
+			$aAuth = $oHeaders->AuthStatuses(\RainLoop\Api::Config()->Get('security', 'trusted_authserv_ids', ''));
+			$oMessage->SPF = $aAuth['spf'];
+			$oMessage->DKIM = $aAuth['dkim'];
+			$oMessage->DMARC = $aAuth['dmarc'];
+			if ($aAuth['dkim'] && $oMessage->oFrom) {
+				foreach ($oMessage->oFrom as $oEmail) {
+					$sEmail = $oEmail->GetEmail();
+					foreach ($aAuth['dkim'] as $aDkimData) {
+						if (\strpos($sEmail, $aDkimData[1])) {
+							$oEmail->SetDkimStatus($aDkimData[0]);
+						}
+					}
 				}
 			}
 		}
@@ -487,72 +320,87 @@ class Message implements \JsonSerializable
 			$oMessage->oTo = $oFetchResponse->GetFetchEnvelopeEmailCollection(5, $sCharset);
 			$oMessage->oCc = $oFetchResponse->GetFetchEnvelopeEmailCollection(6, $sCharset);
 			$oMessage->oBcc = $oFetchResponse->GetFetchEnvelopeEmailCollection(7, $sCharset);
-			$oMessage->sInReplyTo = $oFetchResponse->GetFetchEnvelopeValue(8, '');
+			$oMessage->InReplyTo = $oFetchResponse->GetFetchEnvelopeValue(8, '');
 		}
 
-		if ($oBodyStructure)
-		{
+		if ($oBodyStructure) {
 			$gEncryptedParts = $oBodyStructure->SearchByContentType('multipart/encrypted');
 			foreach ($gEncryptedParts as $oPart) {
-				if ($oPart->IsPgpEncrypted()) {
-					$oMessage->aPgpEncrypted = [
-						'PartId' => $oPart->SubParts()[1]->PartID()
+				if ($oPart->isPgpEncrypted()) {
+					$oMessage->pgpEncrypted = [
+						'partId' => $oPart->SubParts()[1]->PartID()
+					];
+				}
+			}
+
+			$gEncryptedParts = $oBodyStructure->SearchByContentTypes(['application/pkcs7-mime','application/x-pkcs7-mime']);
+			foreach ($gEncryptedParts as $oPart) {
+				if ($oPart->isSMimeEncrypted()) {
+					$oMessage->smimeEncrypted = [
+						'partId' => $oPart->PartID()
+					];
+				} else if ($oPart->isSMimeSigned()) {
+					$oMessage->smimeSigned = [
+						'partId' => $oPart->PartID(),
+						'micAlg' => $oHeaders ? (string) $oHeaders->ParameterValue(MimeHeader::CONTENT_TYPE, 'micalg') : '',
+						'detached' => false
 					];
 				}
 			}
 
 			$gSignatureParts = $oBodyStructure->SearchByContentType('multipart/signed');
 			foreach ($gSignatureParts as $oPart) {
-				if (!$oPart->IsPgpSigned()) {
-					continue;
+				if ($oPart->isPgpSigned()) {
+					$oMessage->pgpSigned = [
+						// /?/Raw/&q[]=/0/Download/&q[]=/...
+						// /?/Raw/&q[]=/0/View/&q[]=/...
+						'partId' => $oPart->SubParts()[0]->PartID(),
+						'sigPartId' => $oPart->SubParts()[1]->PartID(),
+						'micAlg' => $oHeaders ? (string) $oHeaders->ParameterValue(MimeHeader::CONTENT_TYPE, 'micalg') : ''
+					];
+				} else if ($oPart->isSMimeSigned()) {
+					$oMessage->smimeSigned = [
+						'partId' => $oPart->PartID(),
+						'sigPartId' => $oPart->SubParts()[1]->PartID(),
+						'micAlg' => $oHeaders ? (string) $oHeaders->ParameterValue(MimeHeader::CONTENT_TYPE, 'micalg') : '',
+						'detached' => true
+					];
 				}
-				$oPgpSignaturePart = $oPart->SubParts()[1];
-				$oMessage->aPgpSigned = [
-					// /?/Raw/&q[]=/0/Download/&q[]=/...
-					// /?/Raw/&q[]=/0/View/&q[]=/...
-					'BodyPartId' => $oPart->SubParts()[0]->PartID(),
-					'SigPartId' => $oPgpSignaturePart->PartID(),
-					'MicAlg' => (string) $oHeaders->ParameterValue(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'micalg')
-				];
 /*
 				// An empty section specification refers to the entire message, including the header.
 				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
 				$sPgpText = \trim(
-					\trim($oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->aPgpSigned['BodyPartId'].'.MIME]'))
+					\trim($oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->pgpSigned['partId'].'.MIME]'))
 					. "\r\n\r\n"
-					. \trim($oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->aPgpSigned['BodyPartId'].']'))
+					. \trim($oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->pgpSigned['partId'].']'))
 				);
 				if ($sPgpText) {
-					$oMessage->aPgpSigned['Body'] = $sPgpText;
+					$oMessage->pgpSigned['body'] = $sPgpText;
 				}
-				$sPgpSignatureText = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->aPgpSigned['SigPartId'].']');
+				$sPgpSignatureText = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oMessage->pgpSigned['sigPartId'].']');
 				if ($sPgpSignatureText && 0 < \strpos($sPgpSignatureText, 'BEGIN PGP SIGNATURE')) {
-					$oMessage->aPgpSigned['Signature'] = $oPart->SubParts()[0]->PartID();
+					$oMessage->pgpSigned['signature'] = $oPart->SubParts()[0]->PartID();
 				}
 */
 				break;
 			}
 
 			$aTextParts = $oBodyStructure->GetHtmlAndPlainParts();
-			if ($aTextParts)
-			{
+			if ($aTextParts) {
 				$sCharset = $sCharset ?: \MailSo\Base\Enumerations\Charset::UTF_8;
 
 				$aHtmlParts = array();
 				$aPlainParts = array();
 
-				foreach ($aTextParts as $oPart)
-				{
+				foreach ($aTextParts as $oPart) {
 					$sText = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oPart->PartID().']');
-					if (null === $sText)
-					{
+					if (null === $sText) {
 						// TextPartIsTrimmed ?
 						$sText = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$oPart->PartID().']<0>');
 					}
 
-					if (\is_string($sText) && \strlen($sText))
-					{
-						$sText = Utils::DecodeEncodingValue($sText, $oPart->MailEncodingName());
+					if (\is_string($sText) && \strlen($sText)) {
+						$sText = Utils::DecodeEncodingValue($sText, $oPart->ContentTransferEncoding());
 						$sText = Utils::ConvertEncoding($sText,
 							Utils::NormalizeCharset($oPart->Charset() ?: $sCharset, true),
 							\MailSo\Base\Enumerations\Charset::UTF_8
@@ -561,34 +409,28 @@ class Message implements \JsonSerializable
 
 						// https://datatracker.ietf.org/doc/html/rfc4880#section-7
 						// Cleartext Signature
-						if (!$oMessage->aPgpSigned && \str_contains($sText, '-----BEGIN PGP SIGNED MESSAGE-----'))
-						{
-							$oMessage->aPgpSigned = [
-								'BodyPartId' => $oPart->PartID()
+						if (!$oMessage->pgpSigned && \str_contains($sText, '-----BEGIN PGP SIGNED MESSAGE-----')) {
+							$oMessage->pgpSigned = [
+								'partId' => $oPart->PartID()
 							];
 						}
 
-						if (\str_contains($sText, '-----BEGIN PGP MESSAGE-----'))
-						{
+						if (\str_contains($sText, '-----BEGIN PGP MESSAGE-----')) {
 							$keyIds = [];
-							if (\SnappyMail\PGP\GPG::isSupported()) {
-								$GPG = new \SnappyMail\PGP\GPG('');
+							if (GPG::isSupported()) {
+								$GPG = new GPG('');
 								$keyIds = $GPG->getEncryptedMessageKeys($sText);
 							}
-							$oMessage->aPgpEncrypted = [
-								'PartId' => $oPart->PartID(),
-								'KeyIds' => $keyIds
+							$oMessage->pgpEncrypted = [
+								'partId' => $oPart->PartID(),
+								'keyIds' => $keyIds
 							];
 						}
 
-						if ('text/html' === $oPart->ContentType())
-						{
+						if ('text/html' === $oPart->ContentType()) {
 							$aHtmlParts[] = $sText;
-						}
-						else
-						{
-							if ($oPart->IsFlowedFormat())
-							{
+						} else {
+							if ($oPart->IsFlowedFormat()) {
 								$sText = Utils::DecodeFlowedFormat($sText);
 							}
 
@@ -604,54 +446,140 @@ class Message implements \JsonSerializable
 			}
 
 			$gAttachmentsParts = $oBodyStructure->SearchAttachmentsParts();
-			if ($gAttachmentsParts->valid())
-			{
-				$oMessage->oAttachments = new AttachmentCollection;
-				foreach ($gAttachmentsParts as /* @var $oAttachmentItem \MailSo\Imap\BodyStructure */ $oAttachmentItem)
-				{
+			if ($gAttachmentsParts->valid()) {
+				$oMessage->Attachments = new AttachmentCollection;
+				foreach ($gAttachmentsParts as /* @var $oAttachmentItem \MailSo\Imap\BodyStructure */ $oAttachmentItem) {
 //					if ('application/pgp-keys' === $oAttachmentItem->ContentType()) import ???
-					$oMessage->oAttachments->append(
-						Attachment::NewBodyStructureInstance($oMessage->sFolder, $oMessage->iUid, $oAttachmentItem)
+					$oMessage->Attachments->append(
+						new Attachment($oMessage->sFolder, $oMessage->Uid, $oAttachmentItem)
 					);
 				}
 			}
 		}
 
+		if (\str_starts_with($oMessage->sSubject, '[Preview]')) {
+			$oMessage->sSubject = \mb_substr($oMessage->sSubject, 10);
+		}
+
 		return $oMessage;
 	}
 
-	public function jsonSerialize()
+	public function ETag(string $sClientHash): string
 	{
-		return array(
+		return \md5('MessageHash/' . \implode('/', [
+			$this->sFolder,
+			$this->Uid,
+			\implode(',', $this->getFlags()),
+//			\implode(',', $this->aThreadUIDs),
+			$sClientHash
+		]));
+	}
+
+	// https://datatracker.ietf.org/doc/html/rfc5788#section-3.4.1
+	// Thunderbird $label1 is same as $Important?
+	// Thunderbird $label4 is same as $todo?
+	protected function getFlags(): array
+	{
+		return \array_unique(\str_replace(
+			['$readreceipt', '$replied',  /* 'junk',  'nonjunk',  '$queued',        '$sent',      'sent'*/],
+			['$mdnsent',     '\\answered',/* '$junk', '$notjunk', '$submitpending', '$submitted', '$submitted'*/],
+			$this->aFlagsLowerCase
+		));
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+/*
+		// JMAP-only RFC8621 keywords (RFC5788)
+		$keywords = \array_fill_keys(\str_replace(
+			['\\draft', '\\seen', '\\flagged', '\\answered'],
+			[ '$draft',  '$seen',  '$flagged',  '$answered'],
+			$this->aFlagsLowerCase
+		), true);
+*/
+		$result = array(
 			'@Object' => 'Object/Message',
-			'Folder' => $this->sFolder,
-			'Uid' => $this->iUid,
-			'Subject' => \trim(Utils::Utf8Clear($this->sSubject)),
-			'MessageId' => $this->sMessageId,
-			'Size' => $this->iSize,
-			'SpamScore' => $this->bIsSpam ? 100 : $this->iSpamScore,
-			'SpamResult' => $this->sSpamResult,
-			'IsSpam' => $this->bIsSpam,
-			'HasVirus' => $this->bHasVirus,
-			'DateTimeStampInUTC' => $this->iInternalTimeStampInUTC,
+			'folder' => $this->sFolder,
+			'uid' => $this->Uid,
+			'hash' => \md5($this->sFolder . $this->Uid),
+			'subject' => \trim(Utils::Utf8Clear($this->sSubject)),
+			'encrypted' => 'multipart/encrypted' == $this->sContentType || $this->pgpEncrypted || $this->smimeEncrypted,
+			'messageId' => $this->sMessageId,
+			'spamScore' => $this->bIsSpam ? 100 : $this->SpamScore,
+			'spamResult' => $this->sSpamResult,
+			'isSpam' => $this->bIsSpam,
+			// RainLoop had the date_from_headers option
+			'dateTimestamp' => $this->iHeaderTimeStampInUTC ?: $this->iInternalTimeStampInUTC,
+			'dateTimestampSource' => $this->iHeaderTimeStampInUTC ? 'header' : 'internal',
 
 			// \MailSo\Mime\EmailCollection
-			'From' => $this->oFrom,
-			'ReplyTo' => $this->oReplyTo,
-			'To' => $this->oTo,
-			'Cc' => $this->oCc,
-			'Bcc' => $this->oBcc,
-			'Sender' => $this->oSender,
-			'DeliveredTo' => $this->oDeliveredTo,
+			'from' => $this->oFrom,
+			'replyTo' => $this->oReplyTo,
+			'to' => $this->oTo,
+			'cc' => $this->oCc,
+			'bcc' => $this->oBcc,
+			'sender' => $this->oSender,
+			'deliveredTo' => $this->oDeliveredTo,
 
-			'Priority' => $this->iPriority,
-			'Threads' => $this->aThreads,
-			'UnsubsribeLinks' => $this->aUnsubsribeLinks,
-			'ReadReceipt' => '',
+			'readReceipt' => $this->ReadReceipt,
 
-			'Attachments' => $this->oAttachments ? $this->oAttachments->SpecData() : null,
+			'attachments' => $this->Attachments,
 
-			'Flags' => $this->aFlagsLowerCase
+			'spf' => $this->SPF,
+			'dkim' => $this->DKIM,
+			'dmarc' => $this->DMARC,
+
+			'flags' => $this->getFlags(),
+
+			'inReplyTo' => $this->InReplyTo,
+
+			// https://datatracker.ietf.org/doc/html/rfc8621#section-4.1.1
+			'id' => $this->sEmailId,
+//			'blobId' => $this->sEmailIdBlob,
+//			'threadId' => $this->sThreadId,
+//			'mailboxIds' => ['mailboxid'=>true],
+//			'keywords' => $keywords,
+			'size' => $this->iSize,
+
+			'preview' => $this->sPreview,
+
+			'headers' => $this->Headers
 		);
+
+		if ($this->DraftInfo) {
+			$result['draftInfo'] = $this->DraftInfo;
+		}
+		if ($this->References) {
+			$result['references'] = $this->References;
+//			$result['references'] = \explode(' ', $this->References);
+		}
+		if ($this->sHtml || $this->sPlain) {
+			$result['html'] = $this->sHtml;
+			$result['plain'] = $this->sPlain;
+		}
+//		$this->GetCapa(Capa::OPENPGP) || $this->GetCapa(Capa::GNUPG)
+		if ($this->pgpSigned) {
+			$result['pgpSigned'] = $this->pgpSigned;
+		}
+		if ($this->pgpEncrypted) {
+			$result['pgpEncrypted'] = $this->pgpEncrypted;
+		}
+
+		if ($this->smimeSigned) {
+			$result['smimeSigned'] = $this->smimeSigned;
+		}
+		if ($this->smimeEncrypted) {
+			$result['smimeEncrypted'] = $this->smimeEncrypted;
+		}
+
+		if ($this->aThreadUIDs) {
+			$result['threads'] = $this->aThreadUIDs;
+		}
+		if ($this->aThreadUnseenUIDs) {
+			$result['threadUnseen'] = $this->aThreadUnseenUIDs;
+		}
+
+		return $result;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
index 5e780f908..aea3681eb 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageCollection.php
@@ -18,91 +18,58 @@ namespace MailSo\Mail;
 class MessageCollection extends \MailSo\Base\Collection
 {
 	/**
-	 * @var string
+	 * Amount of UIDs in this list (could be less then total messages when using threads)
 	 */
-	public $FolderHash = '';
+	public int $totalEmails = 0;
 
-	/**
-	 * @var int
-	 */
-	public $MessageCount = 0;
+	public ?int $totalThreads = null;
 
-	/**
-	 * @var int
-	 */
-	public $MessageUnseenCount = 0;
+	public string $FolderName = '';
 
-	/**
-	 * @var int
-	 */
-	public $MessageResultCount = 0;
+	public int $Offset = 0;
 
-	/**
-	 * @var string
-	 */
-	public $FolderName = '';
+	public int $Limit = 0;
 
-	/**
-	 * @var int
-	 */
-	public $Offset = 0;
+	public string $Search = '';
 
-	/**
-	 * @var int
-	 */
-	public $Limit = 0;
+	public string $Sort = '';
 
-	/**
-	 * @var string
-	 */
-	public $Search = '';
+	public int $ThreadUid = 0;
 
-	/**
-	 * @var int
-	 */
-	public $UidNext = 0;
+	public ?\MailSo\Imap\FolderInformation $FolderInfo = null;
 
-	/**
-	 * @var int
-	 */
-	public $ThreadUid = 0;
+	public array $NewMessages = array();
 
-	/**
-	 * @var array
-	 */
-	public $NewMessages = array();
+//	public bool $Filtered = false;
 
-	/**
-	 * @var bool
-	 */
-	public $Filtered = false;
+	public bool $Limited = false;
 
-	public function append($oMessage, bool $bToTop = false) : void
+	public function append($oMessage, bool $bToTop = false): void
 	{
 		assert($oMessage instanceof Message);
 		parent::append($oMessage, $bToTop);
 	}
 
-	public function Clear() : void
+	public function Clear(): void
 	{
 		throw new \BadMethodCallException('disallowed');
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		return array_merge(parent::jsonSerialize(), array(
-			'MessageCount' => $this->MessageCount,
-			'MessageUnseenCount' => $this->MessageUnseenCount,
-			'MessageResultCount' => $this->MessageResultCount,
-			'Folder' => $this->FolderName,
-			'FolderHash' => $this->FolderHash,
-			'UidNext' => $this->UidNext,
-			'ThreadUid' => $this->ThreadUid,
-			'NewMessages' => $this->NewMessages,
-			'Filtered' => $this->Filtered,
-			'Offset' => $this->Offset,
-			'Limit' => $this->Limit,
-			'Search' => $this->Search
+		return \array_merge(parent::jsonSerialize(), array(
+			'totalEmails' => $this->totalEmails,
+			'totalThreads' => $this->totalThreads,
+			'threadUid' => $this->ThreadUid,
+			'newMessages' => $this->NewMessages,
+//			'filtered' => $this->Filtered,
+			'offset' => $this->Offset,
+			'limit' => $this->Limit,
+			'search' => $this->Search,
+			'sort' => $this->Sort,
+			'limited' => $this->Limited,
+			'folder' => $this->FolderInfo
 		));
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
index 016fc47e9..a249ef798 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mail/MessageListParams.php
@@ -13,20 +13,32 @@ namespace MailSo\Mail;
 
 class MessageListParams
 {
-	public
-		$sFolderName, // string
-		$sSearch = '', // string
-		$oCacher = null, // ?\MailSo\Cache\CacheClient
-		$bUseSortIfSupported = false, // bool
-		$bUseThreads = false, // bool
-		$sSort = ''; // string
+	public string
+		$sFolderName,
+		$sSearch = '',
+		$sSort = '',
+		$sThreadAlgorithm = '';
 
-	protected
+	public ?\MailSo\Cache\CacheClient
+		$oCacher = null;
+
+	public bool
+		$bUseSort = true,
+		$bUseThreads = false,
+		$bHideDeleted = true,
+		$bSearchFuzzy = false;
+
+	protected int
 		$iOffset = 0,
-		$iLimit = 10,
+		$iLimit = 0,
 		$iPrevUidNext = 0, // used to check for new messages
 		$iThreadUid = 0;
 
+	/**
+	 * Messages with message sequence numbers corresponding to the specified message sequence number set.
+	 */
+	public ?\MailSo\Imap\SequenceSet $oSequenceSet = null;
+
 	public function __get($k)
 	{
 		return \property_exists($this, $k) ? $this->$k : null;
@@ -37,7 +49,74 @@ class MessageListParams
 		if ('i' === $k[0]) {
 			$this->$k = \max(0, (int) $v);
 		}
-//		\MailSo\Base\Validator::RangeInt($oParams->iOffset, 0)
-//		\MailSo\Base\Validator::RangeInt($oParams->iLimit, 0, 999)
+//		0 > $oParams->iOffset
+//		0 > $oParams->iLimit
+//		999 < $oParams->iLimit
 	}
+
+	public function hash() : string
+	{
+		return \md5(\implode('-', [
+			$this->sFolderName,
+			$this->iOffset,
+			$this->iLimit,
+			$this->bHideDeleted ? '1' : '0',
+			$this->sSearch,
+			$this->bSearchFuzzy ? '1' : '0',
+			$this->bUseSort ? $this->sSort : '0',
+			$this->bUseThreads ? $this->iThreadUid : '',
+			$this->bUseThreads ? $this->sThreadAlgorithm : '',
+//			$this->oSequenceSet ? $this->oSequenceSet : '',
+			$this->iPrevUidNext
+		]));
+	}
+
+/*
+	public function sortValid($oImapClient) : bool
+	{
+		if (!$this->sSort) {
+			return true;
+		}
+		/(REVERSE\s+)?(ARRIVAL|CC|DATE|FROM|SIZE|SUBJECT|TO|DISPLAYFROM|DISPLAYTO)/
+			ARRIVAL
+				Internal date and time of the message.  This differs from the
+				ON criteria in SEARCH, which uses just the internal date.
+
+			CC
+				[IMAP] addr-mailbox of the first "cc" address.
+
+			DATE
+				Sent date and time, as described in section 2.2.
+
+			FROM
+				[IMAP] addr-mailbox of the first "From" address.
+
+			REVERSE
+				Followed by another sort criterion, has the effect of that
+				criterion but in reverse (descending) order.
+				Note: REVERSE only reverses a single criterion, and does not
+				affect the implicit "sequence number" sort criterion if all
+				other criteria are identical.  Consequently, a sort of
+				REVERSE SUBJECT is not the same as a reverse ordering of a
+				SUBJECT sort.  This can be avoided by use of additional
+				criteria, e.g., SUBJECT DATE vs. REVERSE SUBJECT REVERSE
+				DATE.  In general, however, it's better (and faster, if the
+				client has a "reverse current ordering" command) to reverse
+				the results in the client instead of issuing a new SORT.
+
+			SIZE
+				Size of the message in octets.
+
+			SUBJECT
+				Base subject text.
+
+			TO
+				[IMAP] addr-mailbox of the first "To" address.
+
+			RFC 5957:
+				$oImapClient->hasCapability('SORT=DISPLAY')
+				DISPLAYFROM, DISPLAYTO
+	}
+*/
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
index a81493c41..1fb069096 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Attachment.php
@@ -22,55 +22,41 @@ class Attachment
 	 */
 	private $rResource;
 
-	/**
-	 * @var string
-	 */
-	private $sFileName;
+	private string $sFileName;
 
-	/**
-	 * @var int
-	 */
-	private $iFileSize;
+//	private int $iFileSize;
 
-	/**
-	 * @var string
-	 */
-	private $sCID;
+	private string $sContentID;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsInline;
+	private bool $bIsInline;
 
-	/**
-	 * @var bool
-	 */
-	private $bIsLinked;
+	private bool $bIsLinked;
 
-	/**
-	 * @var array
-	 */
-	private $aCustomContentTypeParams;
+	private array $aCustomContentTypeParams;
 
-	/**
-	 * @var string
-	 */
-	private $sContentLocation;
+	private string $sContentLocation;
+
+	private string $sContentType;
 
 	/**
 	 * @param resource $rResource
 	 */
 	function __construct($rResource, string $sFileName, int $iFileSize, bool $bIsInline,
-		bool $bIsLinked, string $sCID, array $aCustomContentTypeParams = [], string $sContentLocation = '')
+		bool $bIsLinked, string $sContentID, array $aCustomContentTypeParams = [],
+		string $sContentLocation = '', string $sContentType = '')
 	{
 		$this->rResource = $rResource;
 		$this->sFileName = $sFileName;
-		$this->iFileSize = $iFileSize;
+//		$this->iFileSize = $iFileSize;
 		$this->bIsInline = $bIsInline;
 		$this->bIsLinked = $bIsLinked;
-		$this->sCID = $sCID;
+		$this->sContentID = $sContentID;
 		$this->aCustomContentTypeParams = $aCustomContentTypeParams;
 		$this->sContentLocation = $sContentLocation;
+		$this->sContentType = $sContentType
+			?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+			?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+			?: 'application/octet-stream';
 	}
 
 	/**
@@ -83,7 +69,7 @@ class Attachment
 
 	public function ContentType() : string
 	{
-		return \MailSo\Base\Utils::MimeContentType($this->sFileName);
+		return $this->sContentType;
 	}
 
 	public function CustomContentTypeParams() : array
@@ -91,69 +77,33 @@ class Attachment
 		return $this->aCustomContentTypeParams;
 	}
 
-	public function CID() : string
-	{
-		return $this->sCID;
-	}
-
-	public function ContentLocation() : string
-	{
-		return $this->sContentLocation;
-	}
-
 	public function FileName() : string
 	{
 		return $this->sFileName;
 	}
 
-	public function FileSize() : int
-	{
-		return $this->iFileSize;
-	}
-
-	public function IsInline() : bool
+	public function isInline() : bool
 	{
 		return $this->bIsInline;
 	}
 
-	public function IsImage() : bool
+	public function isLinked() : bool
 	{
-		return 'image' === \MailSo\Base\Utils::ContentTypeType($this->ContentType(), $this->FileName());
-	}
-
-	public function IsArchive() : bool
-	{
-		return 'archive' === \MailSo\Base\Utils::ContentTypeType($this->ContentType(), $this->FileName());
-	}
-
-	public function IsPdf() : bool
-	{
-		return 'pdf' === \MailSo\Base\Utils::ContentTypeType($this->ContentType(), $this->FileName());
-	}
-
-	public function IsDoc() : bool
-	{
-		return 'doc' === \MailSo\Base\Utils::ContentTypeType($this->ContentType(), $this->FileName());
-	}
-
-	public function IsLinked() : bool
-	{
-		return $this->bIsLinked && \strlen($this->sCID);
+		return $this->bIsLinked && \strlen($this->sContentID);
 	}
 
 	public function ToPart() : Part
 	{
 		$oAttachmentPart = new Part;
 
-		$sFileName = $this->FileName();
-		$sCID = $this->CID();
-		$sContentLocation = $this->ContentLocation();
+		$sFileName = \trim($this->sFileName);
+		$sContentID = $this->sContentID;
+		$sContentLocation = $this->sContentLocation;
 
 		$oContentTypeParameters = null;
 		$oContentDispositionParameters = null;
 
-		if (\strlen(\trim($sFileName)))
-		{
+		if (\strlen($sFileName)) {
 			$oContentTypeParameters =
 				(new ParameterCollection)->Add(new Parameter(
 					Enumerations\Parameter::NAME, $sFileName));
@@ -165,27 +115,25 @@ class Attachment
 
 		$oAttachmentPart->Headers->append(
 			new Header(Enumerations\Header::CONTENT_TYPE,
-				$this->ContentType().';'.
-				(($oContentTypeParameters) ? ' '.$oContentTypeParameters->ToString() : '')
+				$this->ContentType().
+				($oContentTypeParameters ? '; '.$oContentTypeParameters : '')
 			)
 		);
 
 		$oAttachmentPart->Headers->append(
 			new Header(Enumerations\Header::CONTENT_DISPOSITION,
-				($this->IsInline() ? 'inline' : 'attachment').';'.
-				(($oContentDispositionParameters) ? ' '.$oContentDispositionParameters->ToString() : '')
+				($this->isInline() ? 'inline' : 'attachment').
+				($oContentDispositionParameters ? '; '.$oContentDispositionParameters : '')
 			)
 		);
 
-		if (\strlen($sCID))
-		{
+		if (\strlen($sContentID)) {
 			$oAttachmentPart->Headers->append(
-				new Header(Enumerations\Header::CONTENT_ID, $sCID)
+				new Header(Enumerations\Header::CONTENT_ID, $sContentID)
 			);
 		}
 
-		if (\strlen($sContentLocation))
-		{
+		if (\strlen($sContentLocation)) {
 			$oAttachmentPart->Headers->append(
 				new Header(Enumerations\Header::CONTENT_LOCATION, $sContentLocation)
 			);
@@ -193,8 +141,7 @@ class Attachment
 
 		$oAttachmentPart->Body = $this->Resource();
 
-		if ('message/rfc822' !== \strtolower($this->ContentType()))
-		{
+		if ('message/rfc822' !== \strtolower($this->ContentType())) {
 			$oAttachmentPart->Headers->append(
 				new Header(
 					Enumerations\Header::CONTENT_TRANSFER_ENCODING,
@@ -202,17 +149,13 @@ class Attachment
 				)
 			);
 
-			if (\is_resource($oAttachmentPart->Body))
-			{
-				if (!\MailSo\Base\StreamWrappers\Binary::IsStreamRemembed($oAttachmentPart->Body))
-				{
-					$oAttachmentPart->Body =
-						\MailSo\Base\StreamWrappers\Binary::CreateStream($oAttachmentPart->Body,
-							\MailSo\Base\StreamWrappers\Binary::GetInlineDecodeOrEncodeFunctionName(
-								\MailSo\Base\Enumerations\Encoding::BASE64, false));
+			if (\is_resource($oAttachmentPart->Body) && !\MailSo\Base\StreamWrappers\Binary::IsStreamRemembed($oAttachmentPart->Body)) {
+				$oAttachmentPart->Body =
+					\MailSo\Base\StreamWrappers\Binary::CreateStream($oAttachmentPart->Body,
+						\MailSo\Base\StreamWrappers\Binary::GetInlineDecodeOrEncodeFunctionName(
+							\MailSo\Base\Enumerations\Encoding::BASE64_LOWER, false));
 
-					\MailSo\Base\StreamWrappers\Binary::RememberStream($oAttachmentPart->Body);
-				}
+				\MailSo\Base\StreamWrappers\Binary::RememberStream($oAttachmentPart->Body);
 			}
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
index deee8c145..246bc40c5 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Email.php
@@ -11,6 +11,8 @@
 
 namespace MailSo\Mime;
 
+use MailSo\Base\Utils;
+
 /**
  * @category MailSo
  * @package Mime
@@ -18,53 +20,39 @@ namespace MailSo\Mime;
 class Email implements \JsonSerializable
 {
 	/**
-	 * @var string
+	 * display-name https://datatracker.ietf.org/doc/html/rfc2822#section-3.4
 	 */
-	private $sDisplayName;
+	private string $sDisplayName;
 
 	/**
-	 * @var string
+	 * addr-spec https://datatracker.ietf.org/doc/html/rfc2822#section-3.4.1
 	 */
-	private $sEmail;
+	private string $sEmail;
+
+	private string $sDkimStatus = Enumerations\DkimStatus::NONE;
 
 	/**
-	 * @var string
-	 */
-	private $sDkimStatus;
-
-	/**
-	 * @var string
-	 */
-	private $sDkimValue;
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \ValueError
 	 */
 	function __construct(string $sEmail, string $sDisplayName = '')
 	{
-		if (!\strlen(\trim($sEmail)))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\strlen(\trim($sEmail)) && !\strlen(\trim($sDisplayName))) {
+			throw new \ValueError;
 		}
 
-		$this->sEmail = \MailSo\Base\Utils::IdnToAscii(
-			\MailSo\Base\Utils::Trim($sEmail), true);
+		$this->sEmail = \SnappyMail\IDN::emailToAscii(Utils::Trim($sEmail));
 
-		$this->sDisplayName = \MailSo\Base\Utils::Trim($sDisplayName);
-
-		$this->sDkimStatus = Enumerations\DkimStatus::NONE;
-		$this->sDkimValue = '';
+		$this->sDisplayName = Utils::Trim($sDisplayName);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \ValueError
 	 */
 	public static function Parse(string $sEmailAddress) : self
 	{
-		$sEmailAddress = \MailSo\Base\Utils::Trim($sEmailAddress);
-		if (!\strlen(\trim($sEmailAddress)))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		$sEmailAddress = Utils::Trim(Utils::DecodeHeaderValue($sEmailAddress));
+		if (!\strlen(\trim($sEmailAddress))) {
+			throw new \ValueError;
 		}
 
 		$sName = '';
@@ -76,37 +64,28 @@ class Email implements \JsonSerializable
 		$bInComment = false;
 
 		$iStartIndex = 0;
-		$iEndIndex = 0;
 		$iCurrentIndex = 0;
 
-		while ($iCurrentIndex < \strlen($sEmailAddress))
-		{
+		while ($iCurrentIndex < \strlen($sEmailAddress)) {
 			switch ($sEmailAddress[$iCurrentIndex])
 			{
 //				case '\'':
 				case '"':
 //					$sQuoteChar = $sEmailAddress[$iCurrentIndex];
-					if ((!$bInName) && (!$bInAddress) && (!$bInComment))
-					{
+					if (!$bInName && !$bInAddress && !$bInComment) {
 						$bInName = true;
 						$iStartIndex = $iCurrentIndex;
-					}
-					else if ((!$bInAddress) && (!$bInComment))
-					{
-						$iEndIndex = $iCurrentIndex;
-						$sName = \substr($sEmailAddress, $iStartIndex + 1, $iEndIndex - $iStartIndex - 1);
-						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iEndIndex - $iStartIndex + 1);
-						$iEndIndex = 0;
+					} else if (!$bInAddress && !$bInComment) {
+						$sName = \substr($sEmailAddress, $iStartIndex + 1, $iCurrentIndex - $iStartIndex - 1);
+						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iCurrentIndex - $iStartIndex + 1);
 						$iCurrentIndex = 0;
 						$iStartIndex = 0;
 						$bInName = false;
 					}
 					break;
 				case '<':
-					if ((!$bInName) && (!$bInAddress) && (!$bInComment))
-					{
-						if ($iCurrentIndex > 0 && \strlen($sName) === 0)
-						{
+					if (!$bInName && !$bInAddress && !$bInComment) {
+						if ($iCurrentIndex > 0 && !\strlen($sName)) {
 							$sName = \substr($sEmailAddress, 0, $iCurrentIndex);
 						}
 
@@ -115,59 +94,47 @@ class Email implements \JsonSerializable
 					}
 					break;
 				case '>':
-					if ($bInAddress)
-					{
-						$iEndIndex = $iCurrentIndex;
-						$sEmail = \substr($sEmailAddress, $iStartIndex + 1, $iEndIndex - $iStartIndex - 1);
-						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iEndIndex - $iStartIndex + 1);
-						$iEndIndex = 0;
+					if ($bInAddress) {
+						$sEmail = \substr($sEmailAddress, $iStartIndex + 1, $iCurrentIndex - $iStartIndex - 1);
+						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iCurrentIndex - $iStartIndex + 1);
 						$iCurrentIndex = 0;
 						$iStartIndex = 0;
 						$bInAddress = false;
 					}
 					break;
 				case '(':
-					if ((!$bInName) && (!$bInAddress) && (!$bInComment))
-					{
+					if (!$bInName && !$bInAddress && !$bInComment) {
 						$bInComment = true;
 						$iStartIndex = $iCurrentIndex;
 					}
 					break;
 				case ')':
-					if ($bInComment)
-					{
-						$iEndIndex = $iCurrentIndex;
-						$sComment = \substr($sEmailAddress, $iStartIndex + 1, $iEndIndex - $iStartIndex - 1);
-						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iEndIndex - $iStartIndex + 1);
-						$iEndIndex = 0;
+					if ($bInComment) {
+						$sComment = \substr($sEmailAddress, $iStartIndex + 1, $iCurrentIndex - $iStartIndex - 1);
+						$sEmailAddress = \substr_replace($sEmailAddress, '', $iStartIndex, $iCurrentIndex - $iStartIndex + 1);
 						$iCurrentIndex = 0;
 						$iStartIndex = 0;
 						$bInComment = false;
 					}
 					break;
 				case '\\':
-					$iCurrentIndex++;
+					++$iCurrentIndex;
 					break;
 			}
 
-			$iCurrentIndex++;
+			++$iCurrentIndex;
 		}
 
-		if (\strlen($sEmail) === 0)
-		{
+		if (!\strlen($sEmail)) {
 			$aRegs = array('');
-			if (\preg_match('/[^@\s]+@\S+/i', $sEmailAddress, $aRegs) && isset($aRegs[0]))
-			{
+			if (\preg_match('/[^@\s]+@\S+/i', $sEmailAddress, $aRegs) && isset($aRegs[0])) {
 				$sEmail = $aRegs[0];
-			}
-			else
-			{
+			} else {
 				$sName = $sEmailAddress;
 			}
 		}
 
-		if ((\strlen($sEmail) > 0) && (\strlen($sName) == 0) && (\strlen($sComment) == 0))
-		{
+		if (\strlen($sEmail) && !\strlen($sName) && !\strlen($sComment)) {
 			$sName = \str_replace($sEmail, '', $sEmailAddress);
 		}
 
@@ -186,9 +153,9 @@ class Email implements \JsonSerializable
 		return new self($sEmail, $sName);
 	}
 
-	public function GetEmail(bool $bIdn = false) : string
+	public function GetEmail(bool $bUtf8 = false) : string
 	{
-		return $bIdn ? \MailSo\Base\Utils::IdnToUtf8($this->sEmail) : $this->sEmail;
+		return $bUtf8 ? \SnappyMail\IDN::emailToUtf8($this->sEmail) : $this->sEmail;
 	}
 
 	public function GetDisplayName() : string
@@ -196,72 +163,51 @@ class Email implements \JsonSerializable
 		return $this->sDisplayName;
 	}
 
-	public function GetDkimStatus() : string
+	public function getLocalPart() : string
 	{
-		return $this->sDkimStatus;
-	}
-
-	public function GetDkimValue() : string
-	{
-		return $this->sDkimValue;
-	}
-
-	public function GetAccountName() : string
-	{
-		return \MailSo\Base\Utils::GetAccountNameFromEmail($this->GetEmail(false));
+		return Utils::getEmailAddressLocalPart($this->sEmail);
 	}
 
 	public function GetDomain(bool $bIdn = false) : string
 	{
-		return \MailSo\Base\Utils::GetDomainFromEmail($this->GetEmail($bIdn));
+		return Utils::getEmailAddressDomain($this->GetEmail($bIdn));
 	}
 
-	public function SetDkimStatusAndValue(string $sDkimStatus, string $sDkimValue = '')
+	public function SetDkimStatus(string $sDkimStatus)
 	{
 		$this->sDkimStatus = Enumerations\DkimStatus::normalizeValue($sDkimStatus);
-		$this->sDkimValue = $sDkimValue;
 	}
 
-	public function ToArray(bool $bIdn = false, bool $bDkim = true) : array
-	{
-		return $bDkim ?
-			array($this->sDisplayName, $this->GetEmail($bIdn), $this->sDkimStatus, $this->sDkimValue) :
-			array($this->sDisplayName, $this->GetEmail($bIdn));
-	}
-
-	public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false) : string
+	public function ToString(bool $bConvertSpecialsName = false, bool $bUtf8 = false) : string
 	{
 		$sReturn = '';
-
-		$sDisplayName = \str_replace('"', '\"', $this->sDisplayName);
-		if ($bConvertSpecialsName)
-		{
-			$sDisplayName = 0 === \strlen($sDisplayName) ? '' : \MailSo\Base\Utils::EncodeUnencodedValue(
-				\MailSo\Base\Enumerations\Encoding::BASE64_SHORT,
-				$sDisplayName);
-		}
-
-		$sDisplayName = 0 === \strlen($sDisplayName) ? '' : '"'.$sDisplayName.'"';
-		if (\strlen($this->sEmail))
-		{
-			$sReturn = $this->GetEmail($bIdn);
-			if (\strlen($sDisplayName))
-			{
-				$sReturn = $sDisplayName.' <'.$sReturn.'>';
+		if (\strlen($this->sEmail)) {
+			$sReturn = $this->GetEmail($bUtf8);
+			$sDisplayName = $this->sDisplayName;
+			if (\strlen($sDisplayName)) {
+				$sDisplayName = \str_replace('"', '\"', $sDisplayName);
+				if ($bConvertSpecialsName) {
+					$sDisplayName = Utils::EncodeHeaderValue($sDisplayName);
+				}
+				$sReturn = '"'.$sDisplayName.'" <'.$sReturn.'>';
 			}
 		}
-
-		return \trim($sReturn);
+		return $sReturn;
 	}
 
-	public function jsonSerialize()
+	public function __toString() : string
+	{
+		return $this->ToString();
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
 		return array(
 			'@Object' => 'Object/Email',
-			'Name' => \MailSo\Base\Utils::Utf8Clear($this->GetDisplayName()),
-			'Email' => \MailSo\Base\Utils::Utf8Clear($this->GetEmail(true)),
-			'DkimStatus' => $this->GetDkimStatus(),
-			'DkimValue' => $this->GetDkimValue()
+			'name' => Utils::Utf8Clear($this->sDisplayName),
+			'email' => Utils::Utf8Clear($this->GetEmail(true)),
+			'dkimStatus' => $this->sDkimStatus
 		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
index bb8b88996..8513a506d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/EmailCollection.php
@@ -27,42 +27,19 @@ class EmailCollection extends \MailSo\Base\Collection
 		}
 	}
 
-	public function append($oEmail, bool $bToTop = false) : void
+	public function append($oEmail, bool $bToTop = false): void
 	{
 		assert($oEmail instanceof Email);
 		parent::append($oEmail, $bToTop);
 	}
 
-	public function ToArray() : array
-	{
-		$aReturn = array();
-		foreach ($this as $oEmail)
-		{
-			$aReturn[] = $oEmail->ToArray();
-		}
-
-		return $aReturn;
-	}
-
-	public function MergeWithOtherCollection(EmailCollection $oEmails) : self
-	{
-		foreach ($oEmails as $oEmail)
-		{
-			$this->append($oEmail);
-		}
-
-		return $this;
-	}
-
-	public function Unique() : self
+	public function Unique(): self
 	{
 		$aReturn = array();
 
-		foreach ($this as $oEmail)
-		{
+		foreach ($this as $oEmail) {
 			$sEmail = $oEmail->GetEmail();
-			if (!isset($aReturn[$sEmail]))
-			{
+			if (!isset($aReturn[$sEmail])) {
 				$aReturn[$sEmail] = $oEmail;
 			}
 		}
@@ -70,25 +47,28 @@ class EmailCollection extends \MailSo\Base\Collection
 		return new static($aReturn);
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false) : string
+	public function ToString(bool $bConvertSpecialsName = false, bool $bIdn = false): string
 	{
 		$aReturn = array();
-		foreach ($this as $oEmail)
-		{
+		foreach ($this as $oEmail) {
 			$aReturn[] = $oEmail->ToString($bConvertSpecialsName, $bIdn);
 		}
 
 		return \implode(', ', $aReturn);
 	}
 
-	private function parseEmailAddresses(string $sRawEmails) : void
+	public function __toString(): string
+	{
+		return $this->ToString();
+	}
+
+	private function parseEmailAddresses(string $sRawEmails): void
 	{
 //		$sRawEmails = \MailSo\Base\Utils::Trim($sRawEmails);
 		$sRawEmails = \trim($sRawEmails);
 
 		$sWorkingRecipientsLen = \strlen($sRawEmails);
-		if (!$sWorkingRecipientsLen)
-		{
+		if (!$sWorkingRecipientsLen) {
 			return;
 		}
 
@@ -102,59 +82,49 @@ class EmailCollection extends \MailSo\Base\Collection
 
 		$iCurrentPos = 0;
 
-		while ($iCurrentPos < $sWorkingRecipientsLen)
-		{
+		while ($iCurrentPos < $sWorkingRecipientsLen) {
 			switch ($sRawEmails[$iCurrentPos])
 			{
 				case '\'':
 				case '"':
-					if (!$bIsInQuotes)
-					{
+					if (!$bIsInQuotes) {
 						$sChQuote = $sRawEmails[$iCurrentPos];
 						$bIsInQuotes = true;
-					}
-					else if ($sChQuote == $sRawEmails[$iCurrentPos])
-					{
+					} else if ($sChQuote == $sRawEmails[$iCurrentPos]) {
 						$bIsInQuotes = false;
 					}
 					break;
 
 				case '<':
-					if (!$bIsInAngleBrackets)
-					{
+					if (!$bIsInAngleBrackets) {
 						$bIsInAngleBrackets = true;
-						if ($bIsInQuotes)
-						{
+						if ($bIsInQuotes) {
 							$bIsInQuotes = false;
 						}
 					}
 					break;
 
 				case '>':
-					if ($bIsInAngleBrackets)
-					{
+					if ($bIsInAngleBrackets) {
 						$bIsInAngleBrackets = false;
 					}
 					break;
 
 				case '(':
-					if (!$bIsInBrackets)
-					{
+					if (!$bIsInBrackets) {
 						$bIsInBrackets = true;
 					}
 					break;
 
 				case ')':
-					if ($bIsInBrackets)
-					{
+					if ($bIsInBrackets) {
 						$bIsInBrackets = false;
 					}
 					break;
 
 				case ',':
 				case ';':
-					if (!$bIsInAngleBrackets && !$bIsInBrackets && !$bIsInQuotes)
-					{
+					if (!$bIsInAngleBrackets && !$bIsInBrackets && !$bIsInQuotes) {
 						$iEmailEndPos = $iCurrentPos;
 
 						try
@@ -165,7 +135,7 @@ class EmailCollection extends \MailSo\Base\Collection
 
 							$iEmailStartPos = $iCurrentPos + 1;
 						}
-						catch (\MailSo\Base\Exceptions\InvalidArgumentException $oException)
+						catch (\Throwable $oException)
 						{
 						}
 					}
@@ -175,15 +145,21 @@ class EmailCollection extends \MailSo\Base\Collection
 			++$iCurrentPos;
 		}
 
-		if ($iEmailStartPos < $iCurrentPos)
-		{
+		if ($iEmailStartPos < $iCurrentPos) {
 			try
 			{
 				$this->append(
 					Email::Parse(\substr($sRawEmails, $iEmailStartPos, $iCurrentPos - $iEmailStartPos))
 				);
 			}
-			catch (\MailSo\Base\Exceptions\InvalidArgumentException $oException) {}
+			catch (\Throwable $oException) {}
 		}
 	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return \array_slice($this->getArrayCopy(), 0, 100);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/ContentType.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/ContentType.php
new file mode 100644
index 000000000..f6761dd45
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/ContentType.php
@@ -0,0 +1,41 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2024 SnappyMail
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Mime\Enumerations;
+
+/**
+ * @category MailSo
+ * @package Mime
+ * @subpackage Enumerations
+ */
+abstract class ContentType
+{
+	const SIGNED = 'multipart/signed';
+	const ENCRYPTED = 'multipart/encrypted';
+	const PGP_ENCRYPTED = 'application/pgp-encrypted';
+	const PGP_SIGNATURE = 'application/pgp-signature';
+	const PKCS7_SIGNATURE = 'application/pkcs7-signature';
+	const PKCS7_MIME = 'application/pkcs7-mime';
+	// RFC 3462
+	const REPORT = 'multipart/report'; // ; report-type=delivery-status;
+
+	public static function isPkcs7Mime(string $data) : bool
+	{
+		return 'application/pkcs7-mime' === $data
+			|| 'application/x-pkcs7-mime' === $data;
+	}
+
+	public static function isPkcs7Signature(string $data) : bool
+	{
+		return 'application/pkcs7-signature' === $data
+			|| 'application/x-pkcs7-signature' === $data;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/DkimStatus.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/DkimStatus.php
index 366e67a70..398514375 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/DkimStatus.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/DkimStatus.php
@@ -16,6 +16,8 @@ namespace MailSo\Mime\Enumerations;
  * @package Mime
  * @subpackage Enumerations
  */
+//enum DkimStatus:string
+//final class DkimStatus extends \BackedEnumString
 abstract class DkimStatus
 {
 	const NONE = 'none';
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
index 395ff4b4a..fc8e6da4a 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/Header.php
@@ -44,6 +44,7 @@ abstract class Header
 		CONTENT_DISPOSITION = 'Content-Disposition',
 		CONTENT_DESCRIPTION = 'Content-Description',
 		CONTENT_ID = 'Content-ID',
+//		CONTENT_BASE = 'Content-Base', // rfc2110
 		CONTENT_LOCATION = 'Content-Location',
 
 		RECEIVED_SPF = 'Received-SPF',
@@ -59,6 +60,7 @@ abstract class Header
 		X_SPAM_STATUS   = 'X-Spam-Status',   // Yes|No
 		X_SPAM_BAR      = 'X-Spam-Bar',      // ++ | --
 		X_SPAM_REPORT   = 'X-Spam-Report',
+		X_SPAM_INFO     = 'X-Spam-Info',     // v4.0.0
 	// Rspamd
 		X_SPAMD_RESULT  = 'X-Spamd-Result',  // default: False [7.13 / 9.00],
 		X_SPAMD_BAR     = 'X-Spamd-Bar',     // +++++++
@@ -88,5 +90,14 @@ abstract class Header
 		IMPORTANCE = 'Importance',
 		X_PRIORITY = 'X-Priority',
 
+		// https://autocrypt.org/level1.html#the-autocrypt-header
+		AUTOCRYPT = 'Autocrypt',
+		// Deprecated https://datatracker.ietf.org/doc/html/draft-josefsson-openpgp-mailnews-header-07
+//		X_PGP_KEY = 'X-PGP-Key',
+//		OPENPGP = 'OpenPGP', // url="https://www.irf.se/pgp/robert.labudda" id=11FA93ABE6892CA7D58CB0BE6392A597DE44B055
+
+		// https://www.ietf.org/archive/id/draft-brand-indicators-for-message-identification-04.html#bimi-selector
+		BIMI_SELECTOR = 'BIMI-Selector',
+
 		LIST_UNSUBSCRIBE = 'List-Unsubscribe';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php
deleted file mode 100644
index 625b587b6..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Enumerations/MimeType.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Mime\Enumerations;
-
-/**
- * @category MailSo
- * @package Mime
- * @subpackage Enumerations
- */
-abstract class MimeType
-{
-	const TEXT_PLAIN = 'text/plain';
-
-	const MULTIPART_ALTERNATIVE = 'multipart/alternative';
-	const MULTIPART_RELATED = 'multipart/related';
-	const MULTIPART_MIXED = 'multipart/mixed';
-
-	const MULTIPART_SIGNED = 'multipart/signed';
-	const APPLICATION_PGP_SIGNATURE = 'application/pgp-signature';
-
-	const MULTIPART_ENCRYPTED = 'multipart/encrypted';
-	const APPLICATION_PGP_ENCRYPTED = 'application/pgp-encrypted';
-	const APPLICATION_OCTET_STREAM = 'application/octet-stream';
-
-	const MESSAGE_RFC822 = 'message/rfc822';
-	const MESSAGE_PARTIAL = 'message/partial';
-	const MESSAGE_REPORT = 'message/report';
-
-	const APPLICATION_MS_TNEF = 'application/ms-tnef';
-	const APPLICATION_PKCS7_MIME = 'application/pkcs7-mime';
-	const APPLICATION_PKCS7_SIGNATURE = 'application/pkcs7-signature';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
index a0f58dc29..523134093 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Header.php
@@ -15,37 +15,19 @@ namespace MailSo\Mime;
  * @category MailSo
  * @package Mime
  */
-class Header
+class Header implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $sName;
 
-	/**
-	 * @var string
-	 */
-	private $sValue;
+	private string $sValue;
 
-	/**
-	 * @var string
-	 */
-	private $sFullValue;
+	private string $sFullValue;
 
-	/**
-	 * @var string
-	 */
-	private $sEncodedValueForReparse;
+	private string $sEncodedValue;
 
-	/**
-	 * @var ParameterCollection
-	 */
-	private $oParameters;
+	private ?ParameterCollection $oParameters = null;
 
-	/**
-	 * @var strign
-	 */
-	private $sParentCharset;
+	private string $sParentCharset;
 
 	function __construct(string $sName, string $sValue = '', string $sEncodedValueForReparse = '', string $sParentCharset = '')
 	{
@@ -53,32 +35,25 @@ class Header
 		$this->initInputData($sName, $sValue, $sEncodedValueForReparse);
 	}
 
-	private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse) : void
+	private function initInputData(string $sName, string $sValue, string $sEncodedValueForReparse): void
 	{
 		$this->sName = \trim($sName);
 		$this->sFullValue = \trim($sValue);
-		$this->sEncodedValueForReparse = '';
+		$this->sEncodedValue = '';
 
-		if (\strlen($sEncodedValueForReparse) && $this->IsReparsed())
-		{
-			$this->sEncodedValueForReparse = \trim($sEncodedValueForReparse);
+		if (\strlen($sEncodedValueForReparse) && ($this->IsEmail() || $this->IsSubject() || $this->IsParameterized())) {
+			$this->sEncodedValue = \trim($sEncodedValueForReparse);
 		}
 
-		if (\strlen($this->sFullValue) && $this->IsParameterized())
-		{
+		if (\strlen($this->sFullValue) && $this->IsParameterized()) {
 			$aRawExplode = \explode(';', $this->sFullValue, 2);
-			if (2 === \count($aRawExplode))
-			{
+			if (2 === \count($aRawExplode)) {
 				$this->sValue = $aRawExplode[0];
 				$this->oParameters = new ParameterCollection($aRawExplode[1]);
-			}
-			else
-			{
+			} else {
 				$this->sValue = $this->sFullValue;
 			}
-		}
-		else
-		{
+		} else {
 			$this->sValue = $this->sFullValue;
 		}
 
@@ -87,16 +62,14 @@ class Header
 		}
 	}
 
-	public static function NewInstanceFromEncodedString(string $sEncodedLines, string $sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1) : Header
+	public static function NewInstanceFromEncodedString(string $sEncodedLines, string $sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1): Header
 	{
-		if (empty($sIncomingCharset))
-		{
+		if (empty($sIncomingCharset)) {
 			$sIncomingCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1;
 		}
 
 		$aParts = \explode(':', \str_replace("\r", '', $sEncodedLines), 2);
-		if (isset($aParts[0]) && isset($aParts[1]) && \strlen($aParts[0]) && \strlen($aParts[1]))
-		{
+		if (isset($aParts[0]) && isset($aParts[1]) && \strlen($aParts[0]) && \strlen($aParts[1])) {
 			return new self(
 				\trim($aParts[0]),
 				\trim(\MailSo\Base\Utils::DecodeHeaderValue(\trim($aParts[1]), $sIncomingCharset)),
@@ -108,34 +81,33 @@ class Header
 		return false;
 	}
 
-	public function Name() : string
+	public function Name(): string
 	{
 		return $this->sName;
 	}
 
-	public function NameWithDelimitrom() : string
-	{
-		return $this->Name().': ';
-	}
-
-	public function Value() : string
+	public function Value(): string
 	{
 		return $this->sValue;
 	}
 
-	public function FullValue() : string
+	public function FullValue(): string
 	{
 		return $this->sFullValue;
 	}
 
-	public function SetParentCharset(string $sParentCharset) : Header
+	public function EncodedValue(): string
 	{
-		if ($this->sParentCharset !== $sParentCharset && $this->IsReparsed() && \strlen($this->sEncodedValueForReparse))
-		{
+		return $this->sEncodedValue ?: $this->sFullValue;
+	}
+
+	public function SetParentCharset(string $sParentCharset): Header
+	{
+		if ($this->sParentCharset !== $sParentCharset && \strlen($this->sEncodedValue)) {
 			$this->initInputData(
 				$this->sName,
-				\trim(\MailSo\Base\Utils::DecodeHeaderValue($this->sEncodedValueForReparse, $sParentCharset)),
-				$this->sEncodedValueForReparse
+				\trim(\MailSo\Base\Utils::DecodeHeaderValue($this->sEncodedValue, $sParentCharset)),
+				$this->sEncodedValue
 			);
 		}
 
@@ -144,74 +116,64 @@ class Header
 		return $this;
 	}
 
-	public function Parameters() : ?ParameterCollection
+	public function Parameters(): ?ParameterCollection
 	{
 		return $this->oParameters;
 	}
 
-	public function setParameter(string $sName, string $sValue) : void
+	public function setParameter(string $sName, string $sValue): void
 	{
 		$this->oParameters->setParameter($sName, $sValue);
 	}
 
-	private function wordWrapHelper(string $sValue, string $sGlue = "\r\n ") : string
-	{
-		return \trim(\substr(\wordwrap($this->NameWithDelimitrom().$sValue,
-			74, $sGlue
-		), \strlen($this->NameWithDelimitrom())));
-	}
-
-	public function __toString() : string
+	public function __toString(): string
 	{
 		$sResult = $this->sFullValue;
 
-		if ($this->IsSubject())
-		{
-			if (!\MailSo\Base\Utils::IsAscii($sResult) &&
-				\function_exists('iconv_mime_encode'))
-			{
-				$aPreferences = array(
+		if ($this->IsSubject()) {
+			if (!\MailSo\Base\Utils::IsAscii($sResult) && \function_exists('iconv_mime_encode')) {
+				return \iconv_mime_encode($this->Name(), $sResult, array(
 //					'scheme' => \MailSo\Base\Enumerations\Encoding::QUOTED_PRINTABLE_SHORT,
 					'scheme' => \MailSo\Base\Enumerations\Encoding::BASE64_SHORT,
 					'input-charset' => \MailSo\Base\Enumerations\Charset::UTF_8,
 					'output-charset' => \MailSo\Base\Enumerations\Charset::UTF_8,
 					'line-length' => 74,
 					'line-break-chars' => "\r\n"
-				);
-
-				return \iconv_mime_encode($this->Name(), $sResult, $aPreferences);
+				));
 			}
 		}
-		else if ($this->IsParameterized() && 0 < $this->oParameters->Count())
+		else if ($this->IsParameterized() && $this->oParameters->count())
 		{
 			$sResult = $this->sValue.'; '.$this->oParameters->ToString(true);
 		}
 		else if ($this->IsEmail())
 		{
 			$oEmailCollection = new EmailCollection($this->sFullValue);
-			if ($oEmailCollection && 0 < $oEmailCollection->Count())
-			{
-				$sResult = $oEmailCollection->ToString(true, false);
+			if ($oEmailCollection && $oEmailCollection->count()) {
+				$sResult = $oEmailCollection->ToString(true);
 			}
 		}
 
-		return $this->NameWithDelimitrom().$this->wordWrapHelper($sResult);
+		// https://www.rfc-editor.org/rfc/rfc2822#section-2.1.1, avoid folding immediately after the header name
+		$sName = $this->sName . ': ';
+		return $sName . \wordwrap($sResult, 78 - \strlen($sName) - 1, "\r\n ");
 	}
 
-	public function IsSubject() : bool
+	private function IsSubject(): bool
 	{
 		return \strtolower(Enumerations\Header::SUBJECT) === \strtolower($this->Name());
 	}
 
-	public function IsParameterized() : bool
+	private function IsParameterized(): bool
 	{
 		return \in_array(\strtolower($this->sName), array(
 			\strtolower(Enumerations\Header::CONTENT_TYPE),
 			\strtolower(Enumerations\Header::CONTENT_DISPOSITION)
+//			,\strtolower(Enumerations\Header::AUTOCRYPT)
 		));
 	}
 
-	public function IsEmail() : bool
+	private function IsEmail(): bool
 	{
 		return \in_array(\strtolower($this->sName), array(
 			\strtolower(Enumerations\Header::FROM_),
@@ -219,31 +181,34 @@ class Header
 			\strtolower(Enumerations\Header::CC),
 			\strtolower(Enumerations\Header::BCC),
 			\strtolower(Enumerations\Header::REPLY_TO),
-			\strtolower(Enumerations\Header::RETURN_PATH),
+//			\strtolower(Enumerations\Header::RETURN_PATH),
 			\strtolower(Enumerations\Header::SENDER)
 		));
 	}
 
-	public function ValueWithCharsetAutoDetect() : string
+	public function ValueWithCharsetAutoDetect(): string
 	{
-		$sValue = $this->Value();
-		if (!\MailSo\Base\Utils::IsAscii($sValue) &&
-			\strlen($this->sEncodedValueForReparse) &&
-			!\MailSo\Base\Utils::IsAscii($this->sEncodedValueForReparse))
-		{
-			$sValueCharset = \MailSo\Base\Utils::CharsetDetect($this->sEncodedValueForReparse);
-			if (\strlen($sValueCharset))
-			{
-				$this->SetParentCharset($sValueCharset);
-				$sValue = $this->Value();
-			}
+		if (!\MailSo\Base\Utils::IsAscii($this->Value())
+		 && \strlen($this->sEncodedValue)
+		 && !\MailSo\Base\Utils::IsAscii($this->sEncodedValue)
+		 && ($mEncoding = \mb_detect_encoding($this->sEncodedValue, 'auto', true))
+		) {
+			$this->SetParentCharset($mEncoding);
 		}
-
-		return $sValue;
+		return $this->Value();
 	}
 
-	public function IsReparsed() : bool
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		return $this->IsEmail() || $this->IsSubject() || $this->IsParameterized();
+		$aResult = array(
+			'@Object' => 'Object/MimeHeader',
+			'name' => $this->sName,
+			'value' => $this->sValue // $this->EncodedValue()
+		);
+		if ($this->oParameters->count()) {
+			$aResult['parameters'] = $this->oParameters;
+		}
+		return $aResult;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
index 1125fddb1..84283e097 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/HeaderCollection.php
@@ -17,58 +17,52 @@ namespace MailSo\Mime;
  */
 class HeaderCollection extends \MailSo\Base\Collection
 {
+	protected string $sParentCharset = '';
 
-	protected $sRawHeaders = '';
-
-	/**
-	 * @var string
-	 */
-	protected $sParentCharset = '';
-
-	function __construct(string $sRawHeaders = '', bool $bStoreRawHeaders = true, string $sParentCharset = '')
+	function __construct(string $sRawHeaders = '', string $sParentCharset = '')
 	{
 		parent::__construct();
 		if (\strlen($sRawHeaders)) {
-			$this->Parse($sRawHeaders, $bStoreRawHeaders, $sParentCharset);
+			$this->Parse($sRawHeaders, $sParentCharset);
 		}
 	}
 
-	public function append($oHeader, bool $bToTop = false) : void
+	public function append($oHeader, bool $bToTop = false): void
 	{
 		assert($oHeader instanceof Header);
 		parent::append($oHeader, $bToTop);
 	}
 
-	public function AddByName(string $sName, string $sValue, bool $bToTop = false) : self
+	public function AddByName(string $sName, string $sValue, bool $bToTop = false): self
 	{
 		$this->append(new Header($sName, $sValue), $bToTop);
 		return $this;
 	}
 
-	public function SetByName(string $sName, string $sValue, bool $bToTop = false) : self
+	public function SetByName(string $sName, string $sValue, bool $bToTop = false): self
 	{
 		return $this->RemoveByName($sName)->Add(new Header($sName, $sValue), $bToTop);
 	}
 
-	public function ValueByName(string $sHeaderName, bool $bCharsetAutoDetect = false) : string
+	public function ValueByName(string $sHeaderName, bool $bCharsetAutoDetect = false): string
 	{
 		$oHeader = $this->GetByName($sHeaderName);
 		return $oHeader ? ($bCharsetAutoDetect ? $oHeader->ValueWithCharsetAutoDetect() : $oHeader->Value()) : '';
 	}
 
-	public function ValuesByName(string $sHeaderName, bool $bCharsetAutoDetect = false) : array
+	public function ValuesByName(string $sHeaderName): array
 	{
 		$aResult = array();
 		$sHeaderNameLower = \strtolower($sHeaderName);
 		foreach ($this as $oHeader) {
 			if ($sHeaderNameLower === \strtolower($oHeader->Name())) {
-				$aResult[] = $bCharsetAutoDetect ? $oHeader->ValueWithCharsetAutoDetect() : $oHeader->Value();
+				$aResult[] = $oHeader->Value();
 			}
 		}
 		return $aResult;
 	}
 
-	public function RemoveByName(string $sHeaderName) : self
+	public function RemoveByName(string $sHeaderName): self
 	{
 		$sHeaderName = \strtolower($sHeaderName);
 		$this->exchangeArray(array_filter($this->getArrayCopy(), function ($oHeader) use ($sHeaderName) {
@@ -77,29 +71,22 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function GetAsEmailCollection(string $sHeaderName, bool $bCharsetAutoDetect = false) : ?EmailCollection
+	public function GetAsEmailCollection(string $sHeaderName): ?EmailCollection
 	{
-		$oResult = null;
-		$sValue = $this->ValueByName($sHeaderName, $bCharsetAutoDetect);
-		if (\strlen($sValue)) {
-			$oResult = new EmailCollection($sValue);
+		if ($oHeader = $this->GetByName($sHeaderName)) {
+			return new EmailCollection($oHeader->EncodedValue());
 		}
-		return $oResult && 0 < $oResult->Count() ? $oResult : null;
+		return new EmailCollection();
 	}
 
-	public function ParametersByName(string $sHeaderName) : ?ParameterCollection
+	public function ParameterValue(string $sHeaderName, string $sParamName): string
 	{
 		$oHeader = $this->GetByName($sHeaderName);
-		return $oHeader ? $oHeader->Parameters() : null;
-	}
-
-	public function ParameterValue(string $sHeaderName, string $sParamName) : string
-	{
-		$oParameters = $this->ParametersByName($sHeaderName);
+		$oParameters = $oHeader ? $oHeader->Parameters() : null;
 		return (null !== $oParameters) ? $oParameters->ParameterValueByName($sParamName) : '';
 	}
 
-	public function GetByName(string $sHeaderName) : ?Header
+	public function GetByName(string $sHeaderName): ?Header
 	{
 		$sHeaderNameLower = \strtolower($sHeaderName);
 		foreach ($this as $oHeader) {
@@ -110,7 +97,7 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return null;
 	}
 
-	public function SetParentCharset(string $sParentCharset) : self
+	public function SetParentCharset(string $sParentCharset): self
 	{
 		if (\strlen($sParentCharset) && $this->sParentCharset !== $sParentCharset) {
 			foreach ($this as $oHeader) {
@@ -121,20 +108,10 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function Clear() : void
-	{
-		parent::Clear();
-		$this->sRawHeaders = '';
-	}
-
-	public function Parse(string $sRawHeaders, bool $bStoreRawHeaders = false, string $sParentCharset = '') : self
+	public function Parse(string $sRawHeaders, string $sParentCharset = ''): self
 	{
 		$this->Clear();
 
-		if ($bStoreRawHeaders) {
-			$this->sRawHeaders = $sRawHeaders;
-		}
-
 		if (\strlen($this->sParentCharset)) {
 			$this->sParentCharset = $sParentCharset;
 		}
@@ -149,40 +126,27 @@ class HeaderCollection extends \MailSo\Base\Collection
 			}
 
 			$sFirstChar = \substr($sHeadersValue, 0, 1);
-			if ($sFirstChar !== ' ' && $sFirstChar !== "\t" && false === \strpos($sHeadersValue, ':'))
-			{
+			if ($sFirstChar !== ' ' && $sFirstChar !== "\t" && false === \strpos($sHeadersValue, ':')) {
 				continue;
 			}
-			else if (null !== $sName && ($sFirstChar === ' ' || $sFirstChar === "\t"))
-			{
+			if (null !== $sName && ($sFirstChar === ' ' || $sFirstChar === "\t")) {
 				$sValue = \is_null($sValue) ? '' : $sValue;
 
-				if ('?=' === \substr(\rtrim($sHeadersValue), -2))
-				{
+				if ('?=' === \substr(\rtrim($sHeadersValue), -2)) {
 					$sHeadersValue = \rtrim($sHeadersValue);
 				}
 
-				if ('=?' === \substr(\ltrim($sHeadersValue), 0, 2))
-				{
-					$sHeadersValue = \ltrim($sHeadersValue);
+				// RFC 5322 unfolding removes the line break and keeps the folding
+				// whitespace; RFC 2047 6.2 drops it only between two encoded words.
+				if ('=?' === \substr(\ltrim($sHeadersValue), 0, 2) && '?=' === \substr($sValue, -2)) {
+					$sValue .= \ltrim($sHeadersValue);
+				} else {
+					$sValue .= ' '.\ltrim($sHeadersValue);
 				}
-
-				if ('=?' === \substr($sHeadersValue, 0, 2))
-				{
-					$sValue .= $sHeadersValue;
-				}
-				else
-				{
-					$sValue .= "\n".$sHeadersValue;
-				}
-			}
-			else
-			{
-				if (null !== $sName)
-				{
+			} else {
+				if (null !== $sName) {
 					$oHeader = Header::NewInstanceFromEncodedString($sName.': '.$sValue, $this->sParentCharset);
-					if ($oHeader)
-					{
+					if ($oHeader) {
 						$this->append($oHeader);
 					}
 
@@ -194,18 +158,15 @@ class HeaderCollection extends \MailSo\Base\Collection
 				$sName = $aHeaderParts[0];
 				$sValue = isset($aHeaderParts[1]) ? $aHeaderParts[1] : '';
 
-				if ('?=' === \substr(\rtrim($sValue), -2))
-				{
+				if ('?=' === \substr(\rtrim($sValue), -2)) {
 					$sValue = \rtrim($sValue);
 				}
 			}
 		}
 
-		if (null !== $sName)
-		{
+		if (null !== $sName) {
 			$oHeader = Header::NewInstanceFromEncodedString($sName.': '.$sValue, $this->sParentCharset);
-			if ($oHeader)
-			{
+			if ($oHeader) {
 				$this->append($oHeader);
 			}
 		}
@@ -213,96 +174,89 @@ class HeaderCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function DkimStatuses() : array
+	/**
+	 * https://www.rfc-editor.org/rfc/rfc8601
+	 * dkim=pass header.d=domain.tld header.s=s1 header.b=F2SfoZWw;
+	 * spf=pass (ORIGINATING: domain of "snappymail@domain.tld" designates 0.0.0.0 as permitted sender) smtp.mailfrom="snappymail@domain.tld";
+	 * dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=domain.tld (policy=none)
+	 */
+	public function AuthStatuses(string $sTrustedIds = ''): array
 	{
-		$aResult = array();
-
+		$aResult = [
+			'dkim' => [],
+			'dmarc' => [],
+			'spf' => []
+		];
 		$aHeaders = $this->ValuesByName(Enumerations\Header::AUTHENTICATION_RESULTS);
-		if (\count($aHeaders))
-		{
-			foreach ($aHeaders as $sHeaderValue)
-			{
-				$sStatus = '';
-				$sHeader = '';
-				$sDkimLine = '';
 
-				$aMatch = array();
+		/**
+		 * A sender can add this header itself, so a result is only worth reading when the
+		 * server that wrote it handled the message. $sTrustedIds names those servers by
+		 * authserv-id; with none given, the authserv-id of the topmost header is taken as
+		 * the local one, which keeps the separate headers an opendkim and an opendmarc
+		 * each add. See RFC 8601 section 7.1.
+		 */
+		$aTrusted = \array_filter(\preg_split('/[\\s,;]+/', \strtolower(\trim($sTrustedIds))));
+		$bConfigured = !!\count($aTrusted);
+		if (\count($aHeaders)) {
+			// The authserv-id is the first field, before the first ";". A version number
+			// may follow it, and a comment may sit anywhere.
+			$fAuthservId = function (string $sValue) : string {
+				$sId = \preg_replace('/\\([^)]*\\)/', ' ', \explode(';', $sValue, 2)[0]);
+				return \strtolower(\trim(\preg_replace('/\\s+\\d+$/', '', \trim($sId)), " \t\""));
+			};
+			$aTrusted = $aTrusted ?: array($fAuthservId($aHeaders[0]));
+			$aHeaders = \array_filter($aHeaders, fn($sValue) => \in_array($fAuthservId($sValue), $aTrusted, true));
+		}
 
-				$sHeaderValue = \preg_replace('/[\r\n\t\s]+/', ' ', $sHeaderValue);
-
-				if (\preg_match('/dkim=.+/i', $sHeaderValue, $aMatch) && !empty($aMatch[0]))
-				{
-					$sDkimLine = $aMatch[0];
-
-					$aMatch = array();
-					if (\preg_match('/dkim=([a-zA-Z0-9]+)/i', $sDkimLine, $aMatch) && !empty($aMatch[1]))
-					{
-						$sStatus = $aMatch[1];
-					}
-
-					$aMatch = array();
-					if (\preg_match('/header\.(d|i|from)=([^\s;]+)/i', $sDkimLine, $aMatch) && !empty($aMatch[2]))
-					{
-						$sHeader = \trim($aMatch[2]);
-					}
-
-					if (!empty($sStatus) && !empty($sHeader))
-					{
-						$aResult[] = array($sStatus, $sHeader, $sDkimLine);
-					}
+		if (\count($aHeaders)) {
+			$aHeaders = \implode(';', $aHeaders);
+			$aHeaders = \preg_replace('/[\\r\\n\\t\\s]+/', ' ', $aHeaders);
+			$aHeaders = \str_replace('-bit key;', '-bit key,', $aHeaders);
+			$aHeaders = \explode(';', $aHeaders);
+			foreach ($aHeaders as $sLine) {
+				$aStatus = array();
+				$aHeader = array();
+				if (\preg_match("/(dkim|dmarc|spf)=([a-z0-9]+).*?(;|$)/Di", $sLine, $aStatus)
+				 && \preg_match('/(?:header\\.(?:d|i|from)|smtp.mailfrom)="?([^\\s;"]+)/i', $sLine, $aHeader)
+				) {
+					$sType = \strtolower($aStatus[1]);
+					$aResult[$sType][] = array(\strtolower($aStatus[2]), $aHeader[1], \trim($sLine));
 				}
 			}
 		}
-		else
-		{
+		if (!\count($aResult['dkim']) && !$bConfigured) {
 			// X-DKIM-Authentication-Results: signer="hostinger.com" status="pass"
+			// This one carries no authserv-id, so there is nothing to tie it to: only the
+			// topmost is read, and an install that names its trusted ids skips it.
 			$aHeaders = $this->ValuesByName(Enumerations\Header::X_DKIM_AUTHENTICATION_RESULTS);
-			foreach ($aHeaders as $sHeaderValue)
-			{
-				$sStatus = '';
-				$sHeader = '';
-
-				$aMatch = array();
-
-				$sHeaderValue = \preg_replace('/[\r\n\t\s]+/', ' ', $sHeaderValue);
-
-				if (\preg_match('/status[\s]?=[\s]?"([a-zA-Z0-9]+)"/i', $sHeaderValue, $aMatch) && !empty($aMatch[1]))
-				{
-					$sStatus = $aMatch[1];
-				}
-
-				if (\preg_match('/signer[\s]?=[\s]?"([^";]+)"/i', $sHeaderValue, $aMatch) && !empty($aMatch[1]))
-				{
-					$sHeader = \trim($aMatch[1]);
-				}
-
-				if (!empty($sStatus) && !empty($sHeader))
-				{
-					$aResult[] = array($sStatus, $sHeader, $sHeaderValue);
+			foreach ($aHeaders as $sHeaderValue) {
+				$aStatus = array();
+				$aHeader = array();
+				$sHeaderValue = \preg_replace('/[\\r\\n\\t\\s]+/', ' ', $sHeaderValue);
+				if (\preg_match('/status[\\s]?=[\\s]?"([a-zA-Z0-9]+)"/i', $sHeaderValue, $aStatus) && !empty($aStatus[1])
+				 && \preg_match('/signer[\\s]?=[\\s]?"([^";]+)"/i', $sHeaderValue, $aHeader) && !empty($aHeader[1])
+				) {
+					$aResult['dkim'][] = array($aStatus[1], \trim($aHeader[1]), $sHeaderValue);
 				}
+				break;
 			}
 		}
 
 		return $aResult;
 	}
 
-	public function PopulateEmailColectionByDkim(EmailCollection $oEmails) : void
-	{
-		$aDkimStatuses = $this->DkimStatuses();
-		foreach ($oEmails as $oEmail) {
-			$sEmail = $oEmail->GetEmail();
-			foreach ($aDkimStatuses as $aDkimData) {
-				if (isset($aDkimData[0], $aDkimData[1]) &&
-					$aDkimData[1] === \strstr($sEmail, $aDkimData[1]))
-				{
-					$oEmail->SetDkimStatusAndValue($aDkimData[0], empty($aDkimData[2]) ? '' : $aDkimData[2]);
-				}
-			}
-		}
-	}
-
-	public function __toString() : string
+	public function __toString(): string
 	{
 		return \implode("\r\n", $this->getArrayCopy());
 	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return array(
+			'@Object' => 'Collection/MimeHeaderCollection',
+			'@Collection' => $this->getArrayCopy()
+		);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
index 0981b4748..48253b33d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Message.php
@@ -17,10 +17,7 @@ namespace MailSo\Mime;
  */
 class Message extends Part
 {
-	/**
-	 * @var array
-	 */
-	private $aHeadersValue = array(
+	private array $aHeadersValue = array(
 /*
 		Enumerations\Header::BCC => '',
 		Enumerations\Header::CC => '',
@@ -42,20 +39,11 @@ class Message extends Part
 */
 	);
 
-	/**
-	 * @var AttachmentCollection
-	 */
-	private $oAttachmentCollection;
+	private AttachmentCollection $oAttachmentCollection;
 
-	/**
-	 * @var bool
-	 */
-	private $bAddEmptyTextPart = true;
+	private bool $bAddEmptyTextPart = true;
 
-	/**
-	 * @var bool
-	 */
-	private $bAddDefaultXMailer = true;
+	private bool $bAddDefaultXMailer = true;
 
 	function __construct()
 	{
@@ -63,6 +51,13 @@ class Message extends Part
 		$this->oAttachmentCollection = new AttachmentCollection;
 	}
 
+	private function getHeaderValue(string $name)
+	{
+		return isset($this->aHeadersValue[$name])
+			? $this->aHeadersValue[$name]
+			: null;
+	}
+
 	public function DoesNotAddDefaultXMailer() : void
 	{
 		$this->bAddDefaultXMailer = false;
@@ -70,8 +65,7 @@ class Message extends Part
 
 	public function MessageId() : string
 	{
-		return empty($this->aHeadersValue[Enumerations\Header::MESSAGE_ID]) ? ''
-			: $this->aHeadersValue[Enumerations\Header::MESSAGE_ID];
+		return $this->getHeaderValue(Enumerations\Header::MESSAGE_ID) ?: '';
 	}
 
 	public function SetMessageId(string $sMessageId) : void
@@ -91,52 +85,31 @@ class Message extends Part
 
 	public function GetSubject() : string
 	{
-		return isset($this->aHeadersValue[Enumerations\Header::SUBJECT]) ?
-			$this->aHeadersValue[Enumerations\Header::SUBJECT] : '';
+		return $this->getHeaderValue(Enumerations\Header::SUBJECT) ?: '';
 	}
 
 	public function GetFrom() : ?Email
 	{
-		if (isset($this->aHeadersValue[Enumerations\Header::FROM_]) &&
-			$this->aHeadersValue[Enumerations\Header::FROM_] instanceof Email)
-		{
-			return $this->aHeadersValue[Enumerations\Header::FROM_];
-		}
-
-		return null;
+		$value = $this->getHeaderValue(Enumerations\Header::FROM_);
+		return ($value instanceof Email) ? $value : null;
 	}
 
-	public function GetTo() : EmailCollection
+	public function GetTo() : ?EmailCollection
 	{
-		if (isset($this->aHeadersValue[Enumerations\Header::TO_]) &&
-			$this->aHeadersValue[Enumerations\Header::TO_] instanceof EmailCollection)
-		{
-			return $this->aHeadersValue[Enumerations\Header::TO_]->Unique();
-		}
-
-		return new EmailCollection;
+		$value = $this->getHeaderValue(Enumerations\Header::TO_);
+		return ($value instanceof EmailCollection) ? $value->Unique() : null;
 	}
 
 	public function GetCc() : ?EmailCollection
 	{
-		if (isset($this->aHeadersValue[Enumerations\Header::CC]) &&
-			$this->aHeadersValue[Enumerations\Header::CC] instanceof EmailCollection)
-		{
-			return $this->aHeadersValue[Enumerations\Header::CC]->Unique();
-		}
-
-		return null;
+		$value = $this->getHeaderValue(Enumerations\Header::CC);
+		return ($value instanceof EmailCollection) ? $value->Unique() : null;
 	}
 
 	public function GetBcc() : ?EmailCollection
 	{
-		if (isset($this->aHeadersValue[Enumerations\Header::BCC]) &&
-			$this->aHeadersValue[Enumerations\Header::BCC] instanceof EmailCollection)
-		{
-			return $this->aHeadersValue[Enumerations\Header::BCC]->Unique();
-		}
-
-		return null;
+		$value = $this->getHeaderValue(Enumerations\Header::BCC);
+		return ($value instanceof EmailCollection) ? $value->Unique() : null;
 	}
 
 	public function GetRcpt() : EmailCollection
@@ -145,8 +118,9 @@ class Message extends Part
 
 		$headers = array(Enumerations\Header::TO_, Enumerations\Header::CC, Enumerations\Header::BCC);
 		foreach ($headers as $header) {
-			if (isset($this->aHeadersValue[$header]) && $this->aHeadersValue[$header] instanceof EmailCollection) {
-				foreach ($this->aHeadersValue[$header] as $oEmail) {
+			$value = $this->getHeaderValue($header);
+			if ($value instanceof EmailCollection) {
+				foreach ($value as $oEmail) {
 					$oResult->append($oEmail);
 				}
 			}
@@ -156,8 +130,9 @@ class Message extends Part
 		$aReturn = array();
 		$headers = array(Enumerations\Header::TO_, Enumerations\Header::CC, Enumerations\Header::BCC);
 		foreach ($headers as $header) {
-			if (isset($this->aHeadersValue[$header]) && $this->aHeadersValue[$header] instanceof EmailCollection) {
-				foreach ($this->aHeadersValue[$header] as $oEmail) {
+			$value = $this->getHeaderValue($header);
+			if ($value instanceof EmailCollection) {
+				foreach ($value as $oEmail) {
 					$oResult->append($oEmail);
 					$sEmail = $oEmail->GetEmail();
 					if (!isset($aReturn[$sEmail])) {
@@ -175,14 +150,19 @@ class Message extends Part
 	public function SetCustomHeader(string $sHeaderName, string $sValue) : self
 	{
 		$sHeaderName = \trim($sHeaderName);
-		if (\strlen($sHeaderName))
-		{
+		if (\strlen($sHeaderName)) {
 			$this->aHeadersValue[$sHeaderName] = $sValue;
 		}
 
 		return $this;
 	}
 
+	public function SetAutocrypt(array $aValue) : self
+	{
+		$this->aHeadersValue['Autocrypt'] = $aValue;
+		return $this;
+	}
+
 	public function SetSubject(string $sSubject) : self
 	{
 		$this->aHeadersValue[Enumerations\Header::SUBJECT] = $sSubject;
@@ -192,16 +172,19 @@ class Message extends Part
 
 	public function SetInReplyTo(string $sInReplyTo) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::IN_REPLY_TO] = $sInReplyTo;
-
+		$sInReplyTo = \trim($sInReplyTo);
+		if (\strlen($sInReplyTo)) {
+			$this->aHeadersValue[Enumerations\Header::IN_REPLY_TO] = $sInReplyTo;
+		}
 		return $this;
 	}
 
 	public function SetReferences(string $sReferences) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::REFERENCES] =
-			\MailSo\Base\Utils::StripSpaces($sReferences);
-
+		$sReferences = \MailSo\Base\Utils::StripSpaces($sReferences);
+		if (\strlen($sReferences)) {
+			$this->aHeadersValue[Enumerations\Header::REFERENCES] = $sReferences;
+		}
 		return $this;
 	}
 
@@ -213,11 +196,6 @@ class Message extends Part
 		return $this;
 	}
 
-	public function SetReadConfirmation(string $sEmail) : self
-	{
-		return $this->SetReadReceipt($sEmail);
-	}
-
 	public function SetPriority(int $iValue) : self
 	{
 		$sResult = '';
@@ -234,8 +212,7 @@ class Message extends Part
 				break;
 		}
 
-		if (\strlen($sResult))
-		{
+		if (\strlen($sResult)) {
 			$this->aHeadersValue[Enumerations\Header::X_PRIORITY] = $sResult;
 		}
 
@@ -258,8 +235,9 @@ class Message extends Part
 
 	public function SetTo(EmailCollection $oEmails) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::TO_] = $oEmails;
-
+		if ($oEmails->count()) {
+			$this->aHeadersValue[Enumerations\Header::TO_] = $oEmails;
+		}
 		return $this;
 	}
 
@@ -272,22 +250,25 @@ class Message extends Part
 
 	public function SetReplyTo(EmailCollection $oEmails) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::REPLY_TO] = $oEmails;
-
+		if ($oEmails->count()) {
+			$this->aHeadersValue[Enumerations\Header::REPLY_TO] = $oEmails;
+		}
 		return $this;
 	}
 
 	public function SetCc(EmailCollection $oEmails) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::CC] = $oEmails;
-
+		if ($oEmails->count()) {
+			$this->aHeadersValue[Enumerations\Header::CC] = $oEmails;
+		}
 		return $this;
 	}
 
 	public function SetBcc(EmailCollection $oEmails) : self
 	{
-		$this->aHeadersValue[Enumerations\Header::BCC] = $oEmails;
-
+		if ($oEmails->count()) {
+			$this->aHeadersValue[Enumerations\Header::BCC] = $oEmails;
+		}
 		return $this;
 	}
 
@@ -311,24 +292,21 @@ class Message extends Part
 
 	private function generateNewMessageId(string $sHostName = '') : string
 	{
-		if (0 === \strlen($sHostName))
-		{
+		if (!\strlen($sHostName)) {
 			$sHostName = isset($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : '';
 		}
 
-		if (empty($sHostName) && \MailSo\Base\Utils::FunctionExistsAndEnabled('php_uname'))
-		{
+		if (empty($sHostName) && \MailSo\Base\Utils::FunctionCallable('php_uname')) {
 			$sHostName = \php_uname('n');
 		}
 
-		if (empty($sHostName))
-		{
+		if (empty($sHostName)) {
 			$sHostName = 'localhost';
 		}
 
 		return '<'.
 			\MailSo\Base\Utils::Sha1Rand($sHostName.
-				(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? \getmypid() : '')).'@'.$sHostName.'>';
+				(\MailSo\Base\Utils::FunctionCallable('getmypid') ? \getmypid() : '')).'@'.$sHostName.'>';
 	}
 
 	public function GetRootPart() : Part
@@ -359,7 +337,7 @@ class Message extends Part
 					}
 					$oPart->Headers->append(
 						new Header(Enumerations\Header::CONTENT_TYPE,
-							$aAttachments[0]->ContentType().'; '.$oParameters->ToString())
+							$aAttachments[0]->ContentType().'; '.$oParameters)
 					);
 
 					if ($resource = $aAttachments[0]->Resource()) {
@@ -382,13 +360,10 @@ class Message extends Part
 		if (1 == \count($this->SubParts)) {
 			$oRootPart = $this->SubParts[0];
 			foreach ($this->oAttachmentCollection as $oAttachment) {
-				if ($oAttachment->IsLinked()) {
+				if ($oAttachment->isLinked()) {
 					$oRelatedPart = new Part;
 					$oRelatedPart->Headers->append(
-						new Header(
-							Enumerations\Header::CONTENT_TYPE,
-							Enumerations\MimeType::MULTIPART_RELATED
-						)
+						new Header(Enumerations\Header::CONTENT_TYPE, 'multipart/related')
 					);
 					$oRelatedPart->SubParts->append($oRootPart);
 					$oRootPart = $oRelatedPart;
@@ -397,24 +372,18 @@ class Message extends Part
 			}
 		} else {
 			$oRootPart = new Part;
-			$oRootPart->Headers->AddByName(
-				Enumerations\Header::CONTENT_TYPE,
-				Enumerations\MimeType::MULTIPART_MIXED
-			);
+			$oRootPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'multipart/mixed');
 			$oRootPart->SubParts = $this->SubParts;
 		}
 
 		$oMixedPart = null;
 		foreach ($this->oAttachmentCollection as $oAttachment) {
-			if ($oRelatedPart && $oAttachment->IsLinked()) {
+			if ($oRelatedPart && $oAttachment->isLinked()) {
 				$oRelatedPart->SubParts->append($oAttachment->ToPart());
 			} else {
 				if (!$oMixedPart) {
 					$oMixedPart = new Part;
-					$oMixedPart->Headers->AddByName(
-						Enumerations\Header::CONTENT_TYPE,
-						Enumerations\MimeType::MULTIPART_MIXED
-					);
+					$oMixedPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'multipart/mixed');
 					$oMixedPart->SubParts->append($oRootPart);
 					$oRootPart = $oMixedPart;
 				}
@@ -443,7 +412,7 @@ class Message extends Part
 			$oRootPart->Headers->SetByName(Enumerations\Header::MESSAGE_ID, $this->generateNewMessageId(), true);
 		}
 
-		if (!isset($this->aHeadersValue[Enumerations\Header::X_MAILER]) && $this->bAddDefaultXMailer) {
+		if ($this->bAddDefaultXMailer && !isset($this->aHeadersValue[Enumerations\Header::X_MAILER])) {
 			$oRootPart->Headers->SetByName(Enumerations\Header::X_MAILER, 'SnappyMail/'.APP_VERSION, true);
 		}
 
@@ -452,12 +421,11 @@ class Message extends Part
 		}
 
 		foreach ($this->aHeadersValue as $sName => $mValue) {
-			if (!($bWithoutBcc && \strtolower(Enumerations\Header::BCC) === \strtolower($sName))) {
-				if (\is_object($mValue)) {
-					if ($mValue instanceof EmailCollection || $mValue instanceof Email || $mValue instanceof ParameterCollection) {
-						$mValue = $mValue->ToString();
-					}
+			if ('autocrypt' === \strtolower($sName)) {
+				foreach ($mValue as $key) {
+					$oRootPart->Headers->AddByName($sName, $key);
 				}
+			} else if (!($bWithoutBcc && \strtolower(Enumerations\Header::BCC) === \strtolower($sName))) {
 				$oRootPart->Headers->SetByName($sName, (string) $mValue);
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
index cc5c2cd4b..276ad2a0d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parameter.php
@@ -15,17 +15,11 @@ namespace MailSo\Mime;
  * @category MailSo
  * @package Mime
  */
-class Parameter
+class Parameter implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $sName;
 
-	/**
-	 * @var string
-	 */
-	private $sValue;
+	private string $sValue;
 
 	function __construct(string $sName, string $sValue)
 	{
@@ -33,71 +27,62 @@ class Parameter
 		$this->sValue = $sValue;
 	}
 
-	public static function CreateFromParameterLine(string $sRawParam) : self
+	public static function FromString(string $sRawParam): self
 	{
 		$oParameter = new self('', '');
-		return $oParameter->Parse($sRawParam);
+
+		$aParts = \explode('=', $sRawParam, 2);
+		$oParameter->sName = \trim(\trim($aParts[0]), '"\'');
+		if (2 === \count($aParts)) {
+			$oParameter->sValue = \trim(\trim($aParts[1]), '"\'');
+		}
+
+		return $oParameter;
 	}
 
-	public function Reset() : self
-	{
-		$this->sName = '';
-		$this->sValue = '';
-
-		return $this;
-	}
-
-	public function Name() : string
+	public function Name(): string
 	{
 		return $this->sName;
 	}
 
-	public function Value() : string
+	public function Value(): string
 	{
 		return $this->sValue;
 	}
 
-	public function setValue(string $sValue) : void
+	public function setValue(string $sValue): void
 	{
 		$this->sValue = $sValue;
 	}
 
-	public function Parse(string $sRawParam, string $sSeparator = '=') : self
+	public function ToString(bool $bConvertSpecialsName = false): string
 	{
-		$this->Reset();
-
-		$aParts = explode($sSeparator, $sRawParam, 2);
-
-		$this->sName = trim(trim($aParts[0]), '"\'');
-		if (2 === count($aParts))
-		{
-			$this->sValue = trim(trim($aParts[1]), '"\'');
+		if (!\strlen($this->sName)) {
+			return '';
 		}
 
-		return $this;
+		if ($bConvertSpecialsName && \in_array(\strtolower($this->sName), array(
+			\strtolower(Enumerations\Parameter::NAME),
+			\strtolower(Enumerations\Parameter::FILENAME)
+		)))
+		{
+			return $this->sName . '="' . \MailSo\Base\Utils::EncodeHeaderValue($this->sValue) . '"';
+		}
+
+		return $this->sName . '="' . $this->sValue . '"';
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false) : string
+	public function __toString(): string
 	{
-		$sResult = '';
-		if (\strlen($this->sName))
-		{
-			$sResult = $this->sName.'=';
-			if ($bConvertSpecialsName && in_array(strtolower($this->sName), array(
-				strtolower(Enumerations\Parameter::NAME),
-				strtolower(Enumerations\Parameter::FILENAME)
-			)))
-			{
-				$sResult .= '"'.\MailSo\Base\Utils::EncodeUnencodedValue(
-					\MailSo\Base\Enumerations\Encoding::BASE64_SHORT,
-					$this->sValue).'"';
-			}
-			else
-			{
-				$sResult .= '"'.$this->sValue.'"';
-			}
-		}
+		return $this->ToString();
+	}
 
-		return $sResult;
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return array(
+			'name' => $this->sName,
+			'value' => $this->sValue
+		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
index a556d30b0..c008e2a85 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/ParameterCollection.php
@@ -21,54 +21,45 @@ class ParameterCollection extends \MailSo\Base\Collection
 	{
 		parent::__construct();
 
-		if (\strlen($sRawParams))
-		{
-			$this->Parse($sRawParams);
-		}
+		\strlen($sRawParams) && $this->Parse($sRawParams);
 	}
 
-	public function append($oParameter, bool $bToTop = false) : void
+	public function append($oParameter, bool $bToTop = false): void
 	{
 		assert($oParameter instanceof Parameter);
-		parent::append($oParameter, $bToTop);
+		parent::offsetSet(\strtolower($oParameter->Name()), $oParameter);
 	}
 
-	public function ParameterValueByName(string $sName) : string
+	public function ParameterValueByName(string $sName): string
 	{
 		$oParam = $this->getParameter($sName);
 		return $oParam ? $oParam->Value() : '';
 	}
 
-	public function getParameter(string $sName) : ?Parameter
+	public function getParameter(string $sName): ?Parameter
 	{
 		$sName = \strtolower(\trim($sName));
-		foreach ($this as $oParam) {
-			if ($sName === \strtolower($oParam->Name())) {
-				return $oParam;
-			}
-		}
-		return null;
+		return parent::offsetExists($sName) ? parent::offsetGet($sName) : null;
 	}
 
-	public function setParameter(string $sName, string $sValue) : void
+	public function setParameter(string $sName, string $sValue): void
 	{
 		$oParam = $this->getParameter($sName);
 		if ($oParam) {
 			$oParam->setValue($sValue);
 		} else {
-			parent::append(new Parameter(\trim($sName), $sValue));
+			$this->append(new Parameter(\trim($sName), $sValue));
 		}
 	}
 
-	public function Parse(string $sRawParams) : self
+	public function Parse(string $sRawParams): self
 	{
 		$this->Clear();
 
 		$aDataToParse = \explode(';', $sRawParams);
 
-		foreach ($aDataToParse as $sParam)
-		{
-			$this->append(Parameter::CreateFromParameterLine($sParam));
+		foreach ($aDataToParse as $sParam) {
+			$this->append(Parameter::FromString($sParam));
 		}
 
 		$this->reParseParameters();
@@ -76,22 +67,39 @@ class ParameterCollection extends \MailSo\Base\Collection
 		return $this;
 	}
 
-	public function ToString(bool $bConvertSpecialsName = false) : string
+	public function ToString(bool $bConvertSpecialsName = false): string
 	{
 		$aResult = array();
-		foreach ($this as $oParam)
-		{
+		foreach ($this as $oParam) {
 			$sLine = $oParam->ToString($bConvertSpecialsName);
-			if (\strlen($sLine))
-			{
+			if (\strlen($sLine)) {
 				$aResult[] = $sLine;
 			}
 		}
-
 		return \count($aResult) ? \implode('; ', $aResult) : '';
 	}
 
-	private function reParseParameters() : void
+	public function __toString(): string
+	{
+		return $this->ToString();
+	}
+
+/*
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$aResult = array();
+		foreach ($this as $oParam) {
+			$aResult[$oParam->Name()] = $oParam->Value();
+		}
+		return array(
+			'@Object' => 'Collection/ParameterCollection',
+			'@Collection' => $aResult
+		);
+	}
+*/
+
+	private function reParseParameters(): void
 	{
 		$aDataToReParse = $this->getArrayCopy();
 		$sCharset = \MailSo\Base\Enumerations\Charset::UTF_8;
@@ -99,26 +107,22 @@ class ParameterCollection extends \MailSo\Base\Collection
 		$this->Clear();
 
 		$aPreParams = array();
-		foreach ($aDataToReParse as $oParam)
-		{
+		foreach ($aDataToReParse as $oParam) {
 			$aMatch = array();
 			$sParamName = $oParam->Name();
 
 			if (\preg_match('/([^\*]+)\*([\d]{1,2})\*/', $sParamName, $aMatch) && isset($aMatch[1], $aMatch[2])
 				&& \strlen($aMatch[1]) && \is_numeric($aMatch[2]))
 			{
-				if (!isset($aPreParams[$aMatch[1]]))
-				{
+				if (!isset($aPreParams[$aMatch[1]])) {
 					$aPreParams[$aMatch[1]] = array();
 				}
 
 				$sValue = $oParam->Value();
 
-				if (false !== \strpos($sValue, "''"))
-				{
+				if (false !== \strpos($sValue, "''")) {
 					$aValueParts = \explode("''", $sValue, 2);
-					if (\is_array($aValueParts) && 2 === \count($aValueParts) && \strlen($aValueParts[1]))
-					{
+					if (\is_array($aValueParts) && 2 === \count($aValueParts) && \strlen($aValueParts[1])) {
 						$sCharset = $aValueParts[0];
 						$sValue = $aValueParts[1];
 					}
@@ -128,17 +132,14 @@ class ParameterCollection extends \MailSo\Base\Collection
 			}
 			else if (\preg_match('/([^\*]+)\*/', $sParamName, $aMatch) && isset($aMatch[1]))
 			{
-				if (!isset($aPreParams[$aMatch[1]]))
-				{
+				if (!isset($aPreParams[$aMatch[1]])) {
 					$aPreParams[$aMatch[1]] = array();
 				}
 
 				$sValue = $oParam->Value();
-				if (false !== \strpos($sValue, "''"))
-				{
+				if (false !== \strpos($sValue, "''")) {
 					$aValueParts = \explode("''", $sValue, 2);
-					if (\is_array($aValueParts) && 2 === \count($aValueParts) && \strlen($aValueParts[1]))
-					{
+					if (\is_array($aValueParts) && 2 === \count($aValueParts) && \strlen($aValueParts[1])) {
 						$sCharset = $aValueParts[0];
 						$sValue = $aValueParts[1];
 					}
@@ -152,14 +153,12 @@ class ParameterCollection extends \MailSo\Base\Collection
 			}
 		}
 
-		foreach ($aPreParams as $sName => $aValues)
-		{
-			ksort($aValues);
+		foreach ($aPreParams as $sName => $aValues) {
+			\ksort($aValues);
 			$sResult = \implode(\array_values($aValues));
 			$sResult = \urldecode($sResult);
 
-			if (\strlen($sCharset))
-			{
+			if (\strlen($sCharset)) {
 				$sResult = \MailSo\Base\Utils::ConvertEncoding($sResult,
 					$sCharset, \MailSo\Base\Enumerations\Charset::UTF_8);
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php
index 492801e44..b5c77755f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Parser.php
@@ -23,7 +23,7 @@ abstract class Parser
 		POS_SUBPARTS = 3,
 		POS_CLOSE_BOUNDARY = 4;
 
-	private static $LineParts = [];
+	private static array $LineParts = [];
 
 	protected static function writeBody(Part $oPart, string $sBuffer) : void
 	{
@@ -59,21 +59,18 @@ abstract class Parser
 
 		$oMimePart = null;
 		$sFirstNotNullCharset = null;
-		foreach (static::$LineParts as /* @var $oMimePart Part */ $oMimePart)
-		{
+		foreach (static::$LineParts as /* @var $oMimePart Part */ $oMimePart) {
 			$sCharset = $oMimePart->HeaderCharset();
-			if (\strlen($sCharset))
-			{
+			if (\strlen($sCharset)) {
 				$sFirstNotNullCharset = $sCharset;
 				break;
 			}
 		}
 
 		$sFirstNotNullCharset = (null !== $sFirstNotNullCharset)
-			? $sFirstNotNullCharset : Part::$DefaultCharset;
+			? $sFirstNotNullCharset : \MailSo\Base\Enumerations\Charset::ISO_8859_1;
 
-		foreach (static::$LineParts as /* @var $oMimePart Part */ $oMimePart)
-		{
+		foreach (static::$LineParts as /* @var $oMimePart Part */ $oMimePart) {
 			$sHeaderCharset = $oMimePart->HeaderCharset();
 			$oMimePart->Headers->SetParentCharset($sHeaderCharset);
 		}
@@ -93,53 +90,38 @@ abstract class Parser
 		$sCurrentBoundary = '';
 		$bIsBoundaryCheck = false;
 		$aHeadersLines = array();
-		while (true)
-		{
-			if (!$bNotFirstRead)
-			{
+		while (true) {
+			if (!$bNotFirstRead) {
 				$sPrevBuffer = $sBuffer;
 				$sBuffer = '';
 			}
 
-			if (!$bIsOef && !\feof($rStreamHandle))
-			{
-				if (!$bNotFirstRead)
-				{
+			if (!$bIsOef && !\feof($rStreamHandle)) {
+				if (!$bNotFirstRead) {
 					$sBuffer = \fread($rStreamHandle, 8192);
-					if (false === $sBuffer)
-					{
+					if (false === $sBuffer) {
 						break;
 					}
-				}
-				else
-				{
+				} else {
 					$bNotFirstRead = false;
 				}
-			}
-			else if ($bIsOef && !\strlen($sBuffer))
-			{
+			} else if ($bIsOef && !\strlen($sBuffer)) {
 				break;
-			}
-			else
-			{
+			} else {
 				$bIsOef = true;
 			}
 
-			while (true)
-			{
+			while (true) {
 				$sCurrentLine = $sPrevBuffer.$sBuffer;
-				if (self::POS_HEADERS === $iParsePosition)
-				{
+				if (self::POS_HEADERS === $iParsePosition) {
 					$iEndLen = 4;
 					$iPos = \strpos($sCurrentLine, "\r\n\r\n", $iOffset);
-					if (false === $iPos)
-					{
+					if (false === $iPos) {
 						$iEndLen = 2;
 						$iPos = \strpos($sCurrentLine, "\n\n", $iOffset);
 					}
 
-					if (false !== $iPos)
-					{
+					if (false !== $iPos) {
 						$aHeadersLines[] = \substr($sCurrentLine, $iOffset, $iPos + $iEndLen - $iOffset);
 
 						$oPart->Headers->Parse(\implode($aHeadersLines))->SetParentCharset($oPart->HeaderCharset());
@@ -156,42 +138,31 @@ abstract class Parser
 						$iOffset = $iPos + $iEndLen;
 						$iParsePosition = self::POS_BODY;
 						continue;
-					}
-					else
-					{
+					} else {
 						$iBufferLen = \strlen($sPrevBuffer);
-						if ($iBufferLen > $iOffset)
-						{
+						if ($iBufferLen > $iOffset) {
 							$aHeadersLines[] = \substr($sPrevBuffer, $iOffset);
 							$iOffset = 0;
-						}
-						else
-						{
+						} else {
 							$iOffset -= $iBufferLen;
 						}
 						break;
 					}
-				}
-				else if (self::POS_BODY === $iParsePosition)
-				{
+				} else if (self::POS_BODY === $iParsePosition) {
 					$iPos = false;
 					$sBoundaryLen = 0;
 					$bIsBoundaryEnd = false;
 					$bCurrentPartBody = false;
 					$bIsBoundaryCheck = \count($aBoundaryStack);
 
-					foreach ($aBoundaryStack as $sKey => $sBoundary)
-					{
-						if (false !== ($iPos = \strpos($sCurrentLine, $sBoundary, $iOffset)))
-						{
-							if ($sCurrentBoundary === $sBoundary)
-							{
+					foreach ($aBoundaryStack as $sKey => $sBoundary) {
+						if (false !== ($iPos = \strpos($sCurrentLine, $sBoundary, $iOffset))) {
+							if ($sCurrentBoundary === $sBoundary) {
 								$bCurrentPartBody = true;
 							}
 
 							$sBoundaryLen = \strlen($sBoundary);
-							if ('--' === \substr($sCurrentLine, $iPos + $sBoundaryLen, 2))
-							{
+							if ('--' === \substr($sCurrentLine, $iPos + $sBoundaryLen, 2)) {
 								$sBoundaryLen += 2;
 								$bIsBoundaryEnd = true;
 								unset($aBoundaryStack[$sKey]);
@@ -203,54 +174,42 @@ abstract class Parser
 						}
 					}
 
-					if (false !== $iPos)
-					{
+					if (false !== $iPos) {
 						static::writeBody($oPart, \substr($sCurrentLine, $iOffset, $iPos - $iOffset));
 						$iOffset = $iPos;
 
-						if ($bCurrentPartBody)
-						{
+						if ($bCurrentPartBody) {
 							$iParsePosition = self::POS_SUBPARTS;
 							continue;
 						}
 
 						return;
-					}
-					else
-					{
+					} else {
 						$iBufferLen = \strlen($sPrevBuffer);
-						if ($iBufferLen > $iOffset)
-						{
+						if ($iBufferLen > $iOffset) {
 							static::writeBody($oPart, \substr($sPrevBuffer, $iOffset));
 							$iOffset = 0;
-						}
-						else
-						{
+						} else {
 							$iOffset -= $iBufferLen;
 						}
 						break;
 					}
-				}
-				else if (self::POS_SUBPARTS === $iParsePosition)
-				{
+				} else if (self::POS_SUBPARTS === $iParsePosition) {
 					$iPos = false;
 					$iBoundaryLen = 0;
 					$bIsBoundaryEnd = false;
 					$bCurrentPartBody = false;
 					$bIsBoundaryCheck = \count($aBoundaryStack);
 
-					foreach ($aBoundaryStack as $sKey => $sBoundary)
-					{
-						if (false !== ($iPos = \strpos($sCurrentLine, $sBoundary, $iOffset)))
-						{
-							if ($sCurrentBoundary === $sBoundary)
-							{
+					foreach ($aBoundaryStack as $sKey => $sBoundary) {
+						$iPos = \strpos($sCurrentLine, $sBoundary, $iOffset);
+						if (false !== $iPos) {
+							if ($sCurrentBoundary === $sBoundary) {
 								$bCurrentPartBody = true;
 							}
 
 							$iBoundaryLen = \strlen($sBoundary);
-							if ('--' === \substr($sCurrentLine, $iPos + $iBoundaryLen, 2))
-							{
+							if ('--' === \substr($sCurrentLine, $iPos + $iBoundaryLen, 2)) {
 								$iBoundaryLen += 2;
 								$bIsBoundaryEnd = true;
 								unset($aBoundaryStack[$sKey]);
@@ -261,52 +220,39 @@ abstract class Parser
 						}
 					}
 
-					if (false !== $iPos && $bCurrentPartBody)
-					{
+					if (false !== $iPos && $bCurrentPartBody) {
 						$iOffset = $iPos + $iBoundaryLen;
 
 						$oSubPart = new Part;
 
-						$oSubPart->parseStreamRecursive($rStreamHandle,
+						static::parseStreamRecursive($oSubPart, $rStreamHandle,
 							$iOffset, $sPrevBuffer, $sBuffer, $aBoundaryStack, $bIsOef, true);
 
 						$oPart->SubParts->append($oSubPart);
 						static::$LineParts[] = $oSubPart;
 						//$iParsePosition = self::POS_HEADERS;
 						unset($oSubPart);
-					}
-					else
-					{
+					} else {
 						return;
 					}
 				}
 			}
 		}
 
-		if (\strlen($sPrevBuffer))
-		{
-			if (self::POS_HEADERS === $iParsePosition)
-			{
+		if (\strlen($sPrevBuffer)) {
+			if (self::POS_HEADERS === $iParsePosition) {
 				$aHeadersLines[] = ($iOffset < \strlen($sPrevBuffer))
 					? \substr($sPrevBuffer, $iOffset)
 					: $sPrevBuffer;
 
 				$oPart->Headers->Parse(\implode($aHeadersLines))->SetParentCharset($oPart->HeaderCharset());
 				$aHeadersLines = array();
+			} else if (!$bIsBoundaryCheck && self::POS_BODY === $iParsePosition) {
+				static::writeBody($oPart, ($iOffset < \strlen($sPrevBuffer))
+					? \substr($sPrevBuffer, $iOffset) : $sPrevBuffer);
 			}
-			else if (self::POS_BODY === $iParsePosition)
-			{
-				if (!$bIsBoundaryCheck)
-				{
-					static::writeBody($oPart, ($iOffset < \strlen($sPrevBuffer))
-						? \substr($sPrevBuffer, $iOffset) : $sPrevBuffer);
-				}
-			}
-		}
-		else
-		{
-			if (self::POS_HEADERS === $iParsePosition && \count($aHeadersLines))
-			{
+		} else {
+			if (self::POS_HEADERS === $iParsePosition && \count($aHeadersLines)) {
 				$oPart->Headers->Parse(\implode($aHeadersLines))->SetParentCharset($oPart->HeaderCharset());
 				$aHeadersLines = array();
 			}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Part.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Part.php
index 014c9008b..79b8e07ea 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Part.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/Part.php
@@ -11,21 +11,15 @@
 
 namespace MailSo\Mime;
 
+use MailSo\Mime\Enumerations\ContentType;
+
 /**
  * @category MailSo
  * @package Mime
  */
 class Part
 {
-	/**
-	 * @var string
-	 */
-	public static $DefaultCharset = \MailSo\Base\Enumerations\Charset::ISO_8859_1;
-
-	/**
-	 * @var HeaderCollection
-	 */
-	public $Headers;
+	public HeaderCollection $Headers;
 
 	/**
 	 * @var resource
@@ -37,10 +31,7 @@ class Part
 	 */
 	public $Raw = null;
 
-	/**
-	 * @var PartCollection
-	 */
-	public $SubParts;
+	public PartCollection $SubParts;
 
 	function __construct()
 	{
@@ -63,29 +54,14 @@ class Part
 		return \trim(\strtolower($this->Headers->ValueByName(Enumerations\Header::CONTENT_TYPE)));
 	}
 
-	public function ContentID() : string
-	{
-		return \trim($this->Headers->ValueByName(Enumerations\Header::CONTENT_ID));
-	}
-
-	public function ContentLocation() : string
-	{
-		return \trim($this->Headers->ValueByName(Enumerations\Header::CONTENT_LOCATION));
-	}
-
 	public function IsFlowedFormat() : bool
 	{
-		$bResult = false;
-		if ($this->Headers)
-		{
-			$bResult = 'flowed' === \trim(\strtolower($this->Headers->ParameterValue(
-				Enumerations\Header::CONTENT_TYPE,
-				Enumerations\Parameter::FORMAT)));
+		$bResult = 'flowed' === \trim(\strtolower($this->Headers->ParameterValue(
+			Enumerations\Header::CONTENT_TYPE,
+			Enumerations\Parameter::FORMAT)));
 
-			if ($bResult && \in_array($this->MailEncodingName(), array('base64', 'quoted-printable')))
-			{
-				$bResult = false;
-			}
+		if ($bResult && \in_array($this->ContentTransferEncoding(), array('base64', 'quoted-printable'))) {
+			$bResult = false;
 		}
 
 		return $bResult;
@@ -93,38 +69,42 @@ class Part
 
 	public function FileName() : string
 	{
-		$sResult = '';
-		if ($this->Headers)
-		{
-			$sResult = \trim($this->Headers->ParameterValue(
-				Enumerations\Header::CONTENT_DISPOSITION,
-				Enumerations\Parameter::FILENAME));
+		$sResult = \trim($this->Headers->ParameterValue(
+			Enumerations\Header::CONTENT_DISPOSITION,
+			Enumerations\Parameter::FILENAME));
 
-			if (!\strlen($sResult))
-			{
-				$sResult = \trim($this->Headers->ParameterValue(
-					Enumerations\Header::CONTENT_TYPE,
-					Enumerations\Parameter::NAME));
-			}
+		if (!\strlen($sResult)) {
+			$sResult = \trim($this->Headers->ParameterValue(
+				Enumerations\Header::CONTENT_TYPE,
+				Enumerations\Parameter::NAME));
 		}
 
 		return $sResult;
 	}
 
-	public function IsPgpSigned() : bool
+	// https://datatracker.ietf.org/doc/html/rfc3156#section-5
+	public function isPgpSigned() : bool
 	{
-		// https://datatracker.ietf.org/doc/html/rfc3156#section-5
 		$header = $this->Headers->GetByName(Enumerations\Header::CONTENT_TYPE);
 		return $header
 		 && \preg_match('#multipart/signed.+protocol=["\']?application/pgp-signature#si', $header->FullValue())
 		 // The multipart/signed body MUST consist of exactly two parts.
 		 && 2 === \count($this->SubParts)
-		 && $this->SubParts[1]->IsPgpSignature();
+		 && 'application/pgp-signature' === $this->SubParts[1]->ContentType();
 	}
 
-	public function IsPgpSignature() : bool
+	// https://www.rfc-editor.org/rfc/rfc8551.html#section-3.5
+	public function isSMimeSigned() : bool
 	{
-		return \in_array($this->ContentType(), array('application/pgp-signature', 'application/pkcs7-signature'));
+		$header = $this->Headers->GetByName(Enumerations\Header::CONTENT_TYPE);
+		return ($header
+			&& \preg_match('#multipart/signed.+protocol=["\']?application/(x-)?pkcs7-signature#si', $header->FullValue())
+			// The multipart/signed body MUST consist of exactly two parts.
+			&& 2 === \count($this->SubParts)
+			&& ContentType::isPkcs7Signature($this->SubParts[1]->ContentType())
+		) || ($header
+			&& \preg_match('#application/(x-)?pkcs7-mime.+smime-type=["\']?signed-data#si', $header->FullValue())
+		);
 	}
 
 	public static function FromFile(string $sFileName) : ?self
@@ -213,4 +193,38 @@ class Part
 
 		return \MailSo\Base\StreamWrappers\SubStreams::CreateStream($aSubStreams);
 	}
+
+	public function addPgpEncrypted(string $sEncrypted)
+	{
+		$oPart = new self;
+		$oPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'multipart/encrypted; protocol="application/pgp-encrypted"');
+		$this->SubParts->append($oPart);
+
+		$oSubPart = new self;
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'application/pgp-encrypted');
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_DISPOSITION, 'attachment');
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+		$oSubPart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString('Version: 1');
+		$oPart->SubParts->append($oSubPart);
+
+		$oSubPart = new self;
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'application/octet-stream');
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
+		$oSubPart->Headers->AddByName(Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+		$oSubPart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($sEncrypted);
+		$oPart->SubParts->append($oSubPart);
+	}
+
+	public function addPlain(string $sPlain)
+	{
+		$oPart = new self;
+		$oPart->Headers->AddByName(Enumerations\Header::CONTENT_TYPE, 'text/plain; charset=utf-8');
+		$oPart->Headers->AddByName(Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+		$oPart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
+			\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sPlain))),
+			'convert.quoted-printable-encode'
+		);
+		$this->SubParts->append($oPart);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php
index e5f7f4395..bd7b8fa7c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Mime/PartCollection.php
@@ -17,7 +17,7 @@ namespace MailSo\Mime;
  */
 class PartCollection extends \MailSo\Base\Collection
 {
-	protected $sBoundary;
+	protected string $sBoundary = '';
 
 	public function append($oPart, bool $bToTop = false) : void
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
new file mode 100644
index 000000000..45e636e8f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/ConnectSettings.php
@@ -0,0 +1,149 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Net;
+
+use SnappyMail\SensitiveString;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class ConnectSettings implements \JsonSerializable
+{
+	public string $host;
+
+	public int $port;
+
+	/**
+	 * stream timeout in seconds
+	 */
+	public int $timeout = 10;
+
+	// none, TLS, STARTTLS
+	public int $type = Enumerations\ConnectionSecurityType::AUTO_DETECT;
+//	public int $type = Enumerations\ConnectionSecurityType::NONE;
+
+	public SSLContext $ssl;
+//	public bool $tls_weak = false;
+
+	// Authentication settings used by all child classes
+	public bool $useAuth = true;
+	public bool $shortLogin = false;
+	public bool $lowerLogin = true;
+	public string $stripLogin = '';
+	public array $SASLMechanisms = [
+		// https://github.com/the-djmaze/snappymail/issues/182
+		'SCRAM-SHA3-512',
+		'SCRAM-SHA-512',
+		'SCRAM-SHA-256',
+		'SCRAM-SHA-1',
+//		'CRAM-MD5',
+		'PLAIN',
+		'LOGIN'
+	];
+
+	private string $username = '';
+	private ?SensitiveString $passphrase = null;
+
+	public function __construct()
+	{
+		$this->ssl = new SSLContext;
+	}
+
+	public function __get(string $name)
+	{
+		$name = \strtolower($name);
+		if ('passphrase' === $name || 'password' === $name) {
+			return $this->passphrase ? $this->passphrase->getValue() : '';
+		}
+		if ('username' === $name || 'login' === $name) {
+			return $this->username;
+		}
+	}
+
+	public function __set(string $name,
+		#[\SensitiveParameter]
+		$value
+	) {
+		$name = \strtolower($name);
+		if ('passphrase' === $name || 'password' === $name) {
+			$this->passphrase = \is_string($value) ? new SensitiveString($value) : $value;
+		}
+		if ('username' === $name || 'login' === $name) {
+			$this->username = $value;
+		}
+	}
+
+	public function fixUsername(string $value, bool $allowShorten = true): string
+	{
+		$value = \SnappyMail\IDN::emailToAscii($value);
+//		$value = \SnappyMail\IDN::emailToAscii(\MailSo\Base\Utils::Trim($value));
+		// Strip the domain part
+		if ($this->shortLogin && $allowShorten) {
+			$value = \MailSo\Base\Utils::getEmailAddressLocalPart($value);
+		}
+		// Convert to lowercase
+		if ($this->lowerLogin) {
+			$value = \mb_strtolower($value);
+		}
+		// Strip certain characters
+		if ($this->stripLogin) {
+			$value = \explode('@', $value);
+			$value[0] = \str_replace(\str_split($this->stripLogin), '', $value[0]);
+			$value = \implode('@', $value);
+		}
+		return $value;
+	}
+
+	public static function fromArray(array $aSettings): self
+	{
+		$object = new static;
+		$object->host = $aSettings['host'];
+		$object->port = $aSettings['port'];
+		$object->type = isset($aSettings['type']) ? $aSettings['type'] : $aSettings['secure'];
+		if (isset($aSettings['timeout'])) {
+			$object->timeout = $aSettings['timeout'];
+		}
+		$object->shortLogin = !empty($aSettings['shortLogin']);
+		if (isset($aSettings['lowerLogin'])) {
+			$object->lowerLogin = !empty($aSettings['lowerLogin']);
+		}
+		if (isset($aSettings['stripLogin'])) {
+			$object->stripLogin = $aSettings['stripLogin'];
+		}
+		$object->ssl = SSLContext::fromArray($aSettings['ssl'] ?? []);
+		if (!empty($aSettings['sasl']) && \is_array($aSettings['sasl'])) {
+			$object->SASLMechanisms = $aSettings['sasl'];
+		}
+//		$object->tls_weak = !empty($aSettings['tls_weak']);
+		return $object;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return array(
+//			'@Object' => 'Object/ConnectSettings',
+			'host' => $this->host,
+			'port' => $this->port,
+			'type' => $this->type,
+			'timeout' => $this->timeout,
+			'shortLogin' => $this->shortLogin,
+			'lowerLogin' => $this->lowerLogin,
+			'stripLogin' => $this->stripLogin,
+			'sasl' => $this->SASLMechanisms,
+			'ssl' => $this->ssl
+//			'tls_weak' => $this->tls_weak
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
index 317fdf693..4db1fd99f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Enumerations/ConnectionSecurityType.php
@@ -20,6 +20,7 @@ abstract class ConnectionSecurityType
 {
 	const NONE = 0;
 	const SSL = 1;
+	const TLS = 1;
 	const STARTTLS = 2;
 	const AUTO_DETECT = 9;
 
@@ -27,8 +28,7 @@ abstract class ConnectionSecurityType
 	{
 		$iPort = (int) $iPort;
 		$iResult = (int) $iSecurityType;
-		if (self::AUTO_DETECT === $iSecurityType)
-		{
+		if (self::AUTO_DETECT === $iSecurityType) {
 			switch (true)
 			{
 				case 993 === $iPort:
@@ -39,19 +39,10 @@ abstract class ConnectionSecurityType
 			}
 		}
 
-		if (self::SSL === $iResult && !\in_array('ssl', \stream_get_transports()))
-		{
+		if (self::SSL === $iResult && !\in_array('ssl', \stream_get_transports())) {
 			$iResult = self::NONE;
 		}
 
 		return self::SSL === $iResult;
 	}
-
-	public static function UseStartTLS(int $iSecurityType, bool $bHasSupportedAuth = true) : bool
-	{
-		return
-			(self::STARTTLS === $iSecurityType
-			 || (self::AUTO_DETECT === $iSecurityType && (!$bHasSupportedAuth || \MailSo\Config::$PreferStartTlsIfAutoDetect)))
-		 && \defined('STREAM_CRYPTO_METHOD_TLS_CLIENT') && \MailSo\Base\Utils::FunctionExistsAndEnabled('stream_socket_enable_crypto');
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/ConnectionException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
index fa825e7e7..92de262e4 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/ConnectionException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class ConnectionException extends \MailSo\Net\Exceptions\Exception {}
+class ConnectionException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/Exception.php
deleted file mode 100644
index c37b21a98..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/Exception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Net\Exceptions;
-
-/**
- * @category MailSo
- * @package Net
- * @subpackage Exceptions
- */
-class Exception extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php
deleted file mode 100644
index a7a0a3416..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/InvalidArgumentException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Net\Exceptions;
-
-/**
- * @category MailSo
- * @package Net
- * @subpackage Exceptions
- */
-class InvalidArgumentException extends \MailSo\Net\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
index 966d18773..180115a70 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketAlreadyConnectedException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketAlreadyConnectedException extends \MailSo\Net\Exceptions\ConnectionException {}
+class SocketAlreadyConnectedException extends ConnectionException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
index 93350837c..8c62cfd84 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketCanNotConnectToHostException.php
@@ -16,17 +16,11 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketCanNotConnectToHostException extends \MailSo\Net\Exceptions\ConnectionException
+class SocketCanNotConnectToHostException extends ConnectionException
 {
-	/**
-	 * @var string
-	 */
-	private $sSocketMessage;
+	private string $sSocketMessage;
 
-	/**
-	 * @var int
-	 */
-	private $iSocketCode;
+	private int $iSocketCode;
 
 	public function __construct(string $sSocketMessage = '', int $iSocketCode = 0, string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
 	{
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
index b406b3d2a..8c663804b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketConnectionDoesNotAvailableException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketConnectionDoesNotAvailableException extends \MailSo\Net\Exceptions\ConnectionException {}
+class SocketConnectionDoesNotAvailableException extends ConnectionException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
index bc5bf33f5..48361b2ae 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketReadException extends \MailSo\Net\Exceptions\Exception {}
+class SocketReadException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
index 96e3dc171..cd55b874f 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketReadTimeoutException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketReadTimeoutException extends \MailSo\Net\Exceptions\Exception {}
+class SocketReadTimeoutException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
index 5d376379d..95350963e 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnreadBufferException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketUnreadBufferException extends \MailSo\Net\Exceptions\Exception {}
+class SocketUnreadBufferException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
index 0314e3a25..7bf3e2e4c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketUnsuppoterdSecureConnectionException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketUnsuppoterdSecureConnectionException extends \MailSo\Net\Exceptions\ConnectionException {}
+class SocketUnsuppoterdSecureConnectionException extends ConnectionException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
index b18766b0d..e8f9372a8 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/Exceptions/SocketWriteException.php
@@ -16,4 +16,4 @@ namespace MailSo\Net\Exceptions;
  * @package Net
  * @subpackage Exceptions
  */
-class SocketWriteException extends \MailSo\Net\Exceptions\Exception {}
+class SocketWriteException extends \MailSo\RuntimeException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
index 5b25e8925..9196ac534 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/NetClient.php
@@ -17,65 +17,26 @@ namespace MailSo\Net;
  */
 abstract class NetClient
 {
+	use \MailSo\Log\Inherit;
+
 	/**
 	 * @var resource
 	 */
 	private $rConnect = null;
 
-	/**
-	 * @var bool
-	 */
-	private $bUnreadBuffer = false;
+	private bool $bUnreadBuffer = false;
 
-	/**
-	 * @var bool
-	 */
-	protected $bRunningCallback = false;
+	protected bool $bRunningCallback = false;
 
-	/**
-	 * @var string
-	 */
-	protected $sResponseBuffer = '';
+	private string $sConnectedHost = '';
 
-	/**
-	 * @var int
-	 */
-	protected $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::NONE;
+	private bool $ssl = false;
 
-	/**
-	 * @var string
-	 */
-	private $sConnectedHost = '';
+	private int $iConnectTimeOut = 10;
 
-	/**
-	 * @var int
-	 */
-	private $iConnectedPort = 0;
+	private float $iStartConnectTime = 0;
 
-	/**
-	 * @var bool
-	 */
-	private $bSecure = false;
-
-	/**
-	 * @var int
-	 */
-	private $iConnectTimeOut = 10;
-
-	/**
-	 * @var int
-	 */
-	private $iSocketTimeOut = 10;
-
-	/**
-	 * @var int
-	 */
-	private $iStartConnectTime = 0;
-
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger = null;
+	public ConnectSettings $Settings;
 
 	public function __destruct()
 	{
@@ -91,15 +52,9 @@ abstract class NetClient
 		return $this->sConnectedHost;
 	}
 
-	public function GetConnectedPort() : int
+	public function SetTimeOuts(int $iConnectTimeOut = 10) : void
 	{
-		return $this->iConnectedPort;
-	}
-
-	public function SetTimeOuts(int $iConnectTimeOut = 10, int $iSocketTimeOut = 10) : void
-	{
-		$this->iConnectTimeOut = max(5, $iConnectTimeOut);
-		$this->iSocketTimeOut = max(5, $iSocketTimeOut);
+		$this->iConnectTimeOut = \max(5, $iConnectTimeOut);
 	}
 
 	/**
@@ -112,84 +67,60 @@ abstract class NetClient
 
 	public function capturePhpErrorWithException(int $iErrNo, string $sErrStr, string $sErrFile, int $iErrLine) : bool
 	{
-		throw new \MailSo\Base\Exceptions\Exception($sErrStr, $iErrNo);
+		throw new \MailSo\RuntimeException($sErrStr, $iErrNo);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
+	 * @throws \ValueError
+	 * @throws \MailSo\RuntimeException
 	 * @throws \MailSo\Net\Exceptions\SocketAlreadyConnectedException
 	 * @throws \MailSo\Net\Exceptions\SocketCanNotConnectToHostException
 	 */
-	public function Connect(string $sServerName, int $iPort,
-		int $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
-		bool $bVerifySsl = false, bool $bAllowSelfSigned = true,
-		string $sClientCert = '') : void
+	public function Connect(ConnectSettings $oSettings) : void
 	{
-		if (!\strlen(\trim($sServerName)) || !\MailSo\Base\Validator::PortInt($iPort))
-		{
-			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		$oSettings->host = \trim($oSettings->host);
+		if (!\strlen($oSettings->host) || 0 > $oSettings->port || 65535 < $oSettings->port) {
+			$this->writeLogException(new \ValueError, \LOG_ERR);
 		}
 
-		if ($this->IsConnected())
-		{
-			$this->writeLogException(
-				new Exceptions\SocketAlreadyConnectedException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if ($this->IsConnected()) {
+			$this->writeLogException(new Exceptions\SocketAlreadyConnectedException, \LOG_ERR, false);
+//			$this->Disconnect();
+			return;
 		}
 
-		$sServerName = \trim($sServerName);
+		$this->Settings = $oSettings;
 
 		$sErrorStr = '';
 		$iErrorNo = 0;
 
-		$this->sConnectedHost = $sServerName;
-		$this->iConnectedPort = $iPort;
-		$this->iSecurityType = $iSecurityType;
-		$this->bSecure = \MailSo\Net\Enumerations\ConnectionSecurityType::UseSSL(
-			$this->iConnectedPort, $this->iSecurityType);
+		$this->sConnectedHost = $oSettings->host;
 
-		if (!\preg_match('/^[a-z0-9._]{2,8}:\/\//i', $this->sConnectedHost))
-		{
-			$this->sConnectedHost = ($this->bSecure ? 'ssl://' : 'tcp://').$this->sConnectedHost;
-//			$this->sConnectedHost = ($this->bSecure ? 'ssl://' : '').$this->sConnectedHost;
+		$this->ssl = \MailSo\Net\Enumerations\ConnectionSecurityType::UseSSL($this->Settings->port, $this->Settings->type);
+
+		if (!\preg_match('/^[a-z0-9._]{2,8}:\/\//i', $this->sConnectedHost)) {
+			$this->sConnectedHost = ($this->ssl ? 'ssl://' : 'tcp://') . $this->sConnectedHost;
+//			$this->sConnectedHost = ($this->ssl ? 'ssl://' : '') . $this->sConnectedHost;
 		}
 
-		if (!$this->bSecure && \MailSo\Net\Enumerations\ConnectionSecurityType::SSL === $this->iSecurityType)
-		{
+		if (!$this->ssl && \MailSo\Net\Enumerations\ConnectionSecurityType::SSL === $this->Settings->type) {
 			$this->writeLogException(
 				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('SSL isn\'t supported: ('.\implode(', ', \stream_get_transports()).')'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+				\LOG_ERR);
 		}
 
 		$this->iStartConnectTime = \microtime(true);
-		$this->writeLog('Start connection to "'.$this->sConnectedHost.':'.$this->iConnectedPort.'"',
-			\MailSo\Log\Enumerations\Type::NOTE);
+		$this->writeLog('Start connection to "'.$this->sConnectedHost.':'.$this->Settings->port.'"');
 
-		$aStreamContextSettings = array(
-			'ssl' => array(
-				'verify_host' => $bVerifySsl,
-				'verify_peer' => $bVerifySsl,
-				'verify_peer_name' => $bVerifySsl,
-				'allow_self_signed' => $bVerifySsl ? $bAllowSelfSigned : true
-			)
-		);
-
-		if (!empty($sClientCert))
-		{
-			$aStreamContextSettings['ssl']['local_cert'] = $sClientCert;
-		}
-
-		\MailSo\Hooks::Run('Net.NetClient.StreamContextSettings/Filter', array(&$aStreamContextSettings));
-
-		$rStreamContext = \stream_context_create($aStreamContextSettings);
+		$rStreamContext = \stream_context_create(array(
+			'ssl' => $oSettings->ssl->jsonSerialize()
+		));
 
 		\set_error_handler(array($this, 'capturePhpErrorWithException'));
 
 		try
 		{
-			$this->rConnect = \stream_socket_client($this->sConnectedHost.':'.$this->iConnectedPort,
+			$this->rConnect = \stream_socket_client($this->sConnectedHost.':'.$this->Settings->port,
 				$iErrorNo, $sErrorStr, $this->iConnectTimeOut, STREAM_CLIENT_CONNECT, $rStreamContext);
 		}
 		catch (\Throwable $oExc)
@@ -200,88 +131,72 @@ abstract class NetClient
 
 		\restore_error_handler();
 
-		$this->writeLog('Connect ('.($this->rConnect ? 'success' : 'failed').')',
-			\MailSo\Log\Enumerations\Type::NOTE);
+		$this->writeLog('Connect ('.($this->rConnect ? 'success' : 'failed').')');
 
-		if (!$this->rConnect)
-		{
+		if (!$this->rConnect) {
 			$this->writeLogException(
 				new Exceptions\SocketCanNotConnectToHostException(
 					\MailSo\Base\Locale::ConvertSystemString($sErrorStr), (int) $iErrorNo,
-					'Can\'t connect to host "'.$this->sConnectedHost.':'.$this->iConnectedPort.'"'
-				), \MailSo\Log\Enumerations\Type::NOTICE, true);
+					'Can\'t connect to host "'.$this->sConnectedHost.':'.$this->Settings->port.'"'
+				)
+			);
 		}
 
-		$this->writeLog((\microtime(true) - $this->iStartConnectTime).' (raw connection)',
-			\MailSo\Log\Enumerations\Type::TIME);
+		$this->writeLog((\microtime(true) - $this->iStartConnectTime).' (raw connection)', \LOG_DEBUG);
 
-		if ($this->rConnect)
-		{
-			if (\MailSo\Base\Utils::FunctionExistsAndEnabled('stream_set_timeout'))
-			{
-				\stream_set_timeout($this->rConnect, $this->iSocketTimeOut);
-			}
+		if ($this->rConnect && \MailSo\Base\Utils::FunctionCallable('stream_set_timeout')) {
+			\stream_set_timeout($this->rConnect, \max(5, $oSettings->timeout));
 		}
 	}
 
-	public function EnableCrypto()
+	public function Encrypted() : bool
 	{
-		$bError = true;
-		if ($this->rConnect &&
-			\MailSo\Base\Utils::FunctionExistsAndEnabled('stream_socket_enable_crypto'))
-		{
-			switch (true)
-			{
-				case defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && OPENSSL_VERSION_NUMBER >= 0x10101000 &&
-					\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT):
-				case defined('STREAM_CRYPTO_METHOD_ANY_CLIENT') &&
-					\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_ANY_CLIENT):
-				case defined('STREAM_CRYPTO_METHOD_TLS_CLIENT') &&
-					\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_TLS_CLIENT):
-				case defined('STREAM_CRYPTO_METHOD_SSLv23_CLIENT') &&
-					\stream_socket_enable_crypto($this->rConnect, true, STREAM_CRYPTO_METHOD_SSLv23_CLIENT):
-					$bError = false;
-					break;
+		return $this->rConnect && !empty(\stream_get_meta_data($this->rConnect)['crypto']);
+	}
+
+	public function EnableCrypto() : void
+	{
+		$bSuccess = false;
+		if ($this->rConnect && \MailSo\Base\Utils::FunctionCallable('stream_socket_enable_crypto')) {
+			$crypto_method = STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
+			if (\defined('STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT') && OPENSSL_VERSION_NUMBER >= 0x10101000) {
+				$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
 			}
+//			if ($this->Settings->tls_weak) {
+//				$crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
+//			}
+			$bSuccess = \stream_socket_enable_crypto($this->rConnect, true, $crypto_method);
 		}
 
-		if ($bError)
-		{
-			$this->writeLogException(
-				new \MailSo\Net\Exceptions\Exception('Cannot enable STARTTLS.'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
+		$bSuccess || $this->writeLogException(new \MailSo\RuntimeException('Cannot enable STARTTLS.'), \LOG_ERR);
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
 	 */
 	public function Disconnect() : void
 	{
-		if ($this->rConnect)
-		{
-			if (!$this->bUnreadBuffer && !$this->bRunningCallback)
-			{
+		if ($this->rConnect) {
+			if (!$this->bUnreadBuffer && !$this->bRunningCallback) {
 				$this->Logout();
 			}
 
 			$bResult = \fclose($this->rConnect);
 
-			$this->writeLog('Disconnected from "'.$this->sConnectedHost.':'.$this->iConnectedPort.'" ('.
-				(($bResult) ? 'success' : 'unsuccess').')', \MailSo\Log\Enumerations\Type::NOTE);
-
-			if ($this->iStartConnectTime)
-			{
-				$this->writeLog((\microtime(true) - $this->iStartConnectTime).' (net session)',
-					\MailSo\Log\Enumerations\Type::TIME);
+			$this->writeLog('Disconnected from "'.$this->sConnectedHost.':'.$this->Settings->port.'" ('.
+				(($bResult) ? 'success' : 'unsuccess').')');
 
+			if ($this->iStartConnectTime) {
+				$this->writeLog((\microtime(true) - $this->iStartConnectTime).' (net session)', \LOG_DEBUG);
 				$this->iStartConnectTime = 0;
 			}
-
 			$this->rConnect = null;
 		}
 	}
 
+	abstract public function supportsAuthType(string $sasl_type) : bool;
+//	abstract public function Login(ConnectSettings $oSettings) : self;
 	abstract public function Logout() : void;
 
 	public function IsConnected(bool $bThrowExceptionOnFalse = false) : bool
@@ -290,24 +205,14 @@ abstract class NetClient
 			return true;
 		}
 		if ($bThrowExceptionOnFalse) {
-			$this->writeLogException(
-				new Exceptions\SocketConnectionDoesNotAvailableException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+			$this->writeLogException(new Exceptions\SocketConnectionDoesNotAvailableException, \LOG_ERR);
 		}
 		return false;
 	}
 
-	/**
-	 * @throws \MailSo\Net\Exceptions\SocketConnectionDoesNotAvailableException
-	 */
-	public function IsConnectedWithException() : void
-	{
-		$this->IsConnected(true);
-	}
-
 	public function StreamContextParams() : array
 	{
-		return $this->rConnect && \MailSo\Base\Utils::FunctionExistsAndEnabled('stream_context_get_options')
+		return $this->rConnect && \MailSo\Base\Utils::FunctionCallable('stream_context_get_options')
 			? \stream_context_get_params($this->rConnect) : false;
 	}
 
@@ -317,42 +222,23 @@ abstract class NetClient
 	 */
 	protected function sendRaw(string $sRaw, bool $bWriteToLog = true, string $sFakeRaw = '') : void
 	{
-		if ($this->bUnreadBuffer)
-		{
-			$this->writeLogException(
-				new Exceptions\SocketUnreadBufferException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if ($this->bUnreadBuffer) {
+			$this->writeLogException(new Exceptions\SocketUnreadBufferException, \LOG_ERR);
 		}
 
-		$bFake = \strlen($sFakeRaw);
 		$sRaw .= "\r\n";
 
-		if ($this->oLogger && $this->oLogger->IsShowSecter())
-		{
-			$bFake = false;
-		}
-
-		if ($bFake)
-		{
+		$bFake = \strlen($sFakeRaw) && $this->oLogger && !$this->oLogger->ShowSecrets();
+		if ($bFake) {
 			$sFakeRaw .= "\r\n";
 		}
 
 		$mResult = \fwrite($this->rConnect, $sRaw);
-		if (false === $mResult)
-		{
+		if (false === $mResult) {
 			$this->IsConnected(true);
-
-			$this->writeLogException(
-				new Exceptions\SocketWriteException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-		else
-		{
-			if ($bWriteToLog)
-			{
-				$this->writeLogWithCrlf('> '.($bFake ? $sFakeRaw : $sRaw), //.' ['.$iWriteSize.']',
-					$bFake ? \MailSo\Log\Enumerations\Type::SECURE : \MailSo\Log\Enumerations\Type::INFO);
-			}
+			$this->writeLogException(new Exceptions\SocketWriteException, \LOG_ERR);
+		} else if ($bWriteToLog) {
+			$this->writeLogWithCrlf('> '.($bFake ? $sFakeRaw : $sRaw));
 		}
 	}
 
@@ -360,118 +246,69 @@ abstract class NetClient
 	 * @throws \MailSo\Net\Exceptions\SocketConnectionDoesNotAvailableException
 	 * @throws \MailSo\Net\Exceptions\SocketReadException
 	 */
-	protected function getNextBuffer(?int $iReadLen = null, bool $bForceLogin = false) : void
+	protected function getNextBuffer(?int $iReadLen = null) : ?string
 	{
-		if (null === $iReadLen)
-		{
-			$this->sResponseBuffer = \fgets($this->rConnect);
-		}
-		else
-		{
-			$this->sResponseBuffer = '';
+		if (null === $iReadLen) {
+			$sResponseBuffer = \fgets($this->rConnect);
+		} else {
+			$sResponseBuffer = '';
 			$iRead = $iReadLen;
-			while (0 < $iRead)
-			{
+			while (0 < $iRead) {
 				$sAddRead = \fread($this->rConnect, $iRead);
-				if (false === $sAddRead)
-				{
-					$this->sResponseBuffer = false;
+				if (false === $sAddRead) {
+					$sResponseBuffer = false;
 					break;
 				}
-
-				$this->sResponseBuffer .= $sAddRead;
+				$sResponseBuffer .= $sAddRead;
 				$iRead -= \strlen($sAddRead);
 			}
 		}
 
-		if (false === $this->sResponseBuffer)
-		{
+		if (false === $sResponseBuffer) {
 			$this->IsConnected(true);
 			$this->bUnreadBuffer = true;
-
 			$aSocketStatus = \stream_get_meta_data($this->rConnect);
-			if (isset($aSocketStatus['timed_out']) && $aSocketStatus['timed_out'])
-			{
-				$this->writeLogException(
-					new Exceptions\SocketReadTimeoutException,
-						\MailSo\Log\Enumerations\Type::ERROR, true);
+			if (isset($aSocketStatus['timed_out']) && $aSocketStatus['timed_out']) {
+				$this->writeLogException(new Exceptions\SocketReadTimeoutException, \LOG_ERR);
+			} else {
+				$this->writeLog('Stream Meta: '.\print_r($aSocketStatus, true), \LOG_ERR);
+				$this->writeLogException(new Exceptions\SocketReadException, \LOG_ERR);
 			}
-			else
-			{
-				$this->writeLog('Stream Meta: '.
-					\print_r($aSocketStatus, true), \MailSo\Log\Enumerations\Type::ERROR);
+			return null;
+		}
 
-				$this->writeLogException(
-					new Exceptions\SocketReadException,
-						\MailSo\Log\Enumerations\Type::ERROR, true);
-			}
-		}
-		else
-		{
-			$iReadedLen = \strlen($this->sResponseBuffer);
-			if (null === $iReadLen || $bForceLogin)
-			{
-				$iLimit = 5000; // 5KB
-				if ($iLimit < $iReadedLen)
-				{
-					$this->writeLogWithCrlf('[cutted:'.$iReadedLen.'] < '.\substr($this->sResponseBuffer, 0, $iLimit).'...',
-						\MailSo\Log\Enumerations\Type::INFO);
-				}
-				else
-				{
-					$this->writeLogWithCrlf('< '.$this->sResponseBuffer, //.' ['.$iReadedLen.']',
-						\MailSo\Log\Enumerations\Type::INFO);
-				}
-			}
-			else
-			{
-				$this->writeLog('Received '.$iReadedLen.'/'.$iReadLen.' bytes.',
-					\MailSo\Log\Enumerations\Type::INFO);
-			}
+		$iReadBytes = \strlen($sResponseBuffer);
+//		$iReadLen && $this->writeLog('Received '.$iReadBytes.'/'.$iReadLen.' bytes.');
+		$iLimit = 5000; // 5KB
+		if ($iLimit < $iReadBytes) {
+			$this->writeLogWithCrlf('[cutted:'.$iReadBytes.'] < '.\substr($sResponseBuffer, 0, $iLimit).'...');
+		} else {
+			$this->writeLogWithCrlf('< '.$sResponseBuffer);
 		}
+
+		return $sResponseBuffer;
 	}
 
 	abstract function getLogName() : string;
 
-	protected function writeLog(string $sDesc, int $iDescType = \MailSo\Log\Enumerations\Type::INFO, bool $bDiplayCrLf = false) : void
+	protected function writeLog(string $sDesc, int $iDescType = \LOG_INFO) : void
 	{
-		if ($this->oLogger)
-		{
-			$this->oLogger->Write($sDesc, $iDescType, $this->getLogName(), true, $bDiplayCrLf);
-		}
+		$this->logWrite($sDesc, $iDescType, $this->getLogName());
 	}
 
-	protected function writeLogWithCrlf(string $sDesc, int $iDescType = \MailSo\Log\Enumerations\Type::INFO) : void
+	protected function writeLogWithCrlf(string $sDesc) : void
 	{
-		$this->writeLog($sDesc, $iDescType, true);
+		$this->logWrite($sDesc, \LOG_INFO, $this->getLogName(), true, true);
 	}
 
-	protected function writeLogException(\Throwable $oException,
-		int $iDescType = \MailSo\Log\Enumerations\Type::NOTICE, bool $bThrowException = false) : void
+	protected function writeLogException(\Throwable $oException, int $iDescType = \LOG_NOTICE, bool $bThrowException = true) : void
 	{
-		if ($this->oLogger)
-		{
-			if ($oException instanceof Exceptions\SocketCanNotConnectToHostException)
-			{
-				$this->oLogger->Write('Socket: ['.$oException->getSocketCode().'] '.$oException->getSocketMessage(), $iDescType, $this->getLogName());
-			}
-
-			$this->oLogger->WriteException($oException, $iDescType, $this->getLogName());
+		if ($oException instanceof Exceptions\SocketCanNotConnectToHostException) {
+			$this->logWrite('Socket: ['.$oException->getSocketCode().'] '.$oException->getSocketMessage(), $iDescType, $this->getLogName());
 		}
-
-		if ($bThrowException)
-		{
+		$this->logException($oException, $iDescType, $this->getLogName());
+		if ($bThrowException) {
 			throw $oException;
 		}
 	}
-
-	public function SetLogger(\MailSo\Log\Logger $oLogger) : void
-	{
-		$this->oLogger = $oLogger;
-	}
-
-	public function Logger() : ?\MailSo\Log\Logger
-	{
-		return $this->oLogger;
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
new file mode 100644
index 000000000..e477a7b81
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Net/SSLContext.php
@@ -0,0 +1,73 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.php.net/context.ssl
+ */
+
+namespace MailSo\Net;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class SSLContext implements \JsonSerializable
+{
+//	public string $peer_name = '';
+//	public string $peer_fingerprint = '';
+	public bool $verify_peer = true;
+	public bool $verify_peer_name = true;
+	public bool $allow_self_signed = false;
+	public string $cafile = '';
+	public string $capath = '';
+//	public string $ciphers = 'HIGH:!SSLv2:!SSLv3';
+	public bool $SNI_enabled = true;
+	public bool $disable_compression = true;
+	public int $security_level = 1;
+	public string $local_cert = '';
+//	public string $local_pk = '';
+//	public string $passphrase = '';
+//	public int $verify_depth = 0;
+//	public bool $capture_peer_cert = false;
+//	public bool $capture_peer_cert_chain = false;
+
+	public function __construct()
+	{
+		$oConfig = \RainLoop\Api::Config();
+		$this->verify_peer = !!$oConfig->Get('ssl', 'verify_certificate', true);
+		$this->verify_peer_name = !!$oConfig->Get('ssl', 'verify_certificate', true);
+		$this->allow_self_signed = !!$oConfig->Get('ssl', 'allow_self_signed', false);
+		$this->cafile = \trim($oConfig->Get('ssl', 'cafile', ''));
+		$this->capath = \trim($oConfig->Get('ssl', 'capath', ''));
+		$this->disable_compression = !!$oConfig->Get('ssl', 'disable_compression', true);
+		$this->security_level = (int) $oConfig->Get('ssl', 'security_level', 1);
+		$this->local_cert = \trim($oConfig->Get('ssl', 'local_cert', ''));
+	}
+
+	public static function fromArray(array $settings): self
+	{
+		$object = new static;
+		foreach ($settings as $key => $value) {
+			$object->$key = $value;
+		}
+		return $object;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$aResult = \get_object_vars($this);
+//		$aResult['@Object'] = 'Object/SSLContext';
+		return \array_filter(
+			$aResult,
+			function($var){return !\is_string($var) || \strlen($var);}
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/RuntimeException.php
similarity index 71%
rename from snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php
rename to snappymail/v/0.0.0/app/libraries/MailSo/RuntimeException.php
index 6240472a4..004764f93 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Base/Exceptions/Exception.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/RuntimeException.php
@@ -9,20 +9,20 @@
  * file that was distributed with this source code.
  */
 
-namespace MailSo\Base\Exceptions;
+namespace MailSo;
 
 /**
  * @category MailSo
- * @package Base
- * @subpackage Exceptions
  */
-class Exception extends \Exception
+class RuntimeException extends \RuntimeException
 {
-	public function __construct(string $sMessage = '', int $iCode = 0, \Throwable $oPrevious = null)
+/*
+	public function __construct(string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
 	{
 		$sMessage = \strlen($sMessage) ? $sMessage
-			: \str_replace('\\', '-', \get_class($this)).' ('.\basename($this->getFile()).' ~ '.$this->getLine().')';
+			: \str_replace('\\', '-', \get_class($this)).' ('.\basename($this->getFile()).'#'.$this->getLine().')';
 
 		parent::__construct($sMessage, $iCode, $oPrevious);
 	}
+*/
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/Exception.php
deleted file mode 100644
index 0740485c4..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/Exception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Sieve\Exceptions;
-
-/**
- * @category MailSo
- * @package Sieve
- * @subpackage Exceptions
- */
-class Exception extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
index c0b5d1a5e..0e7a3dd61 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadCredentialsException.php
@@ -16,4 +16,4 @@ namespace MailSo\Sieve\Exceptions;
  * @package Sieve
  * @subpackage Exceptions
  */
-class LoginBadCredentialsException extends \MailSo\Sieve\Exceptions\LoginException {}
+class LoginBadCredentialsException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
index 0cf709ac0..e4eb34c8d 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginBadMethodException.php
@@ -16,4 +16,4 @@ namespace MailSo\Sieve\Exceptions;
  * @package Sieve
  * @subpackage Exceptions
  */
-class LoginBadMethodException extends \MailSo\Sieve\Exceptions\LoginException {}
\ No newline at end of file
+class LoginBadMethodException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
index ebc3154f1..937bf1da9 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/LoginException.php
@@ -16,4 +16,4 @@ namespace MailSo\Sieve\Exceptions;
  * @package Sieve
  * @subpackage Exceptions
  */
-class LoginException extends \MailSo\Sieve\Exceptions\NegativeResponseException {}
+class LoginException extends NegativeResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
index 1675d2b35..796c0b8c6 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/NegativeResponseException.php
@@ -16,4 +16,4 @@ namespace MailSo\Sieve\Exceptions;
  * @package Sieve
  * @subpackage Exceptions
  */
-class NegativeResponseException extends \MailSo\Sieve\Exceptions\ResponseException {}
+class NegativeResponseException extends ResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
index 048b0f94d..15a194737 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/ResponseException.php
@@ -16,12 +16,9 @@ namespace MailSo\Sieve\Exceptions;
  * @package Sieve
  * @subpackage Exceptions
  */
-class ResponseException extends \MailSo\Sieve\Exceptions\Exception
+class ResponseException extends \MailSo\RuntimeException
 {
-	/**
-	 * @var array
-	 */
-	private $aResponses;
+	private array $aResponses;
 
 	public function __construct(array $aResponses = array(), string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
 	{
@@ -37,7 +34,7 @@ class ResponseException extends \MailSo\Sieve\Exceptions\Exception
 
 	public function GetLastResponse() : ?\MailSo\Sieve\Response
 	{
-		$iCnt = count($this->aResponses);
+		$iCnt = \count($this->aResponses);
 		return $iCnt ? $this->aResponses[$iCnt - 1] : null;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php
deleted file mode 100644
index 8704e461b..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Exceptions/RuntimeException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Sieve\Exceptions;
-
-/**
- * @category MailSo
- * @package Sieve
- * @subpackage Exceptions
- */
-class RuntimeException extends \MailSo\Sieve\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
deleted file mode 100644
index f4ff3375c..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/ManageSieveClient.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Sieve;
-
-/**
- * @category MailSo
- * @package Sieve
- */
-class ManageSieveClient extends \MailSo\Net\NetClient
-{
-	/**
-	 * @var bool
-	 */
-	private $bIsLoggined = false;
-
-	/**
-	 * @var array
-	 */
-	private $aCapa = array();
-
-	/**
-	 * @var array
-	 */
-	private $aAuth = array();
-
-	/**
-	 * @var array
-	 */
-	private $aModules = array();
-
-	public function IsSupported(string $sCapa) : bool
-	{
-		return isset($this->aCapa[\strtoupper($sCapa)]);
-	}
-
-	public function IsModuleSupported(string $sModule) : bool
-	{
-		return $this->IsSupported('SIEVE') && \in_array(\strtolower(\trim($sModule)), $this->aModules);
-	}
-
-	public function Modules() : array
-	{
-		return $this->aModules;
-	}
-
-	public function IsAuthSupported(string $sAuth) : bool
-	{
-		return $this->IsSupported('SASL') && \in_array(\strtoupper($sAuth), $this->aAuth);
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Sieve\Exceptions\ResponseException
-	 */
-	public function Connect(string $sServerName, int $iPort,
-		int $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
-		bool $bVerifySsl = false, bool $bAllowSelfSigned = true, string $sClientCert = '') : void
-	{
-		parent::Connect($sServerName, $iPort, $iSecurityType, $bVerifySsl, $bAllowSelfSigned);
-
-		$aResponse = $this->parseResponse();
-		$this->validateResponse($aResponse);
-		$this->parseStartupResponse($aResponse);
-
-		if ($this->IsSupported('STARTTLS') && \MailSo\Net\Enumerations\ConnectionSecurityType::UseStartTLS($this->iSecurityType))
-		{
-			$this->sendRequestWithCheck('STARTTLS');
-			$this->EnableCrypto();
-
-			$aResponse = $this->parseResponse();
-			$this->validateResponse($aResponse);
-			$this->parseStartupResponse($aResponse);
-		}
-		else if (\MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS === $this->iSecurityType)
-		{
-			$this->writeLogException(
-				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Sieve\Exceptions\LoginException
-	 */
-	public function Login(array $aCredentials) : self
-	{
-		$sLogin = $aCredentials['Login'];
-		$sPassword = $aCredentials['Password'];
-		$sLoginAuthKey = '';
-		if (!\strlen($sLogin) || !\strlen($sPassword))
-		{
-			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-
-		if ($this->IsSupported('SASL'))
-		{
-			$type = '';
-			\array_push($aCredentials['SASLMechanisms'], 'PLAIN', 'LOGIN');
-			foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
-				if ($this->IsAuthSupported($sasl_type) && \SnappyMail\SASL::isSupported($sasl_type)) {
-					$type = $sasl_type;
-					break;
-				}
-			}
-
-			$SASL = \SnappyMail\SASL::factory($type);
-			$SASL->base64 = true;
-
-			$bAuth = false;
-			try
-			{
-				if (0 === \strpos($type, 'SCRAM-'))
-				{
-/*
-					$sAuthzid = $this->getResponseValue($this->SendRequestGetResponse('AUTHENTICATE', array($type)), \MailSo\Imap\Enumerations\ResponseType::CONTINUATION);
-					$this->sendRaw($SASL->authenticate($sLogin, $sPassword/*, $sAuthzid* /), true);
-					$sChallenge = $SASL->challenge($this->getResponseValue($this->getResponse(), \MailSo\Imap\Enumerations\ResponseType::CONTINUATION));
-					if ($this->oLogger) {
-						$this->oLogger->AddSecret($sChallenge);
-					}
-					$this->sendRaw($sChallenge, true, '*******');
-					$oResponse = $this->getResponse();
-					$SASL->verify($this->getResponseValue($oResponse));
-*/
-				}
-				else if ('PLAIN' === $type || 'OAUTHBEARER' === $type || 'XOAUTH2' === $type)
-				{
-					$sAuth = $SASL->authenticate($sLogin, $sPassword, $sLoginAuthKey);
-
-					if ($aCredentials['InitialAuthPlain'])
-					{
-						$this->sendRaw("AUTHENTICATE \"{$type}\" \"{$sAuth}\"");
-					}
-					else
-					{
-						$this->sendRaw("AUTHENTICATE \"{$type}\" {".\strlen($sAuth).'+}');
-						$this->sendRaw($sAuth);
-					}
-
-					$aResponse = $this->parseResponse();
-					$this->validateResponse($aResponse);
-					$this->parseStartupResponse($aResponse);
-					$bAuth = true;
-				}
-				else if ('LOGIN' === $type)
-				{
-					$sLogin = $SASL->authenticate($sLogin, $sPassword);
-					$sPassword = $SASL->challenge('');
-
-					$this->sendRaw('AUTHENTICATE "LOGIN"');
-					$this->sendRaw('{'.\strlen($sLogin).'+}');
-					$this->sendRaw($sLogin);
-					$this->sendRaw('{'.\strlen($sPassword).'+}');
-					$this->sendRaw($sPassword);
-
-					$aResponse = $this->parseResponse();
-					$this->validateResponse($aResponse);
-					$this->parseStartupResponse($aResponse);
-					$bAuth = true;
-				}
-			}
-			catch (\MailSo\Sieve\Exceptions\NegativeResponseException $oException)
-			{
-				$this->writeLogException(
-					new \MailSo\Sieve\Exceptions\LoginBadCredentialsException(
-						$oException->GetResponses(), '', 0, $oException),
-					\MailSo\Log\Enumerations\Type::ERROR, true);
-			}
-
-			if (!$bAuth)
-			{
-				$this->writeLogException(
-					new \MailSo\Sieve\Exceptions\LoginBadMethodException,
-					\MailSo\Log\Enumerations\Type::ERROR, true);
-			}
-		}
-		else
-		{
-			$this->writeLogException(
-				new \MailSo\Sieve\Exceptions\LoginException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-
-		$this->bIsLoggined = true;
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function Logout() : void
-	{
-		if ($this->bIsLoggined)
-		{
-			$this->sendRequestWithCheck('LOGOUT');
-			$this->bIsLoggined = false;
-		}
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function ListScripts() : array
-	{
-		$this->sendRequest('LISTSCRIPTS');
-		$aResponse = $this->parseResponse();
-		$this->validateResponse($aResponse);
-
-		$aResult = array();
-		foreach ($aResponse as $sLine)
-		{
-			$aTokens = $this->parseLine($sLine);
-			if (!$aTokens)
-			{
-				continue;
-			}
-
-			$aResult[$aTokens[0]] = 'ACTIVE' === substr($sLine, -6);
-		}
-
-		return $aResult;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function Capability() : array
-	{
-		$this->sendRequest('CAPABILITY');
-		$aResponse = $this->parseResponse();
-		$this->validateResponse($aResponse);
-		$this->parseStartupResponse($aResponse);
-
-		return $this->aCapa;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function Noop() : self
-	{
-		$this->sendRequestWithCheck('NOOP');
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function GetScript(string $sScriptName) : string
-	{
-		$this->sendRequest('GETSCRIPT "'.$sScriptName.'"');
-		$aResponse = $this->parseResponse();
-		$this->validateResponse($aResponse);
-
-		$sScript = '';
-		if (\count($aResponse))
-		{
-			if ('{' === $aResponse[0][0])
-			{
-				\array_shift($aResponse);
-			}
-
-			if (\in_array(\substr($aResponse[\count($aResponse) - 1], 0, 2), array('OK', 'NO')))
-			{
-				\array_pop($aResponse);
-			}
-
-			$sScript = \implode("\n", $aResponse);
-		}
-
-		return $sScript;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function PutScript(string $sScriptName, string $sScriptSource) : self
-	{
-		$this->sendRequest('PUTSCRIPT "'.$sScriptName.'" {'.\strlen($sScriptSource).'+}');
-		$this->sendRequestWithCheck($sScriptSource);
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function CheckScript(string $sScriptSource) : self
-	{
-		$this->sendRequest('CHECKSCRIPT {'.\strlen($sScriptSource).'+}');
-		$this->sendRequestWithCheck($sScriptSource);
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function SetActiveScript(string $sScriptName) : self
-	{
-		$this->sendRequestWithCheck('SETACTIVE "'.$sScriptName.'"');
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function DeleteScript(string $sScriptName) : self
-	{
-		$this->sendRequestWithCheck('DELETESCRIPT "'.$sScriptName.'"');
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function RenameScript(string $sOldName, string $sNewName) : self
-	{
-		$this->sendRequestWithCheck('RENAMESCRIPT "'.$sOldName.'" "'.$sNewName.'"');
-
-		return $this;
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function GetActiveScriptName() : string
-	{
-		$aList = $this->ListScripts();
-		foreach ($aList as $sName => $bIsActive)
-		{
-			if ($bIsActive)
-			{
-				return $sName;
-			}
-		}
-
-		return '';
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	public function IsActiveScript(string $sScriptName) : bool
-	{
-		return $sScriptName === $this->GetActiveScriptName();
-	}
-
-	private function parseLine(string $sLine) : ?array
-	{
-		if (false === $sLine || null === $sLine || \in_array(\substr($sLine, 0, 2), array('OK', 'NO')))
-		{
-			return null;
-		}
-
-		$iStart = -1;
-		$iIndex = 0;
-		$aResult = array();
-
-		for ($iPos = 0; $iPos < \strlen($sLine); $iPos++)
-		{
-			if ('"' === $sLine[$iPos] && '\\' !== $sLine[$iPos])
-			{
-				if (-1 === $iStart)
-				{
-					$iStart = $iPos;
-				}
-				else
-				{
-					$aResult[$iIndex++] = \substr($sLine, $iStart + 1, $iPos - $iStart - 1);
-					$iStart = -1;
-				}
-			}
-		}
-
-		return isset($aResult[0]) ? $aResult : null;
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 */
-	private function parseStartupResponse(array $aResponse) : void
-	{
-		foreach ($aResponse as $sLine)
-		{
-			$aTokens = $this->parseLine($sLine);
-
-			if (false === $aTokens || !isset($aTokens[0]) ||
-				\in_array(\substr($sLine, 0, 2), array('OK', 'NO')))
-			{
-				continue;
-			}
-
-			$sToken = \strtoupper($aTokens[0]);
-			$this->aCapa[$sToken] = isset($aTokens[1]) ? $aTokens[1] : '';
-
-			if (isset($aTokens[1]))
-			{
-				switch ($sToken) {
-					case 'SASL':
-						$this->aAuth = \explode(' ', \strtoupper($aTokens[1]));
-						break;
-					case 'SIEVE':
-						$this->aModules = \explode(' ', \strtolower($aTokens[1]));
-						break;
-				}
-			}
-		}
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 */
-	private function sendRequest(string $sRequest) : void
-	{
-		if (!\strlen(\trim($sRequest)))
-		{
-			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-
-		$this->IsConnected(true);
-
-		$this->sendRaw($sRequest);
-	}
-
-	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	private function sendRequestWithCheck(string $sRequest) : void
-	{
-		$this->sendRequest($sRequest);
-		$this->validateResponse($this->parseResponse());
-	}
-
-	private function convertEndOfLine(string $sLine) : string
-	{
-		$sLine = \trim($sLine);
-		if ('}' === \substr($sLine, -1))
-		{
-			$iPos = \strrpos($sLine, '{');
-			if (false !== $iPos)
-			{
-				$sSunLine = \substr($sLine, $iPos + 1, -1);
-				if (\is_numeric($sSunLine) && 0 < (int) $sSunLine)
-				{
-					$iLen = (int) $sSunLine;
-
-					$this->getNextBuffer($iLen, true);
-
-					if (\strlen($this->sResponseBuffer) === $iLen)
-					{
-						$sLine = \trim(\substr_replace($sLine, $this->sResponseBuffer, $iPos));
-					}
-				}
-			}
-		}
-
-		return $sLine;
-	}
-
-	private function parseResponse() : array
-	{
-		$aResult = array();
-		do
-		{
-			$this->getNextBuffer();
-
-			$sLine = $this->sResponseBuffer;
-			if (false === $sLine)
-			{
-				break;
-			}
-			else if (\in_array(\substr($sLine, 0, 2), array('OK', 'NO')))
-			{
-				$aResult[] = $this->convertEndOfLine($sLine);
-				break;
-			}
-			else
-			{
-				$aResult[] = $this->convertEndOfLine($sLine);
-			}
-		}
-		while (true);
-
-		return $aResult;
-	}
-
-	/**
-	 * @throws \MailSo\Sieve\Exceptions\NegativeResponseException
-	 */
-	private function validateResponse(array $aResponse)
-	{
-		if (!$aResponse ||
-			'OK' !== \substr($aResponse[\count($aResponse) - 1], 0, 2))
-		{
-			$this->writeLogException(
-				new \MailSo\Sieve\Exceptions\NegativeResponseException($aResponse),
-				\MailSo\Log\Enumerations\Type::WARNING, true);
-		}
-	}
-
-	public function getLogName() : string
-	{
-		return 'SIEVE';
-	}
-
-}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
new file mode 100644
index 000000000..9918decf3
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/Settings.php
@@ -0,0 +1,47 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Sieve;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int $port = 4190;
+
+	public bool $enabled = false;
+
+	public bool $authLiteral = true;
+
+	public static function fromArray(array $aSettings): self
+	{
+		$object = parent::fromArray($aSettings);
+		$object->enabled = !empty($aSettings['enabled']);
+		$object->authLiteral = !isset($aSettings['authLiteral']) || !empty($aSettings['authLiteral']);
+		return $object;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/SmtpSettings',
+				'enabled' => $this->enabled,
+				'authLiteral' => $this->authLiteral
+			]
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
new file mode 100644
index 000000000..a0a1cd595
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Sieve/SieveClient.php
@@ -0,0 +1,450 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2014 Usenko Timur
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Sieve;
+
+use MailSo\Net\Enumerations\ConnectionSecurityType;
+
+/**
+ * @category MailSo
+ * @package Sieve
+ */
+class SieveClient extends \MailSo\Net\NetClient
+{
+	private bool $bIsLoggined = false;
+
+	private array $aCapa = array();
+
+	private array $aAuth = array();
+
+	private array $aModules = array();
+
+	public function hasCapability(string $sCapa) : bool
+	{
+		return isset($this->aCapa[\strtoupper($sCapa)]);
+	}
+
+	public function Modules() : array
+	{
+		return $this->aModules;
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function Connect(\MailSo\Net\ConnectSettings $oSettings) : void
+	{
+		parent::Connect($oSettings);
+
+		$aResponse = $this->parseResponse();
+		$this->parseStartupResponse($aResponse);
+
+		if (ConnectionSecurityType::STARTTLS === $this->Settings->type
+		 || (ConnectionSecurityType::AUTO_DETECT === $this->Settings->type && $this->hasCapability('STARTTLS'))) {
+			$this->StartTLS();
+		}
+	}
+
+	private function StartTLS() : void
+	{
+		if ($this->hasCapability('STARTTLS')) {
+			$this->sendRequestWithCheck('STARTTLS');
+			$this->EnableCrypto();
+			$aResponse = $this->parseResponse();
+			$this->parseStartupResponse($aResponse);
+		} else {
+			$this->writeLogException(
+				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
+				\LOG_ERR);
+		}
+	}
+
+	public function supportsAuthType(string $sasl_type) : bool
+	{
+		return \in_array(\strtoupper($sasl_type), $this->aAuth);
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function Login(Settings $oSettings) : self
+	{
+		if ($this->bIsLoggined) {
+			return $this;
+		}
+
+		$sLogin = $oSettings->username;
+		$sPassword = $oSettings->passphrase;
+		$sLoginAuthKey = '';
+		if (!\strlen($sLogin) || !\strlen($sPassword)) {
+			$this->writeLogException(new \InvalidArgumentException, \LOG_ERR);
+		}
+
+		$type = '';
+		if ($this->hasCapability('SASL')) {
+			foreach ($oSettings->SASLMechanisms as $sasl_type) {
+				if (\in_array(\strtoupper($sasl_type), $this->aAuth) && \SnappyMail\SASL::isSupported($sasl_type)) {
+					$type = $sasl_type;
+					break;
+				}
+			}
+		}
+		if (!$type) {
+			if (!$this->Encrypted() && $this->hasCapability('STARTTLS')) {
+				$this->StartTLS();
+				return $this->Login($oSettings);
+			}
+//			$this->writeLogException(new \UnexpectedValueException('No supported SASL mechanism found'), \LOG_ERR);
+			$this->writeLogException(new \MailSo\Sieve\Exceptions\LoginException, \LOG_ERR);
+		}
+
+		$SASL = \SnappyMail\SASL::factory($type);
+
+		$bAuth = false;
+		try
+		{
+			if (\str_starts_with($type, 'SCRAM-'))
+			{
+/*
+				$sAuthzid = $this->getResponseValue($this->SendRequestGetResponse('AUTHENTICATE', array($type)), \MailSo\Imap\Enumerations\ResponseType::CONTINUATION);
+				$this->sendRaw($SASL->authenticate($sLogin, $sPassword/*, $sAuthzid* /), true);
+				$sChallenge = $SASL->challenge($this->getResponseValue($this->getResponse(), \MailSo\Imap\Enumerations\ResponseType::CONTINUATION));
+				$this->logMask($sChallenge);
+				$this->sendRaw($sChallenge);
+				$oResponse = $this->getResponse();
+				$SASL->verify($this->getResponseValue($oResponse));
+*/
+			}
+			else if ('PLAIN' === $type || 'OAUTHBEARER' === $type || 'XOAUTH2' === $type)
+			{
+				$sAuth = $SASL->authenticate($sLogin, $sPassword, $sLoginAuthKey);
+				$this->logMask($sAuth);
+
+				if ($oSettings->authLiteral) {
+					$this->sendRaw("AUTHENTICATE \"{$type}\" {".\strlen($sAuth).'+}');
+					$this->sendRaw($sAuth);
+				} else {
+					$this->sendRaw("AUTHENTICATE \"{$type}\" \"{$sAuth}\"");
+				}
+
+				$aResponse = $this->parseResponse();
+				$this->parseStartupResponse($aResponse);
+				$bAuth = true;
+			}
+			else if ('LOGIN' === $type)
+			{
+				$sLogin = $SASL->authenticate($sLogin, $sPassword);
+				$sPassword = $SASL->challenge('');
+				$this->logMask($sPassword);
+
+				$this->sendRaw('AUTHENTICATE "LOGIN"');
+				$this->sendRaw('{'.\strlen($sLogin).'+}');
+				$this->sendRaw($sLogin);
+				$this->sendRaw('{'.\strlen($sPassword).'+}');
+				$this->sendRaw($sPassword);
+
+				$aResponse = $this->parseResponse();
+				$this->parseStartupResponse($aResponse);
+				$bAuth = true;
+			}
+		}
+		catch (\MailSo\Sieve\Exceptions\NegativeResponseException $oException)
+		{
+			$this->writeLogException(
+				new \MailSo\Sieve\Exceptions\LoginBadCredentialsException($oException->GetResponses(), '', 0, $oException),
+				\LOG_ERR);
+		}
+
+		$bAuth || $this->writeLogException(new \MailSo\Sieve\Exceptions\LoginBadMethodException, \LOG_ERR);
+
+		$this->bIsLoggined = true;
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function Logout() : void
+	{
+		if ($this->bIsLoggined) {
+			try {
+				$this->sendRequestWithCheck('LOGOUT');
+			} catch (\Throwable $e) {
+				// https://github.com/the-djmaze/snappymail/issues/1455
+				$this->writeLogException($e, \LOG_WARNING, false);
+			}
+			$this->bIsLoggined = false;
+		}
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function ListScripts() : array
+	{
+		$this->sendRequest('LISTSCRIPTS');
+		$aResponse = $this->parseResponse();
+		$aResult = array();
+		foreach ($aResponse as $sLine) {
+			$aTokens = $this->parseLine($sLine);
+			if ($aTokens) {
+				$aResult[$aTokens[0]] = 'ACTIVE' === \substr($sLine, -6);
+			}
+		}
+
+		return $aResult;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function Capability(bool $force = false) : array
+	{
+		if (!$this->aCapa || $force) {
+			$this->sendRequest('CAPABILITY');
+			$aResponse = $this->parseResponse();
+			$this->parseStartupResponse($aResponse);
+		}
+		return $this->aCapa;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function Noop() : self
+	{
+		$this->sendRequestWithCheck('NOOP');
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function GetScript(string $sScriptName) : string
+	{
+		$sScriptName = \addcslashes($sScriptName, '"\\');
+		$this->sendRequest('GETSCRIPT "'.$sScriptName.'"');
+		$aResponse = $this->parseResponse();
+
+		$sScript = '';
+		if (\count($aResponse)) {
+			if ('{' === $aResponse[0][0]) {
+				\array_shift($aResponse);
+			}
+
+			if (\in_array(\substr($aResponse[\count($aResponse) - 1], 0, 2), array('OK', 'NO'))) {
+				\array_pop($aResponse);
+			}
+
+			$sScript = \implode("\r\n", $aResponse);
+		}
+
+		return $sScript;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function PutScript(string $sScriptName, string $sScriptSource) : self
+	{
+		$sScriptName = \addcslashes($sScriptName, '"\\');
+		$sScriptSource = \preg_replace('/\r?\n/', "\r\n", $sScriptSource);
+		$this->sendRequest('PUTSCRIPT "'.$sScriptName.'" {'.\strlen($sScriptSource).'+}');
+		$this->sendRequestWithCheck($sScriptSource);
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function CheckScript(string $sScriptSource) : self
+	{
+		$sScriptSource = \preg_replace('/\r?\n/', "\r\n", $sScriptSource);
+		$this->sendRequest('CHECKSCRIPT {'.\strlen($sScriptSource).'+}');
+		$this->sendRequestWithCheck($sScriptSource);
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function SetActiveScript(string $sScriptName) : self
+	{
+		$sScriptName = \addcslashes($sScriptName, '"\\');
+		$this->sendRequestWithCheck('SETACTIVE "'.$sScriptName.'"');
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function DeleteScript(string $sScriptName) : self
+	{
+		$sScriptName = \addcslashes($sScriptName, '"\\');
+		$this->sendRequestWithCheck('DELETESCRIPT "'.$sScriptName.'"');
+
+		return $this;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	public function RenameScript(string $sOldName, string $sNewName) : self
+	{
+		$sOldName = \addcslashes($sOldName, '"\\');
+		$sNewName = \addcslashes($sNewName, '"\\');
+		$this->sendRequestWithCheck('RENAMESCRIPT "'.$sOldName.'" "'.$sNewName.'"');
+
+		return $this;
+	}
+
+	private function parseLine(string $sLine) : ?array
+	{
+		if (!\in_array(\substr($sLine, 0, 2), array('OK', 'NO'))) {
+			$aResult = array();
+			if (\preg_match_all('/(?:(?:"((?:\\\\"|[^"])*)"))/', $sLine, $aResult)) {
+				return \array_map('stripcslashes', $aResult[1]);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 */
+	private function parseStartupResponse(array $aResponse) : void
+	{
+		$this->aCapa = [];
+		foreach ($aResponse as $sLine) {
+			$aTokens = $this->parseLine($sLine);
+			if (empty($aTokens[0]) || \in_array(\substr($sLine, 0, 2), array('OK', 'NO'))) {
+				continue;
+			}
+
+			$sToken = \strtoupper($aTokens[0]);
+			$this->aCapa[$sToken] = isset($aTokens[1]) ? $aTokens[1] : '';
+
+			if (isset($aTokens[1])) {
+				switch ($sToken) {
+					case 'SASL':
+						$this->aAuth = \explode(' ', \strtoupper($aTokens[1]));
+						break;
+					case 'SIEVE':
+						$this->aModules = \explode(' ', \strtolower($aTokens[1]));
+						break;
+				}
+			}
+		}
+	}
+
+	/**
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 */
+	private function sendRequest(string $sRequest) : void
+	{
+		if (!\strlen(\trim($sRequest))) {
+			$this->writeLogException(new \InvalidArgumentException, \LOG_ERR);
+		}
+
+		$this->IsConnected(true);
+
+		$this->sendRaw($sRequest);
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Sieve\Exceptions\*
+	 */
+	private function sendRequestWithCheck(string $sRequest) : void
+	{
+		$this->sendRequest($sRequest);
+		$this->parseResponse();
+	}
+
+	private function parseResponse() : array
+	{
+		$aResult = array();
+		while (true) {
+			$sResponseBuffer = $this->getNextBuffer();
+			if (null === $sResponseBuffer) {
+				break;
+			}
+			// \MailSo\Imap\Enumerations\ResponseStatus
+			$bEnd = \in_array(\substr($sResponseBuffer, 0, 2), array('OK', 'NO'));
+			// convertEndOfLine
+			$sLine = \trim($sResponseBuffer);
+			if ('}' === \substr($sLine, -1)) {
+				$iPos = \strrpos($sLine, '{');
+				if (false !== $iPos) {
+					$iLen = \intval(\substr($sLine, $iPos + 1, -1));
+					if (0 < $iLen) {
+						$sResponseBuffer = $this->getNextBuffer($iLen);
+						if (\strlen($sResponseBuffer) === $iLen) {
+							$sLine = \trim(\substr_replace($sLine, $sResponseBuffer, $iPos));
+						}
+					}
+				}
+			}
+			$aResult[] = $sLine;
+			if ($bEnd) {
+				break;
+			}
+		}
+
+		if (!$aResult || 'OK' !== \substr($aResult[\array_key_last($aResult)], 0, 2)) {
+			$this->writeLogException(new \MailSo\Sieve\Exceptions\NegativeResponseException($aResult), \LOG_WARNING);
+		}
+
+		return $aResult;
+	}
+
+	public function getLogName() : string
+	{
+		return 'SIEVE';
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/Exception.php
deleted file mode 100644
index 7c18f1892..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/Exception.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Smtp\Exceptions;
-
-/**
- * @category MailSo
- * @package Smtp
- * @subpackage Exceptions
- */
-class Exception extends \MailSo\Base\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
index 46c37a013..087afaba4 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadCredentialsException.php
@@ -16,4 +16,4 @@ namespace MailSo\Smtp\Exceptions;
  * @package Smtp
  * @subpackage Exceptions
  */
-class LoginBadCredentialsException extends \MailSo\Smtp\Exceptions\LoginException {}
+class LoginBadCredentialsException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
index bec91858a..6a84b7a2b 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginBadMethodException.php
@@ -16,4 +16,4 @@ namespace MailSo\Smtp\Exceptions;
  * @package Smtp
  * @subpackage Exceptions
  */
-class LoginBadMethodException extends \MailSo\Smtp\Exceptions\LoginException {}
+class LoginBadMethodException extends LoginException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
index 918cf22f1..c9c462e07 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/LoginException.php
@@ -16,4 +16,4 @@ namespace MailSo\Smtp\Exceptions;
  * @package Smtp
  * @subpackage Exceptions
  */
-class LoginException extends \MailSo\Smtp\Exceptions\NegativeResponseException {}
+class LoginException extends NegativeResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
index 101d624d9..62f67950c 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/NegativeResponseException.php
@@ -16,4 +16,4 @@ namespace MailSo\Smtp\Exceptions;
  * @package Smtp
  * @subpackage Exceptions
  */
-class NegativeResponseException extends \MailSo\Smtp\Exceptions\ResponseException {}
+class NegativeResponseException extends ResponseException {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
index 5eb4268d8..8de5405f1 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/ResponseException.php
@@ -16,12 +16,9 @@ namespace MailSo\Smtp\Exceptions;
  * @package Smtp
  * @subpackage Exceptions
  */
-class ResponseException extends \MailSo\Smtp\Exceptions\Exception
+class ResponseException extends \MailSo\RuntimeException
 {
-	/**
-	 * @var array
-	 */
-	private $aResponses;
+	private array $aResponses;
 
 	public function __construct(array $aResponses = array(), string $sMessage = '', int $iCode = 0, ?\Throwable $oPrevious = null)
 	{
@@ -37,7 +34,7 @@ class ResponseException extends \MailSo\Smtp\Exceptions\Exception
 
 	public function GetLastResponse() : ?\MailSo\Smtp\Response
 	{
-		$iCnt = count($this->aResponses);
+		$iCnt = \count($this->aResponses);
 		return $iCnt ? $this->aResponses[$iCnt - 1] : null;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php
deleted file mode 100644
index 294b93b0f..000000000
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Exceptions/RuntimeException.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-/*
- * This file is part of MailSo.
- *
- * (c) 2014 Usenko Timur
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace MailSo\Smtp\Exceptions;
-
-/**
- * @category MailSo
- * @package Smtp
- * @subpackage Exceptions
- */
-class RuntimeException extends \MailSo\Smtp\Exceptions\Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
new file mode 100644
index 000000000..fa7fc869b
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/Settings.php
@@ -0,0 +1,67 @@
+<?php
+
+/*
+ * This file is part of MailSo.
+ *
+ * (c) 2022 DJMaze
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace MailSo\Smtp;
+
+/**
+ * @category MailSo
+ * @package Net
+ */
+class Settings extends \MailSo\Net\ConnectSettings
+{
+	public int
+		$port = 25,
+		$timeout = 60;
+
+	public bool
+		$setSender = false,
+		$usePhpMail = false,
+		// https://github.com/the-djmaze/snappymail/issues/1038
+		$authPlainLine = false,
+		$viewErrors = false;
+
+	public string $Ehlo;
+
+	public function __construct()
+	{
+		parent::__construct();
+		$oConfig = \RainLoop\Api::Config();
+		$this->viewErrors = !!$oConfig->Get('labs', 'smtp_show_server_errors', false);
+	}
+
+	public static function fromArray(array $aSettings): self
+	{
+		$object = parent::fromArray($aSettings);
+		$object->useAuth = !empty($aSettings['useAuth']);
+		$object->setSender = !empty($aSettings['setSender']);
+		$object->usePhpMail = !empty($aSettings['usePhpMail']);
+		$object->authPlainLine = !empty($aSettings['authPlainLine']);
+//		$object->viewErrors = !empty($aSettings['viewErrors']);
+		return $object;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return \array_merge(
+			parent::jsonSerialize(),
+			[
+//				'@Object' => 'Object/SmtpSettings',
+				'useAuth' => $this->useAuth,
+				'setSender' => $this->setSender,
+				'usePhpMail' => $this->usePhpMail,
+				'authPlainLine' => $this->authPlainLine
+//				'viewErrors' => $this->viewErrors
+			]
+		);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
index 2a17f6401..4ca6cf8e2 100644
--- a/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
+++ b/snappymail/v/0.0.0/app/libraries/MailSo/Smtp/SmtpClient.php
@@ -7,88 +7,82 @@
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
+ *
+ * https://datatracker.ietf.org/doc/html/rfc2034
+ * https://datatracker.ietf.org/doc/html/rfc2821
  */
 
 namespace MailSo\Smtp;
 
+use MailSo\Net\Enumerations\ConnectionSecurityType;
+use SnappyMail\IDN;
+
+/**
+	response codes:
+		220 ready
+		221 Closing
+		235 Authentication succeeded
+		250 Requested mail action okay, completed
+		251 User not local; will forward
+		252 Cannot verify the user, but it will try to deliver the message anyway
+		334 Server challenge (the text part contains the Base64-encoded challenge)
+		354 Start mail input
+*/
+
 /**
  * @category MailSo
  * @package Smtp
  */
 class SmtpClient extends \MailSo\Net\NetClient
 {
-	/**
-	 * @var bool
-	 */
-	private $bHelo = false;
+	private bool $bIsLoggined = false;
+
+	private string $sEhlo = '';
+
+	private bool $bRcpt = false;
+
+	private bool $bMail = false;
+
+	private array $aAuthTypes = array();
+
+	private array $aCapa = array();
 
 	/**
-	 * @var bool
+	 * RFC 1870
 	 */
-	private $bRcpt = false;
+	private int $iSizeCapaValue = 0;
 
-	/**
-	 * @var bool
-	 */
-	private $bMail = false;
+	private array $aResults = array();
 
-	/**
-	 * @var bool
-	 */
-	private $bData = false;
+	public function Capability() : array
+	{
+		return $this->aCapa;
+	}
 
-	/**
-	 * @var array
-	 */
-	private $aAuthTypes = array();
-
-	/**
-	 * @var array
-	 */
-	private $aCapa = array();
-
-	/**
-	 * @var int
-	 */
-	private $iSizeCapaValue = 0;
-
-	/**
-	 * @var array
-	 */
-	private $aResults = array();
-
-	public function IsSupported(string $sCapa) : bool
+	public function hasCapability(string $sCapa) : bool
 	{
 		return \in_array(\strtoupper($sCapa), $this->aCapa);
 	}
 
-	public function IsAuthSupported(string $sAuth) : bool
+	public function maxSize() : int
 	{
-		return \in_array(\strtoupper($sAuth), $this->aAuthTypes);
-	}
-
-	public function HasSupportedAuth() : bool
-	{
-		return $this->IsAuthSupported('PLAIN') || $this->IsAuthSupported('LOGIN');
+		return $this->iSizeCapaValue;
 	}
 
 	public static function EhloHelper() : string
 	{
 		$sEhloHost = empty($_SERVER['SERVER_NAME']) ? '' : \trim($_SERVER['SERVER_NAME']);
-		if (empty($sEhloHost))
-		{
+		if (empty($sEhloHost)) {
 			$sEhloHost = empty($_SERVER['HTTP_HOST']) ? '' : \trim($_SERVER['HTTP_HOST']);
 		}
 
-		if (empty($sEhloHost))
-		{
+		if (empty($sEhloHost)) {
 			$sEhloHost = \function_exists('gethostname') ? \gethostname() : 'localhost';
 		}
 
 		$sEhloHost = \trim(\preg_replace('/:\d+$/', '', \trim($sEhloHost)));
 
-		if (\preg_match('/^\d+\.\d+\.\d+\.\d+$/', $sEhloHost))
-		{
+		if (\preg_match('/^\d+\.\d+\.\d+\.\d+$/', $sEhloHost)) {
 			$sEhloHost = '['.$sEhloHost.']';
 		}
 
@@ -96,164 +90,225 @@ class SmtpClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\ResponseException
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	public function Connect(string $sServerName, int $iPort = 25,
-		int $iSecurityType = \MailSo\Net\Enumerations\ConnectionSecurityType::AUTO_DETECT,
-		bool $bVerifySsl = false, bool $bAllowSelfSigned = true,
-		string $sClientCert = '', string $sEhloHost = '[127.0.0.1]') : void
+	public function Connect(\MailSo\Net\ConnectSettings $oSettings) : void
 	{
-		parent::Connect($sServerName, $iPort, $iSecurityType, $bVerifySsl, $bAllowSelfSigned);
+		parent::Connect($oSettings);
 
 		$this->validateResponse(220);
 
-		$this->preLoginStartTLSAndEhloProcess($sEhloHost);
+		$this->ehloOrHelo($oSettings->Ehlo);
+		$this->sEhlo = $oSettings->Ehlo;
+
+		if (ConnectionSecurityType::STARTTLS === $this->Settings->type
+		 || (ConnectionSecurityType::AUTO_DETECT === $this->Settings->type && $this->hasCapability('STARTTLS'))) {
+			$this->StartTLS();
+		}
+	}
+
+	private function StartTLS() : void
+	{
+		if ($this->hasCapability('STARTTLS')) {
+			$this->sendRequestWithCheck('STARTTLS', 220);
+			$this->EnableCrypto();
+			$this->ehloOrHelo($this->sEhlo);
+		} else {
+			$this->writeLogException(
+				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
+				\LOG_ERR);
+		}
+	}
+
+	public function supportsAuthType(string $sasl_type) : bool
+	{
+		return \in_array(\strtoupper($sasl_type), $this->aAuthTypes);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	public function Login(array $aCredentials) : self
+	public function Login(Settings $oSettings) : self
 	{
-		$sLogin = \MailSo\Base\Utils::IdnToAscii(\MailSo\Base\Utils::Trim($aCredentials['Login']));
-		$sPassword = $aCredentials['Password'];
+		if ($this->bIsLoggined) {
+			return $this;
+		}
+
+		$sLogin = $oSettings->username;
+		$sPassword = $oSettings->passphrase;
 
 		$type = '';
-		$aCredentials['SASLMechanisms'][] = 'LOGIN';
-		foreach ($aCredentials['SASLMechanisms'] as $sasl_type) {
-			if ($this->IsAuthSupported($sasl_type) && \SnappyMail\SASL::isSupported($sasl_type)) {
+		foreach ($oSettings->SASLMechanisms as $sasl_type) {
+			if (\in_array(\strtoupper($sasl_type), $this->aAuthTypes) && \SnappyMail\SASL::isSupported($sasl_type)) {
 				$type = $sasl_type;
 				break;
 			}
 		}
-
 		if (!$type) {
-			\trigger_error("SMTP {$this->GetConnectedHost()} no supported AUTH options. Disable login" . ($this->IsSupported('STARTTLS') ? ' or try with STARTTLS' : ''));
-			$this->writeLogException(
-				new \MailSo\Smtp\Exceptions\LoginBadMethodException,
-				\MailSo\Log\Enumerations\Type::NOTICE, true);
+			if (!$this->Encrypted() && $this->hasCapability('STARTTLS')) {
+				$this->StartTLS();
+				return $this->Login($oSettings);
+			}
+			\trigger_error("SMTP {$this->GetConnectedHost()} no supported AUTH options. Disable login");
+			$this->writeLogException(new \MailSo\Smtp\Exceptions\LoginBadMethodException);
 		}
 
 		$SASL = \SnappyMail\SASL::factory($type);
-		$SASL->base64 = true;
 
-		// Start authentication
-		try
-		{
-			$sResult = $this->sendRequestWithCheck('AUTH', 334, $type);
-		}
-		catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
-		{
-			$this->writeLogException(
-				new \MailSo\Smtp\Exceptions\LoginBadMethodException(
-					$oException->GetResponses(), $oException->getMessage(), 0, $oException),
-				\MailSo\Log\Enumerations\Type::NOTICE, true);
-		}
+		if ($this->Settings->authPlainLine && $SASL instanceof \SnappyMail\SASL\Plain) {
+			// https://github.com/the-djmaze/snappymail/issues/1038
+			try
+			{
+				$sRequest = $SASL->authenticate($sLogin, $sPassword);
+				$this->logMask($sRequest);
+				$sResult = $this->sendRequestWithCheck('AUTH PLAIN ' . $sRequest, 235);
+			}
+			catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
+			{
+				$this->writeLogException(
+					new \MailSo\Smtp\Exceptions\LoginBadCredentialsException($oException->GetResponses(), $oException->getMessage(), 0, $oException)
+				);
+			}
+		} else {
+			// Start authentication
+			try
+			{
+				$sResult = $this->sendRequestWithCheck("AUTH {$type}", 334);
+			}
+			catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
+			{
+				$this->writeLogException(
+					new \MailSo\Smtp\Exceptions\LoginBadMethodException($oException->GetResponses(), $oException->getMessage(), 0, $oException)
+				);
+			}
 
-		try
-		{
-			if (0 === \strpos($type, 'SCRAM-')) {
-				// RFC 5802
-				$sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 234, '');
-				$sResult = $this->sendRequestWithCheck($SASL->challenge($sResult), 235, '', true);
-				$SASL->verify($sResult);
-			} else switch ($type) {
-			// RFC 4616
-			case 'PLAIN':
-			case 'XOAUTH2':
-			case 'OAUTHBEARER':
-				$this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword), 235, '', true);
-				break;
+			try
+			{
+				$sRequest = '';
+				if (\str_starts_with($type, 'SCRAM-')) {
+					// RFC 5802 send "client-first-message" and receive "server-first-message"
+					$sRequest = $SASL->authenticate($sLogin, $sPassword, $sResult);
+					$this->logMask($sRequest);
+					$sResult = $this->sendRequestWithCheck($sRequest, 334);
+					// RFC 5802 send "client-final-message" and receive "server-final-message"
+					$sRequest = $SASL->challenge($sResult);
+					$this->logMask($sRequest);
+					$sResult = $this->sendRequestWithCheck($sRequest, 334);
+					$SASL->verify($sResult);
+					// Now end the authentication
+					$sRequest = '';
+					$this->sendRaw($sRequest, true, '');
+					$this->validateResponse(235, '');
+				} else switch ($type) {
+				// RFC 4616
+				case 'PLAIN':
+				case 'XOAUTH2':
+				case 'OAUTHBEARER':
+					$sRequest = $SASL->authenticate($sLogin, $sPassword);
+					break;
 
-			case 'LOGIN':
-				$sResult = $this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 334, '');
-				$this->sendRequestWithCheck($SASL->challenge($sResult), 235, '', true);
-				break;
+				case 'LOGIN':
+					$sRequest = $SASL->authenticate($sLogin, $sPassword, $sResult);
+					$this->logMask($sRequest);
+					$sResult = $this->sendRequestWithCheck($sRequest, 334);
+					$sRequest = $SASL->challenge($sResult);
+					break;
 
-			// RFC 2195
-			case 'CRAM-MD5':
-				if (empty($sResult)) {
-					$this->writeLogException(
-						new \MailSo\Smtp\Exceptions\NegativeResponseException,
-						\MailSo\Log\Enumerations\Type::NOTICE, true
-					);
+				// RFC 2195
+				case 'CRAM-MD5':
+					$sRequest = $SASL->authenticate($sLogin, $sPassword, $sResult);
+					break;
 				}
-				$this->sendRequestWithCheck($SASL->authenticate($sLogin, $sPassword, $sResult), 235, '', true);
-				break;
+				if ($sRequest) {
+					$this->logMask($sRequest);
+					$SASL->verify($this->sendRequestWithCheck($sRequest, 235));
+				}
+			}
+			catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
+			{
+				$this->writeLogException(
+					new \MailSo\Smtp\Exceptions\LoginBadCredentialsException($oException->GetResponses(), $oException->getMessage(), 0, $oException)
+				);
 			}
 		}
-		catch (\MailSo\Smtp\Exceptions\NegativeResponseException $oException)
-		{
-			$this->writeLogException(
-				new \MailSo\Smtp\Exceptions\LoginBadCredentialsException(
-					$oException->GetResponses(), $oException->getMessage(), 0, $oException),
-				\MailSo\Log\Enumerations\Type::NOTICE, true);
-		}
+
+		$this->bIsLoggined = true;
 
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	public function MailFrom(string $sFrom, string $sSizeIfSupported = '', bool $bDsn = false) : self
+	public function MailFrom(string $sFrom, int $iSizeIfSupported = 0, bool $bDsn = false, bool $bRequireTLS = false) : self
 	{
-		$sFrom = \MailSo\Base\Utils::IdnToAscii(
-			\MailSo\Base\Utils::Trim($sFrom), true);
-
-		$sCmd = 'FROM:<'.$sFrom.'>';
-
-		if (\strlen($sSizeIfSupported) && \is_numeric($sSizeIfSupported) && $this->IsSupported('SIZE'))
-		{
-			$sCmd .= ' SIZE='.$sSizeIfSupported;
+//		$sFrom = IDN::emailToAscii($sFrom);
+		$sCmd = "FROM:<{$sFrom}>";
+		// RFC 6531
+		if ($this->hasCapability('SMTPUTF8')) {
+//			$sFrom = IDN::emailToUtf8($sFrom);
+//			$sCmd = "FROM:<{$sFrom}> SMTPUTF8";
 		}
 
-		if ($bDsn && $this->IsSupported('DSN'))
-		{
+		if (0 < $iSizeIfSupported && $this->hasCapability('SIZE')) {
+			$sCmd .= ' SIZE='.$iSizeIfSupported;
+		}
+
+		// RFC 3461
+		if ($bDsn && $this->hasCapability('DSN')) {
 			$sCmd .= ' RET=HDRS';
 		}
 
-		$this->sendRequestWithCheck('MAIL', 250, $sCmd);
+		// RFC 6152
+		if ($this->hasCapability('8BITMIME')) {
+//			$sCmd .= ' BODY=8BITMIME';
+		}
+		// RFC 3030
+		else if ($this->hasCapability('BINARYMIME')) {
+//			$sCmd .= ' BODY=BINARYMIME';
+		}
+
+		// RFC 8689
+		if ($bRequireTLS && $this->hasCapability('REQUIRETLS')) {
+			$sCmd .= ' REQUIRETLS';
+		}
+
+		$this->sendRequestWithCheck("MAIL {$sCmd}", 250);
 
 		$this->bMail = true;
 		$this->bRcpt = false;
-		$this->bData = false;
 
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Rcpt(string $sTo, bool $bDsn = false) : self
 	{
-		if (!$this->bMail)
-		{
-			$this->writeLogException(
-				new Exceptions\RuntimeException('No sender reverse path has been supplied'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if (!$this->bMail) {
+			$this->writeLogException(new \MailSo\RuntimeException('No sender reverse path has been supplied'), \LOG_ERR);
 		}
 
-		$sTo = \MailSo\Base\Utils::IdnToAscii(
-			\MailSo\Base\Utils::Trim($sTo), true);
+//		$sTo = IDN::emailToAscii($sTo);
 
 		$sCmd = 'TO:<'.$sTo.'>';
 
-		if ($bDsn && $this->IsSupported('DSN'))
-		{
+		if ($bDsn && $this->hasCapability('DSN')) {
 			$sCmd .= ' NOTIFY=SUCCESS,FAILURE';
 		}
 
-		$this->sendRequestWithCheck(
-			'RCPT', array(250, 251), $sCmd, false,
-			'Failed to add recipient "'.$sTo.'"'
-		);
+		$this->sendRequestWithCheck("RCPT {$sCmd}", [250, 251], "Failed to add recipient '{$sTo}'");
 
 		$this->bRcpt = true;
 
@@ -261,8 +316,9 @@ class SmtpClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function MailTo(string $sTo) : self
 	{
@@ -270,14 +326,14 @@ class SmtpClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Data(string $sData) : self
 	{
-		if (!\strlen(\trim($sData)))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\strlen(\trim($sData))) {
+			throw new \InvalidArgumentException;
 		}
 
 		$rDataStream = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($sData);
@@ -291,180 +347,163 @@ class SmtpClient extends \MailSo\Net\NetClient
 	/**
 	 * @param resource $rDataStream
 	 *
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function DataWithStream($rDataStream) : self
 	{
-		if (!\is_resource($rDataStream))
-		{
-			throw new \MailSo\Base\Exceptions\InvalidArgumentException;
+		if (!\is_resource($rDataStream)) {
+			throw new \InvalidArgumentException;
 		}
 
-		if (!$this->bRcpt)
-		{
-			$this->writeLogException(
-				new Exceptions\RuntimeException('No recipient forward path has been supplied'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if (!$this->bRcpt) {
+			$this->writeLogException(new \MailSo\RuntimeException('No recipient forward path has been supplied'), \LOG_ERR);
 		}
 
+/*
+		// RFC 3030
+		if ($this->hasCapability('CHUNKING')) {
+			$this->bRunningCallback = true;
+			while (!\feof($rDataStream)) {
+				$sBuffer = \fgets($rDataStream);
+				if (false === $sBuffer) {
+					if (!\feof($rDataStream)) {
+						$this->writeLogException(new \MailSo\RuntimeException('Cannot read input resource'), \LOG_ERR);
+					}
+					break;
+				}
+				$this->sendRequestWithCheck("BDAT " . \strlen($sBuffer) . "\r\n{$sBuffer}", 250);
+				\MailSo\Base\Utils::ResetTimeLimit();
+			}
+			$this->sendRequestWithCheck("BDAT 0 LAST\r\n", 250);
+		}
+		else {
+*/
 		$this->sendRequestWithCheck('DATA', 354);
 
-		$this->writeLog('Message data.', \MailSo\Log\Enumerations\Type::NOTE);
+		$this->writeLog('Message data.');
 
 		$this->bRunningCallback = true;
 
-		while (!\feof($rDataStream))
-		{
+		while (!\feof($rDataStream)) {
 			$sBuffer = \fgets($rDataStream);
-			if (false !== $sBuffer)
-			{
-				if (0 === \strpos($sBuffer, '.'))
-				{
-					$sBuffer = '.'.$sBuffer;
+			if (false === $sBuffer) {
+				if (!\feof($rDataStream)) {
+					$this->writeLogException(new \MailSo\RuntimeException('Cannot read input resource'), \LOG_ERR);
 				}
-
-				$this->sendRaw(\rtrim($sBuffer, "\r\n"), false);
-
-				\MailSo\Base\Utils::ResetTimeLimit();
-				continue;
+				break;
 			}
-			else if (!\feof($rDataStream))
-			{
-				$this->writeLogException(
-					new Exceptions\RuntimeException('Cannot read input resource'),
-					\MailSo\Log\Enumerations\Type::ERROR, true);
+			if (\str_starts_with($sBuffer, '.')) {
+				$sBuffer = '.' . $sBuffer;
 			}
-
-			break;
+			$this->sendRaw(\rtrim($sBuffer, "\r\n"), false);
+			\MailSo\Base\Utils::ResetTimeLimit();
 		}
 
 		$this->sendRequestWithCheck('.', 250);
 
 		$this->bRunningCallback = false;
 
-		$this->bData = true;
-
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Rset() : self
 	{
-		$this->sendRequestWithCheck('RSET', array(250, 220));
+		$this->sendRequestWithCheck('RSET', [250, 220]);
 
 		$this->bMail = false;
 		$this->bRcpt = false;
-		$this->bData = false;
 
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * VERIFY
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Vrfy(string $sUser) : self
 	{
-		$sUser = \MailSo\Base\Utils::IdnToAscii(
-			\MailSo\Base\Utils::Trim($sUser));
-
-		$this->sendRequestWithCheck('VRFY', array(250, 251, 252), $sUser);
-
+		$sUser = \MailSo\Base\Utils::Trim($sUser);
+/*
+		// RFC 6531
+		if ($this->hasCapability('SMTPUTF8')) {
+			$this->sendRequestWithCheck('VRFY ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8', [250, 251, 252]);
+		} else {
+*/
+		$this->sendRequestWithCheck('VRFY ' . IDN::emailToAscii($sUser), [250, 251, 252]);
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * EXPAND command, the string identifies a mailing list, and the
+	 * successful (i.e., 250) multiline response MAY include the full name
+	 * of the users and MUST give the mailboxes on the mailing list.
+	 *
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
+	 */
+/*
+	public function Expn(string $sUser) : self
+	{
+		$sUser = \MailSo\Base\Utils::Trim($sUser);
+		// RFC 6531
+		if ($this->hasCapability('SMTPUTF8')) {
+			$this->sendRequestWithCheck('EXPN ' . IDN::emailToUtf8($sUser) . ' SMTPUTF8', [250, 251, 252]);
+		} else {
+			$this->sendRequestWithCheck('EXPN ' . IDN::emailToAscii($sUser), [250, 251, 252]);
+		}
+		return $this;
+	}
+*/
+
+	/**
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Noop() : self
 	{
 		$this->sendRequestWithCheck('NOOP', 250);
-
 		return $this;
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	public function Logout() : void
 	{
-		if ($this->IsConnected())
-		{
+		if ($this->IsConnected()) {
 			$this->sendRequestWithCheck('QUIT', 221);
 		}
-
-		$this->bHelo = false;
 		$this->bMail = false;
 		$this->bRcpt = false;
-		$this->bData = false;
-	}
-
-	private function preLoginStartTLSAndEhloProcess(string $sEhloHost) : void
-	{
-		if ($this->bHelo)
-		{
-			$this->writeLogException(
-				new Exceptions\RuntimeException('Cannot issue EHLO/HELO to existing session'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-
-		$this->ehloOrHelo($sEhloHost);
-
-		if ($this->IsSupported('STARTTLS') && \MailSo\Net\Enumerations\ConnectionSecurityType::UseStartTLS($this->iSecurityType, $this->HasSupportedAuth()))
-		{
-			$this->sendRequestWithCheck('STARTTLS', 220);
-			$this->EnableCrypto();
-
-			$this->ehloOrHelo($sEhloHost);
-		}
-		else if (\MailSo\Net\Enumerations\ConnectionSecurityType::STARTTLS === $this->iSecurityType)
-		{
-			$this->writeLogException(
-				new \MailSo\Net\Exceptions\SocketUnsuppoterdSecureConnectionException('STARTTLS is not supported'),
-				\MailSo\Log\Enumerations\Type::ERROR, true);
-		}
-
-		$this->bHelo = true;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
+	 * @throws \InvalidArgumentException
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
-	private function sendRequest(string $sCommand, string $sAddToCommand = '', bool $bSecureLog = false) : void
+	private function sendRequestWithCheck(string $sCommand, $mExpectCode, string $sErrorPrefix = '') : string
 	{
-		if (!\strlen(\trim($sCommand)))
-		{
-			$this->writeLogException(
-				new \MailSo\Base\Exceptions\InvalidArgumentException,
-				\MailSo\Log\Enumerations\Type::ERROR, true);
+		if (!\strlen(\trim($sCommand))) {
+			$this->writeLogException(new \InvalidArgumentException, \LOG_ERR);
 		}
-
 		$this->IsConnected(true);
-
-		$sCommand = \trim($sCommand);
-		$sRealCommand = $sCommand.(0 === \strlen($sAddToCommand) ? '' : ' '.$sAddToCommand);
-
-		$sFakeCommand = ($bSecureLog) ? '********' : '';
-
-		$this->sendRaw($sRealCommand, true, $sFakeCommand);
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\InvalidArgumentException
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
-	 */
-	private function sendRequestWithCheck(string $sCommand, $mExpectCode, string $sAddToCommand = '', bool $bSecureLog = false, string $sErrorPrefix = '') : string
-	{
-		$this->sendRequest($sCommand, $sAddToCommand, $bSecureLog);
+		$this->sendRaw($sCommand, true, '');
 		$this->validateResponse($mExpectCode, $sErrorPrefix);
 		return empty($this->aResults[0]) ? '' : \trim(\substr($this->aResults[0], 4));
 	}
@@ -489,39 +528,36 @@ class SmtpClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	private function ehlo(string $sHost) : void
 	{
-		$this->sendRequestWithCheck('EHLO', 250, $sHost);
-
-		foreach ($this->aResults as $sLine)
-		{
+		$this->sendRequestWithCheck("EHLO {$sHost}", 250);
+		/*
+		250-PIPELINING\r\n
+		250-SIZE 256000000\r\n
+		250-ETRN\r\n
+		250-ENHANCEDSTATUSCODES\r\n
+		*/
+		$this->aCapa = [];
+		foreach ($this->aResults as $sLine) {
 			$aMatch = array();
-			if (\preg_match('/[\d]+[ \-](.+)$/', $sLine, $aMatch) && isset($aMatch[1]) && \strlen($aMatch[1]))
-			{
-				$sLine = \trim($aMatch[1]);
-				$aLine = \preg_split('/[ =]/', $sLine, 2);
-				if (!empty($aLine[0]))
-				{
+			if (\preg_match('/[\d]+[ \-](.+)$/', $sLine, $aMatch) && isset($aMatch[1]) && \strlen($aMatch[1])) {
+				$aLine = \preg_split('/[ =]/', \trim($aMatch[1]), 2);
+				if (!empty($aLine[0])) {
 					$sCapa = \strtoupper($aLine[0]);
-					if (('AUTH' === $sCapa || 'SIZE' === $sCapa) && !empty($aLine[1]))
-					{
+					if (!empty($aLine[1]) && ('AUTH' === $sCapa || 'SIZE' === $sCapa)) {
 						$sSubLine = \trim(\strtoupper($aLine[1]));
-						if (\strlen($sSubLine))
-						{
-							if ('AUTH' === $sCapa)
-							{
+						if (\strlen($sSubLine)) {
+							if ('AUTH' === $sCapa) {
 								$this->aAuthTypes = \explode(' ', $sSubLine);
-							}
-							else if ('SIZE' === $sCapa && \is_numeric($sSubLine))
-							{
+							} else if ('SIZE' === $sCapa && \is_numeric($sSubLine)) {
 								$this->iSizeCapaValue = (int) $sSubLine;
 							}
 						}
 					}
-
 					$this->aCapa[] = $sCapa;
 				}
 			}
@@ -529,15 +565,16 @@ class SmtpClient extends \MailSo\Net\NetClient
 	}
 
 	/**
-	 * @throws \MailSo\Net\Exceptions\Exception
-	 * @throws \MailSo\Smtp\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
+	 * @throws \MailSo\Net\Exceptions\*
+	 * @throws \MailSo\Smtp\Exceptions\*
 	 */
 	private function helo(string $sHost) : void
 	{
-		$this->sendRequestWithCheck('HELO', 250, $sHost);
+		$this->sendRequestWithCheck("HELO {$sHost}", 250);
 		$this->aAuthTypes = array();
 		$this->iSizeCapaValue = 0;
-		$this->aCapa = array();
+		$this->aCapa = [];
 	}
 
 	/**
@@ -545,43 +582,34 @@ class SmtpClient extends \MailSo\Net\NetClient
 	 */
 	private function validateResponse($mExpectCode, string $sErrorPrefix = '') : void
 	{
-		if (!\is_array($mExpectCode))
-		{
-			$mExpectCode = array((int) $mExpectCode);
-		}
-		else
-		{
-			$mExpectCode = \array_map('intval', $mExpectCode);
-		}
+		$mExpectCode = \is_array($mExpectCode)
+			? \array_map('intval', $mExpectCode)
+			: array((int) $mExpectCode);
 
 		$aParts = array('', '', '');
 		$this->aResults = array();
 		do
 		{
-			$this->getNextBuffer();
-			$aParts = \preg_split('/([\s\-]+)/', $this->sResponseBuffer, 2, PREG_SPLIT_DELIM_CAPTURE);
+			$sResponse = $this->getNextBuffer();
+			$aParts = \preg_split('/([\s\-]+)/', $sResponse, 2, PREG_SPLIT_DELIM_CAPTURE);
 
-			if (3 === \count($aParts) && \is_numeric($aParts[0]))
-			{
-				if ('-' !== \substr($aParts[1], 0, 1) && !\in_array((int) $aParts[0], $mExpectCode))
-				{
+			if (3 === \count($aParts) && \is_numeric($aParts[0])) {
+				if ('-' !== \substr($aParts[1], 0, 1) && !\in_array((int) $aParts[0], $mExpectCode)) {
 					$this->writeLogException(
 						new Exceptions\NegativeResponseException($this->aResults,
 							('' === $sErrorPrefix ? '' : $sErrorPrefix.': ').\trim(
 							(\count($this->aResults) ? \implode("\r\n", $this->aResults)."\r\n" : '').
-							$this->sResponseBuffer)), \MailSo\Log\Enumerations\Type::ERROR, true);
+							$sResponse)), \LOG_ERR);
 				}
-			}
-			else
-			{
+			} else {
 				$this->writeLogException(
 					new Exceptions\ResponseException($this->aResults,
 						('' === $sErrorPrefix ? '' : $sErrorPrefix.': ').\trim(
 						(\count($this->aResults) ? \implode("\r\n", $this->aResults)."\r\n" : '').
-						$this->sResponseBuffer)), \MailSo\Log\Enumerations\Type::ERROR, true);
+						$sResponse)), \LOG_ERR);
 			}
 
-			$this->aResults[] = $this->sResponseBuffer;
+			$this->aResults[] = $sResponse;
 		}
 		while ('-' === \substr($aParts[1], 0, 1));
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
new file mode 100644
index 000000000..5d001130c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/Client.php
@@ -0,0 +1,526 @@
+<?php
+/**
+ * Note : Code is released under the GNU LGPL
+ *
+ * Please do not change the header of this file
+ *
+ * This library is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * Lesser General Public License as published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU Lesser General Public License for more details.
+ */
+
+/**
+ * Light PHP wrapper for the OAuth 2.0 protocol.
+ *
+ * This client is based on the OAuth2 specification draft v2.15
+ * http://tools.ietf.org/html/draft-ietf-oauth-v2-15
+ *
+ * @author      Pierrick Charron <pierrick@webstart.fr>
+ * @author      Anis Berejeb <anis.berejeb@gmail.com>
+ * @version     1.3.1
+ */
+namespace OAuth2;
+
+class Client
+{
+    /**
+     * Different AUTH method
+     */
+    const AUTH_TYPE_URI                 = 0;
+    const AUTH_TYPE_AUTHORIZATION_BASIC = 1;
+    const AUTH_TYPE_FORM                = 2;
+
+    /**
+     * Different Access token type
+     */
+    const ACCESS_TOKEN_URI      = 0;
+    const ACCESS_TOKEN_BEARER   = 1;
+    const ACCESS_TOKEN_OAUTH    = 2;
+    const ACCESS_TOKEN_MAC      = 3;
+
+    /**
+    * Different Grant types
+    */
+    const GRANT_TYPE_AUTH_CODE          = 'authorization_code';
+    const GRANT_TYPE_PASSWORD           = 'password';
+    const GRANT_TYPE_CLIENT_CREDENTIALS = 'client_credentials';
+    const GRANT_TYPE_REFRESH_TOKEN      = 'refresh_token';
+
+    /**
+     * HTTP Methods
+     */
+    const HTTP_METHOD_GET    = 'GET';
+    const HTTP_METHOD_POST   = 'POST';
+    const HTTP_METHOD_PUT    = 'PUT';
+    const HTTP_METHOD_DELETE = 'DELETE';
+    const HTTP_METHOD_HEAD   = 'HEAD';
+    const HTTP_METHOD_PATCH   = 'PATCH';
+
+    /**
+     * HTTP Form content types
+     */
+    const HTTP_FORM_CONTENT_TYPE_APPLICATION = 0;
+    const HTTP_FORM_CONTENT_TYPE_MULTIPART = 1;
+
+    /**
+     * Client ID
+     *
+     * @var string
+     */
+    protected $client_id = null;
+
+    /**
+     * Client Secret
+     *
+     * @var string
+     */
+    protected $client_secret = null;
+
+    /**
+     * Client Authentication method
+     *
+     * @var int
+     */
+    protected $client_auth = self::AUTH_TYPE_URI;
+
+    /**
+     * Access Token
+     *
+     * @var string
+     */
+    protected $access_token = null;
+
+    /**
+     * Access Token Type
+     *
+     * @var int
+     */
+    protected $access_token_type = self::ACCESS_TOKEN_URI;
+
+    /**
+     * Access Token Secret
+     *
+     * @var string
+     */
+    protected $access_token_secret = null;
+
+    /**
+     * Access Token crypt algorithm
+     *
+     * @var string
+     */
+    protected $access_token_algorithm = null;
+
+    /**
+     * Access Token Parameter name
+     *
+     * @var string
+     */
+    protected $access_token_param_name = 'access_token';
+
+    /**
+     * The path to the certificate file to use for https connections
+     *
+     * @var string  Defaults to .
+     */
+    protected $certificate_file = null;
+
+    /**
+     * cURL options
+     *
+     * @var array
+     */
+    protected $curl_options = array();
+
+    /**
+     * Construct
+     *
+     * @param string $client_id Client ID
+     * @param string $client_secret Client Secret
+     * @param int    $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @param string $certificate_file Indicates if we want to use a certificate file to trust the server. Optional, defaults to null.
+     * @return void
+     */
+    public function __construct($client_id, $client_secret, $client_auth = self::AUTH_TYPE_URI, $certificate_file = null)
+    {
+        if (!extension_loaded('curl')) {
+            throw new Exception('The PHP exention curl must be installed to use this library.', Exception::CURL_NOT_FOUND);
+        }
+
+        $this->client_id     = $client_id;
+        $this->client_secret = $client_secret;
+        $this->client_auth   = $client_auth;
+        $this->certificate_file = $certificate_file;
+        if (!empty($this->certificate_file)  && !is_file($this->certificate_file)) {
+            throw new InvalidArgumentException('The certificate file was not found', InvalidArgumentException::CERTIFICATE_NOT_FOUND);
+        }
+    }
+
+    /**
+     * Get the client Id
+     *
+     * @return string Client ID
+     */
+    public function getClientId()
+    {
+        return $this->client_id;
+    }
+
+    /**
+     * Get the client Secret
+     *
+     * @return string Client Secret
+     */
+    public function getClientSecret()
+    {
+        return $this->client_secret;
+    }
+
+    /**
+     * getAuthenticationUrl
+     *
+     * @param string $auth_endpoint Url of the authentication endpoint
+     * @param string $redirect_uri  Redirection URI
+     * @param array  $extra_parameters  Array of extra parameters like scope or state (Ex: array('scope' => null, 'state' => ''))
+     * @return string URL used for authentication
+     */
+    public function getAuthenticationUrl($auth_endpoint, $redirect_uri, array $extra_parameters = array())
+    {
+        $parameters = array_merge(array(
+            'response_type' => 'code',
+            'client_id'     => $this->client_id,
+            'redirect_uri'  => $redirect_uri
+        ), $extra_parameters);
+        return $auth_endpoint . '?' . http_build_query($parameters, '', '&');
+    }
+
+    /**
+     * getAccessToken
+     *
+     * @param string $token_endpoint    Url of the token endpoint
+     * @param string $grant_type        Grant Type ('authorization_code', 'password', 'client_credentials', 'refresh_token', or a custom code (@see GrantType Classes)
+     * @param array  $parameters        Array sent to the server (depend on which grant type you're using)
+     * @param array  $extra_headers     Array of extra headers
+     * @return array Array of parameters required by the grant_type (CF SPEC)
+     */
+    public function getAccessToken($token_endpoint, $grant_type, array $parameters, array $extra_headers = array())
+    {
+        if (!$grant_type) {
+            throw new InvalidArgumentException('The grant_type is mandatory.', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeClassName = $this->convertToCamelCase($grant_type);
+        $grantTypeClass =  __NAMESPACE__ . '\\GrantType\\' . $grantTypeClassName;
+        if (!class_exists($grantTypeClass)) {
+            throw new InvalidArgumentException('Unknown grant type \'' . $grant_type . '\'', InvalidArgumentException::INVALID_GRANT_TYPE);
+        }
+        $grantTypeObject = new $grantTypeClass();
+        $grantTypeObject->validateParameters($parameters);
+        if (!defined($grantTypeClass . '::GRANT_TYPE')) {
+            throw new Exception('Unknown constant GRANT_TYPE for class ' . $grantTypeClassName, Exception::GRANT_TYPE_ERROR);
+        }
+        $parameters['grant_type'] = $grantTypeClass::GRANT_TYPE;
+        $http_headers = $extra_headers;
+        switch ($this->client_auth) {
+            case self::AUTH_TYPE_URI:
+            case self::AUTH_TYPE_FORM:
+                $parameters['client_id'] = $this->client_id;
+                $parameters['client_secret'] = $this->client_secret;
+                break;
+            case self::AUTH_TYPE_AUTHORIZATION_BASIC:
+                $parameters['client_id'] = $this->client_id;
+                $http_headers['Authorization'] = 'Basic ' . base64_encode($this->client_id .  ':' . $this->client_secret);
+                break;
+            default:
+                throw new Exception('Unknown client auth type.', Exception::INVALID_CLIENT_AUTHENTICATION_TYPE);
+                break;
+        }
+
+        return $this->executeRequest($token_endpoint, $parameters, self::HTTP_METHOD_POST, $http_headers, self::HTTP_FORM_CONTENT_TYPE_APPLICATION);
+    }
+
+    /**
+     * setToken
+     *
+     * @param string $token Set the access token
+     * @return void
+     */
+    public function setAccessToken($token)
+    {
+        $this->access_token = $token;
+    }
+
+    /**
+     * Check if there is an access token present
+     *
+     * @return bool Whether the access token is present
+     */
+    public function hasAccessToken()
+    {
+        return !!$this->access_token;
+    }
+
+    /**
+     * Set the client authentication type
+     *
+     * @param string $client_auth (AUTH_TYPE_URI, AUTH_TYPE_AUTHORIZATION_BASIC, AUTH_TYPE_FORM)
+     * @return void
+     */
+    public function setClientAuthType($client_auth)
+    {
+        $this->client_auth = $client_auth;
+    }
+
+    /**
+     * Set an option for the curl transfer
+     *
+     * @param int   $option The CURLOPT_XXX option to set
+     * @param mixed $value  The value to be set on option
+     * @return void
+     */
+    public function setCurlOption($option, $value)
+    {
+        $this->curl_options[$option] = $value;
+    }
+
+    /**
+     * Set multiple options for a cURL transfer
+     *
+     * @param array $options An array specifying which options to set and their values
+     * @return void
+     */
+    public function setCurlOptions($options)
+    {
+        $this->curl_options = array_merge($this->curl_options, $options);
+    }
+
+    /**
+     * Set the access token type
+     *
+     * @param int $type Access token type (ACCESS_TOKEN_BEARER, ACCESS_TOKEN_MAC, ACCESS_TOKEN_URI)
+     * @param string $secret The secret key used to encrypt the MAC header
+     * @param string $algorithm Algorithm used to encrypt the signature
+     * @return void
+     */
+    public function setAccessTokenType($type, $secret = null, $algorithm = null)
+    {
+        $this->access_token_type = $type;
+        $this->access_token_secret = $secret;
+        $this->access_token_algorithm = $algorithm;
+    }
+
+    /**
+     * Fetch a protected ressource
+     *
+     * @param string $protected_ressource_url Protected resource URL
+     * @param array  $parameters Array of parameters
+     * @param string $http_method HTTP Method to use (POST, PUT, GET, HEAD, DELETE)
+     * @param array  $http_headers HTTP headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    public function fetch($protected_resource_url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, array $http_headers = array(), $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        if ($this->access_token) {
+            switch ($this->access_token_type) {
+                case self::ACCESS_TOKEN_URI:
+                    if (is_array($parameters)) {
+                        $parameters[$this->access_token_param_name] = $this->access_token;
+                    } else {
+                        throw new InvalidArgumentException(
+                            'You need to give parameters as array if you want to give the token within the URI.',
+                            InvalidArgumentException::REQUIRE_PARAMS_AS_ARRAY
+                        );
+                    }
+                    break;
+                case self::ACCESS_TOKEN_BEARER:
+                    $http_headers['Authorization'] = 'Bearer ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_OAUTH:
+                    $http_headers['Authorization'] = 'OAuth ' . $this->access_token;
+                    break;
+                case self::ACCESS_TOKEN_MAC:
+                    $http_headers['Authorization'] = 'MAC ' . $this->generateMACSignature($protected_resource_url, $parameters, $http_method);
+                    break;
+                default:
+                    throw new Exception('Unknown access token type.', Exception::INVALID_ACCESS_TOKEN_TYPE);
+                    break;
+            }
+        }
+        return $this->executeRequest($protected_resource_url, $parameters, $http_method, $http_headers, $form_content_type);
+    }
+
+    /**
+     * Generate the MAC signature
+     *
+     * @param string $url Called URL
+     * @param array  $parameters Parameters
+     * @param string $http_method Http Method
+     * @return string
+     */
+    private function generateMACSignature($url, $parameters, $http_method)
+    {
+        $timestamp = time();
+        $nonce = uniqid();
+        $parsed_url = parse_url($url);
+        if (!isset($parsed_url['port']))
+        {
+            $parsed_url['port'] = ($parsed_url['scheme'] == 'https') ? 443 : 80;
+        }
+        if ($http_method == self::HTTP_METHOD_GET) {
+            if (is_array($parameters)) {
+                $parsed_url['path'] .= '?' . http_build_query($parameters, '', '&');
+            } elseif ($parameters) {
+                $parsed_url['path'] .= '?' . $parameters;
+            }
+        }
+
+        $signature = base64_encode(hash_hmac($this->access_token_algorithm,
+                    $timestamp . "\n"
+                    . $nonce . "\n"
+                    . $http_method . "\n"
+                    . $parsed_url['path'] . "\n"
+                    . $parsed_url['host'] . "\n"
+                    . $parsed_url['port'] . "\n\n"
+                    , $this->access_token_secret, true));
+
+        return 'id="' . $this->access_token . '", ts="' . $timestamp . '", nonce="' . $nonce . '", mac="' . $signature . '"';
+    }
+
+    /**
+     * Execute a request (with curl)
+     *
+     * @param string $url URL
+     * @param mixed  $parameters Array of parameters
+     * @param string $http_method HTTP Method
+     * @param array  $http_headers HTTP Headers
+     * @param int    $form_content_type HTTP form content type to use
+     * @return array
+     */
+    private function executeRequest($url, $parameters = array(), $http_method = self::HTTP_METHOD_GET, ?array $http_headers = null, $form_content_type = self::HTTP_FORM_CONTENT_TYPE_MULTIPART)
+    {
+        $curl_options = array(
+            CURLOPT_RETURNTRANSFER => true,
+            CURLOPT_SSL_VERIFYPEER => true,
+            CURLOPT_CUSTOMREQUEST  => $http_method
+        );
+
+        switch($http_method) {
+            case self::HTTP_METHOD_POST:
+                $curl_options[CURLOPT_POST] = true;
+                /* No break */
+            case self::HTTP_METHOD_PUT:
+			case self::HTTP_METHOD_PATCH:
+
+                /**
+                 * Passing an array to CURLOPT_POSTFIELDS will encode the data as multipart/form-data,
+                 * while passing a URL-encoded string will encode the data as application/x-www-form-urlencoded.
+                 * http://php.net/manual/en/function.curl-setopt.php
+                 */
+                if(is_array($parameters) && self::HTTP_FORM_CONTENT_TYPE_APPLICATION === $form_content_type) {
+                    $parameters = http_build_query($parameters, '', '&');
+                }
+                $curl_options[CURLOPT_POSTFIELDS] = $parameters;
+                break;
+            case self::HTTP_METHOD_HEAD:
+                $curl_options[CURLOPT_NOBODY] = true;
+                /* No break */
+            case self::HTTP_METHOD_DELETE:
+            case self::HTTP_METHOD_GET:
+                if (is_array($parameters) && count($parameters) > 0) {
+                    $url .= '?' . http_build_query($parameters, '', '&');
+                } elseif ($parameters) {
+                    $url .= '?' . $parameters;
+                }
+                break;
+            default:
+                break;
+        }
+
+        $curl_options[CURLOPT_URL] = $url;
+
+        if (is_array($http_headers)) {
+            $header = array();
+            foreach($http_headers as $key => $parsed_urlvalue) {
+                $header[] = "$key: $parsed_urlvalue";
+            }
+            $curl_options[CURLOPT_HTTPHEADER] = $header;
+        }
+
+        $ch = curl_init();
+        curl_setopt_array($ch, $curl_options);
+        // https handling
+        if (!empty($this->certificate_file)) {
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, true);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
+            curl_setopt($ch, CURLOPT_CAINFO, $this->certificate_file);
+        } else {
+            // bypass ssl verification
+            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
+            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
+        }
+        if (!empty($this->curl_options)) {
+            curl_setopt_array($ch, $this->curl_options);
+        }
+        $result = curl_exec($ch);
+        $http_code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+        $content_type = curl_getinfo($ch, CURLINFO_CONTENT_TYPE);
+        if ($curl_error = curl_error($ch)) {
+            throw new Exception($curl_error, Exception::CURL_ERROR);
+        } else {
+            $json_decode = json_decode($result, true);
+        }
+        curl_close($ch);
+
+        return array(
+            'result' => (null === $json_decode) ? $result : $json_decode,
+            'code' => $http_code,
+            'content_type' => $content_type
+        );
+    }
+
+    /**
+     * Set the name of the parameter that carry the access token
+     *
+     * @param string $name Token parameter name
+     * @return void
+     */
+    public function setAccessTokenParamName($name)
+    {
+        $this->access_token_param_name = $name;
+    }
+
+    /**
+     * Converts the class name to camel case
+     *
+     * @param  mixed  $grant_type  the grant type
+     * @return string
+     */
+    private function convertToCamelCase($grant_type)
+    {
+        $parts = explode('_', $grant_type);
+        array_walk($parts, function(&$item) { $item = ucfirst($item);});
+        return implode('', $parts);
+    }
+}
+
+class Exception extends \Exception
+{
+    const CURL_NOT_FOUND                     = 0x01;
+    const CURL_ERROR                         = 0x02;
+    const GRANT_TYPE_ERROR                   = 0x03;
+    const INVALID_CLIENT_AUTHENTICATION_TYPE = 0x04;
+    const INVALID_ACCESS_TOKEN_TYPE          = 0x05;
+}
+
+class InvalidArgumentException extends \InvalidArgumentException
+{
+    const INVALID_GRANT_TYPE      = 0x01;
+    const CERTIFICATE_NOT_FOUND   = 0x02;
+    const REQUIRE_PARAMS_AS_ARRAY = 0x03;
+    const MISSING_PARAMETER       = 0x04;
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/AuthorizationCode.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/AuthorizationCode.php
new file mode 100644
index 000000000..f3436e4c5
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/AuthorizationCode.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Authorization code  Grant Type Validator
+ */
+class AuthorizationCode implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'authorization_code'.
+     */
+    const GRANT_TYPE = 'authorization_code';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['code']))
+        {
+            throw new InvalidArgumentException(
+                'The \'code\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['redirect_uri']))
+        {
+            throw new InvalidArgumentException(
+                'The \'redirect_uri\' parameter must be defined for the Authorization Code grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/ClientCredentials.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/ClientCredentials.php
new file mode 100644
index 000000000..c6c81f84b
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/ClientCredentials.php
@@ -0,0 +1,25 @@
+<?php
+namespace OAuth2\GrantType;
+
+/**
+ * Client Credentials Parameters 
+ */
+class ClientCredentials implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     * 
+     * @var string  Defaults to 'client_credentials'. 
+     */
+    const GRANT_TYPE = 'client_credentials';
+
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/IGrantType.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/IGrantType.php
new file mode 100644
index 000000000..60631922f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/IGrantType.php
@@ -0,0 +1,15 @@
+<?php
+namespace OAuth2\GrantType;
+/**
+ * Specific GrantType Interface
+ */
+interface IGrantType 
+{
+    /**
+     * Adds a specific Handling of the parameters
+     * 
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters);
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/Password.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/Password.php
new file mode 100644
index 000000000..8972409c9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/Password.php
@@ -0,0 +1,41 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Password Parameters
+ */
+class Password implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'password'.
+     */
+    const GRANT_TYPE = 'password';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['username']))
+        {
+            throw new InvalidArgumentException(
+                'The \'username\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+        elseif (!isset($parameters['password']))
+        {
+            throw new InvalidArgumentException(
+                'The \'password\' parameter must be defined for the Password grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/RefreshToken.php b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/RefreshToken.php
new file mode 100644
index 000000000..12fccb04e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/GrantType/RefreshToken.php
@@ -0,0 +1,34 @@
+<?php
+namespace OAuth2\GrantType;
+
+use OAuth2\InvalidArgumentException;
+
+/**
+ * Refresh Token  Parameters
+ */
+class RefreshToken implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'refresh_token'.
+     */
+    const GRANT_TYPE = 'refresh_token';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['refresh_token']))
+        {
+            throw new InvalidArgumentException(
+                'The \'refresh_token\' parameter must be defined for the refresh token grant type',
+                InvalidArgumentException::MISSING_PARAMETER
+            );
+        }
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/LICENSE b/snappymail/v/0.0.0/app/libraries/OAuth2/LICENSE
new file mode 100644
index 000000000..8000a6faa
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/LICENSE
@@ -0,0 +1,504 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+    USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random
+  Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/snappymail/v/0.0.0/app/libraries/OAuth2/README.md b/snappymail/v/0.0.0/app/libraries/OAuth2/README.md
new file mode 100644
index 000000000..9de3570e0
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/OAuth2/README.md
@@ -0,0 +1,105 @@
+# Light PHP wrapper for the OAuth 2.0
+
+[![Latest Stable Version](https://poser.pugx.org/adoy/fastcgi-client/v/stable)](https://packagist.org/packages/adoy/fastcgi-client)
+[![GitHub](https://img.shields.io/github/license/adoy/PHP-OAuth2)](LICENSE)
+[![Total Downloads](https://poser.pugx.org/adoy/fastcgi-client/downloads)](https://packagist.org/packages/adoy/fastcgi-client)
+
+
+## How can I use it ?
+
+```php
+<?php
+
+require('Client.php');
+require('GrantType/IGrantType.php');
+require('GrantType/AuthorizationCode.php');
+
+const CLIENT_ID     = 'your client id';
+const CLIENT_SECRET = 'your client secret';
+
+const REDIRECT_URI           = 'http://url/of/this.php';
+const AUTHORIZATION_ENDPOINT = 'https://graph.facebook.com/oauth/authorize';
+const TOKEN_ENDPOINT         = 'https://graph.facebook.com/oauth/access_token';
+
+$client = new OAuth2\Client(CLIENT_ID, CLIENT_SECRET);
+if (!isset($_GET['code']))
+{
+    $auth_url = $client->getAuthenticationUrl(AUTHORIZATION_ENDPOINT, REDIRECT_URI);
+    header('Location: ' . $auth_url);
+    die('Redirect');
+}
+else
+{
+    $params = array('code' => $_GET['code'], 'redirect_uri' => REDIRECT_URI);
+    $response = $client->getAccessToken(TOKEN_ENDPOINT, 'authorization_code', $params);
+    parse_str($response['result'], $info);
+    $client->setAccessToken($info['access_token']);
+    $response = $client->fetch('https://graph.facebook.com/me');
+    var_dump($response, $response['result']);
+}
+```
+
+## How can I add a new Grant Type ?
+
+Simply write a new class in the namespace OAuth2\GrantType. You can place the class file under GrantType.
+Here is an example :
+
+```php
+<?php
+
+namespace OAuth2\GrantType;
+
+/**
+ * MyCustomGrantType Grant Type
+ */
+class MyCustomGrantType implements IGrantType
+{
+    /**
+     * Defines the Grant Type
+     *
+     * @var string  Defaults to 'my_custom_grant_type'.
+     */
+    const GRANT_TYPE = 'my_custom_grant_type';
+
+    /**
+     * Adds a specific Handling of the parameters
+     *
+     * @return array of Specific parameters to be sent.
+     * @param  mixed  $parameters the parameters array (passed by reference)
+     */
+    public function validateParameters(&$parameters)
+    {
+        if (!isset($parameters['first_mandatory_parameter']))
+        {
+            throw new \Exception('The \'first_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+        elseif (!isset($parameters['second_mandatory_parameter']))
+        {
+            throw new \Exception('The \'seconde_mandatory_parameter\' parameter must be defined for the Password grant type');
+        }
+    }
+}
+```
+
+call the OAuth client getAccessToken with the grantType you defined in the GRANT_TYPE constant, As following :
+
+```
+$response = $client->getAccessToken(TOKEN_ENDPOINT, 'my_custom_grant_type', $params);
+```
+
+## LICENSE
+
+This Code is released under the GNU LGPL
+
+Please do not change the header of the file(s).
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License as published
+by the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This library is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU Lesser General Public License for more details.
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/ClientContextInterface.php b/snappymail/v/0.0.0/app/libraries/Predis/ClientContextInterface.php
deleted file mode 100644
index 7f695b78d..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/ClientContextInterface.php
+++ /dev/null
@@ -1,189 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis;
-
-use Predis\Command\CommandInterface;
-
-/**
- * Interface defining a client-side context such as a pipeline or transaction.
- *
- * @method $this del(array $keys)
- * @method $this dump($key)
- * @method $this exists($key)
- * @method $this expire($key, $seconds)
- * @method $this expireat($key, $timestamp)
- * @method $this keys($pattern)
- * @method $this move($key, $db)
- * @method $this object($subcommand, $key)
- * @method $this persist($key)
- * @method $this pexpire($key, $milliseconds)
- * @method $this pexpireat($key, $timestamp)
- * @method $this pttl($key)
- * @method $this randomkey()
- * @method $this rename($key, $target)
- * @method $this renamenx($key, $target)
- * @method $this scan($cursor, array $options = null)
- * @method $this sort($key, array $options = null)
- * @method $this ttl($key)
- * @method $this type($key)
- * @method $this append($key, $value)
- * @method $this bitcount($key, $start = null, $end = null)
- * @method $this bitop($operation, $destkey, $key)
- * @method $this decr($key)
- * @method $this decrby($key, $decrement)
- * @method $this get($key)
- * @method $this getbit($key, $offset)
- * @method $this getrange($key, $start, $end)
- * @method $this getset($key, $value)
- * @method $this incr($key)
- * @method $this incrby($key, $increment)
- * @method $this incrbyfloat($key, $increment)
- * @method $this mget(array $keys)
- * @method $this mset(array $dictionary)
- * @method $this msetnx(array $dictionary)
- * @method $this psetex($key, $milliseconds, $value)
- * @method $this set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
- * @method $this setbit($key, $offset, $value)
- * @method $this setex($key, $seconds, $value)
- * @method $this setnx($key, $value)
- * @method $this setrange($key, $offset, $value)
- * @method $this strlen($key)
- * @method $this hdel($key, array $fields)
- * @method $this hexists($key, $field)
- * @method $this hget($key, $field)
- * @method $this hgetall($key)
- * @method $this hincrby($key, $field, $increment)
- * @method $this hincrbyfloat($key, $field, $increment)
- * @method $this hkeys($key)
- * @method $this hlen($key)
- * @method $this hmget($key, array $fields)
- * @method $this hmset($key, array $dictionary)
- * @method $this hscan($key, $cursor, array $options = null)
- * @method $this hset($key, $field, $value)
- * @method $this hsetnx($key, $field, $value)
- * @method $this hvals($key)
- * @method $this blpop(array $keys, $timeout)
- * @method $this brpop(array $keys, $timeout)
- * @method $this brpoplpush($source, $destination, $timeout)
- * @method $this lindex($key, $index)
- * @method $this linsert($key, $whence, $pivot, $value)
- * @method $this llen($key)
- * @method $this lpop($key)
- * @method $this lpush($key, array $values)
- * @method $this lpushx($key, $value)
- * @method $this lrange($key, $start, $stop)
- * @method $this lrem($key, $count, $value)
- * @method $this lset($key, $index, $value)
- * @method $this ltrim($key, $start, $stop)
- * @method $this rpop($key)
- * @method $this rpoplpush($source, $destination)
- * @method $this rpush($key, array $values)
- * @method $this rpushx($key, $value)
- * @method $this sadd($key, array $members)
- * @method $this scard($key)
- * @method $this sdiff(array $keys)
- * @method $this sdiffstore($destination, array $keys)
- * @method $this sinter(array $keys)
- * @method $this sinterstore($destination, array $keys)
- * @method $this sismember($key, $member)
- * @method $this smembers($key)
- * @method $this smove($source, $destination, $member)
- * @method $this spop($key)
- * @method $this srandmember($key, $count = null)
- * @method $this srem($key, $member)
- * @method $this sscan($key, $cursor, array $options = null)
- * @method $this sunion(array $keys)
- * @method $this sunionstore($destination, array $keys)
- * @method $this zadd($key, array $membersAndScoresDictionary)
- * @method $this zcard($key)
- * @method $this zcount($key, $min, $max)
- * @method $this zincrby($key, $increment, $member)
- * @method $this zinterstore($destination, array $keys, array $options = null)
- * @method $this zrange($key, $start, $stop, array $options = null)
- * @method $this zrangebyscore($key, $min, $max, array $options = null)
- * @method $this zrank($key, $member)
- * @method $this zrem($key, $member)
- * @method $this zremrangebyrank($key, $start, $stop)
- * @method $this zremrangebyscore($key, $min, $max)
- * @method $this zrevrange($key, $start, $stop, array $options = null)
- * @method $this zrevrangebyscore($key, $min, $max, array $options = null)
- * @method $this zrevrank($key, $member)
- * @method $this zunionstore($destination, array $keys, array $options = null)
- * @method $this zscore($key, $member)
- * @method $this zscan($key, $cursor, array $options = null)
- * @method $this zrangebylex($key, $start, $stop, array $options = null)
- * @method $this zremrangebylex($key, $min, $max)
- * @method $this zlexcount($key, $min, $max)
- * @method $this pfadd($key, array $elements)
- * @method $this pfmerge($destinationKey, array $sourceKeys)
- * @method $this pfcount(array $keys)
- * @method $this pubsub($subcommand, $argument)
- * @method $this publish($channel, $message)
- * @method $this discard()
- * @method $this exec()
- * @method $this multi()
- * @method $this unwatch()
- * @method $this watch($key)
- * @method $this eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method $this evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method $this script($subcommand, $argument = null)
- * @method $this auth($password)
- * @method $this echo($message)
- * @method $this ping($message = null)
- * @method $this select($database)
- * @method $this bgrewriteaof()
- * @method $this bgsave()
- * @method $this client($subcommand, $argument = null)
- * @method $this config($subcommand, $argument = null)
- * @method $this dbsize()
- * @method $this flushall()
- * @method $this flushdb()
- * @method $this info($section = null)
- * @method $this lastsave()
- * @method $this save()
- * @method $this slaveof($host, $port)
- * @method $this slowlog($subcommand, $argument = null)
- * @method $this time()
- * @method $this command()
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-interface ClientContextInterface
-{
-    /**
-     * Sends the specified command instance to Redis.
-     *
-     * @param CommandInterface $command Command instance.
-     *
-     * @return mixed
-     */
-    public function executeCommand(CommandInterface $command);
-
-    /**
-     * Sends the specified command with its arguments to Redis.
-     *
-     * @param string $method    Command ID.
-     * @param array  $arguments Arguments for the command.
-     *
-     * @return mixed
-     */
-    public function __call($method, $arguments);
-
-    /**
-     * Starts the execution of the context.
-     *
-     * @param mixed $callable Optional callback for execution.
-     *
-     * @return array
-     */
-    public function execute($callable = null);
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/ClientInterface.php b/snappymail/v/0.0.0/app/libraries/Predis/ClientInterface.php
deleted file mode 100644
index f216c470c..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/ClientInterface.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis;
-
-use Predis\Command\CommandInterface;
-use Predis\Configuration\OptionsInterface;
-use Predis\Connection\ConnectionInterface;
-use Predis\Profile\ProfileInterface;
-
-/**
- * Interface defining a client able to execute commands against Redis.
- *
- * All the commands exposed by the client generally have the same signature as
- * described by the Redis documentation, but some of them offer an additional
- * and more friendly interface to ease programming which is described in the
- * following list of methods:
- *
- * @method int    del(array $keys)
- * @method string dump($key)
- * @method int    exists($key)
- * @method int    expire($key, $seconds)
- * @method int    expireat($key, $timestamp)
- * @method array  keys($pattern)
- * @method int    move($key, $db)
- * @method mixed  object($subcommand, $key)
- * @method int    persist($key)
- * @method int    pexpire($key, $milliseconds)
- * @method int    pexpireat($key, $timestamp)
- * @method int    pttl($key)
- * @method string randomkey()
- * @method mixed  rename($key, $target)
- * @method int    renamenx($key, $target)
- * @method array  scan($cursor, array $options = null)
- * @method array  sort($key, array $options = null)
- * @method int    ttl($key)
- * @method mixed  type($key)
- * @method int    append($key, $value)
- * @method int    bitcount($key, $start = null, $end = null)
- * @method int    bitop($operation, $destkey, $key)
- * @method int    decr($key)
- * @method int    decrby($key, $decrement)
- * @method string get($key)
- * @method int    getbit($key, $offset)
- * @method string getrange($key, $start, $end)
- * @method string getset($key, $value)
- * @method int    incr($key)
- * @method int    incrby($key, $increment)
- * @method string incrbyfloat($key, $increment)
- * @method array  mget(array $keys)
- * @method mixed  mset(array $dictionary)
- * @method int    msetnx(array $dictionary)
- * @method mixed  psetex($key, $milliseconds, $value)
- * @method mixed  set($key, $value, $expireResolution = null, $expireTTL = null, $flag = null)
- * @method int    setbit($key, $offset, $value)
- * @method int    setex($key, $seconds, $value)
- * @method int    setnx($key, $value)
- * @method int    setrange($key, $offset, $value)
- * @method int    strlen($key)
- * @method int    hdel($key, array $fields)
- * @method int    hexists($key, $field)
- * @method string hget($key, $field)
- * @method array  hgetall($key)
- * @method int    hincrby($key, $field, $increment)
- * @method string hincrbyfloat($key, $field, $increment)
- * @method array  hkeys($key)
- * @method int    hlen($key)
- * @method array  hmget($key, array $fields)
- * @method mixed  hmset($key, array $dictionary)
- * @method array  hscan($key, $cursor, array $options = null)
- * @method int    hset($key, $field, $value)
- * @method int    hsetnx($key, $field, $value)
- * @method array  hvals($key)
- * @method array  blpop(array $keys, $timeout)
- * @method array  brpop(array $keys, $timeout)
- * @method array  brpoplpush($source, $destination, $timeout)
- * @method string lindex($key, $index)
- * @method int    linsert($key, $whence, $pivot, $value)
- * @method int    llen($key)
- * @method string lpop($key)
- * @method int    lpush($key, array $values)
- * @method int    lpushx($key, $value)
- * @method array  lrange($key, $start, $stop)
- * @method int    lrem($key, $count, $value)
- * @method mixed  lset($key, $index, $value)
- * @method mixed  ltrim($key, $start, $stop)
- * @method string rpop($key)
- * @method string rpoplpush($source, $destination)
- * @method int    rpush($key, array $values)
- * @method int    rpushx($key, $value)
- * @method int    sadd($key, array $members)
- * @method int    scard($key)
- * @method array  sdiff(array $keys)
- * @method int    sdiffstore($destination, array $keys)
- * @method array  sinter(array $keys)
- * @method int    sinterstore($destination, array $keys)
- * @method int    sismember($key, $member)
- * @method array  smembers($key)
- * @method int    smove($source, $destination, $member)
- * @method string spop($key)
- * @method string srandmember($key, $count = null)
- * @method int    srem($key, $member)
- * @method array  sscan($key, $cursor, array $options = null)
- * @method array  sunion(array $keys)
- * @method int    sunionstore($destination, array $keys)
- * @method int    zadd($key, array $membersAndScoresDictionary)
- * @method int    zcard($key)
- * @method string zcount($key, $min, $max)
- * @method string zincrby($key, $increment, $member)
- * @method int    zinterstore($destination, array $keys, array $options = null)
- * @method array  zrange($key, $start, $stop, array $options = null)
- * @method array  zrangebyscore($key, $min, $max, array $options = null)
- * @method int    zrank($key, $member)
- * @method int    zrem($key, $member)
- * @method int    zremrangebyrank($key, $start, $stop)
- * @method int    zremrangebyscore($key, $min, $max)
- * @method array  zrevrange($key, $start, $stop, array $options = null)
- * @method array  zrevrangebyscore($key, $min, $max, array $options = null)
- * @method int    zrevrank($key, $member)
- * @method int    zunionstore($destination, array $keys, array $options = null)
- * @method string zscore($key, $member)
- * @method array  zscan($key, $cursor, array $options = null)
- * @method array  zrangebylex($key, $start, $stop, array $options = null)
- * @method int    zremrangebylex($key, $min, $max)
- * @method int    zlexcount($key, $min, $max)
- * @method int    pfadd($key, array $elements)
- * @method mixed  pfmerge($destinationKey, array $sourceKeys)
- * @method int    pfcount(array $keys)
- * @method mixed  pubsub($subcommand, $argument)
- * @method int    publish($channel, $message)
- * @method mixed  discard()
- * @method array  exec()
- * @method mixed  multi()
- * @method mixed  unwatch()
- * @method mixed  watch($key)
- * @method mixed  eval($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method mixed  evalsha($script, $numkeys, $keyOrArg1 = null, $keyOrArgN = null)
- * @method mixed  script($subcommand, $argument = null)
- * @method mixed  auth($password)
- * @method string echo($message)
- * @method mixed  ping($message = null)
- * @method mixed  select($database)
- * @method mixed  bgrewriteaof()
- * @method mixed  bgsave()
- * @method mixed  client($subcommand, $argument = null)
- * @method mixed  config($subcommand, $argument = null)
- * @method int    dbsize()
- * @method mixed  flushall()
- * @method mixed  flushdb()
- * @method array  info($section = null)
- * @method int    lastsave()
- * @method mixed  save()
- * @method mixed  slaveof($host, $port)
- * @method mixed  slowlog($subcommand, $argument = null)
- * @method array  time()
- * @method array  command()
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-interface ClientInterface
-{
-    /**
-     * Returns the server profile used by the client.
-     *
-     * @return ProfileInterface
-     */
-    public function getProfile();
-
-    /**
-     * Returns the client options specified upon initialization.
-     *
-     * @return OptionsInterface
-     */
-    public function getOptions();
-
-    /**
-     * Opens the underlying connection to the server.
-     */
-    public function connect();
-
-    /**
-     * Closes the underlying connection from the server.
-     */
-    public function disconnect();
-
-    /**
-     * Returns the underlying connection instance.
-     *
-     * @return ConnectionInterface
-     */
-    public function getConnection();
-
-    /**
-     * Creates a new instance of the specified Redis command.
-     *
-     * @param string $method    Command ID.
-     * @param array  $arguments Arguments for the command.
-     *
-     * @return CommandInterface
-     */
-    public function createCommand($method, $arguments = array());
-
-    /**
-     * Executes the specified Redis command.
-     *
-     * @param CommandInterface $command Command instance.
-     *
-     * @return mixed
-     */
-    public function executeCommand(CommandInterface $command);
-
-    /**
-     * Creates a Redis command with the specified arguments and sends a request
-     * to the server.
-     *
-     * @param string $method    Command ID.
-     * @param array  $arguments Arguments for the command.
-     *
-     * @return mixed
-     */
-    public function __call($method, $arguments);
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashDelete.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HashDelete.php
deleted file mode 100644
index d5d4c38c0..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashDelete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/hdel
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HashDelete extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'HDEL';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashExists.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HashExists.php
deleted file mode 100644
index a2c69b90c..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashExists.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/hexists
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HashExists extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'HEXISTS';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetMultiple.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetMultiple.php
deleted file mode 100644
index 820ce958e..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashGetMultiple.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/hmget
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HashGetMultiple extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'HMGET';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSet.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSet.php
deleted file mode 100644
index d3154a9b2..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSet.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/hset
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HashSet extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'HSET';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetPreserve.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetPreserve.php
deleted file mode 100644
index 582100d49..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HashSetPreserve.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/hsetnx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HashSetPreserve extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'HSETNX';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogAdd.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogAdd.php
deleted file mode 100644
index 18d2bd7b5..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogAdd.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/pfadd
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HyperLogLogAdd extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PFADD';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogCount.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogCount.php
deleted file mode 100644
index 0afe54270..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogCount.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/pfcount
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HyperLogLogCount extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PFCOUNT';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogMerge.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogMerge.php
deleted file mode 100644
index c160be5b2..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/HyperLogLogMerge.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/pfmerge
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class HyperLogLogMerge extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PFMERGE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDelete.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDelete.php
deleted file mode 100644
index 89bdfdb7f..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyDelete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/del
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyDelete extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'DEL';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExists.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExists.php
deleted file mode 100644
index 5196ca16b..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExists.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/exists
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyExists extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'EXISTS';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpire.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpire.php
deleted file mode 100644
index fd7c9c802..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpire.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/expire
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyExpire extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'EXPIRE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpireAt.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpireAt.php
deleted file mode 100644
index e2fe7aeb6..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyExpireAt.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/expireat
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyExpireAt extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'EXPIREAT';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMove.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMove.php
deleted file mode 100644
index 8f1ab2a73..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyMove.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/move
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyMove extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'MOVE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPersist.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPersist.php
deleted file mode 100644
index e77295536..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyPersist.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/persist
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyPersist extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PERSIST';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRenamePreserve.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRenamePreserve.php
deleted file mode 100644
index 773ece6d3..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/KeyRenamePreserve.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/renamenx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyRenamePreserve extends KeyRename
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'RENAMENX';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastBlocking.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastBlocking.php
deleted file mode 100644
index 781eb9192..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPopLastBlocking.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/brpop
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ListPopLastBlocking extends ListPopFirstBlocking
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'BRPOP';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHead.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHead.php
deleted file mode 100644
index 74bf7c491..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushHead.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/lpush
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ListPushHead extends ListPushTail
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'LPUSH';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTail.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTail.php
deleted file mode 100644
index f2a057c0b..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ListPushTail.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/rpush
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ListPushTail extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'RPUSH';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/KeyPrefixProcessor.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/KeyPrefixProcessor.php
deleted file mode 100644
index d966d0e10..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/Processor/KeyPrefixProcessor.php
+++ /dev/null
@@ -1,415 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command\Processor;
-
-use Predis\Command\CommandInterface;
-use Predis\Command\PrefixableCommandInterface;
-
-/**
- * Command processor capable of prefixing keys stored in the arguments of Redis
- * commands supported.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class KeyPrefixProcessor implements ProcessorInterface
-{
-    private $prefix;
-    private $commands;
-
-    /**
-     * @param string $prefix Prefix for the keys.
-     */
-    public function __construct($prefix)
-    {
-        $this->prefix = $prefix;
-        $this->commands = array(
-            /* ---------------- Redis 1.2 ---------------- */
-            'EXISTS' => 'static::first',
-            'DEL' => 'static::all',
-            'TYPE' => 'static::first',
-            'KEYS' => 'static::first',
-            'RENAME' => 'static::all',
-            'RENAMENX' => 'static::all',
-            'EXPIRE' => 'static::first',
-            'EXPIREAT' => 'static::first',
-            'TTL' => 'static::first',
-            'MOVE' => 'static::first',
-            'SORT' => 'static::sort',
-            'DUMP' => 'static::first',
-            'RESTORE' => 'static::first',
-            'SET' => 'static::first',
-            'SETNX' => 'static::first',
-            'MSET' => 'static::interleaved',
-            'MSETNX' => 'static::interleaved',
-            'GET' => 'static::first',
-            'MGET' => 'static::all',
-            'GETSET' => 'static::first',
-            'INCR' => 'static::first',
-            'INCRBY' => 'static::first',
-            'DECR' => 'static::first',
-            'DECRBY' => 'static::first',
-            'RPUSH' => 'static::first',
-            'LPUSH' => 'static::first',
-            'LLEN' => 'static::first',
-            'LRANGE' => 'static::first',
-            'LTRIM' => 'static::first',
-            'LINDEX' => 'static::first',
-            'LSET' => 'static::first',
-            'LREM' => 'static::first',
-            'LPOP' => 'static::first',
-            'RPOP' => 'static::first',
-            'RPOPLPUSH' => 'static::all',
-            'SADD' => 'static::first',
-            'SREM' => 'static::first',
-            'SPOP' => 'static::first',
-            'SMOVE' => 'static::skipLast',
-            'SCARD' => 'static::first',
-            'SISMEMBER' => 'static::first',
-            'SINTER' => 'static::all',
-            'SINTERSTORE' => 'static::all',
-            'SUNION' => 'static::all',
-            'SUNIONSTORE' => 'static::all',
-            'SDIFF' => 'static::all',
-            'SDIFFSTORE' => 'static::all',
-            'SMEMBERS' => 'static::first',
-            'SRANDMEMBER' => 'static::first',
-            'ZADD' => 'static::first',
-            'ZINCRBY' => 'static::first',
-            'ZREM' => 'static::first',
-            'ZRANGE' => 'static::first',
-            'ZREVRANGE' => 'static::first',
-            'ZRANGEBYSCORE' => 'static::first',
-            'ZCARD' => 'static::first',
-            'ZSCORE' => 'static::first',
-            'ZREMRANGEBYSCORE' => 'static::first',
-            /* ---------------- Redis 2.0 ---------------- */
-            'SETEX' => 'static::first',
-            'APPEND' => 'static::first',
-            'SUBSTR' => 'static::first',
-            'BLPOP' => 'static::skipLast',
-            'BRPOP' => 'static::skipLast',
-            'ZUNIONSTORE' => 'static::zsetStore',
-            'ZINTERSTORE' => 'static::zsetStore',
-            'ZCOUNT' => 'static::first',
-            'ZRANK' => 'static::first',
-            'ZREVRANK' => 'static::first',
-            'ZREMRANGEBYRANK' => 'static::first',
-            'HSET' => 'static::first',
-            'HSETNX' => 'static::first',
-            'HMSET' => 'static::first',
-            'HINCRBY' => 'static::first',
-            'HGET' => 'static::first',
-            'HMGET' => 'static::first',
-            'HDEL' => 'static::first',
-            'HEXISTS' => 'static::first',
-            'HLEN' => 'static::first',
-            'HKEYS' => 'static::first',
-            'HVALS' => 'static::first',
-            'HGETALL' => 'static::first',
-            'SUBSCRIBE' => 'static::all',
-            'UNSUBSCRIBE' => 'static::all',
-            'PSUBSCRIBE' => 'static::all',
-            'PUNSUBSCRIBE' => 'static::all',
-            'PUBLISH' => 'static::first',
-            /* ---------------- Redis 2.2 ---------------- */
-            'PERSIST' => 'static::first',
-            'STRLEN' => 'static::first',
-            'SETRANGE' => 'static::first',
-            'GETRANGE' => 'static::first',
-            'SETBIT' => 'static::first',
-            'GETBIT' => 'static::first',
-            'RPUSHX' => 'static::first',
-            'LPUSHX' => 'static::first',
-            'LINSERT' => 'static::first',
-            'BRPOPLPUSH' => 'static::skipLast',
-            'ZREVRANGEBYSCORE' => 'static::first',
-            'WATCH' => 'static::all',
-            /* ---------------- Redis 2.6 ---------------- */
-            'PTTL' => 'static::first',
-            'PEXPIRE' => 'static::first',
-            'PEXPIREAT' => 'static::first',
-            'PSETEX' => 'static::first',
-            'INCRBYFLOAT' => 'static::first',
-            'BITOP' => 'static::skipFirst',
-            'BITCOUNT' => 'static::first',
-            'HINCRBYFLOAT' => 'static::first',
-            'EVAL' => 'static::evalKeys',
-            'EVALSHA' => 'static::evalKeys',
-            'MIGRATE' => 'static::migrate',
-            /* ---------------- Redis 2.8 ---------------- */
-            'SSCAN' => 'static::first',
-            'ZSCAN' => 'static::first',
-            'HSCAN' => 'static::first',
-            'PFADD' => 'static::first',
-            'PFCOUNT' => 'static::all',
-            'PFMERGE' => 'static::all',
-            'ZLEXCOUNT' => 'static::first',
-            'ZRANGEBYLEX' => 'static::first',
-            'ZREMRANGEBYLEX' => 'static::first',
-            'ZREVRANGEBYLEX' => 'static::first',
-            'BITPOS' => 'static::first',
-            /* ---------------- Redis 3.2 ---------------- */
-            'HSTRLEN' => 'static::first',
-        );
-    }
-
-    /**
-     * Sets a prefix that is applied to all the keys.
-     *
-     * @param string $prefix Prefix for the keys.
-     */
-    public function setPrefix($prefix)
-    {
-        $this->prefix = $prefix;
-    }
-
-    /**
-     * Gets the current prefix.
-     *
-     * @return string
-     */
-    public function getPrefix()
-    {
-        return $this->prefix;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function process(CommandInterface $command)
-    {
-        if ($command instanceof PrefixableCommandInterface) {
-            $command->prefixKeys($this->prefix);
-        } elseif (isset($this->commands[$commandID = strtoupper($command->getId())])) {
-            call_user_func($this->commands[$commandID], $command, $this->prefix);
-        }
-    }
-
-    /**
-     * Sets an handler for the specified command ID.
-     *
-     * The callback signature must have 2 parameters of the following types:
-     *
-     *   - Predis\Command\CommandInterface (command instance)
-     *   - String (prefix)
-     *
-     * When the callback argument is omitted or NULL, the previously
-     * associated handler for the specified command ID is removed.
-     *
-     * @param string $commandID The ID of the command to be handled.
-     * @param mixed  $callback  A valid callable object or NULL.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function setCommandHandler($commandID, $callback = null)
-    {
-        $commandID = strtoupper($commandID);
-
-        if (!isset($callback)) {
-            unset($this->commands[$commandID]);
-
-            return;
-        }
-
-        if (!is_callable($callback)) {
-            throw new \InvalidArgumentException(
-                'Callback must be a valid callable object or NULL'
-            );
-        }
-
-        $this->commands[$commandID] = $callback;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __toString()
-    {
-        return $this->getPrefix();
-    }
-
-    /**
-     * Applies the specified prefix only the first argument.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function first(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $arguments[0] = "$prefix{$arguments[0]}";
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to all the arguments.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function all(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            foreach ($arguments as &$key) {
-                $key = "$prefix$key";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix only to even arguments in the list.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function interleaved(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $length = count($arguments);
-
-            for ($i = 0; $i < $length; $i += 2) {
-                $arguments[$i] = "$prefix{$arguments[$i]}";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to all the arguments but the first one.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function skipFirst(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $length = count($arguments);
-
-            for ($i = 1; $i < $length; ++$i) {
-                $arguments[$i] = "$prefix{$arguments[$i]}";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to all the arguments but the last one.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function skipLast(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $length = count($arguments);
-
-            for ($i = 0; $i < $length - 1; ++$i) {
-                $arguments[$i] = "$prefix{$arguments[$i]}";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to the keys of a SORT command.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function sort(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $arguments[0] = "$prefix{$arguments[0]}";
-
-            if (($count = count($arguments)) > 1) {
-                for ($i = 1; $i < $count; ++$i) {
-                    switch ($arguments[$i]) {
-                        case 'BY':
-                        case 'STORE':
-                            $arguments[$i] = "$prefix{$arguments[++$i]}";
-                            break;
-
-                        case 'GET':
-                            $value = $arguments[++$i];
-                            if ($value !== '#') {
-                                $arguments[$i] = "$prefix$value";
-                            }
-                            break;
-
-                        case 'LIMIT';
-                            $i += 2;
-                            break;
-                    }
-                }
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to the keys of an EVAL-based command.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function evalKeys(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            for ($i = 2; $i < $arguments[1] + 2; ++$i) {
-                $arguments[$i] = "$prefix{$arguments[$i]}";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to the keys of Z[INTERSECTION|UNION]STORE.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function zsetStore(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $arguments[0] = "$prefix{$arguments[0]}";
-            $length = ((int) $arguments[1]) + 2;
-
-            for ($i = 2; $i < $length; ++$i) {
-                $arguments[$i] = "$prefix{$arguments[$i]}";
-            }
-
-            $command->setRawArguments($arguments);
-        }
-    }
-
-    /**
-     * Applies the specified prefix to the key of a MIGRATE command.
-     *
-     * @param CommandInterface $command Command instance.
-     * @param string           $prefix  Prefix string.
-     */
-    public static function migrate(CommandInterface $command, $prefix)
-    {
-        if ($arguments = $command->getArguments()) {
-            $arguments[2] = "$prefix{$arguments[2]}";
-            $command->setRawArguments($arguments);
-        }
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribe.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribe.php
deleted file mode 100644
index e477b313b..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribe.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/subscribe
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class PubSubSubscribe extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SUBSCRIBE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribeByPattern.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribeByPattern.php
deleted file mode 100644
index 011828066..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubSubscribeByPattern.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/psubscribe
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class PubSubSubscribeByPattern extends PubSubSubscribe
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PSUBSCRIBE';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribe.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribe.php
deleted file mode 100644
index d57c3ac6d..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribe.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/unsubscribe
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class PubSubUnsubscribe extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'UNSUBSCRIBE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribeByPattern.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribeByPattern.php
deleted file mode 100644
index 4d76508b2..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/PubSubUnsubscribeByPattern.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/punsubscribe
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class PubSubUnsubscribeByPattern extends PubSubUnsubscribe
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'PUNSUBSCRIBE';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerCommand.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerCommand.php
deleted file mode 100644
index e9b3393c7..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerCommand.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/command
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ServerCommand extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'COMMAND';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfo.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfo.php
deleted file mode 100644
index 96d6adad9..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfo.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/info
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ServerInfo extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'INFO';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        $info = array();
-        $infoLines = preg_split('/\r?\n/', $data);
-
-        foreach ($infoLines as $row) {
-            if (strpos($row, ':') === false) {
-                continue;
-            }
-
-            list($k, $v) = $this->parseRow($row);
-            $info[$k] = $v;
-        }
-
-        return $info;
-    }
-
-    /**
-     * Parses a single row of the response and returns the key-value pair.
-     *
-     * @param string $row Single row of the response.
-     *
-     * @return array
-     */
-    protected function parseRow($row)
-    {
-        list($k, $v) = explode(':', $row, 2);
-
-        if (preg_match('/^db\d+$/', $k)) {
-            $v = $this->parseDatabaseStats($v);
-        }
-
-        return array($k, $v);
-    }
-
-    /**
-     * Extracts the statistics of each logical DB from the string buffer.
-     *
-     * @param string $str Response buffer.
-     *
-     * @return array
-     */
-    protected function parseDatabaseStats($str)
-    {
-        $db = array();
-
-        foreach (explode(',', $str) as $dbvar) {
-            list($dbvk, $dbvv) = explode('=', $dbvar);
-            $db[trim($dbvk)] = $dbvv;
-        }
-
-        return $db;
-    }
-
-    /**
-     * Parses the response and extracts the allocation statistics.
-     *
-     * @param string $str Response buffer.
-     *
-     * @return array
-     */
-    protected function parseAllocationStats($str)
-    {
-        $stats = array();
-
-        foreach (explode(',', $str) as $kv) {
-            @list($size, $objects, $extra) = explode('=', $kv);
-
-            // hack to prevent incorrect values when parsing the >=256 key
-            if (isset($extra)) {
-                $size = ">=$objects";
-                $objects = $extra;
-            }
-
-            $stats[$size] = $objects;
-        }
-
-        return $stats;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfoV26x.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfoV26x.php
deleted file mode 100644
index 90c9b7163..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerInfoV26x.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/info
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ServerInfoV26x extends ServerInfo
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        if ($data === '') {
-            return array();
-        }
-
-        $info = array();
-
-        $current = null;
-        $infoLines = preg_split('/\r?\n/', $data);
-
-        if (isset($infoLines[0]) && $infoLines[0][0] !== '#') {
-            return parent::parseResponse($data);
-        }
-
-        foreach ($infoLines as $row) {
-            if ($row === '') {
-                continue;
-            }
-
-            if (preg_match('/^# (\w+)$/', $row, $matches)) {
-                $info[$matches[1]] = array();
-                $current = &$info[$matches[1]];
-                continue;
-            }
-
-            list($k, $v) = $this->parseRow($row);
-            $current[$k] = $v;
-        }
-
-        return $info;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerShutdown.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerShutdown.php
deleted file mode 100644
index f5b745a21..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ServerShutdown.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/shutdown
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ServerShutdown extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SHUTDOWN';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetAdd.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetAdd.php
deleted file mode 100644
index c11881816..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetAdd.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sadd
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetAdd extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SADD';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifferenceStore.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifferenceStore.php
deleted file mode 100644
index 0cb78155f..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetDifferenceStore.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sdiffstore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetDifferenceStore extends SetIntersectionStore
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SDIFFSTORE';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersection.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersection.php
deleted file mode 100644
index d18258fd7..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIntersection.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sinter
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetIntersection extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SINTER';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIsMember.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIsMember.php
deleted file mode 100644
index 1b484907e..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetIsMember.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sismember
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetIsMember extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SISMEMBER';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetMove.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetMove.php
deleted file mode 100644
index 72d514be7..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetMove.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/smove
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetMove extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SMOVE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetRemove.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetRemove.php
deleted file mode 100644
index b34710c62..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetRemove.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/srem
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetRemove extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SREM';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnion.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnion.php
deleted file mode 100644
index 7da842b45..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnion.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sunion
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetUnion extends SetIntersection
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SUNION';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnionStore.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnionStore.php
deleted file mode 100644
index eac821ad7..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/SetUnionStore.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/sunionstore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class SetUnionStore extends SetIntersectionStore
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SUNIONSTORE';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitCount.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitCount.php
deleted file mode 100644
index 193cce916..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitCount.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/bitcount
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringBitCount extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'BITCOUNT';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitPos.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitPos.php
deleted file mode 100644
index 42957665d..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringBitPos.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/bitpos
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringBitPos extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'BITPOS';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetMultiple.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetMultiple.php
deleted file mode 100644
index e340f9cfc..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringGetMultiple.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/mget
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringGetMultiple extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'MGET';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeArguments($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrement.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrement.php
deleted file mode 100644
index fa1846e2e..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringIncrement.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/incr
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringIncrement extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'INCR';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiplePreserve.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiplePreserve.php
deleted file mode 100644
index f98f1f7c2..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetMultiplePreserve.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/msetnx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringSetMultiplePreserve extends StringSetMultiple
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'MSETNX';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetPreserve.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetPreserve.php
deleted file mode 100644
index 726c35c87..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetPreserve.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/setnx
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringSetPreserve extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SETNX';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function parseResponse($data)
-    {
-        return (bool) $data;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetRange.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetRange.php
deleted file mode 100644
index 4d9389f48..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/StringSetRange.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/setrange
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class StringSetRange extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'SETRANGE';
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemove.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemove.php
deleted file mode 100644
index cd8ada05c..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetRemove.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/zrem
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ZSetRemove extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'ZREM';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        return self::normalizeVariadic($arguments);
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetUnionStore.php b/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetUnionStore.php
deleted file mode 100644
index befc5ce7c..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Command/ZSetUnionStore.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Command;
-
-/**
- * @link http://redis.io/commands/zunionstore
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ZSetUnionStore extends Command
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getId()
-    {
-        return 'ZUNIONSTORE';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    protected function filterArguments(array $arguments)
-    {
-        $options = array();
-        $argc = count($arguments);
-
-        if ($argc > 2 && is_array($arguments[$argc - 1])) {
-            $options = $this->prepareOptions(array_pop($arguments));
-        }
-
-        if (is_array($arguments[1])) {
-            $arguments = array_merge(
-                array($arguments[0], count($arguments[1])),
-                $arguments[1]
-            );
-        }
-
-        return array_merge($arguments, $options);
-    }
-
-    /**
-     * Returns a list of options and modifiers compatible with Redis.
-     *
-     * @param array $options List of options.
-     *
-     * @return array
-     */
-    private function prepareOptions($options)
-    {
-        $opts = array_change_key_case($options, CASE_UPPER);
-        $finalizedOpts = array();
-
-        if (isset($opts['WEIGHTS']) && is_array($opts['WEIGHTS'])) {
-            $finalizedOpts[] = 'WEIGHTS';
-
-            foreach ($opts['WEIGHTS'] as $weight) {
-                $finalizedOpts[] = $weight;
-            }
-        }
-
-        if (isset($opts['AGGREGATE'])) {
-            $finalizedOpts[] = 'AGGREGATE';
-            $finalizedOpts[] = $opts['AGGREGATE'];
-        }
-
-        return $finalizedOpts;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ClusterOption.php b/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ClusterOption.php
deleted file mode 100644
index 69e36de77..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ClusterOption.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Configuration;
-
-use Predis\Connection\Aggregate\ClusterInterface;
-use Predis\Connection\Aggregate\PredisCluster;
-use Predis\Connection\Aggregate\RedisCluster;
-
-/**
- * Configures an aggregate connection used for clustering
- * multiple Redis nodes using various implementations with
- * different algorithms or strategies.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ClusterOption implements OptionInterface
-{
-    /**
-     * Creates a new cluster connection from on a known descriptive name.
-     *
-     * @param OptionsInterface $options Instance of the client options.
-     * @param string           $id      Descriptive identifier of the cluster type (`predis`, `redis-cluster`)
-     *
-     * @return ClusterInterface|null
-     */
-    protected function createByDescription(OptionsInterface $options, $id)
-    {
-        switch ($id) {
-            case 'predis':
-            case 'predis-cluster':
-                return new PredisCluster();
-
-            case 'redis':
-            case 'redis-cluster':
-                return new RedisCluster($options->connections);
-
-            default:
-                return;
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function filter(OptionsInterface $options, $value)
-    {
-        if (is_string($value)) {
-            $value = $this->createByDescription($options, $value);
-        }
-
-        if (!$value instanceof ClusterInterface) {
-            throw new \InvalidArgumentException(
-                "An instance of type 'Predis\Connection\Aggregate\ClusterInterface' was expected."
-            );
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefault(OptionsInterface $options)
-    {
-        return new PredisCluster();
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ConnectionFactoryOption.php b/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ConnectionFactoryOption.php
deleted file mode 100644
index ba38df96f..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ConnectionFactoryOption.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Configuration;
-
-use Predis\Connection\Factory;
-use Predis\Connection\FactoryInterface;
-
-/**
- * Configures a connection factory used by the client to create new connection
- * instances for single Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ConnectionFactoryOption implements OptionInterface
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function filter(OptionsInterface $options, $value)
-    {
-        if ($value instanceof FactoryInterface) {
-            return $value;
-        } elseif (is_array($value)) {
-            $factory = $this->getDefault($options);
-
-            foreach ($value as $scheme => $initializer) {
-                $factory->define($scheme, $initializer);
-            }
-
-            return $factory;
-        } else {
-            throw new \InvalidArgumentException(
-                'Invalid value provided for the connections option.'
-            );
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefault(OptionsInterface $options)
-    {
-        return new Factory();
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionsInterface.php b/snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionsInterface.php
deleted file mode 100644
index f81164708..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/OptionsInterface.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Configuration;
-
-/**
- * Interface defining a container for client options.
- *
- * @property-read mixed aggregate   Custom connection aggregator.
- * @property-read mixed cluster     Aggregate connection for clustering.
- * @property-read mixed connections Connection factory.
- * @property-read mixed exceptions  Toggles exceptions in client for -ERR responses.
- * @property-read mixed prefix      Key prefixing strategy using the given prefix.
- * @property-read mixed profile     Server profile.
- * @property-read mixed replication Aggregate connection for replication.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-interface OptionsInterface
-{
-    /**
-     * Returns the default value for the given option.
-     *
-     * @param string $option Name of the option.
-     *
-     * @return mixed|null
-     */
-    public function getDefault($option);
-
-    /**
-     * Checks if the given option has been set by the user upon initialization.
-     *
-     * @param string $option Name of the option.
-     *
-     * @return bool
-     */
-    public function defined($option);
-
-    /**
-     * Checks if the given option has been set and does not evaluate to NULL.
-     *
-     * @param string $option Name of the option.
-     *
-     * @return bool
-     */
-    public function __isset($option);
-
-    /**
-     * Returns the value of the given option.
-     *
-     * @param string $option Name of the option.
-     *
-     * @return mixed|null
-     */
-    public function __get($option);
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ProfileOption.php b/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ProfileOption.php
deleted file mode 100644
index 864936e0a..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ProfileOption.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Configuration;
-
-use Predis\Profile\Factory;
-use Predis\Profile\ProfileInterface;
-use Predis\Profile\RedisProfile;
-
-/**
- * Configures the server profile to be used by the client to create command
- * instances depending on the specified version of the Redis server.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ProfileOption implements OptionInterface
-{
-    /**
-     * Sets the commands processors that need to be applied to the profile.
-     *
-     * @param OptionsInterface $options Client options.
-     * @param ProfileInterface $profile Server profile.
-     */
-    protected function setProcessors(OptionsInterface $options, ProfileInterface $profile)
-    {
-        if (isset($options->prefix) && $profile instanceof RedisProfile) {
-            // NOTE: directly using __get('prefix') is actually a workaround for
-            // HHVM 2.3.0. It's correct and respects the options interface, it's
-            // just ugly. We will remove this hack when HHVM will fix re-entrant
-            // calls to __get() once and for all.
-
-            $profile->setProcessor($options->__get('prefix'));
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function filter(OptionsInterface $options, $value)
-    {
-        if (is_string($value)) {
-            $value = Factory::get($value);
-            $this->setProcessors($options, $value);
-        } elseif (!$value instanceof ProfileInterface) {
-            throw new \InvalidArgumentException('Invalid value for the profile option.');
-        }
-
-        return $value;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefault(OptionsInterface $options)
-    {
-        $profile = Factory::getDefault();
-        $this->setProcessors($options, $profile);
-
-        return $profile;
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ReplicationOption.php b/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ReplicationOption.php
deleted file mode 100644
index fd2c8108d..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Configuration/ReplicationOption.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Configuration;
-
-use Predis\Connection\Aggregate\MasterSlaveReplication;
-use Predis\Connection\Aggregate\ReplicationInterface;
-
-/**
- * Configures an aggregate connection used for master/slave replication among
- * multiple Redis nodes.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class ReplicationOption implements OptionInterface
-{
-    /**
-     * {@inheritdoc}
-     *
-     * @todo There's more code than needed due to a bug in filter_var() as
-     *       discussed here https://bugs.php.net/bug.php?id=49510 and  different
-     *       behaviours when encountering NULL values on PHP 5.3.
-     */
-    public function filter(OptionsInterface $options, $value)
-    {
-        if ($value instanceof ReplicationInterface) {
-            return $value;
-        }
-
-        if (is_bool($value) || $value === null) {
-            return $value ? $this->getDefault($options) : null;
-        }
-
-        if (
-            !is_object($value) &&
-            null !== $asbool = filter_var($value, FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE)
-        ) {
-            return $asbool ? $this->getDefault($options) : null;
-        }
-
-        throw new \InvalidArgumentException(
-            "An instance of type 'Predis\Connection\Aggregate\ReplicationInterface' was expected."
-        );
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getDefault(OptionsInterface $options)
-    {
-        return new MasterSlaveReplication();
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/MasterSlaveReplication.php b/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/MasterSlaveReplication.php
deleted file mode 100644
index 3104a753c..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/Aggregate/MasterSlaveReplication.php
+++ /dev/null
@@ -1,264 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Connection\Aggregate;
-
-use Predis\Command\CommandInterface;
-use Predis\Connection\NodeConnectionInterface;
-use Predis\Replication\ReplicationStrategy;
-
-/**
- * Aggregate connection handling replication of Redis nodes configured in a
- * single master / multiple slaves setup.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class MasterSlaveReplication implements ReplicationInterface
-{
-    protected $strategy;
-    protected $master;
-    protected $slaves;
-    protected $current;
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __construct(ReplicationStrategy $strategy = null)
-    {
-        $this->slaves = array();
-        $this->strategy = $strategy ?: new ReplicationStrategy();
-    }
-
-    /**
-     * Checks if one master and at least one slave have been defined.
-     */
-    protected function check()
-    {
-        if (!isset($this->master) || !$this->slaves) {
-            throw new \RuntimeException('Replication needs one master and at least one slave.');
-        }
-    }
-
-    /**
-     * Resets the connection state.
-     */
-    protected function reset()
-    {
-        $this->current = null;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function add(NodeConnectionInterface $connection)
-    {
-        $alias = $connection->getParameters()->alias;
-
-        if ($alias === 'master') {
-            $this->master = $connection;
-        } else {
-            $this->slaves[$alias ?: count($this->slaves)] = $connection;
-        }
-
-        $this->reset();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function remove(NodeConnectionInterface $connection)
-    {
-        if ($connection->getParameters()->alias === 'master') {
-            $this->master = null;
-            $this->reset();
-
-            return true;
-        } else {
-            if (($id = array_search($connection, $this->slaves, true)) !== false) {
-                unset($this->slaves[$id]);
-                $this->reset();
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConnection(CommandInterface $command)
-    {
-        if ($this->current === null) {
-            $this->check();
-            $this->current = $this->strategy->isReadOperation($command)
-                ? $this->pickSlave()
-                : $this->master;
-
-            return $this->current;
-        }
-
-        if ($this->current === $this->master) {
-            return $this->current;
-        }
-
-        if (!$this->strategy->isReadOperation($command)) {
-            $this->current = $this->master;
-        }
-
-        return $this->current;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getConnectionById($connectionId)
-    {
-        if ($connectionId === 'master') {
-            return $this->master;
-        }
-
-        if (isset($this->slaves[$connectionId])) {
-            return $this->slaves[$connectionId];
-        }
-
-        return;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function switchTo($connection)
-    {
-        $this->check();
-
-        if (!$connection instanceof NodeConnectionInterface) {
-            $connection = $this->getConnectionById($connection);
-        }
-        if ($connection !== $this->master && !in_array($connection, $this->slaves, true)) {
-            throw new \InvalidArgumentException('Invalid connection or connection not found.');
-        }
-
-        $this->current = $connection;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getCurrent()
-    {
-        return $this->current;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getMaster()
-    {
-        return $this->master;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSlaves()
-    {
-        return array_values($this->slaves);
-    }
-
-    /**
-     * Returns the underlying replication strategy.
-     *
-     * @return ReplicationStrategy
-     */
-    public function getReplicationStrategy()
-    {
-        return $this->strategy;
-    }
-
-    /**
-     * Returns a random slave.
-     *
-     * @return NodeConnectionInterface
-     */
-    protected function pickSlave()
-    {
-        return $this->slaves[array_rand($this->slaves)];
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function isConnected()
-    {
-        return $this->current ? $this->current->isConnected() : false;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function connect()
-    {
-        if ($this->current === null) {
-            $this->check();
-            $this->current = $this->pickSlave();
-        }
-
-        $this->current->connect();
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function disconnect()
-    {
-        if ($this->master) {
-            $this->master->disconnect();
-        }
-
-        foreach ($this->slaves as $connection) {
-            $connection->disconnect();
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function writeRequest(CommandInterface $command)
-    {
-        $this->getConnection($command)->writeRequest($command);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function readResponse(CommandInterface $command)
-    {
-        return $this->getConnection($command)->readResponse($command);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function executeCommand(CommandInterface $command)
-    {
-        return $this->getConnection($command)->executeCommand($command);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function __sleep()
-    {
-        return array('master', 'slaves', 'strategy');
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ParametersInterface.php b/snappymail/v/0.0.0/app/libraries/Predis/Connection/ParametersInterface.php
deleted file mode 100644
index fd8a908e6..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Connection/ParametersInterface.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Connection;
-
-/**
- * Interface defining a container for connection parameters.
- *
- * The actual list of connection parameters depends on the features supported by
- * each connection backend class (please refer to their specific documentation),
- * but the most common parameters used through the library are:
- *
- * @property-read string scheme             Connection scheme, such as 'tcp' or 'unix'.
- * @property-read string host               IP address or hostname of Redis.
- * @property-read int    port               TCP port on which Redis is listening to.
- * @property-read string path               Path of a UNIX domain socket file.
- * @property-read string alias              Alias for the connection.
- * @property-read float  timeout            Timeout for the connect() operation.
- * @property-read float  read_write_timeout Timeout for read() and write() operations.
- * @property-read bool   async_connect      Performs the connect() operation asynchronously.
- * @property-read bool   tcp_nodelay        Toggles the Nagle's algorithm for coalescing.
- * @property-read bool   persistent         Leaves the connection open after a GC collection.
- * @property-read string password           Password to access Redis (see the AUTH command).
- * @property-read string database           Database index (see the SELECT command).
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-interface ParametersInterface
-{
-    /**
-     * Checks if the specified parameters is set.
-     *
-     * @param string $parameter Name of the parameter.
-     *
-     * @return bool
-     */
-    public function __isset($parameter);
-
-    /**
-     * Returns the value of the specified parameter.
-     *
-     * @param string $parameter Name of the parameter.
-     *
-     * @return mixed|null
-     */
-    public function __get($parameter);
-
-    /**
-     * Returns an array representation of the connection parameters.
-     *
-     * @return array
-     */
-    public function toArray();
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/Factory.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/Factory.php
deleted file mode 100644
index bcee3c2cf..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/Factory.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-use Predis\ClientException;
-
-/**
- * Factory class for creating profile instances from strings.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-final class Factory
-{
-    private static $profiles = array(
-        '2.0' => 'Predis\Profile\RedisVersion200',
-        '2.2' => 'Predis\Profile\RedisVersion220',
-        '2.4' => 'Predis\Profile\RedisVersion240',
-        '2.6' => 'Predis\Profile\RedisVersion260',
-        '2.8' => 'Predis\Profile\RedisVersion280',
-        '3.0' => 'Predis\Profile\RedisVersion300',
-        'dev' => 'Predis\Profile\RedisUnstable',
-        'default' => 'Predis\Profile\RedisVersion300',
-    );
-
-    /**
-     *
-     */
-    private function __construct()
-    {
-        // NOOP
-    }
-
-    /**
-     * Returns the default server profile.
-     *
-     * @return ProfileInterface
-     */
-    public static function getDefault()
-    {
-        return self::get('default');
-    }
-
-    /**
-     * Returns the development server profile.
-     *
-     * @return ProfileInterface
-     */
-    public static function getDevelopment()
-    {
-        return self::get('dev');
-    }
-
-    /**
-     * Registers a new server profile.
-     *
-     * @param string $alias Profile version or alias.
-     * @param string $class FQN of a class implementing Predis\Profile\ProfileInterface.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public static function define($alias, $class)
-    {
-        $reflection = new \ReflectionClass($class);
-
-        if (!$reflection->isSubclassOf('Predis\Profile\ProfileInterface')) {
-            throw new \InvalidArgumentException("The class '$class' is not a valid profile class.");
-        }
-
-        self::$profiles[$alias] = $class;
-    }
-
-    /**
-     * Returns the specified server profile.
-     *
-     * @param string $version Profile version or alias.
-     *
-     * @throws ClientException
-     *
-     * @return ProfileInterface
-     */
-    public static function get($version)
-    {
-        if (!isset(self::$profiles[$version])) {
-            throw new ClientException("Unknown server profile: '$version'.");
-        }
-
-        $profile = self::$profiles[$version];
-
-        return new $profile();
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/ProfileInterface.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/ProfileInterface.php
deleted file mode 100644
index abe71aa63..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/ProfileInterface.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-use Predis\Command\CommandInterface;
-
-/**
- * A profile defines all the features and commands supported by certain versions
- * of Redis. Instances of Predis\Client should use a server profile matching the
- * version of Redis being used.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-interface ProfileInterface
-{
-    /**
-     * Returns the profile version corresponding to the Redis version.
-     *
-     * @return string
-     */
-    public function getVersion();
-
-    /**
-     * Checks if the profile supports the specified command.
-     *
-     * @param string $commandID Command ID.
-     *
-     * @return bool
-     */
-    public function supportsCommand($commandID);
-
-    /**
-     * Checks if the profile supports the specified list of commands.
-     *
-     * @param array $commandIDs List of command IDs.
-     *
-     * @return string
-     */
-    public function supportsCommands(array $commandIDs);
-
-    /**
-     * Creates a new command instance.
-     *
-     * @param string $commandID Command ID.
-     * @param array  $arguments Arguments for the command.
-     *
-     * @return CommandInterface
-     */
-    public function createCommand($commandID, array $arguments = array());
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisProfile.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisProfile.php
deleted file mode 100644
index 3ef316886..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisProfile.php
+++ /dev/null
@@ -1,146 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-use Predis\ClientException;
-use Predis\Command\Processor\ProcessorInterface;
-
-/**
- * Base class implementing common functionalities for Redis server profiles.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-abstract class RedisProfile implements ProfileInterface
-{
-    private $commands;
-    private $processor;
-
-    /**
-     *
-     */
-    public function __construct()
-    {
-        $this->commands = $this->getSupportedCommands();
-    }
-
-    /**
-     * Returns a map of all the commands supported by the profile and their
-     * actual PHP classes.
-     *
-     * @return array
-     */
-    abstract protected function getSupportedCommands();
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsCommand($commandID)
-    {
-        return isset($this->commands[strtoupper($commandID)]);
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function supportsCommands(array $commandIDs)
-    {
-        foreach ($commandIDs as $commandID) {
-            if (!$this->supportsCommand($commandID)) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Returns the fully-qualified name of a class representing the specified
-     * command ID registered in the current server profile.
-     *
-     * @param string $commandID Command ID.
-     *
-     * @return string|null
-     */
-    public function getCommandClass($commandID)
-    {
-        if (isset($this->commands[$commandID = strtoupper($commandID)])) {
-            return $this->commands[$commandID];
-        }
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function createCommand($commandID, array $arguments = array())
-    {
-        $commandID = strtoupper($commandID);
-
-        if (!isset($this->commands[$commandID])) {
-            throw new ClientException("Command '$commandID' is not a registered Redis command.");
-        }
-
-        $commandClass = $this->commands[$commandID];
-        $command = new $commandClass();
-        $command->setArguments($arguments);
-
-        if (isset($this->processor)) {
-            $this->processor->process($command);
-        }
-
-        return $command;
-    }
-
-    /**
-     * Defines a new command in the server profile.
-     *
-     * @param string $commandID Command ID.
-     * @param string $class     Fully-qualified name of a Predis\Command\CommandInterface.
-     *
-     * @throws \InvalidArgumentException
-     */
-    public function defineCommand($commandID, $class)
-    {
-        $reflection = new \ReflectionClass($class);
-
-        if (!$reflection->isSubclassOf('Predis\Command\CommandInterface')) {
-            throw new \InvalidArgumentException("The class '$class' is not a valid command class.");
-        }
-
-        $this->commands[strtoupper($commandID)] = $class;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function setProcessor(ProcessorInterface $processor = null)
-    {
-        $this->processor = $processor;
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getProcessor()
-    {
-        return $this->processor;
-    }
-
-    /**
-     * Returns the version of server profile as its string representation.
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->getVersion();
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisUnstable.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisUnstable.php
deleted file mode 100644
index cf6174feb..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisUnstable.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for the current unstable version of Redis.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisUnstable extends RedisVersion300
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '3.2';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array_merge(parent::getSupportedCommands(), array(
-            /* ---------------- Redis 3.2 ---------------- */
-
-            /* commands operating on hashes */
-            'HSTRLEN' => 'Predis\Command\HashStringLength',
-        ));
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion200.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion200.php
deleted file mode 100644
index 234d53c00..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion200.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 2.0.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion200 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '2.0';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfo',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion220.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion220.php
deleted file mode 100644
index 899014e28..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion220.php
+++ /dev/null
@@ -1,202 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 2.2.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion220 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '2.2';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfo',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-
-            /* ---------------- Redis 2.2 ---------------- */
-
-            /* commands operating on the key space */
-            'PERSIST' => 'Predis\Command\KeyPersist',
-
-            /* commands operating on string values */
-            'STRLEN' => 'Predis\Command\StringStrlen',
-            'SETRANGE' => 'Predis\Command\StringSetRange',
-            'GETRANGE' => 'Predis\Command\StringGetRange',
-            'SETBIT' => 'Predis\Command\StringSetBit',
-            'GETBIT' => 'Predis\Command\StringGetBit',
-
-            /* commands operating on lists */
-            'RPUSHX' => 'Predis\Command\ListPushTailX',
-            'LPUSHX' => 'Predis\Command\ListPushHeadX',
-            'LINSERT' => 'Predis\Command\ListInsert',
-            'BRPOPLPUSH' => 'Predis\Command\ListPopLastPushHeadBlocking',
-
-            /* commands operating on sorted sets */
-            'ZREVRANGEBYSCORE' => 'Predis\Command\ZSetReverseRangeByScore',
-
-            /* transactions */
-            'WATCH' => 'Predis\Command\TransactionWatch',
-            'UNWATCH' => 'Predis\Command\TransactionUnwatch',
-
-            /* remote server control commands */
-            'OBJECT' => 'Predis\Command\ServerObject',
-            'SLOWLOG' => 'Predis\Command\ServerSlowlog',
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion240.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion240.php
deleted file mode 100644
index 0856c37c4..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion240.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 2.4.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion240 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '2.4';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfo',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-
-            /* ---------------- Redis 2.2 ---------------- */
-
-            /* commands operating on the key space */
-            'PERSIST' => 'Predis\Command\KeyPersist',
-
-            /* commands operating on string values */
-            'STRLEN' => 'Predis\Command\StringStrlen',
-            'SETRANGE' => 'Predis\Command\StringSetRange',
-            'GETRANGE' => 'Predis\Command\StringGetRange',
-            'SETBIT' => 'Predis\Command\StringSetBit',
-            'GETBIT' => 'Predis\Command\StringGetBit',
-
-            /* commands operating on lists */
-            'RPUSHX' => 'Predis\Command\ListPushTailX',
-            'LPUSHX' => 'Predis\Command\ListPushHeadX',
-            'LINSERT' => 'Predis\Command\ListInsert',
-            'BRPOPLPUSH' => 'Predis\Command\ListPopLastPushHeadBlocking',
-
-            /* commands operating on sorted sets */
-            'ZREVRANGEBYSCORE' => 'Predis\Command\ZSetReverseRangeByScore',
-
-            /* transactions */
-            'WATCH' => 'Predis\Command\TransactionWatch',
-            'UNWATCH' => 'Predis\Command\TransactionUnwatch',
-
-            /* remote server control commands */
-            'OBJECT' => 'Predis\Command\ServerObject',
-            'SLOWLOG' => 'Predis\Command\ServerSlowlog',
-
-            /* ---------------- Redis 2.4 ---------------- */
-
-            /* remote server control commands */
-            'CLIENT' => 'Predis\Command\ServerClient',
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion260.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion260.php
deleted file mode 100644
index ba5084aa0..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion260.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 2.6.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion260 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '2.6';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-            'DUMP' => 'Predis\Command\KeyDump',
-            'RESTORE' => 'Predis\Command\KeyRestore',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfoV26x',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-
-            /* ---------------- Redis 2.2 ---------------- */
-
-            /* commands operating on the key space */
-            'PERSIST' => 'Predis\Command\KeyPersist',
-
-            /* commands operating on string values */
-            'STRLEN' => 'Predis\Command\StringStrlen',
-            'SETRANGE' => 'Predis\Command\StringSetRange',
-            'GETRANGE' => 'Predis\Command\StringGetRange',
-            'SETBIT' => 'Predis\Command\StringSetBit',
-            'GETBIT' => 'Predis\Command\StringGetBit',
-
-            /* commands operating on lists */
-            'RPUSHX' => 'Predis\Command\ListPushTailX',
-            'LPUSHX' => 'Predis\Command\ListPushHeadX',
-            'LINSERT' => 'Predis\Command\ListInsert',
-            'BRPOPLPUSH' => 'Predis\Command\ListPopLastPushHeadBlocking',
-
-            /* commands operating on sorted sets */
-            'ZREVRANGEBYSCORE' => 'Predis\Command\ZSetReverseRangeByScore',
-
-            /* transactions */
-            'WATCH' => 'Predis\Command\TransactionWatch',
-            'UNWATCH' => 'Predis\Command\TransactionUnwatch',
-
-            /* remote server control commands */
-            'OBJECT' => 'Predis\Command\ServerObject',
-            'SLOWLOG' => 'Predis\Command\ServerSlowlog',
-
-            /* ---------------- Redis 2.4 ---------------- */
-
-            /* remote server control commands */
-            'CLIENT' => 'Predis\Command\ServerClient',
-
-            /* ---------------- Redis 2.6 ---------------- */
-
-            /* commands operating on the key space */
-            'PTTL' => 'Predis\Command\KeyPreciseTimeToLive',
-            'PEXPIRE' => 'Predis\Command\KeyPreciseExpire',
-            'PEXPIREAT' => 'Predis\Command\KeyPreciseExpireAt',
-            'MIGRATE' => 'Predis\Command\KeyMigrate',
-
-            /* commands operating on string values */
-            'PSETEX' => 'Predis\Command\StringPreciseSetExpire',
-            'INCRBYFLOAT' => 'Predis\Command\StringIncrementByFloat',
-            'BITOP' => 'Predis\Command\StringBitOp',
-            'BITCOUNT' => 'Predis\Command\StringBitCount',
-
-            /* commands operating on hashes */
-            'HINCRBYFLOAT' => 'Predis\Command\HashIncrementByFloat',
-
-            /* scripting */
-            'EVAL' => 'Predis\Command\ServerEval',
-            'EVALSHA' => 'Predis\Command\ServerEvalSHA',
-            'SCRIPT' => 'Predis\Command\ServerScript',
-
-            /* remote server control commands */
-            'TIME' => 'Predis\Command\ServerTime',
-            'SENTINEL' => 'Predis\Command\ServerSentinel',
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion280.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion280.php
deleted file mode 100644
index ea17e6829..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion280.php
+++ /dev/null
@@ -1,267 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 2.8.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion280 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '2.8';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-            'DUMP' => 'Predis\Command\KeyDump',
-            'RESTORE' => 'Predis\Command\KeyRestore',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfoV26x',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-
-            /* ---------------- Redis 2.2 ---------------- */
-
-            /* commands operating on the key space */
-            'PERSIST' => 'Predis\Command\KeyPersist',
-
-            /* commands operating on string values */
-            'STRLEN' => 'Predis\Command\StringStrlen',
-            'SETRANGE' => 'Predis\Command\StringSetRange',
-            'GETRANGE' => 'Predis\Command\StringGetRange',
-            'SETBIT' => 'Predis\Command\StringSetBit',
-            'GETBIT' => 'Predis\Command\StringGetBit',
-
-            /* commands operating on lists */
-            'RPUSHX' => 'Predis\Command\ListPushTailX',
-            'LPUSHX' => 'Predis\Command\ListPushHeadX',
-            'LINSERT' => 'Predis\Command\ListInsert',
-            'BRPOPLPUSH' => 'Predis\Command\ListPopLastPushHeadBlocking',
-
-            /* commands operating on sorted sets */
-            'ZREVRANGEBYSCORE' => 'Predis\Command\ZSetReverseRangeByScore',
-
-            /* transactions */
-            'WATCH' => 'Predis\Command\TransactionWatch',
-            'UNWATCH' => 'Predis\Command\TransactionUnwatch',
-
-            /* remote server control commands */
-            'OBJECT' => 'Predis\Command\ServerObject',
-            'SLOWLOG' => 'Predis\Command\ServerSlowlog',
-
-            /* ---------------- Redis 2.4 ---------------- */
-
-            /* remote server control commands */
-            'CLIENT' => 'Predis\Command\ServerClient',
-
-            /* ---------------- Redis 2.6 ---------------- */
-
-            /* commands operating on the key space */
-            'PTTL' => 'Predis\Command\KeyPreciseTimeToLive',
-            'PEXPIRE' => 'Predis\Command\KeyPreciseExpire',
-            'PEXPIREAT' => 'Predis\Command\KeyPreciseExpireAt',
-            'MIGRATE' => 'Predis\Command\KeyMigrate',
-
-            /* commands operating on string values */
-            'PSETEX' => 'Predis\Command\StringPreciseSetExpire',
-            'INCRBYFLOAT' => 'Predis\Command\StringIncrementByFloat',
-            'BITOP' => 'Predis\Command\StringBitOp',
-            'BITCOUNT' => 'Predis\Command\StringBitCount',
-
-            /* commands operating on hashes */
-            'HINCRBYFLOAT' => 'Predis\Command\HashIncrementByFloat',
-
-            /* scripting */
-            'EVAL' => 'Predis\Command\ServerEval',
-            'EVALSHA' => 'Predis\Command\ServerEvalSHA',
-            'SCRIPT' => 'Predis\Command\ServerScript',
-
-            /* remote server control commands */
-            'TIME' => 'Predis\Command\ServerTime',
-            'SENTINEL' => 'Predis\Command\ServerSentinel',
-
-            /* ---------------- Redis 2.8 ---------------- */
-
-            /* commands operating on the key space */
-            'SCAN' => 'Predis\Command\KeyScan',
-
-            /* commands operating on string values */
-            'BITPOS' => 'Predis\Command\StringBitPos',
-
-            /* commands operating on sets */
-            'SSCAN' => 'Predis\Command\SetScan',
-
-            /* commands operating on sorted sets */
-            'ZSCAN' => 'Predis\Command\ZSetScan',
-            'ZLEXCOUNT' => 'Predis\Command\ZSetLexCount',
-            'ZRANGEBYLEX' => 'Predis\Command\ZSetRangeByLex',
-            'ZREMRANGEBYLEX' => 'Predis\Command\ZSetRemoveRangeByLex',
-            'ZREVRANGEBYLEX' => 'Predis\Command\ZSetReverseRangeByLex',
-
-            /* commands operating on hashes */
-            'HSCAN' => 'Predis\Command\HashScan',
-
-            /* publish - subscribe */
-            'PUBSUB' => 'Predis\Command\PubSubPubsub',
-
-            /* commands operating on HyperLogLog */
-            'PFADD' => 'Predis\Command\HyperLogLogAdd',
-            'PFCOUNT' => 'Predis\Command\HyperLogLogCount',
-            'PFMERGE' => 'Predis\Command\HyperLogLogMerge',
-
-            /* remote server control commands */
-            'COMMAND' => 'Predis\Command\ServerCommand',
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion300.php b/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion300.php
deleted file mode 100644
index 8a2fac8b7..000000000
--- a/snappymail/v/0.0.0/app/libraries/Predis/Profile/RedisVersion300.php
+++ /dev/null
@@ -1,270 +0,0 @@
-<?php
-
-/*
- * This file is part of the Predis package.
- *
- * (c) Daniele Alessandri <suppakilla@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Predis\Profile;
-
-/**
- * Server profile for Redis 3.0.
- *
- * @author Daniele Alessandri <suppakilla@gmail.com>
- */
-class RedisVersion300 extends RedisProfile
-{
-    /**
-     * {@inheritdoc}
-     */
-    public function getVersion()
-    {
-        return '3.0';
-    }
-
-    /**
-     * {@inheritdoc}
-     */
-    public function getSupportedCommands()
-    {
-        return array(
-            /* ---------------- Redis 1.2 ---------------- */
-
-            /* commands operating on the key space */
-            'EXISTS' => 'Predis\Command\KeyExists',
-            'DEL' => 'Predis\Command\KeyDelete',
-            'TYPE' => 'Predis\Command\KeyType',
-            'KEYS' => 'Predis\Command\KeyKeys',
-            'RANDOMKEY' => 'Predis\Command\KeyRandom',
-            'RENAME' => 'Predis\Command\KeyRename',
-            'RENAMENX' => 'Predis\Command\KeyRenamePreserve',
-            'EXPIRE' => 'Predis\Command\KeyExpire',
-            'EXPIREAT' => 'Predis\Command\KeyExpireAt',
-            'TTL' => 'Predis\Command\KeyTimeToLive',
-            'MOVE' => 'Predis\Command\KeyMove',
-            'SORT' => 'Predis\Command\KeySort',
-            'DUMP' => 'Predis\Command\KeyDump',
-            'RESTORE' => 'Predis\Command\KeyRestore',
-
-            /* commands operating on string values */
-            'SET' => 'Predis\Command\StringSet',
-            'SETNX' => 'Predis\Command\StringSetPreserve',
-            'MSET' => 'Predis\Command\StringSetMultiple',
-            'MSETNX' => 'Predis\Command\StringSetMultiplePreserve',
-            'GET' => 'Predis\Command\StringGet',
-            'MGET' => 'Predis\Command\StringGetMultiple',
-            'GETSET' => 'Predis\Command\StringGetSet',
-            'INCR' => 'Predis\Command\StringIncrement',
-            'INCRBY' => 'Predis\Command\StringIncrementBy',
-            'DECR' => 'Predis\Command\StringDecrement',
-            'DECRBY' => 'Predis\Command\StringDecrementBy',
-
-            /* commands operating on lists */
-            'RPUSH' => 'Predis\Command\ListPushTail',
-            'LPUSH' => 'Predis\Command\ListPushHead',
-            'LLEN' => 'Predis\Command\ListLength',
-            'LRANGE' => 'Predis\Command\ListRange',
-            'LTRIM' => 'Predis\Command\ListTrim',
-            'LINDEX' => 'Predis\Command\ListIndex',
-            'LSET' => 'Predis\Command\ListSet',
-            'LREM' => 'Predis\Command\ListRemove',
-            'LPOP' => 'Predis\Command\ListPopFirst',
-            'RPOP' => 'Predis\Command\ListPopLast',
-            'RPOPLPUSH' => 'Predis\Command\ListPopLastPushHead',
-
-            /* commands operating on sets */
-            'SADD' => 'Predis\Command\SetAdd',
-            'SREM' => 'Predis\Command\SetRemove',
-            'SPOP' => 'Predis\Command\SetPop',
-            'SMOVE' => 'Predis\Command\SetMove',
-            'SCARD' => 'Predis\Command\SetCardinality',
-            'SISMEMBER' => 'Predis\Command\SetIsMember',
-            'SINTER' => 'Predis\Command\SetIntersection',
-            'SINTERSTORE' => 'Predis\Command\SetIntersectionStore',
-            'SUNION' => 'Predis\Command\SetUnion',
-            'SUNIONSTORE' => 'Predis\Command\SetUnionStore',
-            'SDIFF' => 'Predis\Command\SetDifference',
-            'SDIFFSTORE' => 'Predis\Command\SetDifferenceStore',
-            'SMEMBERS' => 'Predis\Command\SetMembers',
-            'SRANDMEMBER' => 'Predis\Command\SetRandomMember',
-
-            /* commands operating on sorted sets */
-            'ZADD' => 'Predis\Command\ZSetAdd',
-            'ZINCRBY' => 'Predis\Command\ZSetIncrementBy',
-            'ZREM' => 'Predis\Command\ZSetRemove',
-            'ZRANGE' => 'Predis\Command\ZSetRange',
-            'ZREVRANGE' => 'Predis\Command\ZSetReverseRange',
-            'ZRANGEBYSCORE' => 'Predis\Command\ZSetRangeByScore',
-            'ZCARD' => 'Predis\Command\ZSetCardinality',
-            'ZSCORE' => 'Predis\Command\ZSetScore',
-            'ZREMRANGEBYSCORE' => 'Predis\Command\ZSetRemoveRangeByScore',
-
-            /* connection related commands */
-            'PING' => 'Predis\Command\ConnectionPing',
-            'AUTH' => 'Predis\Command\ConnectionAuth',
-            'SELECT' => 'Predis\Command\ConnectionSelect',
-            'ECHO' => 'Predis\Command\ConnectionEcho',
-            'QUIT' => 'Predis\Command\ConnectionQuit',
-
-            /* remote server control commands */
-            'INFO' => 'Predis\Command\ServerInfoV26x',
-            'SLAVEOF' => 'Predis\Command\ServerSlaveOf',
-            'MONITOR' => 'Predis\Command\ServerMonitor',
-            'DBSIZE' => 'Predis\Command\ServerDatabaseSize',
-            'FLUSHDB' => 'Predis\Command\ServerFlushDatabase',
-            'FLUSHALL' => 'Predis\Command\ServerFlushAll',
-            'SAVE' => 'Predis\Command\ServerSave',
-            'BGSAVE' => 'Predis\Command\ServerBackgroundSave',
-            'LASTSAVE' => 'Predis\Command\ServerLastSave',
-            'SHUTDOWN' => 'Predis\Command\ServerShutdown',
-            'BGREWRITEAOF' => 'Predis\Command\ServerBackgroundRewriteAOF',
-
-            /* ---------------- Redis 2.0 ---------------- */
-
-            /* commands operating on string values */
-            'SETEX' => 'Predis\Command\StringSetExpire',
-            'APPEND' => 'Predis\Command\StringAppend',
-            'SUBSTR' => 'Predis\Command\StringSubstr',
-
-            /* commands operating on lists */
-            'BLPOP' => 'Predis\Command\ListPopFirstBlocking',
-            'BRPOP' => 'Predis\Command\ListPopLastBlocking',
-
-            /* commands operating on sorted sets */
-            'ZUNIONSTORE' => 'Predis\Command\ZSetUnionStore',
-            'ZINTERSTORE' => 'Predis\Command\ZSetIntersectionStore',
-            'ZCOUNT' => 'Predis\Command\ZSetCount',
-            'ZRANK' => 'Predis\Command\ZSetRank',
-            'ZREVRANK' => 'Predis\Command\ZSetReverseRank',
-            'ZREMRANGEBYRANK' => 'Predis\Command\ZSetRemoveRangeByRank',
-
-            /* commands operating on hashes */
-            'HSET' => 'Predis\Command\HashSet',
-            'HSETNX' => 'Predis\Command\HashSetPreserve',
-            'HMSET' => 'Predis\Command\HashSetMultiple',
-            'HINCRBY' => 'Predis\Command\HashIncrementBy',
-            'HGET' => 'Predis\Command\HashGet',
-            'HMGET' => 'Predis\Command\HashGetMultiple',
-            'HDEL' => 'Predis\Command\HashDelete',
-            'HEXISTS' => 'Predis\Command\HashExists',
-            'HLEN' => 'Predis\Command\HashLength',
-            'HKEYS' => 'Predis\Command\HashKeys',
-            'HVALS' => 'Predis\Command\HashValues',
-            'HGETALL' => 'Predis\Command\HashGetAll',
-
-            /* transactions */
-            'MULTI' => 'Predis\Command\TransactionMulti',
-            'EXEC' => 'Predis\Command\TransactionExec',
-            'DISCARD' => 'Predis\Command\TransactionDiscard',
-
-            /* publish - subscribe */
-            'SUBSCRIBE' => 'Predis\Command\PubSubSubscribe',
-            'UNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribe',
-            'PSUBSCRIBE' => 'Predis\Command\PubSubSubscribeByPattern',
-            'PUNSUBSCRIBE' => 'Predis\Command\PubSubUnsubscribeByPattern',
-            'PUBLISH' => 'Predis\Command\PubSubPublish',
-
-            /* remote server control commands */
-            'CONFIG' => 'Predis\Command\ServerConfig',
-
-            /* ---------------- Redis 2.2 ---------------- */
-
-            /* commands operating on the key space */
-            'PERSIST' => 'Predis\Command\KeyPersist',
-
-            /* commands operating on string values */
-            'STRLEN' => 'Predis\Command\StringStrlen',
-            'SETRANGE' => 'Predis\Command\StringSetRange',
-            'GETRANGE' => 'Predis\Command\StringGetRange',
-            'SETBIT' => 'Predis\Command\StringSetBit',
-            'GETBIT' => 'Predis\Command\StringGetBit',
-
-            /* commands operating on lists */
-            'RPUSHX' => 'Predis\Command\ListPushTailX',
-            'LPUSHX' => 'Predis\Command\ListPushHeadX',
-            'LINSERT' => 'Predis\Command\ListInsert',
-            'BRPOPLPUSH' => 'Predis\Command\ListPopLastPushHeadBlocking',
-
-            /* commands operating on sorted sets */
-            'ZREVRANGEBYSCORE' => 'Predis\Command\ZSetReverseRangeByScore',
-
-            /* transactions */
-            'WATCH' => 'Predis\Command\TransactionWatch',
-            'UNWATCH' => 'Predis\Command\TransactionUnwatch',
-
-            /* remote server control commands */
-            'OBJECT' => 'Predis\Command\ServerObject',
-            'SLOWLOG' => 'Predis\Command\ServerSlowlog',
-
-            /* ---------------- Redis 2.4 ---------------- */
-
-            /* remote server control commands */
-            'CLIENT' => 'Predis\Command\ServerClient',
-
-            /* ---------------- Redis 2.6 ---------------- */
-
-            /* commands operating on the key space */
-            'PTTL' => 'Predis\Command\KeyPreciseTimeToLive',
-            'PEXPIRE' => 'Predis\Command\KeyPreciseExpire',
-            'PEXPIREAT' => 'Predis\Command\KeyPreciseExpireAt',
-            'MIGRATE' => 'Predis\Command\KeyMigrate',
-
-            /* commands operating on string values */
-            'PSETEX' => 'Predis\Command\StringPreciseSetExpire',
-            'INCRBYFLOAT' => 'Predis\Command\StringIncrementByFloat',
-            'BITOP' => 'Predis\Command\StringBitOp',
-            'BITCOUNT' => 'Predis\Command\StringBitCount',
-
-            /* commands operating on hashes */
-            'HINCRBYFLOAT' => 'Predis\Command\HashIncrementByFloat',
-
-            /* scripting */
-            'EVAL' => 'Predis\Command\ServerEval',
-            'EVALSHA' => 'Predis\Command\ServerEvalSHA',
-            'SCRIPT' => 'Predis\Command\ServerScript',
-
-            /* remote server control commands */
-            'TIME' => 'Predis\Command\ServerTime',
-            'SENTINEL' => 'Predis\Command\ServerSentinel',
-
-            /* ---------------- Redis 2.8 ---------------- */
-
-            /* commands operating on the key space */
-            'SCAN' => 'Predis\Command\KeyScan',
-
-            /* commands operating on string values */
-            'BITPOS' => 'Predis\Command\StringBitPos',
-
-            /* commands operating on sets */
-            'SSCAN' => 'Predis\Command\SetScan',
-
-            /* commands operating on sorted sets */
-            'ZSCAN' => 'Predis\Command\ZSetScan',
-            'ZLEXCOUNT' => 'Predis\Command\ZSetLexCount',
-            'ZRANGEBYLEX' => 'Predis\Command\ZSetRangeByLex',
-            'ZREMRANGEBYLEX' => 'Predis\Command\ZSetRemoveRangeByLex',
-            'ZREVRANGEBYLEX' => 'Predis\Command\ZSetReverseRangeByLex',
-
-            /* commands operating on hashes */
-            'HSCAN' => 'Predis\Command\HashScan',
-
-            /* publish - subscribe */
-            'PUBSUB' => 'Predis\Command\PubSubPubsub',
-
-            /* commands operating on HyperLogLog */
-            'PFADD' => 'Predis\Command\HyperLogLogAdd',
-            'PFCOUNT' => 'Predis\Command\HyperLogLogCount',
-            'PFMERGE' => 'Predis\Command\HyperLogLogMerge',
-
-            /* remote server control commands */
-            'COMMAND' => 'Predis\Command\ServerCommand',
-
-            /* ---------------- Redis 3.0 ---------------- */
-
-        );
-    }
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
index 0ccc325c7..0e39503f9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions.php
@@ -2,7 +2,8 @@
 
 namespace RainLoop;
 
-use RainLoop\Enumerations\UploadError;
+use RainLoop\Enumerations\Capa;
+use RainLoop\Enumerations\SignMeType;
 
 class Actions
 {
@@ -14,6 +15,8 @@ class Actions
 	use Actions\Localization;
 	use Actions\Themes;
 
+	use \MailSo\Log\Inherit;
+
 	const AUTH_MAILTO_TOKEN_KEY = 'smmailtoauth';
 
 	/**
@@ -26,16 +29,17 @@ class Actions
 
 	/**
 	 * This session cookie contains a \RainLoop\Model\Account
+	 * Value is Base64 EncryptToJSON
 	 */
 	const AUTH_SPEC_TOKEN_KEY = 'smaccount';
 
 	/**
 	 * This session cookie optionally contains a \RainLoop\Model\AdditionalAccount
+	 * Value is Base64 EncryptToJSON
 	 */
 	const AUTH_ADDITIONAL_TOKEN_KEY = 'smadditional';
 
-	const AUTH_SPEC_LOGOUT_TOKEN_KEY = 'smspeclogout';
-	const AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY = 'smspeclogoutcmk';
+	const APP_DUMMY = '********';
 
 	/**
 	 * @var \MailSo\Base\Http
@@ -57,11 +61,6 @@ class Actions
 	 */
 	protected $oPlugins = null;
 
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger = null;
-
 	/**
 	 * @var \MailSo\Log\Logger
 	 */
@@ -102,11 +101,6 @@ class Actions
 	 */
 	protected $oLocalSettingsProvider = null;
 
-	/**
-	 * @var \RainLoop\Providers\AddressBook
-	 */
-	protected $oAddressBookProvider = null;
-
 	/**
 	 * @var \RainLoop\Config\Application
 	 */
@@ -122,68 +116,37 @@ class Actions
 		$this->oConfig = API::Config();
 
 		$this->oLogger = API::Logger();
-		if ($this->oConfig->Get('logs', 'enable', false)) {
-			$sSessionFilter = (string)$this->oConfig->Get('logs', 'session_filter', '');
-			if (!empty($sSessionFilter)) {
-				$aSessionParts = \explode(':', $sSessionFilter, 2);
-
-				if (empty($aSessionParts[0]) || empty($aSessionParts[1]) ||
-					(string)$aSessionParts[1] !== (string)Utils::GetCookie($aSessionParts[0], '')) {
-					return $this->oLogger;
-				}
-			}
-
-			$sTimeZone = $this->oConfig->Get('logs', 'time_zone', 'UTC');
-
-			$this->oLogger->SetShowSecrets(!$this->oConfig->Get('logs', 'hide_passwords', true));
-
-			$sLogFileName = $this->oConfig->Get('logs', 'filename', '');
+		if ($this->oConfig->Get('logs', 'enable', false) || $this->oConfig->Get('debug', 'enable', false)) {
 
 			$oDriver = null;
+			$sLogFileName = $this->oConfig->Get('logs', 'filename', '');
 			if ('syslog' === $sLogFileName) {
 				$oDriver = new \MailSo\Log\Drivers\Syslog();
+			} else if ('stderr' === $sLogFileName) {
+				$oDriver = new \MailSo\Log\Drivers\StderrStream();
 			} else {
-				$sLogFileFullPath = \APP_PRIVATE_DATA . 'logs/' . $this->compileLogFileName($sLogFileName);
-				$sLogFileDir = \dirname($sLogFileFullPath);
-
-				if (!\is_dir($sLogFileDir)) {
-					\mkdir($sLogFileDir, 0755, true);
-				}
-
-				$oDriver = new \MailSo\Log\Drivers\File($sLogFileFullPath);
+				$sLogFileFullPath = \trim($this->oConfig->Get('logs', 'path', '')) ?: \APP_PRIVATE_DATA . 'logs';
+				\is_dir($sLogFileFullPath) || \mkdir($sLogFileFullPath, 0700, true);
+				$oDriver = new \MailSo\Log\Drivers\File($sLogFileFullPath . '/' . $this->compileLogFileName($sLogFileName));
 			}
-
 			$this->oLogger->append($oDriver
-				->WriteOnErrorOnly($this->oConfig->Get('logs', 'write_on_error_only', false))
-				->WriteOnPhpErrorOnly($this->oConfig->Get('logs', 'write_on_php_error_only', false))
-				->WriteOnTimeoutOnly($this->oConfig->Get('logs', 'write_on_timeout_only', 0))
-				->SetTimeZone($sTimeZone)
+				->SetTimeZone($this->oConfig->Get('logs', 'time_zone', 'UTC'))
 			);
 
-			if (!$this->oConfig->Get('debug', 'enable', false)) {
-				$this->oLogger->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME);
-			}
-
-			$this->oLogger->WriteEmptyLine();
-
 			$oHttp = $this->Http();
 
-			$this->oLogger->Write('[DATE:' . (new \DateTime('now', new \DateTimeZone($sTimeZone)))->format('Y-m-d ') .
-				$sTimeZone .
-				'][SM:' . APP_VERSION . '][IP:' .
-				$oHttp->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)) . '][PID:' .
-				(\MailSo\Base\Utils::FunctionExistsAndEnabled('getmypid') ? \getmypid() : 'unknown') . '][' .
-				$oHttp->GetServer('SERVER_SOFTWARE', '~') . '][' .
-				(\MailSo\Base\Utils::FunctionExistsAndEnabled('php_sapi_name') ? \php_sapi_name() : '~') . '][Streams:' . \implode(',', \stream_get_transports()) . ']'
+			$this->logWrite(
+				'[SM:' . APP_VERSION . '][IP:'
+				. $oHttp->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false))
+				. '][PID:' . (\MailSo\Base\Utils::FunctionCallable('getmypid') ? \getmypid() : 'unknown')
+				. '][' . \MailSo\Base\Http::GetServer('SERVER_SOFTWARE', '~')
+				. '][' . \PHP_SAPI
+				. '][Streams:' . \implode(',', \stream_get_transports())
+				. '][' . $oHttp->GetMethod() . ' ' . $oHttp->GetScheme() . '://' . $oHttp->GetHost(false) . \MailSo\Base\Http::GetServer('REQUEST_URI', '') . ']'
 			);
-
-			$this->oLogger->Write(
-				'[' . $oHttp->GetMethod() . '] ' . $oHttp->GetScheme() . '://' . $oHttp->GetHost(false, false) . $oHttp->GetServer('REQUEST_URI', ''),
-				\MailSo\Log\Enumerations\Type::NOTE, 'REQUEST');
 		}
 
 		$this->oPlugins = new Plugins\Manager($this);
-		$this->oPlugins->SetLogger($this->oLogger);
 		$this->oPlugins->RunHook('filter.application-config', array($this->oConfig));
 	}
 
@@ -204,10 +167,7 @@ class Actions
 		return $this->oConfig;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	protected function fabrica(string $sName, ?Model\Account $oAccount = null)
+	protected function fabrica(string $sName, ?Model\Account $oAccount = null): mixed
 	{
 		$mResult = null;
 		$this->oPlugins->RunHook('main.fabrica', array($sName, &$mResult), false);
@@ -232,10 +192,6 @@ class Actions
 					// RainLoop\Providers\Settings\ISettings
 					$mResult = new Providers\Settings\DefaultSettings($this->LocalStorageProvider());
 					break;
-				case 'login':
-					// Providers\Login\LoginInterface
-					$mResult = new Providers\Login\DefaultLogin();
-					break;
 				case 'domain':
 					// Providers\Domain\DomainInterface
 					$mResult = new Providers\Domain\DefaultDomain(APP_PRIVATE_DATA . 'domains', $this->Cacher());
@@ -248,22 +204,19 @@ class Actions
 					break;
 				case 'address-book':
 					// Providers\AddressBook\AddressBookInterface
-					$sDsn = \trim($this->oConfig->Get('contacts', 'pdo_dsn', ''));
-					$sUser = \trim($this->oConfig->Get('contacts', 'pdo_user', ''));
-					$sPassword = (string)$this->oConfig->Get('contacts', 'pdo_password', '');
-					$sDsnType = Providers\AddressBook\PdoAddressBook::validPdoType($this->oConfig->Get('contacts', 'type', 'sqlite'));
-					if ('sqlite' === $sDsnType) {
-						$sUser = $sPassword = '';
-						$sDsn = 'sqlite:' . APP_PRIVATE_DATA . 'AddressBook.sqlite';
-					} else {
-						$sDsn = $sDsnType . ':' . \preg_replace('/^[a-z]+:/', '', $sDsn);
-					}
-					$mResult = new Providers\AddressBook\PdoAddressBook($sDsn, $sUser, $sPassword, $sDsnType);
+					$mResult = new Providers\AddressBook\PdoAddressBook();
 					break;
 				case 'identities':
 				case 'suggestions':
 					$mResult = [];
 					break;
+/*				// See function Cacher
+				case 'cache':
+					$mResult = new \MailSo\Cache\Drivers\File(
+						\trim($this->oConfig->Get('cache', 'path', '')) ?: APP_PRIVATE_DATA . 'cache'
+					);
+					break;
+*/
 			}
 		}
 
@@ -285,23 +238,25 @@ class Actions
 
 	public function BootEnd(): void
 	{
+/*
 		try {
-			if ($this->MailClient()->IsLoggined()) {
-				$this->MailClient()->Disconnect();
+			if (!\SnappyMail\Shutdown::count() && $this->ImapClient()->IsLoggined()) {
+				$this->ImapClient()->Disconnect();
 			}
 		} catch (\Throwable $oException) {
 			unset($oException);
 		}
+*/
 	}
 
-	protected function compileLogParams(string $sLine, ?Model\Account $oAccount = null, bool $bUrlEncode = false, array $aAdditionalParams = array()): string
+	protected function compileLogParams(string $sLine, ?Model\Account $oAccount = null, array $aAdditionalParams = array()): string
 	{
 		$aClear = array();
 
 		if (false !== \strpos($sLine, '{date:')) {
 			$oConfig = $this->oConfig;
-			$sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($oConfig, $bUrlEncode) {
-				return Utils::UrlEncode((new \DateTime('now', new \DateTimeZone($oConfig->Get('logs', 'time_zone', 'UTC'))))->format($aMatch[1]), $bUrlEncode);
+			$sLine = \preg_replace_callback('/\{date:([^}]+)\}/', function ($aMatch) use ($oConfig) {
+				return (new \DateTime('now', new \DateTimeZone($oConfig->Get('logs', 'time_zone', 'UTC'))))->format($aMatch[1]);
 			}, $sLine);
 
 			$aClear['/\{date:([^}]*)\}/'] = 'date';
@@ -313,13 +268,15 @@ class Actions
 			}
 
 			if ($oAccount) {
-				$sLine = \str_replace('{imap:login}', Utils::UrlEncode($oAccount->IncLogin(), $bUrlEncode), $sLine);
-				$sLine = \str_replace('{imap:host}', Utils::UrlEncode($oAccount->Domain()->IncHost(), $bUrlEncode), $sLine);
-				$sLine = \str_replace('{imap:port}', Utils::UrlEncode($oAccount->Domain()->IncPort(), $bUrlEncode), $sLine);
-
-				$sLine = \str_replace('{smtp:login}', Utils::UrlEncode($oAccount->OutLogin(), $bUrlEncode), $sLine);
-				$sLine = \str_replace('{smtp:host}', Utils::UrlEncode($oAccount->Domain()->OutHost(), $bUrlEncode), $sLine);
-				$sLine = \str_replace('{smtp:port}', Utils::UrlEncode($oAccount->Domain()->OutPort(), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{imap:login}', $oAccount->ImapUser(), $sLine);
+				$sLine = \str_replace('{smtp:login}', $oAccount->SmtpUser(), $sLine);
+				$oDomain = $oAccount->Domain();
+				if ($oDomain) {
+					$sLine = \str_replace('{imap:host}', $oDomain->ImapSettings()->host, $sLine);
+					$sLine = \str_replace('{imap:port}', $oDomain->ImapSettings()->port, $sLine);
+					$sLine = \str_replace('{smtp:host}', $oDomain->SmtpSettings()->host, $sLine);
+					$sLine = \str_replace('{smtp:port}', $oDomain->SmtpSettings()->port, $sLine);
+				}
 			}
 
 			$aClear['/\{imap:([^}]*)\}/i'] = 'imap';
@@ -328,19 +285,19 @@ class Actions
 
 		if (false !== \strpos($sLine, '{request:')) {
 			if (false !== \strpos($sLine, '{request:ip}')) {
-				$sLine = \str_replace('{request:ip}', Utils::UrlEncode($this->Http()->GetClientIp(
-					$this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{request:ip}',
+					$this->Http()->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)),
+					$sLine);
 			}
 
 			if (false !== \strpos($sLine, '{request:domain}')) {
-				$sLine = \str_replace('{request:domain}',
-					Utils::UrlEncode($this->Http()->GetHost(false, true, true), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{request:domain}', $this->Http()->GetHost(true, true), $sLine);
 			}
 
 			if (false !== \strpos($sLine, '{request:domain-clear}')) {
 				$sLine = \str_replace('{request:domain-clear}',
-					Utils::UrlEncode(
-						\MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(false, true, true)), $bUrlEncode), $sLine);
+					\MailSo\Base\Utils::GetClearDomainName($this->Http()->GetHost(true, true)),
+					$sLine);
 			}
 
 			$aClear['/\{request:([^}]*)\}/i'] = 'request';
@@ -349,15 +306,15 @@ class Actions
 		if (false !== \strpos($sLine, '{user:')) {
 			if (false !== \strpos($sLine, '{user:uid}')) {
 				$sLine = \str_replace('{user:uid}',
-					Utils::UrlEncode(\base_convert(\sprintf('%u',
-						\crc32(Utils::GetConnectionToken())), 10, 32), $bUrlEncode),
+					\base_convert(\sprintf('%u', \crc32(Utils::GetConnectionToken())), 10, 32),
 					$sLine
 				);
 			}
 
 			if (false !== \strpos($sLine, '{user:ip}')) {
-				$sLine = \str_replace('{user:ip}', Utils::UrlEncode($this->Http()->GetClientIp(
-					$this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)), $bUrlEncode), $sLine);
+				$sLine = \str_replace('{user:ip}',
+					$this->Http()->GetClientIp($this->oConfig->Get('labs', 'http_client_ip_check_proxy', false)),
+					$sLine);
 			}
 
 			if (\preg_match('/\{user:(email|login|domain)\}/i', $sLine)) {
@@ -368,14 +325,12 @@ class Actions
 				if ($oAccount) {
 					$sEmail = $oAccount->Email();
 
-					$sLine = \str_replace('{user:email}', Utils::UrlEncode($sEmail, $bUrlEncode), $sLine);
-					$sLine = \str_replace('{user:login}', Utils::UrlEncode(
-						\MailSo\Base\Utils::GetAccountNameFromEmail($sEmail), $bUrlEncode), $sLine);
-					$sLine = \str_replace('{user:domain}', Utils::UrlEncode(
-						\MailSo\Base\Utils::GetDomainFromEmail($sEmail), $bUrlEncode), $sLine);
-					$sLine = \str_replace('{user:domain-clear}', Utils::UrlEncode(
-						\MailSo\Base\Utils::GetClearDomainName(
-							\MailSo\Base\Utils::GetDomainFromEmail($sEmail)), $bUrlEncode), $sLine);
+					$sLine = \str_replace('{user:email}', $sEmail, $sLine);
+					$sLine = \str_replace('{user:login}', \MailSo\Base\Utils::getEmailAddressLocalPart($sEmail), $sLine);
+					$sLine = \str_replace('{user:domain}', \MailSo\Base\Utils::getEmailAddressDomain($sEmail), $sLine);
+					$sLine = \str_replace('{user:domain-clear}',
+						\MailSo\Base\Utils::GetClearDomainName(\MailSo\Base\Utils::getEmailAddressDomain($sEmail)),
+						$sLine);
 				}
 			}
 
@@ -405,7 +360,7 @@ class Actions
 	{
 		$sFileName = \trim($sFileName);
 
-		if (0 !== \strlen($sFileName)) {
+		if (\strlen($sFileName)) {
 			$sFileName = $this->compileLogParams($sFileName);
 
 			$sFileName = \preg_replace('/[\/]+/', '/', \preg_replace('/[.]+/', '.', $sFileName));
@@ -413,7 +368,7 @@ class Actions
 		}
 
 		if (!\strlen($sFileName)) {
-			$sFileName = 'rainloop-log.txt';
+			$sFileName = 'snappymail-log.txt';
 		}
 
 		return $sFileName;
@@ -446,6 +401,12 @@ class Actions
 		return $this->oMailClient;
 	}
 
+	public function ImapClient(): \MailSo\Imap\ImapClient
+	{
+//		$this->initMailClientConnection();
+		return $this->MailClient()->ImapClient();
+	}
+
 	// Stores data in AdditionalAccount else MainAccount
 	public function LocalStorageProvider(): Providers\Storage
 	{
@@ -503,23 +464,9 @@ class Actions
 		return $this->oDomainProvider;
 	}
 
-	public function AddressBookProvider(?Model\Account $oAccount = null, bool $bForceEnable = false): Providers\AddressBook
-	{
-		if (null === $this->oAddressBookProvider) {
-			$oDriver = null;
-			if ($this->GetCapa(Enumerations\Capa::CONTACTS)) {
-				if ($this->oConfig->Get('contacts', 'enable', false) || $bForceEnable) {
-					$oDriver = $this->fabrica('address-book', $oAccount);
-				}
-			}
-
-			$this->oAddressBookProvider = new Providers\AddressBook($oDriver);
-			$this->oAddressBookProvider->SetLogger($this->oLogger);
-		}
-
-		return $this->oAddressBookProvider;
-	}
-
+	/**
+	 * bForceFile is only used by admin session token
+	 */
 	public function Cacher(?Model\Account $oAccount = null, bool $bForceFile = false): \MailSo\Cache\CacheClient
 	{
 		$sKey = '';
@@ -535,46 +482,15 @@ class Actions
 		if (!isset($this->aCachers[$sIndexKey])) {
 			$this->aCachers[$sIndexKey] = new \MailSo\Cache\CacheClient();
 
-			$oDriver = null;
-			$sDriver = \strtoupper(\trim($this->oConfig->Get('cache', 'fast_cache_driver', 'files')));
-
-			switch (true) {
-				default:
-				case $bForceFile:
-					$oDriver = new \MailSo\Cache\Drivers\File(APP_PRIVATE_DATA . 'cache', $sKey);
-					break;
-
-				case ('APCU' === $sDriver) &&
-					\MailSo\Base\Utils::FunctionsExistAndEnabled(array(
-						'apcu_store', 'apcu_fetch', 'apcu_delete', 'apcu_clear_cache')):
-
-					$oDriver = new \MailSo\Cache\Drivers\APCU($sKey);
-					break;
-
-				case ('MEMCACHE' === $sDriver || 'MEMCACHED' === $sDriver) &&
-					(\class_exists('Memcache',false) || \class_exists('Memcached',false)):
-					$oDriver = new \MailSo\Cache\Drivers\Memcache(
-						$this->oConfig->Get('labs', 'fast_cache_memcache_host', '127.0.0.1'),
-						(int) $this->oConfig->Get('labs', 'fast_cache_memcache_port', 11211),
-						43200,
-						$sKey
-					);
-					break;
-
-				case 'REDIS' === $sDriver && \class_exists('Predis\Client'):
-					$oDriver = new \MailSo\Cache\Drivers\Redis(
-						$this->oConfig->Get('labs', 'fast_cache_redis_host', '127.0.0.1'),
-						(int) $this->oConfig->Get('labs', 'fast_cache_redis_port', 6379),
-						43200,
-						$sKey
-					);
-					break;
-			}
-
-			if ($oDriver) {
-				$this->aCachers[$sIndexKey]->SetDriver($oDriver);
+			$oDriver = $bForceFile ? null : $this->fabrica('cache');
+			if (!($oDriver instanceof \MailSo\Cache\DriverInterface)) {
+				$oDriver = new \MailSo\Cache\Drivers\File(
+					\trim($this->oConfig->Get('cache', 'path', '')) ?: APP_PRIVATE_DATA . 'cache'
+				);
 			}
+			$oDriver->setPrefix($sKey);
 
+			$this->aCachers[$sIndexKey]->SetDriver($oDriver);
 			$this->aCachers[$sIndexKey]->SetCacheIndex($this->oConfig->Get('cache', 'fast_cache_index', ''));
 		}
 
@@ -586,579 +502,349 @@ class Actions
 		return $this->oPlugins;
 	}
 
-	public function Logger(): \MailSo\Log\Logger
+	public function LoggerAuthHelper(?Model\Account $oAccount, string $sLogin = '', bool $admin = false): void
 	{
-		return $this->oLogger;
-	}
-
-	public function LoggerAuth(): \MailSo\Log\Logger
-	{
-		if (null === $this->oLoggerAuth) {
-			$this->oLoggerAuth = new \MailSo\Log\Logger(false);
-
-			if ($this->oConfig->Get('logs', 'auth_logging', false)) {
-				$sAuthLogFileFullPath = \APP_PRIVATE_DATA . 'logs/' . $this->compileLogFileName(
-						$this->oConfig->Get('logs', 'auth_logging_filename', ''));
-
-				$sLogFileDir = \dirname($sAuthLogFileFullPath);
-
-				if (!is_dir($sLogFileDir)) {
-					mkdir($sLogFileDir, 0755, true);
-				}
-
-				$this->oLoggerAuth
-					->AddForbiddenType(\MailSo\Log\Enumerations\Type::MEMORY)
-					->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME)
-					->AddForbiddenType(\MailSo\Log\Enumerations\Type::TIME_DELTA);
-
-				$oDriver = new \MailSo\Log\Drivers\File($sAuthLogFileFullPath);
-
-				$oDriver->DisableTimePrefix();
-				$oDriver->DisableGuidPrefix();
-				$oDriver->DisableTypedPrefix();
-
-				$this->oLoggerAuth->append($oDriver);
-			}
+		if ($sLogin) {
+			$sHost = $admin ? $this->Http()->GetHost(true, true) : \MailSo\Base\Utils::getEmailAddressDomain($sLogin);
+			$aAdditionalParams = array(
+				'{imap:login}' => $sLogin,
+				'{imap:host}' => $sHost,
+				'{smtp:login}' => $sLogin,
+				'{smtp:host}' => $sHost,
+				'{user:email}' => $sLogin,
+				'{user:login}' => $admin ? $sLogin : \MailSo\Base\Utils::getEmailAddressLocalPart($sLogin),
+				'{user:domain}' => $sHost,
+			);
+		} else {
+			$aAdditionalParams = array();
 		}
-
-		return $this->oLoggerAuth;
-	}
-
-	protected function LoggerAuthHelper(?Model\Account $oAccount = null, array $aAdditionalParams = array(), bool $admin = false): void
-	{
 		$sLine = $this->oConfig->Get('logs', 'auth_logging_format', '');
 		if (!empty($sLine)) {
-			$this->LoggerAuth()->Write($this->compileLogParams($sLine, $oAccount, false, $aAdditionalParams));
+			if (!$this->oLoggerAuth) {
+				$this->oLoggerAuth = new \MailSo\Log\Logger(false);
+				if ($this->oConfig->Get('logs', 'auth_logging', false)) {
+//					$this->oLoggerAuth->SetLevel(\LOG_WARNING);
+
+					$sAuthLogFileFullPath = (\trim($this->oConfig->Get('logs', 'path', '') ?: \APP_PRIVATE_DATA . 'logs'))
+						. '/' . $this->compileLogFileName($this->oConfig->Get('logs', 'auth_logging_filename', ''));
+					$sLogFileDir = \dirname($sAuthLogFileFullPath);
+					\is_dir($sLogFileDir) || \mkdir($sLogFileDir, 0755, true);
+					$this->oLoggerAuth->append(
+						(new \MailSo\Log\Drivers\File($sAuthLogFileFullPath))
+							->DisableTimePrefix()
+							->DisableGuidPrefix()
+							->DisableTypedPrefix()
+					);
+				}
+			}
+			$this->oLoggerAuth->Write($this->compileLogParams($sLine, $oAccount, $aAdditionalParams), \LOG_WARNING);
 		}
 		if (($this->oConfig->Get('logs', 'auth_logging', false) || $this->oConfig->Get('logs', 'auth_syslog', false))
 		 && \openlog('snappymail', 0, \LOG_AUTHPRIV)) {
 			\syslog(\LOG_ERR, $this->compileLogParams(
 				$admin ? 'Admin Auth failed: ip={request:ip} user={user:login}' : 'Auth failed: ip={request:ip} user={imap:login}',
-				$oAccount, false, $aAdditionalParams
+				$oAccount, $aAdditionalParams
 			));
 			\closelog();
 		}
 	}
 
-	public function AppDataSystem(bool $bAdmin = false): array
-	{
-		$oConfig = $this->oConfig;
-
-		$aAttachmentsActions = array();
-		if ($this->GetCapa(Enumerations\Capa::ATTACHMENTS_ACTIONS)) {
-			if (\class_exists('PharData') || \class_exists('ZipArchive')) {
-				$aAttachmentsActions[] = 'zip';
-			}
-		}
-
-		return \array_merge(array(
-			'version' => APP_VERSION,
-			'admin' => $bAdmin,
-			'webPath' => Utils::WebPath(),
-			'webVersionPath' => Utils::WebVersionPath(),
-			'token' => $oConfig->Get('security', 'csrf_protection', false) ? Utils::GetCsrfToken() : '',
-			'inIframe' => (bool)$oConfig->Get('labs', 'in_iframe', false),
-			'allowHtmlEditorBitiButtons' => (bool)$oConfig->Get('labs', 'allow_html_editor_biti_buttons', false),
-			'allowCtrlEnterOnCompose' => (bool)$oConfig->Get('labs', 'allow_ctrl_enter_on_compose', false),
-			'useImapThread' => (bool)$oConfig->Get('labs', 'use_imap_thread', false),
-			'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false),
-			'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50),
-			'faviconStatus' => (bool)$oConfig->Get('labs', 'favicon_status', true),
-			'listPermanentFiltered' => '' !== \trim($oConfig->Get('labs', 'imap_message_list_permanent_filter', '')),
-			'themes' => $this->GetThemes(),
-			'languages' => \SnappyMail\L10n::getLanguages(false),
-			'languagesAdmin' => \SnappyMail\L10n::getLanguages(true),
-			'attachmentsActions' => $aAttachmentsActions
-		), $bAdmin ? array(
-			'adminHostUse' => '' !== $oConfig->Get('security', 'admin_panel_host', ''),
-			'adminPath' => $oConfig->Get('security', 'admin_panel_key', '') ?: 'admin',
-			'adminAllowed' => (bool)$oConfig->Get('security', 'allow_admin_panel', true),
-		) : array(
-			'customLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
-		));
-	}
-
 	public function AppData(bool $bAdmin): array
 	{
 		$oAccount = null;
 		$oConfig = $this->oConfig;
 
-		/*
-		required by Index.html and rl.js:
-		PluginsLink
-		*/
-
-		$value = \ini_get('upload_max_filesize');
-		$upload_max_filesize = \intval($value);
-		switch (\strtoupper(\substr($value, -1))) {
-			case 'G': $upload_max_filesize *= 1024;
-			case 'M': $upload_max_filesize *= 1024;
-			case 'K': $upload_max_filesize *= 1024;
-		}
-
 		$aResult = array(
 			'Auth' => false,
-			'AccountHash' => '',
-			'AccountSignMe' => false,
-			'MailToEmail' => '',
-			'Email' => '',
-			'DevEmail' => '',
-			'DevPassword' => '',
-			'Title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
-			'LoadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
-			'FaviconUrl' => $oConfig->Get('webmail', 'favicon_url', ''),
-			'LoginDefaultDomain' => $oConfig->Get('login', 'default_domain', ''),
-			'hideSubmitButton' => (bool)$oConfig->Get('login', 'hide_submit_button', true),
-			'DetermineUserLanguage' => (bool)$oConfig->Get('login', 'determine_user_language', true),
-			'DetermineUserDomain' => (bool)$oConfig->Get('login', 'determine_user_domain', false),
-			'SieveAllowFileintoInbox' => (bool)$oConfig->Get('labs', 'sieve_allow_fileinto_inbox', false),
-			'ContactsIsAllowed' => false,
-			'Admin' => array(),
-			'Capa' => array(),
+			'title' => $oConfig->Get('webmail', 'title', 'SnappyMail Webmail'),
+			'loadingDescription' => $oConfig->Get('webmail', 'loading_description', 'SnappyMail'),
 			'Plugins' => array(),
-			'System' => $this->AppDataSystem($bAdmin),
-
-			'NewMoveToFolder' => (bool) $oConfig->Get('interface', 'new_move_to_folder_button', true),
-			'AllowLanguagesOnSettings' => (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true),
-			'AllowLanguagesOnLogin' => (bool) $oConfig->Get('login', 'allow_languages_on_login', true),
-			'AttachmentLimit' => \min($upload_max_filesize, ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024),
-			'SignMe' => (string) $oConfig->Get('login', 'sign_me_auto', Enumerations\SignMeType::DEFAULT_OFF),
-			'UseLocalProxyForExternalImages' => (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false),
-
-			// user
-			'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
-			'ShowImages' => (bool) $oConfig->Get('defaults', 'show_images', false),
-			'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
-			'MessagesPerPage' => (int) $oConfig->Get('webmail', 'messages_per_page', 25),
-			'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
-			'SoundNotification' => true,
-			'NotificationSound' => 'new-mail',
-			'DesktopNotifications' => true,
-			'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW),
-			'EditorDefaultType' => (string) $oConfig->Get('defaults', 'view_editor_type', ''),
-			'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),
-			'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
-			'UseThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),
-			'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
-			'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false),
-			'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true),
-			'HideUnsubscribed' => false,
-			'MainEmail' => '',
-			'InterfaceAnimation' => true,
-			'UserBackgroundName' => '',
-			'UserBackgroundHash' => ''
+			'System' => array(
+				'version' => APP_VERSION,
+				'token' => Utils::GetCsrfToken(),
+				'languages' => \SnappyMail\L10n::getLanguages(false),
+				'webPath' => \RainLoop\Utils::WebPath(),
+				'webVersionPath' => \RainLoop\Utils::WebVersionPath()
+			),
+			'allowLanguagesOnLogin' => (bool) $oConfig->Get('login', 'allow_languages_on_login', true)
 		);
 
-		$oSettings = null;
-
-		$passfile = APP_PRIVATE_DATA.'admin_password.txt';
-		$sPassword = $oConfig->Get('security', 'admin_password', '');
-		if (!$sPassword) {
-			$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
-			Utils::saveFile($passfile, $sPassword . "\n");
-//			\chmod($passfile, 0600);
-			$oConfig->SetPassword($sPassword);
-			$oConfig->Save();
-		}
-
-		$sLanguage = $oConfig->Get('webmail', 'language', 'en');
-		$UserLanguageRaw = $this->detectUserLanguage($bAdmin);
-
 		if ($bAdmin) {
-			$aResult['Auth'] = $this->IsAdminLoggined(false);
-			if ($aResult['Auth']) {
-				$aResult['AdminLogin'] = (string)$oConfig->Get('security', 'admin_login', '');
-				$aResult['AdminTOTP'] = (string)$oConfig->Get('security', 'admin_totp', '');
-				$aResult['UseTokenProtection'] = (bool)$oConfig->Get('security', 'csrf_protection', true);
-				$aResult['EnabledPlugins'] = (bool)$oConfig->Get('plugins', 'enable', false);
-
-				$aResult['VerifySslCertificate'] = (bool)$oConfig->Get('ssl', 'verify_certificate', false);
-				$aResult['AllowSelfSigned'] = (bool)$oConfig->Get('ssl', 'allow_self_signed', true);
-
-				$aResult['supportedPdoDrivers'] = \RainLoop\Common\PdoAbstract::getAvailableDrivers();
-
-				$aResult['ContactsEnable'] = (bool)$oConfig->Get('contacts', 'enable', false);
-				$aResult['ContactsSync'] = (bool)$oConfig->Get('contacts', 'allow_sync', false);
-				$aResult['ContactsPdoType'] = Providers\AddressBook\PdoAddressBook::validPdoType($this->oConfig->Get('contacts', 'type', 'sqlite'));
-				$aResult['ContactsPdoDsn'] = (string)$oConfig->Get('contacts', 'pdo_dsn', '');
-				$aResult['ContactsPdoType'] = (string)$oConfig->Get('contacts', 'type', '');
-				$aResult['ContactsPdoUser'] = (string)$oConfig->Get('contacts', 'pdo_user', '');
-				$aResult['ContactsPdoPassword'] = (string)APP_DUMMY;
-
-				$aResult['WeakPassword'] = \is_file($passfile);
-			}
-
-			$aResult['LanguageAdmin'] = $this->ValidateLanguage($oConfig->Get('webmail', 'language_admin', 'en'), '', true);
-			$aResult['UserLanguageAdmin'] = $this->ValidateLanguage($UserLanguageRaw, '', true, true);
+			ActionsAdmin::AdminAppData($this, $aResult);
 		} else {
 			$oAccount = $this->getAccountFromToken(false);
 			if ($oAccount) {
-				$aResult['Auth'] = true;
-				$aResult['Email'] = $oAccount->Email();
-				$aResult['IncLogin'] = $oAccount->IncLogin();
-				$aResult['OutLogin'] = $oAccount->OutLogin();
-				$aResult['AccountHash'] = $oAccount->Hash();
-				$aResult['AccountSignMe'] = isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]);
-				$aResult['ContactsIsAllowed'] = $this->AddressBookProvider($oAccount)->IsActive();
-				$aResult['ContactsSyncIsAllowed'] = (bool)$oConfig->Get('contacts', 'allow_sync', false);
-				$aResult['ContactsSyncInterval'] = (int)$oConfig->Get('contacts', 'sync_interval', 20);
+				$aResult = \array_merge(
+					$aResult,
+					[
+						'Auth' => true,
+						'accountSignMe' => isset($_COOKIE[self::AUTH_SIGN_ME_TOKEN_KEY]),
+						'allowSpellcheck' => $oConfig->Get('defaults', 'allow_spellcheck', false),
+						'ViewHTML' => (bool) $oConfig->Get('defaults', 'view_html', true),
+						'ViewImages' => $oConfig->Get('defaults', 'view_images', 'ask'),
+						'ViewImagesWhitelist' => '',
+						'RemoveColors' => (bool) $oConfig->Get('defaults', 'remove_colors', false),
+						'AllowStyles' => false,
+						'ListInlineAttachments' => false,
+						'CollapseBlockquotes' => $oConfig->Get('defaults', 'collapse_blockquotes', true),
+						'MaxBlockquotesLevel' => 0,
+						'minFontSize' => 5,
+						'simpleAttachmentsList' => false,
+						'listGrouped' => $oConfig->Get('defaults', 'mail_list_grouped', false),
+						'MessagesPerPage' => \max(10, \intval($oConfig->Get('webmail', 'messages_per_page', 25)) ?: 25),
+						'messageNewWindow' => false,
+						'markdown' => false,
+						'messageReadAuto' => true, // (bool) $oConfig->Get('webmail', 'message_read_auto', true),
+						'MessageReadDelay' => (int) $oConfig->Get('webmail', 'message_read_delay', 5),
+						'MsgDefaultAction' => (int) $oConfig->Get('defaults', 'msg_default_action', 1),
+						'SoundNotification' => true,
+						'NotificationSound' => 'new-mail',
+						'DesktopNotifications' => true,
+						'Layout' => (int) $oConfig->Get('defaults', 'view_layout', Enumerations\Layout::SIDE_PREVIEW),
+						'EditorDefaultType' => \str_replace('Forced', '', $oConfig->Get('defaults', 'view_editor_type', '')),
+						'editorWysiwyg' => 'Squire',
+						'UseCheckboxesInList' => (bool) $oConfig->Get('defaults', 'view_use_checkboxes', true),
+						'showNextMessage' => (bool) $oConfig->Get('defaults', 'view_show_next_message', false),
+						'AutoLogout' => (int) $oConfig->Get('defaults', 'autologout', 30),
+						'keyPassForget' => 15,
+						'AllowDraftAutosave' => (bool) $oConfig->Get('defaults', 'allow_draft_autosave', true),
+						'ContactsAutosave' => (bool) $oConfig->Get('defaults', 'contacts_autosave', true)
+					],
+					// MainAccount or AdditionalAccount
+					$this->getAccountData($oAccount)
+				);
 
-				$aResult['ContactsSyncMode'] = 0;
-				$aResult['ContactsSyncUrl'] = '';
-				$aResult['ContactsSyncUser'] = '';
-				$aResult['ContactsSyncPassword'] = '';
-
-				if ($aResult['ContactsIsAllowed'] && $aResult['ContactsSyncIsAllowed']) {
-					$mData = $this->getContactsSyncData($oAccount);
-					if (\is_array($mData)) {
-						$aResult['ContactsSyncMode'] = isset($mData['Mode']) ? $mData['Mode'] : 0;
-						$aResult['ContactsSyncUrl'] = isset($mData['Url']) ? \trim($mData['Url']) : '';
-						$aResult['ContactsSyncUser'] = isset($mData['User']) ? \trim($mData['User']) : '';
-						$aResult['ContactsSyncPassword'] = APP_DUMMY;
+				$aAttachmentsActions = array();
+				if ($this->GetCapa(Capa::ATTACHMENTS_ACTIONS)) {
+					if (\class_exists('PharData') || \class_exists('ZipArchive')) {
+						$aAttachmentsActions[] = 'zip';
 					}
 				}
+				$aResult['System'] = \array_merge(
+					$aResult['System'], array(
+						'allowAppendMessage' => (bool)$oConfig->Get('labs', 'allow_message_append', false),
+						'folderSpecLimit' => (int)$oConfig->Get('labs', 'folders_spec_limit', 50),
+						'listPermanentFiltered' => '' !== \trim($oConfig->Get('imap', 'message_list_permanent_filter', '')),
+						'attachmentsActions' => $aAttachmentsActions,
+						'customLogoutLink' => $oConfig->Get('labs', 'custom_logout_link', ''),
+					)
+				);
 
-				$sToken = Utils::GetCookie(self::AUTH_MAILTO_TOKEN_KEY, null);
+				if ($aResult['contactsAllowed'] && $oConfig->Get('contacts', 'allow_sync', false)) {
+					$aData = $this->getContactsSyncData($oAccount) ?: [
+						'Mode' => 0,
+						'Url' => '',
+						'User' => ''
+					];
+					$aData['Password'] = empty($aData['Password']) ? '' : static::APP_DUMMY;
+					$aData['Interval'] = \max(20, \min(320, (int) $oConfig->Get('contacts', 'sync_interval', 20)));
+					unset($aData['PasswordHMAC']);
+					$aResult['ContactsSync'] = $aData;
+				}
+
+				$sToken = \SnappyMail\Cookies::get(self::AUTH_MAILTO_TOKEN_KEY);
 				if (null !== $sToken) {
-					Utils::ClearCookie(self::AUTH_MAILTO_TOKEN_KEY);
+					\SnappyMail\Cookies::clear(self::AUTH_MAILTO_TOKEN_KEY);
 
 					$mMailToData = Utils::DecodeKeyValuesQ($sToken);
-					if (!empty($mMailToData['MailTo']) &&
-						'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) {
-						$aResult['MailToEmail'] = $mMailToData['To'];
+					if (!empty($mMailToData['MailTo']) && 'MailTo' === $mMailToData['MailTo'] && !empty($mMailToData['To'])) {
+						$aResult['mailToEmail'] = \SnappyMail\IDN::emailToUtf8($mMailToData['To']);
 					}
 				}
 
+				// MainAccount
 				$oSettings = $this->SettingsProvider()->Load($oAccount);
-
-				$aResult['MainEmail'] = \MailSo\Base\Utils::IdnToUtf8($this->getMainAccountFromToken()->Email());
-
-				$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
-
-				if ($oSettingsLocal instanceof Settings) {
-					$aResult['SentFolder'] = (string)$oSettingsLocal->GetConf('SentFolder', '');
-					$aResult['DraftsFolder'] = (string)$oSettingsLocal->GetConf('DraftFolder', '');
-					$aResult['SpamFolder'] = (string)$oSettingsLocal->GetConf('SpamFolder', '');
-					$aResult['TrashFolder'] = (string)$oSettingsLocal->GetConf('TrashFolder', '');
-					$aResult['ArchiveFolder'] = (string)$oSettingsLocal->GetConf('ArchiveFolder', '');
-					$aResult['HideUnsubscribed'] = (bool)$oSettingsLocal->GetConf('HideUnsubscribed', $aResult['HideUnsubscribed']);
-					$aResult['UseThreads'] = (bool)$oSettingsLocal->GetConf('UseThreads', $aResult['UseThreads']);
-					$aResult['ReplySameFolder'] = (bool)$oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
-				}
-
-				if ($oConfig->Get('login', 'determine_user_language', true)) {
-					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
-				}
-
 				if ($oSettings instanceof Settings) {
-					if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
-						$sLanguage = (string) $oSettings->GetConf('Language', $sLanguage);
+/*
+					foreach ($oSettings->toArray() as $key => $value) {
+						$aResult[\lcfirst($key)] = $value;
 					}
+*/
+					$aResult['hourCycle'] = $oSettings->GetConf('hourCycle', '');
+
 					if (!$oSettings->GetConf('MessagesPerPage')) {
 						$oSettings->SetConf('MessagesPerPage', $oSettings->GetConf('MPP', $aResult['MessagesPerPage']));
 					}
 
-					$aResult['EditorDefaultType'] = (string)$oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']);
+					$aResult['EditorDefaultType'] = \str_replace('Forced', '', $oSettings->GetConf('EditorDefaultType', $aResult['EditorDefaultType']));
+					$aResult['editorWysiwyg'] = $oSettings->GetConf('editorWysiwyg', $aResult['editorWysiwyg']);
+					$aResult['requestReadReceipt'] = (bool) $oSettings->GetConf('requestReadReceipt', false);
+					$aResult['requestDsn'] = (bool) $oSettings->GetConf('requestDsn', false);
+					$aResult['requireTLS'] = (bool) $oSettings->GetConf('requireTLS', false);
+					$aResult['pgpSign'] = (bool) $oSettings->GetConf('pgpSign', false);
+					$aResult['pgpEncrypt'] = (bool) $oSettings->GetConf('pgpEncrypt', false);
+					$aResult['allowSpellcheck'] = (bool) $oSettings->GetConf('allowSpellcheck', $aResult['allowSpellcheck']);
+//					$aResult['allowCtrlEnterOnCompose'] = (bool) $oSettings->GetConf('allowCtrlEnterOnCompose', true);
+
 					$aResult['ViewHTML'] = (bool)$oSettings->GetConf('ViewHTML', $aResult['ViewHTML']);
-					$aResult['ShowImages'] = (bool)$oSettings->GetConf('ShowImages', $aResult['ShowImages']);
+					$show_images = (bool) $oSettings->GetConf('ShowImages', false);
+					$aResult['ViewImages'] = $oSettings->GetConf('ViewImages', $show_images ? 'always' : $aResult['ViewImages']);
+					$aResult['ViewImagesWhitelist'] = $oSettings->GetConf('ViewImagesWhitelist', '');
 					$aResult['RemoveColors'] = (bool)$oSettings->GetConf('RemoveColors', $aResult['RemoveColors']);
+					$aResult['AllowStyles'] = (bool)$oSettings->GetConf('AllowStyles', $aResult['AllowStyles']);
+					$aResult['ListInlineAttachments'] = (bool)$oSettings->GetConf('ListInlineAttachments', $aResult['ListInlineAttachments']);
+					$aResult['CollapseBlockquotes'] = (bool)$oSettings->GetConf('CollapseBlockquotes', $aResult['CollapseBlockquotes']);
+					$aResult['MaxBlockquotesLevel'] = (int)$oSettings->GetConf('MaxBlockquotesLevel', $aResult['MaxBlockquotesLevel']);
+					$aResult['minFontSize'] = (int)$oSettings->GetConf('minFontSize', $aResult['minFontSize']);
+					$aResult['simpleAttachmentsList'] = (bool)$oSettings->GetConf('simpleAttachmentsList', $aResult['simpleAttachmentsList']);
+					$aResult['listGrouped'] = (bool)$oSettings->GetConf('listGrouped', $aResult['listGrouped']);
 					$aResult['ContactsAutosave'] = (bool)$oSettings->GetConf('ContactsAutosave', $aResult['ContactsAutosave']);
-					$aResult['MessagesPerPage'] = (int)$oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']);
+					$aResult['MessagesPerPage'] = \max(10, \intval($oSettings->GetConf('MessagesPerPage', $aResult['MessagesPerPage']) ?: $aResult['MessagesPerPage']));
+					$aResult['messageNewWindow'] = (bool)$oSettings->GetConf('messageNewWindow', $aResult['messageNewWindow']);
+					$aResult['markdown'] = (bool)$oSettings->GetConf('markdown', $aResult['markdown']);
+					$aResult['messageReadAuto'] = (int)$oSettings->GetConf('messageReadAuto', $aResult['messageReadAuto']);
 					$aResult['MessageReadDelay'] = (int)$oSettings->GetConf('MessageReadDelay', $aResult['MessageReadDelay']);
+					$aResult['MsgDefaultAction'] = (int)$oSettings->GetConf('MsgDefaultAction', $aResult['MsgDefaultAction']);
 					$aResult['SoundNotification'] = (bool)$oSettings->GetConf('SoundNotification', $aResult['SoundNotification']);
 					$aResult['NotificationSound'] = (string)$oSettings->GetConf('NotificationSound', $aResult['NotificationSound']);
 					$aResult['DesktopNotifications'] = (bool)$oSettings->GetConf('DesktopNotifications', $aResult['DesktopNotifications']);
 					$aResult['UseCheckboxesInList'] = (bool)$oSettings->GetConf('UseCheckboxesInList', $aResult['UseCheckboxesInList']);
+					$aResult['showNextMessage'] = (bool)$oSettings->GetConf('showNextMessage', $aResult['showNextMessage']);
 					$aResult['AllowDraftAutosave'] = (bool)$oSettings->GetConf('AllowDraftAutosave', $aResult['AllowDraftAutosave']);
 					$aResult['AutoLogout'] = (int)$oSettings->GetConf('AutoLogout', $aResult['AutoLogout']);
+					$aResult['keyPassForget'] = (int)$oSettings->GetConf('keyPassForget', $aResult['keyPassForget']);
 					$aResult['Layout'] = (int)$oSettings->GetConf('Layout', $aResult['Layout']);
+					$aResult['Resizer4Width'] = (int)$oSettings->GetConf('Resizer4Width', 0);
+					$aResult['Resizer5Width'] = (int)$oSettings->GetConf('Resizer5Width', 0);
+					$aResult['Resizer5Height'] = (int)$oSettings->GetConf('Resizer5Height', 0);
 
-					if (!$this->GetCapa(Enumerations\Capa::AUTOLOGOUT)) {
-						$aResult['AutoLogout'] = 0;
-					}
+					$aResult['fontSansSerif'] = $oSettings->GetConf('fontSansSerif', '');
+					$aResult['fontSerif'] = $oSettings->GetConf('fontSerif', '');
+					$aResult['fontMono'] = $oSettings->GetConf('fontMono', '');
 
-					if ($this->GetCapa(Enumerations\Capa::USER_BACKGROUND)) {
-						$aResult['UserBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', $aResult['UserBackgroundName']);
-						$aResult['UserBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', $aResult['UserBackgroundHash']);
+					if ($this->GetCapa(Capa::USER_BACKGROUND)) {
+						$aResult['userBackgroundName'] = (string)$oSettings->GetConf('UserBackgroundName', '');
+						$aResult['userBackgroundHash'] = (string)$oSettings->GetConf('UserBackgroundHash', '');
 					}
 				}
 
-				$aResult['NewMailSounds'] = [];
+				$aResult['newMailSounds'] = [];
 				foreach (\glob(APP_VERSION_ROOT_PATH.'static/sounds/*.mp3') as $file) {
-					$aResult['NewMailSounds'][] = \basename($file, '.mp3');
+					$aResult['newMailSounds'][] = \basename($file, '.mp3');
 				}
+//				foreach (\glob(APP_INDEX_ROOT_PATH.'notifications/*.mp3') as $file) {
+//					$aResult['newMailSounds'][] = 'custom@'.\basename($file, '.mp3');
+//				}
 			}
 			else {
-				if ($oConfig->Get('login', 'allow_languages_on_login', true) && $oConfig->Get('login', 'determine_user_language', true)) {
-					$sLanguage = $this->ValidateLanguage($UserLanguageRaw, $sLanguage, false);
-				}
-
-				if ('0.0.0' === APP_VERSION) {
+				if (SNAPPYMAIL_DEV) {
 					$aResult['DevEmail'] = $oConfig->Get('labs', 'dev_email', '');
 					$aResult['DevPassword'] = $oConfig->Get('labs', 'dev_password', '');
+				} else {
+					$aResult['DevEmail'] = '';
+					$aResult['DevPassword'] = '';
 				}
 
-				if (empty($aResult['AdditionalLoginError'])) {
-					$aResult['AdditionalLoginError'] = $this->GetSpecLogoutCustomMgsWithDeletion();
-				}
+				$aResult['signMe'] = [
+					SignMeType::DefaultOff => 0,
+					SignMeType::DefaultOn => 1,
+					SignMeType::Unused => 2
+				][(string) $oConfig->Get('login', 'sign_me_auto', SignMeType::DefaultOff)];
 			}
 		}
 
 		if ($aResult['Auth']) {
+			$aResult['proxyExternalImages'] = (bool)$oConfig->Get('labs', 'use_local_proxy_for_external_images', false);
+			$aResult['autoVerifySignatures'] = (bool)$oConfig->Get('security', 'auto_verify_signatures', false);
+			$aResult['allowLanguagesOnSettings'] = (bool) $oConfig->Get('webmail', 'allow_languages_on_settings', true);
+			$aResult['minRefreshInterval'] = (int) $oConfig->Get('webmail', 'min_refresh_interval', 5);
 			$aResult['Capa'] = $this->Capa($bAdmin, $oAccount);
-			$aResult['PhpUploadSizes'] = array(
-				'upload_max_filesize' => \ini_get('upload_max_filesize'),
+			$value = \ini_get('upload_max_filesize');
+			$upload_max_filesize = \intval($value);
+			switch (\strtoupper(\substr($value, -1))) {
+				case 'G': $upload_max_filesize *= 1024;
+				case 'M': $upload_max_filesize *= 1024;
+				case 'K': $upload_max_filesize *= 1024;
+			}
+			$aResult['attachmentLimit'] = \min($upload_max_filesize, ((int) $oConfig->Get('webmail', 'attachment_size_limit', 10)) * 1024 * 1024);
+			$aResult['phpUploadSizes'] = array(
+				'upload_max_filesize' => $value,
 				'post_max_size' => \ini_get('post_max_size')
 			);
+			$aResult['System']['themes'] = $this->GetThemes();
 		}
 
-		$sStaticCache = $this->StaticCache();
-
 		$aResult['Theme'] = $this->GetTheme($bAdmin);
 
-		$aResult['Language'] = $this->ValidateLanguage($sLanguage, '', false);
-		$aResult['UserLanguage'] = $this->ValidateLanguage($UserLanguageRaw, '', false, true);
+		$aResult['language'] = $this->GetLanguage();
+		$aResult['clientLanguage'] = $this->ValidateLanguage($this->detectClientLanguage($bAdmin), '', false, true);
 
 		$aResult['PluginsLink'] = $this->oPlugins->HaveJs($bAdmin)
-			? './?/Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $sStaticCache . '/'
+			? 'Plugins/0/' . ($bAdmin ? 'Admin' : 'User') . '/' . $this->etag($this->oPlugins->Hash()) . '/'
 			: '';
 
-		$bAppJsDebug = $this->oConfig->Get('labs', 'use_app_debug_js', false);
+		$bAppJsDebug = $this->oConfig->Get('debug', 'javascript', false)
+			|| $this->oConfig->Get('debug', 'enable', false);
 
-		$aResult['StaticLibsJs'] = $this->StaticPath('js/' . ($bAppJsDebug ? '' : 'min/') .
+		$aResult['StaticLibsJs'] = Utils::WebStaticPath('js/' . ($bAppJsDebug ? '' : 'min/') .
 			'libs' . ($bAppJsDebug ? '' : '.min') . '.js');
 
-		$aResult['EditorDefaultType'] = \in_array($aResult['EditorDefaultType'], array('Plain', 'Html', 'HtmlForced', 'PlainForced'))
-			? $aResult['EditorDefaultType'] : 'Plain';
-
-		// IDN
-		$aResult['Email'] = \MailSo\Base\Utils::IdnToUtf8($aResult['Email']);
-		$aResult['MailToEmail'] = \MailSo\Base\Utils::IdnToUtf8($aResult['MailToEmail']);
-
 		$this->oPlugins->InitAppData($bAdmin, $aResult, $oAccount);
 
 		return $aResult;
 	}
 
-	protected function requestSleep(int $iDelay = 1): void
-	{
-		$time = \microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];
-		if ($iDelay > $time) {
-			\usleep(($iDelay - $time) * 1000000);
-		}
-	}
-
 	protected function loginErrorDelay(): void
 	{
-		$iDelay = (int)$this->oConfig->Get('labs', 'login_fault_delay', 0);
+		$iDelay = (int) $this->oConfig->Get('login', 'fault_delay', 0);
 		if (0 < $iDelay) {
-			$this->requestSleep($iDelay);
+			$seconds = $iDelay - (\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']);
+			if (0 < $seconds) {
+				\usleep(\intval($seconds * 1000000));
+			}
 		}
 	}
 
-	protected function getAdditionalLogParamsByUserLogin(string $sLogin, bool $bAdmin = false): array
-	{
-		$sHost = $bAdmin ? $this->Http()->GetHost(false, true, true) : \MailSo\Base\Utils::GetDomainFromEmail($sLogin);
-		return array(
-			'{imap:login}' => $sLogin,
-			'{imap:host}' => $sHost,
-			'{smtp:login}' => $sLogin,
-			'{smtp:host}' => $sHost,
-			'{user:email}' => $sLogin,
-			'{user:login}' => $bAdmin ? $sLogin : \MailSo\Base\Utils::GetAccountNameFromEmail($sLogin),
-			'{user:domain}' => $sHost,
-		);
-	}
-
 	public function DoPing(): array
 	{
-		return $this->DefaultResponse(__FUNCTION__, 'Pong');
+		return $this->DefaultResponse('Pong');
 	}
 
 	public function DoVersion(): array
 	{
-		return $this->DefaultResponse(__FUNCTION__,
-			APP_VERSION === (string)$this->GetActionParam('Version', ''));
+		return $this->DefaultResponse(APP_VERSION === (string)$this->GetActionParam('version', ''));
 	}
 
-	public function MainClearFileName(string $sFileName, string $sContentType, string $sMimeIndex, int $iMaxLength = 250): string
-	{
-		$sFileName = !\strlen($sFileName) ? \preg_replace('/[^a-zA-Z0-9]/', '.', (empty($sMimeIndex) ? '' : $sMimeIndex . '.') . $sContentType) : $sFileName;
-		$sClearedFileName = \MailSo\Base\Utils::StripSpaces(\preg_replace('/[\.]+/', '.', $sFileName));
-		$sExt = \MailSo\Base\Utils::GetFileExtension($sClearedFileName);
-
-		if (10 < $iMaxLength && $iMaxLength < \strlen($sClearedFileName) - \strlen($sExt)) {
-			$sClearedFileName = \substr($sClearedFileName, 0, $iMaxLength) . (empty($sExt) ? '' : '.' . $sExt);
-		}
-
-		return \MailSo\Base\Utils::ClearFileName(\MailSo\Base\Utils::Utf8Clear($sClearedFileName));
-	}
-
-	protected function getUploadErrorMessageByCode(int $iError, int &$iClientError): string
-	{
-		$sError = '';
-		$iClientError = UploadError::NORMAL;
-		switch ($iError) {
-			case UPLOAD_ERR_OK:
-				break;
-			case UPLOAD_ERR_INI_SIZE:
-			case UPLOAD_ERR_FORM_SIZE:
-			case UploadError::CONFIG_SIZE:
-			case UploadError::EMPTY_FILES_DATA:
-				$sError = 'File is too big';
-				$iClientError = UploadError::FILE_IS_TOO_BIG;
-				break;
-			case UPLOAD_ERR_PARTIAL:
-				$sError = 'File partially uploaded';
-				$iClientError = UploadError::FILE_PARTIALLY_UPLOADED;
-				break;
-			case UPLOAD_ERR_NO_FILE:
-				$sError = 'No file uploaded';
-				$iClientError = UploadError::FILE_NO_UPLOADED;
-				break;
-			case UPLOAD_ERR_NO_TMP_DIR:
-			case UPLOAD_ERR_CANT_WRITE:
-			case UPLOAD_ERR_EXTENSION:
-				$sError = 'Missing temp folder';
-				$iClientError = UploadError::MISSING_TEMP_FOLDER;
-				break;
-			case UploadError::ON_SAVING:
-				$sError = 'Error on saving file';
-				$iClientError = UploadError::FILE_ON_SAVING_ERROR;
-				break;
-			case UploadError::FILE_TYPE:
-				$sError = 'Invalid file type';
-				$iClientError = UploadError::FILE_TYPE;
-				break;
-			case UploadError::UNKNOWN:
-			default:
-				$sError = 'Unknown error';
-				$iClientError = UploadError::UNKNOWN;
-				break;
-		}
-
-		return $sError;
-	}
-
-	public function Upload(): array
+	public function Upload(?array $aFile, int $iError): array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		$aResponse = array();
 
-		$aFile = $this->GetActionParam('File', null);
-		$iError = $this->GetActionParam('Error', Enumerations\UploadError::UNKNOWN);
-
 		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
 			$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name']);
+
+			// Detect content-type
+			$type = \SnappyMail\File\MimeType::fromFile($aFile['tmp_name'], $aFile['name'])
+				?: \SnappyMail\File\MimeType::fromFilename($aFile['name']);
+			if ($type) {
+				$aFile['type'] = $type;
+				$sSavedName .= \SnappyMail\File\MimeType::toExtension($type);
+			}
+
 			if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
 				$iError = Enumerations\UploadError::ON_SAVING;
 			} else {
-				$sUploadName = $aFile['name'];
-				$iSize = $aFile['size'];
-				$sMimeType = $aFile['type'];
-
 				$aResponse['Attachment'] = array(
-					'Name' => $sUploadName,
-					'TempName' => $sSavedName,
-					'MimeType' => $sMimeType,
-					'Size' => (int)$iSize
+					'name' => $aFile['name'],
+					'tempName' => $sSavedName,
+					'mimeType' => $aFile['type'],
+					'size' => (int) $aFile['size']
 				);
 			}
 		}
 
 		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
+			$iClientError = 0;
+			$sError = Enumerations\UploadError::getUserMessage($iError, $iClientError);
 
 			if (!empty($sError)) {
-				$aResponse['ErrorCode'] = $iClientError;
+				$aResponse['code'] = $iClientError;
 				$aResponse['Error'] = $sError;
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $aResponse);
-	}
-
-	public function UploadBackground(): array
-	{
-		$oAccount = $this->getAccountFromToken();
-
-		if (!$this->GetCapa(Enumerations\Capa::USER_BACKGROUND)) {
-			return $this->FalseResponse(__FUNCTION__);
-		}
-
-		$sName = '';
-		$sHash = '';
-
-		$aFile = $this->GetActionParam('File', null);
-		$iError = $this->GetActionParam('Error', Enumerations\UploadError::UNKNOWN);
-
-		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
-			$sMimeType = \strtolower(\MailSo\Base\Utils::MimeContentType($aFile['name']));
-			if (\in_array($sMimeType, array('image/png', 'image/jpg', 'image/jpeg'))) {
-				$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name']);
-				if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
-					$iError = Enumerations\UploadError::ON_SAVING;
-				} else {
-					$rData = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
-					if (\is_resource($rData)) {
-						$sData = \stream_get_contents($rData);
-						if (!empty($sData) && \strlen($sData)) {
-							$sName = $aFile['name'];
-							if (empty($sName)) {
-								$sName = '_';
-							}
-
-							if ($this->StorageProvider()->Put($oAccount,
-								Providers\Storage\Enumerations\StorageType::CONFIG,
-								'background',
-								\json_encode(array(
-									'Name' => $aFile['name'],
-									'ContentType' => $sMimeType,
-									'Raw' => \base64_encode($sData)
-								))
-							)) {
-								$oSettings = $this->SettingsProvider()->Load($oAccount);
-								if ($oSettings) {
-									$sHash = \MailSo\Base\Utils::Sha1Rand($sName . APP_VERSION . APP_SALT);
-
-									$oSettings->SetConf('UserBackgroundName', $sName);
-									$oSettings->SetConf('UserBackgroundHash', $sHash);
-									$this->SettingsProvider()->Save($oAccount, $oSettings);
-								}
-							}
-						}
-
-						unset($sData);
-					}
-
-					if (\is_resource($rData)) {
-						\fclose($rData);
-					}
-
-					unset($rData);
-				}
-
-				$this->FilesProvider()->Clear($oAccount, $sSavedName);
-			} else {
-				$iError = Enumerations\UploadError::FILE_TYPE;
-			}
-		}
-
-		if (UPLOAD_ERR_OK !== $iError) {
-			$iClientError = Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
-
-			if (!empty($sError)) {
-				return $this->FalseResponse(__FUNCTION__, $iClientError, $sError);
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, !empty($sName) && !empty($sHash) ? array(
-			'Name' => $sName,
-			'Hash' => $sHash
-		) : false);
+		return $this->DefaultResponse($aResponse);
 	}
 
 	public function Capa(bool $bAdmin, ?Model\Account $oAccount = null): array
@@ -1167,27 +853,26 @@ class Actions
 		if (!$aResult) {
 			$oConfig = $this->oConfig;
 			$aResult = array(
-				'AutoLogout' => true,
-				'AdditionalAccounts'   => (bool) $oConfig->Get('webmail', 'allow_additional_accounts', false),
-				'AttachmentThumbnails' => (bool) $oConfig->Get('interface', 'show_attachment_thumbnail', true),
-				'AttachmentsActions'   => (bool) $oConfig->Get('capa', 'attachments_actions', false),
-				'Contacts'             => (bool) $oConfig->Get('capa', 'contacts', true),
-				'DangerousActions'     => (bool) $oConfig->Get('capa', 'dangerous_actions', true),
-				'GnuPG'                => (bool) $oConfig->Get('security', 'openpgp', false) && \SnappyMail\PGP\GnuPG::isSupported(),
-				'Identities'           => (bool) $oConfig->Get('webmail', 'allow_additional_identities', false),
-				'Kolab'                => (bool) $oConfig->Get('labs', 'kolab_enabled', false),
-				'MessageActions'       => (bool) $oConfig->Get('capa', 'message_actions', true),
-				'OpenPGP'              => (bool) $oConfig->Get('security', 'openpgp', false),
-				'Prefetch'             => (bool) $oConfig->Get('labs', 'allow_prefetch', false),
-				'Quota'                => (bool) $oConfig->Get('capa', 'quota', true),
-				'Search'               => (bool) $oConfig->Get('capa', 'search', true),
-				'SearchAdv'            => (bool) $oConfig->Get('capa', 'search', true) && $oConfig->Get('capa', 'search_adv', true),
-				'Sieve'                => false,
-				'Themes'               => (bool) $oConfig->Get('webmail', 'allow_themes', false),
-				'UserBackground'       => (bool) $oConfig->Get('webmail', 'allow_user_background', false)
+				Capa::ADDITIONAL_ACCOUNTS   => (bool) $oConfig->Get('webmail', 'allow_additional_accounts', false),
+				Capa::ATTACHMENT_THUMBNAILS => (bool) $oConfig->Get('interface', 'show_attachment_thumbnail', true)
+					&& ($bAdmin
+						|| \extension_loaded('gd')
+						|| \extension_loaded('gmagick')
+						|| \extension_loaded('imagick')
+					),
+				Capa::ATTACHMENTS_ACTIONS => (bool) $oConfig->Get('capa', 'attachments_actions', false),
+				Capa::CONTACTS            => (bool) $oConfig->Get('contacts', 'enable', false),
+				Capa::DANGEROUS_ACTIONS   => (bool) $oConfig->Get('capa', 'dangerous_actions', true),
+				Capa::GNUPG               => (bool) $oConfig->Get('security', 'gnupg', true) && \SnappyMail\PGP\GnuPG::isSupported(),
+				Capa::IDENTITIES          => (bool) $oConfig->Get('webmail', 'allow_additional_identities', false),
+				Capa::OPENPGP             => (bool) $oConfig->Get('security', 'openpgp', true),
+				Capa::SIEVE               => false,
+				Capa::THEMES              => (bool) $oConfig->Get('webmail', 'allow_themes', false),
+				Capa::USER_BACKGROUND     => (bool) $oConfig->Get('webmail', 'allow_user_background', false),
+				'Kolab'                   => false, // See Kolab plugin
 			);
 		}
-		$aResult['Sieve'] = $bAdmin || ($oAccount && $oAccount->Domain()->UseSieve());
+		$aResult[Capa::SIEVE] = $bAdmin || ($oAccount && $oAccount->Domain()->SieveSettings()->enabled);
 		return $aResult;
 	}
 
@@ -1198,36 +883,29 @@ class Actions
 
 	public function etag(string $sKey): string
 	{
-		return \md5('Etag:' . \md5($sKey . \md5($this->oConfig->Get('cache', 'index', ''))));
+//		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
+		return \md5($sKey . $this->oConfig->Get('cache', 'index', '') . APP_VERSION);
 	}
 
-	public function cacheByKey(string $sKey, bool $bForce = false): bool
+	public function cacheByKey(string $sKey): bool
 	{
-		$bResult = false;
-		if (!empty($sKey) && ($bForce || ($this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)))) {
-			$iExpires = $this->oConfig->Get('cache', 'http_expires', 3600);
-			if (0 < $iExpires) {
-				$this->Http()->ServerUseCache($this->etag($sKey), 1382478804, \time() + $iExpires);
-				$bResult = true;
-			}
+		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
+			\MailSo\Base\Http::ServerUseCache(
+				$this->etag($sKey),
+				0, // issue with messages
+				$this->oConfig->Get('cache', 'http_expires', 3600)
+			);
+			return true;
 		}
-
-		if (!$bResult) {
-			$this->Http()->ServerNoCache();
-		}
-
-		return $bResult;
+		$this->Http()->ServerNoCache();
+		return false;
 	}
 
-	public function verifyCacheByKey(string $sKey, bool $bForce = false): void
+	public function verifyCacheByKey(string $sKey): void
 	{
-		if (!empty($sKey) && ($bForce || $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true))) {
-			$sIfNoneMatch = $this->Http()->GetHeader('If-None-Match', '');
-			if ($this->etag($sKey) === $sIfNoneMatch) {
-				\MailSo\Base\Http::StatusHeader(304);
-				$this->cacheByKey($sKey);
-				exit(0);
-			}
+		if ($sKey && $this->oConfig->Get('cache', 'enable', true) && $this->oConfig->Get('cache', 'http', true)) {
+			\MailSo\Base\Http::checkETag($this->etag($sKey));
+//			\MailSo\Base\Http::checkLastModified(0);
 		}
 	}
 
@@ -1236,37 +914,36 @@ class Actions
 	 */
 	protected function initMailClientConnection(): ?Model\Account
 	{
-		$oAccount = null;
-
-		if (!$this->MailClient()->IsLoggined()) {
-			$oAccount = $this->getAccountFromToken();
+		$oAccount = $this->getAccountFromToken();
 
+		if ($oAccount && !$this->ImapClient()->IsLoggined()) {
 			try {
-				$oAccount->IncConnectAndLoginHelper($this->oPlugins, $this->MailClient(), $this->oConfig);
+				$oAccount->ImapConnectAndLogin($this->oPlugins, $this->ImapClient(), $this->oConfig);
 			} catch (\MailSo\Net\Exceptions\ConnectionException $oException) {
 				throw new Exceptions\ClientException(Notifications::ConnectionError, $oException);
 			} catch (\Throwable $oException) {
 				throw new Exceptions\ClientException(Notifications::AuthError, $oException);
 			}
-
-			$this->MailClient()->ImapClient()->__FORCE_SELECT_ON_EXAMINE__ = !!$this->oConfig->Get('labs', 'use_imap_force_selection');
 		}
 
 		return $oAccount;
 	}
 
-	protected function getDecodedRawKeyValue(string $sRawKey): array
+	public function encodeRawKey(array $aValues): string
 	{
-		return empty($sRawKey) ? array() : Utils::DecodeKeyValuesQ($sRawKey);
+		$aValues['accountHash'] = $this->getAccountFromToken()->Hash();
+		return \MailSo\Base\Utils::UrlSafeBase64Encode(\json_encode($aValues));
 	}
 
-	public function StaticCache(): string
+	public function decodeRawKey(string $sRawKey): array
 	{
-		static $sCache = null;
-		if (!$sCache) {
-			$sCache = \md5(APP_VERSION . $this->oPlugins->Hash());
+		return empty($sRawKey) ? []
+			: (\json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true) ?: []);
+/*
+		if (empty($aValues['accountHash']) || $aValues['accountHash'] !== $oAccount->Hash()) {
+			return [];
 		}
-		return $sCache;
+*/
 	}
 
 	public function SetActionParams(array $aCurrentActionParams, string $sMethodName = ''): self
@@ -1278,12 +955,7 @@ class Actions
 		return $this;
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	public function GetActionParam(string $sKey, $mDefault = null)
+	public function GetActionParam(string $sKey, mixed $mDefault = null): mixed
 	{
 		return isset($this->aCurrentActionParams[$sKey]) ?
 			$this->aCurrentActionParams[$sKey] : $mDefault;
@@ -1299,15 +971,10 @@ class Actions
 		return isset($this->aCurrentActionParams[$sKey]);
 	}
 
-	public function Location(string $sUrl): void
+	public function Location(string $sUrl, int $iStatus = 302): void
 	{
-		$this->oLogger->Write('Location: ' . $sUrl);
-		\header('Location: ' . $sUrl);
-	}
-
-	public function StaticPath(string $sPath): string
-	{
-		return Utils::WebStaticPath() . $sPath;
+		$this->logWrite("{$iStatus} Location: {$sUrl}");
+		\MailSo\Base\Http::Location($sUrl, $iStatus);
 	}
 
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
index 5f4628b48..4e78236e9 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Accounts.php
@@ -12,13 +12,11 @@ use RainLoop\Notifications;
 use RainLoop\Providers\Identities;
 use RainLoop\Providers\Storage\Enumerations\StorageType;
 use RainLoop\Utils;
+use SnappyMail\IDN;
 
 trait Accounts
 {
-	/**
-	 * @var RainLoop\Providers\Identities
-	 */
-	private $oIdentitiesProvider;
+	private ?\RainLoop\Providers\Identities $oIdentitiesProvider = null;
 
 	protected function GetMainEmail(Account $oAccount)
 	{
@@ -41,7 +39,8 @@ trait Accounts
 				StorageType::CONFIG,
 				'additionalaccounts'
 			);
-			$aAccounts = $sAccounts ? \json_decode($sAccounts, true) : \SnappyMail\Upgrade::ConvertInsecureAccounts($this, $oAccount);
+			$aAccounts = $sAccounts ? \json_decode($sAccounts, true)
+				: \SnappyMail\Upgrade::ConvertInsecureAccounts($this, $oAccount);
 			if ($aAccounts && \is_array($aAccounts)) {
 				return $aAccounts;
 			}
@@ -70,50 +69,115 @@ trait Accounts
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * Add/Edit additional account
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAccountSetup(): array
 	{
-		$oMainAccount = $this->getMainAccountFromToken();
-
 		if (!$this->GetCapa(Capa::ADDITIONAL_ACCOUNTS)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
+		$oMainAccount = $this->getMainAccountFromToken();
 		$aAccounts = $this->GetAccounts($oMainAccount);
 
-		$sEmail = \trim($this->GetActionParam('Email', ''));
-		$sPassword = $this->GetActionParam('Password', '');
-		$bNew = '1' === (string)$this->GetActionParam('New', '1');
+		$sEmail = \trim($this->GetActionParam('email', ''));
+		$oPassword = new \SnappyMail\SensitiveString($this->GetActionParam('password', ''));
+		$bNew = !empty($this->GetActionParam('new', 1));
 
-		$sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true);
-		if ($bNew && ($oMainAccount->Email() === $sEmail || isset($aAccounts[$sEmail]))) {
-			throw new ClientException(Notifications::AccountAlreadyExists);
-		} else if (!$bNew && !isset($aAccounts[$sEmail])) {
+		if ($bNew || \strlen($oPassword)) {
+			$oNewAccount = $this->LoginProcess($sEmail, $oPassword, false);
+			$sEmail = $oNewAccount->Email();
+			$aAccount = $oNewAccount->asTokenArray($oMainAccount);
+		} else {
+			$aAccount = \RainLoop\Model\AdditionalAccount::convertArray($aAccounts[$sEmail]);
+		}
+
+		if ($bNew) {
+			if ($oMainAccount->Email() === $sEmail || isset($aAccounts[$sEmail])) {
+				throw new ClientException(Notifications::AccountAlreadyExists);
+			}
+		} else if (!isset($aAccounts[$sEmail])) {
 			throw new ClientException(Notifications::AccountDoesNotExist);
 		}
 
-		$oNewAccount = $this->LoginProcess($sEmail, $sPassword, false, false);
+		$aAccounts[$sEmail] = $aAccount;
 
-		$aAccounts[$oNewAccount->Email()] = $oNewAccount->asTokenArray($oMainAccount);
-		$this->SetAccounts($oMainAccount, $aAccounts);
+		if ($aAccounts[$sEmail]) {
+			$aAccounts[$sEmail]['name'] = \trim($this->GetActionParam('name', ''));
+			$this->SetAccounts($oMainAccount, $aAccounts);
+		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
+	}
+
+	protected function loadAdditionalAccountImapClient(string $sEmail): \MailSo\Imap\ImapClient
+	{
+		$sEmail = IDN::emailToAscii($sEmail);
+		if (!\strlen($sEmail)) {
+			throw new ClientException(Notifications::AccountDoesNotExist);
+		}
+
+		$oMainAccount = $this->getMainAccountFromToken();
+		$aAccounts = $this->GetAccounts($oMainAccount);
+		if (!isset($aAccounts[$sEmail])) {
+			throw new ClientException(Notifications::AccountDoesNotExist);
+		}
+		$oAccount = AdditionalAccount::NewInstanceFromTokenArray($this, $aAccounts[$sEmail]);
+		if (!$oAccount) {
+			throw new ClientException(Notifications::AccountDoesNotExist);
+		}
+
+		$oImapClient = new \MailSo\Imap\ImapClient;
+		$oImapClient->SetLogger($this->Logger());
+		$this->imapConnect($oAccount, false, $oImapClient);
+		return $oImapClient;
+	}
+
+	public function DoAccountUnread(): array
+	{
+		$oImapClient = $this->loadAdditionalAccountImapClient($this->GetActionParam('email', ''));
+		$oInfo = $oImapClient->FolderStatus('INBOX');
+		return $this->DefaultResponse([
+			'unreadEmails' => \max(0, $oInfo->UNSEEN)
+		]);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * Imports all mail from AdditionalAccount into MainAccount
+	 */
+	public function DoAccountImport(): array
+	{
+		$sEmail = $this->GetActionParam('email', '');
+		$oImapSource = $this->loadAdditionalAccountImapClient($sEmail);
+
+		$oMainAccount = $this->getMainAccountFromToken();
+		$oImapTarget = new \MailSo\Imap\ImapClient;
+		$oImapTarget->SetLogger($this->Logger());
+		$this->imapConnect($oMainAccount, false, $oImapTarget);
+
+		$oSync = new \SnappyMail\Imap\Sync;
+		$oSync->oImapSource = $oImapSource;
+		$oSync->oImapTarget = $oImapTarget;
+
+		$rootfolder = $this->GetActionParam('rootfolder', '') ?: $sEmail;
+		$oSync->import($rootfolder);
+		exit;
+	}
+
+	/**
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAccountDelete(): array
 	{
 		$oMainAccount = $this->getMainAccountFromToken();
 
 		if (!$this->GetCapa(Capa::ADDITIONAL_ACCOUNTS)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
-		$sEmailToDelete = \trim($this->GetActionParam('EmailToDelete', ''));
-		$sEmailToDelete = \MailSo\Base\Utils::IdnToAscii($sEmailToDelete, true);
+		$sEmailToDelete = \trim($this->GetActionParam('emailToDelete', ''));
+		$sEmailToDelete = IDN::emailToAscii($sEmailToDelete);
 
 		$aAccounts = $this->GetAccounts($oMainAccount);
 
@@ -121,54 +185,84 @@ trait Accounts
 			$bReload = false;
 			$oAccount = $this->getAccountFromToken();
 			if ($oAccount instanceof AdditionalAccount && $oAccount->Email() === $sEmailToDelete) {
-				Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
+//				$this->SetAdditionalAuthToken(null);
+				\SnappyMail\Cookies::clear(self::AUTH_ADDITIONAL_TOKEN_KEY);
 				$bReload = true;
 			}
 
 			unset($aAccounts[$sEmailToDelete]);
 			$this->SetAccounts($oMainAccount, $aAccounts);
 
-			return $this->TrueResponse(__FUNCTION__, array('Reload' => $bReload));
+			return $this->TrueResponse(array('Reload' => $bReload));
 		}
 
-		return $this->FalseResponse(__FUNCTION__);
+		return $this->FalseResponse();
+	}
+
+	public function getAccountData(Account $oAccount): array
+	{
+		$oConfig = $this->Config();
+		$minRefreshInterval = (int) $oConfig->Get('webmail', 'min_refresh_interval', 5);
+		$aResult = [
+//			'Email' => IDN::emailToUtf8($oAccount->Email()),
+			'Email' => $oAccount->Email(),
+			'accountHash' => $oAccount->Hash(),
+			'mainEmail' => \RainLoop\Api::Actions()->getMainAccountFromToken()->Email(),
+			'contactsAllowed' => $this->AddressBookProvider($oAccount)->IsActive(),
+			'HideUnsubscribed' => false,
+			'defaultSort' => '',
+			'useThreads' => (bool) $oConfig->Get('defaults', 'mail_use_threads', false),
+			'threadAlgorithm' => '',
+			'ReplySameFolder' => (bool) $oConfig->Get('defaults', 'mail_reply_same_folder', false),
+			'HideDeleted' => true,
+			'ShowUnreadCount' => false,
+			'UnhideKolabFolders' => false,
+			'CheckMailInterval' => \max(15, $minRefreshInterval)
+		];
+		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+		if ($oSettingsLocal instanceof \RainLoop\Settings) {
+			$aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', '');
+			$aResult['DraftsFolder'] = (string) $oSettingsLocal->GetConf('DraftsFolder', '');
+			$aResult['JunkFolder'] = (string) $oSettingsLocal->GetConf('JunkFolder', '');
+			$aResult['TrashFolder'] = (string) $oSettingsLocal->GetConf('TrashFolder', '');
+			$aResult['ArchiveFolder'] = (string) $oSettingsLocal->GetConf('ArchiveFolder', '');
+			$aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $aResult['HideUnsubscribed']);
+			$aResult['defaultSort'] = (string) $oSettingsLocal->GetConf('defaultSort', $aResult['defaultSort']);
+			$aResult['useThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $aResult['useThreads']);
+			$aResult['threadAlgorithm'] = (string) $oSettingsLocal->GetConf('threadAlgorithm', $aResult['threadAlgorithm']);
+			$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $aResult['ReplySameFolder']);
+			$aResult['HideDeleted'] = (bool)$oSettingsLocal->GetConf('HideDeleted', $aResult['HideDeleted']);
+			$aResult['ShowUnreadCount'] = (bool)$oSettingsLocal->GetConf('ShowUnreadCount', $aResult['ShowUnreadCount']);
+			$aResult['UnhideKolabFolders'] = (bool)$oSettingsLocal->GetConf('UnhideKolabFolders', $aResult['UnhideKolabFolders']);
+			$aResult['CheckMailInterval'] = \max((int) $oSettingsLocal->GetConf('CheckMailInterval', $aResult['CheckMailInterval']), $minRefreshInterval);
+/*
+			foreach ($oSettingsLocal->toArray() as $key => $value) {
+				$aResult[\lcfirst($key)] = $value;
+			}
+			$aResult['junkFolder'] = $aResult['spamFolder'];
+			unset($aResult['checkableFolder']);
+			unset($aResult['theme']);
+*/
+		}
+		return $aResult;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAccountSwitch(): array
 	{
 		if ($this->switchAccount(\trim($this->GetActionParam('Email', '')))) {
 			$oAccount = $this->getAccountFromToken();
-			$aResult['Email'] = $oAccount->Email();
-			$aResult['IncLogin'] = $oAccount->IncLogin();
-			$aResult['OutLogin'] = $oAccount->OutLogin();
-			$aResult['AccountHash'] = $oAccount->Hash();
-			$aResult['MainEmail'] = ($oAccount instanceof AdditionalAccount)
-				? $oAccount->ParentEmail() : '';
-			$aResult['ContactsIsAllowed'] = $this->AddressBookProvider($oAccount)->IsActive();
-			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
-			if ($oSettingsLocal instanceof \RainLoop\Settings) {
-				$oConfig = $this->Config();
-				$aResult['SentFolder'] = (string) $oSettingsLocal->GetConf('SentFolder', '');
-				$aResult['DraftsFolder'] = (string) $oSettingsLocal->GetConf('DraftFolder', '');
-				$aResult['SpamFolder'] = (string) $oSettingsLocal->GetConf('SpamFolder', '');
-				$aResult['TrashFolder'] = (string) $oSettingsLocal->GetConf('TrashFolder', '');
-				$aResult['ArchiveFolder'] = (string) $oSettingsLocal->GetConf('ArchiveFolder', '');
-				$aResult['HideUnsubscribed'] = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', false);
-				$aResult['UseThreads'] = (bool) $oSettingsLocal->GetConf('UseThreads', $oConfig->Get('defaults', 'mail_use_threads', false));
-				$aResult['ReplySameFolder'] = (bool) $oSettingsLocal->GetConf('ReplySameFolder', $oConfig->Get('defaults', 'mail_reply_same_folder', false));
-			}
+			$aResult = $this->getAccountData($oAccount);
 //			$this->Plugins()->InitAppData($bAdmin, $aResult, $oAccount);
-
-			return $this->DefaultResponse(__FUNCTION__, $aResult);
+			return $this->DefaultResponse($aResult);
 		}
-		return $this->FalseResponse(__FUNCTION__);
+		return $this->FalseResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoIdentityUpdate(): array
 	{
@@ -178,33 +272,37 @@ trait Accounts
 		if (!$oIdentity->FromJSON($this->GetActionParams(), true)) {
 			throw new ClientException(Notifications::InvalidInputArgument);
 		}
-
+/*		// TODO: verify private key for certificate?
+		if ($oIdentity->smimeCertificate && $oIdentity->smimeKey) {
+			new \SnappyMail\SMime\Certificate($oIdentity->smimeCertificate, $oIdentity->smimeKey);
+		}
+*/
 		$this->IdentitiesProvider()->UpdateIdentity($oAccount, $oIdentity);
-		return $this->DefaultResponse(__FUNCTION__, true);
+		return $this->TrueResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoIdentityDelete(): array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		if (!$this->GetCapa(Capa::IDENTITIES)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
-		$sId = \trim($this->GetActionParam('IdToDelete', ''));
+		$sId = \trim($this->GetActionParam('idToDelete', ''));
 		if (empty($sId)) {
 			throw new ClientException(Notifications::UnknownError);
 		}
 
 		$this->IdentitiesProvider()->DeleteIdentity($oAccount, $sId);
-		return $this->DefaultResponse(__FUNCTION__, true);
+		return $this->TrueResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAccountsAndIdentitiesSortOrder(): array
 	{
@@ -212,7 +310,7 @@ trait Accounts
 		$aIdentities = $this->GetActionParam('Identities', null);
 
 		if (!\is_array($aAccounts) && !\is_array($aIdentities)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
 		if (\is_array($aAccounts) && 1 < \count($aAccounts)) {
@@ -224,7 +322,7 @@ trait Accounts
 			$this->SetAccounts($oAccount, $aAccounts);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->LocalStorageProvider()->Put(
+		return $this->DefaultResponse($this->LocalStorageProvider()->Put(
 			$this->getAccountFromToken(),
 			StorageType::CONFIG,
 			'identities_order',
@@ -235,15 +333,20 @@ trait Accounts
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAccountsAndIdentities(): array
 	{
-		return $this->DefaultResponse(__FUNCTION__, array(
-			'Accounts' => \array_map(
-				'MailSo\\Base\\Utils::IdnToUtf8',
-				\array_keys($this->GetAccounts($this->getMainAccountFromToken()))
-			),
+		// https://github.com/the-djmaze/snappymail/issues/571
+		return $this->DefaultResponse(array(
+			'Accounts' => \array_values(\array_map(function($value){
+					return [
+						'email' => IDN::emailToUtf8($value['email'] ?? $value[1]),
+						'name' => $value['name'] ?? ''
+					];
+				},
+				$this->GetAccounts($this->getMainAccountFromToken())
+			)),
 			'Identities' => $this->GetIdentities($this->getAccountFromToken())
 		));
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
index e6b17a63a..c2f4db681 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Admin.php
@@ -7,23 +7,29 @@ use RainLoop\KeyPathHelper;
 use RainLoop\Notifications;
 use RainLoop\Utils;
 
-//define('APP_DEV_VERSION', '0.0.0');
-
 trait Admin
 {
-	protected static $AUTH_ADMIN_TOKEN_KEY = 'smadmin';
+	protected static string $AUTH_ADMIN_TOKEN_KEY = 'smadmin';
 
 	public function IsAdminLoggined(bool $bThrowExceptionOnFalse = true) : bool
 	{
 		if ($this->Config()->Get('security', 'allow_admin_panel', true)) {
+			// [PATCH ronzz.org] OIDC bridge: nginx auth_request (webmail-admin.ronzz.org)
+			// sets X-NC-Admin after validating the Nextcloud session. Honored only on the
+			// dedicated admin host (admin_panel.host); the header is stripped/overridden
+			// at nginx for any other path.
+			if (!empty($_SERVER['HTTP_X_NC_ADMIN'])
+				&& \strtolower((string) $this->Config()->Get('admin_panel', 'host', '')) === \strtolower($this->Http()->GetHost()))
+			{
+				return true;
+			}
 			$sAdminKey = $this->getAdminAuthKey();
-			if ($sAdminKey && '' !== $this->Cacher(null, true)->Get(KeyPathHelper::SessionAdminKey($sAdminKey), '')) {
+			if ($sAdminKey && $this->Cacher(null, true)->Get(KeyPathHelper::SessionAdminKey($sAdminKey))) {
 				return true;
 			}
 		}
 
-		if ($bThrowExceptionOnFalse)
-		{
+		if ($bThrowExceptionOnFalse) {
 			throw new ClientException(Notifications::AuthError);
 		}
 
@@ -32,13 +38,13 @@ trait Admin
 
 	protected function getAdminAuthKey() : string
 	{
-		$cookie = Utils::GetCookie(static::$AUTH_ADMIN_TOKEN_KEY, '');
+		$cookie = \SnappyMail\Cookies::get(static::$AUTH_ADMIN_TOKEN_KEY);
 		if ($cookie) {
 			$aAdminHash = Utils::DecodeKeyValuesQ($cookie);
 			if (!empty($aAdminHash[1]) && 'token' === $aAdminHash[0]) {
 				return $aAdminHash[1];
 			}
-			Utils::ClearCookie(static::$AUTH_ADMIN_TOKEN_KEY);
+			\SnappyMail\Cookies::clear(static::$AUTH_ADMIN_TOKEN_KEY);
 		}
 		return '';
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
new file mode 100644
index 000000000..bb037054b
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminDomains.php
@@ -0,0 +1,235 @@
+<?php
+
+namespace RainLoop\Actions;
+
+use RainLoop\Enumerations\PluginPropertyType;
+use RainLoop\Exceptions\ClientException;
+
+trait AdminDomains
+{
+	public function DoAdminDomainLoad() : array
+	{
+		$this->IsAdminLoggined();
+		$mResult = false;
+		$oDomain = $this->DomainProvider()->Load($this->GetActionParam('name', ''), false, false);
+		if ($oDomain) {
+			$mResult = $oDomain->jsonSerialize();
+			$mResult['name'] = $oDomain->Name();
+		}
+		return $this->DefaultResponse($mResult);
+	}
+
+	public function DoAdminDomainList() : array
+	{
+		$this->IsAdminLoggined();
+		$bIncludeAliases = !empty($this->GetActionParam('includeAliases', '1'));
+		return $this->DefaultResponse($this->DomainProvider()->GetList($bIncludeAliases));
+	}
+
+	public function DoAdminDomainDelete() : array
+	{
+		$this->IsAdminLoggined();
+		return $this->DefaultResponse($this->DomainProvider()->Delete($this->GetActionParam('name', '')));
+	}
+
+	public function DoAdminDomainDisable() : array
+	{
+		$this->IsAdminLoggined();
+
+		return $this->DefaultResponse($this->DomainProvider()->Disable(
+			(string) $this->GetActionParam('name', ''),
+			!empty($this->GetActionParam('disabled', '0'))
+		));
+	}
+
+	public function DoAdminDomainSave() : array
+	{
+		$this->IsAdminLoggined();
+
+		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this);
+
+		return $this->DefaultResponse($oDomain ? $this->DomainProvider()->Save($oDomain) : false);
+	}
+
+	public function DoAdminDomainAliasSave() : array
+	{
+		$this->IsAdminLoggined();
+
+		return $this->DefaultResponse($this->DomainProvider()->SaveAlias(
+			(string) $this->GetActionParam('name', ''),
+			(string) $this->GetActionParam('alias', '')
+		));
+	}
+
+	public function DoAdminDomainMatch() : array
+	{
+		$sCredentials = $this->resolveLoginCredentials(
+			$this->GetActionParam('username'),
+			new \SnappyMail\SensitiveString('********')
+		);
+		$sEmail = $sCredentials['email'];
+		return $this->DefaultResponse(array(
+			'email' => $sEmail,
+			'login' => $sCredentials['imapUser'],
+			'name' => $sCredentials['domain'] ? $sCredentials['domain']->Name() : null,
+//			'domain' => $sCredentials['domain'],
+			'whitelist' => $sCredentials['domain'] ? $sCredentials['domain']->ValidateWhiteList($sEmail) : null
+		));
+	}
+
+	public function DoAdminDomainAutoconfig() : array
+	{
+		$this->IsAdminLoggined();
+//		$sDomain = \SnappyMail\IDN::toAscii($this->GetActionParam('domain'));
+		$sDomain = \strtolower(\idn_to_ascii($this->GetActionParam('domain')));
+		$sEmail = "test@{$sDomain}";
+		return $this->DefaultResponse(array(
+			'email' => $sEmail,
+			'config' => \RainLoop\Providers\Domain\Autoconfig::discover($sEmail)
+		));
+	}
+
+	public function DoAdminDomainTest() : array
+	{
+		$this->IsAdminLoggined();
+
+		$mImapResult = false;
+		$sImapErrorDesc = '';
+		$mSmtpResult = false;
+		$sSmtpErrorDesc = '';
+		$mSieveResult = false;
+		$sSieveErrorDesc = '';
+
+		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this, 'test.example.com');
+		if ($oDomain) {
+			$aAuth = $this->GetActionParam('auth');
+
+			try
+			{
+				$oImapClient = new \MailSo\Imap\ImapClient();
+				$oImapClient->SetLogger($this->Logger());
+
+				$oSettings = $oDomain->ImapSettings();
+				$oImapClient->Connect($oSettings);
+				$mImapResult = [
+					'connectCapa' => \array_values(\array_diff($oImapClient->Capabilities(), ['STARTTLS']))
+				];
+				if (!empty($aAuth['user'])) {
+					$oSettings->username = $aAuth['user'];
+					$oSettings->passphrase = $aAuth['pass'];
+					$oImapClient->Login($oSettings);
+					$mImapResult['authCapa'] = \array_values(\array_unique(\array_map(function($n){
+							return \str_starts_with($n, 'THREAD=') ? 'THREAD' : $n;
+						},
+						$oImapClient->Capabilities()
+					)));
+				}
+
+				$oImapClient->Disconnect();
+			}
+			catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+			{
+				$this->logException($oException, \LOG_ERR);
+				$sImapErrorDesc = $oException->getSocketMessage();
+				if (empty($sImapErrorDesc)) {
+					$sImapErrorDesc = $oException->getMessage();
+				}
+			}
+			catch (\Throwable $oException)
+			{
+				$this->logException($oException, \LOG_ERR);
+				$sImapErrorDesc = $oException->getMessage();
+			}
+
+			if ($oDomain->SmtpSettings()->usePhpMail) {
+				$mSmtpResult = \MailSo\Base\Utils::FunctionCallable('mail');
+				if (!$mSmtpResult) {
+					$sSmtpErrorDesc = 'PHP: mail() function is undefined';
+				}
+			} else {
+				try
+				{
+					$oSmtpClient = new \MailSo\Smtp\SmtpClient();
+					$oSmtpClient->SetLogger($this->Logger());
+
+					$oSettings = $oDomain->SmtpSettings();
+					$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
+					$oSmtpClient->Connect($oSettings);
+					$mSmtpResult = [
+						'connectCapa' => $oSmtpClient->Capability()
+					];
+
+					if (!empty($aAuth['user'])) {
+						$oSettings->username = $aAuth['user'];
+						$oSettings->passphrase = $aAuth['pass'];
+						$oSmtpClient->Login($oSettings);
+						$mSmtpResult['authCapa'] = $oSmtpClient->Capability();
+					}
+
+					$oSmtpClient->Disconnect();
+				}
+				catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+				{
+					$this->logException($oException, \LOG_ERR);
+					$sSmtpErrorDesc = $oException->getSocketMessage();
+					if (empty($sSmtpErrorDesc)) {
+						$sSmtpErrorDesc = $oException->getMessage();
+					}
+				}
+				catch (\Throwable $oException)
+				{
+					$this->logException($oException, \LOG_ERR);
+					$sSmtpErrorDesc = $oException->getMessage();
+				}
+			}
+
+			if ($oDomain->SieveSettings()->enabled) {
+				try
+				{
+					$oSieveClient = new \MailSo\Sieve\SieveClient();
+					$oSieveClient->SetLogger($this->Logger());
+
+					$oSettings = $oDomain->SieveSettings();
+					$oSieveClient->Connect($oSettings);
+					$mSieveResult = [
+						'connectCapa' => $oSieveClient->Capability()
+					];
+
+					if (!empty($aAuth['user'])) {
+						$oSettings->username = $aAuth['user'];
+						$oSettings->passphrase = $aAuth['pass'];
+						$oSieveClient->Login($oSettings);
+						$mSieveResult['authCapa'] = $oSieveClient->Capability();
+					}
+
+					$oSieveClient->Disconnect();
+				}
+				catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
+				{
+					$this->logException($oException, \LOG_ERR);
+					$sSieveErrorDesc = $oException->getSocketMessage();
+					if (empty($sSieveErrorDesc)) {
+						$sSieveErrorDesc = $oException->getMessage();
+					}
+				}
+				catch (\Throwable $oException)
+				{
+					$this->logException($oException, \LOG_ERR);
+					$sSieveErrorDesc = $oException->getMessage();
+				}
+			} else {
+				$mSieveResult = true;
+			}
+		}
+
+		return $this->DefaultResponse(array(
+			'Imap' => $mImapResult ? true : $sImapErrorDesc,
+			'Smtp' => $mSmtpResult ? true : $sSmtpErrorDesc,
+			'Sieve' => $mSieveResult ? true : $sSieveErrorDesc,
+			'ImapResult' => $mImapResult,
+			'SmtpResult' => $mSmtpResult,
+			'SieveResult' => $mSieveResult
+		));
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php
new file mode 100644
index 000000000..3caea3168
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/AdminExtensions.php
@@ -0,0 +1,158 @@
+<?php
+
+namespace RainLoop\Actions;
+
+use RainLoop\Enumerations\PluginPropertyType;
+use RainLoop\Exceptions\ClientException;
+use RainLoop\Notifications;
+use SnappyMail\Repository;
+
+trait AdminExtensions
+{
+
+	public function DoAdminPackagesList() : array
+	{
+		return $this->DefaultResponse(Repository::getPackagesList());
+	}
+
+	public function DoAdminPackageDelete() : array
+	{
+		return $this->DefaultResponse(Repository::deletePackage($this->GetActionParam('id', '')));
+	}
+
+	public function DoAdminPackageInstall() : array
+	{
+		$sType = $this->GetActionParam('type', '');
+		$bResult = Repository::installPackage(
+			$sType,
+			$this->GetActionParam('id', ''),
+			$this->GetActionParam('file', '')
+		);
+		return $this->DefaultResponse($bResult ?
+			('plugin' !== $sType ? array('Reload' => true) : true) : false);
+	}
+
+	public function DoAdminPluginDisable() : array
+	{
+		$this->IsAdminLoggined();
+
+		$sId = (string) $this->GetActionParam('id', '');
+		$bDisable = '1' === (string) $this->GetActionParam('disabled', '1');
+
+		if (!$bDisable) {
+			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
+			if ($oPlugin) {
+				$sValue = $oPlugin->Supported();
+				if (\strlen($sValue)) {
+					return $this->FalseResponse(Notifications::UnsupportedPluginPackage, $sValue);
+				}
+			} else {
+				return $this->FalseResponse(Notifications::InvalidPluginPackage);
+			}
+		}
+
+		return $this->DefaultResponse(Repository::enablePackage($sId, !$bDisable));
+	}
+
+	public function DoAdminPluginLoad() : array
+	{
+		$this->IsAdminLoggined();
+
+		$mResult = false;
+		$sId = (string) $this->GetActionParam('id', '');
+
+		if (!empty($sId)) {
+			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
+			if ($oPlugin) {
+				$mResult = array(
+					'@Object' => 'Object/Plugin',
+					'id' => $sId,
+					'name' => $oPlugin->Name(),
+					'readme' => $oPlugin->Description(),
+					'config' => array(),
+
+					'author' => $oPlugin::AUTHOR,
+					'url' => $oPlugin::URL,
+					'version' => $oPlugin::VERSION,
+					'released' => $oPlugin::RELEASE
+/*
+					$oPlugin::NAME
+					$oPlugin::REQUIRED
+					$oPlugin::DEPRECATED
+					$oPlugin::CATEGORY
+					$oPlugin::LICENSE
+					$oPlugin::DESCRIPTION
+*/
+				);
+
+				$aMap = $oPlugin->ConfigMap();
+				if (\is_array($aMap)) {
+					$oConfig = $oPlugin->Config();
+					foreach ($aMap as $oItem) {
+						if ($oItem) {
+							if ($oItem instanceof \RainLoop\Plugins\Property) {
+								if (PluginPropertyType::PASSWORD === $oItem->Type()) {
+									$oItem->SetValue(static::APP_DUMMY);
+								} else {
+									$oItem->SetValue($oConfig->Get('plugin', $oItem->Name(), ''));
+								}
+								$mResult['config'][] = $oItem;
+							} else if ($oItem instanceof \RainLoop\Plugins\PropertyCollection) {
+								foreach ($oItem as $oSubItem) {
+									if ($oSubItem && $oSubItem instanceof \RainLoop\Plugins\Property) {
+										if (PluginPropertyType::PASSWORD === $oSubItem->Type()) {
+											$oSubItem->SetValue(static::APP_DUMMY);
+										} else {
+											$oSubItem->SetValue($oConfig->Get('plugin', $oSubItem->Name(), ''));
+										}
+									}
+								}
+								$mResult['config'][] = $oItem;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		return $this->DefaultResponse($mResult);
+	}
+
+	public function DoAdminPluginSettingsUpdate() : array
+	{
+		$this->IsAdminLoggined();
+
+		$sId = (string) $this->GetActionParam('id', '');
+
+		if (!empty($sId)) {
+			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
+			if ($oPlugin) {
+				$oConfig = $oPlugin->Config();
+				$aMap = $oPlugin->ConfigMap(true);
+				if (\is_array($aMap)) {
+					$aSettings = (array) $this->GetActionParam('settings', []);
+					foreach ($aMap as $oItem) {
+						$sKey = $oItem->Name();
+						$mValue = $aSettings[$sKey] ?? $oConfig->Get('plugin', $sKey);
+						if (PluginPropertyType::PASSWORD !== $oItem->Type() || static::APP_DUMMY !== $mValue) {
+							$oItem->SetValue($mValue);
+							$mValue = $oItem->Value();
+							if (null !== $mValue) {
+								if ($oItem->encrypted) {
+									$oConfig->setEncrypted('plugin', $sKey, $mValue);
+								} else {
+									$oConfig->Set('plugin', $sKey, $mValue);
+								}
+							}
+						}
+					}
+				}
+				if ($oConfig->Save()) {
+					return $this->TrueResponse();
+				}
+			}
+		}
+
+		throw new ClientException(Notifications::CantSavePluginSettings);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
new file mode 100644
index 000000000..007c6171d
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Attachments.php
@@ -0,0 +1,194 @@
+<?php
+
+namespace RainLoop\Actions;
+
+use RainLoop\Enumerations\Capa;
+use RainLoop\Utils;
+
+trait Attachments
+{
+	/**
+	 * @throws \MailSo\RuntimeException
+	 */
+	public function DoAttachmentsActions() : array
+	{
+		$sAction = $this->GetActionParam('target', '');
+		$sFolder = $this->GetActionParam('folder', '');
+		$sFilename = \MailSo\Base\Utils::SecureFileName($this->GetActionParam('filename', ''));
+		$aHashes = $this->GetActionParam('hashes', null);
+		$oFilesProvider = $this->FilesProvider();
+		if (empty($sAction)) {
+			$this->logWrite('AttachmentsAction target not set');
+		}
+		if (!$this->GetCapa(Capa::ATTACHMENTS_ACTIONS)) {
+			$this->logWrite('AttachmentsAction disabled');
+		}
+		if (!$oFilesProvider || !$oFilesProvider->IsActive()) {
+			$this->logWrite('AttachmentsAction FilesProvider inactive');
+		}
+		if (empty($sAction) || !$this->GetCapa(Capa::ATTACHMENTS_ACTIONS) || !$oFilesProvider || !$oFilesProvider->IsActive()) {
+			return $this->FalseResponse();
+		}
+
+		$oAccount = $this->initMailClientConnection();
+
+		$bError = false;
+		$aData = [];
+		$mUIDs = [];
+
+		if (\is_array($aHashes) && \count($aHashes)) {
+			foreach ($aHashes as $sZipHash) {
+				$aResult = $this->getMimeFileByHash($oAccount, $sZipHash);
+				if (empty($aResult['data']) && empty($aResult['fileHash'])) {
+					$this->logWrite('AttachmentsAction data/fileHash not set: ' . \print_r($aResult,1));
+					$bError = true;
+					break;
+				}
+				$aData[] = $aResult;
+				if (!empty($aResult['mimeIndex'])) {
+					$mUIDs[$aResult['uid']] = $aResult['uid'];
+				}
+			}
+		}
+		$mUIDs = 1 < \count($mUIDs);
+
+		if ($bError || !\count($aData)) {
+			return $this->FalseResponse();
+		}
+
+		$mResult = false;
+		switch (\strtolower($sAction))
+		{
+			case 'zip':
+
+				$sZipHash = \MailSo\Base\Utils::Sha1Rand();
+				$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
+
+				if (!empty($sZipFileName)) {
+					if (\class_exists('ZipArchive')) {
+						$oZip = new \ZipArchive();
+						$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
+						$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
+						foreach ($aData as $aItem) {
+							$sFileName = ($mUIDs ? "{$aItem['uid']}/" : ($sFolder ? "{$aItem['uid']}-" : '')) . $aItem['fileName'];
+							if (isset($aItem['data'])) {
+								if (!$oZip->addFromString($sFileName, $aItem['data'])) {
+									$bError = true;
+								}
+							} else {
+								$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $aItem['fileHash']);
+								if (!$oZip->addFile($sFullFileNameHash, $sFileName)) {
+									$bError = true;
+								}
+							}
+						}
+
+						if ($bError) {
+							$oZip->close();
+						} else {
+							$bError = !$oZip->close();
+						}
+/*
+					} else {
+						@\unlink($sZipFileName);
+						$oZip = new \SnappyMail\Stream\ZIP($sZipFileName);
+//						$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
+						foreach ($aData as $aItem) {
+							if ($aItem['fileHash']) {
+								$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $aItem['fileHash']);
+								if (!$oZip->addFile($sFullFileNameHash, $aItem['fileName'])) {
+									$bError = true;
+								}
+							}
+						}
+						$oZip->close();
+*/
+					} else {
+						@\unlink($sZipFileName);
+						$oZip = new \PharData($sZipFileName . '.zip', 0, null, \Phar::ZIP);
+						$oZip->compressFiles(\Phar::GZ);
+						foreach ($aData as $aItem) {
+							if ($aItem['data']) {
+								if (!$oZip->addFromString($sFileName, \MailSo\Base\Utils::UrlSafeBase64Decode($aItem['data']))) {
+									$bError = true;
+								}
+							} else {
+								$oZip->addFile(
+									$oFilesProvider->GetFileName($oAccount, $aItem['fileHash']),
+									($mUIDs ? "{$aItem['uid']}/" : ($sFolder ? "{$aItem['uid']}-" : '')) . $aItem['fileName']
+								);
+							}
+						}
+						$oZip->compressFiles(\Phar::GZ);
+						unset($oZip);
+						\rename($sZipFileName . '.zip', $sZipFileName);
+					}
+
+					if (!$bError) {
+						$mResult = array(
+							'fileHash' => $this->encodeRawKey(array(
+								'fileName' => ($sFilename ?: ($sFolder ? 'messages' : 'attachments')) . \date('-YmdHis') . '.zip',
+								'mimeType' => 'application/zip',
+								'fileHash' => $sZipHash
+							))
+						);
+					}
+				}
+				break;
+
+			default:
+				$data = new \SnappyMail\AttachmentsAction;
+				$data->action = $sAction;
+				$data->items = $aData;
+				$data->filesProvider = $oFilesProvider;
+				$data->account = $oAccount;
+				$this->Plugins()->RunHook('json.attachments', array($data));
+				$mResult = $data->result;
+				break;
+		}
+
+		foreach ($aData as $aItem) {
+			$aItem['fileHash'] && $oFilesProvider->Clear($oAccount, $aItem['fileHash']);
+		}
+
+		return $this->DefaultResponse($bError ? false : $mResult);
+	}
+
+	private function getMimeFileByHash(\RainLoop\Model\Account $oAccount, string $sHash) : array
+	{
+		$aValues = $this->decodeRawKey($sHash);
+		$aValues['fileName'] = empty($aValues['fileName']) ? 'file.dat' : (string) $aValues['fileName'];
+		$aValues['fileHash'] = null;
+		if (isset($aValues['data'])) {
+			$aValues['data'] = \MailSo\Base\Utils::UrlSafeBase64Decode($aValues['data']);
+		} else if (!empty($aValues['folder']) && !empty($aValues['uid'])) {
+			$sFolder = (string) $aValues['folder'];
+			$iUid = (int) $aValues['uid'];
+			$sMimeIndex = (string) $aValues['mimeIndex'] ?: '';
+			$oFileProvider = $this->FilesProvider();
+			$this->MailClient()->MessageMimeStream(
+				function ($rResource, $sContentType, $sFileName, $sMimeIndex = '')
+				use ($oAccount, $oFileProvider, &$aValues) {
+					unset($sContentType, $sFileName, $sMimeIndex);
+					if (\is_resource($rResource)) {
+						$sContentTypeIn = isset($aValues['mimeType']) ? (string) $aValues['mimeType'] : '';
+						$sHash = \MailSo\Base\Utils::Sha1Rand($aValues['fileName'].'~'.$sContentTypeIn);
+						$rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+');
+						if (\is_resource($rTempResource)) {
+							if (-1 < \MailSo\Base\Utils::WriteStream($rResource, $rTempResource)) {
+								$sResultHash = $sHash;
+								$aValues['fileHash'] = $sHash;
+							}
+							\fclose($rTempResource);
+						}
+					}
+				},
+				$sFolder,
+				$iUid,
+				$sMimeIndex
+			);
+		}
+
+		return $aValues;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
index d3992f3dd..3e6dd5a07 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Contacts.php
@@ -2,17 +2,45 @@
 
 namespace RainLoop\Actions;
 
+use RainLoop\Enumerations\Capa;
+use RainLoop\Exceptions\ClientException;
+
 trait Contacts
 {
+	protected ?\RainLoop\Providers\AddressBook $oAddressBookProvider = null;
+
+	public function AddressBookProvider(?\RainLoop\Model\Account $oAccount = null): \RainLoop\Providers\AddressBook
+	{
+		if (null === $this->oAddressBookProvider) {
+			$oDriver = null;
+			try {
+//				if ($this->oConfig->Get('contacts', 'enable', false)) {
+				if ($this->GetCapa(Capa::CONTACTS)) {
+					$oDriver = $this->fabrica('address-book', $oAccount);
+				}
+				if ($oAccount && $oDriver) {
+					$oDriver->SetEmail($this->GetMainEmail($oAccount));
+					$oDriver->setDAVClientConfig($this->getContactsSyncData($oAccount));
+				}
+			} catch (\Throwable $e) {
+				\SnappyMail\LOG::error('AddressBook', $e->getMessage()."\n".$e->getTraceAsString());
+				$oDriver = null;
+//				$oDriver = new \RainLoop\Providers\AddressBook\PdoAddressBook();
+			}
+			$this->oAddressBookProvider = new \RainLoop\Providers\AddressBook($oDriver);
+			$this->oAddressBookProvider->SetLogger($this->oLogger);
+		}
+
+		return $this->oAddressBookProvider;
+	}
 
 	public function DoSaveContactsSyncData() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-		if (!$oAddressBookProvider || !$oAddressBookProvider->IsActive())
-		{
-			return $this->FalseResponse(__FUNCTION__);
+		if (!$oAddressBookProvider || !$oAddressBookProvider->IsActive()) {
+			return $this->FalseResponse();
 		}
 
 		$sPassword = $this->GetActionParam('Password', '');
@@ -22,42 +50,77 @@ trait Contacts
 		$bResult = $this->setContactsSyncData($oAccount, array(
 			'Mode' => \intval($this->GetActionParam('Mode', '0')),
 			'User' => $this->GetActionParam('User', ''),
-			'Password' => APP_DUMMY === $sPassword && isset($mData['Password'])
-				? $mData['Password'] : (APP_DUMMY === $sPassword ? '' : $sPassword),
+			'Password' => static::APP_DUMMY === $sPassword
+				? (isset($mData['Password']) ? $mData['Password'] : '')
+				: $sPassword,
 			'Url' => $this->GetActionParam('Url', '')
 		));
 
-		return $this->DefaultResponse(__FUNCTION__, $bResult);
+		return $this->DefaultResponse($bResult);
+	}
+
+	public function DoTestContactsSyncData() : array
+	{
+		if (!$this->GetCapa(Capa::CONTACTS)) {
+			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'Disallowed');
+		}
+
+		$oAccount = $this->getAccountFromToken();
+
+		$sPassword = $this->GetActionParam('Password', '');
+		if (static::APP_DUMMY === $sPassword) {
+			$mData = $this->getContactsSyncData($oAccount);
+			$sPassword = isset($mData['Password']) ? $mData['Password'] : '';
+		}
+		$sPasswordHMAC = null;
+		if ($sPassword) {
+			$oMainAccount = $this->getMainAccountFromToken();
+			$sPassword = \SnappyMail\Crypt::EncryptToJSON($sPassword, $oMainAccount->CryptKey());
+			if ($sPassword) {
+				$sPasswordHMAC = \hash_hmac('sha1', $sPassword, $oMainAccount->CryptKey());
+			}
+		}
+
+		$oDriver = $this->fabrica('address-book', $oAccount);
+		if (!$oDriver) {
+			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No driver');
+		}
+		$oDriver->SetEmail($this->GetMainEmail($oAccount));
+		$oDriver->setDAVClientConfig([
+			'Mode' => 2, // readonly
+			'User' => $this->GetActionParam('User', ''),
+			'Password' => $sPassword,
+			'Url' => $this->GetActionParam('Url', ''),
+			'PasswordHMAC' => $sPasswordHMAC
+		]);
+
+		$oClient = $oDriver->getDavClient();
+		if (!$oClient) {
+			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No client');
+		}
+		$oClient->propFind($oClient->urlPath, [
+			'{DAV:}getlastmodified',
+			'{DAV:}resourcetype',
+			'{DAV:}getetag'
+		], 1);
+
+		return $this->TrueResponse();
 	}
 
 	public function DoContactsSync() : array
 	{
-		$bResult = false;
 		$oAccount = $this->getAccountFromToken();
-
 		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-		if ($oAddressBookProvider && $oAddressBookProvider->IsActive())
-		{
-			$mData = $this->getContactsSyncData($oAccount);
-			if (isset($mData['User'], $mData['Password'], $mData['Url']) && !empty($mData['Mode']))
-			{
-				$bResult = $oAddressBookProvider->Sync([
-					'Email' => $this->GetMainEmail($oAccount),
-					'Url' => $mData['Url'],
-					'User' => $mData['User'],
-					'Password' => $mData['Password'],
-					'Mode' => $mData['Mode'],
-					'Proxy' => ''
-				]);
-			}
+		if (!$oAddressBookProvider) {
+			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'No AddressBookProvider');
 		}
-
-		if (!$bResult)
-		{
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::ContactsSyncError);
+		\ignore_user_abort(true);
+		\SnappyMail\HTTP\Stream::start(/*$binary = false*/);
+		\SnappyMail\HTTP\Stream::JSON(['messsage'=>'start']);
+		if (!$oAddressBookProvider->Sync()) {
+			throw new ClientException(\RainLoop\Notifications::ContactsSyncError, null, 'AddressBookProvider->Sync() failed');
 		}
-
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoContacts() : array
@@ -74,14 +137,12 @@ trait Contacts
 		$mResult = array();
 
 		$oAbp = $this->AddressBookProvider($oAccount);
-		if ($oAbp->IsActive())
-		{
+		if ($oAbp->IsActive()) {
 			$iResultCount = 0;
-			$mResult = $oAbp->GetContacts($this->GetMainEmail($oAccount),
-				$iOffset, $iLimit, $sSearch, $iResultCount);
+			$mResult = $oAbp->GetContacts($iOffset, $iLimit, $sSearch, $iResultCount);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, array(
+		return $this->DefaultResponse(array(
 			'Offset' => $iOffset,
 			'Limit' => $iLimit,
 			'Count' => $iResultCount,
@@ -93,17 +154,16 @@ trait Contacts
 	public function DoContactsDelete() : array
 	{
 		$oAccount = $this->getAccountFromToken();
-		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
+		$aUids = \explode(',', (string) $this->GetActionParam('uids', ''));
 
 		$aFilteredUids = \array_filter(\array_map('intval', $aUids));
 
 		$bResult = false;
-		if (\count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive())
-		{
-			$bResult = $this->AddressBookProvider($oAccount)->DeleteContacts($this->GetMainEmail($oAccount), $aFilteredUids);
+		if (\count($aFilteredUids) && $this->AddressBookProvider($oAccount)->IsActive()) {
+			$bResult = $this->AddressBookProvider($oAccount)->DeleteContacts($aFilteredUids);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $bResult);
+		return $this->DefaultResponse($bResult);
 	}
 
 	public function DoContactSave() : array
@@ -112,128 +172,76 @@ trait Contacts
 
 		$bResult = false;
 
-		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-		$sRequestUid = \trim($this->GetActionParam('RequestUid', ''));
-		if ($oAddressBookProvider && $oAddressBookProvider->IsActive() && \strlen($sRequestUid))
-		{
-			$sUid = \trim($this->GetActionParam('Uid', ''));
-
-			$oContact = null;
-			if (\strlen($sUid))
-			{
-				$oContact = $oAddressBookProvider->GetContactByID($this->GetMainEmail($oAccount), $sUid);
-			}
-
-			if (!$oContact)
-			{
-				$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
-				if (\strlen($sUid))
-				{
-					$oContact->IdContact = $sUid;
-				}
-			}
-
-			$oContact->Properties = array();
-			$aProperties = $this->GetActionParam('Properties', array());
-			if (\is_array($aProperties))
-			{
-				foreach ($aProperties as $aItem)
-				{
-					if ($aItem && isset($aItem['type'], $aItem['value'])
-					 && \is_numeric($aItem['type']) && (int) $aItem['type']
-					 && \RainLoop\Providers\AddressBook\Enumerations\PropertyType::FULLNAME != $aItem['type']
-					 && \strlen(\trim($aItem['value'])))
-					{
-						$oProp = new \RainLoop\Providers\AddressBook\Classes\Property();
-						$oProp->Type = (int) $aItem['type'];
-						$oProp->Value = \trim($aItem['value']);
-						$oProp->TypeStr = $aItem['typeStr'] ?? '';
-
-						$oContact->Properties[] = $oProp;
+		if ($this->HasActionParam('uid') && $this->HasActionParam('jCard')) {
+			$oAddressBookProvider = $this->AddressBookProvider($oAccount);
+			if ($oAddressBookProvider && $oAddressBookProvider->IsActive()) {
+				$vCard = \Sabre\VObject\Reader::readJson($this->GetActionParam('jCard'));
+				if ($vCard && $vCard instanceof \Sabre\VObject\Component\VCard) {
+					$vCard->REV = \gmdate('Ymd\\THis\\Z');
+					$vCard->PRODID = 'SnappyMail-'.APP_VERSION;
+					$sUid = \trim($this->GetActionParam('uid'));
+					$oContact = $sUid ? $oAddressBookProvider->GetContactByID($sUid) : null;
+					if (!$oContact) {
+						$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
 					}
+					$oContact->setVCard($vCard);
+					$bResult = $oAddressBookProvider->ContactSave($oContact);
 				}
 			}
-
-			if (!empty($oContact->Etag))
-			{
-				$oContact->Etag = \md5($oContact->ToVCard());
-			}
-
-			$oContact->PopulateDisplayAndFullNameValue(true);
-
-			$bResult = $oAddressBookProvider->ContactSave($this->GetMainEmail($oAccount), $oContact);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, array(
-			'RequestUid' => $sRequestUid,
-			'ResultID' => $bResult ? $oContact->IdContact : '',
+		return $this->DefaultResponse(array(
+			'ResultID' => $bResult ? $oContact->id : '',
 			'Result' => $bResult
 		));
 	}
 
-	public function UploadContacts() : array
+	public function UploadContacts(?array $aFile, int $iError) : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		$mResponse = false;
 
-		$aFile = $this->GetActionParam('File', null);
-		$iError = $this->GetActionParam('Error', \RainLoop\Enumerations\UploadError::UNKNOWN);
-
-		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile))
-		{
+		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
 			$sSavedName = 'upload-post-'.\md5($aFile['name'].$aFile['tmp_name']);
-			if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name']))
-			{
+			if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
 				$iError = \RainLoop\Enumerations\UploadError::ON_SAVING;
-			}
-			else
-			{
-				\ini_set('auto_detect_line_endings', true);
+			} else {
+				\ini_set('auto_detect_line_endings', '1');
 				$mData = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
-				if ($mData)
-				{
-					$sFileStart = \fread($mData, 20);
+				if ($mData) {
+					$sFileStart = \fread($mData, 128);
 					\rewind($mData);
-
-					if (false !== $sFileStart)
-					{
+					if (false !== $sFileStart) {
 						$sFileStart = \trim($sFileStart);
-						if (false !== \strpos($sFileStart, 'BEGIN:VCARD'))
-						{
+						if (false !== \strpos($sFileStart, 'BEGIN:VCARD')) {
 							$mResponse = $this->importContactsFromVcfFile($oAccount, $mData);
-						}
-						else if (false !== \strpos($sFileStart, ',') || false !== \strpos($sFileStart, ';'))
-						{
+						} else if (false !== \strpos($sFileStart, ',') || false !== \strpos($sFileStart, ';')) {
 							$mResponse = $this->importContactsFromCsvFile($oAccount, $mData, $sFileStart);
 						}
 					}
 				}
 
-				if (\is_resource($mData))
-				{
+				if (\is_resource($mData)) {
 					\fclose($mData);
 				}
 
 				unset($mData);
 				$this->FilesProvider()->Clear($oAccount, $sSavedName);
 
-				\ini_set('auto_detect_line_endings', false);
+				\ini_set('auto_detect_line_endings', '0');
 			}
 		}
 
-		if (UPLOAD_ERR_OK !== $iError)
-		{
-			$iClientError = \RainLoop\Enumerations\UploadError::NORMAL;
-			$sError = $this->getUploadErrorMessageByCode($iError, $iClientError);
-
-			if (!empty($sError))
-			{
-				return $this->FalseResponse(__FUNCTION__, $iClientError, $sError);
+		if (UPLOAD_ERR_OK !== $iError) {
+			$iClientError = 0;
+			$sError = \RainLoop\Enumerations\UploadError::getUserMessage($iError, $iClientError);
+			if (!empty($sError)) {
+				return $this->FalseResponse($iClientError, $sError);
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $mResponse);
+		return $this->DefaultResponse($mResponse);
 	}
 
 	public function setContactsSyncData(\RainLoop\Model\Account $oAccount, array $aData) : bool
@@ -241,6 +249,7 @@ trait Contacts
 		if (!isset($aData['Mode'])) {
 			$aData['Mode'] = empty($aData['Enable']) ? 0 : 1;
 		}
+//		$oAccount = $this->getAccountFromToken();
 		$oMainAccount = $this->getMainAccountFromToken();
 		if ($aData['Password']) {
 			$aData['Password'] = \SnappyMail\Crypt::EncryptToJSON($aData['Password'], $oMainAccount->CryptKey());
@@ -256,6 +265,7 @@ trait Contacts
 
 	protected function getContactsSyncData(\RainLoop\Model\Account $oAccount) : ?array
 	{
+//		$oAccount = $this->getAccountFromToken();
 		$sData = $this->StorageProvider()->Get($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 			'contacts_sync'
@@ -297,10 +307,11 @@ trait Contacts
 		\header('Accept-Ranges: none');
 		\header('Content-Transfer-Encoding: binary');
 
-		$this->oHttp->ServerNoCache();
+		$this->Http()->ServerNoCache();
 
-		return $this->AddressBookProvider($oAccount)->IsActive() ?
-			$this->AddressBookProvider($oAccount)->Export($this->GetMainEmail($oAccount), 'vcf') : false;
+		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
+		return $oAddressBookProvider->IsActive() ?
+			$oAddressBookProvider->Export('vcf') : false;
 	}
 
 	public function RawContactsCsv() : bool
@@ -312,79 +323,55 @@ trait Contacts
 		\header('Accept-Ranges: none');
 		\header('Content-Transfer-Encoding: binary');
 
-		$this->oHttp->ServerNoCache();
+		$this->Http()->ServerNoCache();
 
-		return $this->AddressBookProvider($oAccount)->IsActive() ?
-			$this->AddressBookProvider($oAccount)->Export($this->GetMainEmail($oAccount), 'csv') : false;
+		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
+		return $oAddressBookProvider->IsActive() ?
+			$oAddressBookProvider->Export('csv') : false;
 	}
 
 	private function importContactsFromVcfFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile): int
 	{
 		$iCount = 0;
-		if ($oAccount && \is_resource($rFile)) {
-			$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-			if ($oAddressBookProvider && $oAddressBookProvider->IsActive()) {
-				$sFile = \stream_get_contents($rFile);
-				if (\is_resource($rFile)) {
-					\fclose($rFile);
-				}
-
-				if (is_string($sFile) && 5 < \strlen($sFile)) {
-					$this->Logger()->Write('Import contacts from vcf');
-					$iCount = $oAddressBookProvider->ImportVcfFile(
-						$this->GetMainEmail($oAccount),
-						$sFile
-					);
+		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
+		if (\is_resource($rFile) && $oAddressBookProvider && $oAddressBookProvider->IsActive()) {
+			try
+			{
+				$this->logWrite('Import contacts from vcf');
+				foreach (\RainLoop\Providers\AddressBook\Utils::VcfStreamToContacts($rFile) as $oContact) {
+					if ($oAddressBookProvider->ContactSave($oContact)) {
+						++$iCount;
+					}
 				}
 			}
+			catch (\Throwable $oExc)
+			{
+				$this->logException($oExc);
+			}
 		}
-
 		return $iCount;
 	}
 
 	private function importContactsFromCsvFile(\RainLoop\Model\Account $oAccount, /*resource*/ $rFile, string $sFileStart): int
 	{
 		$iCount = 0;
-		$aHeaders = null;
-		$aData = array();
-
-		if ($oAccount && \is_resource($rFile)) {
-			$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-			if ($oAddressBookProvider && $oAddressBookProvider->IsActive()) {
+		$oAddressBookProvider = $this->AddressBookProvider($oAccount);
+		if (\is_resource($rFile) && $oAddressBookProvider && $oAddressBookProvider->IsActive()) {
+			try
+			{
+				$this->logWrite('Import contacts from csv');
 				$sDelimiter = ((int)\strpos($sFileStart, ',') > (int)\strpos($sFileStart, ';')) ? ',' : ';';
-
-				\setlocale(LC_CTYPE, 'en_US.UTF-8');
-				while (false !== ($mRow = \fgetcsv($rFile, 5000, $sDelimiter, '"'))) {
-					if (null === $aHeaders) {
-						if (3 >= \count($mRow)) {
-							return 0;
-						}
-
-						$aHeaders = $mRow;
-
-						foreach ($aHeaders as $iIndex => $sHeaderValue) {
-							$aHeaders[$iIndex] = \MailSo\Base\Utils::Utf8Clear($sHeaderValue);
-						}
-					} else {
-						$aNewItem = array();
-						foreach ($aHeaders as $iIndex => $sHeaderValue) {
-							$aNewItem[$sHeaderValue] = isset($mRow[$iIndex]) ? $mRow[$iIndex] : '';
-						}
-
-						$aData[] = $aNewItem;
+				foreach (\RainLoop\Providers\AddressBook\Utils::CsvStreamToContacts($rFile, $sDelimiter) as $oContact) {
+					if ($oAddressBookProvider->ContactSave($oContact)) {
+						++$iCount;
 					}
 				}
-
-				if (\count($aData)) {
-					$this->oLogger->Write('Import contacts from csv');
-					$iCount = $oAddressBookProvider->ImportCsvArray(
-						$this->GetMainEmail($oAccount),
-						$aData
-					);
-				}
+			}
+			catch (\Throwable $oExc)
+			{
+				$this->logException($oExc);
 			}
 		}
-
 		return $iCount;
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Filters.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Filters.php
index 8bd635a80..1d2b02521 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Filters.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Filters.php
@@ -6,89 +6,72 @@ use RainLoop\Enumerations\Capa;
 
 trait Filters
 {
-	/**
-	 * @var \RainLoop\Providers\Filters
-	 */
-	private $oFiltersProvider;
+	private ?\RainLoop\Providers\Filters $oFiltersProvider = null;
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFilters() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
-		if (!$this->GetCapa(Capa::SIEVE, $oAccount))
-		{
-			return $this->FalseResponse(__FUNCTION__);
+		if (!$this->GetCapa(Capa::SIEVE, $oAccount)) {
+			return $this->FalseResponse();
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->Load($oAccount));
+		return $this->DefaultResponse($this->FiltersProvider()->Load($oAccount));
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFiltersScriptSave() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		if (!$this->GetCapa(Capa::SIEVE, $oAccount)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
 		$sName = $this->GetActionParam('name', '');
 
-		$aFilters = array();
-		if (\RainLoop\Providers\Filters\SieveStorage::SIEVE_FILE_NAME === $sName) {
-			$aIncFilters = $this->GetActionParam('filters', array());
-			foreach ($aIncFilters as $aFilter) {
-				if (\is_array($aFilter)) {
-					$oFilter = new \RainLoop\Providers\Filters\Classes\Filter();
-					if ($oFilter->FromJSON($aFilter)) {
-						$aFilters[] = $oFilter;
-					}
-				}
-			}
-		}
-
 		if ($this->GetActionParam('active', false)) {
 //			$this->FiltersProvider()->ActivateScript($oAccount, $sName);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->Save(
-			$oAccount, $sName, $aFilters, $this->GetActionParam('body', '')
+		return $this->DefaultResponse($this->FiltersProvider()->Save(
+			$oAccount, $sName, $this->GetActionParam('body', '')
 		));
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFiltersScriptActivate() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		if (!$this->GetCapa(Capa::SIEVE, $oAccount)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->ActivateScript(
+		return $this->DefaultResponse($this->FiltersProvider()->ActivateScript(
 			$oAccount, $this->GetActionParam('name', '')
 		));
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFiltersScriptDelete() : array
 	{
 		$oAccount = $this->getAccountFromToken();
 
 		if (!$this->GetCapa(Capa::SIEVE, $oAccount)) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->FiltersProvider()->DeleteScript(
+		return $this->DefaultResponse($this->FiltersProvider()->DeleteScript(
 			$oAccount, $this->GetActionParam('name', '')
 		));
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
index 59889fdc3..a88d37116 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Folders.php
@@ -2,7 +2,6 @@
 
 namespace RainLoop\Actions;
 
-use RainLoop\Enumerations\Capa;
 use RainLoop\Exceptions\ClientException;
 use RainLoop\Notifications;
 use MailSo\Imap\Enumerations\FolderType;
@@ -10,44 +9,39 @@ use MailSo\Imap\Enumerations\FolderType;
 trait Folders
 {
 
-	private function getFolderCollection(bool $HideUnsubscribed) : ?\MailSo\Mail\FolderCollection
-	{
-		return $this->MailClient()->Folders('', '*',
-			$HideUnsubscribed,
-			(int) $this->Config()->Get('labs', 'imap_folder_list_limit', 200),
-			(bool) $this->Config()->Get('labs', 'imap_use_list_status', true)
-		);
-	}
-
 	/**
 	 * Appends uploaded rfc822 message to mailbox
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
-	public function Append(): bool
+	public function DoFolderAppend(): array
 	{
 		$oAccount = $this->initMailClientConnection();
 
-		$sFolderFullName = $this->GetActionParam('Folder', '');
+		$sFolderFullName = $this->GetActionParam('folder', '');
 
-		if ($oAccount
-		 && !empty($sFolderFullName)
-		 && !empty($_FILES['AppendFile'])
-		 && \is_uploaded_file($_FILES['AppendFile']['tmp_name'])
-		 && \UPLOAD_ERR_OK == $_FILES['AppendFile']['error']
-		 && $this->oConfig->Get('labs', 'allow_message_append', false)
-		) {
-			$sSavedName = 'append-post-' . \md5($sFolderFullName . $_FILES['AppendFile']['name'] . $_FILES['AppendFile']['tmp_name']);
-			if ($this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $_FILES['AppendFile']['tmp_name'])) {
-				$iMessageStreamSize = $this->FilesProvider()->FileSize($oAccount, $sSavedName);
-				$rMessageStream = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
-
-				$this->MailClient()->MessageAppendStream($rMessageStream, $iMessageStreamSize, $sFolderFullName);
-
-				$this->FilesProvider()->Clear($oAccount, $sSavedName);
-			}
+		if (!$this->oConfig->Get('labs', 'allow_message_append', false)) {
+			return $this->FalseResponse(999, 'Permission denied');
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, true);
+		if (empty($_FILES['appendFile'])) {
+			return $this->FalseResponse(999, 'No file');
+		}
+
+		if (\UPLOAD_ERR_OK != $_FILES['appendFile']['error']) {
+			return $this->FalseResponse($iErrorCode, \RainLoop\Enumerations\UploadError::getMessage($iErrorCode));
+		}
+
+		if ($oAccount && !empty($sFolderFullName) && \is_uploaded_file($_FILES['appendFile']['tmp_name'])) {
+			$sSavedName = 'append-post-' . \md5($sFolderFullName . $_FILES['appendFile']['name'] . $_FILES['appendFile']['tmp_name']);
+			if ($this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $_FILES['appendFile']['tmp_name'])) {
+				$iMessageStreamSize = $this->FilesProvider()->FileSize($oAccount, $sSavedName);
+				$rMessageStream = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
+				$this->ImapClient()->MessageAppendStream($sFolderFullName, $rMessageStream, $iMessageStreamSize);
+				$this->FilesProvider()->Clear($oAccount, $sSavedName);
+				return $this->TrueResponse();
+			}
+		}
+		return $this->FalseResponse(999);
 	}
 
 	public function DoFolders() : array
@@ -60,159 +54,61 @@ trait Folders
 			$HideUnsubscribed = (bool) $oSettingsLocal->GetConf('HideUnsubscribed', $HideUnsubscribed);
 		}
 
-		$oFolderCollection = $this->getFolderCollection($HideUnsubscribed);
+		$oFolderCollection = $this->MailClient()->Folders('', '*', $HideUnsubscribed);
 
-		if ($oFolderCollection)
-		{
-			$sNamespace = $this->MailClient()->GetNamespace();
-
-			$this->Plugins()->RunHook('filter.folders-post', array($oAccount, $oFolderCollection));
-
-			$aSystemFolders = array();
-			$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
-
-			if (!$this->Config()->Get('labs', 'use_imap_sort', true)) {
-				$oFolderCollection->capabilities = \array_filter($oFolderCollection->capabilities, function($item){
-					return !\preg_match('/^E?SORT/', $item);
-				});
+		$oNamespaces = $this->ImapClient()->GetNamespaces();
+		if ($oNamespaces) {
+			if (isset($oNamespaces->aOtherUsers[0])) try {
+				$oCollection = $this->MailClient()->Folders($oNamespaces->aOtherUsers[0]['prefix'], '*', $HideUnsubscribed);
+				if ($oCollection) {
+					foreach ($oCollection as $oFolder) {
+						$oFolderCollection[$oFolder->FullName] = $oFolder;
+					}
+				}
+			} catch (\Throwable $e) {
+				// https://github.com/the-djmaze/snappymail/issues/1438
+				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
+				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
-
-			if ($this->Config()->Get('labs', 'autocreate_system_folders', false))
-			{
-				$bDoItAgain = false;
-
-				$sParent = \substr($sNamespace, 0, -1);
-
-				$sDelimiter = $oFolderCollection->FindDelimiter();
-
-				$aList = array();
-				$aMap = $this->systemFoldersNames($oAccount);
-
-				if ('' === $oSettingsLocal->GetConf('SentFolder', ''))
-				{
-					$aList[] = FolderType::SENT;
-				}
-
-				if ('' === $oSettingsLocal->GetConf('DraftFolder', ''))
-				{
-					$aList[] = FolderType::DRAFTS;
-				}
-
-				if ('' === $oSettingsLocal->GetConf('SpamFolder', ''))
-				{
-					$aList[] = FolderType::JUNK;
-				}
-
-				if ('' === $oSettingsLocal->GetConf('TrashFolder', ''))
-				{
-					$aList[] = FolderType::TRASH;
-				}
-
-				if ('' === $oSettingsLocal->GetConf('ArchiveFolder', ''))
-				{
-					$aList[] = FolderType::ARCHIVE;
-				}
-
-				$this->Plugins()->RunHook('filter.folders-system-types', array($oAccount, &$aList));
-
-				foreach ($aList as $iType)
-				{
-					if (!isset($aSystemFolders[$iType]))
-					{
-						$mFolderNameToCreate = \array_search($iType, $aMap);
-						if (!empty($mFolderNameToCreate))
-						{
-							$iPos = \strrpos($mFolderNameToCreate, $sDelimiter);
-							if (false !== $iPos)
-							{
-								$mNewParent = \substr($mFolderNameToCreate, 0, $iPos);
-								$mNewFolderNameToCreate = \substr($mFolderNameToCreate, $iPos + 1);
-								if (\strlen($mNewFolderNameToCreate))
-								{
-									$mFolderNameToCreate = $mNewFolderNameToCreate;
-								}
-
-								if (\strlen($mNewParent))
-								{
-									$sParent = \strlen($sParent) ? $sParent.$sDelimiter.$mNewParent : $mNewParent;
-								}
-							}
-
-							$sFullNameToCheck = $mFolderNameToCreate;
-							if (\strlen($sParent))
-							{
-								$sFullNameToCheck = $sParent.$sDelimiter.$sFullNameToCheck;
-							}
-
-							if (!isset($oFolderCollection[$sFullNameToCheck]))
-							{
-								try
-								{
-									$this->MailClient()->FolderCreate($mFolderNameToCreate, $sParent, true, $sDelimiter);
-									$bDoItAgain = true;
-								}
-								catch (\Throwable $oException)
-								{
-									$this->Logger()->WriteException($oException);
-								}
-							}
-						}
+			if (isset($oNamespaces->aShared[0])) try {
+				$oCollection = $this->MailClient()->Folders($oNamespaces->aShared[0]['prefix'], '*', $HideUnsubscribed);
+				if ($oCollection) {
+					foreach ($oCollection as $oFolder) {
+						$oFolderCollection[$oFolder->FullName] = $oFolder;
 					}
 				}
-
-				if ($bDoItAgain)
-				{
-					$oFolderCollection = $this->getFolderCollection($HideUnsubscribed);
-
-					if ($oFolderCollection)
-					{
-						$aSystemFolders = array();
-						$this->recFoldersTypes($oAccount, $oFolderCollection, $aSystemFolders);
-					}
-				}
-			}
-
-			if ($oFolderCollection)
-			{
-				$this->Plugins()->RunHook('filter.folders-complete', array($oAccount, $oFolderCollection));
-
-				$aQuota = null;
-				if ($this->GetCapa(Capa::QUOTA)) {
-					try {
-//						$aQuota = $this->MailClient()->Quota();
-						$aQuota = $this->MailClient()->QuotaRoot();
-					} catch (\Throwable $oException) {
-						// ignore
-					}
-				}
-
-				$aCapabilities = \array_filter($this->MailClient()->Capabilities(), function($item){
-					return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item);
-				});
-				if (!$this->Config()->Get('labs', 'imap_use_list_status', true)) {
-					$key = \array_search('LIST-STATUS', $aCapabilities);
-					if (false !== $key) {
-						unset($aCapabilities[$key]);
-					}
-				}
-
-				$oFolderCollection = \array_merge(
-					$oFolderCollection->jsonSerialize(),
-					array(
-						'quotaUsage' => $aQuota ? $aQuota[0] * 1024 : null,
-						'quotaLimit' => $aQuota ? $aQuota[1] * 1024 : null,
-						'Namespace' => $sNamespace,
-						'IsThreadsSupported' => $this->MailClient()->IsThreadsSupported(),
-						'Optimized' => $oFolderCollection->Optimized,
-						'CountRec' => $oFolderCollection->TotalCount,
-						'SystemFolders' => empty($aSystemFolders) ? null : $aSystemFolders,
-						'Capabilities' => \array_values($aCapabilities)
-					)
-				);
+			} catch (\Throwable $e) {
+				// https://github.com/the-djmaze/snappymail/issues/1438
+				// $oAccount->Domain()->ImapSettings()->disabled_capabilities[] = 'NAMESPACE';
+				// $this->DomainProvider()->Save($oAccount->Domain());
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $oFolderCollection);
+		if ($oFolderCollection) {
+			try {
+//				$aQuota = $this->ImapClient()->Quota();
+				$aQuota = $this->ImapClient()->QuotaRoot();
+			} catch (\Throwable $oException) {
+				// ignore
+			}
+
+			$aCapabilities = \array_values(\array_filter($this->ImapClient()->Capability() ?: [], function ($item) {
+				return !\preg_match('/^(IMAP|AUTH|LOGIN|SASL)/', $item);
+			}));
+
+			$oFolderCollection = \array_merge(
+				$oFolderCollection->jsonSerialize(),
+				array(
+					'quotaUsage' => $aQuota ? $aQuota[0] * 1024 : null,
+					'quotaLimit' => $aQuota ? $aQuota[1] * 1024 : null,
+					'namespace' => $oNamespaces ? $oNamespaces->GetPersonalPrefix() : '',
+					'namespaces' => $oNamespaces,
+					'capabilities' => $aCapabilities
+				)
+			);
+		}
+
+		return $this->DefaultResponse($oFolderCollection);
 	}
 
 	public function DoFolderCreate() : array
@@ -222,13 +118,13 @@ trait Folders
 		try
 		{
 			$oFolder = $this->MailClient()->FolderCreate(
-				$this->GetActionParam('Folder', ''),
-				$this->GetActionParam('Parent', ''),
-				!!$this->GetActionParam('Subscribe', 1)
+				$this->GetActionParam('folder', ''),
+				$this->GetActionParam('parent', ''),
+				!empty($this->GetActionParam('subscribe', 0))
 			);
 
 //			FolderInformation(string $sFolderName, int $iPrevUidNext = 0, array $aUids = array())
-			return $this->DefaultResponse(__FUNCTION__, $oFolder);
+			return $this->DefaultResponse($oFolder);
 		}
 		catch (\Throwable $oException)
 		{
@@ -239,137 +135,178 @@ trait Folders
 	public function DoFolderSetMetadata() : array
 	{
 		$this->initMailClientConnection();
-		$sFolderFullName = $this->GetActionParam('Folder');
-		$sMetadataKey = $this->GetActionParam('Key');
+		$sFolderFullName = $this->GetActionParam('folder');
+		$sMetadataKey = $this->GetActionParam('key');
 		if ($sFolderFullName && $sMetadataKey) {
-			$this->MailClient()->FolderSetMetadata($sFolderFullName, [
-				$sMetadataKey => $this->GetActionParam('Value') ?: null
+			$this->ImapClient()->FolderSetMetadata($sFolderFullName, [
+				$sMetadataKey => $this->GetActionParam('value') ?: null
 			]);
 		}
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
+	}
+
+	public function DoFolderSettings() : array
+	{
+		$this->initMailClientConnection();
+
+		$sFolderFullName = $this->GetActionParam('folder', '');
+
+		// DoFolderSubscribe
+		try
+		{
+			$bSubscribe = !empty($this->GetActionParam('subscribe', 0));
+			$this->ImapClient()->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sFolderFullName);
+		}
+		catch (\Throwable $oException)
+		{
+		}
+
+		// DoFolderCheckable
+		$this->SetFolderCheckable($sFolderFullName, !empty($this->GetActionParam('checkable')));
+
+		// DoFolderSetMetadata
+		try
+		{
+			$aKolab = $this->GetActionParam('kolab');
+			if ($aKolab['type']) {
+				$this->ImapClient()->FolderSetMetadata($sFolderFullName, [
+					$aKolab['type'] => $aKolab['value'] ?: null
+				]);
+			}
+		}
+		catch (\Throwable $oException)
+		{
+		}
+
+		return $this->TrueResponse();
 	}
 
 	public function DoFolderSubscribe() : array
 	{
 		$this->initMailClientConnection();
 
-		$sFolderFullName = $this->GetActionParam('Folder', '');
-		$bSubscribe = '1' === (string) $this->GetActionParam('Subscribe', '0');
+		$sFolderFullName = $this->GetActionParam('folder', '');
+		$bSubscribe = !empty($this->GetActionParam('subscribe', 0));
 
 		try
 		{
-			$this->MailClient()->FolderSubscribe($sFolderFullName, $bSubscribe);
+			$this->ImapClient()->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sFolderFullName);
 		}
 		catch (\Throwable $oException)
 		{
-			if ($bSubscribe)
-			{
-				throw new ClientException(Notifications::CantSubscribeFolder, $oException);
-			}
-			else
-			{
-				throw new ClientException(Notifications::CantUnsubscribeFolder, $oException);
-			}
+			throw new ClientException(
+				$bSubscribe ? Notifications::CantSubscribeFolder : Notifications::CantUnsubscribeFolder,
+				$oException
+			);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
+	}
+
+	protected function SetFolderCheckable(string $sFolderFullName, bool $bCheckable) : bool
+	{
+		$oAccount = $this->getAccountFromToken();
+		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+
+		$aCheckableFolders = \json_decode($oSettingsLocal->GetConf('CheckableFolder', '[]'));
+		if (!\is_array($aCheckableFolders)) {
+			$aCheckableFolders = array();
+		}
+
+		if ($bCheckable) {
+			$aCheckableFolders[] = $sFolderFullName;
+		} else if (($key = \array_search($sFolderFullName, $aCheckableFolders)) !== false) {
+			\array_splice($aCheckableFolders, $key, 1);
+		}
+
+		$oSettingsLocal->SetConf('CheckableFolder', \json_encode(\array_unique($aCheckableFolders)));
+
+		return $oSettingsLocal->save();
 	}
 
 	public function DoFolderCheckable() : array
 	{
-		$oAccount = $this->getAccountFromToken();
-
-		$sFolderFullName = $this->GetActionParam('Folder', '');
-		$bCheckable = '1' === (string) $this->GetActionParam('Checkable', '0');
-
-		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
-
-		$sCheckableFolder = $oSettingsLocal->GetConf('CheckableFolder', '[]');
-		$aCheckableFolder = \json_decode($sCheckableFolder);
-
-		if (!\is_array($aCheckableFolder))
-		{
-			$aCheckableFolder = array();
-		}
-
-		if ($bCheckable)
-		{
-			$aCheckableFolder[] = $sFolderFullName;
-		}
-		else
-		{
-			$aCheckableFolderNew = array();
-			foreach ($aCheckableFolder as $sFolder)
-			{
-				if ($sFolder !== $sFolderFullName)
-				{
-					$aCheckableFolderNew[] = $sFolder;
-				}
-			}
-			$aCheckableFolder = $aCheckableFolderNew;
-		}
-
-		$aCheckableFolder = \array_unique($aCheckableFolder);
-
-		$oSettingsLocal->SetConf('CheckableFolder', \json_encode($aCheckableFolder));
-
-		return $this->DefaultResponse(__FUNCTION__,
-			$this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
+		return $this->DefaultResponse(
+			$this->SetFolderCheckable(
+				$this->GetActionParam('folder', ''),
+				!empty($this->GetActionParam('checkable'))
+			)
+		);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
-	 */
-	public function DoFolderMove() : array
-	{
-		$this->initMailClientConnection();
-
-		try
-		{
-			$this->MailClient()->FolderMove(
-				$this->GetActionParam('Folder', ''),
-				$this->GetActionParam('NewFolder', ''),
-				!!$this->GetActionParam('Subscribe', 1)
-			);
-		}
-		catch (\Throwable $oException)
-		{
-			throw new ClientException(Notifications::CantRenameFolder, $oException);
-		}
-
-		return $this->TrueResponse(__FUNCTION__);
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFolderRename() : array
 	{
 		$this->initMailClientConnection();
 
-		$sName = $this->GetActionParam('NewFolderName', '');
 		try
 		{
-			$sFullName = $this->MailClient()->FolderRename(
-				$this->GetActionParam('Folder', ''),
-				$sName,
-				!!$this->GetActionParam('Subscribe', 1)
-			);
+			$sOldName = $this->GetActionParam('oldName', '');
+			$sNewName = $this->GetActionParam('newName', '');
+			$sDelimiter = $this->ImapClient()->FolderHierarchyDelimiter($sOldName);
+
+			$this->MailClient()->FolderRename($sOldName, $sNewName);
+
+			// DoFolderSubscribe
+			try
+			{
+				$bSubscribe = !empty($this->GetActionParam('subscribe', 0));
+				$this->ImapClient()->{$bSubscribe ? 'FolderSubscribe' : 'FolderUnsubscribe'}($sNewName);
+			}
+			catch (\Throwable $oException)
+			{
+			}
+
+			// DoFolderCheckable
+			$oAccount = $this->getAccountFromToken();
+			$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+			$aCheckableFolders = \json_decode($oSettingsLocal->GetConf('CheckableFolder', '[]'));
+			$aRemoveFolders = [];
+			if (\is_array($aCheckableFolders)) {
+				foreach ($aCheckableFolders as $sFolder) {
+					if (\str_starts_with($sFolder . $sDelimiter, $sOldName . $sDelimiter)) {
+						$aRemoveFolders[] = $sFolder;
+						if ($sFolder !== $sOldName) {
+							$aCheckableFolders[] = $sNewName . $sDelimiter . \substr($sFolder, \strlen($sOldName) + 1);
+						}
+					}
+				}
+				$aCheckableFolders = \array_diff($aCheckableFolders, $aRemoveFolders);
+			} else {
+				$aCheckableFolders = [];
+			}
+			if ($this->GetActionParam('checkable')) {
+				$aCheckableFolders[] = $sNewName;
+			}
+			$oSettingsLocal->SetConf('CheckableFolder', \json_encode(\array_unique($aCheckableFolders)));
+			$oSettingsLocal->save();
+
+			// DoFolderSetMetadata
+			try
+			{
+				$aKolab = $this->GetActionParam('kolab');
+				if ($aKolab['type']) {
+					$this->ImapClient()->FolderSetMetadata($sNewName, [
+						$aKolab['type'] => $aKolab['value'] ?: null
+					]);
+				}
+			}
+			catch (\Throwable $oException)
+			{
+			}
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantRenameFolder, $oException);
 		}
 
-//		FolderInformation(string $sFolderName, int $iPrevUidNext = 0, array $aUids = array())
-		return $this->DefaultResponse(__FUNCTION__, array(
-			'Name' => $sName,
-			'FullName' => $sFullName,
-		));
+		return $this->TrueResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFolderDelete() : array
 	{
@@ -377,7 +314,7 @@ trait Folders
 
 		try
 		{
-			$this->MailClient()->FolderDelete($this->GetActionParam('Folder', ''));
+			$this->ImapClient()->FolderDelete($this->GetActionParam('folder', ''));
 		}
 		catch (\MailSo\Mail\Exceptions\NonEmptyFolder $oException)
 		{
@@ -388,11 +325,11 @@ trait Folders
 			throw new ClientException(Notifications::CantDeleteFolder, $oException);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFolderClear() : array
 	{
@@ -400,18 +337,18 @@ trait Folders
 
 		try
 		{
-			$this->MailClient()->FolderClear($this->GetActionParam('Folder', ''));
+			$this->ImapClient()->FolderClear($this->GetActionParam('folder', ''));
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFolderInformation() : array
 	{
@@ -419,61 +356,43 @@ trait Folders
 
 		try
 		{
-			$aInboxInformation = $this->MailClient()->FolderInformation(
-				$this->GetActionParam('Folder', ''),
-				(int) $this->GetActionParam('UidNext', 0),
-				new \MailSo\Imap\SequenceSet($this->GetActionParam('FlagsUids', []))
-			);
-			$aInboxInformation['Flags'] = $aInboxInformation['MessagesFlags'];
-			unset($aInboxInformation['MessagesFlags']);
+			return $this->DefaultResponse($this->MailClient()->FolderInformation(
+				$this->GetActionParam('folder', ''),
+				(int) $this->GetActionParam('uidNext', 0),
+				new \MailSo\Imap\SequenceSet($this->GetActionParam('flagsUids', []))
+			));
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
-
-		return $this->DefaultResponse(__FUNCTION__, $aInboxInformation);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoFolderInformationMultiply() : array
 	{
 		$aResult = array();
 
-		$aFolders = $this->GetActionParam('Folders', null);
-		if (\is_array($aFolders))
-		{
+		$aFolders = $this->GetActionParam('folders', null);
+		if (\is_array($aFolders)) {
 			$this->initMailClientConnection();
 
 			$aFolders = \array_unique($aFolders);
-			foreach ($aFolders as $sFolder)
-			{
-				if (\strlen($sFolder) && 'INBOX' !== \strtoupper($sFolder))
+			foreach ($aFolders as $sFolder) {
+				try
 				{
-					try
-					{
-						$aInboxInformation = $this->MailClient()->FolderInformation($sFolder);
-						if (isset($aInboxInformation['Folder']))
-						{
-							$aResult[] = [
-								'Folder' => $aInboxInformation['Folder'],
-								'Hash' => $aInboxInformation['Hash'],
-								'MessageCount' => $aInboxInformation['MessageCount'],
-								'MessageUnseenCount' => $aInboxInformation['MessageUnseenCount'],
-							];
-						}
-					}
-					catch (\Throwable $oException)
-					{
-						$this->Logger()->WriteException($oException);
-					}
+					$aResult[] = $this->MailClient()->FolderInformation($sFolder);
+				}
+				catch (\Throwable $oException)
+				{
+					$this->logException($oException);
 				}
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $aResult);
+		return $this->DefaultResponse($aResult);
 	}
 
 	public function DoSystemFoldersUpdate() : array
@@ -482,132 +401,48 @@ trait Folders
 
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
-		$oSettingsLocal->SetConf('SentFolder', $this->GetActionParam('Sent', ''));
-		$oSettingsLocal->SetConf('DraftFolder', $this->GetActionParam('Drafts', ''));
-		$oSettingsLocal->SetConf('SpamFolder', $this->GetActionParam('Spam', ''));
-		$oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('Trash', ''));
-		$oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('Archive', ''));
+		$oSettingsLocal->SetConf('SentFolder', $this->GetActionParam('sent', ''));
+		$oSettingsLocal->SetConf('DraftsFolder', $this->GetActionParam('drafts', ''));
+		$oSettingsLocal->SetConf('JunkFolder', $this->GetActionParam('junk', ''));
+		$oSettingsLocal->SetConf('TrashFolder', $this->GetActionParam('trash', ''));
+		$oSettingsLocal->SetConf('ArchiveFolder', $this->GetActionParam('archive', ''));
 
-		return $this->DefaultResponse(__FUNCTION__,
-			$this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
+		return $this->DefaultResponse($oSettingsLocal->save());
 	}
 
-	private function recFoldersTypes(\RainLoop\Model\Account $oAccount, \MailSo\Mail\FolderCollection $oFolders, array &$aResult, bool $bListFolderTypes = true) : void
+	public function DoFolderACL() : array
 	{
-		if ($oFolders->Count())
-		{
-			if ($bListFolderTypes)
-			{
-				foreach ($oFolders as $oFolder)
-				{
-					$iFolderType = $oFolder->GetFolderListType();
-					if (!isset($aResult[$iFolderType]) && \in_array($iFolderType, array(
-						FolderType::INBOX,
-						FolderType::SENT,
-						FolderType::DRAFTS,
-						FolderType::JUNK,
-						FolderType::TRASH,
-						FolderType::ARCHIVE
-					)))
-					{
-						$aResult[$iFolderType] = $oFolder->FullName();
-					}
-				}
-			}
-
-			$aMap = $this->systemFoldersNames($oAccount);
-			foreach ($oFolders as $oFolder)
-			{
-				$sName = $oFolder->Name();
-				$sFullName = $oFolder->FullName();
-
-				if (isset($aMap[$sName]) || isset($aMap[$sFullName]))
-				{
-					$iFolderType = isset($aMap[$sName]) ? $aMap[$sName] : $aMap[$sFullName];
-					if ((!isset($aResult[$iFolderType]) || $sName === $sFullName || "INBOX{$oFolder->Delimiter()}{$sName}" === $sFullName) && \in_array($iFolderType, array(
-						FolderType::INBOX,
-						FolderType::SENT,
-						FolderType::DRAFTS,
-						FolderType::JUNK,
-						FolderType::TRASH,
-						FolderType::ARCHIVE
-					)))
-					{
-						$aResult[$iFolderType] = $oFolder->FullName();
-					}
-				}
-			}
-		}
+		$this->initMailClientConnection();
+		return $this->DefaultResponse([
+			'@Object' => 'Collection/FolderACL',
+			'@Collection' => $this->ImapClient()->FolderGetACL(
+				$this->GetActionParam('folder', '')
+			)
+		]);
 	}
 
-	/**
-	 * @staticvar array $aCache
-	 */
-	private function systemFoldersNames(\RainLoop\Model\Account $oAccount) : array
+	public function DoFolderDeleteACL() : array
 	{
-		static $aCache = null;
-		if (null === $aCache)
-		{
-			$aCache = array(
-
-				'Sent' => FolderType::SENT,
-				'Send' => FolderType::SENT,
-
-				'Outbox' => FolderType::SENT,
-				'Out box' => FolderType::SENT,
-
-				'Sent Item' => FolderType::SENT,
-				'Sent Items' => FolderType::SENT,
-				'Send Item' => FolderType::SENT,
-				'Send Items' => FolderType::SENT,
-				'Sent Mail' => FolderType::SENT,
-				'Sent Mails' => FolderType::SENT,
-				'Send Mail' => FolderType::SENT,
-				'Send Mails' => FolderType::SENT,
-
-				'Drafts' => FolderType::DRAFTS,
-
-				'Draft' => FolderType::DRAFTS,
-				'Draft Mail' => FolderType::DRAFTS,
-				'Draft Mails' => FolderType::DRAFTS,
-				'Drafts Mail' => FolderType::DRAFTS,
-				'Drafts Mails' => FolderType::DRAFTS,
-
-				'Junk E-mail' => FolderType::JUNK,
-
-				'Spam' => FolderType::JUNK,
-				'Spams' => FolderType::JUNK,
-
-				'Junk' => FolderType::JUNK,
-				'Bulk Mail' => FolderType::JUNK,
-				'Bulk Mails' => FolderType::JUNK,
-
-				'Deleted Items' => FolderType::TRASH,
-
-				'Trash' => FolderType::TRASH,
-				'Deleted' => FolderType::TRASH,
-				'Bin' => FolderType::TRASH,
-
-				'Archive' => FolderType::ARCHIVE,
-				'Archives' => FolderType::ARCHIVE,
-
-				'All' => FolderType::ALL,
-				'All Mail' => FolderType::ALL,
-				'All Mails' => FolderType::ALL,
-			);
-
-			$aNewCache = array();
-			foreach ($aCache as $sKey => $iType)
-			{
-				$aNewCache[$sKey] = $iType;
-				$aNewCache[\str_replace(' ', '', $sKey)] = $iType;
-			}
-
-			$aCache = $aNewCache;
-
-			$this->Plugins()->RunHook('filter.system-folders-names', array($oAccount, &$aCache));
-		}
-
-		return $aCache;
+		$this->initMailClientConnection();
+		$this->ImapClient()->FolderDeleteACL(
+			$this->GetActionParam('folder', ''),
+			$this->GetActionParam('identifier', '')
+		);
+		return $this->TrueResponse();
 	}
+
+	public function DoFolderSetACL() : array
+	{
+//		$oImapClient->FolderSetACL('INBOX', 'demo@snappymail.eu', 'lrwstipekxacd');
+//		$oImapClient->FolderSetACL($sFolderFullName, 'demo@snappymail.eu', 'lrwstipekxacd');
+//		$oImapClient->FolderSetACL($sFolderFullName, 'foobar@snappymail.eu', 'lr');
+		$this->initMailClientConnection();
+		$this->ImapClient()->FolderSetACL(
+			$this->GetActionParam('folder', ''),
+			$this->GetActionParam('identifier', ''),
+			$this->GetActionParam('rights', '')
+		);
+		return $this->TrueResponse();
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
index 58a979b97..d0b2069ac 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Localization.php
@@ -8,94 +8,61 @@ trait Localization
 	{
 		$oConfig = $this->Config();
 		if ($bAdmin) {
-			$sLanguage = $oConfig->Get('webmail', 'language_admin', 'en');
+			$sLanguage = $oConfig->Get('admin_panel', 'language', 'en');
 		} else {
 			$sLanguage = $oConfig->Get('webmail', 'language', 'en');
 			if ($oAccount = $this->getAccountFromToken(false)) {
+				if ($oConfig->Get('login', 'determine_user_language', true)) {
+					$sLanguage = $this->ValidateLanguage($this->detectClientLanguage($bAdmin), $sLanguage, false);
+				}
 				if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)
 				 && ($oSettings = $this->SettingsProvider()->Load($oAccount))) {
-					$sLanguage = $oSettings->GetConf('Language', $sLanguage);
+					$sLanguage = $oSettings->GetConf('language', $sLanguage);
 				}
 			} else if ($oConfig->Get('login', 'allow_languages_on_login', true) && $oConfig->Get('login', 'determine_user_language', true)) {
-				$sLanguage = $this->ValidateLanguage($this->detectUserLanguage($bAdmin), $sLanguage, false);
+				$sLanguage = $this->ValidateLanguage($this->detectClientLanguage($bAdmin), $sLanguage, false);
 			}
 		}
-		return $this->ValidateLanguage($sLanguage, '', $bAdmin) ?: 'en';
+		$sHookLanguage = $sLanguage = $this->ValidateLanguage($sLanguage, '', $bAdmin) ?: 'en';
+		$this->Plugins()->RunHook('filter.language', array(&$sHookLanguage, $bAdmin));
+		return $this->ValidateLanguage($sHookLanguage, $sLanguage, $bAdmin);
 	}
 
 	public function ValidateLanguage(string $sLanguage, string $sDefault = '', bool $bAdmin = false, bool $bAllowEmptyResult = false): string
 	{
-		$aLang = \SnappyMail\L10n::getLanguages($bAdmin);
+		$sResult = \SnappyMail\L10n::validLanguage($sLanguage, $bAdmin)
+		?: \SnappyMail\L10n::validLanguage($sDefault, $bAdmin);
 
-		$aHelper = array(
-			'ar' => 'ar-SA',
-			'cs' => 'cs-CZ',
-			'no' => 'nb-NO',
-			'ua' => 'uk-UA',
-			'cn' => 'zh-CN',
-			'zh' => 'zh-CN',
-			'tw' => 'zh-TW',
-			'fa' => 'fa-IR'
-		);
-
-		$sLanguage = isset($aHelper[$sLanguage]) ? $aHelper[$sLanguage] : \strtr($sLanguage, '_', '-');
-		$sDefault  = isset($aHelper[$sDefault])  ? $aHelper[$sDefault]  : \strtr($sDefault, '_', '-');
-
-		if (\in_array($sLanguage, $aLang)) {
-			return $sLanguage;
+		if ($sResult || $bAllowEmptyResult) {
+			return $sResult ?: '';
 		}
 
-		$sLanguage = \preg_replace('/^([a-zA-Z]{2})$/', '\1-\1', $sLanguage);
-
-		$sLangCountry = \preg_replace_callback('/-([a-zA-Z]{2})$/', function ($aData) {
-			return \strtoupper($aData[0]);
-		}, $sLanguage);
-		if (\in_array($sLangCountry, $aLang)) {
-			return $sLangCountry;
-		}
-
-		if (\in_array($sDefault, $aLang)) {
-			return $sDefault;
-		}
-
-		if ($bAllowEmptyResult) {
-			return '';
-		}
-
-		$sResult = $this->Config()->Get('webmail', $bAdmin ? 'language_admin' : 'language', 'en');
-		return \in_array($sResult, $aLang) ? $sResult : 'en';
+		$sResult = $this->Config()->Get($bAdmin ? 'admin_panel' : 'webmail', 'language', 'en');
+		return \SnappyMail\L10n::validLanguage($sResult, $bAdmin) ? $sResult : 'en';
 	}
 
-	private function getUserLanguagesFromHeader(): array
+	public function detectClientLanguage(bool $bAdmin): string
 	{
-		$aResult = $aList = array();
-		$sAcceptLang = \strtolower($this->Http()->GetServer('HTTP_ACCEPT_LANGUAGE', 'en'));
+		$aLangs = $aList = array();
+
+		$sAcceptLang = \strtolower(\MailSo\Base\Http::GetServer('HTTP_ACCEPT_LANGUAGE', 'en'));
 		if (!empty($sAcceptLang) && \preg_match_all('/([a-z]{1,8}(?:-[a-z]{1,8})?)(?:;q=([0-9.]+))?/', $sAcceptLang, $aList)) {
-			$aResult = \array_combine($aList[1], $aList[2]);
-			foreach ($aResult as $n => $v) {
-				$aResult[$n] = $v ? $v : 1;
+			$aLangs = \array_combine($aList[1], $aList[2]);
+			foreach ($aLangs as $n => $v) {
+				$aLangs[$n] = $v ? $v : 1;
 			}
 
-			\arsort($aResult, SORT_NUMERIC);
+			\arsort($aLangs, SORT_NUMERIC);
 		}
 
-		return $aResult;
-	}
-
-	public function detectUserLanguage(bool $bAdmin): string
-	{
-		$sResult = '';
-		$aLangs = $this->getUserLanguagesFromHeader();
-
 		foreach (\array_keys($aLangs) as $sLang) {
 			$sLang = $this->ValidateLanguage($sLang, '', $bAdmin, true);
 			if (!empty($sLang)) {
-				$sResult = $sLang;
-				break;
+				return $sLang;
 			}
 		}
 
-		return $sResult;
+		return '';
 	}
 
 	public function StaticI18N(string $sKey): string
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
index 38a4a96b0..1153e9bee 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Messages.php
@@ -2,7 +2,6 @@
 
 namespace RainLoop\Actions;
 
-use RainLoop\Enumerations\Capa;
 use RainLoop\Exceptions\ClientException;
 use RainLoop\Model\Account;
 use RainLoop\Notifications;
@@ -10,11 +9,12 @@ use MailSo\Imap\SequenceSet;
 use MailSo\Imap\Enumerations\FetchType;
 use MailSo\Imap\Enumerations\MessageFlag;
 use MailSo\Mime\Part as MimePart;
+use MailSo\Mime\Enumerations\Header as MimeEnumHeader;
 
 trait Messages
 {
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoMessageList() : array
 	{
@@ -22,78 +22,92 @@ trait Messages
 //		throw new ClientException(Notifications::CantGetMessageList);
 		$oParams = new \MailSo\Mail\MessageListParams;
 
-		$sRawKey = $this->GetActionParam('RawKey', '');
-		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
-		if ($aValues && 6 < \count($aValues))
-		{
-			$this->verifyCacheByKey($sRawKey);
-
-//			$oParams->sHash = (string) $aValues['Hash'];
-			$oParams->sFolderName = (string) $aValues['Folder'];
-			$oParams->iLimit = $aValues['Limit'];
-			$oParams->iOffset = $aValues['Offset'];
-			$oParams->sSearch = (string) $aValues['Search'];
-			$oParams->sSort = (string) $aValues['Sort'];
-			if (isset($aValues['UidNext'])) {
-				$oParams->iPrevUidNext = $aValues['UidNext'];
+		$aValues = $this->decodeRawKey($this->GetActionParam('RawKey', ''));
+		$sHash = '';
+		if ($aValues && 6 < \count($aValues)) {
+			// GET
+			$sHash = (string) $aValues['hash'];
+			$oParams->sFolderName = (string) $aValues['folder'];
+			$oParams->iLimit = $aValues['limit'];
+			$oParams->iOffset = $aValues['offset'];
+			$oParams->sSearch = (string) $aValues['search'];
+			$oParams->sSort = (string) $aValues['sort'];
+			if (isset($aValues['uidNext'])) {
+				$oParams->iPrevUidNext = $aValues['uidNext'];
 			}
-			$oParams->bUseThreads = !empty($aValues['UseThreads']);
-			if ($oParams->bUseThreads && isset($aValues['ThreadUid'])) {
-				$oParams->iThreadUid = $aValues['ThreadUid'];
-			}
-		}
-		else
-		{
-			$oParams->sFolderName = $this->GetActionParam('Folder', '');
-			$oParams->iOffset = $this->GetActionParam('Offset', 0);
-			$oParams->iLimit = $this->GetActionParam('Limit', 10);
-			$oParams->sSearch = $this->GetActionParam('Search', '');
-			$oParams->sSort = $this->GetActionParam('Sort', '');
-			$oParams->iPrevUidNext = $this->GetActionParam('UidNext', 0);
-			$oParams->bUseThreads = !empty($this->GetActionParam('UseThreads', '0'));
+			$oParams->bUseThreads = !empty($aValues['useThreads']);
 			if ($oParams->bUseThreads) {
-				$oParams->iThreadUid = $this->GetActionParam('ThreadUid', '');
+				if (isset($aValues['threadUid'])) {
+					$oParams->iThreadUid = $aValues['threadUid'];
+				}
+				if (isset($aValues['threadAlgorithm'])) {
+					$oParams->sThreadAlgorithm = $aValues['threadAlgorithm'];
+				}
+			}
+		} else {
+			// POST
+			$oParams->sFolderName = $this->GetActionParam('folder', '');
+			$oParams->iOffset = $this->GetActionParam('offset', 0);
+			$oParams->iLimit = $this->GetActionParam('limit', 10);
+			$oParams->sSearch = $this->GetActionParam('search', '');
+			$oParams->sSort = $this->GetActionParam('sort', '');
+			$oParams->iPrevUidNext = $this->GetActionParam('uidNext', 0);
+			$oParams->bUseThreads = !empty($this->GetActionParam('useThreads', '0'));
+			if ($oParams->bUseThreads) {
+				$oParams->iThreadUid = $this->GetActionParam('threadUid', '');
+				$oParams->sThreadAlgorithm = $this->GetActionParam('threadAlgorithm', '');
 			}
 		}
 
-		if (!\strlen($oParams->sFolderName))
-		{
+		if (!\strlen($oParams->sFolderName)) {
 			throw new ClientException(Notifications::CantGetMessageList);
 		}
 
-		$this->initMailClientConnection();
+		$oAccount = $this->initMailClientConnection();
+
+		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+		if ($oSettingsLocal instanceof \RainLoop\Settings) {
+			$oParams->bHideDeleted = !empty($oSettingsLocal->GetConf('HideDeleted', 1));
+		}
+
+//		$oParams->bUseSort = $this->ImapClient()->hasCapability('SORT');
+		$oParams->bUseSort = true;
+
+		if ($sHash) {
+			$oInfo = $this->ImapClient()->FolderStatusAndSelect($oParams->sFolderName);
+			$aRequestHash = \explode('-', $sHash);
+			$sNewHash = $oParams->hash() . '-' . $oInfo->etag;
+			if ($aRequestHash[1] == $oInfo->etag) {
+				$this->verifyCacheByKey($sNewHash);
+			}
+			$sHash = $sNewHash;
+		}
 
 		try
 		{
-			if (!$this->Config()->Get('labs', 'use_imap_thread', false)) {
-				$oParams->bUseThreads = false;
+			if ($this->Config()->Get('cache', 'enable', true) && $this->Config()->Get('cache', 'server_uids', false)) {
+				$oParams->oCacher = $this->Cacher($oAccount);
 			}
 
-			$oParams->oCacher = $this->cacherForUids();
-			$oParams->bUseSortIfSupported = !!$this->Config()->Get('labs', 'use_imap_sort', true);
-
+//			\ignore_user_abort(true);
 			$oMessageList = $this->MailClient()->MessageList($oParams);
+			if ($sHash) {
+				$this->cacheByKey($sHash);
+			}
+			return $this->DefaultResponse($oMessageList);
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantGetMessageList, $oException);
 		}
-
-		if ($oMessageList)
-		{
-			$this->cacheByKey($sRawKey);
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $oMessageList);
 	}
 
 	public function DoSaveMessage() : array
 	{
 		$oAccount = $this->initMailClientConnection();
 
-		$sDraftFolder = $this->GetActionParam('SaveFolder', '');
-		if (!\strlen($sDraftFolder))
-		{
+		$sDraftFolder = $this->GetActionParam('saveFolder', '');
+		if (!\strlen($sDraftFolder)) {
 			throw new ClientException(Notifications::UnknownError);
 		}
 
@@ -102,60 +116,63 @@ trait Messages
 		$this->Plugins()->RunHook('filter.save-message', array($oMessage));
 
 		$mResult = false;
-		if ($oMessage)
-		{
+		if ($oMessage) {
 			$rMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
 
-			$iMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
-				$oMessage->ToStream(false), array($rMessageStream), 8192, true, true);
+			$iMessageStreamSize = \MailSo\Base\Utils::WriteStream($oMessage->ToStream(false), $rMessageStream, 8192, true);
 
-			if (false !== $iMessageStreamSize)
-			{
+			if (false !== $iMessageStreamSize) {
 				$sMessageId = $oMessage->MessageId();
 
 				\rewind($rMessageStream);
 
-				$iNewUid = 0;
-				$this->MailClient()->MessageAppendStream(
-					$rMessageStream, $iMessageStreamSize, $sDraftFolder, array(MessageFlag::SEEN), $iNewUid
+				$iNewUid = $this->ImapClient()->MessageAppendStream(
+					$sDraftFolder, $rMessageStream, $iMessageStreamSize, array(MessageFlag::SEEN)
 				);
 
-				if (!empty($sMessageId) && (null === $iNewUid || 0 === $iNewUid))
-				{
+				if (!empty($sMessageId) && (null === $iNewUid || 0 === $iNewUid)) {
 					$iNewUid = $this->MailClient()->FindMessageUidByMessageId($sDraftFolder, $sMessageId);
 				}
 
 				$mResult = true;
 
-				$sMessageFolder = $this->GetActionParam('MessageFolder', '');
-				$iMessageUid = (int) $this->GetActionParam('MessageUid', 0);
-				if (\strlen($sMessageFolder) && 0 < $iMessageUid)
-				{
-					$this->MailClient()->MessageDelete($sMessageFolder, new SequenceSet($iMessageUid));
+				$sMessageFolder = $this->GetActionParam('messageFolder', '');
+				$iMessageUid = (int) $this->GetActionParam('messageUid', 0);
+				if (\strlen($sMessageFolder) && 0 < $iMessageUid) {
+					$this->ImapClient()->MessageDelete($sMessageFolder, new SequenceSet($iMessageUid));
 				}
 
-				if (null !== $iNewUid && 0 < $iNewUid)
-				{
+				if (null !== $iNewUid && 0 < $iNewUid) {
 					$mResult = array(
-						'NewFolder' => $sDraftFolder,
-						'NewUid' => $iNewUid
+						'folder' => $sDraftFolder,
+						'uid' => $iNewUid
 					);
 				}
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $mResult);
+		return $this->DefaultResponse($mResult);
 	}
 
 	public function DoSendMessage() : array
 	{
 		$oAccount = $this->initMailClientConnection();
-
+/*
+		$aAuth = $this->GetActionParam('auth', null);
+		if ($aAuth) {
+			$oAccount->setSmtpUser($aAuth['username']);
+			$oAccount->setSmtpPass(new \SnappyMail\SensitiveString($aAuth['password']));
+//			if ($oAccount instanceof AdditionalAccount && !empty($aAuth['remember'])) {
+//				$oMainAccount = $this->getMainAccountFromToken();
+//				$aAccounts = $this->GetAccounts($oMainAccount);
+//				$this->SetAccounts($oMainAccount, $aAccounts);
+//			}
+		}
+*/
 		$oConfig = $this->Config();
 
-		$sSentFolder = $this->GetActionParam('SaveFolder', '');
-		$aDraftInfo = $this->GetActionParam('DraftInfo', null);
-		$bDsn = '1' === (string) $this->GetActionParam('Dsn', '0');
+		$sSaveFolder = $this->GetActionParam('saveFolder', '');
+		$aDraftInfo = $this->GetActionParam('draftInfo', null);
 
 		$oMessage = $this->buildMessage($oAccount, false);
 
@@ -164,19 +181,20 @@ trait Messages
 		$mResult = false;
 		try
 		{
-			if ($oMessage)
-			{
+			if ($oMessage) {
 				$rMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
 
-				$iMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
-					$oMessage->ToStream(true), array($rMessageStream), 8192, true, true, true);
+				$iMessageStreamSize = \MailSo\Base\Utils::WriteStream(
+					$oMessage->ToStream(true), $rMessageStream, 8192, true, true
+				);
 
-				if (false !== $iMessageStreamSize)
-				{
-					$this->smtpSendMessage($oAccount, $oMessage, $rMessageStream, $iMessageStreamSize, $bDsn, true);
+				if (false !== $iMessageStreamSize) {
+					$this->smtpSendMessage($oAccount, $oMessage, $rMessageStream, $iMessageStreamSize, true,
+						!empty($this->GetActionParam('dsn', 0)),
+						!empty($this->GetActionParam('requireTLS', 0))
+					);
 
-					if (\is_array($aDraftInfo) && 3 === \count($aDraftInfo))
-					{
+					if (\is_array($aDraftInfo) && 3 === \count($aDraftInfo)) {
 						$sDraftInfoType = $aDraftInfo[0];
 						$iDraftInfoUid = (int) $aDraftInfo[1];
 						$sDraftInfoFolder = $aDraftInfo[2];
@@ -187,87 +205,105 @@ trait Messages
 							{
 								case 'reply':
 								case 'reply-all':
-									$this->MailClient()->MessageSetFlag($sDraftInfoFolder, new SequenceSet($iDraftInfoUid),
-										MessageFlag::ANSWERED);
+									$this->MailClient()->MessageSetFlag($sDraftInfoFolder, new SequenceSet($iDraftInfoUid), MessageFlag::ANSWERED);
 									break;
 								case 'forward':
-									$sForwardedFlag = $this->Config()->Get('labs', 'imap_forwarded_flag', '');
-									if (\strlen($sForwardedFlag))
-									{
-										$this->MailClient()->MessageSetFlag($sDraftInfoFolder, new SequenceSet($iDraftInfoUid),
-											$sForwardedFlag);
-									}
+									$this->MailClient()->MessageSetFlag($sDraftInfoFolder, new SequenceSet($iDraftInfoUid), MessageFlag::FORWARDED);
 									break;
 							}
 						}
 						catch (\Throwable $oException)
 						{
-							$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+							$this->logException($oException, \LOG_ERR);
 						}
 					}
 
-					if (\strlen($sSentFolder))
-					{
+					if (\strlen($sSaveFolder)) {
+						$rAppendMessageStream = $rMessageStream;
+						$iAppendMessageStreamSize = $iMessageStreamSize;
 						try
 						{
-							if (!$oMessage->GetBcc())
-							{
-								if (\is_resource($rMessageStream))
-								{
-									\rewind($rMessageStream);
-								}
-
-								$this->Plugins()->RunHook('filter.send-message-stream',
-									array($oAccount, &$rMessageStream, &$iMessageStreamSize));
-
-								$this->MailClient()->MessageAppendStream(
-									$rMessageStream, $iMessageStreamSize, $sSentFolder, array(MessageFlag::SEEN)
-								);
-							}
-							else
-							{
+							if ($oMessage->GetBcc()) {
 								$rAppendMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
-
-								$iAppendMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
-									$oMessage->ToStream(false), array($rAppendMessageStream), 8192, true, true, true);
-
-								$this->Plugins()->RunHook('filter.send-message-stream',
-									array($oAccount, &$rAppendMessageStream, &$iAppendMessageStreamSize));
-
-								$this->MailClient()->MessageAppendStream(
-									$rAppendMessageStream, $iAppendMessageStreamSize, $sSentFolder, array(MessageFlag::SEEN)
+								$iAppendMessageStreamSize = \MailSo\Base\Utils::WriteStream(
+									$oMessage->ToStream(false), $rAppendMessageStream, 8192, true, true
 								);
-
-								if (\is_resource($rAppendMessageStream))
-								{
-									fclose($rAppendMessageStream);
+							} else {
+								if (\is_resource($rMessageStream)) {
+									\rewind($rMessageStream);
 								}
 							}
 						}
 						catch (\Throwable $oException)
 						{
+							$this->logException($oException, \LOG_ERR);
 							throw new ClientException(Notifications::CantSaveMessage, $oException);
 						}
+
+						try
+						{
+							$this->Plugins()->RunHook('filter.send-message-stream',
+								array($oAccount, &$rAppendMessageStream, &$iAppendMessageStreamSize));
+						}
+						catch (\Throwable $oException)
+						{
+							$this->logException($oException, \LOG_ERR);
+						}
+
+						try
+						{
+							$this->ImapClient()->MessageAppendStream(
+								$sSaveFolder, $rAppendMessageStream, $iAppendMessageStreamSize,
+								array(MessageFlag::SEEN)
+							);
+						}
+						catch (\Throwable $oException)
+						{
+							// Save folder not the same as default Sent folder, so try again
+							$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
+							if ($oSettingsLocal instanceof \RainLoop\Settings) {
+								$sSentFolder = (string) $oSettingsLocal->GetConf('SentFolder', '');
+								if (\strlen($sSentFolder) && $sSentFolder !== $sSaveFolder) {
+									$oException = null;
+									try
+									{
+										$this->ImapClient()->MessageAppendStream(
+											$sSentFolder, $rAppendMessageStream, $iAppendMessageStreamSize,
+											array(MessageFlag::SEEN)
+										);
+									}
+									catch (\Throwable $oException)
+									{
+									}
+								}
+							}
+							if ($oException) {
+								$this->logException($oException, \LOG_ERR);
+								throw new ClientException(Notifications::CantSaveMessage, $oException);
+							}
+						}
+
+						if (\is_resource($rAppendMessageStream) && $rAppendMessageStream !== $rMessageStream) {
+							\fclose($rAppendMessageStream);
+						}
 					}
 
-					if (\is_resource($rMessageStream))
-					{
+					if (\is_resource($rMessageStream)) {
 						\fclose($rMessageStream);
 					}
 
 					$this->deleteMessageAttachments($oAccount);
 
-					$sDraftFolder = $this->GetActionParam('MessageFolder', '');
-					$iDraftUid = (int) $this->GetActionParam('MessageUid', 0);
-					if (\strlen($sDraftFolder) && 0 < $iDraftUid)
-					{
+					$sDraftFolder = $this->GetActionParam('messageFolder', '');
+					$iDraftUid = (int) $this->GetActionParam('messageUid', 0);
+					if (\strlen($sDraftFolder) && 0 < $iDraftUid) {
 						try
 						{
-							$this->MailClient()->MessageDelete($sDraftFolder, new SequenceSet($iDraftUid));
+							$this->ImapClient()->MessageDelete($sDraftFolder, new SequenceSet($iDraftUid));
 						}
 						catch (\Throwable $oException)
 						{
-							$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+							$this->logException($oException, \LOG_ERR);
 						}
 					}
 
@@ -275,6 +311,10 @@ trait Messages
 				}
 			}
 		}
+		catch (\MailSo\Smtp\Exceptions\LoginBadCredentialsException $oException)
+		{
+			throw new ClientException(Notifications::AuthError, $oException);
+		}
 		catch (ClientException $oException)
 		{
 			throw $oException;
@@ -284,42 +324,37 @@ trait Messages
 			throw new ClientException(Notifications::CantSendMessage, $oException);
 		}
 
-		if (false === $mResult)
-		{
+		if (false === $mResult) {
 			throw new ClientException(Notifications::CantSendMessage);
 		}
 
 		try
 		{
-			if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive())
-			{
+			if ($oMessage && $this->AddressBookProvider($oAccount)->IsActive()) {
 				$aArrayToFrec = array();
 				$oToCollection = $oMessage->GetTo();
-				if ($oToCollection)
-				{
-					foreach ($oToCollection as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
-					{
+				if ($oToCollection) {
+					foreach ($oToCollection as /* @var $oEmail \MailSo\Mime\Email */ $oEmail) {
 						$aArrayToFrec[$oEmail->GetEmail(true)] = $oEmail->ToString(false, true);
 					}
 				}
 
-				if (\count($aArrayToFrec))
-				{
+				if (\count($aArrayToFrec)) {
 					$oSettings = $this->SettingsProvider()->Load($oAccount);
 
 					$this->AddressBookProvider($oAccount)->IncFrec(
-						$this->GetMainEmail($oAccount), \array_values($aArrayToFrec),
-							!!$oSettings->GetConf('ContactsAutosave',
-								!!$oConfig->Get('defaults', 'contacts_autosave', true)));
+						\array_values($aArrayToFrec),
+						!!$oSettings->GetConf('ContactsAutosave', !!$oConfig->Get('defaults', 'contacts_autosave', true))
+					);
 				}
 			}
 		}
 		catch (\Throwable $oException)
 		{
-			$this->Logger()->WriteException($oException);
+			$this->logException($oException);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoSendReadReceiptMessage() : array
@@ -333,39 +368,33 @@ trait Messages
 		$mResult = false;
 		try
 		{
-			if ($oMessage)
-			{
+			if ($oMessage) {
 				$rMessageStream = \MailSo\Base\ResourceRegistry::CreateMemoryResource();
 
-				$iMessageStreamSize = \MailSo\Base\Utils::MultipleStreamWriter(
-					$oMessage->ToStream(true), array($rMessageStream), 8192, true, true, true);
+				$iMessageStreamSize = \MailSo\Base\Utils::WriteStream(
+					$oMessage->ToStream(true), $rMessageStream, 8192, true, true
+				);
 
-				if (false !== $iMessageStreamSize)
-				{
-					$this->smtpSendMessage($oAccount, $oMessage, $rMessageStream, $iMessageStreamSize, false, false);
+				if (false !== $iMessageStreamSize) {
+					$this->smtpSendMessage($oAccount, $oMessage, $rMessageStream, $iMessageStreamSize, false);
 
-					if (\is_resource($rMessageStream))
-					{
+					if (\is_resource($rMessageStream)) {
 						\fclose($rMessageStream);
 					}
 
 					$mResult = true;
 
-					$sReadReceiptFlag = $this->Config()->Get('labs', 'imap_read_receipt_flag', '');
-					if (!empty($sReadReceiptFlag))
-					{
-						$sFolderFullName = $this->GetActionParam('MessageFolder', '');
-						$iUid = (int) $this->GetActionParam('MessageUid', 0);
+					$sFolderFullName = $this->GetActionParam('messageFolder', '');
+					$iUid = (int) $this->GetActionParam('messageUid', 0);
 
-						$this->Cacher($oAccount)->Set(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $sFolderFullName, $iUid), '1');
-
-						if (\strlen($sFolderFullName) && 0 < $iUid)
+					if (\strlen($sFolderFullName) && 0 < $iUid) {
+						try
 						{
-							try
-							{
-								$this->MailClient()->MessageSetFlag($sFolderFullName, new SequenceSet($iUid), $sReadReceiptFlag, true, true);
-							}
-							catch (\Throwable $oException) {}
+							$this->MailClient()->MessageSetFlag($sFolderFullName, new SequenceSet($iUid), MessageFlag::MDNSENT, true, true);
+						}
+						catch (\Throwable $oException)
+						{
+							$this->Cacher($oAccount)->Set(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $sFolderFullName, $iUid), '1');
 						}
 					}
 				}
@@ -380,32 +409,31 @@ trait Messages
 			throw new ClientException(Notifications::CantSendMessage, $oException);
 		}
 
-		if (false === $mResult)
-		{
+		if (false === $mResult) {
 			throw new ClientException(Notifications::CantSendMessage);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoMessageSetSeen() : array
 	{
-		return $this->messageSetFlag(MessageFlag::SEEN, __FUNCTION__);
+		return $this->messageSetFlag(MessageFlag::SEEN);
 	}
 
 	public function DoMessageSetSeenToAll() : array
 	{
 		$this->initMailClientConnection();
 
-		$sThreadUids = \trim($this->GetActionParam('ThreadUids', ''));
+		$sThreadUids = \trim($this->GetActionParam('threadUids', ''));
 
 		try
 		{
 			$this->MailClient()->MessageSetFlag(
-				$this->GetActionParam('Folder', ''),
+				$this->GetActionParam('folder', ''),
 				empty($sThreadUids) ? new SequenceSet('1:*', false) : new SequenceSet(\explode(',', $sThreadUids)),
 				MessageFlag::SEEN,
-				!empty($this->GetActionParam('SetAction', '0'))
+				!empty($this->GetActionParam('setAction', '0'))
 			);
 		}
 		catch (\Throwable $oException)
@@ -413,122 +441,184 @@ trait Messages
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoMessageSetFlagged() : array
 	{
-		return $this->messageSetFlag(MessageFlag::FLAGGED, __FUNCTION__, true);
+		return $this->messageSetFlag(MessageFlag::FLAGGED, true);
+	}
+
+	public function DoMessageSetDeleted() : array
+	{
+		return $this->messageSetFlag(MessageFlag::DELETED, true);
+	}
+
+	public function DoMessageSetKeyword() : array
+	{
+		return $this->messageSetFlag($this->GetActionParam('keyword', ''), true);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoMessage() : array
 	{
-		$sRawKey = (string) $this->GetActionParam('RawKey', '');
-
-		$sFolder = '';
-		$iUid = 0;
-
-		$aValues = \json_decode(\MailSo\Base\Utils::UrlSafeBase64Decode($sRawKey), true);
-		if ($aValues && 2 <= \count($aValues))
-		{
+		$aValues = $this->decodeRawKey((string) $this->GetActionParam('RawKey', ''));
+		if ($aValues && 2 <= \count($aValues)) {
 			$sFolder = (string) $aValues[0];
 			$iUid = (int) $aValues[1];
-
-			$this->verifyCacheByKey($sRawKey);
-		}
-		else
-		{
-			$sFolder = $this->GetActionParam('Folder', '');
-			$iUid = (int) $this->GetActionParam('Uid', 0);
+//			$useThreads = !empty($aValues[2]);
+//			$accountHash = $aValues[3];
+		} else {
+			$sFolder = $this->GetActionParam('folder', '');
+			$iUid = (int) $this->GetActionParam('uid', 0);
 		}
 
 		$oAccount = $this->initMailClientConnection();
 
 		try
 		{
-			$oMessage = $this->MailClient()->Message($sFolder, $iUid, true,
-				$this->cacherForThreads(),
-				(int) $this->Config()->Get('labs', 'imap_body_text_limit', 0)
-			);
+			$oMessage = $this->MailClient()->Message($sFolder, $iUid, true, $this->Cacher($oAccount));
+			if (!$oMessage) {
+				throw new \RuntimeException('Message not found');
+			}
+
+			$bAutoVerify = $this->Config()->Get('security', 'auto_verify_signatures', false);
+
+			// S/MIME signed. Verify it, so we have the raw mime body to show
+			if ($oMessage->smimeSigned && ($bAutoVerify || !$oMessage->smimeSigned['detached'])) try {
+				$bOpaque = !$oMessage->smimeSigned['detached'];
+				$sBody = $this->ImapClient()->FetchMessagePart(
+					$oMessage->Uid,
+					$oMessage->smimeSigned['partId']
+				);
+				$result = (new \SnappyMail\SMime\OpenSSL(''))->verify($sBody, null, $bOpaque);
+				if ($result) {
+					if ($bOpaque) {
+						$oMessage->smimeSigned['body'] = $result['body'];
+					}
+					$oMessage->smimeSigned['success'] = $result['success'];
+				}
+			} catch (\Throwable $e) {
+				$this->logException($e);
+			}
+
+			if ($bAutoVerify && $oMessage->pgpSigned) try {
+				$GPG = $this->GnuPG();
+				if ($GPG) {
+					if ($oMessage->pgpSigned['sigPartId']) {
+						$sPartId = $oMessage->pgpSigned['partId'];
+						$sSigPartId = $oMessage->pgpSigned['sigPartId'];
+						$aParts = [
+							FetchType::BODY_PEEK.'['.$sPartId.']',
+							// An empty section specification refers to the entire message, including the header.
+							// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
+							FetchType::BODY_PEEK.'['.$sPartId.'.MIME]',
+							FetchType::BODY_PEEK.'['.$sSigPartId.']'
+						];
+						$oFetchResponse = $this->ImapClient()->Fetch($aParts, $oMessage->Uid, true)[0];
+						$sBodyMime = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.'.MIME]');
+						$info = $this->GnuPG()->verify(
+							\preg_replace('/\\r?\\n/su', "\r\n",
+								$sBodyMime . $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']')
+							),
+							\preg_replace('/[^\x00-\x7F]/', '',
+								$oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sSigPartId.']')
+							)
+						);
+					} else {
+						// clearsigned text
+						$info = $this->GnuPG()->verify($oMessage->sPlain, '');
+					}
+					if (!empty($info[0]) && 0 == $info[0]['status']) {
+						$info = $info[0];
+						$oMessage->pgpSigned = [
+							'fingerprint' => $info['fingerprint'],
+							'success' => true
+						];
+					}
+				}
+			} catch (\Throwable $e) {
+				$this->logException($e);
+			}
+/*
+			if (!$oMessage->sPlain && !$oMessage->sHtml && !$oMessage->pgpEncrypted && !$oMessage->smimeEncrypted) {
+				$aAttachments = $oMessage->Attachments ?: [];
+				foreach ($aAttachments as $oAttachment) {
+//					\in_array($oAttachment->ContentType(), ['application/vnd.ms-tnef', 'application/ms-tnef'])
+					if ('winmail.dat' === \strtolower($oAttachment->FileName())) {
+						$sData = $this->ImapClient()->FetchMessagePart(
+							$oMessage->Uid,
+							$oAttachment->PartID()
+						);
+						$oTNEF = new \TNEFDecoder\TNEFAttachment;
+						$oTNEF->decodeTnef($sData);
+						foreach ($oTNEF->getFiles() as $oFile) {
+							if (\in_array($oFile->type, ['application/rtf', 'text/rtf'])) {
+								$rtf = new \SnappyMail\Rtf\Document($oFile->content);
+								$oMessage->setHtml($rtf->toHTML());
+							} else {
+								// List as attachment?
+								$oMapiAttachment = new \MailSo\Mail\Attachment($sFolder, $iUid, BodyStructure);
+								$oMessage->Attachments->append($oMapiAttachment);
+							}
+						}
+						break;
+					}
+				}
+			}
+*/
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantGetMessage, $oException);
 		}
 
-		if ($oMessage)
-		{
-			$this->Plugins()->RunHook('filter.result-message', array($oMessage));
-
-			$this->cacheByKey($sRawKey);
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $oMessage);
+		$ETag = $oMessage->ETag($this->getAccountFromToken()->ImapUser());
+		$this->verifyCacheByKey($ETag);
+		$this->Plugins()->RunHook('filter.result-message', array($oMessage));
+		$this->cacheByKey($ETag);
+		return $this->DefaultResponse($oMessage);
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoMessageDelete() : array
 	{
 		$this->initMailClientConnection();
 
-		$sFolder = $this->GetActionParam('Folder', '');
-		$aUids = \explode(',', (string) $this->GetActionParam('Uids', ''));
+		$sFolder = $this->GetActionParam('folder', '');
+		$aUids = \explode(',', (string) $this->GetActionParam('uids', ''));
 
 		try
 		{
-			$this->MailClient()->MessageDelete($sFolder, new SequenceSet($aUids),
-				!!$this->Config()->Get('labs', 'use_imap_expunge_all_on_delete', false));
+			$this->ImapClient()->MessageDelete($sFolder, new SequenceSet($aUids), true);
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::CantDeleteMessage, $oException);
 		}
 
-		if ($this->Config()->Get('labs', 'use_imap_unselect', true))
-		{
-			try
-			{
-				$this->MailClient()->FolderUnselect();
-			}
-			catch (\Throwable $oException)
-			{
-				unset($oException);
-			}
-		}
+		$sHash = $this->MailClient()->FolderHash($sFolder);
 
-		$sHash = '';
-		try
-		{
-			$sHash = $this->MailClient()->FolderHash($sFolder);
-		}
-		catch (\Throwable $oException)
-		{
-			\SnappyMail\Log::warning('IMAP', "FolderHash({$sFolder}) Exception: {$oException->getMessage()}");
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFolder, $sHash) : array($sFromFolder));
+		return $this->DefaultResponse($sHash ? array($sFolder, $sHash) : array($sFromFolder));
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoMessageMove() : array
 	{
 		$this->initMailClientConnection();
 
-		$sFromFolder = $this->GetActionParam('FromFolder', '');
-		$sToFolder = $this->GetActionParam('ToFolder', '');
-		$bMarkAsRead = !empty($this->GetActionParam('MarkAsRead', '0'));
+		$sFromFolder = $this->GetActionParam('fromFolder', '');
+		$sToFolder = $this->GetActionParam('toFolder', '');
 
-		$oUids = new SequenceSet(\explode(',', (string) $this->GetActionParam('Uids', '')));
+		$oUids = new SequenceSet(\explode(',', (string) $this->GetActionParam('uids', '')));
 
-		if ($bMarkAsRead)
-		{
+		if (!empty($this->GetActionParam('markAsRead', '0'))) {
 			try
 			{
 				$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::SEEN);
@@ -539,23 +629,19 @@ trait Messages
 			}
 		}
 
-		try
-		{
-			$this->MailClient()->MessageMove($sFromFolder, $sToFolder, $oUids,
-				!!$this->Config()->Get('labs', 'use_imap_move', true),
-				!!$this->Config()->Get('labs', 'use_imap_expunge_all_on_delete', false)
-			);
-		}
-		catch (\Throwable $oException)
-		{
-			throw new ClientException(Notifications::CantMoveMessage, $oException);
-		}
-
-		if ($this->Config()->Get('labs', 'use_imap_unselect', true))
-		{
+		$sLearning = $this->GetActionParam('learning', '');
+		if ($sLearning) {
 			try
 			{
-				$this->MailClient()->FolderUnselect();
+				if ('SPAM' === $sLearning) {
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk');
+					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK);
+					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK, false);
+				} else if ('HAM' === $sLearning) {
+					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::NOTJUNK);
+					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, MessageFlag::JUNK, false);
+//					$this->MailClient()->MessageSetFlag($sFromFolder, $oUids, '\\junk', false);
+				}
 			}
 			catch (\Throwable $oException)
 			{
@@ -563,32 +649,35 @@ trait Messages
 			}
 		}
 
-		$sHash = '';
 		try
 		{
-			$sHash = $this->MailClient()->FolderHash($sFromFolder);
+			$this->ImapClient()->MessageMove($sFromFolder, $sToFolder, $oUids);
 		}
 		catch (\Throwable $oException)
 		{
-			\SnappyMail\Log::warning('IMAP', "FolderHash({$sFromFolder}) Exception: {$oException->getMessage()}");
+			throw new ClientException(Notifications::CantMoveMessage, $oException);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $sHash ? array($sFromFolder, $sHash) : array($sFromFolder));
+		$sHash = $this->MailClient()->FolderHash($sFromFolder);
+
+		return $this->DefaultResponse($sHash ? array($sFromFolder, $sHash) : array($sFromFolder));
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoMessageCopy() : array
 	{
 		$this->initMailClientConnection();
 
+		$sToFolder = $this->GetActionParam('toFolder', '');
+
 		try
 		{
-			$this->MailClient()->MessageCopy(
-				$this->GetActionParam('FromFolder', ''),
-				$this->GetActionParam('ToFolder', ''),
-				new SequenceSet(\explode(',', (string) $this->GetActionParam('Uids', '')))
+			$this->ImapClient()->MessageCopy(
+				$this->GetActionParam('fromFolder', ''),
+				$sToFolder,
+				new SequenceSet(\explode(',', (string) $this->GetActionParam('uids', '')))
 			);
 		}
 		catch (\Throwable $oException)
@@ -596,7 +685,9 @@ trait Messages
 			throw new ClientException(Notifications::CantCopyMessage, $oException);
 		}
 
-		return $this->TrueResponse(__FUNCTION__);
+		$sHash = $this->MailClient()->FolderHash($sToFolder);
+
+		return $this->DefaultResponse($sHash ? array($sToFolder, $sHash) : array($sToFolder));
 	}
 
 	public function DoMessageUploadAttachments() : array
@@ -608,38 +699,53 @@ trait Messages
 
 		try
 		{
-			$aAttachments = $this->GetActionParam('Attachments', array());
-			if (\is_array($aAttachments) && \count($aAttachments))
-			{
-				$mResult = array();
-				foreach ($aAttachments as $sAttachment)
-				{
-					if ($aValues = \RainLoop\Utils::DecodeKeyValuesQ($sAttachment))
-					{
-						$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
-						$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
-						$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
+			$aAttachments = $this->GetActionParam('attachments', array());
+			if (!\is_array($aAttachments)) {
+				$aAttachments = [];
+			}
+			if (\count($aAttachments)) {
+				$oFilesProvider = $this->FilesProvider();
+				foreach ($aAttachments as $mIndex => $sAttachment) {
+					$aAttachments[$mIndex] = false;
+					if ($aValues = $this->decodeRawKey($sAttachment)) {
+						$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
+						$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
+						$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : '';
 
-						$sTempName = \md5($sAttachment);
-						if (!$this->FilesProvider()->FileExists($oAccount, $sTempName))
-						{
+						$sTempName = \sha1($sAttachment);
+						if (!$oFilesProvider->FileExists($oAccount, $sTempName)) {
 							$this->MailClient()->MessageMimeStream(
-								function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, &$mResult, $sTempName, $sAttachment, $self) {
-									if (is_resource($rResource))
-									{
-										$sContentType = (empty($sFileName)) ? 'text/plain' : \MailSo\Base\Utils::MimeContentType($sFileName);
-										$sFileName = $self->MainClearFileName($sFileName, $sContentType, $sMimeIndex);
+								function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use ($oAccount, $sTempName, $self, &$aAttachments, $mIndex) {
+									if (\is_resource($rResource)) {
+										$sContentType =
+											$sContentType
+											?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+											?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+											?: 'application/octet-stream'; // 'text/plain'
 
-										if ($self->FilesProvider()->PutFile($oAccount, $sTempName, $rResource))
-										{
-											$mResult[$sTempName] = $sAttachment;
+										$sTempName .= \SnappyMail\File\MimeType::toExtension($sContentType);
+
+										if ($self->FilesProvider()->PutFile($oAccount, $sTempName, $rResource)) {
+											$aAttachments[$mIndex] = [
+//												'name' => $sFileName,
+												'tempName' => $sTempName,
+												'mimeType' => $sContentType
+//												'size' => 0
+											];
 										}
 									}
 								}, $sFolder, $iUid, $sMimeIndex);
-						}
-						else
-						{
-							$mResult[$sTempName] = $sAttachment;
+						} else {
+							$rResource = $oFilesProvider->GetFile($oAccount, $sTempName);
+							$sContentType = \SnappyMail\File\MimeType::fromStream($rResource, $sTempName)
+								?: \SnappyMail\File\MimeType::fromFilename($sTempName)
+								?: 'application/octet-stream'; // 'text/plain'
+							$aAttachments[$mIndex] = [
+//								'name' => '',
+								'tempName' => $sTempName,
+								'mimeType' => $sContentType
+//								'size' => $oFilesProvider->FileSize($oAccount, $sTempName)
+							];
 						}
 					}
 				}
@@ -650,121 +756,7 @@ trait Messages
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $mResult);
-	}
-
-	/**
-	 * https://datatracker.ietf.org/doc/html/rfc3156#section-5
-	 */
-	public function DoMessagePgpVerify() : array
-	{
-		$sFolderName = $this->GetActionParam('Folder', '');
-		$iUid = (int) $this->GetActionParam('Uid', 0);
-		$sBodyPart = $this->GetActionParam('BodyPart', '');
-		$sSigPart = $this->GetActionParam('SigPart', '');
-		if ($sBodyPart) {
-			$result = [
-				'text' => \preg_replace('/\\R/s', "\r\n", $sBodyPart),
-				'signature' => $this->GetActionParam('SigPart', '')
-			];
-		} else {
-			$sBodyPartId = $this->GetActionParam('BodyPartId', '');
-			$sSigPartId = $this->GetActionParam('SigPartId', '');
-//			$sMicAlg = $this->GetActionParam('MicAlg', '');
-
-			$oAccount = $this->initMailClientConnection();
-
-			$oImapClient = $this->MailClient()->ImapClient();
-			$oImapClient->FolderExamine($sFolderName);
-
-			$aParts = [
-				FetchType::BODY_PEEK.'['.$sBodyPartId.']',
-				// An empty section specification refers to the entire message, including the header.
-				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
-				FetchType::BODY_PEEK.'['.$sBodyPartId.'.MIME]'
-			];
-			if ($sSigPartId) {
-				$aParts[] = FetchType::BODY_PEEK.'['.$sSigPartId.']';
-			}
-
-			$oFetchResponse = $oImapClient->Fetch($aParts, $iUid, true)[0];
-
-			$sBodyMime = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sBodyPartId.'.MIME]');
-			if ($sSigPartId) {
-				$result = [
-					'text' => \preg_replace('/\\R/s', "\r\n",
-						$sBodyMime . $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sBodyPartId.']')
-					),
-					'signature' => preg_replace('/[^\x00-\x7F]/', '',
-						$oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sSigPartId.']')
-					)
-				];
-			} else {
-				// clearsigned text
-				$result = [
-					'text' => $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sBodyPartId.']'),
-					'signature' => ''
-				];
-				$decode = (new \MailSo\Mime\HeaderCollection($sBodyMime))->ValueByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING);
-				if ('base64' === $decode) {
-					$result['text'] = \base64_decode($result['text']);
-				} else if ('quoted-printable' === $decode) {
-					$result['text'] = \quoted_printable_decode($result['text']);
-				}
-			}
-		}
-
-		if ($this->GetActionParam('GnuPG', 1)) {
-			$GPG = $this->GnuPG();
-			if ($GPG) {
-				$info = $this->GnuPG()->verify($result['text'], $result['signature']);
-//				$info = $this->GnuPG()->verifyStream($fp, $result['signature']);
-				if (empty($info[0])) {
-					$result = false;
-				} else {
-					$info = $info[0];
-
-					/**
-					* https://code.woboq.org/qt5/include/gpg-error.h.html
-					* status:
-						0 = GPG_ERR_NO_ERROR
-						9 = GPG_ERR_NO_PUBKEY
-						117440513 = General error
-						117440520 = Bad signature
-					*/
-
-					$summary = [
-						GNUPG_SIGSUM_VALID => 'The signature is fully valid.',
-						GNUPG_SIGSUM_GREEN => 'The signature is good but one might want to display some extra information. Check the other bits.',
-						GNUPG_SIGSUM_RED => 'The signature is bad. It might be useful to check other bits and display more information, i.e. a revoked certificate might not render a signature invalid when the message was received prior to the cause for the revocation.',
-						GNUPG_SIGSUM_KEY_REVOKED => 'The key or at least one certificate has been revoked.',
-						GNUPG_SIGSUM_KEY_EXPIRED => 'The key or one of the certificates has expired. It is probably a good idea to display the date of the expiration.',
-						GNUPG_SIGSUM_SIG_EXPIRED => 'The signature has expired.',
-						GNUPG_SIGSUM_KEY_MISSING => 'Can’t verify due to a missing key or certificate.',
-						GNUPG_SIGSUM_CRL_MISSING => 'The CRL (or an equivalent mechanism) is not available.',
-						GNUPG_SIGSUM_CRL_TOO_OLD => 'Available CRL is too old.',
-						GNUPG_SIGSUM_BAD_POLICY => 'A policy requirement was not met.',
-						GNUPG_SIGSUM_SYS_ERROR => 'A system error occurred.',
-//						GNUPG_SIGSUM_TOFU_CONFLICT = 'A TOFU conflict was detected.',
-					];
-
-					// Verified, so no need to return $result['text'] and $result['signature']
-					$result = [
-						'fingerprint' => $info['fingerprint'],
-						'validity' => $info['validity'],
-						'status' => $info['status'],
-						'summary' => $info['summary'],
-						'message' => \implode("\n", \array_filter($summary, function($k) use ($info) {
-							return $info['summary'] & $k;
-						}, ARRAY_FILTER_USE_KEY))
-					];
-				}
-			} else {
-				$result = false;
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $result);
+		return $this->DefaultResponse($aAttachments);
 	}
 
 	/**
@@ -772,159 +764,132 @@ trait Messages
 	 * @throws \MailSo\Net\Exceptions\ConnectionException
 	 */
 	private function smtpSendMessage(Account $oAccount, \MailSo\Mime\Message $oMessage,
-		/*resource*/ &$rMessageStream, int &$iMessageStreamSize, bool $bDsn = false, bool $bAddHiddenRcpt = true)
+		/*resource*/ &$rMessageStream, int &$iMessageStreamSize, bool $bAddHiddenRcpt = true,
+		bool $bDsn = false, bool $bRequireTLS = false)
 	{
 		$oRcpt = $oMessage->GetRcpt();
-		if ($oRcpt && 0 < $oRcpt->Count())
+		if (!$oRcpt || !$oRcpt->count()) {
+			throw new ClientException(Notifications::InvalidRecipients);
+		}
+
+		$this->Plugins()->RunHook('filter.smtp-message-stream',
+			array($oAccount, &$rMessageStream, &$iMessageStreamSize));
+
+		$this->Plugins()->RunHook('filter.message-rcpt', array($oAccount, $oRcpt));
+
+		$oSmtpClient = null;
+		try
 		{
-			$this->Plugins()->RunHook('filter.smtp-message-stream',
-				array($oAccount, &$rMessageStream, &$iMessageStreamSize));
+			$oFrom = $oMessage->GetFrom();
+			$sFrom = $oFrom instanceof \MailSo\Mime\Email ? $oFrom->GetEmail() : '';
+			$sFrom = empty($sFrom) ? $oAccount->Email() : $sFrom;
 
-			$this->Plugins()->RunHook('filter.message-rcpt', array($oAccount, $oRcpt));
+			$this->Plugins()->RunHook('filter.smtp-from', array($oAccount, $oMessage, &$sFrom));
 
-			try
-			{
-				$oFrom = $oMessage->GetFrom();
-				$sFrom = $oFrom instanceof \MailSo\Mime\Email ? $oFrom->GetEmail() : '';
-				$sFrom = empty($sFrom) ? $oAccount->Email() : $sFrom;
+			$aHiddenRcpt = array();
+			if ($bAddHiddenRcpt) {
+				$this->Plugins()->RunHook('filter.smtp-hidden-rcpt', array($oAccount, $oMessage, &$aHiddenRcpt));
+			}
 
-				$this->Plugins()->RunHook('filter.smtp-from', array($oAccount, $oMessage, &$sFrom));
+			$oSmtpClient = new \MailSo\Smtp\SmtpClient();
+			$oSmtpClient->SetLogger($this->Logger());
 
-				$aHiddenRcpt = array();
-				if ($bAddHiddenRcpt)
-				{
-					$this->Plugins()->RunHook('filter.smtp-hidden-rcpt', array($oAccount, $oMessage, &$aHiddenRcpt));
+			$oAccount->SmtpConnectAndLogin($this->Plugins(), $oSmtpClient);
+
+			if ($oSmtpClient->Settings->usePhpMail) {
+				if (!$sFrom || !\MailSo\Base\Utils::FunctionCallable('mail')) {
+					throw new ClientException(Notifications::CantSendMessage);
+				}
+				$oToCollection = $oMessage->GetTo();
+				if (!$oToCollection) {
+					throw new ClientException(Notifications::CantSendMessage);
+				}
+				$sRawBody = \stream_get_contents($rMessageStream);
+				if (empty($sRawBody)) {
+					throw new ClientException(Notifications::CantSendMessage);
+				}
+				$sMailTo = \trim($oToCollection->ToString(true));
+				$sMailSubject = \trim($oMessage->GetSubject());
+				$sMailSubject = \strlen($sMailSubject) ? \MailSo\Base\Utils::EncodeHeaderValue($sMailSubject) : '';
+
+				$sMailHeaders = $sMailBody = '';
+				list($sMailHeaders, $sMailBody) = \explode("\r\n\r\n", $sRawBody, 2);
+				unset($sRawBody);
+
+				if ($this->Config()->Get('labs', 'mail_func_clear_headers', true)) {
+					$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
+						MimeEnumHeader::TO_,
+						MimeEnumHeader::SUBJECT
+					));
 				}
 
-				$oSmtpClient = new \MailSo\Smtp\SmtpClient();
-				$oSmtpClient->SetLogger($this->Logger());
-				$oSmtpClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'smtp_timeout', 60));
+				$this->Logger()->WriteDump(array(
+					$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
+				), \LOG_DEBUG);
 
-				$bUsePhpMail = false;
-				$oAccount->OutConnectAndLoginHelper($this->Plugins(), $oSmtpClient, $this->Config(), $bUsePhpMail);
+				$bR = $this->Config()->Get('labs', 'mail_func_additional_parameters', false) ?
+					\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders, '-f'.$sFrom) :
+					\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders);
+				if (!$bR) {
+					throw new ClientException(Notifications::CantSendMessage);
+				}
+			} else if ($oSmtpClient->IsConnected()) {
+				if ($iMessageStreamSize && $oSmtpClient->maxSize() && $iMessageStreamSize * 1.33 > $oSmtpClient->maxSize()) {
+					throw new ClientException(Notifications::ClientViewError, null, 'Message size '. ($iMessageStreamSize * 1.33) . ' bigger then max ' . $oSmtpClient->maxSize());
+				}
 
-				if ($bUsePhpMail)
-				{
-					if (\MailSo\Base\Utils::FunctionExistsAndEnabled('mail'))
-					{
-						$aToCollection = $oMessage->GetTo();
-						if ($aToCollection && $oFrom)
-						{
-							$sRawBody = \stream_get_contents($rMessageStream);
-							if (!empty($sRawBody))
-							{
-								$sMailTo = \trim($aToCollection->ToString(true));
-								$sMailSubject = \trim($oMessage->GetSubject());
-								$sMailSubject = 0 === \strlen($sMailSubject) ? '' : \MailSo\Base\Utils::EncodeUnencodedValue(
-									\MailSo\Base\Enumerations\Encoding::BASE64_SHORT, $sMailSubject);
+				if (!empty($sFrom)) {
+					$oSmtpClient->MailFrom($sFrom, 0, $bDsn, $bRequireTLS);
+				}
 
-								$sMailHeaders = $sMailBody = '';
-								list($sMailHeaders, $sMailBody) = \explode("\r\n\r\n", $sRawBody, 2);
-								unset($sRawBody);
+				foreach ($oRcpt as /* @var $oEmail \MailSo\Mime\Email */ $oEmail) {
+					$oSmtpClient->Rcpt($oEmail->GetEmail(), $bDsn);
+				}
 
-								if ($this->Config()->Get('labs', 'mail_func_clear_headers', true))
-								{
-									$sMailHeaders = \MailSo\Base\Utils::RemoveHeaderFromHeaders($sMailHeaders, array(
-										\MailSo\Mime\Enumerations\Header::TO_,
-										\MailSo\Mime\Enumerations\Header::SUBJECT
-									));
-								}
-
-								if ($this->Config()->Get('debug', 'enable', false))
-								{
-									$this->Logger()->WriteDump(array(
-										$sMailTo, $sMailSubject, $sMailBody, $sMailHeaders
-									));
-								}
-
-								$bR = $this->Config()->Get('labs', 'mail_func_additional_parameters', false) ?
-									\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders, '-f'.$oFrom->GetEmail()) :
-									\mail($sMailTo, $sMailSubject, $sMailBody, $sMailHeaders);
-
-								if (!$bR)
-								{
-									throw new ClientException(Notifications::CantSendMessage);
-								}
-							}
+				if ($bAddHiddenRcpt && \is_array($aHiddenRcpt) && \count($aHiddenRcpt)) {
+					foreach ($aHiddenRcpt as $sEmail) {
+						if (\preg_match('/^[^@\s]+@[^@\s]+$/', $sEmail)) {
+							$oSmtpClient->Rcpt($sEmail);
 						}
 					}
-					else
-					{
-						throw new ClientException(Notifications::CantSendMessage);
-					}
 				}
-				else if ($oSmtpClient->IsConnected())
-				{
-					if (!empty($sFrom))
-					{
-						$oSmtpClient->MailFrom($sFrom, '', $bDsn);
-					}
 
-					foreach ($oRcpt as /* @var $oEmail \MailSo\Mime\Email */ $oEmail)
-					{
-						$oSmtpClient->Rcpt($oEmail->GetEmail(), $bDsn);
-					}
+				$oSmtpClient->DataWithStream($rMessageStream);
 
-					if ($bAddHiddenRcpt && \is_array($aHiddenRcpt) && \count($aHiddenRcpt))
-					{
-						foreach ($aHiddenRcpt as $sEmail)
-						{
-							if (\preg_match('/^[^@\s]+@[^@\s]+$/', $sEmail))
-							{
-								$oSmtpClient->Rcpt($sEmail);
-							}
-						}
-					}
-
-					$oSmtpClient->DataWithStream($rMessageStream);
-
-					$oSmtpClient->Disconnect();
-				}
-			}
-			catch (\MailSo\Net\Exceptions\ConnectionException $oException)
-			{
-				if ($this->Config()->Get('labs', 'smtp_show_server_errors'))
-				{
-					throw new ClientException(Notifications::ClientViewError, $oException);
-				}
-				else
-				{
-					throw new ClientException(Notifications::ConnectionError, $oException);
-				}
-			}
-			catch (\MailSo\Smtp\Exceptions\LoginException $oException)
-			{
-				throw new ClientException(Notifications::AuthError, $oException);
-			}
-			catch (\Throwable $oException)
-			{
-				if ($this->Config()->Get('labs', 'smtp_show_server_errors'))
-				{
-					throw new ClientException(Notifications::ClientViewError, $oException);
-				}
-				else
-				{
-					throw $oException;
-				}
+				$oSmtpClient->Disconnect();
 			}
 		}
-		else
+		catch (\MailSo\Net\Exceptions\ConnectionException $oException)
 		{
-			throw new ClientException(Notifications::InvalidRecipients);
+			if ($oSmtpClient && $oSmtpClient->Settings->viewErrors) {
+				throw new ClientException(Notifications::ClientViewError, $oException);
+			}
+			throw new ClientException(Notifications::ConnectionError, $oException);
+		}
+		catch (\MailSo\Smtp\Exceptions\LoginException $oException)
+		{
+			throw new ClientException(Notifications::AuthError, $oException);
+		}
+		catch (\Throwable $oException)
+		{
+			if ($oSmtpClient && $oSmtpClient->Settings->viewErrors) {
+				throw new ClientException(Notifications::ClientViewError, $oException);
+			}
+			throw $oException;
 		}
 	}
 
-	private function messageSetFlag(string $sMessageFlag, string $sResponseFunction, bool $bSkipUnsupportedFlag = false) : array
+	private function messageSetFlag(string $sMessageFlag, bool $bSkipUnsupportedFlag = false) : array
 	{
 		$this->initMailClientConnection();
 
 		try
 		{
 			$this->MailClient()->MessageSetFlag(
-				$this->GetActionParam('Folder', ''),
-				new SequenceSet(\explode(',', (string) $this->GetActionParam('Uids', ''))),
+				$this->GetActionParam('folder', ''),
+				new SequenceSet(\explode(',', (string) $this->GetActionParam('uids', ''))),
 				$sMessageFlag,
-				!empty($this->GetActionParam('SetAction', '0')),
+				!empty($this->GetActionParam('setAction', '0')),
 				$bSkipUnsupportedFlag
 			);
 		}
@@ -933,62 +898,38 @@ trait Messages
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
 
-		return $this->TrueResponse($sResponseFunction);
+		return $this->TrueResponse();
 	}
 
 	private function deleteMessageAttachments(Account $oAccount) : void
 	{
-		$aAttachments = $this->GetActionParam('Attachments', null);
+		$aAttachments = $this->GetActionParam('attachments', null);
 
-		if (\is_array($aAttachments))
-		{
-			foreach (\array_keys($aAttachments) as $sTempName)
-			{
-				if ($this->FilesProvider()->FileExists($oAccount, $sTempName))
-				{
+		if (\is_array($aAttachments)) {
+			foreach (\array_keys($aAttachments) as $sTempName) {
+				if ($this->FilesProvider()->FileExists($oAccount, $sTempName)) {
 					$this->FilesProvider()->Clear($oAccount, $sTempName);
 				}
 			}
 		}
 	}
 
-	/**
-	 * @return MailSo\Cache\CacheClient|null
-	 */
-	private function cacherForUids()
-	{
-		$oAccount = $this->getAccountFromToken(false);
-		return ($this->Config()->Get('cache', 'enable', true) &&
-			$this->Config()->Get('cache', 'server_uids', false)) ? $this->Cacher($oAccount) : null;
-	}
-
-	/**
-	 * @return MailSo\Cache\CacheClient|null
-	 */
-	private function cacherForThreads()
-	{
-		$oAccount = $this->getAccountFromToken(false);
-		return !!$this->Config()->Get('labs', 'use_imap_thread', false) ? $this->Cacher($oAccount) : null;
-	}
-
 	private function buildReadReceiptMessage(Account $oAccount) : \MailSo\Mime\Message
 	{
-		$sReadReceipt = $this->GetActionParam('ReadReceipt', '');
-		$sSubject = $this->GetActionParam('Subject', '');
-		$sText = $this->GetActionParam('Text', '');
+		$sReadReceipt = $this->GetActionParam('readReceipt', '');
+		$sSubject = $this->GetActionParam('subject', '');
+		$sText = $this->GetActionParam('plain', '');
 
 		$oIdentity = $this->GetIdentityByID($oAccount, '', true);
 
-		if (empty($sReadReceipt) || empty($sSubject) || empty($sText) || !$oIdentity)
-		{
+		if (empty($sReadReceipt) || empty($sSubject) || empty($sText) || !$oIdentity) {
 			throw new ClientException(Notifications::UnknownError);
 		}
 
 		$oMessage = new \MailSo\Mime\Message();
 
-		if (!$this->Config()->Get('security', 'hide_x_mailer_header', true))
-		{
-			$oMessage->SetXMailer('SnappyMail/'.APP_VERSION);
+		if ($this->Config()->Get('security', 'hide_x_mailer_header', true)) {
+			$oMessage->DoesNotAddDefaultXMailer();
 		}
 
 		$oMessage->SetFrom(new \MailSo\Mime\Email($oIdentity->Email(), $oIdentity->Name()));
@@ -997,11 +938,9 @@ trait Messages
 		$oMessage->RegenerateMessageId($oFrom ? $oFrom->GetDomain() : '');
 
 		$sReplyTo = $oIdentity->ReplyTo();
-		if (!empty($sReplyTo))
-		{
+		if (!empty($sReplyTo)) {
 			$oReplyTo = new \MailSo\Mime\EmailCollection($sReplyTo);
-			if ($oReplyTo && $oReplyTo->Count())
-			{
+			if ($oReplyTo && $oReplyTo->count()) {
 				$oMessage->SetReplyTo($oReplyTo);
 			}
 		}
@@ -1009,47 +948,47 @@ trait Messages
 		$oMessage->SetSubject($sSubject);
 
 		$oToEmails = new \MailSo\Mime\EmailCollection($sReadReceipt);
-		if ($oToEmails && $oToEmails->Count())
-		{
+		if ($oToEmails && $oToEmails->count()) {
 			$oMessage->SetTo($oToEmails);
 		}
 
 		$this->Plugins()->RunHook('filter.read-receipt-message-plain', array($oAccount, $oMessage, &$sText));
 
 		$oPart = new MimePart;
-		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"');
-		$oPart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+		$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset="utf-8"');
+		$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
 		$oPart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
-			\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sText))),
+			\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sText))),
 			'convert.quoted-printable-encode'
 		);
-		$this->SubParts->append($oPart);
+		$oMessage->SubParts->append($oPart);
 
 		$this->Plugins()->RunHook('filter.build-read-receipt-message', array($oMessage, $oAccount));
 
 		return $oMessage;
 	}
 
+	/**
+	 * called by DoSaveMessage and DoSendMessage
+	 */
 	private function buildMessage(Account $oAccount, bool $bWithDraftInfo = true) : \MailSo\Mime\Message
 	{
 		$oMessage = new \MailSo\Mime\Message();
 
-		if (!$this->Config()->Get('security', 'hide_x_mailer_header', true))
-		{
-			$oMessage->SetXMailer('SnappyMail/'.APP_VERSION);
-		} else {
+		if ($this->Config()->Get('security', 'hide_x_mailer_header', true)) {
 			$oMessage->DoesNotAddDefaultXMailer();
 		}
 
-		$sFrom = $this->GetActionParam('From', '');
-		$oMessage->SetFrom(\MailSo\Mime\Email::Parse($sFrom));
+		$oMessage->SetFrom(\MailSo\Mime\Email::Parse($this->GetActionParam('from', '')));
+		$oFrom = $oMessage->GetFrom();
+
 /*
-		$oFromIdentity = $this->GetIdentityByID($oAccount, $this->GetActionParam('IdentityID', ''));
-		if ($oFromIdentity)
+		$oIdentity = $this->GetIdentityByID($oAccount, $this->GetActionParam('identityID', ''));
+		if ($oIdentity)
 		{
 			$oMessage->SetFrom(new \MailSo\Mime\Email(
-				$oFromIdentity->Email(), $oFromIdentity->Name()));
-			if ($oAccount->Domain()->OutSetSender()) {
+				$oIdentity->Email(), $oIdentity->Name()));
+			if ($oAccount->Domain()->SmtpSettings()->setSender) {
 				$oMessage->SetSender(\MailSo\Mime\Email::Parse($oAccount->Email()));
 			}
 		}
@@ -1058,71 +997,60 @@ trait Messages
 			$oMessage->SetFrom(\MailSo\Mime\Email::Parse($oAccount->Email()));
 		}
 */
-		$oFrom = $oMessage->GetFrom();
 		$oMessage->RegenerateMessageId($oFrom ? $oFrom->GetDomain() : '');
 
-		$oReplyTo = new \MailSo\Mime\EmailCollection($this->GetActionParam('ReplyTo', ''));
-		if ($oReplyTo->count()) {
-			$oMessage->SetReplyTo($oReplyTo);
-		}
+		$oMessage->SetReplyTo(new \MailSo\Mime\EmailCollection($this->GetActionParam('replyTo', '')));
 
-		if ('1' === $this->GetActionParam('ReadReceiptRequest', '0')) {
+		if (!empty($this->GetActionParam('readReceiptRequest', 0))) {
 			// Read Receipts Reference Main Account Email, Not Identities #147
-//			$oMessage->SetReadReceipt(($oFromIdentity ?: $oAccount)->Email());
+//			$oMessage->SetReadReceipt(($oIdentity ?: $oAccount)->Email());
 			$oMessage->SetReadReceipt($oFrom->GetEmail());
 		}
 
-		if ('1' === $this->GetActionParam('MarkAsImportant', '0')) {
+		if (empty($this->GetActionParam('requireTLS', 0))) {
+			$oMessage->SetCustomHeader('TLS-Required', 'No');
+		}
+
+		if (!empty($this->GetActionParam('markAsImportant', 0))) {
 			$oMessage->SetPriority(\MailSo\Mime\Enumerations\MessagePriority::HIGH);
 		}
 
-		$oMessage->SetSubject($this->GetActionParam('Subject', ''));
+		$oMessage->SetSubject($this->GetActionParam('subject', ''));
 
-		$oToEmails = new \MailSo\Mime\EmailCollection($this->GetActionParam('To', ''));
-		if ($oToEmails->count()) {
-			$oMessage->SetTo($oToEmails);
-		}
+		$oMessage->SetTo(new \MailSo\Mime\EmailCollection($this->GetActionParam('to', '')));
+		$oMessage->SetCc(new \MailSo\Mime\EmailCollection($this->GetActionParam('cc', '')));
+		$oMessage->SetBcc(new \MailSo\Mime\EmailCollection($this->GetActionParam('bcc', '')));
 
-		$oCcEmails = new \MailSo\Mime\EmailCollection($this->GetActionParam('Cc', ''));
-		if ($oCcEmails->count()) {
-			$oMessage->SetCc($oCcEmails);
-		}
-
-		$oBccEmails = new \MailSo\Mime\EmailCollection($this->GetActionParam('Bcc', ''));
-		if ($oBccEmails->count()) {
-			$oMessage->SetBcc($oBccEmails);
-		}
-
-		$aDraftInfo = $this->GetActionParam('DraftInfo', null);
-		if ($bWithDraftInfo && \is_array($aDraftInfo) && !empty($aDraftInfo[0]) && !empty($aDraftInfo[1]) && !empty($aDraftInfo[2]))
-		{
+		$aDraftInfo = $this->GetActionParam('draftInfo', null);
+		if ($bWithDraftInfo && \is_array($aDraftInfo) && !empty($aDraftInfo[0]) && !empty($aDraftInfo[1]) && !empty($aDraftInfo[2])) {
 			$oMessage->SetDraftInfo($aDraftInfo[0], $aDraftInfo[1], $aDraftInfo[2]);
 		}
 
-		$sInReplyTo = $this->GetActionParam('InReplyTo', '');
-		if (\strlen($sInReplyTo)) {
-			$oMessage->SetInReplyTo($sInReplyTo);
-		}
+		$oMessage->SetInReplyTo($this->GetActionParam('inReplyTo', ''));
+		$oMessage->SetReferences($this->GetActionParam('references', ''));
 
-		$sReferences = $this->GetActionParam('References', '');
-		if (\strlen($sReferences)) {
-			$oMessage->SetReferences($sReferences);
-		}
+		$aAutocrypt = $this->GetActionParam('autocrypt', []);
+		$oMessage->SetAutocrypt(
+			\array_map(fn($header)=>"addr={$header['addr']}; keydata={$header['keydata']}", $aAutocrypt)
+		);
 
 		$aFoundCids = array();
 		$aFoundDataURL = array();
 		$aFoundContentLocationUrls = array();
 		$oPart;
 
-		if ($sSigned = $this->GetActionParam('Signed', '')) {
+		if ($sSigned = $this->GetActionParam('signed', '')) {
 			$aSigned = \explode("\r\n\r\n", $sSigned, 2);
 //			$sBoundary = \preg_replace('/^.+boundary="([^"]+)".+$/Dsi', '$1', $aSigned[0]);
-			$sBoundary = $this->GetActionParam('Boundary', '');
+			$sBoundary = $this->GetActionParam('boundary', '');
+//			\preg_match('/protocol="(application/[^"]+)"/', $aSigned[0], $match);
+//			$sProtocol = $match[1][0];
+			$sProtocol = 'application/pgp-signature';
 
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-				'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"; boundary="'.$sBoundary.'"'
+				MimeEnumHeader::CONTENT_TYPE,
+				'multipart/signed; micalg="pgp-sha256"; protocol="'.$sProtocol.'"; boundary="'.$sBoundary.'"'
 			);
 			$oPart->Body = $aSigned[1];
 			$oMessage->SubParts->append($oPart);
@@ -1131,135 +1059,117 @@ trait Messages
 			unset($oAlternativePart);
 			unset($sSigned);
 
-		} else if ($sEncrypted = $this->GetActionParam('Encrypted', '')) {
+		} else if ($sEncrypted = $this->GetActionParam('encrypted', '')) {
+			$oMessage->addPgpEncrypted(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sEncrypted)));
+			unset($sEncrypted);
+
+		} else if ($sHtml = $this->GetActionParam('html', '')) {
 			$oPart = new MimePart;
-			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-				'multipart/encrypted; protocol="application/pgp-encrypted"'
-			);
+			$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'multipart/alternative');
 			$oMessage->SubParts->append($oPart);
 
-			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-encrypted');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
-			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString('Version: 1');
-			$oPart->SubParts->append($oAlternativePart);
+			$sHtml = \MailSo\Base\HtmlUtils::BuildHtml($sHtml, $aFoundCids, $aFoundDataURL, $aFoundContentLocationUrls);
 
+			$aLinkedData = $this->GetActionParam('linkedData', []);
+			if ($aLinkedData) {
+				$sHtml = \str_replace('</head>', '<script type="application/ld+json">'.\json_encode($aLinkedData).'</script></head>', $sHtml);
+			}
+
+			$this->Plugins()->RunHook('filter.message-html', array($oAccount, $oMessage, &$sHtml));
+
+			// First add plain
+			$sPlain = $this->GetActionParam('plain', '') ?: \MailSo\Base\HtmlUtils::ConvertHtmlToPlain($sHtml);
+			$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
+			$oPart->addPlain($sPlain);
+			unset($sPlain);
+
+			// Now add HTML
 			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/octet-stream');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
-			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sEncrypted)));
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/html; charset=utf-8');
+			$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
+			$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
+				\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sHtml))),
+				'convert.quoted-printable-encode'
+			);
 			$oPart->SubParts->append($oAlternativePart);
 
 			unset($oAlternativePart);
-			unset($sEncrypted);
+			unset($sHtml);
 
 		} else {
-			if ($sHtml = $this->GetActionParam('Html', '')) {
+			$sPlain = $this->GetActionParam('plain', '');
+/*
+			if ($sSignature = $this->GetActionParam('pgpSignature', null)) {
 				$oPart = new MimePart;
 				$oPart->Headers->AddByName(
-					\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-					\MailSo\Mime\Enumerations\MimeType::MULTIPART_ALTERNATIVE
+					MimeEnumHeader::CONTENT_TYPE,
+					'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"'
 				);
 				$oMessage->SubParts->append($oPart);
 
-				$sHtml = \MailSo\Base\HtmlUtils::BuildHtml($sHtml, $aFoundCids, $aFoundDataURL, $aFoundContentLocationUrls);
-				$this->Plugins()->RunHook('filter.message-html', array($oAccount, $oMessage, &$sHtml));
-
-				// First add plain
-				$sPlain = $this->GetActionParam('Text', '') ?: \MailSo\Base\HtmlUtils::ConvertHtmlToPlain($sHtml);
-				$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
 				$oAlternativePart = new MimePart;
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset=utf-8');
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
-				$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
-					\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sPlain))),
-					'convert.quoted-printable-encode'
-				);
-				$oPart->SubParts->append($oAlternativePart);
-				unset($sPlain);
-
-				// Now add HTML
-				$oAlternativePart = new MimePart;
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/html; charset=utf-8');
-				$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
-				$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
-					\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sHtml))),
-					'convert.quoted-printable-encode'
-				);
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'text/plain; charset="utf-8"; protected-headers="v1"');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'base64');
+				$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sPlain)));
 				$oPart->SubParts->append($oAlternativePart);
 
-				unset($oAlternativePart);
-				unset($sHtml);
+				$oAlternativePart = new MimePart;
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
+				$oAlternativePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
+				$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\r?\\n/su', "\r\n", \trim($sSignature)));
+				$oPart->SubParts->append($oAlternativePart);
 
-			} else {
-				$sPlain = $this->GetActionParam('Text', '');
-				if ($sSignature = $this->GetActionParam('Signature', null)) {
-					$oPart = new MimePart;
-					$oPart->Headers->AddByName(
-						\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-						'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"'
-					);
-					$oMessage->SubParts->append($oPart);
-
-					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"; protected-headers="v1"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'base64');
-					$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sPlain)));
-					$oPart->SubParts->append($oAlternativePart);
-
-					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
-					$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sSignature)));
-					$oPart->SubParts->append($oAlternativePart);
-				} else {
-					$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
-					$oAlternativePart = new MimePart;
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'text/plain; charset="utf-8"');
-					$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, 'quoted-printable');
-					$oAlternativePart->Body = \MailSo\Base\StreamWrappers\Binary::CreateStream(
-						\MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString(\preg_replace('/\\R/', "\r\n", \trim($sPlain))),
-						'convert.quoted-printable-encode'
-					);
-					$oMessage->SubParts->append($oAlternativePart);
-				}
-				unset($oAlternativePart);
 				unset($sSignature);
-				unset($sPlain);
-			}
+			} else {
+*/
+			$this->Plugins()->RunHook('filter.message-plain', array($oAccount, $oMessage, &$sPlain));
+			$oMessage->addPlain($sPlain);
+			unset($sPlain);
 		}
 		unset($oPart);
 
-		$aAttachments = $this->GetActionParam('Attachments', null);
-		if (\is_array($aAttachments))
-		{
-			foreach ($aAttachments as $sTempName => $aData)
-			{
-				$sFileName = (string) $aData[0];
-				$bIsInline = (bool) $aData[1];
-				$sCID = (string) $aData[2];
-				$sContentLocation = isset($aData[3]) ? (string) $aData[3] : '';
+		$aAttachments = $this->GetActionParam('attachments', null);
+		if (\is_array($aAttachments)) {
+			foreach ($aAttachments as $sTempName => $aData) {
+				$sFileName = (string) $aData['name'];
+				$bIsInline = (bool) $aData['inline'];
+				$sCID = (string) $aData['cId'];
+				$sContentLocation = (string) $aData['location'];
+				$sMimeType = (string) $aData['type'];
 
 				$rResource = $this->FilesProvider()->GetFile($oAccount, $sTempName);
-				if (\is_resource($rResource))
-				{
+				if (\is_resource($rResource)) {
 					$iFileSize = $this->FilesProvider()->FileSize($oAccount, $sTempName);
 
 					$oMessage->Attachments()->append(
 						new \MailSo\Mime\Attachment($rResource, $sFileName, $iFileSize, $bIsInline,
 							\in_array(trim(trim($sCID), '<>'), $aFoundCids),
-							$sCID, array(), $sContentLocation
+							$sCID, array(), $sContentLocation, $sMimeType
 						)
 					);
 				}
 			}
 		}
-
-		foreach ($aFoundDataURL as $sCidHash => $sDataUrlString)
-		{
+/*
+		// OpenPGP https://github.com/the-djmaze/snappymail/issues/1587
+		$sPublicKey = $this->GetActionParam('publicKey', '');
+		if ($sPublicKey) {
+			$oMessage->Attachments()->append(
+				new \MailSo\Mime\Attachment(
+					\fopen("data://text/plain,{$sPublicKey}", 'r'),
+					'OpenPGP_'.\md5($sPublicKey).'.asc',
+					\strlen($sPublicKey),
+					false,
+					false,
+					'',
+					array(),
+					'',
+					'application/pgp-keys'
+				)
+			);
+		}
+*/
+		foreach ($aFoundDataURL as $sCidHash => $sDataUrlString) {
 			$aMatch = array();
 			$sCID = '<'.$sCidHash.'>';
 			if (\preg_match('/^data:(image\/[a-zA-Z0-9]+);base64,(.+)$/i', $sDataUrlString, $aMatch) &&
@@ -1267,8 +1177,7 @@ trait Messages
 			{
 				$sRaw = \MailSo\Base\Utils::Base64Decode($aMatch[2]);
 				$iFileSize = \strlen($sRaw);
-				if (0 < $iFileSize)
-				{
+				if (0 < $iFileSize) {
 					$sFileName = \preg_replace('/[^a-z0-9]+/i', '.', $aMatch[1]);
 					$rResource = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($sRaw);
 
@@ -1283,21 +1192,45 @@ trait Messages
 			}
 		}
 
-		$sFingerprint = $this->GetActionParam('SignFingerprint', '');
-		$sPassphrase = $this->GetActionParam('SignPassphrase', '');
+		$oPassphrase = new \SnappyMail\SensitiveString($this->GetActionParam('signPassphrase', ''));
+
+		// GnuPG
+		$sFingerprint = $this->GetActionParam('signFingerprint', '');
 		if ($sFingerprint) {
 			$GPG = $this->GnuPG();
+/*
+			// https://github.com/the-djmaze/snappymail/issues/1587
+			if ($this->GetActionParam('attachPublicKey', false)) {
+				$sPublicKey = $GPG->export($sFingerprint);
+				$oMessage->Attachments()->append(
+					new \MailSo\Mime\Attachment(
+						\fopen("data://text/plain,{$sPublicKey}", 'r'),
+						"OpenPGP_0x{$sFingerprint}.asc",
+						\strlen($sPublicKey),
+						false,
+						false,
+						'',
+						array(),
+						'',
+						'application/pgp-keys'
+					)
+				);
+			}
+*/
 			$oBody = $oMessage->GetRootPart();
-			$fp = \fopen('php://memory', 'r+b');
 			$resource = $oBody->ToStream();
+
+			\MailSo\Base\StreamFilters\LineEndings::appendTo($resource);
+			$fp = \fopen('php://temp', 'r+b');
+//			\stream_copy_to_stream($resource, $fp); // Fails
+			while (!\feof($resource)) \fwrite($fp, \fread($resource, 8192));
+
 			$oBody->Body = null;
 			$oBody->SubParts->Clear();
 			$oMessage->SubParts->Clear();
 			$oMessage->Attachments()->Clear();
 
-			\MailSo\Base\StreamFilters\LineEndings::appendTo($resource);
-			\stream_copy_to_stream($resource, $fp);
-			$GPG->addSignKey($sFingerprint, $sPassphrase);
+			$GPG->addSignKey($sFingerprint, $oPassphrase);
 			$GPG->setsignmode(GNUPG_SIG_MODE_DETACH);
 			$sSignature = $GPG->signStream($fp);
 			if (!$sSignature) {
@@ -1306,7 +1239,7 @@ trait Messages
 
 			$oPart = new MimePart;
 			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
+				MimeEnumHeader::CONTENT_TYPE,
 				'multipart/signed; micalg="pgp-sha256"; protocol="application/pgp-signature"'
 			);
 			$oMessage->SubParts->append($oPart);
@@ -1316,47 +1249,152 @@ trait Messages
 			$oPart->SubParts->append($oBody);
 
 			$oSignaturePart = new MimePart;
-			$oSignaturePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
-			$oSignaturePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
+			$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pgp-signature; name="signature.asc"');
+			$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, '7Bit');
 			$oSignaturePart->Body = $sSignature;
 			$oPart->SubParts->append($oSignaturePart);
+		} else {
+			$sCertificate = $this->GetActionParam('signCertificate', '');
+			$sCertificateChain = $this->GetActionParam('signCertificateChain', '');
+			$sPrivateKey = $this->GetActionParam('signPrivateKey', '');
+			if ('S/MIME' === $this->GetActionParam('sign', '')) {
+				$sID = $this->GetActionParam('identityID', '');
+				foreach ($this->GetIdentities($oAccount) as $oIdentity) {
+					if ($oIdentity && $oIdentity->smimeCertificate && $oIdentity->smimeKey
+					 && ($oIdentity->Id() === $sID || $oIdentity->Email() === $oFrom->GetEmail())
+					) {
+						$sCertificate = $oIdentity->smimeCertificate;
+						$sCertificateChain = $oIdentity->smimeCertificateChain;
+						$sPrivateKey = $oIdentity->smimeKey;
+						break;
+					}
+				}
+			}
+/*
+			// https://github.com/the-djmaze/snappymail/issues/1587
+			if ($sCertificate && $this->GetActionParam('attachCertificate', false)) {
+				$oMessage->Attachments()->append(
+					new \MailSo\Mime\Attachment(
+						\fopen("data://text/plain,{$sCertificate}", 'r'),
+						'certificate.pem',
+						\strlen($sCertificate),
+						false,
+						false,
+						'',
+						array(),
+						'',
+						'application/pem-certificate-chain'
+					)
+				);
+			}
+*/
+			if ($sCertificate && $sPrivateKey) {
+				$oBody = $oMessage->GetRootPart();
+
+				$resource = $oBody->ToStream();
+				\MailSo\Base\StreamFilters\LineEndings::appendTo($resource);
+				$tmp = new \SnappyMail\File\Temporary('mimepart');
+				$tmp->writeFromStream($resource);
+
+				$oBody->Body = null;
+				$oBody->SubParts->Clear();
+				$oMessage->SubParts->Clear();
+				$oMessage->Attachments()->Clear();
+
+				$detached = true;
+
+				$SMIME = $this->SMIME();
+				$SMIME->setCertificate($sCertificate);
+				$SMIME->setCertificateChain($sCertificateChain);
+				$SMIME->setPrivateKey($sPrivateKey, $oPassphrase);
+				$sSignature = $SMIME->sign($tmp, $detached);
+
+				if (!$sSignature) {
+					throw new \RuntimeException('S/MIME sign() failed');
+				}
+
+				$oPart = new MimePart;
+				$oMessage->SubParts->append($oPart);
+				if ($detached) {
+					$oPart->Headers->AddByName(
+						MimeEnumHeader::CONTENT_TYPE,
+						'multipart/signed; micalg="sha-256"; protocol="application/pkcs7-signature"'
+					);
+
+					$fp = $tmp->fopen();
+					\rewind($fp);
+					$oBody->Raw = $fp;
+					$oPart->SubParts->append($oBody);
+
+					$oSignaturePart = new MimePart;
+					$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TYPE, 'application/pkcs7-signature; name="signature.p7s"');
+					$oSignaturePart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'base64');
+					$oSignaturePart->Body = $sSignature;
+					$oPart->SubParts->append($oSignaturePart);
+				} else {
+					$oPart->Headers->AddByName(
+						MimeEnumHeader::CONTENT_TYPE,
+						'application/pkcs7-mime; smime-type=signed-data; name="smime.p7m"'
+					);
+					$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'base64');
+					$oPart->Body = $sSignature;
+				}
+			}
 		}
 
-		$aFingerprints = \json_decode($this->GetActionParam('EncryptFingerprints', ''), true);
+		$aFingerprints = \json_decode($this->GetActionParam('encryptFingerprints', ''), true);
 		if ($aFingerprints) {
-			$GPG = $this->GnuPG();
-			$oBody = $oMessage->GetRootPart();
-			$fp = \fopen('php://memory', 'r+b');
-			$resource = $oBody->ToStream();
-			\stream_copy_to_stream($resource, $fp);
-			foreach ($aFingerprints as $sFingerprint) {
-				$GPG->addEncryptKey($sFingerprint);
-			}
-			$sEncrypted = $GPG->encryptStream($fp);
+			$resource = $oMessage->GetRootPart()->ToStream();
+			$fp = \fopen('php://temp', 'r+b');
+//			\stream_copy_to_stream($resource, $fp); // Fails
+			while (!\feof($resource)) \fwrite($fp, \fread($resource, 8192));
 
 			$oMessage->SubParts->Clear();
 			$oMessage->Attachments()->Clear();
 
-			$oPart = new MimePart;
-			$oPart->Headers->AddByName(
-				\MailSo\Mime\Enumerations\Header::CONTENT_TYPE,
-				'multipart/encrypted; protocol="application/pgp-encrypted"'
-			);
-			$oMessage->SubParts->append($oPart);
+			$GPG = $this->GnuPG();
+			foreach ($aFingerprints as $sFingerprint) {
+				$GPG->addEncryptKey($sFingerprint);
+			}
+			$oMessage->addPgpEncrypted($GPG->encryptStream($fp));
+		} else {
+			$aCertificates = $this->GetActionParam('encryptCertificates', []);
+			if ($aCertificates) {
+				$oBody = $oMessage->GetRootPart();
 
-			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/pgp-encrypted');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'attachment');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
-			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString('Version: 1');
-			$oPart->SubParts->append($oAlternativePart);
+				$resource = $oBody->ToStream();
+				\MailSo\Base\StreamFilters\LineEndings::appendTo($resource);
+				$tmp = new \SnappyMail\File\Temporary('mimepart');
+				$tmp->writeFromStream($resource);
 
-			$oAlternativePart = new MimePart;
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TYPE, 'application/octet-stream');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_DISPOSITION, 'inline; filename="msg.asc"');
-			$oAlternativePart->Headers->AddByName(\MailSo\Mime\Enumerations\Header::CONTENT_TRANSFER_ENCODING, '7Bit');
-			$oAlternativePart->Body = \MailSo\Base\ResourceRegistry::CreateMemoryResourceFromString($sEncrypted);
-			$oPart->SubParts->append($oAlternativePart);
+				$oBody->Body = null;
+				$oBody->SubParts->Clear();
+				$oMessage->SubParts->Clear();
+				$oMessage->Attachments()->Clear();
+
+				$SMIME = $this->SMIME();
+				$certificates = $SMIME->certificates();
+				// Load certificates by id
+				foreach ($aCertificates as &$sCertificate) {
+					if (!\str_contains($sCertificate, '-----BEGIN CERTIFICATE-----')) {
+						foreach ($certificates as $certificate) {
+							if ($certificate['id'] === $sCertificate) {
+								$sCertificate = $SMIME->getCertificate($certificate['file']);
+							}
+						}
+					}
+				}
+				$sEncrypted = $SMIME->encrypt($tmp, $aCertificates);
+
+				$oPart = new MimePart;
+				$oMessage->SubParts->append($oPart);
+				$oPart->Headers->AddByName(
+					MimeEnumHeader::CONTENT_TYPE,
+					'application/pkcs7-mime; smime-type=enveloped-data; name="smime.p7m"'
+				);
+				$oPart->Headers->AddByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING, 'base64');
+				$oPart->Body = $sEncrypted;
+			}
 		}
 
 		$this->Plugins()->RunHook('filter.build-message', array($oMessage));
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
index c58f46530..a87b6d1da 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Pgp.php
@@ -2,30 +2,64 @@
 
 namespace RainLoop\Actions;
 
+use SnappyMail\PGP\Backup;
+use SnappyMail\PGP\Keyservers;
+use SnappyMail\PGP\GnuPG;
+use MailSo\Imap\Enumerations\FetchType;
+use MailSo\Mime\Enumerations\Header as MimeEnumHeader;
+
 trait Pgp
 {
-	/**
-	 * Also see trait Messages::DoMessagePgpVerify
-	 */
+	public function DoGetPGPKeys() : array
+	{
+		$result = [];
+
+		$keys = Backup::getKeys();
+		foreach ($keys['public'] as $key) {
+			$result[] = $key['value'];
+		}
+		foreach ($keys['private'] as $key) {
+			$result[] = $key['value'];
+		}
+
+		$GPG = $this->GnuPG();
+		if ($GPG) {
+			$keys = $GPG->allKeysInfo('');
+			foreach ($keys['public'] as $key) {
+				$key = $GPG->export($key['subkeys'][0]['fingerprint'] ?: $key['subkeys'][0]['keyid']);
+				if ($key) {
+					$result[] = $key;
+				}
+			}
+		}
+
+		return $this->DefaultResponse(\array_values(\array_unique($result)));
+	}
+
+	public function DoPgpSearchKey() : array
+	{
+		$result = Keyservers::get(
+			$this->GetActionParam('query', '')
+		);
+		return $this->DefaultResponse($result ?: false);
+	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
-	public function GnuPG() : ?\SnappyMail\PGP\GnuPG
+	public function GnuPG() : ?\SnappyMail\PGP\PGPInterface
 	{
 		$oAccount = $this->getMainAccountFromToken();
 		if (!$oAccount) {
 			return null;
 		}
 
-		$homedir = \dirname($this->StorageProvider()->GenerateFilePath(
+		$homedir = \rtrim($this->StorageProvider()->GenerateFilePath(
 			$oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::PGP
-		)) . '/.gnupg';
+			\RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
+		), '/') . '/.gnupg';
 
-		if (!\is_dir($homedir)) {
-			\mkdir($homedir, 0700, true);
-		}
+		\MailSo\Base\Utils::mkdir($homedir);
 		if (!\is_writable($homedir)) {
 			throw new \Exception("gpg homedir '{$homedir}' not writable");
 		}
@@ -39,10 +73,13 @@ trait Pgp
 			// First try a symbolic link
 			$tmpdir = \sys_get_temp_dir() . '/snappymail';
 //			if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
-			if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) {
+			\is_dir($tmpdir) || \mkdir($tmpdir, 0700);
+			if (\is_dir($tmpdir) && \is_writable($tmpdir)) {
 				$link = $tmpdir . '/' . \md5($homedir);
 				if (\is_link($link) || \symlink($homedir, $link)) {
 					$homedir = $link;
+				} else {
+					$this->logWrite("symlink('{$homedir}', '{$link}') failed", \LOG_WARNING, 'GnuPG');
 				}
 			}
 			// Else try ~/.gnupg/ + hash(email address)
@@ -54,35 +91,30 @@ trait Pgp
 					$tmpdir .= \sha1($oAccount->Email());
 				}
 //				if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
-				if (\is_dir($tmpdir) || \mkdir($tmpdir, 0700, true)) {
-					$homedir = $link;
+				if (\is_dir($tmpdir) || \is_link($tmpdir) || \symlink($homedir, $tmpdir) || \mkdir($tmpdir, 0700, true)) {
+					$homedir = $tmpdir;
 				}
 			}
-
-			if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
-				throw new \Exception("socket name for '{$homedir}/S.gpg-agent.extra' is too long");
-			}
 		}
 
-		return \SnappyMail\PGP\GnuPG::getInstance($homedir);
+		return GnuPG::getInstance($homedir);
 	}
 
 	public function DoGnupgDecrypt() : array
 	{
 		$GPG = $this->GnuPG();
 		if (!$GPG) {
-			return $this->FalseResponse(__FUNCTION__);
+			return $this->FalseResponse();
 		}
 
-		$GPG->addDecryptKey(
-			$this->GetActionParam('KeyId', ''),
-			$this->GetActionParam('Passphrase', '')
-		);
+		$oPassphrase = new \SnappyMail\SensitiveString($this->GetActionParam('passphrase', ''));
 
-		$sData = $this->GetActionParam('Data', '');
+		$GPG->addDecryptKey($this->GetActionParam('keyId', ''), $oPassphrase);
+
+		$sData = $this->GetActionParam('data', '');
 		$oPart = null;
 		$result = [
-			'data' => '',
+			'data' => null,
 			'signatures' => []
 		];
 		if ($sData) {
@@ -92,39 +124,48 @@ trait Pgp
 			$this->initMailClientConnection();
 			$this->MailClient()->MessageMimeStream(
 				function ($rResource) use ($GPG, &$result, &$oPart) {
-					if (\is_resource($rResource)) {
+					if (\is_resource($rResource)) try {
 						$result['data'] = $GPG->decryptStream($rResource);
 //						$oPart = \MailSo\Mime\Part::FromString($result);
 //						$GPG->decryptStream($rResource, $rStreamHandle);
 //						$oPart = \MailSo\Mime\Part::FromStream($rStreamHandle);
+					} catch (\Throwable $e) {
+						$result = $e;
 					}
 				},
-				$this->GetActionParam('Folder', ''),
-				(int) $this->GetActionParam('Uid', ''),
-				$this->GetActionParam('PartId', '')
+				$this->GetActionParam('folder', ''),
+				(int) $this->GetActionParam('uid', ''),
+				$this->GetActionParam('partId', '')
 			);
 		}
 
-		if ($oPart && $oPart->IsPgpSigned()) {
+		if ($oPart && $oPart->isPgpSigned()) {
 //			$GPG->verifyStream($oPart->SubParts[0]->Body, \stream_get_contents($oPart->SubParts[1]->Body));
 //			$result['signatures'] = $oPart->SubParts[0];
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $result);
+		if ($result instanceof \Throwable) {
+			throw $result;
+		}
+
+		return $this->DefaultResponse($result);
 	}
 
 	public function DoGnupgGetKeys() : array
 	{
 		$GPG = $this->GnuPG();
-		return $this->DefaultResponse(__FUNCTION__, $GPG ? $GPG->keyInfo('') : false);
+		return $this->DefaultResponse($GPG ? $GPG->allKeysInfo('') : false);
 	}
 
 	public function DoGnupgExportKey() : array
 	{
+		$oPassphrase = $this->GetActionParam('isPrivate', '')
+			? new \SnappyMail\SensitiveString($this->GetActionParam('passphrase', ''))
+			: null;
 		$GPG = $this->GnuPG();
-		return $this->DefaultResponse(__FUNCTION__, $GPG ? $GPG->export(
-			$this->GetActionParam('KeyId', ''),
-			$this->GetActionParam('Passphrase', '')
+		return $this->DefaultResponse($GPG ? $GPG->export(
+			$this->GetActionParam('keyId', ''),
+			$oPassphrase
 		) : false);
 	}
 
@@ -133,29 +174,30 @@ trait Pgp
 		$fingerprint = false;
 		$GPG = $this->GnuPG();
 		if ($GPG) {
-			$sName = $this->GetActionParam('Name', '');
-			$sEmail = $this->GetActionParam('Email', '');
+			$sName = $this->GetActionParam('name', '');
+			$sEmail = $this->GetActionParam('email', '');
+			$oPassphrase = new \SnappyMail\SensitiveString($this->GetActionParam('passphrase', ''));
 			$fingerprint = $GPG->generateKey(
 				$sName ? "{$sName} <{$sEmail}>" : $sEmail,
-				$this->GetActionParam('Passphrase', '')
+				$oPassphrase
 			);
 		}
-		return $this->DefaultResponse(__FUNCTION__, $fingerprint);
+		return $this->DefaultResponse($fingerprint);
 	}
 
 	public function DoGnupgDeleteKey() : array
 	{
 		$GPG = $this->GnuPG();
-		$sKeyId = $this->GetActionParam('KeyId', '');
+		$sKeyId = $this->GetActionParam('keyId', '');
 		$bPrivate = !!$this->GetActionParam('isPrivate', 0);
-		return $this->DefaultResponse(__FUNCTION__, $GPG ? $GPG->deleteKey($sKeyId, $bPrivate) : false);
+		return $this->DefaultResponse($GPG ? $GPG->deleteKey($sKeyId, $bPrivate) : false);
 	}
 
-	public function DoGnupgImportKey() : array
+	public function DoPgpImportKey() : array
 	{
-		$sKey = $this->GetActionParam('Key', '');
-		$sKeyId = $this->GetActionParam('KeyId', '');
-		$sEmail = $this->GetActionParam('Email', '');
+		$sKey = $this->GetActionParam('key', '');
+		$sKeyId = $this->GetActionParam('keyId', '');
+		$sEmail = $this->GetActionParam('email', '');
 
 		if (!$sKey) {
 			try {
@@ -164,22 +206,28 @@ trait Pgp
 						$sEmail = $aMatch[0];
 					}
 					if ($sEmail) {
-						$aKeys = \SnappyMail\PGP\Keyservers::index($sEmail);
+						$aKeys = Keyservers::index($sEmail);
 						if ($aKeys) {
 							$sKeyId = $aKeys[0]['keyid'];
 						}
 					}
 				}
 				if ($sKeyId) {
-					$sKey = \SnappyMail\PGP\Keyservers::get($sKeyId);
+					$sKey = Keyservers::get($sKeyId);
 				}
 			} catch (\Throwable $e) {
 				// ignore
 			}
 		}
 
-		$GPG = $sKey ? $this->GnuPG() : null;
-		return $this->DefaultResponse(__FUNCTION__, $GPG ? $GPG->import($sKey) : false);
+		$result = [];
+		if ($sKey) {
+			$sKey = \trim($sKey);
+			$result['backup'] = $this->GetActionParam('backup', '') && Backup::PGPKey($sKey);
+			$result['gnuPG'] = $this->GetActionParam('gnuPG', '') && ($GPG = $this->GnuPG()) && $GPG->import($sKey);
+		}
+
+		return $this->DefaultResponse($result);
 	}
 
 	/**
@@ -188,35 +236,7 @@ trait Pgp
 	 */
 	public function DoGetStoredPGPKeys() : array
 	{
-		$oAccount = $this->getMainAccountFromToken();
-		if (!$oAccount) {
-			return null;
-		}
-
-		$dir = $this->StorageProvider()->GenerateFilePath(
-			$oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::PGP
-		);
-
-		$keys = [];
-		foreach (\glob("{$dir}/*") as $file) {
-			if (\is_file($file)) {
-				if ('.asc' === \substr($file, -4)) {
-					$keys[] = \file_get_contents($file);
-				} else if ('.key' === \substr($file, -4)) {
-					$key = \json_decode(\file_get_contents($file), true);
-					$mac = \array_pop($key);
-					$hash = $oAccount->CryptKey();
-					if ($mac === \hash_hmac('sha1', $key[2], $hash)) {
-						$key[1] = \base64_decode($key[1]);
-						$key[2] = \base64_decode($key[2]);
-						$keys[] = \SnappyMail\Crypt::Decrypt($key, $hash);
-					}
-				}
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $keys);
+		return $this->DefaultResponse(Backup::getKeys());
 	}
 
 	/**
@@ -229,16 +249,16 @@ trait Pgp
 		$privateKey = $this->GetActionParam('privateKey', '');
 
 		$result = [
-			'onServer' => [false, false, false],
-			'inGnuPG'  => [false, false, false]
+			'onServer' => [false, false],
+			'inGnuPG'  => [false, false]
 		];
 
 		$onServer = (int) $this->GetActionParam('onServer', 0);
 		if ($publicKey && $onServer & 1) {
-			$result['onServer'][0] = $this->StorePGPKey($publicKey);
+			$result['onServer'][0] = Backup::PGPKey($publicKey);
 		}
 		if ($privateKey && $onServer & 2) {
-			$result['onServer'][1] = $this->StorePGPKey($privateKey);
+			$result['onServer'][1] = Backup::PGPKey($privateKey);
 		}
 
 		$inGnuPG = (int) $this->GetActionParam('inGnuPG', 0);
@@ -253,7 +273,7 @@ trait Pgp
 		}
 
 //		$revocationCertificate = $this->GetActionParam('revocationCertificate', '');
-		return $this->DefaultResponse(__FUNCTION__, $result);
+		return $this->DefaultResponse($result);
 	}
 
 	/**
@@ -262,33 +282,130 @@ trait Pgp
 	 */
 	public function DoStorePGPKey() : array
 	{
-		$key = $this->GetActionParam('Key', '');
-		$keyId = $this->GetActionParam('KeyId', '');
-		return $this->DefaultResponse(__FUNCTION__, ($key && $keyId && $this->StorePGPKey($key, $keyId)));
+		$key = $this->GetActionParam('key', '');
+		$keyId = $this->GetActionParam('keyId', '');
+		return $this->DefaultResponse(($key && $keyId && Backup::PGPKey($key, $keyId)));
 	}
 
-	private function StorePGPKey(string $key, string $keyId = '') : bool
+	public function DoDeletePGPKey(): array
 	{
-		$oAccount = $this->getMainAccountFromToken();
-		if ($oAccount) {
-			$keyId = $keyId ? "0x{$keyId}" : \sha1($key);
-			$dir = $this->StorageProvider()->GenerateFilePath(
-				$oAccount,
-				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP
-			);
-			if (\str_contains($key, 'PGP PRIVATE KEY')) {
-				$hash = $oAccount->CryptKey();
-				$key = \SnappyMail\Crypt::Encrypt($key, $hash);
-				$key[1] = \base64_encode($key[1]);
-				$key[2] = \base64_encode($key[2]);
-				$key[] = \hash_hmac('sha1', $key[2], $hash);
-				return !!\file_put_contents("{$dir}{$keyId}.key", \json_encode($key));
+		$key = $this->GetActionParam('key', '');
+		$keyId = $this->GetActionParam('keyId', '');
+		$success = $key && Backup::PGPKey($key, $keyId, true);
+		return $this->DefaultResponse($success, ['code' => (int)!$success]);
+	}
+
+	/**
+	 * https://datatracker.ietf.org/doc/html/rfc3156#section-5
+	 */
+	public function DoPgpVerifyMessage() : array
+	{
+		$sBodyPart = $this->GetActionParam('bodyPart', '');
+		if ($sBodyPart) {
+			$result = [
+				'text' => \preg_replace('/\\r?\\n/su', "\r\n", $sBodyPart),
+				'signature' => $this->GetActionParam('sigPart', '')
+			];
+		} else {
+			$sFolderName = $this->GetActionParam('folder', '');
+			$iUid = (int) $this->GetActionParam('uid', 0);
+			$sPartId = $this->GetActionParam('partId', '');
+			$sSigPartId = $this->GetActionParam('sigPartId', '');
+//			$sMicAlg = $this->GetActionParam('micAlg', '');
+
+			$this->initMailClientConnection();
+			$oImapClient = $this->ImapClient();
+			$oImapClient->FolderExamine($sFolderName);
+
+			$aParts = [
+				FetchType::BODY_PEEK.'['.$sPartId.']',
+				// An empty section specification refers to the entire message, including the header.
+				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
+				FetchType::BODY_PEEK.'['.$sPartId.'.MIME]'
+			];
+			if ($sSigPartId) {
+				$aParts[] = FetchType::BODY_PEEK.'['.$sSigPartId.']';
 			}
-			if (\str_contains($key, 'PGP PUBLIC KEY')) {
-				return !!\file_put_contents("{$dir}{$keyId}_public.asc", $key);
+
+			$oFetchResponse = $oImapClient->Fetch($aParts, $iUid, true)[0];
+
+			$sBodyMime = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.'.MIME]');
+			if ($sSigPartId) {
+				$result = [
+					'text' => \preg_replace('/\\r?\\n/su', "\r\n",
+						$sBodyMime . $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']')
+					),
+					'signature' => \preg_replace('/[^\x00-\x7F]/', '',
+						$oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sSigPartId.']')
+					)
+				];
+			} else {
+				// clearsigned text
+				$result = [
+					'text' => $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']'),
+					'signature' => ''
+				];
+				$decode = (new \MailSo\Mime\HeaderCollection($sBodyMime))->ValueByName(MimeEnumHeader::CONTENT_TRANSFER_ENCODING);
+				if ('base64' === $decode) {
+					$result['text'] = \base64_decode($result['text']);
+				} else if ('quoted-printable' === $decode) {
+					$result['text'] = \quoted_printable_decode($result['text']);
+				}
 			}
 		}
-		return false;
-	}
 
+		// Try by default as OpenPGP.js sets useGnuPG to 0
+		if ($this->GetActionParam('tryGnuPG', 1)) {
+			$GPG = $this->GnuPG();
+			if ($GPG) {
+				$info = $this->GnuPG()->verify($result['text'], $result['signature']);
+//				$info = $this->GnuPG()->verifyStream($fp, $result['signature']);
+				if (empty($info[0])) {
+					$result = false;
+				} else {
+					$info = $info[0];
+
+					/**
+					* https://code.woboq.org/qt5/include/gpg-error.h.html
+					* status:
+						0 = GPG_ERR_NO_ERROR
+						1 = GPG_ERR_GENERAL
+						9 = GPG_ERR_NO_PUBKEY
+						117440513 = General error
+						117440520 = Bad signature
+					*/
+
+					$summary = \defined('GNUPG_SIGSUM_VALID') ? [
+						GNUPG_SIGSUM_VALID => 'The signature is fully valid.',
+						GNUPG_SIGSUM_GREEN => 'The signature is good but one might want to display some extra information. Check the other bits.',
+						GNUPG_SIGSUM_RED => 'The signature is bad. It might be useful to check other bits and display more information, i.e. a revoked certificate might not render a signature invalid when the message was received prior to the cause for the revocation.',
+						GNUPG_SIGSUM_KEY_REVOKED => 'The key or at least one certificate has been revoked.',
+						GNUPG_SIGSUM_KEY_EXPIRED => 'The key or one of the certificates has expired. It is probably a good idea to display the date of the expiration.',
+						GNUPG_SIGSUM_SIG_EXPIRED => 'The signature has expired.',
+						GNUPG_SIGSUM_KEY_MISSING => 'Can’t verify due to a missing key or certificate.',
+						GNUPG_SIGSUM_CRL_MISSING => 'The CRL (or an equivalent mechanism) is not available.',
+						GNUPG_SIGSUM_CRL_TOO_OLD => 'Available CRL is too old.',
+						GNUPG_SIGSUM_BAD_POLICY => 'A policy requirement was not met.',
+						GNUPG_SIGSUM_SYS_ERROR => 'A system error occurred.',
+//						GNUPG_SIGSUM_TOFU_CONFLICT = 'A TOFU conflict was detected.',
+					] : [];
+
+					// Verified, so no need to return $result['text'] and $result['signature']
+					$result = [
+						'fingerprint' => $info['fingerprint'],
+						'validity' => $info['validity'],
+						'status' => $info['status'],
+						'summary' => $info['summary'],
+						'message' => \implode("\n", \array_filter($summary, function($k) use ($info) {
+							return $info['summary'] & $k;
+						}, ARRAY_FILTER_USE_KEY))
+					];
+				}
+			} else {
+				$result = false;
+			}
+		}
+
+		return $this->DefaultResponse($result);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
index 7a158d3b1..ef73f9c7f 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Raw.php
@@ -5,27 +5,32 @@ namespace RainLoop\Actions;
 trait Raw
 {
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function RawViewAsPlain() : bool
 	{
-		$this->initMailClientConnection();
-
-		$sRawKey = (string) $this->GetActionParam('RawKey', '');
-		$aValues = $this->getDecodedRawKeyValue($sRawKey);
-
-		$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
-		$iUid = (isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0);
-		$sMimeIndex = (string) (isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '');
-
-		\header('Content-Type: text/plain');
-
-		return $this->MailClient()->MessageMimeStream(function ($rResource) {
-			if (\is_resource($rResource))
-			{
-				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
-			}
-		}, $sFolder, $iUid, $sMimeIndex);
+		$oAccount = $this->getAccountFromToken();
+		$sRawKey = $this->GetActionParam('RawKey', '');
+		$aValues = $this->decodeRawKey($sRawKey);
+		if (!empty($aValues['folder']) && !empty($aValues['uid'])
+		 && !empty($aValues['accountHash']) && $aValues['accountHash'] === $oAccount->Hash()
+		) {
+			$this->verifyCacheByKey($sRawKey);
+			$this->initMailClientConnection();
+			\header('Content-Type: text/plain');
+			return $this->MailClient()->MessageMimeStream(
+				function ($rResource) use ($sRawKey) {
+					if (\is_resource($rResource)) {
+						$this->cacheByKey($sRawKey);
+						\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
+					}
+				},
+				(string) $aValues['folder'],
+				(int) $aValues['uid'],
+				isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : ''
+			);
+		}
+		return false;
 	}
 
 	public function RawDownload() : bool
@@ -50,24 +55,19 @@ trait Raw
 
 		$oAccount = $this->getAccountFromToken();
 
-		$sData = $this->StorageProvider()->Get($oAccount,
+		$mData = $this->StorageProvider()->Get($oAccount,
 			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 			'background'
 		);
 
-		if (!empty($sData))
-		{
-			$aData = \json_decode($sData, true);
-			unset($sData);
-
-			if (!empty($aData['ContentType']) && !empty($aData['Raw']) &&
-				\in_array($aData['ContentType'], array('image/png', 'image/jpg', 'image/jpeg')))
-			{
+		if (!empty($mData)) {
+			$mData = \json_decode($mData, true);
+			if (!empty($mData['ContentType']) && !empty($mData['Raw'])) {
 				$this->cacheByKey($sRawKey);
 
-				\header('Content-Type: '.$aData['ContentType']);
-				echo \base64_decode($aData['Raw']);
-				unset($aData);
+				\header('Content-Type: '.$mData['ContentType']);
+				echo \base64_decode($mData['Raw']);
+				unset($mData);
 
 				return true;
 			}
@@ -76,155 +76,129 @@ trait Raw
 		return false;
 	}
 
-	public function RawPublic() : bool
+	private function clearFileName(string $sFileName, string $sContentType, string $sMimeIndex, int $iMaxLength = 250): string
 	{
-		$sRawKey = (string) $this->GetActionParam('RawKey', '');
-		$this->verifyCacheByKey($sRawKey);
+		$sFileName = !\strlen($sFileName) ? \preg_replace('/[^a-zA-Z0-9]/', '.', (empty($sMimeIndex) ? '' : $sMimeIndex . '.') . $sContentType) : $sFileName;
+		$sClearedFileName = \MailSo\Base\Utils::StripSpaces(\preg_replace('/[\.]+/', '.', $sFileName));
+		$sExt = \MailSo\Base\Utils::GetFileExtension($sClearedFileName);
 
-		$sHash = $sRawKey;
-		$sData = '';
-
-		if (!empty($sHash))
-		{
-			$sData = $this->StorageProvider()->Get(null,
-				\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY,
-				\RainLoop\KeyPathHelper::PublicFile($sHash)
-			);
+		if (10 < $iMaxLength && $iMaxLength < \strlen($sClearedFileName) - \strlen($sExt)) {
+			$sClearedFileName = \substr($sClearedFileName, 0, $iMaxLength) . (empty($sExt) ? '' : '.' . $sExt);
 		}
 
-		$aMatch = array();
-		if (!empty($sData) && 0 === \strpos($sData, 'data:') &&
-			\preg_match('/^data:([^:]+):/', $sData, $aMatch) && !empty($aMatch[1]))
-		{
-			$sContentType = \trim($aMatch[1]);
-			if (\in_array($sContentType, array('image/png', 'image/jpg', 'image/jpeg')))
-			{
-				$this->cacheByKey($sRawKey);
-
-				\header('Content-Type: '.$sContentType);
-				echo \preg_replace('/^data:[^:]+:/', '', $sData);
-				unset($sData);
-
-				return true;
-			}
-		}
-
-		return false;
+		return \MailSo\Base\Utils::SecureFileName(\MailSo\Base\Utils::Utf8Clear($sClearedFileName));
 	}
 
+	/**
+	 * Message, Message Attachment or Zip
+	 */
 	private function rawSmart(bool $bDownload, bool $bThumbnail = false) : bool
 	{
 		$sRawKey = (string) $this->GetActionParam('RawKey', '');
 
-		$aValues = $this->getDecodedRawKeyValue($sRawKey);
-
-		$sRange = $this->Http()->GetHeader('Range');
+		$oAccount = $this->getAccountFromToken();
+		$aValues = $this->decodeRawKey($sRawKey);
+		if (empty($aValues['accountHash']) || $aValues['accountHash'] !== $oAccount->Hash()) {
+			return false;
+		}
 
+		$sRange = \MailSo\Base\Http::GetHeader('Range');
 		$aMatch = array();
 		$sRangeStart = $sRangeEnd = '';
 		$bIsRangeRequest = false;
-
-		if (!empty($sRange) && 'bytes=0-' !== \strtolower($sRange) && \preg_match('/^bytes=([0-9]+)-([0-9]*)/i', \trim($sRange), $aMatch))
+		if (!empty($sRange) && 'bytes=0-' !== \strtolower($sRange)
+		 && \preg_match('/^bytes=([0-9]+)-([0-9]*)/i', \trim($sRange), $aMatch))
 		{
 			$sRangeStart = $aMatch[1];
 			$sRangeEnd = $aMatch[2];
-
 			$bIsRangeRequest = true;
+		} else {
+			$this->verifyCacheByKey($sRawKey);
 		}
 
-		$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
-		$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
-		$sMimeIndex = isset($aValues['MimeIndex']) ? (string) $aValues['MimeIndex'] : '';
-
-		$sContentTypeIn = isset($aValues['MimeType']) ? (string) $aValues['MimeType'] : '';
-		$sFileNameIn = isset($aValues['FileName']) ? (string) $aValues['FileName'] : '';
-		$sFileHashIn = isset($aValues['FileHash']) ? (string) $aValues['FileHash'] : '';
-
-		if (!empty($sFileHashIn))
-		{
-			$this->verifyCacheByKey($sRawKey);
-
-			$oAccount = $this->getAccountFromToken();
+		$sMimeIndex = isset($aValues['mimeIndex']) ? (string) $aValues['mimeIndex'] : '';
+		$sContentTypeIn = isset($aValues['mimeType']) ? (string) $aValues['mimeType'] : '';
+		$sFileNameIn = isset($aValues['fileName']) ? (string) $aValues['fileName'] : '';
 
+		if (!empty($aValues['fileHash'])) {
+			$rResource = $this->FilesProvider()->GetFile($oAccount, (string) $aValues['fileHash']);
+			if (!\is_resource($rResource)) {
+				return false;
+			}
 			// https://github.com/the-djmaze/snappymail/issues/144
 			if ('.pdf' === \substr($sFileNameIn,-4)) {
 				$sContentTypeOut = 'application/pdf'; // application/octet-stream
 			} else {
-				$sContentTypeOut = $sContentTypeIn ?: \MailSo\Base\Utils::MimeContentType($sFileNameIn);
-			}
-
-			$sFileNameOut = $this->MainClearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
-
-			$rResource = $this->FilesProvider()->GetFile($oAccount, $sFileHashIn);
-			if (\is_resource($rResource))
-			{
-				\header('Content-Type: '.$sContentTypeOut);
-				\header('Content-Disposition: attachment; '.
-					\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileNameOut)));
-
-				\header('Accept-Ranges: none');
-				\header('Content-Transfer-Encoding: binary');
-
-				\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
-				return true;
+				$sContentTypeOut = $sContentTypeIn
+					?: \SnappyMail\File\MimeType::fromFilename($sFileNameIn)
+					?: 'application/octet-stream';
 			}
+			$sFileNameOut = $this->clearFileName($sFileNameIn, $sContentTypeIn, $sMimeIndex);
+			\header('Content-Type: '.$sContentTypeOut);
+			\MailSo\Base\Http::setContentDisposition('attachment', ['filename' => $sFileNameOut]);
+			\header('Accept-Ranges: none');
+			\header('Content-Transfer-Encoding: binary');
+			\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
+			return true;
+		}
 
+		$sFolder = isset($aValues['folder']) ? (string) $aValues['folder'] : '';
+		$iUid = isset($aValues['uid']) ? (int) $aValues['uid'] : 0;
+		if (empty($sFolder) || 1 > $iUid) {
 			return false;
 		}
-		else if (!empty($sFolder) && 0 < $iUid)
-		{
-			$this->verifyCacheByKey($sRawKey);
-		}
 
-		$oAccount = $this->initMailClientConnection();
+		$this->initMailClientConnection();
 
 		$self = $this;
 		return $this->MailClient()->MessageMimeStream(
 			function($rResource, $sContentType, $sFileName, $sMimeIndex = '') use (
-				$self, $oAccount, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail,
+				$self, $sRawKey, $sContentTypeIn, $sFileNameIn, $bDownload, $bThumbnail,
 				$bIsRangeRequest, $sRangeStart, $sRangeEnd
 			) {
-				if ($oAccount && \is_resource($rResource))
-				{
+				if (\is_resource($rResource)) {
 					\MailSo\Base\Utils::ResetTimeLimit();
 
 					$self->cacheByKey($sRawKey);
 
+					$self->logWrite(\print_r([
+						$sFileName,
+						$sContentType,
+						$sFileNameIn,
+						$sContentTypeIn
+					],true), \LOG_DEBUG, 'RAW');
+
 					if ($sFileNameIn) {
 						$sFileName = $sFileNameIn;
 					}
-					$sFileName = $self->MainClearFileName($sFileName, $sContentType, $sMimeIndex);
+					$sFileName = $self->clearFileName($sFileName, $sContentType, $sMimeIndex);
 
 					if ('.pdf' === \substr($sFileName, -4)) {
 						// https://github.com/the-djmaze/snappymail/issues/144
 						$sContentType = 'application/pdf';
-					} else if ($sContentTypeIn) {
-						$sContentType = $sContentTypeIn;
-					} else if (!$sContentType) {
-						$sContentType = $sFileName ? \MailSo\Base\Utils::MimeContentType($sFileName) : 'text/plain';
+					} else {
+						$sContentType = $sContentTypeIn
+							?: $sContentType
+//							?: \SnappyMail\File\MimeType::fromStream($rResource, $sFileName)
+							?: \SnappyMail\File\MimeType::fromFilename($sFileName)
+							?: 'application/octet-stream';
 					}
 
-					if (!$bDownload)
-					{
+					if (!$bDownload) {
 						$bDetectImageOrientation = $self->Config()->Get('labs', 'image_exif_auto_rotate', false)
 							// Mostly only JPEG has EXIF metadata
 							&& 'image/jpeg' == $sContentType;
 						try
 						{
-							if ($bThumbnail)
-							{
-								$oImage = static::loadImage($rResource, $bDetectImageOrientation, 60);
-								\header('Content-Disposition: inline; '.
-									\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileName.'_thumb60x60.png')));
+							if ($bThumbnail) {
+								$oImage = static::loadImage($rResource, $bDetectImageOrientation, 48);
+								\MailSo\Base\Http::setContentDisposition('inline', ['filename' => $sFileName.'_thumb60x60.png']);
 								$oImage->show('png');
 //								$oImage->show('webp'); // Little Britain: "Safari says NO"
 								exit;
-							}
-							else if ($bDetectImageOrientation)
-							{
+							} else if ($bDetectImageOrientation) {
 								$oImage = static::loadImage($rResource, $bDetectImageOrientation);
-								\header('Content-Disposition: inline; '.
-									\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileName)));
+								\MailSo\Base\Http::setContentDisposition('inline', ['filename' => $sFileName]);
 								$oImage->show();
 //								$oImage->show('webp'); // Little Britain: "Safari says NO"
 								exit;
@@ -240,9 +214,7 @@ trait Raw
 
 					if (!\headers_sent()) {
 						\header('Content-Type: '.$sContentType);
-						\header('Content-Disposition: '.($bDownload ? 'attachment' : 'inline').'; '.
-							\trim(\MailSo\Base\Utils::EncodeHeaderUtf8AttributeValue('filename', $sFileName)));
-
+						\MailSo\Base\Http::setContentDisposition($bDownload ? 'attachment' : 'inline', ['filename' => $sFileName]);
 						\header('Accept-Ranges: bytes');
 						\header('Content-Transfer-Encoding: binary');
 					}
@@ -260,24 +232,20 @@ trait Raw
 
 							\MailSo\Base\Http::StatusHeader(206);
 
-							$iRangeStart = (int) $sRangeStart;
-							$iRangeEnd = (int) $sRangeEnd;
+							$iRangeStart = \max(0, \intval($sRangeStart));
+							$iRangeEnd = \max(0, \intval($sRangeEnd));
 
-							if ('' === $sRangeEnd) {
-								$sLoadedData = 0 < $iRangeStart ? \substr($sLoadedData, $iRangeStart) : $sLoadedData;
-							} else {
-								if ($iRangeStart < $iRangeEnd) {
-									$sLoadedData = \substr($sLoadedData, $iRangeStart, $iRangeEnd - $iRangeStart);
-								} else {
-									$sLoadedData = 0 < $iRangeStart ? \substr($sLoadedData, $iRangeStart) : $sLoadedData;
-								}
+							if ($iRangeEnd && $iRangeStart < $iRangeEnd) {
+								$sLoadedData = \substr($sLoadedData, $iRangeStart, $iRangeEnd - $iRangeStart);
+							} else if ($iRangeStart) {
+								$sLoadedData = \substr($sLoadedData, $iRangeStart);
 							}
 
 							$iContentLength = \strlen($sLoadedData);
 
 							if (0 < $iContentLength) {
 								\header('Content-Length: '.$iContentLength);
-								\header('Content-Range: bytes '.$sRangeStart.'-'.(0 < $iRangeEnd ? $iRangeEnd : $iFullContentLength - 1).'/'.$iFullContentLength);
+								\header('Content-Range: bytes '.$sRangeStart.'-'.($iRangeEnd ?: $iFullContentLength - 1).'/'.$iFullContentLength);
 							}
 						} else {
 							\header('Content-Length: '.\strlen($sLoadedData));
@@ -290,7 +258,8 @@ trait Raw
 						\MailSo\Base\Utils::FpassthruWithTimeLimitReset($rResource);
 					}
 				}
-			}, $sFolder, $iUid, $sMimeIndex);
+			}, $sFolder, $iUid, $sMimeIndex
+		);
 	}
 
 	private static function loadImage($resource, bool $bDetectImageOrientation = false, int $iThumbnailBoxSize = 0) : \SnappyMail\Image
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
index 098664c4c..8a2414387 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Response.php
@@ -2,282 +2,102 @@
 
 namespace RainLoop\Actions;
 
-use RainLoop\Enumerations\Capa;
 use RainLoop\Notifications;
 use RainLoop\Utils;
 
 trait Response
 {
-	/**
-	 * @param mixed $mResult = false
-	 */
-	public function DefaultResponse(string $sActionName, $mResult = false, array $aAdditionalParams = array()) : array
+	public function DefaultResponse(mixed $mResult, array $aAdditionalParams = array(), string $sActionName = ''): array
 	{
-		$this->Plugins()->RunHook('main.default-response-data', array($sActionName, &$mResult));
-		$aResponseItem = $this->mainDefaultResponse($sActionName, $mResult, $aAdditionalParams);
-		$this->Plugins()->RunHook('main.default-response', array($sActionName, &$aResponseItem));
-		return $aResponseItem;
-	}
-
-	public function TrueResponse(string $sActionName, array $aAdditionalParams = array()) : array
-	{
-		$mResult = true;
-		$this->Plugins()->RunHook('main.default-response-data', array($sActionName, &$mResult));
-		$aResponseItem = $this->mainDefaultResponse($sActionName, $mResult, $aAdditionalParams);
-		$this->Plugins()->RunHook('main.default-response', array($sActionName, &$aResponseItem));
-		return $aResponseItem;
-	}
-
-	public function FalseResponse(string $sActionName, ?int $iErrorCode = null, ?string $sErrorMessage = null, ?string $sAdditionalErrorMessage = null) : array
-	{
-		$mResult = false;
-		$this->Plugins()
-			->RunHook('main.default-response-data', array($sActionName, &$mResult))
-			->RunHook('main.default-response-error-data', array($sActionName, &$iErrorCode, &$sErrorMessage))
-		;
-
-		$aAdditionalParams = array();
-		if (null !== $iErrorCode)
-		{
-			$aAdditionalParams['ErrorCode'] = (int) $iErrorCode;
-			$aAdditionalParams['ErrorMessage'] = null === $sErrorMessage ? '' : (string) $sErrorMessage;
-			$aAdditionalParams['ErrorMessageAdditional'] = null === $sAdditionalErrorMessage ? '' : (string) $sAdditionalErrorMessage;
+		if (false === $mResult) {
+			if (!isset($aAdditionalParams['code'])) {
+				$aAdditionalParams['code'] = 0;
+			}
+			if (!isset($aAdditionalParams['message'])) {
+				$aAdditionalParams['message'] = '';
+			}
 		}
 
-		$aResponseItem = $this->mainDefaultResponse($sActionName, $mResult, $aAdditionalParams);
-
-		$this->Plugins()->RunHook('main.default-response', array($sActionName, &$aResponseItem));
-		return $aResponseItem;
+		return \array_merge(array(
+//			'version' => APP_VERSION,
+			'Action' => $sActionName,
+			'Result' => $this->responseObject($mResult)
+		), $aAdditionalParams);
 	}
 
-	public function ExceptionResponse(string $sActionName, \Throwable $oException) : array
+	public function TrueResponse(array $aAdditionalParams = array()): array
 	{
-		$iErrorCode = null;
-		$sErrorMessage = null;
-		$sErrorMessageAdditional = null;
+		return $this->DefaultResponse(true, $aAdditionalParams);
+	}
 
-		if ($oException instanceof \RainLoop\Exceptions\ClientException)
-		{
+	public function FalseResponse(int $iErrorCode = 0, string $sErrorMessage = '', string $sAdditionalErrorMessage = ''): array
+	{
+		return $this->DefaultResponse(false, [
+			'code' => $iErrorCode,
+			'message' => $sErrorMessage,
+			'messageAdditional' => $sAdditionalErrorMessage
+		]);
+	}
+
+	public function ExceptionResponse(\Throwable $oException): array
+	{
+		$iErrorCode = Notifications::UnknownError;
+		$sErrorMessage = $oException->getMessage();
+		$sErrorMessageAdditional = '';
+		$iExceptionCode = 0;
+
+		if ($oException instanceof \RainLoop\Exceptions\ClientException) {
 			$iErrorCode = $oException->getCode();
-			$sErrorMessage = null;
-
-			if ($iErrorCode === Notifications::ClientViewError)
-			{
+			if ($iErrorCode === Notifications::ClientViewError) {
 				$sErrorMessage = $oException->getMessage();
 			}
-
 			$sErrorMessageAdditional = $oException->getAdditionalMessage();
-			if (empty($sErrorMessageAdditional))
-			{
-				$sErrorMessageAdditional = null;
-			}
-		}
-		else
-		{
-			$iErrorCode = Notifications::UnknownError;
-			$sErrorMessage = $oException->getCode().' - '.$oException->getMessage();
+		} else {
+			$iExceptionCode = $oException->getCode();
 		}
 
-		$oPrevious = $oException->getPrevious();
-		if ($oPrevious)
-		{
-			$this->Logger()->WriteException($oPrevious);
-		}
-		else
-		{
-			$this->Logger()->WriteException($oException);
-		}
+		$this->logException($oException->getPrevious() ?: $oException);
 
-		return $this->FalseResponse($sActionName, $iErrorCode, $sErrorMessage, $sErrorMessageAdditional);
+		return $this->DefaultResponse(false, [
+			'code' => $iErrorCode,
+			'message' => $sErrorMessage,
+			'messageAdditional' => $sErrorMessageAdditional,
+			'ExceptionCode' => $iExceptionCode
+		]);
 	}
 
-	/**
-	 * @param mixed $mResult = false
-	 */
-	private function mainDefaultResponse(string $sActionName, $mResult = false, array $aAdditionalParams = array()) : array
-	{
-		$sActionName = 'Do' === \substr($sActionName, 0, 2) ? \substr($sActionName, 2) : $sActionName;
-		$sActionName = \preg_replace('/[^a-zA-Z0-9_]+/', '', $sActionName);
-
-		$aResult = array(
-//			'Version' => APP_VERSION,
-			'Action' => $sActionName,
-			'Result' => $this->responseObject($mResult, $sActionName)
-		);
-
-		foreach ($aAdditionalParams as $sKey => $mValue)
-		{
-			$aResult[$sKey] = $mValue;
-		}
-
-		return $aResult;
-	}
-
-	private function isFileHasFramedPreview(string $sFileName) : bool
-	{
-		$sExt = \MailSo\Base\Utils::GetFileExtension($sFileName);
-		return \in_array($sExt, array('doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx'));
-	}
-
-	private function isFileHasThumbnail(string $sFileName) : bool
-	{
-		static $aCache = array();
-
-		$sExt = \MailSo\Base\Utils::GetFileExtension($sFileName);
-		if (isset($aCache[$sExt])) {
-			return $aCache[$sExt];
-		}
-
-		$bResult = (
-			\extension_loaded('gd')
-			|| \extension_loaded('gmagick')
-			|| \extension_loaded('imagick')
-		) && \in_array($sExt, ['png', 'gif', 'jpg', 'jpeg']);
-
-		$aCache[$sExt] = $bResult;
-
-		return $bResult;
-	}
-
-	/**
-	 * @param mixed $mResponse
-	 *
-	 * @return mixed
-	 */
 	private $aCheckableFolder = null;
-	private function responseObject($mResponse, string $sParent = '')
+	private function responseObject(mixed $mResponse, string $sParent = ''): mixed
 	{
-		if (!($mResponse instanceof \JsonSerializable))
-		{
-			if (\is_object($mResponse))
-			{
+		if (!($mResponse instanceof \JsonSerializable)) {
+			if (\is_object($mResponse)) {
 				return '["'.\get_class($mResponse).'"]';
 			}
 
-			if (\is_array($mResponse))
-			{
-				foreach ($mResponse as $iKey => $oItem)
-				{
-					$mResponse[$iKey] = $this->responseObject($oItem, $sParent);
+			if (\is_array($mResponse)) {
+				foreach ($mResponse as $iKey => $oItem) {
+					$mResponse[$iKey] = $this->responseObject($oItem, 'Array');
 				}
 			}
 
 			return $mResponse;
 		}
 
-		if ($mResponse instanceof \MailSo\Mail\Message)
-		{
-			$mResult = $mResponse->jsonSerialize();
-
-			$oAccount = $this->getAccountFromToken();
-
-			if (!$mResult['DateTimeStampInUTC'] || $this->Config()->Get('labs', 'date_from_headers', false)) {
-				$iDateTimeStampInUTC = $mResponse->HeaderTimeStampInUTC();
-				if ($iDateTimeStampInUTC) {
-					$mResult['DateTimeStampInUTC'] = $iDateTimeStampInUTC;
+		if ($mResponse instanceof \MailSo\Mail\Message) {
+			$aResult = $mResponse->jsonSerialize();
+			if (!$sParent && \strlen($aResult['readReceipt']) && !\in_array('$mdnsent', $aResult['flags']) && !\in_array('\\answered', $aResult['flags'])) {
+				$oAccount = $this->getAccountFromToken();
+				if ('1' === $this->Cacher($oAccount)->Get(\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $aResult['folder'], $aResult['uid']), '0')) {
+					$aResult['readReceipt'] = '';
 				}
 			}
-
-			// \MailSo\Mime\EmailCollection
-			foreach (['ReplyTo','From','To','Cc','Bcc','Sender','DeliveredTo','ReplyTo'] as $prop) {
-				$mResult[$prop] = $this->responseObject($mResult[$prop], $sParent);
-			}
-
-			$sSubject = $mResult['Subject'];
-			$mResult['Hash'] = \md5($mResult['Folder'].$mResult['Uid']);
-			$mResult['RequestHash'] = Utils::EncodeKeyValuesQ(array(
-				'V' => APP_VERSION,
-				'Account' => $oAccount->Hash(),
-				'Folder' => $mResult['Folder'],
-				'Uid' => $mResult['Uid'],
-				'MimeType' => 'message/rfc822',
-				'FileName' => (\strlen($sSubject) ? \MailSo\Base\Utils::ClearXss($sSubject) : 'message-'.$mResult['Uid']) . '.eml'
-			));
-
-			$sForwardedFlag = \strtolower($this->Config()->Get('labs', 'imap_forwarded_flag', ''));
-			$sReadReceiptFlag = \strtolower($this->Config()->Get('labs', 'imap_read_receipt_flag', ''));
-			\strlen($sForwardedFlag) && \in_array($sForwardedFlag, $mResult['Flags']) && \array_push($mResult['Flags'], '$forwarded');
-			\strlen($sReadReceiptFlag) && \in_array($sReadReceiptFlag, $mResult['Flags']) && \array_push($mResult['Flags'], '$mdnsent');
-			$mResult['Flags'] = \array_unique($mResult['Flags']);
-
-			if ('Message' === $sParent)
-			{
-				$mResult['DraftInfo'] = $mResponse->DraftInfo();
-				$mResult['InReplyTo'] = $mResponse->InReplyTo();
-				$mResult['UnsubsribeLinks'] = $mResponse->UnsubsribeLinks();
-				$mResult['References'] = $mResponse->References();
-
-				$mResult['Html'] = $mResponse->Html();
-				$mResult['Plain'] = $mResponse->Plain();
-
-//				$this->GetCapa(Capa::OPEN_PGP) || $this->GetCapa(Capa::GNUPG)
-				$mResult['PgpSigned'] = $mResponse->PgpSigned();
-				$mResult['PgpEncrypted'] = $mResponse->PgpEncrypted();
-
-				$mResult['Attachments'] = $this->responseObject($mResponse->Attachments(), $sParent);
-
-				$mResult['ReadReceipt'] = $mResponse->ReadReceipt();
-
-				if (\strlen($mResult['ReadReceipt']) && !\in_array('$forwarded', $mResult['Flags']))
-				{
-					if (\strlen($mResult['ReadReceipt']))
-					{
-						try
-						{
-							$oReadReceipt = \MailSo\Mime\Email::Parse($mResult['ReadReceipt']);
-							if (!$oReadReceipt)
-							{
-								$mResult['ReadReceipt'] = '';
-							}
-						}
-						catch (\Throwable $oException) { unset($oException); }
-					}
-
-					if (\strlen($mResult['ReadReceipt']) && '1' === $this->Cacher($oAccount)->Get(
-						\RainLoop\KeyPathHelper::ReadReceiptCache($oAccount->Email(), $mResult['Folder'], $mResult['Uid']), '0'))
-					{
-						$mResult['ReadReceipt'] = '';
-					}
-				}
-			}
-			return $mResult;
+			return $aResult;
 		}
 
-		if ($mResponse instanceof \MailSo\Mail\Attachment)
-		{
-			$mResult = $mResponse->jsonSerialize();
-			$mResult['Framed'] = $this->isFileHasFramedPreview($mResult['FileName']);
-			$mResult['IsThumbnail'] = $this->GetCapa(Capa::ATTACHMENT_THUMBNAILS) && $this->isFileHasThumbnail($mResult['FileName']);
-			$mResult['Download'] = Utils::EncodeKeyValuesQ(array(
-				'V' => APP_VERSION,
-				'Account' => $this->getAccountFromToken()->Hash(),
-				'Folder' => $mResult['Folder'],
-				'Uid' => $mResult['Uid'],
-				'MimeIndex' => $mResult['MimeIndex'],
-				'MimeType' => $mResult['MimeType'],
-				'FileName' => $mResult['FileName'],
-				'Framed' => $mResult['Framed']
-			));
-			return $mResult;
-		}
+		if ($mResponse instanceof \MailSo\Imap\Folder) {
+			$aResult = $mResponse->jsonSerialize();
 
-		if ($mResponse instanceof \MailSo\Mail\Folder)
-		{
-			$aExtended = null;
-			$aStatus = $mResponse->Status();
-			if ($aStatus && isset($aStatus['MESSAGES'], $aStatus['UNSEEN'], $aStatus['UIDNEXT'])) {
-				$aExtended = array(
-					'MessageCount' => (int) $aStatus['MESSAGES'],
-					'MessageUnseenCount' => (int) $aStatus['UNSEEN'],
-					'UidNext' => (int) $aStatus['UIDNEXT'],
-					'Hash' => $this->MailClient()->GenerateFolderHash(
-						$mResponse->FullName(), $aStatus['MESSAGES'], $aStatus['UIDNEXT'],
-							empty($aStatus['HIGHESTMODSEQ']) ? 0 : $aStatus['HIGHESTMODSEQ'])
-				);
-			}
-
-			if (null === $this->aCheckableFolder)
-			{
+			if (null === $this->aCheckableFolder) {
 				$aCheckable = \json_decode(
 					$this->SettingsProvider(true)
 					->Load($this->getAccountFromToken())
@@ -285,30 +105,9 @@ trait Response
 				);
 				$this->aCheckableFolder = \is_array($aCheckable) ? $aCheckable : array();
 			}
+			$aResult['checkable'] = \in_array($mResponse->FullName, $this->aCheckableFolder);
 
-			return \array_merge(
-				$mResponse->jsonSerialize(),
-				array(
-					'Checkable' => \in_array($mResponse->FullName(), $this->aCheckableFolder),
-					'Extended' => $aExtended,
-				)
-			);
-		}
-
-		if ($mResponse instanceof \MailSo\Base\Collection)
-		{
-			$mResult = $mResponse->jsonSerialize();
-			$mResult['@Collection'] = $this->responseObject($mResult['@Collection'], $sParent);
-			if ($mResponse instanceof \MailSo\Mail\EmailCollection) {
-				return \array_slice($mResult['@Collection'], 0, 100);
-			}
-			if ($mResponse instanceof \MailSo\Mail\AttachmentCollection
-			 || $mResponse instanceof \MailSo\Mail\FolderCollection
-			 || $mResponse instanceof \MailSo\Mail\MessageCollection
-			) {
-				return $mResult;
-			}
-			return $mResult['@Collection'];
+			return $aResult;
 		}
 
 		return $mResponse;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
new file mode 100644
index 000000000..124f3c974
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/SMime.php
@@ -0,0 +1,215 @@
+<?php
+
+namespace RainLoop\Actions;
+
+use SnappyMail\SMime\OpenSSL;
+use SnappyMail\SMime\Certificate;
+use MailSo\Imap\Enumerations\FetchType;
+
+trait SMime
+{
+	private $SMIME = null;
+	public function SMIME() : OpenSSL
+	{
+		if (!$this->SMIME) {
+			$oAccount = $this->getMainAccountFromToken();
+			if (!$oAccount) {
+				return null;
+			}
+
+			$homedir = \rtrim($this->StorageProvider()->GenerateFilePath(
+				$oAccount,
+				\RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
+			), '/') . '/.smime';
+
+			\MailSo\Base\Utils::mkdir($homedir);
+			if (!\is_writable($homedir)) {
+				throw new \Exception("smime homedir '{$homedir}' not writable");
+			}
+
+			$this->SMIME = new OpenSSL($homedir);
+		}
+		return $this->SMIME;
+	}
+
+	public function DoGetSMimeCertificate() : array
+	{
+		$result = [
+			'key' => '',
+			'pkey' => '',
+			'cert' => ''
+		];
+		return $this->DefaultResponse(\array_values(\array_unique($result)));
+	}
+
+	// Like DoGnupgGetKeys
+	public function DoSMimeGetCertificates() : array
+	{
+		return $this->DefaultResponse(
+			$this->SMIME()->certificates()
+		);
+	}
+
+	/**
+	 * Can be used by Identity
+	 */
+	public function DoSMimeCreateCertificate() : array
+	{
+		$oAccount = $this->getAccountFromToken();
+
+		$oPassphrase = new \SnappyMail\SensitiveString($this->GetActionParam('passphrase', ''));
+
+		$cert = new Certificate();
+		$cert->distinguishedName['commonName'] = $this->GetActionParam('name', '') ?: $oAccount->Name();
+		$cert->distinguishedName['emailAddress'] = $this->GetActionParam('email', '') ?: $oAccount->Email();
+		$result = $cert->createSelfSigned($oPassphrase, $this->GetActionParam('privateKey', ''));
+		return $this->DefaultResponse($result ?: false);
+	}
+
+	public function DoSMimeExportPrivateKey() : array
+	{
+		$SMIME = $this->SMIME();
+		$SMIME->setPrivateKey(
+			$this->GetActionParam('privateKey'),
+			new \SnappyMail\SensitiveString($this->GetActionParam('oldPassphrase', ''))
+		);
+		$result = $SMIME->exportPrivateKey(
+			new \SnappyMail\SensitiveString($this->GetActionParam('newPassphrase', ''))
+		);
+
+		return $this->DefaultResponse($result);
+	}
+
+	public function DoSMimeDecryptMessage() : array
+	{
+		$sFolderName = $this->GetActionParam('folder', '');
+		$iUid = (int) $this->GetActionParam('uid', 0);
+		$sPartId = $this->GetActionParam('partId', '');
+		$sCertificate = $this->GetActionParam('certificate', '');
+		$sPrivateKey = $this->GetActionParam('privateKey', '');
+		$oPassphrase = new \SnappyMail\SensitiveString($this->GetActionParam('passphrase', ''));
+
+		$this->initMailClientConnection();
+		$oImapClient = $this->ImapClient();
+		$oImapClient->FolderExamine($sFolderName);
+
+		if ('TEXT' === $sPartId) {
+			$oFetchResponse = $oImapClient->Fetch([
+				FetchType::BODY_PEEK.'['.$sPartId.']',
+				// An empty section specification refers to the entire message, including the header.
+				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
+				FetchType::BODY_HEADER_PEEK
+			], $iUid, true)[0];
+			$sBody = $oFetchResponse->GetFetchValue(FetchType::BODY_HEADER);
+		} else {
+			$oFetchResponse = $oImapClient->Fetch([
+				FetchType::BODY_PEEK.'['.$sPartId.']',
+				// An empty section specification refers to the entire message, including the header.
+				// But Dovecot does not return it with BODY.PEEK[1], so we also use BODY.PEEK[1.MIME].
+				FetchType::BODY_PEEK.'['.$sPartId.'.MIME]'
+			], $iUid, true)[0];
+			$sBody = $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.'.MIME]');
+		}
+		$sBody .= $oFetchResponse->GetFetchValue(FetchType::BODY.'['.$sPartId.']');
+
+		$SMIME = $this->SMIME();
+		$SMIME->setCertificate($sCertificate);
+		$SMIME->setPrivateKey($sPrivateKey, $oPassphrase);
+		$result = $SMIME->decrypt($sBody);
+		if ($result) {
+			$result = ['data' => $result];
+			if (\str_contains($result['data'], 'multipart/signed')
+			  || \preg_match('/smime-type=["\']?signed-data/', $result['data'])
+			) {
+				$signed = $SMIME->verify($result['data'], null, true);
+				$result['signed'] = [
+					'success' => !empty($signed['success'])
+				];
+				if (!empty($signed['body'])) {
+					$result['data'] = $signed['body'];
+				}
+			}
+		}
+
+		return $this->DefaultResponse($result ?: false);
+	}
+
+	public function DoSMimeVerifyMessage() : array
+	{
+		$sBody = $this->GetActionParam('bodyPart', '');
+		$sPartId = $this->GetActionParam('partId', '');
+		$bDetached = !empty($this->GetActionParam('detached', 0));
+		if (!$sBody && $sPartId) {
+			$iUid = (int) $this->GetActionParam('uid', 0);
+//			$sMicAlg = $this->GetActionParam('micAlg', '');
+			$this->initMailClientConnection();
+			$oImapClient = $this->ImapClient();
+			$oImapClient->FolderExamine($this->GetActionParam('folder', ''));
+			$sBody = $oImapClient->FetchMessagePart($iUid, $sPartId);
+		}
+
+		$result = $this->SMIME()->verify($sBody, null, !$bDetached);
+
+		// Import the certificates automatically
+		$sBody = $this->GetActionParam('sigPart', '');
+		$sPartId = $this->GetActionParam('sigPartId', '') ?: $sPartId;
+		if (!$sBody && $sPartId && $oImapClient) {
+			$sBody = $oImapClient->Fetch(
+				[FetchType::BODY_PEEK.'['.$sPartId.']'],
+				$iUid,
+				true
+			)[0]->GetFetchValue(FetchType::BODY.'['.$sPartId.']');
+		}
+		if ($sBody) {
+			$sBody = \trim($sBody);
+			$certificates = [];
+			\openssl_pkcs7_read(
+				"-----BEGIN PKCS7-----\n\n{$sBody}\n-----END PKCS7-----",
+				$certificates
+			) || $this->logWrite("openssl_pkcs7_read: " . \openssl_error_string(), \LOG_ERR, 'OpenSSL');
+			foreach ($certificates as $certificate) {
+				$this->SMIME()->storeCertificate($certificate);
+			}
+		}
+
+		return $this->DefaultResponse($result);
+	}
+
+	public function DoSMimeImportCertificate() : array
+	{
+		return $this->DefaultResponse(
+			$this->SMIME()->storeCertificate(
+				$this->GetActionParam('pem', '')
+			)
+		);
+	}
+
+	public function DoSMimeImportCertificatesFromMessage() : array
+	{
+/*
+		$sBody = $this->GetActionParam('sigPart', '');
+		if (!$sBody) {
+			$sPartId = $this->GetActionParam('sigPartId', '') ?: $this->GetActionParam('partId', '');
+			$this->initMailClientConnection();
+			$oImapClient = $this->ImapClient();
+			$oImapClient->FolderExamine($this->GetActionParam('folder', ''));
+			$sBody = $oImapClient->Fetch([
+				FetchType::BODY_PEEK.'['.$sPartId.']'
+			], (int) $this->GetActionParam('uid', 0), true)[0]
+			->GetFetchValue(FetchType::BODY.'['.$sPartId.']');
+		}
+		$sBody = \trim($sBody);
+		$certificates = [];
+		\openssl_pkcs7_read(
+			"-----BEGIN PKCS7-----\n\n{$sBody}\n-----END PKCS7-----",
+			$certificates
+		);
+
+		foreach ($certificates as $certificate) {
+			$this->SMIME()->storeCertificate($certificate);
+		}
+
+		return $this->DefaultResponse($certificates);
+*/
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
index 45d63cf66..fd79a977d 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/Themes.php
@@ -2,6 +2,9 @@
 
 namespace RainLoop\Actions;
 
+use RainLoop\Enumerations\Capa;
+use SnappyMail\Nextcloud;
+
 trait Themes
 {
 	public function GetTheme(bool $bAdmin): string
@@ -11,11 +14,11 @@ trait Themes
 			$sTheme = $this->Config()->Get('webmail', 'theme', 'Default');
 			if (!$bAdmin
 			 && ($oAccount = $this->getAccountFromToken(false))
-			 && $this->GetCapa(\RainLoop\Enumerations\Capa::THEMES)
+			 && $this->GetCapa(Capa::THEMES)
 			 && ($oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount))) {
 				$sTheme = (string) $oSettingsLocal->GetConf('Theme', $sTheme);
 			}
-			$sTheme = $this->ValidateTheme($sTheme) ?: 'Default';
+			$sTheme = $this->ValidateTheme($sTheme);
 		}
 		return $sTheme;
 	}
@@ -55,19 +58,23 @@ trait Themes
 
 		$sDir = APP_INDEX_ROOT_PATH . 'themes'; // custom user themes
 		if (\is_dir($sDir)) {
-			$rDirH = \opendir($sDir);
-			if ($rDirH) {
+			if ($rDirH = \opendir($sDir)) {
 				while (($sFile = \readdir($rDirH)) !== false) {
 					if ('.' !== $sFile[0] && \is_dir($sDir . '/' . $sFile)
 					 && (\file_exists("{$sDir}/{$sFile}/styles.css") || \file_exists("{$sDir}/{$sFile}/styles.less"))) {
 						$aCache[] = $sFile . '@custom';
 					}
 				}
-
 				\closedir($rDirH);
+			} else {
+				$this->logWrite("{$sDir} not readable", \LOG_DEBUG, 'Themes');
 			}
 		}
 
+		if (\class_exists('OC', false)) {
+			$aCache = \array_merge($aCache, Nextcloud::themes());
+		}
+
 		$aCache = \array_unique($aCache);
 		\sort($aCache);
 
@@ -82,43 +89,49 @@ trait Themes
 		return $aCache;
 	}
 
-	public function ThemeLink(bool $bAdmin): string
-	{
-		return './?/Css/0/' . ($bAdmin ? 'Admin' : 'User') . '/-/' . $this->GetTheme($bAdmin) . '/-/' . $this->StaticCache() . '/Hash/-/';
-	}
-
 	public function ValidateTheme(string $sTheme): string
 	{
-		return \in_array($sTheme, $this->GetThemes()) ? $sTheme : $this->Config()->Get('themes', 'default', 'Default');
-	}
-
-	public function compileCss(string $sTheme, bool $bAdmin) : string
-	{
-		$bCustomTheme = '@custom' === \substr($sTheme, -7);
-		if ($bCustomTheme) {
-			$sTheme = \substr($sTheme, 0, -7);
-		}
-
-		$mResult = array();
-
-		$sBase = ($bCustomTheme ? \RainLoop\Utils::WebPath() : \RainLoop\Utils::WebVersionPath())
-				. "themes/{$sTheme}/";
-
-		$bLess = false;
-
-		$sThemeCSSFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sTheme.'/styles.css';
-		if (\is_file($sThemeCSSFile)) {
-			$mResult[] = \file_get_contents($sThemeCSSFile);
-		} else {
-			$sThemeCSSFile = \str_replace('styles.css', 'styles.less', $sThemeCSSFile);
-			if (\is_file($sThemeCSSFile)) {
-				$bLess = true;
-				$mResult[] = "@base: \"{$sBase}\";";
-				$mResult[] = \file_get_contents($sThemeCSSFile);
+		if (!\in_array($sTheme, $this->GetThemes())) {
+			$sTheme = $this->Config()->Get('webmail', 'theme', 'Default');
+			if (!\in_array($sTheme, $this->GetThemes())) {
+				$sTheme = 'Default';
 			}
 		}
+		return $sTheme;
+	}
 
-		$mResult[] = $this->Plugins()->CompileCss($bAdmin, $bLess);
+	public function compileCss(string $sTheme, bool $bAdmin, bool $bMinified = false) : string
+	{
+		$mResult = array();
+		$bLess = false;
+
+		if ('@nextcloud' === \substr($sTheme, -10)) {
+			$sBase = Nextcloud::webRoot() . '/';
+			$sThemeCSSFile = Nextcloud::themesDir() . '/' . \str_replace('@nextcloud', '/snappymail/style.css', $sTheme);
+		} else {
+			$bCustomTheme = '@custom' === \substr($sTheme, -7);
+			if ($bCustomTheme) {
+				$sTheme = \substr($sTheme, 0, -7);
+				$sBase = \RainLoop\Utils::WebPath();
+			} else {
+				$sBase = \RainLoop\Utils::WebVersionPath();
+			}
+			$sBase .= "themes/{$sTheme}/";
+			$sThemeCSSFile = ($bCustomTheme ? APP_INDEX_ROOT_PATH : APP_VERSION_ROOT_PATH).'themes/'.$sTheme.'/styles.css';
+			if (!\is_file($sThemeCSSFile)) {
+				$sThemeCSSFile = \str_replace('styles.css', 'styles.less', $sThemeCSSFile);
+				if (\is_file($sThemeCSSFile)) {
+					$bLess = true;
+					$mResult[] = "@base: \"{$sBase}\";";
+					$mResult[] = \file_get_contents($sThemeCSSFile);
+				}
+			}
+		}
+		if (\is_file($sThemeCSSFile)) {
+			$mResult[] = \file_get_contents($sThemeCSSFile);
+		}
+
+		$mResult[] = $this->Plugins()->CompileCss($bAdmin, $bLess, $bMinified);
 
 		$mResult = \preg_replace('@(url\(["\']?)(\\./)?([a-z]+[^:a-z])@',
 			"\$1{$sBase}\$3",
@@ -127,4 +140,84 @@ trait Themes
 		return $bLess ? (new \LessPHP\lessc())->compile($mResult) : $mResult;
 //			: \str_replace(';}', '}', \preg_replace('/\\s*([:;{},])\\s*/', '\1', \preg_replace('/\\s+/', ' ', \preg_replace('#/\\*.*?\\*/#s', '', $mResult))));
 	}
+
+	public function UploadBackground(?array $aFile, int $iError): array
+	{
+		$oAccount = $this->getAccountFromToken();
+
+		if (!$this->GetCapa(Capa::USER_BACKGROUND)) {
+			return $this->FalseResponse();
+		}
+
+		$sName = '';
+		$sHash = '';
+
+		if ($oAccount && UPLOAD_ERR_OK === $iError && \is_array($aFile)) {
+			$sMimeType = \SnappyMail\File\MimeType::fromFile($aFile['tmp_name'], $aFile['name'])
+				?: \SnappyMail\File\MimeType::fromFilename($aFile['name'])
+				?: $aFile['type'];
+			if (\in_array($sMimeType, array('image/png', 'image/jpg', 'image/jpeg', 'image/webp'))) {
+				$sSavedName = 'upload-post-' . \md5($aFile['name'] . $aFile['tmp_name'])
+					. \SnappyMail\File\MimeType::toExtension($sMimeType);
+				if (!$this->FilesProvider()->MoveUploadedFile($oAccount, $sSavedName, $aFile['tmp_name'])) {
+					$iError = \RainLoop\Enumerations\UploadError::ON_SAVING;
+				} else {
+					$rData = $this->FilesProvider()->GetFile($oAccount, $sSavedName);
+					if (\is_resource($rData)) {
+						$sData = \stream_get_contents($rData);
+						if (!empty($sData) && \strlen($sData)) {
+							$sName = $aFile['name'];
+							if (empty($sName)) {
+								$sName = '_';
+							}
+
+							if ($this->StorageProvider()->Put($oAccount,
+								\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
+								'background',
+								// Used by RawUserBackground()
+								\RainLoop\Utils::jsonEncode(array(
+									'ContentType' => $sMimeType,
+									'Raw' => \base64_encode($sData)
+								))
+							)) {
+								$oSettings = $this->SettingsProvider()->Load($oAccount);
+								if ($oSettings) {
+									$sHash = \MailSo\Base\Utils::Sha1Rand($sName . APP_VERSION . APP_SALT);
+
+									$oSettings->SetConf('UserBackgroundName', $sName);
+									$oSettings->SetConf('UserBackgroundHash', $sHash);
+									$oSettings->save();
+								}
+							}
+						}
+
+						unset($sData);
+					}
+
+					if (\is_resource($rData)) {
+						\fclose($rData);
+					}
+
+					unset($rData);
+				}
+
+				$this->FilesProvider()->Clear($oAccount, $sSavedName);
+			} else {
+				$iError = \RainLoop\Enumerations\UploadError::FILE_TYPE;
+			}
+		}
+
+		if (UPLOAD_ERR_OK !== $iError) {
+			$iClientError = 0;
+			$sError = \RainLoop\Enumerations\UploadError::getUserMessage($iError, $iClientError);
+			if (!empty($sError)) {
+				return $this->FalseResponse($iClientError, $sError);
+			}
+		}
+
+		return $this->DefaultResponse(!empty($sName) && !empty($sHash) ? array(
+			'name' => $sName,
+			'hash' => $sHash
+		) : false);
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
index 6f2c4ae14..a60783edd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/User.php
@@ -15,204 +15,53 @@ trait User
 	use Filters;
 	use Folders;
 	use Messages;
+	use Attachments;
 	use Pgp;
+	use SMime;
 
-	/**
-	 * @var \RainLoop\Providers\Suggestions
-	 */
-	private $oSuggestionsProvider = null;
+	private ?Suggestions $oSuggestionsProvider = null;
 
 	public function SuggestionsProvider(): Suggestions
 	{
 		if (null === $this->oSuggestionsProvider) {
-			$this->oSuggestionsProvider = new Suggestions(
-				$this->fabrica('suggestions'));
+			$this->oSuggestionsProvider = new Suggestions($this->fabrica('suggestions'));
 		}
 
 		return $this->oSuggestionsProvider;
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoLogin() : array
 	{
-		$sEmail = \MailSo\Base\Utils::Trim($this->GetActionParam('Email', ''));
-		$sPassword = $this->GetActionParam('Password', '');
-		$bSignMe = !empty($this->GetActionParam('SignMe', 0));
+		try {
+			$oAccount = $this->LoginProcess(
+				\MailSo\Base\Utils::Trim($this->GetActionParam('Email', '')),
+				new \SnappyMail\SensitiveString($this->GetActionParam('Password', ''))
+			);
+		} catch (\Throwable $oException) {
+			$this->loginErrorDelay();
+			throw $oException;
+		}
 
-		$oAccount = null;
+		empty($this->GetActionParam('signMe', 0)) || $this->SetSignMeToken($oAccount);
 
-		$this->Logger()->AddSecret($sPassword);
-
-		$oAccount = $this->LoginProcess($sEmail, $sPassword, $bSignMe);
-		$this->Plugins()->RunHook('login.success', array($oAccount));
-
-		$this->SetAuthToken($oAccount);
-
-		$sLanguage = $this->GetActionParam('Language', '');
-		if ($oAccount && $sLanguage)
-		{
+		$sLanguage = $this->GetActionParam('language', '');
+		if ($oAccount && $sLanguage) {
 			$oSettings = $this->SettingsProvider()->Load($oAccount);
-			if ($oSettings)
-			{
+			if ($oSettings) {
 				$sLanguage = $this->ValidateLanguage($sLanguage);
-				$sCurrentLanguage = $oSettings->GetConf('Language', '');
+				$sCurrentLanguage = $oSettings->GetConf('language', '');
 
-				if ($sCurrentLanguage !== $sLanguage)
-				{
-					$oSettings->SetConf('Language', $sLanguage);
-					$this->SettingsProvider()->Save($oAccount, $oSettings);
+				if ($sCurrentLanguage !== $sLanguage) {
+					$oSettings->SetConf('language', $sLanguage);
+					$oSettings->save();
 				}
 			}
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $this->AppData(false));
-	}
-
-	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
-	 */
-	public function DoAttachmentsActions() : array
-	{
-		if (!$this->GetCapa(Capa::ATTACHMENTS_ACTIONS))
-		{
-			return $this->FalseResponse(__FUNCTION__);
-		}
-
-		$oAccount = $this->initMailClientConnection();
-
-		$sAction = $this->GetActionParam('Do', '');
-		$aHashes = $this->GetActionParam('Hashes', null);
-
-		$mResult = false;
-		$bError = false;
-		$aData = false;
-
-		if (\is_array($aHashes) && \count($aHashes))
-		{
-			$aData = array();
-			foreach ($aHashes as $sZipHash)
-			{
-				$aResult = $this->getMimeFileByHash($oAccount, $sZipHash);
-				if (!empty($aResult['FileHash']))
-				{
-					$aData[] = $aResult;
-				}
-				else
-				{
-					$bError = true;
-					break;
-				}
-			}
-		}
-
-		$oFilesProvider = $this->FilesProvider();
-		if (!empty($sAction) && !$bError && \is_array($aData) && \count($aData) &&
-			$oFilesProvider && $oFilesProvider->IsActive())
-		{
-			$bError = false;
-			switch (\strtolower($sAction))
-			{
-				case 'zip':
-
-					$sZipHash = \MailSo\Base\Utils::Sha1Rand();
-					$sZipFileName = $oFilesProvider->GenerateLocalFullFileName($oAccount, $sZipHash);
-
-					if (!empty($sZipFileName)) {
-						if (\class_exists('ZipArchive')) {
-							$oZip = new \ZipArchive();
-							$oZip->open($sZipFileName, \ZIPARCHIVE::CREATE | \ZIPARCHIVE::OVERWRITE);
-							$oZip->setArchiveComment('SnappyMail/'.APP_VERSION);
-
-							foreach ($aData as $aItem)
-							{
-								$sFileName = (string) (isset($aItem['FileName']) ? $aItem['FileName'] : 'file.dat');
-								$sFileHash = (string) (isset($aItem['FileHash']) ? $aItem['FileHash'] : '');
-
-								if (!empty($sFileHash))
-								{
-									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
-									if (!$oZip->addFile($sFullFileNameHash, $sFileName))
-									{
-										$bError = true;
-									}
-								}
-							}
-
-							if (!$bError)
-							{
-								$bError = !$oZip->close();
-							}
-							else
-							{
-								$oZip->close();
-							}
-						} else {
-							@\unlink($sZipFileName);
-							$oZip = new \PharData($sZipFileName . '.zip', 0, null, \Phar::ZIP);
-							$oZip->compressFiles(\Phar::GZ);
-
-							foreach ($aData as $aItem)
-							{
-								$sFileName = (isset($aItem['FileName']) ? (string) $aItem['FileName'] : 'file.dat');
-								$sFileHash = (isset($aItem['FileHash']) ? (string) $aItem['FileHash'] : '');
-
-								if ($sFileHash)
-								{
-									$sFullFileNameHash = $oFilesProvider->GetFileName($oAccount, $sFileHash);
-									$oZip->addFile($sFullFileNameHash, $sFileName);
-								}
-							}
-
-							$oZip->compressFiles(\Phar::GZ);
-
-							unset($oZip);
-							\rename($sZipFileName . '.zip', $sZipFileName);
-						}
-
-						foreach ($aData as $aItem)
-						{
-							$sFileHash = (isset($aItem['FileHash']) ? (string) $aItem['FileHash'] : '');
-							if ($sFileHash)
-							{
-								$oFilesProvider->Clear($oAccount, $sFileHash);
-							}
-						}
-
-						if (!$bError)
-						{
-							$mResult = array(
-								'FileHash' => Utils::EncodeKeyValuesQ(array(
-									'V' => APP_VERSION,
-									'Account' => $oAccount ? \md5($oAccount->Hash()) : '',
-									'FileName' => 'attachments.zip',
-									'MimeType' => 'application/zip',
-									'FileHash' => $sZipHash
-								))
-							);
-						}
-					}
-					break;
-
-				default:
-					$data = new \SnappyMail\AttachmentsAction;
-					$data->action = $sAction;
-					$data->items = $aData;
-					$data->filesProvider = $oFilesProvider;
-					$data->account = $oAccount;
-					$this->Plugins()->RunHook('json.attachments', array($data));
-					$mResult = $data->result;
-					break;
-			}
-		}
-		else
-		{
-			$bError = true;
-		}
-
-		$this->requestSleep();
-		return $this->DefaultResponse(__FUNCTION__, $bError ? false : $mResult);
+		return $this->DefaultResponse($this->AppData(false));
 	}
 
 	public function DoLogout() : array
@@ -220,13 +69,11 @@ trait User
 		$bMain = true; // empty($_COOKIE[self::AUTH_ADDITIONAL_TOKEN_KEY]);
 		$this->Logout($bMain);
 		$bMain && $this->ClearSignMeData();
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoAppDelayStart() : array
 	{
-		$this->Plugins()->RunHook('service.app-delay-start-begin');
-
 		Utils::UpdateConnectionToken();
 
 		$bMainCache = false;
@@ -243,20 +90,17 @@ trait User
 		$iMainCacheTime = !empty($aTimers[0]) && \is_numeric($aTimers[0]) ? (int) $aTimers[0] : 0;
 		$iFilesCacheTime = !empty($aTimers[1]) && \is_numeric($aTimers[1]) ? (int) $aTimers[1] : 0;
 
-		if (0 === $iMainCacheTime || $iMainCacheTime + $iOneDay1 < \time())
-		{
+		if (0 === $iMainCacheTime || $iMainCacheTime + $iOneDay1 < \time()) {
 			$bMainCache = true;
 			$iMainCacheTime = \time();
 		}
 
-		if (0 === $iFilesCacheTime || $iFilesCacheTime + $iOneDay2 < \time())
-		{
+		if (0 === $iFilesCacheTime || $iFilesCacheTime + $iOneDay2 < \time()) {
 			$bFilesCache = true;
 			$iFilesCacheTime = \time();
 		}
 
-		if ($bMainCache || $bFilesCache)
-		{
+		if ($bMainCache || $bFilesCache) {
 			if (!$this->StorageProvider()->Put(null,
 				\RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY, 'Cache/Timers',
 				\implode(',', array($iMainCacheTime, $iFilesCacheTime))))
@@ -265,26 +109,21 @@ trait User
 			}
 		}
 
-		if ($bMainCache)
-		{
-			$this->Logger()->Write('Cacher GC: Begin');
+		if ($bMainCache) {
+			$this->logWrite('Cacher GC: Begin');
 			$this->Cacher()->GC(48);
-			$this->Logger()->Write('Cacher GC: End');
+			$this->logWrite('Cacher GC: End');
 
-			$this->Logger()->Write('Storage GC: Begin');
+			$this->logWrite('Storage GC: Begin');
 			$this->StorageProvider()->GC();
-			$this->Logger()->Write('Storage GC: End');
-		}
-		else if ($bFilesCache)
-		{
-			$this->Logger()->Write('Files GC: Begin');
+			$this->logWrite('Storage GC: End');
+		} else if ($bFilesCache) {
+			$this->logWrite('Files GC: Begin');
 			$this->FilesProvider()->GC(48);
-			$this->Logger()->Write('Files GC: End');
+			$this->logWrite('Files GC: End');
 		}
 
-		$this->Plugins()->RunHook('service.app-delay-start-end');
-
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoSettingsUpdate() : array
@@ -297,30 +136,28 @@ trait User
 		$oSettings = $this->SettingsProvider()->Load($oAccount);
 		$oSettingsLocal = $this->SettingsProvider(true)->Load($oAccount);
 
-		if ($oConfig->Get('webmail', 'allow_languages_on_settings', true))
-		{
-			$this->setSettingsFromParams($oSettings, 'Language', 'string', function ($sLanguage) use ($self) {
+		if ($oConfig->Get('webmail', 'allow_languages_on_settings', true)) {
+			$this->setSettingsFromParams($oSettings, 'language', 'string', function ($sLanguage) use ($self) {
 				return $self->ValidateLanguage($sLanguage);
 			});
+		} else {
+//			$oSettings->SetConf('language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
 		}
-		else
-		{
-			$oSettings->SetConf('Language', $this->ValidateLanguage($oConfig->Get('webmail', 'language', 'en')));
-		}
+		$this->setSettingsFromParams($oSettings, 'hourCycle', 'string');
 
-		if ($this->GetCapa(Capa::THEMES))
-		{
+		if ($this->GetCapa(Capa::THEMES)) {
 			$this->setSettingsFromParams($oSettingsLocal, 'Theme', 'string', function ($sTheme) use ($self) {
 				return $self->ValidateTheme($sTheme);
 			});
-		}
-		else
-		{
-			$oSettingsLocal->SetConf('Theme', $this->ValidateTheme($oConfig->Get('webmail', 'theme', 'Default')));
+			$this->setSettingsFromParams($oSettings, 'fontSansSerif', 'string');
+			$this->setSettingsFromParams($oSettings, 'fontSerif', 'string');
+			$this->setSettingsFromParams($oSettings, 'fontMono', 'string');
+		} else {
+//			$oSettingsLocal->SetConf('Theme', $this->ValidateTheme($oConfig->Get('webmail', 'theme', 'Default')));
 		}
 
 		$this->setSettingsFromParams($oSettings, 'MessagesPerPage', 'int', function ($iValue) {
-			return \min(50, \max(10, $iValue));
+			return \min(100, \max(10, $iValue));
 		});
 
 		$this->setSettingsFromParams($oSettings, 'Layout', 'int', function ($iValue) {
@@ -330,9 +167,25 @@ trait User
 		});
 
 		$this->setSettingsFromParams($oSettings, 'EditorDefaultType', 'string');
+		$this->setSettingsFromParams($oSettings, 'editorWysiwyg', 'string');
+		$this->setSettingsFromParams($oSettings, 'requestReadReceipt', 'bool');
+		$this->setSettingsFromParams($oSettings, 'requestDsn', 'bool');
+		$this->setSettingsFromParams($oSettings, 'requireTLS', 'bool');
+		$this->setSettingsFromParams($oSettings, 'pgpSign', 'bool');
+		$this->setSettingsFromParams($oSettings, 'pgpEncrypt', 'bool');
+		$this->setSettingsFromParams($oSettings, 'allowSpellcheck', 'bool');
+
 		$this->setSettingsFromParams($oSettings, 'ViewHTML', 'bool');
-		$this->setSettingsFromParams($oSettings, 'ShowImages', 'bool');
+		$this->setSettingsFromParams($oSettings, 'ViewImages', 'string');
+		$this->setSettingsFromParams($oSettings, 'ViewImagesWhitelist', 'string');
 		$this->setSettingsFromParams($oSettings, 'RemoveColors', 'bool');
+		$this->setSettingsFromParams($oSettings, 'AllowStyles', 'bool');
+		$this->setSettingsFromParams($oSettings, 'ListInlineAttachments', 'bool');
+		$this->setSettingsFromParams($oSettings, 'CollapseBlockquotes', 'bool');
+		$this->setSettingsFromParams($oSettings, 'MaxBlockquotesLevel', 'int');
+		$this->setSettingsFromParams($oSettings, 'minFontSize', 'int');
+		$this->setSettingsFromParams($oSettings, 'simpleAttachmentsList', 'bool');
+		$this->setSettingsFromParams($oSettings, 'listGrouped', 'bool');
 		$this->setSettingsFromParams($oSettings, 'ContactsAutosave', 'bool');
 		$this->setSettingsFromParams($oSettings, 'DesktopNotifications', 'bool');
 		$this->setSettingsFromParams($oSettings, 'SoundNotification', 'bool');
@@ -340,36 +193,42 @@ trait User
 		$this->setSettingsFromParams($oSettings, 'UseCheckboxesInList', 'bool');
 		$this->setSettingsFromParams($oSettings, 'AllowDraftAutosave', 'bool');
 		$this->setSettingsFromParams($oSettings, 'AutoLogout', 'int');
+		$this->setSettingsFromParams($oSettings, 'keyPassForget', 'int');
+		$this->setSettingsFromParams($oSettings, 'messageNewWindow', 'bool');
+		$this->setSettingsFromParams($oSettings, 'messageReadAuto', 'bool');
 		$this->setSettingsFromParams($oSettings, 'MessageReadDelay', 'int');
+		$this->setSettingsFromParams($oSettings, 'MsgDefaultAction', 'int');
+		$this->setSettingsFromParams($oSettings, 'showNextMessage', 'bool');
+		$this->setSettingsFromParams($oSettings, 'markdown', 'bool');
 
+		$this->setSettingsFromParams($oSettings, 'Resizer4Width', 'int');
+		$this->setSettingsFromParams($oSettings, 'Resizer5Width', 'int');
+		$this->setSettingsFromParams($oSettings, 'Resizer5Height', 'int');
+
+		$this->setSettingsFromParams($oSettingsLocal, 'defaultSort', 'string');
 		$this->setSettingsFromParams($oSettingsLocal, 'UseThreads', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'threadAlgorithm', 'string');
 		$this->setSettingsFromParams($oSettingsLocal, 'ReplySameFolder', 'bool');
 		$this->setSettingsFromParams($oSettingsLocal, 'HideUnsubscribed', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'HideDeleted', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'UnhideKolabFolders', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'ShowUnreadCount', 'bool');
+		$this->setSettingsFromParams($oSettingsLocal, 'CheckMailInterval', 'int');
 
-		return $this->DefaultResponse(__FUNCTION__,
-			$this->SettingsProvider()->Save($oAccount, $oSettings) &&
-			$this->SettingsProvider(true)->Save($oAccount, $oSettingsLocal));
+		return $this->DefaultResponse($oSettings->save() && $oSettingsLocal->save());
 	}
 
 	public function DoQuota() : array
 	{
 		$oAccount = $this->initMailClientConnection();
-
-		if (!$this->GetCapa(Capa::QUOTA))
-		{
-			return $this->DefaultResponse(__FUNCTION__, array(0, 0, 0, 0));
-		}
-
 		try
 		{
-			$aQuota = $this->MailClient()->QuotaRoot();
+			return $this->DefaultResponse($this->ImapClient()->QuotaRoot() ?: [0, 0, 0, 0]);
 		}
 		catch (\Throwable $oException)
 		{
 			throw new ClientException(Notifications::MailServerError, $oException);
 		}
-
-		return $this->DefaultResponse(__FUNCTION__, $aQuota);
 	}
 
 	public function DoSuggestions() : array
@@ -379,86 +238,26 @@ trait User
 		$sQuery = \trim($this->GetActionParam('Query', ''));
 		$iLimit = (int) $this->Config()->Get('contacts', 'suggestions_limit', 20);
 
-		$aResult = array();
-
 		$this->Plugins()->RunHook('json.suggestions-input-parameters', array(&$sQuery, &$iLimit, $oAccount));
 
-		$iLimit = (int) $iLimit;
-		if (5 > $iLimit)
-		{
-			$iLimit = 5;
+		$aResult = array();
+
+		if ($oSuggestionsProvider = $this->SuggestionsProvider()) {
+			$aResult = $oSuggestionsProvider->Process($oAccount, $sQuery, $iLimit);
 		}
 
-		$this->Plugins()->RunHook('json.suggestions-pre', array(&$aResult, $sQuery, $oAccount, $iLimit));
-
-		if ($iLimit > \count($aResult) && \strlen($sQuery))
-		{
-			try
-			{
-				// Address Book
-				$oAddressBookProvider = $this->AddressBookProvider($oAccount);
-				if ($oAddressBookProvider && $oAddressBookProvider->IsActive())
-				{
-					$aSuggestions = $oAddressBookProvider->GetSuggestions($this->GetMainEmail($oAccount), $sQuery, $iLimit);
-					if (!\count($aResult))
-					{
-						$aResult = $aSuggestions;
-					}
-					else
-					{
-						$aResult = \array_merge($aResult, $aSuggestions);
-					}
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException);
-			}
-		}
-
-		if ($iLimit > \count($aResult) && \strlen($sQuery))
-		{
-			$oSuggestionsProvider = $this->SuggestionsProvider();
-			if ($oSuggestionsProvider && $oSuggestionsProvider->IsActive())
-			{
-				$aSuggestionsProviderResult = $oSuggestionsProvider->Process($oAccount, $sQuery, $iLimit);
-				if (\is_array($aSuggestionsProviderResult) && \count($aSuggestionsProviderResult))
-				{
-					$aResult = \array_merge($aResult, $aSuggestionsProviderResult);
-				}
-			}
-
-		}
-
-		$aResult = Utils::RemoveSuggestionDuplicates($aResult);
-		if ($iLimit < \count($aResult))
-		{
-			$aResult = \array_slice($aResult, 0, $iLimit);
-		}
-
-		$this->Plugins()->RunHook('json.suggestions-post', array(&$aResult, $sQuery, $oAccount, $iLimit));
-
-		$aResult = Utils::RemoveSuggestionDuplicates($aResult);
-		if ($iLimit < \count($aResult))
-		{
-			$aResult = \array_slice($aResult, 0, $iLimit);
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $aResult);
+		return $this->DefaultResponse($aResult);
 	}
 
 	public function DoClearUserBackground() : array
 	{
-		$oAccount = $this->getAccountFromToken();
-
-		if (!$this->GetCapa(Capa::USER_BACKGROUND))
-		{
-			return $this->FalseResponse(__FUNCTION__);
+		if (!$this->GetCapa(Capa::USER_BACKGROUND)) {
+			return $this->FalseResponse();
 		}
 
+		$oAccount = $this->getAccountFromToken();
 		$oSettings = $this->SettingsProvider()->Load($oAccount);
-		if ($oAccount && $oSettings)
-		{
+		if ($oAccount && $oSettings) {
 			$this->StorageProvider()->Clear($oAccount,
 				\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
 				'background'
@@ -468,61 +267,12 @@ trait User
 			$oSettings->SetConf('UserBackgroundHash', '');
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $oAccount && $oSettings ?
-			$this->SettingsProvider()->Save($oAccount, $oSettings) : false);
-	}
-
-	private function getMimeFileByHash(\RainLoop\Model\Account $oAccount, string $sHash) : array
-	{
-		$aValues = $this->getDecodedRawKeyValue($sHash);
-
-		$sFolder = isset($aValues['Folder']) ? $aValues['Folder'] : '';
-		$iUid = isset($aValues['Uid']) ? (int) $aValues['Uid'] : 0;
-		$sMimeIndex = (string) isset($aValues['MimeIndex']) ? $aValues['MimeIndex'] : '';
-
-		$sContentTypeIn = (string) isset($aValues['MimeType']) ? $aValues['MimeType'] : '';
-		$sFileNameIn = (string) isset($aValues['FileName']) ? $aValues['FileName'] : '';
-
-		$oFileProvider = $this->FilesProvider();
-
-		$sResultHash = '';
-
-		$mResult = $this->MailClient()->MessageMimeStream(function ($rResource, $sContentType, $sFileName, $sMimeIndex = '')
-			use ($oAccount, $oFileProvider, $sFileNameIn, $sContentTypeIn, &$sResultHash) {
-
-				unset($sContentType, $sFileName, $sMimeIndex);
-
-				if ($oAccount && \is_resource($rResource))
-				{
-					$sHash = \MailSo\Base\Utils::Sha1Rand($sFileNameIn.'~'.$sContentTypeIn);
-					$rTempResource = $oFileProvider->GetFile($oAccount, $sHash, 'wb+');
-
-					if (\is_resource($rTempResource))
-					{
-						if (false !== \MailSo\Base\Utils::MultipleStreamWriter($rResource, array($rTempResource)))
-						{
-							$sResultHash = $sHash;
-						}
-
-						\fclose($rTempResource);
-					}
-				}
-
-			}, $sFolder, $iUid, $sMimeIndex);
-
-		$aValues['FileHash'] = '';
-		if ($mResult)
-		{
-			$aValues['FileHash'] = $sResultHash;
-		}
-
-		return $aValues;
+		return $this->DefaultResponse($oAccount && $oSettings ? $oSettings->save() : false);
 	}
 
 	private function setSettingsFromParams(\RainLoop\Settings $oSettings, string $sConfigName, string $sType = 'string', ?callable $cCallback = null) : void
 	{
-		if ($this->HasActionParam($sConfigName))
-		{
+		if ($this->HasActionParam($sConfigName)) {
 			$sValue = $this->GetActionParam($sConfigName, '');
 			switch ($sType)
 			{
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
index c00dc519d..be26a590e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Actions/UserAuth.php
@@ -2,6 +2,7 @@
 
 namespace RainLoop\Actions;
 
+use RainLoop\Enumerations\Capa;
 use RainLoop\Notifications;
 use RainLoop\Utils;
 use RainLoop\Model\Account;
@@ -9,175 +10,208 @@ use RainLoop\Model\MainAccount;
 use RainLoop\Model\AdditionalAccount;
 use RainLoop\Providers\Storage\Enumerations\StorageType;
 use RainLoop\Exceptions\ClientException;
+use SnappyMail\Cookies;
+use SnappyMail\SensitiveString;
 
 trait UserAuth
 {
 	/**
-	 * @var string
+	 * @var bool | null | Account
 	 */
 	private $oAdditionalAuthAccount = false;
 	private $oMainAuthAccount = false;
 
+	public function DoResealCryptKey() : array
+	{
+		return $this->DefaultResponse(
+			$this->getMainAccountFromToken()->resealCryptKey(
+				new SensitiveString($this->GetActionParam('passphrase', ''))
+			)
+		);
+	}
+
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	public function LoginProcess(string &$sEmail, string &$sPassword, bool $bSignMe = false, bool $bMainAccount = true): Account
+	protected function resolveLoginCredentials(string $sEmail, SensitiveString $oPassword): array
 	{
-		$sInputEmail = $sEmail;
+		$sEmail = \SnappyMail\IDN::emailToAscii(\MailSo\Base\Utils::Trim($sEmail));
 
-		$this->Plugins()->RunHook('login.credentials.step-1', array(&$sEmail));
-
-		$sEmail = \MailSo\Base\Utils::Trim($sEmail);
-		if ($this->Config()->Get('login', 'login_lowercase', true)) {
-			$sEmail = \mb_strtolower($sEmail);
+		$sNewEmail = $sEmail;
+		$this->Plugins()->RunHook('login.credentials.step-1', array(&$sNewEmail));
+		if ($sNewEmail) {
+			$sEmail = $sNewEmail;
 		}
 
-		if (false === \strpos($sEmail, '@')) {
-			$this->Logger()->Write('The email address "' . $sEmail . '" is not complete', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+		$oDomain = null;
+		$oDomainProvider = $this->DomainProvider();
 
-			if (false === \strpos($sEmail, '@') && $this->Config()->Get('login', 'determine_user_domain', false)) {
-				$sUserHost = \trim($this->Http()->GetHost(false, true, true));
-				$this->Logger()->Write('Determined user domain: ' . $sUserHost, \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+		// When email address is missing the domain, try to add it
+		if (!\str_contains($sEmail, '@')) {
+			$this->logWrite("The email address '{$sEmail}' is incomplete", \LOG_INFO, 'LOGIN');
+			if ($this->Config()->Get('login', 'determine_user_domain', false)) {
+				$sUserHost = \SnappyMail\IDN::toAscii($this->Http()->GetHost(false, true));
+				$this->logWrite("Determined user domain: {$sUserHost}", \LOG_INFO, 'LOGIN');
 
-				$bAdded = false;
-
-				$iLimit = 14;
+				// Determine without wildcard
 				$aDomainParts = \explode('.', $sUserHost);
-
-				$oDomainProvider = $this->DomainProvider();
-				while (\count($aDomainParts) && 0 < $iLimit) {
-					$sLine = \trim(\implode('.', $aDomainParts), '. ');
-
-					$oDomain = $oDomainProvider->Load($sLine, false);
+				$iLimit = \min(\count($aDomainParts), 14);
+				while (0 < $iLimit--) {
+					$sDomain = \implode('.', $aDomainParts);
+					$oDomain = $oDomainProvider->Load($sDomain, false);
 					if ($oDomain) {
-						$bAdded = true;
-						$this->Logger()->Write('Check "' . $sLine . '": OK (' . $sEmail . ' > ' . $sEmail . '@' . $sLine . ')',
-							\MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
-
-						$sEmail = $sEmail . '@' . $sLine;
+						$sEmail .= '@' . $sDomain;
+						$this->logWrite("Check '{$sDomain}': OK", \LOG_INFO, 'LOGIN');
 						break;
 					} else {
-						$this->Logger()->Write('Check "' . $sLine . '": NO', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+						$this->logWrite("Check '{$sDomain}': NO", \LOG_INFO, 'LOGIN');
 					}
-
 					\array_shift($aDomainParts);
-					$iLimit--;
 				}
 
-				if (!$bAdded) {
-					$sLine = $sUserHost;
-					$oDomain = $oDomainProvider->Load($sLine, true);
-					if ($oDomain && $oDomain) {
-						$bAdded = true;
-						$this->Logger()->Write('Check "' . $sLine . '" with wildcard: OK (' . $sEmail . ' > ' . $sEmail . '@' . $sLine . ')',
-							\MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
-
-						$sEmail = $sEmail . '@' . $sLine;
+				// Else determine with wildcard
+				if (!$oDomain) {
+					$oDomain = $oDomainProvider->Load($sUserHost, true);
+					if ($oDomain) {
+						$sEmail .= '@' . $sUserHost;
+						$this->logWrite("Check '{$sUserHost}' with wildcard: OK", \LOG_INFO, 'LOGIN');
 					} else {
-						$this->Logger()->Write('Check "' . $sLine . '" with wildcard: NO', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+						$this->logWrite("Check '{$sUserHost}' with wildcard: NO", \LOG_INFO, 'LOGIN');
 					}
 				}
 
-				if (!$bAdded) {
-					$this->Logger()->Write('Domain was not found!', \MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
+				if (!$oDomain) {
+					$this->logWrite("Domain '{$sUserHost}' was not determined!", \LOG_INFO, 'LOGIN');
 				}
 			}
 
-			$sDefDomain = \trim($this->Config()->Get('login', 'default_domain', ''));
-			if (false === \strpos($sEmail, '@') && \strlen($sDefDomain)) {
-				$this->Logger()->Write('Default domain "' . $sDefDomain . '" was used. (' . $sEmail . ' > ' . $sEmail . '@' . $sDefDomain . ')',
-					\MailSo\Log\Enumerations\Type::INFO, 'LOGIN');
-
-				$sEmail = $sEmail . '@' . $sDefDomain;
+			// Else try default domain
+			if (!$oDomain) {
+				$sDefDomain = \trim($this->Config()->Get('login', 'default_domain', ''));
+				if (\strlen($sDefDomain)) {
+					if ('HTTP_HOST' === $sDefDomain || 'SERVER_NAME' === $sDefDomain) {
+						$sDefDomain = \preg_replace('/:[0-9]+$/D', '', $_SERVER[$sDefDomain]);
+					} else if ('gethostname' === $sDefDomain) {
+						$sDefDomain = \gethostname();
+					}
+					$sEmail .= '@' . $sDefDomain;
+					$this->logWrite("Default domain '{$sDefDomain}' will be used.", \LOG_INFO, 'LOGIN');
+				} else {
+					$this->logWrite('Default domain not configured.', \LOG_INFO, 'LOGIN');
+				}
 			}
 		}
 
-		$this->Plugins()->RunHook('login.credentials.step-2', array(&$sEmail, &$sPassword));
+		$sNewEmail = $sEmail;
+		$sPassword = $oPassword->getValue();
+		$this->Plugins()->RunHook('login.credentials.step-2', array(&$sNewEmail, &$sPassword));
+		$this->logMask($sPassword);
+		if ($sNewEmail) {
+			$sEmail = $sNewEmail;
+		}
 
-		if (false === \strpos($sEmail, '@') || !\strlen($sPassword)) {
-			$this->loginErrorDelay();
+		$sImapUser = $sEmail;
+		$sSmtpUser = $sEmail;
+		if (\str_contains($sEmail, '@')
+		 && ($oDomain || ($oDomain = $oDomainProvider->Load(\MailSo\Base\Utils::getEmailAddressDomain($sEmail), true)))
+		) {
+			$sEmail = $oDomain->ImapSettings()->fixUsername($sEmail, false);
+			$sImapUser = $oDomain->ImapSettings()->fixUsername($sImapUser);
+			$sSmtpUser = $oDomain->SmtpSettings()->fixUsername($sSmtpUser);
+		}
 
+		$sNewEmail = $sEmail;
+		$sNewImapUser = $sImapUser;
+		$sNewSmtpUser = $sSmtpUser;
+		$this->Plugins()->RunHook('login.credentials', array(&$sNewEmail, &$sNewImapUser, &$sPassword, &$sNewSmtpUser));
+
+		$oPassword->setValue($sPassword);
+
+		return [
+			'email' => $sNewEmail ?: $sEmail,
+			'domain' => $oDomain,
+			'imapUser' => $sNewImapUser ?: $sImapUser,
+			'smtpUser' => $sNewSmtpUser ?: $sSmtpUser,
+			'pass' => $oPassword
+		];
+	}
+
+	/**
+	 * @throws \RainLoop\Exceptions\ClientException
+	 */
+	public function LoginProcess(string $sEmail, SensitiveString $oPassword, bool $bMainAccount = true): Account
+	{
+		$aCredentials = $this->resolveLoginCredentials($sEmail, $oPassword);
+
+		if (!\str_contains($aCredentials['email'], '@') || !\strlen($oPassword)) {
 			throw new ClientException(Notifications::InvalidInputArgument);
 		}
 
-		$this->Logger()->AddSecret($sPassword);
-
-		$sLogin = $sEmail;
-		if ($this->Config()->Get('login', 'login_lowercase', true)) {
-			$sLogin = \mb_strtolower($sLogin);
-		}
-
-		$this->Plugins()->RunHook('login.credentials', array(&$sEmail, &$sLogin, &$sPassword));
-
-		$this->Logger()->AddSecret($sPassword);
+		$oDomain = $this->DomainProvider()->getByEmailAddress($aCredentials['email']);
 
 		$oAccount = null;
-		$sClientCert = \trim($this->Config()->Get('ssl', 'client_cert', ''));
 		try {
-			$oAccount = $bMainAccount
-				? MainAccount::NewInstanceFromCredentials($this, $sEmail, $sLogin, $sPassword, $sClientCert, true)
-				: AdditionalAccount::NewInstanceFromCredentials($this, $sEmail, $sLogin, $sPassword, $sClientCert, true);
+			$oAccount = $bMainAccount ? new MainAccount : new AdditionalAccount;
+			$oAccount->setCredentials(
+				$aCredentials['domain'],
+				$aCredentials['email'],
+				$aCredentials['imapUser'],
+				$oPassword,
+				$aCredentials['smtpUser']
+//				,new SensitiveString($oPassword)
+			);
+			$this->Plugins()->RunHook('filter.account', array($oAccount));
 			if (!$oAccount) {
-				throw new ClientException(Notifications::AuthError);
+				throw new ClientException(Notifications::AccountFilterError);
 			}
 		} catch (\Throwable $oException) {
-			$this->LoggerAuthHelper($oAccount, $this->getAdditionalLogParamsByUserLogin($sInputEmail));
-			$this->loginErrorDelay();
+			$this->LoggerAuthHelper($oAccount, $sEmail);
 			throw $oException;
 		}
 
-		try {
-			$this->CheckMailConnection($oAccount, true);
-			if ($bMainAccount) {
-				$bSignMe && $this->SetSignMeToken($oAccount);
-				$this->StorageProvider()->Put($oAccount, StorageType::SESSION, Utils::GetSessionToken(), 'true');
-			}
-		} catch (\Throwable $oException) {
-			$this->loginErrorDelay();
+		$this->imapConnect($oAccount, true);
+		if ($bMainAccount) {
+			$this->StorageProvider()->Put($oAccount, StorageType::SESSION, Utils::GetSessionToken(), 'true');
 
-			throw $oException;
+			// Must be here due to bug #1241
+			$this->SetMainAuthAccount($oAccount);
+			$this->Plugins()->RunHook('login.success', array($oAccount));
+
+			$this->SetAuthToken($oAccount);
+			$this->SetAdditionalAuthToken(null);
 		}
 
 		return $oAccount;
 	}
 
-	private static function SetAccountCookie(string $sName, ?Account $oAccount)
-	{
-		if ($oAccount) {
-			Utils::SetCookie(
-				$sName,
-				\MailSo\Base\Utils::UrlSafeBase64Encode(\SnappyMail\Crypt::EncryptToJSON($oAccount))
-			);
-		} else {
-			Utils::ClearCookie($sName);
-		}
-	}
-
 	public function switchAccount(string $sEmail) : bool
 	{
 		$this->Http()->ServerNoCache();
 		$oMainAccount = $this->getMainAccountFromToken(false);
-		if ($sEmail && $oMainAccount && $this->GetCapa(\RainLoop\Enumerations\Capa::ADDITIONAL_ACCOUNTS)) {
+		if ($sEmail && $oMainAccount && $this->GetCapa(Capa::ADDITIONAL_ACCOUNTS)) {
 			$oAccount = null;
-			if ($oMainAccount->Email() === $sEmail) {
-				$this->SetAdditionalAuthToken($oAccount);
-				return true;
-			}
-			$sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail);
-			$aAccounts = $this->GetAccounts($oMainAccount);
-			if (!isset($aAccounts[$sEmail])) {
-				throw new ClientException(Notifications::AccountDoesNotExist);
-			}
-			$oAccount = AdditionalAccount::NewInstanceFromTokenArray(
-				$this, $aAccounts[$sEmail]
-			);
-			if (!$oAccount) {
-				throw new ClientException(Notifications::AccountSwitchFailed);
-			}
-
-			// Test the login
-			$this->CheckMailConnection($oAccount);
+			if ($oMainAccount->Email() !== $sEmail) {
+				$sEmail = \SnappyMail\IDN::emailToAscii($sEmail);
+				$aAccounts = $this->GetAccounts($oMainAccount);
+				if (!isset($aAccounts[$sEmail])) {
+					throw new ClientException(Notifications::AccountDoesNotExist);
+				}
+				try {
+					$oAccount = AdditionalAccount::NewInstanceFromTokenArray(
+						$this, $aAccounts[$sEmail], true
+					);
+				} catch (\Throwable $e) {
+					throw new ClientException(Notifications::AccountSwitchFailed, $e);
+				}
+				if (!$oAccount) {
+					throw new ClientException(Notifications::AccountSwitchFailed);
+				}
 
+				// Test the login
+				$oImapClient = new \MailSo\Imap\ImapClient;
+				$oImapClient->SetLogger($this->Logger());
+				$this->imapConnect($oAccount, false, $oImapClient);
+			}
 			$this->SetAdditionalAuthToken($oAccount);
 			return true;
 		}
@@ -186,7 +220,7 @@ trait UserAuth
 
 	/**
 	 * Returns RainLoop\Model\AdditionalAccount when it exists,
-	 * else returns RainLoop\Model\Account when it exists,
+	 * else returns RainLoop\Model\MainAccount when it exists,
 	 * else null
 	 *
 	 * @throws \RainLoop\Exceptions\ClientException
@@ -196,7 +230,7 @@ trait UserAuth
 		$this->getMainAccountFromToken($bThrowExceptionOnFalse);
 
 		if (false === $this->oAdditionalAuthAccount && isset($_COOKIE[self::AUTH_ADDITIONAL_TOKEN_KEY])) {
-			$aData = Utils::GetSecureCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
+			$aData = Cookies::getSecure(self::AUTH_ADDITIONAL_TOKEN_KEY);
 			if ($aData) {
 				$this->oAdditionalAuthAccount = AdditionalAccount::NewInstanceFromTokenArray(
 					$this,
@@ -206,7 +240,7 @@ trait UserAuth
 			}
 			if (!$this->oAdditionalAuthAccount) {
 				$this->oAdditionalAuthAccount = null;
-				Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
+				Cookies::clear(self::AUTH_ADDITIONAL_TOKEN_KEY);
 			}
 		}
 
@@ -220,46 +254,41 @@ trait UserAuth
 	{
 		if (false === $this->oMainAuthAccount) try {
 			$this->oMainAuthAccount = null;
-			if (isset($_COOKIE[self::AUTH_SPEC_LOGOUT_TOKEN_KEY])) {
-				Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY);
-				Utils::ClearCookie(self::AUTH_SIGN_ME_TOKEN_KEY);
-//				Utils::ClearCookie(self::AUTH_SPEC_TOKEN_KEY);
-//				Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
-				Utils::ClearCookie(Utils::SESSION_TOKEN);
-			}
 
-			$aData = Utils::GetSecureCookie(self::AUTH_SPEC_TOKEN_KEY);
+			$aData = Cookies::getSecure(self::AUTH_SPEC_TOKEN_KEY);
 			if ($aData) {
 				/**
 				 * Server side control/kickout of logged in sessions
 				 * https://github.com/the-djmaze/snappymail/issues/151
 				 */
-				if (empty($_COOKIE[Utils::SESSION_TOKEN])) {
+				$sToken = Utils::GetSessionToken(false);
+				if (!$sToken) {
 //					\MailSo\Base\Http::StatusHeader(401);
-					$this->Logout(true);
-//					$sAdditionalMessage = $this->StaticI18N('SESSION_UNDEFINED');
-					\SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN empty');
-					throw new ClientException(Notifications::InvalidToken, null, 'Session undefined');
-				}
-				$oMainAuthAccount = MainAccount::NewInstanceFromTokenArray(
-					$this,
-					$aData,
-					$bThrowExceptionOnFalse
-				);
-				$oMainAuthAccount || \SnappyMail\Log::notice('TOKENS', 'AUTH_SPEC_TOKEN_KEY invalid');
-				$sToken = $oMainAuthAccount ? Utils::GetSessionToken(false) : null;
-				$sTokenValue = $sToken ? $this->StorageProvider()->Get($oMainAuthAccount, StorageType::SESSION, $sToken) : null;
-				if ($oMainAuthAccount && $sTokenValue) {
-					$this->oMainAuthAccount = $oMainAuthAccount;
-				} else {
-					if ($oMainAuthAccount) {
-						$sToken || \SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN not found');
-						if ($sToken) {
-							$oMainAuthAccount && $this->StorageProvider()->Clear($oMainAuthAccount, StorageType::SESSION, $sToken);
-							$sTokenValue || \SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN value invalid: ' . \gettype($sTokenValue));
-						}
+					if (isset($_COOKIE[Utils::SESSION_TOKEN])) {
+						\SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN invalid');
+					} else {
+						\SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN not set');
 					}
-					Utils::ClearCookie(Utils::SESSION_TOKEN);
+				} else {
+					$oMainAuthAccount = MainAccount::NewInstanceFromTokenArray(
+						$this,
+						$aData,
+						$bThrowExceptionOnFalse
+					);
+					if ($oMainAuthAccount) {
+						$sTokenValue = $this->StorageProvider()->Get($oMainAuthAccount, StorageType::SESSION, $sToken);
+						if ($sTokenValue) {
+							$this->oMainAuthAccount = $oMainAuthAccount;
+						} else {
+							$this->StorageProvider()->Clear($oMainAuthAccount, StorageType::SESSION, $sToken);
+							\SnappyMail\Log::notice('TOKENS', 'SESSION_TOKEN value invalid: ' . \get_debug_type($sTokenValue));
+						}
+					} else {
+						\SnappyMail\Log::notice('TOKENS', 'AUTH_SPEC_TOKEN_KEY invalid');
+					}
+				}
+				if (!$this->oMainAuthAccount) {
+					Cookies::clear(Utils::SESSION_TOKEN);
 //					\MailSo\Base\Http::StatusHeader(401);
 					$this->Logout(true);
 //					$sAdditionalMessage = $this->StaticI18N('SESSION_GONE');
@@ -290,17 +319,22 @@ trait UserAuth
 		return $this->oMainAuthAccount;
 	}
 
-	public function SetAuthToken(MainAccount $oAccount): void
+	public function SetMainAuthAccount(MainAccount $oAccount): void
 	{
 		$this->oAdditionalAuthAccount = false;
 		$this->oMainAuthAccount = $oAccount;
-		static::SetAccountCookie(self::AUTH_SPEC_TOKEN_KEY, $oAccount);
+	}
+
+	public function SetAuthToken(MainAccount $oAccount): void
+	{
+		$this->SetMainAuthAccount($oAccount);
+		Cookies::setSecure(self::AUTH_SPEC_TOKEN_KEY, $oAccount);
 	}
 
 	public function SetAdditionalAuthToken(?AdditionalAccount $oAccount): void
 	{
 		$this->oAdditionalAuthAccount = $oAccount ?: false;
-		static::SetAccountCookie(self::AUTH_ADDITIONAL_TOKEN_KEY, $oAccount);
+		Cookies::setSecure(self::AUTH_ADDITIONAL_TOKEN_KEY, $oAccount);
 	}
 
 	/**
@@ -309,40 +343,39 @@ trait UserAuth
 
 	private static function GetSignMeToken(): ?array
 	{
-		$sSignMeToken = Utils::GetCookie(self::AUTH_SIGN_ME_TOKEN_KEY);
+		$sSignMeToken = Cookies::get(self::AUTH_SIGN_ME_TOKEN_KEY);
 		if ($sSignMeToken) {
-			$aResult = \SnappyMail\Crypt::DecryptUrlSafe($sSignMeToken);
+			\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'decrypt');
+			$aResult = \SnappyMail\Crypt::DecryptUrlSafe($sSignMeToken, 'signme');
 			if (isset($aResult['e'], $aResult['u']) && \SnappyMail\UUID::isValid($aResult['u'])) {
+				if (!isset($aResult['c'])) {
+					$aResult['c'] = \array_key_last($aResult);
+					$aResult['d'] = \end($aResult);
+				}
 				return $aResult;
 			}
 			\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'invalid');
+			Cookies::clear(self::AUTH_SIGN_ME_TOKEN_KEY);
 		}
 		return null;
 	}
 
-	private function SetSignMeToken(MainAccount $oAccount): void
+	public function SetSignMeToken(MainAccount $oAccount): void
 	{
 		$this->ClearSignMeData();
-
 		$uuid = \SnappyMail\UUID::generate();
-		$data = \SnappyMail\Crypt::Encrypt($oAccount);
-
-		Utils::SetCookie(
+		$data = \SnappyMail\Crypt::Encrypt($oAccount, 'signme');
+		Cookies::set(
 			self::AUTH_SIGN_ME_TOKEN_KEY,
 			\SnappyMail\Crypt::EncryptUrlSafe([
 				'e' => $oAccount->Email(),
 				'u' => $uuid,
-				$data[0] => \base64_encode($data[1])
-			]),
+				'c' => $data[0],
+				'd' => \base64_encode($data[1])
+			], 'signme'),
 			\time() + 3600 * 24 * 30 // 30 days
 		);
-
-		$this->StorageProvider()->Put(
-			$oAccount,
-			StorageType::SIGN_ME,
-			$uuid,
-			$data[2]
-		);
+		$this->StorageProvider()->Put($oAccount, StorageType::SIGN_ME, $uuid, $data[2]);
 	}
 
 	public function GetAccountFromSignMeToken(): ?MainAccount
@@ -356,36 +389,32 @@ trait UserAuth
 					StorageType::SIGN_ME,
 					$aTokenData['u']
 				);
-				if ($sAuthToken) {
-					$aAccountHash = \SnappyMail\Crypt::Decrypt([
-						\array_key_last($aTokenData),
-						\base64_decode(\end($aTokenData)),
-						$sAuthToken
-					]);
-					if (\is_array($aAccountHash)) {
-						$oAccount = MainAccount::NewInstanceFromTokenArray($this, $aAccountHash);
-						if ($oAccount) {
-							$this->CheckMailConnection($oAccount);
-							// Update lifetime
-							$this->SetSignMeToken($oAccount);
-							return $oAccount;
-						}
-						\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'has no account');
-					} else {
-						\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, 'decrypt failed');
-					}
-				} else {
-					\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, "server token not found for {$aTokenData['e']}/.sign_me/{$aTokenData['u']}");
+				if (!$sAuthToken) {
+					throw new \RuntimeException("server token not found for {$aTokenData['e']}/.sign_me/{$aTokenData['u']}");
 				}
+				$aAccountHash = \SnappyMail\Crypt::Decrypt([
+					$aTokenData['c'],
+					\base64_decode($aTokenData['d']),
+					$sAuthToken
+				], 'signme');
+				if (!\is_array($aAccountHash)) {
+					throw new \RuntimeException('token decrypt failed');
+				}
+				$oAccount = MainAccount::NewInstanceFromTokenArray($this, $aAccountHash);
+				if (!$oAccount) {
+					throw new \RuntimeException('token has no account');
+				}
+				$this->imapConnect($oAccount);
+				// Update lifetime
+				$this->SetSignMeToken($oAccount);
+				return $oAccount;
 			}
 			catch (\Throwable $oException)
 			{
-				\SnappyMail\Log::notice(self::AUTH_SIGN_ME_TOKEN_KEY, $oException->getMessage());
+				\SnappyMail\Log::warning(self::AUTH_SIGN_ME_TOKEN_KEY, $oException->getMessage());
+				$this->ClearSignMeData();
 			}
 		}
-
-		$this->ClearSignMeData();
-
 		return null;
 	}
 
@@ -395,47 +424,31 @@ trait UserAuth
 		if ($aTokenData) {
 			$this->StorageProvider()->Clear($aTokenData['e'], StorageType::SIGN_ME, $aTokenData['u']);
 		}
-		Utils::ClearCookie(self::AUTH_SIGN_ME_TOKEN_KEY);
+		Cookies::clear(self::AUTH_SIGN_ME_TOKEN_KEY);
 	}
 
 	/**
 	 * Logout methods
 	 */
 
-	public function SetAuthLogoutToken(): void
+	public function Logout(bool $bMain) : void
 	{
-		\header('X-RainLoop-Action: Logout');
-		Utils::SetCookie(self::AUTH_SPEC_LOGOUT_TOKEN_KEY, \md5($_SERVER['REQUEST_TIME_FLOAT']));
-	}
-
-	public function GetSpecLogoutCustomMgsWithDeletion(): string
-	{
-		$sResult = Utils::GetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, '');
-		if (\strlen($sResult)) {
-			Utils::ClearCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY);
-		}
-
-		return $sResult;
-	}
-
-	public function SetSpecLogoutCustomMgsWithDeletion(string $sMessage): void
-	{
-		Utils::SetCookie(self::AUTH_SPEC_LOGOUT_CUSTOM_MSG_KEY, $sMessage);
-	}
-
-	protected function Logout(bool $bMain) : void
-	{
-		Utils::ClearCookie(self::AUTH_ADDITIONAL_TOKEN_KEY);
-		$bMain && Utils::ClearCookie(self::AUTH_SPEC_TOKEN_KEY);
+//		Cookies::clear(Utils::SESSION_TOKEN);
+		Cookies::clear(self::AUTH_ADDITIONAL_TOKEN_KEY);
+		$bMain && Cookies::clear(self::AUTH_SPEC_TOKEN_KEY);
+		// TODO: kill SignMe data to prevent automatic login?
 	}
 
 	/**
 	 * @throws \RainLoop\Exceptions\ClientException
 	 */
-	protected function CheckMailConnection(Account $oAccount, bool $bAuthLog = false): void
+	protected function imapConnect(Account $oAccount, bool $bAuthLog = false, ?\MailSo\Imap\ImapClient $oImapClient = null): void
 	{
 		try {
-			$oAccount->IncConnectAndLoginHelper($this->Plugins(), $this->MailClient(), $this->Config());
+			if (!$oImapClient) {
+				$oImapClient = $this->ImapClient();
+			}
+			$oAccount->ImapConnectAndLogin($this->Plugins(), $oImapClient, $this->Config());
 		} catch (ClientException $oException) {
 			throw $oException;
 		} catch (\MailSo\Net\Exceptions\ConnectionException $oException) {
@@ -445,7 +458,7 @@ trait UserAuth
 				$this->LoggerAuthHelper($oAccount);
 			}
 
-			if ($this->Config()->Get('labs', 'imap_show_login_alert', true)) {
+			if ($this->Config()->Get('imap', 'show_login_alert', true)) {
 				throw new ClientException(Notifications::AuthError, $oException, $oException->getAlertFromStatus());
 			} else {
 				throw new ClientException(Notifications::AuthError, $oException);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
index 95d7b9cc1..54a550d35 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ActionsAdmin.php
@@ -7,6 +7,8 @@ use RainLoop\Exceptions\ClientException;
 
 class ActionsAdmin extends Actions
 {
+	use Actions\AdminDomains;
+	use Actions\AdminExtensions;
 
 	public function DoAdminClearCache() : array
 	{
@@ -14,42 +16,35 @@ class ActionsAdmin extends Actions
 		if (\is_dir(APP_PRIVATE_DATA . 'cache')) {
 			\MailSo\Base\Utils::RecRmDir(APP_PRIVATE_DATA.'cache');
 		}
-		return $this->TrueResponse(__FUNCTION__);
+		return $this->TrueResponse();
 	}
 
 	public function DoAdminSettingsGet() : array
 	{
 		$aConfig = $this->Config()->jsonSerialize();
 		unset($aConfig['version']);
-		return $this->DefaultResponse(__FUNCTION__, $aConfig);
+		$aConfig['logs']['time_zone'][1] = '';
+		$aConfig['logs']['time_zone'][2] = \DateTimeZone::listIdentifiers();
+		$aConfig['login']['sign_me_auto'][2] = ['DefaultOff','DefaultOn','Unused'];
+		$aConfig['defaults']['view_images'][2] = ['ask','match','always'];
+		return $this->DefaultResponse($aConfig);
 	}
 
 	public function DoAdminSettingsSet() : array
 	{
-		// TODO
-		$aConfig = $this->GetActionParam('config', []);
-		unset($aConfig['version']);
-		/* Sections:
-		[webmail] => Array
-		[interface] => Array
-		[contacts] => Array
-		[security] => Array
-		[ssl] => Array
-		[capa] => Array
-		[login] => Array
-		[plugins] => Array
-		[defaults] => Array
-		[logs] => Array
-		[cache] => Array
-		[labs] => Array
-		*/
-		return $this->TrueResponse(__FUNCTION__);
+		$oConfig = $this->Config();
+		foreach ($this->GetActionParam('config', []) as $sSection => $aItems) {
+			foreach ($aItems as $sKey => $mValue) {
+				$oConfig->Set($sSection, $sKey, $mValue);
+			}
+		}
+		return $this->DefaultResponse($oConfig->Save());
 	}
 
 	public function DoAdminSettingsUpdate() : array
 	{
 //		sleep(3);
-//		return $this->DefaultResponse(__FUNCTION__, false);
+//		return $this->DefaultResponse(false);
 
 		$this->IsAdminLoggined();
 
@@ -57,11 +52,11 @@ class ActionsAdmin extends Actions
 
 		$self = $this;
 
-		$this->setConfigFromParams($oConfig, 'Language', 'webmail', 'language', 'string', function ($sLanguage) use ($self) {
+		$this->setConfigFromParams($oConfig, 'language', 'webmail', 'language', 'string', function ($sLanguage) use ($self) {
 			return $self->ValidateLanguage($sLanguage, '', false);
 		});
 
-		$this->setConfigFromParams($oConfig, 'LanguageAdmin', 'webmail', 'language_admin', 'string', function ($sLanguage) use ($self) {
+		$this->setConfigFromParams($oConfig, 'languageAdmin', 'admin_panel', 'language', 'string', function ($sLanguage) use ($self) {
 			return $self->ValidateLanguage($sLanguage, '', true);
 		});
 
@@ -69,28 +64,27 @@ class ActionsAdmin extends Actions
 			return $self->ValidateTheme($sTheme);
 		});
 
-		$this->setConfigFromParams($oConfig, 'VerifySslCertificate', 'ssl', 'verify_certificate', 'bool');
-		$this->setConfigFromParams($oConfig, 'AllowSelfSigned', 'ssl', 'allow_self_signed', 'bool');
+		$this->setConfigFromParams($oConfig, 'proxyExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool');
+		$this->setConfigFromParams($oConfig, 'autoVerifySignatures', 'security', 'auto_verify_signatures', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'UseLocalProxyForExternalImages', 'labs', 'use_local_proxy_for_external_images', 'bool');
+		$this->setConfigFromParams($oConfig, 'allowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
+		$this->setConfigFromParams($oConfig, 'allowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
+		$this->setConfigFromParams($oConfig, 'attachmentLimit', 'webmail', 'attachment_size_limit', 'int');
 
-		$this->setConfigFromParams($oConfig, 'NewMoveToFolder', 'interface', 'new_move_to_folder_button', 'bool');
+		$this->setConfigFromParams($oConfig, 'loginDefaultDomain', 'login', 'default_domain', 'string');
 
-		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnSettings', 'webmail', 'allow_languages_on_settings', 'bool');
-		$this->setConfigFromParams($oConfig, 'AllowLanguagesOnLogin', 'login', 'allow_languages_on_login', 'bool');
-		$this->setConfigFromParams($oConfig, 'hideSubmitButton', 'login', 'hide_submit_button', 'bool');
-		$this->setConfigFromParams($oConfig, 'AttachmentLimit', 'webmail', 'attachment_size_limit', 'int');
-
-		$this->setConfigFromParams($oConfig, 'LoginDefaultDomain', 'login', 'default_domain', 'string');
-
-		$this->setConfigFromParams($oConfig, 'ContactsEnable', 'contacts', 'enable', 'bool');
-		$this->setConfigFromParams($oConfig, 'ContactsSync', 'contacts', 'allow_sync', 'bool');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
-
-		$this->setConfigFromParams($oConfig, 'ContactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
-			return \RainLoop\Providers\AddressBook\PdoAddressBook::validPdoType($sType);
+		$this->setConfigFromParams($oConfig, 'contactsEnable', 'contacts', 'enable', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsSync', 'contacts', 'allow_sync', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoUser', 'contacts', 'pdo_user', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
+		$this->setConfigFromParams($oConfig, 'contactsMySQLSSLCA', 'contacts', 'mysql_ssl_ca', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsMySQLSSLVerify', 'contacts', 'mysql_ssl_verify', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsMySQLSSLCiphers', 'contacts', 'mysql_ssl_ciphers', 'string');
+		$this->setConfigFromParams($oConfig, 'contactsSQLiteGlobal', 'contacts', 'sqlite_global', 'bool');
+		$this->setConfigFromParams($oConfig, 'contactsSuggestionsLimit', 'contacts', 'suggestions_limit', 'int');
+		$this->setConfigFromParams($oConfig, 'contactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
+			return Providers\AddressBook\PdoAddressBook::validPdoType($sType);
 		});
 
 		$this->setConfigFromParams($oConfig, 'CapaAdditionalAccounts', 'webmail', 'allow_additional_accounts', 'bool');
@@ -98,49 +92,46 @@ class ActionsAdmin extends Actions
 		$this->setConfigFromParams($oConfig, 'CapaAttachmentThumbnails', 'interface', 'show_attachment_thumbnail', 'bool');
 		$this->setConfigFromParams($oConfig, 'CapaThemes', 'webmail', 'allow_themes', 'bool');
 		$this->setConfigFromParams($oConfig, 'CapaUserBackground', 'webmail', 'allow_user_background', 'bool');
-		$this->setConfigFromParams($oConfig, 'CapaOpenPGP', 'security', 'openpgp', 'bool');
+		$this->setConfigFromParams($oConfig, 'capaGnuPG', 'security', 'gnupg', 'bool');
+		$this->setConfigFromParams($oConfig, 'capaOpenPGP', 'security', 'openpgp', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'DetermineUserLanguage', 'login', 'determine_user_language', 'bool');
-		$this->setConfigFromParams($oConfig, 'DetermineUserDomain', 'login', 'determine_user_domain', 'bool');
+		$this->setConfigFromParams($oConfig, 'determineUserLanguage', 'login', 'determine_user_language', 'bool');
+		$this->setConfigFromParams($oConfig, 'determineUserDomain', 'login', 'determine_user_domain', 'bool');
 
-		$this->setConfigFromParams($oConfig, 'Title', 'webmail', 'title', 'string');
-		$this->setConfigFromParams($oConfig, 'LoadingDescription', 'webmail', 'loading_description', 'string');
-		$this->setConfigFromParams($oConfig, 'FaviconUrl', 'webmail', 'favicon_url', 'string');
+		$this->setConfigFromParams($oConfig, 'title', 'webmail', 'title', 'string');
+		$this->setConfigFromParams($oConfig, 'loadingDescription', 'webmail', 'loading_description', 'string');
+		$this->setConfigFromParams($oConfig, 'faviconUrl', 'webmail', 'favicon_url', 'string');
 
-		$this->setConfigFromParams($oConfig, 'TokenProtection', 'security', 'csrf_protection', 'bool');
-		$this->setConfigFromParams($oConfig, 'EnabledPlugins', 'plugins', 'enable', 'bool');
+		$this->setConfigFromParams($oConfig, 'pluginsEnable', 'plugins', 'enable', 'bool');
 
-		return $this->DefaultResponse(__FUNCTION__, $oConfig->Save());
+		return $this->DefaultResponse($oConfig->Save());
 	}
 
 	/**
-	 * @throws \MailSo\Base\Exceptions\Exception
+	 * @throws \MailSo\RuntimeException
 	 */
 	public function DoAdminLogin() : array
 	{
 		$sLogin = trim($this->GetActionParam('Login', ''));
-		$sPassword = $this->GetActionParam('Password', '');
-
-		$this->Logger()->AddSecret($sPassword);
+		$oPassword = new \SnappyMail\SensitiveString($this->GetActionParam('Password', ''));
 
 		$totp = $this->Config()->Get('security', 'admin_totp', '');
 
 		// \explode(':',`getent shadow root`)[1];
-		if (!\strlen($sLogin) || !\strlen($sPassword) ||
+		if (!\strlen($sLogin) || !\strlen($oPassword) ||
 			!$this->Config()->Get('security', 'allow_admin_panel', true) ||
 			$sLogin !== $this->Config()->Get('security', 'admin_login', '') ||
-			!$this->Config()->ValidatePassword($sPassword)
+			!$this->Config()->ValidatePassword($oPassword)
 			|| ($totp && !\SnappyMail\TOTP::Verify($totp, $this->GetActionParam('TOTP', ''))))
 		{
-			$this->LoggerAuthHelper(null, $this->getAdditionalLogParamsByUserLogin($sLogin, true), true);
+			$this->LoggerAuthHelper(null, $sLogin, true);
 			$this->loginErrorDelay();
 			throw new ClientException(Notifications::AuthError);
 		}
 
-		$sToken = $this->getAdminToken();
-		$this->setAdminAuthToken($sToken);
+		$sToken = $this->setAdminAuthToken();
 
-		return $this->DefaultResponse(__FUNCTION__, $sToken ? $this->AppData(true) : false);
+		return $this->DefaultResponse($sToken ? $this->AppData(true) : false);
 	}
 
 	public function DoAdminLogout() : array
@@ -149,8 +140,8 @@ class ActionsAdmin extends Actions
 		if ($sAdminKey) {
 			$this->Cacher(null, true)->Delete(KeyPathHelper::SessionAdminKey($sAdminKey));
 		}
-		Utils::ClearCookie(static::$AUTH_ADMIN_TOKEN_KEY);
-		return $this->TrueResponse(__FUNCTION__);
+		\SnappyMail\Cookies::clear(static::$AUTH_ADMIN_TOKEN_KEY);
+		return $this->TrueResponse();
 	}
 
 	public function DoAdminContactsTest() : array
@@ -158,18 +149,28 @@ class ActionsAdmin extends Actions
 		$this->IsAdminLoggined();
 
 		$oConfig = $this->Config();
-
-		$this->setConfigFromParams($oConfig, 'ContactsPdoDsn', 'contacts', 'pdo_dsn', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoUser', 'contacts', 'pdo_user', 'string');
-		$this->setConfigFromParams($oConfig, 'ContactsPdoPassword', 'contacts', 'pdo_password', 'dummy');
-
-		$self = $this;
-		$this->setConfigFromParams($oConfig, 'ContactsPdoType', 'contacts', 'type', 'string', function ($sType) use ($self) {
-			return \RainLoop\Providers\AddressBook\PdoAddressBook::validPdoType($sType);
+		$this->setConfigFromParams($oConfig, 'PdoDsn', 'contacts', 'pdo_dsn', 'string');
+		$this->setConfigFromParams($oConfig, 'PdoUser', 'contacts', 'pdo_user', 'string');
+		$this->setConfigFromParams($oConfig, 'PdoPassword', 'contacts', 'pdo_password', 'dummy');
+		$this->setConfigFromParams($oConfig, 'PdoType', 'contacts', 'type', 'string', function ($sType) {
+			return Providers\AddressBook\PdoAddressBook::validPdoType($sType);
 		});
+		$this->setConfigFromParams($oConfig, 'MySQLSSLCA', 'contacts', 'mysql_ssl_ca', 'string');
+		$this->setConfigFromParams($oConfig, 'MySQLSSLVerify', 'contacts', 'mysql_ssl_verify', 'bool');
+		$this->setConfigFromParams($oConfig, 'MySQLSSLCiphers', 'contacts', 'mysql_ssl_ciphers', 'string');
+		$this->setConfigFromParams($oConfig, 'SQLiteGlobal', 'contacts', 'sqlite_global', 'bool');
 
-		$sTestMessage = $this->AddressBookProvider(null, true)->Test();
-		return $this->DefaultResponse(__FUNCTION__, array(
+		$sTestMessage = '';
+		try {
+			$AddressBook = new Providers\AddressBook(new Providers\AddressBook\PdoAddressBook());
+			$AddressBook->SetLogger($this->oLogger);
+			$sTestMessage = $AddressBook->Test();
+		} catch (\Throwable $e) {
+			\SnappyMail\LOG::error('AddressBook', $e->getMessage()."\n".$e->getTraceAsString());
+			$sTestMessage = $e->getMessage();
+		}
+
+		return $this->DefaultResponse(array(
 			'Result' => '' === $sTestMessage,
 			'Message' => \MailSo\Base\Utils::Utf8Clear($sTestMessage)
 		));
@@ -182,31 +183,23 @@ class ActionsAdmin extends Actions
 		$bResult = false;
 		$oConfig = $this->Config();
 
-		$sLogin = \trim($this->GetActionParam('Login', ''));
-		$sPassword = $this->GetActionParam('Password', '');
-		$this->Logger()->AddSecret($sPassword);
+		$oPassword = new \SnappyMail\SensitiveString($this->GetActionParam('Password', ''));
 
-		$sNewPassword = $this->GetActionParam('NewPassword', '');
-		if (\strlen(\trim($sNewPassword)))
-		{
-			$this->Logger()->AddSecret($sNewPassword);
-		}
+		$oNewPassword = new \SnappyMail\SensitiveString($this->GetActionParam('newPassword', ''));
 
 		$passfile = APP_PRIVATE_DATA.'admin_password.txt';
 
-		$oConfig->Set('security', 'admin_totp', $this->GetActionParam('TOTP', ''));
-
-		if ($oConfig->ValidatePassword($sPassword))
-		{
-			if (\strlen($sLogin))
-			{
+		if ($oConfig->ValidatePassword($oPassword)) {
+			$sLogin = \trim($this->GetActionParam('Login', ''));
+			if (\strlen($sLogin)) {
 				$oConfig->Set('security', 'admin_login', $sLogin);
 			}
 
-			if (\strlen(\trim($sNewPassword)))
-			{
-				$oConfig->SetPassword($sNewPassword);
-				if (\is_file($passfile) && \trim(\file_get_contents($passfile)) !== $sNewPassword) {
+			$oConfig->Set('security', 'admin_totp', $this->GetActionParam('TOTP', ''));
+
+			if (\strlen($oNewPassword)) {
+				$oConfig->SetPassword($oNewPassword);
+				if (\is_file($passfile) && \trim(\file_get_contents($passfile)) !== (string) $oNewPassword) {
 					\unlink($passfile);
 				}
 			}
@@ -214,240 +207,11 @@ class ActionsAdmin extends Actions
 			$bResult = $oConfig->Save();
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, $bResult
+		return $this->DefaultResponse($bResult
 			? array('Weak' => \is_file($passfile))
 			: false);
 	}
 
-	public function DoAdminDomainLoad() : array
-	{
-		$this->IsAdminLoggined();
-
-		return $this->DefaultResponse(__FUNCTION__,
-			$this->DomainProvider()->Load($this->GetActionParam('Name', ''), false, false));
-	}
-
-	public function DoAdminDomainList() : array
-	{
-		$this->IsAdminLoggined();
-		$bIncludeAliases = !empty($this->GetActionParam('IncludeAliases', '1'));
-		return $this->DefaultResponse(__FUNCTION__, $this->DomainProvider()->GetList($bIncludeAliases));
-	}
-
-	public function DoAdminDomainDelete() : array
-	{
-		$this->IsAdminLoggined();
-
-		return $this->DefaultResponse(__FUNCTION__,
-			$this->DomainProvider()->Delete((string) $this->GetActionParam('Name', '')));
-	}
-
-	public function DoAdminDomainDisable() : array
-	{
-		$this->IsAdminLoggined();
-
-		return $this->DefaultResponse(__FUNCTION__, $this->DomainProvider()->Disable(
-			(string) $this->GetActionParam('Name', ''),
-			'1' === (string) $this->GetActionParam('Disabled', '0')
-		));
-	}
-
-	public function DoAdminDomainSave() : array
-	{
-		$this->IsAdminLoggined();
-
-		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this);
-
-		return $this->DefaultResponse(__FUNCTION__,
-			$oDomain ? $this->DomainProvider()->Save($oDomain) : false);
-	}
-
-	public function DoAdminDomainAliasSave() : array
-	{
-		$this->IsAdminLoggined();
-
-		return $this->DefaultResponse(__FUNCTION__, $this->DomainProvider()->SaveAlias(
-			(string) $this->GetActionParam('Name', ''),
-			(string) $this->GetActionParam('Alias', '')
-		));
-	}
-
-	public function DoAdminDomainTest() : array
-	{
-		$this->IsAdminLoggined();
-
-		$bImapResult = false;
-		$sImapErrorDesc = '';
-		$bSmtpResult = false;
-		$sSmtpErrorDesc = '';
-		$bSieveResult = false;
-		$sSieveErrorDesc = '';
-
-		$iConnectionTimeout = 5;
-
-		$oDomain = $this->DomainProvider()->LoadOrCreateNewFromAction($this, 'test.example.com');
-		if ($oDomain)
-		{
-			try
-			{
-				$oImapClient = new \MailSo\Imap\ImapClient();
-				$oImapClient->SetLogger($this->Logger());
-				$oImapClient->SetTimeOuts($iConnectionTimeout);
-
-				$iTime = \microtime(true);
-				$oImapClient->Connect($oDomain->IncHost(), $oDomain->IncPort(), $oDomain->IncSecure(),
-					!!$this->Config()->Get('ssl', 'verify_certificate', false),
-					!!$this->Config()->Get('ssl', 'allow_self_signed', true),
-					$this->Config()->Get('ssl', 'client_cert', '')
-				);
-
-				$oImapClient->Disconnect();
-				$bImapResult = true;
-			}
-			catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
-			{
-				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-				$sImapErrorDesc = $oException->getSocketMessage();
-				if (empty($sImapErrorDesc))
-				{
-					$sImapErrorDesc = $oException->getMessage();
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-				$sImapErrorDesc = $oException->getMessage();
-			}
-
-			if ($oDomain->OutUsePhpMail())
-			{
-				$bSmtpResult = \MailSo\Base\Utils::FunctionExistsAndEnabled('mail');
-				if (!$bSmtpResult)
-				{
-					$sSmtpErrorDesc = 'PHP: mail() function is undefined';
-				}
-			}
-			else
-			{
-				try
-				{
-					$oSmtpClient = new \MailSo\Smtp\SmtpClient();
-					$oSmtpClient->SetLogger($this->Logger());
-					$oSmtpClient->SetTimeOuts($iConnectionTimeout);
-
-					$iTime = \microtime(true);
-					$oSmtpClient->Connect($oDomain->OutHost(), $oDomain->OutPort(), $oDomain->OutSecure(),
-						!!$this->Config()->Get('ssl', 'verify_certificate', false),
-						!!$this->Config()->Get('ssl', 'allow_self_signed', true),
-						'', \MailSo\Smtp\SmtpClient::EhloHelper()
-					);
-
-					$oSmtpClient->Disconnect();
-					$bSmtpResult = true;
-				}
-				catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
-				{
-					$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-					$sSmtpErrorDesc = $oException->getSocketMessage();
-					if (empty($sSmtpErrorDesc))
-					{
-						$sSmtpErrorDesc = $oException->getMessage();
-					}
-				}
-				catch (\Throwable $oException)
-				{
-					$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-					$sSmtpErrorDesc = $oException->getMessage();
-				}
-			}
-
-			if ($oDomain->UseSieve())
-			{
-				try
-				{
-					$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
-					$oSieveClient->SetLogger($this->Logger());
-					$oSieveClient->SetTimeOuts($iConnectionTimeout);
-
-					$iTime = \microtime(true);
-					$oSieveClient->Connect($oDomain->SieveHost(), $oDomain->SievePort(), $oDomain->SieveSecure(),
-						!!$this->Config()->Get('ssl', 'verify_certificate', false),
-						!!$this->Config()->Get('ssl', 'allow_self_signed', true)
-					);
-
-					$oSieveClient->Disconnect();
-					$bSieveResult = true;
-				}
-				catch (\MailSo\Net\Exceptions\SocketCanNotConnectToHostException $oException)
-				{
-					$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-					$sSieveErrorDesc = $oException->getSocketMessage();
-					if (empty($sSieveErrorDesc))
-					{
-						$sSieveErrorDesc = $oException->getMessage();
-					}
-				}
-				catch (\Throwable $oException)
-				{
-					$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-					$sSieveErrorDesc = $oException->getMessage();
-				}
-			}
-			else
-			{
-				$bSieveResult = true;
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, array(
-			'Imap' => $bImapResult ? true : $sImapErrorDesc,
-			'Smtp' => $bSmtpResult ? true : $sSmtpErrorDesc,
-			'Sieve' => $bSieveResult ? true : $sSieveErrorDesc
-		));
-	}
-
-	public function DoAdminPHPExtensions() : array
-	{
-		$aResult = [
-			[
-				'name' => 'PHP ' . PHP_VERSION,
-				'loaded' => true
-			]
-		];
-		foreach (['APCu', 'cURL','GnuPG','GD','Gmagick','Imagick','iconv','intl','LDAP','OpenSSL','pdo_mysql','pdo_pgsql','pdo_sqlite','redis','Sodium','Tidy','uuid','XXTEA','Zip'] as $name) {
-			$aResult[] = [
-				'name' => $name,
-				'loaded' => \extension_loaded(\strtolower($name))
-			];
-		}
-		return $this->DefaultResponse(__FUNCTION__, $aResult);
-	}
-
-	public function DoAdminPackagesList() : array
-	{
-		return $this->DefaultResponse(__FUNCTION__, \SnappyMail\Repository::getPackagesList());
-	}
-
-	public function DoAdminPackageDelete() : array
-	{
-		$sId = $this->GetActionParam('Id', '');
-		$bResult = \SnappyMail\Repository::deletePackage($sId);
-		static::pluginEnable($sId, false);
-		return $this->DefaultResponse(__FUNCTION__, $bResult);
-	}
-
-	public function DoAdminPackageInstall() : array
-	{
-		$sType = $this->GetActionParam('Type', '');
-		$bResult = \SnappyMail\Repository::installPackage(
-			$sType,
-			$this->GetActionParam('Id', ''),
-			$this->GetActionParam('File', '')
-		);
-		return $this->DefaultResponse(__FUNCTION__, $bResult ?
-			('plugin' !== $sType ? array('Reload' => true) : true) : false);
-	}
-
 	// /?admin/Backup
 	public function DoAdminBackup() : void
 	{
@@ -455,7 +219,7 @@ class ActionsAdmin extends Actions
 			$this->IsAdminLoggined();
 			$file = \SnappyMail\Upgrade::backup();
 			\header('Content-Type: application/gzip');
-			\header('Content-Disposition: attachment; filename="' . \basename($file) . '"');
+			\MailSo\Base\Http::setContentDisposition('attachment', ['filename' => \basename($file)]);
 			\header('Content-Transfer-Encoding: binary');
 			\header('Content-Length: ' . \filesize($file));
 			$fp = \fopen($file, 'rb');
@@ -470,7 +234,7 @@ class ActionsAdmin extends Actions
 		exit;
 	}
 
-	public function DoAdminUpdateInfo() : array
+	public function DoAdminInfo() : array
 	{
 		$this->IsAdminLoggined();
 
@@ -479,7 +243,7 @@ class ActionsAdmin extends Actions
 		$sVersion = empty($info->version) ? '' : $info->version;
 
 		$bShowWarning = false;
-		if (!empty($info->warnings) && APP_VERSION !== APP_DEV_VERSION) {
+		if (!empty($info->warnings) && !SNAPPYMAIL_DEV) {
 			foreach ($info->warnings as $sWarningVersion) {
 				$sWarningVersion = \trim($sWarningVersion);
 
@@ -503,217 +267,121 @@ class ActionsAdmin extends Actions
 			$aWarnings[] = 'Can not edit: ' . APP_INDEX_ROOT_PATH . 'index.php';
 		}
 
-		return $this->DefaultResponse(__FUNCTION__, array(
-			 'Updatable' => \SnappyMail\Repository::canUpdateCore(),
-			 'Warning' => $bShowWarning,
-			 'Version' => $sVersion,
-			 'VersionCompare' => \version_compare(APP_VERSION, $sVersion),
-			 'Warnings' => $aWarnings
-		));
+		$aResult = [
+			'system' => [
+				'load' => \is_callable('sys_getloadavg') ? \sys_getloadavg() : null
+			],
+			'core' => [
+				 'updatable' => \SnappyMail\Repository::canUpdateCore(),
+				 'warning' => $bShowWarning,
+				 'version' => $sVersion,
+				 'versionCompare' => \version_compare(APP_VERSION, $sVersion),
+				 'warnings' => $aWarnings
+			],
+			'php' => [
+				[
+					'name' => 'PHP ' . PHP_VERSION,
+					'loaded' => true,
+					'version' => PHP_VERSION
+				],
+				[
+					'name' => 'PHP 64bit',
+					'loaded' => PHP_INT_SIZE == 8,
+					'version' => PHP_INT_SIZE
+				]
+			]
+		];
+
+		foreach (['APCu', 'cURL','Fileinfo','iconv','intl','LDAP','redis','Tidy','uuid','Zip'] as $name) {
+			$aResult['php'][] = [
+				'name' => $name,
+				'loaded' => \extension_loaded(\strtolower($name)),
+				'version' => \phpversion($name)
+			];
+		}
+
+		$aResult['php'][] = [
+			'name' => 'Phar',
+			'loaded' => \class_exists('PharData'),
+			'version' => \phpversion('phar')
+		];
+
+		$aResult['php'][] = [
+			'name' => 'Contacts database:',
+			'loaded' => \extension_loaded('pdo_mysql') || \extension_loaded('pdo_pgsql') || \extension_loaded('pdo_sqlite'),
+			'version' => 0
+		];
+		foreach (['pdo_mysql','pdo_pgsql','pdo_sqlite'] as $name) {
+			$aResult['php'][] = [
+				'name' => "- {$name}",
+				'loaded' => \extension_loaded(\strtolower($name)),
+				'version' => \phpversion($name)
+			];
+		}
+
+		$aResult['php'][] = [
+			'name' => 'Crypt:',
+			'loaded' => true,
+			'version' => 0
+		];
+		foreach (['Sodium','OpenSSL','XXTEA','GnuPG'] as $name) {
+			$aResult['php'][] = [
+				'name' => '- ' . (('OpenSSL' === $name && \defined('OPENSSL_VERSION_TEXT')) ? OPENSSL_VERSION_TEXT : $name),
+				'loaded' => \extension_loaded(\strtolower($name)),
+				'version' => \phpversion($name)
+			];
+		}
+
+		$aResult['php'][] = [
+			'name' => 'Image processing:',
+			'loaded' => \extension_loaded('gd') || \extension_loaded('gmagick') || \extension_loaded('imagick'),
+			'version' => 0
+		];
+		foreach (['GD','Gmagick','Imagick'] as $name) {
+			$aResult['php'][] = [
+				'name' => "- {$name}",
+				'loaded' => \extension_loaded(\strtolower($name)),
+				'version' => \phpversion($name)
+			];
+		}
+
+		return $this->DefaultResponse($aResult);
 	}
 
 	public function DoAdminUpgradeCore() : array
 	{
-		return $this->DefaultResponse(__FUNCTION__, \SnappyMail\Upgrade::core());
+		\header('Connection: close');
+		return $this->DefaultResponse(\SnappyMail\Upgrade::core());
 	}
 
-	public function DoAdminPluginDisable() : array
+	public function DoAdminQRCode() : array
 	{
-		$this->IsAdminLoggined();
-
-		$sId = (string) $this->GetActionParam('Id', '');
-		$bDisable = '1' === (string) $this->GetActionParam('Disabled', '1');
-
-		if (!$bDisable)
-		{
-			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
-			if ($oPlugin)
-			{
-				$sValue = $oPlugin->Supported();
-				if (\strlen($sValue))
-				{
-					return $this->FalseResponse(__FUNCTION__, Notifications::UnsupportedPluginPackage, $sValue);
-				}
-			}
-			else
-			{
-				return $this->FalseResponse(__FUNCTION__, Notifications::InvalidPluginPackage);
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $this->pluginEnable($sId, !$bDisable));
+		$user = (string) $this->GetActionParam('username', '');
+		$secret = (string) $this->GetActionParam('TOTP', '');
+		$issuer = \rawurlencode(API::Config()->Get('webmail', 'title', 'SnappyMail'));
+		$QR = \SnappyMail\QRCode::getMinimumQRCode(
+			"otpauth://totp/{$issuer}:{$user}?secret={$secret}&issuer={$issuer}",
+//			"otpauth://totp/{$user}?secret={$secret}",
+			\SnappyMail\QRCode::ERROR_CORRECT_LEVEL_M
+		);
+		return $this->DefaultResponse($QR->__toString());
 	}
 
-	public function DoAdminPluginLoad() : array
-	{
-		$this->IsAdminLoggined();
-
-		$mResult = false;
-		$sId = (string) $this->GetActionParam('Id', '');
-
-		if (!empty($sId)) {
-			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
-			if ($oPlugin) {
-				$mResult = array(
-					'@Object' => 'Object/Plugin',
-					'Id' => $sId,
-					'Name' => $oPlugin->Name(),
-					'Readme' => $oPlugin->Description(),
-					'Config' => array()
-				);
-
-				$aMap = $oPlugin->ConfigMap();
-				if (\is_array($aMap)) {
-					$oConfig = $oPlugin->Config();
-					foreach ($aMap as $oItem) {
-						if ($oItem) {
-							if ($oItem instanceof \RainLoop\Plugins\Property) {
-								if (PluginPropertyType::PASSWORD === $oItem->Type()) {
-									$oItem->SetValue(APP_DUMMY);
-								} else {
-									$oItem->SetValue($oConfig->Get('plugin', $oItem->Name(), ''));
-								}
-								$mResult['Config'][] = $oItem;
-							} else if ($oItem instanceof \RainLoop\Plugins\PropertyCollection) {
-								foreach ($oItem as $oSubItem) {
-									if ($oSubItem && $oSubItem instanceof \RainLoop\Plugins\Property) {
-										if (PluginPropertyType::PASSWORD === $oSubItem->Type()) {
-											$oSubItem->SetValue(APP_DUMMY);
-										} else {
-											$oSubItem->SetValue($oConfig->Get('plugin', $oSubItem->Name(), ''));
-										}
-									}
-								}
-								$mResult['Config'][] = $oItem;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, $mResult);
-	}
-
-	public function DoAdminPluginSettingsUpdate() : array
-	{
-		$this->IsAdminLoggined();
-
-		$mResult = false;
-		$sId = (string) $this->GetActionParam('Id', '');
-
-		if (!empty($sId))
-		{
-			$oPlugin = $this->Plugins()->CreatePluginByName($sId);
-			if ($oPlugin)
-			{
-				$oConfig = $oPlugin->Config();
-				$aMap = $oPlugin->ConfigMap(true);
-				if (\is_array($aMap))
-				{
-					$aSettings = (array) $this->GetActionParam('Settings', []);
-					foreach ($aMap as $oItem)
-					{
-						$sKey = $oItem->Name();
-						$sValue = $aSettings[$sKey] ?? $oConfig->Get('plugin', $sKey);
-						if (PluginPropertyType::PASSWORD !== $oItem->Type() || APP_DUMMY !== $sValue)
-						{
-							$mResultValue = null;
-							switch ($oItem->Type()) {
-								case PluginPropertyType::INT:
-									$mResultValue  = (int) $sValue;
-									break;
-								case PluginPropertyType::BOOL:
-									$mResultValue  = '1' === (string) $sValue;
-									break;
-								case PluginPropertyType::SELECTION:
-									if (is_array($oItem->DefaultValue()) && in_array($sValue, $oItem->DefaultValue()))
-									{
-										$mResultValue = (string) $sValue;
-									}
-									break;
-								case PluginPropertyType::PASSWORD:
-								case PluginPropertyType::STRING:
-								case PluginPropertyType::STRING_TEXT:
-								case PluginPropertyType::URL:
-									$mResultValue = (string) $sValue;
-									break;
-							}
-
-							if (null !== $mResultValue)
-							{
-								$oConfig->Set('plugin', $sKey, $mResultValue);
-							}
-						}
-					}
-				}
-
-				$mResult = $oConfig->Save();
-			}
-		}
-
-		if (!$mResult)
-		{
-			throw new ClientException(Notifications::CantSavePluginSettings);
-		}
-
-		return $this->DefaultResponse(__FUNCTION__, true);
-	}
-
-	private function setAdminAuthToken(string $sToken) : void
-	{
-		Utils::SetCookie(static::$AUTH_ADMIN_TOKEN_KEY, $sToken, 0);
-	}
-
-	private function getAdminToken() : string
+	private function setAdminAuthToken() : string
 	{
 		$sRand = \MailSo\Base\Utils::Sha1Rand();
-		if (!$this->Cacher(null, true)->Set(KeyPathHelper::SessionAdminKey($sRand), \time()))
-		{
-			$this->oLogger->Write('Cannot store an admin token',
-				\MailSo\Log\Enumerations\Type::WARNING);
-			return '';
+		if (!$this->Cacher(null, true)->Set(KeyPathHelper::SessionAdminKey($sRand), \time())) {
+			throw new \RuntimeException('Failed to store admin token');
 		}
-
-		return Utils::EncodeKeyValuesQ(array('token', $sRand));
+		$sToken = Utils::EncodeKeyValuesQ(array('token', $sRand));
+		if (!$sToken) {
+			throw new \RuntimeException('Failed to encode admin token');
+		}
+		\SnappyMail\Cookies::set(static::$AUTH_ADMIN_TOKEN_KEY, $sToken);
+		return $sToken;
 	}
 
-	private function pluginEnable(string $sName, bool $bEnable = true) : bool
-	{
-		if (!\strlen($sName))
-		{
-			return false;
-		}
-
-		$oConfig = $this->Config();
-
-		$sEnabledPlugins = $oConfig->Get('plugins', 'enabled_list', '');
-		$aEnabledPlugins = \explode(',', \strtolower($sEnabledPlugins));
-		$aEnabledPlugins = \array_map('trim', $aEnabledPlugins);
-
-		$aNewEnabledPlugins = array();
-		if ($bEnable)
-		{
-			$aNewEnabledPlugins = $aEnabledPlugins;
-			$aNewEnabledPlugins[] = $sName;
-		}
-		else
-		{
-			foreach ($aEnabledPlugins as $sPlugin)
-			{
-				if ($sName !== $sPlugin && \strlen($sPlugin))
-				{
-					$aNewEnabledPlugins[] = $sPlugin;
-				}
-			}
-		}
-
-		$oConfig->Set('plugins', 'enabled_list', \trim(\implode(',', \array_unique($aNewEnabledPlugins)), ' ,'));
-
-		return $oConfig->Save();
-	}
-
-	private function setConfigFromParams(\RainLoop\Config\Application $oConfig, string $sParamName, string $sConfigSector, string $sConfigName, string $sType = 'string', ?callable $mStringCallback = null): void
+	private function setConfigFromParams(Config\Application $oConfig, string $sParamName, string $sConfigSector, string $sConfigName, string $sType = 'string', ?callable $mStringCallback = null): void
 	{
 		if ($this->HasActionParam($sParamName)) {
 			$sValue = $this->GetActionParam($sParamName, '');
@@ -729,8 +397,8 @@ class ActionsAdmin extends Actions
 					break;
 
 				case 'dummy':
-					$sValue = (string) $this->GetActionParam($sParamName, APP_DUMMY);
-					if (APP_DUMMY !== $sValue) {
+					$sValue = (string) $this->GetActionParam($sParamName, static::APP_DUMMY);
+					if (static::APP_DUMMY !== $sValue) {
 						$oConfig->Set($sConfigSector, $sConfigName, $sValue);
 					}
 					break;
@@ -747,4 +415,60 @@ class ActionsAdmin extends Actions
 		}
 	}
 
+	public static function AdminAppData(Actions $oActions, array &$aResult): void
+	{
+		$oConfig = $oActions->Config();
+		$aResult['Admin'] = [
+			'host' => '' !== $oConfig->Get('admin_panel', 'host', ''),
+			'path' => $oConfig->Get('admin_panel', 'key', '') ?: 'admin',
+			'allowed' => (bool)$oConfig->Get('security', 'allow_admin_panel', true)
+		];
+
+		$aResult['Auth'] = $oActions->IsAdminLoggined(false);
+		if ($aResult['Auth']) {
+			$aResult['adminLogin'] = (string)$oConfig->Get('security', 'admin_login', '');
+			$aResult['adminTOTP'] = (string)$oConfig->Get('security', 'admin_totp', '');
+			$aResult['pluginsEnable'] = (bool)$oConfig->Get('plugins', 'enable', false);
+
+			$aResult['loginDefaultDomain'] = $oConfig->Get('login', 'default_domain', '');
+			$aResult['determineUserLanguage'] = (bool)$oConfig->Get('login', 'determine_user_language', true);
+			$aResult['determineUserDomain'] = (bool)$oConfig->Get('login', 'determine_user_domain', false);
+
+			$aResult['supportedPdoDrivers'] = \RainLoop\Pdo\Base::getAvailableDrivers();
+
+			$aResult['contactsEnable'] = (bool)$oConfig->Get('contacts', 'enable', false);
+			$aResult['contactsSync'] = (bool)$oConfig->Get('contacts', 'allow_sync', false);
+			$aResult['contactsPdoType'] = Providers\AddressBook\PdoAddressBook::validPdoType($oConfig->Get('contacts', 'type', 'sqlite'));
+			$aResult['contactsPdoDsn'] = (string)$oConfig->Get('contacts', 'pdo_dsn', '');
+			$aResult['contactsPdoType'] = (string)$oConfig->Get('contacts', 'type', '');
+			$aResult['contactsPdoUser'] = (string)$oConfig->Get('contacts', 'pdo_user', '');
+			$aResult['contactsPdoPassword'] = static::APP_DUMMY;
+			$aResult['contactsMySQLSSLCA'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ca', '');
+			$aResult['contactsMySQLSSLVerify'] = !!$oConfig->Get('contacts', 'mysql_ssl_verify', true);
+			$aResult['contactsMySQLSSLCiphers'] = (string) $oConfig->Get('contacts', 'mysql_ssl_ciphers', '');
+			$aResult['contactsSQLiteGlobal'] = !!$oConfig->Get('contacts', 'sqlite_global', \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite'));
+			$aResult['contactsSuggestionsLimit'] = (int)$oConfig->Get('contacts', 'suggestions_limit', 20);
+
+			$aResult['faviconUrl'] = $oConfig->Get('webmail', 'favicon_url', '');
+
+			$aResult['weakPassword'] = \is_file(APP_PRIVATE_DATA.'admin_password.txt');
+
+			$aResult['Admin']['language'] = $oActions->ValidateLanguage($oConfig->Get('admin_panel', 'language', 'en'), '', true);
+			$aResult['Admin']['languages'] = \SnappyMail\L10n::getLanguages(true);
+			$aResult['Admin']['clientLanguage'] = $oActions->ValidateLanguage($oActions->detectClientLanguage(true), '', true, true);
+
+			$gnupg = \SnappyMail\PGP\GnuPG::getInstance('');
+			$aResult['gnupg'] = $gnupg ? $gnupg->getEngineInfo()['version'] : null;
+		} else {
+			$passfile = APP_PRIVATE_DATA.'admin_password.txt';
+			$sPassword = $oConfig->Get('security', 'admin_password', '');
+			if (!$sPassword) {
+				$sPassword = \substr(\base64_encode(\random_bytes(16)), 0, 12);
+				Utils::saveFile($passfile, $sPassword . "\n");
+//				\chmod($passfile, 0600);
+				$oConfig->SetPassword(new \SnappyMail\SensitiveString($sPassword));
+				$oConfig->Save();
+			}
+		}
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
index aa69ba039..685821507 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Api.php
@@ -2,37 +2,13 @@
 
 namespace RainLoop;
 
-class Api
+abstract class Api
 {
 
-	function __construct()
-	{
-	}
-
-	public static function RunResult() : bool
-	{
-		return true;
-	}
-
-	/**
-	 * @staticvar bool $bOne
-	 */
-	public static function Handle() : bool
-	{
-		static $bOne = null;
-		if (null === $bOne)
-		{
-			static::SetupDefaultMailSoConfig();
-			$bOne = static::RunResult();
-		}
-		return $bOne;
-	}
-
-	final public static function Actions() : Actions
+	public static function Actions() : Actions
 	{
 		static $oActions = null;
-		if (null === $oActions)
-		{
+		if (null === $oActions) {
 			$oActions = new Actions();
 		}
 
@@ -42,78 +18,64 @@ class Api
 	public static function Config() : Config\Application
 	{
 		static $oConfig = null;
-		if (!$oConfig)
-		{
+		if (!$oConfig) {
 			$oConfig = new Config\Application();
 			if (!$oConfig->Load()) {
-				usleep(10000);
+				\usleep(10000);
 				$oConfig->Load();
 			}
+//			\ini_set('display_errors', '0');
+			if ($oConfig->Get('debug', 'enable', false)) {
+				\error_reporting(E_ALL);
+//				\ini_set('display_errors', '1');
+				\ini_set('log_errors', '1');
+			}
+			\MailSo\Config::$BoundaryPrefix = \trim($oConfig->Get('labs', 'boundary_prefix', ''));
 		}
 		return $oConfig;
 	}
 
-	public static function Logger() : \MailSo\Log\Logger
+	public static function getCSP(?string $sScriptNonce = null) : \SnappyMail\HTTP\CSP
 	{
-		return \MailSo\Log\Logger::SingletonInstance();
+		$oConfig = static::Config();
+		$CSP = new \SnappyMail\HTTP\CSP(\trim($oConfig->Get('security', 'content_security_policy', '')));
+		$CSP->report = $oConfig->Get('security', 'csp_report', false);
+		$CSP->report_only = $oConfig->Get('debug', 'enable', false); // || SNAPPYMAIL_DEV
+
+		// Allow favicon host, if present
+		$parsedFaviconUrl = parse_url($oConfig->Get('webmail', 'favicon_url', ''));
+		if (is_array($parsedFaviconUrl) && array_key_exists('host', $parsedFaviconUrl)) {
+			$CSP->add('img-src', $parsedFaviconUrl['host']);
+		}
+
+		// Allow https: due to remote images in e-mails or use proxy
+		if (!$oConfig->Get('labs', 'use_local_proxy_for_external_images', '')) {
+			$CSP->add('img-src', 'https:');
+			$CSP->add('img-src', 'http:');
+		}
+		if ($sScriptNonce) {
+			$CSP->add('script-src', "'nonce-{$sScriptNonce}'");
+		}
+
+		static::Actions()->Plugins()->RunHook('main.content-security-policy', array($CSP));
+
+		return $CSP;
 	}
 
-	protected static function SetupDefaultMailSoConfig() : void
+	public static function Logger() : \MailSo\Log\Logger
 	{
-		if (\class_exists('MailSo\Config'))
-		{
-			\MailSo\Config::$MessageListFastSimpleSearch =
-				!!static::Config()->Get('labs', 'imap_message_list_fast_simple_search', true);
-
-			\MailSo\Config::$MessageListCountLimitTrigger =
-				(int) static::Config()->Get('labs', 'imap_message_list_count_limit_trigger', 0);
-
-			\MailSo\Config::$MessageListDateFilter =
-				(int) static::Config()->Get('labs', 'imap_message_list_date_filter', 0);
-
-			\MailSo\Config::$MessageListPermanentFilter =
-				\trim(static::Config()->Get('labs', 'imap_message_list_permanent_filter', ''));
-
-			\MailSo\Config::$MessageAllHeaders =
-				!!static::Config()->Get('labs', 'imap_message_all_headers', false);
-
-			\MailSo\Config::$LargeThreadLimit =
-				(int) static::Config()->Get('labs', 'imap_large_thread_limit', 50);
-
-			\MailSo\Config::$ImapTimeout =
-				(int) static::Config()->Get('labs', 'imap_timeout', 300);
-
-			\MailSo\Config::$BoundaryPrefix =
-				\trim(static::Config()->Get('labs', 'boundary_prefix', ''));
-
-			\MailSo\Config::$SystemLogger = static::Logger();
-
-			$sSslCafile = static::Config()->Get('ssl', 'cafile', '');
-			$sSslCapath = static::Config()->Get('ssl', 'capath', '');
-
-			Utils::$CookieDefaultPath = static::Config()->Get('labs', 'cookie_default_path', '');
-			Utils::$CookieDefaultSecure = !!static::Config()->Get('labs', 'cookie_default_secure', false);
-
-			if (!empty($sSslCafile) || !empty($sSslCapath))
-			{
-				\MailSo\Hooks::Add('Net.NetClient.StreamContextSettings/Filter', function ($aStreamContextSettings) use ($sSslCafile, $sSslCapath) {
-					if (isset($aStreamContextSettings['ssl']) && \is_array($aStreamContextSettings['ssl']))
-					{
-						if (empty($aStreamContextSettings['ssl']['cafile']) && !empty($sSslCafile))
-						{
-							$aStreamContextSettings['ssl']['cafile'] = $sSslCafile;
-						}
-
-						if (empty($aStreamContextSettings['ssl']['capath']) && !empty($sSslCapath))
-						{
-							$aStreamContextSettings['ssl']['capath'] = $sSslCapath;
-						}
-					}
-				});
+		static $oLogger = null;
+		if (!$oLogger) {
+			$oConfig = static::Config();
+			$oLogger = new \MailSo\Log\Logger(true);
+			$oLogger->SetShowSecrets(!$oConfig->Get('logs', 'hide_passwords', true));
+			if ($oConfig->Get('debug', 'enable', false)) {
+				$oLogger->SetLevel(\LOG_DEBUG);
+			} else if ($oConfig->Get('logs', 'enable', false)) {
+				$oLogger->SetLevel(\max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING)));
 			}
-
-			\MailSo\Config::$CheckNewMessages = !!static::Config()->Get('labs', 'check_new_messages', true);
 		}
+		return $oLogger;
 	}
 
 	public static function Version() : string
@@ -121,7 +83,11 @@ class Api
 		return APP_VERSION;
 	}
 
-	public static function CreateUserSsoHash(string $sEmail, string $sPassword, array $aAdditionalOptions = array(), bool $bUseTimeout = true) : ?string
+	public static function CreateUserSsoHash(string $sEmail,
+		#[\SensitiveParameter]
+		string $sPassword,
+		array $aAdditionalOptions = array(), bool $bUseTimeout = true
+	) : ?string
 	{
 		$sSsoHash = \MailSo\Base\Utils::Sha1Rand(\sha1($sPassword.$sEmail));
 
@@ -143,20 +109,21 @@ class Api
 
 	public static function ClearUserData(string $sEmail) : bool
 	{
-		if (\strlen($sEmail))
-		{
-			$sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail);
+		if (\strlen($sEmail)) {
+			$sEmail = \SnappyMail\IDN::emailToAscii($sEmail);
 
 			$oStorageProvider = static::Actions()->StorageProvider();
-			if ($oStorageProvider && $oStorageProvider->IsActive())
-			{
+			if ($oStorageProvider && $oStorageProvider->IsActive()) {
 				$oStorageProvider->DeleteStorage($sEmail);
 			}
 
-			if (static::Actions()->AddressBookProvider() &&
-				static::Actions()->AddressBookProvider()->IsActive())
-			{
-				static::Actions()->AddressBookProvider()->DeleteAllContacts($sEmail);
+			$oConfig = static::Config();
+			$sqlite_global = $oConfig->Get('contacts', 'sqlite_global', false);
+			if ('sqlite' != $oConfig->Get('contacts', 'type', '') || \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')) {
+				$oConfig->Set('contacts', 'sqlite_global', true);
+				$oAddressBookProvider = static::Actions()->AddressBookProvider();
+				$oAddressBookProvider && $oAddressBookProvider->DeleteAllContacts($sEmail);
+				$oConfig->Set('contacts', 'sqlite_global', !!$sqlite_global);
 			}
 
 			return true;
@@ -167,8 +134,7 @@ class Api
 
 	public static function LogoutCurrentLogginedUser() : bool
 	{
-		// TODO: kill SignMe data to prevent automatic login?
-		Utils::ClearCookie(Utils::SESSION_TOKEN);
+		static::Actions()->Logout(true);
 		return true;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
deleted file mode 100644
index 54de31b80..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Common/PdoAbstract.php
+++ /dev/null
@@ -1,531 +0,0 @@
-<?php
-
-namespace RainLoop\Common;
-
-abstract class PdoAbstract
-{
-	/**
-	 * @var \PDO
-	 */
-	protected $oPDO = null;
-
-	/**
-	 * @var bool
-	 */
-	protected $bExplain = false;
-
-	/**
-	 * @var bool
-	 */
-	protected $bSqliteCollate = true;
-
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger;
-
-	/**
-	 * @var string
-	 */
-	protected $sDbType;
-
-	public function IsSupported() : bool
-	{
-		return !!\class_exists('PDO');
-	}
-
-	public function SetLogger(?\MailSo\Log\Logger $oLogger)
-	{
-		$this->oLogger = $oLogger;
-	}
-
-	protected function getPdoAccessData() : array
-	{
-		return array('', '', '', '');
-	}
-
-	public function sqliteNoCaseCollationHelper(string $sStr1, string $sStr2) : int
-	{
-		$this->oLogger->WriteDump(array($sStr1, $sStr2));
-		return \strcmp(\mb_strtoupper($sStr1, 'UTF-8'), \mb_strtoupper($sStr2, 'UTF-8'));
-	}
-
-	public static function getAvailableDrivers() : array
-	{
-		return \class_exists('PDO', false)
-			? \array_values(\array_intersect(['mysql', 'pgsql', 'sqlite'], \PDO::getAvailableDrivers()))
-			: [];
-	}
-
-	/**
-	 *
-	 * @throws \Exception
-	 */
-	protected function getPDO() : \PDO
-	{
-		if ($this->oPDO)
-		{
-			return $this->oPDO;
-		}
-
-		if (!\class_exists('PDO'))
-		{
-			throw new \Exception('Class PDO does not exist');
-		}
-
-		$sType = $sDsn = $sDbLogin = $sDbPassword = '';
-		list($sType, $sDsn, $sDbLogin, $sDbPassword) = $this->getPdoAccessData();
-
-		if (!\in_array($sType, static::getAvailableDrivers()))
-		{
-			throw new \Exception('Unknown PDO SQL connection type');
-		}
-
-		if (empty($sDsn))
-		{
-			throw new \Exception('Empty PDO DSN configuration');
-		}
-
-		$this->sDbType = $sType;
-
-		$oPdo = false;
-		try
-		{
-//			$bCaseFunc = false;
-			$oPdo = new \PDO($sDsn, $sDbLogin, $sDbPassword);
-			if ($oPdo)
-			{
-				$sPdoType = $oPdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
-				$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
-
-				if ('mysql' === $sType && 'mysql' === $sPdoType)
-				{
-					$oPdo->exec('SET NAMES utf8mb4 COLLATE utf8mb4_general_ci');
-				}
-//				else if ('sqlite' === $sType && 'sqlite' === $sPdoType && $this->bSqliteCollate)
-//				{
-//					if (\method_exists($oPdo, 'sqliteCreateCollation'))
-//					{
-//						$oPdo->sqliteCreateCollation('SQLITE_NOCASE_UTF8', array($this, 'sqliteNoCaseCollationHelper'));
-//						$bCaseFunc = true;
-//					}
-//				}
-//
-//				$this->oLogger->Write('PDO:'.$sPdoType.($bCaseFunc ? '/SQLITE_NOCASE_UTF8' : ''));
-			}
-		}
-		catch (\Throwable $oException)
-		{
-			throw $oException;
-		}
-
-		if ($oPdo)
-		{
-			$this->oPDO = $oPdo;
-		}
-		else
-		{
-			throw new \Exception('PDO = false');
-		}
-
-		return $oPdo;
-	}
-
-	protected function lastInsertId(?string $sTabelName = null, ?string $sColumnName = null) : string
-	{
-		$mName = null;
-		if ('pgsql' === $this->sDbType &&
-			null !== $sTabelName && $sColumnName !== null)
-		{
-			$mName = \strtolower($sTabelName.'_'.$sColumnName.'_seq');
-		}
-
-		return null === $mName ? $this->getPDO()->lastInsertId() : $this->getPDO()->lastInsertId($mName);
-	}
-
-	protected function beginTransaction() : bool
-	{
-		return $this->getPDO()->beginTransaction();
-	}
-
-	protected function commit() : bool
-	{
-		return $this->getPDO()->commit();
-	}
-
-	protected function rollBack() : bool
-	{
-		return $this->getPDO()->rollBack();
-	}
-
-	protected function prepareAndExecute(string $sSql, array $aParams = array(), bool $bMultiplyParams = false, bool $bLogParams = false) : ?\PDOStatement
-	{
-		if ($this->bExplain && !$bMultiplyParams)
-		{
-			$this->prepareAndExplain($sSql, $aParams);
-		}
-
-		$mResult = null;
-
-		$this->writeLog($sSql);
-		$oStmt = $this->getPDO()->prepare($sSql);
-		if ($oStmt)
-		{
-			$aLogs = array();
-			$aRootParams = $bMultiplyParams ? $aParams : array($aParams);
-			foreach ($aRootParams as $aSubParams)
-			{
-				foreach ($aSubParams as $sName => $aValue)
-				{
-					if ($bLogParams)
-					{
-						$aLogs[$sName] = $aValue[0];
-					}
-
-					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
-				}
-
-				$mResult = $oStmt->execute() && !$bMultiplyParams ? $oStmt : null;
-			}
-
-			if ($bLogParams && $aLogs)
-			{
-				$this->writeLog('Params: '.\json_encode($aLogs, JSON_UNESCAPED_UNICODE));
-			}
-		}
-
-		return $mResult;
-	}
-
-	protected function prepareAndExplain(string $sSql, array $aParams = array())
-	{
-		$mResult = null;
-		if (0 === strpos($sSql, 'SELECT '))
-		{
-			$sSql = 'EXPLAIN '.$sSql;
-			$this->writeLog($sSql);
-			$oStmt = $this->getPDO()->prepare($sSql);
-			if ($oStmt)
-			{
-				foreach ($aParams as $sName => $aValue)
-				{
-					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
-				}
-
-				$mResult = $oStmt->execute() ? $oStmt : null;
-			}
-		}
-
-		if ($mResult)
-		{
-			$aFetch = $mResult->fetchAll(\PDO::FETCH_ASSOC);
-			$this->oLogger->WriteDump($aFetch);
-
-			unset($aFetch);
-			$mResult->closeCursor();
-		}
-	}
-
-	/**
-	 * @param mixed $mData
-	 */
-	protected function writeLog($mData)
-	{
-		if ($this->oLogger)
-		{
-			$this->oLogger->WriteMixed($mData, \MailSo\Log\Enumerations\Type::INFO, 'SQL');
-		}
-	}
-
-	protected function getUserId(string $sEmail, bool $bSkipInsert = false, bool $bCache = true) : int
-	{
-		static $aCache = array();
-		if ($bCache && isset($aCache[$sEmail]))
-		{
-			return $aCache[$sEmail];
-		}
-
-		$sEmail = \MailSo\Base\Utils::IdnToAscii(\trim($sEmail), true);
-		if (empty($sEmail))
-		{
-			throw new \InvalidArgumentException('Empty Email argument');
-		}
-
-		$oStmt = $this->prepareAndExecute('SELECT id_user FROM rainloop_users WHERE rl_email = :rl_email',
-			array(
-				':rl_email' => array($sEmail, \PDO::PARAM_STR)
-			)
-		);
-
-		$mRow = $oStmt->fetch(\PDO::FETCH_ASSOC);
-		if ($mRow && isset($mRow['id_user']) && \is_numeric($mRow['id_user']))
-		{
-			$iResult = (int) $mRow['id_user'];
-			if (0 >= $iResult)
-			{
-				throw new \Exception('id_user <= 0');
-			}
-
-			if ($bCache)
-			{
-				$aCache[$sEmail] = $iResult;
-			}
-
-			return $iResult;
-		}
-
-		if (!$bSkipInsert)
-		{
-			$oStmt->closeCursor();
-
-			$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email) VALUES (:rl_email)',
-				array(':rl_email' => array($sEmail, \PDO::PARAM_STR))
-			);
-
-			return $this->getUserId($sEmail, true);
-		}
-
-		throw new \Exception('id_user = 0');
-	}
-
-	public function quoteValue(string $sValue) : string
-	{
-		$oPdo = $this->getPDO();
-		return $oPdo ? $oPdo->quote((string) $sValue, \PDO::PARAM_STR) : '\'\'';
-	}
-
-	protected function getSystemValue(string $sName, bool $bReturnIntValue = true) : int
-	{
-		$oPdo = $this->getPDO();
-		if ($oPdo)
-		{
-			if ($bReturnIntValue)
-			{
-				$sQuery = 'SELECT value_int FROM rainloop_system WHERE sys_name = ?';
-			}
-			else
-			{
-				$sQuery = 'SELECT value_str FROM rainloop_system WHERE sys_name = ?';
-			}
-
-			$this->writeLog($sQuery);
-
-			$oStmt = $oPdo->prepare($sQuery);
-			if ($oStmt->execute(array($sName)))
-			{
-				$mRow = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-				$sKey = $bReturnIntValue ? 'value_int' : 'value_str';
-				if ($mRow && isset($mRow[0][$sKey]))
-				{
-					return $bReturnIntValue ? (int) $mRow[0][$sKey] : (string) $mRow[0][$sKey];
-				}
-
-				return $bReturnIntValue ? 0 : '';
-			}
-		}
-
-		return false;
-	}
-
-	protected function getVersion(string $sName) : int
-	{
-		return $this->getSystemValue($sName.'_version', true);
-	}
-
-	protected function setVersion(string $sName, int $iVersion) : bool
-	{
-		$bResult = false;
-		$oPdo = $this->getPDO();
-		if ($oPdo)
-		{
-			$sQuery = 'DELETE FROM rainloop_system WHERE sys_name = ? AND value_int <= ?;';
-			$this->writeLog($sQuery);
-
-			$oStmt = $oPdo->prepare($sQuery);
-			$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
-			if ($bResult)
-			{
-				$sQuery = 'INSERT INTO rainloop_system (sys_name, value_int) VALUES (?, ?);';
-				$this->writeLog($sQuery);
-
-				$oStmt = $oPdo->prepare($sQuery);
-				if ($oStmt)
-				{
-					$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
-				}
-			}
-		}
-
-		return $bResult;
-	}
-
-	/**
-	 * @throws \Exception
-	 */
-	protected function initSystemTables()
-	{
-		$bResult = true;
-
-		$oPdo = $this->getPDO();
-		if ($oPdo)
-		{
-			$aQ = array();
-			switch ($this->sDbType)
-			{
-				case 'mysql':
-					$aQ[] = 'CREATE TABLE IF NOT EXISTS rainloop_system (
-id bigint UNSIGNED NOT NULL AUTO_INCREMENT,
-sys_name varchar(50) NOT NULL,
-value_int int UNSIGNED NOT NULL DEFAULT 0,
-value_str varchar(128) NOT NULL DEFAULT \'\',
-PRIMARY KEY(id),
-INDEX sys_name_rainloop_system_index (sys_name)
-) ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;';
-					$aQ[] = 'CREATE TABLE IF NOT EXISTS rainloop_users (
-id_user int UNSIGNED NOT NULL AUTO_INCREMENT,
-rl_email varchar(128) NOT NULL DEFAULT \'\',
-PRIMARY KEY(id_user),
-INDEX rl_email_rainloop_users_index (rl_email)
-) ENGINE=INNODB;';
-					break;
-
-				case 'pgsql':
-					$aQ[] = 'CREATE TABLE rainloop_system (
-sys_name varchar(50) NOT NULL,
-value_int integer NOT NULL DEFAULT 0,
-value_str varchar(128) NOT NULL DEFAULT \'\'
-);';
-					$aQ[] = 'CREATE INDEX sys_name_rainloop_system_index ON rainloop_system (sys_name);';
-					$aQ[] = 'CREATE SEQUENCE id_user START WITH 1 INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1;';
-					$aQ[] = 'CREATE TABLE rainloop_users (
-id_user integer DEFAULT nextval(\'id_user\'::text) PRIMARY KEY,
-rl_email varchar(128) NOT NULL DEFAULT \'\'
-);';
-					$aQ[] = 'CREATE INDEX rl_email_rainloop_users_index ON rainloop_users (rl_email);';
-					break;
-
-				case 'sqlite':
-					$aQ[] = 'CREATE TABLE rainloop_system (
-sys_name text NOT NULL,
-value_int integer NOT NULL DEFAULT 0,
-value_str text NOT NULL DEFAULT \'\'
-);';
-					$aQ[] = 'CREATE INDEX sys_name_rainloop_system_index ON rainloop_system (sys_name);';
-					$aQ[] = 'CREATE TABLE rainloop_users (
-id_user integer NOT NULL PRIMARY KEY,
-rl_email text NOT NULL DEFAULT \'\'
-);';
-					$aQ[] = 'CREATE INDEX rl_email_rainloop_users_index ON rainloop_users (rl_email);';
-					break;
-			}
-
-			if (\count($aQ))
-			{
-				try
-				{
-					foreach ($aQ as $sQuery)
-					{
-						if ($bResult)
-						{
-							$this->writeLog($sQuery);
-							$bResult = false !== $oPdo->exec($sQuery);
-							if (!$bResult)
-							{
-								$this->writeLog('Result=false');
-							}
-							else
-							{
-								$this->writeLog('Result=true');
-							}
-						}
-					}
-				}
-				catch (\Throwable $oException)
-				{
-					$this->writeLog($oException);
-					throw $oException;
-				}
-			}
-		}
-
-		return $bResult;
-	}
-
-	protected function dataBaseUpgrade(string $sName, array $aData = array()) : bool
-	{
-		$iFromVersion = null;
-		try
-		{
-			$iFromVersion = $this->getVersion($sName);
-		}
-		catch (\PDOException $oException)
-		{
-			$this->writeLog($oException);
-
-			try
-			{
-				$this->initSystemTables();
-
-				$iFromVersion = $this->getVersion($sName);
-			}
-			catch (\PDOException $oSubException)
-			{
-				$this->writeLog($oSubException);
-				throw $oSubException;
-			}
-		}
-
-		$bResult = false;
-		if (\is_int($iFromVersion) && 0 <= $iFromVersion)
-		{
-			$oPdo = false;
-
-			foreach ($aData as $iVersion => $aQuery)
-			{
-				if (0 === \count($aQuery))
-				{
-					continue;
-				}
-
-				if (!$oPdo)
-				{
-					$oPdo = $this->getPDO();
-					$bResult = true;
-				}
-
-				if ($iFromVersion < $iVersion && $oPdo)
-				{
-					try
-					{
-						foreach ($aQuery as $sQuery)
-						{
-							$this->writeLog($sQuery);
-							$bExec = $oPdo->exec($sQuery);
-							if (false === $bExec)
-							{
-								$this->writeLog('Result: false');
-
-								$bResult = false;
-								break;
-							}
-						}
-					}
-					catch (\Throwable $oException)
-					{
-						$this->writeLog($oException);
-						throw $oException;
-					}
-
-					if (!$bResult)
-					{
-						break;
-					}
-
-					$this->setVersion($sName, $iVersion);
-				}
-			}
-		}
-
-		return $bResult;
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
index 92fa46634..6d1e3db30 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/AbstractConfig.php
@@ -2,92 +2,92 @@
 
 namespace RainLoop\Config;
 
-abstract class AbstractConfig implements \JsonSerializable
+abstract class AbstractConfig implements \ArrayAccess, \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sFile;
+	private string $sFile;
 
-	/**
-	 * @var string
-	 */
-	private $sAdditionalFile = '';
+	private string $sAdditionalFile = '';
 
-	/**
-	 * @var array
-	 */
-	private $aData;
+	private array $aData;
 
-	/**
-	 * @var bool
-	 */
-	private $bUseApcCache;
+	private bool $bUseApcCache;
 
-	/**
-	 * @var string
-	 */
-	private $sFileHeader;
+	private string $sFileHeader;
 
 	public function __construct(string $sFileName, string $sFileHeader = '', string $sAdditionalFileName = '')
 	{
 		$this->sFile = \APP_PRIVATE_DATA.'configs/'.\trim($sFileName);
 
 		$sAdditionalFileName = \trim($sAdditionalFileName);
-		if (\strlen($sAdditionalFileName)) {
+		if ($sAdditionalFileName) {
 			$sAdditionalFileName = \APP_PRIVATE_DATA.'configs/'.$sAdditionalFileName;
 			if (\file_exists($this->sAdditionalFile)) {
-				$this->sAdditionalFile = $this->sAdditionalFile;
+				$this->sAdditionalFile = $sAdditionalFileName;
 			}
 		}
 
 		$this->sFileHeader = $sFileHeader;
 		$this->aData = $this->defaultValues();
 
-		$this->bUseApcCache = APP_USE_APCU_CACHE &&
-			\MailSo\Base\Utils::FunctionsExistAndEnabled(array('apcu_fetch', 'apcu_store'));
+		$this->bUseApcCache = defined('APP_USE_APCU_CACHE') && APP_USE_APCU_CACHE &&
+			\MailSo\Base\Utils::FunctionsCallable(array('apcu_fetch', 'apcu_store'));
 	}
 
-	protected abstract function defaultValues() : array;
+	public function offsetExists(mixed $offset): bool
+	{
+	}
 
-	public function IsInited() : bool
+	public function offsetGet(mixed $offset): mixed
+	{
+		$offset = \explode('/', $offset, 2);
+		$this->Get($offset[0], $offset[1]);
+	}
+
+	public function offsetSet(mixed $offset, mixed $value): void
+	{
+		$offset = \explode('/', $offset, 2);
+		$this->Set($offset[0], $offset[1], $value);
+	}
+
+	public function offsetUnset(mixed $offset): void
+	{
+	}
+
+	protected abstract function defaultValues(): array;
+
+	public function IsInited(): bool
 	{
 		return \is_array($this->aData) && \count($this->aData);
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		return $this->aData;
+		return $this->aData;;
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	public function Get(string $sSection, string $sName, $mDefault = null)
+	public function Get(string $sSection, string $sName, mixed $mDefault = null): mixed
 	{
 		return isset($this->aData[$sSection][$sName][0])
 			? $this->aData[$sSection][$sName][0]
 			: $mDefault;
 	}
 
-	/**
-	 * @param mixed $mParamValue
-	 */
-	public function Set(string $sSectionKey, string $sParamKey, $mParamValue) : void
+	public function Set(string $sSectionKey, string $sParamKey, mixed $mParamValue): void
 	{
-		if (isset($this->aData[$sSectionKey][$sParamKey][0]))
-		{
-			switch (\gettype($this->aData[$sSectionKey][$sParamKey][0]))
+		if (isset($this->aData[$sSectionKey][$sParamKey][0])) {
+			if (!\is_scalar($mParamValue)) {
+				$mParamValue = null;
+			}
+			switch (\get_debug_type($this->aData[$sSectionKey][$sParamKey][0]))
 			{
-				case 'boolean':
+				case 'bool':
 					$this->aData[$sSectionKey][$sParamKey][0] = (bool) $mParamValue;
 					break;
-				case 'double':
+				case 'float':
 					$this->aData[$sSectionKey][$sParamKey][0] = (float) $mParamValue;
 					break;
-				case 'integer':
+				case 'int':
 					$this->aData[$sSectionKey][$sParamKey][0] = (int) $mParamValue;
 					break;
 				case 'string':
@@ -95,38 +95,49 @@ abstract class AbstractConfig implements \JsonSerializable
 					$this->aData[$sSectionKey][$sParamKey][0] = (string) $mParamValue;
 					break;
 			}
-		}
-		else if ('custom' === $sSectionKey)
-		{
+		} else if ('custom' === $sSectionKey) {
 			$this->aData[$sSectionKey][$sParamKey] = array((string) $mParamValue);
 		}
 	}
 
-	private function cacheKey() : string
+	public function getDecrypted(string $sSection, string $sName, mixed $mDefault = null)
+	{
+		// $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property
+		if (!empty($this->aData[$sSection][$sName][0])) try {
+			return \SnappyMail\Crypt::DecryptFromJSON($this->aData[$sSection][$sName][0], \APP_SALT);
+		} catch (\Throwable $e) {
+		}
+		return $mDefault;
+	}
+
+	public function setEncrypted(string $sSectionKey, string $sParamKey, mixed $mParamValue): void
+	{
+		// $salt = \basename($this->sFile) not possible due to RainLoop\Plugins\Property
+		$mParamValue = \SnappyMail\Crypt::EncryptToJSON($mParamValue, \APP_SALT);
+		$this->Set($sSectionKey, $sParamKey, $mParamValue);
+	}
+
+	private function cacheKey(): string
 	{
 		return 'config:'.\sha1($this->sFile).':'.\sha1($this->sAdditionalFile).':';
 	}
 
-	private function loadDataFromCache() : bool
+	private function loadDataFromCache(): bool
 	{
-		if ($this->bUseApcCache)
-		{
+		if ($this->bUseApcCache) {
 			$iMTime = \filemtime($this->sFile);
 			$iMTime = \is_int($iMTime) && 0 < $iMTime ? $iMTime : 0;
 
 			$iATime = $this->sAdditionalFile ? \filemtime($this->sAdditionalFile) : 0;
 			$iATime = \is_int($iATime) && 0 < $iATime ? $iATime : 0;
 
-			if (0 < $iMTime)
-			{
+			if (0 < $iMTime) {
 				$sKey = $this->cacheKey();
 
 				$sTimeHash = \apcu_fetch($sKey.'time');
-				if ($sTimeHash && $sTimeHash === \md5($iMTime.'/'.$iATime))
-				{
+				if ($sTimeHash && $sTimeHash === \md5($iMTime.'/'.$iATime)) {
 					$aFetchData = \apcu_fetch($sKey.'data');
-					if (\is_array($aFetchData))
-					{
+					if (\is_array($aFetchData)) {
 						$this->aData = $aFetchData;
 						return true;
 					}
@@ -137,18 +148,16 @@ abstract class AbstractConfig implements \JsonSerializable
 		return false;
 	}
 
-	private function storeDataToCache() : bool
+	private function storeDataToCache(): bool
 	{
-		if ($this->bUseApcCache)
-		{
+		if ($this->bUseApcCache) {
 			$iMTime = \filemtime($this->sFile);
 			$iMTime = \is_int($iMTime) && 0 < $iMTime ? $iMTime : 0;
 
 			$iATime = $this->sAdditionalFile ? \filemtime($this->sAdditionalFile) : 0;
 			$iATime = \is_int($iATime) && 0 < $iATime ? $iATime : 0;
 
-			if (0 < $iMTime)
-			{
+			if (0 < $iMTime) {
 				$sKey = $this->cacheKey();
 
 				\apcu_store($sKey.'time', \md5($iMTime.'/'.$iATime));
@@ -161,10 +170,9 @@ abstract class AbstractConfig implements \JsonSerializable
 		return false;
 	}
 
-	private function clearCache() : bool
+	private function clearCache(): bool
 	{
-		if ($this->bUseApcCache)
-		{
+		if ($this->bUseApcCache) {
 			$sKey = $this->cacheKey();
 
 			\apcu_delete($sKey.'time');
@@ -176,29 +184,26 @@ abstract class AbstractConfig implements \JsonSerializable
 		return false;
 	}
 
-	public function IsFileExists() : bool
+	public function Load(): bool
 	{
-		return \file_exists($this->sFile);
-	}
-
-	public function Load() : bool
-	{
-		if (\file_exists($this->sFile) && \is_readable($this->sFile))
-		{
-			if ($this->loadDataFromCache())
-			{
+		$sFile = $this->sFile;
+		if (!\file_exists($sFile) && \str_ends_with($sFile, '.json')) {
+			$sFile = \str_replace('.json', '.ini', $sFile);
+		}
+		if (\file_exists($sFile) && \is_readable($sFile)) {
+			if ($this->loadDataFromCache()) {
 				return true;
 			}
 
-			$aData = \RainLoop\Utils::CustomParseIniFile($this->sFile, true);
-			if (\count($aData))
-			{
-				foreach ($aData as $sSectionKey => $aSectionValue)
-				{
-					if (\is_array($aSectionValue))
-					{
-						foreach ($aSectionValue as $sParamKey => $mParamValue)
-						{
+			if (\str_ends_with($sFile, '.json')) {
+				$aData = \json_decode(\file_get_contents($sFile), true);
+			} else {
+				$aData = \parse_ini_file($sFile, true);
+			}
+			if ($aData && \count($aData)) {
+				foreach ($aData as $sSectionKey => $aSectionValue) {
+					if (\is_array($aSectionValue)) {
+						foreach ($aSectionValue as $sParamKey => $mParamValue) {
 							$this->Set($sSectionKey, $sParamKey, $mParamValue);
 						}
 					}
@@ -206,24 +211,23 @@ abstract class AbstractConfig implements \JsonSerializable
 
 				unset($aData);
 
-				if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile))
-				{
-					$aSubData = \RainLoop\Utils::CustomParseIniFile($this->sAdditionalFile, true);
-					if (\is_array($aSubData) && \count($aSubData))
-					{
-						foreach ($aSubData as $sSectionKey => $aSectionValue)
-						{
-							if (\is_array($aSectionValue))
-							{
-								foreach ($aSectionValue as $sParamKey => $mParamValue)
-								{
+				if (\file_exists($this->sAdditionalFile) && \is_readable($this->sAdditionalFile)) {
+					if (\str_ends_with($this->sAdditionalFile, '.json')) {
+						$aData = \json_decode(\file_get_contents($this->sAdditionalFile), true);
+					} else {
+						$aData = \parse_ini_file($this->sAdditionalFile, true);
+					}
+					if ($aData && \count($aData)) {
+						foreach ($aData as $sSectionKey => $aSectionValue) {
+							if (\is_array($aSectionValue)) {
+								foreach ($aSectionValue as $sParamKey => $mParamValue) {
 									$this->Set($sSectionKey, $sParamKey, $mParamValue);
 								}
 							}
 						}
 					}
 
-					unset($aSubData);
+					unset($aData);
 				}
 
 				$this->storeDataToCache();
@@ -232,63 +236,62 @@ abstract class AbstractConfig implements \JsonSerializable
 			}
 		}
 
-		return false;
+		return $this->Save();
 	}
 
-	public function Save() : bool
+	public function Save(): bool
 	{
-		if (\file_exists($this->sFile) && !\is_writable($this->sFile))
-		{
+		if (\file_exists($this->sFile) && !\is_writable($this->sFile)) {
 			return false;
 		}
 
+		if (\str_ends_with($this->sFile, '.json')) {
+			$this->clearCache();
+			\RainLoop\Utils::saveFile($this->sFile, \json_encode($this, \JSON_PRETTY_PRINT | \JSON_UNESCAPED_SLASHES));
+			// Remove old .ini file
+			$sFile = \str_replace('.json', '.ini', $this->sFile);
+			\file_exists($sFile) && \unlink($sFile);
+			return true;
+		}
+
 		$sNewLine = "\n";
 
 		$aResultLines = array();
 
-		foreach ($this->aData as $sSectionKey => $aSectionValue)
-		{
-			if (\is_array($aSectionValue))
-			{
+		foreach ($this->aData as $sSectionKey => $aSectionValue) {
+			if (\is_array($aSectionValue)) {
 				$aResultLines[] = '';
 				$aResultLines[] = '['.$sSectionKey.']';
 				$bFirst = true;
 
-				foreach ($aSectionValue as $sParamKey => $mParamValue)
-				{
-					if (\is_array($mParamValue))
-					{
-						if (!empty($mParamValue[1]))
-						{
-							$sDesk = \str_replace("\r", '', $mParamValue[1]);
-							$aDesk = \explode("\n", $sDesk);
-							$aDesk = \array_map(function ($sLine) {
-								return '; '.$sLine;
-							}, $aDesk);
-
-							if (!$bFirst)
-							{
+				foreach ($aSectionValue as $sParamKey => $mParamValue) {
+					if (\is_array($mParamValue)) {
+						// Add comments
+						if (!empty($mParamValue[1])) {
+							if (!$bFirst) {
 								$aResultLines[] = '';
 							}
-
-							$aResultLines[] = \implode($sNewLine, $aDesk);
+							foreach (\explode("\n", \str_replace("\r", '', $mParamValue[1])) as $sLine) {
+								$aResultLines[] = '; ' . $sLine;
+							}
 						}
 
+						// Add value
 						$bFirst = false;
 
 						$sValue = '""';
-						switch (\gettype($mParamValue[0]))
+						switch (\get_debug_type($mParamValue[0]))
 						{
-							case 'boolean':
+							case 'bool':
 								$sValue = $mParamValue[0] ? 'On' : 'Off';
 								break;
-							case 'double':
-							case 'integer':
+							case 'float':
+							case 'int':
 								$sValue = $mParamValue[0];
 								break;
 							case 'string':
 							default:
-								$sValue = '"'.\str_replace('"', '\\"', $mParamValue[0]).'"';
+								$sValue = '"'.\addcslashes($mParamValue[0], '\\"').'"';
 								break;
 						}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index e96a04a2c..87478571c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -4,7 +4,7 @@ namespace RainLoop\Config;
 
 class Application extends \RainLoop\Config\AbstractConfig
 {
-	private $aReplaceEnv = null;
+	private ?array $aReplaceEnv = null;
 
 	public function __construct()
 	{
@@ -14,89 +14,141 @@ class Application extends \RainLoop\Config\AbstractConfig
 			APP_CONFIGURATION_NAME);
 	}
 
-	public function Load() : bool
+	public function Load(): bool
 	{
 		$bResult = parent::Load();
 
+		$max = \floatval($this->Get('security', 'max_sys_getloadavg', 0));
+		if ($max && \is_callable('sys_getloadavg')) {
+			$load = \sys_getloadavg();
+			if ($load && $load[0] > $max) {
+				\header('HTTP/1.1 503 Service Unavailable', true, 503);
+				\header('Retry-After: 120');
+				exit("Mailserver too busy ({$load[0]}). Please try again later.");
+			}
+		}
+
 		$this->aReplaceEnv = null;
 		if ((isset($_ENV) && \is_array($_ENV) && \count($_ENV)) ||
 			(isset($_SERVER) && \is_array($_SERVER) && \count($_SERVER)))
 		{
 			$sEnvNames = $this->Get('labs', 'replace_env_in_configuration', '');
-			if (\strlen($sEnvNames))
-			{
+			if (\strlen($sEnvNames)) {
 				$this->aReplaceEnv = \explode(',', $sEnvNames);
-				if (\is_array($this->aReplaceEnv))
-				{
+				if (\is_array($this->aReplaceEnv)) {
 					$this->aReplaceEnv = \array_map('trim', $this->aReplaceEnv);
 					$this->aReplaceEnv = \array_map('strtolower', $this->aReplaceEnv);
 				}
 			}
 		}
 
-		if (!\is_array($this->aReplaceEnv) || 0 === \count($this->aReplaceEnv))
-		{
+		if (!\is_array($this->aReplaceEnv) || !\count($this->aReplaceEnv)) {
 			$this->aReplaceEnv = null;
 		}
 
+		$sCipher = $this->Get('security', 'encrypt_cipher', '');
+		if (!$sCipher || !\SnappyMail\Crypt::cipherSupported($sCipher)) {
+			$sCipher && \SnappyMail\Log::warning('Crypt', "OpenSSL no support for cipher '{$sCipher}'");
+			$aCiphers = \SnappyMail\Crypt::listCiphers();
+			$sCipher2 = $aCiphers ? $aCiphers[\array_rand($aCiphers)] : '';
+			if ($sCipher !== $sCipher2) {
+				$this->Set('security', 'encrypt_cipher', $sCipher2);
+				$this->Save();
+			}
+		}
+
+		if (!\in_array($this->Get('logs', 'time_zone', ''), \DateTimeZone::listIdentifiers())) {
+			$this->Set('logs', 'time_zone', 'UTC');
+		}
+
 		return $bResult;
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	public function Get(string $sSection, string $sName, $mDefault = null)
+	public function Get(string $sSection, string $sName, mixed $mDefault = null): mixed
 	{
 		$mResult = parent::Get($sSection, $sName, $mDefault);
-		if ($this->aReplaceEnv && \is_string($mResult))
-		{
+		if ($this->aReplaceEnv && \is_string($mResult)) {
 			$sKey = \strtolower($sSection.'.'.$sName);
-			if (\in_array($sKey, $this->aReplaceEnv) && false !== strpos($mResult, '$'))
-			{
+			if (\in_array($sKey, $this->aReplaceEnv) && false !== strpos($mResult, '$')) {
 				$mResult = \preg_replace_callback('/\$([^\s]+)/', function($aMatch) {
-
-					if (!empty($aMatch[0]) && !empty($aMatch[1]))
-					{
-						if (!empty($_ENV[$aMatch[1]]))
-						{
+					if (!empty($aMatch[0]) && !empty($aMatch[1])) {
+						if (!empty($_ENV[$aMatch[1]])) {
+							return $_ENV[$aMatch[1]];
+						}
+						if (!empty($_SERVER[$aMatch[1]])) {
 							return $_SERVER[$aMatch[1]];
 						}
-
-						if (!empty($_SERVER[$aMatch[1]]))
-						{
-							return $_SERVER[$aMatch[1]];
-						}
-
 						return $aMatch[0];
 					}
-
 					return '';
-
 				}, $mResult);
 			}
 		}
-
 		return $mResult;
 	}
 
-	public function SetPassword(string $sPassword) : void
+	public function Set(string $sSectionKey, string $sParamKey, $mParamValue): void
 	{
-		$this->Set('security', 'admin_password', \password_hash($sPassword, PASSWORD_DEFAULT));
-	}
-
-	public function ValidatePassword(string $sPassword) : bool
-	{
-		$sConfigPassword = (string) $this->Get('security', 'admin_password', '');
-		if (32 == \strlen($sPassword) && \md5(APP_SALT.$sPassword.APP_SALT) === $sConfigPassword) {
-			$this->SetPassword($sPassword);
-			return true;
+		// Workarounds for the changed application structure
+		if ('webmail' === $sSectionKey) {
+			if ('language_admin' === $sParamKey) {
+				$sSectionKey = 'admin_panel';
+				$sParamKey = 'language';
+			}
 		}
-		return \strlen($sPassword) && \password_verify($sPassword, $sConfigPassword);
+		if ('security' === $sSectionKey) {
+			if (\str_starts_with($sParamKey, 'admin_panel_')) {
+				$sSectionKey = 'admin_panel';
+				$sParamKey = \str_replace('admin_panel_', '', $sParamKey);
+			}
+		}
+		if ('labs' === $sSectionKey) {
+			if (\str_starts_with($sParamKey, 'imap_')) {
+				$sSectionKey = 'imap';
+				$sParamKey = \str_replace('imap_', '', $sParamKey);
+			}
+			if (\str_starts_with($sParamKey, 'use_app_debug_')) {
+				$sSectionKey = 'debug';
+				$sParamKey = \str_replace('use_app_debug_js', 'javascript', $sParamKey);
+				$sParamKey = \str_replace('use_app_debug_css', 'css', $sParamKey);
+			}
+			if ('cache_system_data' === $sParamKey) {
+				$sSectionKey = 'cache';
+				$sParamKey = 'system_data';
+			}
+			if ('force_https' === $sParamKey) {
+				$sSectionKey = 'security';
+			}
+			if ('check_new_messages' === $sParamKey) {
+				$sSectionKey = 'imap';
+				$sParamKey = 'fetch_new_messages';
+			}
+			if ('login_fault_delay' === $sParamKey) {
+				$sSectionKey = 'login';
+				$sParamKey = 'fault_delay';
+			}
+			if ('log_ajax_response_write_limit' === $sParamKey) {
+				$sSectionKey = 'logs';
+				$sParamKey = 'json_response_write_limit';
+			}
+		}
+		if ('language' === $sParamKey) {
+			$mParamValue = \SnappyMail\L10n::validLanguage($mParamValue, 'admin_panel' === $sSectionKey) ?: 'en';
+		}
+		parent::Set($sSectionKey, $sParamKey, $mParamValue);
 	}
 
-	public function Save() : bool
+	public function SetPassword(\SnappyMail\SensitiveString $oPassword): void
+	{
+		$this->Set('security', 'admin_password', \password_hash($oPassword, PASSWORD_DEFAULT));
+	}
+
+	public function ValidatePassword(\SnappyMail\SensitiveString $oPassword): bool
+	{
+		return \strlen($oPassword) && \password_verify($oPassword, $this->Get('security', 'admin_password', ''));
+	}
+
+	public function Save(): bool
 	{
 		$this->Set('version', 'current', APP_VERSION);
 		$this->Set('version', 'saved', \gmdate('r'));
@@ -104,7 +156,7 @@ class Application extends \RainLoop\Config\AbstractConfig
 		return parent::Save();
 	}
 
-	protected function defaultValues() : array
+	protected function defaultValues(): array
 	{
 		$value = \ini_get('upload_max_filesize');
 		$upload_max_filesize = \intval($value);
@@ -115,140 +167,184 @@ class Application extends \RainLoop\Config\AbstractConfig
 		}
 		$upload_max_filesize = $upload_max_filesize / 1024 / 1024;
 
-		$sCipher = 'aes-256-cbc-hmac-sha1';
-		$aCiphers = \SnappyMail\Crypt::listCiphers();
-		if (!\in_array($sCipher, $aCiphers)) {
-			$sCipher = $aCiphers[\array_rand($aCiphers)];
-		}
-
 		return array(
 
 			'webmail' => array(
 
 				'title'                       => array('SnappyMail Webmail', 'Text displayed as page title'),
 				'loading_description'         => array('SnappyMail', 'Text displayed on startup'),
-				'favicon_url'                 => array('', ''),
+				'favicon_url'                 => array(''),
+				'app_path'                    => array(''),
 
 				'theme'                       => array('Default', 'Theme used by default'),
 				'allow_themes'                => array(true, 'Allow theme selection on settings screen'),
 				'allow_user_background'       => array(false),
 
 				'language'                    => array('en', 'Language used by default'),
-				'language_admin'              => array('en', 'Admin Panel interface language'),
 				'allow_languages_on_settings' => array(true, 'Allow language selection on settings screen'),
 
-				'allow_additional_accounts'   => array(true, ''),
-				'allow_additional_identities' => array(true, ''),
+				'allow_additional_accounts'   => array(true),
+				'allow_additional_identities' => array(true),
+				'popup_identity' => array(true, 'When identity is not set yet, open identity popup after login'),
 
 				'messages_per_page'           => array(20, 'Number of messages displayed on page by default'),
 				'message_read_delay'          => array(5, 'Mark message read after N seconds'),
 
+				'min_refresh_interval'        => array(5, 'Minimal check for new messages interval in minutes'),
+
 				'attachment_size_limit'       => array(\min($upload_max_filesize, 25), 'File size limit (MB) for file upload on compose screen
-0 for unlimited.')
+0 for unlimited.'),
+
+				'compress_output' => array(false, 'brotli or gzip compress the output.
+Warning: only enable when server does not do this, else double compression errors occur')
 			),
 
 			'interface' => array(
-				'show_attachment_thumbnail' => array(true, ''),
-				'new_move_to_folder_button' => array(true)
+				'show_attachment_thumbnail' => array(true)
 			),
 
 			'contacts' => array(
 				'enable'            => array(false, 'Enable contacts'),
 				'allow_sync'        => array(false),
 				'sync_interval'     => array(20),
-				'type'              => array('sqlite', ''),
-				'pdo_dsn'           => array('host=127.0.0.1;port=3306;dbname=snappymail', ''),
-				'pdo_user'          => array('root', ''),
-				'pdo_password'      => array('', ''),
-				'suggestions_limit' => array(30)
+				'type'              => array('sqlite'),
+				'pdo_dsn'           => array('host=127.0.0.1;port=3306;dbname=snappymail'),
+				'pdo_user'          => array('root'),
+				'pdo_password'      => array(''),
+				'mysql_ssl_ca'      => array('', 'PEM format certificate'),
+				'mysql_ssl_verify'  => array(true),
+				'mysql_ssl_ciphers' => array('', 'HIGH'),
+				'sqlite_global'     => array(\is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')),
+				'suggestions_limit' => array(20)
 			),
 
 			'security' => array(
-				'csrf_protection'    => array(true,
-				    'Enable CSRF protection (http://en.wikipedia.org/wiki/Cross-site_request_forgery)'),
+				'custom_server_signature' => array('SnappyMail'),
+				'x_xss_protection_header' => array('1; mode=block'),
 
-				'custom_server_signature'    => array('SnappyMail'),
-				'x_frame_options_header'     => array('DENY'),
-				'x_xss_protection_header'    => array('1; mode=block'),
+				'gnupg'                   => array(true),
+				'openpgp'                 => array(true),
+				'auto_verify_signatures'  => array(false),
 
-				'openpgp'                    => array(false),
+				'trusted_authserv_ids'    => array('', 'Which servers\' DKIM, SPF and DMARC results to believe,
+by authserv-id (the first field of an Authentication-Results header), separated by
+spaces or commas. A sender can add that header itself, so a result not tied to a
+server that handled the message says nothing.
+Empty: the authserv-id of the topmost header is taken as the local one. That covers
+the usual case, but a server which adds no results of its own leaves the sender\'s
+header as the topmost, so name your own id here if these results are shown.'),
 
-				'admin_login'                => array('admin', 'Login and password for web admin panel'),
-				'admin_password'             => array(''),
-				'admin_totp'                 => array(''),
-				'allow_admin_panel'          => array(true, 'Access settings'),
-				'hide_x_mailer_header'       => array(true),
-				'admin_panel_host'           => array(''),
-				'admin_panel_key'            => array('admin'),
-				'content_security_policy'    => array(''),
-				'csp_report'                 => array(false),
-				'encrypt_cipher'             => array($sCipher)
+				'allow_admin_panel'       => array(true, 'Access settings'),
+				'admin_login'             => array('admin', 'Login and password for web admin panel'),
+				'admin_password'          => array(''),
+				'admin_totp'              => array(''),
+				'insecure_cryptkey'       => array(false, 'Use email address instead of login password for encrypting sensitive data (like account passwords)'),
+
+				'force_https'             => array(false),
+				'hide_x_mailer_header'    => array(true),
+				'max_sys_getloadavg'      => array(0.0, 'https://en.m.wikipedia.org/wiki/Load_(computing)'),
+				'content_security_policy' => array('', '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'),
+				'csp_report'              => array(false, 'Report CSP errors to PHP and/or SnappyMail Log'),
+				'encrypt_cipher'          => array('aes-256-cbc-hmac-sha1', 'A valid cipher method from https://php.net/openssl_get_cipher_methods'),
+				'cookie_samesite'         => array('Strict', 'Strict, Lax or None'),
+				'secfetch_allow'          => array('', '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"')
+			),
+
+			'admin_panel' => array(
+/*
+				'enabled'  => array(true, 'Access settings'),
+				'login'    => array('admin', 'Login and password for web admin panel'),
+				'password' => array(''),
+				'totp'     => array(''),
+*/
+				'host'     => array(''),
+				'key'      => array('admin'),
+				'allow_update' => array(false),
+				'language'     => array('en', 'Admin Panel interface language'),
 			),
 
 			'ssl' => array(
-				'verify_certificate' => array(false, 'Require verification of SSL certificate used.'),
-				'allow_self_signed'  => array(true, 'Allow self-signed certificates. Requires verify_certificate.'),
-				'cafile'             => array('', 'Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)'),
-				'capath'             => array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
-				'client_cert'        => array('', 'Location of client certificate file (pem format with private key) on local filesystem'),
+				'verify_certificate'  => array(true, 'Require verification of SSL certificate used.'),
+				'allow_self_signed'   => array(false, 'Allow self-signed certificates. Requires verify_certificate.'),
+				'security_level'      => array(1, 'https://www.openssl.org/docs/man1.1.1/man3/SSL_CTX_set_security_level.html'),
+				'cafile'              => array('', 'Location of Certificate Authority file on local filesystem (/etc/ssl/certs/ca-certificates.crt)'),
+				'capath'              => array('', 'capath must be a correctly hashed certificate directory. (/etc/ssl/certs/)'),
+				'local_cert'          => array('', 'Location of client certificate file (pem format with private key) on local filesystem'),
+				'disable_compression' => array(true, 'This can help mitigate the CRIME attack vector.')
 			),
 
 			'capa' => array(
-				'contacts' => array(true),
-				'quota' => array(true),
-				'search' => array(true),
-				'search_adv' => array(true),
-				'dangerous_actions' => array(true),
-				'message_actions' => array(true),
-				'attachments_actions' => array(true)
+				'dangerous_actions' => array(true, 'Allow clear folder and delete messages without moving to trash'),
+				'attachments_actions' => array(true, 'Allow download attachments as Zip (and optionally others)')
 			),
 
 			'login' => array(
 
-				'default_domain' => array('', ''),
+				'default_domain' => array('',
+					'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.
+'),
 
 				'allow_languages_on_login' => array(true,
 					'Allow language selection on webmail login screen'),
 
-				'determine_user_language' => array(true, ''),
-				'determine_user_domain' => array(false, ''),
+				'determine_user_language' => array(true, 'Detect language from browser header `Accept-Language`'),
+				'determine_user_domain' => array(false, 'Like default_domain but then HTTP_HOST/SERVER_NAME without www.'),
 
-				'hide_submit_button' => array(true),
-
-				'login_lowercase' => array(true, ''),
-
-				'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DEFAULT_OFF,
+				'sign_me_auto' => array(\RainLoop\Enumerations\SignMeType::DefaultOff,
 					'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')
+  "Unused"     - cannot be used'),
+
+				'fault_delay' => array(5, 'When login fails, wait N seconds before responding'),
 			),
 
 			'plugins' => array(
 				'enable'       => array(false, 'Enable plugin support'),
-				'enabled_list' => array('', 'List of enabled plugins'),
+				'enabled_list' => array('', 'Comma-separated list of enabled plugins'),
 			),
 
 			'defaults' => array(
-				'view_editor_type'       => array('Html', 'Editor mode used by default (Plain, Html, HtmlForced or PlainForced)'),
+				'view_editor_type'       => array('Html', 'Editor mode used by default (Plain, Html)'),
 				'view_layout'            => array(1, 'layout: 0 - no preview, 1 - side preview, 2 - bottom preview'),
 				'view_use_checkboxes'    => array(true),
+				'view_show_next_message' => array(true, 'Show next message when (re)move current message'),
 				'autologout'             => array(30),
 				'view_html'              => array(true),
 				'show_images'            => array(false),
+				'view_images'            => array('ask', 'View external images:
+  "ask" - always ask
+  "match" - whitelist or ask
+  "always" - show always'),
 				'contacts_autosave'      => array(true),
-				'mail_use_threads'       => array(false),
+                'mail_list_grouped'      => array(false),
+                'mail_use_threads'       => array(false),
 				'allow_draft_autosave'   => array(true),
-				'mail_reply_same_folder' => array(false)
+				'mail_reply_same_folder' => array(false),
+				'msg_default_action'     => array(1, '1 - reply, 2 - reply all'),
+                'collapse_blockquotes'   => array(true),
+                'allow_spellcheck'       => array(false)
 			),
 
 			'logs' => array(
 
 				'enable' => array(false, 'Enable logging'),
 
+				'path' => array('', 'Path where log files will be stored'),
+
 				'level' => array(4, 'Log messages of set RFC 5424 section 6.2.1 Severity level and higher (0 = highest, 7 = lowest).
 0 = Emergency
 1 = Alert
@@ -259,15 +355,10 @@ Values:
 6 = Informational
 7 = Debug'),
 
-				'write_on_error_only' => array(false, 'Logs entire request only if error occured (php required)'),
-				'write_on_php_error_only' => array(false, 'Logs entire request only if php error occured'),
-				'write_on_timeout_only' => array(0, 'Logs entire request only if request timeout (in seconds) occured.'),
-
 				'hide_passwords' => array(true, 'Required for development purposes only.
 Disabling this option is not recommended.'),
 
 				'time_zone' => array('UTC'),
-				'session_filter' => array(''),
 
 				'filename' => array('log-{date:Y-m-d}.txt',
 					'Log filename.
@@ -296,16 +387,23 @@ 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 = "syslog"
+  filename = "stderr"'),
 
 				'auth_logging' => array(false, 'Enable auth logging in a separate file (for fail2ban)'),
 				'auth_logging_filename' => array('fail2ban/auth-{date:Y-m-d}.txt'),
 				'auth_logging_format' => array('[{date:Y-m-d H:i:s}] Auth failed: ip={request:ip} user={imap:login} host={imap:host} port={imap:port}'),
-				'auth_syslog' => array(false, 'Enable auth logging to syslog for fail2ban')
+				'auth_syslog' => array(false, 'Enable auth logging to syslog for fail2ban'),
+
+				'json_response_write_limit' => array(300),
 			),
 
 			'debug' => array(
-				'enable' => array(false, 'Special option required for development purposes')
+				'enable' => array(false, 'Special option required for development purposes'),
+				// use_app_debug_js
+				'javascript' => array(false),
+				// use_app_debug_css
+				'css' => array(false)
 			),
 
 			'cache' => array(
@@ -314,81 +412,47 @@ Examples:
 
 Enables caching in the system'),
 
+				'path' => array('', 'Path where cache files will be stored'),
+
 				'index' => array('v1', 'Additional caching key. If changed, cache is purged'),
 
-				'fast_cache_driver' => array('files', 'Can be: files, APCU, memcache, redis (beta)'),
 				'fast_cache_index' => array('v1', 'Additional caching key. If changed, fast cache is purged'),
 
 				'http' => array(true, 'Browser-level cache. If enabled, caching is maintainted without using files'),
 				'http_expires' => array(3600, 'Browser-level cache time (seconds, Expires header)'),
 
-				'server_uids' => array(true, 'Caching message UIDs when searching and sorting (threading)')
+				'server_uids' => array(true, 'Caching message UIDs when searching and sorting (threading)'),
+
+				'system_data' => array(true)
+			),
+
+			'imap' => array(
+				'use_force_selection' => array(false),
+				'use_expunge_all_on_delete' => array(false),
+				'message_list_fast_simple_search' => array(true),
+				'message_list_permanent_filter' => array(''),
+				'message_all_headers' => array(false),
+				'show_login_alert' => array(true),
+				'fetch_new_messages' => array(true),
 			),
 
 			'labs' => array(
-				'allow_prefetch' => array(false),
-				'cache_system_data' => array(true),
-				'date_from_headers' => array(true),
-				'autocreate_system_folders' => array(false),
-				'allow_message_append' => array(false),
-				'login_fault_delay' => array(1),
-				'log_ajax_response_write_limit' => array(300),
-				'allow_html_editor_biti_buttons' => array(false),
-				'allow_ctrl_enter_on_compose' => array(true),
-				'try_to_detect_hidden_images' => array(false),
-				'use_app_debug_js' => array(false),
-				'use_mobile_version_for_tablets' => array(false),
-				'use_app_debug_css' => array(false),
-				'use_imap_sort' => array(true),
-				'use_imap_force_selection' => array(false),
-				'use_imap_thread' => array(true),
-				'use_imap_move' => array(false),
-				'use_imap_expunge_all_on_delete' => array(false),
-				'imap_forwarded_flag' => array('$Forwarded'),
-				'imap_read_receipt_flag' => array('$ReadReceipt'),
-				'imap_body_text_limit' => array(555000),
-				'imap_message_list_fast_simple_search' => array(true),
-				'imap_message_list_count_limit_trigger' => array(0),
-				'imap_message_list_date_filter' => array(0),
-				'imap_message_list_permanent_filter' => array(''),
-				'imap_message_all_headers' => array(false),
-				'imap_large_thread_limit' => array(50),
-				'imap_folder_list_limit' => array(200),
-				'imap_show_login_alert' => array(true),
-				'imap_use_list_status' => array(true),
-				'imap_timeout' => array(300),
+				'allow_message_append' => array(false, 'Allow drag & drop .eml files from system into messages list'),
 				'smtp_show_server_errors' => array(false),
-				'smtp_timeout' => array(60),
-				'sieve_auth_plain_initial' => array(true),
-				'sieve_allow_fileinto_inbox' => array(false),
-				'sieve_timeout' => array(10),
-				'sasl_allow_plain' => array(true),
-				'sasl_allow_scram_sha' => array(false),
-				'sasl_allow_cram_md5' => array(false),
-				'mail_func_clear_headers' => array(true),
-				'mail_func_additional_parameters' => array(false),
-				'favicon_status' => array(true),
+				'mail_func_clear_headers' => array(true, 'PHP mail() remove To and Subject headers'),
+				'mail_func_additional_parameters' => array(false, 'PHP mail() set -f emailaddress'),
 				'folders_spec_limit' => array(50),
 				'curl_proxy' => array(''),
 				'curl_proxy_auth' => array(''),
-				'in_iframe' => array(false),
-				'force_https' => array(false),
 				'custom_login_link' => array(''),
 				'custom_logout_link' => array(''),
-				'allow_external_login' => array(false),
 				'http_client_ip_check_proxy' => array(false),
-				'fast_cache_memcache_host' => array('127.0.0.1'),
-				'fast_cache_memcache_port' => array(11211),
-				'fast_cache_redis_host' => array('127.0.0.1'),
-				'fast_cache_redis_port' => array(6379),
 				'use_local_proxy_for_external_images' => array(true),
 				'image_exif_auto_rotate' => array(false),
 				'cookie_default_path' => array(''),
 				'cookie_default_secure' => array(false),
-				'check_new_messages' => array(true),
 				'replace_env_in_configuration' => array(''),
 				'boundary_prefix' => array(''),
-				'kolab_enabled' => array(false),
 				'dev_email' => array(''),
 				'dev_password' => array('')
 			),
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
index d848e333b..67f87f841 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Config/Plugin.php
@@ -4,20 +4,19 @@ namespace RainLoop\Config;
 
 class Plugin extends \RainLoop\Config\AbstractConfig
 {
-	/**
-	 * @var array
-	 */
-	private $aMap = array();
+	private array $aMap = array();
 
 	public function __construct(string $sPluginName, array $aMap = array())
 	{
 		if (\count($aMap)) {
 			$aResultMap = array();
-			foreach ($aMap as /* @var $oProperty \RainLoop\Plugins\Property */ $oProperty) {
-				if ($oProperty) {
-					$mValue = $oProperty->DefaultValue();
-					$sValue = \is_array($mValue) && isset($mValue[0]) ? $mValue[0] : $mValue;
-					$aResultMap[$oProperty->Name()] = array($sValue, '');
+			foreach ($aMap as $oProperty) {
+				if ($oProperty instanceof \RainLoop\Plugins\Property) {
+					$mDefaultValue = $oProperty->DefaultValue();
+					$aResultMap[$oProperty->Name()] = array(
+						\is_array($mDefaultValue) ? '' : $mDefaultValue,
+						''
+					);
 				}
 			}
 
@@ -28,11 +27,27 @@ class Plugin extends \RainLoop\Config\AbstractConfig
 			}
 		}
 
-		parent::__construct('plugin-'.$sPluginName.'.ini', '; SnappyMail plugin ('.$sPluginName.')');
+//		parent::__construct('plugin-'.$sPluginName.'.ini', '; SnappyMail plugin ('.$sPluginName.')');
+		parent::__construct('plugin-'.$sPluginName.'.json');
 	}
 
-	protected function defaultValues() : array
+	protected function defaultValues(): array
 	{
 		return $this->aMap;
 	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$aData = [];
+		foreach (parent::jsonSerialize() as $sSectionKey => $aSectionValue) {
+			if (\is_array($aSectionValue)) {
+				$aData[$sSectionKey] = [];
+				foreach ($aSectionValue as $sParamKey => $mParamValue) {
+					$aData[$sSectionKey][$sParamKey] = $mParamValue[0];
+				}
+			}
+		}
+		return $aData;
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
index 57f8712a3..5637e9738 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Capa.php
@@ -2,24 +2,17 @@
 
 namespace RainLoop\Enumerations;
 
-class Capa
+abstract class Capa
 {
+	const ADDITIONAL_ACCOUNTS = 'AdditionalAccounts';
+	const ATTACHMENTS_ACTIONS = 'AttachmentsActions';
+	const ATTACHMENT_THUMBNAILS = 'AttachmentThumbnails';
+	const CONTACTS = 'Contacts';
+	const DANGEROUS_ACTIONS = 'DangerousActions';
 	const GNUPG = 'GnuPG';
-	const OPEN_PGP = 'OpenPGP';
-	const PREFETCH = 'Prefetch';
+	const IDENTITIES = 'Identities';
+	const OPENPGP = 'OpenPGP';
+	const SIEVE = 'Sieve';
 	const THEMES = 'Themes';
 	const USER_BACKGROUND = 'UserBackground';
-	const SIEVE = 'Sieve';
-	const ATTACHMENT_THUMBNAILS = 'AttachmentThumbnails';
-	const ADDITIONAL_ACCOUNTS = 'AdditionalAccounts';
-	const IDENTITIES = 'Identities';
-	const CONTACTS = 'Contacts';
-	const SEARCH = 'Search';
-	const SEARCH_ADV = 'SearchAdv';
-	const QUOTA = 'Quota';
-	const MESSAGE_ACTIONS = 'MessageActions';
-	const ATTACHMENTS_ACTIONS = 'AttachmentsActions';
-	const DANGEROUS_ACTIONS = 'DangerousActions';
-	const AUTOLOGOUT = 'AutoLogout';
-	const KOLAB = 'Kolab';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Layout.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Layout.php
index 32af1fe45..0fe236ae7 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Layout.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/Layout.php
@@ -2,7 +2,7 @@
 
 namespace RainLoop\Enumerations;
 
-class Layout
+abstract class Layout
 {
 	const NO_PREVIEW = 0;
 	const SIDE_PREVIEW = 1;
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/PluginPropertyType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
index 6b18a05f9..32b6cc8d5 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/PluginPropertyType.php
@@ -2,7 +2,7 @@
 
 namespace RainLoop\Enumerations;
 
-class PluginPropertyType
+abstract class PluginPropertyType
 {
 	const
 		GROUP = 7,
@@ -12,5 +12,6 @@ class PluginPropertyType
 		PASSWORD = 3,
 		SELECTION = 4,
 		BOOL = 5,
-		URL = 6;
+		URL = 6,
+		SELECT = 8;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
index aca8eb5db..bb50c4345 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/SignMeType.php
@@ -2,9 +2,9 @@
 
 namespace RainLoop\Enumerations;
 
-class SignMeType
+abstract class SignMeType
 {
-	const DEFAULT_OFF = 'DefaultOff';
-	const DEFAULT_ON = 'DefaultOn';
-	const UNUSED = 'Unused';
+	const DefaultOff = 'DefaultOff';
+	const DefaultOn = 'DefaultOn';
+	const Unused = 'Unused';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/TimeFormat.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/TimeFormat.php
deleted file mode 100644
index 0dc07e2c6..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/TimeFormat.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace RainLoop\Enumerations;
-
-class TimeFormat
-{
-	const F12 = '12';
-	const F24 = '24';
-}
\ No newline at end of file
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
index eb7160c36..c31dd8f45 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Enumerations/UploadError.php
@@ -4,27 +4,62 @@ namespace RainLoop\Enumerations;
 
 abstract class UploadError
 {
-	// UPLOAD_ERR_OK; There is no error, the file uploaded with success.
-	const NORMAL = 0;
-	// UPLOAD_ERR_INI_SIZE; The uploaded file exceeds the upload_max_filesize directive in php.ini.
-	const FILE_IS_TOO_BIG = 1;
-	// UPLOAD_ERR_FORM_SIZE; The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.
-//	const FORM_SIZE = 2;
-	// UPLOAD_ERR_PARTIAL; The uploaded file was only partially uploaded.
-	const FILE_PARTIALLY_UPLOADED = 3;
-	// UPLOAD_ERR_NO_FILE; No file was uploaded.
-	const FILE_NO_UPLOADED = 4;
-	// UPLOAD_ERR_NO_TMP_DIR; Missing a temporary folder.
-	const MISSING_TEMP_FOLDER = 6;
-	// UPLOAD_ERR_CANT_WRITE; Failed to write file to disk.
-	const FILE_ON_SAVING_ERROR = 7;
-	// UPLOAD_ERR_EXTENSION; A PHP extension stopped the file upload
-//	const EXTENSION = 8;
-
 	const FILE_TYPE = 98;
 	const UNKNOWN = 99;
 
 	const CONFIG_SIZE = 1001;
 	const ON_SAVING = 1002;
-	const EMPTY_FILES_DATA = 1003;
+	const EMPTY_FILE = 1003;
+
+	private static $messages = [
+		/*1*/\UPLOAD_ERR_INI_SIZE   => 'Filesize exceeds the upload_max_filesize directive in php.ini',
+		/*2*/\UPLOAD_ERR_FORM_SIZE  => 'Filesize exceeds the MAX_FILE_SIZE directive that was specified in the html form',
+		/*3*/\UPLOAD_ERR_PARTIAL    => 'File was only partially uploaded',
+		/*4*/\UPLOAD_ERR_NO_FILE    => 'No file was uploaded',
+		/*6*/\UPLOAD_ERR_NO_TMP_DIR => 'Missing a temporary folder',
+		/*7*/\UPLOAD_ERR_CANT_WRITE => 'Failed to write file to disk',
+		/*8*/\UPLOAD_ERR_EXTENSION  => 'File upload stopped by extension',
+		98   => 'Invalid file type',
+		99   => 'Unknown error',
+		1001 => 'Filesize exceeds the config setting',
+		1002 => 'Error saving file',
+		1003 => 'File is empty'
+	];
+
+	public static function getMessage(int $code): string
+	{
+		return isset(static::$messages[$code]) ? static::$messages[$code] : '';
+	}
+
+	public static function getUserMessage(int $iError, int &$iClientError): string
+	{
+		$iClientError = $iError;
+		switch ($iError) {
+			case \UPLOAD_ERR_OK:
+			case \UPLOAD_ERR_PARTIAL:
+			case \UPLOAD_ERR_NO_FILE:
+			case static::FILE_TYPE:
+			case static::EMPTY_FILE:
+				break;
+
+			case \UPLOAD_ERR_INI_SIZE:
+			case \UPLOAD_ERR_FORM_SIZE:
+			case static::CONFIG_SIZE:
+				return 'File is too big';
+
+			case \UPLOAD_ERR_NO_TMP_DIR:
+			case \UPLOAD_ERR_CANT_WRITE:
+			case \UPLOAD_ERR_EXTENSION:
+			case static::ON_SAVING:
+				$iClientError = static::ON_SAVING;
+				break;
+
+			default:
+				$iClientError = static::UNKNOWN;
+				break;
+		}
+
+		return static::getMessage($iClientError);
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
index 4ea81ca7b..6d7d824af 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/ClientException.php
@@ -6,7 +6,7 @@ namespace RainLoop\Exceptions;
  * @category RainLoop
  * @package Exceptions
  */
-class ClientException extends Exception
+class ClientException extends \RuntimeException
 {
 	/**
 	 * @var string
@@ -15,9 +15,11 @@ class ClientException extends Exception
 
 	public function __construct(int $iCode, ?\Throwable $oPrevious = null, string $sAdditionalMessage = '')
 	{
-		parent::__construct(\RainLoop\Notifications::GetNotificationsMessage($iCode, $oPrevious),
-			$iCode, $oPrevious);
-
+		parent::__construct(
+			\RainLoop\Notifications::GetNotificationsMessage($iCode, $oPrevious),
+			$iCode,
+			$oPrevious
+		);
 		$this->sAdditionalMessage = $sAdditionalMessage ?: ($oPrevious ? $oPrevious->getMessage() : '');
 	}
 
@@ -25,4 +27,13 @@ class ClientException extends Exception
 	{
 		return $this->sAdditionalMessage;
 	}
+
+	public function __toString() : string
+	{
+		$message = $this->getMessage();
+		if ($this->sAdditionalMessage) {
+			$message .= " ({$this->sAdditionalMessage})";
+		}
+		return "{$message}\r\n{$this->getFile()}#{$this->getLine()}\r\n{$this->getTraceAsString()}";
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/Exception.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/Exception.php
deleted file mode 100644
index c5a36e22e..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Exceptions/Exception.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-namespace RainLoop\Exceptions;
-
-class Exception extends \Exception {}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
index cd341aa10..db07fc51e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/KeyPathHelper.php
@@ -4,22 +4,11 @@ namespace RainLoop;
 
 class KeyPathHelper
 {
-
-	static public function PublicFile(string $sHash) : string
-	{
-		return '/Public/Files/'.\sha1($sHash).'/Data/';
-	}
-
 	static public function SsoCacherKey(string $sSsoHash) : string
 	{
 		return '/Sso/Data/'.$sSsoHash.'/Login/';
 	}
 
-	static public function RepositoryCacheFile(string $sRepo, string $sRepoFile) : string
-	{
-		return '/RepositoryCache/Repo/'.$sRepo.'/File/'.$sRepoFile;
-	}
-
 	static public function ReadReceiptCache(string $sEmail, string $sFolderFullName, int $iUid) : string
 	{
 		return '/ReadReceipt/'.$sEmail.'/'.$sFolderFullName.'/'.$iUid;
@@ -30,21 +19,11 @@ class KeyPathHelper
 		return '/LangCache/'.$sPluginsHash.'/'.$sLanguage.'/'.($bAdmim ? 'Admin' : 'App').'/'.APP_VERSION.'/';
 	}
 
-	static public function TemplatesCache(bool $bAdmin, string $sPluginsHash) : string
-	{
-		return '/TemplatesCache/'.$sPluginsHash.'/'.($bAdmin ? 'Admin' : 'App').'/'.APP_VERSION.'/';
-	}
-
 	static public function PluginsJsCache(string $sPluginsHash) : string
 	{
 		return '/PluginsJsCache/'.$sPluginsHash.'/'.APP_VERSION.'/';
 	}
 
-	static public function CssCache(string $sTheme, string $sHash) : string
-	{
-		return '/CssCache/'.$sHash.'/'.$sTheme.'/'.APP_VERSION.'/';
-	}
-
 	static public function SessionAdminKey(string $sRand) : string
 	{
 		return '/Session/AdminKey/'.\md5($sRand).'/';
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
index d4ffc9347..792cf6030 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Account.php
@@ -5,175 +5,136 @@ namespace RainLoop\Model;
 use RainLoop\Utils;
 use RainLoop\Notifications;
 use RainLoop\Exceptions\ClientException;
+use SnappyMail\SensitiveString;
 
 abstract class Account implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sEmail;
+	private string $sName = '';
 
-	/**
-	 * @var string
-	 */
-	private $sLogin;
+	private string $sEmail = '';
 
-	/**
-	 * @var string
-	 */
-	private $sPassword;
+	private string $sImapUser = '';
 
-	/**
-	 * @var string
-	 */
-	private $sProxyAuthUser = '';
+	private ?SensitiveString $oImapPass = null;
 
-	/**
-	 * @var string
-	 */
-	private $sProxyAuthPassword = '';
+	private string $sSmtpUser = '';
 
-	/**
-	 * @var string
-	 */
-	private $sClientCert;
+	private ?SensitiveString $oSmtpPass = null;
 
-	/**
-	 * @var \RainLoop\Model\Domain
-	 */
-	private $oDomain;
+	private ?Domain $oDomain = null;
 
-	public function Email() : string
+	public function Email(): string
 	{
 		return $this->sEmail;
 	}
 
-	public function ProxyAuthUser() : string
+	public function Name(): string
 	{
-		return $this->sProxyAuthUser;
+		return $this->sName;
 	}
 
-	public function ProxyAuthPassword() : string
+	public function ImapUser(): string
 	{
-		return $this->sProxyAuthPassword;
+		return $this->sImapUser;
 	}
 
-	public function IncLogin() : string
+	public function ImapPass(): string
 	{
-		$sLogin = $this->sLogin;
-		if ($this->oDomain->IncShortLogin())
-		{
-			$sLogin = \MailSo\Base\Utils::GetAccountNameFromEmail($this->sLogin);
-		}
-
-		return $sLogin;
+		return $this->oImapPass ? $this->oImapPass->getValue() : '';
 	}
 
-	public function IncPassword() : string
+	public function SmtpUser(): string
 	{
-		return $this->sPassword;
+		return $this->sSmtpUser ?: ($this->oDomain ? $this->oDomain->SmtpSettings()->fixUsername($this->sEmail) : '');
+//		return $this->sSmtpUser ?: $this->sEmail ?: $this->sImapUser;
 	}
 
-	public function OutLogin() : string
-	{
-		$sLogin = $this->sLogin;
-		if ($this->oDomain->OutShortLogin())
-		{
-			$sLogin = \MailSo\Base\Utils::GetAccountNameFromEmail($this->sLogin);
-		}
-
-		return $sLogin;
-	}
-
-	public function Login() : string
-	{
-		return $this->IncLogin();
-	}
-
-	public function Password() : string
-	{
-		return $this->IncPassword();
-	}
-
-	public function ClientCert() : string
-	{
-		return $this->sClientCert;
-	}
-
-	public function Domain() : Domain
+	public function Domain(): ?Domain
 	{
 		return $this->oDomain;
 	}
 
-	public function Hash() : string
+	public function Hash(): string
 	{
 		return \sha1(\implode(APP_SALT, [
 			$this->sEmail,
-			$this->Domain()->IncHost(),
-			$this->Domain()->IncPort(),
-			$this->sPassword
+			$this->sImapUser,
+//			\json_encode($this->Domain()),
+//			$this->oImapPass
 		]));
 	}
 
-	public function SetPassword(string $sPassword) : void
+	public function setImapUser(string $sImapUser): void
 	{
-		$this->sPassword = $sPassword;
+		$this->sImapUser = $sImapUser;
 	}
 
-	public function SetProxyAuthUser(string $sProxyAuthUser) : void
+	public function setImapPass(SensitiveString $oPassword): void
 	{
-		$this->sProxyAuthUser = $sProxyAuthUser;
+		$this->oImapPass = $oPassword;
 	}
 
-	public function SetProxyAuthPassword(string $sProxyAuthPassword) : void
+	public function setSmtpUser(string $sSmtpUser): void
 	{
-		$this->sProxyAuthPassword = $sProxyAuthPassword;
+		$this->sSmtpUser = $sSmtpUser;
 	}
 
-	public function jsonSerialize()
+	public function setSmtpPass(SensitiveString $oPassword): void
 	{
-		return array(
-			'account',                // 0
-			$this->sEmail,            // 1
-			$this->sLogin,            // 2
-			$this->sPassword,         // 3
-			$this->sClientCert,       // 4
-			$this->sProxyAuthUser,    // 5
-			$this->sProxyAuthPassword // 6
-		);
+		$this->oSmtpPass = $oPassword;
 	}
 
-	public static function NewInstanceFromCredentials(\RainLoop\Actions $oActions,
-		string $sEmail, string $sLogin, string $sPassword, string $sClientCert = '',
-		bool $bThrowException = false): ?self
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		$oAccount = null;
-		if ($sEmail && $sLogin && $sPassword) {
-			$oDomain = $oActions->DomainProvider()->Load(\MailSo\Base\Utils::GetDomainFromEmail($sEmail), true);
-			if ($oDomain) {
-				if ($oDomain->ValidateWhiteList($sEmail, $sLogin)) {
-					$oAccount = new static;
-
-					$oAccount->sEmail = \MailSo\Base\Utils::IdnToAscii($sEmail, true);
-					$oAccount->sLogin = \MailSo\Base\Utils::IdnToAscii($sLogin);
-					$oAccount->sPassword = $sPassword;
-					$oAccount->oDomain = $oDomain;
-					$oAccount->sClientCert = $sClientCert;
-
-					$oActions->Plugins()->RunHook('filter.account', array($oAccount));
-
-					if ($bThrowException && !$oAccount) {
-						throw new ClientException(Notifications::AccountFilterError);
-					}
-				} else if ($bThrowException) {
-					throw new ClientException(Notifications::AccountNotAllowed);
-				}
-			} else if ($bThrowException) {
-				throw new ClientException(Notifications::DomainNotAllowed);
-			}
+		$result = [
+			'email' => $this->sEmail,
+			'login' => $this->sImapUser,
+			'pass'  => $this->ImapPass(),
+			'name' => $this->sName,
+			'smtp' => []
+		];
+		if ($this->sSmtpUser) {
+			$result['smtp']['user'] = $this->sSmtpUser;
 		}
+		if ($this->oSmtpPass) {
+			$result['smtp']['pass'] = $this->oSmtpPass->getValue();
+		}
+		return $result;
+	}
 
-		return $oAccount;
+	public function setCredentials(
+		Domain $oDomain,
+		string $sEmail,
+		string $sImapUser,
+		SensitiveString $oImapPass,
+		string $sSmtpUser = '',
+		?SensitiveString $oSmtpPass = null
+	) {
+		$this->sEmail = $sEmail;
+		$this->oDomain = $oDomain;
+		$this->sImapUser = $sImapUser;
+		$this->oImapPass = $oImapPass;
+		$this->sSmtpUser = $sSmtpUser;
+		$this->oSmtpPass = $oSmtpPass;
+	}
+
+	/**
+	 * Converts old numeric array to new associative array
+	 */
+	public static function convertArray(array $aAccount): array
+	{
+		if (isset($aAccount['email'])) {
+			return $aAccount;
+		}
+		if (empty($aAccount[0]) || 'account' != $aAccount[0] || 7 > \count($aAccount)) {
+			return [];
+		}
+		return [
+			'email' => $aAccount[1] ?: '',
+			'login' => $aAccount[2] ?: '',
+			'pass'  => $aAccount[3] ?: ''
+		];
 	}
 
 	public static function NewInstanceFromTokenArray(
@@ -181,109 +142,122 @@ abstract class Account implements \JsonSerializable
 		array $aAccountHash,
 		bool $bThrowExceptionOnFalse = false): ?self
 	{
-		if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 <= \count($aAccountHash)) {
-			$oAccount = static::NewInstanceFromCredentials(
-				$oActions,
-				$aAccountHash[1] ?: '',
-				$aAccountHash[2] ?: '',
-				$aAccountHash[3] ?: '',
-				$aAccountHash[4] ?: '',
-				$bThrowExceptionOnFalse
-			);
-
-			if ($oAccount) {
-				// init proxy user/password
-				if (!empty($aAccountHash[5]) && !empty($aAccountHash[6])) {
-					$oAccount->SetProxyAuthUser($aAccountHash[5]);
-					$oAccount->SetProxyAuthPassword($aAccountHash[6]);
+		$oAccount = null;
+		$aAccountHash = static::convertArray($aAccountHash);
+		try {
+/*
+			if (empty($aAccountHash['email'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing email');
+			}
+			if (empty($aAccountHash['login'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing login');
+			}
+			if (empty($aAccountHash['pass'])) {
+				throw new ClientException(Notifications::InvalidToken, null, 'TokenArray missing pass');
+			}
+*/
+			if (empty($aAccountHash['email']) || empty($aAccountHash['login']) || empty($aAccountHash['pass'])) {
+				throw new \RuntimeException("Invalid TokenArray");
+			}
+			$oDomain = $oActions->DomainProvider()->getByEmailAddress($aAccountHash['email']);
+			if ($oDomain) {
+//				$aAccountHash['email'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['email'], false);
+//				$aAccountHash['login'] = $oDomain->ImapSettings()->fixUsername($aAccountHash['login']);
+				$oAccount = new static;
+				$oAccount->sEmail = \SnappyMail\IDN::emailToAscii($aAccountHash['email']);
+//				$oAccount->sImapUser = \SnappyMail\IDN::emailToAscii($aAccountHash['login']);
+				$oAccount->sImapUser = $aAccountHash['login'];
+				$oAccount->setImapPass(new SensitiveString($aAccountHash['pass']));
+				$oAccount->oDomain = $oDomain;
+				$oActions->Plugins()->RunHook('filter.account', array($oAccount));
+				if (!$oAccount) {
+					throw new ClientException(Notifications::AccountFilterError);
 				}
-
-				$oActions->Logger()->AddSecret($oAccount->Password());
-				$oActions->Logger()->AddSecret($oAccount->ProxyAuthPassword());
-
-				return $oAccount;
+				if (isset($aAccountHash['name'])) {
+					$oAccount->sName = $aAccountHash['name'];
+				}
+				// init smtp user/password
+				if (isset($aAccountHash['smtp']['user'])) {
+					$oAccount->sSmtpUser = $aAccountHash['smtp']['user'];
+				}
+				if (isset($aAccountHash['smtp']['pass'])) {
+					$oAccount->setSmtpPass(new SensitiveString($aAccountHash['smtp']['pass']));
+				}
+			}
+		} catch (\Throwable $e) {
+			\SnappyMail\Log::debug('ACCOUNT', $e->getMessage());
+			if ($bThrowExceptionOnFalse) {
+				throw $e;
 			}
 		}
-		return null;
+		return $oAccount;
 	}
 
-	public function IncConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Mail\MailClient $oMailClient, \RainLoop\Config\Application $oConfig) : bool
+	public function ImapConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Imap\ImapClient $oImapClient, \RainLoop\Config\Application $oConfig): bool
 	{
-		$oImapClient = $oMailClient->ImapClient();
+		$oSettings = $this->Domain()->ImapSettings();
+		$oSettings->timeout = \max($oSettings->timeout, (int) $oConfig->Get('imap', 'timeout', $oSettings->timeout));
+		$oSettings->username = $this->ImapUser();
 
-		$aImapCredentials = \array_merge(
-			$this->Domain()->ImapSettings(),
-			array(
-				'Login' => $this->IncLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'ClientCert' => $this->ClientCert(),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true)
-			)
-		);
+		$oSettings->expunge_all_on_delete |= !!$oConfig->Get('imap', 'use_expunge_all_on_delete', false);
+		$oSettings->fast_simple_search = !(!$oSettings->fast_simple_search || !$oConfig->Get('imap', 'message_list_fast_simple_search', true));
+		$oSettings->fetch_new_messages = !(!$oSettings->fetch_new_messages || !$oConfig->Get('imap', 'fetch_new_messages', true));
+		$oSettings->force_select |= !!$oConfig->Get('imap', 'use_force_selection', false);
+		$oSettings->message_all_headers |= !!$oConfig->Get('imap', 'message_all_headers', false);
+		$oSettings->search_filter = $oSettings->search_filter ?: \trim($oConfig->Get('imap', 'message_list_permanent_filter', ''));
+//		$oSettings->body_text_limit = \min($oSettings->body_text_limit, (int) $oConfig->Get('imap', 'body_text_limit', 50));
+//		$oSettings->thread_limit = \min($oSettings->thread_limit, (int) $oConfig->Get('imap', 'large_thread_limit', 50));
 
-		$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, &$aImapCredentials));
-		if ($aImapCredentials['UseConnect']) {
-			$oImapClient->Connect($aImapCredentials['Host'], $aImapCredentials['Port'],
-					$aImapCredentials['Secure'], $aImapCredentials['VerifySsl'],
-					$aImapCredentials['AllowSelfSigned'], $aImapCredentials['ClientCert']);
+		$oImapClient->Settings = $oSettings;
 
-		}
-		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $aImapCredentials));
+		$oPlugins->RunHook('imap.before-connect', array($this, $oImapClient, $oSettings));
+		$oImapClient->Connect($oSettings);
+		$oPlugins->RunHook('imap.after-connect', array($this, $oImapClient, $oSettings));
 
-		return $this->netClientLogin($oImapClient, $oConfig, $oPlugins, $aImapCredentials);
+		$oSettings->passphrase = $this->oImapPass;
+		return $this->netClientLogin($oImapClient, $oPlugins);
 	}
 
-	public function OutConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient, \RainLoop\Config\Application $oConfig, bool &$bUsePhpMail = false) : bool
+	public function SmtpConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Smtp\SmtpClient $oSmtpClient): bool
 	{
-		$aSmtpCredentials = \array_merge(
-			$this->Domain()->SmtpSettings(),
-			array(
-				'UseConnect' => !$bUsePhpMail,
-				'UsePhpMail' => $bUsePhpMail,
-				'Login' => $this->OutLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true)
-			)
-		);
+		$oSettings = $this->Domain()->SmtpSettings();
+		$oSettings->username = $this->SmtpUser();
+		$oSettings->Ehlo = \MailSo\Smtp\SmtpClient::EhloHelper();
 
-		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, &$aSmtpCredentials));
-		$bUsePhpMail = $aSmtpCredentials['UsePhpMail'];
-		$aSmtpCredentials['UseAuth'] = $aSmtpCredentials['UseAuth'] && !$aSmtpCredentials['UsePhpMail'];
-		if ($aSmtpCredentials['UseConnect'] && !$aSmtpCredentials['UsePhpMail']) {
-			$oSmtpClient->Connect($aSmtpCredentials['Host'], $aSmtpCredentials['Port'],
-				$aSmtpCredentials['Secure'], $aSmtpCredentials['VerifySsl'], $aSmtpCredentials['AllowSelfSigned'],
-				'', $aSmtpCredentials['Ehlo']
-			);
+		$oSmtpClient->Settings = $oSettings;
+
+		$oPlugins->RunHook('smtp.before-connect', array($this, $oSmtpClient, $oSettings));
+		if ($oSettings->usePhpMail) {
+			$oSettings->useAuth = false;
+			return true;
 		}
-		$oPlugins->RunHook('smtp.after-connect', array($this, $oSmtpClient, $aSmtpCredentials));
-
-		return $this->netClientLogin($oSmtpClient, $oConfig, $oPlugins, $aSmtpCredentials);
+		$oSmtpClient->Connect($oSettings);
+		$oPlugins->RunHook('smtp.after-connect', array($this, $oSmtpClient, $oSettings));
+/*
+		if ($this->oDomain->OutAskCredentials() && !($this->oSmtpPass && $this->sSmtpUser)) {
+			throw new RequireCredentialsException
+		}
+*/
+		$oSettings->passphrase = $this->oSmtpPass ?: $this->oImapPass;
+		return $this->netClientLogin($oSmtpClient, $oPlugins);
 	}
 
-	public function SieveConnectAndLoginHelper(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\ManageSieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
+	public function SieveConnectAndLogin(\RainLoop\Plugins\Manager $oPlugins, \MailSo\Sieve\SieveClient $oSieveClient, \RainLoop\Config\Application $oConfig)
 	{
-		$aSieveCredentials = \array_merge(
-			$this->Domain()->SieveSettings(),
-			array(
-				'Login' => $this->IncLogin(),
-				'VerifySsl' => !!$oConfig->Get('ssl', 'verify_certificate', false),
-				'AllowSelfSigned' => !!$oConfig->Get('ssl', 'allow_self_signed', true),
-				'InitialAuthPlain' => !!$oConfig->Get('ssl', 'sieve_auth_plain_initial', true)
-			)
-		);
+		$oSettings = $this->Domain()->SieveSettings();
+		$oSettings->username = $this->ImapUser();
 
-		$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, &$aSieveCredentials));
-		if ($aSieveCredentials['UseConnect']) {
-			$oSieveClient->Connect($aSieveCredentials['Host'], $aSieveCredentials['Port'],
-				$aSieveCredentials['Secure'], $aSieveCredentials['VerifySsl'], $aSieveCredentials['AllowSelfSigned']
-			);
-		}
-		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $aSieveCredentials));
+		$oSieveClient->Settings = $oSettings;
 
-		return $this->netClientLogin($oSieveClient, $oConfig, $oPlugins, $aSieveCredentials);
+		$oPlugins->RunHook('sieve.before-connect', array($this, $oSieveClient, $oSettings));
+		$oSieveClient->Connect($oSettings);
+		$oPlugins->RunHook('sieve.after-connect', array($this, $oSieveClient, $oSettings));
+
+		$oSettings->passphrase = $this->oImapPass;
+		return $this->netClientLogin($oSieveClient, $oPlugins);
 	}
 
-	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Config\Application $oConfig, \RainLoop\Plugins\Manager $oPlugins, array $aCredentials) : bool
+	private function netClientLogin(\MailSo\Net\NetClient $oClient, \RainLoop\Plugins\Manager $oPlugins): bool
 	{
 /*
 		$encrypted = !empty(\stream_get_meta_data($oClient->ConnectionResource())['crypto']);
@@ -294,36 +268,41 @@ abstract class Account implements \JsonSerializable
 			[cipher_version] => TLSv1.3
 		)
 */
-		/**
-		 * TODO: move these to Admin -> Domains -> per Domain management?
-		 */
-		$aSASLMechanisms = [];
-		if ($oConfig->Get('labs', 'sasl_allow_scram_sha', false)) {
-			// https://github.com/the-djmaze/snappymail/issues/182
-			\array_push($aSASLMechanisms, 'SCRAM-SHA3-512', 'SCRAM-SHA-512', 'SCRAM-SHA-256', 'SCRAM-SHA-1');
-		}
-		if ($oConfig->Get('labs', 'sasl_allow_cram_md5', false)) {
-			$aSASLMechanisms[] = 'CRAM-MD5';
-		}
-		if ($oConfig->Get('labs', 'sasl_allow_plain', true)) {
-			$aSASLMechanisms[] = 'PLAIN';
-		}
-		$aCredentials = \array_merge(
-			$aCredentials,
-			array(
-				'Password' => $this->Password(),
-				'ProxyAuthUser' => $this->ProxyAuthUser(),
-				'ProxyAuthPassword' => $this->ProxyAuthPassword(),
-				'SASLMechanisms' => $aSASLMechanisms
-			)
-		);
+		$oSettings = $oClient->Settings;
 
 		$client_name = \strtolower($oClient->getLogName());
 
-		$oPlugins->RunHook("{$client_name}.before-login", array($this, $oClient, &$aCredentials));
-		$bResult = $aCredentials['UseAuth'] && $oClient->Login($aCredentials);
-		$oPlugins->RunHook("{$client_name}.after-login", array($this, $oClient, $bResult, $aCredentials));
+		$oPlugins->RunHook("{$client_name}.before-login", array($this, $oClient, $oSettings));
+		$bResult = !$oSettings->useAuth || $oClient->Login($oSettings);
+		$oPlugins->RunHook("{$client_name}.after-login", array($this, $oClient, $bResult, $oSettings));
 		return $bResult;
 	}
 
+/*
+	// Stores settings in AdditionalAccount else MainAccount
+	public function settingsLocal(): \RainLoop\Settings
+	{
+		return \RainLoop\Api::Actions()->SettingsProvider(true)->Load($this);
+	}
+*/
+
+	/**
+	 * @deprecated since v2.36.1
+	 */
+	public function IncLogin(): string
+	{
+		return $this->ImapUser();
+	}
+	public function IncPassword(): string
+	{
+		return $this->ImapPass();
+	}
+	public function OutLogin(): string
+	{
+		return $this->SmtpUser();
+	}
+	public function SetPassword(SensitiveString $oPassword): void
+	{
+		$this->oImapPass = $oPassword;
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
index fb03624a5..6515025bc 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/AdditionalAccount.php
@@ -9,21 +9,33 @@ class AdditionalAccount extends Account
 {
 	public function ParentEmail() : string
 	{
-		return \trim(\MailSo\Base\Utils::IdnToAscii(\RainLoop\Api::Actions()->getMainAccountFromToken()->Email(), true));
+		return \SnappyMail\IDN::emailToAscii(\RainLoop\Api::Actions()->getMainAccountFromToken()->Email());
 	}
 
 	public function Hash() : string
 	{
-		return \md5(parent::Hash() . $this->ParentEmail());
+		return \sha1(parent::Hash() . $this->ParentEmail());
+	}
+
+	public static function convertArray(array $aAccount) : array
+	{
+		$aResult = parent::convertArray($aAccount);
+		$iCount = \count($aAccount);
+		if ($aResult && 7 < $iCount && 9 >= $iCount) {
+			$aResult['hmac'] = \array_pop($aAccount);
+		}
+		return $aResult;
 	}
 
 	public function asTokenArray(MainAccount $oMainAccount) : array
 	{
 		$sHash = $oMainAccount->CryptKey();
 		$aData = $this->jsonSerialize();
-		$aData[3] = \SnappyMail\Crypt::EncryptUrlSafe($aData[3], $sHash); // sPassword
-		$aData[6] = \SnappyMail\Crypt::EncryptUrlSafe($aData[6], $sHash); // sProxyAuthPassword
-		$aData[] = \hash_hmac('sha1', $aData[3], $sHash);
+		$aData['pass'] = \SnappyMail\Crypt::EncryptUrlSafe($aData['pass'], $sHash); // sPassword
+		if (!empty($aData['smtp']['pass'])) {
+			$aData['smtp']['pass'] = \SnappyMail\Crypt::EncryptUrlSafe($aData['smtp']['pass'], $sHash);
+		}
+		$aData['hmac'] = \hash_hmac('sha1', $aData['pass'], $sHash);
 		return $aData;
 	}
 
@@ -32,13 +44,23 @@ class AdditionalAccount extends Account
 		array $aAccountHash,
 		bool $bThrowExceptionOnFalse = false) : ?Account /* PHP7.4: ?self*/
 	{
-		$iCount = \count($aAccountHash);
-		if (!empty($aAccountHash[0]) && 'account' === $aAccountHash[0] && 7 <= $iCount && 9 >= $iCount) {
+		$aAccountHash = static::convertArray($aAccountHash);
+		if (!empty($aAccountHash['email'])) {
 			$sHash = $oActions->getMainAccountFromToken()->CryptKey();
-			$sPasswordHMAC = (7 < $iCount) ? \array_pop($aAccountHash) : null;
-			if ($sPasswordHMAC && $sPasswordHMAC === \hash_hmac('sha1', $aAccountHash[3], $sHash)) {
-				$aAccountHash[3] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[3], $sHash);
-				$aAccountHash[6] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash[6], $sHash);
+			// hmac only set when asTokenArray() was used
+			$sPasswordHMAC = $aAccountHash['hmac'] ?? null;
+			if ($sPasswordHMAC) {
+				if ($sPasswordHMAC === \hash_hmac('sha1', $aAccountHash['pass'], $sHash)) {
+					$aAccountHash['pass'] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash['pass'], $sHash);
+					if (!empty($aData['smtp']['pass'])) {
+						$aAccountHash['smtp']['pass'] = \SnappyMail\Crypt::DecryptUrlSafe($aAccountHash['smtp']['pass'], $sHash);
+					}
+				} else {
+					$aAccountHash['pass'] = '';
+					if (!empty($aData['smtp']['pass'])) {
+						$aAccountHash['smtp']['pass'] = '';
+					}
+				}
 			}
 			return parent::NewInstanceFromTokenArray($oActions, $aAccountHash, $bThrowExceptionOnFalse);
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
index 80b377ecc..c7c55a7d4 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Domain.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * Domain name is handled in lowercase punycode.
+ * Because internationalized domain names can have uppercase or titlecase characters.
+ */
 
 namespace RainLoop\Model;
 
@@ -6,422 +10,241 @@ use MailSo\Net\Enumerations\ConnectionSecurityType;
 
 class Domain implements \JsonSerializable
 {
-	const DEFAULT_FORWARDED_FLAG = '$Forwarded';
+	private string $Name;
 
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private \MailSo\Imap\Settings $IMAP;
 
-	/**
-	 * @var string
-	 */
-	private $sIncHost;
+	private \MailSo\Smtp\Settings $SMTP;
 
-	/**
-	 * @var int
-	 */
-	private $iIncPort;
+	private \MailSo\Sieve\Settings $Sieve;
 
-	/**
-	 * @var int
-	 */
-	private $iIncSecure;
+	private string $whiteList = '';
 
-	/**
-	 * @var bool
-	 */
-	private $bIncShortLogin;
-
-	/**
-	 * @var string
-	 */
-	private $sOutHost;
-
-	/**
-	 * @var int
-	 */
-	private $iOutPort;
-
-	/**
-	 * @var int
-	 */
-	private $iOutSecure;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutShortLogin;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutAuth;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutSetSender;
-
-	/**
-	 * @var bool
-	 */
-	private $bOutUsePhpMail;
-
-	/**
-	 * @var bool
-	 */
-	private $bUseSieve;
-
-	/**
-	 * @var string
-	 */
-	private $sSieveHost;
-
-	/**
-	 * @var int
-	 */
-	private $iSievePort;
-
-	/**
-	 * @var int
-	 */
-	private $iSieveSecure;
-
-	/**
-	 * @var string
-	 */
-	private $sWhiteList;
-
-	/**
-	 * @var string
-	 */
-	private $sAliasName = '';
+	private string $aliasName = '';
 
 	function __construct(string $sName)
 	{
-		$this->sName = $sName;
+//		$this->Name = \SnappyMail\IDN::toAscii($sName);
+		$this->Name = \strtolower(\idn_to_ascii($sName));
+		$this->IMAP = new \MailSo\Imap\Settings;
+		$this->SMTP = new \MailSo\Smtp\Settings;
+		$this->Sieve = new \MailSo\Sieve\Settings;
+	}
+
+	private function Normalize()
+	{
+		$this->IMAP->host = \trim($this->IMAP->host);
+		$this->Sieve->host = \trim($this->Sieve->host);
+		$this->SMTP->host = \trim($this->SMTP->host);
+		$this->whiteList = \trim($this->whiteList);
+	}
+
+	public function Name(): string
+	{
+		return $this->Name;
 	}
 
 	/**
-	 * See ToIniString() for valid values
+	 * @deprecated
 	 */
-	public static function NewInstanceFromDomainConfigArray(string $sName, array $aDomain) : ?self
+	public function IncHost(): string
 	{
-		$oDomain = null;
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->IMAP->host;
+	}
 
-		if (\strlen($sName) && \strlen($aDomain['imap_host']) && \strlen($aDomain['imap_port']))
-		{
-			$oDomain = new self($sName);
+	/**
+	 * @deprecated
+	 */
+	public function IncPort(): int
+	{
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->IMAP->port;
+	}
 
-			$oDomain->sIncHost = (string) $aDomain['imap_host'];
-			$oDomain->iIncPort = (int) $aDomain['imap_port'];
-			$oDomain->iIncSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['imap_secure']) ? '' : $aDomain['imap_secure']);
-			$oDomain->bIncShortLogin = !empty($aDomain['imap_short_login']);
+	/**
+	 * @deprecated
+	 */
+	public function IncShortLogin(): bool
+	{
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->IMAP->shortLogin;
+	}
 
-			$oDomain->bUseSieve = !empty($aDomain['sieve_use']);
-			$oDomain->sSieveHost = empty($aDomain['sieve_host']) ? '' : (string) $aDomain['sieve_host'];
-			$oDomain->iSievePort = empty($aDomain['sieve_port']) ? 4190 : (int) $aDomain['sieve_port'];
-			$oDomain->iSieveSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['sieve_secure']) ? '' : $aDomain['sieve_secure']);
+	/**
+	 * @deprecated
+	 */
+	public function UseSieve(): bool
+	{
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->Sieve->enabled;
+	}
 
-			$oDomain->sOutHost = empty($aDomain['smtp_host']) ? '' : (string) $aDomain['smtp_host'];
-			$oDomain->iOutPort = empty($aDomain['smtp_port']) ? 25 : (int) $aDomain['smtp_port'];
-			$oDomain->iOutSecure = self::StrConnectionSecurityTypeToCons(empty($aDomain['smtp_secure']) ? '' : $aDomain['smtp_secure']);
-			$oDomain->bOutShortLogin = !empty($aDomain['smtp_short_login']);
-			$oDomain->bOutAuth = !empty($aDomain['smtp_auth']);
-			$oDomain->bOutSetSender = !empty($aDomain['smtp_set_sender']);
-			$oDomain->bOutUsePhpMail = !empty($aDomain['smtp_php_mail']);
+	/**
+	 * @deprecated
+	 */
+	public function OutHost(): string
+	{
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->SMTP->host;
+	}
 
-			$oDomain->sWhiteList = (string) ($aDomain['white_list'] ?? '');
+	/**
+	 * @deprecated
+	 */
+	public function OutPort(): int
+	{
+		\trigger_error('Deprecated function called.', \E_USER_DEPRECATED);
+		return $this->SMTP->port;
+	}
+
+	public function SetAliasName(string $sAliasName): void
+	{
+//		$this->aliasName = \SnappyMail\IDN::toAscii($sAliasName);
+		$this->aliasName = \strtolower(\idn_to_ascii($sAliasName));
+	}
+
+	public function ValidateWhiteList(string $sEmail): bool
+	{
+		$sW = $this->whiteList;
+		if (!$sW) {
+			return true;
 		}
+		$sEmail = \SnappyMail\IDN::emailToAscii(\mb_strtolower($sEmail));
+		$iPos = \strrpos($sEmail, '@');
+		$sUserPart = \substr($sEmail, 0, $iPos);
+		$sUserDomain = \substr($sEmail, $iPos);
+		$sItem = \strtok($sW, " ;,\n");
+		while (false !== $sItem) {
+			$sItem = \SnappyMail\IDN::emailToAscii(\mb_strtolower(\trim($sItem)));
+			if ($sItem === $sEmail || $sItem === $sUserPart || $sItem === $sUserDomain) {
+				return true;
+			}
+			$sItem = \strtok(" ;,\n");
+		}
+		return false;
+	}
 
+	public function ImapSettings(): \MailSo\Imap\Settings
+	{
+		return $this->IMAP;
+	}
+
+	public function SieveSettings(): \MailSo\Sieve\Settings
+	{
+		return $this->Sieve;
+	}
+
+	public function SmtpSettings(): \MailSo\Smtp\Settings
+	{
+		return $this->SMTP;
+	}
+
+	/**
+	 * See jsonSerialize() for valid values
+	 */
+	public static function fromArray(string $sName, array $aDomain): ?self
+	{
+		if (!\strlen($sName)) {
+			return null;
+		}
+		$oDomain = new self($sName);
+		if (!empty($aDomain['IMAP'])) {
+			$oDomain->IMAP = \MailSo\Imap\Settings::fromArray($aDomain['IMAP']);
+			$oDomain->SMTP = \MailSo\Smtp\Settings::fromArray($aDomain['SMTP']);
+			$oDomain->Sieve = \MailSo\Sieve\Settings::fromArray($aDomain['Sieve']);
+			$oDomain->whiteList = (string) $aDomain['whiteList'];
+		} else if (\strlen($aDomain['imapHost'])) {
+			// Old way
+			$oDomain->IMAP->host = $aDomain['imapHost'];
+			$oDomain->IMAP->port = (int) $aDomain['imapPort'];
+			$oDomain->IMAP->type = (int) $aDomain['imapSecure'];
+			$oDomain->IMAP->shortLogin = !empty($aDomain['imapShortLogin']);
+
+			$oDomain->Sieve->enabled = !empty($aDomain['useSieve']);
+			$oDomain->Sieve->host = $aDomain['sieveHost'];
+			$oDomain->Sieve->port = (int) $aDomain['sievePort'];
+			$oDomain->Sieve->type = (int) $aDomain['sieveSecure'];
+
+			$oDomain->SMTP->host = $aDomain['smtpHost'];
+			$oDomain->SMTP->port = (int) $aDomain['smtpPort'];
+			$oDomain->SMTP->type = (int) $aDomain['smtpSecure'];
+			$oDomain->SMTP->shortLogin = !empty($aDomain['smtpShortLogin']);
+			$oDomain->SMTP->useAuth = !empty($aDomain['smtpAuth']);
+			$oDomain->SMTP->setSender = !empty($aDomain['smtpSetSender']);
+			$oDomain->SMTP->authPlainLine = !empty($aDomain['smtpAuthPlainLine']);
+			$oDomain->SMTP->usePhpMail = !empty($aDomain['smtpPhpMail']);
+
+			$oDomain->whiteList = (string) $aDomain['whiteList'];
+		} else {
+			return null;
+		}
+		$oDomain->Normalize();
 		return $oDomain;
 	}
 
-	private function encodeIniString(string $sStr) : string
+	/**
+	 * Used by old RainLoop ToIniString()
+	 */
+	public static function fromIniArray(string $sName, array $aDomain): ?self
 	{
-		return str_replace('"', '\\"', $sStr);
+		$oDomain = null;
+		if (\strlen($sName) && \strlen($aDomain['imap_host'])) {
+			$oDomain = new self($sName);
+
+			$oDomain->IMAP->host = $aDomain['imap_host'];
+			$oDomain->IMAP->port = (int) $aDomain['imap_port'];
+			$oDomain->IMAP->type = self::StrConnectionSecurityTypeToCons($aDomain['imap_secure'] ?? '');
+			$oDomain->IMAP->shortLogin = !empty($aDomain['imap_short_login']);
+
+			$oDomain->Sieve->enabled = !empty($aDomain['sieve_use']);
+			$oDomain->Sieve->host = $aDomain['sieve_host'] ?: '';
+			$oDomain->Sieve->port = (int) ($aDomain['sieve_port'] ?? 4190);;
+			$oDomain->Sieve->type = self::StrConnectionSecurityTypeToCons($aDomain['sieve_secure'] ?? '');
+
+			$oDomain->SMTP->host = $aDomain['smtp_host'];
+			$oDomain->SMTP->port = (int) ($aDomain['smtp_port'] ?? 25);
+			$oDomain->SMTP->type = self::StrConnectionSecurityTypeToCons($aDomain['smtp_secure'] ?? '');
+			$oDomain->SMTP->shortLogin = !empty($aDomain['smtp_short_login']);
+			$oDomain->SMTP->useAuth = !empty($aDomain['smtp_auth']);
+			$oDomain->SMTP->setSender = !empty($aDomain['smtp_set_sender']);
+			$oDomain->SMTP->usePhpMail = !empty($aDomain['smtp_php_mail']);
+
+			$oDomain->whiteList = $aDomain['white_list'] ?? '';
+
+			$oDomain->Normalize();
+		}
+		return $oDomain;
 	}
 
-	public function Normalize()
+	/**
+	 * Use by old RainLoop fromIniArray()
+	 */
+	public static function StrConnectionSecurityTypeToCons(string $sType): int
 	{
-		$this->sIncHost = \trim($this->sIncHost);
-		$this->sSieveHost = \trim($this->sSieveHost);
-		$this->sOutHost = \trim($this->sOutHost);
-		$this->sWhiteList = \trim($this->sWhiteList);
-
-		if ($this->iIncPort <= 0)
-		{
-			$this->iIncPort = 143;
-		}
-
-		if ($this->iSievePort <= 0)
-		{
-			$this->iSievePort = 4190;
-		}
-
-		if ($this->iOutPort <= 0)
-		{
-			$this->iOutPort = 25;
-		}
-	}
-
-	public function ToIniString() : string
-	{
-		$this->Normalize();
-		return \implode("\n", array(
-			'imap_host = "'.$this->encodeIniString($this->sIncHost).'"',
-			'imap_port = '.$this->iIncPort,
-			'imap_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iIncSecure).'"',
-			'imap_short_login = '.($this->bIncShortLogin ? 'On' : 'Off'),
-			'sieve_use = '.($this->bUseSieve ? 'On' : 'Off'),
-			'sieve_host = "'.$this->encodeIniString($this->sSieveHost).'"',
-			'sieve_port = '.$this->iSievePort,
-			'sieve_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iSieveSecure).'"',
-			'smtp_host = "'.$this->encodeIniString($this->sOutHost).'"',
-			'smtp_port = '.$this->iOutPort,
-			'smtp_secure = "'.self::ConstConnectionSecurityTypeToStr($this->iOutSecure).'"',
-			'smtp_short_login = '.($this->bOutShortLogin ? 'On' : 'Off'),
-			'smtp_auth = '.($this->bOutAuth ? 'On' : 'Off'),
-			'smtp_set_sender = '.($this->bOutSetSender ? 'On' : 'Off'),
-			'smtp_php_mail = '.($this->bOutUsePhpMail ? 'On' : 'Off'),
-			'white_list = "'.$this->encodeIniString($this->sWhiteList).'"'
-		));
-	}
-
-	public static function StrConnectionSecurityTypeToCons(string $sType) : int
-	{
-		$iSecurityType = ConnectionSecurityType::NONE;
-		switch (strtoupper($sType))
+		switch (\strtoupper($sType))
 		{
 			case 'SSL':
-				$iSecurityType = ConnectionSecurityType::SSL;
-				break;
+				return ConnectionSecurityType::SSL;
 			case 'TLS':
-				$iSecurityType = ConnectionSecurityType::STARTTLS;
-				break;
+				return ConnectionSecurityType::STARTTLS;
 		}
-		return $iSecurityType;
+		return ConnectionSecurityType::NONE;
 	}
 
-	public static function ConstConnectionSecurityTypeToStr(int $iSecurityType) : string
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		$sType = 'None';
-		switch ($iSecurityType)
-		{
-			case ConnectionSecurityType::SSL:
-				$sType = 'SSL';
-				break;
-			case ConnectionSecurityType::STARTTLS:
-				$sType = 'TLS';
-				break;
-		}
-
-		return $sType;
-	}
-
-	public function SetConfig(
-		string $sIncHost, int $iIncPort, int $iIncSecure, bool $bIncShortLogin,
-		bool $bUseSieve, string $sSieveHost, int $iSievePort, int $iSieveSecure,
-		string $sOutHost, int $iOutPort, int $iOutSecure, bool $bOutShortLogin,
-		bool $bOutAuth, bool $bOutSetSender, bool $bOutUsePhpMail,
-		string $sWhiteList = '') : self
-	{
-		$this->sIncHost = $sIncHost;
-		$this->iIncPort = $iIncPort;
-		$this->iIncSecure = $iIncSecure;
-		$this->bIncShortLogin = $bIncShortLogin;
-
-		$this->bUseSieve = $bUseSieve;
-		$this->sSieveHost = $sSieveHost;
-		$this->iSievePort = $iSievePort;
-		$this->iSieveSecure = $iSieveSecure;
-
-		$this->sOutHost = $sOutHost;
-		$this->iOutPort = $iOutPort;
-		$this->iOutSecure = $iOutSecure;
-		$this->bOutShortLogin = $bOutShortLogin;
-		$this->bOutAuth = $bOutAuth;
-		$this->bOutSetSender = $bOutSetSender;
-		$this->bOutUsePhpMail = $bOutUsePhpMail;
-
-		$this->sWhiteList = \trim($sWhiteList);
-
-		return $this;
-	}
-
-	public function Name() : string
-	{
-		return $this->sName;
-	}
-
-	public function IncHost() : string
-	{
-		return $this->sIncHost;
-	}
-
-	public function IncPort() : int
-	{
-		return $this->iIncPort;
-	}
-
-	public function IncSecure() : int
-	{
-		return $this->iIncSecure;
-	}
-
-	public function IncShortLogin() : bool
-	{
-		return $this->bIncShortLogin;
-	}
-
-	public function UseSieve() : bool
-	{
-		return $this->bUseSieve;
-	}
-
-	public function SieveHost() : string
-	{
-		return $this->sSieveHost;
-	}
-
-	public function SievePort() : int
-	{
-		return $this->iSievePort;
-	}
-
-	public function SieveSecure() : int
-	{
-		return $this->iSieveSecure;
-	}
-
-	public function OutHost() : string
-	{
-		return $this->sOutHost;
-	}
-
-	public function OutPort() : int
-	{
-		return $this->iOutPort;
-	}
-
-	public function OutSecure() : int
-	{
-		return $this->iOutSecure;
-	}
-
-	public function OutShortLogin() : bool
-	{
-		return $this->bOutShortLogin;
-	}
-
-	public function OutAuth() : bool
-	{
-		return $this->bOutAuth;
-	}
-
-	public function OutSetSender() : bool
-	{
-		return $this->bOutSetSender;
-	}
-
-	public function OutUsePhpMail() : bool
-	{
-		return $this->bOutUsePhpMail;
-	}
-
-	public function WhiteList() : string
-	{
-		return $this->sWhiteList;
-	}
-
-	public function AliasName() : string
-	{
-		return $this->sAliasName;
-	}
-
-	public function SetAliasName(string $sAliasName) : self
-	{
-		$this->sAliasName = $sAliasName;
-
-		return $this;
-	}
-
-	public function ValidateWhiteList(string $sEmail, string $sLogin = '') : bool
-	{
-		$sW = \trim($this->sWhiteList);
-		if (\strlen($sW))
-		{
-			$sEmail = \MailSo\Base\Utils::IdnToUtf8($sEmail, true);
-			$sLogin = \MailSo\Base\Utils::IdnToUtf8($sLogin, true);
-
-			$sW = \preg_replace('/([^\s]+)@[^\s]*/', '$1', $sW);
-			$sW = ' '.\trim(\preg_replace('/[\s;,\r\n\t]+/', ' ', $sW)).' ';
-
-			$sUserPart = \MailSo\Base\Utils::GetAccountNameFromEmail(\strlen($sLogin) ? $sLogin : $sEmail);
-			return false !== \stripos($sW, ' '.$sUserPart.' ');
-		}
-
-		return true;
-	}
-
-	public function ImapSettings() : array
-	{
-		return array(
-			'UseConnect' => true,
-			'UseAuth' => true,
-			'Host' => $this->sIncHost,
-			'Port' => $this->iIncPort,
-			'Secure' => $this->iIncSecure,
-		);
-	}
-
-	public function SmtpSettings() : array
-	{
-		return array(
-			'UseConnect' => !$this->bOutUsePhpMail,
-			'UseAuth' => $this->bOutAuth,
-			'Host' => $this->sOutHost,
-			'Port' => $this->iOutPort,
-			'Secure' => $this->iOutSecure,
-			'Ehlo' => \MailSo\Smtp\SmtpClient::EhloHelper(),
-			'UsePhpMail' => $this->bOutUsePhpMail
-		);
-	}
-
-	public function SieveSettings() : array
-	{
-		return array(
-			'UseConnect' => true,
-			'UseAuth' => true,
-			'Host' => $this->sSieveHost,
-			'Port' => $this->iSievePort,
-			'Secure' => $this->iSieveSecure
-		);
-	}
-
-	public function jsonSerialize()
-	{
-		return array(
+		$aResult = array(
 //			'@Object' => 'Object/Domain',
-			'name' => \MailSo\Base\Utils::IdnToUtf8($this->sName),
-			'imapHost' => \MailSo\Base\Utils::IdnToUtf8($this->sIncHost),
-			'imapPort' => $this->iIncPort,
-			'imapSecure' => $this->iIncSecure,
-			'imapShortLogin' => $this->bIncShortLogin,
-			'useSieve' => $this->bUseSieve,
-			'sieveHost' => \MailSo\Base\Utils::IdnToUtf8($this->sSieveHost),
-			'sievePort' => $this->iSievePort,
-			'sieveSecure' => $this->iSieveSecure,
-			'smtpHost' => \MailSo\Base\Utils::IdnToUtf8($this->sOutHost),
-			'smtpPort' => $this->iOutPort,
-			'smtpSecure' => $this->iOutSecure,
-			'smtpShortLogin' => $this->bOutShortLogin,
-			'smtpAuth' => $this->bOutAuth,
-			'smtpSetSender' => $this->bOutSetSender,
-			'smtpPhpMail' => $this->bOutUsePhpMail,
-			'whiteList' => $this->sWhiteList,
-			'aliasName' => $this->sAliasName
+			'IMAP' => $this->IMAP,
+			'SMTP' => $this->SMTP,
+			'Sieve' => $this->Sieve,
+			'whiteList' => $this->whiteList
 		);
+		if ($this->aliasName) {
+			$aResult['aliasName'] = $this->aliasName;
+		}
+		return $aResult;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
index 037d41fc5..0a51d94ae 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/Identity.php
@@ -2,54 +2,56 @@
 
 namespace RainLoop\Model;
 
-use MailSo\Base\Utils;
+use SnappyMail\SensitiveString;
 
 class Identity implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sId;
+	private string $sId;
 
-	/**
-	 * @var string
-	 */
-	private $sEmail;
+	private string $sLabel = '';
 
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $sEmail;
 
-	/**
-	 * @var string
-	 */
-	private $sReplyTo;
+	private string $sName = '';
 
-	/**
-	 * @var string
-	 */
-	private $sBcc;
+	private string $sReplyTo = '';
 
-	/**
-	 * @var string
-	 */
-	private $sSignature;
+	private string $sBcc = '';
 
-	/**
-	 * @var bool
-	 */
-	private $bSignatureInsertBefore;
+	private string $sSignature = '';
+
+	private string $sSentFolder = '';
+
+	private bool $bSignatureInsertBefore = false;
+
+	private bool $pgpEncrypt = false;
+	private bool $pgpSign = false;
+
+	public bool $exists = true;
+
+	private ?SensitiveString $smimeKey = null;
+	private string $smimeCertificate = '';
+	private string $smimeCertificateChain = '';
 
 	function __construct(string $sId = '', string $sEmail = '')
 	{
 		$this->sId = $sId;
 		$this->sEmail = $sEmail;
-		$this->sName = '';
-		$this->sReplyTo = '';
-		$this->sBcc = '';
-		$this->sSignature = '';
-		$this->bSignatureInsertBefore = false;
+	}
+
+	function __get(string $name)
+	{
+		if (!\property_exists($this, $name)) {
+			$name = \substr($name, 1);
+		}
+		if (\property_exists($this, $name)) {
+			return $this->$name;
+		}
+	}
+
+	function toMime(): \MailSo\Mime\Email
+	{
+		return new \MailSo\Mime\Email($this->sEmail, $this->sName);
 	}
 
 	public function Id(bool $bFillOnEmpty = false): string
@@ -74,26 +76,6 @@ class Identity implements \JsonSerializable
 		return $this->sName;
 	}
 
-	public function ReplyTo(): string
-	{
-		return $this->sReplyTo;
-	}
-
-	public function Bcc(): string
-	{
-		return $this->sBcc;
-	}
-
-	public function Signature(): string
-	{
-		return $this->sSignature;
-	}
-
-	public function SignatureInsertBefore(): bool
-	{
-		return $this->bSignatureInsertBefore;
-	}
-
 	public function SetId(string $sId): Identity
 	{
 		$this->sId = $sId;
@@ -106,10 +88,9 @@ class Identity implements \JsonSerializable
 		return $this;
 	}
 
-	public function SetReplyTo(string $sReplyTo): Identity
+	public function ReplyTo(): string
 	{
-		$this->sReplyTo = $sReplyTo;
-		return $this;
+		return $this->sReplyTo;
 	}
 
 	public function SetBcc(string $sBcc): Identity
@@ -118,59 +99,70 @@ class Identity implements \JsonSerializable
 		return $this;
 	}
 
-	public function SetSignature(string $sSignature): Identity
-	{
-		$this->sSignature = $sSignature;
-		return $this;
-	}
-
-	public function SetSignatureInsertBefore(bool $bSignatureInsertBefore): Identity
-	{
-		$this->bSignatureInsertBefore = $bSignatureInsertBefore;
-		return $this;
-	}
-
 	public function FromJSON(array $aData, bool $bJson = false): bool
 	{
 		if (!empty($aData['Email'])) {
 			$this->sId = !empty($aData['Id']) ? $aData['Id'] : '';
-			$this->sEmail = $bJson ? Utils::IdnToAscii($aData['Email'], true) : $aData['Email'];
+			$this->sLabel = isset($aData['Label']) ? $aData['Label'] : '';
+			$this->sEmail = $bJson ? \SnappyMail\IDN::emailToAscii($aData['Email']) : $aData['Email'];
 			$this->sName = isset($aData['Name']) ? $aData['Name'] : '';
 			$this->sReplyTo = !empty($aData['ReplyTo']) ? $aData['ReplyTo'] : '';
 			$this->sBcc = !empty($aData['Bcc']) ? $aData['Bcc'] : '';
 			$this->sSignature = !empty($aData['Signature']) ? $aData['Signature'] : '';
-			$this->bSignatureInsertBefore = isset($aData['SignatureInsertBefore']) ?
-				!empty($aData['SignatureInsertBefore']) : true;
-
+			$this->bSignatureInsertBefore = !empty($aData['SignatureInsertBefore']);
+			$this->sSentFolder = isset($aData['sentFolder']) ? $aData['sentFolder'] : '';
+			$this->pgpEncrypt = !empty($aData['pgpEncrypt']);
+			$this->pgpSign = !empty($aData['pgpSign']);
+			$this->smimeKey = new SensitiveString(isset($aData['smimeKey']) ? $aData['smimeKey'] : '');
+			$this->smimeCertificate = isset($aData['smimeCertificate']) ? $aData['smimeCertificate'] : '';
+			$this->smimeCertificateChain = isset($aData['smimeCertificateChain']) ? $aData['smimeCertificateChain'] : '';
 			return true;
 		}
 
 		return false;
 	}
 
+	// Used to store
 	public function ToSimpleJSON(): array
 	{
 		return array(
-			'Id' => $this->Id(),
-			'Email' => $this->Email(),
-			'Name' => $this->Name(),
-			'ReplyTo' => $this->ReplyTo(),
-			'Bcc' => $this->Bcc(),
-			'Signature' => $this->Signature(),
-			'SignatureInsertBefore' => $this->SignatureInsertBefore()
+			'Id' => $this->sId,
+			'Label' => $this->sLabel,
+			'Email' => $this->sEmail,
+			'Name' => $this->sName,
+			'ReplyTo' => $this->sReplyTo,
+			'Bcc' => $this->sBcc,
+			'Signature' => $this->sSignature,
+			'SignatureInsertBefore' => $this->bSignatureInsertBefore,
+			'sentFolder' => $this->sSentFolder,
+			'pgpEncrypt' => $this->pgpEncrypt,
+			'pgpSign' => $this->pgpSign,
+			'smimeKey' => (string) $this->smimeKey,
+			'smimeCertificate' => $this->smimeCertificate,
+			'smimeCertificateChain' => $this->smimeCertificateChain
 		);
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
 		return array(
-			'Id' => $this->Id(),
-			'Email' => Utils::IdnToUtf8($this->Email()),
-			'Name' => $this->Name(),
-			'ReplyTo' => $this->ReplyTo(),
-			'Bcc' => $this->Bcc(),
-			'Signature' => $this->Signature(),
-			'SignatureInsertBefore' => $this->SignatureInsertBefore()
+			'@Object' => 'Object/Identity',
+			'id' => $this->sId,
+			'label' => $this->sLabel,
+			'email' => \SnappyMail\IDN::emailToUtf8($this->sEmail),
+			'name' => $this->sName,
+			'replyTo' => $this->sReplyTo,
+			'bcc' => $this->sBcc,
+			'signature' => $this->sSignature,
+			'signatureInsertBefore' => $this->bSignatureInsertBefore,
+			'sentFolder' => $this->sSentFolder,
+			'pgpEncrypt' => $this->pgpEncrypt,
+			'pgpSign' => $this->pgpSign,
+			'smimeKey' => (string) $this->smimeKey,
+			'smimeCertificate' => $this->smimeCertificate,
+			'smimeCertificateChain' => $this->smimeCertificateChain,
+			'exists' => $this->exists
 		);
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
index d369e20bc..a44ca19fe 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Model/MainAccount.php
@@ -4,24 +4,68 @@ namespace RainLoop\Model;
 
 use RainLoop\Utils;
 use RainLoop\Exceptions\ClientException;
+use RainLoop\Notifications;
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+use SnappyMail\SensitiveString;
 
 class MainAccount extends Account
 {
-	/**
-	 * @var string
-	 */
-	private $sCryptKey;
+	private ?SensitiveString $sCryptKey = null;
+
+	public function resealCryptKey(SensitiveString $oOldPass) : bool
+	{
+		$oStorage = \RainLoop\Api::Actions()->StorageProvider();
+		$sKey = $oStorage->Get($this, StorageType::ROOT, '.cryptkey');
+		if ($sKey) {
+			$sKey = \SnappyMail\Crypt::DecryptFromJSON($sKey, $oOldPass);
+			if (!$sKey) {
+				throw new ClientException(Notifications::CryptKeyError);
+			}
+			$sPass = \RainLoop\Api::Config()->Get('security', 'insecure_cryptkey', false)
+				? $this->Email()
+				: $this->ImapPass();
+			$sKey = \SnappyMail\Crypt::EncryptToJSON($sKey, $sPass);
+			if ($sKey) {
+				$this->sCryptKey = null;
+				if (\RainLoop\Api::Actions()->StorageProvider()->Put($this, StorageType::ROOT, '.cryptkey', $sKey)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
 
 	public function CryptKey() : string
 	{
 		if (!$this->sCryptKey) {
-			$this->SetCryptKey($this->IncPassword());
+			// Seal the cryptkey so that people who change their login password
+			// can use the old password to re-seal the cryptkey
+			$oStorage = \RainLoop\Api::Actions()->StorageProvider();
+			$sKey = $oStorage->Get($this, StorageType::ROOT, '.cryptkey');
+			$sPass = \RainLoop\Api::Config()->Get('security', 'insecure_cryptkey', false)
+				? $this->Email()
+				: $this->ImapPass();
+			if (!$sKey) {
+				$sKey = \SnappyMail\Crypt::EncryptToJSON(
+					\sha1($this->ImapPass() . APP_SALT),
+					$sPass
+				);
+				$oStorage->Put($this, StorageType::ROOT, '.cryptkey', $sKey);
+			}
+			$sKey = \SnappyMail\Crypt::DecryptFromJSON($sKey, $sPass);
+			if (!$sKey) {
+				throw new ClientException(Notifications::CryptKeyError);
+			}
+			$this->sCryptKey = new SensitiveString(\hex2bin($sKey));
 		}
 		return $this->sCryptKey;
 	}
 
-	public function SetCryptKey(string $sKey) : void
+/*
+	// Stores settings in MainAccount
+	public function settings() : \RainLoop\Settings
 	{
-		$this->sCryptKey = \sha1($sKey . APP_SALT, true);
+		return \RainLoop\Api::Actions()->SettingsProvider()->Load($this);
 	}
+*/
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Notifications.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Notifications.php
index 0bba7ecee..036d6c078 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Notifications.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Notifications.php
@@ -4,6 +4,12 @@ namespace RainLoop;
 
 class Notifications
 {
+/*
+	RequestError = 1;
+	RequestAborted = 2;
+	RequestTimeout = 3;
+*/
+
 	const InvalidToken = 101;
 	const AuthError = 102;
 
@@ -11,6 +17,7 @@ class Notifications
 	const ConnectionError = 104;
 	const DomainNotAllowed = 109;
 	const AccountNotAllowed = 110;
+	const CryptKeyError = 111;
 
 	const ContactsSyncError = 140;
 
@@ -52,7 +59,6 @@ class Notifications
 	const MailServerError = 901;
 	const ClientViewError = 902;
 	const InvalidInputArgument = 903;
-//	const UnknownNotification = 998;
 	const UnknownError = 999;
 
 	// Admin
@@ -64,8 +70,7 @@ class Notifications
 
 	static public function GetNotificationsMessage(int $iCode, ?\Throwable $oPrevious = null) : string
 	{
-		if (self::ClientViewError === $iCode && $oPrevious)
-		{
+		if (self::ClientViewError === $iCode && $oPrevious) {
 			return $oPrevious->getMessage();
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
new file mode 100644
index 000000000..631c1c0f2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Base.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace RainLoop\Pdo;
+
+abstract class Base
+{
+	use \MailSo\Log\Inherit;
+
+	protected ?\PDO $oPDO = null;
+
+	protected bool $bExplain = false;
+
+	protected bool $bSqliteCollate = true;
+
+	protected string $sDbType;
+
+	public function IsSupported() : bool
+	{
+		return !!\class_exists('PDO');
+	}
+
+	abstract protected function getPdoSettings(): \RainLoop\Pdo\Settings;
+
+	public function sqliteNoCaseCollationHelper(string $sStr1, string $sStr2): int
+	{
+		$this->oLogger->WriteDump(array($sStr1, $sStr2));
+		return \strcmp(\mb_strtoupper($sStr1, 'UTF-8'), \mb_strtoupper($sStr2, 'UTF-8'));
+	}
+
+	public static function getAvailableDrivers(): array
+	{
+		return \class_exists('PDO', false)
+			? \array_values(\array_intersect(['mysql', 'pgsql', 'sqlite'], \PDO::getAvailableDrivers()))
+			: [];
+	}
+
+	/**
+	 *
+	 * @throws \Exception
+	 */
+	protected function getPDO(): \PDO
+	{
+		if ($this->oPDO) {
+			return $this->oPDO;
+		}
+
+		if (!\class_exists('PDO')) {
+			throw new \Exception('Class PDO does not exist');
+		}
+
+		$oSettings = $this->getPdoSettings();
+
+		if (!\in_array($oSettings->driver, static::getAvailableDrivers())) {
+			throw new \Exception('Unknown PDO SQL connection type');
+		}
+
+		if (empty($oSettings->dsn)) {
+			throw new \Exception('Empty PDO DSN configuration');
+		}
+
+		$this->sDbType = $oSettings->driver;
+
+		$options = [];
+		if ('mysql' === $oSettings->driver) {
+			if ($oSettings->sslCa) {
+				$options[\PDO::MYSQL_ATTR_SSL_CA] = $oSettings->sslCa;
+			}
+			// PHP 8.0 https://github.com/the-djmaze/snappymail/issues/1205
+			if (\defined('PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT')) {
+				$options[\PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT] = $oSettings->sslVerify;
+			}
+			if ($oSettings->sslCiphers) {
+				$options[\PDO::MYSQL_ATTR_SSL_CIPHER] = $oSettings->sslCiphers;
+			}
+/*
+			$options[\PDO::MYSQL_ATTR_SSL_CAPATH] = '';
+			// mutual (two-way) authentication
+			$options[\PDO::MYSQL_ATTR_SSL_KEY] = '';
+			$options[\PDO::MYSQL_ATTR_SSL_CERT] = '';
+*/
+		}
+
+		$oPdo = new \PDO($oSettings->dsn, $oSettings->user, $oSettings->password, $options);
+		$sPdoType = $oPdo->getAttribute(\PDO::ATTR_DRIVER_NAME);
+		$oPdo->setAttribute(\PDO::ATTR_ERRMODE, \PDO::ERRMODE_EXCEPTION);
+
+//		$bCaseFunc = false;
+		if ('mysql' === $oSettings->driver && 'mysql' === $sPdoType) {
+			$oPdo->exec('SET NAMES utf8mb4 COLLATE utf8mb4_general_ci');
+		}
+//		else if ('sqlite' === $oSettings->driver && 'sqlite' === $sPdoType && $this->bSqliteCollate) {
+//			if (\method_exists($oPdo, 'sqliteCreateCollation')) {
+//				$oPdo->sqliteCreateCollation('SQLITE_NOCASE_UTF8', array($this, 'sqliteNoCaseCollationHelper'));
+//				$bCaseFunc = true;
+//			}
+//		}
+//		$this->logWrite('PDO:'.$sPdoType.($bCaseFunc ? '/SQLITE_NOCASE_UTF8' : ''));
+
+		$this->oPDO = $oPdo;
+		return $oPdo;
+	}
+
+	protected function lastInsertId(?string $sTabelName = null, ?string $sColumnName = null): string
+	{
+		$mName = null;
+		if ('pgsql' === $this->sDbType && null !== $sTabelName && $sColumnName !== null) {
+			$mName = \strtolower($sTabelName.'_'.$sColumnName.'_seq');
+		}
+
+		return null === $mName ? $this->getPDO()->lastInsertId() : $this->getPDO()->lastInsertId($mName);
+	}
+
+	protected function beginTransaction(): bool
+	{
+		return $this->getPDO()->beginTransaction();
+	}
+
+	protected function commit(): bool
+	{
+		return $this->getPDO()->commit();
+	}
+
+	protected function rollBack(): bool
+	{
+		return $this->getPDO()->rollBack();
+	}
+
+	protected function prepareAndExecute(string $sSql, array $aParams = array(), bool $bMultiplyParams = false, bool $bLogParams = false): ?\PDOStatement
+	{
+		if ($this->bExplain && !$bMultiplyParams) {
+			$this->prepareAndExplain($sSql, $aParams);
+		}
+
+		$mResult = null;
+
+		$this->writeLog($sSql);
+		$oStmt = $this->getPDO()->prepare($sSql);
+		if ($oStmt) {
+			$aLogs = array();
+			$aRootParams = $bMultiplyParams ? $aParams : array($aParams);
+			foreach ($aRootParams as $aSubParams) {
+				foreach ($aSubParams as $sName => $aValue) {
+					if ($bLogParams) {
+						$aLogs[$sName] = $aValue[0];
+					}
+					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
+				}
+				$mResult = $oStmt->execute() && !$bMultiplyParams ? $oStmt : null;
+			}
+			if ($bLogParams && $aLogs) {
+				$this->writeLog('Params: '.\json_encode($aLogs, JSON_UNESCAPED_UNICODE));
+			}
+		}
+
+		return $mResult;
+	}
+
+	protected function prepareAndExplain(string $sSql, array $aParams = array())
+	{
+		$mResult = null;
+		if (0 === \strpos($sSql, 'SELECT ')) {
+			$sSql = 'EXPLAIN '.$sSql;
+			$this->writeLog($sSql);
+			$oStmt = $this->getPDO()->prepare($sSql);
+			if ($oStmt) {
+				foreach ($aParams as $sName => $aValue) {
+					$oStmt->bindValue($sName, $aValue[0], $aValue[1]);
+				}
+
+				$mResult = $oStmt->execute() ? $oStmt : null;
+			}
+		}
+
+		if ($mResult) {
+			$aFetch = $mResult->fetchAll(\PDO::FETCH_ASSOC);
+			$this->oLogger->WriteDump($aFetch);
+
+			unset($aFetch);
+			$mResult->closeCursor();
+		}
+	}
+
+	protected function writeLog(mixed $mData): void
+	{
+		if ($this->oLogger) {
+			if ($mData instanceof \Throwable) {
+				$this->logException($mData, \LOG_ERR, 'SQL');
+			} else if (\is_scalar($mData)) {
+				$this->logWrite((string) $mData, \LOG_INFO, 'SQL');
+			} else {
+				$this->oLogger->WriteDump($mData, \LOG_INFO, 'SQL');
+			}
+		}
+	}
+
+	public function quoteValue(string $sValue): string
+	{
+		$oPdo = $this->getPDO();
+		return $oPdo ? $oPdo->quote((string) $sValue, \PDO::PARAM_STR) : '\'\'';
+	}
+
+	protected function getVersion(string $sName): ?int
+	{
+		$oPdo = $this->getPDO();
+		if ($oPdo) {
+			$sQuery = 'SELECT MAX(value_int) FROM rainloop_system WHERE sys_name = ?';
+
+			$this->writeLog($sQuery);
+
+			$oStmt = $oPdo->prepare($sQuery);
+			if ($oStmt->execute(array($sName.'_version'))) {
+				$mRow = $oStmt->fetch(\PDO::FETCH_NUM);
+				if ($mRow && isset($mRow[0])) {
+					return (int) $mRow[0];
+				}
+
+				return 0;
+			}
+		}
+
+		return null;
+	}
+
+	protected function setVersion(string $sName, int $iVersion): bool
+	{
+		$bResult = false;
+		$oPdo = $this->getPDO();
+		if ($oPdo) {
+			$sQuery = 'DELETE FROM rainloop_system WHERE sys_name = ? AND value_int <= ?;';
+			$this->writeLog($sQuery);
+
+			$oStmt = $oPdo->prepare($sQuery);
+			$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
+			if ($bResult) {
+				$sQuery = 'INSERT INTO rainloop_system (sys_name, value_int) VALUES (?, ?);';
+				$this->writeLog($sQuery);
+
+				$oStmt = $oPdo->prepare($sQuery);
+				if ($oStmt) {
+					$bResult = !!$oStmt->execute(array($sName.'_version', $iVersion));
+				}
+			}
+		}
+
+		return $bResult;
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	protected function initSystemTables()
+	{
+		$bResult = true;
+
+		$oPdo = $this->getPDO();
+		if ($oPdo) {
+			$aQ = Schema::getForDbType($this->sDbType);
+			if (\count($aQ)) {
+				try
+				{
+					foreach ($aQ as $sQuery) {
+						$this->writeLog($sQuery);
+						$bResult = false !== $oPdo->exec($sQuery);
+						if (!$bResult) {
+							$this->writeLog('Result=false');
+							break;
+						} else {
+							$this->writeLog('Result=true');
+						}
+					}
+				}
+				catch (\Throwable $oException)
+				{
+					$this->writeLog($oException);
+					throw $oException;
+				}
+			}
+		}
+
+		return $bResult;
+	}
+
+	protected function dataBaseUpgrade(string $sName, array $aData = array()): bool
+	{
+		$iFromVersion = null;
+		try
+		{
+			$iFromVersion = $this->getVersion($sName);
+		}
+		catch (\PDOException $oException)
+		{
+//			$this->writeLog($oException);
+			try
+			{
+				$this->initSystemTables();
+				$iFromVersion = $this->getVersion($sName);
+			}
+			catch (\PDOException $oSubException)
+			{
+				$this->writeLog($oSubException);
+				throw $oSubException;
+			}
+		}
+
+		$bResult = false;
+		if (\is_int($iFromVersion) && 0 <= $iFromVersion) {
+			$oPdo = false;
+			foreach ($aData as $iVersion => $aQuery) {
+				if ($iFromVersion < $iVersion) {
+					if (\count($aQuery)) {
+						if (!$oPdo) {
+							$oPdo = $this->getPDO();
+							$bResult = true;
+						}
+						if ($oPdo) {
+							try
+							{
+								foreach ($aQuery as $sQuery) {
+									$this->writeLog($sQuery);
+									$bExec = $oPdo->exec($sQuery);
+									if (false === $bExec) {
+										$this->writeLog('Result: false');
+										$bResult = false;
+										break;
+									}
+								}
+							}
+							catch (\Throwable $oException)
+							{
+								$this->writeLog($oException);
+								throw $oException;
+							}
+							if (!$bResult) {
+								break;
+							}
+						}
+					}
+					$this->setVersion($sName, $iVersion);
+				}
+			}
+		}
+
+		return $bResult;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Schema.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Schema.php
new file mode 100644
index 000000000..1a34d96ef
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Schema.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace RainLoop\Pdo;
+
+abstract class Schema
+{
+	public static function mysql() : array
+	{
+		return [
+			'CREATE TABLE IF NOT EXISTS rainloop_system (
+sys_name varchar(64) NOT NULL,
+value_int int UNSIGNED NOT NULL DEFAULT 0,
+PRIMARY KEY (sys_name)
+) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;',
+			'CREATE TABLE IF NOT EXISTS rainloop_users (
+id_user int UNSIGNED NOT NULL AUTO_INCREMENT,
+rl_email varchar(254) NOT NULL,
+PRIMARY KEY (id_user),
+UNIQUE KEY ui_rainloop_users_email (rl_email)
+);'
+		];
+	}
+
+	public static function pgsql() : array
+	{
+		return [
+			'CREATE TABLE rainloop_system (
+sys_name varchar(50) NOT NULL,
+value_int integer NOT NULL DEFAULT 0
+);',
+			'CREATE INDEX sys_name_rainloop_system_index ON rainloop_system (sys_name);',
+			'CREATE SEQUENCE id_user START WITH 1 INCREMENT BY 1 NO MAXVALUE NO MINVALUE CACHE 1;',
+			'CREATE TABLE rainloop_users (
+id_user integer DEFAULT nextval(\'id_user\'::text) PRIMARY KEY,
+rl_email varchar(254) NOT NULL DEFAULT \'\'
+);',
+			'CREATE INDEX rl_email_rainloop_users_index ON rainloop_users (rl_email);'
+		];
+	}
+
+	public static function sqlite() : array
+	{
+		return [
+			'CREATE TABLE rainloop_system (
+sys_name text NOT NULL,
+value_int integer NOT NULL DEFAULT 0
+);',
+			'CREATE UNIQUE INDEX ui_rainloop_system_sys_name ON rainloop_system (sys_name);',
+			'CREATE TABLE rainloop_users (
+id_user integer NOT NULL PRIMARY KEY,
+rl_email text NOT NULL DEFAULT \'\'
+);',
+			'CREATE INDEX rl_email_rainloop_users_index ON rainloop_users (rl_email);'
+		];
+	}
+
+	public static function getForDbType(string $sDbType) : array
+	{
+		switch ($sDbType)
+		{
+			case 'mysql':
+			case 'pgsql':
+			case 'sqlite':
+				return static::{$sDbType}();
+		}
+		return [];
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Settings.php
new file mode 100644
index 000000000..ecddde9f6
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Pdo/Settings.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace RainLoop\Pdo;
+
+class Settings
+{
+	public string $driver;
+
+	public string $dsn;
+
+	public string $user = '';
+
+	public string $password = '';
+
+	public string $sslCa = '';
+
+	public bool $sslVerify = true;
+
+	public string $sslCiphers = '';
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
index a270f0417..2085fec4b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/AbstractPlugin.php
@@ -11,8 +11,9 @@ abstract class AbstractPlugin
 		VERSION  = '0.0',
 		RELEASE  = '2020-11-01',
 		REQUIRED = '2.0.0',
+//		DEPRECATED = '',
 		CATEGORY = 'General',
-		LICENSE  = 'MIT',
+		LICENSE  = 'AGPL v3',
 		DESCRIPTION = '';
 
 	/**
@@ -25,96 +26,82 @@ abstract class AbstractPlugin
 	 */
 	private $oPluginConfig = null;
 
-	/**
-	 * @var bool
-	 */
-	private $bLangs = false;
+	private bool $bLangs = false;
 
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $sName;
 
-	/**
-	 * @var string
-	 */
-	private $sPath = '';
+	private string $sPath = '';
 
-	/**
-	 * @var array
-	 */
-	private $aConfigMap = null;
+	private ?array $aConfigMap = null;
 
 	public function __construct()
 	{
 		$this->sName = static::NAME;
 	}
 
-	public function Name() : string
+	public function Name(): string
 	{
 		return $this->sName;
 	}
 
-	public function Description() : string
+	public function Description(): string
 	{
 		$sFile = $this->Path().'/README';
 		return \is_readable($sFile) ? \file_get_contents($sFile) : static::DESCRIPTION;
 	}
 
-	public function UseLangs(?bool $bLangs = null) : bool
+	public function UseLangs(?bool $bLangs = null): bool
 	{
-		if (null !== $bLangs)
-		{
+		if (null !== $bLangs) {
 			$this->bLangs = $bLangs;
 		}
 
 		return $this->bLangs;
 	}
 
-	protected function configMapping() : array
+	protected function configMapping(): array
 	{
 		return array();
 	}
 
-	public function Supported() : string
+	public function Supported(): string
 	{
 		return '';
 	}
 
-	public function Init() : void
+	public function Init(): void
 	{
 
 	}
 
-	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig) : void
+	public function FilterAppDataPluginSection(bool $bAdmin, bool $bAuth, array &$aConfig): void
 	{
 
 	}
 
-	final public function Hash() : string
+	final public function Hash(): string
 	{
 		return static::class . '@' . static::VERSION;
 	}
 
-	final public function Config() : \RainLoop\Config\Plugin
+	final public function Config(): \RainLoop\Config\Plugin
 	{
 		return $this->oPluginConfig;
 	}
 
-	final public function Manager() : \RainLoop\Plugins\Manager
+	final public function Manager(): \RainLoop\Plugins\Manager
 	{
 		return $this->oPluginManager;
 	}
 
-	final public function Path() : string
+	final public function Path(): string
 	{
 		return $this->sPath;
 	}
 
-	final public function ConfigMap(bool $flatten = false) : array
+	final public function ConfigMap(bool $flatten = false): array
 	{
-		if (null === $this->aConfigMap)
-		{
+		if (null === $this->aConfigMap) {
 			$this->aConfigMap = $this->configMapping();
 		}
 
@@ -139,111 +126,91 @@ abstract class AbstractPlugin
 		return $this->aConfigMap;
 	}
 
-	final public function SetPath(string $sPath) : self
+	final public function SetPath(string $sPath): self
 	{
 		$this->sPath = $sPath;
 
 		return $this;
 	}
 
-	final public function SetName(string $sName) : self
+	final public function SetName(string $sName): self
 	{
 		$this->sName = $sName;
 
 		return $this;
 	}
 
-	final public function SetPluginManager(\RainLoop\Plugins\Manager $oPluginManager) : self
+	final public function SetPluginManager(\RainLoop\Plugins\Manager $oPluginManager): self
 	{
 		$this->oPluginManager = $oPluginManager;
 
 		return $this;
 	}
 
-	final public function SetPluginConfig(\RainLoop\Config\Plugin $oPluginConfig) : self
+	final public function SetPluginConfig(\RainLoop\Config\Plugin $oPluginConfig): self
 	{
 		$this->oPluginConfig = $oPluginConfig;
-		if ($oPluginConfig->IsInited() && !$oPluginConfig->Load())
-		{
+		if ($oPluginConfig->IsInited() && !$oPluginConfig->Load()) {
 			$oPluginConfig->Save();
 		}
 		return $this;
 	}
 
-	final protected function addHook(string $sHookName, string $sFunctionName) : self
+	final protected function addHook(string $sHookName, string $sFunctionName): self
 	{
-		if ($this->oPluginManager)
-		{
+		if ($this->oPluginManager) {
 			$this->oPluginManager->AddHook($sHookName, array($this, $sFunctionName));
 		}
 
 		return $this;
 	}
 
-	final protected function addCss(string $sFile, bool $bAdminScope = false) : self
+	final protected function addCss(string $sFile, bool $bAdminScope = false): self
 	{
-		if ($this->oPluginManager)
-		{
+		if ($this->oPluginManager) {
 			$this->oPluginManager->AddCss($this->sPath.'/'.$sFile, $bAdminScope);
 		}
 
 		return $this;
 	}
 
-	final protected function addJs(string $sFile, bool $bAdminScope = false) : self
+	final protected function addJs(string $sFile, bool $bAdminScope = false): self
 	{
-		if ($this->oPluginManager)
-		{
+		if ($this->oPluginManager) {
 			$this->oPluginManager->AddJs($this->sPath.'/'.$sFile, $bAdminScope);
 		}
 
 		return $this;
 	}
 
-	final protected function addTemplate(string $sFile, bool $bAdminScope = false) : self
+	final protected function addTemplate(string $sFile, bool $bAdminScope = false): self
 	{
-		if ($this->oPluginManager)
-		{
+		if ($this->oPluginManager) {
 			$this->oPluginManager->AddTemplate($this->sPath.'/'.$sFile, $bAdminScope);
 		}
 
 		return $this;
 	}
 
-	final protected function replaceTemplate(string $sFile, bool $bAdminScope = false) : self
+	final protected function addPartHook(string $sActionName, string $sFunctionName): self
 	{
-		if ($this->oPluginManager)
-		{
-			$this->oPluginManager->AddTemplate($this->sPath.'/'.$sFile, $bAdminScope);
-		}
-
-		return $this;
-	}
-
-	final protected function addPartHook(string $sActionName, string $sFunctionName) : self
-	{
-		if ($this->oPluginManager)
-		{
+		if ($this->oPluginManager) {
 			$this->oPluginManager->AddAdditionalPartAction($sActionName, array($this, $sFunctionName));
 		}
 
 		return $this;
 	}
 
-	final protected function addJsonHook(string $sActionName, string $sFunctionName) : self
+	final protected function addJsonHook(string $sActionName, string $sFunctionName = ''): self
 	{
-		if ($this->oPluginManager)
-		{
-			$this->oPluginManager->AddAdditionalJsonAction($sActionName, array($this, $sFunctionName));
+		if ($this->oPluginManager) {
+			$this->oPluginManager->AddAdditionalJsonAction($sActionName, array($this, $sFunctionName ?: $sActionName));
 		}
 
 		return $this;
 	}
 
-	/**
-	 * @return mixed false|string|array
-	 */
-	final protected function jsonResponse(string $sFunctionName, $mData)
+	final protected function jsonResponse(string $sFunctionName, mixed $mData): false|string|array
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->JsonResponseHelper(
@@ -251,26 +218,21 @@ abstract class AbstractPlugin
 			: \json_encode($mData);
 	}
 
-	/**
-	 * @param mixed $mDefault = null
-	 *
-	 * @return mixed
-	 */
-	final public function jsonParam(string $sKey, $mDefault = null)
+	final public function jsonParam(string $sKey, mixed $mDefault = null): mixed
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->Actions()->GetActionParam($sKey, $mDefault)
-			: '';
+			: $mDefault;
 	}
 
-	final public function getUserSettings() : array
+	final public function getUserSettings(): array
 	{
 		return $this->oPluginManager
 			? $this->oPluginManager->GetUserPluginSettings($this->Name())
 			: array();
 	}
 
-	final public function saveUserSettings(array $aSettings) : bool
+	final public function saveUserSettings(array $aSettings): bool
 	{
 		return $this->oPluginManager
 			&& $this->oPluginManager->SaveUserPluginSettings($this->Name(), $aSettings);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
index 13f312cd6..9f85f9659 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Helper.php
@@ -4,50 +4,40 @@ namespace RainLoop\Plugins;
 
 class Helper
 {
-	static public function ValidateWildcardValues(string $sString, string $sWildcardValues, string &$sFoundValue = null) : bool
+	static public function ValidateWildcardValues(string $sString, string $sWildcardValues, ?string &$sFoundValue = null) : bool
 	{
 		$sFoundValue = '';
 
 		$sString = \trim($sString);
-		if ('' === $sString)
-		{
+		if ('' === $sString) {
 			return false;
 		}
 
 		$sWildcardValues = \trim($sWildcardValues);
-		if ('' === $sWildcardValues)
-		{
+		if ('' === $sWildcardValues) {
 			return true;
 		}
 
-		if ('*' === $sWildcardValues)
-		{
+		if ('*' === $sWildcardValues) {
 			$sFoundValue = '*';
 			return true;
 		}
 
-		$sWildcardValues = \preg_replace('/[*]+/', '*', \preg_replace('/[\s,;]+/', ' ', $sWildcardValues));
-		$aWildcardValues = \explode(' ', $sWildcardValues);
+		$aWildcardValues = \preg_split('/[\\s,;]+/', \preg_replace('/\\*+/', '*', $sWildcardValues));
 
-		foreach ($aWildcardValues as $sItem)
-		{
-			if (false === \strpos($sItem, '*'))
-			{
-				if ($sString === $sItem)
-				{
+		foreach ($aWildcardValues as $sItem) {
+			if (false === \strpos($sItem, '*')) {
+				if ($sString === $sItem) {
 					$sFoundValue = $sItem;
 					return true;
 				}
-			}
-			else
-			{
+			} else {
 				$aItem = \explode('*', $sItem);
 				$aItem = \array_map(function ($sItem) {
 					return \preg_quote($sItem, '/');
 				}, $aItem);
 
-				if (\preg_match('/'.\implode('.*', $aItem).'/', $sString))
-				{
+				if (\preg_match('/'.\implode('.*', $aItem).'/', $sString)) {
 					$sFoundValue = $sItem;
 					return true;
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
index d43b46513..1fd444d8b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Manager.php
@@ -4,12 +4,11 @@ namespace RainLoop\Plugins;
 
 class Manager
 {
-	/**
-	 * @var \RainLoop\Actions
-	 */
-	private $oActions;
+	use \MailSo\Log\Inherit;
 
-	private
+	private \RainLoop\Actions $oActions;
+
+	private array
 		$aHooks = array(),
 		$aCss = array([], []),
 		$aJs = array([], []),
@@ -19,38 +18,25 @@ class Manager
 		$aAdditionalJson = array(),
 		$aPlugins = array();
 
-	/**
-	 * @var bool
-	 */
-	private $bIsEnabled;
-
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	private $oLogger;
+	private bool $bIsEnabled;
 
 	public function __construct(\RainLoop\Actions $oActions)
 	{
-		$this->oLogger = null;
 		$this->oActions = $oActions;
+		$this->SetLogger($oActions->Logger());
 
 		$oConfig = $oActions->Config();
 		$this->bIsEnabled = (bool) $oConfig->Get('plugins', 'enable', false);
 		if ($this->bIsEnabled) {
 			$sList = $oConfig->Get('plugins', 'enabled_list', '');
 			if (\strlen($sList)) {
-				$aList = \array_map('trim', \explode(',', $sList));
+				$aList = \SnappyMail\Repository::getEnabledPackagesNames();
 				foreach ($aList as $i => $sName) {
-					$oPlugin = $this->CreatePluginByName($sName);
-					if ($oPlugin) {
-						$oPlugin->Init();
-
-						$this->aPlugins[] = $oPlugin;
-					} else {
+					if (!$this->loadPlugin($sName)) {
 						unset($aList[$i]);
 					}
 				}
-				$aList = \implode(',', \array_unique($aList));
+				$aList = \implode(',', \array_keys($this->aPlugins));
 				if ($sList != $aList) {
 					$oConfig->Set('plugins', 'enabled_list', $aList);
 					$oConfig->Save();
@@ -59,7 +45,19 @@ class Manager
 		}
 	}
 
-	protected static function getPluginPath(string $sName) : ?string
+	public function loadPlugin(string $sName): bool
+	{
+		if (!isset($this->aPlugins[$sName])) {
+			$oPlugin = $this->CreatePluginByName($sName);
+			if ($oPlugin) {
+				$oPlugin->Init();
+				$this->aPlugins[$sName] = $oPlugin;
+			}
+		}
+		return isset($this->aPlugins[$sName]);
+	}
+
+	protected static function getPluginPath(string $sName): ?string
 	{
 		$sPath = APP_PLUGINS_PATH.$sName;
 		if (\is_readable("{$sPath}/index.php")) {
@@ -71,7 +69,7 @@ class Manager
 		return null;
 	}
 
-	public function CreatePluginByName(string $sName) : ?\RainLoop\Plugins\AbstractPlugin
+	public function CreatePluginByName(string $sName): ?\RainLoop\Plugins\AbstractPlugin
 	{
 		$oPlugin = null;
 
@@ -84,20 +82,21 @@ class Manager
 				->SetPluginManager($this)
 				->SetPluginConfig(new \RainLoop\Config\Plugin($sName, $oPlugin->ConfigMap(true)))
 			;
+			if (\method_exists($oPlugin, 'SetLogger')) {
+				$oPlugin->SetLogger($this->oLogger);
+			}
 		}
 
 		return $oPlugin;
 	}
 
-	public function InstalledPlugins() : array
+	public function InstalledPlugins(): array
 	{
 		$aList = array();
 
 		$aGlob = \glob(APP_PLUGINS_PATH.'*');
-		if (\is_array($aGlob))
-		{
-			foreach ($aGlob as $sPathName)
-			{
+		if (\is_array($aGlob)) {
+			foreach ($aGlob as $sPathName) {
 				if (\is_dir($sPathName)) {
 					$sName = \basename($sPathName);
 				} else if ('.phar' === \substr($sPathName, -5)) {
@@ -109,21 +108,20 @@ class Manager
 				if ($sClassName) {
 					$aList[] = array(
 						$sName,
-						$sClassName::VERSION
+						$sClassName::VERSION,
+						$sClassName::NAME,
+						$sClassName::DESCRIPTION
 					);
 				}
 			}
-		}
-		else
-		{
-			$this->oActions->Logger()->Write('Cannot get installed plugins from '.APP_PLUGINS_PATH,
-				\MailSo\Log\Enumerations\Type::ERROR);
+		} else {
+			$this->oActions->logWrite('Cannot get installed plugins from '.APP_PLUGINS_PATH, \LOG_ERR);
 		}
 
 		return $aList;
 	}
 
-	public function convertPluginFolderNameToClassName(string $sFolderName) : string
+	public function convertPluginFolderNameToClassName(string $sFolderName): string
 	{
 		$aParts = \array_map('ucfirst', \array_map('strtolower',
 			\explode(' ', \preg_replace('/[^a-z0-9]+/', ' ', $sFolderName))));
@@ -131,7 +129,7 @@ class Manager
 		return \implode($aParts).'Plugin';
 	}
 
-	public function loadPluginByName(string $sName) : ?string
+	public function loadPluginByName(string $sName): ?string
 	{
 		if (\preg_match('/^[a-z0-9\\-]+$/', $sName)) {
 			$sClassName = $this->convertPluginFolderNameToClassName($sName);
@@ -150,28 +148,38 @@ class Manager
 		return null;
 	}
 
-	public function Actions() : \RainLoop\Actions
+	public function Actions(): \RainLoop\Actions
 	{
 		return $this->oActions;
 	}
 
-	public function Hash() : string
+	public function Hash(): string
 	{
-		return \md5(\array_reduce($this->aPlugins, function($sResult, $oPlugin){
-			return $sResult . "|{$oPlugin->Hash()}";
-		}, APP_VERSION));
+		return \md5(
+			\array_reduce($this->aPlugins, function($sResult, $oPlugin){
+				return $sResult . "|{$oPlugin->Hash()}";
+			}, APP_VERSION)
+			.implode('',$this->aJs[1]).implode('',$this->aJs[0])
+			.implode('',$this->aCss[1]).implode('',$this->aCss[0])
+		);
 	}
 
-	public function HaveJs(bool $bAdminScope = false) : bool
+	public function HaveJs(bool $bAdminScope = false): bool
 	{
 		return $this->bIsEnabled && \count($this->aJs[$bAdminScope ? 1 : 0]);
 	}
 
-	public function CompileCss(bool $bAdminScope, bool &$bLess) : string
+	public function CompileCss(bool $bAdminScope, bool &$bLess, bool $bMinified): string
 	{
 		$aResult = array();
 		if ($this->bIsEnabled) {
 			foreach ($this->aCss[$bAdminScope ? 1 : 0] as $sFile) {
+				if ($bMinified) {
+					$sMinFile = \str_replace('.css', '.min.css', $sFile);
+					if (\is_readable($sMinFile)) {
+						$sFile = $sMinFile;
+					}
+				}
 				if (\is_readable($sFile)) {
 					$aResult[] = \file_get_contents($sFile);
 					$bLess = $bLess || \str_ends_with($sFile, '.less');
@@ -181,15 +189,18 @@ class Manager
 		return \implode("\n", $aResult);
 	}
 
-	public function CompileJs(bool $bAdminScope = false) : string
+	public function CompileJs(bool $bAdminScope = false, bool $bMinified = false): string
 	{
 		$aResult = array();
-		if ($this->bIsEnabled)
-		{
-			foreach ($this->aJs[$bAdminScope ? 1 : 0] as $sFile)
-			{
-				if (\is_readable($sFile))
-				{
+		if ($this->bIsEnabled) {
+			foreach ($this->aJs[$bAdminScope ? 1 : 0] as $sFile) {
+				if ($bMinified) {
+					$sMinFile = \str_replace('.js', '.min.js', $sFile);
+					if (\is_readable($sMinFile)) {
+						$sFile = $sMinFile;
+					}
+				}
+				if (\is_readable($sFile)) {
 					$aResult[] = \file_get_contents($sFile);
 				}
 			}
@@ -198,15 +209,12 @@ class Manager
 		return \implode("\n", $aResult);
 	}
 
-	public function CompileTemplate(array &$aList, bool $bAdminScope = false) : void
+	public function CompileTemplate(array &$aList, bool $bAdminScope = false): void
 	{
-		if ($this->bIsEnabled)
-		{
+		if ($this->bIsEnabled) {
 			$aTemplates = $bAdminScope ? $this->aAdminTemplates : $this->aTemplates;
-			foreach ($aTemplates as $sFile)
-			{
-				if (\is_readable($sFile))
-				{
+			foreach ($aTemplates as $sFile) {
+				if (\is_readable($sFile)) {
 					$sTemplateName = \substr(\basename($sFile), 0, -5);
 					$aList[$sTemplateName] = $sFile;
 				}
@@ -214,23 +222,17 @@ class Manager
 		}
 	}
 
-	public function InitAppData(bool $bAdmin, array &$aAppData, ?\RainLoop\Model\Account $oAccount = null) : self
+	public function InitAppData(bool $bAdmin, array &$aAppData, ?\RainLoop\Model\Account $oAccount = null): self
 	{
-		if ($this->bIsEnabled && isset($aAppData['Plugins']) && \is_array($aAppData['Plugins']))
-		{
+		if ($this->bIsEnabled && isset($aAppData['Plugins']) && \is_array($aAppData['Plugins'])) {
 			$bAuth = !empty($aAppData['Auth']);
-			foreach ($this->aPlugins as $oPlugin)
-			{
-				if ($oPlugin)
-				{
+			foreach ($this->aPlugins as $oPlugin) {
+				if ($oPlugin) {
 					$aConfig = array();
 					$aMap = $oPlugin->ConfigMap(true);
-					if (\is_array($aMap))
-					{
-						foreach ($aMap as /* @var $oPluginProperty \RainLoop\Plugins\Property */ $oPluginProperty)
-						{
-							if ($oPluginProperty && $oPluginProperty->AllowedInJs())
-							{
+					if (\is_array($aMap)) {
+						foreach ($aMap as /* @var $oPluginProperty \RainLoop\Plugins\Property */ $oPluginProperty) {
+							if ($oPluginProperty && $oPluginProperty->AllowedInJs()) {
 								$aConfig[$oPluginProperty->Name()] =
 									$oPlugin->Config()->Get('plugin',
 										$oPluginProperty->Name(),
@@ -241,8 +243,7 @@ class Manager
 
 					$oPlugin->FilterAppDataPluginSection($bAdmin, $bAuth, $aConfig);
 
-					if (\count($aConfig))
-					{
+					if (\count($aConfig)) {
 						$aAppData['Plugins'][$oPlugin->Name()] = $aConfig;
 					}
 				}
@@ -254,25 +255,19 @@ class Manager
 		return $this;
 	}
 
-	/**
-	 * @param mixed $mCallbak
-	 */
-	public function AddHook(string $sHookName, $mCallbak) : self
+	public function AddHook(string $sHookName, callable $mCallbak): self
 	{
-		if ($this->bIsEnabled && \is_callable($mCallbak))
-		{
-			if (!isset($this->aHooks[$sHookName]))
-			{
+		if ($this->bIsEnabled && \is_callable($mCallbak)) {
+			$sHookName = \strtolower($sHookName);
+			if (!isset($this->aHooks[$sHookName])) {
 				$this->aHooks[$sHookName] = array();
 			}
-
 			$this->aHooks[$sHookName][] = $mCallbak;
 		}
-
 		return $this;
 	}
 
-	public function AddCss(string $sFile, bool $bAdminScope = false) : self
+	public function AddCss(string $sFile, bool $bAdminScope = false): self
 	{
 		if ($this->bIsEnabled) {
 			$this->aCss[$bAdminScope ? 1 : 0][] = $sFile;
@@ -280,7 +275,7 @@ class Manager
 		return $this;
 	}
 
-	public function AddJs(string $sFile, bool $bAdminScope = false) : self
+	public function AddJs(string $sFile, bool $bAdminScope = false): self
 	{
 		if ($this->bIsEnabled) {
 			$this->aJs[$bAdminScope ? 1 : 0][$sFile] = $sFile;
@@ -289,16 +284,12 @@ class Manager
 		return $this;
 	}
 
-	public function AddTemplate(string $sFile, bool $bAdminScope = false) : self
+	public function AddTemplate(string $sFile, bool $bAdminScope = false): self
 	{
-		if ($this->bIsEnabled)
-		{
-			if ($bAdminScope)
-			{
+		if ($this->bIsEnabled) {
+			if ($bAdminScope) {
 				$this->aAdminTemplates[$sFile] = $sFile;
-			}
-			else
-			{
+			} else {
 				$this->aTemplates[$sFile] = $sFile;
 			}
 		}
@@ -306,37 +297,55 @@ class Manager
 		return $this;
 	}
 
-	public function RunHook(string $sHookName, array $aArg = array(), bool $bLogHook = true) : self
-	{
-		if ($this->bIsEnabled)
-		{
-			if (isset($this->aHooks[$sHookName]))
-			{
-				if ($bLogHook)
-				{
-					$this->WriteLog('Hook: '.$sHookName, \MailSo\Log\Enumerations\Type::NOTE);
-				}
+/*
+	private static function getCallableName(callable $callable) {
+		if (\is_string($callable)) {
+			if (\str_contains($callable, '::')) {
+				return '[static] ' . $callable;
+			}
+			return '[function] ' . $callable;
+		}
+		if (\is_array($callable)) {
+			if (\is_object($callable[0])) {
+				return '[method] ' . \get_class($callable[0])  . '->' . $callable[1];
+			}
+			return '[static] ' . $callable[0]  . '::' . $callable[1];
+		}
+		if ($callable instanceof \Closure) {
+			return '[closure]';
+		}
+		if (\is_object($callable)) {
+			return '[invokable] ' . \get_class($callable);
+		}
+		return '[unknown]';
+	}
+*/
 
-				foreach ($this->aHooks[$sHookName] as $mCallback)
-				{
+	public function RunHook(string $sHookName, array $aArg = array(), bool $bLogHook = true): self
+	{
+		if ($this->bIsEnabled) {
+			$sHookName = \strtolower($sHookName);
+			if (isset($this->aHooks[$sHookName])) {
+				if ($bLogHook) {
+					$this->WriteLog('Hook: '.$sHookName, \LOG_INFO);
+//					$this->WriteLog('Hooks: '.\implode(',', \array_map('self::getCallableName', $this->aHooks[$sHookName])), \LOG_DEBUG);
+				}
+				foreach ($this->aHooks[$sHookName] as $mCallback) try {
 					$mCallback(...$aArg);
+				} catch (\Throwable $e) {
+//					$this->WriteLog("Hook {$sHookName} {$e->getMessage()}\n".static::getCallableName($mCallback), \LOG_ERR);
+					throw $e;
 				}
 			}
 		}
-
 		return $this;
 	}
 
-	/**
-	 * @param mixed $mCallbak
-	 */
-	public function AddAdditionalPartAction(string $sActionName, $mCallbak) : self
+	public function AddAdditionalPartAction(string $sActionName, callable $mCallbak): self
 	{
-		if ($this->bIsEnabled && \is_callable($mCallbak))
-		{
+		if ($this->bIsEnabled && \is_callable($mCallbak)) {
 			$sActionName = \strtolower($sActionName);
-			if (!isset($this->aAdditionalParts[$sActionName]))
-			{
+			if (!isset($this->aAdditionalParts[$sActionName])) {
 				$this->aAdditionalParts[$sActionName] = array();
 			}
 
@@ -346,21 +355,14 @@ class Manager
 		return $this;
 	}
 
-	public function RunAdditionalPart(string $sActionName, array $aParts = array()) : bool
+	public function RunAdditionalPart(string $sActionName, array $aParts = array()): bool
 	{
 		$bResult = false;
-		if ($this->bIsEnabled)
-		{
+		if ($this->bIsEnabled) {
 			$sActionName = \strtolower($sActionName);
-			if (isset($this->aAdditionalParts[$sActionName]))
-			{
-				foreach ($this->aAdditionalParts[$sActionName] as $mCallbak)
-				{
-					$bCallResult = $mCallbak(...$aParts);
-					if ($bCallResult && !$bResult)
-					{
-						$bResult = true;
-					}
+			if (isset($this->aAdditionalParts[$sActionName])) {
+				foreach ($this->aAdditionalParts[$sActionName] as $mCallbak) {
+					$bResult = !!$mCallbak(...$aParts) || $bResult;
 				}
 			}
 		}
@@ -368,64 +370,38 @@ class Manager
 		return $bResult;
 	}
 
-	/**
-	 * @param mixed $mCallback
-	 */
-	public function AddAdditionalJsonAction(string $sActionName, $mCallback) : self
+	public function AddAdditionalJsonAction(string $sActionName, callable $mCallback): self
 	{
-		if ($this->bIsEnabled && \is_callable($mCallback) && \strlen($sActionName))
-		{
-			$sActionName = 'DoPlugin'.$sActionName;
-
-			if (!isset($this->aAdditionalJson[$sActionName]))
-			{
-				$this->aAdditionalJson[$sActionName] = $mCallback;
-			}
+		$sActionName = "DoPlugin{$sActionName}";
+		if ($this->bIsEnabled && \strlen($sActionName) && !isset($this->aAdditionalJson[$sActionName])) {
+			$this->aAdditionalJson[$sActionName] = $mCallback;
 		}
-
 		return $this;
 	}
 
-	public function HasAdditionalJson(string $sActionName) : bool
+	public function HasAdditionalJson(string $sActionName): bool
 	{
 		return $this->bIsEnabled && isset($this->aAdditionalJson[$sActionName]);
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function RunAdditionalJson(string $sActionName)
+	public function RunAdditionalJson(string $sActionName): mixed
 	{
-		if ($this->bIsEnabled)
-		{
-			if (isset($this->aAdditionalJson[$sActionName]))
-			{
-				return $this->aAdditionalJson[$sActionName]();
-			}
-		}
-
-		return false;
+		return $this->HasAdditionalJson($sActionName) ? $this->aAdditionalJson[$sActionName](): false;
 	}
 
-	/**
-	 * @param mixed $mData
-	 */
-	public function JsonResponseHelper(string $sFunctionName, $mData) : array
+	public function JsonResponseHelper(string $sFunctionName, mixed $mData): array
 	{
-		return $this->oActions->DefaultResponse($sFunctionName, $mData);
+		return $this->oActions->DefaultResponse($mData, [], $sFunctionName);
 	}
 
-	public function GetUserPluginSettings(string $sPluginName) : array
+	public function GetUserPluginSettings(string $sPluginName): array
 	{
-		$oAccount = $this->oActions->GetAccount();
-		if ($oAccount)
-		{
+		$oAccount = $this->oActions->getAccountFromToken();
+		if ($oAccount) {
 			$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
-			if ($oSettings)
-			{
+			if ($oSettings) {
 				$aData = $oSettings->GetConf('Plugins', array());
-				if (isset($aData[$sPluginName]) && \is_array($aData[$sPluginName]))
-				{
+				if (isset($aData[$sPluginName]) && \is_array($aData[$sPluginName])) {
 					return $aData[$sPluginName];
 				}
 			}
@@ -434,42 +410,37 @@ class Manager
 		return array();
 	}
 
-	public function SaveUserPluginSettings(string $sPluginName, array $aSettings) : bool
+	public function SaveUserPluginSettings(string $sPluginName, array $aSettings): bool
 	{
-		$oAccount = $this->oActions->GetAccount();
-		if ($oAccount)
-		{
+		$oAccount = $this->oActions->getAccountFromToken();
+		if ($oAccount) {
 			$oSettings = $this->oActions->SettingsProvider()->Load($oAccount);
-			if ($oSettings)
-			{
+			if ($oSettings) {
 				$aData = $oSettings->GetConf('Plugins', array());
-				if (!\is_array($aData))
-				{
+				if (!\is_array($aData)) {
 					$aData = array();
 				}
 
 				$aPluginSettings = array();
-				if (isset($aData[$sPluginName]) && \is_array($aData[$sPluginName]))
-				{
+				if (isset($aData[$sPluginName]) && \is_array($aData[$sPluginName])) {
 					$aPluginSettings = $aData[$sPluginName];
 				}
 
-				foreach ($aSettings as $sKey => $mValue)
-				{
+				foreach ($aSettings as $sKey => $mValue) {
 					$aPluginSettings[$sKey] = $mValue;
 				}
 
 				$aData[$sPluginName] = $aPluginSettings;
 				$oSettings->SetConf('Plugins',$aData);
 
-				return $this->oActions->SettingsProvider()->Save($oAccount, $oSettings);
+				return $oSettings->save();
 			}
 		}
 
 		return false;
 	}
 
-	public function ReadLang(string $sLang, array &$aLang) : void
+	public function ReadLang(string $sLang, array &$aLang): void
 	{
 		if ($this->bIsEnabled) {
 			foreach ($this->aPlugins as $oPlugin) {
@@ -478,10 +449,10 @@ class Manager
 					$aPLang = [];
 
 					// First get english
-					if (\is_file("{$sPath}en.ini")) {
-						$aPLang = \parse_ini_file("{$sPath}en.ini", true);
-					} else if (\is_file("{$sPath}en.json")) {
+					if (\is_file("{$sPath}en.json")) {
 						$aPLang = \json_decode(\file_get_contents("{$sPath}en.json"), true);
+					} else if (\is_file("{$sPath}en.ini")) {
+						$aPLang = \parse_ini_file("{$sPath}en.ini", true);
 					}
 					if ($aPLang) {
 						$aLang = \array_replace_recursive($aLang, $aPLang);
@@ -490,12 +461,15 @@ class Manager
 					// Now get native
 					if ('en' !== $sLang) {
 						$aPLang = [];
-						if (\is_file("{$sPath}{$sLang}.ini")) {
-							$aPLang = \parse_ini_file("{$sPath}{$sLang}.ini", true);
-						} else if (\is_file($sPath.\strtr($sLang,'-','_').'.ini')) {
-							$aPLang = \parse_ini_file($sPath.\strtr($sLang,'-','_').'.ini', true);
-						} else if (\is_file("{$sPath}{$sLang}.json")) {
+						if (\is_file("{$sPath}{$sLang}.json")) {
 							$aPLang = \json_decode(\file_get_contents("{$sPath}{$sLang}.json"), true);
+						} else {
+							if (!\is_file("{$sPath}{$sLang}.ini")) {
+								$sLang = \strtr($sLang, '-', '_');
+							}
+							if (\is_file("{$sPath}{$sLang}.ini")) {
+								$aPLang = \parse_ini_file("{$sPath}{$sLang}.ini", true);
+							}
 						}
 						if ($aPLang) {
 							$aLang = \array_replace_recursive($aLang, $aPLang);
@@ -506,36 +480,23 @@ class Manager
 		}
 	}
 
-	public function IsEnabled() : bool
+	public function IsEnabled(): bool
 	{
 		return $this->bIsEnabled;
 	}
 
-	public function Count() : int
+	public function count(): int
 	{
 		return $this->bIsEnabled ? \count($this->aPlugins) : 0;
 	}
 
-	public function SetLogger(\MailSo\Log\Logger $oLogger) : self
+	public function WriteLog(string $sDesc, int $iType = \LOG_INFO): void
 	{
-		$this->oLogger = $oLogger;
-
-		return $this;
+		$this->logWrite($sDesc, $iType, 'PLUGIN');
 	}
 
-	public function WriteLog(string $sDesc, int $iType = \MailSo\Log\Enumerations\Type::INFO) : void
+	public function WriteException(string $sDesc, int $iType = \LOG_INFO): void
 	{
-		if ($this->oLogger)
-		{
-			$this->oLogger->Write($sDesc, $iType, 'PLUGIN');
-		}
-	}
-
-	public function WriteException(string $sDesc, int $iType = \MailSo\Log\Enumerations\Type::INFO) : void
-	{
-		if ($this->oLogger)
-		{
-			$this->oLogger->WriteException($sDesc, $iType, 'PLUGIN');
-		}
+		$this->logException($sDesc, $iType, 'PLUGIN');
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
index 187f6847b..7531f9266 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/Property.php
@@ -2,166 +2,191 @@
 
 namespace RainLoop\Plugins;
 
+use RainLoop\Enumerations\PluginPropertyType;
+
 class Property implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sName;
+	private string $sName;
 
-	/**
-	 * @var mixed
-	 */
-	private $mValue;
+	private mixed $mValue;
 
-	/**
-	 * @var string
-	 */
-	private $sLabel;
+	private string $sLabel = '';
 
-	/**
-	 * @var string
-	 */
-	private $sDesc;
+	private string $sDesc = '';
 
-	/**
-	 * @var int
-	 */
-	private $iType;
+	private int $iType = PluginPropertyType::STRING;
 
-	/**
-	 * @var bool
-	 */
-	private $bAllowedInJs;
+	private bool $bAllowedInJs = false;
 
-	/**
-	 * @var mixed
-	 */
-	private $mDefaultValue;
+	private mixed $mDefaultValue = '';
 
-	/**
-	 * @var string
-	 */
-	private $sPlaceholder;
+	private array $aOptions = [];
+
+	private string $sPlaceholder = '';
+
+	public bool $encrypted = false;
 
 	function __construct(string $sName)
 	{
 		$this->sName = $sName;
-		$this->iType = \RainLoop\Enumerations\PluginPropertyType::STRING;
-		$this->mDefaultValue = '';
-		$this->sLabel = '';
-		$this->sDesc = '';
-		$this->bAllowedInJs = false;
-		$this->sPlaceholder = '';
 	}
 
-	public static function NewInstance(string $sName) : self
+	public static function NewInstance(string $sName): self
 	{
 		return new self($sName);
 	}
 
-	public function SetType(int $iType) : self
+	public function SetType(int $iType): self
 	{
 		$this->iType = (int) $iType;
-
 		return $this;
 	}
 
-	/**
-	 * @param mixed $mValue
-	 */
-	public function SetValue($mValue) : void
+	public function SetValue(mixed $mValue): void
 	{
-		$this->mValue = $mValue;
+		$this->mValue = null;
+		switch ($this->iType) {
+			case PluginPropertyType::INT:
+				$this->mValue = (int) $mValue;
+				break;
+			case PluginPropertyType::BOOL:
+				$this->mValue = !empty($mValue);
+				break;
+			case PluginPropertyType::SELECT:
+				foreach ($this->aOptions as $option) {
+					if ($mValue == $option['id']) {
+						$this->mValue = (string) $mValue;
+					}
+				}
+				break;
+			case PluginPropertyType::SELECTION:
+				if ($this->aOptions && \in_array($mValue, $this->aOptions)) {
+					$this->mValue = (string) $mValue;
+				}
+				break;
+			case PluginPropertyType::PASSWORD:
+			case PluginPropertyType::STRING:
+			case PluginPropertyType::STRING_TEXT:
+			case PluginPropertyType::URL:
+				$this->mValue = (string) $mValue;
+				break;
+//			case PluginPropertyType::GROUP:
+//				throw new \Exception('Not allowed to set group value');
+		}
 	}
 
 	/**
 	 * @param mixed $mDefaultValue
 	 */
-	public function SetDefaultValue($mDefaultValue) : self
+	public function SetDefaultValue($mDefaultValue): self
 	{
-		$this->mDefaultValue = $mDefaultValue;
-
+		if (\is_array($mDefaultValue)) {
+			$this->aOptions = $mDefaultValue;
+		} else {
+			$this->mDefaultValue = $mDefaultValue;
+		}
 		return $this;
 	}
 
-	public function SetPlaceholder(string $sPlaceholder) : self
+	public function SetOptions(array $aOptions): self
+	{
+		$this->aOptions = $aOptions;
+		return $this;
+	}
+
+	public function SetPlaceholder(string $sPlaceholder): self
 	{
 		$this->sPlaceholder = $sPlaceholder;
-
 		return $this;
 	}
 
-	public function SetLabel(string $sLabel) : self
+	public function SetLabel(string $sLabel): self
 	{
 		$this->sLabel = $sLabel;
-
 		return $this;
 	}
 
-	public function SetDescription(string $sDesc) : self
+	public function SetDescription(string $sDesc): self
 	{
 		$this->sDesc = $sDesc;
-
 		return $this;
 	}
 
-	public function SetAllowedInJs(bool $bValue = true) : self
+	public function SetAllowedInJs(bool $bValue = true): self
 	{
 		$this->bAllowedInJs = $bValue;
-
 		return $this;
 	}
 
-	public function Name() : string
+	public function SetEncrypted(bool $bValue = true): self
+	{
+		$this->encrypted = $bValue;
+		return $this;
+	}
+
+	public function Name(): string
 	{
 		return $this->sName;
 	}
 
-	public function AllowedInJs() : bool
+	public function AllowedInJs(): bool
 	{
 		return $this->bAllowedInJs;
 	}
 
-	public function Description() : string
+	public function Description(): string
 	{
 		return $this->sDesc;
 	}
 
-	public function Label() : string
+	public function Label(): string
 	{
 		return $this->sLabel;
 	}
 
-	public function Type() : int
+	public function Type(): int
 	{
 		return $this->iType;
 	}
 
-	/**
-	 * @return mixed
-	 */
-	public function DefaultValue()
+	public function DefaultValue(): mixed
 	{
 		return $this->mDefaultValue;
 	}
 
-	public function Placeholder() : string
+	public function Options(): array
+	{
+		return $this->aOptions;
+	}
+
+	public function Placeholder(): string
 	{
 		return $this->sPlaceholder;
 	}
 
-	public function jsonSerialize()
+	public function Value(): mixed
 	{
+		return $this->mValue;
+	}
+
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		$mValue = $this->mValue;
+		if ($this->encrypted && $mValue) try {
+			$mValue = \SnappyMail\Crypt::DecryptFromJSON($mValue, \APP_SALT);
+		} catch (\Throwable $e) {
+		}
 		return array(
 			'@Object' => 'Object/PluginProperty',
-			'value' => $this->mValue,
+			'value' => $mValue,
 			'placeholder' => $this->sPlaceholder,
-			'Name' => $this->sName,
-			'Type' => $this->iType,
-			'Label' => $this->sLabel,
-			'Default' => $this->mDefaultValue,
-			'Desc' => $this->sDesc
+			'name' => $this->sName,
+			'type' => $this->iType,
+			'label' => $this->sLabel,
+			'default' => $this->mDefaultValue,
+			'options' => $this->aOptions,
+			'desc' => $this->sDesc
 		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
index c61a1241c..2ed849fc0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Plugins/PropertyCollection.php
@@ -5,22 +5,20 @@ namespace RainLoop\Plugins;
 //class PropertyCollection extends \MailSo\Base\Collection
 class PropertyCollection extends \ArrayObject implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	private $sLabel;
+	private string $sLabel;
 
 	function __construct(string $sLabel)
 	{
 		$this->sLabel = $sLabel;
 	}
 
-	public function jsonSerialize()
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
 		return array(
 			'@Object' => 'Object/PluginProperty',
-			'Type' => \RainLoop\Enumerations\PluginPropertyType::GROUP,
-			'Label' => $this->sLabel,
+			'type' => \RainLoop\Enumerations\PluginPropertyType::GROUP,
+			'label' => $this->sLabel,
 			'config' => $this->getArrayCopy()
 /*
 			'config' => [
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AbstractProvider.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AbstractProvider.php
index 91851693e..78ee2bfdb 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AbstractProvider.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AbstractProvider.php
@@ -4,33 +4,7 @@ namespace RainLoop\Providers;
 
 abstract class AbstractProvider
 {
-	/**
-	 * @var \RainLoop\Model\Account
-	 */
-	protected $oAccount;
+	use \MailSo\Log\Inherit;
 
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger = null;
-
-	public function IsActive() : bool
-	{
-		return false;
-	}
-
-	public function SetAccount(\RainLoop\Model\Account $oAccount)
-	{
-		$this->oAccount = $oAccount;
-	}
-
-	public function SetLogger(?\MailSo\Log\Logger $oLogger)
-	{
-		$this->oLogger = $oLogger;
-	}
-
-	public function Logger() : ?\MailSo\Log\Logger
-	{
-		return $this->oLogger;
-	}
+	abstract public function IsActive() : bool;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
index cccb7c5ad..2342d716c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook.php
@@ -2,16 +2,11 @@
 
 namespace RainLoop\Providers;
 
-use RainLoop\Providers\AddressBook\Enumerations\PropertyType as PropertyType;
-
-class AddressBook extends \RainLoop\Providers\AbstractProvider
+class AddressBook extends AbstractProvider
 {
-	/**
-	 * @var \RainLoop\Providers\AddressBook\AddressBookInterface
-	 */
-	private $oDriver;
+	private ?AddressBook\AddressBookInterface $oDriver;
 
-	public function __construct(?\RainLoop\Providers\AddressBook\AddressBookInterface $oDriver)
+	public function __construct(?AddressBook\AddressBookInterface $oDriver)
 	{
 		$this->oDriver = $oDriver;
 	}
@@ -19,46 +14,32 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 	public function Test() : string
 	{
 		\sleep(1);
-		return $this->oDriver instanceof \RainLoop\Providers\AddressBook\AddressBookInterface ?
-			$this->oDriver->Test() : 'Personal address book driver is not allowed';
+		return $this->oDriver ? $this->oDriver->Test() : 'Personal address book driver is not allowed';
 	}
 
 	public function IsActive() : bool
 	{
-		return $this->oDriver instanceof \RainLoop\Providers\AddressBook\AddressBookInterface &&
-			$this->oDriver->IsSupported();
+		return $this->oDriver && $this->oDriver->IsSupported();
 	}
 
-	public function IsSupported() : bool
+	public function Sync() : bool
 	{
-		return $this->oDriver instanceof \RainLoop\Providers\AddressBook\AddressBookInterface &&
-			$this->oDriver->IsSupported();
+		return $this->IsActive() ? $this->oDriver->Sync() : false;
 	}
 
-	public function IsSharingAllowed() : bool
+	public function Export(string $sType = 'vcf') : bool
 	{
-		return $this->oDriver instanceof \RainLoop\Providers\AddressBook\AddressBookInterface &&
-			$this->oDriver->IsSharingAllowed();
+		return $this->IsActive() ? $this->oDriver->Export($sType) : false;
 	}
 
-	public function Sync(array $oConfig) : bool
+	public function ContactSave(AddressBook\Classes\Contact $oContact) : bool
 	{
-		return $this->IsActive() ? $this->oDriver->Sync($oConfig) : false;
+		return $this->IsActive() ? $this->oDriver->ContactSave($oContact) : false;
 	}
 
-	public function Export(string $sEmail, string $sType = 'vcf') : bool
+	public function DeleteContacts(array $aContactIds) : bool
 	{
-		return $this->IsActive() ? $this->oDriver->Export($sEmail, $sType) : false;
-	}
-
-	public function ContactSave(string $sEmail, \RainLoop\Providers\AddressBook\Classes\Contact $oContact) : bool
-	{
-		return $this->IsActive() ? $this->oDriver->ContactSave($sEmail, $oContact) : false;
-	}
-
-	public function DeleteContacts(string $sEmail, array $aContactIds) : bool
-	{
-		return $this->IsActive() ? $this->oDriver->DeleteContacts($sEmail, $aContactIds) : false;
+		return $this->IsActive() ? $this->oDriver->DeleteContacts($aContactIds) : false;
 	}
 
 	public function DeleteAllContacts(string $sEmail) : bool
@@ -66,209 +47,36 @@ class AddressBook extends \RainLoop\Providers\AbstractProvider
 		return $this->IsActive() ? $this->oDriver->DeleteAllContacts($sEmail) : false;
 	}
 
-	public function GetContacts(string $sEmail, int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array
+	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array
 	{
-		return $this->IsActive() ? $this->oDriver->GetContacts($sEmail,
-			$iOffset, $iLimit, $sSearch, $iResultCount) : array();
+		return $this->IsActive() ? $this->oDriver->GetContacts(
+			\max(0, $iOffset),
+			0 < $iLimit ? $iLimit : 20,
+			\trim($sSearch),
+			$iResultCount
+		) : array();
 	}
 
-	public function GetContactByID(string $sEmail, $mID, bool $bIsStrID = false) : ?\RainLoop\Providers\AddressBook\Classes\Contact
+	public function GetContactByEmail(string $sEmail) : ?AddressBook\Classes\Contact
 	{
-		return $this->IsActive() ? $this->oDriver->GetContactByID($sEmail, $mID, $bIsStrID) : null;
+		return $this->IsActive() ? $this->oDriver->GetContactByEmail($sEmail) : null;
+	}
+
+	public function GetContactByID($mID, bool $bIsStrID = false) : ?AddressBook\Classes\Contact
+	{
+		return $this->IsActive() ? $this->oDriver->GetContactByID($mID, $bIsStrID) : null;
 	}
 
 	/**
 	 * @throws \InvalidArgumentException
 	 */
-	public function GetSuggestions(string $sEmail, string $sSearch, int $iLimit = 20) : array
+	public function GetSuggestions(string $sSearch, int $iLimit = 20) : array
 	{
-		return $this->IsActive() ? $this->oDriver->GetSuggestions($sEmail, $sSearch, $iLimit) : array();
+		return $this->IsActive() ? $this->oDriver->GetSuggestions($sSearch, $iLimit) : array();
 	}
 
-	public function IncFrec(string $sEmail, array $aEmails, bool $bCreateAuto = true) : bool
+	public function IncFrec(array $aEmails, bool $bCreateAuto = true) : bool
 	{
-		return $this->IsActive() ? $this->oDriver->IncFrec($sEmail, $aEmails, $bCreateAuto) : false;
-	}
-
-	private function csvNameToTypeConvertor(string $sCsvName) : int
-	{
-		static $aMap = null;
-		if (null === $aMap)
-		{
-			$aMap = array(
-				'Title' => PropertyType::FULLNAME,
-				'Name' => PropertyType::FULLNAME,
-				'FullName' => PropertyType::FULLNAME,
-				'DisplayName' => PropertyType::FULLNAME,
-				'GivenName' => PropertyType::FULLNAME,
-				'First' => PropertyType::FIRST_NAME,
-				'FirstName' => PropertyType::FIRST_NAME,
-				'Middle' => PropertyType::MIDDLE_NAME,
-				'MiddleName' => PropertyType::MIDDLE_NAME,
-				'Last' => PropertyType::LAST_NAME,
-				'LastName' => PropertyType::LAST_NAME,
-				'Suffix' => PropertyType::NAME_SUFFIX,
-				'NameSuffix' => PropertyType::NAME_SUFFIX,
-				'Prefix' => PropertyType::NAME_PREFIX,
-				'NamePrefix' => PropertyType::NAME_PREFIX,
-				'ShortName' => PropertyType::NICK_NAME,
-				'NickName' => PropertyType::NICK_NAME,
-				'BusinessFax' => array(PropertyType::PHONE, 'Work,Fax'),
-				'BusinessFax2' => array(PropertyType::PHONE, 'Work,Fax'),
-				'BusinessFax3' => array(PropertyType::PHONE, 'Work,Fax'),
-				'BusinessPhone' => array(PropertyType::PHONE, 'Work'),
-				'BusinessPhone2' => array(PropertyType::PHONE, 'Work'),
-				'BusinessPhone3' => array(PropertyType::PHONE, 'Work'),
-				'CompanyPhone' => array(PropertyType::PHONE, 'Work'),
-				'CompanyMainPhone' => array(PropertyType::PHONE, 'Work'),
-				'HomeFax' => array(PropertyType::PHONE, 'Home,Fax'),
-				'HomeFax2' => array(PropertyType::PHONE, 'Home,Fax'),
-				'HomeFax3' => array(PropertyType::PHONE, 'Home,Fax'),
-				'HomePhone' => array(PropertyType::PHONE, 'Home'),
-				'HomePhone2' => array(PropertyType::PHONE, 'Home'),
-				'HomePhone3' => array(PropertyType::PHONE, 'Home'),
-				'Mobile' => array(PropertyType::PHONE, 'Mobile'),
-				'MobilePhone' => array(PropertyType::PHONE, 'Mobile'),
-				'BusinessMobile' => array(PropertyType::PHONE, 'Work,Mobile'),
-				'BusinessMobilePhone' => array(PropertyType::PHONE, 'Work,Mobile'),
-				'OtherFax' => array(PropertyType::PHONE, 'Other,Fax'),
-				'OtherPhone' => array(PropertyType::PHONE, 'Other'),
-				'PrimaryPhone' => array(PropertyType::PHONE, 'Pref,Home'),
-				'Email' => array(PropertyType::EMAIl, 'Home'),
-				'Email2' => array(PropertyType::EMAIl, 'Home'),
-				'Email3' => array(PropertyType::EMAIl, 'Home'),
-				'HomeEmail' => array(PropertyType::EMAIl, 'Home'),
-				'HomeEmail2' => array(PropertyType::EMAIl, 'Home'),
-				'HomeEmail3' => array(PropertyType::EMAIl, 'Home'),
-				'PrimaryEmail' => array(PropertyType::EMAIl, 'Home'),
-				'PrimaryEmail2' => array(PropertyType::EMAIl, 'Home'),
-				'PrimaryEmail3' => array(PropertyType::EMAIl, 'Home'),
-				'EmailAddress' => array(PropertyType::EMAIl, 'Home'),
-				'Email2Address' => array(PropertyType::EMAIl, 'Home'),
-				'Email3Address' => array(PropertyType::EMAIl, 'Home'),
-				'OtherEmail' => array(PropertyType::EMAIl, 'Other'),
-				'BusinessEmail' => array(PropertyType::EMAIl, 'Work'),
-				'BusinessEmail2' => array(PropertyType::EMAIl, 'Work'),
-				'BusinessEmail3' => array(PropertyType::EMAIl, 'Work'),
-				'PersonalEmail' => array(PropertyType::EMAIl, 'Home'),
-				'PersonalEmail2' => array(PropertyType::EMAIl, 'Home'),
-				'PersonalEmail3' => array(PropertyType::EMAIl, 'Home'),
-				'Notes' => PropertyType::NOTE,
-				'Web' => PropertyType::WEB_PAGE,
-				'BusinessWeb' => array(PropertyType::WEB_PAGE, 'Work'),
-				'WebPage' => PropertyType::WEB_PAGE,
-				'BusinessWebPage' => array(PropertyType::WEB_PAGE, 'Work'),
-				'WebSite' => PropertyType::WEB_PAGE,
-				'BusinessWebSite' => array(PropertyType::WEB_PAGE, 'Work'),
-				'PersonalWebSite' => PropertyType::WEB_PAGE
-			);
-
-			$aMap = \array_change_key_case($aMap, CASE_LOWER);
-		}
-
-		$sCsvNameLower = \MailSo\Base\Utils::IsAscii($sCsvName) ? \preg_replace('/[\s\-]+/', '', \strtolower($sCsvName)) : '';
-		return !empty($sCsvNameLower) && isset($aMap[$sCsvNameLower]) ? $aMap[$sCsvNameLower] : PropertyType::UNKNOWN;
-	}
-
-	public function ImportCsvArray(string $sEmail, array $aCsvData) : int
-	{
-		$iCount = 0;
-		if ($this->IsActive() && \count($aCsvData))
-		{
-			$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
-			foreach ($aCsvData as $aItem)
-			{
-				\MailSo\Base\Utils::ResetTimeLimit();
-
-				foreach ($aItem as $sItemName => $sItemValue)
-				{
-					$sItemName = \trim($sItemName);
-					$sItemValue = \trim($sItemValue);
-
-					if (!empty($sItemName) && !empty($sItemValue))
-					{
-						$mData = $this->csvNameToTypeConvertor($sItemName);
-						$iType = \is_array($mData) ? $mData[0] : $mData;
-
-						if (PropertyType::UNKNOWN !== $iType)
-						{
-							$oProp = new \RainLoop\Providers\AddressBook\Classes\Property();
-							$oProp->Type = $iType;
-							$oProp->Value = $sItemValue;
-							$oProp->TypeStr = \is_array($mData) && !empty($mData[1]) ? $mData[1] : '';
-
-							$oContact->Properties[] = $oProp;
-						}
-					}
-				}
-
-				if ($oContact && \count($oContact->Properties))
-				{
-					if ($this->ContactSave($sEmail, $oContact))
-					{
-						$iCount++;
-					}
-				}
-
-				$oContact->Clear();
-			}
-
-			unset($oContact);
-		}
-
-		return $iCount;
-	}
-
-	public function ImportVcfFile(string $sEmail, string $sVcfData) : int
-	{
-		$iCount = 0;
-
-		if ($this->IsActive() && \is_string($sVcfData))
-		{
-			$sVcfData = \trim($sVcfData);
-			if ("\xef\xbb\xbf" === \substr($sVcfData, 0, 3))
-			{
-				$sVcfData = \substr($sVcfData, 3);
-			}
-
-			$oVCardSplitter = null;
-			try
-			{
-				$oVCardSplitter = new \Sabre\VObject\Splitter\VCard($sVcfData);
-			}
-			catch (\Throwable $oExc)
-			{
-				$this->Logger()->WriteException($oExc);
-			}
-
-			if ($oVCardSplitter)
-			{
-				$oContact = new \RainLoop\Providers\AddressBook\Classes\Contact();
-
-				$oVCard = null;
-
-				while ($oVCard = $oVCardSplitter->getNext())
-				{
-					if ($oVCard instanceof \Sabre\VObject\Component\VCard)
-					{
-						\MailSo\Base\Utils::ResetTimeLimit();
-
-						$oContact->PopulateByVCard($oVCard);
-
-						if (\count($oContact->Properties))
-						{
-							if ($this->ContactSave($sEmail, $oContact))
-							{
-								$iCount++;
-							}
-						}
-
-						$oContact->Clear();
-					}
-				}
-			}
-		}
-
-		return $iCount;
+		return $this->IsActive() ? $this->oDriver->IncFrec($aEmails, $bCreateAuto) : false;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
index bc4519c7d..564a0d48b 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/AddressBookInterface.php
@@ -5,4 +5,32 @@ namespace RainLoop\Providers\AddressBook;
 interface AddressBookInterface
 {
 	public function IsSupported() : bool;
+
+	public function SetEmail(string $sEmail) : bool;
+
+	public function Sync() : bool;
+
+	public function Export(string $sType = 'vcf') : bool;
+
+	public function ContactSave(Classes\Contact $oContact) : bool;
+
+	public function DeleteContacts(array $aContactIds) : bool;
+
+	public function DeleteAllContacts(string $sEmail) : bool;
+
+	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array;
+
+	public function GetContactByEmail(string $sEmail) : ?Classes\Contact;
+
+	public function GetContactByID($mID, bool $bIsStrID = false) : ?Classes\Contact;
+
+	public function GetSuggestions(string $sSearch, int $iLimit = 20) : array;
+
+	/**
+	 * Add/increment email address usage
+	 * Handy for "most used" sorting suggestions in PdoAddressBook
+	 */
+	public function IncFrec(array $aEmails, bool $bCreateAuto = true) : bool;
+
+	public function Test() : string;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
index d16f41e0f..80b9706fd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/CardDAV.php
@@ -6,40 +6,48 @@ use SnappyMail\DAV\Client as DAVClient;
 
 trait CardDAV
 {
+	private $aDAVConfig = ['Mode' => 0];
+
+	public function setDAVClientConfig(?array $aConfig)
+	{
+		if (isset($aConfig['User'], $aConfig['Password'], $aConfig['Url']) && !empty($aConfig['Mode'])) {
+			$this->aDAVConfig = $aConfig;
+		} else {
+			$this->aDAVConfig = ['Mode' => 0];
+		}
+	}
+
+	protected function isDAVReadWrite()
+	{
+		return 1 == $this->aDAVConfig['Mode'];
+	}
+
 	protected function prepareDavSyncData(DAVClient $oClient, string $sPath)
 	{
 		$mResult = false;
 		$aResponse = null;
 		try
 		{
-			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
-
 			$aResponse = $oClient->propFind($sPath, array(
 				'{DAV:}getlastmodified',
 				'{DAV:}resourcetype',
 				'{DAV:}getetag'
 			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Throwable $oException)
 		{
-			$this->oLogger->WriteException($oException);
+			$this->logException($oException);
 		}
 
 		/**
 		 * find every <response><href>*.vcf</href> with empty <resourcetype/>
 		 */
-		if (\is_array($aResponse))
-		{
+		if (\is_array($aResponse)) {
 			$mResult = array();
-			foreach ($aResponse as $sKey => $aItem)
-			{
+			foreach ($aResponse as $sKey => $aItem) {
 				$sKey = \rtrim(\trim($sKey), '\\/');
-				if (!empty($sKey) && is_array($aItem))
-				{
-					if (isset($aItem['{DAV:}getetag']))
-					{
+				if (!empty($sKey) && is_array($aItem)) {
+					if (isset($aItem['{DAV:}getetag'])) {
 						$aMatch = array();
 						if (\preg_match('/\/([^\/?]+)$/', $sKey, $aMatch) && !empty($aMatch[1])
 						 && !static::hasDAVCollection($aItem))
@@ -56,14 +64,11 @@ trait CardDAV
 								'changed' => 0
 							);
 
-							if (isset($aItem['{DAV:}getlastmodified']))
-							{
+							if (isset($aItem['{DAV:}getlastmodified'])) {
 								$mResult[$sKeyID]['lastmodified'] = $aItem['{DAV:}getlastmodified'];
 								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::ParseRFC2822DateString(
 									$aItem['{DAV:}getlastmodified']);
-							}
-							else
-							{
+							} else {
 								$mResult[$sKeyID]['changed'] = \MailSo\Base\DateTimeHelper::TryToParseSpecEtagFormat($mResult[$sKeyID]['etag']);
 								$mResult[$sKeyID]['lastmodified'] = 0 < $mResult[$sKeyID]['changed'] ?
 									\gmdate('c', $mResult[$sKeyID]['changed']) : '';
@@ -79,288 +84,215 @@ trait CardDAV
 		return $mResult;
 	}
 
-	protected function davClientRequest(DAVClient $oClient, string $sCmd, string $sUrl, $mData = null) : ?\SnappyMail\HTTP\Response
+	protected function davClientRequest(DAVClient $oClient, string $sCmd, string $sUrl, mixed $mData = null): ?\SnappyMail\HTTP\Response
 	{
 		\MailSo\Base\Utils::ResetTimeLimit();
 
-		$this->oLogger->Write($sCmd.' '.$sUrl.(('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData ? ' ('.\strlen($mData).')' : ''),
-			\MailSo\Log\Enumerations\Type::INFO, 'DAV');
-
-//		if ('PUT' === $sCmd || 'POST' === $sCmd)
-//		{
-//			$this->oLogger->Write($mData, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
-//		}
+		$this->logWrite($sCmd.' '.$sUrl.(('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData ? ' ('.\strlen($mData).')' : ''),
+			\LOG_INFO, 'DAV');
 
 		try
 		{
-			if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData)
-			{
+			if (('PUT' === $sCmd || 'POST' === $sCmd) && null !== $mData) {
 				return $oClient->request($sCmd, $sUrl, $mData, array(
 					'Content-Type' => 'text/vcard; charset=utf-8'
 				));
 			}
-			else
-			{
-				return $oClient->request($sCmd, $sUrl);
-			}
-
-//			if ('GET' === $sCmd)
-//			{
-//				$this->oLogger->WriteDump($aResponse, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+			return $oClient->request($sCmd, $sUrl);
+//			if ('GET' === $sCmd) {
+//				$this->oLogger->WriteDump($aResponse, \LOG_INFO, 'DAV');
 //			}
 		}
 		catch (\Throwable $oException)
 		{
-			$this->oLogger->WriteException($oException);
+			$this->logException($oException);
 		}
 
 		return null;
 	}
 
-	private function detectionPropFind(DAVClient $oClient, string $sPath) : ?array
+	private function detectionPropFind(DAVClient $oClient, string $sPath): ?array
 	{
-		$aResponse = null;
-
 		try
 		{
-			$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
-
-			$aResponse = $oClient->propFind($sPath, array(
+			return $oClient->propFind($sPath, array(
 				'{DAV:}current-user-principal',
 				'{DAV:}resourcetype',
 				'{DAV:}displayname',
 				'{urn:ietf:params:xml:ns:carddav}addressbook-home-set'
 			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
 		}
 		catch (\Throwable $oException)
 		{
-			$this->oLogger->WriteException($oException);
+			$this->logException($oException);
 		}
 
-		return $aResponse;
+		return null;
 	}
 
-	private function getContactsPaths(DAVClient $oClient, string $sUser, string $sPassword, string $sProxy = '') : array
+	private function getContactsPaths(DAVClient $oClient, string $sPath, string $sUser,
+		#[\SensitiveParameter]
+		string $sPassword,
+		string $sProxy = ''): array
 	{
 		$aContactsPaths = array();
 
 		$sCurrentUserPrincipal = '';
 		$sAddressbookHomeSet = '';
 
-//		[{DAV:}current-user-principal] => /cloud/remote.php/carddav/principals/admin/
-//		[{urn:ietf:params:xml:ns:carddav}addressbook-home-set] => /cloud/remote.php/carddav/addressbooks/admin/
-
-		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav');
+		$aResponse = $this->detectionPropFind($oClient, '/.well-known/carddav')
+			?: $this->detectionPropFind($oClient, $sPath);
 
 		$sNextPath = '';
 		$sFirstNextPath = '';
-		if (\is_array($aResponse))
-		{
-			foreach ($aResponse as $sKey => $aItem)
-			{
-				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-					false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
+		if (\is_array($aResponse)) {
+			foreach ($aResponse as $sPropPath => $aItem) {
+				if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'])
+				 && false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
 				{
-					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
+					$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
 					continue;
 				}
 
-				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
-				{
-					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
+				if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href'])) {
+					$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
 					continue;
 				}
 
-				if (!empty($sKey))
-				{
-					if (empty($sFirstNextPath))
-					{
-						$sFirstNextPath = $sKey;
+				if (!empty($sPropPath)) {
+					if (empty($sFirstNextPath)) {
+						$sFirstNextPath = $sPropPath;
 					}
 
-					if (empty($sNextPath))
-					{
-						if (static::hasDAVCollection($aItem))
-						{
-							$sNextPath = $sKey;
+					if (empty($sNextPath)) {
+						if (static::hasDAVCollection($aItem)) {
+							$sNextPath = $sPropPath;
 							continue;
 						}
 					}
 				}
 			}
 
-			if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath))
-			{
+			if (empty($sNextPath) && empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet) && !empty($sFirstNextPath)) {
 				$sNextPath = $sFirstNextPath;
 			}
 		}
 
-		if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet))
-		{
-			if (empty($sNextPath))
-			{
+		if (empty($sCurrentUserPrincipal) && empty($sAddressbookHomeSet)) {
+			if (empty($sNextPath)) {
 				return $aContactsPaths;
 			}
-			else
-			{
-				if (\preg_match('/^http[s]?:\/\//i', $sNextPath))
-				{
-					$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
-					if ($oClient)
-					{
-						$sNextPath = $oClient->__UrlPath__;
-					}
-					else
-					{
-						return $aContactsPaths;
-					}
-				}
-
-				$aResponse = $this->detectionPropFind($oClient, $sNextPath);
-				if (\is_array($aResponse))
-				{
-					foreach ($aResponse as $sKey => $aItem)
-					{
-						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
-						{
-							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
-							continue;
-						}
-
-						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']))
-						{
-							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal'];
-							continue;
-						}
-					}
-				}
-			}
-		}
-
-		if (empty($sAddressbookHomeSet))
-		{
-			if (empty($sCurrentUserPrincipal))
-			{
-				return $aContactsPaths;
-			}
-			else
-			{
-				if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal))
-				{
-					$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
-					if ($oClient)
-					{
-						$sCurrentUserPrincipal = $oClient->__UrlPath__;
-					}
-					else
-					{
-						return $aContactsPaths;
-					}
-				}
-
-				$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
-				if (\is_array($aResponse))
-				{
-					foreach ($aResponse as $sKey => $aItem)
-					{
-						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']) &&
-							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'], '/calendar-proxy'))
-						{
-							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set'];
-							continue;
-						}
-					}
-				}
-			}
-		}
-
-		if (empty($sAddressbookHomeSet))
-		{
-			return $aContactsPaths;
-		}
-		else
-		{
-			if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet))
-			{
-				$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
-				if ($oClient)
-				{
-					$sAddressbookHomeSet = $oClient->__UrlPath__;
-				}
-				else
-				{
+			if (\preg_match('/^http[s]?:\/\//i', $sNextPath)) {
+				$oClient = $this->getDavClientFromUrl($sNextPath, $sUser, $sPassword, $sProxy);
+				if (!$oClient) {
 					return $aContactsPaths;
 				}
+				$sNextPath = $oClient->urlPath;
 			}
 
-			$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
-			if (\is_array($aResponse))
-			{
-				foreach ($aResponse as $sKey => $aItem)
-				{
-					if (!empty($sKey) && static::hasDAVCollection($aItem)
-					 && \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
-					{
-						$aContactsPaths[$sKey] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
+			if ($sPath != $sNextPath) {
+				$aResponse = $this->detectionPropFind($oClient, $sNextPath);
+				if (\is_array($aResponse)) {
+					foreach ($aResponse as $aItem) {
+						if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
+							false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
+						{
+							$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
+							continue;
+						}
+
+						if (empty($sCurrentUserPrincipal) && !empty($aItem['{DAV:}current-user-principal']['{DAV:}href'])) {
+							$sCurrentUserPrincipal = $aItem['{DAV:}current-user-principal']['{DAV:}href'];
+							continue;
+						}
 					}
 				}
 			}
 		}
 
+		if (empty($sAddressbookHomeSet)) {
+			if (empty($sCurrentUserPrincipal)) {
+				return $aContactsPaths;
+			}
+			if (\preg_match('/^http[s]?:\/\//i', $sCurrentUserPrincipal)) {
+				$oClient = $this->getDavClientFromUrl($sCurrentUserPrincipal, $sUser, $sPassword, $sProxy);
+				if (!$oClient) {
+					return $aContactsPaths;
+				}
+				$sCurrentUserPrincipal = $oClient->urlPath;
+			}
+
+			$aResponse = $this->detectionPropFind($oClient, $sCurrentUserPrincipal);
+			if (\is_array($aResponse)) {
+				foreach ($aResponse as $aItem) {
+					if (empty($sAddressbookHomeSet) && !empty($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href']) &&
+						false === \strpos($aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'], '/calendar-proxy'))
+					{
+						$sAddressbookHomeSet = $aItem['{urn:ietf:params:xml:ns:carddav}addressbook-home-set']['{DAV:}href'];
+						continue;
+					}
+				}
+			}
+		}
+
+		if (empty($sAddressbookHomeSet)) {
+			return $aContactsPaths;
+		}
+		if (\preg_match('/^http[s]?:\/\//i', $sAddressbookHomeSet)) {
+			$oClient = $this->getDavClientFromUrl($sAddressbookHomeSet, $sUser, $sPassword, $sProxy);
+			if (!$oClient) {
+				return $aContactsPaths;
+			}
+			$sAddressbookHomeSet = $oClient->urlPath;
+		}
+
+		$aResponse = $this->detectionPropFind($oClient, $sAddressbookHomeSet);
+		if (\is_array($aResponse)) {
+			foreach ($aResponse as $sPropPath => $aItem) {
+				if (!empty($sPropPath) && static::hasDAVCollection($aItem)
+				 && \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
+				{
+					$aContactsPaths[$sPropPath] = isset($aItem['{DAV:}displayname']) ? \trim($aItem['{DAV:}displayname']) : '';
+				}
+			}
+		}
+
 		return $aContactsPaths;
 	}
 
-	private function checkContactsPath(DAVClient $oClient, string $sPath) : bool
+	/**
+	 * Checks if remote path resourcetype is an addressbook
+	 */
+	private function checkContactsPath(DAVClient $oClient, string $sPath): bool
 	{
-		if (!$oClient)
-		{
-			return false;
-		}
-
-		$this->oLogger->Write('PROPFIND '.$sPath, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
-
-		$aResponse = null;
-		try
-		{
-			$aResponse = $oClient->propFind($sPath, array(
-				'{DAV:}resourcetype'
-			), 1);
-
-//			$this->oLogger->WriteDump($aResponse);
-		}
-		catch (\Throwable $oException)
-		{
-			$this->oLogger->WriteException($oException);
-		}
+		$aResponse = $oClient->propFind($sPath, array(
+			'{DAV:}resourcetype'
+		), 1);
 
 		$bGood = false;
-		if (\is_array($aResponse))
-		{
-			foreach ($aResponse as $sKey => $aItem)
-			{
+		if (\is_array($aResponse)) {
+			foreach ($aResponse as $sKey => $aItem) {
 				if (!empty($sKey) && static::hasDAVCollection($aItem)
 				 && \in_array('{urn:ietf:params:xml:ns:carddav}addressbook', $aItem['{DAV:}resourcetype']))
 				{
 					$bGood = true;
 				}
 			}
-		}
-
-		if ($bGood)
-		{
-			$oClient->__UrlPath__ = $sPath;
+			if ($bGood) {
+				$oClient->urlPath = $sPath;
+			}
 		}
 
 		return $bGood;
 	}
 
-	private function getDavClientFromUrl(string $sUrl, string $sUser, string $sPassword, string $sProxy = '') : DAVClient
+	private function getDavClientFromUrl(string $sUrl, string $sUser,
+		#[\SensitiveParameter]
+		string $sPassword,
+		string $sProxy = ''
+	): DAVClient
 	{
-		if (!\preg_match('/^http[s]?:\/\//i', $sUrl))
-		{
+		if (!\preg_match('/^http[s]?:\/\//i', $sUrl)) {
 			$sUrl = \preg_replace('/^fruux\.com/i', 'dav.fruux.com', $sUrl);
 			$sUrl = \preg_replace('/^icloud\.com/i', 'contacts.icloud.com', $sUrl);
 			$sUrl = \preg_replace('/^gmail\.com/i', 'google.com', $sUrl);
@@ -368,8 +300,7 @@ trait CardDAV
 		}
 
 		$aUrl = \parse_url($sUrl);
-		if (!\is_array($aUrl))
-		{
+		if (!\is_array($aUrl)) {
 			$aUrl = array();
 		}
 
@@ -384,30 +315,36 @@ trait CardDAV
 			'password' => $sPassword
 		);
 
-		$this->oLogger->AddSecret($sPassword);
+		$this->logMask($sPassword);
 
-		if (!empty($sProxy))
-		{
+		if (!empty($sProxy)) {
 			$aSettings['proxy'] = $sProxy;
 		}
 
 		$oClient = new DAVClient($aSettings);
 		$oClient->setVerifyPeer(false);
 
-		$oClient->__UrlPath__ = $aUrl['path'];
+		$oClient->urlPath = $aUrl['path'];
 
-		$this->oLogger->Write('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \MailSo\Log\Enumerations\Type::INFO, 'DAV');
+		$this->logWrite('DavClient: User: '.$aSettings['userName'].', Url: '.$sUrl, \LOG_INFO, 'DAV');
 
 		return $oClient;
 	}
 
-	protected function getDavClient(string $sUrl, string $sUser, string $sPassword, string $sProxy = '') : ?DAVClient
+	public function getDavClient(): ?DAVClient
 	{
+		if (!$this->aDAVConfig['Mode']) {
+			return null;
+		}
+		$sUrl = $this->aDAVConfig['Url'];
+		$sUser = $this->aDAVConfig['User'];
+		$sPassword = $this->aDAVConfig['Password'];
+		$sProxy = '';
+
 		$aMatch = array();
 		$sUserAddressBookNameName = '';
 
-		if (\preg_match('/\|(.+)$/', $sUrl, $aMatch) && !empty($aMatch[1]))
-		{
+		if (\preg_match('/\|(.+)$/', $sUrl, $aMatch) && !empty($aMatch[1])) {
 			$sUserAddressBookNameName = \trim($aMatch[1]);
 			$sUserAddressBookNameName = \mb_strtolower($sUserAddressBookNameName);
 
@@ -416,40 +353,33 @@ trait CardDAV
 
 		$oClient = $this->getDavClientFromUrl($sUrl, $sUser, $sPassword, $sProxy);
 
-		$sPath = $oClient->__UrlPath__;
+		$sPath = $oClient->urlPath;
 
 		$bGood = true;
-		if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath))
-		{
-			$sNewPath = '';
-
-			$aPaths = $this->getContactsPaths($oClient, $sUser, $sPassword, $sProxy);
+		if ('' === $sPath || '/' === $sPath || !$this->checkContactsPath($oClient, $sPath)) {
+			/**
+			 * Path is not an addressbook, try to find it
+			 */
+			$aPaths = $this->getContactsPaths($oClient, $sPath, $sUser, $sPassword, $sProxy);
 			$this->oLogger->WriteDump($aPaths);
 
-			if (\is_array($aPaths))
-			{
-				if (1 < \count($aPaths))
-				{
-					if ('' !== $sUserAddressBookNameName)
-					{
-						foreach ($aPaths as $sKey => $sValue)
-						{
+			$sNewPath = '';
+			if (\is_array($aPaths)) {
+				if (1 < \count($aPaths)) {
+					if ('' !== $sUserAddressBookNameName) {
+						foreach ($aPaths as $sKey => $sValue) {
 							$sValue = \mb_strtolower(\trim($sValue));
-							if ($sValue === $sUserAddressBookNameName)
-							{
+							if ($sValue === $sUserAddressBookNameName) {
 								$sNewPath = $sKey;
 								break;
 							}
 						}
 					}
 
-					if (empty($sNewPath))
-					{
-						foreach ($aPaths as $sKey => $sValue)
-						{
+					if (empty($sNewPath)) {
+						foreach ($aPaths as $sKey => $sValue) {
 							$sValue = \mb_strtolower($sValue);
-							if (\in_array($sValue, array('contacts', 'default', 'addressbook', 'address book')))
-							{
+							if (\in_array($sValue, array('contacts', 'default', 'addressbook', 'address book'))) {
 								$sNewPath = $sKey;
 								break;
 							}
@@ -457,25 +387,28 @@ trait CardDAV
 					}
 				}
 
-				if (empty($sNewPath))
-				{
-					foreach ($aPaths as $sKey => $sValue)
-					{
+				if (empty($sNewPath)) {
+					foreach ($aPaths as $sKey => $sValue) {
 						$sNewPath = $sKey;
 						break;
 					}
 				}
 			}
 
-			$sPath = $sNewPath;
-
-			$bGood = $this->checkContactsPath($oClient, $sPath);
+			$bGood = $sNewPath && $this->checkContactsPath($oClient, $sNewPath);
+			if (!$bGood) {
+				throw new \RainLoop\Exceptions\ClientException(
+					\RainLoop\Notifications::ContactsSyncError,
+					null,
+					'Contacts path not found at: '.$sPath
+				);
+			}
 		}
 
 		return $bGood ? $oClient : null;
 	}
 
-	private static function hasDAVCollection($aItem)
+	private static function hasDAVCollection($aItem): bool
 	{
 		return !empty($aItem['{DAV:}resourcetype'])
 			&& \is_array($aItem['{DAV:}resourcetype'])
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
index 736e2f4f8..a84718e1a 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Contact.php
@@ -2,605 +2,90 @@
 
 namespace RainLoop\Providers\AddressBook\Classes;
 
-use
-	RainLoop\Providers\AddressBook\Enumerations\PropertyType,
-	RainLoop\Providers\AddressBook\Classes\Property
-;
+use Sabre\VObject\Component\VCard;
 
 class Contact implements \JsonSerializable
 {
-	/**
-	 * @var string
-	 */
-	public $IdContact;
+	public string $id = '';
+
+	public string $IdContactStr = '';
+
+//	public string $Display;
+
+	public int $Changed;
+
+	public bool $ReadOnly = false;
 
 	/**
-	 * @var string
+	 * Used for CardDAV synchronization
 	 */
-	public $IdContactStr;
+	public string $Etag = '';
 
-	/**
-	 * @var string
-	 */
-	public $Display;
+	protected ?VCard $vCard = null;
 
-	/**
-	 * @var int
-	 */
-	public $Changed;
-
-	/**
-	 * @var array
-	 */
-	public $Properties;
-
-	/**
-	 * @var bool
-	 */
-	public $ReadOnly;
-
-	/**
-	 * @var int
-	 */
-	public $IdPropertyFromSearch;
-
-	/**
-	 * @var string
-	 */
-	public $Etag;
-
-	public function __construct()
+	function __construct()
 	{
-		$this->Clear();
-	}
-
-	public function Clear() : void
-	{
-		$this->IdContact = '';
-		$this->IdContactStr = '';
-		$this->Display = '';
 		$this->Changed = \time();
-		$this->Properties = array();
-		$this->ReadOnly = false;
-		$this->IdPropertyFromSearch = 0;
-		$this->Etag = '';
 	}
 
-	public function PopulateDisplayAndFullNameValue(bool $bForceFullNameReplace = false) : void
+	function __get($k)
 	{
-		$sFullName = '';
-		$sLastName = '';
-		$sFirstName = '';
-		$sEmail = '';
-		$sOther = '';
-
-		$oFullNameProperty = null;
-
-		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ $oProperty)
-		{
-			if ($oProperty)
-			{
-				$oProperty->UpdateDependentValues();
-
-				if (!$oFullNameProperty && PropertyType::FULLNAME === $oProperty->Type)
-				{
-					$oFullNameProperty =& $oProperty;
-				}
-
-				if (\strlen($oProperty->Value))
-				{
-					if ('' === $sEmail && $oProperty->IsEmail())
-					{
-						$sEmail = $oProperty->Value;
-					}
-					else if ('' === $sLastName && PropertyType::LAST_NAME === $oProperty->Type)
-					{
-						$sLastName = $oProperty->Value;
-					}
-					else if ('' === $sFirstName && PropertyType::FIRST_NAME === $oProperty->Type)
-					{
-						$sFirstName = $oProperty->Value;
-					}
-					else if ('' === $sFullName && PropertyType::FULLNAME === $oProperty->Type)
-					{
-						$sFullName = $oProperty->Value;
-					}
-					else if ('' === $sOther && \in_array($oProperty->Type, array(
-						PropertyType::PHONE
-					)))
-					{
-						$sOther = $oProperty->Value;
-					}
-				}
-			}
-		}
-
-		$sDisplay = $bForceFullNameReplace ? '' : \trim($sFullName);
-
-		if ('' === $sDisplay && (\strlen($sLastName) || \strlen($sFirstName)))
-		{
-			$sDisplay = \trim($sFirstName.' '.$sLastName);
-		}
-
-		if ('' === $sDisplay)
-		{
-			$sDisplay = \trim($sFullName);
-		}
-
-		if ('' === $sDisplay)
-		{
-			$sDisplay = \trim($sEmail);
-		}
-
-		if ('' === $sDisplay)
-		{
-			$sDisplay = \trim($sOther);
-		}
-
-		$this->Display = \trim($sDisplay);
-
-		if ($oFullNameProperty)
-		{
-			$oFullNameProperty->Value = $this->Display;
-			$oFullNameProperty->UpdateDependentValues();
-		}
-
-		if (!$oFullNameProperty)
-		{
-			$this->Properties[] = new \RainLoop\Providers\AddressBook\Classes\Property(PropertyType::FULLNAME, $this->Display);
+		if ('vCard' === $k) {
+			return $this->vCard;
 		}
 	}
 
-	public function UpdateDependentValues() : void
-	{
-		if (empty($this->IdContactStr))
-		{
-			$this->IdContactStr = \SnappyMail\UUID::generate();
-		}
-
-		$this->PopulateDisplayAndFullNameValue();
-	}
-
+/*
 	public function GetEmails() : array
 	{
 		$aResult = array();
-		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ $oProperty)
-		{
-			if ($oProperty && $oProperty->IsEmail())
-			{
-				$aResult[] = $oProperty->Value;
-			}
+		foreach ($this->vCard->EMAIL as $oProperty) {
+			$aResult[] = $oProperty->Value;
 		}
-
 		return \array_unique($aResult);
 	}
-
-	public function CardDavNameUri() : string
+*/
+	public function setVCard(VCard $oVCard) : void
 	{
-		return $this->IdContactStr.'.vcf';
+		if ($oVCard->PHOTO && !empty($oVCard->PHOTO->parameters['ENCODING'])) {
+			$oVCard->VERSION = '3.0';
+		}
+		if (VCard::VCARD40 != $oVCard->getDocumentType()) {
+			$oVCard = $oVCard->convert(VCard::VCARD40);
+		}
+
+		// KDE KAddressBook entry and used by SnappyMail
+		// https://github.com/sabre-io/vobject/issues/589
+		$oVCard->select('X-CRYPTO')
+		|| $oVCard->add('X-CRYPTO', '', [
+			'allowed' => 'PGP/INLINE,PGP/MIME,S/MIME,S/MIMEOpaque',
+			'signpref' => 'Ask',
+			'encryptpref' => 'Ask'
+		]);
+
+		$aWarnings = $oVCard->validate(3);
+//		\error_log(\print_r($aWarnings,1));
+		$this->vCard = $oVCard;
+		$sUid = (string) $oVCard->UID;
+		if (empty($sUid)) {
+			$sUid = \SnappyMail\UUID::generate();
+//			$this->vCard->UID = $sUid;
+		}
+/*
+		$rev = new \DateTime($oVCard->REV[0]->getJsonValue());
+		$this->Changed = $rev->getTimestamp();
+*/
+		$this->IdContactStr = $sUid;
 	}
 
-	public function ToVCard(string $sPreVCard = '', $oLogger = null) : string
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
 	{
-		$this->UpdateDependentValues();
-
-		if ("\xef\xbb\xbf" === \substr($sPreVCard, 0, 3))
-		{
-			$sPreVCard = \substr($sPreVCard, 3);
-		}
-
-		$oVCard = null;
-		if (\strlen($sPreVCard))
-		{
-			try
-			{
-				$oVCard = \Sabre\VObject\Reader::read($sPreVCard);
-			}
-			catch (\Throwable $oExc)
-			{
-				if ($oLogger)
-				{
-					$oLogger->WriteException($oExc);
-					$oLogger->WriteDump($sPreVCard);
-				}
-			}
-		}
-
-//		if ($oLogger)
-//		{
-//			$oLogger->WriteDump($sPreVCard);
-//		}
-
-		if (!$oVCard)
-		{
-			$oVCard = new \Sabre\VObject\Component\VCard();
-		}
-
-		$oVCard->VERSION = '3.0';
-		$oVCard->PRODID = '-//RainLoop//'.APP_VERSION.'//EN';
-
-		unset($oVCard->FN, $oVCard->EMAIL, $oVCard->TEL, $oVCard->URL, $oVCard->NICKNAME);
-
-		$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
-		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ $oProperty)
-		{
-			if ($oProperty)
-			{
-				$sAddKey = '';
-				switch ($oProperty->Type)
-				{
-					case PropertyType::FULLNAME:
-						$oVCard->FN = $oProperty->Value;
-						break;
-					case PropertyType::NICK_NAME:
-						$oVCard->NICKNAME = $oProperty->Value;
-						break;
-					case PropertyType::NOTE:
-						$oVCard->NOTE = $oProperty->Value;
-						break;
-					case PropertyType::UID:
-						$sUid = $oProperty->Value;
-						break;
-					case PropertyType::FIRST_NAME:
-						$sFirstName = $oProperty->Value;
-						break;
-					case PropertyType::LAST_NAME:
-						$sLastName = $oProperty->Value;
-						break;
-					case PropertyType::MIDDLE_NAME:
-						$sMiddleName = $oProperty->Value;
-						break;
-					case PropertyType::NAME_SUFFIX:
-						$sSuffix = $oProperty->Value;
-						break;
-					case PropertyType::NAME_PREFIX:
-						$sPrefix = $oProperty->Value;
-						break;
-					case PropertyType::EMAIl:
-						if (empty($sAddKey))
-						{
-							$sAddKey = 'EMAIL';
-						}
-					case PropertyType::WEB_PAGE:
-						if (empty($sAddKey))
-						{
-							$sAddKey = 'URL';
-						}
-					case PropertyType::PHONE:
-						if (empty($sAddKey))
-						{
-							$sAddKey = 'TEL';
-						}
-
-						$aTypes = $oProperty->TypesAsArray();
-						$oVCard->add($sAddKey, $oProperty->Value, \is_array($aTypes) && \count($aTypes) ? array('TYPE' => $aTypes) : null);
-						break;
-				}
-			}
-		}
-
-		$oVCard->UID = empty($sUid) ? $this->IdContactStr : $sUid;
-		$oVCard->N = array($sLastName, $sFirstName, $sMiddleName, $sPrefix, $sSuffix);
-		$oVCard->REV = \gmdate('Ymd', $this->Changed).'T'.\gmdate('His', $this->Changed).'Z';
-
-		return (string) $oVCard->serialize();
-	}
-
-	public function ToCsv(bool $bWithHeader = false) : string
-	{
-		$aData = array();
-		if ($bWithHeader)
-		{
-			$aData[] = array(
-				'Title', 'First Name', 'Middle Name', 'Last Name', 'Nick Name', 'Display Name',
-				'Company', 'Department', 'Job Title', 'Office Location',
-				'E-mail Address', 'Notes', 'Web Page', 'Birthday',
-				'Other Email', 'Other Phone', 'Other Mobile', 'Mobile Phone',
-				'Home Email',		'Home Phone',		'Home Fax',
-				'Home Street',		'Home City',		'Home State',		'Home Postal Code',			'Home Country',
-				'Business Email',	'Business Phone',	'Business Fax',
-				'Business Street',	'Business City',	'Business State',	'Business Postal Code',		'Business Country'
-			);
-		}
-
-		$aValues = array(
-			'',		// 0	'Title',
-			'',		// 1	'First Name',
-			'',		// 2	'Middle Name',
-			'',		// 3	'Last Name',
-			'',		// 4	'Nick Name',
-			'',		// 5	'Display Name',
-			'',		// 6	'Company',
-			'',		// 7	'Department',
-			'',		// 8	'Job Title',
-			'',		// 9	'Office Location',
-			'',		// 10	'E-mail Address',
-			'',		// 11	'Notes',
-			'',		// 12	'Web Page',
-			'',		// 13	'Birthday',
-			'',		// 14	'Other Email',
-			'',		// 15	'Other Phone',
-			'',		// 16	'Other Mobile',
-			'',		// 17	'Mobile Phone',
-			'',		// 18	'Home Email',
-			'',		// 19	'Home Phone',
-			'',		// 20	'Home Fax',
-			'',		// 21	'Home Street',
-			'',		// 22	'Home City',
-			'',		// 23	'Home State',
-			'',		// 24	'Home Postal Code',
-			'',		// 25	'Home Country',
-			'',		// 26	'Business Email',
-			'',		// 27	'Business Phone',
-			'',		// 28	'Business Fax',
-			'',		// 29	'Business Street',
-			'',		// 30	'Business City',
-			'',		// 31	'Business State',
-			'',		// 32	'Business Postal Code',
-			''		// 33	'Business Country'
-		);
-
-		$this->UpdateDependentValues();
-
-		foreach ($this->Properties as /* @var $oProperty \RainLoop\Providers\AddressBook\Classes\Property */ $oProperty)
-		{
-			$iIndex = -1;
-			if ($oProperty)
-			{
-				$aUpperTypes = $oProperty->TypesUpperAsArray();
-				switch ($oProperty->Type)
-				{
-					case PropertyType::FULLNAME:
-						$iIndex = 5;
-						break;
-					case PropertyType::NICK_NAME:
-						$iIndex = 4;
-						break;
-					case PropertyType::FIRST_NAME:
-						$iIndex = 1;
-						break;
-					case PropertyType::LAST_NAME:
-						$iIndex = 3;
-						break;
-					case PropertyType::MIDDLE_NAME:
-						$iIndex = 2;
-						break;
-					case PropertyType::EMAIl:
-						switch (true)
-						{
-							case \in_array('OTHER', $aUpperTypes):
-								$iIndex = 14;
-								break;
-							case \in_array('WORK', $aUpperTypes):
-								$iIndex = 26;
-								break;
-							default:
-								$iIndex = 18;
-								break;
-						}
-						break;
-					case PropertyType::PHONE:
-						switch (true)
-						{
-							case \in_array('OTHER', $aUpperTypes):
-								$iIndex = 15;
-								break;
-							case \in_array('WORK', $aUpperTypes):
-								$iIndex = 27;
-								break;
-							case \in_array('MOBILE', $aUpperTypes):
-								$iIndex = 17;
-								break;
-							default:
-								$iIndex = 19;
-								break;
-						}
-						break;
-					case PropertyType::WEB_PAGE:
-						$iIndex = 12;
-						break;
-					case PropertyType::NOTE:
-						$iIndex = 11;
-						break;
-				}
-
-				if (-1 < $iIndex)
-				{
-					$aValues[$iIndex] = $oProperty->Value;
-				}
-			}
-		}
-
-		// subfix
-		if (empty($aValues[10]))  // 'E-mail Address'
-		{
-			if (!empty($aValues[18]))
-			{
-				$aValues[10] = $aValues[18];
-			}
-			else if (!empty($aValues[26]))
-			{
-				$aValues[10] = $aValues[26];
-			}
-			else if (!empty($aValues[14]))
-			{
-				$aValues[10] = $aValues[14];
-			}
-		}
-
-		$aData[] = \array_map(function ($sValue) {
-			$sValue = \trim($sValue);
-			return \preg_match('/[\r\n,"]/', $sValue) ? '"'.\str_replace('"', '""', $sValue).'"' : $sValue;
-		}, $aValues);
-
-		$sResult = '';
-		foreach ($aData as $aSubData)
-		{
-			$sResult .= \implode(',', $aSubData)."\r\n";
-		}
-
-		return $sResult;
-	}
-
-	/**
-	 * @param mixed $oProp
-	 */
-	private function getPropertyValueHelper($oProp, bool $bOldVersion) : string
-	{
-		$sValue = \trim($oProp);
-		if ($bOldVersion && !isset($oProp->parameters['CHARSET']))
-		{
-			if (\strlen($sValue))
-			{
-				$sEncValue = \utf8_encode($sValue);
-				if (0 === \strlen($sEncValue))
-				{
-					$sEncValue = $sValue;
-				}
-
-				$sValue = $sEncValue;
-			}
-		}
-
-		return \MailSo\Base\Utils::Utf8Clear($sValue);
-	}
-
-	/**
-	 * @param mixed $oProp
-	 */
-	private function addArrayPropertyHelper(array &$aProperties, $oArrayProp, int $iType) : void
-	{
-		foreach ($oArrayProp as $oProp)
-		{
-			$oTypes = $oProp ? $oProp['TYPE'] : null;
-			$aTypes = $oTypes ? $oTypes->getParts() : array();
-			$sValue = $oProp ? \trim($oProp->getValue()) : '';
-
-			if (\strlen($sValue))
-			{
-				if (!$oTypes || $oTypes->has('PREF'))
-				{
-					\array_unshift($aProperties, new Property($iType, $sValue, \implode(',', $aTypes)));
-				}
-				else
-				{
-					\array_push($aProperties, new Property($iType, $sValue, \implode(',', $aTypes)));
-				}
-			}
-		}
-	}
-
-	public function PopulateByVCard(\Sabre\VObject\Component\VCard $oVCard, string $sEtag = '') : bool
-	{
-		$this->Properties = array();
-
-		if (!empty($sEtag))
-		{
-			$this->Etag = $sEtag;
-		}
-
-		$aProperties = array();
-
-		$bOldVersion = empty($oVCard->VERSION) ? false :
-			\in_array((string) $oVCard->VERSION, array('2.1', '2.0', '1.0'));
-
-		if (isset($oVCard->FN) && '' !== \trim($oVCard->FN))
-		{
-			$sValue = $this->getPropertyValueHelper($oVCard->FN, $bOldVersion);
-			$aProperties[] = new Property(PropertyType::FULLNAME, $sValue);
-		}
-
-		if (isset($oVCard->NICKNAME) && '' !== \trim($oVCard->NICKNAME))
-		{
-			$sValue = $sValue = $this->getPropertyValueHelper($oVCard->NICKNAME, $bOldVersion);
-			$aProperties[] = new Property(PropertyType::NICK_NAME, $sValue);
-		}
-
-		if (isset($oVCard->NOTE) && '' !== \trim($oVCard->NOTE))
-		{
-			$sValue = $this->getPropertyValueHelper($oVCard->NOTE, $bOldVersion);
-			$aProperties[] = new Property(PropertyType::NOTE, $sValue);
-		}
-
-		if (isset($oVCard->N))
-		{
-			$aNames = $oVCard->N->getParts();
-			foreach ($aNames as $iIndex => $sValue)
-			{
-				$sValue = \trim($sValue);
-				if ($bOldVersion && !isset($oVCard->N->parameters['CHARSET']))
-				{
-					if (\strlen($sValue))
-					{
-						$sEncValue = \utf8_encode($sValue);
-						if (0 === \strlen($sEncValue))
-						{
-							$sEncValue = $sValue;
-						}
-
-						$sValue = $sEncValue;
-					}
-				}
-
-				$sValue = \MailSo\Base\Utils::Utf8Clear($sValue);
-				switch ($iIndex) {
-					case 0:
-						$aProperties[] = new Property(PropertyType::LAST_NAME, $sValue);
-						break;
-					case 1:
-						$aProperties[] = new Property(PropertyType::FIRST_NAME, $sValue);
-						break;
-					case 2:
-						$aProperties[] = new Property(PropertyType::MIDDLE_NAME, $sValue);
-						break;
-					case 3:
-						$aProperties[] = new Property(PropertyType::NAME_PREFIX, $sValue);
-						break;
-					case 4:
-						$aProperties[] = new Property(PropertyType::NAME_SUFFIX, $sValue);
-						break;
-				}
-			}
-		}
-
-		if (isset($oVCard->EMAIL))
-		{
-			$this->addArrayPropertyHelper($aProperties, $oVCard->EMAIL, PropertyType::EMAIl);
-		}
-
-		if (isset($oVCard->URL))
-		{
-			$this->addArrayPropertyHelper($aProperties, $oVCard->URL, PropertyType::WEB_PAGE);
-		}
-
-		if (isset($oVCard->TEL))
-		{
-			$this->addArrayPropertyHelper($aProperties, $oVCard->TEL, PropertyType::PHONE);
-		}
-
-		$this->IdContactStr = $oVCard->UID ? (string) $oVCard->UID : \SnappyMail\UUID::generate();
-		$aProperties[] = new Property(PropertyType::UID, $this->IdContactStr);
-
-		$this->Properties = $aProperties;
-
-		$this->UpdateDependentValues();
-
-		return true;
-	}
-
-	public function jsonSerialize()
-	{
-		$properties = array();
-		foreach ($this->Properties as $property) {
-			$properties[] = $property->jsonSerialize();
-		}
 		return array(
 			'@Object' => 'Object/Contact',
-			'id' => $this->IdContact,
-			'display' => \MailSo\Base\Utils::Utf8Clear($this->Display),
+			'id' => $this->id,
 			'readOnly' => $this->ReadOnly,
-			'IdPropertyFromSearch' => $this->IdPropertyFromSearch,
-			'properties' => $properties
+			'jCard' => $this->vCard
 		);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
index 02bdcff8c..f0f1401a0 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Property.php
@@ -6,159 +6,25 @@ use RainLoop\Providers\AddressBook\Enumerations\PropertyType;
 
 class Property implements \JsonSerializable
 {
-	/**
-	 * @var int
-	 */
-	public $IdProperty;
+	public int $IdProperty = 0;
 
-	/**
-	 * @var int
-	 */
-	public $Type;
+	public int $Type;
 
-	/**
-	 * @var string
-	 */
-	public $TypeStr;
+	public string $TypeStr;
 
-	/**
-	 * @var string
-	 */
-	public $Value;
+	public string $Value;
 
-	/**
-	 * @var string
-	 */
-	public $ValueLower;
+	public int $Frec = 0;
 
-	/**
-	 * @var string
-	 */
-	public $ValueCustom;
-
-	/**
-	 * @var int
-	 */
-	public $Frec;
-
-	public function __construct(
-		$iType = \RainLoop\Providers\AddressBook\Enumerations\PropertyType::UNKNOWN, $sValue = '', $sTypeStr = '')
+	public function __construct(int $iType = PropertyType::UNKNOWN, string $sValue = '', string $sTypeStr = '')
 	{
-		$this->Clear();
-
 		$this->Type = $iType;
 		$this->Value = $sValue;
 		$this->TypeStr = $sTypeStr;
 	}
 
-	public function Clear() : void
+	public function jsonSerialize(): mixed
 	{
-		$this->IdProperty = 0;
-
-		$this->Type = PropertyType::UNKNOWN;
-		$this->TypeStr = '';
-
-		$this->Value = '';
-		$this->ValueLower = '';
-		$this->ValueCustom = '';
-
-		$this->Frec = 0;
-	}
-
-	public function IsName() : bool
-	{
-		return \in_array($this->Type, array(PropertyType::FULLNAME, PropertyType::FIRST_NAME,
-			PropertyType::LAST_NAME, PropertyType::MIDDLE_NAME, PropertyType::NICK_NAME));
-	}
-
-	public function IsEmail() : bool
-	{
-		return PropertyType::EMAIl === $this->Type;
-	}
-
-	public function IsPhone() : bool
-	{
-		return PropertyType::PHONE === $this->Type;
-	}
-
-	public function IsWeb() : bool
-	{
-		return PropertyType::WEB_PAGE === $this->Type;
-	}
-
-	public function IsValueForLower() : bool
-	{
-		return $this->IsEmail() || $this->IsName() || $this->IsWeb();
-	}
-
-	public function TypesAsArray() : array
-	{
-		$aResult = array();
-		if (!empty($this->TypeStr))
-		{
-			$sTypeStr = \preg_replace('/[\s]+/', '', $this->TypeStr);
-			$aResult = \explode(',', $sTypeStr);
-		}
-
-		return $aResult;
-	}
-
-	public function TypesUpperAsArray() : array
-	{
-		return \array_map('strtoupper', $this->TypesAsArray());
-	}
-
-	public function UpdateDependentValues() : void
-	{
-		$this->Value = \trim($this->Value);
-		$this->ValueCustom = \trim($this->ValueCustom);
-		$this->TypeStr = \trim($this->TypeStr);
-		$this->ValueLower = '';
-
-		if (\strlen($this->Value))
-		{
-			// lower
-			if ($this->IsEmail())
-			{
-				$this->Value = \MailSo\Base\Utils::StrMailDomainToLower($this->Value);
-			}
-
-			if ($this->IsName())
-			{
-				$this->Value = \MailSo\Base\Utils::StripSpaces($this->Value);
-			}
-
-			// lower value for searching
-			if ($this->IsValueForLower())
-			{
-				$this->ValueLower = (string) \mb_strtolower($this->Value, 'UTF-8');
-			}
-
-			// phone value for searching
-			if ($this->IsPhone())
-			{
-				$sPhone = \trim($this->Value);
-				$sPhone = \preg_replace('/^[+]+/', '', $sPhone);
-				$sPhone = \preg_replace('/[^\d]/', '', $sPhone);
-
-				$this->ValueCustom = \trim($sPhone);
-			}
-		}
-	}
-
-	public function jsonSerialize()
-	{
-		// Simple hack
-		if ($this && $this->IsWeb())
-		{
-			$this->Value = \preg_replace('#(https?)\\\://#i', '$1://', $this->Value);
-		}
-		return array(
-			'@Object' => 'Object/ContactProperty',
-			'id' => $this->IdProperty,
-			'type' => $this->Type,
-			'typeStr' => $this->TypeStr,
-			'value' => \MailSo\Base\Utils::Utf8Clear($this->Value)
-		);
+		throw new \Exception('Obsolete ' . __CLASS__ . '::jsonSerialize()');
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Tag.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Tag.php
deleted file mode 100644
index c5973a680..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Classes/Tag.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\AddressBook\Classes;
-
-class Tag implements \JsonSerializable
-{
-	/**
-	 * @var string
-	 */
-	public $IdContactTag;
-
-	/**
-	 * @var string
-	 */
-	public $Name;
-
-	/**
-	 * @var bool
-	 */
-	public $ReadOnly;
-
-	public function __construct()
-	{
-		$this->Clear();
-	}
-
-	public function Clear() : void
-	{
-		$this->IdContactTag = '';
-		$this->Name = '';
-		$this->ReadOnly = false;
-	}
-
-	public function jsonSerialize()
-	{
-		return array(
-			'@Object' => 'Object/Tag',
-			'id' => $this->IdContactTag,
-			'name' => \MailSo\Base\Utils::Utf8Clear($mResponse->Name),
-			'readOnly' => $this->ReadOnly
-		);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
index 5b1bdae94..8fc64c5d2 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Enumerations/PropertyType.php
@@ -2,7 +2,7 @@
 
 namespace RainLoop\Providers\AddressBook\Enumerations;
 
-class PropertyType
+abstract class PropertyType
 {
 	const UNKNOWN = 0;
 
@@ -32,4 +32,6 @@ class PropertyType
 	const NOTE = 110;
 
 	const CUSTOM = 250;
+
+	const JCARD = 251;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php
new file mode 100644
index 000000000..da91df01f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Legacy.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace RainLoop\Providers\AddressBook;
+
+use
+	RainLoop\Providers\AddressBook\Enumerations\PropertyType,
+	RainLoop\Providers\AddressBook\Classes\Property
+;
+
+class Legacy
+{
+	private static function yieldPropertyHelper(mixed $oArrayProp, int $iType): iterable
+	{
+		$aTmp = [];
+		foreach ($oArrayProp as $oProp) {
+			$sValue = \trim($oProp->getValue());
+			if (\strlen($sValue)) {
+				$oTypes = $oProp['TYPE'];
+				$aTypes = $oTypes ? $oTypes->getParts() : array();
+				$pref = empty($oProp['PREF']) ? 100 : \min(100, \max(1, $oProp['PREF']->getValue()));
+				$pref = \str_pad($pref, 3, '0', \STR_PAD_LEFT);
+				$aTmp[$pref . $sValue] = new Property($iType, $sValue, \implode(',', $aTypes));
+			}
+		}
+		\ksort($aTmp);
+		foreach ($aTmp as $oProp) {
+			yield $oProp;
+		}
+	}
+
+	private static function getPropertyValueHelper(mixed $oProp, bool $bOldVersion): string
+	{
+		$sValue = \trim($oProp);
+		if ($bOldVersion && !isset($oProp->parameters['CHARSET'])) {
+			if (\strlen($sValue)) {
+				$sEncValue = \mb_convert_encoding($sValue, 'UTF-8', 'ISO-8859-1');
+				if (\strlen($sEncValue)) {
+					$sValue = $sEncValue;
+				}
+			}
+		}
+		return \MailSo\Base\Utils::Utf8Clear($sValue);
+	}
+
+	public static function VCardToProperties(\Sabre\VObject\Component\VCard $oVCard): iterable
+	{
+		yield new Property(PropertyType::JCARD, \json_encode($oVCard));
+
+		$bOldVersion = !empty($oVCard->VERSION) && \in_array((string) $oVCard->VERSION, array('2.1', '2.0', '1.0'));
+
+		if (isset($oVCard->FN) && '' !== \trim($oVCard->FN)) {
+			$sValue = static::getPropertyValueHelper($oVCard->FN, $bOldVersion);
+			yield new Property(PropertyType::FULLNAME, $sValue);
+		}
+
+		if (isset($oVCard->N)) {
+			$aNames = $oVCard->N->getParts();
+			foreach ($aNames as $iIndex => $sValue) {
+				$sValue = \trim($sValue);
+				if ($bOldVersion && !isset($oVCard->N->parameters['CHARSET'])) {
+					if (\strlen($sValue)) {
+						$sEncValue = \mb_convert_encoding($sValue, 'UTF-8', 'ISO-8859-1');
+						if (\strlen($sEncValue)) {
+							$sValue = $sEncValue;
+						}
+					}
+				}
+				$sValue = \MailSo\Base\Utils::Utf8Clear($sValue);
+				if ($sValue) {
+					switch ($iIndex) {
+						case 0:
+							yield new Property(PropertyType::LAST_NAME, $sValue);
+							break;
+						case 1:
+							yield new Property(PropertyType::FIRST_NAME, $sValue);
+							break;
+						case 2:
+							yield new Property(PropertyType::MIDDLE_NAME, $sValue);
+							break;
+						case 3:
+							yield new Property(PropertyType::NAME_PREFIX, $sValue);
+							break;
+						case 4:
+							yield new Property(PropertyType::NAME_SUFFIX, $sValue);
+							break;
+					}
+				}
+			}
+		}
+
+		if (isset($oVCard->EMAIL)) {
+			yield from static::yieldPropertyHelper($oVCard->EMAIL, PropertyType::EMAIl);
+		}
+
+		if (isset($oVCard->URL)) {
+			yield from static::yieldPropertyHelper($oVCard->URL, PropertyType::WEB_PAGE);
+		}
+
+		if (isset($oVCard->TEL)) {
+			yield from static::yieldPropertyHelper($oVCard->TEL, PropertyType::PHONE);
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
index 2a4148df9..00e2c18fd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoAddressBook.php
@@ -2,40 +2,64 @@
 
 namespace RainLoop\Providers\AddressBook;
 
-use RainLoop\Providers\AddressBook\Enumerations\PropertyType;
+use
+	Sabre\VObject\Component\VCard,
+	RainLoop\Providers\AddressBook\Classes\Contact,
+	RainLoop\Providers\AddressBook\Enumerations\PropertyType
+;
 
 class PdoAddressBook
-	extends \RainLoop\Common\PdoAbstract
-	implements \RainLoop\Providers\AddressBook\AddressBookInterface
+	extends \RainLoop\Pdo\Base
+	implements AddressBookInterface
 {
 	use CardDAV;
 
-	/**
-	 * @var string
-	 */
-	private $sDsn;
+	private $iUserID = 0;
 
-	/**
-	 * @var string
-	 */
-	private $sDsnType;
+	private \RainLoop\Pdo\Settings $settings;
 
-	/**
-	 * @var string
-	 */
-	private $sUser;
+	private static $aSearchInFields = [
+		PropertyType::EMAIl,
+		PropertyType::FIRST_NAME,
+		PropertyType::LAST_NAME,
+		PropertyType::NICK_NAME
+	];
 
-	/**
-	 * @var string
-	 */
-	private $sPassword;
-
-	public function __construct(string $sDsn, string $sUser = '', string $sPassword = '', string $sDsnType = 'mysql')
+	public function __construct()
 	{
-		$this->sDsn = $sDsn;
-		$this->sUser = $sUser;
-		$this->sPassword = $sPassword;
-		$this->sDsnType = $sDsnType;
+		$oConfig = \RainLoop\Api::Config();
+		$oSettings = new \RainLoop\Pdo\Settings;
+		$oSettings->driver = static::validPdoType($oConfig->Get('contacts', 'type', 'sqlite'));
+		if ('sqlite' === $oSettings->driver) {
+			$sDsn = 'sqlite:' . APP_PRIVATE_DATA . 'AddressBook.sqlite';
+			if (!$oConfig->Get('contacts', 'sqlite_global', \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite'))) {
+				$oAccount = \RainLoop\Api::Actions()->getMainAccountFromToken(false);
+				if ($oAccount) {
+					$homedir = \RainLoop\Api::Actions()->StorageProvider()->GenerateFilePath(
+						$oAccount,
+						\RainLoop\Providers\Storage\Enumerations\StorageType::ROOT
+					);
+					// TODO: sync data on switch?
+//					if (!\is_file($homedir . 'AddressBook.sqlite') && \is_file(APP_PRIVATE_DATA . '/AddressBook.sqlite')) {
+//						\copy(APP_PRIVATE_DATA . '/AddressBook.sqlite', $homedir . 'AddressBook.sqlite');
+//					}
+					$sDsn = 'sqlite:' . $homedir . 'AddressBook.sqlite';
+				}
+			}
+		} else {
+			$sDsn = \trim($oConfig->Get('contacts', 'pdo_dsn', ''));
+			$oSettings->user = \trim($oConfig->Get('contacts', 'pdo_user', ''));
+			$oSettings->password = (string)$oConfig->Get('contacts', 'pdo_password', '');
+			$sDsn = $oSettings->driver . ':' . \preg_replace('/^[a-z]+:/', '', $sDsn);
+			if ('mysql' === $oSettings->driver) {
+				$oSettings->sslCa = \trim($oConfig->Get('contacts', 'mysql_ssl_ca', ''));
+				$oSettings->sslVerify = !!$oConfig->Get('contacts', 'mysql_ssl_verify', true);
+				$oSettings->sslCiphers = \trim($oConfig->Get('contacts', 'mysql_ssl_ciphers', ''));
+			}
+		}
+
+		$oSettings->dsn = $sDsn;
+		$this->settings = $oSettings;
 
 		$this->bExplain = false; // debug
 	}
@@ -46,64 +70,50 @@ class PdoAddressBook
 		return \in_array($sType, static::getAvailableDrivers()) ? $sType : 'sqlite';
 	}
 
-	public function IsSupported() : bool
+	public function IsSupported(): bool
 	{
 		$aDrivers = static::getAvailableDrivers();
-		return \is_array($aDrivers) && \in_array($this->sDsnType, $aDrivers);
+		return \is_array($aDrivers) && \in_array($this->settings->driver, $aDrivers);
 	}
 
-	public function IsSharingAllowed() : bool
+	public function SetEmail(string $sEmail): bool
 	{
-		return $this->IsSupported() && false; // TODO
+		$this->iUserID = $this->getUserId($sEmail);
+		return 0 < $this->iUserID;
 	}
 
-	private function flushDeletedContacts(int $iUserID) : bool
+	private function flushDeletedContacts(): bool
 	{
 		return !!$this->prepareAndExecute('DELETE FROM rainloop_ab_contacts WHERE id_user = :id_user AND deleted = 1', array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT)
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT)
 		));
 	}
 
-	private function updateContactEtagAndTime(int $iUserID, int $iID, string $sEtag, int $iChanged) : bool
-	{
-		return !!$this->prepareAndExecute('UPDATE rainloop_ab_contacts SET changed = :changed, etag = :etag '.
-			'WHERE id_user = :id_user AND id_contact = :id_contact', array(
-				':id_user' => array($iUserID, \PDO::PARAM_INT),
-				':id_contact' => array($iID, \PDO::PARAM_INT),
-				':changed' => array($iChanged, \PDO::PARAM_INT),
-				':etag' => array($sEtag, \PDO::PARAM_STR)
-			)
-		);
-	}
-
-	private function prepareDatabaseSyncData(int $iUserID) : array
+	private function prepareDatabaseSyncData(): array
 	{
 		$aResult = array();
-		$oStmt = $this->prepareAndExecute('SELECT id_contact, id_contact_str, changed, deleted, etag FROM rainloop_ab_contacts WHERE id_user = :id_user', array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT)
-		));
+		$oStmt = $this->prepareAndExecute('SELECT id_contact, id_contact_str, changed, deleted, etag
+			FROM rainloop_ab_contacts
+			WHERE id_user = :id_user
+			ORDER BY deleted DESC',
+			array(':id_user' => array($this->iUserID, \PDO::PARAM_INT))
+		);
 
-		if ($oStmt)
-		{
+		if ($oStmt) {
 			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-			if (\is_array($aFetch) && \count($aFetch))
-			{
-				foreach ($aFetch as $aItem)
-				{
+			if (\is_array($aFetch) && \count($aFetch)) {
+				foreach ($aFetch as $aItem) {
 					if ($aItem && isset($aItem['id_contact'], $aItem['id_contact_str'], $aItem['changed'], $aItem['deleted'], $aItem['etag']) &&
-						!empty($aItem['id_contact_str']))
-					{
+						!empty($aItem['id_contact_str'])) {
 						$sKeyID = $aItem['id_contact_str'];
 
 						$aResult[$sKeyID] = array(
-							'deleted' => '1' === (string) $aItem['deleted'],
+							'deleted' => !empty($aItem['deleted']),
 							'id_contact' => $aItem['id_contact'],
 							'uid' => $sKeyID,
 							'etag' => $aItem['etag'],
-							'changed' => (int) $aItem['changed'],
+							'changed' => (int) $aItem['changed']
 						);
-
-						$aResult[$sKeyID]['changed_'] = \gmdate('c', $aResult[$sKeyID]['changed']);
 					}
 				}
 			}
@@ -112,221 +122,242 @@ class PdoAddressBook
 		return $aResult;
 	}
 
-	public function Sync(array $oConfig) : bool
+	public function Sync(): bool
 	{
-		$this->SyncDatabase();
-
-		$iUserID = $this->getUserId($oConfig['Email']);
-		if (0 >= $iUserID)
-		{
+		if (1 > $this->iUserID) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid $iUserID');
 			return false;
 		}
 
-		$oClient = $this->getDavClient($oConfig['Url'], $oConfig['User'], $oConfig['Password'], $oConfig['Proxy']);
-		if (!$oClient)
-		{
+		try {
+			$oClient = $this->getDavClient();
+		} catch (\Throwable $e) {
+			\SnappyMail\Log::error('DAV', $e->getMessage());
+//			$this->logException($oException);
+			return false;
+		}
+		if (!$oClient) {
 			\SnappyMail\Log::warning('PdoAddressBook', 'Sync() invalid DavClient');
 			return false;
 		}
 
-		$sPath = $oClient->__UrlPath__;
+		$sPath = $oClient->urlPath;
 
+		$time = \microtime(true);
 		$aRemoteSyncData = $this->prepareDavSyncData($oClient, $sPath);
-		if (false === $aRemoteSyncData)
-		{
+		if (false === $aRemoteSyncData) {
 			\SnappyMail\Log::info('PdoAddressBook', 'Sync() no data to sync');
 			return false;
 		}
+		$time = \microtime(true) - $time;
+		\SnappyMail\HTTP\Stream::JSON(['messsage'=>"Received ".\count($aRemoteSyncData)." remote contacts in {$time} seconds"]);
+		\SnappyMail\Log::info('PdoAddressBook', \count($aRemoteSyncData) . ' remote contacts');
 
-		$aDatabaseSyncData = $this->prepareDatabaseSyncData($iUserID);
+		$aLocalSyncData = $this->prepareDatabaseSyncData();
+		\SnappyMail\Log::info('PdoAddressBook', \count($aLocalSyncData) . ' local contacts');
 
 //		$this->oLogger->WriteDump($aRemoteSyncData);
-//		$this->oLogger->WriteDump($aDatabaseSyncData);
+//		$this->oLogger->WriteDump($aLocalSyncData);
+
+		$bReadWrite = $this->isDAVReadWrite();
+
+		/**
+		 * An empty list on either side is far more often a fault than a real
+		 * "delete everything": a fresh or rebuilt local store, a DAV listing
+		 * that failed to parse, a stale server-side index. Acting on it
+		 * destroys data the other side still holds, so skip the deletions in
+		 * that direction and let the following import/export reconcile.
+		 */
+		$iLocalLive = 0;
+		foreach ($aLocalSyncData as $aGuardData) {
+			if (empty($aGuardData['deleted'])) {
+				++$iLocalLive;
+			}
+		}
+		$iRemoteCount = \count($aRemoteSyncData);
+		$bProtectRemote = (0 === $iLocalLive && 0 < $iRemoteCount);
+		$bProtectLocal  = (0 === $iRemoteCount && 0 < $iLocalLive);
+		if ($bProtectRemote) {
+			\SnappyMail\Log::warning('PdoAddressBook', "Sync() local store is empty while remote holds"
+				. " {$iRemoteCount} contacts: importing only, no remote deletions");
+		}
+		if ($bProtectLocal) {
+			\SnappyMail\Log::warning('PdoAddressBook', "Sync() remote listing is empty while local holds"
+				. " {$iLocalLive} contacts: keeping local, no local deletions");
+		}
 
 		// Delete remote when Mode = read + write
-		if (1 === $oConfig['Mode']) {
-			foreach ($aDatabaseSyncData as $sKey => $aData)
-			{
-				if ($aData['deleted'] && isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf']))
-				{
-					$this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']);
+		if ($bReadWrite) {
+			\SnappyMail\Log::info('PdoAddressBook', 'Sync() is import and export');
+			$iCount = 0;
+			foreach ($aLocalSyncData as $sKey => $aData) {
+				if ($aData['deleted']) {
+					++$iCount;
+					unset($aLocalSyncData[$sKey]);
+					if (!$bProtectRemote && isset($aRemoteSyncData[$sKey], $aRemoteSyncData[$sKey]['vcf'])) {
+						\SnappyMail\HTTP\Stream::JSON(['messsage'=>"Delete remote {$sKey}"]);
+						$this->davClientRequest($oClient, 'DELETE', $sPath.$aRemoteSyncData[$sKey]['vcf']);
+					}
+				}
+			}
+			if ($iCount) {
+				\SnappyMail\Log::info('PdoAddressBook', $iCount . ' remote contacts removed');
+			}
+		} else {
+			\SnappyMail\Log::info('PdoAddressBook', 'Sync() is import only');
+		}
+
+		// Delete local
+		$aIdsForDeletion = array();
+		if (!$bProtectLocal) {
+			foreach ($aLocalSyncData as $sKey => $aData) {
+				if (!empty($aData['etag']) && !isset($aRemoteSyncData[$sKey])) {
+					$aIdsForDeletion[] = $aData['id_contact'];
 				}
 			}
 		}
-
-		// Delete from db
-		$aIdsForDeletedion = array();
-		foreach ($aDatabaseSyncData as $sKey => $aData)
-		{
-			if (!$aData['deleted'] && !empty($aData['etag']) && !isset($aRemoteSyncData[$sKey]))
-			{
-				$aIdsForDeletedion[] = $aData['id_contact'];
-			}
-		}
-		if (\count($aIdsForDeletedion))
-		{
-			$this->DeleteContacts($oConfig['Email'], $aIdsForDeletedion, false);
+		if (\count($aIdsForDeletion)) {
+			\SnappyMail\HTTP\Stream::JSON(['messsage'=>'Delete local ' . \implode(', ', $aIdsForDeletion)]);
+			$this->DeleteContacts($aIdsForDeletion);
+			\SnappyMail\Log::info('PdoAddressBook', \count($aIdsForDeletion) . ' local contacts removed');
+			unset($aIdsForDeletion);
 		}
 
-		$this->flushDeletedContacts($iUserID);
+		$this->flushDeletedContacts();
 
-		//+++new or newer (from db)
-		foreach ($aDatabaseSyncData as $sKey => $aData)
-		{
-			if (!$aData['deleted'] &&
-				(empty($aData['etag']) && !isset($aRemoteSyncData[$sKey])) // new
-					||
-				(!empty($aData['etag']) && isset($aRemoteSyncData[$sKey]) && // newer
-					$aRemoteSyncData[$sKey]['etag'] !== $aData['etag'] &&
-					$aRemoteSyncData[$sKey]['changed'] < $aData['changed']
-				)
-			)
-			{
-				$mID = $aData['id_contact'];
-				$oContact = $this->GetContactByID($oConfig['Email'], $mID, false);
-				if ($oContact)
-				{
-					$sExsistensBody = '';
-					$mExsistenRemoteID = isset($aRemoteSyncData[$sKey]['vcf']) && !empty($aData['etag']) ? $aRemoteSyncData[$sKey]['vcf'] : '';
-					if (\strlen($mExsistenRemoteID))
-					{
-						$oResponse = $this->davClientRequest($oClient, 'GET', $sPath.$mExsistenRemoteID);
-						if ($oResponse)
-						{
-							$sExsistensBody = \trim($oResponse->body);
-						}
-
-//						$this->oLogger->WriteDump($sExsistensBody);
-					}
-
-					// Add remote when Mode = read + write
-					if (1 === $oConfig['Mode']) {
+		// local is new or newer
+		if ($bReadWrite) {
+			foreach ($aLocalSyncData as $sKey => $aData) {
+				if ((empty($aData['etag']) && !isset($aRemoteSyncData[$sKey])) // new
+				 // newer
+				 || (!empty($aData['etag']) && isset($aRemoteSyncData[$sKey]) &&
+						$aRemoteSyncData[$sKey]['etag'] !== $aData['etag'] &&
+						$aRemoteSyncData[$sKey]['changed'] < $aData['changed']
+					)
+				) {
+					\SnappyMail\HTTP\Stream::JSON(['messsage'=>"Update remote {$sKey}"]);
+					$mID = $aData['id_contact'];
+					$oContact = $this->GetContactByID($mID);
+					if ($oContact) {
+						$sRemoteID = isset($aRemoteSyncData[$sKey]['vcf']) && !empty($aData['etag'])
+							? $aRemoteSyncData[$sKey]['vcf'] : '';
+						\SnappyMail\Log::info('PdoAddressBook', "Update contact {$sKey} in DAV");
 						$oResponse = $this->davClientRequest($oClient, 'PUT',
-							$sPath.(\strlen($mExsistenRemoteID) ? $mExsistenRemoteID : $oContact->CardDavNameUri()),
-							$oContact->ToVCard($sExsistensBody, $this->oLogger)."\r\n\r\n");
-						if ($oResponse)
-						{
+							$sPath . ($sRemoteID ?: $oContact->IdContactStr.'.vcf'),
+							$oContact->vCard->serialize() . "\r\n\r\n");
+						if ($oResponse) {
 							$sEtag = \trim(\trim($oResponse->getHeader('etag')), '"\'');
 							$sDate = \trim($oResponse->getHeader('date'));
-							if (!empty($sEtag))
-							{
+							if (!empty($sEtag)) {
 								$iChanged = empty($sDate) ? \time() : \MailSo\Base\DateTimeHelper::ParseRFC2822DateString($sDate);
-								$this->updateContactEtagAndTime($iUserID, $mID, $sEtag, $iChanged);
+								$this->prepareAndExecute('UPDATE rainloop_ab_contacts SET changed = :changed, etag = :etag '.
+									'WHERE id_user = :id_user AND id_contact = :id_contact', array(
+										':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+										':id_contact' => array($mID, \PDO::PARAM_INT),
+										':changed' => array($iChanged, \PDO::PARAM_INT),
+										':etag' => array($sEtag, \PDO::PARAM_STR)
+									)
+								);
 							}
+						} else {
+							\SnappyMail\Log::warning('PdoAddressBook', "Update/create remote failed");
 						}
+					} else {
+						\SnappyMail\Log::warning('PdoAddressBook', "Local contact {$sKey} not found");
 					}
+					unset($oContact);
 				}
-
-				unset($oContact);
 			}
 		}
-		//---new
 
-		//+++new or newer (from carddav)
-		foreach ($aRemoteSyncData as $sKey => $aData)
-		{
-			if (!isset($aDatabaseSyncData[$sKey]) // new
-					 ||
-				($aDatabaseSyncData[$sKey]['etag'] !== $aData['etag'] && // newer
-					$aDatabaseSyncData[$sKey]['changed'] < $aData['changed'])
-			)
-			{
-				$mExsistenContactID = isset($aDatabaseSyncData[$sKey]['id_contact']) ?
-					$aDatabaseSyncData[$sKey]['id_contact'] : '';
+		// remote is new or newer
+		foreach ($aRemoteSyncData as $sKey => $aData) {
+			if (!isset($aLocalSyncData[$sKey]) // new
+			 // newer
+			 || ($aLocalSyncData[$sKey]['etag'] !== $aData['etag'] && $aLocalSyncData[$sKey]['changed'] < $aData['changed'])
+			) {
+				\SnappyMail\HTTP\Stream::JSON(['messsage'=>"Update local {$sKey}"]);
+
+				$oVCard = null;
 
 				$oResponse = $this->davClientRequest($oClient, 'GET', $sPath.$aData['vcf']);
-				if ($oResponse)
-				{
+				if ($oResponse) {
 					$sBody = \trim($oResponse->body);
 
 					// Remove UTF-8 BOM
-					if ("\xef\xbb\xbf" === \substr($sBody, 0, 3))
-					{
+					if ("\xef\xbb\xbf" === \substr($sBody, 0, 3)) {
 						$sBody = \substr($sBody, 3);
 					}
 
-					if (!empty($sBody))
-					{
-						$oVCard = null;
-						try
-						{
+					if (!empty($sBody)) {
+						try {
 							$oVCard = \Sabre\VObject\Reader::read($sBody);
-						}
-						catch (\Throwable $oExc)
-						{
-							if ($this->oLogger)
-							{
-								$this->oLogger->WriteException($oExc);
-								$this->oLogger->WriteDump($sBody);
-							}
-						}
-
-						if ($oVCard instanceof \Sabre\VObject\Component\VCard)
-						{
-							$oVCard->UID = $aData['uid'];
-
-							$oContact = null;
-							if ($mExsistenContactID)
-							{
-								$oContact = $this->GetContactByID($oConfig['Email'], $mExsistenContactID);
-							}
-							if (!$oContact)
-							{
-								$oContact = new Classes\Contact();
-							}
-
-							$oContact->PopulateByVCard(
-								$oVCard,
-								\trim(\trim($oResponse->getHeader('etag')), '"\'')
-							);
-
-							$this->ContactSave($oConfig['Email'], $oContact);
-							unset($oContact);
-//						} else if ($this->oLogger) {
-//							$this->oLogger->WriteDump($sBody);
+						} catch (\Throwable $oExc) {
+							$this->logException($oExc);
+							$this->oLogger && $this->oLogger->WriteDump($sBody);
 						}
 					}
 				}
+
+				if ($oVCard instanceof VCard) {
+					$oVCard->UID = $aData['uid'];
+
+					$oContact = empty($aLocalSyncData[$sKey]['id_contact'])
+						 ? null
+						 : $this->GetContactByID($aLocalSyncData[$sKey]['id_contact']);
+					if ($oContact) {
+						\SnappyMail\Log::info('PdoAddressBook', "Update local contact {$sKey}");
+					} else {
+						\SnappyMail\Log::info('PdoAddressBook', "Create local contact {$sKey}");
+						$oContact = new Contact();
+					}
+
+					$oContact->setVCard($oVCard);
+
+					$sEtag = \trim($oResponse->getHeader('etag'), " \n\r\t\v\x00\"'");
+					if (!empty($sEtag)) {
+						$oContact->Etag = $sEtag;
+					}
+
+					$this->ContactSave($oContact);
+					unset($oContact);
+				} else {
+					\SnappyMail\Log::error('PdoAddressBook', "Import remote contact {$sKey} failed");
+				}
 			}
 		}
 
 		return true;
 	}
 
-	public function Export(string $sEmail, string $sType = 'vcf') : bool
+	public function Export(string $sType = 'vcf'): bool
 	{
-		$this->SyncDatabase();
-
-		$iUserID = $this->getUserId($sEmail);
-		if (0 >= $iUserID)
-		{
+		if (1 > $this->iUserID) {
+			\SnappyMail\Log::warning('PdoAddressBook', 'Export() invalid $iUserID');
 			return false;
 		}
 
-		$bVcf = 'vcf' === $sType;
+		$rCsv = 'csv' === $sType ? \fopen('php://output', 'w') : null;
 		$bCsvHeader = true;
 
-		$aDatabaseSyncData = $this->prepareDatabaseSyncData($iUserID);
-		if (\is_array($aDatabaseSyncData) && \count($aDatabaseSyncData))
-		{
-			foreach ($aDatabaseSyncData as $mData)
-			{
-				if ($mData && isset($mData['id_contact'], $mData['deleted']) && !$mData['deleted'])
-				{
-					$oContact = $this->GetContactByID($sEmail, $mData['id_contact']);
-					if ($oContact)
-					{
-						if ($bVcf)
-						{
-							echo $oContact->ToVCard();
-						}
-						else
-						{
-							echo $oContact->ToCsv($bCsvHeader);
-							$bCsvHeader = false;
+		$aDatabaseSyncData = $this->prepareDatabaseSyncData();
+		if (\count($aDatabaseSyncData)) {
+			foreach ($aDatabaseSyncData as $mData) {
+				try {
+//					if ($mData && isset($mData['id_contact'], $mData['deleted']) && !$mData['deleted']) {
+					if ($mData && !empty($mData['id_contact'])) {
+						$oContact = $this->GetContactByID($mData['id_contact']);
+						if ($oContact) {
+							if ($rCsv) {
+								Utils::VCardToCsv($rCsv, $oContact->vCard, $bCsvHeader);
+								$bCsvHeader = false;
+							} else {
+								echo $oContact->vCard->serialize();
+							}
 						}
 					}
+				} catch (\Throwable $oExc) {
+					$this->logException($oExc);
 				}
 			}
 		}
@@ -334,142 +365,126 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function ContactSave(string $sEmail, Classes\Contact $oContact, bool $bSyncDb = true) : bool
+	public function ContactSave(Contact $oContact): bool
 	{
-		if ($bSyncDb)
-		{
-			$this->SyncDatabase();
+		if (1 > $this->iUserID) {
+			\SnappyMail\Log::warning('PdoAddressBook', 'ContactSave() invalid $iUserID');
+			return false;
 		}
 
-		$iUserID = $this->getUserId($sEmail);
-
-		$iIdContact = \strlen($oContact->IdContact) && \is_numeric($oContact->IdContact) ? (int) $oContact->IdContact : 0;
+		$iIdContact = \strlen($oContact->id) && \is_numeric($oContact->id) ? (int) $oContact->id : 0;
 
 		$bUpdate = 0 < $iIdContact;
 
-		$oContact->UpdateDependentValues();
 		$oContact->Changed = \time();
+//		$oContact->vCard->REV = \gmdate('Ymd\\THis\\Z', $oContact->Changed);
+//		$oContact->REV = \time();
+
+		try {
+			$sFullName = (string) $oContact->vCard->FN;
 
-		try
-		{
 			$aFreq = array();
-			if ($bUpdate)
-			{
-				$aFreq = $this->getContactFreq($iUserID, $iIdContact);
+			if ($bUpdate) {
+				$aFreq = $this->getContactFreq($this->iUserID, $iIdContact);
 
-				$sSql = 'UPDATE rainloop_ab_contacts SET id_contact_str = :id_contact_str, display = :display, changed = :changed, etag = :etag '.
-					'WHERE id_user = :id_user AND id_contact = :id_contact';
-
-				$this->prepareAndExecute($sSql,
+				$this->prepareAndExecute('UPDATE rainloop_ab_contacts
+					SET id_contact_str = :id_contact_str, display = :display, changed = :changed, etag = :etag
+					WHERE id_user = :id_user AND id_contact = :id_contact',
 					array(
-						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 						':id_contact' => array($iIdContact, \PDO::PARAM_INT),
 						':id_contact_str' => array($oContact->IdContactStr, \PDO::PARAM_STR),
-						':display' => array($oContact->Display, \PDO::PARAM_STR),
+						':display' => array($sFullName, \PDO::PARAM_STR),
 						':changed' => array($oContact->Changed, \PDO::PARAM_INT),
 						':etag' => array($oContact->Etag, \PDO::PARAM_STR)
 					)
 				);
 
-				// clear previos props
+				// clear previous props
 				$this->prepareAndExecute(
 					'DELETE FROM rainloop_ab_properties WHERE id_user = :id_user AND id_contact = :id_contact',
 					array(
-						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 						':id_contact' => array($iIdContact, \PDO::PARAM_INT)
 					)
 				);
-			}
-			else
-			{
-				$sSql = 'INSERT INTO rainloop_ab_contacts '.
-					'( id_user,  id_contact_str,  display,  changed,  etag)'.
-					' VALUES '.
-					'(:id_user, :id_contact_str, :display, :changed, :etag)';
-
-				$this->prepareAndExecute($sSql,
+			} else {
+				$this->prepareAndExecute('INSERT INTO rainloop_ab_contacts
+					( id_user,  id_contact_str,  display,  changed,  etag)
+					VALUES
+					(:id_user, :id_contact_str, :display, :changed, :etag)',
 					array(
-						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 						':id_contact_str' => array($oContact->IdContactStr, \PDO::PARAM_STR),
-						':display' => array($oContact->Display, \PDO::PARAM_STR),
+						':display' => array($sFullName, \PDO::PARAM_STR),
 						':changed' => array($oContact->Changed, \PDO::PARAM_INT),
 						':etag' => array($oContact->Etag, \PDO::PARAM_STR)
 					)
 				);
 
 				$sLast = $this->lastInsertId('rainloop_ab_contacts', 'id_contact');
-				if (\is_numeric($sLast) && 0 < (int) $sLast)
-				{
+				if (\is_numeric($sLast) && 0 < (int) $sLast) {
 					$iIdContact = (int) $sLast;
-					$oContact->IdContact = (string) $iIdContact;
+					$oContact->id = (string) $iIdContact;
 				}
 			}
 
-			if (0 < $iIdContact)
-			{
+			if (0 < $iIdContact) {
 				$aParams = array();
-				foreach ($oContact->Properties as /* @var $oProp Classes\Property */ $oProp)
-				{
+				foreach (Legacy::VCardToProperties($oContact->vCard) as /* @var $oProp Classes\Property */ $oProp) {
 					$iFreq = $oProp->Frec;
-					if ($oProp->IsEmail() && isset($aFreq[$oProp->Value]))
-					{
+					if (PropertyType::EMAIl === $oProp->Type && isset($aFreq[$oProp->Value])) {
 						$iFreq = $aFreq[$oProp->Value];
 					}
-
 					$aParams[] = array(
 						':id_contact' => array($iIdContact, \PDO::PARAM_INT),
-						':id_user' => array($iUserID, \PDO::PARAM_INT),
+						':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 						':prop_type' => array($oProp->Type, \PDO::PARAM_INT),
 						':prop_type_str' => array($oProp->TypeStr, \PDO::PARAM_STR),
 						':prop_value' => array($oProp->Value, \PDO::PARAM_STR),
-						':prop_value_lower' => array($oProp->ValueLower, \PDO::PARAM_STR),
-						':prop_value_custom' => array($oProp->ValueCustom, \PDO::PARAM_STR),
+						':prop_value_lower' => array(\mb_strtolower($oProp->Value, 'UTF-8'), \PDO::PARAM_STR),
+						':prop_value_custom' => array('', \PDO::PARAM_STR),
 						':prop_frec' => array($iFreq, \PDO::PARAM_INT),
 					);
 				}
-
-				if (\count($aParams))
-				{
-					$sSql = 'INSERT INTO rainloop_ab_properties '.
+				if ($aParams) {
+					$this->prepareAndExecute('INSERT INTO rainloop_ab_properties '.
 						'( id_contact,  id_user,  prop_type,  prop_type_str,  prop_value,  prop_value_lower, prop_value_custom,  prop_frec)'.
 						' VALUES '.
-						'(:id_contact, :id_user, :prop_type, :prop_type_str, :prop_value, :prop_value_lower, :prop_value_custom, :prop_frec)';
-
-					$this->prepareAndExecute($sSql, $aParams, true);
+						'(:id_contact, :id_user, :prop_type, :prop_type_str, :prop_value, :prop_value_lower, :prop_value_custom, :prop_frec)',
+						$aParams,
+						true
+					);
 				}
 			}
 		}
-		catch (\Throwable $oException)
-		{
+		catch (\Throwable $oException) {
 			throw $oException;
 		}
 
 		return 0 < $iIdContact;
 	}
 
-	public function DeleteContacts(string $sEmail, array $aContactIds, bool $bSyncDb = true) : bool
+	public function DeleteContacts(array $aContactIds): bool
 	{
-		if ($bSyncDb)
-		{
-			$this->SyncDatabase();
+		if (1 > $this->iUserID) {
+			\SnappyMail\Log::warning('PdoAddressBook', 'DeleteContacts() invalid $iUserID');
+			return false;
 		}
 
-		$iUserID = $this->getUserId($sEmail);
-
 		$aContactIds = \array_filter(\array_map('intval', $aContactIds));
 
-		if (0 === \count($aContactIds))
-		{
+		if (!\count($aContactIds)) {
 			return false;
 		}
 
 		$sIDs = \implode(',', $aContactIds);
-		$aParams = array(':id_user' => array($iUserID, \PDO::PARAM_INT));
+		$aParams = array(':id_user' => array($this->iUserID, \PDO::PARAM_INT));
 
 		$this->prepareAndExecute('DELETE FROM rainloop_ab_properties WHERE id_user = :id_user AND id_contact IN ('.$sIDs.')', $aParams);
 
 		$aParams = array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT),
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 			':changed' => array(\time(), \PDO::PARAM_INT)
 		);
 
@@ -479,13 +494,8 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function DeleteAllContacts(string $sEmail, bool $bSyncDb = true) : bool
+	public function DeleteAllContacts(string $sEmail): bool
 	{
-		if ($bSyncDb)
-		{
-			$this->SyncDatabase();
-		}
-
 		$iUserID = $this->getUserId($sEmail);
 
 		$aParams = array(':id_user' => array($iUserID, \PDO::PARAM_INT));
@@ -496,219 +506,289 @@ class PdoAddressBook
 		return true;
 	}
 
-	public function GetContacts(string $sEmail, int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0) : array
+	protected function getContactsFromPDO(?\PDOStatement $oStmt): array
 	{
-		$this->SyncDatabase();
+		if ($oStmt) {
+			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
 
-		$iOffset = 0 <= $iOffset ? $iOffset : 0;
-		$iLimit = 0 < $iLimit ? (int) $iLimit : 20;
-		$sSearch = \trim($sSearch);
-
-		$iUserID = $this->getUserId($sEmail);
-
-		$iCount = 0;
-		$aSearchIds = array();
-		$aPropertyFromSearchIds = array();
-
-		if (\strlen($sSearch))
-		{
-			$sCustomSearch = $this->specialConvertSearchValueCustomPhone($sSearch);
-			$sLowerSearch = $this->specialConvertSearchValueLower($sSearch, '=');
-
-			$sSearchTypes = \implode(',', array(
-				PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME,
-				PropertyType::PHONE, PropertyType::WEB_PAGE
-			));
-
-			$sSql = 'SELECT id_user, id_prop, id_contact FROM rainloop_ab_properties '.
-				'WHERE (id_user = :id_user) AND prop_type IN ('.$sSearchTypes.') AND ('.
-				'prop_value LIKE :search ESCAPE \'=\''.
-(\strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
-(\strlen($sCustomSearch) ? ' OR (prop_type = '.PropertyType::PHONE.' AND prop_value_custom <> \'\' AND prop_value_custom LIKE :search_custom_phone)' : '').
-				') GROUP BY id_contact, id_prop';
-
-			$aParams = array(
-				':id_user' => array($iUserID, \PDO::PARAM_INT),
-				':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
-			);
-
-			if (\strlen($sLowerSearch))
-			{
-				$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
-			}
-
-			if (\strlen($sCustomSearch))
-			{
-				$aParams[':search_custom_phone'] = array($sCustomSearch, \PDO::PARAM_STR);
-			}
-
-			$oStmt = $this->prepareAndExecute($sSql, $aParams, false, true);
-			if ($oStmt)
-			{
-				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-				if (\is_array($aFetch) && \count($aFetch))
-				{
-					foreach ($aFetch as $aItem)
-					{
-						$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
-						if (0 < $iIdContact)
-						{
-							$aSearchIds[] = $iIdContact;
-							$aPropertyFromSearchIds[$iIdContact] = isset($aItem['id_prop']) ? (int) $aItem['id_prop'] : 0;
-						}
-					}
-				}
-
-				$aSearchIds = \array_unique($aSearchIds);
-				$iCount = \count($aSearchIds);
-			}
-		}
-		else
-		{
-			$sSql = 'SELECT COUNT(DISTINCT id_contact) as contact_count FROM rainloop_ab_properties '.
-				'WHERE id_user = :id_user';
-
-			$aParams = array(
-				':id_user' => array($iUserID, \PDO::PARAM_INT)
-			);
-
-			$oStmt = $this->prepareAndExecute($sSql, $aParams);
-			if ($oStmt)
-			{
-				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-				if ($aFetch && isset($aFetch[0]['contact_count']) && is_numeric($aFetch[0]['contact_count']) && 0 < (int) $aFetch[0]['contact_count'])
-				{
-					$iCount = (int) $aFetch[0]['contact_count'];
-				}
-			}
-		}
-
-		$iResultCount = $iCount;
-
-		$aResult = array();
-		if (0 < $iCount)
-		{
-			$sSql = 'SELECT * FROM rainloop_ab_contacts WHERE deleted = 0 AND id_user = :id_user';
-
-			$aParams = array(
-				':id_user' => array($iUserID, \PDO::PARAM_INT)
-			);
-
-			if (\count($aSearchIds))
-			{
-				$sSql .= ' AND id_contact IN ('.implode(',', $aSearchIds).')';
-			}
-
-			$sSql .= ' ORDER BY display ASC LIMIT :limit OFFSET :offset';
-			$aParams[':limit'] = array($iLimit, \PDO::PARAM_INT);
-			$aParams[':offset'] = array($iOffset, \PDO::PARAM_INT);
-
-			$oStmt = $this->prepareAndExecute($sSql, $aParams);
-			if ($oStmt)
-			{
-				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-
-				$aContacts = array();
-				$aIdContacts = array();
-				if (\is_array($aFetch) && \count($aFetch))
-				{
-					foreach ($aFetch as $aItem)
-					{
-						$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
-						if (0 < $iIdContact)
-						{
+			$aContacts = array();
+			$aIdContacts = array();
+			if (\is_array($aFetch) && \count($aFetch)) {
+				foreach ($aFetch as $aItem) {
+					$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
+					if (0 < $iIdContact) {
+						$oContact = new Contact();
+						$oContact->id = (string) $iIdContact;
+						$oContact->IdContactStr = (string) $aItem['id_contact_str'];
+//						$oContact->Display = (string) $aItem['display'];
+						$oContact->Changed = (int) $aItem['changed'];
+						$oContact->Etag = (int) $aItem['etag'];
+						if (!empty($aItem['jcard'])) {
+							$oContact->setVCard(
+								\Sabre\VObject\Reader::readJson($aItem['jcard'])
+							);
+//							$oContact->vCard->FN = (string) $aItem['display'];
+//							$oContact->vCard->REV = \gmdate('Ymd\\THis\\Z', $oContact->Changed);
+						} else {
 							$aIdContacts[] = $iIdContact;
-							$oContact = new Classes\Contact();
-
-							$oContact->IdContact = (string) $iIdContact;
-							$oContact->IdContactStr = isset($aItem['id_contact_str']) ? (string) $aItem['id_contact_str'] : '';
-							$oContact->Display = isset($aItem['display']) ? (string) $aItem['display'] : '';
-							$oContact->Changed = isset($aItem['changed']) ? (int) $aItem['changed'] : 0;
-							$oContact->ReadOnly = $iUserID !== (isset($aItem['id_user']) ? (int) $aItem['id_user'] : 0);
-
-							$oContact->IdPropertyFromSearch = isset($aPropertyFromSearchIds[$iIdContact]) &&
-								0 < $aPropertyFromSearchIds[$iIdContact] ? $aPropertyFromSearchIds[$iIdContact] : 0;
-
-							$aContacts[$iIdContact] = $oContact;
 						}
+						$aContacts[$iIdContact] = $oContact;
 					}
 				}
+			}
 
-				unset($aFetch);
+			unset($aFetch);
 
-				if (\count($aIdContacts))
-				{
-					$oStmt->closeCursor();
+			// Build vCards using old RainLoop data (missing jCard)
+			if (\count($aIdContacts)) {
+				$oStmt->closeCursor();
 
-					$sSql = 'SELECT * FROM rainloop_ab_properties WHERE id_contact IN ('.\implode(',', $aIdContacts).')';
-					$oStmt = $this->prepareAndExecute($sSql);
-
-					if ($oStmt)
-					{
-						$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-						if (\is_array($aFetch) && \count($aFetch))
-						{
-							foreach ($aFetch as $aItem)
-							{
-								if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['prop_type'], $aItem['prop_value']))
-								{
-									$iId = (int) $aItem['id_contact'];
-									if (0 < $iId && isset($aContacts[$iId]))
+				$oStmt = $this->prepareAndExecute('SELECT * FROM rainloop_ab_properties
+				WHERE id_contact IN ('.\implode(',', $aIdContacts).')
+				ORDER BY id_contact ASC');
+				if ($oStmt) {
+					$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+					if (\is_array($aFetch) && \count($aFetch)) {
+						$aVCards = array();
+						$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
+						$iPrevId = 0;
+						foreach ($aFetch as $aItem) {
+							if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['prop_type'], $aItem['prop_value'])) {
+								$iId = (int) $aItem['id_contact'];
+								if (0 < $iId) {
+									if ($iPrevId != $iId) {
+										if ($iPrevId) {
+											$aVCards[$iPrevId]->UID = $sUid ?: \SnappyMail\UUID::generate();
+											$aVCards[$iPrevId]->N = array($sLastName, $sFirstName, $sMiddleName, $sPrefix, $sSuffix);
+										}
+										$sUid = $sFirstName = $sLastName = $sMiddleName = $sSuffix = $sPrefix = '';
+										$iPrevId = $iId;
+									}
+									if (isset($aVCards[$iId])) {
+										$oVCard = $aVCards[$iId];
+									} else {
+										$oVCard = new VCard;
+//										$oVCard = $oVCard->convert(VCard::VCARD40);
+										$oVCard->VERSION = '4.0';
+										$oVCard->PRODID = 'SnappyMail-'.APP_VERSION;
+										$aVCards[$iId] = $oVCard;
+									}
+									$oVCard = $aVCards[$iId];
+									$sPropValue = (string) $aItem['prop_value'];
+									$aTypes = array();
+									if (!empty($aItem['prop_type_str'])) {
+										$aTypes = \explode(',', \preg_replace('/[\s]+/', '', $aItem['prop_type_str']));
+									}
+									switch ((int) $aItem['prop_type'])
 									{
-										$oProperty = new Classes\Property();
-										$oProperty->IdProperty = (int) $aItem['id_prop'];
-										$oProperty->Type = (int) $aItem['prop_type'];
-										$oProperty->TypeStr = isset($aItem['prop_type_str']) ? (string) $aItem['prop_type_str'] : '';
-										$oProperty->Value = (string) $aItem['prop_value'];
-										$oProperty->ValueLower = isset($aItem['prop_value_lower']) ? (string) $aItem['prop_value_lower'] : '';
-										$oProperty->ValueCustom = isset($aItem['prop_value_custom']) ? (string) $aItem['prop_value_custom'] : '';
-										$oProperty->Frec = isset($aItem['prop_frec']) ? (int) $aItem['prop_frec'] : 0;
+										case PropertyType::JCARD:
+											break;
 
-										$aContacts[$iId]->Properties[] = $oProperty;
+										case PropertyType::FULLNAME:
+											$oVCard->FN = $sPropValue;
+											break;
+										case PropertyType::NICK_NAME:
+											$oVCard->NICKNAME = $sPropValue;
+											break;
+										case PropertyType::NOTE:
+											$oVCard->NOTE = $sPropValue;
+											break;
+										case PropertyType::UID:
+											$sUid = $sPropValue;
+											break;
+										case PropertyType::FIRST_NAME:
+											$sFirstName = $sPropValue;
+											break;
+										case PropertyType::LAST_NAME:
+											$sLastName = $sPropValue;
+											break;
+										case PropertyType::MIDDLE_NAME:
+											$sMiddleName = $sPropValue;
+											break;
+										case PropertyType::NAME_SUFFIX:
+											$sSuffix = $sPropValue;
+											break;
+										case PropertyType::NAME_PREFIX:
+											$sPrefix = $sPropValue;
+											break;
+
+										case PropertyType::EMAIl:
+											$oVCard->add('EMAIL', $sPropValue, \is_array($aTypes) && \count($aTypes) ? array('TYPE' => $aTypes) : null);
+											break;
+
+										case PropertyType::WEB_PAGE:
+											$oVCard->add('URL', $sPropValue, \is_array($aTypes) && \count($aTypes) ? array('TYPE' => $aTypes) : null);
+											break;
+
+										case PropertyType::PHONE:
+											$oVCard->add('TEL', $sPropValue, \is_array($aTypes) && \count($aTypes) ? array('TYPE' => $aTypes) : null);
+											break;
 									}
 								}
 							}
 						}
-
-						unset($aFetch);
-
-						foreach ($aContacts as $oItem)
-						{
-							$oItem->UpdateDependentValues();
+						if ($iPrevId) {
+							$aVCards[$iPrevId]->UID = $sUid ?: \SnappyMail\UUID::generate();
+							$aVCards[$iPrevId]->N = array($sLastName, $sFirstName, $sMiddleName, $sPrefix, $sSuffix);
 						}
 
-						$aResult = \array_values($aContacts);
+						foreach ($aVCards as $iId => $oVCard) {
+							$oVCard->REV = \gmdate('Ymd\\THis\\Z', $aContacts[$iId]->Changed);
+							$aContacts[$iId]->setVCard($oVCard);
+						}
+					}
+
+					unset($aFetch);
+				}
+			}
+
+			return \array_values($aContacts);
+		}
+
+		return [];
+	}
+
+	public function GetContacts(int $iOffset = 0, int $iLimit = 20, string $sSearch = '', int &$iResultCount = 0): array
+	{
+		if (1 > $this->iUserID) {
+			return [];
+		}
+
+		$aSearchIds = array();
+
+		if (\strlen($sSearch)) {
+			$sLowerSearch = $this->specialConvertSearchValueLower($sSearch, '=');
+
+			$sSearchTypes = \implode(',', static::$aSearchInFields);
+			// PropertyType::PHONE, PropertyType::WEB_PAGE
+
+			$sSql = 'SELECT DISTINCT id_contact FROM rainloop_ab_properties '.
+				'WHERE (id_user = :id_user) AND prop_type IN ('.$sSearchTypes.') AND ('.
+				'prop_value LIKE :search ESCAPE \'=\''.
+(\strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
+				')';
+
+			$aParams = array(
+				':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+				':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
+			);
+
+			if (\strlen($sLowerSearch)) {
+				$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
+			}
+
+			$oStmt = $this->prepareAndExecute($sSql, $aParams, false, true);
+			if ($oStmt) {
+				while ($aItem = $oStmt->fetch(\PDO::FETCH_NUM)) {
+					if (0 < $aItem[0]) {
+						$aSearchIds[] = (int) $aItem[0];
 					}
 				}
+				$iResultCount = \count($aSearchIds);
+			}
+		} else {
+			$oStmt = $this->prepareAndExecute(
+				'SELECT COUNT(*) FROM rainloop_ab_contacts WHERE id_user = :id_user',
+				[':id_user' => array($this->iUserID, \PDO::PARAM_INT)]
+			);
+			if ($oStmt && $aItem = $oStmt->fetch(\PDO::FETCH_NUM)) {
+				$iResultCount = (int) $aItem[0];
 			}
 		}
 
-		return $aResult;
+		if (0 < $iResultCount) {
+			$sSql = 'SELECT
+				c.id_contact,
+				c.id_contact_str,
+				c.display,
+				c.changed,
+				c.etag,
+				p.prop_value as jcard
+			FROM rainloop_ab_contacts AS c
+			LEFT JOIN rainloop_ab_properties AS p ON (p.id_contact = c.id_contact AND p.prop_type = :prop_type)
+			WHERE c.deleted = 0 AND c.id_user = :id_user';
+			if (\count($aSearchIds)) {
+				$sSql .= ' AND c.id_contact IN ('.\implode(',', $aSearchIds).')';
+			}
+			$sSql .= ' ORDER BY display ASC LIMIT :limit OFFSET :offset';
+
+			$aParams = array(
+				':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+				':prop_type' => array(PropertyType::JCARD, \PDO::PARAM_INT),
+				':limit' => array($iLimit, \PDO::PARAM_INT),
+				':offset' => array($iOffset, \PDO::PARAM_INT)
+			);
+
+			return $this->getContactsFromPDO(
+				$this->prepareAndExecute($sSql, $aParams)
+			);
+		}
+
+		return [];
 	}
 
-	/**
-	 * @param mixed $mID
-	 */
-	public function GetContactByID(string $sEmail, $mID, bool $bIsStrID = false) : ?Classes\Contact
+	public function GetContactByEmail(string $sEmail): ?Contact
+	{
+		$sLowerSearch = $this->specialConvertSearchValueLower($sEmail);
+
+		$sSql = 'SELECT
+			DISTINCT id_contact
+		FROM rainloop_ab_properties
+		WHERE id_user = :id_user
+		 AND prop_type = '.PropertyType::JCARD.'
+		 AND ('.
+			'prop_value LIKE :search ESCAPE \'=\''
+				. (\strlen($sLowerSearch) ? ' OR (prop_value_lower <> \'\' AND prop_value_lower LIKE :search_lower ESCAPE \'=\')' : '').
+			')';
+		$aParams = array(
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+			':search' => array($this->specialConvertSearchValue($sEmail, '='), \PDO::PARAM_STR)
+		);
+		if (\strlen($sLowerSearch)) {
+			$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
+		}
+
+		// This query selects id_contact only, so it must not be handed to
+		// getContactsFromPDO(), which unconditionally reads id_contact_str,
+		// changed, etag and jcard from every row. Look the contact up by id
+		// instead: GetContactByID() selects those columns, so the Contact it
+		// returns carries a real etag and changed value rather than 0.
+		$oStmt = $this->prepareAndExecute($sSql, $aParams);
+		if ($oStmt) {
+			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+			if (\is_array($aFetch) && \count($aFetch) && !empty($aFetch[0]['id_contact'])) {
+				return $this->GetContactByID((int) $aFetch[0]['id_contact']);
+			}
+		}
+
+		return null;
+	}
+
+	public function GetContactByID(mixed $mID, bool $bIsStrID = false): ?Contact
 	{
 		$mID = \trim($mID);
 
-		$iUserID = $this->getUserId($sEmail);
-
-		$sSql = 'SELECT * FROM rainloop_ab_contacts WHERE deleted = 0 AND id_user = :id_user';
+		$sSql = 'SELECT
+			c.id_contact,
+			c.id_contact_str,
+			c.display,
+			c.changed,
+			c.etag,
+			p.prop_value as jcard
+		FROM rainloop_ab_contacts AS c
+		LEFT JOIN rainloop_ab_properties AS p ON (p.id_contact = c.id_contact AND p.prop_type = :prop_type)
+		WHERE c.id_user = :id_user AND c.deleted = 0';
 
 		$aParams = array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT)
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
+			':prop_type' => array(PropertyType::JCARD, \PDO::PARAM_INT)
 		);
 
-		if ($bIsStrID)
-		{
-			$sSql .= ' AND id_contact_str = :id_contact_str';
+		if ($bIsStrID) {
+			$sSql .= ' AND c.id_contact_str = :id_contact_str';
 			$aParams[':id_contact_str'] = array($mID, \PDO::PARAM_STR);
-		}
-		else
-		{
-			$sSql .= ' AND id_contact = :id_contact';
+		} else {
+			$sSql .= ' AND c.id_contact = :id_contact';
 			$aParams[':id_contact'] = array($mID, \PDO::PARAM_INT);
 		}
 
@@ -717,93 +797,28 @@ class PdoAddressBook
 		$oContact = null;
 		$iIdContact = 0;
 
-		$oStmt = $this->prepareAndExecute($sSql, $aParams);
-		if ($oStmt)
-		{
-			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
+		$aContacts = $this->getContactsFromPDO(
+			$this->prepareAndExecute($sSql, $aParams)
+		);
 
-			if (\is_array($aFetch) && \count($aFetch))
-			{
-				foreach ($aFetch as $aItem)
-				{
-					$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
-					if (0 < $iIdContact)
-					{
-						$oContact = new Classes\Contact();
-
-						$oContact->IdContact = (string) $iIdContact;
-						$oContact->IdContactStr = isset($aItem['id_contact_str']) ? (string) $aItem['id_contact_str'] : '';
-						$oContact->Display = isset($aItem['display']) ? (string) $aItem['display'] : '';
-						$oContact->Changed = isset($aItem['changed']) ? (int) $aItem['changed'] : 0;
-						$oContact->ReadOnly = $iUserID !== (isset($aItem['id_user']) ? (int) $aItem['id_user'] : 0);
-						$oContact->Etag = empty($aItem['etag']) ? '' : (string) $aItem['etag'];
-					}
-				}
-			}
-
-			unset($aFetch);
-
-			if (0 < $iIdContact && $oContact)
-			{
-				$oStmt->closeCursor();
-
-				$sSql = 'SELECT * FROM rainloop_ab_properties WHERE id_contact = '.$iIdContact;
-				$oStmt = $this->prepareAndExecute($sSql);
-
-				if ($oStmt)
-				{
-					$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-					if (\is_array($aFetch) && \count($aFetch))
-					{
-						foreach ($aFetch as $aItem)
-						{
-							if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['prop_type'], $aItem['prop_value']))
-							{
-								if ((string) $oContact->IdContact === (string) $aItem['id_contact'])
-								{
-									$oProperty = new Classes\Property();
-									$oProperty->IdProperty = (int) $aItem['id_prop'];
-									$oProperty->Type = (int) $aItem['prop_type'];
-									$oProperty->TypeStr = isset($aItem['prop_type_str']) ? (string) $aItem['prop_type_str'] : '';
-									$oProperty->Value = (string) $aItem['prop_value'];
-									$oProperty->ValueLower = isset($aItem['prop_value_lower']) ? (string) $aItem['prop_value_lower'] : '';
-									$oProperty->ValueCustom = isset($aItem['prop_value_custom']) ? (string) $aItem['prop_value_custom'] : '';
-									$oProperty->Frec = isset($aItem['prop_frec']) ? (int) $aItem['prop_frec'] : 0;
-
-									$oContact->Properties[] = $oProperty;
-								}
-							}
-						}
-					}
-
-					unset($aFetch);
-
-					$oContact->UpdateDependentValues();
-				}
-			}
-		}
-
-		return $oContact;
+		return $aContacts ? $aContacts[0] : null;
 	}
 
 	/**
-	 * @throws \InvalidArgumentException
+	 * @throws \ValueError
 	 */
-	public function GetSuggestions(string $sEmail, string $sSearch, int $iLimit = 20) : array
+	public function GetSuggestions(string $sSearch, int $iLimit = 20): array
 	{
-		$sSearch = \trim($sSearch);
-		if (0 === \strlen($sSearch))
-		{
-			throw new \InvalidArgumentException('Empty Search argument');
+		if (1 > $this->iUserID) {
+			return [];
 		}
 
-		$this->SyncDatabase();
+		$sSearch = \trim($sSearch);
+		if (!\strlen($sSearch)) {
+			throw new \ValueError('Empty Search argument');
+		}
 
-		$iUserID = $this->getUserId($sEmail);
-
-		$sTypes = implode(',', array(
-			PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME
-		));
+		$sTypes = \implode(',', static::$aSearchInFields);
 
 		$sLowerSearch = $this->specialConvertSearchValueLower($sSearch);
 
@@ -815,13 +830,12 @@ class PdoAddressBook
 		;
 
 		$aParams = array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT),
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 			':limit' => array($iLimit, \PDO::PARAM_INT),
 			':search' => array($this->specialConvertSearchValue($sSearch, '='), \PDO::PARAM_STR)
 		);
 
-		if (\strlen($sLowerSearch))
-		{
+		if (\strlen($sLowerSearch)) {
 			$aParams[':search_lower'] = array($sLowerSearch, \PDO::PARAM_STR);
 		}
 
@@ -831,30 +845,24 @@ class PdoAddressBook
 		$aResult = array();
 
 		$oStmt = $this->prepareAndExecute($sSql, $aParams);
-		if ($oStmt)
-		{
+		if ($oStmt) {
 			$aIdContacts = array();
 			$aIdProps = array();
 			$aContactAllAccess = array();
 
 			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-			if (\is_array($aFetch) && \count($aFetch))
-			{
-				foreach ($aFetch as $aItem)
-				{
+			if (\is_array($aFetch) && \count($aFetch)) {
+				foreach ($aFetch as $aItem) {
 					$iIdContact = $aItem && isset($aItem['id_contact']) ? (int) $aItem['id_contact'] : 0;
 					$iIdProp = $aItem && isset($aItem['id_prop']) ? (int) $aItem['id_prop'] : 0;
 					$iType = $aItem && isset($aItem['prop_type']) ? (int) $aItem['prop_type'] : 0;
 
-					if (0 < $iIdContact && 0 < $iIdProp)
-					{
+					if (0 < $iIdContact && 0 < $iIdProp) {
 						$aIdContacts[$iIdContact] = $iIdContact;
 						$aIdProps[$iIdProp] = $iIdProp;
 
-						if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME, PropertyType::NICK_NAME)))
-						{
-							if (!isset($aContactAllAccess[$iIdContact]))
-							{
+						if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME, PropertyType::NICK_NAME))) {
+							if (!isset($aContactAllAccess[$iIdContact])) {
 								$aContactAllAccess[$iIdContact] = array();
 							}
 
@@ -867,52 +875,40 @@ class PdoAddressBook
 			unset($aFetch);
 
 			$aIdContacts = \array_values($aIdContacts);
-			if (\count($aIdContacts))
-			{
+			if (\count($aIdContacts)) {
 				$oStmt->closeCursor();
 
-				$sTypes = \implode(',', array(
-					PropertyType::EMAIl, PropertyType::FIRST_NAME, PropertyType::LAST_NAME, PropertyType::NICK_NAME
-				));
+				$sTypes = \implode(',', static::$aSearchInFields);
 
 				$sSql = 'SELECT id_prop, id_contact, prop_type, prop_value FROM rainloop_ab_properties '.
 					'WHERE prop_type IN ('.$sTypes.') AND id_contact IN ('.\implode(',', $aIdContacts).')';
 
 				$oStmt = $this->prepareAndExecute($sSql);
-				if ($oStmt)
-				{
+				if ($oStmt) {
 					$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-					if (\is_array($aFetch) && \count($aFetch))
-					{
+					if (\is_array($aFetch) && \count($aFetch)) {
 						$aNames = array();
 						$aEmails = array();
 
-						foreach ($aFetch as $aItem)
-						{
-							if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['prop_type'], $aItem['prop_value']))
-							{
+						foreach ($aFetch as $aItem) {
+							if ($aItem && isset($aItem['id_prop'], $aItem['id_contact'], $aItem['prop_type'], $aItem['prop_value'])) {
 								$iIdContact = (int) $aItem['id_contact'];
 								$iIdProp = (int) $aItem['id_prop'];
 								$iType = (int) $aItem['prop_type'];
 
-								if (PropertyType::NICK_NAME === $iType)
-								{
+								if (PropertyType::NICK_NAME === $iType) {
 									$aNicks[$iIdContact] = $aItem['prop_value'];
 								}
-								else if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME)))
-								{
-									if (!isset($aNames[$iIdContact]))
-									{
+								else if (\in_array($iType, array(PropertyType::LAST_NAME, PropertyType::FIRST_NAME))) {
+									if (!isset($aNames[$iIdContact])) {
 										$aNames[$iIdContact] = array('', '');
 									}
 
 									$aNames[$iIdContact][PropertyType::FIRST_NAME === $iType ? 0 : 1] = $aItem['prop_value'];
 								}
 								else if ((isset($aIdProps[$iIdProp]) || isset($aContactAllAccess[$iIdContact])) &&
-									PropertyType::EMAIl === $iType)
-								{
-									if (!isset($aEmails[$iIdContact]))
-									{
+									PropertyType::EMAIl === $iType) {
+									if (!isset($aEmails[$iIdContact])) {
 										$aEmails[$iIdContact] = array();
 									}
 
@@ -921,10 +917,8 @@ class PdoAddressBook
 							}
 						}
 
-						foreach ($aEmails as $iId => $aItems)
-						{
-							if (isset($aContactAllAccess[$iId]))
-							{
+						foreach ($aEmails as $iId => $aItems) {
+							if (isset($aContactAllAccess[$iId])) {
 								$bName = \in_array(PropertyType::FIRST_NAME, $aContactAllAccess[$iId]) || \in_array(PropertyType::LAST_NAME, $aContactAllAccess[$iId]);
 								$bNick = \in_array(PropertyType::NICK_NAME, $aContactAllAccess[$iId]);
 
@@ -933,36 +927,28 @@ class PdoAddressBook
 
 								$sNickItem = isset($aNicks[$iId]) ? $aNicks[$iId] : '';
 
-								foreach ($aItems as $sEmail)
-								{
-									if ($sEmail)
-									{
-										if ($bName)
-										{
+								foreach ($aItems as $sEmail) {
+									if ($sEmail) {
+										if ($bName) {
 											$aResult[] = array($sEmail, $sNameItem);
 										}
-										else if ($bNick)
-										{
+										else if ($bNick) {
 											$aResult[] = array($sEmail, $sNickItem);
 										}
-										else
-										{
+										else {
 											$aResult[] = array($sEmail, '');
 										}
 									}
 								}
 							}
-							else
-							{
+							else {
 								$aNameItem = isset($aNames[$iId]) && \is_array($aNames[$iId]) ? $aNames[$iId] : array('', '');
 								$sNameItem = \trim($aNameItem[0].' '.$aNameItem[1]);
-								if (0 === \strlen($sNameItem))
-								{
+								if (0 === \strlen($sNameItem)) {
 									$sNameItem = isset($aNicks[$iId]) ? $aNicks[$iId] : '';
 								}
 
-								foreach ($aItems as $sEmail)
-								{
+								foreach ($aItems as $sEmail) {
 									$aResult[] = array($sEmail, $sNameItem);
 								}
 							}
@@ -971,8 +957,7 @@ class PdoAddressBook
 
 					unset($aFetch);
 
-					if ($iLimit < \count($aResult))
-					{
+					if ($iLimit < \count($aResult)) {
 						$aResult = \array_slice($aResult, 0, $iLimit);
 					}
 
@@ -984,16 +969,24 @@ class PdoAddressBook
 		return array();
 	}
 
-	public function IncFrec(string $sEmail, array $aEmails, bool $bCreateAuto = true) : bool
+	/**
+	 * @throws \ValueError
+	 */
+	public function IncFrec(array $aEmails, bool $bCreateAuto = true): bool
 	{
+		if (1 > $this->iUserID) {
+			return false;
+		}
+
 		$self = $this;
 		$aEmailsObjects = \array_map(function ($mItem) {
 			$oResult = null;
-			try
-			{
+			try {
 				$oResult = \MailSo\Mime\Email::Parse(\trim($mItem));
 			}
-			catch (\Throwable $oException) { unset($oException); }
+			catch (\Throwable $oException) {
+				unset($oException);
+			}
 			return $oResult;
 		}, $aEmails);
 
@@ -1001,35 +994,26 @@ class PdoAddressBook
 			return !!$oItem;
 		});
 
-		if (0 === \count($aEmailsObjects))
-		{
-			throw new \InvalidArgumentException('Empty Emails argument');
+		if (!\count($aEmailsObjects)) {
+			throw new \ValueError('Empty Emails argument');
 		}
 
-		$this->SyncDatabase();
-		$iUserID = $this->getUserId($sEmail);
-
 		$aExists = array();
 		$aEmailsToCreate = array();
 		$aEmailsToUpdate = array();
 
-		if ($bCreateAuto)
-		{
+		if ($bCreateAuto) {
 			$sSql = 'SELECT prop_value FROM rainloop_ab_properties WHERE id_user = :id_user AND prop_type = :prop_type';
 			$oStmt = $this->prepareAndExecute($sSql, array(
-				':id_user' => array($iUserID, \PDO::PARAM_INT),
+				':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 				':prop_type' => array(PropertyType::EMAIl, \PDO::PARAM_INT)
 			));
 
-			if ($oStmt)
-			{
+			if ($oStmt) {
 				$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-				if (\is_array($aFetch) && \count($aFetch))
-				{
-					foreach ($aFetch as $aItem)
-					{
-						if ($aItem && !empty($aItem['prop_value']))
-						{
+				if (\is_array($aFetch) && \count($aFetch)) {
+					foreach ($aFetch as $aItem) {
+						if ($aItem && !empty($aItem['prop_value'])) {
 							$aExists[] = \mb_strtolower(\trim($aItem['prop_value']));
 						}
 					}
@@ -1037,28 +1021,20 @@ class PdoAddressBook
 			}
 
 			$aEmailsToCreate = \array_filter($aEmailsObjects, function ($oItem) use ($aExists, &$aEmailsToUpdate) {
-				if ($oItem)
-				{
+				if ($oItem) {
 					$sEmail = \trim($oItem->GetEmail(true));
-					if (\strlen($sEmail))
-					{
+					if (\strlen($sEmail)) {
 						$aEmailsToUpdate[] = $sEmail;
-						return !\in_array($sEmail, $aExists);
+						return !\in_array(\mb_strtolower($sEmail), $aExists);
 					}
 				}
-
 				return false;
 			});
-		}
-		else
-		{
-			foreach ($aEmailsObjects as $oItem)
-			{
-				if ($oItem)
-				{
+		} else {
+			foreach ($aEmailsObjects as $oItem) {
+				if ($oItem) {
 					$sEmailUpdate = \trim($oItem->GetEmail(true));
-					if (\strlen($sEmailUpdate))
-					{
+					if (\strlen($sEmailUpdate)) {
 						$aEmailsToUpdate[] = $sEmailUpdate;
 					}
 				}
@@ -1067,60 +1043,34 @@ class PdoAddressBook
 
 		unset($aEmails, $aEmailsObjects);
 
-		if (\count($aEmailsToCreate))
-		{
-			$oContact = new Classes\Contact();
-			foreach ($aEmailsToCreate as $oEmail)
-			{
-				if ('' !== \trim($oEmail->GetEmail()))
-				{
-					$oPropEmail = new Classes\Property();
-					$oPropEmail->Type = Enumerations\PropertyType::EMAIl;
-					$oPropEmail->Value = \trim($oEmail->GetEmail(true));
-
-					$oContact->Properties[] = $oPropEmail;
+		if (\count($aEmailsToCreate)) {
+			foreach ($aEmailsToCreate as $oEmail) {
+				$oVCard = new VCard;
+				$bValid = false;
+				if ('' !== \trim($oEmail->GetEmail())) {
+					$oVCard->add('EMAIL', \trim($oEmail->GetEmail(true)));
+					$bValid = true;
 				}
-
-				if ('' !== \trim($oEmail->GetDisplayName()))
-				{
+				if ('' !== \trim($oEmail->GetDisplayName())) {
 					$sFirst = $sLast = '';
 					$sFullName = $oEmail->GetDisplayName();
-					if (false !== \strpos($sFullName, ' '))
-					{
+					if (false !== \strpos($sFullName, ' ')) {
 						$aNames = \explode(' ', $sFullName, 2);
 						$sFirst = isset($aNames[0]) ? $aNames[0] : '';
 						$sLast = isset($aNames[1]) ? $aNames[1] : '';
-					}
-					else
-					{
+					} else {
 						$sFirst = $sFullName;
 					}
-
-					if (\strlen($sFirst))
-					{
-						$oPropName = new Classes\Property();
-						$oPropName->Type = Enumerations\PropertyType::FIRST_NAME;
-						$oPropName->Value = \trim($sFirst);
-
-						$oContact->Properties[] = $oPropName;
-					}
-
-					if (\strlen($sLast))
-					{
-						$oPropName = new Classes\Property();
-						$oPropName->Type = Enumerations\PropertyType::LAST_NAME;
-						$oPropName->Value = \trim($sLast);
-
-						$oContact->Properties[] = $oPropName;
+					if (\strlen($sFirst) || \strlen($sLast)) {
+						$oVCard->N = array($sLast, $sFirst, '', '', '');
+						$bValid = true;
 					}
 				}
-
-				if (\count($oContact->Properties))
-				{
-					$this->ContactSave($sEmail, $oContact);
+				if ($bValid) {
+					$oContact = new Contact();
+					$oContact->setVCard($oVCard);
+					$this->ContactSave($oContact);
 				}
-
-				$oContact->Clear();
 			}
 		}
 
@@ -1130,42 +1080,34 @@ class PdoAddressBook
 			return $self->quoteValue($mItem);
 		}, $aEmailsToUpdate);
 
-		if (1 === \count($aEmailsQuoted))
-		{
+		if (1 === \count($aEmailsQuoted)) {
 			$sSql .= ' AND prop_value = '.$aEmailsQuoted[0];
-		}
-		else
-		{
+		} else {
 			$sSql .= ' AND prop_value IN ('.\implode(',', $aEmailsQuoted).')';
 		}
 
 		return !!$this->prepareAndExecute($sSql, array(
-			':id_user' => array($iUserID, \PDO::PARAM_INT),
+			':id_user' => array($this->iUserID, \PDO::PARAM_INT),
 			':prop_type' => array(PropertyType::EMAIl, \PDO::PARAM_INT)
 		));
 	}
 
-	public function Test() : string
+	public function Test(): string
 	{
 		$sResult = '';
-		try
-		{
+		try {
 			$this->SyncDatabase();
-			if (0 >= $this->getVersion($this->sDsnType.'-ab-version'))
-			{
+			if (0 >= $this->getVersion($this->settings->driver.'-ab-version')) {
 				$sResult = 'Unknown database error';
 			}
 		}
-		catch (\Throwable $oException)
-		{
+		catch (\Throwable $oException) {
 			$sResult = $oException->getMessage();
-			if (!empty($sResult) && !\MailSo\Base\Utils::IsAscii($sResult) && !\MailSo\Base\Utils::IsUtf8($sResult))
-			{
-				$sResult = \utf8_encode($sResult);
+			if (!empty($sResult) && !\MailSo\Base\Utils::IsAscii($sResult) && !\MailSo\Base\Utils::IsUtf8($sResult)) {
+				$sResult = \mb_convert_encoding($sResult, 'UTF-8', 'ISO-8859-1');
 			}
 
-			if (!\is_string($sResult) || empty($sResult))
-			{
+			if (!\is_string($sResult) || empty($sResult)) {
 				$sResult = 'Unknown database error';
 			}
 		}
@@ -1173,179 +1115,29 @@ class PdoAddressBook
 		return $sResult;
 	}
 
-	private function getInitialTablesArray(string $sDbType) : array
-	{
-		switch ($sDbType)
-		{
-			case 'mysql':
-				$sInitial = <<<MYSQLINITIAL
-
-CREATE TABLE IF NOT EXISTS rainloop_ab_contacts (
-
-	id_contact     bigint UNSIGNED  NOT NULL AUTO_INCREMENT,
-	id_contact_str varchar(128)     NOT NULL DEFAULT '',
-	id_user        int UNSIGNED     NOT NULL,
-	display        varchar(255)     NOT NULL DEFAULT '',
-	changed        int UNSIGNED     NOT NULL DEFAULT 0,
-	deleted        tinyint UNSIGNED NOT NULL DEFAULT 0,
-	etag           varchar(128)     CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
-
-	PRIMARY KEY(id_contact),
-	INDEX id_user_rainloop_ab_contacts_index (id_user)
-
-) ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
-
-CREATE TABLE IF NOT EXISTS rainloop_ab_properties (
-
-	id_prop           bigint UNSIGNED  NOT NULL AUTO_INCREMENT,
-	id_contact        bigint UNSIGNED  NOT NULL,
-	id_user           int UNSIGNED     NOT NULL,
-	prop_type         tinyint UNSIGNED NOT NULL,
-	prop_type_str     varchar(255)     CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
-	prop_value        varchar(255)     NOT NULL DEFAULT '',
-	prop_value_custom varchar(255)     NOT NULL DEFAULT '',
-	prop_frec         int UNSIGNED     NOT NULL DEFAULT 0,
-
-	PRIMARY KEY(id_prop),
-	INDEX id_user_rainloop_ab_properties_index (id_user),
-	INDEX id_user_id_contact_rainloop_ab_properties_index (id_user, id_contact),
-	INDEX id_contact_prop_type_rainloop_ab_properties_index (id_contact, prop_type)
-
-) ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
-
-MYSQLINITIAL;
-				break;
-
-			case 'pgsql':
-				$sInitial = <<<POSTGRESINITIAL
-
-CREATE TABLE rainloop_ab_contacts (
-	id_contact     bigserial    PRIMARY KEY,
-	id_contact_str varchar(128) NOT NULL DEFAULT '',
-	id_user        integer      NOT NULL,
-	display        varchar(255) NOT NULL DEFAULT '',
-	changed        integer      NOT NULL default 0,
-	deleted        integer      NOT NULL default 0,
-	etag           varchar(128) NOT NULL DEFAULT ''
-);
-
-CREATE INDEX id_user_rainloop_ab_contacts_index ON rainloop_ab_contacts (id_user);
-
-CREATE TABLE rainloop_ab_properties (
-	id_prop           bigserial    PRIMARY KEY,
-	id_contact        integer      NOT NULL,
-	id_user           integer      NOT NULL,
-	prop_type         integer      NOT NULL,
-	prop_type_str     varchar(255) NOT NULL DEFAULT '',
-	prop_value        text         NOT NULL DEFAULT '',
-	prop_value_custom text         NOT NULL DEFAULT '',
-	prop_frec         integer      NOT NULL default 0
-);
-
-CREATE INDEX id_user_rainloop_ab_properties_index ON rainloop_ab_properties (id_user);
-CREATE INDEX id_user_id_contact_rainloop_ab_properties_index ON rainloop_ab_properties (id_user, id_contact);
-
-POSTGRESINITIAL;
-				break;
-
-			case 'sqlite':
-				$sInitial = <<<SQLITEINITIAL
-
-CREATE TABLE rainloop_ab_contacts (
-	id_contact     integer NOT NULL PRIMARY KEY,
-	id_contact_str text    NOT NULL DEFAULT '',
-	id_user        integer NOT NULL,
-	display        text    NOT NULL DEFAULT '',
-	changed        integer NOT NULL DEFAULT 0,
-	deleted        integer NOT NULL DEFAULT 0,
-	etag           text    NOT NULL DEFAULT ''
-);
-
-CREATE INDEX id_user_rainloop_ab_contacts_index ON rainloop_ab_contacts (id_user);
-
-CREATE TABLE rainloop_ab_properties (
-	id_prop           integer NOT NULL PRIMARY KEY,
-	id_contact        integer NOT NULL,
-	id_user           integer NOT NULL,
-	prop_type         integer NOT NULL,
-	prop_type_str     text    NOT NULL DEFAULT '',
-	prop_value        text    NOT NULL DEFAULT '',
-	prop_value_custom text    NOT NULL DEFAULT '',
-	prop_frec         integer NOT NULL DEFAULT 0
-);
-
-CREATE INDEX id_user_rainloop_ab_properties_index ON rainloop_ab_properties (id_user);
-CREATE INDEX id_user_id_contact_rainloop_ab_properties_index ON rainloop_ab_properties (id_user, id_contact);
-
-SQLITEINITIAL;
-				break;
-		}
-
-		$aResult = array();
-		if (\strlen($sInitial))
-		{
-			$aList = \explode(';', \trim($sInitial));
-			foreach ($aList as $sV)
-			{
-				$sV = \trim($sV);
-				if (\strlen($sV))
-				{
-					$aResult[] = $sV;
-				}
-			}
-		}
-
-		return $aResult;
-	}
-
-	public function SyncDatabase() : bool
+	private function SyncDatabase(): bool
 	{
 		static $mCache = null;
-		if (null !== $mCache)
-		{
+		if (null !== $mCache) {
 			return $mCache;
 		}
 
 		$mCache = false;
-		switch ($this->sDsnType)
-		{
+		switch ($this->settings->driver) {
 			case 'mysql':
-				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType),
-					2 => array(
-'ALTER TABLE rainloop_ab_properties ADD prop_value_lower varchar(255) NOT NULL DEFAULT \'\' AFTER prop_value_custom;'
-					),
-					3 => array(
-'ALTER TABLE rainloop_ab_properties CHANGE prop_value prop_value TEXT NOT NULL;',
-'ALTER TABLE rainloop_ab_properties CHANGE prop_value_custom prop_value_custom TEXT NOT NULL;',
-'ALTER TABLE rainloop_ab_properties CHANGE prop_value_lower prop_value_lower TEXT NOT NULL;'
-					)
-				));
-				break;
 			case 'pgsql':
-				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType),
-					2 => array(
-'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
-					),
-					3 => array()
-				));
-				break;
 			case 'sqlite':
-				$mCache = $this->dataBaseUpgrade($this->sDsnType.'-ab-version', array(
-					1 => $this->getInitialTablesArray($this->sDsnType),
-					2 => array(
-'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
-					),
-					3 => array()
-				));
+				$mCache = $this->dataBaseUpgrade(
+					$this->settings->driver.'-ab-version',
+					PdoSchema::getForDbType($this->settings->driver)
+				);
 				break;
 		}
 
 		return $mCache;
 	}
 
-	private function getContactFreq(int $iUserID, int $iIdContact) : array
+	private function getContactFreq(int $iUserID, int $iIdContact): array
 	{
 		$aResult = array();
 
@@ -1357,15 +1149,11 @@ SQLITEINITIAL;
 		);
 
 		$oStmt = $this->prepareAndExecute($sSql, $aParams);
-		if ($oStmt)
-		{
+		if ($oStmt) {
 			$aFetch = $oStmt->fetchAll(\PDO::FETCH_ASSOC);
-			if (\is_array($aFetch))
-			{
-				foreach ($aFetch as $aItem)
-				{
-					if ($aItem && !empty($aItem['prop_value']) && !empty($aItem['prop_frec']))
-					{
+			if (\is_array($aFetch)) {
+				foreach ($aFetch as $aItem) {
+					if ($aItem && !empty($aItem['prop_value']) && !empty($aItem['prop_frec'])) {
 						$aResult[$aItem['prop_value']] = (int) $aItem['prop_frec'];
 					}
 				}
@@ -1375,7 +1163,7 @@ SQLITEINITIAL;
 		return $aResult;
 	}
 
-	private function specialConvertSearchValue(string $sSearch, string $sEscapeSign = '=') : string
+	private function specialConvertSearchValue(string $sSearch, string $sEscapeSign = '='): string
 	{
 		return '%'.\str_replace(array($sEscapeSign, '_', '%'),
 			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'), $sSearch).'%';
@@ -1385,17 +1173,65 @@ SQLITEINITIAL;
 	{
 		return '%'.\str_replace(array($sEscapeSign, '_', '%'),
 			array($sEscapeSign.$sEscapeSign, $sEscapeSign.'_', $sEscapeSign.'%'),
-				(string) \mb_strtolower($sSearch, 'UTF-8')).'%';
+				(string) \mb_strtolower($sSearch)).'%';
 	}
 
-	private function specialConvertSearchValueCustomPhone(string $sSearch) : string
+	protected function getPdoSettings(): \RainLoop\Pdo\Settings
 	{
-		$sResult = '%'.\preg_replace('/[^\d]/', '', $sSearch).'%';
-		return '%%' === $sResult ? '' : $sResult;
+		$sSslCa = $this->settings->sslCa;
+		if ($sSslCa && !\is_file($sSslCa)) {
+			$sFile = \APP_PRIVATE_DATA . 'configs/contacts_mysql_ssl_ca.pem';
+//			$sSslCa = (\is_file($sFile) || \file_put_contents($sFile, $sSslCa)) ? $sFile : '';
+			$this->settings->sslCa = \file_put_contents($sFile, $sSslCa) ? $sFile : '';
+		}
+		return $this->settings;
 	}
 
-	protected function getPdoAccessData() : array
+	/**
+	 * @throws \ValueError
+	 */
+	protected function getUserId(string $sEmail, bool $bSkipInsert = false, bool $bCache = true): int
 	{
-		return array($this->sDsnType, $this->sDsn, $this->sUser, $this->sPassword);
+		static $aCache = array();
+
+		$sEmail = \SnappyMail\IDN::emailToAscii(\trim($sEmail));
+		if (empty($sEmail)) {
+			throw new \ValueError('Empty Email argument');
+		}
+
+		if ($bCache && isset($aCache[$sEmail])) {
+			return $aCache[$sEmail];
+		}
+
+		$this->SyncDatabase();
+
+		$oStmt = $this->prepareAndExecute('SELECT id_user FROM rainloop_users WHERE rl_email = :rl_email',
+			array(
+				':rl_email' => array($sEmail, \PDO::PARAM_STR)
+			)
+		);
+
+		$mRow = $oStmt->fetch(\PDO::FETCH_ASSOC);
+		if ($mRow && isset($mRow['id_user']) && \is_numeric($mRow['id_user'])) {
+			$iResult = (int) $mRow['id_user'];
+			if (0 >= $iResult) {
+				throw new \Exception('id_user <= 0');
+			}
+			if ($bCache) {
+				$aCache[$sEmail] = $iResult;
+			}
+			return $iResult;
+		}
+
+		if (!$bSkipInsert) {
+			$oStmt->closeCursor();
+			$oStmt = $this->prepareAndExecute('INSERT INTO rainloop_users (rl_email) VALUES (:rl_email)',
+				array(':rl_email' => array($sEmail, \PDO::PARAM_STR))
+			);
+			return $this->getUserId($sEmail, true);
+		}
+
+		throw new \Exception('id_user = 0');
 	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoSchema.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoSchema.php
new file mode 100644
index 000000000..8f97f84d2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/PdoSchema.php
@@ -0,0 +1,170 @@
+<?php
+
+namespace RainLoop\Providers\AddressBook;
+
+abstract class PdoSchema
+{
+	public static function mysql() : string
+	{
+		return <<<MYSQLINITIAL
+
+CREATE TABLE IF NOT EXISTS rainloop_ab_contacts (
+
+	id_contact     bigint UNSIGNED  NOT NULL AUTO_INCREMENT,
+	id_contact_str varchar(128)     NOT NULL DEFAULT '',
+	id_user        int UNSIGNED     NOT NULL,
+	display        varchar(255)     NOT NULL DEFAULT '',
+	changed        int UNSIGNED     NOT NULL DEFAULT 0,
+	deleted        tinyint UNSIGNED NOT NULL DEFAULT 0,
+	etag           varchar(128)     CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+
+	PRIMARY KEY(id_contact),
+	INDEX id_user_rainloop_ab_contacts_index (id_user)
+
+) ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+CREATE TABLE IF NOT EXISTS rainloop_ab_properties (
+
+	id_prop           bigint UNSIGNED  NOT NULL AUTO_INCREMENT,
+	id_contact        bigint UNSIGNED  NOT NULL,
+	id_user           int UNSIGNED     NOT NULL,
+	prop_type         tinyint UNSIGNED NOT NULL,
+	prop_type_str     varchar(255)     CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL DEFAULT '',
+	prop_value        MEDIUMTEXT         NOT NULL,
+	prop_value_custom MEDIUMTEXT         NOT NULL,
+	prop_frec         int UNSIGNED     NOT NULL DEFAULT 0,
+
+	PRIMARY KEY(id_prop),
+	INDEX id_user_rainloop_ab_properties_index (id_user),
+	INDEX id_user_id_contact_rainloop_ab_properties_index (id_user, id_contact),
+	INDEX id_contact_prop_type_rainloop_ab_properties_index (id_contact, prop_type)
+
+) ENGINE=INNODB CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
+
+MYSQLINITIAL;
+	}
+
+	public static function pgsql() : string
+	{
+		return <<<POSTGRESINITIAL
+
+CREATE TABLE rainloop_ab_contacts (
+	id_contact     bigserial    PRIMARY KEY,
+	id_contact_str varchar(128) NOT NULL DEFAULT '',
+	id_user        integer      NOT NULL,
+	display        varchar(255) NOT NULL DEFAULT '',
+	changed        integer      NOT NULL default 0,
+	deleted        integer      NOT NULL default 0,
+	etag           varchar(128) NOT NULL DEFAULT ''
+);
+
+CREATE INDEX id_user_rainloop_ab_contacts_index ON rainloop_ab_contacts (id_user);
+
+CREATE TABLE rainloop_ab_properties (
+	id_prop           bigserial    PRIMARY KEY,
+	id_contact        integer      NOT NULL,
+	id_user           integer      NOT NULL,
+	prop_type         integer      NOT NULL,
+	prop_type_str     varchar(255) NOT NULL DEFAULT '',
+	prop_value        text         NOT NULL DEFAULT '',
+	prop_value_custom text         NOT NULL DEFAULT '',
+	prop_frec         integer      NOT NULL default 0
+);
+
+CREATE INDEX id_user_rainloop_ab_properties_index ON rainloop_ab_properties (id_user);
+CREATE INDEX id_user_id_contact_rainloop_ab_properties_index ON rainloop_ab_properties (id_user, id_contact);
+
+POSTGRESINITIAL;
+	}
+
+	public static function sqlite() : string
+	{
+		return <<<SQLITEINITIAL
+
+CREATE TABLE rainloop_ab_contacts (
+	id_contact     integer NOT NULL PRIMARY KEY,
+	id_contact_str text    NOT NULL DEFAULT '',
+	id_user        integer NOT NULL,
+	display        text    NOT NULL DEFAULT '',
+	changed        integer NOT NULL DEFAULT 0,
+	deleted        integer NOT NULL DEFAULT 0,
+	etag           text    NOT NULL DEFAULT ''
+);
+
+CREATE INDEX id_user_rainloop_ab_contacts_index ON rainloop_ab_contacts (id_user);
+
+CREATE TABLE rainloop_ab_properties (
+	id_prop           integer NOT NULL PRIMARY KEY,
+	id_contact        integer NOT NULL,
+	id_user           integer NOT NULL,
+	prop_type         integer NOT NULL,
+	prop_type_str     text    NOT NULL DEFAULT '',
+	prop_value        text    NOT NULL DEFAULT '',
+	prop_value_custom text    NOT NULL DEFAULT '',
+	prop_frec         integer NOT NULL DEFAULT 0
+);
+
+CREATE INDEX id_user_rainloop_ab_properties_index ON rainloop_ab_properties (id_user);
+CREATE INDEX id_user_id_contact_rainloop_ab_properties_index ON rainloop_ab_properties (id_user, id_contact);
+
+SQLITEINITIAL;
+	}
+
+	public static function getForDbType(string $sDbType) : array
+	{
+		$aVersions = [];
+		switch ($sDbType)
+		{
+			case 'mysql':
+				$aVersions = [
+					1 => [],
+					2 => [
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower MEDIUMTEXT NOT NULL AFTER prop_value_custom;'
+					],
+					3 => [
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value prop_value MEDIUMTEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_custom prop_value_custom MEDIUMTEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_lower prop_value_lower MEDIUMTEXT NOT NULL;'
+					],
+					4 => [
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value prop_value MEDIUMTEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_custom prop_value_custom MEDIUMTEXT NOT NULL;',
+'ALTER TABLE rainloop_ab_properties CHANGE prop_value_lower prop_value_lower MEDIUMTEXT NOT NULL;'
+					]
+				];
+				break;
+
+			case 'pgsql':
+				$aVersions = [
+					1 => [],
+					2 => [
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
+					]
+				];
+				break;
+
+			case 'sqlite':
+				$aVersions = [
+					1 => [],
+					2 => [
+'ALTER TABLE rainloop_ab_properties ADD prop_value_lower text NOT NULL DEFAULT \'\';'
+					]
+				];
+				$sInitial = static::{$sDbType}();
+				break;
+		}
+
+		if ($aVersions) {
+			$aList = \explode(';', \trim(static::{$sDbType}()));
+			foreach ($aList as $sV) {
+				$sV = \trim($sV);
+				if (\strlen($sV)) {
+					$aVersions[1][] = $sV;
+				}
+			}
+		}
+
+		return $aVersions;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
new file mode 100644
index 000000000..839b04905
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/AddressBook/Utils.php
@@ -0,0 +1,222 @@
+<?php
+
+namespace RainLoop\Providers\AddressBook;
+
+use Sabre\VObject\Component\VCard;
+
+class Utils
+{
+	private static $aMap = array(
+		'title'               => 'FN',
+		'name'                => 'FN',
+		'fullname'            => 'FN',
+		'displayname'         => 'FN',
+		'last'                => 0,
+		'lastname'            => 0,
+		'givenname'           => 1,
+		'first'               => 1,
+		'firstname'           => 1,
+		'middle'              => 2,
+		'middlename'          => 2,
+		'prefix'              => 3,
+		'nameprefix'          => 3,
+		'suffix'              => 4,
+		'namesuffix'          => 4,
+		'shortname'           => 'NICKNAME',
+		'nickname'            => 'NICKNAME',
+		'birthday'            => 'BDAY',
+
+		'mobile'              => array('TEL', 'CELL'),
+		'mobilephone'         => array('TEL', 'CELL'),
+
+		'businessemail'       => array('EMAIL', 'WORK'),
+		'businessemail2'      => array('EMAIL', 'WORK'),
+		'businessemail3'      => array('EMAIL', 'WORK'),
+		'businessphone'       => array('TEL', 'WORK'),
+		'businessphone2'      => array('TEL', 'WORK'),
+		'businessphone3'      => array('TEL', 'WORK'),
+		'businessmobile'      => array('TEL', 'WORK,CELL'),
+		'businessmobilephone' => array('TEL', 'WORK,CELL'),
+		'businessweb'         => array('URL', 'WORK'),
+		'businesswebpage'     => array('URL', 'WORK'),
+		'businesswebsite'     => array('URL', 'WORK'),
+		'companyphone'        => array('TEL', 'WORK'),
+		'companymainphone'    => array('TEL', 'WORK'),
+
+		'primaryphone'        => array('TEL', 'PREF,HOME'),
+		'homephone'           => array('TEL', 'HOME'),
+		'homephone2'          => array('TEL', 'HOME'),
+		'homephone3'          => array('TEL', 'HOME'),
+		'email'               => array('EMAIL', 'HOME'),
+		'email2'              => array('EMAIL', 'HOME'),
+		'email3'              => array('EMAIL', 'HOME'),
+		'homeemail'           => array('EMAIL', 'HOME'),
+		'homeemail2'          => array('EMAIL', 'HOME'),
+		'homeemail3'          => array('EMAIL', 'HOME'),
+		'primaryemail'        => array('EMAIL', 'HOME'),
+		'primaryemail2'       => array('EMAIL', 'HOME'),
+		'primaryemail3'       => array('EMAIL', 'HOME'),
+		'emailaddress'        => array('EMAIL', 'HOME'),
+		'email2address'       => array('EMAIL', 'HOME'),
+		'email3address'       => array('EMAIL', 'HOME'),
+		'personalemail'       => array('EMAIL', 'HOME'),
+		'personalemail2'      => array('EMAIL', 'HOME'),
+		'personalemail3'      => array('EMAIL', 'HOME'),
+		'personalwebsite'     => array('URL', 'HOME'),
+
+		'otheremail'          => 'EMAIL',
+		'otherphone'          => 'TEL',
+		'notes'               => 'NOTE',
+		'web'                 => 'URL',
+		'webpage'             => 'URL',
+		'website'             => 'URL'
+/*
+	TODO:
+		'company'             => '',
+		'department'          => '',
+		'jobtitle'            => '',
+		'officelocation'      => '',
+		'homestreet'          => '',
+		'homecity'            => '',
+		'homestate'           => '',
+		'homepostalcode'      => '',
+		'homecountry'         => '',
+		'businessstreet'      => '',
+		'businesscity'        => '',
+		'businessstate'       => '',
+		'businesspostalcode'  => '',
+		'businesscountry'     => '',
+*/
+	);
+
+	public static function CsvStreamToContacts(/*resource*/ $rFile, string $sDelimiter): iterable
+	{
+		\setlocale(LC_CTYPE, 'en_US.UTF-8');
+
+		$aHeaders = \fgetcsv($rFile, 5000, $sDelimiter, '"');
+		if (!$aHeaders || 3 >= \count($aHeaders)) {
+			return;
+		}
+		foreach ($aHeaders as $iIndex => $sItemName) {
+			$sItemName = \MailSo\Base\Utils::Utf8Clear($sItemName);
+			$sItemName = \strtoupper(\trim(\preg_replace('/[\s\-]+/', '', $sItemName)));
+			if (!\array_key_exists($sItemName, VCard::$propertyMap)) {
+				$sItemName = \strtolower($sItemName);
+				$sItemName = isset(static::$aMap[$sItemName]) ? static::$aMap[$sItemName] : null;
+			}
+			$aHeaders[$iIndex] = $sItemName;
+		}
+
+		while (false !== ($mRow = \fgetcsv($rFile, 5000, $sDelimiter, '"'))) {
+			\MailSo\Base\Utils::ResetTimeLimit();
+			$iCount = 0;
+			$oVCard = new VCard;
+			$aName = ['','','','',''];
+			foreach ($mRow as $iIndex => $sItemValue) {
+				$sItemName = $aHeaders[$iIndex];
+				$sItemValue = \trim($sItemValue);
+				if (isset($sItemName) && !empty($sItemValue)) {
+					$mType = \is_array($sItemName) ? $sItemName[0] : $sItemName;
+					++$iCount;
+					if (\is_int($mType)) {
+						$aName[$mType] = $sItemValue;
+					} else if (\is_array($sItemName)) {
+						$oVCard->add($mType, $sItemValue, ['type' => $sItemName[1]]);
+					} else if ('FN' === $mType || 'NICKNAME' === $mType) {
+						$oVCard->$mType = $sItemValue;
+					} else {
+						$oVCard->add($mType, $sItemValue);
+					}
+				}
+			}
+			if ($iCount) {
+				if ('' !== \implode('', $aName)) {
+					$oVCard->N = $aName;
+				}
+				$oContact = new Classes\Contact();
+				$oContact->setVCard($oVCard);
+				yield $oContact;
+			}
+		}
+	}
+
+	public static function VCardToCsv($stream, VCard $oVCard, bool $bWithHeader = false): int|false
+	{
+		$aData = array();
+		if ($bWithHeader) {
+			\fputcsv($stream, array(
+				'Title', 'First Name', 'Middle Name', 'Last Name', 'Nick Name', 'Display Name',
+				'Company', 'Department', 'Job Title', 'Office Location',
+				'E-mail Address', 'Notes', 'Web Page', 'Birthday', 'Mobile Phone',
+				'Home Email', 'Home Phone',
+				'Home Street', 'Home City', 'Home State', 'Home Postal Code', 'Home Country',
+				'Business Email', 'Business Phone',
+				'Business Street', 'Business City', 'Business State', 'Business Postal Code', 'Business Country'
+			));
+		}
+
+		$aName = isset($oVCard->N) ? $oVCard->N->getParts() : ['','','','',''];
+
+		$adrHome = $oVCard->getByType('ADR', 'HOME');
+		$adrHome = $adrHome ? $adrHome->getParts() : ['','','','','','',''];
+
+		$adrWork = $oVCard->getByType('ADR', 'WORK');
+		$adrWork = $adrWork ? $adrWork->getParts() : ['','','','','','',''];
+
+		return \fputcsv($stream, array(
+			(string) $oVCard->FN,       // Title
+			$aName[1],                  // First Name
+			$aName[2],                  // Middle Name
+			$aName[0],                  // Last Name
+			(string) $oVCard->NICKNAME, // Nick Name
+			(string) $oVCard->FN,       // Display Name
+			(string) $oVCard->ORG,      // Company
+			'',                         // Department
+			'',                         // Job Title
+			'',                         // Office Location
+			(string) $oVCard->EMAIL,    // E-mail Address
+			(string) $oVCard->NOTE,     // Notes
+			(string) $oVCard->URL,      // Web Page
+			(string) $oVCard->BDAY,     // Birthday
+			(string) $oVCard->getByType('TEL', 'CELL'),   // Mobile Phone
+			// Home
+			(string) $oVCard->getByType('EMAIL', 'HOME'), // Email
+			(string) $oVCard->getByType('TEL', 'HOME'),   // Phone
+			\trim($adrHome[1]."\n".$adrHome[2]), // extended address + street address
+			$adrHome[3],                // City
+			$adrHome[4],                // State
+			$adrHome[5],                // Postal Code
+			$adrHome[6],                // Country
+			// Business
+			(string) $oVCard->getByType('EMAIL', 'WORK'), // Email
+			(string) $oVCard->getByType('TEL', 'WORK'),   // Phone
+			\trim($adrWork[1]."\n".$adrWork[2]), // extended address + street address
+			$adrWork[3],                // City
+			$adrWork[4],                // State
+			$adrWork[5],                // Postal Code
+			$adrWork[6]                 // Country
+		));
+	}
+
+	public static function VcfStreamToContacts(/*resource*/ $rFile): iterable
+	{
+		$oVCardSplitter = new \Sabre\VObject\Splitter\VCard($rFile);
+		if ($oVCardSplitter) {
+			while ($oVCard = $oVCardSplitter->getNext()) {
+				if ($oVCard instanceof VCard) {
+					\MailSo\Base\Utils::ResetTimeLimit();
+					$oContact = new Classes\Contact();
+					$oContact->setVCard($oVCard);
+					yield $oContact;
+				}
+			}
+		}
+	}
+/*
+	public static function QrCode(string $sVcfData): string
+	{
+		MECARD:N:djmaze;ORG:SnappyMail;TEL:+31012345678;URL:https\://snappymail.eu;EMAIL:info@snappymail.eu;ADR:address line;;
+		VCARD
+	}
+*/
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
index 6aa6b7d50..25ef02501 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain.php
@@ -2,20 +2,16 @@
 
 namespace RainLoop\Providers;
 
+use RainLoop\Notifications;
+use RainLoop\Exceptions\ClientException;
+
 class Domain extends AbstractProvider
 {
-	/**
-	 * @var Domain\DomainInterface
-	 */
-	private $oDriver;
+	private Domain\DomainInterface $oDriver;
 
-	/**
-	 * @var \RainLoop\Plugins\Manager
-	 */
-	private $oPlugins;
+	private \RainLoop\Plugins\Manager $oPlugins;
 
-	public function __construct(Domain\DomainInterface $oDriver,
-		\RainLoop\Plugins\Manager $oPlugins)
+	public function __construct(Domain\DomainInterface $oDriver, \RainLoop\Plugins\Manager $oPlugins)
 	{
 		$this->oDriver = $oDriver;
 		$this->oPlugins = $oPlugins;
@@ -24,11 +20,7 @@ class Domain extends AbstractProvider
 	public function Load(string $sName, bool $bFindWithWildCard = false, bool $bCheckDisabled = true, bool $bCheckAliases = true) : ?\RainLoop\Model\Domain
 	{
 		$oDomain = $this->oDriver->Load($sName, $bFindWithWildCard, $bCheckDisabled, $bCheckAliases);
-		if ($oDomain instanceof \RainLoop\Model\Domain)
-		{
-			$this->oPlugins->RunHook('filter.domain', array(&$oDomain));
-		}
-
+		$oDomain && $this->oPlugins->RunHook('filter.domain', array($oDomain));
 		return $oDomain;
 	}
 
@@ -39,11 +31,9 @@ class Domain extends AbstractProvider
 
 	public function SaveAlias(string $sName, string $sAlias) : bool
 	{
-		if ($this->Load($sName, false, false))
-		{
-			throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
+		if ($this->Load($sName, false, false)) {
+			throw new ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 		}
-
 		return $this->oDriver->SaveAlias($sName, $sAlias);
 	}
 
@@ -62,66 +52,40 @@ class Domain extends AbstractProvider
 		return $this->oDriver->GetList($bIncludeAliases);
 	}
 
-	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, string $sNameForTest = null) : ?\RainLoop\Model\Domain
+	public function LoadOrCreateNewFromAction(\RainLoop\Actions $oActions, ?string $sNameForTest = null) : ?\RainLoop\Model\Domain
 	{
-		$oDomain = null;
-
-		$sName = (string) $oActions->GetActionParam('Name', '');
-
-		if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*'))
-		{
+		$sName = \mb_strtolower((string) $oActions->GetActionParam('name', ''));
+		if (\strlen($sName) && $sNameForTest && !\str_contains($sName, '*')) {
 			$sNameForTest = null;
 		}
-
-		if (\strlen($sName) || $sNameForTest)
-		{
-			$bCreate = !empty($oActions->GetActionParam('Create', 0));
-			$sIncHost = (string) $oActions->GetActionParam('IncHost', '');
-			$iIncPort = (int) $oActions->GetActionParam('IncPort', 143);
-			$iIncSecure = (int) $oActions->GetActionParam('IncSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-			$bIncShortLogin = '1' === (string) $oActions->GetActionParam('IncShortLogin', '0');
-			$bUseSieve = '1' === (string) $oActions->GetActionParam('UseSieve', '0');
-			$sSieveHost = (string) $oActions->GetActionParam('SieveHost', '');
-			$iSievePort = (int) $oActions->GetActionParam('SievePort', 4190);
-			$iSieveSecure = (int) $oActions->GetActionParam('SieveSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-			$sOutHost = (string) $oActions->GetActionParam('OutHost', '');
-			$iOutPort = (int) $oActions->GetActionParam('OutPort', 25);
-			$iOutSecure = (int) $oActions->GetActionParam('OutSecure', \MailSo\Net\Enumerations\ConnectionSecurityType::NONE);
-			$bOutShortLogin = '1' === (string) $oActions->GetActionParam('OutShortLogin', '0');
-			$bOutAuth = '1' === (string) $oActions->GetActionParam('OutAuth', '1');
-			$bOutSetSender = '1' === (string) $oActions->GetActionParam('OutSetSender', '0');
-			$bOutUsePhpMail = '1' === (string) $oActions->GetActionParam('OutUsePhpMail', '0');
-			$sWhiteList = (string) $oActions->GetActionParam('WhiteList', '');
-
-			$oDomain = $sNameForTest ? null : $this->Load($sName);
-			if ($oDomain instanceof \RainLoop\Model\Domain)
-			{
-				if ($bCreate)
-				{
-					throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::DomainAlreadyExists);
-				}
+		if (\strlen($sName) || $sNameForTest) {
+			if (!$sNameForTest && !empty($oActions->GetActionParam('create', 0)) && $this->Load($sName)) {
+				throw new ClientException(\RainLoop\Notifications::DomainAlreadyExists);
 			}
-			else
-			{
-				$oDomain = new \RainLoop\Model\Domain($sNameForTest ?: $sName);
-			}
-
-			$sIncHost = \MailSo\Base\Utils::IdnToAscii($sIncHost);
-			$sSieveHost = \MailSo\Base\Utils::IdnToAscii($sSieveHost);
-			$sOutHost = \MailSo\Base\Utils::IdnToAscii($sOutHost);
-
-			$oDomain->SetConfig(
-				$sIncHost, $iIncPort, $iIncSecure, $bIncShortLogin,
-				$bUseSieve, $sSieveHost, $iSievePort, $iSieveSecure,
-				$sOutHost, $iOutPort, $iOutSecure, $bOutShortLogin, $bOutAuth, $bOutSetSender, $bOutUsePhpMail,
-				$sWhiteList);
+			return \RainLoop\Model\Domain::fromArray($sNameForTest ?: $sName, [
+				'IMAP' => $oActions->GetActionParam('IMAP'),
+				'SMTP' => $oActions->GetActionParam('SMTP'),
+				'Sieve' => $oActions->GetActionParam('Sieve'),
+				'whiteList' => $oActions->GetActionParam('whiteList')
+			]);
 		}
-
-		return $oDomain;
+		return null;
 	}
 
 	public function IsActive() : bool
 	{
 		return $this->oDriver instanceof Domain\DomainInterface;
 	}
+
+	public function getByEmailAddress(string $sEmail) : \RainLoop\Model\Domain
+	{
+		$oDomain = $this->Load(\MailSo\Base\Utils::getEmailAddressDomain($sEmail), true);
+		if (!$oDomain) {
+			throw new ClientException(Notifications::DomainNotAllowed, null, "{$sEmail} has no domain configuration");
+		}
+		if (!$oDomain->ValidateWhiteList($sEmail)) {
+			throw new ClientException(Notifications::AccountNotAllowed, null, "{$sEmail} not whitelisted");
+		}
+		return $oDomain;
+	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
new file mode 100644
index 000000000..b104276d8
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/Autoconfig.php
@@ -0,0 +1,248 @@
+<?php
+/**
+ * https://datatracker.ietf.org/doc/draft-bucksch-autoconfig/
+ */
+
+namespace RainLoop\Providers\Domain;
+
+abstract class Autoconfig
+{
+	public static function discover(string $emailaddress) : ?array
+	{
+//		$emailaddress = \SnappyMail\IDN::emailToAscii($emailaddress);
+		$domain = \MailSo\Base\Utils::getEmailAddressDomain($emailaddress);
+//		$domain = \SnappyMail\IDN::toAscii($domain);
+		$domain = \strtolower(\idn_to_ascii($domain));
+		return
+			// First try autoconfig
+			static::resolve($domain, $emailaddress)
+			// Else try MX, but it is mostly useless
+//			?: static::mx($domain, $emailaddress)
+			// Else try Microsoft autodiscover
+			?: static::autodiscover($domain)
+			// Else try DNS SRV
+			?: static::srv($domain);
+	}
+
+	private static function resolve(string $domain, string $emailaddress) : ?array
+	{
+		$emailaddress = \urlencode($emailaddress);
+		foreach ([
+			// Mail provider https://www.ietf.org/archive/id/draft-bucksch-autoconfig-02.html#section-4.1
+			"https://autoconfig.{$domain}/.well-known/mail-v1.xml?emailaddress={$emailaddress}",
+			"https://{$domain}/.well-known/autoconfig/mail/config-v1.1.xml",
+			"http://autoconfig.{$domain}/mail/config-v1.1.xml",
+			// Central database https://www.ietf.org/archive/id/draft-bucksch-autoconfig-02.html#section-4.2
+			"https://autoconfig.thunderbird.net/v1.1/{$domain}"
+		] as $url) {
+			$data = \file_get_contents($url);
+			if ($data && \str_contains($data, '<clientConfig')) {
+				$data = \json_decode(
+					\json_encode(
+						\simplexml_load_string($data, 'SimpleXMLElement', \LIBXML_NOCDATA)
+					), true);
+				if (!empty($data['emailProvider'])) {
+					$data = $data['emailProvider'];
+					unset($data['documentation']);
+					$data['incomingServer'] = \array_filter(
+						isset($data['incomingServer'][0]) ? $data['incomingServer'] : [$data['incomingServer']],
+						fn($data) => 'imap' === $data['@attributes']['type']
+					);
+					$data['outgoingServer'] = \array_filter(
+						isset($data['outgoingServer'][0]) ? $data['outgoingServer'] : [$data['outgoingServer']],
+						fn($data) => 'smtp' === $data['@attributes']['type']
+					);
+					$data['canonical'] = $url;
+					return $data;
+				}
+			}
+		}
+		return null;
+	}
+
+	private static function publicsuffixes() : array
+	{
+		$oCache = \RainLoop\Api::Actions()->Cacher();
+		$list = $oCache->Get('public_suffix_list');
+		if ($list) {
+			$list = \json_decode($list, true);
+			if ($list[1] < \time()) {
+				$list = null;
+			} else {
+				$list = $list[0];
+			}
+		}
+		if (null === $list) {
+			$list = [];
+			$data = \file_get_contents('https://publicsuffix.org/list/public_suffix_list.dat');
+			if ($data) {
+				$list = \array_filter(
+					\explode("\n", $data),
+					fn($text) => \strlen($text) && '/' !== $text[0] && '*' !== $text[0] && \substr_count($text, '.')
+				);
+			}
+			// Don't lookup for 24 hours
+			$oCache->Set('public_suffix_list', \json_encode([$list, time() + 86400]));
+		}
+		return $list ?: [];
+	}
+
+	/**
+	 * https://www.ietf.org/archive/id/draft-bucksch-autoconfig-02.html#section-4.3
+	 */
+	private static function mx(string $domain, string $emailaddress) : ?array
+	{
+		$suffixes = static::publicsuffixes();
+		foreach (\SnappyMail\DNS::MX($domain) as $hostname) {
+			// Extract only the second-level domain from the MX hostname
+			$mxbasedomain = \explode('.', $hostname);
+			$i = -2;
+			while (\in_array(\implode('.', \array_slice($mxbasedomain, $i)), $suffixes)) {
+				--$i;
+			}
+			$mxbasedomain = \implode('.', \array_slice($mxbasedomain, $i));
+			if ($mxbasedomain) {
+				$mxfulldomain = $mxbasedomain;
+				if (\substr_count($hostname, '.') > \substr_count($mxbasedomain, '.')) {
+					// Remove the first component from the MX hostname
+					$mxfulldomain = \explode('.', $hostname, 2)[1];
+				}
+				$hostnames[$mxfulldomain] = $mxbasedomain;
+			}
+		}
+		foreach ($hostnames as $mxfulldomain => $mxbasedomain) {
+			if ($domain != $mxfulldomain) {
+				$autoconfig = static::resolve($mxfulldomain, $emailaddress);
+				if (!$autoconfig && $mxfulldomain != $mxbasedomain && $domain != $mxbasedomain) {
+					$autoconfig = static::resolve($mxbasedomain, $emailaddress);
+				}
+				if ($autoconfig) {
+					return $autoconfig;
+				}
+			}
+		}
+	}
+
+	/**
+	 * https://datatracker.ietf.org/doc/html/rfc6186
+	 * https://datatracker.ietf.org/doc/html/rfc8314
+	 */
+	private static function srv(string $domain) : ?array
+	{
+		$srv = \SnappyMail\DNS::SRV('_submissions._tcp.'.$domain);
+		if (empty($srv[0]['target'])) {
+			$srv = \SnappyMail\DNS::SRV('_submission._tcp.'.$domain);
+		}
+		if (!empty($srv[0]['target'])) {
+			$result = [
+				'incomingServer' => [],
+				'outgoingServer' => [
+					'hostname' => $srv[0]['target'],
+					'port' => $srv[0]['port'],
+					'socketType' => (587 == $srv[0]['port']) ? 'STARTTLS' : (465 == $srv[0]['port'] ? 'SSL' : ''),
+					'authentication' => 'password-cleartext',
+					'username' => '%EMAILADDRESS%'
+				]
+			];
+			$srv = \SnappyMail\DNS::SRV('_imaps._tcp.'.$domain);
+			if (empty($srv[0]['target'])) {
+				$srv = \SnappyMail\DNS::SRV('_imap._tcp.'.$domain);
+			}
+			if (!empty($srv[0]['target'])) {
+				$result['incomingServer'][] = [
+					'hostname' => $srv[0]['target'],
+					'port' => $srv[0]['port'],
+					'socketType' => 993 == $srv[0]['port'] ? 'SSL' : '',
+					'authentication' => 'password-cleartext',
+					'username' => '%EMAILADDRESS%'
+				];
+				return $result;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * This is Microsoft
+	 * https://learn.microsoft.com/en-us/exchange/client-developer/web-service-reference/pox-autodiscover-web-service-reference-for-exchange
+	 */
+	private static function autodiscover(string $domain) : ?array
+	{
+		foreach (\SnappyMail\DNS::SRV("_autodiscover._tcp.{$domain}") as $record) {
+			if (443 == $record['port']) {
+				$result = static::autodiscover_resolve("https://{$record['target']}", $domain);
+			} else if (80 == $record['port']) {
+				$result = static::autodiscover_resolve("http://{$record['target']}", $domain);
+			} else {
+				$result = static::autodiscover_resolve("https://{$record['target']}:{$record['port']}", $domain);
+			}
+			if ($result) {
+				return $result;
+			}
+		}
+		foreach ([
+			"https://{$domain}",
+			"https://autodiscover.{$domain}",
+			"http://autodiscover.{$domain}"
+		] as $host) {
+			$result = static::autodiscover_resolve($host, $domain);
+			if ($result) {
+				return $result;
+			}
+		}
+		return null;
+	}
+
+	private static function autodiscover_resolve(string $host, string $domain) : ?array
+	{
+		$email = "autodiscover@{$domain}";
+		$context = \stream_context_create(['http' => [
+			'method'  => 'POST',
+			'header'  => 'Content-Type: application/xml',
+			'content' => '<?xml version="1.0" encoding="utf-8" ?>
+		<Autodiscover xmlns="http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006">
+			<Request>
+				<AcceptableResponseSchema>http://schemas.microsoft.com/exchange/autodiscover/outlook/responseschema/2006a</AcceptableResponseSchema>
+				<EMailAddress>'.$email.'</EMailAddress>
+			</Request>
+		</Autodiscover>'
+		]]);
+		$url = "{$host}/autodiscover/autodiscover.xml";
+		$xml = \file_get_contents($url, false, $context);
+		if ($xml) {
+			$data = \json_decode(
+				\json_encode(
+					\simplexml_load_string($xml, 'SimpleXMLElement', \LIBXML_NOCDATA)
+				), true);
+			if (!empty($data['Response']['Account']['Protocol']) && 'email' === $data['Response']['Account']['AccountType']) {
+				$result = [
+					'incomingServer' => [],
+					'outgoingServer' => []
+				];
+				foreach ($data['Response']['Account']['Protocol'] as $entry) {
+					if ('IMAP' === $entry['Type']) {
+						$result['incomingServer'][] = [
+							'hostname' => $entry['Server'],
+							'port' => $entry['Port'],
+							'socketType' => ('on' === $entry['SSL']) ? (993 == $entry['Port'] ? 'SSL' : 'STARTTLS') : '',
+							'authentication' => 'password-cleartext',
+							'username' => ($entry['LoginName'] === $email) ? '%EMAILADDRESS%' : ''
+						];
+					} else if ('SMTP' === $entry['Type']) {
+						$result['outgoingServer'][] = [
+							'hostname' => $entry['Server'],
+							'port' => $entry['Port'],
+							'socketType' => (587 == $entry['Port']) ? 'STARTTLS' : ('on' === $entry['SSL'] ? 'SSL' : ''),
+							'authentication' => 'password-cleartext',
+							'username' => ($entry['LoginName'] === $email) ? '%EMAILADDRESS%' : ''
+						];
+					}
+				}
+				$result['canonical'] = $url;
+				return $result;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
index e99267ae3..989e45620 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Domain/DefaultDomain.php
@@ -1,303 +1,246 @@
 <?php
+/**
+ * Domain names are handled in lowercase punycode.
+ * Because internationalized domain names can have uppercase or titlecase characters.
+ */
 
 namespace RainLoop\Providers\Domain;
 
+use MailSo\Cache\CacheClient;
+
 class DefaultDomain implements DomainInterface
 {
-	/**
-	 * @var string
-	 */
-	protected $sDomainPath;
+	const CACHE_KEY = '/WildCardDomainsCache/';
 
-	/**
-	 * @var \MailSo\Cache\CacheClient
-	 */
-	protected $oCacher;
+	protected string $sDomainPath;
 
-	public function __construct(string $sDomainPath, ?\MailSo\Cache\CacheClient $oCacher = null)
+	protected ?CacheClient $oCacher;
+
+	public function __construct(string $sDomainPath, ?CacheClient $oCacher = null)
 	{
 		$this->sDomainPath = \rtrim(\trim($sDomainPath), '\\/');
 		$this->oCacher = $oCacher;
 	}
 
-	public function codeFileName(string $sName, bool $bBack = false) : string
+	private static function decodeFileName(string $sName) : string
 	{
-		if ($bBack && 'default' === $sName) {
-			return '*';
-		}
-
-		if (!$bBack && '*' === $sName) {
-			return 'default';
-		}
-
-		return $bBack
-			? \str_replace('_wildcard_', '*', \MailSo\Base\Utils::IdnToUtf8($sName, true))
-			: \str_replace('*', '_wildcard_', \MailSo\Base\Utils::IdnToAscii($sName, true));
+		return ('default' === $sName) ? '*' : \str_replace('_wildcard_', '*', $sName);
 	}
 
-	private function wildcardDomainsCacheKey() : string
+	private static function encodeFileName(string $sName) : string
 	{
-		return '/WildCard/DomainCache/'.\md5(APP_VERSION.APP_PRIVATE_DATA_NAME).'/';
+//		return ('*' === $sName) ? 'default' : \str_replace('*', '_wildcard_', \SnappyMail\IDN::toAscii($sName));
+		return ('*' === $sName) ? 'default' : \str_replace('*', '_wildcard_', \strtolower(\idn_to_ascii($sName)));
 	}
 
 	private function getWildcardDomainsLine() : string
 	{
-		if ($this->oCacher)
-		{
-			$sResult = $this->oCacher->Get($this->wildcardDomainsCacheKey());
-			if (\strlen($sResult))
-			{
+		if ($this->oCacher) {
+			$sResult = $this->oCacher->Get(static::CACHE_KEY);
+			if (\is_string($sResult)) {
 				return $sResult;
 			}
 		}
 
-		$sResult = '';
 		$aNames = array();
 
+//		$aList = \glob($this->sDomainPath.'/*.{ini,json,alias}', GLOB_BRACE);
+		$aList = \glob($this->sDomainPath.'/*.json');
+		foreach ($aList as $sFile) {
+			$sName = \substr(\basename($sFile), 0, -5);
+			if ('default' === $sName || false !== \strpos($sName, '_wildcard_')) {
+				$aNames[] = static::decodeFileName($sName);
+			}
+		}
 		$aList = \glob($this->sDomainPath.'/*.ini');
-		foreach ($aList as $sFile)
-		{
+		foreach ($aList as $sFile) {
 			$sName = \substr(\basename($sFile), 0, -4);
-			if ('default' === $sName || false !== \strpos($sName, '_wildcard_'))
-			{
-				$aNames[] = $this->codeFileName($sName, true);
+			if ('default' === $sName || false !== \strpos($sName, '_wildcard_')) {
+				$aNames[] = static::decodeFileName($sName);
+			}
+		}
+		$aList = \glob($this->sDomainPath.'/*.alias');
+		foreach ($aList as $sFile) {
+			$sName = \substr(\basename($sFile), 0, -6);
+			if ('default' === $sName || false !== \strpos($sName, '_wildcard_')) {
+				$aNames[] = static::decodeFileName($sName);
 			}
 		}
 
-		if (\count($aNames))
-		{
+		$sResult = '';
+		if ($aNames) {
 			\rsort($aNames, SORT_STRING);
-			$sResult = \implode(' ', $aNames);
+			$sResult = \implode(' ', \array_unique($aNames));
 		}
 
-		if ($this->oCacher)
-		{
-			$this->oCacher->Set($this->wildcardDomainsCacheKey(), $sResult);
-		}
+		$this->oCacher && $this->oCacher->Set(static::CACHE_KEY, $sResult);
 
 		return $sResult;
 	}
 
 	public function Load(string $sName, bool $bFindWithWildCard = false, bool $bCheckDisabled = true, bool $bCheckAliases = true) : ?\RainLoop\Model\Domain
 	{
-		$mResult = null;
-
-		$sDisabled = '';
-		$sFoundValue = '';
-
-		$sRealFileName = $this->codeFileName($sName);
-
-		if (\file_exists($this->sDomainPath.'/disabled'))
-		{
-			$sDisabled = \file_get_contents($this->sDomainPath.'/disabled');
+//		$sName = \SnappyMail\IDN::toAscii($sName);
+		$sName = \strtolower(\idn_to_ascii($sName));
+		if ($bCheckDisabled && \in_array($sName, $this->getDisabled())) {
+			return null;
 		}
 
-		if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini') &&
-			(!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.\MailSo\Base\Utils::IdnToAscii($sName, true).',')))
-		{
-			$aDomain = \RainLoop\Utils::CustomParseIniFile($this->sDomainPath.'/'.$sRealFileName.'.ini');
-//			if ($bCheckAliases && !empty($aDomain['alias']))
-//			{
-//				$oDomain = $this->Load($aDomain['alias'], false, false, false);
-//				if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
-//				{
-//					$oDomain->SetAliasName($sName);
-//				}
-//
-//				return $oDomain;
-//			}
-			$mResult = \RainLoop\Model\Domain::NewInstanceFromDomainConfigArray($sName, $aDomain);
-		}
-		else if ($bCheckAliases && \file_exists($this->sDomainPath.'/'.$sRealFileName.'.alias') &&
-			(!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.\MailSo\Base\Utils::IdnToAscii($sName, true).',')))
-		{
-			$sAlias = \trim(\file_get_contents($this->sDomainPath.'/'.$sRealFileName.'.alias'));
-			if (!empty($sAlias))
-			{
-				$oDomain = $this->Load($sAlias, false, false, false);
-				if ($oDomain && $oDomain instanceof \RainLoop\Model\Domain)
-				{
-					$oDomain->SetAliasName($sName);
-				}
+		$sRealFileBase = $this->sDomainPath . '/' . static::encodeFileName($sName);
 
+		if (\file_exists($sRealFileBase.'.json')) {
+			$aDomain = \json_decode(\file_get_contents($sRealFileBase.'.json'), true) ?: array();
+			return \RainLoop\Model\Domain::fromArray($sName, $aDomain);
+		}
+
+		if (\file_exists($sRealFileBase.'.ini')) {
+			$aDomain = \parse_ini_file($sRealFileBase.'.ini') ?: array();
+			return \RainLoop\Model\Domain::fromIniArray($sName, $aDomain);
+		}
+
+		if ($bCheckAliases && \file_exists($sRealFileBase.'.alias')) {
+			$sTarget = \trim(\file_get_contents($sRealFileBase.'.alias'));
+			if (!empty($sTarget)) {
+				$oDomain = $this->Load($sTarget, false, false, false);
+				$oDomain && $oDomain->SetAliasName($sName);
 				return $oDomain;
 			}
 		}
-		else if ($bFindWithWildCard)
-		{
+
+		if ($bFindWithWildCard) {
 			$sNames = $this->getWildcardDomainsLine();
-			if (\strlen($sNames))
-			{
-				if (\RainLoop\Plugins\Helper::ValidateWildcardValues(
-					\MailSo\Base\Utils::IdnToUtf8($sName, true), $sNames, $sFoundValue) && \strlen($sFoundValue))
-				{
-					if (!$bCheckDisabled || 0 === \strlen($sDisabled) || false === \strpos(','.$sDisabled.',', ','.$sFoundValue.','))
-					{
-						$mResult = $this->Load($sFoundValue, false);
-					}
-				}
+			$sFoundValue = '';
+			if (\strlen($sNames)
+			 && \RainLoop\Plugins\Helper::ValidateWildcardValues($sName, $sNames, $sFoundValue)
+			 && \strlen($sFoundValue)
+			) {
+				return $this->Load($sFoundValue);
 			}
 		}
 
-		return $mResult;
+		return null;
 	}
 
 	public function Save(\RainLoop\Model\Domain $oDomain) : bool
 	{
-		$sRealFileName = $this->codeFileName($oDomain->Name());
-
-		if ($this->oCacher)
-		{
-			$this->oCacher->Delete($this->wildcardDomainsCacheKey());
+		$sRealFileName = static::encodeFileName($oDomain->Name());
+		if (!$sRealFileName) {
+			return false;
 		}
-
-		\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.ini', $oDomain->ToIniString());
-
+		$this->Delete($oDomain->Name());
+		\RainLoop\Utils::saveFile("{$this->sDomainPath}/{$sRealFileName}.json", \json_encode($oDomain, \JSON_PRETTY_PRINT));
+		$this->oCacher && $this->oCacher->Delete(static::CACHE_KEY);
 		return true;
 	}
 
-	public function SaveAlias(string $sName, string $sAlias) : bool
+	public function SaveAlias(string $sName, string $sTarget) : bool
 	{
-		$sRealFileName = $this->codeFileName($sName);
-
-		if ($this->oCacher)
-		{
-			$this->oCacher->Delete($this->wildcardDomainsCacheKey());
+//		$sTarget = \SnappyMail\IDN::toAscii($sTarget);
+//		$sTarget = static::encodeFileName($sTarget);
+		$sTarget = \strtolower(\idn_to_ascii($sTarget));
+		$sRealFileName = static::encodeFileName($sName);
+		if (!$sRealFileName || !$sTarget/* || !\is_readable("{$this->sDomainPath}/{$sTarget}.json")*/) {
+			return false;
 		}
-
-		\RainLoop\Utils::saveFile($this->sDomainPath.'/'.$sRealFileName.'.alias', $sAlias);
+//		$this->Delete($sName);
+		\RainLoop\Utils::saveFile("{$this->sDomainPath}/{$sRealFileName}.alias", $sTarget);
+		$this->oCacher && $this->oCacher->Delete(static::CACHE_KEY);
 		return true;
 	}
 
+	protected function getDisabled() : array
+	{
+		$sFile = '';
+		if (\file_exists($this->sDomainPath.'/disabled')) {
+			$sFile = \file_get_contents($this->sDomainPath.'/disabled');
+		}
+		$aDisabled = array();
+		// RainLoop use comma, we use newline
+		$sItem = \strtok($sFile, ",\n");
+		while (false !== $sItem) {
+//			$aDisabled[] = \SnappyMail\IDN::toAscii($sItem);
+			$aDisabled[] = \strtolower(\idn_to_ascii($sItem));
+			$sItem = \strtok(",\n");
+		}
+		return $aDisabled;
+//		return \array_unique($aDisabled);
+	}
+
 	public function Disable(string $sName, bool $bDisable) : bool
 	{
-		$sName = \MailSo\Base\Utils::IdnToAscii($sName, true);
-
-		$sFile = '';
-		if (\file_exists($this->sDomainPath.'/disabled'))
-		{
-			$sFile = \file_get_contents($this->sDomainPath.'/disabled');
-		}
-
-		$aResult = array();
-		$aNames = \explode(',', $sFile);
-		if ($bDisable)
-		{
-			\array_push($aNames, $sName);
-			$aResult = $aNames;
-		}
-		else
-		{
-			foreach ($aNames as $sItem)
-			{
-				if ($sName !== $sItem)
-				{
-					$aResult[] = $sItem;
-				}
+//		$sName = \SnappyMail\IDN::toAscii($sName);
+		$sName = \strtolower(\idn_to_ascii($sName));
+		if ($sName) {
+			$aResult = $this->getDisabled();
+			if ($bDisable) {
+				$aResult[] = $sName;
+			} else {
+				$aResult = \array_filter($aResult, fn($v) => $v !== $sName);
 			}
+			$aResult = \array_unique($aResult);
+			\RainLoop\Utils::saveFile($this->sDomainPath.'/disabled', \implode("\n", $aResult));
+			return $this->getDisabled() === $aResult;
 		}
-
-		\RainLoop\Utils::saveFile($this->sDomainPath.'/disabled', \trim(\implode(',', \array_unique($aResult)), ', '));
-		return true;
+		return false;
 	}
 
 	public function Delete(string $sName) : bool
 	{
 		$bResult = true;
-		$sRealFileName = $this->codeFileName($sName);
-
-		if (\strlen($sName))
-		{
-			if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.ini'))
-			{
-				$bResult = \unlink($this->sDomainPath.'/'.$sRealFileName.'.ini');
-			}
-			else if (\file_exists($this->sDomainPath.'/'.$sRealFileName.'.alias'))
-			{
-				$bResult = \unlink($this->sDomainPath.'/'.$sRealFileName.'.alias');
+		if (\strlen($sName)) {
+			$sRealFileName = $this->sDomainPath . '/' . static::encodeFileName($sName);
+			$bResult =
+				(!\file_exists($sRealFileName.'.json') || \unlink($sRealFileName.'.json'))
+				&& (!\file_exists($sRealFileName.'.ini') || \unlink($sRealFileName.'.ini'))
+				&& (!\file_exists($sRealFileName.'.alias') || \unlink($sRealFileName.'.alias'));
+			$this->Disable($sName, !$bResult);
+			if ($this->oCacher) {
+				$this->oCacher->Delete(static::CACHE_KEY);
 			}
 		}
-
-		if ($bResult)
-		{
-			$this->Disable($sName, false);
-		}
-
-		if ($this->oCacher)
-		{
-			$this->oCacher->Delete($this->wildcardDomainsCacheKey());
-		}
-
 		return $bResult;
 	}
 
 	public function GetList(bool $bIncludeAliases = true) : array
 	{
+		$aDisabledNames = $this->getDisabled();
 		$aResult = array();
 		$aWildCards = array();
 		$aAliases = array();
 
-//		$aList = \glob($this->sDomainPath.'/*.{ini,alias}', GLOB_BRACE);
+//		$aList = \glob($this->sDomainPath.'/*.{ini,json,alias}', GLOB_BRACE);
 		$aList = \array_diff(\scandir($this->sDomainPath), array('.', '..'));
-		foreach ($aList as $sFile)
-		{
-			$sName = $sFile;
-			if ('.ini' === \substr($sName, -4) || '.alias' === \substr($sName, -6))
-			{
-				$bAlias = '.alias' === \substr($sName, -6);
-
-				$sName = \preg_replace('/\.(ini|alias)$/', '', $sName);
-				$sName = $this->codeFileName($sName, true);
-
-				if ($bAlias)
-				{
-					if ($bIncludeAliases)
-					{
-						$aAliases[] = $sName;
+		foreach ($aList as $sFile) {
+			$bAlias = '.alias' === \substr($sFile, -6);
+			if ($bAlias || '.json' === \substr($sFile, -5) || '.ini' === \substr($sFile, -4)) {
+				$sName = static::decodeFileName(\preg_replace('/\.(ini|json|alias)$/', '', $sFile));
+				if ($bAlias) {
+					if ($bIncludeAliases) {
+						$aAliases[$sName] = array(
+							'name' => $sName,
+							'disabled' => \in_array($sName, $aDisabledNames),
+							'alias' => true
+						);
 					}
-				}
-				else if (false !== \strpos($sName, '*'))
-				{
-					$aWildCards[] = $sName;
-				}
-				else
-				{
-					$aResult[] = $sName;
+				} else if (false !== \strpos($sName, '*')) {
+					$aWildCards[$sName] = array(
+						'name' => $sName,
+						'disabled' => \in_array($sName, $aDisabledNames),
+						'alias' => false
+					);
+				} else {
+					$aResult[$sName] = array(
+						'name' => $sName,
+						'disabled' => \in_array($sName, $aDisabledNames),
+						'alias' => false
+					);
 				}
 			}
 		}
 
-		\sort($aResult, SORT_STRING);
-		\sort($aAliases, SORT_STRING);
-		\rsort($aWildCards, SORT_STRING);
-
-		$aResult = \array_merge($aResult, $aAliases, $aWildCards);
-
-		$aDisabledNames = array();
-		if (\count($aResult) && \file_exists($this->sDomainPath.'/disabled'))
-		{
-			$sDisabled = \file_get_contents($this->sDomainPath.'/disabled');
-			if (false !== $sDisabled && \strlen($sDisabled))
-			{
-				$aDisabledNames = \explode(',', $sDisabled);
-				$aDisabledNames = \array_unique($aDisabledNames);
-				foreach ($aDisabledNames as $iIndex => $sValue)
-				{
-					$aDisabledNames[$iIndex] = \MailSo\Base\Utils::IdnToUtf8($sValue, true);
-				}
-			}
-		}
-
-		$aReturn = array();
-		foreach ($aResult as $sName)
-		{
-			$aReturn[] = array(
-				'name' => $sName,
-				'disabled' => \in_array($sName, $aDisabledNames),
-				'alias' => \in_array($sName, $aAliases)
-			);
-		}
-
-		return $aReturn;
+		\ksort($aResult, SORT_STRING);
+		\ksort($aAliases, SORT_STRING);
+		\krsort($aWildCards, SORT_STRING);
+		return \array_values(\array_merge($aResult, $aAliases, $aWildCards));
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
index dc687a977..8e85d74f6 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Files/FileStorage.php
@@ -4,43 +4,34 @@ namespace RainLoop\Providers\Files;
 
 class FileStorage implements \RainLoop\Providers\Files\IFiles
 {
-	/**
-	 * @var array
-	 */
-	private $aResources;
+	private array $aResources = array();
 
-	/**
-	 * @var string
-	 */
-	private $sDataPath;
+	private ?string $sDataPath;
 
 	public function __construct(string $sStoragePath)
 	{
-		$this->aResources = array();
 		$this->sDataPath = \rtrim(\trim($sStoragePath), '\\/');
 	}
 
-	public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey) : string
+	public function GenerateLocalFullFileName(\RainLoop\Model\Account $oAccount, string $sKey): string
 	{
 		return $this->generateFullFileName($oAccount, $sKey, true);
 	}
 
-	public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource) : bool
+	public function PutFile(\RainLoop\Model\Account $oAccount, string $sKey, /*resource*/ $rSource): bool
 	{
 		$bResult = false;
-		if ($rSource)
-		{
+		if ($rSource) {
 			$rOpenOutput = \fopen($this->generateFullFileName($oAccount, $sKey, true), 'w+b');
-			if ($rOpenOutput)
-			{
-				$bResult = (false !== \MailSo\Base\Utils::MultipleStreamWriter($rSource, array($rOpenOutput)));
+			if ($rOpenOutput) {
+				$bResult = (false !== \MailSo\Base\Utils::WriteStream($rSource, $rOpenOutput));
 				\fclose($rOpenOutput);
 			}
 		}
 		return $bResult;
 	}
 
-	public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource) : bool
+	public function MoveUploadedFile(\RainLoop\Model\Account $oAccount, string $sKey, string $sSource): bool
 	{
 		return \move_uploaded_file($sSource,
 			$this->generateFullFileName($oAccount, $sKey, true));
@@ -68,13 +59,13 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return $mResult;
 	}
 
-	public function GetFileName(\RainLoop\Model\Account $oAccount, string $sKey) /*: string|false*/
+	public function GetFileName(\RainLoop\Model\Account $oAccount, string $sKey): string|false
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		return \file_exists($sFileName) ? $sFileName : false;
 	}
 
-	public function Clear(\RainLoop\Model\Account $oAccount, string $sKey) : bool
+	public function Clear(\RainLoop\Model\Account $oAccount, string $sKey): bool
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		if (\file_exists($sFileName)) {
@@ -86,18 +77,18 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return false;
 	}
 
-	public function FileSize(\RainLoop\Model\Account $oAccount, string $sKey) /*: int|false*/
+	public function FileSize(\RainLoop\Model\Account $oAccount, string $sKey): int|false
 	{
 		$sFileName = $this->generateFullFileName($oAccount, $sKey);
 		return \file_exists($sFileName) ? \filesize($sFileName) : false;
 	}
 
-	public function FileExists(\RainLoop\Model\Account $oAccount, string $sKey) : bool
+	public function FileExists(\RainLoop\Model\Account $oAccount, string $sKey): bool
 	{
 		return \file_exists($this->generateFullFileName($oAccount, $sKey));
 	}
 
-	public function GC(int $iTimeToClearInHours = 24) : bool
+	public function GC(int $iTimeToClearInHours = 24): bool
 	{
 		if (0 < $iTimeToClearInHours) {
 			$iTimeToClear = 3600 * $iTimeToClearInHours;
@@ -115,7 +106,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return false;
 	}
 
-	public function CloseAllOpenedFiles() : bool
+	public function CloseAllOpenedFiles(): bool
 	{
 		if (\is_array($this->aResources) && \count($this->aResources))
 		{
@@ -131,7 +122,7 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		return true;
 	}
 
-	private function generateFullFileName(\RainLoop\Model\Account $oAccount, string $sKey, bool $bMkDir = false) : string
+	private function generateFullFileName(\RainLoop\Model\Account $oAccount, string $sKey, bool $bMkDir = false): string
 	{
 		if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
 			$sEmail = $oAccount->ParentEmail();
@@ -144,14 +135,12 @@ class FileStorage implements \RainLoop\Providers\Files\IFiles
 		$aEmail = \explode('@', $sEmail ?: 'nobody@unknown.tld');
 		$sDomain = \trim(1 < \count($aEmail) ? \array_pop($aEmail) : '');
 		$sFilePath = $this->sDataPath
-			.'/'.\RainLoop\Utils::fixName($sDomain ?: 'unknown.tld')
-			.'/'.\RainLoop\Utils::fixName(\implode('@', $aEmail) ?: '.unknown')
-			.($sSubEmail ? '/'.\RainLoop\Utils::fixName($sSubEmail) : '')
+			.'/'.\MailSo\Base\Utils::SecureFileName($sDomain ?: 'unknown.tld')
+			.'/'.\MailSo\Base\Utils::SecureFileName(\implode('@', $aEmail) ?: '.unknown')
+			.($sSubEmail ? '/'.\MailSo\Base\Utils::SecureFileName($sSubEmail) : '')
 			.'/.files/'.\sha1($sKey);
 
-		if ($bMkDir && !\is_dir(\dirname($sFilePath)) && !\mkdir(\dirname($sFilePath), 0700, true)) {
-			throw new \RainLoop\Exceptions\Exception('Can\'t make storage directory "'.$sFilePath.'"');
-		}
+		$bMkDir && \MailSo\Base\Utils::mkdir(\dirname($sFilePath));
 
 		return $sFilePath;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
index ff1571036..0e80d12cd 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters.php
@@ -41,12 +41,12 @@ class Filters extends \RainLoop\Providers\AbstractProvider
 		}
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, array $aFilters, string $sRaw = '') : bool
+	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, string $sRaw) : bool
 	{
 		try
 		{
 			return $this->IsActive()
-				? $this->oDriver->Save($oAccount, $sScriptName, $aFilters, $sRaw)
+				? $this->oDriver->Save($oAccount, $sScriptName, $sRaw)
 				: false;
 		}
 		catch (\Throwable $oException)
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
deleted file mode 100644
index 41ba1e561..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/Filter.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Classes;
-
-class Filter implements \JsonSerializable
-{
-	/**
-	 * @var string
-	 */
-	private $sID;
-
-	/**
-	 * @var bool
-	 */
-	private $bEnabled;
-
-	/**
-	 * @var string
-	 */
-	private $sName;
-
-	/**
-	 * @var array
-	 */
-	private $aConditions;
-
-	/**
-	 * @var string
-	 */
-	private $sConditionsType;
-
-	/**
-	 * @var string
-	 */
-	private $sActionType;
-
-	/**
-	 * @var string
-	 */
-	private $sActionValue;
-
-	/**
-	 * @var string
-	 */
-	private $sActionValueSecond;
-
-	/**
-	 * @var string
-	 */
-	private $sActionValueThird;
-
-	/**
-	 * @var string
-	 */
-	private $sActionValueFourth;
-
-	/**
-	 * @var bool
-	 */
-	private $bMarkAsRead;
-
-	/**
-	 * @var bool
-	 */
-	private $bSkipOthers;
-
-	/**
-	 * @var bool
-	 */
-	private $bKeep;
-
-	/**
-	 * @var bool
-	 */
-	private $bStop;
-
-	public function __construct()
-	{
-		$this->Clear();
-	}
-
-	public function Clear()
-	{
-		$this->sID = '';
-		$this->sName = '';
-
-		$this->bEnabled = true;
-
-		$this->aConditions = array();
-
-		$this->sConditionsType = \RainLoop\Providers\Filters\Enumerations\ConditionsType::ANY;
-
-		$this->sActionType = \RainLoop\Providers\Filters\Enumerations\ActionType::MOVE_TO;
-		$this->sActionValue = '';
-		$this->sActionValueSecond = '';
-		$this->sActionValueThird = '';
-		$this->sActionValueFourth  = '';
-
-		$this->bMarkAsRead = false;
-		$this->bKeep = true;
-		$this->bStop = true;
-	}
-
-	public function ID() : string
-	{
-		return $this->sID;
-	}
-
-	public function Enabled() : bool
-	{
-		return $this->bEnabled;
-	}
-
-	public function Name() : string
-	{
-		return $this->sName;
-	}
-
-	public function Conditions() : array
-	{
-		return $this->aConditions;
-	}
-
-	public function ConditionsType() : string
-	{
-		return $this->sConditionsType;
-	}
-
-	public function ActionType() : string
-	{
-		return $this->sActionType;
-	}
-
-	public function ActionValue() : string
-	{
-		return $this->sActionValue;
-	}
-
-	public function ActionValueSecond() : string
-	{
-		return $this->sActionValueSecond;
-	}
-
-	public function ActionValueThird() : string
-	{
-		return $this->sActionValueThird;
-	}
-
-	public function ActionValueFourth() : string
-	{
-		return $this->sActionValueFourth;
-	}
-
-	public function MarkAsRead() : bool
-	{
-		return $this->bMarkAsRead;
-	}
-
-	public function Stop() : bool
-	{
-		return $this->bStop;
-	}
-
-	public function Keep() : bool
-	{
-		return $this->bKeep;
-	}
-
-	public function unserializeFromJson(string $sFilterJson)
-	{
-		$aFilterJson = \json_decode(\trim($sFilterJson), true);
-		if (\is_array($aFilterJson))
-		{
-			return $this->FromJSON($aFilterJson);
-		}
-
-		return false;
-	}
-
-	public function FromJSON(array $aFilter) : bool
-	{
-		$this->sID = $aFilter['ID'] ?? '';
-		$this->sName = $aFilter['Name'] ?? '';
-
-		$this->bEnabled = !isset($aFilter['Enabled']) || !empty($aFilter['Enabled']);
-
-		$this->sConditionsType = $aFilter['ConditionsType']
-			?? \RainLoop\Providers\Filters\Enumerations\ConditionsType::ANY;
-
-		$this->sActionType = $aFilter['ActionType']
-			?? \RainLoop\Providers\Filters\Enumerations\ActionType::MOVE_TO;
-
-		$this->sActionValue = $aFilter['ActionValue'] ?? '';
-		$this->sActionValueSecond = $aFilter['ActionValueSecond'] ?? '';
-		$this->sActionValueThird = $aFilter['ActionValueThird'] ?? '';
-		$this->sActionValueFourth = $aFilter['ActionValueFourth'] ?? '';
-
-		$this->bKeep = !isset($aFilter['Keep']) || !empty($aFilter['Keep']);
-		$this->bStop = !isset($aFilter['Stop']) || !empty($aFilter['Stop']);
-		$this->bMarkAsRead = !isset($aFilter['MarkAsRead']) || !empty($aFilter['MarkAsRead']);
-
-		$this->aConditions = empty($aFilter['Conditions']) ? array() : FilterCondition::CollectionFromJSON($aFilter['Conditions']);
-
-		return !empty($this->aConditions);
-	}
-
-	public function jsonSerialize()
-	{
-		return array(
-			'@Object' => 'Object/Filter',
-			'ID' => $this->ID(),
-			'Enabled' => $this->Enabled(),
-			'Name' => $this->Name(),
-			'Conditions' => $this->Conditions(),
-			'ConditionsType' => $this->ConditionsType(),
-			'ActionType' => $this->ActionType(),
-			'ActionValue' => $this->ActionValue(),
-			'ActionValueSecond' => $this->ActionValueSecond(),
-			'ActionValueThird' => $this->ActionValueThird(),
-			'ActionValueFourth' => $this->ActionValueFourth(),
-			'Keep' => $this->Keep(),
-			'Stop' => $this->Stop(),
-			'MarkAsRead' => $this->MarkAsRead()
-		);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
deleted file mode 100644
index 0b40a9d52..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Classes/FilterCondition.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Classes;
-
-class FilterCondition implements \JsonSerializable
-{
-	/**
-	 * @var string
-	 */
-	private $sField = '';
-
-	/**
-	 * @var string
-	 */
-	private $sType = '';
-
-	/**
-	 * @var string
-	 */
-	private $sValue = '';
-
-	/**
-	 * @var string
-	 */
-	private $sValueSecond = '';
-
-	public function Field() : string
-	{
-		return $this->sField;
-	}
-
-	public function Type() : string
-	{
-		return $this->sType;
-	}
-
-	public function Value() : string
-	{
-		return $this->sValue;
-	}
-
-	public function ValueSecond() : string
-	{
-		return $this->sValueSecond;
-	}
-
-	public function FromJSON(array $aData) : bool
-	{
-		if (empty($aData['Field']) || empty($aData['Type']) || empty($aData['Value'])) {
-			return false;
-		}
-		$this->sField = $aData['Field'];
-		$this->sType = $aData['Type'];
-		$this->sValue = (string) $aData['Value'];
-		$this->sValueSecond = isset($aData['ValueSecond']) ? (string) $aData['ValueSecond'] : '';
-
-		return true;
-	}
-
-	public static function CollectionFromJSON(array $aCollection) : array
-	{
-		$aResult = array();
-		foreach ($aCollection as $aItem)
-		{
-			if (\is_array($aItem) && \count($aItem))
-			{
-				$oItem = new \RainLoop\Providers\Filters\Classes\FilterCondition();
-				if ($oItem->FromJSON($aItem))
-				{
-					$aResult[] = $oItem;
-				}
-			}
-		}
-		return $aResult;
-	}
-
-	public function jsonSerialize()
-	{
-		return array(
-			'@Object' => 'Object/FilterCondition',
-			'Field' => $this->Field(),
-			'Type' => $this->Type(),
-			'Value' => $this->Value(),
-			'ValueSecond' => $this->ValueSecond()
-		);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ActionType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ActionType.php
deleted file mode 100644
index c5b87d9b3..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ActionType.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Enumerations;
-
-class ActionType
-{
-	const NONE = 'None';
-	const MOVE_TO = 'MoveTo';
-	const DISCARD = 'Discard';
-	const VACATION = 'Vacation';
-	const REJECT = 'Reject';
-	const FORWARD = 'Forward';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
deleted file mode 100644
index 8020b98a1..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionField.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Enumerations;
-
-class ConditionField
-{
-	const
-		FROM = 'From',
-		RECIPIENT = 'Recipient',
-		SUBJECT = 'Subject',
-		HEADER = 'Header',
-		BODY = 'Body',
-		SIZE = 'Size';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
deleted file mode 100644
index 87d0f91a4..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionType.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Enumerations;
-
-class ConditionType
-{
-	const
-		EQUAL_TO = 'EqualTo',
-		NOT_EQUAL_TO = 'NotEqualTo',
-		CONTAINS = 'Contains',
-		NOT_CONTAINS = 'NotContains',
-		REGEX = 'Regex',
-		OVER = 'Over',
-		UNDER = 'Under',
-		TEXT = 'Text',
-		RAW = 'Raw';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionsType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionsType.php
deleted file mode 100644
index 4ff12a431..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Enumerations/ConditionsType.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters\Enumerations;
-
-class ConditionsType
-{
-	const ALL = 'All';
-	const ANY = 'Any';
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php
index 5b73a6796..5f41ed6aa 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/FiltersInterface.php
@@ -6,7 +6,7 @@ interface FiltersInterface
 {
 	public function Load(\RainLoop\Model\Account $oAccount) : array;
 
-	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, array $aFilters, string $sRaw = '') : bool;
+	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, string $sRaw) : bool;
 
 	public function Activate(\RainLoop\Model\Account $oAccount, string $sScriptName) : bool;
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php
deleted file mode 100644
index 56aeae3e9..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/Sieve.php
+++ /dev/null
@@ -1,383 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Filters;
-
-class Sieve
-{
-	const NEW_LINE = "\r\n";
-
-	public static function collectionToFileString(array $aFilters) : string
-	{
-		$sNL = static::NEW_LINE;
-
-		$aCapa = array();
-		$aParts = [
-			'# This is SnappyMail sieve script.',
-			'# Please don\'t change anything here.',
-			'# RAINLOOP:SIEVE',
-			''
-		];
-
-		foreach ($aFilters as /* @var $oItem \RainLoop\Providers\Filters\Classes\Filter */ $oItem)
-		{
-			$aParts[] = \implode($sNL, [
-				'/*',
-				'BEGIN:FILTER:'.$oItem->ID(),
-				'BEGIN:HEADER',
-				\chunk_split(\base64_encode(\json_encode($oItem)), 74, $sNL).'END:HEADER',
-				'*/',
-				$oItem->Enabled() ? '' : '/* @Filter is disabled ',
-				static::filterToSieveScript($oItem, $aCapa),
-				$oItem->Enabled() ? '' : '*/',
-				'/* END:FILTER */',
-				''
-			]);
-		}
-
-		$aCapa = \array_keys($aCapa);
-		$sCapa = \count($aCapa)
-			? $sNL . 'require ' . \str_replace('","', '", "', \json_encode($aCapa)).';' . $sNL
-			: '';
-
-		return $sCapa . $sNL . \implode($sNL, $aParts);
-	}
-
-	public static function fileStringToCollection(string $sFileString) : array
-	{
-		$aResult = array();
-		if (!empty($sFileString) && false !== \strpos($sFileString, 'RAINLOOP:SIEVE'))
-		{
-			$aMatch = array();
-			if (\preg_match_all('/BEGIN:FILTER(.+?)BEGIN:HEADER(.+?)END:HEADER/s', $sFileString, $aMatch) &&
-				isset($aMatch[2]) && \is_array($aMatch[2]))
-			{
-				foreach ($aMatch[2] as $sEncodedLine)
-				{
-					if (!empty($sEncodedLine))
-					{
-						$sDecodedLine = \base64_decode(\preg_replace('/\\s+/s', '', $sEncodedLine));
-						if (!empty($sDecodedLine))
-						{
-							$oItem = new Classes\Filter();
-							if ($oItem && $oItem->unserializeFromJson($sDecodedLine))
-							{
-								$aResult[] = $oItem;
-							}
-						}
-					}
-				}
-			}
-		}
-
-		return $aResult;
-	}
-
-	private static function conditionToSieveScript(Classes\FilterCondition $oCondition, array &$aCapa) : string
-	{
-		$sResult = '';
-		$sTypeWord = '';
-		$bTrue = true;
-
-		$sValue = \trim($oCondition->Value());
-		$sValueSecond = \trim($oCondition->ValueSecond());
-
-		if (\strlen($sValue) ||
-			(\strlen($sValue) && \strlen($sValueSecond) &&
-				Enumerations\ConditionField::HEADER === $oCondition->Field()))
-		{
-			switch ($oCondition->Type())
-			{
-				case Enumerations\ConditionType::TEXT:
-				case Enumerations\ConditionType::RAW:
-				case Enumerations\ConditionType::OVER:
-				case Enumerations\ConditionType::UNDER:
-					$sTypeWord = ':' . \strtolower($oCondition->Type());
-					break;
-				case Enumerations\ConditionType::NOT_EQUAL_TO:
-					$sResult .= 'not ';
-				case Enumerations\ConditionType::EQUAL_TO:
-					$sTypeWord = ':is';
-					break;
-				case Enumerations\ConditionType::NOT_CONTAINS:
-					$sResult .= 'not ';
-				case Enumerations\ConditionType::CONTAINS:
-					$sTypeWord = ':contains';
-					break;
-				case Enumerations\ConditionType::REGEX:
-					$sTypeWord = ':regex';
-					$aCapa['regex'] = true;
-					break;
-				default:
-					$bTrue = false;
-					$sResult = '/* @Error: unknown type value */ false';
-					break;
-			}
-
-			switch ($oCondition->Field())
-			{
-				case Enumerations\ConditionField::FROM:
-					$sResult .= 'header '.$sTypeWord.' ["From"]';
-					break;
-				case Enumerations\ConditionField::RECIPIENT:
-					$sResult .= 'header '.$sTypeWord.' ["To", "CC"]';
-					break;
-				case Enumerations\ConditionField::SUBJECT:
-					$sResult .= 'header '.$sTypeWord.' ["Subject"]';
-					break;
-				case Enumerations\ConditionField::HEADER:
-					$sResult .= 'header '.$sTypeWord.' ["'.static::quote($sValueSecond).'"]';
-					break;
-				case Enumerations\ConditionField::BODY:
-					// :text :raw :content
-					$sResult .= 'body '.$sTypeWord.' :contains';
-					$aCapa['body'] = true;
-					break;
-				case Enumerations\ConditionField::SIZE:
-					$sResult .= 'size '.$sTypeWord;
-					break;
-				default:
-					$bTrue = false;
-					$sResult = '/* @Error: unknown field value */ false';
-					break;
-			}
-
-			if ($bTrue)
-			{
-				if (\in_array($oCondition->Field(), array(
-					Enumerations\ConditionField::FROM,
-					Enumerations\ConditionField::RECIPIENT
-				)) && false !== \strpos($sValue, ','))
-				{
-					$aValue = \array_map(function ($sValue) use ($self) {
-						return '"'.static::quote(\trim($sValue)).'"';
-					}, \explode(',', $sValue));
-
-					$sResult .= ' ['.\trim(\implode(', ', $aValue)).']';
-				}
-				else if (Enumerations\ConditionField::SIZE === $oCondition->Field())
-				{
-					$sResult .= ' '.static::quote($sValue);
-				}
-				else
-				{
-					$sResult .= ' "'.static::quote($sValue).'"';
-				}
-
-				$sResult = \MailSo\Base\Utils::StripSpaces($sResult);
-			}
-		}
-		else
-		{
-			$sResult = '/* @Error: empty condition value */ false';
-		}
-
-		return $sResult;
-	}
-
-	private static function filterToSieveScript(Classes\Filter $oFilter, array &$aCapa) : string
-	{
-		$sNL = static::NEW_LINE;
-		$sTab = '    ';
-
-		$bBlock = true;
-		$aResult = array();
-
-		// Conditions
-		$aConditions = $oFilter->Conditions();
-		if (1 < \count($aConditions))
-		{
-			if (Enumerations\ConditionsType::ANY ===
-				$oFilter->ConditionsType())
-			{
-				$aResult[] = 'if anyof(';
-
-				$bTrim = false;
-				foreach ($aConditions as $oCond)
-				{
-					$bTrim = true;
-					$sCons = static::conditionToSieveScript($oCond, $aCapa);
-					if (!empty($sCons))
-					{
-						$aResult[] = $sTab.$sCons.',';
-					}
-				}
-				if ($bTrim)
-				{
-					$aResult[\count($aResult) - 1] = \rtrim($aResult[\count($aResult) - 1], ',');
-				}
-
-				$aResult[] = ')';
-			}
-			else
-			{
-				$aResult[] = 'if allof(';
-				foreach ($aConditions as $oCond)
-				{
-					$aResult[] = $sTab . static::conditionToSieveScript($oCond, $aCapa) . ',';
-				}
-
-				$aResult[\count($aResult) - 1] = \rtrim($aResult[\count($aResult) - 1], ',');
-				$aResult[] = ')';
-			}
-		}
-		else if (1 === \count($aConditions))
-		{
-			$aResult[] = 'if ' . static::conditionToSieveScript($aConditions[0], $aCapa);
-		}
-		else
-		{
-			$bBlock = false;
-		}
-
-		// actions
-		if ($bBlock)
-		{
-			$aResult[] = '{';
-		}
-		else
-		{
-			$sTab = '';
-		}
-
-		if ($oFilter->MarkAsRead() && \in_array($oFilter->ActionType(), array(
-			Enumerations\ActionType::NONE,
-			Enumerations\ActionType::MOVE_TO,
-			Enumerations\ActionType::FORWARD
-		)))
-		{
-			$aCapa['imap4flags'] = true;
-			$aResult[] = $sTab.'addflag "\\\\Seen";';
-		}
-
-		switch ($oFilter->ActionType())
-		{
-			case Enumerations\ActionType::NONE:
-				if ($oFilter->Stop())
-				{
-					$aResult[] = $sTab.'stop;';
-				}
-				break;
-			case Enumerations\ActionType::DISCARD:
-				$aResult[] = $sTab.'discard;';
-				if ($oFilter->Stop())
-				{
-					$aResult[] = $sTab.'stop;';
-				}
-				break;
-			case Enumerations\ActionType::VACATION:
-				$sValue = \trim($oFilter->ActionValue());
-				$sValueSecond = \trim($oFilter->ActionValueSecond());
-				$sValueThird = \trim($oFilter->ActionValueThird());
-				$sValueFourth = \trim($oFilter->ActionValueFourth());
-				if (\strlen($sValue))
-				{
-					$aCapa['vacation'] = true;
-
-					$iDays = 1;
-					$sSubject = '';
-					if (\strlen($sValueSecond))
-					{
-						$sSubject = ':subject "'.
-							static::quote(\MailSo\Base\Utils::StripSpaces($sValueSecond)).'" ';
-					}
-
-					if (\strlen($sValueThird) && \is_numeric($sValueThird) && 1 < (int) $sValueThird)
-					{
-						$iDays = (int) $sValueThird;
-					}
-
-					$sAddresses = '';
-					if (\strlen($sValueFourth))
-					{
-						$aAddresses = \explode(',', $sValueFourth);
-						$aAddresses = \array_filter(\array_map(function ($sEmail) use ($self) {
-							$sEmail = \trim($sEmail);
-							return \strlen($sEmail) ? '"'.static::quote($sEmail).'"' : '';
-						}, $aAddresses), 'strlen');
-
-						if (\count($aAddresses))
-						{
-							$sAddresses = ':addresses ['.\implode(', ', $aAddresses).'] ';
-						}
-					}
-
-					$aResult[] = $sTab.'vacation :days '.$iDays.' '.$sAddresses.$sSubject.'"'.static::quote($sValue).'";';
-					if ($oFilter->Stop())
-					{
-						$aResult[] = $sTab.'stop;';
-					}
-				}
-				else
-				{
-					$aResult[] = $sTab.'# @Error (vacation): empty action value';
-				}
-				break;
-			case Enumerations\ActionType::REJECT:
-				$sValue = \trim($oFilter->ActionValue());
-				if (\strlen($sValue))
-				{
-					$aCapa['reject'] = true;
-
-					$aResult[] = $sTab.'reject "'.static::quote($sValue).'";';
-					if ($oFilter->Stop())
-					{
-						$aResult[] = $sTab.'stop;';
-					}
-				}
-				else
-				{
-					$aResult[] = $sTab.'# @Error (reject): empty action value';
-				}
-				break;
-			case Enumerations\ActionType::FORWARD:
-				$sValue = $oFilter->ActionValue();
-				if (\strlen($sValue))
-				{
-					if ($oFilter->Keep())
-					{
-						$aCapa['fileinto'] = true;
-						$aResult[] = $sTab.'fileinto "INBOX";';
-					}
-
-					$aResult[] = $sTab.'redirect "'.static::quote($sValue).'";';
-					if ($oFilter->Stop())
-					{
-						$aResult[] = $sTab.'stop;';
-					}
-				}
-				else
-				{
-					$aResult[] = $sTab.'# @Error (redirect): empty action value';
-				}
-				break;
-			case Enumerations\ActionType::MOVE_TO:
-				$sFolderName = $oFilter->ActionValue();
-				if (\strlen($sFolderName))
-				{
-					$aCapa['fileinto'] = true;
-					$aResult[] = $sTab.'fileinto "'.static::quote($sFolderName).'";';
-					if ($oFilter->Stop())
-					{
-						$aResult[] = $sTab.'stop;';
-					}
-				}
-				else
-				{
-					$aResult[] = $sTab.'# @Error (fileinto): empty action value';
-				}
-				break;
-		}
-
-		if ($bBlock)
-		{
-			$aResult[] = '}';
-		}
-
-		return \implode($sNL, $aResult);
-	}
-
-	private static function quote(string $sValue) : string
-	{
-		return \str_replace(array('\\', '"'), array('\\\\', '\\"'), \trim($sValue));
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
index 915e89b9b..afd36bc59 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Filters/SieveStorage.php
@@ -4,12 +4,9 @@ namespace RainLoop\Providers\Filters;
 
 class SieveStorage implements FiltersInterface
 {
-	const SIEVE_FILE_NAME = 'rainloop.user';
+	use \MailSo\Log\Inherit;
 
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	private $oLogger;
+	const SIEVE_FILE_NAME = 'rainloop.user';
 
 	/**
 	 * @var \RainLoop\Plugins\Manager
@@ -23,18 +20,15 @@ class SieveStorage implements FiltersInterface
 
 	public function __construct($oPlugins, $oConfig)
 	{
-		$this->oLogger = null;
-
 		$this->oPlugins = $oPlugins;
 		$this->oConfig = $oConfig;
 	}
 
-	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\ManageSieveClient
+	protected function getConnection(\RainLoop\Model\Account $oAccount) : ?\MailSo\Sieve\SieveClient
 	{
-		$oSieveClient = new \MailSo\Sieve\ManageSieveClient();
+		$oSieveClient = new \MailSo\Sieve\SieveClient();
 		$oSieveClient->SetLogger($this->oLogger);
-		$oSieveClient->SetTimeOuts(10, (int) \RainLoop\Api::Config()->Get('labs', 'sieve_timeout', 10));
-		return $oAccount->SieveConnectAndLoginHelper($this->oPlugins, $oSieveClient, $this->oConfig)
+		return $oAccount->SieveConnectAndLogin($this->oPlugins, $oSieveClient, $this->oConfig)
 			 ? $oSieveClient
 			 : null;
 	}
@@ -67,8 +61,7 @@ class SieveStorage implements FiltersInterface
 					'@Object' => 'Object/SieveScript',
 					'name' => self::SIEVE_FILE_NAME,
 					'active' => false,
-					'body' => '',
-					'filters' => []
+					'body' => ''
 				);
 			}
 		}
@@ -81,22 +74,11 @@ class SieveStorage implements FiltersInterface
 		);
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, array $aFilters, string $sRaw = '') : bool
+	public function Save(\RainLoop\Model\Account $oAccount, string $sScriptName, string $sRaw) : bool
 	{
-		if ($aFilters && !$sRaw) {
-			$sRaw = Sieve::collectionToFileString($aFilters);
-		}
 		$oSieveClient = $this->getConnection($oAccount);
 		if ($oSieveClient) {
-			if (empty($sRaw)) {
-				$aList = $oSieveClient->ListScripts();
-				if (isset($aList[$sScriptName])) {
-					$oSieveClient->DeleteScript($sScriptName);
-				}
-			} else {
-				$oSieveClient->PutScript($sScriptName, $sRaw);
-			}
-			$oSieveClient->Disconnect();
+			$oSieveClient->PutScript($sScriptName, $sRaw);
 			return true;
 		}
 		return false;
@@ -129,14 +111,11 @@ class SieveStorage implements FiltersInterface
 	{
 		$oSieveClient = $this->getConnection($oAccount);
 		if ($oSieveClient) {
-			$oSieveClient->DeleteScript(\trim($sScriptName));
+			if (isset($oSieveClient->ListScripts()[$sScriptName])) {
+				$oSieveClient->DeleteScript(\trim($sScriptName));
+			}
 			return true;
 		}
 		return false;
 	}
-
-	public function SetLogger(?\MailSo\Log\Logger $oLogger)
-	{
-		$this->oLogger = $oLogger;
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
index cf1331a6c..6dc3686eb 100755
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Identities.php
@@ -27,6 +27,11 @@ class Identities extends AbstractProvider
 		});
 	}
 
+	public function IsActive() : bool
+	{
+		return true;
+	}
+
 	/**
 	 * @param Account $account
 	 * @param bool $allowMultipleIdentities
@@ -43,8 +48,9 @@ class Identities extends AbstractProvider
 		}));
 
 		// If no primary identity is found, generate default one from account info
-		if ($primaryIdentity === null || $primaryIdentity === false) {
-			$primaryIdentity = $primaryIdentity = new Identity('', $account->Email());
+		if (!$primaryIdentity) {
+			$primaryIdentity = new Identity('', $account->Email());
+			$primaryIdentity->exists = !\RainLoop\Api::Config()->Get('webmail', 'popup_identity', true);
 			$identities[] = $primaryIdentity;
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
index d913b36da..66123e4bf 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings.php
@@ -2,30 +2,30 @@
 
 namespace RainLoop\Providers;
 
+use RainLoop\Model\Account;
+use RainLoop\Providers\Settings\ISettings;
+
 class Settings extends \RainLoop\Providers\AbstractProvider
 {
-	/**
-	 * @var \RainLoop\Providers\Settings\ISettings
-	 */
-	private $oDriver;
+	private ISettings $oDriver;
 
-	public function __construct(\RainLoop\Providers\Settings\ISettings $oDriver)
+	public function __construct(ISettings $oDriver)
 	{
 		$this->oDriver = $oDriver;
 	}
 
-	public function Load(\RainLoop\Model\Account $oAccount) : \RainLoop\Settings
+	public function Load(Account $oAccount) : \RainLoop\Settings
 	{
-		return new \RainLoop\Settings($this->oDriver->Load($oAccount));
+		return new \RainLoop\Settings($this, $oAccount, $this->oDriver->Load($oAccount));
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool
+	public function Save(Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
-		return $this->oDriver->Save($oAccount, $oSettings->DataAsArray());
+		return $this->oDriver->Save($oAccount, $oSettings);
 	}
 
 	public function IsActive() : bool
 	{
-		return $this->oDriver instanceof \RainLoop\Providers\Settings\ISettings;
+		return true;
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
index 53e04b73e..63df9be23 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/DefaultSettings.php
@@ -2,35 +2,34 @@
 
 namespace RainLoop\Providers\Settings;
 
+use RainLoop\Model\Account;
+use RainLoop\Providers\Storage;
+use RainLoop\Providers\Storage\Enumerations\StorageType;
+
 class DefaultSettings implements ISettings
 {
 	const FILE_NAME = 'settings';
 	const FILE_NAME_LOCAL = 'settings_local';
 
-	/**
-	 * @var \RainLoop\Providers\Storage
-	 */
-	private $oStorageProvider;
+	private Storage $oStorageProvider;
 
-	public function __construct(\RainLoop\Providers\Storage $oStorageProvider)
+	public function __construct(Storage $oStorageProvider)
 	{
 		$this->oStorageProvider = $oStorageProvider;
 	}
 
-	public function Load(\RainLoop\Model\Account $oAccount) : array
+	public function Load(Account $oAccount) : array
 	{
 		$sValue = $this->oStorageProvider->Get($oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
+			StorageType::CONFIG,
 			$this->oStorageProvider->IsLocal() ?
 				self::FILE_NAME_LOCAL :
 				self::FILE_NAME
 		);
 
-		if (\is_string($sValue))
-		{
+		if (\is_string($sValue)) {
 			$aData = \json_decode($sValue, true);
-			if (\is_array($aData))
-			{
+			if (\is_array($aData)) {
 				return $aData;
 			}
 		}
@@ -38,20 +37,20 @@ class DefaultSettings implements ISettings
 		return array();
 	}
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool
+	public function Save(Account $oAccount, \RainLoop\Settings $oSettings) : bool
 	{
 		return $this->oStorageProvider->Put($oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
+			StorageType::CONFIG,
 			$this->oStorageProvider->IsLocal() ?
 				self::FILE_NAME_LOCAL :
 				self::FILE_NAME,
-			\json_encode($aSettings));
+			\json_encode($oSettings));
 	}
 
-	public function Delete(\RainLoop\Model\Account $oAccount) : bool
+	public function Delete(Account $oAccount) : bool
 	{
 		return $this->oStorageProvider->Clear($oAccount,
-			\RainLoop\Providers\Storage\Enumerations\StorageType::CONFIG,
+			StorageType::CONFIG,
 			$this->oStorageProvider->IsLocal() ?
 				self::FILE_NAME_LOCAL :
 				self::FILE_NAME);
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
index b1d1a7f8d..0199d1b5e 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Settings/ISettings.php
@@ -6,7 +6,7 @@ interface ISettings
 {
 	public function Load(\RainLoop\Model\Account $oAccount) : array;
 
-	public function Save(\RainLoop\Model\Account $oAccount, array $aSettings) : bool;
+	public function Save(\RainLoop\Model\Account $oAccount, \RainLoop\Settings $oSettings) : bool;
 
 	public function Delete(\RainLoop\Model\Account $oAccount) : bool;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
index 3f1790b84..bc4f47096 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage.php
@@ -2,6 +2,8 @@
 
 namespace RainLoop\Providers;
 
+use RainLoop\Model\Account;
+
 class Storage extends \RainLoop\Providers\AbstractProvider
 {
 	/**
@@ -14,74 +16,55 @@ class Storage extends \RainLoop\Providers\AbstractProvider
 		$this->oDriver = $oDriver;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 */
-	private function verifyAccount($mAccount, int $iStorageType) : bool
+	private function verifyAccount(Account|string|null $mAccount, int $iStorageType): bool
 	{
 		return \RainLoop\Providers\Storage\Enumerations\StorageType::NOBODY === $iStorageType
-			|| $mAccount instanceof \RainLoop\Model\Account
+			|| $mAccount instanceof Account
 			|| \is_string($mAccount);
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 * @param mixed $sValue
-	 */
-	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool
+	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Put($mAccount, $iStorageType, $sKey, $sValue)
 			: false;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 * @param mixed $mDefault = false
-	 *
-	 * @return mixed
-	 */
-	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false)
+	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Get($mAccount, $iStorageType, $sKey, $mDefault)
 			: $mDefault;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 */
-	public function Clear($mAccount, int $iStorageType, string $sKey) : bool
+	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool
 	{
 		return $this->verifyAccount($mAccount, $iStorageType)
 			? $this->oDriver->Clear($mAccount, $iStorageType, $sKey)
 			: false;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string $mAccount
-	 */
-	public function DeleteStorage($mAccount) : bool
+	public function DeleteStorage(Account|string $mAccount): bool
 	{
 		return $this->oDriver->DeleteStorage($mAccount);
 	}
 
-	public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string
+	public function GenerateFilePath(Account|string|null $mAccount, int $iStorageType, bool $bMkDir = false): string
 	{
 		return $this->oDriver->GenerateFilePath($mAccount, $iStorageType, $bMkDir);
 	}
 
-	public function IsActive() : bool
+	public function IsActive(): bool
 	{
 		return true;
 	}
 
-	public function IsLocal() : bool
+	public function IsLocal(): bool
 	{
 		return $this->oDriver->IsLocal();
 	}
 
-	public function GC() : void
+	public function GC(): void
 	{
 		$this->oDriver->GC();
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
index 18fd63f74..f2337ba41 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/Enumerations/StorageType.php
@@ -2,12 +2,18 @@
 
 namespace RainLoop\Providers\Storage\Enumerations;
 
-class StorageType
-{
-	const USER = 1;
-	const CONFIG = 2;
-	const NOBODY = 3;
-	const SIGN_ME = 4;
-	const SESSION = 5;
-	const PGP = 6;
+/**
+ * PHP 8.1
+enum StorageType: int {
+	case USER = 1;
+}
+*/
+abstract class StorageType
+{
+	const CONFIG = 1;
+	const NOBODY = 2;
+	const SIGN_ME = 3;
+	const SESSION = 4;
+	const PGP = 5;
+	const ROOT = 6;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
index 1717e442f..e2f93bff6 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/FileStorage.php
@@ -3,35 +3,23 @@
 namespace RainLoop\Providers\Storage;
 
 use RainLoop\Providers\Storage\Enumerations\StorageType;
+use RainLoop\Model\Account;
 
 class FileStorage implements \RainLoop\Providers\Storage\IStorage
 {
-	/**
-	 * @var string
-	 */
-	protected $sDataPath;
+	use \MailSo\Log\Inherit;
 
-	/**
-	 * @var bool
-	 */
-	private $bLocal;
+	protected string $sDataPath;
 
-	/**
-	 * @var \MailSo\Log\Logger
-	 */
-	protected $oLogger;
+	private bool $bLocal;
 
 	public function __construct(string $sStoragePath, bool $bLocal = false)
 	{
 		$this->sDataPath = \rtrim(\trim($sStoragePath), '\\/');
 		$this->bLocal = $bLocal;
-		$this->oLogger = null;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 */
-	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool
+	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool
 	{
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey, true);
 		try {
@@ -43,13 +31,7 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return false;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 * @param mixed $mDefault = false
-	 *
-	 * @return mixed
-	 */
-	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false)
+	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed
 	{
 		$mValue = false;
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey);
@@ -63,19 +45,13 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return false === $mValue ? $mDefault : $mValue;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 */
-	public function Clear($mAccount, int $iStorageType, string $sKey) : bool
+	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool
 	{
 		$sFileName = $this->generateFileName($mAccount, $iStorageType, $sKey);
 		return $sFileName && \file_exists($sFileName) && \unlink($sFileName);
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string $mAccount
-	 */
-	public function DeleteStorage($mAccount) : bool
+	public function DeleteStorage(Account|string|null $mAccount): bool
 	{
 		$sPath = $this->generateFileName($mAccount, StorageType::CONFIG, '');
 		if ($sPath && \is_dir($sPath)) {
@@ -89,89 +65,80 @@ class FileStorage implements \RainLoop\Providers\Storage\IStorage
 		return $this->bLocal;
 	}
 
-	public function GenerateFilePath($mAccount, int $iStorageType, bool $bMkDir = false) : string
+	public function GenerateFilePath(Account|string|null $mAccount, int $iStorageType, bool $bMkDir = false): string
 	{
-		$sEmail = $sSubFolder = '';
-		if (null === $mAccount) {
-			$iStorageType = StorageType::NOBODY;
-		} else if ($mAccount instanceof \RainLoop\Model\MainAccount) {
-			$sEmail = $mAccount->Email();
-		} else if ($mAccount instanceof \RainLoop\Model\AdditionalAccount) {
-			$sEmail = $mAccount->ParentEmail();
-			if ($this->bLocal) {
-				$sSubFolder = $mAccount->Email();
+		$sEmail = $sSubFolder = $sFilePath = '';
+		if (null === $mAccount || StorageType::NOBODY === $iStorageType) {
+			$sFilePath = $this->sDataPath.'/__nobody__/';
+		} else {
+			if ($mAccount instanceof \RainLoop\Model\MainAccount) {
+				$sEmail = $mAccount->Email();
+			} else if ($mAccount instanceof \RainLoop\Model\AdditionalAccount) {
+				$sEmail = $mAccount->ParentEmail();
+				if ($this->bLocal) {
+					$sSubFolder = $mAccount->Email();
+				}
+			} else if (\is_string($mAccount)) {
+				$sEmail = $mAccount;
 			}
-		} else if (\is_string($mAccount)) {
-			$sEmail = $mAccount;
-		}
 
-		if ($sEmail) {
-			if (StorageType::SIGN_ME === $iStorageType) {
-				$sSubFolder = '.sign_me';
-			} else if (StorageType::SESSION === $iStorageType) {
-				$sSubFolder = '.sessions';
-			} else if (StorageType::PGP === $iStorageType) {
-				$sSubFolder = '.pgp';
+			if ($sEmail) {
+				// these are never local
+				if (StorageType::SIGN_ME === $iStorageType) {
+					$sSubFolder = '.sign_me';
+				} else if (StorageType::SESSION === $iStorageType) {
+					$sSubFolder = '.sessions';
+				} else if (StorageType::PGP === $iStorageType) {
+					$sSubFolder = '.pgp';
+				} else if (StorageType::ROOT === $iStorageType) {
+					$sSubFolder = '';
+				}
+			}
+
+			switch ($iStorageType)
+			{
+				case StorageType::CONFIG:
+				case StorageType::SIGN_ME:
+				case StorageType::SESSION:
+				case StorageType::PGP:
+				case StorageType::ROOT:
+					if (empty($sEmail)) {
+						return '';
+					}
+					if (\is_dir("{$this->sDataPath}/cfg")) {
+						\SnappyMail\Upgrade::FileStorage($this->sDataPath);
+					}
+					$aEmail = \explode('@', $sEmail ?: 'nobody@unknown.tld');
+					$sDomain = \trim(1 < \count($aEmail) ? \array_pop($aEmail) : '');
+					$sFilePath = $this->sDataPath
+						.'/'.\MailSo\Base\Utils::SecureFileName($sDomain ?: 'unknown.tld')
+						.'/'.\MailSo\Base\Utils::SecureFileName(\implode('@', $aEmail) ?: '.unknown')
+						.'/'.($sSubFolder ? \MailSo\Base\Utils::SecureFileName($sSubFolder).'/' : '');
+					break;
+				default:
+					throw new \Exception("Invalid storage type {$iStorageType}");
 			}
 		}
 
-		$sFilePath = '';
-		switch ($iStorageType)
-		{
-			case StorageType::NOBODY:
-				$sFilePath = $this->sDataPath.'/__nobody__/';
-				break;
-			case StorageType::SIGN_ME:
-			case StorageType::SESSION:
-			case StorageType::CONFIG:
-			case StorageType::PGP:
-				if (empty($sEmail)) {
-					return '';
-				}
-				if (\is_dir("{$this->sDataPath}/cfg")) {
-					\SnappyMail\Upgrade::FileStorage($this->sDataPath);
-				}
-				$aEmail = \explode('@', $sEmail ?: 'nobody@unknown.tld');
-				$sDomain = \trim(1 < \count($aEmail) ? \array_pop($aEmail) : '');
-				$sFilePath = $this->sDataPath
-					.'/'.\RainLoop\Utils::fixName($sDomain ?: 'unknown.tld')
-					.'/'.\RainLoop\Utils::fixName(\implode('@', $aEmail) ?: '.unknown')
-					.'/'.($sSubFolder ? \RainLoop\Utils::fixName($sSubFolder).'/' : '');
-				break;
-			default:
-				throw new \Exception("Invalid storage type {$iStorageType}");
-		}
-
-		if ($bMkDir && !empty($sFilePath) && !\is_dir($sFilePath) && !\mkdir($sFilePath, 0700, true))
-		{
-			throw new \RainLoop\Exceptions\Exception('Can\'t make storage directory "'.$sFilePath.'"');
-		}
+		$bMkDir && !empty($sFilePath) && \MailSo\Base\Utils::mkdir($sFilePath);
 
 		return $sFilePath;
 	}
 
-	/**
-	 * @param \RainLoop\Model\Account|string|null $mAccount
-	 */
-	protected function generateFileName($mAccount, int $iStorageType, string $sKey, bool $bMkDir = false) : string
+	protected function generateFileName(Account|string|null $mAccount, int $iStorageType, string $sKey, bool $bMkDir = false): string
 	{
 		$sFilePath = $this->GenerateFilePath($mAccount, $iStorageType, $bMkDir);
 		if ($sFilePath) {
 			if (StorageType::NOBODY === $iStorageType) {
 				$sFilePath .= \sha1($sKey ?: \time());
 			} else {
-				$sFilePath .= ($sKey ? \RainLoop\Utils::fixName($sKey) : '');
+				$sFilePath .= ($sKey ? \MailSo\Base\Utils::SecureFileName($sKey) : '');
 			}
 		}
 		return $sFilePath;
 	}
 
-	public function SetLogger(?\MailSo\Log\Logger $oLogger)
-	{
-		$this->oLogger = $oLogger;
-	}
-
-	public function GC() : void
+	public function GC(): void
 	{
 		\clearstatcache();
 		foreach (\glob("{$this->sDataPath}/*", GLOB_ONLYDIR) as $sDomain) {
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
index 66bf5b93b..882510cf3 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Storage/IStorage.php
@@ -2,25 +2,15 @@
 
 namespace RainLoop\Providers\Storage;
 
+use RainLoop\Model\Account;
+
 interface IStorage
 {
-	/**
-	 * @param \RainLoop\Model\Account|null $mAccount
-	 */
-	public function Put($mAccount, int $iStorageType, string $sKey, string $sValue) : bool;
+	public function Put(Account|string|null $mAccount, int $iStorageType, string $sKey, string $sValue): bool;
 
-	/**
-	 * @param \RainLoop\Model\Account|null $mAccount
-	 * @param mixed $mDefault = false
-	 *
-	 * @return mixed
-	 */
-	public function Get($mAccount, int $iStorageType, string $sKey, $mDefault = false);
+	public function Get(Account|string|null $mAccount, int $iStorageType, string $sKey, mixed $mDefault = false): mixed;
 
-	/**
-	 * @param \RainLoop\Model\Account|null $mAccount
-	 */
-	public function Clear($mAccount, int $iStorageType, string $sKey) : bool;
+	public function Clear(Account|string|null $mAccount, int $iStorageType, string $sKey): bool;
 
-	public function IsLocal() : bool;
+	public function IsLocal(): bool;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
index 16b980da6..cca87d0f4 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions.php
@@ -7,54 +7,75 @@ class Suggestions extends \RainLoop\Providers\AbstractProvider
 	/**
 	 * @var \RainLoop\Providers\Suggestions\ISuggestions[]
 	 */
-	private $aDrivers;
+	private array $aDrivers = [];
 
 	/**
 	 * @param \RainLoop\Providers\Suggestions\ISuggestions[]|null $aDriver = null
 	 */
 	public function __construct(?array $aDriver = null)
 	{
-		if (\is_array($aDriver))
-		{
-			$aDriver = \array_filter($aDriver, function ($oDriver) {
+		if (\is_array($aDriver)) {
+			$this->aDrivers = \array_filter($aDriver, function ($oDriver) {
 				return $oDriver instanceof \RainLoop\Providers\Suggestions\ISuggestions;
 			});
 		}
-
-		$this->aDrivers = \is_array($aDriver) && \count($aDriver) ? $aDriver : null;
 	}
 
 	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20) : array
 	{
-		$aSuggestions = array();
-		if ($this->IsActive() && \is_array($this->aDrivers) && \strlen($sQuery))
+		if (!\strlen($sQuery)) {
+			return [];
+		}
+
+		$iLimit = \max(5, (int) $iLimit);
+		$aResult = [];
+
+		// Address Book
+		try
 		{
-			foreach ($this->aDrivers as $oDriver)
-			{
-				$aSubs = null;
-				if ($oDriver)
-				{
-					$aSubs = $oDriver->Process($oAccount, $sQuery, $iLimit);
-					if (\is_array($aSubs) && \count($aSubs))
-					{
-						$aSuggestions = \array_merge($aSuggestions, $aSubs);
+			$oAddressBookProvider = \RainLoop\Api::Actions()->AddressBookProvider($oAccount);
+			if ($oAddressBookProvider && $oAddressBookProvider->IsActive()) {
+				$aSuggestions = $oAddressBookProvider->GetSuggestions($sQuery, $iLimit);
+				foreach ($aSuggestions as $aItem) {
+					// Unique email address
+					$sLine = \mb_strtolower($aItem[0]);
+					if (!isset($aResult[$sLine])) {
+						$aResult[$sLine] = $aItem;
 					}
 				}
 			}
 		}
-
-		$aResult = \RainLoop\Utils::RemoveSuggestionDuplicates($aSuggestions);
-
-		if ($iLimit < \count($aResult))
+		catch (\Throwable $oException)
 		{
-			$aResult = \array_slice($aResult, 0, $iLimit);
+			$this->logException($oException);
 		}
 
-		return $aResult;
+		// Extensions/Plugins
+		foreach ($this->aDrivers as $oDriver) {
+			if ($oDriver) try {
+				$aSuggestions = $oDriver->Process($oAccount, $sQuery, $iLimit);
+				if ($aSuggestions) {
+					foreach ($aSuggestions as $aItem) {
+						// Unique email address
+						$sLine = \mb_strtolower($aItem[0]);
+						if (!isset($aResult[$sLine])) {
+							$aResult[$sLine] = $aItem;
+						}
+					}
+					if ($iLimit < \count($aResult)) {
+						break;
+					}
+				}
+			} catch (\Throwable $oException) {
+				$this->logException($oException);
+			}
+		}
+
+		return \array_slice(\array_values($aResult), 0, $iLimit);
 	}
 
 	public function IsActive() : bool
 	{
-		return \is_array($this->aDrivers) && \count($this->aDrivers);
+		return \count($this->aDrivers);
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
index 25c3f2c49..bb1f2a6d8 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/ISuggestions.php
@@ -4,5 +4,7 @@ namespace RainLoop\Providers\Suggestions;
 
 interface ISuggestions
 {
+//	use \MailSo\Log\Inherit;
 	public function Process(\RainLoop\Model\Account $oAccount, string $sQuery, int $iLimit = 20) : array;
+//	public function SetLogger(\MailSo\Log\Logger $oLogger) : void
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php
deleted file mode 100644
index 51490bc54..000000000
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Providers/Suggestions/TestSuggestions.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace RainLoop\Providers\Suggestions;
-
-use RainLoop\Model\Account;
-
-class TestSuggestions implements ISuggestions
-{
-	public function Process(Account $oAccount, string $sQuery, int $iLimit = 20) : array
-	{
-		return array(
-			array($oAccount->Email(), ''),
-			array('email@domain.com', 'name')
-		);
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
index 1e0926f71..52104cf80 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -10,8 +10,7 @@ abstract class Service
 	public static function Handle() : bool
 	{
 		static $bOne = null;
-		if (null === $bOne)
-		{
+		if (null === $bOne) {
 			$bOne = static::RunResult();
 		}
 
@@ -22,16 +21,8 @@ abstract class Service
 	{
 		$oConfig = Api::Config();
 
-		if ($oConfig->Get('debug', 'enable', false))
-		{
-			\error_reporting(E_ALL);
-			\ini_set('display_errors', 1);
-			\ini_set('log_errors', 1);
-		}
-
 		$sServer = \trim($oConfig->Get('security', 'custom_server_signature', ''));
-		if (\strlen($sServer))
-		{
+		if (\strlen($sServer)) {
 			\header('Server: '.$sServer);
 		}
 
@@ -43,17 +34,35 @@ abstract class Service
 
 		static::setCSP();
 
-		$sXFrameOptionsHeader = \trim($oConfig->Get('security', 'x_frame_options_header', '')) ?: 'DENY';
-		\header('X-Frame-Options: '.$sXFrameOptionsHeader);
-
 		$sXssProtectionOptionsHeader = \trim($oConfig->Get('security', 'x_xss_protection_header', '')) ?: '1; mode=block';
 		\header('X-XSS-Protection: '.$sXssProtectionOptionsHeader);
 
 		$oHttp = \MailSo\Base\Http::SingletonInstance();
-		if ($oConfig->Get('labs', 'force_https', false) && !$oHttp->IsSecure())
-		{
-			\header('Location: https://'.$oHttp->GetHost(false, false).$oHttp->GetUrl());
-			exit;
+		if ($oConfig->Get('security', 'force_https', false) && !$oHttp->IsSecure()) {
+			\MailSo\Base\Http::Location('https://'.$oHttp->GetHost(false).$oHttp->GetUrl());
+			return true;
+		}
+
+		// See https://github.com/kjdev/php-ext-brotli
+		if (!empty($_SERVER['HTTP_ACCEPT_ENCODING'])
+		 && $oConfig->Get('webmail', 'compress_output', false)
+		 && !\ini_get('zlib.output_compression')
+		 && !\ini_get('brotli.output_compression')
+		) {
+			if (\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 {
+				\ob_start('ob_gzhandler');
+			}
+		} else {
+			\ob_start();
 		}
 
 		$sQuery = \trim($_SERVER['QUERY_STRING'] ?? '');
@@ -75,31 +84,25 @@ abstract class Service
 
 		$aPaths = \explode('/', $sQuery);
 
-		$bAdmin = false;
-		$sAdminPanelHost = $oConfig->Get('security', 'admin_panel_host', '');
-		if (empty($sAdminPanelHost))
-		{
-			$bAdmin = !empty($aPaths[0]) && ($oConfig->Get('security', 'admin_panel_key', '') ?: 'admin') === $aPaths[0];
+		$sAdminPanelHost = \trim($oConfig->Get('admin_panel', 'host', ''));
+		if (empty($sAdminPanelHost)) {
+			$bAdmin = !empty($aPaths[0]) && ($oConfig->Get('admin_panel', 'key', '') ?: 'admin') === $aPaths[0];
 			$bAdmin && \array_shift($aPaths);
-		}
-		else if (empty($aPaths[0]) && \mb_strtolower($sAdminPanelHost) === \mb_strtolower($oHttp->GetHost()))
-		{
-			$bAdmin = true;
+		} else {
+			$bAdmin = \mb_strtolower($sAdminPanelHost) === \mb_strtolower($oHttp->GetHost());
 		}
 
 		$oActions = $bAdmin ? new ActionsAdmin() : Api::Actions();
 
 		$oActions->Plugins()->RunHook('filter.http-paths', array(&$aPaths));
 
-		if ($oHttp->IsPost())
-		{
+		if ($oHttp->IsPost()) {
 			$oHttp->ServerNoCache();
 		}
 
 		$oServiceActions = new ServiceActions($oHttp, $oActions);
 
-		if ($bAdmin && !$oConfig->Get('security', 'allow_admin_panel', true))
-		{
+		if ($bAdmin && !$oConfig->Get('security', 'allow_admin_panel', true)) {
 			\MailSo\Base\Http::StatusHeader(403);
 			echo $oServiceActions->ErrorTemplates('Access Denied.',
 				'Access to the SnappyMail Admin Panel is not allowed!');
@@ -108,10 +111,8 @@ abstract class Service
 		}
 
 		$bIndex = true;
-		$sResult = '';
-		if (\count($aPaths) && !empty($aPaths[0]) && 'index' !== \strtolower($aPaths[0]))
-		{
-			if ('mailto' !== \strtolower($aPaths[0]) && !\SnappyMail\HTTP\SecFetch::isSameOrigin()) {
+		if (\count($aPaths) && !empty($aPaths[0]) && 'index' !== \strtolower($aPaths[0])) {
+			if ('mailto' !== \strtolower($aPaths[0]) && !\SnappyMail\HTTP\SecFetch::matchAnyRule($oConfig->Get('security', 'secfetch_allow', ''))) {
 				\MailSo\Base\Http::StatusHeader(403);
 				echo $oServiceActions->ErrorTemplates('Access Denied.',
 					"Disallowed Sec-Fetch
@@ -122,106 +123,112 @@ abstract class Service
 				return false;
 			}
 
-			$bIndex = false;
 			$sMethodName = 'Service'.\preg_replace('/@.+$/', '', $aPaths[0]);
 			$sMethodExtra = \strpos($aPaths[0], '@') ? \preg_replace('/^[^@]+@/', '', $aPaths[0]) : '';
 
-			if (\method_exists($oServiceActions, $sMethodName) &&
-				\is_callable(array($oServiceActions, $sMethodName)))
-			{
+			if (\method_exists($oServiceActions, $sMethodName) && \is_callable(array($oServiceActions, $sMethodName))) {
+				$bIndex = false;
 				$oServiceActions->SetQuery($sQuery)->SetPaths($aPaths);
-				$sResult = $oServiceActions->{$sMethodName}($sMethodExtra);
-			}
-			else if (!$oActions->Plugins()->RunAdditionalPart($aPaths[0], $aPaths))
-			{
-				$bIndex = true;
+				echo $oServiceActions->{$sMethodName}($sMethodExtra);
+			} else if ($oActions->Plugins()->RunAdditionalPart($aPaths[0], $aPaths)) {
+				$bIndex = false;
 			}
 		}
 
-		if ($bIndex)
-		{
+		if ($bIndex) {
+			// https://github.com/the-djmaze/snappymail/issues/1024
+			$oHttp->ServerNoCache();
+
 			if (!$bAdmin) {
 				$login = $oConfig->Get('labs', 'custom_login_link', '');
 				if ($login && !$oActions->getAccountFromToken(false)) {
-					\header("Location: {$login}");
-					exit;
+					\MailSo\Base\Http::Location($login);
+					return true;
 				}
 			}
 
 //			if (!\SnappyMail\HTTP\SecFetch::isEntering()) {
 			\header('Content-Type: text/html; charset=utf-8');
-			$oHttp->ServerNoCache();
 
-			if (!\is_dir(APP_DATA_FOLDER_PATH) || !\is_writable(APP_DATA_FOLDER_PATH))
-			{
+			if (!\is_dir(APP_DATA_FOLDER_PATH) || !\is_writable(APP_DATA_FOLDER_PATH)) {
 				echo $oServiceActions->ErrorTemplates(
 					'Permission denied!',
 					'SnappyMail can not access the data folder "'.APP_DATA_FOLDER_PATH.'"'
 				);
-
 				return false;
 			}
 
 			$sLanguage = $oActions->GetLanguage($bAdmin);
 
-			$sAppJsMin = $oConfig->Get('labs', 'use_app_debug_js', false) ? '' : '.min';
-			$sAppCssMin = $oConfig->Get('labs', 'use_app_debug_css', false) ? '' : '.min';
+			$bAppDebug = $oConfig->Get('debug', 'enable', false);
+			$sAppJsMin = $bAppDebug || $oConfig->Get('debug', 'javascript', false) ? '' : '.min';
+			$sAppCssMin = $bAppDebug || $oConfig->Get('debug', 'css', false) ? '' : '.min';
 
 			$sFaviconUrl = (string) $oConfig->Get('webmail', 'favicon_url', '');
 
-			$sFaviconPngLink = $sFaviconUrl ? $sFaviconUrl : $oActions->StaticPath('apple-touch-icon.png');
-			$sAppleTouchLink = $sFaviconUrl ? '' : $oActions->StaticPath('apple-touch-icon.png');
+			$sFaviconPngLink = $sFaviconUrl ?: Utils::WebStaticPath('apple-touch-icon.png');
+			$sAppleTouchLink = $sFaviconUrl ? '' : Utils::WebStaticPath('apple-touch-icon.png');
+
+			$oActions = Api::Actions();
+
+			$sThemeName = $oActions->GetTheme($bAdmin);
 
 			$aTemplateParameters = array(
+				'{{BaseAppThemeName}}' => $sThemeName,
 				'{{BaseAppFaviconPngLinkTag}}' => $sFaviconPngLink ? '<link type="image/png" rel="shortcut icon" href="'.$sFaviconPngLink.'">' : '',
 				'{{BaseAppFaviconTouchLinkTag}}' => $sAppleTouchLink ? '<link type="image/png" rel="apple-touch-icon" href="'.$sAppleTouchLink.'">' : '',
-				'{{BaseAppMainCssLink}}' => $oActions->StaticPath('css/'.($bAdmin ? 'admin' : 'app').$sAppCssMin.'.css'),
-				'{{BaseAppThemeCssLink}}' => $oActions->ThemeLink($bAdmin),
-				'{{BaseAppManifestLink}}' => $oActions->StaticPath('manifest.json'),
+				'{{BaseAppManifestLink}}' => Utils::WebStaticPath('manifest.json'),
+				'{{BaseFavIconSvg}}' => $sFaviconUrl ? '' : Utils::WebStaticPath('favicon.svg'),
 				'{{LoadingDescriptionEsc}}' => \htmlspecialchars($oConfig->Get('webmail', 'loading_description', 'SnappyMail'), ENT_QUOTES|ENT_IGNORE, 'UTF-8'),
 				'{{BaseAppAdmin}}' => $bAdmin ? 1 : 0
 			);
 
-			$sCacheFileName = '';
-			if ($oConfig->Get('labs', 'cache_system_data', true))
-			{
-				$sCacheFileName = 'TMPL:' . $sLanguage . \md5(
-					\json_encode(array(
-						$oConfig->Get('cache', 'index', ''),
-						$oActions->Plugins()->Hash(),
-						$sAppJsMin,
-						$sAppCssMin,
-						$aTemplateParameters,
-						APP_VERSION
-					))
-				);
+			$sCacheFileName = 'TMPL:' . \sha1(
+				Utils::jsonEncode(array(
+					$sLanguage,
+					$oConfig->Get('cache', 'index', ''),
+					$oActions->Plugins()->Hash(),
+					$sAppJsMin,
+					$sAppCssMin,
+					$aTemplateParameters,
+					APP_VERSION
+				))
+			);
+
+			// https://github.com/the-djmaze/snappymail/issues/1024
+//			$oActions->verifyCacheByKey($sCacheFileName);
+
+			if ($oConfig->Get('cache', 'system_data', true)) {
 				$sResult = $oActions->Cacher()->Get($sCacheFileName);
+			} else {
+				$sResult = '';
 			}
 
 			if ($sResult) {
 				$sResult .= '<!--cached-->';
 			} else {
-				$aTemplateParameters['{{BaseAppThemeCss}}'] = $oActions->compileCss($oActions->GetTheme($bAdmin), $bAdmin);
-				$aTemplateParameters['{{BaseLanguage}}'] = $oActions->compileLanguage($sLanguage, $bAdmin);
-				$aTemplateParameters['{{BaseTemplates}}'] = $oServiceActions->compileTemplates($bAdmin);
 				$aTemplateParameters['{{BaseAppBootCss}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/css/boot'.$sAppCssMin.'.css');
 				$aTemplateParameters['{{BaseAppBootScript}}'] = \file_get_contents(APP_VERSION_ROOT_PATH.'static/js'.($sAppJsMin ? '/min' : '').'/boot'.$sAppJsMin.'.js');
-				$sResult = \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'), $aTemplateParameters);
-
-				if ($sAppJsMin || $sAppCssMin) {
-					$sResult = \preg_replace(
-						['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/>\\s+</'],
-						['>', "\xC2\xA0", "\xC2\xA0", '><'],
-						\trim($sResult)
-					);
-				} else {
-					$sResult = Utils::ClearHtmlOutput($sResult);
-				}
+				$aTemplateParameters['{{BaseAppMainCssLink}}'] = Utils::WebStaticPath('css/'.($bAdmin ? 'admin' : 'app').$sAppCssMin.'.css');
+				$aTemplateParameters['{{BaseAppThemeCss}}'] = \preg_replace('/\\s*([:;{},]+)\\s*/s', '$1', $oActions->compileCss($sThemeName, $bAdmin));
+				$aTemplateParameters['{{BaseLanguage}}'] = $oActions->compileLanguage($sLanguage, $bAdmin);
+				$aTemplateParameters['{{BaseTemplates}}'] = Utils::ClearHtmlOutput($oServiceActions->compileTemplates($bAdmin));
+				$aTemplateParameters['{{NO_SCRIPT_DESC}}'] = \nl2br($oActions->StaticI18N('NO_SCRIPT_TITLE') . "\n" . $oActions->StaticI18N('NO_SCRIPT_DESC'));
+				$aTemplateParameters['{{NO_COOKIE_TITLE}}'] = $oActions->StaticI18N('NO_COOKIE_TITLE');
+				$aTemplateParameters['{{NO_COOKIE_DESC}}'] = $oActions->StaticI18N('NO_COOKIE_DESC');
+				$aTemplateParameters['{{BAD_BROWSER_TITLE}}'] = $oActions->StaticI18N('BAD_BROWSER_TITLE');
+				$aTemplateParameters['{{BAD_BROWSER_DESC}}'] = \nl2br($oActions->StaticI18N('BAD_BROWSER_DESC'));
+				$sResult = Utils::ClearHtmlOutput(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Index.html'));
+				$sResult = \strtr($sResult, $aTemplateParameters);
 				if ($sCacheFileName) {
 					$oActions->Cacher()->Set($sCacheFileName, $sResult);
 				}
 			}
 
+			$SameSite = \strtolower($oConfig->Get('security', 'cookie_samesite', 'Strict'));
+			$Secure = (isset($_SERVER['HTTPS']) || 'none' == $SameSite) ? ';secure' : '';
+			$sResult = \str_replace('samesite=strict', "samesite={$SameSite}{$Secure}", $sResult);
+
 			$sScriptNonce = \SnappyMail\UUID::generate();
 			static::setCSP($sScriptNonce);
 			$sResult = \str_replace('nonce=""', 'nonce="'.$sScriptNonce.'"', $sResult);
@@ -230,36 +237,22 @@ abstract class Service
 			$sScriptHash = 'sha256-'.\base64_encode(\hash('sha256', $script[1], true));
 			static::setCSP(null, $sScriptHash);
 */
-		}
-		else if (!\headers_sent())
-		{
+			// https://github.com/the-djmaze/snappymail/issues/1024
+//			$oActions->cacheByKey($sCacheFileName);
+
+			echo $sResult;
+			unset($sResult);
+		} else if (!\headers_sent()) {
 			\header('X-XSS-Protection: 1; mode=block');
 		}
 
-		// Output result
-		echo $sResult;
-		unset($sResult);
-
 		$oActions->BootEnd();
 
 		return true;
 	}
 
-	private static function setCSP(string $sScriptNonce = null) : void
+	private static function setCSP(?string $sScriptNonce = null) : void
 	{
-		$CSP = new \SnappyMail\HTTP\CSP(\trim(Api::Config()->Get('security', 'content_security_policy', '')));
-		$CSP->report = Api::Config()->Get('security', 'csp_report', false);
-		$CSP->report_only = Api::Config()->Get('debug', 'enable', false); // '0.0.0' === APP_VERSION
-
-		// Allow https: due to remote images in e-mails or use proxy
-		if (!Api::Config()->Get('security', 'use_local_proxy_for_external_images', '')) {
-			$CSP->img[] = 'https:';
-			$CSP->img[] = 'http:';
-		}
-		$CSP->script[] = "'nonce-{$sScriptNonce}'";
-
-		Api::Actions()->Plugins()->RunHook('main.content-security-policy', array($CSP));
-
-		$CSP->setHeaders();
+		Api::getCSP($sScriptNonce)->setHeaders();
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
index 074632756..b3ad82241 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/ServiceActions.php
@@ -4,60 +4,46 @@ namespace RainLoop;
 
 class ServiceActions
 {
-	/**
-	 * @var \MailSo\Base\Http
-	 */
-	protected $oHttp;
+	protected \MailSo\Base\Http $oHttp;
 
-	/**
-	 * @var \RainLoop\Actions
-	 */
-	protected $oActions;
+	protected Actions $oActions;
 
-	/**
-	 * @var array
-	 */
-	protected $aPaths;
+	protected array $aPaths = array();
 
-	/**
-	 * @var string
-	 */
-	protected $sQuery;
+	protected string $sQuery = '';
 
 	public function __construct(\MailSo\Base\Http $oHttp, Actions $oActions)
 	{
 		$this->oHttp = $oHttp;
 		$this->oActions = $oActions;
-		$this->aPaths = array();
-		$this->sQuery = '';
 	}
 
-	public function Logger() : \MailSo\Log\Logger
+	private function Logger() : \MailSo\Log\Logger
 	{
 		return $this->oActions->Logger();
 	}
 
-	public function Plugins() : Plugins\Manager
+	private function Plugins() : Plugins\Manager
 	{
 		return $this->oActions->Plugins();
 	}
 
-	public function Config() : Config\Application
+	private function Config() : Config\Application
 	{
 		return $this->oActions->Config();
 	}
 
-	public function Cacher() : \MailSo\Cache\CacheClient
+	private function Cacher() : \MailSo\Cache\CacheClient
 	{
 		return $this->oActions->Cacher();
 	}
 
-	public function StorageProvider() : Providers\Storage
+	private function StorageProvider() : Providers\Storage
 	{
 		return $this->oActions->StorageProvider();
 	}
 
-	public function SettingsProvider() : Providers\Settings
+	private function SettingsProvider() : Providers\Settings
 	{
 		return $this->oActions->SettingsProvider();
 	}
@@ -88,12 +74,15 @@ class ServiceActions
 	{
 		\ob_start();
 
-		$aResponseItem = null;
+		$aResponse = null;
 		$oException = null;
 
-		$sAction = $_POST['Action'] ?? null;
-		if (empty($sAction) && $this->oHttp->IsGet() && !empty($this->aPaths[2]))
-		{
+		if (empty($_POST) || (!empty($_SERVER['CONTENT_TYPE']) && \str_contains($_SERVER['CONTENT_TYPE'], 'application/json'))) {
+			$_POST = \json_decode(\file_get_contents('php://input'), true);
+		}
+
+		$sAction = $_POST['Action'] ?? '';
+		if (empty($sAction) && $this->oHttp->IsGet() && !empty($this->aPaths[2])) {
 			$sAction = $this->aPaths[2];
 		}
 
@@ -101,227 +90,173 @@ class ServiceActions
 
 		try
 		{
-			if ($this->oHttp->IsPost() &&
-				$this->Config()->Get('security', 'csrf_protection', false) &&
-				($_POST['XToken'] ?? '') !== Utils::GetCsrfToken())
-			{
-				throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'CSRF failed');
+			if (empty($sAction)) {
+				throw new Exceptions\ClientException(Notifications::InvalidInputArgument, null, 'Action unknown');
 			}
-			else if (!empty($sAction))
-			{
-				if ($this->oActions instanceof ActionsAdmin && 0 === \stripos($sAction, 'Admin') && !\in_array($sAction, ['AdminLogin', 'AdminLogout'])) {
-					$this->oActions->IsAdminLoggined();
-				}
 
-				$sMethodName = 'Do'.$sAction;
-
-				$this->Logger()->Write('Action: '.$sMethodName, \MailSo\Log\Enumerations\Type::NOTE, 'JSON');
-
-				$aPost = $_POST ?? null;
-				if ($aPost)
-				{
-					$this->oActions->SetActionParams($aPost, $sMethodName);
-					foreach ($aPost as $key => $value) {
-						if (false !== \stripos($key, 'Password')) {
-							$aPost[$key] = '*******';
-						}
+			if ('Logout' !== $sAction) {
+				$token = Utils::GetCsrfToken();
+				if (isset($_SERVER['HTTP_X_SM_TOKEN'])) {
+					if ($_SERVER['HTTP_X_SM_TOKEN'] !== $token) {
+						$oAccount = $this->oActions->getAccountFromToken(false);
+						$sEmail = $oAccount ? $oAccount->Email() : 'guest';
+						$this->oActions->logWrite("{$_SERVER['HTTP_X_SM_TOKEN']} !== {$token} for {$sEmail}", \LOG_ERR, 'Token');
+						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'HTTP Token mismatch');
 					}
-/*
-					switch ($sMethodName)
-					{
-						case 'DoLogin':
-						case 'DoAdminLogin':
-						case 'DoAccountAdd':
-							$this->Logger()->AddSecret($this->oActions->GetActionParam('Password', ''));
-							break;
+				} else if ($this->oHttp->IsPost()) {
+					if (empty($_POST['XToken']) || $_POST['XToken'] !== $token) {
+						$oAccount = $this->oActions->getAccountFromToken(false);
+						$sEmail = $oAccount ? $oAccount->Email() : 'guest';
+						$this->oActions->logWrite("{$_POST['XToken']} !== {$token} for {$sEmail}", \LOG_ERR, 'XToken');
+						throw new Exceptions\ClientException(Notifications::InvalidToken, null, 'XToken mismatch');
 					}
-*/
-					$this->Logger()->Write(\MailSo\Base\Utils::Php2js($aPost, $this->Logger()),
-						\MailSo\Log\Enumerations\Type::INFO, 'POST', true);
-				}
-				else if (3 < \count($this->aPaths) && $this->oHttp->IsGet())
-				{
-					$this->oActions->SetActionParams(array(
-						'RawKey' => empty($this->aPaths[3]) ? '' : $this->aPaths[3]
-					), $sMethodName);
-				}
-
-				if (\method_exists($this->oActions, $sMethodName) &&
-					\is_callable(array($this->oActions, $sMethodName)))
-				{
-					$this->Plugins()->RunHook('json.action-pre-call', array($sAction));
-					$aResponseItem = $this->oActions->{$sMethodName}();
-					$this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem));
-				}
-				else if ($this->Plugins()->HasAdditionalJson($sMethodName))
-				{
-					$this->Plugins()->RunHook('json.action-pre-call', array($sAction));
-					$aResponseItem = $this->Plugins()->RunAdditionalJson($sMethodName);
-					$this->Plugins()->RunHook('json.action-post-call', array($sAction, &$aResponseItem));
 				}
 			}
 
-			if (!\is_array($aResponseItem))
-			{
+			if ($this->oActions instanceof ActionsAdmin && 0 === \stripos($sAction, 'Admin') && !\in_array($sAction, ['AdminLogin', 'AdminLogout'])) {
+				$this->oActions->IsAdminLoggined();
+			}
+
+			$sMethodName = 'Do'.$sAction;
+
+			$this->oActions->logWrite('Action: '.$sMethodName, \LOG_INFO, 'JSON');
+
+			if ($_POST) {
+				$this->oActions->SetActionParams($_POST, $sMethodName);
+				$aPost = $_POST;
+				foreach ($aPost as $key => $value) {
+					// password & passphrase
+					if (false !== \stripos($key, 'pass')) {
+						$aPost[$key] = '*******';
+//						$this->oActions->logMask($value);
+					}
+				}
+				$this->oActions->logWrite(Utils::jsonEncode($aPost), \LOG_INFO, 'POST');
+			} else if (3 < \count($this->aPaths) && $this->oHttp->IsGet()) {
+				$this->oActions->SetActionParams(array(
+					'RawKey' => empty($this->aPaths[3]) ? '' : $this->aPaths[3]
+				), $sMethodName);
+			}
+
+			if (\method_exists($this->oActions, $sMethodName) && \is_callable(array($this->oActions, $sMethodName))) {
+				$this->Plugins()->RunHook("json.before-{$sAction}");
+				$aResponse = $this->oActions->{$sMethodName}();
+			} else if ($this->Plugins()->HasAdditionalJson($sMethodName)) {
+				$this->Plugins()->RunHook("json.before-{$sAction}");
+				$aResponse = $this->Plugins()->RunAdditionalJson($sMethodName);
+			}
+
+			if (\is_array($aResponse)) {
+				// Everything must converted to array
+				$aResponse = \json_decode(Utils::jsonEncode($aResponse), true);
+				$this->Plugins()->RunHook("json.after-{$sAction}", array(&$aResponse));
+			}
+
+			if (!\is_array($aResponse)) {
 				throw new Exceptions\ClientException(Notifications::UnknownError);
 			}
 		}
 		catch (\Throwable $oException)
 		{
-			\SnappyMail\Log::warning('SERVICE', $oException->getMessage());
+			\SnappyMail\Log::warning('SERVICE', "{$oException}");
 			if ($e = $oException->getPrevious()) {
-				\SnappyMail\Log::warning('SERVICE', "\t{$e->getMessage()} @ {$e->getFile()}#{$e->getLine()}");
+				\SnappyMail\Log::warning('SERVICE', "- {$e}");
 			}
 
-			$aResponseItem = $this->oActions->ExceptionResponse(
-				empty($sAction) ? 'Unknown' : $sAction, $oException);
+			$aResponse = $this->oActions->ExceptionResponse($oException);
 		}
 
-		if (\is_array($aResponseItem))
-		{
-			$aResponseItem['Time'] = (int) ((\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT']) * 1000);
+		$aResponse['Action'] = $sAction ?: 'Unknown';
+
+		if (!\headers_sent()) {
+			\header('Content-Type: application/json; charset=utf-8');
 		}
 
-		$this->Plugins()->RunHook('filter.json-response', array($sAction, &$aResponseItem));
+		if (\is_array($aResponse)) {
+			$aResponse['epoch'] = \time();
+//			if ($this->Config()->Get('debug', 'enable', false)) {
+//				$aResponse['rtime'] = \round(\microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'], 3);
+//			}
+		}
 
-		\header('Content-Type: application/json; charset=utf-8');
-
-		$sResult = \MailSo\Base\Utils::Php2js($aResponseItem, $this->Logger());
+		$sResult = Utils::jsonEncode($aResponse);
 
 		$sObResult = \ob_get_clean();
 
-		if ($this->Logger()->IsEnabled())
-		{
-			if (\strlen($sObResult))
-			{
-				$this->Logger()->Write($sObResult, \MailSo\Log\Enumerations\Type::ERROR, 'OB-DATA');
+		if ($this->Logger()->IsEnabled()) {
+			if (\strlen($sObResult)) {
+				$this->oActions->logWrite($sObResult, \LOG_ERR, 'OB-DATA');
 			}
 
-			if ($oException)
-			{
-				$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
+			if ($oException) {
+				$this->oActions->logException($oException, \LOG_ERR);
 			}
 
-			$iLimit = (int) $this->Config()->Get('labs', 'log_ajax_response_write_limit', 0);
-			$this->Logger()->Write(0 < $iLimit && $iLimit < \strlen($sResult)
-					? \substr($sResult, 0, $iLimit).'...' : $sResult, \MailSo\Log\Enumerations\Type::INFO, 'JSON');
+			$iLimit = (int) $this->Config()->Get('logs', 'json_response_write_limit', 0);
+			$this->oActions->logWrite(0 < $iLimit && $iLimit < \strlen($sResult)
+					? \substr($sResult, 0, $iLimit).'...' : $sResult, \LOG_INFO, 'JSON');
 		}
 
 		return $sResult;
 	}
 
-	public function ServiceAppend() : string
-	{
-		\ob_start();
-		$bResponse = false;
-		$oException = null;
-		try
-		{
-			if (\method_exists($this->oActions, 'Append') &&
-				\is_callable(array($this->oActions, 'Append')))
-			{
-				isset($_POST) && $this->oActions->SetActionParams($_POST, 'Append');
-				$bResponse = $this->oActions->Append();
-			}
-		}
-		catch (\Throwable $oException)
-		{
-			$bResponse = false;
-		}
-
-		\header('Content-Type: text/plain; charset=utf-8');
-		$sResult = true === $bResponse ? '1' : '0';
-
-		$sObResult = \ob_get_clean();
-		if (\strlen($sObResult))
-		{
-			$this->Logger()->Write($sObResult, \MailSo\Log\Enumerations\Type::ERROR, 'OB-DATA');
-		}
-
-		if ($oException)
-		{
-			$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR);
-		}
-
-		$this->Logger()->Write($sResult, \MailSo\Log\Enumerations\Type::INFO, 'APPEND');
-
-		return $sResult;
-	}
-
 	private function privateUpload(string $sAction, int $iSizeLimit = 0) : string
 	{
 		$oConfig = $this->Config();
 
 		\ob_start();
-		$aResponseItem = null;
+		$aResponse = null;
 		try
 		{
 			$aFile = null;
 			$sInputName = 'uploader';
-			$iError = Enumerations\UploadError::UNKNOWN;
 			$iSizeLimit = (0 < $iSizeLimit ? $iSizeLimit : ((int) $oConfig->Get('webmail', 'attachment_size_limit', 0))) * 1024 * 1024;
 
-			$iError = UPLOAD_ERR_OK;
 			$_FILES = isset($_FILES) ? $_FILES : null;
-			if (isset($_FILES[$sInputName], $_FILES[$sInputName]['name'], $_FILES[$sInputName]['tmp_name'], $_FILES[$sInputName]['size']))
-			{
+			if (isset($_FILES[$sInputName], $_FILES[$sInputName]['name'], $_FILES[$sInputName]['tmp_name'], $_FILES[$sInputName]['size'])) {
 				$iError = (isset($_FILES[$sInputName]['error'])) ? (int) $_FILES[$sInputName]['error'] : UPLOAD_ERR_OK;
 //				\is_uploaded_file($_FILES[$sInputName]['tmp_name'])
 
-				if (UPLOAD_ERR_OK === $iError && 0 < $iSizeLimit && $iSizeLimit < (int) $_FILES[$sInputName]['size'])
-				{
+				if (UPLOAD_ERR_OK === $iError && 0 < $iSizeLimit && $iSizeLimit < (int) $_FILES[$sInputName]['size']) {
 					$iError = Enumerations\UploadError::CONFIG_SIZE;
 				}
 
-				if (UPLOAD_ERR_OK === $iError)
-				{
+				if (UPLOAD_ERR_OK === $iError) {
 					$aFile = $_FILES[$sInputName];
 				}
-			}
-			else if (empty($_FILES))
-			{
+			} else if (empty($_FILES)) {
 				$iError = UPLOAD_ERR_INI_SIZE;
-			}
-			else
-			{
-				$iError = Enumerations\UploadError::EMPTY_FILES_DATA;
+			} else {
+				$iError = Enumerations\UploadError::EMPTY_FILE;
 			}
 
-			if (\method_exists($this->oActions, $sAction) &&
-				\is_callable(array($this->oActions, $sAction)))
-			{
-				$aActionParams = isset($_GET) && \is_array($_GET) ? $_GET : null;
-
-				$aActionParams['File'] = $aFile;
-				$aActionParams['Error'] = $iError;
-
-				$this->oActions->SetActionParams($aActionParams, $sAction);
-
-				$aResponseItem = $this->oActions->{$sAction}();
+			if (\method_exists($this->oActions, $sAction) && \is_callable(array($this->oActions, $sAction))) {
+				$aResponse = $this->oActions->{$sAction}($aFile, $iError);
 			}
 
-			if (!is_array($aResponseItem))
-			{
+			if (!is_array($aResponse)) {
 				throw new Exceptions\ClientException(Notifications::UnknownError);
 			}
+
+			$this->Plugins()->RunHook('filter.upload-response', array(&$aResponse));
 		}
 		catch (\Throwable $oException)
 		{
-			$aResponseItem = $this->oActions->ExceptionResponse($sAction, $oException);
+			$aResponse = $this->oActions->ExceptionResponse($oException);
 		}
 
+		$aResponse['Action'] = $sAction ?: 'Unknown';
+
 		\header('Content-Type: application/json; charset=utf-8');
 
-		$this->Plugins()->RunHook('filter.upload-response', array(&$aResponseItem));
-		$sResult = \MailSo\Base\Utils::Php2js($aResponseItem, $this->Logger());
+		$sResult = Utils::jsonEncode($aResponse);
 
 		$sObResult = \ob_get_clean();
-		if (\strlen($sObResult))
-		{
-			$this->Logger()->Write($sObResult, \MailSo\Log\Enumerations\Type::ERROR, 'OB-DATA');
+		if (\strlen($sObResult)) {
+			$this->oActions->logWrite($sObResult, \LOG_ERR, 'OB-DATA');
 		}
 
-		$this->Logger()->Write($sResult, \MailSo\Log\Enumerations\Type::INFO, 'UPLOAD');
+		$this->oActions->logWrite($sResult, \LOG_INFO, 'UPLOAD');
 
 		return $sResult;
 	}
@@ -344,7 +279,10 @@ class ServiceActions
 	public function ServiceProxyExternal() : string
 	{
 		$sData = empty($this->aPaths[1]) ? '' : $this->aPaths[1];
-		if ($sData && $this->Config()->Get('labs', 'use_local_proxy_for_external_images', false)) {
+		if ($sData
+		  && $this->Config()->Get('labs', 'use_local_proxy_for_external_images', false)
+		  && $this->oActions->getMainAccountFromToken()
+		) {
 			$this->oActions->verifyCacheByKey($sData);
 			$sUrl = \MailSo\Base\Utils::UrlSafeBase64Decode($sData);
 			if (!empty($sUrl)) {
@@ -354,21 +292,25 @@ class ServiceActions
 				$HTTP->max_redirects = 2;
 				$HTTP->streamBodyTo($tmp);
 				$oResponse = $HTTP->doRequest('GET', $sUrl);
-				if ($oResponse && 200 === $oResponse->status
-					&& \str_starts_with($oResponse->getHeader('content-type'), 'image/')
-				) try {
-					$this->oActions->cacheByKey($sData);
-					\header('Content-Type: ' . $oResponse->getHeader('content-type'));
-					\header('Cache-Control: public');
-					\header('Expires: '.\gmdate('D, j M Y H:i:s', 2592000 + \time()).' UTC');
-					\header('X-Content-Redirect-Location: '.$oResponse->final_uri);
-					\rewind($tmp);
-					\fpassthru($tmp);
-					exit;
-				} catch (\Throwable $e) {
-					$msg = \get_class($HTTP) . ': ' . $e->getMessage();
-					\SnappyMail\Log::error('Proxy', $msg);
-//					\error_log(\get_class($HTTP) . ': ' . $e->getMessage());
+				if ($oResponse) {
+					$sContentType = \SnappyMail\File\MimeType::fromStream($tmp) ?: $oResponse->getHeader('content-type');
+					if (200 === $oResponse->status && \str_starts_with($sContentType, 'image/')) {
+						try {
+							$this->oActions->cacheByKey($sData);
+							\header('Content-Type: ' . $sContentType);
+							\header('Cache-Control: public');
+							\header('Expires: '.\gmdate('D, j M Y H:i:s', 2592000 + \time()).' UTC');
+							\header('X-Content-Redirect-Location: '.$oResponse->final_uri);
+							\rewind($tmp);
+							\fpassthru($tmp);
+							exit;
+						} catch (\Throwable $e) {
+							\header("X-Content-Error: {$e->getMessage()}");
+							\SnappyMail\Log::error('Proxy', \get_class($HTTP) . ': ' . $e->getMessage());
+						}
+					} else {
+						\header("X-Content-Error: {$oResponse->status} {$sContentType}");
+					}
 				}
 			}
 		}
@@ -392,32 +334,30 @@ class ServiceActions
 		try
 		{
 			$sRawError = 'Invalid action';
-			if (0 !== \strlen($sAction))
-			{
-				$sMethodName = 'Raw'.$sAction;
-				if (\method_exists($this->oActions, $sMethodName))
-				{
-					\header('X-Raw-Action: '.$sMethodName);
-					\header('Content-Security-Policy: script-src \'none\'; child-src \'none\'');
+			if (\strlen($sAction)) {
+				try {
+					$sMethodName = 'Raw'.$sAction;
+					if (\method_exists($this->oActions, $sMethodName)) {
+						\header('X-Raw-Action: '.$sMethodName);
+						\header('Content-Security-Policy: script-src \'none\'; child-src \'none\'; object-src \'none\'');
 
-					$sRawError = '';
-					$this->oActions->SetActionParams(array(
-						'RawKey' => empty($this->aPaths[3]) ? '' : $this->aPaths[3],
-						'Params' => $this->aPaths
-					), $sMethodName);
+						$sRawError = '';
+						$this->oActions->SetActionParams(array(
+							'RawKey' => empty($this->aPaths[3]) ? '' : $this->aPaths[3],
+							'Params' => $this->aPaths
+						), $sMethodName);
 
-					if (!$this->oActions->{$sMethodName}())
-					{
-						$sRawError = 'False result';
+						if (!$this->oActions->{$sMethodName}()) {
+							$sRawError = 'False result';
+						}
+					} else {
+						$sRawError = 'Unknown action "'.$sAction.'"';
 					}
+				} catch (\Throwable $e) {
+//					error_log(print_r($e,1));
+					$sRawError = $e->getMessage();
 				}
-				else
-				{
-					$sRawError = 'Unknown action "'.$sAction.'"';
-				}
-			}
-			else
-			{
+			} else {
 				$sRawError = 'Empty action';
 			}
 		}
@@ -432,15 +372,13 @@ class ServiceActions
 			$sRawError = 'Exception as result';
 		}
 
-		if (\strlen($sRawError))
-		{
-			$this->Logger()->Write($sRawError, \MailSo\Log\Enumerations\Type::ERROR);
-			$this->Logger()->WriteDump($this->aPaths, \MailSo\Log\Enumerations\Type::ERROR, 'PATHS');
+		if (\strlen($sRawError)) {
+			$this->oActions->logWrite($sRawError, \LOG_ERR);
+			$this->Logger()->WriteDump($this->aPaths, \LOG_ERR, 'PATHS');
 		}
 
-		if ($oException)
-		{
-			$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR, 'RAW');
+		if ($oException) {
+			$this->oActions->logException($oException, \LOG_ERR, 'RAW');
 		}
 
 		return $sResult;
@@ -448,42 +386,30 @@ class ServiceActions
 
 	public function ServiceLang() : string
 	{
-//		sleep(2);
 		$sResult = '';
 		\header('Content-Type: application/javascript; charset=utf-8');
 
-		if (!empty($this->aPaths[3]))
-		{
+		if (!empty($this->aPaths[3])) {
 			$bAdmin = 'Admin' === (isset($this->aPaths[2]) ? (string) $this->aPaths[2] : 'App');
 			$sLanguage = $this->oActions->ValidateLanguage($this->aPaths[3], '', $bAdmin);
 
-			$bCacheEnabled = $this->Config()->Get('labs', 'cache_system_data', true);
-			if (!empty($sLanguage) && $bCacheEnabled)
-			{
-				$this->oActions->verifyCacheByKey($this->sQuery);
-			}
-
+			$bCacheEnabled = $this->Config()->Get('cache', 'system_data', true);
 			$sCacheFileName = '';
-			if ($bCacheEnabled)
-			{
-				$sCacheFileName = KeyPathHelper::LangCache(
-					$sLanguage, $bAdmin, $this->oActions->Plugins()->Hash());
-
+			if ($bCacheEnabled) {
+				$sCacheFileName = KeyPathHelper::LangCache($sLanguage, $bAdmin, $this->oActions->Plugins()->Hash());
+				$this->oActions->verifyCacheByKey(\md5($sCacheFileName));
 				$sResult = $this->Cacher()->Get($sCacheFileName);
 			}
 
-			if (!\strlen($sResult))
-			{
+			if (!$sResult) {
 				$sResult = $this->oActions->compileLanguage($sLanguage, $bAdmin);
-				if ($bCacheEnabled && \strlen($sCacheFileName))
-				{
+				if ($sCacheFileName) {
 					$this->Cacher()->Set($sCacheFileName, $sResult);
 				}
 			}
 
-			if ($bCacheEnabled)
-			{
-				$this->oActions->cacheByKey($this->sQuery);
+			if ($sCacheFileName) {
+				$this->oActions->cacheByKey(\md5($sCacheFileName));
 			}
 		}
 
@@ -497,31 +423,26 @@ class ServiceActions
 
 		\header('Content-Type: application/javascript; charset=utf-8');
 
-		$bCacheEnabled = $this->Config()->Get('labs', 'cache_system_data', true);
-		if ($bCacheEnabled)
-		{
-			$this->oActions->verifyCacheByKey($this->sQuery);
-		}
+		$bAppDebug = $this->Config()->Get('debug', 'enable', false);
+		$sMinify = ($bAppDebug || $this->Config()->Get('debug', 'javascript', false)) ? '' : 'min';
 
+		$bCacheEnabled = !$bAppDebug && $this->Config()->Get('cache', 'system_data', true);
 		$sCacheFileName = '';
-		if ($bCacheEnabled)
-		{
-			$sCacheFileName = KeyPathHelper::PluginsJsCache($this->oActions->Plugins()->Hash());
+		if ($bCacheEnabled) {
+			$sCacheFileName = KeyPathHelper::PluginsJsCache($this->oActions->Plugins()->Hash()) . $sMinify;
+			$this->oActions->verifyCacheByKey(\md5($sCacheFileName));
 			$sResult = $this->Cacher()->Get($sCacheFileName);
 		}
 
-		if (!\strlen($sResult))
-		{
-			$sResult = $this->Plugins()->CompileJs($bAdmin);
-			if ($bCacheEnabled && \strlen($sCacheFileName))
-			{
+		if (!$sResult) {
+			$sResult = $this->Plugins()->CompileJs($bAdmin, !!$sMinify);
+			if ($sCacheFileName) {
 				$this->Cacher()->Set($sCacheFileName, $sResult);
 			}
 		}
 
-		if ($bCacheEnabled)
-		{
-			$this->oActions->cacheByKey($this->sQuery);
+		if ($sCacheFileName) {
+			$this->oActions->cacheByKey(\md5($sCacheFileName));
 		}
 
 		return $sResult;
@@ -530,61 +451,50 @@ class ServiceActions
 	public function ServiceCss() : string
 	{
 		$sResult = '';
-
 		$bAdmin = !empty($this->aPaths[2]) && 'Admin' === $this->aPaths[2];
 		$bJson = !empty($this->aPaths[9]) && 'Json' === $this->aPaths[9];
 
-		if ($bJson)
-		{
+		if ($bJson) {
 			\header('Content-Type: application/json; charset=utf-8');
-		}
-		else
-		{
+		} else {
 			\header('Content-Type: text/css; charset=utf-8');
 		}
 
 		$sTheme = '';
-		if (!empty($this->aPaths[4]))
-		{
+		if (!empty($this->aPaths[4])) {
 			$sTheme = $this->oActions->ValidateTheme($this->aPaths[4]);
 
-			$bCacheEnabled = $this->Config()->Get('labs', 'cache_system_data', true);
-			if ($bCacheEnabled)
-			{
-				$this->oActions->verifyCacheByKey($this->sQuery);
-			}
+			$bAppDebug = $this->Config()->Get('debug', 'enable', false);
+			$sMinify = ($bAppDebug || $this->Config()->Get('debug', 'css', false)) ? '' : 'min';
 
+			$bCacheEnabled = !$bAppDebug && $this->Config()->Get('cache', 'system_data', true);
 			$sCacheFileName = '';
-			if ($bCacheEnabled)
-			{
-				$sCacheFileName = KeyPathHelper::CssCache($sTheme, $this->oActions->Plugins()->Hash());
+			if ($bCacheEnabled) {
+				$sCacheFileName = '/CssCache/'.$this->oActions->Plugins()->Hash().'/'.$sTheme.'/'.APP_VERSION.'/' . $sMinify;
+				$this->oActions->verifyCacheByKey(\md5($sCacheFileName . ($bJson ? 1 : 0)));
 				$sResult = $this->Cacher()->Get($sCacheFileName);
 			}
 
-			if (!$sResult)
-			{
+			if (!$sResult) {
 				try
 				{
 					$sResult = $this->oActions->compileCss($sTheme, $bAdmin);
-
-					if ($bCacheEnabled && $sCacheFileName)
-					{
+					if ($sCacheFileName) {
 						$this->Cacher()->Set($sCacheFileName, $sResult);
 					}
 				}
 				catch (\Throwable $oException)
 				{
-					$this->Logger()->WriteException($oException, \MailSo\Log\Enumerations\Type::ERROR, 'LESS');
+					$this->oActions->logException($oException, \LOG_ERR, 'LESS');
 				}
 			}
 
-			if ($bCacheEnabled)
-			{
-				$this->oActions->cacheByKey($this->sQuery);
+			if ($sCacheFileName) {
+				$this->oActions->cacheByKey(\md5($sCacheFileName . ($bJson ? 1 : 0 )));
 			}
 		}
 
-		return $bJson ? \MailSo\Base\Utils::Php2js(array($sTheme, $sResult), $this->Logger()) : $sResult;
+		return $bJson ? Utils::jsonEncode(array($sTheme, $sResult)) : $sResult;
 	}
 
 	public function ServiceAppData() : string
@@ -597,43 +507,21 @@ class ServiceActions
 		return $this->localAppData(true);
 	}
 
-	public function ServiceNoScript() : string
-	{
-		return $this->localError($this->oActions->StaticI18N('NO_SCRIPT_TITLE'), $this->oActions->StaticI18N('NO_SCRIPT_DESC'));
-	}
-
-	public function ServiceNoCookie() : string
-	{
-		return $this->localError($this->oActions->StaticI18N('NO_COOKIE_TITLE'), $this->oActions->StaticI18N('NO_COOKIE_DESC'));
-	}
-
-	public function ServiceBadBrowser() : string
-	{
-		$sTitle = $this->oActions->StaticI18N('BAD_BROWSER_TITLE');
-		$sDesc = \nl2br($this->oActions->StaticI18N('BAD_BROWSER_DESC'));
-
-		\header('Content-Type: text/html; charset=utf-8');
-		return \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/BadBrowser.html'), array(
-			'{{BaseWebStaticPath}}' => Utils::WebStaticPath(),
-			'{{ErrorTitle}}' => $sTitle,
-			'{{ErrorHeader}}' => $sTitle,
-			'{{ErrorDesc}}' => $sDesc
-		));
-	}
-
 	public function ServiceMailto() : string
 	{
 		$this->oHttp->ServerNoCache();
 		$sTo = \trim($_GET['to'] ?? '');
-		if (!empty($sTo) && \preg_match('/^mailto:/i', $sTo)) {
-			Utils::SetCookie(Actions::AUTH_MAILTO_TOKEN_KEY,
+		if (\preg_match('/^mailto:/i', $sTo)) {
+			\SnappyMail\Cookies::set(
+				Actions::AUTH_MAILTO_TOKEN_KEY,
 				Utils::EncodeKeyValuesQ(array(
 					'Time' => \microtime(true),
 					'MailTo' => 'MailTo',
 					'To' => $sTo
-				)), 0);
+				))
+			);
 		}
-		$this->oActions->Location('./');
+		\MailSo\Base\Http::Location('./');
 		return '';
 	}
 
@@ -642,12 +530,19 @@ class ServiceActions
 		$this->oHttp->ServerNoCache();
 
 		\header('Content-Type: text/plain; charset=utf-8');
-		$this->oActions->Logger()->Write('Pong', \MailSo\Log\Enumerations\Type::INFO, 'PING');
+		$this->oActions->logWrite('Pong', \LOG_INFO, 'PING');
 		return 'Pong';
 	}
 
+	public function ServiceTest() : string
+	{
+		$this->oHttp->ServerNoCache();
+		\SnappyMail\Integrity::test();
+		return '';
+	}
+
 	/**
-	 * Login with the \RainLoop\API::CreateUserSsoHash() generated hash
+	 * Login with the \RainLoop\Api::CreateUserSsoHash() generated hash
 	 */
 	public function ServiceSso() : string
 	{
@@ -657,13 +552,11 @@ class ServiceActions
 		$oAccount = null;
 
 		$sSsoHash = $_REQUEST['hash'] ?? '';
-		if (!empty($sSsoHash))
-		{
+		if (!empty($sSsoHash)) {
 			$mData = null;
 
 			$sSsoSubData = $this->Cacher()->Get(KeyPathHelper::SsoCacherKey($sSsoHash));
-			if (!empty($sSsoSubData))
-			{
+			if (!empty($sSsoSubData)) {
 				$aData = \SnappyMail\Crypt::DecryptFromJSON($sSsoSubData, $sSsoHash);
 
 				$this->Cacher()->Delete(KeyPathHelper::SsoCacherKey($sSsoHash));
@@ -671,143 +564,51 @@ class ServiceActions
 				if (\is_array($aData) && !empty($aData['Email']) && isset($aData['Password'], $aData['Time']) &&
 					(0 === $aData['Time'] || \time() - 10 < $aData['Time']))
 				{
-					$sEmail = \trim($aData['Email']);
-					$sPassword = $aData['Password'];
-
 					$aAdditionalOptions = (isset($aData['AdditionalOptions']) && \is_array($aData['AdditionalOptions']))
 						? $aData['AdditionalOptions'] : [];
-
 					try
 					{
-						$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-
-						if ($aAdditionalOptions)
-						{
-							$bNeedToSettings = false;
+						$oAccount = $this->oActions->LoginProcess(
+							\trim($aData['Email']),
+							new \SnappyMail\SensitiveString($aData['Password'])
+						);
+						if ($aAdditionalOptions) {
+							$bSaveSettings = false;
 
 							$oSettings = $this->SettingsProvider()->Load($oAccount);
-							if ($oSettings)
-							{
-								$sLanguage = isset($aAdditionalOptions['Language']) ?
-									$aAdditionalOptions['Language'] : '';
+							if ($oSettings) {
+								$sLanguage = isset($aAdditionalOptions['language']) ?
+									$aAdditionalOptions['language'] : '';
 
-								if ($sLanguage)
-								{
+								if ($sLanguage) {
 									$sLanguage = $this->oActions->ValidateLanguage($sLanguage);
-									if ($sLanguage !== $oSettings->GetConf('Language', ''))
-									{
-										$bNeedToSettings = true;
-										$oSettings->SetConf('Language', $sLanguage);
+									if ($sLanguage !== $oSettings->GetConf('language', '')) {
+										$bSaveSettings = true;
+										$oSettings->SetConf('language', $sLanguage);
 									}
 								}
 							}
 
-							if ($bNeedToSettings)
-							{
-								$this->SettingsProvider()->Save($oAccount, $oSettings);
+							if ($bSaveSettings) {
+								$oSettings->save();
 							}
 						}
-
-						if ($oAccount instanceof Model\MainAccount) {
-							$this->oActions->SetAuthToken($oAccount);
-						}
 					}
 					catch (\Throwable $oException)
 					{
-						$this->Logger()->WriteException($oException);
+						$this->oActions->logException($oException);
 					}
 				}
 			}
 		}
 
-		$this->oActions->Location('./');
+		\MailSo\Base\Http::Location('./');
 		return '';
 	}
 
-	public function ServiceRemoteAutoLogin() : string
-	{
-		$oException = null;
-		$oAccount = null;
-
-		$sEmail = $_ENV['REMOTE_USER'] ?? '';
-		$sPassword = $_ENV['REMOTE_PASSWORD'] ?? '';
-
-		if (\strlen($sEmail) && \strlen(\trim($sPassword)))
-		{
-			try
-			{
-				$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-				if ($oAccount instanceof Model\MainAccount) {
-					$this->oActions->SetAuthToken($oAccount);
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException);
-			}
-		}
-
-		$this->oActions->Location('./');
-		return '';
-	}
-
-	public function ServiceExternalLogin() : string
-	{
-		$this->oHttp->ServerNoCache();
-
-		$oException = null;
-		$oAccount = null;
-
-		if ($this->oActions->Config()->Get('labs', 'allow_external_login', false)) {
-			$sEmail = \trim($this->oHttp->GetRequest('Email', ''));
-			$sPassword = $this->oHttp->GetRequest('Password', '');
-
-			try
-			{
-				$oAccount = $this->oActions->LoginProcess($sEmail, $sPassword);
-				if ($oAccount instanceof Model\MainAccount) {
-					$this->oActions->SetAuthToken($oAccount);
-				} else {
-					$oAccount = null;
-				}
-			}
-			catch (\Throwable $oException)
-			{
-				$this->Logger()->WriteException($oException);
-			}
-		}
-
-		if ('json' === \strtolower($this->oHttp->GetRequest('Output', ''))) {
-			\header('Content-Type: application/json; charset=utf-8');
-
-			$aResult = array(
-				'Action' => 'ExternalLogin',
-				'Result' => $oAccount ? true : false,
-				'ErrorCode' => 0
-			);
-
-			if (!$oAccount) {
-				if ($oException instanceof Exceptions\ClientException) {
-					$aResult['ErrorCode'] = $oException->getCode();
-				} else {
-					$aResult['ErrorCode'] = Notifications::AuthError;
-				}
-			}
-
-			return \MailSo\Base\Utils::Php2js($aResult, $this->Logger());
-		}
-
-		$this->oActions->Location('./');
-		return '';
-	}
-
-	/**
-	 * @return mixed
-	 */
-	public function ErrorTemplates(string $sTitle, string $sDesc, bool $bShowBackLink = true)
+	public function ErrorTemplates(string $sTitle, string $sDesc, bool $bShowBackLink = true) : string
 	{
 		return \strtr(\file_get_contents(APP_VERSION_ROOT_PATH.'app/templates/Error.html'), array(
-			'{{BaseWebStaticPath}}' => Utils::WebStaticPath(),
 			'{{ErrorTitle}}' => $sTitle,
 			'{{ErrorHeader}}' => $sTitle,
 			'{{ErrorDesc}}' => $sDesc,
@@ -825,16 +626,15 @@ class ServiceActions
 
 	private function localAppData(bool $bAdmin = false) : string
 	{
-		\header('Content-Type: application/javascript; charset=utf-8');
+		\header('Content-Type: application/json; charset=utf-8');
 		$this->oHttp->ServerNoCache();
-
-		$sResult = 'rl.initData('
-			.\json_encode($this->oActions->AppData($bAdmin))
-			.');';
-
-		$this->Logger()->Write($sResult, \MailSo\Log\Enumerations\Type::INFO, 'APPDATA');
-
-		return $sResult;
+		try {
+			return Utils::jsonEncode($this->oActions->AppData($bAdmin));
+		} catch (\Throwable $oException) {
+			$this->Logger()->WriteExceptionShort($oException);
+			\MailSo\Base\Http::StatusHeader(500);
+			return $oException->getMessage();
+		}
 	}
 
 	public function compileTemplates(bool $bAdmin = false) : string
@@ -855,7 +655,7 @@ class ServiceActions
 		foreach ($aTemplates as $sName => $sFile) {
 			$sName = \preg_replace('/[^a-zA-Z0-9]/', '', $sName);
 			$sHtml .= '<template id="'.$sName.'">'
-				. Utils::ClearHtmlOutput(\preg_replace('/<(\/?)script/i', '<$1x-script', \file_get_contents($sFile)))
+				. \preg_replace('/<(\/?)script/i', '<$1x-script', \file_get_contents($sFile))
 				. '</template>';
 		}
 
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
index f1e8c4683..96cac627c 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Settings.php
@@ -2,37 +2,54 @@
 
 namespace RainLoop;
 
-class Settings
-{
-	/**
-	 * @var array
-	 */
-	protected $aData = array();
+use RainLoop\Model\Account;
+use RainLoop\Providers\Settings as SettingsProvider;
 
-	public function __construct(array $aData)
+class Settings implements \JsonSerializable
+{
+	protected array $aData;
+	protected Account $oAccount;
+	protected SettingsProvider $oProvider;
+
+	public function __construct(SettingsProvider $oProvider, Account $oAccount, array $aData)
 	{
+		if (isset($aData['SpamFolder']) && !isset($aData['JunkFolder'])) {
+			$aData['JunkFolder'] = $aData['SpamFolder'];
+		}
+		if (isset($aData['DraftFolder']) && !isset($aData['DraftsFolder'])) {
+			$aData['DraftsFolder'] = $aData['DraftFolder'];
+		}
+		if (isset($aData['Language']) && !isset($aData['language'])) {
+			$aData['language'] = $aData['Language'];
+			unset($aData['Language']);
+		}
 		$this->aData = $aData;
+		$this->oAccount = $oAccount;
+		$this->oProvider = $oProvider;
 	}
 
-	public function DataAsArray() : array
+	public function save() : bool
+	{
+		return $this->oProvider->Save($this->oAccount, $this);
+	}
+
+	public function toArray() : array
 	{
 		return $this->aData;
 	}
 
-	/**
-	 * @param mixed $mDefValue = null
-	 *
-	 * @return mixed
-	 */
-	public function GetConf(string $sName, $mDefValue = null)
+//	public function jsonSerialize(): array
+	public function jsonSerialize(): mixed
+	{
+		return $this->aData;;
+	}
+
+	public function GetConf(string $sName, mixed $mDefValue = null): mixed
 	{
 		return isset($this->aData[$sName]) ? $this->aData[$sName] : $mDefValue;
 	}
 
-	/**
-	 * @param mixed $mValue
-	 */
-	public function SetConf(string $sName, $mValue) : void
+	public function SetConf(string $sName, mixed $mValue): void
 	{
 		$this->aData[$sName] = $mValue;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
index eb90dbe8d..135f59fcb 100644
--- a/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
+++ b/snappymail/v/0.0.0/app/libraries/RainLoop/Utils.php
@@ -4,16 +4,6 @@ namespace RainLoop;
 
 class Utils
 {
-	/**
-	 * @var string
-	 */
-	static $CookieDefaultPath = '';
-
-	/**
-	 * @var bool|null
-	 */
-	static $CookieDefaultSecure = null;
-
 	const
 		/**
 		 * 30 days cookie
@@ -27,7 +17,26 @@ class Utils
 		 */
 		SESSION_TOKEN = 'smsession';
 
-	public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = '') : string
+	/**
+	 * @param mixed $value
+	 * @param int $flags Bitmask
+	 */
+	public static function jsonEncode(mixed $value, int $flags = \JSON_INVALID_UTF8_SUBSTITUTE): string
+	{
+		try {
+			/* Issue with \SnappyMail\HTTP\Stream
+			if (Api::Config()->Get('debug', 'enable', false)) {
+				$flags |= \JSON_PRETTY_PRINT;
+			}
+			*/
+			return \json_encode($value, $flags | \JSON_UNESCAPED_UNICODE | \JSON_THROW_ON_ERROR);
+		} catch (\Throwable $e) {
+			Api::Logger()->WriteException($e, \LOG_ERR, 'JSON');
+		}
+		return '';
+	}
+
+	public static function EncodeKeyValuesQ(array $aValues, string $sCustomKey = ''): string
 	{
 		return \SnappyMail\Crypt::EncryptUrlSafe(
 			$aValues,
@@ -35,158 +44,98 @@ class Utils
 		);
 	}
 
-	public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = '') : ?array
+	public static function DecodeKeyValuesQ(string $sEncodedValues, string $sCustomKey = ''): array
 	{
 		return \SnappyMail\Crypt::DecryptUrlSafe(
 			$sEncodedValues,
 			\sha1(APP_SALT.$sCustomKey.'Q'.static::GetSessionToken(false))
-		) ?: null;
+		) ?: array();
 	}
 
-	public static function GetSessionToken(bool $generate = true) : ?string
+	public static function GetSessionToken(bool $generate = true): ?string
 	{
-		$sToken = static::GetCookie(self::SESSION_TOKEN, null);
+		$sToken = \SnappyMail\Cookies::get(self::SESSION_TOKEN);
 		if (!$sToken) {
 			if (!$generate) {
 				return null;
 			}
 			\SnappyMail\Log::debug('TOKENS', 'New SESSION_TOKEN');
 			$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
-			static::SetCookie(self::SESSION_TOKEN, $sToken);
+			\SnappyMail\Cookies::set(self::SESSION_TOKEN, $sToken);
 		}
 		return \sha1('Session'.APP_SALT.$sToken.'Token'.APP_SALT);
 	}
 
-	public static function GetConnectionToken() : string
+	public static function GetConnectionToken(): string
 	{
-		$sToken = static::GetCookie(self::CONNECTION_TOKEN);
-		if (!$sToken)
-		{
+		$oActions = \RainLoop\Api::Actions();
+		$oAccount = $oActions->getAccountFromToken(false);
+//		$oAccount = $oActions->getMainAccountFromToken(false);
+		if ($oAccount) {
+			if ($oAccount instanceof \RainLoop\Model\AdditionalAccount) {
+				return '2-' . \sha1(APP_SALT.$oAccount->Hash());
+			}
+			return '1-' . \sha1(APP_SALT.$oAccount->Hash());
+		}
+		$sToken = \SnappyMail\Cookies::get(self::CONNECTION_TOKEN);
+		if (!$sToken) {
 			$sToken = \MailSo\Base\Utils::Sha1Rand(APP_SALT);
-			static::SetCookie(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
+			\SnappyMail\Cookies::set(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
 		}
-
-		return \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
+		return '0-' . \sha1('Connection'.APP_SALT.$sToken.'Token'.APP_SALT);
 	}
 
-	public static function GetCsrfToken() : string
+	public static function GetCsrfToken(): string
 	{
-		return \sha1('Csrf'.APP_SALT.self::GetConnectionToken().'Token'.APP_SALT);
+		return self::GetConnectionToken();
+//		return \sha1('Csrf'.APP_SALT.self::GetConnectionToken().'Token'.APP_SALT);
 	}
 
-	public static function UpdateConnectionToken() : void
+	public static function UpdateConnectionToken(): void
 	{
-		$sToken = static::GetCookie(self::CONNECTION_TOKEN);
-		if ($sToken)
-		{
-			static::SetCookie(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
+		$sToken = \SnappyMail\Cookies::get(self::CONNECTION_TOKEN);
+		if ($sToken) {
+			\SnappyMail\Cookies::set(self::CONNECTION_TOKEN, $sToken, \time() + 3600 * 24 * 30);
 		}
 	}
 
-	public static function ClearHtmlOutput(string $sHtml) : string
+	public static function ClearHtmlOutput(string $sHtml): string
 	{
 //		return $sHtml;
-		return \preg_replace(
-			['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/[\\r\\n\\t]+/', '/>\\s+</'],
-			['>', "\xC2\xA0", "\xC2\xA0", ' ', '><'],
+		return \preg_replace('/>\\s+</', '> <', \preg_replace(
+			['@\\s*/>@', '/\\s*&nbsp;/i', '/&nbsp;\\s*/i', '/[\\r\\n\\t]+/'],
+			['>', "\xC2\xA0", "\xC2\xA0", ' '],
 			\trim($sHtml)
-		);
-	}
-
-	/**
-	 * @param mixed $mDefault = null
-	 * @return mixed
-	 */
-	public static function GetCookie(string $sName, $mDefault = null)
-	{
-		return isset($_COOKIE[$sName]) ? $_COOKIE[$sName] : $mDefault;
-	}
-
-	public static function GetSecureCookie(string $sName)
-	{
-		return isset($_COOKIE[$sName]) && 1024 > \strlen($_COOKIE[$sName])
-			? \SnappyMail\Crypt::DecryptFromJSON(\MailSo\Base\Utils::UrlSafeBase64Decode($_COOKIE[$sName]))
-			: null;
-	}
-
-	public static function SetCookie(string $sName, string $sValue = '', int $iExpire = 0, bool $bHttpOnly = true)
-	{
-		$sPath = static::$CookieDefaultPath;
-		$_COOKIE[$sName] = $sValue;
-		\setcookie($sName, $sValue, array(
-			'expires' => $iExpire,
-			'path' => $sPath && \strlen($sPath) ? $sPath : '/',
-//			'domain' => $sDomain,
-			'secure' => isset($_SERVER['HTTPS']) || static::$CookieDefaultSecure,
-			'httponly' => $bHttpOnly,
-			'samesite' => 'Strict'
 		));
 	}
 
-	public static function ClearCookie(string $sName)
-	{
-		if (isset($_COOKIE[$sName])) {
-			$sPath = static::$CookieDefaultPath;
-			unset($_COOKIE[$sName]);
-			\setcookie($sName, '', array(
-				'expires' => \time() - 3600 * 24 * 30,
-				'path' => $sPath && \strlen($sPath) ? $sPath : '/',
-//				'domain' => null,
-				'secure' => isset($_SERVER['HTTPS']) || static::$CookieDefaultSecure,
-				'httponly' => true,
-				'samesite' => 'Strict'
-			));
-		}
-	}
-
-	public static function UrlEncode(string $sV, bool $bEncode = false) : string
-	{
-		return $bEncode ? \urlencode($sV) : $sV;
-	}
-
-	public static function WebPath() : string
+	public static function WebPath(): string
 	{
 		static $sAppPath;
 		if (!$sAppPath) {
-			$sAppPath = \preg_replace('#index\\.php.*$#D', '', $_SERVER['SCRIPT_NAME']);
-//			$sAppPath = Api::Config()->Get('labs', 'app_default_path', '');
+			$sAppPath = \rtrim(Api::Config()->Get('webmail', 'app_path', '')
+				?: \preg_replace('#index\\.php.*$#D', '', $_SERVER['SCRIPT_NAME']),
+			'/') . '/';
 		}
 		return $sAppPath;
 	}
 
-	public static function WebVersionPath() : string
+	public static function WebVersionPath(): string
 	{
-		return self::WebPath().'snappymail/v/'.APP_VERSION.'/';
+		return self::WebPath() . 'snappymail/v/' . APP_VERSION . '/';
+		/**
+		 * TODO: solve this to support other paths.
+		 * https://github.com/the-djmaze/snappymail/issues/685
+		 */
+//		return self::WebPath() . \str_replace(APP_INDEX_ROOT_PATH, '', APP_VERSION_ROOT_PATH);
 	}
 
-	public static function WebStaticPath() : string
+	public static function WebStaticPath(string $path = ''): string
 	{
-		return self::WebVersionPath().'static/';
+		return self::WebVersionPath() . 'static/' . $path;
 	}
 
-	public static function RemoveSuggestionDuplicates(array $aSuggestions) : array
-	{
-		$aResult = array();
-
-		foreach ($aSuggestions as $aItem)
-		{
-			$sLine = \implode('~~', $aItem);
-			if (!isset($aResult[$sLine]))
-			{
-				$aResult[$sLine] = $aItem;
-			}
-		}
-
-		return array_values($aResult);
-	}
-
-	public static function CustomParseIniFile(string $sFileName, bool $bProcessSections = false) : array
-	{
-		return @\parse_ini_file($sFileName, !!$bProcessSections) ?: array();
-//		return @\parse_ini_string(\file_get_contents($sFileName), $bProcessSections) ?: array();
-	}
-
-	public static function inOpenBasedir(string $name) : string
+	public static function inOpenBasedir(string $name): string
 	{
 		static $open_basedir;
 		if (null === $open_basedir) {
@@ -198,36 +147,27 @@ class Utils
 					return true;
 				}
 			}
-			\SnappyMail\Log::warning('OpenBasedir', "open_basedir restriction in effect. {$name} is not within the allowed path(s): " . \ini_get('open_basedir'));
+//			\SnappyMail\Log::warning('OpenBasedir', "open_basedir restriction in effect. {$name} is not within the allowed path(s): " . \ini_get('open_basedir'));
 			return false;
 		}
 		return true;
 	}
 
-	/**
-	 * Replace control characters, ampersand, spaces and reserved characters (based on Win95 VFAT)
-	 * en.wikipedia.org/wiki/Filename#Reserved_characters_and_words
-	 */
-	public static function fixName(string $filename) : string
-	{
-		return \preg_replace('#[|\\\\?*<":>+\\[\\]/&\\s\\pC]#su', '-', $filename);
-	}
-
-	public static function saveFile(string $filename, string $data) : void
+	public static function saveFile(string $filename, string $data): void
 	{
 		$dir = \dirname($filename);
 		if (!\is_dir($dir) && !\mkdir($dir, 0700, true)) {
-			throw new Exceptions\Exception('Failed to create directory "'.$dir.'"');
+			throw new \RuntimeException('Failed to create directory "'.$dir.'"');
 		}
 		if (false === \file_put_contents($filename, $data)) {
-			throw new Exceptions\Exception('Failed to save file "'.$filename.'"');
+			throw new \RuntimeException('Failed to save file "'.$filename.'"');
 		}
 		\clearstatcache();
 		\chmod($filename, 0600);
 /*
 		try {
 		} catch (\Throwable $oException) {
-			throw new Exceptions\Exception($oException->getMessage() . ': ' . \error_get_last()['message']);
+			throw new \RuntimeException($oException->getMessage() . ': ' . \error_get_last()['message']);
 		}
 */
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
index fade50e16..11ae8be14 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/BirthdayCalendarGenerator.php
@@ -15,31 +15,25 @@ class BirthdayCalendarGenerator
 {
     /**
      * Input objects.
-     *
-     * @var array
      */
-    protected $objects = [];
+    protected array $objects = [];
 
     /**
      * Default year.
      * Used for dates without a year.
      */
-    const DEFAULT_YEAR = 2000;
+    public const DEFAULT_YEAR = 2000;
 
     /**
      * Output format for the SUMMARY.
-     *
-     * @var string
      */
-    protected $format = '%1$s\'s Birthday';
+    protected string $format = '%1$s\'s Birthday';
 
     /**
      * Creates the generator.
      *
      * Check the setTimeRange and setObjects methods for details about the
      * arguments.
-     *
-     * @param mixed $objects
      */
     public function __construct($objects = null)
     {
@@ -53,10 +47,8 @@ class BirthdayCalendarGenerator
      *
      * You must either supply a vCard as a string or as a Component/VCard object.
      * It's also possible to supply an array of strings or objects.
-     *
-     * @param mixed $objects
      */
-    public function setObjects($objects)
+    public function setObjects($objects): void
     {
         if (!is_array($objects)) {
             $objects = [$objects];
@@ -81,20 +73,16 @@ class BirthdayCalendarGenerator
 
     /**
      * Sets the output format for the SUMMARY.
-     *
-     * @param string $format
      */
-    public function setFormat($format)
+    public function setFormat(string $format): void
     {
         $this->format = $format;
     }
 
     /**
      * Parses the input data and returns a VCALENDAR.
-     *
-     * @return Component/VCalendar
      */
-    public function getResult()
+    public function getResult(): VCalendar
     {
         $calendar = new VCalendar();
 
@@ -107,11 +95,11 @@ class BirthdayCalendarGenerator
             // We've seen clients (ez-vcard) putting "BDAY:" properties
             // without a value into vCards. If we come across those, we'll
             // skip them.
-            if (empty($object->BDAY->getValue())) {
+            if ('' === $object->BDAY->getValue()) {
                 continue;
             }
 
-            // We're always converting to vCard 4.0 so we can rely on the
+            // We're always converting to vCard 4.0, so we can rely on the
             // VCardConverter handling the X-APPLE-OMIT-YEAR property for us.
             $object = $object->convert(Document::VCARD40);
 
@@ -128,7 +116,7 @@ class BirthdayCalendarGenerator
             // Skip if we can't parse the BDAY value.
             try {
                 $dateParts = DateTimeParser::parseVCardDateTime($object->BDAY->getValue());
-            } catch (InvalidDataException $e) {
+            } catch (InvalidDataException) {
                 continue;
             }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
index 816e2cb31..386cf2c73 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Cli.php
@@ -2,7 +2,9 @@
 
 namespace Sabre\VObject;
 
-use InvalidArgumentException;
+use Sabre\VObject\Parser\Json;
+use Sabre\VObject\Parser\MimeDir;
+use Sabre\VObject\Parser\Parser;
 
 /**
  * This is the CLI interface for sabre-vobject.
@@ -15,45 +17,28 @@ class Cli
 {
     /**
      * No output.
-     *
-     * @var bool
      */
-    protected $quiet = false;
-
-    /**
-     * Help display.
-     *
-     * @var bool
-     */
-    protected $showHelp = false;
+    protected bool $quiet = false;
 
     /**
      * Whether to spit out 'mimedir' or 'json' format.
-     *
-     * @var string
      */
-    protected $format;
+    protected ?string $format = null;
 
     /**
      * JSON pretty print.
-     *
-     * @var bool
      */
-    protected $pretty;
+    protected bool $pretty = false;
 
     /**
      * Source file.
-     *
-     * @var string
      */
-    protected $inputPath;
+    protected string $inputPath;
 
     /**
      * Destination file.
-     *
-     * @var string
      */
-    protected $outputPath;
+    protected string $outputPath;
 
     /**
      * output stream.
@@ -78,24 +63,18 @@ class Cli
 
     /**
      * Input format (one of json or mimedir).
-     *
-     * @var string
      */
-    protected $inputFormat;
+    protected ?string $inputFormat = null;
 
     /**
      * Makes the parser less strict.
-     *
-     * @var bool
      */
-    protected $forgiving = false;
+    protected bool $forgiving = false;
 
     /**
      * Main function.
-     *
-     * @return int
      */
-    public function main(array $argv)
+    public function main(array $argv): int
     {
         // @codeCoverageIgnoreStart
         // We cannot easily test this, so we'll skip it. Pretty basic anyway.
@@ -113,7 +92,7 @@ class Cli
         // @codeCoverageIgnoreEnd
 
         try {
-            list($options, $positional) = $this->parseArguments($argv);
+            [$options, $positional] = $this->parseArguments($argv);
 
             if (isset($options['q'])) {
                 $this->quiet = true;
@@ -130,64 +109,27 @@ class Cli
                         $this->showHelp();
 
                         return 0;
-                        break;
                     case 'format':
-                        switch ($value) {
-                            // jcard/jcal documents
-                            case 'jcard':
-                            case 'jcal':
-                            // specific document versions
-                            case 'vcard21':
-                            case 'vcard30':
-                            case 'vcard40':
-                            case 'icalendar20':
-                            // specific formats
-                            case 'json':
-                            case 'mimedir':
-                            // icalendar/vcad
-                            case 'icalendar':
-                            case 'vcard':
-                                $this->format = $value;
-                                break;
-
-                            default:
-                                throw new InvalidArgumentException('Unknown format: '.$value);
-                        }
+                        $this->format = match ($value) {
+                            'jcard', 'jcal', 'vcard21', 'vcard30', 'vcard40', 'icalendar20', 'json', 'mimedir', 'icalendar', 'vcard' => $value,
+                            default => throw new \InvalidArgumentException('Unknown format: '.$value),
+                        };
                         break;
                     case 'pretty':
-                        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-                            $this->pretty = true;
-                        }
+                        $this->pretty = true;
                         break;
                     case 'forgiving':
                         $this->forgiving = true;
                         break;
                     case 'inputformat':
-                        switch ($value) {
-                            // json formats
-                            case 'jcard':
-                            case 'jcal':
-                            case 'json':
-                                $this->inputFormat = 'json';
-                                break;
-
-                            // mimedir formats
-                            case 'mimedir':
-                            case 'icalendar':
-                            case 'vcard':
-                            case 'vcard21':
-                            case 'vcard30':
-                            case 'vcard40':
-                            case 'icalendar20':
-                                $this->inputFormat = 'mimedir';
-                                break;
-
-                            default:
-                                throw new InvalidArgumentException('Unknown format: '.$value);
-                        }
+                        $this->inputFormat = match ($value) {
+                            'jcard', 'jcal', 'json' => 'json',
+                            'mimedir', 'icalendar', 'vcard', 'vcard21', 'vcard30', 'vcard40', 'icalendar20' => 'mimedir',
+                            default => throw new \InvalidArgumentException('Unknown format: '.$value),
+                        };
                         break;
                     default:
-                        throw new InvalidArgumentException('Unknown option: '.$name);
+                        throw new \InvalidArgumentException('Unknown option: '.$name);
                 }
             }
 
@@ -198,17 +140,17 @@ class Cli
             }
 
             if (1 === count($positional)) {
-                throw new InvalidArgumentException('Inputfile is a required argument');
+                throw new \InvalidArgumentException('Inputfile is a required argument');
             }
 
             if (count($positional) > 3) {
-                throw new InvalidArgumentException('Too many arguments');
+                throw new \InvalidArgumentException('Too many arguments');
             }
 
-            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'])) {
-                throw new InvalidArgumentException('Unknown command: '.$positional[0]);
+            if (!in_array($positional[0], ['validate', 'repair', 'convert', 'color'], true)) {
+                throw new \InvalidArgumentException('Unknown command: '.$positional[0]);
             }
-        } catch (InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             $this->showHelp();
             $this->log('Error: '.$e->getMessage(), 'red');
 
@@ -218,21 +160,21 @@ class Cli
         $command = $positional[0];
 
         $this->inputPath = $positional[1];
-        $this->outputPath = isset($positional[2]) ? $positional[2] : '-';
+        $this->outputPath = $positional[2] ?? '-';
 
         if ('-' !== $this->outputPath) {
             $this->stdout = fopen($this->outputPath, 'w');
         }
 
-        if (!$this->inputFormat) {
-            if ('.json' === substr($this->inputPath, -5)) {
+        if (null === $this->inputFormat) {
+            if (str_ends_with($this->inputPath, '.json')) {
                 $this->inputFormat = 'json';
             } else {
                 $this->inputFormat = 'mimedir';
             }
         }
-        if (!$this->format) {
-            if ('.json' === substr($this->outputPath, -5)) {
+        if (null === $this->format) {
+            if (str_ends_with($this->outputPath, '.json')) {
                 $this->format = 'json';
             } else {
                 $this->format = 'mimedir';
@@ -243,12 +185,13 @@ class Cli
 
         try {
             while ($input = $this->readInput()) {
+                // @phpstan-ignore method.dynamicName
                 $returnCode = $this->$command($input);
                 if (0 !== $returnCode) {
                     $realCode = $returnCode;
                 }
             }
-        } catch (EofException $e) {
+        } catch (EofException) {
             // end of file
         } catch (\Exception $e) {
             $this->log('Error: '.$e->getMessage(), 'red');
@@ -262,7 +205,7 @@ class Cli
     /**
      * Shows the help message.
      */
-    protected function showHelp()
+    protected function showHelp(): void
     {
         $this->log('Usage:', 'yellow');
         $this->log('  vobject [options] command [arguments]');
@@ -275,10 +218,7 @@ class Cli
         $this->log('                vcard30, vcard40, icalendar20, jcal, jcard, json, mimedir.');
         $this->log($this->colorize('green', '  --inputformat ').'If the input format cannot be guessed from the extension, it');
         $this->log('                must be specified here.');
-        // Only PHP 5.4 and up
-        if (version_compare(PHP_VERSION, '5.4.0') >= 0) {
-            $this->log($this->colorize('green', '  --pretty      ').'json pretty-print.');
-        }
+        $this->log($this->colorize('green', '  --pretty      ').'json pretty-print.');
         $this->log('');
         $this->log('Commands:', 'yellow');
         $this->log($this->colorize('green', '  validate').' source_file              Validates a file for correctness.');
@@ -286,7 +226,7 @@ class Cli
         $this->log($this->colorize('green', '  convert').' source_file [output_file] Converts a file.');
         $this->log($this->colorize('green', '  color').' source_file                 Colorize a file, useful for debugging.');
         $this->log(
-        <<<HELP
+            <<<HELP
 
 If source_file is set as '-', STDIN will be used.
 If output_file is omitted, STDOUT will be used.
@@ -306,10 +246,8 @@ HELP
 
     /**
      * Validates a VObject file.
-     *
-     * @return int
      */
-    protected function validate(Component $vObj)
+    protected function validate(Component $vObj): int
     {
         $returnCode = 0;
 
@@ -346,10 +284,8 @@ HELP
 
     /**
      * Repairs a VObject file.
-     *
-     * @return int
      */
-    protected function repair(Component $vObj)
+    protected function repair(Component $vObj): int
     {
         $returnCode = 0;
 
@@ -387,12 +323,8 @@ HELP
 
     /**
      * Converts a vObject file to a new format.
-     *
-     * @param Component $vObj
-     *
-     * @return int
      */
-    protected function convert($vObj)
+    protected function convert(Component $vObj): int
     {
         $json = false;
         $convertVersion = null;
@@ -443,7 +375,7 @@ HELP
             }
             fwrite($this->stdout, json_encode($vObj->jsonSerialize(), $jsonOptions));
         } else {
-            fwrite($this->stdout, $vObj->serialize());
+            fwrite($this->stdout, (string) $vObj->serialize());
         }
 
         return 0;
@@ -451,22 +383,18 @@ HELP
 
     /**
      * Colorizes a file.
-     *
-     * @param Component $vObj
      */
-    protected function color($vObj)
+    protected function color(Component $vObj): int
     {
-        fwrite($this->stdout, $this->serializeComponent($vObj));
+        $this->serializeComponent($vObj);
+
+        return 0;
     }
 
     /**
      * Returns an ansi color string for a color name.
-     *
-     * @param string $color
-     *
-     * @return string
      */
-    protected function colorize($color, $str, $resetTo = 'default')
+    protected function colorize(string $color, string $str, string $resetTo = 'default'): string
     {
         $colors = [
             'cyan' => '1;36',
@@ -483,16 +411,13 @@ HELP
 
     /**
      * Writes out a string in specific color.
-     *
-     * @param string $color
-     * @param string $str
      */
-    protected function cWrite($color, $str)
+    protected function cWrite(string $color, string $str): void
     {
         fwrite($this->stdout, $this->colorize($color, $str));
     }
 
-    protected function serializeComponent(Component $vObj)
+    protected function serializeComponent(Component $vObj): void
     {
         $this->cWrite('cyan', 'BEGIN');
         $this->cWrite('red', ':');
@@ -507,48 +432,40 @@ HELP
          * To avoid score collisions, each "score category" has a reasonable
          * space to accommodate elements. The $key is added to the $score to
          * preserve the original relative order of elements.
-         *
-         * @param int   $key
-         * @param array $array
-         *
-         * @return int
          */
-        $sortScore = function ($key, $array) {
+        $sortScore = function (int $key, array $array): int {
             if ($array[$key] instanceof Component) {
                 // We want to encode VTIMEZONE first, this is a personal
                 // preference.
                 if ('VTIMEZONE' === $array[$key]->name) {
                     $score = 300000000;
-
-                    return $score + $key;
                 } else {
                     $score = 400000000;
-
-                    return $score + $key;
                 }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ('VERSION' === $array[$key]->name) {
-                        $score = 100000000;
 
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-
-                        return $score + $key;
-                    }
-                }
+                return $score + $key;
             }
+            // Properties get encoded first
+            // VCARD version 4.0 wants the VERSION property to appear first
+            if ($array[$key] instanceof Property) {
+                if ('VERSION' === $array[$key]->name) {
+                    $score = 100000000;
+                } else {
+                    // All other properties
+                    $score = 200000000;
+                }
+
+                return $score + $key;
+            }
+
+            return 0;
         };
 
         $children = $vObj->children();
         $tmp = $children;
         uksort(
             $children,
-            function ($a, $b) use ($sortScore, $tmp) {
+            function ($a, $b) use ($sortScore, $tmp): int {
                 $sA = $sortScore($a, $tmp);
                 $sB = $sortScore($b, $tmp);
 
@@ -572,7 +489,7 @@ HELP
     /**
      * Colorizes a property.
      */
-    protected function serializeProperty(Property $property)
+    protected function serializeProperty(Property $property): void
     {
         if ($property->group) {
             $this->cWrite('default', $property->group);
@@ -588,7 +505,7 @@ HELP
         $this->cWrite('red', ':');
 
         if ($property instanceof Property\Binary) {
-            $this->cWrite('default', 'embedded binary stripped. ('.strlen($property->getValue()).' bytes)');
+            $this->cWrite('default', 'embedded binary stripped. ('.strlen((string) $property->getValue()).' bytes)');
         } else {
             $parts = $property->getParts();
             $first1 = true;
@@ -630,7 +547,7 @@ HELP
     /**
      * Parses the list of arguments.
      */
-    protected function parseArguments(array $argv)
+    protected function parseArguments(array $argv): array
     {
         $positional = [];
         $options = [];
@@ -643,17 +560,17 @@ HELP
 
             $v = $argv[$ii];
 
-            if ('--' === substr($v, 0, 2)) {
+            if (str_starts_with((string) $v, '--')) {
                 // This is a long-form option.
-                $optionName = substr($v, 2);
+                $optionName = substr((string) $v, 2);
                 $optionValue = true;
                 if (strpos($optionName, '=')) {
-                    list($optionName, $optionValue) = explode('=', $optionName);
+                    [$optionName, $optionValue] = explode('=', $optionName);
                 }
                 $options[$optionName] = $optionValue;
-            } elseif ('-' === substr($v, 0, 1) && strlen($v) > 1) {
+            } elseif (str_starts_with((string) $v, '-') && strlen((string) $v) > 1) {
                 // This is a short-form option.
-                foreach (str_split(substr($v, 1)) as $option) {
+                foreach (str_split(substr((string) $v, 1)) as $option) {
                     $options[$option] = true;
                 }
             } else {
@@ -664,24 +581,29 @@ HELP
         return [$options, $positional];
     }
 
-    protected $parser;
+    protected ?Parser $parser = null;
 
     /**
      * Reads the input file.
      *
-     * @return Component
+     * @throws EofException
+     * @throws ParseException
+     * @throws InvalidDataException
      */
-    protected function readInput()
+    protected function readInput(): ?Document
     {
         if (!$this->parser) {
             if ('-' !== $this->inputPath) {
                 $this->stdin = fopen($this->inputPath, 'r');
+                if (false === $this->stdin) {
+                    throw new InvalidDataException('Cannot open "'.$this->inputPath);
+                }
             }
 
             if ('mimedir' === $this->inputFormat) {
-                $this->parser = new Parser\MimeDir($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+                $this->parser = new MimeDir($this->stdin, $this->forgiving ? Reader::OPTION_FORGIVING : 0);
             } else {
-                $this->parser = new Parser\Json($this->stdin, ($this->forgiving ? Reader::OPTION_FORGIVING : 0));
+                $this->parser = new Json($this->stdin, $this->forgiving ? Reader::OPTION_FORGIVING : 0);
             }
         }
 
@@ -690,10 +612,8 @@ HELP
 
     /**
      * Sends a message to STDERR.
-     *
-     * @param string $msg
      */
-    protected function log($msg, $color = 'default')
+    protected function log(string $msg, string $color = 'default'): void
     {
         if (!$this->quiet) {
             if ('default' !== $color) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
index f33b628a7..0849c5a8e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component.php
@@ -13,6 +13,8 @@ use Sabre\Xml;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property Property\FlatText UID
  */
 class Component extends Node
 {
@@ -20,17 +22,15 @@ class Component extends Node
      * Component name.
      *
      * This will contain a string such as VEVENT, VTODO, VCALENDAR, VCARD.
-     *
-     * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * A list of properties and/or sub-components.
      *
-     * @var array
+     * @var array<string, Component|Property>
      */
-    protected $children = [];
+    protected array $children = [];
 
     /**
      * Creates a new component.
@@ -43,12 +43,11 @@ class Component extends Node
      * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
      * ensure that this does not happen, set $defaults to false.
      *
-     * @param string $name     such as VCALENDAR, VEVENT
-     * @param bool   $defaults
+     * @param string|null $name such as VCALENDAR, VEVENT
      */
-    public function __construct(Document $root, $name, array $children = [], $defaults = true)
+    public function __construct(Document $root, ?string $name, array $children = [], bool $defaults = true)
     {
-        $this->name = strtoupper($name);
+        $this->name = isset($name) ? strtoupper($name) : '';
         $this->root = $root;
 
         if ($defaults) {
@@ -97,10 +96,8 @@ class Component extends Node
      * add($name, $value, array $parameters = []) // Adds a new property
      * add($name, array $children = []) // Adds a new component
      * by name.
-     *
-     * @return Node
      */
-    public function add()
+    public function add(): Node
     {
         $arguments = func_get_args();
 
@@ -116,6 +113,7 @@ class Component extends Node
             throw new \InvalidArgumentException('The first argument must either be a \\Sabre\\VObject\\Node or a string');
         }
 
+        /** @var Component|Property|Parameter $newNode */
         $name = $newNode->name;
         if (isset($this->children[$name])) {
             $this->children[$name][] = $newNode;
@@ -136,13 +134,13 @@ class Component extends Node
      *
      * @param string|Property|Component $item
      */
-    public function remove($item)
+    public function remove($item): void
     {
         if (is_string($item)) {
-            // If there's no dot in the name, it's an exact property name and
+            // If there's no dot in the name, it's an exact property name,
             // we can just wipe out all those properties.
             //
-            if (false === strpos($item, '.')) {
+            if (!str_contains($item, '.')) {
                 unset($this->children[strtoupper($item)]);
 
                 return;
@@ -168,10 +166,8 @@ class Component extends Node
     /**
      * Returns a flat list of all the properties and components in this
      * component.
-     *
-     * @return array
      */
-    public function children()
+    public function children(): array
     {
         $result = [];
         foreach ($this->children as $childGroup) {
@@ -184,10 +180,8 @@ class Component extends Node
     /**
      * This method only returns a list of sub-components. Properties are
      * ignored.
-     *
-     * @return array
      */
-    public function getComponents()
+    public function getComponents(): array
     {
         $result = [];
 
@@ -211,37 +205,31 @@ class Component extends Node
      * search for a property in a specific group, you can select on the entire
      * string ("HOME.EMAIL"). If you want to search on a specific property that
      * has not been assigned a group, specify ".EMAIL".
-     *
-     * @param string $name
-     *
-     * @return array
      */
-    public function select($name)
+    public function select(string $name): array
     {
         $group = null;
         $name = strtoupper($name);
-        if (false !== strpos($name, '.')) {
-            list($group, $name) = explode('.', $name, 2);
+        if (str_contains($name, '.')) {
+            [$group, $name] = explode('.', $name, 2);
         }
         if ('' === $name) {
             $name = null;
         }
 
         if (!is_null($name)) {
-            $result = isset($this->children[$name]) ? $this->children[$name] : [];
+            $result = $this->children[$name] ?? [];
 
             if (is_null($group)) {
                 return $result;
-            } else {
-                // If we have a group filter as well, we need to narrow it down
-                // more.
-                return array_filter(
-                    $result,
-                    function ($child) use ($group) {
-                        return $child instanceof Property && strtoupper($child->group) === $group;
-                    }
-                );
             }
+
+            // If we have a group filter as well, we need to narrow it down
+            // more.
+            return array_filter(
+                $result,
+                fn ($child) => $child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group
+            );
         }
 
         // If we got to this point, it means there was no 'name' specified for
@@ -249,7 +237,7 @@ class Component extends Node
         $result = [];
         foreach ($this->children as $childGroup) {
             foreach ($childGroup as $child) {
-                if ($child instanceof Property && strtoupper($child->group) === $group) {
+                if ($child instanceof Property && (null !== $child->group ? strtoupper($child->group) : '') === $group) {
                     $result[] = $child;
                 }
             }
@@ -260,10 +248,8 @@ class Component extends Node
 
     /**
      * Turns the object back into a serialized blob.
-     *
-     * @return string
      */
-    public function serialize()
+    public function serialize(): string
     {
         $str = 'BEGIN:'.$this->name."\r\n";
 
@@ -282,42 +268,39 @@ class Component extends Node
          *
          * @return int
          */
-        $sortScore = function ($key, $array) {
+        $sortScore = function (int $key, array $array): ?int {
             if ($array[$key] instanceof Component) {
                 // We want to encode VTIMEZONE first, this is a personal
                 // preference.
                 if ('VTIMEZONE' === $array[$key]->name) {
                     $score = 300000000;
-
-                    return $score + $key;
                 } else {
                     $score = 400000000;
-
-                    return $score + $key;
                 }
-            } else {
-                // Properties get encoded first
-                // VCARD version 4.0 wants the VERSION property to appear first
-                if ($array[$key] instanceof Property) {
-                    if ('VERSION' === $array[$key]->name) {
-                        $score = 100000000;
 
-                        return $score + $key;
-                    } else {
-                        // All other properties
-                        $score = 200000000;
-
-                        return $score + $key;
-                    }
-                }
+                return $score + $key;
             }
+            // Properties get encoded first
+            // VCARD version 4.0 wants the VERSION property to appear first
+            if ($array[$key] instanceof Property) {
+                if ('VERSION' === $array[$key]->name) {
+                    $score = 100000000;
+                } else {
+                    // All other properties
+                    $score = 200000000;
+                }
+
+                return $score + $key;
+            }
+
+            return 0;
         };
 
         $children = $this->children();
         $tmp = $children;
         uksort(
             $children,
-            function ($a, $b) use ($sortScore, $tmp) {
+            function ($a, $b) use ($sortScore, $tmp): int {
                 $sA = $sortScore($a, $tmp);
                 $sB = $sortScore($b, $tmp);
 
@@ -336,11 +319,9 @@ class Component extends Node
     /**
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
-     *
-     * @return array
      */
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $components = [];
         $properties = [];
@@ -368,7 +349,7 @@ class Component extends Node
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $components = [];
         $properties = [];
@@ -385,7 +366,7 @@ class Component extends Node
 
         $writer->startElement(strtolower($this->name));
 
-        if (!empty($properties)) {
+        if ([] !== $properties) {
             $writer->startElement('properties');
 
             foreach ($properties as $property) {
@@ -395,7 +376,7 @@ class Component extends Node
             $writer->endElement();
         }
 
-        if (!empty($components)) {
+        if ([] !== $components) {
             $writer->startElement('components');
 
             foreach ($components as $component) {
@@ -410,10 +391,8 @@ class Component extends Node
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [];
     }
@@ -430,11 +409,9 @@ class Component extends Node
      *
      * $event = $calendar->VEVENT;
      *
-     * @param string $name
-     *
-     * @return Property|null
+     * @return Property|Component
      */
-    public function __get($name)
+    public function __get(string $name): ?Node
     {
         if ('children' === $name) {
             throw new \RuntimeException('Starting sabre/vobject 4.0 the children property is now protected. You should use the children() method instead');
@@ -442,24 +419,19 @@ class Component extends Node
 
         $matches = $this->select($name);
         if (0 === count($matches)) {
-            return;
-        } else {
-            $firstMatch = current($matches);
-            /* @var $firstMatch Property */
-            $firstMatch->setIterator(new ElementList(array_values($matches)));
-
-            return $firstMatch;
+            return null;
         }
+        $firstMatch = current($matches);
+        /* @var $firstMatch Property */
+        $firstMatch->setIterator(new ElementList(array_values($matches)));
+
+        return $firstMatch;
     }
 
     /**
      * This method checks if a sub-element with the specified name exists.
-     *
-     * @param string $name
-     *
-     * @return bool
      */
-    public function __isset($name)
+    public function __isset(string $name): bool
     {
         $matches = $this->select($name);
 
@@ -474,11 +446,8 @@ class Component extends Node
      *
      * If the item already exists, it will be removed. If you want to add
      * a new item with the same name, always use the add() method.
-     *
-     * @param string $name
-     * @param mixed  $value
      */
-    public function __set($name, $value)
+    public function __set(string $name, $value): void
     {
         $name = strtoupper($name);
         $this->remove($name);
@@ -492,10 +461,8 @@ class Component extends Node
     /**
      * Removes all properties and components within this component with the
      * specified name.
-     *
-     * @param string $name
      */
-    public function __unset($name)
+    public function __unset(string $name): void
     {
         $this->remove($name);
     }
@@ -536,10 +503,8 @@ class Component extends Node
      *
      * See the VEVENT implementation for getValidationRules for a more complex
      * example.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [];
     }
@@ -563,12 +528,8 @@ class Component extends Node
      *   1 - The issue was repaired (only happens if REPAIR was turned on).
      *   2 - A warning.
      *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $rules = $this->getValidationRules();
         $defaults = $this->getDefaults();
@@ -578,7 +539,7 @@ class Component extends Node
         $messages = [];
 
         foreach ($this->children() as $child) {
-            $name = strtoupper($child->name);
+            $name = strtoupper((string) $child->name);
             if (!isset($propertyCounters[$name])) {
                 $propertyCounters[$name] = 1;
             } else {
@@ -659,7 +620,7 @@ class Component extends Node
      * It's intended to remove all circular references, so PHP can easily clean
      * it up.
      */
-    public function destroy()
+    public function destroy(): void
     {
         parent::destroy();
         foreach ($this->children as $childGroup) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/Available.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/Available.php
index 5510b9e0a..b3ba40b07 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/Available.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/Available.php
@@ -13,6 +13,10 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Ivan Enderlin
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
+ * @property VObject\Property\ICalendar\DateTime DTEND
+ * @property VObject\Property\ICalendar\Duration DURATION
  */
 class Available extends VObject\Component
 {
@@ -26,9 +30,9 @@ class Available extends VObject\Component
      * If either the start or end is 'unbounded' its value will be null
      * instead.
      *
-     * @return array
+     * @throws VObject\InvalidDataException
      */
-    public function getEffectiveStartEnd()
+    public function getEffectiveStartEnd(): array
     {
         $effectiveStart = $this->DTSTART->getDateTime();
         if (isset($this->DTEND)) {
@@ -52,10 +56,8 @@ class Available extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'UID' => 1,
@@ -101,12 +103,8 @@ class Available extends VObject\Component
      *   1 - The issue was repaired (only happens if REPAIR was turned on).
      *   2 - A warning.
      *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $result = parent::validate($options);
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
index bd00eb600..47474dfbf 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAlarm.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeImmutable;
-use DateTimeInterface;
 use Sabre\VObject;
 use Sabre\VObject\InvalidDataException;
 
@@ -15,6 +13,12 @@ use Sabre\VObject\InvalidDataException;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
+ * @property VObject\Property\ICalendar\DateTime DTEND
+ * @property VObject\Property\ICalendar\Duration DURATION
+ * @property VObject\Property\ICalendar\Duration|VObject\Property\ICalendar\DateTime TRIGGER
+ * @property VObject\Property\IntegerValue REPEAT
  */
 class VAlarm extends VObject\Component
 {
@@ -23,25 +27,19 @@ class VAlarm extends VObject\Component
      *
      * This ignores repeated alarm, only the first trigger is returned.
      *
-     * @return DateTimeImmutable
+     * @throws InvalidDataException
      */
-    public function getEffectiveTriggerTime()
+    public function getEffectiveTriggerTime(): \DateTimeImmutable
     {
         $trigger = $this->TRIGGER;
-        if (!isset($trigger['VALUE']) || 'DURATION' === strtoupper($trigger['VALUE'])) {
+        if (!isset($trigger['VALUE']) || ($trigger['VALUE'] && 'DURATION' === strtoupper((string) $trigger['VALUE']))) {
             $triggerDuration = VObject\DateTimeParser::parseDuration($this->TRIGGER);
-            $related = (isset($trigger['RELATED']) && 'END' == strtoupper($trigger['RELATED'])) ? 'END' : 'START';
+            $related = (isset($trigger['RELATED']) && 'END' === strtoupper($trigger['RELATED'])) ? 'END' : 'START';
 
+            /** @var VEvent|VTodo $parentComponent */
             $parentComponent = $this->parent;
             if ('START' === $related) {
-                if ('VTODO' === $parentComponent->name) {
-                    $propName = 'DUE';
-                } else {
-                    $propName = 'DTSTART';
-                }
-
-                $effectiveTrigger = $parentComponent->$propName->getDateTime();
-                $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
+                $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
             } else {
                 if ('VTODO' === $parentComponent->name) {
                     $endProp = 'DUE';
@@ -53,17 +51,15 @@ class VAlarm extends VObject\Component
 
                 if (isset($parentComponent->$endProp)) {
                     $effectiveTrigger = $parentComponent->$endProp->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
                 } elseif (isset($parentComponent->DURATION)) {
                     $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
                     $duration = VObject\DateTimeParser::parseDuration($parentComponent->DURATION);
                     $effectiveTrigger = $effectiveTrigger->add($duration);
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
                 } else {
                     $effectiveTrigger = $parentComponent->DTSTART->getDateTime();
-                    $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
                 }
             }
+            $effectiveTrigger = $effectiveTrigger->add($triggerDuration);
         } else {
             $effectiveTrigger = $trigger->getDateTime();
         }
@@ -78,12 +74,9 @@ class VAlarm extends VObject\Component
      * The rules used to determine if an event falls within the specified
      * time-range is based on the CalDAV specification.
      *
-     * @param DateTime $start
-     * @param DateTime $end
-     *
-     * @return bool
+     * @throws InvalidDataException
      */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+    public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
         $effectiveTrigger = $this->getEffectiveTriggerTime();
 
@@ -103,9 +96,9 @@ class VAlarm extends VObject\Component
             }
 
             return false;
-        } else {
-            return $start <= $effectiveTrigger && $end > $effectiveTrigger;
         }
+
+        return $start <= $effectiveTrigger && $end > $effectiveTrigger;
     }
 
     /**
@@ -120,10 +113,8 @@ class VAlarm extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'ACTION' => 1,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
index 04ec38dcb..a4db47642 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VAvailability.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
 use Sabre\VObject;
 
 /**
@@ -14,6 +13,10 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Ivan Enderlin
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
+ * @property VObject\Property\ICalendar\DateTime DTEND
+ * @property VObject\Property\ICalendar\Duration DURATION
  */
 class VAvailability extends VObject\Component
 {
@@ -26,15 +29,15 @@ class VAvailability extends VObject\Component
      *
      * https://tools.ietf.org/html/draft-daboo-calendar-availability-05#section-3.1
      *
-     * @return bool
+     * @throws VObject\InvalidDataException
      */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+    public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
-        list($effectiveStart, $effectiveEnd) = $this->getEffectiveStartEnd();
+        [$effectiveStart, $effectiveEnd] = $this->getEffectiveStartEnd();
 
         return
-            (is_null($effectiveStart) || $start < $effectiveEnd) &&
-            (is_null($effectiveEnd) || $end > $effectiveStart)
+            (is_null($effectiveStart) || $start < $effectiveEnd)
+            && (is_null($effectiveEnd) || $end > $effectiveStart)
         ;
     }
 
@@ -48,9 +51,9 @@ class VAvailability extends VObject\Component
      * If either the start or end is 'unbounded' its value will be null
      * instead.
      *
-     * @return array
+     * @throws VObject\InvalidDataException
      */
-    public function getEffectiveStartEnd()
+    public function getEffectiveStartEnd(): array
     {
         $effectiveStart = null;
         $effectiveEnd = null;
@@ -79,10 +82,8 @@ class VAvailability extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'UID' => 1,
@@ -127,12 +128,8 @@ class VAvailability extends VObject\Component
      *   1 - The issue was repaired (only happens if REPAIR was turned on).
      *   2 - A warning.
      *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $result = parent::validate($options);
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
index 4db318135..879fcee29 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCalendar.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
-use DateTimeZone;
 use Sabre\VObject;
 use Sabre\VObject\Component;
 use Sabre\VObject\InvalidDataException;
@@ -19,6 +17,11 @@ use Sabre\VObject\Recur\NoInstancesException;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VEvent VEVENT
+ * @property VJournal VJOURNAL
+ * @property Property\Text ORG
+ * @property Property\FlatText METHOD
  */
 class VCalendar extends VObject\Document
 {
@@ -26,17 +29,13 @@ class VCalendar extends VObject\Document
      * The default name for this component.
      *
      * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
      */
-    public static $defaultName = 'VCALENDAR';
+    public static ?string $defaultName = 'VCALENDAR';
 
     /**
      * This is a list of components, and which classes they should map to.
-     *
-     * @var array
      */
-    public static $componentMap = [
+    public static array $componentMap = [
         'VCALENDAR' => self::class,
         'VALARM' => VAlarm::class,
         'VEVENT' => VEvent::class,
@@ -50,114 +49,112 @@ class VCalendar extends VObject\Document
 
     /**
      * List of value-types, and which classes they map to.
-     *
-     * @var array
      */
-    public static $valueMap = [
-        'BINARY' => VObject\Property\Binary::class,
-        'BOOLEAN' => VObject\Property\Boolean::class,
-        'CAL-ADDRESS' => VObject\Property\ICalendar\CalAddress::class,
-        'DATE' => VObject\Property\ICalendar\Date::class,
-        'DATE-TIME' => VObject\Property\ICalendar\DateTime::class,
-        'DURATION' => VObject\Property\ICalendar\Duration::class,
-        'FLOAT' => VObject\Property\FloatValue::class,
-        'INTEGER' => VObject\Property\IntegerValue::class,
-        'PERIOD' => VObject\Property\ICalendar\Period::class,
-        'RECUR' => VObject\Property\ICalendar\Recur::class,
-        'TEXT' => VObject\Property\Text::class,
-        'TIME' => VObject\Property\Time::class,
-        'UNKNOWN' => VObject\Property\Unknown::class, // jCard / jCal-only.
-        'URI' => VObject\Property\Uri::class,
-        'UTC-OFFSET' => VObject\Property\UtcOffset::class,
+    public static array $valueMap = [
+        'BINARY' => Property\Binary::class,
+        'BOOLEAN' => Property\Boolean::class,
+        'CAL-ADDRESS' => Property\ICalendar\CalAddress::class,
+        'DATE' => Property\ICalendar\Date::class,
+        'DATE-TIME' => Property\ICalendar\DateTime::class,
+        'DURATION' => Property\ICalendar\Duration::class,
+        'FLOAT' => Property\FloatValue::class,
+        'INTEGER' => Property\IntegerValue::class,
+        'PERIOD' => Property\ICalendar\Period::class,
+        'RECUR' => Property\ICalendar\Recur::class,
+        'TEXT' => Property\Text::class,
+        'TIME' => Property\Time::class,
+        'UNKNOWN' => Property\Unknown::class, // jCard / jCal-only.
+        'URI' => Property\Uri::class,
+        'UTC-OFFSET' => Property\UtcOffset::class,
     ];
 
     /**
      * List of properties, and which classes they map to.
-     *
-     * @var array
      */
-    public static $propertyMap = [
+    public static array $propertyMap = [
         // Calendar properties
-        'CALSCALE' => VObject\Property\FlatText::class,
-        'METHOD' => VObject\Property\FlatText::class,
-        'PRODID' => VObject\Property\FlatText::class,
-        'VERSION' => VObject\Property\FlatText::class,
+        'CALSCALE' => Property\FlatText::class,
+        'METHOD' => Property\FlatText::class,
+        'PRODID' => Property\FlatText::class,
+        'VERSION' => Property\FlatText::class,
 
         // Component properties
-        'ATTACH' => VObject\Property\Uri::class,
-        'CATEGORIES' => VObject\Property\Text::class,
-        'CLASS' => VObject\Property\FlatText::class,
-        'COMMENT' => VObject\Property\FlatText::class,
-        'DESCRIPTION' => VObject\Property\FlatText::class,
-        'GEO' => VObject\Property\FloatValue::class,
-        'LOCATION' => VObject\Property\FlatText::class,
-        'PERCENT-COMPLETE' => VObject\Property\IntegerValue::class,
-        'PRIORITY' => VObject\Property\IntegerValue::class,
-        'RESOURCES' => VObject\Property\Text::class,
-        'STATUS' => VObject\Property\FlatText::class,
-        'SUMMARY' => VObject\Property\FlatText::class,
+        'ATTACH' => Property\Uri::class,
+        'CATEGORIES' => Property\Text::class,
+        'CLASS' => Property\FlatText::class,
+        'COMMENT' => Property\FlatText::class,
+        'DESCRIPTION' => Property\FlatText::class,
+        'GEO' => Property\FloatValue::class,
+        'LOCATION' => Property\FlatText::class,
+        'PERCENT-COMPLETE' => Property\IntegerValue::class,
+        'PRIORITY' => Property\IntegerValue::class,
+        'RESOURCES' => Property\Text::class,
+        'STATUS' => Property\FlatText::class,
+        'SUMMARY' => Property\FlatText::class,
 
         // Date and Time Component Properties
-        'COMPLETED' => VObject\Property\ICalendar\DateTime::class,
-        'DTEND' => VObject\Property\ICalendar\DateTime::class,
-        'DUE' => VObject\Property\ICalendar\DateTime::class,
-        'DTSTART' => VObject\Property\ICalendar\DateTime::class,
-        'DURATION' => VObject\Property\ICalendar\Duration::class,
-        'FREEBUSY' => VObject\Property\ICalendar\Period::class,
-        'TRANSP' => VObject\Property\FlatText::class,
+        'COMPLETED' => Property\ICalendar\DateTime::class,
+        'DTEND' => Property\ICalendar\DateTime::class,
+        'DUE' => Property\ICalendar\DateTime::class,
+        'DTSTART' => Property\ICalendar\DateTime::class,
+        'DURATION' => Property\ICalendar\Duration::class,
+        'FREEBUSY' => Property\ICalendar\Period::class,
+        'TRANSP' => Property\FlatText::class,
 
         // Time Zone Component Properties
-        'TZID' => VObject\Property\FlatText::class,
-        'TZNAME' => VObject\Property\FlatText::class,
-        'TZOFFSETFROM' => VObject\Property\UtcOffset::class,
-        'TZOFFSETTO' => VObject\Property\UtcOffset::class,
-        'TZURL' => VObject\Property\Uri::class,
+        'TZID' => Property\FlatText::class,
+        'TZNAME' => Property\FlatText::class,
+        'TZOFFSETFROM' => Property\UtcOffset::class,
+        'TZOFFSETTO' => Property\UtcOffset::class,
+        'TZURL' => Property\Uri::class,
 
         // Relationship Component Properties
-        'ATTENDEE' => VObject\Property\ICalendar\CalAddress::class,
-        'CONTACT' => VObject\Property\FlatText::class,
-        'ORGANIZER' => VObject\Property\ICalendar\CalAddress::class,
-        'RECURRENCE-ID' => VObject\Property\ICalendar\DateTime::class,
-        'RELATED-TO' => VObject\Property\FlatText::class,
-        'URL' => VObject\Property\Uri::class,
-        'UID' => VObject\Property\FlatText::class,
+        'ATTENDEE' => Property\ICalendar\CalAddress::class,
+        'CONTACT' => Property\FlatText::class,
+        'ORGANIZER' => Property\ICalendar\CalAddress::class,
+        'RECURRENCE-ID' => Property\ICalendar\DateTime::class,
+        'RELATED-TO' => Property\FlatText::class,
+        'URL' => Property\Uri::class,
+        'UID' => Property\FlatText::class,
 
         // Recurrence Component Properties
-        'EXDATE' => VObject\Property\ICalendar\DateTime::class,
-        'RDATE' => VObject\Property\ICalendar\DateTime::class,
-        'RRULE' => VObject\Property\ICalendar\Recur::class,
-        'EXRULE' => VObject\Property\ICalendar\Recur::class, // Deprecated since rfc5545
+        'EXDATE' => Property\ICalendar\DateTime::class,
+        'RDATE' => Property\ICalendar\DateTime::class,
+        'RRULE' => Property\ICalendar\Recur::class,
+        'EXRULE' => Property\ICalendar\Recur::class, // Deprecated since rfc5545
 
         // Alarm Component Properties
-        'ACTION' => VObject\Property\FlatText::class,
-        'REPEAT' => VObject\Property\IntegerValue::class,
-        'TRIGGER' => VObject\Property\ICalendar\Duration::class,
+        'ACTION' => Property\FlatText::class,
+        'REPEAT' => Property\IntegerValue::class,
+        'TRIGGER' => Property\ICalendar\Duration::class,
 
         // Change Management Component Properties
-        'CREATED' => VObject\Property\ICalendar\DateTime::class,
-        'DTSTAMP' => VObject\Property\ICalendar\DateTime::class,
-        'LAST-MODIFIED' => VObject\Property\ICalendar\DateTime::class,
-        'SEQUENCE' => VObject\Property\IntegerValue::class,
+        'CREATED' => Property\ICalendar\DateTime::class,
+        'DTSTAMP' => Property\ICalendar\DateTime::class,
+        'LAST-MODIFIED' => Property\ICalendar\DateTime::class,
+        'SEQUENCE' => Property\IntegerValue::class,
 
         // Request Status
-        'REQUEST-STATUS' => VObject\Property\Text::class,
+        'REQUEST-STATUS' => Property\Text::class,
 
         // Additions from draft-daboo-valarm-extensions-04
-        'ALARM-AGENT' => VObject\Property\Text::class,
-        'ACKNOWLEDGED' => VObject\Property\ICalendar\DateTime::class,
-        'PROXIMITY' => VObject\Property\Text::class,
-        'DEFAULT-ALARM' => VObject\Property\Boolean::class,
+        'ALARM-AGENT' => Property\Text::class,
+        'ACKNOWLEDGED' => Property\ICalendar\DateTime::class,
+        'PROXIMITY' => Property\Text::class,
+        'DEFAULT-ALARM' => Property\Boolean::class,
 
         // Additions from draft-daboo-calendar-availability-05
-        'BUSYTYPE' => VObject\Property\Text::class,
+        'BUSYTYPE' => Property\Text::class,
+
+        // RFC 7986 properties
+        'NAME' => Property\FlatText::class,
+        'COLOR' => Property\FlatText::class,
     ];
 
     /**
      * Returns the current document type.
-     *
-     * @return int
      */
-    public function getDocumentType()
+    public function getDocumentType(): int
     {
         return self::ICALENDAR20;
     }
@@ -169,14 +166,14 @@ class VCalendar extends VObject\Document
      *
      * VTIMEZONE components will always be excluded.
      *
-     * @param string $componentName filter by component name
+     * @param string|null $componentName filter by component name
      *
-     * @return VObject\Component[]
+     * @return Component[]
      */
-    public function getBaseComponents($componentName = null)
+    public function getBaseComponents(?string $componentName = null): array
     {
-        $isBaseComponent = function ($component) {
-            if (!$component instanceof VObject\Component) {
+        $isBaseComponent = function ($component): bool {
+            if (!$component instanceof Component) {
                 return false;
             }
             if ('VTIMEZONE' === $component->name) {
@@ -220,14 +217,12 @@ class VCalendar extends VObject\Document
      *
      * If there is no such component, null will be returned.
      *
-     * @param string $componentName filter by component name
-     *
-     * @return VObject\Component|null
+     * @param string|null $componentName filter by component name
      */
-    public function getBaseComponent($componentName = null)
+    public function getBaseComponent(?string $componentName = null): ?Component
     {
-        $isBaseComponent = function ($component) {
-            if (!$component instanceof VObject\Component) {
+        $isBaseComponent = function ($component): bool {
+            if (!$component instanceof Component) {
                 return false;
             }
             if ('VTIMEZONE' === $component->name) {
@@ -270,34 +265,35 @@ class VCalendar extends VObject\Document
      * can be used to expand the event into multiple sub-events.
      *
      * Each event will be stripped from its recurrence information, and only
-     * the instances of the event in the specified timerange will be left
+     * the instances of the event in the specified time range will be left
      * alone.
      *
      * In addition, this method will cause timezone information to be stripped,
      * and normalized to UTC.
      *
-     * @param DateTimeZone $timeZone reference timezone for floating dates and
-     *                               times
+     * @param \DateTimeZone|null $timeZone reference timezone for floating dates and
+     *                                     times
      *
-     * @return VCalendar
+     * @throws InvalidDataException
+     * @throws VObject\Recur\MaxInstancesExceededException
      */
-    public function expand(DateTimeInterface $start, DateTimeInterface $end, DateTimeZone $timeZone = null)
+    public function expand(\DateTimeInterface $start, \DateTimeInterface $end, ?\DateTimeZone $timeZone = null): VCalendar
     {
         $newChildren = [];
         $recurringEvents = [];
 
         if (!$timeZone) {
-            $timeZone = new DateTimeZone('UTC');
+            $timeZone = new \DateTimeZone('UTC');
         }
 
-        $stripTimezones = function (Component $component) use ($timeZone, &$stripTimezones) {
+        $stripTimezones = function (Component $component) use ($timeZone, &$stripTimezones): Component {
             foreach ($component->children() as $componentChild) {
                 if ($componentChild instanceof Property\ICalendar\DateTime && $componentChild->hasTime()) {
                     $dt = $componentChild->getDateTimes($timeZone);
                     // We only need to update the first timezone, because
                     // setDateTimes will match all other timezones to the
                     // first.
-                    $dt[0] = $dt[0]->setTimeZone(new DateTimeZone('UTC'));
+                    $dt[0] = $dt[0]->setTimeZone(new \DateTimeZone('UTC'));
                     $componentChild->setDateTimes($dt);
                 } elseif ($componentChild instanceof Component) {
                     $stripTimezones($componentChild);
@@ -335,7 +331,7 @@ class VCalendar extends VObject\Document
         foreach ($recurringEvents as $events) {
             try {
                 $it = new EventIterator($events, null, $timeZone);
-            } catch (NoInstancesException $e) {
+            } catch (NoInstancesException) {
                 // This event is recurring, but it doesn't have a single
                 // instance. We are skipping this event from the output
                 // entirely.
@@ -356,10 +352,8 @@ class VCalendar extends VObject\Document
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [
             'VERSION' => '2.0',
@@ -380,10 +374,8 @@ class VCalendar extends VObject\Document
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'PRODID' => 1,
@@ -391,6 +383,18 @@ class VCalendar extends VObject\Document
 
             'CALSCALE' => '?',
             'METHOD' => '?',
+
+            // RFC 7986 calendar properties
+            'UID' => '?',
+            'LAST-MODIFIED' => '?',
+            'URL' => '?',
+            'REFRESH-INTERVAL' => '?',
+            'SOURCE' => '?',
+            'COLOR' => '?',
+            'NAME' => '*',
+            'DESCRIPTION' => '*',
+            'CATEGORIES' => '*',
+            'IMAGE' => '*',
         ];
     }
 
@@ -413,12 +417,8 @@ class VCalendar extends VObject\Document
      *   1 - The issue was repaired (only happens if REPAIR was turned on).
      *   2 - A warning.
      *   3 - An error.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $warnings = parent::validate($options);
 
@@ -440,7 +440,7 @@ class VCalendar extends VObject\Document
             if ($child instanceof Component) {
                 ++$componentsFound;
 
-                if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'])) {
+                if (!in_array($child->name, ['VEVENT', 'VTODO', 'VJOURNAL'], true)) {
                     continue;
                 }
                 $componentTypes[] = $child->name;
@@ -511,10 +511,8 @@ class VCalendar extends VObject\Document
 
     /**
      * Returns all components with a specific UID value.
-     *
-     * @return array
      */
-    public function getByUID($uid)
+    public function getByUID($uid): array
     {
         return array_filter($this->getComponents(), function ($item) use ($uid) {
             if (!$itemUid = $item->select('UID')) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
index eac789842..62223aaeb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VCard.php
@@ -14,6 +14,10 @@ use Sabre\Xml;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\FlatText FN
+ * @property VObject\Property\Text ORG
+ * @property VObject\Property\FlatText EMAIL
  */
 class VCard extends VObject\Document
 {
@@ -21,33 +25,25 @@ class VCard extends VObject\Document
      * The default name for this component.
      *
      * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
      */
-    public static $defaultName = 'VCARD';
+    public static ?string $defaultName = 'VCARD';
 
     /**
      * Caching the version number.
-     *
-     * @var int
      */
-    private $version = null;
+    private ?int $version = null;
 
     /**
      * This is a list of components, and which classes they should map to.
-     *
-     * @var array
      */
-    public static $componentMap = [
+    public static array $componentMap = [
         'VCARD' => VCard::class,
     ];
 
     /**
      * List of value-types, and which classes they map to.
-     *
-     * @var array
      */
-    public static $valueMap = [
+    public static array $valueMap = [
         'BINARY' => VObject\Property\Binary::class,
         'BOOLEAN' => VObject\Property\Boolean::class,
         'CONTENT-ID' => VObject\Property\FlatText::class,   // vCard 2.1 only
@@ -69,10 +65,8 @@ class VCard extends VObject\Document
 
     /**
      * List of properties, and which classes they map to.
-     *
-     * @var array
      */
-    public static $propertyMap = [
+    public static array $propertyMap = [
         // vCard 2.1 properties and up
         'N' => VObject\Property\Text::class,
         'FN' => VObject\Property\FlatText::class,
@@ -88,7 +82,7 @@ class VCard extends VObject\Document
         'ROLE' => VObject\Property\FlatText::class,
         'LOGO' => VObject\Property\Binary::class,
         // 'AGENT'   => 'Sabre\\VObject\\Property\\',      // Todo: is an embedded vCard. Probably rare, so
-                                 // not supported at the moment
+        // not supported at the moment
         'ORG' => VObject\Property\Text::class,
         'NOTE' => VObject\Property\FlatText::class,
         'REV' => VObject\Property\VCard\TimeStamp::class,
@@ -136,14 +130,21 @@ class VCard extends VObject\Document
         'HOBBY' => VObject\Property\FlatText::class,
         'INTEREST' => VObject\Property\FlatText::class,
         'ORG-DIRECTORY' => VObject\Property\FlatText::class,
+
+        'X-CRYPTO' => VObject\Property\XCrypto::class,
+
+        // rfc9554 properties
+        'CREATED' => VObject\Property\VCard\TimeStamp::class,
+        'GRAMGENDER' => VObject\Property\FlatText::class,
+        'LANGUAGE' => VObject\Property\VCard\LanguageTag::class,
+        'PRONOUNS' => VObject\Property\FlatText::class,
+        'SOCIALPROFILE' => VObject\Property\Uri::class,
     ];
 
     /**
      * Returns the current document type.
-     *
-     * @return int
      */
-    public function getDocumentType()
+    public function getDocumentType(): int
     {
         if (!$this->version) {
             $version = (string) $this->VERSION;
@@ -178,11 +179,9 @@ class VCard extends VObject\Document
      *
      * If input and output version are identical, a clone is returned.
      *
-     * @param int $target
-     *
-     * @return VCard
+     * @throws VObject\InvalidDataException
      */
-    public function convert($target)
+    public function convert(int $target): VCard
     {
         $converter = new VObject\VCardConverter();
 
@@ -194,7 +193,7 @@ class VCard extends VObject\Document
      *
      * If the VCARD doesn't know its version, 2.1 is assumed.
      */
-    const DEFAULT_VERSION = self::VCARD21;
+    public const DEFAULT_VERSION = self::VCARD21;
 
     /**
      * Validates the node for correctness.
@@ -213,12 +212,8 @@ class VCard extends VObject\Document
      *   1 - The issue was repaired (only happens if REPAIR was turned on)
      *   2 - An inconsequential issue
      *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $warnings = [];
 
@@ -291,6 +286,11 @@ class VCard extends VObject\Document
                     $this->FN = (string) $this->ORG;
                     $repaired = true;
 
+                // Otherwise, the NICKNAME property may work
+                } elseif (isset($this->NICKNAME)) {
+                    $this->FN = (string) $this->NICKNAME;
+                    $repaired = true;
+
                 // Otherwise, the EMAIL property may work
                 } elseif (isset($this->EMAIL)) {
                     $this->FN = (string) $this->EMAIL;
@@ -322,10 +322,8 @@ class VCard extends VObject\Document
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'ADR' => '*',
@@ -335,6 +333,11 @@ class VCard extends VObject\Document
             'CALURI' => '*',
             'CATEGORIES' => '*',
             'CLIENTPIDMAP' => '*',
+            'CREATED' => '?',
+            'GRAMGENDER' => '*',
+            'LANGUAGE' => '?',
+            'PRONOUNS' => '*',
+            'SOCIALPROFILE' => '*',
             'EMAIL' => '*',
             'FBURL' => '*',
             'IMPP' => '*',
@@ -379,12 +382,8 @@ class VCard extends VObject\Document
      *
      * If neither of those parameters are specified, the first is returned, if
      * a field with that name does not exist, null is returned.
-     *
-     * @param string $fieldName
-     *
-     * @return VObject\Property|null
      */
-    public function preferred($propertyName)
+    public function preferred(string $propertyName): ?VObject\Property
     {
         $preferred = null;
         $lastPref = 101;
@@ -411,26 +410,51 @@ class VCard extends VObject\Document
      * This function will return null if the property does not exist. If there are
      * multiple properties with the same TYPE value, only one will be returned.
      *
-     * @param string $propertyName
-     * @param string $type
-     *
-     * @return VObject\Property|null
+     * @return \ArrayAccess|array|null
      */
-    public function getByType($propertyName, $type)
+    public function getByType(string $propertyName, string $type)
     {
         foreach ($this->select($propertyName) as $field) {
             if (isset($field['TYPE']) && $field['TYPE']->has($type)) {
                 return $field;
             }
         }
+
+        return null;
+    }
+
+    /**
+     * Returns a property with a specific TYPE value (ADR, TEL, or EMAIL).
+     *
+     * This function will return null if the exact property list does not exist.
+     *
+     * For example to get the property of `TEL;TYPE=HOME,CELL`
+     * you would call `getByTypes('TEL', ['HOME', 'CELL'])`
+     *
+     * @param string[] $types
+     *
+     * @return \ArrayAccess|array|null
+     */
+    public function getByTypes(string $propertyName, array $types)
+    {
+        $types = array_map(strtolower(...), $types);
+        foreach ($this->select($propertyName) as $field) {
+            if (isset($field['TYPE'])) {
+                $parts = array_map(strtolower(...), $field['TYPE']->getParts());
+
+                if (!array_diff($types, $parts) && !array_diff($parts, $types)) {
+                    return $field;
+                }
+            }
+        }
+
+        return null;
     }
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [
             'VERSION' => '4.0',
@@ -442,11 +466,9 @@ class VCard extends VObject\Document
     /**
      * This method returns an array, with the representation as it should be
      * encoded in json. This is used to create jCard or jCal documents.
-     *
-     * @return array
      */
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         // A vcard does not have sub-components, so we're overriding this
         // method to remove that array element.
@@ -465,19 +487,15 @@ class VCard extends VObject\Document
     /**
      * This method serializes the data into XML. This is used to create xCard or
      * xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $propertiesByGroup = [];
 
         foreach ($this->children() as $property) {
-            $group = $property->group;
+            $group = $property->group ?? '';
 
-            if (!isset($propertiesByGroup[$group])) {
-                $propertiesByGroup[$group] = [];
-            }
+            $propertiesByGroup[$group] ??= [];
 
             $propertiesByGroup[$group][] = $property;
         }
@@ -485,9 +503,9 @@ class VCard extends VObject\Document
         $writer->startElement(strtolower($this->name));
 
         foreach ($propertiesByGroup as $group => $properties) {
-            if (!empty($group)) {
+            if ('' !== $group) {
                 $writer->startElement('group');
-                $writer->writeAttribute('name', strtolower($group));
+                $writer->writeAttribute('name', strtolower((string) $group));
             }
 
             foreach ($properties as $property) {
@@ -507,7 +525,7 @@ class VCard extends VObject\Document
                 }
             }
 
-            if (!empty($group)) {
+            if ('' !== $group) {
                 $writer->endElement();
             }
         }
@@ -517,17 +535,13 @@ class VCard extends VObject\Document
 
     /**
      * Returns the default class for a property name.
-     *
-     * @param string $propertyName
-     *
-     * @return string
      */
-    public function getClassNameForPropertyName($propertyName)
+    public function getClassNameForPropertyName(string $propertyName): string
     {
         $className = parent::getClassNameForPropertyName($propertyName);
 
         // In vCard 4, BINARY no longer exists, and we need URI instead.
-        if (VObject\Property\Binary::class == $className && self::VCARD40 === $this->getDocumentType()) {
+        if (VObject\Property\Binary::class === $className && self::VCARD40 === $this->getDocumentType()) {
             return VObject\Property\Uri::class;
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
index 6ea93ed5e..b1a762690 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VEvent.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
 use Sabre\VObject;
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\VObject\Recur\NoInstancesException;
@@ -15,6 +14,18 @@ use Sabre\VObject\Recur\NoInstancesException;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
+ * @property VObject\Property\ICalendar\DateTime DTEND
+ * @property VObject\Property\ICalendar\DateTime DTSTAMP
+ * @property VObject\Property\ICalendar\Duration DURATION
+ * @property VObject\Property\ICalendar\Recur RRULE
+ * @property VObject\Property\ICalendar\DateTime[] EXDATE
+ * @property VObject\Property\ICalendar\DateTime RDATE
+ * @property VObject\Property\ICalendar\Recur EXRULE
+ * @property VObject\Property\ICalendar\DateTime RECURRENCE-ID
+ * @property VObject\Property\FlatText TRANSP
+ * @property VObject\Property\FlatText STATUS
  */
 class VEvent extends VObject\Component
 {
@@ -25,14 +36,15 @@ class VEvent extends VObject\Component
      * The rules used to determine if an event falls within the specified
      * time-range is based on the CalDAV specification.
      *
-     * @return bool
+     * @throws VObject\InvalidDataException
+     * @throws VObject\Recur\MaxInstancesExceededException
      */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+    public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
-        if ($this->RRULE) {
+        if ($this->RRULE || $this->RDATE) {
             try {
                 $it = new EventIterator($this, null, $start->getTimezone());
-            } catch (NoInstancesException $e) {
+            } catch (NoInstancesException) {
                 // If we've caught this exception, there are no instances
                 // for the event that fall into the specified time-range.
                 return false;
@@ -44,14 +56,14 @@ class VEvent extends VObject\Component
             // recurrence instance exceeded the start of the requested
             // time-range.
             //
-            // If the starttime of the recurrence did not exceed the
+            // If the start time of the recurrence did not exceed the
             // end of the time range as well, we have a match.
             return $it->getDTStart() < $end && $it->getDTEnd() > $start;
         }
 
         $effectiveStart = $this->DTSTART->getDateTime($start->getTimezone());
         if (isset($this->DTEND)) {
-            // The DTEND property is considered non inclusive. So for a 3 day
+            // The DTEND property is considered non-inclusive. So for a 3-day
             // event in july, dtstart and dtend would have to be July 1st and
             // July 4th respectively.
             //
@@ -73,10 +85,8 @@ class VEvent extends VObject\Component
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [
             'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
@@ -96,10 +106,8 @@ class VEvent extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         $hasMethod = isset($this->parent->METHOD);
 
@@ -109,6 +117,7 @@ class VEvent extends VObject\Component
             'DTSTART' => $hasMethod ? '?' : '1',
             'CLASS' => '?',
             'CREATED' => '?',
+            'COLOR' => '?',
             'DESCRIPTION' => '?',
             'GEO' => '?',
             'LAST-MODIFIED' => '?',
@@ -129,7 +138,9 @@ class VEvent extends VObject\Component
             'ATTENDEE' => '*',
             'CATEGORIES' => '*',
             'COMMENT' => '*',
+            'CONFERENCE' => '*',
             'CONTACT' => '*',
+            'IMAGE' => '*',
             'EXDATE' => '*',
             'REQUEST-STATUS' => '*',
             'RELATED-TO' => '*',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
index fef418b53..623652ff9 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VFreeBusy.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
 use Sabre\VObject;
 
 /**
@@ -14,6 +13,8 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\Period FREEBUSY
  */
 class VFreeBusy extends VObject\Component
 {
@@ -21,9 +22,9 @@ class VFreeBusy extends VObject\Component
      * Checks based on the contained FREEBUSY information, if a timeslot is
      * available.
      *
-     * @return bool
+     * @throws VObject\InvalidDataException
      */
-    public function isFree(DateTimeInterface $start, DatetimeInterface $end)
+    public function isFree(\DateTimeInterface $start, \DatetimeInterface $end): bool
     {
         foreach ($this->select('FREEBUSY') as $freebusy) {
             // We are only interested in FBTYPE=BUSY (the default),
@@ -40,7 +41,7 @@ class VFreeBusy extends VObject\Component
                 // Every period is formatted as [start]/[end]. The start is an
                 // absolute UTC time, the end may be an absolute UTC time, or
                 // duration (relative) value.
-                list($busyStart, $busyEnd) = explode('/', $period);
+                [$busyStart, $busyEnd] = explode('/', $period);
 
                 $busyStart = VObject\DateTimeParser::parse($busyStart);
                 $busyEnd = VObject\DateTimeParser::parse($busyEnd);
@@ -69,10 +70,8 @@ class VFreeBusy extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'UID' => 1,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
index 9b7f1b873..79c14dece 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VJournal.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
 use Sabre\VObject;
 
 /**
@@ -13,6 +12,8 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
  */
 class VJournal extends VObject\Component
 {
@@ -23,9 +24,9 @@ class VJournal extends VObject\Component
      * The rules used to determine if an event falls within the specified
      * time-range is based on the CalDAV specification.
      *
-     * @return bool
+     * @throws VObject\InvalidDataException
      */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+    public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
         $dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
         if ($dtstart) {
@@ -52,10 +53,8 @@ class VJournal extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'UID' => 1,
@@ -63,6 +62,7 @@ class VJournal extends VObject\Component
 
             'CLASS' => '?',
             'CREATED' => '?',
+            'COLOR' => '?',
             'DTSTART' => '?',
             'LAST-MODIFIED' => '?',
             'ORGANIZER' => '?',
@@ -79,6 +79,7 @@ class VJournal extends VObject\Component
             'CATEGORIES' => '*',
             'COMMENT' => '*',
             'CONTACT' => '*',
+            'IMAGE' => '*',
             'DESCRIPTION' => '*',
             'EXDATE' => '*',
             'RELATED-TO' => '*',
@@ -88,10 +89,8 @@ class VJournal extends VObject\Component
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [
             'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTimeZone.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTimeZone.php
index 21c062377..9dcf9b976 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTimeZone.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTimeZone.php
@@ -2,6 +2,7 @@
 
 namespace Sabre\VObject\Component;
 
+use DateTimeZone;
 use Sabre\VObject;
 
 /**
@@ -13,6 +14,8 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\FlatText TZID
  */
 class VTimeZone extends VObject\Component
 {
@@ -21,10 +24,8 @@ class VTimeZone extends VObject\Component
      *
      * If we can't accurately determine the timezone, this method will return
      * UTC.
-     *
-     * @return \DateTimeZone
      */
-    public function getTimeZone()
+    public function getTimeZone(): \DateTimeZone
     {
         return VObject\TimeZoneUtil::getTimeZone((string) $this->TZID, $this->root);
     }
@@ -41,10 +42,8 @@ class VTimeZone extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'TZID' => 1,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
index 6f022ba6d..e0ed15de0 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Component/VTodo.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Component;
 
-use DateTimeInterface;
 use Sabre\VObject;
 
 /**
@@ -13,6 +12,19 @@ use Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property VObject\Property\ICalendar\DateTime DTSTART
+ * @property VObject\Property\ICalendar\DateTime DTEND
+ * @property VObject\Property\ICalendar\DateTime DTSTAMP
+ * @property VObject\Property\ICalendar\Duration DURATION
+ * @property VObject\Property\ICalendar\Recur RRULE
+ * @property VObject\Property\ICalendar\DateTime EXDATE
+ * @property VObject\Property\ICalendar\DateTime RDATE
+ * @property VObject\Property\ICalendar\Recur EXRULE
+ * @property VObject\Property\ICalendar\DateTime {'RECURRENCE-ID'}
+ * @property VObject\Property\ICalendar\DateTime DUE
+ * @property VObject\Property\ICalendar\DateTime COMPLETED
+ * @property VObject\Property\ICalendar\DateTime CREATED
  */
 class VTodo extends VObject\Component
 {
@@ -23,9 +35,9 @@ class VTodo extends VObject\Component
      * The rules used to determine if an event falls within the specified
      * time-range is based on the CalDAV specification.
      *
-     * @return bool
+     * @throws VObject\InvalidDataException
      */
-    public function isInTimeRange(DateTimeInterface $start, DateTimeInterface $end)
+    public function isInTimeRange(\DateTimeInterface $start, \DateTimeInterface $end): bool
     {
         $dtstart = isset($this->DTSTART) ? $this->DTSTART->getDateTime() : null;
         $duration = isset($this->DURATION) ? VObject\DateTimeParser::parseDuration($this->DURATION) : null;
@@ -40,19 +52,19 @@ class VTodo extends VObject\Component
                 return $start <= $effectiveEnd && $end > $dtstart;
             } elseif ($due) {
                 return
-                    ($start < $due || $start <= $dtstart) &&
-                    ($end > $dtstart || $end >= $due);
-            } else {
-                return $start <= $dtstart && $end > $dtstart;
+                    ($start < $due || $start <= $dtstart)
+                    && ($end > $dtstart || $end >= $due);
             }
+
+            return $start <= $dtstart && $end > $dtstart;
         }
         if ($due) {
             return $start < $due && $end >= $due;
         }
         if ($completed && $created) {
             return
-                ($start <= $created || $start <= $completed) &&
-                ($end >= $created || $end >= $completed);
+                ($start <= $created || $start <= $completed)
+                && ($end >= $created || $end >= $completed);
         }
         if ($completed) {
             return $start <= $completed && $end >= $completed;
@@ -76,10 +88,8 @@ class VTodo extends VObject\Component
      *   * + - Must appear at least once.
      *   * * - Can appear any number of times.
      *   * ? - May appear, but not more than once.
-     *
-     * @var array
      */
-    public function getValidationRules()
+    public function getValidationRules(): array
     {
         return [
             'UID' => 1,
@@ -88,13 +98,14 @@ class VTodo extends VObject\Component
             'CLASS' => '?',
             'COMPLETED' => '?',
             'CREATED' => '?',
+            'COLOR' => '?',
             'DESCRIPTION' => '?',
             'DTSTART' => '?',
             'GEO' => '?',
             'LAST-MODIFIED' => '?',
             'LOCATION' => '?',
             'ORGANIZER' => '?',
-            'PERCENT' => '?',
+            'PERCENT-COMPLETE' => '?',
             'PRIORITY' => '?',
             'RECURRENCE-ID' => '?',
             'SEQUENCE' => '?',
@@ -110,7 +121,9 @@ class VTodo extends VObject\Component
             'ATTENDEE' => '*',
             'CATEGORIES' => '*',
             'COMMENT' => '*',
+            'CONFERENCE' => '*',
             'CONTACT' => '*',
+            'IMAGE' => '*',
             'EXDATE' => '*',
             'REQUEST-STATUS' => '*',
             'RELATED-TO' => '*',
@@ -137,11 +150,9 @@ class VTodo extends VObject\Component
      *   2 - An inconsequential issue
      *   3 - A severe issue.
      *
-     * @param int $options
-     *
-     * @return array
+     * @throws VObject\InvalidDataException
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $result = parent::validate($options);
         if (isset($this->DUE) && isset($this->DTSTART)) {
@@ -168,10 +179,8 @@ class VTodo extends VObject\Component
 
     /**
      * This method should return a list of default property values.
-     *
-     * @return array
      */
-    protected function getDefaults()
+    protected function getDefaults(): array
     {
         return [
             'UID' => 'sabre-vobject-'.VObject\UUIDUtil::getUUID(),
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
index 1c253437a..fad973a8c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/DateTimeParser.php
@@ -4,12 +4,11 @@ namespace Sabre\VObject;
 
 use DateInterval;
 use DateTimeImmutable;
-use DateTimeZone;
 
 /**
  * DateTimeParser.
  *
- * This class is responsible for parsing the several different date and time
+ * This class is responsible for parsing the several date and time
  * formats iCalendar and vCards have.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
@@ -26,12 +25,9 @@ class DateTimeParser
      * if the non-UTC format is used. The argument is used as a reference, the
      * returned DateTimeImmutable object will still be in the UTC timezone.
      *
-     * @param string       $dt
-     * @param DateTimeZone $tz
-     *
-     * @return DateTimeImmutable
+     * @throws InvalidDataException
      */
-    public static function parseDateTime($dt, DateTimeZone $tz = null)
+    public static function parseDateTime(string $dt, ?\DateTimeZone $tz = null): \DateTimeImmutable
     {
         // Format is YYYYMMDD + "T" + hhmmss
         $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])T([0-2][0-9])([0-5][0-9])([0-5][0-9])([Z]?)$/', $dt, $matches);
@@ -41,12 +37,12 @@ class DateTimeParser
         }
 
         if ('Z' === $matches[7] || is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
+            $tz = new \DateTimeZone('UTC');
         }
 
         try {
-            $date = new DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3].' '.$matches[4].':'.$matches[5].':'.$matches[6], $tz);
-        } catch (\Exception $e) {
+            $date = new \DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3].' '.$matches[4].':'.$matches[5].':'.$matches[6], $tz);
+        } catch (\Exception) {
             throw new InvalidDataException('The supplied iCalendar datetime value is incorrect: '.$dt);
         }
 
@@ -56,12 +52,9 @@ class DateTimeParser
     /**
      * Parses an iCalendar (rfc5545) formatted date and returns a DateTimeImmutable object.
      *
-     * @param string       $date
-     * @param DateTimeZone $tz
-     *
-     * @return DateTimeImmutable
+     * @throws InvalidDataException
      */
-    public static function parseDate($date, DateTimeZone $tz = null)
+    public static function parseDate(string $date, ?\DateTimeZone $tz = null): \DateTimeImmutable
     {
         // Format is YYYYMMDD
         $result = preg_match('/^([0-9]{4})([0-1][0-9])([0-3][0-9])$/', $date, $matches);
@@ -70,13 +63,11 @@ class DateTimeParser
             throw new InvalidDataException('The supplied iCalendar date value is incorrect: '.$date);
         }
 
-        if (is_null($tz)) {
-            $tz = new DateTimeZone('UTC');
-        }
+        $tz ??= new \DateTimeZone('UTC');
 
         try {
-            $date = new DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3], $tz);
-        } catch (\Exception $e) {
+            $date = new \DateTimeImmutable($matches[1].'-'.$matches[2].'-'.$matches[3], $tz);
+        } catch (\Exception) {
             throw new InvalidDataException('The supplied iCalendar date value is incorrect: '.$date);
         }
 
@@ -86,80 +77,90 @@ class DateTimeParser
     /**
      * Parses an iCalendar (RFC5545) formatted duration value.
      *
-     * This method will either return a DateTimeInterval object, or a string
-     * suitable for strtotime or DateTime::modify.
+     * This method will return a DateTimeInterval object
      *
-     * @param string $duration
-     * @param bool   $asString
-     *
-     * @return DateInterval|string
+     * @throws InvalidDataException
+     * @throws \Exception
      */
-    public static function parseDuration($duration, $asString = false)
+    public static function parseDuration(string $duration): \DateInterval
     {
         $result = preg_match('/^(?<plusminus>\+|-)?P((?<week>\d+)W)?((?<day>\d+)D)?(T((?<hour>\d+)H)?((?<minute>\d+)M)?((?<second>\d+)S)?)?$/', $duration, $matches);
         if (!$result) {
             throw new InvalidDataException('The supplied iCalendar duration value is incorrect: '.$duration);
         }
 
-        if (!$asString) {
-            $invert = false;
+        $invert = false;
 
-            if ('-' === $matches['plusminus']) {
-                $invert = true;
+        if (isset($matches['plusminus']) && '-' === $matches['plusminus']) {
+            $invert = true;
+        }
+
+        $parts = [
+            'week',
+            'day',
+            'hour',
+            'minute',
+            'second',
+        ];
+
+        foreach ($parts as $part) {
+            $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int) $matches[$part] : 0;
+        }
+
+        // We need to re-construct the $duration string, because weeks and
+        // days are not supported by DateInterval in the same string.
+        $duration = 'P';
+        $days = $matches['day'];
+
+        if ($matches['week']) {
+            $days += $matches['week'] * 7;
+        }
+
+        if ($days) {
+            $duration .= $days.'D';
+        }
+
+        if ($matches['minute'] || $matches['second'] || $matches['hour']) {
+            $duration .= 'T';
+
+            if ($matches['hour']) {
+                $duration .= $matches['hour'].'H';
             }
 
-            $parts = [
-                'week',
-                'day',
-                'hour',
-                'minute',
-                'second',
-            ];
-
-            foreach ($parts as $part) {
-                $matches[$part] = isset($matches[$part]) && $matches[$part] ? (int) $matches[$part] : 0;
+            if ($matches['minute']) {
+                $duration .= $matches['minute'].'M';
             }
 
-            // We need to re-construct the $duration string, because weeks and
-            // days are not supported by DateInterval in the same string.
-            $duration = 'P';
-            $days = $matches['day'];
-
-            if ($matches['week']) {
-                $days += $matches['week'] * 7;
+            if ($matches['second']) {
+                $duration .= $matches['second'].'S';
             }
+        }
 
-            if ($days) {
-                $duration .= $days.'D';
-            }
+        if ('P' === $duration) {
+            $duration = 'PT0S';
+        }
 
-            if ($matches['minute'] || $matches['second'] || $matches['hour']) {
-                $duration .= 'T';
+        $iv = new \DateInterval($duration);
 
-                if ($matches['hour']) {
-                    $duration .= $matches['hour'].'H';
-                }
+        if ($invert) {
+            $iv->invert = true;
+        }
 
-                if ($matches['minute']) {
-                    $duration .= $matches['minute'].'M';
-                }
+        return $iv;
+    }
 
-                if ($matches['second']) {
-                    $duration .= $matches['second'].'S';
-                }
-            }
-
-            if ('P' === $duration) {
-                $duration = 'PT0S';
-            }
-
-            $iv = new DateInterval($duration);
-
-            if ($invert) {
-                $iv->invert = true;
-            }
-
-            return $iv;
+    /**
+     * Parses an iCalendar (RFC5545) formatted duration value.
+     *
+     * This method will return a string suitable for strtotime or DateTime::modify.
+     *
+     * @throws InvalidDataException
+     */
+    public static function parseDurationAsString(string $duration): string
+    {
+        $result = preg_match('/^(?<plusminus>\+|-)?P((?<week>\d+)W)?((?<day>\d+)D)?(T((?<hour>\d+)H)?((?<minute>\d+)M)?((?<second>\d+)S)?)?$/', $duration, $matches);
+        if (!$result) {
+            throw new InvalidDataException('The supplied iCalendar duration value is incorrect: '.$duration);
         }
 
         $parts = [
@@ -190,20 +191,21 @@ class DateTimeParser
     /**
      * Parses either a Date or DateTime, or Duration value.
      *
-     * @param string              $date
-     * @param DateTimeZone|string $referenceTz
+     * @param \DateTimeZone|string $referenceTz
      *
-     * @return DateTimeImmutable|DateInterval
+     * @return \DateInterval|\DateTimeImmutable
+     *
+     * @throws InvalidDataException
      */
-    public static function parse($date, $referenceTz = null)
+    public static function parse(string $date, $referenceTz = null)
     {
         if ('P' === $date[0] || ('-' === $date[0] && 'P' === $date[1])) {
             return self::parseDuration($date);
         } elseif (8 === strlen($date)) {
             return self::parseDate($date, $referenceTz);
-        } else {
-            return self::parseDateTime($date, $referenceTz);
         }
+
+        return self::parseDateTime($date, $referenceTz);
     }
 
     /**
@@ -258,11 +260,9 @@ class DateTimeParser
      * Times may be postfixed by a timezone offset. This can be either 'Z' for
      * UTC, or a string like -0500 or +1100.
      *
-     * @param string $date
-     *
-     * @return array
+     * @throws InvalidDataException
      */
-    public static function parseVCardDateTime($date)
+    public static function parseVCardDateTime(string $date): array
     {
         $regex = '/^
             (?:  # date part
@@ -304,7 +304,7 @@ class DateTimeParser
                     (?: \.[0-9]{3})? # milliseconds
                     (?P<timezone> # timezone offset
 
-                        Z | (?: \+|-)(?: [0-9]{2}:[0-9]{2})
+                        Z | (?: \+|-)(?: [0-9]{2}:?[0-9]{2})
 
                     )?
 
@@ -327,7 +327,7 @@ class DateTimeParser
 
         $result = [];
         foreach ($parts as $part) {
-            if (empty($matches[$part])) {
+            if (!array_key_exists($part, $matches) || '' === $matches[$part]) {
                 $result[$part] = null;
             } elseif ('-' === $matches[$part] || '--' === $matches[$part]) {
                 $result[$part] = null;
@@ -377,11 +377,9 @@ class DateTimeParser
      * Times may be postfixed by a timezone offset. This can be either 'Z' for
      * UTC, or a string like -0500 or +11:00.
      *
-     * @param string $date
-     *
-     * @return array
+     * @throws InvalidDataException
      */
-    public static function parseVCardTime($date)
+    public static function parseVCardTime(string $date): array
     {
         $regex = '/^
             (?<hour> [0-9]{2} | -)
@@ -406,7 +404,7 @@ class DateTimeParser
                 (?: \.[0-9]{3})? # milliseconds
                 (?P<timezone> # timezone offset
 
-                    Z | (?: \+|-)(?: [0-9]{2}:[0-9]{2})
+                    Z | (?: \+|-)(?: [0-9]{2}:?[0-9]{2})
 
                 )?
                 $/x';
@@ -424,7 +422,7 @@ class DateTimeParser
 
         $result = [];
         foreach ($parts as $part) {
-            if (empty($matches[$part])) {
+            if (!array_key_exists($part, $matches) || '' === $matches[$part]) {
                 $result[$part] = null;
             } elseif ('-' === $matches[$part]) {
                 $result[$part] = null;
@@ -483,11 +481,9 @@ class DateTimeParser
      * Times may be postfixed by a timezone offset. This can be either 'Z' for
      * UTC, or a string like -0500 or +1100.
      *
-     * @param string $date
-     *
-     * @return array
+     * @throws InvalidDataException
      */
-    public static function parseVCardDateAndOrTime($date)
+    public static function parseVCardDateAndOrTime(string $date): array
     {
         // \d{8}|\d{4}-\d\d|--\d\d(\d\d)?|---\d\d
         $valueDate = '/^(?J)(?:'.
@@ -543,7 +539,7 @@ class DateTimeParser
         $parts['year0'] = &$parts['year'];
 
         foreach ($parts as $part => &$value) {
-            if (!empty($matches[$part])) {
+            if (array_key_exists($part, $matches) && '' !== $matches[$part]) {
                 $value = $matches[$part];
             }
         }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
index 14a77c911..8319b49be 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Document.php
@@ -15,68 +15,62 @@ namespace Sabre\VObject;
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
+ *
+ * @property Property\FlatText VERSION
  */
 abstract class Document extends Component
 {
     /**
      * Unknown document type.
      */
-    const UNKNOWN = 1;
+    public const UNKNOWN = 1;
 
     /**
      * vCalendar 1.0.
      */
-    const VCALENDAR10 = 2;
+    public const VCALENDAR10 = 2;
 
     /**
      * iCalendar 2.0.
      */
-    const ICALENDAR20 = 3;
+    public const ICALENDAR20 = 3;
 
     /**
      * vCard 2.1.
      */
-    const VCARD21 = 4;
+    public const VCARD21 = 4;
 
     /**
      * vCard 3.0.
      */
-    const VCARD30 = 5;
+    public const VCARD30 = 5;
 
     /**
      * vCard 4.0.
      */
-    const VCARD40 = 6;
+    public const VCARD40 = 6;
 
     /**
      * The default name for this component.
      *
      * This should be 'VCALENDAR' or 'VCARD'.
-     *
-     * @var string
      */
-    public static $defaultName;
+    public static ?string $defaultName = null;
 
     /**
      * List of properties, and which classes they map to.
-     *
-     * @var array
      */
-    public static $propertyMap = [];
+    public static array $propertyMap = [];
 
     /**
      * List of components, along with which classes they map to.
-     *
-     * @var array
      */
-    public static $componentMap = [];
+    public static array $componentMap = [];
 
     /**
      * List of value-types, and which classes they map to.
-     *
-     * @var array
      */
-    public static $valueMap = [];
+    public static array $valueMap = [];
 
     /**
      * Creates a new document.
@@ -97,22 +91,20 @@ abstract class Document extends Component
         $args = func_get_args();
         $name = static::$defaultName;
         if (0 === count($args) || is_array($args[0])) {
-            $children = isset($args[0]) ? $args[0] : [];
-            $defaults = isset($args[1]) ? $args[1] : true;
+            $children = $args[0] ?? [];
+            $defaults = $args[1] ?? true;
         } else {
             $name = $args[0];
-            $children = isset($args[1]) ? $args[1] : [];
-            $defaults = isset($args[2]) ? $args[2] : true;
+            $children = $args[1] ?? [];
+            $defaults = $args[2] ?? true;
         }
         parent::__construct($this, $name, $children, $defaults);
     }
 
     /**
      * Returns the current document type.
-     *
-     * @return int
      */
-    public function getDocumentType()
+    public function getDocumentType(): int
     {
         return self::UNKNOWN;
     }
@@ -122,19 +114,14 @@ abstract class Document extends Component
      *
      * If it's a known component, we will automatically call createComponent.
      * otherwise, we'll assume it's a property and call createProperty instead.
-     *
-     * @param string $name
-     * @param string $arg1,... Unlimited number of args
-     *
-     * @return mixed
      */
-    public function create($name)
+    public function create(string $name)
     {
         if (isset(static::$componentMap[strtoupper($name)])) {
-            return call_user_func_array([$this, 'createComponent'], func_get_args());
-        } else {
-            return call_user_func_array([$this, 'createProperty'], func_get_args());
+            return $this->createComponent(...func_get_args());
         }
+
+        return $this->createProperty(...func_get_args());
     }
 
     /**
@@ -150,14 +137,8 @@ abstract class Document extends Component
      * By default, a set of sensible values will be added to the component. For
      * an iCalendar object, this may be something like CALSCALE:GREGORIAN. To
      * ensure that this does not happen, set $defaults to false.
-     *
-     * @param string $name
-     * @param array  $children
-     * @param bool   $defaults
-     *
-     * @return Component
      */
-    public function createComponent($name, array $children = null, $defaults = true)
+    public function createComponent(string $name, ?array $children = null, bool $defaults = true): Component
     {
         $name = strtoupper($name);
         $class = Component::class;
@@ -165,9 +146,7 @@ abstract class Document extends Component
         if (isset(static::$componentMap[$name])) {
             $class = static::$componentMap[$name];
         }
-        if (is_null($children)) {
-            $children = [];
-        }
+        $children ??= [];
 
         return new $class($this, $name, $children, $defaults);
     }
@@ -182,16 +161,13 @@ abstract class Document extends Component
      * parameters will automatically be created, or you can just pass a list of
      * Parameter objects.
      *
-     * @param string $name
-     * @param mixed  $value
-     * @param array  $parameters
-     * @param string $valueType  Force a specific valuetype, such as URI or TEXT
+     * @param string|null $valueType Force a specific valueType, such as URI or TEXT
      *
-     * @return Property
+     * @throws InvalidDataException
      */
-    public function createProperty($name, $value = null, array $parameters = null, $valueType = null)
+    public function createProperty(string $name, $value = null, ?array $parameters = null, ?string $valueType = null, ?int $lineIndex = null, ?string $lineString = null): Property
     {
-        // If there's a . in the name, it means it's prefixed by a groupname.
+        // If there's a . in the name, it means it's prefixed by a group name.
         if (false !== ($i = strpos($name, '.'))) {
             $group = substr($name, 0, $i);
             $name = strtoupper(substr($name, $i + 1));
@@ -202,28 +178,31 @@ abstract class Document extends Component
 
         $class = null;
 
+        // If a VALUE parameter is supplied, we have to use that
+        // According to https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.20
+        //  If the property's value is the default value type, then this
+        //  parameter need not be specified.  However, if the property's
+        //  default value type is overridden by some other allowable value
+        //  type, then this parameter MUST be specified.
+        if (!$valueType) {
+            $valueType = $parameters['VALUE'] ?? null;
+        }
+
         if ($valueType) {
             // The valueType argument comes first to figure out the correct
             // class.
             $class = $this->getClassNameForPropertyValue($valueType);
         }
 
-        if (is_null($class)) {
-            // If a VALUE parameter is supplied, we should use that.
-            if (isset($parameters['VALUE'])) {
-                $class = $this->getClassNameForPropertyValue($parameters['VALUE']);
-                if (is_null($class)) {
-                    throw new InvalidDataException('Unsupported VALUE parameter for '.$name.' property. You supplied "'.$parameters['VALUE'].'"');
-                }
-            } else {
-                $class = $this->getClassNameForPropertyName($name);
-            }
-        }
-        if (is_null($parameters)) {
-            $parameters = [];
-        }
+        // If the value parameter is not set or set to something we do not recognize
+        // we do not attempt to interpret or parse the datass value as specified in
+        // https://datatracker.ietf.org/doc/html/rfc5545#section-3.2.20
+        // So when we so far did not get a class-name, we use the default for the property
+        $class ??= $this->getClassNameForPropertyName($name);
 
-        return new $class($this, $name, $value, $parameters, $group);
+        $parameters ??= [];
+
+        return new $class($this, $name, $value, $parameters, $group, $lineIndex, $lineString);
     }
 
     /**
@@ -234,11 +213,9 @@ abstract class Document extends Component
      *
      * This method returns null if we don't have a specialized class.
      *
-     * @param string $valueParam
-     *
-     * @return string|null
+     * @return string|void|null
      */
-    public function getClassNameForPropertyValue($valueParam)
+    public function getClassNameForPropertyValue(string $valueParam)
     {
         $valueParam = strtoupper($valueParam);
         if (isset(static::$valueMap[$valueParam])) {
@@ -248,17 +225,9 @@ abstract class Document extends Component
 
     /**
      * Returns the default class for a property name.
-     *
-     * @param string $propertyName
-     *
-     * @return string
      */
-    public function getClassNameForPropertyName($propertyName)
+    public function getClassNameForPropertyName(string $propertyName): string
     {
-        if (isset(static::$propertyMap[$propertyName])) {
-            return static::$propertyMap[$propertyName];
-        } else {
-            return Property\Unknown::class;
-        }
+        return static::$propertyMap[$propertyName] ?? Property\Unknown::class;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php
index 860512649..9c81b7748 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ElementList.php
@@ -2,9 +2,6 @@
 
 namespace Sabre\VObject;
 
-use ArrayIterator;
-use LogicException;
-
 /**
  * VObject ElementList.
  *
@@ -15,20 +12,19 @@ use LogicException;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class ElementList extends ArrayIterator
+class ElementList extends \ArrayIterator
 {
     /* {{{ ArrayAccess Interface */
 
     /**
      * Sets an item through ArrayAccess.
      *
-     * @param int   $offset
-     * @param mixed $value
+     * @param int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
-        throw new LogicException('You can not add new objects to an ElementList');
+        throw new \LogicException('You can not add new objects to an ElementList');
     }
 
     /**
@@ -39,9 +35,9 @@ class ElementList extends ArrayIterator
      * @param int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
-        throw new LogicException('You can not remove objects from an ElementList');
+        throw new \LogicException('You can not remove objects from an ElementList');
     }
 
     /* }}} */
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
index 4d9f441ce..6cdf2b937 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyData.php
@@ -11,31 +11,19 @@ namespace Sabre\VObject;
  */
 class FreeBusyData
 {
-    /**
-     * Start timestamp.
-     *
-     * @var int
-     */
-    protected $start;
-
-    /**
-     * End timestamp.
-     *
-     * @var int
-     */
-    protected $end;
-
     /**
      * A list of free-busy times.
-     *
-     * @var array
      */
-    protected $data;
+    protected array $data;
 
-    public function __construct($start, $end)
+    public function __construct(/**
+     * Start timestamp.
+     */
+        protected int $start, /**
+     * End timestamp.
+     */
+        protected int $end)
     {
-        $this->start = $start;
-        $this->end = $end;
         $this->data = [];
 
         $this->data[] = [
@@ -46,16 +34,14 @@ class FreeBusyData
     }
 
     /**
-     * Adds free or busytime to the data.
+     * Adds free or busy time to the data.
      *
-     * @param int    $start
-     * @param int    $end
-     * @param string $type  FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
+     * @param string $type FREE, BUSY, BUSY-UNAVAILABLE or BUSY-TENTATIVE
      */
-    public function add($start, $end, $type)
+    public function add(int $start, int $end, string $type): void
     {
         if ($start > $this->end || $end < $this->start) {
-            // This new data is outside our timerange.
+            // This new data is outside our time range.
             return;
         }
 
@@ -178,7 +164,7 @@ class FreeBusyData
         }
     }
 
-    public function getData()
+    public function getData(): array
     {
         return $this->data;
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
index 81b8126d5..9eec5c8d7 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/FreeBusyGenerator.php
@@ -2,10 +2,10 @@
 
 namespace Sabre\VObject;
 
-use DateTimeImmutable;
-use DateTimeInterface;
-use DateTimeZone;
 use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\Component\VFreeBusy;
+use Sabre\VObject\Property\ICalendar\DateTime;
 use Sabre\VObject\Recur\EventIterator;
 use Sabre\VObject\Recur\NoInstancesException;
 
@@ -27,31 +27,23 @@ class FreeBusyGenerator
 {
     /**
      * Input objects.
-     *
-     * @var array
      */
-    protected $objects = [];
+    protected array $objects = [];
 
     /**
      * Start of range.
-     *
-     * @var DateTimeInterface|null
      */
-    protected $start;
+    protected ?\DateTimeInterface $start;
 
     /**
      * End of range.
-     *
-     * @var DateTimeInterface|null
      */
-    protected $end;
+    protected ?\DateTimeInterface $end;
 
     /**
      * VCALENDAR object.
-     *
-     * @var Document
      */
-    protected $baseObject;
+    protected ?Document $baseObject = null;
 
     /**
      * Reference timezone.
@@ -63,42 +55,31 @@ class FreeBusyGenerator
      * This is also used for all-day events.
      *
      * This defaults to UTC.
-     *
-     * @var DateTimeZone
      */
-    protected $timeZone;
+    protected \DateTimeZone $timeZone;
 
     /**
      * A VAVAILABILITY document.
      *
      * If this is set, its information will be included when calculating
      * freebusy time.
-     *
-     * @var Document
      */
-    protected $vavailability;
+    protected ?Document $vavailability = null;
 
     /**
      * Creates the generator.
      *
      * Check the setTimeRange and setObjects methods for details about the
      * arguments.
-     *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
-     * @param mixed             $objects
-     * @param DateTimeZone      $timeZone
      */
-    public function __construct(DateTimeInterface $start = null, DateTimeInterface $end = null, $objects = null, DateTimeZone $timeZone = null)
+    public function __construct(?\DateTimeInterface $start = null, ?\DateTimeInterface $end = null, $objects = null, ?\DateTimeZone $timeZone = null)
     {
         $this->setTimeRange($start, $end);
 
         if ($objects) {
             $this->setObjects($objects);
         }
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
+        $timeZone ??= new \DateTimeZone('UTC');
         $this->setTimeZone($timeZone);
     }
 
@@ -110,7 +91,7 @@ class FreeBusyGenerator
      *
      * The VFREEBUSY object will be automatically added though.
      */
-    public function setBaseObject(Document $vcalendar)
+    public function setBaseObject(Document $vcalendar): void
     {
         $this->baseObject = $vcalendar;
     }
@@ -118,7 +99,7 @@ class FreeBusyGenerator
     /**
      * Sets a VAVAILABILITY document.
      */
-    public function setVAvailability(Document $vcalendar)
+    public function setVAvailability(Document $vcalendar): void
     {
         $this->vavailability = $vcalendar;
     }
@@ -129,10 +110,8 @@ class FreeBusyGenerator
      * You must either specify a vcalendar object as a string, or as the parse
      * Component.
      * It's also possible to specify multiple objects as an array.
-     *
-     * @param mixed $objects
      */
-    public function setObjects($objects)
+    public function setObjects($objects): void
     {
         if (!is_array($objects)) {
             $objects = [$objects];
@@ -153,18 +132,17 @@ class FreeBusyGenerator
     /**
      * Sets the time range.
      *
-     * Any freebusy object falling outside of this time range will be ignored.
+     * Any freebusy object falling outside this time range will be ignored.
      *
-     * @param DateTimeInterface $start
-     * @param DateTimeInterface $end
+     * @throws \Exception
      */
-    public function setTimeRange(DateTimeInterface $start = null, DateTimeInterface $end = null)
+    public function setTimeRange(?\DateTimeInterface $start = null, ?\DateTimeInterface $end = null): void
     {
         if (!$start) {
-            $start = new DateTimeImmutable(Settings::$minDate);
+            $start = new \DateTimeImmutable(Settings::$minDate);
         }
         if (!$end) {
-            $end = new DateTimeImmutable(Settings::$maxDate);
+            $end = new \DateTimeImmutable(Settings::$maxDate);
         }
         $this->start = $start;
         $this->end = $end;
@@ -173,7 +151,7 @@ class FreeBusyGenerator
     /**
      * Sets the reference timezone for floating times.
      */
-    public function setTimeZone(DateTimeZone $timeZone)
+    public function setTimeZone(\DateTimeZone $timeZone): void
     {
         $this->timeZone = $timeZone;
     }
@@ -181,16 +159,14 @@ class FreeBusyGenerator
     /**
      * Parses the input data and returns a correct VFREEBUSY object, wrapped in
      * a VCALENDAR.
-     *
-     * @return Component
      */
-    public function getResult()
+    public function getResult(): Component
     {
         $fbData = new FreeBusyData(
             $this->start->getTimeStamp(),
             $this->end->getTimeStamp()
         );
-        if ($this->vavailability) {
+        if (null !== $this->vavailability) {
             $this->calculateAvailability($fbData, $this->vavailability);
         }
 
@@ -203,7 +179,7 @@ class FreeBusyGenerator
      * This method takes a VAVAILABILITY component and figures out all the
      * available times.
      */
-    protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability)
+    protected function calculateAvailability(FreeBusyData $fbData, VCalendar $vavailability): void
     {
         $vavailComps = iterator_to_array($vavailability->VAVAILABILITY);
         usort(
@@ -231,7 +207,7 @@ class FreeBusyGenerator
         // Now we go over all the VAVAILABILITY components and figure if
         // there's any we don't need to consider.
         //
-        // This is can be because of one of two reasons: either the
+        // This is because of one of two reasons: either the
         // VAVAILABILITY component falls outside the time we are interested in,
         // or a different VAVAILABILITY component with a higher priority has
         // already completely covered the time-range.
@@ -239,9 +215,9 @@ class FreeBusyGenerator
         $new = [];
 
         foreach ($old as $vavail) {
-            list($compStart, $compEnd) = $vavail->getEffectiveStartEnd();
+            [$compStart, $compEnd] = $vavail->getEffectiveStartEnd();
 
-            // We don't care about datetimes that are earlier or later than the
+            // We don't care about date-times that are earlier or later than the
             // start and end of the freebusy report, so this gets normalized
             // first.
             if (is_null($compStart) || $compStart < $this->start) {
@@ -251,7 +227,7 @@ class FreeBusyGenerator
                 $compEnd = $this->end;
             }
 
-            // If the item fell out of the timerange, we can just skip it.
+            // If the item fell out of the time range, we can just skip it.
             if ($compStart > $this->end || $compEnd < $this->start) {
                 continue;
             }
@@ -259,10 +235,10 @@ class FreeBusyGenerator
             // Going through our existing list of components to see if there's
             // a higher priority component that already fully covers this one.
             foreach ($new as $higherVavail) {
-                list($higherStart, $higherEnd) = $higherVavail->getEffectiveStartEnd();
+                [$higherStart, $higherEnd] = $higherVavail->getEffectiveStartEnd();
                 if (
-                    (is_null($higherStart) || $higherStart < $compStart) &&
-                    (is_null($higherEnd) || $higherEnd > $compEnd)
+                    (is_null($higherStart) || $higherStart < $compStart)
+                    && (is_null($higherEnd) || $higherEnd > $compEnd)
                 ) {
                     // Component is fully covered by a higher priority
                     // component. We can skip this component.
@@ -281,7 +257,7 @@ class FreeBusyGenerator
         // priority components to override the lower ones.
         foreach (array_reverse($new) as $vavail) {
             $busyType = isset($vavail->BUSYTYPE) ? strtoupper($vavail->BUSYTYPE) : 'BUSY-UNAVAILABLE';
-            list($vavailStart, $vavailEnd) = $vavail->getEffectiveStartEnd();
+            [$vavailStart, $vavailEnd] = $vavail->getEffectiveStartEnd();
 
             // Making the component size no larger than the requested free-busy
             // report range.
@@ -303,20 +279,20 @@ class FreeBusyGenerator
             // Looping over the AVAILABLE components.
             if (isset($vavail->AVAILABLE)) {
                 foreach ($vavail->AVAILABLE as $available) {
-                    list($availStart, $availEnd) = $available->getEffectiveStartEnd();
+                    [$availStart, $availEnd] = $available->getEffectiveStartEnd();
                     $fbData->add(
-                    $availStart->getTimeStamp(),
-                    $availEnd->getTimeStamp(),
-                    'FREE'
-                );
+                        $availStart->getTimeStamp(),
+                        $availEnd->getTimeStamp(),
+                        'FREE'
+                    );
 
                     if ($available->RRULE) {
                         // Our favourite thing: recurrence!!
 
                         $rruleIterator = new Recur\RRuleIterator(
-                        $available->RRULE->getValue(),
-                        $availStart
-                    );
+                            $available->RRULE->getValue(),
+                            $availStart
+                        );
                         $rruleIterator->fastForward($vavailStart);
 
                         $startEndDiff = $availStart->diff($availEnd);
@@ -326,7 +302,7 @@ class FreeBusyGenerator
                             $recurEnd = $recurStart->add($startEndDiff);
 
                             if ($recurStart > $vavailEnd) {
-                                // We're beyond the legal timerange.
+                                // We're beyond the legal time range.
                                 break;
                             }
 
@@ -337,10 +313,10 @@ class FreeBusyGenerator
                             }
 
                             $fbData->add(
-                            $recurStart->getTimeStamp(),
-                            $recurEnd->getTimeStamp(),
-                            'FREE'
-                        );
+                                $recurStart->getTimeStamp(),
+                                $recurEnd->getTimeStamp(),
+                                'FREE'
+                            );
 
                             $rruleIterator->next();
                         }
@@ -355,13 +331,16 @@ class FreeBusyGenerator
      * times on fbData.
      *
      * @param VCalendar[] $objects
+     *
+     * @throws InvalidDataException|Recur\MaxInstancesExceededException
      */
-    protected function calculateBusy(FreeBusyData $fbData, array $objects)
+    protected function calculateBusy(FreeBusyData $fbData, array $objects): void
     {
         foreach ($objects as $key => $object) {
             foreach ($object->getBaseComponents() as $component) {
                 switch ($component->name) {
                     case 'VEVENT':
+                        /** @var VEvent $component */
                         $FBTYPE = 'BUSY';
                         if (isset($component->TRANSP) && ('TRANSPARENT' === strtoupper($component->TRANSP))) {
                             break;
@@ -381,7 +360,7 @@ class FreeBusyGenerator
                         if ($component->RRULE) {
                             try {
                                 $iterator = new EventIterator($object, (string) $component->UID, $this->timeZone);
-                            } catch (NoInstancesException $e) {
+                            } catch (NoInstancesException) {
                                 // This event is recurring, but it doesn't have a single
                                 // instance. We are skipping this event from the output
                                 // entirely.
@@ -447,6 +426,7 @@ class FreeBusyGenerator
                         break;
 
                     case 'VFREEBUSY':
+                        /** @var VFreeBusy $component */
                         foreach ($component->FREEBUSY as $freebusy) {
                             $fbType = isset($freebusy['FBTYPE']) ? strtoupper($freebusy['FBTYPE']) : 'BUSY';
 
@@ -455,12 +435,12 @@ class FreeBusyGenerator
                                 continue;
                             }
 
-                            $values = explode(',', $freebusy);
+                            $values = explode(',', (string) $freebusy);
                             foreach ($values as $value) {
-                                list($startTime, $endTime) = explode('/', $value);
+                                [$startTime, $endTime] = explode('/', $value);
                                 $startTime = DateTimeParser::parseDateTime($startTime);
 
-                                if ('P' === substr($endTime, 0, 1) || '-P' === substr($endTime, 0, 2)) {
+                                if (str_starts_with($endTime, 'P') || str_starts_with($endTime, '-P')) {
                                     $duration = DateTimeParser::parseDuration($endTime);
                                     $endTime = clone $startTime;
                                     $endTime = $endTime->add($duration);
@@ -491,11 +471,12 @@ class FreeBusyGenerator
      * This method takes a FreeBusyData object and generates the VCALENDAR
      * object associated with it.
      *
-     * @return VCalendar
+     * @throws InvalidDataException
+     * @throws \Exception
      */
-    protected function generateFreeBusyCalendar(FreeBusyData $fbData)
+    protected function generateFreeBusyCalendar(FreeBusyData $fbData): VCalendar
     {
-        if ($this->baseObject) {
+        if (null !== $this->baseObject) {
             $calendar = $this->baseObject;
         } else {
             $calendar = new VCalendar();
@@ -505,23 +486,26 @@ class FreeBusyGenerator
         $calendar->add($vfreebusy);
 
         if ($this->start) {
+            /** @var DateTime $dtstart */
             $dtstart = $calendar->createProperty('DTSTART');
             $dtstart->setDateTime($this->start);
             $vfreebusy->add($dtstart);
         }
         if ($this->end) {
+            /** @var DateTime $dtend */
             $dtend = $calendar->createProperty('DTEND');
             $dtend->setDateTime($this->end);
             $vfreebusy->add($dtend);
         }
 
         $tz = new \DateTimeZone('UTC');
+        /** @var DateTime $dtstamp */
         $dtstamp = $calendar->createProperty('DTSTAMP');
-        $dtstamp->setDateTime(new DateTimeImmutable('now', $tz));
+        $dtstamp->setDateTime(new \DateTimeImmutable('now', $tz));
         $vfreebusy->add($dtstamp);
 
         foreach ($fbData->getData() as $busyTime) {
-            $busyType = strtoupper($busyTime['type']);
+            $busyType = strtoupper((string) $busyTime['type']);
 
             // Ignoring all the FREE parts, because those are already assumed.
             if ('FREE' === $busyType) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
index b66a59f54..19de8b16b 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Broker.php
@@ -3,9 +3,14 @@
 namespace Sabre\VObject\ITip;
 
 use Sabre\VObject\Component\VCalendar;
+use Sabre\VObject\Component\VEvent;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
+use Sabre\VObject\ParseException;
 use Sabre\VObject\Reader;
 use Sabre\VObject\Recur\EventIterator;
+use Sabre\VObject\Recur\MaxInstancesExceededException;
+use Sabre\VObject\Recur\NoInstancesException;
 
 /**
  * The ITip\Broker class is a utility class that helps with processing
@@ -13,7 +18,7 @@ use Sabre\VObject\Recur\EventIterator;
  *
  * iTip is defined in rfc5546, stands for iCalendar Transport-Independent
  * Interoperability Protocol, and describes the underlying mechanism for
- * using iCalendar for scheduling for for example through email (also known as
+ * using iCalendar for scheduling, for example, through email (also known as
  * IMip) and CalDAV Scheduling.
  *
  * This class helps by:
@@ -27,7 +32,7 @@ use Sabre\VObject\Recur\EventIterator;
  *    a received invite.
  * 4. It can also process an invite update on a local event, ensuring that any
  *    overridden properties from attendees are retained.
- * 5. It can create a accepted or declined iTip reply based on an invite.
+ * 5. It can create an accepted or declined iTip reply based on an invite.
  * 6. It can process a reply from an invite and update an events attendee
  *     status based on a reply.
  *
@@ -49,10 +54,8 @@ class Broker
      * CLIENT will be ignored. This is the desired behavior for a CalDAV
      * server, but if you're writing an iTip application that doesn't deal with
      * CalDAV, you may want to ignore this parameter.
-     *
-     * @var bool
      */
-    public $scheduleAgentServerRules = true;
+    public bool $scheduleAgentServerRules = true;
 
     /**
      * The broker will try during 'parseEvent' figure out whether the change
@@ -66,7 +69,7 @@ class Broker
      *
      * @var string[]
      */
-    public $significantChangeProperties = [
+    public array $significantChangeProperties = [
         'DTSTART',
         'DTEND',
         'DURATION',
@@ -104,11 +107,13 @@ class Broker
      *
      * If the iTip message was not supported, we will always return false.
      *
-     * @param VCalendar $existingObject
+     * @return VCalendar|false|void|null
      *
-     * @return VCalendar|null
+     * @throws InvalidDataException
+     * @throws MaxInstancesExceededException
+     * @throws NoInstancesException
      */
-    public function processMessage(Message $itipMessage, VCalendar $existingObject = null)
+    public function processMessage(Message $itipMessage, ?VCalendar $existingObject = null)
     {
         // We only support events at the moment.
         if ('VEVENT' !== $itipMessage->component) {
@@ -129,8 +134,6 @@ class Broker
                 // Unsupported iTip message
                 return;
         }
-
-        return $existingObject;
     }
 
     /**
@@ -156,13 +159,16 @@ class Broker
      * people. If the user was an attendee, we need to make sure that the
      * organizer gets the 'declined' message.
      *
-     * @param VCalendar|string $calendar
-     * @param string|array     $userHref
-     * @param VCalendar|string $oldCalendar
+     * @param VCalendar|string      $calendar
+     * @param string|array          $userHref
+     * @param VCalendar|string|null $oldCalendar
      *
-     * @return array
+     * @throws ITipException
+     * @throws InvalidDataException
+     * @throws ParseException
+     * @throws SameOrganizerForAllComponentsException
      */
-    public function parseEvent($calendar, $userHref, $oldCalendar = null)
+    public function parseEvent($calendar, $userHref, $oldCalendar = null): array
     {
         if ($oldCalendar) {
             if (is_string($oldCalendar)) {
@@ -216,13 +222,13 @@ class Broker
             // The calendar object got deleted, we need to process this as a
             // cancellation / decline.
             if (!$oldCalendar) {
-                // No old and no new calendar, there's no thing to do.
+                // No old and no new calendar, there's nothing to do.
                 return [];
             }
 
             $eventInfo = $oldEventInfo;
 
-            if (in_array($eventInfo['organizer'], $userHref)) {
+            if (in_array($eventInfo['organizer'], $userHref, true)) {
                 // This is an organizer deleting the event.
                 $eventInfo['attendees'] = [];
                 // Increasing the sequence, but only if the organizer deleted
@@ -231,7 +237,7 @@ class Broker
             } else {
                 // This is an attendee deleting the event.
                 foreach ($eventInfo['attendees'] as $key => $attendee) {
-                    if (in_array($attendee['href'], $userHref)) {
+                    if (in_array($attendee['href'], $userHref, true)) {
                         $eventInfo['attendees'][$key]['instances'] = ['master' => ['id' => 'master', 'partstat' => 'DECLINED'],
                         ];
                     }
@@ -240,16 +246,29 @@ class Broker
             $baseCalendar = $oldCalendar;
         }
 
-        if (in_array($eventInfo['organizer'], $userHref)) {
+        // Check if the user is the organizer
+        if (in_array($eventInfo['organizer'], $userHref, true)) {
             return $this->parseEventForOrganizer($baseCalendar, $eventInfo, $oldEventInfo);
-        } elseif ($oldCalendar) {
-            // We need to figure out if the user is an attendee, but we're only
-            // doing so if there's an oldCalendar, because we only want to
-            // process updates, not creation of new events.
-            foreach ($eventInfo['attendees'] as $attendee) {
-                if (in_array($attendee['href'], $userHref)) {
+        }
+
+        // Check if the user is an attendee
+        foreach ($eventInfo['attendees'] as $attendee) {
+            if (in_array($attendee['href'], $userHref, true)) {
+                // If this is a event update, we always generate a reply
+                if ($oldCalendar) {
                     return $this->parseEventForAttendee($baseCalendar, $eventInfo, $oldEventInfo, $attendee['href']);
                 }
+
+                // If this is a new event, we only generate a reply if the participation status is set
+                foreach ($attendee['instances'] as $instance) {
+                    if (isset($instance['partstat']) && 'NEEDS-ACTION' !== $instance['partstat']) {
+                        // Attendee has responded (ACCEPTED/DECLINED/TENTATIVE) - generate REPLY
+                        return $this->parseEventForAttendee($baseCalendar, $eventInfo, $oldEventInfo, $attendee['href']);
+                    }
+                }
+
+                // User is attendee but no response to process
+                break;
             }
         }
 
@@ -261,20 +280,13 @@ class Broker
      *
      * This is message from an organizer, and is either a new event
      * invite, or an update to an existing one.
-     *
-     * @param VCalendar $existingObject
-     *
-     * @return VCalendar|null
      */
-    protected function processMessageRequest(Message $itipMessage, VCalendar $existingObject = null)
+    protected function processMessageRequest(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
     {
         if (!$existingObject) {
             // This is a new invite, and we're just going to copy over
             // all the components from the invite.
             $existingObject = new VCalendar();
-            foreach ($itipMessage->message->getComponents() as $component) {
-                $existingObject->add(clone $component);
-            }
         } else {
             // We need to update an existing object with all the new
             // information. We can just remove all existing components
@@ -282,9 +294,9 @@ class Broker
             foreach ($existingObject->getComponents() as $component) {
                 $existingObject->remove($component);
             }
-            foreach ($itipMessage->message->getComponents() as $component) {
-                $existingObject->add(clone $component);
-            }
+        }
+        foreach ($itipMessage->message->getComponents() as $component) {
+            $existingObject->add(clone $component);
         }
 
         return $existingObject;
@@ -296,12 +308,8 @@ class Broker
      * This is a message from an organizer, and means that either an
      * attendee got removed from an event, or an event got cancelled
      * altogether.
-     *
-     * @param VCalendar $existingObject
-     *
-     * @return VCalendar|null
      */
-    protected function processMessageCancel(Message $itipMessage, VCalendar $existingObject = null)
+    protected function processMessageCancel(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
     {
         if (!$existingObject) {
             // The event didn't exist in the first place, so we're just
@@ -322,28 +330,31 @@ class Broker
      * The message is a reply. This is for example an attendee telling
      * an organizer he accepted the invite, or declined it.
      *
-     * @param VCalendar $existingObject
-     *
-     * @return VCalendar|null
+     * @throws InvalidDataException
+     * @throws MaxInstancesExceededException
+     * @throws NoInstancesException
      */
-    protected function processMessageReply(Message $itipMessage, VCalendar $existingObject = null)
+    protected function processMessageReply(Message $itipMessage, ?VCalendar $existingObject = null): ?VCalendar
     {
         // A reply can only be processed based on an existing object.
         // If the object is not available, the reply is ignored.
         if (!$existingObject) {
-            return;
+            return null;
         }
         $instances = [];
         $requestStatus = '2.0';
 
         // Finding all the instances the attendee replied to.
         foreach ($itipMessage->message->VEVENT as $vevent) {
-            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
+            // Use the Unix timestamp returned by getTimestamp as a unique identifier for the recurrence.
+            // The Unix timestamp will be the same for an event, even if the reply from the attendee
+            // used a different format/timezone to express the event date-time.
+            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() : 'master';
             $attendee = $vevent->ATTENDEE;
             $instances[$recurId] = $attendee['PARTSTAT']->getValue();
             if (isset($vevent->{'REQUEST-STATUS'})) {
                 $requestStatus = $vevent->{'REQUEST-STATUS'}->getValue();
-                list($requestStatus) = explode(';', $requestStatus);
+                [$requestStatus] = explode(';', $requestStatus);
             }
         }
 
@@ -351,7 +362,8 @@ class Broker
         // all the instances where we have a reply for.
         $masterObject = null;
         foreach ($existingObject->VEVENT as $vevent) {
-            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
+            // Use the Unix timestamp returned by getTimestamp as a unique identifier for the recurrence.
+            $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() : 'master';
             if ('master' === $recurId) {
                 $masterObject = $vevent;
             }
@@ -386,7 +398,7 @@ class Broker
 
         if (!$masterObject) {
             // No master object, we can't add new instances.
-            return;
+            return null;
         }
         // If we got replies to instances that did not exist in the
         // original list, it means that new exceptions must be created.
@@ -398,7 +410,10 @@ class Broker
                 $newObject = $recurrenceIterator->getEventObject();
                 $recurrenceIterator->next();
 
-                if (isset($newObject->{'RECURRENCE-ID'}) && $newObject->{'RECURRENCE-ID'}->getValue() === $recurId) {
+                // Compare the Unix timestamp returned by getTimestamp with the previously calculated timestamp.
+                // If they are the same, then this is a matching recurrence, even though its date-time may have
+                // been expressed in a different format/timezone.
+                if (isset($newObject->{'RECURRENCE-ID'}) && $newObject->{'RECURRENCE-ID'}->getDateTime()->getTimestamp() === $recurId) {
                     $found = true;
                 }
                 --$iterations;
@@ -446,10 +461,8 @@ class Broker
      *
      * We will detect which attendees got added, which got removed and create
      * specific messages for these situations.
-     *
-     * @return array
      */
-    protected function parseEventForOrganizer(VCalendar $calendar, array $eventInfo, array $oldEventInfo)
+    protected function parseEventForOrganizer(VCalendar $calendar, array $eventInfo, array $oldEventInfo): array
     {
         // Merging attendee lists.
         $attendees = [];
@@ -479,7 +492,6 @@ class Broker
         }
 
         $messages = [];
-
         foreach ($attendees as $attendee) {
             // An organizer can also be an attendee. We should not generate any
             // messages for those.
@@ -503,14 +515,16 @@ class Broker
                 $icalMsg->add(clone $timezone);
             }
 
-            if (!$attendee['newInstances']) {
-                // If there are no instances the attendee is a part of, it
-                // means the attendee was removed and we need to send him a
-                // CANCEL.
+            if (!$attendee['newInstances'] || 'CANCELLED' === $eventInfo['status']) {
+                // If there are no instances the attendee is a part of, it means
+                // the attendee was removed and we need to send them a CANCEL message.
+                // Also If the meeting STATUS property was changed to CANCELLED
+                // we need to send the attendee a CANCEL message.
                 $message->method = 'CANCEL';
 
                 $icalMsg->METHOD = $message->method;
 
+                /** @var VEvent $event */
                 $event = $icalMsg->add('VEVENT', [
                     'UID' => $message->uid,
                     'SEQUENCE' => $message->sequence,
@@ -551,10 +565,10 @@ class Broker
                 $newAttendeeInstances = array_keys($attendee['newInstances']);
 
                 $message->significantChange =
-                    'REQUEST' === $attendee['forceSend'] ||
-                    count($oldAttendeeInstances) != count($newAttendeeInstances) ||
-                    count(array_diff($oldAttendeeInstances, $newAttendeeInstances)) > 0 ||
-                    $oldEventInfo['significantChangeHash'] !== $eventInfo['significantChangeHash'];
+                    'REQUEST' === $attendee['forceSend']
+                    || count($oldAttendeeInstances) !== count($newAttendeeInstances)
+                    || count(array_diff($oldAttendeeInstances, $newAttendeeInstances)) > 0
+                    || $oldEventInfo['significantChangeHash'] !== $eventInfo['significantChangeHash'];
 
                 foreach ($attendee['newInstances'] as $instanceId => $instanceInfo) {
                     $currentEvent = clone $eventInfo['instances'][$instanceId];
@@ -562,9 +576,9 @@ class Broker
                         // We need to find a list of events that the attendee
                         // is not a part of to add to the list of exceptions.
                         $exceptions = [];
-                        foreach ($eventInfo['instances'] as $instanceId => $vevent) {
-                            if (!isset($attendee['newInstances'][$instanceId])) {
-                                $exceptions[] = $instanceId;
+                        foreach ($eventInfo['instances'] as $eventInstanceId => $vevent) {
+                            if (!isset($attendee['newInstances'][$eventInstanceId])) {
+                                $exceptions[] = $eventInstanceId;
                             }
                         }
 
@@ -578,6 +592,9 @@ class Broker
                                 ));
                             } else {
                                 $currentEvent->EXDATE = $exceptions;
+                                if ($currentEvent->DTSTART['TZID']) {
+                                    $currentEvent->EXDATE['TZID'] = clone $currentEvent->DTSTART['TZID'];
+                                }
                             }
                         }
 
@@ -586,15 +603,13 @@ class Broker
                         unset($currentEvent->ORGANIZER['SCHEDULE-FORCE-SEND']);
                         unset($currentEvent->ORGANIZER['SCHEDULE-STATUS']);
 
-                        foreach ($currentEvent->ATTENDEE as $attendee) {
-                            unset($attendee['SCHEDULE-FORCE-SEND']);
-                            unset($attendee['SCHEDULE-STATUS']);
+                        foreach ($currentEvent->ATTENDEE as $currentEventAttendee) {
+                            unset($currentEventAttendee['SCHEDULE-FORCE-SEND']);
+                            unset($currentEventAttendee['SCHEDULE-STATUS']);
 
                             // We're adding PARTSTAT=NEEDS-ACTION to ensure that
                             // iOS shows an "Inbox Item"
-                            if (!isset($attendee['PARTSTAT'])) {
-                                $attendee['PARTSTAT'] = 'NEEDS-ACTION';
-                            }
+                            $currentEventAttendee['PARTSTAT'] ??= 'NEEDS-ACTION';
                         }
                     }
 
@@ -615,11 +630,11 @@ class Broker
      *
      * This function figures out if we need to send a reply to an organizer.
      *
-     * @param string $attendee
-     *
      * @return Message[]
+     *
+     * @throws InvalidDataException
      */
-    protected function parseEventForAttendee(VCalendar $calendar, array $eventInfo, array $oldEventInfo, $attendee)
+    protected function parseEventForAttendee(VCalendar $calendar, array $eventInfo, array $oldEventInfo, string $attendee): array
     {
         if ($this->scheduleAgentServerRules && 'CLIENT' === $eventInfo['organizerScheduleAgent']) {
             return [];
@@ -631,7 +646,12 @@ class Broker
             return [];
         }
 
-        $oldInstances = !empty($oldEventInfo['attendees'][$attendee]['instances']) ?
+        $oldInstances =
+            is_array($oldEventInfo['attendees'])
+            && array_key_exists($attendee, $oldEventInfo['attendees'])
+            && is_array($oldEventInfo['attendees'][$attendee])
+            && array_key_exists('instances', $oldEventInfo['attendees'][$attendee])
+            && is_array($oldEventInfo['attendees'][$attendee]['instances']) ?
             $oldEventInfo['attendees'][$attendee]['instances'] :
             [];
 
@@ -662,7 +682,7 @@ class Broker
         // We only need to do that though, if the master event is not declined.
         if (isset($instances['master']) && 'DECLINED' !== $instances['master']['newstatus']) {
             foreach ($eventInfo['exdate'] as $exDate) {
-                if (!in_array($exDate, $oldEventInfo['exdate'])) {
+                if (!in_array($exDate, $oldEventInfo['exdate'] ?? [], true)) {
                     if (isset($instances[$exDate])) {
                         $instances[$exDate]['newstatus'] = 'DECLINED';
                     } else {
@@ -705,11 +725,12 @@ class Broker
         $hasReply = false;
 
         foreach ($instances as $instance) {
-            if ($instance['oldstatus'] == $instance['newstatus'] && 'REPLY' !== $eventInfo['organizerForceSend']) {
+            if ($instance['oldstatus'] === $instance['newstatus'] && 'REPLY' !== $eventInfo['organizerForceSend']) {
                 // Skip
                 continue;
             }
 
+            /** @var VEvent $event */
             $event = $icalMsg->add('VEVENT', [
                 'UID' => $message->uid,
                 'SEQUENCE' => $message->sequence,
@@ -736,7 +757,7 @@ class Broker
                 // EXDATE
                 $dt = DateTimeParser::parse($instance['id'], $eventInfo['timezone']);
                 // Treat is as a DATE field
-                if (strlen($instance['id']) <= 8) {
+                if (strlen((string) $instance['id']) <= 8) {
                     $event->add('DTSTART', $dt, ['VALUE' => 'DATE']);
                 } else {
                     $event->add('DTSTART', $dt);
@@ -748,7 +769,7 @@ class Broker
             if ('master' !== $instance['id']) {
                 $dt = DateTimeParser::parse($instance['id'], $eventInfo['timezone']);
                 // Treat is as a DATE field
-                if (strlen($instance['id']) <= 8) {
+                if (strlen((string) $instance['id']) <= 8) {
                     $event->add('RECURRENCE-ID', $dt, ['VALUE' => 'DATE']);
                 } else {
                     $event->add('RECURRENCE-ID', $dt);
@@ -771,9 +792,9 @@ class Broker
             $message->message = $icalMsg;
 
             return [$message];
-        } else {
-            return [];
         }
+
+        return [];
     }
 
     /**
@@ -796,11 +817,10 @@ class Broker
      * 11. significantChangeHash
      * 12. status
      *
-     * @param VCalendar $calendar
-     *
-     * @return array
+     * @throws ITipException
+     * @throws SameOrganizerForAllComponentsException
      */
-    protected function parseEventInfo(VCalendar $calendar = null)
+    protected function parseEventInfo(VCalendar $calendar): array
     {
         $uid = null;
         $organizer = null;
@@ -811,8 +831,6 @@ class Broker
         $status = null;
         $organizerScheduleAgent = 'SERVER';
 
-        $significantChangeHash = '';
-
         // Now we need to collect a list of attendees, and which instances they
         // are a part of.
         $attendees = [];
@@ -841,9 +859,9 @@ class Broker
             if (isset($vevent->ORGANIZER)) {
                 if (is_null($organizer)) {
                     $organizer = $vevent->ORGANIZER->getNormalizedValue();
-                    $organizerName = isset($vevent->ORGANIZER['CN']) ? $vevent->ORGANIZER['CN'] : null;
+                    $organizerName = $vevent->ORGANIZER['CN'] ?? null;
                 } else {
-                    if (strtoupper($organizer) !== strtoupper($vevent->ORGANIZER->getNormalizedValue())) {
+                    if (strtoupper($organizer) !== strtoupper((string) $vevent->ORGANIZER->getNormalizedValue())) {
                         throw new SameOrganizerForAllComponentsException('Every instance of the event must have the same organizer.');
                     }
                 }
@@ -869,7 +887,7 @@ class Broker
                 foreach ($vevent->select('RRULE') as $rr) {
                     foreach ($rr->getParts() as $key => $val) {
                         // ignore default values (https://github.com/sabre-io/vobject/issues/126)
-                        if ('INTERVAL' === $key && 1 == $val) {
+                        if ('INTERVAL' === $key && '1' === (string) $val) {
                             continue;
                         }
                         if (is_array($val)) {
@@ -881,7 +899,7 @@ class Broker
                 sort($rrule);
             }
             if (isset($vevent->STATUS)) {
-                $status = strtoupper($vevent->STATUS->getValue());
+                $status = strtoupper((string) $vevent->STATUS->getValue());
             }
 
             $recurId = isset($vevent->{'RECURRENCE-ID'}) ? $vevent->{'RECURRENCE-ID'}->getValue() : 'master';
@@ -892,11 +910,14 @@ class Broker
                     $timezone = $vevent->{'RECURRENCE-ID'}->getDateTime()->getTimeZone();
                 }
             }
+
+            $instances[$recurId] = $vevent;
+
             if (isset($vevent->ATTENDEE)) {
                 foreach ($vevent->ATTENDEE as $attendee) {
-                    if ($this->scheduleAgentServerRules &&
-                        isset($attendee['SCHEDULE-AGENT']) &&
-                        'CLIENT' === strtoupper($attendee['SCHEDULE-AGENT']->getValue())
+                    if ($this->scheduleAgentServerRules
+                        && isset($attendee['SCHEDULE-AGENT'])
+                        && 'CLIENT' === strtoupper((string) $attendee['SCHEDULE-AGENT']->getValue())
                     ) {
                         continue;
                     }
@@ -930,10 +951,10 @@ class Broker
                         ];
                     }
                 }
-                $instances[$recurId] = $vevent;
             }
 
             foreach ($this->significantChangeProperties as $prop) {
+                // @phpstan-ignore property.dynamicName
                 if (isset($vevent->$prop)) {
                     $propertyValues = $vevent->select($prop);
 
@@ -955,9 +976,7 @@ class Broker
 
         asort($significantChangeEventProperties);
 
-        foreach ($significantChangeEventProperties as $eventSignificantChangeHash) {
-            $significantChangeHash .= $eventSignificantChangeHash;
-        }
+        $significantChangeHash = implode('', $significantChangeEventProperties);
         $significantChangeHash = md5($significantChangeHash);
 
         return compact(
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/ITipException.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/ITipException.php
index 949563614..c949cdb7c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/ITipException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/ITipException.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject\ITip;
 
-use Exception;
-
 /**
  * This message is emitted in case of serious problems with iTip messages.
  *
@@ -11,6 +9,6 @@ use Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class ITipException extends Exception
+class ITipException extends \Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
index 43536f172..505e07f25 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/ITip/Message.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject\ITip;
 
+use Sabre\VObject\Component\VCalendar;
+
 /**
  * This class represents an iTip message.
  *
@@ -18,32 +20,24 @@ class Message
 {
     /**
      * The object's UID.
-     *
-     * @var string
      */
-    public $uid;
+    public string $uid;
 
     /**
      * The component type, such as VEVENT.
-     *
-     * @var string
      */
-    public $component;
+    public string $component;
 
     /**
      * Contains the ITip method, which is something like REQUEST, REPLY or
      * CANCEL.
-     *
-     * @var string
      */
-    public $method;
+    public ?string $method = null;
 
     /**
      * The current sequence number for the event.
-     *
-     * @var int
      */
-    public $sequence;
+    public ?int $sequence = null;
 
     /**
      * The senders' email address.
@@ -51,33 +45,25 @@ class Message
      * Note that this does not imply that this has to be used in a From: field
      * if the message is sent by email. It may also be populated in Reply-To:
      * or not at all.
-     *
-     * @var string
      */
-    public $sender;
+    public string $sender;
 
     /**
      * The name of the sender. This is often populated from a CN parameter from
      * either the ORGANIZER or ATTENDEE, depending on the message.
-     *
-     * @var string|null
      */
-    public $senderName;
+    public ?string $senderName = null;
 
     /**
      * The recipient's email address.
-     *
-     * @var string
      */
-    public $recipient;
+    public string $recipient;
 
     /**
      * The name of the recipient. This is usually populated with the CN
      * parameter from the ATTENDEE or ORGANIZER property, if it's available.
-     *
-     * @var string|null
      */
-    public $recipientName;
+    public ?string $recipientName = null;
 
     /**
      * After the message has been delivered, this should contain a string such
@@ -87,17 +73,13 @@ class Message
      *
      * See:
      * http://tools.ietf.org/html/rfc6638#section-7.3
-     *
-     * @var string
      */
-    public $scheduleStatus;
+    public ?string $scheduleStatus = null;
 
     /**
      * The iCalendar / iTip body.
-     *
-     * @var \Sabre\VObject\Component\VCalendar
      */
-    public $message;
+    public VCalendar $message;
 
     /**
      * This will be set to true, if the iTip broker considers the change
@@ -110,10 +92,8 @@ class Message
      *
      * To see the list of properties that are considered 'significant', check
      * out Sabre\VObject\ITip\Broker::$significantChangeProperties.
-     *
-     * @var bool
      */
-    public $significantChange = true;
+    public bool $significantChange = true;
 
     /**
      * Returns the schedule status as a string.
@@ -127,10 +107,9 @@ class Message
     {
         if (!$this->scheduleStatus) {
             return false;
-        } else {
-            list($scheduleStatus) = explode(';', $this->scheduleStatus);
-
-            return $scheduleStatus;
         }
+        [$scheduleStatus] = explode(';', $this->scheduleStatus);
+
+        return $scheduleStatus;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
index 2041b2ac7..47889a2ab 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Node.php
@@ -19,7 +19,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * If REPAIR is set, the validator will attempt to repair any broken data
      * (if possible).
      */
-    const REPAIR = 1;
+    public const REPAIR = 1;
 
     /**
      * If this option is set, the validator will operate on the vcards on the
@@ -28,7 +28,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * This means for example that the UID is required, whereas it is not for
      * regular vcards.
      */
-    const PROFILE_CARDDAV = 2;
+    public const PROFILE_CARDDAV = 2;
 
     /**
      * If this option is set, the validator will operate on iCalendar objects
@@ -37,41 +37,33 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * This means for example that calendars can only contain objects with
      * identical component types and UIDs.
      */
-    const PROFILE_CALDAV = 4;
+    public const PROFILE_CALDAV = 4;
 
     /**
      * Reference to the parent object, if this is not the top object.
-     *
-     * @var Node
      */
-    public $parent;
+    public ?Node $parent = null;
 
     /**
      * Iterator override.
-     *
-     * @var ElementList
      */
-    protected $iterator = null;
+    protected ?ElementList $iterator = null;
 
     /**
      * The root document.
-     *
-     * @var Component
      */
-    protected $root;
+    protected ?Component $root = null;
 
     /**
      * Serializes the node into a mimedir format.
-     *
-     * @return string
      */
-    abstract public function serialize();
+    abstract public function serialize(): string;
 
     /**
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
      *
-     * @return array
+     * @return array|string
      */
     #[\ReturnTypeWillChange]
     abstract public function jsonSerialize();
@@ -82,7 +74,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      *
      * @param Xml\Writer $writer XML writer
      */
-    abstract public function xmlSerialize(Xml\Writer $writer);
+    abstract public function xmlSerialize(Xml\Writer $writer): void;
 
     /**
      * Call this method on a document if you're done using it.
@@ -90,7 +82,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * It's intended to remove all circular references, so PHP can easily clean
      * it up.
      */
-    public function destroy()
+    public function destroy(): void
     {
         $this->parent = null;
         $this->root = null;
@@ -100,11 +92,9 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
 
     /**
      * Returns the iterator for this object.
-     *
-     * @return ElementList
      */
     #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): ?ElementList
     {
         if (!is_null($this->iterator)) {
             return $this->iterator;
@@ -118,7 +108,7 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      *
      * Note that this is not actually part of the iterator interface
      */
-    public function setIterator(ElementList $iterator)
+    public function setIterator(ElementList $iterator): void
     {
         $this->iterator = $iterator;
     }
@@ -140,12 +130,8 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      *   1 - The issue was repaired (only happens if REPAIR was turned on)
      *   2 - An inconsequential issue
      *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         return [];
     }
@@ -156,11 +142,9 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
 
     /**
      * Returns the number of elements.
-     *
-     * @return int
      */
     #[\ReturnTypeWillChange]
-    public function count()
+    public function count(): int
     {
         $it = $this->getIterator();
 
@@ -177,11 +161,9 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * This method just forwards the request to the inner iterator
      *
      * @param int $offset
-     *
-     * @return bool
      */
     #[\ReturnTypeWillChange]
-    public function offsetExists($offset)
+    public function offsetExists($offset): bool
     {
         $iterator = $this->getIterator();
 
@@ -194,8 +176,6 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * This method just forwards the request to the inner iterator
      *
      * @param int $offset
-     *
-     * @return mixed
      */
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
@@ -210,19 +190,18 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      *
      * This method just forwards the request to the inner iterator
      *
-     * @param int   $offset
-     * @param mixed $value
+     * @param int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($offset, $value)
+    public function offsetSet($offset, $value): void
     {
         $iterator = $this->getIterator();
         $iterator->offsetSet($offset, $value);
 
         // @codeCoverageIgnoreStart
-    //
-    // This method always throws an exception, so we ignore the closing
-    // brace
+        //
+        // This method always throws an exception, so we ignore the closing
+        // brace
     }
 
     // @codeCoverageIgnoreEnd
@@ -235,15 +214,15 @@ abstract class Node implements \IteratorAggregate, \ArrayAccess, \Countable, \Js
      * @param int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($offset)
+    public function offsetUnset($offset): void
     {
         $iterator = $this->getIterator();
         $iterator->offsetUnset($offset);
 
         // @codeCoverageIgnoreStart
-    //
-    // This method always throws an exception, so we ignore the closing
-    // brace
+        //
+        // This method always throws an exception, so we ignore the closing
+        // brace
     }
 
     // @codeCoverageIgnoreEnd
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
index 45c0a21c6..aad5438a5 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/PHPUnitAssertions.php
@@ -30,9 +30,8 @@ trait PHPUnitAssertions
      *
      * @param resource|string|Component $expected
      * @param resource|string|Component $actual
-     * @param string                    $message
      */
-    public function assertVObjectEqualsVObject($expected, $actual, $message = '')
+    public function assertVObjectEqualsVObject($expected, $actual, string $message = ''): void
     {
         $getObj = function ($input) {
             if (is_resource($input)) {
@@ -42,7 +41,7 @@ trait PHPUnitAssertions
                 $input = Reader::read($input);
             }
             if (!$input instanceof Component) {
-                $this->fail('Input must be a string, stream or VObject component');
+                self::fail('Input must be a string, stream or VObject component');
             }
             unset($input->PRODID);
             if ($input instanceof Component\VCalendar && 'GREGORIAN' === (string) $input->CALSCALE) {
@@ -52,23 +51,28 @@ trait PHPUnitAssertions
             return $input;
         };
 
-        $expected = $getObj($expected)->serialize();
-        $actual = $getObj($actual)->serialize();
+        /**
+         * @var string $expectedSerialized
+         */
+        $expectedSerialized = $getObj($expected)->serialize();
+        $actualSerialized = $getObj($actual)->serialize();
 
         // Finding wildcards in expected.
-        preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expected, $matches, PREG_SET_ORDER);
+        $result = preg_match_all('|^([A-Z]+):\\*\\*ANY\\*\\*\r$|m', $expectedSerialized, $matches, PREG_SET_ORDER);
+
+        self::assertNotFalse($result);
 
         foreach ($matches as $match) {
-            $actual = preg_replace(
+            $actualSerialized = preg_replace(
                 '|^'.preg_quote($match[1], '|').':(.*)\r$|m',
                 $match[1].':**ANY**'."\r",
-                $actual
+                (string) $actualSerialized
             );
         }
 
-        $this->assertEquals(
-            $expected,
-            $actual,
+        self::assertEquals(
+            $expectedSerialized,
+            $actualSerialized,
             $message
         );
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
index 7e4d55743..c97e76ea9 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parameter.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject;
 
-use ArrayIterator;
 use Sabre\Xml;
 
 /**
@@ -17,28 +16,24 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Parameter extends Node
+class Parameter extends Node implements \Stringable
 {
     /**
      * Parameter name.
-     *
-     * @var string
      */
-    public $name;
+    public string $name;
 
     /**
      * vCard 2.1 allows parameters to be encoded without a name.
      *
      * We can deduce the parameter name based on its value.
-     *
-     * @var bool
      */
-    public $noName = false;
+    public bool $noName = false;
 
     /**
      * Parameter value.
      *
-     * @var string
+     * @var string|array|null
      */
     protected $value;
 
@@ -47,16 +42,16 @@ class Parameter extends Node
      *
      * It's recommended to use the create:: factory method instead.
      *
-     * @param string $name
-     * @param string $value
+     * @param string|array|null $value
      */
-    public function __construct(Document $root, $name, $value = null)
+    public function __construct(Document $root, ?string $name, $value = null)
     {
-        $this->name = strtoupper($name);
         $this->root = $root;
         if (is_null($name)) {
             $this->noName = true;
             $this->name = static::guessParameterNameByValue($value);
+        } else {
+            $this->name = strtoupper($name);
         }
 
         // If guessParameterNameByValue() returns an empty string
@@ -76,90 +71,15 @@ class Parameter extends Node
      * Figuring out what the name should have been. Note that a ton of
      * these are rather silly in 2014 and would probably rarely be
      * used, but we like to be complete.
-     *
-     * @param string $value
-     *
-     * @return string
      */
-    public static function guessParameterNameByValue($value)
+    public static function guessParameterNameByValue(string $value): string
     {
-        switch (strtoupper($value)) {
-            // Encodings
-            case '7-BIT':
-            case 'QUOTED-PRINTABLE':
-            case 'BASE64':
-                $name = 'ENCODING';
-                break;
-
-            // Common types
-            case 'WORK':
-            case 'HOME':
-            case 'PREF':
-            // Delivery Label Type
-            case 'DOM':
-            case 'INTL':
-            case 'POSTAL':
-            case 'PARCEL':
-            // Telephone types
-            case 'VOICE':
-            case 'FAX':
-            case 'MSG':
-            case 'CELL':
-            case 'PAGER':
-            case 'BBS':
-            case 'MODEM':
-            case 'CAR':
-            case 'ISDN':
-            case 'VIDEO':
-            // EMAIL types (lol)
-            case 'AOL':
-            case 'APPLELINK':
-            case 'ATTMAIL':
-            case 'CIS':
-            case 'EWORLD':
-            case 'INTERNET':
-            case 'IBMMAIL':
-            case 'MCIMAIL':
-            case 'POWERSHARE':
-            case 'PRODIGY':
-            case 'TLX':
-            case 'X400':
-            // Photo / Logo format types
-            case 'GIF':
-            case 'CGM':
-            case 'WMF':
-            case 'BMP':
-            case 'DIB':
-            case 'PICT':
-            case 'TIFF':
-            case 'PDF':
-            case 'PS':
-            case 'JPEG':
-            case 'MPEG':
-            case 'MPEG2':
-            case 'AVI':
-            case 'QTIME':
-            // Sound Digital Audio Type
-            case 'WAVE':
-            case 'PCM':
-            case 'AIFF':
-            // Key types
-            case 'X509':
-            case 'PGP':
-                $name = 'TYPE';
-                break;
-
-            // Value types
-            case 'INLINE':
-            case 'URL':
-            case 'CONTENT-ID':
-            case 'CID':
-                $name = 'VALUE';
-                break;
-
-            default:
-                $name = '';
-        }
+        $name = match (strtoupper($value)) {
+            '7-BIT', 'QUOTED-PRINTABLE', 'BASE64' => 'ENCODING',
+            'WORK', 'HOME', 'PREF', 'DOM', 'INTL', 'POSTAL', 'PARCEL', 'VOICE', 'FAX', 'MSG', 'CELL', 'PAGER', 'BBS', 'MODEM', 'CAR', 'ISDN', 'VIDEO', 'AOL', 'APPLELINK', 'ATTMAIL', 'CIS', 'EWORLD', 'INTERNET', 'IBMMAIL', 'MCIMAIL', 'POWERSHARE', 'PRODIGY', 'TLX', 'X400', 'GIF', 'CGM', 'WMF', 'BMP', 'DIB', 'PICT', 'TIFF', 'PDF', 'PS', 'JPEG', 'MPEG', 'MPEG2', 'AVI', 'QTIME', 'WAVE', 'PCM', 'AIFF', 'X509', 'PGP' => 'TYPE',
+            'INLINE', 'URL', 'CONTENT-ID', 'CID' => 'VALUE',
+            default => '',
+        };
 
         return $name;
     }
@@ -171,7 +91,7 @@ class Parameter extends Node
      *
      * @param string|array $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
         $this->value = $value;
     }
@@ -181,22 +101,20 @@ class Parameter extends Node
      *
      * This method will always return a string, or null. If there were multiple
      * values, it will automatically concatenate them (separated by comma).
-     *
-     * @return string|null
      */
-    public function getValue()
+    public function getValue(): ?string
     {
         if (is_array($this->value)) {
             return implode(',', $this->value);
-        } else {
-            return $this->value;
         }
+
+        return $this->value;
     }
 
     /**
      * Sets multiple values for this parameter.
      */
-    public function setParts(array $value)
+    public function setParts(array $value): void
     {
         $this->value = $value;
     }
@@ -205,18 +123,16 @@ class Parameter extends Node
      * Returns all values for this parameter.
      *
      * If there were no values, an empty array will be returned.
-     *
-     * @return array
      */
-    public function getParts()
+    public function getParts(): array
     {
         if (is_array($this->value)) {
             return $this->value;
         } elseif (is_null($this->value)) {
             return [];
-        } else {
-            return [$this->value];
         }
+
+        return [$this->value];
     }
 
     /**
@@ -227,7 +143,7 @@ class Parameter extends Node
      *
      * @param string|array $part
      */
-    public function addValue($part)
+    public function addValue($part): void
     {
         if (is_null($this->value)) {
             $this->value = $part;
@@ -239,28 +155,23 @@ class Parameter extends Node
     /**
      * Checks if this parameter contains the specified value.
      *
-     * This is a case-insensitive match. It makes sense to call this for for
-     * instance the TYPE parameter, to see if it contains a keyword such as
+     * This is a case-insensitive match. It makes sense to call this for
+     * the TYPE parameter, for instance, to see if it contains a keyword such as
      * 'WORK' or 'FAX'.
-     *
-     * @param string $value
-     *
-     * @return bool
      */
-    public function has($value)
+    public function has(string $value): bool
     {
         return in_array(
             strtolower($value),
-            array_map('strtolower', (array) $this->value)
+            array_map(strtolower(...), (array) $this->value),
+            true
         );
     }
 
     /**
      * Turns the object back into a serialized blob.
-     *
-     * @return string
      */
-    public function serialize()
+    public function serialize(): string
     {
         $value = $this->getParts();
 
@@ -297,20 +208,19 @@ class Parameter extends Node
                 // added + as well.
                 if (!preg_match('#(?: [\n":;\^,\+] )#x', $item)) {
                     return $out.$item;
-                } else {
-                    // Enclosing in double-quotes, and using RFC6868 for encoding any
-                    // special characters
-                    $out .= '"'.strtr(
-                        $item,
-                        [
-                            '^' => '^^',
-                            "\n" => '^n',
-                            '"' => '^\'',
-                        ]
-                    ).'"';
-
-                    return $out;
                 }
+                // Enclosing in double-quotes, and using RFC6868 for encoding any
+                // special characters
+                $out .= '"'.strtr(
+                    $item,
+                    [
+                        '^' => '^^',
+                        "\n" => '^n',
+                        '"' => '^\'',
+                    ]
+                ).'"';
+
+                return $out;
             }
         );
     }
@@ -319,7 +229,7 @@ class Parameter extends Node
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
      *
-     * @return array
+     * @return array|string|null
      */
     #[\ReturnTypeWillChange]
     public function jsonSerialize()
@@ -333,35 +243,31 @@ class Parameter extends Node
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
-        foreach (explode(',', $this->value) as $value) {
+        foreach (is_array($this->value) ? $this->value : explode(',', $this->value) as $value) {
             $writer->writeElement('text', $value);
         }
     }
 
     /**
      * Called when this object is being cast to a string.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->getValue();
     }
 
     /**
      * Returns the iterator for this object.
-     *
-     * @return ElementList
      */
     #[\ReturnTypeWillChange]
-    public function getIterator()
+    public function getIterator(): ElementList
     {
         if (!is_null($this->iterator)) {
             return $this->iterator;
         }
 
-        return $this->iterator = new ArrayIterator((array) $this->value);
+        return $this->iterator = new ElementList((array) $this->value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
index f33603207..e54a61c7e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Json.php
@@ -2,11 +2,14 @@
 
 namespace Sabre\VObject\Parser;
 
+use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
 use Sabre\VObject\EofException;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\ParseException;
+use Sabre\VObject\Property;
 use Sabre\VObject\Property\FlatText;
 use Sabre\VObject\Property\Text;
 
@@ -23,17 +26,13 @@ class Json extends Parser
 {
     /**
      * The input data.
-     *
-     * @var array
      */
-    protected $input;
+    protected ?array $input = null;
 
     /**
      * Root component.
-     *
-     * @var Document
      */
-    protected $root;
+    protected ?Document $root = null;
 
     /**
      * This method starts the parsing process.
@@ -44,11 +43,12 @@ class Json extends Parser
      * If either input or options are not supplied, the defaults will be used.
      *
      * @param resource|string|array|null $input
-     * @param int                        $options
      *
-     * @return \Sabre\VObject\Document
+     * @throws EofException
+     * @throws ParseException
+     * @throws InvalidDataException
      */
-    public function parse($input = null, $options = 0)
+    public function parse($input = null, int $options = 0): ?Document
     {
         if (!is_null($input)) {
             $this->setInput($input);
@@ -61,16 +61,11 @@ class Json extends Parser
             $this->options = $options;
         }
 
-        switch ($this->input[0]) {
-            case 'vcalendar':
-                $this->root = new VCalendar([], false);
-                break;
-            case 'vcard':
-                $this->root = new VCard([], false);
-                break;
-            default:
-                throw new ParseException('The root component must either be a vcalendar, or a vcard');
-        }
+        $this->root = match ($this->input[0]) {
+            'vcalendar' => new VCalendar([], false),
+            'vcard' => new VCard([], false),
+            default => throw new ParseException('The root component must either be a vcalendar, or a vcard'),
+        };
         foreach ($this->input[1] as $prop) {
             $this->root->add($this->parseProperty($prop));
         }
@@ -80,7 +75,7 @@ class Json extends Parser
             }
         }
 
-        // Resetting the input so we can throw an feof exception the next time.
+        // Resetting the input so that we can throw an feof exception the next time.
         $this->input = null;
 
         return $this->root;
@@ -89,25 +84,21 @@ class Json extends Parser
     /**
      * Parses a component.
      *
-     * @return \Sabre\VObject\Component
+     * @throws InvalidDataException
      */
-    public function parseComponent(array $jComp)
+    public function parseComponent(array $jComp): Component
     {
         // We can remove $self from PHP 5.4 onward.
         $self = $this;
 
         $properties = array_map(
-            function ($jProp) use ($self) {
-                return $self->parseProperty($jProp);
-            },
+            $self->parseProperty(...),
             $jComp[1]
         );
 
         if (isset($jComp[2])) {
             $components = array_map(
-                function ($jComp) use ($self) {
-                    return $self->parseComponent($jComp);
-                },
+                $self->parseComponent(...),
                 $jComp[2]
             );
         } else {
@@ -117,24 +108,24 @@ class Json extends Parser
         return $this->root->createComponent(
             $jComp[0],
             array_merge($properties, $components),
-            $defaults = false
+            false
         );
     }
 
     /**
      * Parses properties.
      *
-     * @return \Sabre\VObject\Property
+     * @throws InvalidDataException
      */
-    public function parseProperty(array $jProp)
+    public function parseProperty(array $jProp): Property
     {
         list(
             $propertyName,
             $parameters,
-            $valueType
+            $valueType,
         ) = $jProp;
 
-        $propertyName = strtoupper($propertyName);
+        $propertyName = strtoupper((string) $propertyName);
 
         // This is the default class we would be using if we didn't know the
         // value type. We're using this value later in this function.
@@ -144,13 +135,17 @@ class Json extends Parser
 
         $value = array_slice($jProp, 3);
 
-        $valueType = strtoupper($valueType);
+        $valueType = strtoupper((string) $valueType);
 
         if (isset($parameters['group'])) {
             $propertyName = $parameters['group'].'.'.$propertyName;
             unset($parameters['group']);
         }
 
+        if ('X-CRYPTO' === $propertyName) {
+            $propertyType = 'X-CRYPTO';
+        }
+
         $prop = $this->root->createProperty($propertyName, null, $parameters, $valueType);
         $prop->setJsonValue($value);
 
@@ -165,7 +160,7 @@ class Json extends Parser
         // If the value type we received (e.g.: TEXT) was not the default value
         // type for the given property (e.g.: BDAY), we need to add a VALUE=
         // parameter.
-        if ($defaultPropertyClass !== get_class($prop)) {
+        if ($defaultPropertyClass !== $prop::class) {
             $prop['VALUE'] = $valueType;
         }
 
@@ -177,7 +172,7 @@ class Json extends Parser
      *
      * @param resource|string|array $input
      */
-    public function setInput($input)
+    public function setInput($input): void
     {
         if (is_resource($input)) {
             $input = stream_get_contents($input);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
index db0f81531..1263ced8e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/MimeDir.php
@@ -2,13 +2,14 @@
 
 namespace Sabre\VObject\Parser;
 
-use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
 use Sabre\VObject\Document;
 use Sabre\VObject\EofException;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Node;
 use Sabre\VObject\ParseException;
+use Sabre\VObject\Property;
 
 /**
  * MimeDir parser.
@@ -25,6 +26,11 @@ use Sabre\VObject\ParseException;
  */
 class MimeDir extends Parser
 {
+    public const TOKEN_PROPNAME = 1;
+    public const TOKEN_PROPVALUE = 2;
+    public const TOKEN_PARAMNAME = 3;
+    public const TOKEN_PARAMVALUE = 4;
+
     /**
      * The input stream.
      *
@@ -34,13 +40,11 @@ class MimeDir extends Parser
 
     /**
      * Root component.
-     *
-     * @var Component
      */
-    protected $root;
+    protected ?Document $root = null;
 
     /**
-     * By default all input will be assumed to be UTF-8.
+     * By default, all input will be assumed to be UTF-8.
      *
      * However, both iCalendar and vCard might be encoded using different
      * character sets. The character set is usually set in the mime-type.
@@ -48,17 +52,15 @@ class MimeDir extends Parser
      * If this is the case, use setEncoding to specify that a different
      * encoding will be used. If this is set, the parser will automatically
      * convert all incoming data to UTF-8.
-     *
-     * @var string
      */
-    protected $charset = 'UTF-8';
+    protected string $charset = 'UTF-8';
 
     /**
      * The list of character sets we support when decoding.
      *
      * This would be a const expression but for now we need to support PHP 5.5
      */
-    protected static $SUPPORTED_CHARSETS = [
+    protected static array $SUPPORTED_CHARSETS = [
         'UTF-8',
         'ISO-8859-1',
         'Windows-1252',
@@ -71,18 +73,23 @@ class MimeDir extends Parser
      * used.
      *
      * @param string|resource|null $input
-     * @param int                  $options
      *
-     * @return \Sabre\VObject\Document
+     * @throws ParseException
      */
-    public function parse($input = null, $options = 0)
+    public function parse($input = null, int $options = 0): ?Document
     {
         $this->root = null;
 
-        if (!is_null($input)) {
+        if (!\is_null($input)) {
             $this->setInput($input);
         }
 
+        if (!\is_resource($this->input)) {
+            // Null was passed as input, but there was no existing input buffer
+            // There is nothing to parse.
+            throw new ParseException('No input provided to parse');
+        }
+
         if (0 !== $options) {
             $this->options = $options;
         }
@@ -93,7 +100,7 @@ class MimeDir extends Parser
     }
 
     /**
-     * By default all input will be assumed to be UTF-8.
+     * By default, all input will be assumed to be UTF-8.
      *
      * However, both iCalendar and vCard might be encoded using different
      * character sets. The character set is usually set in the mime-type.
@@ -101,12 +108,10 @@ class MimeDir extends Parser
      * If this is the case, use setEncoding to specify that a different
      * encoding will be used. If this is set, the parser will automatically
      * convert all incoming data to UTF-8.
-     *
-     * @param string $charset
      */
-    public function setCharset($charset)
+    public function setCharset(string $charset): void
     {
-        if (!in_array($charset, self::$SUPPORTED_CHARSETS)) {
+        if (!in_array($charset, self::$SUPPORTED_CHARSETS, true)) {
             throw new \InvalidArgumentException('Unsupported encoding. (Supported encodings: '.implode(', ', self::$SUPPORTED_CHARSETS).')');
         }
         $this->charset = $charset;
@@ -116,6 +121,8 @@ class MimeDir extends Parser
      * Sets the input buffer. Must be a string or stream.
      *
      * @param resource|string $input
+     *
+     * @return void
      */
     public function setInput($input)
     {
@@ -138,37 +145,39 @@ class MimeDir extends Parser
 
     /**
      * Parses an entire document.
+     *
+     * @throws EofException
+     * @throws ParseException
      */
-    protected function parseDocument()
+    protected function parseDocument(): void
     {
         $line = $this->readLine();
 
         // BOM is ZERO WIDTH NO-BREAK SPACE (U+FEFF).
         // It's 0xEF 0xBB 0xBF in UTF-8 hex.
-        if (3 <= strlen($line)
-            && 0xef === ord($line[0])
-            && 0xbb === ord($line[1])
-            && 0xbf === ord($line[2])) {
-            $line = substr($line, 3);
+        if (3 <= strlen((string) $line)
+            && 0xEF === ord($line[0])
+            && 0xBB === ord($line[1])
+            && 0xBF === ord($line[2])) {
+            $line = \substr((string) $line, 3);
         }
 
-        switch (strtoupper($line)) {
-            case 'BEGIN:VCALENDAR':
-                $class = VCalendar::$componentMap['VCALENDAR'];
-                break;
-            case 'BEGIN:VCARD':
-                $class = VCard::$componentMap['VCARD'];
-                break;
-            default:
-                throw new ParseException('This parser only supports VCARD and VCALENDAR files');
-        }
+        $class = match (strtoupper((string) $line)) {
+            'BEGIN:VCALENDAR' => VCalendar::$componentMap['VCALENDAR'],
+            'BEGIN:VCARD' => VCard::$componentMap['VCARD'],
+            default => throw new ParseException('This parser only supports VCARD and VCALENDAR files'),
+        };
 
         $this->root = new $class([], false);
 
         while (true) {
             // Reading until we hit END:
-            $line = $this->readLine();
-            if ('END:' === strtoupper(substr($line, 0, 4))) {
+            try {
+                $line = $this->readLine();
+            } catch (EofException) {
+                $line = 'END:'.$this->root->name;
+            }
+            if ('END:' === strtoupper(\substr((string) $line, 0, 4))) {
                 break;
             }
             $result = $this->parseLine($line);
@@ -177,7 +186,7 @@ class MimeDir extends Parser
             }
         }
 
-        $name = strtoupper(substr($line, 4));
+        $name = strtoupper(\substr((string) $line, 4));
         if ($name !== $this->root->name) {
             throw new ParseException('Invalid MimeDir file. expected: "END:'.$this->root->name.'" got: "END:'.$name.'"');
         }
@@ -189,21 +198,24 @@ class MimeDir extends Parser
      *
      * @param string $line Unfolded line
      *
-     * @return Node
+     * @return Node|Property|false
+     *
+     * @throws EofException
+     * @throws ParseException
      */
-    protected function parseLine($line)
+    protected function parseLine(string $line)
     {
         // Start of a new component
-        if ('BEGIN:' === strtoupper(substr($line, 0, 6))) {
-            if (substr($line, 6) === $this->root->name) {
+        if ('BEGIN:' === strtoupper(\substr($line, 0, 6))) {
+            if (\substr($line, 6) === $this->root->name) {
                 throw new ParseException('Invalid MimeDir file. Unexpected component: "'.$line.'" in document type '.$this->root->name);
             }
-            $component = $this->root->createComponent(substr($line, 6), [], false);
+            $component = $this->root->createComponent(\substr($line, 6), [], false);
 
             while (true) {
                 // Reading until we hit END:
                 $line = $this->readLine();
-                if ('END:' === strtoupper(substr($line, 0, 4))) {
+                if ('END:' === strtoupper(\substr((string) $line, 0, 4))) {
                     break;
                 }
                 $result = $this->parseLine($line);
@@ -212,22 +224,21 @@ class MimeDir extends Parser
                 }
             }
 
-            $name = strtoupper(substr($line, 4));
+            $name = strtoupper(\substr((string) $line, 4));
             if ($name !== $component->name) {
                 throw new ParseException('Invalid MimeDir file. expected: "END:'.$component->name.'" got: "END:'.$name.'"');
             }
 
             return $component;
-        } else {
-            // Property reader
-            $property = $this->readProperty($line);
-            if (!$property) {
-                // Ignored line
-                return false;
-            }
-
-            return $property;
         }
+        // Property reader
+        $property = $this->readProperty($line);
+        if (!$property) {
+            // Ignored line
+            return false;
+        }
+
+        return $property;
     }
 
     /**
@@ -235,41 +246,33 @@ class MimeDir extends Parser
      * the next line.
      *
      * If that was not the case, we store it here.
-     *
-     * @var string|null
      */
-    protected $lineBuffer;
+    protected ?string $lineBuffer = null;
 
     /**
      * The real current line number.
      */
-    protected $lineIndex = 0;
+    protected int $lineIndex = 0;
 
     /**
      * In the case of unfolded lines, this property holds the line number for
      * the start of the line.
-     *
-     * @var int
      */
-    protected $startLine = 0;
+    protected int $startLine = 0;
 
     /**
      * Contains a 'raw' representation of the current line.
-     *
-     * @var string
      */
-    protected $rawLine;
+    protected string $rawLine;
 
     /**
      * Reads a single line from the buffer.
      *
      * This method strips any newlines and also takes care of unfolding.
      *
-     * @throws \Sabre\VObject\EofException
-     *
-     * @return string
+     * @throws EofException|ParseException
      */
-    protected function readLine()
+    protected function readLine(): ?string
     {
         if (!\is_null($this->lineBuffer)) {
             $rawLine = $this->lineBuffer;
@@ -317,8 +320,12 @@ class MimeDir extends Parser
 
     /**
      * Reads a property or component from a line.
+     *
+     * @return Property|false
+     *
+     * @throws ParseException|InvalidDataException
      */
-    protected function readProperty($line)
+    protected function readProperty(string $line)
     {
         if ($this->options & self::OPTION_FORGIVING) {
             $propNameToken = 'A-Z0-9\-\._\\/';
@@ -343,7 +350,7 @@ class MimeDir extends Parser
             ) (?=[;:,])
             /xi";
 
-        //echo $regex, "\n"; exit();
+        // echo $regex, "\n"; exit();
         preg_match_all($regex, $line, $matches, PREG_SET_ORDER);
 
         $property = [
@@ -352,6 +359,12 @@ class MimeDir extends Parser
             'value' => null,
         ];
 
+        /*
+         * Keep track on the last token we parsed in order to do
+         * better error checking
+         */
+        $lastToken = null;
+
         $lastParam = null;
 
         /*
@@ -364,41 +377,59 @@ class MimeDir extends Parser
         foreach ($matches as $match) {
             if (isset($match['paramValue'])) {
                 if ($match['paramValue'] && '"' === $match['paramValue'][0]) {
-                    $value = substr($match['paramValue'], 1, -1);
+                    $value = \substr($match['paramValue'], 1, -1);
                 } else {
                     $value = $match['paramValue'];
                 }
 
                 $value = $this->unescapeParam($value);
 
-                if (is_null($lastParam)) {
+                if (\is_null($lastParam)) {
+                    if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
+                        // When the property can't be matched and the configuration
+                        // option is set to ignore invalid lines, we ignore this line
+                        // This can happen when servers provide faulty data as iCloud
+                        //  frequently does with X-APPLE-STRUCTURED-LOCATION
+                        $lastToken = self::TOKEN_PARAMVALUE;
+                        continue;
+                    }
                     throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.' did not follow iCalendar/vCard conventions');
                 }
-                if (is_null($property['parameters'][$lastParam])) {
+
+                if ('=' === $match[0][0] && self::TOKEN_PARAMNAME !== $lastToken) {
+                    throw new ParseException('Invalid Mimedir file. Line starting at '.$this->startLine.': Missing parameter name for parameter value "'.$match['paramValue'].'"');
+                }
+
+                if (\is_null($property['parameters'][$lastParam])) {
                     $property['parameters'][$lastParam] = $value;
                 } elseif (is_array($property['parameters'][$lastParam])) {
                     $property['parameters'][$lastParam][] = $value;
+                } elseif ($property['parameters'][$lastParam] === $value) {
+                    // When the current value of the parameter is the same as the
+                    // new one, then we can leave the current parameter as it is.
                 } else {
                     $property['parameters'][$lastParam] = [
                         $property['parameters'][$lastParam],
                         $value,
                     ];
                 }
+                $lastToken = self::TOKEN_PARAMVALUE;
                 continue;
             }
             if (isset($match['paramName'])) {
                 $lastParam = strtoupper($match['paramName']);
-                if (!isset($property['parameters'][$lastParam])) {
-                    $property['parameters'][$lastParam] = null;
-                }
+                $property['parameters'][$lastParam] ??= null;
+                $lastToken = self::TOKEN_PARAMNAME;
                 continue;
             }
             if (isset($match['propValue'])) {
                 $property['value'] = $match['propValue'];
+                $lastToken = self::TOKEN_PROPVALUE;
                 continue;
             }
-            if (isset($match['name']) && $match['name']) {
+            if (isset($match['name']) && 0 < strlen($match['name'])) {
                 $property['name'] = strtoupper($match['name']);
+                $lastToken = self::TOKEN_PROPNAME;
                 continue;
             }
 
@@ -407,10 +438,8 @@ class MimeDir extends Parser
             // @codeCoverageIgnoreEnd
         }
 
-        if (is_null($property['value'])) {
-            $property['value'] = '';
-        }
-        if (!$property['name']) {
+        $property['value'] ??= '';
+        if (!isset($property['name']) || 0 === strlen($property['name'])) {
             if ($this->options & self::OPTION_IGNORE_INVALID_LINES) {
                 return false;
             }
@@ -426,20 +455,21 @@ class MimeDir extends Parser
         $namelessParameters = [];
 
         foreach ($property['parameters'] as $name => $value) {
-            if (!is_null($value)) {
+            if (!\is_null($value)) {
                 $namedParameters[$name] = $value;
             } else {
                 $namelessParameters[] = $name;
             }
         }
 
-        $propObj = $this->root->createProperty($property['name'], null, $namedParameters);
+        $propObj = $this->root->createProperty($property['name'], null, $namedParameters, null, $this->startLine, $line);
 
         foreach ($namelessParameters as $namelessParameter) {
             $propObj->add(null, $namelessParameter);
         }
 
         if (isset($propObj['ENCODING']) && 'QUOTED-PRINTABLE' === strtoupper($propObj['ENCODING'])) {
+            /* @var Property\Text|Property\FlatText $propObj */
             $propObj->setQuotedPrintableValue($this->extractQuotedPrintableValue());
         } else {
             $charset = $this->charset;
@@ -450,10 +480,8 @@ class MimeDir extends Parser
             switch (strtolower($charset)) {
                 case 'utf-8':
                     break;
-                case 'iso-8859-1':
-                    $property['value'] = utf8_encode($property['value']);
-                    break;
                 case 'windows-1252':
+                case 'iso-8859-1':
                     $property['value'] = mb_convert_encoding($property['value'], 'UTF-8', $charset);
                     break;
                 default:
@@ -471,7 +499,7 @@ class MimeDir extends Parser
      * vCard 2.1 says:
      *   * Semi-colons must be escaped in some property values, specifically
      *     ADR, ORG and N.
-     *   * Semi-colons must be escaped in parameter values, because semi-colons
+     *   * Semi-colons must be escaped in parameter values, because semicolons
      *     are also use to separate values.
      *   * No mention of escaping backslashes with another backslash.
      *   * newlines are not escaped either, instead QUOTED-PRINTABLE is used to
@@ -479,10 +507,10 @@ class MimeDir extends Parser
      *
      * vCard 3.0 says:
      *   * (rfc2425) Backslashes, newlines (\n or \N) and comma's must be
-     *     escaped, all time time.
-     *   * Comma's are used for delimiters in multiple values
-     *   * (rfc2426) Adds to to this that the semi-colon MUST also be escaped,
-     *     as in some properties semi-colon is used for separators.
+     *     escaped, all the time.
+     *   * Commas are used for delimiters in multiple values
+     *   * (rfc2426) Adds to this that the semicolon MUST also be escaped,
+     *     as in some properties semicolon is used for separators.
      *   * Properties using semi-colons: N, ADR, GEO, ORG
      *   * Both ADR and N's individual parts may be broken up further with a
      *     comma.
@@ -490,12 +518,12 @@ class MimeDir extends Parser
      *
      * vCard 4.0 (rfc6350) says:
      *   * Commas must be escaped.
-     *   * Semi-colons may be escaped, an unescaped semi-colon _may_ be a
+     *   * Semi-colons may be escaped, an unescaped semicolon _may_ be a
      *     delimiter, depending on the property.
      *   * Backslashes must be escaped
      *   * Newlines must be escaped as either \N or \n.
      *   * Some compound properties may contain multiple parts themselves, so a
-     *     comma within a semi-colon delimited property may also be unescaped
+     *     comma within a semicolon delimited property may also be unescaped
      *     to denote multiple parts _within_ the compound property.
      *   * Text-properties using semi-colons: N, ADR, ORG, CLIENTPIDMAP.
      *   * Text-properties using commas: NICKNAME, RELATED, CATEGORIES, PID.
@@ -504,7 +532,7 @@ class MimeDir extends Parser
      * example for GEO in Section 6.5.2 seems to violate this.
      *
      * iCalendar 2.0 (rfc5545) says:
-     *   * Commas or semi-colons may be used as delimiters, depending on the
+     *   * Commas or semicolons may be used as delimiters, depending on the
      *     property.
      *   * Commas, semi-colons, backslashes, newline (\N or \n) are always
      *     escaped, unless they are delimiters.
@@ -514,20 +542,17 @@ class MimeDir extends Parser
      *     insignificant.
      *   * Semi-colons are described as the delimiter for 'structured values'.
      *     They are specifically used in Semi-colons are used as a delimiter in
-     *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated however.
+     *     REQUEST-STATUS, RRULE, GEO and EXRULE. EXRULE is deprecated, however.
      *
      * Now for the parameters
      *
      * If delimiter is not set (empty string) this method will just return a string.
-     * If it's a comma or a semi-colon the string will be split on those
+     * If it's a comma or a semicolon the string will be split on those
      * characters, and always return an array.
      *
-     * @param string $input
-     * @param string $delimiter
-     *
      * @return string|string[]
      */
-    public static function unescapeValue($input, $delimiter = ';')
+    public static function unescapeValue(string $input, string $delimiter = ';')
     {
         $regex = '#  (?: (\\\\ (?: \\\\ | N | n | ; | , ) )';
         if ($delimiter) {
@@ -577,11 +602,11 @@ class MimeDir extends Parser
      *   * Does not mention a mechanism for this. In addition, double quotes
      *     are never used to wrap values.
      *   * This means that parameters can simply not contain colons or
-     *     semi-colons.
+     *     semicolons.
      *
      * vCard 3.0 (rfc2425, rfc2426):
      *   * Parameters _may_ be surrounded by double quotes.
-     *   * If this is not the case, semi-colon, colon and comma may simply not
+     *   * If this is not the case, semicolon, colon and comma may simply not
      *     occur (the comma used for multiple parameter values though).
      *   * If it is surrounded by double-quotes, it may simply not contain
      *     double-quotes.
@@ -599,10 +624,8 @@ class MimeDir extends Parser
      *   * New-line is encoded as ^n
      *   * ^ is encoded as ^^.
      *   * " is encoded as ^'
-     *
-     * @param string $input
      */
-    private function unescapeParam($input)
+    private function unescapeParam(string $input): ?string
     {
         return
             preg_replace_callback(
@@ -616,7 +639,7 @@ class MimeDir extends Parser
                         case '\'':
                             return '"';
 
-                    // @codeCoverageIgnoreStart
+                            // @codeCoverageIgnoreStart
                     }
                     // @codeCoverageIgnoreEnd
                 },
@@ -632,9 +655,10 @@ class MimeDir extends Parser
      *
      * This method does not do any decoding.
      *
-     * @return string
+     * @throws EofException
+     * @throws ParseException
      */
-    private function extractQuotedPrintableValue()
+    private function extractQuotedPrintableValue(): string
     {
         // We need to parse the raw line again to get the start of the value.
         //
@@ -654,11 +678,11 @@ class MimeDir extends Parser
         // like unfolding, but we keep the newline.
         $value = str_replace("\n ", "\n", $value);
 
-        // Microsoft products don't always correctly fold lines, they may be
+        // Microsoft's products don't always correctly fold lines, they may be
         // missing a whitespace. So if 'forgiving' is turned on, we will take
         // those as well.
         if ($this->options & self::OPTION_FORGIVING) {
-            while ('=' === substr($value, -1) && $this->lineBuffer) {
+            while (str_ends_with($value, '=') && $this->lineBuffer) {
                 // Reading the line
                 $this->readLine();
                 // Grabbing the raw form
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
index b7b611430..c5126445a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/Parser.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject\Parser;
 
+use Sabre\VObject\Document;
+
 /**
  * Abstract parser.
  *
@@ -20,35 +22,26 @@ abstract class Parser
      * accept slashes and underscores in property names, and it will also
      * attempt to fix Microsoft vCard 2.1's broken line folding.
      */
-    const OPTION_FORGIVING = 1;
+    public const OPTION_FORGIVING = 1;
 
     /**
      * If this option is turned on, any lines we cannot parse will be ignored
      * by the reader.
      */
-    const OPTION_IGNORE_INVALID_LINES = 2;
-
-    /**
-     * Bitmask of parser options.
-     *
-     * @var int
-     */
-    protected $options;
+    public const OPTION_IGNORE_INVALID_LINES = 2;
 
     /**
      * Creates the parser.
      *
      * Optionally, it's possible to parse the input stream here.
      *
-     * @param mixed $input
-     * @param int   $options any parser options (OPTION constants)
+     * @param int $options any parser options (OPTION constants)
      */
-    public function __construct($input = null, $options = 0)
+    public function __construct($input = null, protected int $options = 0)
     {
         if (!is_null($input)) {
             $this->setInput($input);
         }
-        $this->options = $options;
     }
 
     /**
@@ -59,17 +52,14 @@ abstract class Parser
      *
      * If either input or options are not supplied, the defaults will be used.
      *
-     * @param mixed $input
-     * @param int   $options
-     *
-     * @return array
+     * @param resource|string|array|null $input
      */
-    abstract public function parse($input = null, $options = 0);
+    abstract public function parse($input = null, int $options = 0): ?Document;
 
     /**
      * Sets the input data.
      *
-     * @param mixed $input
+     * @param resource|string|array $input
      */
     abstract public function setInput($input);
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
index 78773173d..46abd8020 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML.php
@@ -5,7 +5,9 @@ namespace Sabre\VObject\Parser;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 use Sabre\VObject\Component\VCard;
+use Sabre\VObject\Document;
 use Sabre\VObject\EofException;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\ParseException;
 use Sabre\Xml as SabreXml;
 
@@ -20,39 +22,32 @@ use Sabre\Xml as SabreXml;
  */
 class XML extends Parser
 {
-    const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
-    const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
+    public const XCAL_NAMESPACE = 'urn:ietf:params:xml:ns:icalendar-2.0';
+    public const XCARD_NAMESPACE = 'urn:ietf:params:xml:ns:vcard-4.0';
 
     /**
      * The input data.
-     *
-     * @var array
      */
-    protected $input;
+    protected ?array $input = null;
 
     /**
      * A pointer/reference to the input.
-     *
-     * @var array
      */
-    private $pointer;
+    private ?array $pointer = null;
 
     /**
      * Document, root component.
-     *
-     * @var \Sabre\VObject\Document
      */
-    protected $root;
+    protected ?Document $root = null;
 
     /**
      * Creates the parser.
      *
      * Optionally, it's possible to parse the input stream here.
      *
-     * @param mixed $input
-     * @param int   $options any parser options (OPTION constants)
+     * @param int $options any parser options (OPTION constants)
      */
-    public function __construct($input = null, $options = 0)
+    public function __construct($input = null, int $options = 0)
     {
         if (0 === $options) {
             $options = parent::OPTION_FORGIVING;
@@ -64,14 +59,14 @@ class XML extends Parser
     /**
      * Parse xCal or xCard.
      *
-     * @param resource|string $input
-     * @param int             $options
+     * @param resource|string|null $input
      *
-     * @throws \Exception
-     *
-     * @return \Sabre\VObject\Document
+     * @throws EofException
+     * @throws InvalidDataException
+     * @throws ParseException
+     * @throws SabreXml\LibXMLException
      */
-    public function parse($input = null, $options = 0)
+    public function parse($input = null, int $options = 0): ?Document
     {
         if (!is_null($input)) {
             $this->setInput($input);
@@ -112,10 +107,12 @@ class XML extends Parser
 
     /**
      * Parse a xCalendar component.
+     *
+     * @throws InvalidDataException
      */
-    protected function parseVCalendarComponents(Component $parentComponent)
+    protected function parseVCalendarComponents(Component $parentComponent): void
     {
-        foreach ($this->pointer['value'] ?: [] as $children) {
+        foreach ($this->pointer['value'] ?? [] as $children) {
             switch (static::getTagName($children['name'])) {
                 case 'properties':
                     $this->pointer = &$children['value'];
@@ -132,8 +129,10 @@ class XML extends Parser
 
     /**
      * Parse a xCard component.
+     *
+     * @throws InvalidDataException
      */
-    protected function parseVCardComponents(Component $parentComponent)
+    protected function parseVCardComponents(Component $parentComponent): void
     {
         $this->pointer = &$this->pointer['value'];
         $this->parseProperties($parentComponent);
@@ -142,12 +141,12 @@ class XML extends Parser
     /**
      * Parse xCalendar and xCard properties.
      *
-     * @param string $propertyNamePrefix
+     * @throws InvalidDataException
      */
-    protected function parseProperties(Component $parentComponent, $propertyNamePrefix = '')
+    protected function parseProperties(Component $parentComponent, string $propertyNamePrefix = ''): void
     {
-        foreach ($this->pointer ?: [] as $xmlProperty) {
-            list($namespace, $tagName) = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
+        foreach ($this->pointer ?? [] as $xmlProperty) {
+            [$namespace, $tagName] = SabreXml\Service::parseClarkNotation($xmlProperty['name']);
 
             $propertyName = $tagName;
             $propertyValue = [];
@@ -272,6 +271,27 @@ class XML extends Parser
                     }
                     break;
 
+                case 'xcard:x-crypto':
+                    foreach ($xmlProperty['value'] as $i => $xmlPropertyChild) {
+                        if (is_array($xmlPropertyChild)) {
+                            $propertyParameterValues = [];
+                            foreach ($xmlPropertyChild['value'] as $xmlParameter) {
+                                if (is_array($xmlParameter['value'])) {
+                                    foreach ($xmlParameter['value'] as $xmlParameterValues) {
+                                        $propertyParameterValues[] = $xmlParameterValues['value'];
+                                    }
+                                } else {
+                                    $propertyParameterValues[] = $xmlParameter['value'];
+                                }
+                            }
+                            $propertyParameters[static::getTagName($xmlPropertyChild['name'])]
+                                = implode(',', $propertyParameterValues);
+                        }
+                        array_splice($xmlProperty['value'], $i, 1);
+                    }
+                    $propertyType = 'X-CRYPTO';
+                    break;
+
                 default:
                     $propertyType = static::getTagName($xmlProperty['value'][0]['name']);
 
@@ -297,10 +317,12 @@ class XML extends Parser
 
     /**
      * Parse a component.
+     *
+     * @throws InvalidDataException
      */
-    protected function parseComponent(Component $parentComponent)
+    protected function parseComponent(Component $parentComponent): void
     {
-        $components = $this->pointer['value'] ?: [];
+        $components = $this->pointer['value'] ?? [];
 
         foreach ($components as $component) {
             $componentName = static::getTagName($component['name']);
@@ -320,12 +342,9 @@ class XML extends Parser
     /**
      * Create a property.
      *
-     * @param string $name
-     * @param array  $parameters
-     * @param string $type
-     * @param mixed  $value
+     * @throws InvalidDataException
      */
-    protected function createProperty(Component $parentComponent, $name, $parameters, $type, $value)
+    protected function createProperty(Component $parentComponent, string $name, array $parameters, string $type, $value): void
     {
         $property = $this->root->createProperty(
             $name,
@@ -340,9 +359,11 @@ class XML extends Parser
     /**
      * Sets the input data.
      *
-     * @param resource|string $input
+     * @param resource|string|array $input
+     *
+     * @throws SabreXml\LibXMLException
      */
-    public function setInput($input)
+    public function setInput($input): void
     {
         if (is_resource($input)) {
             $input = stream_get_contents($input);
@@ -363,12 +384,8 @@ class XML extends Parser
 
     /**
      * Get tag name from a Clark notation.
-     *
-     * @param string $clarkedTagName
-     *
-     * @return string
      */
-    protected static function getTagName($clarkedTagName)
+    protected static function getTagName(string $clarkedTagName): string
     {
         list(, $tagName) = SabreXml\Service::parseClarkNotation($clarkedTagName);
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML/Element/KeyValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML/Element/KeyValue.php
index c0bbf0d9b..207f150b2 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML/Element/KeyValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Parser/XML/Element/KeyValue.php
@@ -32,12 +32,8 @@ class KeyValue extends SabreXml\Element\KeyValue
      *
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
-     *
-     * @param XML\Reader $reader
-     *
-     * @return mixed
      */
-    public static function xmlDeserialize(SabreXml\Reader $reader)
+    public static function xmlDeserialize(SabreXml\Reader $reader): array
     {
         // If there's no children, we don't do anything.
         if ($reader->isEmptyElement) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
index 50cda9684..7432e5064 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property.php
@@ -14,47 +14,37 @@ use Sabre\Xml;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-abstract class Property extends Node
+abstract class Property extends Node implements \Stringable
 {
-    /**
-     * Property name.
-     *
-     * This will contain a string such as DTSTART, SUMMARY, FN.
-     *
-     * @var string
-     */
-    public $name;
-
-    /**
-     * Property group.
-     *
-     * This is only used in vcards
-     *
-     * @var string
-     */
-    public $group;
-
     /**
      * List of parameters.
-     *
-     * @var array
      */
-    public $parameters = [];
+    public array $parameters = [];
 
     /**
      * Current value.
-     *
-     * @var mixed
      */
     protected $value;
 
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = ';';
+    public string $delimiter = ';';
+
+    /**
+     * The line number in the original iCalendar / vCard file
+     *   that corresponds with the current node
+     *   if the node was read from a file.
+     */
+    public ?int $lineIndex;
+
+    /**
+     * The line string from the original iCalendar / vCard file
+     *   that corresponds with the current node
+     *   if the node was read from a file.
+     */
+    public ?string $lineString;
 
     /**
      * Creates the generic property.
@@ -62,18 +52,17 @@ abstract class Property extends Node
      * Parameters must be specified in key=>value syntax.
      *
      * @param Component         $root       The root document
-     * @param string            $name
      * @param string|array|null $value
      * @param array             $parameters List of parameters
-     * @param string            $group      The vcard property group
+     * @param string|null       $group      The vcard property group
      */
-    public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null)
+    public function __construct(public ?Component $root, /**
+     * Property name.
+     *
+     * This will contain a string such as DTSTART, SUMMARY, FN.
+     */
+        public ?string $name, $value = null, array $parameters = [], public ?string $group = null, ?int $lineIndex = null, ?string $lineString = null)
     {
-        $this->name = $name;
-        $this->group = $group;
-
-        $this->root = $root;
-
         foreach ($parameters as $k => $v) {
             $this->add($k, $v);
         }
@@ -81,6 +70,14 @@ abstract class Property extends Node
         if (!is_null($value)) {
             $this->setValue($value);
         }
+
+        if (!is_null($lineIndex)) {
+            $this->lineIndex = $lineIndex;
+        }
+
+        if (!is_null($lineString)) {
+            $this->lineString = $lineString;
+        }
     }
 
     /**
@@ -90,7 +87,7 @@ abstract class Property extends Node
      *
      * @param string|array $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
         $this->value = $value;
     }
@@ -103,28 +100,26 @@ abstract class Property extends Node
      * it as a string.
      *
      * To get the correct multi-value version, use getParts.
-     *
-     * @return string
      */
     public function getValue()
     {
         if (is_array($this->value)) {
-            if (0 == count($this->value)) {
-                return;
+            if (0 === count($this->value)) {
+                return null;
             } elseif (1 === count($this->value)) {
                 return $this->value[0];
-            } else {
-                return $this->getRawMimeDirValue();
             }
-        } else {
-            return $this->value;
+
+            return $this->getRawMimeDirValue();
         }
+
+        return $this->value;
     }
 
     /**
      * Sets a multi-valued property.
      */
-    public function setParts(array $parts)
+    public function setParts(array $parts): void
     {
         $this->value = $parts;
     }
@@ -134,18 +129,16 @@ abstract class Property extends Node
      *
      * This method always returns an array, if there was only a single value,
      * it will still be wrapped in an array.
-     *
-     * @return array
      */
-    public function getParts()
+    public function getParts(): array
     {
         if (is_null($this->value)) {
             return [];
         } elseif (is_array($this->value)) {
             return $this->value;
-        } else {
-            return [$this->value];
         }
+
+        return [$this->value];
     }
 
     /**
@@ -155,10 +148,9 @@ abstract class Property extends Node
      * combined.
      * If nameless parameter is added, we try to guess its name.
      *
-     * @param string            $name
      * @param string|array|null $value
      */
-    public function add($name, $value = null)
+    public function add(?string $name, $value = null): void
     {
         $noName = false;
         if (null === $name) {
@@ -177,10 +169,8 @@ abstract class Property extends Node
 
     /**
      * Returns an iterable list of children.
-     *
-     * @return array
      */
-    public function parameters()
+    public function parameters(): array
     {
         return $this->parameters;
     }
@@ -190,34 +180,26 @@ abstract class Property extends Node
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    abstract public function getValueType();
+    abstract public function getValueType(): string;
 
     /**
      * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    abstract public function setRawMimeDirValue($val);
+    abstract public function setRawMimeDirValue(string $val): void;
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    abstract public function getRawMimeDirValue();
+    abstract public function getRawMimeDirValue(): string;
 
     /**
      * Turns the object back into a serialized blob.
-     *
-     * @return string
      */
-    public function serialize()
+    public function serialize(): string
     {
         $str = $this->name;
         if ($this->group) {
@@ -241,17 +223,15 @@ abstract class Property extends Node
         );
 
         // remove single space after last CRLF
-        return \substr($str, 0, -1);
+        return \substr((string) $str, 0, -1);
     }
 
     /**
      * Returns the value, in the format it should be encoded for JSON.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         return $this->getParts();
     }
@@ -261,7 +241,7 @@ abstract class Property extends Node
      *
      * The value must always be an array.
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
         if (1 === count($value)) {
             $this->setValue(reset($value));
@@ -273,11 +253,9 @@ abstract class Property extends Node
     /**
      * This method returns an array, with the representation as it should be
      * encoded in JSON. This is used to create jCard or jCal documents.
-     *
-     * @return array
      */
     #[\ReturnTypeWillChange]
-    public function jsonSerialize()
+    public function jsonSerialize(): array
     {
         $parameters = [];
 
@@ -285,7 +263,7 @@ abstract class Property extends Node
             if ('VALUE' === $parameter->name) {
                 continue;
             }
-            $parameters[strtolower($parameter->name)] = $parameter->jsonSerialize();
+            $parameters[strtolower((string) $parameter->name)] = $parameter->jsonSerialize();
         }
         // In jCard, we need to encode the property-group as a separate 'group'
         // parameter.
@@ -295,7 +273,7 @@ abstract class Property extends Node
 
         return array_merge(
             [
-                strtolower($this->name),
+                strtolower((string) $this->name),
                 (object) $parameters,
                 strtolower($this->getValueType()),
             ],
@@ -304,10 +282,12 @@ abstract class Property extends Node
     }
 
     /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+     * Hydrate data from an XML subtree, as it would appear in a xCard or xCal
      * object.
+     *
+     * @throws InvalidDataException
      */
-    public function setXmlValue(array $value)
+    public function setXmlValue(array $value): void
     {
         $this->setJsonValue($value);
     }
@@ -318,7 +298,7 @@ abstract class Property extends Node
      *
      * @param Xml\Writer $writer XML writer
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $parameters = [];
 
@@ -330,13 +310,13 @@ abstract class Property extends Node
             $parameters[] = $parameter;
         }
 
-        $writer->startElement(strtolower($this->name));
+        $writer->startElement(strtolower((string) $this->name));
 
-        if (!empty($parameters)) {
+        if ([] !== $parameters) {
             $writer->startElement('parameters');
 
             foreach ($parameters as $parameter) {
-                $writer->startElement(strtolower($parameter->name));
+                $writer->startElement(strtolower((string) $parameter->name));
                 $writer->write($parameter);
                 $writer->endElement();
             }
@@ -354,7 +334,7 @@ abstract class Property extends Node
      *
      * @param Xml\Writer $writer XML writer
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         $valueType = strtolower($this->getValueType());
 
@@ -370,11 +350,9 @@ abstract class Property extends Node
      *
      * If the property only had a single value, you will get just that. In the
      * case the property had multiple values, the contents will be escaped and
-     * combined with ,.
-     *
-     * @return string
+     * combined with comma.
      */
-    public function __toString()
+    public function __toString(): string
     {
         return (string) $this->getValue();
     }
@@ -383,22 +361,18 @@ abstract class Property extends Node
 
     /**
      * Checks if an array element exists.
-     *
-     * @param mixed $name
-     *
-     * @return bool
      */
     #[\ReturnTypeWillChange]
-    public function offsetExists($name)
+    public function offsetExists($offset): bool
     {
-        if (is_int($name)) {
-            return parent::offsetExists($name);
+        if (is_int($offset)) {
+            return parent::offsetExists($offset);
         }
 
-        $name = strtoupper($name);
+        $offset = strtoupper($offset);
 
         foreach ($this->parameters as $parameter) {
-            if ($parameter->name == $name) {
+            if ($parameter->name == $offset) {
                 return true;
             }
         }
@@ -411,36 +385,34 @@ abstract class Property extends Node
      *
      * If the parameter does not exist, null is returned.
      *
-     * @param string $name
-     *
-     * @return Node
+     * @param string|int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetGet($name)
+    public function offsetGet($offset): ?Node
     {
-        if (is_int($name)) {
-            return parent::offsetGet($name);
+        if (is_int($offset)) {
+            return parent::offsetGet($offset);
         }
-        $name = strtoupper($name);
+        $offset = strtoupper($offset);
 
-        if (!isset($this->parameters[$name])) {
-            return;
+        if (!isset($this->parameters[$offset])) {
+            return null;
         }
 
-        return $this->parameters[$name];
+        return $this->parameters[$offset];
     }
 
     /**
      * Creates a new parameter.
      *
-     * @param string $name
-     * @param mixed  $value
+     * @param string|int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($name, $value)
+    public function offsetSet($offset, $value): void
     {
-        if (is_int($name)) {
-            parent::offsetSet($name, $value);
+        if (is_int($offset)) {
+            parent::offsetSet($offset, $value);
+
             // @codeCoverageIgnoreStart
             // This will never be reached, because an exception is always
             // thrown.
@@ -448,20 +420,21 @@ abstract class Property extends Node
             // @codeCoverageIgnoreEnd
         }
 
-        $param = new Parameter($this->root, $name, $value);
+        $param = new Parameter($this->root, $offset, $value);
         $this->parameters[$param->name] = $param;
     }
 
     /**
      * Removes one or more parameters with the specified name.
      *
-     * @param string $name
+     * @param string|int $offset
      */
     #[\ReturnTypeWillChange]
-    public function offsetUnset($name)
+    public function offsetUnset($offset): void
     {
-        if (is_int($name)) {
-            parent::offsetUnset($name);
+        if (is_int($offset)) {
+            parent::offsetUnset($offset);
+
             // @codeCoverageIgnoreStart
             // This will never be reached, because an exception is always
             // thrown.
@@ -469,7 +442,7 @@ abstract class Property extends Node
             // @codeCoverageIgnoreEnd
         }
 
-        unset($this->parameters[strtoupper($name)]);
+        unset($this->parameters[strtoupper($offset)]);
     }
 
     /* }}} */
@@ -499,12 +472,8 @@ abstract class Property extends Node
      *    * level - (number between 1 and 3 with severity information)
      *    * message - (human readable message)
      *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $warnings = [];
 
@@ -514,10 +483,8 @@ abstract class Property extends Node
             $level = 3;
             if ($options & self::REPAIR) {
                 $newValue = StringUtil::convertToUTF8($oldValue);
-                if (true || StringUtil::isUTF8($newValue)) {
-                    $this->setRawMimeDirValue($newValue);
-                    $level = 1;
-                }
+                $this->setRawMimeDirValue($newValue);
+                $level = 1;
             }
 
             if (preg_match('%([\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', $oldValue, $matches)) {
@@ -533,11 +500,11 @@ abstract class Property extends Node
             ];
         }
 
-        // Checking if the propertyname does not contain any invalid bytes.
-        if (!preg_match('/^([A-Z0-9-]+)$/', $this->name)) {
+        // Checking if the property name does not contain any invalid bytes.
+        if (!preg_match('/^([A-Z0-9-]+)$/', (string) $this->name)) {
             $warnings[] = [
                 'level' => $options & self::REPAIR ? 1 : 3,
-                'message' => 'The propertyname: '.$this->name.' contains invalid characters. Only A-Z, 0-9 and - are allowed',
+                'message' => 'The property name: '.$this->name.' contains invalid characters. Only A-Z, 0-9 and - are allowed',
                 'node' => $this,
             ];
             if ($options & self::REPAIR) {
@@ -546,7 +513,7 @@ abstract class Property extends Node
                     str_replace('_', '-', $this->name)
                 );
                 // Removing every other invalid character
-                $this->name = preg_replace('/([^A-Z0-9-])/u', '', $this->name);
+                $this->name = \preg_replace('/([^A-Z0-9-])/u', '', $this->name);
             }
         }
 
@@ -558,6 +525,7 @@ abstract class Property extends Node
                     'node' => $this,
                 ];
             } else {
+                /** @var Property $encoding */
                 $encoding = (string) $encoding;
 
                 $allowedEncoding = [];
@@ -571,7 +539,7 @@ abstract class Property extends Node
                         break;
                     case Document::VCARD30:
                         $allowedEncoding = ['B'];
-                        //Repair vCard30 that use BASE64 encoding
+                        // Repair vCard30 that use BASE64 encoding
                         if ($options & self::REPAIR) {
                             if ('BASE64' === strtoupper($encoding)) {
                                 $encoding = 'B';
@@ -585,7 +553,7 @@ abstract class Property extends Node
                         }
                         break;
                 }
-                if ($allowedEncoding && !in_array(strtoupper($encoding), $allowedEncoding)) {
+                if ($allowedEncoding && !in_array(strtoupper($encoding), $allowedEncoding, true)) {
                     $warnings[] = [
                         'level' => 3,
                         'message' => 'ENCODING='.strtoupper($encoding).' is not valid for this document type.',
@@ -609,7 +577,7 @@ abstract class Property extends Node
      * It's intended to remove all circular references, so PHP can easily clean
      * it up.
      */
-    public function destroy()
+    public function destroy(): void
     {
         parent::destroy();
         foreach ($this->parameters as $param) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
index 1262dd054..9d68f415e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Binary.php
@@ -23,10 +23,8 @@ class Binary extends Property
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Updates the current value.
@@ -35,7 +33,7 @@ class Binary extends Property
      *
      * @param string|array $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
         if (is_array($value)) {
             if (1 === count($value)) {
@@ -53,22 +51,18 @@ class Binary extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
-        $this->value = base64_decode($val);
+        $this->value = base64_decode($val, true);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
-        return base64_encode($this->value);
+        return base64_encode((string) $this->value);
     }
 
     /**
@@ -76,10 +70,8 @@ class Binary extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'BINARY';
     }
@@ -88,12 +80,10 @@ class Binary extends Property
      * Returns the value, in the format it should be encoded for json.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
-        return [base64_encode($this->getValue())];
+        return [base64_encode((string) $this->getValue())];
     }
 
     /**
@@ -101,9 +91,9 @@ class Binary extends Property
      *
      * The value must always be an array.
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
-        $value = array_map('base64_decode', $value);
+        $value = array_map(base64_decode(...), $value);
         parent::setJsonValue($value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
index 4bd6ffdfe..f33fbafdc 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Boolean.php
@@ -23,21 +23,17 @@ class Boolean extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
-        $val = 'TRUE' === strtoupper($val) ? true : false;
+        $val = 'TRUE' === strtoupper($val);
         $this->setValue($val);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return $this->value ? 'TRUE' : 'FALSE';
     }
@@ -47,24 +43,20 @@ class Boolean extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'BOOLEAN';
     }
 
     /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+     * Hydrate data from an XML subtree, as it would appear in a xCard or xCal
      * object.
      */
-    public function setXmlValue(array $value)
+    public function setXmlValue(array $value): void
     {
         $value = array_map(
-            function ($value) {
-                return 'true' === $value;
-            },
+            fn ($value) => 'true' === $value,
             $value
         );
         parent::setXmlValue($value);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php
index d15cfe051..eee1316e2 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FlatText.php
@@ -2,20 +2,22 @@
 
 namespace Sabre\VObject\Property;
 
+use Sabre\VObject\InvalidDataException;
+
 /**
  * FlatText property.
  *
  * This object represents certain TEXT values.
  *
  * Specifically, this property is used for text values where there is only 1
- * part. Semi-colons and colons will be de-escaped when deserializing, but if
- * any semi-colons or commas appear without a backslash, we will not assume
+ * part. Semicolons and colons will be de-escaped when deserializing, but if
+ * any semicolons or commas appear without a backslash, we will not assume
  * that they are delimiters.
  *
- * vCard 2.1 specifically has a whole bunch of properties where this may
+ * vCard 2.1 specifically has a bunch of properties where this may
  * happen, as it only defines a delimiter for a few properties.
  *
- * vCard 4.0 states something similar. An unescaped semi-colon _may_ be a
+ * vCard 4.0 states something similar. An unescaped semicolon _may_ be a
  * delimiter, depending on the property.
  *
  * @copyright Copyright (C) fruux GmbH (https://fruux.com/)
@@ -26,19 +28,17 @@ class FlatText extends Text
 {
     /**
      * Field separator.
-     *
-     * @var string
      */
-    public $delimiter = ',';
+    public string $delimiter = ',';
 
     /**
      * Sets the value as a quoted-printable encoded string.
      *
-     * Overriding this so we're not splitting on a ; delimiter.
+     * Overriding this so that we're not splitting on a semicolon delimiter.
      *
-     * @param string $val
+     * @throws InvalidDataException
      */
-    public function setQuotedPrintableValue($val)
+    public function setQuotedPrintableValue(string $val): void
     {
         $val = quoted_printable_decode($val);
         $this->setValue($val);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
index e780ae6c1..32b02a972 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/FloatValue.php
@@ -20,20 +20,16 @@ class FloatValue extends Property
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = ';';
+    public string $delimiter = ';';
 
     /**
      * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $val = explode($this->delimiter, $val);
         foreach ($val as &$item) {
@@ -44,10 +40,8 @@ class FloatValue extends Property
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return implode(
             $this->delimiter,
@@ -60,10 +54,8 @@ class FloatValue extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'FLOAT';
     }
@@ -72,12 +64,10 @@ class FloatValue extends Property
      * Returns the value, in the format it should be encoded for JSON.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
-        $val = array_map('floatval', $this->getParts());
+        $val = array_map(floatval(...), $this->getParts());
 
         // Special-casing the GEO property.
         //
@@ -91,29 +81,27 @@ class FloatValue extends Property
     }
 
     /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+     * Hydrate data from an XML subtree, as it would appear in a xCard or xCal
      * object.
      */
-    public function setXmlValue(array $value)
+    public function setXmlValue(array $value): void
     {
-        $value = array_map('floatval', $value);
+        $value = array_map(floatval(...), $value);
         parent::setXmlValue($value);
     }
 
     /**
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         // Special-casing the GEO property.
         //
         // See:
         // http://tools.ietf.org/html/rfc6321#section-3.4.1.2
         if ('GEO' === $this->name) {
-            $value = array_map('floatval', $this->getParts());
+            $value = array_map(floatval(...), $this->getParts());
 
             $writer->writeElement('latitude', $value[0]);
             $writer->writeElement('longitude', $value[1]);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
index 2dbbc6eaf..a2b13eee7 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/CalAddress.php
@@ -18,20 +18,16 @@ class CalAddress extends Text
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'CAL-ADDRESS';
     }
@@ -43,17 +39,19 @@ class CalAddress extends Text
      * uris to lower-case.
      *
      * Evolution in particular tends to encode mailto: as MAILTO:.
-     *
-     * @return string
      */
-    public function getNormalizedValue()
+    public function getNormalizedValue(): string
     {
         $input = $this->getValue();
-        if (!strpos($input, ':')) {
+        if (!strpos((string) $input, ':')) {
             return $input;
         }
-        list($schema, $everythingElse) = explode(':', $input, 2);
+        [$schema, $everythingElse] = explode(':', (string) $input, 2);
+        $schema = strtolower($schema);
+        if ('mailto' === $schema) {
+            $everythingElse = strtolower($everythingElse);
+        }
 
-        return strtolower($schema).':'.$everythingElse;
+        return $schema.':'.$everythingElse;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
index ca71633b9..cd92475f3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/DateTime.php
@@ -2,7 +2,6 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
-use DateTimeInterface;
 use DateTimeZone;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
@@ -32,16 +31,18 @@ class DateTime extends Property
      *
      * @var string|null
      */
-    public $delimiter = ',';
+    public string $delimiter = ',';
 
     /**
      * Sets a multi-valued property.
      *
      * You may also specify DateTime objects here.
+     *
+     * @throws InvalidDataException
      */
-    public function setParts(array $parts)
+    public function setParts(array $parts): void
     {
-        if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
+        if (isset($parts[0]) && $parts[0] instanceof \DateTimeInterface) {
             $this->setDateTimes($parts);
         } else {
             parent::setParts($parts);
@@ -55,13 +56,15 @@ class DateTime extends Property
      *
      * Instead of strings, you may also use DateTime here.
      *
-     * @param string|array|DateTimeInterface $value
+     * @param string|array|\DateTimeInterface $value
+     *
+     * @throws InvalidDataException
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
-        if (is_array($value) && isset($value[0]) && $value[0] instanceof DateTimeInterface) {
+        if (is_array($value) && isset($value[0]) && $value[0] instanceof \DateTimeInterface) {
             $this->setDateTimes($value);
-        } elseif ($value instanceof DateTimeInterface) {
+        } elseif ($value instanceof \DateTimeInterface) {
             $this->setDateTimes([$value]);
         } else {
             parent::setValue($value);
@@ -74,29 +77,25 @@ class DateTime extends Property
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
      *
-     * @param string $val
+     * @throws InvalidDataException
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue(explode($this->delimiter, $val));
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return implode($this->delimiter, $this->getParts());
     }
 
     /**
      * Returns true if this is a DATE-TIME value, false if it's a DATE.
-     *
-     * @return bool
      */
-    public function hasTime()
+    public function hasTime(): bool
     {
         return 'DATE' !== strtoupper((string) $this['VALUE']);
     }
@@ -106,13 +105,13 @@ class DateTime extends Property
      *
      * Note that DATE is always floating.
      */
-    public function isFloating()
+    public function isFloating(): bool
     {
         return
-            !$this->hasTime() ||
-            (
-                !isset($this['TZID']) &&
-                false === strpos($this->getValue(), 'Z')
+            !$this->hasTime()
+            || (
+                !isset($this['TZID'])
+                && !str_contains((string) $this->getValue(), 'Z')
             );
     }
 
@@ -127,15 +126,13 @@ class DateTime extends Property
      * property or floating time, we will use the DateTimeZone argument to
      * figure out the exact date.
      *
-     * @param DateTimeZone $timeZone
-     *
-     * @return \DateTimeImmutable
+     * @throws InvalidDataException
      */
-    public function getDateTime(DateTimeZone $timeZone = null)
+    public function getDateTime(?\DateTimeZone $timeZone = null): ?\DateTimeImmutable
     {
         $dt = $this->getDateTimes($timeZone);
         if (!$dt) {
-            return;
+            return null;
         }
 
         return $dt[0];
@@ -148,14 +145,14 @@ class DateTime extends Property
      * property or floating time, we will use the DateTimeZone argument to
      * figure out the exact date.
      *
-     * @param DateTimeZone $timeZone
+     * @return \DateInterval[]|\DateTimeImmutable[]
      *
-     * @return \DateTimeImmutable[]
-     * @return \DateTime[]
+     * @throws InvalidDataException
      */
-    public function getDateTimes(DateTimeZone $timeZone = null)
+    public function getDateTimes(?\DateTimeZone $timeZone = null): array
     {
         // Does the property have a TZID?
+        /** @var Property\FlatText $tzid */
         $tzid = $this['TZID'];
 
         if ($tzid) {
@@ -174,8 +171,10 @@ class DateTime extends Property
      * Sets the property as a DateTime object.
      *
      * @param bool isFloating If set to true, timezones will be ignored
+     *
+     * @throws InvalidDataException
      */
-    public function setDateTime(DateTimeInterface $dt, $isFloating = false)
+    public function setDateTime(\DateTimeInterface $dt, $isFloating = false): void
     {
         $this->setDateTimes([$dt], $isFloating);
     }
@@ -186,10 +185,12 @@ class DateTime extends Property
      * The first value will be used as a reference for the timezones, and all
      * the other values will be adjusted for that timezone
      *
-     * @param DateTimeInterface[] $dt
+     * @param \DateTimeInterface[] $dt
      * @param bool isFloating If set to true, timezones will be ignored
+     *
+     * @throws InvalidDataException
      */
-    public function setDateTimes(array $dt, $isFloating = false)
+    public function setDateTimes(array $dt, $isFloating = false): void
     {
         $values = [];
 
@@ -204,7 +205,7 @@ class DateTime extends Property
                 }
                 if (is_null($tz)) {
                     $tz = $d->getTimeZone();
-                    $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00']);
+                    $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z', '+00:00'], true);
                     if (!$isUtc) {
                         $this->offsetSet('TZID', $tz->getName());
                     }
@@ -236,10 +237,8 @@ class DateTime extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return $this->hasTime() ? 'DATE-TIME' : 'DATE';
     }
@@ -249,24 +248,24 @@ class DateTime extends Property
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $dts = $this->getDateTimes();
         $hasTime = $this->hasTime();
         $isFloating = $this->isFloating();
 
         $tz = $dts[0]->getTimeZone();
-        $isUtc = $isFloating ? false : in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+        $isUtc = !$isFloating && in_array($tz->getName(), ['UTC', 'GMT', 'Z'], true);
 
         return array_map(
-            function (DateTimeInterface $dt) use ($hasTime, $isUtc) {
+            function (\DateTimeInterface $dt) use ($hasTime, $isUtc) {
                 if ($hasTime) {
                     return $dt->format('Y-m-d\\TH:i:s').($isUtc ? 'Z' : '');
-                } else {
-                    return $dt->format('Y-m-d');
                 }
+
+                return $dt->format('Y-m-d');
             },
             $dts
         );
@@ -276,8 +275,10 @@ class DateTime extends Property
      * Sets the json value, as it would appear in a jCard or jCal object.
      *
      * The value must always be an array.
+     *
+     * @throws InvalidDataException
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
         // dates and times in jCal have one difference to dates and times in
         // iCalendar. In jCal date-parts are separated by dashes, and
@@ -285,9 +286,7 @@ class DateTime extends Property
         // those.
         $this->setValue(
             array_map(
-                function ($item) {
-                    return strtr($item, [':' => '', '-' => '']);
-                },
+                fn ($item) => strtr($item, [':' => '', '-' => '']),
                 $value
             )
         );
@@ -297,14 +296,15 @@ class DateTime extends Property
      * We need to intercept offsetSet, because it may be used to alter the
      * VALUE from DATE-TIME to DATE or vice-versa.
      *
-     * @param string $name
-     * @param mixed  $value
+     * @param string|int $offset
+     *
+     * @throws InvalidDataException
      */
     #[\ReturnTypeWillChange]
-    public function offsetSet($name, $value)
+    public function offsetSet($offset, $value): void
     {
-        parent::offsetSet($name, $value);
-        if ('VALUE' !== strtoupper($name)) {
+        parent::offsetSet($offset, $value);
+        if ('VALUE' !== strtoupper((string) $offset)) {
             return;
         }
 
@@ -329,12 +329,8 @@ class DateTime extends Property
      *   1 - The issue was repaired (only happens if REPAIR was turned on)
      *   2 - An inconsequential issue
      *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $messages = parent::validate($options);
         $valueType = $this->getValueType();
@@ -349,7 +345,7 @@ class DateTime extends Property
                         DateTimeParser::parseDateTime($value);
                         break;
                 }
-            } catch (InvalidDataException $e) {
+            } catch (InvalidDataException) {
                 $messages[] = [
                     'level' => 3,
                     'message' => 'The supplied value ('.$value.') is not a correct '.$valueType,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php
index e18fe191e..e95f355f2 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Duration.php
@@ -2,7 +2,9 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
+use DateInterval;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
 
 /**
@@ -21,30 +23,24 @@ class Duration extends Property
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = ',';
+    public string $delimiter = ',';
 
     /**
      * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue(explode($this->delimiter, $val));
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return implode($this->delimiter, $this->getParts());
     }
@@ -54,10 +50,8 @@ class Duration extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'DURATION';
     }
@@ -67,9 +61,9 @@ class Duration extends Property
      *
      * If the property has more than one value, only the first is returned.
      *
-     * @return \DateInterval
+     * @throws InvalidDataException
      */
-    public function getDateInterval()
+    public function getDateInterval(): \DateInterval
     {
         $parts = $this->getParts();
         $value = $parts[0];
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
index ae8a78911..da9d972b1 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Period.php
@@ -3,6 +3,7 @@
 namespace Sabre\VObject\Property\ICalendar;
 
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property;
 use Sabre\Xml;
 
@@ -22,30 +23,24 @@ class Period extends Property
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = ',';
+    public string $delimiter = ',';
 
     /**
      * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue(explode($this->delimiter, $val));
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return implode($this->delimiter, $this->getParts());
     }
@@ -55,10 +50,8 @@ class Period extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'PERIOD';
     }
@@ -68,43 +61,46 @@ class Period extends Property
      *
      * The value must always be an array.
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
         $value = array_map(
-            function ($item) {
-                return strtr(implode('/', $item), [':' => '', '-' => '']);
-            },
+            fn ($item) => strtr(implode('/', $item), [':' => '', '-' => '']),
             $value
         );
         parent::setJsonValue($value);
     }
 
+    public function appendUtc(string $strDate)
+    {
+        return !str_ends_with($strDate, 'Z') ? '' : 'Z';
+    }
+
     /**
      * Returns the value, in the format it should be encoded for json.
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $return = [];
         foreach ($this->getParts() as $item) {
-            list($start, $end) = explode('/', $item, 2);
+            [$start, $end] = explode('/', (string) $item, 2);
 
-            $start = DateTimeParser::parseDateTime($start);
+            $startDt = DateTimeParser::parseDateTime($start)->format('Y-m-d\\TH:i:s').$this->appendUtc($start);
 
             // This is a duration value.
             if ('P' === $end[0]) {
                 $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
+                    $startDt,
                     $end,
                 ];
             } else {
-                $end = DateTimeParser::parseDateTime($end);
+                $endDt = DateTimeParser::parseDateTime($end)->format('Y-m-d\\TH:i:s').$this->appendUtc($end);
                 $return[] = [
-                    $start->format('Y-m-d\\TH:i:s'),
-                    $end->format('Y-m-d\\TH:i:s'),
+                    $startDt,
+                    $endDt,
                 ];
             }
         }
@@ -116,9 +112,9 @@ class Period extends Property
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
      *
-     * @param Xml\Writer $writer XML writer
+     * @throws InvalidDataException
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         $writer->startElement(strtolower($this->getValueType()));
         $value = $this->getJsonValue();
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
index 3d632fec1..f3d45158a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/ICalendar/Recur.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject\Property\ICalendar;
 
+use Sabre\VObject\InvalidDataException;
+use Sabre\VObject\Node;
 use Sabre\VObject\Property;
 use Sabre\Xml;
 
@@ -24,17 +26,22 @@ use Sabre\Xml;
  */
 class Recur extends Property
 {
+    /**
+     * Reference to the parent object, if this is not the top object.
+     */
+    public ?Node $parent = null;
+
     /**
      * Updates the current value.
      *
      * This may be either a single, or multiple strings in an array.
      *
-     * @param string|array $value
+     * @param string|array|object $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
         // If we're getting the data from json, we'll be receiving an object
-        if ($value instanceof \StdClass) {
+        if ($value instanceof \stdClass) {
             $value = (array) $value;
         }
 
@@ -45,17 +52,17 @@ class Recur extends Property
                     $v = strtoupper($v);
 
                     // The value had multiple sub-values
-                    if (false !== strpos($v, ',')) {
+                    if (str_contains($v, ',')) {
                         $v = explode(',', $v);
                     }
-                    if (0 === strcmp($k, 'until')) {
+                    if (0 === strcmp((string) $k, 'until')) {
                         $v = strtr($v, [':' => '', '-' => '']);
                     }
                 } elseif (is_array($v)) {
-                    $v = array_map('strtoupper', $v);
+                    $v = array_map(strtoupper(...), $v);
                 }
 
-                $newVal[strtoupper($k)] = $v;
+                $newVal[strtoupper((string) $k)] = $v;
             }
             $this->value = $newVal;
         } elseif (is_string($value)) {
@@ -73,10 +80,8 @@ class Recur extends Property
      * it as a string.
      *
      * To get the correct multi-value version, use getParts.
-     *
-     * @return string
      */
-    public function getValue()
+    public function getValue(): string
     {
         $out = [];
         foreach ($this->value as $key => $value) {
@@ -89,7 +94,7 @@ class Recur extends Property
     /**
      * Sets a multi-valued property.
      */
-    public function setParts(array $parts)
+    public function setParts(array $parts): void
     {
         $this->setValue($parts);
     }
@@ -99,10 +104,8 @@ class Recur extends Property
      *
      * This method always returns an array, if there was only a single value,
      * it will still be wrapped in an array.
-     *
-     * @return array
      */
-    public function getParts()
+    public function getParts(): array
     {
         return $this->value;
     }
@@ -112,20 +115,16 @@ class Recur extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue($val);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return $this->getValue();
     }
@@ -135,10 +134,8 @@ class Recur extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'RECUR';
     }
@@ -148,19 +145,19 @@ class Recur extends Property
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $values = [];
         foreach ($this->getParts() as $k => $v) {
-            if (0 === strcmp($k, 'UNTIL')) {
+            if (0 === strcmp((string) $k, 'UNTIL')) {
                 $date = new DateTime($this->root, null, $v);
-                $values[strtolower($k)] = $date->getJsonValue()[0];
-            } elseif (0 === strcmp($k, 'COUNT')) {
-                $values[strtolower($k)] = intval($v);
+                $values[strtolower((string) $k)] = $date->getJsonValue()[0];
+            } elseif (0 === strcmp((string) $k, 'COUNT')) {
+                $values[strtolower((string) $k)] = intval($v);
             } else {
-                $values[strtolower($k)] = $v;
+                $values[strtolower((string) $k)] = $v;
             }
         }
 
@@ -170,10 +167,8 @@ class Recur extends Property
     /**
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         $valueType = strtolower($this->getValueType());
 
@@ -184,24 +179,27 @@ class Recur extends Property
 
     /**
      * Parses an RRULE value string, and turns it into a struct-ish array.
-     *
-     * @param string $value
-     *
-     * @return array
      */
-    public static function stringToArray($value)
+    public static function stringToArray(string $value): array
     {
         $value = strtoupper($value);
         $newValue = [];
         foreach (explode(';', $value) as $part) {
             // Skipping empty parts.
-            if (empty($part)) {
+            if ('' === $part) {
                 continue;
             }
-            list($partName, $partValue) = explode('=', $part);
+
+            $parts = explode('=', $part);
+
+            if (2 !== count($parts)) {
+                throw new InvalidDataException('The supplied iCalendar RRULE part is incorrect: '.$part);
+            }
+
+            [$partName, $partValue] = $parts;
 
             // The value itself had multiple values..
-            if (false !== strpos($partValue, ',')) {
+            if (str_contains($partValue, ',')) {
                 $partValue = explode(',', $partValue);
             }
             $newValue[$partName] = $partValue;
@@ -227,12 +225,8 @@ class Recur extends Property
      *   1 - The issue was repaired (only happens if REPAIR was turned on)
      *   2 - An inconsequential issue
      *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $repair = ($options & self::REPAIR);
 
@@ -249,7 +243,7 @@ class Recur extends Property
                 if ($repair) {
                     unset($values[$key]);
                 }
-            } elseif ('BYMONTH' == $key) {
+            } elseif ('BYMONTH' === $key) {
                 $byMonth = (array) $value;
                 foreach ($byMonth as $i => $v) {
                     if (!is_numeric($v) || (int) $v < 1 || (int) $v > 12) {
@@ -268,13 +262,13 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && empty($values[$key])) {
+                if (is_array($value) && ([] === $values[$key])) {
                     unset($values[$key]);
                 }
-            } elseif ('BYWEEKNO' == $key) {
+            } elseif ('BYWEEKNO' === $key) {
                 $byWeekNo = (array) $value;
                 foreach ($byWeekNo as $i => $v) {
-                    if (!is_numeric($v) || (int) $v < -53 || 0 == (int) $v || (int) $v > 53) {
+                    if (!is_numeric($v) || (int) $v < -53 || 0 === (int) $v || (int) $v > 53) {
                         $warnings[] = [
                             'level' => $repair ? 1 : 3,
                             'message' => 'BYWEEKNO in RRULE must have value(s) from -53 to -1, or 1 to 53!',
@@ -290,13 +284,13 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && empty($values[$key])) {
+                if (is_array($value) && ([] === $values[$key])) {
                     unset($values[$key]);
                 }
-            } elseif ('BYYEARDAY' == $key) {
+            } elseif ('BYYEARDAY' === $key) {
                 $byYearDay = (array) $value;
                 foreach ($byYearDay as $i => $v) {
-                    if (!is_numeric($v) || (int) $v < -366 || 0 == (int) $v || (int) $v > 366) {
+                    if (!is_numeric($v) || (int) $v < -366 || 0 === (int) $v || (int) $v > 366) {
                         $warnings[] = [
                             'level' => $repair ? 1 : 3,
                             'message' => 'BYYEARDAY in RRULE must have value(s) from -366 to -1, or 1 to 366!',
@@ -312,7 +306,7 @@ class Recur extends Property
                     }
                 }
                 // if there is no valid entry left, remove the whole value
-                if (is_array($value) && empty($values[$key])) {
+                if (is_array($value) && ([] === $values[$key])) {
                     unset($values[$key]);
                 }
             }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
index 3ae775214..1cd7273cc 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/IntegerValue.php
@@ -21,20 +21,16 @@ class IntegerValue extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue((int) $val);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return $this->value;
     }
@@ -44,10 +40,8 @@ class IntegerValue extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'INTEGER';
     }
@@ -56,21 +50,19 @@ class IntegerValue extends Property
      * Returns the value, in the format it should be encoded for json.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         return [(int) $this->getValue()];
     }
 
     /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+     * Hydrate data from an XML subtree, as it would appear in a xCard or xCal
      * object.
      */
-    public function setXmlValue(array $value)
+    public function setXmlValue(array $value): void
     {
-        $value = array_map('intval', $value);
+        $value = array_map(intval(...), $value);
         parent::setXmlValue($value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
index ac8aa066b..e585026fc 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Text.php
@@ -4,6 +4,7 @@ namespace Sabre\VObject\Property;
 
 use Sabre\VObject\Component;
 use Sabre\VObject\Document;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Parser\MimeDir;
 use Sabre\VObject\Property;
 use Sabre\Xml;
@@ -22,17 +23,13 @@ class Text extends Property
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = ',';
+    public string $delimiter = ',';
 
     /**
      * List of properties that are considered 'structured'.
-     *
-     * @var array
      */
-    protected $structuredValues = [
+    protected array $structuredValues = [
         // vCard
         'N',
         'ADR',
@@ -49,10 +46,8 @@ class Text extends Property
      *
      * N must for instance be represented as 5 components, separated by ;, even
      * if the last few components are unused.
-     *
-     * @var array
      */
-    protected $minimumPropertyValues = [
+    protected array $minimumPropertyValues = [
         'N' => 5,
         'ADR' => 7,
     ];
@@ -65,19 +60,18 @@ class Text extends Property
      * Parameter objects.
      *
      * @param Component         $root       The root document
-     * @param string            $name
      * @param string|array|null $value
      * @param array             $parameters List of parameters
-     * @param string            $group      The vcard property group
+     * @param string|null       $group      The vcard property group
      */
-    public function __construct(Component $root, $name, $value = null, array $parameters = [], $group = null)
+    public function __construct(Component $root, string $name, $value = null, array $parameters = [], ?string $group = null)
     {
         // There's two types of multi-valued text properties:
         // 1. multivalue properties.
         // 2. structured value properties
         //
-        // The former is always separated by a comma, the latter by semi-colon.
-        if (in_array($name, $this->structuredValues)) {
+        // The former is always separated by a comma, the latter by semicolon.
+        if (in_array($name, $this->structuredValues, true)) {
             $this->delimiter = ';';
         }
 
@@ -90,19 +84,17 @@ class Text extends Property
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
      *
-     * @param string $val
+     * @throws InvalidDataException
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
     }
 
     /**
      * Sets the value as a quoted-printable encoded string.
-     *
-     * @param string $val
      */
-    public function setQuotedPrintableValue($val)
+    public function setQuotedPrintableValue(string $val): void
     {
         $val = quoted_printable_decode($val);
 
@@ -119,15 +111,13 @@ class Text extends Property
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         $val = $this->getParts();
 
         if (isset($this->minimumPropertyValues[$this->name])) {
-            $val = array_pad($val, $this->minimumPropertyValues[$this->name], '');
+            $val = \array_pad($val, $this->minimumPropertyValues[$this->name], '');
         }
 
         foreach ($val as &$item) {
@@ -136,36 +126,36 @@ class Text extends Property
             }
 
             foreach ($item as &$subItem) {
-                $subItem = strtr(
-                    $subItem,
-                    [
-                        '\\' => '\\\\',
-                        ';' => '\;',
-                        ',' => '\,',
-                        "\n" => '\n',
-                        "\r" => '',
-                    ]
-                );
+                if (!\is_null($subItem)) {
+                    $subItem = strtr(
+                        $subItem,
+                        [
+                            '\\' => '\\\\',
+                            ';' => '\;',
+                            ',' => '\,',
+                            "\n" => '\n',
+                            "\r" => '',
+                        ]
+                    );
+                }
             }
-            $item = implode(',', $item);
+            $item = \implode(',', $item);
         }
 
-        return implode($this->delimiter, $val);
+        return \implode($this->delimiter, $val);
     }
 
     /**
      * Returns the value, in the format it should be encoded for json.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         // Structured text values should always be returned as a single
         // array-item. Multi-value text should be returned as multiple items in
         // the top-array.
-        if (in_array($this->name, $this->structuredValues)) {
+        if (in_array($this->name, $this->structuredValues, true)) {
             return [$this->getParts()];
         }
 
@@ -177,20 +167,16 @@ class Text extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'TEXT';
     }
 
     /**
      * Turns the object back into a serialized blob.
-     *
-     * @return string
      */
-    public function serialize()
+    public function serialize(): string
     {
         // We need to kick in a special type of encoding, if it's a 2.1 vcard.
         if (Document::VCARD21 !== $this->root->getDocumentType()) {
@@ -227,22 +213,22 @@ class Text extends Property
 
         // If the resulting value contains a \n, we must encode it as
         // quoted-printable.
-        if (false !== \strpos($val, "\n")) {
+        if (str_contains((string) $val, "\n")) {
             $str .= ';ENCODING=QUOTED-PRINTABLE:';
             $lastLine = $str;
-            $out = null;
+            $out = '';
 
             // The PHP built-in quoted-printable-encode does not correctly
             // encode newlines for us. Specifically, the \r\n sequence must in
             // vcards be encoded as =0D=OA and we must insert soft-newlines
             // every 75 bytes.
-            for ($ii = 0; $ii < \strlen($val); ++$ii) {
+            for ($ii = 0; $ii < \strlen((string) $val); ++$ii) {
                 $ord = \ord($val[$ii]);
                 // These characters are encoded as themselves.
                 if ($ord >= 32 && $ord <= 126) {
                     $lastLine .= $val[$ii];
                 } else {
-                    $lastLine .= '='.\strtoupper(\bin2hex($val[$ii]));
+                    $lastLine .= '='.\strtoupper(\bin2hex((string) $val[$ii]));
                 }
                 if (\strlen($lastLine) >= 75) {
                     // Soft line break
@@ -255,39 +241,36 @@ class Text extends Property
             }
 
             return $out;
-        } else {
-            $str .= ':'.$val;
+        }
+        $str .= ':'.$val;
 
-            $str = \preg_replace(
-                '/(
+        $str = \preg_replace(
+            '/(
                     (?:^.)?         # 1 additional byte in first line because of missing single space (see next line)
                     .{1,74}         # max 75 bytes per line (1 byte is used for a single space added after every CRLF)
                     (?![\x80-\xbf]) # prevent splitting multibyte characters
                 )/x',
-                "$1\r\n ",
-                $str
-            );
+            "$1\r\n ",
+            $str
+        );
 
-            // remove single space after last CRLF
-            return \substr($str, 0, -1);
-        }
+        // remove single space after last CRLF
+        return \substr((string) $str, 0, -1);
     }
 
     /**
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         $values = $this->getParts();
 
-        $map = function ($items) use ($values, $writer) {
+        $map = function (array $items) use ($values, $writer): void {
             foreach ($items as $i => $item) {
                 $writer->writeElement(
                     $item,
-                    !empty($values[$i]) ? $values[$i] : null
+                    ('' !== $values[$i] && [] !== $values[$i]) ? $values[$i] : null
                 );
             }
         };
@@ -360,26 +343,22 @@ class Text extends Property
      *    * level - (number between 1 and 3 with severity information)
      *    * message - (human readable message)
      *    * node - (reference to the offending node)
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $warnings = parent::validate($options);
 
         if (isset($this->minimumPropertyValues[$this->name])) {
             $minimum = $this->minimumPropertyValues[$this->name];
             $parts = $this->getParts();
-            if (count($parts) < $minimum) {
+            if (\count($parts) < $minimum) {
                 $warnings[] = [
                     'level' => $options & self::REPAIR ? 1 : 3,
-                    'message' => 'The '.$this->name.' property must have at least '.$minimum.' values. It only has '.count($parts),
+                    'message' => 'The '.$this->name.' property must have at least '.$minimum.' values. It only has '.\count($parts),
                     'node' => $this,
                 ];
                 if ($options & self::REPAIR) {
-                    $parts = array_pad($parts, $minimum, '');
+                    $parts = \array_pad($parts, $minimum, '');
                     $this->setParts($parts);
                 }
             }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
index 1b81609aa..9c4016c64 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Time.php
@@ -3,6 +3,7 @@
 namespace Sabre\VObject\Property;
 
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
 
 /**
  * Time property.
@@ -18,20 +19,16 @@ class Time extends Text
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'TIME';
     }
@@ -41,7 +38,7 @@ class Time extends Text
      *
      * The value must always be an array.
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
         // Removing colons from value.
         $value = str_replace(
@@ -62,9 +59,9 @@ class Time extends Text
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $parts = DateTimeParser::parseVCardTime($this->getValue());
         $timeStr = '';
@@ -107,7 +104,7 @@ class Time extends Text
                 $timeStr .= 'Z';
             } else {
                 $timeStr .=
-                    preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', $parts['timezone']);
+                    preg_replace('/([0-9]{2})([0-9]{2})$/', '$1:$2', (string) $parts['timezone']);
             }
         }
 
@@ -115,15 +112,13 @@ class Time extends Text
     }
 
     /**
-     * Hydrate data from a XML subtree, as it would appear in a xCard or xCal
+     * Hydrate data from an XML subtree, as it would appear in a xCard or xCal
      * object.
      */
-    public function setXmlValue(array $value)
+    public function setXmlValue(array $value): void
     {
         $value = array_map(
-            function ($value) {
-                return str_replace(':', '', $value);
-            },
+            fn ($value) => str_replace(':', '', $value),
             $value
         );
         parent::setXmlValue($value);
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php
index 6f404c286..3bcf61351 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Unknown.php
@@ -18,10 +18,8 @@ class Unknown extends Text
      * Returns the value, in the format it should be encoded for json.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         return [$this->getRawMimeDirValue()];
     }
@@ -31,10 +29,8 @@ class Unknown extends Text
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'UNKNOWN';
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
index 1ad1fb199..dce7bf4bb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/Uri.php
@@ -3,7 +3,6 @@
 namespace Sabre\VObject\Property;
 
 use Sabre\VObject\Parameter;
-use Sabre\VObject\Property;
 
 /**
  * URI property.
@@ -19,33 +18,27 @@ class Uri extends Text
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'URI';
     }
 
     /**
      * Returns an iterable list of children.
-     *
-     * @return array
      */
-    public function parameters()
+    public function parameters(): array
     {
         $parameters = parent::parameters();
-        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'])) {
+        if (!isset($parameters['VALUE']) && in_array($this->name, ['URL', 'PHOTO'], true)) {
             // If we are encoding a URI value, and this URI value has no
             // VALUE=URI parameter, we add it anyway.
             //
@@ -65,13 +58,11 @@ class Uri extends Text
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         // Normally we don't need to do any type of unescaping for these
-        // properties, however.. we've noticed that Google Contacts
+        // properties, however, we've noticed that Google Contacts
         // specifically escapes the colon (:) with a backslash. While I have
         // no clue why they thought that was a good idea, I'm unescaping it
         // anyway.
@@ -83,14 +74,10 @@ class Uri extends Text
             $matches = preg_split($regex, $val, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
             $newVal = '';
             foreach ($matches as $match) {
-                switch ($match) {
-                    case '\:':
-                        $newVal .= ':';
-                        break;
-                    default:
-                        $newVal .= $match;
-                        break;
-                }
+                match ($match) {
+                    '\:' => $newVal .= ':',
+                    default => $newVal .= $match,
+                };
             }
             $this->value = $newVal;
         } else {
@@ -100,10 +87,8 @@ class Uri extends Text
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         if (is_array($this->value)) {
             $value = $this->value[0];
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
index 04b88447f..52d81f1f6 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/UtcOffset.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject\Property;
 
+use Sabre\VObject\InvalidDataException;
+
 /**
  * UtcOffset property.
  *
@@ -16,20 +18,16 @@ class UtcOffset extends Text
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'UTC-OFFSET';
     }
@@ -38,13 +36,13 @@ class UtcOffset extends Text
      * Sets the JSON value, as it would appear in a jCard or jCal object.
      *
      * The value must always be an array.
+     *
+     * @throws InvalidDataException
      */
-    public function setJsonValue(array $value)
+    public function setJsonValue(array $value): void
     {
         $value = array_map(
-            function ($value) {
-                return str_replace(':', '', $value);
-            },
+            fn ($value) => str_replace(':', '', $value),
             $value
         );
         parent::setJsonValue($value);
@@ -54,16 +52,12 @@ class UtcOffset extends Text
      * Returns the value, in the format it should be encoded for JSON.
      *
      * This method must always return an array.
-     *
-     * @return array
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         return array_map(
-            function ($value) {
-                return substr($value, 0, -2).':'.
-                       substr($value, -2);
-            },
+            fn ($value) => substr((string) $value, 0, -2).':'.
+                   substr((string) $value, -2),
             parent::getJsonValue()
         );
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php
index fc679d572..1ad9fedc2 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/Date.php
@@ -18,10 +18,8 @@ class Date extends DateAndOrTime
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'DATE';
     }
@@ -29,7 +27,7 @@ class Date extends DateAndOrTime
     /**
      * Sets the property as a DateTime object.
      */
-    public function setDateTime(\DateTimeInterface $dt)
+    public function setDateTime(\DateTimeInterface $dt): void
     {
         $this->value = $dt->format('Ymd');
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
index 7bf79c48c..9a7693961 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateAndOrTime.php
@@ -3,7 +3,6 @@
 namespace Sabre\VObject\Property\VCard;
 
 use DateTime;
-use DateTimeImmutable;
 use DateTimeInterface;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
@@ -23,20 +22,16 @@ class DateAndOrTime extends Property
 {
     /**
      * Field separator.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'DATE-AND-OR-TIME';
     }
@@ -46,12 +41,12 @@ class DateAndOrTime extends Property
      *
      * You may also specify DateTimeInterface objects here.
      */
-    public function setParts(array $parts)
+    public function setParts(array $parts): void
     {
         if (count($parts) > 1) {
             throw new \InvalidArgumentException('Only one value allowed');
         }
-        if (isset($parts[0]) && $parts[0] instanceof DateTimeInterface) {
+        if (isset($parts[0]) && $parts[0] instanceof \DateTimeInterface) {
             $this->setDateTime($parts[0]);
         } else {
             parent::setParts($parts);
@@ -65,11 +60,11 @@ class DateAndOrTime extends Property
      *
      * Instead of strings, you may also use DateTimeInterface here.
      *
-     * @param string|array|DateTimeInterface $value
+     * @param string|array|\DateTimeInterface $value
      */
-    public function setValue($value)
+    public function setValue($value): void
     {
-        if ($value instanceof DateTimeInterface) {
+        if ($value instanceof \DateTimeInterface) {
             $this->setDateTime($value);
         } else {
             parent::setValue($value);
@@ -79,10 +74,10 @@ class DateAndOrTime extends Property
     /**
      * Sets the property as a DateTime object.
      */
-    public function setDateTime(DateTimeInterface $dt)
+    public function setDateTime(\DateTimeInterface $dt): void
     {
         $tz = $dt->getTimeZone();
-        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z']);
+        $isUtc = in_array($tz->getName(), ['UTC', 'GMT', 'Z'], true);
 
         if ($isUtc) {
             $value = $dt->format('Ymd\\THis\\Z');
@@ -108,11 +103,11 @@ class DateAndOrTime extends Property
      * current values for those. So at the time of writing, if the year was
      * omitted, we would have filled in 2014.
      *
-     * @return DateTimeImmutable
+     * @throws InvalidDataException
      */
-    public function getDateTime()
+    public function getDateTime(): \DateTimeImmutable
     {
-        $now = new DateTime();
+        $now = new \DateTime();
 
         $tzFormat = 0 === $now->getTimezone()->getOffset($now) ? '\\Z' : 'O';
         $nowParts = DateTimeParser::parseVCardDateTime($now->format('Ymd\\This'.$tzFormat));
@@ -128,7 +123,7 @@ class DateAndOrTime extends Property
             }
         }
 
-        return new DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
+        return new \DateTimeImmutable("$dateParts[year]-$dateParts[month]-$dateParts[date] $dateParts[hour]:$dateParts[minute]:$dateParts[second] $dateParts[timezone]");
     }
 
     /**
@@ -136,9 +131,9 @@ class DateAndOrTime extends Property
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $parts = DateTimeParser::parseVCardDateTime($this->getValue());
 
@@ -228,23 +223,19 @@ class DateAndOrTime extends Property
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
      *
-     * @param Xml\Writer $writer XML writer
+     * @throws InvalidDataException
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         $valueType = strtolower($this->getValueType());
         $parts = DateTimeParser::parseVCardDateAndOrTime($this->getValue());
         $value = '';
 
         // $d = defined
-        $d = function ($part) use ($parts) {
-            return !is_null($parts[$part]);
-        };
+        $d = (fn ($part): bool => !is_null($parts[$part]));
 
         // $r = read
-        $r = function ($part) use ($parts) {
-            return $parts[$part];
-        };
+        $r = (fn ($part) => $parts[$part]);
 
         // From the Relax NG Schema.
         //
@@ -264,7 +255,7 @@ class DateAndOrTime extends Property
                 $value .= '---'.$r('date');
             }
 
-            // # 4.3.2
+        // # 4.3.2
         // value-time = element time {
         //     xsd:string { pattern = "(\d\d(\d\d(\d\d)?)?|-\d\d(\d\d?)|--\d\d)"
         //                          ~ "(Z|[+\-]\d\d(\d\d)?)?" }
@@ -307,20 +298,16 @@ class DateAndOrTime extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue($val);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return implode($this->delimiter, $this->getParts());
     }
@@ -342,19 +329,15 @@ class DateAndOrTime extends Property
      *   1 - The issue was repaired (only happens if REPAIR was turned on)
      *   2 - An inconsequential issue
      *   3 - A severe issue.
-     *
-     * @param int $options
-     *
-     * @return array
      */
-    public function validate($options = 0)
+    public function validate(int $options = 0): array
     {
         $messages = parent::validate($options);
         $value = $this->getValue();
 
         try {
             DateTimeParser::parseVCardDateTime($value);
-        } catch (InvalidDataException $e) {
+        } catch (InvalidDataException) {
             $messages[] = [
                 'level' => 3,
                 'message' => 'The supplied value ('.$value.') is not a correct DATE-AND-OR-TIME property',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php
index 49c1f3555..c71071f1a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/DateTime.php
@@ -18,10 +18,8 @@ class DateTime extends DateAndOrTime
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'DATE-TIME';
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php
index 318ea0231..c3b996f52 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/LanguageTag.php
@@ -20,20 +20,16 @@ class LanguageTag extends Property
      *
      * This has been 'unfolded', so only 1 line will be passed. Unescaping is
      * not yet done, but parameters are not included.
-     *
-     * @param string $val
      */
-    public function setRawMimeDirValue($val)
+    public function setRawMimeDirValue(string $val): void
     {
         $this->setValue($val);
     }
 
     /**
      * Returns a raw mime-dir representation of the value.
-     *
-     * @return string
      */
-    public function getRawMimeDirValue()
+    public function getRawMimeDirValue(): string
     {
         return $this->getValue();
     }
@@ -43,10 +39,8 @@ class LanguageTag extends Property
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'LANGUAGE-TAG';
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/PhoneNumber.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/PhoneNumber.php
index b714ffd03..f007be3df 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/PhoneNumber.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/PhoneNumber.php
@@ -13,17 +13,15 @@ use Sabre\VObject\Property;
  */
 class PhoneNumber extends Property\Text
 {
-    protected $structuredValues = [];
+    protected array $structuredValues = [];
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'PHONE-NUMBER';
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php
index da6ea3d44..80739237e 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/VCard/TimeStamp.php
@@ -3,6 +3,7 @@
 namespace Sabre\VObject\Property\VCard;
 
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Property\Text;
 use Sabre\Xml;
 
@@ -20,20 +21,16 @@ class TimeStamp extends Text
     /**
      * In case this is a multi-value property. This string will be used as a
      * delimiter.
-     *
-     * @var string
      */
-    public $delimiter = '';
+    public string $delimiter = '';
 
     /**
      * Returns the type of value.
      *
      * This corresponds to the VALUE= parameter. Every property also has a
      * 'default' valueType.
-     *
-     * @return string
      */
-    public function getValueType()
+    public function getValueType(): string
     {
         return 'TIMESTAMP';
     }
@@ -43,9 +40,9 @@ class TimeStamp extends Text
      *
      * This method must always return an array.
      *
-     * @return array
+     * @throws InvalidDataException
      */
-    public function getJsonValue()
+    public function getJsonValue(): array
     {
         $parts = DateTimeParser::parseVCardDateTime($this->getValue());
 
@@ -68,10 +65,8 @@ class TimeStamp extends Text
     /**
      * This method serializes only the value of a property. This is used to
      * create xCard or xCal documents.
-     *
-     * @param Xml\Writer $writer XML writer
      */
-    protected function xmlSerializeValue(Xml\Writer $writer)
+    protected function xmlSerializeValue(Xml\Writer $writer): void
     {
         // xCard is the only XML and JSON format that has the same date and time
         // format than vCard.
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php
new file mode 100644
index 000000000..00cea1231
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Property/XCrypto.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Sabre\VObject\Property;
+
+use Sabre\VObject\Property;
+//use Sabre\VObject\Property\Text;
+
+/**
+ * XCrypto property.
+ *
+ * This object encodes X-CRYPTO values, as defined in KDE KAddressBook
+ *
+ * @copyright Copyright (C) SnappyMail (https://snappymail.eu/)
+ * @author DJMaze (https://snappymail.eu/)
+ * @license http://sabre.io/license/ Modified BSD License
+ *
+ * https://github.com/sabre-io/vobject/issues/589
+ */
+
+class XCrypto extends Property
+//class XCrypto extends Text
+{
+    /**
+     * Returns the type of value.
+     *
+     * This corresponds to the VALUE= parameter. Every property also has a
+     * 'default' valueType.
+     */
+    public function getValueType(): string
+    {
+        return 'X-CRYPTO';
+    }
+
+    /**
+     * Sets a raw value coming from a mimedir (iCalendar/vCard) file.
+     *
+     * This has been 'unfolded', so only 1 line will be passed. Unescaping is
+     * not yet done, but parameters are not included.
+     */
+    public function setRawMimeDirValue($val): void
+    {
+        error_log("setRawMimeDirValue({$val})");
+//        $this->setValue(MimeDir::unescapeValue($val, $this->delimiter));
+    }
+
+    /**
+     * Returns a raw mime-dir representation of the value.
+     */
+    public function getRawMimeDirValue(): string
+    {
+        $result = [];
+        foreach ($this->parameters as $parameter) {
+            $result[] = strtolower($parameter->name) . '=' . $parameter->getValue();
+        }
+        return implode(',', $result);
+    }
+
+    public function xmlSerialize(\Sabre\Xml\Writer $writer): void
+    {
+        $writer->startElement(strtolower($this->name));
+        foreach ($this->parameters as $parameter) {
+            $writer->startElement(strtolower($parameter->name));
+            $writer->write($parameter);
+            $writer->endElement();
+        }
+        $writer->endElement();
+    }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Reader.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Reader.php
index 055d546a5..353186920 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Reader.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Reader.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject;
 
+use Sabre\Xml\LibXMLException;
+
 /**
  * iCalendar/vCard/jCal/jCard/xCal/xCard reader object.
  *
@@ -18,13 +20,13 @@ class Reader
      * If this option is passed to the reader, it will be less strict about the
      * validity of the lines.
      */
-    const OPTION_FORGIVING = 1;
+    public const OPTION_FORGIVING = 1;
 
     /**
      * If this option is turned on, any lines we cannot parse will be ignored
      * by the reader.
      */
-    const OPTION_IGNORE_INVALID_LINES = 2;
+    public const OPTION_IGNORE_INVALID_LINES = 2;
 
     /**
      * Parses a vCard or iCalendar object, and returns the top component.
@@ -35,18 +37,15 @@ class Reader
      * You can either supply a string, or a readable stream for input.
      *
      * @param string|resource $data
-     * @param int             $options
-     * @param string          $charset
      *
-     * @return Document
+     * @throws ParseException
      */
-    public static function read($data, $options = 0, $charset = 'UTF-8')
+    public static function read($data, int $options = 0, string $charset = 'UTF-8'): ?Document
     {
         $parser = new Parser\MimeDir();
         $parser->setCharset($charset);
-        $result = $parser->parse($data, $options);
 
-        return $result;
+        return $parser->parse($data, $options);
     }
 
     /**
@@ -60,16 +59,15 @@ class Reader
      * input.
      *
      * @param string|resource|array $data
-     * @param int                   $options
      *
-     * @return Document
+     * @throws EofException
+     * @throws ParseException|InvalidDataException
      */
-    public static function readJson($data, $options = 0)
+    public static function readJson($data, int $options = 0): ?Document
     {
         $parser = new Parser\Json();
-        $result = $parser->parse($data, $options);
 
-        return $result;
+        return $parser->parse($data, $options);
     }
 
     /**
@@ -81,15 +79,16 @@ class Reader
      * You can either supply a string, or a readable stream for input.
      *
      * @param string|resource $data
-     * @param int             $options
      *
-     * @return Document
+     * @throws EofException
+     * @throws InvalidDataException
+     * @throws ParseException
+     * @throws LibXMLException
      */
-    public static function readXML($data, $options = 0)
+    public static function readXML($data, int $options = 0): ?Document
     {
         $parser = new Parser\XML();
-        $result = $parser->parse($data, $options);
 
-        return $result;
+        return $parser->parse($data, $options);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
index 61f05d7de..5db409350 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/EventIterator.php
@@ -2,12 +2,9 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeImmutable;
-use DateTimeInterface;
-use DateTimeZone;
-use InvalidArgumentException;
 use Sabre\VObject\Component;
 use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\InvalidDataException;
 use Sabre\VObject\Settings;
 
 /**
@@ -62,17 +59,13 @@ class EventIterator implements \Iterator
 {
     /**
      * Reference timeZone for floating dates and times.
-     *
-     * @var DateTimeZone
      */
-    protected $timeZone;
+    protected \DateTimeZone $timeZone;
 
     /**
      * True if we're iterating an all-day event.
-     *
-     * @var bool
      */
-    protected $allDay = false;
+    protected bool $allDay = false;
 
     /**
      * Creates the iterator.
@@ -88,16 +81,17 @@ class EventIterator implements \Iterator
      *
      * The $uid parameter is only required for the first method.
      *
-     * @param Component|array $input
-     * @param string|null     $uid
-     * @param DateTimeZone    $timeZone reference timezone for floating dates and
-     *                                  times
+     * @param Component|Component\VCalendar|array $input
+     * @param \DateTimeZone|null                  $timeZone reference timezone for floating dates and
+     *                                                      times
+     *
+     * @throws MaxInstancesExceededException
+     * @throws NoInstancesException
+     * @throws InvalidDataException
      */
-    public function __construct($input, $uid = null, DateTimeZone $timeZone = null)
+    public function __construct($input, ?string $uid = null, ?\DateTimeZone $timeZone = null)
     {
-        if (is_null($timeZone)) {
-            $timeZone = new DateTimeZone('UTC');
-        }
+        $timeZone ??= new \DateTimeZone('UTC');
         $this->timeZone = $timeZone;
 
         if (is_array($input)) {
@@ -107,16 +101,16 @@ class EventIterator implements \Iterator
             $events = [$input];
         } else {
             // Calendar + UID mode.
-            $uid = (string) $uid;
             if (!$uid) {
-                throw new InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
+                throw new \InvalidArgumentException('The UID argument is required when a VCALENDAR is passed to this constructor');
             }
             if (!isset($input->VEVENT)) {
-                throw new InvalidArgumentException('No events found in this calendar');
+                throw new \InvalidArgumentException('No events found in this calendar');
             }
             $events = $input->getByUID($uid);
         }
 
+        /** @var VEvent[] $events */
         foreach ($events as $vevent) {
             if (!isset($vevent->{'RECURRENCE-ID'})) {
                 $this->masterEvent = $vevent;
@@ -136,7 +130,7 @@ class EventIterator implements \Iterator
             // event and use that instead. This may not always give the
             // desired result.
             if (!count($this->overriddenEvents)) {
-                throw new InvalidArgumentException('This VCALENDAR did not have an event with UID: '.$uid);
+                throw new \InvalidArgumentException('This VCALENDAR did not have an event with UID: '.$uid);
             }
             $this->masterEvent = array_shift($this->overriddenEvents);
         }
@@ -168,8 +162,12 @@ class EventIterator implements \Iterator
         }
 
         if (isset($this->masterEvent->RDATE)) {
+            $rdateValues = [];
+            foreach ($this->masterEvent->RDATE as $rdate) {
+                $rdateValues = array_merge($rdateValues, $rdate->getParts());
+            }
             $this->recurIterator = new RDateIterator(
-                $this->masterEvent->RDATE->getParts(),
+                $rdateValues,
                 $this->startDate
             );
         } elseif (isset($this->masterEvent->RRULE)) {
@@ -195,48 +193,47 @@ class EventIterator implements \Iterator
 
     /**
      * Returns the date for the current position of the iterator.
-     *
-     * @return DateTimeImmutable
      */
     #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): ?\DateTimeImmutable
     {
         if ($this->currentDate) {
             return clone $this->currentDate;
         }
+
+        return null;
     }
 
     /**
      * This method returns the start date for the current iteration of the
      * event.
-     *
-     * @return DateTimeImmutable
      */
-    public function getDtStart()
+    public function getDtStart(): ?\DateTimeImmutable
     {
         if ($this->currentDate) {
             return clone $this->currentDate;
         }
+
+        return null;
     }
 
     /**
      * This method returns the end date for the current iteration of the
      * event.
      *
-     * @return DateTimeImmutable
+     * @throws MaxInstancesExceededException|InvalidDataException
      */
-    public function getDtEnd()
+    public function getDtEnd(): ?\DateTimeImmutable
     {
         if (!$this->valid()) {
-            return;
+            return null;
         }
         if ($this->currentOverriddenEvent && $this->currentOverriddenEvent->DTEND) {
             return $this->currentOverriddenEvent->DTEND->getDateTime($this->timeZone);
-        } else {
-            $end = clone $this->currentDate;
-
-            return $end->modify('+'.$this->eventDuration.' seconds');
         }
+        $end = clone $this->currentDate;
+
+        return $end->modify('+'.$this->eventDuration.' seconds');
     }
 
     /**
@@ -245,14 +242,16 @@ class EventIterator implements \Iterator
      * This VEVENT will have a recurrence id, and its DTSTART and DTEND
      * altered.
      *
-     * @return VEvent
+     * @throws MaxInstancesExceededException
+     * @throws InvalidDataException
      */
-    public function getEventObject()
+    public function getEventObject(): VEvent
     {
         if ($this->currentOverriddenEvent) {
             return $this->currentOverriddenEvent;
         }
 
+        /** @var VEvent $event */
         $event = clone $this->masterEvent;
 
         // Ignoring the following block, because PHPUnit's code coverage
@@ -283,11 +282,9 @@ class EventIterator implements \Iterator
      * Returns the current position of the iterator.
      *
      * This is for us simply a 0-based index.
-     *
-     * @return int
      */
     #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): int
     {
         // The counter is always 1 ahead.
         return $this->counter - 1;
@@ -297,10 +294,10 @@ class EventIterator implements \Iterator
      * This is called after next, to see if the iterator is still at a valid
      * position, or if it's at the end.
      *
-     * @return bool
+     * @throws MaxInstancesExceededException
      */
     #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         if ($this->counter > Settings::$maxRecurrences && -1 !== Settings::$maxRecurrences) {
             throw new MaxInstancesExceededException('Recurring events are only allowed to generate '.Settings::$maxRecurrences);
@@ -312,15 +309,16 @@ class EventIterator implements \Iterator
     /**
      * Sets the iterator back to the starting point.
      *
-     * @return void
+     * @throws InvalidDataException
      */
     #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->recurIterator->rewind();
         // re-creating overridden event index.
         $index = [];
         foreach ($this->overriddenEvents as $key => $event) {
+            /** @var VEvent $event */
             $stamp = $event->DTSTART->getDateTime($this->timeZone)->getTimeStamp();
             $index[$stamp][] = $key;
         }
@@ -338,10 +336,10 @@ class EventIterator implements \Iterator
     /**
      * Advances the iterator with one step.
      *
-     * @return void
+     * @throws InvalidDataException
      */
     #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         $this->currentOverriddenEvent = null;
         ++$this->counter;
@@ -393,8 +391,10 @@ class EventIterator implements \Iterator
 
     /**
      * Quickly jump to a date in the future.
+     *
+     * @throws MaxInstancesExceededException|InvalidDataException
      */
-    public function fastForward(DateTimeInterface $dateTime)
+    public function fastForward(\DateTimeInterface $dateTime): void
     {
         while ($this->valid() && $this->getDtEnd() <= $dateTime) {
             $this->next();
@@ -403,10 +403,8 @@ class EventIterator implements \Iterator
 
     /**
      * Returns true if this recurring event never ends.
-     *
-     * @return bool
      */
-    public function isInfinite()
+    public function isInfinite(): bool
     {
         return $this->recurIterator->isInfinite();
     }
@@ -414,9 +412,9 @@ class EventIterator implements \Iterator
     /**
      * RRULE parser.
      *
-     * @var RRuleIterator
+     * @var RRuleIterator|RDateIterator
      */
-    protected $recurIterator;
+    protected \Iterator $recurIterator;
 
     /**
      * The duration, in seconds, of the master event.
@@ -427,71 +425,53 @@ class EventIterator implements \Iterator
 
     /**
      * A reference to the main (master) event.
-     *
-     * @var VEVENT
      */
-    protected $masterEvent;
+    protected ?VEvent $masterEvent = null;
 
     /**
      * List of overridden events.
-     *
-     * @var array
      */
-    protected $overriddenEvents = [];
+    protected array $overriddenEvents = [];
 
     /**
      * Overridden event index.
      *
      * Key is timestamp, value is the list of indexes of the item in the $overriddenEvent
      * property.
-     *
-     * @var array
      */
-    protected $overriddenEventsIndex;
+    protected array $overriddenEventsIndex;
 
     /**
      * A list of recurrence-id's that are either part of EXDATE, or are
      * overridden.
-     *
-     * @var array
      */
-    protected $exceptions = [];
+    protected array $exceptions = [];
 
     /**
      * Internal event counter.
-     *
-     * @var int
      */
-    protected $counter;
+    protected int $counter = 0;
 
     /**
      * The very start of the iteration process.
-     *
-     * @var DateTimeImmutable
      */
-    protected $startDate;
+    protected ?\DateTimeImmutable $startDate;
 
     /**
      * Where we are currently in the iteration process.
-     *
-     * @var DateTimeImmutable
      */
-    protected $currentDate;
+    protected ?\DateTimeImmutable $currentDate = null;
 
     /**
      * The next date from the rrule parser.
      *
      * Sometimes we need to temporary store the next date, because an
      * overridden event came before.
-     *
-     * @var DateTimeImmutable
      */
-    protected $nextDate;
+    protected ?\DateTimeImmutable $nextDate = null;
 
     /**
      * The event that overwrites the current iteration.
-     *
-     * @var VEVENT
      */
-    protected $currentOverriddenEvent;
+    protected ?VEvent $currentOverriddenEvent = null;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/MaxInstancesExceededException.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/MaxInstancesExceededException.php
index cb0835813..38d62b46b 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/MaxInstancesExceededException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/MaxInstancesExceededException.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject\Recur;
 
-use Exception;
-
 /**
  * This exception will get thrown when a recurrence rule generated more than
  * the maximum number of instances.
@@ -12,6 +10,6 @@ use Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class MaxInstancesExceededException extends Exception
+class MaxInstancesExceededException extends \Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/NoInstancesException.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/NoInstancesException.php
index 348c02306..4c2d44aa6 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/NoInstancesException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/NoInstancesException.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject\Recur;
 
-use Exception;
-
 /**
  * This exception gets thrown when a recurrence iterator produces 0 instances.
  *
@@ -13,6 +11,6 @@ use Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
  */
-class NoInstancesException extends Exception
+class NoInstancesException extends \Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
index 5d56657fa..b9bd0beff 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RDateIterator.php
@@ -2,9 +2,9 @@
 
 namespace Sabre\VObject\Recur;
 
-use DateTimeInterface;
 use Iterator;
 use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\InvalidDataException;
 
 /**
  * RRuleParser.
@@ -19,16 +19,20 @@ use Sabre\VObject\DateTimeParser;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class RDateIterator implements Iterator
+class RDateIterator implements \Iterator
 {
     /**
      * Creates the Iterator.
      *
      * @param string|array $rrule
      */
-    public function __construct($rrule, DateTimeInterface $start)
+    public function __construct($rrule, /**
+     * The reference start date/time for the rrule.
+     *
+     * All calculations are based on this initial date.
+     */
+        protected \DateTimeInterface $startDate)
     {
-        $this->startDate = $start;
         $this->parseRDate($rrule);
         $this->currentDate = clone $this->startDate;
     }
@@ -36,10 +40,10 @@ class RDateIterator implements Iterator
     /* Implementation of the Iterator interface {{{ */
 
     #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): ?\DateTimeInterface
     {
         if (!$this->valid()) {
-            return;
+            return null;
         }
 
         return clone $this->currentDate;
@@ -47,11 +51,9 @@ class RDateIterator implements Iterator
 
     /**
      * Returns the current item number.
-     *
-     * @return int
      */
     #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): int
     {
         return $this->counter;
     }
@@ -59,22 +61,18 @@ class RDateIterator implements Iterator
     /**
      * Returns whether the current item is a valid item for the recurrence
      * iterator.
-     *
-     * @return bool
      */
     #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         return $this->counter <= count($this->dates);
     }
 
     /**
      * Resets the iterator.
-     *
-     * @return void
      */
     #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->currentDate = clone $this->startDate;
         $this->counter = 0;
@@ -83,10 +81,10 @@ class RDateIterator implements Iterator
     /**
      * Goes on to the next iteration.
      *
-     * @return void
+     * @throws InvalidDataException
      */
     #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         ++$this->counter;
         if (!$this->valid()) {
@@ -104,10 +102,8 @@ class RDateIterator implements Iterator
 
     /**
      * Returns true if this recurring event never ends.
-     *
-     * @return bool
      */
-    public function isInfinite()
+    public function isInfinite(): bool
     {
         return false;
     }
@@ -115,39 +111,28 @@ class RDateIterator implements Iterator
     /**
      * This method allows you to quickly go to the next occurrence after the
      * specified date.
+     *
+     * @throws InvalidDataException
      */
-    public function fastForward(DateTimeInterface $dt)
+    public function fastForward(\DateTimeInterface $dt): void
     {
         while ($this->valid() && $this->currentDate < $dt) {
             $this->next();
         }
     }
 
-    /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     *
-     * @var DateTimeInterface
-     */
-    protected $startDate;
-
     /**
      * The date of the current iteration. You can get this by calling
      * ->current().
-     *
-     * @var DateTimeInterface
      */
-    protected $currentDate;
+    protected \DateTimeInterface $currentDate;
 
     /**
      * The current item in the list.
      *
      * You can get this number with the key() method.
-     *
-     * @var int
      */
-    protected $counter = 0;
+    protected int $counter = 0;
 
     /* }}} */
 
@@ -155,9 +140,9 @@ class RDateIterator implements Iterator
      * This method receives a string from an RRULE property, and populates this
      * class with all the values.
      *
-     * @param string|array $rrule
+     * @param string|array $rdate
      */
-    protected function parseRDate($rdate)
+    protected function parseRDate($rdate): void
     {
         if (is_string($rdate)) {
             $rdate = explode(',', $rdate);
@@ -168,8 +153,6 @@ class RDateIterator implements Iterator
 
     /**
      * Array with the RRULE dates.
-     *
-     * @var array
      */
-    protected $dates = [];
+    protected array $dates = [];
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
index d556aa6c3..6f1f28ae3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Recur/RRuleIterator.php
@@ -3,7 +3,6 @@
 namespace Sabre\VObject\Recur;
 
 use DateTimeImmutable;
-use DateTimeInterface;
 use Iterator;
 use Sabre\VObject\DateTimeParser;
 use Sabre\VObject\InvalidDataException;
@@ -22,16 +21,29 @@ use Sabre\VObject\Property;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class RRuleIterator implements Iterator
+class RRuleIterator implements \Iterator
 {
+    /**
+     * Constant denoting the upper limit on how long into the future
+     * we want to iterate. The value is a unix timestamp and currently
+     * corresponds to the datetime 9999-12-31 11:59:59 UTC.
+     */
+    public const dateUpperLimit = 253402300799;
+
     /**
      * Creates the Iterator.
      *
      * @param string|array $rrule
+     *
+     * @throws InvalidDataException
      */
-    public function __construct($rrule, DateTimeInterface $start)
+    public function __construct($rrule, /**
+     * The reference start date/time for the rrule.
+     *
+     * All calculations are based on this initial date.
+     */
+        protected \DateTimeInterface $startDate)
     {
-        $this->startDate = $start;
         $this->parseRRule($rrule);
         $this->currentDate = clone $this->startDate;
     }
@@ -39,10 +51,10 @@ class RRuleIterator implements Iterator
     /* Implementation of the Iterator interface {{{ */
 
     #[\ReturnTypeWillChange]
-    public function current()
+    public function current(): ?\DateTimeInterface
     {
         if (!$this->valid()) {
-            return;
+            return null;
         }
 
         return clone $this->currentDate;
@@ -50,11 +62,9 @@ class RRuleIterator implements Iterator
 
     /**
      * Returns the current item number.
-     *
-     * @return int
      */
     #[\ReturnTypeWillChange]
-    public function key()
+    public function key(): int
     {
         return $this->counter;
     }
@@ -63,11 +73,9 @@ class RRuleIterator implements Iterator
      * Returns whether the current item is a valid item for the recurrence
      * iterator. This will return false if we've gone beyond the UNTIL or COUNT
      * statements.
-     *
-     * @return bool
      */
     #[\ReturnTypeWillChange]
-    public function valid()
+    public function valid(): bool
     {
         if (null === $this->currentDate) {
             return false;
@@ -81,11 +89,9 @@ class RRuleIterator implements Iterator
 
     /**
      * Resets the iterator.
-     *
-     * @return void
      */
     #[\ReturnTypeWillChange]
-    public function rewind()
+    public function rewind(): void
     {
         $this->currentDate = clone $this->startDate;
         $this->counter = 0;
@@ -93,11 +99,9 @@ class RRuleIterator implements Iterator
 
     /**
      * Goes on to the next iteration.
-     *
-     * @return void
      */
     #[\ReturnTypeWillChange]
-    public function next()
+    public function next(): void
     {
         // Otherwise, we find the next event in the normal RRULE
         // sequence.
@@ -129,10 +133,8 @@ class RRuleIterator implements Iterator
 
     /**
      * Returns true if this recurring event never ends.
-     *
-     * @return bool
      */
-    public function isInfinite()
+    public function isInfinite(): bool
     {
         return !$this->count && !$this->until;
     }
@@ -141,97 +143,78 @@ class RRuleIterator implements Iterator
      * This method allows you to quickly go to the next occurrence after the
      * specified date.
      */
-    public function fastForward(DateTimeInterface $dt)
+    public function fastForward(\DateTimeInterface $dt): void
     {
         while ($this->valid() && $this->currentDate < $dt) {
             $this->next();
         }
     }
 
-    /**
-     * The reference start date/time for the rrule.
-     *
-     * All calculations are based on this initial date.
-     *
-     * @var DateTimeInterface
-     */
-    protected $startDate;
-
     /**
      * The date of the current iteration. You can get this by calling
      * ->current().
-     *
-     * @var DateTimeInterface
      */
-    protected $currentDate;
+    protected ?\DateTimeInterface $currentDate;
+
+    /**
+     * The number of hours that the next occurrence of an event
+     * jumped forward, usually because summer time started and
+     * the requested time-of-day like 0230 did not exist on that
+     * day. And so the event was scheduled 1 hour later at 0330.
+     */
+    protected int $hourJump = 0;
 
     /**
      * Frequency is one of: secondly, minutely, hourly, daily, weekly, monthly,
      * yearly.
-     *
-     * @var string
      */
-    protected $frequency;
+    protected string $frequency;
 
     /**
      * The number of recurrences, or 'null' if infinitely recurring.
-     *
-     * @var int
      */
-    protected $count;
+    protected ?int $count = null;
 
     /**
      * The interval.
      *
      * If for example frequency is set to daily, interval = 2 would mean every
      * 2 days.
-     *
-     * @var int
      */
-    protected $interval = 1;
+    protected int $interval = 1;
 
     /**
      * The last instance of this recurrence, inclusively.
-     *
-     * @var DateTimeInterface|null
      */
-    protected $until;
+    protected ?\DateTimeInterface $until = null;
 
     /**
      * Which seconds to recur.
      *
      * This is an array of integers (between 0 and 60)
-     *
-     * @var array
      */
-    protected $bySecond;
+    protected ?array $bySecond = null;
 
     /**
      * Which minutes to recur.
      *
      * This is an array of integers (between 0 and 59)
-     *
-     * @var array
      */
-    protected $byMinute;
+    protected ?array $byMinute = null;
 
     /**
      * Which hours to recur.
      *
      * This is an array of integers (between 0 and 23)
-     *
-     * @var array
      */
-    protected $byHour;
+    protected ?array $byHour = null;
 
     /**
      * The current item in the list.
      *
      * You can get this number with the key() method.
-     *
-     * @var int
      */
-    protected $counter = 0;
+    protected int $counter = 0;
 
     /**
      * Which weekdays to recur.
@@ -242,20 +225,16 @@ class RRuleIterator implements Iterator
      * this indicates the nth occurrence of a specific day within the monthly or
      * yearly rrule. For instance, -2TU indicates the second-last tuesday of
      * the month, or year.
-     *
-     * @var array
      */
-    protected $byDay;
+    protected ?array $byDay = null;
 
     /**
      * Which days of the month to recur.
      *
      * This is an array of days of the months (1-31). The value can also be
      * negative. -5 for instance means the 5th last day of the month.
-     *
-     * @var array
      */
-    protected $byMonthDay;
+    protected ?array $byMonthDay = null;
 
     /**
      * Which days of the year to recur.
@@ -263,29 +242,23 @@ class RRuleIterator implements Iterator
      * This is an array with days of the year (1 to 366). The values can also
      * be negative. For instance, -1 will always represent the last day of the
      * year. (December 31st).
-     *
-     * @var array
      */
-    protected $byYearDay;
+    protected ?array $byYearDay = null;
 
     /**
      * Which week numbers to recur.
      *
      * This is an array of integers from 1 to 53. The values can also be
      * negative. -1 will always refer to the last week of the year.
-     *
-     * @var array
      */
-    protected $byWeekNo;
+    protected ?array $byWeekNo = null;
 
     /**
      * Which months to recur.
      *
      * This is an array of integers from 1 to 12.
-     *
-     * @var array
      */
-    protected $byMonth;
+    protected ?array $byMonth = null;
 
     /**
      * Which items in an existing st to recur.
@@ -298,57 +271,106 @@ class RRuleIterator implements Iterator
      *
      * This would be done by setting frequency to 'monthly', byDay to
      * 'MO,TU,WE,TH,FR' and bySetPos to -1.
-     *
-     * @var array
      */
-    protected $bySetPos;
+    protected ?array $bySetPos = null;
 
     /**
      * When the week starts.
-     *
-     * @var string
      */
-    protected $weekStart = 'MO';
+    protected string $weekStart = 'MO';
 
     /* Functions that advance the iterator {{{ */
 
+    /**
+     * Gets the original start time of the RRULE.
+     *
+     * The value is formatted as a string with 24-hour:minute:second
+     */
+    protected function startTime(): string
+    {
+        return $this->startDate->format('H:i:s');
+    }
+
+    /**
+     * Advances currentDate by the interval.
+     * The time is set from the original startDate.
+     * If the recurrence is on a day when summer time started, then the
+     * time on that day may have jumped forward, for example, from 0230 to 0330.
+     * Using the original time means that the next recurrence will be calculated
+     * based on the original start time and the day/week/month/year interval.
+     * So the start time of the next occurrence can correctly revert to 0230.
+     */
+    protected function advanceTheDate(string $interval): void
+    {
+        $this->currentDate = $this->currentDate->modify($interval.' '.$this->startTime());
+    }
+
+    /**
+     * Does the processing for adjusting the time of multi-hourly events when summer time starts.
+     */
+    protected function adjustForTimeJumpsOfHourlyEvent(\DateTimeInterface $previousEventDateTime): void
+    {
+        if (0 === $this->hourJump) {
+            // Remember if the clock time jumped forward on the next occurrence.
+            // That happens if the next event time is on a day when summer time starts
+            // and the event time is in the non-existent hour of the day.
+            // For example, an event that normally starts at 02:30 will
+            // have to start at 03:30 on that day.
+            // If the interval is just 1 hour, then there is no "jumping back" to do.
+            // The events that day will happen, for example, at 0030 0130 0330 0430 0530...
+            if ($this->interval > 1) {
+                $expectedHourOfNextDate = ((int) $previousEventDateTime->format('G') + $this->interval) % 24;
+                $actualHourOfNextDate = (int) $this->currentDate->format('G');
+                $this->hourJump = $actualHourOfNextDate - $expectedHourOfNextDate;
+            }
+        } else {
+            // The hour "jumped" for the previous occurrence, to avoid the non-existent time.
+            // currentDate got set ahead by (usually) 1 hour on that day.
+            // Adjust it back for this next occurrence.
+            $this->currentDate = $this->currentDate->sub(new \DateInterval('PT'.$this->hourJump.'H'));
+            $this->hourJump = 0;
+        }
+    }
+
     /**
      * Does the processing for advancing the iterator for hourly frequency.
      */
-    protected function nextHourly()
+    protected function nextHourly(): void
     {
+        $previousEventDateTime = clone $this->currentDate;
         $this->currentDate = $this->currentDate->modify('+'.$this->interval.' hours');
+        $this->adjustForTimeJumpsOfHourlyEvent($previousEventDateTime);
     }
 
     /**
      * Does the processing for advancing the iterator for daily frequency.
      */
-    protected function nextDaily()
+    protected function nextDaily(): void
     {
         if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' days');
+            $this->advanceTheDate('+'.$this->interval.' days');
 
             return;
         }
 
         $recurrenceHours = [];
-        if (!empty($this->byHour)) {
+        if ($this->byHour) {
             $recurrenceHours = $this->getHours();
         }
 
         $recurrenceDays = [];
-        if (!empty($this->byDay)) {
+        if ($this->byDay) {
             $recurrenceDays = $this->getDays();
         }
 
         $recurrenceMonths = [];
-        if (!empty($this->byMonth)) {
+        if ($this->byMonth) {
             $recurrenceMonths = $this->getMonths();
         }
 
         do {
             if ($this->byHour) {
-                if ('23' == $this->currentDate->format('G')) {
+                if ('23' === $this->currentDate->format('G')) {
                     // to obey the interval rule
                     $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' days');
                 }
@@ -366,20 +388,26 @@ class RRuleIterator implements Iterator
 
             // Current hour of the day
             $currentHour = $this->currentDate->format('G');
+
+            if ($this->currentDate->getTimestamp() > self::dateUpperLimit) {
+                $this->currentDate = null;
+
+                return;
+            }
         } while (
-            ($this->byDay && !in_array($currentDay, $recurrenceDays)) ||
-            ($this->byHour && !in_array($currentHour, $recurrenceHours)) ||
-            ($this->byMonth && !in_array($currentMonth, $recurrenceMonths))
+            ($this->byDay && !in_array((int) $currentDay, $recurrenceDays, true))
+            || ($this->byHour && !in_array($currentHour, $recurrenceHours, true))
+            || ($this->byMonth && !in_array($currentMonth, $recurrenceMonths, true))
         );
     }
 
     /**
      * Does the processing for advancing the iterator for weekly frequency.
      */
-    protected function nextWeekly()
+    protected function nextWeekly(): void
     {
         if (!$this->byHour && !$this->byDay) {
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' weeks');
+            $this->advanceTheDate('+'.$this->interval.' weeks');
 
             return;
         }
@@ -401,7 +429,7 @@ class RRuleIterator implements Iterator
             if ($this->byHour) {
                 $this->currentDate = $this->currentDate->modify('+1 hours');
             } else {
-                $this->currentDate = $this->currentDate->modify('+1 days');
+                $this->advanceTheDate('+1 days');
             }
 
             // Current day of the week
@@ -411,24 +439,26 @@ class RRuleIterator implements Iterator
             $currentHour = (int) $this->currentDate->format('G');
 
             // We need to roll over to the next week
-            if ($currentDay === $firstDay && (!$this->byHour || '0' == $currentHour)) {
+            if ($currentDay === $firstDay && (!$this->byHour || 0 === $currentHour)) {
                 $this->currentDate = $this->currentDate->modify('+'.($this->interval - 1).' weeks');
 
                 // We need to go to the first day of this week, but only if we
                 // are not already on this first day of this week.
-                if ($this->currentDate->format('w') != $firstDay) {
+                if ((int) $this->currentDate->format('w') !== $firstDay) {
                     $this->currentDate = $this->currentDate->modify('last '.$this->dayNames[$this->dayMap[$this->weekStart]]);
                 }
             }
 
             // We have a match
-        } while (($this->byDay && !in_array($currentDay, $recurrenceDays)) || ($this->byHour && !in_array($currentHour, $recurrenceHours)));
+        } while (($this->byDay && !in_array($currentDay, $recurrenceDays, true)) || ($this->byHour && !in_array((string) $currentHour, $recurrenceHours, true)));
     }
 
     /**
      * Does the processing for advancing the iterator for monthly frequency.
+     *
+     * @throws \Exception
      */
-    protected function nextMonthly()
+    protected function nextMonthly(): void
     {
         $currentDayOfMonth = $this->currentDate->format('j');
         if (!$this->byMonthDay && !$this->byDay) {
@@ -436,28 +466,29 @@ class RRuleIterator implements Iterator
             // occur to the next month. We Must skip these invalid
             // entries.
             if ($currentDayOfMonth < 29) {
-                $this->currentDate = $this->currentDate->modify('+'.$this->interval.' months');
+                $this->advanceTheDate('+'.$this->interval.' months');
             } else {
                 $increase = 0;
                 do {
                     ++$increase;
                     $tempDate = clone $this->currentDate;
-                    $tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months');
-                } while ($tempDate->format('j') != $currentDayOfMonth);
+                    $tempDate = $tempDate->modify('+ '.($this->interval * $increase).' months '.$this->startTime());
+                } while ($tempDate->format('j') !== $currentDayOfMonth);
                 $this->currentDate = $tempDate;
             }
 
             return;
         }
 
-        $occurrence = -1;
+        $selectedOccurrence = -1;
         while (true) {
             $occurrences = $this->getMonthlyOccurrences();
 
             foreach ($occurrences as $occurrence) {
-                // The first occurrence thats higher than the current
+                // The first occurrence that's higher than the current
                 // day of the month wins.
                 if ($occurrence > $currentDayOfMonth) {
+                    $selectedOccurrence = $occurrence;
                     break 2;
                 }
             }
@@ -469,7 +500,7 @@ class RRuleIterator implements Iterator
             // This line does not currently work in hhvm. Temporary workaround
             // follows:
             // $this->currentDate->modify('first day of this month');
-            $this->currentDate = new DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
+            $this->currentDate = new \DateTimeImmutable($this->currentDate->format('Y-m-1 H:i:s'), $this->currentDate->getTimezone());
             // end of workaround
             $this->currentDate = $this->currentDate->modify('+ '.$this->interval.' months');
 
@@ -478,7 +509,7 @@ class RRuleIterator implements Iterator
             $currentDayOfMonth = 0;
 
             // For some reason the "until" parameter was not being used here,
-            // that's why the workaround of the 10000 year bug was needed at all
+            // that's why the workaround of the 10000-year bug was needed at all
             // let's stop it before the "until" parameter date
             if ($this->until && $this->currentDate->getTimestamp() >= $this->until->getTimestamp()) {
                 return;
@@ -486,33 +517,37 @@ class RRuleIterator implements Iterator
 
             // To prevent running this forever (better: until we hit the max date of DateTimeImmutable) we simply
             // stop at 9999-12-31. Looks like the year 10000 problem is not solved in php ....
-            if ($this->currentDate->getTimestamp() > 253402300799) {
+            if ($this->currentDate->getTimestamp() > self::dateUpperLimit) {
                 $this->currentDate = null;
 
                 return;
             }
         }
 
+        // Set the currentDate to the year and month that we are in, and the day of the month that we have selected.
+        // That day could be a day when summer time starts, and if the time of the event is, for example, 0230,
+        // then 0230 will not be a valid time on that day. So always apply the start time from the original startDate.
+        // The "modify" method will set the time forward to 0330, for example, if needed.
         $this->currentDate = $this->currentDate->setDate(
             (int) $this->currentDate->format('Y'),
             (int) $this->currentDate->format('n'),
-            (int) $occurrence
-        );
+            (int) $selectedOccurrence
+        )->modify($this->startTime());
     }
 
     /**
      * Does the processing for advancing the iterator for yearly frequency.
      */
-    protected function nextYearly()
+    protected function nextYearly(): void
     {
         $currentMonth = $this->currentDate->format('n');
         $currentYear = $this->currentDate->format('Y');
         $currentDayOfMonth = $this->currentDate->format('j');
 
         // No sub-rules, so we just advance by year
-        if (empty($this->byMonth)) {
+        if (!$this->byMonth) {
             // Unless it was a leap day!
-            if (2 == $currentMonth && 29 == $currentDayOfMonth) {
+            if (2 === (int) $currentMonth && 29 === (int) $currentDayOfMonth) {
                 $counter = 0;
                 do {
                     ++$counter;
@@ -526,7 +561,7 @@ class RRuleIterator implements Iterator
                     // functions instead.
                     $nextDate = clone $this->currentDate;
                     $nextDate = $nextDate->modify('+ '.($this->interval * $counter).' years');
-                } while (2 != $nextDate->format('n'));
+                } while (2 !== (int) $nextDate->format('n'));
 
                 $this->currentDate = $nextDate;
 
@@ -589,14 +624,15 @@ class RRuleIterator implements Iterator
                     // loop through all YearDay and Days to check all the combinations
                     foreach ($this->byYearDay as $byYearDay) {
                         $date = clone $this->currentDate;
-                        $date = $date->setDate($currentYear, 1, 1);
                         if ($byYearDay > 0) {
-                            $date = $date->add(new \DateInterval('P'.$byYearDay.'D'));
+                            $date = $date->setDate($currentYear, 1, 1);
+                            $date = $date->add(new \DateInterval('P'.($byYearDay - 1).'D'));
                         } else {
-                            $date = $date->sub(new \DateInterval('P'.abs($byYearDay).'D'));
+                            $date = $date->setDate($currentYear, 12, 31);
+                            $date = $date->sub(new \DateInterval('P'.abs($byYearDay + 1).'D'));
                         }
 
-                        if ($date > $this->currentDate && in_array($date->format('N'), $dayOffsets)) {
+                        if ($date > $this->currentDate && in_array((int) $date->format('N'), $dayOffsets, true)) {
                             $checkDates[] = $date;
                         }
                     }
@@ -613,7 +649,7 @@ class RRuleIterator implements Iterator
             }
 
             // The easiest form
-            $this->currentDate = $this->currentDate->modify('+'.$this->interval.' years');
+            $this->advanceTheDate('+'.$this->interval.' years');
 
             return;
         }
@@ -627,7 +663,7 @@ class RRuleIterator implements Iterator
         // If we got a byDay or getMonthDay filter, we must first expand
         // further.
         if ($this->byDay || $this->byMonthDay) {
-            $occurrence = -1;
+            $selectedOccurrence = -1;
             while (true) {
                 $occurrences = $this->getMonthlyOccurrences();
 
@@ -637,7 +673,12 @@ class RRuleIterator implements Iterator
                     // If we advanced to the next month or year, the first
                     // occurrence is always correct.
                     if ($occurrence > $currentDayOfMonth || $advancedToNewMonth) {
-                        break 2;
+                        // only consider byMonth matches,
+                        // otherwise, we don't follow RRule correctly
+                        if (in_array((string) $currentMonth, $this->byMonth, true)) {
+                            $selectedOccurrence = $occurrence;
+                            break 2;
+                        }
                     }
                 }
 
@@ -651,41 +692,46 @@ class RRuleIterator implements Iterator
                         $currentYear += $this->interval;
                         $currentMonth = 1;
                     }
-                } while (!in_array($currentMonth, $this->byMonth));
+                } while (!in_array((string) $currentMonth, $this->byMonth, true));
 
                 $this->currentDate = $this->currentDate->setDate(
                     (int) $currentYear,
-                    (int) $currentMonth,
-                    (int) $currentDayOfMonth
+                    $currentMonth,
+                    $currentDayOfMonth
                 );
+
+                // To prevent running this forever (better: until we hit the max date of DateTimeImmutable) we simply
+                // stop at 9999-12-31. Looks like the year 10000 problem is not solved in php ....
+                if ($this->currentDate->getTimestamp() > self::dateUpperLimit) {
+                    $this->currentDate = null;
+
+                    return;
+                }
             }
 
             // If we made it here, it means we got a valid occurrence
             $this->currentDate = $this->currentDate->setDate(
                 (int) $currentYear,
                 (int) $currentMonth,
-                (int) $occurrence
-            );
-
-            return;
-        } else {
-            // These are the 'byMonth' rules, if there are no byDay or
-            // byMonthDay sub-rules.
-            do {
-                ++$currentMonth;
-                if ($currentMonth > 12) {
-                    $currentYear += $this->interval;
-                    $currentMonth = 1;
-                }
-            } while (!in_array($currentMonth, $this->byMonth));
-            $this->currentDate = $this->currentDate->setDate(
-                (int) $currentYear,
-                (int) $currentMonth,
-                (int) $currentDayOfMonth
-            );
+                (int) $selectedOccurrence
+            )->modify($this->startTime());
 
             return;
         }
+        // These are the 'byMonth' rules, if there are no byDay or
+        // byMonthDay sub-rules.
+        do {
+            ++$currentMonth;
+            if ($currentMonth > 12) {
+                $currentYear += $this->interval;
+                $currentMonth = 1;
+            }
+        } while (!in_array((string) $currentMonth, $this->byMonth, true));
+        $this->currentDate = $this->currentDate->setDate(
+            (int) $currentYear,
+            $currentMonth,
+            (int) $currentDayOfMonth
+        )->modify($this->startTime());
     }
 
     /* }}} */
@@ -695,21 +741,24 @@ class RRuleIterator implements Iterator
      * class with all the values.
      *
      * @param string|array $rrule
+     *
+     * @throws InvalidDataException
      */
-    protected function parseRRule($rrule)
+    protected function parseRRule($rrule): void
     {
         if (is_string($rrule)) {
             $rrule = Property\ICalendar\Recur::stringToArray($rrule);
         }
 
         foreach ($rrule as $key => $value) {
-            $key = strtoupper($key);
+            $key = strtoupper((string) $key);
             switch ($key) {
                 case 'FREQ':
-                    $value = strtolower($value);
+                    $value = strtolower((string) $value);
                     if (!in_array(
                         $value,
-                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly']
+                        ['secondly', 'minutely', 'hourly', 'daily', 'weekly', 'monthly', 'yearly'],
+                        true
                     )) {
                         throw new InvalidDataException('Unknown value for FREQ='.strtoupper($value));
                     }
@@ -757,7 +806,7 @@ class RRuleIterator implements Iterator
                 case 'BYDAY':
                     $value = (array) $value;
                     foreach ($value as $part) {
-                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $# xi', $part)) {
+                        if (!preg_match('#^  (-|\+)? ([1-5])? (MO|TU|WE|TH|FR|SA|SU) $#xi', (string) $part)) {
                             throw new InvalidDataException('Invalid part in BYDAY clause: '.$part);
                         }
                     }
@@ -771,7 +820,7 @@ class RRuleIterator implements Iterator
                 case 'BYYEARDAY':
                     $this->byYearDay = (array) $value;
                     foreach ($this->byYearDay as $byYearDay) {
-                        if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 == (int) $byYearDay || (int) $byYearDay > 366) {
+                        if (!is_numeric($byYearDay) || (int) $byYearDay < -366 || 0 === (int) $byYearDay || (int) $byYearDay > 366) {
                             throw new InvalidDataException('BYYEARDAY in RRULE must have value(s) from 1 to 366, or -366 to -1!');
                         }
                     }
@@ -780,7 +829,7 @@ class RRuleIterator implements Iterator
                 case 'BYWEEKNO':
                     $this->byWeekNo = (array) $value;
                     foreach ($this->byWeekNo as $byWeekNo) {
-                        if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 == (int) $byWeekNo || (int) $byWeekNo > 53) {
+                        if (!is_numeric($byWeekNo) || (int) $byWeekNo < -53 || 0 === (int) $byWeekNo || (int) $byWeekNo > 53) {
                             throw new InvalidDataException('BYWEEKNO in RRULE must have value(s) from 1 to 53, or -53 to -1!');
                         }
                     }
@@ -800,7 +849,7 @@ class RRuleIterator implements Iterator
                     break;
 
                 case 'WKST':
-                    $this->weekStart = strtoupper($value);
+                    $this->weekStart = strtoupper((string) $value);
                     break;
 
                 default:
@@ -811,10 +860,8 @@ class RRuleIterator implements Iterator
 
     /**
      * Mappings between the day number and english day name.
-     *
-     * @var array
      */
-    protected $dayNames = [
+    protected array $dayNames = [
         0 => 'Sunday',
         1 => 'Monday',
         2 => 'Tuesday',
@@ -830,9 +877,9 @@ class RRuleIterator implements Iterator
      *
      * The returned list is an array of integers with the day of month (1-31).
      *
-     * @return array
+     * @throws \Exception
      */
-    protected function getMonthlyOccurrences()
+    protected function getMonthlyOccurrences(): array
     {
         $startDate = clone $this->currentDate;
 
@@ -842,7 +889,7 @@ class RRuleIterator implements Iterator
         // that point and add it to the results.
         if ($this->byDay) {
             foreach ($this->byDay as $day) {
-                $dayName = $this->dayNames[$this->dayMap[substr($day, -2)]];
+                $dayName = $this->dayNames[$this->dayMap[substr((string) $day, -2)]];
 
                 // Dayname will be something like 'wednesday'. Now we need to find
                 // all wednesdays in this month.
@@ -863,8 +910,8 @@ class RRuleIterator implements Iterator
                 // So now we have 'all wednesdays' for month. It is however
                 // possible that the user only really wanted the 1st, 2nd or last
                 // wednesday.
-                if (strlen($day) > 2) {
-                    $offset = (int) substr($day, 0, -2);
+                if (strlen((string) $day) > 2) {
+                    $offset = (int) substr((string) $day, 0, -2);
 
                     if ($offset > 0) {
                         // It is possible that the day does not exist, such as a
@@ -881,7 +928,7 @@ class RRuleIterator implements Iterator
                     }
                 } else {
                     // There was no counter (first, second, last wednesdays), so we
-                    // just need to add the all to the list).
+                    // just need to add the all to the list.
                     $byDayResults = array_merge($byDayResults, $dayHits);
                 }
             }
@@ -891,15 +938,15 @@ class RRuleIterator implements Iterator
         if ($this->byMonthDay) {
             foreach ($this->byMonthDay as $monthDay) {
                 // Removing values that are out of range for this month
-                if ($monthDay > $startDate->format('t') ||
-                    $monthDay < 0 - $startDate->format('t')) {
+                if ($monthDay > $startDate->format('t')
+                    || $monthDay < 0 - $startDate->format('t')) {
                     continue;
                 }
                 if ($monthDay > 0) {
                     $byMonthDayResults[] = $monthDay;
                 } else {
                     // Negative values
-                    $byMonthDayResults[] = $startDate->format('t') + 1 + $monthDay;
+                    $byMonthDayResults[] = (int) $startDate->format('t') + 1 + $monthDay;
                 }
             }
         }
@@ -940,10 +987,8 @@ class RRuleIterator implements Iterator
 
     /**
      * Simple mapping from iCalendar day names to day numbers.
-     *
-     * @var array
      */
-    protected $dayMap = [
+    protected array $dayMap = [
         'SU' => 0,
         'MO' => 1,
         'TU' => 2,
@@ -953,7 +998,7 @@ class RRuleIterator implements Iterator
         'SA' => 6,
     ];
 
-    protected function getHours()
+    protected function getHours(): array
     {
         $recurrenceHours = [];
         foreach ($this->byHour as $byHour) {
@@ -963,20 +1008,20 @@ class RRuleIterator implements Iterator
         return $recurrenceHours;
     }
 
-    protected function getDays()
+    protected function getDays(): array
     {
         $recurrenceDays = [];
         foreach ($this->byDay as $byDay) {
             // The day may be preceded with a positive (+n) or
             // negative (-n) integer. However, this does not make
             // sense in 'weekly' so we ignore it here.
-            $recurrenceDays[] = $this->dayMap[substr($byDay, -2)];
+            $recurrenceDays[] = $this->dayMap[substr((string) $byDay, -2)];
         }
 
         return $recurrenceDays;
     }
 
-    protected function getMonths()
+    protected function getMonths(): array
     {
         $recurrenceMonths = [];
         foreach ($this->byMonth as $byMonth) {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Settings.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Settings.php
index b0bb80a82..5e50f914f 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Settings.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Settings.php
@@ -25,7 +25,7 @@ class Settings
      * use-cases. In particular, it covers birthdates for virtually everyone
      * alive on earth, which is less than 5 people at the time of writing.
      */
-    public static $minDate = '1900-01-01';
+    public static string $minDate = '1900-01-01';
 
     /**
      * The maximum date we accept for various calculations with dates, such as
@@ -34,7 +34,7 @@ class Settings
      * The choice of 2100 is pretty arbitrary, but should cover most
      * appointments made for many years to come.
      */
-    public static $maxDate = '2100-01-01';
+    public static string $maxDate = '2100-01-01';
 
     /**
      * The maximum number of recurrences that will be generated.
@@ -51,5 +51,5 @@ class Settings
      *
      * Set this value to -1 to disable this control altogether.
      */
-    public static $maxRecurrences = 3500;
+    public static int $maxRecurrences = 3500;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
index d42566194..edbba68cc 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/ICalendar.php
@@ -3,6 +3,7 @@
 namespace Sabre\VObject\Splitter;
 
 use Sabre\VObject;
+use Sabre\VObject\Component;
 use Sabre\VObject\Component\VCalendar;
 
 /**
@@ -23,36 +24,34 @@ class ICalendar implements SplitterInterface
 {
     /**
      * Timezones.
-     *
-     * @var array
      */
-    protected $vtimezones = [];
+    protected array $vtimezones = [];
 
     /**
      * iCalendar objects.
-     *
-     * @var array
      */
-    protected $objects = [];
+    protected array $objects = [];
 
     /**
      * Constructor.
      *
-     * The splitter should receive an readable file stream as its input.
+     * The splitter should receive a readable file stream as its input.
      *
      * @param resource $input
      * @param int      $options parser options, see the OPTIONS constants
+     *
+     * @throws VObject\ParseException
      */
-    public function __construct($input, $options = 0)
+    public function __construct($input, int $options = 0)
     {
         $data = VObject\Reader::read($input, $options);
 
-        if (!$data instanceof VObject\Component\VCalendar) {
+        if (!$data instanceof VCalendar) {
             throw new VObject\ParseException('Supplied input could not be parsed as VCALENDAR.');
         }
 
         foreach ($data->children() as $component) {
-            if (!$component instanceof VObject\Component) {
+            if (!$component instanceof Component) {
                 continue;
             }
 
@@ -82,10 +81,8 @@ class ICalendar implements SplitterInterface
      * hit the end of the stream.
      *
      * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
      */
-    public function getNext()
+    public function getNext(): ?Component
     {
         if ($object = array_shift($this->objects)) {
             // create our baseobject
@@ -99,8 +96,8 @@ class ICalendar implements SplitterInterface
             }
 
             return $object;
-        } else {
-            return;
         }
+
+        return null;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php
index c845ac5fc..c4014abf3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/SplitterInterface.php
@@ -2,6 +2,8 @@
 
 namespace Sabre\VObject\Splitter;
 
+use Sabre\VObject\Component;
+
 /**
  * VObject splitter.
  *
@@ -20,7 +22,7 @@ interface SplitterInterface
     /**
      * Constructor.
      *
-     * The splitter should receive an readable file stream as its input.
+     * The splitter should receive a readable file stream as its input.
      *
      * @param resource $input
      */
@@ -31,8 +33,6 @@ interface SplitterInterface
      * hit the end of the stream.
      *
      * When the end is reached, null will be returned.
-     *
-     * @return \Sabre\VObject\Component|null
      */
-    public function getNext();
+    public function getNext(): ?Component;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
index a20f5c2c1..a802dbe75 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Splitter/VCard.php
@@ -3,6 +3,7 @@
 namespace Sabre\VObject\Splitter;
 
 use Sabre\VObject;
+use Sabre\VObject\Component;
 use Sabre\VObject\Parser\MimeDir;
 
 /**
@@ -21,32 +22,25 @@ use Sabre\VObject\Parser\MimeDir;
  */
 class VCard implements SplitterInterface
 {
-    /**
-     * File handle.
-     *
-     * @var resource
-     */
-    protected $input;
-
     /**
      * Persistent parser.
-     *
-     * @var MimeDir
      */
-    protected $parser;
+    protected MimeDir $parser;
 
     /**
      * Constructor.
      *
-     * The splitter should receive an readable file stream as its input.
+     * The splitter should receive a readable file stream as its input.
      *
      * @param resource $input
      * @param int      $options parser options, see the OPTIONS constants
      */
-    public function __construct($input, $options = 0)
+    public function __construct(/**
+     * File handle.
+     */
+        protected $input, int $options = 0)
     {
-        $this->input = $input;
-        $this->parser = new MimeDir($input, $options);
+        $this->parser = new MimeDir($this->input, $options);
     }
 
     /**
@@ -55,18 +49,18 @@ class VCard implements SplitterInterface
      *
      * When the end is reached, null will be returned.
      *
-     * @return \Sabre\VObject\Component|null
+     * @throws VObject\ParseException
      */
-    public function getNext()
+    public function getNext(): ?Component
     {
         try {
             $object = $this->parser->parse();
 
-            if (!$object instanceof VObject\Component\VCard) {
+            if (!$object instanceof Component\VCard) {
                 throw new VObject\ParseException('The supplied input contained non-VCARD data.');
             }
-        } catch (VObject\EofException $e) {
-            return;
+        } catch (VObject\EofException) {
+            return null;
         }
 
         return $object;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php
index 2333d6ab9..8fe5f9f0a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/StringUtil.php
@@ -13,12 +13,8 @@ class StringUtil
 {
     /**
      * Returns true or false depending on if a string is valid UTF-8.
-     *
-     * @param string $str
-     *
-     * @return bool
      */
-    public static function isUTF8($str)
+    public static function isUTF8(string $str): bool
     {
         // Control characters
         if (preg_match('%[\x00-\x08\x0B-\x0C\x0E\x0F]%', $str)) {
@@ -33,30 +29,14 @@ class StringUtil
      *
      * Currently only ISO-5991-1 input and UTF-8 input is supported, but this
      * may be expanded upon if we receive other examples.
-     *
-     * @param string $str
-     *
-     * @return string
      */
-    public static function convertToUTF8($str)
+    public static function convertToUTF8(string $str): string
     {
-        $encoding = mb_detect_encoding($str, ['UTF-8', 'ISO-8859-1', 'WINDOWS-1252'], true);
-
-        switch ($encoding) {
-            case 'ISO-8859-1':
-                $newStr = utf8_encode($str);
-                break;
-            /* Unreachable code. Not sure yet how we can improve this
-             * situation.
-            case 'WINDOWS-1252' :
-                $newStr = iconv('cp1252', 'UTF-8', $str);
-                break;
-             */
-            default:
-                 $newStr = $str;
+        if (!mb_check_encoding($str, 'UTF-8') && mb_check_encoding($str, 'ISO-8859-1')) {
+            $str = mb_convert_encoding($str, 'UTF-8', 'ISO-8859-1');
         }
 
         // Removing any control characters
-        return preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $newStr);
+        return preg_replace('%(?:[\x00-\x08\x0B-\x0C\x0E-\x1F\x7F])%', '', $str);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
index 6422c0930..19333e86a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimeZoneUtil.php
@@ -2,8 +2,6 @@
 
 namespace Sabre\VObject;
 
-use DateTimeZone;
-use InvalidArgumentException;
 use Sabre\VObject\TimezoneGuesser\FindFromOffset;
 use Sabre\VObject\TimezoneGuesser\FindFromTimezoneIdentifier;
 use Sabre\VObject\TimezoneGuesser\FindFromTimezoneMap;
@@ -24,14 +22,13 @@ use Sabre\VObject\TimezoneGuesser\TimezoneGuesser;
  */
 class TimeZoneUtil
 {
-    /** @var self */
-    private static $instance = null;
+    private static ?TimeZoneUtil $instance = null;
 
     /** @var TimezoneGuesser[] */
-    private $timezoneGuessers = [];
+    private array $timezoneGuessers = [];
 
     /** @var TimezoneFinder[] */
-    private $timezoneFinders = [];
+    private array $timezoneFinders = [];
 
     private function __construct()
     {
@@ -44,9 +41,7 @@ class TimeZoneUtil
 
     private static function getInstance(): self
     {
-        if (null === self::$instance) {
-            self::$instance = new self();
-        }
+        self::$instance ??= new self();
 
         return self::$instance;
     }
@@ -75,11 +70,11 @@ class TimeZoneUtil
      * Alternatively, if $failIfUncertain is set to true, it will throw an
      * exception if we cannot accurately determine the timezone.
      */
-    private function findTimeZone(string $tzid, Component $vcalendar = null, bool $failIfUncertain = false): DateTimeZone
+    private function findTimeZone(string $tzid, ?Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
     {
         foreach ($this->timezoneFinders as $timezoneFinder) {
             $timezone = $timezoneFinder->find($tzid, $failIfUncertain);
-            if (!$timezone instanceof DateTimeZone) {
+            if (!$timezone instanceof \DateTimeZone) {
                 continue;
             }
 
@@ -92,7 +87,7 @@ class TimeZoneUtil
                 if ((string) $vtimezone->TZID === $tzid) {
                     foreach ($this->timezoneGuessers as $timezoneGuesser) {
                         $timezone = $timezoneGuesser->guess($vtimezone, $failIfUncertain);
-                        if (!$timezone instanceof DateTimeZone) {
+                        if (!$timezone instanceof \DateTimeZone) {
                             continue;
                         }
 
@@ -103,11 +98,11 @@ class TimeZoneUtil
         }
 
         if ($failIfUncertain) {
-            throw new InvalidArgumentException('We were unable to determine the correct PHP timezone for tzid: '.$tzid);
+            throw new \InvalidArgumentException('We were unable to determine the correct PHP timezone for tzid: '.$tzid);
         }
 
         // If we got all the way here, we default to whatever has been set as the PHP default timezone.
-        return new DateTimeZone(date_default_timezone_get());
+        return new \DateTimeZone(date_default_timezone_get());
     }
 
     public static function addTimezoneGuesser(string $key, TimezoneGuesser $guesser): void
@@ -120,13 +115,7 @@ class TimeZoneUtil
         self::getInstance()->addFinder($key, $finder);
     }
 
-    /**
-     * @param string $tzid
-     * @param false  $failIfUncertain
-     *
-     * @return DateTimeZone
-     */
-    public static function getTimeZone($tzid, Component $vcalendar = null, $failIfUncertain = false)
+    public static function getTimeZone(string $tzid, ?Component $vcalendar = null, bool $failIfUncertain = false): \DateTimeZone
     {
         return self::getInstance()->findTimeZone($tzid, $vcalendar, $failIfUncertain);
     }
@@ -135,138 +124,4 @@ class TimeZoneUtil
     {
         self::$instance = null;
     }
-
-    // Keeping things for backwards compatibility
-    /**
-     * @var array|null
-     *
-     * @deprecated
-     */
-    public static $map = null;
-
-    /**
-     * List of microsoft exchange timezone ids.
-     *
-     * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
-     *
-     * @deprecated
-     */
-    public static $microsoftExchangeMap = [
-        0 => 'UTC',
-        31 => 'Africa/Casablanca',
-        // Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
-        // I'm not even kidding.. We handle this special case in the
-        // getTimeZone method.
-        2 => 'Europe/Lisbon',
-        1 => 'Europe/London',
-        4 => 'Europe/Berlin',
-        6 => 'Europe/Prague',
-        3 => 'Europe/Paris',
-        69 => 'Africa/Luanda', // This was a best guess
-        7 => 'Europe/Athens',
-        5 => 'Europe/Bucharest',
-        49 => 'Africa/Cairo',
-        50 => 'Africa/Harare',
-        59 => 'Europe/Helsinki',
-        27 => 'Asia/Jerusalem',
-        26 => 'Asia/Baghdad',
-        74 => 'Asia/Kuwait',
-        51 => 'Europe/Moscow',
-        56 => 'Africa/Nairobi',
-        25 => 'Asia/Tehran',
-        24 => 'Asia/Muscat', // Best guess
-        54 => 'Asia/Baku',
-        48 => 'Asia/Kabul',
-        58 => 'Asia/Yekaterinburg',
-        47 => 'Asia/Karachi',
-        23 => 'Asia/Calcutta',
-        62 => 'Asia/Kathmandu',
-        46 => 'Asia/Almaty',
-        71 => 'Asia/Dhaka',
-        66 => 'Asia/Colombo',
-        61 => 'Asia/Rangoon',
-        22 => 'Asia/Bangkok',
-        64 => 'Asia/Krasnoyarsk',
-        45 => 'Asia/Shanghai',
-        63 => 'Asia/Irkutsk',
-        21 => 'Asia/Singapore',
-        73 => 'Australia/Perth',
-        75 => 'Asia/Taipei',
-        20 => 'Asia/Tokyo',
-        72 => 'Asia/Seoul',
-        70 => 'Asia/Yakutsk',
-        19 => 'Australia/Adelaide',
-        44 => 'Australia/Darwin',
-        18 => 'Australia/Brisbane',
-        76 => 'Australia/Sydney',
-        43 => 'Pacific/Guam',
-        42 => 'Australia/Hobart',
-        68 => 'Asia/Vladivostok',
-        41 => 'Asia/Magadan',
-        17 => 'Pacific/Auckland',
-        40 => 'Pacific/Fiji',
-        67 => 'Pacific/Tongatapu',
-        29 => 'Atlantic/Azores',
-        53 => 'Atlantic/Cape_Verde',
-        30 => 'America/Noronha',
-         8 => 'America/Sao_Paulo', // Best guess
-        32 => 'America/Argentina/Buenos_Aires',
-        60 => 'America/Godthab',
-        28 => 'America/St_Johns',
-         9 => 'America/Halifax',
-        33 => 'America/Caracas',
-        65 => 'America/Santiago',
-        35 => 'America/Bogota',
-        10 => 'America/New_York',
-        34 => 'America/Indiana/Indianapolis',
-        55 => 'America/Guatemala',
-        11 => 'America/Chicago',
-        37 => 'America/Mexico_City',
-        36 => 'America/Edmonton',
-        38 => 'America/Phoenix',
-        12 => 'America/Denver', // Best guess
-        13 => 'America/Los_Angeles', // Best guess
-        14 => 'America/Anchorage',
-        15 => 'Pacific/Honolulu',
-        16 => 'Pacific/Midway',
-        39 => 'Pacific/Kwajalein',
-    ];
-
-    /**
-     * This method will load in all the tz mapping information, if it's not yet
-     * done.
-     *
-     * @deprecated
-     */
-    public static function loadTzMaps()
-    {
-        if (!is_null(self::$map)) {
-            return;
-        }
-
-        self::$map = array_merge(
-            include __DIR__.'/timezonedata/windowszones.php',
-            include __DIR__.'/timezonedata/lotuszones.php',
-            include __DIR__.'/timezonedata/exchangezones.php',
-            include __DIR__.'/timezonedata/php-workaround.php'
-        );
-    }
-
-    /**
-     * This method returns an array of timezone identifiers, that are supported
-     * by DateTimeZone(), but not returned by DateTimeZone::listIdentifiers().
-     *
-     * We're not using DateTimeZone::listIdentifiers(DateTimeZone::ALL_WITH_BC) because:
-     * - It's not supported by some PHP versions as well as HHVM.
-     * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
-     * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
-     *
-     * @deprecated
-     */
-    public static function getIdentifiersBC()
-    {
-        return include __DIR__.'/timezonedata/php-bc.php';
-    }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
index 990ac9692..418fd6ba9 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromOffset.php
@@ -4,14 +4,12 @@ declare(strict_types=1);
 
 namespace Sabre\VObject\TimezoneGuesser;
 
-use DateTimeZone;
-
 /**
  * Some clients add 'X-LIC-LOCATION' with the olson name.
  */
 class FindFromOffset implements TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+    public function find(string $tzid, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         // Maybe the author was hyper-lazy and just included an offset. We
         // support it, but we aren't happy about it.
@@ -22,10 +20,28 @@ class FindFromOffset implements TimezoneFinder
             // for versions under PHP 5.5.10, this bit can be taken out of the
             // source.
             // @codeCoverageIgnoreStart
-            return new DateTimeZone('Etc/GMT'.$matches[1].ltrim(substr($matches[2], 0, 2), '0'));
+            return new \DateTimeZone('Etc/GMT'.$matches[1].ltrim(substr($matches[2], 0, 2), '0'));
             // @codeCoverageIgnoreEnd
         }
 
+        if (0 === strncasecmp($tzid, 'UTC', 3)) {
+            $offset = substr($tzid, 3);
+            if (6 === strlen($offset) && ':' === $offset[3]) {
+                $offset = substr($offset, 0, 3).substr($offset, 4);
+            }
+
+            if (5 !== strlen($offset)
+                || ('+' !== $offset[0] && '-' !== $offset[0])
+                || 4 !== strspn(substr($offset, 1), '0123456789')
+                || (int) substr($offset, 1, 2) > 23
+                || (int) substr($offset, 3, 2) > 59
+            ) {
+                return null;
+            }
+
+            return new \DateTimeZone($offset);
+        }
+
         return null;
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
index d8c6d5d3b..5e56b82f1 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneIdentifier.php
@@ -5,14 +5,13 @@ declare(strict_types=1);
 namespace Sabre\VObject\TimezoneGuesser;
 
 use DateTimeZone;
-use Exception;
 
 /**
  * Some clients add 'X-LIC-LOCATION' with the olson name.
  */
 class FindFromTimezoneIdentifier implements TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+    public function find(string $tzid, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         // First we will just see if the tzid is a support timezone identifier.
         //
@@ -35,19 +34,19 @@ class FindFromTimezoneIdentifier implements TimezoneFinder
         // https://bugs.php.net/bug.php?id=67881
         //
         // That's why we're checking if we'll be able to successfully instantiate
-        // \DateTimeZone() before doing so. Otherwise we could simply instantiate
+        // \DateTimeZone() before doing so. Otherwise, we could simply instantiate
         // and catch the exception.
-        $tzIdentifiers = DateTimeZone::listIdentifiers();
+        $tzIdentifiers = \DateTimeZone::listIdentifiers();
 
         try {
             if (
-                (in_array($tzid, $tzIdentifiers)) ||
-                (preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)) ||
-                (in_array($tzid, $this->getIdentifiersBC()))
+                in_array($tzid, $tzIdentifiers, true)
+                || preg_match('/^GMT(\+|-)([0-9]{4})$/', $tzid, $matches)
+                || in_array($tzid, $this->getIdentifiersBC(), true)
             ) {
-                return new DateTimeZone($tzid);
+                return new \DateTimeZone($tzid);
             }
-        } catch (Exception $e) {
+        } catch (\Exception) {
         }
 
         return null;
@@ -61,10 +60,8 @@ class FindFromTimezoneIdentifier implements TimezoneFinder
      * - It's not supported by some PHP versions as well as HHVM.
      * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
      * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
      */
-    private function getIdentifiersBC()
+    private function getIdentifiersBC(): array
     {
         return include __DIR__.'/../timezonedata/php-bc.php';
     }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
index b52ba6a19..5beb5450d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/FindFromTimezoneMap.php
@@ -11,18 +11,25 @@ use DateTimeZone;
  */
 class FindFromTimezoneMap implements TimezoneFinder
 {
-    private $map = [];
+    private array $map = [];
 
-    private $patterns = [
+    private array $patterns = [
         '/^\((UTC|GMT)(\+|\-)[\d]{2}\:[\d]{2}\) (.*)/',
         '/^\((UTC|GMT)(\+|\-)[\d]{2}\.[\d]{2}\) (.*)/',
     ];
 
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone
+    /**
+     * @throws void
+     */
+    public function find(string $tzid, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         // Next, we check if the tzid is somewhere in our tzid map.
         if ($this->hasTzInMap($tzid)) {
-            return new DateTimeZone($this->getTzFromMap($tzid));
+            try {
+                return new \DateTimeZone($this->getTzFromMap($tzid));
+            } catch (\Exception) {
+                return null;
+            }
         }
 
         // Some Microsoft products prefix the offset first, so let's strip that off
@@ -34,7 +41,11 @@ class FindFromTimezoneMap implements TimezoneFinder
             }
             $tzidAlternate = $matches[3];
             if ($this->hasTzInMap($tzidAlternate)) {
-                return new DateTimeZone($this->getTzFromMap($tzidAlternate));
+                try {
+                    return new \DateTimeZone($this->getTzFromMap($tzidAlternate));
+                } catch (\Exception) {
+                    return null;
+                }
             }
         }
 
@@ -49,10 +60,8 @@ class FindFromTimezoneMap implements TimezoneFinder
      * - It's not supported by some PHP versions as well as HHVM.
      * - It also returns identifiers, that are invalid values for new DateTimeZone() on some PHP versions.
      * (See timezonedata/php-bc.php and timezonedata php-workaround.php)
-     *
-     * @return array
      */
-    private function getTzMaps()
+    private function getTzMaps(): array
     {
         if ([] === $this->map) {
             $this->map = array_merge(
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
index f340a3962..7212117f7 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromLicEntry.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Sabre\VObject\TimezoneGuesser;
 
-use DateTimeZone;
 use Sabre\VObject\Component\VTimeZone;
 use Sabre\VObject\TimeZoneUtil;
 
@@ -13,7 +12,7 @@ use Sabre\VObject\TimeZoneUtil;
  */
 class GuessFromLicEntry implements TimezoneGuesser
 {
-    public function guess(VTimeZone $vtimezone, bool $failIfUncertain = false): ?DateTimeZone
+    public function guess(VTimeZone $vtimezone, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         if (!isset($vtimezone->{'X-LIC-LOCATION'})) {
             return null;
@@ -24,7 +23,7 @@ class GuessFromLicEntry implements TimezoneGuesser
         // Libical generators may specify strings like
         // "SystemV/EST5EDT". For those we must remove the
         // SystemV part.
-        if ('SystemV/' === substr($lic, 0, 8)) {
+        if (str_starts_with($lic, 'SystemV/')) {
             $lic = substr($lic, 8);
         }
 
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
index b11ce1832..82060bd27 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/GuessFromMsTzId.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Sabre\VObject\TimezoneGuesser;
 
-use DateTimeZone;
 use Sabre\VObject\Component\VTimeZone;
 
 class GuessFromMsTzId implements TimezoneGuesser
@@ -14,12 +13,12 @@ class GuessFromMsTzId implements TimezoneGuesser
      *
      * Source: http://msdn.microsoft.com/en-us/library/aa563018(loband).aspx
      */
-    public static $microsoftExchangeMap = [
+    public static array $microsoftExchangeMap = [
         0 => 'UTC',
         31 => 'Africa/Casablanca',
 
         // Insanely, id #2 is used for both Europe/Lisbon, and Europe/Sarajevo.
-        // I'm not even kidding.. We handle this special case in the
+        // I'm not even kidding. We handle this special case in the
         // getTimeZone method.
         2 => 'Europe/Lisbon',
         1 => 'Europe/London',
@@ -96,7 +95,7 @@ class GuessFromMsTzId implements TimezoneGuesser
         39 => 'Pacific/Kwajalein',
     ];
 
-    public function guess(VTimeZone $vtimezone, bool $throwIfUnsure = false): ?DateTimeZone
+    public function guess(VTimeZone $vtimezone, ?bool $failIfUncertain = false): ?\DateTimeZone
     {
         // Microsoft may add a magic number, which we also have an
         // answer for.
@@ -106,12 +105,12 @@ class GuessFromMsTzId implements TimezoneGuesser
         $cdoId = (int) $vtimezone->{'X-MICROSOFT-CDO-TZID'}->getValue();
 
         // 2 can mean both Europe/Lisbon and Europe/Sarajevo.
-        if (2 === $cdoId && false !== strpos((string) $vtimezone->TZID, 'Sarajevo')) {
-            return new DateTimeZone('Europe/Sarajevo');
+        if (2 === $cdoId && str_contains((string) $vtimezone->TZID, 'Sarajevo')) {
+            return new \DateTimeZone('Europe/Sarajevo');
         }
 
         if (isset(self::$microsoftExchangeMap[$cdoId])) {
-            return new DateTimeZone(self::$microsoftExchangeMap[$cdoId]);
+            return new \DateTimeZone(self::$microsoftExchangeMap[$cdoId]);
         }
 
         return null;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneFinder.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneFinder.php
index 5aa880a1c..220459527 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneFinder.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneFinder.php
@@ -2,9 +2,7 @@
 
 namespace Sabre\VObject\TimezoneGuesser;
 
-use DateTimeZone;
-
 interface TimezoneFinder
 {
-    public function find(string $tzid, bool $failIfUncertain = false): ?DateTimeZone;
+    public function find(string $tzid, ?bool $failIfUncertain = false): ?\DateTimeZone;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneGuesser.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneGuesser.php
index 5e193bb52..f92eeb210 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneGuesser.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/TimezoneGuesser/TimezoneGuesser.php
@@ -2,10 +2,9 @@
 
 namespace Sabre\VObject\TimezoneGuesser;
 
-use DateTimeZone;
 use Sabre\VObject\Component\VTimeZone;
 
 interface TimezoneGuesser
 {
-    public function guess(VTimeZone $vtimezone, bool $failIfUncertain = false): ?DateTimeZone;
+    public function guess(VTimeZone $vtimezone, ?bool $failIfUncertain = false): ?\DateTimeZone;
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/UUIDUtil.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/UUIDUtil.php
index 066af624c..e8208630c 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/UUIDUtil.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/UUIDUtil.php
@@ -21,42 +21,36 @@ class UUIDUtil
      * This function is based on a comment by Andrew Moore on php.net
      *
      * @see http://www.php.net/manual/en/function.uniqid.php#94959
-     *
-     * @return string
      */
-    public static function getUUID()
+    public static function getUUID(): string
     {
         return sprintf(
             '%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
 
             // 32 bits for "time_low"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff),
+            mt_rand(0, 0xFFFF), mt_rand(0, 0xFFFF),
 
             // 16 bits for "time_mid"
-            mt_rand(0, 0xffff),
+            mt_rand(0, 0xFFFF),
 
             // 16 bits for "time_hi_and_version",
             // four most significant bits holds version number 4
-            mt_rand(0, 0x0fff) | 0x4000,
+            mt_rand(0, 0x0FFF) | 0x4000,
 
             // 16 bits, 8 bits for "clk_seq_hi_res",
             // 8 bits for "clk_seq_low",
             // two most significant bits holds zero and one for variant DCE1.1
-            mt_rand(0, 0x3fff) | 0x8000,
+            mt_rand(0, 0x3FFF) | 0x8000,
 
             // 48 bits for "node"
-            mt_rand(0, 0xffff), mt_rand(0, 0xffff), mt_rand(0, 0xffff)
+            mt_rand(0, 0xFFFF), mt_rand(0, 0xFFFF), mt_rand(0, 0xFFFF)
         );
     }
 
     /**
      * Checks if a string is a valid UUID.
-     *
-     * @param string $uuid
-     *
-     * @return bool
      */
-    public static function validateUUID($uuid)
+    public static function validateUUID(string $uuid): bool
     {
         return 0 !== preg_match(
             '/^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
index 04932fe67..39969d558 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/VCardConverter.php
@@ -2,6 +2,9 @@
 
 namespace Sabre\VObject;
 
+use Sabre\VObject\Property\Binary;
+use Sabre\VObject\Property\Uri;
+
 /**
  * This utility converts vcards from one version to another.
  *
@@ -26,19 +29,19 @@ class VCardConverter
      *
      * If input and output version are identical, a clone is returned.
      *
-     * @param int $targetVersion
+     * @throws InvalidDataException
      */
-    public function convert(Component\VCard $input, $targetVersion)
+    public function convert(Component\VCard $input, int $targetVersion): Component\VCard
     {
         $inputVersion = $input->getDocumentType();
         if ($inputVersion === $targetVersion) {
             return clone $input;
         }
 
-        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40])) {
+        if (!in_array($inputVersion, [Document::VCARD21, Document::VCARD30, Document::VCARD40], true)) {
             throw new \InvalidArgumentException('Only vCard 2.1, 3.0 and 4.0 are supported for the input data');
         }
-        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40])) {
+        if (!in_array($targetVersion, [Document::VCARD30, Document::VCARD40], true)) {
             throw new \InvalidArgumentException('You can only use vCard 3.0 or 4.0 for the target version');
         }
 
@@ -61,12 +64,12 @@ class VCardConverter
     /**
      * Handles conversion of a single property.
      *
-     * @param int $targetVersion
+     * @throws InvalidDataException
      */
-    protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, $targetVersion)
+    protected function convertProperty(Component\VCard $input, Component\VCard $output, Property $property, int $targetVersion): void
     {
         // Skipping these, those are automatically added.
-        if (in_array($property->name, ['VERSION', 'PRODID'])) {
+        if (in_array($property->name, ['VERSION', 'PRODID'], true)) {
             return;
         }
 
@@ -90,15 +93,16 @@ class VCardConverter
         );
 
         if (Document::VCARD30 === $targetVersion) {
-            if ($property instanceof Property\Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'])) {
+            if ($property instanceof Uri && in_array($property->name, ['PHOTO', 'LOGO', 'SOUND'], true)) {
+                /** @var Uri $newProperty */
                 $newProperty = $this->convertUriToBinary($output, $newProperty);
             } elseif ($property instanceof Property\VCard\DateAndOrTime) {
                 // In vCard 4, the birth year may be optional. This is not the
                 // case for vCard 3. Apple has a workaround for this that
                 // allows applications that support Apple's extension still
-                // omit birthyears in vCard 3, but applications that do not
-                // support this, will just use a random birthyear. We're
-                // choosing 1604 for the birthyear, because that's what apple
+                // omit birth years in vCard 3, but applications that do not
+                // support this, will just use a random birth year. We're
+                // choosing 1604 for the birth year, because that's what apple
                 // uses.
                 $parts = DateTimeParser::parseVCardDateTime($property->getValue());
                 if (is_null($parts['year'])) {
@@ -107,7 +111,7 @@ class VCardConverter
                     $newProperty['X-APPLE-OMIT-YEAR'] = '1604';
                 }
 
-                if ('ANNIVERSARY' == $newProperty->name) {
+                if ('ANNIVERSARY' === $newProperty->name) {
                     // Microsoft non-standard anniversary
                     $newProperty->name = 'X-ANNIVERSARY';
 
@@ -123,7 +127,7 @@ class VCardConverter
                     $output->add('ITEM'.$x.'.X-ABLABEL', '_$!<Anniversary>!$_');
                 }
             } elseif ('KIND' === $property->name) {
-                switch (strtolower($property->getValue())) {
+                switch (strtolower((string) $property->getValue())) {
                     case 'org':
                         // vCard 3.0 does not have an equivalent to KIND:ORG,
                         // but apple has an extension that means the same
@@ -140,14 +144,17 @@ class VCardConverter
                         $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-KIND', 'GROUP');
                         break;
                 }
+            } elseif ('MEMBER' === $property->name) {
+                $newProperty = $output->createProperty('X-ADDRESSBOOKSERVER-MEMBER', $property->getValue());
             }
         } elseif (Document::VCARD40 === $targetVersion) {
             // These properties were removed in vCard 4.0
-            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'])) {
+            if (in_array($property->name, ['NAME', 'MAILER', 'LABEL', 'CLASS'], true)) {
                 return;
             }
 
-            if ($property instanceof Property\Binary) {
+            if ($property instanceof Binary) {
+                /** @var Binary $newProperty */
                 $newProperty = $this->convertBinaryToUri($output, $newProperty, $parameters);
             } elseif ($property instanceof Property\VCard\DateAndOrTime && isset($parameters['X-APPLE-OMIT-YEAR'])) {
                 // If a property such as BDAY contained 'X-APPLE-OMIT-YEAR',
@@ -164,15 +171,18 @@ class VCardConverter
             }
             switch ($property->name) {
                 case 'X-ABSHOWAS':
-                    if ('COMPANY' === strtoupper($property->getValue())) {
+                    if ('COMPANY' === strtoupper((string) $property->getValue())) {
                         $newProperty = $output->createProperty('KIND', 'ORG');
                     }
                     break;
                 case 'X-ADDRESSBOOKSERVER-KIND':
-                    if ('GROUP' === strtoupper($property->getValue())) {
+                    if ('GROUP' === strtoupper((string) $property->getValue())) {
                         $newProperty = $output->createProperty('KIND', 'GROUP');
                     }
                     break;
+                case 'X-ADDRESSBOOKSERVER-MEMBER':
+                    $newProperty = $output->createProperty('MEMBER', $property->getValue());
+                    break;
                 case 'X-ANNIVERSARY':
                     $newProperty->name = 'ANNIVERSARY';
                     // If we already have an anniversary property with the same
@@ -204,7 +214,7 @@ class VCardConverter
                     }
                     $newProperty->name = 'ANNIVERSARY';
                     break;
-                // Apple's per-property label system.
+                    // Apple's per-property label system.
                 case 'X-ABLABEL':
                     if ('_$!<Anniversary>!$_' === $newProperty->getValue()) {
                         // We can safely remove these, as they are converted to
@@ -226,7 +236,7 @@ class VCardConverter
 
         // Lastly, we need to see if there's a need for a VALUE parameter.
         //
-        // We can do that by instantiating a empty property with that name, and
+        // We can do that by instantiating an empty property with that name, and
         // seeing if the default valueType is identical to the current one.
         $tempProperty = $output->createProperty($newProperty->name);
         if ($tempProperty->getValueType() !== $newProperty->getValueType()) {
@@ -241,15 +251,15 @@ class VCardConverter
      *
      * vCard 4.0 no longer supports BINARY properties.
      *
-     * @param Property\Uri $property the input property
-     * @param $parameters list of parameters that will eventually be added to
-     *                    the new property
+     * @param array $parameters list of parameters that will eventually be added to
+     *                          the new property
      *
-     * @return Property\Uri
+     * @throws InvalidDataException
      */
-    protected function convertBinaryToUri(Component\VCard $output, Property\Binary $newProperty, array &$parameters)
+    protected function convertBinaryToUri(Component\VCard $output, Binary $newProperty, array &$parameters): Uri
     {
         $value = $newProperty->getValue();
+        /** @var Uri $newProperty */
         $newProperty = $output->createProperty(
             $newProperty->name,
             null, // no value
@@ -264,10 +274,11 @@ class VCardConverter
             $newTypes = [];
             foreach ($parameters['TYPE']->getParts() as $typePart) {
                 if (in_array(
-                    strtoupper($typePart),
-                    ['JPEG', 'PNG', 'GIF']
+                    strtoupper((string) $typePart),
+                    ['JPEG', 'PNG', 'GIF'],
+                    true
                 )) {
-                    $mimeType = 'image/'.strtolower($typePart);
+                    $mimeType = 'image/'.strtolower((string) $typePart);
                 } else {
                     $newTypes[] = $typePart;
                 }
@@ -282,7 +293,7 @@ class VCardConverter
             }
         }
 
-        $newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode($value));
+        $newProperty->setValue('data:'.$mimeType.';base64,'.base64_encode((string) $value));
 
         return $newProperty;
     }
@@ -294,19 +305,20 @@ class VCardConverter
      * be valid in vCard 3.0 as well, we should convert those to BINARY if
      * possible, to improve compatibility.
      *
-     * @param Property\Uri $property the input property
+     * @return Binary|Uri|null
      *
-     * @return Property\Binary|null
+     * @throws InvalidDataException
      */
-    protected function convertUriToBinary(Component\VCard $output, Property\Uri $newProperty)
+    protected function convertUriToBinary(Component\VCard $output, Uri $newProperty): Property
     {
         $value = $newProperty->getValue();
 
         // Only converting data: uris
-        if ('data:' !== substr($value, 0, 5)) {
+        if (!str_starts_with((string) $value, 'data:')) {
             return $newProperty;
         }
 
+        /** @var Binary $newProperty */
         $newProperty = $output->createProperty(
             $newProperty->name,
             null, // no value
@@ -314,12 +326,12 @@ class VCardConverter
             'BINARY'
         );
 
-        $mimeType = substr($value, 5, strpos($value, ',') - 5);
+        $mimeType = substr((string) $value, 5, strpos((string) $value, ',') - 5);
         if (strpos($mimeType, ';')) {
             $mimeType = substr($mimeType, 0, strpos($mimeType, ';'));
-            $newProperty->setValue(base64_decode(substr($value, strpos($value, ',') + 1)));
+            $newProperty->setValue(base64_decode(substr((string) $value, strpos((string) $value, ',') + 1), true));
         } else {
-            $newProperty->setValue(substr($value, strpos($value, ',') + 1));
+            $newProperty->setValue(substr((string) $value, strpos((string) $value, ',') + 1));
         }
         unset($value);
 
@@ -342,7 +354,7 @@ class VCardConverter
     /**
      * Adds parameters to a new property for vCard 4.0.
      */
-    protected function convertParameters40(Property $newProperty, array $parameters)
+    protected function convertParameters40(Property $newProperty, array $parameters): void
     {
         // Adding all parameters.
         foreach ($parameters as $param) {
@@ -356,14 +368,14 @@ class VCardConverter
                 // that's now PREF=1.
                 case 'TYPE':
                     foreach ($param->getParts() as $paramPart) {
-                        if ('PREF' === strtoupper($paramPart)) {
+                        if ('PREF' === strtoupper((string) $paramPart)) {
                             $newProperty->add('PREF', '1');
                         } else {
                             $newProperty->add($param->name, $paramPart);
                         }
                     }
                     break;
-                // These no longer exist in vCard 4
+                    // These no longer exist in vCard 4
                 case 'ENCODING':
                 case 'CHARSET':
                     break;
@@ -378,7 +390,7 @@ class VCardConverter
     /**
      * Adds parameters to a new property for vCard 3.0.
      */
-    protected function convertParameters30(Property $newProperty, array $parameters)
+    protected function convertParameters30(Property $newProperty, array $parameters): void
     {
         // Adding all parameters.
         foreach ($parameters as $param) {
@@ -391,18 +403,18 @@ class VCardConverter
                 case 'ENCODING':
                     // This value only existed in vCard 2.1, and should be
                     // removed for anything else.
-                    if ('QUOTED-PRINTABLE' !== strtoupper($param->getValue())) {
+                    if ('QUOTED-PRINTABLE' !== strtoupper((string) $param->getValue())) {
                         $newProperty->add($param->name, $param->getParts());
                     }
                     break;
 
-                /*
-                 * Converting PREF=1 to TYPE=PREF.
-                 *
-                 * Any other PREF numbers we'll drop.
-                 */
+                    /*
+                     * Converting PREF=1 to TYPE=PREF.
+                     *
+                     * Any other PREF numbers we'll drop.
+                     */
                 case 'PREF':
-                    if ('1' == $param->getValue()) {
+                    if ('1' === (string) $param->getValue()) {
                         $newProperty->add('TYPE', 'PREF');
                     }
                     break;
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
index 64938bf0b..e851a6507 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Version.php
@@ -14,5 +14,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '4.4.1';
+    public const VERSION = '5.0.0';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Writer.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Writer.php
index cbd22022e..504e38a7d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Writer.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/Writer.php
@@ -18,32 +18,24 @@ class Writer
 {
     /**
      * Serializes a vCard or iCalendar object.
-     *
-     * @return string
      */
-    public static function write(Component $component)
+    public static function write(Component $component): string
     {
         return $component->serialize();
     }
 
     /**
      * Serializes a jCal or jCard object.
-     *
-     * @param int $options
-     *
-     * @return string
      */
-    public static function writeJson(Component $component, $options = 0)
+    public static function writeJson(Component $component, int $options = 0): string
     {
         return json_encode($component, $options);
     }
 
     /**
      * Serializes a xCal or xCard object.
-     *
-     * @return string
      */
-    public static function writeXml(Component $component)
+    public static function writeXml(Component $component): string
     {
         $writer = new Xml\Writer();
         $writer->openMemory();
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
index 89bddc27c..f42944b3b 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/exchangezones.php
@@ -17,6 +17,7 @@ return [
     'Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London' => 'Europe/Lisbon',
     'Greenwich Mean Time; Dublin, Edinburgh, London' => 'Europe/London',
     'Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna' => 'Europe/Berlin',
+    'Amsterdam, Berlin, Bern, Rom, Stockholm, Wien' => 'Europe/Berlin',
     'Belgrade, Pozsony, Budapest, Ljubljana, Prague' => 'Europe/Prague',
     'Brussels, Copenhagen, Madrid, Paris' => 'Europe/Paris',
     'Paris, Madrid, Brussels, Copenhagen' => 'Europe/Paris',
@@ -39,12 +40,12 @@ return [
     'Kabul' => 'Asia/Kabul',
     'Ekaterinburg' => 'Asia/Yekaterinburg',
     'Islamabad, Karachi, Tashkent' => 'Asia/Karachi',
-    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Calcutta',
+    'Kolkata, Chennai, Mumbai, New Delhi, India Standard Time' => 'Asia/Kolkata',
     'Kathmandu, Nepal' => 'Asia/Kathmandu',
     'Almaty, Novosibirsk, North Central Asia' => 'Asia/Almaty',
     'Astana, Dhaka' => 'Asia/Dhaka',
     'Sri Jayawardenepura, Sri Lanka' => 'Asia/Colombo',
-    'Rangoon' => 'Asia/Rangoon',
+    'Rangoon' => 'Asia/Yangon',
     'Bangkok, Hanoi, Jakarta' => 'Asia/Bangkok',
     'Krasnoyarsk' => 'Asia/Krasnoyarsk',
     'Beijing, Chongqing, Hong Kong SAR, Urumqi' => 'Asia/Shanghai',
@@ -71,7 +72,7 @@ return [
     'Mid-Atlantic' => 'America/Noronha',
     'Brasilia' => 'America/Sao_Paulo', // Best guess
     'Buenos Aires' => 'America/Argentina/Buenos_Aires',
-    'Greenland' => 'America/Godthab',
+    'Greenland' => 'America/Nuuk',
     'Newfoundland' => 'America/St_Johns',
     'Atlantic Time (Canada)' => 'America/Halifax',
     'Caracas, La Paz' => 'America/Caracas',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
index 4b50808f9..45e76f7d6 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/lotuszones.php
@@ -34,13 +34,13 @@ return [
     'Newfoundland' => 'America/St_Johns',
     'Argentina' => 'America/Argentina/Buenos_Aires',
     'E. South America' => 'America/Belem',
-    'Greenland' => 'America/Godthab',
+    'Greenland' => 'America/Nuuk',
     'Montevideo' => 'America/Montevideo',
     'SA Eastern' => 'America/Belem',
     // 'Mid-Atlantic'           => 'Etc/GMT-2', // conflict with windows timezones.
     'Azores' => 'Atlantic/Azores',
     'Cape Verde' => 'Atlantic/Cape_Verde',
-    'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious.. Greenwich is not GMT.
+    'Greenwich' => 'Atlantic/Reykjavik', // No I'm serious. Greenwich is not GMT.
     'Morocco' => 'Africa/Casablanca',
     'Central Europe' => 'Europe/Prague',
     'Central European' => 'Europe/Sarajevo',
@@ -71,12 +71,12 @@ return [
     'Ekaterinburg' => 'Asia/Yekaterinburg',
     'Pakistan' => 'Asia/Karachi',
     'West Asia' => 'Asia/Tashkent',
-    'India' => 'Asia/Calcutta',
+    'India' => 'Asia/Kolkata',
     'Sri Lanka' => 'Asia/Colombo',
     'Nepal' => 'Asia/Kathmandu',
     'Central Asia' => 'Asia/Dhaka',
     'N. Central Asia' => 'Asia/Almaty',
-    'Myanmar' => 'Asia/Rangoon',
+    'Myanmar' => 'Asia/Yangon',
     'North Asia' => 'Asia/Krasnoyarsk',
     'SE Asia' => 'Asia/Bangkok',
     'China' => 'Asia/Shanghai',
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
index 2049a95c1..2dd9120e3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/VObject/timezonedata/windowszones.php
@@ -11,142 +11,142 @@
  */
 
 return [
-  'AUS Central Standard Time' => 'Australia/Darwin',
-  'AUS Eastern Standard Time' => 'Australia/Sydney',
-  'Afghanistan Standard Time' => 'Asia/Kabul',
-  'Alaskan Standard Time' => 'America/Anchorage',
-  'Aleutian Standard Time' => 'America/Adak',
-  'Altai Standard Time' => 'Asia/Barnaul',
-  'Arab Standard Time' => 'Asia/Riyadh',
-  'Arabian Standard Time' => 'Asia/Dubai',
-  'Arabic Standard Time' => 'Asia/Baghdad',
-  'Argentina Standard Time' => 'America/Buenos_Aires',
-  'Astrakhan Standard Time' => 'Europe/Astrakhan',
-  'Atlantic Standard Time' => 'America/Halifax',
-  'Aus Central W. Standard Time' => 'Australia/Eucla',
-  'Azerbaijan Standard Time' => 'Asia/Baku',
-  'Azores Standard Time' => 'Atlantic/Azores',
-  'Bahia Standard Time' => 'America/Bahia',
-  'Bangladesh Standard Time' => 'Asia/Dhaka',
-  'Belarus Standard Time' => 'Europe/Minsk',
-  'Bougainville Standard Time' => 'Pacific/Bougainville',
-  'Canada Central Standard Time' => 'America/Regina',
-  'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
-  'Caucasus Standard Time' => 'Asia/Yerevan',
-  'Cen. Australia Standard Time' => 'Australia/Adelaide',
-  'Central America Standard Time' => 'America/Guatemala',
-  'Central Asia Standard Time' => 'Asia/Almaty',
-  'Central Brazilian Standard Time' => 'America/Cuiaba',
-  'Central Europe Standard Time' => 'Europe/Budapest',
-  'Central European Standard Time' => 'Europe/Warsaw',
-  'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
-  'Central Standard Time' => 'America/Chicago',
-  'Central Standard Time (Mexico)' => 'America/Mexico_City',
-  'Chatham Islands Standard Time' => 'Pacific/Chatham',
-  'China Standard Time' => 'Asia/Shanghai',
-  'Cuba Standard Time' => 'America/Havana',
-  'Dateline Standard Time' => 'Etc/GMT+12',
-  'E. Africa Standard Time' => 'Africa/Nairobi',
-  'E. Australia Standard Time' => 'Australia/Brisbane',
-  'E. Europe Standard Time' => 'Europe/Chisinau',
-  'E. South America Standard Time' => 'America/Sao_Paulo',
-  'Easter Island Standard Time' => 'Pacific/Easter',
-  'Eastern Standard Time' => 'America/New_York',
-  'Eastern Standard Time (Mexico)' => 'America/Cancun',
-  'Egypt Standard Time' => 'Africa/Cairo',
-  'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
-  'FLE Standard Time' => 'Europe/Kiev',
-  'Fiji Standard Time' => 'Pacific/Fiji',
-  'GMT Standard Time' => 'Europe/London',
-  'GTB Standard Time' => 'Europe/Bucharest',
-  'Georgian Standard Time' => 'Asia/Tbilisi',
-  'Greenland Standard Time' => 'America/Godthab',
-  'Greenwich Standard Time' => 'Atlantic/Reykjavik',
-  'Haiti Standard Time' => 'America/Port-au-Prince',
-  'Hawaiian Standard Time' => 'Pacific/Honolulu',
-  'India Standard Time' => 'Asia/Calcutta',
-  'Iran Standard Time' => 'Asia/Tehran',
-  'Israel Standard Time' => 'Asia/Jerusalem',
-  'Jordan Standard Time' => 'Asia/Amman',
-  'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
-  'Korea Standard Time' => 'Asia/Seoul',
-  'Libya Standard Time' => 'Africa/Tripoli',
-  'Line Islands Standard Time' => 'Pacific/Kiritimati',
-  'Lord Howe Standard Time' => 'Australia/Lord_Howe',
-  'Magadan Standard Time' => 'Asia/Magadan',
-  'Magallanes Standard Time' => 'America/Punta_Arenas',
-  'Marquesas Standard Time' => 'Pacific/Marquesas',
-  'Mauritius Standard Time' => 'Indian/Mauritius',
-  'Middle East Standard Time' => 'Asia/Beirut',
-  'Montevideo Standard Time' => 'America/Montevideo',
-  'Morocco Standard Time' => 'Africa/Casablanca',
-  'Mountain Standard Time' => 'America/Denver',
-  'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
-  'Myanmar Standard Time' => 'Asia/Rangoon',
-  'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
-  'Namibia Standard Time' => 'Africa/Windhoek',
-  'Nepal Standard Time' => 'Asia/Katmandu',
-  'New Zealand Standard Time' => 'Pacific/Auckland',
-  'Newfoundland Standard Time' => 'America/St_Johns',
-  'Norfolk Standard Time' => 'Pacific/Norfolk',
-  'North Asia East Standard Time' => 'Asia/Irkutsk',
-  'North Asia Standard Time' => 'Asia/Krasnoyarsk',
-  'North Korea Standard Time' => 'Asia/Pyongyang',
-  'Omsk Standard Time' => 'Asia/Omsk',
-  'Pacific SA Standard Time' => 'America/Santiago',
-  'Pacific Standard Time' => 'America/Los_Angeles',
-  'Pacific Standard Time (Mexico)' => 'America/Tijuana',
-  'Pakistan Standard Time' => 'Asia/Karachi',
-  'Paraguay Standard Time' => 'America/Asuncion',
-  'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
-  'Romance Standard Time' => 'Europe/Paris',
-  'Russia Time Zone 10' => 'Asia/Srednekolymsk',
-  'Russia Time Zone 11' => 'Asia/Kamchatka',
-  'Russia Time Zone 3' => 'Europe/Samara',
-  'Russian Standard Time' => 'Europe/Moscow',
-  'SA Eastern Standard Time' => 'America/Cayenne',
-  'SA Pacific Standard Time' => 'America/Bogota',
-  'SA Western Standard Time' => 'America/La_Paz',
-  'SE Asia Standard Time' => 'Asia/Bangkok',
-  'Saint Pierre Standard Time' => 'America/Miquelon',
-  'Sakhalin Standard Time' => 'Asia/Sakhalin',
-  'Samoa Standard Time' => 'Pacific/Apia',
-  'Sao Tome Standard Time' => 'Africa/Sao_Tome',
-  'Saratov Standard Time' => 'Europe/Saratov',
-  'Singapore Standard Time' => 'Asia/Singapore',
-  'South Africa Standard Time' => 'Africa/Johannesburg',
-  'Sri Lanka Standard Time' => 'Asia/Colombo',
-  'Sudan Standard Time' => 'Africa/Khartoum',
-  'Syria Standard Time' => 'Asia/Damascus',
-  'Taipei Standard Time' => 'Asia/Taipei',
-  'Tasmania Standard Time' => 'Australia/Hobart',
-  'Tocantins Standard Time' => 'America/Araguaina',
-  'Tokyo Standard Time' => 'Asia/Tokyo',
-  'Tomsk Standard Time' => 'Asia/Tomsk',
-  'Tonga Standard Time' => 'Pacific/Tongatapu',
-  'Transbaikal Standard Time' => 'Asia/Chita',
-  'Turkey Standard Time' => 'Europe/Istanbul',
-  'Turks And Caicos Standard Time' => 'America/Grand_Turk',
-  'US Eastern Standard Time' => 'America/Indianapolis',
-  'US Mountain Standard Time' => 'America/Phoenix',
-  'UTC' => 'Etc/GMT',
-  'UTC+12' => 'Etc/GMT-12',
-  'UTC+13' => 'Etc/GMT-13',
-  'UTC-02' => 'Etc/GMT+2',
-  'UTC-08' => 'Etc/GMT+8',
-  'UTC-09' => 'Etc/GMT+9',
-  'UTC-11' => 'Etc/GMT+11',
-  'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
-  'Venezuela Standard Time' => 'America/Caracas',
-  'Vladivostok Standard Time' => 'Asia/Vladivostok',
-  'Volgograd Standard Time' => 'Europe/Volgograd',
-  'W. Australia Standard Time' => 'Australia/Perth',
-  'W. Central Africa Standard Time' => 'Africa/Lagos',
-  'W. Europe Standard Time' => 'Europe/Berlin',
-  'W. Mongolia Standard Time' => 'Asia/Hovd',
-  'West Asia Standard Time' => 'Asia/Tashkent',
-  'West Bank Standard Time' => 'Asia/Hebron',
-  'West Pacific Standard Time' => 'Pacific/Port_Moresby',
-  'Yakutsk Standard Time' => 'Asia/Yakutsk',
-  'Yukon Standard Time' => 'America/Whitehorse',
+    'AUS Central Standard Time' => 'Australia/Darwin',
+    'AUS Eastern Standard Time' => 'Australia/Sydney',
+    'Afghanistan Standard Time' => 'Asia/Kabul',
+    'Alaskan Standard Time' => 'America/Anchorage',
+    'Aleutian Standard Time' => 'America/Adak',
+    'Altai Standard Time' => 'Asia/Barnaul',
+    'Arab Standard Time' => 'Asia/Riyadh',
+    'Arabian Standard Time' => 'Asia/Dubai',
+    'Arabic Standard Time' => 'Asia/Baghdad',
+    'Argentina Standard Time' => 'America/Argentina/Buenos_Aires',
+    'Astrakhan Standard Time' => 'Europe/Astrakhan',
+    'Atlantic Standard Time' => 'America/Halifax',
+    'Aus Central W. Standard Time' => 'Australia/Eucla',
+    'Azerbaijan Standard Time' => 'Asia/Baku',
+    'Azores Standard Time' => 'Atlantic/Azores',
+    'Bahia Standard Time' => 'America/Bahia',
+    'Bangladesh Standard Time' => 'Asia/Dhaka',
+    'Belarus Standard Time' => 'Europe/Minsk',
+    'Bougainville Standard Time' => 'Pacific/Bougainville',
+    'Canada Central Standard Time' => 'America/Regina',
+    'Cape Verde Standard Time' => 'Atlantic/Cape_Verde',
+    'Caucasus Standard Time' => 'Asia/Yerevan',
+    'Cen. Australia Standard Time' => 'Australia/Adelaide',
+    'Central America Standard Time' => 'America/Guatemala',
+    'Central Asia Standard Time' => 'Asia/Almaty',
+    'Central Brazilian Standard Time' => 'America/Cuiaba',
+    'Central Europe Standard Time' => 'Europe/Budapest',
+    'Central European Standard Time' => 'Europe/Warsaw',
+    'Central Pacific Standard Time' => 'Pacific/Guadalcanal',
+    'Central Standard Time' => 'America/Chicago',
+    'Central Standard Time (Mexico)' => 'America/Mexico_City',
+    'Chatham Islands Standard Time' => 'Pacific/Chatham',
+    'China Standard Time' => 'Asia/Shanghai',
+    'Cuba Standard Time' => 'America/Havana',
+    'Dateline Standard Time' => 'Etc/GMT+12',
+    'E. Africa Standard Time' => 'Africa/Nairobi',
+    'E. Australia Standard Time' => 'Australia/Brisbane',
+    'E. Europe Standard Time' => 'Europe/Chisinau',
+    'E. South America Standard Time' => 'America/Sao_Paulo',
+    'Easter Island Standard Time' => 'Pacific/Easter',
+    'Eastern Standard Time' => 'America/New_York',
+    'Eastern Standard Time (Mexico)' => 'America/Cancun',
+    'Egypt Standard Time' => 'Africa/Cairo',
+    'Ekaterinburg Standard Time' => 'Asia/Yekaterinburg',
+    'FLE Standard Time' => 'Europe/Kyiv',
+    'Fiji Standard Time' => 'Pacific/Fiji',
+    'GMT Standard Time' => 'Europe/London',
+    'GTB Standard Time' => 'Europe/Bucharest',
+    'Georgian Standard Time' => 'Asia/Tbilisi',
+    'Greenland Standard Time' => 'America/Nuuk',
+    'Greenwich Standard Time' => 'Atlantic/Reykjavik',
+    'Haiti Standard Time' => 'America/Port-au-Prince',
+    'Hawaiian Standard Time' => 'Pacific/Honolulu',
+    'India Standard Time' => 'Asia/Kolkata',
+    'Iran Standard Time' => 'Asia/Tehran',
+    'Israel Standard Time' => 'Asia/Jerusalem',
+    'Jordan Standard Time' => 'Asia/Amman',
+    'Kaliningrad Standard Time' => 'Europe/Kaliningrad',
+    'Korea Standard Time' => 'Asia/Seoul',
+    'Libya Standard Time' => 'Africa/Tripoli',
+    'Line Islands Standard Time' => 'Pacific/Kiritimati',
+    'Lord Howe Standard Time' => 'Australia/Lord_Howe',
+    'Magadan Standard Time' => 'Asia/Magadan',
+    'Magallanes Standard Time' => 'America/Punta_Arenas',
+    'Marquesas Standard Time' => 'Pacific/Marquesas',
+    'Mauritius Standard Time' => 'Indian/Mauritius',
+    'Middle East Standard Time' => 'Asia/Beirut',
+    'Montevideo Standard Time' => 'America/Montevideo',
+    'Morocco Standard Time' => 'Africa/Casablanca',
+    'Mountain Standard Time' => 'America/Denver',
+    'Mountain Standard Time (Mexico)' => 'America/Chihuahua',
+    'Myanmar Standard Time' => 'Asia/Yangon',
+    'N. Central Asia Standard Time' => 'Asia/Novosibirsk',
+    'Namibia Standard Time' => 'Africa/Windhoek',
+    'Nepal Standard Time' => 'Asia/Kathmandu',
+    'New Zealand Standard Time' => 'Pacific/Auckland',
+    'Newfoundland Standard Time' => 'America/St_Johns',
+    'Norfolk Standard Time' => 'Pacific/Norfolk',
+    'North Asia East Standard Time' => 'Asia/Irkutsk',
+    'North Asia Standard Time' => 'Asia/Krasnoyarsk',
+    'North Korea Standard Time' => 'Asia/Pyongyang',
+    'Omsk Standard Time' => 'Asia/Omsk',
+    'Pacific SA Standard Time' => 'America/Santiago',
+    'Pacific Standard Time' => 'America/Los_Angeles',
+    'Pacific Standard Time (Mexico)' => 'America/Tijuana',
+    'Pakistan Standard Time' => 'Asia/Karachi',
+    'Paraguay Standard Time' => 'America/Asuncion',
+    'Qyzylorda Standard Time' => 'Asia/Qyzylorda',
+    'Romance Standard Time' => 'Europe/Paris',
+    'Russia Time Zone 10' => 'Asia/Srednekolymsk',
+    'Russia Time Zone 11' => 'Asia/Kamchatka',
+    'Russia Time Zone 3' => 'Europe/Samara',
+    'Russian Standard Time' => 'Europe/Moscow',
+    'SA Eastern Standard Time' => 'America/Cayenne',
+    'SA Pacific Standard Time' => 'America/Bogota',
+    'SA Western Standard Time' => 'America/La_Paz',
+    'SE Asia Standard Time' => 'Asia/Bangkok',
+    'Saint Pierre Standard Time' => 'America/Miquelon',
+    'Sakhalin Standard Time' => 'Asia/Sakhalin',
+    'Samoa Standard Time' => 'Pacific/Apia',
+    'Sao Tome Standard Time' => 'Africa/Sao_Tome',
+    'Saratov Standard Time' => 'Europe/Saratov',
+    'Singapore Standard Time' => 'Asia/Singapore',
+    'South Africa Standard Time' => 'Africa/Johannesburg',
+    'Sri Lanka Standard Time' => 'Asia/Colombo',
+    'Sudan Standard Time' => 'Africa/Khartoum',
+    'Syria Standard Time' => 'Asia/Damascus',
+    'Taipei Standard Time' => 'Asia/Taipei',
+    'Tasmania Standard Time' => 'Australia/Hobart',
+    'Tocantins Standard Time' => 'America/Araguaina',
+    'Tokyo Standard Time' => 'Asia/Tokyo',
+    'Tomsk Standard Time' => 'Asia/Tomsk',
+    'Tonga Standard Time' => 'Pacific/Tongatapu',
+    'Transbaikal Standard Time' => 'Asia/Chita',
+    'Turkey Standard Time' => 'Europe/Istanbul',
+    'Turks And Caicos Standard Time' => 'America/Grand_Turk',
+    'US Eastern Standard Time' => 'America/Indiana/Indianapolis',
+    'US Mountain Standard Time' => 'America/Phoenix',
+    'UTC' => 'Etc/GMT',
+    'UTC+12' => 'Etc/GMT-12',
+    'UTC+13' => 'Etc/GMT-13',
+    'UTC-02' => 'Etc/GMT+2',
+    'UTC-08' => 'Etc/GMT+8',
+    'UTC-09' => 'Etc/GMT+9',
+    'UTC-11' => 'Etc/GMT+11',
+    'Ulaanbaatar Standard Time' => 'Asia/Ulaanbaatar',
+    'Venezuela Standard Time' => 'America/Caracas',
+    'Vladivostok Standard Time' => 'Asia/Vladivostok',
+    'Volgograd Standard Time' => 'Europe/Volgograd',
+    'W. Australia Standard Time' => 'Australia/Perth',
+    'W. Central Africa Standard Time' => 'Africa/Lagos',
+    'W. Europe Standard Time' => 'Europe/Berlin',
+    'W. Mongolia Standard Time' => 'Asia/Hovd',
+    'West Asia Standard Time' => 'Asia/Tashkent',
+    'West Bank Standard Time' => 'Asia/Hebron',
+    'West Pacific Standard Time' => 'Pacific/Port_Moresby',
+    'Yakutsk Standard Time' => 'Asia/Yakutsk',
+    'Yukon Standard Time' => 'America/Whitehorse',
 ];
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
index 4e15bd414..7c082f5fb 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ContextStackTrait.php
@@ -32,9 +32,9 @@ trait ContextStackTrait
      * Values may also be a callable. In that case the function will be called
      * directly.
      *
-     * @var array
+     * @phpstan-var array<string, class-string|callable|object>
      */
-    public $elementMap = [];
+    public array $elementMap = [];
 
     /**
      * A contextUri pointing to the document being parsed / written.
@@ -44,10 +44,8 @@ trait ContextStackTrait
      * The reader and writer don't use this property, but as it's an extremely
      * common use-case for parsing XML documents, it's added here as a
      * convenience.
-     *
-     * @var string|null
      */
-    public $contextUri;
+    public ?string $contextUri = null;
 
     /**
      * This is a list of namespaces that you want to give default prefixes.
@@ -55,9 +53,9 @@ trait ContextStackTrait
      * You must make sure you create this entire list before starting to write.
      * They should be registered on the root element.
      *
-     * @var array
+     * @phpstan-var array<string, class-string|string|null>
      */
-    public $namespaceMap = [];
+    public array $namespaceMap = [];
 
     /**
      * This is a list of custom serializers for specific classes.
@@ -65,7 +63,7 @@ trait ContextStackTrait
      * The writer may use this if you attempt to serialize an object with a
      * class that does not implement XmlSerializable.
      *
-     * Instead it will look at this classmap to see if there is a custom
+     * Instead, it will look at this classmap to see if there is a custom
      * serializer here. This is useful if you don't want your value objects
      * to be responsible for serializing themselves.
      *
@@ -75,16 +73,16 @@ trait ContextStackTrait
      *
      * function (Writer $writer, object $value)
      *
-     * @var array
+     * @phpstan-var array<class-string, callable(Writer, object):mixed>
      */
-    public $classMap = [];
+    public array $classMap = [];
 
     /**
      * Backups of previous contexts.
      *
-     * @var array
+     * @var list<mixed>
      */
-    protected $contextStack = [];
+    protected array $contextStack = [];
 
     /**
      * Create a new "context".
@@ -93,7 +91,7 @@ trait ContextStackTrait
      * namespaceMap. After you're done, you can restore the old data again
      * with popContext.
      */
-    public function pushContext()
+    public function pushContext(): void
     {
         $this->contextStack[] = [
             $this->elementMap,
@@ -106,13 +104,13 @@ trait ContextStackTrait
     /**
      * Restore the previous "context".
      */
-    public function popContext()
+    public function popContext(): void
     {
         list(
             $this->elementMap,
             $this->contextUri,
             $this->namespaceMap,
-            $this->classMap
+            $this->classMap,
         ) = array_pop($this->contextStack);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
index c4f240970..cb5b7ca56 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Deserializer/functions.php
@@ -54,8 +54,10 @@ use Sabre\Xml\Reader;
  *
  * Attributes will be removed from the top-level elements. If elements with
  * the same name appear twice in the list, only the last one will be kept.
+ *
+ * @phpstan-return array<string, mixed>
  */
-function keyValue(Reader $reader, string $namespace = null): array
+function keyValue(Reader $reader, ?string $namespace = null): array
 {
     // If there's no children, we don't do anything.
     if ($reader->isEmptyElement) {
@@ -143,8 +145,10 @@ function keyValue(Reader $reader, string $namespace = null): array
  * ];
  *
  * @return string[]
+ *
+ * @phpstan-return list<string>
  */
-function enum(Reader $reader, string $namespace = null): array
+function enum(Reader $reader, ?string $namespace = null): array
 {
     // If there's no children, we don't do anything.
     if ($reader->isEmptyElement) {
@@ -183,15 +187,19 @@ function enum(Reader $reader, string $namespace = null): array
 }
 
 /**
- * The valueObject deserializer turns an xml element into a PHP object of
+ * The valueObject deserializer turns an XML element into a PHP object of
  * a specific class.
  *
  * This is primarily used by the mapValueObject function from the Service
  * class, but it can also easily be used for more specific situations.
  *
- * @return object
+ * @template C of object
+ *
+ * @param class-string<C> $className
+ *
+ * @phpstan-return C
  */
-function valueObject(Reader $reader, string $className, string $namespace)
+function valueObject(Reader $reader, string $className, string $namespace): object
 {
     $valueObject = new $className();
     if ($reader->isEmptyElement) {
@@ -204,19 +212,24 @@ function valueObject(Reader $reader, string $className, string $namespace)
 
     $reader->read();
     do {
-        if (Reader::ELEMENT === $reader->nodeType && $reader->namespaceURI == $namespace) {
+        if (Reader::ELEMENT === $reader->nodeType && $reader->namespaceURI === $namespace) {
             if (property_exists($valueObject, $reader->localName)) {
                 if (is_array($defaultProperties[$reader->localName])) {
+                    // @phpstan-ignore property.dynamicName
                     $valueObject->{$reader->localName}[] = $reader->parseCurrentElement()['value'];
                 } else {
+                    // @phpstan-ignore property.dynamicName
                     $valueObject->{$reader->localName} = $reader->parseCurrentElement()['value'];
                 }
             } else {
                 // Ignore property
                 $reader->next();
             }
+        } elseif (Reader::ELEMENT === $reader->nodeType) {
+            // Skipping element from different namespace
+            $reader->next();
         } else {
-            if (!$reader->read()) {
+            if (Reader::END_ELEMENT !== $reader->nodeType && !$reader->read()) {
                 break;
             }
         }
@@ -226,134 +239,3 @@ function valueObject(Reader $reader, string $className, string $namespace)
 
     return $valueObject;
 }
-
-/**
- * This deserializer helps you deserialize xml structures that look like
- * this:.
- *
- * <collection>
- *    <item>...</item>
- *    <item>...</item>
- *    <item>...</item>
- * </collection>
- *
- * Many XML documents use patterns like that, and this deserializer
- * allow you to get all the 'items' as an array.
- *
- * In that previous example, you would register the deserializer as such:
- *
- * $reader->elementMap['{}collection'] = function($reader) {
- *     return repeatingElements($reader, '{}item');
- * }
- *
- * The repeatingElements deserializer simply returns everything as an array.
- *
- * $childElementName must either be a a clark-notation element name, or if no
- * namespace is used, the bare element name.
- */
-function repeatingElements(Reader $reader, string $childElementName): array
-{
-    if ('{' !== $childElementName[0]) {
-        $childElementName = '{}'.$childElementName;
-    }
-    $result = [];
-
-    foreach ($reader->parseGetElements() as $element) {
-        if ($element['name'] === $childElementName) {
-            $result[] = $element['value'];
-        }
-    }
-
-    return $result;
-}
-
-/**
- * This deserializer helps you to deserialize structures which contain mixed content like this:.
- *
- * <p>some text <extref>and a inline tag</extref>and even more text</p>
- *
- * The above example will return
- *
- * [
- *     'some text',
- *     [
- *         'name'       => '{}extref',
- *         'value'      => 'and a inline tag',
- *         'attributes' => []
- *     ],
- *     'and even more text'
- * ]
- *
- * In strict XML documents you wont find this kind of markup but in html this is a quite common pattern.
- */
-function mixedContent(Reader $reader): array
-{
-    // If there's no children, we don't do anything.
-    if ($reader->isEmptyElement) {
-        $reader->next();
-
-        return [];
-    }
-
-    $previousDepth = $reader->depth;
-
-    $content = [];
-    $reader->read();
-    while (true) {
-        if (Reader::ELEMENT == $reader->nodeType) {
-            $content[] = $reader->parseCurrentElement();
-        } elseif ($reader->depth >= $previousDepth && in_array($reader->nodeType, [Reader::TEXT, Reader::CDATA, Reader::WHITESPACE])) {
-            $content[] = $reader->value;
-            $reader->read();
-        } elseif (Reader::END_ELEMENT == $reader->nodeType) {
-            // Ensuring we are moving the cursor after the end element.
-            $reader->read();
-            break;
-        } else {
-            $reader->read();
-        }
-    }
-
-    return $content;
-}
-
-/**
- * The functionCaller deserializer turns an xml element into whatever your callable return.
- *
- * You can use, e.g., a named constructor (factory method) to create an object using
- * this function.
- *
- * @return mixed
- */
-function functionCaller(Reader $reader, callable $func, string $namespace)
-{
-    if ($reader->isEmptyElement) {
-        $reader->next();
-
-        return null;
-    }
-
-    $funcArgs = [];
-    $func = is_string($func) && false !== strpos($func, '::') ? explode('::', $func) : $func;
-    $ref = is_array($func) ? new \ReflectionMethod($func[0], $func[1]) : new \ReflectionFunction($func);
-    foreach ($ref->getParameters() as $parameter) {
-        $funcArgs[$parameter->getName()] = null;
-    }
-
-    $reader->read();
-    do {
-        if (Reader::ELEMENT === $reader->nodeType && $reader->namespaceURI == $namespace) {
-            if (array_key_exists($reader->localName, $funcArgs)) {
-                $funcArgs[$reader->localName] = $reader->parseCurrentElement()['value'];
-            } else {
-                // Ignore property
-                $reader->next();
-            }
-        } else {
-            $reader->read();
-        }
-    } while (Reader::END_ELEMENT !== $reader->nodeType);
-    $reader->read();
-
-    return $func(...array_values($funcArgs));
-}
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
index 8a93191b1..10fe97838 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Base.php
@@ -19,19 +19,13 @@ use Sabre\Xml;
  */
 class Base implements Xml\Element
 {
-    /**
-     * PHP value to serialize.
-     *
-     * @var mixed
-     */
-    protected $value;
-
     /**
      * Constructor.
+     *
+     * @param mixed $value PHP value to serialize
      */
-    public function __construct($value = null)
+    public function __construct(protected $value = null)
     {
-        $this->value = $value;
     }
 
     /**
@@ -50,7 +44,7 @@ class Base implements Xml\Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $writer->write($this->value);
     }
@@ -73,7 +67,7 @@ class Base implements Xml\Element
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @return mixed
+     * @return array<int,array<string, mixed>>|string|null
      */
     public static function xmlDeserialize(Xml\Reader $reader)
     {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
index 1367343ff..54e3879ee 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Cdata.php
@@ -21,19 +21,15 @@ use Sabre\Xml;
  */
 class Cdata implements Xml\XmlSerializable
 {
-    /**
-     * CDATA element value.
-     *
-     * @var string
-     */
-    protected $value;
-
     /**
      * Constructor.
      */
-    public function __construct(string $value)
-    {
-        $this->value = $value;
+    public function __construct(
+        /**
+         * CDATA element value.
+         */
+        protected string $value,
+    ) {
     }
 
     /**
@@ -52,8 +48,8 @@ class Cdata implements Xml\XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
-        $writer->writeCData($this->value);
+        $writer->writeCdata($this->value);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
index fecce4c75..44d296bd3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Elements.php
@@ -37,19 +37,17 @@ use Sabre\Xml\Serializer;
  */
 class Elements implements Xml\Element
 {
-    /**
-     * Value to serialize.
-     *
-     * @var array
-     */
-    protected $value;
-
     /**
      * Constructor.
+     *
+     * @param array<int, mixed> $value
      */
-    public function __construct(array $value = [])
-    {
-        $this->value = $value;
+    public function __construct(
+        /**
+         * Value to serialize.
+         */
+        protected array $value = [],
+    ) {
     }
 
     /**
@@ -68,8 +66,9 @@ class Elements implements Xml\Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
+        require_once __DIR__ . '/../Serializer/functions.php';
         Serializer\enum($writer, $this->value);
     }
 
@@ -91,10 +90,11 @@ class Elements implements Xml\Element
      * $reader->parseSubTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @return mixed
+     * @return string[]
      */
     public static function xmlDeserialize(Xml\Reader $reader)
     {
+        require_once __DIR__ . '/../Deserializer/functions.php';
         return Deserializer\enum($reader);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
index 17448880d..862c181c3 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/KeyValue.php
@@ -37,19 +37,17 @@ use Sabre\Xml\Deserializer;
  */
 class KeyValue implements Xml\Element
 {
-    /**
-     * Value to serialize.
-     *
-     * @var array
-     */
-    protected $value;
-
     /**
      * Constructor.
+     *
+     * @param array<string, mixed> $value
      */
-    public function __construct(array $value = [])
-    {
-        $this->value = $value;
+    public function __construct(
+        /**
+         * Value to serialize.
+         */
+        protected array $value = [],
+    ) {
     }
 
     /**
@@ -68,8 +66,9 @@ class KeyValue implements Xml\Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
+        require_once __DIR__ . '/Serializer/functions.php';
         $writer->write($this->value);
     }
 
@@ -91,10 +90,11 @@ class KeyValue implements Xml\Element
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @return mixed
+     * @return array<string, mixed>
      */
     public static function xmlDeserialize(Xml\Reader $reader)
     {
+        require_once __DIR__ . '/../Deserializer/functions.php';
         return Deserializer\keyValue($reader);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
index 336212a53..583aff618 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/Uri.php
@@ -6,6 +6,8 @@ namespace Sabre\Xml\Element;
 
 use Sabre\Xml;
 
+use function Sabre\Uri\resolve;
+
 /**
  * Uri element.
  *
@@ -24,21 +26,15 @@ use Sabre\Xml;
  */
 class Uri implements Xml\Element
 {
-    /**
-     * Uri element value.
-     *
-     * @var string
-     */
-    protected $value;
-
     /**
      * Constructor.
-     *
-     * @param string $value
      */
-    public function __construct($value)
-    {
-        $this->value = $value;
+    public function __construct(
+        /**
+         * Uri element value.
+         */
+        protected string $value,
+    ) {
     }
 
     /**
@@ -57,11 +53,11 @@ class Uri implements Xml\Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Xml\Writer $writer)
+    public function xmlSerialize(Xml\Writer $writer): void
     {
         $writer->text(
-            \Sabre\Uri\resolve(
-                $writer->contextUri,
+            resolve(
+                $writer->contextUri ?? '',
                 $this->value
             )
         );
@@ -84,13 +80,11 @@ class Uri implements Xml\Element
      *
      * $reader->parseSubTree() will parse the entire sub-tree, and advance to
      * the next element.
-     *
-     * @return mixed
      */
     public static function xmlDeserialize(Xml\Reader $reader)
     {
         return new self(
-            \Sabre\Uri\resolve(
+            resolve(
                 (string) $reader->contextUri,
                 $reader->readText()
             )
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
index bf110eaee..908fe5b22 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Element/XmlFragment.php
@@ -24,19 +24,15 @@ use Sabre\Xml\Writer;
  */
 class XmlFragment implements Element
 {
-    /**
-     * The inner XML value.
-     *
-     * @var string
-     */
-    protected $xml;
-
     /**
      * Constructor.
      */
-    public function __construct(string $xml)
-    {
-        $this->xml = $xml;
+    public function __construct(
+        /**
+         * The inner XML value.
+         */
+        protected string $xml,
+    ) {
     }
 
     /**
@@ -63,7 +59,7 @@ class XmlFragment implements Element
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer)
+    public function xmlSerialize(Writer $writer): void
     {
         $reader = new Reader();
 
@@ -74,7 +70,7 @@ class XmlFragment implements Element
 <xml-fragment xmlns="http://sabre.io/ns">{$this->getXml()}</xml-fragment>
 XML;
 
-        $reader->xml($xml);
+        $reader->XML($xml);
 
         while ($reader->read()) {
             if ($reader->depth < 1) {
@@ -135,8 +131,6 @@ XML;
      *
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
-     *
-     * @return mixed
      */
     public static function xmlDeserialize(Reader $reader)
     {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
index fb074f97d..0f760c849 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/LibXMLException.php
@@ -5,7 +5,6 @@ declare(strict_types=1);
 namespace Sabre\Xml;
 
 use LibXMLError;
-use Throwable;
 
 /**
  * This exception is thrown when the Reader runs into a parsing error.
@@ -18,29 +17,25 @@ use Throwable;
  */
 class LibXMLException extends ParseException
 {
-    /**
-     * The error list.
-     *
-     * @var \LibXMLError[]
-     */
-    protected $errors;
-
     /**
      * Creates the exception.
      *
      * You should pass a list of LibXMLError objects in its constructor.
      *
-     * @param LibXMLError[] $errors
-     * @param Throwable     $previousException
+     * @param \LibXMLError[] $errors
      */
-    public function __construct(array $errors, int $code = 0, Throwable $previousException = null)
+    public function __construct(/**
+     * The error list.
+     */
+        protected array $errors, int $code = 0, ?\Throwable $previousException = null)
     {
-        $this->errors = $errors;
-        parent::__construct($errors[0]->message.' on line '.$errors[0]->line.', column '.$errors[0]->column, $code, $previousException);
+        parent::__construct($this->errors[0]->message.' on line '.$this->errors[0]->line.', column '.$this->errors[0]->column, $code, $previousException);
     }
 
     /**
      * Returns the LibXML errors.
+     *
+     * @return \LibXMLError[]
      */
     public function getErrors(): array
     {
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ParseException.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ParseException.php
index e237b8732..ff6656b23 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ParseException.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/ParseException.php
@@ -4,8 +4,6 @@ declare(strict_types=1);
 
 namespace Sabre\Xml;
 
-use Exception;
-
 /**
  * This is a base exception for any exception related to parsing xml files.
  *
@@ -13,6 +11,6 @@ use Exception;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class ParseException extends Exception
+class ParseException extends \Exception
 {
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
index 7871a74f5..8d01f710a 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Reader.php
@@ -19,7 +19,7 @@ use XMLReader;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Reader extends XMLReader
+class Reader extends \XMLReader
 {
     use ContextStackTrait;
 
@@ -30,12 +30,10 @@ class Reader extends XMLReader
      * Or if no namespace is defined: "{}feed".
      *
      * This method returns null if we're not currently on an element.
-     *
-     * @return string|null
      */
-    public function getClark()
+    public function getClark(): ?string
     {
-        if (!$this->localName) {
+        if ('' === $this->localName) {
             return null;
         }
 
@@ -52,6 +50,8 @@ class Reader extends XMLReader
      *
      * This function will also disable the standard libxml error handler (which
      * usually just results in PHP errors), and throw exceptions instead.
+     *
+     * @return array<string, mixed>
      */
     public function parse(): array
     {
@@ -67,7 +67,7 @@ class Reader extends XMLReader
                 if (!$this->read()) {
                     $errors = libxml_get_errors();
                     libxml_clear_errors();
-                    if ($errors) {
+                    if (count($errors) > 0) {
                         throw new LibXMLException($errors);
                     }
                 }
@@ -77,7 +77,7 @@ class Reader extends XMLReader
             // last line of defense in case errors did occur above
             $errors = libxml_get_errors();
             libxml_clear_errors();
-            if ($errors) {
+            if (count($errors) > 0) {
                 throw new LibXMLException($errors);
             }
         } finally {
@@ -102,8 +102,12 @@ class Reader extends XMLReader
      *
      * If the $elementMap argument is specified, the existing elementMap will
      * be overridden while parsing the tree, and restored after this process.
+     *
+     * @param array<string, mixed>|null $elementMap
+     *
+     * @return array<int,array<string, mixed>>
      */
-    public function parseGetElements(array $elementMap = null): array
+    public function parseGetElements(?array $elementMap = null): array
     {
         $result = $this->parseInnerTree($elementMap);
         if (!is_array($result)) {
@@ -124,9 +128,11 @@ class Reader extends XMLReader
      * If the $elementMap argument is specified, the existing elementMap will
      * be overridden while parsing the tree, and restored after this process.
      *
-     * @return array|string|null
+     * @param array<string, mixed>|null $elementMap
+     *
+     * @return array<int,array<string, mixed>>|string|null
      */
-    public function parseInnerTree(array $elementMap = null)
+    public function parseInnerTree(?array $elementMap = null)
     {
         $text = null;
         $elements = [];
@@ -147,7 +153,7 @@ class Reader extends XMLReader
             if (!$this->read()) {
                 $errors = libxml_get_errors();
                 libxml_clear_errors();
-                if ($errors) {
+                if (count($errors) > 0) {
                     throw new LibXMLException($errors);
                 }
                 throw new ParseException('This should never happen (famous last words)');
@@ -159,7 +165,7 @@ class Reader extends XMLReader
                 if (!$this->isValid()) {
                     $errors = libxml_get_errors();
 
-                    if ($errors) {
+                    if (count($errors) > 0) {
                         libxml_clear_errors();
                         throw new LibXMLException($errors);
                     }
@@ -193,7 +199,7 @@ class Reader extends XMLReader
             }
         }
 
-        return $elements ? $elements : $text;
+        return count($elements) > 0 ? $elements : $text;
     }
 
     /**
@@ -204,8 +210,8 @@ class Reader extends XMLReader
         $result = '';
         $previousDepth = $this->depth;
 
-        while ($this->read() && $this->depth != $previousDepth) {
-            if (in_array($this->nodeType, [XMLReader::TEXT, XMLReader::CDATA, XMLReader::WHITESPACE])) {
+        while ($this->read() && $this->depth !== $previousDepth) {
+            if (in_array($this->nodeType, [\XMLReader::TEXT, \XMLReader::CDATA, \XMLReader::WHITESPACE], true)) {
                 $result .= $this->value;
             }
         }
@@ -220,6 +226,8 @@ class Reader extends XMLReader
      *   * name - A clark-notation XML element name.
      *   * value - The parsed value.
      *   * attributes - A key-value list of attributes.
+     *
+     * @return array <string, mixed>
      */
     public function parseCurrentElement(): array
     {
@@ -250,13 +258,15 @@ class Reader extends XMLReader
      * If the attributes are part of the same namespace, they will simply be
      * short keys. If they are defined on a different namespace, the attribute
      * name will be returned in clark-notation.
+     *
+     * @return array<string, mixed>
      */
     public function parseAttributes(): array
     {
         $attributes = [];
 
         while ($this->moveToNextAttribute()) {
-            if ($this->namespaceURI) {
+            if ('' !== $this->namespaceURI) {
                 // Ignoring 'xmlns', it doesn't make any sense.
                 if ('http://www.w3.org/2000/xmlns/' === $this->namespaceURI) {
                     continue;
@@ -280,28 +290,22 @@ class Reader extends XMLReader
     public function getDeserializerForElementName(string $name): callable
     {
         if (!array_key_exists($name, $this->elementMap)) {
-            if ('{}' == substr($name, 0, 2) && array_key_exists(substr($name, 2), $this->elementMap)) {
+            if (str_starts_with($name, '{}') && array_key_exists(substr($name, 2), $this->elementMap)) {
                 $name = substr($name, 2);
             } else {
-                return ['Sabre\\Xml\\Element\\Base', 'xmlDeserialize'];
+                return Element\Base::xmlDeserialize(...);
             }
         }
 
         $deserializer = $this->elementMap[$name];
-        if (is_subclass_of($deserializer, 'Sabre\\Xml\\XmlDeserializable')) {
-            return [$deserializer, 'xmlDeserialize'];
-        }
-
         if (is_callable($deserializer)) {
             return $deserializer;
         }
 
-        $type = gettype($deserializer);
-        if ('string' === $type) {
-            $type .= ' ('.$deserializer.')';
-        } elseif ('object' === $type) {
-            $type .= ' ('.get_class($deserializer).')';
+        if (is_subclass_of($deserializer, XmlDeserializable::class)) {
+            return fn (Reader $reader) => $deserializer::xmlDeserialize($reader);
         }
-        throw new \LogicException('Could not use this type as a deserializer: '.$type.' for element: '.$name);
+
+        throw new \LogicException('Could not use this type as a deserializer: '.get_debug_type($deserializer).' for element: '.$name);
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
index 8d0330558..66685bf43 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Serializer/functions.php
@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace Sabre\Xml\Serializer;
 
-use InvalidArgumentException;
 use Sabre\Xml\Writer;
 use Sabre\Xml\XmlSerializable;
 
@@ -38,7 +37,7 @@ use Sabre\Xml\XmlSerializable;
  *
  * @param string[] $values
  */
-function enum(Writer $writer, array $values)
+function enum(Writer $writer, array $values): void
 {
     foreach ($values as $value) {
         $writer->writeElement($value);
@@ -48,15 +47,13 @@ function enum(Writer $writer, array $values)
 /**
  * The valueObject serializer turns a simple PHP object into a classname.
  *
- * Every public property will be encoded as an xml element with the same
+ * Every public property will be encoded as an XML element with the same
  * name, in the XML namespace as specified.
  *
  * Values that are set to null or an empty array are not serialized. To
  * serialize empty properties, you must specify them as an empty string.
- *
- * @param object $valueObject
  */
-function valueObject(Writer $writer, $valueObject, string $namespace)
+function valueObject(Writer $writer, object $valueObject, string $namespace): void
 {
     foreach (get_object_vars($valueObject) as $key => $val) {
         if (is_array($val)) {
@@ -71,28 +68,6 @@ function valueObject(Writer $writer, $valueObject, string $namespace)
     }
 }
 
-/**
- * This serializer helps you serialize xml structures that look like
- * this:.
- *
- * <collection>
- *    <item>...</item>
- *    <item>...</item>
- *    <item>...</item>
- * </collection>
- *
- * In that previous example, this serializer just serializes the item element,
- * and this could be called like this:
- *
- * repeatingElements($writer, $items, '{}item');
- */
-function repeatingElements(Writer $writer, array $items, string $childElementName)
-{
-    foreach ($items as $item) {
-        $writer->writeElement($childElementName, $item);
-    }
-}
-
 /**
  * This function is the 'default' serializer that is able to serialize most
  * things, and delegates to other serializers if needed.
@@ -104,7 +79,7 @@ function repeatingElements(Writer $writer, array $items, string $childElementNam
  *    calls it's xmlSerialize() method.
  * $value may be a PHP callback/function/closure, in case we call the callback
  *    and give it the Writer as an argument.
- * $value may be a an object, and if it's in the classMap we automatically call
+ * $value may be an object, and if it's in the classMap we automatically call
  *    the correct serializer for it.
  * $value may be null, in which case we do nothing.
  *
@@ -148,9 +123,9 @@ function repeatingElements(Writer $writer, array $items, string $childElementNam
  *
  * You can even mix the two array syntaxes.
  *
- * @param string|int|float|bool|array|object $value
+ * @param string|int|float|bool|array<int|string, mixed>|object|null $value
  */
-function standardSerializer(Writer $writer, $value)
+function standardSerializer(Writer $writer, $value): void
 {
     if (is_scalar($value)) {
         // String, integer, float, boolean
@@ -158,9 +133,9 @@ function standardSerializer(Writer $writer, $value)
     } elseif ($value instanceof XmlSerializable) {
         // XmlSerializable classes or Element classes.
         $value->xmlSerialize($writer);
-    } elseif (is_object($value) && isset($writer->classMap[get_class($value)])) {
+    } elseif (is_object($value) && isset($writer->classMap[$value::class])) {
         // It's an object which class appears in the classmap.
-        $writer->classMap[get_class($value)]($writer, $value);
+        $writer->classMap[$value::class]($writer, $value);
     } elseif (is_callable($value)) {
         // A callback
         $value($writer);
@@ -169,8 +144,8 @@ function standardSerializer(Writer $writer, $value)
         // describes a 'name' and optionally 'attributes' and 'value'.
 
         $name = $value['name'];
-        $attributes = isset($value['attributes']) ? $value['attributes'] : [];
-        $value = isset($value['value']) ? $value['value'] : null;
+        $attributes = $value['attributes'] ?? [];
+        $value = $value['value'] ?? null;
 
         $writer->startElement($name);
         $writer->writeAttributes($attributes);
@@ -182,7 +157,7 @@ function standardSerializer(Writer $writer, $value)
                 // This item has a numeric index. We just loop through the
                 // array and throw it back in the writer.
                 standardSerializer($writer, $item);
-            } elseif (is_string($name) && is_array($item) && isset($item['attributes'])) {
+            } elseif (is_array($item) && isset($item['attributes'])) {
                 // The key is used for a name, but $item has 'attributes' and
                 // possibly 'value'
                 $writer->startElement($name);
@@ -197,12 +172,12 @@ function standardSerializer(Writer $writer, $value)
                 $writer->write($item);
                 $writer->endElement();
             } else {
-                throw new InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.gettype($name));
+                throw new \InvalidArgumentException('The writer does not know how to serialize arrays with keys of type: '.get_debug_type($name));
             }
         }
     } elseif (is_object($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize objects of class: '.get_class($value));
+        throw new \InvalidArgumentException('The writer cannot serialize objects of class: '.$value::class);
     } elseif (!is_null($value)) {
-        throw new InvalidArgumentException('The writer cannot serialize values of type: '.gettype($value));
+        throw new \InvalidArgumentException('The writer cannot serialize values of type: '.get_debug_type($value));
     }
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
index a8e34d254..1f1b3585b 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Service.php
@@ -26,9 +26,9 @@ class Service
      * Values may also be a callable. In that case the function will be called
      * directly.
      *
-     * @var array
+     * @phpstan-var array<string, class-string|callable|object>
      */
-    public $elementMap = [];
+    public array $elementMap = [];
 
     /**
      * This is a list of namespaces that you want to give default prefixes.
@@ -36,9 +36,9 @@ class Service
      * You must make sure you create this entire list before starting to write.
      * They should be registered on the root element.
      *
-     * @var array
+     * @phpstan-var array<string, class-string|string|null>
      */
-    public $namespaceMap = [];
+    public array $namespaceMap = [];
 
     /**
      * This is a list of custom serializers for specific classes.
@@ -46,7 +46,7 @@ class Service
      * The writer may use this if you attempt to serialize an object with a
      * class that does not implement XmlSerializable.
      *
-     * Instead it will look at this classmap to see if there is a custom
+     * Instead, it will look at this classmap to see if there is a custom
      * serializer here. This is useful if you don't want your value objects
      * to be responsible for serializing themselves.
      *
@@ -56,16 +56,14 @@ class Service
      *
      * function (Writer $writer, object $value)
      *
-     * @var array
+     * @phpstan-var array<class-string, callable(Writer, object):mixed>
      */
-    public $classMap = [];
+    public array $classMap = [];
 
     /**
      * A bitmask of the LIBXML_* constants.
-     *
-     * @var int
      */
-    public $options = 0;
+    public int $options = 0;
 
     /**
      * Returns a fresh XML Reader.
@@ -105,20 +103,27 @@ class Service
      *
      * @param string|resource $input
      *
-     * @throws ParseException
+     * @return array<string, mixed>|object|string
      *
-     * @return array|object|string
+     * @throws ParseException
      */
-    public function parse($input, string $contextUri = null, string &$rootElementName = null)
+    public function parse($input, ?string $contextUri = null, ?string &$rootElementName = null)
     {
-        if (is_resource($input)) {
+        if (!is_string($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            if (is_resource($input)) {
+                $input = (string) stream_get_contents($input);
+            } else {
+                // Input is not a string and not a resource.
+                // Therefore, it has to be a closed resource.
+                // Effectively empty input has been passed in.
+                $input = '';
+            }
         }
 
         // If input is empty, then it's safe to throw an exception
-        if (empty($input)) {
+        if ('' === $input) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
 
@@ -149,20 +154,27 @@ class Service
      * @param string|string[] $rootElementName
      * @param string|resource $input
      *
-     * @throws ParseException
+     * @return array<string, mixed>|object|string
      *
-     * @return array|object|string
+     * @throws ParseException
      */
-    public function expect($rootElementName, $input, string $contextUri = null)
+    public function expect($rootElementName, $input, ?string $contextUri = null)
     {
-        if (is_resource($input)) {
+        if (!is_string($input)) {
             // Unfortunately the XMLReader doesn't support streams. When it
             // does, we can optimize this.
-            $input = (string) stream_get_contents($input);
+            if (is_resource($input)) {
+                $input = (string) stream_get_contents($input);
+            } else {
+                // Input is not a string and not a resource.
+                // Therefore, it has to be a closed resource.
+                // Effectively empty input has been passed in.
+                $input = '';
+            }
         }
 
         // If input is empty, then it's safe to throw an exception
-        if (empty($input)) {
+        if ('' === $input) {
             throw new ParseException('The input element to parse is empty. Do not attempt to parse');
         }
 
@@ -200,11 +212,9 @@ class Service
      * This allows an implementor to easily create URI's relative to the root
      * of the domain.
      *
-     * @param string|array|object|XmlSerializable $value
-     *
-     * @return string
+     * @param string|array<int|string, mixed>|object|XmlSerializable $value
      */
-    public function write(string $rootElementName, $value, string $contextUri = null)
+    public function write(string $rootElementName, $value, ?string $contextUri = null): string
     {
         $w = $this->getWriter();
         $w->openMemory();
@@ -239,16 +249,18 @@ class Service
      * These can easily be mapped by calling:
      *
      * $service->mapValueObject('{http://example.org}author', 'Author');
+     *
+     * @param class-string $className
      */
-    public function mapValueObject(string $elementName, string $className)
+    public function mapValueObject(string $elementName, string $className): void
     {
-        list($namespace) = self::parseClarkNotation($elementName);
+        [$namespace] = self::parseClarkNotation($elementName);
 
-        $this->elementMap[$elementName] = function (Reader $reader) use ($className, $namespace) {
-            return \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace);
-        };
-        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace) {
-            return \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
+        require_once __DIR__ . '/Deserializer/functions.php';
+        $this->elementMap[$elementName] = (fn (Reader $reader) => \Sabre\Xml\Deserializer\valueObject($reader, $className, $namespace));
+        require_once __DIR__ . '/Serializer/functions.php';
+        $this->classMap[$className] = function (Writer $writer, $valueObject) use ($namespace): void {
+            \Sabre\Xml\Serializer\valueObject($writer, $valueObject, $namespace);
         };
         $this->valueObjectMap[$className] = $elementName;
     }
@@ -262,18 +274,16 @@ class Service
      * The ValueObject must have been previously registered using
      * mapValueObject().
      *
-     * @param object $object
-     *
      * @throws \InvalidArgumentException
      */
-    public function writeValueObject($object, string $contextUri = null)
+    public function writeValueObject(object $object, ?string $contextUri = null): string
     {
-        if (!isset($this->valueObjectMap[get_class($object)])) {
-            throw new \InvalidArgumentException('"'.get_class($object).'" is not a registered value object class. Register your class with mapValueObject.');
+        if (!isset($this->valueObjectMap[$object::class])) {
+            throw new \InvalidArgumentException('"'.$object::class.'" is not a registered value object class. Register your class with mapValueObject.');
         }
 
         return $this->write(
-            $this->valueObjectMap[get_class($object)],
+            $this->valueObjectMap[$object::class],
             $object,
             $contextUri
         );
@@ -285,6 +295,8 @@ class Service
      *
      * If the string was invalid, it will throw an InvalidArgumentException.
      *
+     * @return array{string, string}
+     *
      * @throws \InvalidArgumentException
      */
     public static function parseClarkNotation(string $str): array
@@ -292,7 +304,7 @@ class Service
         static $cache = [];
 
         if (!isset($cache[$str])) {
-            if (!preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
+            if (1 !== preg_match('/^{([^}]*)}(.*)$/', $str, $matches)) {
                 throw new \InvalidArgumentException('\''.$str.'\' is not a valid clark-notation formatted string');
             }
 
@@ -307,6 +319,8 @@ class Service
 
     /**
      * A list of classes and which XML elements they map to.
+     *
+     * @var array<class-string, string>
      */
-    protected $valueObjectMap = [];
+    protected array $valueObjectMap = [];
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
index 1144bf085..88f4128a5 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Version.php
@@ -16,5 +16,5 @@ class Version
     /**
      * Full version number.
      */
-    const VERSION = '2.2.5';
+    public const VERSION = '4.1.0';
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
index e3238a7ed..ed08eb216 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/Writer.php
@@ -30,7 +30,7 @@ use XMLWriter;
  * @author Evert Pot (http://evertpot.com/)
  * @license http://sabre.io/license/ Modified BSD License
  */
-class Writer extends XMLWriter
+class Writer extends \XMLWriter
 {
     use ContextStackTrait;
 
@@ -41,19 +41,17 @@ class Writer extends XMLWriter
      * time* they are used, but this array allows the writer to make sure that
      * the prefixes are consistent anyway.
      *
-     * @var array
+     * @var array<string, string>
      */
-    protected $adhocNamespaces = [];
+    protected array $adhocNamespaces = [];
 
     /**
      * When the first element is written, this flag is set to true.
      *
      * This ensures that the namespaces in the namespaces map are only written
      * once.
-     *
-     * @var bool
      */
-    protected $namespacesWritten = false;
+    protected bool $namespacesWritten = false;
 
     /**
      * Writes a value to the output stream.
@@ -94,17 +92,18 @@ class Writer extends XMLWriter
      *    ]
      * ]
      *
-     * @param mixed $value
+     * @param mixed $value PHP value to be written
      */
-    public function write($value)
+    public function write($value): void
     {
+        require_once __DIR__ . '/Serializer/functions.php';
         Serializer\standardSerializer($this, $value);
     }
 
     /**
      * Opens a new element.
      *
-     * You can either just use a local elementname, or you can use clark-
+     * You can either just use a local element name, or you can use clark-
      * notation to start a new element.
      *
      * Example:
@@ -117,17 +116,18 @@ class Writer extends XMLWriter
      *
      * Note: this function doesn't have the string typehint, because PHP's
      * XMLWriter::startElement doesn't either.
+     * From PHP 8.0 the typehint exists, so it can be added here after PHP 7.4 is dropped.
      *
      * @param string $name
      */
     public function startElement($name): bool
     {
         if ('{' === $name[0]) {
-            list($namespace, $localName) =
+            [$namespace, $localName] =
                 Service::parseClarkNotation($name);
 
             if (array_key_exists($namespace, $this->namespaceMap)) {
-                $result = $this->startElementNS(
+                $result = $this->startElementNs(
                     '' === $this->namespaceMap[$namespace] ? null : $this->namespaceMap[$namespace],
                     $localName,
                     null
@@ -135,14 +135,12 @@ class Writer extends XMLWriter
             } else {
                 // An empty namespace means it's the global namespace. This is
                 // allowed, but it mustn't get a prefix.
-                if ('' === $namespace || null === $namespace) {
+                if ('' === $namespace) {
                     $result = $this->startElement($localName);
                     $this->writeAttribute('xmlns', '');
                 } else {
-                    if (!isset($this->adhocNamespaces[$namespace])) {
-                        $this->adhocNamespaces[$namespace] = 'x'.(count($this->adhocNamespaces) + 1);
-                    }
-                    $result = $this->startElementNS($this->adhocNamespaces[$namespace], $localName, $namespace);
+                    $this->adhocNamespaces[$namespace] ??= 'x'.(count($this->adhocNamespaces) + 1);
+                    $result = $this->startElementNs($this->adhocNamespaces[$namespace], $localName, $namespace);
                 }
             }
         } else {
@@ -151,7 +149,7 @@ class Writer extends XMLWriter
 
         if (!$this->namespacesWritten) {
             foreach ($this->namespaceMap as $namespace => $prefix) {
-                $this->writeAttribute(($prefix ? 'xmlns:'.$prefix : 'xmlns'), $namespace);
+                $this->writeAttribute(is_string($prefix) && '' !== $prefix ? 'xmlns:'.$prefix : 'xmlns', $namespace);
             }
             $this->namespacesWritten = true;
         }
@@ -180,8 +178,10 @@ class Writer extends XMLWriter
      *
      * Note: this function doesn't have the string typehint, because PHP's
      * XMLWriter::startElement doesn't either.
+     * From PHP 8.0 the typehint exists, so it can be added here after PHP 7.4 is dropped.
      *
-     * @param array|string|object|null $content
+     * @param string                                      $name
+     * @param array<int|string, mixed>|string|object|null $content
      */
     public function writeElement($name, $content = null): bool
     {
@@ -202,8 +202,10 @@ class Writer extends XMLWriter
      * The key is an attribute name. If the key is a 'localName', the current
      * xml namespace is assumed. If it's a 'clark notation key', this namespace
      * will be used instead.
+     *
+     * @param array<string, string> $attributes
      */
-    public function writeAttributes(array $attributes)
+    public function writeAttributes(array $attributes): void
     {
         foreach ($attributes as $name => $value) {
             $this->writeAttribute($name, $value);
@@ -219,6 +221,7 @@ class Writer extends XMLWriter
      *
      * Note: this function doesn't have typehints, because for some reason
      * PHP's XMLWriter::writeAttribute doesn't either.
+     * From PHP 8.0 the typehint exists, so it can be added here after PHP 7.4 is dropped.
      *
      * @param string $name
      * @param string $value
@@ -231,7 +234,7 @@ class Writer extends XMLWriter
 
         list(
             $namespace,
-            $localName
+            $localName,
         ) = Service::parseClarkNotation($name);
 
         if (array_key_exists($namespace, $this->namespaceMap)) {
@@ -243,11 +246,9 @@ class Writer extends XMLWriter
         }
 
         // We don't know the namespace, we must add it in-line
-        if (!isset($this->adhocNamespaces[$namespace])) {
-            $this->adhocNamespaces[$namespace] = 'x'.(count($this->adhocNamespaces) + 1);
-        }
+        $this->adhocNamespaces[$namespace] ??= 'x'.(count($this->adhocNamespaces) + 1);
 
-        return $this->writeAttributeNS(
+        return $this->writeAttributeNs(
             $this->adhocNamespaces[$namespace],
             $localName,
             $namespace,
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlDeserializable.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlDeserializable.php
index 83f33db1e..56448d17d 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlDeserializable.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlDeserializable.php
@@ -32,7 +32,7 @@ interface XmlDeserializable
      * $reader->parseInnerTree() will parse the entire sub-tree, and advance to
      * the next element.
      *
-     * @return mixed
+     * @return mixed see comments above
      */
     public static function xmlDeserialize(Reader $reader);
 }
diff --git a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlSerializable.php b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlSerializable.php
index 2affc33f1..4cd4e7f20 100644
--- a/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlSerializable.php
+++ b/snappymail/v/0.0.0/app/libraries/Sabre/Xml/XmlSerializable.php
@@ -30,5 +30,5 @@ interface XmlSerializable
      *
      * If you are opening new elements, you must also close them again.
      */
-    public function xmlSerialize(Writer $writer);
+    public function xmlSerialize(Writer $writer): void;
 }
diff --git a/plugins/ckeditor/src/plugins/quicktable/LICENSE b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/LICENSE
similarity index 98%
rename from plugins/ckeditor/src/plugins/quicktable/LICENSE
rename to snappymail/v/0.0.0/app/libraries/TNEFDecoder/LICENSE
index 22fbe5dba..d159169d1 100644
--- a/plugins/ckeditor/src/plugins/quicktable/LICENSE
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/LICENSE
@@ -1,7 +1,7 @@
-GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
@@ -290,8 +290,8 @@ to attach them to the start of each source file to most effectively
 convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
-    {description}
-    Copyright (C) {year}  {fullname}
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -329,11 +329,11 @@ necessary.  Here is a sample; alter the names:
   Yoyodyne, Inc., hereby disclaims all copyright interest in the program
   `Gnomovision' (which makes passes at compilers) written by James Hacker.
 
-  {signature of Ty Coon}, 1 April 1989
+  <signature of Ty Coon>, 1 April 1989
   Ty Coon, President of Vice
 
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
 library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
\ No newline at end of file
+Public License instead of this License.
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFAttachment.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFAttachment.php
new file mode 100644
index 000000000..973854786
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFAttachment.php
@@ -0,0 +1,334 @@
+<?php
+
+namespace TNEFDecoder;
+
+require 'constants.php';
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+function tnef_log($string)
+{
+	echo $string . "\n";
+//	\error_log($string . "\n", 3, '/tmp/squirrelmail_tnef_decoder.log');
+//	\SnappyMail\Log::debug('TNEF', $string);
+}
+
+class TNEFAttachment
+{
+
+	public bool $debug;
+	public bool $validateChecksum;
+	public TNEFMailinfo $mailinfo;
+	public array
+		$files = [],
+		$attachments = [],
+		$body = [];
+	public ?array $files_nested = null;
+	public ?TNEFFile $current_receiver = null;
+
+	public function __construct(bool $debug = false, bool $validateChecksum = false)
+	{
+		$this->debug = $debug;
+		$this->validateChecksum = $validateChecksum;
+		$this->mailinfo = new TNEFMailinfo();
+	}
+
+	/**
+	 * @return TNEFFileBase[]
+	 */
+	public function &getFiles(): array
+	{
+		return $this->files;
+	}
+
+	/**
+	 * @return TNEFFileBase[]
+	 */
+	public function &getFilesNested(): array
+	{
+		if (null === $this->files_nested) {
+			$this->files_nested = array();
+			$this->addFilesNested($this->files);
+			foreach ($this->attachments as $attachment) {
+				$this->addFilesNested($attachment->getFilesNested());
+			}
+		}
+		return $this->files_nested;
+	}
+
+	private function addFilesNested(array &$add): void
+	{
+		foreach ($add as $file) {
+			$this->files_nested[] = &$file;
+		}
+	}
+
+	public function getAttachments(): array
+	{
+		return $this->attachments;
+	}
+
+	public function getMailinfo(): TNEFMailinfo
+	{
+		return $this->mailinfo;
+	}
+
+	public function getBodyElements(): array
+	{
+		return $this->body;
+	}
+
+	public function decodeTnef($data): void
+	{
+		$buffer = new TNEFBuffer($data);
+
+		$tnef_signature = $buffer->geti32();
+		if (TNEF_SIGNATURE == $tnef_signature) {
+			$tnef_key = $buffer->geti16();
+			$this->debug && tnef_log(\sprintf("Signature: 0x%08x\nKey: 0x%04x\n", $tnef_signature, $tnef_key));
+
+			while ($buffer->getRemainingBytes() > 0) {
+				$lvl_type = $buffer->geti8();
+
+				switch ($lvl_type) {
+					case TNEF_LVL_MESSAGE:
+					case TNEF_LVL_ATTACHMENT:
+						$this->tnef_decode_attribute($buffer);
+						break;
+
+					default:
+						if ($this->debug) {
+							$len = $buffer->getRemainingBytes();
+							if ($len)
+								tnef_log("Invalid file format! Unknown Level {$lvl_type}. Rest={$len}");
+						}
+						break;
+				}
+			}
+		} else {
+			throw new \RuntimeException("TNEF: Invalid file format! Wrong signature.");
+		}
+
+		// propagate parent message's code page to child files if given
+		//
+		$code_page = $this->mailinfo->getCodePage();
+		if (!empty($code_page))
+			foreach ($this->files as $i => $file)
+				$this->files[$i]->setMessageCodePage($code_page);
+	}
+
+	private function tnef_decode_attribute(TNEFBuffer $buffer)
+	{
+		$attribute = $buffer->geti32();      // attribute if
+		$length = $buffer->geti32();         // length
+		$value = $buffer->getBytes($length); // data
+		$checksumAtt = $buffer->geti16();    // checksum
+		if ($value !== null && $this->validateChecksum) {
+			$checksum = \array_sum(\unpack('C*', $value)) & 0xFFFF;
+			if ($checksum !== $checksumAtt) {
+				throw new \Exception('Checksums do not match');
+			}
+		}
+
+		switch ($attribute)
+		{
+			case TNEF_ARENDDATA: // marks start of new attachment
+				$this->debug && tnef_log("Creating new File for Attachment");
+				$this->current_receiver = new TNEFFile($this->debug);
+				$this->files[] = $this->current_receiver;
+				break;
+
+			case TNEF_AMAPIATTRS:
+				$this->debug && tnef_log("mapi attrs");
+				$this->extract_mapi_attrs(new TNEFBuffer($value));
+				break;
+
+			case TNEF_AMAPIPROPS:
+				$this->debug && tnef_log("mapi props");
+				$this->extract_mapi_attrs(new TNEFBuffer($value));
+				break;
+
+			case TNEF_AMCLASS:
+				$value = substr($value, 0, $length - 1);
+				if ($value == 'IPM.Contact') {
+					$this->debug && tnef_log("Creating vCard Attachment");
+					$this->current_receiver = new TNEFvCard($this->debug);
+					$this->files[] = $this->current_receiver;
+				}
+				break;
+
+			default:
+				$this->mailinfo->receiveTnefAttribute($attribute, $value, $length);
+				if ($this->current_receiver)
+					$this->current_receiver->receiveTnefAttribute($attribute, $value, $length);
+				break;
+		}
+	}
+
+	private function extract_mapi_attrs(TNEFBuffer $buffer): void
+	{
+
+		$number = $buffer->geti32(); // number of attributes
+		$props = 0;
+		$ended = 0;
+
+		while (($buffer->getRemainingBytes() > 0) && ($props++ < $number) && !$ended) {
+			$value = '';
+			unset($named_id);
+			$length = 0;
+			$have_multivalue = false;
+			$num_multivalues = 1;
+			$attr_type = $buffer->geti16();
+			$attr_name = $buffer->geti16();
+
+			if (($attr_type & TNEF_MAPI_MV_FLAG) != 0) {
+				$this->debug && tnef_log("Multivalue Attribute found.");
+				$have_multivalue = true;
+				$attr_type = $attr_type & ~TNEF_MAPI_MV_FLAG;
+			}
+
+			// Named Attribute
+			if (($attr_name >= 0x8000) && ($attr_name < 0xFFFE)) {
+				$guid = $buffer->getBytes(16);
+				$named_type = $buffer->geti32();
+				switch ($named_type)
+				{
+					case TNEF_MAPI_NAMED_TYPE_ID:
+						$named_id = $buffer->geti32();
+						$attr_name = $named_id;
+						$this->debug && tnef_log(sprintf("Named Id='0x%04x'", $named_id));
+						break;
+
+					case TNEF_MAPI_NAMED_TYPE_STRING:
+						$attr_name = 0x9999; // dummy to identify strings
+						$idlen = $buffer->geti32();
+						$this->debug && tnef_log("idlen={$idlen}");
+						$buflen = $idlen + ((4 - ($idlen % 4)) % 4);  // pad to next 4 byte boundary
+						$this->debug && tnef_log("buflen={$buflen}");
+						$named_id = substr($buffer->getBytes($buflen), 0, $idlen );  // read and truncate to length
+						$this->debug && tnef_log("Named Id='{$named_id}'");
+						break;
+
+					default:
+						$this->debug && tnef_log(\sprintf("Unknown Named Type 0x%04x found", $named_type));
+						break;
+				}
+			}
+
+			if ($have_multivalue) {
+				$num_multivalues = $buffer->geti32();
+				$this->debug && tnef_log("Number of multivalues={$num_multivalues}");
+			}
+
+			switch ($attr_type)
+			{
+				case TNEF_MAPI_NULL:
+					break;
+
+				case TNEF_MAPI_SHORT:
+					$value = $buffer->geti16();
+					break;
+
+				case TNEF_MAPI_INT:
+				case TNEF_MAPI_BOOLEAN:
+					for ($cnt = 0; $cnt < $num_multivalues; $cnt++)
+						$value = $buffer->geti32();
+					break;
+
+				case TNEF_MAPI_FLOAT:
+				case TNEF_MAPI_ERROR:
+					$value = $buffer->getBytes(4);
+					break;
+
+				case TNEF_MAPI_DOUBLE:
+				case TNEF_MAPI_APPTIME:
+				case TNEF_MAPI_CURRENCY:
+				case TNEF_MAPI_INT8BYTE:
+				case TNEF_MAPI_SYSTIME:
+					$value = $buffer->getBytes(8);
+					break;
+
+				case TNEF_MAPI_CLSID:
+					$this->debug && tnef_log("What is a MAPI CLSID ????");
+					break;
+
+				case TNEF_MAPI_STRING:
+				case TNEF_MAPI_UNICODE_STRING:
+				case TNEF_MAPI_BINARY:
+				case TNEF_MAPI_OBJECT:
+					$num_vals = $have_multivalue ? $num_multivalues : $buffer->geti32();
+
+					if ($num_vals > 20) {
+						// A Sanity check.
+						$ended = 1;
+						$this->debug && tnef_log("Number of entries in String Attributes={$num_vals}. Aborting Mapi parsing.");
+					} else {
+						for ($cnt = 0; $cnt < $num_vals; ++$cnt) {
+							$length = $buffer->geti32();
+							$buflen = $length + ((4 - ($length % 4)) % 4); // pad to next 4 byte boundary
+							if ($attr_type == TNEF_MAPI_STRING)
+								$length -= 1;
+							$value = \substr($buffer->getBytes($buflen), 0, $length); // read and truncate to length
+						}
+					}
+					break;
+
+				default:
+					$this->debug && tnef_log("Unknown mapi attribute! {$attr_type}");
+					break;
+			}
+
+			switch ($attr_name)
+			{
+				case TNEF_MAPI_ATTACH_DATA:
+					$this->debug && tnef_log("MAPI Found nested attachment. Processing new one.");
+					$value = substr($value, 16); // skip the next 16 bytes (unknown data)
+					$att = new TNEFAttachment($this->debug, $this->validateChecksum);
+					$att->decodeTnef($value);
+					$this->attachments[] = $att;
+					$this->debug && tnef_log("MAPI Finished nested attachment. Continuing old one.");
+					break;
+
+				case TNEF_MAPI_RTF_COMPRESSED:
+					$this->debug && tnef_log("MAPI Found Compressed RTF Attachment.");
+					$this->files[] = new TNEFFileRTF($this->debug, $value);
+					break;
+				case TNEF_MAPI_BODY:
+				case TNEF_MAPI_BODY_HTML:
+					$result = [];
+					$result['type'] = 'text';
+					$result['subtype'] = $attr_name == TNEF_MAPI_BODY ? 'plain' : 'html';
+					$result['name'] = ('Untitled') . ($attr_name == TNEF_MAPI_BODY ? '.txt' : '.html');
+					$result['stream'] = $value;
+					$result['size'] = strlen($value);
+					$this->body[] = $result;
+					break;
+				default:
+					$this->mailinfo->receiveMapiAttribute($attr_type, $attr_name, $value, $length);
+					if ($this->current_receiver)
+						$this->current_receiver->receiveMapiAttribute($attr_type, $attr_name, $value, $length);
+					break;
+			}
+		}
+		if ($this->debug && $ended) {
+			$len = $buffer->getRemainingBytes();
+			for ($cnt = 0; $cnt < $len; ++$cnt) {
+				$ord = $buffer->geti8();
+				$char = $ord ? \chr($ord) : '';
+				tnef_log(\sprintf("Char Nr. %6d = 0x%02x = '%s'", $cnt, $ord, $char));
+			}
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFBuffer.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFBuffer.php
new file mode 100644
index 000000000..d4dded488
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFBuffer.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFBuffer
+{
+	private string $data;
+	private int $offset = 0;
+
+	public function __construct(string $data)
+	{
+		$this->data = $data;
+	}
+
+	public function getBytes(int $numBytes): ?string
+	{
+		if ($this->getRemainingBytes() < $numBytes) {
+			$this->offset = \strlen($this->data);
+			return null;
+		}
+
+		$this->offset += $numBytes;
+		return \substr($this->data, $this->offset - $numBytes, $numBytes);
+	}
+
+	public function getRemainingBytes(): int
+	{
+		return \strlen($this->data) - $this->offset;
+	}
+
+	public function geti8(): ?int
+	{
+		$bytes = $this->getBytes(1);
+		return (null === $bytes) ? null : \ord($bytes[0]);
+	}
+
+	public function geti16(): ?int
+	{
+		$bytes = $this->getBytes(2);
+		return (null === $bytes) ? null : \ord($bytes[0]) + (\ord($bytes[1]) << 8);
+	}
+
+	public function geti32(): ?int
+	{
+		$bytes = $this->getBytes(4);
+		return (null === $bytes) ? null
+			: \ord($bytes[0])
+			+ (\ord($bytes[1]) << 8)
+			+ (\ord($bytes[2]) << 16)
+			+ (\ord($bytes[3]) << 24);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFDate.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFDate.php
new file mode 100644
index 000000000..369f88a4c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFDate.php
@@ -0,0 +1,37 @@
+<?php namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFDate extends \DateTime
+{
+	public function __construct(string $datetime = "now", ?\DateTimeZone $timezone = null)
+	{
+		parent::__construct($datetime, new \DateTimeZone('UTC'));
+	}
+
+	public function setTnefBuffer(TNEFBuffer $buffer)
+	{
+		$this->setDate(
+			$buffer->geti16(), // year
+			$buffer->geti16(), // month
+			$buffer->geti16()  // day
+		);
+		$this->setTime(
+			$buffer->geti16(), // hour
+			$buffer->geti16(), // minute
+			$buffer->geti16()  // second
+		);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFile.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFile.php
new file mode 100644
index 000000000..2b96c56d0
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFile.php
@@ -0,0 +1,120 @@
+<?php
+
+namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFFile extends TNEFFileBase
+{
+
+	public string $metafile;
+
+	public function getMetafile()
+	{
+		return $this->metafile;
+	}
+
+	public function receiveTnefAttribute(int $attribute, string $value, int $length): void
+	{
+		switch ($attribute)
+		{
+
+			// filename
+			//
+			case TNEF_AFILENAME:
+				// strip path
+				//
+				if (($pos = \strrpos($value, '/')) !== FALSE)
+					$this->name = \substr($value, $pos + 1);
+				else
+					$this->name = $value;
+
+				// Strip trailing null bytes if present
+				$this->name = \trim($this->name);
+				break;
+			// code page
+			//
+			case TNEF_AOEMCODEPAGE:
+				$this->code_page = (new TNEFBuffer($value))->geti16();
+				break;
+
+			// the attachment itself
+			//
+			case TNEF_ATTACHDATA:
+				$this->content = $value;
+				break;
+
+			// a metafile
+			//
+			case TNEF_ATTACHMETAFILE:
+				$this->metafile = $value;
+				break;
+
+			case TNEF_AATTACHCREATEDATE:
+				$this->created = new TNEFDate();
+				$this->created->setTnefBuffer(new TNEFBuffer($value));
+
+			case TNEF_AATTACHMODDATE:
+				$this->modified = new TNEFDate();
+				$this->modified->setTnefBuffer(new TNEFBuffer($value));
+				break;
+		}
+	}
+
+	public function receiveMapiAttribute(int $attr_type, int $attr_name, string $value, int $length): void
+	{
+		switch ($attr_name)
+		{
+
+			// used in preference to AFILENAME value
+			//
+			case TNEF_MAPI_ATTACH_LONG_FILENAME:
+				// strip path
+				//
+				if (($pos = \strrpos($value, '/')) !== FALSE)
+					$this->name = \substr($value, $pos + 1);
+				else
+					$this->name = $value;
+
+				$this->name_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			// Is this ever set, and what is format?
+			//
+			case TNEF_MAPI_ATTACH_MIME_TAG:
+				$type0 = $type1 = '';
+				$mime_type = \explode('/', $value, 2);
+				if (!empty($mime_type[0]))
+					$type0 = $mime_type[0];
+				if (!empty($mime_type[1]))
+					$type1 = $mime_type[1];
+				$this->type = "{$type0}/{$type1}";
+				if (TNEF_MAPI_UNICODE_STRING === $attr_type) {
+					$this->type = \substr(\mb_convert_encoding($this->type, "UTF-8" , "UTF-16LE"), 0, -1);
+				}
+				break;
+
+			case TNEF_MAPI_ATTACH_EXTENSION:
+				$type = \SnappyMail\File\MimeType::fromFilename($value);
+				if ($type)
+					$this->type = $type;
+				break;
+		}
+	}
+
+}
+
+
+
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileBase.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileBase.php
new file mode 100644
index 000000000..6d36dede2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileBase.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFFileBase
+{
+	public bool $name_is_unicode = FALSE;
+	public string
+		$name = 'Untitled',
+		$code_page = '',
+		$message_code_page = '', // parent message's code page (the whole TNEF file)
+		$type = 'application/octet-stream',
+		$content = '';
+	public ?TNEFDate
+		$created = null,
+		$modified = null;
+	public bool $debug;
+
+	public function __construct(bool $debug)
+	{
+		$this->debug = $debug;
+	}
+
+	public function setMessageCodePage(string $code_page): void
+	{
+		$this->message_code_page = $code_page;
+	}
+
+	public function getCodePage(): string
+	{
+		return empty($this->code_page)
+			? $this->message_code_page
+			: $this->code_page;
+	}
+
+	public function getName(): string
+	{
+		return $this->name_is_unicode
+			? \substr(\mb_convert_encoding($this->name, "UTF-8" , "UTF-16LE"), 0, -1)
+			: $this->name;
+	}
+
+	public function getType(): string
+	{
+		return $this->type;
+	}
+
+	public function getSize(): int
+	{
+		return \strlen($this->content);
+	}
+
+	public function getCreated(): ?TNEFDate
+	{
+		return $this->created;
+	}
+
+	public function getModified(): ?TNEFDate
+	{
+		return $this->modified;
+	}
+
+	public function getContent(): string
+	{
+		return $this->content;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileRTF.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileRTF.php
new file mode 100644
index 000000000..e477390b5
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFFileRTF.php
@@ -0,0 +1,110 @@
+<?php namespace TNEFDecoder;
+
+/**
+ * SquirrelMail TNEF Decoder Plugin
+ *
+ * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+ * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+ * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+ *
+ * Licensed under the GNU GPL. For full terms see the file COPYING.
+ *
+ * @package plugins
+ * @subpackage tnef_decoder
+ *
+ */
+class TNEFFileRTF extends TNEFFileBase
+{
+	public string $name = 'EmbeddedRTF.rtf';
+	public string $type = 'application/rtf';
+	protected int $size = 0;
+	const MAX_DICT_SIZE = 4096;
+	const INIT_DICT_SIZE = 207;
+
+	public function __construct($debug, $data)
+	{
+		parent::__construct($debug);
+		$this->decode_crtf(new TNEFBuffer($data));
+	}
+
+	public function getSize(): int
+	{
+		return $this->size;
+	}
+
+	public function decode_crtf(TNEFBuffer $buffer)
+	{
+		$size_compressed = $buffer->geti32();
+		$this->size = $buffer->geti32();
+		$magic = $buffer->geti32();
+		$crc32 = $buffer->geti32();
+
+		$this->debug && tnef_log("CRTF: size comp={$size_compressed}, size={$this->size}");
+
+		$data = $buffer->getBytes($buffer->getRemainingBytes());
+
+		switch ($magic) {
+			case CRTF_COMPRESSED:
+				$this->uncompress($data);
+				break;
+
+			case CRTF_UNCOMPRESSED:
+				$this->content = $data;
+				break;
+
+			default:
+				$this->debug && tnef_log("Unknown Compressed RTF Format");
+				break;
+		}
+	}
+
+	public function uncompress($data)
+	{
+		$preload = "{\\rtf1\\ansi\\mac\\deff0\\deftab720{\\fonttbl;}{\\f0\\fnil \\froman \\fswiss \\fmodern \\fscript \\fdecor MS Sans SerifSymbolArialTimes New RomanCourier{\\colortbl\\red0\\green0\\blue0\n\r\\par \\pard\\plain\\f0\\fs20\\b\\i\\u\\tab\\tx";
+		$length_preload = \strlen($preload);
+		$init_dict = [];
+		for ($cnt = 0; $cnt < $length_preload; ++$cnt) {
+			$init_dict[$cnt] = $preload[$cnt];
+		}
+		$init_dict = \array_merge($init_dict, \array_fill(\count($init_dict), self::MAX_DICT_SIZE - $length_preload, ' '));
+		$write_offset = self::INIT_DICT_SIZE;
+		$this->content = '';
+		$end = false;
+		$in = 0;
+		$l = \strlen($data);
+		while (!$end) {
+			if ($in >= $l) {
+				break;
+			}
+			$control = \strrev(\str_pad(\decbin(\ord($data[$in++])), 8, 0, STR_PAD_LEFT));
+			for ($i = 0; $i < 8; ++$i) {
+				if ($control[$i] == '1') {
+					$token = \unpack("n", $data[$in++] . $data[$in++])[1];
+					$offset = ($token >> 4) & 0b111111111111;
+					$length = $token & 0b1111;
+					if ($write_offset == $offset) {
+						$end = true;
+						break;
+					}
+					$actual_length = $length + 2;
+					for ($step = 0; $step < $actual_length; ++$step) {
+						$read_offset = ($offset + $step) % self::MAX_DICT_SIZE;
+						$char = $init_dict[$read_offset];
+						$this->content .= $char;
+						$init_dict[$write_offset] = $char;
+						$write_offset = ($write_offset + 1) % self::MAX_DICT_SIZE;
+					}
+				} else {
+					if ($in >= $l) {
+						break;
+					}
+					$val = $data[$in++];
+					$this->content .= $val;
+					$init_dict[$write_offset] = $val;
+					$write_offset = ($write_offset + 1) % self::MAX_DICT_SIZE;
+				}
+			}
+		}
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFMailinfo.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFMailinfo.php
new file mode 100644
index 000000000..4b2e2537c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFMailinfo.php
@@ -0,0 +1,107 @@
+<?php namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFMailinfo
+{
+
+	public string
+		$subject = '',
+		$topic = '',
+		$from = '',
+		$from_name = '',
+		$code_page = '';
+	public ?TNEFDate $date_sent = null;
+	public bool
+		$topic_is_unicode = FALSE,
+		$from_is_unicode = FALSE,
+		$from_name_is_unicode = FALSE;
+
+	public function getTopic(): string
+	{
+		return $this->topic;
+	}
+
+	public function getSubject(): string
+	{
+		return $this->subject;
+	}
+
+	public function getFrom(): string
+	{
+		return $this->from;
+	}
+
+	public function getCodePage(): string
+	{
+		return $this->code_page;
+	}
+
+	public function getFromName(): string
+	{
+		return $this->from_name;
+	}
+
+	public function getDateSent(): TNEFDate
+	{
+		return $this->date_sent;
+	}
+
+	public function receiveTnefAttribute(int $attribute, string $value, int $length): void
+	{
+		$value = new TNEFBuffer($value);
+
+		switch ($attribute)
+		{
+			case TNEF_AOEMCODEPAGE:
+				$this->code_page = $value->geti16();
+				break;
+
+			case TNEF_ASUBJECT:
+				$this->subject = $value->getBytes($length - 1);
+				break;
+
+			case TNEF_ADATERECEIVED:
+				if ($this->date_sent) {
+					break;
+				}
+			case TNEF_ADATESENT:
+				$this->date_sent = new TNEFDate();
+				$this->date_sent->setTnefBuffer($value);
+		}
+	}
+
+	public function receiveMapiAttribute(int $attr_type, int $attr_name, string $value, int $length): void
+	{
+		switch ($attr_name)
+		{
+			case TNEF_MAPI_CONVERSATION_TOPIC:
+				$this->topic = $value;
+				$this->topic_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_SENT_REP_EMAIL_ADDR:
+				$this->from = $value;
+				$this->from_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_SENT_REP_NAME:
+				$this->from_name = $value;
+				$this->from_name_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+		}
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFvCard.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFvCard.php
new file mode 100644
index 000000000..546c83710
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/TNEFvCard.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+class TNEFvCard extends TNEFFileBase
+{
+	public string $type = 'text/x-vcard';
+
+	public bool
+		$surname_is_unicode = FALSE,
+		$given_name_is_unicode = FALSE,
+		$middle_name_is_unicode = FALSE,
+		$nickname_is_unicode = FALSE,
+		$company_is_unicode = FALSE;
+	public string
+		$surname,
+		$given_name,
+		$middle_name,
+		$nickname,
+		$company,
+		$metafile;
+	public array
+		$homepages = [],
+		$addresses = [],
+		$emails = [],
+		$telefones = [];
+
+	private static
+		$address_mapping = array (
+			TNEF_MAPI_LOCALTY            => array ("Address", ADDRESS_CITY),
+			TNEF_MAPI_COUNTRY            => array ("Address", ADDRESS_COUNTRY),
+			TNEF_MAPI_POSTAL_CODE        => array ("Address", ADDRESS_ZIP),
+			TNEF_MAPI_STATE_OR_PROVINCE  => array ("Address", ADDRESS_STATE),
+			TNEF_MAPI_STREET_ADDRESS     => array ("Address", ADDRESS_STREET),
+			TNEF_MAPI_POST_OFFICE_BOX    => array ("Address", ADDRESS_PO_BOX),
+			TNEF_MAPI_HOME_ADDR_CITY     => array ("Home Address", ADDRESS_CITY),
+			TNEF_MAPI_HOME_ADDR_COUNTRY  => array ("Home Address", ADDRESS_COUNTRY),
+			TNEF_MAPI_HOME_ADDR_ZIP      => array ("Home Address", ADDRESS_ZIP),
+			TNEF_MAPI_HOME_ADDR_STATE    => array ("Home Address", ADDRESS_STATE),
+			TNEF_MAPI_HOME_ADDR_STREET   => array ("Home Address", ADDRESS_STREET),
+			TNEF_MAPI_HOME_ADDR_PO_BOX   => array ("Home Address", ADDRESS_PO_BOX),
+			TNEF_MAPI_OTHER_ADDR_CITY    => array ("Other Address", ADDRESS_CITY),
+			TNEF_MAPI_OTHER_ADDR_COUNTRY => array ("Other Address", ADDRESS_COUNTRY),
+			TNEF_MAPI_OTHER_ADDR_ZIP     => array ("Other Address", ADDRESS_ZIP),
+			TNEF_MAPI_OTHER_ADDR_STATE   => array ("Other Address", ADDRESS_STATE),
+			TNEF_MAPI_OTHER_ADDR_STREET  => array ("Other Address", ADDRESS_STREET),
+			TNEF_MAPI_OTHER_ADDR_PO_BOX  => array ("Other Address", ADDRESS_PO_BOX),
+		),
+		$email_mapping = array (
+			TNEF_MAPI_EMAIL1_DISPLAY     => array ("Email 1", EMAIL_DISPLAY),
+			TNEF_MAPI_EMAIL1_TRANSPORT   => array ("Email 1", EMAIL_TRANSPORT),
+			TNEF_MAPI_EMAIL1_EMAIL       => array ("Email 1", EMAIL_EMAIL),
+			TNEF_MAPI_EMAIL1_EMAIL2      => array ("Email 1", EMAIL_EMAIL2),
+			TNEF_MAPI_EMAIL2_DISPLAY     => array ("Email 2", EMAIL_DISPLAY),
+			TNEF_MAPI_EMAIL2_TRANSPORT   => array ("Email 2", EMAIL_TRANSPORT),
+			TNEF_MAPI_EMAIL2_EMAIL       => array ("Email 2", EMAIL_EMAIL),
+			TNEF_MAPI_EMAIL2_EMAIL2      => array ("Email 2", EMAIL_EMAIL2),
+			TNEF_MAPI_EMAIL3_DISPLAY     => array ("Email 3", EMAIL_DISPLAY),
+			TNEF_MAPI_EMAIL3_TRANSPORT   => array ("Email 3", EMAIL_TRANSPORT),
+			TNEF_MAPI_EMAIL3_EMAIL       => array ("Email 3", EMAIL_EMAIL),
+			TNEF_MAPI_EMAIL3_EMAIL2      => array ("Email 3", EMAIL_EMAIL2),
+		),
+		$homepage_mapping = array (
+			TNEF_MAPI_PERSONAL_HOME_PAGE => "Personal Homepage",
+			TNEF_MAPI_BUSINESS_HOME_PAGE => "Business Homepage",
+			TNEF_MAPI_OTHER_HOME_PAGE    => "Other Homepage",
+		),
+		$telefone_mapping = array (
+			TNEF_MAPI_PRIMARY_TEL_NUMBER   => "Primary Telefone",
+			TNEF_MAPI_HOME_TEL_NUMBER      => "Home Telefone",
+			TNEF_MAPI_HOME2_TEL_NUMBER     => "Home2 Telefone",
+			TNEF_MAPI_BUSINESS_TEL_NUMBER  => "Business Telefone",
+			TNEF_MAPI_BUSINESS2_TEL_NUMBER => "Business2 Telefone",
+			TNEF_MAPI_MOBILE_TEL_NUMBER    => "Mobile Telefone",
+			TNEF_MAPI_RADIO_TEL_NUMBER     => "Radio Telefone",
+			TNEF_MAPI_CAR_TEL_NUMBER       => "Car Telefone",
+			TNEF_MAPI_OTHER_TEL_NUMBER     => "Other Telefone",
+			TNEF_MAPI_PAGER_TEL_NUMBER     => "Pager Telefone",
+			TNEF_MAPI_PRIMARY_FAX_NUMBER   => "Primary Fax",
+			TNEF_MAPI_BUSINESS_FAX_NUMBER  => "Business Fax",
+			TNEF_MAPI_HOME_FAX_NUMBER      => "Home Fax",
+		);
+
+	public function getSurname(): string
+	{
+		return $this->surname;
+	}
+
+	public function getGivenName(): string
+	{
+		return $this->given_name;
+	}
+
+	public function getMiddleName(): string
+	{
+		return $this->middle_name;
+	}
+
+	public function getNickname(): string
+	{
+		return $this->nickname;
+	}
+
+	public function getCompany(): string
+	{
+		return $this->company;
+	}
+
+	public function getAddresses(): array
+	{
+		return $this->addresses;
+	}
+
+	public function getMetafile()
+	{
+		return $this->metafile;
+	}
+
+	public function getTelefones(): array
+	{
+		return $this->telefones;
+	}
+
+	public function getHomepages(): array
+	{
+		return $this->homepages;
+	}
+
+	public function getEmails(): array
+	{
+		return $this->emails;
+	}
+
+	public function receiveTnefAttribute(int $attribute, string $value, int $length): void
+	{
+		switch ($attribute)
+		{
+			// code page
+			//
+			case TNEF_AOEMCODEPAGE:
+				$this->code_page = (new TNEFBuffer($value))->geti16();
+				break;
+		}
+	}
+
+	public function receiveMapiAttribute(int $attr_type, int $attr_name, string $value, int $length)
+	{
+		switch ($attr_name)
+		{
+			case TNEF_MAPI_DISPLAY_NAME:
+				$this->name = $value;
+				$this->name_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_SURNAME:
+				$this->surname = $value;
+				$this->surname_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_GIVEN_NAME:
+				$this->given_name = $value;
+				$this->given_name_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_MIDDLE_NAME:
+				$this->middle_name = $value;
+				$this->middle_name_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_NICKNAME:
+				$this->nickname = $value;
+				$this->nickname_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			case TNEF_MAPI_COMPANY_NAME:
+				$this->company = $value;
+				$this->company_is_unicode = TNEF_MAPI_UNICODE_STRING === $attr_type;
+				break;
+
+			default:
+				$this->evaluateTelefoneAttribute($attr_type, $attr_name, $value, $length)
+				|| $this->evaluateEmailAttribute($attr_type, $attr_name, $value, $length)
+				|| $this->evaluateAddressAttribute($attr_type, $attr_name, $value, $length)
+				|| $this->evaluateHomepageAttribute($attr_type, $attr_name, $value, $length);
+				break;
+		}
+	}
+
+	private function evaluateTelefoneAttribute(int $attr_type, int $attr_name, string $value, int $length): bool
+	{
+		if ($length && \array_key_exists($attr_name, static::$telefone_mapping)) {
+			$telefone_key = static::$telefone_mapping[$attr_name];
+			$this->telefones[$telefone_key] = $value;
+			$this->debug && tnef_log("Setting telefone '{$telefone_key}' to value '{$value}'");
+			return true;
+		}
+		return false;
+	}
+
+	private function evaluateEmailAttribute(int $attr_type, int $attr_name, string $value, int $length): bool
+	{
+		if ($length && \array_key_exists($attr_name, static::$email_mapping)) {
+			$email_key = static::$email_mapping[$attr_name];
+			if (!\array_key_exists($email_key[0], $this->emails))
+				$this->emails[$email_key[0]] = array(EMAIL_DISPLAY => "", EMAIL_TRANSPORT => "", EMAIL_EMAIL => "", EMAIL_EMAIL2 => "");
+			$this->emails[$email_key[0]][$email_key[1]] = $value;
+			return true;
+		}
+		return false;
+	}
+
+	private function evaluateAddressAttribute(int $attr_type, int $attr_name, string $value, int $length): bool
+	{
+		if ($length && \array_key_exists($attr_name, static::$address_mapping)) {
+			$address_key = static::$address_mapping[$attr_name];
+			if (!\array_key_exists($address_key[0], $this->addresses))
+				$this->addresses[$address_key[0]] = array();
+			$this->addresses[$address_key[0]][$address_key[1]] = $value;
+			return true;
+		}
+		return false;
+	}
+
+	private function evaluateHomepageAttribute(int $attr_type, int $attr_name, string $value, int $length): bool
+	{
+		if ($length && \array_key_exists($attr_name, static::$homepage_mapping)) {
+			$homepage_key = static::$homepage_mapping[$attr_name];
+			$this->homepages[$homepage_key] = $value;
+			$this->debug && tnef_log("Setting homepage '{$homepage_key}' to value '{$value}'");
+			return true;
+		}
+		return false;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/TNEFDecoder/constants.php b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/constants.php
new file mode 100644
index 000000000..13f73f284
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/TNEFDecoder/constants.php
@@ -0,0 +1,202 @@
+<?php
+
+namespace TNEFDecoder;
+
+/**
+  * SquirrelMail TNEF Decoder Plugin
+  *
+  * Copyright (c) 2010- Paul Lesniewski <paul@squirrelmail.org>
+  * Copyright (c) 2003  Bernd Wiegmann <bernd@wib-software.de>
+  * Copyright (c) 2002  Graham Norburys <gnorbury@bondcar.com>
+  *
+  * Licensed under the GNU GPL. For full terms see the file COPYING.
+  *
+  * @package plugins
+  * @subpackage tnef_decoder
+  *
+  */
+
+define("TNEF_SIGNATURE",      0x223e9f78);
+define("TNEF_LVL_MESSAGE",    0x01);
+define("TNEF_LVL_ATTACHMENT", 0x02);
+
+define("TNEF_TRIPLES", 0x00000000);
+define("TNEF_STRING",  0x00010000);
+define("TNEF_TEXT",    0x00020000);
+define("TNEF_DATE",    0x00030000);
+define("TNEF_SHORT",   0x00040000);
+define("TNEF_LONG",    0x00050000);
+define("TNEF_BYTE",    0x00060000);
+define("TNEF_WORD",    0x00070000);
+define("TNEF_DWORD",   0x00080000);
+define("TNEF_MAX",     0x00090000);
+
+define("TNEF_AIDOWNER",          TNEF_LONG    | 0x0008);
+define("TNEF_AREQUESTRES",       TNEF_SHORT   | 0x0009);
+define("TNEF_AFROM",             TNEF_TRIPLES | 0x8000);
+define("TNEF_ASUBJECT",          TNEF_STRING  | 0x8004);
+define("TNEF_ADATESENT",         TNEF_DATE    | 0x8005);
+define("TNEF_ADATERECEIVED",     TNEF_DATE    | 0x8006);
+define("TNEF_ASTATUS",           TNEF_BYTE    | 0x8007);
+define("TNEF_AMCLASS",           TNEF_WORD    | 0x8008);
+define("TNEF_AMESSAGEID",        TNEF_STRING  | 0x8009);
+define("TNEF_ABODYTEXT",         TNEF_TEXT    | 0x800c);
+define("TNEF_APRIORITY",         TNEF_SHORT   | 0x800d);
+define("TNEF_ATTACHDATA",        TNEF_BYTE    | 0x800f);
+define("TNEF_AFILENAME",         TNEF_STRING  | 0x8010);
+define("TNEF_ATTACHMETAFILE",    TNEF_BYTE    | 0x8011);
+define("TNEF_AATTACHCREATEDATE", TNEF_DATE    | 0x8012);
+define("TNEF_AATTACHMODDATE",    TNEF_DATE    | 0x8013);
+define("TNEF_ADATEMODIFIED",     TNEF_DATE    | 0x8020);
+define("TNEF_ARENDDATA",         TNEF_BYTE    | 0x9002);
+define("TNEF_AMAPIPROPS",        TNEF_BYTE    | 0x9003);
+define("TNEF_AMAPIATTRS",        TNEF_BYTE    | 0x9005);
+define("TNEF_AVERSION",          TNEF_DWORD   | 0x9006);
+define("TNEF_AOEMCODEPAGE",      TNEF_BYTE    | 0x9007);
+
+define("TNEF_MAPI_NULL",           0x0001);
+define("TNEF_MAPI_SHORT",          0x0002);
+define("TNEF_MAPI_INT",            0x0003);
+define("TNEF_MAPI_FLOAT",          0x0004);
+define("TNEF_MAPI_DOUBLE",         0x0005);
+define("TNEF_MAPI_CURRENCY",       0x0006);
+define("TNEF_MAPI_APPTIME",        0x0007);
+define("TNEF_MAPI_ERROR",          0x000a);
+define("TNEF_MAPI_BOOLEAN",        0x000b);
+define("TNEF_MAPI_OBJECT",         0x000d);
+define("TNEF_MAPI_INT8BYTE",       0x0014);
+define("TNEF_MAPI_STRING",         0x001e);
+define("TNEF_MAPI_UNICODE_STRING", 0x001f);
+define("TNEF_MAPI_SYSTIME", 0x0040);
+define("TNEF_MAPI_CLSID", 0x0048);
+define("TNEF_MAPI_BINARY", 0x0102);
+
+define("TNEF_MAPI_MV_FLAG", 0x1000);
+define("TNEF_MAPI_NAMED_TYPE_ID", 0x0000);
+define("TNEF_MAPI_NAMED_TYPE_STRING", 0x0001);
+
+define("TNEF_MAPI_SUBJECT_PREFIX", 0x003D);
+define("TNEF_MAPI_SENT_REP_NAME", 0x0042);
+define("TNEF_MAPI_ORIGINAL_AUTHOR", 0x004D);
+define("TNEF_MAPI_SENT_REP_ADDRTYPE", 0x0064);
+define("TNEF_MAPI_SENT_REP_EMAIL_ADDR", 0x0065);
+define("TNEF_MAPI_CONVERSATION_TOPIC", 0x0070);
+define("TNEF_MAPI_SENDER_NAME", 0x0c1A);
+define("TNEF_MAPI_SENDER_ADDRTYPE", 0x0c1E);
+define("TNEF_MAPI_SENDER_EMAIL_ADDRESS", 0x0c1F);
+define("TNEF_MAPI_NORMALIZED_SUBJECT", 0x0E1D);
+define("TNEF_MAPI_ATTACH_SIZE", 0x0E20);
+define("TNEF_MAPI_ATTACH_NUM", 0x0E21);
+define("TNEF_MAPI_ACCESS_LEVEL", 0x0FF7);
+define("TNEF_MAPI_MAPPING_SIGNATURE", 0x0FF8);
+define("TNEF_MAPI_RECORD_KEY", 0x0FF9);
+define("TNEF_MAPI_STORE_RECORD_KEY", 0x0FFA);
+define("TNEF_MAPI_STORE_ENTRY_ID", 0x0FFB);
+define("TNEF_MAPI_OBJECT_TYPE", 0x0FFE);
+define("TNEF_MAPI_BODY", 0x1000);
+define("TNEF_MAPI_RTF_SYNC_BODY_TAG", 0x1008);
+define("TNEF_MAPI_RTF_COMPRESSED", 0x1009);
+define("TNEF_MAPI_BODY_HTML", 0x1013);
+define("TNEF_MAPI_NATIVE_BODY", 0x1016);
+define("TNEF_MAPI_DISPLAY_NAME", 0x3001);
+define("TNEF_MAPI_CREATION_TIME", 0x3007);
+define("TNEF_MAPI_MODIFICATION_TIME", 0x3008);
+define("TNEF_MAPI_ATTACH_DATA", 0x3701);
+define("TNEF_MAPI_ATTACH_ENCODING", 0x3702);
+define("TNEF_MAPI_ATTACH_EXTENSION", 0x3703);
+define("TNEF_MAPI_ATTACH_METHOD", 0x3705);
+define("TNEF_MAPI_ATTACH_LONG_FILENAME", 0x3707);
+define("TNEF_MAPI_RENDERING_POSITION", 0x370B);
+define("TNEF_MAPI_ATTACH_MIME_TAG", 0x370E);
+define("TNEF_MAPI_ACCOUNT", 0x3A00);
+define("TNEF_MAPI_GENERATION", 0x3A05);
+define("TNEF_MAPI_GIVEN_NAME", 0x3A06);
+define("TNEF_MAPI_BUSINESS_TEL_NUMBER", 0x3A08);
+define("TNEF_MAPI_HOME_TEL_NUMBER", 0x3A09);
+define("TNEF_MAPI_INITIALS", 0x3A0A);
+define("TNEF_MAPI_KEYWORDS", 0x3A0B);
+define("TNEF_MAPI_LANGUAGE", 0x3A0C);
+define("TNEF_MAPI_LOCATION", 0x3A0D);
+define("TNEF_MAPI_SURNAME", 0x3A11);
+define("TNEF_MAPI_POSTAL_ADDRESS", 0x3A15);
+define("TNEF_MAPI_COMPANY_NAME", 0x3A16);
+define("TNEF_MAPI_TITLE", 0x3A17);
+define("TNEF_MAPI_DEPARTMENT_NAME", 0x3A18);
+define("TNEF_MAPI_OFFICE_LOCATION", 0x3A19);
+define("TNEF_MAPI_PRIMARY_TEL_NUMBER", 0x3A1A);
+define("TNEF_MAPI_BUSINESS2_TEL_NUMBER", 0x3A1B);
+define("TNEF_MAPI_MOBILE_TEL_NUMBER", 0x3A1C);
+define("TNEF_MAPI_RADIO_TEL_NUMBER", 0x3A1D);
+define("TNEF_MAPI_CAR_TEL_NUMBER", 0x3A1E);
+define("TNEF_MAPI_OTHER_TEL_NUMBER",     0x3A1F);
+define("TNEF_MAPI_PAGER_TEL_NUMBER",     0x3A21);
+define("TNEF_MAPI_PRIMARY_FAX_NUMBER",   0x3A23);
+define("TNEF_MAPI_BUSINESS_FAX_NUMBER",  0x3A24);
+define("TNEF_MAPI_HOME_FAX_NUMBER",      0x3A25);
+define("TNEF_MAPI_COUNTRY",              0x3A26);
+define("TNEF_MAPI_LOCALTY",              0x3A27);
+define("TNEF_MAPI_STATE_OR_PROVINCE",    0x3A28);
+define("TNEF_MAPI_STREET_ADDRESS",       0x3A29);
+define("TNEF_MAPI_POSTAL_CODE",          0x3A2A);
+define("TNEF_MAPI_POST_OFFICE_BOX",      0x3A2B);
+define("TNEF_MAPI_TELEX_NUMBER",         0x3A2C);
+define("TNEF_MAPI_ISDN_NUMBER",          0x3A2D);
+define("TNEF_MAPI_ASSISTANT_TEL_NUMBER", 0x3A2E);
+define("TNEF_MAPI_HOME2_TEL_NUMBER",     0x3A2F);
+define("TNEF_MAPI_ASSISTANT",            0x3A30);
+define("TNEF_MAPI_MIDDLE_NAME",          0x3A44);
+define("TNEF_MAPI_DISPLAYNAME_PREFIX",   0x3A45);
+define("TNEF_MAPI_PROFESSION",           0x3A46);
+define("TNEF_MAPI_SPOUSE_NAME",          0x3A48);
+define("TNEF_MAPI_MANAGER_NAME",         0x3A4E);
+define("TNEF_MAPI_NICKNAME",             0x3A4F);
+define("TNEF_MAPI_PERSONAL_HOME_PAGE",   0x3A50);
+define("TNEF_MAPI_BUSINESS_HOME_PAGE",   0x3A51);
+define("TNEF_MAPI_CONTACT_EMAIL_ADDR",   0x3A56);
+define("TNEF_MAPI_HOME_ADDR_CITY",       0x3A59);
+define("TNEF_MAPI_HOME_ADDR_COUNTRY",    0x3A5A);
+define("TNEF_MAPI_HOME_ADDR_ZIP",        0x3A5B);
+define("TNEF_MAPI_HOME_ADDR_STATE",      0x3A5C);
+define("TNEF_MAPI_HOME_ADDR_STREET",     0x3A5D);
+define("TNEF_MAPI_HOME_ADDR_PO_BOX",     0x3A5E);
+define("TNEF_MAPI_OTHER_ADDR_CITY",      0x3A5F);
+define("TNEF_MAPI_OTHER_ADDR_COUNTRY",   0x3A60);
+define("TNEF_MAPI_OTHER_ADDR_ZIP",       0x3A61);
+define("TNEF_MAPI_OTHER_ADDR_STATE",     0x3A62);
+define("TNEF_MAPI_OTHER_ADDR_STREET",    0x3A63);
+define("TNEF_MAPI_OTHER_ADDR_PO_BOX",    0x3A64);
+
+define("TNEF_MAPI_OTHER_HOME_PAGE",      0x804F);
+define("TNEF_MAPI_EMAIL1_DISPLAY",       0x8080);
+define("TNEF_MAPI_EMAIL1_TRANSPORT",     0x8082);
+define("TNEF_MAPI_EMAIL1_EMAIL",         0x8083);
+define("TNEF_MAPI_EMAIL1_EMAIL2",        0x8084);
+define("TNEF_MAPI_EMAIL2_DISPLAY",       0x8090);
+define("TNEF_MAPI_EMAIL2_TRANSPORT",     0x8092);
+define("TNEF_MAPI_EMAIL2_EMAIL",         0x8093);
+define("TNEF_MAPI_EMAIL2_EMAIL2",        0x8094);
+define("TNEF_MAPI_EMAIL3_DISPLAY",       0x80A0);
+define("TNEF_MAPI_EMAIL3_TRANSPORT",     0x80A2);
+define("TNEF_MAPI_EMAIL3_EMAIL",         0x80A3);
+define("TNEF_MAPI_EMAIL3_EMAIL2",        0x80A4);
+
+
+
+// used in RTF
+//
+define("CRTF_UNCOMPRESSED",          0x414c454d);
+define("CRTF_COMPRESSED",            0x75465a4c);
+
+
+// used in VCARD
+//
+define ("EMAIL_DISPLAY",       1);
+define ("EMAIL_TRANSPORT",     2);
+define ("EMAIL_EMAIL",         3);
+define ("EMAIL_EMAIL2",        4);
+define ("ADDRESS_STREET",      "Street");
+define ("ADDRESS_ZIP",         "Zip");
+define ("ADDRESS_CITY",        "City");
+define ("ADDRESS_COUNTRY",     "Country");
+define ("ADDRESS_STATE",       "State");
+define ("ADDRESS_PO_BOX",      "PO Box");
diff --git a/snappymail/v/0.0.0/app/libraries/lessphp/lessc.php b/snappymail/v/0.0.0/app/libraries/lessphp/lessc.php
index 9e3e04bcc..4b27bc70b 100644
--- a/snappymail/v/0.0.0/app/libraries/lessphp/lessc.php
+++ b/snappymail/v/0.0.0/app/libraries/lessphp/lessc.php
@@ -2,9 +2,6 @@
 
 namespace LessPHP;
 
-class stdClass extends \stdClass {};
-class Exception extends \Exception {};
-
 /**
  * lessphp v0.3.9-sm
  * http://leafo.net/lessphp
@@ -1480,7 +1477,7 @@ class lessc {
 	/* environment functions */
 
 	protected function makeOutputBlock($type, $selectors = null) {
-		$b = new stdclass;
+		$b = new \stdClass;
 		$b->lines = array();
 		$b->children = array();
 		$b->selectors = $selectors;
@@ -1491,7 +1488,7 @@ class lessc {
 
 	// the state of execution
 	protected function pushEnv($block = null) {
-		$e = new stdclass;
+		$e = new \stdClass;
 		$e->parent = $this->env;
 		$e->store = array();
 		$e->block = $block;
@@ -1595,7 +1592,7 @@ class lessc {
 		if ($this->sourceLoc >= 0) {
 			$this->sourceParser->throwError($msg, $this->sourceLoc);
 		}
-		throw new exception($msg);
+		throw new \Exception($msg);
 	}
 
 	static protected $cssColors = array(
@@ -1831,7 +1828,7 @@ class lessc_parser {
 
 		// TODO report where the block was opened
 		if (!is_null($this->env->parent))
-			throw new exception('parse error: unclosed block');
+			throw new \Exception('parse error: unclosed block');
 
 		return $this->env;
 	}
@@ -1962,7 +1959,7 @@ class lessc_parser {
 		if ($this->literal('}', false)) {
 			try {
 				$block = $this->pop();
-			} catch (exception $e) {
+			} catch (\Exception $e) {
 				$this->seek($s);
 				$this->throwError($e->getMessage());
 			}
@@ -2939,13 +2936,13 @@ class lessc_parser {
 
 		// TODO this depends on $this->count
 		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
-			throw new exception("$msg: failed at `$m[1]` $loc");
+			throw new \Exception("$msg: failed at `$m[1]` $loc");
 		}
-		throw new exception("$msg: $loc");
+		throw new \Exception("$msg: $loc");
 	}
 
 	protected function pushBlock($selectors=null, $type=null) {
-		$b = new stdclass;
+		$b = new \stdClass;
 		$b->parent = $this->env;
 
 		$b->type = $type;
diff --git a/snappymail/v/0.0.0/app/libraries/polyfill/ctype.php b/snappymail/v/0.0.0/app/libraries/polyfill/ctype.php
new file mode 100644
index 000000000..7f913e728
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/polyfill/ctype.php
@@ -0,0 +1,17 @@
+<?php
+
+if (!function_exists('ctype_digit')) {
+	function ctype_digit(string $text): bool
+	{
+		$l = \strlen($text);
+		return $l && $l === \strspn($text, '0123456789');
+	}
+}
+
+if (!function_exists('ctype_alpha')) {
+	function ctype_alpha(string $text): bool
+	{
+		$l = \strlen($text);
+		return $l && $l === \strspn($text, 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz');
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/polyfill/intl.php b/snappymail/v/0.0.0/app/libraries/polyfill/intl.php
new file mode 100644
index 000000000..d23d1edea
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/polyfill/intl.php
@@ -0,0 +1,13 @@
+<?php
+
+if (!\function_exists('idn_to_ascii')) {
+	function idn_to_ascii(string $domain) {
+		return \SnappyMail\Intl\Idn::toAscii($domain);
+	}
+}
+
+if (!\function_exists('idn_to_utf8')) {
+	function idn_to_utf8(string $domain) {
+		return \SnappyMail\Intl\Idn::toUtf8($domain);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/base32.php b/snappymail/v/0.0.0/app/libraries/snappymail/base32.php
new file mode 100644
index 000000000..d65e4c389
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/base32.php
@@ -0,0 +1,84 @@
+<?php
+
+namespace SnappyMail;
+
+class Base32
+{
+	private string $chars;
+
+	function __construct(string $chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567')
+	{
+		$this->chars = $chars;
+	}
+
+	public function random(int $length): string
+	{
+		$secret = '';
+		while (0 < $length--) {
+			$secret .= $this->chars[\random_int(0,31)];
+		}
+		return $secret;
+	}
+
+	public function encode(string $data, bool $padding = false, int $chunklen = 0, string $end = "\r\n"): string
+	{
+		$sl = \is_string($data) ? \strlen($data) : 0;
+
+		$base32 = '';
+		$remainder = 0;
+		$remainderSize = 0;
+
+		for ($i = 0; $i < $sl; ++$i) {
+			$remainder = ($remainder << 8) | \ord($data[$i]);
+			$remainderSize += 8;
+			while ($remainderSize > 4) {
+				$remainderSize -= 5;
+				$base32 .= $this->chars[($remainder & (31 << $remainderSize)) >> $remainderSize];
+			}
+		}
+
+		if ($remainderSize > 0) {
+			// remainderSize < 5:
+			$base32 .= $this->chars[($remainder << (5 - $remainderSize)) & 31];
+		}
+
+		if ($padding) {
+			$base32 .= \str_repeat('=', (8 - \ceil(($sl % 5) * 8 / 5)) % 8);
+		}
+
+		return 0 < $chunklen
+			? \chunk_split($base32, $chunklen, $end)
+			: $base32;
+	}
+
+	public function decode(string $data, bool $strict = false): ?string
+	{
+		$data = \strtoupper(\rtrim($data, "=\x20\t\n\r\0\x0B"));
+		$dataSize = \strlen($data);
+		$buf = 0;
+		$bufSize = 0;
+		$res = '';
+		$charMap = \array_flip(\str_split($this->chars));
+		for ($i = 0; $i < $dataSize; ++$i) {
+			$c = $data[$i];
+			if (isset($charMap[$c])) {
+				$buf = ($buf << 5) | $charMap[$c];
+				$bufSize += 5;
+				if ($bufSize > 7) {
+					$bufSize -= 8;
+					$res .= \chr(($buf & (0xff << $bufSize)) >> $bufSize);
+				}
+			} else if ($strict && false === \strpos(" \r\n\t", $c)) {
+				\trigger_error('Base32 string contains unexpected char #'.\ord($c)." at offset {$i}");
+				return null;
+			}
+		}
+		return $res;
+	}
+
+	public function verify(string $data): bool
+	{
+		return (bool) \preg_match('/^['.\preg_quote($this->chars).' \\r\\n\\t]+=*$/D', $data);
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
new file mode 100644
index 000000000..ebe056ae1
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/cookies.php
@@ -0,0 +1,156 @@
+<?php
+
+namespace SnappyMail;
+
+class Cookies
+{
+	static $DefaultPath = '';
+
+	static $Secure = null;
+
+	static $SameSite = 'Strict';
+
+	private static function init() : bool
+	{
+		static $bOne = false;
+		if (!$bOne) {
+			$oConfig = \RainLoop\Api::Config();
+			static::$DefaultPath = $oConfig->Get('labs', 'cookie_default_path', '');
+			static::$SameSite = $oConfig->Get('security', 'cookie_samesite', 'Strict');
+			static::$Secure = isset($_SERVER['HTTPS'])
+				|| 'None' == static::$SameSite
+				|| !!$oConfig->Get('labs', 'cookie_default_secure', false);
+			$bOne = true;
+		}
+		return $bOne;
+	}
+
+	public static function get(string $sName) : ?string
+	{
+		if (isset($_COOKIE[$sName])) {
+			$aParts = [];
+			foreach (\array_keys($_COOKIE) as $sCookieName) {
+				if (\strtok($sCookieName, '~') === $sName) {
+					$aParts[$sCookieName] = $_COOKIE[$sCookieName];
+				}
+			}
+			\ksort($aParts);
+			return \implode('', $aParts);
+		}
+		return null;
+	}
+
+	public static function getSecure(string $sName)
+	{
+		return isset($_COOKIE[$sName])
+			? Crypt::DecryptFromJSON(\MailSo\Base\Utils::UrlSafeBase64Decode(static::get($sName)))
+			: null;
+	}
+
+	public static function setSecure(string $sName, $data): void
+	{
+		if (\is_null($data)) {
+			static::clear($sName);
+		} else {
+			static::set(
+				$sName,
+				\MailSo\Base\Utils::UrlSafeBase64Encode(Crypt::EncryptToJSON($data))
+			);
+		}
+	}
+
+	private static function _set(string $sName, string $sValue, int $iExpire, bool $httponly = true) : bool
+	{
+		$sPath = static::$DefaultPath;
+		$sPath = $sPath && \strlen($sPath) ? $sPath : '/';
+/*
+		if (\strlen($sValue) > 4000 - \strlen($sPath . $sName)) {
+			throw new \Exception("Cookie '{$sName}' value too long");
+		}
+*/
+		if (\strlen($sValue)) {
+			$_COOKIE[$sName] = $sValue;
+		} else {
+			if (!isset($_COOKIE[$sName])) {
+				return true;
+			}
+			unset($_COOKIE[$sName]);
+			$iExpire = \time() - 3600 * 24 * 30;
+		}
+
+		// Cookie "$sName" has been rejected because it is already expired.
+		// Happens when \setcookie() sends multiple with the same name (and one is deleted)
+		// So when previously set, we must delete all 'Set-Cookie' headers and start over
+		$cookies = [];
+		$cookie_remove = false;
+		foreach (\headers_list() as $header) {
+			if (\preg_match("/Set-Cookie:([^=]+)=/i", $header, $match)) {
+				if (\trim($match[1]) == $sName) {
+					$cookie_remove = true;
+				} else {
+					$cookies[] = $header;
+				}
+			}
+		}
+		if ($cookie_remove) {
+			\header_remove('Set-Cookie');
+			foreach ($cookies as $cookie) {
+				\header($cookie,false);
+			}
+		}
+
+		return \setcookie($sName, $sValue, array(
+			'expires' => $iExpire,
+			'path' => $sPath,
+//			'domain' => null,
+			'secure' => static::$Secure,
+			'httponly' => $httponly,
+			'samesite' => static::$SameSite
+		));
+	}
+
+	/**
+	 * Firefox: Cookie "$sName" has been rejected because it is already expired.
+	 * \header_remove("set-cookie: {$sName}");
+	 */
+	public static function set(string $sName, string $sValue, int $iExpire = 0, bool $httponly = true) : void
+	{
+		static::init();
+		$sPath = static::$DefaultPath;
+		$sPath = $sPath && \strlen($sPath) ? $sPath : '/';
+		// https://github.com/the-djmaze/snappymail/issues/451
+		// The 4K browser limit is for the entire cookie, including name, value, expiry date etc.
+		$iMaxSize = 4000 - \strlen($sPath . $sName);
+/*
+		if ($iMaxSize < \strlen($sValue)) {
+			throw new \Exception("Cookie '{$sName}' value too long");
+		}
+*/
+		// Set the new 4K split cookie
+		foreach (\str_split($sValue, $iMaxSize) as $i => $sPart) {
+			$sCookieName = $i ? "{$sName}~{$i}" : $sName;
+			Log::debug('COOKIE', "set {$sCookieName}");
+			static::_set($sCookieName, $sPart, $iExpire, $httponly);
+		}
+		// Delete unused old 4K split cookie parts
+		foreach (\array_keys($_COOKIE) as $sCookieName) {
+			$aSplit = \explode('~', $sCookieName);
+			if (isset($aSplit[1]) && $aSplit[0] == $sName && $aSplit[1] > $i) {
+				Log::debug('COOKIE', "unset {$sCookieName}");
+				static::_set($sCookieName, '', 0, $httponly);
+			}
+		}
+	}
+
+	public static function clear(string $sName) : void
+	{
+		static::init();
+		static::_set($sName, '', 0);
+		// Delete 4K split cookie parts
+		foreach (\array_keys($_COOKIE) as $sCookieName) {
+			if (\strtok($sCookieName, '~') === $sName) {
+				static::_set($sCookieName, '', 0);
+			}
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
index 6cbded338..066352dcc 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/crypt.php
@@ -10,7 +10,7 @@ abstract class Crypt
 {
 	protected static $cipher = '';
 
-	public static function listCiphers() : array
+	public static function listCiphers(): array
 	{
 		$list = array();
 		if (\function_exists('openssl_get_cipher_methods')) {
@@ -18,108 +18,162 @@ abstract class Crypt
 			$list = \array_diff($list, \array_map('strtoupper',$list));
 			$list = \array_filter($list, function($v){
 				// DES/ECB/bf/rc insecure, GCM/CCM not supported
-				return !\preg_match('/(^(des|bf|rc))|-(ecb|gcm|ccm)/i', $v);
+				return !\preg_match('/(^(des|bf|rc))|-(ecb|gcm|ccm|ocb|siv|cts)|wrap/i', $v);
 			});
 			\natcasesort($list);
 		}
 		return $list;
 	}
 
-	public static function setCipher(string $cipher) : bool
+	public static function cipherSupported(string $cipher): bool
 	{
-		if ($cipher) {
-			$ciphers = static::listCiphers();
-			if (\in_array($cipher, $ciphers)) {
-				static::$cipher = $cipher;
-				return true;
-			}
+		return \in_array($cipher, static::listCiphers());
+	}
+
+	public static function setCipher(string $cipher): bool
+	{
+		if (static::cipherSupported($cipher)) {
+			static::$cipher = $cipher;
+			return true;
 		}
+		Log::error('Crypt', "OpenSSL no support for cipher '{$cipher}'");
 		return false;
 	}
 
 	/**
-	 * When $key is empty, it will use a fingerprint of the user agent.
+	 * When $key is empty, it will use the smctoken.
 	 */
-	private static function Passphrase(?string $key) : string
+	private static function Passphrase(
+		#[\SensitiveParameter]
+		?string $key
+	): string
 	{
-		return \sha1(
-			($key ?: \preg_replace('/[^a-z]+/i', '', \explode(')', $_SERVER['HTTP_USER_AGENT'])[0])) . APP_SALT,
-			true
-		);
+		if (!$key) {
+			if (empty($_COOKIE['smctoken'])) {
+				\SnappyMail\Cookies::set('smctoken', \base64_encode(\random_bytes(16)), 0, false);
+//				throw new \RuntimeException('Missing smctoken');
+			}
+			$key = $_COOKIE['smctoken'] . APP_VERSION;
+		}
+		return \sha1($key . APP_SALT, true);
 	}
 
-	public static function Decrypt(array $data, string $key = null) /* : mixed */
+	public static function Decrypt(array $data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): mixed
 	{
 		if (3 === \count($data) && isset($data[0], $data[1], $data[2]) && \strlen($data[0])) {
-			try {
-				$fn = "{$data[0]}Decrypt";
-				if (\method_exists(__CLASS__, $fn)) {
+			$fn = "{$data[0]}Decrypt";
+			if (!\method_exists(__CLASS__, $fn)) {
+				Log::warning('Crypt', "{$fn} does not exists");
+			} else {
+				try {
 					$result = static::{$fn}($data[2], $data[1], $key);
-					return \json_decode($result, true);
+					if (\is_string($result)) {
+						return static::jsonDecode($result);
+					}
+					throw new \RuntimeException('invalid $data or $key');
+				} catch (\Throwable $e) {
+					Log::error('Crypt', "{$fn}(): {$e->getMessage()}\n{$e->getTraceAsString()}");
 				}
-			} catch (\Throwable $e) {
-				\trigger_error(__CLASS__ . "::{$fn}(): " . $e->getMessage());
 			}
 		} else {
-//			\trigger_error(__CLASS__ . '::Decrypt() invalid $data');
+			Log::warning('Crypt', 'Decrypt() invalid $data');
 		}
 	}
 
-	public static function DecryptFromJSON(string $data, string $key = null) /* : mixed */
+	public static function DecryptFromJSON(string $data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): mixed
 	{
-		$data = \json_decode($data, true);
+		$data = static::jsonDecode($data);
 		if (!\is_array($data)) {
-//			\trigger_error(__CLASS__ . '::DecryptFromJSON() invalid $data');
+			Log::notice('Crypt', 'DecryptFromJSON() invalid $data');
 			return null;
 		}
 		return static::Decrypt(\array_map('base64_decode', $data), $key);
 	}
 
-	public static function DecryptUrlSafe(string $data, string $key = null) /* : mixed */
+	public static function DecryptUrlSafe(string $data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): mixed
 	{
 		$data = \explode('.', $data);
 		if (!\is_array($data)) {
-//			\trigger_error(__CLASS__ . '::DecryptUrlSafe() invalid $data');
+			Log::notice('Crypt', 'DecryptUrlSafe() invalid $data');
 			return null;
 		}
 		return static::Decrypt(\array_map('MailSo\\Base\\Utils::UrlSafeBase64Decode', $data), $key);
 	}
 
-	public static function Encrypt($data, string $key = null) : array
+	public static function Encrypt(
+		#[\SensitiveParameter]
+		$data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): array
 	{
 		$data = \json_encode($data);
-		if (\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
-			$nonce = \random_bytes(\SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES);
-			$result = ['sodium', $nonce, static::SodiumEncrypt($data, $nonce, $key)];
-		} else if (static::$cipher && \is_callable('openssl_encrypt')) {
-			$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));
-			$result = ['openssl', $iv, static::OpenSSLEncrypt($data, $iv, $key)];
-		} else {
-			$salt = \random_bytes(16);
-			$result = ['xxtea', $salt, static::XxteaEncrypt($data, $salt, $key)];
+
+		if (\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
+			try {
+				$nonce = \random_bytes(\SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_NPUBBYTES);
+				return ['sodium', $nonce, static::SodiumEncrypt($data, $nonce, $key)];
+			} catch (\Throwable $e) {
+				Log::error('Crypt', 'Sodium ' . $e->getMessage());
+			}
 		}
+
+		// Too much OpenSSL v3 issues ?
+//		if (\is_callable('openssl_encrypt') && OPENSSL_VERSION_NUMBER < 805306368) {
+		if (\is_callable('openssl_encrypt')) {
+			try {
+				$iv = \random_bytes(\openssl_cipher_iv_length(static::$cipher));
+				return ['openssl', $iv, static::OpenSSLEncrypt($data, $iv, $key)];
+			} catch (\Throwable $e) {
+				Log::error('Crypt', 'OpenSSL ' . $e->getMessage());
+			}
+		}
+
+		$salt = \random_bytes(16);
+		return ['xxtea', $salt, static::XxteaEncrypt($data, $salt, $key)];
 /*
 		if (static::{"{$result[0]}Decrypt"}($result[2], $result[1], $key) !== $data) {
-			throw new \Exception('Encrypt/Decrypt mismatch');
+			throw new \RuntimeException('Encrypt/Decrypt mismatch');
 		}
 */
-		return $result;
 	}
 
-	public static function EncryptToJSON($data, string $key = null) : string
+	public static function EncryptToJSON(
+		#[\SensitiveParameter]
+		$data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string
 	{
 		return \json_encode(\array_map('base64_encode', static::Encrypt($data, $key)));
 	}
 
-	public static function EncryptUrlSafe($data, string $key = null) : string
+	public static function EncryptUrlSafe(
+		#[\SensitiveParameter]
+		$data,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string
 	{
 		return \implode('.', \array_map('MailSo\\Base\\Utils::UrlSafeBase64Encode', static::Encrypt($data, $key)));
 	}
 
-	public static function SodiumDecrypt(string $data, string $nonce, string $key = null) /* : mixed */
+	public static function SodiumDecrypt(string $data, string $nonce,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string|false
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt')) {
-			return null;
+			throw new \Exception('sodium_crypto_aead_xchacha20poly1305_ietf_decrypt not callable');
 		}
 		return \sodium_crypto_aead_xchacha20poly1305_ietf_decrypt(
 			$data,
@@ -129,24 +183,44 @@ abstract class Crypt
 		);
 	}
 
-	public static function SodiumEncrypt(string $data, string $nonce, string $key = null) : ?string
+	public static function SodiumEncrypt(
+		#[\SensitiveParameter]
+		string $data,
+		string $nonce,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string
 	{
 		if (!\is_callable('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt')) {
-			return null;
+			throw new \Exception('sodium_crypto_aead_xchacha20poly1305_ietf_encrypt not callable');
 		}
-		return \sodium_crypto_aead_xchacha20poly1305_ietf_encrypt(
+		$result = \sodium_crypto_aead_xchacha20poly1305_ietf_encrypt(
 			$data,
 			APP_SALT,
 			$nonce,
 			\str_pad('', \SODIUM_CRYPTO_AEAD_XCHACHA20POLY1305_IETF_KEYBYTES, static::Passphrase($key))
 		);
+		if (!$result) {
+			throw new \RuntimeException('Sodium encryption failed');
+		}
+		return $result;
 	}
 
-	public static function OpenSSLDecrypt(string $data, string $iv, string $key = null) /* : mixed */
+	public static function OpenSSLDecrypt(string $data, string $iv,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string|false
 	{
-		if (!$data || !$iv || !static::$cipher || !\is_callable('openssl_decrypt')) {
-			return null;
+		if (!$data || !$iv) {
+			throw new \ValueError('$data or $iv is empty string');
 		}
+		if (!\is_callable('openssl_decrypt')) {
+			throw new \Exception('openssl_decrypt not callable');
+		}
+		if (!static::$cipher) {
+			throw new \RuntimeException('openssl $cipher not set');
+		}
+		Log::debug('Crypt', 'openssl_decrypt() with cipher ' . static::$cipher);
 		return \openssl_decrypt(
 			$data,
 			static::$cipher,
@@ -156,24 +230,44 @@ abstract class Crypt
 		);
 	}
 
-	public static function OpenSSLEncrypt(string $data, string $iv, string $key = null) : ?string
+	public static function OpenSSLEncrypt(
+		#[\SensitiveParameter]
+		string $data,
+		string $iv,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string
 	{
-		if (!$data || !$iv || !static::$cipher || !\is_callable('openssl_encrypt')) {
-			return null;
+		if (!$data || !$iv) {
+			throw new \ValueError('$data or $iv is empty string');
 		}
-		return \openssl_encrypt(
+		if (!\is_callable('openssl_encrypt')) {
+			throw new \Exception('openssl_encrypt not callable');
+		}
+		if (!static::$cipher) {
+			throw new \RuntimeException('openssl $cipher not set');
+		}
+		Log::debug('Crypt', 'openssl_encrypt() with cipher ' . static::$cipher);
+		$result = \openssl_encrypt(
 			$data,
 			static::$cipher,
 			static::Passphrase($key),
 			OPENSSL_RAW_DATA,
 			$iv
 		);
+		if (!$result) {
+			throw new \RuntimeException('OpenSSL encryption with ' . static::$cipher . ' failed');
+		}
+		return $result;
 	}
 
-	public static function XxteaDecrypt(string $data, string $salt, string $key = null) /* : mixed */
+	public static function XxteaDecrypt(string $data, string $salt,
+		#[\SensitiveParameter]
+		?string $key = null
+	): mixed
 	{
 		if (!$data || !$salt) {
-			return null;
+			throw new \ValueError('$data or $salt is empty string');
 		}
 		$key = $salt . static::Passphrase($key);
 		return \is_callable('xxtea_decrypt')
@@ -181,19 +275,32 @@ abstract class Crypt
 			: \MailSo\Base\Xxtea::decrypt($data, $key);
 	}
 
-	public static function XxteaEncrypt(string $data, string $salt, string $key = null) : ?string
+	public static function XxteaEncrypt(
+		#[\SensitiveParameter]
+		string $data,
+		string $salt,
+		#[\SensitiveParameter]
+		?string $key = null
+	): string
 	{
 		if (!$data || !$salt) {
-			return null;
+			throw new \ValueError('$data or $salt is empty string');
 		}
 		$key = $salt . static::Passphrase($key);
-		return \is_callable('xxtea_encrypt')
+		$result = \is_callable('xxtea_encrypt')
 			? \xxtea_encrypt($data, $key)
 			: \MailSo\Base\Xxtea::encrypt($data, $key);
+		if (!$result) {
+			throw new \RuntimeException('Xxtea encryption failed');
+		}
+		return $result;
+	}
+
+	private static function jsonDecode(string $data): mixed
+	{
+		return \json_decode($data, true, 512, JSON_THROW_ON_ERROR);
 	}
 
 }
 
-\SnappyMail\Crypt::setCipher(\RainLoop\Api::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1'))
-	|| \SnappyMail\Crypt::setCipher('aes-256-cbc-hmac-sha1')
-	|| \SnappyMail\Crypt::setCipher('aes-256-xts');
+\SnappyMail\Crypt::setCipher(\RainLoop\Api::Config()->Get('security', 'encrypt_cipher', 'aes-256-cbc-hmac-sha1'));
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
index b2b62b25d..8bc717c15 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dav/client.php
@@ -10,13 +10,15 @@ namespace SnappyMail\DAV;
 
 class Client
 {
-//	public $__UrlPath__;
+	public string $urlPath;
 
 	const
 		NS_DAV  = 'urn:DAV',
 		NS_CARDDAV = 'urn:ietf:params:xml:ns:carddav';
 
-	protected $baseUri;
+	protected string $baseUri;
+
+	protected $HTTP;
 
 	/**
 	 * Constructor
@@ -32,16 +34,20 @@ class Client
 	function __construct(array $settings)
 	{
 		if (!isset($settings['baseUri'])) {
-			throw new \InvalidArgumentException('A baseUri must be provided');
+			throw new \ValueError('A baseUri must be provided');
 		}
 		$this->baseUri = $settings['baseUri'];
 
 		$this->HTTP = \SnappyMail\HTTP\Request::factory(/*'socket'*/);
 		$this->HTTP->proxy = $settings['proxy'] ?? null;
-		$this->HTTP->setAuth(3, $settings['userName'] ?? '', $settings['password'] ?? '');
+		if (!empty($settings['userName']) && !empty($settings['password'])) {
+			$this->HTTP->setAuth(3, $settings['userName'], $settings['password']);
+		} else {
+			\SnappyMail\Log::warning('DAV', 'No user credentials set');
+		}
 		$this->HTTP->max_response_kb = 0;
 		$this->HTTP->timeout = 15; // timeout in seconds.
-//		$this->HTTP->max_redirects = 0;
+		$this->HTTP->max_redirects = 0;
 	}
 
 	/**
@@ -57,23 +63,24 @@ class Client
 	 *
 	 * If the specified url is relative, it will be expanded based on the base url.
 	 */
-	public function request(string $method, string $url = '', string $body = null, array $headers = array()) : \SnappyMail\HTTP\Response
+	public function request(string $method, string $url = '', ?string $body = null, array $headers = array()) : \SnappyMail\HTTP\Response
 	{
 		if (!\preg_match('@^(https?:)?//@', $url)) {
 			// If the url starts with a slash, we must calculate the url based off
 			// the root of the base url.
-			if (0 === \strpos($url, '/')) {
+			if (\str_starts_with($url, '/')) {
 				$parts = \parse_url($this->baseUri);
 				$url = $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
 			} else {
 				$url = $this->baseUri . $url;
 			}
 		}
+		\SnappyMail\Log::debug('DAV', "{$method} {$url}" . ($body ? "\n\t" . \str_replace("\n", "\n\t", $body) : ''));
 		$response = $this->HTTP->doRequest($method, $url, $body, $headers);
 		if (301 == $response->status) {
 			// Like: RewriteRule ^\.well-known/carddav /nextcloud/remote.php/dav [R=301,L]
 			$location = $response->getRedirectLocation();
-			\trigger_error("Redirect {$url} to {$location}");
+			\SnappyMail\Log::info('DAV', "301 Redirect {$url} to {$location}");
 			$url = \preg_replace('@^(https?:)?//[^/]+[/$]@', '/', $location);
 			$parts = \parse_url($this->baseUri);
 			$url = $parts['scheme'] . '://' . $parts['host'] . (isset($parts['port'])?':' . $parts['port']:'') . $url;
@@ -82,6 +89,7 @@ class Client
 		if (300 <= $response->status) {
 			throw new \SnappyMail\HTTP\Exception("{$method} {$url}", $response->status, $response);
 		}
+		\SnappyMail\Log::debug('DAV', "{$response->status}: {$response->body}");
 
 		return $response;
 	}
@@ -104,23 +112,20 @@ class Client
 	 */
 	public function propFind(string $url, array $properties, int $depth = 0) : array
 	{
-		$body = '<?xml version="1.0"?>' . "\n";
-		$body.= '<d:propfind xmlns:d="DAV:">' . "\n";
-		$body.= '  <d:prop>' . "\n";
+		$body = '<?xml version="1.0"?>' . "\n" . '<d:propfind xmlns:d="DAV:"><d:prop>';
 
 		foreach ($properties as $property) {
 			if (!\preg_match('/^{([^}]*)}(.*)$/', $property, $match)) {
-				throw new \InvalidArgumentException('\'' . $property . '\' is not a valid clark-notation formatted string');
+				throw new \ValueError('\'' . $property . '\' is not a valid clark-notation formatted string');
 			}
 			if ('DAV:' === $match[1]) {
-				$body .= "    <d:{$match[2]} />\n";
+				$body .= "<d:{$match[2]}/>";
 			} else {
-				$body .= "    <x:{$match[2]} xmlns:x=\"{$match[1]}\"/>\n";
+				$body .= "<x:{$match[2]} xmlns:x=\"{$match[1]}\"/>";
 			}
 		}
 
-		$body .= '  </d:prop>' . "\n";
-		$body .= '</d:propfind>';
+		$body .= '</d:prop></d:propfind>';
 
 		$response = $this->request('PROPFIND', $url, $body, array(
 			"Depth: {$depth}",
@@ -144,7 +149,7 @@ class Client
 			null, LIBXML_NOBLANKS | LIBXML_NOCDATA);
 
 		if (false === $responseXML) {
-			throw new \InvalidArgumentException('The passed data is not valid XML');
+			throw new \UnexpectedValueException("The passed data is not valid XML\n{$response->body}");
 		}
 
 		$ns = \array_search('urn:DAV', $responseXML->getNamespaces(true)) ?: 'd';
@@ -163,13 +168,18 @@ class Client
 				foreach ($propStat->xpath("{$ns}:prop") as $prop) {
 					foreach ($prop->xpath("*") as $element) {
 						$propertyName = self::toClarkNotation($element);
+						$propList[$propertyName] = [];
 						if ('{DAV:}resourcetype' === $propertyName) {
-							$propList[$propertyName] = [];
 							foreach ($element->xpath("*") as $resourcetype) {
 								$propList[$propertyName][] = self::toClarkNotation($resourcetype);
 							}
 						} else {
-							$propList[$propertyName] = (string) $element;
+							foreach ($element->xpath("*") as $child) {
+								$propList[$propertyName][self::toClarkNotation($child)] = (string) $child;
+							}
+							if (!$propList[$propertyName]) {
+								$propList[$propertyName] = (string) $element;
+							}
 						}
 					}
 				}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/dns.php b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
new file mode 100644
index 000000000..67ffc8ded
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/dns.php
@@ -0,0 +1,96 @@
+<?php
+
+namespace SnappyMail;
+
+// Sockets extension not loaded?
+if (!defined('AF_INET6')) {
+	define('AF_INET6', true);
+}
+
+abstract class DNS
+{
+	/**
+	 * $domain = 'bimigroup.org'
+	 * $selector = 'default'
+	 * Then a TXT lookup is done on 'default._bimi.bimigroup.org'
+	 */
+	public static function BIMI(string $domain, string $selector = 'default') : string
+	{
+		$selector = \trim($selector) ?: 'default';
+		$oCache = \RainLoop\Api::Actions()->Cacher();
+		$sCacheKey = "dns-bimi-{$domain}-{$selector}";
+		$BIMI = $oCache->Get($sCacheKey);
+		if ($BIMI) {
+			$BIMI = \json_decode($BIMI);
+			if ($BIMI[1] < \time()) {
+				$BIMI = null;
+			} else {
+				$BIMI = $BIMI[0];
+			}
+		}
+		if (null === $BIMI) {
+			$BIMI = '';
+			$values = \dns_get_record("{$selector}._bimi.{$domain}", \DNS_TXT);
+			if ($values) {
+				foreach ($values as $value) {
+					if (\str_starts_with($value['txt'], 'v=BIMI1')) {
+						$BIMI = \preg_replace('/^.+l=([^;]+)(;.*)?$/D', '$1', $value['txt']);
+						$oCache->Set($sCacheKey, \json_encode([
+							$BIMI,
+							time() + $value['ttl']
+						]));
+						break;
+					}
+				}
+			}
+			if (!$BIMI) {
+				// Don't lookup for 24 hours
+				$oCache->Set($sCacheKey, \json_encode([
+					$BIMI,
+					time() + 86400
+				]));
+			}
+		}
+		return $BIMI;
+	}
+
+	public static function MX(string $domain) : array
+	{
+		$mxhosts = array();
+		foreach (\dns_get_record($host, \DNS_MX) ?: array() as $record) {
+			$mxhosts[$record['pri']] = $record['target'];
+		}
+		if (!$mxhosts) {
+			\getmxrr($domain, $mxhosts);
+		}
+		\ksort($mxhosts);
+		return \array_values($mxhosts);
+	}
+
+	public static function SRV(string $domain) : array
+	{
+		$result = array();
+		foreach (\dns_get_record($host, \DNS_SRV) ?: array() as $record) {
+			$result[$record['pri']] = $record;
+		}
+		\ksort($result);
+		return \array_values($result);
+	}
+
+	public static function IP(string $domain): array
+	{
+		$ips = array();
+		foreach (\dns_get_record($domain, \DNS_A | (\AF_INET6 ? \DNS_AAAA : 0)) ?: array() as $record) {
+			if (!empty($record['ip'])) {
+				$ips[] = $record['ip'];
+			}
+			if (!empty($record['ipv6'])) {
+				$ips[] = $record['ipv6'];
+			}
+		}
+		if (!$ips) {
+			$ips = \gethostbynamel($host);
+		}
+		return $ips ?: array();
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php
new file mode 100644
index 000000000..2b79d0069
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/magic.mime.php
@@ -0,0 +1,34 @@
+<?php
+$magic = array(
+	'#^\x37\x7A.*#s'          => 'application/x-7z-compressed', # unknown by magic.mime
+	'#^BZh.*#s'               => 'application/x-bzip2',
+	'#^\x1f\x8b.*#s'          => 'application/x-gzip',
+	'#^.{257}ustar  \x00.*#s' => 'application/x-gtar',
+	'#^.{257}ustar\x00.*#s'   => 'application/x-tar',
+	'#^Rar!.*#s'              => 'application/x-rar-compressed',
+	'#^PK\x03\x04.*#s'        => 'application/zip',
+
+	'#^%PDF-.*#s'  => 'application/pdf',
+	'#^[CF]WS.*#s' => 'application/x-shockwave-flash',
+
+	'#^(.*\n)?(INSERT|CREATE|DROP|DELETE|ALTER|UPDATE)\ .*#is' => 'text/x-sql',
+	'#^BEGIN:VCARD#s' => 'text/x-vcard',
+
+	'#^GIF8.*#s'       => 'image/gif',
+	'#^.{8}heic#s'     => 'image/heic', // https://nokiatech.github.io/heif/technical.html
+	'#^\xFF\xD8.*#s'   => 'image/jpeg',
+	'#^\x89PNG.*#s'    => 'image/png',
+	'#^.PNG.*#s'       => 'image/png',
+	'#^<svg.*#s'       => 'image/svg+xml', # wild guess, unknown by magic.mime
+	'#^RIFF.{4}WEBP#s' => 'image/webp',
+
+	'#^FLV.*#s'      => 'video/x-flv',
+	'#^OggS.+\x80theora.*#s' => 'video/ogg',
+
+	'#^ID3.*#s'      => 'audio/mpeg', # wild guess?
+	'#^\xff\xfa.*#s' => 'audio/mpeg', # wild guess?
+	'#^OggS.+\x01vorbis.*#s' => 'audio/ogg',
+
+	'#^\xD0\xCF\x11\xE0\xA1.*#s' => 'application/msword',
+	'#^OggS.*#s'     => 'application/ogg',
+);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
new file mode 100644
index 000000000..7fc04b9af
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/mimetype.php
@@ -0,0 +1,289 @@
+<?php
+
+namespace SnappyMail\File;
+
+// use MailSo\Mime\Enumerations\MimeType;
+
+abstract class MimeType
+{
+	protected static $finfo = null;
+
+	protected static function initFInfo() : void
+	{
+		if (null === self::$finfo) {
+//			if (!\getenv('MAGIC')) { \putenv('MAGIC='.__DIR__.'/magic.mime'.(WINDOWS_OS?'.win32':'')); } # /usr/share/misc/magic
+			self::$finfo = \class_exists('finfo', false) ? new \finfo(FILEINFO_MIME) : false; // FILEINFO_CONTINUE
+		}
+	}
+
+	protected static function detectDeeper(string $mime, string $name = '') : string
+	{
+		if ('application/ogg' === $mime
+		 || 'application/vnd.ms-office' === $mime
+		 || 'application/octet-stream' === $mime
+		 || 'application/zip' === $mime) {
+			return static::fromFilename($name) ?: $mime;
+		}
+		return $mime;
+	}
+
+	public static function fromFile(string $filename, string $name = '') : ?string
+	{
+		$mime = null;
+		if (\is_file($filename)) {
+			static::initFInfo();
+			if (self::$finfo) {
+				$mime = \preg_replace('#[,;].*#', '', self::$finfo->file($filename));
+			}
+			if (!$mime && \is_callable('mime_content_type')) {
+				$mime = \mime_content_type($filename);
+			}
+			if (!$mime && $fp = \fopen($filename, 'rb')) {
+				$mime = self::fromStream($fp);
+				\fclose($fp);
+			}
+			if ('application/zip' === \str_replace('/x-', '/', $mime)) {
+				if (\class_exists('ZipArchive')) {
+					$zip = new \ZipArchive();
+					if ($zip->open($filename, \ZIPARCHIVE::RDONLY)) {
+						if (false !== $zip->locateName('word/_rels/document.xml.rels')) {
+							return 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
+						}
+						if (false !== $zip->locateName('xl/_rels/workbook.xml.rels')) {
+							return 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
+						}
+					}
+				}
+				$mime = \str_replace('/x-', '/', $mime);
+			}
+		}
+		return $mime ? static::detectDeeper($mime, $name ?: $filename) : null;
+	}
+
+	public static function fromStream($stream, string $name = '') : ?string
+	{
+		if (\is_resource($stream) && \stream_get_meta_data($stream)['seekable']) {
+			$pos = \ftell($stream);
+//			if (\is_int($pos) && \rewind($stream)) {
+			if (\is_int($pos) && 0 === \fseek($stream, 0)) {
+//				$str = \fread($stream, 265);
+				$str = \stream_get_contents($stream, 265, 0);
+				\fseek($stream, $pos);
+				if ($str) {
+					return static::fromString($str, $name);
+				}
+			}
+		}
+		return null;
+	}
+
+	public static function fromString(string &$str, string $name = '') : ?string
+	{
+		static::initFInfo();
+		$mime = self::$finfo
+			? \preg_replace('#[,;].*#', '', self::$finfo->buffer($str))
+			: self::getFromData($str);
+		return $mime ? static::detectDeeper($mime, $name) : null;
+	}
+
+	protected static function getFromData(string $str) : ?string
+	{
+		if (\str_contains($str, '-----BEGIN PGP SIGNATURE-----')) {
+			return 'application/pgp-signature';
+		}
+		if (\preg_match('/-----BEGIN PGP (PUBLIC|PRIVATE) KEY BLOCK-----/', $str)) {
+			return 'application/pgp-keys';
+		}
+		static $magic;
+		if (!$magic) {
+			require __DIR__ . '/magic.mime.php';
+		}
+		$str = \preg_replace(\array_keys($magic), \array_values($magic), $str, 1, $c);
+		return $c ? $str : null;
+	}
+
+	public static function fromFilename(string $filename) : ?string
+	{
+		$filename = \strtolower($filename);
+		if ('winmail.dat' === $filename) {
+			return static::$types['tnef'];
+		}
+		$extension = \explode('.', $filename);
+		$extension = \array_pop($extension);
+		return isset(static::$types[$extension]) ? static::$types[$extension] : null;
+	}
+
+	/**
+	 * Issue with 'text/plain'
+	 */
+	public static function toExtension(string $mime, bool $include_dot = true) : ?string
+	{
+		$mime = \strtolower($mime);
+		if ('application/pgp-signature' === $mime || 'application/pgp-keys' === $mime) {
+			$ext = 'asc';
+		} else {
+			$mime = \str_replace('application/x-tar', 'application/gtar', $mime);
+			$ext = \array_search($mime, static::$types)
+				?: \array_search(\str_replace('/x-', '/', $mime), static::$types)
+				?: \array_search(\str_replace('/', '/x-', $mime), static::$types)
+				?: 'bin';
+		}
+		return ($include_dot ? '.' : '') . $ext;
+	}
+
+	protected static $types = [
+		'7z' => 'application/x-7z-compressed',
+		'ai' => 'application/postscript',
+//		'asc' => 'application/pgp-signature',
+//		'asc' => 'application/pgp-keys',
+		'bat' => 'application/x-msdownload',
+		'bz' => 'application/x-bzip',
+		'bz2' => 'application/x-bzip2',
+		'cab' => 'application/vnd.ms-cab-compressed',
+		'chm' => 'application/vnd.ms-htmlhelp',
+		'com' => 'application/x-msdownload',
+		'deb' => 'application/x-debian-package',
+		'dll' => 'application/x-msdownload',
+		'doc' => 'application/msword',
+		'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+		'dot' => 'application/msword',
+		'dotx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.template',
+		'eps' => 'application/postscript',
+		'epub' => 'application/epub',
+		'exe' => 'application/x-msdownload',
+		'gz' => 'application/gzip',
+		'hlp' => 'application/winhlp',
+		'js' => 'application/javascript',
+		'json' => 'application/json',
+		'msi' => 'application/x-msdownload',
+		'odp' => 'application/vnd.oasis.opendocument.presentation',
+		'ods' => 'application/vnd.oasis.opendocument.spreadsheet',
+		'odt' => 'application/vnd.oasis.opendocument.text',
+		'ogx' => 'application/ogg',
+		'p10' => 'application/pkcs10',
+		'p7c' => 'application/pkcs7-mime',
+		'p7m' => 'application/pkcs7-mime',
+		'p7s' => 'application/pkcs7-signature',
+		'pdf' => 'application/pdf',
+		'php' => 'application/x-httpd-php',
+		'php' => 'application/x-php',
+		'ppt' => 'application/vnd.ms-powerpoint',
+		'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+		'ps' => 'application/postscript',
+		'psd' => 'image/vnd.adobe.photoshop',
+		'rar' => 'application/rar-compressed',
+		'rar' => 'application/x-rar-compressed',
+		'rtf' => 'application/rtf',
+		'scr' => 'application/x-msdownload',
+		'sql' => 'application/sql',
+		'swf' => 'application/shockwave-flash',
+		'swf' => 'application/x-shockwave-flash',
+		'tar' => 'application/gtar',
+//		'tar' => 'application/x-tar',
+//		'tgz' => 'application/gzip',
+		'tnef' => 'application/vnd.ms-tnef',
+//		'tnef' => 'application/ms-tnef', // not IANA official
+		'torrent' => 'application/x-bittorrent',
+		'wgt' => 'application/widget',
+		'xls' => 'application/vnd.ms-excel',
+		'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+		'xltx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.template',
+		'zip' => 'application/zip',
+
+		'aac' => 'audio/aac',
+		'aif' => 'audio/aiff',
+		'aifc' => 'audio/aiff',
+		'aiff' => 'audio/aiff',
+		'flac' => 'audio/flac',
+		'm3u' => 'audio/x-mpegurl',
+		'midi' => 'audio/midi',
+		'mp3' => 'audio/mpeg',
+		'mp4a' => 'audio/mp4',
+		'ogg' => 'audio/ogg',
+		'wav' => 'audio/wav',
+		'weba' => 'audio/webm',
+
+		'ttf' => 'font/ttf',
+		'woff' => 'font/woff',
+		'woff2' => 'font/woff2',
+
+		'bmp' => 'image/bmp',
+		'cgm' => 'image/cgm',
+		'djv' => 'image/vnd.djvu',
+		'djvu' => 'image/vnd.djvu',
+		'gif' => 'image/gif',
+//		'heic' => 'image/heic',
+		'ico' => 'image/vnd.microsoft.icon',
+//		'ico' => 'image/x-icon',
+		'ief' => 'image/ief',
+		'jpeg' => 'image/jpeg',
+		'jfif' => 'image/jpeg',
+		'jpe' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'png' => 'image/png',
+		'svg' => 'image/svg+xml',
+		'svgz' => 'image/svg+xml',
+		'tiff' => 'image/tiff',
+		'tif' => 'image/tiff',
+		'webp' => 'image/webp',
+
+		'eml' => 'message/rfc822',
+		'mime' => 'message/rfc822',
+		// RFC 3464
+//		'u8dsn' => 'message/delivery-status',
+		// RFC 5337
+		'u8dsn' => 'message/global-delivery-status',
+
+		'txt' => 'text/plain',
+		'asp' => 'text/asp',
+		'cfg' => 'text/plain',
+		'conf' => 'text/plain',
+		'css' => 'text/css',
+		'csv' => 'text/csv',
+		'def' => 'text/plain',
+		'html' => 'text/html',
+		'htm' => 'text/html',
+		'ics' => 'text/calendar',
+		'ifb' => 'text/calendar',
+		'in' => 'text/plain',
+		'ini' => 'text/plain',
+		'list' => 'text/plain',
+		'log' => 'text/plain',
+		'pl' => 'text/perl',
+		'rtx' => 'text/richtext',
+		'text' => 'text/plain',
+		'vcf' => 'text/vcard',
+		'vcard' => 'text/vcard',
+		'xml' => 'text/xml',
+
+		'3g2' => 'video/3gpp2',
+		'3gp' => 'video/3gpp',
+		'asf' => 'video/x-ms-asf',
+		'asx' => 'video/x-ms-asf',
+		'avi' => 'video/x-msvideo',
+		'flv' => 'video/flv',
+		'h261' => 'video/h261',
+		'h263' => 'video/h263',
+		'h264' => 'video/h264',
+		'jpgv' => 'video/jpgv',
+		'm4v' => 'video/x-m4v',
+		'mov' => 'video/quicktime',
+		'movie' => 'video/x-sgi-movie',
+		'mp4' => 'video/mp4',
+		'mp4v' => 'video/mp4',
+		'mpeg' => 'video/mpeg',
+		'm1v' => 'video/mpeg',
+		'm2v' => 'video/mpeg',
+		'mpe' => 'video/mpeg',
+		'mpg' => 'video/mpeg',
+		'mpg4' => 'video/mp4',
+		'ogv' => 'video/ogg',
+		'qt' => 'video/quicktime',
+		'webm' => 'video/webm',
+		'wm' => 'video/x-ms-wm',
+		'wmv' => 'video/x-ms-wmv',
+		'wmx' => 'video/x-ms-wmx',
+		'wvx' => 'video/x-ms-wvx',
+	];
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php b/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php
new file mode 100644
index 000000000..1300a0f12
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/file/temporary.php
@@ -0,0 +1,63 @@
+<?php
+
+namespace SnappyMail\File;
+
+class Temporary
+{
+	protected string $filename = '';
+
+	function __construct(string $name, bool $prefix = true)
+	{
+		$tmpdir = \sys_get_temp_dir() . '/snappymail';
+//		if (\RainLoop\Utils::inOpenBasedir($tmpdir) &&
+		\MailSo\Base\Utils::mkdir($tmpdir);
+		if ($prefix) {
+			$this->filename = @\tempnam($tmpdir, $name);
+		} else {
+			$this->filename = $tmpdir . '/' . $name;
+		}
+	}
+
+	function __destruct()
+	{
+		$this->filename && \unlink($this->filename);
+	}
+
+	function __toString() : string
+	{
+		return $this->filename;
+	}
+
+	public function filename() : string
+	{
+		return $this->filename;
+	}
+
+	private $fp = null;
+	public function fopen()/* : resource|false*/
+	{
+		if (!$this->fp) {
+			$this->fp = \fopen($this->filename, 'r+b');
+		}
+		return $this->fp;
+	}
+
+	public function writeFromStream(/*resource*/ $from): int|false
+	{
+		$fp = $this->fopen();
+//		return \stream_copy_to_stream($from, $fp); // Fails
+		$bytes = 0;
+		while (!\feof($from)) $bytes += \fwrite($fp, \fread($from, 8192));
+		return $bytes;
+	}
+
+	public function putContents(mixed $data, int $flags = 0): int|false
+	{
+		return \file_put_contents($this->filename, $data /*, $flags, $context*/);
+	}
+
+	public function getContents(): string|false
+	{
+		return \file_get_contents($this->filename);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
new file mode 100644
index 000000000..794aa9735
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/base.php
@@ -0,0 +1,509 @@
+<?php
+/**
+ * GnuPG
+ */
+
+namespace SnappyMail\GPG;
+
+use SnappyMail\SensitiveString;
+
+abstract class Base
+{
+	const
+		// @see https://pear.php.net/bugs/bug.php?id=21077
+		CHUNK_SIZE = 65536,
+
+		// This is used to pass data to the GPG process.
+		FD_INPUT = 0,
+
+		// This is used to receive normal output from the GPG process.
+		FD_OUTPUT = 1,
+
+		// This is used to receive error output from the GPG process.
+		FD_ERROR = 2,
+
+		/**
+		 * GPG status output file descriptor. The status file descriptor outputs
+		 * detailed information for many GPG commands. See the second section of
+		 * the file <b>doc/DETAILS</b> in the
+		 * {@link http://www.gnupg.org/download/ GPG package} for a detailed
+		 * description of GPG's status output.
+		 */
+		FD_STATUS = 3,
+
+		// This is used for methods requiring passphrases.
+		FD_COMMAND = 4,
+
+		// This is used for passing signed data when verifying a detached signature.
+		FD_MESSAGE = 5;
+
+	public
+		$strict = false;
+
+	protected
+		$binary,
+		$version = '2.0',
+		$pinentries = [],
+		$encryptKeys = [],
+		// Create PEM encoded output
+		$armor = true,
+
+		$_input,
+		$_output,
+
+		$proc_resource,
+		$_openPipes, // ProcPipes
+
+		// https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html
+		$options = [
+			'homedir' => '',
+			'keyring' => '',
+			'digest-algo' => '',
+			'cipher-algo' => '',
+		];
+
+	function __construct(string $homedir)
+	{
+		$homedir = \rtrim($homedir, '/\\');
+		// BSD 4.4 max length
+		if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
+			throw new \Exception('Socket name for S.gpg-agent.extra is too long');
+		}
+		$this->options['homedir'] = $homedir;
+//		\putenv("GNUPGHOME={$homedir}");
+	}
+
+	function __destruct()
+	{
+		$this->proc_close();
+		$gpgconf = static::findBinary('gpgconf');
+		if ($gpgconf) {
+			$cmd = $gpgconf . ' --kill gpg-agent';
+			// https://github.com/the-djmaze/snappymail/issues/1560#issuecomment-2144817883
+//			if (\version_compare($this->version, '2.4.0', '<')) {
+				$cmd .= ' ' . \escapeshellarg($this->options['homedir']);
+//			}
+			$env = ['GNUPGHOME' => $this->options['homedir']];
+			$pipes = [];
+			if ($process = \proc_open($cmd, [], $pipes, null, $env)) {
+				\proc_close($process);
+			}
+		}
+	}
+
+	public static function isSupported(): bool
+	{
+		return \is_callable('shell_exec') && \is_callable('proc_open');
+	}
+
+	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
+	{
+		return false;
+	}
+
+	/**
+	 * Decrypts a given text
+	 */
+	public function decrypt(string $text): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Decrypts a given file
+	 */
+	public function decryptFile(string $filename): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Decrypts a given stream
+	 */
+	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Decrypts and verifies a given text
+	 */
+	public function decryptVerify(string $text, string &$plaintext): array|false
+	{
+		return false;
+	}
+
+	/**
+	 * Decrypts and verifies a given file
+	 */
+	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	{
+		return false;
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Encrypts and signs a given text
+	 */
+	public function encryptSign(string $plaintext): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Encrypts and signs a given text
+	 */
+	public function encryptSignFile(string $filename): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Exports a public or private key
+	 */
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function import(string $keydata): array|false
+	{
+		return false;
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function importFile(string $filename): array|false
+	{
+		return false;
+	}
+
+	public function deleteKey(string $keyId, bool $private)
+	{
+		return false;
+	}
+
+	/**
+	 * Returns an array with information about all keys that matches the given pattern
+	 */
+	public function keyInfo(string $pattern, bool $private = false): array
+	{
+		return [];
+	}
+
+	/**
+	 * Sets the mode for error_reporting
+	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
+	 * By default GNUPG_ERROR_SILENT is used.
+	 */
+	public function setErrorMode(int $errormode): void
+	{
+	}
+
+	/**
+	 * Signs a given text
+	 */
+	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Verifies a signed text
+	 */
+	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	{
+		return false;
+	}
+
+	/**
+	 * Verifies a signed file
+	 */
+	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	{
+		return false;
+	}
+
+	/**
+	 * Verifies a signed file
+	 */
+	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
+	{
+		return false;
+	}
+
+	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
+	{
+		return [];
+	}
+
+	/******************************************************************
+	 * Defined methods
+	 ******************************************************************/
+
+	/**
+	 * Add a key for decryption
+	 */
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool
+	{
+		$this->addPinentry($fingerprint, $passphrase);
+		return true;
+	}
+
+	/**
+	 * Add a key for encryption
+	 */
+	public function addEncryptKey(string $fingerprint): bool
+	{
+		$this->encryptKeys[$fingerprint] = 1;
+		return true;
+	}
+
+	/**
+	 * Add a key for signing
+	 */
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool
+	{
+		$this->addPinentry($fingerprint, $passphrase);
+		return true;
+	}
+
+	public function clear(): bool
+	{
+		$this->clearPinentries();
+		$this->clearEncryptKeys();
+		return true;
+	}
+
+	/**
+	 * Removes all keys which were set for decryption before
+	 */
+	public function clearDecryptKeys(): bool
+	{
+		return $this->clearPinentries();
+	}
+
+	/**
+	 * Removes all keys which were set for encryption before
+	 */
+	public function clearEncryptKeys(): bool
+	{
+		$this->encryptKeys = [];
+		return true;
+	}
+
+	/**
+	 * Removes all keys which were set for signing before
+	 */
+	public function clearSignKeys(): bool
+	{
+		return $this->clearPinentries();
+	}
+
+	/**
+	 * Returns the engine info
+	 */
+	public function getEngineInfo(): array
+	{
+		return [
+			'protocol' => null,
+			'file_name' => $this->binary,
+			'home_dir' => $this->options['homedir'],
+			'version' => $this->version
+		];
+	}
+
+	/**
+	 * Add private key passphrase for decrypt, sign or export
+	 * $keyId or fingerprint
+	 */
+	public function addPinentry(string $keyId, SensitiveString $passphrase): self
+	{
+		/**
+		 * Test first?
+		 * gpg --dry-run --passwd <your-user-id>
+		$_ENV['PINENTRY_USER_DATA'] = \json_encode(\array_map('strval', [$keyId => $passphrase]));
+		$result = $this->exec([
+			'--dry-run',
+			'--passwd',
+			$passphrase
+		]);
+		 */
+//		$this->export($keyId, $passphrase);
+		$this->pinentries[$keyId] = $passphrase;
+//		$this->pinentries[\substr($keyId, -16)] = $passphrase;
+		return $this;
+	}
+
+	/**
+	 * Removes all keys which were set for decryption, signing and export
+	 */
+	public function clearPinentries(): bool
+	{
+		$this->pinentries = [];
+		return true;
+	}
+
+	/**
+	 * Toggle the armored output
+	 * When true the output is ASCII
+	 */
+	public function setArmor(bool $armor = true): bool
+	{
+		$this->armor = $armor;
+		return true;
+	}
+
+	protected function _debug(string $msg): void
+	{
+		\SnappyMail\Log::debug('GPG', $msg);
+	}
+
+	protected function setInput(&$input): void
+	{
+		if (\is_resource($input)) {
+			// https://github.com/the-djmaze/snappymail/issues/331
+			// $meta['stream_type'] == MEMORY or $meta['wrapper_data'] == MailSo\Base\StreamWrappers\Literal
+			$meta = \stream_get_meta_data($input);
+			if (!\in_array($meta['stream_type'], ['STDIO', 'TEMP'])) {
+/*
+				$fp = \fopen('php://temp');
+				\stream_copy_to_stream($input, $fp);
+				$input = $fp;
+*/
+				$input = \stream_get_contents($input);
+			}
+		}
+		$this->_input =& $input;
+	}
+
+	protected function setOutput($output)/* : resource|false*/
+	{
+		$fclose = false;
+		if ($output && !\is_resource($output)) {
+			$output = \fopen($output, 'wb');
+			if (!$output) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			$fclose = $output;
+		}
+		$this->_output = $output;
+		return $fclose;
+	}
+
+	public function agent()
+	{
+//		$home = \escapeshellarg($this->options['homedir']);
+//		echo \shell_exec('gpg-agent --daemon --homedir $home 2>&1');
+	}
+
+	protected function getPassphrase(string $key): string
+	{
+		$passphrase  = '';
+		$keyIdLength = \strlen($key);
+		if ($keyIdLength && !empty($_ENV['PINENTRY_USER_DATA'])) {
+			$passphrases = \json_decode($_ENV['PINENTRY_USER_DATA'], true);
+			foreach ($passphrases as $keyId => $pass) {
+				$length = \min($keyIdLength, \strlen($keyId));
+				if (\substr($keyId, -$length) === \substr($key, -$length)) {
+					return $pass;
+				}
+			}
+		}
+//		throw new \Exception("Passphrase not found for {$key}");
+		return '';
+	}
+
+	protected function proc_close(): int
+	{
+		$exitCode = 0;
+
+		// clear PINs from environment if they were set
+		$_ENV['PINENTRY_USER_DATA'] = null;
+
+		if (\is_resource($this->proc_resource)) {
+			$this->_debug('CLOSING SUBPROCESS');
+
+			// close remaining open pipes
+			$this->_openPipes->closeAll();
+
+			$status   = \proc_get_status($this->proc_resource);
+			$exitCode = \proc_close($this->proc_resource);
+			$this->proc_resource = null;
+
+			// proc_close() can return -1 in some cases,
+			// get the real exit code from the process status
+			if ($exitCode < 0 && $status && !$status['running']) {
+				$exitCode = $status['exitcode'];
+			}
+
+			if ($exitCode > 0) {
+				$this->_debug('=> subprocess returned an unexpected exit code: ' . $exitCode);
+			}
+		}
+
+		return $exitCode;
+	}
+
+	protected static function findBinary($name): ?string
+	{
+		$binary = \function_exists('shell_exec') ? \trim((string) \shell_exec('which ' . \escapeshellarg($name))) : '';
+		if ($binary && \RainLoop\Utils::inOpenBasedir($binary) && \is_executable($binary)) {
+			return $binary;
+		}
+		$locations = \array_filter([
+			'/sw/bin/',
+			'/usr/bin/',
+			'/usr/local/bin/',
+			'/opt/local/bin/',
+			'/run/current-system/sw/bin/'
+		], '\RainLoop\Utils::inOpenBasedir');
+		foreach ($locations as $location) {
+			if (\is_executable($location . $name)) {
+				return $location . $name;
+			}
+		}
+		return null;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
new file mode 100644
index 000000000..543b9a5c2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgp.php
@@ -0,0 +1,1193 @@
+<?php
+/**
+ * This class is inspired by PEAR Crypt_GPG and PECL gnupg
+ * It does not support gpg v1 because that is missing ECDH, ECDSA, EDDSA
+ * It does not support gpg < v2.2.5 as they are from before 2018
+ */
+
+namespace SnappyMail\GPG;
+
+use SnappyMail\SensitiveString;
+
+class PGP extends Base implements \SnappyMail\PGP\PGPInterface
+{
+	private
+		$_message,
+
+		$ciphers = [],
+		$digests = [],
+		$curves = [],
+		$pubkey_types = [],
+		$compressions = [],
+
+		$signmode = 2;
+
+	protected
+		// https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html
+		$options = [
+			'homedir' => '',
+			'keyring' => '',
+			'digest-algo' => '',
+			'cipher-algo' => '',
+			'secret-keyring' => '',
+			/*
+			2 = ZLIB (GnuPG, default)
+			1 = ZIP (PGP)
+			0 = Uncompressed
+			*/
+			'compress-algo' => 2,
+		];
+
+	function __construct(string $homedir)
+	{
+		parent::__construct($homedir);
+
+		// the random seed file makes subsequent actions faster so only disable it if we have to.
+		if ($this->options['homedir'] && !\is_writable($this->options['homedir'])) {
+			$this->options['no-random-seed-file'] = true;
+		}
+
+		// How to use gpgme-json ?
+		$this->binary = static::findBinary('gpg');
+
+		$info = \preg_replace('/\R +/', ' ', \shell_exec(\escapeshellcmd($this->binary) . ' --with-colons --list-config'));
+		if (\preg_match('/cfg:version:([0-9]+\\.[0-9]+\\.[0-9]+)/', $info, $match)) {
+			$this->version = $match[1];
+		}
+		if (\preg_match('/cfg:cipher:(.+)/', $info, $match) && \preg_match('/cfg:ciphername:(.+)/', $info, $match1)) {
+			$this->ciphers = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		}
+		if (\preg_match('/cfg:digest:(.+)/', $info, $match) && \preg_match('/cfg:digestname:(.+)/', $info, $match1)) {
+			$this->digests = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		}
+		if (\preg_match('/cfg:pubkey:(.+)/', $info, $match) && \preg_match('/cfg:pubkeyname:(.+)/', $info, $match1)) {
+			$this->pubkey_types = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		}
+		if (\preg_match('/cfg:compress:(.+)/', $info, $match) && \preg_match('/cfg:compressname:(.+)/', $info, $match1)) {
+			$this->compressions = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		}
+		if (\preg_match('/cfg:curve:(.+)/', $info, $match)) {
+			$this->curves = \explode(';', $match[1]);
+		}
+	}
+
+	public static function isSupported(): bool
+	{
+		return parent::isSupported() && static::findBinary('gpg');
+	}
+
+	/**
+	 * TODO: parse result
+	 * https://github.com/the-djmaze/snappymail/issues/89
+	 */
+	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
+	{
+		$this->setInput($input);
+		$_ENV['PINENTRY_USER_DATA'] = '';
+		return $this->execOutput(['--list-packets'], $output);
+	}
+
+	protected function _decrypt(/*string|resource*/ $input, /*string|resource*/ $output = null)
+	{
+		$this->setInput($input);
+		if ($this->pinentries) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode(\array_map('strval', $this->pinentries));
+		}
+		return $this->execOutput(['--decrypt','--skip-verify'], $output);
+	}
+
+	/**
+	 * Decrypts a given text
+	 */
+	public function decrypt(string $text): string|false
+	{
+		return $this->_decrypt($text);
+	}
+
+	/**
+	 * Decrypts a given file
+	 */
+	public function decryptFile(string $filename): string|false
+	{
+		$fp = \fopen($filename, 'rb');
+		try {
+			if (!$fp) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			return $this->_decrypt($fp, $output);
+		} finally {
+			$fp && \fclose($fp);
+		}
+	}
+
+	/**
+	 * Decrypts a given stream
+	 */
+	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+//		\rewind($fp);
+		return $this->_decrypt($fp, $output);
+	}
+
+	/**
+	 * Decrypts and verifies a given text
+	 */
+	public function decryptVerify(string $text, string &$plaintext): array|false
+	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		return false;
+	}
+
+	/**
+	 * Decrypts and verifies a given file
+	 */
+	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
+		return false;
+	}
+
+	protected function _encrypt(/*string|resource*/ $input, /*string|resource*/ $output = null)
+	{
+		if (!$this->encryptKeys) {
+			throw new \Exception('No encryption keys specified.');
+		}
+
+		$this->setInput($input);
+
+		$arguments = [
+			'--encrypt'
+		];
+		if ($this->armor) {
+			$arguments[] = '--armor';
+		}
+
+		foreach ($this->encryptKeys as $fingerprint => $dummy) {
+			$arguments[] = '--recipient ' . \escapeshellarg($fingerprint);
+		}
+
+		return $this->execOutput($arguments, $output);
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
+	{
+		return $this->_encrypt($plaintext, $output);
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
+	{
+		$fp = \fopen($filename, 'rb');
+		try {
+			if (!$fp) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			return $this->_encrypt($filename, $output);
+		} finally {
+			$fp && \fclose($fp);
+		}
+	}
+
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+		\rewind($fp);
+		return $this->_encrypt($fp, $output);
+	}
+
+	/**
+	 * Encrypts and signs a given text
+	 */
+	public function encryptSign(string $plaintext): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Encrypts and signs a given text
+	 */
+	public function encryptSignFile(string $filename): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Exports a public or private key
+	 */
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	{
+//		\SnappyMail\Log::debug('GnuPG', "export({$fingerprint}, {$passphrase})");
+		$private = null !== $passphrase;
+		$keys = $this->keyInfo($fingerprint, $private);
+		if (!$keys) {
+			throw new \Exception(($private ? 'Private' : 'Public') . ' key not found: ' . $fingerprint);
+		}
+		if ($private) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode([$fingerprint => \strval($passphrase)]);
+		}
+		$result = $this->exec([
+			$private ? '--export-secret-keys' : '--export',
+			'--armor',
+			\escapeshellarg($keys[0]['subkeys'][0]['fingerprint']),
+		]);
+		return $result ? $result['output'] : false;
+	}
+
+	/**
+	 * Returns the errortext, if a function fails
+	 */
+	public function getError(): string|false
+	{
+		return false;
+	}
+
+	/**
+	 * Returns the error info
+	 */
+	public function getErrorInfo(): array
+	{
+		return [];
+	}
+
+	/**
+	 * Returns the currently active protocol for all operations
+	 */
+	public function getProtocol(): int
+	{
+		return 0; // GPGME_PROTOCOL_OpenPGP
+	}
+
+	/**
+	 * Generates a key
+	 * Also saves revocation certificate in {homedir}/openpgp-revocs.d/
+	 * https://www.gnupg.org/documentation/manuals/gnupg/OpenPGP-Key-Management.html
+	 */
+	public function generateKey(string $uid, SensitiveString $passphrase): string|false
+	{
+		$settings = new PGPKeySettings;
+		$settings->name = $uid;
+		$settings->email = $uid;
+		$settings->passphrase = $passphrase;
+
+		$arguments = [
+			'--batch',
+			'--yes',
+			'--passphrase', \escapeshellarg($settings->passphrase)
+		];
+
+		/**
+		 * https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
+		 * But it can't generate multiple subkeys
+		 * Somehow generating first subkey is also broken in v2.3.4
+		$this->_input = $settings->asUnattendedData();
+		$result = $this->exec(['--batch', '--yes', '--full-gen-key']);
+		 */
+		$result = $this->exec(\array_merge($arguments, [
+			'--quick-gen-key',
+			\escapeshellarg($settings->uid()),
+			$settings->algo(),
+			$settings->usage
+		]));
+		if (!$result) {
+			return false;
+		}
+
+		$fingerprint = '';
+		foreach ($result['status'] as $line) {
+			$tokens = \explode(' ', $line);
+			if ('KEY_CREATED' === $tokens[0]/* && 'P' === $tokens[1]*/) {
+				$fingerprint = $tokens[2];
+			}
+		}
+		if (!$fingerprint) {
+			return false;
+		}
+
+		$arguments[] = '--quick-add-key';
+		$arguments[] = $fingerprint;
+
+		foreach ($settings->subkeys as $i => $key) {
+			$algo = 'default';
+			if (!empty($key['curve'])) {
+				$algo = $key['curve'];
+			}
+			if (!empty($key['type'])) {
+				$algo = $key['type'] . ($key['length'] ?? '');
+			}
+			$this->exec(\array_merge($arguments, [$algo, $key['usage'], '0']));
+		}
+
+/*
+		[status][0] => KEY_NOT_CREATED
+		[errors][0] => gpg: -:3: specified Key-Usage not allowed for algo 22
+		[errors][0] => gpg: key generation failed: Unknown elliptic curve
+
+		[status][0] => KEY_CONSIDERED B2FD2BCADCC6A9E4B2C90DBBE776CADFF94D327F 0
+		[status][1] => KEY_CREATED P B2FD2BCADCC6A9E4B2C90DBBE776CADFF94D327F
+*/
+		return $fingerprint;
+	}
+
+	protected function _importKey($input): array|false
+	{
+		$arguments = ['--import'];
+
+		if ($this->pinentries) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode(\array_map('strval', $this->pinentries));
+		} else {
+			$arguments[] = '--batch';
+		}
+
+		$this->setInput($input);
+		$result = $this->exec($arguments);
+		if ($result) {
+			foreach ($result['status'] as $line) {
+				if (false !== \strpos($line, 'IMPORT_RES')) {
+					$line = \explode(' ', \explode('IMPORT_RES ', $line)[1]);
+					return [
+						'imported' => (int) $line[2],
+						'unchanged' => (int) $line[4],
+						'newuserids' => (int) $line[5],
+						'newsubkeys' => (int) $line[6],
+						'secretimported' => (int) $line[10],
+						'secretunchanged' => (int) $line[11],
+						'newsignatures' => (int) $line[7],
+						'skippedkeys' => (int) $line[12],
+						'fingerprint' => ''
+					];
+				}
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function import(string $keydata): array|false
+	{
+		if (!$keydata) {
+			throw new \Exception('No valid input data found.');
+		}
+		return $this->_importKey($keydata);
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function importFile(string $filename): array|false
+	{
+		$fp = \fopen($filename, 'rb');
+		try {
+			if (!$fp) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			return $this->_importKey($fp);
+		} finally {
+			$fp && \fclose($fp);
+		}
+	}
+
+	/**
+	 * Import remote key from WKD
+		gpg --auto-key-locate clear,wkd --locate-keys releases@snappymail.eu
+	 */
+
+	public function deleteKey(string $keyId, bool $private): bool
+	{
+		$key = $this->keyInfo($keyId, $private);
+		if (!$key) {
+			throw new \Exception(($private ? 'Private' : 'Public') . ' key not found: ' . $keyId);
+		}
+//		if (!$private && $this->keyInfo($keyId, true)) {
+//			throw new \Exception('Delete private key first: ' . $keyId);
+//		}
+
+		$result = $this->exec([
+			'--batch',
+			'--yes',
+			$private ? '--delete-secret-key' : '--delete-key',
+			\escapeshellarg($key[0]['subkeys'][0]['fingerprint'])
+		]);
+
+//		$result['status'][0] = '[GNUPG:] ERROR keylist.getkey 17'
+//		$result['errors'][0] = 'gpg: error reading key: No public key'
+
+//		print_r($result);
+		return !!$result;
+	}
+
+	/**
+	 * Returns an array with information about all keys that matches the given pattern
+	 */
+	public function keyInfo(string $pattern, bool $private = false): array
+	{
+		// According to The file 'doc/DETAILS' in the GnuPG distribution, using
+		// double '--with-fingerprint' also prints the fingerprint for subkeys.
+		$arguments = [
+			'--with-colons',
+			'--with-fingerprint',
+			'--fixed-list-mode',
+			$private ? '--list-secret-keys' : '--list-public-keys'
+		];
+		if ($pattern) {
+			$arguments[] = '--utf8-strings';
+			$arguments[] = \escapeshellarg($pattern);
+		}
+
+		$result = $this->exec($arguments);
+
+		$keys   = [];
+		if ($result) {
+			$key    = null; // current key
+			$subKey = null; // current sub-key
+
+			foreach (\explode(PHP_EOL, $result['output']) as $line) {
+				$tokens = \explode(':', $line);
+
+				switch ($tokens[0])
+				{
+				case 'tru':
+					break;
+
+				case 'sec':
+				case 'pub':
+					// new primary key means last key should be added to the array
+					if ($key !== null) {
+						$keys[] = $key;
+					}
+					$key = [
+						'disabled' => false,
+						'expired' => false,
+						'revoked' => false,
+						'is_secret' => 'ssb' === $tokens[0],
+						'can_sign' => \str_contains($tokens[11], 's'),
+						'can_encrypt' => \str_contains($tokens[11], 'e'),
+						'uids' => [],
+						'subkeys' => []
+					];
+					// Fall through to add subkey
+				case 'ssb': // secure subkey
+				case 'sub': // public subkey
+					$key['subkeys'][] = [
+						'fingerprint' => '', // fpr:::::::::....:
+						'keyid' => $tokens[4],
+						'timestamp' => $tokens[5],
+						'expires' => $tokens[6],
+						'is_secret' => 'ssb' === $tokens[0],
+						'invalid' => false,
+						// escaESCA
+						'can_encrypt' => \str_contains($tokens[11], 'e'),
+						'can_sign' => \str_contains($tokens[11], 's'),
+						'can_certify' => \str_contains($tokens[11], 'c'),
+						'can_authenticate' => \str_contains($tokens[11], 'a'),
+						'disabled' => false,
+						'expired' => false,
+						'revoked' => 'r' === $tokens[1],
+						'length' => $tokens[2],
+						'algorithm' => $tokens[3],
+					];
+					break;
+
+				case 'fpr':
+					$key['subkeys'][\array_key_last($key['subkeys'])]['fingerprint'] = $tokens[9];
+					break;
+
+				case 'grp':
+					$key['subkeys'][\array_key_last($key['subkeys'])]['keygrip'] = $tokens[9];
+					break;
+
+				case 'uid':
+					$string  = \stripcslashes($tokens[9]); // as per documentation
+					$name    = '';
+					$email   = '';
+					$comment = '';
+					$matches = [];
+
+					// get email address from end of string if it exists
+					if (\preg_match('/^(.*?)<([^>]+)>$/', $string, $matches)) {
+						$string = \trim($matches[1]);
+						$email  = $matches[2];
+					}
+
+					// get comment from end of string if it exists
+					$matches = [];
+					if (\preg_match('/^(.+?) \(([^\)]+)\)$/', $string, $matches)) {
+						$string  = $matches[1];
+						$comment = $matches[2];
+					}
+
+					// there can be an email without a name
+					if (!$email && \preg_match('/^[\S]+@[\S]+$/', $string, $matches)) {
+						$email = $string;
+					} else {
+						$name = $string;
+					}
+
+					$key['uids'][] = [
+						'name' => $name,
+						'comment' => $comment,
+						'email' => $email,
+						'uid' => $tokens[9],
+						'revoked' => 'r' === $tokens[1],
+						'invalid' => false,
+					];
+					break;
+				}
+			}
+
+			// add last key
+			if ($key) {
+				$keys[] = $key;
+			}
+		}
+
+		return $keys;
+	}
+
+	/**
+	 * Returns an array with information about all keys that matches the given pattern
+	 */
+	public function allKeysInfo(string $pattern): array
+	{
+		$keys = [
+			'public' => [],
+			'private' => []
+		];
+		// Public
+		foreach (($this->keyinfo($pattern) ?: []) as $key) {
+			$key['can_verify'] = $key['can_sign'];
+			unset($key['can_sign']);
+			$keys['public'][] = $key;
+		}
+		// Private, read https://github.com/php-gnupg/php-gnupg/issues/5
+		foreach (($this->keyinfo($pattern, 1) ?: []) as $key) {
+			$key['can_decrypt'] = $key['can_encrypt'];
+			unset($key['can_encrypt']);
+			$keys['private'][] = $key;
+		}
+		return $keys;
+	}
+
+	/**
+	 * Sets the mode for error_reporting
+	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
+	 * By default GNUPG_ERROR_SILENT is used.
+	 */
+	public function setErrorMode(int $errormode): void
+	{
+	}
+
+	/**
+	 * Sets the mode for signing
+	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH, GNUPG_SIG_MODE_CLEAR
+	 * By default GNUPG_SIG_MODE_CLEAR
+	 */
+	public function setSignMode(int $signmode): bool
+	{
+		$this->signmode = $signmode;
+		return true;
+	}
+
+	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null, bool $textmode = true): string|false
+	{
+		if (empty($this->pinentries)) {
+			throw new \Exception('No signing keys specified.');
+		}
+
+		$this->setInput($input);
+
+		$arguments = [];
+
+		switch ($this->signmode)
+		{
+		case 0: // GNUPG_SIG_MODE_NORMAL
+			$arguments[] = '--sign';
+			break;
+		case 1: // GNUPG_SIG_MODE_DETACH
+			$arguments[] = '--detach-sign';
+			break;
+		case 2: // GNUPG_SIG_MODE_CLEAR
+		default:
+			$arguments[] = '--clearsign';
+			break;
+		}
+
+		if ($this->armor) {
+			$arguments[] = '--armor';
+		}
+		if ($textmode) {
+			$arguments[] = '--textmode';
+		}
+
+		if ($this->pinentries) {
+			foreach ($this->pinentries as $fingerprint => $pass) {
+				$arguments[] = '--local-user ' . \escapeshellarg($fingerprint);
+			}
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode(\array_map('strval', $this->pinentries));
+		}
+
+		return $this->execOutput($arguments, $output);
+	}
+
+	/**
+	 * Signs a given text
+	 */
+	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
+	{
+		return $this->_sign($plaintext, $output);
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
+	{
+		$fp = \fopen($filename, 'rb');
+		try {
+			if (!$fp) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			return $this->_sign($fp, $output);
+		} finally {
+			$fp && \fclose($fp);
+		}
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+		\rewind($fp);
+		return $this->_sign($fp, $output);
+	}
+
+	protected function _verify($input, string $signature): array|false
+	{
+		$arguments = ['--verify'];
+		if ($signature) {
+			// detached signature
+			$this->setInput($signature);
+			$this->_message =& $input;
+			// Signed data goes in FD_MESSAGE, detached signature data goes in FD_INPUT.
+			$arguments[] = '--enable-special-filenames';
+			$arguments[] = '- "-&' . self::FD_MESSAGE . '"';
+		} else {
+			// signed or clearsigned data
+			$this->setInput($input);
+		}
+
+		$result = $this->exec($arguments);
+
+		$signatures = [];
+		if ($result) {
+			foreach ($result['status'] as $line) {
+				$tokens = \explode(' ', $line);
+				switch ($tokens[0])
+				{
+				case 'VERIFICATION_COMPLIANCE_MODE':
+				case 'TRUST_FULLY':
+					break;
+
+				case 'EXPSIG':
+				case 'EXPKEYSIG':
+				case 'REVKEYSIG':
+				case 'BADSIG':
+				case 'ERRSIG':
+				case 'GOODSIG':
+					$signatures[] = [
+						'fingerprint' => '',
+						'validity' => 0,
+						'timestamp' => 0,
+						'status' => 'GOODSIG' === $tokens[0] ? 0 : 1,
+						'summary' => 'GOODSIG' === $tokens[0] ? 0 : 4,
+						'keyid' => $tokens[1],
+						'uid' => \rawurldecode(\implode(' ', \array_splice($tokens, 2))),
+						'valid' => false
+					];
+					break;
+
+				case 'VALIDSIG':
+					$last = \array_key_last($signatures);
+					$signatures[$last]['fingerprint'] = $tokens[1];
+					$signatures[$last]['timestamp'] = (int) $tokens[3];
+					$signatures[$last]['expires'] = (int) $tokens[4];
+					$signatures[$last]['version'] = (int) $tokens[5];
+//					$signatures[$last]['reserved'] = (int) $tokens[6];
+//					$signatures[$last]['pubkey-algo'] = (int) $tokens[7];
+//					$signatures[$last]['hash-algo'] = (int) $tokens[8];
+//					$signatures[$last]['sig-class'] = $tokens[9];
+//					$signatures[$last]['primary-fingerprint'] = $tokens[10];
+					$signatures[$last]['valid'] = 0;
+				}
+			}
+		}
+
+		return $signatures;
+	}
+
+	/**
+	 * Verifies a signed text
+	 */
+	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	{
+		return $this->_verify($signed_text, $signature);
+	}
+
+	/**
+	 * Verifies a signed file
+	 */
+	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	{
+		$fp = \fopen($filename, 'rb');
+		try {
+			if (!$fp) {
+				throw new \Exception("Could not open file '{$filename}'");
+			}
+			return $this->_verify($fp, $signature);
+		} finally {
+			$fp && \fclose($fp);
+		}
+	}
+
+	/**
+	 * Verifies a signed file
+	 */
+	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+//		\rewind($fp);
+		return $this->_verify($fp, $signature);
+	}
+
+	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
+	{
+		$this->_debug('BEGIN DETECT MESSAGE KEY IDs');
+		$this->setInput($data);
+//		$_ENV['PINENTRY_USER_DATA'] = null;
+		$result = $this->exec(['--decrypt','--skip-verify'], false);
+		$info = [
+			'ENC_TO' => [],
+//			'KEY_CONSIDERED' => [],
+//			'NO_SECKEY' => [],
+		];
+		if ($result) {
+			foreach ($result['status'] as $line) {
+				$tokens = \explode(' ', $line);
+				if (isset($info[$tokens[0]])) {
+					$info[$tokens[0]][] = $tokens[1];
+				}
+			}
+		}
+		$this->_debug('END DETECT MESSAGE KEY IDs');
+		return $info['ENC_TO'];
+	}
+
+	protected function execOutput(array $arguments, /*string|resource*/ $output = null)
+	{
+		$fclose = $this->setOutput($output);
+		$result = $this->exec($arguments);
+		$fclose && \fclose($fclose);
+		return $output ? true : ($result ? $result['output'] : false);
+	}
+
+	private function exec(array $arguments, bool $throw = true): array|false
+	{
+		if (\version_compare($this->version, '2.2.5', '<')) {
+			\SnappyMail\Log::error('GPG', "{$this->version} too old");
+			return false;
+		}
+
+		$defaultArguments = [
+			'--status-fd ' . self::FD_STATUS,
+			'--command-fd ' . self::FD_COMMAND,
+//			'--no-greeting',
+			'--no-secmem-warning',
+			'--no-tty',
+			'--no-default-keyring',         // ignored if keying files are not specified
+			'--no-options',                 // prevent creation of ~/.gnupg directory
+			'--no-permission-warning',      // 1.0.7+
+//			'--no-use-agent',               // < 2.0.0
+			'--exit-on-status-write-error', // 1.4.2+
+			'--trust-model always',         // 1.3.2+ else --always-trust
+			// If no passphrases are set, cancel them
+			'--pinentry-mode ' . (empty($_ENV['PINENTRY_USER_DATA']) ? 'cancel' : 'loopback') // 2.1.13+
+		];
+
+		if (!$this->strict) {
+			$defaultArguments[] = '--ignore-time-conflict';
+			$defaultArguments[] = '--ignore-valid-from';
+		}
+
+		if ($this->options['digest-algo']) {
+			$this->options['s2k-digest-algo'] = $this->options['digest-algo'];
+		}
+		if ($this->options['cipher-algo']) {
+			$this->options['s2k-cipher-algo'] = $this->options['cipher-algo'];
+		}
+
+		foreach ($this->options as $option => $value) {
+			if (\is_string($value)) {
+				if (\strlen($value)) {
+					$defaultArguments[] = "--{$option} " . \escapeshellarg($value);
+				}
+			} else if (true === $value) {
+				$defaultArguments[] = "--{$option}";
+			} else if ('compress-algo' === $option && 2 !== $value) {
+				$defaultArguments[] = "--{$option} " . \intval($value);
+			}
+		}
+
+		$commandLine = $this->binary . ' ' . \implode(' ', \array_merge($defaultArguments, $arguments));
+
+		$descriptorSpec = [
+			self::FD_INPUT   => array('pipe', 'rb'), // stdin
+			self::FD_OUTPUT  => array('pipe', 'wb'), // stdout
+			self::FD_ERROR   => array('pipe', 'wb'), // stderr
+			self::FD_STATUS  => array('pipe', 'wb'), // status
+			self::FD_COMMAND => array('pipe', 'rb'), // command
+			self::FD_MESSAGE => array('pipe', 'rb')  // message
+		];
+
+		$this->_debug('OPENING SUBPROCESS WITH THE FOLLOWING COMMAND:');
+		$this->_debug($commandLine);
+
+		// Don't localize GnuPG results.
+		$env = $_ENV;
+		$env['LC_ALL'] = 'C';
+		$env = \array_filter($env, fn($var) => \is_scalar($var));
+
+		$proc_pipes = [];
+
+		$this->proc_resource = \proc_open(
+			$commandLine,
+			$descriptorSpec,
+			$proc_pipes,
+			null,
+			$env,
+			['binary_pipes' => true]
+		);
+
+		if (!\is_resource($this->proc_resource)) {
+			throw new \Exception('Unable to open process.');
+		}
+
+		$this->_openPipes = new ProcPipes($proc_pipes);
+
+		$this->_debug('BEGIN PROCESSING');
+
+		$commandBuffer   = '';    // buffers input to GPG
+		$messageBuffer   = '';    // buffers input to GPG
+		$inputBuffer     = '';    // buffers input to GPG
+		$outputBuffer    = '';    // buffers output from GPG
+		$inputComplete   = false; // input stream is completely buffered
+		$messageComplete = false; // message stream is completely buffered
+
+		if (\is_string($this->_input)) {
+			$inputBuffer   = $this->_input;
+			$inputComplete = true;
+		}
+
+		if (\is_string($this->_message)) {
+			$messageBuffer   = $this->_message;
+			$messageComplete = true;
+		}
+
+		$status = [];
+		$errors = [];
+
+		// convenience variables
+		$fdInput   = $proc_pipes[self::FD_INPUT];
+		$fdOutput  = $proc_pipes[self::FD_OUTPUT];
+		$fdError   = $proc_pipes[self::FD_ERROR];
+		$fdStatus  = $proc_pipes[self::FD_STATUS];
+		$fdCommand = $proc_pipes[self::FD_COMMAND];
+		$fdMessage = $proc_pipes[self::FD_MESSAGE];
+
+		// select loop delay in milliseconds
+		$delay         = 0;
+		$inputPosition = 0;
+
+		$start = \microtime(1);
+
+		while (true) {
+			// Timeout after 5 seconds
+			if (5 < \microtime(1) - $start) {
+				$errors[] = 'timeout';
+				throw new \RuntimeException(\implode("\n", $errors));
+			}
+
+			$inputStreams     = [];
+			$outputStreams    = [];
+			$exceptionStreams = [];
+
+			// set up input streams
+			if (!$inputComplete && \is_resource($this->_input)) {
+				if (\feof($this->_input)) {
+					$inputComplete = true;
+				} else {
+					$inputStreams[] = $this->_input;
+				}
+			}
+
+			// close GPG input pipe if there is no more data
+			if ('' == $inputBuffer && $inputComplete) {
+				$this->_debug('=> closing input pipe');
+				$this->_openPipes->close(self::FD_INPUT);
+			}
+
+			if (\is_resource($this->_message) && !$messageComplete) {
+				if (\feof($this->_message)) {
+					$messageComplete = true;
+				} else {
+					$inputStreams[] = $this->_message;
+				}
+			}
+
+			if (!\feof($fdOutput)) {
+				$inputStreams[] = $fdOutput;
+			}
+
+			if (!\feof($fdStatus)) {
+				$inputStreams[] = $fdStatus;
+			}
+
+			if (!\feof($fdError)) {
+				$inputStreams[] = $fdError;
+			}
+
+			// set up output streams
+			if ('' != $outputBuffer && $this->_output) {
+				$outputStreams[] = $this->_output;
+			}
+
+			if ($commandBuffer != '' && \is_resource($fdCommand)) {
+				$outputStreams[] = $fdCommand;
+			}
+
+			if ('' != $messageBuffer) {
+				if (\is_resource($fdMessage)) {
+					$outputStreams[] = $fdMessage;
+				}
+			} else if ($messageComplete) {
+				// close GPG message pipe if there is no more data
+				$this->_debug('=> closing message pipe');
+				$this->_openPipes->close(self::FD_MESSAGE);
+			}
+
+			if ($inputBuffer != '' && \is_resource($fdInput)) {
+				$outputStreams[] = $fdInput;
+			}
+
+			// no streams left to read or write, we're all done
+			if (!\count($inputStreams) && !\count($outputStreams)) {
+				break;
+			}
+
+			$this->_debug('selecting streams');
+
+			$ready = \stream_select(
+				$inputStreams,
+				$outputStreams,
+				$exceptionStreams,
+				5
+			);
+
+			$this->_debug('=> got ' . $ready);
+
+			if ($ready === false) {
+				throw new \Exception(
+					'Error selecting stream for communication with GPG ' .
+					'subprocess. Please file a bug report at: ' .
+					'http://pear.php.net/bugs/report.php?package=Crypt_GPG'
+				);
+			}
+
+			if ($ready === 0) {
+				throw new \Exception(
+					'stream_select() returned 0. This can not happen! Please ' .
+					'file a bug report at: ' .
+					'http://pear.php.net/bugs/report.php?package=Crypt_GPG'
+				);
+			}
+
+			// write input (to GPG)
+			if (\in_array($fdInput, $outputStreams, true)) {
+				$this->_debug('ready for input');
+				$chunk  = \substr($inputBuffer, $inputPosition, self::CHUNK_SIZE);
+				$length = \strlen($chunk);
+				$this->_debug('=> about to write ' . $length . ' bytes to input');
+				$length = $this->_openPipes->writePipe(self::FD_INPUT, $chunk, $length);
+				if ($length) {
+					$this->_debug('=> wrote ' . $length . ' bytes');
+					// Move the position pointer, don't modify $inputBuffer (#21081)
+					if (\is_string($this->_input)) {
+						$inputPosition += $length;
+					} else {
+						$inputPosition = 0;
+						$inputBuffer   = \substr($inputBuffer, $length);
+					}
+				} else {
+					$this->_debug('=> pipe broken and closed');
+				}
+			}
+
+			// read input (from PHP stream)
+			// If the buffer is too big wait until it's smaller, we don't want
+			// to use too much memory
+			if (\in_array($this->_input, $inputStreams, true) && \strlen($inputBuffer) < self::CHUNK_SIZE) {
+				$this->_debug('input stream is ready for reading');
+				$chunk        = \fread($this->_input, self::CHUNK_SIZE);
+				$length       = \strlen($chunk);
+				$inputBuffer .= $chunk;
+				$this->_debug('=> read ' . $length . ' bytes');
+			}
+
+			// write message (to GPG)
+			if (\in_array($fdMessage, $outputStreams, true)) {
+				$this->_debug('ready for message data');
+				$this->_debug('=> about to write ' . \min(self::CHUNK_SIZE, \strlen($messageBuffer)) . ' bytes to message');
+				$length = $this->_openPipes->writePipe(self::FD_MESSAGE, $messageBuffer, self::CHUNK_SIZE);
+				if ($length) {
+					$this->_debug('=> wrote ' . $length . ' bytes');
+					$messageBuffer = \substr($messageBuffer, $length);
+				} else {
+					$this->_debug('=> pipe broken and closed');
+				}
+			}
+
+			// read message (from PHP stream)
+			if (\in_array($this->_message, $inputStreams, true)) {
+				$this->_debug('message stream is ready for reading');
+				$chunk          = \fread($this->_message, self::CHUNK_SIZE);
+				$length         = \strlen($chunk);
+				$messageBuffer .= $chunk;
+				$this->_debug('=> read ' . $length . ' bytes');
+			}
+
+			// read output (from GPG)
+			if (\in_array($fdOutput, $inputStreams, true)) {
+				$this->_debug('output stream ready for reading');
+				$chunk         = \fread($fdOutput, self::CHUNK_SIZE);
+				$length        = \strlen($chunk);
+				$outputBuffer .= $chunk;
+				$this->_debug('=> read ' . $length . ' bytes');
+			}
+
+			// write output (to PHP stream)
+			if (\in_array($this->_output, $outputStreams, true)) {
+				$this->_debug('output stream is ready for data');
+				$chunk  = \substr($outputBuffer, 0, self::CHUNK_SIZE);
+				$length = \strlen($chunk);
+				$this->_debug('=> about to write ' . $length . ' bytes to output stream');
+				$length = \fwrite($this->_output, $chunk, $length);
+				if (!$length) {
+					$this->_debug('=> broken pipe on output stream');
+					$this->_debug('=> closing pipe output stream');
+					$this->_openPipes->close(self::FD_OUTPUT);
+				} else {
+					$this->_debug('=> wrote ' . $length . ' bytes');
+					$outputBuffer = \substr($outputBuffer, $length);
+				}
+			}
+
+			// read error (from GPG)
+			if (\in_array($fdError, $inputStreams, true)) {
+				$this->_debug('error stream ready for reading');
+				foreach ($this->_openPipes->readPipeLines(self::FD_ERROR) as $line) {
+					$this->_debug("\t{$line}");
+					$errors[] = \preg_replace('/^gpg: /', '', $line);
+					if ($throw && (\str_contains($line, 'error') || \str_contains($line, 'failed'))) {
+						break 2;
+					}
+				}
+			}
+
+			// read status (from GPG)
+			if (\in_array($fdStatus, $inputStreams, true)) {
+				$this->_debug('status stream ready for reading');
+				// pass lines to status handlers
+				foreach ($this->_openPipes->readPipeLines(self::FD_STATUS) as $line) {
+					// only pass lines beginning with magic prefix
+					if ('[GNUPG:] ' == \substr($line, 0, 9)) {
+						$line = \substr($line, 9);
+						$status[] = $line;
+						$this->_debug("\t{$line}");
+
+						$tokens = \explode(' ', $line);
+						// NEED_PASSPHRASE 0123456789ABCDEF 0123456789ABCDEF 1 0
+						if ('NEED_PASSPHRASE' === $tokens[0]) {
+							// key ?: subkey
+							$passphrase = $this->getPassphrase($tokens[1]) ?: $this->getPassphrase($tokens[2]);
+							$commandBuffer .= $passphrase . PHP_EOL;
+						}
+					}
+				}
+			}
+
+			// write command (to GPG)
+			if (\in_array($fdCommand, $outputStreams, true)) {
+				$this->_debug('ready for command data');
+				$chunk  = \substr($commandBuffer, 0, self::CHUNK_SIZE);
+				$length = \strlen($chunk);
+				$this->_debug('=> about to write ' . $length . ' bytes to command');
+				$length = $this->_openPipes->writePipe(self::FD_COMMAND, $chunk, $length);
+				if ($length) {
+					$this->_debug('=> wrote ' . $length);
+					$commandBuffer = \substr($commandBuffer, $length);
+				} else {
+					$this->_debug('=> pipe broken and closed');
+				}
+			}
+
+			if (\count($outputStreams) === 0 || \count($inputStreams) === 0) {
+				// we have an I/O imbalance, increase the select loop delay
+				// to smooth things out
+				$delay += 10;
+			} else {
+				// things are running smoothly, decrease the delay
+				$delay -= 8;
+				$delay = \max(0, $delay);
+			}
+
+			if ($delay > 0) {
+				\usleep($delay);
+			}
+
+		} // end loop while streams are open
+
+		$this->_debug('END PROCESSING');
+
+		$exitCode = $this->proc_close();
+
+		$this->_message = null;
+		$this->_input   = null;
+		$this->_output  = null;
+
+		if ($throw && $exitCode && $errors) {
+			throw new \RuntimeException(\implode(".\n", $errors), $exitCode);
+		}
+
+		return [
+			'output' => $outputBuffer,
+			'status' => $status,
+			'errors' => $errors
+		];
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpgkeysettings.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgpkeysettings.php
similarity index 98%
rename from snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpgkeysettings.php
rename to snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgpkeysettings.php
index 3936f51b3..007a5548a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpgkeysettings.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/pgpkeysettings.php
@@ -1,8 +1,8 @@
 <?php
 
-namespace SnappyMail\PGP;
+namespace SnappyMail\GPG;
 
-class GPGKeySettings
+class PGPKeySettings
 {
 	public
 		// Primary key
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php
new file mode 100644
index 000000000..d9c04cbf9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/procpipes.php
@@ -0,0 +1,88 @@
+<?php
+/**
+ * GnuPG
+ */
+
+namespace SnappyMail\GPG;
+
+class ProcPipes
+{
+	private $pipes;
+
+	function __construct(array $pipes)
+	{
+		// Set streams as non-blocking.
+		foreach ($pipes as $pipe) {
+			\stream_set_blocking($pipe, 0);
+			\stream_set_write_buffer($pipe, Base::CHUNK_SIZE);
+			\stream_set_chunk_size($pipe, Base::CHUNK_SIZE);
+			\stream_set_read_buffer($pipe, Base::CHUNK_SIZE);
+		}
+		$this->pipes = $pipes;
+	}
+
+	function __destruct()
+	{
+		$this->closeAll();
+	}
+
+	public function closeAll(): void
+	{
+		$this->pipes && \array_all(\array_keys($this->pipes), [$this, 'close']);
+		$this->pipes = [];
+	}
+
+	public function get(int $number): mixed
+	{
+		if (\array_key_exists($number, $this->pipes) && \is_resource($this->pipes[$number])) {
+			return $this->pipes[$number];
+		}
+	}
+
+	public function close(int $number): void
+	{
+		if (\array_key_exists($number, $this->pipes)) {
+			\fflush($this->pipes[$number]);
+			\fclose($this->pipes[$number]);
+			unset($this->pipes[$number]);
+		}
+	}
+
+	private $buffers = [];
+	public function readPipeLines(int $number): iterable
+	{
+		$pipe = $this->get($number);
+		if ($pipe) {
+			$chunk     = \fread($pipe, Base::CHUNK_SIZE);
+			$length    = \strlen($chunk);
+			$eolLength = \strlen(\PHP_EOL);
+			if (!isset($this->buffers[$number])) {
+				$this->buffers[$number] = '';
+			}
+			$this->buffers[$number] .= $chunk;
+			while (false !== ($pos = \strpos($this->buffers[$number], \PHP_EOL))) {
+				yield \substr($this->buffers[$number], 0, $pos);
+				$this->buffers[$number] = \substr($this->buffers[$number], $pos + $eolLength);
+			}
+		}
+	}
+
+	public function writePipe(int $number, string $data, int $length = 0): int
+	{
+		$pipe = $this->get($number);
+		if ($pipe) {
+			$chunk  = \substr($data, 0, $length ?: \strlen($data));
+			$length = \strlen($chunk);
+			$length = \fwrite($pipe, $chunk, $length);
+			if (!$length) {
+				// If we wrote 0 bytes it was either EAGAIN or EPIPE. Since
+				// the pipe was seleted for writing, we assume it was EPIPE.
+				// There's no way to get the actual error code in PHP. See
+				// PHP Bug #39598. https://bugs.php.net/bug.php?id=39598
+				$this->close($number);
+			}
+			return $length ?: 0;
+		}
+		return 0;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
similarity index 61%
rename from snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
rename to snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
index 19ff4f2c2..bbba86b59 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gpg.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/gpg/smime.php
@@ -3,86 +3,37 @@
  * This class is inspired by PEAR Crypt_GPG and PECL gnupg
  * It does not support gpg v1 because that is missing ECDH, ECDSA, EDDSA
  * It does not support gpg < v2.2.5 as they are from before 2018
+ *
+ * https://www.gnupg.org/(en)/documentation/manuals/gnupg24/gpgsm.1.html
+ *
+ * gpgsm --dump-options
  */
 
-namespace SnappyMail\PGP;
+namespace SnappyMail\GPG;
 
-class GPG
+use SnappyMail\SensitiveString;
+
+class SMIME extends Base
 {
-	const
-		// @see https://pear.php.net/bugs/bug.php?id=21077
-		CHUNK_SIZE = 65536,
-
-		// This is used to pass data to the GPG process.
-		FD_INPUT = 0,
-
-		// This is used to receive normal output from the GPG process.
-		FD_OUTPUT = 1,
-
-		// This is used to receive error output from the GPG process.
-		FD_ERROR = 2,
-
-		/**
-		 * GPG status output file descriptor. The status file descriptor outputs
-		 * detailed information for many GPG commands. See the second section of
-		 * the file <b>doc/DETAILS</b> in the
-		 * {@link http://www.gnupg.org/download/ GPG package} for a detailed
-		 * description of GPG's status output.
-		 */
-		FD_STATUS = 3,
-
-		// This is used for methods requiring passphrases.
-		FD_COMMAND = 4,
-
-		// This is used for passing signed data when verifying a detached signature.
-		FD_MESSAGE = 5;
-
-	public
-		$strict = false;
-
 	private
 		$_message,
-		$_input,
-		$_output,
 
-		$signKeys = [],
-		$encryptKeys = [],
-		$decryptKeys = [];
-
-	private
-		$binary,
-		$version = '2.0',
 		$ciphers = [],
-		$digests = [],
-		$curves = [],
-		$pubkey_types = [],
-		$compressions = [],
-		$passphrases = [],
-
-		$proc_resource,
-
-		$armor = true,
-
-		$signmode = 2,
+		$hashes = [],
+		$pubkey_types = [];
 
+	protected
 		// https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html
 		$options = [
 			'homedir' => '',
 			'keyring' => '',
-			'secret-keyring' => '',
 			'digest-algo' => '',
-			'cipher-algo' => '',
-			/*
-			2 = ZLIB (GnuPG, default)
-			1 = ZIP (PGP)
-			0 = Uncompressed
-			*/
-			'compress-algo' => 2,
+			'cipher-algo' => ''
 		];
 
 	function __construct(string $homedir)
 	{
-		$this->options['homedir'] = \rtrim($homedir, '/\\');
+		parent::__construct($homedir);
 
 		// the random seed file makes subsequent actions faster so only disable it if we have to.
 		if ($this->options['homedir'] && !\is_writable($this->options['homedir'])) {
@@ -90,102 +41,40 @@ class GPG
 		}
 
 		// How to use gpgme-json ?
-		$this->binary = static::findBinary('gpg');
+		$this->binary = static::findBinary('gpgsm');
 
-		$info = \preg_replace('/\R +/', ' ', `$this->binary --with-colons --list-config`);
-		if (\preg_match('/cfg:version:([0-9]+\\.[0-9]+\\.[0-9]+)/', $info, $match)) {
+		$info = \preg_replace('/\R +/', ' ', \shell_exec(\escapeshellcmd($this->binary) . ' --version') );
+		if (\preg_match('/gpgsm.+([0-9]+\\.[0-9]+\\.[0-9]+)/', $info, $match)) {
 			$this->version = $match[1];
 		}
-		if (\preg_match('/cfg:cipher:(.+)/', $info, $match) && \preg_match('/cfg:ciphername:(.+)/', $info, $match1)) {
-			$this->ciphers = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		if (\preg_match('/Cipher:(.+)/', $info, $match)) {
+			$this->ciphers = \array_map('trim', \explode(',', $match[1]));
 		}
-		if (\preg_match('/cfg:digest:(.+)/', $info, $match) && \preg_match('/cfg:digestname:(.+)/', $info, $match1)) {
-			$this->digests = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
+		if (\preg_match('/Pubkey:(.+)/', $info, $match)) {
+			$this->pubkey_types = \array_map('trim', \explode(',', $match[1]));
 		}
-		if (\preg_match('/cfg:pubkey:(.+)/', $info, $match) && \preg_match('/cfg:pubkeyname:(.+)/', $info, $match1)) {
-			$this->pubkey_types = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
-		}
-		if (\preg_match('/cfg:compress:(.+)/', $info, $match) && \preg_match('/cfg:compressname:(.+)/', $info, $match1)) {
-			$this->compressions = \array_combine(\explode(';', $match[1]), \explode(';', $match1[1]));
-		}
-		if (\preg_match('/cfg:curve:(.+)/', $info, $match)) {
-			$this->curves = \explode(';', $match[1]);
+		if (\preg_match('/Hash:(.+)/', $info, $match)) {
+			$this->hashes = \array_map('trim', \explode(',', $match[1]));
 		}
 	}
 
-	function __destruct()
+	public static function isSupported(): bool
 	{
-		$this->proc_close();
-
-		$gpgconf = static::findBinary('gpgconf');
-		if ($gpgconf) {
-			$env = ['GNUPGHOME' => $this->options['homedir']];
-			$pipes = [];
-			if ($process = \proc_open($gpgconf . ' --kill gpg-agent --homedir ' . \escapeshellarg($this->options['homedir']), [], $pipes, null, $env)) {
-				\proc_close($process);
-			}
-		}
-	}
-
-	public static function isSupported() : bool
-	{
-		return \is_callable('proc_open') && static::findBinary('gpg');
+		return parent::isSupported() && static::findBinary('gpgsm');
 	}
 
 	/**
-	 * Add a key for decryption
+	 * TODO: parse result
+	 * https://github.com/the-djmaze/snappymail/issues/89
 	 */
-	public function addDecryptKey(string $fingerprint, string $passphrase) : bool
+	protected function listDecryptKeys(/*string|resource*/ $input, /*string|resource*/ $output = null)
 	{
-		$this->decryptKeys[$fingerprint] = $passphrase;
-//		$this->decryptKeys[\substr($fingerprint, -16)] = $passphrase;
-		return true;
-	}
-
-	/**
-	 * Add a key for encryption
-	 */
-	public function addEncryptKey(string $fingerprint) : bool
-	{
-		$this->encryptKeys[$fingerprint] = 1;
-		return true;
-	}
-
-	/**
-	 * Add a key for signing
-	 */
-	public function addSignKey(string $fingerprint, string $passphrase) : bool
-	{
-		$this->signKeys[$fingerprint] = $passphrase;
-//		$this->signKeys[\substr($fingerprint, -16)] = $passphrase;
-		return false;
-	}
-
-	/**
-	 * Removes all keys which were set for decryption before
-	 */
-	public function clearDecryptKeys() : bool
-	{
-		$this->decryptKeys = [];
-		return true;
-	}
-
-	/**
-	 * Removes all keys which were set for encryption before
-	 */
-	public function clearEncryptKeys() : bool
-	{
-		$this->encryptKeys = [];
-		return true;
-	}
-
-	/**
-	 * Removes all keys which were set for signing before
-	 */
-	public function clearSignKeys() : bool
-	{
-		$this->signKeys = [];
-		return true;
+		$this->setInput($input);
+		$fclose = $this->setOutput($output);
+		$_ENV['PINENTRY_USER_DATA'] = '';
+		$result = $this->exec(['--list-secret-keys']);
+		$fclose && \fclose($fclose);
+		return $output ? true : ($result ? $result['output'] : false);
 	}
 
 	protected function _decrypt(/*string|resource*/ $input, /*string|resource*/ $output = null)
@@ -194,8 +83,8 @@ class GPG
 
 		$fclose = $this->setOutput($output);
 
-		if ($this->decryptKeys) {
-			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->decryptKeys);
+		if ($this->pinentries) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->pinentries);
 		}
 
 		$result = $this->exec(['--decrypt','--skip-verify']);
@@ -208,7 +97,7 @@ class GPG
 	/**
 	 * Decrypts a given text
 	 */
-	public function decrypt(string $text) /*: string|false */
+	public function decrypt(string $text): string|false
 	{
 		return $this->_decrypt($text);
 	}
@@ -216,7 +105,7 @@ class GPG
 	/**
 	 * Decrypts a given file
 	 */
-	public function decryptFile(string $filename) /*: string|false */
+	public function decryptFile(string $filename): string|false
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -232,7 +121,7 @@ class GPG
 	/**
 	 * Decrypts a given stream
 	 */
-	public function decryptStream($fp, /*string|resource*/ $output = null) /*: string|false*/
+	public function decryptStream($fp, /*string|resource*/ $output = null): string|false
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -243,16 +132,18 @@ class GPG
 	/**
 	 * Decrypts and verifies a given text
 	 */
-	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
+	public function decryptVerify(string $text, string &$plaintext): array|false
 	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
 	/**
 	 * Decrypts and verifies a given file
 	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
+	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
 	{
+		// TODO: https://github.com/the-djmaze/snappymail/issues/89
 		return false;
 	}
 
@@ -287,7 +178,7 @@ class GPG
 	/**
 	 * Encrypts a given text
 	 */
-	public function encrypt(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
+	public function encrypt(string $plaintext, /*string|resource*/ $output = null): string|false
 	{
 		return $this->_encrypt($plaintext, $output);
 	}
@@ -295,7 +186,7 @@ class GPG
 	/**
 	 * Encrypts a given text
 	 */
-	public function encryptFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
+	public function encryptFile(string $filename, /*string|resource*/ $output = null): string|false
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -308,7 +199,7 @@ class GPG
 		}
 	}
 
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -319,7 +210,7 @@ class GPG
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSign(string $plaintext) /*: string|false*/
+	public function encryptSign(string $plaintext): string|false
 	{
 		return false;
 	}
@@ -327,159 +218,38 @@ class GPG
 	/**
 	 * Encrypts and signs a given text
 	 */
-	public function encryptSignFile(string $filename) /*: string|false*/
+	public function encryptSignFile(string $filename): string|false
 	{
 		return false;
 	}
 
-	protected function _exportKey($keyId, $private = false)
+	/**
+	 * Exports a public or private key
+	 */
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
 	{
-		$keys = $this->keyInfo($keyId, $private ? 1 : 0);
+		$private = null !== $passphrase;
+		$keys = $this->keyInfo($fingerprint, $private);
 		if (!$keys) {
-			throw new \Exception(($private ? 'Private' : 'Public') . ' key not found: ' . $keyId);
+			throw new \Exception(($private ? 'Private' : 'Public') . ' key not found: ' . $fingerprint);
 		}
-		if ($private && $this->passphrases) {
-			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->passphrases);
+		if ($private) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode([$fingerprint => \strval($passphrase)]);
 		}
 		$result = $this->exec([
-			$private ? '--export-secret-keys' : '--export',
+			$private ? '--export-secret-key-p12' : '--export',
 			'--armor',
 			\escapeshellarg($keys[0]['subkeys'][0]['fingerprint']),
 		]);
 		return $result['output'];
 	}
 
-	/**
-	 * Exports a public key
-	 */
-	public function export(string $fingerprint) /*: string|false*/
-	{
-		return $this->_exportKey($fingerprint);
-	}
-
-	/**
-	 * Exports a private key
-	 */
-	public function exportPrivateKey(string $fingerprint) /*: string|false*/
-	{
-		return $this->_exportKey($fingerprint, true);
-	}
-
-	/**
-	 * Returns the engine info
-	 */
-	public function getEngineInfo() : array
-	{
-		return [
-			'protocol' => null,
-			'file_name' => $this->binary,
-			'home_dir' => $this->options['homedir'],
-			'version' => $this->version
-		];
-	}
-
-	/**
-	 * Returns the errortext, if a function fails
-	 */
-	public function getError() /*: string|false*/
-	{
-		return false;
-	}
-
-	/**
-	 * Returns the error info
-	 */
-	public function getErrorInfo() : array
-	{
-		return false;
-	}
-
-	/**
-	 * Returns the currently active protocol for all operations
-	 */
-	public function getProtocol() : int
-	{
-		return 0;
-	}
-
-	public function addPassphrase($keyId, $passphrase)
-	{
-		$this->passphrases[$keyId] = $passphrase;
-		return $this;
-	}
-
-	/**
-	 * Generates a key
-	 * Also saves revocation certificate in {homedir}/openpgp-revocs.d/
-	 * https://www.gnupg.org/documentation/manuals/gnupg/OpenPGP-Key-Management.html
-	 */
-	public function generateKey(GPGKeySettings $settings) /*: string|false*/
-	{
-		$arguments = [
-			'--batch',
-			'--yes',
-			'--passphrase', \escapeshellarg($settings->passphrase)
-		];
-
-		/**
-		 * https://www.gnupg.org/documentation/manuals/gnupg/Unattended-GPG-key-generation.html
-		 * But it can't generate multiple subkeys
-		 * Somehow generating first subkey is also broken in v2.3.4
-		$this->_input = $settings->asUnattendedData();
-		$result = $this->exec(['--batch', '--yes', '--full-gen-key']);
-		 */
-		$result = $this->exec(\array_merge($arguments, [
-			'--quick-gen-key',
-			\escapeshellarg($settings->uid()),
-			$settings->algo(),
-			$settings->usage
-		]));
-
-		$fingerprint = '';
-		foreach ($result['status'] as $line) {
-			$tokens = \explode(' ', $line);
-			if ('KEY_CREATED' === $tokens[0]/* && 'P' === $tokens[1]*/) {
-				$fingerprint = $tokens[2];
-			}
-		}
-		if (!$fingerprint) {
-			if (!empty($result['errors'])) {
-				\SnappyMail\Log::error('GPG', \implode("\n\t", $result['errors']));
-			}
-			return false;
-		}
-
-		$arguments[] = '--quick-add-key';
-		$arguments[] = $fingerprint;
-
-		foreach ($settings->subkeys as $i => $key) {
-			$algo = 'default';
-			if (!empty($key['curve'])) {
-				$algo = $key['curve'];
-			}
-			if (!empty($key['type'])) {
-				$algo = $key['type'] . ($key['length'] ?? '');
-			}
-			$this->exec(\array_merge($arguments, [$algo, $key['usage'], '0']));
-		}
-
-/*
-		[status][0] => KEY_NOT_CREATED
-		[errors][0] => gpg: -:3: specified Key-Usage not allowed for algo 22
-		[errors][0] => gpg: key generation failed: Unknown elliptic curve
-
-		[status][0] => KEY_CONSIDERED B2FD2BCADCC6A9E4B2C90DBBE776CADFF94D327F 0
-		[status][1] => KEY_CREATED P B2FD2BCADCC6A9E4B2C90DBBE776CADFF94D327F
-*/
-		return $fingerprint;
-	}
-
-	protected function _importKey($input) /*: array|false*/
+	protected function _importKey($input): array|false
 	{
 		$arguments = ['--import'];
 
-		if ($this->passphrases) {
-			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->passphrases);
+		if ($this->pinentries) {
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->pinentries);
 		} else {
 			$arguments[] = '--batch';
 		}
@@ -514,7 +284,7 @@ class GPG
 	/**
 	 * Imports a key
 	 */
-	public function import(string $keydata) /*: array|false*/
+	public function import(string $keydata): array|false
 	{
 		if (!$keydata) {
 			throw new \Exception('No valid input data found.');
@@ -525,7 +295,7 @@ class GPG
 	/**
 	 * Imports a key
 	 */
-	public function importFile(string $filename) /*: array|false*/
+	public function importFile(string $filename): array|false
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -540,18 +310,18 @@ class GPG
 
 	public function deleteKey(string $keyId, bool $private)
 	{
-		$key = $this->keyInfo($keyId, $private ? 1 : 0);
+		$key = $this->keyInfo($keyId, $private);
 		if (!$key) {
 			throw new \Exception(($private ? 'Private' : 'Public') . ' key not found: ' . $keyId);
 		}
-		if (!$private && $this->keyInfo($keyId, 1)) {
-			throw new \Exception('Delete private key first: ' . $keyId);
+		if ($private) {
+			throw new \Exception('Delete private key not possible: ' . $keyId);
 		}
 
 		$result = $this->exec([
 			'--batch',
 			'--yes',
-			$private ? '--delete-secret-key' : '--delete-key',
+			'--delete-key',
 			\escapeshellarg($key[0]['subkeys'][0]['fingerprint'])
 		]);
 
@@ -565,7 +335,7 @@ class GPG
 	/**
 	 * Returns an array with information about all keys that matches the given pattern
 	 */
-	public function keyInfo(string $pattern, int $private = 0) : array
+	public function keyInfo(string $pattern, bool $private = false): array
 	{
 		// According to The file 'doc/DETAILS' in the GnuPG distribution, using
 		// double '--with-fingerprint' also prints the fingerprint for subkeys.
@@ -573,11 +343,9 @@ class GPG
 			'--with-colons',
 			'--with-fingerprint',
 			'--with-fingerprint',
-			'--fixed-list-mode',
-			$private ? '--list-secret-keys' : '--list-public-keys'
+			$private ? '--list-secret-keys' : '--list-keys'
 		];
 		if ($pattern) {
-			$arguments[] = '--utf8-strings';
 			$arguments[] = \escapeshellarg($pattern);
 		}
 
@@ -689,38 +457,9 @@ class GPG
 		return $keys;
 	}
 
-	/**
-	 * Toggle the armored output
-	 */
-	public function setArmor(int $armor = 1) : bool
+	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null): string|false
 	{
-		$this->armor = !!$armor;
-		return true;
-	}
-
-	/**
-	 * Sets the mode for error_reporting
-	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
-	 * By default GNUPG_ERROR_SILENT is used.
-	 */
-	public function setErrorMode(int $errormode) : void
-	{
-	}
-
-	/**
-	 * Sets the mode for signing
-	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH, GNUPG_SIG_MODE_CLEAR
-	 * By default GNUPG_SIG_MODE_CLEAR
-	 */
-	public function setSignMode(int $signmode) : bool
-	{
-		$this->signmode = $signmode;
-		return true;
-	}
-
-	protected function _sign(/*string|resource*/ $input, /*string|resource*/ $output = null, bool $textmode = true) /*: string|false*/
-	{
-		if (!$this->hasSignKeys()) {
+		if (empty($this->pinentries)) {
 			throw new \Exception('No signing keys specified.');
 		}
 
@@ -728,34 +467,19 @@ class GPG
 
 		$fclose = $this->setOutput($output);
 
-		$arguments = [];
-
-		switch ($this->signmode)
-		{
-		case 0: // GNUPG_SIG_MODE_NORMAL
-			$arguments[] = '--sign';
-			break;
-		case 1: // GNUPG_SIG_MODE_DETACH
-			$arguments[] = '--detach-sign';
-			break;
-		case 2: // GNUPG_SIG_MODE_CLEAR
-		default:
-			$arguments[] = '--clearsign';
-			break;
-		}
+		$arguments = [
+			'--sign'
+		];
 
 		if ($this->armor) {
 			$arguments[] = '--armor';
 		}
-		if ($textmode) {
-			$arguments[] = '--textmode';
-		}
 
-		if ($this->signKeys) {
-			foreach ($this->signKeys as $fingerprint => $pass) {
+		if ($this->pinentries) {
+			foreach ($this->pinentries as $fingerprint => $pass) {
 				$arguments[] = '--local-user ' . \escapeshellarg($fingerprint);
 			}
-			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->signKeys);
+			$_ENV['PINENTRY_USER_DATA'] = \json_encode($this->pinentries);
 		}
 
 		$result = $this->exec($arguments);
@@ -768,7 +492,7 @@ class GPG
 	/**
 	 * Signs a given text
 	 */
-	public function sign(string $plaintext, /*string|resource*/ $output = null) /*: string|false*/
+	public function sign(string $plaintext, /*string|resource*/ $output = null): string|false
 	{
 		return $this->_sign($plaintext, $output);
 	}
@@ -776,7 +500,7 @@ class GPG
 	/**
 	 * Signs a given file
 	 */
-	public function signFile(string $filename, /*string|resource*/ $output = null) /*: string|false*/
+	public function signFile(string $filename, /*string|resource*/ $output = null): string|false
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -792,7 +516,7 @@ class GPG
 	/**
 	 * Signs a given file
 	 */
-	public function signStream($fp, /*string|resource*/ $output = null) /*: array|false*/
+	public function signStream($fp, /*string|resource*/ $output = null): string|false
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -800,7 +524,7 @@ class GPG
 		return $this->_sign($fp, $output);
 	}
 
-	protected function _verify($input, string $signature)
+	protected function _verify($input, string $signature): array|false
 	{
 		$arguments = ['--verify'];
 		if ($signature) {
@@ -865,7 +589,7 @@ class GPG
 	/**
 	 * Verifies a signed text
 	 */
-	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
+	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
 	{
 		return $this->_verify($signed_text, $signature);
 	}
@@ -873,7 +597,7 @@ class GPG
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
+	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
 	{
 		$fp = \fopen($filename, 'rb');
 		try {
@@ -889,7 +613,7 @@ class GPG
 	/**
 	 * Verifies a signed file
 	 */
-	public function verifyStream($fp, string $signature, string &$plaintext = null) /*: array|false*/
+	public function verifyStream($fp, string $signature, ?string &$plaintext = null): array|false
 	{
 		if (!$fp || !\is_resource($fp)) {
 			throw new \Exception('Invalid stream resource');
@@ -897,38 +621,9 @@ class GPG
 		return $this->_verify($fp, $signature);
 	}
 
-	private function _debug(string $msg) : void
-	{
-		\SnappyMail\Log::debug('GPG', $msg);
-	}
-
-	private function setInput(&$input) : void
-	{
-		$this->_input =& $input;
-	}
-
-	private function setOutput($output)/* : resource|false*/
-	{
-		$fclose = false;
-		if ($output && !\is_resource($output)) {
-			$output = \fopen($output, 'wb');
-			if (!$output) {
-				throw new \Exception("Could not open file '{$filename}'");
-			}
-			$fclose = $output;
-		}
-		$this->_output = $output;
-		return $fclose;
-	}
-
-	public function agent()
-	{
-//		$home = \escapeshellarg($this->options['homedir']);
-//		echo `gpg-agent --daemon --homedir $home 2>&1`;
-	}
-
-	public function getEncryptedMessageKeys(/*string|resource*/ $data) : array
+	public function getEncryptedMessageKeys(/*string|resource*/ $data): array
 	{
+		$this->_debug('BEGIN DETECT MESSAGE KEY IDs');
 		$this->setInput($data);
 //		$_ENV['PINENTRY_USER_DATA'] = null;
 		$result = $this->exec(['--decrypt','--skip-verify']);
@@ -944,10 +639,11 @@ class GPG
 				$info[$tokens[0]][] = $tokens[1];
 			}
 		}
+		$this->_debug('END DETECT MESSAGE KEY IDs');
 		return $info['ENC_TO'];
 	}
 
-	private function exec(array $arguments) /*: array|false*/
+	private function exec(array $arguments, bool $throw = true): array|false
 	{
 		if (\version_compare($this->version, '2.2.5', '<')) {
 			\SnappyMail\Log::error('GPG', "{$this->version} too old");
@@ -956,30 +652,18 @@ class GPG
 
 		$defaultArguments = [
 			'--status-fd ' . self::FD_STATUS,
-			'--command-fd ' . self::FD_COMMAND,
+			'--passphrase-fd ' . self::FD_COMMAND,
 //			'--no-greeting',
 			'--no-secmem-warning',
 			'--no-tty',
 			'--no-default-keyring',         // ignored if keying files are not specified
 			'--no-options',                 // prevent creation of ~/.gnupg directory
-			'--no-permission-warning',      // 1.0.7+
-//			'--no-use-agent',               // < 2.0.0
-			'--exit-on-status-write-error', // 1.4.2+
-			'--trust-model always',         // 1.3.2+ else --always-trust
 			// If no passphrases are set, cancel them
 			'--pinentry-mode ' . (empty($_ENV['PINENTRY_USER_DATA']) ? 'cancel' : 'loopback') // 2.1.13+
 		];
 
 		if (!$this->strict) {
 			$defaultArguments[] = '--ignore-time-conflict';
-			$defaultArguments[] = '--ignore-valid-from';
-		}
-
-		if ($this->options['digest-algo']) {
-			$this->options['s2k-digest-algo'] = $this->options['digest-algo'];
-		}
-		if ($this->options['cipher-algo']) {
-			$this->options['s2k-cipher-algo'] = $this->options['cipher-algo'];
 		}
 
 		foreach ($this->options as $option => $value) {
@@ -989,8 +673,6 @@ class GPG
 				}
 			} else if (true === $value) {
 				$defaultArguments[] = "--{$option}";
-			} else if ('compress-algo' === $option && 2 !== $value) {
-				$defaultArguments[] = "--{$option} " . \intval($value);
 			}
 		}
 
@@ -1005,7 +687,7 @@ class GPG
 			self::FD_MESSAGE => array('pipe', 'rb')  // message
 		];
 
-		$this->_debug('OPENING GPG SUBPROCESS WITH THE FOLLOWING COMMAND:');
+		$this->_debug('OPENING SUBPROCESS WITH THE FOLLOWING COMMAND:');
 		$this->_debug($commandLine);
 
 		// Don't localize GnuPG results.
@@ -1024,10 +706,10 @@ class GPG
 		);
 
 		if (!\is_resource($this->proc_resource)) {
-			throw new \Exception('Unable to open GPG process.');
+			throw new \Exception('Unable to open process.');
 		}
 
-		$this->_openPipes = new GpgProcPipes($proc_pipes);
+		$this->_openPipes = new ProcPipes($proc_pipes);
 
 		$this->_debug('BEGIN PROCESSING');
 
@@ -1092,7 +774,7 @@ class GPG
 
 			// close GPG input pipe if there is no more data
 			if ('' == $inputBuffer && $inputComplete) {
-				$this->_debug('=> closing GPG input pipe');
+				$this->_debug('=> closing input pipe');
 				$this->_openPipes->close(self::FD_INPUT);
 			}
 
@@ -1131,7 +813,7 @@ class GPG
 				}
 			} else if ($messageComplete) {
 				// close GPG message pipe if there is no more data
-				$this->_debug('=> closing GPG message pipe');
+				$this->_debug('=> closing message pipe');
 				$this->_openPipes->close(self::FD_MESSAGE);
 			}
 
@@ -1150,7 +832,7 @@ class GPG
 				$inputStreams,
 				$outputStreams,
 				$exceptionStreams,
-				null
+				5
 			);
 
 			$this->_debug('=> got ' . $ready);
@@ -1173,10 +855,10 @@ class GPG
 
 			// write input (to GPG)
 			if (\in_array($fdInput, $outputStreams, true)) {
-				$this->_debug('GPG is ready for input');
+				$this->_debug('ready for input');
 				$chunk  = \substr($inputBuffer, $inputPosition, self::CHUNK_SIZE);
 				$length = \strlen($chunk);
-				$this->_debug('=> about to write ' . $length . ' bytes to GPG input');
+				$this->_debug('=> about to write ' . $length . ' bytes to input');
 				$length = $this->_openPipes->writePipe(self::FD_INPUT, $chunk, $length);
 				if ($length) {
 					$this->_debug('=> wrote ' . $length . ' bytes');
@@ -1206,8 +888,8 @@ class GPG
 
 			// write message (to GPG)
 			if (\in_array($fdMessage, $outputStreams, true)) {
-				$this->_debug('GPG is ready for message data');
-				$this->_debug('=> about to write ' . \min(self::CHUNK_SIZE, \strlen($messageBuffer)) . ' bytes to GPG message');
+				$this->_debug('ready for message data');
+				$this->_debug('=> about to write ' . \min(self::CHUNK_SIZE, \strlen($messageBuffer)) . ' bytes to message');
 				$length = $this->_openPipes->writePipe(self::FD_MESSAGE, $messageBuffer, self::CHUNK_SIZE);
 				if ($length) {
 					$this->_debug('=> wrote ' . $length . ' bytes');
@@ -1229,8 +911,8 @@ class GPG
 
 			// read output (from GPG)
 			if (\in_array($fdOutput, $inputStreams, true)) {
-				$this->_debug('GPG output stream ready for reading');
-				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from GPG output');
+				$this->_debug('output stream ready for reading');
+				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from output');
 				$chunk         = \fread($fdOutput, self::CHUNK_SIZE);
 				$length        = \strlen($chunk);
 				$outputBuffer .= $chunk;
@@ -1256,8 +938,8 @@ class GPG
 
 			// read error (from GPG)
 			if (\in_array($fdError, $inputStreams, true)) {
-				$this->_debug('GPG error stream ready for reading');
-				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from GPG error');
+				$this->_debug('error stream ready for reading');
+				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from error');
 				foreach ($this->_openPipes->readPipeLines(self::FD_ERROR) as $line) {
 					$errors[] = $line;
 					$this->_debug("\t{$line}");
@@ -1266,8 +948,8 @@ class GPG
 
 			// read status (from GPG)
 			if (\in_array($fdStatus, $inputStreams, true)) {
-				$this->_debug('GPG status stream ready for reading');
-				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from GPG status');
+				$this->_debug('status stream ready for reading');
+				$this->_debug('=> about to read ' . self::CHUNK_SIZE . ' bytes from status');
 				// pass lines to status handlers
 				foreach ($this->_openPipes->readPipeLines(self::FD_STATUS) as $line) {
 					// only pass lines beginning with magic prefix
@@ -1289,10 +971,10 @@ class GPG
 
 			// write command (to GPG)
 			if (\in_array($fdCommand, $outputStreams, true)) {
-				$this->_debug('GPG is ready for command data');
+				$this->_debug('ready for command data');
 				$chunk  = \substr($commandBuffer, 0, self::CHUNK_SIZE);
 				$length = \strlen($chunk);
-				$this->_debug('=> about to write ' . $length . ' bytes to GPG command');
+				$this->_debug('=> about to write ' . $length . ' bytes to command');
 				$length = $this->_openPipes->writePipe(self::FD_COMMAND, $chunk, $length);
 				if ($length) {
 					$this->_debug('=> wrote ' . $length);
@@ -1333,7 +1015,7 @@ class GPG
 		];
 	}
 
-	private function getPassphrase($key)
+	protected function getPassphrase(string $key): string
 	{
 		$passphrase  = '';
 		$keyIdLength = \strlen($key);
@@ -1350,7 +1032,7 @@ class GPG
 		return '';
 	}
 
-	private function proc_close() : int
+	protected function proc_close(): int
 	{
 		$exitCode = 0;
 
@@ -1358,7 +1040,7 @@ class GPG
 		$_ENV['PINENTRY_USER_DATA'] = null;
 
 		if (\is_resource($this->proc_resource)) {
-			$this->_debug('CLOSING GPG SUBPROCESS');
+			$this->_debug('CLOSING SUBPROCESS');
 
 			// close remaining open pipes
 			$this->_openPipes->closeAll();
@@ -1380,110 +1062,4 @@ class GPG
 
 		return $exitCode;
 	}
-
-	private static function findBinary($name) : ?string
-	{
-		$binary = \trim(`which $name`);
-		if ($binary && \is_executable($binary)) {
-			return $binary;
-		}
-		$locations = \array_filter([
-			'/sw/bin/',
-			'/usr/bin/',
-			'/usr/local/bin/',
-			'/opt/local/bin/',
-			'/run/current-system/sw/bin/'
-		], '\RainLoop\Utils::inOpenBasedir');
-		foreach ($locations as $location) {
-			if (\is_executable($location . $name)) {
-				return $location . $name;
-			}
-		}
-		return null;
-	}
-
-}
-
-
-class GpgProcPipes
-{
-	private $pipes;
-
-	function __construct(array $pipes)
-	{
-		// Set streams as non-blocking.
-		foreach ($pipes as $pipe) {
-			\stream_set_blocking($pipe, 0);
-			\stream_set_write_buffer($pipe, GPG::CHUNK_SIZE);
-			\stream_set_chunk_size($pipe, GPG::CHUNK_SIZE);
-			\stream_set_read_buffer($pipe, GPG::CHUNK_SIZE);
-		}
-		$this->pipes = $pipes;
-	}
-
-	function __destruct()
-	{
-		$this->closeAll();
-	}
-
-	public function closeAll() : void
-	{
-		foreach (\array_keys($this->pipes) as $number) {
-			$this->close($number);
-		}
-	}
-
-	public function get(int $number)
-	{
-		if (\array_key_exists($number, $this->pipes) && \is_resource($this->pipes[$number])) {
-			return $this->pipes[$number];
-		}
-	}
-
-	public function close(int $number) : void
-	{
-		if (\array_key_exists($number, $this->pipes)) {
-			\fflush($this->pipes[$number]);
-			\fclose($this->pipes[$number]);
-			unset($this->pipes[$number]);
-		}
-	}
-
-	private $buffers = [];
-	public function readPipeLines(int $number) : iterable
-	{
-		$pipe = $this->get($number);
-		if ($pipe) {
-			$chunk     = \fread($pipe, GPG::CHUNK_SIZE);
-			$length    = \strlen($chunk);
-			$eolLength = \strlen(PHP_EOL);
-			if (!isset($this->buffers[$number])) {
-				$this->buffers[$number] = '';
-			}
-			$this->buffers[$number] .= $chunk;
-			while (false !== ($pos = \strpos($this->buffers[$number], PHP_EOL))) {
-				yield \substr($this->buffers[$number], 0, $pos);
-				$this->buffers[$number] = \substr($this->buffers[$number], $pos + $eolLength);
-			}
-		}
-	}
-
-	public function writePipe(int $number, string $data, int $length = 0) : int
-	{
-		$pipe = $this->get($number);
-		if ($pipe) {
-			$chunk  = \substr($data, 0, $length ?: \strlen($data));
-			$length = \strlen($chunk);
-			$length = \fwrite($pipe, $chunk, $length);
-			if (!$length) {
-				// If we wrote 0 bytes it was either EAGAIN or EPIPE. Since
-				// the pipe was seleted for writing, we assume it was EPIPE.
-				// There's no way to get the actual error code in PHP. See
-				// PHP Bug #39598. https://bugs.php.net/bug.php?id=39598
-				$this->close($number);
-			}
-			return $length ?: 0;
-		}
-		return 0;
-	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/hibp.php b/snappymail/v/0.0.0/app/libraries/snappymail/hibp.php
new file mode 100644
index 000000000..106968502
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/hibp.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * https://haveibeenpwned.com/API/v3
+ * https://haveibeenpwned.com/API/Key
+ */
+
+namespace SnappyMail;
+
+class Hibp
+{
+	public static function password(SensitiveString $password): int
+	{
+		$pass = \strtoupper(\sha1($password));
+		$prefix = \substr($pass, 0, 5);
+		$suffix = \substr($pass, 5);
+		$response = HTTP\Request::factory()->doRequest('GET', "https://api.pwnedpasswords.com/range/{$prefix}");
+		if (200 !== $response->status) {
+			throw new HTTP\Exception('Hibp', $response->status);
+		}
+		foreach (\preg_split('/\\R/', $response->body) as $entry) {
+			if ($entry) {
+				$entry = \explode(':', $entry);
+				if ($entry[0] === $suffix) {
+					return (int) $entry[1];
+				}
+			}
+		}
+		return 0;
+	}
+
+	public static function account(string $api_key, string $email): ?array
+	{
+		if ($api_key) {
+			$email = \rawurlencode(IDN::emailToAscii($email));
+			$response = HTTP\Request::factory()->doRequest('GET', "https://haveibeenpwned.com/api/v3/breachedaccount/{$email}", null, [
+				'hibp-api-key' => $api_key
+			]);
+			if (200 !== $response->status) {
+				throw new HTTP\Exception('Hibp', $response->status);
+			}
+			return \json_decode($response->body, true);
+		}
+		return null;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
old mode 100644
new mode 100755
index 85fd5c23f..79c7a0ff5
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/csp.php
@@ -5,60 +5,77 @@
 
 namespace SnappyMail\HTTP;
 
-class CSP
+class CSP implements \Stringable
 {
 	public
-		$base = ["'self'"],
-		$default = ["'self'"],
-		// Knockout.js requires unsafe-inline?
-		// Knockout.js requires eval() for observable binding purposes
-		$script  = ["'self'", "'unsafe-eval'"/*, "'unsafe-inline'"*/],
-		$img     = ["'self'", 'data:'],
-		$style   = ["'self'", "'unsafe-inline'"],
-		$frame   = [],
-
 		$report = false,
 		$report_to = [],
 		$report_only = false;
 
+	/**
+	 * https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy#directives
+	 */
+	private $directives = [
+		'base-uri' => ["'self'"],
+		'default-src' => ["'self'", 'data:'],
+		// Knockout.js requires eval() for observable binding purposes
+		// Safari < 15.4 does not support strict-dynamic
+//		'script-src' => ["'strict-dynamic'", "'unsafe-eval'"],
+		'script-src' => ["'self'", "'unsafe-eval'"],
+		// Knockout.js requires unsafe-inline?
+//		'script-src' => ["'self'", "'unsafe-inline'", "'unsafe-eval'"],
+		'img-src' => ["'self'", 'data:'],
+		'media-src' => ["'self'", 'data:'],
+		'style-src' => ["'self'", "'unsafe-inline'"],
+		'connect-src' => ["'self'", 'data:', "keys.openpgp.org"]
+	];
+
 	function __construct(string $default = '')
 	{
 		if ($default) {
 			foreach (\explode(';', $default) as $directive) {
-				$values = \explode(' ', $directive);
-				$name = \preg_replace('/-.+/', '', \trim(\array_shift($values)));
-				$this->$name = $values;
+				$sources = \preg_split('/\\s+/', \trim($directive));
+				$directive = \array_shift($sources);
+				if (!isset($this->directives[$directive])) {
+					$this->directives[$directive] = [];
+				}
+				$this->directives[$directive] = \array_merge($this->directives[$directive], $sources);
 			}
 		}
 	}
 
 	function __toString() : string
 	{
-		$params = [
-			'base-uri ' . \implode(' ', $this->base),
-			'default-src ' . \implode(' ', $this->default)
-		];
-		if ($this->script) {
-			$params[] = 'script-src ' . \implode(' ', $this->script);
+		// report-uri deprecated
+		unset($this->directives['report-uri']);
+		if ($this->report || $this->report_only) {
+			$this->directives['report-uri'] = [\RainLoop\Utils::WebPath() . '?/CspReport'];
 		}
-		if ($this->img) {
-			$params[] = 'img-src ' . \implode(' ', $this->img);
+		$params = [];
+		foreach ($this->directives as $directive => $sources) {
+			$params[] = $directive . ' ' . \implode(' ', \array_unique($sources));
 		}
-		if ($this->style) {
-			$params[] = 'style-src ' . \implode(' ', $this->style);
-		}
-		if ($this->frame) {
-			$params[] = 'frame-src ' . \implode(' ', $this->frame);
-		}
-
-		// Deprecated
-		if ($this->report) {
-			$params[] = 'report-uri ./?/CspReport';
-		}
-
+//		if (empty($this->directives['frame-ancestors'])) {
+//			$params[] = "frame-ancestors 'none';";
+//		}
 		return \implode('; ', $params);
 	}
 
+	public function add(string $directive, string $source) : void
+	{
+		if (!isset($this->directives[$directive])) {
+			$this->directives[$directive] = [];
+		}
+		$this->directives[$directive][] = $source;
+	}
+
+	public function get(string $directive) : array
+	{
+		return isset($this->directives[$directive])
+			? $this->directives[$directive]
+			: [];
+	}
+
 	public function setHeaders() : void
 	{
 		if ($this->report_only) {
@@ -66,6 +83,11 @@ class CSP
 		} else {
 			\header('Content-Security-Policy: ' . $this);
 		}
+		if (empty($this->directives['frame-ancestors']) || \in_array('none', $this->directives['frame-ancestors'])) {
+			\header('X-Frame-Options: DENY');
+		} else {
+//			\header('X-Frame-Options: SAMEORIGIN');
+		}
 	}
 
 	public static function logReport() : void
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
index 9778e2028..ceed8b772 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/exception.php
@@ -66,7 +66,7 @@ class Exception extends \Exception
 		511 => 'Network Authentication Required',
 	);
 
-	function __construct(string $message = "", int $code = 0, Response $response = null)
+	function __construct(string $message = "", int $code = 0, ?Response $response = null)
 	{
 		if ($response) {
 			if (\in_array($code, array(301, 302, 303, 307))) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
index 301d87c34..04d9dd63a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request.php
@@ -7,9 +7,11 @@ abstract class Request
 	const
 		/**
 		 * Authentication
+		 * These are bitwise options
 		 */
 		AUTH_BASIC = 1,
-		AUTH_DIGEST = 2;
+		AUTH_DIGEST = 2,
+		AUTH_BEARER = 4;
 
 	public
 		$timeout = 5, // timeout in seconds.
@@ -48,7 +50,10 @@ abstract class Request
 		$this->user_agent = 'SnappyMail/' . APP_VERSION;
 	}
 
-	public function setAuth(int $type, string $user, string $pass) : void
+	public function setAuth(int $type, string $user,
+		#[\SensitiveParameter]
+		string $pass
+	) : void
 	{
 		$this->auth = [
 			'type' => $type,
@@ -71,7 +76,7 @@ abstract class Request
 		$this->stream = $stream;
 	}
 
-	public function setCABundleFile($file)
+	public function setCABundleFile(?string $file)
 	{
 		$this->ca_bundle = $file;
 	}
@@ -82,7 +87,7 @@ abstract class Request
 	 *
 	 * @return bool
 	 */
-	public function canFetchURI($uri)
+	public function canFetchURI(string $uri)
 	{
 		if ('https:' === \substr($uri, 0, 6) && !$this->supportsSSL()) {
 			\trigger_error('HTTPS URI unsupported fetching '.$uri, E_USER_WARNING);
@@ -106,7 +111,7 @@ abstract class Request
 
 	abstract protected function __doRequest(string &$method, string &$request_url, &$body, array $extra_headers) : Response;
 
-	public function doRequest($method, $request_url, $body = null, array $extra_headers = array()) : ?Response
+	public function doRequest(string $method, string $request_url, string|array|null $body = null, array $extra_headers = array()) : ?Response
 	{
 		$method = \strtoupper($method);
 		$url    = $request_url;
@@ -152,12 +157,12 @@ abstract class Request
 	 * Return whether a URI should be allowed. Override this method to conform to your local policy.
 	 * By default, will attempt to fetch any http or https URI.
 	 */
-	public static function URIHasAllowedScheme($uri) : bool
+	public static function URIHasAllowedScheme(string $uri) : bool
 	{
 		return (bool) \preg_match('#^https?://#i', $uri);
 	}
 
-	public static function getSchemePort($scheme) : int
+	public static function getSchemePort(string $scheme) : int
 	{
 		return self::$scheme_ports[$scheme] ?? 0;
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
index 37dad6cfa..f25fef1c0 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/curl.php
@@ -6,9 +6,8 @@ use SnappyMail\HTTP\Response;
 
 class CURL extends \SnappyMail\HTTP\Request
 {
-	private
-		$response_headers = array(),
-		$response_body = '';
+	private array $response_headers = array();
+	private string $response_body = '';
 
 	public function supportsSSL() : bool
 	{
@@ -51,15 +50,20 @@ class CURL extends \SnappyMail\HTTP\Request
 			\curl_setopt($c, CURLOPT_HTTPHEADER, $extra_headers);
 		}
 		if ($this->auth['user'] && $this->auth['type']) {
-			$auth = 0;
-			if ($this->auth['type'] & self::AUTH_BASIC) {
-				$auth |= CURLAUTH_BASIC;
+			if ($this->auth['type'] & self::AUTH_BEARER ) {
+				\curl_setopt($c, CURLOPT_HTTPAUTH, CURLAUTH_BEARER);
+				\curl_setopt($c, CURLOPT_XOAUTH2_BEARER, $this->auth['pass']);
+			} else {
+				$auth = 0;
+				if ($this->auth['type'] & self::AUTH_BASIC) {
+					$auth |= CURLAUTH_BASIC;
+				}
+				if ($this->auth['type'] & self::AUTH_DIGEST) {
+					$auth |= CURLAUTH_DIGEST;
+				}
+				\curl_setopt($c, CURLOPT_HTTPAUTH, $auth);
+				\curl_setopt($c, CURLOPT_USERPWD,  $this->auth['user'] . ':' . $this->auth['pass']);
 			}
-			if ($this->auth['type'] & self::AUTH_DIGEST) {
-				$auth |= CURLAUTH_DIGEST;
-			}
-			\curl_setopt($c, CURLOPT_HTTPAUTH, $auth);
-			\curl_setopt($c, CURLOPT_USERPWD,  $this->auth['user'] . ':' . $this->auth['pass']);
 		}
 		if ($this->proxy) {
 			\curl_setopt($c, CURLOPT_PROXY, $this->proxy);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php
index f0b65d7a1..8b6ffc975 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/request/socket.php
@@ -105,7 +105,7 @@ class Socket extends \SnappyMail\HTTP\Request
 					return $this->__doRequest($method, $request_url, $body, $extra_headers);
 				}
 				// Digest authentication
-				else if ($this->auth['type'] & self::AUTH_DIGEST && \preg_match("/WWW-Authenticate:\\s+Digest\\s+([^\\r\\n]*)/i", $data, $match)) {
+				if ($this->auth['type'] & self::AUTH_DIGEST && \preg_match("/WWW-Authenticate:\\s+Digest\\s+([^\\r\\n]*)/i", $data, $match)) {
 					$challenge = [];
 					foreach (\split(',', $match[1]) as $i) {
 						$ii = \split('=', \trim($i), 2);
@@ -126,7 +126,7 @@ class Socket extends \SnappyMail\HTTP\Request
 						$digest = \md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' . $challenge['cnonce'] . ':auth:' . $a2);
 					}
 					$extra_headers['Authorization'] = "Authorization: Digest "
-						. ' username="' . \str_replace(array('\\', '"'), array('\\\\', '\\"'), $this->auth['user']) . '",'
+						. ' username="' . \addcslashes($this->auth['user'], '\\"') . '",'
 						. ' realm="' . $challenge['realm'] . '",'
 						. ' nonce="' . $challenge['nonce'] . '",'
 						. ' uri="' . $request_url . '",'
@@ -137,6 +137,11 @@ class Socket extends \SnappyMail\HTTP\Request
 					\fclose($sock);
 					return $this->__doRequest($method, $request_url, $body, $extra_headers);
 				}
+				if ($this->auth['type'] & self::AUTH_BEARER) {
+					$extra_headers['Authorization'] = "Authorization: Bearer {$this->auth['pass']}";
+					\fclose($sock);
+					return $this->__doRequest($method, $request_url, $body, $extra_headers);
+				}
 			}
 
 			$data = \rtrim(\fgets($sock, 1024)); # read next line
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
index 3593aa41d..1c2f3b692 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/response.php
@@ -12,7 +12,7 @@ class Response
 		$headers = array(), # The headers returned from the final_uri
 		$body;              # The body returned from the final_uri
 
-	function __construct(string $request_uri, int $status = 0, array $headers = null, $body = null)
+	function __construct(string $request_uri, int $status = 0, ?array $headers = null, string $body = '')
 	{
 		if ($headers) {
 			$name = null;
@@ -39,12 +39,7 @@ class Response
 		$this->request_uri = $request_uri;
 		$this->final_uri   = $request_uri;
 		$this->status      = (int) $status;
-		if (\function_exists('gzinflate') && isset($this->headers['content-encoding'])
-		 && (false !== \stripos($this->headers['content-encoding'], 'gzip'))) {
-			$this->body = \gzinflate(\substr($body, 10, -4));
-		} else {
-			$this->body = $body;
-		}
+		$this->body = $body;
 	}
 
 	function __get($k)
@@ -52,10 +47,21 @@ class Response
 		return \property_exists($this, $k) ? $this->$k : null;
 	}
 
-	/**
-	 * returns string, array or null
-	 */
-	public function getHeader($names)
+	public function decoded(): string|false
+	{
+		$body = $this->body;
+		if (\function_exists('gzinflate') && isset($this->headers['content-encoding'])
+		 && (false !== \stripos($this->headers['content-encoding'], 'gzip'))) {
+			$body = \gzinflate(\substr($body, 10, -4));
+			if (false === $body) {
+				$err = \error_get_last() ?: ['message' => 'gzinflate failed'];
+				throw new \RuntimeException("{$err['message']} for {$request_uri}");
+			}
+		}
+		return $body;
+	}
+
+	public function getHeader(mixed $names): string|array|null
 	{
 		$names = \is_array($names) ? $names : array($names);
 		foreach ($names as $n) {
@@ -67,12 +73,12 @@ class Response
 		return null;
 	}
 
-	public function getHeaders() : array
+	public function getHeaders(): array
 	{
 		return $this->headers;
 	}
 
-	public function getRedirectLocation() : ?string
+	public function getRedirectLocation(): ?string
 	{
 		if ($location = $this->getHeader('location')) {
 			$uri = \is_array($location) ? $location[0] : $location;
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/secfetch.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/secfetch.php
index 406ffc2a9..536317b99 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/secfetch.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/secfetch.php
@@ -107,11 +107,43 @@ abstract class SecFetch
 
 	public static function isSameOrigin() : bool
 	{
-
 		return !isset($_SERVER['HTTP_SEC_FETCH_SITE'])
 			|| 'same-origin' === $_SERVER['HTTP_SEC_FETCH_SITE']
 			// Fulguris incognito: Dest = document, Mode = navigate, Site = none, User = true
 			|| 'none' === $_SERVER['HTTP_SEC_FETCH_SITE'];
 	}
 
+	/**
+	 * $rules = 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"
+	 */
+	public static function matchAnyRule(string $rules) : bool
+	{
+		if (!isset($_SERVER['HTTP_SEC_FETCH_SITE'])) {
+			return true;
+		}
+		$secfetch = \explode(';', 'site=same-origin;site=none;' . $rules);
+		foreach ($secfetch as $rule) {
+			if (\preg_match_all('/(dest|mode|site)=([^,]+)/', $rule, $matches, PREG_SET_ORDER)) {
+				$data = ['dest'=>'','mode'=>'','site'=>''];
+				foreach ($matches as $match) {
+					$data[$match[1]] = $match[2];
+				}
+				if ((!$data['site'] || static::site($data['site']))
+					&& (!$data['dest'] || !isset($_SERVER['HTTP_SEC_FETCH_DEST']) || static::dest($data['dest']))
+					&& (!$data['mode'] || !isset($_SERVER['HTTP_SEC_FETCH_MODE']) || static::mode($data['mode']))
+				) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/http/stream.php b/snappymail/v/0.0.0/app/libraries/snappymail/http/stream.php
index 847bee9d6..4d8435bfb 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/http/stream.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/http/stream.php
@@ -4,6 +4,11 @@ namespace SnappyMail\HTTP;
 
 /**
  * Can be used with JavaScript AbstractFetchRemote.streamPerLine(fCallback, sGetAdd, postData)
+ *
+ * Apache mod_fastcgi needs the -flush option
+ * Apache mod_proxy_fcgi needs 'flushpackets' like in <Proxy "fcgi://...." flushpackets=on></Proxy>
+ * We can't control them in PHP
+ * We can control ending the response with \fastcgi_finish_request(), but that makes it a background process
  */
 
 abstract class Stream
@@ -12,28 +17,24 @@ abstract class Stream
 	{
 		\set_time_limit(0);
 		\ob_implicit_flush();
-		\ini_set('implicit_flush',1);
-		\ini_set('output_buffering', 0);
+		\ini_set('implicit_flush', '1');
+		\ini_set('output_buffering', '0');
+		\ini_set('display_errors', '0');
 		if ($i = \ob_get_level()) {
 			# Clear buffers:
 			while ($i-- && \ob_end_clean());
-//			if (!\ob_get_level()) \header('Content-Encoding: ');
+//			\ob_get_level() || \header('Content-Encoding: ');
 		}
 		// https://www.w3.org/TR/edge-arch/
 		// We just fake Drupal https://www.drupal.org/docs/8/core/modules/big-pipe/bigpipe-environment-requirements
 		\header('Surrogate-Control: no-store, content="BigPipe/1.0"');
 		// Explicitly disable caching so Varnish and other upstreams won't cache.
-		\header('Cache-Control: no-store, no-cache, must-revalidate');
+		\header('Cache-Control: no-store');
 		\header('Pragma: no-cache');
 
 		// Nginx: disable fastcgi_buffering and disable gzip for this request.
 		\header('X-Accel-Buffering: no');
 
-		// Apache mod_fastcgi needs the -flush option
-		// Apache mod_proxy_fcgi needs 'flushpackets' like in <Proxy "fcgi://...." flushpackets=on></Proxy>
-		// We can't control them here
-		// We can control ending the response with \fastcgi_finish_request()
-
 		if (!$binary) {
 			\header('Content-Type: text/plain');
 		}
@@ -41,8 +42,8 @@ abstract class Stream
 
 	public static function JSON($data)
 	{
-		echo \MailSo\Base\Utils::Php2js($data) . "\n";
-		\ob_flush();
+		echo \RainLoop\Utils::jsonEncode($data) . "\n";
+//		\ob_flush();
 		\flush();
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/idn.php b/snappymail/v/0.0.0/app/libraries/snappymail/idn.php
index 4c5faa42c..583668c1f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/idn.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/idn.php
@@ -1,119 +1,98 @@
 <?php
+/**
+ * Internationalized domain names
+ */
 
 namespace SnappyMail;
 
 abstract class IDN
 {
-	public static function toAscii(string $domain) : string
+	/**
+	 * Converts domain name to lowercased punycode
+	 * When the '@' is in, only the part after is changed
+	 * Like: '📧.SnappyMail.EU' to 'xn--du8h.snappymail.eu'
+	 */
+	public static function toAscii(string $value) : string
 	{
-		return \function_exists('idn_to_ascii')
-			? \idn_to_ascii($domain)
-			: Intl\Idn::toAscii($domain);
-	}
-
-	public static function toUtf8(string $domain) : string
-	{
-		return \function_exists('idn_to_utf8')
-			? \idn_to_utf8($domain)
-			: Intl\Idn::toUtf8($domain);
-	}
-
-	public static function anyToAscii(string $string) : string
-	{
-		if (\preg_match('#[:/]#', $string)) {
-			return static::uri($string, true);
-		}
-		if (\strpos($string, '@')) {
-			return static::emailAddress($string, true);
-		}
-		return static::toAscii($string);
-	}
-
-	public static function anyToUtf8(string $string) : string
-	{
-		if (\preg_match('#[:/]#', $string)) {
-			return static::uri($string, false);
-		}
-		if (\strpos($string, '@')) {
-			return static::emailAddress($string, false);
-		}
-		return static::toUtf8($string);
+		$local = \explode('@', $value);
+		$domain = static::domain(\array_pop($local), true);
+		$local[] = $domain;
+		return \implode('@', $local);
 	}
 
+	/**
+	 * Converts IDN domain part to lowercased punycode
+	 * Like: 'Smile😀@📧.SnappyMail.eu' to 'Smile😀@xn--du8h.snappymail.eu'
+	 * When the '@' is missing, it does nothing
+	 */
 	public static function emailToAscii(string $address) : string
 	{
 		return static::emailAddress($address, true);
 	}
 
+	/**
+	 * Converts IDN domain part to unicode
+	 * Like: 'Smile😀@xn--du8h.SnappyMail.eu' to 'Smile😀@📧.SnappyMail.eu'
+	 * When the '@' is missing, it does nothing
+	 */
 	public static function emailToUtf8(string $address) : string
 	{
 		return static::emailAddress($address, false);
 	}
 
-	public static function uriToAscii(string $address) : string
+	private static function domain(string $domain, bool $toAscii) : string
 	{
-		return static::uri($address, true);
-	}
-
-	public static function uriToUtf8(string $address) : string
-	{
-		return static::uri($address, false);
+//		if ($toAscii && \preg_match('/[^\x20-\x7E]/', $domain)) {
+//		if (!$toAscii && \preg_match('/(^|\\.)xn--/i', $domain)) {
+		return $toAscii ? \strtolower(\idn_to_ascii($domain)) : \idn_to_utf8($domain);
+/*
+		$domain = \explode('.', $domain);
+		foreach ($domain as $k => $v) {
+			$conv = $toAscii ? \idn_to_ascii($v) : \idn_to_utf8($v);
+			if ($conv) $domain[$k] = $conv;
+		}
+		return \implode('.', $domain);
+*/
 	}
 
 	private static function emailAddress(string $address, bool $toAscii) : string
 	{
-		if (\strpos($address, '@')) {
-			list($local, $domain) = \explode('@', $address, 2);
-			$arr = \explode('.', $domain);
-			foreach ($arr as $k => $v) {
-				$conv = $toAscii ? static::toAscii($v) : static::toUtf8($v);
-				if ($conv) $arr[$k] = $conv;
-			}
-			return $local . '@' . \implode('.', $arr);
+		if (!\str_contains($address, '@')) {
+//			throw new \RuntimeException("Invalid email address: {$address}");
+			return $address;
 		}
-		return $toAscii ? static::toAscii($address) : static::toUtf8($address);
+		$local = \explode('@', $address);
+		$domain = static::domain(\array_pop($local), $toAscii);
+		return \implode('@', $local) . '@' . $domain;
 	}
 
 	private static function uri(string $address, bool $toAscii) : string
 	{
-		if (\preg_match('#[:\./]#', $address)) {
-			$parsed = \parse_url($address);
-			if (isset($parsed['host'])) {
-				$arr = \explode('.', $parsed['host']);
-				foreach ($arr as $k => $v) {
-					$conv = $toAscii ? static::toAscii($v) : static::toUtf8($v);
-					if ($conv) $arr[$k] = $conv;
-				}
-				$parsed['host'] = \implode('.', $arr);
+		$parsed = \parse_url($address);
+		if (isset($parsed['host'])) {
+			$parsed['host'] = static::domain($parsed['host'], $toAscii);
 
-				$url = '//';
-				if (!empty($parsed['scheme']))   { $url = $parsed['scheme'] . (\strtolower($parsed['scheme']) === 'mailto' ? ':' : '://'); }
+			$url = empty($parsed['scheme']) ? '//'
+				: $parsed['scheme'] . (\strtolower($parsed['scheme']) === 'mailto' ? ':' : '://');
 /*
-				if (!empty($parsed['user']) || !empty($parsed['pass'])) {
-					$ret_url .= $parts_arr['user'];
-					if (!empty($parts_arr['pass'])) {
-						$ret_url .= ':' . $parts_arr['pass'];
-					}
-					$ret_url .= '@';
+			if (!empty($parsed['user']) || !empty($parsed['pass'])) {
+				$ret_url .= $parts_arr['user'];
+				if (!empty($parts_arr['pass'])) {
+					$ret_url .= ':' . $parts_arr['pass'];
 				}
+				$ret_url .= '@';
+			}
 */
-				if (!empty($parsed['host']))     { $url .= $parsed['host']; }
-				if (!empty($parsed['port']))     { $url .= ':'.$parsed['port']; }
-				if (!empty($parsed['path']))     { $url .= $parsed['path']; }
-				if (!empty($parsed['query']))    { $url .= '?'.$parsed['query']; }
-				if (!empty($parsed['fragment'])) { $url .= '#'.$parsed['fragment']; }
-				return $url;
-			}
-
-			// parse_url seems to have failed, try without it
-			$arr = \explode('.', $address);
-			foreach ($arr as $k => $v) {
-				$conv = $toAscii ? static::toAscii($v) : static::toUtf8($v);
-				if ($conv) $arr[$k] = $conv;
-			}
-			return \implode('.', $arr);
+			if (!empty($parsed['host']))     { $url .= $parsed['host']; }
+			if (!empty($parsed['port']))     { $url .= ':'.$parsed['port']; }
+			if (!empty($parsed['path']))     { $url .= $parsed['path']; }
+			if (!empty($parsed['query']))    { $url .= '?'.$parsed['query']; }
+			if (!empty($parsed['fragment'])) { $url .= '#'.$parsed['fragment']; }
+			return $url;
 		}
-		return $toAscii ? static::toAscii($address) : static::toUtf8($address);
+
+		// parse_url seems to have failed, try without it
+		return static::domain($address, $toAscii);
 	}
 
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
index dc08aabd3..d587ba4ff 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/exif.php
@@ -16,7 +16,7 @@ class Exif
 		ORIENTATION_RIGHTBOTTOM = 7,
 		ORIENTATION_LEFTBOTTOM  = 8;
 */
-	public static function getImageOrientation(string &$data, array $image_info = null) : int
+	public static function getImageOrientation(string &$data, ?array $image_info = null) : int
 	{
 		$image_info = empty($image_info['mime']) ? \getimagesizefromstring($data) : $image_info;
 		if (!empty($image_info['mime']) && \IMG_JPG == $image_info[2] && \is_callable('exif_read_data')) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php
index b4dd61aab..3f496b3f8 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/gd2.php
@@ -50,7 +50,8 @@ class GD2 implements \SnappyMail\Image
 		}
 		$gd2 = new static();
 		$gd2->img = \imagecreatefromstring($data);
-		if (!\is_resource($gd2->img)) {
+		// resource or PHP8 GdImage
+		if (!$gd2->img) {
 			throw new \InvalidArgumentException('Failed to load image');
 		}
 		$gd2->file = 'blob';
@@ -223,7 +224,7 @@ class GD2 implements \SnappyMail\Image
 		/** rotate clockwise */
 		if (!\function_exists('imagerotate')) { require __DIR__ . '/gd2/imagerotate.inc'; }
 		$tmp_img = \imagerotate($this->img, $degrees * -1, 0);
-		if (!\is_resource($tmp_img)) { return false; }
+		if (!$tmp_img) { return false; }
 		\imagedestroy($this->img);
 		$this->img = $tmp_img;
 		return true;
@@ -240,7 +241,7 @@ class GD2 implements \SnappyMail\Image
 		if (!$width  || ($bestfit && $tx < $ty)) { $width  = \round($x / $ty); }
 		if (!$height || ($bestfit && $tx > $ty)) { $height = \round($y / $tx); }
 		$tmp_img = $this->create_image($width, $height);
-		if (!\is_resource($tmp_img)) { return false; }
+		if (!$tmp_img) { return false; }
 		\imagealphablending($tmp_img, false);
 		if (!\imagecopyresampled($tmp_img, $this->img, 0, 0, 0, 0, $width, $height, $x, $y)) {
 			if (!\imagecopyresized($tmp_img, $this->img, 0, 0, 0, 0, $width, $height, $x, $y)) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
index ff9c7807d..bf514fa20 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/image/imagick.php
@@ -28,12 +28,17 @@ class IMagick extends \Imagick implements \SnappyMail\Image
 
 	public static function createFromStream($fp)
 	{
+		// https://github.com/the-djmaze/snappymail/issues/1201
+		$data = \stream_get_contents($fp);
+		return static::createFromString($data);
+/*
 		$imagick = new static();
 		if (!$imagick->readImageFile($fp)) {
 			throw new \InvalidArgumentException('Failed to load image');
 		}
 		$imagick->setImageMatte(true);
 		return $imagick;
+*/
 	}
 
 	public function getOrientation() : int
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php
new file mode 100644
index 000000000..2232ee0b9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/imap/sync.php
@@ -0,0 +1,238 @@
+<?php
+
+namespace SnappyMail\Imap;
+
+use MailSo\Imap\Enumerations\FetchType;
+use MailSo\Imap\Enumerations\MessageFlag;
+use MailSo\Mime\Enumerations\Header;
+
+class Sync
+{
+	public \MailSo\Imap\ImapClient $oImapSource;
+	public \MailSo\Imap\ImapClient $oImapTarget;
+
+	function import(string $sTargetRootFolderName = '')
+	{
+		$sParent = '';
+		$sListPattern = '*';
+
+		$this->oImapSource->TAG_PREFIX = 'S';
+		$this->oImapTarget->TAG_PREFIX = 'T';
+
+//		$this->oImapTarget->logWrite('Get oImapTarget->FolderList');
+		\SnappyMail\Log::notice('SYNC', 'Get oImapTarget->FolderList');
+		$aTargetFolders = $this->oImapTarget->FolderList($sParent, $sListPattern);
+		if (!$aTargetFolders) {
+			return null;
+		}
+		$sTargetDelimiter = '';
+		$sTargetRoles = [
+			'inbox'   => false,
+			'sent'    => false,
+			'drafts'  => false,
+			'junk'    => false,
+			'trash'   => false,
+			'archive' => false
+		];
+		foreach ($aTargetFolders as $sFullName => $oImapFolder) {
+			$role = $oImapFolder->Role();
+			if ($role && empty($sTargetRoles[$role])) {
+				$sTargetRoles[$role] = $sFullName;
+			}
+			if (!$sTargetDelimiter) {
+				$sTargetDelimiter = $oImapFolder->Delimiter();
+			}
+		}
+
+		\SnappyMail\Log::notice('SYNC', 'Get oImapSource->FolderList');
+		$bUseListStatus = $this->oImapSource->hasCapability('LIST-EXTENDED');
+		$aSourceFolders = $this->oImapSource->FolderList($sParent, $sListPattern, false, $bUseListStatus);
+		if (!$aSourceFolders) {
+			return null;
+		}
+
+		$isCli = false !== \stripos(\php_sapi_name(), 'cli');
+		if ($isCli) {
+			echo 'folders: ' . \count($aSourceFolders) . "\n";
+		} else {
+			\SnappyMail\HTTP\Stream::start();
+			\SnappyMail\HTTP\Stream::JSON([
+				'folders' => \count($aSourceFolders)
+			]);
+		}
+
+		$fi = 0;
+		\ignore_user_abort(true);
+		foreach ($aSourceFolders as $sSourceFolderName => $oImapFolder) {
+			++$fi;
+			if ($oImapFolder->Selectable()) {
+				$role = $oImapFolder->Role();
+				if ('all' === $role) {
+					// Don't duplicate all mail
+					continue;
+				}
+				// Detect mailbox name based on role
+				if (!$sTargetRootFolderName && $role && !empty($sTargetRoles[$role])) {
+					$sTargetFolderName = $sTargetRoles[$role];
+				}
+				// Else just do a name match
+				else {
+					if ($sTargetDelimiter) {
+						$sTargetFolderName = \str_replace($oImapFolder->Delimiter(), $sTargetDelimiter, $sSourceFolderName);
+						$sTargetRootFolderName = \str_replace($sTargetDelimiter, '-', $sTargetRootFolderName);
+					} else {
+						$sTargetFolderName = $sSourceFolderName;
+					}
+					if ($sTargetRootFolderName) {
+						$sTargetFolderName = $sTargetRootFolderName . ($sTargetDelimiter?:'-') . $sTargetFolderName;
+					}
+				}
+				if ($isCli) {
+					echo \str_pad($fi, 3, ' ', STR_PAD_LEFT) . " folder: {$sSourceFolderName} => {$sTargetFolderName}\n";
+				} else {
+					\SnappyMail\HTTP\Stream::JSON([
+						'index' => $fi,
+						'folder' => $sSourceFolderName,
+						'target' => $sTargetFolderName
+					]);
+				}
+
+				// Create mailbox if not exists
+				if (!isset($aTargetFolders[$sTargetFolderName])) {
+					$this->oImapTarget->FolderCreate(
+						$sTargetFolderName,
+						!$bUseListStatus || $oImapFolder->IsSubscribed()
+					);
+				} else if (!$aTargetFolders[$sTargetFolderName]->Selectable()) {
+					// Can't copy messages
+					continue;
+				}
+
+				// Set Source metadata on target
+				if ($aMetadata = $oImapFolder->Metadata()) {
+					$this->oImapTarget->FolderSetMetadata($sTargetFolderName, $aMetadata);
+				}
+
+				$oSourceInfo = $this->oImapSource->FolderSelect($sSourceFolderName);
+				if ($oSourceInfo->MESSAGES) {
+					if ($isCli) {
+						echo \str_pad($fi, 3, ' ', STR_PAD_LEFT)
+							. " messages: [" . \str_repeat(' ', 50) . "] 0/{$oSourceInfo->MESSAGES}";
+					} else {
+						\SnappyMail\HTTP\Stream::JSON([
+							'index' => $fi,
+							'messages' => $oSourceInfo->MESSAGES
+						]);
+					}
+					// All id's to skip from source
+					$oTargetInfo = $this->oImapTarget->FolderSelect($sTargetFolderName);
+					if ($oTargetInfo->MESSAGES) {
+						// Get all existing message id's from target to skip
+						$aTargetMessageIDs = [];
+						$this->oImapTarget->SendRequest('FETCH', [
+							'1:*', [FetchType::BuildBodyCustomHeaderRequest([Header::MESSAGE_ID], true)]
+						]);
+						foreach ($this->oImapTarget->yieldUntaggedResponses() as $oResponse) {
+							if ('FETCH' === $oResponse->ResponseList[2]) {
+								// $oResponse->ResponseList[3][0] == 'BODY[HEADER.FIELDS (MESSAGE-ID)]'
+								// 'Message-ID: ...'
+								$aTargetMessageIDs[] = $oResponse->ResponseList[3][1];
+							}
+						}
+					}
+					// Set all existing id's from source to skip and get all flags
+					$aSourceSkipIDs = [];
+					$aSourceFlags = [];
+					$this->oImapSource->SendRequest('FETCH', [
+						'1:*', [FetchType::FLAGS, FetchType::BuildBodyCustomHeaderRequest([Header::MESSAGE_ID], true)]
+					]);
+					foreach ($this->oImapSource->yieldUntaggedResponses() as $oResponse) {
+						if ('FETCH' === $oResponse->ResponseList[2]
+						 && isset($oResponse->ResponseList[3])
+						 && \is_array($oResponse->ResponseList[3])
+						) {
+							$id = $oResponse->ResponseList[1];
+							foreach ($oResponse->ResponseList[3] as $i => $mItem) {
+								if ('FLAGS' === $mItem) {
+									$aSourceFlags[$id] = $oResponse->ResponseList[3][$i+1];
+								} else if ('MESSAGE-ID' === $mItem && \in_array($oResponse->ResponseList[3][$i+1], $aTargetMessageIDs)) {
+									$aSourceSkipIDs[] = $id;
+								}
+							}
+						}
+					}
+
+					$aTargetMessageIDs = [];
+					// Now copy each message from source to target
+					for ($i = 1; $i <= $oSourceInfo->MESSAGES; ++$i) {
+						if (!\in_array($i, $aSourceSkipIDs)) {
+							$sPeek = $this->oImapSource->hasCapability('BINARY')
+								? FetchType::BINARY_PEEK
+								: FetchType::BODY_PEEK;
+							$iAppendUid = 0;
+							$aFetchResponse = $this->oImapSource->Fetch(array(
+								array(
+									$sPeek.'[]',
+									function ($sParent, $sLiteralAtomUpperCase, $rLiteralStream, $iLiteralLen)
+									use ($sTargetFolderName, &$iAppendUid, $aSourceFlags, $i) {
+										if (\strlen($sLiteralAtomUpperCase) && \is_resource($rLiteralStream) && 'FETCH' === $sParent) {
+//											$sMessage = \stream_get_contents($rLiteralStream);
+											$iAppendUid = $this->oImapTarget->MessageAppendStream(
+												$sTargetFolderName,
+												$rLiteralStream,
+												$iLiteralLen,
+												isset($aSourceFlags[$i]) ? $aSourceFlags[$i] : []
+											);
+										}
+									}
+								)), $i, false);
+
+/*
+							$aFlags = $aFetchResponse[0]->GetFetchValue('FLAGS');
+							$iAppendUid = $this->oImapTarget->MessageAppendStream(
+								$sTargetFolderName,
+								$rLiteralStream,
+								$iLiteralLen,
+								$aFlags
+							);
+							if ($iAppendUid && $aFlags) {
+								$this->MessageStoreFlag(
+									new SequenceSet($iAppendUid),
+									$aFlags,
+									\MailSo\Imap\Enumerations\StoreAction::ADD_FLAGS_SILENT
+								);
+							}
+*/
+						}
+
+						if ($isCli) {
+							// Clear line
+							echo "\x1b[2K\x1b[1G";
+							// Echo same line with progress
+							$p = \floor(50 * $i / $oSourceInfo->MESSAGES);
+							echo \str_pad($fi, 3, ' ', STR_PAD_LEFT)
+								. " messages: [" . \str_repeat('=', $p) . \str_repeat(' ', 50 - $p)
+								. "] {$i}/{$oSourceInfo->MESSAGES}";
+						} else {
+							\SnappyMail\HTTP\Stream::JSON([
+								'index' => $fi,
+								'message' => $i
+							]);
+						}
+					}
+					if ($isCli) {
+						echo "\n";
+					}
+				}
+			} else if ($isCli) {
+				echo \str_pad($fi, 3, ' ', STR_PAD_LEFT) . " folder: {$sSourceFolderName}\n";
+			} else {
+				\SnappyMail\HTTP\Stream::JSON([
+					'index' => $fi,
+					'folder' => $sSourceFolderName
+				]);
+			}
+		}
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
new file mode 100644
index 000000000..97873d50c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/integrity.php
@@ -0,0 +1,126 @@
+<?php
+
+namespace SnappyMail;
+
+abstract class Integrity
+{
+
+	/**
+	 * Called by https://webmail.tld/?/Test
+	 */
+	public static function test()
+	{
+		$result = static::phpVersion();
+		if ($result) {
+			echo '<p style="color: red">' . $result . '</p>';
+			return;
+		}
+
+		$result = static::phpExtensions();
+		if ($result) {
+			echo '<p>The following PHP extensions are not available in your PHP configuration!</p>';
+			echo '<ul><li>' . \implode('</li>li><li>', $result) . '</li></ul>';
+		}
+
+/*
+		echo '<div>'.APP_VERSION_ROOT_PATH.'static directory permissions: ' . substr(sprintf('%o', fileperms(APP_VERSION_ROOT_PATH . 'static')), -4) . '</div>';
+		echo '<div>'.APP_VERSION_ROOT_PATH.'themes directory permissions: ' . substr(sprintf('%o', fileperms(APP_VERSION_ROOT_PATH . 'themes')), -4) . '</div>';
+*/
+
+		$uri = (isset($_SERVER['HTTPS']) ? 'https' : 'http') . '://' . $_SERVER['HTTP_HOST']
+			. \RainLoop\Utils::WebVersionPath();
+		$HTTP = \SnappyMail\HTTP\Request::factory();
+		$files = [
+//			'static/css/app.css',
+//			'static/js/libs.js',
+//			'static/js/app.js',
+//			'static/js/openpgp.js',
+			'static/css/app.min.css',
+			'static/js/min/libs.min.js',
+			'static/js/min/app.min.js',
+			'static/js/min/openpgp.min.js'
+		];
+		foreach ($files as $file) {
+			echo "<h2>{$uri}{$file}</h2>";
+			$response = $HTTP->doRequest('HEAD', $uri . $file);
+			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
+			$size = \filesize(APP_VERSION_ROOT_PATH.$file);
+			if ($size == intval($response->getHeader('content-length'))) {
+				echo '<div>content-length matches size ' . $size . '</div>';
+			} else {
+				echo '<div style="color: red">content-length mismatch, should be: ' . $size . '</div>';
+			}
+/*
+			echo "<h3>encoding</h3>";
+			$response = $HTTP->doRequest('GET', $uri . $file, null, ['Accept-Encoding' => 'gzip, deflate, br']);
+			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
+*/
+			echo "<h3>gzip encoded</h3>";
+			$response = $HTTP->doRequest('HEAD', $uri . $file . '.gz');
+//			$response = $HTTP->doRequest('HEAD', $uri . $file, null, ['Accept-Encoding: gzip']);
+			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
+			$size = \filesize(APP_VERSION_ROOT_PATH.$file . '.gz');
+			if ($size == intval($response->getHeader('content-length'))) {
+				echo '<div>content-length matches size ' . $size . '</div>';
+			} else {
+				echo '<div style="color: red">content-length mismatch, should be: ' . $size . '</div>';
+			}
+			if ('gzip' == $response->getHeader('content-encoding')) {
+				echo '<div>content-encoding matches</div>';
+			} else {
+				echo '<div style="color: red">content-encoding mismatch, should be: gzip</div>';
+			}
+
+			echo "<h3>brotli encoded</h3>";
+			$response = $HTTP->doRequest('HEAD', $uri . $file, null, ['Accept-Encoding: br']);
+//			$response = $HTTP->doRequest('HEAD', $uri . $file . '.br');
+			echo '<details><summary>Status: ' . $response->status . '</summary><pre>' . \print_r($response->headers, 1) . '</pre></details>';
+			$size = \filesize(APP_VERSION_ROOT_PATH.$file . '.br');
+			if ($size == intval($response->getHeader('content-length'))) {
+				echo '<div>content-length matches size ' . $size . '</div>';
+			} else {
+				echo '<div style="color: red">content-length mismatch, should be: ' . $size . '</div>';
+			}
+			if ('br' == $response->getHeader('content-encoding')) {
+				echo '<div>content-encoding matches</div>';
+			} else {
+				echo '<div style="color: red">content-encoding mismatch, should be: br</div>';
+			}
+		}
+	}
+
+	public static function phpVersion()
+	{
+		if (PHP_VERSION_ID < 80200) {
+			return 'Your PHP version ('.PHP_VERSION.') is lower than the minimal required 8.2.0!';
+		}
+	}
+
+	public static function phpExtensions()
+	{
+		$aRequirements = array(
+			'openssl'  => extension_loaded('openssl'),
+			'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/1392
+			'fileinfo' => extension_loaded('fileinfo')
+			// https://github.com/the-djmaze/snappymail/issues/392
+		//	'phar'     => class_exists('PharData')
+		);
+
+		$aMissing = [];
+		if (in_array(false, $aRequirements)) {
+			foreach ($aRequirements as $sKey => $bValue) {
+				if (!$bValue) {
+					$aMissing[] = $sKey;
+				}
+			}
+		}
+		return $aMissing;
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php b/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
new file mode 100644
index 000000000..5dfd9cedf
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/jwt.php
@@ -0,0 +1,220 @@
+<?php
+
+namespace SnappyMail;
+
+use MailSo\Base\Utils;
+
+abstract class JWT
+{
+	private static function jsonEncode(mixed $data): string|false
+	{
+		return Utils::UrlSafeBase64Encode(\json_encode($payload, \JSON_THROW_ON_ERROR));
+	}
+
+	private static function jsonDecode(string $data): mixed
+	{
+		$data = Utils::UrlSafeBase64Decode($data);
+		return \json_decode($data, false, 8, \JSON_BIGINT_AS_STRING | \JSON_THROW_ON_ERROR);
+	}
+
+	/**
+	 * Decodes a JWT string into a PHP object.
+	 *
+	 * @param string        $jwt            The JWT
+	 * @param string|array  $key            The key, or map of keys.
+	 *                                      If the algorithm used is asymmetric, this is the public key
+	 * @param int           $timestamp      Allow the current timestamp to be specified. default time()
+	 * @param int           $leeway         When checking nbf (Not Before) Claim, iat (Issued At) Claim or expiration times, we want to provide some extra leeway time to account for clock skew.
+	 */
+	public static function decode(string $jwt, string|array $key, ?int $timestamp = null, int $leeway = 0): object
+	{
+		$timestamp = $timestamp ?: \time();
+
+		if (empty($key)) {
+			throw new \ValueError('Key may not be empty');
+		}
+
+		$jwt = \explode('.', $jwt);
+		if (\count($jwt) != 3) {
+			throw new \UnexpectedValueException('Wrong number of segments');
+		}
+		try {
+			$header = static::jsonDecode($jwt[0]);
+		} catch (\Throwable $e) {
+			throw new \UnexpectedValueException("Invalid header encoding ({$e->getMessage()})");
+		}
+		try {
+			$payload = static::jsonDecode($jwt[1]);
+		} catch (\Throwable $e) {
+			throw new \UnexpectedValueException("Invalid claims encoding ({$e->getMessage()})");
+		}
+		$sig = Utils::UrlSafeBase64Decode($jwt[2]);
+
+		if (empty($header->alg)) {
+			throw new \UnexpectedValueException('Empty algorithm');
+		}
+		if (\is_array($key) || $key instanceof \ArrayAccess) {
+			if (!isset($header->kid)) {
+				throw new \UnexpectedValueException('"kid" empty, unable to lookup correct key');
+			}
+			if (!isset($key[$header->kid])) {
+				throw new \DomainException('No valid key found');
+			}
+			$key = $key[$header->kid];
+		}
+
+		// Check the signature
+		if (!static::verify("{$jwt[0]}.{$jwt[1]}", $sig, $key, $header->alg)) {
+			throw new \Exception('Signature verification failed');
+		}
+
+		// Check if the nbf if it is defined. This is the time that the
+		// token can actually be used. If it's not yet that time, abort.
+		if (isset($payload->nbf) && $payload->nbf > ($timestamp + $leeway)) {
+			throw new \Exception('Cannot handle token prior to ' . \date(\DateTime::ISO8601, $payload->nbf));
+		}
+
+		// Check that this token has been created before 'now'. This prevents
+		// using tokens that have been created for later use (and haven't
+		// correctly used the nbf claim).
+		if (isset($payload->iat) && $payload->iat > ($timestamp + $leeway)) {
+			throw new \Exception('Cannot handle token prior to ' . \date(\DateTime::ISO8601, $payload->iat));
+		}
+
+		// Check if this token has expired.
+		if (isset($payload->exp) && ($timestamp - $leeway) >= $payload->exp) {
+			throw new \Exception('Expired token');
+		}
+
+		return $payload;
+	}
+
+	/**
+	 * Converts and signs a PHP object or array into a JWT string.
+	 *
+	 * @param object|array  $payload    PHP object or array
+	 * @param string        $key        The private/secret key.
+	 * @param string        $alg        The signing algorithm.
+	 *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+	 * @param mixed         $keyId
+	 * @param array         $head       An array with header elements to attach
+	 *
+	 * @return string A signed JWT
+	 */
+	public static function encode(object|array $payload, string $key, string $alg = 'HS256', mixed $keyId = null, array $header = array()): string
+	{
+		$header = \array_merge($header, array('typ' => 'JWT', 'alg' => $alg));
+		if ($keyId) {
+			$header['kid'] = $keyId;
+		}
+		$segments = array(
+			static::jsonEncode($header),
+			static::jsonEncode($payload)
+		);
+		$segments[] = Utils::UrlSafeBase64Encode(static::sign(\implode('.', $segments), $key, $alg));
+		return \implode('.', $segments);
+	}
+
+	/**
+	 * Sign a string with a given key and algorithm.
+	 *
+	 * @param string            $msg    The message to sign
+	 * @param string|resource   $key    The secret key
+	 * @param string            $alg    The signing algorithm.
+	 *                                  Supported algorithms are 'HS256', 'HS384', 'HS512' and 'RS256'
+	 *
+	 * @return string An encrypted message
+	 */
+	public static function sign(string $msg, $key, string $alg = 'HS256',
+		#[\SensitiveParameter]
+		string $passphrase = ''
+	): string
+	{
+		switch ($alg)
+		{
+			case 'RS256':
+			case 'RS384':
+			case 'RS512':
+				$free_key = !\is_resource($key);
+				if ($free_key) {
+					$key = \openssl_pkey_get_private($key, $passphrase);
+					if (!$key) {
+						throw new \ValueError('Invalid key, reason: ' . \openssl_error_string());
+					}
+				}
+				$details = \openssl_pkey_get_details($key);
+				if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
+					throw new \ValueError('Key is not compatible with RSA signatures');
+				}
+				$signature = '';
+				if (!\openssl_sign($msg, $signature, $key, 'SHA'.\substr($alg,2))) {
+					throw new \DomainException('OpenSSL unable to sign data: ' . \openssl_error_string());
+				}
+				return $signature;
+
+			case 'HS256':
+			case 'HS512':
+			case 'HS384':
+				$algo = 'SHA' . \substr($alg, 2);
+				if (\in_array($algo, \hash_algos())) {
+					return \hash_hmac($algo, $msg, $key, true);
+				}
+
+			default:
+				throw new \ValueError("Algorithm '{$alg}' not supported");
+		}
+	}
+
+	/**
+	 * Verify a signature with the message, key and method. Not all methods
+	 * are symmetric, so we must have a separate verify and sign method.
+	 *
+	 * @param string            $msg        The original message (header and body)
+	 * @param string            $signature  The original signature
+	 * @param string|resource   $key        For HS*, a string key works. for RS*, must be a resource of an openssl public key
+	 * @param string            $alg        The algorithm
+	 *
+	 * @return bool
+	 */
+	private static function verify(string $msg, string $signature, $key, string $alg): bool
+	{
+		switch ($alg)
+		{
+			case 'RS256':
+			case 'RS384':
+			case 'RS512':
+				$free_key = !\is_resource($key);
+				if ($free_key) {
+					$key = \openssl_pkey_get_public($key);
+					if (!$key) {
+						throw new \ValueError('Invalid key, reason: ' . openssl_error_string());
+					}
+				}
+				$details = \openssl_pkey_get_details($key);
+				if (!isset($details['key']) || OPENSSL_KEYTYPE_RSA !== $details['type']) {
+					throw new \ValueError('Key is not compatible with RSA signatures');
+				}
+				$success = \openssl_verify($msg, $signature, $key, 'SHA'.\substr($alg,2));
+				if (-1 == $success) {
+					throw new \DomainException('OpenSSL unable to verify data: ' . \openssl_error_string());
+				}
+				return $success;
+
+			case 'HS256':
+			case 'HS512':
+			case 'HS384':
+				$algo = 'SHA' . \substr($alg, 2);
+				if (\in_array($algo, \hash_algos())) {
+					return \hash_equals($signature, \hash_hmac($algo, $msg, $key, true));
+				}
+
+			// Ecdsa
+//			case 'ES256':
+//			case 'ES384':
+//			case 'ES512':
+			default:
+				throw new \ValueError("Algorithm '{$alg}' not supported");
+		}
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/l10n.php b/snappymail/v/0.0.0/app/libraries/snappymail/l10n.php
index ed056f0a9..78d8c642e 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/l10n.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/l10n.php
@@ -34,6 +34,18 @@ abstract class L10n
 		return $aCache[$bAdmin];
 	}
 
+	public static function validLanguage(string $sLanguage, bool $bAdmin) : ?string
+	{
+		$aLang = static::getLanguages($bAdmin);
+		$sLanguage = \strtr($sLanguage, '_', '-');
+		if (!\in_array($sLanguage, $aLang)) {
+			if (\str_contains($sLanguage, '-')) {
+				$sLanguage = \strtok($sLanguage, '-');
+			}
+		}
+		return \in_array($sLanguage, $aLang) ? $sLanguage : null;
+	}
+
 	/**
 	 * When $sLanguage is like 'sv-SE', it tries to load and merge (in order): en, sv and sv-SE
 	 * $sFile is either 'admin', 'static' or 'user'
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/log.php b/snappymail/v/0.0.0/app/libraries/snappymail/log.php
index d27aeac83..9f40dcb6f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/log.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/log.php
@@ -2,8 +2,6 @@
 
 namespace SnappyMail;
 
-use MailSo\Log\Enumerations\Type;
-
 abstract class Log
 {
 	// Same as RFC 5424 section 6.2.1 decimal Severity level indicator
@@ -35,42 +33,39 @@ abstract class Log
 			\LOG_NOTICE  => 'NOTICE',
 			\LOG_INFO    => 'INFO',
 			\LOG_DEBUG   => 'DEBUG',
-		],
-		$mailso = [
-			\LOG_EMERG   => Type::ERROR,
-			\LOG_ALERT   => Type::ERROR,
-			\LOG_CRIT    => Type::ERROR,
-			\LOG_ERR     => Type::ERROR,
-			\LOG_WARNING => Type::WARNING,
-			\LOG_NOTICE  => Type::NOTICE,
-			\LOG_INFO    => Type::INFO,
-			\LOG_DEBUG   => Type::DEBUG
 		];
 
 	protected static function log(int $level, string $prefix, string $msg)
 	{
-		static $log_level;
-		// Default to level 4, 0 = LOG_EMERG, 7 = LOG_DEBUG
-		if (!$log_level) {
-			$log_level = \max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING));
-		}
-		if ($level <= $log_level) {
-			\RainLoop\Api::Logger()->Write(
-				$msg,
-				static::$mailso[$level],
-				$prefix
-			);
+		if (\RainLoop\Api::Logger()->IsEnabled()) {
+			\RainLoop\Api::Logger()->Write($msg, $level, $prefix);
+		} else {
 /*
-			if (\RainLoop\Api::Config()->Get('logs', 'syslog') && \openlog('snappymail', \LOG_ODELAY, \LOG_USER)) {
-				\syslog($level, "{$prefix} {$msg}");
-				\closelog();
+			static $log_level;
+			// Default to level 4, 0 = LOG_EMERG, 7 = LOG_DEBUG
+			if (!$log_level) {
+				$log_level = \max(3, \RainLoop\Api::Config()->Get('logs', 'level', \LOG_WARNING));
+			}
+			if ($level <= $log_level) {
+				if (\RainLoop\Api::Config()->Get('logs', 'syslog') && \openlog('snappymail', \LOG_ODELAY, \LOG_USER)) {
+					\syslog($level, "{$prefix} {$msg}");
+					\closelog();
+				}
+
+				if (\filter_var(\ini_get('log_errors'), FILTER_VALIDATE_BOOLEAN)
+				&& (($level < \LOG_WARNING && \error_reporting() & \E_ERROR)
+				|| ($level == \LOG_WARNING && \error_reporting() & \E_WARNING)
+				|| ($level > \LOG_WARNING && \error_reporting() & \E_NOTICE)
+				)) {
+					\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg);
+//					\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg, 3, 'filename');
+				}
+			}
+
+			if (\class_exists('OC')) {
+				\SnappyMail\Nextcloud::log($level, $msg);
 			}
 */
 		}
-		if (($level < \LOG_WARNING && \error_reporting() & \E_ERROR)
-		 || ($level == \LOG_WARNING && \error_reporting() & \E_WARNING)
-		 || ($level > \LOG_WARNING && \error_reporting() & \E_ERROR)) {
-			\error_log($prefix . ' ' . static::$levels[$level] . ': ' . $msg);
-		}
 	}
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php b/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php
new file mode 100644
index 000000000..f2fd398cd
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/nextcloud.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace SnappyMail;
+
+abstract class Nextcloud
+{
+	public static function themes(): array
+	{
+		$themes = [];
+		$dir = static::themesDir();
+		if ($dir && ($rDirH = \opendir($dir))) {
+			while (($name = \readdir($rDirH)) !== false) {
+				if ('.' !== $name[0] && \is_dir("{$dir}/{$name}") && \file_exists("{$dir}/{$name}/snappymail/style.css")) {
+					$themes[] = $name . '@nextcloud';
+				}
+			}
+			\closedir($rDirH);
+		}
+		return $themes;
+	}
+
+	public static function themesDir(): ?string
+	{
+		if (\class_exists('OC', false)) {
+			$dir = \OC::$SERVERROOT . '/themes'; // custom user themes
+			if (\is_dir($dir)) {
+				return $dir;
+			}
+		}
+		return null;
+	}
+
+	public static function webRoot(): ?string
+	{
+		return \class_exists('OC', false) ? \OC::$WEBROOT : null;
+	}
+
+	private static
+		$levels = [
+			\LOG_EMERG   => 'EMERGENCY',
+			\LOG_ALERT   => 'ALERT',
+			\LOG_CRIT    => 'CRITICAL',
+			\LOG_ERR     => 'ERROR',
+			\LOG_WARNING => 'WARNING',
+			\LOG_NOTICE  => 'NOTICE',
+			\LOG_INFO    => 'INFO',
+			\LOG_DEBUG   => 'DEBUG',
+		];
+
+	public static function log(int $level, string $msg): void
+	{
+		// https://www.php-fig.org/psr/psr-3/#3-psrlogloggerinterface
+		if (\class_exists('OCP\Log\logger')) {
+//			\OCP\Log\logger('snappymail')->log($level, $msg);
+			\OCP\Log\logger('snappymail')->{static::$levels[$level]}($msg);
+		}
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
new file mode 100644
index 000000000..f16acbd67
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/backup.php
@@ -0,0 +1,87 @@
+<?php
+/**
+ * This class is inspired by PEAR Crypt_GPG and PECL gnupg
+ * It does not support gpg v1 because that is missing ECDH, ECDSA, EDDSA
+ * It does not support gpg < v2.2.5 as they are from before 2018
+ */
+
+namespace SnappyMail\PGP;
+
+class Backup
+{
+	public static function PGPKey(string $key, string $keyId = '', $doDelete = false) : bool
+	{
+		$oActions = \RainLoop\Api::Actions();
+		$oAccount = $oActions->getMainAccountFromToken();
+		if ($oAccount) {
+			$keyId = $keyId ? "0x{$keyId}" : \sha1($key);
+			$dir = $oActions->StorageProvider()->GenerateFilePath(
+				$oAccount,
+				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP,
+				true
+			);
+			if (\str_contains($key, 'PGP PRIVATE KEY')) {
+				$fileName = "{$dir}{$keyId}.key";
+				if ($doDelete) {
+					return !file_exists($fileName) || unlink($fileName);
+				}
+				$hash = $oAccount->CryptKey();
+				$key = \SnappyMail\Crypt::Encrypt($key, $hash);
+				$key[1] = \base64_encode($key[1]);
+				$key[2] = \base64_encode($key[2]);
+				$key[3] = \hash_hmac('sha1', $key[2], $hash);
+				return !!\file_put_contents($fileName, \json_encode($key));
+			}
+			if (\str_contains($key, 'PGP PUBLIC KEY')) {
+				$fileName = "{$dir}{$keyId}_public.asc";
+				if ($doDelete) {
+					return !file_exists($fileName) || unlink($fileName);
+				}
+				return !!\file_put_contents($fileName, $key);
+			}
+		}
+		return false;
+	}
+
+	public static function getKeys() : array
+	{
+		$result = [
+			'public' => [],
+			'private' => []
+		];
+		$oActions = \RainLoop\Api::Actions();
+		$oAccount = $oActions->getMainAccountFromToken();
+		if ($oAccount) {
+			$dir = $oActions->StorageProvider()->GenerateFilePath(
+				$oAccount,
+				\RainLoop\Providers\Storage\Enumerations\StorageType::PGP,
+				true
+			);
+			foreach (\glob("{$dir}*") as $file) {
+				if (\is_file($file)) {
+					if ('_public.asc' === \substr($file, -11)) {
+						$result['public'][] = [
+							'id' => \basename($file),
+							'value' => \file_get_contents($file),
+						];
+					} else if ('.key' === \substr($file, -4)) {
+						$key = \json_decode(\file_get_contents($file));
+						if (\is_array($key)) {
+							$mac = \array_pop($key);
+							$hash = $oAccount->CryptKey();
+							if (!empty($key[2]) && \hash_hmac('sha1', $key[2], $hash) === $mac) {
+								$key[1] = \base64_decode($key[1]);
+								$key[2] = \base64_decode($key[2]);
+								$result['private'][] = [
+									'id' => \basename($file),
+									'value' => \SnappyMail\Crypt::Decrypt($key, $hash),
+								];
+							}
+						}
+					}
+				}
+			}
+		}
+		return $result;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
index 7e8382c17..09a8c769a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/gnupg.php
@@ -6,411 +6,26 @@ defined('GNUPG_SIG_MODE_NORMAL') || define('GNUPG_SIG_MODE_NORMAL', 0);
 defined('GNUPG_SIG_MODE_DETACH') || define('GNUPG_SIG_MODE_DETACH', 1);
 defined('GNUPG_SIG_MODE_CLEAR') || define('GNUPG_SIG_MODE_CLEAR', 2);
 
-class GnuPG
+use SnappyMail\GPG\PGP as GPG;
+
+abstract class GnuPG
 {
-	private
-		$homedir,
-		// Instance of gnupg pecl extension
-		$GnuPG,
-		// Instance of \SnappyMail\PGP\GPG
-		$GPG;
-
-	function __construct(string $homedir)
-	{
-		$homedir = \rtrim($homedir, '/\\');
-		// BSD 4.4 max length
-		if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
-			throw new \Exception('socket name for S.gpg-agent.extra is too long');
-		}
-		$this->homedir = $homedir;
-//		\putenv("GNUPGHOME={$homedir}");
-
-		if (\class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>=')) {
-			$this->GnuPG = new \gnupg([
-				// It is the file name of the executable program implementing this protocol which is usually path of the gpg executable.
-//				'file_name' => '/usr/bin/gpg',
-				// It is the directory name of the configuration directory. It also overrides GNUPGHOME environment variable that is used for the same purpose.
-				'home_dir' => $homedir
-			]);
-			// Output is ASCII
-			$this->GnuPG->setarmor(1);
-		} else {
-			$this->getGPG();
-		}
-
-/*
-		$conf = "{$homedir}/gpg-agent.conf";
-		if (!\file_exists($conf)) {
-			\file_put_contents($conf, 'default-cache-ttl 1');
-		}
-		$conf = "{$homedir}/gpg.conf";
-		if (!\file_exists($conf)) {
-			\file_put_contents($conf, "batch\nno-comments");
-		}
-*/
-	}
-
 	public static function isSupported() : bool
 	{
-		return \class_exists('gnupg') || GPG::isSupported();
+		return GPG::isSupported() || PECL::isSupported();
 	}
 
-	private static $instance;
-	public static function getInstance(string $homedir) : ?self
+	private static $instance = null;
+	public static function getInstance(string $homedir) : ?PGPInterface
 	{
 		if (!static::$instance) {
-			static::$instance = new self($homedir);
+			if (GPG::isSupported()) {
+				static::$instance = new GPG($homedir);
+			}
+			else if (PECL::isSupported()) {
+				static::$instance = new PECL($homedir);
+			}
 		}
 		return static::$instance;
 	}
-
-	public function handler()
-	{
-		return $this->GnuPG ?: $this->GPG;
-	}
-
-	public function getGPG(bool $throw = true) : ?GPG
-	{
-		if (!$this->GPG) {
-			if (GPG::isSupported()) {
-				$this->GPG = new GPG($this->homedir);
-			} else if ($throw) {
-				throw new \Exception('GnuPG not supported');
-			}
-		}
-		return $this->GPG;
-	}
-
-	/**
-	 * Add a key for decryption
-	 */
-	public function addDecryptKey(string $fingerprint, string $passphrase) : bool
-	{
-		return $this->handler()->adddecryptkey($fingerprint, $passphrase);
-	}
-
-	/**
-	 * Add a key for encryption
-	 */
-	public function addEncryptKey(string $fingerprint) : bool
-	{
-		return $this->handler()->addencryptkey($fingerprint);
-	}
-
-	/**
-	 * Add a key for signing
-	 */
-	public function addSignKey(string $fingerprint, ?string $passphrase) : bool
-	{
-		return $this->handler()->addsignkey($fingerprint, $passphrase);
-	}
-
-	/**
-	 * Removes all keys which were set for decryption before
-	 */
-	public function clearDecryptKeys() : bool
-	{
-		return $this->handler()->cleardecryptkeys();
-	}
-
-	/**
-	 * Removes all keys which were set for encryption before
-	 */
-	public function clearEncryptKeys() : bool
-	{
-		return $this->handler()->clearencryptkeys();
-	}
-
-	/**
-	 * Removes all keys which were set for signing before
-	 */
-	public function clearSignKeys() : bool
-	{
-		return $this->handler()->clearsignkeys();
-	}
-
-	/**
-	 * Decrypts a given text
-	 */
-	public function decrypt(string $text) /*: string|false */
-	{
-		return $this->GnuPG
-			? $this->GnuPG->decrypt($text)
-			: $this->GPG->decrypt($text);
-	}
-
-	/**
-	 * Decrypts a given file
-	 */
-	public function decryptFile(string $filename) /*: string|false */
-	{
-		return $this->GnuPG
-			? $this->GnuPG->decrypt(\file_get_contents($filename))
-			: $this->GPG->decryptFile($filename);
-	}
-
-	/**
-	 * Decrypts a given resource
-	 */
-	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false */
-	{
-		if (!$fp || !\is_resource($fp)) {
-			throw new \Exception('Invalid stream resource');
-		}
-		return $this->GnuPG
-			? $this->GnuPG->decrypt(\stream_get_contents($fp))
-			: $this->GPG->decryptStream($fp, $output);
-	}
-
-	/**
-	 * Decrypts and verifies a given text
-	 */
-	public function decryptVerify(string $text, string &$plaintext) /*: array|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->decryptverify($text, $plaintext)
-			: $this->GPG->decryptverify($text, $plaintext);
-	}
-
-	/**
-	 * Decrypts and verifies a given file
-	 */
-	public function decryptVerifyFile(string $filename, string &$plaintext) /*: array|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->decryptverify(\file_get_contents($filename), $plaintext)
-			: $this->GPG->decryptverifyFile($filename, $plaintext);
-	}
-
-	public function deleteKey(string $keyId, bool $private) : bool
-	{
-		return $this->getGPG()->deleteKey($keyId, $private);
-	}
-
-	/**
-	 * Encrypts a given text
-	 */
-	public function encrypt(string $plaintext) /*: string|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->encrypt($plaintext)
-			: $this->GPG->encrypt($plaintext);
-	}
-
-	/**
-	 * Encrypts a given text
-	 */
-	public function encryptFile(string $filename) /*: string|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->encrypt(\file_get_contents($filename))
-			: $this->GPG->encryptFile($filename);
-	}
-
-	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null) /*: string|false*/
-	{
-		\rewind($fp);
-		return $this->GnuPG
-			? $this->GnuPG->encrypt(\stream_get_contents($fp))
-			: $this->GPG->encryptStream($fp);
-	}
-
-	/**
-	 * Exports a key
-	 */
-	public function export(string $fingerprint, string $passphrase = '') /*: string|false*/
-	{
-		if ($passphrase) {
-			return $this->getGPG()
-				->addPassphrase($fingerprint, $passphrase)
-				->exportPrivateKey($fingerprint);
-		}
-		return $this->GnuPG
-			? $this->GnuPG->export($fingerprint)
-			: $this->GPG->export($fingerprint);
-	}
-
-	/**
-	 * Returns the engine info
-	 */
-	public function getEngineInfo() : array
-	{
-		return $this->handler()->getengineinfo();
-	}
-
-	/**
-	 * Returns the errortext, if a function fails
-	 */
-	public function getError() /*: string|false*/
-	{
-		return $this->handler()->geterror();
-	}
-
-	/**
-	 * Returns the error info
-	 */
-	public function getErrorInfo() : array
-	{
-		return $this->handler()->geterrorinfo();
-	}
-
-	/**
-	 * Returns the currently active protocol for all operations
-	 */
-	public function getProtocol() : int
-	{
-		return $this->handler()->getprotocol();
-	}
-
-	/**
-	 * Generates a key
-	 */
-	public function generateKey(string $uid, string $passphrase) /*: string|false*/
-	{
-		$GPG = $this->getGPG(false);
-		return $GPG ? $GPG->generateKey($uid, $passphrase) : false;
-	}
-
-	/**
-	 * Imports a key
-	 */
-	public function import(string $keydata) /*: array|false*/
-	{
-		return $this->handler()->import($keydata);
-	}
-
-	/**
-	 * Imports a key
-	 */
-	public function importFile(string $filename) /*: array|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->import(\file_get_contents($filename))
-			: $this->GPG->importFile($filename);
-	}
-
-	/**
-	 * Returns an array with information about all keys that matches the given pattern
-	 */
-	public function keyInfo(string $pattern) : array
-	{
-		$keys = [
-			'public' => [],
-			'private' => []
-		];
-		// Public
-		foreach ($this->handler()->keyinfo($pattern) as $key) {
-			$key['can_verify'] = $key['can_sign'];
-			unset($key['can_sign']);
-			$keys['public'][] = $key;
-		}
-		// Private, read https://github.com/php-gnupg/php-gnupg/issues/5
-		foreach ($this->handler()->keyinfo($pattern, 1) as $key) {
-			$key['can_decrypt'] = $key['can_encrypt'];
-			unset($key['can_encrypt']);
-			$keys['private'][] = $key;
-		}
-		return $keys;
-	}
-
-	/**
-	 * Toggle armored output
-	 * When true the output is ASCII
-	 */
-	public function setArmor(bool $armor = true) : bool
-	{
-		return $this->handler()->setarmor($armor ? 1 : 0);
-	}
-
-	/**
-	 * Sets the mode for error_reporting
-	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
-	 * By default GNUPG_ERROR_SILENT is used.
-	 */
-	public function setErrorMode(int $errormode) : void
-	{
-		$this->handler()->seterrormode($errormode);
-	}
-
-	/**
-	 * Sets the mode for signing
-	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH and GNUPG_SIG_MODE_CLEAR.
-	 * By default GNUPG_SIG_MODE_CLEAR
-	 */
-	public function setSignMode(int $signmode) : bool
-	{
-		return $this->handler()->setsignmode($signmode);
-	}
-
-	/**
-	 * Signs a given text
-	 */
-	public function sign(string $plaintext) /*: string|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->sign($plaintext)
-			: $this->GPG->sign($plaintext);
-	}
-
-	/**
-	 * Signs a given file
-	 */
-	public function signFile(string $filename) /*: string|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->sign(\file_get_contents($filename))
-			: $this->GPG->signFile($filename);
-	}
-
-	/**
-	 * Signs a given file
-	 */
-	public function signStream($fp, /*string|resource*/ $output = null) /*: array|false*/
-	{
-		\rewind($fp);
-		return $this->GnuPG
-			? $this->GnuPG->sign(\stream_get_contents($fp))
-			: $this->GPG->signStream($fp);
-	}
-
-	/**
-	 * Verifies a signed text
-	 */
-	public function verify(string $signed_text, string $signature, string &$plaintext = null) /*: array|false*/
-	{
-		$result = $this->GnuPG
-			? $this->GnuPG->verify($signed_text, $signature ?: false, $plaintext)
-			: $this->GPG->verify($signed_text, $signature, $plaintext);
-		if (!$result) {
-			if ($this->GnuPG) {
-				\SnappyMail\Log::notice('gnupg_verify() failed: ' . $this->GnuPG->geterror());
-				\SnappyMail\Log::info(\print_r($this->GnuPG->geterrorinfo(),1));
-			} else {
-				\SnappyMail\Log::notice('GPG->verify() failed');
-			}
-		}
-		return $result;
-	}
-
-	/**
-	 * Verifies a signed file
-	 */
-	public function verifyFile(string $filename, string $signature, string &$plaintext = null) /*: array|false*/
-	{
-		return $this->GnuPG
-			? $this->GnuPG->verify(\file_get_contents($filename), $signature, $plaintext)
-			: $this->GPG->verifyFile($filename, $signature, $plaintext);
-	}
-
-	/**
-	 * Verifies a given resource
-	 */
-	public function verifyStream(/*resource*/ $fp, string $signature, string &$plaintext = null) /*: string|false */
-	{
-		if (!$fp || !\is_resource($fp)) {
-			throw new \Exception('Invalid stream resource');
-		}
-		return $this->getGPG()->verifyStream($fp, $signature, $plaintext);
-	}
-
 }
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
index 7b5b90417..938aee764 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/keyservers.php
@@ -8,6 +8,10 @@
  * https://datatracker.ietf.org/doc/html/rfc4387
  * https://datatracker.ietf.org/doc/html/rfc7929
  * https://datatracker.ietf.org/doc/html/draft-koch-openpgp-webkey-service-13
+ *
+ * GET https://keys.openpgp.org/pks/lookup?op=get&options=mr&search=security@snappymail.eu
+ * GET https://keys.openpgp.org/vks/v1/by-fingerprint/445D265124E6072671E64D0733F868A7E35E8277
+ * GET https://openpgpkey.example.org/.well-known/openpgpkey/example.org/hu/ihyath4noz8dsckzjbuyqnh4kbup6h4i?l=john.doe
  */
 
 namespace SnappyMail\PGP;
@@ -15,18 +19,17 @@ namespace SnappyMail\PGP;
 abstract class Keyservers
 {
 	public static $hosts = [
+		'https://keys.openpgp.org'
 /*
-		'https://keys.openpgp.org',
 		'https://pgp.mit.edu',
 		'https://keyring.debian.org',
 		'https://attester.flowcrypt.com',
 		'https://zimmermann.mayfirst.org',
 		'https://pool.sks-keyservers.net',
 		'https://keys.mailvelope.com',
-*/
 		'https://keyserver.ubuntu.com',
-		'https://keys.fedoraproject.org',
-		'https://keys.openpgp.org'
+		'hkps://openpgpkeyserver.com',
+*/
 	];
 
 	private static function fetch(string $host, string $op, string $search, bool $fingerprint = false, bool $exact = false) : ?\SnappyMail\HTTP\Response
@@ -36,7 +39,9 @@ abstract class Keyservers
 		$search = \urlencode($search);
 		$fingerprint = $fingerprint ? '&fingerprint=on' : '';
 		$exact = $exact ? '&exact=on' : '';
-		return static::HTTP()->doRequest('GET', "{$host}/pks/lookup?op={$op}&options=mr{$fingerprint}&search={$search}");
+		$url = "{$host}/pks/lookup?op={$op}&options=mr{$fingerprint}&search={$search}";
+		\SnappyMail\Log::debug('PGP', $url);
+		return static::HTTP()->doRequest('GET', $url);
 	}
 
 	private static $HTTP;
@@ -56,11 +61,12 @@ abstract class Keyservers
 	 */
 	public static function get(string $keyId) : string
 	{
+/*
 		// add the 0x prefix if absent
 		if ('0x' !== \substr($keyId, 0, 2)) {
 			$keyId = '0x' . $keyId;
 		}
-
+*/
 		foreach (static::$hosts as $host) {
 			$oResponse = static::fetch($host, 'get', $keyId);
 			if (!$oResponse) {
@@ -68,14 +74,14 @@ abstract class Keyservers
 				continue;
 			}
 			if (200 !== $oResponse->status) {
-				\SnappyMail\Log::info('PGP', "{$oResponse->status} for key {$keyId} on {$host}");
+				\SnappyMail\Log::debug('PGP', "{$oResponse->status} for key {$keyId} on {$host}");
 				continue;
 			}
 
 			return $oResponse->body;
 		}
 
-		throw new \Exception('Could not obtain public key from the keyserver.');
+		throw new \Exception('Could not obtain public key from the keyservers.');
 	}
 
 	/**
@@ -97,7 +103,7 @@ abstract class Keyservers
 				continue;
 			}
 			if (200 !== $oResponse->status) {
-				\SnappyMail\Log::info('PGP', "{$oResponse->status} for search `{$search}` on {$host}");
+				\SnappyMail\Log::debug('PGP', "{$oResponse->status} for search `{$search}` on {$host}");
 				continue;
 			}
 
@@ -171,7 +177,7 @@ abstract class Keyservers
 	 * Sends a PGP public key to a public keyserver.
 	 *
 	 * @param string $host
-	 * @param mixed $key  The PGP public key.
+	 * @param string $key  The PGP public key.
 	 *
 	 * @throws Exception
 	 */
@@ -191,10 +197,18 @@ abstract class Keyservers
 */
 	}
 
-	/** https://wiki.gnupg.org/WKD */
-	public static function wkd(string $host, string $keyid)
+	/**
+	 * https://wiki.gnupg.org/WKD
+	 * gpg --with-wkd-hash --fingerprint releases@snappymail.eu
+	 * gpg --no-armor --export releases@snappymail.eu > i4cdqgcarfjdjnba6y4jnf498asg8c6p
+     */
+	public static function wkd(string $host, string $emailAddress)
 	{
 /*
+		$localPart = \explode('@', $emailAddress)[0];
+		$b32 = new \SnappyMail\Base32('ybndrfg8ejkmcpqxot1uwisza345h769');
+		$keyid = $b32->encode(\sha1($localPart, true));
+
 		"https://{$host}/.well-known/openpgpkey/hu/{$keyid}";
 		/** https://wiki.gnupg.org/WKD
 			DNS:
@@ -203,8 +217,8 @@ abstract class Keyservers
 			https://openpgpkey.example.com/.well-known/openpgpkey/example.com/hu/
 			else       https://example.com/.well-known/openpgpkey/hu/
 
-			An example: https://example.com/.well-known/openpgpkey/hu/it5sewh54rxz33fwmr8u6dy4bbz8itz4
-			is the direct method URL for "bernhard.reiter@example.com"
+			An example: https://snappymail.eu/.well-known/openpgpkey/hu/i4cdqgcarfjdjnba6y4jnf498asg8c6p
+			is the direct method URL for "releases@snappymail.eu"
 		*/
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
new file mode 100644
index 000000000..bdbaaefe8
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pecl.php
@@ -0,0 +1,402 @@
+<?php
+
+namespace SnappyMail\PGP;
+
+defined('GNUPG_SIG_MODE_NORMAL') || define('GNUPG_SIG_MODE_NORMAL', 0);
+defined('GNUPG_SIG_MODE_DETACH') || define('GNUPG_SIG_MODE_DETACH', 1);
+defined('GNUPG_SIG_MODE_CLEAR') || define('GNUPG_SIG_MODE_CLEAR', 2);
+
+use SnappyMail\GPG\PGP as GPG;
+use SnappyMail\SensitiveString;
+
+class PECL implements \SnappyMail\PGP\PGPInterface
+{
+	private
+		$homedir,
+		// Instance of gnupg pecl extension https://www.php.net/gnupg
+		$GnuPG,
+		// Instance of \SnappyMail\GPG\PGP
+		$GPG;
+
+	function __construct(string $homedir)
+	{
+		$homedir = \rtrim($homedir, '/\\');
+		// BSD 4.4 max length
+		if (104 <= \strlen($homedir . '/S.gpg-agent.extra')) {
+			throw new \Exception('Socket name for S.gpg-agent.extra is too long');
+		}
+		$this->homedir = $homedir;
+//		\putenv("GNUPGHOME={$homedir}");
+
+		$this->GnuPG = new \gnupg([
+			// It is the file name of the executable program implementing this protocol which is usually path of the gpg executable.
+//			'file_name' => '/usr/bin/gpg',
+			// It is the directory name of the configuration directory. It also overrides GNUPGHOME environment variable that is used for the same purpose.
+			'home_dir' => $homedir
+		]);
+		// Output is ASCII
+		$this->GnuPG->setarmor(1);
+/*
+		$conf = "{$homedir}/gpg-agent.conf";
+		if (!\file_exists($conf)) {
+			\file_put_contents($conf, 'default-cache-ttl 1');
+		}
+		$conf = "{$homedir}/gpg.conf";
+		if (!\file_exists($conf)) {
+			\file_put_contents($conf, "batch\nno-comments");
+		}
+*/
+	}
+
+	function __destruct()
+	{
+		$this->GnuPG?->cleardecryptkeys();
+		$this->GnuPG?->clearsignkeys();
+	}
+
+	public static function isSupported(): bool
+	{
+		// Disabled due to failures with "no passphrase" while a passphrase does exist
+		return false && \class_exists('gnupg') && \version_compare(\phpversion('gnupg'), '1.5', '>=');
+	}
+
+	public function gnupgError()
+	{
+		$error = $this->GnuPG->geterrorinfo();
+		if ($error) {
+			throw new \Exception("{$error['gpgme_source']} {$error['generic_message']}. {$error['gpgme_message']}", $error['gpgme_code']);
+		}
+	}
+
+	public function getGPG(bool $throw = true): ?GPG
+	{
+		if (!$this->GPG) {
+			if (GPG::isSupported()) {
+				$this->GPG = new GPG($this->homedir);
+			} else if ($throw) {
+				throw new \Exception('GPG not supported');
+			}
+		}
+		return $this->GPG;
+	}
+
+	/**
+	 * Add a key for decryption
+	 */
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool
+	{
+//		\SnappyMail\Log::debug('GnuPG', "addDecryptKey({$fingerprint}, {$passphrase})");
+		return $this->GnuPG->adddecryptkey($fingerprint, \strval($passphrase)) || $this->gnupgError();
+	}
+
+	/**
+	 * Add a key for encryption
+	 */
+	public function addEncryptKey(string $fingerprint): bool
+	{
+		return $this->GnuPG->addencryptkey($fingerprint) || $this->gnupgError();
+	}
+
+	/**
+	 * Add a key for signing
+	 */
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool
+	{
+//		\SnappyMail\Log::debug('GnuPG', "addSignKey({$fingerprint}, {$passphrase})");
+		return $this->GnuPG->addsignkey($fingerprint, \strval($passphrase)) || $this->gnupgError();
+	}
+
+	/**
+	 * Removes all keys which were set for decryption before
+	 */
+	public function clearDecryptKeys(): bool
+	{
+		return $this->GnuPG->cleardecryptkeys();
+	}
+
+	/**
+	 * Removes all keys which were set for encryption before
+	 */
+	public function clearEncryptKeys(): bool
+	{
+		return $this->GnuPG->clearencryptkeys();
+	}
+
+	/**
+	 * Removes all keys which were set for signing before
+	 */
+	public function clearSignKeys(): bool
+	{
+		return $this->GnuPG->clearsignkeys();
+	}
+
+	/**
+	 * Decrypts a given text
+	 */
+	public function decrypt(string $text): string|false
+	{
+		$result = $this->GnuPG->decrypt($text);
+		(false === $result) && $this->gnupgError();
+		return $result;
+	}
+
+	/**
+	 * Decrypts a given file
+	 */
+	public function decryptFile(string $filename): string|false
+	{
+		$result = $this->GnuPG->decrypt(\file_get_contents($filename));
+		(false === $result) && $this->gnupgError();
+		return $result;
+	}
+
+	/**
+	 * Decrypts a given resource
+	 */
+	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+//		\rewind($fp);
+		$result = $this->GnuPG->decrypt(\stream_get_contents($fp));
+		(false === $result) && $this->gnupgError();
+		return $result;
+	}
+
+	/**
+	 * Decrypts and verifies a given text
+	 */
+	public function decryptVerify(string $text, string &$plaintext): array|false
+	{
+		$result = $this->GnuPG->decryptverify($text, $plaintext);
+		(false === $result) && $this->gnupgError();
+		return $result;
+	}
+
+	/**
+	 * Decrypts and verifies a given file
+	 */
+	public function decryptVerifyFile(string $filename, string &$plaintext): array|false
+	{
+		$result = $this->GnuPG->decryptverify(\file_get_contents($filename), $plaintext);
+		(false === $result) && $this->gnupgError();
+		return $result;
+	}
+
+	/**
+	 * Delete a key from the keyring
+	 */
+	public function deleteKey(string $keyId, bool $private): bool
+	{
+//		return $this->GnuPG->deletekey($keyId, $private);
+		return $this->getGPG()->deleteKey($keyId, $private);
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encrypt(string $plaintext): string|false
+	{
+		return $this->GnuPG->encrypt($plaintext) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Encrypts a given text
+	 */
+	public function encryptFile(string $filename): string|false
+	{
+		return $this->GnuPG->encrypt(\file_get_contents($filename)) ?: $this->gnupgError();
+	}
+
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false
+	{
+		\rewind($fp);
+		return $this->GnuPG->encrypt(\stream_get_contents($fp)) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Exports a key
+	 */
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false
+	{
+		if (null !== $passphrase) {
+			return $this->getGPG()->export($fingerprint, $passphrase);
+		}
+		return $this->GnuPG->export($fingerprint) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Returns the engine info
+	 */
+	public function getEngineInfo(): array
+	{
+		return $this->GnuPG->getengineinfo();
+	}
+
+	/**
+	 * Returns the errortext, if a function fails
+	 */
+	public function getError(): string|false
+	{
+		return $this->GnuPG->geterror();
+	}
+
+	/**
+	 * Returns the error info
+	 */
+	public function getErrorInfo(): array
+	{
+		return $this->GnuPG->geterrorinfo();
+	}
+
+	/**
+	 * Returns the currently active protocol for all operations
+	 */
+	public function getProtocol(): int
+	{
+		return $this->GnuPG->getprotocol();
+	}
+
+	/**
+	 * Generates a key
+	 */
+	public function generateKey(string $uid, SensitiveString $passphrase): string|false
+	{
+		$GPG = $this->getGPG(false);
+		return $GPG ? $GPG->generateKey($uid, $passphrase) : false;
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function import(string $keydata): array|false
+	{
+		return $this->GnuPG->import($keydata);
+	}
+
+	/**
+	 * Imports a key
+	 */
+	public function importFile(string $filename): array|false
+	{
+		return $this->GnuPG->import(\file_get_contents($filename)) ?: $this->gnupgError();
+	}
+
+	public function keyInfo(string $pattern, bool $private = false): array
+	{
+		return $this->GnuPG->keyinfo($pattern, $private ? 1 : 0);
+	}
+
+	/**
+	 * Returns an array with information about all keys that matches the given pattern
+	 */
+	public function allKeysInfo(string $pattern): array
+	{
+		$keys = [
+			'public' => [],
+			'private' => []
+		];
+		// Public
+		foreach (($this->GnuPG->keyinfo($pattern) ?: []) as $key) {
+			$key['can_verify'] = $key['can_sign'];
+			unset($key['can_sign']);
+			$keys['public'][] = $key;
+		}
+		// Private, read https://github.com/php-gnupg/php-gnupg/issues/5
+		foreach (($this->GnuPG->keyinfo($pattern, 1) ?: []) as $key) {
+			$key['can_decrypt'] = $key['can_encrypt'];
+			unset($key['can_encrypt']);
+			$keys['private'][] = $key;
+		}
+		return $keys;
+	}
+
+	/**
+	 * Toggle armored output
+	 * When true the output is ASCII
+	 */
+	public function setArmor(bool $armor = true): bool
+	{
+		return $this->GnuPG->setarmor($armor ? 1 : 0);
+	}
+
+	/**
+	 * Sets the mode for error_reporting
+	 * GNUPG_ERROR_WARNING, GNUPG_ERROR_EXCEPTION and GNUPG_ERROR_SILENT.
+	 * By default GNUPG_ERROR_SILENT is used.
+	 */
+	public function setErrorMode(int $errormode): void
+	{
+		$this->GnuPG->seterrormode($errormode);
+	}
+
+	/**
+	 * Sets the mode for signing
+	 * GNUPG_SIG_MODE_NORMAL, GNUPG_SIG_MODE_DETACH and GNUPG_SIG_MODE_CLEAR.
+	 * By default GNUPG_SIG_MODE_CLEAR
+	 */
+	public function setSignMode(int $signmode): bool
+	{
+		return $this->GnuPG->setsignmode($signmode);
+	}
+
+	/**
+	 * Signs a given text
+	 */
+	public function sign(string $plaintext): string|false
+	{
+		return $this->GnuPG->sign($plaintext) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signFile(string $filename): string|false
+	{
+		return $this->GnuPG->sign(\file_get_contents($filename)) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Signs a given file
+	 */
+	public function signStream($fp, /*string|resource*/ $output = null): string|false
+	{
+		\rewind($fp);
+		return $this->GnuPG->sign(\stream_get_contents($fp)) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Verifies a signed text
+	 */
+	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false
+	{
+		$result = $this->GnuPG->verify($signed_text, $signature ?: false, $plaintext) ?: $this->gnupgError();
+		if (!$result) {
+			\SnappyMail\Log::notice('GnuPG', 'gnupg_verify() failed: ' . $this->GnuPG->geterror());
+			\SnappyMail\Log::info('GnuPG', \print_r($this->GnuPG->geterrorinfo(),1));
+		}
+		return $result;
+	}
+
+	/**
+	 * Verifies a signed file
+	 */
+	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false
+	{
+		return $this->GnuPG->verify(\file_get_contents($filename), $signature, $plaintext) ?: $this->gnupgError();
+	}
+
+	/**
+	 * Verifies a given resource
+	 */
+	public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null): array|false
+	{
+		if (!$fp || !\is_resource($fp)) {
+			throw new \Exception('Invalid stream resource');
+		}
+//		\rewind($fp);
+		return $this->GnuPG->verify(\stream_get_contents($fp), $signature, $plaintext) ?: $this->gnupgError();
+	}
+
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php
new file mode 100644
index 000000000..aba3d703e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/pgp/pgpinterface.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace SnappyMail\PGP;
+
+use SnappyMail\SensitiveString;
+
+interface PGPInterface
+{
+	public static function isSupported(): bool;
+//	public function addPinentry(string $keyId, SensitiveString $passphrase);
+//	public function clearPinentries(): bool
+	public function addDecryptKey(string $fingerprint, SensitiveString $passphrase): bool;
+	public function addEncryptKey(string $fingerprint): bool;
+	public function addSignKey(string $fingerprint, SensitiveString $passphrase): bool;
+	public function clearDecryptKeys(): bool;
+	public function clearEncryptKeys(): bool;
+	public function clearSignKeys(): bool;
+	public function decrypt(string $text): string|false;
+	public function decryptFile(string $filename): string|false;
+	public function decryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false;
+	public function decryptVerify(string $text, string &$plaintext): array|false;
+	public function decryptVerifyFile(string $filename, string &$plaintext): array|false;
+	public function deleteKey(string $keyId, bool $private): bool;
+	public function encrypt(string $plaintext): string|false;
+	public function encryptFile(string $filename): string|false;
+	public function encryptStream(/*resource*/ $fp, /*string|resource*/ $output = null): string|false;
+	public function export(string $fingerprint, ?SensitiveString $passphrase = null): string|false;
+	public function getEngineInfo(): array;
+	public function getError(): string|false;
+	public function getErrorInfo(): array;
+	public function getProtocol(): int;
+	public function generateKey(string $uid, SensitiveString $passphrase): string|false;
+	public function import(string $keydata): array|false;
+	public function importFile(string $filename): array|false;
+	public function allKeysInfo(string $pattern): array;
+	public function setArmor(bool $armor = true): bool;
+	public function setErrorMode(int $errormode): void;
+	public function setSignMode(int $signmode): bool;
+	public function sign(string $plaintext): string|false;
+	public function signFile(string $filename): string|false;
+	public function signStream($fp, /*string|resource*/ $output = null): string|false;
+	public function verify(string $signed_text, string $signature, ?string &$plaintext = null): array|false;
+	public function verifyFile(string $filename, string $signature, ?string &$plaintext = null): array|false;
+	public function verifyStream(/*resource*/ $fp, string $signature, ?string &$plaintext = null): array|false;
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/qrcode.php b/snappymail/v/0.0.0/app/libraries/snappymail/qrcode.php
index 338ae3d3d..13dc91d81 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/qrcode.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/qrcode.php
@@ -19,7 +19,7 @@
 
 namespace SnappyMail;
 
-class QRCode
+class QRCode implements \Stringable
 {
 
 	const
@@ -28,12 +28,15 @@ class QRCode
 		ERROR_CORRECT_LEVEL_Q = 3, // 25%
 		ERROR_CORRECT_LEVEL_H = 2; // 30%
 
-	protected
-		$typeNumber = 1,
-		$modules,
-		$moduleCount,
-		$errorCorrectLevel = self::ERROR_CORRECT_LEVEL_H,
-		$qrDataList = [];
+	protected int $typeNumber = 1;
+
+	protected array $modules;
+
+	protected int $moduleCount;
+
+	protected int $errorCorrectLevel = self::ERROR_CORRECT_LEVEL_H;
+
+	protected array $qrDataList = [];
 
 	public function __toString() : string
 	{
@@ -91,7 +94,7 @@ class QRCode
 		return $this;
 	}
 
-	public function addData($data, int $mode = 0) : void
+	public function addData(string $data, int $mode = 0) : void
 	{
 		$this->qrDataList[] = new QRData($data, $mode);
 	}
@@ -246,7 +249,7 @@ class QRCode
 		$this->modules[$this->moduleCount - 8][8] = !$test;
 	}
 
-	protected function mapData(&$data, int $maskPattern) : void
+	protected function mapData(array &$data, int $maskPattern) : void
 	{
 		$inc = -1;
 		$row = $this->moduleCount - 1;
@@ -283,7 +286,7 @@ class QRCode
 		}
 	}
 
-	protected static function createBytes(&$buffer, &$rsBlocks) : array
+	protected static function createBytes(QRBitBuffer $buffer, array &$rsBlocks) : array
 	{
 		$offset = 0;
 		$maxDcCount = 0;
@@ -347,7 +350,7 @@ class QRCode
 		return $data;
 	}
 
-	protected static function createData(int $typeNumber, int $errorCorrectLevel, $dataArray) : array
+	protected static function createData(int $typeNumber, int $errorCorrectLevel, array $dataArray) : array
 	{
 		$rsBlocks = QRRSBlock::getRSBlocks($typeNumber, $errorCorrectLevel);
 		$buffer = new QRBitBuffer();
@@ -415,7 +418,7 @@ class QRCode
 		$this->makeImpl(false, $this->getBestMaskPattern());
 	}
 
-	public static function getMinimumQRCode($data, int $errorCorrectLevel) : self
+	public static function getMinimumQRCode(string $data, int $errorCorrectLevel) : self
 	{
 		$qr = new QRCode();
 		$qr->setErrorCorrectLevel($errorCorrectLevel);
@@ -654,13 +657,11 @@ abstract class QRUtil {
 				}
 			}
 		}
-		$ratio = \abs(100 * $darkCount / $moduleCount / $moduleCount - 50) / 5;
-		$lostPoint += $ratio * 10;
 
-		return $lostPoint;
+		return $lostPoint + \intval(\abs(100 * $darkCount / $moduleCount / $moduleCount - 50) * 10 / 5);
 	}
 
-	static function getBCHTypeInfo($data)
+	static function getBCHTypeInfo(int $data)
 	{
 		$d = $data << 10;
 		$g15 = static::getBCHDigit(self::G15);
@@ -674,7 +675,7 @@ abstract class QRUtil {
 		return (($data << 10) | $d) ^ self::G15_MASK;
 	}
 
-	static function getBCHTypeNumber($data)
+	static function getBCHTypeNumber(int $data)
 	{
 		$d = $data << 12;
 		$g18 = static::getBCHDigit(self::G18);
@@ -688,7 +689,7 @@ abstract class QRUtil {
 		return ($data << 12) | $d;
 	}
 
-	protected static function getBCHDigit($data) : int
+	protected static function getBCHDigit(int $data) : int
 	{
 		$digit = 0;
 		while ($data != 0) {
@@ -705,8 +706,9 @@ abstract class QRUtil {
 
 class QRRSBlock {
 
-	protected $totalCount;
-	protected $dataCount;
+	protected int $totalCount;
+
+	protected int $dataCount;
 
 	static $QR_RS_BLOCK_TABLE = [
 
@@ -1019,17 +1021,17 @@ class QRData
 		MODE_8BIT_BYTE = 4,
 		MODE_KANJI     = 8;
 
-	protected
-		$data,
-		$mode;
+	protected string $data;
 
-	public function __construct($data, int $mode = 0)
+	protected int $mode;
+
+	public function __construct(string $data, int $mode = 0)
 	{
 		$this->data = $data;
 		$this->mode = $mode ?: static::detectMode($data);
 	}
 
-	public function getData()
+	public function getData() : string
 	{
 		return $this->data;
 	}
@@ -1046,7 +1048,7 @@ class QRData
 		return $this->mode;
 	}
 
-	public function getLengthInBits($type) : int
+	public function getLengthInBits(int $type) : int
 	{
 		if (1 > $type || 40 < $type) {
 			throw new \OutOfBoundsException("Invalid type: {$type}");
@@ -1091,7 +1093,7 @@ class QRData
 		}
 	}
 
-	public function write(&$buffer) : void
+	public function write(QRBitBuffer $buffer) : void
 	{
 		$i = 0;
 		$data = $this->data;
@@ -1249,9 +1251,9 @@ abstract class QRMath
 
 class QRPolynomial {
 
-	protected $num;
+	protected array $num;
 
-	public function __construct($num, $shift = 0)
+	public function __construct(array $num, int $shift = 0)
 	{
 		$offset = 0;
 		$limit = \count($num);
@@ -1274,7 +1276,7 @@ class QRPolynomial {
 		return \count($this->num);
 	}
 
-	public function multiply($e) : self
+	public function multiply(self $e) : self
 	{
 		$tl = $this->getLength();
 		$el = $e->getLength();
@@ -1288,7 +1290,7 @@ class QRPolynomial {
 		return new static($num);
 	}
 
-	public function mod($e) : self
+	public function mod(self $e) : self
 	{
 		$tl = $this->getLength();
 		$el = $e->getLength();
@@ -1340,7 +1342,7 @@ class QRBitBuffer {
 		}
 	}
 
-	public function putBit($bit) : void
+	public function putBit(bool $bit) : void
 	{
 		$bufIndex = (int)\floor($this->length / 8);
 		if (\count($this->buffer) <= $bufIndex) {
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
index 44bfd72a9..2a36360b0 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/repository.php
@@ -67,40 +67,27 @@ abstract class Repository
 		$bReal = false;
 		$aRep = null;
 
-		$sRep = '';
 		$sRepoFile = 'packages.json';
-		$iRepTime = 0;
 
 		$oCache = \RainLoop\Api::Actions()->Cacher();
 
-		$sCacheKey = \RainLoop\KeyPathHelper::RepositoryCacheFile(static::BASE_URL, $sRepoFile);
+		$sCacheKey = '/RepositoryCache/Repo/' . static::BASE_URL . '/File/' . $sRepoFile;
 		$sRep = $oCache->Get($sCacheKey);
-		if ('' !== $sRep)
-		{
-			$iRepTime = $oCache->GetTimer($sCacheKey);
-		}
+		$iRepTime = $sRep ? $oCache->GetTimer($sCacheKey) : 0;
 
-		if ('' === $sRep || 0 === $iRepTime || \time() - 3600 > $iRepTime)
-		{
+		if (!$sRep || !$iRepTime || \time() - 3600 > $iRepTime) {
 			$sRep = static::get($sRepoFile);
-			if ($sRep)
-			{
+			if ($sRep) {
 				$aRep = \json_decode($sRep);
 				$bReal = \is_array($aRep) && \count($aRep);
-
-				if ($bReal)
-				{
+				if ($bReal) {
 					$oCache->Set($sCacheKey, $sRep);
 					$oCache->SetTimer($sCacheKey);
 				}
-			}
-			else
-			{
+			} else {
 				throw new \Exception('Cannot read remote repository file: '.$sRepoFile);
 			}
-		}
-		else if ('' !== $sRep)
-		{
+		} else if ($sRep) {
 			$aRep = \json_decode($sRep, false, 10);
 			$bReal = \is_array($aRep) && \count($aRep);
 		}
@@ -112,38 +99,34 @@ abstract class Repository
 	{
 		$aResult = array();
 		try {
-			$notDev = '0.0.0' !== APP_VERSION;
 			foreach (static::getRepositoryDataByUrl($bReal) as $oItem) {
-				if ($oItem && isset($oItem->type, $oItem->id, $oItem->name,
-					$oItem->version, $oItem->release, $oItem->file, $oItem->description))
-				{
-					if ((!empty($oItem->required) && $notDev && \version_compare(APP_VERSION, $oItem->required, '<'))
-					 || (!empty($oItem->deprecated) && $notDev && \version_compare(APP_VERSION, $oItem->deprecated, '>='))
-					 || (isset($aResult[$oItem->id]) && \version_compare($aResult[$oItem->id]['version'], $oItem->version, '>'))
-					) {
-						continue;
-					}
-
-					if ('plugin' === $oItem->type) {
-						$aResult[$oItem->id] = array(
-							'type' => $oItem->type,
-							'id' => $oItem->id,
-							'name' => $oItem->name,
-							'installed' => '',
-							'enabled' => true,
-							'version' => $oItem->version,
-							'file' => $oItem->file,
-							'release' => $oItem->release,
-							'desc' => $oItem->description,
-							'canBeDeleted' => false,
-							'canBeUpdated' => true
-						);
-					}
+				if ($oItem
+				 && isset($oItem->type, $oItem->id, $oItem->name, $oItem->version, $oItem->release, $oItem->file, $oItem->description)
+				 && 'plugin' === $oItem->type
+				 // is this entry newer then an already defined one
+				 && (empty($aResult[$oItem->id]) || \version_compare($aResult[$oItem->id]['version'], $oItem->version, '<'))
+				 // does this entry require same or older app version
+				 && (SNAPPYMAIL_DEV || empty($oItem->required) || \version_compare(APP_VERSION, $oItem->required, '>='))
+				 // is this entry not deprecated for current app version?
+				 && (SNAPPYMAIL_DEV || empty($oItem->deprecated) || \version_compare(APP_VERSION, $oItem->deprecated, '<'))
+				) {
+					$aResult[$oItem->id] = array(
+						'type' => $oItem->type,
+						'id' => $oItem->id,
+						'name' => $oItem->name,
+						'installed' => '',
+						'enabled' => true,
+						'version' => $oItem->version,
+						'file' => $oItem->file,
+						'release' => $oItem->release,
+						'desc' => $oItem->description,
+						'canBeDeleted' => false,
+						'canBeUpdated' => true
+					);
 				}
 			}
 		} catch (\Throwable $e) {
-			$sError = "{$e->getCode()} {$e->getMessage()}";
-			\RainLoop\Api::Logger()->Write($sError, \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
+			\SnappyMail\Log::error('INSTALLER', "{$e->getCode()} {$e->getMessage()}");
 		}
 		return $aResult;
 	}
@@ -173,20 +156,53 @@ abstract class Repository
 	{
 		return \version_compare(APP_VERSION, '2.0', '>')
 			&& \is_writable(\dirname(APP_VERSION_ROOT_PATH))
-			&& \is_writable(APP_INDEX_ROOT_PATH . 'index.php');
+			&& \is_writable(APP_INDEX_ROOT_PATH . 'index.php')
+			&& \RainLoop\Api::Config()->Get('admin_panel', 'allow_update', false);
+	}
+
+	public static function getEnabledPackagesNames() : array
+	{
+		return \array_map('trim',
+			\explode(',', \strtolower(\RainLoop\Api::Config()->Get('plugins', 'enabled_list', '')))
+		);
+	}
+
+	public static function enablePackage(string $sName, bool $bEnable = true) : bool
+	{
+		if (!\strlen($sName)) {
+			return false;
+		}
+
+		$oConfig = \RainLoop\Api::Config();
+
+		$aEnabledPlugins = static::getEnabledPackagesNames();
+
+		$aNewEnabledPlugins = array();
+		if ($bEnable) {
+			$aNewEnabledPlugins = $aEnabledPlugins;
+			$aNewEnabledPlugins[] = $sName;
+		} else {
+			foreach ($aEnabledPlugins as $sPlugin) {
+				if ($sName !== $sPlugin && \strlen($sPlugin)) {
+					$aNewEnabledPlugins[] = $sPlugin;
+				}
+			}
+		}
+
+		$oConfig->Set('plugins', 'enabled_list', \trim(\implode(',', \array_unique($aNewEnabledPlugins)), ' ,'));
+
+		return $oConfig->Save();
 	}
 
 	public static function getPackagesList() : array
 	{
-		\RainLoop\Api::Actions()->IsAdminLoggined();
+		empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']) && \RainLoop\Api::Actions()->IsAdminLoggined();
 
 		$bReal = false;
 		$sError = '';
 		$aList = static::getRepositoryData($bReal, $sError);
 
-		$aEnabledPlugins = \array_map('trim',
-			\explode(',', \strtolower(\RainLoop\Api::Config()->Get('plugins', 'enabled_list', '')))
-		);
+		$aEnabledPlugins = static::getEnabledPackagesNames();
 
 		$aInstalled = \RainLoop\Api::Actions()->Plugins()->InstalledPlugins();
 		foreach ($aInstalled as $aItem) {
@@ -200,13 +216,13 @@ abstract class Repository
 					\array_push($aList, array(
 						'type' => 'plugin',
 						'id' => $aItem[0],
-						'name' => $aItem[0],
+						'name' => $aItem[2],
 						'installed' => $aItem[1],
 						'enabled' => \in_array(\strtolower($aItem[0]), $aEnabledPlugins),
 						'version' => '',
 						'file' => '',
 						'release' => '',
-						'desc' => '',
+						'desc' => $aItem[3],
 						'canBeDeleted' => true,
 						'canBeUpdated' => false
 					));
@@ -226,6 +242,7 @@ abstract class Repository
 	public static function deletePackage(string $sId) : bool
 	{
 		\RainLoop\Api::Actions()->IsAdminLoggined();
+		static::enablePackage($sId, false);
 		return static::deletePackageDir($sId);
 	}
 
@@ -236,11 +253,11 @@ abstract class Repository
 			&& (!\is_file("{$sPath}.phar") || \unlink("{$sPath}.phar"));
 	}
 
-	public static function installPackage(string $sType, string $sId, string $sFile) : bool
+	public static function installPackage(string $sType, string $sId, string $sFile = '') : bool
 	{
-		\RainLoop\Api::Actions()->IsAdminLoggined();
+		empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']) && \RainLoop\Api::Actions()->IsAdminLoggined();
 
-		\RainLoop\Api::Logger()->Write('Start package install: '.$sFile.' ('.$sType.')', \MailSo\Log\Enumerations\Type::INFO, 'INSTALLER');
+		\SnappyMail\Log::info('INSTALLER', 'Start package install: '.$sId.' ('.$sType.')');
 
 		$sRealFile = '';
 
@@ -254,28 +271,33 @@ abstract class Repository
 				if ($sError) {
 					throw new \Exception($sError);
 				}
-				if (isset($aList[$sId]) && $sFile === $aList[$sId]['file']) {
-					$sRealFile = $sFile;
-					$sTmp = static::download($sFile);
+				if (isset($aList[$sId]) && (!$sFile || $sFile === $aList[$sId]['file'])) {
+					$sRealFile = $aList[$sId]['file'];
+					$sTmp = static::download($aList[$sId]['file']);
 				}
 			}
 
 			if ($sTmp) {
-				$oArchive = new \PharData($sTmp, 0, $sRealFile);
 				if (!static::deletePackageDir($sId)) {
 					throw new \Exception('Cannot remove previous plugin folder: '.$sId);
 				}
 				if ('.phar' === \substr($sRealFile, -5)) {
 					$bResult = \copy($sTmp, APP_PLUGINS_PATH . \basename($sRealFile));
 				} else {
+					if (\class_exists('PharData')) {
+						$oArchive = new \PharData($sTmp, 0, $sRealFile);
+					} else {
+//						throw new \Exception('PHP Phar is disabled, you must enable it');
+						$oArchive = new \SnappyMail\TAR($sTmp);
+					}
 					$bResult = $oArchive->extractTo(\rtrim(APP_PLUGINS_PATH, '\\/'));
 				}
 				if (!$bResult) {
-					throw new \Exception('Cannot extract package files: '.$oArchive->getStatusString());
+					throw new \Exception('Cannot extract package files');
 				}
 			}
 		} catch (\Throwable $e) {
-			\RainLoop\Api::Logger()->Write("Install package {$sRealFile} failed: {$e->getMessage()}", \MailSo\Log\Enumerations\Type::ERROR, 'INSTALLER');
+			\SnappyMail\Log::error('INSTALLER', "Install package {$sRealFile} failed: {$e->getMessage()}");
 			throw $e;
 		} finally {
 			$sTmp && \unlink($sTmp);
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlsymbol.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlsymbol.php
new file mode 100644
index 000000000..01cdddf41
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlsymbol.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class ControlSymbol implements Entity
+{
+	public string $symbol;
+	public /*int|string*/ $parameter;
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlword.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlword.php
new file mode 100644
index 000000000..ce44a1351
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/controlword.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class ControlWord implements Entity
+{
+	public string $word;
+	public int $parameter;
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/document.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/document.php
new file mode 100644
index 000000000..359f3136e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/document.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Based on https://github.com/henck/rtf-html-php
+ */
+
+declare(strict_types=1);
+
+namespace SnappyMail\Rtf;
+
+class Document
+{
+	private string $rtf; // RTF string being parsed
+	private int $len = 0; // Length of RTF string
+	private int $pos = 0; // Current position in RTF string
+	public ?Group $root = null; // Root group
+	private ?Group $group = null; // Current group
+
+	private string $char = '';
+	private array $uc = [];
+
+	private static array $groups = [
+		'colortbl'   => Groups\ColorTable::class,
+		'filetbl'    => Groups\FileTable::class,
+		'fonttbl'    => Groups\FontTable::class,
+		'generator'  => Groups\Generator::class,
+		'info'       => Groups\Info::class,
+		'listtable'  => Groups\ListTable::class,
+		'listtext'  => Groups\ListText::class,
+		'listoverridetable' => Groups\ListOverrideTable::class,
+		'pict'       => Groups\Pict::class,
+		'stylesheet' => Groups\StyleSheet::class
+	];
+
+	public function __construct(string $rtf)
+	{
+		/*
+		 * Attempt to parse an RTF string.
+		 */
+		$this->rtf = $rtf;
+		$this->len = \strlen($rtf);
+		$this->pos = 0;
+		$this->root = null;
+		$this->group = null;
+		$this->char = '';
+		$this->uc = [];
+
+		while ($this->pos < $this->len-1) {
+			// Read next character:
+			$this->nextChar();
+
+			// Ignore \r and \n
+			if ($this->is_endofline()) continue;
+
+			// What type of character is this?
+			switch ($this->char)
+			{
+				// Group handling
+				case '{':
+					$this->startGroup();
+					break;
+				case '}':
+					$this->endGroup();
+					break;
+
+				case '\\':
+					// If there is no current group, then this is not a valid RTF file.
+					if (!$this->group) {
+						throw new \RuntimeException('Parse error: RTF text outside of group.');
+					}
+					// Beginning of an RTF control word or control symbol.
+					// Look ahead by one character to see if it starts with
+					// a letter (control word) or another symbol (control symbol):
+					$this->group->children[] = \ctype_alpha($this->nextChar(true))
+						? $this->parseControlWord()
+						: $this->parseControlSymbol();
+					break;
+
+				default:
+					$this->parseText();
+					break;
+			}
+		}
+		$this->rtf = '';
+		$this->group = null;
+	}
+
+	// Get the next character from the RTF stream.
+	// Parsing is aborted when reading beyond end of input string.
+	protected function nextChar(bool $peek = false): string
+	{
+		if ($this->pos >= $this->len) {
+			$this->char = null;
+			throw new \RuntimeException("Parse error: Tried to read past end of input; RTF is probably truncated.");
+		}
+		if ($peek) {
+			return $this->rtf[$this->pos];
+		}
+		$this->char = $this->rtf[$this->pos++];
+		return $this->char;
+	}
+
+	/*
+	 * (Helper method)
+	 * Is the current character end-of-line (EOL)?
+	 */
+	protected function is_endofline(): bool
+	{
+		if (\strspn($this->char, "\r\n")) {
+			// Checks for a Windows/Acron type EOL
+			if (\strspn($this->nextChar(true), "\r\n")) {
+				++$this->pos;
+			}
+			return true;
+		}
+		return false;
+	}
+
+	// Store state of document on stack.
+	protected function startGroup()
+	{
+		$group = new Group();
+		if ('\\' === $this->nextChar(true)) {
+			$cword = null;
+			if (\ctype_alpha($this->rtf[$this->pos+1])) {
+				$this->nextChar();
+				$cword = $this->parseControlWord();
+				// Replace group with special group?
+				if (isset(static::$groups[$cword->word])) {
+					$group = new static::$groups[$cword->word]();
+				} else {
+					$group->children[] = $cword;
+				}
+			}
+			else if ('*' === $this->rtf[$this->pos+1]) {
+				$group = new Groups\Destination();
+				$this->nextChar();
+				$this->parseControlSymbol();
+//				$group->children[] = $this->parseControlSymbol();
+				if (\ctype_alpha($this->rtf[$this->pos+1])) {
+					/**
+					 * Destinations added after the 1987 RTF Specification may be preceded by the control symbol \*
+					 * This control symbol identifies destinations whose related text should be
+					 * ignored if the RTF reader does not recognize the destination control word.
+					 */
+					$this->nextChar();
+					$cword = $this->parseControlWord();
+					// Replace group with special group?
+					if (isset(static::$groups[$cword->word])) {
+						$group = new static::$groups[$cword->word]();
+					} else {
+						$group->children[] = $cword;
+					}
+				}
+			}
+		}
+
+		// Is there a current group? Then make the new group its child:
+		if ($this->group) {
+			$group->parent = $this->group;
+			$this->group->children[] = $group;
+			$this->uc[] = \end($this->uc);
+		}
+		// If there is no parent group, then set this group
+		// as the root group.
+		else {
+			$this->root = $group;
+			// Create uc stack and insert the first default value
+			$this->uc = [1];
+		}
+		// Set the new group as the current group:
+		$this->group = $group;
+	}
+
+	// Retrieve state of document from stack.
+	protected function endGroup()
+	{
+		$this->group = $this->group->parent;
+		\array_pop($this->uc);
+	}
+
+	protected function parseControlSymbol(): Entity
+	{
+		// Read symbol (one character only).
+		$symbol = $this->nextChar();
+
+		// Exceptional case:
+		// Treat EOL symbols as \par control word
+		if ($this->is_endofline()) {
+			$cword = new ControlWord();
+			$cword->word = 'par';
+			$cword->parameter = 0;
+			return $cword;
+		}
+
+		// Symbols ordinarily have no parameter. However,
+		// if this is \' (a single quote), then it is
+		// followed by a 2-digit hex-code:
+		$parameter = 0;
+		if ('\'' === $symbol) {
+			$parameter = \hexdec($this->nextChar() . $this->nextChar());
+		}
+
+		// Add new control symbol as a child to the current group:
+		$csymbol = new ControlSymbol();
+		$csymbol->symbol = $symbol;
+		$csymbol->parameter = $parameter;
+		return $csymbol;
+	}
+
+	protected function parseControlWord(): ControlWord
+	{
+		// Read letters until a non-letter is reached.
+		$word = '';
+		$this->nextChar();
+		while (\ctype_alpha($this->char)) {
+			$word .= $this->char;
+			$this->nextChar();
+		}
+
+		// Read parameter (if any) consisting of digits.
+		// Parameter may be negative, i.e., starting with a '-'
+		$negative = false;
+		if ('-' === $this->char) {
+			$this->nextChar();
+			$negative = true;
+		}
+		$parameter = null;
+		while (\ctype_digit($this->char)) {
+			if (!$parameter) $parameter = 0;
+			$parameter = $parameter * 10 + (int) $this->char;
+			$this->nextChar();
+		}
+		// If no parameter present, assume control word's default (usually 1)
+		// If no default then assign 0 to the parameter
+		if (null === $parameter) $parameter = 1;
+
+		// Convert parameter to a negative number when applicable
+		if ($negative) $parameter = -$parameter;
+
+		// Update uc value
+		if ('uc' === $word) {
+			\array_pop($this->uc);
+			$this->uc[] = $parameter;
+		}
+
+		// Skip space delimiter
+		if (' ' !== $this->char && !$this->is_endofline()) {
+			--$this->pos;
+		}
+
+		// If this is \u, then the parameter will be followed
+		// by {$this->uc} characters.
+		if ('u' === $word) {
+			// Convert parameter to unsigned decimal unicode
+			if ($negative) {
+				$parameter = 65536 + $parameter;
+			}
+
+			// Will ignore replacement characters $uc times
+			$uc = \end($this->uc);
+			while (0 < $uc--) {
+				$this->nextChar();
+				// If the replacement character is encoded as
+				// hexadecimal value \'hh then jump over it
+				if ('\\' === $this->char && '\'' === $this->rtf[$this->pos])
+					$this->pos = $this->pos + 3;
+
+				// Break if it's an RTF scope delimiter
+				else if (\strspn($this->char, '{}'))
+					break;
+			}
+		}
+
+		$cword = new ControlWord();
+		$cword->word = $word;
+		$cword->parameter = $parameter;
+		return $cword;
+	}
+
+	protected function parseText(): void
+	{
+		// If there is no current group, then this is not a valid RTF file.
+		if (!$this->group) {
+			throw new \RuntimeException('Parse error: RTF text outside of group.');
+		}
+
+		// Parse plain text up to backslash or brace,
+		// unless escaped.
+		$text = '';
+		$terminate = false;
+		do
+		{
+			// Ignore EOL characters
+			if ($this->is_endofline()) {
+				$this->nextChar();
+				continue;
+			}
+			// Is this an escape?
+			if ('\\' == $this->char) {
+				// Perform lookahead to see if this
+				// is really an escape sequence.
+				$this->nextChar();
+				switch ($this->char)
+				{
+					case '\\': break;
+					case '{': break;
+					case '}': break;
+					default:
+						// Not an escape. Roll back.
+						$this->pos = $this->pos - 2;
+						$terminate = true;
+						break;
+				}
+			} else if (\strspn($this->char, '{}')) {
+				--$this->pos;
+				$terminate = true;
+			}
+
+			if (!$terminate) {
+				// Save plain text
+				$text .= $this->char;
+				$this->nextChar();
+			}
+		}
+		while (!$terminate && $this->pos < $this->len);
+
+		// Create new Text element:
+		$text = new Text($text);
+
+		// Add text as a child to the current group:
+		$this->group->children[] = $text;
+	}
+
+	public function toHTML(): string
+	{
+		return (new HtmlFormatter())->format($this);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/encoding.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/encoding.php
new file mode 100644
index 000000000..85f91af53
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/encoding.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+abstract class Encoding
+{
+	public static function getFromCharset(int $fcharset): ?string
+	{
+		/* maps windows character sets to iconv encoding names */
+		$charset = array (
+			0   => 'CP1252', // ANSI: Western Europe
+			1   => 'CP1252', //*Default
+			2   => 'CP1252', //*Symbol
+			3   => null,     // Invalid
+			77  => 'MAC',    //*also [MacRoman]: Macintosh
+			128 => 'CP932',  //*or [Shift_JIS]?: Japanese
+			129 => 'CP949',  //*also [UHC]: Korean (Hangul)
+			130 => 'CP1361', //*also [JOHAB]: Korean (Johab)
+			134 => 'CP936',  //*or [GB2312]?: Simplified Chinese
+			136 => 'CP950',  //*or [BIG5]?: Traditional Chinese
+			161 => 'CP1253', // Greek
+			162 => 'CP1254', // Turkish (latin 5)
+			163 => 'CP1258', // Vietnamese
+			177 => 'CP1255', // Hebrew
+			178 => 'CP1256', // Simplified Arabic
+			179 => 'CP1256', //*Traditional Arabic
+			180 => 'CP1256', //*Arabic User
+			181 => 'CP1255', //*Hebrew User
+			186 => 'CP1257', // Baltic
+			204 => 'CP1251', // Russian (Cyrillic)
+			222 => 'CP874',  // Thai
+			238 => 'CP1250', // Eastern European (latin 2)
+			254 => 'CP437',  //*also [IBM437][437]: PC437
+			255 => 'CP437'   //*OEM still PC437
+		);
+
+		if (isset($charset[$fcharset])) {
+			return $charset[$fcharset];
+		}
+		\trigger_error("Unknown charset: {$fcharset}");
+		return null;
+	}
+
+	public static function getFromCodepage($cpg): ?string
+	{
+		$codePage = array (
+			'ansi' => 'CP1252',
+			'mac'  => 'MAC',
+			'pc'   => 'CP437',
+			'pca'  => 'CP850',
+			437 => 'CP437', // United States IBM
+			708 => 'ASMO-708', // also [ISO-8859-6][ARABIC] Arabic
+			/*	Not supported by iconv
+			709, => '' // Arabic (ASMO 449+, BCON V4)
+			710, => '' // Arabic (transparent Arabic)
+			711, => '' // Arabic (Nafitha Enhanced)
+			720, => '' // Arabic (transparent ASMO)
+			*/
+			819 => 'CP819',   // Windows 3.1 (US and Western Europe)
+			850 => 'CP850',   // IBM multilingual
+			852 => 'CP852',   // Eastern European
+			860 => 'CP860',   // Portuguese
+			862 => 'CP862',   // Hebrew
+			863 => 'CP863',   // French Canadian
+			864 => 'CP864',   // Arabic
+			865 => 'CP865',   // Norwegian
+			866 => 'CP866',   // Soviet Union
+			874 => 'CP874',   // Thai
+			932 => 'CP932',   // Japanese
+			936 => 'CP936',   // Simplified Chinese
+			949 => 'CP949',   // Korean
+			950 => 'CP950',   // Traditional Chinese
+			1250 => 'CP1250', // Windows 3.1 (Eastern European)
+			1251 => 'CP1251', // Windows 3.1 (Cyrillic)
+			1252 => 'CP1252', // Western European
+			1253 => 'CP1253', // Greek
+			1254 => 'CP1254', // Turkish
+			1255 => 'CP1255', // Hebrew
+			1256 => 'CP1256', // Arabic
+			1257 => 'CP1257', // Baltic
+			1258 => 'CP1258', // Vietnamese
+			1361 => 'CP1361'); // Johab
+
+		if (isset($codePage[$cpg])) {
+			return $codePage[$cpg];
+		}
+		\trigger_error("Unknown codepage: {$cpg}");
+		return null;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/entity.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/entity.php
new file mode 100644
index 000000000..1edc89dc8
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/entity.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+/*
+ * Entity is the parent class of all RTF entities,
+ * like Group, ControlWord and ControlSymbol.
+ */
+interface Entity
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/fontinfo.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/fontinfo.php
new file mode 100644
index 000000000..5851ec612
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/fontinfo.php
@@ -0,0 +1,79 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class FontInfo implements \Stringable
+{
+	public string
+		$family = '',
+		$name = '',
+		$charset = '',
+		$codepage = '';
+	public int
+		$uid = 0,
+		$fprq = 0; // 0 = Default pitch, 1 = Fixed pitch, 2 = Variable pitch
+
+	public function addEntity(Entity $entity): void
+	{
+		if ($entity instanceof ControlWord){
+			switch ($entity->word) {
+				case 'f':
+					$this->uid = $entity->parameter;
+					break;
+
+				// <fontfamily>
+				case 'froman':	$this->family = 'serif';      break;
+				case 'fswiss':	$this->family = 'sans-serif'; break;
+				case 'fmodern': $this->family = 'monospace';  break;
+				case 'fscript': $this->family = 'cursive';    break;
+				case 'fdecor':	$this->family = 'fantasy';    break;
+				// case 'fnil': break; // default font
+				// case 'ftech': break; // symbol
+				// case 'fbidi': break; // bidirectional font
+
+				case 'fcharset':
+					$this->charset = Encoding::getFromCharset($entity->parameter);
+					break;
+
+				case 'fprq':
+					$this->fprq = $entity->parameter;
+					break;
+
+				case 'cpg':
+					$this->codepage = Encoding::getFromCodepage($entity->parameter);
+					break;
+			}
+		}
+
+		// <fontname>
+		else if ($entity instanceof Text) {
+			// Store font name (except ; delimiter at end)
+			$this->name = \substr($entity->text, 0, -1);
+		}
+
+		/*
+		else if ($entity instanceof Group) {
+			// possible subgroups:
+			// <panose>
+			// <nontaggedname>
+			// <fontaltname>
+			// <fontemb>
+			// <fontfname>
+		}
+		*/
+	}
+
+	public function __toString(): string
+	{
+		$list = [];
+		if ($this->name) {
+			// If the name has double quotes replace them with single quotes
+			$this->name = \str_replace('"', "'", $this->name);
+			$list[] = $this->name;
+		}
+		if ($this->family) {
+			$list[] = $this->family;
+		}
+		return $list ? 'font-family:' . \implode(', ', $list) : '';
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/group.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/group.php
new file mode 100644
index 000000000..f27a2d160
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/group.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class Group implements Entity
+{
+	public ?Group $parent = null;
+	public array $children = []; // Entities
+
+	public function getType()
+	{
+		if (isset($this->children[0])) {
+			$child = $this->children[0];
+
+			// If the first child is a control word, then
+			// the group type is the word.
+			if ($child instanceof ControlWord) {
+				return $child->word;
+			}
+
+			// If the first child is a control symbol, then
+			// the group type is * for a special symbol, or null.
+			if ($child instanceof ControlSymbol) {
+				return ('*' === $child->symbol) ? '*' : null;
+			}
+		}
+
+		// If first child is neither word nor symbol, then
+		// group type is null.
+		return null;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/colortable.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/colortable.php
new file mode 100644
index 000000000..263c18541
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/colortable.php
@@ -0,0 +1,58 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+use SnappyMail\Rtf\ControlWord;
+use SnappyMail\Rtf\Group;
+use SnappyMail\Rtf\Text;
+
+/**
+ * <colortbl>   '{' \colortbl <colordef>+ '}'
+ * <colordef>   <themecolor>? & \ctintN? & \cshadeN? \redN? & \greenN? & \blueN? ';'
+ * <themecolor> \cmaindarkone | \cmainlightone | \cmaindarktwo | \cmainlighttwo |
+ *              \caccentone | \caccenttwo | \caccentthree | \caccentfour | \caccentfive |
+ *              \caccentsix | \chyperlink | \cfollowedhyperlink | \cbackgroundone |
+ *              \ctextone | \cbackgroundtwo | \ctexttwo
+ */
+class ColorTable extends Group
+{
+	private static $themecolors = [
+		'cmaindarkone', 'cmainlightone', 'cmaindarktwo', 'cmainlighttwo',
+		'caccentone', 'caccenttwo', 'caccentthree', 'caccentfour', 'caccentfive',
+		'caccentsix', 'chyperlink', 'cfollowedhyperlink', 'cbackgroundone',
+		'ctextone', 'cbackgroundtwo', 'ctexttwo'
+	];
+
+	public function getColors(): array
+	{
+		$colortbl = [
+			null
+//			'inherit'
+//			'initial'
+//			'unset'
+		];
+		$color = [];
+		foreach ($this->children as $i => $entity) {
+			if ($entity instanceof ControlWord) {
+				if (isset(static::$themecolors[$entity->word])) {
+					$color['themecolor'] = $entity->word;
+				} else {
+					$color[$entity->word] = $entity->parameter;
+				}
+			} else if ($entity instanceof Text) {
+				// This is a delimiter ';' === $entity->text
+				if ($i) {
+					if (isset($color['red'])) {
+						$colortbl[] = "rgb({$color['red']},{$color['green']},{$color['blue']})";
+						// hex string format
+//						$colortbl[] = \sprintf('#%02x%02x%02x', $color['red'], $color['green'], $color['blue']);
+					} else if (isset($color['themecolor'])) {
+						$colortbl[] = "var(--rtf-{$color['themecolor']})";
+					}
+				}
+				$color = [];
+			}
+		}
+		return $colortbl;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/destination.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/destination.php
new file mode 100644
index 000000000..df7edb56b
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/destination.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class Destination extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/filetable.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/filetable.php
new file mode 100644
index 000000000..fe030dcb4
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/filetable.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class FileTable extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/fonttable.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/fonttable.php
new file mode 100644
index 000000000..d8b14dc32
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/fonttable.php
@@ -0,0 +1,44 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+use SnappyMail\Rtf\FontInfo;
+use SnappyMail\Rtf\Group;
+
+/**
+ * <fonttbl>       '{' \fonttbl (<fontinfo> | ('{' <fontinfo> '}'))+ '}'
+ * <fontinfo>      <themefont>? \fN <fontfamily> \fcharsetN? \fprq? <panose>? <nontaggedname>? <fontemb>? \cpgN? <fontname> <fontaltname>? ';'
+ * <themefont>     \flomajor | \fhimajor | \fdbmajor | \fbimajor | \flominor | \fhiminor | \fdbminor | \fbiminor
+ * <fontfamily>    \fnil | \froman | \fswiss | \fmodern | \fscript | \fdecor | \ftech | \fbidi
+ * <panose>        '{\*' \panose <data> '}'
+ * <nontaggedname> '{\*' \fname #PCDATA ';}'
+ * <fontname>      #PCDATA
+ * <fontaltname>   '{\*' \falt #PCDATA '}'
+ * <fontemb>       '{\*' \fontemb <fonttype> <fontfname>? <data>? '}'
+ * <fonttype>      \ftnil | \fttruetype
+ * <fontfname>     '{\*' \fontfile \cpgN? #PCDATA '}'
+ */
+class FontTable extends Group
+{
+	public function getFonts(): array
+	{
+		$fonts = [];
+		$basefont = null;
+		foreach ($this->children as $fontinfo) {
+			if ($fontinfo instanceof Group) {
+				$font = new FontInfo();
+				foreach ($fontinfo->children as $entity) {
+					$font->addEntity($entity);
+				}
+				$fonts[$font->uid] = $font;
+			} else {
+				$basefont = $basefont ?: new FontInfo();
+				$basefont->addEntity($fontinfo);
+			}
+		}
+		if ($basefont && !$fonts) {
+			$fonts[$basefont->uid] = $basefont;
+		}
+		return $fonts;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/generator.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/generator.php
new file mode 100644
index 000000000..a2b4f17b9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/generator.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class Generator extends Destination
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/info.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/info.php
new file mode 100644
index 000000000..857cf3c03
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/info.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class Info extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listoverridetable.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listoverridetable.php
new file mode 100644
index 000000000..03d927933
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listoverridetable.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class ListOverrideTable extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtable.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtable.php
new file mode 100644
index 000000000..4075391c5
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtable.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class ListTable extends Destination
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtext.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtext.php
new file mode 100644
index 000000000..16b62280d
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/listtext.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class ListText extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/pict.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/pict.php
new file mode 100644
index 000000000..af7380d92
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/pict.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+use SnappyMail\Rtf\ControlWord;
+use SnappyMail\Rtf\Group;
+use SnappyMail\Rtf\Text;
+
+class Pict extends Group
+{
+	public function getHTML(): string
+	{
+		$format = 'bmp';
+		$style = [];
+		$binarySize = 0; // Number of bytes of the binary data
+		$data = null;    // Binary or Hexadecimal Data
+
+		foreach ($this->children as $child) {
+			if ($child instanceof ControlWord) {
+				switch ($child->word) {
+					// Picture Format
+					case 'emfblip':
+					case 'pngblip':
+					case 'jpegblip':
+						$format = \substr($child->word, 0, -4);
+						break;
+					case 'macpict':
+						$format = 'pict';
+						break;
+//					case 'wmetafile': $format = 'bmp'; break;
+
+					// Picture size and scaling
+					case 'picw':
+						$style[] = "width:{$child->parameter}px";
+						break;
+					case 'pich':
+						$style[] = "height:{$child->parameter}px";
+						break;
+					case 'picscalex':
+//						$style[] = "width:{$child->parameter}%";
+						break;
+					case 'picscaley':
+//						$style[] = "height:{$child->parameter}%";
+						break;
+
+					// Binary or Hexadecimal Data ?
+					case 'bin': $binarySize = $child->parameter; break;
+					default: break;
+				}
+
+			} elseif ($child instanceof Text) { // store Data
+				$data = $child->text;
+			}
+		}
+
+		if ($binarySize) {
+			$data = \substr($data, 0, $binarySize);
+		} else {
+			$data = \pack('H*',$data);
+		}
+
+		if ($style) {
+			$style = ' style="' . \implode(';', $style) . '"';
+		}
+
+		return "<img{$style} src=\"data:image/{$format};base64," . \base64_encode($data) . "\"/>";
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/stylesheet.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/stylesheet.php
new file mode 100644
index 000000000..3ae4ebed8
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/groups/stylesheet.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace SnappyMail\Rtf\Groups;
+
+class StyleSheet extends \SnappyMail\Rtf\Group
+{
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/htmlformatter.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/htmlformatter.php
new file mode 100644
index 000000000..9a4c6fe91
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/htmlformatter.php
@@ -0,0 +1,583 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class HtmlFormatter
+{
+	private string $output = '';
+	private string $RTFencoding = '';
+	private $defaultFont;
+
+	private ?Style $previousStyle = null;
+	private array $styles = [];
+	private ?Style $style = null;
+	private array $openedTags = [];
+
+	public function format(Document $document)
+	{
+		// Clear current output
+		$this->output = '';
+		// Keep track of style modifications
+		$this->previousStyle = null;
+		// and create a stack of styles
+		$this->styles = array();
+		// Put an initial standard style onto the stack
+		$this->style = new Style();
+		$this->styles[] = $this->style;
+
+		// Keep track of opened html tags
+		$this->openedTags = [
+			'span' => false,
+			'p' => false
+		];
+		// Create the first paragraph
+		$this->openTag('p');
+		// Begin format
+		$this->processGroup($document->root);
+		// Close opened tags
+		$this->closeTags(true);
+		return $this->output;
+	}
+
+	protected function processGroup(Group $group)
+	{
+		if ($group instanceof Groups\Destination) {
+			$this->processDestination($group->children);
+			return;
+		}
+
+		if ($group instanceof Groups\ColorTable) {
+			Style::$colortbl = $group->getColors();
+			return;
+		}
+		if ($group instanceof Groups\FontTable) {
+			Style::$fonttbl = $group->getFonts();
+			return;
+		}
+		if ($group instanceof Groups\Pict) {
+			$this->output .= $group->getHTML();
+			return;
+		}
+		if ($group instanceof Groups\StyleSheet) {
+			// Stylesheet extraction not yet supported
+			return;
+		}
+
+		if ($group instanceof Groups\FileTable
+		 || $group instanceof Groups\Info
+		 || $group instanceof Groups\ListTable
+		 || $group instanceof Groups\ListText
+		 || $group instanceof Groups\ListOverrideTable
+		) {
+			// Skip
+			return;
+		}
+
+		// Special group processing:
+		switch ($group->getType())
+		{
+			case 'nonshppict':
+				// Ignore alternative images
+				return;
+		}
+
+		// Pictures extraction not yet supported
+		//if (\substr($group->getType(), 0, 4) == "pict") return;
+
+		// Push a new style onto the stack:
+		$this->style = clone $this->style;
+		$this->styles[] = $this->style;
+
+		foreach ($group->children as $child) {
+			$this->processEntity($child);
+		}
+
+		// Pop style from stack
+		\array_pop($this->styles);
+		$this->style = \end($this->styles);
+	}
+
+	protected function processDestination(array $dest)
+	{
+		// Check if this is a Word 97 picture
+		if ($dest[0] instanceof ControlWord && 'shppict' == $dest[0]->word) {
+			$c = \count($dest);
+			for ($i = 1; $i < $c; ++$i) {
+				$this->processEntity($dest[$i]);
+			}
+		}
+	}
+
+	protected function processEntity(Entity $entry)
+	{
+		if ($entry instanceof Group) $this->processGroup($entry);
+		else if ($entry instanceof ControlWord) $this->processControlWord($entry);
+		else if ($entry instanceof ControlSymbol) $this->processControlSymbol($entry);
+		else if ($entry instanceof Text) $this->write($entry);
+	}
+
+	protected function processControlWord(ControlWord $word)
+	{
+		switch ($word->word) {
+			case 'plain': // Reset font formatting properties to default.
+			case 'pard':  // Reset to default paragraph properties.
+				$this->style->reset($this->defaultFont);
+				break;
+
+			/* Font formatting properties: */
+
+			case 'b':          // Bold
+			case 'caps':       // All capitals
+			case 'embo':       // Emboss
+			case 'i':          // Italic
+			case 'impr':       // Engrave (imprint)
+			case 'outl':       // Outline
+			case 'scaps':      // Small capitals
+			case 'shad':       // Shadow
+			case 'strike':     // Strike-through
+			case 'striked':    // Double strike-through
+				$this->style->{$word->word} = $word->parameter;
+				break;
+			case 'sub':        // Subscripts
+			case 'super':      // Superscripts
+				$this->style->verticalAlign = $word->word;
+				break;
+			case 'nosupersub': // Turns off superscripting or subscripting
+				$this->style->verticalAlign = null;
+				break;
+			case 'ul':         // Underline
+			case 'uld':        // Dotted underline
+			case 'uldash':     // Dashed underline
+			case 'uldashd':    // Dash-dotted underline
+			case 'uldashdd':   // Dash-dot-dotted underline
+			case 'uldb':       // Double underline
+			case 'ulhwave':    // Heavy wave underline
+			case 'ulldash':    // Long dashed underline
+			case 'ulnone':     // no underline
+			case 'ulth':       // Thick underline
+			case 'ulthd':      // Thick dotted underline
+			case 'ulthdash':   // Thick dashed underline
+			case 'ulthdashd':  // Thick dash-dotted underline
+			case 'ulthdashdd': // Thick dash-dot-dotted underline
+			case 'ulthldash':  // Thick long dashed underline
+			case 'ululdbwave': // Double wave underline
+			case 'ulw':        // Word underline
+			case 'ulwave':     // Wave underline
+				$this->style->underline = $word->word;
+				break;
+			case 'v': // hidden
+				$this->style->hidden = $word->parameter;
+				break;
+			case 'fs': // Font size in half-points
+				$this->style->fs = $word->parameter;
+				break;
+			case 'f': // Font number
+				$this->style->font = $word->parameter;
+				break;
+			case 'deff': // Store default font
+				$this->defaultFont = $word->parameter;
+				break;
+/*
+			case 'ltrmark':
+				$this->style->dir = 'ltr';
+				break;
+			case 'rtlmark':
+				$this->style->dir = 'rtl';
+				break;
+
+			\ab*      Associated font is bold.
+			\acaps*   Associated font is all capitals.
+			\acfN     Associated foreground color (default is 0).
+			\adnN     Associated font is subscript position in half-points (default is 6).
+			\aexpndN  Expansion or compression of the space between characters in quarter-points; a negative value compresses (default is 0).
+			\afN      Associated font number (default is 0).
+			\afsN     Associated font size in half-points (default is 24).
+			\ai*      Associated font is italic.
+			\alangN   Language ID (see the standard language table) for the associated font.
+			\aoutl*   Associated font is outline.
+			\ascaps*  Associated font is small capitals.
+			\ashad*   Associated font is shadow.
+			\astrike* Associated font is strikethrough.
+			\aul      Associated font is continuous underline. \aul0 turns off all underlining for the alternate font.
+			\auld     Associated font is dotted underline.
+			\auldb    Associated font is double underline.
+			\aulnone  Associated font is no longer underlined.
+			\aulw     Associated font is word underline.
+			\aupN     Superscript position in half-points (default is 6).
+			\fcsN     N = 1 means South East Asian complex script; N = 0 means not South East Asian script
+			\loch     The text consists of single-byte low-ANSI (0x00–0x7F) characters.
+			\hich     The text consists of single-byte high-ANSI (0x80–0xFF) characters.
+			\dbch     The text consists of double-byte characters.
+*/
+
+			/* Colors */
+
+			case 'cf':
+			case 'chcfpat':
+				$this->style->fontcolor = $word->parameter;
+				break;
+			case 'cb':
+			case 'chcbpat':
+				$this->style->background = $word->parameter;
+				break;
+			case 'highlight':
+			case 'ulc':        // Underline color
+				$this->style->{$word->word} = $word->parameter;
+				break;
+
+			/* Special characters */
+
+			case 'lquote':    $this->write('‘'); break;
+			case 'rquote':    $this->write('’'); break;
+			case 'ldblquote': $this->write('“'); break;
+			case 'rdblquote': $this->write('”'); break;
+			case 'bullet':    $this->write('•'); break;
+			case 'endash':    $this->write('–'); break;
+			case 'emdash':    $this->write('—'); break;
+			case 'enspace':   $this->write(' '); break;
+			case 'emspace':   $this->write(' '); break;
+			case 'qmspace':   $this->write(' '); break;
+			case 'tab':       $this->write("\t"); break;
+			case 'line':      $this->output .= '<br/>'; break; // "\r\n"
+//			case 'lbr':       $this->output .= '<br/>'; break;
+			case 'zwbo':      $this->write("\xC2\x82"); break;
+			case 'zwnbo':     $this->write("\xC2\x83"); break;
+			case 'zwj':       $this->write("\xE2\x80\x8D"); break;
+			case 'zwnj':      $this->write("\xE2\x80\x8C"); break;
+
+			/* Unicode characters */
+
+			case 'u':
+				$this->write($this->decodeUnicode($word->parameter));
+				break;
+
+			/* Paragraphs */
+
+			case 'par': // End of paragraph
+			case 'row': // End of table row
+				// Close previously opened tags
+				$this->closeTags();
+				// Begin a new paragraph
+				$this->openTag('p');
+				break;
+
+			/* Tables */
+			case 'cell':     // End of table cell
+			case 'nestcell': // End of nested table cell
+			case 'nestrow':  // End of nested table row
+				break;
+
+			/* Code pages */
+			case 'ansi':
+			case 'mac':
+			case 'pc':
+			case 'pca':
+				$this->RTFencoding = Encoding::getFromCodepage($word->word);
+				break;
+			case 'ansicpg':
+				if ($word->parameter) {
+					$this->RTFencoding = Encoding::getFromCodepage($word->parameter);
+				}
+				break;
+
+			case 'fromtext': // Indicates document was originally plain text email.
+			case 'fromhtml': // Indicates document was originally HTML email and may contain encapsulated HTML tags.
+				break;
+
+		}
+	}
+
+	protected function decodeUnicode($code, $srcEnc = 'UTF-8')
+	{
+		$utf8 = '';
+		if ($srcEnc && 'UTF-8' != $srcEnc) {
+			// convert character to Unicode
+			$utf8 = \iconv($srcEnc, 'UTF-8', \chr($code));
+		}
+		return $utf8 ? $utf8 : \mb_convert_encoding("&#{$code};", 'UTF-8', 'HTML-ENTITIES');
+	}
+
+	protected function write(string $txt)
+	{
+		//$tag = \str_replace('er', '', $this->style->verticalAlign ?: 'span'); // sub / sup / span
+		// Create a new 'span' element only when a style change occurs.
+		// 1st case: style change occured
+		// 2nd case: there is no change in style but the already created 'span'
+		// element is somehow closed (ex. because of an end of paragraph)
+		if (!$this->style->equals($this->previousStyle) ||
+		   ($this->style->equals($this->previousStyle) && !$this->openedTags['span'])
+		) {
+			$this->closeTag('span');
+			$this->previousStyle = clone $this->style;
+			$this->openTag('span', $this->style);
+		}
+		$this->output .= $txt;
+	}
+
+	protected function openTag(string $tag, string $attr = '')
+	{
+		$this->output .= $attr ? "<{$tag} {$attr}>" : "<{$tag}>";
+		$this->openedTags[$tag] = true;
+	}
+
+	protected function closeTag(string $tag, bool $end = false)
+	{
+		if ($this->openedTags[$tag]) {
+			// Check for empty html elements
+			if (\substr($this->output , -\strlen("<{$tag}>")) == "<{$tag}>") {
+				if ('p' === $tag && !$end) {
+					// Replace empty 'p' element with a line break
+					$this->output = \substr($this->output ,0, -3) . "<br>";
+				} else {
+					// Delete empty elements
+					$this->output = \substr($this->output ,0, -\strlen("<{$tag}>"));
+				}
+			} else {
+				$this->output .= "</{$tag}>";
+			}
+			$this->openedTags[$tag] = false;
+		}
+	}
+
+	protected function closeTags(bool $end = false)
+	{
+		foreach ($this->openedTags as $tag => $b) {
+			$this->closeTag($tag, $end);
+		}
+	}
+
+	protected function processControlSymbol(ControlSymbol $symbol)
+	{
+		if ("'" === $symbol->symbol) {
+			// "\'hh" = A hexadecimal value, based on the specified character set
+			$enc = $this->getSourceEncoding();
+			$uchar = $this->decodeUnicode($symbol->parameter, $enc);
+			$this->write($uchar);
+		} else if ('~' === $symbol->symbol) {
+			// Non breaking space
+//			$this->write('&nbsp;');
+//			$this->write("\xC2\xA0");
+			$this->write(' ');
+		} else if ('-' === $symbol->symbol) {
+			// Optional hyphen
+//			$this->write("&#173;");
+//			$this->write("\xC2\xAD");
+			$this->write('­');
+		} else if ('_' === $symbol->symbol) {
+			// Non breaking hyphen
+//			$this->write("&#8209;");
+//			$this->write("\xE2\x80\x91");
+			$this->write('‑');
+		}
+	}
+
+	protected function getSourceEncoding()
+	{
+		if (isset($this->style->font)) {
+			if (isset(Style::$fonttbl[$this->style->font]->codepage)) {
+				return Style::$fonttbl[$this->style->font]->codepage;
+			}
+			if (isset(Style::$fonttbl[$this->style->font]->charset)) {
+				return Style::$fonttbl[$this->style->font]->charset;
+			}
+		}
+		return $this->RTFencoding;
+	}
+
+	protected function ord_utf8($chr)
+	{
+		$ord0 = \ord($chr);
+		if ($ord0 >= 0 && $ord0 <= 127)
+			return $ord0;
+
+		$ord1 = \ord($chr[1]);
+		if ($ord0 >= 192 && $ord0 <= 223)
+			return ($ord0 - 192) * 64 + ($ord1 - 128);
+
+		$ord2 = \ord($chr[2]);
+		if ($ord0 >= 224 && $ord0 <= 239)
+			return ($ord0 - 224) * 4096 + ($ord1 - 128) * 64 + ($ord2 - 128);
+
+		$ord3 = \ord($chr[3]);
+		if ($ord0 >= 240 && $ord0 <= 247)
+			return ($ord0 - 240) * 262144 + ($ord1 - 128) * 4096 + ($ord2 - 128) * 64 + ($ord3 - 128);
+
+		$ord4 = \ord($chr[4]);
+		if ($ord0 >= 248 && $ord0 <= 251)
+			return ($ord0 - 248) * 16777216 + ($ord1 - 128) * 262144 + ($ord2 - 128) * 4096 + ($ord3 - 128) * 64 + ($ord4 - 128);
+
+		if ($ord0 >= 252 && $ord0 <= 253)
+			return ($ord0 - 252) * 1073741824 + ($ord1 - 128) * 16777216 + ($ord2 - 128) * 262144 + ($ord3 - 128) * 4096 + ($ord4 - 128) * 64 + (\ord($chr[5]) - 128);
+
+		\trigger_error("Invalid Unicode character: {$chr}");
+	}
+}
+
+class Style implements \Stringable
+{
+	public static
+		$fonttbl = [],
+		$colortbl = [];
+
+	private static
+		$highlights = [
+			1  => 'Black',
+			2  => 'Blue',
+			3  => 'Cyan',
+			4  => 'Green',
+			5  => 'Magenta',
+			6  => 'Red',
+			7  => 'Yellow',
+			8  => 'Unused',
+			9  => 'DarkBlue',
+			10 => 'DarkCyan',
+			11 => 'DarkGreen',
+			12 => 'DarkMagenta',
+			13 => 'DarkRed',
+			14 => 'DarkYellow',
+			15 => 'DarkGray',
+			16 => 'LightGray'
+		],
+		$underlineStyles = [
+			'ul'         => 'solid 1px', // Underline
+			'uld'        => 'dotted 1px', // Dotted underline
+			'uldash'     => 'dashed 1px', // Dashed underline
+			'uldashd'    => 'dashed 1px', // Dash-dotted underline
+			'uldashdd'   => 'dashed 1px', // Dash-dot-dotted underline
+			'uldb'       => 'double 1px', // Double underline
+			'ulhwave'    => 'wavy 3px', // Heavy wave underline
+			'ulldash'    => 'dashed 1px', // Long dashed underline
+			'ulnone'     => '', // no underline
+			'ulth'       => 'solid 2px', // Thick underline
+			'ulthd'      => 'dotted 2px', // Thick dotted underline
+			'ulthdash'   => 'dashed 2px', // Thick dashed underline
+			'ulthdashd'  => 'dashed 2px', // Thick dash-dotted underline
+			'ulthdashdd' => 'dashed 2px', // Thick dash-dot-dotted underline
+			'ulthldash'  => 'dashed 2px', // Thick long dashed underline
+			'ululdbwave' => 'wavy 2px', // Double wave underline
+//			'ulw'        => 'wavy 1px', // Word underline
+			'ulwave'     => 'wavy 1px', // Wave underline
+		];
+
+	public bool
+		$b = false,          // Bold
+		$caps = false,       // All capitals
+		$embo = false,       // Emboss
+		$i = false,          // Italic
+		$impr = false,       // Engrave (imprint)
+		$outl = false,       // Outline
+		$scaps = false,      // Small capitals
+		$shad = false,       // Shadow
+		$strike = false,     // Strike-through
+		$striked = false,    // Double strike-through
+		$hidden = false;
+
+	public int
+		$fs = 0; // Font size in half-points, default is 24 = 12pt
+
+	public
+		$underline = 'ulnone',
+		$verticalAlign = '', // sub / super
+		$fontcolor = null,
+		$background = null,
+		$font = null,
+		$highlight = null,
+		$ulc = null;         // Underline color
+
+	public function reset($defaultFont = null) : void
+	{
+		$this->b = false;
+		$this->caps = false;
+		$this->embo = false;
+		$this->i = false;
+		$this->impr = false;
+		$this->outl = false;
+		$this->scaps = false;
+		$this->shad = false;
+		$this->strike = false;
+		$this->striked = false;
+		$this->hidden = false;
+		$this->fs = 0;
+		$this->underline = 'ulnone';
+		$this->verticalAlign = '';
+		$this->fontcolor = null;
+		$this->background = null;
+		$this->highlight = null;
+		$this->ulc = null;
+		$this->font = isset($defaultFont) ? $defaultFont : null;
+	}
+
+	public function __toString(): string
+	{
+		$style = [];
+
+		if ($this->b         ) $style[] = 'font-weight:bold';
+		if ($this->caps      ) $style[] = 'text-transform:uppercase';
+//		if ($this->embo      ) $style[] = 'text-shadow: 1px 4px 4px #555;background-clip:text';
+		if ($this->i         ) $style[] = 'font-style:italic';
+//		if ($this->impr      ) $style[] = 'text-shadow: rgba(245,245,245,0.5) 3px 5px 1px;background-clip:text';
+//		if ($this->outl      ) $style[] = '';
+		if ($this->scaps     ) $style[] = 'font-variant:small-caps';
+//		if ($this->shad      ) $style[] = '';
+		if ($this->strike    ) $style[] = 'text-decoration:line-through';
+//		if ($this->striked   ) $style[] = '';
+		if ($this->verticalAlign) $style[] = "vertical-align:{$this->verticalAlign};font-size:smaller";
+		if (!empty(static::$underlineStyles[$this->underline])) {
+			$value = 'text-decoration:underline';
+			if (!empty(static::$colortbl[$this->ulc])) {
+				$value .= ' ' . static::$colortbl[$this->ulc];
+			}
+			$value .= ' ' . static::$underlineStyles[$this->underline];
+			$style[] = $value;
+		}
+		if ($this->hidden) $style[] = 'display:none';
+		if (!empty(static::$fonttbl[$this->font])) {
+			$font = (string) static::$fonttbl[$this->font];
+			if ($font) {
+				$style[] = $font;
+			}
+		}
+		if (0 < $this->fs) {
+//			$style[] = 'font-size:'.\ceil($this->fs / 2).'pt';
+//			$style[] = 'font-size:'.\ceil($word->parameter * 16 / 24).'px';
+			$style[] = 'font-size:'.\round($this->fs / 24, 2).'em';
+		}
+		if (!empty(static::$colortbl[$this->fontcolor])) {
+			$style[] = 'color:' . static::$colortbl[$this->fontcolor];
+		}
+		if (!empty(static::$colortbl[$this->background])) {
+			$style[] = 'background-color:' . static::$colortbl[$this->background];
+		} else if (!empty(static::$highlights[$this->highlight])) {
+			$style[] = 'background-color:' . static::$highlights[$this->highlight];
+		}
+		return $style ? 'style="'.\implode(';', $style).'"' : '';
+	}
+
+	/*
+	 * Check whether this Style is equal to another Style.
+	 */
+	public function equals(?Style $style) : bool
+	{
+		return $style
+		 && ($this->b == $style->b)
+		 && ($this->caps == $style->caps)
+//		 && ($this->embo == $style->embo)
+		 && ($this->i == $style->i)
+//		 && ($this->impr == $style->impr)
+//		 && ($this->outl == $style->outl)
+		 && ($this->scaps == $style->scaps)
+//		 && ($this->shad == $style->shad)
+		 && ($this->strike == $style->strike)
+		 && ($this->striked == $style->striked)
+		 && ($this->verticalAlign == $style->verticalAlign)
+		 && ($this->underline == $style->underline)
+		 && ($this->ulc == $style->ulc)
+		 && ($this->hidden == $style->hidden)
+		 && ($this->fs == $style->fs)
+		 && ($this->fontcolor == $style->fontcolor)
+		 && ($this->background == $style->background)
+		 && ($this->highlight == $style->highlight)
+		 && ($this->font == $style->font)
+		;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/rtf/text.php b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/text.php
new file mode 100644
index 000000000..d0a229fee
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/rtf/text.php
@@ -0,0 +1,18 @@
+<?php
+
+namespace SnappyMail\Rtf;
+
+class Text implements Entity, \Stringable
+{
+	public string $text;
+
+	public function __construct(string $text)
+	{
+		$this->text = $text;
+	}
+
+	public function __toString(): string
+	{
+		return $this->text;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
index 83ef1077f..fc295e68a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl.php
@@ -4,8 +4,7 @@ namespace SnappyMail;
 
 abstract class SASL
 {
-	public
-		$base64 = false;
+	public bool $base64 = true;
 
 	abstract public function authenticate(string $authcid, string $passphrase, ?string $authzid = null) : string;
 
@@ -14,28 +13,29 @@ abstract class SASL
 		return null;
 	}
 
-	public function verify(string $data) : bool
+	public function hasChallenge() : bool
 	{
 		return false;
 	}
 
+	public function verify(string $data) : void
+	{
+	}
+
 	final public static function factory(string $type)
 	{
 		if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) {
 			$class = __CLASS__ . "\\{$m[1]}";
-			if (\class_exists($class)) {
+			if (\class_exists($class) && $class::isSupported($m[2] ?? '')) {
 				return new $class($m[2] ?? '');
 			}
 		}
-		throw new \Exception("Unsupported SASL mechanism type: {$type}");
+		throw new \ValueError("Unsupported SASL mechanism type: {$type}");
 	}
 
 	public static function isSupported(string $type) : bool
 	{
 		if (\preg_match('/^([A-Z2]+)(?:-(.+))?$/Di', $type, $m)) {
-			if ('XOAUTH2' === $m[1] || 'OAUTHBEARER' === $m[1]) {
-				 $m[1] = 'OAUTH';
-			}
 			$class = __CLASS__ . "\\{$m[1]}";
 			return \class_exists($class) && $class::isSupported($m[2] ?? '');
 		}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/cram.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/cram.php
index 4ed7f6b7e..549a9619a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/cram.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/cram.php
@@ -14,8 +14,15 @@ class Cram extends \SnappyMail\SASL
 		$this->algo = $algo;
 	}
 
-	public function authenticate(string $authcid, string $passphrase, ?string $challenge = null) : string
+	public function authenticate(string $authcid,
+		#[\SensitiveParameter]
+		string $passphrase,
+		?string $challenge = null
+	) : string
 	{
+		if (empty($challenge)) {
+			$this->writeLogException(new \MailSo\Smtp\Exceptions\NegativeResponseException);
+		}
 		return $this->encode($authcid . ' ' . \hash_hmac($this->algo, $this->decode($challenge), $passphrase));
 	}
 
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
index 4a84b4835..2f0441fcb 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/login.php
@@ -2,26 +2,34 @@
 
 namespace SnappyMail\SASL;
 
+use SnappyMail\SensitiveString;
+
 class Login extends \SnappyMail\SASL
 {
 	protected
-		$passphrase;
+		SensitiveString $passphrase;
 
-	public function authenticate(string $username, string $passphrase, ?string $challenge = null) : string
+	public function authenticate(string $username,
+		#[\SensitiveParameter]
+		string $passphrase,
+		?string $challenge = null) : string
 	{
-		if ($challenge && 'Username:' !== $this->decode($challenge)) {
-			throw new \Exception("Invalid response: {$challenge}");
+		// $challenge should be 'VXNlcm5hbWU6', but broken on some systems
+		// See https://github.com/the-djmaze/snappymail/issues/693
+		if ($challenge && !\str_starts_with($this->decode($challenge), 'Username:')) {
+			throw new \Exception("Invalid response: {$this->decode($challenge)}");
 		}
-		$this->passphrase = $passphrase;
+		$this->passphrase = new SensitiveString($passphrase);
 		return $this->encode($username);
 	}
 
 	public function challenge(string $challenge) : ?string
 	{
+		// $challenge should be 'UGFzc3dvcmQ6'
 		if ($challenge && 'Password:' !== $this->decode($challenge)) {
 			throw new \Exception("invalid response: {$challenge}");
 		}
-		return $this->encode($this->passphrase);
+		return $this->encode($this->passphrase->getValue());
 	}
 
 	public static function isSupported(string $param) : bool
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauth.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauth.php
deleted file mode 100644
index cd73fb056..000000000
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauth.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- * https://datatracker.ietf.org/doc/html/rfc7628
- * https://developers.google.com/gmail/imap/xoauth2-protocol
- */
-
-
-namespace SnappyMail\SASL;
-
-class OAuth extends \SnappyMail\SASL
-{
-	public function authenticate(string $username, string $passphrase, ?string $authzid = null) : string
-	{
-		return $this->encode("user={$username}\x01auth=Bearer {$passphrase}\x01\x01");
-	}
-
-	public static function isSupported(string $param) : bool
-	{
-		return true;
-	}
-}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
new file mode 100644
index 000000000..8f2bd297f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/oauthbearer.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * https://datatracker.ietf.org/doc/html/rfc7628
+ * https://developers.google.com/gmail/imap/xoauth2-protocol
+ */
+
+namespace SnappyMail\SASL;
+
+class OAuthBearer extends \SnappyMail\SASL
+{
+	public function authenticate(string $username,
+		#[\SensitiveParameter]
+		string $accessToken,
+		?string $authzid = null
+	) : string
+	{
+		// add host and port?
+		//return $this->encode("n,a={$username},\x01host={$host}\x01port={$port}\x01auth=Bearer {$accessToken}\x01\x01");
+		return $this->encode("n,a={$username},\x01auth=Bearer {$accessToken}\x01\x01");
+	}
+
+	public static function isSupported(string $param) : bool
+	{
+		return true;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/plain.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/plain.php
index dca6aa103..92ccc0d4f 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/plain.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/plain.php
@@ -5,7 +5,10 @@ namespace SnappyMail\SASL;
 class Plain extends \SnappyMail\SASL
 {
 
-	public function authenticate(string $username, string $passphrase, ?string $authzid = null) : string
+	public function authenticate(string $username,
+		#[\SensitiveParameter]
+		string $passphrase,
+		?string $authzid = null) : string
 	{
 		return $this->encode("{$authzid}\x00{$username}\x00{$passphrase}");
 	}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
index a74c4ecc8..8091c155a 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/scram.php
@@ -4,16 +4,16 @@
  * https://tools.ietf.org/html/rfc7677
  */
 
-
 namespace SnappyMail\SASL;
 
+use SnappyMail\SensitiveString;
+
 class Scram extends \SnappyMail\SASL
 {
-
+	protected ?SensitiveString $passphrase;
 	protected
 		$algo,
 		$nonce,
-		$passphrase,
 		$gs2_header,
 		$auth_message,
 		$server_key;
@@ -31,13 +31,17 @@ class Scram extends \SnappyMail\SASL
 		$this->algo = $algo;
 	}
 
-	public function authenticate(string $authcid, string $passphrase, ?string $authzid = null) : string
+	public function authenticate(string $authcid,
+		#[\SensitiveParameter]
+		string $passphrase,
+		?string $authzid = null
+	) : string
 	{
 		// SASLprep
 		$authcid = \str_replace(array('=',','), array('=3D','=2C'), $authcid);
 
 		$this->nonce = \bin2hex(\random_bytes(16));
-		$this->passphrase = $passphrase;
+		$this->passphrase = new SensitiveString($passphrase);
 		$this->gs2_header = 'n,' . (empty($authzid) ? '' : 'a=' . $authzid) . ',';
 		$this->auth_message = "n={$authcid},r={$this->nonce}";
 		return $this->encode($this->gs2_header . $this->auth_message);
@@ -67,7 +71,7 @@ class Scram extends \SnappyMail\SASL
 			throw new \Exception('Server invalid salt');
 		}
 
-		$pass = \hash_pbkdf2($this->algo, $this->passphrase, $salt, \intval($values['i']), 0, true);
+		$pass = \hash_pbkdf2($this->algo, $this->passphrase->getValue(), $salt, \intval($values['i']), 0, true);
 		$this->passphrase = null;
 
 		$ckey = \hash_hmac($this->algo, 'Client Key', $pass, true);
@@ -85,7 +89,12 @@ class Scram extends \SnappyMail\SASL
 		return $this->encode("{$cfmb},p={$proof}");
 	}
 
-	public function verify(string $data) : bool
+	public function hasChallenge() : bool
+	{
+		return true;
+	}
+
+	public function verify(string $data) : void
 	{
 		$v = static::parseMessage($this->decode($data));
 		if (empty($v['v'])) {
@@ -94,7 +103,6 @@ class Scram extends \SnappyMail\SASL
 		if (\base64_encode($this->server_key) !== $v['v']) {
 			throw new \Exception('Server signature invalid');
 		}
-		return true;
 	}
 
 	protected static function parseMessage(string $msg) : array
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sasl/xoauth2.php b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/xoauth2.php
new file mode 100644
index 000000000..116000772
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sasl/xoauth2.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * https://datatracker.ietf.org/doc/html/rfc7628
+ * https://developers.google.com/gmail/imap/xoauth2-protocol
+ */
+
+namespace SnappyMail\SASL;
+
+class XOAuth2 extends \SnappyMail\SASL
+{
+	public function authenticate(string $username,
+		#[\SensitiveParameter]
+		string $accessToken,
+		?string $authzid = null
+	) : string
+	{
+		return $this->encode("user={$username}\x01auth=Bearer {$accessToken}\x01\x01");
+	}
+
+	public static function isSupported(string $param) : bool
+	{
+		return true;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php b/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php
new file mode 100644
index 000000000..63d0dc418
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/sensitivestring.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace SnappyMail;
+
+class SensitiveString /* extends SensitiveParameterValue | SensitiveParameter */ implements \Stringable, \JsonSerializable
+{
+	private string $value, $nonce;
+	private static ?string $key = null;
+
+	public function __construct(
+		#[\SensitiveParameter]
+		string $value
+	)
+	{
+		$this->setValue($value);
+	}
+
+	public function getValue(): string
+	{
+		if (\is_callable('sodium_crypto_secretbox')) {
+			return \sodium_crypto_secretbox_open($this->value, $this->nonce, static::$key);
+		}
+		return static::xorIt($this->value);
+	}
+
+	public function setValue(
+		#[\SensitiveParameter]
+		string $value
+	) : void
+	{
+		\strlen($value) && \RainLoop\Api::Actions()->logMask($value);
+		if (\is_callable('sodium_crypto_secretbox')) {
+			$this->nonce = \random_bytes(\SODIUM_CRYPTO_SECRETBOX_NONCEBYTES);
+			if (!static::$key) {
+				static::$key = \sodium_crypto_secretbox_keygen();
+			}
+			$this->value = \sodium_crypto_secretbox($value, $this->nonce, static::$key);
+		} else {
+			$this->value = static::xorIt($value);
+		}
+	}
+
+	private static function xorIt(
+		#[\SensitiveParameter]
+		string $value
+	) : string
+	{
+		if (!static::$key) {
+			static::$key = \random_bytes(32);
+		}
+		$kl = \strlen(static::$key);
+		$i = \strlen($value);
+		while ($i--) {
+			$value[$i] = $value[$i] ^ static::$key[$i % $kl];
+		}
+		return $value;
+	}
+
+	public function __toString(): string
+	{
+		return $this->getValue();
+	}
+
+	public function jsonSerialize(): mixed
+	{
+		throw new \Exception("JSON serialization of 'SnappyMail\\SensitiveString' is not allowed");
+	}
+
+	public function __debugInfo(): array
+	{
+		return [];
+	}
+
+	public function __serialize(): array
+	{
+		throw new \Exception("Serialization of 'SnappyMail\\SensitiveString' is not allowed");
+	}
+
+	public function __unserialize(array $data): void
+	{
+		throw new \Exception("Unserialization of 'SnappyMail\\SensitiveString' is not allowed");
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/shutdown.php b/snappymail/v/0.0.0/app/libraries/snappymail/shutdown.php
new file mode 100644
index 000000000..20ec357b8
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/shutdown.php
@@ -0,0 +1,50 @@
+<?php
+
+namespace SnappyMail;
+
+abstract class Shutdown
+{
+	private static
+		$actions = [],
+		$running = false;
+
+	final public static function run() : void
+	{
+		if (!static::$running && \count(static::$actions)) {
+			static::$running = true;
+			\ini_set('display_errors', 0);
+			\ignore_user_abort(true);
+
+			# Flush all output buffers
+			if ($i = \ob_get_level()) {
+				while ($i-- && \ob_end_flush());
+			}
+			\flush();
+
+			if (\is_callable('fastcgi_finish_request')) {
+				// Special FPM/FastCGI (fpm-fcgi) function to finish request and
+				// flush all data while continuing to do something time-consuming.
+				\fastcgi_finish_request();
+			}
+
+			foreach (static::$actions as $action) {
+				try {
+					\call_user_func_array($action[0], $action[1]);
+				} catch (\Throwable $e) { } # skip
+			}
+		}
+	}
+
+	final public static function add(callable $function, array $args = []) : void
+	{
+		if (!\count(static::$actions)) {
+			\register_shutdown_function('\\SnappyMail\\Shutdown::run');
+		}
+		static::$actions[] = [$function, $args];
+	}
+
+	final public static function count() : int
+	{
+		return \count(static::$actions);
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
new file mode 100644
index 000000000..289d50366
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/certificate.php
@@ -0,0 +1,186 @@
+<?php
+
+namespace SnappyMail\SMime;
+
+class Certificate
+{
+	public
+		$x509 = null,
+		$pkey = null,
+
+		$digest = 'sha256',
+		$cipher = \OPENSSL_CIPHER_AES_256_CBC,
+		$keyBits = 4096,
+		$keyType = \OPENSSL_KEYTYPE_RSA,
+		$days    = 1185, // EV = 1185, DV/OV = 825
+		$distinguishedName = array(
+			'commonName'   => '', // max 64 bytes
+			'emailAddress' => ''  // max 64 bytes
+		),
+		$challengePassphrase; // min 4, max 20 bytes
+
+	// add_entry_by_NID
+	private $NID = [
+		13 => 'commonName',
+		14 => 'countryName',
+		15 => 'localityName',
+		16 => 'stateOrProvinceName',
+		17 => 'organizationName',
+		18 => 'organizationalUnitName',
+		48 => 'emailAddress',
+	];
+
+	/**
+	 * A string having the format file://path/to/cert.pem; the named file must contain a PEM encoded certificate
+	 * A string containing the content of a certificate, PEM encoded, may start with -----BEGIN CERTIFICATE-----
+	 */
+	function __construct(\OpenSSLCertificate|string $x509cert = null,
+		#[\SensitiveParameter]
+		\OpenSSLAsymmetricKey|\OpenSSLCertificate|array|string $privateKey = null)
+	{
+		if ($x509cert) {
+			$x509cert = \openssl_x509_read($x509cert);
+			if (!$x509cert) {
+				throw new \RuntimeException('OpenSSL x509: ' . \openssl_error_string());
+			}
+			$this->x509 = $x509cert;
+			if ($privateKey && \openssl_x509_check_private_key($this->x509, $privateKey)) {
+				$this->pkey = $privateKey;
+			}
+		}
+	}
+
+	function __destruct()
+	{
+	}
+
+	/**
+	 * Verifies if a certificate can be used for a particular purpose
+	 */
+	public function checkPurpose(int $purpose, array $cainfo = array(), ?string $untrustedfile = null): bool|int
+	{
+		if ($this->x509) {
+			return \openssl_x509_checkpurpose($this->x509, $purpose, $cainfo, $untrustedfile);
+		}
+		return false;
+	}
+
+	public function canSign(): bool
+	{
+		return $this->x509
+			? true === \openssl_x509_checkpurpose($this->x509, \X509_PURPOSE_SMIME_SIGN)
+			: false;
+	}
+
+	public function canEncrypt(): bool
+	{
+		return $this->x509
+			? true === \openssl_x509_checkpurpose($this->x509, \X509_PURPOSE_SMIME_ENCRYPT)
+			: false;
+	}
+
+	/**
+	 * Returns the certificate in a PEM encoded format string
+	 */
+	public function export(bool $notext = true): ?string
+	{
+		if ($this->x509) {
+			$output = '';
+			if (\openssl_x509_export($this->x509, $output, $notext)) {
+				return $output;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Returns the fingerprint or digest of the certificate
+	 */
+	public function fingerprint(string $hash_algorithm = 'sha1', bool $raw_output = false): string|bool
+	{
+		return $this->x509 ? \openssl_x509_fingerprint($this->x509, $hash_algorithm, $raw_output) : false;
+	}
+
+	/**
+	 * Returns the certificate information as an array
+	 */
+	public function info(bool $shortnames = true): array|bool
+	{
+		return $this->x509 ? \openssl_x509_parse($this->x509, $shortnames) : false;
+	}
+
+	public static function getCipherMethods(bool $aliases = false): array
+	{
+		return \openssl_get_cipher_methods($aliases);
+	}
+
+	public function createSelfSigned(\SnappyMail\SensitiveString $passphrase, ?string $privateKey = null): array
+	{
+		$options = array(
+			'config'             => __DIR__ . '/openssl.cnf',
+			'digest_alg'         => $this->digest,
+			'private_key_bits'   => $this->keyBits,
+			'private_key_type'   => $this->keyType,
+			'encrypt_key'        => true,
+			'encrypt_key_cipher' => $this->cipher,
+			// v3_ca    = Extensions to use when signing a CA
+			// usr_cert = Extensions for when we sign normal certs (specified as default)
+			'x509_extensions'    => 'snappymail_ca', // v3_ca | usr_cert
+			// Extensions to add to a certificate request
+			'req_extensions'     => 'snappymail_req', // v3_req
+		);
+
+		$dn = $this->distinguishedName;
+		if (empty($dn['organizationalUnitName'])) {
+			unset($dn['organizationalUnitName']);
+		}
+
+		$pkey = null; // openssl_pkey_new($options);
+		if ($privateKey) {
+			$pkey = \openssl_pkey_get_private($privateKey, $passphrase);
+			if (!$pkey) {
+				throw new \RuntimeException('OpenSSL pkey: ' . \openssl_error_string());
+			}
+		}
+		$csr = \openssl_csr_new($dn, $pkey, $options);
+		if ($csr) {
+			$this->x509 = \openssl_csr_sign(
+				$csr,
+				\file_get_contents(__DIR__ . '/snappymail.crt'),
+				\file_get_contents(__DIR__ . '/snappymail.key'),
+				$this->days,
+				$options
+			);
+			if ($this->x509/* && $this->canSign() && $this->canEncrypt()*/) {
+				$this->pkey = $pkey;
+				$privateKey || \openssl_pkey_export($pkey, $privateKey, $passphrase);
+				$certificate = '';
+				\openssl_x509_export($this->x509, $certificate);
+				return array(
+					'pkey' => $privateKey,
+					'x509' => $certificate,
+//					'pkcs12' => $this->asPKCS12($pkey, $passphrase/*, array $args = array()*/)
+//					'canSign' => $this->canSign(),
+//					'canEncrypt' => $this->canEncrypt()
+				);
+			} else {
+				throw new \RuntimeException('OpenSSL sign: ' . \openssl_error_string());
+			}
+		} else {
+			throw new \RuntimeException('OpenSSL csr: ' . \openssl_error_string());
+		}
+		return [];
+	}
+
+	// returns binary data
+	public function asPKCS12(
+		#[\SensitiveParameter]
+		string $pass = '',
+		array $args = array()
+	): string
+	{
+		$out = '';
+    	\openssl_pkcs12_export($this->x509, $out, $this->pkey, $pass, $args);
+    	return $out;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.cnf b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.cnf
new file mode 100644
index 000000000..3cfacd87f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.cnf
@@ -0,0 +1,154 @@
+HOME			= .
+openssl_conf = openssl_init
+config_diagnostics = 1
+oid_section = new_oids
+[ new_oids ]
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+[openssl_init]
+providers = provider_sect
+ssl_conf = ssl_module
+[provider_sect]
+default = default_sect
+[default_sect]
+[ ssl_module ]
+system_default = crypto_policy
+[ crypto_policy ]
+.include = /etc/crypto-policies/back-ends/opensslcnf.config
+[ ca ]
+default_ca	= CA_default
+[ CA_default ]
+dir		= ./demoCA
+certs		= $dir/certs
+crl_dir		= $dir/crl
+database	= $dir/index.txt
+new_certs_dir	= $dir/newcerts
+certificate	= $dir/cacert.pem
+serial		= $dir/serial
+crlnumber	= $dir/crlnumber
+crl		= $dir/crl.pem
+private_key	= $dir/private/cakey.pem
+x509_extensions	= usr_cert
+name_opt 	= ca_default
+cert_opt 	= ca_default
+default_days	= 365
+default_crl_days= 30
+default_md	= default
+preserve	= no
+policy		= policy_match
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+[ req ]
+default_bits		= 2048
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+attributes		= req_attributes
+x509_extensions	= v3_ca
+string_mask = utf8only
+[ req_distinguished_name ]
+commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName_max			= 64
+emailAddress			= Email Address
+emailAddress_max		= 64
+[ req_attributes ]
+challengePassword		= A challenge password
+challengePassword_min		= 4
+challengePassword_max		= 20
+unstructuredName		= An optional company name
+[ usr_cert ]
+basicConstraints=CA:FALSE
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+[ v3_req ]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+[ v3_ca ]
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid:always,issuer
+basicConstraints = critical,CA:true
+[ crl_ext ]
+authorityKeyIdentifier=keyid:always
+[ proxy_cert_ext ]
+basicConstraints=CA:FALSE
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+[ tsa ]
+default_tsa = tsa_config1
+[ tsa_config1 ]
+dir		= ./demoCA
+serial		= $dir/tsaserial
+crypto_device	= builtin
+signer_cert	= $dir/tsacert.pem
+certs		= $dir/cacert.pem
+signer_key	= $dir/private/tsakey.pem
+signer_digest  = sha256
+default_policy	= tsa_policy1
+other_policies	= tsa_policy2, tsa_policy3
+digests     = sha1, sha256, sha384, sha512
+accuracy	= secs:1, millisecs:500, microsecs:100
+clock_precision_digits  = 0
+ordering		= yes
+tsa_name		= yes
+ess_cert_id_chain	= no
+ess_cert_id_alg		= sha1
+[insta]
+server = pki.certificate.fi:8700
+path = pkix/
+recipient = "/C=FI/O=Insta Demo/CN=Insta Demo CA"
+ignore_keyusage = 1
+unprotected_errors = 1
+extracertsout = insta.extracerts.pem
+ref = 3078
+secret = pass:insta
+cmd = ir
+subject = "/CN=openssl-cmp-test"
+newkey = insta.priv.pem
+out_trusted = apps/insta.ca.crt
+certout = insta.cert.pem
+[pbm]
+ref = $insta::ref
+secret = $insta::secret
+[signature]
+trusted = $insta::out_trusted
+secret =
+key = $insta::newkey
+cert = $insta::certout
+[ir]
+cmd = ir
+[cr]
+cmd = cr
+[kur]
+cmd = kur
+oldcert = $insta::certout
+[rr]
+cmd = rr
+oldcert = $insta::certout
+
+[ snappymail_req ]
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+subjectAltName = email:copy
+
+[ snappymail_ca ]
+basicConstraints = critical,CA:true
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+extendedKeyUsage = clientAuth, emailProtection
+subjectAltName = email:copy
+subjectKeyIdentifier = hash
+authorityKeyIdentifier = keyid:always,issuer
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
new file mode 100644
index 000000000..a7c4e892d
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/openssl.php
@@ -0,0 +1,345 @@
+<?php
+
+namespace SnappyMail\SMime;
+
+use SnappyMail\File\Temporary;
+
+/**
+ * PHP 8.3.0 PKCS7_NOOLDMIMETYPE
+ */
+
+class OpenSSL
+{
+	private string $homedir;
+	private array $headers = [];
+	private int $flags = 0;
+	private int $cipher_algo = \OPENSSL_CIPHER_AES_128_CBC; // \OPENSSL_CIPHER_AES_256_CBC
+	private ?string $untrusted_certificates_filename = null;
+
+	// Used for sign and decrypt
+	private $certificate; // OpenSSLCertificate|array|string
+	private $privateKey; // OpenSSLAsymmetricKey|OpenSSLCertificate|array|string
+	private ?string $certificateChain = null;
+
+	function __construct(string $homedir)
+	{
+		$this->homedir = $homedir;
+	}
+
+	public function getCertificate(string $filename): string|false
+	{
+		return \file_get_contents("{$this->homedir}/{$filename}");
+	}
+
+	public function storeCertificate(string $certificate): bool
+	{
+		$data = \openssl_x509_parse(\openssl_x509_read($certificate));
+		if (!$data) {
+			\SnappyMail\Log::error('OpenSSL', "parse: " . \openssl_error_string());
+			return false;
+		}
+		$key = \str_replace(':', '', $data['extensions']['subjectKeyIdentifier'] ?? $data['hash']);
+		$filename = "{$this->homedir}/{$key}.crt";
+		if (\file_exists($filename)) {
+			\SnappyMail\Log::debug('OpenSSL', "certificate {$key} already imported");
+		} else {
+			\file_put_contents("{$this->homedir}/{$key}.crt", $certificate);
+//			\unlink("{$this->homedir}/certificates.json");
+			$this->certificates(true);
+			\SnappyMail\Log::debug('OpenSSL', "certificate {$key} imported");
+		}
+		return true;
+	}
+
+	public function certificates(bool $force = false): array
+	{
+		$cacheFile = "{$this->homedir}/certificates.json";
+		$result = (!$force && \file_exists($cacheFile))
+			? \json_decode(\file_get_contents($cacheFile), true)
+			: null;
+		if (!\is_array($result)) {
+			$keys = [];
+			foreach (\glob("{$this->homedir}/*.key") as $file) {
+				$data = \file_get_contents($file);
+				// Can't check ENCRYPTED PRIVATE KEY
+				if (\str_contains($data, '-----BEGIN PRIVATE KEY-----')) {
+					$keys[] = [\basename($file), $data];
+				}
+			}
+			$result = [];
+			foreach (\glob("{$this->homedir}/*.crt") as $file) {
+				$filename = \basename($file);
+				$certificate = \file_get_contents($file);
+				$data = \openssl_x509_parse($certificate);
+				if ($data) {
+					$key = \str_replace(':', '', $data['extensions']['subjectKeyIdentifier'] ?? $data['hash']);
+					if ("{$key}.crt" != $filename && \rename("{$this->homedir}/{$filename}", "{$this->homedir}/{$key}.crt")) {
+						$filename = "{$key}.crt";
+					}
+//					Use $data['extensions']['authorityKeyIdentifier'] to bundle parent certificate
+					$short = [
+						'file' => $filename,
+						'id' => $key,
+						'CN' => $data['subject']['CN'],
+						'emailAddress' => $data['subject']['emailAddress'],
+//						'validTo' => \gmdate('Y-m-d\\TH:i:s\\Z', $data['validTo_time_t']),
+						'validTo_time_t' => $data['validTo_time_t'],
+						'smimesign' => false,
+						'smimeencrypt' => false,
+						'privateKey' => null // not found or encrypted
+					];
+					foreach ($data['purposes'] as $purpose) {
+						if ('smimesign' === $purpose[2] || 'smimeencrypt' === $purpose[2]) {
+							// [general availability, tested purpose]
+							$short[$purpose[2]] = $purpose[0] || $purpose[1];
+						}
+					}
+					foreach ($keys as $key) {
+						if (\openssl_x509_check_private_key($certificate, $key[1])) {
+							$short['privateKey'] = $key[0];
+							break;
+						}
+					}
+					$result[] = $short;
+				} else {
+					\SnappyMail\Log::error('OpenSSL', "parse({$file}): " . \openssl_error_string());
+				}
+			}
+			\file_put_contents($cacheFile, \json_encode($result));
+		}
+
+		return $result;
+	}
+
+	public function privateKeys(): array
+	{
+//		\glob("{$this->homedir}/*.key");
+	}
+
+	public static function isSupported(): bool
+	{
+		return \defined('PKCS7_DETACHED');
+	}
+
+	public function setCertificate(OpenSSLCertificate|string $certificate): void
+	{
+		$this->certificate = \openssl_x509_read($certificate);
+		if (!$this->certificate) {
+			throw new \RuntimeException('OpenSSL x509: ' . \openssl_error_string());
+		}
+		if ($this->privateKey && !\openssl_x509_check_private_key($this->certificate, $this->privateKey)) {
+			throw new \RuntimeException('OpenSSL x509: ' . \openssl_error_string());
+		}
+	}
+
+	public function setCertificateChain(?string $certificateChain): void
+	{
+		if ($certificateChain === "") {
+			$this->certificateChain = null;
+		} else {
+			$this->certificateChain = $certificateChain;
+		}
+	}
+
+	public function setPrivateKey(OpenSSLAsymmetricKey|string $privateKey,
+		?\SnappyMail\SensitiveString $passphrase = null
+	): void
+	{
+		$this->privateKey = \openssl_pkey_get_private($privateKey, $passphrase);
+		if (!$this->privateKey) {
+			throw new \RuntimeException('OpenSSL setPrivateKey: ' . \openssl_error_string());
+		}
+		if ($this->certificate && !\openssl_x509_check_private_key($this->certificate, $this->privateKey)) {
+			throw new \RuntimeException('OpenSSL setPrivateKey: ' . \openssl_error_string());
+		}
+	}
+
+	public function exportPrivateKey(?\SnappyMail\SensitiveString $passphrase = null): string
+	{
+		if (!$this->privateKey) {
+			throw new \RuntimeException('OpenSSL exportPrivateKey: key not loaded');
+		}
+		$options = [
+			'encrypt_key' => true,
+			'encrypt_key_cipher' => \OPENSSL_CIPHER_AES_256_CBC
+		];
+		$output = '';
+		if (!\openssl_pkey_export($this->privateKey, $output, $passphrase/*, $options*/)) {
+			throw new \RuntimeException('OpenSSL exportPrivateKey: ' . \openssl_error_string());
+		}
+		return $output;
+	}
+
+/*
+	public function asn1parse(string|Temporary $input): ?string
+	{
+		if (\is_string($input)) {
+			$tmp = new Temporary('smimein-');
+			if (!$tmp->putContents($input)) {
+				return null;
+			}
+			$input = $tmp;
+		}
+		\shell_exec('openssl asn1parse -in $input->filename()');
+	}
+*/
+	public function decrypt(string|Temporary $input): ?string
+	{
+		if (\is_string($input)) {
+			$tmp = new Temporary('smimein-');
+			if (!$tmp->putContents($input)) {
+				return null;
+			}
+			$input = $tmp;
+		}
+		$output = new Temporary('smimeout-');
+		if (!\openssl_pkcs7_decrypt(
+			$input->filename(),
+			$output->filename(),
+			$this->certificate,
+			$this->privateKey
+		)) {
+			throw new \RuntimeException('OpenSSL decrypt: ' . \openssl_error_string());
+		}
+		return $output->getContents();
+	}
+
+	public function encrypt(string|Temporary $input, array $certificates): ?string
+	{
+		if (\is_string($input)) {
+			$tmp = new Temporary('smimein-');
+			if (!$tmp->putContents($input)) {
+				return null;
+			}
+			$input = $tmp;
+		}
+		$output = new Temporary('smimeout-');
+		$flags = \defined('PKCS7_NOOLDMIMETYPE') ? \PKCS7_NOOLDMIMETYPE : 0;
+		if (!\openssl_pkcs7_encrypt(
+			$input->filename(),
+			$output->filename(),
+			$certificates,
+			$this->headers,
+			$flags,
+			$this->cipher_algo
+		)) {
+			throw new \RuntimeException('OpenSSL encrypt: ' . \openssl_error_string());
+		}
+
+		/**
+		 * Only fetch the body part
+		 */
+		$fp = $output->fopen();
+		// Skip headers
+		while (\trim(\fgets($fp)));
+		// Fetch the body
+		$encrypted = '';
+		do {
+			$line = \fgets($fp);
+			if (!\trim($line)) {
+				return $encrypted;
+			}
+			$encrypted .= $line;
+		} while (true);
+
+		return $data;
+	}
+
+	public function sign(string|Temporary $input, bool $detached = true): ?string
+	{
+		if (\is_string($input)) {
+			$tmp = new Temporary('smimein-');
+			if (!$tmp->putContents($input)) {
+				return null;
+			}
+			$input = $tmp;
+		}
+		if (\is_string($this->certificateChain)) {
+			$tmp = new Temporary('smimechain-');
+			if (!$tmp->putContents($this->certificateChain)) {
+				return null;
+			}
+			$certificateChain = $tmp;
+		}
+		$output = new Temporary('smimeout-');
+		if (!\openssl_pkcs7_sign(
+			$input->filename(),
+			$output->filename(),
+			$this->certificate,
+			$this->privateKey,
+			$this->headers,
+			$detached ? \PKCS7_DETACHED | \PKCS7_BINARY : 0, // | PKCS7_NOCERTS | PKCS7_NOATTR
+			$certificateChain ?? null
+		)) {
+			throw new \RuntimeException('OpenSSL sign: ' . \openssl_error_string());
+		}
+
+		/**
+		 * Only fetch the signed body part
+		 */
+		$fp = $output->fopen();
+		$micalg = '';
+		while (!\feof($fp)) {
+			$line = \fgets($fp);
+			$fp = $output->fopen();
+			while (!\feof($fp)) {
+				$line = \fgets($fp);
+/*
+				if (!$micalg && \str_contains($line, 'Content-Type: multipart/signed')) {
+					\preg_match('/micalg="([^"+])"/', $line, $match);
+					$micalg = $match[1];
+				}
+*/
+				if (($detached && \str_contains($line, 'Content-Type: application/x-pkcs7-signature'))
+				 || (!$detached && \str_contains($line, 'Content-Type: application/x-pkcs7-mime'))
+				) {
+					// Skip headers
+					while (\trim(\fgets($fp)));
+					// Fetch the body
+					$signature = '';
+					do {
+						$line = \fgets($fp);
+						if (!\trim($line)) {
+							return $signature;
+						}
+						$signature .= $line;
+					} while (true);
+				}
+			}
+		}
+
+		throw new \RuntimeException('OpenSSL sign: failed to find p7s');
+	}
+
+	/**
+	 * $opaque = true, when the message is not detached
+	 */
+	public function verify(string|Temporary $input, ?string $signers_certificates_filename = null, bool $opaque = false): ?array
+	{
+		if (\is_string($input)) {
+			$tmp = new Temporary('smimein-');
+			if (!$tmp->putContents($input)) {
+				return null;
+			}
+			$opaque |= \str_contains($input, 'application/pkcs7-mime') || \str_contains($input, 'application/x-pkcs7-mime');
+			$input = $tmp;
+		}
+		$output = $opaque ? new Temporary('smimeout-') : null;
+		if (true !== \openssl_pkcs7_verify(
+			$input->filename(),
+//			$flags = 0, // \PKCS7_NOVERIFY | \PKCS7_NOCHAIN | \PKCS7_NOSIGS
+			\PKCS7_NOVERIFY | \PKCS7_NOCHAIN | \PKCS7_NOSIGS,
+			$signers_certificates_filename ?: null,
+			$ca_info = [],
+			$this->untrusted_certificates_filename,
+			$output ? $output->filename() : null,
+			$output_filename = null
+		)) {
+			throw new \RuntimeException('OpenSSL verify: ' . \openssl_error_string());
+		}
+		return [
+			'body' => $output ? $output->getContents() : null,
+			'success' => true
+		];
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.crt b/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.crt
new file mode 100644
index 000000000..9673973b0
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.crt
@@ -0,0 +1,34 @@
+-----BEGIN CERTIFICATE-----
+MIIF7TCCA9WgAwIBAgIUTUN7LmHxy9YgRInzdr9AlyD8UsMwDQYJKoZIhvcNAQEL
+BQAwgYUxCzAJBgNVBAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdV
+dHJlY2h0MRMwEQYDVQQKDApTbmFwcHlNYWlsMRYwFAYDVQQDDA1zbmFwcHltYWls
+LmV1MSUwIwYJKoZIhvcNAQkBFhZzZWN1cml0eUBzbmFwcHltYWlsLmV1MB4XDTI0
+MDIxODIzNDEyMFoXDTM0MDUxNjIzNDEyMFowgYUxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRMwEQYDVQQKDApTbmFwcHlN
+YWlsMRYwFAYDVQQDDA1zbmFwcHltYWlsLmV1MSUwIwYJKoZIhvcNAQkBFhZzZWN1
+cml0eUBzbmFwcHltYWlsLmV1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEAvxgynsN5CxhfrH0eu1PJEaUz/+oJkCZMeHpYNOiuGiZBSrHpXuGDBWeKgz4n
+pl6Voee9KU+itMl6c6tIlY/pIcl7EhnRw/ZaX/wSkJCXHOaL+f7QIZeGeTxI3hU6
+8C895ZQQMn6lzsDGJfounCU4YNfXx8VYkoO65zNZlXbwAGoxtK0iQtSbyvs+2oUH
+HtqqJ3SUrs1OSFCmOcymSbKHGNcoX5vEx56bRlwl91Uf5zJJvcVejgmLqDxAkxZt
+6M3SL1f0VMJyKccJJruGGEjYM7IqlBCtxuNZIk8hGB+4FNOdIKbdo49UBiBKFiAR
+TW0hrBwtHmkj2STnS4JGCrQMwhOzRgNq4XcBBCXi+9qLb1H+85qNHPiRiUjVfTmX
+MBivThYVdMeRoouv7/EQHdygrJt05mvV6cZYpDi/wTaDNwJroyOKpfFNBjpsIcN+
+Lk73p7MXuLOLky2j1RXlTdekvHNMSLcxTHAZAV1BS/tCoLLrtnaXgeZd/kq3KNTY
+tdoTyPHXZ2uQsiP65HwXJcCtx8gS8A6hTDBuvAqXpxudoa+sw7mVDV6MUwmfZFLb
++oVnQMFQXe16ZVfBpjeAO21M1Yc7O6QdZHE4PyERAUdtFiWeqCYkiTY2KUYsKL79
+1gwZ7Oi+ktf5ULcLOefQ3JHZP0bUFnlUQusT8e6SFVh8IgsCAwEAAaNTMFEwHQYD
+VR0OBBYEFIzs5G3S7dv2/zqjs942E9hrYwg1MB8GA1UdIwQYMBaAFIzs5G3S7dv2
+/zqjs942E9hrYwg1MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIB
+AFKDwWx4QbQrvc9u1EUnuTCCU0eB4BQJ9NwDiQ5AiDBguH2AFK8oLEH3hk2EXkp1
+yoWLzb+43v71WcOWDzUPQGkMAdyP15B7VqMDQYX93AlvTboztKBw/Mxbvw/by8JO
+5Stwyht3EIiIMEHwz9n5yavfeN3ltgYijwM6rMBSiuScfagYJMyYae5KvP77hj1M
+O6kbB2vvuqLL/NqxamK2ioGg112Jitlybxkjcq4izujB4pjUwDMg2Z0PN4mdmpIo
+/ujHbtGfNoxqUOKIt3AQAVGlg3j0x8NbfN7YLHN11v3AmGj4KbKpIAAxAcK3FgxX
+3mZ8CKg4CO6PRYU0LZIVLuyzFz083S6zOE5Y48/3LWG+VQhsBDXHNxsD26FQSeXm
+ZWYg7BEMy6J8cweY+l9ktmDpwNK+IMljFs5Az7AwSr3zuScZyJi6ytHdzFoGRc9D
+TU4oso9l4/3/G+X/3Vy2uPCNt2MNYafk4nE+lk/WUcKbZqrB8K9XltBR7PxZbpMD
+YDScDtX/HoCNq1oPskI6FLdpiW3DccFja2f7qyaAemH1PgAaIM9VSItSaSs1abi7
+8mpSw8LdumnPaFPv6JVSS5n4HjWjP2g01reD8Lg9SBqnBAUIs+kvKPHOhfBfDSmS
+WTe4EeMGbwGPxCxmR2+uoO2LJFL84xWXtyusS441KUiW
+-----END CERTIFICATE-----
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.key b/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.key
new file mode 100644
index 000000000..1fc2548f5
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/smime/snappymail.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+lxuLGBMOZyy4CruqVloeblEjqz0+3Sw=
+-----END PRIVATE KEY-----
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php
new file mode 100644
index 000000000..3009f53b3
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/stream/tar.php
@@ -0,0 +1,368 @@
+<?php
+
+namespace SnappyMail\Stream;
+
+class TAR
+{
+	const
+		NONE    = "\x00\x00",
+		DEFLATE = "\x08\x00",
+		BZIP2   = "\x0C\x00",
+		LZMA    = "\x0E\x00",
+
+		TYPE_FILE = '0',
+		TYPE_LINK = '2',
+		TYPE_DIR  = '5';
+
+	protected
+		$gzip = false,
+		$started = false,
+		$out = null;
+
+	function __construct($target = 'php://output', string $compression = self::DEFLATE)
+	{
+		if (\is_string($target)) {
+			$target = \fopen($target, 'wb');
+		}
+		if (\is_resource($target)) {
+			$this->out = $target;
+		} else {
+			throw new \Exception("Failed to open output: {$target}");
+		}
+		if (self::DEFLATE === $compression) {
+			$this->gzip = array('w' => null, 'h' => null, 'l' => 0);
+		}
+	}
+
+	function __destruct()
+	{
+		$this->close();
+	}
+
+	public function pushHttpHeaders(string $name): void
+	{
+		if ($i = \ob_get_level()) {
+			# Clear buffers:
+			while ($i-- && \ob_end_clean());
+			\ob_get_level() || \header('Content-Encoding: ');
+		}
+		\header('Cache-Control: no-store, no-cache, must-revalidate');
+		\header('Pragma: no-cache');
+		\header('Content-Transfer-Encoding: binary');
+		if (false !== $this->gzip) {
+			$name .= '.tgz';
+			$tname = \preg_match('#^[\x01-\x7F]*$#D', $name) ? $name : '=?UTF-8?B?'.\base64_encode($name).'?=';
+			\header("Content-Type: application/gzip; name=\"{$tname}\"");
+		} else {
+			$name .= '.tar';
+			$tname = \preg_match('#^[\x01-\x7F]*$#D', $name) ? $name : '=?UTF-8?B?'.\base64_encode($name).'?=';
+			\header("Content-Type: application/x-ustar; name=\"{$tname}\"");
+		}
+		\MailSo\Base\Http::setContentDisposition('attachment', ['filename' => $name]);
+	}
+
+	public function close(): void
+	{
+		if ($this->out) {
+			if ($this->started) {
+				// Write tar footer
+				$this->write(pack('a1024', ''));
+				// Stop compression
+				if (!empty($this->gzip['w'])) {
+					\stream_filter_remove($this->gzip['w']);
+					// hash_final is a string, not an integer
+					$crc = \hash_final($this->gzip['h'], 1);
+					// write the little endian CRC32 and uncompressed file size
+					\fwrite($this->out, $crc[3].$crc[2].$crc[1].$crc[0].\pack('V', $this->gzip['l']), 8);
+				}
+			}
+			\fclose($this->out);
+			$this->out = null;
+		}
+	}
+
+	public function addFile($fileinfo, ?string $name = null): bool
+	{
+		if (!($fileinfo instanceof \SplFileInfo)) {
+			$fileinfo = new \SplFileInfo($fileinfo);
+		}
+		if (!$name) {
+			$name = $fileinfo->getFilename();
+		}
+		if ($fileinfo->isLink()) {
+			$stat = \lstat($fileinfo);
+			$target = $fileinfo->getLinkTarget();
+			if (\dirname($fileinfo->getPathname()) === \dirname($fileinfo->getRealPath())) {
+				$target = \basename($target);
+			}
+			$this->writeEntryHeader(
+				$name,
+				static::TYPE_LINK,
+				0,
+				$stat['uid'],
+				$stat['gid'],
+				$stat['mode'],
+				$stat['mtime'],
+				$target
+			);
+		} else if ($fileinfo->isDir()) {
+			$this->addDir($name, $fileinfo);
+		} else if ($fileinfo->isFile()) {
+			return $this->addFromStream($fileinfo->openFile('rb'), $name);
+		}
+		return true;
+	}
+
+	public function addFromStream($resource, string $name, int $time = 0): bool
+	{
+		if (\is_resource($resource)) {
+			$temp = new TarTempResource();
+			while (!\feof($resource)) {
+				$data = $resource->fread(4096);
+				if (false === $data || '' === $data) {
+					break;
+				}
+				$temp->write($data);
+			}
+			$temp->rewind();
+			$resource = $temp;
+		} else if (!$resource instanceof \SplFileObject) {
+			throw new \Exception('Invalid resource');
+		}
+
+		$this->writeEntryHeader(
+			\strtr($name, '\\', '/'),
+			static::TYPE_FILE,
+			$resource->getSize(),
+			$resource->getOwner(),
+			$resource->getGroup(),
+			$resource->getPerms(),
+			$time ?: $resource->getMTime()
+		);
+		$l = 0;
+		while (!$resource->eof()) {
+			// deflate works best with buffers >32K
+			$data = $resource->fread(65536);
+			if (false === $data || '' === $data) {
+				break;
+			}
+			$l += $this->write($data);
+		}
+		if ($l = $l % 512) {
+			$l = 512 - $l;
+			$this->write(\pack("a{$l}", ''));
+		}
+		return true;
+	}
+
+	public function addFromString(string $name, string $data, int $time = 0): bool
+	{
+		$this->writeEntryHeader(
+			\strtr($name, '\\', '/'),
+			static::TYPE_FILE,
+			\strlen($data),
+			0,
+			0,
+			420,
+			$time
+		);
+		$l += $this->write($data);
+		if ($l = $l % 512) {
+			$l = 512 - $l;
+			$this->write(\pack("a{$l}", ''));
+		}
+		return true;
+	}
+
+	public function addDir(string $dirname, ?\SplFileInfo $fileinfo = null): void
+	{
+		$this->writeEntryHeader(
+			\rtrim(\strtr($dirname, '\\', '/'), '/') . '/',
+			static::TYPE_DIR,
+			0,
+			$fileinfo ? $fileinfo->getOwner() : 0,
+			$fileinfo ? $fileinfo->getGroup() : 0,
+			$fileinfo ? $fileinfo->getPerms() : 493,
+			$fileinfo ? $fileinfo->getMTime() : 0
+		);
+	}
+
+	public function addRecursive(string $dir, string $target_dir = '', $ignore = '#/(\\.hg(/|$)|\\.hgignore)#'): void
+	{
+		if (!$this->out) {
+			throw new \Exception('Stream closed');
+		}
+		\clearstatcache();
+		$dir = \rtrim($dir,'\\/') . '/';
+		$dirl = \strlen($dir);
+		if ($target_dir) {
+			$target_dir = \rtrim($target_dir,'\\/') . '/';
+		}
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS /*| \FilesystemIterator::FOLLOW_SYMLINKS*/),
+			\RecursiveIteratorIterator::SELF_FIRST,
+			\RecursiveIteratorIterator::CATCH_GET_CHILD);
+		$ignore_paths = array();
+		foreach ($iterator as $name => $fileinfo) {
+			if ($ignore_paths && \preg_match('#'.\implode('|',$ignore_paths).'#', $name)) {
+				continue;
+			}
+			if (!$ignore || !\preg_match($ignore, $name)) {
+				$this->addFile($fileinfo, $target_dir . \substr($name, $dirl));
+			}
+			// like: tar --exclude-caches -czf file.tgz *
+			if (\strpos($name, 'CACHEDIR.TAG')) {
+				$ignore_paths[] = \preg_quote(\dirname($name) . '/','#');
+			}
+		}
+	}
+
+	protected function start(): void
+	{
+		if ($this->started) {
+			return;
+		}
+		$this->started = true;
+		if (false !== $this->gzip) {
+			// Write gzip header, see http://www.zlib.org/rfc-gzip.html#member-format
+			if (!\fwrite($this->out, "\x1F\x8B\x08\x00".\pack('V', \time())."\0\x03", 10)) {
+				throw new \Exception('Failed to write to stream');
+			}
+			// Start ZLIB compression (RFC 1950)
+			$this->gzip['w'] = \stream_filter_append($this->out, 'zlib.deflate', STREAM_FILTER_WRITE, array(
+				'level' => 9,
+//				'window' => 32768,
+				'memory' => 9,
+			));
+			// Start CRC32 hashing
+			$this->gzip['h'] = \hash_init('crc32b');
+		}
+	}
+
+	protected function write(string $string): int|bool
+	{
+		if (!$this->out) {
+			throw new \Exception('Stream closed');
+		}
+		if (!$this->started) {
+			$this->start();
+		}
+		$length = \strlen($string);
+		$written = 0;
+		while ($written < $length) {
+			$bytes = \fwrite($this->out, $written ? \substr($string, $written) : $string);
+			if (!$bytes) {
+				return $written ?: false;
+			}
+			$written += $bytes;
+		}
+
+		if (!empty($this->gzip['h'])) {
+			$this->gzip['l'] += $length;
+			\hash_update($this->gzip['h'], $string);
+		}
+
+		return $written;
+	}
+
+	protected function writeEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = ''): void
+	{
+		// handle long filename length
+		$paxdata = $paxname = '';
+		if (100 < \strlen($link)) {
+			$length = \strlen($link) + 11;
+			$length += \strlen($length);
+			$paxdata = "{$length} linkpath={$link}\n";
+			$link = '././@LongSymLink';
+		}
+		$l = \strlen($name);
+		if (($paxdata?90:100) < $l) {
+			// split into name and prefix
+			$p = \strpos($name, '/', \max(0, $l - 90));
+			if ($p && $p < $l-1) {
+				$file = \substr($name, $p+1);
+				$prefix = \substr($name, 0, $p);
+				$paxname = \preg_replace('#(^|/)([^/]+)$#', '$1PaxHeader/$2', $file);
+			} else {
+				$file = \basename($name);
+				if (static::TYPE_DIR === $type) {
+					$file .= '/';
+				}
+				$prefix = \dirname($name);
+				$paxname = 'PaxHeader/' . $file;
+			}
+			if (100 < \strlen($file) || 155 < \strlen($prefix)) {
+				// POSIX.1-2001/pax
+				$length = $l + 7;
+				$length += \strlen($length);
+				$paxdata = "{$length} path={$name}\n{$paxdata}";
+				if (static::TYPE_DIR === $type) {
+					$name = \substr($file, 0, 98) . '/';
+				} else {
+					$name = \substr($file, 0, 99);
+				}
+			} else {
+				// POSIX ustar
+				$name = $file;
+			}
+			$paxname = \substr($paxname, 0, 98);
+		}
+		if ($paxdata) {
+			/* Add?
+			$data .= "30 mtime=1461056595.149922432\n"
+			$data .= "30 ctime=1461056595.149922432\n"
+			*/
+			$this->writeUStarEntryHeader(
+				$paxname ?: \preg_replace('#(^|/)([^/]+)$#', '$1PaxHeader/$2', $name),
+				'x',
+				\strlen($paxdata),
+				$uid,
+				$gid,
+				$perm,
+				$mtime,
+				'',
+				$prefix
+			);
+			$l = 512 * \ceil(\strlen($paxdata) / 512);
+			$this->write(\pack("a{$l}", $paxdata));
+		}
+
+		$this->writeUStarEntryHeader($name, $type, $size, $uid, $gid, $perm, $mtime, $link, $prefix);
+	}
+
+	// Writes Pre-POSIX.1-1988 (i.e. v7) and POSIX UStar headers
+	protected function writeUStarEntryHeader($name, $type, $size, $uid = 0, $gid = 0, $perm = 0, $mtime = 0, $link = '', $prefix  = ''): void
+	{
+		$data = \pack('a100a8a8a8a12A12',
+			$name,
+			// values in octal
+			\sprintf("%06u ", \substr(\decoct($perm),-3)),
+			\sprintf("%06u ", \decoct($uid)),
+			\sprintf("%06u ", \decoct($gid)),
+			\sprintf("%011u ", \decoct($size)),
+			\sprintf("%011u", \decoct($mtime ?: \time())));
+		$this->write($data);
+		$checksum = 0;
+		$i = 148;
+		while ($i--) {
+			$checksum += \ord($data[$i]);
+		}
+
+		$data = \pack('a1a100a6a2a32a32a8a8a155a12', $type, $link, 'ustar', '00', '', '', '000000 ', '000000 ', $prefix, '');
+		$checksum += 256;
+		$i = 356;
+		while ($i--) {
+			$checksum += \ord($data[$i]);
+		}
+
+		$this->write(\pack('a8', \sprintf('%06u ', \decoct($checksum))) . $data);
+	}
+
+}
+
+class TarTempResource extends \SplTempFileObject
+{
+	public function getOwner(): int|false { return 0; }
+	public function getGroup(): int|false { return 0; }
+	public function getPerms(): int|false { return 420; }
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php b/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php
new file mode 100644
index 000000000..135e4fdbc
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/stream/zip.php
@@ -0,0 +1,413 @@
+<?php
+/*
+	Zip file creation class.
+	Official ZIP format: https://support.pkware.com/display/PKZIP/APPNOTE
+*/
+
+namespace SnappyMail\Stream;
+
+class ZIP
+{
+	const
+		NONE    = "\x00\x00",
+		DEFLATE = "\x08\x00",
+		BZIP2   = "\x0C\x00",
+		LZMA    = "\x0E\x00";
+
+	private
+		$encryption,  // TODO
+		$compression,
+
+		/**
+		 * Central directory
+		 */
+		$ctrl_dir = array(),
+
+		/**
+		 * Last offset position
+		 */
+		$offset   = 0,
+
+		/**
+		 * Target resource
+		 */
+		$out      = null;
+
+	function __construct($target = 'php://output', string $compression = self::DEFLATE)
+	{
+		if (\is_string($target)) {
+			$target = \fopen($target, 'wb');
+		}
+		if (\is_resource($target)) {
+			$this->out = $target;
+		} else {
+			throw new \Exception("Failed to open output: {$target}");
+		}
+
+		switch ($compression)
+		{
+		case self::LZMA:
+			if (\function_exists('lzf_compress')) {
+				break;
+			}
+		case self::BZIP2:
+			if (\function_exists('bzcompress')) {
+				$compression = self::BZIP2;
+				break;
+			}
+		case self::DEFLATE:
+			$compression = self::DEFLATE;
+			break;
+		case self::NONE:
+			break;
+		}
+		$this->compression = $compression;
+	}
+
+	function __destruct()
+	{
+		$this->close();
+	}
+
+	public function pushHttpHeaders(string $name) : void
+	{
+		if ($i = \ob_get_level()) {
+			# Clear buffers:
+			while ($i-- && \ob_end_clean());
+			\ob_get_level() || \header('Content-Encoding: ');
+		}
+		\header('Cache-Control: no-store');
+		\header('Pragma: no-cache');
+		\header('Content-Transfer-Encoding: binary');
+		$name .= '.zip';
+		\MailSo\Base\Http::setContentDisposition('attachment', ['filename' => $name]);
+		\header("Content-Type: application/zip; name={$name}");
+	}
+
+	public function close() : void
+	{
+		if ($this->out) {
+			// End of central directory record
+			$ctrldir = \implode('', $this->ctrl_dir);
+			$count   = \pack('v', \count($this->ctrl_dir));
+			\fwrite($this->out, $ctrldir
+				. "\x50\x4b\x05\x06\x00\x00\x00\x00"
+				. $count                      // total # of entries "on this disk"
+				. $count                      // total # of entries overall
+				. \pack('V', \strlen($ctrldir)) // size of central dir
+				. \pack('V', $this->offset)    // offset to start of central dir
+				. "\x00\x00");                // .zip file comment length
+			\fclose($this->out);
+			$this->out = null;
+		}
+	}
+
+	public function addFile($file, ?string $name = null) : bool
+	{
+		if (\is_file($file) && $fp = new \SplFileObject($file, 'rb')) {
+			return $this->addFromStream($fp, $name ?: \basename($file));
+		}
+		return false;
+	}
+
+	public function addFromStream($resource, string $name, int $time = 0) : bool
+	{
+		if (!$this->out) {
+			throw new \Exception('Stream closed');
+		}
+
+		if ($resource instanceof \SplFileObject) {
+			if (!$time) {
+				$time = $resource->getMTime();
+			}
+		} else if (\is_resource($resource)) {
+			$resource = new ZipResource($resource);
+		} else {
+			throw new \Exception('Invalid resource');
+		}
+
+		$file = new ZipEntry(
+			$name,
+			$time,
+			(self::NONE === $this->compression) ? self::NONE : self::DEFLATE
+		);
+
+		$bytes = \fwrite($this->out, $file->getHeader());
+
+		if (self::NONE === $this->compression) {
+			while (!$resource->eof()) {
+				$data = $resource->fread(16384);
+				if (false === $data || '' === $data) {
+					break;
+				}
+				$file->updateCrc32($data);
+				$file->u_len += \strlen($data);
+				$file->c_len += \fwrite($this->out, $data);
+			}
+		} else {
+			$zip = \deflate_init(ZLIB_ENCODING_RAW, array('level' => 9));
+			while (!$resource->eof()) {
+				// deflate works best with buffers >32K
+				$data = $resource->fread(65536);
+				if (false === $data || '' === $data) {
+					break;
+				}
+				$file->updateCrc32($data);
+				$file->u_len += \strlen($data);
+				$file->c_len += \fwrite($this->out, \deflate_add($zip, $data, ZLIB_NO_FLUSH));
+			}
+			$file->c_len += \fwrite($this->out, \deflate_add($zip, '', ZLIB_FINISH));
+		}
+
+		// Write the Data descriptor
+		$bytes += \fwrite($this->out, $file->getDataDescriptor());
+
+		// now add to central directory record
+		$this->ctrl_dir[] = $file->getDirEntry($this->offset);
+
+		$this->offset += $bytes + $file->c_len;
+
+		return true;
+	}
+
+	public function addFromString(string $name, string $data, int $time = 0) : bool
+	{
+		if (!$this->out) {
+			throw new \Exception('Stream closed');
+		}
+
+		$file = new ZipEntry($name, $time, $this->compression);
+		$file->u_len = \strlen($data);
+		$file->setCrc32(\crc32($data));
+
+		switch ($this->compression)
+		{
+		case self::NONE:
+			break;
+		case self::DEFLATE:
+			$data = \gzdeflate($data, 9);
+			break;
+		case self::BZIP2:
+			$data = \bzcompress($data, 9);
+			break;
+		case self::LZMA:
+			$data = \lzf_compress($data);
+			break;
+		}
+		$file->c_len = \strlen($data);
+
+		$bytes = \fwrite($this->out, $file->getHeader() . $data);
+
+		// now add to central directory record
+		$this->ctrl_dir[] = $file->getDirEntry($this->offset);
+
+		$this->offset += $bytes;
+
+		return true;
+	}
+
+	public function addRecursive(string $dir, string $target_dir = '', string $ignore = '#/(\\.hg(/|$)|\\.hgignore)#') : void
+	{
+		if (!$this->out) {
+			throw new \Exception('Stream closed');
+		}
+		\clearstatcache();
+		$dir = \rtrim($dir,'\\/') . '/';
+		$dirl = \strlen($dir);
+		if ($target_dir) {
+			$target_dir = \rtrim($target_dir,'\\/') . '/';
+		}
+		$iterator = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS /*| \FilesystemIterator::FOLLOW_SYMLINKS*/),
+			\RecursiveIteratorIterator::SELF_FIRST,
+			\RecursiveIteratorIterator::CATCH_GET_CHILD);
+		$ignore_paths = array();
+		foreach ($iterator as $name => $fileinfo) {
+			if ($ignore_paths && \preg_match('#'.\implode('|',$ignore_paths).'#', $name)) {
+				continue;
+			}
+			if (!$ignore || !\preg_match($ignore, $name)) {
+				$this->addFile($name, $target_dir . \substr($name, $dirl));
+			}
+			// like: tar --exclude-caches -czf file.tgz *
+			if (\strpos($name, 'CACHEDIR.TAG')) {
+				$ignore_paths[] = \preg_quote(\dirname($name) . '/','#');
+			}
+		}
+	}
+
+/*
+	protected function encrypt($data)
+	{
+		 5.1 - File is encrypted using AES encryption
+		 6.1 - File is encrypted using non-OAEP key wrapping***
+		 6.3 - File is encrypted using Blowfish
+		 6.3 - File is encrypted using Twofish
+	}
+*/
+}
+
+class ZipResource /* SplFileObject */
+{
+	protected $source;
+	function __construct($source) { $this->source = $source; }
+	public function eof() : bool { return \feof($this->source); }
+	public function fread($length) { return \fread($this->source, $length); }
+}
+
+class ZipEntry
+{
+	const
+		NO_CRC32 = "\x00\x00\x00\x00",
+
+		FLAG_ENCRYPTED         = 1,
+		// Method 6 - Imploding compression method used
+		FLAG_IMPLODE_4K        = 0,    // 4K sliding dictionary was used
+		FLAG_IMPLODE_8K        = 2,    // 8K sliding dictionary was used
+		FLAG_IMPLODE_2SF       = 0,    // 2 Shannon-Fano trees were used
+		FLAG_IMPLODE_3SF       = 4,    // 3 Shannon-Fano trees were used
+		// For Methods 8 and 9 - Deflating
+		FLAG_DEFLATE_NORMAL    = 0,
+		FLAG_DEFLATE_MAXIMUM   = 2,
+		FLAG_DEFLATE_FAST      = 4,
+		FLAG_DEFLATE_SUPERFAST = 6,
+		// For Method 14 - LZMA
+		FLAG_LZMA_EOS          = 2,    // end-of-stream marker is used
+		/* If FLAG_DATA_DESCRIPTOR is set, the fields crc-32, compressed size
+		 * and uncompressed size are set to zero in the local header.
+		 * The correct values are put in the data descriptor immediately
+		 * following the compressed data
+		 */
+		FLAG_DATA_DESCRIPTOR   = 8,
+		FLAG_PATCHED           = 32,   // the file is compressed patched data
+		FLAG_STRONG_ENCRYPTION = 65,   // 64 + 1
+		FLAG_EFS_UTF8          = 2048, // Language encoding flag, filename and comment fields for this file MUST be encoded using UTF-8
+		FLAG_ENCRYPTED_CD      = 8192; // encrypting the Central Directory
+
+	public
+		/**
+		 * uncompressed filesize
+		 */
+		$u_len = 0,
+
+		/**
+		 * compressed filesize
+		 */
+		$c_len = 0;
+
+	protected
+		$hctx,
+		$name,
+		$time,
+		$flags = 0,
+		$compression,
+		$crc32 = self::NO_CRC32;
+
+	function __construct(string $name, int $time, string $compression)
+	{
+		$this->name = \strtr($name, '\\', '/');
+
+		// Convert Unix time to DOS
+		$time = \getdate($time ?: \time());
+		if ($time['year'] < 1980) {
+			$this->time = "\x00\x00\x21\x00";
+		} else {
+			$time = (($time['year'] - 1980) << 25) | ($time['mon'] << 21) | ($time['mday'] << 16) |
+				($time['hours'] << 11) | ($time['minutes'] << 5) | ($time['seconds'] >> 1);
+			$time = \str_pad(\dechex($time), 8, '0', STR_PAD_LEFT);
+			$this->time = \hex2bin($time[6] . $time[7] . $time[4] . $time[5] . $time[2] . $time[3] . $time[0] . $time[1]);
+		}
+
+		$this->compression = $compression;
+
+		$this->flags = self::FLAG_EFS_UTF8;
+		if (Zip::DEFLATE === $compression) {
+			$this->flags |= self::FLAG_DEFLATE_MAXIMUM;
+		}
+	}
+
+	protected function getEntry() : string
+	{
+		$versions = array(
+			Zip::NONE    => "\x0A\x00", // v1
+			Zip::DEFLATE => "\x14\x00", // v2
+			Zip::BZIP2   => "\x2E\x00", // v4.6
+			Zip::LZMA    => "\x3F\x00", // v6.3
+		);
+		return $versions[$this->compression]     // ver needed to extract
+			. \pack('v', $this->flags)            // gen purpose bit flag
+			. $this->compression                 // compression method
+			. $this->time                        // last mod time and date
+			. ($this->crc32 ?: self::NO_CRC32)   // crc32
+			. \pack('V', $this->c_len)            // compressed filesize
+			. \pack('V', $this->u_len)            // uncompressed filesize
+			. \pack('v', \strlen($this->name))     // length of filename
+			. "\x00\x00";                        // extra field length
+			// TODO: extra field 4.5 Extensible data fields, the UNIX Extra Field (0x000d)
+	}
+
+	public function setCrc32($v) : void
+	{
+		if (\is_int($v)) {
+			$v = \pack('V', $v);
+		}
+		if (\is_string($v) && 4 === \strlen($v)) {
+			$this->crc32 = $v;
+		} else {
+			$this->crc32 = self::NO_CRC32;
+		}
+	}
+
+	public function updateCrc32(string $data) : void
+	{
+		if (!$this->hctx) {
+			// set up the CRC32 hashing context
+			$this->hctx = \hash_init('crc32b');
+		}
+		\hash_update($this->hctx, $data);
+	}
+
+	// Local file header
+	public function getHeader() : string
+	{
+		if (self::NO_CRC32 === $this->crc32) {
+			$this->flags |= self::FLAG_DATA_DESCRIPTOR;
+		}
+		return "\x50\x4b\x03\x04" . $this->getEntry() . $this->name;
+	}
+
+	// Data descriptor
+	public function getDataDescriptor(bool $signature = false) : string
+	{
+		if ($this->flags & self::FLAG_DATA_DESCRIPTOR) {
+			if ($this->hctx) {
+				// hash_final is a string, not an integer and need to
+				// reverse the hash_final string to little endian
+				$crc = \hash_final($this->hctx, true);
+				$this->setCrc32($crc[3].$crc[2].$crc[1].$crc[0]);
+				$this->hctx = null;
+			}
+			return ($signature ? "\x50\x4b\x07\x08" : '')
+				. $this->crc32
+				. \pack('V', $this->c_len)
+				. \pack('V', $this->u_len);
+		}
+		return '';
+	}
+
+	// Central directory file header
+	public function getDirEntry(int $offset) : string
+	{
+		// now add to central directory record
+		return "\x50\x4b\x01\x02"
+			. "\x00\x03"         // version made by UNIX
+			. $this->getEntry()
+			. "\x00\x00"         // file comment length
+			. "\x00\x00"         // disk number start
+			. "\x00\x00"         // internal file attributes
+			. "\x20\x00\x00\x00" // external file attributes - 'archive' bit set
+			. \pack('V', $offset) // relative offset of local header
+			. $this->name;
+			// TODO: extra field 4.5 Extensible data fields, the UNIX Extra Field (0x000d)
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/tar.php b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
new file mode 100644
index 000000000..80ae166a1
--- /dev/null
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/tar.php
@@ -0,0 +1,101 @@
+<?php
+
+namespace SnappyMail;
+
+class TAR
+{
+	public
+		$alias,
+		$filename;
+
+	const dec = array(
+		'mode', 'uid', 'gid', 'size', 'mtime', 'crc', 'type'
+	);
+
+	function __construct(string $filename, int $flags = 0, ?string $alias = null)
+	{
+		$this->filename = $filename;
+		$this->alias = $alias ?: $filename;
+	}
+
+	public function extractTo(string $directory, array|string|null $files = null, bool $overwrite = false) : bool
+	{
+		$fp = \gzopen($this->filename, 'rb');
+		if (!$fp) {
+			return false;
+		}
+
+		if ($files) {
+			$files = '#^(' . \implode('|', \array_map('preg_quote', \is_array($files) ? $files : [$files])) . ')#u';
+		}
+
+		\clearstatcache(true);
+		while (!\gzeof($fp)) {
+			$data = \gzread($fp, 512);
+			if (\gzeof($fp) || !\trim($data)) {
+				break;
+			}
+			if (\strlen($data) !== 512) {
+				\trigger_error("{$this->alias} invalid header at offset " . \gztell($fp));
+				return false;
+			}
+			$header = \unpack("a100filename/a8mode/a8uid/a8gid/a12size/a12mtime/a8crc/a1type/a100linkname/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155path", $data);
+			if (!\strlen(\trim($header['filename']))) {
+				\trigger_error("{$this->alias} invalid entry filename at offset " . \gztell($fp));
+				return false;
+			}
+			foreach ($header as $k => $v) {
+				$header[$k] = \in_array($k, self::dec) ? \octdec(\trim($v)) : \trim($v);
+			}
+			if ($header['crc'] > 0) {
+				$crc = 0;
+				for ($i = 0;   $i < 148; ++$i) { $crc += \ord(\substr($data, $i, 1)); }
+				for ($i = 148; $i < 156; ++$i) { $crc += \ord(' '); }
+				for ($i = 156; $i < 512; ++$i) { $crc += \ord(\substr($data, $i, 1)); }
+				if ($header['crc'] !== $crc) {
+					\trigger_error("{$this->alias} checksum of '{$header['filename']}' incorrect");
+					return false;
+				}
+			}
+			if (\preg_match('#(^|/)PaxHeader/#', $header['filename'])) {
+			} else if (\substr($header['filename'], -1) !== '/') {
+				$filename = ($header['path'] ? $header['path'] . '/' : '') . $header['filename'];
+				if ($files && !\preg_match($files, $filename)) {
+					continue;
+				}
+				$filename = $directory . '/' . $filename;
+				if (\is_file($filename) && !$overwrite) {
+					continue;
+				}
+				$dir = \dirname($filename);
+				if (!\is_dir($dir) && !\mkdir($dir, 0777, true)) {
+					return false;
+				}
+				$target = \fopen($filename, 'wb');
+				if (!$target) {
+					return false;
+				}
+				$bytes = $header['size'];
+				$blocksize = \ceil($bytes / 512) * 512;
+				$blocks = \ceil($blocksize / 8192);
+				while ($blocks--) {
+					$data = \gzread($fp, \min($blocksize, 8192));
+					$length = \strlen($data);
+					if ($bytes < $length) {
+						$data = \substr($data, 0, $bytes);
+					}
+					\fwrite($target, $data);
+					$bytes -= $length;
+					$blocksize -= $length;
+				}
+				\fclose($target);
+				\chmod($filename, $header['mode']);
+			} else {
+				// Create directory
+//				\gzread($fp, $blocksize);
+			}
+		}
+		\gzclose($fp);
+		return true;
+	}
+}
diff --git a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
index 5d93c0518..d2ef030b6 100644
--- a/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
+++ b/snappymail/v/0.0.0/app/libraries/snappymail/upgrade.php
@@ -15,8 +15,9 @@ abstract class Upgrade
 				$aEmail = \explode('@', \basename($sDomainDir));
 				$sDomain = \trim(1 < \count($aEmail) ? \array_pop($aEmail) : '');
 				$sNewDir = $sDataPath
-					.'/'.\RainLoop\Utils::fixName($sDomain ?: 'unknown.tld')
-					.'/'.\RainLoop\Utils::fixName(\implode('@', $aEmail) ?: '.unknown');
+					.'/'.\MailSo\Base\Utils::SecureFileName($sDomain ?: 'unknown.tld')
+					.'/'.\MailSo\Base\Utils::SecureFileName(\implode('@', $aEmail) ?: '.unknown');
+//				\MailSo\Base\Utils::mkdir($sNewDir)
 				if (\is_dir($sNewDir) || \mkdir($sNewDir, 0700, true)) {
 					foreach (\glob("{$sDomainDir}/*") as $sItem) {
 						$sName = \basename($sItem);
@@ -70,14 +71,10 @@ abstract class Upgrade
 				}
 				try {
 					$aNewAccounts[$sEmail] = [
-						'account',
-						$sEmail,
-						$sEmail, // sLogin
-						'',      // sPassword
-						'',      // sClientCert
-						'',      // sProxyAuthUser
-						'',      // sProxyAuthPassword
-						\hash_hmac('sha1', '', $sHash)
+						'email' => $sEmail,
+						'login' => $sEmail,
+						'pass' => '',
+						'hmac' => \hash_hmac('sha1', '', $sHash)
 					];
 					if (!$sToken) {
 						\SnappyMail\Log::warning('UPGRADE', "ConvertInsecureAccount {$sEmail} no token");
@@ -92,15 +89,10 @@ abstract class Upgrade
 					}
 					$aAccountHash[3] = Crypt::EncryptUrlSafe($aAccountHash[3], $sHash);
 					$aNewAccounts[$sEmail] = [
-						'account',
-						$aAccountHash[1],
-						$aAccountHash[2],
-						$aAccountHash[3],
-						$aAccountHash[11],
-						$aAccountHash[8],
-						$aAccountHash[9],
-						$oMainAccount->Email(),
-						\hash_hmac('sha1', $aAccountHash[3], $sHash)
+						'email' => $aAccountHash[1],
+						'login' => $aAccountHash[2],
+						'pass' => $aAccountHash[3],
+						'hmac' => \hash_hmac('sha1', $aAccountHash[3], $sHash)
 					];
 				} catch (\Throwable $e) {
 					\SnappyMail\Log::warning('UPGRADE', "ConvertInsecureAccount {$sEmail} failed");
@@ -130,13 +122,14 @@ abstract class Upgrade
 			if (!$aData) {
 				$aData = static::DecodeKeyValues($sData);
 				if ($aData) {
-					$oActions->setContactsSyncData($oAccount, $aData);
-					return array(
-						'Enable' => isset($aData['Enable']) ? !!$aData['Enable'] : false,
+					$aData = array(
+						'Mode' => empty($aData['Enable']) ? 0 : 1,
 						'Url' => isset($aData['Url']) ? \trim($aData['Url']) : '',
 						'User' => isset($aData['User']) ? \trim($aData['User']) : '',
 						'Password' => isset($aData['Password']) ? $aData['Password'] : ''
 					);
+					$oActions->setContactsSyncData($oAccount, $aData);
+					return $aData;
 				}
 			}
 		}
@@ -166,9 +159,18 @@ abstract class Upgrade
 	public static function backup() : string
 	{
 //		$tar_destination = APP_DATA_FOLDER_PATH . APP_VERSION . '.tar';
-		$tar_destination = APP_DATA_FOLDER_PATH . 'backup-' . \date('YmdHis') . '.tar';
-		$tar = new \PharData($tar_destination);
-		$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator(APP_DATA_FOLDER_PATH . '_data_'), \RecursiveIteratorIterator::SELF_FIRST);
+		$tar_destination = APP_DATA_FOLDER_PATH . 'backup-' . \date('YmdHis');
+		if (\class_exists('PharData')) {
+			$tar_destination .= '.tar';
+			$tar = new \PharData($tar_destination);
+		} else {
+			$tar_destination .= '.tgz';
+			$tar = new \SnappyMail\Stream\TAR($tar_destination);
+		}
+		$files = new \RecursiveIteratorIterator(
+			new \RecursiveDirectoryIterator(APP_DATA_FOLDER_PATH . '_data_'),
+			\RecursiveIteratorIterator::SELF_FIRST
+		);
 		$l = \strlen(APP_DATA_FOLDER_PATH);
 		foreach ($files as $file) {
 			$file = \str_replace('\\', '/', $file);
@@ -176,6 +178,9 @@ abstract class Upgrade
 				$tar->addFile($file, \substr($file, $l));
 			}
 		}
+		if ($tar instanceof \SnappyMail\Stream\TAR) {
+			return $tar_destination;
+		}
 		$tar->compress(\Phar::GZ);
 		\unlink($tar_destination);
 		return $tar_destination . '.gz';
@@ -193,21 +198,60 @@ abstract class Upgrade
 				if (!$sTmp) {
 					throw new \Exception('Failed to download latest SnappyMail');
 				}
+
+				if (\class_exists('PharData')) {
+					$oArchive = new \PharData($sTmp, 0, null, \Phar::GZ);
+				} else {
+					$oArchive = new \SnappyMail\TAR($sTmp);
+				}
+
 				$target = \rtrim(APP_INDEX_ROOT_PATH, '\\/');
-				$oArchive = new \PharData($sTmp, 0, null, \Phar::GZ);
+				\umask(0022);
 				\error_log('Extract to ' . $target);
 //				$bResult = $oArchive->extractTo($target, null, true);
 				$bResult = $oArchive->extractTo($target, 'snappymail/')
 					&& $oArchive->extractTo($target, 'index.php', true);
-				if ($bResult) {
-					\error_log('Update success');
-				} else {
+				if (!$bResult) {
 					throw new \Exception('Extract core files failed');
 				}
+
+				static::fixPermissions();
+
+				\error_log('Update success');
+				// opcache_reset is a terrible solution
+//				\is_callable('opcache_reset') && \opcache_reset();
+				\is_callable('opcache_invalidate') && \opcache_invalidate($target.'/index.php', true);
 			} finally {
 				$sTmp && \unlink($sTmp);
 			}
 		}
 		return $bResult;
 	}
+
+	// Prevents Apache access error due to directories being 0700
+	public static function fixPermissions($mode = 0755) : void
+	{
+		\clearstatcache(true);
+		\umask(0022);
+		$target = \rtrim(APP_INDEX_ROOT_PATH, '\\/');
+		// Prevent Apache access error due to directories being 0700
+		foreach (\glob("{$target}/snappymail/v/*", \GLOB_ONLYDIR) as $dir) {
+			\chmod($dir, 0755);
+			foreach (['static','themes'] as $folder) {
+				\chmod("{$dir}/{$folder}", 0755);
+				$iterator = new \RecursiveIteratorIterator(
+					new \RecursiveDirectoryIterator("{$dir}/{$folder}", \FilesystemIterator::SKIP_DOTS),
+					\RecursiveIteratorIterator::SELF_FIRST
+				);
+				foreach ($iterator as $item) {
+					if ($item->isDir()) {
+						\chmod($item, 0755);
+					} else if ($item->isFile()) {
+						\chmod($item, 0644);
+					}
+				}
+			}
+		}
+	}
+
 }
diff --git a/snappymail/v/0.0.0/app/localization/README b/snappymail/v/0.0.0/app/localization/README
index aa37d274c..e5cd1c388 100644
--- a/snappymail/v/0.0.0/app/localization/README
+++ b/snappymail/v/0.0.0/app/localization/README
@@ -6,15 +6,14 @@ locale examples: en, en-US, nl, nl-NL
 	2*3ALPHA            ; shortest ISO 639 code
 	["-" extlang]       ; sometimes followed by extended language subtags
 
-https://tools.ietf.org/html/rfc1766
-https://tools.ietf.org/html/rfc3066
+https://github.com/the-djmaze/snappymail/issues/435
+
+https://datatracker.ietf.org/doc/html/rfc5646
+
 https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes
 https://en.wikipedia.org/wiki/IETF_language_tag
-http://www.unc.edu/~rowlett/units/codes/country.htm
 http://www.w3.org/WAI/ER/IG/ert/iso639.htm
 http://www.loc.gov/standards/iso639-2/
-http://www.unicode.org/onlinedat/countries.html
 https://www.iana.org/assignments/language-subtag-registry
 
-
 relativetimeformat.js data is based on Unicode CLDR
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ar/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ar-SA/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/ar/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/static.json b/snappymail/v/0.0.0/app/localization/ar/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ar-SA/static.json
rename to snappymail/v/0.0.0/app/localization/ar/static.json
diff --git a/snappymail/v/0.0.0/app/localization/ar-SA/user.json b/snappymail/v/0.0.0/app/localization/ar/user.json
similarity index 62%
rename from snappymail/v/0.0.0/app/localization/ar-SA/user.json
rename to snappymail/v/0.0.0/app/localization/ar/user.json
index 40d9d6dfb..d47ff6eea 100644
--- a/snappymail/v/0.0.0/app/localization/ar-SA/user.json
+++ b/snappymail/v/0.0.0/app/localization/ar/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "rtl",
 	"GLOBAL": {
 		"TO_ARCHIVE": "الأرشيف",
 		"ARE_YOU_SURE": "هل أنت متأكد؟",
@@ -10,6 +11,7 @@
 		"CLOSE": "أغلق (Esc)",
 		"CONTACTS": "جهات الإتصال",
 		"DELETE": "حذف",
+		"UNDELETE": "Undelete",
 		"DONE": "إنتهاء",
 		"EMAIL": "إيميل",
 		"FROM": "من",
@@ -17,17 +19,30 @@
 		"LOGOUT": "تسجيل الخروج",
 		"MORE": "المزيد",
 		"MOVE_TO": "..انقل الى",
+		"COPY_TO": "نسخ الى",
 		"NAME": "البريد الوارد",
 		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "ليست رسائل غير مرغوب فيها",
+		"USERNAME": "اسم المستخدم",
 		"PASSWORD": "كلمة السر",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "الرد-الى",
 		"SAVE": "حفظ",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "لم يتم ايجاد جهة الإتصال",
-		"SPAM": "الإبلاغ عن الرسائل غير المرغوب فيها",
+		"SPAM": "رسائل إلكترونية مزعجة",
 		"SUBJECT": "الموضوع",
 		"TEST": "تجريب",
-		"TO": "الى"
+		"TO": "الى",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "نعم",
+		"NO": "لا",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "الافتراضي",
+		"HELP": "المساعدة",
+		"TEXT": "النص",
+		"ATTACHMENTS": "الملحقات"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "تسيجيل الدخول",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "الدخول"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "ضفّ حساب",
-		"BUTTON_SETTINGS": "الإعدادات",
-		"BUTTON_HELP": "المساعدة"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
+		"BUTTON_ADD_ACCOUNT": "ضفّ حساب"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "البحث المطور",
-		"LABEL_ADV_TEXT": "النص",
-		"LABEL_ADV_HAS_ATTACHMENT": "يحتوي على مرفق",
-		"LABEL_ADV_HAS_ATTACHMENTS": "يحتوي مرفقات",
-		"LABEL_ADV_FLAGGED": "عليه علم",
-		"LABEL_ADV_UNSEEN": "لم يقرأ",
-		"LABEL_ADV_DATE": "التاريخ",
-		"LABEL_ADV_DATE_ALL": "الكل",
-		"LABEL_ADV_DATE_3_DAYS": "منذ 3 أيام",
-		"LABEL_ADV_DATE_7_DAYS": "منذ أسبوع",
-		"LABEL_ADV_DATE_MONTH": "منذ شهر",
-		"LABEL_ADV_DATE_3_MONTHS": "منذ 3 أشهر",
-		"LABEL_ADV_DATE_6_MONTHS": "منذ 6 أشهر",
-		"LABEL_ADV_DATE_YEAR": "منذ سنة",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "إعداد افتراضي لوضع ملء الشاشة",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "أغلق (Esc)",
-		"GALLERY_PREV": "السابق( السهم اليسار)",
-		"GALLERY_NEXT": "اليمين(السهم اليميني)",
-		"GALLERY_COUNTER": "%curr% of %total%"
+		"TEXT": "النص",
+		"HAS_ATTACHMENT": "يحتوي على مرفق",
+		"FLAGGED": "عليه علم",
+		"UNSEEN": "لم يقرأ",
+		"DATE": "التاريخ",
+		"DATE_ALL": "الكل",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "منذ 3 أيام",
+		"SINCE_7_DAYS": "منذ أسبوع",
+		"SINCE_MONTH": "منذ شهر",
+		"SINCE_3_MONTHS": "منذ 3 أشهر",
+		"SINCE_6_MONTHS": "منذ 6 أشهر",
+		"SINCE_YEAR": "منذ سنة",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "أجاب",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "إنشاء",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "المهملات",
 		"ARCHIVE_NAME": "الأرشيف"
 	},
-	"QUOTA": {
-		"TITLE": "Quota usage"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "أعد تحميل قائمة الرسائل",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "مقروء",
 		"MENU_SELECT_FLAGGED": "محدد كـ مهم",
 		"MENU_SELECT_UNFLAGGED": "إزالة الأهمية",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "إفراغ القائمة",
 		"EMPTY_SEARCH_LIST": "ليست هناك أية رسائل تطابق بحثك.",
 		"SEARCH_RESULT_FOR": "نتيجة البحث لـ \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "العودة الى قائمة الرسائل",
-		"EMPTY_SUBJECT_TEXT": "(لايوجدموضوع)",
 		"PUT_MESSAGE_HERE": "حرك الرسالة الى هنا.. لكي تراها في قائمة الرسائل",
 		"TODAY_AT": "اليوم عند  %TIME%",
 		"YESTERDAY_AT": "البارحة عند  %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "يوجد لديك %COUNT% رسالة جديدة!",
 		"QUOTA_SIZE": "Using <strong>%SIZE% (%PROC%%)<\/strong> of your <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "إظهار المصدر",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": ".eml التنزيل كملف",
 		"MENU_FILTER_SIMILAR": "تصفية رسائل مثل هذه",
 		"MENU_PRINT": "طباعة",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "zip تنزيل كـ",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "إعلام بالقراءة (تم عرضها) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "يتم البحث..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "إضافة جهة إتصال",
 		"BUTTON_CREATE_CONTACT": "إنشاء",
-		"BUTTON_UPDATE_CONTACT": "تحديث",
 		"BUTTON_IMPORT": "إستيراد (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "تصدير كـ  (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "تصدير كـ  (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "لم يتم ايجاد جهة الإتصال",
 		"CLEAR_SEARCH": "إزالة البحث",
 		"CONTACT_VIEW_DESC": "حدد جهة إتصال من القائمة لكي يتم عرضها هنا",
-		"LABEL_PHONE": "رقم الهاتف",
-		"LABEL_WEB": "الموقع",
 		"LABEL_BIRTHDAY": "تاريخ الميلاد",
-		"LINK_ADD_EMAIL": "قم باضافة البريد الالكتروني",
-		"LINK_ADD_PHONE": "قم باضافة رقم الهاتف",
-		"LINK_BIRTHDAY": "تاريخ الميلاد",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "ادخل الاسم المعروض",
-		"PLACEHOLDER_ENTER_LAST_NAME": "ادخل اسم العائلة",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "ادخل الاسم",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ادخل اللقب",
+		"DISPLAY_NAME": "ادخل الاسم المعروض",
+		"LAST_NAME": "ادخل اسم العائلة",
+		"FIRST_NAME": "ادخل الاسم",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "ادخل اللقب",
 		"LABEL_READ_ONLY": "قراءة فقط",
-		"LABEL_SHARE": "مشاركة",
 		"ADD_MENU_LABEL": "اضافة",
 		"ADD_MENU_NICKNAME": "اللقب",
-		"ADD_MENU_NOTES": "الملاحظات",
+		"ADD_MENU_NOTE": "الملاحظات",
 		"ADD_MENU_PHONE": "الهاتف",
 		"ADD_MENU_URL": "الرابط",
 		"ADD_MENU_ADDRESS": "العنوان",
 		"ADD_MENU_BIRTHDAY": "تاريخ الميلاد",
 		"ADD_MENU_TAGS": "Tags",
 		"BUTTON_SHARE_ALL": "الجميع",
-		"BUTTON_SYNC": "المزامنة (CardDAV)"
+		"BUTTON_SYNC": "المزامنة (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "إظهار جميع الحقول",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "لايوجد مرفقات",
 		"ATTACHMENTS_ERROR_DESC": "تحذير! لم يتم إرفاق جميع المرفقات",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "لم تنتهي عملية الإرفاق بعد",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "اطلب اعلاماً بالقراءة",
 		"BUTTON_MARK_AS_IMPORTANT": "تحديده كـ هام",
-		"BUTTON_REQUEST_DSN": "اطلب اعلاماً بايصال البريد"
+		"BUTTON_REQUEST_DSN": "اطلب اعلاماً بايصال البريد",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "نعم",
-		"BUTTON_NO": "لا",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "هل أنت متأكد من رغبتك باغلاق هذه النافذة؟",
 		"DESC_WANT_DELETE_MESSAGES": "هل أنت متأكد من رغبتك بحذف هذه الرسائل؟"
 	},
@@ -224,16 +271,16 @@
 		"TITLE_LANGUAGES": "حدّد لغتك"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "قم باضافة حساب؟",
+		"TITLE_ADD_ACCOUNT": "قم باضافة حساب",
 		"BUTTON_ADD_ACCOUNT": "إضافة",
-		"TITLE_UPDATE_ACCOUNT": "تحديث الحساب؟",
-		"BUTTON_UPDATE_ACCOUNT": "تحديث"
+		"TITLE_UPDATE_ACCOUNT": "تحديث الحساب"
 	},
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "إضافة هوية؟",
 		"TITLE_UPDATE_IDENTITY": "تحديث الهوية؟",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "إضافة",
-		"BUTTON_UPDATE_IDENTITY": "تحديث",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "قم بوضع التوقيع قبل النص المأخوذ من الرسائل في عملية الرد"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "في حال بدء العملية , فلا يمكن ايقافها او الغائها",
 		"TITLE_CLEARING_PROCESS": "...يتم دمج المجلد"
 	},
+	"CRYPTO": {
+		"SIGN": "تسجيل",
+		"ENCRYPT": "تشفير",
+		"DECRYPT": "فك تشفير",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "توقيع جيد من  %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "OpenPGP استيراد مفتاح",
 		"POPUP_IMPORT_BUTTON": "استيراد",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "OpenPGP توليد مفتاح",
 		"POPUP_GENERATE_BUTTON": "قم بالتوليد",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "تسجيل",
-		"LABEL_ENCRYPT": "تشفير",
-		"BUTTON_DECRYPT": "فك تشفير",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP signed message",
 		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "توقيع جيد من  %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME signed message",
+		"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "إنشاء عامل تصفية؟",
-		"TITLE_EDIT_FILTER": "تحديث عامل التصفية؟",
+		"TITLE_CREATE_FILTER": "إنشاء عامل تصفية",
+		"TITLE_EDIT_FILTER": "تحديث عامل التصفية",
 		"LEGEND_CONDITIONS": "الشروط",
 		"LEGEND_ACTIONS": "التطبيقات",
 		"BUTTON_ADD_CONDITION": "إضافة تطبيق",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "تعليمها بـ مقروءة",
 		"REPLY_INTERVAL_LABEL": "فترة الرد (بلأيام)",
 		"KEEP_LABEL": "الإحتفاظ بها",
-		"STOP_LABEL": "لاتتوقف عن المعالجة بالشروط",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "الموضوع (خياري)",
 		"VACATION_MESSAGE_LABEL": "الرسالة",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "حدث خطأ نتيجة إضافة ملف غير معروف النوع"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "الشخصي",
-		"LABEL_GENERAL_NAME": "العام",
-		"LABEL_CONTACTS_NAME": "جهات الإتصال",
-		"LABEL_FOLDERS_NAME": "المجلدات",
-		"LABEL_ACCOUNTS_NAME": "الحسابات",
-		"LABEL_FILTERS_NAME": "عوامل التصفية",
-		"LABEL_SECURITY_NAME": "الأمان",
-		"LABEL_THEMES_NAME": "المظاهر العامة"
+		"GENERAL": "العام",
+		"CONTACTS": "جهات الإتصال",
+		"FOLDERS": "المجلدات",
+		"ACCOUNTS": "الحسابات",
+		"FILTERS": "عوامل التصفية",
+		"SECURITY": "الأمان",
+		"THEMES": "المظاهر العامة"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "عوامل التصفية",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "\"%FOLDER%\" نقل الى",
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\" إعادة توجيه الى",
 		"SUBNAME_REJECT": "رفض",
 		"SUBNAME_VACATION_MESSAGE": "رسالة العطلة",
-		"SUBNAME_DISCARD": "تجاهل",
-		"LOADING_PROCESS": "تحديث قائمة عوامل التصفية"
+		"SUBNAME_DISCARD": "تجاهل"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "الأمان",
 		"LABEL_AUTOLOGOUT": "تسجيل الخروج التلقائي",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "أبداَ",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% دقيقة",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "أبداَ"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "عام",
-		"LABEL_LANGUAGE": "اللغة",
-		"LABEL_IDENTITY": "الهوية",
-		"LABEL_LAYOUT": "التصميم",
-		"LABEL_LAYOUT_NO_SPLIT": "بدون إنقسام",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
-		"LABEL_EDITOR": "المحرر النصي الأساسي",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "عادي",
-		"LABEL_EDITOR_HTML_FORCED": "Html (إجباري)",
-		"LABEL_EDITOR_PLAIN_FORCED": "عادي (إجباري)",
-		"LABEL_VIEW_OPTIONS": "إظهار الخيارات",
-		"LABEL_USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة",
-		"LABEL_USE_THREADS": "إستخدام المواضيع",
-		"LABEL_REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
-		"LABEL_SHOW_IMAGES": "قم دائماَ بعرض الصور القادمة في الرسالة",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "الرسائل في الصفحة",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "اللغة",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "الهوية",
+		"LAYOUT": "التصميم",
+		"LAYOUT_NO_SPLIT": "بدون إنقسام",
+		"LAYOUT_VERTICAL_SPLIT": "إنقسام عمودي",
+		"LAYOUT_HORIZONTAL_SPLIT": "إنقسام أفقي",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "المحرر النصي الأساسي",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "عادي",
+		"VIEW_OPTIONS": "إظهار الخيارات",
+		"USE_PREVIEW_PANE": "استخدام جزئية العرض الجانبي",
+		"HIDE_DELETED_MESSAGES": "إخفاء الرسائل المحددة للحذف",
+		"USE_CHECKBOXES_IN_LIST": "عرض مربعات التحديد في القائمة",
+		"USE_THREADS": "إستخدام المواضيع",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "ضع الردود في مجلد الرسالة التي يتم الرد عليها",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "الرسائل في الصفحة",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "التنبيهات",
-		"LABEL_SOUND_NOTIFICATION": "صوت التنبيهات",
-		"LABEL_CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "التنبيهات",
+		"SOUND_NOTIFICATION": "صوت التنبيهات",
+		"CHROME_NOTIFICATION_DESC": "إظهار نافذة منبثقة في حالة قدوم ايميل جديد",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(تم إعتراضها من قبل المتصفح)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "قم باضافة المستلمين تلقائيا الى دفتر العناوين",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "المخدم",
 		"LABEL_CONTACTS_SYNC_AB_URL": "وصلة دفتر العناوين",
 		"LABEL_CONTACTS_SYNC_USER": "المستخدم",
-		"SYNC_NO": "لا",
-		"SYNC_YES": "نعم",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "المظاهر العامة",
-		"LEGEND_THEMES_CUSTOM": "تجهيز المظهر المخصص",
-		"LABEL_CUSTOM_TYPE": "النوع",
-		"LABEL_CUSTOM_TYPE_LIGHT": "فاتح",
-		"LABEL_CUSTOM_TYPE_DARK": "غامق",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "الخلفية",
+		"LABEL_BACKGROUND": "الخلفية",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "(JPG, PNG)حمل صورة الخلفية",
 		"ERROR_FILE_IS_TOO_BIG": "حجم الملف كبير جداً",
 		"ERROR_FILE_TYPE_ERROR": "مسموحة فقط(JPG,PNG)نوع الملف خطأ",
@@ -437,6 +542,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "إخفاء\\إظهار المجلد",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "تأكد\\لاتتأكد من وصول ايميلات جديدة",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "قم باضافة حساب",
 		"BUTTON_ADD_IDENTITY": "قم باضافة هوية",
 		"LOADING_PROCESS": "..جاري التحميل",
-		"DEFAULT_IDENTITY_LABEL": "الافتراضي"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": " إستيراد مفتاح",
 		"BUTTON_GENERATE_KEY_PAIR": " توليد مفتاح",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "خاص",
 		"TITLE_PUBLIC": "عام",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "الرد للجميع",
 		"LABEL_FORWARD": "إعادة التوجيه",
 		"LABEL_FORWARD_MULTIPLY": "إعادة التوجيه كملف مرفق",
-		"LABEL_HELP": "المساعدة",
 		"LABEL_CHECK_ALL": "تحديد جميع الرسائل",
 		"LABEL_DELETE": "حذف",
 		"LABEL_OPEN_THREAD": "فتح المواضيع المحددة",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "إقتباس الرسائل",
 		"LABEL_THREAD_NEXT": "الرسالة التالية في الموضوع",
 		"LABEL_THREAD_PREV": "الرسالة السابقة من الموضوع",
-		"LABEL_PRINT": "طباعة",
 		"LABEL_EXIT_FULLSCREEN": "الخروج من وضع ملء الشاشة",
 		"LABEL_CLOSE_MESSAGE": "إغلاق الرسالة (بدون نافذة العرض)",
 		"LABEL_SWITCH_TO_LIST": "تحويل التركيز الى قائمة الرسائل",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "إغلاق الرسالة"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "خاطىء token",
-		"AUTH_ERROR": "خطأ في كلمة السر \\اسم المستخدم",
-		"CONNECTION_ERROR": "لايمكن الإتصال بالمخدم",
-		"DOMAIN_ALREADY_EXISTS": "الموقع موجود مسبقاَ",
-		"DOMAIN_NOT_ALLOWED": "غير مسموح لهذا الموقع",
-		"ACCOUNT_NOT_ALLOWED": "الحساب غير مسموح له",
-		"CONTACTS_SYNC_ERROR": "خطأ في مزامنة جهات الإتصال",
-		"CANT_GET_MESSAGE_LIST": "لايمكن الوصول الى قائمة الرسائل",
-		"CANT_GET_MESSAGE": "لايمكن الوصول الى الرسالة",
-		"CANT_DELETE_MESSAGE": "لايمكن حذف الرسالة",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "لايمكن نقل الرسالة",
-		"CANT_SAVE_MESSAGE": "لايمكن حفظ الرسالة",
-		"CANT_SEND_MESSAGE": "لايمكن إرسال الرسالة",
-		"INVALID_RECIPIENTS": "يرجى التأكد من عناوين المرسل اليهم",
-		"CANT_SAVE_FILTERS": "لايمكن حفظ عامل التصفية",
-		"CANT_GET_FILTERS": "لايمكن الوصول الى عوامل التصفية",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "عوامل التصفية خطأ",
-		"CANT_CREATE_FOLDER": "لايمكن إنشاء مجلد",
-		"CANT_RENAME_FOLDER": "لايمكن إعادة تسمية المجلد",
-		"CANT_DELETE_FOLDER": "لايمكن حذف المجلد",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "لايمكن حذف مجلد ممتلأ",
-		"CANT_SUBSCRIBE_FOLDER": "لايمكن الإشتراك بالمجلد",
-		"CANT_UNSUBSCRIBE_FOLDER": "لايمكن حذف الإشتراك من المجلد",
-		"DEMO_SEND_MESSAGE_ERROR": "لأسباب أمنية, هذا الحساب غير مسموح له إرسال رسائل",
-		"DEMO_ACCOUNT_ERROR": "لأسباب أمنية , هذا الحساب قد منع من هذا الإجراء",
-		"ACCOUNT_ALREADY_EXISTS": "الحساب موجود مسبقاَ",
-		"ACCOUNT_DOES_NOT_EXIST": "الحساب المطلوب غير موجود",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "حدث خطأ أثناء محاولة الوصول الى المخدم البريدي",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "خطأ غير معروف"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "خاطىء token",
+		"AuthError": "خطأ في كلمة السر \\اسم المستخدم",
+		"ConnectionError": "لايمكن الإتصال بالمخدم",
+		"DomainAlreadyExists": "الموقع موجود مسبقاَ",
+		"DomainNotAllowed": "غير مسموح لهذا الموقع",
+		"AccountNotAllowed": "الحساب غير مسموح له",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "خطأ في مزامنة جهات الإتصال",
+		"CantGetMessageList": "لايمكن الوصول الى قائمة الرسائل",
+		"CantGetMessage": "لايمكن الوصول الى الرسالة",
+		"CantDeleteMessage": "لايمكن حذف الرسالة",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "لايمكن نقل الرسالة",
+		"CantSaveMessage": "لايمكن حفظ الرسالة",
+		"CantSendMessage": "لايمكن إرسال الرسالة",
+		"InvalidRecipients": "يرجى التأكد من عناوين المرسل اليهم",
+		"CantSaveFilters": "لايمكن حفظ عامل التصفية",
+		"CantGetFilters": "لايمكن الوصول الى عوامل التصفية",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "عوامل التصفية خطأ",
+		"CantCreateFolder": "لايمكن إنشاء مجلد",
+		"CantRenameFolder": "لايمكن إعادة تسمية المجلد",
+		"CantDeleteFolder": "لايمكن حذف المجلد",
+		"CantDeleteNonEmptyFolder": "لايمكن حذف مجلد ممتلأ",
+		"CantSubscribeFolder": "لايمكن الإشتراك بالمجلد",
+		"CantUnsubscribeFolder": "لايمكن حذف الإشتراك من المجلد",
+		"DemoSendMessageError": "لأسباب أمنية, هذا الحساب غير مسموح له إرسال رسائل",
+		"DemoAccountError": "لأسباب أمنية , هذا الحساب قد منع من هذا الإجراء",
+		"AccountAlreadyExists": "الحساب موجود مسبقاَ",
+		"AccountDoesNotExist": "الحساب المطلوب غير موجود",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "حدث خطأ أثناء محاولة الوصول الى المخدم البريدي",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "خطأ غير معروف"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/be/admin.json b/snappymail/v/0.0.0/app/localization/be/admin.json
new file mode 100644
index 000000000..d27d7b708
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/be/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Дадаць",
+		"CLOSE": "Закрыть",
+		"SAVE": "Захаваць",
+		"TEST": "Тэст",
+		"UPDATE": "Абнавіць",
+		"USERNAME": "Імя карыстальніка",
+		"PASSWORD": "Пароль",
+		"CANCEL": "Адмяніць",
+		"SEARCH": "Пошук",
+		"YES": "Так",
+		"NO": "Не"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Логін",
+		"LABEL_TOTP": "Код TOTP",
+		"BUTTON_LOGIN": "Увайсці ў панэль адміністратара"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Панэль кіравання адміністратара"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Асноўныя",
+		"LOGIN": "Логін",
+		"BRANDING": "Брэндынг",
+		"CONTACTS": "Кантакты",
+		"DOMAINS": "Дамены",
+		"SECURITY": "Бяспека",
+		"PACKAGES": "Пакеты",
+		"CONFIG": "Файл канфігурацыі",
+		"ABOUT": "Аб Праграме"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Інтэрфейс",
+		"LABEL_LANGUAGE": "Мова",
+		"LABEL_LANGUAGE_ADMIN": "Мова (Панэлі Адміністратара)",
+		"LABEL_THEME": "Тэмы",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Дазволіць выбар мовы на экране налад",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Дазволіць выбар тэмы на экране налад",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Дазволіць выбар фону на экране налад",
+		"LABEL_SHOW_THUMBNAILS": "Показваць мініяцюры (для ўкладанняў)",
+		"LEGEND_MAIN": "Асноўнае",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Найбольшы памер укладанняў",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Дазволіць дадатковыя акаўнты",
+		"LABEL_ALLOW_IDENTITIES": "Дазволіць множныя профілі",
+		"ALERT_DATA_ACCESS": "Каталог дадзеных SnappyMail доступны для чытання. Калі ласка, наладзьце свой вэб-сервер каб забараніць знешні доступ да каталогу дадзеных. Падрабязней тут:",
+		"ALERT_WARNING": "Увага!",
+		"HTML_ALERT_WEAK_PASSWORD": "Вы выкарыстоўваеце пароль адміністратара па змаўчанні.\n<br>\nПа меркаваннях бяспекі, калі ласка,\n<strong><a href=\"#\/security\">змяніце пароль<\/a><\/strong> прама зараз.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Старонка ўваходу",
+		"LABEL_DEFAULT_DOMAIN": "Асноўны дамен",
+		"LABEL_DETERMINE_USER_DOMAIN": "Спрабаваць вызначыць дамен карыстальніка",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Дазволіць выбар мовы на старонцы ўваходу",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Спрабаваць вызначыць мову карыстальніка"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Брэндынг",
+		"LABEL_PAGE_TITLE": "Назва старонкі",
+		"LABEL_LOADING_DESCRIPTION": "Апісанне пры загрузцы",
+		"LABEL_FAVICON_URL": "Значок (favicon)"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Кантакты",
+		"LEGEND_STORAGE": "Сховішча (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Уключыць кантакты",
+		"LABEL_ALLOW_SYNC": "Дазволіць сінхранізацыю кантактаў (са знешнім CardDAV серверам)",
+		"LABEL_STORAGE_TYPE": "Тым",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Карыстальнік",
+		"LABEL_STORAGE_PASSWORD": "Пароль",
+		"SQLITE_GLOBAL": "Выкарыстоўваць глабальную базу дадзеных замест асобнай базы для кожнага карыстальніка",
+		"ALERT_NOTICE": "Увага!",
+		"SUGGESTIONS_LIMIT": "Ліміт прапаноў",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Не выкарыстаўвайце гэты тып базы дадзеных з вялікаю колькасцю актыўных карыстальнікаў",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ваша сістэма не падтрымлівае кантакты.\n<br>\nВам неабходна ўсталяваць альбо ўключыць дадаткі <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> на вашым серверы.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Дамены",
+		"BUTTON_ADD_DOMAIN": "Дадаць дамен",
+		"BUTTON_ADD_ALIAS": "Дадаць псеўданім",
+		"DELETE_ARE_YOU_SURE": "Вы ўпэўнены?",
+		"HTML_DOMAINS_HELPER": "Спіс даменаў да якіх дазволены доступ.\n<br>\nНацісніце на імя, каб наладзіць дамен.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Бяспека",
+		"LABEL_USE_IMAGE_PROXY": "Выкарыстоўваць лакальны проксі для знешніх выяў",
+		"LABEL_AUTO_VERIFY": "Правяраць подпісы аўтаматычна",
+		"LABEL_SHOW_PHP_INFO": "Паказаць інфармацыю PHP",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Уліковыя дадзеныя для доступа да панэлі адміністратара",
+		"LABEL_CURRENT_PASSWORD": "Бягучы пароль",
+		"LABEL_NEW_PASSWORD": "Новы пароль",
+		"LABEL_REPEAT_PASSWORD": "Паўтарыць пароль",
+		"LABEL_REQUIRE_VERIFICATION": "Патрабаваць праверку SSL сертыфіката да",
+		"CRYPTO": "Шыфраванне",
+		"LABEL_ALLOW_SELF_SIGNED": "Дазволіць самападпісаныя сертыфікаты"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Уключыць убудовы",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Даступна для абнаўлення",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Даступна для ўсталёўкі",
+		"LEGEND_INSTALLED_PACKAGES": "Усталяваныя пакеты",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Не ўдаецца атрымаць доступ да сховішча пакетаў у дадзены момант."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Аб праграме",
+		"LABEL_TAG_HINT": "Просты, сучасны і хуткі вэб-кліент электроннай пошты\n",
+		"LABEL_ALL_RIGHTS_RESERVED": "Усе правы абаронены.",
+		"HINT_READ_CHANGE_LOG": "Калі ласка, азнаёмцеся са зменамі перад абнаўленнем.\n",
+		"HINT_IS_UP_TO_DATE": "Версія SnappyMail актуальная.",
+		"HTML_NEW_VERSION": "Новая <b>%VERSION%<\/b> версія даступная.",
+		"LABEL_UPDATING": "Абнаўленне",
+		"LABEL_CHECKING": "Праверка",
+		"BUTTON_RELEASES": "Выпускі"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Дадаць псеўданім",
+		"LABEL_ALIAS": "Псеўданім",
+		"LABEL_DOMAIN": "Дамен"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Дадаць дамен",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Дадаць дамен \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Рэдагаваць дамен \"%NAME%\"",
+		"LABEL_NAME": "Імя",
+		"NAME_HELPER": "шаблоны падтрымліваюцца",
+		"LABEL_SERVER": "Сервер",
+		"LABEL_PORT": "Порт",
+		"LABEL_SECURE": "Бяспека",
+		"TIMEOUT": "Тайм-аўт",
+		"DISABLE_CAPABILITIES": "Адключыць функцыі",
+		"LIMITS": "Ліміты",
+		"FOLDERS": "Каталогі",
+		"MESSAGES": "Паведамленні",
+		"SECURE_OPTION_NONE": "Не",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Дазволіць сцэнары Sieve",
+		"LABEL_USE_SHORT_LOGIN": "Выкарыстоўваць кароткі логін",
+		"LABEL_LOWERCASE_LOGIN": "Логін у малым рэгістры (неадчувальны да рэгістру)",
+		"LABEL_USE_AUTH": "Выкарыстоўваць аўтэнтыфікацыю",
+		"LABEL_SET_SENDER": "Выкарыстоўваць логін у якасці адпраўшчыка",
+		"LABEL_AUTH_PLAIN_LINE": "Прымусовы ўваход камандаю AUTH PLAIN",
+		"LABEL_USE_PHP_MAIL": "Выкарыстоўваць функцыю mail()",
+		"BUTTON_WHITE_LIST": "Белы спіс",
+		"NEW_DOMAIN_DESC": "Гэтая канфігурацыя дазволіць вам працаваць з <strong>%NAME%<\/strong> адрасамі.",
+		"WHITE_LIST_ALERT": "Спіс карыстальнікаў дамена да якіх дазволены доступ.\nВыкарыстоўвайце прабел у якасці раздзяляльніка.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Убудова",
+		"DESC_NOTHING_TO_CONFIGURE": "Без налад"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы ўпэнены, што жадаеце закрыць гэтае вакно?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Выберыце мову"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Увага!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Дамен ужо існуе",
+		"UNKNOWN_ERROR": "Невядомая памылка"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Запыт не выкананы",
+		"RequestAborted": "Запыт перарваны",
+		"RequestTimeout": "Скончыўся час запыту",
+		"InvalidToken": "Няправільны токен запыту",
+		"AuthError": "Не атрымалася аўтарызавацца",
+		"DomainAlreadyExists": "Дамен ужо існуе",
+		"CantSavePluginSettings": "Не магу захаваць налады",
+		"CantInstallPackage": "Памылка ўсталёўкі ўбудовы",
+		"CantDeletePackage": "Памылка выдалення ўбудовы",
+		"InvalidPluginPackage": "Памылка пакета ўбудовы",
+		"UnsupportedPluginPackage": "Для працы пакету патрэбна поўная падтрымка сервера",
+		"UnknownError": "Невядомая памылка"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/be/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/be/relativetimeformat.js
new file mode 100644
index 000000000..3f0a6683c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/be/relativetimeformat.js
@@ -0,0 +1,87 @@
+{
+	year: {
+		past: {
+			one: "{0} год таму",
+			many: "{0} год таму",
+			other: "{0} гады таму"
+		},
+		future: {
+			one: "праз {0} год",
+			many: "праз {0} год",
+			other: "праз {0} гады"
+		}
+	},
+	month: {
+		past: {
+			one: "{0} месяц таму",
+			many: "{0} месяцаў таму",
+			other: "{0} месяцы таму"
+		},
+		future: {
+			one: "праз {0} месяц",
+			many: "праз {0} месяцаў",
+			other: "праз {0} месяцы"
+		}
+	},
+	week: {
+		past: {
+			one: "{0} тыдзень таму",
+			many: "{0} тыдняў таму",
+			other: "{0} тыдні таму"
+		},
+		future: {
+			one: "праз {0} тыдзень",
+			many: "праз {0} тыдняў",
+			other: "праз {0} тыдні"
+		}
+	},
+	day: {
+		past: {
+			one: "{0} дзень таму",
+			many: "{0} дзён таму",
+			other: "{0} дні таму"
+		},
+		future: {
+			one: "праз {0} дзень",
+			many: "праз {0} дзён",
+			other: "праз {0} дні"
+		}
+	},
+	hour: {
+		past: {
+			one: "{0} гадзіну таму",
+			many: "{0} гадзін таму",
+			other: "{0} гадзіны таму"
+		},
+		future: {
+			one: "праз {0} гадзіну",
+			many: "праз {0} гадзін",
+			other: "праз {0} гадзіны"
+		}
+	},
+	minute: {
+		past: {
+			one: "{0} хвіліну таму",
+			many: "{0} хвілін таму",
+			other: "{0} хвіліны таму"
+		},
+		future: {
+			one: "праз {0} хвіліну",
+			many: "праз {0} хвілін",
+			other: "праз {0} хвіліны"
+		}
+	},
+	second: {
+		past: {
+			one: "{0} секунду таму",
+			many: "{0} секунд таму",
+			other: "{0} секунды таму"
+		},
+		future: {
+			one: "праз {0} секунду",
+			many: "праз {0} секунд",
+			other: "праз {0} секунды"
+		}
+	},
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/be/static.json b/snappymail/v/0.0.0/app/localization/be/static.json
new file mode 100644
index 000000000..d4837c1b4
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/be/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Абнавіць",
+	"NO_SCRIPT_TITLE": "Для працы праграмы неабходны JavaScript.",
+	"NO_SCRIPT_DESC": "Відавочна, JavaScript альбо не патрымліваецца вашым браўзэрам, альбо адключаны.\nУключыце JavaScript, змяніўшы налады браўзэру, затым паспрабуйце знову.\n",
+	"NO_COOKIE_TITLE": "Для працы праграмы неабходны Cookie.",
+	"NO_COOKIE_DESC": "Відавочна, Cookie альбо не падтрымліваюцца вашым браўзэрам, альбо адключаны.\nУключыце Cookie, змяніўшы налады браўзэру, затым паспрабуйце знову.\n",
+	"BAD_BROWSER_TITLE": "Ваш браўзэр састарэлы.",
+	"BAD_BROWSER_DESC": "Каб выкарыстоўваць усе магчымасці праграмы,\nспампуйце і ўсталюйце адзін з гэтых браўзэраў\n"
+}
diff --git a/snappymail/v/0.0.0/app/localization/be/user.json b/snappymail/v/0.0.0/app/localization/be/user.json
new file mode 100644
index 000000000..9ea86d14c
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/be/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "У архіў",
+		"ARE_YOU_SURE": "Вы ўпэўненыя?",
+		"BACK": "Назад",
+		"BCC": "Схаваная",
+		"CANCEL": "Адмяніць",
+		"CC": "Копія",
+		"CLEAR": "Ачысціць",
+		"CLOSE": "Закрыць (Esc)",
+		"CONTACTS": "Кантакты",
+		"DELETE": "Выдаліць",
+		"UNDELETE": "Undelete",
+		"DONE": "Завяршыць",
+		"EMAIL": "Пошта",
+		"FROM": "Ад",
+		"LOADING": "Загрузка...",
+		"LOGOUT": "Выйсці",
+		"MORE": "Яшчэ",
+		"MOVE_TO": "Перамясціць у",
+		"COPY_TO": "Скапіраваць у",
+		"NAME": "Імя",
+		"NONE": "Нічога",
+		"TO_SPAM": "Перамясціць паведамленне(-і) у Спам",
+		"NOT_SPAM": "Не спам",
+		"USERNAME": "Імя карыстальніка",
+		"PASSWORD": "Пароль",
+		"REMEMBER": "Запомніць",
+		"REPLY_TO": "Адказаць-на",
+		"SAVE": "Захаваць",
+		"SAVE_CHANGES": "Захаваць змены?",
+		"SEARCH": "Пошук",
+		"SPAM": "У спам",
+		"SUBJECT": "Тэма",
+		"TEST": "Тэст",
+		"TO": "Да каго",
+		"SERVER_MESSAGE": "Паведамленне серверу",
+		"YES": "Так",
+		"NO": "Не",
+		"INACTIVE": "Неактыўна",
+		"DEFAULT": "Па змаўчанні",
+		"HELP": "Дапамога",
+		"TEXT": "Тэкст",
+		"ATTACHMENTS": "Файлы"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Логін",
+		"LABEL_SIGN_ME": "Запомніць мяне",
+		"BUTTON_SIGN_IN": "Увайсці"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Дадаць яшчэ рахунак"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Пашыраны пошук лістоў",
+		"TEXT": "Тэкст",
+		"HAS_ATTACHMENT": "З файламі",
+		"FLAGGED": "Пазначаныя",
+		"UNSEEN": "Непрачытаныя",
+		"DATE": "Дата",
+		"DATE_ALL": "За ўвесь час",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "За тры дні",
+		"SINCE_7_DAYS": "За тыдзень",
+		"SINCE_MONTH": "За месяц",
+		"SINCE_3_MONTHS": "За 3 месяцы",
+		"SINCE_6_MONTHS": "За паўгода",
+		"SINCE_YEAR": "За год",
+		"SUBFOLDERS": "Падкаталогі",
+		"SUBFOLDERS_NONE": "Нічога",
+		"SUBFOLDERS_SUBTREE": "Усе",
+		"SUBFOLDERS_SUBTREE_ONE": "Одзін узровень",
+		"REPLIED": "Адказаў",
+		"KEYWORD": "Ключавое слова"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Напісаць",
+		"BUTTON_NEW_MESSAGE": "Новае паведамленне",
+		"INBOX_NAME": "Уваходзячыя",
+		"SENT_NAME": "Адпраўленыя",
+		"DRAFTS_NAME": "Чарнавікі",
+		"TRASH_NAME": "Сметніца",
+		"ARCHIVE_NAME": "Архіў"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Абнавіць Спіс Лістоў",
+		"BUTTON_EMPTY_FOLDER": "Ачысціць увесь каталог",
+		"BUTTON_MULTY_FORWARD": "Пераслаць паведамленні",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Выдаліць міма сметніцы",
+		"MENU_SET_SEEN": "Адзначыць як прачытанае",
+		"MENU_SET_ALL_SEEN": "Адзначыць усе як прачытаныя",
+		"MENU_UNSET_SEEN": "Адмеціць як непрачытанае",
+		"MENU_SET_FLAG": "Усталяваць сцяжок",
+		"MENU_UNSET_FLAG": "Зняць сцяжок",
+		"MENU_SELECT_ALL": "Выбраць усе",
+		"MENU_SELECT_INVERT": "Інвертаваць",
+		"MENU_SELECT_UNSEEN": "Непрачытаныя",
+		"MENU_SELECT_SEEN": "Прачытаныя",
+		"MENU_SELECT_FLAGGED": "Пазначаныя",
+		"MENU_SELECT_UNFLAGGED": "Без пазнак",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Спампаваць усе ўкладанні",
+		"EMPTY_LIST": "У каталогу няма лістоў.",
+		"EMPTY_SEARCH_LIST": "Лісты ня знойдзены.",
+		"SEARCH_RESULT_FOR": "Вынік пошука \"%SEARCH%\"",
+		"BACK_TO_MESSAGE_LIST": "Вярнуцца да спісу лістоў",
+		"PUT_MESSAGE_HERE": "Кіньце паведамленне сюды, каб праглядзець яго ў спісе",
+		"TODAY_AT": "сёння ў %TIME%",
+		"YESTERDAY_AT": "учора ў %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% новых паведамленняў!",
+		"QUOTA_SIZE": "Выкарыстана <strong>%SIZE% (%PROC%%)<\/strong> з <strong>%LIMIT%<\/strong>",
+		"SORT": "Сартаванне",
+		"NO_SORT": "Паштовы сервер не падтрымлівае сартаванне",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "Дата па ўзрастанні",
+		"SORT_DATE_DESC": "Дата па спаданні",
+		"SORT_SIZE_ASC": "Памер па ўзрастанні",
+		"SORT_SIZE_DESC": "Памер па спаданні",
+		"SORT_SUBJECT_ASC": "Тэма А-Я",
+		"SORT_SUBJECT_DESC": "Тэма Я-А",
+		"SORT_FROM_ASC": "Ад А-Я",
+		"SORT_FROM_DESC": "Ад Я-А"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Рэдагаваць",
+		"BUTTON_UNSUBSCRIBE": "Адпісацца",
+		"BUTTON_REPLY": "Адказаць на Ліст",
+		"BUTTON_REPLY_ALL": "Адказаць Усім",
+		"BUTTON_FORWARD": "Переслаць",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Пераслаць як файл",
+		"BUTTON_EDIT_AS_NEW": "Рэдагаваць як новае",
+		"BUTTON_SHOW_IMAGES": "Паказаць знешнія выявы ў лісце",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Апавясціць адпраўніка аб чытанні гэтага паведамлення",
+		"BUTTON_IN_NEW_WINDOW": "У асобным вакне",
+		"BUTTON_THREAD_LIST": "Спіс",
+		"BUTTON_THREAD_PREV": "Папярэднія",
+		"BUTTON_THREAD_NEXT": "Наступнае",
+		"BUTTON_THREAD_MORE": "Больш паведамленняў",
+		"MENU_HEADERS": "Праглядзець загалоўкі",
+		"MENU_VIEW_ORIGINAL": "Прашлядзець арыгінал",
+		"HTML_VIEW": "Прагляд паведамлення ў HTML",
+		"PLAIN_VIEW": "Прагляд простага тэкставага паведамлення",
+		"SWAP_COLORS": "Памяняць колер (фону) па змаўчанні",
+		"MENU_DOWNLOAD_ORIGINAL": "Спампаваць як .eml файл",
+		"MENU_FILTER_SIMILAR": "Фільтраваць падобныя",
+		"MENU_PRINT": "Надрукаваць",
+		"EMPTY_SUBJECT_TEXT": "(Без тэмы)",
+		"LABEL_DATE": "Дата",
+		"LABEL_FROM_SHORT": "Ад",
+		"LABEL_TO_SHORT": "Да каго",
+		"PRINT_LABEL_ATTACHMENTS": "Файлы",
+		"MESSAGE_VIEW_DESC": "Выберыце паведамленні да прагляду.",
+		"MESSAGE_VIEW_MOVE_DESC": "Выберыце імя каталогу ў левай панэлі, каб перамясціць паведамленне.",
+		"LINK_DOWNLOAD_AS_ZIP": "Захаваць як zip",
+		"SPAM_SCORE": "Ацэнка спаму",
+		"HAS_VIRUS_WARNING": "УВАГА: Выяўлены вірус!",
+		"TAGS": "Меткі",
+		"NEW_TAG": "Новая метка",
+		"ENABLE_TRACKING_LINKS": "Уключыць спасылкі для адсочвання",
+		"TRACKING_ENABLED": "Спысылкі цяпер адсочваюцца пры націску!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Важлівае",
+		"$todo": "Зрабіць",
+		"$label1": "Важлівае",
+		"$label2": "Праца",
+		"$label3": "Асабістае",
+		"$label4": "Зрабіць",
+		"$label5": "Пазней"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Апавяшчэнне аб чытанні ліста - %SUBJECT%",
+		"BODY": "Гэта апавяшчэнне аб чытанні для паведамлення, якое вы адправілі на адрас %READ-RECEIPT%.\n\nЗаўвага: Гэтае апявяшчэнне азначае толькі тое, што паведамленне было адлюстравана на прыладзе атрымальніка.\nЯно не гарантуе таго, што атрымальнік прачытаў ці зразумеў сэнс паведамлення.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Пошук..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Кантакт",
+		"TAB_LOCATIONS": "Месцазнаходжанне",
+		"TAB_BUSINESS": "Арганізацыя",
+		"LABEL_ORGANIZATION": "Кампанія",
+		"LABEL_DEPARTMENT": "Аддзел",
+		"LABEL_TITLE": "Назва",
+		"TAB_CRYPTO": "Шыфраванне",
+		"ASK": "Спытаць",
+		"NEVER": "Ніколі",
+		"ALWAYS": "Заўсёды",
+		"ALWAYS_IF_POSSIBLE": "Па магчымасці",
+		"BUTTON_ADD_CONTACT": "Дадаць кантакт",
+		"BUTTON_CREATE_CONTACT": "Захаваць",
+		"BUTTON_IMPORT": "Імпарт (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Экспарт (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Экспарт (csv)",
+		"ERROR_IMPORT_FILE": "Памылка імпарту (няправільны фармат файла)",
+		"EMPTY_LIST": "Няма кантактаў",
+		"EMPTY_SEARCH": "Контакты ня знойдзены",
+		"CLEAR_SEARCH": "Ачысціць пошук",
+		"CONTACT_VIEW_DESC": "Абярыце кантакт для прагляду.",
+		"LABEL_BIRTHDAY": "Дзень нараджэння",
+		"DISPLAY_NAME": "Поўнае імя",
+		"LAST_NAME": "Імя",
+		"FIRST_NAME": "Прозвішча",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Мянушку",
+		"LABEL_READ_ONLY": "Толькі чытанне",
+		"ADD_MENU_LABEL": "Дадаць",
+		"ADD_MENU_NICKNAME": "Мянушка",
+		"ADD_MENU_NOTE": "Заўвагі",
+		"ADD_MENU_PHONE": "Тэлефон",
+		"ADD_MENU_URL": "Сайт",
+		"ADD_MENU_ADDRESS": "Адрас",
+		"ADD_MENU_BIRTHDAY": "Дзень нараджэння",
+		"ADD_MENU_TAGS": "Меткі",
+		"BUTTON_SHARE_ALL": "Усім",
+		"BUTTON_SYNC": "Сінхранізацыя (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Адправіць на ўсе кантактныя адрасы электроннай пошты"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Паказаць усе палі",
+		"BUTTON_SEND": "Адпаравіць",
+		"BUTTON_MINIMIZE": "Згарнуць",
+		"SAVED_TIME": "Захавана ў %TIME%",
+		"SAVED_ERROR_ON_SEND": "Паведамленне было адпраўлена, але не было захавана",
+		"DISCARD_UNSAVED_DATA": "Выдаліць незахаваныя дадзеныя?",
+		"ATTACH_FILES": "Прымацаваць файлы",
+		"ATTACH_DROP_FILES_DESC": "Змясціце файлы сюды",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% напісаў",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Перасланае паведамленне -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Адпраўлена",
+		"EMPTY_TO_ERROR_DESC": "Укажыце як мінімум аднаго атрымальніка",
+		"NO_ATTACHMENTS_HERE_DESC": "Прымацаваныя файлы адсучнічаюць.",
+		"ATTACHMENTS_ERROR_DESC": "Увага! Не ўсе прымацаваныя файлы былі загружаны.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Не ўсе прымацаваныя файлы былі загружаны.",
+		"ALLOW_SPELLCHECK": "Уключыць праверку правапісу ў браўзэры",
+		"ALLOW_DRAFT_AUTOSAVE": "Аўтаматычна захоўваць чарнавік",
+		"BUTTON_REQUEST_READ_RECEIPT": "Запыт аб чытанні ліста",
+		"BUTTON_MARK_AS_IMPORTANT": "Адзначыць як важлівае",
+		"BUTTON_REQUEST_DSN": "Запытаць апавяшчэнне аб дастаўцы",
+		"BUTTON_REQUIRE_TLS": "Патрабаваць бяспечную дастаўку",
+		"ERROR_EMPTY_BODY": "Цела ліста адсутнічае"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Вы ўпэўненыя, што хочаце выйсці?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы ўпэўненыя, што хочаце зачыніць гэтае вакно?",
+		"DESC_WANT_DELETE_MESSAGES": "Вы ўпэўненыя, што хочаце выдаліць паведамленне(-і)?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Выберыце мову"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Дадаць яшчэ рахунак",
+		"BUTTON_ADD_ACCOUNT": "Дадаць",
+		"TITLE_UPDATE_ACCOUNT": "Абнавіць рахунак"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Дадаць Профіль",
+		"TITLE_UPDATE_IDENTITY": "Абнавіць Профіль",
+		"LABEL": "Метка",
+		"BUTTON_ADD_IDENTITY": "Дадаць",
+		"SIGNATURE": "Подпіс",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Выстаўляць подпіс перад цытаваннем тэксту ў адказах"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Стварыць каталог",
+		"LABEL_PARENT": "Бацькоўскі каталог",
+		"BUTTON_CREATE": "Стварыць",
+		"TITLE_CREATING_PROCESS": "Стварэнне каталогу"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Ачысціць каталог ад лістоў?",
+		"DANGER_DESC_WARNING": "Увага!",
+		"DANGER_DESC_HTML_1": "Дадзенае дзеянне прывядзе да поўнага выдалення ўсіх лістоў з каталогу <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_2": "Пасля пачатку ачысткі, працэс <strong style=\"color:red\">нельга<\/strong> будзе спыніць альбо адмяніць.",
+		"TITLE_CLEARING_PROCESS": "Ачыстка каталогу..."
+	},
+	"CRYPTO": {
+		"SIGN": "Подпіс",
+		"ENCRYPT": "Шыфраванне",
+		"DECRYPT": "Разшыфраваць",
+		"VERIFY": "Праверыць",
+		"GOOD_SIGNATURE": "Пацверджаная сігнатура для %USER%",
+		"ERROR": "%TYPE% памылка: %ERROR%",
+		"CREATE_SELF_SIGNED": "Стварыць самападпісаны",
+		"VALID_UNTIL": "Дзейнічае да",
+		"PRIVATE_KEY": "Прыватны ключ",
+		"CHANGE_PASS": "Змяніць фразу-пароль",
+		"CURRENT_PASS": "Бягучая фраза-пароль",
+		"NEW_PASS": "Новая фраза-пароль",
+		"ASK_CRYPTKEY_PASS": "Ваша парольная фраза зменена. Каб расшыфраваць дадзеныя, увядзіце стары пароль для ўваходу"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Імпарт OpenPGP ключа",
+		"POPUP_IMPORT_BUTTON": "Імпарт",
+		"POPUP_VIEW_TITLE": "Прагляд OpenPGP ключа",
+		"POPUP_VIEW_BUTTON": "Выбраць",
+		"POPUP_GENERATE_TITLE": "Генерацыя OpenPGP ключа",
+		"POPUP_GENERATE_BUTTON": "Стварыць",
+		"LABEL_KEY_TYPE": "Тып",
+		"SIGNED_MESSAGE": "Паведамленне падпісанае OpenPGP",
+		"ENCRYPTED_MESSAGE": "Паведамленне шыфраванае OpenPGP",
+		"STORE_IN_GNUPG": "Захоўваць на серверы ў GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Захоўваць публічны ключ не серверы ў GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Захоўваць прыватны ключ на серверы ў GnuPG",
+		"BACKUP_ON_SERVER": "Захоўваць (з выкарыстоўваннем шыфравання) на серверы",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Рэзервовая копія публічнага ключа на серверы",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Рэзервовая копія прыватнага ключа на серверы"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Імпартаваць S\/MIME сертыфікат",
+		"CERTIFICATE": "Сертыфікат",
+		"CERTIFICATES": "S\/MIME Сертыфікаты",
+		"SIGNED_MESSAGE": "паведамленне падпісанае S\/MIME",
+		"ENCRYPTED_MESSAGE": "паведамленне шыфраванае S\/MIME",
+		"PRIVATE_KEY_OF": "прыватны ключ S\/MIME паведамлення %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Стварыць фільтр",
+		"TITLE_EDIT_FILTER": "Абнавіць фільтр",
+		"LEGEND_CONDITIONS": "Правілы",
+		"LEGEND_ACTIONS": "Дзеянні",
+		"BUTTON_ADD_CONDITION": "Дадаць правіла",
+		"SELECT_ACTION_MOVE_TO": "Змясціць у",
+		"SELECT_ACTION_FORWARD_TO": "Пераслаць на",
+		"SELECT_ACTION_REJECT": "Не прыймаць",
+		"SELECT_ACTION_VACATION_MESSAGE": "Аўтаадказчык",
+		"SELECT_ACTION_DISCARD": "Знішчыць",
+		"SELECT_FIELD_RECIPIENTS": "Атрымальнікі (To альбо CC)",
+		"SELECT_FIELD_HEADER": "Загаловак",
+		"SELECT_FIELD_BODY": "Цела",
+		"SELECT_FIELD_SIZE": "Памер",
+		"SELECT_TYPE_CONTAINS": "Змяшчае",
+		"SELECT_TYPE_NOT_CONTAINS": "Не змяшчае",
+		"SELECT_TYPE_MATCHES": "Змяшчае (падтрымліваюцца * і ?)",
+		"SELECT_TYPE_NOT_MATCHES": "Не змяшчае (падтрымліваюцца * і ?)",
+		"SELECT_TYPE_REGEXP": "Regexp",
+		"SELECT_TYPE_NOT_REGEXP": "Не Regexp",
+		"SELECT_TYPE_EQUAL_TO": "Супадае з",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Не супадае з",
+		"SELECT_TYPE_OVER": "Больш",
+		"SELECT_TYPE_UNDER": "Меньш",
+		"SELECT_TYPE_TEXT": "Тэкст",
+		"SELECT_TYPE_RAW": "Неапрацаваныя дадзеныя",
+		"SELECT_MATCH_ANY": "Падыходзіць пад хаця б адно з ніжэйпералічаных правілаў",
+		"SELECT_MATCH_ALL": "Падыходзіць пад усе ніжэйпералічаныя правілы",
+		"MARK_AS_READ_LABEL": "Азначыць як прачытанае",
+		"REPLY_INTERVAL_LABEL": "Адказваць кожныя (у днях)",
+		"KEEP_LABEL": "Захаваць копію",
+		"STOP_LABEL": "Спыніць далейшую апрацоўку правілаў",
+		"VACATION_SUBJECT_LABEL": "Тэма (неабавязкова)",
+		"VACATION_MESSAGE_LABEL": "Паведамленне",
+		"VACATION_RECIPIENTS_LABEL": "Атрымальнікі (праз коску)",
+		"REJECT_MESSAGE_LABEL": "Прычына (будзе адаслана адпраўніку)",
+		"ALL_INCOMING_MESSAGES_DESC": "Усе ўваходныя паведамленні"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Стварыць сцэнар",
+		"TITLE_EDIT": "Редагаваць сцэнар",
+		"BUTTON_ADD_FILTER": "Дадаць фільтр",
+		"BUTTON_RAW_SCRIPT": "Выкарыстоўваць уласны сцэнар",
+		"CAPABILITY_LABEL": "Магчымасці",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Гэтыя змены неабходна захаваць на серверы."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Абярыце сістэмныя каталогі",
+		"SELECT_CHOOSE_ONE": "Яшчэ не абрана",
+		"SELECT_UNUSE_NAME": "Не выкарыстоўваць",
+		"NOTIFICATION_SENT": "Вы яшчэ не абралі сістэмны каталог \"Адпраўленыя\", у які будуць складвацца ўсе паведамленні пасля адпраўкі.\nКалі вы не жадаеце захоўваць адпраўленыя лісты, калі ласка, абярыце пункт \"Не выкарыстоўваць\".\n",
+		"NOTIFICATION_DRAFTS": "Вы яшчэ не абралі сістэмны каталог \"Чарнавікі\", у які будуць складвацца ўсе паведамленні ў працэсе стварэння.",
+		"NOTIFICATION_SPAM": "Вы яшчэ не абралі сістэмны каталог \"Спам\", у які будуць складвацца ўсе спам-паведамленні.\nКалі вы не жадаеце выдаляць спам-паведамленні ядразу, калі ласка, выберыце пункт \"Не выкарыстоўваць\".\n",
+		"NOTIFICATION_TRASH": "Вы яшчэ не абралі сістэмны каталог \"Выдаленыя\", у які будуць складвацца ўсе паведамленні пасля выдалення.\nКалі вы жадаеце выдаляць паведамленні адразу, калі ласка, выберыце пункт \"Не выкарыстоўваць\".\n",
+		"NOTIFICATION_ARCHIVE": "Вы яшчэ не абралі сістэмны каталог \"Архіў\", у які будуць складвацца ўсе паведамленні пасля архівацыі."
+	},
+	"TITLES": {
+		"MAILBOX": "Пошта",
+		"SETTINGS": "Налады"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Файл занадта вялікі",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Файл не запампаваўся поўнасцю",
+		"ERROR_NO_FILE_UPLOADED": "Файл не быў запампаваны",
+		"ERROR_MISSING_TEMP_FOLDER": "Памылка часовага файлу",
+		"ERROR_ON_SAVING_FILE": "Памылка пры захаванні файлу",
+		"ERROR_FILE_TYPE": "Няправільны тып файлу",
+		"ERROR_UNKNOWN": "Невядомая памылка пры запампоўцы файлу на сервер"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Сямейства шрыфтоў",
+		"FONTSIZE": "Памер шрыфта",
+		"DIR": "Напрамак тэксту",
+		"DIR_LTR": "З лева на права",
+		"DIR_RTL": "З права на лева",
+		"DIR_AUTO": "Аўтаматычна",
+		"TEXTCOLOR": "Колер тэксту",
+		"BACKGROUNDCOLOR": "Колер фону",
+		"BOLD": "Тлусты",
+		"ITALIC": "Курсіў",
+		"UNDERLINE": "Падкрэслены",
+		"STRIKE": "Закрэслены",
+		"SUB": "Падрадковы",
+		"SUP": "Надрадковы",
+		"OL": "Упарадкаваны спіс",
+		"UL": "Неўпарадкаваны спіс",
+		"QUOTE": "Цытата",
+		"INDENTDECREASE": "Паменшыць водступ",
+		"INDENTINCREASE": "Павяліцычь водступ",
+		"LINK": "Спасылка",
+		"IMAGEURL": "URL выявы",
+		"IMAGEUPLOAD": "Выбар выявы",
+		"UNDO": "Адмяніць",
+		"REDO": "Паўтарыць",
+		"REMOVESTYLE": "Выдаліць стыль"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Асноўныя",
+		"CONTACTS": "Кантакты",
+		"FOLDERS": "Каталогі",
+		"ACCOUNTS": "Рахункі",
+		"FILTERS": "Фільтры",
+		"SECURITY": "Бяспека",
+		"THEMES": "Тэмы"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Просты",
+		"ADVANCED": "Пашыраны",
+		"BUTTON_ADD_SCRIPT": "Дадаць Скрыпт",
+		"SUBNAME_MOVE_TO": "Перамясціць у \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Переслаць на \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Не прымаць",
+		"SUBNAME_VACATION_MESSAGE": "Паведамленне аўтаадказчыка",
+		"SUBNAME_DISCARD": "Знішчыць"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Бяспека",
+		"LABEL_AUTOLOGOUT": "Азтаматычны ўваход",
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Ніколі"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Мова",
+		"HOUR_FORMAT": "Фармат часу",
+		"IDENTITY": "Профіль",
+		"LAYOUT": "Размяшчэньне",
+		"LAYOUT_NO_SPLIT": "Адна панэль",
+		"LAYOUT_VERTICAL_SPLIT": "Вертыкальныя панэлі",
+		"LAYOUT_HORIZONTAL_SPLIT": "Гарызантальныя панэлі",
+		"SHOW_NEXT_MESSAGE": "Перайсці да наступнага паведамлення пасля выдалення\/перамяшчэння бягучага",
+		"EDITOR": "Рэдактар тексту па змаўчанні",
+		"EDITOR_HTML": "Фарматаваны",
+		"EDITOR_PLAIN": "Просты",
+		"VIEW_OPTIONS": "Адлюстраванне",
+		"USE_PREVIEW_PANE": "Выкарыстоўваць трохкалонкавы рэжым адлюстравання",
+		"HIDE_DELETED_MESSAGES": "Схаваць паведамленні, азначаныя для выдалення",
+		"USE_CHECKBOXES_IN_LIST": "Паказваць сцяжкі ў спісах",
+		"USE_THREADS": "Згортваць лісты ў перапісках",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Змяшчаць адказы ў той жа каталог, дзе знаходзіцца арыгінал",
+		"PREFER_HTML": "Аддаваць перавагу HTML замест звычайнага тэксту",
+		"PREFER_HTML_INFO": "Паведамленні часамі прыходзяць у абодвух фарматах. Гэты параметр вызначае, ці вы хочаце каб адлюстроўвалася HTML-частка ці звычайны тэкст.",
+		"REMOVE_COLORS": "Выдаліць колер фона і тэкста з цела паведамлення",
+		"ALLOW_STYLES": "Дазволіць <style> CSS",
+		"MESSAGE_PER_PAGE": "Паведамленняў на адной старонцы",
+		"CHECK_MAIL_INTERVAL": "Інтэрвал праверкі пошты",
+		"MARK_MESSAGE_READ_AFTER": "Азначыць паведамленне як прачытанае пасля",
+		"MSG_DEFAULT_ACTION": "Дзеянне па змаўчанні",
+		"SECONDS": "Секунд",
+		"MINUTES": "Хвілін",
+		"NOTIFICATIONS": "Паведамленні",
+		"SOUND_NOTIFICATION": "Гукавыя паведамленні",
+		"CHROME_NOTIFICATION_DESC": "Паказваць апавяшчэнні аб новых лістах вы ўсплываючых падказках",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблакавана браўзэрам)",
+		"COLLAPSE_BLOCKQUOTES": "Згортваць блок с працытаваным тэкстам",
+		"MAX_QUOTE_LEVEL": "Максімальны ўзровень адлюстравання працытаванага тэксту",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Паказваць укладанні ў спісе",
+		"LIST_SIMPLE_ATTACHMENTS": "Просты спіс укладанняў",
+		"LIST_MESSAGES_GROUPED": "Группаванне спісу паведамленняў (пры сартаванні по даце альбо адпраўніку)",
+		"EXTERNAL_IMAGES": "Знешнія выявы",
+		"IMAGES_OPTION_ASK": "Заўсёды запытваць",
+		"IMAGES_OPTION_WHITELIST": "Белы спіс альбо запытваць",
+		"IMAGES_OPTION_ALWAYS": "Показваць заўсёды",
+		"IMAGES_WHITELIST": "Фарматы з белага спісу",
+		"MESSAGE_POPUP_WINDOW": "Усплываючае вакно ў новым вакне замест карткі",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Аўтаматычна дадаваць атрымальнікаў лістоў у адрасную кнігу",
+		"LEGEND_CONTACTS_SYNC": "Сінхранізацыя (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Уключыць сінхранізацыю",
+		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Адрасная кніга (URL)",
+		"LABEL_CONTACTS_SYNC_USER": "Карыстальнік",
+		"SYNC_READ": "Толькі чытанне"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Тэмы Афармлення",
+		"LABEL_BACKGROUND": "Выява на фоне",
+		"LABEL_FONTS": "Шрыфты",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Запампаваць фонавую выяву (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Файл занадта вялікі",
+		"ERROR_FILE_TYPE_ERROR": "Няправільны тып файлу (толькі JPG ці PNG)",
+		"ERROR_UNKNOWN": "Невядомая памылка пры запампоўцы файлу"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Спіс Каталогаў",
+		"BUTTON_CREATE": "Стварыц Каталог",
+		"BUTTON_SYSTEM": "Сістэмныя каталогі",
+		"BUTTON_SUBSCRIBE": "Падпісацца",
+		"BUTTON_UNSUBSCRIBE": "Адпісацца",
+		"LOADING_PROCESS": "Абнаўленне спісу каталогаў",
+		"CREATING_PROCESS": "Стварэнне каталогу",
+		"DELETING_PROCESS": "Выдаленне каталогу",
+		"RENAMING_PROCESS": "Перайменаванне каталогу",
+		"TO_MANY_FOLDERS_DESC_1": "У вас занадта шмат каталогаў!",
+		"TO_MANY_FOLDERS_DESC_2": "Мы паказалі толькі частку з іх, каб пазбегнуць праблем з прадукцыйнасцю.",
+		"HELP_DELETE_FOLDER": "Выдаліць каталог",
+		"HELP_SHOW_HIDE_FOLDER": "Паказваць\/хаваць каталог",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Правяраць новыя паведамленні",
+		"HIDE_UNSUBSCRIBED": "Схаваць каталогі, на якія няма падпіскі",
+		"UNHIDE_KOLAB_FOLDERS": "Паказваць каталогі Kolab",
+		"TYPE_CALENDAR": "Каляндар",
+		"TYPE_CONFIGURATION": "Канфігурацыя",
+		"TYPE_CONTACTS": "Кантакты",
+		"TYPE_FILES": "Файлы",
+		"TYPE_JOURNAL": "Журнал",
+		"TYPE_NOTES": "Заўвагі",
+		"TYPE_TASKS": "Задачы"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Спіс Рахункаў",
+		"LEGEND_IDENTITIES": "Асобы",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Рахункі і асобы",
+		"BUTTON_ADD_ACCOUNT": "Дадаць рахунак",
+		"BUTTON_ADD_IDENTITY": "Дадаць асобу",
+		"LOADING_PROCESS": "Абнаўленне спісу рахункаў",
+		"SHOW_UNREAD": "Колькасць непрачытаных паведамленняў"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Імпартаваць ключ",
+		"BUTTON_GENERATE_KEY_PAIR": "Новы ключ",
+		"IMPORT_FROM_SERVER": "Імпартаваць з сервера",
+		"TITLE_PRIVATE": "Прыватны",
+		"TITLE_PUBLIC": "Публічны",
+		"GET_MAILVELOPE": "Атрымаць дадатак для браўзэру Mailvelope."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Спалучэнні клавішаў",
+		"TAB_MAILBOX": "Пошта",
+		"TAB_MESSAGE_LIST": "Спіс паведамленняў",
+		"TAB_MESSAGE_VIEW": "Прагляд паведамлення",
+		"TAB_COMPOSE": "Стварэнне ліста",
+		"LABEL_OPEN_USER_DROPDOWN": "Адкрыць карыстальніцкі выпадаючы спіс",
+		"LABEL_REPLY": "Одказаць",
+		"LABEL_REPLY_ALL": "Адказаць усім",
+		"LABEL_FORWARD": "Пераслаць",
+		"LABEL_FORWARD_MULTIPLY": "Пераслаць усе абраныя паведамленні",
+		"LABEL_CHECK_ALL": "Абраць усе паведамленні",
+		"LABEL_DELETE": "Выдаліць",
+		"LABEL_OPEN_THREAD": "Адкрыць абраную нітку",
+		"LABEL_MOVE": "Перамясціць",
+		"LABEL_READ": "Азначыць абраныя лісты прачытанымі",
+		"LABEL_UNREAD": "Азначыць абраныя лісты непрачытанымі",
+		"LABEL_IMPORTANT": "Азначыць абраныя лісты як важлівыя",
+		"LABEL_CANCEL_SEARCH": "Адмяніць пошук",
+		"LABEL_FULLSCREEN_ENTER": "Поўнаэкранны рэжым",
+		"LABEL_VIEW_MESSAGE_ENTER": "Прагляд паведамлення",
+		"LABEL_SWITCH_TO_MESSAGE": "Пераключыць фокус на абранае паведамленне",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Пераключыць фокус на спіс каталогаў",
+		"LABEL_FULLSCREEN_TOGGLE": "Пераключыць поўнаэкранны рэжым",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Пераключыць пачнасць цытат у лісце",
+		"LABEL_THREAD_NEXT": "Наступнае паведамленне ў ланцугу",
+		"LABEL_THREAD_PREV": "Папярэдняе паведамленне ў ланцугу",
+		"LABEL_EXIT_FULLSCREEN": "Выйсці з поўнаэкраннага рэжыму",
+		"LABEL_CLOSE_MESSAGE": "Закрыць паведамленне",
+		"LABEL_SWITCH_TO_LIST": "Пераключыць фокус на спіс лістоў",
+		"LABEL_OPEN_COMPOSE_POPUP": "Напісаць ліст",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Мінімізаваць акно",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Выбраць карыстальніка",
+		"LABEL_SAVE_MESSAGE": "Захаваць паведамленне",
+		"LABEL_SEND_MESSAGE": "Адаслаць паведамленне",
+		"LABEL_CLOSE_COMPOSE": "Закрыць паведамленне"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Запыт не выкананы",
+		"RequestAborted": "Запыт перарваны",
+		"RequestTimeout": "Скончыўся час запыту",
+		"InvalidToken": "Няправільны токен запыту",
+		"AuthError": "Не атрымалася аўтарызавацца",
+		"ConnectionError": "Памылка злучэння з серверам.",
+		"DomainAlreadyExists": "Дамен ужо існуе",
+		"DomainNotAllowed": "Дадзены дамен не дазволены",
+		"AccountNotAllowed": "Дадзены рахунак не дазволены",
+		"CryptKeyError": "Ваша парольная фраза зменена",
+		"ContactsSyncError": "Памылка сінхранізацыі кантактаў",
+		"CantGetMessageList": "Не магу атрымаць спіс лістоў",
+		"CantGetMessage": "Не магу атрымаць ліст",
+		"CantDeleteMessage": "Не магу выдаліць ліст",
+		"CantCopyMessage": "Не магу скапіраваць ліст",
+		"CantMoveMessage": "Не магу перамясціць ліст",
+		"CantSaveMessage": "Не магу захаваць ліст",
+		"CantSendMessage": "Не магу адаслаць оіст",
+		"InvalidRecipients": "Праверце правільнасць уводу ўсіх адрасоў.",
+		"CantSaveFilters": "Не магу захаваць фільтры",
+		"CantGetFilters": "Не магу загрузіць фільтры",
+		"CantActivateFiltersScript": "Не магу актываваць сцэнар фільтраў",
+		"CantDeleteFiltersScript": "Не магу выдаліць сцэнар фільтраў",
+		"FiltersAreNotCorrect": "Фільтры няправільныя",
+		"CantCreateFolder": "Не магу стварыць каталог",
+		"CantRenameFolder": "Не магу перайменаваць каталог",
+		"CantDeleteFolder": "Не магу выдаліць каталог",
+		"CantDeleteNonEmptyFolder": "Не магу выдаліць непусты каталог",
+		"CantSubscribeFolder": "Не магу падпісаць каталог",
+		"CantUnsubscribeFolder": "Не магу адпісаць каталог",
+		"DemoSendMessageError": "Дэма-рахунку адпраўка лістоў на знешнія паштовыя адрасы забаронена!",
+		"DemoAccountError": "Па меркаванням бяспекі дадзены рахунак не можа выканаць гэтае дзеянне.",
+		"AccountAlreadyExists": "Рахунак ужо дададзены",
+		"AccountDoesNotExist": "Рахунак не існуе",
+		"AccountSwitchFailed": "Не атрымалася пераключыцца на рахунак \"%EMAIL%\"",
+		"MailServerError": "Памылка доступу да паштовага серверу",
+		"InvalidInputArgument": "Няправільны параметр",
+		"UnknownError": "Невядомая памылка"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/bg/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/bg-BG/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/bg/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/static.json b/snappymail/v/0.0.0/app/localization/bg/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/bg-BG/static.json
rename to snappymail/v/0.0.0/app/localization/bg/static.json
diff --git a/snappymail/v/0.0.0/app/localization/bg-BG/user.json b/snappymail/v/0.0.0/app/localization/bg/user.json
similarity index 64%
rename from snappymail/v/0.0.0/app/localization/bg-BG/user.json
rename to snappymail/v/0.0.0/app/localization/bg/user.json
index 1bdbbed92..5b2b59194 100644
--- a/snappymail/v/0.0.0/app/localization/bg-BG/user.json
+++ b/snappymail/v/0.0.0/app/localization/bg/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Архивиране",
 		"ARE_YOU_SURE": "Сигурни ли си?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Затваряне (Esc)",
 		"CONTACTS": "Контакти",
 		"DELETE": "Изтрий",
+		"UNDELETE": "Undelete",
 		"DONE": "Готово",
 		"EMAIL": "Акаунт",
 		"FROM": "От",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Изход",
 		"MORE": "Още",
 		"MOVE_TO": "Премести в",
+		"COPY_TO": "Копирай в",
 		"NAME": "Вх. кутия",
 		"NONE": "Няма",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Не е спам",
+		"USERNAME": "Потребителско име",
 		"PASSWORD": "Парола",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Отговори на",
 		"SAVE": "Запази",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Не са намерени контакти",
 		"SPAM": "Спам",
 		"SUBJECT": "Заглавие",
 		"TEST": "Тест",
-		"TO": "До"
+		"TO": "До",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Да",
+		"NO": "Не",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "по подразбиране",
+		"HELP": "Помощ",
+		"TEXT": "Текст",
+		"ATTACHMENTS": "Прикрепени файлове"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логин",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Вход"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Добави акаунт",
-		"BUTTON_SETTINGS": "Настройки",
-		"BUTTON_HELP": "Помощ"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобилна версия",
-		"BUTTON_DESKTOP_VERSION": "Десктоп версия"
+		"BUTTON_ADD_ACCOUNT": "Добави акаунт"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Разширено търсене",
-		"LABEL_ADV_TEXT": "Текст",
-		"LABEL_ADV_HAS_ATTACHMENT": "Има приложен файл",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Има приложени файлове",
-		"LABEL_ADV_FLAGGED": "Отбелязано с флаг",
-		"LABEL_ADV_UNSEEN": "Невидяно",
-		"LABEL_ADV_DATE": "Дата",
-		"LABEL_ADV_DATE_ALL": "Всички",
-		"LABEL_ADV_DATE_3_DAYS": "До 3 дена",
-		"LABEL_ADV_DATE_7_DAYS": "До 1 седмица",
-		"LABEL_ADV_DATE_MONTH": "До 1 месец",
-		"LABEL_ADV_DATE_3_MONTHS": "До 3 месеца",
-		"LABEL_ADV_DATE_6_MONTHS": "До 6 месеца",
-		"LABEL_ADV_DATE_YEAR": "До 1 година",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "На цял екран",
-		"ZOOM": "Приближи\/отдалечи",
-		"CLOSE": "Затваряне (Esc)",
-		"GALLERY_PREV": "Предишно (Бутон лява стрелка)",
-		"GALLERY_NEXT": "Следващо (Бутон дясна стрелка)",
-		"GALLERY_COUNTER": "%curr% от %total%"
+		"TEXT": "Текст",
+		"HAS_ATTACHMENT": "Има приложен файл",
+		"FLAGGED": "Отбелязано с флаг",
+		"UNSEEN": "Невидяно",
+		"DATE": "Дата",
+		"DATE_ALL": "Всички",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "До 3 дена",
+		"SINCE_7_DAYS": "До 1 седмица",
+		"SINCE_MONTH": "До 1 месец",
+		"SINCE_3_MONTHS": "До 3 месеца",
+		"SINCE_6_MONTHS": "До 6 месеца",
+		"SINCE_YEAR": "До 1 година",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Отговорено",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Създай",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Кошче",
 		"ARCHIVE_NAME": "Архив"
 	},
-	"QUOTA": {
-		"TITLE": "Използване по дялове"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Презареди списъка със съобщения",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Прочетени",
 		"MENU_SELECT_FLAGGED": "Маркирани с флаг",
 		"MENU_SELECT_UNFLAGGED": "С премахнат флаг",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Празен списък.",
 		"EMPTY_SEARCH_LIST": "Няма съобщения, които да отговарят на търсенето.",
 		"SEARCH_RESULT_FOR": "Резултати от търсенето за \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Обратно при съобщенията",
-		"EMPTY_SUBJECT_TEXT": "(Няма заглавие)",
 		"PUT_MESSAGE_HERE": "Пуснете съобщението тук, за да го видите в списъка",
 		"TODAY_AT": "днес в %TIME%",
 		"YESTERDAY_AT": "вчера в %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Имате %COUNT% нови съобщения!",
 		"QUOTA_SIZE": "Използване на <strong>%SIZE% (%PROC%%)<\/strong> от вашите <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Покажи източника",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Изтегли като .eml файл",
 		"MENU_FILTER_SIMILAR": "Филтрирай съобщения като това",
 		"MENU_PRINT": "Принтирай",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Изберете цел от папките в лявото поле",
 		"LINK_DOWNLOAD_AS_ZIP": "Свали като ZIP файл",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Обратна разписка (видяно) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Търсене..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Добави контакт",
 		"BUTTON_CREATE_CONTACT": "Създай",
-		"BUTTON_UPDATE_CONTACT": "Обнови",
 		"BUTTON_IMPORT": "Импортирай (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Експортирай (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Експортирай (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Не са намерени контакти",
 		"CLEAR_SEARCH": "Изчистване на търсенето",
 		"CONTACT_VIEW_DESC": "Изберете контакт от списъка, за да го видите тук.",
-		"LABEL_PHONE": "Телефон",
-		"LABEL_WEB": "Страница",
 		"LABEL_BIRTHDAY": "Рожден ден",
-		"LINK_ADD_EMAIL": "Добави имейл адрес",
-		"LINK_ADD_PHONE": "Добави телефон",
-		"LINK_BIRTHDAY": "Рожден ден",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Въвеждете името, което ще се показва",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Въведете фамилия",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Въведете име",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Въведете прякор",
+		"DISPLAY_NAME": "Въвеждете името, което ще се показва",
+		"LAST_NAME": "Фамилия",
+		"FIRST_NAME": "Име",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Прякор",
 		"LABEL_READ_ONLY": "Само за четене",
-		"LABEL_SHARE": "Сподели",
 		"ADD_MENU_LABEL": "Добави",
 		"ADD_MENU_NICKNAME": "Прякор",
-		"ADD_MENU_NOTES": "Бележки",
+		"ADD_MENU_NOTE": "Бележки",
 		"ADD_MENU_PHONE": "Телефон",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Адрес",
 		"ADD_MENU_BIRTHDAY": "Рожден ден",
 		"ADD_MENU_TAGS": "Етикети",
 		"BUTTON_SHARE_ALL": "Всички",
-		"BUTTON_SYNC": "Синхронизация (CardDAV)"
+		"BUTTON_SYNC": "Синхронизация (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "покажи всички полета",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Няма прикрепени файлове.",
 		"ATTACHMENTS_ERROR_DESC": "Внимание! Не всички прикачени файлове са качени.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Все още не са качени всички прикрепени файлове",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова",
 		"BUTTON_REQUEST_READ_RECEIPT": "Поискайте разписка за прочитане на съобщението",
 		"BUTTON_MARK_AS_IMPORTANT": "Отбележи като важно",
-		"BUTTON_REQUEST_DSN": "Уведомяване при доставка"
+		"BUTTON_REQUEST_DSN": "Уведомяване при доставка",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Да",
-		"BUTTON_NO": "Не",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Сигурни ли сте, че желаете да затворите този прозорец?",
 		"DESC_WANT_DELETE_MESSAGES": "Сигурни ли сте, че желаете да изтриете съобщението\/съобщенията?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Избери език"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Добавяне на акаунт?",
+		"TITLE_ADD_ACCOUNT": "Добавяне на акаунт",
 		"BUTTON_ADD_ACCOUNT": "Добави",
-		"TITLE_UPDATE_ACCOUNT": "Обнови акаунта?",
-		"BUTTON_UPDATE_ACCOUNT": "Обнови"
+		"TITLE_UPDATE_ACCOUNT": "Обнови акаунта"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Добавяне на идентичност?",
-		"TITLE_UPDATE_IDENTITY": "Обновяване на идентичност?",
+		"TITLE_ADD_IDENTITY": "Добавяне на идентичност",
+		"TITLE_UPDATE_IDENTITY": "Обновяване на идентичност",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Добавяне",
-		"BUTTON_UPDATE_IDENTITY": "Обновяване",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Подписа да се поставя преди цитирания текст при отговор"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Създаване на папка?",
+		"TITLE_CREATE_FOLDER": "Създаване на папка",
 		"LABEL_PARENT": "Родителска папка",
 		"BUTTON_CREATE": "Създай",
 		"TITLE_CREATING_PROCESS": "Създаване на папка"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Веднъж започнат, този процес не може да бъде прекратен или отказан.",
 		"TITLE_CLEARING_PROCESS": "Прочистване на папката..."
 	},
+	"CRYPTO": {
+		"SIGN": "Подпиши",
+		"ENCRYPT": "Шифровай",
+		"DECRYPT": "Дешифрирай",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Валиден подпис за %USER%",
+		"ERROR": "%TYPE% грешка: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Внасяне на OpenPGP ключ",
 		"POPUP_IMPORT_BUTTON": "Внеси",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Създаване на OpenPGP ключове",
 		"POPUP_GENERATE_BUTTON": "Създай",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Подпиши",
-		"LABEL_ENCRYPT": "Шифровай",
-		"BUTTON_DECRYPT": "Дешифрирай",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Подписано с OpenPGP",
 		"ENCRYPTED_MESSAGE": "Шифровано с OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Валиден подпис за %USER%",
-		"ERROR": "OpenPGP грешка: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Подписано с S\/MIME",
+		"ENCRYPTED_MESSAGE": "Шифровано с S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Създай филтър?",
-		"TITLE_EDIT_FILTER": "Обнови филтъра?",
+		"TITLE_CREATE_FILTER": "Създай филтър",
+		"TITLE_EDIT_FILTER": "Обнови филтъра",
 		"LEGEND_CONDITIONS": "Условия",
 		"LEGEND_ACTIONS": "Действия",
 		"BUTTON_ADD_CONDITION": "Добави условие",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Отбележи като прочетено",
 		"REPLY_INTERVAL_LABEL": "За колко време (дни)",
 		"KEEP_LABEL": "Запази",
-		"STOP_LABEL": "Да не спира да обработва правилата",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Тема (незадължително)",
 		"VACATION_MESSAGE_LABEL": "Съобщение",
 		"VACATION_RECIPIENTS_LABEL": "Получатели (разделени със запетая)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Възникна неизвестна грешка при качването на файла"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> ТЕКСТ"
+		"PLAIN": "HTML <-> ТЕКСТ",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Лични",
-		"LABEL_GENERAL_NAME": "Общи",
-		"LABEL_CONTACTS_NAME": "Контакти",
-		"LABEL_FOLDERS_NAME": "Папки",
-		"LABEL_ACCOUNTS_NAME": "Акаунти",
-		"LABEL_FILTERS_NAME": "Филтри",
-		"LABEL_SECURITY_NAME": "Сигурност",
-		"LABEL_THEMES_NAME": "Теми"
+		"GENERAL": "Общи",
+		"CONTACTS": "Контакти",
+		"FOLDERS": "Папки",
+		"ACCOUNTS": "Акаунти",
+		"FILTERS": "Филтри",
+		"SECURITY": "Сигурност",
+		"THEMES": "Теми"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Филтри",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Премести в \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Препрати към \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Откажи",
 		"SUBNAME_VACATION_MESSAGE": "Съобщение в отпуска",
-		"SUBNAME_DISCARD": "Отхвърли",
-		"LOADING_PROCESS": "Обнови списъка с филтри"
+		"SUBNAME_DISCARD": "Отхвърли"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Сигурност",
 		"LABEL_AUTOLOGOUT": "Автоматично излизане",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Никога",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% минута(и)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% час(а)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Никога"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Общи",
-		"LABEL_LANGUAGE": "Език",
-		"LABEL_IDENTITY": "Идентичност",
-		"LABEL_LAYOUT": "Стил",
-		"LABEL_LAYOUT_NO_SPLIT": "Не разделяй",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
-		"LABEL_EDITOR": "Текстов редактор по подразбиране",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Чист текст",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (задължително)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Чист текст (задължително)",
-		"LABEL_VIEW_OPTIONS": "Настройки на изгледа",
-		"LABEL_USE_PREVIEW_PANE": "Използвай поле за преглед",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка",
-		"LABEL_USE_THREADS": "Използвай групиране на съобщенията",
-		"LABEL_REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
-		"LABEL_SHOW_IMAGES": "Винаги показвай външни картинки в текста на съобщението",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Съобщения на страница",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Език",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Идентичност",
+		"LAYOUT": "Стил",
+		"LAYOUT_NO_SPLIT": "Не разделяй",
+		"LAYOUT_VERTICAL_SPLIT": "Вертикално разделяне",
+		"LAYOUT_HORIZONTAL_SPLIT": "Хоризонтално разделяне",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Текстов редактор по подразбиране",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Чист текст",
+		"VIEW_OPTIONS": "Настройки на изгледа",
+		"USE_PREVIEW_PANE": "Използвай поле за преглед",
+		"HIDE_DELETED_MESSAGES": "Скриване на съобщенията, маркирани за изтриване",
+		"USE_CHECKBOXES_IN_LIST": "Показавай отметките в списъка",
+		"USE_THREADS": "Използвай групиране на съобщенията",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Постави отговорите с папката на отговаряното съобщение",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Съобщения на страница",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Известия",
-		"LABEL_SOUND_NOTIFICATION": "Звуково известяване",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Известия",
+		"SOUND_NOTIFICATION": "Звуково известяване",
+		"CHROME_NOTIFICATION_DESC": "Покажи известие при ново съобщение",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокирано от браузъра)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Автоматично добавяне на получателите към адресната ви книга",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Сървър",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL на адресната книга",
 		"LABEL_CONTACTS_SYNC_USER": "Потребител",
-		"SYNC_NO": "Не",
-		"SYNC_YES": "Да",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Теми",
-		"LEGEND_THEMES_CUSTOM": "Специфична настройка на темата",
-		"LABEL_CUSTOM_TYPE": "Тип",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Светла",
-		"LABEL_CUSTOM_TYPE_DARK": "Тъмна",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Фон",
+		"LABEL_BACKGROUND": "Фон",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Качи снимка за фон (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Файла е прекалено голям",
 		"ERROR_FILE_TYPE_ERROR": "Невалиден тип (Само JPG или PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Ще се показват само част от тях, за да се избегнат проблеми с производителността.",
 		"HELP_DELETE_FOLDER": "Изтрий папка",
 		"HELP_SHOW_HIDE_FOLDER": "Покажи\/скрий папка",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Провери\/не проверявай за нови съобщения",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Провери за нови съобщения",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Добавяне на акаунт",
 		"BUTTON_ADD_IDENTITY": "Добавяне на идентичност",
 		"LOADING_PROCESS": "Обновяване на списъка с акаунти",
-		"DEFAULT_IDENTITY_LABEL": "по подразбиране"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Внеси ключ",
 		"BUTTON_GENERATE_KEY_PAIR": "Генерирай ключ",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Частен",
 		"TITLE_PUBLIC": "Публичен",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматично запазване на чернова",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Отговори до всички",
 		"LABEL_FORWARD": "Препрати",
 		"LABEL_FORWARD_MULTIPLY": "Препрати като прикачен файл",
-		"LABEL_HELP": "Помощ",
 		"LABEL_CHECK_ALL": "Провери всички съобщения",
 		"LABEL_DELETE": "Изтрий",
 		"LABEL_OPEN_THREAD": "Отвори избраната нишка",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Включи цитатите в съобщението",
 		"LABEL_THREAD_NEXT": "Следващо съобщение в групираните",
 		"LABEL_THREAD_PREV": "Предно съобщение в групираните",
-		"LABEL_PRINT": "Принтиране",
 		"LABEL_EXIT_FULLSCREEN": "Излез от режим на цял екран",
 		"LABEL_CLOSE_MESSAGE": "Затвори съобщението (Няма изглед за преглед)",
 		"LABEL_SWITCH_TO_LIST": "Превключи фокуса обратно към списъка със съобщения",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Затвори създаването"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Невалиден токен",
-		"AUTH_ERROR": "Неуспешно удостоверяване",
-		"CONNECTION_ERROR": "Не може да се свърже със сървъра",
-		"DOMAIN_ALREADY_EXISTS": "Домейна вече съществува",
-		"DOMAIN_NOT_ALLOWED": "Този домейн не е разрешен",
-		"ACCOUNT_NOT_ALLOWED": "Този акаунт не е разрешен",
-		"CONTACTS_SYNC_ERROR": "Грешка при синхронизацията",
-		"CANT_GET_MESSAGE_LIST": "Не може да се изтегли списъка със съобщения",
-		"CANT_GET_MESSAGE": "Не може да се изтегли съобщението",
-		"CANT_DELETE_MESSAGE": "Не може да се изтрие съобщението",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Не може да се премести съобщението",
-		"CANT_SAVE_MESSAGE": "Не може да се запамети съобщението",
-		"CANT_SEND_MESSAGE": "Не може да се изпрати съобщението",
-		"INVALID_RECIPIENTS": "Невалидни получатели",
-		"CANT_SAVE_FILTERS": "Не може да се запаметят филтрите",
-		"CANT_GET_FILTERS": "Не могат да се изтеглят филтрите",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Грешни филтри",
-		"CANT_CREATE_FOLDER": "Не може да се създаде папка",
-		"CANT_RENAME_FOLDER": "Не може да се преименува папка",
-		"CANT_DELETE_FOLDER": "Не може да се изтрие папка",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Не може да се изтрие папка, която не е празна",
-		"CANT_SUBSCRIBE_FOLDER": "Не може да се абонира за папка",
-		"CANT_UNSUBSCRIBE_FOLDER": "Не може да се махне абонамента за папка",
-		"DEMO_SEND_MESSAGE_ERROR": "С цел сугурност, на този акаунт е забранено да изпраща съобщения до външни email адреси!",
-		"DEMO_ACCOUNT_ERROR": "С цел сигурност, това действие не е разрешено за този акаунт!",
-		"ACCOUNT_ALREADY_EXISTS": "Акаунта вече съществува",
-		"ACCOUNT_DOES_NOT_EXIST": "Акаунта не съществува",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Възникна грешка при комуникацията с пощенския сървър",
-		"INVALID_INPUT_ARGUMENT": "Невалидни входни аргументи",
-		"UNKNOWN_ERROR": "Неизвестна грешка"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Невалиден токен",
+		"AuthError": "Неуспешно удостоверяване",
+		"ConnectionError": "Не може да се свърже със сървъра",
+		"DomainAlreadyExists": "Домейна вече съществува",
+		"DomainNotAllowed": "Този домейн не е разрешен",
+		"AccountNotAllowed": "Този акаунт не е разрешен",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Грешка при синхронизацията",
+		"CantGetMessageList": "Не може да се изтегли списъка със съобщения",
+		"CantGetMessage": "Не може да се изтегли съобщението",
+		"CantDeleteMessage": "Не може да се изтрие съобщението",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Не може да се премести съобщението",
+		"CantSaveMessage": "Не може да се запамети съобщението",
+		"CantSendMessage": "Не може да се изпрати съобщението",
+		"InvalidRecipients": "Невалидни получатели",
+		"CantSaveFilters": "Не може да се запаметят филтрите",
+		"CantGetFilters": "Не могат да се изтеглят филтрите",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Грешни филтри",
+		"CantCreateFolder": "Не може да се създаде папка",
+		"CantRenameFolder": "Не може да се преименува папка",
+		"CantDeleteFolder": "Не може да се изтрие папка",
+		"CantDeleteNonEmptyFolder": "Не може да се изтрие папка, която не е празна",
+		"CantSubscribeFolder": "Не може да се абонира за папка",
+		"CantUnsubscribeFolder": "Не може да се махне абонамента за папка",
+		"DemoSendMessageError": "С цел сугурност, на този акаунт е забранено да изпраща съобщения до външни email адреси!",
+		"DemoAccountError": "С цел сигурност, това действие не е разрешено за този акаунт!",
+		"AccountAlreadyExists": "Акаунта вече съществува",
+		"AccountDoesNotExist": "Акаунта не съществува",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Възникна грешка при комуникацията с пощенския сървър",
+		"InvalidInputArgument": "Невалидни входни аргументи",
+		"UnknownError": "Неизвестна грешка"
 	}
 }
diff --git a/vendors/squire/LICENSE b/snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop
similarity index 57%
rename from vendors/squire/LICENSE
rename to snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop
index 06cfb7473..1a6999c1a 100644
--- a/vendors/squire/LICENSE
+++ b/snappymail/v/0.0.0/app/localization/ca/LICENSE-RainLoop
@@ -1,21 +1,21 @@
-The MIT License (MIT)
+MIT License
 
-Copyright © 2011–2014 by Neil Jenkins
+Copyright (c) 2022 RainLoopTeam
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to
-deal in the Software without restriction, including without limitation the
-rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-sell copies of the Software, and to permit persons to whom the Software is
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
-IN THE SOFTWARE.
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
\ No newline at end of file
diff --git a/snappymail/v/0.0.0/app/localization/ca/README.md b/snappymail/v/0.0.0/app/localization/ca/README.md
new file mode 100644
index 000000000..17336a3c9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/README.md
@@ -0,0 +1,17 @@
+# Catalan translation
+
+Catalan (`ca`, Català) translation for SnappyMail. A complete linguistic pass
+was applied on 2026-10-16; see [review notes](REVIEW.md). Further corrections
+from Catalan-speaking users are welcome.
+
+Existing translations were adapted from RainLoop's official Catalan resources:
+https://github.com/RainLoop/rainloop-webmail/tree/9bf8fa5b63d7e6871ee533126a7e1b1c85ee45b5/rainloop/v/0.0.0/app/localization
+
+SnappyMail-specific strings were translated for this contribution. Preserve the
+original MIT copyright and permission notice in `LICENSE-RainLoop` when reusing
+the adapted RainLoop texts. The translation includes user, admin and static
+messages, plus the relative-time fallback resource.
+
+Native language selector on a test login page (no authenticated session or mail):
+
+![Català in the native selector](selector.png)
diff --git a/snappymail/v/0.0.0/app/localization/ca/REVIEW.md b/snappymail/v/0.0.0/app/localization/ca/REVIEW.md
new file mode 100644
index 000000000..ffa6bcdc5
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/REVIEW.md
@@ -0,0 +1,43 @@
+# Catalan linguistic review — 2026-10-16
+
+Reviewed the full user, administration, static and relative-time resources
+against their English originals: 567 user entries, 140 administration entries
+and 7 static entries. This pass changes 210 entries (161 user,
+46 administration, 3 static), including typography.
+
+## Editorial criteria
+
+- Use the Softcatalà distinction between short imperative commands in buttons
+  (for example, *Desa*, *Xifra*) and the *vós* form when addressing users in
+  explanations, questions or instructions (*Introduïu*, *Seleccioneu*, *Voleu*).
+- Prefer consistent terms such as *desar*, *xifrar/desxifrar*, *conversa*,
+  *text sense format* and *emmagatzematge*. Preserve proper names such as Sieve.
+- Correct semantic errors, not only spelling: `STOP_LABEL` must stop further
+  processing, `LABEL_UNREAD` marks messages as unread, and the domain allow-list
+  describes permitted **users**, not domains.
+- Distinguish read/display receipts from delivery receipts. Preserve all message
+  variables, including `%READ-RECEIPT%`.
+- Remove inherited RainLoop product references from SnappyMail interface text.
+- Preserve JSON keys, technical flags, placeholders and required HTML structure.
+  Use consistent apostrophes and quotation marks in displayed Catalan text.
+
+## Representative corrections
+
+| Before | After | Reason |
+| --- | --- | --- |
+| No aturis el processament de les regles | Atura el processament de les regles següents | The previous wording reversed the action. |
+| No llegeixis els missatges seleccionats | Marca els missatges seleccionats com a no llegits | Describes changing the unread flag. |
+| Net | Text sense format | Correct meaning of the plain-text editor option. |
+| scripts de sedàs | scripts Sieve | Sieve is a protocol name. |
+| Emmagatzeatge | Emmagatzematge | Spelling correction. |
+| Llista de dominis… | Llista d’usuaris del domini… | The allow-list contains users. |
+| El RainLoop està actualitzat. | SnappyMail està actualitzat. | Correct product name. |
+
+## References
+
+- [Softcatalà linguistic style](https://www.softcatala.org/guia-estil-de-softcatala/aspectes-linguistics/)
+- [TERMCAT criteria for software localization](https://arxiu.termcat.cat/criteris/localitzacio-productes-informatics.pdf)
+
+This is a linguistic review of this contribution, not an endorsement by either
+organization. Further review and corrections from Catalan-speaking maintainers
+remain welcome.
diff --git a/snappymail/v/0.0.0/app/localization/ca/admin.json b/snappymail/v/0.0.0/app/localization/ca/admin.json
new file mode 100644
index 000000000..ef5639570
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Afegeix",
+		"CLOSE": "Tanca",
+		"SAVE": "Desa",
+		"TEST": "Prova",
+		"UPDATE": "Actualitza",
+		"USERNAME": "Nom d’usuari",
+		"PASSWORD": "Contrasenya",
+		"CANCEL": "Cancel·la",
+		"SEARCH": "Cerca",
+		"YES": "Sí",
+		"NO": "No"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Nom d’usuari",
+		"LABEL_TOTP": "Codi TOTP",
+		"BUTTON_LOGIN": "Accedeix al tauler d’administració"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Tauler d’administració"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "General",
+		"LOGIN": "Inici de sessió",
+		"BRANDING": "Imatge de marca",
+		"CONTACTS": "Contactes",
+		"DOMAINS": "Dominis",
+		"SECURITY": "Seguretat",
+		"PACKAGES": "Extensions",
+		"CONFIG": "Configuració",
+		"ABOUT": "Quant a"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Interfície",
+		"LABEL_LANGUAGE": "Llengua",
+		"LABEL_LANGUAGE_ADMIN": "Llengua (administració)",
+		"LABEL_THEME": "Tema",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permet la selecció de llengua a la pantalla de configuració",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permet la selecció del tema a la pantalla de configuració",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permet la selecció del fons a la pantalla de configuració",
+		"LABEL_SHOW_THUMBNAILS": "Mostra les miniatures (adjunts)",
+		"LEGEND_MAIN": "Principal",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Límit de mida dels adjunts",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Permet comptes addicionals",
+		"LABEL_ALLOW_IDENTITIES": "Permet identitats múltiples",
+		"ALERT_DATA_ACCESS": "La carpeta de dades és accessible des de l’exterior. Configureu el servidor web per impedir-hi l’accés extern. Més informació:",
+		"ALERT_WARNING": "Avís!",
+		"HTML_ALERT_WEAK_PASSWORD": "Esteu utilitzant la contrasenya d’administració predeterminada.\n<br>\nPer motius de seguretat,\n<strong><a href=\"#/security\">canvieu-la</a></strong>\nara per una altra.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Pantalla d’inici de sessió",
+		"LABEL_DEFAULT_DOMAIN": "Domini predeterminat",
+		"LABEL_DETERMINE_USER_DOMAIN": "Intenta determinar el domini de l’usuari",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permet triar la llengua a la pantalla d’inici de sessió",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Intenta determinar la llengua de l’usuari"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Imatge de marca",
+		"LABEL_PAGE_TITLE": "Títol de la pàgina",
+		"LABEL_LOADING_DESCRIPTION": "Text durant la càrrega",
+		"LABEL_FAVICON_URL": "URL de la icona de favorits"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Contactes",
+		"LEGEND_STORAGE": "Emmagatzematge (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Activa els contactes",
+		"LABEL_ALLOW_SYNC": "Permet la sincronització dels contactes (amb el servidor extern CardDAV)",
+		"LABEL_STORAGE_TYPE": "Tipus",
+		"LABEL_STORAGE_DSN": "DSN (nom de la font de dades)",
+		"LABEL_STORAGE_USER": "Usuari",
+		"LABEL_STORAGE_PASSWORD": "Contrasenya",
+		"SQLITE_GLOBAL": "Utilitza una base de dades global en lloc d’una per compte",
+		"ALERT_NOTICE": "Atenció!",
+		"SUGGESTIONS_LIMIT": "Límit de suggeriments",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "No useu aquest tipus de base de dades amb un gran nombre d’usuaris actius.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "El sistema no admet els contactes.\n<br>\nHeu d’instal·lar o activar l’extensió <strong>PDO (SQLite / MySQL / PostgreSQL)</strong> al servidor.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Dominis",
+		"BUTTON_ADD_DOMAIN": "Afegeix un domini",
+		"BUTTON_ADD_ALIAS": "Afegeix un àlies",
+		"DELETE_ARE_YOU_SURE": "Voleu continuar?",
+		"HTML_DOMAINS_HELPER": "Llista de dominis als quals el correu web pot accedir.\n<br>\nFeu clic al nom d’un domini per configurar-lo.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Seguretat",
+		"LABEL_USE_IMAGE_PROXY": "Utilitza un servidor intermediari local per a les imatges externes",
+		"LABEL_AUTO_VERIFY": "Verifica les signatures automàticament",
+		"LABEL_SHOW_PHP_INFO": "Mostra la informació de PHP",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credencials d’accés al tauler d’administració",
+		"LABEL_CURRENT_PASSWORD": "Contrasenya actual",
+		"LABEL_NEW_PASSWORD": "Contrasenya nova",
+		"LABEL_REPEAT_PASSWORD": "Repetiu la contrasenya",
+		"LABEL_REQUIRE_VERIFICATION": "Exigeix la verificació del certificat SSL utilitzat (IMAP / SMTP)",
+		"CRYPTO": "Criptografia",
+		"LABEL_ALLOW_SELF_SIGNED": "Permet els certificats autosignats"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Activa les extensions",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Actualitzacions disponibles",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Extensions disponibles per instal·lar",
+		"LEGEND_INSTALLED_PACKAGES": "Paquets instal·lats",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Ara no es pot accedir al repositori."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Quant a",
+		"LABEL_TAG_HINT": "Client de correu electrònic senzill, modern i ràpid basat en la web",
+		"LABEL_ALL_RIGHTS_RESERVED": "Tots els drets reservats.",
+		"HINT_READ_CHANGE_LOG": "Llegiu el registre de canvis abans d’actualitzar.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail està actualitzat.",
+		"HTML_NEW_VERSION": "Hi ha disponible una versió nova: <b>%VERSION%</b>.",
+		"LABEL_UPDATING": "S’està actualitzant…",
+		"LABEL_CHECKING": "S’està comprovant si hi ha actualitzacions…",
+		"BUTTON_RELEASES": "Versions publicades"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Afegeix un àlies",
+		"LABEL_ALIAS": "Àlies",
+		"LABEL_DOMAIN": "Domini"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Afegeix un domini",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Afegeix el domini «%NAME%»",
+		"TITLE_EDIT_DOMAIN": "Edita el domini «%NAME%»",
+		"LABEL_NAME": "Nom",
+		"NAME_HELPER": "S’admet el comodí *",
+		"LABEL_SERVER": "Servidor",
+		"LABEL_PORT": "Port",
+		"LABEL_SECURE": "Seguretat",
+		"TIMEOUT": "Temps d’espera",
+		"DISABLE_CAPABILITIES": "Desactiva capacitats",
+		"LIMITS": "Límits",
+		"FOLDERS": "Carpetes",
+		"MESSAGES": "Missatges",
+		"SECURE_OPTION_NONE": "Cap",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permet scripts Sieve",
+		"LABEL_USE_SHORT_LOGIN": "Utilitza el nom d’usuari sense el domini",
+		"LABEL_LOWERCASE_LOGIN": "Nom d’usuari en minúscules, sense distingir majúscules i minúscules",
+		"LABEL_USE_AUTH": "Utilitza l’autenticació",
+		"LABEL_SET_SENDER": "Utilitza el nom d’usuari com a remitent",
+		"LABEL_AUTH_PLAIN_LINE": "Força l’autenticació amb una sola ordre AUTH PLAIN",
+		"LABEL_USE_PHP_MAIL": "Utilitza la funció mail() de PHP",
+		"BUTTON_WHITE_LIST": "Usuaris permesos",
+		"NEW_DOMAIN_DESC": "Aquesta configuració de domini us permetrà treballar amb les adreces de correu de <strong>%NAME%</strong>.\n",
+		"WHITE_LIST_ALERT": "Llista d’usuaris del domini que poden accedir al correu web.\nSepareu-los amb espais.\n",
+		"VALID_SPAM_HEADERS": "Capçaleres vàlides de correu brossa",
+		"VALID_VIRUS_HEADERS": "Capçaleres vàlides de virus"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Extensió",
+		"DESC_NOTHING_TO_CONFIGURE": "No hi ha res per configurar."
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Segur que voleu tancar aquesta finestra?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Trieu la llengua"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Avís!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "El domini ja existeix.",
+		"UNKNOWN_ERROR": "Error desconegut"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "La sol·licitud ha fallat",
+		"RequestAborted": "S’ha cancel·lat la sol·licitud",
+		"RequestTimeout": "S’ha esgotat el temps d’espera de la sol·licitud",
+		"InvalidToken": "Testimoni no vàlid",
+		"AuthError": "Ha fallat l’autenticació",
+		"DomainAlreadyExists": "El domini ja existeix.",
+		"CantSavePluginSettings": "No es pot desar la configuració.",
+		"CantInstallPackage": "No s’ha pogut instal·lar l’extensió",
+		"CantDeletePackage": "No s’ha pogut eliminar l’extensió",
+		"InvalidPluginPackage": "Paquet d’extensió no vàlid",
+		"UnsupportedPluginPackage": "Paquet d’extensió no compatible",
+		"UnknownError": "Error desconegut"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js
new file mode 100644
index 000000000..a981c01f9
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/relativetimeformat.js
@@ -0,0 +1,75 @@
+{
+  "long": {
+    "year": {
+      "past": {
+        "one": "fa {0} any",
+        "other": "fa {0} anys"
+      },
+      "future": {
+        "one": "d’aquí a {0} any",
+        "other": "d’aquí a {0} anys"
+      }
+    },
+    "month": {
+      "past": {
+        "one": "fa {0} mes",
+        "other": "fa {0} mesos"
+      },
+      "future": {
+        "one": "d’aquí a {0} mes",
+        "other": "d’aquí a {0} mesos"
+      }
+    },
+    "week": {
+      "past": {
+        "one": "fa {0} setmana",
+        "other": "fa {0} setmanes"
+      },
+      "future": {
+        "one": "d’aquí a {0} setmana",
+        "other": "d’aquí a {0} setmanes"
+      }
+    },
+    "day": {
+      "past": {
+        "one": "fa {0} dia",
+        "other": "fa {0} dies"
+      },
+      "future": {
+        "one": "d’aquí a {0} dia",
+        "other": "d’aquí a {0} dies"
+      }
+    },
+    "hour": {
+      "past": {
+        "one": "fa {0} hora",
+        "other": "fa {0} hores"
+      },
+      "future": {
+        "one": "d’aquí a {0} hora",
+        "other": "d’aquí a {0} hores"
+      }
+    },
+    "minute": {
+      "past": {
+        "one": "fa {0} minut",
+        "other": "fa {0} minuts"
+      },
+      "future": {
+        "one": "d’aquí a {0} minut",
+        "other": "d’aquí a {0} minuts"
+      }
+    },
+    "second": {
+      "past": {
+        "one": "fa {0} segon",
+        "other": "fa {0} segons"
+      },
+      "future": {
+        "one": "d’aquí a {0} segon",
+        "other": "d’aquí a {0} segons"
+      }
+    }
+  },
+  plural: n => n === 1 ? "one" : "other"
+}
diff --git a/snappymail/v/0.0.0/app/localization/ca/selector.png b/snappymail/v/0.0.0/app/localization/ca/selector.png
new file mode 100644
index 000000000..01bb1b564
Binary files /dev/null and b/snappymail/v/0.0.0/app/localization/ca/selector.png differ
diff --git a/snappymail/v/0.0.0/app/localization/ca/static.json b/snappymail/v/0.0.0/app/localization/ca/static.json
new file mode 100644
index 000000000..348cacc0e
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Torna a carregar",
+	"NO_SCRIPT_TITLE": "Aquesta aplicació necessita JavaScript.",
+	"NO_SCRIPT_DESC": "El navegador no té activat JavaScript.\nActiveu-lo a la configuració del navegador i torneu-ho a provar.",
+	"NO_COOKIE_TITLE": "Aquesta aplicació necessita galetes.",
+	"NO_COOKIE_DESC": "El navegador no té activades les galetes.\nActiveu-les a la configuració del navegador i torneu-ho a provar.",
+	"BAD_BROWSER_TITLE": "El navegador està obsolet.",
+	"BAD_BROWSER_DESC": "Per utilitzar totes les funcions de l’aplicació,\nbaixeu i instal·leu un navegador actualitzat."
+}
diff --git a/snappymail/v/0.0.0/app/localization/ca/user.json b/snappymail/v/0.0.0/app/localization/ca/user.json
new file mode 100644
index 000000000..2c803dc84
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ca/user.json
@@ -0,0 +1,647 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "Arxiva",
+		"ARE_YOU_SURE": "Voleu continuar?",
+		"BACK": "Enrere",
+		"BCC": "C/o",
+		"CANCEL": "Cancel·la",
+		"CC": "A/c",
+		"CLEAR": "Neteja",
+		"CLOSE": "Tanca",
+		"CONTACTS": "Contactes",
+		"DELETE": "Suprimeix",
+		"UNDELETE": "Restaura",
+		"DONE": "Fet",
+		"EMAIL": "Adreça de correu",
+		"FROM": "De",
+		"LOADING": "S’està carregant…",
+		"LOGOUT": "Tanca la sessió",
+		"MORE": "Més",
+		"MOVE_TO": "Mou a",
+		"COPY_TO": "Copia a",
+		"NAME": "Nom",
+		"NONE": "Cap",
+		"TO_SPAM": "Mou els missatges al correu brossa",
+		"NOT_SPAM": "No és correu brossa",
+		"USERNAME": "Nom d’usuari",
+		"PASSWORD": "Contrasenya",
+		"REMEMBER": "Recorda",
+		"REPLY_TO": "Respon a",
+		"SAVE": "Desa",
+		"SAVE_CHANGES": "Voleu desar els canvis?",
+		"SEARCH": "Cerca",
+		"SPAM": "Correu brossa",
+		"SUBJECT": "Assumpte",
+		"TEST": "Prova",
+		"TO": "Per a",
+		"SERVER_MESSAGE": "Missatge del servidor",
+		"YES": "Sí",
+		"NO": "No",
+		"INACTIVE": "Inactiu",
+		"DEFAULT": "predeterminat",
+		"HELP": "Ajuda",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Adjunts"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Nom d’usuari",
+		"LABEL_SIGN_ME": "Recorda’m",
+		"BUTTON_SIGN_IN": "Inicia la sessió"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Afegeix un compte"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Cerca avançada",
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "Té fitxers adjunts",
+		"FLAGGED": "Destacats",
+		"UNSEEN": "No llegits",
+		"DATE": "Data",
+		"DATE_ALL": "Qualsevol data",
+		"BEFORE_3_DAYS": "De fa més de 3 dies",
+		"BEFORE_7_DAYS": "De fa més d’una setmana",
+		"BEFORE_MONTH": "De fa més d’un mes",
+		"BEFORE_3_MONTHS": "De fa més de 3 mesos",
+		"BEFORE_6_MONTHS": "De fa més de 6 mesos",
+		"BEFORE_YEAR": "De fa més d’un any",
+		"SINCE_3_DAYS": "Antiguitat de fins a 3 dies",
+		"SINCE_7_DAYS": "Antiguitat de fins a 1 setmana",
+		"SINCE_MONTH": "Antiguitat de fins a 1 mes",
+		"SINCE_3_MONTHS": "Antiguitat de fins a 3 mesos",
+		"SINCE_6_MONTHS": "Antiguitat de fins a 6 mesos",
+		"SINCE_YEAR": "Antiguitat de fins a 1 any",
+		"SUBFOLDERS": "Subcarpetes",
+		"SUBFOLDERS_NONE": "Cap",
+		"SUBFOLDERS_SUBTREE": "Totes",
+		"SUBFOLDERS_SUBTREE_ONE": "Un nivell",
+		"REPLIED": "Respostos",
+		"KEYWORD": "Etiqueta"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Escriu",
+		"BUTTON_NEW_MESSAGE": "Missatge nou",
+		"INBOX_NAME": "Bústia d’entrada",
+		"SENT_NAME": "Enviats",
+		"DRAFTS_NAME": "Esborranys",
+		"TRASH_NAME": "Paperera",
+		"ARCHIVE_NAME": "Arxiu"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Permisos",
+		"ACL_A": "Administra",
+		"ACL_E": "Elimina definitivament",
+		"ACL_I": "Insereix missatges",
+		"ACL_K": "Crea subcarpetes",
+		"ACL_L": "Mostra els missatges",
+		"ACL_P": "Envia correu",
+		"ACL_R": "Selecciona una carpeta",
+		"ACL_S": "Etiqueta \\SEEN",
+		"ACL_T": "Etiqueta \\DELETED",
+		"ACL_W": "Altres etiquetes",
+		"ACL_X": "Elimina o canvia el nom de la carpeta"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Torna a carregar la llista de missatges",
+		"BUTTON_EMPTY_FOLDER": "Buida la carpeta",
+		"BUTTON_MULTY_FORWARD": "Reenvia com a fitxers adjunts",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Suprimeix definitivament",
+		"MENU_SET_SEEN": "Marca com a llegit",
+		"MENU_SET_ALL_SEEN": "Marca’ls tots com a llegits",
+		"MENU_UNSET_SEEN": "Marca com a no llegit",
+		"MENU_SET_FLAG": "Destaca",
+		"MENU_UNSET_FLAG": "Deixa de destacar",
+		"MENU_SELECT_ALL": "Selecciona-ho tot",
+		"MENU_SELECT_INVERT": "Inverteix la selecció",
+		"MENU_SELECT_UNSEEN": "No llegits",
+		"MENU_SELECT_SEEN": "Llegits",
+		"MENU_SELECT_FLAGGED": "Destacats",
+		"MENU_SELECT_UNFLAGGED": "Sense destacar",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Baixa tots els fitxers adjunts",
+		"EMPTY_LIST": "No hi ha missatges.",
+		"EMPTY_SEARCH_LIST": "Cap missatge coincideix amb la cerca.",
+		"SEARCH_RESULT_FOR": "Resultats de la cerca de «%SEARCH%»",
+		"BACK_TO_MESSAGE_LIST": "Torna a la llista de missatges",
+		"PUT_MESSAGE_HERE": "Deixeu anar el missatge aquí per veure’l a la llista.",
+		"TODAY_AT": "avui a les %TIME%",
+		"YESTERDAY_AT": "ahir a les %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "Teniu %COUNT% missatges nous.",
+		"QUOTA_SIZE": "S’utilitzen <strong>%SIZE% (%PROC%%)</strong> de <strong>%LIMIT%</strong>",
+		"SORT": "Ordena",
+		"NO_SORT": "El servidor de correu no permet ordenar els missatges",
+		"SORT_ARRIVAL_ASC": "Data de recepció ascendent",
+		"SORT_ARRIVAL_DESC": "Data de recepció descendent",
+		"SORT_DATE_ASC": "Data ascendent",
+		"SORT_DATE_DESC": "Data descendent",
+		"SORT_SIZE_ASC": "Mida ascendent",
+		"SORT_SIZE_DESC": "Mida descendent",
+		"SORT_SUBJECT_ASC": "Assumpte A–Z",
+		"SORT_SUBJECT_DESC": "Assumpte Z–A",
+		"SORT_FROM_ASC": "Remitent A–Z",
+		"SORT_FROM_DESC": "Remitent Z–A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Edita",
+		"BUTTON_UNSUBSCRIBE": "Cancel·la la subscripció a la llista",
+		"BUTTON_REPLY": "Respon",
+		"BUTTON_REPLY_ALL": "Respon a tothom",
+		"BUTTON_FORWARD": "Reenvia",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Reenvia com a fitxer adjunt",
+		"BUTTON_EDIT_AS_NEW": "Edita com a missatge nou",
+		"BUTTON_SHOW_IMAGES": "Mostra les imatges externes",
+		"BUTTON_NOTIFY_READ_RECEIPT": "El remitent ha demanat rebre una notificació quan llegiu aquest missatge.",
+		"BUTTON_IN_NEW_WINDOW": "Mostra en una finestra separada",
+		"BUTTON_THREAD_LIST": "Llista de missatges de la conversa",
+		"BUTTON_THREAD_PREV": "Anterior",
+		"BUTTON_THREAD_NEXT": "Següent",
+		"BUTTON_THREAD_MORE": "Més missatges",
+		"MENU_HEADERS": "Mostra les capçaleres del missatge",
+		"MENU_VIEW_ORIGINAL": "Mostra el codi font",
+		"HTML_VIEW": "Mostra el missatge en HTML",
+		"PLAIN_VIEW": "Mostra el missatge en text sense format",
+		"SWAP_COLORS": "Intercanvia el color de fons predeterminat",
+		"MENU_DOWNLOAD_ORIGINAL": "Baixa com a fitxer .eml",
+		"MENU_FILTER_SIMILAR": "Filtra missatges semblants",
+		"MENU_PRINT": "Imprimeix",
+		"EMPTY_SUBJECT_TEXT": "(Sense assumpte)",
+		"LABEL_DATE": "Data",
+		"LABEL_FROM_SHORT": "de",
+		"LABEL_TO_SHORT": "per a",
+		"PRINT_LABEL_ATTACHMENTS": "Adjunts",
+		"MESSAGE_VIEW_DESC": "Seleccioneu qualsevol missatge de la llista per veure’l aquí.",
+		"MESSAGE_VIEW_MOVE_DESC": "Feu clic al nom de la carpeta del tauler de l’esquerra per seleccionar la destinació.",
+		"LINK_DOWNLOAD_AS_ZIP": "Baixa en format ZIP",
+		"SPAM_SCORE": "Puntuació de correu brossa",
+		"HAS_VIRUS_WARNING": "AVÍS: s’ha detectat un virus",
+		"TAGS": "Etiquetes",
+		"NEW_TAG": "Etiqueta nova",
+		"ENABLE_TRACKING_LINKS": "Activa els enllaços de seguiment",
+		"TRACKING_ENABLED": "Ara es farà el seguiment dels enllaços quan hi feu clic."
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "Per fer",
+		"$label1": "Important",
+		"$label2": "Feina",
+		"$label3": "Personal",
+		"$label4": "Per fer",
+		"$label5": "Més endavant"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Confirmació de lectura (missatge mostrat) - %SUBJECT%",
+		"BODY": "Aquesta és una confirmació de lectura del missatge que vau enviar a %READ-RECEIPT%.\n\nNota: aquesta confirmació només indica que el missatge s’ha mostrat a l’ordinador del destinatari.\nNo garanteix que el destinatari hagi llegit o entès el contingut del missatge.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "S’està cercant…"
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Contacte",
+		"TAB_LOCATIONS": "Ubicacions",
+		"TAB_BUSINESS": "Feina",
+		"LABEL_ORGANIZATION": "Organització",
+		"LABEL_DEPARTMENT": "Departament",
+		"LABEL_TITLE": "Càrrec",
+		"TAB_CRYPTO": "Criptografia",
+		"ASK": "Pregunta",
+		"NEVER": "Mai",
+		"ALWAYS": "Sempre",
+		"ALWAYS_IF_POSSIBLE": "Sempre que sigui possible",
+		"BUTTON_ADD_CONTACT": "Afegeix un contacte",
+		"BUTTON_CREATE_CONTACT": "Crea",
+		"BUTTON_IMPORT": "Importa (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Exporta (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Exporta (csv)",
+		"ERROR_IMPORT_FILE": "Error d’importació (format de fitxer no vàlid)",
+		"EMPTY_LIST": "Aquí no hi ha cap contacte",
+		"EMPTY_SEARCH": "No s’ha trobat cap contacte",
+		"CLEAR_SEARCH": "Neteja la cerca",
+		"CONTACT_VIEW_DESC": "Seleccioneu un contacte de la llista per veure’l aquí.",
+		"LABEL_BIRTHDAY": "Data de naixement",
+		"DISPLAY_NAME": "Nom per mostrar",
+		"LAST_NAME": "Cognoms",
+		"FIRST_NAME": "Nom",
+		"MIDDLE_NAME": "Segon nom",
+		"NAME_PREFIX": "Prefix del nom",
+		"NAME_SUFFIX": "Sufix del nom",
+		"NICK_NAME": "Àlies",
+		"LABEL_READ_ONLY": "Només de lectura",
+		"ADD_MENU_LABEL": "Afegeix",
+		"ADD_MENU_NICKNAME": "Àlies",
+		"ADD_MENU_NOTE": "Nota",
+		"ADD_MENU_PHONE": "Telèfon",
+		"ADD_MENU_URL": "URL",
+		"ADD_MENU_ADDRESS": "Adreça",
+		"ADD_MENU_BIRTHDAY": "Data de naixement",
+		"ADD_MENU_TAGS": "Etiquetes",
+		"BUTTON_SHARE_ALL": "Tothom",
+		"BUTTON_SYNC": "Sincronització (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Envia a totes les adreces del contacte"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Mostra tots els camps",
+		"BUTTON_SEND": "Envia",
+		"BUTTON_MINIMIZE": "Minimitza",
+		"SAVED_TIME": "Desat a les %TIME%",
+		"SAVED_ERROR_ON_SEND": "El missatge s’ha enviat, però no s’ha desat a la carpeta de missatges enviats.",
+		"DISCARD_UNSAVED_DATA": "Voleu descartar les dades no desades?",
+		"ATTACH_FILES": "Adjunta fitxers",
+		"ATTACH_DROP_FILES_DESC": "Deixeu anar fitxers aquí",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% va escriure",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Missatge reenviat -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Enviat",
+		"EMPTY_TO_ERROR_DESC": "Indiqueu almenys un destinatari.",
+		"NO_ATTACHMENTS_HERE_DESC": "No hi ha cap fitxer adjunt.",
+		"ATTACHMENTS_ERROR_DESC": "No s’han pogut pujar tots els fitxers adjunts.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Encara s’estan pujant fitxers adjunts.",
+		"ALLOW_SPELLCHECK": "Activa el corrector ortogràfic del navegador",
+		"ALLOW_DRAFT_AUTOSAVE": "Desa l’esborrany automàticament",
+		"BUTTON_REQUEST_READ_RECEIPT": "Demana una confirmació de lectura",
+		"BUTTON_MARK_AS_IMPORTANT": "Marca com a important",
+		"BUTTON_REQUEST_DSN": "Demana una confirmació de lliurament",
+		"BUTTON_REQUIRE_TLS": "Exigeix un lliurament segur",
+		"ERROR_EMPTY_BODY": "El cos del missatge és buit"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Segur que voleu sortir?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Segur que voleu tancar aquesta finestra?",
+		"DESC_WANT_DELETE_MESSAGES": "Segur que voleu suprimir els missatges?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Trieu la llengua"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Afegeix un compte",
+		"BUTTON_ADD_ACCOUNT": "Afegeix-lo",
+		"TITLE_UPDATE_ACCOUNT": "Actualitza el compte"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Afegeix una identitat",
+		"TITLE_UPDATE_IDENTITY": "Actualitza la identitat",
+		"LABEL": "Etiqueta",
+		"BUTTON_ADD_IDENTITY": "Afegeix-la",
+		"SIGNATURE": "Signatura",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Insereix aquesta signatura abans del text citat en les respostes."
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Crea una carpeta",
+		"LABEL_PARENT": "Carpeta superior",
+		"BUTTON_CREATE": "Crea-la",
+		"TITLE_CREATING_PROCESS": "S’està creant la carpeta…"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Voleu suprimir tots els missatges de la carpeta?",
+		"DANGER_DESC_WARNING": "Avís",
+		"DANGER_DESC_HTML_1": "Aquesta acció suprimirà definitivament tots els missatges de la carpeta <strong>%FOLDER%</strong>.",
+		"DANGER_DESC_HTML_2": "Un cop iniciat, el procés no es pot aturar ni cancel·lar.",
+		"TITLE_CLEARING_PROCESS": "S’està buidant la carpeta…"
+	},
+	"CRYPTO": {
+		"SIGN": "Signa",
+		"ENCRYPT": "Xifra",
+		"DECRYPT": "Desxifra",
+		"VERIFY": "Verifica",
+		"GOOD_SIGNATURE": "Signatura vàlida de %USER%",
+		"ERROR": "Error de %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Crea un certificat autosignat",
+		"VALID_UNTIL": "Vàlid fins al",
+		"PRIVATE_KEY": "Clau privada",
+		"CHANGE_PASS": "Canvia la contrasenya",
+		"CURRENT_PASS": "Contrasenya actual",
+		"NEW_PASS": "Contrasenya nova",
+		"ASK_CRYPTKEY_PASS": "La contrasenya d’accés ha canviat. Introduïu la contrasenya anterior per desxifrar les dades."
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Importa una clau OpenPGP",
+		"POPUP_IMPORT_BUTTON": "Importa-la",
+		"POPUP_VIEW_TITLE": "Mostra una clau OpenPGP",
+		"POPUP_VIEW_BUTTON": "Selecciona",
+		"POPUP_GENERATE_TITLE": "Genera un parell de claus OpenPGP",
+		"POPUP_GENERATE_BUTTON": "Genera",
+		"LABEL_KEY_TYPE": "Tipus",
+		"SIGNED_MESSAGE": "Missatge signat amb OpenPGP",
+		"ENCRYPTED_MESSAGE": "Missatge xifrat amb OpenPGP",
+		"STORE_IN_GNUPG": "Desa al servidor amb GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Desa la clau pública al servidor amb GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Desa la clau privada al servidor amb GnuPG",
+		"BACKUP_ON_SERVER": "Desa al servidor amb xifratge",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Desa una còpia de la clau pública al servidor",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Desa una còpia de la clau privada al servidor"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importa un certificat S/MIME",
+		"CERTIFICATE": "Certificat",
+		"CERTIFICATES": "Certificats S/MIME",
+		"SIGNED_MESSAGE": "Missatge signat amb S/MIME",
+		"ENCRYPTED_MESSAGE": "Missatge xifrat amb S/MIME",
+		"PRIVATE_KEY_OF": "Clau privada S/MIME de %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Crea un filtre",
+		"TITLE_EDIT_FILTER": "Edita el filtre",
+		"LEGEND_CONDITIONS": "Condicions",
+		"LEGEND_ACTIONS": "Accions",
+		"BUTTON_ADD_CONDITION": "Afegeix-hi una condició",
+		"SELECT_ACTION_MOVE_TO": "Mou a",
+		"SELECT_ACTION_FORWARD_TO": "Reenvia a",
+		"SELECT_ACTION_REJECT": "Rebutja",
+		"SELECT_ACTION_VACATION_MESSAGE": "Missatge de vacances",
+		"SELECT_ACTION_DISCARD": "Descarta-ho",
+		"SELECT_FIELD_RECIPIENTS": "Destinataris (Per a o A/c)",
+		"SELECT_FIELD_HEADER": "Capçalera",
+		"SELECT_FIELD_BODY": "Cos",
+		"SELECT_FIELD_SIZE": "Mida",
+		"SELECT_TYPE_CONTAINS": "Conté",
+		"SELECT_TYPE_NOT_CONTAINS": "No conté",
+		"SELECT_TYPE_MATCHES": "Coincideix amb (s’admeten * i ?)",
+		"SELECT_TYPE_NOT_MATCHES": "No coincideix amb (s’admeten * i ?)",
+		"SELECT_TYPE_REGEXP": "Expressió regular",
+		"SELECT_TYPE_NOT_REGEXP": "No coincideix amb l’expressió regular",
+		"SELECT_TYPE_EQUAL_TO": "Igual a",
+		"SELECT_TYPE_NOT_EQUAL_TO": "No igual a",
+		"SELECT_TYPE_OVER": "Més gran que",
+		"SELECT_TYPE_UNDER": "Més petit que",
+		"SELECT_TYPE_TEXT": "Text",
+		"SELECT_TYPE_RAW": "Sense processar",
+		"SELECT_MATCH_ANY": "Coincideix amb QUALSEVOL de les regles següents",
+		"SELECT_MATCH_ALL": "Coincideix amb TOTES les regles següents",
+		"MARK_AS_READ_LABEL": "Marca com a llegit",
+		"REPLY_INTERVAL_LABEL": "Interval de resposta (dies)",
+		"KEEP_LABEL": "Mantén-ho",
+		"STOP_LABEL": "Atura el processament de les regles següents",
+		"VACATION_SUBJECT_LABEL": "Assumpte (opcional)",
+		"VACATION_MESSAGE_LABEL": "Missatge",
+		"VACATION_RECIPIENTS_LABEL": "Destinataris (separats per comes)",
+		"REJECT_MESSAGE_LABEL": "Missatge de rebuig",
+		"ALL_INCOMING_MESSAGES_DESC": "Tots els missatges d’entrada"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Crea un script",
+		"TITLE_EDIT": "Edita l’script",
+		"BUTTON_ADD_FILTER": "Afegeix-hi un filtre",
+		"BUTTON_RAW_SCRIPT": "Utilitza un script d’usuari personalitzat",
+		"CAPABILITY_LABEL": "Capacitats",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Cal desar aquests canvis al servidor."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Seleccioneu carpetes del sistema",
+		"SELECT_CHOOSE_ONE": "Trieu-ne una",
+		"SELECT_UNUSE_NAME": "No l’utilitzis",
+		"NOTIFICATION_SENT": "No heu seleccionat la carpeta del sistema «Enviats», on es desen els missatges enviats.\nSi no els voleu desar, seleccioneu l’opció «No l’utilitzis».\n",
+		"NOTIFICATION_DRAFTS": "No heu seleccionat la carpeta del sistema «Esborranys», on es desen els missatges mentre els redacteu.",
+		"NOTIFICATION_SPAM": "No heu seleccionat la carpeta del sistema «Correu brossa», on es mouen els missatges marcats com a correu brossa.\nSi els voleu suprimir definitivament, seleccioneu l’opció «No l’utilitzis».\n",
+		"NOTIFICATION_TRASH": "No heu seleccionat la carpeta del sistema «Paperera», on es mouen els missatges suprimits.\nSi els voleu suprimir definitivament, seleccioneu l’opció «No l’utilitzis».\n",
+		"NOTIFICATION_ARCHIVE": "No heu seleccionat la carpeta del sistema «Arxiu», on es desen els missatges arxivats."
+	},
+	"TITLES": {
+		"MAILBOX": "Bústia de correu",
+		"SETTINGS": "Configuració"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "El fitxer és massa gran",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "El fitxer només s’ha carregat parcialment a causa d’un error desconegut",
+		"ERROR_NO_FILE_UPLOADED": "No s’ha carregat cap fitxer",
+		"ERROR_MISSING_TEMP_FOLDER": "Manca el fitxer temporal",
+		"ERROR_ON_SAVING_FILE": "S’ha produït un error en desar el fitxer.",
+		"ERROR_FILE_TYPE": "Tipus de fitxer no vàlid",
+		"ERROR_UNKNOWN": "S’ha produït un error desconegut en pujar el fitxer."
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> CODI FONT",
+		"FONTFAMILY": "Tipus de lletra",
+		"FONTSIZE": "Mida de la lletra",
+		"DIR": "Direcció del text",
+		"DIR_LTR": "D’esquerra a dreta",
+		"DIR_RTL": "De dreta a esquerra",
+		"DIR_AUTO": "Automàtica",
+		"TEXTCOLOR": "Color del text",
+		"BACKGROUNDCOLOR": "Color de fons",
+		"BOLD": "Negreta",
+		"ITALIC": "Cursiva",
+		"UNDERLINE": "Subratllat",
+		"STRIKE": "Ratllat",
+		"SUB": "Subíndex",
+		"SUP": "Superíndex",
+		"OL": "Llista numerada",
+		"UL": "Llista amb pics",
+		"QUOTE": "Citació",
+		"INDENTDECREASE": "Disminueix el sagnat",
+		"INDENTINCREASE": "Augmenta el sagnat",
+		"LINK": "Enllaç",
+		"IMAGEURL": "URL de la imatge",
+		"IMAGEUPLOAD": "Selecciona una imatge",
+		"UNDO": "Desfés",
+		"REDO": "Refés",
+		"REMOVESTYLE": "Elimina el format"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "General",
+		"CONTACTS": "Contactes",
+		"FOLDERS": "Carpetes",
+		"ACCOUNTS": "Comptes",
+		"FILTERS": "Filtres",
+		"SECURITY": "Seguretat",
+		"THEMES": "Temes"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Simple",
+		"ADVANCED": "Avançat",
+		"BUTTON_ADD_SCRIPT": "Afegeix un script",
+		"SUBNAME_MOVE_TO": "Mou a «%FOLDER%»",
+		"SUBNAME_FORWARD_TO": "Reenvia a «%EMAIL%»",
+		"SUBNAME_REJECT": "Rebutja",
+		"SUBNAME_VACATION_MESSAGE": "Missatge de vacances",
+		"SUBNAME_DISCARD": "Descarta-ho"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Seguretat",
+		"LABEL_AUTOLOGOUT": "Tancament automàtic de sessió",
+		"FORGET_KEY_PASS": "Oblida la contrasenya de la clau privada",
+		"NEVER": "Mai"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Llengua",
+		"HOUR_FORMAT": "Format de l’hora",
+		"IDENTITY": "Identitat",
+		"LAYOUT": "Disposició",
+		"LAYOUT_NO_SPLIT": "Sense divisió",
+		"LAYOUT_VERTICAL_SPLIT": "Divisió vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Divisió horitzontal",
+		"SHOW_NEXT_MESSAGE": "Mostra el missatge següent en moure o eliminar el missatge actual",
+		"EDITOR": "Editor de text predeterminat",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Text sense format",
+		"VIEW_OPTIONS": "Opcions de visualització",
+		"USE_PREVIEW_PANE": "Utilitza la subfinestra de previsualització",
+		"HIDE_DELETED_MESSAGES": "Amaga els missatges marcats per eliminar",
+		"USE_CHECKBOXES_IN_LIST": "Mostra les caselles a la llista",
+		"USE_THREADS": "Agrupa els missatges en converses",
+		"THREAD_ALGORITHM": "Algorisme d’agrupació de converses",
+		"REPLY_SAME_FOLDER": "Desa les respostes a la carpeta del missatge al qual es respon",
+		"PREFER_HTML": "Prefereix HTML al text sense format",
+		"PREFER_HTML_INFO": "De vegades els missatges inclouen tots dos formats. Aquesta opció permet triar si es mostra la part HTML o la part de text sense format.",
+		"REMOVE_COLORS": "Elimina els colors de fons i del text del cos del missatge",
+		"ALLOW_STYLES": "Permet CSS amb <style>",
+		"MESSAGE_PER_PAGE": "Missatges per pàgina",
+		"CHECK_MAIL_INTERVAL": "Interval de comprovació del correu",
+		"MARK_MESSAGE_READ_AFTER": "Marca el missatge com a llegit després de",
+		"MSG_DEFAULT_ACTION": "Acció predeterminada",
+		"SECONDS": "segons",
+		"MINUTES": "minuts",
+		"NOTIFICATIONS": "Notificacions",
+		"SOUND_NOTIFICATION": "Notificació acústica",
+		"CHROME_NOTIFICATION_DESC": "Mostra notificacions emergents per als missatges nous",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(El navegador les ha bloquejades)",
+		"COLLAPSE_BLOCKQUOTES": "Replega el text citat",
+		"MAX_QUOTE_LEVEL": "Nombre màxim de nivells visibles de text citat",
+		"LIST_INLINE_ATTACHMENTS": "Mostra a la llista els fitxers adjunts inserits al missatge",
+		"LIST_SIMPLE_ATTACHMENTS": "Llista simple de fitxers adjunts",
+		"LIST_MESSAGES_GROUPED": "Agrupa els missatges de la llista en ordenar per data o remitent",
+		"EXTERNAL_IMAGES": "Imatges externes",
+		"IMAGES_OPTION_ASK": "Pregunta sempre",
+		"IMAGES_OPTION_WHITELIST": "Permet les adreces de confiança; pregunta en els altres casos",
+		"IMAGES_OPTION_ALWAYS": "Mostra sempre",
+		"IMAGES_WHITELIST": "Adreces de confiança per mostrar imatges",
+		"MESSAGE_POPUP_WINDOW": "Obre les finestres emergents en una finestra nova en lloc d’una pestanya",
+		"MAILTO": "Registra com a gestor d’enllaços «mailto:»",
+		"HTML_TO_MD": "Converteix l’HTML a Markdown en lloc de text sense format"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Afegeix els destinataris a la llibreta d’adreces automàticament",
+		"LEGEND_CONTACTS_SYNC": "Sincronització remota (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Activa la sincronització remota",
+		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
+		"LABEL_CONTACTS_SYNC_AB_URL": "URL de la llibreta d’adreces",
+		"LABEL_CONTACTS_SYNC_USER": "Usuari",
+		"SYNC_READ": "Només de lectura"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Temes",
+		"LABEL_BACKGROUND": "Fons",
+		"LABEL_FONTS": "Tipus de lletra",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Puja una imatge de fons (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "El fitxer és massa gran",
+		"ERROR_FILE_TYPE_ERROR": "Tipus de fitxer no vàlid (només JPG i PNG)",
+		"ERROR_UNKNOWN": "S’ha produït un error desconegut en pujar el fitxer."
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Llista de carpetes",
+		"BUTTON_CREATE": "Crea una carpeta",
+		"BUTTON_SYSTEM": "Carpetes del sistema",
+		"BUTTON_SUBSCRIBE": "Subscriu-te a la carpeta",
+		"BUTTON_UNSUBSCRIBE": "Cancel·la la subscripció a la carpeta",
+		"LOADING_PROCESS": "S’està actualitzant la llista de carpetes…",
+		"CREATING_PROCESS": "S’està creant la carpeta…",
+		"DELETING_PROCESS": "S’està suprimint la carpeta…",
+		"RENAMING_PROCESS": "S’està canviant el nom de la carpeta…",
+		"TO_MANY_FOLDERS_DESC_1": "Teniu massa carpetes.",
+		"TO_MANY_FOLDERS_DESC_2": "Només n’hem mostrat una part per evitar problemes de rendiment.",
+		"HELP_DELETE_FOLDER": "Suprimeix la carpeta",
+		"HELP_SHOW_HIDE_FOLDER": "Mostra o amaga la carpeta",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Activa o desactiva la comprovació de missatges nous",
+		"HIDE_UNSUBSCRIBED": "Amaga les carpetes sense subscripció",
+		"UNHIDE_KOLAB_FOLDERS": "Mostra les carpetes Kolab ocultes",
+		"TYPE_CALENDAR": "Calendari",
+		"TYPE_CONFIGURATION": "Configuració",
+		"TYPE_CONTACTS": "Contactes",
+		"TYPE_FILES": "Fitxers",
+		"TYPE_JOURNAL": "Diari",
+		"TYPE_NOTES": "Notes",
+		"TYPE_TASKS": "Tasques"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Comptes",
+		"LEGEND_IDENTITIES": "Identitats",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Comptes i identitats",
+		"BUTTON_ADD_ACCOUNT": "Afegeix un compte",
+		"BUTTON_ADD_IDENTITY": "Afegeix una identitat",
+		"LOADING_PROCESS": "S’està actualitzant…",
+		"SHOW_UNREAD": "Mostra el nombre de missatges no llegits"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Importa una clau",
+		"BUTTON_GENERATE_KEY_PAIR": "Genera un parell de claus",
+		"IMPORT_FROM_SERVER": "Importa del servidor",
+		"TITLE_PRIVATE": "Privat",
+		"TITLE_PUBLIC": "Públic",
+		"GET_MAILVELOPE": "Obteniu l’extensió Mailvelope per al navegador."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Ajuda per a les dreceres de teclat",
+		"TAB_MAILBOX": "Bústia de correu",
+		"TAB_MESSAGE_LIST": "Llista de missatges",
+		"TAB_MESSAGE_VIEW": "Vista de missatges",
+		"TAB_COMPOSE": "Escriu",
+		"LABEL_OPEN_USER_DROPDOWN": "Obre el desplegable d’usuaris",
+		"LABEL_REPLY": "Respon",
+		"LABEL_REPLY_ALL": "Respon a tothom",
+		"LABEL_FORWARD": "Reenvia",
+		"LABEL_FORWARD_MULTIPLY": "Reenvia com a fitxers adjunts",
+		"LABEL_CHECK_ALL": "Selecciona tots els missatges",
+		"LABEL_DELETE": "Suprimeix",
+		"LABEL_OPEN_THREAD": "Obre la conversa seleccionada",
+		"LABEL_MOVE": "Mou",
+		"LABEL_READ": "Marca els missatges seleccionats com a llegits",
+		"LABEL_UNREAD": "Marca els missatges seleccionats com a no llegits",
+		"LABEL_IMPORTANT": "Destaca els missatges seleccionats",
+		"LABEL_CANCEL_SEARCH": "Cancel·la la cerca",
+		"LABEL_FULLSCREEN_ENTER": "Pantalla completa (disposició de previsualització)",
+		"LABEL_VIEW_MESSAGE_ENTER": "Mostra el missatge (sense disposició de previsualització)",
+		"LABEL_SWITCH_TO_MESSAGE": "Canvia el focus al missatge seleccionat",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Canvia el focus a la llista de carpetes",
+		"LABEL_FULLSCREEN_TOGGLE": "Commuta el mode de pantalla completa",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Mostra o amaga el text citat dels missatges",
+		"LABEL_THREAD_NEXT": "Missatge següent de la conversa",
+		"LABEL_THREAD_PREV": "Missatge anterior de la conversa",
+		"LABEL_EXIT_FULLSCREEN": "Surt del mode de pantalla completa",
+		"LABEL_CLOSE_MESSAGE": "Tanca el missatge (sense disposició de previsualització)",
+		"LABEL_SWITCH_TO_LIST": "Torna el focus a la llista de missatges",
+		"LABEL_OPEN_COMPOSE_POPUP": "Obre la finestra de redacció",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimitza la finestra de redacció",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Obre el desplegable d’identitats",
+		"LABEL_SAVE_MESSAGE": "Desa el missatge",
+		"LABEL_SEND_MESSAGE": "Envia el missatge",
+		"LABEL_CLOSE_COMPOSE": "Tanca la finestra de redacció"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "La sol·licitud ha fallat",
+		"RequestAborted": "S’ha cancel·lat la sol·licitud",
+		"RequestTimeout": "S’ha esgotat el temps d’espera de la sol·licitud",
+		"InvalidToken": "Testimoni no vàlid",
+		"AuthError": "Ha fallat l’autenticació",
+		"ConnectionError": "No es pot connectar amb el servidor.",
+		"DomainAlreadyExists": "El domini ja existeix.",
+		"DomainNotAllowed": "El domini no es permet.",
+		"AccountNotAllowed": "El compte no es permet.",
+		"CryptKeyError": "La contrasenya d’accés ha canviat",
+		"ContactsSyncError": "Error de sincronització dels contactes",
+		"CantGetMessageList": "No es pot obtenir la llista de missatges.",
+		"CantGetMessage": "No es pot obtenir el missatge.",
+		"CantDeleteMessage": "No es pot suprimir el missatge.",
+		"CantCopyMessage": "No s’ha pogut copiar el missatge",
+		"CantMoveMessage": "No es pot moure el missatge.",
+		"CantSaveMessage": "No es pot desar el missatge.",
+		"CantSendMessage": "No es pot enviar el missatge.",
+		"InvalidRecipients": "Destinataris no vàlids",
+		"CantSaveFilters": "No es poden desar els filtres.",
+		"CantGetFilters": "No es poden obtenir els filtres.",
+		"CantActivateFiltersScript": "No s’ha pogut activar l’script de filtres",
+		"CantDeleteFiltersScript": "No s’ha pogut eliminar l’script de filtres",
+		"FiltersAreNotCorrect": "Els filtres no són correctes.",
+		"CantCreateFolder": "No es pot crear la carpeta.",
+		"CantRenameFolder": "No es pot canviar el nom de la carpeta.",
+		"CantDeleteFolder": "No es pot suprimir la carpeta.",
+		"CantDeleteNonEmptyFolder": "No es pot suprimir una carpeta que no és buida.",
+		"CantSubscribeFolder": "No es pot activar la subscripció a la carpeta.",
+		"CantUnsubscribeFolder": "No es pot cancel·lar la subscripció a la carpeta.",
+		"DemoSendMessageError": "Per raons de seguretat, aquest compte no està autoritzat a enviar missatges a adreces de correu electrònic externes.",
+		"DemoAccountError": "Per raons de seguretat, aquest compte no té permís per a aquesta acció.",
+		"AccountAlreadyExists": "El compte ja existeix.",
+		"AccountDoesNotExist": "El compte no existeix.",
+		"AccountSwitchFailed": "No s’ha pogut canviar al compte «%EMAIL%».",
+		"MailServerError": "Hi ha hagut un error en accedir al servidor de correu.",
+		"InvalidInputArgument": "Argument d’entrada no vàlid",
+		"UnknownError": "Error desconegut"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json b/snappymail/v/0.0.0/app/localization/cs/admin.json
similarity index 70%
rename from snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
rename to snappymail/v/0.0.0/app/localization/cs/admin.json
index fa5db6928..304fd630d 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/admin.json
+++ b/snappymail/v/0.0.0/app/localization/cs/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Přidat",
+		"CLOSE": "Zavřít",
 		"SAVE": "Uložit",
-		"UPDATE": "Aktualizovat"
+		"TEST": "Test",
+		"UPDATE": "Aktualizovat",
+		"USERNAME": "Uživatelské jméno",
+		"PASSWORD": "Heslo",
+		"CANCEL": "Zrušit",
+		"SEARCH": "Nebyly nalezeny žádné kontakty",
+		"YES": "Ano",
+		"NO": "Ne"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Heslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Přihlásit do administrace"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Administrační panel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Základní",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_DOMAINS_NAME": "Domény",
-		"LABEL_SECURITY_NAME": "Zabezpečení",
-		"LABEL_PACKAGES_NAME": "Balíčky",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Info"
+		"GENERAL": "Základní",
+		"LOGIN": "Login",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontakty",
+		"DOMAINS": "Domény",
+		"SECURITY": "Zabezpečení",
+		"PACKAGES": "Balíčky",
+		"CONFIG": "Config",
+		"ABOUT": "Info"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Rozhraní",
@@ -31,13 +39,12 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Povolit výběr jazyka na přihlašovací obrazovce",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Povolit výběr motivu na přihlašovací obrazovce",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Povolit výběr pozadí na přihlašovací obrazovce",
-		"LABEL_NEW_FOLDER_MOVE": "Nové tlačítko \"přesunout do adresáře\"",
 		"LABEL_SHOW_THUMBNAILS": "Zobrazovat miniatury (přílohy)",
 		"LEGEND_MAIN": "Hlavní",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Limit velikosti přílohy",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Povolit přidávat další účty",
 		"LABEL_ALLOW_IDENTITIES": "Povolit další identity",
-		"ALERT_DATA_ACCESS": "Adresář s RainLoop daty je veřejně přístupný. Nakonfigurujte prosím webový server tak, aby skryl adresář data z externího přístupu. Více zde:",
+		"ALERT_DATA_ACCESS": "Adresář s SnappyMail daty je veřejně přístupný. Nakonfigurujte prosím webový server tak, aby skryl adresář data z externího přístupu. Více zde:",
 		"ALERT_WARNING": "Upozornění!",
 		"HTML_ALERT_WEAK_PASSWORD": "Používáte výchozí administrátorské heslo.\n<br>\nZ bezpečnostních důvodů jej prosím\n<strong><a href=\"#\/security\">změňte<\/a><\/strong>.\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Výchozí doména",
 		"LABEL_DETERMINE_USER_DOMAIN": "Zkoušet odvodit doménu z uživatelského jména",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Povolit výběr jazyka na přihlašovací obrazovce",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Zkoušet odvodit jazyk pro uživatele",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Zkoušet odvodit jazyk pro uživatele"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Uživatel",
 		"LABEL_STORAGE_PASSWORD": "Heslo",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Použít globální databázi místo databáze pro každý účet",
 		"ALERT_NOTICE": "Upozornění!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nepoužívejte tento typ databáze při velkém počtu aktivních uživatelů.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Váš systém nepodporuje kontakty.\n<br>\nJe potřeba nainstalovat nebo povolit <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong>\nrozšíření na vašem serveru.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",
 		"LABEL_USE_IMAGE_PROXY": "Použít lokální proxy pro externí obrázky",
-		"LABEL_ALLOW_OPEN_PGP": "Povolit OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Zobrazit PHP informace (php_info)",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Přístupové údaje administrace",
 		"LABEL_CURRENT_PASSWORD": "Současné heslo",
-		"LABEL_NEW_LOGIN": "Nový login",
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Znovu",
-		"BUTTON_UPDATE_PASSWORD": "Aktualizovat heslo",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Vyžadovat ověření SSL certifikátu (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Vyžadovat ověření SSL certifikátu",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Povolit self-signed certifikáty"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Jednoduchý, moderní a rychlý webový emailový klient",
 		"LABEL_ALL_RIGHTS_RESERVED": "Všechna práva vyhrazena.",
 		"HINT_READ_CHANGE_LOG": "Přečtěte si prosím change log předtím, než budete chtít provést aktualizaci.",
-		"HINT_IS_UP_TO_DATE": "RainLoop je v aktuální verzi.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail je v aktuální verzi.",
 		"HTML_NEW_VERSION": "Nová verze <b>%VERSION%<\/b> je k dispozici.",
 		"LABEL_UPDATING": "Aktualizuji",
 		"LABEL_CHECKING": "Kontroluji nové aktualizace",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Přidat alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Doména",
-		"BUTTON_CLOSE": "Zavřít",
-		"BUTTON_ADD": "Přidat"
+		"LABEL_DOMAIN": "Doména"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Přidat Doménu",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Editovat Doménu \"%NAME%\"",
 		"LABEL_NAME": "Název",
 		"NAME_HELPER": "wildcard podporovány",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Zabezpečení",
-		"LABEL_WHITE_LIST": "White List",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Zakázat capabilities",
+		"LIMITS": "Limity",
+		"FOLDERS": "Složky",
+		"MESSAGES": "Zprávy",
 		"SECURE_OPTION_NONE": "Žádné",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Povolit SIEVE skripty",
 		"LABEL_USE_SHORT_LOGIN": "Používat krátký login",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Používat autorizaci",
-		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_SET_SENDER": "Použít přihlašovací jméno jako odesílatele",
+		"LABEL_AUTH_PLAIN_LINE": "Vynutit přihlášení pomocí jednoho příkazu AUTH PLAIN",
 		"LABEL_USE_PHP_MAIL": "Používat php mail() funkci",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "White List",
-		"BUTTON_SIEVE_CONFIGURATION": "SIEVE konfigurace",
-		"BUTTON_BACK_TO_IMAP": "Zpět na IMAP nastavení",
-		"BUTTON_BACK": "Zpět",
-		"BUTTON_CLOSE": "Zavřít",
-		"BUTTON_ADD": "Přidat",
-		"BUTTON_UPDATE": "Aktualizovat",
-		"NEW_DOMAIN_DESC": "Konfigurace této domény umožní používat <i>%NAME%<\/i> adresy.",
-		"WHITE_LIST_ALERT": "Seznam domén s povoleným uživatelským přístupem\nPoužijte mezeru pro jejich oddělení.\n"
+		"NEW_DOMAIN_DESC": "Konfigurace této domény umožní používat <strong>%NAME%<\/strong> adresy.",
+		"WHITE_LIST_ALERT": "Seznam domén s povoleným uživatelským přístupem\nPoužijte mezeru pro jejich oddělení.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
-		"DESC_NOTHING_TO_CONFIGURE": "Není zde nic ke konfiguraci",
-		"BUTTON_CLOSE": "Zavřít"
+		"DESC_NOTHING_TO_CONFIGURE": "Není zde nic ke konfiguraci"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Jste si jistí, že opravdu chcete zavřít toto okno?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Varování!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Neznámá chyba"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neplatný token",
-		"AUTH_ERROR": "Chyba autorizace",
-		"DOMAIN_ALREADY_EXISTS": "Tato doména již existuje",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Nastavení se nepodařilo uložit",
-		"CANT_INSTALL_PACKAGE": "Instalace balíčku se nezdařila",
-		"CANT_DELETE_PACKAGE": "Odstranění balíčku se nezdařilo",
-		"INVALID_PLUGIN_PACKAGE": "Nevalidní balíček",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Nepodporovaný balíček rozšíření",
-		"UNKNOWN_ERROR": "Neznámá chyba"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neplatný token",
+		"AuthError": "Chyba autorizace",
+		"DomainAlreadyExists": "Tato doména již existuje",
+		"CantSavePluginSettings": "Nastavení se nepodařilo uložit",
+		"CantInstallPackage": "Instalace balíčku se nezdařila",
+		"CantDeletePackage": "Odstranění balíčku se nezdařilo",
+		"InvalidPluginPackage": "Nevalidní balíček",
+		"UnsupportedPluginPackage": "Nepodporovaný balíček rozšíření",
+		"UnknownError": "Neznámá chyba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/cs/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/cs-CZ/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/cs/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/static.json b/snappymail/v/0.0.0/app/localization/cs/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/cs-CZ/static.json
rename to snappymail/v/0.0.0/app/localization/cs/static.json
diff --git a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json b/snappymail/v/0.0.0/app/localization/cs/user.json
similarity index 52%
rename from snappymail/v/0.0.0/app/localization/cs-CZ/user.json
rename to snappymail/v/0.0.0/app/localization/cs/user.json
index 2338320f0..7e1a5c526 100644
--- a/snappymail/v/0.0.0/app/localization/cs-CZ/user.json
+++ b/snappymail/v/0.0.0/app/localization/cs/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archivace",
 		"ARE_YOU_SURE": "Jste si jisti?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Zavřít (Esc)",
 		"CONTACTS": "Adresář",
 		"DELETE": "Odstranit",
+		"UNDELETE": "Obnovit",
 		"DONE": "Dokončit",
 		"EMAIL": "Email",
 		"FROM": "Odesílatel",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Odhlásit",
 		"MORE": "Více",
 		"MOVE_TO": "Přesunout do",
+		"COPY_TO": "Kopírovat do",
 		"NAME": "Přijaté",
 		"NONE": "Žádný",
+		"TO_SPAM": "Přesunout zprávu(y) do spamu",
 		"NOT_SPAM": "Není to spam",
+		"USERNAME": "Uživatelské jméno",
 		"PASSWORD": "Heslo",
+		"REMEMBER": "Zapamatovat",
 		"REPLY_TO": "Adresa odpovědi",
 		"SAVE": "Uložit",
+		"SAVE_CHANGES": "Uložit změny?",
 		"SEARCH": "Nebyly nalezeny žádné kontakty",
-		"SPAM": "Je to spam",
+		"SPAM": "Spam",
 		"SUBJECT": "Předmět",
 		"TEST": "Test",
-		"TO": "Příjemce"
+		"TO": "Příjemce",
+		"SERVER_MESSAGE": "Zpráva serveru",
+		"YES": "Ano",
+		"NO": "Ne",
+		"INACTIVE": "Neaktivní",
+		"DEFAULT": "Výchozí",
+		"HELP": "Nápověda",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Přílohy"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Uživatelské jméno",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Přihlásit"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Přidat účet",
-		"BUTTON_SETTINGS": "Nastavení",
-		"BUTTON_HELP": "Nápověda"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilní verze",
-		"BUTTON_DESKTOP_VERSION": "Desktop verze"
+		"BUTTON_ADD_ACCOUNT": "Přidat účet"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Rozšířené hledání",
-		"LABEL_ADV_TEXT": "Text",
-		"LABEL_ADV_HAS_ATTACHMENT": "S přílohou",
-		"LABEL_ADV_HAS_ATTACHMENTS": "S přílohami",
-		"LABEL_ADV_FLAGGED": "Označené hvězdičkou",
-		"LABEL_ADV_UNSEEN": "Nepřečtené",
-		"LABEL_ADV_DATE": "Datum",
-		"LABEL_ADV_DATE_ALL": "Kdykoliv",
-		"LABEL_ADV_DATE_3_DAYS": "Ne starší než 3 dny",
-		"LABEL_ADV_DATE_7_DAYS": "Ne starší než týden",
-		"LABEL_ADV_DATE_MONTH": "Ne starší než měsíc",
-		"LABEL_ADV_DATE_3_MONTHS": "Ne starší než 3 měsíce",
-		"LABEL_ADV_DATE_6_MONTHS": "Ne starší než 6 měsíců",
-		"LABEL_ADV_DATE_YEAR": "Ne starší než 1 rok",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Celá obrazovka",
-		"ZOOM": "Zvětšit\/zmenšit",
-		"CLOSE": "Zavřít (Esc)",
-		"GALLERY_PREV": "Předchozí",
-		"GALLERY_NEXT": "Další",
-		"GALLERY_COUNTER": "%curr% z %total%"
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "S přílohou",
+		"FLAGGED": "Označené hvězdičkou",
+		"UNSEEN": "Nepřečtené",
+		"DATE": "Datum",
+		"DATE_ALL": "Kdykoliv",
+		"BEFORE_3_DAYS": "Starší než 3 dny",
+		"BEFORE_7_DAYS": "Starší než 1 týden",
+		"BEFORE_MONTH": "Starší než 1 měsíc",
+		"BEFORE_3_MONTHS": "Starší než 3 měsíce",
+		"BEFORE_6_MONTHS": "Starší než 6 měsíců",
+		"BEFORE_YEAR": "Starší než 1 rok",
+		"SINCE_3_DAYS": "Ne starší než 3 dny",
+		"SINCE_7_DAYS": "Ne starší než týden",
+		"SINCE_MONTH": "Ne starší než měsíc",
+		"SINCE_3_MONTHS": "Ne starší než 3 měsíce",
+		"SINCE_6_MONTHS": "Ne starší než 6 měsíců",
+		"SINCE_YEAR": "Ne starší než 1 rok",
+		"SUBFOLDERS": "Podsložky",
+		"SUBFOLDERS_NONE": "Žádné",
+		"SUBFOLDERS_SUBTREE": "Všechny",
+		"SUBFOLDERS_SUBTREE_ONE": "Jedna úroveň",
+		"REPLIED": "Odpovězeno",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Vytvořit",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Koš",
 		"ARCHIVE_NAME": "Archiv"
 	},
-	"QUOTA": {
-		"TITLE": "Využití kvóty"
+	"IMAP": {
+		"ACL_RIGHTS": "Oprávnění",
+		"ACL_A": "Spravovat",
+		"ACL_E": "Vymazat",
+		"ACL_I": "Vkládat zprávy",
+		"ACL_K": "Vytvářet podsložky",
+		"ACL_L": "Zobrazit zprávy",
+		"ACL_P": "Odesílat poštu",
+		"ACL_R": "Vybrat složku",
+		"ACL_S": "\\SEEN značka",
+		"ACL_T": "\\DELETED značka",
+		"ACL_W": "Ostatní značky",
+		"ACL_X": "Smazat\/Přejmenovat složku"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Obnovit seznam zpráv",
@@ -99,25 +118,28 @@
 		"MENU_SELECT_SEEN": "Přečtené",
 		"MENU_SELECT_FLAGGED": "Označené",
 		"MENU_SELECT_UNFLAGGED": "Neoznačené",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Stáhnout všechny přílohy",
 		"EMPTY_LIST": "Seznam je prázdný",
 		"EMPTY_SEARCH_LIST": "Vašemu vyhledávání neodpovídají žádné zprávy.",
 		"SEARCH_RESULT_FOR": "Výsledky vyhledávání pro \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Zpět na seznam zpráv",
-		"EMPTY_SUBJECT_TEXT": "(Bez předmětu)",
 		"PUT_MESSAGE_HERE": "Přesuňte zprávu sem pro její zobrazení v seznamu",
 		"TODAY_AT": "Dnes v %TIME%",
 		"YESTERDAY_AT": "Včera v %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Máte %COUNT% nových zpráv!",
 		"QUOTA_SIZE": "Používáte <strong>%SIZE% (%PROC%%)<\/strong> z vašich <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
+		"SORT": "Seřadit",
+		"NO_SORT": "Server nepodporuje řazení",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "Datum vzestupně",
+		"SORT_DATE_DESC": "Datum sestupně",
+		"SORT_SIZE_ASC": "Velikost vzestupně",
+		"SORT_SIZE_DESC": "Velikost sestupně",
+		"SORT_SUBJECT_ASC": "Předmět A-Z",
+		"SORT_SUBJECT_DESC": "Předmět Z-A",
+		"SORT_FROM_ASC": "Od A-Z",
+		"SORT_FROM_DESC": "Od Z-A"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Editovat",
@@ -136,8 +158,9 @@
 		"BUTTON_THREAD_MORE": "Více zpráv",
 		"MENU_HEADERS": "Zobrazit hlavičku zprávy",
 		"MENU_VIEW_ORIGINAL": "Zobrazit zdroj",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Zobrazit HTML zprávu",
+		"PLAIN_VIEW": "Zobrazit prostý text",
+		"SWAP_COLORS": "Prohodit výchozí barvy (pozadí)",
 		"MENU_DOWNLOAD_ORIGINAL": "Stáhnout jako soubor .eml",
 		"MENU_FILTER_SIMILAR": "Filtrovat zprávy jako tato",
 		"MENU_PRINT": "Tisknout",
@@ -149,8 +172,21 @@
 		"MESSAGE_VIEW_DESC": "Vyberte zprávu ze seznamu pro její zobrazení zde.",
 		"MESSAGE_VIEW_MOVE_DESC": "Vyberte cílovou složku v levém panelu.",
 		"LINK_DOWNLOAD_AS_ZIP": "Stáhnout jako zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"SPAM_SCORE": "Spam skóre",
+		"HAS_VIRUS_WARNING": "VAROVÁNÍ: detekován virus",
+		"TAGS": "Tagy",
+		"NEW_TAG": "Nový tag",
+		"ENABLE_TRACKING_LINKS": "Povolit sledování odkazů",
+		"TRACKING_ENABLED": "Odkazy jsou nyní při kliknutí sledovány!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Důležité",
+		"$todo": "Úkol",
+		"$label1": "Důležité",
+		"$label2": "Práce",
+		"$label3": "Osobní",
+		"$label4": "Úkol",
+		"$label5": "Později"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Potvrzení o zobrazení zprávy - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Hledám..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Kontakt",
+		"TAB_LOCATIONS": "Umístění",
+		"TAB_BUSINESS": "Firma",
+		"LABEL_ORGANIZATION": "Organizace",
+		"LABEL_DEPARTMENT": "Oddělení",
+		"LABEL_TITLE": "Titul",
+		"TAB_CRYPTO": "Šifrování",
+		"ASK": "Zeptat se",
+		"NEVER": "Nikdy",
+		"ALWAYS": "Vždy",
+		"ALWAYS_IF_POSSIBLE": "Vždy když je to možné",
 		"BUTTON_ADD_CONTACT": "Přidat kontakt",
 		"BUTTON_CREATE_CONTACT": "Vytvořit",
-		"BUTTON_UPDATE_CONTACT": "Aktualizovat",
 		"BUTTON_IMPORT": "Importovat (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exportovat (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exportovat (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nebyly nalezeny žádné kontakty",
 		"CLEAR_SEARCH": "Smazat vyhledávání",
 		"CONTACT_VIEW_DESC": "Vyberte kontakt ze seznamu pro zobrazení zde.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Narozeniny",
-		"LINK_ADD_EMAIL": "Přidat email",
-		"LINK_ADD_PHONE": "Přidat telefon",
-		"LINK_BIRTHDAY": "Narozeniny",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Zadejte zobrazované jméno",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Zadejte příjmení",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Zadejte jméno",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Zadejte přezdívku",
+		"DISPLAY_NAME": "Zobrazované jméno",
+		"LAST_NAME": "Příjmení",
+		"FIRST_NAME": "Jméno",
+		"MIDDLE_NAME": "Prostřední jméno",
+		"NAME_PREFIX": "Titul před",
+		"NAME_SUFFIX": "Titul za",
+		"NICK_NAME": "Přezdívku",
 		"LABEL_READ_ONLY": "Jen pro čtení",
-		"LABEL_SHARE": "Sdílet",
 		"ADD_MENU_LABEL": "Přidat",
 		"ADD_MENU_NICKNAME": "Přezdívka",
-		"ADD_MENU_NOTES": "Poznámka",
+		"ADD_MENU_NOTE": "Poznámka",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresa",
 		"ADD_MENU_BIRTHDAY": "Narozeniny",
 		"ADD_MENU_TAGS": "Tagy",
 		"BUTTON_SHARE_ALL": "Vše",
-		"BUTTON_SYNC": "Synchronizace (CardDAV)"
+		"BUTTON_SYNC": "Synchronizace (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Poslat na všechny emailové adresy kontaktu"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "zobrazit všechna pole",
@@ -203,20 +247,23 @@
 		"DISCARD_UNSAVED_DATA": "Neuložit změny?",
 		"ATTACH_FILES": "Připojit soubory",
 		"ATTACH_DROP_FILES_DESC": "Soubory přetáhněte sem",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% wrote",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Forwarded message -------",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% napsal",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Přeposlaná zpráva -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Odeslat",
 		"EMPTY_TO_ERROR_DESC": "Zadejte prosím alespoň jednoho příjemce",
 		"NO_ATTACHMENTS_HERE_DESC": "Žádné přílohy.",
 		"ATTACHMENTS_ERROR_DESC": "Upozornění! Některé přílohy nebyly nahrány.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Některé přílohy ještě nebyly nahrány",
+		"ALLOW_SPELLCHECK": "Povolit kontrolu pravopisu prohlížeče",
+		"ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžádat si potvrzení o přečtení",
 		"BUTTON_MARK_AS_IMPORTANT": "Označit jako důležité",
-		"BUTTON_REQUEST_DSN": "Vyžádat si potvrzení o přijetí"
+		"BUTTON_REQUEST_DSN": "Vyžádat si potvrzení o přijetí",
+		"BUTTON_REQUIRE_TLS": "Vyžadovat bezpečné doručení",
+		"ERROR_EMPTY_BODY": "Tělo zprávy je prázdné"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ano",
-		"BUTTON_NO": "Ne",
+		"EXIT_ARE_YOU_SURE": "Opravdu chcete ukončit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Opravdu chcete zavřít toto okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Opravdu chcete odstranit tyto zprávy?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Zvolte jazyk"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Přidat účet?",
+		"TITLE_ADD_ACCOUNT": "Přidat účet",
 		"BUTTON_ADD_ACCOUNT": "Přidat",
-		"TITLE_UPDATE_ACCOUNT": "Upravit účet?",
-		"BUTTON_UPDATE_ACCOUNT": "Upravit"
+		"TITLE_UPDATE_ACCOUNT": "Upravit účet"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Opravdu přidat?",
-		"TITLE_UPDATE_IDENTITY": "Uložit změny?",
+		"TITLE_ADD_IDENTITY": "Opravdu přidat",
+		"TITLE_UPDATE_IDENTITY": "Uložit změny",
+		"LABEL": "Štítek",
 		"BUTTON_ADD_IDENTITY": "Přidat",
-		"BUTTON_UPDATE_IDENTITY": "Uložit",
+		"SIGNATURE": "Podpis",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "V odpovědích vložit podpis před citovaný text."
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Vytvořit složku?",
+		"TITLE_CREATE_FOLDER": "Vytvořit složku",
 		"LABEL_PARENT": "Nadřazená složka",
 		"BUTTON_CREATE": "Vytvořit",
 		"TITLE_CREATING_PROCESS": "Vytvářím složku"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Tento proces není možné přerušit.",
 		"TITLE_CLEARING_PROCESS": "Odstraňuje se složka..."
 	},
+	"CRYPTO": {
+		"SIGN": "Podpis",
+		"ENCRYPT": "Šifrování",
+		"DECRYPT": "Dešifrovat",
+		"VERIFY": "Ověřit",
+		"GOOD_SIGNATURE": "Ověřený podpis od %USER%",
+		"ERROR": "%TYPE% chyba: %ERROR%",
+		"CREATE_SELF_SIGNED": "Vytvořit samopodepsaný",
+		"VALID_UNTIL": "Platný do",
+		"PRIVATE_KEY": "Soukromý klíč",
+		"CHANGE_PASS": "Změnit heslo",
+		"CURRENT_PASS": "Aktuální heslo",
+		"NEW_PASS": "Nové heslo",
+		"ASK_CRYPTKEY_PASS": "Vaše přihlašovací heslo se změnilo. Vyplňte prosím své staré přihlašovací heslo pro dešifrování dat"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import OpenPGP klíče",
 		"POPUP_IMPORT_BUTTON": "Import",
@@ -256,21 +318,27 @@
 		"POPUP_VIEW_BUTTON": "Vybrat",
 		"POPUP_GENERATE_TITLE": "Generovat OpenPGP klíče",
 		"POPUP_GENERATE_BUTTON": "Generovat",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Podpis",
-		"LABEL_ENCRYPT": "Šifrování",
-		"BUTTON_DECRYPT": "Dešifrovat",
-		"BUTTON_VERIFY": "Verify",
+		"LABEL_KEY_TYPE": "Typ",
 		"SIGNED_MESSAGE": "Zpráva podepsaná OpenPGP",
 		"ENCRYPTED_MESSAGE": "Zpráva šifrovaná OpenPGP",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Ověřený podpis od %USER%",
-		"ERROR": "OpenPGP chyba: %ERROR%"
+		"STORE_IN_GNUPG": "Uložit na server v GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Uložit veřejný klíč na server v GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Uložit soukromý klíč na server v GnuPG",
+		"BACKUP_ON_SERVER": "Uložit (šifrované) na server",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Zálohovat veřejný klíč na server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Zálohovat soukromý klíč na server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certifikátu",
+		"CERTIFICATE": "Certifikát",
+		"CERTIFICATES": "S\/MIME certifikáty",
+		"SIGNED_MESSAGE": "Zpráva podepsaná S\/MIME",
+		"ENCRYPTED_MESSAGE": "Zpráva šifrovaná S\/MIME",
+		"PRIVATE_KEY_OF": "Soukromý klíč S\/MIME pro %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Vytvořit filtr?",
-		"TITLE_EDIT_FILTER": "Změnit filtr?",
+		"TITLE_CREATE_FILTER": "Vytvořit filtr",
+		"TITLE_EDIT_FILTER": "Změnit filtr",
 		"LEGEND_CONDITIONS": "Podmínka",
 		"LEGEND_ACTIONS": "Akce",
 		"BUTTON_ADD_CONDITION": "Přidat podmínku",
@@ -281,13 +349,13 @@
 		"SELECT_ACTION_DISCARD": "Zahodit",
 		"SELECT_FIELD_RECIPIENTS": "Příjemci (Komu nebo Kopie)",
 		"SELECT_FIELD_HEADER": "Hlavička",
-		"SELECT_FIELD_BODY": "Body",
+		"SELECT_FIELD_BODY": "Tělo",
 		"SELECT_FIELD_SIZE": "Velikost",
 		"SELECT_TYPE_CONTAINS": "Obsahuje",
 		"SELECT_TYPE_NOT_CONTAINS": "Neobsahuje",
-		"SELECT_TYPE_MATCHES": "Odpovídá (můžete použit * a ? )",
-		"SELECT_TYPE_NOT_MATCHES": "Neodpovídá (můžete použit * a ? )",
-		"SELECT_TYPE_REGEXP": "egulární výraz",
+		"SELECT_TYPE_MATCHES": "Odpovídá (můžete použít * a ? )",
+		"SELECT_TYPE_NOT_MATCHES": "Neodpovídá (můžete použít * a ? )",
+		"SELECT_TYPE_REGEXP": "Regulární výraz",
 		"SELECT_TYPE_NOT_REGEXP": "Není regulární výraz",
 		"SELECT_TYPE_EQUAL_TO": "Rovná se",
 		"SELECT_TYPE_NOT_EQUAL_TO": "Nerovná se",
@@ -297,10 +365,10 @@
 		"SELECT_TYPE_RAW": "Raw",
 		"SELECT_MATCH_ANY": "Vyhovuje alespoň jednomu pravidlu",
 		"SELECT_MATCH_ALL": "Vyhovuje všem pravidlům",
-		"MARK_AS_READ_LABEL": "Odznačit jako přečtené",
+		"MARK_AS_READ_LABEL": "Označit jako přečtené",
 		"REPLY_INTERVAL_LABEL": "Interval odpovědi (dny)",
 		"KEEP_LABEL": "Zachovat",
-		"STOP_LABEL": "Neukončovat zpracování pravidel",
+		"STOP_LABEL": "Zastavit další zpracování pravidel",
 		"VACATION_SUBJECT_LABEL": "Předmět (volitelný)",
 		"VACATION_MESSAGE_LABEL": "Zpráva",
 		"VACATION_RECIPIENTS_LABEL": "Příjemci (odděleni čárkou)",
@@ -308,12 +376,12 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Všechny příchozí zprávy"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
+		"TITLE_CREATE": "Vytvořit skript",
+		"TITLE_EDIT": "Upravit skript",
+		"BUTTON_ADD_FILTER": "Přidat filtr",
+		"BUTTON_RAW_SCRIPT": "Použít vlastní uživatelský skript",
 		"CAPABILITY_LABEL": "Schopnost",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Tyto změny musí být uloženy na server."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
 		"TITLE_SYSTEM_FOLDERS": "Spravovat systémové složky",
@@ -336,67 +404,109 @@
 		"ERROR_MISSING_TEMP_FOLDER": "Chybí dočasný soubor",
 		"ERROR_ON_SAVING_FILE": "Nastala neznámá chyba při ukládání",
 		"ERROR_FILE_TYPE": "Neplatný typ souboru",
-		"ERROR_UNKNOWN": "Nastala neznámá chyba při nahrávaní"
+		"ERROR_UNKNOWN": "Nastala neznámá chyba při nahrávání"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> ZDROJ",
+		"FONTFAMILY": "Rodina písma",
+		"FONTSIZE": "Velikost písma",
+		"DIR": "Směr textu",
+		"DIR_LTR": "Zleva doprava",
+		"DIR_RTL": "Zprava doleva",
+		"DIR_AUTO": "Automaticky",
+		"TEXTCOLOR": "Barva textu",
+		"BACKGROUNDCOLOR": "Barva pozadí",
+		"BOLD": "Tučné",
+		"ITALIC": "Kurzíva",
+		"UNDERLINE": "Podtržení",
+		"STRIKE": "Přeškrtnutí",
+		"SUB": "Dolní index",
+		"SUP": "Horní index",
+		"OL": "Číslovaný seznam",
+		"UL": "Nečíslovaný seznam",
+		"QUOTE": "Citace",
+		"INDENTDECREASE": "Zmenšit odsazení",
+		"INDENTINCREASE": "Zvětšit odsazení",
+		"LINK": "Odkaz",
+		"IMAGEURL": "URL obrázku",
+		"IMAGEUPLOAD": "Výběr obrázku",
+		"UNDO": "Zpět",
+		"REDO": "Znovu",
+		"REMOVESTYLE": "Odstranit styl"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Osobní",
-		"LABEL_GENERAL_NAME": "Všeobecné",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_FOLDERS_NAME": "Složky",
-		"LABEL_ACCOUNTS_NAME": "Účty",
-		"LABEL_FILTERS_NAME": "Filtry",
-		"LABEL_SECURITY_NAME": "Zabezpečení",
-		"LABEL_THEMES_NAME": "Motivy"
+		"GENERAL": "Všeobecné",
+		"CONTACTS": "Kontakty",
+		"FOLDERS": "Složky",
+		"ACCOUNTS": "Účty",
+		"FILTERS": "Filtry",
+		"SECURITY": "Zabezpečení",
+		"THEMES": "Motivy"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtry",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
+		"SIMPLE": "Jednoduché",
+		"ADVANCED": "Pokročilé",
+		"BUTTON_ADD_SCRIPT": "Přidat skript",
 		"SUBNAME_MOVE_TO": "Přesunout do \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Přeposlat to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Odmítnout",
 		"SUBNAME_VACATION_MESSAGE": "Odpověď v nepřítomnosti",
-		"SUBNAME_DISCARD": "Zahodit",
-		"LOADING_PROCESS": "Aktualizovat seznam filtrů"
+		"SUBNAME_DISCARD": "Zahodit"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Zabezpečení",
 		"LABEL_AUTOLOGOUT": "Automatické odhlášení",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nikdy",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minut",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hodin"
+		"FORGET_KEY_PASS": "Zapomenout heslo k soukromému klíči",
+		"NEVER": "Nikdy"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Všeobecné",
-		"LABEL_LANGUAGE": "Jazyk",
-		"LABEL_IDENTITY": "Uživatel",
-		"LABEL_LAYOUT": "Rozložení",
-		"LABEL_LAYOUT_NO_SPLIT": "Nerozdělovat",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
-		"LABEL_EDITOR": "Přednastavený editor zpráv",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Text",
-		"LABEL_EDITOR_HTML_FORCED": "Html (vynucený)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Text (vynucený)",
-		"LABEL_VIEW_OPTIONS": "Možnosti zobrazení",
-		"LABEL_USE_PREVIEW_PANE": "Používáte panel rychlého zobrazení",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
-		"LABEL_USE_THREADS": "Zobrazit jako konverzace",
-		"LABEL_REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
-		"LABEL_SHOW_IMAGES": "Vždy zobrazovat obrázky v těle zprávy",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Zpráv na stranu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikace",
-		"LABEL_SOUND_NOTIFICATION": "Zvukové notifikace",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)"
+		"LANGUAGE": "Jazyk",
+		"HOUR_FORMAT": "Formát času",
+		"IDENTITY": "Uživatel",
+		"LAYOUT": "Rozložení",
+		"LAYOUT_NO_SPLIT": "Nerozdělovat",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikální rozdělení",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontální rozdělení",
+		"SHOW_NEXT_MESSAGE": "Zobrazit další zprávu při přesunutí\/odstranění aktuální zprávy",
+		"EDITOR": "Přednastavený editor zpráv",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Text",
+		"VIEW_OPTIONS": "Možnosti zobrazení",
+		"USE_PREVIEW_PANE": "Používat panel rychlého zobrazení",
+		"HIDE_DELETED_MESSAGES": "Skrýt zprávy označené ke smazání",
+		"USE_CHECKBOXES_IN_LIST": "Zobrazení zaškrtávacích políček v seznamu",
+		"USE_THREADS": "Zobrazit jako konverzace",
+		"THREAD_ALGORITHM": "Algoritmus konverzací",
+		"REPLY_SAME_FOLDER": "Ukládat odpovědi do složky se zprávou, které se týkají",
+		"PREFER_HTML": "Upřednostnit HTML před prostým textem",
+		"PREFER_HTML_INFO": "Zprávy někdy přicházejí v obou formátech. Tato volba určuje, zda chcete zobrazit HTML část nebo prostý text.",
+		"REMOVE_COLORS": "Odstranit barvy pozadí a textu z těla zprávy",
+		"ALLOW_STYLES": "Povolit CSS styly",
+		"MESSAGE_PER_PAGE": "Zpráv na stranu",
+		"CHECK_MAIL_INTERVAL": "Interval kontroly pošty",
+		"MARK_MESSAGE_READ_AFTER": "Označit zprávu jako přečtenou po",
+		"MSG_DEFAULT_ACTION": "Výchozí akce",
+		"SECONDS": "sekund",
+		"MINUTES": "minut",
+		"NOTIFICATIONS": "Notifikace",
+		"SOUND_NOTIFICATION": "Zvukové notifikace",
+		"CHROME_NOTIFICATION_DESC": "Zobrazovat upozornění na nové zprávy",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prohlížečem)",
+		"COLLAPSE_BLOCKQUOTES": "Sbalit citovaný text",
+		"MAX_QUOTE_LEVEL": "Maximální počet úrovní zobrazených citací",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Zobrazit vložené přílohy v seznamu",
+		"LIST_SIMPLE_ATTACHMENTS": "Jednoduchý seznam příloh",
+		"LIST_MESSAGES_GROUPED": "Seskupit zprávy v seznamu (při řazení podle data nebo odesílatele)",
+		"EXTERNAL_IMAGES": "Externí obrázky",
+		"IMAGES_OPTION_ASK": "Vždy se zeptat",
+		"IMAGES_OPTION_WHITELIST": "Seznam povolených nebo se zeptat",
+		"IMAGES_OPTION_ALWAYS": "Vždy zobrazit",
+		"IMAGES_WHITELIST": "Seznam povolených obrázků",
+		"MESSAGE_POPUP_WINDOW": "Otevřít zprávu v novém okně místo záložky",
+		"MAILTO": "Registrovat jako výchozí program pro 'mailto:' odkazy",
+		"HTML_TO_MD": "Převést HTML na Markdown místo prostého textu"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky přidávat adresy příjemců do Adresáře",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL adresáře",
 		"LABEL_CONTACTS_SYNC_USER": "Uživatel",
-		"SYNC_NO": "Ne",
-		"SYNC_YES": "Ano",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Pouze pro čtení"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motivy",
-		"LEGEND_THEMES_CUSTOM": "Správa vlastního motivu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Světlý",
-		"LABEL_CUSTOM_TYPE_DARK": "Tmavý",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Pozadí",
+		"LABEL_BACKGROUND": "Pozadí",
+		"LABEL_FONTS": "Písma",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Nahrát obrázek pozadí (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Soubor je příliš velký",
 		"ERROR_FILE_TYPE_ERROR": "Nesprávný typ souboru (povolené jsou pouze JPG a PNG)",
@@ -435,15 +540,16 @@
 		"TO_MANY_FOLDERS_DESC_2": "Můžeme zobrazit jen část z nich, abychom zabránili problémům s výkonem.",
 		"HELP_DELETE_FOLDER": "Smazat složku",
 		"HELP_SHOW_HIDE_FOLDER": "Zobrazit\/skrýt složku",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrovat\/nekontrolovat nové příchozí zprávy",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrovat nové příchozí zprávy",
+		"HIDE_UNSUBSCRIBED": "Skrýt neodebírané složky",
+		"UNHIDE_KOLAB_FOLDERS": "Zobrazit Kolab složky",
+		"TYPE_CALENDAR": "Kalendář",
+		"TYPE_CONFIGURATION": "Konfigurace",
+		"TYPE_CONTACTS": "Kontakty",
+		"TYPE_FILES": "Soubory",
+		"TYPE_JOURNAL": "Deník",
+		"TYPE_NOTES": "Poznámky",
+		"TYPE_TASKS": "Úkoly"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "Seznam účtů",
@@ -451,16 +557,16 @@
 		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Účty a aliasy",
 		"BUTTON_ADD_ACCOUNT": "Přidat účet",
 		"BUTTON_ADD_IDENTITY": "Přidat alias",
-		"LOADING_PROCESS": "Aktualizace seznamu účtů",
-		"DEFAULT_IDENTITY_LABEL": "výchozí"
+		"LOADING_PROCESS": "Aktualizuji seznam účtů",
+		"SHOW_UNREAD": "Zobrazit počet nepřečtených zpráv"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importovat klíč",
 		"BUTTON_GENERATE_KEY_PAIR": "Generovat klíče",
+		"IMPORT_FROM_SERVER": "Importovat ze serveru",
 		"TITLE_PRIVATE": "Soukromý",
 		"TITLE_PUBLIC": "Veřejný",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložit koncept",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Získat rozšíření Mailvelope pro prohlížeč"
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Klávesové zkratky",
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Odpovědět všem",
 		"LABEL_FORWARD": "Přeposlat",
 		"LABEL_FORWARD_MULTIPLY": "Přeposlat jako přílohu",
-		"LABEL_HELP": "Nápověda",
 		"LABEL_CHECK_ALL": "Zjistit nové zprávy",
 		"LABEL_DELETE": "Smazat",
 		"LABEL_OPEN_THREAD": "Otevřít označenou konverzaci",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Přepnout zobrazení přiložených zpráv",
 		"LABEL_THREAD_NEXT": "Následující zpráva ve vlákně",
 		"LABEL_THREAD_PREV": "Předchozí zpráva ve vlákně",
-		"LABEL_PRINT": "Tisk",
 		"LABEL_EXIT_FULLSCREEN": "Ukončit režim celé obrazovky",
 		"LABEL_CLOSE_MESSAGE": "Zavřít zprávu (bez náhledu)",
 		"LABEL_SWITCH_TO_LIST": "Vrátit se zpět do seznamu zpráv",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Zavřít okno se zprávou"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neplatný token",
-		"AUTH_ERROR": "Ověření selhalo",
-		"CONNECTION_ERROR": "Nepodařilo se připojit k serveru",
-		"DOMAIN_ALREADY_EXISTS": "Tato doména již existuje",
-		"DOMAIN_NOT_ALLOWED": "Doména není povolená",
-		"ACCOUNT_NOT_ALLOWED": "Účet není povolený",
-		"CONTACTS_SYNC_ERROR": "Chyba při synchronizaci kontaktů",
-		"CANT_GET_MESSAGE_LIST": "Chyba při vytváření seznamu zpráv",
-		"CANT_GET_MESSAGE": "Zprávu se nepodařilo načíst",
-		"CANT_DELETE_MESSAGE": "Zprávu se nepodařilo odstranit",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Zprávu se nepodařilo přesunout",
-		"CANT_SAVE_MESSAGE": "Zprávu se nepodařilo uložit",
-		"CANT_SEND_MESSAGE": "Zprávu se nepodařilo odeslat",
-		"INVALID_RECIPIENTS": "Neplatný příjemci",
-		"CANT_SAVE_FILTERS": "Nelze uložit filtry",
-		"CANT_GET_FILTERS": "Nelze načíst filtry",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtry nejsou validní",
-		"CANT_CREATE_FOLDER": "Složku se nepodařilo vytvořit",
-		"CANT_RENAME_FOLDER": "Složku se nepodařilo přejmenovat",
-		"CANT_DELETE_FOLDER": "Složku se nepodařilo odstranit",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nelze odstranit neprázdnou složku",
-		"CANT_SUBSCRIBE_FOLDER": "Nelze přihlásit adresář",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nelze odhlásit adresář",
-		"DEMO_SEND_MESSAGE_ERROR": "Z důvodu bezpečnosti tento demo účet není oprávněn posílat zprávy na externí emaily!",
-		"DEMO_ACCOUNT_ERROR": "Z důvodu bezpečnosti tento účet nemá oprávnění toto provést!",
-		"ACCOUNT_ALREADY_EXISTS": "Účet už existuje",
-		"ACCOUNT_DOES_NOT_EXIST": "Účet neexistuje",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Nastala chyba během přístupu na poštovní server",
-		"INVALID_INPUT_ARGUMENT": "Nevalidní vstupní argument",
-		"UNKNOWN_ERROR": "Neznámá chyba"
+		"RequestError": "Požadavek selhal",
+		"RequestAborted": "Požadavek byl zrušen",
+		"RequestTimeout": "Časový limit požadavku vypršel",
+		"InvalidToken": "Neplatný token",
+		"AuthError": "Ověření selhalo",
+		"ConnectionError": "Nepodařilo se připojit k serveru",
+		"DomainAlreadyExists": "Tato doména již existuje",
+		"DomainNotAllowed": "Doména není povolená",
+		"AccountNotAllowed": "Účet není povolený",
+		"CryptKeyError": "Vaše přihlašovací heslo se změnilo",
+		"ContactsSyncError": "Chyba při synchronizaci kontaktů",
+		"CantGetMessageList": "Chyba při vytváření seznamu zpráv",
+		"CantGetMessage": "Zprávu se nepodařilo načíst",
+		"CantDeleteMessage": "Zprávu se nepodařilo odstranit",
+		"CantCopyMessage": "Zprávu se nepodařilo zkopírovat",
+		"CantMoveMessage": "Zprávu se nepodařilo přesunout",
+		"CantSaveMessage": "Zprávu se nepodařilo uložit",
+		"CantSendMessage": "Zprávu se nepodařilo odeslat",
+		"InvalidRecipients": "Neplatní příjemci",
+		"CantSaveFilters": "Nelze uložit filtry",
+		"CantGetFilters": "Nelze načíst filtry",
+		"CantActivateFiltersScript": "Nelze aktivovat skript filtrů",
+		"CantDeleteFiltersScript": "Nelze odstranit skript filtrů",
+		"FiltersAreNotCorrect": "Filtry nejsou validní",
+		"CantCreateFolder": "Složku se nepodařilo vytvořit",
+		"CantRenameFolder": "Složku se nepodařilo přejmenovat",
+		"CantDeleteFolder": "Složku se nepodařilo odstranit",
+		"CantDeleteNonEmptyFolder": "Nelze odstranit neprázdnou složku",
+		"CantSubscribeFolder": "Nelze přihlásit adresář",
+		"CantUnsubscribeFolder": "Nelze odhlásit adresář",
+		"DemoSendMessageError": "Z důvodu bezpečnosti tento demo účet není oprávněn posílat zprávy na externí emaily!",
+		"DemoAccountError": "Z důvodu bezpečnosti tento účet nemá oprávnění toto provést!",
+		"AccountAlreadyExists": "Účet už existuje",
+		"AccountDoesNotExist": "Účet neexistuje",
+		"AccountSwitchFailed": "Přepnutí na účet \"%EMAIL%\" selhalo",
+		"MailServerError": "Nastala chyba během přístupu na poštovní server",
+		"InvalidInputArgument": "Nevalidní vstupní argument",
+		"UnknownError": "Neznámá chyba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/admin.json b/snappymail/v/0.0.0/app/localization/da/admin.json
similarity index 72%
rename from snappymail/v/0.0.0/app/localization/da-DK/admin.json
rename to snappymail/v/0.0.0/app/localization/da/admin.json
index 1ced8c846..5c040e5c0 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/da/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Tilføj",
+		"CLOSE": "Luk",
 		"SAVE": "Gem",
-		"UPDATE": "Opdater"
+		"TEST": "Test",
+		"UPDATE": "Opdater",
+		"USERNAME": "Brugernavn",
+		"PASSWORD": "Adgangskode",
+		"CANCEL": "Annuller",
+		"SEARCH": "Ingen kontakter fundet",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Log ind",
-		"LABEL_PASSWORD": "Adgangskode",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Log ind i administrationspanelet"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Generelt",
-		"LABEL_LOGIN_NAME": "Log ind",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_DOMAINS_NAME": "Domæner",
-		"LABEL_SECURITY_NAME": "Sikkerhed",
-		"LABEL_PACKAGES_NAME": "Pakker",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Om"
+		"GENERAL": "Generelt",
+		"LOGIN": "Log ind",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontakter",
+		"DOMAINS": "Domæner",
+		"SECURITY": "Sikkerhed",
+		"PACKAGES": "Pakker",
+		"CONFIG": "Config",
+		"ABOUT": "Om"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Grænseflade",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Tillad sprogvalg i indstillinger",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Tillad temavalg i indstillinger",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Tillad baggrundsvalg i indstillinger",
-		"LABEL_NEW_FOLDER_MOVE": "Ny \"flyt til mappe\" knap",
 		"LABEL_SHOW_THUMBNAILS": "Vis miniaturer (vedhæftede filer)",
 		"LEGEND_MAIN": "Primære",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Vedhæftede filers størrelsesgrænse",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Standard domæne",
 		"LABEL_DETERMINE_USER_DOMAIN": "Forsøg at bestemme brugerens domæne",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Tillad sprogvalg ved log ind",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Forsøg at bestemme brugerens sprog",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Forsøg at bestemme brugerens sprog"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Bruger",
 		"LABEL_STORAGE_PASSWORD": "Adgangskode",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Underretning!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Brug ikke denne database type med større antal af aktive brugere.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Dit system ser ikke ud til at understøtte kontakter.\n<br>\nDu skal installere og aktivere <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> udvidelsen på din server.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhed",
 		"LABEL_USE_IMAGE_PROXY": "Brug lokal proxy til eksterne billeder",
-		"LABEL_ALLOW_OPEN_PGP": "Tillad OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Vis PHP informationer",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Adgangsoplysninger",
 		"LABEL_CURRENT_PASSWORD": "Nuværende adgangskode",
-		"LABEL_NEW_LOGIN": "Nyt log ind",
 		"LABEL_NEW_PASSWORD": "Ny adgangskode",
 		"LABEL_REPEAT_PASSWORD": "Gentag",
-		"BUTTON_UPDATE_PASSWORD": "Opdater adgangskode",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Kræv verifikation af brugt SSL certifikat (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Kræv verifikation af brugt SSL certifikat",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillad selvsignerede certifikater"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Simpel, moderne & hurtig web-baseret e-mail klient",
 		"LABEL_ALL_RIGHTS_RESERVED": "alle rettigheder forbeholdes.",
 		"HINT_READ_CHANGE_LOG": "Læs ændrings listen før der opdateres.",
-		"HINT_IS_UP_TO_DATE": "RainLoop is up to date.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail is up to date.",
 		"HTML_NEW_VERSION": "Ny  <b>%VERSION%<\/b> version tilgængelig",
 		"LABEL_UPDATING": "Opdatere",
 		"LABEL_CHECKING": "Tjekker for opdateringer",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Tilføj alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domæne",
-		"BUTTON_CLOSE": "Luk",
-		"BUTTON_ADD": "Tilføj"
+		"LABEL_DOMAIN": "Domæne"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Tilføj domæne",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Rediger domæne \"%NAME%\"",
 		"LABEL_NAME": "Navn",
 		"NAME_HELPER": "specieltegn understøttet",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Sikker",
-		"LABEL_WHITE_LIST": "Whitelist",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Ingen",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Tillad sieve skripts",
 		"LABEL_USE_SHORT_LOGIN": "Brug kort log ind",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Brug godkendelse",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Brug php mail()",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Whitelist",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve opsætning",
-		"BUTTON_BACK_TO_IMAP": "Tilbage til IMAP indstillinger",
-		"BUTTON_BACK": "Tilbage",
-		"BUTTON_CLOSE": "Luk",
-		"BUTTON_ADD": "Tilføj",
-		"BUTTON_UPDATE": "Opdater",
-		"NEW_DOMAIN_DESC": "Denne domæne konfiguration tillader <i>%NAME%<\/i> e-mail adresser.",
-		"WHITE_LIST_ALERT": "Liste med godkendte domæne for webmail opsætning.\nBrug mellemrum til at separere domæner.\n"
+		"NEW_DOMAIN_DESC": "Denne domæne konfiguration tillader <strong>%NAME%<\/strong> e-mail adresser.",
+		"WHITE_LIST_ALERT": "Liste med godkendte domæne for webmail opsætning.\nBrug mellemrum til at separere domæner.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tilføjelse",
-		"DESC_NOTHING_TO_CONFIGURE": "Intet at opsætte",
-		"BUTTON_CLOSE": "Luk"
+		"DESC_NOTHING_TO_CONFIGURE": "Intet at opsætte"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vil du lukke vinduet?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "ustabil",
 		"WARNING": "Advarsel!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Ukendt fejl"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ugyldigt tegn",
-		"AUTH_ERROR": "Godkendelse fejlede",
-		"DOMAIN_ALREADY_EXISTS": "Domæne eksisterer allerede",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Kan ikke gemme instillinger",
-		"CANT_INSTALL_PACKAGE": "Installation af pakke mislykkedes",
-		"CANT_DELETE_PACKAGE": "Fjernelse af pakke mislykkedes",
-		"INVALID_PLUGIN_PACKAGE": "Ugyldig tilføjelsespakke",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Tilføjelsespakke ikke understøttet",
-		"UNKNOWN_ERROR": "Ukendt fejl"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Ugyldigt tegn",
+		"AuthError": "Godkendelse fejlede",
+		"DomainAlreadyExists": "Domæne eksisterer allerede",
+		"CantSavePluginSettings": "Kan ikke gemme instillinger",
+		"CantInstallPackage": "Installation af pakke mislykkedes",
+		"CantDeletePackage": "Fjernelse af pakke mislykkedes",
+		"InvalidPluginPackage": "Ugyldig tilføjelsespakke",
+		"UnsupportedPluginPackage": "Tilføjelsespakke ikke understøttet",
+		"UnknownError": "Ukendt fejl"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/da/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/da-DK/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/da/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/static.json b/snappymail/v/0.0.0/app/localization/da/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/da-DK/static.json
rename to snappymail/v/0.0.0/app/localization/da/static.json
diff --git a/snappymail/v/0.0.0/app/localization/da-DK/user.json b/snappymail/v/0.0.0/app/localization/da/user.json
similarity index 58%
rename from snappymail/v/0.0.0/app/localization/da-DK/user.json
rename to snappymail/v/0.0.0/app/localization/da/user.json
index 6f2e3b515..608209514 100644
--- a/snappymail/v/0.0.0/app/localization/da-DK/user.json
+++ b/snappymail/v/0.0.0/app/localization/da/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arkivering",
 		"ARE_YOU_SURE": "Er du sikker?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Luk (Esc)",
 		"CONTACTS": "Kontakter",
 		"DELETE": "Slet",
+		"UNDELETE": "Undelete",
 		"DONE": "Færdig",
 		"EMAIL": "E-mail",
 		"FROM": "Fra",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Log ud",
 		"MORE": "Mere",
 		"MOVE_TO": "Flyt til",
+		"COPY_TO": "Kopier til",
 		"NAME": "Indbakke",
 		"NONE": "Ingen",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ikke uønsket",
+		"USERNAME": "Brugernavn",
 		"PASSWORD": "Adgangskode",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Svar til",
 		"SAVE": "Gem",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Ingen kontakter fundet",
 		"SPAM": "Uønsket",
 		"SUBJECT": "Emne",
 		"TEST": "Test",
-		"TO": "Til"
+		"TO": "Til",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Ja",
+		"NO": "Nej",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "standard",
+		"HELP": "Hjælp",
+		"TEXT": "Tekst",
+		"ATTACHMENTS": "Vedhæftninger"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Brugernavn",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Log ind"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Tilføj konto",
-		"BUTTON_SETTINGS": "Indstillinger",
-		"BUTTON_HELP": "Hjælp"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil udgave",
-		"BUTTON_DESKTOP_VERSION": "Desktop udgave"
+		"BUTTON_ADD_ACCOUNT": "Tilføj konto"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Avanceret søgning",
-		"LABEL_ADV_TEXT": "Tekst",
-		"LABEL_ADV_HAS_ATTACHMENT": "Har vedhæftet fil",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Har vedhæftede filer",
-		"LABEL_ADV_FLAGGED": "Markeret med flag",
-		"LABEL_ADV_UNSEEN": "Ulæst",
-		"LABEL_ADV_DATE": "Dato",
-		"LABEL_ADV_DATE_ALL": "Alle",
-		"LABEL_ADV_DATE_3_DAYS": "Nyere end 3 dage",
-		"LABEL_ADV_DATE_7_DAYS": "Nyere end 1 uge",
-		"LABEL_ADV_DATE_MONTH": "Nyere end 1 måned",
-		"LABEL_ADV_DATE_3_MONTHS": "Nyere end 3 måneder",
-		"LABEL_ADV_DATE_6_MONTHS": "Nyere end 6 måneder",
-		"LABEL_ADV_DATE_YEAR": "Nyere end 1 år",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Fuld skærm",
-		"ZOOM": "Zoom ind\/ud",
-		"CLOSE": "Luk (Esc)",
-		"GALLERY_PREV": "Forrige (venstrepil)",
-		"GALLERY_NEXT": "Næste (højrepil)",
-		"GALLERY_COUNTER": "%curr% af %total%"
+		"TEXT": "Tekst",
+		"HAS_ATTACHMENT": "Har vedhæftet fil",
+		"FLAGGED": "Markeret med flag",
+		"UNSEEN": "Ulæst",
+		"DATE": "Dato",
+		"DATE_ALL": "Alle",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Nyere end 3 dage",
+		"SINCE_7_DAYS": "Nyere end 1 uge",
+		"SINCE_MONTH": "Nyere end 1 måned",
+		"SINCE_3_MONTHS": "Nyere end 3 måneder",
+		"SINCE_6_MONTHS": "Nyere end 6 måneder",
+		"SINCE_YEAR": "Nyere end 1 år",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Besvarede",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Forfat",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Slettede meddelelser",
 		"ARCHIVE_NAME": "Arkiverede meddelelser"
 	},
-	"QUOTA": {
-		"TITLE": "Forbrug"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Genindlæs meddelelser",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Læst",
 		"MENU_SELECT_FLAGGED": "Markeret med flag",
 		"MENU_SELECT_UNFLAGGED": "Ikke markeret med flag",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Ingen meddelelser.",
 		"EMPTY_SEARCH_LIST": "Ingen meddelelser passede på søgningen.",
 		"SEARCH_RESULT_FOR": "Resultat for søgningen på \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Tilbage til meddelelsesoversigt",
-		"EMPTY_SUBJECT_TEXT": "(Intet emne)",
 		"PUT_MESSAGE_HERE": "Slip meddelelse her for visning i oversigten",
 		"TODAY_AT": "i dag klokken %TIME%",
 		"YESTERDAY_AT": "i går klokken %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "%COUNT% nye meddelelser!",
 		"QUOTA_SIZE": "Du bruger <strong>%SIZE% (%PROC%%)<\/strong> af <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Vis kilder",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Hent som .eml fil",
 		"MENU_FILTER_SIMILAR": "Find lignende meddelelser",
 		"MENU_PRINT": "Udskriv",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Vælg modtagemappe i panelet til venstre.",
 		"LINK_DOWNLOAD_AS_ZIP": "Hent som zip-fil",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kvittering for læsning af - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Søger..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Tilføj kontakt",
 		"BUTTON_CREATE_CONTACT": "Ny kontakt",
-		"BUTTON_UPDATE_CONTACT": "Opdater kontakt",
 		"BUTTON_IMPORT": "Importer kontakter (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Eksporter kontakter (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Eksporter kontakter (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Ingen kontakter fundet",
 		"CLEAR_SEARCH": "Fjern søgning",
 		"CONTACT_VIEW_DESC": "Vælg kontakt i oversigten for visning.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Hjemmeside",
 		"LABEL_BIRTHDAY": "Fødselsdag",
-		"LINK_ADD_EMAIL": "Tilføj e-mail adresse",
-		"LINK_ADD_PHONE": "Tilføj telefonnummer",
-		"LINK_BIRTHDAY": "Fødselsdag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Indtast kaldenavn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Indtast efternavn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Indtast fornavn(e)",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Indtast kaldenavn",
+		"DISPLAY_NAME": "Kaldenavn",
+		"LAST_NAME": "Efternavn",
+		"FIRST_NAME": "Fornavn(e)",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Kaldenavn",
 		"LABEL_READ_ONLY": "Skrivebeskyttet",
-		"LABEL_SHARE": "Del",
 		"ADD_MENU_LABEL": "Tilføj",
 		"ADD_MENU_NICKNAME": "Kaldenavn",
-		"ADD_MENU_NOTES": "Noter",
+		"ADD_MENU_NOTE": "Noter",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresse",
 		"ADD_MENU_BIRTHDAY": "Fødselsdag",
 		"ADD_MENU_TAGS": "Mærkater",
 		"BUTTON_SHARE_ALL": "Alle",
-		"BUTTON_SYNC": "Synkronisering (CardDAV)"
+		"BUTTON_SYNC": "Synkronisering (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Vis alle felter",
@@ -203,20 +247,23 @@
 		"DISCARD_UNSAVED_DATA": "Slet ikke gemt data?",
 		"ATTACH_FILES": "Vedhæft filer",
 		"ATTACH_DROP_FILES_DESC": "Slip filer her",
-		"REPLY_MESSAGE_TITLE": "Den %DATE% klokken %TIME%, skrev %EMAIL%:",
+		"REPLY_MESSAGE_TITLE": "Den %DATETIME%, skrev %EMAIL%:",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Videresendt meddelelse -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Sendt",
 		"EMPTY_TO_ERROR_DESC": "Tilføj minimum en modtager",
 		"NO_ATTACHMENTS_HERE_DESC": "Ingen vedhæftninger.",
 		"ATTACHMENTS_ERROR_DESC": "Advarsels! Ikke alle vedhæftninger er overført.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Overførsel af vedhæftninger igang.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk",
 		"BUTTON_REQUEST_READ_RECEIPT": "Bed om kvittering for læsning",
 		"BUTTON_MARK_AS_IMPORTANT": "Markér som vigtig",
-		"BUTTON_REQUEST_DSN": "Bed om kvittering for modtagelse"
+		"BUTTON_REQUEST_DSN": "Bed om kvittering for modtagelse",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nej",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vil du lukke vinduet?",
 		"DESC_WANT_DELETE_MESSAGES": "Vil du slette denne\/disse meddelelse(r)?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Vælg sprog"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Tilføj konto?",
+		"TITLE_ADD_ACCOUNT": "Tilføj konto",
 		"BUTTON_ADD_ACCOUNT": "Tilføj",
-		"TITLE_UPDATE_ACCOUNT": "Opdater konto?",
-		"BUTTON_UPDATE_ACCOUNT": "Opdater"
+		"TITLE_UPDATE_ACCOUNT": "Opdater konto"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Tilføj identitet?",
-		"TITLE_UPDATE_IDENTITY": "Opdater identitet?",
+		"TITLE_ADD_IDENTITY": "Tilføj identitet",
+		"TITLE_UPDATE_IDENTITY": "Opdater identitet",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Tilføj",
-		"BUTTON_UPDATE_IDENTITY": "Opdater",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Indsæt signatur før citeret tekst"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Opret ny mappe?",
+		"TITLE_CREATE_FOLDER": "Opret ny mappe",
 		"LABEL_PARENT": "Hovedmappe",
 		"BUTTON_CREATE": "Opret ny mappe",
 		"TITLE_CREATING_PROCESS": "Opretter mappe"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Handlingen kan ikke afbrydes når den er startet.",
 		"TITLE_CLEARING_PROCESS": "Tømmer mappe..."
 	},
+	"CRYPTO": {
+		"SIGN": "Signér",
+		"ENCRYPT": "Krypter",
+		"DECRYPT": "Dekrypter",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Accepteret signatur for %USER\"",
+		"ERROR": "%TYPE% fejl: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importer OpenPGP nøgle",
 		"POPUP_IMPORT_BUTTON": "Importer",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Generér OpenPGP nøgler",
 		"POPUP_GENERATE_BUTTON": "Generér",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Signér",
-		"LABEL_ENCRYPT": "Krypter",
-		"BUTTON_DECRYPT": "Dekrypter",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP signeret meddelelse",
 		"ENCRYPTED_MESSAGE": "OpenPGP krypteret meddelelse",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Accepteret signatur for %USER\"",
-		"ERROR": "OpenPGP fejl: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME signeret meddelelse",
+		"ENCRYPTED_MESSAGE": "S\/MIME krypteret meddelelse",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Opret filter?",
-		"TITLE_EDIT_FILTER": "Opdater filter?",
+		"TITLE_CREATE_FILTER": "Opret filter",
+		"TITLE_EDIT_FILTER": "Opdater filter",
 		"LEGEND_CONDITIONS": "Betingelser",
 		"LEGEND_ACTIONS": "Handlinger",
 		"BUTTON_ADD_CONDITION": "Tilføj betingelse",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Markér som læst",
 		"REPLY_INTERVAL_LABEL": "Svarinterval (dage)",
 		"KEEP_LABEL": "Behold",
-		"STOP_LABEL": "Forsæt med at tjekke regler",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Emne (valgfrit)",
 		"VACATION_MESSAGE_LABEL": "Meddelelse",
 		"VACATION_RECIPIENTS_LABEL": "Modtagere (kommaseparerede)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Ukendt upload fejl"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personlig",
-		"LABEL_GENERAL_NAME": "Generelt",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_FOLDERS_NAME": "Mapper",
-		"LABEL_ACCOUNTS_NAME": "Kontoer",
-		"LABEL_FILTERS_NAME": "Filtre",
-		"LABEL_SECURITY_NAME": "Sikkerhed",
-		"LABEL_THEMES_NAME": "Temaer"
+		"GENERAL": "Generelt",
+		"CONTACTS": "Kontakter",
+		"FOLDERS": "Mapper",
+		"ACCOUNTS": "Kontoer",
+		"FILTERS": "Filtre",
+		"SECURITY": "Sikkerhed",
+		"THEMES": "Temaer"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtre",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Flyt til \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Videresend til \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Afvis",
 		"SUBNAME_VACATION_MESSAGE": "Feriemeddelelse",
-		"SUBNAME_DISCARD": "Kassér",
-		"LOADING_PROCESS": "Opdater oversigten over filtre"
+		"SUBNAME_DISCARD": "Kassér"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhed",
 		"LABEL_AUTOLOGOUT": "Automatisk log ud",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minut(ter)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% time(r)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Aldrig"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generelt",
-		"LABEL_LANGUAGE": "Sprog",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Del ikke",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Del lodret",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
-		"LABEL_EDITOR": "Standard tekst program",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_EDITOR_HTML_FORCED": "Html (gennemtvunget)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (gennemtvunget)",
-		"LABEL_VIEW_OPTIONS": "Visningsindstillinger",
-		"LABEL_USE_PREVIEW_PANE": "Brug preview panel",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten",
-		"LABEL_USE_THREADS": "Brug samtaler",
-		"LABEL_REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
-		"LABEL_SHOW_IMAGES": "Vis altid eksterne billeder",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Meddelelser per side",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Sprog",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "Del ikke",
+		"LAYOUT_VERTICAL_SPLIT": "Del lodret",
+		"LAYOUT_HORIZONTAL_SPLIT": "Del vandret",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Standard tekst program",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "Visningsindstillinger",
+		"USE_PREVIEW_PANE": "Brug preview panel",
+		"HIDE_DELETED_MESSAGES": "Skjul beskeder, der er markeret til sletning",
+		"USE_CHECKBOXES_IN_LIST": "Vis afkrydsningsfelt i oversigten",
+		"USE_THREADS": "Brug samtaler",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Placer svar i samme mappe som oprindelig meddelelse",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Meddelelser per side",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikationer",
-		"LABEL_SOUND_NOTIFICATION": "Lyd notifikationer",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notifikationer",
+		"SOUND_NOTIFICATION": "Lyd notifikationer",
+		"CHROME_NOTIFICATION_DESC": "Vis ny meddelelses notifikations popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokeret af browseren)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tilføj automatisk modtager til adressebog",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adressebogs URL",
 		"LABEL_CONTACTS_SYNC_USER": "Bruger",
-		"SYNC_NO": "Nej",
-		"SYNC_YES": "Ja",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temaer",
-		"LEGEND_THEMES_CUSTOM": "Brugerdefineret temakonfiguration",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lys",
-		"LABEL_CUSTOM_TYPE_DARK": "Mørk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Baggrund",
+		"LABEL_BACKGROUND": "Baggrund",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload baggrundsbillede (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fil for stor",
 		"ERROR_FILE_TYPE_ERROR": "Forkert filtype (kun JPG og PNG )",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Kun nogle mapper vises for at undgå problemer.",
 		"HELP_DELETE_FOLDER": "Slet mappe",
 		"HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Markér\/fjern markering for nye meddelelser",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Markér for nye meddelelser",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Tilføj konto",
 		"BUTTON_ADD_IDENTITY": "Tilføj identitet?",
 		"LOADING_PROCESS": "Opdaterer...",
-		"DEFAULT_IDENTITY_LABEL": "standard"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer nøgle",
 		"BUTTON_GENERATE_KEY_PAIR": "Generer nøgler",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Gem kladde automatisk",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Svar alle",
 		"LABEL_FORWARD": "Videresend",
 		"LABEL_FORWARD_MULTIPLY": "Videresend som vedhæftning(er)",
-		"LABEL_HELP": "Hjælp",
 		"LABEL_CHECK_ALL": "Vælg alle meddelelser",
 		"LABEL_DELETE": "Slet",
 		"LABEL_OPEN_THREAD": "Åben valgte samtale",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Slå blokcitater til\/fra i meddelelser",
 		"LABEL_THREAD_NEXT": "Næste besked i samtale",
 		"LABEL_THREAD_PREV": "Forrige besked i samtale",
-		"LABEL_PRINT": "Udskriv",
 		"LABEL_EXIT_FULLSCREEN": "Luk fuld skærm",
 		"LABEL_CLOSE_MESSAGE": "Luk meddelelse (Uden preview panel layout)",
 		"LABEL_SWITCH_TO_LIST": "Fokuser på meddelelsesoversigt",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Luk forfatter mode"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ugyldigt tegn",
-		"AUTH_ERROR": "Godkendelse fejlede",
-		"CONNECTION_ERROR": "Kan ikke kontakte server",
-		"DOMAIN_ALREADY_EXISTS": "Domæne eksisterer allerede",
-		"DOMAIN_NOT_ALLOWED": "Domæne ikke tilladt",
-		"ACCOUNT_NOT_ALLOWED": "Konto ikke tilladt",
-		"CONTACTS_SYNC_ERROR": "Fejl ved synkronisering af kontakter",
-		"CANT_GET_MESSAGE_LIST": "Kan ikke indlæse meddelelsesoversigt ",
-		"CANT_GET_MESSAGE": "Kan ikke indlæse meddelelse",
-		"CANT_DELETE_MESSAGE": "Kan ikke slette meddelelse",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Kan ikke flytte meddelelse",
-		"CANT_SAVE_MESSAGE": "Kan ikke gemme meddelelse",
-		"CANT_SEND_MESSAGE": "Kan ikke sende meddelelse",
-		"INVALID_RECIPIENTS": "Ugyldige modtagere",
-		"CANT_SAVE_FILTERS": "Kan ikke gemme filtre",
-		"CANT_GET_FILTERS": "Kan ikke indlæse filtre",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Fejl i filtre",
-		"CANT_CREATE_FOLDER": "Kan ikke oprette mappe",
-		"CANT_RENAME_FOLDER": "Kan ikke omdøbe mappe",
-		"CANT_DELETE_FOLDER": "Kan ikke slette mappe",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Kan ikke slette mappe som ikke er tom",
-		"CANT_SUBSCRIBE_FOLDER": "Kan ikke abonnere på mappe",
-		"CANT_UNSUBSCRIBE_FOLDER": "Kan ikke afmelde mappe",
-		"DEMO_SEND_MESSAGE_ERROR": "Denne konto kan af sikkerhedshensyn ikke sende e-mails til eksterne adresser!",
-		"DEMO_ACCOUNT_ERROR": "Denne konto kan af sikkerhedshensyn ikke udføre denne handling!",
-		"ACCOUNT_ALREADY_EXISTS": "Kontoen eksisterer allerede",
-		"ACCOUNT_DOES_NOT_EXIST": "Kontoen eksisterer ikke",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Der skete en fejl under adgang til e-mail serveren",
-		"INVALID_INPUT_ARGUMENT": "Ugyldigt argument",
-		"UNKNOWN_ERROR": "Ukendt fejl"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Ugyldigt tegn",
+		"AuthError": "Godkendelse fejlede",
+		"ConnectionError": "Kan ikke kontakte server",
+		"DomainAlreadyExists": "Domæne eksisterer allerede",
+		"DomainNotAllowed": "Domæne ikke tilladt",
+		"AccountNotAllowed": "Konto ikke tilladt",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Fejl ved synkronisering af kontakter",
+		"CantGetMessageList": "Kan ikke indlæse meddelelsesoversigt ",
+		"CantGetMessage": "Kan ikke indlæse meddelelse",
+		"CantDeleteMessage": "Kan ikke slette meddelelse",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Kan ikke flytte meddelelse",
+		"CantSaveMessage": "Kan ikke gemme meddelelse",
+		"CantSendMessage": "Kan ikke sende meddelelse",
+		"InvalidRecipients": "Ugyldige modtagere",
+		"CantSaveFilters": "Kan ikke gemme filtre",
+		"CantGetFilters": "Kan ikke indlæse filtre",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Fejl i filtre",
+		"CantCreateFolder": "Kan ikke oprette mappe",
+		"CantRenameFolder": "Kan ikke omdøbe mappe",
+		"CantDeleteFolder": "Kan ikke slette mappe",
+		"CantDeleteNonEmptyFolder": "Kan ikke slette mappe som ikke er tom",
+		"CantSubscribeFolder": "Kan ikke abonnere på mappe",
+		"CantUnsubscribeFolder": "Kan ikke afmelde mappe",
+		"DemoSendMessageError": "Denne konto kan af sikkerhedshensyn ikke sende e-mails til eksterne adresser!",
+		"DemoAccountError": "Denne konto kan af sikkerhedshensyn ikke udføre denne handling!",
+		"AccountAlreadyExists": "Kontoen eksisterer allerede",
+		"AccountDoesNotExist": "Kontoen eksisterer ikke",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Der skete en fejl under adgang til e-mail serveren",
+		"InvalidInputArgument": "Ugyldigt argument",
+		"UnknownError": "Ukendt fejl"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/admin.json b/snappymail/v/0.0.0/app/localization/de/admin.json
similarity index 54%
rename from snappymail/v/0.0.0/app/localization/de-DE/admin.json
rename to snappymail/v/0.0.0/app/localization/de/admin.json
index 468c31851..e7377d9ac 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/de/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Hinzufügen",
+		"CLOSE": "Schließen",
 		"SAVE": "Speichern",
-		"UPDATE": "Aktualisieren"
+		"TEST": "Testen",
+		"UPDATE": "Aktualisieren",
+		"USERNAME": "Nutzername",
+		"PASSWORD": "Passwort",
+		"CANCEL": "Abbrechen",
+		"SEARCH": "Suchen",
+		"YES": "Ja",
+		"NO": "Nein"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Benutzer",
-		"LABEL_PASSWORD": "Passwort",
 		"LABEL_TOTP": "TOTP-Code",
 		"BUTTON_LOGIN": "Im Adminpanel anmelden"
 	},
@@ -13,108 +21,103 @@
 		"LABEL_ADMIN_PANEL": "Adminpanel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Allgemein",
-		"LABEL_LOGIN_NAME": "Anmeldung",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontakte",
-		"LABEL_DOMAINS_NAME": "Domains",
-		"LABEL_SECURITY_NAME": "Sicherheit",
-		"LABEL_PACKAGES_NAME": "Erweiterungen",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Über"
+		"GENERAL": "Allgemein",
+		"LOGIN": "Anmeldung",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontakte",
+		"DOMAINS": "Domains",
+		"SECURITY": "Sicherheit",
+		"PACKAGES": "Erweiterungen",
+		"CONFIG": "Konfigurationsdatei",
+		"ABOUT": "Über"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Oberfläche",
 		"LABEL_LANGUAGE": "Sprache",
-		"LABEL_LANGUAGE_ADMIN": "Sprache (Admin)",
+		"LABEL_LANGUAGE_ADMIN": "Sprache (Adminpanel)",
 		"LABEL_THEME": "Thema",
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Sprachauswahl in den Einstellungen zulassen",
-		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Themaauswahl in den Einstellungen zulassen",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Themenauswahl in den Einstellungen zulassen",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Hintergrundauswahl in den Einstellungen zulassen",
-		"LABEL_NEW_FOLDER_MOVE": "Neue \"Verschieben nach\"-Schaltfläche",
 		"LABEL_SHOW_THUMBNAILS": "Vorschaubilder anzeigen (Anhänge)",
 		"LEGEND_MAIN": "Allgemein",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Größenlimit für Anhänge",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Zusätzliche Konten erlauben",
 		"LABEL_ALLOW_IDENTITIES": "Mehrere Identitäten erlauben",
-		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
+		"ALERT_DATA_ACCESS": "Auf den \"Data\"-Ordner kann zugegriffen werden. Konfigurieren Sie den Ordner so, dass er extern nicht erreichbar ist. Weitere Informationen:",
 		"ALERT_WARNING": "Warnung!",
-		"HTML_ALERT_WEAK_PASSWORD": "Sie verwenden das Standard-Admin-Passwort.\n<br>\nBitte <strong><a href=\"#\/security\">ändern<\/a><\/strong> Sie\naus Sicherheitsgründen das Passwort jetzt.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "Sie verwenden das Standard-Admin-Passwort.\n<br>\nBitte <strong><a href=\"#\/security\">ändern<\/a><\/strong> Sie\n das Passwort aus Sicherheitsgründen!"
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Anmeldebildschirm",
 		"LABEL_DEFAULT_DOMAIN": "Standarddomain",
-		"LABEL_DETERMINE_USER_DOMAIN": "Versuche Domain des Benutzers zu ermitteln",
+		"LABEL_DETERMINE_USER_DOMAIN": "Domain des Benutzers automatisch ermitteln",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sprachauswahl bei der Anmeldung zulassen",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Versuche Sprache des Benutzers zu ermitteln",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Die Schaltfläche 'Anmelden' ausblenden"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Sprache des Benutzers automatisch ermitteln"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
 		"LABEL_PAGE_TITLE": "Seitentitel",
-		"LABEL_LOADING_DESCRIPTION": "Ladevorgang-Beschreibung",
+		"LABEL_LOADING_DESCRIPTION": "Beschreibungstext für Ladevorgang",
 		"LABEL_FAVICON_URL": "Favicon"
 	},
 	"TAB_CONTACTS": {
 		"LEGEND_CONTACTS": "Kontakte",
 		"LEGEND_STORAGE": "Speicher (PDO)",
 		"LABEL_ENABLE_CONTACTS": "Kontakte aktivieren",
-		"LABEL_ALLOW_SYNC": "Kontakte-Synchronisierung erlauben (mit externem CardDAV-Server)",
+		"LABEL_ALLOW_SYNC": "Synchronisierung von Kontakten erlauben (mit externem CardDAV-Server)",
 		"LABEL_STORAGE_TYPE": "Typ",
 		"LABEL_STORAGE_DSN": "DSN",
 		"LABEL_STORAGE_USER": "Benutzer",
 		"LABEL_STORAGE_PASSWORD": "Passwort",
-		"BUTTON_TEST": "Testen",
+		"SQLITE_GLOBAL": "Eine globale DB verwenden statt einer pro Account",
 		"ALERT_NOTICE": "Hinweis!",
+		"SUGGESTIONS_LIMIT": "Limit für Empfehlungen",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Verwenden Sie diesen Datenbanktyp nicht bei einer hohen Anzahl aktiver Benutzer.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ihr System unterstützt keine Kontakte.\n<br>\nSie müssen die <strong>PDO-Erweiterung (SQLite \/ MySQL \/ PostgreSQL)<\/strong> auf Ihrem Server installieren oder aktivieren.\n"
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ihr System unterstützt keine Kontakte.\n<br>\nSie müssen die <strong>PDO-Erweiterung (SQLite \/ MySQL \/ PostgreSQL)<\/strong> auf Ihrem Server installieren oder aktivieren."
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Domains",
 		"BUTTON_ADD_DOMAIN": "Domain hinzufügen",
 		"BUTTON_ADD_ALIAS": "Alias hinzufügen",
 		"DELETE_ARE_YOU_SURE": "Sind Sie sicher?",
-		"HTML_DOMAINS_HELPER": "Liste der Domains, die Webmail abrufen darf.\n<br>\nKlicken Sie auf den Namen, um die Domain zu konfigurieren.\n"
+		"HTML_DOMAINS_HELPER": "Liste der Domains, die Webmail-Nutzer verwenden dürfen.\n<br>\nKlicken Sie auf den Namen, um die Domain zu konfigurieren."
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sicherheit",
 		"LABEL_USE_IMAGE_PROXY": "Lokalen Proxy für externe Bilder verwenden",
-		"LABEL_ALLOW_OPEN_PGP": "OpenPGP erlauben",
+		"LABEL_AUTO_VERIFY": "Signaturen automatisch überprüfen",
 		"LABEL_SHOW_PHP_INFO": "PHP-Informationen anzeigen",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Adminpanel-Zugangsdaten",
 		"LABEL_CURRENT_PASSWORD": "Aktuelles Passwort",
-		"LABEL_NEW_LOGIN": "Neuer Benutzer",
 		"LABEL_NEW_PASSWORD": "Neues Passwort",
 		"LABEL_REPEAT_PASSWORD": "Wiederholen",
-		"BUTTON_UPDATE_PASSWORD": "Passwort aktualisieren",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Verlangen, dass das verwendete SSL-Zertifikat beglaubigt ist (IMAP\/SMTP)",
-		"LABEL_ALLOW_SELF_SIGNED": "Selbst-signierte Zertifikate erlauben"
+		"LABEL_REQUIRE_VERIFICATION": "Signiertes SSL-Zertifikat erfordern",
+		"CRYPTO": "Kryptographie",
+		"LABEL_ALLOW_SELF_SIGNED": "Selbst-signiertes Zertifikat akzeptieren"
 	},
 	"TAB_PACKAGES": {
 		"LABEL_ENABLE_PLUGINS": "Erweiterungen aktivieren",
 		"LEGEND_AVAILABLE_FOR_UPDATE": "Zur Aktualisierung verfügbar",
 		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Zur Installation verfügbar",
 		"LEGEND_INSTALLED_PACKAGES": "Installierte Erweiterungen",
-		"ALERT_CANNOT_ACCESS_REPOSITORY": "Kann momentan nicht auf das Repository zugreifen."
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Momentan kann nicht auf das Repository zugegriffen werden."
 	},
 	"TAB_ABOUT": {
 		"LEGEND_ABOUT": "Über",
 		"LABEL_TAG_HINT": "Einfacher, moderner und schneller webbasierter E-Mail-Client",
 		"LABEL_ALL_RIGHTS_RESERVED": "Alle Rechte vorbehalten.",
-		"HINT_READ_CHANGE_LOG": "Bitte Lesen Sie das Änderungsprotokoll vor dem Update.",
-		"HINT_IS_UP_TO_DATE": "RainLoop ist auf dem neusten Stand.",
+		"HINT_READ_CHANGE_LOG": "Bitte Lesen Sie das Changelog vor dem Update.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail ist auf dem neusten Stand.",
 		"HTML_NEW_VERSION": "Neue Version <b>%VERSION%<\/b> verfügbar.",
 		"LABEL_UPDATING": "Aktualisiere",
-		"LABEL_CHECKING": "Prüfe auf Aktualisierungen",
-		"BUTTON_RELEASES": "Releases"
+		"LABEL_CHECKING": "Überprüfe auf Aktualisierungen",
+		"BUTTON_RELEASES": "Veröffentlichungen"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Alias hinzufügen",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domain",
-		"BUTTON_CLOSE": "Schließen",
-		"BUTTON_ADD": "Hinzufügen"
+		"LABEL_DOMAIN": "Domain"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Domain hinzufügen",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Domain \"%NAME%\" bearbeiten",
 		"LABEL_NAME": "Name",
 		"NAME_HELPER": "Platzhalter unterstützt",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Sicherheit",
-		"LABEL_WHITE_LIST": "Whitelist",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Funktionen deaktivieren",
+		"LIMITS": "Grenzwerte",
+		"FOLDERS": "Ordner",
+		"MESSAGES": "Nachrichten",
 		"SECURE_OPTION_NONE": "Ohne",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Sieve-Skripte erlauben",
 		"LABEL_USE_SHORT_LOGIN": "Kurze Benutzernamen verwenden",
+		"LABEL_LOWERCASE_LOGIN": "Login in Kleinbuchstaben konvertieren",
 		"LABEL_USE_AUTH": "Authentifizierung verwenden",
-		"LABEL_SET_SENDER": "Verwenden Sie die Anmeldung als Absender",
+		"LABEL_SET_SENDER": "Login-Namen als Absender verwenden",
+		"LABEL_AUTH_PLAIN_LINE": "Einzelnen AUTH PLAIN Befehl bei der Anmeldung erzwingen",
 		"LABEL_USE_PHP_MAIL": "PHPs mail()-Funktion verwenden",
-		"BUTTON_TEST": "Testen",
 		"BUTTON_WHITE_LIST": "Whitelist",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve-Konfiguration",
-		"BUTTON_BACK_TO_IMAP": "Zurück zu IMAP-Einstellungen",
-		"BUTTON_BACK": "Zurück",
-		"BUTTON_CLOSE": "Schließen",
-		"BUTTON_ADD": "Hinzufügen",
-		"BUTTON_UPDATE": "Aktualisieren",
-		"NEW_DOMAIN_DESC": "Diese Domain Konfiguration wird es dir möglich machen <br>mit <i>%NAME%<\/i> Mailadressen zu arbeiten.",
-		"WHITE_LIST_ALERT": "Liste der User, die Webmail abrufen darf.\nVerwenden Sie Leerzeichen als Trenner.\n"
+		"NEW_DOMAIN_DESC": "Diese Domain-Konfiguration erlaubt die Verwendung von <strong>%NAME%<\/strong> Mail-Adressen.",
+		"WHITE_LIST_ALERT": "Liste der Domain-User, die Webmail verwenden dürfen.\nVerwenden Sie Leerzeichen als Trennsymbol.",
+		"VALID_SPAM_HEADERS": "Spam-Header beachten",
+		"VALID_VIRUS_HEADERS": "Virus-Header beachten"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Erweiterung",
-		"DESC_NOTHING_TO_CONFIGURE": "Nichts zu konfigurieren",
-		"BUTTON_CLOSE": "Schließen"
+		"DESC_NOTHING_TO_CONFIGURE": "Nichts zu konfigurieren"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nein",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sind Sie sicher, dass Sie dieses Fenster schließen möchten?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "Beta",
-		"UNSTABLE": "Nicht stabil",
 		"WARNING": "Warnung!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Unbekannter Fehler"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ungültiger Token",
-		"AUTH_ERROR": "Authentifizierung fehlgeschlagen",
-		"DOMAIN_ALREADY_EXISTS": "Diese Domain existiert bereits",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Einstellungen können nicht gespeichert werden",
-		"CANT_INSTALL_PACKAGE": "Fehler beim Installieren der Erweiterung",
-		"CANT_DELETE_PACKAGE": "Fehler beim entfernen der Erweiterung",
-		"INVALID_PLUGIN_PACKAGE": "Erweiterungspaket ist ungültig",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Erweiterungspaket wird nicht unterstützt",
-		"UNKNOWN_ERROR": "Unbekannter Fehler"
+		"RequestError": "Anfrage fehlgeschlagen",
+		"RequestAborted": "Anfrage abgebrochen",
+		"RequestTimeout": "Zeitüberschreitung bei der Anfrage",
+		"InvalidToken": "Ungültiger Token",
+		"AuthError": "Authentifizierung fehlgeschlagen",
+		"DomainAlreadyExists": "Diese Domain existiert bereits",
+		"CantSavePluginSettings": "Einstellungen können nicht gespeichert werden",
+		"CantInstallPackage": "Fehler beim Installieren der Erweiterung",
+		"CantDeletePackage": "Fehler beim Entfernen der Erweiterung",
+		"InvalidPluginPackage": "Erweiterungspaket ist ungültig",
+		"UnsupportedPluginPackage": "Erweiterungspaket wird nicht unterstützt",
+		"UnknownError": "Unbekannter Fehler"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/de/relativetimeformat.js
similarity index 67%
rename from snappymail/v/0.0.0/app/localization/de-DE/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/de/relativetimeformat.js
index fb706b4eb..c4a29b907 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/relativetimeformat.js
+++ b/snappymail/v/0.0.0/app/localization/de/relativetimeformat.js
@@ -2,71 +2,71 @@
 	long: {
 		year: {
 			past: {
-				one: "vor {0} Jahr",
+				one: "vor einem Jahr",
 				other: "vor {0} Jahren"
 			},
 			future: {
-				one: "in {0} Jahr",
+				one: "in einem Jahr",
 				other: "in {0} Jahren"
 			}
 		},
 		month: {
 			past: {
-				one: "vor {0} Monat",
+				one: "vor einem Monat",
 				other: "vor {0} Monaten"
 			},
 			future: {
-				one: "in {0} Monat",
+				one: "in einem Monat",
 				other: "in {0} Monaten"
 			}
 		},
 		week: {
 			past: {
-				one: "vor {0} Woche",
+				one: "vor einer Woche",
 				other: "vor {0} Wochen"
 			},
 			future: {
-				one: "in {0} Woche",
+				one: "in einer Woche",
 				other: "in {0} Wochen"
 			}
 		},
 		day: {
 			past: {
-				one: "vor {0} Tag",
+				one: "vor einem Tag",
 				other: "vor {0} Tagen"
 			},
 			future: {
-				one: "in {0} Tag",
+				one: "in einem Tag",
 				other: "in {0} Tagen"
 			}
 		},
 		hour: {
 			past: {
-				one: "vor {0} Stunde",
+				one: "vor einer Stunde",
 				other: "vor {0} Stunden"
 			},
 			future: {
-				one: "in {0} Stunde",
+				one: "in einer Stunde",
 				other: "in {0} Stunden"
 			}
 		},
 		minute: {
 			past: {
-				one: "vor {0} Minute",
+				one: "vor einer Minute",
 				other: "vor {0} Minuten"
 			},
 			future: {
-				one: "in {0} Minute",
+				one: "in einer Minute",
 				other: "in {0} Minuten"
 			}
 		},
 		second: {
 			past: {
-				one: "vor {0} Sekunde",
+				one: "vor einer Sekunde",
 				other: "vor {0} Sekunden"
 			},
 			future: {
-				one: "in {0} Sekunde",
+				one: "in einer Sekunde",
 				other: "in {0} Sekunden"
 			}
 		}
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/static.json b/snappymail/v/0.0.0/app/localization/de/static.json
similarity index 71%
rename from snappymail/v/0.0.0/app/localization/de-DE/static.json
rename to snappymail/v/0.0.0/app/localization/de/static.json
index c69b63cee..f9f949ddd 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/static.json
+++ b/snappymail/v/0.0.0/app/localization/de/static.json
@@ -1,9 +1,9 @@
 {
 	"BACK_LINK": "Aktualisieren",
 	"NO_SCRIPT_TITLE": "Diese Anwendung benötigt JavaScript.",
-	"NO_SCRIPT_DESC": "Ihr Browser unterstützt JavaScript nicht.\nAktivieren Sie bitte die JavaScript-Unterstützung in Ihrem Browser und versuchen Sie es erneut.\n",
+	"NO_SCRIPT_DESC": "Ihr Browser unterstützt JavaScript nicht.\nAktivieren Sie die JavaScript-Unterstützung in Ihrem Browser und versuchen Sie es erneut.\n",
 	"NO_COOKIE_TITLE": "Diese Anwendung benötigt Cookies.",
-	"NO_COOKIE_DESC": "Ihr Browser unterstützt Cookies nicht.\nAktivieren Sie bitte die Cookie-Unterstützung in Ihrem Browser und versuchen Sie es erneut.\n",
+	"NO_COOKIE_DESC": "Ihr Browser unterstützt Cookies nicht.\nAktivieren Sie die Cookie-Unterstützung in Ihrem Browser und versuchen Sie es erneut.\n",
 	"BAD_BROWSER_TITLE": "Ihr Browser ist veraltet.",
 	"BAD_BROWSER_DESC": "Um alle Funktionen dieser Anwendung nutzen zu können,\nsollten Sie einen der folgenden Browser herunterladen und installieren\n"
 }
diff --git a/snappymail/v/0.0.0/app/localization/de-DE/user.json b/snappymail/v/0.0.0/app/localization/de/user.json
similarity index 55%
rename from snappymail/v/0.0.0/app/localization/de-DE/user.json
rename to snappymail/v/0.0.0/app/localization/de/user.json
index 57b4e8e42..6a3ff1a12 100644
--- a/snappymail/v/0.0.0/app/localization/de-DE/user.json
+++ b/snappymail/v/0.0.0/app/localization/de/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archivieren",
 		"ARE_YOU_SURE": "Sind Sie sicher?",
@@ -6,10 +7,11 @@
 		"BCC": "BCC",
 		"CANCEL": "Abbrechen",
 		"CC": "CC",
-		"CLEAR": "Bereinigen",
+		"CLEAR": "Entfernen",
 		"CLOSE": "Schließen",
 		"CONTACTS": "Kontakte",
 		"DELETE": "Löschen",
+		"UNDELETE": "Undelete",
 		"DONE": "Erledigt",
 		"EMAIL": "E-Mail",
 		"FROM": "Von",
@@ -17,59 +19,67 @@
 		"LOGOUT": "Abmelden",
 		"MORE": "Mehr",
 		"MOVE_TO": "Verschieben nach",
+		"COPY_TO": "Kopieren nach",
 		"NAME": "Name",
 		"NONE": "Keine",
+		"TO_SPAM": "Nachricht(en) zu Spam verschieben",
 		"NOT_SPAM": "Kein Spam",
+		"USERNAME": "Nutzername",
 		"PASSWORD": "Passwort",
+		"REMEMBER": "Zugangsdaten merken",
+		"REMEMBER_FOR_SESSION": "Aktuelle Sitzung merken",
+		"REMEMBER_PERMANENT": "Dauerhaft merken",
 		"REPLY_TO": "Antwort an",
 		"SAVE": "Speichern",
+		"SAVE_CHANGES": "Änderungen speichern?",
 		"SEARCH": "Suchen",
 		"SPAM": "Spam",
 		"SUBJECT": "Betreff",
 		"TEST": "Testen",
-		"TO": "An"
+		"TO": "An",
+		"SERVER_MESSAGE": "Server-Nachricht",
+		"YES": "Ja",
+		"NO": "Nein",
+		"INACTIVE": "Inaktiv",
+		"DEFAULT": "Standard",
+		"HELP": "Hilfe",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Anhänge"
 	},
 	"LOGIN": {
-		"LABEL_LOGIN": "Login",
+		"LABEL_LOGIN": "Anmeldung",
 		"LABEL_SIGN_ME": "Anmeldung merken",
 		"BUTTON_SIGN_IN": "Anmelden"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Konto hinzufügen",
-		"BUTTON_SETTINGS": "Einstellungen",
-		"BUTTON_HELP": "Hilfe"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "mobile Version",
-		"BUTTON_DESKTOP_VERSION": "Desktop Version"
+		"BUTTON_ADD_ACCOUNT": "Konto hinzufügen"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Erweiterte Suche",
-		"LABEL_ADV_TEXT": "Text",
-		"LABEL_ADV_HAS_ATTACHMENT": "Anhang vorhanden",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Anhänge vorhanden",
-		"LABEL_ADV_FLAGGED": "Markiert",
-		"LABEL_ADV_UNSEEN": "Ungelesen",
-		"LABEL_ADV_DATE": "Datum",
-		"LABEL_ADV_DATE_ALL": "Alle",
-		"LABEL_ADV_DATE_3_DAYS": "Nicht älter als 3 Tage",
-		"LABEL_ADV_DATE_7_DAYS": "Nicht älter als 1 Woche",
-		"LABEL_ADV_DATE_MONTH": "Nicht älter als 1 Monat",
-		"LABEL_ADV_DATE_3_MONTHS": "Nicht älter als 3 Monate",
-		"LABEL_ADV_DATE_6_MONTHS": "Nicht älter als 6 Monate",
-		"LABEL_ADV_DATE_YEAR": "Nicht älter als 1 Jahr",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Vollbild umschalten",
-		"ZOOM": "Herein-\/Herauszoomen",
-		"CLOSE": "Schließen (Esc)",
-		"GALLERY_PREV": "Zurück (Linke Pfeil-Taste)",
-		"GALLERY_NEXT": "Weiter (Rechte Pfeil-Taste)",
-		"GALLERY_COUNTER": "%curr% von %total%"
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "Anhang vorhanden",
+		"FLAGGED": "Markiert",
+		"UNSEEN": "Ungelesen",
+		"DATE": "Datum",
+		"DATE_ALL": "Alle",
+		"BEFORE_3_DAYS": "Älter als 3 Tage",
+		"BEFORE_7_DAYS": "Älter als eine Woche",
+		"BEFORE_MONTH": "Älter als ein Monat",
+		"BEFORE_3_MONTHS": "Älter als 3 Monate",
+		"BEFORE_6_MONTHS": "Älter als 6 Monate",
+		"BEFORE_YEAR": "Älter als ein Jahr",
+		"SINCE_3_DAYS": "Nicht älter als 3 Tage",
+		"SINCE_7_DAYS": "Nicht älter als eine Woche",
+		"SINCE_MONTH": "Nicht älter als ein Monat",
+		"SINCE_3_MONTHS": "Nicht älter als 3 Monate",
+		"SINCE_6_MONTHS": "Nicht älter als 6 Monate",
+		"SINCE_YEAR": "Nicht älter als ein Jahr",
+		"SUBFOLDERS": "Unterordner",
+		"SUBFOLDERS_NONE": "Keine",
+		"SUBFOLDERS_SUBTREE": "Alle",
+		"SUBFOLDERS_SUBTREE_ONE": "Eine Ebene",
+		"REPLIED": "Beantwortet",
+		"KEYWORD": "Schlagwort"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Erstellen",
@@ -80,8 +90,19 @@
 		"TRASH_NAME": "Papierkorb",
 		"ARCHIVE_NAME": "Archiv"
 	},
-	"QUOTA": {
-		"TITLE": "Speicherplatz-Nutzung"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Nachrichtenliste neu laden",
@@ -99,17 +120,20 @@
 		"MENU_SELECT_SEEN": "Gelesen",
 		"MENU_SELECT_FLAGGED": "Markiert",
 		"MENU_SELECT_UNFLAGGED": "Nicht markiert",
-		"EMPTY_LIST": "Liste ist leer.",
-		"EMPTY_SEARCH_LIST": "Keine Treffer für Ihre Suche.",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Alle Anhänge herunterladen",
+		"EMPTY_LIST": "Liste ist leer",
+		"EMPTY_SEARCH_LIST": "Keine Treffer für Ihre Suche",
 		"SEARCH_RESULT_FOR": "Suchergebnisse für \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Zurück zur Nachrichtenliste",
-		"EMPTY_SUBJECT_TEXT": "(Kein Betreff)",
-		"PUT_MESSAGE_HERE": "Ziehen Sie die Nachricht hierhin, um sie in der Liste anzuzeigen",
+		"PUT_MESSAGE_HERE": "Ziehen Sie die Nachricht hierhin, um sie in der Liste anzuzeigen.",
 		"TODAY_AT": "Heute um %TIME%",
 		"YESTERDAY_AT": "Gestern um %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Sie haben %COUNT% neue Nachrichten!",
 		"QUOTA_SIZE": "Sie nutzen <strong>%SIZE% (%PROC%%)<\/strong> von <strong>%LIMIT%<\/strong>.",
 		"SORT": "Sortieren",
+		"NO_SORT": "Ihr Mailserver unterstützt das Sortieren von E-Mails nicht",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Datum aufsteigend",
 		"SORT_DATE_DESC": "Datum absteigend",
 		"SORT_SIZE_ASC": "Größe aufsteigend",
@@ -128,7 +152,7 @@
 		"BUTTON_FORWARD_AS_ATTACHMENT": "Als Anhang weiterleiten",
 		"BUTTON_EDIT_AS_NEW": "Als neue Nachricht öffnen",
 		"BUTTON_SHOW_IMAGES": "Bilder anzeigen",
-		"BUTTON_NOTIFY_READ_RECEIPT": "Der Absender hat darum gebeten, benachrichtigt zu werden, wenn Sie diese Nachricht lesen.",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Der Absender hat um Benachrichtigung gebeten, wenn Sie diese Nachricht lesen.",
 		"BUTTON_IN_NEW_WINDOW": "In neuem Fenster anzeigen",
 		"BUTTON_THREAD_LIST": "Unterhaltungsliste",
 		"BUTTON_THREAD_PREV": "Zurück",
@@ -136,8 +160,9 @@
 		"BUTTON_THREAD_MORE": "Mehr Nachrichten",
 		"MENU_HEADERS": "Kopfzeilen anzeigen",
 		"MENU_VIEW_ORIGINAL": "Original anzeigen",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Zeige Nachricht als HTML",
+		"PLAIN_VIEW": "Zeige Nachricht im Klartext",
+		"SWAP_COLORS": "Tausche die (Hintergrund-)Farbe",
 		"MENU_DOWNLOAD_ORIGINAL": "Als .eml-Datei herunterladen",
 		"MENU_FILTER_SIMILAR": "Ähnliche Nachrichten",
 		"MENU_PRINT": "Drucken",
@@ -147,10 +172,23 @@
 		"LABEL_TO_SHORT": "an",
 		"PRINT_LABEL_ATTACHMENTS": "Anhänge",
 		"MESSAGE_VIEW_DESC": "Wählen Sie eine Nachricht aus der Liste aus, um sie anzuzeigen.",
-		"MESSAGE_VIEW_MOVE_DESC": "Klicke auf den Ordnernamen auf der linken Seite, um die Nachricht zu verschieben.",
+		"MESSAGE_VIEW_MOVE_DESC": "Klicken Sie auf den Ordnernamen auf der linken Seite, um die Nachricht zu verschieben.",
 		"LINK_DOWNLOAD_AS_ZIP": "Als ZIP-Datei herunterladen",
 		"SPAM_SCORE": "Spam-Score",
-		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt"
+		"HAS_VIRUS_WARNING": "WARNUNG: Virus erkannt",
+		"TAGS": "Schlagworte",
+		"NEW_TAG": "Neues Schlagwort",
+		"ENABLE_TRACKING_LINKS": "Aktiviere Tracking-Links",
+		"TRACKING_ENABLED": "Tracking-Links sind nun aktiv!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Wichtig",
+		"$todo": "Zu erledigen",
+		"$label1": "Wichtig",
+		"$label2": "Dienstlich",
+		"$label3": "Persönlich",
+		"$label4": "Zu erledigen",
+		"$label5": "Später"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Empfangsbestätigung (angezeigt) - %SUBJECT%",
@@ -160,9 +198,19 @@
 		"SEARCHING_DESC": "Suche läuft..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Kontakt",
+		"TAB_LOCATIONS": "Standorte",
+		"TAB_BUSINESS": "Unternehmen",
+		"LABEL_ORGANIZATION": "Organisation",
+		"LABEL_DEPARTMENT": "Abteilung",
+		"LABEL_TITLE": "Titel",
+		"TAB_CRYPTO": "Verschlüsselung",
+		"ASK": "Fragen",
+		"NEVER": "Niemals",
+		"ALWAYS": "Immer",
+		"ALWAYS_IF_POSSIBLE": "Wenn möglich",
 		"BUTTON_ADD_CONTACT": "Kontakt hinzufügen",
 		"BUTTON_CREATE_CONTACT": "Kontakt anlegen",
-		"BUTTON_UPDATE_CONTACT": "Kontakt aktualisieren",
 		"BUTTON_IMPORT": "Import (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Export (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +219,26 @@
 		"EMPTY_SEARCH": "Keine Kontakte gefunden",
 		"CLEAR_SEARCH": "Suche leeren",
 		"CONTACT_VIEW_DESC": "Kontakt aus der Liste wählen, um ihn anzuzeigen.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Geburtstag",
-		"LINK_ADD_EMAIL": "E-Mail-Adresse hinzufügen",
-		"LINK_ADD_PHONE": "Nummer hinzufügen",
-		"LINK_BIRTHDAY": "Geburtstag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Anzeigename eingeben",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Nachnamen eingeben",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Vornamen eingeben",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Spitzname eingeben",
+		"DISPLAY_NAME": "Anzeigename",
+		"LAST_NAME": "Nachnamen",
+		"FIRST_NAME": "Vornamen",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Spitzname",
 		"LABEL_READ_ONLY": "Schreibgeschützt",
-		"LABEL_SHARE": "Teilen",
 		"ADD_MENU_LABEL": "Hinzufügen",
 		"ADD_MENU_NICKNAME": "Spitzname",
-		"ADD_MENU_NOTES": "Anmerkung",
+		"ADD_MENU_NOTE": "Anmerkung",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresse",
 		"ADD_MENU_BIRTHDAY": "Geburtstag",
-		"ADD_MENU_TAGS": "Tags",
+		"ADD_MENU_TAGS": "Schlagwörter",
 		"BUTTON_SHARE_ALL": "Jeder",
-		"BUTTON_SYNC": "Synchronisierung (CardDAV)"
+		"BUTTON_SYNC": "Synchronisierung (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "An alle E-Mail-Adressen schreiben"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "alle Felder anzeigen",
@@ -203,20 +249,23 @@
 		"DISCARD_UNSAVED_DATA": "Nicht gespeicherte Daten löschen?",
 		"ATTACH_FILES": "Dateien anhängen",
 		"ATTACH_DROP_FILES_DESC": "Fügen Sie hier Dateien ein",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% schrieb",
+		"REPLY_MESSAGE_TITLE": "Am %DATETIME% schrieb %EMAIL%",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Weitergeleitete Nachricht -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Gesendet",
 		"EMPTY_TO_ERROR_DESC": "Geben Sie bitte mindestens einen Empfänger an",
 		"NO_ATTACHMENTS_HERE_DESC": "Keine Anhänge vorhanden.",
 		"ATTACHMENTS_ERROR_DESC": "Warnung! Nicht alle Anhänge wurden hochgeladen.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Es wurden noch nicht alle Anhänge hochgeladen.",
+		"ALLOW_SPELLCHECK": "Rechtschreibprüfung durch den Browser zulassen",
+		"ALLOW_DRAFT_AUTOSAVE": "Entwurf automatisch speichern",
 		"BUTTON_REQUEST_READ_RECEIPT": "Empfangsbestätigung anfordern",
 		"BUTTON_MARK_AS_IMPORTANT": "Als Wichtig markieren",
-		"BUTTON_REQUEST_DSN": "Übermittlungsstatus anfordern"
+		"BUTTON_REQUEST_DSN": "Übermittlungsstatus anfordern",
+		"BUTTON_REQUIRE_TLS": "Erzwinge sichere Übermittlung (TLS)",
+		"ERROR_EMPTY_BODY": "Inhalt der Nachricht ist leer"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nein",
+		"EXIT_ARE_YOU_SURE": "Sind Sie sicher, dass Sie SnappyMail beenden möchten?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sind Sie sicher, dass Sie dieses Fenster schließen möchten?",
 		"DESC_WANT_DELETE_MESSAGES": "Sind Sie sicher, dass Sie diese Nachricht(en) löschen möchten?"
 	},
@@ -224,20 +273,20 @@
 		"TITLE_LANGUAGES": "Sprache auswählen"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Konto hinzufügen?",
+		"TITLE_ADD_ACCOUNT": "Konto hinzufügen",
 		"BUTTON_ADD_ACCOUNT": "Hinzufügen",
-		"TITLE_UPDATE_ACCOUNT": "Konto aktualisieren?",
-		"BUTTON_UPDATE_ACCOUNT": "Aktualisieren"
+		"TITLE_UPDATE_ACCOUNT": "Konto aktualisieren"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Identität hinzufügen?",
-		"TITLE_UPDATE_IDENTITY": "Identität aktualisieren?",
+		"TITLE_ADD_IDENTITY": "Identität hinzufügen",
+		"TITLE_UPDATE_IDENTITY": "Identität aktualisieren",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Hinzufügen",
-		"BUTTON_UPDATE_IDENTITY": "Aktualisieren",
+		"SIGNATURE": "Signatur",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Diese Signatur in Antworten vor dem zitierten Text einfügen"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Ordner anlegen?",
+		"TITLE_CREATE_FOLDER": "Ordner anlegen",
 		"LABEL_PARENT": "Übergeordneter Ordner",
 		"BUTTON_CREATE": "Anlegen",
 		"TITLE_CREATING_PROCESS": "Ordner wird angelegt"
@@ -246,9 +295,24 @@
 		"TITLE_CLEAR_FOLDER": "Alle Nachrichten in diesem Ordner löschen?",
 		"DANGER_DESC_WARNING": "Achtung!",
 		"DANGER_DESC_HTML_1": "Dieser Schritt wird alle Nachrichten im Ordner <strong>%FOLDER%<\/strong> endgültig löschen.",
-		"DANGER_DESC_HTML_2": "Einmal begonnen, kann dieser Vorgang nicht mehr abgebrochen oder beendet werden.",
+		"DANGER_DESC_HTML_2": "Einmal begonnen, kann dieser Vorgang nicht mehr abgebrochen werden.",
 		"TITLE_CLEARING_PROCESS": "Ordner wird gelöscht ..."
 	},
+	"CRYPTO": {
+		"SIGN": "Unterschreiben",
+		"ENCRYPT": "Verschlüsseln",
+		"DECRYPT": "Entschlüsseln",
+		"VERIFY": "Überprüfen",
+		"GOOD_SIGNATURE": "Gültige Unterschrift von %USER%",
+		"ERROR": "%TYPE%-Fehler: %ERROR%",
+		"CREATE_SELF_SIGNED": "Erstelle selbst-signiertes Zertifikat",
+		"VALID_UNTIL": "Gültig bis",
+		"PRIVATE_KEY": "Privater Schlüssel",
+		"CHANGE_PASS": "Passphrase ändern",
+		"CURRENT_PASS": "Aktuelle Passphrase",
+		"NEW_PASS": "Neue Passphrase",
+		"ASK_CRYPTKEY_PASS": "Ihr Anmeldekennwort wurde geändert. Bitte geben Sie Ihr altes Kennwort ein, um die Daten zu entschlüsseln."
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "OpenPGP-Schlüssel importieren",
 		"POPUP_IMPORT_BUTTON": "Importieren",
@@ -256,21 +320,28 @@
 		"POPUP_VIEW_BUTTON": "Auswählen",
 		"POPUP_GENERATE_TITLE": "OpenPGP-Schlüssel generieren",
 		"POPUP_GENERATE_BUTTON": "Generieren",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Unterschrift",
-		"LABEL_ENCRYPT": "Verschlüsselung",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
+		"LABEL_KEY_TYPE": "Typ",
 		"SIGNED_MESSAGE": "OpenPGP-signierte Nachricht",
 		"ENCRYPTED_MESSAGE": "OpenPGP-verschlüsselte Nachricht",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Gültige Unterschrift von %USER%",
-		"ERROR": "OpenPGP-Fehler: %ERROR%"
+		"STORE_IN_GNUPG": "Auf dem Server in GnuPG speichern",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Öffentlichen Schlüssel auf dem Server in GnuPG speichern",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Privaten Schlüssel auf dem Server in GnuPG speichern",
+		"BACKUP_ON_SERVER": "Auf dem Server verschlüsselt speichern",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Öffentlichen Schlüssel auf dem Server speichern",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Privaten Schlüssel auf dem Server speichern"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "S\/MIME-Zertifikat importieren",
+		"CERTIFICATE": "Zertifikat",
+		"CERTIFICATECHAIN": "Zwischenzertifikat(e)",
+		"CERTIFICATES": "S\/MIME-Zertifikate",
+		"SIGNED_MESSAGE": "S\/MIME-signierte Nachricht",
+		"ENCRYPTED_MESSAGE": "S\/MIME-verschlüsselte Nachricht",
+		"PRIVATE_KEY_OF": "Privater S\/MIME-Schlüssel von %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Filter erstellen?",
-		"TITLE_EDIT_FILTER": "Filter bearbeiten?",
+		"TITLE_CREATE_FILTER": "Filter erstellen",
+		"TITLE_EDIT_FILTER": "Filter bearbeiten",
 		"LEGEND_CONDITIONS": "Bedingungen",
 		"LEGEND_ACTIONS": "Aktionen",
 		"BUTTON_ADD_CONDITION": "Bedingung hinzufügen",
@@ -300,7 +371,7 @@
 		"MARK_AS_READ_LABEL": "Als Gelesen markieren",
 		"REPLY_INTERVAL_LABEL": "Antwortintervall (Tage)",
 		"KEEP_LABEL": "Behalten",
-		"STOP_LABEL": "Weiterverarbeitung der Regeln nicht verhindern",
+		"STOP_LABEL": "Stoppe das Abarbeiten nachfolgender Regeln",
 		"VACATION_SUBJECT_LABEL": "Betreff (optional)",
 		"VACATION_MESSAGE_LABEL": "Nachricht",
 		"VACATION_RECIPIENTS_LABEL": "Empfänger (durch Komma getrennt)",
@@ -339,64 +410,107 @@
 		"ERROR_UNKNOWN": "Ein unbekannter Fehler trat beim Hochladen auf"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> QUELLTEXT",
+		"FONTFAMILY": "Schriftart",
+		"FONTSIZE": "Schriftgröße",
+		"DIR": "Textrichtung",
+		"DIR_LTR": "Links nach rechts",
+		"DIR_RTL": "Rechts nach links",
+		"DIR_AUTO": "Automatisch",
+		"TEXTCOLOR": "Textfarbe",
+		"BACKGROUNDCOLOR": "Hintergrundfarbe",
+		"BOLD": "Fett",
+		"ITALIC": "Kursiv",
+		"UNDERLINE": "Unterstrichen",
+		"STRIKE": "Durchgestrichen",
+		"SUB": "Tiefgestellt",
+		"SUP": "Hochgestellt",
+		"OL": "Geordnete Liste",
+		"UL": "Ungeordnete Liste",
+		"QUOTE": "Blockzitat",
+		"INDENTDECREASE": "Einzug verkleinern",
+		"INDENTINCREASE": "Einzug vergrößern",
+		"LINK": "Hyperlink",
+		"IMAGEURL": "Bild-URL",
+		"IMAGEUPLOAD": "Bilddatei auswählen",
+		"UNDO": "Rückgängig",
+		"REDO": "Wiederholen",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Persönlich",
-		"LABEL_GENERAL_NAME": "Allgemein",
-		"LABEL_CONTACTS_NAME": "Kontakte",
-		"LABEL_FOLDERS_NAME": "Ordner",
-		"LABEL_ACCOUNTS_NAME": "Konten",
-		"LABEL_FILTERS_NAME": "Filter",
-		"LABEL_SECURITY_NAME": "Sicherheit",
-		"LABEL_THEMES_NAME": "Themen"
+		"GENERAL": "Allgemein",
+		"CONTACTS": "Kontakte",
+		"FOLDERS": "Ordner",
+		"ACCOUNTS": "Konten",
+		"FILTERS": "Filter",
+		"SECURITY": "Sicherheit",
+		"THEMES": "Themen"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Einfach",
+		"ADVANCED": "Erweitert",
 		"BUTTON_ADD_SCRIPT": "Skript hinzufügen",
 		"SUBNAME_MOVE_TO": "Verschieben nach \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Weiterleiten nach \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Ablehnen",
 		"SUBNAME_VACATION_MESSAGE": "Urlaubsbenachrichtigung",
-		"SUBNAME_DISCARD": "Verwerfen",
-		"LOADING_PROCESS": "Aktualisiere Filterliste"
+		"SUBNAME_DISCARD": "Verwerfen"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sicherheit",
 		"LABEL_AUTOLOGOUT": "Automatische Abmeldung",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nie",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% Minute(n)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% Stunde(n)"
+		"FORGET_KEY_PASS": "Passphrase für privaten Schlüssel vergessen",
+		"NEVER": "Nie",
+		"LABEL_STORED_PASS": "Passphrase gespeichert"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Allgemein",
-		"LABEL_LANGUAGE": "Sprache",
-		"LABEL_IDENTITY": "Identität",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Keine Aufteilung",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
-		"LABEL_EDITOR": "Standard-Texteditor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Unformatierter Text",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (erzwungen)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Unformatierter Text (erzwungen)",
-		"LABEL_VIEW_OPTIONS": "Optionen anzeigen",
-		"LABEL_USE_PREVIEW_PANE": "Vorschaufenster nutzen",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen",
-		"LABEL_USE_THREADS": "Als Unterhaltungen anzeigen",
-		"LABEL_REPLY_SAME_FOLDER": "Antworten im gleichen Ordner wie die Nachricht, auf die geantwortet wurde, abspeichern",
-		"LABEL_SHOW_IMAGES": "In der Nachricht enthaltene Bilder immer anzeigen",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Entferne Hintergrund- und Textfarben aus der Nachricht",
-		"LABEL_MESSAGE_PER_PAGE": "Nachrichten pro Seite",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Nachricht als gelesen markieren nach",
+		"LANGUAGE": "Sprache",
+		"HOUR_FORMAT": "Stundenformat",
+		"IDENTITY": "Identität",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "Keine Aufteilung",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikale Aufteilung",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale Aufteilung",
+		"SHOW_NEXT_MESSAGE": "Zeige nächste Nachricht wenn aktuelle gelöscht oder verschoben wird",
+		"EDITOR": "Standard-Texteditor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Unformatierter Text",
+		"VIEW_OPTIONS": "Optionen anzeigen",
+		"USE_PREVIEW_PANE": "Vorschaufenster nutzen",
+		"HIDE_DELETED_MESSAGES": "Zum Löschen markierte Nachrichten ausblenden",
+		"USE_CHECKBOXES_IN_LIST": "Kontrollkästchen in der Liste anzeigen",
+		"USE_THREADS": "Als Unterhaltungen anzeigen",
+		"THREAD_ALGORITHM": "Verfahren für Unterhaltungen",
+		"REPLY_SAME_FOLDER": "Antworten im Ordner der beantworteten Nachricht abspeichern",
+		"PREFER_HTML": "HTML gegenüber Klartext bevorzugen",
+		"PREFER_HTML_INFO": "Nachrichten können manchmal in beiden Formaten empfangen werden. Diese Option legt fest, ob die Nachricht standardmäßig in HTML oder als Klartext angezeigt wird.",
+		"REMOVE_COLORS": "Entferne Hintergrund- und Textfarben aus der Nachricht",
+		"ALLOW_STYLES": "Erlaube erweiterte Darstellungen in Nachrichten (CSS <style>)",
+		"MESSAGE_PER_PAGE": "Nachrichten pro Seite",
+		"CHECK_MAIL_INTERVAL": "Prüfintervall für neue Nachrichten",
+		"MARK_MESSAGE_READ_AFTER": "Nachricht als gelesen markieren nach",
+		"MSG_DEFAULT_ACTION": "Standardaktion",
 		"SECONDS": "Sekunden",
-		"LABEL_NOTIFICATIONS": "Benachrichtigungen",
-		"LABEL_SOUND_NOTIFICATION": "Benachrichtigungston",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert.)"
+		"MINUTES": "Minuten",
+		"NOTIFICATIONS": "Benachrichtigungen",
+		"SOUND_NOTIFICATION": "Benachrichtigungston",
+		"CHROME_NOTIFICATION_DESC": "Popups einblenden, wenn neue Nachrichten vorhanden sind",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Vom Browser blockiert)",
+		"COLLAPSE_BLOCKQUOTES": "zitierten Text ausblenden",
+		"MAX_QUOTE_LEVEL": "Maximal sichtbare Ebenen von zitiertem Text",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Inline-Anhänge in der Liste anzeigen",
+		"LIST_SIMPLE_ATTACHMENTS": "Vereinfachte Liste der Anhänge",
+		"LIST_MESSAGES_GROUPED": "Nachrichten bei Sortierung nach Datum oder Absender gruppieren",
+		"EXTERNAL_IMAGES": "Externe Bilder",
+		"IMAGES_OPTION_ASK": "Jedesmal fragen",
+		"IMAGES_OPTION_WHITELIST": "Nutze Ausnahmeliste oder frage den Benutzer",
+		"IMAGES_OPTION_ALWAYS": "Immer anzeigen",
+		"IMAGES_WHITELIST": "Ausnahmeliste für Bilder",
+		"MESSAGE_POPUP_WINDOW": "In neuem Fenster statt Tab anzeigen",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Empfänger automatisch zu Ihrem Adressbuch hinzuzufügen",
@@ -405,17 +519,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adressbuch-URL",
 		"LABEL_CONTACTS_SYNC_USER": "Benutzer",
-		"SYNC_NO": "Nein",
-		"SYNC_YES": "Ja",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Nur lesend"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Themen",
-		"LEGEND_THEMES_CUSTOM": "Konfiguration der selbsterstellten Themen",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Hell",
-		"LABEL_CUSTOM_TYPE_DARK": "Dunkel",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Hintergrund",
+		"LABEL_BACKGROUND": "Hintergrund",
+		"LABEL_FONTS": "Schriftarten",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Hintergrundbild hochladen (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Datei ist zu groß",
 		"ERROR_FILE_TYPE_ERROR": "Ungültiger Dateityp (nur JPG und PNG)",
@@ -437,11 +546,12 @@
 		"HELP_SHOW_HIDE_FOLDER": "Ordner ein-\/ausblenden",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "Auf neue Nachrichten prüfen\/nicht prüfen",
 		"HIDE_UNSUBSCRIBED": "Nicht abonnierte Ordner ausblenden",
+		"UNHIDE_KOLAB_FOLDERS": "Kolab Ordner anzeigen",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Konfiguration",
 		"TYPE_CONTACTS": "Kontakte",
 		"TYPE_FILES": "Dateien",
-		"TYPE_JOURNAL": "Journal",
+		"TYPE_JOURNAL": "Tagebuch",
 		"TYPE_NOTES": "Aufzeichnungen",
 		"TYPE_TASKS": "Aufgaben"
 	},
@@ -452,15 +562,15 @@
 		"BUTTON_ADD_ACCOUNT": "Konto hinzufügen",
 		"BUTTON_ADD_IDENTITY": "Identität hinzufügen",
 		"LOADING_PROCESS": "Aktualisiere Kontenliste",
-		"DEFAULT_IDENTITY_LABEL": "Standard"
+		"SHOW_UNREAD": "Zeige Zahl der ungelesenen Nachrichten aller Konten"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Schlüssel importieren",
 		"BUTTON_GENERATE_KEY_PAIR": "Schlüssel generieren",
+		"IMPORT_FROM_SERVER": "Vom Server importieren",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Öffentlich",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Lade das Mailvelope Browser-Addon herunter."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tastaturkürzel-Hilfe",
@@ -473,7 +583,6 @@
 		"LABEL_REPLY_ALL": "Allen Antworten",
 		"LABEL_FORWARD": "Weiterleiten",
 		"LABEL_FORWARD_MULTIPLY": "Als Anhang\/Anhänge weiterleiten",
-		"LABEL_HELP": "Hilfe",
 		"LABEL_CHECK_ALL": "Alle Nachrichten auswählen",
 		"LABEL_DELETE": "Löschen",
 		"LABEL_OPEN_THREAD": "Ausgewählte Unterhaltung öffnen",
@@ -490,51 +599,54 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Nachrichten-Blockzitate umschalten",
 		"LABEL_THREAD_NEXT": "Nächste Nachricht in Unterhaltung",
 		"LABEL_THREAD_PREV": "Vorherige Nachricht in Unterhaltung",
-		"LABEL_PRINT": "Drucken",
 		"LABEL_EXIT_FULLSCREEN": "Vollbildmodus verlassen",
 		"LABEL_CLOSE_MESSAGE": "Nachricht schließen (kein Vorschaubereich-Layout)",
 		"LABEL_SWITCH_TO_LIST": "Fokus auf Nachrichtenliste zurückschalten",
 		"LABEL_OPEN_COMPOSE_POPUP": "Erstellen-Popup öffnen",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Erstellen-Popup minimieren",
 		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Identitätsauswahl öffnen",
 		"LABEL_SAVE_MESSAGE": "Nachricht speichern",
 		"LABEL_SEND_MESSAGE": "Nachricht senden",
 		"LABEL_CLOSE_COMPOSE": "Popup schließen"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ungültiger Token",
-		"AUTH_ERROR": "Authentifizierung fehlgeschlagen",
-		"CONNECTION_ERROR": "Serververbindung kann nicht hergestellt werden",
-		"DOMAIN_ALREADY_EXISTS": "Diese Domain existiert bereits",
-		"DOMAIN_NOT_ALLOWED": "Diese Domain ist nicht zugelassen.",
-		"ACCOUNT_NOT_ALLOWED": "Konto ist nicht zugelassen.",
-		"CONTACTS_SYNC_ERROR": "Fehler bei Kontakte-Synchronisierung",
-		"CANT_GET_MESSAGE_LIST": "Die Nachrichtenliste ist nicht verfügbar",
-		"CANT_GET_MESSAGE": "Diese Nachricht ist nicht verfügbar",
-		"CANT_DELETE_MESSAGE": "Diese Nachricht kann nicht gelöscht werden",
-		"CANT_COPY_MESSAGE": "Diese Nachricht kann nicht kopiert werden",
-		"CANT_MOVE_MESSAGE": "Diese Nachricht kann nicht verschoben werden",
-		"CANT_SAVE_MESSAGE": "Diese Nachricht kann nicht gespeichert werden",
-		"CANT_SEND_MESSAGE": "Diese Nachricht kann nicht gesendet werden",
-		"INVALID_RECIPIENTS": "Ungültige Empfängeradressen",
-		"CANT_SAVE_FILTERS": "Die Filter können nicht gespeichert werden",
-		"CANT_GET_FILTERS": "Die Filter sind nicht verfügbar",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Die Filter sind fehlerhaft",
-		"CANT_CREATE_FOLDER": "Dieser Ordner kann nicht angelegt werden",
-		"CANT_RENAME_FOLDER": "Dieser Ordner kann nicht umbenannt werden",
-		"CANT_DELETE_FOLDER": "Dieser Ordner kann nicht gelöscht werden",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Der Ordner kann nicht gelöscht werden; er ist nicht leer",
-		"CANT_SUBSCRIBE_FOLDER": "Dieser Ordner kann nicht abonniert werden",
-		"CANT_UNSUBSCRIBE_FOLDER": "Das Abonnement dieses Ordners kann nicht gelöscht werden",
-		"DEMO_SEND_MESSAGE_ERROR": "Dieses Demokonto darf aus Sicherheitsgründen keine Nachrichten an externe E-Mail-Adressen versenden!",
-		"DEMO_ACCOUNT_ERROR": "Aus Sicherheitsgründen ist dieses Konto nicht zu dieser Aktion berechtigt!",
-		"ACCOUNT_ALREADY_EXISTS": "Dieses Konto existiert bereits",
-		"ACCOUNT_DOES_NOT_EXIST": "Dieser Account existiert nicht.",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Beim Zugriff auf den E-Mail-Server trat ein Fehler auf.",
-		"INVALID_INPUT_ARGUMENT": "Ungültige Eingabe",
-		"UNKNOWN_ERROR": "Unbekannter Fehler"
+		"RequestError": "Anfrage fehlgeschlagen",
+		"RequestAborted": "Anfrage abgebrochen",
+		"RequestTimeout": "Zeitüberschreitung der Anfrage",
+		"InvalidToken": "Ungültiger Token",
+		"AuthError": "Authentifizierung fehlgeschlagen",
+		"ConnectionError": "Serververbindung kann nicht hergestellt werden",
+		"DomainAlreadyExists": "Diese Domain existiert bereits",
+		"DomainNotAllowed": "Diese Domain ist nicht zugelassen.",
+		"AccountNotAllowed": "Konto ist nicht zugelassen.",
+		"CryptKeyError": "Ihr Anmeldekennwort wurde geändert",
+		"ContactsSyncError": "Fehler bei Kontakte-Synchronisierung",
+		"CantGetMessageList": "Die Nachrichtenliste ist nicht verfügbar",
+		"CantGetMessage": "Diese Nachricht ist nicht verfügbar",
+		"CantDeleteMessage": "Diese Nachricht kann nicht gelöscht werden",
+		"CantCopyMessage": "Diese Nachricht kann nicht kopiert werden",
+		"CantMoveMessage": "Diese Nachricht kann nicht verschoben werden",
+		"CantSaveMessage": "Diese Nachricht kann nicht gespeichert werden",
+		"CantSendMessage": "Diese Nachricht kann nicht gesendet werden",
+		"InvalidRecipients": "Ungültige Empfängeradressen",
+		"CantSaveFilters": "Die Filter können nicht gespeichert werden",
+		"CantGetFilters": "Die Filter sind nicht verfügbar",
+		"CantActivateFiltersScript": "Filters-Skript kann nicht aktiviert werden",
+		"CantDeleteFiltersScript": "Filters-Skript kann nicht gelöscht werden",
+		"FiltersAreNotCorrect": "Die Filter sind fehlerhaft",
+		"CantCreateFolder": "Dieser Ordner kann nicht angelegt werden",
+		"CantRenameFolder": "Dieser Ordner kann nicht umbenannt werden",
+		"CantDeleteFolder": "Dieser Ordner kann nicht gelöscht werden",
+		"CantDeleteNonEmptyFolder": "Der Ordner kann nicht gelöscht werden; er ist nicht leer",
+		"CantSubscribeFolder": "Dieser Ordner kann nicht abonniert werden",
+		"CantUnsubscribeFolder": "Das Abonnement dieses Ordners kann nicht gelöscht werden",
+		"DemoSendMessageError": "Dieses Demokonto darf aus Sicherheitsgründen keine Nachrichten an externe E-Mail-Adressen versenden!",
+		"DemoAccountError": "Aus Sicherheitsgründen ist dieses Konto nicht zu dieser Aktion berechtigt!",
+		"AccountAlreadyExists": "Dieses Konto existiert bereits",
+		"AccountDoesNotExist": "Dieser Account existiert nicht.",
+		"AccountSwitchFailed": "Konto wechseln \"%EMAIL%\" versagt",
+		"MailServerError": "Beim Zugriff auf den E-Mail-Server trat ein Fehler auf.",
+		"InvalidInputArgument": "Ungültige Eingabe",
+		"UnknownError": "Unbekannter Fehler"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/el/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/el-GR/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/el/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/static.json b/snappymail/v/0.0.0/app/localization/el/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/el-GR/static.json
rename to snappymail/v/0.0.0/app/localization/el/static.json
diff --git a/snappymail/v/0.0.0/app/localization/el-GR/user.json b/snappymail/v/0.0.0/app/localization/el/user.json
similarity index 65%
rename from snappymail/v/0.0.0/app/localization/el-GR/user.json
rename to snappymail/v/0.0.0/app/localization/el/user.json
index b0c482281..c7f148411 100644
--- a/snappymail/v/0.0.0/app/localization/el-GR/user.json
+++ b/snappymail/v/0.0.0/app/localization/el/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Αρχειοθέτηση",
 		"ARE_YOU_SURE": "Είστε σίγουροι;",
@@ -10,6 +11,7 @@
 		"CLOSE": "Κλείσιμο (Esc)",
 		"CONTACTS": "Επαφές",
 		"DELETE": "Διαγραφή",
+		"UNDELETE": "Undelete",
 		"DONE": "Έγινε",
 		"EMAIL": "Διεύθυνση ηλεκτρονικού ταχυδρομείου",
 		"FROM": "Από",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Έξοδος",
 		"MORE": "Περισσότερα",
 		"MOVE_TO": "Μετακίνησε σε",
+		"COPY_TO": "Αντέγραψε στο",
 		"NAME": "Εισερχόμενα",
 		"NONE": "Κανένα",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Όχι ανεπιθύμητο",
+		"USERNAME": "Όνομα χρήστη",
 		"PASSWORD": "Κωδικός πρόσβασης",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Απάντηση στον",
 		"SAVE": "Αποθήκευση",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Δεν βρέθηκαν επαφές",
 		"SPAM": "Ανεπιθύμητο",
 		"SUBJECT": "Θέμα",
 		"TEST": "Τεστ",
-		"TO": "Προς"
+		"TO": "Προς",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Ναι",
+		"NO": "Όχι",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Βοήθεια",
+		"TEXT": "Κείμενο",
+		"ATTACHMENTS": "Συνημμένα"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Είσοδος",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Σύνδεση"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Προσθήκη λογαριασμού",
-		"BUTTON_SETTINGS": "Ρυθμίσεις",
-		"BUTTON_HELP": "Βοήθεια"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
+		"BUTTON_ADD_ACCOUNT": "Προσθήκη λογαριασμού"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Προχωρημένη αναζήτηση",
-		"LABEL_ADV_TEXT": "Κείμενο",
-		"LABEL_ADV_HAS_ATTACHMENT": "Έχει συνημμένο",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Έχει συνημμένα",
-		"LABEL_ADV_FLAGGED": "Με σημαία",
-		"LABEL_ADV_UNSEEN": "Δεν έχουν διαβαστεί",
-		"LABEL_ADV_DATE": "Ημερομηνία",
-		"LABEL_ADV_DATE_ALL": "Όλα",
-		"LABEL_ADV_DATE_3_DAYS": "Έως 3 ημέρες πρίν",
-		"LABEL_ADV_DATE_7_DAYS": "Έως 1 εβδομάδα πριν",
-		"LABEL_ADV_DATE_MONTH": "Έως 1 μήνα πριν",
-		"LABEL_ADV_DATE_3_MONTHS": "Έως 3 μήνες πριν",
-		"LABEL_ADV_DATE_6_MONTHS": "Έως 6 μήνες πριν",
-		"LABEL_ADV_DATE_YEAR": "Έως 1 χρόνο πριν",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Ενναλαγή πλήρους οθόνης",
-		"ZOOM": "Μεγέθυνση\/Σμίκρυνση",
-		"CLOSE": "Κλείσιμο (Esc)",
-		"GALLERY_PREV": "Προηγούμενο (αριστερό βέλος)",
-		"GALLERY_NEXT": "Επόμενο (δεξί βέλος)",
-		"GALLERY_COUNTER": "%curr% από %total%"
+		"TEXT": "Κείμενο",
+		"HAS_ATTACHMENT": "Έχει συνημμένο",
+		"FLAGGED": "Με σημαία",
+		"UNSEEN": "Δεν έχουν διαβαστεί",
+		"DATE": "Ημερομηνία",
+		"DATE_ALL": "Όλα",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Έως 3 ημέρες πρίν",
+		"SINCE_7_DAYS": "Έως 1 εβδομάδα πριν",
+		"SINCE_MONTH": "Έως 1 μήνα πριν",
+		"SINCE_3_MONTHS": "Έως 3 μήνες πριν",
+		"SINCE_6_MONTHS": "Έως 6 μήνες πριν",
+		"SINCE_YEAR": "Έως 1 χρόνο πριν",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Απάντησε",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Νέο μήνυμα",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Άχρηστα",
 		"ARCHIVE_NAME": "Αρχείο"
 	},
-	"QUOTA": {
-		"TITLE": "Χρήση αποθηκευτικού χώρου"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Φόρτωσε ξανά τη λίστα των μηνυμάτων",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Διαβασμένο",
 		"MENU_SELECT_FLAGGED": "Σημαδεμένο",
 		"MENU_SELECT_UNFLAGGED": "Μη σημαδεμένο",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Άδεια λίστα.",
 		"EMPTY_SEARCH_LIST": "Δεν υπάρχουν μηνύματα που να ταιριάζουν στην αναζήτηση.",
 		"SEARCH_RESULT_FOR": "Αποτελέσματα αναζήτησης για \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "πίσω στη λίστα των μηνυμάτων",
-		"EMPTY_SUBJECT_TEXT": "(Κανένα θέμα)",
 		"PUT_MESSAGE_HERE": "Σύρετε εδώ το μήνυμα για να φανεί στη λίστα",
 		"TODAY_AT": "σήμερα στις %TIME%",
 		"YESTERDAY_AT": "εχθές στις %TIME% ",
 		"NEW_MESSAGE_NOTIFICATION": "Έχετε %COUNT% νέα μηνύματα!",
 		"QUOTA_SIZE": "Χρησιμοποιούνται <strong>%SIZE% (%PROC%%)<\/strong> από <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Εμφάνιση πηγαίου μηνύματος",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Μεταφόρτωση σαν αρχείο .eml",
 		"MENU_FILTER_SIMILAR": "Φιλτράρισμα μηνυμάτων όπως αυτό",
 		"MENU_PRINT": "Εκτύπωση",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Μεταφόρτωση σαν zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Αποδεικτικό Ανάγνωσης (παρουσιάστηκε) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Αναζήτηση..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Προσθήκη επαφής",
 		"BUTTON_CREATE_CONTACT": "Δημιουργία",
-		"BUTTON_UPDATE_CONTACT": "Ενημέρωση",
 		"BUTTON_IMPORT": "Εισαγωγή (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Εξαγωγή (csv, vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Εξαγωγή (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Δεν βρέθηκαν επαφές",
 		"CLEAR_SEARCH": "Καθαρισμός αναζήτησης",
 		"CONTACT_VIEW_DESC": "Επιλέξτε μια επαφή από τη λίστα για να εμφανιστεί εδώ.",
-		"LABEL_PHONE": "Τηλέφωνο",
-		"LABEL_WEB": "Ιστός",
 		"LABEL_BIRTHDAY": "Γενέθλια",
-		"LINK_ADD_EMAIL": "Προσθήκη ηλεκτρονικής διεύθυνσης αλληλογραφίας",
-		"LINK_ADD_PHONE": "Προσθήκη τηλεφώνου",
-		"LINK_BIRTHDAY": "Γενέθλια",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Εισαγωγή ονόματος εμφάνισης",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Εισαγωγή επωνύμου",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Εισαγωγή ονόματος",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Εισαγωγή πρόσθετου ονόματος",
+		"DISPLAY_NAME": "Ονόματος εμφάνισης",
+		"LAST_NAME": "Επωνύμου",
+		"FIRST_NAME": "Ονόματος",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Πρόσθετου ονόματος",
 		"LABEL_READ_ONLY": "Μόνο για ανάγνωση",
-		"LABEL_SHARE": "Διαμοιρασμός ",
 		"ADD_MENU_LABEL": "Προσθήκη",
 		"ADD_MENU_NICKNAME": "Πρόσθετο όνομα",
-		"ADD_MENU_NOTES": "Σημειώσεις",
+		"ADD_MENU_NOTE": "Σημειώσεις",
 		"ADD_MENU_PHONE": "Τηλέφωνο",
 		"ADD_MENU_URL": "Τοποθεσία ιστού",
 		"ADD_MENU_ADDRESS": "Διεύθυνση",
 		"ADD_MENU_BIRTHDAY": "Γενέθλια",
 		"ADD_MENU_TAGS": "Ετικέτες",
 		"BUTTON_SHARE_ALL": "Όλοι",
-		"BUTTON_SYNC": "Συγχρονισμός (CardDAV)"
+		"BUTTON_SYNC": "Συγχρονισμός (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Εμφάνισε όλα τα πεδία",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Δεν υπάρχουν συνημμένα εδώ.",
 		"ATTACHMENTS_ERROR_DESC": "Προειδοποίηση! Δεν έχουν μεταφορτωθεί όλα τα συνημμένα.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Δεν έχουν μεταφορτωθεί ακόμη όλα τα συνημμένα.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Ζητήστε αποδεικτικό ανάγνωσης",
 		"BUTTON_MARK_AS_IMPORTANT": "Σημειώστε το σαν σημαντικό",
-		"BUTTON_REQUEST_DSN": "Ζητήστε αποδεικτικό παράδοσης"
+		"BUTTON_REQUEST_DSN": "Ζητήστε αποδεικτικό παράδοσης",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ναι",
-		"BUTTON_NO": "Όχι",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Είστε σίγουροι πως θέλετε να κλείσετε αυτό το παράθυρο;",
 		"DESC_WANT_DELETE_MESSAGES": "Είστε σίγουροι πως θέλετε να διαγράψετε το (τα) μήνυμα(τα);"
 	},
@@ -224,16 +271,16 @@
 		"TITLE_LANGUAGES": "Επιλέξτε τη γλώσσα σας"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Προσθήκη λογαριασμού;",
+		"TITLE_ADD_ACCOUNT": "Προσθήκη λογαριασμού",
 		"BUTTON_ADD_ACCOUNT": "Προσθήκη",
-		"TITLE_UPDATE_ACCOUNT": "Ενημέρωση λογαριασμού;",
-		"BUTTON_UPDATE_ACCOUNT": "Ενημέρωση"
+		"TITLE_UPDATE_ACCOUNT": "Ενημέρωση λογαριασμού"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Προσθήκη ταυτότητας;",
-		"TITLE_UPDATE_IDENTITY": "Ενημέρωση ταυτότητας;",
+		"TITLE_ADD_IDENTITY": "Προσθήκη ταυτότητας",
+		"TITLE_UPDATE_IDENTITY": "Ενημέρωση ταυτότητας",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Προσθήκη",
-		"BUTTON_UPDATE_IDENTITY": "Ενημέρωση",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Προσθήκη της υπογραφής πριν το προτότυπο κείμενο στις απαντήσεις"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Αφού ξεκινήσει, η διαδικασία δεν σταματά ή ακυρώνεται.",
 		"TITLE_CLEARING_PROCESS": "Διαγραφή όλων των μηνυμάτων στο φάκελο..."
 	},
+	"CRYPTO": {
+		"SIGN": "Υπογραφή",
+		"ENCRYPT": "Κρυπτογράφηση",
+		"DECRYPT": "Αποκρυπτογράφηση",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Εισαγωγή κλειδιού OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Εισαγωγή",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Δημιουργία κλειδιών OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Δημιουργία",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Υπογραφή",
-		"LABEL_ENCRYPT": "Κρυπτογράφηση",
-		"BUTTON_DECRYPT": "Αποκρυπτογράφηση",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Μήνυμα υπογεγραμμένο με OpenPGP",
 		"ENCRYPTED_MESSAGE": "Μήνυμα κωδικοποιημένο με OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Μήνυμα υπογεγραμμένο με S\/MIME",
+		"ENCRYPTED_MESSAGE": "Μήνυμα κωδικοποιημένο με S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Δημιουργία φίλτρου;",
-		"TITLE_EDIT_FILTER": "Ενημέρωση φίλτρου;",
+		"TITLE_CREATE_FILTER": "Δημιουργία φίλτρου",
+		"TITLE_EDIT_FILTER": "Ενημέρωση φίλτρου",
 		"LEGEND_CONDITIONS": "Συνθήκες",
 		"LEGEND_ACTIONS": "Ενέργειες",
 		"BUTTON_ADD_CONDITION": "Προσθήκη συνθήκης",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Σήμανε σαν διαβασμένο",
 		"REPLY_INTERVAL_LABEL": "Μεσοδιάστημα απαντήσεων (σε ημέρες)",
 		"KEEP_LABEL": "Κράτησε",
-		"STOP_LABEL": "Μην σταματάς να επεξεργάζεσαι κανόνες",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Θέμα (προαιρετικό)",
 		"VACATION_MESSAGE_LABEL": "Μήνυμα",
 		"VACATION_RECIPIENTS_LABEL": "Παραλήπτες (χωρισμένοι με κόμμα)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Υπήρξε άγνωστο λάθος κατα τη διαδικασία μεταφόρτωσης του αρχείου"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Προσωπικό",
-		"LABEL_GENERAL_NAME": "Γενικό",
-		"LABEL_CONTACTS_NAME": "Επαφές",
-		"LABEL_FOLDERS_NAME": "Φάκελοι",
-		"LABEL_ACCOUNTS_NAME": "Λογαρισμοί",
-		"LABEL_FILTERS_NAME": "Φίλτρα",
-		"LABEL_SECURITY_NAME": "Ασφάλεια",
-		"LABEL_THEMES_NAME": "Θέματα"
+		"GENERAL": "Γενικό",
+		"CONTACTS": "Επαφές",
+		"FOLDERS": "Φάκελοι",
+		"ACCOUNTS": "Λογαρισμοί",
+		"FILTERS": "Φίλτρα",
+		"SECURITY": "Ασφάλεια",
+		"THEMES": "Θέματα"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Φίλτρα",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Μετακίνηση στο \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Προώθηση στο \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Απόρριψη",
 		"SUBNAME_VACATION_MESSAGE": "Μήνυμα διακοπών",
-		"SUBNAME_DISCARD": "Απόρριψη",
-		"LOADING_PROCESS": "Ενημέρωση λίστας φίλτρων"
+		"SUBNAME_DISCARD": "Απόρριψη"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Ασφάλεια",
 		"LABEL_AUTOLOGOUT": "Αυτόματη αποσύνδεση",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Ποτέ",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% λεπτό(α)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Ποτέ"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Γενικό",
-		"LABEL_LANGUAGE": "Γλώσσα",
-		"LABEL_IDENTITY": "Ταυτότητα",
-		"LABEL_LAYOUT": "Σχέδιο",
-		"LABEL_LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
-		"LABEL_EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Απλό",
-		"LABEL_EDITOR_HTML_FORCED": "Html (επιβολή)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Απλό (επιβολή)",
-		"LABEL_VIEW_OPTIONS": "Επιλογές προβολής",
-		"LABEL_USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα",
-		"LABEL_USE_THREADS": "Χρήση νημάτων",
-		"LABEL_REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
-		"LABEL_SHOW_IMAGES": "Να εμφανίζονται πάντα οι εξωτερικές εικόνες στο σώμα του μηνύματος",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Μηνύματα στη σελίδα",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Γλώσσα",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Ταυτότητα",
+		"LAYOUT": "Σχέδιο",
+		"LAYOUT_NO_SPLIT": "Χωρίς χώρισμα",
+		"LAYOUT_VERTICAL_SPLIT": "Κάθετο χώρισμα",
+		"LAYOUT_HORIZONTAL_SPLIT": "Οριζόντιο χώρισμα",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Προεπιλεγμένος συντάκτης κειμένου",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Απλό",
+		"VIEW_OPTIONS": "Επιλογές προβολής",
+		"USE_PREVIEW_PANE": "Χρήση προεπισκόπησης ",
+		"HIDE_DELETED_MESSAGES": "Απόκρυψη μηνυμάτων που έχουν επισημανθεί για διαγραφή",
+		"USE_CHECKBOXES_IN_LIST": "Εμφάνιση των κουτιών επιλογής σε λίστα",
+		"USE_THREADS": "Χρήση νημάτων",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Τοποθέτηση απαντήσεων στο φάκελο που ανήκει το μήνυμα που απαντάται",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Μηνύματα στη σελίδα",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Επισημάνσεις",
-		"LABEL_SOUND_NOTIFICATION": "Ηχητική επισήμανση",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Επισημάνσεις",
+		"SOUND_NOTIFICATION": "Ηχητική επισήμανση",
+		"CHROME_NOTIFICATION_DESC": "Να εμφανίζονται τα νέα μηνύματα σε αναδυόμενες επισημάνσεις",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Αποκλείστηκε από το φυλλομετρητή)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Αυτόματη προσθήκη επαφών στον κατάλογο διευθύνσεων",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Εξυπηρετητής",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL του καταλόγου διεθύνσεων",
 		"LABEL_CONTACTS_SYNC_USER": "Χρήστης",
-		"SYNC_NO": "Όχι",
-		"SYNC_YES": "Ναι",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Θέματα",
-		"LEGEND_THEMES_CUSTOM": "Διαμόρφωση προσαρμοσμένου θέματος",
-		"LABEL_CUSTOM_TYPE": "Τύπος",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ανοικτόχρωμο",
-		"LABEL_CUSTOM_TYPE_DARK": "Σκουρόχρωμο",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Υπόβαθρο",
+		"LABEL_BACKGROUND": "Υπόβαθρο",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Μεταφόρτωση εικόνας υποβάθρου (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Το αρχείο είναι πολύ μεγάλο",
 		"ERROR_FILE_TYPE_ERROR": "Άκυρος τύπος αρχείου (μόνο JPG και PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Add an Account",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Updating...",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Απάντηση σε όλους",
 		"LABEL_FORWARD": "Προώθηση",
 		"LABEL_FORWARD_MULTIPLY": "Προώθησε σαν συνημμένο(α)",
-		"LABEL_HELP": "Βοήθεια",
 		"LABEL_CHECK_ALL": "Select all messages",
 		"LABEL_DELETE": "Διέγραψε",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Εκτύπωση",
 		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
 		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
 		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Invalid token",
-		"AUTH_ERROR": "Authentication failed",
-		"CONNECTION_ERROR": "Can't connect to server",
-		"DOMAIN_ALREADY_EXISTS": "Domain already exists",
-		"DOMAIN_NOT_ALLOWED": "Domain is not allowed",
-		"ACCOUNT_NOT_ALLOWED": "Account is not allowed",
-		"CONTACTS_SYNC_ERROR": "Contacts synchronization error",
-		"CANT_GET_MESSAGE_LIST": "Can't get message list",
-		"CANT_GET_MESSAGE": "Can't get message",
-		"CANT_DELETE_MESSAGE": "Can't delete message",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Can't move message",
-		"CANT_SAVE_MESSAGE": "Can't save message",
-		"CANT_SEND_MESSAGE": "Can't send message",
-		"INVALID_RECIPIENTS": "Invalid recipients",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Can't create folder",
-		"CANT_RENAME_FOLDER": "Can't rename folder",
-		"CANT_DELETE_FOLDER": "Can't delete folder",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Can't delete non-empty directory",
-		"CANT_SUBSCRIBE_FOLDER": "Can't subscribe folder",
-		"CANT_UNSUBSCRIBE_FOLDER": "Can't unsubscribe folder",
-		"DEMO_SEND_MESSAGE_ERROR": "For security purposes, this account is not allowed to send messages to external e-mail addresses!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Account already exists",
-		"ACCOUNT_DOES_NOT_EXIST": "Account doesn't exist",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "An error has occured while accessing mail server",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Unknown error"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Invalid token",
+		"AuthError": "Authentication failed",
+		"ConnectionError": "Can't connect to server",
+		"DomainAlreadyExists": "Domain already exists",
+		"DomainNotAllowed": "Domain is not allowed",
+		"AccountNotAllowed": "Account is not allowed",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Contacts synchronization error",
+		"CantGetMessageList": "Can't get message list",
+		"CantGetMessage": "Can't get message",
+		"CantDeleteMessage": "Can't delete message",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Can't move message",
+		"CantSaveMessage": "Can't save message",
+		"CantSendMessage": "Can't send message",
+		"InvalidRecipients": "Invalid recipients",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Can't create folder",
+		"CantRenameFolder": "Can't rename folder",
+		"CantDeleteFolder": "Can't delete folder",
+		"CantDeleteNonEmptyFolder": "Can't delete non-empty directory",
+		"CantSubscribeFolder": "Can't subscribe folder",
+		"CantUnsubscribeFolder": "Can't unsubscribe folder",
+		"DemoSendMessageError": "For security purposes, this account is not allowed to send messages to external e-mail addresses!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Account already exists",
+		"AccountDoesNotExist": "Account doesn't exist",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "An error has occured while accessing mail server",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Unknown error"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/en/admin.json b/snappymail/v/0.0.0/app/localization/en/admin.json
index 14f53adb5..2006cab01 100644
--- a/snappymail/v/0.0.0/app/localization/en/admin.json
+++ b/snappymail/v/0.0.0/app/localization/en/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Add",
+		"CLOSE": "Close",
 		"SAVE": "Save",
-		"UPDATE": "Update"
+		"TEST": "Test",
+		"UPDATE": "Update",
+		"USERNAME": "Username",
+		"PASSWORD": "Passphrase",
+		"CANCEL": "Cancel",
+		"SEARCH": "Search",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Log into the admin panel"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "General",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_DOMAINS_NAME": "Domains",
-		"LABEL_SECURITY_NAME": "Security",
-		"LABEL_PACKAGES_NAME": "Extensions",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "About"
+		"GENERAL": "General",
+		"LOGIN": "Login",
+		"BRANDING": "Branding",
+		"CONTACTS": "Contacts",
+		"DOMAINS": "Domains",
+		"SECURITY": "Security",
+		"PACKAGES": "Extensions",
+		"CONFIG": "Config",
+		"ABOUT": "About"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Interface",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Allow language selection on settings screen",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Allow theme selection on settings screen",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen",
-		"LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button",
 		"LABEL_SHOW_THUMBNAILS": "Show thumbnails (attachments)",
 		"LEGEND_MAIN": "Main",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Attachment size limit",
@@ -39,15 +46,14 @@
 		"LABEL_ALLOW_IDENTITIES": "Allow multiple identities",
 		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
 		"ALERT_WARNING": "Warning!",
-		"HTML_ALERT_WEAK_PASSWORD": "You are using the default admin password.\n<br>\nFor security reasons please\n<strong><a href=\"#\/security\">change<\/a><\/strong>\npassword to something else now.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "You are using the default admin passphrase.\n<br>\nFor security reasons please\n<strong><a href=\"#\/security\">change<\/a><\/strong>\npassphrase to something else now.\n"
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Login Screen",
 		"LABEL_DEFAULT_DOMAIN": "Default Domain",
 		"LABEL_DETERMINE_USER_DOMAIN": "Try to determine user domain",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Allow language selection on login screen",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
@@ -61,11 +67,12 @@
 		"LABEL_ENABLE_CONTACTS": "Enable contacts",
 		"LABEL_ALLOW_SYNC": "Allow contacts sync (with external CardDAV server)",
 		"LABEL_STORAGE_TYPE": "Type",
-		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_DSN": "Data Source Name (DSN)",
 		"LABEL_STORAGE_USER": "User",
-		"LABEL_STORAGE_PASSWORD": "Password",
-		"BUTTON_TEST": "Test",
+		"LABEL_STORAGE_PASSWORD": "Passphrase",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Notice!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Don't use this database type with a large number of active users.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Your system doesn't support contacts.\n<br>\nYou need to install or enable <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extension on your server.\n"
 	},
@@ -74,21 +81,19 @@
 		"BUTTON_ADD_DOMAIN": "Add Domain",
 		"BUTTON_ADD_ALIAS": "Add Alias",
 		"DELETE_ARE_YOU_SURE": "Are you sure?",
-		"HTML_DOMAINS_HELPER": "List of domains webmail is allowed to access.\n<br>\nClick on the name to configure the domain.\n"
+		"HTML_DOMAINS_HELPER": "List of domains that are allowed.\n<br>\nClick on the name to configure the domain.\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPEN_PGP": "Allow OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Show PHP information",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
-		"LABEL_CURRENT_PASSWORD": "Current password",
-		"LABEL_NEW_LOGIN": "New login",
-		"LABEL_NEW_PASSWORD": "New password",
-		"LABEL_REPEAT_PASSWORD": "Repeat",
-		"BUTTON_UPDATE_PASSWORD": "Update Password",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
+		"LABEL_CURRENT_PASSWORD": "Current passphrase",
+		"LABEL_NEW_PASSWORD": "New passphrase",
+		"LABEL_REPEAT_PASSWORD": "Repeat passphrase",
+		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
@@ -103,8 +108,8 @@
 		"LABEL_TAG_HINT": "Simple, modern & fast web-based email client",
 		"LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.",
 		"HINT_READ_CHANGE_LOG": "Please read the change log before updating.",
-		"HINT_IS_UP_TO_DATE": "RainLoop is up to date.",
-		"HTML_NEW_VERSION": "New <b>%VERSION%</b> version is available.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail is up to date.",
+		"HTML_NEW_VERSION": "New <b>%VERSION%<\/b> version is available.",
 		"LABEL_UPDATING": "Updating",
 		"LABEL_CHECKING": "Checking for updates",
 		"BUTTON_RELEASES": "Releases"
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Add Alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domain",
-		"BUTTON_CLOSE": "Close",
-		"BUTTON_ADD": "Add"
+		"LABEL_DOMAIN": "Domain"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Add Domain",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Edit Domain \"%NAME%\"",
 		"LABEL_NAME": "Name",
 		"NAME_HELPER": "wildcard supported",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
-		"LABEL_SECURE": "Secure",
-		"LABEL_WHITE_LIST": "White List",
+		"LABEL_SECURE": "Security",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "None",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Allow sieve scripts",
 		"LABEL_USE_SHORT_LOGIN": "Use short login",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Use authentication",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Use php mail() function",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "White List",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve configuration",
-		"BUTTON_BACK_TO_IMAP": "Back to IMAP settings",
-		"BUTTON_BACK": "Back",
-		"BUTTON_CLOSE": "Close",
-		"BUTTON_ADD": "Add",
-		"BUTTON_UPDATE": "Update",
-		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work <br>with <i>%NAME%<\/i> email addresses.",
-		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n"
+		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
+		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extension",
-		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure",
-		"BUTTON_CLOSE": "Close"
+		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Warning!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Unknown error"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Invalid token",
-		"AUTH_ERROR": "Authentication failed",
-		"DOMAIN_ALREADY_EXISTS": "Domain already exists",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Can't save settings",
-		"CANT_INSTALL_PACKAGE": "Failed to install extension",
-		"CANT_DELETE_PACKAGE": "Failed to remove extension",
-		"INVALID_PLUGIN_PACKAGE": "Invalid extension package",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Unsupported extension package",
-		"UNKNOWN_ERROR": "Unknown error"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Invalid token",
+		"AuthError": "Authentication failed",
+		"DomainAlreadyExists": "Domain already exists",
+		"CantSavePluginSettings": "Can't save settings",
+		"CantInstallPackage": "Failed to install extension",
+		"CantDeletePackage": "Failed to remove extension",
+		"InvalidPluginPackage": "Invalid extension package",
+		"UnsupportedPluginPackage": "Unsupported extension package",
+		"UnknownError": "Unknown error"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/en/static.json b/snappymail/v/0.0.0/app/localization/en/static.json
index c1f10c9bd..e6216a2b0 100644
--- a/snappymail/v/0.0.0/app/localization/en/static.json
+++ b/snappymail/v/0.0.0/app/localization/en/static.json
@@ -1,9 +1,9 @@
 {
 	"BACK_LINK": "Reload",
 	"NO_SCRIPT_TITLE": "JavaScript is required for this application.",
-	"NO_SCRIPT_DESC": "JavaScript support is not available in your browser.\nPlease enable JavaScript support in your browser settings and retry.\n",
+	"NO_SCRIPT_DESC": "JavaScript support is not available in your browser.\nPlease enable JavaScript support in your browser settings and retry.",
 	"NO_COOKIE_TITLE": "Cookies support is required for this application.",
-	"NO_COOKIE_DESC": "Cookies support is not available in your browser.\nPlease enable Cookie support in your browser settings and retry.\n",
+	"NO_COOKIE_DESC": "Cookies support is not available in your browser.\nPlease enable Cookie support in your browser settings and retry.",
 	"BAD_BROWSER_TITLE": "Your browser is outdated.",
-	"BAD_BROWSER_DESC": "To use all the features of the application,\ndownload and install one of these browsers:\n"
+	"BAD_BROWSER_DESC": "To use all the features of the application,\ndownload and install one of the latest browsers."
 }
diff --git a/snappymail/v/0.0.0/app/localization/en/user.json b/snappymail/v/0.0.0/app/localization/en/user.json
index 980f29db5..7c53b9d39 100644
--- a/snappymail/v/0.0.0/app/localization/en/user.json
+++ b/snappymail/v/0.0.0/app/localization/en/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archive",
 		"ARE_YOU_SURE": "Are you sure?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Close",
 		"CONTACTS": "Contacts",
 		"DELETE": "Delete",
+		"UNDELETE": "Undelete",
 		"DONE": "Done",
 		"EMAIL": "Email",
 		"FROM": "From",
@@ -17,17 +19,32 @@
 		"LOGOUT": "Logout",
 		"MORE": "More",
 		"MOVE_TO": "Move To",
+		"COPY_TO": "Copy To",
 		"NAME": "Name",
 		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Not Spam",
-		"PASSWORD": "Password",
+		"USERNAME": "Username",
+		"PASSWORD": "Passphrase",
+		"REMEMBER": "Remember",
+		"REMEMBER_FOR_SESSION": "Remember for this Session",
+		"REMEMBER_PERMANENT": "Remember Permanently",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Save",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Search",
 		"SPAM": "Spam",
 		"SUBJECT": "Subject",
 		"TEST": "Test",
-		"TO": "To"
+		"TO": "To",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Yes",
+		"NO": "No",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Help",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Attachments"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -35,41 +52,34 @@
 		"BUTTON_SIGN_IN": "Sign In"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Add Account",
-		"BUTTON_SETTINGS": "Settings",
-		"BUTTON_HELP": "Help"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
+		"BUTTON_ADD_ACCOUNT": "Add Account"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Advanced Search",
-		"LABEL_ADV_TEXT": "Text",
-		"LABEL_ADV_HAS_ATTACHMENT": "Has attachment",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Has attachments",
-		"LABEL_ADV_FLAGGED": "Flagged",
-		"LABEL_ADV_UNSEEN": "Unseen",
-		"LABEL_ADV_DATE": "Date",
-		"LABEL_ADV_DATE_ALL": "All",
-		"LABEL_ADV_DATE_3_DAYS": "Up to 3 days old",
-		"LABEL_ADV_DATE_7_DAYS": "Up to 1 week old",
-		"LABEL_ADV_DATE_MONTH": "Up to 1 month old",
-		"LABEL_ADV_DATE_3_MONTHS": "Up to 3 months old",
-		"LABEL_ADV_DATE_6_MONTHS": "Up to 6 months old",
-		"LABEL_ADV_DATE_YEAR": "Up to 1 year old",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE" : "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE" : "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE" : "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Close (Esc)",
-		"GALLERY_PREV": "Previous (arrow left)",
-		"GALLERY_NEXT": "Next (arrow right)",
-		"GALLERY_COUNTER": "%curr% of %total%"
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "Has attachment(s)",
+		"FLAGGED": "Flagged",
+		"UNSEEN": "Unseen",
+		"DATE": "Date",
+		"DATE_ALL": "All",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Up to 3 days old",
+		"SINCE_7_DAYS": "Up to 1 week old",
+		"SINCE_MONTH": "Up to 1 month old",
+		"SINCE_3_MONTHS": "Up to 3 months old",
+		"SINCE_6_MONTHS": "Up to 6 months old",
+		"SINCE_YEAR": "Up to 1 year old",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Answered",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compose",
@@ -80,8 +90,19 @@
 		"TRASH_NAME": "Trash",
 		"ARCHIVE_NAME": "Archive"
 	},
-	"QUOTA": {
-		"TITLE": "Quota usage"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Reload Message List",
@@ -99,17 +120,20 @@
 		"MENU_SELECT_SEEN": "Read",
 		"MENU_SELECT_FLAGGED": "Flagged",
 		"MENU_SELECT_UNFLAGGED": "Unflagged",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Empty list.",
 		"EMPTY_SEARCH_LIST": "No messages matched your search.",
 		"SEARCH_RESULT_FOR": "Search results for \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
-		"EMPTY_SUBJECT_TEXT": "(No subject)",
+		"BACK_TO_MESSAGE_LIST": "Back to message list",
 		"PUT_MESSAGE_HERE": "Drop message here to view it in the list",
 		"TODAY_AT": "today at %TIME%",
 		"YESTERDAY_AT": "yesterday at %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "You have %COUNT% new messages!",
 		"QUOTA_SIZE": "Using <strong>%SIZE% (%PROC%%)<\/strong> of your <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +162,7 @@
 		"MENU_VIEW_ORIGINAL": "Show Source",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Download as .eml file",
 		"MENU_FILTER_SIMILAR": "Filter messages like this",
 		"MENU_PRINT": "Print",
@@ -150,7 +175,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
@@ -160,9 +198,19 @@
 		"SEARCHING_DESC": "Searching..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Add Contact",
 		"BUTTON_CREATE_CONTACT": "Create",
-		"BUTTON_UPDATE_CONTACT": "Update",
 		"BUTTON_IMPORT": "Import (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Export (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +219,26 @@
 		"EMPTY_SEARCH": "No contacts found",
 		"CLEAR_SEARCH": "Clear search",
 		"CONTACT_VIEW_DESC": "Select contact in the list to view it here.",
-		"LABEL_PHONE": "Phone",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Birthday",
-		"LINK_ADD_EMAIL": "Add an email address",
-		"LINK_ADD_PHONE": "Add a phone",
-		"LINK_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Enter display name",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Enter last name",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Enter first name",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Display name",
+		"LAST_NAME": "Last name",
+		"FIRST_NAME": "First name",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Read only",
-		"LABEL_SHARE": "Share",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
-		"ADD_MENU_NOTES": "Notes",
+		"ADD_MENU_NOTE": "Note",
 		"ADD_MENU_PHONE": "Phone",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Address",
 		"ADD_MENU_BIRTHDAY": "Birthday",
 		"ADD_MENU_TAGS": "Tags",
 		"BUTTON_SHARE_ALL": "Everyone",
-		"BUTTON_SYNC": "Synchronization (CardDAV)"
+		"BUTTON_SYNC": "Synchronization (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "show all fields",
@@ -210,13 +256,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
+		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?",
 		"DESC_WANT_DELETE_MESSAGES": "Are you sure you want to delete the message(s)?"
 	},
@@ -224,20 +273,20 @@
 		"TITLE_LANGUAGES": "Choose your language"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Add Account?",
+		"TITLE_ADD_ACCOUNT": "Add Account",
 		"BUTTON_ADD_ACCOUNT": "Add",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_UPDATE_ACCOUNT": "Edit Account"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Add Identity?",
-		"TITLE_UPDATE_IDENTITY": "Update Identity?",
+		"TITLE_ADD_IDENTITY": "Add Identity",
+		"TITLE_UPDATE_IDENTITY": "Edit Identity",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Add",
-		"BUTTON_UPDATE_IDENTITY": "Update",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Create a folder?",
+		"TITLE_CREATE_FOLDER": "Create a folder",
 		"LABEL_PARENT": "Parent folder",
 		"BUTTON_CREATE": "Create",
 		"TITLE_CREATING_PROCESS": "Creating a folder"
@@ -245,10 +294,25 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Purge all messages from the folder?",
 		"DANGER_DESC_WARNING": "Warning!",
-		"DANGER_DESC_HTML_1": "This action will result in removing all mails from <strong>%FOLDER%<\/strong> folder completely.",
-		"DANGER_DESC_HTML_2": "Once started, the process cannot be aborted or cancelled.",
+		"DANGER_DESC_HTML_1": "This action will result in removing all mails from '<strong>%FOLDER%<\/strong>' folder completely.",
+		"DANGER_DESC_HTML_2": "Once started, the process cannot be aborted or canceled.",
 		"TITLE_CLEARING_PROCESS": "Purging the folder..."
 	},
+	"CRYPTO": {
+		"SIGN": "Sign",
+		"ENCRYPT": "Encrypt",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import OpenPGP key",
 		"POPUP_IMPORT_BUTTON": "Import",
@@ -257,20 +321,27 @@
 		"POPUP_GENERATE_TITLE": "Generate OpenPGP key pair",
 		"POPUP_GENERATE_BUTTON": "Generate",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Sign",
-		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP signed message",
 		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATECHAIN": "Intermediate Certificate(s)",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME signed message",
+		"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
+		"TITLE_CREATE_FILTER": "Create a filter",
+		"TITLE_EDIT_FILTER": "Update filter",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Add a Condition",
@@ -300,7 +371,7 @@
 		"MARK_AS_READ_LABEL": "Mark as read",
 		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
 		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Subject (optional)",
 		"VACATION_MESSAGE_LABEL": "Message",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -334,69 +405,112 @@
 		"ERROR_FILE_PARTIALLY_UPLOADED": "File was partially uploaded due to unknown error",
 		"ERROR_NO_FILE_UPLOADED": "No file uploaded",
 		"ERROR_MISSING_TEMP_FOLDER": "The temporary file is missing",
-		"ERROR_ON_SAVING_FILE": "An unknown file upload error occurred",
+		"ERROR_ON_SAVING_FILE": "Saving uploaded file failed",
 		"ERROR_FILE_TYPE": "Invalid file type",
 		"ERROR_UNKNOWN": "An unknown file upload error occurred"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personal",
-		"LABEL_GENERAL_NAME": "General",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_FOLDERS_NAME": "Folders",
-		"LABEL_ACCOUNTS_NAME": "Accounts",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Security",
-		"LABEL_THEMES_NAME": "Themes"
+		"GENERAL": "General",
+		"CONTACTS": "Contacts",
+		"FOLDERS": "Folders",
+		"ACCOUNTS": "Accounts",
+		"FILTERS": "Filters",
+		"SECURITY": "Security",
+		"THEMES": "Themes"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Never",
+		"LABEL_STORED_PASS": "Remembered Passphrase"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "General",
-		"LABEL_LANGUAGE": "Language",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Default text editor",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "View options",
-		"LABEL_USE_PREVIEW_PANE": "Use preview pane",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
-		"LABEL_USE_THREADS": "Use threads",
-		"LABEL_REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
-		"LABEL_SHOW_IMAGES": "Always display external images in message body",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Language",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Default text editor",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Plain",
+		"VIEW_OPTIONS": "View options",
+		"USE_PREVIEW_PANE": "Use preview pane",
+		"HIDE_DELETED_MESSAGES": "Hide messages marked for deletion",
+		"USE_CHECKBOXES_IN_LIST": "Display checkboxes in list",
+		"USE_THREADS": "Use threads",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Place replies in the folder of the message being replied to",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Messages on page",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifications",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notifications",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Show new messages notification popups",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blocked by the browser)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
@@ -405,17 +519,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL",
 		"LABEL_CONTACTS_SYNC_USER": "User",
-		"SYNC_NO": "No",
-		"SYNC_YES": "Yes",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Themes",
-		"LEGEND_THEMES_CUSTOM": "Custom Theme Configuration",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Light",
-		"LABEL_CUSTOM_TYPE_DARK": "Dark",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Background",
+		"LABEL_BACKGROUND": "Background",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload background image (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "File is too big",
 		"ERROR_FILE_TYPE_ERROR": "Invalid file type (JPG and PNG only)",
@@ -435,8 +544,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +562,14 @@
 		"BUTTON_ADD_ACCOUNT": "Add an Account",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Updating...",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Key Pair",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +583,6 @@
 		"LABEL_REPLY_ALL": "Reply All",
 		"LABEL_FORWARD": "Forward",
 		"LABEL_FORWARD_MULTIPLY": "Forward as attachment(s)",
-		"LABEL_HELP": "Help",
 		"LABEL_CHECK_ALL": "Select all messages",
 		"LABEL_DELETE": "Delete",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +599,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Print",
 		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
 		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
 		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
@@ -502,39 +610,43 @@
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Invalid token",
-		"AUTH_ERROR": "Authentication failed",
-		"CONNECTION_ERROR": "Can't connect to server",
-		"DOMAIN_ALREADY_EXISTS": "Domain already exists",
-		"DOMAIN_NOT_ALLOWED": "Domain is not allowed",
-		"ACCOUNT_NOT_ALLOWED": "Account is not allowed",
-		"CONTACTS_SYNC_ERROR": "Contacts synchronization error",
-		"CANT_GET_MESSAGE_LIST": "Can't get message list",
-		"CANT_GET_MESSAGE": "Can't get message",
-		"CANT_DELETE_MESSAGE": "Can't delete message",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Can't move message",
-		"CANT_SAVE_MESSAGE": "Can't save message",
-		"CANT_SEND_MESSAGE": "Can't send message",
-		"INVALID_RECIPIENTS": "Invalid recipients",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Can't create folder",
-		"CANT_RENAME_FOLDER": "Can't rename folder",
-		"CANT_DELETE_FOLDER": "Can't delete folder",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Can't delete non-empty directory",
-		"CANT_SUBSCRIBE_FOLDER": "Can't subscribe folder",
-		"CANT_UNSUBSCRIBE_FOLDER": "Can't unsubscribe folder",
-		"DEMO_SEND_MESSAGE_ERROR": "For security purposes, this account is not allowed to send messages to external e-mail addresses!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Account already exists",
-		"ACCOUNT_DOES_NOT_EXIST": "Account doesn't exist",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "An error has occured while accessing mail server",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Unknown error"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Invalid token",
+		"AuthError": "Authentication failed",
+		"ConnectionError": "Can't connect to server",
+		"DomainAlreadyExists": "Domain already exists",
+		"DomainNotAllowed": "Domain is not allowed",
+		"AccountNotAllowed": "Account is not allowed",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Contacts synchronization error",
+		"CantGetMessageList": "Can't get message list",
+		"CantGetMessage": "Can't get message",
+		"CantDeleteMessage": "Can't delete message",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Can't move message",
+		"CantSaveMessage": "Can't save message",
+		"CantSendMessage": "Can't send message",
+		"InvalidRecipients": "Invalid recipients",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Can't create folder",
+		"CantRenameFolder": "Can't rename folder",
+		"CantDeleteFolder": "Can't delete folder",
+		"CantDeleteNonEmptyFolder": "Can't delete non-empty directory",
+		"CantSubscribeFolder": "Can't subscribe folder",
+		"CantUnsubscribeFolder": "Can't unsubscribe folder",
+		"DemoSendMessageError": "For security purposes, this account is not allowed to send messages to external e-mail addresses!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Account already exists",
+		"AccountDoesNotExist": "Account doesn't exist",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "An error has occured while accessing mail server",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Unknown error"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/admin.json b/snappymail/v/0.0.0/app/localization/es/admin.json
similarity index 72%
rename from snappymail/v/0.0.0/app/localization/es-ES/admin.json
rename to snappymail/v/0.0.0/app/localization/es/admin.json
index 86e27f4dc..a31d1940d 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/admin.json
+++ b/snappymail/v/0.0.0/app/localization/es/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Agregar",
+		"CLOSE": "Cerrar",
 		"SAVE": "Guardar",
-		"UPDATE": "Actualizar"
+		"TEST": "Probar",
+		"UPDATE": "Actualizar",
+		"USERNAME": "Nombre de usuario",
+		"PASSWORD": "Contraseña",
+		"CANCEL": "Cancelar",
+		"SEARCH": "Buscar",
+		"YES": "Sí",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Ingresar",
-		"LABEL_PASSWORD": "Contraseña",
 		"LABEL_TOTP": "Código TOTP",
 		"BUTTON_LOGIN": "Ingresar al panel de control"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Panel de Control"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "General",
-		"LABEL_LOGIN_NAME": "Ingresar",
-		"LABEL_BRANDING_NAME": "Personalización",
-		"LABEL_CONTACTS_NAME": "Contactos",
-		"LABEL_DOMAINS_NAME": "Dominios",
-		"LABEL_SECURITY_NAME": "Seguridad",
-		"LABEL_PACKAGES_NAME": "Extensiones",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Acerca"
+		"GENERAL": "General",
+		"LOGIN": "Ingresar",
+		"BRANDING": "Personalización",
+		"CONTACTS": "Contactos",
+		"DOMAINS": "Dominios",
+		"SECURITY": "Seguridad",
+		"PACKAGES": "Extensiones",
+		"CONFIG": "Config",
+		"ABOUT": "Acerca"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Interfaz",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir selección del idioma",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir personalización de la interfaz",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir cambiar el fondo de pantalla",
-		"LABEL_NEW_FOLDER_MOVE": "Nuevo botón \"mover a carpeta\"",
 		"LABEL_SHOW_THUMBNAILS": "Mostrar previsualización (adjuntos)",
 		"LEGEND_MAIN": "Principal",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Tamaño máximo para adjuntos",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Dominio por defecto",
 		"LABEL_DETERMINE_USER_DOMAIN": "Intentar encontrar el dominio del usuario",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permitir la selección de idioma en la pantalla de ingreso",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Intentar definir el idioma del usuari",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Ocultar el botón 'Acceder'"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Intentar definir el idioma del usuari"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Personalización",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Usuario",
 		"LABEL_STORAGE_PASSWORD": "Contraseña",
-		"BUTTON_TEST": "Probar",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "¡Advertencia!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "No utilices este tipo de Base de Datos para un número grande de usuarios.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Tu sistema no soporta el uso de Contactos.\n<br>\nDebes instalar o habilitar el uso de <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> en tu servidor.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Seguridad",
 		"LABEL_USE_IMAGE_PROXY": "Utilizar un proxy local para mostrar imágenes externas",
-		"LABEL_ALLOW_OPEN_PGP": "Permitir OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostrar información de PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciales de Acceso al panel de control",
 		"LABEL_CURRENT_PASSWORD": "Contraseña actual",
-		"LABEL_NEW_LOGIN": "Nuevo login",
 		"LABEL_NEW_PASSWORD": "Nueva contraseña",
 		"LABEL_REPEAT_PASSWORD": "Re-ingresar",
-		"BUTTON_UPDATE_PASSWORD": "Actualizar contraseña",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Requerir verificación del certificado SSL (IMAP \/ SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Requerir verificación del certificado SSL",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-firmados"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Moderno, simple y rápido cliente web de correo electrónico",
 		"LABEL_ALL_RIGHTS_RESERVED": "Todos los Derechos Reservados.",
 		"HINT_READ_CHANGE_LOG": "Revisa la lista de cambios antes de actualizar.",
-		"HINT_IS_UP_TO_DATE": "RainLoop está actualizado.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail está actualizado.",
 		"HTML_NEW_VERSION": "Nueva versión ( <b>%VERSION%<\/b> ) está disponible.",
 		"LABEL_UPDATING": "Actualizando",
 		"LABEL_CHECKING": "Buscando actualizaciones",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Agregar alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Dominio",
-		"BUTTON_CLOSE": "Cerrar",
-		"BUTTON_ADD": "Agregar"
+		"LABEL_DOMAIN": "Dominio"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Agregar dominio",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Editar \"&NAME&\"",
 		"LABEL_NAME": "Nombre",
 		"NAME_HELPER": "wildcards soportados",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "FILTRO",
 		"LABEL_SERVER": "Servidor",
 		"LABEL_PORT": "Puerto",
 		"LABEL_SECURE": "Seguridad",
-		"LABEL_WHITE_LIST": "Lista blanca",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Ninguno",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permitir scripts de filtro",
 		"LABEL_USE_SHORT_LOGIN": "Inicio de Sesión corto",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Usar autenticación",
 		"LABEL_SET_SENDER": "Usar inicio de sesión como remitente",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Utilizar la función mail() de PHP",
-		"BUTTON_TEST": "Probar",
 		"BUTTON_WHITE_LIST": "Lista blanca",
-		"BUTTON_SIEVE_CONFIGURATION": "Configuraciones de Filtro",
-		"BUTTON_BACK_TO_IMAP": "Volver a la configuración IMAP",
-		"BUTTON_BACK": "Volver",
-		"BUTTON_CLOSE": "Cerrar",
-		"BUTTON_ADD": "Agregar",
-		"BUTTON_UPDATE": "Actualizar",
-		"NEW_DOMAIN_DESC": "Esta configuración de Dominio le permitirá trabajar <br>con direcciones de correo tipo @<i>%NAME%<\/i>.",
-		"WHITE_LIST_ALERT": "Lista de dominios con que los usuarios pueden ingresar.\nUse un espacio como delimitador.\n"
+		"NEW_DOMAIN_DESC": "Esta configuración de Dominio le permitirá trabajar con direcciones de correo tipo @<strong>%NAME%<\/strong>.",
+		"WHITE_LIST_ALERT": "Lista de dominios con que los usuarios pueden ingresar.\nUse un espacio como delimitador.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extensión",
-		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar",
-		"BUTTON_CLOSE": "Cerrar"
+		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sí",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "¿Estás seguro de que deseas cerrar esta ventana?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "inestable",
 		"WARNING": "¡Atención!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Error desconocido"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Token inválido",
-		"AUTH_ERROR": "Autenticación fallida",
-		"DOMAIN_ALREADY_EXISTS": "El Dominio ya existe",
-		"CANT_SAVE_PLUGIN_SETTINGS": "No se pudieron guardar las configuraciones",
-		"CANT_INSTALL_PACKAGE": "No se ha podido instalar el extensión",
-		"CANT_DELETE_PACKAGE": "No se ha podido eliminar el extensión",
-		"INVALID_PLUGIN_PACKAGE": "El paquete de extensión no válido",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "El paquete del extensión es incompatible",
-		"UNKNOWN_ERROR": "Error desconocido"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Token inválido",
+		"AuthError": "Autenticación fallida",
+		"DomainAlreadyExists": "El Dominio ya existe",
+		"CantSavePluginSettings": "No se pudieron guardar las configuraciones",
+		"CantInstallPackage": "No se ha podido instalar el extensión",
+		"CantDeletePackage": "No se ha podido eliminar el extensión",
+		"InvalidPluginPackage": "El paquete de extensión no válido",
+		"UnsupportedPluginPackage": "El paquete del extensión es incompatible",
+		"UnknownError": "Error desconocido"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/es/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/es-ES/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/es/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/static.json b/snappymail/v/0.0.0/app/localization/es/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/es-ES/static.json
rename to snappymail/v/0.0.0/app/localization/es/static.json
diff --git a/snappymail/v/0.0.0/app/localization/es-ES/user.json b/snappymail/v/0.0.0/app/localization/es/user.json
similarity index 57%
rename from snappymail/v/0.0.0/app/localization/es-ES/user.json
rename to snappymail/v/0.0.0/app/localization/es/user.json
index fa48afbd2..6b55c0a20 100644
--- a/snappymail/v/0.0.0/app/localization/es-ES/user.json
+++ b/snappymail/v/0.0.0/app/localization/es/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archivar",
 		"ARE_YOU_SURE": "¿Está seguro?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Cerrar",
 		"CONTACTS": "Contactos",
 		"DELETE": "Eliminar",
+		"UNDELETE": "Undelete",
 		"DONE": "Hecho",
 		"EMAIL": "Email",
 		"FROM": "De",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Cerrar sesión",
 		"MORE": "Más",
 		"MOVE_TO": "Mover",
+		"COPY_TO": "Copiar a",
 		"NAME": "Nombre",
 		"NONE": "Ninguno",
-		"NOT_SPAM": "Correo no deseado",
+		"TO_SPAM": "Mover mensaje(s) a Spam",
+		"NOT_SPAM": "Es correo deseado",
+		"USERNAME": "Nombre de usuario",
 		"PASSWORD": "Contraseña",
+		"REMEMBER": "Recordar",
 		"REPLY_TO": "Responder",
 		"SAVE": "Guardar",
+		"SAVE_CHANGES": "¿Guardar cambios?",
 		"SEARCH": "Buscar",
-		"SPAM": "Es correo deseado",
+		"SPAM": "Correo no deseado",
 		"SUBJECT": "Asunto",
 		"TEST": "Probar",
-		"TO": "Para"
+		"TO": "Para",
+		"SERVER_MESSAGE": "Mensaje de Servidor",
+		"YES": "Sí",
+		"NO": "No",
+		"INACTIVE": "Inactivo",
+		"DEFAULT": "predeterminado",
+		"HELP": "Ayuda",
+		"TEXT": "Texto",
+		"ATTACHMENTS": "Adjuntos"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Acceder"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Agregar cuenta",
-		"BUTTON_SETTINGS": "Configuración",
-		"BUTTON_HELP": "Ayuda"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versión móvil",
-		"BUTTON_DESKTOP_VERSION": "Versión escritorio"
+		"BUTTON_ADD_ACCOUNT": "Agregar cuenta"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Búsqueda avanzada",
-		"LABEL_ADV_TEXT": "Texto",
-		"LABEL_ADV_HAS_ATTACHMENT": "Tiene adjunto",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Tiene adjuntos",
-		"LABEL_ADV_FLAGGED": "Seleccionado",
-		"LABEL_ADV_UNSEEN": "No leído",
-		"LABEL_ADV_DATE": "Fecha",
-		"LABEL_ADV_DATE_ALL": "Todo",
-		"LABEL_ADV_DATE_3_DAYS": "Hasta 3 días de antigüedad",
-		"LABEL_ADV_DATE_7_DAYS": "Hasta una semana de antigüedad",
-		"LABEL_ADV_DATE_MONTH": "Hasta 1 mes de antigüedad",
-		"LABEL_ADV_DATE_3_MONTHS": "Hasta 3 meses de antigüedad",
-		"LABEL_ADV_DATE_6_MONTHS": "Hasta 6 meses de antigüedad",
-		"LABEL_ADV_DATE_YEAR": "Hasta 1 año de antigüedad",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Cambiar a pantalla completa",
-		"ZOOM": "Acercar \/ Alejar",
-		"CLOSE": "Cerrar (Esc)",
-		"GALLERY_PREV": "Anterior (Flecha Izquierda)",
-		"GALLERY_NEXT": "Siguiente (Flecha Derecha)",
-		"GALLERY_COUNTER": "%curr% de %total%"
+		"TEXT": "Texto",
+		"HAS_ATTACHMENT": "Tiene adjunto",
+		"FLAGGED": "Seleccionado",
+		"UNSEEN": "No leído",
+		"DATE": "Fecha",
+		"DATE_ALL": "Todo",
+		"BEFORE_3_DAYS": "Más de 3 días",
+		"BEFORE_7_DAYS": "Más de 1 semana",
+		"BEFORE_MONTH": "Más de 1 mes",
+		"BEFORE_3_MONTHS": "Más de 3 meses",
+		"BEFORE_6_MONTHS": "Más de 6 meses",
+		"BEFORE_YEAR": "Más de 1 año",
+		"SINCE_3_DAYS": "Hasta 3 días de antigüedad",
+		"SINCE_7_DAYS": "Hasta una semana de antigüedad",
+		"SINCE_MONTH": "Hasta 1 mes de antigüedad",
+		"SINCE_3_MONTHS": "Hasta 3 meses de antigüedad",
+		"SINCE_6_MONTHS": "Hasta 6 meses de antigüedad",
+		"SINCE_YEAR": "Hasta 1 año de antigüedad",
+		"SUBFOLDERS": "Subcarpetas",
+		"SUBFOLDERS_NONE": "Ninguno",
+		"SUBFOLDERS_SUBTREE": "Todo",
+		"SUBFOLDERS_SUBTREE_ONE": "Un nivel",
+		"REPLIED": "Contestada",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Redactar",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Papelera",
 		"ARCHIVE_NAME": "Archivo"
 	},
-	"QUOTA": {
-		"TITLE": "Cuota"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Actualizar lista de mensajes",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Leído",
 		"MENU_SELECT_FLAGGED": "Destacado",
 		"MENU_SELECT_UNFLAGGED": "No Destacado",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Descargar todos los adjuntos",
 		"EMPTY_LIST": "No hay mensajes.",
 		"EMPTY_SEARCH_LIST": "La búsqueda no ha producido resultados.",
 		"SEARCH_RESULT_FOR": "Resultados de búsqueda para \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "volver a la lista de mensajes",
-		"EMPTY_SUBJECT_TEXT": "(Sin asunto)",
 		"PUT_MESSAGE_HERE": "Arrastre su mensaje aquí para verlo en la lista",
 		"TODAY_AT": "hoy a las %TIME%",
 		"YESTERDAY_AT": "ayer a las %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Tiene %COUNT% nuevos mensajes.",
 		"QUOTA_SIZE": "Usando <strong>%SIZE% (%PROC%%)<\/strong> de sus <strong>%LIMIT%<\/strong>",
 		"SORT": "Ordenar",
+		"NO_SORT": "El servidor no soporta clasificación",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Fecha ascendente",
 		"SORT_DATE_DESC": "Fecha descendente",
 		"SORT_SIZE_ASC": "Tamaño ascendente",
@@ -136,8 +158,9 @@
 		"BUTTON_THREAD_MORE": "Más mensajes",
 		"MENU_HEADERS": "Mostrar los encabezados del mensaje",
 		"MENU_VIEW_ORIGINAL": "Mostrar original",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Ver el mensaje HTML",
+		"PLAIN_VIEW": "Ver en texto plano",
+		"SWAP_COLORS": "Cambiar color predeterminado (fondo)",
 		"MENU_DOWNLOAD_ORIGINAL": "Descargar como archivo .eml",
 		"MENU_FILTER_SIMILAR": "Filtrar mensajes como este",
 		"MENU_PRINT": "Imprimir",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Haga clic en el nombre de la carpeta del panel izquierdo para seleccionar el destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Descargar todo (archivo ZIP)",
 		"SPAM_SCORE": "Puntuación de spam",
-		"HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado"
+		"HAS_VIRUS_WARNING": "ADVERTENCIA: virus detectado",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Habilitar links de seguimiento",
+		"TRACKING_ENABLED": "Ahora se realiza un seguimiento al presionar en los enlaces"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Importante",
+		"$todo": "Para hacer",
+		"$label1": "Importante",
+		"$label2": "Trabajo",
+		"$label3": "Personal",
+		"$label4": "Para hacer",
+		"$label5": "Despues"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Acuse de recibo (se visualiza) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Buscando..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contacto",
+		"TAB_LOCATIONS": "Ubicaciones",
+		"TAB_BUSINESS": "Negocios",
+		"LABEL_ORGANIZATION": "Organización",
+		"LABEL_DEPARTMENT": "Departmento",
+		"LABEL_TITLE": "Titulo",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Pregunta",
+		"NEVER": "Nunca",
+		"ALWAYS": "Siempre",
+		"ALWAYS_IF_POSSIBLE": "Siempre (si es posible)",
 		"BUTTON_ADD_CONTACT": "Añadir Contacto",
 		"BUTTON_CREATE_CONTACT": "Crear",
-		"BUTTON_UPDATE_CONTACT": "Actualizar",
 		"BUTTON_IMPORT": "Importar (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exportar (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exportar (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "No se encontraron contactos",
 		"CLEAR_SEARCH": "Limpiar búsqueda",
 		"CONTACT_VIEW_DESC": "Seleccionar un contacto de la lista para verlo aquí.",
-		"LABEL_PHONE": "Teléfono",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Cumpleaños",
-		"LINK_ADD_EMAIL": "Agregar una dirección de correo electrónico",
-		"LINK_ADD_PHONE": "Agregar un teléfono",
-		"LINK_BIRTHDAY": "Cumpleaños",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduzca el nombre a visualizar",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Introduzca los apellidos",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Introduzca el nombre",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Introduzca un alias",
+		"DISPLAY_NAME": "Nombre a visualizar",
+		"LAST_NAME": "Apellidos",
+		"FIRST_NAME": "Nombre",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Alias",
 		"LABEL_READ_ONLY": "Solo lectura",
-		"LABEL_SHARE": "Compartir",
 		"ADD_MENU_LABEL": "Añadir",
 		"ADD_MENU_NICKNAME": "Alias",
-		"ADD_MENU_NOTES": "Notas",
+		"ADD_MENU_NOTE": "Notas",
 		"ADD_MENU_PHONE": "Teléfono",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Dirección",
 		"ADD_MENU_BIRTHDAY": "Cumpleaños",
 		"ADD_MENU_TAGS": "Etiquetas",
 		"BUTTON_SHARE_ALL": "Todos",
-		"BUTTON_SYNC": "Sincronización (CardDAV)"
+		"BUTTON_SYNC": "Sincronización (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Enviar a todos los correos de contactos"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "mostrar todos los campos",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No hay adjuntos aquí.",
 		"ATTACHMENTS_ERROR_DESC": "¡Atención! No se han subido todos los archivos adjuntos.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "No se han subido todos los archivos adjuntos.",
+		"ALLOW_SPELLCHECK": "Habilitar el corrector ortográfico del navegador",
+		"ALLOW_DRAFT_AUTOSAVE": "Guardar borradores automaticamente",
 		"BUTTON_REQUEST_READ_RECEIPT": "Solicitar confirmación de lectura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
-		"BUTTON_REQUEST_DSN": "Solicitar una confirmación de entrega"
+		"BUTTON_REQUEST_DSN": "Solicitar una confirmación de entrega",
+		"BUTTON_REQUIRE_TLS": "Solicitar entrega segura",
+		"ERROR_EMPTY_BODY": "El cuerpo del mensaje esta vacio"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sí",
-		"BUTTON_NO": "No",
+		"EXIT_ARE_YOU_SURE": "¿Estas seguro que deseas salir?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "¿Está seguro de que desea cerrar esta ventana?",
 		"DESC_WANT_DELETE_MESSAGES": "¿Está seguro de que desea eliminar los mensajes?"
 	},
@@ -226,14 +273,14 @@
 	"POPUPS_ADD_ACCOUNT": {
 		"TITLE_ADD_ACCOUNT": "Añadir cuenta",
 		"BUTTON_ADD_ACCOUNT": "Añadir",
-		"TITLE_UPDATE_ACCOUNT": "¿Actualizar cuenta?",
-		"BUTTON_UPDATE_ACCOUNT": "Actualizar"
+		"TITLE_UPDATE_ACCOUNT": "Actualizar cuenta"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "¿Añadir Identidad?",
-		"TITLE_UPDATE_IDENTITY": "¿Actualizar identidad?",
+		"TITLE_ADD_IDENTITY": "Añadir Identidad",
+		"TITLE_UPDATE_IDENTITY": "Actualizar identidad",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Añadir",
-		"BUTTON_UPDATE_IDENTITY": "Actualizar",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insertar esta firma antes de el texto entre comillas en las respuestas"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Una vez comenzado el proceso no se puede abortar ni cancelar.",
 		"TITLE_CLEARING_PROCESS": "Purgando carpeta..."
 	},
+	"CRYPTO": {
+		"SIGN": "Firmar",
+		"ENCRYPT": "Encriptar",
+		"DECRYPT": "Descifrar",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Buena firma de %USER%",
+		"ERROR": "Error %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Crear auto-firmada",
+		"VALID_UNTIL": "Valida hasta",
+		"PRIVATE_KEY": "Llave privada",
+		"CHANGE_PASS": "Cambiar passphrase",
+		"CURRENT_PASS": "passphrase actual",
+		"NEW_PASS": "Nueva passphrase",
+		"ASK_CRYPTKEY_PASS": "Su contraseña de inicio de sesión ha cambiado. Complete su antigua contraseña de inicio de sesión para descifrar los datos"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importar clave OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Importar",
@@ -256,21 +318,27 @@
 		"POPUP_VIEW_BUTTON": "Seleccionar",
 		"POPUP_GENERATE_TITLE": "Generar clave OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Generar",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Firmar",
-		"LABEL_ENCRYPT": "Encriptar",
-		"BUTTON_DECRYPT": "Descifrar",
-		"BUTTON_VERIFY": "Verify",
+		"LABEL_KEY_TYPE": "Tipo",
 		"SIGNED_MESSAGE": "Mensaje firmado mediante OpenPGP",
 		"ENCRYPTED_MESSAGE": "Mensaje cifrado mediante OpenPGP",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Buena firma de %USER%",
-		"ERROR": "Error OpenPGP: %ERROR%"
+		"STORE_IN_GNUPG": "Guardar en servidor GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Almacenar la clave pública en el servidor GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Almacenar la clave privada en el servidor GnuPG",
+		"BACKUP_ON_SERVER": "Almacenar (cifrado) en el servidor",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Copia de seguridad de clave pública en el servidor",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Copia de seguridad de clave privada en el servidor"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importar certificado S\/MIME",
+		"CERTIFICATE": "Certificado",
+		"CERTIFICATES": "S\/MIME Certificados",
+		"SIGNED_MESSAGE": "Mensaje firmado mediante S\/MIME",
+		"ENCRYPTED_MESSAGE": "Mensaje cifrado mediante S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME llave privada de %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "¿Crear un filtro?",
-		"TITLE_EDIT_FILTER": "¿Actualizar un filtro?",
+		"TITLE_CREATE_FILTER": "¿Crear un filtro",
+		"TITLE_EDIT_FILTER": "¿Actualizar un filtro",
 		"LEGEND_CONDITIONS": "Condiciones",
 		"LEGEND_ACTIONS": "Acciones",
 		"BUTTON_ADD_CONDITION": "Añadir condición",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Marcar como leído",
 		"REPLY_INTERVAL_LABEL": "Intervalo de respuesta (días)",
 		"KEEP_LABEL": "Mantener",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Asunto (opcional)",
 		"VACATION_MESSAGE_LABEL": "Mensaje",
 		"VACATION_RECIPIENTS_LABEL": "Destinatarios (separados por coma)",
@@ -308,8 +376,8 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Todos los mensajes entrantes"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
+		"TITLE_CREATE": "Crear Script",
+		"TITLE_EDIT": "Editar Script",
 		"BUTTON_ADD_FILTER": "Añadir un Filtro",
 		"BUTTON_RAW_SCRIPT": "Usar Script Personalizado",
 		"CAPABILITY_LABEL": "Capability",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Se ha producido un error de carga de archivo desconocido"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXTO"
+		"PLAIN": "HTML <-> TEXTO",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Tamaño fuente",
+		"DIR": "Dirección del texto",
+		"DIR_LTR": "Izquierda a derecha",
+		"DIR_RTL": "Derecha a izquierda",
+		"DIR_AUTO": "Automatico",
+		"TEXTCOLOR": "Color de texto",
+		"BACKGROUNDCOLOR": "Color de fondo",
+		"BOLD": "Negrita",
+		"ITALIC": "Cursiva",
+		"UNDERLINE": "Subrayado",
+		"STRIKE": "Tachado",
+		"SUB": "Subíndice",
+		"SUP": "Superíndice",
+		"OL": "Lista orndenada",
+		"UL": "Lista desordenada",
+		"QUOTE": "Cita en bloque",
+		"INDENTDECREASE": "Disminuir sangría",
+		"INDENTINCREASE": "Aumentar sangría",
+		"LINK": "Link",
+		"IMAGEURL": "URL de Imagen",
+		"IMAGEUPLOAD": "Seleccionar imagen",
+		"UNDO": "Deshacer",
+		"REDO": "Rehacer",
+		"REMOVESTYLE": "Quitar estilo"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personal",
-		"LABEL_GENERAL_NAME": "General",
-		"LABEL_CONTACTS_NAME": "Contactos",
-		"LABEL_FOLDERS_NAME": "Carpetas",
-		"LABEL_ACCOUNTS_NAME": "Cuentas",
-		"LABEL_FILTERS_NAME": "Filtros",
-		"LABEL_SECURITY_NAME": "Seguridad",
-		"LABEL_THEMES_NAME": "Temas"
+		"GENERAL": "General",
+		"CONTACTS": "Contactos",
+		"FOLDERS": "Carpetas",
+		"ACCOUNTS": "Cuentas",
+		"FILTERS": "Filtros",
+		"SECURITY": "Seguridad",
+		"THEMES": "Temas"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtros",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Avanzado",
 		"BUTTON_ADD_SCRIPT": "Añadir un Script",
 		"SUBNAME_MOVE_TO": "Mover a \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Reenviar a \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rechazar",
 		"SUBNAME_VACATION_MESSAGE": "Mensaje de vacaciones",
-		"SUBNAME_DISCARD": "Descartar",
-		"LOADING_PROCESS": "Actualizando lista de filtros"
+		"SUBNAME_DISCARD": "Descartar"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Seguridad",
 		"LABEL_AUTOLOGOUT": "Salir Automáticamente",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minuto(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hora(s)"
+		"FORGET_KEY_PASS": "Olvidar la frase de contraseña de la clave privada",
+		"NEVER": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "General",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidad",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "Sin División",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "División Vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
-		"LABEL_EDITOR": "Editor de texto predeterminado",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Texto plano",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forzado)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Texto plano (forzado)",
-		"LABEL_VIEW_OPTIONS": "Ver opciones",
-		"LABEL_USE_PREVIEW_PANE": "Utilice el panel de vista previa",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista",
-		"LABEL_USE_THREADS": "Usar hilos de conversación",
-		"LABEL_REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
-		"LABEL_SHOW_IMAGES": "Mostrar siempre las imágenes en el cuerpo del mensaje",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Eliminar el fondo y los colores del texto del mensaje",
-		"LABEL_MESSAGE_PER_PAGE": "Mensajes en página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marcar el mensaje como leído después de",
+		"LANGUAGE": "Idioma",
+		"HOUR_FORMAT": "Formato de hora",
+		"IDENTITY": "Identidad",
+		"LAYOUT": "Disposición",
+		"LAYOUT_NO_SPLIT": "Sin División",
+		"LAYOUT_VERTICAL_SPLIT": "División Vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "División Horizontal",
+		"SHOW_NEXT_MESSAGE": "Mostrar el siguiente mensaje al mover o eliminar el actual",
+		"EDITOR": "Editor de texto predeterminado",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Texto plano",
+		"VIEW_OPTIONS": "Ver opciones",
+		"USE_PREVIEW_PANE": "Utilice el panel de vista previa",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensajes marcados para borrar",
+		"USE_CHECKBOXES_IN_LIST": "Mostrar casillas de verificación en la lista",
+		"USE_THREADS": "Usar hilos de conversación",
+		"THREAD_ALGORITHM": "Algoritmo de hilos",
+		"REPLY_SAME_FOLDER": "Coloque las respuestas en la carpeta del mensaje que esta respondiendo.",
+		"PREFER_HTML": "Preferir HTML a texto sin formato",
+		"PREFER_HTML_INFO": "Los mensajes a veces vienen en ambos formatos. Esta opción controla si deseas que se muestre la parte HTML o la parte de texto sin formato.",
+		"REMOVE_COLORS": "Eliminar el fondo y los colores del texto del mensaje",
+		"ALLOW_STYLES": "Permitir CSS <style>",
+		"MESSAGE_PER_PAGE": "Mensajes por página",
+		"CHECK_MAIL_INTERVAL": "Intervalo para revisar correo",
+		"MARK_MESSAGE_READ_AFTER": "Marcar el mensaje como leído después de",
+		"MSG_DEFAULT_ACTION": "Acción predeterminada",
 		"SECONDS": "segundos",
-		"LABEL_NOTIFICATIONS": "Notificaciones",
-		"LABEL_SOUND_NOTIFICATION": "Sonido de la notificación",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el explorador)"
+		"MINUTES": "minutos",
+		"NOTIFICATIONS": "Notificaciones",
+		"SOUND_NOTIFICATION": "Sonido de la notificación",
+		"CHROME_NOTIFICATION_DESC": "Mostrar notificación de nuevos mensajes en Popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado por el navegador)",
+		"COLLAPSE_BLOCKQUOTES": "Colapsar texto citado",
+		"MAX_QUOTE_LEVEL": "Niveles máximos de texto citado visibles",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Mostrar adjuntos en línea en la lista",
+		"LIST_SIMPLE_ATTACHMENTS": "Lista simple de adjuntos",
+		"LIST_MESSAGES_GROUPED": "Listar mensajes agrupados (al ordenar por fecha o remitente)",
+		"EXTERNAL_IMAGES": "Imágenes externas",
+		"IMAGES_OPTION_ASK": "Preguntar siempre",
+		"IMAGES_OPTION_WHITELIST": "Lista blanca o preguntar",
+		"IMAGES_OPTION_ALWAYS": "Mostrar siempre",
+		"IMAGES_WHITELIST": "Lista blanca de imágenes",
+		"MESSAGE_POPUP_WINDOW": "Popup en nueva ventana en lugar de pestaña",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Agregar automáticamente destinatarios a la libreta de direcciones",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Libreta de direcciones URL",
 		"LABEL_CONTACTS_SYNC_USER": "Usuario",
-		"SYNC_NO": "No",
-		"SYNC_YES": "Sí",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Solo lectura"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configuración de tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Oscuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fondo",
+		"LABEL_BACKGROUND": "Fondo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Suba una imagen de fondo (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "La imagen es muy grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de archivo inválido (Solo permitido: JPG y PNG)",
@@ -432,11 +537,12 @@
 		"DELETING_PROCESS": "Eliminado carpeta",
 		"RENAMING_PROCESS": "Renombrando carpeta",
 		"TO_MANY_FOLDERS_DESC_1": "Tiene muchas carpetas!",
-		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
+		"TO_MANY_FOLDERS_DESC_2": "Hemos mostrado solo una parte de ellas, para evitar problemas de rendimiento.",
 		"HELP_DELETE_FOLDER": "Eliminar carpeta",
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar carpeta",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Chequear\/no chequear nuevos mensajes",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Chequear nuevos mensajes",
 		"HIDE_UNSUBSCRIBED": "Ocultar carpetas dadas de baja",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendario",
 		"TYPE_CONFIGURATION": "Configuración",
 		"TYPE_CONTACTS": "Contactos",
@@ -452,15 +558,15 @@
 		"BUTTON_ADD_ACCOUNT": "Añadir cuenta",
 		"BUTTON_ADD_IDENTITY": "Añadir identidad",
 		"LOADING_PROCESS": "Actualizando lista de cuentas",
-		"DEFAULT_IDENTITY_LABEL": "predeterminado"
+		"SHOW_UNREAD": "Mostrar el recuento de mensajes no leídos"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importar llave",
 		"BUTTON_GENERATE_KEY_PAIR": "Generar llaves",
+		"IMPORT_FROM_SERVER": "Importar del servidor",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Obtener la extensión del navegador Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Ayuda de atajos de teclado",
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Responder a todos",
 		"LABEL_FORWARD": "Adelante",
 		"LABEL_FORWARD_MULTIPLY": "Reenviar (multiplicar)",
-		"LABEL_HELP": "Ayuda",
 		"LABEL_CHECK_ALL": "Comprobar todos los mensajes",
 		"LABEL_DELETE": "Eliminar",
 		"LABEL_OPEN_THREAD": "Abrir hilo seleccionado",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Cambiar blockquotes de mensaje",
 		"LABEL_THREAD_NEXT": "Próximo mensaje del hilo",
 		"LABEL_THREAD_PREV": "Mensaje anterior del hilo",
-		"LABEL_PRINT": "Imprimir",
 		"LABEL_EXIT_FULLSCREEN": "Salir del modo de pantalla completa",
 		"LABEL_CLOSE_MESSAGE": "Cerrar el mensaje (No hay diseño panel de vista previa)",
 		"LABEL_SWITCH_TO_LIST": "Cambiar foco de nuevo a la lista de mensajes",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Cerrar componer"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Elemento no válido",
-		"AUTH_ERROR": "Autentificación fallida",
-		"CONNECTION_ERROR": "No se puede conectar al servidor",
-		"DOMAIN_ALREADY_EXISTS": "El Dominio ya existe",
-		"DOMAIN_NOT_ALLOWED": "Dominio no permitido",
-		"ACCOUNT_NOT_ALLOWED": "La cuenta no está permitida",
-		"CONTACTS_SYNC_ERROR": "Error de sincronización de Contactos",
-		"CANT_GET_MESSAGE_LIST": "No se puede obtener la lista de mensajes",
-		"CANT_GET_MESSAGE": "No se puede obtener el mensaje",
-		"CANT_DELETE_MESSAGE": "No se puede eliminar el mensaje",
-		"CANT_COPY_MESSAGE": "No se puede copiar el mensaje",
-		"CANT_MOVE_MESSAGE": "No se puede mover el mensaje",
-		"CANT_SAVE_MESSAGE": "No se puede guardar el mensaje",
-		"CANT_SEND_MESSAGE": "No se puede enviar el mensaje",
-		"INVALID_RECIPIENTS": "Los destinatarios no son válidos",
-		"CANT_SAVE_FILTERS": "No se pueden guardar los filtros",
-		"CANT_GET_FILTERS": "No se pueden obtener los filtros",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtros incorrectos",
-		"CANT_CREATE_FOLDER": "No se puede crear la carpeta",
-		"CANT_RENAME_FOLDER": "No se puede renombrar la carpeta",
-		"CANT_DELETE_FOLDER": "No se puede eliminar la carpeta",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "No se puede eliminar un directorio que no está vacío",
-		"CANT_SUBSCRIBE_FOLDER": "No se puede suscribir carpeta",
-		"CANT_UNSUBSCRIBE_FOLDER": "No puede darse de baja de la carpeta",
-		"DEMO_SEND_MESSAGE_ERROR": "Por razones de seguridad, esta cuenta demo no permite enviar mensajes a direcciones de correo electrónico externas!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "La cuenta ya existe",
-		"ACCOUNT_DOES_NOT_EXIST": "La cuenta no existe",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Ocurrió un error mientras se accedía al servidor",
-		"INVALID_INPUT_ARGUMENT": "Argumento no válido",
-		"UNKNOWN_ERROR": "Error desconocido"
+		"RequestError": "La solicitud falló",
+		"RequestAborted": "La solicitud fue abortada",
+		"RequestTimeout": "La solicitud excedió el tiempo de espera",
+		"InvalidToken": "Elemento no válido",
+		"AuthError": "Autenticación fallida",
+		"ConnectionError": "No se puede conectar al servidor",
+		"DomainAlreadyExists": "El dominio ya existe",
+		"DomainNotAllowed": "Dominio no permitido",
+		"AccountNotAllowed": "La cuenta no está permitida",
+		"CryptKeyError": "Tu frase de acceso ha cambiado",
+		"ContactsSyncError": "Error de sincronización de contactos",
+		"CantGetMessageList": "No se puede obtener la lista de mensajes",
+		"CantGetMessage": "No se puede obtener el mensaje",
+		"CantDeleteMessage": "No se puede eliminar el mensaje",
+		"CantCopyMessage": "No se puede copiar el mensaje",
+		"CantMoveMessage": "No se puede mover el mensaje",
+		"CantSaveMessage": "No se puede guardar el mensaje",
+		"CantSendMessage": "No se puede enviar el mensaje",
+		"InvalidRecipients": "Los destinatarios no son válidos",
+		"CantSaveFilters": "No se pueden guardar los filtros",
+		"CantGetFilters": "No se pueden obtener los filtros",
+		"CantActivateFiltersScript": "No se puede activar el script de filtros",
+		"CantDeleteFiltersScript": "No se puede eliminar el script de filtros",
+		"FiltersAreNotCorrect": "Filtros incorrectos",
+		"CantCreateFolder": "No se puede crear la carpeta",
+		"CantRenameFolder": "No se puede renombrar la carpeta",
+		"CantDeleteFolder": "No se puede eliminar la carpeta",
+		"CantDeleteNonEmptyFolder": "No se puede eliminar un directorio que no está vacío",
+		"CantSubscribeFolder": "No se puede suscribir a la carpeta",
+		"CantUnsubscribeFolder": "No puede darse de baja de la carpeta",
+		"DemoSendMessageError": "¡Por razones de seguridad, esta cuenta demo no permite enviar mensajes a direcciones de correo electrónico externas!",
+		"DemoAccountError": "¡Por razones de seguridad, esta cuenta no está permitida para esta acción!",
+		"AccountAlreadyExists": "La cuenta ya existe",
+		"AccountDoesNotExist": "La cuenta no existe",
+		"AccountSwitchFailed": "El cambio a la cuenta \"%EMAIL%\" falló",
+		"MailServerError": "Ocurrió un error mientras se accedía al servidor",
+		"InvalidInputArgument": "Argumento no válido",
+		"UnknownError": "Error desconocido"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/et/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/et-EE/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/et/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/static.json b/snappymail/v/0.0.0/app/localization/et/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/et-EE/static.json
rename to snappymail/v/0.0.0/app/localization/et/static.json
diff --git a/snappymail/v/0.0.0/app/localization/et-EE/user.json b/snappymail/v/0.0.0/app/localization/et/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/et-EE/user.json
rename to snappymail/v/0.0.0/app/localization/et/user.json
index 44d961e23..9b62e373d 100644
--- a/snappymail/v/0.0.0/app/localization/et-EE/user.json
+++ b/snappymail/v/0.0.0/app/localization/et/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arhiveerimine",
 		"ARE_YOU_SURE": "Kas oled kindel?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Sulge (Esc)",
 		"CONTACTS": "Kontaktid",
 		"DELETE": "Kustuta",
+		"UNDELETE": "Undelete",
 		"DONE": "Valmis",
 		"EMAIL": "E-post",
 		"FROM": "Saatja",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Logi välja",
 		"MORE": "Näita rohkem",
 		"MOVE_TO": "Liiguta kausta",
+		"COPY_TO": "Kopeeri",
 		"NAME": "Saabunud kirjad",
 		"NONE": "Puuduvad",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ei ole rämpspost",
+		"USERNAME": "Kasutajanimi",
 		"PASSWORD": "Salasõna",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Vastuse saaja",
 		"SAVE": "Salvesta",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Kontakte ei leitud",
 		"SPAM": "Märgi rämpspostiks",
 		"SUBJECT": "Pealkiri",
 		"TEST": "Kontrolli",
-		"TO": "Saaja"
+		"TO": "Saaja",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Jah",
+		"NO": "Ei",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "vaikimisi",
+		"HELP": "Abi",
+		"TEXT": "Tekst",
+		"ATTACHMENTS": "Manused"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logi sisse",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Sisene"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Lisa konto",
-		"BUTTON_SETTINGS": "Sätted",
-		"BUTTON_HELP": "Abi"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiiliversioon",
-		"BUTTON_DESKTOP_VERSION": "Töölauaversioon"
+		"BUTTON_ADD_ACCOUNT": "Lisa konto"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Täpsem otsing",
-		"LABEL_ADV_TEXT": "Tekst",
-		"LABEL_ADV_HAS_ATTACHMENT": "Manusega",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Manustega",
-		"LABEL_ADV_FLAGGED": "Lipuga tähistatud",
-		"LABEL_ADV_UNSEEN": "Lugemata",
-		"LABEL_ADV_DATE": "Kuupäev",
-		"LABEL_ADV_DATE_ALL": "Kõik",
-		"LABEL_ADV_DATE_3_DAYS": "Kuni 3 päeva vanune",
-		"LABEL_ADV_DATE_7_DAYS": "Kuni 1 nädal vanune",
-		"LABEL_ADV_DATE_MONTH": "Kuni 1 kuu vanune",
-		"LABEL_ADV_DATE_3_MONTHS": "Kuni 3 kuu vanune ",
-		"LABEL_ADV_DATE_6_MONTHS": "Kuni 6 kuu vanune",
-		"LABEL_ADV_DATE_YEAR": "Kuni 1 aasta vanune",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Täisekraan sisse\/välja",
-		"ZOOM": "Suurenda\/vähenda",
-		"CLOSE": "Sulge (Esc)",
-		"GALLERY_PREV": "Eelmine (nool vasakule)",
-		"GALLERY_NEXT": "Järgmine (nool paremale)",
-		"GALLERY_COUNTER": "%curr%. %total%-st"
+		"TEXT": "Tekst",
+		"HAS_ATTACHMENT": "Manusega",
+		"FLAGGED": "Lipuga tähistatud",
+		"UNSEEN": "Lugemata",
+		"DATE": "Kuupäev",
+		"DATE_ALL": "Kõik",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Kuni 3 päeva vanune",
+		"SINCE_7_DAYS": "Kuni 1 nädal vanune",
+		"SINCE_MONTH": "Kuni 1 kuu vanune",
+		"SINCE_3_MONTHS": "Kuni 3 kuu vanune ",
+		"SINCE_6_MONTHS": "Kuni 6 kuu vanune",
+		"SINCE_YEAR": "Kuni 1 aasta vanune",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Vastatud",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Koosta uus kiri",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Prügikast",
 		"ARCHIVE_NAME": "Arhiiv"
 	},
-	"QUOTA": {
-		"TITLE": "Andmemaht"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Laadi kirjade nimekiri uuesti",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Loetud",
 		"MENU_SELECT_FLAGGED": "Lipuga märgitud",
 		"MENU_SELECT_UNFLAGGED": "Lipuga märkimata",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tühi nimekiri",
 		"EMPTY_SEARCH_LIST": "Otsingule ei vastanud ühtegi kirja",
 		"SEARCH_RESULT_FOR": "Vasted otsingule \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "tagasi kirjade nimekirja",
-		"EMPTY_SUBJECT_TEXT": "(Pealkiri puudub)",
 		"PUT_MESSAGE_HERE": "Sikuta siia kiri, mida soovid nimekirjas näha",
 		"TODAY_AT": "täna kell %TIME%",
 		"YESTERDAY_AT": "eile kell %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Sulle on %COUNT% uut kirja!",
 		"QUOTA_SIZE": "Kasutad <strong>%SIZE% (%PROC%%)<\/strong> lubatud kettamahust <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Näita lähteteksti",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Laadi alla .eml failina",
 		"MENU_FILTER_SIMILAR": "Filtreeri sarnased kirjad",
 		"MENU_PRINT": "Prindi",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Laadi alla .zip failina",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kohaletoimetamise kinnitus - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Otsin..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Lisa kontakt",
 		"BUTTON_CREATE_CONTACT": "Lisa",
-		"BUTTON_UPDATE_CONTACT": "Salvesta",
 		"BUTTON_IMPORT": "Impordi (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Ekspordi (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Ekspordi (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Kontakte ei leitud",
 		"CLEAR_SEARCH": "Puhasta otsinguväli",
 		"CONTACT_VIEW_DESC": "Vali nimekirjast kontakt, mida siin näidata",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Veebileht",
 		"LABEL_BIRTHDAY": "Sünnipäev",
-		"LINK_ADD_EMAIL": "Lisa e-posti aadress",
-		"LINK_ADD_PHONE": "Lisa telefon",
-		"LINK_BIRTHDAY": "Sünnipäev",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Sisesta kuvatav nimi",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Sisesta perenimi",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Sisesta eesnimi",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Sisesta hüüdnimi",
+		"DISPLAY_NAME": "Kuvatav nimi",
+		"LAST_NAME": "Perenimi",
+		"FIRST_NAME": "Eesnimi",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Hüüdnimi",
 		"LABEL_READ_ONLY": "Ainult lugemisõigus",
-		"LABEL_SHARE": "Jaga",
 		"ADD_MENU_LABEL": "Lisa",
 		"ADD_MENU_NICKNAME": "Hüüdnimi",
-		"ADD_MENU_NOTES": "Märkmed",
+		"ADD_MENU_NOTE": "Märkmed",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Aadress",
 		"ADD_MENU_BIRTHDAY": "Sünnipäev",
 		"ADD_MENU_TAGS": "Sildid",
 		"BUTTON_SHARE_ALL": "Kõigiga",
-		"BUTTON_SYNC": "Sünkroniseerimine (CardDAV)"
+		"BUTTON_SYNC": "Sünkroniseerimine (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "näita kõiki väljasid",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Manused puuduvad.",
 		"ATTACHMENTS_ERROR_DESC": "Tähelepanu! Kõiki manuseid ei ole üles laetud.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kõiki manuseid ei ole veel üles laetud.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Palu lugemise kohta kinnitust",
 		"BUTTON_MARK_AS_IMPORTANT": "Tähista olulisena",
-		"BUTTON_REQUEST_DSN": "Palu kättesaamise kohta kinnitust"
+		"BUTTON_REQUEST_DSN": "Palu kättesaamise kohta kinnitust",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Jah",
-		"BUTTON_NO": "Ei",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Kas oled kindel, et soovid akna sulgeda?",
 		"DESC_WANT_DELETE_MESSAGES": "Kas oled kindel, et soovid sõnumi(d) kustutada?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Vali oma keel"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Lisan konto?",
+		"TITLE_ADD_ACCOUNT": "Lisan konto",
 		"BUTTON_ADD_ACCOUNT": "Lisa",
-		"TITLE_UPDATE_ACCOUNT": "Muudan kontot?",
-		"BUTTON_UPDATE_ACCOUNT": "Muuda"
+		"TITLE_UPDATE_ACCOUNT": "Muudan kontot"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Lisan identiteedi?",
-		"TITLE_UPDATE_IDENTITY": "Muudan identiteeti?",
+		"TITLE_ADD_IDENTITY": "Lisan identiteedi",
+		"TITLE_UPDATE_IDENTITY": "Muudan identiteeti",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lisa",
-		"BUTTON_UPDATE_IDENTITY": "Muuda",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sisesta see signatuur kirjades enne tsiteeritud teksti"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Loon kausta?",
+		"TITLE_CREATE_FOLDER": "Loon kausta",
 		"LABEL_PARENT": "Ülemkaust",
 		"BUTTON_CREATE": "Loo",
 		"TITLE_CREATING_PROCESS": "Loon kausta"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Juba alustatud protsessi ei saa tühistada või katkestada.",
 		"TITLE_CLEARING_PROCESS": "Tühjendan kausta..."
 	},
+	"CRYPTO": {
+		"SIGN": "Allkirjasta",
+		"ENCRYPT": "Krüpteeri",
+		"DECRYPT": "Dekrüpteeri",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Korralik signatuur kasutajalt %USER%",
+		"ERROR": "%TYPE% viga: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Impordi OpenPGP võti",
 		"POPUP_IMPORT_BUTTON": "Impordi",
@@ -257,16 +319,22 @@
 		"POPUP_GENERATE_TITLE": "Genereeri OpenPGP võtmed",
 		"POPUP_GENERATE_BUTTON": "Genereeri",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Allkirjasta",
-		"LABEL_ENCRYPT": "Krüpteeri",
-		"BUTTON_DECRYPT": "Dekrüpteeri",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP abil signeeritud kiri",
 		"ENCRYPTED_MESSAGE": "OpenPGP abil krüpteeritud kiri",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Korralik signatuur kasutajalt %USER%",
-		"ERROR": "OpenPGP viga: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME abil signeeritud kiri",
+		"ENCRYPTED_MESSAGE": "S\/MIME abil krüpteeritud kiri",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Filtri loomine",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Märgi loetuks",
 		"REPLY_INTERVAL_LABEL": "Vastuse intervall (päevades)",
 		"KEEP_LABEL": "Salvesta",
-		"STOP_LABEL": "Ära peata reeglite protsessimist",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Pealkiri (valikuline)",
 		"VACATION_MESSAGE_LABEL": "Sõnum",
 		"VACATION_RECIPIENTS_LABEL": "Saajad (eraldatud komaga)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Faili üleslaadimisel tekkis tundmatu iseloomuga viga"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Isiklik",
-		"LABEL_GENERAL_NAME": "Üldine",
-		"LABEL_CONTACTS_NAME": "Kontaktid",
-		"LABEL_FOLDERS_NAME": "Kaustad",
-		"LABEL_ACCOUNTS_NAME": "Kontod",
-		"LABEL_FILTERS_NAME": "Filtrid",
-		"LABEL_SECURITY_NAME": "Turvalisus",
-		"LABEL_THEMES_NAME": "Teemad"
+		"GENERAL": "Üldine",
+		"CONTACTS": "Kontaktid",
+		"FOLDERS": "Kaustad",
+		"ACCOUNTS": "Kontod",
+		"FILTERS": "Filtrid",
+		"SECURITY": "Turvalisus",
+		"THEMES": "Teemad"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtrid",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Liiguta kausta \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Edasta aadressile \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Lükka tagasi",
 		"SUBNAME_VACATION_MESSAGE": "Puhkuse teade",
-		"SUBNAME_DISCARD": "Hülga",
-		"LOADING_PROCESS": "Värskendan filtrite nimekirja"
+		"SUBNAME_DISCARD": "Hülga"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvalisus",
 		"LABEL_AUTOLOGOUT": "Automaatne välja logimine",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Mitte kunagi",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minutit",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% tund(i)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Mitte kunagi"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Üldine",
-		"LABEL_LANGUAGE": "Keel",
-		"LABEL_IDENTITY": "Identiteet",
-		"LABEL_LAYOUT": "Vaade",
-		"LABEL_LAYOUT_NO_SPLIT": "Jaotuseta",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
-		"LABEL_EDITOR": "Vaikimisi tekstiredaktor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Lihttekst",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (kohustuslik)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Lihttekst (kohustuslik)",
-		"LABEL_VIEW_OPTIONS": "Vaate seaded",
-		"LABEL_USE_PREVIEW_PANE": "Kasuta eelvaadet",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi",
-		"LABEL_USE_THREADS": "Kasuta vestluse lõimesid",
-		"LABEL_REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
-		"LABEL_SHOW_IMAGES": "Näita alati kirja sisus viidatud väliseid pilte",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Lehel kuvatavate kirjade arv",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Keel",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identiteet",
+		"LAYOUT": "Vaade",
+		"LAYOUT_NO_SPLIT": "Jaotuseta",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikaalse jaotusega",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontaalse jaotusega",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Vaikimisi tekstiredaktor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Lihttekst",
+		"VIEW_OPTIONS": "Vaate seaded",
+		"USE_PREVIEW_PANE": "Kasuta eelvaadet",
+		"HIDE_DELETED_MESSAGES": "Peida kustutamiseks märgitud kirjad",
+		"USE_CHECKBOXES_IN_LIST": "Kuva nimekirjas valikukastikesi",
+		"USE_THREADS": "Kasuta vestluse lõimesid",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Pane vastused samasse kausta, kus asub vastatud kiri",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Lehel kuvatavate kirjade arv",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Teavitused",
-		"LABEL_SOUND_NOTIFICATION": "Teavitused heliga",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Teavitused",
+		"SOUND_NOTIFICATION": "Teavitused heliga",
+		"CHROME_NOTIFICATION_DESC": "Näita uute kirjade teavitust hüpikaknaga",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Veebilehitseja poolt blokeeritud)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisa saajad automaatselt aadressiraamatusse",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Aadressiraamatu URL",
 		"LABEL_CONTACTS_SYNC_USER": "Kasutaja",
-		"SYNC_NO": "Ei",
-		"SYNC_YES": "Jah",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teemad",
-		"LEGEND_THEMES_CUSTOM": "Teema kohandamine",
-		"LABEL_CUSTOM_TYPE": "Tüüp",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Hele",
-		"LABEL_CUSTOM_TYPE_DARK": "Tume",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Taust",
+		"LABEL_BACKGROUND": "Taust",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Laadi üles taustapilt (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fail on liiga suur",
 		"ERROR_FILE_TYPE_ERROR": "Faili tüüp ei sobi (lubatud on ainult JPG ja PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Näitame sulle neist vaid osa, et vältida jõudlusprobleeme.",
 		"HELP_DELETE_FOLDER": "Kustuta kaust",
 		"HELP_SHOW_HIDE_FOLDER": "Näita\/peida kaust",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrolli\/ära kontrolli uusi kirju",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrolli uusi kirju",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Lisa konto",
 		"BUTTON_ADD_IDENTITY": "Lisa identiteet",
 		"LOADING_PROCESS": "Värskendan...",
-		"DEFAULT_IDENTITY_LABEL": "vaikimisi"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Impordi võti",
 		"BUTTON_GENERATE_KEY_PAIR": "Genereeri võti",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privaatne",
 		"TITLE_PUBLIC": "Avalik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Vasta kõigile",
 		"LABEL_FORWARD": "Edasta",
 		"LABEL_FORWARD_MULTIPLY": "Edasta manusena",
-		"LABEL_HELP": "Abi",
 		"LABEL_CHECK_ALL": "Vali kõik kirjad",
 		"LABEL_DELETE": "Kustuta",
 		"LABEL_OPEN_THREAD": "Ava valitud lõim",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Tsitaatide lülitamine",
 		"LABEL_THREAD_NEXT": "Järgmine kiri lõimes",
 		"LABEL_THREAD_PREV": "Eelmine kiri lõimes",
-		"LABEL_PRINT": "Prindi",
 		"LABEL_EXIT_FULLSCREEN": "Välju täisekraani vaatest",
 		"LABEL_CLOSE_MESSAGE": "Sulge kiri (ilma eelvaateta)",
 		"LABEL_SWITCH_TO_LIST": "Vii fookus tagasi kirjade nimekirjale",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Sulge kirja koostamise aken"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Puudulik tõend",
-		"AUTH_ERROR": "Autentimine ebaõnnestus",
-		"CONNECTION_ERROR": "Serveriga ühendumine ebaõnnestus",
-		"DOMAIN_ALREADY_EXISTS": "Domeen juba eksisteerib",
-		"DOMAIN_NOT_ALLOWED": "Domeenil ei ole lubatud siseneda",
-		"ACCOUNT_NOT_ALLOWED": "Kasutajakontol ei ole lubatud siseneda",
-		"CONTACTS_SYNC_ERROR": "Kontaktide sünkroniseerimise viga",
-		"CANT_GET_MESSAGE_LIST": "Kirjade nimekirja laadimine ebaõnnestus",
-		"CANT_GET_MESSAGE": "Kirja laadimine ebaõnnestus",
-		"CANT_DELETE_MESSAGE": "Kirja kustutamine ebaõnnestus",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Kirja liigutamine ebaõnnestus",
-		"CANT_SAVE_MESSAGE": "Kirja salvestamine ebaõnnestus",
-		"CANT_SEND_MESSAGE": "Kirja saatmine ebaõnnestus",
-		"INVALID_RECIPIENTS": "Puudulikud saajad",
-		"CANT_SAVE_FILTERS": "Filtri salvestamine ebaõnnestus",
-		"CANT_GET_FILTERS": "Filtrite laadimine ebaõnnestus",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtrid on puudulikud",
-		"CANT_CREATE_FOLDER": "Kausta loomine ebaõnnestus",
-		"CANT_RENAME_FOLDER": "Kausta ümbernimetamine ebaõnnestus",
-		"CANT_DELETE_FOLDER": "Kausta kustutamine ebaõnnestus",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Kirju sisaldavat kausta pole võimalik kustutada",
-		"CANT_SUBSCRIBE_FOLDER": "Kausta tellimine ebaõnnestus.",
-		"CANT_UNSUBSCRIBE_FOLDER": "Kausta tellimisest loobumine ebaõnnestus.",
-		"DEMO_SEND_MESSAGE_ERROR": "Turvalisusega seotud põhjustel ei ole sellel kontol lubatud saata kirju välistele aadressidele!",
-		"DEMO_ACCOUNT_ERROR": "Turvalisusega seotud põhjustel ei ole sellel kontol lubatud soovitud toimingut teostada!",
-		"ACCOUNT_ALREADY_EXISTS": "Konto juba eksisteerib",
-		"ACCOUNT_DOES_NOT_EXIST": "Kontot veel ei eksisteeri",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "E-posti serveri poole pöördumisel tekkis viga",
-		"INVALID_INPUT_ARGUMENT": "Puudulik sisendi arument",
-		"UNKNOWN_ERROR": "Tundmatu viga"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Puudulik tõend",
+		"AuthError": "Autentimine ebaõnnestus",
+		"ConnectionError": "Serveriga ühendumine ebaõnnestus",
+		"DomainAlreadyExists": "Domeen juba eksisteerib",
+		"DomainNotAllowed": "Domeenil ei ole lubatud siseneda",
+		"AccountNotAllowed": "Kasutajakontol ei ole lubatud siseneda",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kontaktide sünkroniseerimise viga",
+		"CantGetMessageList": "Kirjade nimekirja laadimine ebaõnnestus",
+		"CantGetMessage": "Kirja laadimine ebaõnnestus",
+		"CantDeleteMessage": "Kirja kustutamine ebaõnnestus",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Kirja liigutamine ebaõnnestus",
+		"CantSaveMessage": "Kirja salvestamine ebaõnnestus",
+		"CantSendMessage": "Kirja saatmine ebaõnnestus",
+		"InvalidRecipients": "Puudulikud saajad",
+		"CantSaveFilters": "Filtri salvestamine ebaõnnestus",
+		"CantGetFilters": "Filtrite laadimine ebaõnnestus",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filtrid on puudulikud",
+		"CantCreateFolder": "Kausta loomine ebaõnnestus",
+		"CantRenameFolder": "Kausta ümbernimetamine ebaõnnestus",
+		"CantDeleteFolder": "Kausta kustutamine ebaõnnestus",
+		"CantDeleteNonEmptyFolder": "Kirju sisaldavat kausta pole võimalik kustutada",
+		"CantSubscribeFolder": "Kausta tellimine ebaõnnestus.",
+		"CantUnsubscribeFolder": "Kausta tellimisest loobumine ebaõnnestus.",
+		"DemoSendMessageError": "Turvalisusega seotud põhjustel ei ole sellel kontol lubatud saata kirju välistele aadressidele!",
+		"DemoAccountError": "Turvalisusega seotud põhjustel ei ole sellel kontol lubatud soovitud toimingut teostada!",
+		"AccountAlreadyExists": "Konto juba eksisteerib",
+		"AccountDoesNotExist": "Kontot veel ei eksisteeri",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "E-posti serveri poole pöördumisel tekkis viga",
+		"InvalidInputArgument": "Puudulik sisendi arument",
+		"UnknownError": "Tundmatu viga"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/eu/admin.json b/snappymail/v/0.0.0/app/localization/eu/admin.json
new file mode 100644
index 000000000..db2aefb85
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Gehitu",
+		"CLOSE": "Itxi",
+		"SAVE": "Gorde",
+		"TEST": "Probatu",
+		"UPDATE": "Eguneratu",
+		"USERNAME": "Erabiltzailea",
+		"PASSWORD": "Pasahitza",
+		"CANCEL": "Ezeztatu",
+		"SEARCH": "Bilatu",
+		"YES": "Bai",
+		"NO": "Ez"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Login",
+		"LABEL_TOTP": "TOTP kodea",
+		"BUTTON_LOGIN": "Administradore panelean saioa hasi"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Administradore Panela"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Orokorra",
+		"LOGIN": "Login",
+		"BRANDING": "Marka",
+		"CONTACTS": "Kontaktuak",
+		"DOMAINS": "Domeinuak",
+		"SECURITY": "Segurtasuna",
+		"PACKAGES": "Gehigarriak",
+		"CONFIG": "Ezarpenak",
+		"ABOUT": "Honi buruz"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Interfazea",
+		"LABEL_LANGUAGE": "Hizkuntza",
+		"LABEL_LANGUAGE_ADMIN": "Hizkuntza (admin)",
+		"LABEL_THEME": "Gaia",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Baimendu hizkuntza aukeratzea ezarpenen pantailan",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Baimendu gaia aukeratzea ezarpenen pantailan",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Baimendu atzealdeko irudia aukeratzea ezarpenen pantailan",
+		"LABEL_SHOW_THUMBNAILS": "Erakutsi miniaturak (gehigarriak)",
+		"LEGEND_MAIN": "Nagusia",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Eranskinen tamaina-muga",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Onartu kontu gehigarriak",
+		"LABEL_ALLOW_IDENTITIES": "Onartu nortasun gehigarriak",
+		"ALERT_DATA_ACCESS": "Datu karpeta eskuragarri dago. Mesedez, konfigruatu zure web zerbitzaria datuen karpeta kanpoko sarbidetik ezkutatzeko. Irakurri gehiago hemen:",
+		"ALERT_WARNING": "Kontuz!",
+		"HTML_ALERT_WEAK_PASSWORD": "Lehenetsitako administradore pasahitza erabiltzen ari zara.\n<br>\nSegurtasunagatik, mesedez,\n<strong><a href=\"#\/security\">aldatu<\/a><\/strong>\npasahitza beste zerbaitetara orain.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Saio hasiera pantaila",
+		"LABEL_DEFAULT_DOMAIN": "Lehenetsitako Domeinua",
+		"LABEL_DETERMINE_USER_DOMAIN": "Saiatu zehazten erabiltzailearen domeinua",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Onartu hizkuntza hautaketa saio-hasiera pantailan",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Saiatu zehazten erabiltzailearen hizkuntza"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Marka",
+		"LABEL_PAGE_TITLE": "Orriaren izenburua",
+		"LABEL_LOADING_DESCRIPTION": "Deskribapena Kargatzen",
+		"LABEL_FAVICON_URL": "Favicon"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Kontaktuak",
+		"LEGEND_STORAGE": "Biltegia (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Gaitu kontaktuak",
+		"LABEL_ALLOW_SYNC": "Onartu kontaktuen sinkronizazioa (kanpoko CardDAV zerbitzaria)",
+		"LABEL_STORAGE_TYPE": "Mota",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Erabiltzailea",
+		"LABEL_STORAGE_PASSWORD": "Pasahitza",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
+		"ALERT_NOTICE": "Adi!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ez erabili datubase hau erabiltzaile aktibo koputu handiarekin.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Zure sistemak ez ditu kontaktuak onartzen.\n<br>\n<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> gehigarria instalatu edo gaitu behar duzu zure zerbitzarian.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Domeinuak",
+		"BUTTON_ADD_DOMAIN": "Gehitu Domeinua",
+		"BUTTON_ADD_ALIAS": "gehitu Aliasa",
+		"DELETE_ARE_YOU_SURE": "Ziur zaude?",
+		"HTML_DOMAINS_HELPER": "Webmail-a sartzera baimenduta dagoen domeinu zerrenda.\n<br>\nKlikatu izenean domeinua konfiguratzeko.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Segurtasuna",
+		"LABEL_USE_IMAGE_PROXY": "Erabili proxy lokala kanpoko irudientzat",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
+		"LABEL_SHOW_PHP_INFO": "Erakutsi PHP informazioa",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panelerako Sarbide Kredentzialak",
+		"LABEL_CURRENT_PASSWORD": "Uneko pasahitza",
+		"LABEL_NEW_PASSWORD": "Pasahitz berria",
+		"LABEL_REPEAT_PASSWORD": "Errepikatu",
+		"LABEL_REQUIRE_VERIFICATION": "SSL ziurtagiriaren baliozkotzea eskatu",
+		"CRYPTO": "Crypto",
+		"LABEL_ALLOW_SELF_SIGNED": "Onartu norberak sinatutako ziurtagiriak"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Onartu gehigarriak",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Eguneratzeko eskuragarri",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Instalatzeko eskuragarri",
+		"LEGEND_INSTALLED_PACKAGES": "Instalatutako Gehigarriak",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Ezin da sartu biltegira une honetan."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Honi buruz",
+		"LABEL_TAG_HINT": "Weban oinarritutako email-bezero erraz, moderno eta azkarra",
+		"LABEL_ALL_RIGHTS_RESERVED": "Eskubide guztiak gordeak.",
+		"HINT_READ_CHANGE_LOG": "Mesedez irakurri aldaketen informea eguneratu aurretik.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail eguneratuta dago.",
+		"HTML_NEW_VERSION": "<b>%VERSION%<\/b> bertsio berria eskuragarri.",
+		"LABEL_UPDATING": "Eguneratzen",
+		"LABEL_CHECKING": "Eguneraketak dauden begiratzen",
+		"BUTTON_RELEASES": "Bertsioak"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Gehitu Aliasa",
+		"LABEL_ALIAS": "Alias",
+		"LABEL_DOMAIN": "Domeinua"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Gehitu Domeinua",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Gehitu Domeinua \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Editatu Domeinua \"%NAME%\"",
+		"LABEL_NAME": "Izena",
+		"NAME_HELPER": "komodina onartuta",
+		"LABEL_SERVER": "Zerbitzaria",
+		"LABEL_PORT": "Portua",
+		"LABEL_SECURE": "Segurtasuna",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
+		"SECURE_OPTION_NONE": "Bat ere ez",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Onartu sieve scriptak",
+		"LABEL_USE_SHORT_LOGIN": "Erabili login motza",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
+		"LABEL_USE_AUTH": "Erabili autentikazioa",
+		"LABEL_SET_SENDER": "Erabili logina bidaltzaile bezala",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
+		"LABEL_USE_PHP_MAIL": "Erabili php mail() funtzioa",
+		"BUTTON_WHITE_LIST": "Zerrenda Zuria",
+		"NEW_DOMAIN_DESC": "Domeinu honen konfigurazioak <strong>%NAME%<\/strong> email kontuarekin lan egitea ahalbideratuko dizu.",
+		"WHITE_LIST_ALERT": "Webmailak sartzeko baimena duen domeinuko erabiltzaileen zerrenda.\nErabili hutsunea banatzaile bezala.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Gehigarria",
+		"DESC_NOTHING_TO_CONFIGURE": "Ez dago kongiguratzeko ezer"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Aukeratu zure hizkuntza"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Kontuz!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Domeinua jadanik existizen da",
+		"UNKNOWN_ERROR": "Errore ezezaguna"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Eskaerak huts egin du",
+		"RequestAborted": "Eskaera bertan behera utzi da",
+		"RequestTimeout": "Eskaeraren denbora-muga gainditu da",
+		"InvalidToken": "Ez-baliozko tokena",
+		"AuthError": "Autentikazioak huts egin du",
+		"DomainAlreadyExists": "Domeinua jadanik existitzen da",
+		"CantSavePluginSettings": "Ezin dira ezarpenak gorde",
+		"CantInstallPackage": "Akatsa gehigarria instalatzean",
+		"CantDeletePackage": "Akatsa gehigarria kentzean",
+		"InvalidPluginPackage": "Ez-baliozko gehigarri paketea",
+		"UnsupportedPluginPackage": "Gehigarri paketea ez da onartzen",
+		"UnknownError": "Errore ezezaguna"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js
new file mode 100644
index 000000000..29f66890d
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/relativetimeformat.js
@@ -0,0 +1,75 @@
+{
+	long: {
+		year: {
+			past: {
+				one: "duela urtebete",
+				other: "duela {0} urte"
+			},
+			future: {
+				one: "urtebete barru",
+				other: "{0} urte barru"
+			}
+		},
+		month: {
+			past: {
+				one: "duela hilabete",
+				other: "duela {0} hilabete"
+			},
+			future: {
+				one: "hilabete barru",
+				other: "{0} hilabete barru"
+			}
+		},
+		week: {
+			past: {
+				one: "duela astebete",
+				other: "duela {0} aste"
+			},
+			future: {
+				one: "astebete barru",
+				other: "{0} aste barru"
+			}
+		},
+		day: {
+			past: {
+				one: "duela egun bat",
+				other: "duela {0} egun"
+			},
+			future: {
+				one: "egun bat barru",
+				other: "{0} egun barru"
+			}
+		},
+		hour: {
+			past: {
+				one: "duela ordubete",
+				other: "duela {0} ordu"
+			},
+			future: {
+				one: "ordubete barru",
+				other: "{0} ordu barru"
+			}
+		},
+		minute: {
+			past: {
+				one: "duela minutu {0}",
+				other: "duela {0} minutu"
+			},
+			future: {
+				one: "minutu {0} barru",
+				other: "{0} minutu barru"
+			}
+		},
+		second: {
+			past: {
+				one: "duela segundo {0}",
+				other: "duela {0} segundo"
+			},
+			future: {
+				one: "segundo {0} barru",
+				other: "{0} segundo barru"
+			}
+		}
+	},
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/static.json b/snappymail/v/0.0.0/app/localization/eu/static.json
new file mode 100644
index 000000000..1ea35b0d2
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Birkargatu",
+	"NO_SCRIPT_TITLE": "JavaScript beharrezkoa da aplikazio honetarako.",
+	"NO_SCRIPT_DESC": "Zure nabigatzaileak ez du JavaScript onartzen.\nMesedez gaitu JavaScript zure nabigatzailearen ezarpenetan eta saiatu berriro.\n",
+	"NO_COOKIE_TITLE": "Cookieak onartzea behar da aplikazio honetarako.",
+	"NO_COOKIE_DESC": "Zure nabigatzaileak ez ditu Cookieak onartzen.\nMesedez gaitu Cookieak zure nabigatzailearen ezarpenetan eta saiatu berriro.\n",
+	"BAD_BROWSER_TITLE": "Zure nabigatzailea ez dago eguneratuta.",
+	"BAD_BROWSER_DESC": "Aplikazio honen ezaugarri gutziak erabiltzeko,\ndeskargatu eta instalatu ondo nabigatzaileetako bat:\n"
+}
diff --git a/snappymail/v/0.0.0/app/localization/eu/user.json b/snappymail/v/0.0.0/app/localization/eu/user.json
new file mode 100644
index 000000000..54abcd1f4
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/eu/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "Artxibatu",
+		"ARE_YOU_SURE": "Ziur zaude",
+		"BACK": "Atzera",
+		"BCC": "BCC",
+		"CANCEL": "Utzi",
+		"CC": "CC",
+		"CLEAR": "Garbitu",
+		"CLOSE": "Itxi",
+		"CONTACTS": "Kontaktuak",
+		"DELETE": "Ezabatu",
+		"UNDELETE": "Berreskuratu",
+		"DONE": "Eginda",
+		"EMAIL": "E-mail",
+		"FROM": "Nork",
+		"LOADING": "Kargatzen",
+		"LOGOUT": "Saioa itxi",
+		"MORE": "Gehiago",
+		"MOVE_TO": "Mugitu",
+		"COPY_TO": "Kopiatu hona",
+		"NAME": "Izena",
+		"NONE": "Bat ere ez",
+		"TO_SPAM": "Eraman mezua(k) Spam-era",
+		"NOT_SPAM": "Ez da spama",
+		"USERNAME": "Erabiltzaile-izena",
+		"PASSWORD": "Pasahitza",
+		"REMEMBER": "Gogoratu",
+		"REPLY_TO": "Erantzun",
+		"SAVE": "Gorde",
+		"SAVE_CHANGES": "Aldaketak gorde?",
+		"SEARCH": "Bilatu",
+		"SPAM": "Spam",
+		"SUBJECT": "Gaia",
+		"TEST": "Probatu",
+		"TO": "Nori",
+		"SERVER_MESSAGE": "Zerbitzariko mezua",
+		"YES": "Bai",
+		"NO": "Ez",
+		"INACTIVE": "Inaktibo",
+		"DEFAULT": "lehenetsia",
+		"HELP": "Laguntza",
+		"TEXT": "Testua",
+		"ATTACHMENTS": "Eranskinak"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Hasi saioa",
+		"LABEL_SIGN_ME": "Gogora nazazu",
+		"BUTTON_SIGN_IN": "Sartu"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Gehitu kontua"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Bilaketa aurreratua",
+		"TEXT": "Testua",
+		"HAS_ATTACHMENT": "Erantsitako fitxategiak",
+		"FLAGGED": "Markatuta",
+		"UNSEEN": "Irakurri gabe",
+		"DATE": "Data",
+		"DATE_ALL": "Denak",
+		"BEFORE_3_DAYS": "3 egun baino zaharragoa",
+		"BEFORE_7_DAYS": "Aste 1 baino zaharragoa",
+		"BEFORE_MONTH": "Hilabete 1 baino zaharragoa",
+		"BEFORE_3_MONTHS": "3 hilabete baino zaharragoa",
+		"BEFORE_6_MONTHS": "6 hilabete baino zaharragoa",
+		"BEFORE_YEAR": "Urte 1 baino zaharragoa",
+		"SINCE_3_DAYS": "3 egun arterakoak",
+		"SINCE_7_DAYS": "Astebetako arterakoak",
+		"SINCE_MONTH": "Hilabete arterakoak",
+		"SINCE_3_MONTHS": "3 hilabete arterakoak",
+		"SINCE_6_MONTHS": "6 hilabete arterakoak",
+		"SINCE_YEAR": "Urtebete arterakoak",
+		"SUBFOLDERS": "Azpikarpetak",
+		"SUBFOLDERS_NONE": "Bat ere ez",
+		"SUBFOLDERS_SUBTREE": "Denak",
+		"SUBFOLDERS_SUBTREE_ONE": "Maila bat",
+		"REPLIED": "Erantzunda",
+		"KEYWORD": "Etiketa"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Idatzi",
+		"BUTTON_NEW_MESSAGE": "Mezu berria",
+		"INBOX_NAME": "Sarrera-ontzia",
+		"SENT_NAME": "Bidalitakoak",
+		"DRAFTS_NAME": "Zirriborroak",
+		"TRASH_NAME": "Zakarrontzia",
+		"ARCHIVE_NAME": "Artxiboa"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Baimenak",
+		"ACL_A": "Administratu",
+		"ACL_E": "Ezabatu",
+		"ACL_I": "Txertatu mezuak",
+		"ACL_K": "Sortu azpi-karpetak",
+		"ACL_L": "Erakutsi mezuak",
+		"ACL_P": "Bidali posta",
+		"ACL_R": "Hautatu karpeta",
+		"ACL_S": "\\IKUSITAKO etiketa",
+		"ACL_T": "\\EZABATUTAKO etiketa",
+		"ACL_W": "Beste etiketak",
+		"ACL_X": "Ezabatu/Berrizendatu karpeta"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Eguneratu mezuen zerrenda",
+		"BUTTON_EMPTY_FOLDER": "Hustu karpeta",
+		"BUTTON_MULTY_FORWARD": "Bidali eranskin gisa",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Ezabatu betirako",
+		"MENU_SET_SEEN": "Irakurritako gisa markatu",
+		"MENU_SET_ALL_SEEN": "Dena irakurritako gisa markatu",
+		"MENU_UNSET_SEEN": "Irakurri gabe bezala markatu",
+		"MENU_SET_FLAG": "Markatu",
+		"MENU_UNSET_FLAG": "Desmarkatu",
+		"MENU_SELECT_ALL": "Denak",
+		"MENU_SELECT_INVERT": "Alderantzikatu",
+		"MENU_SELECT_UNSEEN": "Irakurri gabea",
+		"MENU_SELECT_SEEN": "Irakurria",
+		"MENU_SELECT_FLAGGED": "Markatua",
+		"MENU_SELECT_UNFLAGGED": "Markatu gabea",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Deskargatu eranskin guztiak",
+		"EMPTY_LIST": "Hustu zerrenda.",
+		"EMPTY_SEARCH_LIST": "Zure bilaketarekin bat datorren mezurik ez.",
+		"SEARCH_RESULT_FOR": "\"%SEARCH%\"-erako bilaketa emaitzak",
+		"BACK_TO_MESSAGE_LIST": "Itzuli mezuen zerrendara",
+		"PUT_MESSAGE_HERE": "Bota mezua hemen zerrendan ikusteko",
+		"TODAY_AT": "gaur %TIME%-etan",
+		"YESTERDAY_AT": "atzo %TIME%-etan",
+		"NEW_MESSAGE_NOTIFICATION": "%COUNT% mezu berri dituzu!",
+		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong> erabiliz zure <strong>%LIMIT%<\/strong>-tik",
+		"SORT": "Ordenatu",
+		"NO_SORT": "Posta zerbitzariak ez du ordenatzen",
+		"SORT_ARRIVAL_ASC": "Zaharrenetik berrienera",
+		"SORT_ARRIVAL_DESC": "Berrienetik zaharrenera",
+		"SORT_DATE_ASC": "Data goraka",
+		"SORT_DATE_DESC": "Data beheraka",
+		"SORT_SIZE_ASC": "Tamaina goraka",
+		"SORT_SIZE_DESC": "Tamaina beheraka",
+		"SORT_SUBJECT_ASC": "Gaia A-Z",
+		"SORT_SUBJECT_DESC": "Gaia Z-A",
+		"SORT_FROM_ASC": "Nork A-Z",
+		"SORT_FROM_DESC": "Nork Z-A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Editatu",
+		"BUTTON_UNSUBSCRIBE": "Kendu zerrenda honen harpidetza",
+		"BUTTON_REPLY": "Erantzun",
+		"BUTTON_REPLY_ALL": "Erantzun denei",
+		"BUTTON_FORWARD": "Birbidali",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Birbidali eranskin moduan",
+		"BUTTON_EDIT_AS_NEW": "Editatu Berri moduan",
+		"BUTTON_SHOW_IMAGES": "Erakutsi kanpoko irudiak",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Bidaltzaileak irakurri duzunean abisua jasotzeko eskatu du.",
+		"BUTTON_IN_NEW_WINDOW": "Ikusi kanpoko leihoan",
+		"BUTTON_THREAD_LIST": "Harien zerrenda",
+		"BUTTON_THREAD_PREV": "Aurrekoa",
+		"BUTTON_THREAD_NEXT": "Hurrengoa",
+		"BUTTON_THREAD_MORE": "Mezu gehiago",
+		"MENU_HEADERS": "Erakutsi mezuen goiburuak",
+		"MENU_VIEW_ORIGINAL": "Erakutsi jatorrizkoa",
+		"HTML_VIEW": "Ikusi HTML mezua",
+		"PLAIN_VIEW": "Ikusi testu soil mezua",
+		"SWAP_COLORS": "Aldatu atzeko planoaren kolorea",
+		"MENU_DOWNLOAD_ORIGINAL": "Deskargatu .eml fitxategi bezala",
+		"MENU_FILTER_SIMILAR": "Iragazi hau bezalako mezuak",
+		"MENU_PRINT": "Inprimatu",
+		"EMPTY_SUBJECT_TEXT": "(Gairik ez)",
+		"LABEL_DATE": "Data",
+		"LABEL_FROM_SHORT": "nork",
+		"LABEL_TO_SHORT": "nori",
+		"PRINT_LABEL_ATTACHMENTS": "Eranskinak",
+		"MESSAGE_VIEW_DESC": "Aukeratu zerrendako edozein mezua hemen ikusteko.",
+		"MESSAGE_VIEW_MOVE_DESC": "Klikatu karpetaren izena ezkerreko panelean helburua aukeratzeko.",
+		"LINK_DOWNLOAD_AS_ZIP": "Deskargatu zip gisa",
+		"SPAM_SCORE": "Spam puntuzioa",
+		"HAS_VIRUS_WARNING": "KONTUZ: virusa detektatu da",
+		"TAGS": "Etiketak",
+		"NEW_TAG": "Etiketa berria",
+		"ENABLE_TRACKING_LINKS": "Gaitu jarraipen-estekak",
+		"TRACKING_ENABLED": "Estekak orain jarraipena dute klikatzean!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Garrantzitsua",
+		"$todo": "Egiteko",
+		"$label1": "Garrantzitsua",
+		"$label2": "Lana",
+		"$label3": "Pertsonala",
+		"$label4": "Egiteko",
+		"$label5": "Beranduago"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Itzultzeko agiria (bistaratua) - %SUBJECT%",
+		"BODY": "%READ-RECEIPT% -ra bidali duzun mezurako Itzultzeko agiria da hau.\n\nNote: \"Itzultzeko agiri honek mezua hartzailearen ordenagailuan agertu dela bakarrik jakinarazten du .\"\nHorrek ez du esan nahi hartzaileak edukia irakurri edota ulertu duenik.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Bilatzen..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Kontaktua",
+		"TAB_LOCATIONS": "Kokapenak",
+		"TAB_BUSINESS": "Lantegia",
+		"LABEL_ORGANIZATION": "Erakundea",
+		"LABEL_DEPARTMENT": "Saila",
+		"LABEL_TITLE": "Izenburua",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Galdetu",
+		"NEVER": "Inoiz ez",
+		"ALWAYS": "Beti",
+		"ALWAYS_IF_POSSIBLE": "Beti aukera badago",
+		"BUTTON_ADD_CONTACT": "Gehitu Kontaktua",
+		"BUTTON_CREATE_CONTACT": "Sortu",
+		"BUTTON_IMPORT": "Inportatu (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Esportatu (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Esportatu (csv)",
+		"ERROR_IMPORT_FILE": "Inportazio errorea (fitxategi-formatua ez da baliozkoa)",
+		"EMPTY_LIST": "Ez dago kontakturik hemen",
+		"EMPTY_SEARCH": "Ez da kontakturik aurkitu",
+		"CLEAR_SEARCH": "Garbitu bilaketa",
+		"CONTACT_VIEW_DESC": "Aukeratu kontaktua zerrendan hemen ikusteko.",
+		"LABEL_BIRTHDAY": "Urtebetetzea",
+		"DISPLAY_NAME": "Erakusteko izena",
+		"LAST_NAME": "Abizenak",
+		"FIRST_NAME": "Izena",
+		"MIDDLE_NAME": "Bigarren izena",
+		"NAME_PREFIX": "Aurrizkia",
+		"NAME_SUFFIX": "Atzizkia",
+		"NICK_NAME": "Ezizena",
+		"LABEL_READ_ONLY": "Irakurtzeko bakarrik",
+		"ADD_MENU_LABEL": "Gehitu",
+		"ADD_MENU_NICKNAME": "Ezizena",
+		"ADD_MENU_NOTE": "Iruzkina",
+		"ADD_MENU_PHONE": "Telefonoa",
+		"ADD_MENU_URL": "URL",
+		"ADD_MENU_ADDRESS": "Helbidea",
+		"ADD_MENU_BIRTHDAY": "Urtebetetzea",
+		"ADD_MENU_TAGS": "Etiketak",
+		"BUTTON_SHARE_ALL": "Denak",
+		"BUTTON_SYNC": "Sinkronizazioa (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Bidali kontaktu guztiei"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Erakutsi eremu guztiak",
+		"BUTTON_SEND": "Bidali",
+		"BUTTON_MINIMIZE": "Minimizatu",
+		"SAVED_TIME": "%TIME%-etan gordea",
+		"SAVED_ERROR_ON_SEND": "Mezua bidali da baina ez da gorde bidalitako elementuen karpetan",
+		"DISCARD_UNSAVED_DATA": "Baztertu gorde gabeko datuak?",
+		"ATTACH_FILES": "Erantsi fitxategiak",
+		"ATTACH_DROP_FILES_DESC": "Arrastatu fitxategiak hona",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% idatzia",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Birbidalitako mezua -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Bidalita",
+		"EMPTY_TO_ERROR_DESC": "Gehitu jasotzaile bat gutxienez",
+		"NO_ATTACHMENTS_HERE_DESC": "Ez dago eranskinik hemen.",
+		"ATTACHMENTS_ERROR_DESC": "Kontuz! Eranskin guztiak ez dira kargatu.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Eranskin guztiak ez dira kargatu oraindik.",
+		"ALLOW_SPELLCHECK": "Gaitu nabigatzaileko hizkuntza-zuzentzailea",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatikoki gorde zirriborroa",
+		"BUTTON_REQUEST_READ_RECEIPT": "Eskatu irakurketa-agiria",
+		"BUTTON_MARK_AS_IMPORTANT": "Markatu garrantzitsu gisa",
+		"BUTTON_REQUEST_DSN": "Eskatu jasotze-agiria",
+		"BUTTON_REQUIRE_TLS": "Eskatu entrega segurua",
+		"ERROR_EMPTY_BODY": "Mezua hutsik dago"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Ziur zaude irten nahi duzula?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ziur zaude leiho hau itxi nahi duzula?",
+		"DESC_WANT_DELETE_MESSAGES": "Ziur zaude mezua(k) ezabatu nahi d(it)uzula?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Aukeratu zure hizkuntza"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Gehitu kontua",
+		"BUTTON_ADD_ACCOUNT": "Gehitu",
+		"TITLE_UPDATE_ACCOUNT": "Eguneratu kontua"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Gehitu nortasuna",
+		"TITLE_UPDATE_IDENTITY": "Eguneratu nortasuna",
+		"LABEL": "Etiketa",
+		"BUTTON_ADD_IDENTITY": "Gehitu",
+		"SIGNATURE": "Sinadura",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Txertatu sinadura hau erantzunaren aurretik"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Sortu karpeta",
+		"LABEL_PARENT": "Karpeta gurasoa",
+		"BUTTON_CREATE": "Sortu",
+		"TITLE_CREATING_PROCESS": "Karpeta sortzen"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Ezabatu karpetako mezu guztiak?",
+		"DANGER_DESC_WARNING": "Kontuz!",
+		"DANGER_DESC_HTML_1": "Ekintza honen bidez  <strong>%FOLDER%<\/strong> karpetako mezu guztiak ezabatuko dira.",
+		"DANGER_DESC_HTML_2": "Behin hasita, ekintza hau ezin da gelditu edo utzi.",
+		"TITLE_CLEARING_PROCESS": "Karpeta garbitzen..."
+	},
+	"CRYPTO": {
+		"SIGN": "Sinatu",
+		"ENCRYPT": "Zifratu",
+		"DECRYPT": "Deszifratu",
+		"VERIFY": "Egiaztatu",
+		"GOOD_SIGNATURE": "%USER%-en sinadura egokia",
+		"ERROR": "%TYPE% errorea: %ERROR%",
+		"CREATE_SELF_SIGNED": "Sortu sinadura automatikoa",
+		"VALID_UNTIL": "Noiz arte balio du",
+		"PRIVATE_KEY": "Gako pribatua",
+		"CHANGE_PASS": "Aldatu pasaesaldia",
+		"CURRENT_PASS": "Uneko pasaesaldia",
+		"NEW_PASS": "Pasaesaldi berria",
+		"ASK_CRYPTKEY_PASS": "Saioaren pasahitza aldatu egin da. Bete zure saio-hasierako pasahitz zaharrean deszifratzeko"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Inportatu OpenPGP gakoa",
+		"POPUP_IMPORT_BUTTON": "Inportatu",
+		"POPUP_VIEW_TITLE": "Ikusi OpenPGP gakoa",
+		"POPUP_VIEW_BUTTON": "Aukeratu",
+		"POPUP_GENERATE_TITLE": "Sortu OpenPGP gako parea",
+		"POPUP_GENERATE_BUTTON": "Sortu",
+		"LABEL_KEY_TYPE": "Mota",
+		"SIGNED_MESSAGE": "OpenPGP sinatutako mezua",
+		"ENCRYPTED_MESSAGE": "OpenPGP zifratutako mezua",
+		"STORE_IN_GNUPG": "Zerbitzarian gorden GnuPG-n",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Gorde gako publikoa GnuPGko zerbitzarian",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Gorde gako pribatua GnuPGko zerbitzarian",
+		"BACKUP_ON_SERVER": "Gorde zerbitzarian (zifratuta)",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Gorde gako publikoa zerbitzarian",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Gorde gako pribatua zerbitzarian"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Inportatu S\/MIME ziurtagiria",
+		"CERTIFICATE": "Ziurtagiria",
+		"CERTIFICATES": "S\/MIME ziurtagiria",
+		"SIGNED_MESSAGE": "S\/MIME sinatutako mezua",
+		"ENCRYPTED_MESSAGE": "S\/MIME zifratutako mezua",
+		"PRIVATE_KEY_OF": "S\/MIME %EMAIL%-ren gako pribatua"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Sortu iragazkia",
+		"TITLE_EDIT_FILTER": "Eguneratu iragazkia",
+		"LEGEND_CONDITIONS": "Baldintzak",
+		"LEGEND_ACTIONS": "Ekintzak",
+		"BUTTON_ADD_CONDITION": "Gehitu baldintza",
+		"SELECT_ACTION_MOVE_TO": "Mugitu hona",
+		"SELECT_ACTION_FORWARD_TO": "Birbidali honi",
+		"SELECT_ACTION_REJECT": "Errefusatu",
+		"SELECT_ACTION_VACATION_MESSAGE": "Opor mezua",
+		"SELECT_ACTION_DISCARD": "Baztertu",
+		"SELECT_FIELD_RECIPIENTS": "Hartzaileak (Nori edo CC)",
+		"SELECT_FIELD_HEADER": "Goiburua",
+		"SELECT_FIELD_BODY": "Gorputza",
+		"SELECT_FIELD_SIZE": "Tamaina",
+		"SELECT_TYPE_CONTAINS": "Barnean du",
+		"SELECT_TYPE_NOT_CONTAINS": "Barnean ez du",
+		"SELECT_TYPE_MATCHES": "Bat etortzeak (* eta ? onartzen dira)",
+		"SELECT_TYPE_NOT_MATCHES": "Bat ez etortzeak (* eta ? onartzen dira)",
+		"SELECT_TYPE_REGEXP": "Adierazpen erregularra",
+		"SELECT_TYPE_NOT_REGEXP": "Adierazpen erregularra",
+		"SELECT_TYPE_EQUAL_TO": "Berdina",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Desberdina",
+		"SELECT_TYPE_OVER": "Gainean",
+		"SELECT_TYPE_UNDER": "Azpian",
+		"SELECT_TYPE_TEXT": "Testua",
+		"SELECT_TYPE_RAW": "Gordina",
+		"SELECT_MATCH_ANY": "Bat etortzeak hurrengo EDOZEIN araurekin",
+		"SELECT_MATCH_ALL": "Bat etortzeak hurrengo arau GUZTIEKIN",
+		"MARK_AS_READ_LABEL": "Markatu irakurri bezala",
+		"REPLY_INTERVAL_LABEL": "Erantzuteko tartea (egunak)",
+		"KEEP_LABEL": "Mantenua",
+		"STOP_LABEL": "Utzi arauak gehiago izapidetzeari",
+		"VACATION_SUBJECT_LABEL": "Gaia (hautazkoa)",
+		"VACATION_MESSAGE_LABEL": "Mezua",
+		"VACATION_RECIPIENTS_LABEL": "Hartzaileak (komaz bananduta)",
+		"REJECT_MESSAGE_LABEL": "Errefusatu mezua",
+		"ALL_INCOMING_MESSAGES_DESC": "Iristen diren mezu guztiak"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Sortu scripta",
+		"TITLE_EDIT": "Editatu scripta",
+		"BUTTON_ADD_FILTER": "Gehitu iragazkia",
+		"BUTTON_RAW_SCRIPT": "Erabili erabiltzailearen script pertsonal bat",
+		"CAPABILITY_LABEL": "Gaitasunak",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Aldaketa hauek zerbitzarian gorde behar dira."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Aukeratu sistemaren karpetak",
+		"SELECT_CHOOSE_ONE": "Aukeratu bat",
+		"SELECT_UNUSE_NAME": "Ez erabili",
+		"NOTIFICATION_SENT": "Ez duzu sistemako \"Bidalitakoak\" karpeta hautatu mezuak bidali ondoren bertan ipintzeko.\nBidalitako mezua gorde nahi ez baduzu hautatu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_DRAFTS": "Ez duzu sistemako \"Zirriborroak\"  karpeta hautatu mezuak editatu bitartean gordetzeko.",
+		"NOTIFICATION_SPAM": "Ez duzu sistemako \"Zabor-posta\" karpeta hautatu zabor-mezuak kokatzeko.\nMezu hauek betirako ezabatu nahi badituzu, aukeratu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_TRASH": "Ez duzu sistemako \"Zakarrontzia\" karpeta hautatu zabor-mezuak kokatzeko.\nMezu hauek betirako ezabatu nahi badituzu, aukeratu \"Ez erabili\" aukera.\n",
+		"NOTIFICATION_ARCHIVE": "Ez duzu sistemako \"Artxiboa\" karpeta hautatu artxibatutako mezuak gordetzeko."
+	},
+	"TITLES": {
+		"MAILBOX": "Sarrera-ontzia",
+		"SETTINGS": "Ezarpenak"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Fitxategia handiegia da",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Fitxategia partzialki kargatu da errore ezezagun batengatik",
+		"ERROR_NO_FILE_UPLOADED": "Ez da fitxategirik kargatu",
+		"ERROR_MISSING_TEMP_FOLDER": "Fitxategi tenporala falta da",
+		"ERROR_ON_SAVING_FILE": "Fitxategi-kargako errore ezezagun bat gertatu da",
+		"ERROR_FILE_TYPE": "Fitxategi-mota ez baliozkoa",
+		"ERROR_UNKNOWN": "Fitxategi-kargako errore ezezagun bat gertatu da"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TESTUA",
+		"SOURCE": "HTML <-> JATORRIA",
+		"FONTFAMILY": "Letra mota",
+		"FONTSIZE": "Letra tamaina",
+		"DIR": "Testuaren noranzkoa",
+		"DIR_LTR": "Eskerretik eskuinera",
+		"DIR_RTL": "Eskuinetik eskerrera",
+		"DIR_AUTO": "Automatikoa",
+		"TEXTCOLOR": "Testuaren kolorea",
+		"BACKGROUNDCOLOR": "Atzeko planoaren kolorea",
+		"BOLD": "Lodia",
+		"ITALIC": "Etzana",
+		"UNDERLINE": "Azpimarratua",
+		"STRIKE": "Marratua",
+		"SUB": "Azpi-indizea",
+		"SUP": "Goi-indizea",
+		"OL": "Zerrenda ordenatua",
+		"UL": "Ordenik gabeko zerrenda",
+		"QUOTE": "Aipua",
+		"INDENTDECREASE": "Txikitu koska",
+		"INDENTINCREASE": "Handitu koska",
+		"LINK": "Esteka",
+		"IMAGEURL": "Irudiaren URLa",
+		"IMAGEUPLOAD": "Aukeratu irudia",
+		"UNDO": "Desegin",
+		"REDO": "Berregin",
+		"REMOVESTYLE": "Kendu estiloa"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Orokorra",
+		"CONTACTS": "Kontaktuak",
+		"FOLDERS": "Karpetak",
+		"ACCOUNTS": "Kontuak",
+		"FILTERS": "Iragazkiak",
+		"SECURITY": "Segurtasuna",
+		"THEMES": "Itxurak"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Arrunta",
+		"ADVANCED": "Aurretatua",
+		"BUTTON_ADD_SCRIPT": "Gehitu scripta",
+		"SUBNAME_MOVE_TO": "Mugitu \"%FOLDER%\"-era",
+		"SUBNAME_FORWARD_TO": "Birbidali \"%EMAIL%\"-era",
+		"SUBNAME_REJECT": "Errefusatu",
+		"SUBNAME_VACATION_MESSAGE": "Opor-mezua",
+		"SUBNAME_DISCARD": "Baztertu"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Segurtasuna",
+		"LABEL_AUTOLOGOUT": "Saioa automatikoki itxi",
+		"FORGET_KEY_PASS": "Ahaztu gako pribatuaren pasaesaldia",
+		"NEVER": "Inoiz ez"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Hizkuntza",
+		"HOUR_FORMAT": "Ordu-formatua",
+		"IDENTITY": "Nortasuna",
+		"LAYOUT": "Diseinua",
+		"LAYOUT_NO_SPLIT": "Zatitu gabe",
+		"LAYOUT_VERTICAL_SPLIT": "Zatiketa bertikala",
+		"LAYOUT_HORIZONTAL_SPLIT": "Zatiketa horizontala",
+		"SHOW_NEXT_MESSAGE": "Erakutsi hurrengo mezua unekoa mugitu edo ezabatzean",
+		"EDITOR": "Berezko testu editorea",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Formaturik gabea",
+		"VIEW_OPTIONS": "Ikusteko aukerak",
+		"USE_PREVIEW_PANE": "Erabili aurreikusteko panela",
+		"HIDE_DELETED_MESSAGES": "Ezkutatu ezabatzeko markatutako mezuak",
+		"USE_CHECKBOXES_IN_LIST": "Bistaratu kontrol laukiak zerrendan",
+		"USE_THREADS": "Erabili hariak",
+		"THREAD_ALGORITHM": "Harien algoritmoa",
+		"REPLY_SAME_FOLDER": "Kokatu erantzunak erantzundako mezuaren karpeta berean",
+		"PREFER_HTML": "Lehenetsi HTMLa testu arruntari",
+		"PREFER_HTML_INFO": "Mezuak batzuetan bi formatuetan datoz. Aukera honekin HTML edo testu arrunt partea erakustea aukera dezakezu.",
+		"REMOVE_COLORS": "Kendu atzealdeko irudia eta testuaren kolorean mezuaren gorputzetik",
+		"ALLOW_STYLES": "Gaitu <style> CSS",
+		"MESSAGE_PER_PAGE": "Orrialdeko mezuak",
+		"CHECK_MAIL_INTERVAL": "Posta begiratzeko tartea",
+		"MARK_MESSAGE_READ_AFTER": "Markatu mezua irakurrita ondoren",
+		"MSG_DEFAULT_ACTION": "Lehenetsitako ekintza",
+		"SECONDS": "segundo",
+		"MINUTES": "minutu",
+		"NOTIFICATIONS": "Jakinarazpenak",
+		"SOUND_NOTIFICATION": "Soinu-jakinarazpena",
+		"CHROME_NOTIFICATION_DESC": "Erakutsi mezu berrien jakinarazpen popup-ak",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Nabigatzaileak blokeatuta)",
+		"COLLAPSE_BLOCKQUOTES": "Bildu aipuko testua",
+		"MAX_QUOTE_LEVEL": "Ageriko aipamen-maila maximoak",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Erakutsi sareko eranskinak zerrendan",
+		"LIST_SIMPLE_ATTACHMENTS": "Eranskinen zerrenda arrunta",
+		"LIST_MESSAGES_GROUPED": "Zerrendatu mezuak taldekatuak (ordena jatorria edo data denean)",
+		"EXTERNAL_IMAGES": "Kanpoko irudiak",
+		"IMAGES_OPTION_ASK": "Galdetu beti",
+		"IMAGES_OPTION_WHITELIST": "Zerrenda zuria edo galdetu",
+		"IMAGES_OPTION_ALWAYS": "Erakutsi bete",
+		"IMAGES_WHITELIST": "Irudien zerrenda zuria",
+		"MESSAGE_POPUP_WINDOW": "Agertu popup-ean fitxa berrian ordez",
+		"MAILTO": "Erregistratu 'mailto:' esteken kudeatzaile gisa",
+		"HTML_TO_MD": "Bihurtu HTML Markdown-era formaturik gabeko testuraren ordez"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Automatikoki gehitu hartzaileak helbide-liburura",
+		"LEGEND_CONTACTS_SYNC": "Urruneko Sinkronizazioa (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Gaitu urruneko sinkronizazioa",
+		"LABEL_CONTACTS_SYNC_SERVER": "Zerbitzaria",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Helbide-liburuaren URL-a",
+		"LABEL_CONTACTS_SYNC_USER": "Erabiltzailea",
+		"SYNC_READ": "Irakurtzeko soilik"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Gaiak",
+		"LABEL_BACKGROUND": "Atzealdeko irudiak",
+		"LABEL_FONTS": "Letra-tipoak",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Kargatu atzealdeko irudia (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Fitxategia handiegia da",
+		"ERROR_FILE_TYPE_ERROR": "Ez-baliozko fitxategi-mota (JPG eta PNG soilik)",
+		"ERROR_UNKNOWN": "Fitxategi-karga errore ezezagun bat gertatu da"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Karpeta Zerrenda",
+		"BUTTON_CREATE": "Sortu Karpeta",
+		"BUTTON_SYSTEM": "Sistemak Karpetak",
+		"BUTTON_SUBSCRIBE": "Harpidetu",
+		"BUTTON_UNSUBSCRIBE": "Harpidetza kendu",
+		"LOADING_PROCESS": "Karpeta zerrenda eguneratzen",
+		"CREATING_PROCESS": "Karpeta sortzen",
+		"DELETING_PROCESS": "Karpeta ezabatzen",
+		"RENAMING_PROCESS": "Karpeta berrizendatzen",
+		"TO_MANY_FOLDERS_DESC_1": "Karpeta gehiegi dituzu!",
+		"TO_MANY_FOLDERS_DESC_2": "Beraien zati bat bakarrik erakutsi dugu, errendimendu arazoak saihesteko.",
+		"HELP_DELETE_FOLDER": "Ezabatu karpeta",
+		"HELP_SHOW_HIDE_FOLDER": "Erakutsi\/ezkutatu karpeta",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Bilatu mezu berriak",
+		"HIDE_UNSUBSCRIBED": "Ezkutatu harpidetzik gabeko karpetak",
+		"UNHIDE_KOLAB_FOLDERS": "Erakutsi Kolab karpetak",
+		"TYPE_CALENDAR": "Egutegia",
+		"TYPE_CONFIGURATION": "Ezarpenak",
+		"TYPE_CONTACTS": "Kontaktuak",
+		"TYPE_FILES": "Fitxategiak",
+		"TYPE_JOURNAL": "Egunerokoa",
+		"TYPE_NOTES": "Oharrak",
+		"TYPE_TASKS": "Atazak"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Kontuak",
+		"LEGEND_IDENTITIES": "Nortasunak",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Kontuak eta Nortasunak",
+		"BUTTON_ADD_ACCOUNT": "Gehitu kontu bat",
+		"BUTTON_ADD_IDENTITY": "Gehitu identitate bat",
+		"LOADING_PROCESS": "Eguneratzen...",
+		"SHOW_UNREAD": "Erakutsi irakurri gabeko mezuen kopurua"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Inportatu Gakoa",
+		"BUTTON_GENERATE_KEY_PAIR": "Sortu Gako Parea",
+		"IMPORT_FROM_SERVER": "Inportatu zerbitzaritik",
+		"TITLE_PRIVATE": "Pribatua",
+		"TITLE_PUBLIC": "Publikoa",
+		"GET_MAILVELOPE": "Lortu Mailvelope nabigatzaileko gehigarria."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Laster-teklen laguntza",
+		"TAB_MAILBOX": "Sarrera-ontzia",
+		"TAB_MESSAGE_LIST": "Mezuen zerrenda",
+		"TAB_MESSAGE_VIEW": "Mezuen ikuspegia",
+		"TAB_COMPOSE": "Prestatu",
+		"LABEL_OPEN_USER_DROPDOWN": "Ireki erabiltzailearen goitibeherako menua",
+		"LABEL_REPLY": "Erantzun",
+		"LABEL_REPLY_ALL": "Erantzun Denei",
+		"LABEL_FORWARD": "Birbidali",
+		"LABEL_FORWARD_MULTIPLY": "Birbidali eranskin moduan",
+		"LABEL_CHECK_ALL": "Aukeratu mezu guztiak",
+		"LABEL_DELETE": "Ezabatu",
+		"LABEL_OPEN_THREAD": "Ireki aukeratutako haria",
+		"LABEL_MOVE": "Mugitu",
+		"LABEL_READ": "Irakurri aukeratutako mezuak",
+		"LABEL_UNREAD": "Ez irakurri aukeratutako mezuak",
+		"LABEL_IMPORTANT": "Garrantzitsua, markatu aukeratutako mezuak",
+		"LABEL_CANCEL_SEARCH": "Ezeztatu bilaketa",
+		"LABEL_FULLSCREEN_ENTER": "Pantaila osoa (aurrebista panelaarekin)",
+		"LABEL_VIEW_MESSAGE_ENTER": "Ikusi mezua (aurrebista panelik gabe)",
+		"LABEL_SWITCH_TO_MESSAGE": "Fokuratu hautatutako mezua",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Fokuratu hautatutako mezua",
+		"LABEL_FULLSCREEN_TOGGLE": "Aldatu pantaila osoko modua",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Aldatu mezuen aipuak",
+		"LABEL_THREAD_NEXT": "Hariko hurrengo mezua",
+		"LABEL_THREAD_PREV": "Hariko aurreko mezua",
+		"LABEL_EXIT_FULLSCREEN": "Irten pantaila osoko modutik",
+		"LABEL_CLOSE_MESSAGE": "Itxi mezua (aurrebista panelik gabe)",
+		"LABEL_SWITCH_TO_LIST": "Itzuli fokua mezuen zerrendara",
+		"LABEL_OPEN_COMPOSE_POPUP": "Ireki prestatzeko popup-a",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Txikitu prestatzeko popup-a",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Ireki identitateen goitibeherako menua",
+		"LABEL_SAVE_MESSAGE": "Gorde mezua",
+		"LABEL_SEND_MESSAGE": "Bidali mezua",
+		"LABEL_CLOSE_COMPOSE": "Itxi mezua"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Eskaerak huts egin du",
+		"RequestAborted": "Eskaera bertan behera utzi da",
+		"RequestTimeout": "Eskaera denboraz kantpo",
+		"InvalidToken": "Ez-baliozko tokena",
+		"AuthError": "Autentikazio errorea",
+		"ConnectionError": "Ezin da zerbitzarira konektatu",
+		"DomainAlreadyExists": "Domeinua jadanik existitzen da",
+		"DomainNotAllowed": "Domeinu ez baimendua",
+		"AccountNotAllowed": "Kontu ez baimendua",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kontaktu sinkronizazio errorea",
+		"CantGetMessageList": "Ezin da mezuen zerrenda eskuratu",
+		"CantGetMessage": "Ezin da mezua eskuratu",
+		"CantDeleteMessage": "Ezin da mezua ezabatu",
+		"CantCopyMessage": "Ezin da mezua kopiatu",
+		"CantMoveMessage": "Ezin da mezua mugitu",
+		"CantSaveMessage": "Ezin da mezua gorde",
+		"CantSendMessage": "Ezin da mezua bidali",
+		"InvalidRecipients": "Ez-baliozko hartzaileak",
+		"CantSaveFilters": "Ezin dira iragazkiak gorde",
+		"CantGetFilters": "Ezin dira iragazkiak eskuratu",
+		"CantActivateFiltersScript": "Ezin dira iragazki-scriptak aktibatu",
+		"CantDeleteFiltersScript": "Ezin dira iragazki-scriptak ezabatu",
+		"FiltersAreNotCorrect": "Iragazkiak ez dira zuzenak",
+		"CantCreateFolder": "Ezin da karpeta sortu",
+		"CantRenameFolder": "Ezin da karpeta berrizendatu",
+		"CantDeleteFolder": "Ezin da karpeta ezabatu",
+		"CantDeleteNonEmptyFolder": "Ezin da hutsi ez dagoen direktorioa ezabatu",
+		"CantSubscribeFolder": "Ezin da karpetara harpidetu",
+		"CantUnsubscribeFolder": "Ezin da karpetatik harpidetza kendu",
+		"DemoSendMessageError": "Segurtasunagatik, kontua honek ezin du kanpoko e-mail helbideetara mezurik bidali!",
+		"DemoAccountError": "Segurtasunagatik, kontu hau ez dago ahalbideratuta ekintza honetarako!",
+		"AccountAlreadyExists": "Kontua jada existitzen da",
+		"AccountDoesNotExist": "Kontua ez da existitzen",
+		"AccountSwitchFailed": "\"%EMAIL%\" kontura aldaketak akatsa eman du",
+		"MailServerError": "Errore bat gertatu da posta zebritzarira sartzean",
+		"InvalidInputArgument": "Ez-naliozko sarrera-argumentua",
+		"UnknownError": "Errore ezezaguna"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json b/snappymail/v/0.0.0/app/localization/fa/admin.json
similarity index 74%
rename from snappymail/v/0.0.0/app/localization/fa-IR/admin.json
rename to snappymail/v/0.0.0/app/localization/fa/admin.json
index e48ecfa91..71bdcf7e0 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fa/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "اضافه‌کردن",
+		"CLOSE": "بستن",
 		"SAVE": "ذخیره",
-		"UPDATE": "بروزرسانی"
+		"TEST": "تست",
+		"UPDATE": "بروزرسانی",
+		"USERNAME": "نام کاربری",
+		"PASSWORD": "گذرواژه",
+		"CANCEL": "انصراف",
+		"SEARCH": "هیچ تماسی پیدا نشد",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ورود",
-		"LABEL_PASSWORD": "گذرواژه",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "ورود به صفحه مدیریت"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "صفحه مدیریت"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "عمومی",
-		"LABEL_LOGIN_NAME": "ورود",
-		"LABEL_BRANDING_NAME": "برندسازی",
-		"LABEL_CONTACTS_NAME": "تماس‌ها",
-		"LABEL_DOMAINS_NAME": "دامنه‌ها",
-		"LABEL_SECURITY_NAME": "امنیت",
-		"LABEL_PACKAGES_NAME": "بسته‌ها",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "درباره"
+		"GENERAL": "عمومی",
+		"LOGIN": "ورود",
+		"BRANDING": "برندسازی",
+		"CONTACTS": "تماس‌ها",
+		"DOMAINS": "دامنه‌ها",
+		"SECURITY": "امنیت",
+		"PACKAGES": "بسته‌ها",
+		"CONFIG": "Config",
+		"ABOUT": "درباره"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "رابط",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "زبان در صفحه تنظیمات قابل انتخاب باشد",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "پوسته در صفحه تنظیمات قابل انتخاب باشد",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "تصویر پشت زمینه در صفحه تنظیمات قابل انتخاب باشد",
-		"LABEL_NEW_FOLDER_MOVE": "دکمه جدید «انتقال به پوشه»",
 		"LABEL_SHOW_THUMBNAILS": "اندازه کوچک را نشان بده (پیوست‌ها)",
 		"LEGEND_MAIN": "اصلی",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "محدودیت اندازه پیوست",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "دامنه پیش‌فرض",
 		"LABEL_DETERMINE_USER_DOMAIN": "برای تشخیص دامنه کاربر تلاش شود",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "انتخاب زبان در صفحه ورود",
-		"LABEL_DETERMINE_USER_LANGUAGE": "برای تشخیص زبان کاربر تلاش شود",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "برای تشخیص زبان کاربر تلاش شود"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "برندسازی",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "کاربر",
 		"LABEL_STORAGE_PASSWORD": "گذرواژه",
-		"BUTTON_TEST": "تست",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "توجه!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "از این پایگاه داده برای کاربران زیاد استفاده نکنید.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "سیستم از تماس‌ها پشتیبانی نمی‌کند\n<br>\nشما باید افزونه <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> را نصب کنید یا اینکه فعال کنید.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "امنیت",
 		"LABEL_USE_IMAGE_PROXY": "از پروکسی محلی برای عکسهای خارج از سرور استفاده شود",
-		"LABEL_ALLOW_OPEN_PGP": "فعال‌سازی OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "نمایش اطلاعات PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "اعتبار مجوز دسترسی به صفحه مدیریت",
 		"LABEL_CURRENT_PASSWORD": "گذرواژه فعلی",
-		"LABEL_NEW_LOGIN": "نام کاربری جدید",
 		"LABEL_NEW_PASSWORD": "گذرواژه جدید",
 		"LABEL_REPEAT_PASSWORD": "تکرار",
-		"BUTTON_UPDATE_PASSWORD": "بروز‌رسانی گذرواژه",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "به بررسی گواهینامه SSL نیاز داشته باشد (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "به بررسی گواهینامه SSL نیاز داشته باشد",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "به گواهی‌نامه‌هایی که توسط خودشان امضاء شده‌اند اجازه بده"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "یک رابط کاربری پست الکترونیک ساده، پیشرفته و سریع",
 		"LABEL_ALL_RIGHTS_RESERVED": "همه حقوق محفوظ هست",
 		"HINT_READ_CHANGE_LOG": "فایل وقایع را قبل از بروزرسانی بخوانید.",
-		"HINT_IS_UP_TO_DATE": "RainLoop بروز هست",
+		"HINT_IS_UP_TO_DATE": "SnappyMail بروز هست",
 		"HTML_NEW_VERSION": "نسخه <b>%VERSION%<\/b>  در دسترس هست",
 		"LABEL_UPDATING": "در حال بروزرسانی",
 		"LABEL_CHECKING": "چک کردن برای بروزرسانی",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "اضافه کردن نام مستعار",
 		"LABEL_ALIAS": "مستعار",
-		"LABEL_DOMAIN": "دامنه",
-		"BUTTON_CLOSE": "بستن",
-		"BUTTON_ADD": "اضافه‌کردن"
+		"LABEL_DOMAIN": "دامنه"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "اضافه‌کردن دامنه",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "ویرایش دامنه \"%NAME%\"",
 		"LABEL_NAME": "نام",
 		"NAME_HELPER": "پشتیبانی از wildcard",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "سرور",
 		"LABEL_PORT": "پورت",
 		"LABEL_SECURE": "امن",
-		"LABEL_WHITE_LIST": "لیست سفید",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "هیچ‌کدام",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "اجازه به اجرا‌شونده‌های sieve",
 		"LABEL_USE_SHORT_LOGIN": "استفاده از ورود کوتاه بدون دامنه",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "استفاده از احراز هویت",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "استفاده از تابع mail() زبان PHP",
-		"BUTTON_TEST": "تست",
 		"BUTTON_WHITE_LIST": "لیست سفید",
-		"BUTTON_SIEVE_CONFIGURATION": "پیکربندی Sieve",
-		"BUTTON_BACK_TO_IMAP": "برگشت به تنظیمات IMAP",
-		"BUTTON_BACK": "برگشت",
-		"BUTTON_CLOSE": "بستن",
-		"BUTTON_ADD": "اضافه‌کردن",
-		"BUTTON_UPDATE": "بروزرسانی",
-		"NEW_DOMAIN_DESC": "این تنظیمات دامنه به شما اجازه کار کردن <br>با پست الکترونیک <i>%NAME%<\/i> را می‌دهد.",
-		"WHITE_LIST_ALERT": "لیستی از دامنه‌ها که کاربران وب‌میل می‌توانند به آنها دسترسی داشته باشند.\nاز فاصله جهت جدا کردن استفاده کنید.\n"
+		"NEW_DOMAIN_DESC": "این تنظیمات دامنه به شما اجازه کار کردن با پست الکترونیک <strong>%NAME%<\/strong> را می‌دهد.",
+		"WHITE_LIST_ALERT": "لیستی از دامنه‌ها که کاربران وب‌میل می‌توانند به آنها دسترسی داشته باشند.\nاز فاصله جهت جدا کردن استفاده کنید.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "افزونه",
-		"DESC_NOTHING_TO_CONFIGURE": "چیزی برای پیکربندی نیست",
-		"BUTTON_CLOSE": "بستن"
+		"DESC_NOTHING_TO_CONFIGURE": "چیزی برای پیکربندی نیست"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "آیا شما از بستن این پنجره اطمینان دارید؟"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "آزمایشی",
-		"UNSTABLE": "ناپایدار",
 		"WARNING": "هشدار!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "خطای نامشخص"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "توکن نامعتبر",
-		"AUTH_ERROR": "احراز هویت انجام نشد",
-		"DOMAIN_ALREADY_EXISTS": "دامنه در حال حاضر موجود است",
-		"CANT_SAVE_PLUGIN_SETTINGS": "امکان ذخیره تنظیمات نیست",
-		"CANT_INSTALL_PACKAGE": "نصب بسته با خطا همراه بود",
-		"CANT_DELETE_PACKAGE": "حذف بسته با خطا همراه بو",
-		"INVALID_PLUGIN_PACKAGE": "بسته افزونه نامعتبر است",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "بسته افزونه پشتیبانی نمی‌شود",
-		"UNKNOWN_ERROR": "خطای نامشخص"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "توکن نامعتبر",
+		"AuthError": "احراز هویت انجام نشد",
+		"DomainAlreadyExists": "دامنه در حال حاضر موجود است",
+		"CantSavePluginSettings": "امکان ذخیره تنظیمات نیست",
+		"CantInstallPackage": "نصب بسته با خطا همراه بود",
+		"CantDeletePackage": "حذف بسته با خطا همراه بو",
+		"InvalidPluginPackage": "بسته افزونه نامعتبر است",
+		"UnsupportedPluginPackage": "بسته افزونه پشتیبانی نمی‌شود",
+		"UnknownError": "خطای نامشخص"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/fa/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fa-IR/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/fa/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/static.json b/snappymail/v/0.0.0/app/localization/fa/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fa-IR/static.json
rename to snappymail/v/0.0.0/app/localization/fa/static.json
diff --git a/snappymail/v/0.0.0/app/localization/fa-IR/user.json b/snappymail/v/0.0.0/app/localization/fa/user.json
similarity index 63%
rename from snappymail/v/0.0.0/app/localization/fa-IR/user.json
rename to snappymail/v/0.0.0/app/localization/fa/user.json
index a81dff528..3888bc47c 100644
--- a/snappymail/v/0.0.0/app/localization/fa-IR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fa/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "rtl",
 	"GLOBAL": {
 		"TO_ARCHIVE": "بایگانی",
 		"ARE_YOU_SURE": "اطمینان دارید؟",
@@ -10,6 +11,7 @@
 		"CLOSE": "بستن (Esc)",
 		"CONTACTS": "تماس‌ها",
 		"DELETE": "حذف",
+		"UNDELETE": "Undelete",
 		"DONE": "انجام شد",
 		"EMAIL": "پست الکترونیک",
 		"FROM": "از",
@@ -17,17 +19,30 @@
 		"LOGOUT": "خروج",
 		"MORE": "بیشتر",
 		"MOVE_TO": "انتقال به",
+		"COPY_TO": "کپی به",
 		"NAME": "صندوق ورودی",
 		"NONE": "هیچ‌کدام",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "هرزنامه نیست",
+		"USERNAME": "نام کاربری",
 		"PASSWORD": "گذرواژه",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "پاسخ به",
 		"SAVE": "ذخیره کن",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "هیچ تماسی پیدا نشد",
 		"SPAM": "هرزنامه",
 		"SUBJECT": "موضوع",
 		"TEST": "تست",
-		"TO": "به"
+		"TO": "به",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "بلی",
+		"NO": "خیر",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "پیش‌فرض",
+		"HELP": "راهنما",
+		"TEXT": "متن",
+		"ATTACHMENTS": "پیوست‌ها"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ورود",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "ورود"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "ساخت کاربر",
-		"BUTTON_SETTINGS": "تنظیمات",
-		"BUTTON_HELP": "راهنما"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "نسخه موبایل",
-		"BUTTON_DESKTOP_VERSION": "نسخه رومیزی"
+		"BUTTON_ADD_ACCOUNT": "ساخت کاربر"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "جستجوی پیشرفته",
-		"LABEL_ADV_TEXT": "متن",
-		"LABEL_ADV_HAS_ATTACHMENT": "داشتن پیوست",
-		"LABEL_ADV_HAS_ATTACHMENTS": "داشتن پیوست‌ها",
-		"LABEL_ADV_FLAGGED": "پرچم",
-		"LABEL_ADV_UNSEEN": "خوانده نشده",
-		"LABEL_ADV_DATE": "تاریخ",
-		"LABEL_ADV_DATE_ALL": "همه",
-		"LABEL_ADV_DATE_3_DAYS": "تا 3 روز گذشته",
-		"LABEL_ADV_DATE_7_DAYS": "تا 1 هفته گذشته",
-		"LABEL_ADV_DATE_MONTH": "تا 1 ماه گذشته",
-		"LABEL_ADV_DATE_3_MONTHS": "تا 3 ماه گذشته",
-		"LABEL_ADV_DATE_6_MONTHS": "تا 6 ماه گذشته",
-		"LABEL_ADV_DATE_YEAR": "تا 1 سال گذشته",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "ضامن تمام صفحه",
-		"ZOOM": "بزرگنمایی داخل\/بیرون",
-		"CLOSE": "بستن (Esc)",
-		"GALLERY_PREV": "قبلی (جهت چپ)",
-		"GALLERY_NEXT": "بعدی (جهت راست)",
-		"GALLERY_COUNTER": "%curr% از %total%"
+		"TEXT": "متن",
+		"HAS_ATTACHMENT": "داشتن پیوست",
+		"FLAGGED": "پرچم",
+		"UNSEEN": "خوانده نشده",
+		"DATE": "تاریخ",
+		"DATE_ALL": "همه",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "تا 3 روز گذشته",
+		"SINCE_7_DAYS": "تا 1 هفته گذشته",
+		"SINCE_MONTH": "تا 1 ماه گذشته",
+		"SINCE_3_MONTHS": "تا 3 ماه گذشته",
+		"SINCE_6_MONTHS": "تا 6 ماه گذشته",
+		"SINCE_YEAR": "تا 1 سال گذشته",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "جواب داد",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "ایجاد",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "سطل آشغال",
 		"ARCHIVE_NAME": "بایگانی"
 	},
-	"QUOTA": {
-		"TITLE": "سهمیه استفاده شده"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "بازنگری لیست پیام‌ها",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "خوانده",
 		"MENU_SELECT_FLAGGED": "پرچم‌دار کردن",
 		"MENU_SELECT_UNFLAGGED": "پرچم‌دار نشده",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "فهرست خالی",
 		"EMPTY_SEARCH_LIST": "پیامی مطابق جستجوی شما پیدا نشد",
 		"SEARCH_RESULT_FOR": "نتایج جستجو مطابق \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "برگشت به لیست پیام‌ها",
-		"EMPTY_SUBJECT_TEXT": "(بدون موضوع)",
 		"PUT_MESSAGE_HERE": "برای دیدن پیام در این لیست آن را به اینجا بکشید",
 		"TODAY_AT": "امروز در %TIME%",
 		"YESTERDAY_AT": " دیروز در %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "شما تعداد %COUNT%  پیام جدید دارید!",
 		"QUOTA_SIZE": "استفاده <strong>%SIZE% (%PROC%%)<\/strong> از<strong>%LIMIT%<\/strong> برای شما",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "نمایش منبع",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "دریافت با پسوند eml.",
 		"MENU_FILTER_SIMILAR": " فیلتر کردن پیام‌های مشابه",
 		"MENU_PRINT": "چاپ",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "بر روی نام شاخه در پنل سمت راست جهت انتخاب مقصد کلیک کنید",
 		"LINK_DOWNLOAD_AS_ZIP": "دریافت با پسوند zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "برگرداندن گیرنده (نمایش داده شد) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "در حال جستجو..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "اضافه‌کردن تماس",
 		"BUTTON_CREATE_CONTACT": "ایجاد",
-		"BUTTON_UPDATE_CONTACT": "بروزرسانی",
 		"BUTTON_IMPORT": "وارد کردن(csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "صدور (csv, vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "صدور (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "هیچ تماسی پیدا نشد",
 		"CLEAR_SEARCH": "پاک‌کردن جستجو",
 		"CONTACT_VIEW_DESC": "تماس مورد نظر در لیست را جهت مشاهده، انتخاب کنید.",
-		"LABEL_PHONE": "تلفن",
-		"LABEL_WEB": "تارنما",
 		"LABEL_BIRTHDAY": "تاریخ تولد",
-		"LINK_ADD_EMAIL": "اضافه کردن آدرس پست الکترونیک",
-		"LINK_ADD_PHONE": "اضافه کردن تلفن",
-		"LINK_BIRTHDAY": "تاریخ تولد",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "ورود نام",
-		"PLACEHOLDER_ENTER_LAST_NAME": "ورود نام خانوادگی",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "ورود نام",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ورود نام مستعار",
+		"DISPLAY_NAME": "نام",
+		"LAST_NAME": "نام خانوادگی",
+		"FIRST_NAME": "نام",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "نام مستعار",
 		"LABEL_READ_ONLY": "فقط خواندنی",
-		"LABEL_SHARE": "اشتراک‌گذاری",
 		"ADD_MENU_LABEL": "اضافه‌کردن",
 		"ADD_MENU_NICKNAME": "نام مستعار",
-		"ADD_MENU_NOTES": "یادداشت‌ها",
+		"ADD_MENU_NOTE": "یادداشت‌ها",
 		"ADD_MENU_PHONE": "تلفن",
 		"ADD_MENU_URL": "تارنما",
 		"ADD_MENU_ADDRESS": "آدرس",
 		"ADD_MENU_BIRTHDAY": "تاریخ تولد",
 		"ADD_MENU_TAGS": "برچسب",
 		"BUTTON_SHARE_ALL": "هرکسی",
-		"BUTTON_SYNC": "همگام‌سازی (CardDAV)"
+		"BUTTON_SYNC": "همگام‌سازی (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "نمایش همه فیلدها",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "هیچ پیوستی اینجا وجود ندارد.",
 		"ATTACHMENTS_ERROR_DESC": "اخطار! همه پیوست‌ها هنوز بارگذاری نشده است.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "همه پیوست‌ها هنوز بارگذاری نشده است.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس",
 		"BUTTON_REQUEST_READ_RECEIPT": "درخواست دریافت رسید خواندن",
 		"BUTTON_MARK_AS_IMPORTANT": "علامت زدن به عنوان مهم",
-		"BUTTON_REQUEST_DSN": "درخواست دریافت رسید تحویل درمقصد"
+		"BUTTON_REQUEST_DSN": "درخواست دریافت رسید تحویل درمقصد",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "بلی",
-		"BUTTON_NO": "خیر",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "آیا از بستن این پنجره مطمئن هستید؟",
 		"DESC_WANT_DELETE_MESSAGES": "آیا از حذف این پیام(ها) اطمینان دارید؟"
 	},
@@ -224,16 +271,16 @@
 		"TITLE_LANGUAGES": "زبان خود را انتخاب کنید"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "اضافه کردن کاربر؟",
+		"TITLE_ADD_ACCOUNT": "اضافه کردن کاربر",
 		"BUTTON_ADD_ACCOUNT": "اضافه کردن",
-		"TITLE_UPDATE_ACCOUNT": "بروزرسانی کاربر؟",
-		"BUTTON_UPDATE_ACCOUNT": "بروزرسانی"
+		"TITLE_UPDATE_ACCOUNT": "بروزرسانی کاربر"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "اضافه کردن هویت؟",
-		"TITLE_UPDATE_IDENTITY": "بروزرسانی هویت؟",
+		"TITLE_ADD_IDENTITY": "اضافه کردن هویت",
+		"TITLE_UPDATE_IDENTITY": "بروزرسانی هویت",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "اضافه‌کردن",
-		"BUTTON_UPDATE_IDENTITY": "بروزرسانی",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "قراردادن امضاء‌ قبل از متن مشخص شده در جواب"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "زمانی که این عملیات شروع شود قابل لغو یا انصراف نیست.",
 		"TITLE_CLEARING_PROCESS": "خالی کردن شاخه..."
 	},
+	"CRYPTO": {
+		"SIGN": "امضاء",
+		"ENCRYPT": "رمزنگاری",
+		"DECRYPT": "رمزگشایی",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "امضای صحیح از %USER%",
+		"ERROR": "خطای %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "واردکردن کلید OpenPGP",
 		"POPUP_IMPORT_BUTTON": "وارد‌کردن",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "تولید کلید‌های OpenPGP",
 		"POPUP_GENERATE_BUTTON": "تولید",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "امضاء",
-		"LABEL_ENCRYPT": "رمزنگاری",
-		"BUTTON_DECRYPT": "رمزگشایی",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "پیام توسط  OpenPGP امضاء شد",
 		"ENCRYPTED_MESSAGE": "پیام توسط  OpenPGP رمزنگاری شد",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "امضای صحیح از %USER%",
-		"ERROR": "خطای OpenPGP: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "پیام توسط  S\/MIME امضاء شد",
+		"ENCRYPTED_MESSAGE": "پیام توسط  S\/MIME رمزنگاری شد",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "یک فیلتر ایجاد شود؟",
-		"TITLE_EDIT_FILTER": "بروزرسانی فیلتر؟",
+		"TITLE_CREATE_FILTER": "یک فیلتر ایجاد شود",
+		"TITLE_EDIT_FILTER": "بروزرسانی فیلتر",
 		"LEGEND_CONDITIONS": "شرایط",
 		"LEGEND_ACTIONS": "عملیات",
 		"BUTTON_ADD_CONDITION": "اضافه کردن یک شرط",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "علامت بعنوان خوانده شده",
 		"REPLY_INTERVAL_LABEL": "دوره جواب (بر پایه روز)",
 		"KEEP_LABEL": "نگه‌داشتن",
-		"STOP_LABEL": "پردازش قوانین را متوقف نکن",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "موضوع (اختیاری)",
 		"VACATION_MESSAGE_LABEL": "پیام",
 		"VACATION_RECIPIENTS_LABEL": "گیرندگان (جداسازی با , )",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "یک خطای نامشخص در بارگذاری فایل روی داده است"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "شخصی",
-		"LABEL_GENERAL_NAME": "عمومی",
-		"LABEL_CONTACTS_NAME": "تماس‌ها",
-		"LABEL_FOLDERS_NAME": "پوشه‌ها",
-		"LABEL_ACCOUNTS_NAME": "حساب‌های کاربری",
-		"LABEL_FILTERS_NAME": "فیلترها",
-		"LABEL_SECURITY_NAME": "امنیت",
-		"LABEL_THEMES_NAME": "پوسته‌ها"
+		"GENERAL": "عمومی",
+		"CONTACTS": "تماس‌ها",
+		"FOLDERS": "پوشه‌ها",
+		"ACCOUNTS": "حساب‌های کاربری",
+		"FILTERS": "فیلترها",
+		"SECURITY": "امنیت",
+		"THEMES": "پوسته‌ها"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "فیلترها",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "انتقال به \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "ارسال به \"%EMAIL%\"",
 		"SUBNAME_REJECT": "برگشت‌زدن",
 		"SUBNAME_VACATION_MESSAGE": "پیام تعطیلات",
-		"SUBNAME_DISCARD": "دور انداختن",
-		"LOADING_PROCESS": "بروزرسانی لیست فیلتر"
+		"SUBNAME_DISCARD": "دور انداختن"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "امنیت",
 		"LABEL_AUTOLOGOUT": "خروج خودکار",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "هرگز",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% دقیقه(ها)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% ساعت‌(ها)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "هرگز"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "عمومی",
-		"LABEL_LANGUAGE": "زبان",
-		"LABEL_IDENTITY": "شناسه",
-		"LABEL_LAYOUT": "لایه",
-		"LABEL_LAYOUT_NO_SPLIT": "بدون تقسیم",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
-		"LABEL_EDITOR": "ویرایشگر پیش‌فرض",
-		"LABEL_EDITOR_HTML": "تحت فرمت Html",
-		"LABEL_EDITOR_PLAIN": "ساده",
-		"LABEL_EDITOR_HTML_FORCED": "Html (اجباری)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (اجباری)",
-		"LABEL_VIEW_OPTIONS": "مشاهده گزینه‌ها",
-		"LABEL_USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست",
-		"LABEL_USE_THREADS": "استفاده از حالت موضوعی",
-		"LABEL_REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
-		"LABEL_SHOW_IMAGES": "همیشه تصاویر بیرونی را در بدنه پیام‌ها نشان بده",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "پیام‌ها در صفحه",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "زبان",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "شناسه",
+		"LAYOUT": "لایه",
+		"LAYOUT_NO_SPLIT": "بدون تقسیم",
+		"LAYOUT_VERTICAL_SPLIT": "تقسیم عمودی",
+		"LAYOUT_HORIZONTAL_SPLIT": "تقسیم افقی",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "ویرایشگر پیش‌فرض",
+		"EDITOR_HTML": "تحت فرمت Html",
+		"EDITOR_PLAIN": "ساده",
+		"VIEW_OPTIONS": "مشاهده گزینه‌ها",
+		"USE_PREVIEW_PANE": "استفاده از پنجره پیش‌نمایش",
+		"HIDE_DELETED_MESSAGES": "پنهان کردن پیام های علامت گذاری شده برای حذف",
+		"USE_CHECKBOXES_IN_LIST": "نمایش چک‌باکس در لیست",
+		"USE_THREADS": "استفاده از حالت موضوعی",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": " جوابها را در پوشه‌ای که پیامها در آن جواب داده شده است قراردهید",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "پیام‌ها در صفحه",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "اطلاعیه‌ها",
-		"LABEL_SOUND_NOTIFICATION": "آگاه‌سازی با صدا",
-		"LABEL_CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "اطلاعیه‌ها",
+		"SOUND_NOTIFICATION": "آگاه‌سازی با صدا",
+		"CHROME_NOTIFICATION_DESC": "پنجره اعلان دریافت پیام جدید را نمایش بده",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(مسدود شده توسط مرورگر)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "اطلاعات تماس گیرندگان را بصورت خودکار در آدرس‌بوک ذخیره کن",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "سرور",
 		"LABEL_CONTACTS_SYNC_AB_URL": "تارنمای آدرس‌بوک",
 		"LABEL_CONTACTS_SYNC_USER": "کاربر",
-		"SYNC_NO": "خیر",
-		"SYNC_YES": "بلی",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "پوسته‌ها",
-		"LEGEND_THEMES_CUSTOM": "پیکربندی سفارشی پوسته",
-		"LABEL_CUSTOM_TYPE": "نوع",
-		"LABEL_CUSTOM_TYPE_LIGHT": "روشن",
-		"LABEL_CUSTOM_TYPE_DARK": "تیره",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "پشت زمینه",
+		"LABEL_BACKGROUND": "پشت زمینه",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "بارگذاری تصاویر پشت زمینه (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "اندازه فایل بیش از حد بزرگ است",
 		"ERROR_FILE_TYPE_ERROR": "نوع فایل نامعتبر (فقط PNG و JPG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "جهت جلوگیری از کاهش کارایی سیستم، ما فقط قسمتی از آنها را به شما نشان می‌دهیم.",
 		"HELP_DELETE_FOLDER": "حذف پوشه",
 		"HELP_SHOW_HIDE_FOLDER": "نمایش\/مخفی‌بودن پوشه",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "بررسی\/عدم‌بررسی برای پیام جدید",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "پیام جدی را بررسی کنید",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "اضافه کردن یک حساب کاربری",
 		"BUTTON_ADD_IDENTITY": "اضافه کردن یک شناسه",
 		"LOADING_PROCESS": "بروزرسانی...",
-		"DEFAULT_IDENTITY_LABEL": "پیش‌فرض"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "وارد کردن کلید",
 		"BUTTON_GENERATE_KEY_PAIR": "تولید کلیدهای",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "خصوصی",
 		"TITLE_PUBLIC": "عمومی",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "ذخیره خودکار پیش‌نویس",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "پاسخ به همه",
 		"LABEL_FORWARD": "ارسال به دیگران",
 		"LABEL_FORWARD_MULTIPLY": "ارسال بصورت پیوست(ها)",
-		"LABEL_HELP": "راهنما",
 		"LABEL_CHECK_ALL": "انتخاب همه پیام‌ها",
 		"LABEL_DELETE": "حذف",
 		"LABEL_OPEN_THREAD": "باز کردن موضوع انتخاب شده",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "ضامن نقل‌قولهای پیام",
 		"LABEL_THREAD_NEXT": "پیام بعدی در موضوع",
 		"LABEL_THREAD_PREV": "پیام قبلی در موضوع",
-		"LABEL_PRINT": "چاپ",
 		"LABEL_EXIT_FULLSCREEN": "خروج از حالت تمام صفحه",
 		"LABEL_CLOSE_MESSAGE": "بستن پیام (بدون لایه پنجره پیش‌نمایش)",
 		"LABEL_SWITCH_TO_LIST": "برگشت به لیست پیام‌ها",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "بستن صفحه ایجاد"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "توکن نامعتبر",
-		"AUTH_ERROR": "احراز هویت با موفقیت همراه نبود",
-		"CONNECTION_ERROR": "عدم اتصال به سرور",
-		"DOMAIN_ALREADY_EXISTS": "دامنه در حال حاضر موجود است",
-		"DOMAIN_NOT_ALLOWED": "به دامنه اجازه داده نشده است",
-		"ACCOUNT_NOT_ALLOWED": "به حساب کاربری اجازه داده نشده است",
-		"CONTACTS_SYNC_ERROR": "همگام‌سازی تماس‌ها با خطا همراه بود",
-		"CANT_GET_MESSAGE_LIST": "امکان دریافت لیست پیام‌ها نیست",
-		"CANT_GET_MESSAGE": "امکان دریافت پیام نیست",
-		"CANT_DELETE_MESSAGE": "امکان حذف پیام نیست",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "امکان انتقال پیام نیست",
-		"CANT_SAVE_MESSAGE": "امکان ذخیره پیام نیست",
-		"CANT_SEND_MESSAGE": "امکان ارسال پیام نیست",
-		"INVALID_RECIPIENTS": "گیرنده نامعتبر",
-		"CANT_SAVE_FILTERS": "امکان ذخیره فیلترها نیست",
-		"CANT_GET_FILTERS": "امکان دریافت فیلترها نیست",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "فیلترها صحیح نیستند",
-		"CANT_CREATE_FOLDER": "امکان ایجاد شاخه وجود ندارد",
-		"CANT_RENAME_FOLDER": "امکان تغییر نام شاخه نیست",
-		"CANT_DELETE_FOLDER": "امکان حذف شاخه نیست",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "امکان حذف شاخه‌ای که خالی نیست وجود ندارد",
-		"CANT_SUBSCRIBE_FOLDER": "امکان اشتراک شاخه نیست",
-		"CANT_UNSUBSCRIBE_FOLDER": "امکان عدم اشتراک شاخه نیست",
-		"DEMO_SEND_MESSAGE_ERROR": "بنابر اهداف امنیتی، این کاربر اجازه ارسال ایمیل به یک ایمیل خارج از دامنه را ندارد!",
-		"DEMO_ACCOUNT_ERROR": "بنابر اهداف امنیتی، این کاربر اجازه انجام این عملیات را ندارد!",
-		"ACCOUNT_ALREADY_EXISTS": "کاربر وجود دارد",
-		"ACCOUNT_DOES_NOT_EXIST": "کاربر وجود ندارد",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "یک خطا در زمان دسترسی به سرویس پست الکترونیک رخ داد",
-		"INVALID_INPUT_ARGUMENT": "پارامترهای ورودی نامعتبر",
-		"UNKNOWN_ERROR": "خطای نامشخص"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "توکن نامعتبر",
+		"AuthError": "احراز هویت با موفقیت همراه نبود",
+		"ConnectionError": "عدم اتصال به سرور",
+		"DomainAlreadyExists": "دامنه در حال حاضر موجود است",
+		"DomainNotAllowed": "به دامنه اجازه داده نشده است",
+		"AccountNotAllowed": "به حساب کاربری اجازه داده نشده است",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "همگام‌سازی تماس‌ها با خطا همراه بود",
+		"CantGetMessageList": "امکان دریافت لیست پیام‌ها نیست",
+		"CantGetMessage": "امکان دریافت پیام نیست",
+		"CantDeleteMessage": "امکان حذف پیام نیست",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "امکان انتقال پیام نیست",
+		"CantSaveMessage": "امکان ذخیره پیام نیست",
+		"CantSendMessage": "امکان ارسال پیام نیست",
+		"InvalidRecipients": "گیرنده نامعتبر",
+		"CantSaveFilters": "امکان ذخیره فیلترها نیست",
+		"CantGetFilters": "امکان دریافت فیلترها نیست",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "فیلترها صحیح نیستند",
+		"CantCreateFolder": "امکان ایجاد شاخه وجود ندارد",
+		"CantRenameFolder": "امکان تغییر نام شاخه نیست",
+		"CantDeleteFolder": "امکان حذف شاخه نیست",
+		"CantDeleteNonEmptyFolder": "امکان حذف شاخه‌ای که خالی نیست وجود ندارد",
+		"CantSubscribeFolder": "امکان اشتراک شاخه نیست",
+		"CantUnsubscribeFolder": "امکان عدم اشتراک شاخه نیست",
+		"DemoSendMessageError": "بنابر اهداف امنیتی، این کاربر اجازه ارسال ایمیل به یک ایمیل خارج از دامنه را ندارد!",
+		"DemoAccountError": "بنابر اهداف امنیتی، این کاربر اجازه انجام این عملیات را ندارد!",
+		"AccountAlreadyExists": "کاربر وجود دارد",
+		"AccountDoesNotExist": "کاربر وجود ندارد",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "یک خطا در زمان دسترسی به سرویس پست الکترونیک رخ داد",
+		"InvalidInputArgument": "پارامترهای ورودی نامعتبر",
+		"UnknownError": "خطای نامشخص"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json b/snappymail/v/0.0.0/app/localization/fi/admin.json
similarity index 72%
rename from snappymail/v/0.0.0/app/localization/fi-FI/admin.json
rename to snappymail/v/0.0.0/app/localization/fi/admin.json
index 71aa0663b..118f28c18 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fi/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Lisää",
+		"CLOSE": "Sulje",
 		"SAVE": "Tallenna",
-		"UPDATE": "Päivitä"
+		"TEST": "Testi",
+		"UPDATE": "Päivitä",
+		"USERNAME": "Käyttäjätunnus",
+		"PASSWORD": "Salasana",
+		"CANCEL": "Peruuta",
+		"SEARCH": "Yhtään yhteystietoa ei löytynyt",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Tunnus",
-		"LABEL_PASSWORD": "Salasana",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Kirjaudu hallintapaneliin"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Halintapaneli"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Yleiset",
-		"LABEL_LOGIN_NAME": "Kirjautuminen",
-		"LABEL_BRANDING_NAME": "Brändäys",
-		"LABEL_CONTACTS_NAME": "Yhteystiedot",
-		"LABEL_DOMAINS_NAME": "Verkkotunnutkset",
-		"LABEL_SECURITY_NAME": "Turvallisuus",
-		"LABEL_PACKAGES_NAME": "Paketit",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Tietoja"
+		"GENERAL": "Yleiset",
+		"LOGIN": "Kirjautuminen",
+		"BRANDING": "Brändäys",
+		"CONTACTS": "Yhteystiedot",
+		"DOMAINS": "Verkkotunnutkset",
+		"SECURITY": "Turvallisuus",
+		"PACKAGES": "Paketit",
+		"CONFIG": "Config",
+		"ABOUT": "Tietoja"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Käyttöliittymä",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Salli kielivalinta asetuksissa",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Salli teemavalinta asetuksissa",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Salli taustavalinta asetuksissa",
-		"LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button",
 		"LABEL_SHOW_THUMBNAILS": "Näytä kuvakkeet (liitteet)",
 		"LEGEND_MAIN": "Yleiset",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Liitetiedoston kokorajoitus",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Oletus domain",
 		"LABEL_DETERMINE_USER_DOMAIN": "Koita päätellä käyttäjän domain",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Salli kielivalinta kirjautumissivulla",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Koita päätellä käyttäjän kieli",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Koita päätellä käyttäjän kieli"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Brändäys",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Käyttäjä",
 		"LABEL_STORAGE_PASSWORD": "Salasana",
-		"BUTTON_TEST": "Testi",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Huomio!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Älä käytä tätä tietokantatyyppiä suurella määrällä aktiivisia käyttäjiä.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Järjestelmäsi ei tue yhteystietoja.\n<br>\nAsenna tai aktivoi <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> lisäosa palvelimellasi.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Tietoturva",
 		"LABEL_USE_IMAGE_PROXY": "Käytä paikallista proxya ulkoisille kuville.",
-		"LABEL_ALLOW_OPEN_PGP": "Salli OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Näytä PHP tiedot",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hallintapaneeli kirjautumistiedot",
 		"LABEL_CURRENT_PASSWORD": "Nykyinen salasana",
-		"LABEL_NEW_LOGIN": "Uusi tunnus",
 		"LABEL_NEW_PASSWORD": "Uusi salasana",
 		"LABEL_REPEAT_PASSWORD": "Toista",
-		"BUTTON_UPDATE_PASSWORD": "Päivitä salasana",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Vaadi SSL sertifikaatin varmistus (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Vaadi SSL sertifikaatin varmistus",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Salli itse-allekirjoitetut sertifikaatit"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Helppo, moderni ja nopea web-pohjainen sähköpostiohjelma",
 		"LABEL_ALL_RIGHTS_RESERVED": "Kaikki oikeudet pidätetään.",
 		"HINT_READ_CHANGE_LOG": "Lue muutosloki ennen päivitystä.",
-		"HINT_IS_UP_TO_DATE": "RainLoop on ajan tasalla.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail on ajan tasalla.",
 		"HTML_NEW_VERSION": "Uusi versio <b>%VERSION%<\/b> on saatavissa.",
 		"LABEL_UPDATING": "Päivitetään",
 		"LABEL_CHECKING": "Tarkastetaan päivityksiä",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Lisää Alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Verkkotunnus",
-		"BUTTON_CLOSE": "Sulje",
-		"BUTTON_ADD": "Lisää"
+		"LABEL_DOMAIN": "Verkkotunnus"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Lisää verkkotunnus",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Muokkaa verkkotunnusta \"%NAME%\"",
 		"LABEL_NAME": "Nimi",
 		"NAME_HELPER": "wildcard tuettu",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Palvelin",
 		"LABEL_PORT": "Portti",
 		"LABEL_SECURE": "Secure",
-		"LABEL_WHITE_LIST": "Sallitut Lista",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Ei mitään",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Salli sieve skriptit",
 		"LABEL_USE_SHORT_LOGIN": "Käytä lyhyttä kirjautumista",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Käytä tunnistautumista",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Käytä php mail() funktiota",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Sallitut Lista",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve asetukset",
-		"BUTTON_BACK_TO_IMAP": "Takaisin IMAP asetuksiin",
-		"BUTTON_BACK": "Takaisin",
-		"BUTTON_CLOSE": "Sulje",
-		"BUTTON_ADD": "Lisää",
-		"BUTTON_UPDATE": "Päivitä",
-		"NEW_DOMAIN_DESC": "Tämän verkkotunnuksen asetukset sallivat käyttää <br> <i>%NAME%<i> säkhöpostiosoitteita.",
-		"WHITE_LIST_ALERT": "Lista domain käyttäjistä joihin webmaililla on oikeus.\nErottele välilyönnillä.\n"
+		"NEW_DOMAIN_DESC": "Tämän verkkotunnuksen asetukset sallivat käyttää  <strong>%NAME%<strong> säkhöpostiosoitteita.",
+		"WHITE_LIST_ALERT": "Lista domain käyttäjistä joihin webmaililla on oikeus.\nErottele välilyönnillä.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Lisäosa",
-		"DESC_NOTHING_TO_CONFIGURE": "Ei mitään asetettavaa",
-		"BUTTON_CLOSE": "Sulje"
+		"DESC_NOTHING_TO_CONFIGURE": "Ei mitään asetettavaa"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Haluatko varmasti sulkea tämän ikkunan?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "epävakaa",
 		"WARNING": "Varoitus!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Tuntematon virhe"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Väärä token",
-		"AUTH_ERROR": "Tunnistautuminen epäonnistui",
-		"DOMAIN_ALREADY_EXISTS": "Verkkotunnus on jo olemassa",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Asetuksia ei voida tallentaa",
-		"CANT_INSTALL_PACKAGE": "Paketin asennus epäonnistui",
-		"CANT_DELETE_PACKAGE": "Paketin poisto epäonnistui",
-		"INVALID_PLUGIN_PACKAGE": "Virheellinen lisäosa-paketti",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Ei tuettu lisäosa-paketti",
-		"UNKNOWN_ERROR": "Tuntematon virhe"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Väärä token",
+		"AuthError": "Tunnistautuminen epäonnistui",
+		"DomainAlreadyExists": "Verkkotunnus on jo olemassa",
+		"CantSavePluginSettings": "Asetuksia ei voida tallentaa",
+		"CantInstallPackage": "Paketin asennus epäonnistui",
+		"CantDeletePackage": "Paketin poisto epäonnistui",
+		"InvalidPluginPackage": "Virheellinen lisäosa-paketti",
+		"UnsupportedPluginPackage": "Ei tuettu lisäosa-paketti",
+		"UnknownError": "Tuntematon virhe"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/fi/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fi-FI/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/fi/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/static.json b/snappymail/v/0.0.0/app/localization/fi/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fi-FI/static.json
rename to snappymail/v/0.0.0/app/localization/fi/static.json
diff --git a/snappymail/v/0.0.0/app/localization/fi-FI/user.json b/snappymail/v/0.0.0/app/localization/fi/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/fi-FI/user.json
rename to snappymail/v/0.0.0/app/localization/fi/user.json
index 505dfdf9b..6e3eb1d9c 100644
--- a/snappymail/v/0.0.0/app/localization/fi-FI/user.json
+++ b/snappymail/v/0.0.0/app/localization/fi/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arkistointi",
 		"ARE_YOU_SURE": "Oletko varma?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Sulje (Esc)",
 		"CONTACTS": "Yhteystiedot",
 		"DELETE": "Poista",
+		"UNDELETE": "Undelete",
 		"DONE": "Valmis",
 		"EMAIL": "Sähköpostisi",
 		"FROM": "Lähettäjä",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Kirjaudu ulos",
 		"MORE": "Lisää",
 		"MOVE_TO": "Siirrä",
+		"COPY_TO": "Kopioi",
 		"NAME": "Postilaatikko",
 		"NONE": "Ei mitään",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ei roskapostia",
+		"USERNAME": "Käyttäjätunnus",
 		"PASSWORD": "Salasana",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Vastaa",
 		"SAVE": "Tallenna",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Yhtään yhteystietoa ei löytynyt",
 		"SPAM": "Merkitse roskapostiksi",
 		"SUBJECT": "Aihe",
 		"TEST": "Testaa",
-		"TO": "Vastaanottaja"
+		"TO": "Vastaanottaja",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Kyllä",
+		"NO": "Ei",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "oletus",
+		"HELP": "Ohje",
+		"TEXT": "Teksti",
+		"ATTACHMENTS": "Liite"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Tunnus",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Kirjaudu"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Lisää tili",
-		"BUTTON_SETTINGS": "Asetukset",
-		"BUTTON_HELP": "Ohje"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiiliversio",
-		"BUTTON_DESKTOP_VERSION": "Työpöytäversio"
+		"BUTTON_ADD_ACCOUNT": "Lisää tili"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Tarkka haku",
-		"LABEL_ADV_TEXT": "Teksti",
-		"LABEL_ADV_HAS_ATTACHMENT": "Sisältää liitteen",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Sisältää liitteitä",
-		"LABEL_ADV_FLAGGED": "Merkitty",
-		"LABEL_ADV_UNSEEN": "Ei luettu",
-		"LABEL_ADV_DATE": "Pvm",
-		"LABEL_ADV_DATE_ALL": "Kaikki",
-		"LABEL_ADV_DATE_3_DAYS": "3 päivän ajalta",
-		"LABEL_ADV_DATE_7_DAYS": "1 viikon ajalta",
-		"LABEL_ADV_DATE_MONTH": "1 kk ajalta",
-		"LABEL_ADV_DATE_3_MONTHS": "3 kk ajalta",
-		"LABEL_ADV_DATE_6_MONTHS": "6 kk ajalta",
-		"LABEL_ADV_DATE_YEAR": "1 vuoden ajalta",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Koko ruutu",
-		"ZOOM": "Zoomaa",
-		"CLOSE": "Sulje (Esc)",
-		"GALLERY_PREV": "Edellinen (nuoli vasemmalle)",
-		"GALLERY_NEXT": "Seuraava (nuoli oikealle)",
-		"GALLERY_COUNTER": "%curr% %total% sta"
+		"TEXT": "Teksti",
+		"HAS_ATTACHMENT": "Sisältää liitteen",
+		"FLAGGED": "Merkitty",
+		"UNSEEN": "Ei luettu",
+		"DATE": "Pvm",
+		"DATE_ALL": "Kaikki",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "3 päivän ajalta",
+		"SINCE_7_DAYS": "1 viikon ajalta",
+		"SINCE_MONTH": "1 kk ajalta",
+		"SINCE_3_MONTHS": "3 kk ajalta",
+		"SINCE_6_MONTHS": "6 kk ajalta",
+		"SINCE_YEAR": "1 vuoden ajalta",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Vastattu",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Luo",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Roskakori",
 		"ARCHIVE_NAME": "Arkisto"
 	},
-	"QUOTA": {
-		"TITLE": "Kiintiö"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Päivitä viestit",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Luetut",
 		"MENU_SELECT_FLAGGED": "Merkityt",
 		"MENU_SELECT_UNFLAGGED": "Merkkaamattomat",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tyhjä lista",
 		"EMPTY_SEARCH_LIST": "Yhtään viestiä ei löytynyt ehdoillasi.",
 		"SEARCH_RESULT_FOR": "Hakutulokset haulle \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Takaisin viestilistaan",
-		"EMPTY_SUBJECT_TEXT": "(Ei aihetta)",
 		"PUT_MESSAGE_HERE": "Pudota viesti tähän nähdäksesi sen listassa",
 		"TODAY_AT": "tänään klo %TIME%",
 		"YESTERDAY_AT": "eilen klo %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Sinulle on %COUNT% uutta viestiä!",
 		"QUOTA_SIZE": "Käytät <strong>%SIZE% (%PROC%%)<\/strong> sinulle varatusta <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Näytä lähdekoodi",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Lataa .eml tiedostona",
 		"MENU_FILTER_SIMILAR": "Suodata samankaltaiset",
 		"MENU_PRINT": "Tulosta",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Lataa zip-tiedostona",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Kuitattu luetuksi - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Hakee..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Lisää yhteystieto",
 		"BUTTON_CREATE_CONTACT": "Luo",
-		"BUTTON_UPDATE_CONTACT": "Päivitä",
 		"BUTTON_IMPORT": "Tuo (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Vie (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Vie (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Yhtään yhteystietoa ei löytynyt",
 		"CLEAR_SEARCH": "Poista haku",
 		"CONTACT_VIEW_DESC": "Valitse yhteystieto nähdäksesi sen tässä.",
-		"LABEL_PHONE": "Puhelin",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Syntymäpäivä",
-		"LINK_ADD_EMAIL": "Lisää sähköpostiosoite",
-		"LINK_ADD_PHONE": "Lisää puhelinnumero",
-		"LINK_BIRTHDAY": "Syntymäpäivä",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Lisää näytettävä nimi",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Lisää sukunimi",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Lisää etunimi",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Lisää lempinimi",
+		"DISPLAY_NAME": "Näytettävä nimi",
+		"LAST_NAME": "Sukunimi",
+		"FIRST_NAME": "Etunimi",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Lempinimi",
 		"LABEL_READ_ONLY": "Vain luku",
-		"LABEL_SHARE": "Jaa",
 		"ADD_MENU_LABEL": "Lisää",
 		"ADD_MENU_NICKNAME": "Lempinimi",
-		"ADD_MENU_NOTES": "Muistiinpanot",
+		"ADD_MENU_NOTE": "Muistiinpanot",
 		"ADD_MENU_PHONE": "Puhelin",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Osoite",
 		"ADD_MENU_BIRTHDAY": "Syntymäpäivä",
 		"ADD_MENU_TAGS": "Tagit",
 		"BUTTON_SHARE_ALL": "Kaikille",
-		"BUTTON_SYNC": "Synkronoi (CardDAV)"
+		"BUTTON_SYNC": "Synkronoi (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "näytä kaikki kentät",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ei liitteitä",
 		"ATTACHMENTS_ERROR_DESC": "Huom! Yhtään liitetiedostoa ei ole ladattu.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Kaikkia liitetiedostoja ei ole vielä ladattu.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pyydä kuittaus",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkitse tärkeäksi",
-		"BUTTON_REQUEST_DSN": "Pyydä toimituskuittaus"
+		"BUTTON_REQUEST_DSN": "Pyydä toimituskuittaus",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Kyllä",
-		"BUTTON_NO": "Ei",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Haluatko varmasti sulkea tämän ikkunan?",
 		"DESC_WANT_DELETE_MESSAGES": "Haluatko varmasti poistaa viestin\/viestit?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Valitse kieli"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Lisää tili?",
+		"TITLE_ADD_ACCOUNT": "Lisää tili",
 		"BUTTON_ADD_ACCOUNT": "Lisää",
-		"TITLE_UPDATE_ACCOUNT": "Päivitä tili?",
-		"BUTTON_UPDATE_ACCOUNT": "Päivitä"
+		"TITLE_UPDATE_ACCOUNT": "Päivitä tili"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Lisää identiteetti?",
-		"TITLE_UPDATE_IDENTITY": "Päivitä identiteetti?",
+		"TITLE_ADD_IDENTITY": "Lisää identiteetti",
+		"TITLE_UPDATE_IDENTITY": "Päivitä identiteetti",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lisää",
-		"BUTTON_UPDATE_IDENTITY": "Päivitä",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Lisää tämä allekirjoitus ennen lainattua tekstiä vastauksissa"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Luo kansio?",
+		"TITLE_CREATE_FOLDER": "Luo kansio",
 		"LABEL_PARENT": "Emo-kansio",
 		"BUTTON_CREATE": "Luo",
 		"TITLE_CREATING_PROCESS": "Luodaan kansiota"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Tätä toimintoa ei voi peruuttaa.",
 		"TITLE_CLEARING_PROCESS": "Tyhjennetään kansiota..."
 	},
+	"CRYPTO": {
+		"SIGN": "Allekirjoita",
+		"ENCRYPT": "Salaa",
+		"DECRYPT": "Pura",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Oikea allekirjoitus %USER% lle",
+		"ERROR": "%TYPE% virhe: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Tuo OpenPGP avain",
 		"POPUP_IMPORT_BUTTON": "Tuo",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Luo OpenPGP avain",
 		"POPUP_GENERATE_BUTTON": "Generoi",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Allekirjoita",
-		"LABEL_ENCRYPT": "Salaa",
-		"BUTTON_DECRYPT": "Pura",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP allekirjoitettu viesti",
 		"ENCRYPTED_MESSAGE": "OpenPGP salattu visti",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Oikea allekirjoitus %USER% lle",
-		"ERROR": "OpenPGP virhe: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME allekirjoitettu viesti",
+		"ENCRYPTED_MESSAGE": "S\/MIME salattu visti",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Luo suodatin?",
-		"TITLE_EDIT_FILTER": "Päivitä suodatin?",
+		"TITLE_CREATE_FILTER": "Luo suodatin",
+		"TITLE_EDIT_FILTER": "Päivitä suodatin",
 		"LEGEND_CONDITIONS": "Ehdot",
 		"LEGEND_ACTIONS": "Toimenpiteet",
 		"BUTTON_ADD_CONDITION": "Lisää ehto",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Merkitse luetuksi",
 		"REPLY_INTERVAL_LABEL": "Vastaus intervalli (päivissä)",
 		"KEEP_LABEL": "Säästä",
-		"STOP_LABEL": "Älä lopeta sääntöjen prosessointia",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Aihe (valinnainen)",
 		"VACATION_MESSAGE_LABEL": "Viesti",
 		"VACATION_RECIPIENTS_LABEL": "Vastaanottajat (erotettu pilkulla)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Tuntematon virhe ladattaessa"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEKSTI"
+		"PLAIN": "HTML <-> TEKSTI",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Henkilökohtainen",
-		"LABEL_GENERAL_NAME": "Yleinen",
-		"LABEL_CONTACTS_NAME": "Yhteystiedot",
-		"LABEL_FOLDERS_NAME": "kansiot",
-		"LABEL_ACCOUNTS_NAME": "Tilit",
-		"LABEL_FILTERS_NAME": "Suodattimet",
-		"LABEL_SECURITY_NAME": "Turvallisuus",
-		"LABEL_THEMES_NAME": "Teemat"
+		"GENERAL": "Yleinen",
+		"CONTACTS": "Yhteystiedot",
+		"FOLDERS": "kansiot",
+		"ACCOUNTS": "Tilit",
+		"FILTERS": "Suodattimet",
+		"SECURITY": "Turvallisuus",
+		"THEMES": "Teemat"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Suodattimet",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Siirrä kansioon \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Välitä osoitteeseen \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Hylkää",
 		"SUBNAME_VACATION_MESSAGE": "Lomaviesti",
-		"SUBNAME_DISCARD": "Poista",
-		"LOADING_PROCESS": "Asetetaan suodattimet"
+		"SUBNAME_DISCARD": "Poista"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Turvallisuus",
 		"LABEL_AUTOLOGOUT": "Automaattinen uloskirjautuminen",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Ei koskaan",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minuuttia",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% tuntia"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Ei koskaan"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Yleiset",
-		"LABEL_LANGUAGE": "Kieli",
-		"LABEL_IDENTITY": "Identiteetti",
-		"LABEL_LAYOUT": "Asettelu",
-		"LABEL_LAYOUT_NO_SPLIT": "Ei jakoa",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
-		"LABEL_EDITOR": "Oletus tekstieditori",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Pelkkä teksti",
-		"LABEL_EDITOR_HTML_FORCED": "Html (pakotettu)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Pelkkä teksti (pakotettu)",
-		"LABEL_VIEW_OPTIONS": "Näyttö-valinnat",
-		"LABEL_USE_PREVIEW_PANE": "Käytä esikatselua",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa",
-		"LABEL_USE_THREADS": "Käytä keskustelunäkymää",
-		"LABEL_REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
-		"LABEL_SHOW_IMAGES": "Näytä aina ulkopuoliset kuvat viestissä",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Viestiä sivulla",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Kieli",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identiteetti",
+		"LAYOUT": "Asettelu",
+		"LAYOUT_NO_SPLIT": "Ei jakoa",
+		"LAYOUT_VERTICAL_SPLIT": "Pystysuora jako",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vaakataso jako",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Oletus tekstieditori",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Pelkkä teksti",
+		"VIEW_OPTIONS": "Näyttö-valinnat",
+		"USE_PREVIEW_PANE": "Käytä esikatselua",
+		"HIDE_DELETED_MESSAGES": "Piilota poistettavaksi merkityt viestit",
+		"USE_CHECKBOXES_IN_LIST": "Näytä valintaruudut listassa",
+		"USE_THREADS": "Käytä keskustelunäkymää",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Siirrä vastaukset samaan kansioon vastattavien kanssa",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Viestiä sivulla",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Ilmoitukset",
-		"LABEL_SOUND_NOTIFICATION": "Äänimerkit",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Ilmoitukset",
+		"SOUND_NOTIFICATION": "Äänimerkit",
+		"CHROME_NOTIFICATION_DESC": "Näytä uusien viestien ponnahdusikkuna",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Estetty selaimessa)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lisää yhetystieto automaattisesti osoitekirjaan",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Palvelin",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Osoitekirjan URL",
 		"LABEL_CONTACTS_SYNC_USER": "Käyttäjä",
-		"SYNC_NO": "Ei",
-		"SYNC_YES": "Kyllä",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teemat",
-		"LEGEND_THEMES_CUSTOM": "Muokatun teeman asetukset",
-		"LABEL_CUSTOM_TYPE": "Tyyppi",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Vaalea",
-		"LABEL_CUSTOM_TYPE_DARK": "Tumma",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Tausta",
+		"LABEL_BACKGROUND": "Tausta",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Lataa taustakuva (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Tiedosto on liian iso",
 		"ERROR_FILE_TYPE_ERROR": "Väärä tiedostotyyppi (ainoastaan JPG ja PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Näytetään vain osa.",
 		"HELP_DELETE_FOLDER": "Poista kansio",
 		"HELP_SHOW_HIDE_FOLDER": "Näytä\/Piilota kansio",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Tarkista\/Älä tarkista uudet viestit",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Tarkista uudet viestit",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Lisää Tili",
 		"BUTTON_ADD_IDENTITY": "Lisää identiteetti",
 		"LOADING_PROCESS": "Päivitetään...",
-		"DEFAULT_IDENTITY_LABEL": "oletus"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Tuo avain",
 		"BUTTON_GENERATE_KEY_PAIR": "Luo avain",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Yksityinen",
 		"TITLE_PUBLIC": "Julkinen",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Vastaa kaikille",
 		"LABEL_FORWARD": "Lähetä edelleen",
 		"LABEL_FORWARD_MULTIPLY": "Lähetä edelleen liitteenä",
-		"LABEL_HELP": "Ohje",
 		"LABEL_CHECK_ALL": "Valitse kaikki viestit",
 		"LABEL_DELETE": "Poista",
 		"LABEL_OPEN_THREAD": "Avaa valittu ketju",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Aseta lainaus",
 		"LABEL_THREAD_NEXT": "Seuraava viesti ketjussa",
 		"LABEL_THREAD_PREV": "Edellinen viesti ketjussa",
-		"LABEL_PRINT": "Tulosta",
 		"LABEL_EXIT_FULLSCREEN": "Poistu täyden ruudun näkymästä",
 		"LABEL_CLOSE_MESSAGE": "Sulje viesti",
 		"LABEL_SWITCH_TO_LIST": "Fokusoi viestilistaan",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Sule luo viesti"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Väärä suojaustunnus",
-		"AUTH_ERROR": "Tunnistusvirhe",
-		"CONNECTION_ERROR": "Ei voi yhdistää palvelimeen",
-		"DOMAIN_ALREADY_EXISTS": "Verkkotunnus on jo olemassa",
-		"DOMAIN_NOT_ALLOWED": "Verkkotunnus ei ole sallittu",
-		"ACCOUNT_NOT_ALLOWED": "Tili ei ole sallittu",
-		"CONTACTS_SYNC_ERROR": "Yhteystietojen synkronointivirhe",
-		"CANT_GET_MESSAGE_LIST": "Viestilistaa ei voi näyttää",
-		"CANT_GET_MESSAGE": "Viestiä ei voi näyttää",
-		"CANT_DELETE_MESSAGE": "Viestiä ei voi poistaa",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Viestiä ei voi siirtää",
-		"CANT_SAVE_MESSAGE": "Viestiä ei voi tallentaa",
-		"CANT_SEND_MESSAGE": "Viestiä ei voi lähettää",
-		"INVALID_RECIPIENTS": "Vastaanottajassa virhe",
-		"CANT_SAVE_FILTERS": "Suodattimia ei voi tallentaa",
-		"CANT_GET_FILTERS": "Suodattimia ei voi ladata",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Suodattimet väärin",
-		"CANT_CREATE_FOLDER": "Kansiota ei voi luoda",
-		"CANT_RENAME_FOLDER": "Kansiota ei voi uudelleennimetä",
-		"CANT_DELETE_FOLDER": "Kansiota ei voi poistaa",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Kansiossa on viestejä, ei voi poistaa",
-		"CANT_SUBSCRIBE_FOLDER": "Kansiota ei voi tilata",
-		"CANT_UNSUBSCRIBE_FOLDER": "Kansiotilausta ei voi peruuttaa",
-		"DEMO_SEND_MESSAGE_ERROR": "Turvallisuus syistä tältä tililtä ei voi lähettää viestejä ulkopuolisiin osoitteisiin!",
-		"DEMO_ACCOUNT_ERROR": "Turvallisuus syistä tämä ei ole sallittua!",
-		"ACCOUNT_ALREADY_EXISTS": "Tili on jo olemassa.",
-		"ACCOUNT_DOES_NOT_EXIST": "Tiliä ei ole olemassa",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Palvelinyhteydessä tapahtui virhe",
-		"INVALID_INPUT_ARGUMENT": "Virheelinen komento",
-		"UNKNOWN_ERROR": "Tuntematon virhe"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Väärä suojaustunnus",
+		"AuthError": "Tunnistusvirhe",
+		"ConnectionError": "Ei voi yhdistää palvelimeen",
+		"DomainAlreadyExists": "Verkkotunnus on jo olemassa",
+		"DomainNotAllowed": "Verkkotunnus ei ole sallittu",
+		"AccountNotAllowed": "Tili ei ole sallittu",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Yhteystietojen synkronointivirhe",
+		"CantGetMessageList": "Viestilistaa ei voi näyttää",
+		"CantGetMessage": "Viestiä ei voi näyttää",
+		"CantDeleteMessage": "Viestiä ei voi poistaa",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Viestiä ei voi siirtää",
+		"CantSaveMessage": "Viestiä ei voi tallentaa",
+		"CantSendMessage": "Viestiä ei voi lähettää",
+		"InvalidRecipients": "Vastaanottajassa virhe",
+		"CantSaveFilters": "Suodattimia ei voi tallentaa",
+		"CantGetFilters": "Suodattimia ei voi ladata",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Suodattimet väärin",
+		"CantCreateFolder": "Kansiota ei voi luoda",
+		"CantRenameFolder": "Kansiota ei voi uudelleennimetä",
+		"CantDeleteFolder": "Kansiota ei voi poistaa",
+		"CantDeleteNonEmptyFolder": "Kansiossa on viestejä, ei voi poistaa",
+		"CantSubscribeFolder": "Kansiota ei voi tilata",
+		"CantUnsubscribeFolder": "Kansiotilausta ei voi peruuttaa",
+		"DemoSendMessageError": "Turvallisuus syistä tältä tililtä ei voi lähettää viestejä ulkopuolisiin osoitteisiin!",
+		"DemoAccountError": "Turvallisuus syistä tämä ei ole sallittua!",
+		"AccountAlreadyExists": "Tili on jo olemassa.",
+		"AccountDoesNotExist": "Tiliä ei ole olemassa",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Palvelinyhteydessä tapahtui virhe",
+		"InvalidInputArgument": "Virheelinen komento",
+		"UnknownError": "Tuntematon virhe"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json b/snappymail/v/0.0.0/app/localization/fr/admin.json
similarity index 67%
rename from snappymail/v/0.0.0/app/localization/fr-FR/admin.json
rename to snappymail/v/0.0.0/app/localization/fr/admin.json
index f2d7968dd..b1ac8385b 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/fr/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Ajouter",
+		"CLOSE": "Fermer",
 		"SAVE": "Enregistrer",
-		"UPDATE": "Mettre à jour"
+		"TEST": "Test",
+		"UPDATE": "Mettre à jour",
+		"USERNAME": "Nom d'utilisateur",
+		"PASSWORD": "Mot de passe",
+		"CANCEL": "Annuler",
+		"SEARCH": "Rechercher",
+		"YES": "Oui",
+		"NO": "Non"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Identifiant",
-		"LABEL_PASSWORD": "Mot de passe",
 		"LABEL_TOTP": "Code TOTP",
 		"BUTTON_LOGIN": "Se connecter au panneau d'administration"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Panneau d'Administration"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Général",
-		"LABEL_LOGIN_NAME": "Identifiant",
-		"LABEL_BRANDING_NAME": "Logo & Marque",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_DOMAINS_NAME": "Domaines",
-		"LABEL_SECURITY_NAME": "Sécurité",
-		"LABEL_PACKAGES_NAME": "Extensions",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "A propos"
+		"GENERAL": "Général",
+		"LOGIN": "Identifiant",
+		"BRANDING": "Logo & Marque",
+		"CONTACTS": "Contacts",
+		"DOMAINS": "Domaines",
+		"SECURITY": "Sécurité",
+		"PACKAGES": "Extensions",
+		"CONFIG": "Configuration",
+		"ABOUT": "À propos"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Interface",
@@ -31,29 +39,27 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permettre la sélection de la langue dans les paramètres",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permettre la sélection du thème dans les paramètres",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permettre la sélection de l'arrière-plan dans les paramètres",
-		"LABEL_NEW_FOLDER_MOVE": "Nouveau bouton \"déplacer vers le dossier\"",
 		"LABEL_SHOW_THUMBNAILS": "Montrer les miniatures (pièces jointes)",
 		"LEGEND_MAIN": "Principal",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Taille limite des pièces jointes",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Autoriser les comptes supplémentaires",
 		"LABEL_ALLOW_IDENTITIES": "Autoriser les identités multiples",
-		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
+		"ALERT_DATA_ACCESS": "Le dossier de données est accessible. Veuillez configurer votre serveur web afin qu'il soit masqué à tout accès externe. Plus d'informations ici :",
 		"ALERT_WARNING": "ATTENTION !",
-		"HTML_ALERT_WEAK_PASSWORD": "Vous utilisez le mot de passe administrateur par défaut.\n<br>\nPour des raisons de sécurité, veuillez\n<strong><a href=\"#\/security\">changer le mot de passe <\/a><\/strong>\ndès maintenant.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "Vous utilisez le mot de passe administrateur par défaut.\n<br>\nPour des raisons de sécurité, veuillez\n<strong><a href=\"#\/security\">changer le mot de passe <\/a><\/strong>\ndès maintenant."
 	},
 	"TAB_LOGIN": {
-		"LEGEND_LOGIN_SCREEN": "Ecran de connexion",
+		"LEGEND_LOGIN_SCREEN": "Écran de connexion",
 		"LABEL_DEFAULT_DOMAIN": "Domaine par défaut",
 		"LABEL_DETERMINE_USER_DOMAIN": "Deviner le domaine de l'utilisateur",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permettre la sélection de la langue sur l'écran de connexion",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Deviner la langue de l'utilisateur",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Masquer le bouton 'Se connecter'"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Deviner la langue de l'utilisateur"
 	},
 	"TAB_BRANDING": {
-		"LEGEND_BRANDING": "Logo & Marque",
+		"LEGEND_BRANDING": "Favicône & Titre",
 		"LABEL_PAGE_TITLE": "Titre de la page",
 		"LABEL_LOADING_DESCRIPTION": "Description pendant le chargement",
-		"LABEL_FAVICON_URL": "Favicon"
+		"LABEL_FAVICON_URL": "Favicône"
 	},
 	"TAB_CONTACTS": {
 		"LEGEND_CONTACTS": "Contacts",
@@ -64,31 +70,30 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Utilisateur",
 		"LABEL_STORAGE_PASSWORD": "Mot de passe",
-		"BUTTON_TEST": "Test",
-		"ALERT_NOTICE": "Avis !",
+		"SQLITE_GLOBAL": "Utilisez une DB globale au lieu de par compte",
+		"ALERT_NOTICE": "Note !",
+		"SUGGESTIONS_LIMIT": "Limite de suggestions",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "N'utilisez pas ce type de base de données avec un grand nombre d'utilisateurs actifs.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Votre système ne supporte pas les contacts.\n<br>\nVous devez installer ou autoriser l'extension <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> sur votre serveur.\n"
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Votre système ne supporte pas les contacts.\n<br>\nVous devez installer ou autoriser l'extension <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> sur votre serveur."
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Domaines",
 		"BUTTON_ADD_DOMAIN": "Ajouter un domaine",
 		"BUTTON_ADD_ALIAS": "Ajouter un alias",
 		"DELETE_ARE_YOU_SURE": "Êtes-vous sûr ?",
-		"HTML_DOMAINS_HELPER": "Liste des domaines autorisés.\n<br>\nCliquez sur le nom pour configurer le domaine.\n"
+		"HTML_DOMAINS_HELPER": "Liste des domaines autorisés.\n<br>\nCliquez sur le nom pour configurer le domaine."
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sécurité",
 		"LABEL_USE_IMAGE_PROXY": "Utiliser un proxy local pour les images externes",
-		"LABEL_ALLOW_OPEN_PGP": "Autoriser OpenPGP",
+		"LABEL_AUTO_VERIFY": "Vérifier automatiquement les signatures",
 		"LABEL_SHOW_PHP_INFO": "Voir les informations PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Codes d'accès au panneau d'administration",
 		"LABEL_CURRENT_PASSWORD": "Mot de passe actuel",
-		"LABEL_NEW_LOGIN": "Nouvel identifiant",
 		"LABEL_NEW_PASSWORD": "Nouveau mot de passe",
 		"LABEL_REPEAT_PASSWORD": "Répéter",
-		"BUTTON_UPDATE_PASSWORD": "Changer le mot de passe",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "S'assurer qu'un certificat SSL (IMAP\/SMTP) est utilisé",
+		"LABEL_REQUIRE_VERIFICATION": "S'assurer qu'un certificat SSL est utilisé",
+		"CRYPTO": "Chiffrement",
 		"LABEL_ALLOW_SELF_SIGNED": "Autoriser les certificats auto-signés"
 	},
 	"TAB_PACKAGES": {
@@ -99,63 +104,54 @@
 		"ALERT_CANNOT_ACCESS_REPOSITORY": "Impossible d'accéder au dépôt pour l'instant."
 	},
 	"TAB_ABOUT": {
-		"LEGEND_ABOUT": "A propos",
-		"LABEL_TAG_HINT": "Un client webmail simple, moderne et rapide ",
+		"LEGEND_ABOUT": "À propos",
+		"LABEL_TAG_HINT": "Un client webmail simple, moderne et rapide",
 		"LABEL_ALL_RIGHTS_RESERVED": "Tous droits réservés.",
 		"HINT_READ_CHANGE_LOG": "Veuillez lire le journal des modifications avant de faire la mise à jour.",
-		"HINT_IS_UP_TO_DATE": "Rainloop est à jour.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail est à jour.",
 		"HTML_NEW_VERSION": "Une nouvelle version <b>%VERSION%<\/b> est disponible.",
 		"LABEL_UPDATING": "Mise à jour",
 		"LABEL_CHECKING": "Vérification des mises à jour",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Versions"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Ajouter un alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domaine",
-		"BUTTON_CLOSE": "Fermer",
-		"BUTTON_ADD": "Ajouter"
+		"LABEL_DOMAIN": "Domaine"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Ajouter un domaine",
 		"TITLE_ADD_DOMAIN_WITH_NAME": "Ajouter le domaine \"%NAME%\"",
 		"TITLE_EDIT_DOMAIN": "Modifier le domaine \"%NAME%\"",
 		"LABEL_NAME": "Nom",
-		"NAME_HELPER": "Jokers autorisés",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
+		"NAME_HELPER": "Caractères jokers autorisés",
 		"LABEL_SERVER": "Serveur",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Sécurité",
-		"LABEL_WHITE_LIST": "Liste Blanche",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Désactiver les fonctionnalités",
+		"LIMITS": "Limites",
+		"FOLDERS": "Dossiers",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Aucun",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Autoriser les scripts sieve",
 		"LABEL_USE_SHORT_LOGIN": "Utiliser l'identifiant court",
+		"LABEL_LOWERCASE_LOGIN": "Connexion en minuscules (insensible à la casse)",
 		"LABEL_USE_AUTH": "Utiliser l'authentification",
 		"LABEL_SET_SENDER": "Utiliser la connexion en tant qu'expéditeur",
+		"LABEL_AUTH_PLAIN_LINE": "Forcer l'authentification AUTH PLAIN",
 		"LABEL_USE_PHP_MAIL": "Utiliser la fonction mail() de php",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Liste Blanche",
-		"BUTTON_SIEVE_CONFIGURATION": "Configuration sieve",
-		"BUTTON_BACK_TO_IMAP": "Retour à la configuration IMAP",
-		"BUTTON_BACK": "Retour",
-		"BUTTON_CLOSE": "Fermer",
-		"BUTTON_ADD": "Ajouter",
-		"BUTTON_UPDATE": "Modifier",
-		"NEW_DOMAIN_DESC": "Cette configuration de domaine vous permettra de travailler <br> avec <i>%NAME%<\/i> dans les adresses électroniques.",
-		"WHITE_LIST_ALERT": "Liste des utilisateurs du domaine auxquels le webmail est autorisé à accéder.\nUtilisez un espace comme séparateur.\n"
+		"NEW_DOMAIN_DESC": "Cette configuration de domaine vous permettra de travailler  avec <strong>%NAME%<\/strong> dans les adresses électroniques.",
+		"WHITE_LIST_ALERT": "Liste des utilisateurs du domaine auxquels le webmail est autorisé à accéder.\nUtilisez un espace comme séparateur.",
+		"VALID_SPAM_HEADERS": "En-têtes SPAM valides",
+		"VALID_VIRUS_HEADERS": "En-têtes de virus valides"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extension",
-		"DESC_NOTHING_TO_CONFIGURE": "Rien à configurer",
-		"BUTTON_CLOSE": "Fermer"
+		"DESC_NOTHING_TO_CONFIGURE": "Rien à configurer"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Oui",
-		"BUTTON_NO": "Non",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Êtes-vous sûr de vouloir fermer cette fenêtre ?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "bêta",
-		"UNSTABLE": "instable",
 		"WARNING": "ATTENTION !"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Erreur inconnue"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Jeton invalide",
-		"AUTH_ERROR": "L'authentification a échoué",
-		"DOMAIN_ALREADY_EXISTS": "Le domaine existe déjà",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Vous ne pouvez pas enregistrer les paramètres",
-		"CANT_INSTALL_PACKAGE": "Impossible d'installer le extension",
-		"CANT_DELETE_PACKAGE": "Impossible de supprimer le extension",
-		"INVALID_PLUGIN_PACKAGE": "Package d'extension non valide",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Package d'extension non pris en charge",
-		"UNKNOWN_ERROR": "Erreur inconnue"
+		"RequestError": "La requête a échouée",
+		"RequestAborted": "La requête a été annulée",
+		"RequestTimeout": "La requête a expirée",
+		"InvalidToken": "Jeton invalide",
+		"AuthError": "L'authentification a échoué",
+		"DomainAlreadyExists": "Le domaine existe déjà",
+		"CantSavePluginSettings": "Vous ne pouvez pas enregistrer les paramètres",
+		"CantInstallPackage": "Impossible d'installer le extension",
+		"CantDeletePackage": "Impossible de supprimer le extension",
+		"InvalidPluginPackage": "Package d'extension non valide",
+		"UnsupportedPluginPackage": "Package d'extension non pris en charge",
+		"UnknownError": "Erreur inconnue"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/fr/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fr-FR/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/fr/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/static.json b/snappymail/v/0.0.0/app/localization/fr/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/fr-FR/static.json
rename to snappymail/v/0.0.0/app/localization/fr/static.json
diff --git a/snappymail/v/0.0.0/app/localization/fr-FR/user.json b/snappymail/v/0.0.0/app/localization/fr/user.json
similarity index 55%
rename from snappymail/v/0.0.0/app/localization/fr-FR/user.json
rename to snappymail/v/0.0.0/app/localization/fr/user.json
index 9beb59b13..fb39cb0c0 100644
--- a/snappymail/v/0.0.0/app/localization/fr-FR/user.json
+++ b/snappymail/v/0.0.0/app/localization/fr/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archiver",
 		"ARE_YOU_SURE": "Êtes-vous sûr ?",
@@ -10,24 +11,38 @@
 		"CLOSE": "Fermer",
 		"CONTACTS": "Contacts",
 		"DELETE": "Supprimer",
+		"UNDELETE": "Annuler la suppression",
 		"DONE": "Fait",
-		"EMAIL": "Email",
+		"EMAIL": "Courriel",
 		"FROM": "De",
 		"LOADING": "Chargement",
 		"LOGOUT": "Déconnexion",
 		"MORE": "Plus",
 		"MOVE_TO": "Déplacer vers",
+		"COPY_TO": "Copier",
 		"NAME": "Nom",
 		"NONE": "Aucun",
+		"TO_SPAM": "Déplacer le(s) message(s) vers Indésirable",
 		"NOT_SPAM": "Acceptable",
+		"USERNAME": "Nom d'utilisateur",
 		"PASSWORD": "Mot de passe",
+		"REMEMBER": "Se souvenir",
 		"REPLY_TO": "Répondre à",
 		"SAVE": "Enregistrer",
+		"SAVE_CHANGES": "Enregistrer les modifications?",
 		"SEARCH": "Rechercher",
 		"SPAM": "Indésirable",
 		"SUBJECT": "Sujet",
 		"TEST": "Test",
-		"TO": "À"
+		"TO": "À",
+		"SERVER_MESSAGE": "Message du serveur",
+		"YES": "Oui",
+		"NO": "Non",
+		"INACTIVE": "Inactif",
+		"DEFAULT": "défaut",
+		"HELP": "Aide",
+		"TEXT": "Texte",
+		"ATTACHMENTS": "Pièces jointes"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Identifiant",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Se connecter"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Ajouter un compte",
-		"BUTTON_SETTINGS": "Paramètres",
-		"BUTTON_HELP": "Aide"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Version mobile",
-		"BUTTON_DESKTOP_VERSION": "Version grand écran"
+		"BUTTON_ADD_ACCOUNT": "Ajouter un compte"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Recherche avancée",
-		"LABEL_ADV_TEXT": "Texte",
-		"LABEL_ADV_HAS_ATTACHMENT": "Pièce jointe",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Pièces jointes",
-		"LABEL_ADV_FLAGGED": "Signalé",
-		"LABEL_ADV_UNSEEN": "Non lu",
-		"LABEL_ADV_DATE": "Date",
-		"LABEL_ADV_DATE_ALL": "Tous",
-		"LABEL_ADV_DATE_3_DAYS": "Jusqu'à 3 jours",
-		"LABEL_ADV_DATE_7_DAYS": "Jusqu'à 1 semaine",
-		"LABEL_ADV_DATE_MONTH": "Jusqu'à 1 mois",
-		"LABEL_ADV_DATE_3_MONTHS": "Jusqu'à 3 mois",
-		"LABEL_ADV_DATE_6_MONTHS": "Jusqu'à 6 mois",
-		"LABEL_ADV_DATE_YEAR": "Jusqu'à 1 an",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Basculer en plein écran",
-		"ZOOM": "Zoom Avant\/Arrière",
-		"CLOSE": "Fermer (Esc)",
-		"GALLERY_PREV": "Précédent (flèche gauche)",
-		"GALLERY_NEXT": "Suivant (flèche droite)",
-		"GALLERY_COUNTER": "%curr% de %total%"
+		"TEXT": "Texte",
+		"HAS_ATTACHMENT": "Pièce jointe(s)",
+		"FLAGGED": "Signalé",
+		"UNSEEN": "Non lu",
+		"DATE": "Date",
+		"DATE_ALL": "Tous",
+		"BEFORE_3_DAYS": "Plus de 3 jours",
+		"BEFORE_7_DAYS": "Plus d'une semaine",
+		"BEFORE_MONTH": "Plus de 1 mois",
+		"BEFORE_3_MONTHS": "Plus de 3 mois",
+		"BEFORE_6_MONTHS": "Plus de 6 mois",
+		"BEFORE_YEAR": "Plus de 1 an",
+		"SINCE_3_DAYS": "Jusqu'à 3 jours",
+		"SINCE_7_DAYS": "Jusqu'à 1 semaine",
+		"SINCE_MONTH": "Jusqu'à 1 mois",
+		"SINCE_3_MONTHS": "Jusqu'à 3 mois",
+		"SINCE_6_MONTHS": "Jusqu'à 6 mois",
+		"SINCE_YEAR": "Jusqu'à 1 an",
+		"SUBFOLDERS": "Sous-dossiers",
+		"SUBFOLDERS_NONE": "Aucun",
+		"SUBFOLDERS_SUBTREE": "Tous",
+		"SUBFOLDERS_SUBTREE_ONE": "Un niveau",
+		"REPLIED": "Répondu",
+		"KEYWORD": "Étiquette"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Nouveau message",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Corbeille",
 		"ARCHIVE_NAME": "Archive"
 	},
-	"QUOTA": {
-		"TITLE": "Quota"
+	"IMAP": {
+		"ACL_RIGHTS": "Droits",
+		"ACL_A": "Administrer",
+		"ACL_E": "Supprimer",
+		"ACL_I": "Insérer des messages",
+		"ACL_K": "Créer des sous-dossiers",
+		"ACL_L": "Afficher les messages",
+		"ACL_P": "Envoyer un courrier",
+		"ACL_R": "Sélectionner un dossier",
+		"ACL_S": "\\VUE balise",
+		"ACL_T": "\\SUPPRIMÉE balise",
+		"ACL_W": "Autres balises",
+		"ACL_X": "Supprimer\/Renommer le dossier"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Recharger la liste des messages",
@@ -90,26 +109,29 @@
 		"BUTTON_DELETE_WITHOUT_MOVE": "Supprimer définitivement",
 		"MENU_SET_SEEN": "Marquer comme lu",
 		"MENU_SET_ALL_SEEN": "Marquer tous comme lus",
-		"MENU_UNSET_SEEN": "Marquer comme non-lu",
+		"MENU_UNSET_SEEN": "Marquer comme non lu",
 		"MENU_SET_FLAG": "Signaler",
 		"MENU_UNSET_FLAG": "Enlever le signal",
 		"MENU_SELECT_ALL": "Tous",
 		"MENU_SELECT_INVERT": "Inverser",
-		"MENU_SELECT_UNSEEN": "Non-lu",
+		"MENU_SELECT_UNSEEN": "Non lu",
 		"MENU_SELECT_SEEN": "Lu",
 		"MENU_SELECT_FLAGGED": "Signalés",
 		"MENU_SELECT_UNFLAGGED": "Non signalés",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Télécharger tous les fichiers",
 		"EMPTY_LIST": "Liste vide.",
 		"EMPTY_SEARCH_LIST": "Aucun message ne correspond à votre recherche.",
 		"SEARCH_RESULT_FOR": "Résultats de recherche pour \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "retour à la liste des messages",
-		"EMPTY_SUBJECT_TEXT": "(Pas d'objet)",
+		"BACK_TO_MESSAGE_LIST": "Retour à la liste des messages",
 		"PUT_MESSAGE_HERE": "Glisser un message ici pour l'afficher dans la liste",
-		"TODAY_AT": "aujourd'hui à %TIME%",
-		"YESTERDAY_AT": "hier à %TIME%",
+		"TODAY_AT": "Aujourd'hui à %TIME%",
+		"YESTERDAY_AT": "Hier à %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Vous avez %COUNT% nouveaux messages !",
 		"QUOTA_SIZE": "Vous utilisez <strong>%SIZE% (%PROC%%)<\/strong> sur <strong>%LIMIT%<\/strong>",
 		"SORT": "Trier",
+		"NO_SORT": "Le serveur de messagerie ne prend pas en charge le tri",
+		"SORT_ARRIVAL_ASC": "Arrivée ascendante",
+		"SORT_ARRIVAL_DESC": "Arrivée décroissante",
 		"SORT_DATE_ASC": "Date ascendante",
 		"SORT_DATE_DESC": "Date décroissante",
 		"SORT_SIZE_ASC": "Taille ascendante",
@@ -136,8 +158,9 @@
 		"BUTTON_THREAD_MORE": "Plus de messages",
 		"MENU_HEADERS": "Voir les en-têtes du message",
 		"MENU_VIEW_ORIGINAL": "Voir la source",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Afficher le message HTML",
+		"PLAIN_VIEW": "Afficher le message en texte brut",
+		"SWAP_COLORS": "Échanger la couleur (arrière-plan) par défaut",
 		"MENU_DOWNLOAD_ORIGINAL": "Télécharger comme fichier .eml",
 		"MENU_FILTER_SIMILAR": "Filtrer les messages similaires",
 		"MENU_PRINT": "Imprimer",
@@ -150,19 +173,42 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Cliquez sur le nom du dossier dans le panneau de gauche pour sélectionner la destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Télécharger le zip",
 		"SPAM_SCORE": "Score de spam",
-		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté"
+		"HAS_VIRUS_WARNING": "ATTENTION : virus détecté",
+		"TAGS": "Étiquettes",
+		"NEW_TAG": "Nouvelle étiquette",
+		"ENABLE_TRACKING_LINKS": "Activer les liens de suivi",
+		"TRACKING_ENABLED": "Les liens sont désormais suivis lorsque vous cliquez dessus !"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "À faire",
+		"$label1": "Important",
+		"$label2": "Travail",
+		"$label3": "Personnel",
+		"$label4": "À faire",
+		"$label5": "Plus tard"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Accusé de réception (affiché) - %SUBJECT%",
-		"BODY": "Il s'agit d'un accusé de réception pour le courrier que vous avez envoyé à %READ-RECEIPT%.\n\nNote: Cet accusé de réception reconnaît que le message a été affiché sur l'ordinateur du destinataire.\nIl n'y a aucune garantie que le destinataire ait lu ou compris le contenu du message.\n"
+		"BODY": "Il s'agit d'un accusé de réception pour le courrier que vous avez envoyé à %READ-RECEIPT%.\n\nNote: Cet accusé de réception reconnaît que le message a été affiché sur l'ordinateur du destinataire.\nIl n'y a aucune garantie que le destinataire ait lu ou compris le contenu du message."
 	},
 	"SUGGESTIONS": {
 		"SEARCHING_DESC": "Recherche..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Localisations",
+		"TAB_BUSINESS": "professionnel",
+		"LABEL_ORGANIZATION": "Entreprise",
+		"LABEL_DEPARTMENT": "Service",
+		"LABEL_TITLE": "Titre",
+		"TAB_CRYPTO": "Chiffrement",
+		"ASK": "Demander",
+		"NEVER": "Jamais",
+		"ALWAYS": "Toujours",
+		"ALWAYS_IF_POSSIBLE": "Toujours si possible",
 		"BUTTON_ADD_CONTACT": "Ajouter un contact",
 		"BUTTON_CREATE_CONTACT": "Créer",
-		"BUTTON_UPDATE_CONTACT": "Modifier",
 		"BUTTON_IMPORT": "Importer (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exporter (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exporter (csv)",
@@ -171,31 +217,29 @@
 		"EMPTY_SEARCH": "Aucun contact trouvé",
 		"CLEAR_SEARCH": "Effacer la recherche",
 		"CONTACT_VIEW_DESC": "Sélectionner un contact dans la liste pour l'afficher ici.",
-		"LABEL_PHONE": "Téléphone",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Anniversaire",
-		"LINK_ADD_EMAIL": "Ajouter une adresse email",
-		"LINK_ADD_PHONE": "Ajouter un numéro de téléphone",
-		"LINK_BIRTHDAY": "Anniversaire",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Entrez le nom à afficher",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Entrez votre nom",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Entrez votre prénom",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter le pseudonyme",
+		"DISPLAY_NAME": "Nom à afficher",
+		"LAST_NAME": "Nom",
+		"FIRST_NAME": "Prénom",
+		"MIDDLE_NAME": "Deuxième Prénom",
+		"NAME_PREFIX": "Civilité",
+		"NAME_SUFFIX": "Suffix",
+		"NICK_NAME": "Pseudonyme",
 		"LABEL_READ_ONLY": "Lecture seule",
-		"LABEL_SHARE": "Partager",
 		"ADD_MENU_LABEL": "Ajouter",
 		"ADD_MENU_NICKNAME": "Pseudonyme",
-		"ADD_MENU_NOTES": "Notes",
+		"ADD_MENU_NOTE": "Notes",
 		"ADD_MENU_PHONE": "Téléphone",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresse",
 		"ADD_MENU_BIRTHDAY": "Anniversaire",
-		"ADD_MENU_TAGS": "Tags",
+		"ADD_MENU_TAGS": "Étiquettes",
 		"BUTTON_SHARE_ALL": "Tout le monde",
-		"BUTTON_SYNC": "Synchronisation (CardDAV)"
+		"BUTTON_SYNC": "Synchronisation (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Envoyer à tous les e-mails contact"
 	},
 	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "voir tous les champs",
+		"LINK_SHOW_INPUTS": "Voir tous les champs",
 		"BUTTON_SEND": "Envoyer",
 		"BUTTON_MINIMIZE": "Réduire",
 		"SAVED_TIME": "Enregistré à %TIME%",
@@ -203,20 +247,23 @@
 		"DISCARD_UNSAVED_DATA": "Abandonner les données non enregistrées ?",
 		"ATTACH_FILES": "Joindre des fichiers",
 		"ATTACH_DROP_FILES_DESC": "Glisser les fichiers ici",
-		"REPLY_MESSAGE_TITLE": "%DATETIME% %EMAIL% a écrit",
+		"REPLY_MESSAGE_TITLE": "%DATETIME% %EMAIL% a écrit ",
 		"FORWARD_MESSAGE_TOP_TITLE": "-------- Message transféré -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Envoyé",
 		"EMPTY_TO_ERROR_DESC": "Merci de spécifier au moins un destinataire",
 		"NO_ATTACHMENTS_HERE_DESC": "Aucune pièce jointe.",
 		"ATTACHMENTS_ERROR_DESC": "Attention ! Toutes les pièces jointes n'ont pas été téléchargées.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toutes les pièces jointes n'ont pas encore été téléchargées",
+		"ALLOW_SPELLCHECK": "Activer le vérificateur d'orthographe du navigateur",
+		"ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement",
 		"BUTTON_REQUEST_READ_RECEIPT": "Demander une confirmation de lecture",
 		"BUTTON_MARK_AS_IMPORTANT": "Marquer comme important",
-		"BUTTON_REQUEST_DSN": "Demander un accusé de réception"
+		"BUTTON_REQUEST_DSN": "Demander un accusé de réception",
+		"BUTTON_REQUIRE_TLS": "Exiger une livraison sécurisée",
+		"ERROR_EMPTY_BODY": "Le corps du message est vide"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Oui",
-		"BUTTON_NO": "Non",
+		"EXIT_ARE_YOU_SURE": "Êtes-vous sûr de vouloir quitter ?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Êtes-vous sûr de vouloir fermer cette fenêtre ?",
 		"DESC_WANT_DELETE_MESSAGES": "Êtes-vous sûr de vouloir supprimer ce(s) message(s) ?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Choisir la langue"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Ajouter un compte ?",
+		"TITLE_ADD_ACCOUNT": "Ajouter un compte",
 		"BUTTON_ADD_ACCOUNT": "Ajouter",
-		"TITLE_UPDATE_ACCOUNT": "Mettre à jour le compte ?",
-		"BUTTON_UPDATE_ACCOUNT": "Mettre à jour"
+		"TITLE_UPDATE_ACCOUNT": "Mettre à jour le compte"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Ajouter une identité ?",
-		"TITLE_UPDATE_IDENTITY": "Mettre à jour l'identité ?",
+		"TITLE_ADD_IDENTITY": "Ajouter une identité",
+		"TITLE_UPDATE_IDENTITY": "Mettre à jour l'identité",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Ajouter",
-		"BUTTON_UPDATE_IDENTITY": "Mettre à jour",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insérer la signature avant le texte cité dans les réponses"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Créer un dossier ?",
+		"TITLE_CREATE_FOLDER": "Créer un dossier",
 		"LABEL_PARENT": "Dossier parent",
 		"BUTTON_CREATE": "Créer",
 		"TITLE_CREATING_PROCESS": "Création du dossier"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Une fois lancé, le processus ne peut pas être interrompu ou annulé.",
 		"TITLE_CLEARING_PROCESS": "Purge du dossier..."
 	},
+	"CRYPTO": {
+		"SIGN": "Signer",
+		"ENCRYPT": "Chiffer",
+		"DECRYPT": "Déchiffrer",
+		"VERIFY": "Vérifier",
+		"GOOD_SIGNATURE": "Signature valide pour %USER%",
+		"ERROR": "Erreur %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Créer auto-signé",
+		"VALID_UNTIL": "Valable jusque",
+		"PRIVATE_KEY": "Clé privée",
+		"CHANGE_PASS": "Changer la phrase secrète",
+		"CURRENT_PASS": "Phrase secrète actuelle",
+		"NEW_PASS": "Nouvelle phrase secrète",
+		"ASK_CRYPTKEY_PASS": "Votre phrase secrète de connexion a été changé. Veuillez fournir votre ancien mot de passe de connexion pour décrypter les données"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importer la clef OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Importer",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Générer les clés OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Générer",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Signer",
-		"LABEL_ENCRYPT": "Chiffer",
-		"BUTTON_DECRYPT": "Déchiffrer",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Message signé par OpenPGP",
 		"ENCRYPTED_MESSAGE": "Message chiffré par OpenPGP",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Signature valide pour %USER%",
-		"ERROR": "Erreur OpenPGP: %ERROR%"
+		"STORE_IN_GNUPG": "Stocker sur le serveur dans GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Stocker la clé publique sur le serveur dans GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Stocker la clé privée sur le serveur dans GnuPG",
+		"BACKUP_ON_SERVER": "Stocker (chiffré) sur le serveur",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Clé publique de sauvegarde sur le serveur",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Clé privée de sauvegarde sur le serveur"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importer le certificat S\/MIME",
+		"CERTIFICATE": "Certificat",
+		"CERTIFICATES": "Certificats S\/MIME",
+		"SIGNED_MESSAGE": "Message signé par S\/MIME",
+		"ENCRYPTED_MESSAGE": "Message chiffré par S\/MIME",
+		"PRIVATE_KEY_OF": "Clé privée S\/MIME de %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Créer un filtre ?",
-		"TITLE_EDIT_FILTER": "Mettre à jour le filtre ?",
+		"TITLE_CREATE_FILTER": "Créer un filtre",
+		"TITLE_EDIT_FILTER": "Mettre à jour le filtre",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Ajouter une condition",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Marquer comme lu",
 		"REPLY_INTERVAL_LABEL": "Délai de réponse (jours)",
 		"KEEP_LABEL": "Garder",
-		"STOP_LABEL": "Ne pas arrêter le traitement des règles",
+		"STOP_LABEL": "Arrêter le traitement de la règles",
 		"VACATION_SUBJECT_LABEL": "Sujet (optionnel)",
 		"VACATION_MESSAGE_LABEL": "Message",
 		"VACATION_RECIPIENTS_LABEL": "Destinataires (séparés par des virgules)",
@@ -308,8 +376,8 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Tous les messages entrants"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
+		"TITLE_CREATE": "Créer un script",
+		"TITLE_EDIT": "Éditer un script",
 		"BUTTON_ADD_FILTER": "Ajouter un filtre",
 		"BUTTON_RAW_SCRIPT": "Utiliser le script d'un utilisateur",
 		"CAPABILITY_LABEL": "Capacité",
@@ -319,11 +387,11 @@
 		"TITLE_SYSTEM_FOLDERS": "Sélectionner les dossiers systèmes",
 		"SELECT_CHOOSE_ONE": "Faites un choix",
 		"SELECT_UNUSE_NAME": "Ne pas utiliser",
-		"NOTIFICATION_SENT": "Vous n'avez pas sélectionné de dossier \"Envoyés\" où copier les messages après envoi.\nSi vous ne souhaitez pas enregistrer une copie des messages envoyés, sélectionnez l'option \"Ne pas utiliser\".\n",
+		"NOTIFICATION_SENT": "Vous n'avez pas sélectionné de dossier \"Envoyés\" où copier les messages après envoi.\nSi vous ne souhaitez pas enregistrer une copie des messages envoyés, sélectionnez l'option \"Ne pas utiliser\".",
 		"NOTIFICATION_DRAFTS": "Vous n'avez pas sélectionné de dossier \"Brouillons\" où enregistrer les messages en cours de rédaction.",
-		"NOTIFICATION_SPAM": "Vous n'avez pas sélectionné de dossier \"Spam\" où placer les indésirables.\nSi vous ne souhaitez pas supprimer définitivement les messages, sélectionnez l'option \"Ne pas utiliser\".\n",
-		"NOTIFICATION_TRASH": "Vous n'avez pas sélectionné de dossier \"Corbeille\" où placer les messages supprimés.\nSi vous ne souhaitez pas supprimer définitivement les messages, sélectionnez l'option \"Ne pas utiliser\".\n",
-		"NOTIFICATION_ARCHIVE": "Vous n'avez pas sélectionné de dossier \"Archive\" où placer les messages archivés.\n"
+		"NOTIFICATION_SPAM": "Vous n'avez pas sélectionné de dossier \"Spam\" où placer les indésirables.\nSi vous ne souhaitez pas supprimer définitivement les messages, sélectionnez l'option \"Ne pas utiliser\".",
+		"NOTIFICATION_TRASH": "Vous n'avez pas sélectionné de dossier \"Corbeille\" où placer les messages supprimés.\nSi vous ne souhaitez pas supprimer définitivement les messages, sélectionnez l'option \"Ne pas utiliser\".",
+		"NOTIFICATION_ARCHIVE": "Vous n'avez pas sélectionné de dossier \"Archive\" où placer les messages archivés."
 	},
 	"TITLES": {
 		"MAILBOX": "Boîte mail",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Une erreur inconnue de téléversement de fichier s'est produite"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> Non-formaté"
+		"PLAIN": "HTML <-> Non-formaté",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Polices",
+		"FONTSIZE": "Taille",
+		"DIR": "Sens du texte",
+		"DIR_LTR": "De gauche à droite",
+		"DIR_RTL": "De droite à gauche",
+		"DIR_AUTO": "Automatique",
+		"TEXTCOLOR": "Couleur du texte",
+		"BACKGROUNDCOLOR": "Couleur de l'arrière plan",
+		"BOLD": "Gras",
+		"ITALIC": "Italique",
+		"UNDERLINE": "Souligné",
+		"STRIKE": "Barré",
+		"SUB": "Indice",
+		"SUP": "Exposant",
+		"OL": "Liste ordonnée",
+		"UL": "Liste non ordonnée",
+		"QUOTE": "Citation",
+		"INDENTDECREASE": "Diminuer le retrait",
+		"INDENTINCREASE": "Augmenter le retrait",
+		"LINK": "Lien",
+		"IMAGEURL": "URL de l'image",
+		"IMAGEUPLOAD": "Sélection de l'image",
+		"UNDO": "Annuler",
+		"REDO": "Refaire",
+		"REMOVESTYLE": "Supprimer le style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personnel",
-		"LABEL_GENERAL_NAME": "Général",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_FOLDERS_NAME": "Dossiers",
-		"LABEL_ACCOUNTS_NAME": "Comptes",
-		"LABEL_FILTERS_NAME": "Filtres",
-		"LABEL_SECURITY_NAME": "Sécurité",
-		"LABEL_THEMES_NAME": "Thèmes"
+		"GENERAL": "Général",
+		"CONTACTS": "Contacts",
+		"FOLDERS": "Dossiers",
+		"ACCOUNTS": "Comptes",
+		"FILTERS": "Filtres",
+		"SECURITY": "Sécurité",
+		"THEMES": "Thèmes"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtres",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Avancé",
 		"BUTTON_ADD_SCRIPT": "Ajouter un Script",
 		"SUBNAME_MOVE_TO": "Déplacer vers \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Faire suivre à \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rejeter",
 		"SUBNAME_VACATION_MESSAGE": "Message d'absence",
-		"SUBNAME_DISCARD": "Exclure",
-		"LOADING_PROCESS": "Mise à jour de la liste de filtres"
+		"SUBNAME_DISCARD": "Exclure"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sécurité",
 		"LABEL_AUTOLOGOUT": "Déconnexion automatique",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Jamais",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% heure(s)"
+		"FORGET_KEY_PASS": "Oublier la phrase secrète de la clé privée",
+		"NEVER": "Jamais"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Général",
-		"LABEL_LANGUAGE": "Langue",
-		"LABEL_IDENTITY": "Identité",
-		"LABEL_LAYOUT": "Disposition",
-		"LABEL_LAYOUT_NO_SPLIT": "Pas de séparation",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
-		"LABEL_EDITOR": "Éditeur de texte par défaut",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Non-formaté",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (forcé)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Non-formaté (forcé)",
-		"LABEL_VIEW_OPTIONS": "Voir les options",
-		"LABEL_USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste",
-		"LABEL_USE_THREADS": "Regrouper en conversations",
-		"LABEL_REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
-		"LABEL_SHOW_IMAGES": "Toujours afficher les images dans le mail",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
-		"LABEL_MESSAGE_PER_PAGE": "Messages par page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
+		"LANGUAGE": "Langue",
+		"HOUR_FORMAT": "Format horaire",
+		"IDENTITY": "Identité",
+		"LAYOUT": "Disposition",
+		"LAYOUT_NO_SPLIT": "Pas de séparation",
+		"LAYOUT_VERTICAL_SPLIT": "Séparation verticale",
+		"LAYOUT_HORIZONTAL_SPLIT": "Séparation horizontale",
+		"SHOW_NEXT_MESSAGE": "Afficher le message suivant lors de la suppression ou du déplacement du message actuel",
+		"EDITOR": "Éditeur de texte par défaut",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Non-formaté",
+		"VIEW_OPTIONS": "Voir les options",
+		"USE_PREVIEW_PANE": "Utiliser le panneau de prévisualisation",
+		"HIDE_DELETED_MESSAGES": "Masquer les messages marqués pour suppression",
+		"USE_CHECKBOXES_IN_LIST": "Afficher des cases à cocher dans la liste",
+		"USE_THREADS": "Regrouper en conversations",
+		"THREAD_ALGORITHM": "Type de regroupement des courriers",
+		"REPLY_SAME_FOLDER": "Placer les réponses dans le dossier du message",
+		"PREFER_HTML": "Préférer le HTML au texte brut",
+		"PREFER_HTML_INFO": "Les messages arrivent parfois dans les deux formats. Cette option contrôle si vous voulez que la partie HTML ou la partie texte brut soit affichée.",
+		"REMOVE_COLORS": "Supprimer les couleurs d'arrière-plan et de texte du message",
+		"ALLOW_STYLES": "Autoriser <style> CSS",
+		"MESSAGE_PER_PAGE": "Messages par page",
+		"CHECK_MAIL_INTERVAL": "Intervalle de relevé des messages",
+		"MARK_MESSAGE_READ_AFTER": "Marquer le message comme lu après",
+		"MSG_DEFAULT_ACTION": "Action par défaut",
 		"SECONDS": "secondes",
-		"LABEL_NOTIFICATIONS": "Notifications",
-		"LABEL_SOUND_NOTIFICATION": "Son de notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notifications",
+		"SOUND_NOTIFICATION": "Son de notification",
+		"CHROME_NOTIFICATION_DESC": "Afficher un pop-up de notification pour les nouveaux messages",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqué par le navigateur)",
+		"COLLAPSE_BLOCKQUOTES": "Réduire le texte cité",
+		"MAX_QUOTE_LEVEL": "Niveau maximum de texte cité visible",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Afficher les pièces jointes intégrées dans la liste",
+		"LIST_SIMPLE_ATTACHMENTS": "Liste simple des pièces jointes",
+		"LIST_MESSAGES_GROUPED": "Lister les messages groupés (lors du tri par Date ou Destinataire)",
+		"EXTERNAL_IMAGES": "Images externes",
+		"IMAGES_OPTION_ASK": "Toujours demander",
+		"IMAGES_OPTION_WHITELIST": "Ajouter à la liste blanche ou demander",
+		"IMAGES_OPTION_ALWAYS": "Toujours afficher",
+		"IMAGES_WHITELIST": "Liste blanche Images",
+		"MESSAGE_POPUP_WINDOW": "Popup dans une nouvelle fenêtre au lieu d'un onglet",
+		"MAILTO": "Inscrivez-vous en tant que gestionnaire de liens 'mailto:'",
+		"HTML_TO_MD": "Convertir HTML en Markdown au lieu du texte brut"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Ajouter automatiquement les destinataires à votre carnet d'adresses",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Serveur",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL du carnet d'adresses",
 		"LABEL_CONTACTS_SYNC_USER": "Utilisateur",
-		"SYNC_NO": "Non",
-		"SYNC_YES": "Oui",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Lecture seulement"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Thèmes",
-		"LEGEND_THEMES_CUSTOM": "Configuration du thème personnel",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lumineux",
-		"LABEL_CUSTOM_TYPE_DARK": "Sombre",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Image de fond",
+		"LABEL_BACKGROUND": "Image de fond",
+		"LABEL_FONTS": "Polices de caractères",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Envoyer une image de fond (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fichier trop volumineux",
 		"ERROR_FILE_TYPE_ERROR": "Type de fichier invalide (JPG et PNG seulement)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Seulement une partie d'entre eux ont été affichés afin de limiter les problèmes de performance.",
 		"HELP_DELETE_FOLDER": "Supprimer le dossier",
 		"HELP_SHOW_HIDE_FOLDER": "Afficher\/masquer le dossier",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Cocher\/Décocher pour les nouveaux messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Cocher pour les nouveaux messages",
 		"HIDE_UNSUBSCRIBED": "Masquer les dossiers désabonnés",
+		"UNHIDE_KOLAB_FOLDERS": "Afficher les dossiers Kolab",
 		"TYPE_CALENDAR": "Calendrier",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,15 +558,15 @@
 		"BUTTON_ADD_ACCOUNT": "Ajouter un compte",
 		"BUTTON_ADD_IDENTITY": "Ajouter une identité",
 		"LOADING_PROCESS": "Mise à jour de la liste des comptes",
-		"DEFAULT_IDENTITY_LABEL": "défaut"
+		"SHOW_UNREAD": "Affiche le compteur de messages non lus"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer la clé",
 		"BUTTON_GENERATE_KEY_PAIR": "Générer les clés",
+		"IMPORT_FROM_SERVER": "Importer depuis le serveur",
 		"TITLE_PRIVATE": "Privée",
 		"TITLE_PUBLIC": "Publique",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Brouillon sauvegardé automatiquement",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Obtenez le module complémentaire de navigateur Mailvelope"
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Aide pour les raccourcis clavier",
@@ -473,13 +579,12 @@
 		"LABEL_REPLY_ALL": "Répondre à tous",
 		"LABEL_FORWARD": "Transférer",
 		"LABEL_FORWARD_MULTIPLY": "Transférer comme pièce(s) jointe(s)",
-		"LABEL_HELP": "Aide",
 		"LABEL_CHECK_ALL": "Sélectionner tous les messages",
 		"LABEL_DELETE": "Supprimer",
 		"LABEL_OPEN_THREAD": "Ouvrir le message selectionné",
 		"LABEL_MOVE": "Déplacer",
 		"LABEL_READ": "Marquer les messages sélectionnés comme lus",
-		"LABEL_UNREAD": "Marquer les messages sélectionnés comme non-lus",
+		"LABEL_UNREAD": "Marquer les messages sélectionnés comme non lus",
 		"LABEL_IMPORTANT": "Important, drapeau sélectionnés",
 		"LABEL_CANCEL_SEARCH": "Annuler la recherche",
 		"LABEL_FULLSCREEN_ENTER": "Plein écran (Mise en page avec aperçu)",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Basculer les citations en bloc",
 		"LABEL_THREAD_NEXT": "Message précédent de la liste",
 		"LABEL_THREAD_PREV": "Message suivant de la liste",
-		"LABEL_PRINT": "Imprimer",
 		"LABEL_EXIT_FULLSCREEN": "Quitter le mode plein écran",
 		"LABEL_CLOSE_MESSAGE": "Fermer le message (Mise en page sans aperçu)",
 		"LABEL_SWITCH_TO_LIST": "Retourner à la liste des messages",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Fermer la fenêtre d'édition"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Jeton invalide",
-		"AUTH_ERROR": "L'authentification a échoué",
-		"CONNECTION_ERROR": "Serveur injoignable",
-		"DOMAIN_ALREADY_EXISTS": "Le domaine existe déjà",
-		"DOMAIN_NOT_ALLOWED": "Ce domaine n'est pas autorisé",
-		"ACCOUNT_NOT_ALLOWED": "Ce compte n'est pas autorisé",
-		"CONTACTS_SYNC_ERROR": "Erreur de synchronisation des contacts",
-		"CANT_GET_MESSAGE_LIST": "Impossible d'obtenir la liste des messages",
-		"CANT_GET_MESSAGE": "Impossible d'obtenir le message",
-		"CANT_DELETE_MESSAGE": "Impossible de supprimer le message",
-		"CANT_COPY_MESSAGE": "Impossible de copier le message",
-		"CANT_MOVE_MESSAGE": "Impossible de déplacer le message",
-		"CANT_SAVE_MESSAGE": "Impossible d'enregistrer le message",
-		"CANT_SEND_MESSAGE": "Impossible d'envoyer le message",
-		"INVALID_RECIPIENTS": "Destinataires invalides",
-		"CANT_SAVE_FILTERS": "Impossible d'enregistrer les filtres",
-		"CANT_GET_FILTERS": "Impossible d'obtenir les filtres",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Les filtres ne sont pas corrects",
-		"CANT_CREATE_FOLDER": "Impossible de créer le dossier",
-		"CANT_RENAME_FOLDER": "Impossible de renommer le dossier",
-		"CANT_DELETE_FOLDER": "Impossible de supprimer le dossier",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Impossible de supprimer un dossier non vide",
-		"CANT_SUBSCRIBE_FOLDER": "Impossible de s'abonner au dossier",
-		"CANT_UNSUBSCRIBE_FOLDER": "Impossible de se désabonner du dossier",
-		"DEMO_SEND_MESSAGE_ERROR": "Pour des raisons de sécurité, ce compte de démonstration n'est pas autorisé à envoyer des messages à des adresses e-mail externes !",
-		"DEMO_ACCOUNT_ERROR": "Pour des raisons de sécurité, ce compte n'est pas autorisé à faire cette action !",
-		"ACCOUNT_ALREADY_EXISTS": "Ce compte existe déjà",
-		"ACCOUNT_DOES_NOT_EXIST": "Ce compte n'existe pas",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Une erreur est survenue lors de l'accès au serveur mail",
-		"INVALID_INPUT_ARGUMENT": "Argument invalide",
-		"UNKNOWN_ERROR": "Erreur inconnue"
+		"RequestError": "La requête a échouée",
+		"RequestAborted": "La requête a été annulée",
+		"RequestTimeout": "La requête a expirée",
+		"InvalidToken": "Jeton invalide",
+		"AuthError": "L'authentification a échoué",
+		"ConnectionError": "Serveur injoignable",
+		"DomainAlreadyExists": "Le domaine existe déjà",
+		"DomainNotAllowed": "Ce domaine n'est pas autorisé",
+		"AccountNotAllowed": "Ce compte n'est pas autorisé",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Erreur de synchronisation des contacts",
+		"CantGetMessageList": "Impossible d'obtenir la liste des messages",
+		"CantGetMessage": "Impossible d'obtenir le message",
+		"CantDeleteMessage": "Impossible de supprimer le message",
+		"CantCopyMessage": "Impossible de copier le message",
+		"CantMoveMessage": "Impossible de déplacer le message",
+		"CantSaveMessage": "Impossible d'enregistrer le message",
+		"CantSendMessage": "Impossible d'envoyer le message",
+		"InvalidRecipients": "Destinataires invalides",
+		"CantSaveFilters": "Impossible d'enregistrer les filtres",
+		"CantGetFilters": "Impossible d'obtenir les filtres",
+		"CantActivateFiltersScript": "Impossible d'activer le script des filtres",
+		"CantDeleteFiltersScript": "Impossible de supprimer le script des filtres",
+		"FiltersAreNotCorrect": "Les filtres ne sont pas corrects",
+		"CantCreateFolder": "Impossible de créer le dossier",
+		"CantRenameFolder": "Impossible de renommer le dossier",
+		"CantDeleteFolder": "Impossible de supprimer le dossier",
+		"CantDeleteNonEmptyFolder": "Impossible de supprimer un dossier non vide",
+		"CantSubscribeFolder": "Impossible de s'abonner au dossier",
+		"CantUnsubscribeFolder": "Impossible de se désabonner du dossier",
+		"DemoSendMessageError": "Pour des raisons de sécurité, ce compte de démonstration n'est pas autorisé à envoyer des messages à des adresses e-mail externes !",
+		"DemoAccountError": "Pour des raisons de sécurité, ce compte n'est pas autorisé à faire cette action !",
+		"AccountAlreadyExists": "Ce compte existe déjà",
+		"AccountDoesNotExist": "Ce compte n'existe pas",
+		"AccountSwitchFailed": "Switch vers le compte \"%EMAIL%\" a échoué",
+		"MailServerError": "Une erreur est survenue lors de l'accès au serveur mail",
+		"InvalidInputArgument": "Argument invalide",
+		"UnknownError": "Erreur inconnue"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json b/snappymail/v/0.0.0/app/localization/hu/admin.json
similarity index 69%
rename from snappymail/v/0.0.0/app/localization/hu-HU/admin.json
rename to snappymail/v/0.0.0/app/localization/hu/admin.json
index 759fd1b00..b5775e6a0 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/hu/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Hozzáad",
+		"CLOSE": "Bezár",
 		"SAVE": "Mentés",
-		"UPDATE": "Frissítés"
+		"TEST": "Teszt",
+		"UPDATE": "Frissítés",
+		"USERNAME": "Felhasználónév",
+		"PASSWORD": "Jelszó",
+		"CANCEL": "Mégse",
+		"SEARCH": "Nem találtam névjegyeket",
+		"YES": "Igen",
+		"NO": "Nem"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Belépés",
-		"LABEL_PASSWORD": "Jelszó",
 		"LABEL_TOTP": "TOTP kód",
 		"BUTTON_LOGIN": "Bejelentkezés az admin felületre"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Adminisztrációs felület"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Általános",
-		"LABEL_LOGIN_NAME": "Belépés",
-		"LABEL_BRANDING_NAME": "Arculat",
-		"LABEL_CONTACTS_NAME": "Névjegyek",
-		"LABEL_DOMAINS_NAME": "Domainek",
-		"LABEL_SECURITY_NAME": "Biztonság",
-		"LABEL_PACKAGES_NAME": "Bővítmények",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Névjegy"
+		"GENERAL": "Általános",
+		"LOGIN": "Belépés",
+		"BRANDING": "Arculat",
+		"CONTACTS": "Névjegyek",
+		"DOMAINS": "Domainek",
+		"SECURITY": "Biztonság",
+		"PACKAGES": "Bővítmények",
+		"CONFIG": "Config",
+		"ABOUT": "Névjegy"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Felület",
@@ -31,13 +39,12 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Nyelv választás engedélyezés a beállításoknál",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Téma választás engedélyezés a beállításoknál",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Háttér választás engedélyezés a beállításoknál",
-		"LABEL_NEW_FOLDER_MOVE": "Új \"áthelyezés mappába\" gomb",
 		"LABEL_SHOW_THUMBNAILS": "Előnézetek megjelenítése (mellékletek)",
 		"LEGEND_MAIN": "Fontos",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Melléklet méret korlát",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "További fiókok engedélyezése",
 		"LABEL_ALLOW_IDENTITIES": "Több identitás engedélyezése",
-		"ALERT_DATA_ACCESS": "A RainLoop adatmappája hozzáférhető. Kérlek állítsd be úgy a webszervert, hogy az adatmappát rejtse el a külső hozzáférés elől. További tudnivalók itt:",
+		"ALERT_DATA_ACCESS": "A SnappyMail adatmappája hozzáférhető. Kérlek állítsd be úgy a webszervert, hogy az adatmappát rejtse el a külső hozzáférés elől. További tudnivalók itt:",
 		"ALERT_WARNING": "Figyelmeztetés!",
 		"HTML_ALERT_WEAK_PASSWORD": "Az alapértelmezett admin jelszót használod\n<br>\nBiztonsági okokból kérlek\n<strong><a href=\"#\/security\">változtasd meg<\/a><\/strong>\na jelszót valami másra!\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Alapértelmezett domain",
 		"LABEL_DETERMINE_USER_DOMAIN": "Próbálja megállapítani a felhasználó domainjét",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Nyel választás engedélyezése a bejelentkező képernyőn",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Próbálja megállapítani a felhasználó nyelvét",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Próbálja megállapítani a felhasználó nyelvét"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Arculat",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "DSN",
 		"LABEL_STORAGE_USER": "Felhasználó",
 		"LABEL_STORAGE_PASSWORD": "Jelszó",
-		"BUTTON_TEST": "Teszt",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Megjegyzés!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ne használd ezt az adatbázis típust nagy számú aktív felhasználóval.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "A rendszer nem támogatja a címtárat.\n<br>\nTelepítened vagy engedélyezned kell egy <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> kiterjesztést a szervereden.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Biztonság",
 		"LABEL_USE_IMAGE_PROXY": "Helyi proxy használata a külső képekhez",
-		"LABEL_ALLOW_OPEN_PGP": "OpenPGP engedélyezése",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "PHP információ megjelenítése",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin panel hozzáférés hitelesítés",
 		"LABEL_CURRENT_PASSWORD": "Jelenlegi jelszó",
-		"LABEL_NEW_LOGIN": "Új felhasználó",
 		"LABEL_NEW_PASSWORD": "Új jelszó",
 		"LABEL_REPEAT_PASSWORD": "Újra",
-		"BUTTON_UPDATE_PASSWORD": "Jelszó frissítés",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "A használt (IMAP\/SMTP) tanúsítvány ellenőrzés megkövetelése",
+		"LABEL_REQUIRE_VERIFICATION": "A használt tanúsítvány ellenőrzés megkövetelése",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Saját aláírt tanúsítványok engedélyezése"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Egyszerű, modern és gyors webes email kliens",
 		"LABEL_ALL_RIGHTS_RESERVED": "Minden jog fenntartva.",
 		"HINT_READ_CHANGE_LOG": "Frissítés előtt kérlek olvasd el a változások listáját.",
-		"HINT_IS_UP_TO_DATE": "A RainLoop naprakész.",
+		"HINT_IS_UP_TO_DATE": "A SnappyMail naprakész.",
 		"HTML_NEW_VERSION": "Új verzió érhető el: <b>%VERSION%<\/b>",
 		"LABEL_UPDATING": "Frissítés",
 		"LABEL_CHECKING": "Frissítések ellenőrzése",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Álnév hozzáadás",
 		"LABEL_ALIAS": "Álnév",
-		"LABEL_DOMAIN": "Domain",
-		"BUTTON_CLOSE": "Bezár",
-		"BUTTON_ADD": "Hozzáad"
+		"LABEL_DOMAIN": "Domain"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Domain hozzáadás",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "\"%NAME%\" domain szerkesztése",
 		"LABEL_NAME": "Név",
 		"NAME_HELPER": "helyettesítő karakter használható",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Szerver",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Biztonság",
-		"LABEL_WHITE_LIST": "Fehér lista",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Semmi",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "SIEVE szkriptek engedélyezése",
 		"LABEL_USE_SHORT_LOGIN": "Rövid felhasználónév használata",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Hitelesítés használata",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "A PHP mail() funkció használata",
-		"BUTTON_TEST": "Teszt",
 		"BUTTON_WHITE_LIST": "Fehér lista",
-		"BUTTON_SIEVE_CONFIGURATION": "SIEVE beállítás",
-		"BUTTON_BACK_TO_IMAP": "Vissza az IMAP beállításokhoz",
-		"BUTTON_BACK": "Vissza",
-		"BUTTON_CLOSE": "Bezár",
-		"BUTTON_ADD": "Hozzáad",
-		"BUTTON_UPDATE": "Frissítés",
-		"NEW_DOMAIN_DESC": "Ez a domain konfiguráció lehetővé teszi <br>a <i>%NAME%<\/i> email címek használatát.",
-		"WHITE_LIST_ALERT": "Hozzáféréshez engedélyezett domainek listája.\nElválasztáshoz használd a szóközt.\n"
+		"NEW_DOMAIN_DESC": "Ez a domain konfiguráció lehetővé teszi a <strong>%NAME%<\/strong> email címek használatát.",
+		"WHITE_LIST_ALERT": "Hozzáféréshez engedélyezett domainek listája.\nElválasztáshoz használd a szóközt.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Bővítményt",
-		"DESC_NOTHING_TO_CONFIGURE": "Nincs mit beállítani",
-		"BUTTON_CLOSE": "Bezár"
+		"DESC_NOTHING_TO_CONFIGURE": "Nincs mit beállítani"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Igen",
-		"BUTTON_NO": "Nem",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Biztos, hogy be akarod zárni ezt az ablakot?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "béta",
-		"UNSTABLE": "instabil",
 		"WARNING": "Figyelmeztetés!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Ismeretlen hiba"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Érvénytelen token",
-		"AUTH_ERROR": "Sikertelen hitelesítés",
-		"DOMAIN_ALREADY_EXISTS": "A domain már létezik",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Nem lehet menteni a beállításokat",
-		"CANT_INSTALL_PACKAGE": "Nem sikerült telepíteni a bővítményt",
-		"CANT_DELETE_PACKAGE": "Nem sikerült eltávolítani a bővítményt",
-		"INVALID_PLUGIN_PACKAGE": "Érvénytelen kiterjesztési csomag",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Nem támogatott bővítménycsomag",
-		"UNKNOWN_ERROR": "Ismeretlen hiba"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Érvénytelen token",
+		"AuthError": "Sikertelen hitelesítés",
+		"DomainAlreadyExists": "A domain már létezik",
+		"CantSavePluginSettings": "Nem lehet menteni a beállításokat",
+		"CantInstallPackage": "Nem sikerült telepíteni a bővítményt",
+		"CantDeletePackage": "Nem sikerült eltávolítani a bővítményt",
+		"InvalidPluginPackage": "Érvénytelen kiterjesztési csomag",
+		"UnsupportedPluginPackage": "Nem támogatott bővítménycsomag",
+		"UnknownError": "Ismeretlen hiba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/hu/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/hu-HU/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/hu/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/static.json b/snappymail/v/0.0.0/app/localization/hu/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/hu-HU/static.json
rename to snappymail/v/0.0.0/app/localization/hu/static.json
diff --git a/snappymail/v/0.0.0/app/localization/hu-HU/user.json b/snappymail/v/0.0.0/app/localization/hu/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/hu-HU/user.json
rename to snappymail/v/0.0.0/app/localization/hu/user.json
index 2eaf094d1..911790cb5 100644
--- a/snappymail/v/0.0.0/app/localization/hu-HU/user.json
+++ b/snappymail/v/0.0.0/app/localization/hu/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archívum",
 		"ARE_YOU_SURE": "Biztos vagy benne?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Bezárás (Esc)",
 		"CONTACTS": "Névjegyek",
 		"DELETE": "Törlés",
+		"UNDELETE": "Undelete",
 		"DONE": "Kész",
 		"EMAIL": "E-mail",
 		"FROM": "Feladó",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Kilépés",
 		"MORE": "Tovább",
 		"MOVE_TO": "Áthelyezés ide",
+		"COPY_TO": "Másold",
 		"NAME": "Beérkező levelek",
 		"NONE": "Semmi",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Nem szemét",
+		"USERNAME": "Felhasználónév",
 		"PASSWORD": "Jelszó",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Válaszcím",
 		"SAVE": "Mentés",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Nem találtam névjegyeket",
 		"SPAM": "Levélszemét",
 		"SUBJECT": "Tárgy",
 		"TEST": "Tesztelés",
-		"TO": "Címzett"
+		"TO": "Címzett",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Igen",
+		"NO": "Nem",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Súgó",
+		"TEXT": "Szöveg",
+		"ATTACHMENTS": "Mellékletek"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Bejelentkezés",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Belépés"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Fiók hozzáadás",
-		"BUTTON_SETTINGS": "Beállítások",
-		"BUTTON_HELP": "Súgó"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil verzió",
-		"BUTTON_DESKTOP_VERSION": "Asztali verzió"
+		"BUTTON_ADD_ACCOUNT": "Fiók hozzáadás"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Részletes keresés",
-		"LABEL_ADV_TEXT": "Szöveg",
-		"LABEL_ADV_HAS_ATTACHMENT": "Van melléklete",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Vannak mellékletei",
-		"LABEL_ADV_FLAGGED": "Megjelölve",
-		"LABEL_ADV_UNSEEN": "Észrevétlen",
-		"LABEL_ADV_DATE": "Dátum",
-		"LABEL_ADV_DATE_ALL": "Összes",
-		"LABEL_ADV_DATE_3_DAYS": "Legfeljebb 3 napos",
-		"LABEL_ADV_DATE_7_DAYS": "Legfeljebb 1 hetes",
-		"LABEL_ADV_DATE_MONTH": "Legfeljebb 1 hónapos",
-		"LABEL_ADV_DATE_3_MONTHS": "Legfeljebb 3 hónapos",
-		"LABEL_ADV_DATE_6_MONTHS": "Legfeljebb 6 hónapos",
-		"LABEL_ADV_DATE_YEAR": "Legfeljebb 1 éves",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Teljes képernyő váltása",
-		"ZOOM": "Nagyítás ki\/be",
-		"CLOSE": "Bezárás (Esc)",
-		"GALLERY_PREV": "Előző (Bal nyíl gomb)",
-		"GALLERY_NEXT": "Következő (Jobb nyíl gomb)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
+		"TEXT": "Szöveg",
+		"HAS_ATTACHMENT": "Van melléklete",
+		"FLAGGED": "Megjelölve",
+		"UNSEEN": "Észrevétlen",
+		"DATE": "Dátum",
+		"DATE_ALL": "Összes",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Legfeljebb 3 napos",
+		"SINCE_7_DAYS": "Legfeljebb 1 hetes",
+		"SINCE_MONTH": "Legfeljebb 1 hónapos",
+		"SINCE_3_MONTHS": "Legfeljebb 3 hónapos",
+		"SINCE_6_MONTHS": "Legfeljebb 6 hónapos",
+		"SINCE_YEAR": "Legfeljebb 1 éves",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Válaszolt",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Levélírás",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Lomtár",
 		"ARCHIVE_NAME": "Archívum"
 	},
-	"QUOTA": {
-		"TITLE": "Helyfoglalás"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Üzenetlista újratöltés",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Olvasott",
 		"MENU_SELECT_FLAGGED": "Megjelölt",
 		"MENU_SELECT_UNFLAGGED": "Jelöletlen",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista üres.",
 		"EMPTY_SEARCH_LIST": "Nincs a keresésnek megfelelő levél.",
 		"SEARCH_RESULT_FOR": "Keresési eredmények ehhez: \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "vissza az üzenetlistához",
-		"EMPTY_SUBJECT_TEXT": "(Nincs tárgy)",
 		"PUT_MESSAGE_HERE": "Húzz ide egy üzenetet, hogy megjelenjen a listában",
 		"TODAY_AT": "ma ekkor: %TIME%",
 		"YESTERDAY_AT": "tegnap ekkor: %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "%COUNT% olvasatlan üzeneted van!",
 		"QUOTA_SIZE": "Felhasználva <strong>%SIZE% (%PROC%%)<\/strong> ebből: <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Eredeti megjelenítése",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": ".eml fájl letöltés",
 		"MENU_FILTER_SIMILAR": "Hasonló üzenetek szűrése",
 		"MENU_PRINT": "Nyomtatás",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "A cél kiválasztásához a bal oldali panelen kattints a mappa nevére.",
 		"LINK_DOWNLOAD_AS_ZIP": "Letöltés zip fájlként",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk"
+		"HAS_VIRUS_WARNING": "FIGYELEM: vírust észleltünk",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Visszaigazolás (megjelenítve) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Keresés..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Névjegy hozzáadás",
 		"BUTTON_CREATE_CONTACT": "Létrehozás",
-		"BUTTON_UPDATE_CONTACT": "Frissítés",
 		"BUTTON_IMPORT": "Importálás (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Export (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nem találtam névjegyeket",
 		"CLEAR_SEARCH": "Keresés törlése",
 		"CONTACT_VIEW_DESC": "Válassz egy névjegyet a listából, hogy itt megjelenjen.",
-		"LABEL_PHONE": "Telefonszám",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Születésnap",
-		"LINK_ADD_EMAIL": "Adj meg egy e-mail címet",
-		"LINK_ADD_PHONE": "Adj meg egy telefonszámot",
-		"LINK_BIRTHDAY": "Születésnap",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Add meg a megjelenítendő nevet",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Add meg a vezetéknevet",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Add meg a keresztnevet",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Add meg a felhasználónevet",
+		"DISPLAY_NAME": "Megjelenítendő nevet",
+		"LAST_NAME": "Vezetéknevet",
+		"FIRST_NAME": "Keresztnevet",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Felhasználónevet",
 		"LABEL_READ_ONLY": "Csak olvasás",
-		"LABEL_SHARE": "Megosztás",
 		"ADD_MENU_LABEL": "Hozzáadás",
 		"ADD_MENU_NICKNAME": "Felhasználónév",
-		"ADD_MENU_NOTES": "Jegyzetek",
+		"ADD_MENU_NOTE": "Jegyzetek",
 		"ADD_MENU_PHONE": "Telefonszám",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Cím",
 		"ADD_MENU_BIRTHDAY": "Születésnap",
 		"ADD_MENU_TAGS": "Címkék",
 		"BUTTON_SHARE_ALL": "Mindenki",
-		"BUTTON_SYNC": "Szinkronizálás (CardDAV)"
+		"BUTTON_SYNC": "Szinkronizálás (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "összes mező",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Nincsenek mellékletek.",
 		"ATTACHMENTS_ERROR_DESC": "Figyelem! Még nem lett feltöltve minden melléklet.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Még nem lett feltöltve minden melléklet.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése",
 		"BUTTON_REQUEST_READ_RECEIPT": "Olvasási visszaigazolás kérése",
 		"BUTTON_MARK_AS_IMPORTANT": "Megjelölés fontosként",
-		"BUTTON_REQUEST_DSN": "Továbbítási visszaigazolás kérés"
+		"BUTTON_REQUEST_DSN": "Továbbítási visszaigazolás kérés",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Igen",
-		"BUTTON_NO": "Nem",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Biztos, hogy be akarod zárni ezt az ablakot?",
 		"DESC_WANT_DELETE_MESSAGES": "Biztos, hogy törölni akarod az üzenete(ke)t?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Nyelv kiválasztás"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Új fiók?",
+		"TITLE_ADD_ACCOUNT": "Új fiók",
 		"BUTTON_ADD_ACCOUNT": "Hozzáadás",
-		"TITLE_UPDATE_ACCOUNT": "Fiók frissítése?",
-		"BUTTON_UPDATE_ACCOUNT": "Frissítés"
+		"TITLE_UPDATE_ACCOUNT": "Fiók frissítése"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Identitás hozzáadás?",
-		"TITLE_UPDATE_IDENTITY": "Frissítsük az identitást?",
+		"TITLE_ADD_IDENTITY": "Identitás hozzáadás",
+		"TITLE_UPDATE_IDENTITY": "Frissítsük az identitást",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Hozzáadás",
-		"BUTTON_UPDATE_IDENTITY": "Frissítés",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Szúrja be ezt az aláírást az idézett szöveg elé a válaszokban"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Létrehozzuk a mappát?",
+		"TITLE_CREATE_FOLDER": "Létrehozzuk a mappát",
 		"LABEL_PARENT": "Szülő mappa",
 		"BUTTON_CREATE": "Létrehozás",
 		"TITLE_CREATING_PROCESS": "Mappa létrehozás"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Ha egyszer elindult, a folyamatot nem lehet megszakítani.",
 		"TITLE_CLEARING_PROCESS": "Mappa ürítés..."
 	},
+	"CRYPTO": {
+		"SIGN": "Aláírás",
+		"ENCRYPT": "Titkosítás",
+		"DECRYPT": "Visszafejtés",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Jó aláírás tőle: %USER%",
+		"ERROR": "%TYPE% hiba: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "OpenPGP kulcs importálás",
 		"POPUP_IMPORT_BUTTON": "Importálás",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "OpenPGP kulcs generálás",
 		"POPUP_GENERATE_BUTTON": "Generálás",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Aláírás",
-		"LABEL_ENCRYPT": "Titkosítás",
-		"BUTTON_DECRYPT": "Visszafejtés",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP aláírt üzenet",
 		"ENCRYPTED_MESSAGE": "OpenPGP kódolt üzenet",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Jó aláírás tőle: %USER%",
-		"ERROR": "OpenPGP hiba: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME aláírt üzenet",
+		"ENCRYPTED_MESSAGE": "S\/MIME kódolt üzenet",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Szűrő létrehozás?",
-		"TITLE_EDIT_FILTER": "Szűrő frissítés?",
+		"TITLE_CREATE_FILTER": "Szűrő létrehozás",
+		"TITLE_EDIT_FILTER": "Szűrő frissítés",
 		"LEGEND_CONDITIONS": "Feltételek",
 		"LEGEND_ACTIONS": "Műveletek",
 		"BUTTON_ADD_CONDITION": "Feltétel hozzáadás",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Megjelölés olvasottként",
 		"REPLY_INTERVAL_LABEL": "Válasz időköz (nap)",
 		"KEEP_LABEL": "Megtart",
-		"STOP_LABEL": "Ne hagyja abba a szabályok feldolgozását",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Tárgy (nem kötelező)",
 		"VACATION_MESSAGE_LABEL": "Üzenet",
 		"VACATION_RECIPIENTS_LABEL": "Címzettek (vesszővel elválasztva)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Ismeretlen fájl feltöltési hiba történt"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Személyes",
-		"LABEL_GENERAL_NAME": "Általános",
-		"LABEL_CONTACTS_NAME": "Névjegyek",
-		"LABEL_FOLDERS_NAME": "Mappák",
-		"LABEL_ACCOUNTS_NAME": "Fiókok",
-		"LABEL_FILTERS_NAME": "Szűrők",
-		"LABEL_SECURITY_NAME": "Biztonság",
-		"LABEL_THEMES_NAME": "Témák"
+		"GENERAL": "Általános",
+		"CONTACTS": "Névjegyek",
+		"FOLDERS": "Mappák",
+		"ACCOUNTS": "Fiókok",
+		"FILTERS": "Szűrők",
+		"SECURITY": "Biztonság",
+		"THEMES": "Témák"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Szűrők",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Áthelyezés ide \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Továbbítás ide: \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Visszautasít",
 		"SUBNAME_VACATION_MESSAGE": "Vakáció üzenet",
-		"SUBNAME_DISCARD": "Elvetés",
-		"LOADING_PROCESS": "Szűrő lista frissítése"
+		"SUBNAME_DISCARD": "Elvetés"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Biztonság",
 		"LABEL_AUTOLOGOUT": "Automatikus kijelentkezés",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Soha",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% perc",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% óra"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Soha"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Általános",
-		"LABEL_LANGUAGE": "Nyelv",
-		"LABEL_IDENTITY": "Identitás",
-		"LABEL_LAYOUT": "Elrendezés",
-		"LABEL_LAYOUT_NO_SPLIT": "Felosztás nélkül",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
-		"LABEL_EDITOR": "Alapértelmezett szövegszerkesztő",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Egyszerű",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (kényszerített)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Egyszerű (kényszerített)",
-		"LABEL_VIEW_OPTIONS": "Nézet beállítások",
-		"LABEL_USE_PREVIEW_PANE": "Előnézeti ablak használata",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában",
-		"LABEL_USE_THREADS": "Szálak használata",
-		"LABEL_REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
-		"LABEL_SHOW_IMAGES": "Mindig jelenítse meg a külső képeket az üzenet törzsében",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Üzenetek egy oldalon",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Jelölje meg az üzenetet olvasottként",
+		"LANGUAGE": "Nyelv",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identitás",
+		"LAYOUT": "Elrendezés",
+		"LAYOUT_NO_SPLIT": "Felosztás nélkül",
+		"LAYOUT_VERTICAL_SPLIT": "Függőleges felosztás",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vízszintes felosztás",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Alapértelmezett szövegszerkesztő",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Egyszerű",
+		"VIEW_OPTIONS": "Nézet beállítások",
+		"USE_PREVIEW_PANE": "Előnézeti ablak használata",
+		"HIDE_DELETED_MESSAGES": "A törlésre megjelölt üzenetek elrejtése",
+		"USE_CHECKBOXES_IN_LIST": "Jelölőnégyzetek megjelenítése a listában",
+		"USE_THREADS": "Szálak használata",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Válaszüzenetek elhelyezése az eredeti üzenet mappájában",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Üzenetek egy oldalon",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Jelölje meg az üzenetet olvasottként",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "másodperc után",
-		"LABEL_NOTIFICATIONS": "Értesítések",
-		"LABEL_SOUND_NOTIFICATION": "Hangos értesítés",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Értesítések",
+		"SOUND_NOTIFICATION": "Hangos értesítés",
+		"CHROME_NOTIFICATION_DESC": "Új üzenetek értesítő ablakainak megjelenítése",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(a böngésző blokkolta)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Címzettek automatikus hozzáadása a címtárhoz",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Szerver",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Címtár URL",
 		"LABEL_CONTACTS_SYNC_USER": "Felhasználó",
-		"SYNC_NO": "Nem",
-		"SYNC_YES": "Igen",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Témák",
-		"LEGEND_THEMES_CUSTOM": "Saját téma beállítások",
-		"LABEL_CUSTOM_TYPE": "Típus",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Világos",
-		"LABEL_CUSTOM_TYPE_DARK": "Sötét",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Háttér",
+		"LABEL_BACKGROUND": "Háttér",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Háttérkép feltöltés (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "A fájl túl nagy",
 		"ERROR_FILE_TYPE_ERROR": "Érvénytelen fájl típus (csak JPG és PNG lehet)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Teljesítény problémák elkerülése miatt, csak egy részét jelenítjük meg.",
 		"HELP_DELETE_FOLDER": "Mappa törlés",
 		"HELP_SHOW_HIDE_FOLDER": "Mappa mutatás\/elrejtés",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Ellenőrizze\/ne ellenőrizze az új üzeneteket",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Ellenőrizze az új üzeneteket",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Naptár",
 		"TYPE_CONFIGURATION": "Konfiguráció",
 		"TYPE_CONTACTS": "Kapcsolatok",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Fiók hozzáadás",
 		"BUTTON_ADD_IDENTITY": "Identitás hozzáadás",
 		"LOADING_PROCESS": "Fiók lista frissítés",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Kulcs importálás",
 		"BUTTON_GENERATE_KEY_PAIR": "Kulcs generálás",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privát",
 		"TITLE_PUBLIC": "Publikus",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Piszkozat automatikus mentése",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Válasz mindenkinek",
 		"LABEL_FORWARD": "Továbbítás",
 		"LABEL_FORWARD_MULTIPLY": "Továbbítás melléklet(en)ként",
-		"LABEL_HELP": "Súgó",
 		"LABEL_CHECK_ALL": "Minden üzenet kijelölése",
 		"LABEL_DELETE": "Törlés",
 		"LABEL_OPEN_THREAD": "Kijelölt szál megnyitása",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Idézetek váltása az üzenetben",
 		"LABEL_THREAD_NEXT": "Következő üzenet a szálban",
 		"LABEL_THREAD_PREV": "Előző üzenet a szálban",
-		"LABEL_PRINT": "Nyomtatás",
 		"LABEL_EXIT_FULLSCREEN": "Kilépés a teljes képernyős módból",
 		"LABEL_CLOSE_MESSAGE": "Üzenet bezárás (előnézeti panel nélküli elrendezés)",
 		"LABEL_SWITCH_TO_LIST": "Fókusz váltása vissza az üzenetlistára",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Levélírás bezárása"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Érvénytelen kulcs",
-		"AUTH_ERROR": "Érvénytelen hitelesítés",
-		"CONNECTION_ERROR": "Nem lehet kapcsolódni a szerverhez",
-		"DOMAIN_ALREADY_EXISTS": "A domain már létezik",
-		"DOMAIN_NOT_ALLOWED": "A domain nem engedélyezett",
-		"ACCOUNT_NOT_ALLOWED": "A fiók nem engedélyezett",
-		"CONTACTS_SYNC_ERROR": "Hiba lépett fel a névjegyek szinkronizálása közben",
-		"CANT_GET_MESSAGE_LIST": "Nem tudom letölteni az üzenetlistát",
-		"CANT_GET_MESSAGE": "Nem tudom letölteni az üzenetet",
-		"CANT_DELETE_MESSAGE": "Nem lehet törölni az üzenetet",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Nem lehet áthelyezni az üzenetet",
-		"CANT_SAVE_MESSAGE": "Nem lehet menteni az üzenetet",
-		"CANT_SEND_MESSAGE": "Nem lehet elküldeni az üzenetet",
-		"INVALID_RECIPIENTS": "Érvénytelent címzettek",
-		"CANT_SAVE_FILTERS": "Nem lehet menteni a szűrőket",
-		"CANT_GET_FILTERS": "Nem lehet letölteni a szűrőket",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "A szűrők nem megfelelőek",
-		"CANT_CREATE_FOLDER": "Nem lehet létrehozni a mappát",
-		"CANT_RENAME_FOLDER": "Nem lehet átnevezni a mappát",
-		"CANT_DELETE_FOLDER": "Nem lehet törölni a mappát",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nem üres mappát nem lehet törölni",
-		"CANT_SUBSCRIBE_FOLDER": "Nem lehet feliratkozni mappára",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nem lehet leiratkozni mappáról",
-		"DEMO_SEND_MESSAGE_ERROR": "Biztonsági okokból, ebből a demó fiókból nem lehet külső e-mail címekre üzenetet küldeni.",
-		"DEMO_ACCOUNT_ERROR": "Biztonsági okokból, ebből a fiókból nem lehet elvégezni ezt a műveletet!",
-		"ACCOUNT_ALREADY_EXISTS": "A fiók már létezik",
-		"ACCOUNT_DOES_NOT_EXIST": "A fiók nem létezik",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Hiba történt a levelező szerverhez történő hozzáférés közben",
-		"INVALID_INPUT_ARGUMENT": "Érvénytelen input argumentum",
-		"UNKNOWN_ERROR": "Ismeretlen hiba"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Érvénytelen kulcs",
+		"AuthError": "Érvénytelen hitelesítés",
+		"ConnectionError": "Nem lehet kapcsolódni a szerverhez",
+		"DomainAlreadyExists": "A domain már létezik",
+		"DomainNotAllowed": "A domain nem engedélyezett",
+		"AccountNotAllowed": "A fiók nem engedélyezett",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Hiba lépett fel a névjegyek szinkronizálása közben",
+		"CantGetMessageList": "Nem tudom letölteni az üzenetlistát",
+		"CantGetMessage": "Nem tudom letölteni az üzenetet",
+		"CantDeleteMessage": "Nem lehet törölni az üzenetet",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Nem lehet áthelyezni az üzenetet",
+		"CantSaveMessage": "Nem lehet menteni az üzenetet",
+		"CantSendMessage": "Nem lehet elküldeni az üzenetet",
+		"InvalidRecipients": "Érvénytelent címzettek",
+		"CantSaveFilters": "Nem lehet menteni a szűrőket",
+		"CantGetFilters": "Nem lehet letölteni a szűrőket",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "A szűrők nem megfelelőek",
+		"CantCreateFolder": "Nem lehet létrehozni a mappát",
+		"CantRenameFolder": "Nem lehet átnevezni a mappát",
+		"CantDeleteFolder": "Nem lehet törölni a mappát",
+		"CantDeleteNonEmptyFolder": "Nem üres mappát nem lehet törölni",
+		"CantSubscribeFolder": "Nem lehet feliratkozni mappára",
+		"CantUnsubscribeFolder": "Nem lehet leiratkozni mappáról",
+		"DemoSendMessageError": "Biztonsági okokból, ebből a demó fiókból nem lehet külső e-mail címekre üzenetet küldeni.",
+		"DemoAccountError": "Biztonsági okokból, ebből a fiókból nem lehet elvégezni ezt a műveletet!",
+		"AccountAlreadyExists": "A fiók már létezik",
+		"AccountDoesNotExist": "A fiók nem létezik",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Hiba történt a levelező szerverhez történő hozzáférés közben",
+		"InvalidInputArgument": "Érvénytelen input argumentum",
+		"UnknownError": "Ismeretlen hiba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/admin.json b/snappymail/v/0.0.0/app/localization/id/admin.json
similarity index 66%
rename from snappymail/v/0.0.0/app/localization/id-ID/admin.json
rename to snappymail/v/0.0.0/app/localization/id/admin.json
index 03d4c8d3b..557ffb3b5 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/admin.json
+++ b/snappymail/v/0.0.0/app/localization/id/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Tambah",
+		"CLOSE": "Tutup",
 		"SAVE": "Simpan",
-		"UPDATE": "Pembaruan"
+		"TEST": "Ujicoba",
+		"UPDATE": "Pembaruan",
+		"USERNAME": "Nama belakang",
+		"PASSWORD": "Sandi",
+		"CANCEL": "Batal",
+		"SEARCH": "Tidak ditemukan kontak",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Login ke panel admin"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Panel Admin"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Umum",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontak",
-		"LABEL_DOMAINS_NAME": "Domain",
-		"LABEL_SECURITY_NAME": "Keamanan",
-		"LABEL_PACKAGES_NAME": "Paket",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Tentang"
+		"GENERAL": "Umum",
+		"LOGIN": "Login",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontak",
+		"DOMAINS": "Domain",
+		"SECURITY": "Keamanan",
+		"PACKAGES": "Paket",
+		"CONFIG": "Config",
+		"ABOUT": "Tentang"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Antarmuka",
@@ -31,23 +39,21 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Izinkan pemilihan bahasa pada laman pengaturan",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Izinkan pemilihan tema di laman pengaturan",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Izinkan pemilihan gambar latar di laman pengaturan",
-		"LABEL_NEW_FOLDER_MOVE": "Tombol \"pindahkan ke folder\" baru",
 		"LABEL_SHOW_THUMBNAILS": "Tampikankan gambar kecil (lampiran)",
 		"LEGEND_MAIN": "Utama",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Batas ukuran lampiran",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Izinkan akun tambahan",
 		"LABEL_ALLOW_IDENTITIES": "Izinkan identitas jamak",
-		"ALERT_DATA_ACCESS": "Data foldel RainLoop bisa diakses. Silahkan atur web server anda untuk menyembunyikan folder data dari akses eksternal. Baca selengkapnya di sini:",
+		"ALERT_DATA_ACCESS": "Data foldel SnappyMail bisa diakses. Silahkan atur web server anda untuk menyembunyikan folder data dari akses eksternal. Baca selengkapnya di sini:",
 		"ALERT_WARNING": "Peringatan!",
-		"HTML_ALERT_WEAK_PASSWORD": "Anda menggunakan password admin bawaan.\n<br>\nAtas alasan keamanan, mohon\n<strong><a href=\"#\/security\">mengganti<\/a><\/strong>\npassword dengan frasa yang lainnya segera.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "Anda menggunakan passphrase admin bawaan.\n<br>\nAtas alasan keamanan, mohon\n<strong><a href=\"#\/security\">mengganti<\/a><\/strong>\npassphrase dengan frasa yang lainnya segera.\n"
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Laman login",
 		"LABEL_DEFAULT_DOMAIN": "Domain bawaan",
 		"LABEL_DETERMINE_USER_DOMAIN": "Coba untuk memeriksa user domain",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Izinkan pemilihan bahasa di laman login",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Coba untuk memeriksa bahasa user",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Coba untuk memeriksa bahasa user"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
@@ -63,9 +69,10 @@
 		"LABEL_STORAGE_TYPE": "Tipe",
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "User",
-		"LABEL_STORAGE_PASSWORD": "Password",
-		"BUTTON_TEST": "Ujicoba",
+		"LABEL_STORAGE_PASSWORD": "Passphrase",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Perhatian!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Jangan gunakan tipe database ini untuk jumlah user aktif yang besar.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Sistem anda tidak mendukung kontak\n<br>\nAnda harus memasang atau mengaktifkan <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extension pada server anda.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Keamanan",
 		"LABEL_USE_IMAGE_PROXY": "Gunakan proxy lokal untuk gambar dari luar",
-		"LABEL_ALLOW_OPEN_PGP": "Izinkan OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Tampilkan informasi PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Hak Akses Panel Admin",
-		"LABEL_CURRENT_PASSWORD": "Password saat ini",
-		"LABEL_NEW_LOGIN": "Login baru",
-		"LABEL_NEW_PASSWORD": "Password baru",
+		"LABEL_CURRENT_PASSWORD": "Passphrase saat ini",
+		"LABEL_NEW_PASSWORD": "Passphrase baru",
 		"LABEL_REPEAT_PASSWORD": "Ulangi",
-		"BUTTON_UPDATE_PASSWORD": "Perbarui Password",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Diperlukan verifikasi sertifikat SSL dengan (IMAP\/SMTP) ",
+		"LABEL_REQUIRE_VERIFICATION": "Diperlukan verifikasi sertifikat SSL dengan",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Izinkan sertifikat yang dibuat sendiri"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Klien web-based email yang simpel, modern & cepat",
 		"LABEL_ALL_RIGHTS_RESERVED": "Hak Cipta",
 		"HINT_READ_CHANGE_LOG": "Mohon baca log perubahan sebelum melakukan pembaruan",
-		"HINT_IS_UP_TO_DATE": "RainLoop sudah terbaru",
+		"HINT_IS_UP_TO_DATE": "SnappyMail sudah terbaru",
 		"HTML_NEW_VERSION": "Versi  <b>%VERSION%<\/b> baru tersedia",
 		"LABEL_UPDATING": "Memperbarui",
 		"LABEL_CHECKING": "Memeriksa pembaruan",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Tambah Alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domain",
-		"BUTTON_CLOSE": "Tutup",
-		"BUTTON_ADD": "Tambah"
+		"LABEL_DOMAIN": "Domain"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Tambah Domain",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Ubah Domain \"%NAME%\"",
 		"LABEL_NAME": "Nama",
 		"NAME_HELPER": "Mendukung Wildcard",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Aman",
-		"LABEL_WHITE_LIST": "Daftar Putih",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Tidak satupun",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Izinkan script sieve",
 		"LABEL_USE_SHORT_LOGIN": "Gunakan login singkat",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Gunakan otentikasi",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Gunakan fungsi mail() PHP",
-		"BUTTON_TEST": "Ujicoba",
 		"BUTTON_WHITE_LIST": "Daftar Putih",
-		"BUTTON_SIEVE_CONFIGURATION": "Konfigurasi Sieve",
-		"BUTTON_BACK_TO_IMAP": "Kembali ke pengaturan IMAP",
-		"BUTTON_BACK": "Kembali",
-		"BUTTON_CLOSE": "Tutup",
-		"BUTTON_ADD": "Tambah",
-		"BUTTON_UPDATE": "Perbarui",
-		"NEW_DOMAIN_DESC": "Domain ini mengizinkan anda bekerja dengan alamat email <br>juga<i>%NAME%<\/i> ",
-		"WHITE_LIST_ALERT": "Daftar domain webmail user yang diizinkan diakses.\nGunakan spasi untuk pemisahnya\n"
+		"NEW_DOMAIN_DESC": "Domain ini mengizinkan anda bekerja dengan alamat email juga<strong>%NAME%<\/strong> ",
+		"WHITE_LIST_ALERT": "Daftar domain webmail user yang diizinkan diakses.\nGunakan spasi untuk pemisahnya\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
-		"DESC_NOTHING_TO_CONFIGURE": "Tidak ada yang dikonfigurasi",
-		"BUTTON_CLOSE": "Tutup"
+		"DESC_NOTHING_TO_CONFIGURE": "Tidak ada yang dikonfigurasi"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Anda yakin menutup jendela ini?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "Tidak stabil",
 		"WARNING": "Peringatan!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Kesalahan tidak diketahui"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Token invalid",
-		"AUTH_ERROR": "Otentikasi gagal",
-		"DOMAIN_ALREADY_EXISTS": "Domain sudah ada",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Tidak bisa menyimpan pengaturan",
-		"CANT_INSTALL_PACKAGE": "Gagal memasang paket",
-		"CANT_DELETE_PACKAGE": "Gagal menghapus paket",
-		"INVALID_PLUGIN_PACKAGE": "Paket plugin tidak sah",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Paket plugin tidak didukung",
-		"UNKNOWN_ERROR": "Kesalahan tidak diketahui"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Token invalid",
+		"AuthError": "Otentikasi gagal",
+		"DomainAlreadyExists": "Domain sudah ada",
+		"CantSavePluginSettings": "Tidak bisa menyimpan pengaturan",
+		"CantInstallPackage": "Gagal memasang paket",
+		"CantDeletePackage": "Gagal menghapus paket",
+		"InvalidPluginPackage": "Paket plugin tidak sah",
+		"UnsupportedPluginPackage": "Paket plugin tidak didukung",
+		"UnknownError": "Kesalahan tidak diketahui"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/id/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/id-ID/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/id/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/static.json b/snappymail/v/0.0.0/app/localization/id/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/id-ID/static.json
rename to snappymail/v/0.0.0/app/localization/id/static.json
diff --git a/snappymail/v/0.0.0/app/localization/id-ID/user.json b/snappymail/v/0.0.0/app/localization/id/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/id-ID/user.json
rename to snappymail/v/0.0.0/app/localization/id/user.json
index 6c9479604..f2482e3aa 100644
--- a/snappymail/v/0.0.0/app/localization/id-ID/user.json
+++ b/snappymail/v/0.0.0/app/localization/id/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Pengarsipan",
 		"ARE_YOU_SURE": "Anda yakin?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Tutup (esc)",
 		"CONTACTS": "Kontak",
 		"DELETE": "Hapus",
+		"UNDELETE": "Undelete",
 		"DONE": "Selesai",
 		"EMAIL": "Email",
 		"FROM": "Dari",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Keluar",
 		"MORE": "Lagi",
 		"MOVE_TO": "Pindahkan Ke",
+		"COPY_TO": "Salin ke",
 		"NAME": "Kotak Masuk",
 		"NONE": "Tidak ada",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Bukan Spam",
+		"USERNAME": "Nama belakang",
 		"PASSWORD": "Sandi",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Balas-Ke",
 		"SAVE": "Simpan",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Tidak ditemukan kontak",
 		"SPAM": "Spam",
 		"SUBJECT": "Judul",
 		"TEST": "Uji",
-		"TO": "Kepada"
+		"TO": "Kepada",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Ya",
+		"NO": "Tidak",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "Bawaan",
+		"HELP": "Bantuan",
+		"TEXT": "Teks",
+		"ATTACHMENTS": "Lampiran"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Masuk"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Tambah Akun",
-		"BUTTON_SETTINGS": "Pengaturan",
-		"BUTTON_HELP": "Bantuan"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versi Mobile",
-		"BUTTON_DESKTOP_VERSION": "Versi Desktop"
+		"BUTTON_ADD_ACCOUNT": "Tambah Akun"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Pencarian Rinci",
-		"LABEL_ADV_TEXT": "Teks",
-		"LABEL_ADV_HAS_ATTACHMENT": "Memiliki lampiran",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Memiliki lampiran",
-		"LABEL_ADV_FLAGGED": "Ditandai",
-		"LABEL_ADV_UNSEEN": "Belum dilihat",
-		"LABEL_ADV_DATE": "Tanggal",
-		"LABEL_ADV_DATE_ALL": "Semua",
-		"LABEL_ADV_DATE_3_DAYS": "Sudah 3 hari lalu",
-		"LABEL_ADV_DATE_7_DAYS": "Sudah 1 bulan lalu",
-		"LABEL_ADV_DATE_MONTH": "Lebih dari 1 bulan lalu",
-		"LABEL_ADV_DATE_3_MONTHS": "Lebih dari 3 bulan lalu",
-		"LABEL_ADV_DATE_6_MONTHS": "Lebih dari 6 bulan lalu",
-		"LABEL_ADV_DATE_YEAR": "Lebih dari 1 tahun lalu",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Beralih ke layar penuh",
-		"ZOOM": "Perbesar\/perkecil",
-		"CLOSE": "Tutup (esc)",
-		"GALLERY_PREV": "Sebelumnya (panah kiri)",
-		"GALLERY_NEXT": "Selanjutnya (panah kanan)",
-		"GALLERY_COUNTER": "%curr% dari %total%"
+		"TEXT": "Teks",
+		"HAS_ATTACHMENT": "Memiliki lampiran",
+		"FLAGGED": "Ditandai",
+		"UNSEEN": "Belum dilihat",
+		"DATE": "Tanggal",
+		"DATE_ALL": "Semua",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Sudah 3 hari lalu",
+		"SINCE_7_DAYS": "Sudah 1 bulan lalu",
+		"SINCE_MONTH": "Lebih dari 1 bulan lalu",
+		"SINCE_3_MONTHS": "Lebih dari 3 bulan lalu",
+		"SINCE_6_MONTHS": "Lebih dari 6 bulan lalu",
+		"SINCE_YEAR": "Lebih dari 1 tahun lalu",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Dijawab",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Tulis baru",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Sampah",
 		"ARCHIVE_NAME": "Arsip"
 	},
-	"QUOTA": {
-		"TITLE": "Jatah digunakan"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Muat Ulang Daftar Pesan",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Dibaca",
 		"MENU_SELECT_FLAGGED": "Ditandai",
 		"MENU_SELECT_UNFLAGGED": "Jangan tandai",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Daftar kosong",
 		"EMPTY_SEARCH_LIST": "Tidak ada pesan yang sesuai dengan pencarian",
 		"SEARCH_RESULT_FOR": "Hasil pencarian untuk \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Kembali ke daftar pesan",
-		"EMPTY_SUBJECT_TEXT": "(Tanpa Judul)",
 		"PUT_MESSAGE_HERE": "Taruh pesan di sini untuk melihatnya dalam daftar",
 		"TODAY_AT": "hari ini pada %TIME%",
 		"YESTERDAY_AT": "Kemarin pada  %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Anda memiliki %COUNT% pesan baru!",
 		"QUOTA_SIZE": "Menggunakan <strong>%SIZE% (%PROC%%)<\/strong> dari <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Tampilkan kode sumber",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Unduh sebagai berkas .eml",
 		"MENU_FILTER_SIMILAR": "Saring pesan seperti ini",
 		"MENU_PRINT": "Cetak",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klik pada nama folder pada panel kiri untuk memilih tujuan.",
 		"LINK_DOWNLOAD_AS_ZIP": "Unduh sebagai berkas zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Tanda terima (ditampilkan) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Pencarian..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Tambah Kontak",
 		"BUTTON_CREATE_CONTACT": "Simpan",
-		"BUTTON_UPDATE_CONTACT": "Perbarui",
 		"BUTTON_IMPORT": "Impor (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Expor (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Expor (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Tidak ditemukan kontak",
 		"CLEAR_SEARCH": "Bersihkan pencarian",
 		"CONTACT_VIEW_DESC": "Pilih kontak pada daftar untuk ditampilkan di sini.",
-		"LABEL_PHONE": "Telepon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Tanggal lahir",
-		"LINK_ADD_EMAIL": "Tambah alamat email",
-		"LINK_ADD_PHONE": "Tambah telepon",
-		"LINK_BIRTHDAY": "Tanggal lahir",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Isi nama tampilan",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Isi nama belakang ",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Isi nama depan",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Isi nama panggilan",
+		"DISPLAY_NAME": "Tampilan",
+		"LAST_NAME": "Belakang ",
+		"FIRST_NAME": "Depan",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Panggilan",
 		"LABEL_READ_ONLY": "Hanya bisa dibaca",
-		"LABEL_SHARE": "Bagikan",
 		"ADD_MENU_LABEL": "Tambah",
 		"ADD_MENU_NICKNAME": "Nama panggilan",
-		"ADD_MENU_NOTES": "Catatan",
+		"ADD_MENU_NOTE": "Catatan",
 		"ADD_MENU_PHONE": "Telepon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Alamat",
 		"ADD_MENU_BIRTHDAY": "Tanggal lahir",
 		"ADD_MENU_TAGS": "Penanda",
 		"BUTTON_SHARE_ALL": "Semuanya",
-		"BUTTON_SYNC": "Sinkronisasi (CardDAV)"
+		"BUTTON_SYNC": "Sinkronisasi (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "tampikan semua isian",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Tidak ada lampiran",
 		"ATTACHMENTS_ERROR_DESC": "Peringatan! belum semua lampiran terunggah.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Belum semua lampiran terunggah.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis",
 		"BUTTON_REQUEST_READ_RECEIPT": "Minta pemberitahuan telah dibaca",
 		"BUTTON_MARK_AS_IMPORTANT": "Tandai sebagai pesan penting",
-		"BUTTON_REQUEST_DSN": "Minta pemberitahuan berhasil kirim"
+		"BUTTON_REQUEST_DSN": "Minta pemberitahuan berhasil kirim",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ya",
-		"BUTTON_NO": "Tidak",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Anda yakin untuk menutup jendela ini?",
 		"DESC_WANT_DELETE_MESSAGES": "Anda yakin menghapus permanen pesan ini?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Pilih bahasa"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Tambah Akun?",
+		"TITLE_ADD_ACCOUNT": "Tambah Akun",
 		"BUTTON_ADD_ACCOUNT": "Tambah",
-		"TITLE_UPDATE_ACCOUNT": "Perbarui Akun?",
-		"BUTTON_UPDATE_ACCOUNT": "Perbarui"
+		"TITLE_UPDATE_ACCOUNT": "Perbarui Akun"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Tambah Identitas?",
-		"TITLE_UPDATE_IDENTITY": "Perbarui Identitas?",
+		"TITLE_ADD_IDENTITY": "Tambah Identitas",
+		"TITLE_UPDATE_IDENTITY": "Perbarui Identitas",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Tambah",
-		"BUTTON_UPDATE_IDENTITY": "Perbarui",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sisipkan tanda tangan ini sebelum teks kutipan pada balasan"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Buat folder?",
+		"TITLE_CREATE_FOLDER": "Buat folder",
 		"LABEL_PARENT": "Folder induk",
 		"BUTTON_CREATE": "Buat",
 		"TITLE_CREATING_PROCESS": "Membuat folder"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Begitu dimulai, proses tidak dapat dibatalkan atau ditunda.",
 		"TITLE_CLEARING_PROCESS": "Membersihkan folder..."
 	},
+	"CRYPTO": {
+		"SIGN": "Tandatangan",
+		"ENCRYPT": "Enkripsi",
+		"DECRYPT": "Deskripsi",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Tandatangan sah dari user %USER%",
+		"ERROR": "Kesalahan %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Impor kunci OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Impor",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Buat kunci OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Buat",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Tandatangan",
-		"LABEL_ENCRYPT": "Enkripsi",
-		"BUTTON_DECRYPT": "Deskripsi",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Pesan bertanda-tangan OpenPGP",
 		"ENCRYPTED_MESSAGE": "Pesan terenkripsi OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Tandatangan sah dari user %USER%",
-		"ERROR": "Kesalahan OpenPGP: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Pesan bertanda-tangan S\/MIME",
+		"ENCRYPTED_MESSAGE": "Pesan terenkripsi S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Buat filter?",
-		"TITLE_EDIT_FILTER": "Perbarui filter?",
+		"TITLE_CREATE_FILTER": "Buat filter",
+		"TITLE_EDIT_FILTER": "Perbarui filter",
 		"LEGEND_CONDITIONS": "Kondisi",
 		"LEGEND_ACTIONS": "Aksi",
 		"BUTTON_ADD_CONDITION": "Tambah kondisi",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Tandai sudah dibaca",
 		"REPLY_INTERVAL_LABEL": "Selang waktu balasan (hari)",
 		"KEEP_LABEL": "Tahan",
-		"STOP_LABEL": "Jangan hentikan peraturan proses",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Subjek (opsional)",
 		"VACATION_MESSAGE_LABEL": "Pesan",
 		"VACATION_RECIPIENTS_LABEL": "Penerima (dipisahkan koma)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Kesalahan tidak diketahui saat unggah file"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Pribadi",
-		"LABEL_GENERAL_NAME": "Umum",
-		"LABEL_CONTACTS_NAME": "Kontak",
-		"LABEL_FOLDERS_NAME": "Folder",
-		"LABEL_ACCOUNTS_NAME": "Akun",
-		"LABEL_FILTERS_NAME": "Filter",
-		"LABEL_SECURITY_NAME": "Keamanan",
-		"LABEL_THEMES_NAME": "Tema"
+		"GENERAL": "Umum",
+		"CONTACTS": "Kontak",
+		"FOLDERS": "Folder",
+		"ACCOUNTS": "Akun",
+		"FILTERS": "Filter",
+		"SECURITY": "Keamanan",
+		"THEMES": "Tema"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Pindahkan ke \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Teruskan ke \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Tolak",
 		"SUBNAME_VACATION_MESSAGE": "Pesan liburan",
-		"SUBNAME_DISCARD": "Buang",
-		"LOADING_PROCESS": "Perbarui daftar filter"
+		"SUBNAME_DISCARD": "Buang"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Keamanan",
 		"LABEL_AUTOLOGOUT": "Logout otomatis",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Tidak pernah",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% menit",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% jam"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Tidak pernah"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Umum",
-		"LABEL_LANGUAGE": "Bahasa",
-		"LABEL_IDENTITY": "Identitas",
-		"LABEL_LAYOUT": "Tampilan",
-		"LABEL_LAYOUT_NO_SPLIT": "Tanpa pemisah",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
-		"LABEL_EDITOR": "Editor teks bawaan",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Polos",
-		"LABEL_EDITOR_HTML_FORCED": "Html (paksa)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Polos (paksa)",
-		"LABEL_VIEW_OPTIONS": "Tampilkan Opsi",
-		"LABEL_USE_PREVIEW_PANE": "Gunakan panel pratinjau",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar",
-		"LABEL_USE_THREADS": "Gunakan tread",
-		"LABEL_REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
-		"LABEL_SHOW_IMAGES": "Selalu tampilkan gambar eksternal di dalam pesan",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Pesan di halaman",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Bahasa",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identitas",
+		"LAYOUT": "Tampilan",
+		"LAYOUT_NO_SPLIT": "Tanpa pemisah",
+		"LAYOUT_VERTICAL_SPLIT": "Pemisah vertikal",
+		"LAYOUT_HORIZONTAL_SPLIT": "Pemisah horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Editor teks bawaan",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Polos",
+		"VIEW_OPTIONS": "Tampilkan Opsi",
+		"USE_PREVIEW_PANE": "Gunakan panel pratinjau",
+		"HIDE_DELETED_MESSAGES": "Sembunyikan pesan yang ditandai untuk dihapus",
+		"USE_CHECKBOXES_IN_LIST": "Tampilkan centang dalam daftar",
+		"USE_THREADS": "Gunakan tread",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Tempatkan pesan balasan di folder pesan yang dibalas",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Pesan di halaman",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikasi",
-		"LABEL_SOUND_NOTIFICATION": "Notifikasi suara",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notifikasi",
+		"SOUND_NOTIFICATION": "Notifikasi suara",
+		"CHROME_NOTIFICATION_DESC": "Tampilkan jendela sembul notifikasi pesan",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(diblokir oleh browser)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Tambah penerima ke daftar alamat secara otomatis",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL Buku alamat",
 		"LABEL_CONTACTS_SYNC_USER": "User",
-		"SYNC_NO": "Tidak",
-		"SYNC_YES": "Ya",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tema",
-		"LEGEND_THEMES_CUSTOM": "Konfigurasi tema khusus",
-		"LABEL_CUSTOM_TYPE": "Tipe",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Terang",
-		"LABEL_CUSTOM_TYPE_DARK": "Gelap",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Latar",
+		"LABEL_BACKGROUND": "Latar",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Unggah gambar latar (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "File terlalu besar",
 		"ERROR_FILE_TYPE_ERROR": "Tipe file tidak sah (JPG dan PNG saja)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Kami hanya menampilkan sebagian, untuk mencegah turunnya performa.",
 		"HELP_DELETE_FOLDER": "Hapus folder",
 		"HELP_SHOW_HIDE_FOLDER": "Tampil\/lenyapkan folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Cek\/jangan cek pesan baru",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Cek pesan baru",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Tambahkan akun",
 		"BUTTON_ADD_IDENTITY": "Tambahkan identitas",
 		"LOADING_PROCESS": "Memperbarui...",
-		"DEFAULT_IDENTITY_LABEL": "Bawaan"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Impor kunci",
 		"BUTTON_GENERATE_KEY_PAIR": "Buat kunci",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Pribadi",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Simpan konsep otomatis",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Balas semua",
 		"LABEL_FORWARD": "Teruskan",
 		"LABEL_FORWARD_MULTIPLY": "Teruskan sebagai berkas",
-		"LABEL_HELP": "Bantuan",
 		"LABEL_CHECK_ALL": "Pilih semua pesan",
 		"LABEL_DELETE": "Hapus",
 		"LABEL_OPEN_THREAD": "Buka pekerjaan terpilih",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Tetapkan kutip pesan",
 		"LABEL_THREAD_NEXT": "Pesan berikutnya dalam rentang",
 		"LABEL_THREAD_PREV": "Pesan sebelumnya dalam rentang",
-		"LABEL_PRINT": "Cetak",
 		"LABEL_EXIT_FULLSCREEN": "Keluar dari mode Layar penuh",
 		"LABEL_CLOSE_MESSAGE": "Tutup pesan (Tanpa panel pratinjau)",
 		"LABEL_SWITCH_TO_LIST": "Pindahkan fokus kembali ke daftar pesan",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Tutup buat pesan"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Token tidak sah",
-		"AUTH_ERROR": "Otentikasi gagal",
-		"CONNECTION_ERROR": "Tidak terhubung ke server",
-		"DOMAIN_ALREADY_EXISTS": "Domain telah ada",
-		"DOMAIN_NOT_ALLOWED": "Domain tidak diizinkan",
-		"ACCOUNT_NOT_ALLOWED": "Akun ini tidak diizinkan",
-		"CONTACTS_SYNC_ERROR": "Kesalahan sinkronisasi kontak",
-		"CANT_GET_MESSAGE_LIST": "Gagal memperoleh daftar pesan",
-		"CANT_GET_MESSAGE": "Gagal memperoleh pesan",
-		"CANT_DELETE_MESSAGE": "Gagal menghapus pesan",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Gagal memindahkan pesan",
-		"CANT_SAVE_MESSAGE": "Gagal menyimpan pesan",
-		"CANT_SEND_MESSAGE": "Gagal mengirim pesan",
-		"INVALID_RECIPIENTS": "Penerima tidak valid",
-		"CANT_SAVE_FILTERS": "Gagal menyimpan filter",
-		"CANT_GET_FILTERS": "Gagal memperoleh filter",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filter tidak benar",
-		"CANT_CREATE_FOLDER": "Gagal membuat folder",
-		"CANT_RENAME_FOLDER": "Gagal mengubah nama folder",
-		"CANT_DELETE_FOLDER": "Gagal menghapus folder",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Gagal menghapus direkori yang berisi",
-		"CANT_SUBSCRIBE_FOLDER": "Gagal mengkaitkan folder",
-		"CANT_UNSUBSCRIBE_FOLDER": "Tidak bisa memutus folder",
-		"DEMO_SEND_MESSAGE_ERROR": "Atas alasan keamanan, akun ini tidak diizinkan mengirim pesan ke alamat luar!",
-		"DEMO_ACCOUNT_ERROR": "Atas alasan keamanan, akun ini tidak diizinkan melakukan aksi ini!",
-		"ACCOUNT_ALREADY_EXISTS": "Akun sudah ada",
-		"ACCOUNT_DOES_NOT_EXIST": "Akun tidak ada",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Terjadi kesalahan saat mengakses server mail",
-		"INVALID_INPUT_ARGUMENT": "Uraian input tidak sah",
-		"UNKNOWN_ERROR": "Kesalahan tidak diketahui"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Token tidak sah",
+		"AuthError": "Otentikasi gagal",
+		"ConnectionError": "Tidak terhubung ke server",
+		"DomainAlreadyExists": "Domain telah ada",
+		"DomainNotAllowed": "Domain tidak diizinkan",
+		"AccountNotAllowed": "Akun ini tidak diizinkan",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kesalahan sinkronisasi kontak",
+		"CantGetMessageList": "Gagal memperoleh daftar pesan",
+		"CantGetMessage": "Gagal memperoleh pesan",
+		"CantDeleteMessage": "Gagal menghapus pesan",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Gagal memindahkan pesan",
+		"CantSaveMessage": "Gagal menyimpan pesan",
+		"CantSendMessage": "Gagal mengirim pesan",
+		"InvalidRecipients": "Penerima tidak valid",
+		"CantSaveFilters": "Gagal menyimpan filter",
+		"CantGetFilters": "Gagal memperoleh filter",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filter tidak benar",
+		"CantCreateFolder": "Gagal membuat folder",
+		"CantRenameFolder": "Gagal mengubah nama folder",
+		"CantDeleteFolder": "Gagal menghapus folder",
+		"CantDeleteNonEmptyFolder": "Gagal menghapus direkori yang berisi",
+		"CantSubscribeFolder": "Gagal mengkaitkan folder",
+		"CantUnsubscribeFolder": "Tidak bisa memutus folder",
+		"DemoSendMessageError": "Atas alasan keamanan, akun ini tidak diizinkan mengirim pesan ke alamat luar!",
+		"DemoAccountError": "Atas alasan keamanan, akun ini tidak diizinkan melakukan aksi ini!",
+		"AccountAlreadyExists": "Akun sudah ada",
+		"AccountDoesNotExist": "Akun tidak ada",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Terjadi kesalahan saat mengakses server mail",
+		"InvalidInputArgument": "Uraian input tidak sah",
+		"UnknownError": "Kesalahan tidak diketahui"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/is/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/is-IS/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/is/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/static.json b/snappymail/v/0.0.0/app/localization/is/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/is-IS/static.json
rename to snappymail/v/0.0.0/app/localization/is/static.json
diff --git a/snappymail/v/0.0.0/app/localization/is-IS/user.json b/snappymail/v/0.0.0/app/localization/is/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/is-IS/user.json
rename to snappymail/v/0.0.0/app/localization/is/user.json
index e15e0f27d..d9c9c6de6 100644
--- a/snappymail/v/0.0.0/app/localization/is-IS/user.json
+++ b/snappymail/v/0.0.0/app/localization/is/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Skjalavörsla",
 		"ARE_YOU_SURE": "Ertu viss?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Loka (Esc)",
 		"CONTACTS": "Tengiliðir",
 		"DELETE": "Eyða",
+		"UNDELETE": "Undelete",
 		"DONE": "Lokið",
 		"EMAIL": "Tölvupóstfang",
 		"FROM": "Frá",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Útskrá",
 		"MORE": "Meira",
 		"MOVE_TO": "Færa í",
+		"COPY_TO": "Afrita til",
 		"NAME": "Innhólf",
 		"NONE": "Ekkert",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ekki ruslpóstur",
+		"USERNAME": "Notendanafn",
 		"PASSWORD": "Lykilorð",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Svara-til",
 		"SAVE": "Vista",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Engir tengiliðir fundust",
 		"SPAM": "Ruslpóstur",
 		"SUBJECT": "Viðfangsefni",
 		"TEST": "Prófa",
-		"TO": "Til"
+		"TO": "Til",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Já",
+		"NO": "Nei",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "sjálfgefið",
+		"HELP": "Hjálp",
+		"TEXT": "Texti",
+		"ATTACHMENTS": "Viðhengi"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Innskráning",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Skrá inn"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Bæta við aðgangi",
-		"BUTTON_SETTINGS": "Stillingar",
-		"BUTTON_HELP": "Hjálp"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Farsímaútgáfa",
-		"BUTTON_DESKTOP_VERSION": "Vinnutölvuútgáfa"
+		"BUTTON_ADD_ACCOUNT": "Bæta við aðgangi"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Ítarleg leit",
-		"LABEL_ADV_TEXT": "Texti",
-		"LABEL_ADV_HAS_ATTACHMENT": "Er með viðhengi",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Er með viðhengi",
-		"LABEL_ADV_FLAGGED": "Flaggað",
-		"LABEL_ADV_UNSEEN": "Ólesið",
-		"LABEL_ADV_DATE": "Dagsetning",
-		"LABEL_ADV_DATE_ALL": "Allt",
-		"LABEL_ADV_DATE_3_DAYS": "Allt að 3 daga gömlu",
-		"LABEL_ADV_DATE_7_DAYS": "Allt að viku gömlu",
-		"LABEL_ADV_DATE_MONTH": "Allt að mánaðar gömlu",
-		"LABEL_ADV_DATE_3_MONTHS": "Allt að 3 mánaða gömlu",
-		"LABEL_ADV_DATE_6_MONTHS": "Allt að 6 mánaða gömlu",
-		"LABEL_ADV_DATE_YEAR": "Allt að 1 árs gömlu",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Víxla heilskjá af\/á",
-		"ZOOM": "Aðdráttur að\/frá",
-		"CLOSE": "Loka (Esc)",
-		"GALLERY_PREV": "Fyrra (vinstri örvarhnappur)",
-		"GALLERY_NEXT": "Næsta (hægri örvarhnappur)",
-		"GALLERY_COUNTER": "%curr% af %total%"
+		"TEXT": "Texti",
+		"HAS_ATTACHMENT": "Er með viðhengi",
+		"FLAGGED": "Flaggað",
+		"UNSEEN": "Ólesið",
+		"DATE": "Dagsetning",
+		"DATE_ALL": "Allt",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Allt að 3 daga gömlu",
+		"SINCE_7_DAYS": "Allt að viku gömlu",
+		"SINCE_MONTH": "Allt að mánaðar gömlu",
+		"SINCE_3_MONTHS": "Allt að 3 mánaða gömlu",
+		"SINCE_6_MONTHS": "Allt að 6 mánaða gömlu",
+		"SINCE_YEAR": "Allt að 1 árs gömlu",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Svarað",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Semja",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Ruslafata",
 		"ARCHIVE_NAME": "Safnskrá"
 	},
-	"QUOTA": {
-		"TITLE": "Disknotkun"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Endurhlaða skilaboðalista",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Lesið",
 		"MENU_SELECT_FLAGGED": "Flaggað",
 		"MENU_SELECT_UNFLAGGED": "Afflaggað",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tómur listi.",
 		"EMPTY_SEARCH_LIST": "Engin skilaboð stemmdu við leitina þína.",
 		"SEARCH_RESULT_FOR": "Leitarniðurstöður fyrir \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "til baka í skilaboðalista",
-		"EMPTY_SUBJECT_TEXT": "(Ekkert viðfangsefni)",
 		"PUT_MESSAGE_HERE": "Slepptu skilaboðum hér til að skoða það í listanum",
 		"TODAY_AT": "í dag kl. %TIME%",
 		"YESTERDAY_AT": "í gær kl. %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Þú átt %COUNT% ný skilaboð!",
 		"QUOTA_SIZE": "Notar <strong>%SIZE% (%PROC%%)<\/strong> af <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Sýna upprunalegt",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Sækja sem .eml skrá",
 		"MENU_FILTER_SIMILAR": "Sía skilaboð eins og þessi",
 		"MENU_PRINT": "Prenta",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Smelltu á heiti möppu á spjaldinu til vinstri til að velja áfangastaðinn.",
 		"LINK_DOWNLOAD_AS_ZIP": "Sækja sem .zip skrá",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Móttökukvittun (birt) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Leita..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Bæta við tengilið",
 		"BUTTON_CREATE_CONTACT": "Búa til",
-		"BUTTON_UPDATE_CONTACT": "Uppfæra",
 		"BUTTON_IMPORT": "Flytja inn (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Flytja út (csv, vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Flytja út (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Engir tengiliðir fundust",
 		"CLEAR_SEARCH": "Hreinsa leit",
 		"CONTACT_VIEW_DESC": "Veldu tengilið í listanum til að skoða hér.",
-		"LABEL_PHONE": "Sími",
-		"LABEL_WEB": "Vefsíða",
 		"LABEL_BIRTHDAY": "Afmælisdagur",
-		"LINK_ADD_EMAIL": "Bæta við tölvupóstfangi",
-		"LINK_ADD_PHONE": "Bæta við síma",
-		"LINK_BIRTHDAY": "Afmælisdagur",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Settu inn birtingarnafn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Settu inn kenninafn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Settu inn eiginnafn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Birtingarnafn",
+		"LAST_NAME": "Kenninafn",
+		"FIRST_NAME": "Eiginnafn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Aðeins lesanlegt",
-		"LABEL_SHARE": "Deila",
 		"ADD_MENU_LABEL": "Bæta við",
 		"ADD_MENU_NICKNAME": "Stuttnefni",
-		"ADD_MENU_NOTES": "Minnispunktar",
+		"ADD_MENU_NOTE": "Minnispunktar",
 		"ADD_MENU_PHONE": "Sími",
 		"ADD_MENU_URL": "URL-slóð",
 		"ADD_MENU_ADDRESS": "Heimilisfang",
 		"ADD_MENU_BIRTHDAY": "Afmælisdagur",
 		"ADD_MENU_TAGS": "Merki",
 		"BUTTON_SHARE_ALL": "Allir",
-		"BUTTON_SYNC": "Samstilling (CardDAV)"
+		"BUTTON_SYNC": "Samstilling (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "sýna alla reiti",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Engin viðhengi hér.",
 		"ATTACHMENTS_ERROR_DESC": "Aðvörun! Ekki er búið að senda inn öll viðhengi.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ekki er búið að senda inn öll viðhengi.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa",
 		"BUTTON_REQUEST_READ_RECEIPT": "Biðja um staðfestingu á lestri",
 		"BUTTON_MARK_AS_IMPORTANT": "Merkja sem mikilvægt",
-		"BUTTON_REQUEST_DSN": "Biðja um staðfestingu á afhendingu"
+		"BUTTON_REQUEST_DSN": "Biðja um staðfestingu á afhendingu",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Já",
-		"BUTTON_NO": "Nei",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ertu viss um að þú viljir loka þessum glugga?",
 		"DESC_WANT_DELETE_MESSAGES": "Ertu viss um að þú viljir eyða skeytunum?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Veldu tungumálið þitt"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Bæta við aðgangi?",
+		"TITLE_ADD_ACCOUNT": "Bæta við aðgangi",
 		"BUTTON_ADD_ACCOUNT": "Bæta við",
-		"TITLE_UPDATE_ACCOUNT": "Uppfæra aðgang?",
-		"BUTTON_UPDATE_ACCOUNT": "Uppfæra"
+		"TITLE_UPDATE_ACCOUNT": "Uppfæra aðgang"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Bæta við auðkenni?",
-		"TITLE_UPDATE_IDENTITY": "Uppfæra auðkenni?",
+		"TITLE_ADD_IDENTITY": "Bæta við auðkenni",
+		"TITLE_UPDATE_IDENTITY": "Uppfæra auðkenni",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Bæta við",
-		"BUTTON_UPDATE_IDENTITY": "Uppfæra",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Setja þessa undirskrift inn á undan tilvitnuðum texta þegar verið er að svara"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Búa til möppu?",
+		"TITLE_CREATE_FOLDER": "Búa til möppu",
 		"LABEL_PARENT": "Undirmappa",
 		"BUTTON_CREATE": "Búa til",
 		"TITLE_CREATING_PROCESS": "Bý til möppu"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Það er ekki hægt að hætta við aðgerðina eftir að búið er að keyra hana.",
 		"TITLE_CLEARING_PROCESS": "Tæmi möppu..."
 	},
+	"CRYPTO": {
+		"SIGN": "Undirrita",
+		"ENCRYPT": "Dulrita",
+		"DECRYPT": "Afkóða",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Gild undirritun frá %USER%",
+		"ERROR": "%TYPE% villa: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Flytja inn OpenPGP-lykil",
 		"POPUP_IMPORT_BUTTON": "Flytja inn",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Búa til OpenPGP-lykla",
 		"POPUP_GENERATE_BUTTON": "Útbúa",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Undirrita",
-		"LABEL_ENCRYPT": "Dulrita",
-		"BUTTON_DECRYPT": "Afkóða",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Skeyti undirritað með OpenPGP",
 		"ENCRYPTED_MESSAGE": "Skeyti dulritað með OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Gild undirritun frá %USER%",
-		"ERROR": "OpenPGP villa: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Skeyti undirritað með S\/MIME",
+		"ENCRYPTED_MESSAGE": "Skeyti dulritað með S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Búa til síu?",
-		"TITLE_EDIT_FILTER": "Uppfæra síu?",
+		"TITLE_CREATE_FILTER": "Búa til síu",
+		"TITLE_EDIT_FILTER": "Uppfæra síu",
 		"LEGEND_CONDITIONS": "Skilyrði",
 		"LEGEND_ACTIONS": "Aðgerðir",
 		"BUTTON_ADD_CONDITION": "Bæta við skilyrði",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Merkja sem lesið",
 		"REPLY_INTERVAL_LABEL": "Bil milli svara (dagar)",
 		"KEEP_LABEL": "Halda",
-		"STOP_LABEL": "Ekki hætta að vinna með reglur",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Viðfangsefni (valkvætt)",
 		"VACATION_MESSAGE_LABEL": "Skilaboð",
 		"VACATION_RECIPIENTS_LABEL": "Viðtakendur (aðgreindir með kommu)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Óþekkt innsendingarvilla kom upp"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXTI"
+		"PLAIN": "HTML <-> TEXTI",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Persónulegt",
-		"LABEL_GENERAL_NAME": "Almennt",
-		"LABEL_CONTACTS_NAME": "Tengiliðir",
-		"LABEL_FOLDERS_NAME": "Möppur",
-		"LABEL_ACCOUNTS_NAME": "Aðgangar",
-		"LABEL_FILTERS_NAME": "Síur",
-		"LABEL_SECURITY_NAME": "Öryggi",
-		"LABEL_THEMES_NAME": "Þemu"
+		"GENERAL": "Almennt",
+		"CONTACTS": "Tengiliðir",
+		"FOLDERS": "Möppur",
+		"ACCOUNTS": "Aðgangar",
+		"FILTERS": "Síur",
+		"SECURITY": "Öryggi",
+		"THEMES": "Þemu"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Síur",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Færa í \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Áframsenda til \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Hafna",
 		"SUBNAME_VACATION_MESSAGE": "Skilaboð vegna fría",
-		"SUBNAME_DISCARD": "Henda",
-		"LOADING_PROCESS": "Uppfæri síulista"
+		"SUBNAME_DISCARD": "Henda"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Öryggi",
 		"LABEL_AUTOLOGOUT": "Sjálfvirk útskráning",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrei",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% mínútu(r)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% klukkustund(ir)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Aldrei"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Almennt",
-		"LABEL_LANGUAGE": "Tungumál",
-		"LABEL_IDENTITY": "Auðkenni",
-		"LABEL_LAYOUT": "Framsetning",
-		"LABEL_LAYOUT_NO_SPLIT": "Ekki klofið",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
-		"LABEL_EDITOR": "Sjálfgefinn textaritill",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Venjulegt",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (þvingað)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Einfalt (þvingað)",
-		"LABEL_VIEW_OPTIONS": "Valkostir skoðunar",
-		"LABEL_USE_PREVIEW_PANE": "Nota forskoðunarham",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum",
-		"LABEL_USE_THREADS": "Nota þræði",
-		"LABEL_REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
-		"LABEL_SHOW_IMAGES": "Sýna ávallt myndir í skilaboðum",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Skilaboð á síðu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Tungumál",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Auðkenni",
+		"LAYOUT": "Framsetning",
+		"LAYOUT_NO_SPLIT": "Ekki klofið",
+		"LAYOUT_VERTICAL_SPLIT": "Klofið lóðrétt",
+		"LAYOUT_HORIZONTAL_SPLIT": "Klofið lárétt",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Sjálfgefinn textaritill",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Venjulegt",
+		"VIEW_OPTIONS": "Valkostir skoðunar",
+		"USE_PREVIEW_PANE": "Nota forskoðunarham",
+		"HIDE_DELETED_MESSAGES": "Fela skilaboð merkt til eyðingar",
+		"USE_CHECKBOXES_IN_LIST": "Sýna valkassa í listanum",
+		"USE_THREADS": "Nota þræði",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Setja svör í möppu skilaboðanna sem er verið að svara",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Skilaboð á síðu",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Tilkynningar",
-		"LABEL_SOUND_NOTIFICATION": "Tilkynningarhljóð",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Tilkynningar",
+		"SOUND_NOTIFICATION": "Tilkynningarhljóð",
+		"CHROME_NOTIFICATION_DESC": "Sýna tilkynningarglugga fyrir ný skilaboð",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Lokað af vafra)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Bæta viðtakendum sjálfkrafa í nafnaskrá",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Þjónn",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Slóð á nafnaskrá",
 		"LABEL_CONTACTS_SYNC_USER": "Notandi",
-		"SYNC_NO": "Nei",
-		"SYNC_YES": "Já",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Þemu",
-		"LEGEND_THEMES_CUSTOM": "Sérsniðin þemastilling",
-		"LABEL_CUSTOM_TYPE": "Tegund",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ljóst",
-		"LABEL_CUSTOM_TYPE_DARK": "Dökkt",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrunnur",
+		"LABEL_BACKGROUND": "Bakgrunnur",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Senda inn bakgrunnsmynd (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Skrá er of stór",
 		"ERROR_FILE_TYPE_ERROR": "Röng skráartegund (aðeins JPG and PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Við höfum birt aðeins hluta þeirra, til að koma í veg fyrir vandamál með afköst.",
 		"HELP_DELETE_FOLDER": "Eyða möppu",
 		"HELP_SHOW_HIDE_FOLDER": "Birta\/fela möppu",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Athuga\/ekki athuga með ný skilaboð",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Athuga með ný skilaboð",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Bæta við aðgangi",
 		"BUTTON_ADD_IDENTITY": "Bæta við auðkenni",
 		"LOADING_PROCESS": "Uppfæri aðgangslista",
-		"DEFAULT_IDENTITY_LABEL": "sjálfgefið"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Flytja inn lykil",
 		"BUTTON_GENERATE_KEY_PAIR": "Búa til lykla",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Einkalykill",
 		"TITLE_PUBLIC": "Dreifilykill",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Vista drög sjálfkrafa",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Svara öllum",
 		"LABEL_FORWARD": "Áframsenda",
 		"LABEL_FORWARD_MULTIPLY": "Áframsenda sem viðhengi",
-		"LABEL_HELP": "Hjálp",
 		"LABEL_CHECK_ALL": "Velja öll skilaboð",
 		"LABEL_DELETE": "Eyða",
 		"LABEL_OPEN_THREAD": "Opna valinn þráð",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Víxla inndregnum tilvitnunum skilaboða af\/á",
 		"LABEL_THREAD_NEXT": "Næstu skilaboð í þræði",
 		"LABEL_THREAD_PREV": "Fyrri skilaboð í þræði",
-		"LABEL_PRINT": "Prenta",
 		"LABEL_EXIT_FULLSCREEN": "Fara úr fullum skjá",
 		"LABEL_CLOSE_MESSAGE": "Loka skilaboðum (ekkert forskoðunarspjald)",
 		"LABEL_SWITCH_TO_LIST": "Skipta virkni til baka í skilaboðalista",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Loka ritli"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Rangt tákn",
-		"AUTH_ERROR": "Auðkenning mistókst",
-		"CONNECTION_ERROR": "Get ekki tengst á netþjón",
-		"DOMAIN_ALREADY_EXISTS": "Lén er nú þegar til staðar",
-		"DOMAIN_NOT_ALLOWED": "Lén ekki leyft",
-		"ACCOUNT_NOT_ALLOWED": "Aðgangur er ekki leyfður",
-		"CONTACTS_SYNC_ERROR": "Villa í samstillingu tengiliða",
-		"CANT_GET_MESSAGE_LIST": "Get ekki sótt skilaboðlista",
-		"CANT_GET_MESSAGE": "Get ekki sótt skilaboð",
-		"CANT_DELETE_MESSAGE": "Get ekki eytt skilaboðum",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Get ekki fært skilaboð",
-		"CANT_SAVE_MESSAGE": "Get ekki vistað skilaboð",
-		"CANT_SEND_MESSAGE": "Get ekki sent skilaboð",
-		"INVALID_RECIPIENTS": "Rangir viðtakendur",
-		"CANT_SAVE_FILTERS": "Get ekki vistað síur",
-		"CANT_GET_FILTERS": "Get ekki sótt síur",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Síur eru ekki réttar",
-		"CANT_CREATE_FOLDER": "Get ekki búið til möppu",
-		"CANT_RENAME_FOLDER": "Get ekki endurnefnt möppu",
-		"CANT_DELETE_FOLDER": "Get ekki eytt möppu",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Get ekki eytt möppu í notkun",
-		"CANT_SUBSCRIBE_FOLDER": "Get ekki gerst áskrifandi á möppu",
-		"CANT_UNSUBSCRIBE_FOLDER": "Get ekki hætt áskrift á möppu",
-		"DEMO_SEND_MESSAGE_ERROR": "Vegna öryggissjónarmiða, þá hefur þessi aðgangur ekki leyfi til að senda póst á utanaðkomandi netföng!",
-		"DEMO_ACCOUNT_ERROR": "Vegna öryggissjónarmiða, þá hefur þessi aðgangur ekki heimild fyrir þessa aðgerð!",
-		"ACCOUNT_ALREADY_EXISTS": "Aðgangur er nú þegar til staðar",
-		"ACCOUNT_DOES_NOT_EXIST": "Aðgangur er ekki til",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Villa kom upp við tilraun til að tengjast póstþjóni",
-		"INVALID_INPUT_ARGUMENT": "Óleyfilegt inntaksviðfang",
-		"UNKNOWN_ERROR": "Óþekkt villa"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Rangt tákn",
+		"AuthError": "Auðkenning mistókst",
+		"ConnectionError": "Get ekki tengst á netþjón",
+		"DomainAlreadyExists": "Lén er nú þegar til staðar",
+		"DomainNotAllowed": "Lén ekki leyft",
+		"AccountNotAllowed": "Aðgangur er ekki leyfður",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Villa í samstillingu tengiliða",
+		"CantGetMessageList": "Get ekki sótt skilaboðlista",
+		"CantGetMessage": "Get ekki sótt skilaboð",
+		"CantDeleteMessage": "Get ekki eytt skilaboðum",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Get ekki fært skilaboð",
+		"CantSaveMessage": "Get ekki vistað skilaboð",
+		"CantSendMessage": "Get ekki sent skilaboð",
+		"InvalidRecipients": "Rangir viðtakendur",
+		"CantSaveFilters": "Get ekki vistað síur",
+		"CantGetFilters": "Get ekki sótt síur",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Síur eru ekki réttar",
+		"CantCreateFolder": "Get ekki búið til möppu",
+		"CantRenameFolder": "Get ekki endurnefnt möppu",
+		"CantDeleteFolder": "Get ekki eytt möppu",
+		"CantDeleteNonEmptyFolder": "Get ekki eytt möppu í notkun",
+		"CantSubscribeFolder": "Get ekki gerst áskrifandi á möppu",
+		"CantUnsubscribeFolder": "Get ekki hætt áskrift á möppu",
+		"DemoSendMessageError": "Vegna öryggissjónarmiða, þá hefur þessi aðgangur ekki leyfi til að senda póst á utanaðkomandi netföng!",
+		"DemoAccountError": "Vegna öryggissjónarmiða, þá hefur þessi aðgangur ekki heimild fyrir þessa aðgerð!",
+		"AccountAlreadyExists": "Aðgangur er nú þegar til staðar",
+		"AccountDoesNotExist": "Aðgangur er ekki til",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Villa kom upp við tilraun til að tengjast póstþjóni",
+		"InvalidInputArgument": "Óleyfilegt inntaksviðfang",
+		"UnknownError": "Óþekkt villa"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/admin.json b/snappymail/v/0.0.0/app/localization/it-IT/admin.json
deleted file mode 100644
index 103ac2470..000000000
--- a/snappymail/v/0.0.0/app/localization/it-IT/admin.json
+++ /dev/null
@@ -1,184 +0,0 @@
-{
-	"GLOBAL": {
-		"SAVE": "Save",
-		"UPDATE": "Aggiorna"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Password",
-		"LABEL_TOTP": "TOTP code",
-		"BUTTON_LOGIN": "Log into the admin panel"
-	},
-	"TOP_PANEL": {
-		"LABEL_ADMIN_PANEL": "Admin Panel"
-	},
-	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "General",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_DOMAINS_NAME": "Domains",
-		"LABEL_SECURITY_NAME": "Security",
-		"LABEL_PACKAGES_NAME": "Extensions",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "About"
-	},
-	"TAB_GENERAL": {
-		"LEGEND_INTERFACE": "Interface",
-		"LABEL_LANGUAGE": "Language",
-		"LABEL_LANGUAGE_ADMIN": "Language (admin)",
-		"LABEL_THEME": "Theme",
-		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Allow language selection on settings screen",
-		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Allow theme selection on settings screen",
-		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen",
-		"LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button",
-		"LABEL_SHOW_THUMBNAILS": "Show thumbnails (attachments)",
-		"LEGEND_MAIN": "Main",
-		"LABEL_ATTACHMENT_SIZE_LIMIT": "Attachment size limit",
-		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Allow additional accounts",
-		"LABEL_ALLOW_IDENTITIES": "Allow multiple identities",
-		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
-		"ALERT_WARNING": "Warning!",
-		"HTML_ALERT_WEAK_PASSWORD": "You are using the default admin password.\n<br>\nFor security reasons please\n<strong><a href=\"#\/security\">change<\/a><\/strong>\npassword to something else now.\n"
-	},
-	"TAB_LOGIN": {
-		"LEGEND_LOGIN_SCREEN": "Login Screen",
-		"LABEL_DEFAULT_DOMAIN": "Default Domain",
-		"LABEL_DETERMINE_USER_DOMAIN": "Try to determine user domain",
-		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Allow language selection on login screen",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Try to determine user language",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
-	},
-	"TAB_BRANDING": {
-		"LEGEND_BRANDING": "Branding",
-		"LABEL_PAGE_TITLE": "Page Title",
-		"LABEL_LOADING_DESCRIPTION": "Loading Description",
-		"LABEL_FAVICON_URL": "Favicon"
-	},
-	"TAB_CONTACTS": {
-		"LEGEND_CONTACTS": "Contacts",
-		"LEGEND_STORAGE": "Storage (PDO)",
-		"LABEL_ENABLE_CONTACTS": "Enable contacts",
-		"LABEL_ALLOW_SYNC": "Allow contacts sync (with external CardDAV server)",
-		"LABEL_STORAGE_TYPE": "Type",
-		"LABEL_STORAGE_DSN": "Dsn",
-		"LABEL_STORAGE_USER": "User",
-		"LABEL_STORAGE_PASSWORD": "Password",
-		"BUTTON_TEST": "Test",
-		"ALERT_NOTICE": "Notice!",
-		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Don't use this database type with a large number of active users.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Your system doesn't support contacts.\n<br>\nYou need to install or enable <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extension on your server.\n"
-	},
-	"TAB_DOMAINS": {
-		"LEGEND_DOMAINS": "Domains",
-		"BUTTON_ADD_DOMAIN": "Add Domain",
-		"BUTTON_ADD_ALIAS": "Add Alias",
-		"DELETE_ARE_YOU_SURE": "Are you sure?",
-		"HTML_DOMAINS_HELPER": "List of domains webmail is allowed to access.\n<br>\nClick on the name to configure the domain.\n"
-	},
-	"TAB_SECURITY": {
-		"LEGEND_SECURITY": "Security",
-		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPEN_PGP": "Allow OpenPGP",
-		"LABEL_SHOW_PHP_INFO": "Show PHP information",
-		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
-		"LABEL_CURRENT_PASSWORD": "Current password",
-		"LABEL_NEW_LOGIN": "New login",
-		"LABEL_NEW_PASSWORD": "New password",
-		"LABEL_REPEAT_PASSWORD": "Repeat",
-		"BUTTON_UPDATE_PASSWORD": "Update Password",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
-		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
-	},
-	"TAB_PACKAGES": {
-		"LABEL_ENABLE_PLUGINS": "Enable extensions",
-		"LEGEND_AVAILABLE_FOR_UPDATE": "Available for Update",
-		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Available for Installation",
-		"LEGEND_INSTALLED_PACKAGES": "Installed Extensions",
-		"ALERT_CANNOT_ACCESS_REPOSITORY": "Cannot access the repository at the moment."
-	},
-	"TAB_ABOUT": {
-		"LEGEND_ABOUT": "About",
-		"LABEL_TAG_HINT": "Simple, modern & fast web-based email client",
-		"LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.",
-		"HINT_READ_CHANGE_LOG": "Leggere il changelog prima di effettuare l'aggiornamento.",
-		"HINT_IS_UP_TO_DATE": "RainLoop è aggiornato.",
-		"HTML_NEW_VERSION": "La nuova versione <b>%VERSION%<\/b> è disponibile.",
-		"LABEL_UPDATING": "Aggiornamento in corso...",
-		"LABEL_CHECKING": "Controllo della presenza di aggiornamenti...",
-		"BUTTON_RELEASES": "Releases"
-	},
-	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Add Alias",
-		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domain",
-		"BUTTON_CLOSE": "Close",
-		"BUTTON_ADD": "Add"
-	},
-	"POPUPS_DOMAIN": {
-		"TITLE_ADD_DOMAIN": "Add Domain",
-		"TITLE_ADD_DOMAIN_WITH_NAME": "Add Domain \"%NAME%\"",
-		"TITLE_EDIT_DOMAIN": "Edit Domain \"%NAME%\"",
-		"LABEL_NAME": "Name",
-		"NAME_HELPER": "wildcard supported",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
-		"LABEL_SERVER": "Server",
-		"LABEL_PORT": "Port",
-		"LABEL_SECURE": "Secure",
-		"LABEL_WHITE_LIST": "White List",
-		"SECURE_OPTION_NONE": "None",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "Allow sieve scripts",
-		"LABEL_USE_SHORT_LOGIN": "Use short login",
-		"LABEL_USE_AUTH": "Use authentication",
-		"LABEL_SET_SENDER": "Use login as sender",
-		"LABEL_USE_PHP_MAIL": "Use php mail() function",
-		"BUTTON_TEST": "Test",
-		"BUTTON_WHITE_LIST": "White List",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve configuration",
-		"BUTTON_BACK_TO_IMAP": "Back to IMAP settings",
-		"BUTTON_BACK": "Back",
-		"BUTTON_CLOSE": "Close",
-		"BUTTON_ADD": "Add",
-		"BUTTON_UPDATE": "Update",
-		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work <br>with <i>%NAME%<\/i> email addresses.",
-		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n"
-	},
-	"POPUPS_PLUGIN": {
-		"TITLE_PLUGIN": "Extension",
-		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure",
-		"BUTTON_CLOSE": "Close"
-	},
-	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Choose your language"
-	},
-	"HINTS": {
-		"BETA": "beta",
-		"UNSTABLE": "unstable",
-		"WARNING": "Warning!"
-	},
-	"ERRORS": {
-		"DOMAIN_ALREADY_EXISTS": "Domain already exists",
-		"UNKNOWN_ERROR": "Unknown error"
-	},
-	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Invalid token",
-		"AUTH_ERROR": "Authentication failed",
-		"DOMAIN_ALREADY_EXISTS": "Domain already exists",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Can't save settings",
-		"CANT_INSTALL_PACKAGE": "Failed to install extension",
-		"CANT_DELETE_PACKAGE": "Failed to remove extension",
-		"INVALID_PLUGIN_PACKAGE": "Invalid extension package",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Unsupported extension package",
-		"UNKNOWN_ERROR": "Unknown error"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/it/admin.json b/snappymail/v/0.0.0/app/localization/it/admin.json
new file mode 100644
index 000000000..0fae97c31
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/it/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Aggiungi",
+		"CLOSE": "Chiudi",
+		"SAVE": "Salva",
+		"TEST": "Test",
+		"UPDATE": "Aggiorna",
+		"USERNAME": "Nome utente",
+		"PASSWORD": "Passphrase",
+		"CANCEL": "Annulla",
+		"SEARCH": "Cerca",
+		"YES": "Si",
+		"NO": "No"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Login",
+		"LABEL_TOTP": "Codice TOTP",
+		"BUTTON_LOGIN": "Accedi al pannello admin"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Pannello Admin"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Generale",
+		"LOGIN": "Login",
+		"BRANDING": "Branding",
+		"CONTACTS": "Contatti",
+		"DOMAINS": "Domini",
+		"SECURITY": "Sicurezza",
+		"PACKAGES": "Estensioni",
+		"CONFIG": "Configurazioni",
+		"ABOUT": "About"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Interfaccia",
+		"LABEL_LANGUAGE": "Lingua",
+		"LABEL_LANGUAGE_ADMIN": "Lingua (admin)",
+		"LABEL_THEME": "Tema",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permetti la selezione della lingua nella schermata impostazioni",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permetti la selezione del tema nella schermata impostazioni",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permetti la selezione dello sfondo nella schermata impostazioni",
+		"LABEL_SHOW_THUMBNAILS": "Mostra anteprima (allegati)",
+		"LEGEND_MAIN": "Principale",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Limite dimensione allegati",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Permetti account aggiuntivi",
+		"LABEL_ALLOW_IDENTITIES": "Permetti identità multiple",
+		"ALERT_DATA_ACCESS": "La cartella Data è accessibile. Per favore configura il tuo server web per nascondere la cartella data da accessi esterni. Maggiori informazioni qui:",
+		"ALERT_WARNING": "Attenzione!",
+		"HTML_ALERT_WEAK_PASSWORD": "L'account admin sta utilizzando la passphrase predefinita.\n<br>\nPer ragioni di sicurezza per favore\n<strong><a href=\"#\/security\">cambia<\/a><\/strong>\nla passphrase ora."
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Login Screen",
+		"LABEL_DEFAULT_DOMAIN": "Domino Predefinito",
+		"LABEL_DETERMINE_USER_DOMAIN": "Cerca di determinare il dominio utente",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permette selezione della lingua nella schermata di login",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Cerca di determinare la lingua dell'utente"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Branding",
+		"LABEL_PAGE_TITLE": "Titolo Pagina",
+		"LABEL_LOADING_DESCRIPTION": "Descrizione di caricamento",
+		"LABEL_FAVICON_URL": "Favicon"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Contatti",
+		"LEGEND_STORAGE": "Storage (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Abilita contatti",
+		"LABEL_ALLOW_SYNC": "Abilita sincronizzazione contatti (con server esterno CardDAV)",
+		"LABEL_STORAGE_TYPE": "Type",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Utente",
+		"LABEL_STORAGE_PASSWORD": "Passphrase",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
+		"ALERT_NOTICE": "Avviso!",
+		"SUGGESTIONS_LIMIT": "Limite suggerimenti",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Non usare questo tipo di database con un grande numero di utenti attivi.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Il tuo sistema non supporta i contatti.\n<br>\nÉ necessario installare o abilitare l'estensione <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> sul tuo server."
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Domini",
+		"BUTTON_ADD_DOMAIN": "Aggiungi Dominio",
+		"BUTTON_ADD_ALIAS": "Aggiungi Alias",
+		"DELETE_ARE_YOU_SURE": "Sei sicuro?",
+		"HTML_DOMAINS_HELPER": "Lista dei domini a cui webmail può accedere.\n<br>\nClicca sul nome per configurare il dominio."
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Sicurezza",
+		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
+		"LABEL_SHOW_PHP_INFO": "Mostra informazioni PHP",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenziali di Accesso Pannello Admin",
+		"LABEL_CURRENT_PASSWORD": "Passphrase Corrente",
+		"LABEL_NEW_PASSWORD": "Nuova passphrase",
+		"LABEL_REPEAT_PASSWORD": "Ripeti",
+		"LABEL_REQUIRE_VERIFICATION": "Richiesta verifica del certificato SSL utilizzato",
+		"CRYPTO": "Crypto",
+		"LABEL_ALLOW_SELF_SIGNED": "Permetti certificati auto-firmati"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Abilita estensioni",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Disponibile per Aggiornamento",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Disponibile per Installazione",
+		"LEGEND_INSTALLED_PACKAGES": "Estensioni Installate",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Impossibile accedere al repository in questo momento."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "About",
+		"LABEL_TAG_HINT": "Simple, modern & fast web-based email client",
+		"LABEL_ALL_RIGHTS_RESERVED": "Tutti i Diritti Riservati.",
+		"HINT_READ_CHANGE_LOG": "Leggere il changelog prima di effettuare l'aggiornamento.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail è aggiornato.",
+		"HTML_NEW_VERSION": "La nuova versione <b>%VERSION%<\/b> è disponibile.",
+		"LABEL_UPDATING": "Aggiornamento in corso...",
+		"LABEL_CHECKING": "Controllo della presenza di aggiornamenti...",
+		"BUTTON_RELEASES": "Rilasci"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Aggiungi Alias",
+		"LABEL_ALIAS": "Alias",
+		"LABEL_DOMAIN": "Dominio"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Aggiungi Domain",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Aggiungi Domain \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Modifica Domain \"%NAME%\"",
+		"LABEL_NAME": "Nome",
+		"NAME_HELPER": "wildcard supportato",
+		"LABEL_SERVER": "Server",
+		"LABEL_PORT": "Porta",
+		"LABEL_SECURE": "Secure",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limiti",
+		"FOLDERS": "Cartelle",
+		"MESSAGES": "Messaggi",
+		"SECURE_OPTION_NONE": "None",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permetti scripts sieve",
+		"LABEL_USE_SHORT_LOGIN": "Usa login breve",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
+		"LABEL_USE_AUTH": "Usa autenticazione",
+		"LABEL_SET_SENDER": "Usa login come mittente",
+		"LABEL_AUTH_PLAIN_LINE": "Force login a comando singolo AUTH PLAIN",
+		"LABEL_USE_PHP_MAIL": "Usa la funzione php mail()",
+		"BUTTON_WHITE_LIST": "White List",
+		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
+		"WHITE_LIST_ALERT": "Lista degli utenti del dominio ai quali webmail può accedere.\nUsa uno spazio come delimitatore.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Estensione",
+		"DESC_NOTHING_TO_CONFIGURE": "Niente da configurare"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Sei sicuro di voler chiudere questa finestra?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Scegli la lingua"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Attenzione!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Il dominio esiste già",
+		"UNKNOWN_ERROR": "Errore sconosciuto"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Richiesta fallita",
+		"RequestAborted": "Richiesta annullata",
+		"RequestTimeout": "Richiesta scaduta",
+		"InvalidToken": "Token non valido",
+		"AuthError": "Autenticazione fallita",
+		"DomainAlreadyExists": "Il dominio esiste già",
+		"CantSavePluginSettings": "Impossibile salvare le impostazioni",
+		"CantInstallPackage": "Installazione estensione fallita",
+		"CantDeletePackage": "Rimozione estensione fallita",
+		"InvalidPluginPackage": "Pacchetto estensione non valido",
+		"UnsupportedPluginPackage": "Pacchetto estensione non supportato",
+		"UnknownError": "Errore sconosciuto"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/it/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/it-IT/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/it/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/static.json b/snappymail/v/0.0.0/app/localization/it/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/it-IT/static.json
rename to snappymail/v/0.0.0/app/localization/it/static.json
diff --git a/snappymail/v/0.0.0/app/localization/it-IT/user.json b/snappymail/v/0.0.0/app/localization/it/user.json
similarity index 58%
rename from snappymail/v/0.0.0/app/localization/it-IT/user.json
rename to snappymail/v/0.0.0/app/localization/it/user.json
index ae25ae145..c55c8dff3 100644
--- a/snappymail/v/0.0.0/app/localization/it-IT/user.json
+++ b/snappymail/v/0.0.0/app/localization/it/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archiviazione",
 		"ARE_YOU_SURE": "Sei sicuro?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Chiudi (Esc)",
 		"CONTACTS": "Contatti",
 		"DELETE": "Elimina",
+		"UNDELETE": "Undelete",
 		"DONE": "Fatto",
 		"EMAIL": "Email",
 		"FROM": "Da",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Esci",
 		"MORE": "Altro",
 		"MOVE_TO": "Sposta in",
+		"COPY_TO": "Copia a",
 		"NAME": "Nome",
 		"NONE": "Nessuno",
+		"TO_SPAM": "Sposta messaggio\/i nel spam",
 		"NOT_SPAM": "Segnala come non spam",
-		"PASSWORD": "Password",
+		"USERNAME": "Nome utente",
+		"PASSWORD": "Passphrase",
+		"REMEMBER": "Ricordami",
 		"REPLY_TO": "Rispondi a",
 		"SAVE": "Salva",
+		"SAVE_CHANGES": "Salvare le modifiche?",
 		"SEARCH": "Cerca",
 		"SPAM": "Segnala come spam",
 		"SUBJECT": "Oggetto",
 		"TEST": "Esegui test",
-		"TO": "A"
+		"TO": "A",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Sì",
+		"NO": "No",
+		"INACTIVE": "Inattivo",
+		"DEFAULT": "predefinito",
+		"HELP": "Aiuto",
+		"TEXT": "Messaggio",
+		"ATTACHMENTS": "Allegati"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Accedi"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Aggiungi account",
-		"BUTTON_SETTINGS": "Impostazioni",
-		"BUTTON_HELP": "Aiuto"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versione mobile",
-		"BUTTON_DESKTOP_VERSION": "Versione desktop"
+		"BUTTON_ADD_ACCOUNT": "Aggiungi account"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Ricerca avanzata",
-		"LABEL_ADV_TEXT": "Messaggio",
-		"LABEL_ADV_HAS_ATTACHMENT": "Ha un allegato",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Ha più allegati",
-		"LABEL_ADV_FLAGGED": "Preferiti",
-		"LABEL_ADV_UNSEEN": "Non letti",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Tutte",
-		"LABEL_ADV_DATE_3_DAYS": "Meno di 3 giorni fa",
-		"LABEL_ADV_DATE_7_DAYS": "Meno di una settimana fa",
-		"LABEL_ADV_DATE_MONTH": "Meno di un mese fa",
-		"LABEL_ADV_DATE_3_MONTHS": "Meno di 3 mesi fa",
-		"LABEL_ADV_DATE_6_MONTHS": "Meno di 6 mesi fa",
-		"LABEL_ADV_DATE_YEAR": "Meno di un anno fa",
-		"LABEL_ADV_SUBFOLDERS": "Sottocartelle",
-		"LABEL_ADV_SUBFOLDERS_NONE": "Nessuna",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "Tutte",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "Primo livello"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Passa a schermo intero",
-		"ZOOM": "Ingrandisci +\/-",
-		"CLOSE": "Chiudi (Esc)",
-		"GALLERY_PREV": "Precedente (Freccia sinistra)",
-		"GALLERY_NEXT": "Successivo (Freccia destra)",
-		"GALLERY_COUNTER": "%curr% di %total%"
+		"TEXT": "Messaggio",
+		"HAS_ATTACHMENT": "Ha un allegato",
+		"FLAGGED": "Preferiti",
+		"UNSEEN": "Non letti",
+		"DATE": "Data",
+		"DATE_ALL": "Tutte",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Meno di 3 giorni fa",
+		"SINCE_7_DAYS": "Meno di una settimana fa",
+		"SINCE_MONTH": "Meno di un mese fa",
+		"SINCE_3_MONTHS": "Meno di 3 mesi fa",
+		"SINCE_6_MONTHS": "Meno di 6 mesi fa",
+		"SINCE_YEAR": "Meno di un anno fa",
+		"SUBFOLDERS": "Sottocartelle",
+		"SUBFOLDERS_NONE": "Nessuna",
+		"SUBFOLDERS_SUBTREE": "Tutte",
+		"SUBFOLDERS_SUBTREE_ONE": "Primo livello",
+		"REPLIED": "Risposto",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Scrivi messaggio",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Cestino",
 		"ARCHIVE_NAME": "Archivio"
 	},
-	"QUOTA": {
-		"TITLE": "Uso della quota"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Aggiorna",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Letti",
 		"MENU_SELECT_FLAGGED": "Preferiti",
 		"MENU_SELECT_UNFLAGGED": "Non preferiti",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Scarica tutti allegati",
 		"EMPTY_LIST": "Lista vuota",
 		"EMPTY_SEARCH_LIST": "Nessun messaggio corrisponde alla tua ricerca",
 		"SEARCH_RESULT_FOR": "Risultati di ricerca per \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "ritorna alla lista dei messaggi",
-		"EMPTY_SUBJECT_TEXT": "(Nessun oggetto)",
 		"PUT_MESSAGE_HERE": "Trascina il messaggio qui per vederlo nella lista",
 		"TODAY_AT": "oggi alle %TIME%",
 		"YESTERDAY_AT": "ieri alle %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Hai %COUNT% nuovi messaggi!",
 		"QUOTA_SIZE": "Stai usando <strong>%SIZE% (%PROC%%)<\/strong> su <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
+		"SORT": "Riordina",
+		"NO_SORT": "Il mail server non supporta l'ordinamento",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Data crescente",
 		"SORT_DATE_DESC": "Data decrescente",
 		"SORT_SIZE_ASC": "Dimensione crescente",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Visualizza sorgente",
 		"HTML_VIEW": "Visualizza messaggio in HTML",
 		"PLAIN_VIEW": "Visualizza in formato Testo",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Scarica come file .eml",
 		"MENU_FILTER_SIMILAR": "Mostra messaggi come questo",
 		"MENU_PRINT": "Stampa",
@@ -150,19 +173,42 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Clicca sul nome della cartella nel pannello sinistro per selezionare la destinazione.",
 		"LINK_DOWNLOAD_AS_ZIP": "Scarica come archivio ZIP",
 		"SPAM_SCORE": "Punteggio Spam",
-		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus"
+		"HAS_VIRUS_WARNING": "AVVISO: rilevato virus",
+		"TAGS": "Tag",
+		"NEW_TAG": "Nuovo tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Importante",
+		"$todo": "Da fare",
+		"$label1": "Importante",
+		"$label2": "Opera",
+		"$label3": "Personale",
+		"$label4": "Da fare",
+		"$label5": "Dopo"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Avviso di lettura - %SUBJECT%",
-		"BODY": "Questo è un avviso di lettura per la mail che hai inviato a %READ-RECEIPT%.\n\nAttenzione: questa notifica di lettura significa solo che il messaggio è stato visualizzato nel computer del destinatario.\nNon c'è alcuna garanzia che il destinatario abbia letto o capito il contenuto del messaggio.\n"
+		"BODY": "Questo è un avviso di lettura per la mail che hai inviato a %READ-RECEIPT%.\n\nAttenzione: questa notifica di lettura significa solo che il messaggio è stato visualizzato nel computer del destinatario.\nNon c'è alcuna garanzia che il destinatario abbia letto o capito il contenuto del messaggio."
 	},
 	"SUGGESTIONS": {
 		"SEARCHING_DESC": "Cerca..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contatto",
+		"TAB_LOCATIONS": "Località",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organizzazione",
+		"LABEL_DEPARTMENT": "Reparto",
+		"LABEL_TITLE": "Titolo",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Chiedi",
+		"NEVER": "Mai",
+		"ALWAYS": "Sempre",
+		"ALWAYS_IF_POSSIBLE": "Sempre, se possibile",
 		"BUTTON_ADD_CONTACT": "Aggiungi contatto",
 		"BUTTON_CREATE_CONTACT": "Crea",
-		"BUTTON_UPDATE_CONTACT": "Aggiorna",
 		"BUTTON_IMPORT": "Importa (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Esporta (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Esporta (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nessun contatto trovato",
 		"CLEAR_SEARCH": "Pulisci ricerca",
 		"CONTACT_VIEW_DESC": "Seleziona un contatto dalla lista per visualizzarlo qui",
-		"LABEL_PHONE": "Telefono",
-		"LABEL_WEB": "Sito web",
 		"LABEL_BIRTHDAY": "Compleanno",
-		"LINK_ADD_EMAIL": "Aggiungi un'indirizzo email",
-		"LINK_ADD_PHONE": "Aggiungi un numero di telefono",
-		"LINK_BIRTHDAY": "Compleanno",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Inserisci il nome visualizzato",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Inserisci il cognome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Inserisci il nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Inserisci il nickname",
+		"DISPLAY_NAME": "Nome visualizzato",
+		"LAST_NAME": "Cognome",
+		"FIRST_NAME": "Nome",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Sola lettura",
-		"LABEL_SHARE": "Condividi",
 		"ADD_MENU_LABEL": "Aggiungi",
-		"ADD_MENU_NICKNAME": "Nickname",
-		"ADD_MENU_NOTES": "Note",
+		"ADD_MENU_NICKNAME": "Soprannome",
+		"ADD_MENU_NOTE": "Note",
 		"ADD_MENU_PHONE": "Telefono",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Indirizzo",
 		"ADD_MENU_BIRTHDAY": "Compleanno",
 		"ADD_MENU_TAGS": "Tag",
 		"BUTTON_SHARE_ALL": "Tutti",
-		"BUTTON_SYNC": "Sincronizzazione (CardDAV)"
+		"BUTTON_SYNC": "Sincronizzazione (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Visualizza tutti i campi",
@@ -203,20 +247,23 @@
 		"DISCARD_UNSAVED_DATA": "Elimino i dati non salvati?",
 		"ATTACH_FILES": "Allega file",
 		"ATTACH_DROP_FILES_DESC": "Trascina i file qui",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% wrote",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% scrive",
 		"FORWARD_MESSAGE_TOP_TITLE": "------- Messaggio inoltrato -------",
 		"FORWARD_MESSAGE_TOP_SENT": "Inviato il",
 		"EMPTY_TO_ERROR_DESC": "Specifica almeno un destinatario",
 		"NO_ATTACHMENTS_HERE_DESC": "Nessun allegato.",
 		"ATTACHMENTS_ERROR_DESC": "Attenzione! Non tutti gli allegati sono stati caricati.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Non tutti gli allegati sono stati caricati al momento.",
+		"ALLOW_SPELLCHECK": "Abilita il controllo ortografico del browser",
+		"ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza",
 		"BUTTON_REQUEST_READ_RECEIPT": "Richiedi conferma di lettura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marca come importante",
-		"BUTTON_REQUEST_DSN": "Richiedi conferma del ricevimento"
+		"BUTTON_REQUEST_DSN": "Richiedi conferma del ricevimento",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Il corpo del messaggio è vuoto"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sì",
-		"BUTTON_NO": "No",
+		"EXIT_ARE_YOU_SURE": "Sei sicuro di voler chiudere?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sei sicuro di voler chiudere questa finestra?",
 		"DESC_WANT_DELETE_MESSAGES": "Sei sicuro di voler eliminare il messaggio?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Seleziona lingua"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Aggiungo un account?",
+		"TITLE_ADD_ACCOUNT": "Aggiungo un account",
 		"BUTTON_ADD_ACCOUNT": "Aggiungi",
-		"TITLE_UPDATE_ACCOUNT": "Aggiorno account?",
-		"BUTTON_UPDATE_ACCOUNT": "Aggiorna"
+		"TITLE_UPDATE_ACCOUNT": "Aggiorno account"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Aggiungo un'identità?",
-		"TITLE_UPDATE_IDENTITY": "Aggiorno identità?",
+		"TITLE_ADD_IDENTITY": "Aggiungo un'identità",
+		"TITLE_UPDATE_IDENTITY": "Aggiorno identità",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Aggiungi",
-		"BUTTON_UPDATE_IDENTITY": "Aggiorna",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Inserisci questa firma prima del messaggio citato nelle risposte"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Creo una cartella?",
+		"TITLE_CREATE_FOLDER": "Creo una cartella",
 		"LABEL_PARENT": "Genitore",
 		"BUTTON_CREATE": "Crea",
 		"TITLE_CREATING_PROCESS": "Creazione cartella..."
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Una volta iniziato, il processo non può più essere annullato.",
 		"TITLE_CLEARING_PROCESS": "Eliminazione cartella..."
 	},
+	"CRYPTO": {
+		"SIGN": "Firma",
+		"ENCRYPT": "Criptazione",
+		"DECRYPT": "Decriptazione",
+		"VERIFY": "Verifica",
+		"GOOD_SIGNATURE": "Firma valida da %USER%",
+		"ERROR": "Errore di %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importa chiave OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Importa",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Genera chiavi OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Genera",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Firma",
-		"LABEL_ENCRYPT": "Criptazione",
-		"BUTTON_DECRYPT": "Decriptazione",
-		"BUTTON_VERIFY": "Verifica",
 		"SIGNED_MESSAGE": "Messaggio firmato con OpenPGP",
 		"ENCRYPTED_MESSAGE": "Messaggio cifrato con OpenPGP",
 		"STORE_IN_GNUPG": "Salva nel server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Salvataggio (criptato) sul server",
-		"GOOD_SIGNATURE": "Firma valida da %USER%",
-		"ERROR": "Errore di OpenPGP: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Messaggio firmato con S\/MIME",
+		"ENCRYPTED_MESSAGE": "Messaggio cifrato con S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Creo un filtro?",
-		"TITLE_EDIT_FILTER": "Aggiorno il filtro?",
+		"TITLE_CREATE_FILTER": "Creo un filtro",
+		"TITLE_EDIT_FILTER": "Aggiorno il filtro",
 		"LEGEND_CONDITIONS": "Condizioni",
 		"LEGEND_ACTIONS": "Azioni",
 		"BUTTON_ADD_CONDITION": "Aggiungi una condizione",
@@ -293,14 +361,14 @@
 		"SELECT_TYPE_NOT_EQUAL_TO": "Non uguale a",
 		"SELECT_TYPE_OVER": "Maggiore di",
 		"SELECT_TYPE_UNDER": "Minore di",
-		"SELECT_TYPE_TEXT": "Text",
+		"SELECT_TYPE_TEXT": "Testo",
 		"SELECT_TYPE_RAW": "Raw",
 		"SELECT_MATCH_ANY": "Corrisponde ad una delle seguenti regole",
 		"SELECT_MATCH_ALL": "Corrisponde a tutte le seguenti regole",
 		"MARK_AS_READ_LABEL": "Marca come letto",
 		"REPLY_INTERVAL_LABEL": "Intervallo di risposta (giorni)",
 		"KEEP_LABEL": "Mantieni",
-		"STOP_LABEL": "Non interrompere l'elaborazione delle regole",
+		"STOP_LABEL": "Interrompi l'utilizzo di ulteriori regole",
 		"VACATION_SUBJECT_LABEL": "Oggetto (opzionale)",
 		"VACATION_MESSAGE_LABEL": "Messaggio",
 		"VACATION_RECIPIENTS_LABEL": "Destinatari (separati da virgola)",
@@ -319,10 +387,10 @@
 		"TITLE_SYSTEM_FOLDERS": "Imposta le cartelle di sistema",
 		"SELECT_CHOOSE_ONE": "Selezionane una",
 		"SELECT_UNUSE_NAME": "Non usarla",
-		"NOTIFICATION_SENT": "Non hai selezionato una cartella di sistema per la posta inviata.\nSe non vuoi salvare i messaggi inviati seleziona \"Non usarla\".\n",
+		"NOTIFICATION_SENT": "Non hai selezionato una cartella di sistema per la posta inviata.\nSe non vuoi salvare i messaggi inviati seleziona \"Non usarla\".",
 		"NOTIFICATION_DRAFTS": "Non hai selezionato una cartella di sistema per le bozze.",
-		"NOTIFICATION_SPAM": "Non hai selezionato una cartella di sistema per i messaggi spam.\nSe li vuoi eliminare permanentemente seleziona \"Non usarla\".\n",
-		"NOTIFICATION_TRASH": "Non hai selezionato una cartella di sistema per il cestino.\nSe non lo vuoi usare (e quindi eliminare i messaggi permanentemente) seleziona \"Non usarla\".\n",
+		"NOTIFICATION_SPAM": "Non hai selezionato una cartella di sistema per i messaggi spam.\nSe li vuoi eliminare permanentemente seleziona \"Non usarla\".",
+		"NOTIFICATION_TRASH": "Non hai selezionato una cartella di sistema per il cestino.\nSe non lo vuoi usare (e quindi eliminare i messaggi permanentemente) seleziona \"Non usarla\".",
 		"NOTIFICATION_ARCHIVE": "Non hai selezionato una cartella di sistema per i messaggi archiviati."
 	},
 	"TITLES": {
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Si è verificato un errore sconosciuto durante il caricamento del file"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> Testo semplice"
+		"PLAIN": "HTML <-> Testo semplice",
+		"SOURCE": "HTML <-> Sorgente",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personali",
-		"LABEL_GENERAL_NAME": "Generali",
-		"LABEL_CONTACTS_NAME": "Contatti",
-		"LABEL_FOLDERS_NAME": "Cartelle",
-		"LABEL_ACCOUNTS_NAME": "Account",
-		"LABEL_FILTERS_NAME": "Filtri",
-		"LABEL_SECURITY_NAME": "Sicurezza",
-		"LABEL_THEMES_NAME": "Temi"
+		"GENERAL": "Generali",
+		"CONTACTS": "Contatti",
+		"FOLDERS": "Cartelle",
+		"ACCOUNTS": "Account",
+		"FILTERS": "Filtri",
+		"SECURITY": "Sicurezza",
+		"THEMES": "Temi"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtri",
+		"SIMPLE": "Semplice",
+		"ADVANCED": "Avanzato",
 		"BUTTON_ADD_SCRIPT": "Aggiungi uno script",
 		"SUBNAME_MOVE_TO": "Sposta in \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Inoltra a \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rifiuta",
 		"SUBNAME_VACATION_MESSAGE": "Messaggio fuori-ufficio",
-		"SUBNAME_DISCARD": "Scarta",
-		"LOADING_PROCESS": "Aggiornamento lista filtri"
+		"SUBNAME_DISCARD": "Scarta"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sicurezza",
 		"LABEL_AUTOLOGOUT": "Disconnessione automatica",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Mai",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minuti",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% ore"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Mai"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generali",
-		"LABEL_LANGUAGE": "Lingua",
-		"LABEL_IDENTITY": "Identità",
-		"LABEL_LAYOUT": "Struttura",
-		"LABEL_LAYOUT_NO_SPLIT": "A pagina intera",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
-		"LABEL_EDITOR": "Editor di testo predefinito",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Testo semplice",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forzato)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Testo semplice (forzato)",
-		"LABEL_VIEW_OPTIONS": "Impostazioni di visualizzazione",
-		"LABEL_USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista",
-		"LABEL_USE_THREADS": "Usa le conversazioni",
-		"LABEL_REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
-		"LABEL_SHOW_IMAGES": "Visualizza sempre le immagini esterne nel messaggio",
-		"LABEL_PREFER_HTML": "Usa HTML predefinito anziché formato testo",
-		"LABEL_PREFER_HTML_INFO": "Il messaggio a volte contiene entrambi i formati. Questa opzione agisce sulla visualizzazione del messaggio in HTML o della versione in formato testo.",
-		"LABEL_REMOVE_COLORS": "Rimuovi lo sfondo e i colori del testo dal messaggio",
-		"LABEL_MESSAGE_PER_PAGE": "Messaggi per pagina",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Contrassegna il messaggio come letto dopo",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifiche",
-		"LABEL_SOUND_NOTIFICATION": "Notifica sonora",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)"
+		"LANGUAGE": "Lingua",
+		"HOUR_FORMAT": "Formato orario",
+		"IDENTITY": "Identità",
+		"LAYOUT": "Struttura",
+		"LAYOUT_NO_SPLIT": "A pagina intera",
+		"LAYOUT_VERTICAL_SPLIT": "Divisione verticale",
+		"LAYOUT_HORIZONTAL_SPLIT": "Divisione orizzontale",
+		"SHOW_NEXT_MESSAGE": "Vai al prossimo messaggio dopo la eliminazione\/spostamento dell'attuale",
+		"EDITOR": "Editor di testo predefinito",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Testo semplice",
+		"VIEW_OPTIONS": "Impostazioni di visualizzazione",
+		"USE_PREVIEW_PANE": "Mostra l'anteprima del messaggio",
+		"HIDE_DELETED_MESSAGES": "Nascondi i messaggi contrassegnati per l'eliminazione",
+		"USE_CHECKBOXES_IN_LIST": "Mostra le caselle di spunta nella lista",
+		"USE_THREADS": "Usa le conversazioni",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Posiziona le risposte nella cartella del messaggio a cui si è risposto",
+		"PREFER_HTML": "Usa HTML predefinito anziché formato testo",
+		"PREFER_HTML_INFO": "Il messaggio a volte contiene entrambi i formati. Questa opzione agisce sulla visualizzazione del messaggio in HTML o della versione in formato testo.",
+		"REMOVE_COLORS": "Rimuovi lo sfondo e i colori del testo dal messaggio",
+		"ALLOW_STYLES": "Consenti formattazioni estese all'interno del messaggio (CSS <style>)",
+		"MESSAGE_PER_PAGE": "Messaggi per pagina",
+		"CHECK_MAIL_INTERVAL": "Controlla nuove mail ogni",
+		"MARK_MESSAGE_READ_AFTER": "Contrassegna il messaggio come letto dopo",
+		"MSG_DEFAULT_ACTION": "Azione di default",
+		"SECONDS": "secondi",
+		"MINUTES": "minuti",
+		"NOTIFICATIONS": "Notifiche",
+		"SOUND_NOTIFICATION": "Notifica sonora",
+		"CHROME_NOTIFICATION_DESC": "Mostra le notifiche in caso di nuovi messaggi",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloccate dal browser)",
+		"COLLAPSE_BLOCKQUOTES": "Nascondi testo quotato",
+		"MAX_QUOTE_LEVEL": "Livelli massimi visibilità testo quotato",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Visualizza lista degli allegati in linea",
+		"LIST_SIMPLE_ATTACHMENTS": "Lista semplice allegati",
+		"LIST_MESSAGES_GROUPED": "Lista messaggi raggruppati (quando riordinati per data o mittente)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Chiedi sempre",
+		"IMAGES_OPTION_WHITELIST": "Usa whitelist o chiedi",
+		"IMAGES_OPTION_ALWAYS": "Visualizza sempre",
+		"IMAGES_WHITELIST": "Whitelist per immagini",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Aggiungi automaticamente le persone che ti inviano mail alla rubrica",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Indirizzo della rubrica",
 		"LABEL_CONTACTS_SYNC_USER": "Utente",
-		"SYNC_NO": "No",
-		"SYNC_YES": "Sì",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Sola lettura"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temi",
-		"LEGEND_THEMES_CUSTOM": "Configurazione del tema personalizzato",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Chiaro",
-		"LABEL_CUSTOM_TYPE_DARK": "Scuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Sfondo",
+		"LABEL_BACKGROUND": "Sfondo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carica immagine di sfondo (.jpg o .png)",
 		"ERROR_FILE_IS_TOO_BIG": "Il file è più grande di 1MB",
 		"ERROR_FILE_TYPE_ERROR": "Tipo di file invalido (solo .jpg o .png)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Vengono visualizzate solo una parte per evitare problemi di performance.",
 		"HELP_DELETE_FOLDER": "Cancella cartella",
 		"HELP_SHOW_HIDE_FOLDER": "Mostra\/nascondi cartella",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Controlla\/non controlla la presenza di nuovi messaggi",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Controlla la presenza di nuovi messaggi",
 		"HIDE_UNSUBSCRIBED": "Nascondi le cartelle non sottoscritte",
+		"UNHIDE_KOLAB_FOLDERS": "Rendi visibili le cartelle Kolab",
 		"TYPE_CALENDAR": "Calendario",
 		"TYPE_CONFIGURATION": "Configurazione",
 		"TYPE_CONTACTS": "Contatti",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Aggiungi account",
 		"BUTTON_ADD_IDENTITY": "Aggiungi identità",
 		"LOADING_PROCESS": "Aggiornamento della lista degli account...",
-		"DEFAULT_IDENTITY_LABEL": "predefinito"
+		"SHOW_UNREAD": "Visualizza il numero di messaggi non letti dei account"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importa chiave",
 		"BUTTON_GENERATE_KEY_PAIR": "Genera chiave",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privata",
 		"TITLE_PUBLIC": "Pubblica",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salva automaticamente la bozza",
 		"GET_MAILVELOPE": "Installa l'estensione browser Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Rispondi a tutti",
 		"LABEL_FORWARD": "Inoltra",
 		"LABEL_FORWARD_MULTIPLY": "Inoltro multiplo",
-		"LABEL_HELP": "Aiuto",
 		"LABEL_CHECK_ALL": "Seleziona tutti i messaggi",
 		"LABEL_DELETE": "Elimina messaggio",
 		"LABEL_OPEN_THREAD": "Apri la conversazione selezionata",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Mostra\/nascondi le citazioni",
 		"LABEL_THREAD_NEXT": "Prossimo messaggio nella conversazione",
 		"LABEL_THREAD_PREV": "Messaggio precedente nella conversazione",
-		"LABEL_PRINT": "Stampa",
 		"LABEL_EXIT_FULLSCREEN": "Esci dalla modalità a schermo intero",
 		"LABEL_CLOSE_MESSAGE": "Chiudi messaggio (senza anteprima messaggi)",
 		"LABEL_SWITCH_TO_LIST": "Sposta la selezione sulla lista messaggi",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Chiudi finestra di scrittura"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Token invalido",
-		"AUTH_ERROR": "Autenticazione fallita",
-		"CONNECTION_ERROR": "Impossibile connettersi al server",
-		"DOMAIN_ALREADY_EXISTS": "Il dominio esiste già",
-		"DOMAIN_NOT_ALLOWED": "Il dominio non è autorizzato",
-		"ACCOUNT_NOT_ALLOWED": "L'account non è autorizzato",
-		"CONTACTS_SYNC_ERROR": "Errore durante la sincronizzazione dei contatti",
-		"CANT_GET_MESSAGE_LIST": "Impossibile ottenere la lista dei messaggi",
-		"CANT_GET_MESSAGE": "Impossibile caricare il messaggio",
-		"CANT_DELETE_MESSAGE": "Impossibile eliminare il messaggio",
-		"CANT_COPY_MESSAGE": "Impossibile copiare il messaggio",
-		"CANT_MOVE_MESSAGE": "Impossibile spostare il messaggio",
-		"CANT_SAVE_MESSAGE": "Impossibile salvare il messaggio",
-		"CANT_SEND_MESSAGE": "Impossibile inviare il messaggio",
-		"INVALID_RECIPIENTS": "Destinatario non valido",
-		"CANT_SAVE_FILTERS": "Impossibile salvare i filtri",
-		"CANT_GET_FILTERS": "Impossibile caricare i filtri",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Impossibile attivare i filtri script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Impossibile eliminare i filtri script",
-		"FILTERS_ARE_NOT_CORRECT": "I filtri non sono corretti",
-		"CANT_CREATE_FOLDER": "Impossibile creare la cartella",
-		"CANT_RENAME_FOLDER": "Impossibile rinominare la cartella",
-		"CANT_DELETE_FOLDER": "Impossibile eliminare la cartella",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Impossibile eliminare una cartella non vuota",
-		"CANT_SUBSCRIBE_FOLDER": "Impossibile sottoscrivere la cartella",
-		"CANT_UNSUBSCRIBE_FOLDER": "Impossibile rimuovere la sottoscrizione alla cartella",
-		"DEMO_SEND_MESSAGE_ERROR": "Per ragioni di sicurezza, questa demo non è abilitata ad inviare email ad inidirizzi esterni",
-		"DEMO_ACCOUNT_ERROR": "Per ragioni di sicurezza, questo account non è autorizzato ad effettuare questa operazione!",
-		"ACCOUNT_ALREADY_EXISTS": "L'account esiste già",
-		"ACCOUNT_DOES_NOT_EXIST": "L'account non esiste",
-		"ACCOUNT_SWITCH_FAILED": "Passaggio all'account \"%EMAIL%\" fallito",
-		"MAIL_SERVER_ERROR": "Si è verificato un errore nel server mail",
-		"INVALID_INPUT_ARGUMENT": "Argomento non valido",
-		"UNKNOWN_ERROR": "Errore sconosciuto"
+		"RequestError": "Richiesta fallita",
+		"RequestAborted": "Richiesta annullata",
+		"RequestTimeout": "Richiesta scaduta",
+		"InvalidToken": "Token invalido",
+		"AuthError": "Autenticazione fallita",
+		"ConnectionError": "Impossibile connettersi al server",
+		"DomainAlreadyExists": "Il dominio esiste già",
+		"DomainNotAllowed": "Il dominio non è autorizzato",
+		"AccountNotAllowed": "L'account non è autorizzato",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Errore durante la sincronizzazione dei contatti",
+		"CantGetMessageList": "Impossibile ottenere la lista dei messaggi",
+		"CantGetMessage": "Impossibile caricare il messaggio",
+		"CantDeleteMessage": "Impossibile eliminare il messaggio",
+		"CantCopyMessage": "Impossibile copiare il messaggio",
+		"CantMoveMessage": "Impossibile spostare il messaggio",
+		"CantSaveMessage": "Impossibile salvare il messaggio",
+		"CantSendMessage": "Impossibile inviare il messaggio",
+		"InvalidRecipients": "Destinatario non valido",
+		"CantSaveFilters": "Impossibile salvare i filtri",
+		"CantGetFilters": "Impossibile caricare i filtri",
+		"CantActivateFiltersScript": "Impossibile attivare i filtri script",
+		"CantDeleteFiltersScript": "Impossibile eliminare i filtri script",
+		"FiltersAreNotCorrect": "I filtri non sono corretti",
+		"CantCreateFolder": "Impossibile creare la cartella",
+		"CantRenameFolder": "Impossibile rinominare la cartella",
+		"CantDeleteFolder": "Impossibile eliminare la cartella",
+		"CantDeleteNonEmptyFolder": "Impossibile eliminare una cartella non vuota",
+		"CantSubscribeFolder": "Impossibile sottoscrivere la cartella",
+		"CantUnsubscribeFolder": "Impossibile rimuovere la sottoscrizione alla cartella",
+		"DemoSendMessageError": "Per ragioni di sicurezza, questa demo non è abilitata ad inviare email ad inidirizzi esterni",
+		"DemoAccountError": "Per ragioni di sicurezza, questo account non è autorizzato ad effettuare questa operazione!",
+		"AccountAlreadyExists": "L'account esiste già",
+		"AccountDoesNotExist": "L'account non esiste",
+		"AccountSwitchFailed": "Passaggio all'account \"%EMAIL%\" fallito",
+		"MailServerError": "Si è verificato un errore nel server mail",
+		"InvalidInputArgument": "Argomento non valido",
+		"UnknownError": "Errore sconosciuto"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ja-JP/relativetimeformat.js
deleted file mode 100644
index 51781986a..000000000
--- a/snappymail/v/0.0.0/app/localization/ja-JP/relativetimeformat.js
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	year: {
-		past: "{0} 年前",
-		future: "{0} 年後"
-	},
-	month: {
-		past: "{0} か月前",
-		future: "{0} か月後"
-	},
-	week: {
-		past: "{0} 週間前",
-		future: "{0} 週間後"
-	},
-	day: {
-		past: "{0} 日前",
-		future: "{0} 日後"
-	},
-	hour: {
-		past: "{0} 時間前",
-		future: "{0} 時間後"
-	},
-	minute: {
-		past: "{0} 分前",
-		future: "{0} 分後"
-	},
-	second: {
-		past: "{0} 秒前",
-		future: "{0} 秒後"
-	},
-	plural: n => 1 == n ? 'one' : 'other'
-}
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/static.json b/snappymail/v/0.0.0/app/localization/ja-JP/static.json
deleted file mode 100644
index 3fcc92a65..000000000
--- a/snappymail/v/0.0.0/app/localization/ja-JP/static.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"BACK_LINK": "更新",
-	"NO_SCRIPT_TITLE": "このアプリケーションでは  JavaScript が必要です。",
-	"NO_SCRIPT_DESC": "ブラウザで JavaScript が、有効になっていません。\nJavaScript を有効にして、再度試してください。\n",
-	"NO_COOKIE_TITLE": "このアプリケーションでは  Cookie が必要です。",
-	"NO_COOKIE_DESC": "ブラウザで Cookie が、有効になっていません。\nCookie を有効にして、再度試してください。\n",
-	"BAD_BROWSER_TITLE": "ブラウザが古いです。",
-	"BAD_BROWSER_DESC": "アプリケーションのすべての機能を使用するには、\nこれらのブラウザの1つをダウンロードしてインストールします：\n"
-}
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/user.json b/snappymail/v/0.0.0/app/localization/ja-JP/user.json
deleted file mode 100644
index a7584ead4..000000000
--- a/snappymail/v/0.0.0/app/localization/ja-JP/user.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-	"GLOBAL": {
-		"TO_ARCHIVE": "アーカイブ",
-		"ARE_YOU_SURE": "よろしいですか？",
-		"BACK": "戻る",
-		"BCC": "BCC",
-		"CANCEL": "キャンセル",
-		"CC": "CC",
-		"CLEAR": "消去",
-		"CLOSE": "閉じる (Esc)",
-		"CONTACTS": "連絡先",
-		"DELETE": "削除",
-		"DONE": "完了",
-		"EMAIL": "メールアドレス",
-		"FROM": "差出人",
-		"LOADING": "読み込み中...",
-		"LOGOUT": "ログアウト",
-		"MORE": "その他",
-		"MOVE_TO": "移動",
-		"NAME": "受信トレイ",
-		"NONE": "なし",
-		"NOT_SPAM": "迷惑メールを解除",
-		"PASSWORD": "パスワード",
-		"REPLY_TO": "Reply-To",
-		"SAVE": "保存",
-		"SEARCH": "連絡先が見つかりません",
-		"SPAM": "迷惑メールにする",
-		"SUBJECT": "件名",
-		"TEST": "テスト",
-		"TO": "宛先"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "ログイン",
-		"LABEL_SIGN_ME": "サインイン状態を保持する",
-		"BUTTON_SIGN_IN": "サインイン"
-	},
-	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "アカウントを追加",
-		"BUTTON_SETTINGS": "設定",
-		"BUTTON_HELP": "ヘルプ"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "モバイル版",
-		"BUTTON_DESKTOP_VERSION": "デスクトップ版"
-	},
-	"SEARCH": {
-		"TITLE_ADV": "高度な検索",
-		"LABEL_ADV_TEXT": "キーワード",
-		"LABEL_ADV_HAS_ATTACHMENT": "添付ファイルあり",
-		"LABEL_ADV_HAS_ATTACHMENTS": "添付ファイルあり",
-		"LABEL_ADV_FLAGGED": "スター付き",
-		"LABEL_ADV_UNSEEN": "未読メール",
-		"LABEL_ADV_DATE": "日付",
-		"LABEL_ADV_DATE_ALL": "全て",
-		"LABEL_ADV_DATE_3_DAYS": "3日前まで",
-		"LABEL_ADV_DATE_7_DAYS": "1週間前まで",
-		"LABEL_ADV_DATE_MONTH": "1ヶ月前まで",
-		"LABEL_ADV_DATE_3_MONTHS": "3ヶ月前まで",
-		"LABEL_ADV_DATE_6_MONTHS": "6ヶ月前まで",
-		"LABEL_ADV_DATE_YEAR": "1年前まで",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "フルスクリーン",
-		"ZOOM": "拡大\/縮小",
-		"CLOSE": "閉じる (Esc)",
-		"GALLERY_PREV": "前 (←)",
-		"GALLERY_NEXT": "次 (→)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
-	},
-	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "作成",
-		"BUTTON_NEW_MESSAGE": "新規作成",
-		"INBOX_NAME": "受信トレイ",
-		"SENT_NAME": "送信済み",
-		"DRAFTS_NAME": "下書き",
-		"TRASH_NAME": "ごみ箱",
-		"ARCHIVE_NAME": "アーカイブ"
-	},
-	"QUOTA": {
-		"TITLE": "クォータ使用量"
-	},
-	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "リスト更新",
-		"BUTTON_EMPTY_FOLDER": "フォルダを空にする",
-		"BUTTON_MULTY_FORWARD": "転送 (元のメッセージを添付)",
-		"BUTTON_DELETE_WITHOUT_MOVE": "完全に削除",
-		"MENU_SET_SEEN": "既読にする",
-		"MENU_SET_ALL_SEEN": "すべて既読にする",
-		"MENU_UNSET_SEEN": "未読にする",
-		"MENU_SET_FLAG": "スターをつける",
-		"MENU_UNSET_FLAG": "スターをはずす",
-		"MENU_SELECT_ALL": "全て",
-		"MENU_SELECT_INVERT": "反転",
-		"MENU_SELECT_UNSEEN": "未読",
-		"MENU_SELECT_SEEN": "既読",
-		"MENU_SELECT_FLAGGED": "フラグ付き",
-		"MENU_SELECT_UNFLAGGED": "フラグなし",
-		"EMPTY_LIST": "メッセージはありません",
-		"EMPTY_SEARCH_LIST": "検索条件に一致するメールは見つかりませんでした。高度な検索を試してみてください。",
-		"SEARCH_RESULT_FOR": "\"%SEARCH%\"の検索結果",
-		"BACK_TO_MESSAGE_LIST": "メッセージ一覧に戻る",
-		"EMPTY_SUBJECT_TEXT": "(件名なし)",
-		"PUT_MESSAGE_HERE": "ここにメッセージをドロップ",
-		"TODAY_AT": "今日 %TIME%",
-		"YESTERDAY_AT": "昨日 %TIME%",
-		"NEW_MESSAGE_NOTIFICATION": "%COUNT% の新しいメッセージ!",
-		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong>　\/　<strong>%LIMIT%<\/strong>を使用中",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
-	},
-	"MESSAGE": {
-		"BUTTON_EDIT": "編集",
-		"BUTTON_UNSUBSCRIBE": "このリストから登録解除",
-		"BUTTON_REPLY": "返信",
-		"BUTTON_REPLY_ALL": "全員に返信",
-		"BUTTON_FORWARD": "転送",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "添付ファイルとして転送",
-		"BUTTON_EDIT_AS_NEW": "新しいメールとして編集",
-		"BUTTON_SHOW_IMAGES": "外部画像を表示する",
-		"BUTTON_NOTIFY_READ_RECEIPT": "差出人がメールの開封確認メッセージを求めています。",
-		"BUTTON_IN_NEW_WINDOW": "新しいウインドウで開く",
-		"BUTTON_THREAD_LIST": "スレッド一覧",
-		"BUTTON_THREAD_PREV": "前へ",
-		"BUTTON_THREAD_NEXT": "次へ",
-		"BUTTON_THREAD_MORE": "さらに読み込む",
-		"MENU_HEADERS": "メールのヘッダーを表示",
-		"MENU_VIEW_ORIGINAL": "メールのソースを表示",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": ".emlファイルでダウンロード",
-		"MENU_FILTER_SIMILAR": "このようなメッセージをフィルタ",
-		"MENU_PRINT": "印刷",
-		"EMPTY_SUBJECT_TEXT": "(件名なし)",
-		"LABEL_DATE": "日付",
-		"LABEL_FROM_SHORT": "差出人",
-		"LABEL_TO_SHORT": "宛先",
-		"PRINT_LABEL_ATTACHMENTS": "添付ファイル",
-		"MESSAGE_VIEW_DESC": "選択したメールがここに表示されます。",
-		"MESSAGE_VIEW_MOVE_DESC": "左側のパネルでフォルダ名をクリックして移動先を選択します。",
-		"LINK_DOWNLOAD_AS_ZIP": "Zip としてダウンロード",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
-	},
-	"READ_RECEIPT": {
-		"SUBJECT": "開封確認メッセージ - %SUBJECT%",
-		"BODY": "これは %READ-RECEIPT% に送信されたメールの開封確認です。\n\n注： 「この開封確認は、メッセージが受信者のコンピュータ上に表示されたことだけを意味しています。 」\n受信者が読んだり、メッセージの内容を理解しているという保証はありません。\n"
-	},
-	"SUGGESTIONS": {
-		"SEARCHING_DESC": "検索中..."
-	},
-	"CONTACTS": {
-		"BUTTON_ADD_CONTACT": "連絡先を追加",
-		"BUTTON_CREATE_CONTACT": "作成",
-		"BUTTON_UPDATE_CONTACT": "更新",
-		"BUTTON_IMPORT": "インポート (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "エクスポート (vcf, vCard)",
-		"BUTTON_EXPORT_CSV": "エクスポート (csv)",
-		"ERROR_IMPORT_FILE": "インポートエラー (ファイルフォーマットが不正です)",
-		"EMPTY_LIST": "連絡先がありません",
-		"EMPTY_SEARCH": "連絡先が見つかりません",
-		"CLEAR_SEARCH": "検索をクリア",
-		"CONTACT_VIEW_DESC": "選択した連絡先がここに表示されます。",
-		"LABEL_PHONE": "電話番号",
-		"LABEL_WEB": "Web",
-		"LABEL_BIRTHDAY": "誕生日",
-		"LINK_ADD_EMAIL": "メールアドレスを追加",
-		"LINK_ADD_PHONE": "電話番号を追加",
-		"LINK_BIRTHDAY": "誕生日を追加",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "表示名を入力してください",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓を入力してください",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名を入力してください",
-		"PLACEHOLDER_ENTER_NICK_NAME": "ニックネームを入力してください",
-		"LABEL_READ_ONLY": "読み取り専用",
-		"LABEL_SHARE": "共有",
-		"ADD_MENU_LABEL": "追加",
-		"ADD_MENU_NICKNAME": "ニックネーム",
-		"ADD_MENU_NOTES": "注釈",
-		"ADD_MENU_PHONE": "電話番号",
-		"ADD_MENU_URL": "URL",
-		"ADD_MENU_ADDRESS": "住所",
-		"ADD_MENU_BIRTHDAY": "誕生日",
-		"ADD_MENU_TAGS": "タグ",
-		"BUTTON_SHARE_ALL": "すべて",
-		"BUTTON_SYNC": "同期 (CardDAV)"
-	},
-	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "すべて表示",
-		"BUTTON_SEND": "送信",
-		"BUTTON_MINIMIZE": "最小化",
-		"SAVED_TIME": "%TIME%　に保存しました",
-		"SAVED_ERROR_ON_SEND": "メールは送信できましたが、送信済みに保存できませんでした",
-		"DISCARD_UNSAVED_DATA": "保存していないデータを破棄しますか?",
-		"ATTACH_FILES": "ファイルを添付",
-		"ATTACH_DROP_FILES_DESC": "ここにファイルをドロップ",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% wrote",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Forwarded message -------",
-		"FORWARD_MESSAGE_TOP_SENT": "送信済み",
-		"EMPTY_TO_ERROR_DESC": "少なくとも一つの受信者を指定してください",
-		"NO_ATTACHMENTS_HERE_DESC": "添付ファイルがありません",
-		"ATTACHMENTS_ERROR_DESC": "警告！すべての添付ファイルがアップロードされているわけではありません。",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "すべての添付ファイルがアップロードされているわけではありません。",
-		"BUTTON_REQUEST_READ_RECEIPT": "開封確認を要求する",
-		"BUTTON_MARK_AS_IMPORTANT": "重要フラグをつける",
-		"BUTTON_REQUEST_DSN": "配信確認を要求する"
-	},
-	"POPUPS_ASK": {
-		"BUTTON_YES": "はい",
-		"BUTTON_NO": "いいえ",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "このウインドウを閉じていいですか？",
-		"DESC_WANT_DELETE_MESSAGES": "メッセージを削除していいですか？"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "言語を選択"
-	},
-	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "アカウントを追加しますか?",
-		"BUTTON_ADD_ACCOUNT": "追加",
-		"TITLE_UPDATE_ACCOUNT": "アカウント更新しますか？",
-		"BUTTON_UPDATE_ACCOUNT": "更新"
-	},
-	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "メールの表示名を追加しますか？",
-		"TITLE_UPDATE_IDENTITY": "メールの表示名を更新しますか？",
-		"BUTTON_ADD_IDENTITY": "追加",
-		"BUTTON_UPDATE_IDENTITY": "更新",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "返信の引用テキストの前に署名を挿入する"
-	},
-	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "フォルダを作成しますか？",
-		"LABEL_PARENT": "親フォルダ",
-		"BUTTON_CREATE": "作成",
-		"TITLE_CREATING_PROCESS": "フォルダを作成中"
-	},
-	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "フォルダ内のすべてのメールを消去しますか？",
-		"DANGER_DESC_WARNING": "警告！",
-		"DANGER_DESC_HTML_1": "この操作をすると、<strong>%FOLDER%<\/strong>フォルダからすべてのメールを完全に消去してしまいます。",
-		"DANGER_DESC_HTML_2": "一度始めると、中止やキャンセルができません。",
-		"TITLE_CLEARING_PROCESS": "フォルダを消去しています..."
-	},
-	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "OpenPGP キーをインポート",
-		"POPUP_IMPORT_BUTTON": "インポート",
-		"POPUP_VIEW_TITLE": "OpenPGP キーを表示",
-		"POPUP_VIEW_BUTTON": "選択",
-		"POPUP_GENERATE_TITLE": "OpenPGP キーを生成",
-		"POPUP_GENERATE_BUTTON": "生成",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "署名",
-		"LABEL_ENCRYPT": "暗号化",
-		"BUTTON_DECRYPT": "復号化",
-		"BUTTON_VERIFY": "Verify",
-		"SIGNED_MESSAGE": "OpenPGP 署名済みメッセージ",
-		"ENCRYPTED_MESSAGE": "OpenPGP 暗号化メッセージ",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "%USER% からの正しい署名",
-		"ERROR": "OpenPGP エラー: %ERROR%"
-	},
-	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "フィルターを作成しますか?",
-		"TITLE_EDIT_FILTER": "フィルターを更新しますか?",
-		"LEGEND_CONDITIONS": "条件",
-		"LEGEND_ACTIONS": "アクション",
-		"BUTTON_ADD_CONDITION": "条件の追加",
-		"SELECT_ACTION_MOVE_TO": "移動",
-		"SELECT_ACTION_FORWARD_TO": "転送",
-		"SELECT_ACTION_REJECT": "拒否",
-		"SELECT_ACTION_VACATION_MESSAGE": "バケーションメッセージ",
-		"SELECT_ACTION_DISCARD": "破棄",
-		"SELECT_FIELD_RECIPIENTS": "受信者 (To or CC)",
-		"SELECT_FIELD_HEADER": "ヘッダー",
-		"SELECT_FIELD_BODY": "Body",
-		"SELECT_FIELD_SIZE": "サイズ",
-		"SELECT_TYPE_CONTAINS": "含む",
-		"SELECT_TYPE_NOT_CONTAINS": "含まない",
-		"SELECT_TYPE_MATCHES": "マッチする (* と ? が使用可)",
-		"SELECT_TYPE_NOT_MATCHES": "マッチしない (* と ? が使用可)",
-		"SELECT_TYPE_REGEXP": "正規表現",
-		"SELECT_TYPE_NOT_REGEXP": "正規表現を使わない",
-		"SELECT_TYPE_EQUAL_TO": "一致",
-		"SELECT_TYPE_NOT_EQUAL_TO": "一致しない",
-		"SELECT_TYPE_OVER": "Over",
-		"SELECT_TYPE_UNDER": "Under",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "以下のルールのいずれかにマッチ",
-		"SELECT_MATCH_ALL": "以下のルールのすべてにマッチ",
-		"MARK_AS_READ_LABEL": "既読にする",
-		"REPLY_INTERVAL_LABEL": "返信間隔 (日)",
-		"KEEP_LABEL": "保持",
-		"STOP_LABEL": "ルールの処理を止めない",
-		"VACATION_SUBJECT_LABEL": "件名 (オプション)",
-		"VACATION_MESSAGE_LABEL": "メッセージ",
-		"VACATION_RECIPIENTS_LABEL": "受信者 (カンマ区切り)",
-		"REJECT_MESSAGE_LABEL": "拒否メッセージ",
-		"ALL_INCOMING_MESSAGES_DESC": "すべての受信メッセージ"
-	},
-	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
-	},
-	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "システムフォルダーを選択",
-		"SELECT_CHOOSE_ONE": "1つ選択",
-		"SELECT_UNUSE_NAME": "使用しない",
-		"NOTIFICATION_SENT": "送信済みメッセージを置くための ”Sent” システムフォルダが選択されていません。\n送信済みメッセージを保存する必要がないのなら、\"使用しない\"オプションを選択してください。\n",
-		"NOTIFICATION_DRAFTS": "下書きメッセージを置くための ”Sent” システムフォルダが選択されていません。",
-		"NOTIFICATION_SPAM": "迷惑メールを置くための ”Spam” システムフォルダが選択されていません。\n迷惑メールが完全に削除されるのを望むのなら、\"使用しない\"オプションを選択してください。\n",
-		"NOTIFICATION_TRASH": "削除されたメッセージを置くための ”Trash” システムフォルダが選択されていません。\n削除されたメッセージが完全に削除されるのを望むのなら、\"使用しない\"オプションを選択してください。\n",
-		"NOTIFICATION_ARCHIVE": "アーカイブされたメッセージを置くための ”Archive” システムフォルダが選択されていません。"
-	},
-	"TITLES": {
-		"MAILBOX": "メールボックス",
-		"SETTINGS": "設定"
-	},
-	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "ファイルが大きすぎます",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "ファイルは、不明なエラーのため一部しかアップロードされませんでした",
-		"ERROR_NO_FILE_UPLOADED": "ファイルはアップロードされていません",
-		"ERROR_MISSING_TEMP_FOLDER": "一時ファイルが見つかりません",
-		"ERROR_ON_SAVING_FILE": "不明なファイルアップロードエラーが発生しました",
-		"ERROR_FILE_TYPE": "無効なファイル種類",
-		"ERROR_UNKNOWN": "不明なファイルアップロードエラーが発生しました"
-	},
-	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
-	},
-	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "個人",
-		"LABEL_GENERAL_NAME": "全般",
-		"LABEL_CONTACTS_NAME": "連絡先",
-		"LABEL_FOLDERS_NAME": "フォルダー",
-		"LABEL_ACCOUNTS_NAME": "アカウント",
-		"LABEL_FILTERS_NAME": "フィルター",
-		"LABEL_SECURITY_NAME": "セキュリティ",
-		"LABEL_THEMES_NAME": "テーマ"
-	},
-	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "フィルター",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
-		"SUBNAME_MOVE_TO": "\"%FOLDER%\" へ移動",
-		"SUBNAME_FORWARD_TO": "\"%EMAIL%\" へ転送",
-		"SUBNAME_REJECT": "拒否",
-		"SUBNAME_VACATION_MESSAGE": "バケーションメッセージ",
-		"SUBNAME_DISCARD": "破棄",
-		"LOADING_PROCESS": "フィルターリストの更新中"
-	},
-	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "セキュリティ",
-		"LABEL_AUTOLOGOUT": "自動ログアウト",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "しない",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% 分",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% 時間"
-	},
-	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "全般",
-		"LABEL_LANGUAGE": "言語",
-		"LABEL_IDENTITY": "表示名",
-		"LABEL_LAYOUT": "レイアウト",
-		"LABEL_LAYOUT_NO_SPLIT": "分割しない",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "縦に分割",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "横に分割",
-		"LABEL_EDITOR": "メール形式",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "プレーンテキスト",
-		"LABEL_EDITOR_HTML_FORCED": "Html (強制)",
-		"LABEL_EDITOR_PLAIN_FORCED": "プレーンテキスト (強制)",
-		"LABEL_VIEW_OPTIONS": "表示",
-		"LABEL_USE_PREVIEW_PANE": "プレビューペインを使用する",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示",
-		"LABEL_USE_THREADS": "スレッドを使う",
-		"LABEL_REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
-		"LABEL_SHOW_IMAGES": "外部画像を常に表示する",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "1ページに表示する件数",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "通知設定",
-		"LABEL_SOUND_NOTIFICATION": "サウンド通知",
-		"LABEL_CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)"
-	},
-	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する",
-		"LEGEND_CONTACTS_SYNC": "リモート同期 (CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "リモート同期を有効化",
-		"LABEL_CONTACTS_SYNC_SERVER": "サーバー",
-		"LABEL_CONTACTS_SYNC_AB_URL": "アドレス帳 URL",
-		"LABEL_CONTACTS_SYNC_USER": "ユーザー",
-		"SYNC_NO": "いいえ",
-		"SYNC_YES": "はい",
-		"SYNC_READ": "Read only"
-	},
-	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "テーマ",
-		"LEGEND_THEMES_CUSTOM": "カスタムテーマ設定",
-		"LABEL_CUSTOM_TYPE": "種類",
-		"LABEL_CUSTOM_TYPE_LIGHT": "ライト",
-		"LABEL_CUSTOM_TYPE_DARK": "ダーク",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "背景画像をアップロード (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "ファイルが大きすぎます",
-		"ERROR_FILE_TYPE_ERROR": "無効なファイル種類 (JPG\/PNG のみ)",
-		"ERROR_UNKNOWN": "不明なファイルアップロードエラーが発生しました"
-	},
-	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "フォルダー一覧",
-		"BUTTON_CREATE": "フォルダを作成",
-		"BUTTON_SYSTEM": "システムフォルダー",
-		"BUTTON_SUBSCRIBE": "購読",
-		"BUTTON_UNSUBSCRIBE": "購読解除",
-		"LOADING_PROCESS": "フォルダーリストの更新",
-		"CREATING_PROCESS": "フォルダーの作成",
-		"DELETING_PROCESS": "フォルダーの削除",
-		"RENAMING_PROCESS": "フォルダーの名前を変更",
-		"TO_MANY_FOLDERS_DESC_1": "フォルダーが多すぎます",
-		"TO_MANY_FOLDERS_DESC_2": "パフォーマンスの問題を回避するために、それらの一部のみを示しています。",
-		"HELP_DELETE_FOLDER": "フォルダーを削除",
-		"HELP_SHOW_HIDE_FOLDER": "フォルダーの表示\/非表示",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "新しいメッセージをチェックする\/しない",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
-	},
-	"SETTINGS_ACCOUNTS": {
-		"LEGEND_ACCOUNTS": "アカウント一覧",
-		"LEGEND_IDENTITIES": "表示名",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "アカウトと表示名",
-		"BUTTON_ADD_ACCOUNT": "アカウントを追加",
-		"BUTTON_ADD_IDENTITY": "表示名を追加",
-		"LOADING_PROCESS": "更新中",
-		"DEFAULT_IDENTITY_LABEL": "デフォルト"
-	},
-	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "キーをインポート",
-		"BUTTON_GENERATE_KEY_PAIR": "キーを生成",
-		"TITLE_PRIVATE": "プライベート",
-		"TITLE_PUBLIC": "パブリック",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
-	},
-	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "キーボード ショートカット ヘルプ",
-		"TAB_MAILBOX": "メールボックス",
-		"TAB_MESSAGE_LIST": "メッセージ一覧",
-		"TAB_MESSAGE_VIEW": "メッセージ表示画面",
-		"TAB_COMPOSE": "作成画面",
-		"LABEL_OPEN_USER_DROPDOWN": "ユーザーメニューを開く",
-		"LABEL_REPLY": "返信",
-		"LABEL_REPLY_ALL": "全員に返信",
-		"LABEL_FORWARD": "転送",
-		"LABEL_FORWARD_MULTIPLY": "転送 (元のメッセージを添付)",
-		"LABEL_HELP": "ヘルプ",
-		"LABEL_CHECK_ALL": "すべてのメッセージを選択",
-		"LABEL_DELETE": "削除",
-		"LABEL_OPEN_THREAD": "選択したスレッドを開く",
-		"LABEL_MOVE": "移動",
-		"LABEL_READ": "選択したメッセージを既読にする",
-		"LABEL_UNREAD": "選択したメッセージを未読にする",
-		"LABEL_IMPORTANT": "選択したメッセージに重要フラグをつける",
-		"LABEL_CANCEL_SEARCH": "検索を取り消す",
-		"LABEL_FULLSCREEN_ENTER": "全画面 (プレビューペインレイアウト)",
-		"LABEL_VIEW_MESSAGE_ENTER": "メッセージの表示 (非プレビューペインレイアウト)",
-		"LABEL_SWITCH_TO_MESSAGE": "選択されたメッセージへ切り替える",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "フォルダー一覧へ切り替える",
-		"LABEL_FULLSCREEN_TOGGLE": "フルスクリーンモードへの切り替え",
-		"LABEL_BLOCKQUOTES_TOGGLE": "メッセージ引用の切り替え",
-		"LABEL_THREAD_NEXT": "スレッドの次のメーッセージ",
-		"LABEL_THREAD_PREV": "スレッドの前のメーッセージ",
-		"LABEL_PRINT": "印刷",
-		"LABEL_EXIT_FULLSCREEN": "フルスクリーンモードの終了",
-		"LABEL_CLOSE_MESSAGE": "メッセージを閉じる (非プレビューペインレイアウト)",
-		"LABEL_SWITCH_TO_LIST": "メッセージ一覧へ切り替える",
-		"LABEL_OPEN_COMPOSE_POPUP": "作成画面を開く",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "作成画面を最小化",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "表示名メニューを開く",
-		"LABEL_SAVE_MESSAGE": "メッセージを保存",
-		"LABEL_SEND_MESSAGE": "メッセージを送信",
-		"LABEL_CLOSE_COMPOSE": "作成画面を閉じる"
-	},
-	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "無効なトークン",
-		"AUTH_ERROR": "認証に失敗しました",
-		"CONNECTION_ERROR": "サーバーへ接続できません",
-		"DOMAIN_ALREADY_EXISTS": "ドメインが既に存在しています",
-		"DOMAIN_NOT_ALLOWED": "ドメインは、許可されていません",
-		"ACCOUNT_NOT_ALLOWED": "アカウントは、許可されていません",
-		"CONTACTS_SYNC_ERROR": "連絡先 同期 エラー",
-		"CANT_GET_MESSAGE_LIST": "メッセージ一覧が取得できません",
-		"CANT_GET_MESSAGE": "メッセージを取得できません",
-		"CANT_DELETE_MESSAGE": "メッセージを削除できません",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "メッセージを移動できません",
-		"CANT_SAVE_MESSAGE": "メッセージを保存できません",
-		"CANT_SEND_MESSAGE": "メッセージ送信できません",
-		"INVALID_RECIPIENTS": "無効な受信者",
-		"CANT_SAVE_FILTERS": "フィルターを保存できません",
-		"CANT_GET_FILTERS": "フィルターを取得できません",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "フィルターが正しくありません",
-		"CANT_CREATE_FOLDER": "フォルダを作成できません",
-		"CANT_RENAME_FOLDER": "フォルダの名前を変更できません",
-		"CANT_DELETE_FOLDER": "フォルダを削除できません",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "空ではないディレクトリを削除できません",
-		"CANT_SUBSCRIBE_FOLDER": "フォルダを購読できません",
-		"CANT_UNSUBSCRIBE_FOLDER": "フォルダを購読解除できません",
-		"DEMO_SEND_MESSAGE_ERROR": "セキュリティ上の理由から、アカウントは、外部の電子メールアドレスにメッセージを送信することを許可されていません！",
-		"DEMO_ACCOUNT_ERROR": "セキュリティ上の理由から、アカウントには、このアクションが許可されていません！",
-		"ACCOUNT_ALREADY_EXISTS": "アカウントがすでに存在します",
-		"ACCOUNT_DOES_NOT_EXIST": "アカウントは存在しません",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "メールサーバーへのアクセス中にエラーが発生しました",
-		"INVALID_INPUT_ARGUMENT": "無効な入力引数",
-		"UNKNOWN_ERROR": "不明なエラー"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json b/snappymail/v/0.0.0/app/localization/ja/admin.json
similarity index 57%
rename from snappymail/v/0.0.0/app/localization/ja-JP/admin.json
rename to snappymail/v/0.0.0/app/localization/ja/admin.json
index f1358b943..5255b00e1 100644
--- a/snappymail/v/0.0.0/app/localization/ja-JP/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ja/admin.json
@@ -1,43 +1,50 @@
 {
 	"GLOBAL": {
+		"ADD": "追加",
+		"CLOSE": "閉じる",
 		"SAVE": "保存",
-		"UPDATE": "更新"
+		"TEST": "テスト",
+		"UPDATE": "更新",
+		"USERNAME": "ユーザー名",
+		"PASSWORD": "パスワード",
+		"CANCEL": "キャンセル",
+		"SEARCH": "検索",
+		"YES": "はい",
+		"NO": "いいえ"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "ログイン",
-		"LABEL_PASSWORD": "パスワード",
-		"LABEL_TOTP": "TOTP code",
+		"LABEL_TOTP": "TOTPコード",
 		"BUTTON_LOGIN": "管理画面へログイン"
 	},
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "管理画面"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "全般",
-		"LABEL_LOGIN_NAME": "ログイン",
-		"LABEL_BRANDING_NAME": "ブランド化",
-		"LABEL_CONTACTS_NAME": "連絡先",
-		"LABEL_DOMAINS_NAME": "ドメイン",
-		"LABEL_SECURITY_NAME": "セキュリティ",
-		"LABEL_PACKAGES_NAME": "パッケージ",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "RainLoop について"
+		"GENERAL": "全般",
+		"LOGIN": "ログイン",
+		"BRANDING": "ブランド化",
+		"CONTACTS": "連絡先",
+		"DOMAINS": "ドメイン",
+		"SECURITY": "セキュリティ",
+		"PACKAGES": "パッケージ",
+		"CONFIG": "詳細",
+		"ABOUT": "SnappyMailについて"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "インターフェース",
 		"LABEL_LANGUAGE": "言語",
-		"LABEL_LANGUAGE_ADMIN": "言語 (管理画面)",
+		"LABEL_LANGUAGE_ADMIN": "言語(管理画面)",
 		"LABEL_THEME": "テーマ",
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "設定画面で言語選択を使用する",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "設定画面でテーマ選択を使用する",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "設定画面で背景選択を使用する",
-		"LABEL_NEW_FOLDER_MOVE": "新しい \"フォルダへ移動\" ボタン",
-		"LABEL_SHOW_THUMBNAILS": "サムネイルを表示 (添付ファイル)",
+		"LABEL_SHOW_THUMBNAILS": "サムネイルを表示(添付ファイル)",
 		"LEGEND_MAIN": "メイン",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "添付サイズ制限",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "追加のアカウントを使用する",
 		"LABEL_ALLOW_IDENTITIES": "複数の表示名を使用する",
-		"ALERT_DATA_ACCESS": "RainLoop のデータフォルダがアクセス可能になっています。外部から RainLoop のデータフォルダにアクセスできないよう、Web サーバーを設定してください。詳しくは以下をご覧ください:",
+		"ALERT_DATA_ACCESS": "SnappyMailのデータフォルダがアクセス可能になっています。外部からSnappyMailのデータフォルダにアクセスできないよう、Webサーバーを設定してください。詳しくは以下をご覧ください:",
 		"ALERT_WARNING": "警告！",
 		"HTML_ALERT_WEAK_PASSWORD": "デフォルトの管理者パスワードを使用しています。\n<br>\nセキュリティ上の理由から、いますぐパスワードを\n<strong><a href=\"#\/security\">変更<\/a><\/strong>\nしてください。\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "デフォルトドメイン",
 		"LABEL_DETERMINE_USER_DOMAIN": "ユーザードメインを自動で選ぶ",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "ログイン画面で言語選択を使用する",
-		"LABEL_DETERMINE_USER_LANGUAGE": "ユーザー言語を自動で選ぶ",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "ユーザー言語を自動で選ぶ"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "ブランド化",
@@ -57,15 +63,16 @@
 	},
 	"TAB_CONTACTS": {
 		"LEGEND_CONTACTS": "連絡先",
-		"LEGEND_STORAGE": "ストレージ (PDO)",
+		"LEGEND_STORAGE": "ストレージ(PDO)",
 		"LABEL_ENABLE_CONTACTS": "連絡先を有効化",
-		"LABEL_ALLOW_SYNC": " (外部の CardDAV サーバーと) 連絡先の同期を使用する",
+		"LABEL_ALLOW_SYNC": "(外部のCardDAVサーバーと)連絡先の同期を使用する",
 		"LABEL_STORAGE_TYPE": "タイプ",
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "ユーザー",
 		"LABEL_STORAGE_PASSWORD": "パスワード",
-		"BUTTON_TEST": "テスト",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "注意！",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "アクティブユーザーの数が多いとき、このデータベース・タイプを使用しないでください。",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "このシステムでは連絡先はサポートされていません。\n<br>\nサーバーへ<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong>\n拡張モジュールのインストールが必要です。\n"
 	},
@@ -74,37 +81,35 @@
 		"BUTTON_ADD_DOMAIN": "ドメインを追加",
 		"BUTTON_ADD_ALIAS": "エイリアスを追加",
 		"DELETE_ARE_YOU_SURE": "よろしいですか？",
-		"HTML_DOMAINS_HELPER": "ドメインの一覧は、Web メールのアクセスを許可されています。\n<br>\nドメインを設定するには、名前をクリックしてください。\n"
+		"HTML_DOMAINS_HELPER": "ドメインの一覧は、Webメールのアクセスを許可されています。\n<br>\nドメインを設定するには、名前をクリックしてください。\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "セキュリティ",
-		"LABEL_USE_IMAGE_PROXY": "外部イメージにローカル Proxy を使う",
-		"LABEL_ALLOW_OPEN_PGP": "OpenPGP を使う",
-		"LABEL_SHOW_PHP_INFO": "PHP 情報を表示",
+		"LABEL_USE_IMAGE_PROXY": "外部イメージにローカルProxyを使う",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
+		"LABEL_SHOW_PHP_INFO": "PHP情報を表示",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理画面アクセス情報",
 		"LABEL_CURRENT_PASSWORD": "現在のパスワード",
-		"LABEL_NEW_LOGIN": "新しいログイン名",
 		"LABEL_NEW_PASSWORD": "新しいパスワード",
 		"LABEL_REPEAT_PASSWORD": "再入力",
-		"BUTTON_UPDATE_PASSWORD": "パスワード更新",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": " (IMAP\/SMTP) のSSL 証明書の検証を有効にする",
+		"LABEL_REQUIRE_VERIFICATION": "のSSL証明書の検証を有効にする",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "自己署名証明書を使う"
 	},
 	"TAB_PACKAGES": {
-		"LABEL_ENABLE_PLUGINS": "Enable extensions",
+		"LABEL_ENABLE_PLUGINS": "プラグインを有効化",
 		"LEGEND_AVAILABLE_FOR_UPDATE": "更新があります",
 		"LEGEND_AVAILABLE_FOR_INSTALLATION": "インストール可能なパッケージ",
 		"LEGEND_INSTALLED_PACKAGES": "インストールされたパッケージ",
 		"ALERT_CANNOT_ACCESS_REPOSITORY": "現時点でリポジトリにアクセスすることはできません。"
 	},
 	"TAB_ABOUT": {
-		"LEGEND_ABOUT": "RainLoop について",
+		"LEGEND_ABOUT": "SnappyMailについて",
 		"LABEL_TAG_HINT": "シンプル・モダン・高速なウェブベースのメールクライアント",
 		"LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.",
 		"HINT_READ_CHANGE_LOG": "更新する前に変更ログをお読みください。",
-		"HINT_IS_UP_TO_DATE": "RainLoopは最新のものです。",
-		"HTML_NEW_VERSION": "新しいバージョン  <b>%VERSION%<\/b> があります",
+		"HINT_IS_UP_TO_DATE": "SnappyMailは最新のものです。",
+		"HTML_NEW_VERSION": "新しいバージョン<b>%VERSION%<\/b>があります",
 		"LABEL_UPDATING": "更新中",
 		"LABEL_CHECKING": "アップデートの確認",
 		"BUTTON_RELEASES": "Releases"
@@ -112,50 +117,41 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "エイリアスを追加",
 		"LABEL_ALIAS": "エイリアス",
-		"LABEL_DOMAIN": "ドメイン",
-		"BUTTON_CLOSE": "閉じる",
-		"BUTTON_ADD": "追加"
+		"LABEL_DOMAIN": "ドメイン"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "ドメインを追加",
-		"TITLE_ADD_DOMAIN_WITH_NAME": "ドメイン \"%NAME%\" を追加",
-		"TITLE_EDIT_DOMAIN": "ドメイン \"%NAME%\" を編集",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "ドメイン\"%NAME%\"を追加",
+		"TITLE_EDIT_DOMAIN": "ドメイン\"%NAME%\"を編集",
 		"LABEL_NAME": "名前",
 		"NAME_HELPER": "ワイルドカード利用可",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "サーバー",
 		"LABEL_PORT": "ポート",
 		"LABEL_SECURE": "セキュリティ",
-		"LABEL_WHITE_LIST": "ホワイトリスト",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "なし",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "SIEVE スクリプトを使用する",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "SIEVEスクリプトを使用する",
 		"LABEL_USE_SHORT_LOGIN": "短いログイン名を使う",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "認証を使用する",
-		"LABEL_SET_SENDER": "Use login as sender",
-		"LABEL_USE_PHP_MAIL": "PHP mail() 関数を使用する",
-		"BUTTON_TEST": "接続テスト",
+		"LABEL_SET_SENDER": "ログイン名を送信者として使う",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
+		"LABEL_USE_PHP_MAIL": "PHPのmail()関数を使用する",
 		"BUTTON_WHITE_LIST": "ホワイトリスト",
-		"BUTTON_SIEVE_CONFIGURATION": "SIEVE 設定",
-		"BUTTON_BACK_TO_IMAP": "IMAP 設定に戻る",
-		"BUTTON_BACK": "戻る",
-		"BUTTON_CLOSE": "閉じる",
-		"BUTTON_ADD": "追加",
-		"BUTTON_UPDATE": "更新",
-		"NEW_DOMAIN_DESC": "このドメイン設定を使用すると、 <i>%NAME%<\/i>  メールアドレスで動作するようになります。",
-		"WHITE_LIST_ALERT": "ドメインの一覧は、Web メールのアクセスを許可されています。\n区切り文字としてスペースを使用してください。\n"
+		"NEW_DOMAIN_DESC": "このドメイン設定を使用すると、<strong>%NAME%<\/strong>メールアドレスで動作するようになります。",
+		"WHITE_LIST_ALERT": "ドメインの一覧は、Webメールのアクセスを許可されています。\n区切り文字としてスペースを使用してください。\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "プラグイン",
-		"DESC_NOTHING_TO_CONFIGURE": "何も設定されていません",
-		"BUTTON_CLOSE": "閉じる"
+		"DESC_NOTHING_TO_CONFIGURE": "何も設定されていません"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "このウィンドウを閉じてもよろしいですか？"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "警告！"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "不明なエラー"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "無効なトークン",
-		"AUTH_ERROR": "認証に失敗しました",
-		"DOMAIN_ALREADY_EXISTS": "ドメインが既に存在しています",
-		"CANT_SAVE_PLUGIN_SETTINGS": "設定が保存できません",
-		"CANT_INSTALL_PACKAGE": "パッケージのインストールに失敗しました",
-		"CANT_DELETE_PACKAGE": "パッケージの削除に失敗しました",
-		"INVALID_PLUGIN_PACKAGE": "無効なプラグインパッケージ",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "サポートされていないプラグインパッケージ",
-		"UNKNOWN_ERROR": "不明なエラー"
+		"RequestError": "要求は失敗しました",
+		"RequestAborted": "要求は中断されました",
+		"RequestTimeout": "要求はタイムアウトしました",
+		"InvalidToken": "無効なトークン",
+		"AuthError": "認証に失敗しました",
+		"DomainAlreadyExists": "ドメインが既に存在しています",
+		"CantSavePluginSettings": "設定が保存できません",
+		"CantInstallPackage": "パッケージのインストールに失敗しました",
+		"CantDeletePackage": "パッケージの削除に失敗しました",
+		"InvalidPluginPackage": "無効なプラグインパッケージ",
+		"UnsupportedPluginPackage": "サポートされていないプラグインパッケージ",
+		"UnknownError": "不明なエラー"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/ja/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ja/relativetimeformat.js
new file mode 100644
index 000000000..b11732dc0
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ja/relativetimeformat.js
@@ -0,0 +1,31 @@
+{
+	year: {
+		past: "{0}年前",
+		future: "{0}年後"
+	},
+	month: {
+		past: "{0}か月前",
+		future: "{0}か月後"
+	},
+	week: {
+		past: "{0}週間前",
+		future: "{0}週間後"
+	},
+	day: {
+		past: "{0}日前",
+		future: "{0}日後"
+	},
+	hour: {
+		past: "{0}時間前",
+		future: "{0}時間後"
+	},
+	minute: {
+		past: "{0}分前",
+		future: "{0}分後"
+	},
+	second: {
+		past: "{0}秒前",
+		future: "{0}秒後"
+	},
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/ja/static.json b/snappymail/v/0.0.0/app/localization/ja/static.json
new file mode 100644
index 000000000..7566e08c1
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ja/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "更新",
+	"NO_SCRIPT_TITLE": "このアプリケーションではJavaScriptが必要です。",
+	"NO_SCRIPT_DESC": "ブラウザでJavaScriptが、有効になっていません。\nJavaScriptを有効にして、再度試してください。\n",
+	"NO_COOKIE_TITLE": "このアプリケーションではCookieが必要です。",
+	"NO_COOKIE_DESC": "ブラウザでCookieが、有効になっていません。\nCookieを有効にして、再度試してください。\n",
+	"BAD_BROWSER_TITLE": "ブラウザが古いです。",
+	"BAD_BROWSER_DESC": "アプリケーションのすべての機能を使用するには、\nこれらのブラウザの1つをダウンロードしてインストールします：\n"
+}
diff --git a/snappymail/v/0.0.0/app/localization/ja/user.json b/snappymail/v/0.0.0/app/localization/ja/user.json
new file mode 100644
index 000000000..c24c8d205
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ja/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "アーカイブ",
+		"ARE_YOU_SURE": "よろしいですか？",
+		"BACK": "戻る",
+		"BCC": "BCC",
+		"CANCEL": "キャンセル",
+		"CC": "CC",
+		"CLEAR": "消去",
+		"CLOSE": "閉じる(Esc)",
+		"CONTACTS": "連絡先",
+		"DELETE": "削除",
+		"UNDELETE": "Undelete",
+		"DONE": "完了",
+		"EMAIL": "メールアドレス",
+		"FROM": "差出人",
+		"LOADING": "読み込み中...",
+		"LOGOUT": "ログアウト",
+		"MORE": "その他",
+		"MOVE_TO": "移動",
+		"COPY_TO": "コピー先",
+		"NAME": "受信トレイ",
+		"NONE": "なし",
+		"TO_SPAM": "Move message(s) to Spam",
+		"NOT_SPAM": "迷惑メールを解除",
+		"USERNAME": "ユーザー名",
+		"PASSWORD": "パスワード",
+		"REMEMBER": "Remember",
+		"REPLY_TO": "Reply-To",
+		"SAVE": "保存",
+		"SAVE_CHANGES": "Save changes?",
+		"SEARCH": "検索",
+		"SPAM": "迷惑メール",
+		"SUBJECT": "件名",
+		"TEST": "テスト",
+		"TO": "宛先",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "はい",
+		"NO": "いいえ",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "デフォルト",
+		"HELP": "ヘルプ",
+		"TEXT": "キーワード",
+		"ATTACHMENTS": "添付ファイル"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "ログイン",
+		"LABEL_SIGN_ME": "サインイン状態を保持する",
+		"BUTTON_SIGN_IN": "サインイン"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "アカウントを追加"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "高度な検索",
+		"TEXT": "キーワード",
+		"HAS_ATTACHMENT": "添付ファイルあり",
+		"FLAGGED": "スター付き",
+		"UNSEEN": "未読メール",
+		"DATE": "日付",
+		"DATE_ALL": "全て",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "3日前まで",
+		"SINCE_7_DAYS": "1週間前まで",
+		"SINCE_MONTH": "1ヶ月前まで",
+		"SINCE_3_MONTHS": "3ヶ月前まで",
+		"SINCE_6_MONTHS": "6ヶ月前まで",
+		"SINCE_YEAR": "1年前まで",
+		"SUBFOLDERS": "サブフォルダ",
+		"SUBFOLDERS_NONE": "なし",
+		"SUBFOLDERS_SUBTREE": "全て",
+		"SUBFOLDERS_SUBTREE_ONE": "一段のみ",
+		"REPLIED": "回答済み",
+		"KEYWORD": "Tag"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "作成",
+		"BUTTON_NEW_MESSAGE": "新規作成",
+		"INBOX_NAME": "受信トレイ",
+		"SENT_NAME": "送信済み",
+		"DRAFTS_NAME": "下書き",
+		"TRASH_NAME": "ごみ箱",
+		"ARCHIVE_NAME": "アーカイブ"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "リスト更新",
+		"BUTTON_EMPTY_FOLDER": "フォルダを空にする",
+		"BUTTON_MULTY_FORWARD": "転送(元のメッセージを添付)",
+		"BUTTON_DELETE_WITHOUT_MOVE": "完全に削除",
+		"MENU_SET_SEEN": "既読にする",
+		"MENU_SET_ALL_SEEN": "すべて既読にする",
+		"MENU_UNSET_SEEN": "未読にする",
+		"MENU_SET_FLAG": "スターをつける",
+		"MENU_UNSET_FLAG": "スターをはずす",
+		"MENU_SELECT_ALL": "全て",
+		"MENU_SELECT_INVERT": "反転",
+		"MENU_SELECT_UNSEEN": "未読",
+		"MENU_SELECT_SEEN": "既読",
+		"MENU_SELECT_FLAGGED": "フラグ付き",
+		"MENU_SELECT_UNFLAGGED": "フラグなし",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
+		"EMPTY_LIST": "メッセージはありません",
+		"EMPTY_SEARCH_LIST": "検索条件に一致するメールは見つかりませんでした。高度な検索を試してみてください。",
+		"SEARCH_RESULT_FOR": "\"%SEARCH%\"の検索結果",
+		"BACK_TO_MESSAGE_LIST": "メッセージ一覧に戻る",
+		"PUT_MESSAGE_HERE": "ここにメッセージをドロップ",
+		"TODAY_AT": "今日 %TIME%",
+		"YESTERDAY_AT": "昨日 %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "%COUNT%の新しいメッセージ!",
+		"QUOTA_SIZE": "<strong>%SIZE% (%PROC%%)<\/strong>\/<strong>%LIMIT%<\/strong>を使用中",
+		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "日付で昇順",
+		"SORT_DATE_DESC": "日付で降順",
+		"SORT_SIZE_ASC": "サイズで昇順",
+		"SORT_SIZE_DESC": "サイズで降順",
+		"SORT_SUBJECT_ASC": "件名で昇順",
+		"SORT_SUBJECT_DESC": "件名で降順",
+		"SORT_FROM_ASC": "差出人で昇順",
+		"SORT_FROM_DESC": "差出人で降順"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "編集",
+		"BUTTON_UNSUBSCRIBE": "このリストから登録解除",
+		"BUTTON_REPLY": "返信",
+		"BUTTON_REPLY_ALL": "全員に返信",
+		"BUTTON_FORWARD": "転送",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "添付ファイルとして転送",
+		"BUTTON_EDIT_AS_NEW": "新しいメールとして編集",
+		"BUTTON_SHOW_IMAGES": "外部画像を表示する",
+		"BUTTON_NOTIFY_READ_RECEIPT": "差出人がメールの開封確認メッセージを求めています。",
+		"BUTTON_IN_NEW_WINDOW": "新しいウインドウで開く",
+		"BUTTON_THREAD_LIST": "スレッド一覧",
+		"BUTTON_THREAD_PREV": "前へ",
+		"BUTTON_THREAD_NEXT": "次へ",
+		"BUTTON_THREAD_MORE": "さらに読み込む",
+		"MENU_HEADERS": "メールのヘッダーを表示",
+		"MENU_VIEW_ORIGINAL": "メールのソースを表示",
+		"HTML_VIEW": "メッセージをHTMLで表示",
+		"PLAIN_VIEW": "メッセージをプレーンテキストで表示",
+		"SWAP_COLORS": "Swap default (background)color",
+		"MENU_DOWNLOAD_ORIGINAL": ".emlファイルでダウンロード",
+		"MENU_FILTER_SIMILAR": "このようなメッセージをフィルタ",
+		"MENU_PRINT": "印刷",
+		"EMPTY_SUBJECT_TEXT": "(件名なし)",
+		"LABEL_DATE": "日付",
+		"LABEL_FROM_SHORT": "差出人",
+		"LABEL_TO_SHORT": "宛先",
+		"PRINT_LABEL_ATTACHMENTS": "添付ファイル",
+		"MESSAGE_VIEW_DESC": "選択したメールがここに表示されます。",
+		"MESSAGE_VIEW_MOVE_DESC": "左側のパネルでフォルダ名をクリックして移動先を選択します。",
+		"LINK_DOWNLOAD_AS_ZIP": "Zipとしてダウンロード",
+		"SPAM_SCORE": "Spam Score",
+		"HAS_VIRUS_WARNING": "警告: ウィルスが検出されました",
+		"TAGS": "タグ",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "重要",
+		"$todo": "To Do",
+		"$label1": "重要",
+		"$label2": "仕事",
+		"$label3": "プライベート",
+		"$label4": "To Do",
+		"$label5": "あとで読む"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "開封確認メッセージ - %SUBJECT%",
+		"BODY": "これは %READ-RECEIPT% に送信されたメールの開封確認です。\n\n注： 「この開封確認は、メッセージが受信者のコンピュータ上に表示されたことだけを意味しています。 」\n受信者が読んだり、メッセージの内容を理解しているという保証はありません。\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "検索中..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
+		"BUTTON_ADD_CONTACT": "連絡先を追加",
+		"BUTTON_CREATE_CONTACT": "作成",
+		"BUTTON_IMPORT": "インポート(csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "エクスポート(vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "エクスポート(csv)",
+		"ERROR_IMPORT_FILE": "インポートエラー(ファイルフォーマットが不正です)",
+		"EMPTY_LIST": "連絡先がありません",
+		"EMPTY_SEARCH": "連絡先が見つかりません",
+		"CLEAR_SEARCH": "検索をクリア",
+		"CONTACT_VIEW_DESC": "選択した連絡先がここに表示されます。",
+		"LABEL_BIRTHDAY": "誕生日",
+		"DISPLAY_NAME": "表示名を入力してください",
+		"LAST_NAME": "姓を入力してください",
+		"FIRST_NAME": "名を入力してください",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "ニックネームを入力してください",
+		"LABEL_READ_ONLY": "読み取り専用",
+		"ADD_MENU_LABEL": "追加",
+		"ADD_MENU_NICKNAME": "ニックネーム",
+		"ADD_MENU_NOTE": "注釈",
+		"ADD_MENU_PHONE": "電話番号",
+		"ADD_MENU_URL": "URL",
+		"ADD_MENU_ADDRESS": "住所",
+		"ADD_MENU_BIRTHDAY": "誕生日",
+		"ADD_MENU_TAGS": "タグ",
+		"BUTTON_SHARE_ALL": "すべて",
+		"BUTTON_SYNC": "同期(CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "すべて表示",
+		"BUTTON_SEND": "送信",
+		"BUTTON_MINIMIZE": "最小化",
+		"SAVED_TIME": "%TIME%に保存しました",
+		"SAVED_ERROR_ON_SEND": "メールは送信できましたが、送信済みに保存できませんでした",
+		"DISCARD_UNSAVED_DATA": "保存していないデータを破棄しますか?",
+		"ATTACH_FILES": "ファイルを添付",
+		"ATTACH_DROP_FILES_DESC": "ここにファイルをドロップ",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% wrote",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- 転送されたメッセージ -------",
+		"FORWARD_MESSAGE_TOP_SENT": "送信済み",
+		"EMPTY_TO_ERROR_DESC": "少なくとも一つの受信者を指定してください",
+		"NO_ATTACHMENTS_HERE_DESC": "添付ファイルがありません",
+		"ATTACHMENTS_ERROR_DESC": "警告！すべての添付ファイルがアップロードされているわけではありません。",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "すべての添付ファイルがアップロードされているわけではありません。",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "下書きを自動的に保存する",
+		"BUTTON_REQUEST_READ_RECEIPT": "開封確認を要求する",
+		"BUTTON_MARK_AS_IMPORTANT": "重要フラグをつける",
+		"BUTTON_REQUEST_DSN": "配信確認を要求する",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "このウインドウを閉じていいですか？",
+		"DESC_WANT_DELETE_MESSAGES": "メッセージを削除していいですか？"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "言語を選択"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "アカウントを追加しますか",
+		"BUTTON_ADD_ACCOUNT": "追加",
+		"TITLE_UPDATE_ACCOUNT": "アカウント更新しますか"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "メールの表示名を追加しますか",
+		"TITLE_UPDATE_IDENTITY": "メールの表示名を更新しますか",
+		"LABEL": "Label",
+		"BUTTON_ADD_IDENTITY": "追加",
+		"SIGNATURE": "Signature",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "返信の引用テキストの前に署名を挿入する"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "フォルダを作成しますか",
+		"LABEL_PARENT": "親フォルダ",
+		"BUTTON_CREATE": "作成",
+		"TITLE_CREATING_PROCESS": "フォルダを作成中"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "フォルダ内のすべてのメールを消去しますか？",
+		"DANGER_DESC_WARNING": "警告！",
+		"DANGER_DESC_HTML_1": "この操作をすると、<strong>%FOLDER%<\/strong>フォルダからすべてのメールを完全に消去してしまいます。",
+		"DANGER_DESC_HTML_2": "一度始めると、中止やキャンセルができません。",
+		"TITLE_CLEARING_PROCESS": "フォルダを消去しています..."
+	},
+	"CRYPTO": {
+		"SIGN": "署名",
+		"ENCRYPT": "暗号化",
+		"DECRYPT": "復号化",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "%USER%からの正しい署名",
+		"ERROR": "%TYPE% エラー: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "OpenPGPキーをインポート",
+		"POPUP_IMPORT_BUTTON": "インポート",
+		"POPUP_VIEW_TITLE": "OpenPGPキーを表示",
+		"POPUP_VIEW_BUTTON": "選択",
+		"POPUP_GENERATE_TITLE": "OpenPGPキーを生成",
+		"POPUP_GENERATE_BUTTON": "生成",
+		"LABEL_KEY_TYPE": "Type",
+		"SIGNED_MESSAGE": "OpenPGP署名済みメッセージ",
+		"ENCRYPTED_MESSAGE": "OpenPGP暗号化メッセージ",
+		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"BACKUP_ON_SERVER": "Store (encrypted) on server",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME署名済みメッセージ",
+		"ENCRYPTED_MESSAGE": "S\/MIME暗号化メッセージ",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "フィルターを作成しますか",
+		"TITLE_EDIT_FILTER": "フィルターを更新しますか",
+		"LEGEND_CONDITIONS": "条件",
+		"LEGEND_ACTIONS": "アクション",
+		"BUTTON_ADD_CONDITION": "条件の追加",
+		"SELECT_ACTION_MOVE_TO": "移動",
+		"SELECT_ACTION_FORWARD_TO": "転送",
+		"SELECT_ACTION_REJECT": "拒否",
+		"SELECT_ACTION_VACATION_MESSAGE": "バケーションメッセージ",
+		"SELECT_ACTION_DISCARD": "破棄",
+		"SELECT_FIELD_RECIPIENTS": "受信者(To or CC)",
+		"SELECT_FIELD_HEADER": "ヘッダー",
+		"SELECT_FIELD_BODY": "本文",
+		"SELECT_FIELD_SIZE": "サイズ",
+		"SELECT_TYPE_CONTAINS": "含む",
+		"SELECT_TYPE_NOT_CONTAINS": "含まない",
+		"SELECT_TYPE_MATCHES": "マッチする(* と ? が使用可)",
+		"SELECT_TYPE_NOT_MATCHES": "マッチしない(* と ? が使用可)",
+		"SELECT_TYPE_REGEXP": "正規表現",
+		"SELECT_TYPE_NOT_REGEXP": "正規表現を使わない",
+		"SELECT_TYPE_EQUAL_TO": "一致",
+		"SELECT_TYPE_NOT_EQUAL_TO": "一致しない",
+		"SELECT_TYPE_OVER": "以上",
+		"SELECT_TYPE_UNDER": "以下",
+		"SELECT_TYPE_TEXT": "Text",
+		"SELECT_TYPE_RAW": "Raw",
+		"SELECT_MATCH_ANY": "以下のルールのいずれかにマッチ",
+		"SELECT_MATCH_ALL": "以下のルールのすべてにマッチ",
+		"MARK_AS_READ_LABEL": "既読にする",
+		"REPLY_INTERVAL_LABEL": "返信間隔(日)",
+		"KEEP_LABEL": "保持",
+		"STOP_LABEL": "Stop further processing of rules",
+		"VACATION_SUBJECT_LABEL": "件名(オプション)",
+		"VACATION_MESSAGE_LABEL": "メッセージ",
+		"VACATION_RECIPIENTS_LABEL": "受信者(カンマ区切り)",
+		"REJECT_MESSAGE_LABEL": "拒否メッセージ",
+		"ALL_INCOMING_MESSAGES_DESC": "すべての受信メッセージ"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "スクリプトを新規作成",
+		"TITLE_EDIT": "スクリプトを編集",
+		"BUTTON_ADD_FILTER": "フィルターを追加",
+		"BUTTON_RAW_SCRIPT": "ユーザが作成したカスタムスクリプトを使用する",
+		"CAPABILITY_LABEL": "機能",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "これらの変更はサーバに保存する必要があります"
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "システムフォルダーを選択",
+		"SELECT_CHOOSE_ONE": "1つ選択",
+		"SELECT_UNUSE_NAME": "使用しない",
+		"NOTIFICATION_SENT": "送信済みメッセージを置くための\"Sent\"システムフォルダが選択されていません。\n送信済みメッセージを保存する必要がないのなら、\"使用しない\"オプションを選択してください。\n",
+		"NOTIFICATION_DRAFTS": "下書きメッセージを置くための\"Sent\"システムフォルダが選択されていません。",
+		"NOTIFICATION_SPAM": "迷惑メールを置くための\"Spam\"システムフォルダが選択されていません。\n迷惑メールが完全に削除されるのを望むのなら、\"使用しない\"オプションを選択してください。\n",
+		"NOTIFICATION_TRASH": "削除されたメッセージを置くための\"Trash\"システムフォルダが選択されていません。\n削除されたメッセージが完全に削除されるのを望むのなら、\"使用しない\"オプションを選択してください。\n",
+		"NOTIFICATION_ARCHIVE": "アーカイブされたメッセージを置くための\"Archive\"システムフォルダが選択されていません。"
+	},
+	"TITLES": {
+		"MAILBOX": "メールボックス",
+		"SETTINGS": "設定"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "ファイルが大きすぎます",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "ファイルは、不明なエラーのため一部しかアップロードされませんでした",
+		"ERROR_NO_FILE_UPLOADED": "ファイルはアップロードされていません",
+		"ERROR_MISSING_TEMP_FOLDER": "一時ファイルが見つかりません",
+		"ERROR_ON_SAVING_FILE": "不明なファイルアップロードエラーが発生しました",
+		"ERROR_FILE_TYPE": "無効なファイル種類",
+		"ERROR_UNKNOWN": "不明なファイルアップロードエラーが発生しました"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "全般",
+		"CONTACTS": "連絡先",
+		"FOLDERS": "フォルダー",
+		"ACCOUNTS": "アカウント",
+		"FILTERS": "フィルター",
+		"SECURITY": "セキュリティ",
+		"THEMES": "テーマ"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
+		"BUTTON_ADD_SCRIPT": "スクリプトを追加",
+		"SUBNAME_MOVE_TO": "\"%FOLDER%\"へ移動",
+		"SUBNAME_FORWARD_TO": "\"%EMAIL%\"へ転送",
+		"SUBNAME_REJECT": "拒否",
+		"SUBNAME_VACATION_MESSAGE": "バケーションメッセージ",
+		"SUBNAME_DISCARD": "破棄"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "セキュリティ",
+		"LABEL_AUTOLOGOUT": "自動ログアウト",
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "しない"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "言語",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "表示名",
+		"LAYOUT": "レイアウト",
+		"LAYOUT_NO_SPLIT": "分割しない",
+		"LAYOUT_VERTICAL_SPLIT": "縦に分割",
+		"LAYOUT_HORIZONTAL_SPLIT": "横に分割",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "メール形式",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "プレーンテキスト",
+		"VIEW_OPTIONS": "表示",
+		"USE_PREVIEW_PANE": "プレビューペインを使用する",
+		"HIDE_DELETED_MESSAGES": "削除のマークが付いたメッセージを非表示にする",
+		"USE_CHECKBOXES_IN_LIST": "リストにチェックボックスを表示",
+		"USE_THREADS": "スレッドを使う",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "返信したメッセージのフォルダに送信メールを置く",
+		"PREFER_HTML": "プレーンテキストよりHTMLを優先する",
+		"PREFER_HTML_INFO": "メッセージがHTMLとプレーンテキストの両方の形式を含むことがあります。このオプションはそのような場合にどちらの形式を表示するかを制御します。",
+		"REMOVE_COLORS": "本文の文字色及び背景色の設定を無視する",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "1ページに表示する件数",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "メッセージが既読となるまでの秒数",
+		"MSG_DEFAULT_ACTION": "Default action",
+		"SECONDS": "秒",
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "通知設定",
+		"SOUND_NOTIFICATION": "サウンド通知",
+		"CHROME_NOTIFICATION_DESC": "新しいメッセージを受信したらポップアップで知らせる",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(ブラウザでブロックされています)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "返信したアドレスをアドレス帳へ自動的に追加する",
+		"LEGEND_CONTACTS_SYNC": "リモート同期(CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "リモート同期を有効化",
+		"LABEL_CONTACTS_SYNC_SERVER": "サーバー",
+		"LABEL_CONTACTS_SYNC_AB_URL": "アドレス帳URL",
+		"LABEL_CONTACTS_SYNC_USER": "ユーザー",
+		"SYNC_READ": "読み取り専用"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "テーマ",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "Fonts",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "背景画像をアップロード(JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "ファイルが大きすぎます",
+		"ERROR_FILE_TYPE_ERROR": "無効なファイル種類(JPG\/PNG のみ)",
+		"ERROR_UNKNOWN": "不明なファイルアップロードエラーが発生しました"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "フォルダー一覧",
+		"BUTTON_CREATE": "フォルダを作成",
+		"BUTTON_SYSTEM": "システムフォルダー",
+		"BUTTON_SUBSCRIBE": "購読",
+		"BUTTON_UNSUBSCRIBE": "購読解除",
+		"LOADING_PROCESS": "フォルダーリストの更新",
+		"CREATING_PROCESS": "フォルダーの作成",
+		"DELETING_PROCESS": "フォルダーの削除",
+		"RENAMING_PROCESS": "フォルダーの名前を変更",
+		"TO_MANY_FOLDERS_DESC_1": "フォルダーが多すぎます",
+		"TO_MANY_FOLDERS_DESC_2": "パフォーマンスの問題を回避するために、それらの一部のみを示しています。",
+		"HELP_DELETE_FOLDER": "フォルダーを削除",
+		"HELP_SHOW_HIDE_FOLDER": "フォルダーの表示\/非表示",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "新しいメッセージを確認する",
+		"HIDE_UNSUBSCRIBED": "購読していないフォルダを隠す",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+		"TYPE_CALENDAR": "Calendar",
+		"TYPE_CONFIGURATION": "Configuration",
+		"TYPE_CONTACTS": "Contacts",
+		"TYPE_FILES": "Files",
+		"TYPE_JOURNAL": "Journal",
+		"TYPE_NOTES": "Notes",
+		"TYPE_TASKS": "Tasks"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "アカウント一覧",
+		"LEGEND_IDENTITIES": "表示名",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "アカウトと表示名",
+		"BUTTON_ADD_ACCOUNT": "アカウントを追加",
+		"BUTTON_ADD_IDENTITY": "表示名を追加",
+		"LOADING_PROCESS": "更新中",
+		"SHOW_UNREAD": "Show unread messages count"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "キーをインポート",
+		"BUTTON_GENERATE_KEY_PAIR": "キーを生成",
+		"IMPORT_FROM_SERVER": "Import from server",
+		"TITLE_PRIVATE": "プライベート",
+		"TITLE_PUBLIC": "パブリック",
+		"GET_MAILVELOPE": "Mailvelopeのブラウザアドオンを入手する"
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "キーボード ショートカット ヘルプ",
+		"TAB_MAILBOX": "メールボックス",
+		"TAB_MESSAGE_LIST": "メッセージ一覧",
+		"TAB_MESSAGE_VIEW": "メッセージ表示画面",
+		"TAB_COMPOSE": "作成画面",
+		"LABEL_OPEN_USER_DROPDOWN": "ユーザーメニューを開く",
+		"LABEL_REPLY": "返信",
+		"LABEL_REPLY_ALL": "全員に返信",
+		"LABEL_FORWARD": "転送",
+		"LABEL_FORWARD_MULTIPLY": "転送(元のメッセージを添付)",
+		"LABEL_CHECK_ALL": "すべてのメッセージを選択",
+		"LABEL_DELETE": "削除",
+		"LABEL_OPEN_THREAD": "選択したスレッドを開く",
+		"LABEL_MOVE": "移動",
+		"LABEL_READ": "選択したメッセージを既読にする",
+		"LABEL_UNREAD": "選択したメッセージを未読にする",
+		"LABEL_IMPORTANT": "選択したメッセージに重要フラグをつける",
+		"LABEL_CANCEL_SEARCH": "検索を取り消す",
+		"LABEL_FULLSCREEN_ENTER": "全画面(プレビューペインレイアウト)",
+		"LABEL_VIEW_MESSAGE_ENTER": "メッセージの表示(非プレビューペインレイアウト)",
+		"LABEL_SWITCH_TO_MESSAGE": "選択されたメッセージへ切り替える",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "フォルダー一覧へ切り替える",
+		"LABEL_FULLSCREEN_TOGGLE": "フルスクリーンモードへの切り替え",
+		"LABEL_BLOCKQUOTES_TOGGLE": "メッセージ引用の切り替え",
+		"LABEL_THREAD_NEXT": "スレッドの次のメーッセージ",
+		"LABEL_THREAD_PREV": "スレッドの前のメーッセージ",
+		"LABEL_EXIT_FULLSCREEN": "フルスクリーンモードの終了",
+		"LABEL_CLOSE_MESSAGE": "メッセージを閉じる(非プレビューペインレイアウト)",
+		"LABEL_SWITCH_TO_LIST": "メッセージ一覧へ切り替える",
+		"LABEL_OPEN_COMPOSE_POPUP": "作成画面を開く",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "作成画面を最小化",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "表示名メニューを開く",
+		"LABEL_SAVE_MESSAGE": "メッセージを保存",
+		"LABEL_SEND_MESSAGE": "メッセージを送信",
+		"LABEL_CLOSE_COMPOSE": "作成画面を閉じる"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "要求は失敗しました",
+		"RequestAborted": "要求は中断されました",
+		"RequestTimeout": "要求はタイムアウトしました",
+		"InvalidToken": "無効なトークン",
+		"AuthError": "認証に失敗しました",
+		"ConnectionError": "サーバーへ接続できません",
+		"DomainAlreadyExists": "ドメインが既に存在しています",
+		"DomainNotAllowed": "ドメインは、許可されていません",
+		"AccountNotAllowed": "アカウントは、許可されていません",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "連絡先 同期 エラー",
+		"CantGetMessageList": "メッセージ一覧が取得できません",
+		"CantGetMessage": "メッセージを取得できません",
+		"CantDeleteMessage": "メッセージを削除できません",
+		"CantCopyMessage": "メッセージをコピーできません",
+		"CantMoveMessage": "メッセージを移動できません",
+		"CantSaveMessage": "メッセージを保存できません",
+		"CantSendMessage": "メッセージ送信できません",
+		"InvalidRecipients": "無効な受信者",
+		"CantSaveFilters": "フィルターを保存できません",
+		"CantGetFilters": "フィルターを取得できません",
+		"CantActivateFiltersScript": "フィルタースクリプトを有効にできません",
+		"CantDeleteFiltersScript": "フィルタースクリプトを削除できません",
+		"FiltersAreNotCorrect": "フィルターが正しくありません",
+		"CantCreateFolder": "フォルダを作成できません",
+		"CantRenameFolder": "フォルダの名前を変更できません",
+		"CantDeleteFolder": "フォルダを削除できません",
+		"CantDeleteNonEmptyFolder": "空ではないディレクトリを削除できません",
+		"CantSubscribeFolder": "フォルダを購読できません",
+		"CantUnsubscribeFolder": "フォルダを購読解除できません",
+		"DemoSendMessageError": "セキュリティ上の理由から、アカウントは、外部の電子メールアドレスにメッセージを送信することを許可されていません！",
+		"DemoAccountError": "セキュリティ上の理由から、アカウントには、このアクションが許可されていません！",
+		"AccountAlreadyExists": "アカウントがすでに存在します",
+		"AccountDoesNotExist": "アカウントは存在しません",
+		"AccountSwitchFailed": "アカウントを\"%EMAIL%\"に切り換えるのに失敗しました",
+		"MailServerError": "メールサーバーへのアクセス中にエラーが発生しました",
+		"InvalidInputArgument": "無効な入力引数",
+		"UnknownError": "不明なエラー"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ko/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ko-KR/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/ko/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/static.json b/snappymail/v/0.0.0/app/localization/ko/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ko-KR/static.json
rename to snappymail/v/0.0.0/app/localization/ko/static.json
diff --git a/snappymail/v/0.0.0/app/localization/ko-KR/user.json b/snappymail/v/0.0.0/app/localization/ko/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/ko-KR/user.json
rename to snappymail/v/0.0.0/app/localization/ko/user.json
index 1604ff2b7..abcd658f5 100644
--- a/snappymail/v/0.0.0/app/localization/ko-KR/user.json
+++ b/snappymail/v/0.0.0/app/localization/ko/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "아카이빙",
 		"ARE_YOU_SURE": "정말입니까?",
@@ -10,6 +11,7 @@
 		"CLOSE": "닫기 (Esc)",
 		"CONTACTS": "연락처",
 		"DELETE": "삭제",
+		"UNDELETE": "Undelete",
 		"DONE": "완료",
 		"EMAIL": "이메일",
 		"FROM": "보내는 사람",
@@ -17,17 +19,30 @@
 		"LOGOUT": "로그아웃",
 		"MORE": "더 보기",
 		"MOVE_TO": "다음 위치로 이동",
+		"COPY_TO": "에게 복사",
 		"NAME": "받은 편지함",
 		"NONE": "없음",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "스팸 아님",
+		"USERNAME": "사용자 이름",
 		"PASSWORD": "비밀번호",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "회신 주소",
 		"SAVE": "저장",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "연락처를 찾지 못했습니다.",
 		"SPAM": "스팸",
 		"SUBJECT": "제목",
 		"TEST": "테스트",
-		"TO": "받는 사람"
+		"TO": "받는 사람",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "예",
+		"NO": "아니요",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "도움말",
+		"TEXT": "본문",
+		"ATTACHMENTS": "첨부파일"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "아이디",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "로그인"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "계정 추가",
-		"BUTTON_SETTINGS": "설정",
-		"BUTTON_HELP": "도움말"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "모바일 버전",
-		"BUTTON_DESKTOP_VERSION": "데스크탑 버전"
+		"BUTTON_ADD_ACCOUNT": "계정 추가"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "고급 검색",
-		"LABEL_ADV_TEXT": "본문",
-		"LABEL_ADV_HAS_ATTACHMENT": "첨부파일이 있음",
-		"LABEL_ADV_HAS_ATTACHMENTS": "첨부파일이 있음",
-		"LABEL_ADV_FLAGGED": "중요",
-		"LABEL_ADV_UNSEEN": "읽지 않음",
-		"LABEL_ADV_DATE": "날짜",
-		"LABEL_ADV_DATE_ALL": "모두",
-		"LABEL_ADV_DATE_3_DAYS": "3일 이내",
-		"LABEL_ADV_DATE_7_DAYS": "1주일 이내",
-		"LABEL_ADV_DATE_MONTH": "1개월 이내",
-		"LABEL_ADV_DATE_3_MONTHS": "3개월 이내",
-		"LABEL_ADV_DATE_6_MONTHS": "6개월 이내",
-		"LABEL_ADV_DATE_YEAR": "1년 이내",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "전체화면으로 보기",
-		"ZOOM": "확대\/축소",
-		"CLOSE": "닫기 (Esc)",
-		"GALLERY_PREV": "이전 (왼쪽 방향키)",
-		"GALLERY_NEXT": "다음 (오른쪽 방향키)",
-		"GALLERY_COUNTER": "%total% 중 %curr%"
+		"TEXT": "본문",
+		"HAS_ATTACHMENT": "첨부파일이 있음",
+		"FLAGGED": "중요",
+		"UNSEEN": "읽지 않음",
+		"DATE": "날짜",
+		"DATE_ALL": "모두",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "3일 이내",
+		"SINCE_7_DAYS": "1주일 이내",
+		"SINCE_MONTH": "1개월 이내",
+		"SINCE_3_MONTHS": "3개월 이내",
+		"SINCE_6_MONTHS": "6개월 이내",
+		"SINCE_YEAR": "1년 이내",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Odgovoreno",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "메일 쓰기",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "휴지통",
 		"ARCHIVE_NAME": "보관함"
 	},
-	"QUOTA": {
-		"TITLE": "사용량"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "메일 목록 새로고침",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "읽음",
 		"MENU_SELECT_FLAGGED": "중요",
 		"MENU_SELECT_UNFLAGGED": "일반",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "목록이 비어있습니다.",
 		"EMPTY_SEARCH_LIST": "검색 조건에 맞는 결과가 없습니다..",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\"에 대한 검색 결과",
 		"BACK_TO_MESSAGE_LIST": "메시지 목록으로 돌아가기",
-		"EMPTY_SUBJECT_TEXT": "(제목 없음)",
 		"PUT_MESSAGE_HERE": "목록에 표시할 메시지를 여기로 끌어다 놓으세요.",
 		"TODAY_AT": "오늘 %TIME%",
 		"YESTERDAY_AT": "어제 %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "%COUNT% 개의 새 메시지가 있습니다!",
 		"QUOTA_SIZE": "총 <strong>%LIMIT%<\/strong> 중 <strong>%PROC%%<\/strong>을(를) 사용 중입니다.",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "원본 보기",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": ".eml 파일로 다운로드",
 		"MENU_FILTER_SIMILAR": "이런 유형의 메시지에 필터 적용",
 		"MENU_PRINT": "인쇄",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "왼쪽 패널에서 폴더명을 클릭하여 위치를 선택하세요.",
 		"LINK_DOWNLOAD_AS_ZIP": ".zip 파일로 다운로드",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "수신 확인 (표시됨) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "검색 중..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "연락처 추가",
 		"BUTTON_CREATE_CONTACT": "생성",
-		"BUTTON_UPDATE_CONTACT": "업데이트",
 		"BUTTON_IMPORT": "가져오기 (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "내보내기 (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "내보내기 (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "연락처를 찾지 못했습니다.",
 		"CLEAR_SEARCH": "검색 초기화",
 		"CONTACT_VIEW_DESC": "목록에서 연락처를 선택하여 이 곳에 표시하세요.",
-		"LABEL_PHONE": "전화",
-		"LABEL_WEB": "홈페이지",
 		"LABEL_BIRTHDAY": "생일",
-		"LINK_ADD_EMAIL": "이메일 주소 추가",
-		"LINK_ADD_PHONE": "전화번호 추가",
-		"LINK_BIRTHDAY": "생일",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "표시명을 입력하세요",
-		"PLACEHOLDER_ENTER_LAST_NAME": "성을 입력하세요",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "이름을 입력하세요",
-		"PLACEHOLDER_ENTER_NICK_NAME": "별칭을 입력하세요",
+		"DISPLAY_NAME": "표시명을 입력하세요",
+		"LAST_NAME": "성을 입력하세요",
+		"FIRST_NAME": "이름을 입력하세요",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "별칭을 입력하세요",
 		"LABEL_READ_ONLY": "읽기 전용",
-		"LABEL_SHARE": "공유",
 		"ADD_MENU_LABEL": "추가",
 		"ADD_MENU_NICKNAME": "별칭",
-		"ADD_MENU_NOTES": "메모",
+		"ADD_MENU_NOTE": "메모",
 		"ADD_MENU_PHONE": "전화",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "주소",
 		"ADD_MENU_BIRTHDAY": "생일",
 		"ADD_MENU_TAGS": "태그",
 		"BUTTON_SHARE_ALL": "전원",
-		"BUTTON_SYNC": "동기화 (CardDAV)"
+		"BUTTON_SYNC": "동기화 (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "모든 필드 표시",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "첨부된 파일이 없습니다.",
 		"ATTACHMENTS_ERROR_DESC": "경고! 모든 첨부파일이 업로드 되지 않습니다.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "첨부파일이 아직 업로드되지 않았습니다.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장",
 		"BUTTON_REQUEST_READ_RECEIPT": "수신 확인 요청",
 		"BUTTON_MARK_AS_IMPORTANT": "중요 표시",
-		"BUTTON_REQUEST_DSN": "수신 확인 요청"
+		"BUTTON_REQUEST_DSN": "수신 확인 요청",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "예",
-		"BUTTON_NO": "아니요",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "정말로 이 페이지를 닫으시겠습니까 ?",
 		"DESC_WANT_DELETE_MESSAGES": "정말로 선택한 메세지를 삭제하시겠습니까 ?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "언어 선택"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "계정을 추가할까요?",
+		"TITLE_ADD_ACCOUNT": "계정을 추가할까요",
 		"BUTTON_ADD_ACCOUNT": "추가",
-		"TITLE_UPDATE_ACCOUNT": "계정을 업데이트할까요?",
-		"BUTTON_UPDATE_ACCOUNT": "업데이트"
+		"TITLE_UPDATE_ACCOUNT": "계정을 업데이트할까요"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "신원을 새로 추가할까요?",
-		"TITLE_UPDATE_IDENTITY": "신원을 업데이트할까요?",
+		"TITLE_ADD_IDENTITY": "신원을 새로 추가할까요",
+		"TITLE_UPDATE_IDENTITY": "신원을 업데이트할까요",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "추가",
-		"BUTTON_UPDATE_IDENTITY": "업데이트",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "회신 시 이 서명을 인용문 이전에 삽입"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "폴더를 생성할까요?",
+		"TITLE_CREATE_FOLDER": "폴더를 생성할까요",
 		"LABEL_PARENT": "상위 폴더",
 		"BUTTON_CREATE": "생성",
 		"TITLE_CREATING_PROCESS": "폴더 생성 중"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "작업이 시작되면 중지하거나 취소할 수 없습니다.",
 		"TITLE_CLEARING_PROCESS": "폴더를 비우는 중..."
 	},
+	"CRYPTO": {
+		"SIGN": "로그인",
+		"ENCRYPT": "암호화",
+		"DECRYPT": "복호화",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "%USER%(으)로부터 수신한 양호한 서명",
+		"ERROR": "%TYPE% 오류: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "OpenPGP 키 가져오기",
 		"POPUP_IMPORT_BUTTON": "가져오기",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "OpenPGP 키 생성",
 		"POPUP_GENERATE_BUTTON": "생성",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "로그인",
-		"LABEL_ENCRYPT": "암호화",
-		"BUTTON_DECRYPT": "복호화",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP로 서명된 메세지입니다.",
 		"ENCRYPTED_MESSAGE": "OpenPGP로 암호화된 메세지입니다.",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "%USER%(으)로부터 수신한 양호한 서명",
-		"ERROR": "OpenPGP 오류: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME로 서명된 메세지입니다.",
+		"ENCRYPTED_MESSAGE": "S\/MIME로 암호화된 메세지입니다.",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "필터를 생성할까요?",
-		"TITLE_EDIT_FILTER": "필터를 업데이트할까요?",
+		"TITLE_CREATE_FILTER": "필터를 생성할까요",
+		"TITLE_EDIT_FILTER": "필터를 업데이트할까요",
 		"LEGEND_CONDITIONS": "조건",
 		"LEGEND_ACTIONS": "동작",
 		"BUTTON_ADD_CONDITION": "조건 추가",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "읽음 표시",
 		"REPLY_INTERVAL_LABEL": "회신 주기 (일)",
 		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "제목 (옵션)",
 		"VACATION_MESSAGE_LABEL": "메시지",
 		"VACATION_RECIPIENTS_LABEL": "수신인 (쉼표 분리)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "알 수 없는 업로드 오류가 발생했습니다."
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "개인",
-		"LABEL_GENERAL_NAME": "일반",
-		"LABEL_CONTACTS_NAME": "연락처",
-		"LABEL_FOLDERS_NAME": "폴더",
-		"LABEL_ACCOUNTS_NAME": "계정",
-		"LABEL_FILTERS_NAME": "필터",
-		"LABEL_SECURITY_NAME": "보안",
-		"LABEL_THEMES_NAME": "테마"
+		"GENERAL": "일반",
+		"CONTACTS": "연락처",
+		"FOLDERS": "폴더",
+		"ACCOUNTS": "계정",
+		"FILTERS": "필터",
+		"SECURITY": "보안",
+		"THEMES": "테마"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "필터",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "\"%FOLDER%\"(으)로 이동",
 		"SUBNAME_FORWARD_TO": "\"%EMAIL%\"(으)로 전달",
 		"SUBNAME_REJECT": "거부",
 		"SUBNAME_VACATION_MESSAGE": "부재 중 메시지",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "필터 목록 업데이트 중"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "보안",
 		"LABEL_AUTOLOGOUT": "자동 로그아웃",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "설정하지 않음",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES%분",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS%시간"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "설정하지 않음"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "일반",
-		"LABEL_LANGUAGE": "언어",
-		"LABEL_IDENTITY": "신원",
-		"LABEL_LAYOUT": "레이아웃",
-		"LABEL_LAYOUT_NO_SPLIT": "분할 해제",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "세로 분할",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
-		"LABEL_EDITOR": "기본 텍스트 편집기",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "평문",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (강제 적용)",
-		"LABEL_EDITOR_PLAIN_FORCED": "평문 (강제 적용)",
-		"LABEL_VIEW_OPTIONS": "보기 옵션",
-		"LABEL_USE_PREVIEW_PANE": "미리보기 창 사용",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시",
-		"LABEL_USE_THREADS": "대화형 목록 사용",
-		"LABEL_REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
-		"LABEL_SHOW_IMAGES": "메시지 본문에 포함된 외부 이미지를 항상 표시",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "페이지 당 메시지 개수",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "언어",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "신원",
+		"LAYOUT": "레이아웃",
+		"LAYOUT_NO_SPLIT": "분할 해제",
+		"LAYOUT_VERTICAL_SPLIT": "세로 분할",
+		"LAYOUT_HORIZONTAL_SPLIT": "가로 분할",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "기본 텍스트 편집기",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "평문",
+		"VIEW_OPTIONS": "보기 옵션",
+		"USE_PREVIEW_PANE": "미리보기 창 사용",
+		"HIDE_DELETED_MESSAGES": "삭제 표시된 메시지 숨기기",
+		"USE_CHECKBOXES_IN_LIST": "목록에서 확인상자 표시",
+		"USE_THREADS": "대화형 목록 사용",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "회신 메시지를 원본과 동일한 폴더 위치에 저장",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "페이지 당 메시지 개수",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "알림",
-		"LABEL_SOUND_NOTIFICATION": "소리 알림",
-		"LABEL_CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "알림",
+		"SOUND_NOTIFICATION": "소리 알림",
+		"CHROME_NOTIFICATION_DESC": "새 메시지 알림 팝업 사용",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(브라우저에 의해 차단됨)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "수신인을 주소록에 자동으로 추가",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "서버",
 		"LABEL_CONTACTS_SYNC_AB_URL": "주소록 URL",
 		"LABEL_CONTACTS_SYNC_USER": "사용자",
-		"SYNC_NO": "아니요",
-		"SYNC_YES": "예",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "테마",
-		"LEGEND_THEMES_CUSTOM": "사용자 지정 테마 설정",
-		"LABEL_CUSTOM_TYPE": "유형",
-		"LABEL_CUSTOM_TYPE_LIGHT": "밝음",
-		"LABEL_CUSTOM_TYPE_DARK": "어두움",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "배경",
+		"LABEL_BACKGROUND": "배경",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "배경 이미지 업로드 (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "파일이 너무 큽니다",
 		"ERROR_FILE_TYPE_ERROR": "유효하지 않은 파일 형식 (JPG 또는 PNG만 가능)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "폴더 삭제",
 		"HELP_SHOW_HIDE_FOLDER": "폴더 표시\/숨기기",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "새 메시지 확인\/확인 취소",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "새 메시지 확인",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "계정 추가",
 		"BUTTON_ADD_IDENTITY": "신원 추가",
 		"LOADING_PROCESS": "업데이트 중...",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "키 가져오기",
 		"BUTTON_GENERATE_KEY_PAIR": "키 생성",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "비공개",
 		"TITLE_PUBLIC": "공개",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "작성 중인 메시지 자동 저장",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "전체 회신",
 		"LABEL_FORWARD": "전달",
 		"LABEL_FORWARD_MULTIPLY": "첨부파일로 전달",
-		"LABEL_HELP": "도움말",
 		"LABEL_CHECK_ALL": "전체 메시지  선택",
 		"LABEL_DELETE": "삭제",
 		"LABEL_OPEN_THREAD": "선택한 대화 열기",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "메시지 인용구 전환",
 		"LABEL_THREAD_NEXT": "대화에서 다음 메시지",
 		"LABEL_THREAD_PREV": "대화에서 이전 메시지",
-		"LABEL_PRINT": "인쇄",
 		"LABEL_EXIT_FULLSCREEN": "전체화면 모드 나가기",
 		"LABEL_CLOSE_MESSAGE": "메시지 닫기 (미리보기 화면 레이아웃 없음)",
 		"LABEL_SWITCH_TO_LIST": "메시지 목록으로 촛점 전환",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "쓰기 창 닫기"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "잘못된 토큰입니다.",
-		"AUTH_ERROR": "인증에 실패했습니다",
-		"CONNECTION_ERROR": "서버에 연결할 수 없습니다.",
-		"DOMAIN_ALREADY_EXISTS": "이미 존재하는 도메인입니다.",
-		"DOMAIN_NOT_ALLOWED": "허용된 도메인이 아닙니다.",
-		"ACCOUNT_NOT_ALLOWED": "허용된 계정이 아닙니다.",
-		"CONTACTS_SYNC_ERROR": "연락처 동기화 오류",
-		"CANT_GET_MESSAGE_LIST": "메시지 목록을 불러 올 수 없습니다.",
-		"CANT_GET_MESSAGE": "메시지를 가져올 수 없습니다.",
-		"CANT_DELETE_MESSAGE": "메시지를 삭제할 수 없습니다.",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "메시지를 이동할 수 없습니다.",
-		"CANT_SAVE_MESSAGE": "메시지를 저장할 수 없습니다.",
-		"CANT_SEND_MESSAGE": "메시지를 보낼 수 없습니다.",
-		"INVALID_RECIPIENTS": "유효하지 않은 수신인",
-		"CANT_SAVE_FILTERS": "필터를 저장할 수 없습니다",
-		"CANT_GET_FILTERS": "필터를 가져올 수 없습니다",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "필터가 올바르지 않습니다",
-		"CANT_CREATE_FOLDER": "폴더를 생성할 수 없습니다.",
-		"CANT_RENAME_FOLDER": "폴더명을 변경할 수 없습니다.",
-		"CANT_DELETE_FOLDER": "폴더를 삭제할 수 없습니다.",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "비어있지 않은 디렉터리를 삭제할 수 없습니다.",
-		"CANT_SUBSCRIBE_FOLDER": "폴더를 볼 수 없습니다.",
-		"CANT_UNSUBSCRIBE_FOLDER": "폴더를 보이지 않게 할 수 없습니다.",
-		"DEMO_SEND_MESSAGE_ERROR": "이 테스트 계정은 외부 메일 발송이 금지되어있습니다.",
-		"DEMO_ACCOUNT_ERROR": "보안을 사유로 이 계정에서는 해당 동작이 허용되지 않습니다.",
-		"ACCOUNT_ALREADY_EXISTS": "이미 존재하는 계정입니다.",
-		"ACCOUNT_DOES_NOT_EXIST": "존재하지 않는 계정입니다",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "메일 서버에 연결하는 도중 오류가 발생했습니다.",
-		"INVALID_INPUT_ARGUMENT": "유효하지 않은 input argument",
-		"UNKNOWN_ERROR": "알 수 없는 오류"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "잘못된 토큰입니다.",
+		"AuthError": "인증에 실패했습니다",
+		"ConnectionError": "서버에 연결할 수 없습니다.",
+		"DomainAlreadyExists": "이미 존재하는 도메인입니다.",
+		"DomainNotAllowed": "허용된 도메인이 아닙니다.",
+		"AccountNotAllowed": "허용된 계정이 아닙니다.",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "연락처 동기화 오류",
+		"CantGetMessageList": "메시지 목록을 불러 올 수 없습니다.",
+		"CantGetMessage": "메시지를 가져올 수 없습니다.",
+		"CantDeleteMessage": "메시지를 삭제할 수 없습니다.",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "메시지를 이동할 수 없습니다.",
+		"CantSaveMessage": "메시지를 저장할 수 없습니다.",
+		"CantSendMessage": "메시지를 보낼 수 없습니다.",
+		"InvalidRecipients": "유효하지 않은 수신인",
+		"CantSaveFilters": "필터를 저장할 수 없습니다",
+		"CantGetFilters": "필터를 가져올 수 없습니다",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "필터가 올바르지 않습니다",
+		"CantCreateFolder": "폴더를 생성할 수 없습니다.",
+		"CantRenameFolder": "폴더명을 변경할 수 없습니다.",
+		"CantDeleteFolder": "폴더를 삭제할 수 없습니다.",
+		"CantDeleteNonEmptyFolder": "비어있지 않은 디렉터리를 삭제할 수 없습니다.",
+		"CantSubscribeFolder": "폴더를 볼 수 없습니다.",
+		"CantUnsubscribeFolder": "폴더를 보이지 않게 할 수 없습니다.",
+		"DemoSendMessageError": "이 테스트 계정은 외부 메일 발송이 금지되어있습니다.",
+		"DemoAccountError": "보안을 사유로 이 계정에서는 해당 동작이 허용되지 않습니다.",
+		"AccountAlreadyExists": "이미 존재하는 계정입니다.",
+		"AccountDoesNotExist": "존재하지 않는 계정입니다",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "메일 서버에 연결하는 도중 오류가 발생했습니다.",
+		"InvalidInputArgument": "유효하지 않은 input argument",
+		"UnknownError": "알 수 없는 오류"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/langs.json b/snappymail/v/0.0.0/app/localization/langs.json
index 3e5953cbc..a23a38b25 100644
--- a/snappymail/v/0.0.0/app/localization/langs.json
+++ b/snappymail/v/0.0.0/app/localization/langs.json
@@ -1,88 +1,243 @@
 {
-	"LANGS_NAMES": {
-		"ar-SA": "‏العربية‏",
-		"bg-BG": "Български",
-		"cs-CZ": "Čeština",
-		"da-DK": "Dansk",
-		"de-DE": "Deutsch",
-		"el-GR": "Ελληνικά",
-		"en": "English",
-		"en-CA": "English (Canada)",
-		"en-GB": "English (GB)",
-		"en-US": "English (US)",
-		"es-ES": "Español (España)",
-		"es-LA": "Español",
-		"et-EE": "Eesti",
-		"fa-IR": "‏فارسی‏",
-		"fi-FI": "Suomi",
-		"fr-CA": "Français (Canada)",
-		"fr-FR": "Français (France)",
-		"hu-HU": "Magyar",
-		"id-ID": "Bahasa Indonesia",
-		"is-IS": "Íslenska",
-		"it-IT": "Italiano",
-		"ja-JP": "日本語",
-		"ko-KR": "한국어",
-		"lt-LT": "Lietuvių",
-		"lv-LV": "Latviešu",
-		"nb-NO": "Norsk (bokmål)",
-		"nl-NL": "Nederlands",
-		"pl-PL": "Polski",
-		"pt-BR": "Português (Brasil)",
-		"pt-PT": "Português (Portugal)",
-		"ro-RO": "Română",
-		"ru-RU": "Русский",
-		"sk-SK": "Slovenčina",
-		"sl-SI": "Slovenščina",
-		"sv-SE": "Svenska",
-		"th-TH": "ภาษาไทย",
-		"tr-TR": "Türkçe",
-		"uk-UA": "Українська",
-		"zh-CN": "中文(简体)",
-		"zh-HK": "中文(香港)",
-		"zh-TW": "中文(台灣)"
-	},
-	"LANGS_NAMES_EN": {
-		"ar-SA": "Arabic",
-		"bg-BG": "Bulgarian",
-		"cs-CZ": "Czech",
-		"da-DK": "Danish",
-		"de-DE": "German",
-		"el-GR": "Greek",
-		"en": "English",
-		"en-CA": "English (Canada)",
-		"en-GB": "English (GB)",
-		"en-US": "English (US)",
-		"es-ES": "Spanish",
-		"es-LA": "Spanish",
-		"et-EE": "Estonian",
-		"fa-IR": "Persian",
-		"fi-FI": "Finnish",
-		"fr-CA": "France (Canada)",
-		"fr-FR": "French (France)",
-		"hu-HU": "Hungarian",
-		"id-ID": "Indonesian",
-		"is-IS": "Icelandic",
-		"it-IT": "Italian",
-		"ja-JP": "Japanese",
-		"ko-KR": "Korean",
-		"lt-LT": "Lithuanian",
-		"lv-LV": "Latvian",
-		"nb-NO": "Norwegian (bokmal)",
-		"nl-NL": "Dutch",
-		"pl-PL": "Polish",
-		"pt-BR": "Portuguese (Brazil)",
-		"pt-PT": "Portuguese (Portugal)",
-		"ro-RO": "Romanian",
-		"ru-RU": "Russian",
-		"sk-SK": "Slovak",
-		"sl-SI": "Slovenian",
-		"sv-SE": "Swedish",
-		"th-TH": "Thai",
-		"tr-TR": "Turkish",
-		"uk-UA": "Ukrainian",
-		"zh-CN": "Simplified Chinese (China)",
-		"zh-HK": "Traditional Chinese (Hong Kong)",
-		"zh-TW": "Traditional Chinese (Taiwan)"
-	}
+    "LANGS_NAMES": {
+        "id": "Bahasa Indonesia",
+        "ca": "Català",
+        "cs": "Čeština",
+        "da": "Dansk",
+        "de": "Deutsch",
+        "et": "Eesti",
+        "en": "English",
+        "en-CA": "English (Canada)",
+        "en-GB": "English (Great Britain)",
+        "en-US": "English (United States)",
+        "es": "Español",
+        "es-LA": "Español (América Latina)",
+        "eo": "Esperanto",
+        "eu": "Euskara",
+        "fr": "Français",
+        "fr-CA": "Français (Canada)",
+        "is": "Íslenska",
+        "it": "Italiano",
+        "lv": "Latviešu",
+        "lt": "Lietuvių",
+        "hu": "Magyar",
+        "nl": "Nederlands",
+        "nb": "Norsk (bokmål)",
+        "pl": "Polski",
+        "pt": "Português",
+        "pt-BR": "Português (Brasil)",
+        "ro": "Română",
+        "sk": "Slovenčina",
+        "sl": "Slovenščina",
+        "fi": "Suomi",
+        "sv": "Svenska",
+        "vi": "Tiếng Việt",
+        "tr": "Türkçe",
+        "el": "Ελληνικά",
+        "be": "Беларуская",
+        "bg": "Български",
+        "ru": "Русский",
+        "uk": "Українська",
+        "ar": "‏العربية‏",
+        "fa": "‏فارسی‏",
+        "th": "ภาษาไทย",
+        "ko": "한국어",
+        "ja": "日本語",
+        "zh": "简体中文",
+        "zh-TW": "繁體中文(台灣)",
+        "zh-HK": "繁體中文(香港)"
+    },
+    "LANGS_NAMES_EN": {
+        "ab": "Abkhazian",
+        "aa": "Afar",
+        "af": "Afrikaans",
+        "ak": "Akan",
+        "sq": "Albanian",
+        "am": "Amharic",
+        "ar": "Arabic",
+        "an": "Aragonese",
+        "hy": "Armenian",
+        "as": "Assamese",
+        "av": "Avaric",
+        "ae": "Avestan",
+        "ay": "Aymara",
+        "az": "Azerbaijani",
+        "bm": "Bambara",
+        "ba": "Bashkir",
+        "eu": "Basque",
+        "be": "Belarusian",
+        "bn": "Bengali",
+        "bi": "Bislama",
+        "bs": "Bosnian",
+        "br": "Breton",
+        "bg": "Bulgarian",
+        "my": "Burmese",
+        "ca": "Catalan",
+        "km": "Central Khmer",
+        "ch": "Chamorro",
+        "ce": "Chechen",
+        "ny": "Chichewa",
+        "zh": "Chinese Simplified (China)",
+        "zh-HK": "Chinese Traditional (Hong Kong)",
+        "zh-TW": "Chinese Traditional (Taiwan)",
+        "cu": "Church Slavonic",
+        "cv": "Chuvash",
+        "kw": "Cornish",
+        "co": "Corsican",
+        "cr": "Cree",
+        "hr": "Croatian",
+        "cs": "Czech",
+        "da": "Danish",
+        "dv": "Divehi",
+        "nl": "Dutch",
+        "dz": "Dzongkha",
+        "en": "English",
+        "en-CA": "English (Canada)",
+        "en-GB": "English (Great Britain)",
+        "en-US": "English (United States)",
+        "eo": "Esperanto",
+        "et": "Estonian",
+        "ee": "Ewe",
+        "fo": "Faroese",
+        "fj": "Fijian",
+        "fi": "Finnish",
+        "fr": "French",
+        "fr-CA": "French (Canada)",
+        "ff": "Fulah",
+        "gd": "Gaelic",
+        "gl": "Galician",
+        "lg": "Ganda",
+        "ka": "Georgian",
+        "de": "German",
+        "el": "Greek",
+        "gn": "Guarani",
+        "gu": "Gujarati",
+        "ht": "Haitian",
+        "ha": "Hausa",
+        "he": "Hebrew",
+        "hz": "Herero",
+        "hi": "Hindi",
+        "ho": "Hiri Motu",
+        "hu": "Hungarian",
+        "is": "Icelandic",
+        "io": "Ido",
+        "ig": "Igbo",
+        "id": "Indonesian",
+        "ia": "Interlingua",
+        "ie": "Interlingue",
+        "iu": "Inuktitut",
+        "ik": "Inupiaq",
+        "ga": "Irish",
+        "it": "Italian",
+        "ja": "Japanese",
+        "jv": "Javanese",
+        "kl": "Kalaallisut",
+        "kn": "Kannada",
+        "kr": "Kanuri",
+        "ks": "Kashmiri",
+        "kk": "Kazakh",
+        "ki": "Kikuyu",
+        "rw": "Kinyarwanda",
+        "ky": "Kirghiz",
+        "kv": "Komi",
+        "kg": "Kongo",
+        "ko": "Korean",
+        "kj": "Kuanyama",
+        "ku": "Kurdish",
+        "lo": "Lao",
+        "la": "Latin",
+        "lv": "Latvian",
+        "li": "Limburgan",
+        "ln": "Lingala",
+        "lt": "Lithuanian",
+        "lu": "Luba-Katanga",
+        "lb": "Luxembourgish",
+        "mk": "Macedonian",
+        "mg": "Malagasy",
+        "ms": "Malay",
+        "ml": "Malayalam",
+        "mt": "Maltese",
+        "gv": "Manx",
+        "mi": "Maori",
+        "mr": "Marathi",
+        "mh": "Marshallese",
+        "mn": "Mongolian",
+        "na": "Nauru",
+        "nv": "Navajo",
+        "ng": "Ndonga",
+        "ne": "Nepali",
+        "nd": "North Ndebele",
+        "se": "Northern Sami",
+        "no": "Norwegian",
+        "nb": "Norwegian Bokmål",
+        "nn": "Norwegian Nynorsk",
+        "oc": "Occitan",
+        "oj": "Ojibwa",
+        "or": "Oriya",
+        "om": "Oromo",
+        "os": "Ossetian",
+        "pi": "Pali",
+        "ps": "Pashto",
+        "fa": "Persian",
+        "pl": "Polish",
+        "pt": "Portuguese",
+        "pt-BR": "Portuguese (Brazil)",
+        "pa": "Punjabi",
+        "qu": "Quechua",
+        "ro": "Romanian",
+        "rm": "Romansh",
+        "rn": "Rundi",
+        "ru": "Russian",
+        "sm": "Samoan",
+        "sg": "Sango",
+        "sa": "Sanskrit",
+        "sc": "Sardinian",
+        "sr": "Serbian",
+        "sn": "Shona",
+        "ii": "Sichuan Yi",
+        "sd": "Sindhi",
+        "si": "Sinhala",
+        "sk": "Slovak",
+        "sl": "Slovenian",
+        "so": "Somali",
+        "nr": "South Ndebele",
+        "st": "Southern Sotho",
+        "es": "Spanish",
+        "es-LA": "Spanish (Latin America)",
+        "su": "Sundanese",
+        "sw": "Swahili",
+        "ss": "Swati",
+        "sv": "Swedish",
+        "tl": "Tagalog",
+        "ty": "Tahitian",
+        "tg": "Tajik",
+        "ta": "Tamil",
+        "tt": "Tatar",
+        "te": "Telugu",
+        "th": "Thai",
+        "bo": "Tibetan",
+        "ti": "Tigrinya",
+        "to": "Tonga",
+        "ts": "Tsonga",
+        "tn": "Tswana",
+        "tr": "Turkish",
+        "tk": "Turkmen",
+        "tw": "Twi",
+        "ug": "Uighur",
+        "uk": "Ukrainian",
+        "ur": "Urdu",
+        "uz": "Uzbek",
+        "ve": "Venda",
+        "vi": "Vietnamese",
+        "vo": "Volapük",
+        "wa": "Walloon",
+        "cy": "Welsh",
+        "fy": "Western Frisian",
+        "wo": "Wolof",
+        "xh": "Xhosa",
+        "yi": "Yiddish",
+        "yo": "Yoruba",
+        "za": "Zhuang",
+        "zu": "Zulu"
+    }
 }
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json b/snappymail/v/0.0.0/app/localization/lt/admin.json
similarity index 72%
rename from snappymail/v/0.0.0/app/localization/lt-LT/admin.json
rename to snappymail/v/0.0.0/app/localization/lt/admin.json
index 8b05f59ad..b6958d1c4 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/admin.json
+++ b/snappymail/v/0.0.0/app/localization/lt/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Pridėti",
+		"CLOSE": "Uždaryti",
 		"SAVE": "Saugoti",
-		"UPDATE": "Atnaujinti"
+		"TEST": "Bandymas",
+		"UPDATE": "Atnaujinti",
+		"USERNAME": "Vartotojo vardas",
+		"PASSWORD": "Slaptažodis",
+		"CANCEL": "Atšaukti",
+		"SEARCH": "Kontaktų nerasta",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prisijungimo vardas",
-		"LABEL_PASSWORD": "Slaptažodis",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prisijungti prie valdymo skydo"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Administratoriaus valdymo skydas"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Pagrindiniai",
-		"LABEL_LOGIN_NAME": "Prisijungimo vardas",
-		"LABEL_BRANDING_NAME": "Įdaguoti",
-		"LABEL_CONTACTS_NAME": "Kontaktai",
-		"LABEL_DOMAINS_NAME": "Domenai",
-		"LABEL_SECURITY_NAME": "Sauga",
-		"LABEL_PACKAGES_NAME": "Paketai",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Apie"
+		"GENERAL": "Pagrindiniai",
+		"LOGIN": "Prisijungimo vardas",
+		"BRANDING": "Įdaguoti",
+		"CONTACTS": "Kontaktai",
+		"DOMAINS": "Domenai",
+		"SECURITY": "Sauga",
+		"PACKAGES": "Paketai",
+		"CONFIG": "Config",
+		"ABOUT": "Apie"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Sąsaja",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Leisti kalbos keitimą nustatymuose",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Leisti temos keitimą nustatymuose",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Leisti keisti foną nustatymuose",
-		"LABEL_NEW_FOLDER_MOVE": "Naujas \"\"perkelti į katalogą\" mygtukas",
 		"LABEL_SHOW_THUMBNAILS": "Rodyti miniatiūrą (prisegtuko)",
 		"LEGEND_MAIN": "Pagrindinis",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Prisegtukų dydžio limitas",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Numatytasis Domenas",
 		"LABEL_DETERMINE_USER_DOMAIN": "Bandyti nuspėti vartotojo domeną",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Leisti kalbų keitimą prisijungimo lange",
-		"LABEL_DETERMINE_USER_LANGUAGE": "bandyti nuspėti vartotojo kalbą",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "bandyti nuspėti vartotojo kalbą"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Prekės ženklo derinimas",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Vartotojas",
 		"LABEL_STORAGE_PASSWORD": "Slaptažodis",
-		"BUTTON_TEST": "Bandymas",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Pastaba!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nenaudokite šio duomenų bazės tipo, jei turite daug aktyvių vartotojų",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Jūsų sistema nepalaiko kontaktų sąrašo.\nReikia įdiegti ar įjungti <strong>PDO (SĄLite \/ MySQL \/ PostgreSQL)<\/strong> plėtinius jūsų serveryje.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sauga",
 		"LABEL_USE_IMAGE_PROXY": "naudoti vietinį šliuzą (proxy) išoriniams paveikslėliams",
-		"LABEL_ALLOW_OPEN_PGP": "Leisti OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Rodyti PHP informaciją",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Valdymo skydo prieigos rekvizitai",
 		"LABEL_CURRENT_PASSWORD": "Dabartinis slaptažodis",
-		"LABEL_NEW_LOGIN": "Naujas prisijungimo vardas",
 		"LABEL_NEW_PASSWORD": "Naujas slaptažodis",
 		"LABEL_REPEAT_PASSWORD": "Pakartokite",
-		"BUTTON_UPDATE_PASSWORD": "Atnaujinti slaptažodį",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Reikalauti SSL sertifikato (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Reikalauti SSL sertifikato",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Leisti pačių sukurtus sertifikatus"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Paprastas, modernus ir greitas web pašto klientas",
 		"LABEL_ALL_RIGHTS_RESERVED": "Visos teisės saugomos.",
 		"HINT_READ_CHANGE_LOG": "Prašom perskaityti pasikeitimų eigą prieš atnaujinant.",
-		"HINT_IS_UP_TO_DATE": "RainLoop naujausios laidos.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail naujausios laidos.",
 		"HTML_NEW_VERSION": "Nauja <b>%VERSION%<\/b> versija jau prieinama.",
 		"LABEL_UPDATING": "Atnaujinama",
 		"LABEL_CHECKING": "Ieškau atnaujinimų",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Pridėti Alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domenas",
-		"BUTTON_CLOSE": "Uždaryti",
-		"BUTTON_ADD": "Pridėti"
+		"LABEL_DOMAIN": "Domenas"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Pridėti Domeną",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Redaguoti Domeną \"%NAME%\"",
 		"LABEL_NAME": "Pavadinimas",
 		"NAME_HELPER": "wildcard palaikymas",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Serveris",
 		"LABEL_PORT": "Prievadas",
 		"LABEL_SECURE": "Sauga",
-		"LABEL_WHITE_LIST": "Baltas Sąrašas",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Nėra",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Leisti sieve programavimą",
 		"LABEL_USE_SHORT_LOGIN": "Naudoti trumpą prisijungimo vardą",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Naudoti autentifikavimą ",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Naudoti php mail() funkciją",
-		"BUTTON_TEST": "Bandyti",
 		"BUTTON_WHITE_LIST": "Baltas sąrašas",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve konfiguracija",
-		"BUTTON_BACK_TO_IMAP": "Atgal į IMAP nustatymus",
-		"BUTTON_BACK": "Atgal",
-		"BUTTON_CLOSE": "Uždaryti",
-		"BUTTON_ADD": "Pridėti",
-		"BUTTON_UPDATE": "Atnaujinti",
-		"NEW_DOMAIN_DESC": "Šie nustatymai leis jums dirbti <br> su <i>%NAME%<\/i> domeno pašto adresais.",
-		"WHITE_LIST_ALERT": "Domeno vartotojų sąrašas, kuriems leista naudotis web paštu.\nNaudokite tarpo simbolį kaip skyriklį.\n"
+		"NEW_DOMAIN_DESC": "Šie nustatymai leis jums dirbti  su <strong>%NAME%<\/strong> domeno pašto adresais.",
+		"WHITE_LIST_ALERT": "Domeno vartotojų sąrašas, kuriems leista naudotis web paštu.\nNaudokite tarpo simbolį kaip skyriklį.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Įskiepis",
-		"DESC_NOTHING_TO_CONFIGURE": "Nėra ką konfiguruoti",
-		"BUTTON_CLOSE": "Uždaryti"
+		"DESC_NOTHING_TO_CONFIGURE": "Nėra ką konfiguruoti"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ar tikrai norite uždaryti šį langą?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilus",
 		"WARNING": "Dėmesio!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Nežinoma klaida"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neteisingas raktas",
-		"AUTH_ERROR": "Autorizacija nepavyko",
-		"DOMAIN_ALREADY_EXISTS": "Toks domenas jau yra",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Nepavyksta išsaugoti nustatymų",
-		"CANT_INSTALL_PACKAGE": "Nepavyksta įdiegti paketo",
-		"CANT_DELETE_PACKAGE": "Nepavyksta pašalinti paketo",
-		"INVALID_PLUGIN_PACKAGE": "Netinkamas įskiepio paketas",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Nepalaikomas įskiepio paketas",
-		"UNKNOWN_ERROR": "Nežinoma klaida"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neteisingas raktas",
+		"AuthError": "Autorizacija nepavyko",
+		"DomainAlreadyExists": "Toks domenas jau yra",
+		"CantSavePluginSettings": "Nepavyksta išsaugoti nustatymų",
+		"CantInstallPackage": "Nepavyksta įdiegti paketo",
+		"CantDeletePackage": "Nepavyksta pašalinti paketo",
+		"InvalidPluginPackage": "Netinkamas įskiepio paketas",
+		"UnsupportedPluginPackage": "Nepalaikomas įskiepio paketas",
+		"UnknownError": "Nežinoma klaida"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/lt/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/lt-LT/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/lt/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/static.json b/snappymail/v/0.0.0/app/localization/lt/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/lt-LT/static.json
rename to snappymail/v/0.0.0/app/localization/lt/static.json
diff --git a/snappymail/v/0.0.0/app/localization/lt-LT/user.json b/snappymail/v/0.0.0/app/localization/lt/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/lt-LT/user.json
rename to snappymail/v/0.0.0/app/localization/lt/user.json
index a11fcf475..ac72ad101 100644
--- a/snappymail/v/0.0.0/app/localization/lt-LT/user.json
+++ b/snappymail/v/0.0.0/app/localization/lt/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archyvavimas",
 		"ARE_YOU_SURE": "Ar Jūs įsitikinę?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Uždaryti (Esc)",
 		"CONTACTS": "Kontaktai",
 		"DELETE": "Naikinti",
+		"UNDELETE": "Undelete",
 		"DONE": "Atlikta",
 		"EMAIL": "E-paštas",
 		"FROM": "Nuo",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Atsijungti",
 		"MORE": "Daugiau",
 		"MOVE_TO": "Perkelti į",
+		"COPY_TO": "Nukopijuoti",
 		"NAME": "Gautieji",
 		"NONE": "Nieko",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ne šlamštas",
+		"USERNAME": "Vartotojo vardas",
 		"PASSWORD": "Slaptažodis",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Kam atsakyti",
 		"SAVE": "Išsaugoti",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Kontaktų nerasta",
 		"SPAM": "Žymėti kaip šlamštas",
 		"SUBJECT": "Tema",
 		"TEST": "Bandyti",
-		"TO": "Kam"
+		"TO": "Kam",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Taip",
+		"NO": "Ne",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "numatytasis",
+		"HELP": "Pagalba",
+		"TEXT": "Laiško Tekstas",
+		"ATTACHMENTS": "Priedai"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prisijungimo vardas",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Prisijungti"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Pridėti paskyrą",
-		"BUTTON_SETTINGS": "Nustatymai",
-		"BUTTON_HELP": "Pagalba"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobili versija",
-		"BUTTON_DESKTOP_VERSION": "Standartinė versija"
+		"BUTTON_ADD_ACCOUNT": "Pridėti paskyrą"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Detali paieška",
-		"LABEL_ADV_TEXT": "Laiško Tekstas",
-		"LABEL_ADV_HAS_ATTACHMENT": "Turi priedą",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Turi priedą",
-		"LABEL_ADV_FLAGGED": "Pažymėtas",
-		"LABEL_ADV_UNSEEN": "Neskaitytas",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Visi",
-		"LABEL_ADV_DATE_3_DAYS": "Nesenesni kaip 3 dienų",
-		"LABEL_ADV_DATE_7_DAYS": "Nesenesni kaip 1 savaitės",
-		"LABEL_ADV_DATE_MONTH": "Nesenesni kaip 1 mėnesio",
-		"LABEL_ADV_DATE_3_MONTHS": "Nesenesni kaip 3 mėnesių",
-		"LABEL_ADV_DATE_6_MONTHS": "Nesenesni kaip 6 mėnesių",
-		"LABEL_ADV_DATE_YEAR": "Nesenesni kaip 1 metų",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Perjungti viso ekrano režimą",
-		"ZOOM": "Didinti \/ mažinti",
-		"CLOSE": "Uždaryti (Esc)",
-		"GALLERY_PREV": "Ankstesnis (Rodyklė kairėn)",
-		"GALLERY_NEXT": "Kitas (Rodyklė dešinėn)",
-		"GALLERY_COUNTER": "%curr% iš %total%"
+		"TEXT": "Laiško Tekstas",
+		"HAS_ATTACHMENT": "Turi priedą",
+		"FLAGGED": "Pažymėtas",
+		"UNSEEN": "Neskaitytas",
+		"DATE": "Data",
+		"DATE_ALL": "Visi",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Nesenesni kaip 3 dienų",
+		"SINCE_7_DAYS": "Nesenesni kaip 1 savaitės",
+		"SINCE_MONTH": "Nesenesni kaip 1 mėnesio",
+		"SINCE_3_MONTHS": "Nesenesni kaip 3 mėnesių",
+		"SINCE_6_MONTHS": "Nesenesni kaip 6 mėnesių",
+		"SINCE_YEAR": "Nesenesni kaip 1 metų",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Atsakyta",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Sukurti",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Šiukšlynas",
 		"ARCHIVE_NAME": "Archyvas"
 	},
-	"QUOTA": {
-		"TITLE": "Kvotos naudojimas"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Atnaujinti žinučių sąrašą",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Skaityta",
 		"MENU_SELECT_FLAGGED": "Pažymėta",
 		"MENU_SELECT_UNFLAGGED": "Nepažymėta",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tuščias sąrašas.",
 		"EMPTY_SEARCH_LIST": "Nėra pranešimų, atitinkančių jūsų paiešką.",
 		"SEARCH_RESULT_FOR": "Ieškoti \"%SEARCH%\" rezultatuose",
 		"BACK_TO_MESSAGE_LIST": "grįžti į sąrašą",
-		"EMPTY_SUBJECT_TEXT": "(Be temos)",
 		"PUT_MESSAGE_HERE": "Įkelkite žinutę čia, kad matytumėte ją sąraše",
 		"TODAY_AT": "šiandien %TIME%",
 		"YESTERDAY_AT": "vakar %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Jūs turite %COUNT% naujų laiškų!",
 		"QUOTA_SIZE": "Naudojate <strong>%SIZE% (%PROC%%)<\/strong> iš savo turimų <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Rodyti šaltinį",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Atsisiųsti .eml failą",
 		"MENU_FILTER_SIMILAR": "Filtruoti laiškus, kaip šis",
 		"MENU_PRINT": "Spausdinti",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Kairėje pasirinkite katalogą, į kurį norite perkelti.",
 		"LINK_DOWNLOAD_AS_ZIP": "Atsisiųsti zip archyvą",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Pristatymo patvirtinimas (laiškas parodytas) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Ieškome..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Pridėti kontaktą",
 		"BUTTON_CREATE_CONTACT": "Sukurti",
-		"BUTTON_UPDATE_CONTACT": "Atnaujinti",
 		"BUTTON_IMPORT": "Importuoti (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Eksportuoti (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Eksportuoti (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Kontaktų nerasta",
 		"CLEAR_SEARCH": "Išvalyti paiešką",
 		"CONTACT_VIEW_DESC": "Pasirinkite kontaktą sąraše, kad matytumėte informaciją čia.",
-		"LABEL_PHONE": "Telefonas",
-		"LABEL_WEB": "Tinklapis",
 		"LABEL_BIRTHDAY": "Gimtadienis",
-		"LINK_ADD_EMAIL": "Pridėti elektroninio pašto adresą",
-		"LINK_ADD_PHONE": "Pridėti telefono Nr.",
-		"LINK_BIRTHDAY": "Gimtadienis",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Įveskite rodomą vardą",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Įveskite pavardę",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Įveskite vardą",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Įveskite slapyvardį",
+		"DISPLAY_NAME": "Rodomą vardą",
+		"LAST_NAME": "Pavardę",
+		"FIRST_NAME": "Vardą",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Slapyvardį",
 		"LABEL_READ_ONLY": "Tik skaitymui",
-		"LABEL_SHARE": "Dalintis",
 		"ADD_MENU_LABEL": "Pridėti",
 		"ADD_MENU_NICKNAME": "Slapyvardis",
-		"ADD_MENU_NOTES": "Pastabos",
+		"ADD_MENU_NOTE": "Pastabos",
 		"ADD_MENU_PHONE": "Telefono Nr.",
 		"ADD_MENU_URL": "URL nuoroda",
 		"ADD_MENU_ADDRESS": "Adresas",
 		"ADD_MENU_BIRTHDAY": "Gimtadienis",
 		"ADD_MENU_TAGS": "Žymos",
 		"BUTTON_SHARE_ALL": "Visiems",
-		"BUTTON_SYNC": "Sinchronizavimas (CardDAV)"
+		"BUTTON_SYNC": "Sinchronizavimas (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "rodyti visus laukus",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Nėra priedų.",
 		"ATTACHMENTS_ERROR_DESC": "Dėmesio! Ne visi priedai buvo įkelti.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Dar ne visi priedai buvo įkelti",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Prašyti pranešti kada bus perskaitytas",
 		"BUTTON_MARK_AS_IMPORTANT": "Žymėti svarbiu",
-		"BUTTON_REQUEST_DSN": "Prašyti laiško gavimo pažymos"
+		"BUTTON_REQUEST_DSN": "Prašyti laiško gavimo pažymos",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Taip",
-		"BUTTON_NO": "Ne",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ar tikrai norite uždaryti šį langą??",
 		"DESC_WANT_DELETE_MESSAGES": "Ar tikrai norite ištrinti pranešimą(us)?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Pasirinkite kalbą"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Pridėti paskyrą?",
+		"TITLE_ADD_ACCOUNT": "Pridėti paskyrą",
 		"BUTTON_ADD_ACCOUNT": "Pridėti",
-		"TITLE_UPDATE_ACCOUNT": "Atnaujinti paskyrą?",
-		"BUTTON_UPDATE_ACCOUNT": "Atnaujinti"
+		"TITLE_UPDATE_ACCOUNT": "Atnaujinti paskyrą"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Pridėti tapatybę?",
-		"TITLE_UPDATE_IDENTITY": "Atnaujinti tapatybę?",
+		"TITLE_ADD_IDENTITY": "Pridėti tapatybę",
+		"TITLE_UPDATE_IDENTITY": "Atnaujinti tapatybę",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Pridėti",
-		"BUTTON_UPDATE_IDENTITY": "Atnaujinti",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Įterpti šį parašą prieš citatą rašant atsakymą"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Sukurti aplanką?",
+		"TITLE_CREATE_FOLDER": "Sukurti aplanką",
 		"LABEL_PARENT": "Pirminis katalogas",
 		"BUTTON_CREATE": "Sukurti",
 		"TITLE_CREATING_PROCESS": "Kuriamas katalogas"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Pradėjus veiksmą, jis nebesustabdomas.",
 		"TITLE_CLEARING_PROCESS": "Valomas katalogas..."
 	},
+	"CRYPTO": {
+		"SIGN": "Parašas",
+		"ENCRYPT": "Šifravimas",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Tinkamas parašas nuo %USER%",
+		"ERROR": "%TYPE% klaida: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importuoti OpenPGP raktą",
 		"POPUP_IMPORT_BUTTON": "Importuoti",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Sukurti OpenPGP raktą",
 		"POPUP_GENERATE_BUTTON": "Sukurti",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Parašas",
-		"LABEL_ENCRYPT": "Šifravimas",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP pasirašytas pranešimas",
 		"ENCRYPTED_MESSAGE": "OpenPGP šifruotas pranešimas",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Tinkamas parašas nuo %USER%",
-		"ERROR": "OpenPGP klaida: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME pasirašytas pranešimas",
+		"ENCRYPTED_MESSAGE": "S\/MIME šifruotas pranešimas",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Sukurti filtrą?",
-		"TITLE_EDIT_FILTER": "Atnaujinti filtrą?",
+		"TITLE_CREATE_FILTER": "Sukurti filtrą",
+		"TITLE_EDIT_FILTER": "Atnaujinti filtrą",
 		"LEGEND_CONDITIONS": "Sąlygos",
 		"LEGEND_ACTIONS": "Veiksmai",
 		"BUTTON_ADD_CONDITION": "Pridėti sąlygą",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Žymėti skaitytu",
 		"REPLY_INTERVAL_LABEL": "Atsakymų intervalai (dienomis)",
 		"KEEP_LABEL": "laikyti",
-		"STOP_LABEL": "Nesustoti vykdyti taisykles",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Tema (nebūtina)",
 		"VACATION_MESSAGE_LABEL": "Žinutė",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Nežinoma klaida įkeliant failą"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEKSTAS"
+		"PLAIN": "HTML <-> TEKSTAS",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Asmeniniai",
-		"LABEL_GENERAL_NAME": "Pagrindiniai",
-		"LABEL_CONTACTS_NAME": "Kontaktai",
-		"LABEL_FOLDERS_NAME": "Katalogai",
-		"LABEL_ACCOUNTS_NAME": "Paskyros",
-		"LABEL_FILTERS_NAME": "Filtrai",
-		"LABEL_SECURITY_NAME": "Sauga",
-		"LABEL_THEMES_NAME": "Temos"
+		"GENERAL": "Pagrindiniai",
+		"CONTACTS": "Kontaktai",
+		"FOLDERS": "Katalogai",
+		"ACCOUNTS": "Paskyros",
+		"FILTERS": "Filtrai",
+		"SECURITY": "Sauga",
+		"THEMES": "Temos"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtrai",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Perkelti į \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "persiūsti \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Atmesti",
 		"SUBNAME_VACATION_MESSAGE": "Atostogų žinutė",
-		"SUBNAME_DISCARD": "Nepaisyti",
-		"LOADING_PROCESS": "Atnaujinamas filtrų sąrašas"
+		"SUBNAME_DISCARD": "Nepaisyti"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sauga",
 		"LABEL_AUTOLOGOUT": "Automatinis atsijungimas",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Niekada",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "po %MINUTES% minučių",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "po %HOURS% valandų"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Niekada"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Pagrindiniai",
-		"LABEL_LANGUAGE": "Kalba",
-		"LABEL_IDENTITY": "Tapatybė",
-		"LABEL_LAYOUT": "Išdėstymas",
-		"LABEL_LAYOUT_NO_SPLIT": "Skaidymo nėra",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
-		"LABEL_EDITOR": "Numatytas teksto redaktorius",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Paprastas",
-		"LABEL_EDITOR_HTML_FORCED": "Html (priverstinis)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Paprastas (priverstinis)",
-		"LABEL_VIEW_OPTIONS": "Peržiūros parinktys",
-		"LABEL_USE_PREVIEW_PANE": "Naudokite peržiūros sritį",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše",
-		"LABEL_USE_THREADS": "Naudoti gijas",
-		"LABEL_REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
-		"LABEL_SHOW_IMAGES": "Visada rodyti išorinius vaizdus žinutėse",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Žinučių lape",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Kalba",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Tapatybė",
+		"LAYOUT": "Išdėstymas",
+		"LAYOUT_NO_SPLIT": "Skaidymo nėra",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikalus skaidymas",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontalus skaidymas",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Numatytas teksto redaktorius",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Paprastas",
+		"VIEW_OPTIONS": "Peržiūros parinktys",
+		"USE_PREVIEW_PANE": "Naudokite peržiūros sritį",
+		"HIDE_DELETED_MESSAGES": "Slėpti pranešimus, pažymėtus ištrinti",
+		"USE_CHECKBOXES_IN_LIST": "Rodyti žymėjimo langelius sąraše",
+		"USE_THREADS": "Naudoti gijas",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Atsakymus dėti į katalogą, kuriame yra pradinė žinutė",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Žinučių lape",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Pranešimai",
-		"LABEL_SOUND_NOTIFICATION": "Garsinis pranešimas",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Pranešimai",
+		"SOUND_NOTIFICATION": "Garsinis pranešimas",
+		"CHROME_NOTIFICATION_DESC": "Rodyti iššokančius pranešimus apie naujas žinutes",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blokuoja naršyklė)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatiškai pridėti gavėjus į adresų knygą",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Serveris",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adresų knygos URL adresas",
 		"LABEL_CONTACTS_SYNC_USER": "Vartotojas",
-		"SYNC_NO": "Ne",
-		"SYNC_YES": "Taip",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temos",
-		"LEGEND_THEMES_CUSTOM": "Individualizuotos temos konfigūravimas",
-		"LABEL_CUSTOM_TYPE": "Tipas",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Šviesi",
-		"LABEL_CUSTOM_TYPE_DARK": "Tamsi",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fonas",
+		"LABEL_BACKGROUND": "Fonas",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Įkelti fono paveiksliuką (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Per didelis failas",
 		"ERROR_FILE_TYPE_ERROR": "Netinkamas failo tipas (tik JPG ir PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Mes rodome ne visus juos, kad išvengti našumo problemų.",
 		"HELP_DELETE_FOLDER": "Naikinti katalogą",
 		"HELP_SHOW_HIDE_FOLDER": "Rodyti\/Slėpti katalogą",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Tikrinti\/Netikrinti ar yra naujų laiškų",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Tikrinti ar yra naujų laiškų",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Pridėti paskyrą",
 		"BUTTON_ADD_IDENTITY": "Pridėti tapatybę",
 		"LOADING_PROCESS": "Atnaujinamas paskyrų sąrašas",
-		"DEFAULT_IDENTITY_LABEL": "numatytasis"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importuoti raktą",
 		"BUTTON_GENERATE_KEY_PAIR": "Sukurti raktus",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privatus",
 		"TITLE_PUBLIC": "Viešas",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Atsakyti visiems",
 		"LABEL_FORWARD": "Persiųsti",
 		"LABEL_FORWARD_MULTIPLY": "Persiųsti kaip prisegtuką",
-		"LABEL_HELP": "Pagalba",
 		"LABEL_CHECK_ALL": "Žymėti visus laiškus",
 		"LABEL_DELETE": "Šalinti",
 		"LABEL_OPEN_THREAD": "Atidaryti pasirinktą giją",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Pereiti į citatą",
 		"LABEL_THREAD_NEXT": "Kita šios gijos žinutė",
 		"LABEL_THREAD_PREV": "Ankstesnė šios gijos žinutė",
-		"LABEL_PRINT": "Spausdinti",
 		"LABEL_EXIT_FULLSCREEN": "Išeiti iš viso ekrano režimo",
 		"LABEL_CLOSE_MESSAGE": "Uždaryti laišką (Be peržiūros lauko)",
 		"LABEL_SWITCH_TO_LIST": "Perjungti atgal į laiškų sąrašą",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Uždaryti laišką"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neteisingas raktas",
-		"AUTH_ERROR": "Autorizacija nepavyko",
-		"CONNECTION_ERROR": "Nepavyskta prisijungti prie serverio",
-		"DOMAIN_ALREADY_EXISTS": "Subdomenas jau egzistuoja",
-		"DOMAIN_NOT_ALLOWED": "Šis subdomenas neleidžiamas",
-		"ACCOUNT_NOT_ALLOWED": "Paskyra neleidžiama",
-		"CONTACTS_SYNC_ERROR": "Kontaktų sinchronizavimo klaida",
-		"CANT_GET_MESSAGE_LIST": "Nepavyksta gauti laiškų sąrašo",
-		"CANT_GET_MESSAGE": "Nepavyksta gauti laiško",
-		"CANT_DELETE_MESSAGE": "Nepavyko pašalinti laiško",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Nepavyko perkelti laiško",
-		"CANT_SAVE_MESSAGE": "Nepavyko išsaugoti laiško",
-		"CANT_SEND_MESSAGE": "Nepavyko išsiųsti laiško",
-		"INVALID_RECIPIENTS": "Netinkamas gavėjas",
-		"CANT_SAVE_FILTERS": "Nepavyko išsaugoti filtrų",
-		"CANT_GET_FILTERS": "Nepavyko gauti filtrų",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtrai neteisingi",
-		"CANT_CREATE_FOLDER": "Nepavyksta sukurti katalogo",
-		"CANT_RENAME_FOLDER": "Nepavyksta pervadinti katalogo",
-		"CANT_DELETE_FOLDER": "Nepavyksta pašalinti katalogo",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Negalima pašalinti ne tuščio katalogo",
-		"CANT_SUBSCRIBE_FOLDER": "Nepavyskta užprenumeruoti katalogo",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nepavyksta nutraukti katalogo prenumeratos",
-		"DEMO_SEND_MESSAGE_ERROR": "Saugumo sumetimais, ši demo paskyra neleidžia siųsti laiškų išoriniais e-pašto adresais!",
-		"DEMO_ACCOUNT_ERROR": "Saugumo sumetimais, su šia paskyra negalima atlikti norimo veiksmo!",
-		"ACCOUNT_ALREADY_EXISTS": "Paskyra jau egzistuoja",
-		"ACCOUNT_DOES_NOT_EXIST": "Nėra tokios paskyros",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Klaida bandant pasiekti pašto serverį",
-		"INVALID_INPUT_ARGUMENT": "Neteisingas įvesties argumentas",
-		"UNKNOWN_ERROR": "Nežinoma klaida"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neteisingas raktas",
+		"AuthError": "Autorizacija nepavyko",
+		"ConnectionError": "Nepavyskta prisijungti prie serverio",
+		"DomainAlreadyExists": "Subdomenas jau egzistuoja",
+		"DomainNotAllowed": "Šis subdomenas neleidžiamas",
+		"AccountNotAllowed": "Paskyra neleidžiama",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kontaktų sinchronizavimo klaida",
+		"CantGetMessageList": "Nepavyksta gauti laiškų sąrašo",
+		"CantGetMessage": "Nepavyksta gauti laiško",
+		"CantDeleteMessage": "Nepavyko pašalinti laiško",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Nepavyko perkelti laiško",
+		"CantSaveMessage": "Nepavyko išsaugoti laiško",
+		"CantSendMessage": "Nepavyko išsiųsti laiško",
+		"InvalidRecipients": "Netinkamas gavėjas",
+		"CantSaveFilters": "Nepavyko išsaugoti filtrų",
+		"CantGetFilters": "Nepavyko gauti filtrų",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filtrai neteisingi",
+		"CantCreateFolder": "Nepavyksta sukurti katalogo",
+		"CantRenameFolder": "Nepavyksta pervadinti katalogo",
+		"CantDeleteFolder": "Nepavyksta pašalinti katalogo",
+		"CantDeleteNonEmptyFolder": "Negalima pašalinti ne tuščio katalogo",
+		"CantSubscribeFolder": "Nepavyskta užprenumeruoti katalogo",
+		"CantUnsubscribeFolder": "Nepavyksta nutraukti katalogo prenumeratos",
+		"DemoSendMessageError": "Saugumo sumetimais, ši demo paskyra neleidžia siųsti laiškų išoriniais e-pašto adresais!",
+		"DemoAccountError": "Saugumo sumetimais, su šia paskyra negalima atlikti norimo veiksmo!",
+		"AccountAlreadyExists": "Paskyra jau egzistuoja",
+		"AccountDoesNotExist": "Nėra tokios paskyros",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Klaida bandant pasiekti pašto serverį",
+		"InvalidInputArgument": "Neteisingas įvesties argumentas",
+		"UnknownError": "Nežinoma klaida"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/lv/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/lv-LV/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/lv/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/static.json b/snappymail/v/0.0.0/app/localization/lv/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/lv-LV/static.json
rename to snappymail/v/0.0.0/app/localization/lv/static.json
diff --git a/snappymail/v/0.0.0/app/localization/lv-LV/user.json b/snappymail/v/0.0.0/app/localization/lv/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/lv-LV/user.json
rename to snappymail/v/0.0.0/app/localization/lv/user.json
index a6b5489bc..b611f8225 100644
--- a/snappymail/v/0.0.0/app/localization/lv-LV/user.json
+++ b/snappymail/v/0.0.0/app/localization/lv/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arhivēšana",
 		"ARE_YOU_SURE": "Tiešām?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Aizvērt (Esc)",
 		"CONTACTS": "Kontakti",
 		"DELETE": "Dzēst",
+		"UNDELETE": "Undelete",
 		"DONE": "Done",
 		"EMAIL": "E-pasts",
 		"FROM": "No",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Izlogoties",
 		"MORE": "Vairāk",
 		"MOVE_TO": "Pārvietot uz",
+		"COPY_TO": "Kopēt uz",
 		"NAME": "Iesūtne",
 		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Not Spam",
+		"USERNAME": "Lietotājvārds",
 		"PASSWORD": "Parole",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Saglabāt",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Kontakti nav atrasti",
 		"SPAM": "Spams",
 		"SUBJECT": "Tēma",
 		"TEST": "Test",
-		"TO": "Kam"
+		"TO": "Kam",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Jā",
+		"NO": "Nē",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Palīdzība",
+		"TEXT": "Teksts",
+		"ATTACHMENTS": "Pielikumi"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Ielogoties",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Ielogoties"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Pievienot kontu",
-		"BUTTON_SETTINGS": "Uzstādijumi",
-		"BUTTON_HELP": "Palīdzība"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilā versija",
-		"BUTTON_DESKTOP_VERSION": "Darba virsmas versija"
+		"BUTTON_ADD_ACCOUNT": "Pievienot kontu"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Papildus meklēšana",
-		"LABEL_ADV_TEXT": "Teksts",
-		"LABEL_ADV_HAS_ATTACHMENT": "Ir pielikums",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Ir pielikumi",
-		"LABEL_ADV_FLAGGED": "Atzīmētie",
-		"LABEL_ADV_UNSEEN": "Unseen",
-		"LABEL_ADV_DATE": "Datums",
-		"LABEL_ADV_DATE_ALL": "Viss periods",
-		"LABEL_ADV_DATE_3_DAYS": "Līdz 3 dienas vecs",
-		"LABEL_ADV_DATE_7_DAYS": "Līdz 1 nedēļu vecs",
-		"LABEL_ADV_DATE_MONTH": "Līdz 1 mēnesi vecs",
-		"LABEL_ADV_DATE_3_MONTHS": "Līdz 3 mēnešus vecs",
-		"LABEL_ADV_DATE_6_MONTHS": "Līdz 6 mēnešus vecs",
-		"LABEL_ADV_DATE_YEAR": "Līdz 1 gadu vecs",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Aizvērt (Esc)",
-		"GALLERY_PREV": "Iepriekšejā (Kreisā būltiņa)",
-		"GALLERY_NEXT": "Nākamā (Labā būltiņa)",
-		"GALLERY_COUNTER": "%curr% no %total%"
+		"TEXT": "Teksts",
+		"HAS_ATTACHMENT": "Ir pielikums",
+		"FLAGGED": "Atzīmētie",
+		"UNSEEN": "Unseen",
+		"DATE": "Datums",
+		"DATE_ALL": "Viss periods",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Līdz 3 dienas vecs",
+		"SINCE_7_DAYS": "Līdz 1 nedēļu vecs",
+		"SINCE_MONTH": "Līdz 1 mēnesi vecs",
+		"SINCE_3_MONTHS": "Līdz 3 mēnešus vecs",
+		"SINCE_6_MONTHS": "Līdz 6 mēnešus vecs",
+		"SINCE_YEAR": "Līdz 1 gadu vecs",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Atbildēja",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Rakstīt",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Miskaste",
 		"ARCHIVE_NAME": "Arhīvs"
 	},
-	"QUOTA": {
-		"TITLE": "Kvotas izmantojums"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Pārlādēt ziņojumu sarakstu",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Izlasīts",
 		"MENU_SELECT_FLAGGED": "Atzīmētie",
 		"MENU_SELECT_UNFLAGGED": "Noņemtās atzīmes",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tukšs saraksts.",
 		"EMPTY_SEARCH_LIST": "Neviens ziņojums neatbilda jūsu meklētajiem kritērijiem.",
 		"SEARCH_RESULT_FOR": "Meklēšanas rezultāti: \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
-		"EMPTY_SUBJECT_TEXT": "(Nav virsraksta)",
+		"BACK_TO_MESSAGE_LIST": "Back to message list",
 		"PUT_MESSAGE_HERE": "Ievelciet ziņojumus šeit lai tos apskatītu.",
 		"TODAY_AT": "šodien %TIME%",
 		"YESTERDAY_AT": "vakardien %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Jums ir %COUNT% jaunas ziņas!",
 		"QUOTA_SIZE": "Izmantots <strong>%SIZE% (%PROC%%)<\/strong> no <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Rādīt orģinālu",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Lejuplādēt kā .eml failu",
 		"MENU_FILTER_SIMILAR": "Atfiltrēt šādus ziņojumus",
 		"MENU_PRINT": "Printēt",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Meklē..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Pievienot kontaktu",
 		"BUTTON_CREATE_CONTACT": "Izveidot",
-		"BUTTON_UPDATE_CONTACT": "Atjaunot",
 		"BUTTON_IMPORT": "Import (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Export (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Kontakti nav atrasti",
 		"CLEAR_SEARCH": "Nodzēt meklēšanu",
 		"CONTACT_VIEW_DESC": "Izvēlaties kontaktu no saraksta lai to apskatītu.",
-		"LABEL_PHONE": "Phone",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Birthday",
-		"LINK_ADD_EMAIL": "Add an email address",
-		"LINK_ADD_PHONE": "Add a phone",
-		"LINK_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Enter display name",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Enter last name",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Enter first name",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Display name",
+		"LAST_NAME": "Last name",
+		"FIRST_NAME": "First name",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Read only",
-		"LABEL_SHARE": "Share",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
-		"ADD_MENU_NOTES": "Notes",
+		"ADD_MENU_NOTE": "Notes",
 		"ADD_MENU_PHONE": "Phone",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Address",
 		"ADD_MENU_BIRTHDAY": "Birthday",
 		"ADD_MENU_TAGS": "Tags",
 		"BUTTON_SHARE_ALL": "Everyone",
-		"BUTTON_SYNC": "Synchronization (CardDAV)"
+		"BUTTON_SYNC": "Synchronization (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "rādīt visus laukus",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
+		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Jā",
-		"BUTTON_NO": "Nē",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?",
 		"DESC_WANT_DELETE_MESSAGES": "Are you sure you want to delete the message(s)?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Choose your language"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Pievienot kontu?",
+		"TITLE_ADD_ACCOUNT": "Pievienot kontu",
 		"BUTTON_ADD_ACCOUNT": "Pievienot",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_UPDATE_ACCOUNT": "Update Account"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Add Identity?",
-		"TITLE_UPDATE_IDENTITY": "Update Identity?",
+		"TITLE_ADD_IDENTITY": "Add Identity",
+		"TITLE_UPDATE_IDENTITY": "Update Identity",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Add",
-		"BUTTON_UPDATE_IDENTITY": "Update",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Izveidot mapi?",
+		"TITLE_CREATE_FOLDER": "Izveidot mapi",
 		"LABEL_PARENT": "Zem kuras mapes",
 		"BUTTON_CREATE": "Izveidot",
 		"TITLE_CREATING_PROCESS": "Izveidot mapi"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Šo procesu nevarēs apturēt.",
 		"TITLE_CLEARING_PROCESS": "Mape tiek iztīrīta..."
 	},
+	"CRYPTO": {
+		"SIGN": "Sign",
+		"ENCRYPT": "Encrypt",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import OpenPGP key",
 		"POPUP_IMPORT_BUTTON": "Import",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Generate OpenPGP keys",
 		"POPUP_GENERATE_BUTTON": "Generate",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Sign",
-		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP signed message",
 		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME signed message",
+		"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
+		"TITLE_CREATE_FILTER": "Create a filter",
+		"TITLE_EDIT_FILTER": "Update filter",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Add a Condition",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Mark as read",
 		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
 		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Subject (optional)",
 		"VACATION_MESSAGE_LABEL": "Message",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Nezināma faila ielādes kļūda"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEKSTS"
+		"PLAIN": "HTML <-> TEKSTS",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personīgie",
-		"LABEL_GENERAL_NAME": "Vispārējie",
-		"LABEL_CONTACTS_NAME": "Contacts",
-		"LABEL_FOLDERS_NAME": "Mapes",
-		"LABEL_ACCOUNTS_NAME": "Konti",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Security",
-		"LABEL_THEMES_NAME": "Tēmas"
+		"GENERAL": "Vispārējie",
+		"CONTACTS": "Contacts",
+		"FOLDERS": "Mapes",
+		"ACCOUNTS": "Konti",
+		"FILTERS": "Filters",
+		"SECURITY": "Security",
+		"THEMES": "Tēmas"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS%  Stunda(s)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Vispārējie",
-		"LABEL_LANGUAGE": "Valoda",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Galvenais teksta editors",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Teksts",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "Apskates opcijas",
-		"LABEL_USE_PREVIEW_PANE": "Lietot priekšskatu",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā",
-		"LABEL_USE_THREADS": "Lietot saraksti",
-		"LABEL_REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
-		"LABEL_SHOW_IMAGES": "Vienmēr rādīt attēlus ziņojumos",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Ziņojumi lapā",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Valoda",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Galvenais teksta editors",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Teksts",
+		"VIEW_OPTIONS": "Apskates opcijas",
+		"USE_PREVIEW_PANE": "Lietot priekšskatu",
+		"HIDE_DELETED_MESSAGES": "Slēpt ziņojumus, kas atzīmēti dzēšanai",
+		"USE_CHECKBOXES_IN_LIST": "Rādīt checkboxes sarakstā",
+		"USE_THREADS": "Lietot saraksti",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Atbildes ziņojumus ielikt mapē kurā atrodas vēstule uz kuru tiek atbildēts.",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Ziņojumi lapā",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Paziņojumi",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Paziņojumi",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Rādīt jaunus paziņojumus kā izlecošus logus",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Parlūkprogramma bloķēja)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatically add recipients to your address book",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL",
 		"LABEL_CONTACTS_SYNC_USER": "User",
-		"SYNC_NO": "Nē",
-		"SYNC_YES": "Jā",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tēmas",
-		"LEGEND_THEMES_CUSTOM": "Tēmas konfigurācija",
-		"LABEL_CUSTOM_TYPE": "Tips",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Gaišs",
-		"LABEL_CUSTOM_TYPE_DARK": "Tumšs",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Fons",
+		"LABEL_BACKGROUND": "Fons",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Ielādēt fona attēlu (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fails ir par lielu",
 		"ERROR_FILE_TYPE_ERROR": "Nepareizs faila tips (Tikai JPG un PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Pievienot kontu",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Atjauno kontu sarakstu",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Reply All",
 		"LABEL_FORWARD": "Forward",
 		"LABEL_FORWARD_MULTIPLY": "Forward (multiply)",
-		"LABEL_HELP": "Help",
 		"LABEL_CHECK_ALL": "Select all messages",
 		"LABEL_DELETE": "Delete",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Print",
 		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
 		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
 		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Nepareizs tokens",
-		"AUTH_ERROR": "Autorizācija neizdevās",
-		"CONNECTION_ERROR": "Nevar savienoties ar serveri",
-		"DOMAIN_ALREADY_EXISTS": "Domeņes jau eksistē",
-		"DOMAIN_NOT_ALLOWED": "Šis domēns nav atļauts",
-		"ACCOUNT_NOT_ALLOWED": "Account is not allowed",
-		"CONTACTS_SYNC_ERROR": "Contacts synchronization error",
-		"CANT_GET_MESSAGE_LIST": "Nevar ielādēt ziņojumu sarakstu",
-		"CANT_GET_MESSAGE": "Nevar ielādēt ziņojumu",
-		"CANT_DELETE_MESSAGE": "Nevar izdzēst ziņojumu",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Nevar pārvietot ziņojumu",
-		"CANT_SAVE_MESSAGE": "Nevar saglabāt ziņojumu",
-		"CANT_SEND_MESSAGE": "Nevar nosūtīt ziņojumu",
-		"INVALID_RECIPIENTS": "Nepareizi saņēmēji",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Nevar izveidot mapi",
-		"CANT_RENAME_FOLDER": "Nevar pārsaukt mapi",
-		"CANT_DELETE_FOLDER": "Nevar izdzēst mapi",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nevar izdzēst pilnu mapi",
-		"CANT_SUBSCRIBE_FOLDER": "Nevar pierakstīties mapei",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nevar atrakstīties mapei",
-		"DEMO_SEND_MESSAGE_ERROR": "Drošīnas iemeslu dēļ, demo konts nedrīks sūtīt e-pastu uz ārējiem e-pastiem!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Konts jau eksistē",
-		"ACCOUNT_DOES_NOT_EXIST": "Konts neeksistē",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Radās kļūda savienojoties ar serveri",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Nezināma kļūda"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Nepareizs tokens",
+		"AuthError": "Autorizācija neizdevās",
+		"ConnectionError": "Nevar savienoties ar serveri",
+		"DomainAlreadyExists": "Domeņes jau eksistē",
+		"DomainNotAllowed": "Šis domēns nav atļauts",
+		"AccountNotAllowed": "Account is not allowed",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Contacts synchronization error",
+		"CantGetMessageList": "Nevar ielādēt ziņojumu sarakstu",
+		"CantGetMessage": "Nevar ielādēt ziņojumu",
+		"CantDeleteMessage": "Nevar izdzēst ziņojumu",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Nevar pārvietot ziņojumu",
+		"CantSaveMessage": "Nevar saglabāt ziņojumu",
+		"CantSendMessage": "Nevar nosūtīt ziņojumu",
+		"InvalidRecipients": "Nepareizi saņēmēji",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Nevar izveidot mapi",
+		"CantRenameFolder": "Nevar pārsaukt mapi",
+		"CantDeleteFolder": "Nevar izdzēst mapi",
+		"CantDeleteNonEmptyFolder": "Nevar izdzēst pilnu mapi",
+		"CantSubscribeFolder": "Nevar pierakstīties mapei",
+		"CantUnsubscribeFolder": "Nevar atrakstīties mapei",
+		"DemoSendMessageError": "Drošīnas iemeslu dēļ, demo konts nedrīks sūtīt e-pastu uz ārējiem e-pastiem!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Konts jau eksistē",
+		"AccountDoesNotExist": "Konts neeksistē",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Radās kļūda savienojoties ar serveri",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Nezināma kļūda"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json b/snappymail/v/0.0.0/app/localization/nb/admin.json
similarity index 65%
rename from snappymail/v/0.0.0/app/localization/nb-NO/admin.json
rename to snappymail/v/0.0.0/app/localization/nb/admin.json
index da5d9c1e5..3f0047cb5 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nb/admin.json
@@ -1,27 +1,35 @@
 {
 	"GLOBAL": {
+		"ADD": "Legg til",
+		"CLOSE": "Lukk",
 		"SAVE": "Lagre",
-		"UPDATE": "Oppdater"
+		"TEST": "Test",
+		"UPDATE": "Oppdater",
+		"USERNAME": "Brukernavn",
+		"PASSWORD": "Passord",
+		"CANCEL": "Avbryt",
+		"SEARCH": "Fant ingen kontakter",
+		"YES": "Ja",
+		"NO": "Nei"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Brukernavn",
-		"LABEL_PASSWORD": "Passord",
-		"LABEL_TOTP": "TOTP code",
+		"LABEL_TOTP": "TOTP-kode",
 		"BUTTON_LOGIN": "Logg inn på admin-panel"
 	},
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Admin-panel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Generelt",
-		"LABEL_LOGIN_NAME": "Brukernavn",
-		"LABEL_BRANDING_NAME": "Utforming",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_DOMAINS_NAME": "Domener",
-		"LABEL_SECURITY_NAME": "Sikkerhet",
-		"LABEL_PACKAGES_NAME": "Pakker",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Om"
+		"GENERAL": "Generelt",
+		"LOGIN": "Brukernavn",
+		"BRANDING": "Utforming",
+		"CONTACTS": "Kontakter",
+		"DOMAINS": "Domener",
+		"SECURITY": "Sikkerhet",
+		"PACKAGES": "Pakker",
+		"CONFIG": "Oppsett",
+		"ABOUT": "Om"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Grensesnitt",
@@ -31,23 +39,21 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "La brukere velge språk på oppsettsskjerm",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "La brukere velge tema på oppsettsskjerm",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "La brukere velge bakgrunn på oppsettsskjerm",
-		"LABEL_NEW_FOLDER_MOVE": "Ny «flytt til mappe»-knapp",
 		"LABEL_SHOW_THUMBNAILS": "Vis miniatyrer (vedlegg)",
 		"LEGEND_MAIN": "Hoved",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Maksimal størrelse på vedlegg",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Tillat bruk av flere kontoer",
 		"LABEL_ALLOW_IDENTITIES": "Tillat bruk av flere identiteter",
-		"ALERT_DATA_ACCESS": "RainLoop-datamappa di er offentlig tiljgengelig. Sett opp webtjeneren slik at den ikke viser datamappa. Les mer her:",
+		"ALERT_DATA_ACCESS": "SnappyMail-datamappa di er offentlig tiljgengelig. Sett opp webtjeneren slik at den ikke viser datamappa. Les mer her:",
 		"ALERT_WARNING": "Advarsel!",
-		"HTML_ALERT_WEAK_PASSWORD": "Du bruker forvalgt admin-passord.\n<br>\nAv sikkerhetshensyn bør du\n<strong><a href=\"#\/security\">endre<\/a><\/strong>\npassordet umiddelbart.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "Du bruker forvalgt admin-passord.\n<br>\nAv sikkerhetshensyn bør du\n<strong><a href=\"#\/security\">endre<\/a><\/strong>\npassordet umiddelbart."
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Innloggingsskjerm",
-		"LABEL_DEFAULT_DOMAIN": "Standard-domene",
+		"LABEL_DEFAULT_DOMAIN": "Standarddomene",
 		"LABEL_DETERMINE_USER_DOMAIN": "Prøv å finne brukerens domene",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "La brukere velge språk på innloggingsskjerm",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Prøv å finne brukerens språk",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Prøv å finne brukerens språk"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Utforming",
@@ -64,57 +70,54 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Bruker",
 		"LABEL_STORAGE_PASSWORD": "Passord",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Varsel!",
+		"SUGGESTIONS_LIMIT": "Forslagsbegrensning",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ikke bruk denne databasetypen hvis dette systemet har mange brukere.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Dette systemet støtter ikke kontakter.\n<br>\nDu må installere eller slå på utvidelsen <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> på tjeneren.\n"
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Dette systemet støtter ikke kontakter.\n<br>\nDu må installere eller slå på utvidelsen <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> på tjeneren."
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Domener",
 		"BUTTON_ADD_DOMAIN": "Legg til domene",
 		"BUTTON_ADD_ALIAS": "Legg til alias",
 		"DELETE_ARE_YOU_SURE": "Er du sikker?",
-		"HTML_DOMAINS_HELPER": "Liste over domener som programmet kan få tilgang til.\n<br>\nTrykk på et navn for å sette opp domenet.\n"
+		"HTML_DOMAINS_HELPER": "Liste over domener som programmet kan få tilgang til.\n<br>\nTrykk på et navn for å sette opp domenet."
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhet",
 		"LABEL_USE_IMAGE_PROXY": "Bruk lokal mellomtjener for eksterne bilder",
-		"LABEL_ALLOW_OPEN_PGP": "Tillat OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Vis PHP-informasjon",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Akkreditiver for admin-panel",
 		"LABEL_CURRENT_PASSWORD": "Gjeldende passord",
-		"LABEL_NEW_LOGIN": "Nytt brukernavn",
 		"LABEL_NEW_PASSWORD": "Nytt passord",
 		"LABEL_REPEAT_PASSWORD": "Gjenta",
-		"BUTTON_UPDATE_PASSWORD": "Oppdater passord",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Krev bekreftelse av SSL-sertifikat (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Krev bekreftelse av SSL-sertifikat",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Tillat selvutstedt sertifikat"
 	},
 	"TAB_PACKAGES": {
-		"LABEL_ENABLE_PLUGINS": "Enable extensions",
+		"LABEL_ENABLE_PLUGINS": "Slå på utvidelser",
 		"LEGEND_AVAILABLE_FOR_UPDATE": "Tilgjengelig for oppdatering",
 		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Tilgjengelig for installasjon",
 		"LEGEND_INSTALLED_PACKAGES": "Installerte pakker",
-		"ALERT_CANNOT_ACCESS_REPOSITORY": "Fikk ikke tilgang til pakkelageret."
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Fikk ikke tilgang til pakkelager."
 	},
 	"TAB_ABOUT": {
 		"LEGEND_ABOUT": "Om",
 		"LABEL_TAG_HINT": "Rask, enkel, moderne og web-basert e-postklient",
-		"LABEL_ALL_RIGHTS_RESERVED": "All Rights Reserved.",
+		"LABEL_ALL_RIGHTS_RESERVED": "Alle rettigheter reservert.",
 		"HINT_READ_CHANGE_LOG": "Les endringslogg før du oppdaterer.",
-		"HINT_IS_UP_TO_DATE": "RainLoop er oppdatert.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail er oppdatert.",
 		"HTML_NEW_VERSION": "Versjon <b>%VERSION%<\/b> er nå tilgjengelig.",
 		"LABEL_UPDATING": "Oppdaterer",
 		"LABEL_CHECKING": "Ser etter oppdateringer",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Utgivelser"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Legg til alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domene",
-		"BUTTON_CLOSE": "Lukk",
-		"BUTTON_ADD": "Legg til"
+		"LABEL_DOMAIN": "Domene"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Legg til domene",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Rediger «%NAME%»",
 		"LABEL_NAME": "Navn",
 		"NAME_HELPER": "jokertegn støttes",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Tjener",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Sikker",
-		"LABEL_WHITE_LIST": "Hvitliste",
-		"SECURE_OPTION_NONE": "None",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Deaktiver funksjoner",
+		"LIMITS": "Grenser",
+		"FOLDERS": "Mapper",
+		"MESSAGES": "Meldinger",
+		"SECURE_OPTION_NONE": "Ingen",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Tillat sieve-skript",
 		"LABEL_USE_SHORT_LOGIN": "Bruk forkortet brukernavn",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Bruk autentisering",
-		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_SET_SENDER": "Bruk pålogging som avsender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Bruk php-funksjonen «mail()»",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Hvitliste",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve-oppsett",
-		"BUTTON_BACK_TO_IMAP": "Tilbake til IMAP-innstillinger",
-		"BUTTON_BACK": "Tilbake",
-		"BUTTON_CLOSE": "Lukk",
-		"BUTTON_ADD": "Legg til",
-		"BUTTON_UPDATE": "Oppdater",
-		"NEW_DOMAIN_DESC": "Dette domeneoppsettet lar deg jobbe <br> med e-postadresser ved <i>%NAME%<\/i>.",
-		"WHITE_LIST_ALERT": "Liste over domenebrukere som programmet skal ha tilgang til.\nHold verdier adskilt med mellomrom.\n"
+		"NEW_DOMAIN_DESC": "Dette domeneoppsettet lar deg jobbe  med e-postadresser ved <strong>%NAME%<\/strong>.",
+		"WHITE_LIST_ALERT": "Liste over domenebrukere som programmet skal ha tilgang til.\nHold verdier adskilt med mellomrom.",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tillegg",
-		"DESC_NOTHING_TO_CONFIGURE": "Ingenting å sette opp",
-		"BUTTON_CLOSE": "Lukk"
+		"DESC_NOTHING_TO_CONFIGURE": "Ingenting å sette opp"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Er du sikker på at du vil lukke dette vinduet?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "ustabil",
 		"WARNING": "Advarsel!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Ukjent feil"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ugyldig symbol",
-		"AUTH_ERROR": "Autentisering mislyktes",
-		"DOMAIN_ALREADY_EXISTS": "Domenet finnes allerede",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Klarte ikke å lagre innstillinger",
-		"CANT_INSTALL_PACKAGE": "Klarte ikke å installere pakke",
-		"CANT_DELETE_PACKAGE": "Klarte ikke å fjerne pakke",
-		"INVALID_PLUGIN_PACKAGE": "Ugyldig tilleggspakke",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Tilleggspakke støttes ikke",
-		"UNKNOWN_ERROR": "Ukjent feil"
+		"RequestError": "Forespørsel feilet",
+		"RequestAborted": "Forespørselen er avbrutt",
+		"RequestTimeout": "Forespørselen ble tidsavbrutt",
+		"InvalidToken": "Ugyldig symbol",
+		"AuthError": "Autentisering mislyktes",
+		"DomainAlreadyExists": "Domenet finnes allerede",
+		"CantSavePluginSettings": "Klarte ikke å lagre innstillinger",
+		"CantInstallPackage": "Klarte ikke å installere pakke",
+		"CantDeletePackage": "Klarte ikke å fjerne pakke",
+		"InvalidPluginPackage": "Ugyldig tilleggspakke",
+		"UnsupportedPluginPackage": "Tilleggspakke støttes ikke",
+		"UnknownError": "Ukjent feil"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/nb/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/nb-NO/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/nb/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/static.json b/snappymail/v/0.0.0/app/localization/nb/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/nb-NO/static.json
rename to snappymail/v/0.0.0/app/localization/nb/static.json
diff --git a/snappymail/v/0.0.0/app/localization/nb-NO/user.json b/snappymail/v/0.0.0/app/localization/nb/user.json
similarity index 54%
rename from snappymail/v/0.0.0/app/localization/nb-NO/user.json
rename to snappymail/v/0.0.0/app/localization/nb/user.json
index b8faead65..a8f95e122 100644
--- a/snappymail/v/0.0.0/app/localization/nb-NO/user.json
+++ b/snappymail/v/0.0.0/app/localization/nb/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arkivering",
 		"ARE_YOU_SURE": "Er du sikker?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Lukk (Esc)",
 		"CONTACTS": "Kontakter",
 		"DELETE": "Slett",
+		"UNDELETE": "Undelete",
 		"DONE": "Ferdig",
 		"EMAIL": "E-postadresse",
 		"FROM": "Fra",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Logg ut",
 		"MORE": "Mer",
 		"MOVE_TO": "Flytt til",
+		"COPY_TO": "Kopier til",
 		"NAME": "Innboks",
 		"NONE": "Ingen",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ikke søppelpost",
+		"USERNAME": "Brukernavn",
 		"PASSWORD": "Passord",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Svar til",
 		"SAVE": "Lagre",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Fant ingen kontakter",
 		"SPAM": "Søppelpost",
 		"SUBJECT": "Emne",
 		"TEST": "Test",
-		"TO": "Til"
+		"TO": "Til",
+		"SERVER_MESSAGE": "Tjenermelding",
+		"YES": "Ja",
+		"NO": "Nei",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "Standard",
+		"HELP": "Hjelp",
+		"TEXT": "Tekst",
+		"ATTACHMENTS": "Vedlegg"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logg inn",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Logg inn"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Legg til konto",
-		"BUTTON_SETTINGS": "Innstillinger",
-		"BUTTON_HELP": "Hjelp"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilversjon",
-		"BUTTON_DESKTOP_VERSION": "Skrivebordsversjon"
+		"BUTTON_ADD_ACCOUNT": "Legg til konto"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Avansert søk",
-		"LABEL_ADV_TEXT": "Tekst",
-		"LABEL_ADV_HAS_ATTACHMENT": "Har vedlegg",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Har vedlegg",
-		"LABEL_ADV_FLAGGED": "Stjernemerket",
-		"LABEL_ADV_UNSEEN": "Ulest",
-		"LABEL_ADV_DATE": "Dato",
-		"LABEL_ADV_DATE_ALL": "Alle",
-		"LABEL_ADV_DATE_3_DAYS": "Inntil 3 dager gamle",
-		"LABEL_ADV_DATE_7_DAYS": "Inntil 1 uke gamle",
-		"LABEL_ADV_DATE_MONTH": "Inntil 1 måned gamle",
-		"LABEL_ADV_DATE_3_MONTHS": "Inntil 3 måneder gamle",
-		"LABEL_ADV_DATE_6_MONTHS": "Inntil 6 måneder gamle",
-		"LABEL_ADV_DATE_YEAR": "Inntil 1 år gamle",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Lukk (Esc)",
-		"GALLERY_PREV": "Forrige (venstre piltast)",
-		"GALLERY_NEXT": "Neste (høyre piltast)",
-		"GALLERY_COUNTER": "%curr% av %total%"
+		"TEXT": "Tekst",
+		"HAS_ATTACHMENT": "Har vedlegg",
+		"FLAGGED": "Stjernemerket",
+		"UNSEEN": "Ulest",
+		"DATE": "Dato",
+		"DATE_ALL": "Alle",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Inntil 3 dager gamle",
+		"SINCE_7_DAYS": "Inntil 1 uke gamle",
+		"SINCE_MONTH": "Inntil 1 måned gamle",
+		"SINCE_3_MONTHS": "Inntil 3 måneder gamle",
+		"SINCE_6_MONTHS": "Inntil 6 måneder gamle",
+		"SINCE_YEAR": "Inntil 1 år gamle",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "Alle",
+		"SUBFOLDERS_SUBTREE_ONE": "Ett nivå",
+		"REPLIED": "Besvart",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Skriv",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Papirkurv",
 		"ARCHIVE_NAME": "Arkiv"
 	},
-	"QUOTA": {
-		"TITLE": "Kvote bruk"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Hent nye meldinger",
@@ -99,25 +118,28 @@
 		"MENU_SELECT_SEEN": "Lest",
 		"MENU_SELECT_FLAGGED": "Stjernemerket",
 		"MENU_SELECT_UNFLAGGED": "Ikke stjernemerket",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tom liste",
 		"EMPTY_SEARCH_LIST": "Søket ga ingen treff.",
 		"SEARCH_RESULT_FOR": "Søketreff for «%SEARCH%»",
 		"BACK_TO_MESSAGE_LIST": "tilbake til meldingsliste",
-		"EMPTY_SUBJECT_TEXT": "(uten emne)",
 		"PUT_MESSAGE_HERE": "Dra en melding hit for å vise den i lista",
 		"TODAY_AT": "i dag, %TIME%",
 		"YESTERDAY_AT": "i går, %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Du har %count% nye meldinger",
 		"QUOTA_SIZE": "Bruker <strong> %SIZE% ( %PROC%% ) <\/strong> av <strong> %LIMIT% <\/strong>",
 		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "Dato, stigende",
+		"SORT_DATE_DESC": "Dato, synkende",
+		"SORT_SIZE_ASC": "Størrelse, stigende",
+		"SORT_SIZE_DESC": "Størrelse, synkende",
+		"SORT_SUBJECT_ASC": "Emne, A-Z",
+		"SORT_SUBJECT_DESC": "Emne, Z-A",
+		"SORT_FROM_ASC": "Fra A til Z",
+		"SORT_FROM_DESC": "Fra Z til A"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Rediger",
@@ -136,8 +158,9 @@
 		"BUTTON_THREAD_MORE": "Flere meldinger",
 		"MENU_HEADERS": "Vis meldingshoder",
 		"MENU_VIEW_ORIGINAL": "Vis original",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Vis HTML-melding",
+		"PLAIN_VIEW": "Vis ren tekst",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Last ned som .eml-fil",
 		"MENU_FILTER_SIMILAR": "Filtrer slike meldinger",
 		"MENU_PRINT": "Skriv ut",
@@ -149,8 +172,21 @@
 		"MESSAGE_VIEW_DESC": "Trykk på en melding for å lese den",
 		"MESSAGE_VIEW_MOVE_DESC": "Trykk på mappenavn i panelet til venstre for å velge mål.",
 		"LINK_DOWNLOAD_AS_ZIP": "Last ned som zip-fil",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"SPAM_SCORE": "Søppelvurdering",
+		"HAS_VIRUS_WARNING": "ADVARSEL: virus oppdaget",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Lesebekreftelse (meldinga er lest) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Søker …"
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Legg til kontakt",
 		"BUTTON_CREATE_CONTACT": "Lag",
-		"BUTTON_UPDATE_CONTACT": "Oppdater",
 		"BUTTON_IMPORT": "Importer (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Eksporter (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Eksporter (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Fant ingen kontakter",
 		"CLEAR_SEARCH": "Tøm søk",
 		"CONTACT_VIEW_DESC": "Velg en kontakt i lista",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Nettside",
 		"LABEL_BIRTHDAY": "Bursdag",
-		"LINK_ADD_EMAIL": "Legg til e-postadresse",
-		"LINK_ADD_PHONE": "Legg til telefon",
-		"LINK_BIRTHDAY": "Bursdag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Visningsnavn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Etternavn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Fornavn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Kallenavn",
+		"DISPLAY_NAME": "Visningsnavn",
+		"LAST_NAME": "Etternavn",
+		"FIRST_NAME": "Fornavn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Kallenavn",
 		"LABEL_READ_ONLY": "Skrivebeskyttet",
-		"LABEL_SHARE": "Del",
 		"ADD_MENU_LABEL": "Legg til",
 		"ADD_MENU_NICKNAME": "Kallenavn",
-		"ADD_MENU_NOTES": "Notater",
+		"ADD_MENU_NOTE": "Notater",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresse",
 		"ADD_MENU_BIRTHDAY": "Bursdag",
 		"ADD_MENU_TAGS": "Tagger",
 		"BUTTON_SHARE_ALL": "Alle",
-		"BUTTON_SYNC": "Synkronisering (CardDAV)"
+		"BUTTON_SYNC": "Synkronisering (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Vis alle felt",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ingen vedlegg.",
 		"ATTACHMENTS_ERROR_DESC": "Advarsel: ett eller flere vedlegg er ikke blitt lastet opp enda.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ett eller flere vedlegg er ikke blitt lastet opp enda",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk",
 		"BUTTON_REQUEST_READ_RECEIPT": "Be om en bekreftelse fra mottaker på at meldinga er lest",
 		"BUTTON_MARK_AS_IMPORTANT": "Marker som viktig",
-		"BUTTON_REQUEST_DSN": "Be om leveringsbekreftelse"
+		"BUTTON_REQUEST_DSN": "Be om leveringsbekreftelse",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nei",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Er du sikker på at du vil lukke dette vinduet?",
 		"DESC_WANT_DELETE_MESSAGES": "Er du sikker på at du vil slette meldingen(e)?"
 	},
@@ -226,18 +273,18 @@
 	"POPUPS_ADD_ACCOUNT": {
 		"TITLE_ADD_ACCOUNT": "Legg til konto",
 		"BUTTON_ADD_ACCOUNT": "Legg til",
-		"TITLE_UPDATE_ACCOUNT": "Oppdater konto",
-		"BUTTON_UPDATE_ACCOUNT": "Oppdater"
+		"TITLE_UPDATE_ACCOUNT": "Oppdater konto"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Vil du legge til en identitet?",
+		"TITLE_ADD_IDENTITY": "Vil du legge til en identitet",
 		"TITLE_UPDATE_IDENTITY": "Oppdater identitet",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Legg til",
-		"BUTTON_UPDATE_IDENTITY": "Oppdater",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Legg til denne signaturen før sitert tekst"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Vil du lage en mappe?",
+		"TITLE_CREATE_FOLDER": "Vil du lage en mappe",
 		"LABEL_PARENT": "Forelder",
 		"BUTTON_CREATE": "Lag",
 		"TITLE_CREATING_PROCESS": "Lager mappe"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Hvis du går videre, blir meldingene slettet for godt.",
 		"TITLE_CLEARING_PROCESS": "Tømmer mappe …"
 	},
+	"CRYPTO": {
+		"SIGN": "Signer",
+		"ENCRYPT": "Krypter",
+		"DECRYPT": "Dekrypter",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Gyldig signatur fra %USER%",
+		"ERROR": "%TYPE%-feil: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importer OpenPGP-nøkkel",
 		"POPUP_IMPORT_BUTTON": "Importer",
@@ -257,19 +319,25 @@
 		"POPUP_GENERATE_TITLE": "Lag OpenPGP-nøkler",
 		"POPUP_GENERATE_BUTTON": "Lag",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Signer",
-		"LABEL_ENCRYPT": "Krypter",
-		"BUTTON_DECRYPT": "Dekrypter",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP-signert melding",
 		"ENCRYPTED_MESSAGE": "OpenPGP-kryptert melding",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Gyldig signatur fra %USER%",
-		"ERROR": "OpenPGP-feil: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME-signert melding",
+		"ENCRYPTED_MESSAGE": "S\/MIME-kryptert melding",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Vil du lage et filter?",
+		"TITLE_CREATE_FILTER": "Vil du lage et filter",
 		"TITLE_EDIT_FILTER": "Oppdater filter",
 		"LEGEND_CONDITIONS": "Betingelser",
 		"LEGEND_ACTIONS": "Handlinger",
@@ -281,7 +349,7 @@
 		"SELECT_ACTION_DISCARD": "Forkast",
 		"SELECT_FIELD_RECIPIENTS": "Hoved- eller kopimottaker",
 		"SELECT_FIELD_HEADER": "Meldingshode",
-		"SELECT_FIELD_BODY": "Body",
+		"SELECT_FIELD_BODY": "Brødtekst",
 		"SELECT_FIELD_SIZE": "Størrelse",
 		"SELECT_TYPE_CONTAINS": "Inneholder",
 		"SELECT_TYPE_NOT_CONTAINS": "Inneholder ikke",
@@ -294,13 +362,13 @@
 		"SELECT_TYPE_OVER": "Større enn",
 		"SELECT_TYPE_UNDER": "Mindre enn",
 		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
+		"SELECT_TYPE_RAW": "Rå",
 		"SELECT_MATCH_ANY": "Samsvarer med én av følgende regler",
 		"SELECT_MATCH_ALL": "Samsvarer med alle følgende regler",
 		"MARK_AS_READ_LABEL": "Merk som lest",
 		"REPLY_INTERVAL_LABEL": "Svar-intervall (dager)",
 		"KEEP_LABEL": "Behold",
-		"STOP_LABEL": "Ikke slutt å bruke regler",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Emne (valgfritt)",
 		"VACATION_MESSAGE_LABEL": "Melding",
 		"VACATION_RECIPIENTS_LABEL": "Mottakere (adskilt med komma)",
@@ -308,12 +376,12 @@
 		"ALL_INCOMING_MESSAGES_DESC": "Alle inngående meldinger"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
+		"TITLE_CREATE": "Lag skript",
+		"TITLE_EDIT": "Rediger skript",
+		"BUTTON_ADD_FILTER": "Legg til filter",
+		"BUTTON_RAW_SCRIPT": "Bruk selvvalgt skript",
+		"CAPABILITY_LABEL": "Muligheter",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Endringer må lagres på tjeneren."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
 		"TITLE_SYSTEM_FOLDERS": "Velg systemmapper",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Det oppstod en ukjent feil under opplasting av fil"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEKST"
+		"PLAIN": "HTML <-> TEKST",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personlig",
-		"LABEL_GENERAL_NAME": "Generelt",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_FOLDERS_NAME": "Mapper",
-		"LABEL_ACCOUNTS_NAME": "Kontoer",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Sikkerhet",
-		"LABEL_THEMES_NAME": "Tema"
+		"GENERAL": "Generelt",
+		"CONTACTS": "Kontakter",
+		"FOLDERS": "Mapper",
+		"ACCOUNTS": "Kontoer",
+		"FILTERS": "Filters",
+		"SECURITY": "Sikkerhet",
+		"THEMES": "Tema"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtre",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
+		"SIMPLE": "Enkel",
+		"ADVANCED": "Avansert",
+		"BUTTON_ADD_SCRIPT": "Legg til skript",
 		"SUBNAME_MOVE_TO": "Flytt til «%FOLDER%»",
 		"SUBNAME_FORWARD_TO": "Videresend til «%EMAIL%»",
 		"SUBNAME_REJECT": "Avvis",
 		"SUBNAME_VACATION_MESSAGE": "Feriemelding",
-		"SUBNAME_DISCARD": "Forkast",
-		"LOADING_PROCESS": "Oppdater filterliste"
+		"SUBNAME_DISCARD": "Forkast"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Sikkerhet",
 		"LABEL_AUTOLOGOUT": "Logg ut automatisk etter",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldri",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minutt(er)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% time(r)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Aldri"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Generelt",
-		"LABEL_LANGUAGE": "Språk",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Utforming",
-		"LABEL_LAYOUT_NO_SPLIT": "Ingen deling",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
-		"LABEL_EDITOR": "Standard tekstbehandler",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Ren tekst",
-		"LABEL_EDITOR_HTML_FORCED": "Html (tvungen)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Ren tekst (tvungen)",
-		"LABEL_VIEW_OPTIONS": "Vis valg",
-		"LABEL_USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste",
-		"LABEL_USE_THREADS": "Bruk tråder",
-		"LABEL_REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
-		"LABEL_SHOW_IMAGES": "Vis alltid eksterne bilder i meldingstekst",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Meldinger per side",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Varsler",
-		"LABEL_SOUND_NOTIFICATION": "Lydvarsel",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blokkert av nettleser)"
+		"LANGUAGE": "Språk",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Utforming",
+		"LAYOUT_NO_SPLIT": "Ingen deling",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikal deling",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontal deling",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Standard tekstbehandler",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Ren tekst",
+		"VIEW_OPTIONS": "Vis valg",
+		"USE_PREVIEW_PANE": "Bruk forhåndsvisningsrute",
+		"HIDE_DELETED_MESSAGES": "Skjul meldinger som er merket for sletting",
+		"USE_CHECKBOXES_IN_LIST": "Vis avkrysningsbokser i liste",
+		"USE_THREADS": "Bruk tråder",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Legg svar i samme mappe som opprinnelig melding",
+		"PREFER_HTML": "Foretrekk HTML fremfor",
+		"PREFER_HTML_INFO": "Meldinger kan ankomme i både HTML og ren tekst. Dette valget styrer hvilken av dem du vil se.",
+		"REMOVE_COLORS": "Fjern bakgrunn og tekstfarger fra brødtekst",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Meldinger per side",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Marker melding som lest etter",
+		"MSG_DEFAULT_ACTION": "Default action",
+		"SECONDS": "sekunder",
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Varsler",
+		"SOUND_NOTIFICATION": "Lydvarsel",
+		"CHROME_NOTIFICATION_DESC": "Vis sprettopp-varsel om nye meldinger",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(blokkert av nettleser)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Legg til mottakere i adresseboka automatisk",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Tjener",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Nettadresse til adressebok",
 		"LABEL_CONTACTS_SYNC_USER": "Bruker",
-		"SYNC_NO": "Nei",
-		"SYNC_YES": "Ja",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Skrivebeskyttet"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tema",
-		"LEGEND_THEMES_CUSTOM": "Selvvalgt tema",
-		"LABEL_CUSTOM_TYPE": "Type",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lys",
-		"LABEL_CUSTOM_TYPE_DARK": "Mørk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrunn",
+		"LABEL_BACKGROUND": "Bakgrunn",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Last opp bakgrunnsbilde (.jpg eller .png)",
 		"ERROR_FILE_IS_TOO_BIG": "Fila er for stor (1mb +)",
 		"ERROR_FILE_TYPE_ERROR": "Ugyldig filtype (bruk .jpg eller .png)",
@@ -435,15 +540,16 @@
 		"TO_MANY_FOLDERS_DESC_2": "For å unngå ytelsesproblemer får du bare se noen av dem.",
 		"HELP_DELETE_FOLDER": "Slett mappe",
 		"HELP_SHOW_HIDE_FOLDER": "Vis\/skjul mappe",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Se\/ikke se etter nye meldinger",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Se etter nye meldinger",
+		"HIDE_UNSUBSCRIBED": "Skjul mapper som bruker ikke abonnerer på",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+		"TYPE_CALENDAR": "Kalender",
+		"TYPE_CONFIGURATION": "Oppsett",
+		"TYPE_CONTACTS": "Kontakter",
+		"TYPE_FILES": "Filer",
 		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
+		"TYPE_NOTES": "Notater",
+		"TYPE_TASKS": "Oppgaver"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "Kontoer",
@@ -452,15 +558,15 @@
 		"BUTTON_ADD_ACCOUNT": "Legg til konto",
 		"BUTTON_ADD_IDENTITY": "Legg til identitet",
 		"LOADING_PROCESS": "Oppdaterer …",
-		"DEFAULT_IDENTITY_LABEL": "Standard"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importer nøkkel",
 		"BUTTON_GENERATE_KEY_PAIR": "Lag nøkler",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Offentlig",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Lagre utkast automatisk",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Få nettlesertillegg Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Tastatursnarveier",
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Svar alle",
 		"LABEL_FORWARD": "Videresend",
 		"LABEL_FORWARD_MULTIPLY": "Videresend som vedlegg",
-		"LABEL_HELP": "Hjelp",
 		"LABEL_CHECK_ALL": "Merk alle meldinger",
 		"LABEL_DELETE": "Slett",
 		"LABEL_OPEN_THREAD": "Åpne valgt tråd",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Vis\/skjul sitert melding",
 		"LABEL_THREAD_NEXT": "Neste melding i tråd",
 		"LABEL_THREAD_PREV": "Forrige melding i tråd",
-		"LABEL_PRINT": "Skriv ut",
 		"LABEL_EXIT_FULLSCREEN": "Avslutt fullskjerm-modus",
 		"LABEL_CLOSE_MESSAGE": "Lukk melding",
 		"LABEL_SWITCH_TO_LIST": "Flytt fokus til meldingsliste",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Lukk ny melding"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ugyldig info",
-		"AUTH_ERROR": "Autentisering mislyktes",
-		"CONNECTION_ERROR": "Klarte ikke å koble til tjeneren",
-		"DOMAIN_ALREADY_EXISTS": "Domenet finnes allerede",
-		"DOMAIN_NOT_ALLOWED": "Dette domenet tillates ikke",
-		"ACCOUNT_NOT_ALLOWED": "Denne kontoen tillates ikke",
-		"CONTACTS_SYNC_ERROR": "Synkronisering av kontakter mislyktes",
-		"CANT_GET_MESSAGE_LIST": "Klarte ikke å hente liste over meldinger",
-		"CANT_GET_MESSAGE": "Klarte ikke å hente melding",
-		"CANT_DELETE_MESSAGE": "Klarte ikke å slette melding",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Klarte ikke å flytte melding",
-		"CANT_SAVE_MESSAGE": "Klarte ikke å lagre melding",
-		"CANT_SEND_MESSAGE": "Klarte ikke å sende melding",
-		"INVALID_RECIPIENTS": "Ugyldige mottakere",
-		"CANT_SAVE_FILTERS": "Klarte ikke å lagre filtre",
-		"CANT_GET_FILTERS": "Klarte ikke å hente filtre",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Feilutformet filter",
-		"CANT_CREATE_FOLDER": "Klarte ikke å lage mappe",
-		"CANT_RENAME_FOLDER": "Klarte ikke å endre navn på mappe",
-		"CANT_DELETE_FOLDER": "Klarte ikke å slette mappe",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Du må slette mappeinnholdet før du kan slette mappa",
-		"CANT_SUBSCRIBE_FOLDER": "Klarte ikke å abonnere på mappe",
-		"CANT_UNSUBSCRIBE_FOLDER": "Klarte ikke å avslutte abonnement",
-		"DEMO_SEND_MESSAGE_ERROR": "Denne demo-kontoen er blokkert fra å sende meldinger til eksterne e-postadresser av sikkerhetshensyn.",
-		"DEMO_ACCOUNT_ERROR": "Av sikkerhetshensyn er denne kontoen blokkert fra å utføre denne handlinga.",
-		"ACCOUNT_ALREADY_EXISTS": "Kontoen finnes allerede",
-		"ACCOUNT_DOES_NOT_EXIST": "Kontoen finnes ikke",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Fikk ikke tilgang til e-posttjener",
-		"INVALID_INPUT_ARGUMENT": "Ugyldig inndata-argument",
-		"UNKNOWN_ERROR": "Ukjent feil"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Ugyldig info",
+		"AuthError": "Autentisering mislyktes",
+		"ConnectionError": "Klarte ikke å koble til tjeneren",
+		"DomainAlreadyExists": "Domenet finnes allerede",
+		"DomainNotAllowed": "Dette domenet tillates ikke",
+		"AccountNotAllowed": "Denne kontoen tillates ikke",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Synkronisering av kontakter mislyktes",
+		"CantGetMessageList": "Klarte ikke å hente liste over meldinger",
+		"CantGetMessage": "Klarte ikke å hente melding",
+		"CantDeleteMessage": "Klarte ikke å slette melding",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Klarte ikke å flytte melding",
+		"CantSaveMessage": "Klarte ikke å lagre melding",
+		"CantSendMessage": "Klarte ikke å sende melding",
+		"InvalidRecipients": "Ugyldige mottakere",
+		"CantSaveFilters": "Klarte ikke å lagre filtre",
+		"CantGetFilters": "Klarte ikke å hente filtre",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Feilutformet filter",
+		"CantCreateFolder": "Klarte ikke å lage mappe",
+		"CantRenameFolder": "Klarte ikke å endre navn på mappe",
+		"CantDeleteFolder": "Klarte ikke å slette mappe",
+		"CantDeleteNonEmptyFolder": "Du må slette mappeinnholdet før du kan slette mappa",
+		"CantSubscribeFolder": "Klarte ikke å abonnere på mappe",
+		"CantUnsubscribeFolder": "Klarte ikke å avslutte abonnement",
+		"DemoSendMessageError": "Denne demo-kontoen er blokkert fra å sende meldinger til eksterne e-postadresser av sikkerhetshensyn.",
+		"DemoAccountError": "Av sikkerhetshensyn er denne kontoen blokkert fra å utføre denne handlinga.",
+		"AccountAlreadyExists": "Kontoen finnes allerede",
+		"AccountDoesNotExist": "Kontoen finnes ikke",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Fikk ikke tilgang til e-posttjener",
+		"InvalidInputArgument": "Ugyldig inndata-argument",
+		"UnknownError": "Ukjent feil"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/static.json b/snappymail/v/0.0.0/app/localization/nl-NL/static.json
deleted file mode 100644
index 9c6623a89..000000000
--- a/snappymail/v/0.0.0/app/localization/nl-NL/static.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"BACK_LINK": "Reload",
-	"NO_SCRIPT_TITLE": "JavaScript is required for this application.",
-	"NO_SCRIPT_DESC": "JavaScript support is not available in your browser.\nPlease enable JavaScript support in your browser settings and retry.\n",
-	"NO_COOKIE_TITLE": "Cookies support is required for this application.",
-	"NO_COOKIE_DESC": "Cookies support is not available in your browser.\nPlease enable Cookie support in your browser settings and retry.\n",
-	"BAD_BROWSER_TITLE": "Your browser is outdated.",
-	"BAD_BROWSER_DESC": "Om alle functies van deze applicatie te gebruiken,\ndownload en installeer een van de volgende browsers:\n"
-}
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json b/snappymail/v/0.0.0/app/localization/nl/admin.json
similarity index 67%
rename from snappymail/v/0.0.0/app/localization/nl-NL/admin.json
rename to snappymail/v/0.0.0/app/localization/nl/admin.json
index e26ab48cd..3570bb04a 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/nl/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Toevoegen",
+		"CLOSE": "Sluiten",
 		"SAVE": "Opslaan",
-		"UPDATE": "Updaten"
+		"TEST": "Test",
+		"UPDATE": "Updaten",
+		"USERNAME": "Gebruikersnaam",
+		"PASSWORD": "Wachtwoord",
+		"CANCEL": "Annuleer",
+		"SEARCH": "Zoeken",
+		"YES": "Ja",
+		"NO": "Nee"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Inlognaam",
-		"LABEL_PASSWORD": "Wachtwoord",
 		"LABEL_TOTP": "TOTP-code",
 		"BUTTON_LOGIN": "Aanmelden in het beheer paneel"
 	},
@@ -13,41 +21,39 @@
 		"LABEL_ADMIN_PANEL": "Beheer paneel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Algemeen",
-		"LABEL_LOGIN_NAME": "Inlogscherm",
-		"LABEL_BRANDING_NAME": "Huisstijl",
-		"LABEL_CONTACTS_NAME": "Contactpersonen",
-		"LABEL_DOMAINS_NAME": "Domeinen",
-		"LABEL_SECURITY_NAME": "Beveiliging",
-		"LABEL_PACKAGES_NAME": "Extensies",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Over"
+		"GENERAL": "Algemeen",
+		"LOGIN": "Inlogscherm",
+		"BRANDING": "Huisstijl",
+		"CONTACTS": "Contactpersonen",
+		"DOMAINS": "Domeinen",
+		"SECURITY": "Beveiliging",
+		"PACKAGES": "Extensies",
+		"CONFIG": "Configuratie",
+		"ABOUT": "Over"
 	},
 	"TAB_GENERAL": {
-		"LEGEND_INTERFACE": "Interface",
+		"LEGEND_INTERFACE": "Omgeving",
 		"LABEL_LANGUAGE": "Taal",
 		"LABEL_LANGUAGE_ADMIN": "Taal (admin)",
 		"LABEL_THEME": "Thema",
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Sta taalselectie toe in het instellingen scherm",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Sta thema selectie toe in het instellingen scherm",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Sta achtergrond selectie toe in het instellingen scherm",
-		"LABEL_NEW_FOLDER_MOVE": "Nieuwe \"verplaats naar map\" knop",
 		"LABEL_SHOW_THUMBNAILS": "Toon miniaturen (bijlage)",
 		"LEGEND_MAIN": "Diverse",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Maximale bijlage grootte",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Sta extra accounts toe",
 		"LABEL_ALLOW_IDENTITIES": "Meerdere identiteiten toestaan",
-		"ALERT_DATA_ACCESS": "Data folder is accessible. Please configure your web server to hide the data folder from external access. Read more here:",
+		"ALERT_DATA_ACCESS": "Gegevensmap is toegankelijk. Configureer uw webserver om de gegevensmap te verbergen voor externe toegang. Lees hier meer:",
 		"ALERT_WARNING": "Waarschuwing!",
-		"HTML_ALERT_WEAK_PASSWORD": "U gebruikt het standaard beheer wachtwoord.\n<br>\n<strong><a href=\"#\/security\">Wijzig<\/a><\/strong>\na.u.b. voor uw veiligheid direct het wachtwoord.\n"
+		"HTML_ALERT_WEAK_PASSWORD": "U gebruikt het standaard beheer wachtwoord.\n<br>\n<strong><a href=\"#\/security\">Wijzig<\/a><\/strong>\na.u.b. voor uw veiligheid direct het wachtwoord."
 	},
 	"TAB_LOGIN": {
 		"LEGEND_LOGIN_SCREEN": "Inlogscherm",
 		"LABEL_DEFAULT_DOMAIN": "Standaard domein",
 		"LABEL_DETERMINE_USER_DOMAIN": "Probeer gebruikersdomein te bepalen",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Sta taal selectie toe in het login scherm",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Probeer gebruiker taal te bepalen",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Verberg de 'Aanmelden' knop"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Probeer gebruiker taal te bepalen"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Huisstijl",
@@ -64,31 +70,30 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Gebruikersnaam",
 		"LABEL_STORAGE_PASSWORD": "Wachtwoord",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Gebruik een globale database in plaats van per account",
 		"ALERT_NOTICE": "Aandacht!",
+		"SUGGESTIONS_LIMIT": "Suggesties limiet",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Gegruik deze database soort niet met een groot aantal actieve gebrukers.",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "Uw systeem ondersteund geen contactpersonen.\n<br>\nU moet een <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extentie op uw server installeren of activeren.\n"
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Uw systeem ondersteund geen contactpersonen.\n<br>\nU moet een <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extentie op uw server installeren of activeren."
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Domeinen",
 		"BUTTON_ADD_DOMAIN": "Domein toevoegen",
 		"BUTTON_ADD_ALIAS": "Voeg alias toe",
 		"DELETE_ARE_YOU_SURE": "Weet u het zeker?",
-		"HTML_DOMAINS_HELPER": "Lijst van toegestane domeinen.\n<br>\nKlik op de domeinnaam om deze te configureren.\n"
+		"HTML_DOMAINS_HELPER": "Lijst van toegestane domeinen.\n<br>\nKlik op de domeinnaam om deze te configureren."
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Beveiliging",
 		"LABEL_USE_IMAGE_PROXY": "Gebruik de server als proxy voor externe afbeeldingen",
-		"LABEL_ALLOW_OPEN_PGP": "OpenPGP toestaan",
+		"LABEL_AUTO_VERIFY": "Ondertekening automatisch verifiëren",
 		"LABEL_SHOW_PHP_INFO": "PHP informatie tonen",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Toegangsgegevens beheer paneel",
 		"LABEL_CURRENT_PASSWORD": "Huidig wachtwoord",
-		"LABEL_NEW_LOGIN": "Nieuwe gebruikersnaam",
 		"LABEL_NEW_PASSWORD": "Nieuw wachtwoord",
 		"LABEL_REPEAT_PASSWORD": "Herhaal nieuw wachtwoord",
-		"BUTTON_UPDATE_PASSWORD": "Gegevens bijwerken",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Verificatie van SSL certificaten (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Verificatie van SSL certificaten",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Sta zelf ondertekende certificaten toe"
 	},
 	"TAB_PACKAGES": {
@@ -103,18 +108,16 @@
 		"LABEL_TAG_HINT": "Simpel, modern en snelle web-based e-mail client",
 		"LABEL_ALL_RIGHTS_RESERVED": "Alle rechten voorbehouden.",
 		"HINT_READ_CHANGE_LOG": "Lees a.u.b. het veranderingen logboek alvorens te updaten.",
-		"HINT_IS_UP_TO_DATE": "De laatste versie van RainLoop is geïnstalleerd.",
+		"HINT_IS_UP_TO_DATE": "De laatste versie van SnappyMail is geïnstalleerd.",
 		"HTML_NEW_VERSION": "Een nieuwe versie <b>%VERSION%<\/b> is beschikbaar.",
 		"LABEL_UPDATING": "Bezig met updaten",
 		"LABEL_CHECKING": "Controleren op updates",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Uitgaven"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Voeg alias toe",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domein",
-		"BUTTON_CLOSE": "Sluiten",
-		"BUTTON_ADD": "Toevoegen"
+		"LABEL_DOMAIN": "Domein"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Voeg domein toe",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Pas domein \"%NAME%\" aan",
 		"LABEL_NAME": "Naam",
 		"NAME_HELPER": "ondersteunt joker tekens",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Poort",
 		"LABEL_SECURE": "Encryptie",
-		"LABEL_WHITE_LIST": "Witte lijst",
+		"TIMEOUT": "Time-out",
+		"DISABLE_CAPABILITIES": "Mogelijkheden uitschakelen",
+		"LIMITS": "Limieten",
+		"FOLDERS": "Mappen",
+		"MESSAGES": "Berichten",
 		"SECURE_OPTION_NONE": "Geen",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Sta Sieve scripts toe",
 		"LABEL_USE_SHORT_LOGIN": "Gebruik verkorte login",
+		"LABEL_LOWERCASE_LOGIN": "Kleine letters login (hoofdletterongevoelig)",
 		"LABEL_USE_AUTH": "Gebruik authenticatie",
 		"LABEL_SET_SENDER": "Gebruik login als verzender",
+		"LABEL_AUTH_PLAIN_LINE": "Forceer een enkele opdracht AUTH PLAIN-aanmelding",
 		"LABEL_USE_PHP_MAIL": "Gebruik php mail() functie",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Witte lijst",
-		"BUTTON_SIEVE_CONFIGURATION": "Sieve configuratie",
-		"BUTTON_BACK_TO_IMAP": "Terug naar IMAP instellingen",
-		"BUTTON_BACK": "Terug",
-		"BUTTON_CLOSE": "Annuleer",
-		"BUTTON_ADD": "Toevoegen",
-		"BUTTON_UPDATE": "Update",
-		"NEW_DOMAIN_DESC": "Dit domein stelt u in staat om <br>met <i>%NAME%<\/i> e-mail adressen te werken.",
-		"WHITE_LIST_ALERT": "Lijst van gebruikers die dit domein mogen gebruiken.\nGebruik een spatie als scheidingsteken.\n"
+		"NEW_DOMAIN_DESC": "Dit domein stelt u in staat om met <strong>%NAME%<\/strong> e-mail adressen te werken.",
+		"WHITE_LIST_ALERT": "Lijst van gebruikers die dit domein mogen gebruiken.\nGebruik een spatie als scheidingsteken.",
+		"VALID_SPAM_HEADERS": "Valide SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valide virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Extensie",
-		"DESC_NOTHING_TO_CONFIGURE": "Niets om te configureren",
-		"BUTTON_CLOSE": "Annuleer"
+		"DESC_NOTHING_TO_CONFIGURE": "Niets om te configureren"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nee",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Weet u zeker dat u dit venster wilt stuiten?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "bèta",
-		"UNSTABLE": "onstabiel",
 		"WARNING": "Waarschuwing!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Onbekende fout"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Onjuiste token",
-		"AUTH_ERROR": "Authenticatie mislukt",
-		"DOMAIN_ALREADY_EXISTS": "Domein bestaat al",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Kan instellingen niet opslaan",
-		"CANT_INSTALL_PACKAGE": "Extensie installeren mislukt",
-		"CANT_DELETE_PACKAGE": "Extensie verwijderen mislukt",
-		"INVALID_PLUGIN_PACKAGE": "Onjuist extensie pakket",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Niet ondersteund extensie pakket",
-		"UNKNOWN_ERROR": "Unknown error"
+		"RequestError": "Aanvraag mislukt",
+		"RequestAborted": "Aanvraag is afgebroken",
+		"RequestTimeout": "Aanvraag verlopen",
+		"InvalidToken": "Onjuiste token",
+		"AuthError": "Authenticatie mislukt",
+		"DomainAlreadyExists": "Domein bestaat al",
+		"CantSavePluginSettings": "Kan instellingen niet opslaan",
+		"CantInstallPackage": "Extensie installeren mislukt",
+		"CantDeletePackage": "Extensie verwijderen mislukt",
+		"InvalidPluginPackage": "Onjuist extensie pakket",
+		"UnsupportedPluginPackage": "Niet ondersteund extensie pakket",
+		"UnknownError": "Onbekende fout"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/nl/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/nl-NL/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/nl/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/nl/static.json b/snappymail/v/0.0.0/app/localization/nl/static.json
new file mode 100644
index 000000000..d77c47368
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/nl/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Reload",
+	"NO_SCRIPT_TITLE": "JavaScript is required for this application.",
+	"NO_SCRIPT_DESC": "JavaScript support is not available in your browser.\nPlease enable JavaScript support in your browser settings and retry.",
+	"NO_COOKIE_TITLE": "Cookie-ondersteuning is vereist voor deze applicatie.",
+	"NO_COOKIE_DESC": "Cookie-ondersteuning is niet beschikbaar in uw browser.\nSchakel Cookie-ondersteuning in uw browserinstellingen in en probeer het opnieuw.",
+	"BAD_BROWSER_TITLE": "Uw browser is te oud.",
+	"BAD_BROWSER_DESC": "Om alle functies van deze applicatie te gebruiken,\ndownload en installeer een van de nieuwste browsers."
+}
diff --git a/snappymail/v/0.0.0/app/localization/nl-NL/user.json b/snappymail/v/0.0.0/app/localization/nl/user.json
similarity index 56%
rename from snappymail/v/0.0.0/app/localization/nl-NL/user.json
rename to snappymail/v/0.0.0/app/localization/nl/user.json
index 91d4b6c42..25964de24 100644
--- a/snappymail/v/0.0.0/app/localization/nl-NL/user.json
+++ b/snappymail/v/0.0.0/app/localization/nl/user.json
@@ -1,15 +1,17 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archiveren",
 		"ARE_YOU_SURE": "Weet u het zeker?",
 		"BACK": "Terug",
 		"BCC": "BCC",
 		"CANCEL": "Annuleer",
-		"CC": "Cc",
+		"CC": "CC",
 		"CLEAR": "Wissen",
 		"CLOSE": "Sluiten",
 		"CONTACTS": "Contactpersonen",
 		"DELETE": "Verwijder",
+		"UNDELETE": "Verwijdering annuleren",
 		"DONE": "Klaar",
 		"EMAIL": "E-mailadres",
 		"FROM": "Van",
@@ -17,17 +19,32 @@
 		"LOGOUT": "Uitloggen",
 		"MORE": "Meer",
 		"MOVE_TO": "Verplaats naar",
+		"COPY_TO": "Kopiëren naar",
 		"NAME": "Naam",
 		"NONE": "Geen",
+		"TO_SPAM": "Verplaats bericht(en) naar Spam",
 		"NOT_SPAM": "Geen ongewenste e-mail",
+		"USERNAME": "Gebruikersnaam",
 		"PASSWORD": "Wachtwoord",
+		"REMEMBER": "Onthouden",
+		"REMEMBER_FOR_SESSION": "Onthoud voor deze sessie",
+		"REMEMBER_PERMANENT": "Onthoud permanent",
 		"REPLY_TO": "Antwoordadres",
 		"SAVE": "Opslaan",
+		"SAVE_CHANGES": "Wijzigingen opslaan?",
 		"SEARCH": "Zoeken",
 		"SPAM": "Ongewenste e-mail",
 		"SUBJECT": "Onderwerp",
 		"TEST": "Test",
-		"TO": "Naar"
+		"TO": "Naar",
+		"SERVER_MESSAGE": "Server bericht",
+		"YES": "Ja",
+		"NO": "Nee",
+		"INACTIVE": "Inactief",
+		"DEFAULT": "standaard",
+		"HELP": "Help",
+		"TEXT": "Tekst",
+		"ATTACHMENTS": "Bijlagen"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Inlognaam",
@@ -35,41 +52,34 @@
 		"BUTTON_SIGN_IN": "Aanmelden"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Account toevoegen",
-		"BUTTON_SETTINGS": "Instellingen",
-		"BUTTON_HELP": "Help"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobiele versie",
-		"BUTTON_DESKTOP_VERSION": "Desktop versie"
+		"BUTTON_ADD_ACCOUNT": "Account toevoegen"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Geavanceerd zoeken",
-		"LABEL_ADV_TEXT": "Tekst",
-		"LABEL_ADV_HAS_ATTACHMENT": "Heeft bijlage",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Heeft bijlages",
-		"LABEL_ADV_FLAGGED": "Gemarkeerd",
-		"LABEL_ADV_UNSEEN": "Ongelezen",
-		"LABEL_ADV_DATE": "Datum",
-		"LABEL_ADV_DATE_ALL": "Alles",
-		"LABEL_ADV_DATE_3_DAYS": "Tot 3 dagen oud",
-		"LABEL_ADV_DATE_7_DAYS": "Tot 1 week oud",
-		"LABEL_ADV_DATE_MONTH": "Tot 1 maand oud",
-		"LABEL_ADV_DATE_3_MONTHS": "Tot 3 maanden oud",
-		"LABEL_ADV_DATE_6_MONTHS": "Tot 6 maanden oud",
-		"LABEL_ADV_DATE_YEAR": "Tot 1 jaar oud",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Schakel volledig scherm in\/uit",
-		"ZOOM": "Zoom in\/uit",
-		"CLOSE": "Sluiten (Esc)",
-		"GALLERY_PREV": "Vorige (Linker Pijl toets)",
-		"GALLERY_NEXT": "Volgende (Rechter Pijl toets)",
-		"GALLERY_COUNTER": "%curr% van %total%"
+		"TEXT": "Tekst",
+		"HAS_ATTACHMENT": "Heeft bijlage(s)",
+		"FLAGGED": "Gemarkeerd",
+		"UNSEEN": "Ongelezen",
+		"DATE": "Datum",
+		"DATE_ALL": "Alles",
+		"BEFORE_3_DAYS": "Ouder dan 3 dagen",
+		"BEFORE_7_DAYS": "Ouder dan 1 week",
+		"BEFORE_MONTH": "Ouder dan 1 maand",
+		"BEFORE_3_MONTHS": "Ouder dan 3 maanden",
+		"BEFORE_6_MONTHS": "Ouder dan 6 maanden",
+		"BEFORE_YEAR": "Ouder dan 1 jaar",
+		"SINCE_3_DAYS": "Tot 3 dagen oud",
+		"SINCE_7_DAYS": "Tot 1 week oud",
+		"SINCE_MONTH": "Tot 1 maand oud",
+		"SINCE_3_MONTHS": "Tot 3 maanden oud",
+		"SINCE_6_MONTHS": "Tot 6 maanden oud",
+		"SINCE_YEAR": "Tot 1 jaar oud",
+		"SUBFOLDERS": "Submappen",
+		"SUBFOLDERS_NONE": "Geen",
+		"SUBFOLDERS_SUBTREE": "Alle",
+		"SUBFOLDERS_SUBTREE_ONE": "Één niveau",
+		"REPLIED": "Beantwoord",
+		"KEYWORD": "Label"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Nieuw bericht",
@@ -80,8 +90,19 @@
 		"TRASH_NAME": "Verwijderde items",
 		"ARCHIVE_NAME": "Archief"
 	},
-	"QUOTA": {
-		"TITLE": "Quota gebruik"
+	"IMAP": {
+		"ACL_RIGHTS": "Rechten",
+		"ACL_A": "Beheren",
+		"ACL_E": "Uitwissen",
+		"ACL_I": "Berichten toevoegen",
+		"ACL_K": "Submappen maken",
+		"ACL_L": "Toon berichten",
+		"ACL_P": "Verstuur mail",
+		"ACL_R": "Map selecteren",
+		"ACL_S": "\\SEEN label",
+		"ACL_T": "\\DELETED label",
+		"ACL_W": "Andere labels",
+		"ACL_X": "Map verwijderen\/hernoemen"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Berichten controleren",
@@ -99,17 +120,20 @@
 		"MENU_SELECT_SEEN": "Gelezen",
 		"MENU_SELECT_FLAGGED": "Met Vlag",
 		"MENU_SELECT_UNFLAGGED": "Zonder Vlag",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download alle bijlagen",
 		"EMPTY_LIST": "Geen berichten",
 		"EMPTY_SEARCH_LIST": "Geen items gevonden",
 		"SEARCH_RESULT_FOR": "Zoekresultaten voor \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "terug naar berichtenlijst",
-		"EMPTY_SUBJECT_TEXT": "(Geen onderwerp)",
 		"PUT_MESSAGE_HERE": "Sleep bericht hier om ze te bekijken in de lijst",
 		"TODAY_AT": "vandaag om %TIME%",
 		"YESTERDAY_AT": "gisteren om %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "U heeft %COUNT% nieuwe berichten!",
 		"QUOTA_SIZE": "U gebruikt <strong>%SIZE% (%PROC%%)<\/strong> van <strong>%LIMIT%<\/strong>",
 		"SORT": "Sorteren",
+		"NO_SORT": "Mail server ondersteund sorteren niet",
+		"SORT_ARRIVAL_ASC": "Ontvangen oplopend",
+		"SORT_ARRIVAL_DESC": "Ontvangen aflopend",
 		"SORT_DATE_ASC": "Datum oplopend",
 		"SORT_DATE_DESC": "Datum aflopend",
 		"SORT_SIZE_ASC": "Grootte oplopend",
@@ -136,8 +160,9 @@
 		"BUTTON_THREAD_MORE": "Meer berichten",
 		"MENU_HEADERS": "Toon berichtkoppen",
 		"MENU_VIEW_ORIGINAL": "Toon origineel",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
+		"HTML_VIEW": "Bekijk HTML bericht",
+		"PLAIN_VIEW": "Bekijk platte tekst bericht",
+		"SWAP_COLORS": "Verwissel standaard (achtergrond)kleur",
 		"MENU_DOWNLOAD_ORIGINAL": "Download als .eml bestand",
 		"MENU_FILTER_SIMILAR": "Filter gelijksoortige berichten",
 		"MENU_PRINT": "Afdrukken",
@@ -150,19 +175,42 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klik op de doel map in het linker paneel.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download als zip",
 		"SPAM_SCORE": "Spamscore",
-		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd"
+		"HAS_VIRUS_WARNING": "WAARSCHUWING: virus gedetecteerd",
+		"TAGS": "Labels",
+		"NEW_TAG": "Nieuw label",
+		"ENABLE_TRACKING_LINKS": "Schakel trackinglinks in",
+		"TRACKING_ENABLED": "Links worden nu bijgehouden wanneer erop wordt geklikt!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Belangrijk",
+		"$todo": "Te doen",
+		"$label1": "Belangrijk",
+		"$label2": "Werk",
+		"$label3": "Persoonlijk",
+		"$label4": "Te doen",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Ontvangstbevestiging (weergegeven) - %SUBJECT%",
-		"BODY": "Dit is een bevestiging dat uw bericht aan %READ-RECEIPT% is ontvangen.\n\nLet op: Deze ontvangstbevestiging bevestigd slechts dat uw bericht was weergegeven op het scherm van de ontvanger.\nEr is geen enkele garantie dat uw bericht is gelezen of begrepen.\n"
+		"BODY": "Dit is een bevestiging dat uw bericht aan %READ-RECEIPT% is ontvangen.\n\nLet op: Deze ontvangstbevestiging bevestigd slechts dat uw bericht was weergegeven op het scherm van de ontvanger.\nEr is geen enkele garantie dat uw bericht is gelezen of begrepen."
 	},
 	"SUGGESTIONS": {
 		"SEARCHING_DESC": "Zoeken..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locaties",
+		"TAB_BUSINESS": "Bedrijf",
+		"LABEL_ORGANIZATION": "Organisatie",
+		"LABEL_DEPARTMENT": "Afdeling",
+		"LABEL_TITLE": "Titel",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Vraag",
+		"NEVER": "Nooit",
+		"ALWAYS": "Altijd",
+		"ALWAYS_IF_POSSIBLE": "Altijd indien mogelijk",
 		"BUTTON_ADD_CONTACT": "Contactpersoon Toevoegen",
 		"BUTTON_CREATE_CONTACT": "Toevoegen",
-		"BUTTON_UPDATE_CONTACT": "Bijwerken",
 		"BUTTON_IMPORT": "Importeer (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exporteer (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exporteer (csv)",
@@ -171,28 +219,26 @@
 		"EMPTY_SEARCH": "Geen items gevonden",
 		"CLEAR_SEARCH": "Wis zoekopdracht",
 		"CONTACT_VIEW_DESC": "Selecteer een contactpersoon in de lijst om hier te bekijken",
-		"LABEL_PHONE": "Telefoon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Geboortedatum",
-		"LINK_ADD_EMAIL": "E-mail adres toevoegen",
-		"LINK_ADD_PHONE": "Telefoonnummer toevoegen",
-		"LINK_BIRTHDAY": "Geboortedatum",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Weergeven als",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Achternaam",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Voornaam",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Bijnaam",
+		"DISPLAY_NAME": "Weergeven als",
+		"LAST_NAME": "Achternaam",
+		"FIRST_NAME": "Voornaam",
+		"MIDDLE_NAME": "Middelste naam",
+		"NAME_PREFIX": "Voorvoegsel",
+		"NAME_SUFFIX": "Achtervoegsel",
+		"NICK_NAME": "Bijnaam",
 		"LABEL_READ_ONLY": "Alleen lezen",
-		"LABEL_SHARE": "Deel",
 		"ADD_MENU_LABEL": "Toevoegen",
 		"ADD_MENU_NICKNAME": "Bijnaam",
-		"ADD_MENU_NOTES": "Notities",
+		"ADD_MENU_NOTE": "Notities",
 		"ADD_MENU_PHONE": "Telefoonnummer",
 		"ADD_MENU_URL": "Webpagina",
 		"ADD_MENU_ADDRESS": "Adres",
 		"ADD_MENU_BIRTHDAY": "Geboortedatum",
 		"ADD_MENU_TAGS": "Labels",
 		"BUTTON_SHARE_ALL": "Iedereen",
-		"BUTTON_SYNC": "Synchroniseren (CardDAV)"
+		"BUTTON_SYNC": "Synchroniseren (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Verzend naar alle e-mailadressen"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Toon alle velden",
@@ -210,13 +256,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Er zijn geen bijlagen",
 		"ATTACHMENTS_ERROR_DESC": "Waarschuwing! Nog niet alle bijlagen zijn klaar met uploaden",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Toevoegen van bijlage(n) is nog niet gereed",
+		"ALLOW_SPELLCHECK": "De browser spellingcontrole toestaan",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatisch opslaan as concept",
 		"BUTTON_REQUEST_READ_RECEIPT": "Leesbevestiging vragen",
 		"BUTTON_MARK_AS_IMPORTANT": "Markeer als belangrijk",
-		"BUTTON_REQUEST_DSN": "Ontvangstbevestiging vragen"
+		"BUTTON_REQUEST_DSN": "Ontvangstbevestiging vragen",
+		"BUTTON_REQUIRE_TLS": "Veilige bezorging vereisen",
+		"ERROR_EMPTY_BODY": "Bericht inhoud is leeg"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nee",
+		"EXIT_ARE_YOU_SURE": "Weet u zeker dat u wilt afsluiten?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Weet u zeker dat u dit venster wilt sluiten?",
 		"DESC_WANT_DELETE_MESSAGES": "Weet u zeker dat u dit\/deze bericht\/berichten wilt verwijderen?"
 	},
@@ -224,20 +273,20 @@
 		"TITLE_LANGUAGES": "Kies uw taal"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Account toevoegen?",
+		"TITLE_ADD_ACCOUNT": "Account toevoegen",
 		"BUTTON_ADD_ACCOUNT": "Toevoegen",
-		"TITLE_UPDATE_ACCOUNT": "Account updaten?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_UPDATE_ACCOUNT": "Account wijzigen"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Identiteit toevoegen?",
-		"TITLE_UPDATE_IDENTITY": "Identiteit bijwerken?",
+		"TITLE_ADD_IDENTITY": "Identiteit toevoegen",
+		"TITLE_UPDATE_IDENTITY": "Identiteit bijwerken",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Toevoegen",
-		"BUTTON_UPDATE_IDENTITY": "Bijwerken",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
+		"SIGNATURE": "Handtekening",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Plaats deze handtekening vóór geciteerde tekst in antwoorden"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Map aanmaken?",
+		"TITLE_CREATE_FOLDER": "Map aanmaken",
 		"LABEL_PARENT": "Bovenliggende map",
 		"BUTTON_CREATE": "Maken",
 		"TITLE_CREATING_PROCESS": "Maak een nieuwe map"
@@ -245,10 +294,25 @@
 	"POPUPS_CLEAR_FOLDER": {
 		"TITLE_CLEAR_FOLDER": "Alle inhoud van deze map verwijderen?",
 		"DANGER_DESC_WARNING": "Opgelet!",
-		"DANGER_DESC_HTML_1": "Deze actie verwijdert alle e-mails in de map <strong>%FOLDER%<\/strong>!",
+		"DANGER_DESC_HTML_1": "Deze actie verwijdert alle e-mails uit de map '<strong>%FOLDER%<\/strong>'!",
 		"DANGER_DESC_HTML_2": "Eens in gang gezet kan het proces niet geannuleerd worden!",
 		"TITLE_CLEARING_PROCESS": "Folder aan het leegmaken..."
 	},
+	"CRYPTO": {
+		"SIGN": "Ondertekenen",
+		"ENCRYPT": "Versleutelen",
+		"DECRYPT": "Ontsleutelen",
+		"VERIFY": "Verifiëren",
+		"GOOD_SIGNATURE": "Juiste ondertekening van %USER%",
+		"ERROR": "%TYPE% foutmelding: %ERROR%",
+		"CREATE_SELF_SIGNED": "Zelfondertekend certificaat aanmaken",
+		"VALID_UNTIL": "Geldig tot",
+		"PRIVATE_KEY": "Privésleutel",
+		"CHANGE_PASS": "Wijzig wachtwoord",
+		"CURRENT_PASS": "Huidige wachtwoord",
+		"NEW_PASS": "Nieuwe wachtwoord",
+		"ASK_CRYPTKEY_PASS": "Uw login wachtwoord is veranderd. Vul uw oude login wachtwoord in om de data te ontsleutelen."
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importeer OpenPGP sleutel",
 		"POPUP_IMPORT_BUTTON": "Importeer",
@@ -257,16 +321,22 @@
 		"POPUP_GENERATE_TITLE": "Genereer OpenPGP sleutels",
 		"POPUP_GENERATE_BUTTON": "Genereer",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Ondertekenen",
-		"LABEL_ENCRYPT": "Versleutelen",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP ondertekend bericht",
 		"ENCRYPTED_MESSAGE": "OpenPGP versleuteld bericht",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Juiste handtekening van %USER%",
-		"ERROR": "OpenPGP foutmelding: %ERROR%"
+		"STORE_IN_GNUPG": "Bewaar op de server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Bewaar openbare sleutel op de server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Bewaar privésleutel op de server in GnuPG",
+		"BACKUP_ON_SERVER": "Bewaar (versleuteld) op de server",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Maak een back-up van de openbare sleutel op de server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Maak een back-up van de privésleutel op de server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importeer S\/MIME certificaat",
+		"CERTIFICATE": "Certificaat",
+		"CERTIFICATES": "S\/MIME Certificaten",
+		"SIGNED_MESSAGE": "S\/MIME ondertekend bericht",
+		"ENCRYPTED_MESSAGE": "S\/MIME versleuteld bericht",
+		"PRIVATE_KEY_OF": "S\/MIME privésleutel van %EMAIL%"
 	},
 	"POPUPS_FILTER": {
 		"TITLE_CREATE_FILTER": "Filter toevoegen",
@@ -300,7 +370,7 @@
 		"MARK_AS_READ_LABEL": "Markeer als gelezen",
 		"REPLY_INTERVAL_LABEL": "Antwoord interval (dagen)",
 		"KEEP_LABEL": "Behoud",
-		"STOP_LABEL": "Stop niet met uitvoeren van volgende filters",
+		"STOP_LABEL": "Stop met het uitvoeren van de volgende filters",
 		"VACATION_SUBJECT_LABEL": "Onderwerp (optioneel)",
 		"VACATION_MESSAGE_LABEL": "Bericht",
 		"VACATION_RECIPIENTS_LABEL": "Ontvangers (comma gescheiden)",
@@ -319,10 +389,10 @@
 		"TITLE_SYSTEM_FOLDERS": "Selecteer systeem mappen",
 		"SELECT_CHOOSE_ONE": "Kies één",
 		"SELECT_UNUSE_NAME": "Niet gebruiken",
-		"NOTIFICATION_SENT": "U heeft nog geen \"Verzonden items\" folder aangeduid waar de berichten geplaatst worden na het versturen.\nIndien u geen verzonden berichten wilt bewaren, kies de \"Niet gebruiken\" optie.\n",
+		"NOTIFICATION_SENT": "U heeft nog geen \"Verzonden items\" folder aangeduid waar de berichten geplaatst worden na het versturen.\nIndien u geen verzonden berichten wilt bewaren, kies de \"Niet gebruiken\" optie.",
 		"NOTIFICATION_DRAFTS": "U heeft nog geen \"Concepten\" folder aangeduid waar de berichten bewaard worden tijdens het opstellen.",
-		"NOTIFICATION_SPAM": "U heeft nog geen \"Ongewenste e-mail\" folder aangeduid waar de spam berichten geplaatst worden.\nIndien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie.\n",
-		"NOTIFICATION_TRASH": "U heeft nog geen \"Verwijderde items\" folder aangeduid waar de verwijderde berichten geplaatst worden.\nIndien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie.\n",
+		"NOTIFICATION_SPAM": "U heeft nog geen \"Ongewenste e-mail\" folder aangeduid waar de spam berichten geplaatst worden.\nIndien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie.",
+		"NOTIFICATION_TRASH": "U heeft nog geen \"Verwijderde items\" folder aangeduid waar de verwijderde berichten geplaatst worden.\nIndien u berichten permanent wilt verwijderen, kies de \"Niet gebruiken\" optie.",
 		"NOTIFICATION_ARCHIVE": "U heeft nog geen \"Archief\" map aangeduid waar de gearchiveerde berichten geplaatst worden."
 	},
 	"TITLES": {
@@ -339,64 +409,107 @@
 		"ERROR_UNKNOWN": "Er is een onbekende fout opgetreden"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEKST"
+		"PLAIN": "HTML <-> TEKST",
+		"SOURCE": "HTML <-> BRONCODE",
+		"FONTFAMILY": "Lettertype",
+		"FONTSIZE": "Lettergrootte",
+		"DIR": "Tekstrichting",
+		"DIR_LTR": "Links naar rechts",
+		"DIR_RTL": "Rechts naar links",
+		"DIR_AUTO": "Automatisch",
+		"TEXTCOLOR": "Tekstkleur",
+		"BACKGROUNDCOLOR": "Achtergrondkleur",
+		"BOLD": "Dikgedrukt",
+		"ITALIC": "Cursief",
+		"UNDERLINE": "Onderstreept",
+		"STRIKE": "Doorgestreept",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Genummerde lijst",
+		"UL": "Ongenummerde lijst",
+		"QUOTE": "Citaat",
+		"INDENTDECREASE": "Inspringing verkleinen",
+		"INDENTINCREASE": "Inspringing vergroten",
+		"LINK": "Link",
+		"IMAGEURL": "Afbeelding URL",
+		"IMAGEUPLOAD": "Upload afbeelding",
+		"UNDO": "Ongedaan maken",
+		"REDO": "Opnieuw",
+		"REMOVESTYLE": "Verwijder css-stijl"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Persoonlijk",
-		"LABEL_GENERAL_NAME": "Algemeen",
-		"LABEL_CONTACTS_NAME": "Contactpersonen",
-		"LABEL_FOLDERS_NAME": "Mappen",
-		"LABEL_ACCOUNTS_NAME": "Accounts",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Beveiliging",
-		"LABEL_THEMES_NAME": "Thema's"
+		"GENERAL": "Algemeen",
+		"CONTACTS": "Contactpersonen",
+		"FOLDERS": "Mappen",
+		"ACCOUNTS": "Accounts",
+		"FILTERS": "Filters",
+		"SECURITY": "Beveiliging",
+		"THEMES": "Thema's"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simpel",
+		"ADVANCED": "Geavanceerd",
 		"BUTTON_ADD_SCRIPT": "Script toevoegen",
 		"SUBNAME_MOVE_TO": "Verplaats naar map \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Doorsturen naar \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Afwijzen",
 		"SUBNAME_VACATION_MESSAGE": "Afwezigheidsbericht",
-		"SUBNAME_DISCARD": "Gooi weg",
-		"LOADING_PROCESS": "Bezig met updaten van de filter lijst"
+		"SUBNAME_DISCARD": "Gooi weg"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Beveiliging",
 		"LABEL_AUTOLOGOUT": "Automatisch uitloggen",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nooit",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minuten",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% uur"
+		"FORGET_KEY_PASS": "Vergeet privésleutel wachtwoord",
+		"NEVER": "Nooit",
+		"LABEL_STORED_PASS": "Wachtwoordzin opgeslagen"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Algemeen",
-		"LABEL_LANGUAGE": "Taal",
-		"LABEL_IDENTITY": "Identiteit",
-		"LABEL_LAYOUT": "Indeling",
-		"LABEL_LAYOUT_NO_SPLIT": "Geen splitsing",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
-		"LABEL_EDITOR": "Standaard tekst editor",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Platte tekst",
-		"LABEL_EDITOR_HTML_FORCED": "Html (geforceerd)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Platte tekst (geforceerd)",
-		"LABEL_VIEW_OPTIONS": "Bekijk opties",
-		"LABEL_USE_PREVIEW_PANE": "Toon leesvenster",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst",
-		"LABEL_USE_THREADS": "Groepeer berichten",
-		"LABEL_REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
-		"LABEL_SHOW_IMAGES": "Afbeeldingen altijd weergeven in het bericht",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Verwijder achtergrond- en tekstkleuren uit het bericht",
-		"LABEL_MESSAGE_PER_PAGE": "Berichten op pagina",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Bericht markeren als gelezen na",
+		"LANGUAGE": "Taal",
+		"HOUR_FORMAT": "Uur formaat",
+		"IDENTITY": "Identiteit",
+		"LAYOUT": "Indeling",
+		"LAYOUT_NO_SPLIT": "Geen splitsing",
+		"LAYOUT_VERTICAL_SPLIT": "Verticale splitsing",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontale splitsing",
+		"SHOW_NEXT_MESSAGE": "Toon volgende bericht bij verplaatsen huidige bericht",
+		"EDITOR": "Standaard tekst editor",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Platte tekst",
+		"VIEW_OPTIONS": "Bekijk opties",
+		"USE_PREVIEW_PANE": "Toon leesvenster",
+		"HIDE_DELETED_MESSAGES": "Berichten verbergen die zijn gemarkeerd voor verwijdering",
+		"USE_CHECKBOXES_IN_LIST": "Toon selectievakjes in de lijst",
+		"USE_THREADS": "Toon berichten in boomweergave",
+		"THREAD_ALGORITHM": "Boomweergave algoritme",
+		"REPLY_SAME_FOLDER": "Plaats antwoorden in de map van het originele bericht",
+		"PREFER_HTML": "Geef de voorkeur aan HTML boven platte tekst",
+		"PREFER_HTML_INFO": "Berichten komen soms in beide formaten. Deze optie bepaalt of u het HTML-gedeelte of het platte tekstgedeelte wilt weergeven.",
+		"REMOVE_COLORS": "Verwijder achtergrond- en tekstkleuren uit het bericht",
+		"ALLOW_STYLES": "CSS <style> toestaan",
+		"MESSAGE_PER_PAGE": "Berichten op pagina",
+		"CHECK_MAIL_INTERVAL": "Controleer mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Bericht markeren als gelezen na",
+		"MSG_DEFAULT_ACTION": "Standaard actie",
 		"SECONDS": "seconden",
-		"LABEL_NOTIFICATIONS": "Notificaties",
-		"LABEL_SOUND_NOTIFICATION": "Notificatie geluid",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)"
+		"MINUTES": "minuten",
+		"NOTIFICATIONS": "Notificaties",
+		"SOUND_NOTIFICATION": "Notificatie geluid",
+		"CHROME_NOTIFICATION_DESC": "Toon nieuwe berichten popup",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Geblokkeerd door de browser)",
+		"COLLAPSE_BLOCKQUOTES": "Geciteerde tekst inklappen",
+		"MAX_QUOTE_LEVEL": "Maximaal zichtbare geciteerde tekstniveaus",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Toon inline bijlagen in lijst",
+		"LIST_SIMPLE_ATTACHMENTS": "Simpele bijlagen lijst",
+		"LIST_MESSAGES_GROUPED": "Toon berichten gegroepeerd (bij sorteren op Datum of Van)",
+		"EXTERNAL_IMAGES": "Externe afbeeldingen",
+		"IMAGES_OPTION_ASK": "Altijd vragen",
+		"IMAGES_OPTION_WHITELIST": "Whitelist of vragen",
+		"IMAGES_OPTION_ALWAYS": "Altijd tonen",
+		"IMAGES_WHITELIST": "Afbeeldingen whitelist",
+		"MESSAGE_POPUP_WINDOW": "Openen in een nieuw venster i.p.v. tab",
+		"MAILTO": "Registreer als 'mailto:'-linkhandler",
+		"HTML_TO_MD": "Converteer HTML naar Markdown i.p.v. platte tekst"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatisch ontvangers toevoegen aan uw adresboek",
@@ -405,17 +518,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adresboek URL",
 		"LABEL_CONTACTS_SYNC_USER": "Gebruikersnaam",
-		"SYNC_NO": "Nee",
-		"SYNC_YES": "Ja",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Alleen lezen"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Thema's",
-		"LEGEND_THEMES_CUSTOM": "Aangepaste thema configuratie",
-		"LABEL_CUSTOM_TYPE": "Soort",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Licht",
-		"LABEL_CUSTOM_TYPE_DARK": "Donker",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Achtergrond",
+		"LABEL_BACKGROUND": "Achtergrond",
+		"LABEL_FONTS": "Lettertypes",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Upload achtergrond afbeelding (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Bestand is te groot",
 		"ERROR_FILE_TYPE_ERROR": "Onjuist bestandstype (alleen JPG and PNG)",
@@ -435,8 +543,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Er wordt maar een deel weergegeven om prestatieproblemen te voorkomen.",
 		"HELP_DELETE_FOLDER": "Verwijder map",
 		"HELP_SHOW_HIDE_FOLDER": "Toon\/verberg map",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Controleer wel of niet op nieuwe berichten",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Controleer op nieuwe berichten",
 		"HIDE_UNSUBSCRIBED": "Verberg niet geabonneerde mappen",
+		"UNHIDE_KOLAB_FOLDERS": "Toon Kolab mappen",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Configuratie",
 		"TYPE_CONTACTS": "Contacten",
@@ -452,15 +561,15 @@
 		"BUTTON_ADD_ACCOUNT": "Account toevoegen",
 		"BUTTON_ADD_IDENTITY": "Identiteit toevoegen",
 		"LOADING_PROCESS": "Account lijst aan het bijwerken",
-		"DEFAULT_IDENTITY_LABEL": "standaard"
+		"SHOW_UNREAD": "Toon het aantal ongelezen berichten"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importeer sleutel",
 		"BUTTON_GENERATE_KEY_PAIR": "Genereer sleutels",
+		"IMPORT_FROM_SERVER": "Importeren vanaf de server",
 		"TITLE_PRIVATE": "Privé sleutel",
 		"TITLE_PUBLIC": "Publieke sleutel",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Verkrijg Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Hulp bij toetsenbord sneltoetsen",
@@ -473,7 +582,6 @@
 		"LABEL_REPLY_ALL": "Alle beantwoorden",
 		"LABEL_FORWARD": "Doorsturen",
 		"LABEL_FORWARD_MULTIPLY": "Doorsturen als bijlage(n)",
-		"LABEL_HELP": "Help",
 		"LABEL_CHECK_ALL": "Selecteer alle berichten",
 		"LABEL_DELETE": "Verwijderen",
 		"LABEL_OPEN_THREAD": "Open geselecteerde berichtenlijst",
@@ -486,55 +594,58 @@
 		"LABEL_VIEW_MESSAGE_ENTER": "Bericht lezen (leesvenster uitgeschakeld)",
 		"LABEL_SWITCH_TO_MESSAGE": "Schakel focus naar bericht",
 		"LABEL_SWITCH_TO_FOLDER_LIST": "Schakel focus naar berichtenlijst",
-		"LABEL_FULLSCREEN_TOGGLE": "Schakel tussen normaal en lezen in volledig scherm",
+		"LABEL_FULLSCREEN_TOGGLE": "Wissel volledige scherm modus",
 		"LABEL_BLOCKQUOTES_TOGGLE": "Schakel blok citaten aan of uit",
 		"LABEL_THREAD_NEXT": "Volgende bericht in groep",
 		"LABEL_THREAD_PREV": "Vorige bericht in groep",
-		"LABEL_PRINT": "Afdrukken",
 		"LABEL_EXIT_FULLSCREEN": "Volledig scherm sluiten",
 		"LABEL_CLOSE_MESSAGE": "Bericht sluiten (leesvenster uitgeschakeld)",
 		"LABEL_SWITCH_TO_LIST": "Schakel focus terug naar berichtenlijst",
 		"LABEL_OPEN_COMPOSE_POPUP": "Open nieuw bericht venster",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimaliseer nieuw bericht venster",
 		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Open identiteiten menu",
 		"LABEL_SAVE_MESSAGE": "Concept opslaan",
 		"LABEL_SEND_MESSAGE": "Bericht versturen",
 		"LABEL_CLOSE_COMPOSE": "Nieuw bericht venster sluiten"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ongeldige token",
-		"AUTH_ERROR": "Authenticatie mislukt",
-		"CONNECTION_ERROR": "Kan geen verbinding maken met de Server",
-		"DOMAIN_ALREADY_EXISTS": "Domein bestaat reeds",
-		"DOMAIN_NOT_ALLOWED": "Domein is niet toegestaan",
-		"ACCOUNT_NOT_ALLOWED": "Account is niet toegestaan",
-		"CONTACTS_SYNC_ERROR": "Contactpersonen synchronisatie fout",
-		"CANT_GET_MESSAGE_LIST": "Berichtenlijst kan niet worden opgehaald",
-		"CANT_GET_MESSAGE": "Bericht kan niet worden opgehaald",
-		"CANT_DELETE_MESSAGE": "Kan bericht niet verwijderen",
-		"CANT_COPY_MESSAGE": "Kan bericht niet kopiëren",
-		"CANT_MOVE_MESSAGE": "Kan bericht niet verplaatsen",
-		"CANT_SAVE_MESSAGE": "Kan bericht niet opslaan",
-		"CANT_SEND_MESSAGE": "Kan bericht niet verzenden",
-		"INVALID_RECIPIENTS": "Onjuiste ontvangers",
-		"CANT_SAVE_FILTERS": "Kan filters niet opslaan",
-		"CANT_GET_FILTERS": "Kan filters niet ophalen",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Kan filters script niet activeren",
-		"CANT_DELETE_FILTERS_SCRIPT": "Kan filters script niet verwijderen",
-		"FILTERS_ARE_NOT_CORRECT": "Filters zijn onjuist",
-		"CANT_CREATE_FOLDER": "Kan map niet aanmaken",
-		"CANT_RENAME_FOLDER": "Kan map niet hernoemen",
-		"CANT_DELETE_FOLDER": "Kan map niet verwijderen",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Een niet lege map kan niet verwijderd worden",
-		"CANT_SUBSCRIBE_FOLDER": "Kan niet abonneren op folder",
-		"CANT_UNSUBSCRIBE_FOLDER": "Kan abonnement op folder niet opzeggen",
-		"DEMO_SEND_MESSAGE_ERROR": "Vanwege beveiliging is het niet toegestaan dat deze demo account e-mail naar extern verzend!",
-		"DEMO_ACCOUNT_ERROR": "Vanwege beveiliging is deze actie niet toegestaan voor deze account!",
-		"ACCOUNT_ALREADY_EXISTS": "Account bestaat al",
-		"ACCOUNT_DOES_NOT_EXIST": "Account bestaat niet.",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Fout bij toegang tot de mail Server",
-		"INVALID_INPUT_ARGUMENT": "Ongeldig invoer argument",
-		"UNKNOWN_ERROR": "Er is een onbekende fout opgetreden"
+		"RequestError": "Verzoek mislukt",
+		"RequestAborted": "Verzoek is afgebroken",
+		"RequestTimeout": "Verzoek time-out",
+		"InvalidToken": "Ongeldige token",
+		"AuthError": "Authenticatie mislukt",
+		"ConnectionError": "Kan geen verbinding maken met de Server",
+		"DomainAlreadyExists": "Domein bestaat reeds",
+		"DomainNotAllowed": "Domein is niet toegestaan",
+		"AccountNotAllowed": "Account is niet toegestaan",
+		"CryptKeyError": "Uw login wachtwoord is veranderd",
+		"ContactsSyncError": "Contactpersonen synchronisatie fout",
+		"CantGetMessageList": "Berichtenlijst kan niet worden opgehaald",
+		"CantGetMessage": "Bericht kan niet worden opgehaald",
+		"CantDeleteMessage": "Kan bericht niet verwijderen",
+		"CantCopyMessage": "Kan bericht niet kopiëren",
+		"CantMoveMessage": "Kan bericht niet verplaatsen",
+		"CantSaveMessage": "Kan bericht niet opslaan",
+		"CantSendMessage": "Kan bericht niet verzenden",
+		"InvalidRecipients": "Onjuiste ontvangers",
+		"CantSaveFilters": "Kan filters niet opslaan",
+		"CantGetFilters": "Kan filters niet ophalen",
+		"CantActivateFiltersScript": "Kan filters script niet activeren",
+		"CantDeleteFiltersScript": "Kan filters script niet verwijderen",
+		"FiltersAreNotCorrect": "Filters zijn onjuist",
+		"CantCreateFolder": "Kan map niet aanmaken",
+		"CantRenameFolder": "Kan map niet hernoemen",
+		"CantDeleteFolder": "Kan map niet verwijderen",
+		"CantDeleteNonEmptyFolder": "Een niet lege map kan niet verwijderd worden",
+		"CantSubscribeFolder": "Kan niet abonneren op folder",
+		"CantUnsubscribeFolder": "Kan abonnement op folder niet opzeggen",
+		"DemoSendMessageError": "Vanwege beveiliging is het niet toegestaan dat deze demo account e-mail naar extern verzend!",
+		"DemoAccountError": "Vanwege beveiliging is deze actie niet toegestaan voor deze account!",
+		"AccountAlreadyExists": "Account bestaat al",
+		"AccountDoesNotExist": "Account bestaat niet.",
+		"AccountSwitchFailed": "Overschakelen naar account \"%EMAIL%\" mislukt",
+		"MailServerError": "Fout bij toegang tot de mail Server",
+		"InvalidInputArgument": "Ongeldig invoer argument",
+		"UnknownError": "Er is een onbekende fout opgetreden"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json b/snappymail/v/0.0.0/app/localization/pl/admin.json
similarity index 68%
rename from snappymail/v/0.0.0/app/localization/pl-PL/admin.json
rename to snappymail/v/0.0.0/app/localization/pl/admin.json
index 6cd9480fa..855374b15 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pl/admin.json
@@ -1,27 +1,35 @@
 {
 	"GLOBAL": {
+		"ADD": "Dodaj",
+		"CLOSE": "Zamknij",
 		"SAVE": "Zapisz",
-		"UPDATE": "Zaktualizuj"
+		"TEST": "Testuj",
+		"UPDATE": "Zaktualizuj",
+		"USERNAME": "Nazwa użytkownika",
+		"PASSWORD": "Hasło",
+		"CANCEL": "Anuluj",
+		"SEARCH": "Szukaj",
+		"YES": "Tak",
+		"NO": "Nie"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
-		"LABEL_PASSWORD": "Hasło",
-		"LABEL_TOTP": "TOTP code",
+		"LABEL_TOTP": "Kod TOTP",
 		"BUTTON_LOGIN": "Zaloguj do panelu administracjnego"
 	},
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "Panel administracyjny"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Ogólne",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Personalizacja",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_DOMAINS_NAME": "Domeny",
-		"LABEL_SECURITY_NAME": "Bezpieczeństwo",
-		"LABEL_PACKAGES_NAME": "Pakiety",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "O programie"
+		"GENERAL": "Ogólne",
+		"LOGIN": "Logowanie",
+		"BRANDING": "Personalizacja",
+		"CONTACTS": "Kontakty",
+		"DOMAINS": "Domeny",
+		"SECURITY": "Bezpieczeństwo",
+		"PACKAGES": "Pakiety",
+		"CONFIG": "Plik konfiguracyjny",
+		"ABOUT": "O programie"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Interfejs",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Zezwól użytkownikowi na wybór języka",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Zezwól użytkownikowi na zmianę motywu",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Zezwól użytkownikowi na użycie własnego tła",
-		"LABEL_NEW_FOLDER_MOVE": "Nowy przycisk „przenieś do folderu”",
 		"LABEL_SHOW_THUMBNAILS": "Pokaż miniatury (załączniki)",
 		"LEGEND_MAIN": "Główne",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Maksymalny rozmiar załącznika",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Domyślna domena",
 		"LABEL_DETERMINE_USER_DOMAIN": "Spróbuj określić domenę użytkownika",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Zezwól na zmianę języka na ekranie logowania",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Spróbuj określić język użytkownika",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Spróbuj określić język użytkownika"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Personalizacja",
@@ -64,32 +70,31 @@
 		"LABEL_STORAGE_DSN": "Adres DSN",
 		"LABEL_STORAGE_USER": "Użytkownik",
 		"LABEL_STORAGE_PASSWORD": "Hasło",
-		"BUTTON_TEST": "Testuj",
+		"SQLITE_GLOBAL": "Używaj globalnej bazy kontaktów zamiast indywidualnych dla każdego konta.",
 		"ALERT_NOTICE": "Ostrzeżenie!",
+		"SUGGESTIONS_LIMIT": "Limit sugestii",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nie używaj tej bazy danych z dużą ilością aktywnych użytkowników.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Twój system nie zawiera wsparcia dla obsługi kontaktów.\n<br>\nMusisz zainstalować lub uruchomić na serwerze jedno z rozszerzeń <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong>.\n"
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Domeny",
 		"BUTTON_ADD_DOMAIN": "Dodaj domenę",
-		"BUTTON_ADD_ALIAS": "Dodaj Alias",
+		"BUTTON_ADD_ALIAS": "Dodaj alias",
 		"DELETE_ARE_YOU_SURE": "Czy na pewno?",
 		"HTML_DOMAINS_HELPER": "Lista domen, do których można uzyskać dostęp poprzez tego klienta.\n<br>\nKliknij na nazwę, aby skonfigurować domenę.\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Bezpieczeństwo",
 		"LABEL_USE_IMAGE_PROXY": "Użyj lokalnego serwera proxy dla zewnętrznych obrazów",
-		"LABEL_ALLOW_OPEN_PGP": "Zezwól na używanie OpenPGP",
+		"LABEL_AUTO_VERIFY": "Weryfikuj podpisy automatycznie",
 		"LABEL_SHOW_PHP_INFO": "Pokaż informacje o wersji PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Poświadczenia dostępu do panelu administracyjnego",
 		"LABEL_CURRENT_PASSWORD": "Bieżące hasło",
-		"LABEL_NEW_LOGIN": "Nowy login",
 		"LABEL_NEW_PASSWORD": "Nowe hasło",
 		"LABEL_REPEAT_PASSWORD": "Powtórz hasło",
-		"BUTTON_UPDATE_PASSWORD": "Zaktualizuj hasło",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Wymagaj weryfikacji używanego certyfikatu SSL (IMAP\/SMTP)",
-		"LABEL_ALLOW_SELF_SIGNED": "Zezwól na certyfikaty z podpisem własnym"
+		"LABEL_REQUIRE_VERIFICATION": "Wymagaj weryfikacji używanego certyfikatu SSL",
+		"CRYPTO": "Kryptografia",
+		"LABEL_ALLOW_SELF_SIGNED": "Zezwól na certyfikaty podpisane samodzielnie"
 	},
 	"TAB_PACKAGES": {
 		"LABEL_ENABLE_PLUGINS": "Włącz obsługę wtyczek",
@@ -103,18 +108,16 @@
 		"LABEL_TAG_HINT": "Prosty, nowoczesny i szybki klient poczty elektronicznej",
 		"LABEL_ALL_RIGHTS_RESERVED": "Wszystkie prawa zastrzeżone.",
 		"HINT_READ_CHANGE_LOG": "Przed aktualizacją przeczytaj proszę listę zmian.",
-		"HINT_IS_UP_TO_DATE": "RainLoop jest aktualny.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail jest aktualny.",
 		"HTML_NEW_VERSION": "Dostępna jest nowa wersja: <b>%VERSION%<\/b>.",
 		"LABEL_UPDATING": "Aktualizacja w toku...",
 		"LABEL_CHECKING": "Szukanie aktualizacji...",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Wydania"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Dodaj Alias",
+		"TITLE_ADD_DOMAIN_ALIAS": "Dodaj alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domena",
-		"BUTTON_CLOSE": "Zamknij",
-		"BUTTON_ADD": "Dodaj"
+		"LABEL_DOMAIN": "Domena"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Dodawanie domeny",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Edycja domeny „%NAME%”",
 		"LABEL_NAME": "Nazwa",
 		"NAME_HELPER": "obsługiwany znak wieloznaczności - *",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Serwer",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Rodzaj połączenia",
-		"LABEL_WHITE_LIST": "Biała lista",
+		"TIMEOUT": "Limit czasu",
+		"DISABLE_CAPABILITIES": "Zablokuj funkcjonalności",
+		"LIMITS": "Limity",
+		"FOLDERS": "Foldery",
+		"MESSAGES": "Wiadomości",
 		"SECURE_OPTION_NONE": "Bez zabezpieczeń",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Zezwól na skrypty sieve",
 		"LABEL_USE_SHORT_LOGIN": "Użyj krótkiego loginu",
-		"LABEL_USE_AUTH": "Użyj autoryzacji",
-		"LABEL_SET_SENDER": "Use login as sender",
-		"LABEL_USE_PHP_MAIL": "Użyj funkcji php 'mail()'",
-		"BUTTON_TEST": "Testuj",
+		"LABEL_LOWERCASE_LOGIN": "Logowanie małymi literami (bez uwzględniania ich wielkości)",
+		"LABEL_USE_AUTH": "Użyj uwierzytelnienia",
+		"LABEL_SET_SENDER": "Użyj loginu jako nadawcy",
+		"LABEL_AUTH_PLAIN_LINE": "Wymuś logowanie pojedynczą komendą AUTH PLAIN",
+		"LABEL_USE_PHP_MAIL": "Użyj funkcji PHP 'mail()'",
 		"BUTTON_WHITE_LIST": "Biała lista",
-		"BUTTON_SIEVE_CONFIGURATION": "Konfiguracja sieve",
-		"BUTTON_BACK_TO_IMAP": "Powrót do ustawień serwera IMAP",
-		"BUTTON_BACK": "Wstecz",
-		"BUTTON_CLOSE": "Zamknij",
-		"BUTTON_ADD": "Dodaj",
-		"BUTTON_UPDATE": "Zaktualizuj",
-		"NEW_DOMAIN_DESC": "Konfiguracja tej domeny pozwala na pracę<br>z adresami e-mail: <i>%NAME%<\/i>",
-		"WHITE_LIST_ALERT": "Lista użytkowników domeny, którzy mogą uzyskać dostęp z tego webmaila.\nUżyj spacji do rozdzielenia.\n"
+		"NEW_DOMAIN_DESC": "Konfiguracja tej domeny pozwala na pracę z adresami e-mail: <strong>%NAME%<\/strong>",
+		"WHITE_LIST_ALERT": "Lista użytkowników domeny, którzy mogą uzyskać dostęp z tego webmaila.\nUżyj spacji do rozdzielenia.\n",
+		"VALID_SPAM_HEADERS": "Prawidłowe nagłówki informacji o SPAMie",
+		"VALID_VIRUS_HEADERS": "Prawidłowe nagłówki informacji o wirusach"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Wtyczka",
-		"DESC_NOTHING_TO_CONFIGURE": "Brak opcji do skonfigurowania",
-		"BUTTON_CLOSE": "Zamknij"
+		"DESC_NOTHING_TO_CONFIGURE": "Brak opcji do skonfigurowania"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Czy na pewno chcesz zamknąć to okno?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "Beta",
-		"UNSTABLE": "Niestabilne",
 		"WARNING": "Ostrzeżenie!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Nieznany błąd"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Nieprawidłowy token",
-		"AUTH_ERROR": "Autoryzacja zakończona niepowodzeniem",
-		"DOMAIN_ALREADY_EXISTS": "Ta domena już istnieje",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Nie można zapisać ustawień wtyczki",
-		"CANT_INSTALL_PACKAGE": "Instalacja wtyczki zakończona niepowodzeniem",
-		"CANT_DELETE_PACKAGE": "Usunięcie wtyczki zakończone niepowodzeniem",
-		"INVALID_PLUGIN_PACKAGE": "Niepoprawna wtyczka",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Nieobsługiwana wtyczka",
-		"UNKNOWN_ERROR": "Nieznany błąd"
+		"RequestError": "Zapytanie zakończone niepowodzeniem",
+		"RequestAborted": "Zapytanie przerwane",
+		"RequestTimeout": "Upłynął limit czasu",
+		"InvalidToken": "Nieprawidłowy token",
+		"AuthError": "Uwierzytelnienie zakończone niepowodzeniem",
+		"DomainAlreadyExists": "Ta domena już istnieje",
+		"CantSavePluginSettings": "Nie można zapisać ustawień wtyczki",
+		"CantInstallPackage": "Instalacja wtyczki zakończona niepowodzeniem",
+		"CantDeletePackage": "Usunięcie wtyczki zakończone niepowodzeniem",
+		"InvalidPluginPackage": "Nieprawidłowa wtyczka",
+		"UnsupportedPluginPackage": "Nieobsługiwana wtyczka",
+		"UnknownError": "Nieznany błąd"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/pl/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/pl-PL/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/pl/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/static.json b/snappymail/v/0.0.0/app/localization/pl/static.json
similarity index 69%
rename from snappymail/v/0.0.0/app/localization/pl-PL/static.json
rename to snappymail/v/0.0.0/app/localization/pl/static.json
index 60b84747c..419588a40 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/static.json
+++ b/snappymail/v/0.0.0/app/localization/pl/static.json
@@ -2,8 +2,8 @@
 	"BACK_LINK": "Odśwież",
 	"NO_SCRIPT_TITLE": "Ta aplikacja wymaga JavaScript.",
 	"NO_SCRIPT_DESC": "Twoja przeglądarka nie obsługuje JavaScript.\nWłącz obsługę JavaScript w przeglądarce i ponowne załaduj tę stronę.\n",
-	"NO_COOKIE_TITLE": "Ta aplikacja wymaga plików Cookies",
-	"NO_COOKIE_DESC": "Obsługa Cookies jest wyłączona w Twojej przeglądarce.\nWłącz obsługę plików Cookie w przeglądarce i spróbuj ponowne.\n",
+	"NO_COOKIE_TITLE": "Ta aplikacja wymaga plików cookies",
+	"NO_COOKIE_DESC": "Obsługa cookies jest wyłączona w Twojej przeglądarce.\nWłącz obsługę plików cookies w przeglądarce i spróbuj ponowne.\n",
 	"BAD_BROWSER_TITLE": "Twoja przeglądarka jest przestarzała.",
 	"BAD_BROWSER_DESC": "W celu wykorzystania wszystkich funkcji tej aplikacji,\nzaktualizuj aktualnie używaną lub pobierz i zainstaluj jedną z poniższych przeglądarek:\n"
 }
diff --git a/snappymail/v/0.0.0/app/localization/pl-PL/user.json b/snappymail/v/0.0.0/app/localization/pl/user.json
similarity index 52%
rename from snappymail/v/0.0.0/app/localization/pl-PL/user.json
rename to snappymail/v/0.0.0/app/localization/pl/user.json
index b678380ee..ba8a169ee 100644
--- a/snappymail/v/0.0.0/app/localization/pl-PL/user.json
+++ b/snappymail/v/0.0.0/app/localization/pl/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archiwizacja",
 		"ARE_YOU_SURE": "Jesteś pewien\/pewna?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Zamknij (Esc)",
 		"CONTACTS": "Kontakty",
 		"DELETE": "Usuń",
+		"UNDELETE": "Cofnij usunięcie",
 		"DONE": "Gotowe",
 		"EMAIL": "Adres e-mail",
 		"FROM": "Od",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Wyloguj",
 		"MORE": "Więcej",
 		"MOVE_TO": "Przenieś do",
-		"NAME": "Odebrane",
+		"COPY_TO": "Kopiuj do",
+		"NAME": "Nazwa",
 		"NONE": "Brak",
+		"TO_SPAM": "Przenieś wiadomość(-ci) do spamu",
 		"NOT_SPAM": "Oznacz jako pożądane",
+		"USERNAME": "Nazwa użytkownika",
 		"PASSWORD": "Hasło",
+		"REMEMBER": "Zapamiętaj",
 		"REPLY_TO": "Odpisz do",
 		"SAVE": "Zapisz",
-		"SEARCH": "Nie znaleziono żadnych kontaktów",
-		"SPAM": "Oznacz jako SPAM",
+		"SAVE_CHANGES": "Zapisać zmiany?",
+		"SEARCH": "Szukaj",
+		"SPAM": "Spam",
 		"SUBJECT": "Temat",
 		"TEST": "Testuj",
-		"TO": "Do"
+		"TO": "Do",
+		"SERVER_MESSAGE": "Wiadomość serwera",
+		"YES": "Tak",
+		"NO": "Nie",
+		"INACTIVE": "Nieaktywne",
+		"DEFAULT": "Domyślna",
+		"HELP": "Pomoc",
+		"TEXT": "Tekst",
+		"ATTACHMENTS": "Załączniki"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Login",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Zaloguj"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Dodaj konto",
-		"BUTTON_SETTINGS": "Ustawienia",
-		"BUTTON_HELP": "Pomoc"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Wersja mobilna",
-		"BUTTON_DESKTOP_VERSION": "Wersja desktopowa"
+		"BUTTON_ADD_ACCOUNT": "Dodaj konto"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Wyszukiwanie zaawansowane",
-		"LABEL_ADV_TEXT": "Tekst",
-		"LABEL_ADV_HAS_ATTACHMENT": "Posiada załącznik",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Posiada załączniki",
-		"LABEL_ADV_FLAGGED": "Oznaczona",
-		"LABEL_ADV_UNSEEN": "Nieprzeczytana",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Wszystkie",
-		"LABEL_ADV_DATE_3_DAYS": "do 3 dni",
-		"LABEL_ADV_DATE_7_DAYS": "do tygodnia",
-		"LABEL_ADV_DATE_MONTH": "do miesiąca",
-		"LABEL_ADV_DATE_3_MONTHS": "do 3 miesięcy",
-		"LABEL_ADV_DATE_6_MONTHS": "do 6 miesięcy",
-		"LABEL_ADV_DATE_YEAR": "do roku",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Pełny ekran",
-		"ZOOM": "Przybliż\/oddal",
-		"CLOSE": "Zamknij (Esc)",
-		"GALLERY_PREV": "Poprzedni (strzałka w lewo)",
-		"GALLERY_NEXT": "Następny (strzałka w prawo)",
-		"GALLERY_COUNTER": "%curr% z %total%"
+		"TEXT": "Tekst",
+		"HAS_ATTACHMENT": "Posiada załącznik",
+		"FLAGGED": "Oznaczona",
+		"UNSEEN": "Nieprzeczytana",
+		"DATE": "Data",
+		"DATE_ALL": "Wszystkie",
+		"BEFORE_3_DAYS": "Starsze niż 3 dni",
+		"BEFORE_7_DAYS": "Starsze niż 1 tydzień",
+		"BEFORE_MONTH": "Starsze niż 1 miesiąc",
+		"BEFORE_3_MONTHS": "Starsze niż 3 miesiące",
+		"BEFORE_6_MONTHS": "Starsze niż 6 miesięcy",
+		"BEFORE_YEAR": "Starsze niż 1 rok",
+		"SINCE_3_DAYS": "do 3 dni",
+		"SINCE_7_DAYS": "do tygodnia",
+		"SINCE_MONTH": "do miesiąca",
+		"SINCE_3_MONTHS": "do 3 miesięcy",
+		"SINCE_6_MONTHS": "do 6 miesięcy",
+		"SINCE_YEAR": "do roku",
+		"SUBFOLDERS": "Podfoldery",
+		"SUBFOLDERS_NONE": "Brak",
+		"SUBFOLDERS_SUBTREE": "Wszystkie",
+		"SUBFOLDERS_SUBTREE_ONE": "Jeden poziom",
+		"REPLIED": "Odebrano",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Utwórz",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Kosz",
 		"ARCHIVE_NAME": "Archiwum"
 	},
-	"QUOTA": {
-		"TITLE": "Wykorzystane miejsce"
+	"IMAP": {
+		"ACL_RIGHTS": "Uprawnienia",
+		"ACL_A": "Administracja",
+		"ACL_E": "Usuń",
+		"ACL_I": "Wstaw wiadomości",
+		"ACL_K": "Utwórz podfoldery",
+		"ACL_L": "Pokaż wiadomości",
+		"ACL_P": "Wyślij mail",
+		"ACL_R": "Wybierz folder",
+		"ACL_S": "\\Tag przeczytane",
+		"ACL_T": "\\Tag usunięte",
+		"ACL_W": "Inne tagi",
+		"ACL_X": "Usuń\/Zmień nazwę folder(-u)"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Odśwież listę wiadomości",
@@ -99,25 +118,28 @@
 		"MENU_SELECT_SEEN": "Przeczytane",
 		"MENU_SELECT_FLAGGED": "Oznaczone jako ważne",
 		"MENU_SELECT_UNFLAGGED": "Oznaczone jako nieważne",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Pobierz wszystkie załączniki",
 		"EMPTY_LIST": "Brak wiadomości.",
 		"EMPTY_SEARCH_LIST": "Brak wiadomości spełniających kryteria wyszukiwania.",
 		"SEARCH_RESULT_FOR": "Wyniki wyszukiwania dla \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "powrót do listy wiadomości",
-		"EMPTY_SUBJECT_TEXT": "(Brak tematu)",
 		"PUT_MESSAGE_HERE": "Upuść wiadomość tutaj, aby zobaczyć ją na liście",
 		"TODAY_AT": "dzisiaj o %TIME%",
 		"YESTERDAY_AT": "wczoraj o %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Masz %COUNT% now(-ą,-e,-ych) wiadomość(-ci)!",
 		"QUOTA_SIZE": "Wykorzystano <strong>%SIZE% (%PROC%%)<\/strong> z <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
+		"SORT": "Sortowanie",
+		"NO_SORT": "Serwer pocztowy nie wspiera sortowania",
+		"SORT_ARRIVAL_ASC": "Odebrano rosnąco",
+		"SORT_ARRIVAL_DESC": "Odebrano malejąco",
+		"SORT_DATE_ASC": "Data rosnąco",
+		"SORT_DATE_DESC": "Data malejąco",
+		"SORT_SIZE_ASC": "Wielkość rosnąco",
+		"SORT_SIZE_DESC": "Wielkość malejąco",
+		"SORT_SUBJECT_ASC": "Temat A-Z",
+		"SORT_SUBJECT_DESC": "Temat Z-A",
+		"SORT_FROM_ASC": "Od A-Z",
+		"SORT_FROM_DESC": "Od Z-A"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "Edytuj",
@@ -136,9 +158,10 @@
 		"BUTTON_THREAD_MORE": "Więcej wiadomości",
 		"MENU_HEADERS": "Pokaż nagłówki wiadomości",
 		"MENU_VIEW_ORIGINAL": "Pokaż źródło",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "Pobierz jako plik eml",
+		"HTML_VIEW": "Wyświetl jako HTML",
+		"PLAIN_VIEW": "Wyświetl jako czysty tekst",
+		"SWAP_COLORS": "Zamień domyślny kolor (tła)",
+		"MENU_DOWNLOAD_ORIGINAL": "Pobierz jako plik .eml",
 		"MENU_FILTER_SIMILAR": "Filtruj podobne wiadomości",
 		"MENU_PRINT": "Drukuj",
 		"EMPTY_SUBJECT_TEXT": "(Brak tematu)",
@@ -148,9 +171,22 @@
 		"PRINT_LABEL_ATTACHMENTS": "Załączniki",
 		"MESSAGE_VIEW_DESC": "Wybierz wiadomość do wyświetlenia.",
 		"MESSAGE_VIEW_MOVE_DESC": "Kliknij nazwę folderu w lewym panelu, aby wybrać folder docelowy.",
-		"LINK_DOWNLOAD_AS_ZIP": "Pobierz jako plik zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"LINK_DOWNLOAD_AS_ZIP": "Pobierz jako ZIP",
+		"SPAM_SCORE": "Punktacja\/Reputacja spamu",
+		"HAS_VIRUS_WARNING": "Uwaga: wykryto wirusa!",
+		"TAGS": "Tagi",
+		"NEW_TAG": "Nowy tag",
+		"ENABLE_TRACKING_LINKS": "Włącz linki śledzące",
+		"TRACKING_ENABLED": "Linki są teraz śledzone!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Ważne",
+		"$todo": "Do zrobienia",
+		"$label1": "Ważne",
+		"$label2": "Służbowe",
+		"$label3": "Osobiste",
+		"$label4": "Do zrobienia",
+		"$label5": "Na później"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Żądaj potwierdzenia wyświetlenia wiadomości - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Wyszukiwanie..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Kontakt",
+		"TAB_LOCATIONS": "Lokalizacje",
+		"TAB_BUSINESS": "Biznes",
+		"LABEL_ORGANIZATION": "Organizacja",
+		"LABEL_DEPARTMENT": "Departament",
+		"LABEL_TITLE": "Tytuł",
+		"TAB_CRYPTO": "Kryptografia",
+		"ASK": "Pytaj",
+		"NEVER": "Nigdy",
+		"ALWAYS": "Zawsze",
+		"ALWAYS_IF_POSSIBLE": "Zawsze jeśli możliwe",
 		"BUTTON_ADD_CONTACT": "Dodaj kontakt",
 		"BUTTON_CREATE_CONTACT": "Utwórz",
-		"BUTTON_UPDATE_CONTACT": "Zaktualizuj",
 		"BUTTON_IMPORT": "Importuj (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Eksportuj (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Eksportuj (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nie znaleziono żadnych kontaktów",
 		"CLEAR_SEARCH": "Wyczyść wyniki",
 		"CONTACT_VIEW_DESC": "Wybierz kontakt do wyświetlenia",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Strona WWW",
 		"LABEL_BIRTHDAY": "Urodziny",
-		"LINK_ADD_EMAIL": "Dodaj adres e-mail",
-		"LINK_ADD_PHONE": "Dodaj nr telefonu",
-		"LINK_BIRTHDAY": "Urodziny",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Nazwa wyświetlana",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Nazwisko",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Imię",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Pseudonim",
+		"DISPLAY_NAME": "Nazwa wyświetlana",
+		"LAST_NAME": "Nazwisko",
+		"FIRST_NAME": "Imię",
+		"MIDDLE_NAME": "Drugie imię",
+		"NAME_PREFIX": "Przedrostek imienia",
+		"NAME_SUFFIX": "Przyrostek imienia",
+		"NICK_NAME": "Pseudonim",
 		"LABEL_READ_ONLY": "Tylko do odczytu",
-		"LABEL_SHARE": "Udostępnij kontakt",
 		"ADD_MENU_LABEL": "Dodaj",
 		"ADD_MENU_NICKNAME": "Pseudonim",
-		"ADD_MENU_NOTES": "Notatki",
+		"ADD_MENU_NOTE": "Notatki",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "Adres URL",
 		"ADD_MENU_ADDRESS": "Adres",
 		"ADD_MENU_BIRTHDAY": "Urodziny",
 		"ADD_MENU_TAGS": "Tagi",
 		"BUTTON_SHARE_ALL": "Wszystkim",
-		"BUTTON_SYNC": "Synchronizacja (CardDAV)"
+		"BUTTON_SYNC": "Synchronizacja (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Wyślij na wszystkie adresy email dla tego kontaktu"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Pokaż wszystkie pola",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Brak załączników.",
 		"ATTACHMENTS_ERROR_DESC": "Ostrzeżenie! Nie wszystkie załączniki zostały przesłane na serwer.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Jeszcze nie wszystkie załączniki zostały przesłane na serwer.",
+		"ALLOW_SPELLCHECK": "Włącz sprawdzanie pisowni przeglądarki",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic",
 		"BUTTON_REQUEST_READ_RECEIPT": "Żądaj potwierdzenia przeczytania wiadomości",
 		"BUTTON_MARK_AS_IMPORTANT": "Oznacz jako ważną",
-		"BUTTON_REQUEST_DSN": "Żądaj potwierdzenia dostarczenia wiadomości"
+		"BUTTON_REQUEST_DSN": "Żądaj potwierdzenia dostarczenia wiadomości",
+		"BUTTON_REQUIRE_TLS": "Wymagaj bezpiecznego dostarczenia",
+		"ERROR_EMPTY_BODY": "Treść wiadomości jest pusta"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Tak",
-		"BUTTON_NO": "Nie",
+		"EXIT_ARE_YOU_SURE": "Jesteś pewien\/pewna, że chcesz zakończyć?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Na pewno chcesz zamknąć to okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Na pewno chcesz usunąć wiadomość(-ci)?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Wybierz język"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Czy dodać konto?",
+		"TITLE_ADD_ACCOUNT": "Czy dodać konto",
 		"BUTTON_ADD_ACCOUNT": "Dodaj",
-		"TITLE_UPDATE_ACCOUNT": "Czy zaktualizować konto?",
-		"BUTTON_UPDATE_ACCOUNT": "Aktualizuj"
+		"TITLE_UPDATE_ACCOUNT": "Czy zaktualizować konto"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Czy dodać tożsamość?",
-		"TITLE_UPDATE_IDENTITY": "Czy zaktualizować tożsamość?",
+		"TITLE_ADD_IDENTITY": "Czy dodać tożsamość",
+		"TITLE_UPDATE_IDENTITY": "Czy zaktualizować tożsamość",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Dodaj",
-		"BUTTON_UPDATE_IDENTITY": "Aktualizuj",
+		"SIGNATURE": "Podpis",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Umieszczaj ten podpis przed cytowanym tekstem w odpowiedziach"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Czy stworzyć folder?",
+		"TITLE_CREATE_FOLDER": "Czy stworzyć folder",
 		"LABEL_PARENT": "Folder nadrzędny",
 		"BUTTON_CREATE": "Utwórz",
 		"TITLE_CREATING_PROCESS": "Tworzenie folderu"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Po rozpoczęciu nie będzie możliwe przerwanie lub anulowanie zadania.",
 		"TITLE_CLEARING_PROCESS": "Trwa usuwanie wszystkich wiadomości z folderu..."
 	},
+	"CRYPTO": {
+		"SIGN": "Podpisz",
+		"ENCRYPT": "Zaszyfruj",
+		"DECRYPT": "Odszyfruj",
+		"VERIFY": "Weryfikuj",
+		"GOOD_SIGNATURE": "Poprawnie podpisana przez %USER%",
+		"ERROR": "Błąd %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Utwórz samodzielnie podpisany certyfikat",
+		"VALID_UNTIL": "Ważny do",
+		"PRIVATE_KEY": "Klucz prywatny",
+		"CHANGE_PASS": "Zmień hasło",
+		"CURRENT_PASS": "Aktualne hasło",
+		"NEW_PASS": "Nowe hasło",
+		"ASK_CRYPTKEY_PASS": "Hasło logowania zostało zmienione. Aby odszyfrować dane, wpisz swoje stare hasło logowania"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importowanie klucza OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Importuj",
@@ -256,21 +318,27 @@
 		"POPUP_VIEW_BUTTON": "Zaznacz",
 		"POPUP_GENERATE_TITLE": "Generowanie klucza OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Generuj",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Podpisz",
-		"LABEL_ENCRYPT": "Zaszyfruj",
-		"BUTTON_DECRYPT": "Odszyfruj",
-		"BUTTON_VERIFY": "Verify",
+		"LABEL_KEY_TYPE": "Typ",
 		"SIGNED_MESSAGE": "Wiadomość podpisana OpenPGP",
 		"ENCRYPTED_MESSAGE": "Wiadomość zaszyfrowana OpenPGP",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Poprawnie podpisana przez %USER%",
-		"ERROR": "Błąd OpenPGP: %ERROR%"
+		"STORE_IN_GNUPG": "Przechowuj na serwerze w GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Przechowuj klucz publiczny na serwerze w GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Przechowuj klucz prywatny na serwerze w GnuPG",
+		"BACKUP_ON_SERVER": "Przechowuj (zaszyfrowane) na serwerze",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Utwórz kopię zapasową klucza publicznego na serwerze",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Utwórz kopię zapasową klucza prywatnego na serwerze"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importuj certyfikat S\/MIME",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "Certyfikaty S\/MIME",
+		"SIGNED_MESSAGE": "Wiadomość podpisana S\/MIME",
+		"ENCRYPTED_MESSAGE": "Wiadomość zaszyfrowana S\/MIME",
+		"PRIVATE_KEY_OF": "Klucz prywatny S\/MIME adresu %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Czy stworzyć filtr?",
-		"TITLE_EDIT_FILTER": "Czy zaktualizować filtr?",
+		"TITLE_CREATE_FILTER": "Czy stworzyć filtr",
+		"TITLE_EDIT_FILTER": "Czy zaktualizować filtr",
 		"LEGEND_CONDITIONS": "Warunki",
 		"LEGEND_ACTIONS": "Działania",
 		"BUTTON_ADD_CONDITION": "Dodaj warunek",
@@ -281,7 +349,7 @@
 		"SELECT_ACTION_DISCARD": "Porzuć",
 		"SELECT_FIELD_RECIPIENTS": "Adresaci (Do lub DW)",
 		"SELECT_FIELD_HEADER": "Nagłówek",
-		"SELECT_FIELD_BODY": "Body",
+		"SELECT_FIELD_BODY": "Treść",
 		"SELECT_FIELD_SIZE": "Rozmiar",
 		"SELECT_TYPE_CONTAINS": "zawiera",
 		"SELECT_TYPE_NOT_CONTAINS": "nie zawiera",
@@ -289,31 +357,31 @@
 		"SELECT_TYPE_NOT_MATCHES": "nie zawiera (*, ?)",
 		"SELECT_TYPE_REGEXP": "Wyrażenie regularne",
 		"SELECT_TYPE_NOT_REGEXP": "Niepoprawne wyrażenie regularne",
-		"SELECT_TYPE_EQUAL_TO": "Równa się",
-		"SELECT_TYPE_NOT_EQUAL_TO": "Nie równa się",
-		"SELECT_TYPE_OVER": "powyżej",
-		"SELECT_TYPE_UNDER": "poniżej",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
+		"SELECT_TYPE_EQUAL_TO": "Równe",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Nierówne",
+		"SELECT_TYPE_OVER": "Powyżej",
+		"SELECT_TYPE_UNDER": "Poniżej",
+		"SELECT_TYPE_TEXT": "Tekst",
+		"SELECT_TYPE_RAW": "Czysty tekst",
 		"SELECT_MATCH_ANY": "Spełnia dowolny z warunków",
 		"SELECT_MATCH_ALL": "Spełnia wszystkie warunki",
 		"MARK_AS_READ_LABEL": "Oznacz jako przeczytane",
 		"REPLY_INTERVAL_LABEL": "Interwał odpowiedzi (dni)",
 		"KEEP_LABEL": "Zachowaj",
-		"STOP_LABEL": "Nie zatrzymuj przetwarzania reguł",
+		"STOP_LABEL": "Zatrzymaj dalsze przetwarzanie reguł",
 		"VACATION_SUBJECT_LABEL": "Temat (opcjonalnie)",
 		"VACATION_MESSAGE_LABEL": "Wiadomość",
-		"VACATION_RECIPIENTS_LABEL": "Odbiorcy (rodzielone przecinkami)",
+		"VACATION_RECIPIENTS_LABEL": "Odbiorcy (rozdzielone przecinkami)",
 		"REJECT_MESSAGE_LABEL": "Odrzuć wiadomość",
 		"ALL_INCOMING_MESSAGES_DESC": "Wszystkie przychodzące wiadomości"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
+		"TITLE_CREATE": "Utwórz skrypt",
+		"TITLE_EDIT": "Edytuj skrypt",
+		"BUTTON_ADD_FILTER": "Dodaj filtr",
+		"BUTTON_RAW_SCRIPT": "Użyj własnego skryptu użytkownika",
+		"CAPABILITY_LABEL": "Możliwości",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Zmiany te muszą zostać zapisane na serwerze."
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
 		"TITLE_SYSTEM_FOLDERS": "Wybierz foldery systemowe",
@@ -326,7 +394,7 @@
 		"NOTIFICATION_ARCHIVE": "Nie został wybrany folder \"Archiwum\", zostanie użyty systemowy folder archiwizacji wiadomości."
 	},
 	"TITLES": {
-		"MAILBOX": "Skrzynka Odbiorcza",
+		"MAILBOX": "Skrzynka odbiorcza",
 		"SETTINGS": "Ustawienia"
 	},
 	"UPLOAD": {
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Wystąpił nieznany błąd w trakcie przesyłania pliku na serwer"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> zwykły tekst"
+		"PLAIN": "HTML <-> zwykły tekst",
+		"SOURCE": "HTML <-> ŹRÓDŁO",
+		"FONTFAMILY": "Czcionka",
+		"FONTSIZE": "Wielkość czcionki",
+		"DIR": "Kierunek tekstu",
+		"DIR_LTR": "Z lewej do prawej",
+		"DIR_RTL": "Z prawej do lewej",
+		"DIR_AUTO": "Automatycznie",
+		"TEXTCOLOR": "Kolor tekstu",
+		"BACKGROUNDCOLOR": "Kolor tła",
+		"BOLD": "Pogrubienie",
+		"ITALIC": "Kursywa",
+		"UNDERLINE": "Podkreślenie",
+		"STRIKE": "Przekreślenie",
+		"SUB": "Indeks dolny",
+		"SUP": "Indeks górny",
+		"OL": "Lista numerowana",
+		"UL": "Lista wypunktowana",
+		"QUOTE": "Cytat",
+		"INDENTDECREASE": "Zmniejsz wcięcie",
+		"INDENTINCREASE": "Zwiększ wcięcie",
+		"LINK": "Odnośnik",
+		"IMAGEURL": "Odnośnik obrazu",
+		"IMAGEUPLOAD": "Wybierz obraz",
+		"UNDO": "Cofnij",
+		"REDO": "Ponów",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Osobiste",
-		"LABEL_GENERAL_NAME": "Ogólne",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_FOLDERS_NAME": "Foldery",
-		"LABEL_ACCOUNTS_NAME": "Konta",
-		"LABEL_FILTERS_NAME": "Filtry",
-		"LABEL_SECURITY_NAME": "Bezpieczeństwo",
-		"LABEL_THEMES_NAME": "Motywy"
+		"GENERAL": "Ogólne",
+		"CONTACTS": "Kontakty",
+		"FOLDERS": "Foldery",
+		"ACCOUNTS": "Konta",
+		"FILTERS": "Filtry",
+		"SECURITY": "Bezpieczeństwo",
+		"THEMES": "Motywy"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtry",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
+		"SIMPLE": "Proste",
+		"ADVANCED": "Zaawansowane",
+		"BUTTON_ADD_SCRIPT": "Dodaj skrypt",
 		"SUBNAME_MOVE_TO": "Przenieś do \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Przekaż do \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Odrzuć",
 		"SUBNAME_VACATION_MESSAGE": "Wiadomość urlopowa",
-		"SUBNAME_DISCARD": "Porzuć",
-		"LOADING_PROCESS": "Aktualizowanie listy filtrów"
+		"SUBNAME_DISCARD": "Porzuć"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Bezpieczeństwo",
 		"LABEL_AUTOLOGOUT": "Automatyczne wylogowanie",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nidgy",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minut(a)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% godzina(-y)"
+		"FORGET_KEY_PASS": "Zapomnij hasło klucza prywatnego",
+		"NEVER": "Nigdy"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Ogólne",
-		"LABEL_LANGUAGE": "Język",
-		"LABEL_IDENTITY": "Tożsamość",
-		"LABEL_LAYOUT": "Układ",
-		"LABEL_LAYOUT_NO_SPLIT": "bez podziału",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "podział w pionie",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
-		"LABEL_EDITOR": "Format wiadomości",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "zwykły tekst",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (wymuszony)",
-		"LABEL_EDITOR_PLAIN_FORCED": "zwykły tekst (wymuszony)",
-		"LABEL_VIEW_OPTIONS": "Opcje wyświetlania",
-		"LABEL_USE_PREVIEW_PANE": "Wyświetl okno podglądu",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach",
-		"LABEL_USE_THREADS": "Używaj wątków",
-		"LABEL_REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
-		"LABEL_SHOW_IMAGES": "Zawsze wyświetlaj zewnętrzne obrazy w treści wiadomości",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Wiadomości na stronę",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Powiadomienia",
-		"LABEL_SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)"
+		"LANGUAGE": "Język",
+		"HOUR_FORMAT": "Format godziny",
+		"IDENTITY": "Tożsamość",
+		"LAYOUT": "Układ",
+		"LAYOUT_NO_SPLIT": "bez podziału",
+		"LAYOUT_VERTICAL_SPLIT": "podział w pionie",
+		"LAYOUT_HORIZONTAL_SPLIT": "podział w poziomie",
+		"SHOW_NEXT_MESSAGE": "Pokaż następną wiadomość kiedy przenosisz\/usuwasz tę wiadomość",
+		"EDITOR": "Format wiadomości",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "zwykły tekst",
+		"VIEW_OPTIONS": "Opcje wyświetlania",
+		"USE_PREVIEW_PANE": "Wyświetl okno podglądu",
+		"HIDE_DELETED_MESSAGES": "Ukryj wiadomości oznaczone do usunięcia",
+		"USE_CHECKBOXES_IN_LIST": "Pokazuj pola zaznaczenia na listach",
+		"USE_THREADS": "Używaj wątków",
+		"THREAD_ALGORITHM": "Algorytm wątków",
+		"REPLY_SAME_FOLDER": "Umieść odpowiedzi w folderach, z których pochodzą wiadomości",
+		"PREFER_HTML": "Preferuj HTML względem zwykłego tekstu",
+		"PREFER_HTML_INFO": "Wiadomości często przesyłane są w obu formatach. Ta opcja określa, czy ma być wyświetlana część HTML, czy zwykły tekst.",
+		"REMOVE_COLORS": "Usuń tło i kolory tekstu z treści wiadomości",
+		"ALLOW_STYLES": "Zezwalaj na style CSS",
+		"MESSAGE_PER_PAGE": "Wiadomości na stronę",
+		"CHECK_MAIL_INTERVAL": "Sprawdź pocztę co",
+		"MARK_MESSAGE_READ_AFTER": "Oznacz wiadomość jako przeczytaną po",
+		"MSG_DEFAULT_ACTION": "Domyślna akcja",
+		"SECONDS": "sekund",
+		"MINUTES": "minut",
+		"NOTIFICATIONS": "Powiadomienia",
+		"SOUND_NOTIFICATION": "Powiadomienia dźwiękowe",
+		"CHROME_NOTIFICATION_DESC": "Wyświetlaj powiadomienia o nowych wiadomościach",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokowane przez przeglądarkę)",
+		"COLLAPSE_BLOCKQUOTES": "Zwiń cytowany tekst",
+		"MAX_QUOTE_LEVEL": "Maksymalna ilość poziomów cytowanego tekstu",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Pokaż załączniki wbudowane na liście",
+		"LIST_SIMPLE_ATTACHMENTS": "Prosta lista załączników",
+		"LIST_MESSAGES_GROUPED": "Grupuj listę wiadomości (kiedy sortowana po dacie lub \"Od\")",
+		"EXTERNAL_IMAGES": "Zewnętrzne obrazy",
+		"IMAGES_OPTION_ASK": "Zawsze pytaj",
+		"IMAGES_OPTION_WHITELIST": "Dodaj do białej listy lub pytaj",
+		"IMAGES_OPTION_ALWAYS": "Zawsze pokazuj",
+		"IMAGES_WHITELIST": "Biała lista obrazów",
+		"MESSAGE_POPUP_WINDOW": "Pokaż w nowym oknie zamiast w nowej karcie",
+		"MAILTO": "Zarejestruj obsługę linków 'mailto:' jako domyślnego klienta poczty",
+		"HTML_TO_MD": "Konwertuj HTML na Markdown zamiast zwykłego tekstu"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automatycznie dodawaj odbiorców do książki adresowej",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Serwer",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL książki adresowej",
 		"LABEL_CONTACTS_SYNC_USER": "Użytkownik",
-		"SYNC_NO": "Nie",
-		"SYNC_YES": "Tak",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "Tylko do odczytu"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motywy",
-		"LEGEND_THEMES_CUSTOM": "Konfiguracja własnego motywu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Jasny",
-		"LABEL_CUSTOM_TYPE_DARK": "Ciemny",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Tło",
+		"LABEL_BACKGROUND": "Tło",
+		"LABEL_FONTS": "Czcionki",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Prześlij własne tło (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Plik jest za duży",
 		"ERROR_FILE_TYPE_ERROR": "Nieprawidłowy format pliku (obsługiwane są wyłącznie pliki JPG i PNG)",
@@ -435,15 +540,16 @@
 		"TO_MANY_FOLDERS_DESC_2": "Pokazaliśmy tylko część z nich aby uniknąć problemów z wydajnością.",
 		"HELP_DELETE_FOLDER": "Usuń folder",
 		"HELP_SHOW_HIDE_FOLDER": "Pokaż\/ukryj folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Sprawdzaj\/nie sprawdzaj nowych wiadomości",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Sprawdź czy są nowe wiadomości",
+		"HIDE_UNSUBSCRIBED": "Ukryj niesubskrybowane foldery",
+		"UNHIDE_KOLAB_FOLDERS": "Pokaż foldery Kolab",
+		"TYPE_CALENDAR": "Kalendarz",
+		"TYPE_CONFIGURATION": "Konfiguracja",
+		"TYPE_CONTACTS": "Kontakty",
+		"TYPE_FILES": "Pliki",
+		"TYPE_JOURNAL": "Dziennik",
+		"TYPE_NOTES": "Notatki",
+		"TYPE_TASKS": "Zadania"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "Konta",
@@ -452,15 +558,15 @@
 		"BUTTON_ADD_ACCOUNT": "Dodaj konto",
 		"BUTTON_ADD_IDENTITY": "Dodaj tożsamość",
 		"LOADING_PROCESS": "Trwa aktualizowanie listy kont",
-		"DEFAULT_IDENTITY_LABEL": "domyślna"
+		"SHOW_UNREAD": "Pokaż ilość nieprzeczytanych wiadomości"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importuj klucz",
 		"BUTTON_GENERATE_KEY_PAIR": "Generuj klucz",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Prywatny",
 		"TITLE_PUBLIC": "Publiczny",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatycznie zapisuj szkic",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "Pobierz dodatek do przeglądarki Mailvelope."
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "Pomoc dotycząca skrótów klawiaturowych",
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Odpowiedz wszystkim",
 		"LABEL_FORWARD": "Przekaż dalej",
 		"LABEL_FORWARD_MULTIPLY": "Przekaż dalej jako załącznik(i)",
-		"LABEL_HELP": "Pomoc",
 		"LABEL_CHECK_ALL": "Zaznacz wszystkie wiadomości",
 		"LABEL_DELETE": "Usuń",
 		"LABEL_OPEN_THREAD": "Otwórz wybrany wątek",
@@ -490,51 +595,54 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Cytowanie wiadomości",
 		"LABEL_THREAD_NEXT": "Następna wiadomość w wątku",
 		"LABEL_THREAD_PREV": "Poprzednia wiadomość w wątku",
-		"LABEL_PRINT": "Drukuj",
 		"LABEL_EXIT_FULLSCREEN": "Opuść tryb pełnoekranowy",
 		"LABEL_CLOSE_MESSAGE": "Zamknij wiadomość (nieaktywny podgląd wiadomości)",
 		"LABEL_SWITCH_TO_LIST": "Wróć do widoku listy wiadomości",
 		"LABEL_OPEN_COMPOSE_POPUP": "Otwórz okno tworzenia wiadomości",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Zminimalizuj okienko tworzenia",
 		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Otwórz menu wyboru tożsamości",
 		"LABEL_SAVE_MESSAGE": "Zapisz wiadomość",
 		"LABEL_SEND_MESSAGE": "Wyślij wiadomość",
 		"LABEL_CLOSE_COMPOSE": "Zamknij okno tworzenia wiadomości"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Nieprawidłowy token",
-		"AUTH_ERROR": "Błąd autoryzacji",
-		"CONNECTION_ERROR": "Błąd połączenia z serwerem",
-		"DOMAIN_ALREADY_EXISTS": "Domena już istnieje",
-		"DOMAIN_NOT_ALLOWED": "Domena jest niedozwolona",
-		"ACCOUNT_NOT_ALLOWED": "Konto nie jest dozwolone",
-		"CONTACTS_SYNC_ERROR": "Błąd synchronizacji kontaktów",
-		"CANT_GET_MESSAGE_LIST": "Nie można pobrać listy wiadomości",
-		"CANT_GET_MESSAGE": "Nie można pobrać wiadomości",
-		"CANT_DELETE_MESSAGE": "Nie można usunąć wiadomości",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Nie można przenieść wiadomości",
-		"CANT_SAVE_MESSAGE": "Nie można zapisać wiadomości",
-		"CANT_SEND_MESSAGE": "Nie można wysłać wiadomości",
-		"INVALID_RECIPIENTS": "Nieprawidłowy adres odbiorcy",
-		"CANT_SAVE_FILTERS": "Nie można zapisać filtrów",
-		"CANT_GET_FILTERS": "Nie można pobrać filtrów",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtry są nieprawidłowe",
-		"CANT_CREATE_FOLDER": "Nie można utworzyć folderu",
-		"CANT_RENAME_FOLDER": "Nie można zmienić nazwy folderu",
-		"CANT_DELETE_FOLDER": "Nie można usunąć folderu",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nie można usunąć folderu, w którym znajdują się wiadomości",
-		"CANT_SUBSCRIBE_FOLDER": "Nie można zasubskrybować folderu",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nie można usunąć subskrypcji folderu",
-		"DEMO_SEND_MESSAGE_ERROR": "Ze względów bezpieczeństwa konto testowe nie ma możliwości przesyłania wiadomości na zewnętrzne adresy e-mail.",
-		"DEMO_ACCOUNT_ERROR": "Ze względów bezpieczeństwa ta akcja jest niedozwolona na tym koncie!",
-		"ACCOUNT_ALREADY_EXISTS": "Konto o takiej nazwie już istnieje",
-		"ACCOUNT_DOES_NOT_EXIST": "Konto nie istnieje",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Wystąpił błąd w trakcie połączenia z serwerem poczty",
-		"INVALID_INPUT_ARGUMENT": "Nieprawidłowy argument",
-		"UNKNOWN_ERROR": "Nieznany błąd"
+		"RequestError": "Zapytanie zakończone niepowodzeniem",
+		"RequestAborted": "Zapytanie przerwane",
+		"RequestTimeout": "Upłynął limit czasu",
+		"InvalidToken": "Nieprawidłowy token",
+		"AuthError": "Uwierzytelnienie zakończone niepowodzeniem",
+		"ConnectionError": "Nie można połączyć z serwerem",
+		"DomainAlreadyExists": "Domena już istnieje",
+		"DomainNotAllowed": "Domena jest niedozwolona",
+		"AccountNotAllowed": "Konto nie jest dozwolone",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Błąd synchronizacji kontaktów",
+		"CantGetMessageList": "Nie można pobrać listy wiadomości",
+		"CantGetMessage": "Nie można pobrać wiadomości",
+		"CantDeleteMessage": "Nie można usunąć wiadomości",
+		"CantCopyMessage": "Nie można skopiować wiadomości",
+		"CantMoveMessage": "Nie można przenieść wiadomości",
+		"CantSaveMessage": "Nie można zapisać wiadomości",
+		"CantSendMessage": "Nie można wysłać wiadomości",
+		"InvalidRecipients": "Nieprawidłowy adres odbiorcy",
+		"CantSaveFilters": "Nie można zapisać filtrów",
+		"CantGetFilters": "Nie można pobrać filtrów",
+		"CantActivateFiltersScript": "Nie można aktywować skryptu filtrów",
+		"CantDeleteFiltersScript": "Nie można usunąć skryptu filtrów",
+		"FiltersAreNotCorrect": "Filtry są nieprawidłowe",
+		"CantCreateFolder": "Nie można utworzyć folderu",
+		"CantRenameFolder": "Nie można zmienić nazwy folderu",
+		"CantDeleteFolder": "Nie można usunąć folderu",
+		"CantDeleteNonEmptyFolder": "Nie można usunąć folderu, w którym znajdują się wiadomości",
+		"CantSubscribeFolder": "Nie można zasubskrybować folderu",
+		"CantUnsubscribeFolder": "Nie można usunąć subskrypcji folderu",
+		"DemoSendMessageError": "Ze względów bezpieczeństwa konto testowe nie ma możliwości przesyłania wiadomości na zewnętrzne adresy e-mail.",
+		"DemoAccountError": "Ze względów bezpieczeństwa ta akcja jest niedozwolona na tym koncie!",
+		"AccountAlreadyExists": "Konto o takiej nazwie już istnieje",
+		"AccountDoesNotExist": "Konto nie istnieje",
+		"AccountSwitchFailed": "Przełączenie na konto \"%EMAIL%\" nie powiodło się",
+		"MailServerError": "Wystąpił błąd w trakcie połączenia z serwerem poczty",
+		"InvalidInputArgument": "Nieprawidłowy argument",
+		"UnknownError": "Nieznany błąd"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
index 9562e5153..d0916e72a 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Adicionar",
+		"CLOSE": "Fechar",
 		"SAVE": "Salvar",
-		"UPDATE": "Atualizar"
+		"TEST": "Testar",
+		"UPDATE": "Atualizar",
+		"USERNAME": "Nome de usuário",
+		"PASSWORD": "Senha",
+		"CANCEL": "Cancelar",
+		"SEARCH": "Nenhum contato encontrado",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Usuário",
-		"LABEL_PASSWORD": "Senha",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Entrar no painel administrativo"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Painel Administrativo"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Geral",
-		"LABEL_LOGIN_NAME": "Login",
-		"LABEL_BRANDING_NAME": "Personalizar",
-		"LABEL_CONTACTS_NAME": "Contatos",
-		"LABEL_DOMAINS_NAME": "Domínios",
-		"LABEL_SECURITY_NAME": "Segurança",
-		"LABEL_PACKAGES_NAME": "Pacotes",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Sobre"
+		"GENERAL": "Geral",
+		"LOGIN": "Login",
+		"BRANDING": "Personalizar",
+		"CONTACTS": "Contatos",
+		"DOMAINS": "Domínios",
+		"SECURITY": "Segurança",
+		"PACKAGES": "Pacotes",
+		"CONFIG": "Config",
+		"ABOUT": "Sobre"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Interface",
@@ -31,13 +39,12 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir escolha do idioma na tela de configurações",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir escolha do tema na tela de configurações",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir escolha de Imagem de Fundo na tela de configurações",
-		"LABEL_NEW_FOLDER_MOVE": "Novo botão \"Mover para pasta\"",
 		"LABEL_SHOW_THUMBNAILS": "Mostrar imagem miniatura (Anexos)",
 		"LEGEND_MAIN": "Principal",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Tamanho limite de anexo",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Permitir contas adicionais",
 		"LABEL_ALLOW_IDENTITIES": "Permitir identidades multiplas",
-		"ALERT_DATA_ACCESS": "A pasta de dados RainLoop está acessível. Por favor configure o seu servidor web para esconder a pasta de dados do acesso externo. Leia mais aqui:",
+		"ALERT_DATA_ACCESS": "A pasta de dados SnappyMail está acessível. Por favor configure o seu servidor web para esconder a pasta de dados do acesso externo. Leia mais aqui:",
 		"ALERT_WARNING": "Aviso!",
 		"HTML_ALERT_WEAK_PASSWORD": "Você está usando a senha administrativa padrão.\n<br>\nPor motivo de segurança por favor\n<strong><a href=\"#\/security\">troque a senha<\/a><\/strong>\nagora.\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Domínio padrão",
 		"LABEL_DETERMINE_USER_DOMAIN": "Tentar determinar o domínio do usuário",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permitir escolha do idioma na tela de entrada",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Tentar determinar o idioma do usuário",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Tentar determinar o idioma do usuário"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Personalização",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Usuário",
 		"LABEL_STORAGE_PASSWORD": "Senha",
-		"BUTTON_TEST": "Testar",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Aviso!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Não use este tipo de banco de dados com um grande número de usuários ativos.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "O seu sistema não suporta o uso dos contatos.\n<br>\nVocê precisa instalar ou habilitar a extensão <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> em seu servidor.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
 		"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
-		"LABEL_ALLOW_OPEN_PGP": "Permitir OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Mostar informações PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel Administrativo",
 		"LABEL_CURRENT_PASSWORD": "Senha atual",
-		"LABEL_NEW_LOGIN": "Usuário",
 		"LABEL_NEW_PASSWORD": "Nova senha",
 		"LABEL_REPEAT_PASSWORD": "Confirmar nova senha",
-		"BUTTON_UPDATE_PASSWORD": "Atualizar",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Exigir verificação do certificado SSL (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Exigir verificação do certificado SSL",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados auto-assinados"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Leitor de email web simples, moderno & rápido.",
 		"LABEL_ALL_RIGHTS_RESERVED": "Todos os direitos reservados.",
 		"HINT_READ_CHANGE_LOG": "Por favor, leia o registro de alterações antes de atualizar.",
-		"HINT_IS_UP_TO_DATE": "RainLoop está atualizado.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail está atualizado.",
 		"HTML_NEW_VERSION": "Está disponível uma nova versão: <b>%VERSION%<\/b>.",
 		"LABEL_UPDATING": "Atualizando",
 		"LABEL_CHECKING": "Checar por atualizações",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Adicionar apelido (Alias)",
 		"LABEL_ALIAS": "Apelido (Alias)",
-		"LABEL_DOMAIN": "Domínio",
-		"BUTTON_CLOSE": "Fechar",
-		"BUTTON_ADD": "Adicionar"
+		"LABEL_DOMAIN": "Domínio"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Adicionar Domínio",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Editar Domínio \"%NAME%\"",
 		"LABEL_NAME": "Domínio",
 		"NAME_HELPER": "curinga (wildcard) suportado",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Servidor",
 		"LABEL_PORT": "Porta",
 		"LABEL_SECURE": "Criptografia",
-		"LABEL_WHITE_LIST": "Lista branca",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Nenhuma",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permitir scripts sieve",
 		"LABEL_USE_SHORT_LOGIN": "Usar login curto",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Usar autenticação",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Usar função php mail()",
-		"BUTTON_TEST": "Testar",
 		"BUTTON_WHITE_LIST": "Lista branca",
-		"BUTTON_SIEVE_CONFIGURATION": "Configurações Sieve",
-		"BUTTON_BACK_TO_IMAP": "Voltar para as configurações IMAP",
-		"BUTTON_BACK": "Voltar",
-		"BUTTON_CLOSE": "Fechar",
-		"BUTTON_ADD": "Adicionar",
-		"BUTTON_UPDATE": "Atualizar",
-		"NEW_DOMAIN_DESC": "Esta configuração de domínio lhe permitirá trabalhar <br> com endereços de e-mail do <i>%NAME%<\/i>.",
-		"WHITE_LIST_ALERT": "Filtrar com lista dos únicos usuários do domínio que terão acesso ao webmail.\nUse um espaço como delimitador.\n"
+		"NEW_DOMAIN_DESC": "Esta configuração de domínio lhe permitirá trabalhar  com endereços de e-mail do <strong>%NAME%<\/strong>.",
+		"WHITE_LIST_ALERT": "Filtrar com lista dos únicos usuários do domínio que terão acesso ao webmail.\nUse um espaço como delimitador.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Plugin",
-		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar",
-		"BUTTON_CLOSE": "Fechar"
+		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Você tem certeza que deseja fechar esta janela?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instável",
 		"WARNING": "Aviso!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Erro desconhecido"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Senha inválida",
-		"AUTH_ERROR": "Falha na autenticação",
-		"DOMAIN_ALREADY_EXISTS": "O domínio já existe",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Não foi possível salvar as configurações",
-		"CANT_INSTALL_PACKAGE": "Erro ao instalar pacote de plugin",
-		"CANT_DELETE_PACKAGE": "Erro ao remover pacote de plugin",
-		"INVALID_PLUGIN_PACKAGE": "Pacote de plugins inválido",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Pacote de plugins insuportados",
-		"UNKNOWN_ERROR": "Erro desconhecido"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Senha inválida",
+		"AuthError": "Falha na autenticação",
+		"DomainAlreadyExists": "O domínio já existe",
+		"CantSavePluginSettings": "Não foi possível salvar as configurações",
+		"CantInstallPackage": "Erro ao instalar pacote de plugin",
+		"CantDeletePackage": "Erro ao remover pacote de plugin",
+		"InvalidPluginPackage": "Pacote de plugins inválido",
+		"UnsupportedPluginPackage": "Pacote de plugins insuportados",
+		"UnknownError": "Erro desconhecido"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/pt-BR/user.json b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
index 58e732400..e10e78c3f 100644
--- a/snappymail/v/0.0.0/app/localization/pt-BR/user.json
+++ b/snappymail/v/0.0.0/app/localization/pt-BR/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arquivo",
 		"ARE_YOU_SURE": "Você tem certeza?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Fechar (Esc)",
 		"CONTACTS": "Contatos",
 		"DELETE": "Excluir",
+		"UNDELETE": "Undelete",
 		"DONE": "Concluir",
 		"EMAIL": "E-mail",
 		"FROM": "De",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Sair",
 		"MORE": "Mais",
 		"MOVE_TO": "Mover Para",
+		"COPY_TO": "Copiar para",
 		"NAME": "Caixa de Entrada",
 		"NONE": "Nenhum",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Não é Lixo Eletrônico",
+		"USERNAME": "Nome de usuário",
 		"PASSWORD": "Senha",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Responder para",
 		"SAVE": "Salvar",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Nenhum contato encontrado",
 		"SPAM": "Lixo Eletrônico",
 		"SUBJECT": "Assunto",
 		"TEST": "Testar",
-		"TO": "Para"
+		"TO": "Para",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Sim",
+		"NO": "Não",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "padrão",
+		"HELP": "Ajuda",
+		"TEXT": "Texto",
+		"ATTACHMENTS": "Anexos"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Usuário",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Entrar"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Adicionar Conta",
-		"BUTTON_SETTINGS": "Configurações",
-		"BUTTON_HELP": "Ajuda"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versão Mobile",
-		"BUTTON_DESKTOP_VERSION": "Versão Desktop"
+		"BUTTON_ADD_ACCOUNT": "Adicionar Conta"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Pesquisa Avançada",
-		"LABEL_ADV_TEXT": "Texto",
-		"LABEL_ADV_HAS_ATTACHMENT": "Com anexo",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Com anexos",
-		"LABEL_ADV_FLAGGED": "Sinalizada",
-		"LABEL_ADV_UNSEEN": "Não Lida",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Qualquer",
-		"LABEL_ADV_DATE_3_DAYS": "Até 3 dias atrás",
-		"LABEL_ADV_DATE_7_DAYS": "Até 1 semana atrás",
-		"LABEL_ADV_DATE_MONTH": "Até 1 mês atrás",
-		"LABEL_ADV_DATE_3_MONTHS": "Até 3 meses atrás",
-		"LABEL_ADV_DATE_6_MONTHS": "Até 6 meses atrás",
-		"LABEL_ADV_DATE_YEAR": "Até 1 ano atrás",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Em tela cheia",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Fechar (Esc)",
-		"GALLERY_PREV": "Anterior (Seta p\/ Esquerda)",
-		"GALLERY_NEXT": "Posterior (Seta p\/ Direita)",
-		"GALLERY_COUNTER": "%curr% de %total%"
+		"TEXT": "Texto",
+		"HAS_ATTACHMENT": "Com anexo",
+		"FLAGGED": "Sinalizada",
+		"UNSEEN": "Não Lida",
+		"DATE": "Data",
+		"DATE_ALL": "Qualquer",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Até 3 dias atrás",
+		"SINCE_7_DAYS": "Até 1 semana atrás",
+		"SINCE_MONTH": "Até 1 mês atrás",
+		"SINCE_3_MONTHS": "Até 3 meses atrás",
+		"SINCE_6_MONTHS": "Até 6 meses atrás",
+		"SINCE_YEAR": "Até 1 ano atrás",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Respondidas",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compor",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Lixeira",
 		"ARCHIVE_NAME": "Arquivadas"
 	},
-	"QUOTA": {
-		"TITLE": "Uso do Armazenamento"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Atualizar Lista de Mensagens",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Lidas",
 		"MENU_SELECT_FLAGGED": "Sinalizadas",
 		"MENU_SELECT_UNFLAGGED": "Não Sinalizadas",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Lista Vazia.",
 		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde a sua pesquisa.",
 		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Voltar para a lista de mensagens",
-		"EMPTY_SUBJECT_TEXT": "(Sem assunto)",
 		"PUT_MESSAGE_HERE": "Coloque a mensagem aqui para vê-la na lista",
 		"TODAY_AT": "Hoje as %TIME%",
 		"YESTERDAY_AT": "Ontem as %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Você tem %COUNT% novas mensagens!",
 		"QUOTA_SIZE": "Utilizando <strong>%SIZE% (%PROC%%)<\/strong> de <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Mostrar original",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Baixar como arquivo .eml",
 		"MENU_FILTER_SIMILAR": "Filtrar mensagens como esta",
 		"MENU_PRINT": "Imprimir",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel esquerdo para selecionar o destino.",
 		"LINK_DOWNLOAD_AS_ZIP": "Baixar como zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Aviso de recepção (Visualizada) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Procurando..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Adicionar Contato",
 		"BUTTON_CREATE_CONTACT": "Criar",
-		"BUTTON_UPDATE_CONTACT": "Atualizar",
 		"BUTTON_IMPORT": "Importar (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exportar (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exportar (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nenhum contato encontrado",
 		"CLEAR_SEARCH": "Limpar pesquisa",
 		"CONTACT_VIEW_DESC": "Selecione um contato na lista para visualizá-lo.",
-		"LABEL_PHONE": "Telefone",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Aniversário",
-		"LINK_ADD_EMAIL": "Adicionar um endereço e-mail",
-		"LINK_ADD_PHONE": "Adicionar um telefone",
-		"LINK_BIRTHDAY": "Aniversário",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Digite o nome de exibição",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Digite o sobrenome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Digite o primeiro nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Digite o apelido",
+		"DISPLAY_NAME": "Nome de exibição",
+		"LAST_NAME": "Sobrenome",
+		"FIRST_NAME": "Primeiro nome",
+		"MIDDLE_NAME": "Nomes adicionais",
+		"NAME_PREFIX": "Prefixo do nome",
+		"NAME_SUFFIX": "Sufixo do nome",
+		"NICK_NAME": "Apelido",
 		"LABEL_READ_ONLY": "Somente Leitura",
-		"LABEL_SHARE": "Compartilhar",
 		"ADD_MENU_LABEL": "Adicionar",
 		"ADD_MENU_NICKNAME": "Apelido",
-		"ADD_MENU_NOTES": "Observações",
+		"ADD_MENU_NOTE": "Observações",
 		"ADD_MENU_PHONE": "Telefone",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Endereço",
 		"ADD_MENU_BIRTHDAY": "Aniversário",
 		"ADD_MENU_TAGS": "Tags",
 		"BUTTON_SHARE_ALL": "Todos",
-		"BUTTON_SYNC": "Sincronização (CardDAV)"
+		"BUTTON_SYNC": "Sincronização (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Exibir todos os campos",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Não há anexos aqui.",
 		"ATTACHMENTS_ERROR_DESC": "Alerta! Nem todos os arquivos foram anexados.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alguns anexos ainda não foram completamente enviados",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho",
 		"BUTTON_REQUEST_READ_RECEIPT": "Pedir recibo de leitura",
 		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
-		"BUTTON_REQUEST_DSN": "Pedir recibo de entrega"
+		"BUTTON_REQUEST_DSN": "Pedir recibo de entrega",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Sim",
-		"BUTTON_NO": "Não",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Você tem certeza que deseja fechar esta janela?",
 		"DESC_WANT_DELETE_MESSAGES": "Você tem certeza de que deseja excluir essa(s) mensagem(s)?"
 	},
@@ -226,14 +273,14 @@
 	"POPUPS_ADD_ACCOUNT": {
 		"TITLE_ADD_ACCOUNT": "Nova conta",
 		"BUTTON_ADD_ACCOUNT": "Adicionar",
-		"TITLE_UPDATE_ACCOUNT": "Atualizar Conta?",
-		"BUTTON_UPDATE_ACCOUNT": "Atualizar"
+		"TITLE_UPDATE_ACCOUNT": "Atualizar Conta?"
 	},
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adicionar identidade",
-		"TITLE_UPDATE_IDENTITY": "Atualizar identidade?",
+		"TITLE_UPDATE_IDENTITY": "Atualizar identidade",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adicionar",
-		"BUTTON_UPDATE_IDENTITY": "Atualizar",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Inserir esta assinatura antes do texto citado nas respostas"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não poderá ser interrompido ou cancelado.",
 		"TITLE_CLEARING_PROCESS": "Excluindo a pasta..."
 	},
+	"CRYPTO": {
+		"SIGN": "Assinar",
+		"ENCRYPT": "Criptografar",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
+		"ERROR": "Erro %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importar chave OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Importar",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Gerar chave OpenPGP",
 		"POPUP_GENERATE_BUTTON": "Gerar",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Assinar",
-		"LABEL_ENCRYPT": "Criptografar",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Mensagem assinada com OpenPGP",
 		"ENCRYPTED_MESSAGE": "Mensagem criptografada com OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
-		"ERROR": "Erro OpenPGP: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Mensagem assinada com S\/MIME",
+		"ENCRYPTED_MESSAGE": "Mensagem criptografada com S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Criar um filtro?",
-		"TITLE_EDIT_FILTER": "Atualizar filtro?",
+		"TITLE_CREATE_FILTER": "Criar um filtro",
+		"TITLE_EDIT_FILTER": "Atualizar filtro",
 		"LEGEND_CONDITIONS": "Condições",
 		"LEGEND_ACTIONS": "Ações",
 		"BUTTON_ADD_CONDITION": "Adicionar uma Condição",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Marcar como Lida",
 		"REPLY_INTERVAL_LABEL": "Responder intervalo (dias)",
 		"KEEP_LABEL": "Manter",
-		"STOP_LABEL": "Não parar o processamento das regras",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
 		"VACATION_MESSAGE_LABEL": "Mensagem",
 		"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgulas)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Ocorreu um erro de envio de arquivo desconhecido"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXTO"
+		"PLAIN": "HTML <-> TEXTO",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Pessoal",
-		"LABEL_GENERAL_NAME": "Geral",
-		"LABEL_CONTACTS_NAME": "Contatos",
-		"LABEL_FOLDERS_NAME": "Pastas",
-		"LABEL_ACCOUNTS_NAME": "Contas",
-		"LABEL_FILTERS_NAME": "Filtros",
-		"LABEL_SECURITY_NAME": "Segurança",
-		"LABEL_THEMES_NAME": "Temas"
+		"GENERAL": "Geral",
+		"CONTACTS": "Contatos",
+		"FOLDERS": "Pastas",
+		"ACCOUNTS": "Contas",
+		"FILTERS": "Filtros",
+		"SECURITY": "Segurança",
+		"THEMES": "Temas"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtros",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Rejeitar",
 		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
-		"SUBNAME_DISCARD": "Descartar",
-		"LOADING_PROCESS": "Atualizando Lista de filtros"
+		"SUBNAME_DISCARD": "Descartar"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Segurança",
 		"LABEL_AUTOLOGOUT": "Deslogar Automaticamente",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minutos",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hora(s)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Nunca"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Geral",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidade",
-		"LABEL_LAYOUT": "Painel de Leitura",
-		"LABEL_LAYOUT_NO_SPLIT": "Sem divisão",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
-		"LABEL_EDITOR": "Editor de texto padrão",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Texto Simples",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forçado)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Texto Simples (forçado)",
-		"LABEL_VIEW_OPTIONS": "Opções de Visualização",
-		"LABEL_USE_PREVIEW_PANE": "Usar painel de pré-visualização",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista",
-		"LABEL_USE_THREADS": "Agrupar mensagens por conversa",
-		"LABEL_REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
-		"LABEL_SHOW_IMAGES": "Sempre exibir imagens no corpo da mensagem",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Mensagens por Página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Idioma",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identidade",
+		"LAYOUT": "Painel de Leitura",
+		"LAYOUT_NO_SPLIT": "Sem divisão",
+		"LAYOUT_VERTICAL_SPLIT": "Divisão Vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Divisão Horizontal",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Editor de texto padrão",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Texto Simples",
+		"VIEW_OPTIONS": "Opções de Visualização",
+		"USE_PREVIEW_PANE": "Usar painel de pré-visualização",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para exclusão",
+		"USE_CHECKBOXES_IN_LIST": "Exibir caixas de seleção na lista",
+		"USE_THREADS": "Agrupar mensagens por conversa",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Colocar resposta na mesma pasta da mensagem respondida",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Mensagens por Página",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notificações",
-		"LABEL_SOUND_NOTIFICATION": "Notificação sonora",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notificações",
+		"SOUND_NOTIFICATION": "Notificação sonora",
+		"CHROME_NOTIFICATION_DESC": "Mostrar notificação popup para novas mensagens",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente os destinatários na lista de endereços",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL da lista de contatos",
 		"LABEL_CONTACTS_SYNC_USER": "Usuário",
-		"SYNC_NO": "Não",
-		"SYNC_YES": "Sim",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configurar tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Escuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Plano de fundo",
+		"LABEL_BACKGROUND": "Plano de fundo",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Enviar imagem de plano de fundo(JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Arquivo muito grande",
 		"ERROR_FILE_TYPE_ERROR": "Tipo de arquivo inválido (somente JPG e PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Mostraremos apenas uma parte delas, para evitar problemas de desempenho.",
 		"HELP_DELETE_FOLDER": "Deletar pasta",
 		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/esconder pasta",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Ativar\/Desativar verificação por novas mensagens",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Ativar verificação por novas mensagens",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Adicionar uma conta",
 		"BUTTON_ADD_IDENTITY": "Adicionar uma identidade",
 		"LOADING_PROCESS": "Atualizando a lista de contas",
-		"DEFAULT_IDENTITY_LABEL": "padrão"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importa chave",
 		"BUTTON_GENERATE_KEY_PAIR": "Gerar chave",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privado",
 		"TITLE_PUBLIC": "Público",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvar automaticamente rascunho",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Responder todos",
 		"LABEL_FORWARD": "Encaminhar",
 		"LABEL_FORWARD_MULTIPLY": "Encaminhar como anexo",
-		"LABEL_HELP": "Ajuda",
 		"LABEL_CHECK_ALL": "Selecionar todas as mensagens",
 		"LABEL_DELETE": "Excluir",
 		"LABEL_OPEN_THREAD": "Abrir conversa selecionada",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Alternar blocos de citações de mensagem",
 		"LABEL_THREAD_NEXT": "Mensagem seguinte na conversa",
 		"LABEL_THREAD_PREV": "Mensagem anterior na conversa",
-		"LABEL_PRINT": "Imprimir",
 		"LABEL_EXIT_FULLSCREEN": "Sair do modo tela-cheia",
 		"LABEL_CLOSE_MESSAGE": "Fechar mensagem (Sem pré-visualização)",
 		"LABEL_SWITCH_TO_LIST": "Mudar o foco volta para a lista de mensagens",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Fechar composição"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Senha inválida",
-		"AUTH_ERROR": "Falha na autenticação",
-		"CONNECTION_ERROR": "Não foi possível conectar-se ao servidor",
-		"DOMAIN_ALREADY_EXISTS": "O domínio já existe",
-		"DOMAIN_NOT_ALLOWED": "Este domínio não é permitido",
-		"ACCOUNT_NOT_ALLOWED": "Conta não permitida",
-		"CONTACTS_SYNC_ERROR": "Erro na sincronização dos contatos",
-		"CANT_GET_MESSAGE_LIST": "Não foi possível obter a lista de mensagens",
-		"CANT_GET_MESSAGE": "Não foi possível obter a mensagem",
-		"CANT_DELETE_MESSAGE": "Não foi possível excluir a mensagem",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Não foi possível mover a mensagem",
-		"CANT_SAVE_MESSAGE": "Não foi possível salvar a mensagem",
-		"CANT_SEND_MESSAGE": "Não foi possível enviar a mensagem",
-		"INVALID_RECIPIENTS": "Destinatário inválido",
-		"CANT_SAVE_FILTERS": "Não é possível salvar os filtros",
-		"CANT_GET_FILTERS": "Não é possível obter os filtros",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Os filtros não estão corretos",
-		"CANT_CREATE_FOLDER": "Não foi possível criar a pasta",
-		"CANT_RENAME_FOLDER": "Não foi possível renomear a pasta",
-		"CANT_DELETE_FOLDER": "Não foi possível exluir a pasta",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Não é possível excluir diretório não vazio",
-		"CANT_SUBSCRIBE_FOLDER": "Não foi possível inscrever esta pasta",
-		"CANT_UNSUBSCRIBE_FOLDER": "Não foi possível desinscrever esta pasta",
-		"DEMO_SEND_MESSAGE_ERROR": "Por motivos de segurança, esta conta demo não tem permissão para enviar mensagens para endereços de e-mail externo!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Esta conta já existe",
-		"ACCOUNT_DOES_NOT_EXIST": "Conta não existente",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Ocorreu um erro ao acessar o servidor de e-mail",
-		"INVALID_INPUT_ARGUMENT": "Argumento de entrada inválido",
-		"UNKNOWN_ERROR": "Erro desconhecido"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Senha inválida",
+		"AuthError": "Falha na autenticação",
+		"ConnectionError": "Não foi possível conectar-se ao servidor",
+		"DomainAlreadyExists": "O domínio já existe",
+		"DomainNotAllowed": "Este domínio não é permitido",
+		"AccountNotAllowed": "Conta não permitida",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Erro na sincronização dos contatos",
+		"CantGetMessageList": "Não foi possível obter a lista de mensagens",
+		"CantGetMessage": "Não foi possível obter a mensagem",
+		"CantDeleteMessage": "Não foi possível excluir a mensagem",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Não foi possível mover a mensagem",
+		"CantSaveMessage": "Não foi possível salvar a mensagem",
+		"CantSendMessage": "Não foi possível enviar a mensagem",
+		"InvalidRecipients": "Destinatário inválido",
+		"CantSaveFilters": "Não é possível salvar os filtros",
+		"CantGetFilters": "Não é possível obter os filtros",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Os filtros não estão corretos",
+		"CantCreateFolder": "Não foi possível criar a pasta",
+		"CantRenameFolder": "Não foi possível renomear a pasta",
+		"CantDeleteFolder": "Não foi possível exluir a pasta",
+		"CantDeleteNonEmptyFolder": "Não é possível excluir diretório não vazio",
+		"CantSubscribeFolder": "Não foi possível inscrever esta pasta",
+		"CantUnsubscribeFolder": "Não foi possível desinscrever esta pasta",
+		"DemoSendMessageError": "Por motivos de segurança, esta conta demo não tem permissão para enviar mensagens para endereços de e-mail externo!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Esta conta já existe",
+		"AccountDoesNotExist": "Conta não existente",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Ocorreu um erro ao acessar o servidor de e-mail",
+		"InvalidInputArgument": "Argumento de entrada inválido",
+		"UnknownError": "Erro desconhecido"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/pt-PT/relativetimeformat.js
deleted file mode 100644
index 86596829b..000000000
--- a/snappymail/v/0.0.0/app/localization/pt-PT/relativetimeformat.js
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-	year: {
-		past: {
-			one: "há {0} ano",
-			other: "há {0} anos"
-		},
-		future: {
-			one: "dentro de {0} ano",
-			other: "dentro de {0} anos"
-		}
-	},
-	month: {
-		past: {
-			one: "há {0} mês",
-			other: "há {0} meses"
-		},
-		future: {
-			one: "dentro de {0} mês",
-			other: "dentro de {0} meses"
-		}
-	},
-	week: {
-		past: {
-			one: "há {0} semana",
-			other: "há {0} semanas"
-		},
-		future: {
-			one: "dentro de {0} semana",
-			other: "dentro de {0} semanas"
-		}
-	},
-	day: {
-		past: {
-			one: "há {0} dia",
-			other: "há {0} dias"
-		},
-		future: {
-			one: "dentro de {0} dia",
-			other: "dentro de {0} dias"
-		}
-	},
-	hour: {
-		past: {
-			one: "há {0} hora",
-			other: "há {0} horas"
-		},
-		future: {
-			one: "dentro de {0} hora",
-			other: "dentro de {0} horas"
-		}
-	},
-	minute: {
-		past: {
-			one: "há {0} minuto",
-			other: "há {0} minutos"
-		},
-		future: {
-			one: "dentro de {0} minuto",
-			other: "dentro de {0} minutos"
-		}
-	},
-	second: {
-		past: {
-			one: "há {0} segundo",
-			other: "há {0} segundos"
-		},
-		future: {
-			one: "dentro de {0} segundo",
-			other: "dentro de {0} segundos"
-		}
-	},
-	plural: n => 1 == n ? 'one' : 'other'
-}
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/user.json b/snappymail/v/0.0.0/app/localization/pt-PT/user.json
deleted file mode 100644
index 1516bd1b3..000000000
--- a/snappymail/v/0.0.0/app/localization/pt-PT/user.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-	"GLOBAL": {
-		"TO_ARCHIVE": "Arquivo",
-		"ARE_YOU_SURE": "Tem a certeza?",
-		"BACK": "Voltar",
-		"BCC": "BCC",
-		"CANCEL": "Cancelar",
-		"CC": "CC",
-		"CLEAR": "Limpar",
-		"CLOSE": "Fechar (Esc)",
-		"CONTACTS": "Contactos",
-		"DELETE": "Eliminar",
-		"DONE": "Terminado",
-		"EMAIL": "Email",
-		"FROM": "De",
-		"LOADING": "A carregar...",
-		"LOGOUT": "Sair",
-		"MORE": "Mais",
-		"MOVE_TO": "Mover para",
-		"NAME": "Caixa de entrada",
-		"NONE": "Nenhum",
-		"NOT_SPAM": "Não é spam",
-		"PASSWORD": "Palavra-passe",
-		"REPLY_TO": "Resp.-Para",
-		"SAVE": "Guardar",
-		"SEARCH": "Nenhum contacto encontrado",
-		"SPAM": "Marcar como spam",
-		"SUBJECT": "Assunto",
-		"TEST": "Testar",
-		"TO": "Para"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Utilizador",
-		"LABEL_SIGN_ME": "Lembrar-me",
-		"BUTTON_SIGN_IN": "Entrar"
-	},
-	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Adicionar conta",
-		"BUTTON_SETTINGS": "Definições",
-		"BUTTON_HELP": "Ajuda"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
-	},
-	"SEARCH": {
-		"TITLE_ADV": "Pesquisa avançada",
-		"LABEL_ADV_TEXT": "Texto",
-		"LABEL_ADV_HAS_ATTACHMENT": "Tem anexo",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Tem anexos",
-		"LABEL_ADV_FLAGGED": "Sinalizada",
-		"LABEL_ADV_UNSEEN": "Não lida",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Qualquer",
-		"LABEL_ADV_DATE_3_DAYS": "Até 3 dias atrás",
-		"LABEL_ADV_DATE_7_DAYS": "Até 1 semana atrás",
-		"LABEL_ADV_DATE_MONTH": "Até 1 mês atrás",
-		"LABEL_ADV_DATE_3_MONTHS": "Até 3 meses atrás",
-		"LABEL_ADV_DATE_6_MONTHS": "Até 6 meses atrás",
-		"LABEL_ADV_DATE_YEAR": "Até 1 ano atrás",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Alternar ecrã-inteiro",
-		"ZOOM": "Zoom +\/-",
-		"CLOSE": "Fechar (Esc)",
-		"GALLERY_PREV": "Anterior (seta p\/ esquerda)",
-		"GALLERY_NEXT": "Próxima (seta p\/ direita)",
-		"GALLERY_COUNTER": "%curr% de %total%"
-	},
-	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Compor",
-		"BUTTON_NEW_MESSAGE": "New message",
-		"INBOX_NAME": "Caixa de entrada",
-		"SENT_NAME": "Correio enviado",
-		"DRAFTS_NAME": "Rascunhos",
-		"TRASH_NAME": "Lixo",
-		"ARCHIVE_NAME": "Arquivo"
-	},
-	"QUOTA": {
-		"TITLE": "Uso da Cota"
-	},
-	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "Atualizar lista de mensagens",
-		"BUTTON_EMPTY_FOLDER": "Esvaziar pasta",
-		"BUTTON_MULTY_FORWARD": "Encaminhar mensagens",
-		"BUTTON_DELETE_WITHOUT_MOVE": "Eliminar definitivamente",
-		"MENU_SET_SEEN": "Marcar como lida",
-		"MENU_SET_ALL_SEEN": "Marcar todas como lidas",
-		"MENU_UNSET_SEEN": "Marcar como não lida",
-		"MENU_SET_FLAG": "Sinalizar",
-		"MENU_UNSET_FLAG": "Remover sinalização",
-		"MENU_SELECT_ALL": "Todas",
-		"MENU_SELECT_INVERT": "Inverter",
-		"MENU_SELECT_UNSEEN": "Não lida",
-		"MENU_SELECT_SEEN": "Lida",
-		"MENU_SELECT_FLAGGED": "Sinalizada",
-		"MENU_SELECT_UNFLAGGED": "Não sinalizada",
-		"EMPTY_LIST": "Lista vazia.",
-		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
-		"SEARCH_RESULT_FOR": "Resultados de pesquisa para \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "voltar à lista de mensagens",
-		"EMPTY_SUBJECT_TEXT": "(Sem assunto)",
-		"PUT_MESSAGE_HERE": "Coloque a mensagem aqui para vê-la na lista",
-		"TODAY_AT": "Hoje às %TIME%",
-		"YESTERDAY_AT": "Ontem às %TIME%",
-		"NEW_MESSAGE_NOTIFICATION": "Você tem %COUNT% novas mensagens!",
-		"QUOTA_SIZE": "Está a usar <strong>%SIZE% (%PROC%%)<\/strong> dos <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
-	},
-	"MESSAGE": {
-		"BUTTON_EDIT": "Editar",
-		"BUTTON_UNSUBSCRIBE": "Unsubscribe from this list",
-		"BUTTON_REPLY": "Responder",
-		"BUTTON_REPLY_ALL": "Responder a todos",
-		"BUTTON_FORWARD": "Encaminhar",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "Enviar como anexo",
-		"BUTTON_EDIT_AS_NEW": "Editar como novo",
-		"BUTTON_SHOW_IMAGES": "Mostrar imagens",
-		"BUTTON_NOTIFY_READ_RECEIPT": "O remetente pediu para ser notificado quando você lesse esta mensagem.",
-		"BUTTON_IN_NEW_WINDOW": "Ver em janela separada",
-		"BUTTON_THREAD_LIST": "Lista de tópicos",
-		"BUTTON_THREAD_PREV": "Anterior",
-		"BUTTON_THREAD_NEXT": "Seguinte",
-		"BUTTON_THREAD_MORE": "Mais mensagens",
-		"MENU_HEADERS": "Mostrar título das mensagens",
-		"MENU_VIEW_ORIGINAL": "Mostrar original",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "Transferir como ficheiro .eml",
-		"MENU_FILTER_SIMILAR": "Filtrar mensagens semelhantes a esta",
-		"MENU_PRINT": "Imprimir",
-		"EMPTY_SUBJECT_TEXT": "(Sem assunto)",
-		"LABEL_DATE": "Data",
-		"LABEL_FROM_SHORT": "de",
-		"LABEL_TO_SHORT": "para",
-		"PRINT_LABEL_ATTACHMENTS": "Anexos",
-		"MESSAGE_VIEW_DESC": "Selecione uma mensagem na lista para ver o conteúdo aqui.",
-		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
-	},
-	"READ_RECEIPT": {
-		"SUBJECT": "Recibo de leitura (apresentado) - %SUBJECT%",
-		"BODY": "Este é um comprovativo de leitura para o e-mail que você enviou para %READ-RECEIPT%.\n\nNota: Este comprovativo apenas confirma que a mensagem foi apresentada no computador do destinatário.\nNão existe nenhuma garantia de que o destinatário tenha lido ou compreendido o conteúdo da mensagem.\n"
-	},
-	"SUGGESTIONS": {
-		"SEARCHING_DESC": "A procurar..."
-	},
-	"CONTACTS": {
-		"BUTTON_ADD_CONTACT": "Adicionar contacto",
-		"BUTTON_CREATE_CONTACT": "Criar",
-		"BUTTON_UPDATE_CONTACT": "Atualizar",
-		"BUTTON_IMPORT": "Importar (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "Exportar (vcf, vCard)",
-		"BUTTON_EXPORT_CSV": "Exportar (csv)",
-		"ERROR_IMPORT_FILE": "Erro ao importar (formato do ficheiro inválido)",
-		"EMPTY_LIST": "Nenhum contacto aqui",
-		"EMPTY_SEARCH": "Nenhum contacto encontrado",
-		"CLEAR_SEARCH": "Limpar pesquisa",
-		"CONTACT_VIEW_DESC": "Selecione o contacto na lista para visualizá-lo.",
-		"LABEL_PHONE": "Telefone",
-		"LABEL_WEB": "Página web",
-		"LABEL_BIRTHDAY": "Aniversário",
-		"LINK_ADD_EMAIL": "Adicionar um endereço e-mail",
-		"LINK_ADD_PHONE": "Adicionar um telefone",
-		"LINK_BIRTHDAY": "Aniversário",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduza o nome a apresentar",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Introduza o último nome",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Introduza o primeiro nome",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Introduza uma alcunha",
-		"LABEL_READ_ONLY": "Ler apenas",
-		"LABEL_SHARE": "Partilhar",
-		"ADD_MENU_LABEL": "Adicionar",
-		"ADD_MENU_NICKNAME": "Alcunha",
-		"ADD_MENU_NOTES": "Notas",
-		"ADD_MENU_PHONE": "Telefone",
-		"ADD_MENU_URL": "URL",
-		"ADD_MENU_ADDRESS": "Morada",
-		"ADD_MENU_BIRTHDAY": "Aniversário",
-		"ADD_MENU_TAGS": "Marcadores",
-		"BUTTON_SHARE_ALL": "Todos",
-		"BUTTON_SYNC": "Sincronização (CardDAV)"
-	},
-	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "Mostrar todos os campos",
-		"BUTTON_SEND": "Enviar",
-		"BUTTON_MINIMIZE": "Minimizar",
-		"SAVED_TIME": "Guardado às %TIME%",
-		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta dos itens enviados.",
-		"DISCARD_UNSAVED_DATA": "Rejeitar o conteúdo que não foi guardado?",
-		"ATTACH_FILES": "Anexar ficheiros",
-		"ATTACH_DROP_FILES_DESC": "Arraste os ficheiros para aqui",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% escreveu",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Mensagem Encaminhada -------",
-		"FORWARD_MESSAGE_TOP_SENT": "Enviado",
-		"EMPTY_TO_ERROR_DESC": "Por favor, especifique pelo menos um destinatário",
-		"NO_ATTACHMENTS_HERE_DESC": "Sem anexos aqui.",
-		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
-		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
-		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
-		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega"
-	},
-	"POPUPS_ASK": {
-		"BUTTON_YES": "Sim",
-		"BUTTON_NO": "Não",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Tem a certeza que deseja fechar esta janela?",
-		"DESC_WANT_DELETE_MESSAGES": "Tem a certeza de que deseja eliminar esta(s) mensagem(s)?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Escolha o idioma"
-	},
-	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Adicionar conta?",
-		"BUTTON_ADD_ACCOUNT": "Adicionar",
-		"TITLE_UPDATE_ACCOUNT": "Atualizar conta?",
-		"BUTTON_UPDATE_ACCOUNT": "Atualizar"
-	},
-	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Adicionar identidade?",
-		"TITLE_UPDATE_IDENTITY": "Atualizar identidade?",
-		"BUTTON_ADD_IDENTITY": "Adicionar",
-		"BUTTON_UPDATE_IDENTITY": "Atualizar",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Nas respostas, inserir esta assinatura acima da mensagem citada"
-	},
-	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Criar pasta?",
-		"LABEL_PARENT": "Pasta principal",
-		"BUTTON_CREATE": "Criar",
-		"TITLE_CREATING_PROCESS": "A criar pasta"
-	},
-	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "Eliminar todas as mensagens da pasta?",
-		"DANGER_DESC_WARNING": "Atenção!",
-		"DANGER_DESC_HTML_1": "Esta ação irá resultar na remoção definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
-		"DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não pode ser interrompido ou cancelado.",
-		"TITLE_CLEARING_PROCESS": "A eliminar a pasta..."
-	},
-	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "Importar chave OpenPGP",
-		"POPUP_IMPORT_BUTTON": "Importar",
-		"POPUP_VIEW_TITLE": "Ver chave OpenPGP",
-		"POPUP_VIEW_BUTTON": "Escolher",
-		"POPUP_GENERATE_TITLE": "Gerar chaves OpenPGP",
-		"POPUP_GENERATE_BUTTON": "Gerar",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Assinar",
-		"LABEL_ENCRYPT": "Encriptar",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
-		"SIGNED_MESSAGE": "Mensagem assinada com OpenPGP",
-		"ENCRYPTED_MESSAGE": "Mensagem encriptada com OpenPGP",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
-		"ERROR": "Erro OpenPGP: %ERROR%"
-	},
-	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Criar um filtro?",
-		"TITLE_EDIT_FILTER": "Atualizar um filtro?",
-		"LEGEND_CONDITIONS": "Condições",
-		"LEGEND_ACTIONS": "Ações",
-		"BUTTON_ADD_CONDITION": "Adicionar uma condição",
-		"SELECT_ACTION_MOVE_TO": "Mover para",
-		"SELECT_ACTION_FORWARD_TO": "Encaminhar para",
-		"SELECT_ACTION_REJECT": "Rejeitar",
-		"SELECT_ACTION_VACATION_MESSAGE": "Mensagem de férias",
-		"SELECT_ACTION_DISCARD": "Descartar",
-		"SELECT_FIELD_RECIPIENTS": "Destinatários (Para ou CC)",
-		"SELECT_FIELD_HEADER": "Cebeçalho",
-		"SELECT_FIELD_BODY": "Body",
-		"SELECT_FIELD_SIZE": "Tamanho",
-		"SELECT_TYPE_CONTAINS": "Contém",
-		"SELECT_TYPE_NOT_CONTAINS": "Não contém",
-		"SELECT_TYPE_MATCHES": "Corresponde (* e ? suportados)",
-		"SELECT_TYPE_NOT_MATCHES": "Não correponde (* e ? suportados)",
-		"SELECT_TYPE_REGEXP": "Regexp",
-		"SELECT_TYPE_NOT_REGEXP": "Sem Regexp",
-		"SELECT_TYPE_EQUAL_TO": "Igual a",
-		"SELECT_TYPE_NOT_EQUAL_TO": "Não é igual a",
-		"SELECT_TYPE_OVER": "Superior",
-		"SELECT_TYPE_UNDER": "Inferior",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "Correspondendo a qualquer uma das regras que se seguem",
-		"SELECT_MATCH_ALL": "Correspondendo a todas as regras que se seguem",
-		"MARK_AS_READ_LABEL": "Marcar como lida",
-		"REPLY_INTERVAL_LABEL": "Intervalo de resposta (dias)",
-		"KEEP_LABEL": "Manter",
-		"STOP_LABEL": "Não parar de processar as regras",
-		"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
-		"VACATION_MESSAGE_LABEL": "Mensagem",
-		"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgula)",
-		"REJECT_MESSAGE_LABEL": "Rejeitar mensagem",
-		"ALL_INCOMING_MESSAGES_DESC": "Todas as mensagens recebidas"
-	},
-	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
-	},
-	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Selecione as pastas do sistema",
-		"SELECT_CHOOSE_ONE": "Escolha uma",
-		"SELECT_UNUSE_NAME": "Não usar",
-		"NOTIFICATION_SENT": "Você não selecionou a pasta \"Sent\" de sistema, onde as mensagens enviadas são colocadas.\nSe você não quiser salvar as mensagens enviadas, por favor selecione a opção \"Do not use\".\n",
-		"NOTIFICATION_DRAFTS": "Você não selecionou a pasta \"Drafts\" de sistema, onde as mensagens são guardadas enquanto são escritas.",
-		"NOTIFICATION_SPAM": "Você não selecionou a pasta \"Spam\" de sistema, onde as mensagens de spam são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Do not use\".\n",
-		"NOTIFICATION_TRASH": "Você não selecionou a pasta \"Trash\" de sistema, onde as mensagens eliminadas são colocadas.\nSe você deseja remover as mensagens definitivamente, por favor selecione a opção \"Do not use\".\n",
-		"NOTIFICATION_ARCHIVE": "Você não selecionou a pasta \"Archive\" de sistema, onde as mensagens arquivadas são colocadas."
-	},
-	"TITLES": {
-		"MAILBOX": "Caixa de correio",
-		"SETTINGS": "Definições"
-	},
-	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "O ficheiro é muito grande",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "O ficheiro foi carregado parcialmente devido a um erro desconhecido",
-		"ERROR_NO_FILE_UPLOADED": "Nenhum ficheiro carregado",
-		"ERROR_MISSING_TEMP_FOLDER": "O ficheiro temporário está em falta",
-		"ERROR_ON_SAVING_FILE": "Ocorreu um erro desconhecido durante o carregamento do ficheiro",
-		"ERROR_FILE_TYPE": "Tipo de ficheiro inválido",
-		"ERROR_UNKNOWN": "Ocorreu um erro desconhecido durante o carregamento do ficheiro"
-	},
-	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
-	},
-	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Pessoal",
-		"LABEL_GENERAL_NAME": "Geral",
-		"LABEL_CONTACTS_NAME": "Contactos",
-		"LABEL_FOLDERS_NAME": "Pastas",
-		"LABEL_ACCOUNTS_NAME": "Contas",
-		"LABEL_FILTERS_NAME": "Filtros",
-		"LABEL_SECURITY_NAME": "Segurança",
-		"LABEL_THEMES_NAME": "Temas"
-	},
-	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtros",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
-		"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
-		"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",
-		"SUBNAME_REJECT": "Rejeitar",
-		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
-		"SUBNAME_DISCARD": "Descartar",
-		"LOADING_PROCESS": "A atualizar lista de filtros"
-	},
-	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "Segurança",
-		"LABEL_AUTOLOGOUT": "Terminar sessão auto.",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nunca",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minuto(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
-	},
-	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Geral",
-		"LABEL_LANGUAGE": "Idioma",
-		"LABEL_IDENTITY": "Identidade",
-		"LABEL_LAYOUT": "Apresentação",
-		"LABEL_LAYOUT_NO_SPLIT": "Sem separação",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Separação vertical",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
-		"LABEL_EDITOR": "Editor de texto padrão",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Texto simples",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forçado)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Texto simples (forçado)",
-		"LABEL_VIEW_OPTIONS": "Ver opções",
-		"LABEL_USE_PREVIEW_PANE": "Use o painel de pré-visualização",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
-		"LABEL_USE_THREADS": "Usar tópicos de conversa",
-		"LABEL_REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
-		"LABEL_SHOW_IMAGES": "Apresentar sempre as imagens no corpo da mensagem",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Mensagens por página",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notificações",
-		"LABEL_SOUND_NOTIFICATION": "Notificações sonoras",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)"
-	},
-	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "Adicionar automaticamente destinatários à sua lista de endereços",
-		"LEGEND_CONTACTS_SYNC": "Sincronização Remota (CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "Ativar sincronização remota",
-		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
-		"LABEL_CONTACTS_SYNC_AB_URL": "URL do livro de endereços",
-		"LABEL_CONTACTS_SYNC_USER": "Utilizador",
-		"SYNC_NO": "Não",
-		"SYNC_YES": "Sim",
-		"SYNC_READ": "Read only"
-	},
-	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "Temas",
-		"LEGEND_THEMES_CUSTOM": "Configuração de tema personalizado",
-		"LABEL_CUSTOM_TYPE": "Tipo",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Claro",
-		"LABEL_CUSTOM_TYPE_DARK": "Escuro",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Imagem de fundo",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carregar imagem de fundo (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "Ficheiro muito grande",
-		"ERROR_FILE_TYPE_ERROR": "Tipo de ficheiro inválido (apenas JPG e PNG)",
-		"ERROR_UNKNOWN": "Ocorreu um erro desconhecido durante o carregamento do ficheiro"
-	},
-	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "Lista de pastas",
-		"BUTTON_CREATE": "Criar pasta",
-		"BUTTON_SYSTEM": "System Folders",
-		"BUTTON_SUBSCRIBE": "Assinar",
-		"BUTTON_UNSUBSCRIBE": "Anular",
-		"LOADING_PROCESS": "Atualizar lista de pastas",
-		"CREATING_PROCESS": "Criar a pasta",
-		"DELETING_PROCESS": "Eliminar a pasta",
-		"RENAMING_PROCESS": "Renomear a pasta",
-		"TO_MANY_FOLDERS_DESC_1": "Você tem demasiadas pastas!",
-		"TO_MANY_FOLDERS_DESC_2": "Apenas apresentámos parte delas, para evitar problemas de desempenho.",
-		"HELP_DELETE_FOLDER": "Eliminar pasta",
-		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
-	},
-	"SETTINGS_ACCOUNTS": {
-		"LEGEND_ACCOUNTS": "Lista de contas",
-		"LEGEND_IDENTITIES": "Identidades",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Contas e Identidades",
-		"BUTTON_ADD_ACCOUNT": "Adicionar uma conta",
-		"BUTTON_ADD_IDENTITY": "Adicionar uma identidade",
-		"LOADING_PROCESS": "A atualizar...",
-		"DEFAULT_IDENTITY_LABEL": "predefinida"
-	},
-	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "Importar chave",
-		"BUTTON_GENERATE_KEY_PAIR": "Gerar chaves",
-		"TITLE_PRIVATE": "Privada",
-		"TITLE_PUBLIC": "Pública",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
-	},
-	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "Ajuda para atalhos de teclado",
-		"TAB_MAILBOX": "Caixa de correio",
-		"TAB_MESSAGE_LIST": "Lista de mensagens",
-		"TAB_MESSAGE_VIEW": "Vista da mensagem",
-		"TAB_COMPOSE": "Compor",
-		"LABEL_OPEN_USER_DROPDOWN": "Abrir menu do utilizador",
-		"LABEL_REPLY": "Responder",
-		"LABEL_REPLY_ALL": "Responder a todos",
-		"LABEL_FORWARD": "Encaminhar",
-		"LABEL_FORWARD_MULTIPLY": "Encaminhar (multiplicar)",
-		"LABEL_HELP": "Ajuda",
-		"LABEL_CHECK_ALL": "Selecionar todas as mensagens",
-		"LABEL_DELETE": "Eliminar",
-		"LABEL_OPEN_THREAD": "Abrir tópico selecionado",
-		"LABEL_MOVE": "Mover",
-		"LABEL_READ": "Ler as mensagens selecionadas",
-		"LABEL_UNREAD": "Marcar as mensagens selecionadas como não lidas",
-		"LABEL_IMPORTANT": "Marcar como Importantes as mensagens selecionadas",
-		"LABEL_CANCEL_SEARCH": "Cancelar pesquisa",
-		"LABEL_FULLSCREEN_ENTER": "Ecrã-inteiro (com janela de pré-visualização)",
-		"LABEL_VIEW_MESSAGE_ENTER": "Ver mensagem (sem janela de pré-visualização)",
-		"LABEL_SWITCH_TO_MESSAGE": "Dar foco à mensagem selecionada",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Dar foco à lista de pastas",
-		"LABEL_FULLSCREEN_TOGGLE": "Alternar modo ecrã-inteiro",
-		"LABEL_BLOCKQUOTES_TOGGLE": "Alternar visibilidade do texto citado",
-		"LABEL_THREAD_NEXT": "Mensagem seguinte deste tópico",
-		"LABEL_THREAD_PREV": "Mensagem anterior deste tópico",
-		"LABEL_PRINT": "Imprimir",
-		"LABEL_EXIT_FULLSCREEN": "Sair do modo ecrã-inteiro",
-		"LABEL_CLOSE_MESSAGE": "Fechar mensagem (sem janela de pré-visualização)",
-		"LABEL_SWITCH_TO_LIST": "Dar foco à lista de mensagens",
-		"LABEL_OPEN_COMPOSE_POPUP": "Abrir janela de composição",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Abrir menu de identidades",
-		"LABEL_SAVE_MESSAGE": "Guardar mensagem",
-		"LABEL_SEND_MESSAGE": "Enviar mensagem",
-		"LABEL_CLOSE_COMPOSE": "Fechar janela de composição"
-	},
-	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Token inválido",
-		"AUTH_ERROR": "Falha na autenticação",
-		"CONNECTION_ERROR": "Não foi possível conectar ao servidor",
-		"DOMAIN_ALREADY_EXISTS": "O domínio já existe",
-		"DOMAIN_NOT_ALLOWED": "Este domínio não é permitido",
-		"ACCOUNT_NOT_ALLOWED": "Esta conta não é permitida",
-		"CONTACTS_SYNC_ERROR": "Erro na sincronização de contactos",
-		"CANT_GET_MESSAGE_LIST": "Não é possível obter a lista de mensagens",
-		"CANT_GET_MESSAGE": "Não é possível obter a mensagem",
-		"CANT_DELETE_MESSAGE": "Não é possível eliminar a mensagem",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Não é possível mover a mensagem",
-		"CANT_SAVE_MESSAGE": "Não é possível guardar a mensagem",
-		"CANT_SEND_MESSAGE": "Não é possível enviar a mensagem",
-		"INVALID_RECIPIENTS": "Destinatário inválido",
-		"CANT_SAVE_FILTERS": "Não é possível guardar os filtros",
-		"CANT_GET_FILTERS": "Não é possível obter os filtros",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Os filtros não estão corretos",
-		"CANT_CREATE_FOLDER": "Não é possível criar a pasta",
-		"CANT_RENAME_FOLDER": "Não é possível renomear a pasta",
-		"CANT_DELETE_FOLDER": "Não é possível eliminar a pasta",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Não é possível eliminar pastas com conteúdos",
-		"CANT_SUBSCRIBE_FOLDER": "Não é possível assinar esta pasta",
-		"CANT_UNSUBSCRIBE_FOLDER": "Não é possível cancelar esta pasta",
-		"DEMO_SEND_MESSAGE_ERROR": "Por motivos de segurança, esta conta de demonstração não tem permissão para enviar mensagens para endereços de e-mail externos!",
-		"DEMO_ACCOUNT_ERROR": "Por motivos de segurança, esta conta não tem permissão de executar esta ação!",
-		"ACCOUNT_ALREADY_EXISTS": "Esta conta já existe",
-		"ACCOUNT_DOES_NOT_EXIST": "Conta inexistente",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Ocorreu um erro ao aceder ao servidor de email",
-		"INVALID_INPUT_ARGUMENT": "Parâmetro de entrada inválido",
-		"UNKNOWN_ERROR": "Erro desconhecido"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/pt/admin.json b/snappymail/v/0.0.0/app/localization/pt/admin.json
new file mode 100644
index 000000000..cfda26771
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/pt/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Adicionar",
+		"CLOSE": "Fechar",
+		"SAVE": "Guardar",
+		"TEST": "Testar",
+		"UPDATE": "Atualizar",
+		"USERNAME": "Nome de utilizador",
+		"PASSWORD": "Palavra-passe",
+		"CANCEL": "Cancelar",
+		"SEARCH": "Pesquisar",
+		"YES": "Sim",
+		"NO": "Não"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Utilizador",
+		"LABEL_TOTP": "Código TOTP",
+		"BUTTON_LOGIN": "Entrar no painel de admin"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Painel de Admin"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Geral",
+		"LOGIN": "Entrada",
+		"BRANDING": "Personalização",
+		"CONTACTS": "Contactos",
+		"DOMAINS": "Domínios",
+		"SECURITY": "Segurança",
+		"PACKAGES": "Extensões",
+		"CONFIG": "Configuração",
+		"ABOUT": "Acerca"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Interface",
+		"LABEL_LANGUAGE": "Idioma",
+		"LABEL_LANGUAGE_ADMIN": "Idioma (admin)",
+		"LABEL_THEME": "Tema",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Permitir escolha do idioma nas definições",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Permitir personalização da interface nas definições",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Permitir alterar a imagem de fundo nas definições",
+		"LABEL_SHOW_THUMBNAILS": "Mostrar miniaturas (anexos)",
+		"LEGEND_MAIN": "Principal",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Tamanho limite dos anexos",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Permitir contas adicionais",
+		"LABEL_ALLOW_IDENTITIES": "Permitir múltiplas identidades",
+		"ALERT_DATA_ACCESS": "A pasta \"data\" está acessível. Por favor, configure o seu servidor web para impedir o acesso à pasta \"data\" a partir do exterior. Leia mais aqui:",
+		"ALERT_WARNING": "Aviso!",
+		"HTML_ALERT_WEAK_PASSWORD": "Está a usar a palavra-passe de administração predefinida.\n<br>\nPor razões de segurança\n<strong><a href=\"#\/security\">mude<\/a><\/strong>\na palavra-passe agora.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Ecrã de entrada",
+		"LABEL_DEFAULT_DOMAIN": "Domínio predefinido",
+		"LABEL_DETERMINE_USER_DOMAIN": "Tentar determinar domínio do utilizador",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Permitir escolha do idioma no ecrã de entrada",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Tentar determinar idioma do utilizador"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Personalização",
+		"LABEL_PAGE_TITLE": "Título da página",
+		"LABEL_LOADING_DESCRIPTION": "Descrição durante carregamento",
+		"LABEL_FAVICON_URL": "Ícone"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Contactos",
+		"LEGEND_STORAGE": "Armazenamento (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Ativar contactos",
+		"LABEL_ALLOW_SYNC": "Permitir sincronização de contactos (com servidor CardDAV externo)",
+		"LABEL_STORAGE_TYPE": "Tipo",
+		"LABEL_STORAGE_DSN": "Nome da Origem de Dados (DSN)",
+		"LABEL_STORAGE_USER": "Utilizador",
+		"LABEL_STORAGE_PASSWORD": "Palavra-passe",
+		"SQLITE_GLOBAL": "Usar uma BD global em vez de individual",
+		"ALERT_NOTICE": "Aviso!",
+		"SUGGESTIONS_LIMIT": "Limite de sugestões",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Não use este tipo de base de dados com uma grande quantidade de utilizadores ativos.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "O seu sistema não suporta contactos.\n<br>\nPrecisa instalar ou ativar a extensão <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> no seu servidor.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Domínios",
+		"BUTTON_ADD_DOMAIN": "Adicionar domínio",
+		"BUTTON_ADD_ALIAS": "Adicionar pseudónimo",
+		"DELETE_ARE_YOU_SURE": "Tem a certeza?",
+		"HTML_DOMAINS_HELPER": "Lista de domínios aos quais o webmail terá permissão para aceder.\n<br>\nClique no nome para configurar o domínio.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Segurança",
+		"LABEL_USE_IMAGE_PROXY": "Usar proxy local para imagens externas",
+		"LABEL_AUTO_VERIFY": "Verificar assinaturas automaticamente",
+		"LABEL_SHOW_PHP_INFO": "Mostrar informação do PHP",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Credenciais de acesso ao Painel de Admin",
+		"LABEL_CURRENT_PASSWORD": "Palavra-passe atual",
+		"LABEL_NEW_PASSWORD": "Nova palavra-passe",
+		"LABEL_REPEAT_PASSWORD": "Repetir",
+		"LABEL_REQUIRE_VERIFICATION": "Exigir a verificação dos certificados SSL",
+		"CRYPTO": "Criptografia",
+		"LABEL_ALLOW_SELF_SIGNED": "Permitir certificados autoassinados"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Ativar extensões",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Disponível para atualização",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Disponível para instalação",
+		"LEGEND_INSTALLED_PACKAGES": "Extensões instaladas",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Não é possível aceder ao repositório neste momento."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Acerca",
+		"LABEL_TAG_HINT": "Cliente de correio web simples, moderno e rápido",
+		"LABEL_ALL_RIGHTS_RESERVED": "Todos os direitos reservados.",
+		"HINT_READ_CHANGE_LOG": "Por favor leia a lista de modificações antes de atualizar.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail está atualizado.",
+		"HTML_NEW_VERSION": "Nova versão <b>%VERSION%<\/b> está disponível.",
+		"LABEL_UPDATING": "A atualizar",
+		"LABEL_CHECKING": "A procurar atualizações",
+		"BUTTON_RELEASES": "Lançamentos"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Adicionar pseudónimo",
+		"LABEL_ALIAS": "Pseudónimo",
+		"LABEL_DOMAIN": "Domínio"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Adicionar domínio",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Adicionar domínio \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Editar domínio \"%NAME%\"",
+		"LABEL_NAME": "Nome",
+		"NAME_HELPER": "caracter universal suportado",
+		"LABEL_SERVER": "Servidor",
+		"LABEL_PORT": "Porta",
+		"LABEL_SECURE": "Segurança",
+		"TIMEOUT": "Tempo de espera",
+		"DISABLE_CAPABILITIES": "Desativar capacidades",
+		"LIMITS": "Limites",
+		"FOLDERS": "Pastas",
+		"MESSAGES": "Mensagens",
+		"SECURE_OPTION_NONE": "Nenhuma",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Permitir scripts sieve",
+		"LABEL_USE_SHORT_LOGIN": "Usar nome de utilizador curto",
+		"LABEL_LOWERCASE_LOGIN": "Não diferenciar maiúsculas e minúsculas no nome de utilizador",
+		"LABEL_USE_AUTH": "Usar autenticação",
+		"LABEL_SET_SENDER": "Usar nome de utilizador como remetente",
+		"LABEL_AUTH_PLAIN_LINE": "Forçar comando AUTH PLAIN único para autenticar",
+		"LABEL_USE_PHP_MAIL": "Usar a função php mail()",
+		"BUTTON_WHITE_LIST": "Lista Branca",
+		"NEW_DOMAIN_DESC": "Esta configuração de domínio vai permitir trabalhar com endereços email <strong>%NAME%<\/strong>.",
+		"WHITE_LIST_ALERT": "Lista de utilizadores do domínio aos quais o webmail terá permissão para aceder.\nUsar espaços para delimitar.\n",
+		"VALID_SPAM_HEADERS": "Cabeçalhos de SPAM válidos",
+		"VALID_VIRUS_HEADERS": "Cabeçalhos de vírus válidos"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Extensão",
+		"DESC_NOTHING_TO_CONFIGURE": "Nada para configurar"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Escolha o seu idioma"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Aviso!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "O domínio já existe",
+		"UNKNOWN_ERROR": "Erro desconhecido"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "A solicitação falhou",
+		"RequestAborted": "A solicitação foi abortada",
+		"RequestTimeout": "A solicitação expirou",
+		"InvalidToken": "Token inválido",
+		"AuthError": "A autenticação falhou",
+		"DomainAlreadyExists": "O domínio já existe",
+		"CantSavePluginSettings": "Não é possível guardar as definições",
+		"CantInstallPackage": "Não foi possível instalar a extensão",
+		"CantDeletePackage": "Não foi possível remover a extensão",
+		"InvalidPluginPackage": "Pacote de extensão inválido",
+		"UnsupportedPluginPackage": "Pacote de extensão não suportado",
+		"UnknownError": "Erro desconhecido"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/pt/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/pt/relativetimeformat.js
new file mode 100644
index 000000000..b5ab92177
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/pt/relativetimeformat.js
@@ -0,0 +1,76 @@
+{
+	long: {
+		year: {
+			past: {
+				one: "há {0} ano",
+				other: "há {0} anos"
+			},
+			future: {
+				one: "dentro de {0} ano",
+				other: "dentro de {0} anos"
+			}
+		},
+		month: {
+			past: {
+				one: "há {0} mês",
+				other: "há {0} meses"
+			},
+			future: {
+				one: "dentro de {0} mês",
+				other: "dentro de {0} meses"
+			}
+		},
+		week: {
+			past: {
+				one: "há {0} semana",
+				other: "há {0} semanas"
+			},
+			future: {
+				one: "dentro de {0} semana",
+				other: "dentro de {0} semanas"
+			}
+		},
+		day: {
+			past: {
+				one: "há {0} dia",
+				other: "há {0} dias"
+			},
+			future: {
+				one: "dentro de {0} dia",
+				other: "dentro de {0} dias"
+			}
+		},
+		hour: {
+			past: {
+				one: "há {0} hora",
+				other: "há {0} horas"
+			},
+			future: {
+				one: "dentro de {0} hora",
+				other: "dentro de {0} horas"
+			}
+		},
+		minute: {
+			past: {
+				one: "há {0} minuto",
+				other: "há {0} minutos"
+			},
+			future: {
+				one: "dentro de {0} minuto",
+				other: "dentro de {0} minutos"
+			}
+		},
+		second: {
+			past: {
+				one: "há {0} segundo",
+				other: "há {0} segundos"
+			},
+			future: {
+				one: "dentro de {0} segundo",
+				other: "dentro de {0} segundos"
+			}
+		}
+	},
+	/* 'zero', 'one', 'two', 'few', 'many', 'other' */
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/pt-PT/static.json b/snappymail/v/0.0.0/app/localization/pt/static.json
similarity index 52%
rename from snappymail/v/0.0.0/app/localization/pt-PT/static.json
rename to snappymail/v/0.0.0/app/localization/pt/static.json
index cb22ba35a..fbd501b7d 100644
--- a/snappymail/v/0.0.0/app/localization/pt-PT/static.json
+++ b/snappymail/v/0.0.0/app/localization/pt/static.json
@@ -1,9 +1,9 @@
 {
 	"BACK_LINK": "Recarregar",
 	"NO_SCRIPT_TITLE": "É necessário JavaScript para esta aplicação.",
-	"NO_SCRIPT_DESC": "O suporte de JavaScript não está disponível no seu navegador.\nPor favor ative o suporte de JavaScript nas definições do seu navegador e tente novamente.\n",
-	"NO_COOKIE_TITLE": "É necessário suporte de cookies para esta aplicação.",
-	"NO_COOKIE_DESC": "O suport de Cookies não está disponível no seu navegador.\nPor favor ative o suporte de Cookies nas definições do seu navegador e tente novamente.\n",
+	"NO_SCRIPT_DESC": "O suporte de JavaScript não está disponível no seu navegador.\nPor favor ative o suporte de JavaScript nas definições do seu navegador e tente novamente.",
+	"NO_COOKIE_TITLE": "É necessário suporte de Cookies para esta aplicação.",
+	"NO_COOKIE_DESC": "O suporte de Cookies não está disponível no seu navegador.\nPor favor ative o suporte de Cookies nas definições do seu navegador e tente novamente.",
 	"BAD_BROWSER_TITLE": "O seu navegador está desatualizado.",
-	"BAD_BROWSER_DESC": "Para usar todas as funções da aplicação,\ntransfira e instale um destes navegadores:\n"
+	"BAD_BROWSER_DESC": "Para usar todas as funções da aplicação,\ntransfira e instale um navegador recente."
 }
diff --git a/snappymail/v/0.0.0/app/localization/pt/user.json b/snappymail/v/0.0.0/app/localization/pt/user.json
new file mode 100644
index 000000000..e5da381a7
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/pt/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "Arquivar",
+		"ARE_YOU_SURE": "Tem a certeza?",
+		"BACK": "Voltar",
+		"BCC": "Bcc",
+		"CANCEL": "Cancelar",
+		"CC": "Cc",
+		"CLEAR": "Limpar",
+		"CLOSE": "Fechar",
+		"CONTACTS": "Contactos",
+		"DELETE": "Eliminar",
+		"UNDELETE": "Restaurar",
+		"DONE": "Terminado",
+		"EMAIL": "Email",
+		"FROM": "De",
+		"LOADING": "A carregar",
+		"LOGOUT": "Sair",
+		"MORE": "Mais",
+		"MOVE_TO": "Mover para",
+		"COPY_TO": "Copiar para",
+		"NAME": "Nome",
+		"NONE": "Nenhum",
+		"TO_SPAM": "Mover mensagem(ns) para o Spam",
+		"NOT_SPAM": "Não é spam",
+		"USERNAME": "Nome de usuário",
+		"PASSWORD": "Palavra-passe",
+		"REMEMBER": "Lembrar",
+		"REPLY_TO": "Resp.-Para",
+		"SAVE": "Guardar",
+		"SAVE_CHANGES": "Guardar alterações?",
+		"SEARCH": "Pesquisar",
+		"SPAM": "Spam",
+		"SUBJECT": "Assunto",
+		"TEST": "Testar",
+		"TO": "Para",
+		"SERVER_MESSAGE": "Mensagem do servidor",
+		"YES": "Sim",
+		"NO": "Não",
+		"INACTIVE": "Inativo",
+		"DEFAULT": "predefinida",
+		"HELP": "Ajuda",
+		"TEXT": "Texto",
+		"ATTACHMENTS": "Anexos"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Utilizador",
+		"LABEL_SIGN_ME": "Lembrar-me",
+		"BUTTON_SIGN_IN": "Entrar"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Adicionar conta"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Pesquisa avançada",
+		"TEXT": "Texto",
+		"HAS_ATTACHMENT": "Tem anexo",
+		"FLAGGED": "Sinalizada",
+		"UNSEEN": "Não lida",
+		"DATE": "Data",
+		"DATE_ALL": "Qualquer",
+		"BEFORE_3_DAYS": "Mais antigo que 3 dias",
+		"BEFORE_7_DAYS": "Mais antigo que 1 semana",
+		"BEFORE_MONTH": "Mais antigo que 1 mês",
+		"BEFORE_3_MONTHS": "Mais antigo que 3 meses",
+		"BEFORE_6_MONTHS": "Mais antigo que 6 meses",
+		"BEFORE_YEAR": "Mais antigo que 1 ano",
+		"SINCE_3_DAYS": "Até 3 dias atrás",
+		"SINCE_7_DAYS": "Até 1 semana atrás",
+		"SINCE_MONTH": "Até 1 mês atrás",
+		"SINCE_3_MONTHS": "Até 3 meses atrás",
+		"SINCE_6_MONTHS": "Até 6 meses atrás",
+		"SINCE_YEAR": "Até 1 ano atrás",
+		"SUBFOLDERS": "Subpastas",
+		"SUBFOLDERS_NONE": "Nenhuma",
+		"SUBFOLDERS_SUBTREE": "Todas",
+		"SUBFOLDERS_SUBTREE_ONE": "Um nível",
+		"REPLIED": "Respondidas",
+		"KEYWORD": "Marcador"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Escrever",
+		"BUTTON_NEW_MESSAGE": "Nova mensagem",
+		"INBOX_NAME": "Caixa de entrada",
+		"SENT_NAME": "Enviadas",
+		"DRAFTS_NAME": "Rascunhos",
+		"TRASH_NAME": "Lixo",
+		"ARCHIVE_NAME": "Arquivo"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Permissões",
+		"ACL_A": "Administrar",
+		"ACL_E": "Purgar",
+		"ACL_I": "Inserir mensagens",
+		"ACL_K": "Criar sub-pastas",
+		"ACL_L": "Mostrar mensagens",
+		"ACL_P": "Enviar correio",
+		"ACL_R": "Escolher pasta",
+		"ACL_S": "Marcador \\SEEN (lida)",
+		"ACL_T": "Marcador \\DELETED (eliminada)",
+		"ACL_W": "Outros marcadores",
+		"ACL_X": "Eliminar\/Renomear pasta"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Atualizar lista de mensagens",
+		"BUTTON_EMPTY_FOLDER": "Esvaziar pasta",
+		"BUTTON_MULTY_FORWARD": "Encaminhar como anexo(s)",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Eliminar definitivamente",
+		"MENU_SET_SEEN": "Marcar como lida",
+		"MENU_SET_ALL_SEEN": "Marcar todas como lidas",
+		"MENU_UNSET_SEEN": "Marcar como não lida",
+		"MENU_SET_FLAG": "Sinalizar",
+		"MENU_UNSET_FLAG": "Remover sinalização",
+		"MENU_SELECT_ALL": "Todas",
+		"MENU_SELECT_INVERT": "Inverter",
+		"MENU_SELECT_UNSEEN": "Não lidas",
+		"MENU_SELECT_SEEN": "Lidas",
+		"MENU_SELECT_FLAGGED": "Sinalizadas",
+		"MENU_SELECT_UNFLAGGED": "Não sinalizadas",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Descarregar todos os anexos",
+		"EMPTY_LIST": "Lista vazia.",
+		"EMPTY_SEARCH_LIST": "Nenhuma mensagem corresponde à sua pesquisa.",
+		"SEARCH_RESULT_FOR": "Resultados da pesquisa para \"%SEARCH%\"",
+		"BACK_TO_MESSAGE_LIST": "voltar à lista de mensagens",
+		"PUT_MESSAGE_HERE": "Coloque a mensagem aqui para vê-la na lista",
+		"TODAY_AT": "hoje às %TIME%",
+		"YESTERDAY_AT": "ontem às %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "Você tem %COUNT% novas mensagens!",
+		"QUOTA_SIZE": "Está a usar <strong>%SIZE% (%PROC%%)<\/strong> dos <strong>%LIMIT%<\/strong>",
+		"SORT": "Ordenar",
+		"NO_SORT": "O servidor de correio não suporta ordenação",
+		"SORT_ARRIVAL_ASC": "Chegada ascendente",
+		"SORT_ARRIVAL_DESC": "Chegada descendente",
+		"SORT_DATE_ASC": "Data ascendente",
+		"SORT_DATE_DESC": "Data descendente",
+		"SORT_SIZE_ASC": "Tamanho ascendente",
+		"SORT_SIZE_DESC": "Tamanho descendente",
+		"SORT_SUBJECT_ASC": "Assunto A-Z",
+		"SORT_SUBJECT_DESC": "Assunto Z-A",
+		"SORT_FROM_ASC": "De A-Z",
+		"SORT_FROM_DESC": "De Z-A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Editar",
+		"BUTTON_UNSUBSCRIBE": "Desinscrever-me desta lista",
+		"BUTTON_REPLY": "Responder",
+		"BUTTON_REPLY_ALL": "Responder a todos",
+		"BUTTON_FORWARD": "Encaminhar",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Encaminhar como anexo",
+		"BUTTON_EDIT_AS_NEW": "Editar como novo",
+		"BUTTON_SHOW_IMAGES": "Mostrar imagens externas",
+		"BUTTON_NOTIFY_READ_RECEIPT": "O remetente pediu para ser notificado quando você lesse esta mensagem.",
+		"BUTTON_IN_NEW_WINDOW": "Ver em janela separada",
+		"BUTTON_THREAD_LIST": "Lista de tópicos",
+		"BUTTON_THREAD_PREV": "Anterior",
+		"BUTTON_THREAD_NEXT": "Seguinte",
+		"BUTTON_THREAD_MORE": "Mais mensagens",
+		"MENU_HEADERS": "Mostrar título das mensagens",
+		"MENU_VIEW_ORIGINAL": "Mostrar original",
+		"HTML_VIEW": "Ver mensagem em HTML",
+		"PLAIN_VIEW": "Ver mensagem em texto simples",
+		"SWAP_COLORS": "Trocar a cor (de fundo) predefinida",
+		"MENU_DOWNLOAD_ORIGINAL": "Transferir como ficheiro .eml",
+		"MENU_FILTER_SIMILAR": "Filtrar mensagens semelhantes a esta",
+		"MENU_PRINT": "Imprimir",
+		"EMPTY_SUBJECT_TEXT": "(Sem assunto)",
+		"LABEL_DATE": "Data",
+		"LABEL_FROM_SHORT": "de",
+		"LABEL_TO_SHORT": "para",
+		"PRINT_LABEL_ATTACHMENTS": "Anexos",
+		"MESSAGE_VIEW_DESC": "Escolha uma mensagem na lista para ver o conteúdo aqui.",
+		"MESSAGE_VIEW_MOVE_DESC": "Clique no nome da pasta no painel da esquerda para escolher o destino.",
+		"LINK_DOWNLOAD_AS_ZIP": "Transferir em arquivo zip",
+		"SPAM_SCORE": "Pontuação de Spam",
+		"HAS_VIRUS_WARNING": "AVISO: vírus detetado",
+		"TAGS": "Marcadores",
+		"NEW_TAG": "Novo marcador",
+		"ENABLE_TRACKING_LINKS": "Ativar ligações de rastreamento",
+		"TRACKING_ENABLED": "As ligações irão ser rastreadas quando clicadas!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Importante",
+		"$todo": "A fazer",
+		"$label1": "Importante",
+		"$label2": "Trabalho",
+		"$label3": "Particular",
+		"$label4": "A fazer",
+		"$label5": "Mais tarde"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Recibo de leitura (apresentado) - %SUBJECT%",
+		"BODY": "Este é um comprovativo de leitura para o e-mail que você enviou para %READ-RECEIPT%.\n\nNota: Este comprovativo apenas confirma que a mensagem foi apresentada no computador do destinatário.\nNão existe nenhuma garantia de que o destinatário tenha lido ou compreendido o conteúdo da mensagem.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "A pesquisar..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Contactos",
+		"TAB_LOCATIONS": "Localizações",
+		"TAB_BUSINESS": "Empresa",
+		"LABEL_ORGANIZATION": "Empresa",
+		"LABEL_DEPARTMENT": "Departamento",
+		"LABEL_TITLE": "Cargo",
+		"TAB_CRYPTO": "Criptografia",
+		"ASK": "Perguntar",
+		"NEVER": "Nunca",
+		"ALWAYS": "Sempre",
+		"ALWAYS_IF_POSSIBLE": "Sempre que possível",
+		"BUTTON_ADD_CONTACT": "Adicionar contacto",
+		"BUTTON_CREATE_CONTACT": "Criar",
+		"BUTTON_IMPORT": "Importar (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Exportar (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Exportar (csv)",
+		"ERROR_IMPORT_FILE": "Erro ao importar (formato do ficheiro inválido)",
+		"EMPTY_LIST": "Nenhum contacto aqui",
+		"EMPTY_SEARCH": "Nenhum contacto encontrado",
+		"CLEAR_SEARCH": "Limpar pesquisa",
+		"CONTACT_VIEW_DESC": "Escolha o contacto na lista para visualizá-lo.",
+		"LABEL_BIRTHDAY": "Aniversário",
+		"DISPLAY_NAME": "Nome a apresentar",
+		"LAST_NAME": "Apelido",
+		"FIRST_NAME": "Nome",
+		"MIDDLE_NAME": "Nome do meio",
+		"NAME_PREFIX": "Prefixo do nome",
+		"NAME_SUFFIX": "Sufixo do nome",
+		"NICK_NAME": "Alcunha",
+		"LABEL_READ_ONLY": "Só de leitura",
+		"ADD_MENU_LABEL": "Adicionar",
+		"ADD_MENU_NICKNAME": "Alcunha",
+		"ADD_MENU_NOTE": "Notas",
+		"ADD_MENU_PHONE": "Telefone",
+		"ADD_MENU_URL": "Website",
+		"ADD_MENU_ADDRESS": "Morada",
+		"ADD_MENU_BIRTHDAY": "Aniversário",
+		"ADD_MENU_TAGS": "Marcadores",
+		"BUTTON_SHARE_ALL": "Todos",
+		"BUTTON_SYNC": "Sincronização (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Enviar para todos os contactos"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Mostrar todos os campos",
+		"BUTTON_SEND": "Enviar",
+		"BUTTON_MINIMIZE": "Minimizar",
+		"SAVED_TIME": "Guardada às %TIME%",
+		"SAVED_ERROR_ON_SEND": "A sua mensagem foi enviada, mas não foi guardada na pasta das mensagens enviadas.",
+		"DISCARD_UNSAVED_DATA": "Rejeitar o conteúdo que não foi guardado?",
+		"ATTACH_FILES": "Anexar ficheiros",
+		"ATTACH_DROP_FILES_DESC": "Arraste os ficheiros para aqui",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% escreveu",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Mensagem Encaminhada -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Enviado",
+		"EMPTY_TO_ERROR_DESC": "Por favor, especifique pelo menos um destinatário",
+		"NO_ATTACHMENTS_HERE_DESC": "Sem anexos aqui.",
+		"ATTACHMENTS_ERROR_DESC": "Aviso! Nem todos os anexos foram carregados.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ainda não foram carregados todos os anexos",
+		"ALLOW_SPELLCHECK": "Ativar corretor ortográfico do navegador",
+		"ALLOW_DRAFT_AUTOSAVE": "Guardar rascunho automaticamente",
+		"BUTTON_REQUEST_READ_RECEIPT": "Pedir um recibo de leitura",
+		"BUTTON_MARK_AS_IMPORTANT": "Marcar como importante",
+		"BUTTON_REQUEST_DSN": "Pedir um recibo de entrega",
+		"BUTTON_REQUIRE_TLS": "Exigir entrega segura",
+		"ERROR_EMPTY_BODY": "O corpo da mensagem está vazio"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Quer mesmo sair?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Quer mesmo fechar esta janela?",
+		"DESC_WANT_DELETE_MESSAGES": "Quer mesmo eliminar a(s) mensagem(ns)?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Escolha o seu idioma"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Adicionar conta",
+		"BUTTON_ADD_ACCOUNT": "Adicionar",
+		"TITLE_UPDATE_ACCOUNT": "Atualizar conta"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Adicionar identidade",
+		"TITLE_UPDATE_IDENTITY": "Atualizar identidade",
+		"LABEL": "Rótulo",
+		"BUTTON_ADD_IDENTITY": "Adicionar",
+		"SIGNATURE": "Assinatura",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Nas respostas, inserir esta assinatura acima da mensagem citada"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Criar uma pasta",
+		"LABEL_PARENT": "Pasta principal",
+		"BUTTON_CREATE": "Criar",
+		"TITLE_CREATING_PROCESS": "A criar pasta"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Eliminar todas as mensagens da pasta?",
+		"DANGER_DESC_WARNING": "Aviso!",
+		"DANGER_DESC_HTML_1": "Esta ação irá resultar na eliminação definitiva de todos os e-mails na pasta <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_2": "Uma vez iniciado, o processo não pode ser interrompido ou cancelado.",
+		"TITLE_CLEARING_PROCESS": "A eliminar a pasta..."
+	},
+	"CRYPTO": {
+		"SIGN": "Assinar",
+		"ENCRYPT": "Encriptar",
+		"DECRYPT": "Desencriptar",
+		"VERIFY": "Validar",
+		"GOOD_SIGNATURE": "Boa assinatura de %USER%",
+		"ERROR": "Erro %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Criar autoassinado",
+		"VALID_UNTIL": "Válido até",
+		"PRIVATE_KEY": "Chave privada",
+		"CHANGE_PASS": "Alterar frase secreta",
+		"CURRENT_PASS": "Frase secreta atual",
+		"NEW_PASS": "Nova frase secreta",
+		"ASK_CRYPTKEY_PASS": "A sua frase secreta de autenticação foi alterada. Por favor, preencha a sua frase secreta antiga para desencriptar os dados"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Importar chave OpenPGP",
+		"POPUP_IMPORT_BUTTON": "Importar",
+		"POPUP_VIEW_TITLE": "Ver chave OpenPGP",
+		"POPUP_VIEW_BUTTON": "Escolher",
+		"POPUP_GENERATE_TITLE": "Gerar chaves OpenPGP",
+		"POPUP_GENERATE_BUTTON": "Gerar",
+		"LABEL_KEY_TYPE": "Tipo",
+		"SIGNED_MESSAGE": "Mensagem assinada com OpenPGP",
+		"ENCRYPTED_MESSAGE": "Mensagem encriptada com OpenPGP",
+		"STORE_IN_GNUPG": "Guardar no servidor em GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Guardar a chave pública no servidor em GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Guardar a chave privada no servidor em GnuPG",
+		"BACKUP_ON_SERVER": "Guardar (encriptado) no servidor",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Fazer cópia de segurança da chave pública no servidor",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Fazer cópia de segurança da chave privada no servidor"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Importar certificado S\/MIME",
+		"CERTIFICATE": "Certificado",
+		"CERTIFICATES": "Certificados S\/MIME",
+		"SIGNED_MESSAGE": "Mensagem assinada com S\/MIME",
+		"ENCRYPTED_MESSAGE": "Mensagem encriptada com S\/MIME",
+		"PRIVATE_KEY_OF": "Chave privada S\/MIME de %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Criar um filtro",
+		"TITLE_EDIT_FILTER": "Atualizar um filtro",
+		"LEGEND_CONDITIONS": "Condições",
+		"LEGEND_ACTIONS": "Ações",
+		"BUTTON_ADD_CONDITION": "Adicionar uma condição",
+		"SELECT_ACTION_MOVE_TO": "Mover para",
+		"SELECT_ACTION_FORWARD_TO": "Encaminhar para",
+		"SELECT_ACTION_REJECT": "Rejeitar",
+		"SELECT_ACTION_VACATION_MESSAGE": "Mensagem de férias",
+		"SELECT_ACTION_DISCARD": "Descartar",
+		"SELECT_FIELD_RECIPIENTS": "Destinatários (Para ou Cc)",
+		"SELECT_FIELD_HEADER": "Cabeçalho",
+		"SELECT_FIELD_BODY": "Corpo",
+		"SELECT_FIELD_SIZE": "Tamanho",
+		"SELECT_TYPE_CONTAINS": "Contém",
+		"SELECT_TYPE_NOT_CONTAINS": "Não contém",
+		"SELECT_TYPE_MATCHES": "Corresponde (* e ? suportados)",
+		"SELECT_TYPE_NOT_MATCHES": "Não corresponde (* e ? suportados)",
+		"SELECT_TYPE_REGEXP": "RegExp",
+		"SELECT_TYPE_NOT_REGEXP": "Diferente de RegExp",
+		"SELECT_TYPE_EQUAL_TO": "Igual a",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Não é igual a",
+		"SELECT_TYPE_OVER": "Superior",
+		"SELECT_TYPE_UNDER": "Inferior",
+		"SELECT_TYPE_TEXT": "Texto",
+		"SELECT_TYPE_RAW": "Bruto",
+		"SELECT_MATCH_ANY": "Correspondendo a qualquer uma das regras que se seguem",
+		"SELECT_MATCH_ALL": "Correspondendo a todas as regras que se seguem",
+		"MARK_AS_READ_LABEL": "Marcar como lida",
+		"REPLY_INTERVAL_LABEL": "Intervalo de resposta (dias)",
+		"KEEP_LABEL": "Manter",
+		"STOP_LABEL": "Interromper o processamento das regras",
+		"VACATION_SUBJECT_LABEL": "Assunto (opcional)",
+		"VACATION_MESSAGE_LABEL": "Mensagem",
+		"VACATION_RECIPIENTS_LABEL": "Destinatários (separados por vírgula)",
+		"REJECT_MESSAGE_LABEL": "Rejeitar mensagem",
+		"ALL_INCOMING_MESSAGES_DESC": "Todas as mensagens recebidas"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Criar script",
+		"TITLE_EDIT": "Editar script",
+		"BUTTON_ADD_FILTER": "Adicionar um filtro",
+		"BUTTON_RAW_SCRIPT": "Usar um script de utilizador personalizado",
+		"CAPABILITY_LABEL": "Capacidades",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Estas alterações têm que ser guardadas no servidor."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Escolha as pastas de sistema",
+		"SELECT_CHOOSE_ONE": "Escolha uma",
+		"SELECT_UNUSE_NAME": "Não usar",
+		"NOTIFICATION_SENT": "Não escolheu a pasta de sistema \"Enviadas\", onde as mensagens enviadas são colocadas.\nSe não quiser guardar as mensagens enviadas, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_DRAFTS": "Não escolheu a pasta de sistema \"Rascunhos\", onde as mensagens são guardadas enquanto são escritas.",
+		"NOTIFICATION_SPAM": "Não escolheu a pasta de sistema \"Spam\", onde as mensagens de spam são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_TRASH": "Não escolheu a pasta de sistema \"Lixo\", onde as mensagens eliminadas são colocadas.\nSe quiser eliminar as mensagens definitivamente, por favor escolha a opção \"Não usar\".\n",
+		"NOTIFICATION_ARCHIVE": "Não escolheu a pasta de sistema \"Arquivo\", onde as mensagens arquivadas são colocadas."
+	},
+	"TITLES": {
+		"MAILBOX": "Caixa de correio",
+		"SETTINGS": "Definições"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "O ficheiro é muito grande",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "O ficheiro foi carregado parcialmente devido a um erro desconhecido",
+		"ERROR_NO_FILE_UPLOADED": "Nenhum ficheiro carregado",
+		"ERROR_MISSING_TEMP_FOLDER": "O ficheiro temporário está em falta",
+		"ERROR_ON_SAVING_FILE": "Ocorreu um erro desconhecido durante o carregamento do ficheiro",
+		"ERROR_FILE_TYPE": "Tipo de ficheiro inválido",
+		"ERROR_UNKNOWN": "Ocorreu um erro desconhecido durante o carregamento do ficheiro"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TEXTO",
+		"SOURCE": "HTML <-> FONTE",
+		"FONTFAMILY": "Tipo de letra",
+		"FONTSIZE": "Tamanho do tipo de letra",
+		"DIR": "Direção da escrita",
+		"DIR_LTR": "Esquerda para a direita",
+		"DIR_RTL": "Direita para a esquerda",
+		"DIR_AUTO": "Automática",
+		"TEXTCOLOR": "Cor do tipo de letra",
+		"BACKGROUNDCOLOR": "Cor de fundo",
+		"BOLD": "Negrito",
+		"ITALIC": "Itálico",
+		"UNDERLINE": "Sublinhado",
+		"STRIKE": "Rasurado",
+		"SUB": "Subscrito",
+		"SUP": "Sobrescrito",
+		"OL": "Lista ordenada",
+		"UL": "Lista não ordenada",
+		"QUOTE": "Citação",
+		"INDENTDECREASE": "Diminuir avanço",
+		"INDENTINCREASE": "Aumentar avanço",
+		"LINK": "Hiperligação",
+		"IMAGEURL": "Imagem por URL",
+		"IMAGEUPLOAD": "Escolher imagem",
+		"UNDO": "Desfazer",
+		"REDO": "Refazer",
+		"REMOVESTYLE": "Remover estilo"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Geral",
+		"CONTACTS": "Contactos",
+		"FOLDERS": "Pastas",
+		"ACCOUNTS": "Contas",
+		"FILTERS": "Filtros",
+		"SECURITY": "Segurança",
+		"THEMES": "Temas"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Simples",
+		"ADVANCED": "Avançado",
+		"BUTTON_ADD_SCRIPT": "Adicionar um script",
+		"SUBNAME_MOVE_TO": "Mover para \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Encaminhar para \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Rejeitar",
+		"SUBNAME_VACATION_MESSAGE": "Mensagem de férias",
+		"SUBNAME_DISCARD": "Descartar"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Segurança",
+		"LABEL_AUTOLOGOUT": "Auto-terminar sessão",
+		"FORGET_KEY_PASS": "Esquecer a palavra-passe da chave privada",
+		"NEVER": "Nunca"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Idioma",
+		"HOUR_FORMAT": "Formato da hora",
+		"IDENTITY": "Identidade",
+		"LAYOUT": "Apresentação",
+		"LAYOUT_NO_SPLIT": "Sem separação",
+		"LAYOUT_VERTICAL_SPLIT": "Separação vertical",
+		"LAYOUT_HORIZONTAL_SPLIT": "Separação horizontal",
+		"SHOW_NEXT_MESSAGE": "Mostrar a próxima mensagem quando (re)mover a mensagem atual",
+		"EDITOR": "Editor de texto padrão",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Texto simples",
+		"VIEW_OPTIONS": "Ver opções",
+		"USE_PREVIEW_PANE": "Use o painel de pré-visualização",
+		"HIDE_DELETED_MESSAGES": "Ocultar mensagens marcadas para eliminação",
+		"USE_CHECKBOXES_IN_LIST": "Apresentar caixas de seleção na lista",
+		"USE_THREADS": "Usar tópicos de conversa",
+		"THREAD_ALGORITHM": "Algoritmo de agrupamento",
+		"REPLY_SAME_FOLDER": "Colocar respostas na pasta das mensagens a que responde",
+		"PREFER_HTML": "Preferir HTML em vez de texto simples",
+		"PREFER_HTML_INFO": "Por vezes as mensagens são recebidas em ambos os formatos. Esta opção determina se prefere apresentar o conteúdo em HTML ou em texto simples.",
+		"REMOVE_COLORS": "Retirar imagens de fundo e coloração de texto do corpo das mensagens",
+		"ALLOW_STYLES": "Permitir estilos CSS",
+		"MESSAGE_PER_PAGE": "Mensagens por página",
+		"CHECK_MAIL_INTERVAL": "Intervalo de verificação do correio",
+		"MARK_MESSAGE_READ_AFTER": "Marcar mensagem como lida após",
+		"MSG_DEFAULT_ACTION": "Ação predefinida",
+		"SECONDS": "segundos",
+		"MINUTES": "minutos",
+		"NOTIFICATIONS": "Notificações",
+		"SOUND_NOTIFICATION": "Notificações sonoras",
+		"CHROME_NOTIFICATION_DESC": "Apresentar notificações para novas mensagens",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Bloqueado pelo navegador)",
+		"COLLAPSE_BLOCKQUOTES": "Minimizar texto citado",
+		"MAX_QUOTE_LEVEL": "Níveis máximos de texto citado visíveis",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Mostrar na lista de anexos os anexos integrados no corpo",
+		"LIST_SIMPLE_ATTACHMENTS": "Lista simples de anexos",
+		"LIST_MESSAGES_GROUPED": "Agrupar mensagens listadas (quando ordenadas por data ou remetente)",
+		"EXTERNAL_IMAGES": "Imagens externas",
+		"IMAGES_OPTION_ASK": "Perguntar sempre",
+		"IMAGES_OPTION_WHITELIST": "Lista Branca ou perguntar",
+		"IMAGES_OPTION_ALWAYS": "Mostrar sempre",
+		"IMAGES_WHITELIST": "Lista Branca de imagens",
+		"MESSAGE_POPUP_WINDOW": "Abrir em nova janela em vez de um separador",
+		"MAILTO": "Registar como manipulador de ligações 'mailto:'",
+		"HTML_TO_MD": "Converter HTML para Markdown em vez de texto simples"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Adicionar destinatários automaticamente à sua lista de endereços",
+		"LEGEND_CONTACTS_SYNC": "Sincronização Remota (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Ativar sincronização remota",
+		"LABEL_CONTACTS_SYNC_SERVER": "Servidor",
+		"LABEL_CONTACTS_SYNC_AB_URL": "URL do livro de endereços",
+		"LABEL_CONTACTS_SYNC_USER": "Utilizador",
+		"SYNC_READ": "Só de leitura"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Temas",
+		"LABEL_BACKGROUND": "Imagem de fundo",
+		"LABEL_FONTS": "Tipos de letra",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Carregar imagem de fundo (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Ficheiro muito grande",
+		"ERROR_FILE_TYPE_ERROR": "Tipo de ficheiro inválido (apenas JPG e PNG)",
+		"ERROR_UNKNOWN": "Ocorreu um erro desconhecido durante o carregamento do ficheiro"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Lista de pastas",
+		"BUTTON_CREATE": "Criar pasta",
+		"BUTTON_SYSTEM": "Pastas de sistema",
+		"BUTTON_SUBSCRIBE": "Subscrever",
+		"BUTTON_UNSUBSCRIBE": "Anular subscrição",
+		"LOADING_PROCESS": "A atualizar a lista de pastas",
+		"CREATING_PROCESS": "A criar uma pasta",
+		"DELETING_PROCESS": "A eliminar uma pasta",
+		"RENAMING_PROCESS": "A renomear uma pasta",
+		"TO_MANY_FOLDERS_DESC_1": "Você tem demasiadas pastas!",
+		"TO_MANY_FOLDERS_DESC_2": "Apenas apresentámos parte delas, para evitar problemas de desempenho.",
+		"HELP_DELETE_FOLDER": "Eliminar pasta",
+		"HELP_SHOW_HIDE_FOLDER": "Mostrar\/ocultar pasta",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Procurar novas mensagens",
+		"HIDE_UNSUBSCRIBED": "Esconder pastas não subscritas",
+		"UNHIDE_KOLAB_FOLDERS": "Tonar pastas Kolab visíveis",
+		"TYPE_CALENDAR": "Calendário",
+		"TYPE_CONFIGURATION": "Configuração",
+		"TYPE_CONTACTS": "Contactos",
+		"TYPE_FILES": "Ficheiros",
+		"TYPE_JOURNAL": "Diário",
+		"TYPE_NOTES": "Notas",
+		"TYPE_TASKS": "Tarefas"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Contas",
+		"LEGEND_IDENTITIES": "Identidades",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Contas e identidades",
+		"BUTTON_ADD_ACCOUNT": "Adicionar uma conta",
+		"BUTTON_ADD_IDENTITY": "Adicionar uma identidade",
+		"LOADING_PROCESS": "A atualizar...",
+		"SHOW_UNREAD": "Mostrar contador de mensagens não lidas"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Importar chave",
+		"BUTTON_GENERATE_KEY_PAIR": "Gerar chaves",
+		"IMPORT_FROM_SERVER": "Importar de servidor",
+		"TITLE_PRIVATE": "Privada",
+		"TITLE_PUBLIC": "Pública",
+		"GET_MAILVELOPE": "Obter extensão Mailvelope para o navegador."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Ajuda para atalhos de teclado",
+		"TAB_MAILBOX": "Caixa de correio",
+		"TAB_MESSAGE_LIST": "Lista de mensagens",
+		"TAB_MESSAGE_VIEW": "Vista da mensagem",
+		"TAB_COMPOSE": "Compor",
+		"LABEL_OPEN_USER_DROPDOWN": "Abrir menu do utilizador",
+		"LABEL_REPLY": "Responder",
+		"LABEL_REPLY_ALL": "Responder a todos",
+		"LABEL_FORWARD": "Encaminhar",
+		"LABEL_FORWARD_MULTIPLY": "Encaminhar como anexo(s)",
+		"LABEL_CHECK_ALL": "Selecionar todas as mensagens",
+		"LABEL_DELETE": "Eliminar",
+		"LABEL_OPEN_THREAD": "Abrir tópico selecionado",
+		"LABEL_MOVE": "Mover",
+		"LABEL_READ": "Ler as mensagens selecionadas",
+		"LABEL_UNREAD": "Marcar as mensagens selecionadas como não lidas",
+		"LABEL_IMPORTANT": "Marcar como Importantes as mensagens selecionadas",
+		"LABEL_CANCEL_SEARCH": "Cancelar pesquisa",
+		"LABEL_FULLSCREEN_ENTER": "Ecrã-inteiro (com janela de pré-visualização)",
+		"LABEL_VIEW_MESSAGE_ENTER": "Ver mensagem (sem janela de pré-visualização)",
+		"LABEL_SWITCH_TO_MESSAGE": "Dar foco à mensagem selecionada",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Dar foco à lista de pastas",
+		"LABEL_FULLSCREEN_TOGGLE": "Alternar modo ecrã-inteiro",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Alternar visibilidade do texto citado",
+		"LABEL_THREAD_NEXT": "Mensagem seguinte deste tópico",
+		"LABEL_THREAD_PREV": "Mensagem anterior deste tópico",
+		"LABEL_EXIT_FULLSCREEN": "Sair do modo ecrã-inteiro",
+		"LABEL_CLOSE_MESSAGE": "Fechar mensagem (sem janela de pré-visualização)",
+		"LABEL_SWITCH_TO_LIST": "Dar foco à lista de mensagens",
+		"LABEL_OPEN_COMPOSE_POPUP": "Abrir janela de composição",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimizar janela de composição",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Abrir menu de identidades",
+		"LABEL_SAVE_MESSAGE": "Guardar mensagem",
+		"LABEL_SEND_MESSAGE": "Enviar mensagem",
+		"LABEL_CLOSE_COMPOSE": "Fechar janela de composição"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "A solicitação falhou",
+		"RequestAborted": "A solicitação foi abortada",
+		"RequestTimeout": "A solicitação expirou",
+		"InvalidToken": "Token inválido",
+		"AuthError": "A autenticação falhou",
+		"ConnectionError": "Não foi possível ligar ao servidor",
+		"DomainAlreadyExists": "O domínio já existe",
+		"DomainNotAllowed": "Este domínio não é permitido",
+		"AccountNotAllowed": "Esta conta não é permitida",
+		"CryptKeyError": "A sua palavra-passe de autenticação foi alterada",
+		"ContactsSyncError": "Erro na sincronização de contactos",
+		"CantGetMessageList": "Não é possível obter a lista de mensagens",
+		"CantGetMessage": "Não é possível obter a mensagem",
+		"CantDeleteMessage": "Não é possível eliminar a mensagem",
+		"CantCopyMessage": "Não é possível copiar a mensagem",
+		"CantMoveMessage": "Não é possível mover a mensagem",
+		"CantSaveMessage": "Não é possível guardar a mensagem",
+		"CantSendMessage": "Não é possível enviar a mensagem",
+		"InvalidRecipients": "Destinatários inválidos",
+		"CantSaveFilters": "Não é possível guardar os filtros",
+		"CantGetFilters": "Não é possível obter os filtros",
+		"CantActivateFiltersScript": "Não é possível ativar o script de filtração",
+		"CantDeleteFiltersScript": "Não é possível eliminar o script de filtração",
+		"FiltersAreNotCorrect": "Os filtros não estão corretos",
+		"CantCreateFolder": "Não é possível criar a pasta",
+		"CantRenameFolder": "Não é possível renomear a pasta",
+		"CantDeleteFolder": "Não é possível eliminar a pasta",
+		"CantDeleteNonEmptyFolder": "Não é possível eliminar pastas com conteúdos",
+		"CantSubscribeFolder": "Não é possível subscrever a esta pasta",
+		"CantUnsubscribeFolder": "Não é possível anular a subscrição desta pasta",
+		"DemoSendMessageError": "Por motivos de segurança, esta conta de demonstração não tem permissão para enviar mensagens para endereços de e-mail externos!",
+		"DemoAccountError": "Por motivos de segurança, esta conta não tem permissão de executar esta ação!",
+		"AccountAlreadyExists": "Esta conta já existe",
+		"AccountDoesNotExist": "Esta conta não existe",
+		"AccountSwitchFailed": "A alteração para a conta \"%EMAIL%\" falhou",
+		"MailServerError": "Ocorreu um erro ao aceder ao servidor de correio",
+		"InvalidInputArgument": "Parâmetro de entrada inválido",
+		"UnknownError": "Erro desconhecido"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ro/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ro-RO/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/ro/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/static.json b/snappymail/v/0.0.0/app/localization/ro/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ro-RO/static.json
rename to snappymail/v/0.0.0/app/localization/ro/static.json
diff --git a/snappymail/v/0.0.0/app/localization/ro-RO/user.json b/snappymail/v/0.0.0/app/localization/ro/user.json
similarity index 61%
rename from snappymail/v/0.0.0/app/localization/ro-RO/user.json
rename to snappymail/v/0.0.0/app/localization/ro/user.json
index dc0ea891f..9705bf33d 100644
--- a/snappymail/v/0.0.0/app/localization/ro-RO/user.json
+++ b/snappymail/v/0.0.0/app/localization/ro/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arhivare",
 		"ARE_YOU_SURE": "Sunteți sigur?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Închide (Esc)",
 		"CONTACTS": "Contacte",
 		"DELETE": "Șterge",
+		"UNDELETE": "Undelete",
 		"DONE": "Done",
 		"EMAIL": "Email",
 		"FROM": "De la",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Deconectare",
 		"MORE": "Mai mult",
 		"MOVE_TO": "Mută la",
+		"COPY_TO": "Copiaza in",
 		"NAME": "Intrări",
 		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Not SPAM",
+		"USERNAME": "Nume de utilizator",
 		"PASSWORD": "Parolă",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Salvează",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Nu am găsit nimic.",
 		"SPAM": "SPAM",
 		"SUBJECT": "Subiect",
 		"TEST": "Test",
-		"TO": "către"
+		"TO": "către",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Da",
+		"NO": "Nu",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Help",
+		"TEXT": "Conținut",
+		"ATTACHMENTS": "Atașament"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Conectare",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Conectare"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Adaugă un cont",
-		"BUTTON_SETTINGS": "Opțiuni",
-		"BUTTON_HELP": "Help"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Versiunea de mobil",
-		"BUTTON_DESKTOP_VERSION": "Versiunea desktop"
+		"BUTTON_ADD_ACCOUNT": "Adaugă un cont"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Căutare avansată",
-		"LABEL_ADV_TEXT": "Conținut",
-		"LABEL_ADV_HAS_ATTACHMENT": "Are atașament",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Atașamente",
-		"LABEL_ADV_FLAGGED": "Importante",
-		"LABEL_ADV_UNSEEN": "Necitit",
-		"LABEL_ADV_DATE": "Data",
-		"LABEL_ADV_DATE_ALL": "Tot timpul",
-		"LABEL_ADV_DATE_3_DAYS": "З zile",
-		"LABEL_ADV_DATE_7_DAYS": "7 zile",
-		"LABEL_ADV_DATE_MONTH": "în această lună",
-		"LABEL_ADV_DATE_3_MONTHS": "3 luni",
-		"LABEL_ADV_DATE_6_MONTHS": "6 luni",
-		"LABEL_ADV_DATE_YEAR": "în acest an",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Închide (Esc)",
-		"GALLERY_PREV": "Precedentul (săgeată stânga)",
-		"GALLERY_NEXT": "Următorul (săgeată dreapta)",
-		"GALLERY_COUNTER": "%curr% din %total%"
+		"TEXT": "Conținut",
+		"HAS_ATTACHMENT": "Are atașament",
+		"FLAGGED": "Importante",
+		"UNSEEN": "Necitit",
+		"DATE": "Data",
+		"DATE_ALL": "Tot timpul",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "З zile",
+		"SINCE_7_DAYS": "7 zile",
+		"SINCE_MONTH": "în această lună",
+		"SINCE_3_MONTHS": "3 luni",
+		"SINCE_6_MONTHS": "6 luni",
+		"SINCE_YEAR": "în acest an",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Răspuns",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Compune",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Șterse",
 		"ARCHIVE_NAME": "Archive"
 	},
-	"QUOTA": {
-		"TITLE": "Cotă"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Actualizare",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Citit",
 		"MENU_SELECT_FLAGGED": "Important",
 		"MENU_SELECT_UNFLAGGED": "Neimportant",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Nimic aici, deocamdată",
 		"EMPTY_SEARCH_LIST": "Nu am găsit nimic.",
 		"SEARCH_RESULT_FOR": "Rezultat căutare \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "înapoi la lista de mesaje",
-		"EMPTY_SUBJECT_TEXT": "(nici un subiect)",
 		"PUT_MESSAGE_HERE": "EROARE! CONTACTAȚI ADIMISTRATORUL! (trimiteți un prt.scr)",
 		"TODAY_AT": "azi %TIME%",
 		"YESTERDAY_AT": "ieri %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Aveți %COUNT% mesaje noi!",
 		"QUOTA_SIZE": "Ați folosit <strong>%SIZE% (%PROC%%)<\/strong> din <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Vezi originalul",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Descărcați ca fișier eml",
 		"MENU_FILTER_SIMILAR": "Filtrează similarele",
 		"MENU_PRINT": "Printează",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Faceți clic pe numele dosarului din panoul din stânga pentru a selecta destinația.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Mesajul dumneavoastră a fost citit - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Căutare..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Adugă un contact",
 		"BUTTON_CREATE_CONTACT": "Salvează",
-		"BUTTON_UPDATE_CONTACT": "Actualizează",
 		"BUTTON_IMPORT": "Importă (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Export (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nu am găsit nimic.",
 		"CLEAR_SEARCH": "Golește căutarea",
 		"CONTACT_VIEW_DESC": "Selectați un contact pentru a-l vizualiza",
-		"LABEL_PHONE": "Тelefon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Birthday",
-		"LINK_ADD_EMAIL": "Adugă Mail nou",
-		"LINK_ADD_PHONE": "Adaugă un număr nou",
-		"LINK_BIRTHDAY": "Birthday",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Introduceți numele complet",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Prenume",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Nume",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Enter nickname",
+		"DISPLAY_NAME": "Numele complet",
+		"LAST_NAME": "Prenume",
+		"FIRST_NAME": "Nume",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Doar pentru citire",
-		"LABEL_SHARE": "Distribuie",
 		"ADD_MENU_LABEL": "Add",
 		"ADD_MENU_NICKNAME": "Nickname",
-		"ADD_MENU_NOTES": "Notes",
+		"ADD_MENU_NOTE": "Notes",
 		"ADD_MENU_PHONE": "Phone",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Address",
 		"ADD_MENU_BIRTHDAY": "Birthday",
 		"ADD_MENU_TAGS": "Tags",
 		"BUTTON_SHARE_ALL": "Toate",
-		"BUTTON_SYNC": "Synchronization (CardDAV)"
+		"BUTTON_SYNC": "Synchronization (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "Extinde",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat",
 		"BUTTON_REQUEST_READ_RECEIPT": "Cere confirmare de citire",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
+		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Da",
-		"BUTTON_NO": "Nu",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Sigur doriți să închideți această fereastră?",
 		"DESC_WANT_DELETE_MESSAGES": "Sigur doriți să ștergeți mesajul(e)?"
 	},
@@ -226,14 +273,14 @@
 	"POPUPS_ADD_ACCOUNT": {
 		"TITLE_ADD_ACCOUNT": "Adăugați un cont",
 		"BUTTON_ADD_ACCOUNT": "Adaugă",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_UPDATE_ACCOUNT": "Update Account"
 	},
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Adăugați un profil",
 		"TITLE_UPDATE_IDENTITY": "Actualizați profilul",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Adăugați",
-		"BUTTON_UPDATE_IDENTITY": "Actualizați",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "După începerea procesului de curățare <strong style=\"color:red\">nu mai puteți<\/strong> anula procesul.",
 		"TITLE_CLEARING_PROCESS": "Curăț dosarul..."
 	},
+	"CRYPTO": {
+		"SIGN": "Sign",
+		"ENCRYPT": "Encrypt",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import OpenPGP key",
 		"POPUP_IMPORT_BUTTON": "Import",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Generate OpenPGP keys",
 		"POPUP_GENERATE_BUTTON": "Generate",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Sign",
-		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP signed message",
 		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME signed message",
+		"ENCRYPTED_MESSAGE": "S\/MIME encrypted message",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
+		"TITLE_CREATE_FILTER": "Create a filter",
+		"TITLE_EDIT_FILTER": "Update filter",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Add a Condition",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Mark as read",
 		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
 		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Subject (optional)",
 		"VACATION_MESSAGE_LABEL": "Message",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Eroare la încărcarea de fișiere"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personal",
-		"LABEL_GENERAL_NAME": "De bază",
-		"LABEL_CONTACTS_NAME": "Contacte",
-		"LABEL_FOLDERS_NAME": "Dosare",
-		"LABEL_ACCOUNTS_NAME": "Conturi",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Security",
-		"LABEL_THEMES_NAME": "Subiecte"
+		"GENERAL": "De bază",
+		"CONTACTS": "Contacte",
+		"FOLDERS": "Dosare",
+		"ACCOUNTS": "Conturi",
+		"FILTERS": "Filters",
+		"SECURITY": "Security",
+		"THEMES": "Subiecte"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% oră(ore)"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Setări de bază",
-		"LABEL_LANGUAGE": "Limbă",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Editor de text implicit",
-		"LABEL_EDITOR_HTML": "Formatat",
-		"LABEL_EDITOR_PLAIN": "Simplu",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "Afișare",
-		"LABEL_USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox",
-		"LABEL_USE_THREADS": "Minimizează scrisorile",
-		"LABEL_REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
-		"LABEL_SHOW_IMAGES": "Arată imaginile externe în corpul mesajului, fără avertisment",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Mesaje pe o pagină",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Limbă",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Editor de text implicit",
+		"EDITOR_HTML": "Formatat",
+		"EDITOR_PLAIN": "Simplu",
+		"VIEW_OPTIONS": "Afișare",
+		"USE_PREVIEW_PANE": "Folosiți un mod de afișare cu trei coloane",
+		"HIDE_DELETED_MESSAGES": "Ascunde mesajele marcate pentru ștergere",
+		"USE_CHECKBOXES_IN_LIST": "Afișează listele checkbox",
+		"USE_THREADS": "Minimizează scrisorile",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Răspunsurile în același folder cu originalul",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Mesaje pe o pagină",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notificări",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notificări",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Afișați notificări desktop pentru mesaje noi",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(browser-ul blocat)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Adaugă automat destinatarii la agenda de scrisori",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL",
 		"LABEL_CONTACTS_SYNC_USER": "User",
-		"SYNC_NO": "Nu",
-		"SYNC_YES": "Da",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Tematică",
-		"LEGEND_THEMES_CUSTOM": "Setați o temă particularizată",
-		"LABEL_CUSTOM_TYPE": "Tip Teme",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Lumina",
-		"LABEL_CUSTOM_TYPE_DARK": "Umbră",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Imaginea de pe fundal",
+		"LABEL_BACKGROUND": "Imaginea de pe fundal",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Încărcați o imagine de fundal (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Fișier prea mare",
 		"ERROR_FILE_TYPE_ERROR": "Tip de fișier invalid (numai JPG sau PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Adaugă un alt cont",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Actualizez lista de conturi",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Salvează ciorna automat",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Reply All",
 		"LABEL_FORWARD": "Forward",
 		"LABEL_FORWARD_MULTIPLY": "Forward (multiply)",
-		"LABEL_HELP": "Help",
 		"LABEL_CHECK_ALL": "Select all messages",
 		"LABEL_DELETE": "Delete",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Print",
 		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
 		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
 		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Semn invalid",
-		"AUTH_ERROR": "Nu se poate realiza conectarea",
-		"CONNECTION_ERROR": "Eroare la conectarea la server.",
-		"DOMAIN_ALREADY_EXISTS": "Domeniu există deja.",
-		"DOMAIN_NOT_ALLOWED": "Domeniul nu apartine de Wey5",
-		"ACCOUNT_NOT_ALLOWED": "Contul nu are permisiunea de conectare",
-		"CONTACTS_SYNC_ERROR": "Contacts synchronization error",
-		"CANT_GET_MESSAGE_LIST": "Nu găsesc o lista de scrisori",
-		"CANT_GET_MESSAGE": "Nu pot obține scrisoarea. Încercați din nou",
-		"CANT_DELETE_MESSAGE": "Nu pot șterge scrisoarea. Încercați din  nou",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Nu pot muta scrisoarea.Încercați din nou",
-		"CANT_SAVE_MESSAGE": "Nu pot salva mesajul. Încercați din nou",
-		"CANT_SEND_MESSAGE": "Nu pot trimite scrisoarea.Încercați din nou",
-		"INVALID_RECIPIENTS": "Verificați dacă ați introdus toate adresele.",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Nu crea dosarul. Încercați din nou",
-		"CANT_RENAME_FOLDER": "Nu pot redenumi dosarul. Încercați din nou",
-		"CANT_DELETE_FOLDER": "Nu pot șterge dosarul. Încercați din nou",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nu pot șterge un dosar care nu este gol",
-		"CANT_SUBSCRIBE_FOLDER": "Nu pot semna dosarul. Încercați din nou",
-		"CANT_UNSUBSCRIBE_FOLDER": "Nu mă pot dezbona. Încercați din nou",
-		"DEMO_SEND_MESSAGE_ERROR": "Cont demo trimite e-mail la adresele de e-mail externe este interzisă!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Contul deja există",
-		"ACCOUNT_DOES_NOT_EXIST": "contul nu există",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Nu am reușit să accesez serverul de e-mail",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Eroare necunoscută"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Semn invalid",
+		"AuthError": "Nu se poate realiza conectarea",
+		"ConnectionError": "Eroare la conectarea la server.",
+		"DomainAlreadyExists": "Domeniu există deja.",
+		"DomainNotAllowed": "Domeniul nu apartine de Wey5",
+		"AccountNotAllowed": "Contul nu are permisiunea de conectare",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Contacts synchronization error",
+		"CantGetMessageList": "Nu găsesc o lista de scrisori",
+		"CantGetMessage": "Nu pot obține scrisoarea. Încercați din nou",
+		"CantDeleteMessage": "Nu pot șterge scrisoarea. Încercați din  nou",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Nu pot muta scrisoarea.Încercați din nou",
+		"CantSaveMessage": "Nu pot salva mesajul. Încercați din nou",
+		"CantSendMessage": "Nu pot trimite scrisoarea.Încercați din nou",
+		"InvalidRecipients": "Verificați dacă ați introdus toate adresele.",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Nu crea dosarul. Încercați din nou",
+		"CantRenameFolder": "Nu pot redenumi dosarul. Încercați din nou",
+		"CantDeleteFolder": "Nu pot șterge dosarul. Încercați din nou",
+		"CantDeleteNonEmptyFolder": "Nu pot șterge un dosar care nu este gol",
+		"CantSubscribeFolder": "Nu pot semna dosarul. Încercați din nou",
+		"CantUnsubscribeFolder": "Nu mă pot dezbona. Încercați din nou",
+		"DemoSendMessageError": "Cont demo trimite e-mail la adresele de e-mail externe este interzisă!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Contul deja există",
+		"AccountDoesNotExist": "contul nu există",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Nu am reușit să accesez serverul de e-mail",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Eroare necunoscută"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/user.json b/snappymail/v/0.0.0/app/localization/ru-RU/user.json
deleted file mode 100644
index 51ad3e1e6..000000000
--- a/snappymail/v/0.0.0/app/localization/ru-RU/user.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-	"GLOBAL": {
-		"TO_ARCHIVE": "Архивирование",
-		"ARE_YOU_SURE": "Точно?",
-		"BACK": "Назад",
-		"BCC": "Скрытая",
-		"CANCEL": "Отменить",
-		"CC": "Копия",
-		"CLEAR": "Очистить",
-		"CLOSE": "Закрыть (Esc)",
-		"CONTACTS": "Контакты",
-		"DELETE": "Удалить",
-		"DONE": "Закончить",
-		"EMAIL": "Почта",
-		"FROM": "От",
-		"LOADING": "Загрузка...",
-		"LOGOUT": "Выйти",
-		"MORE": "Еще",
-		"MOVE_TO": "Переместить",
-		"NAME": "Входящие",
-		"NONE": "Ничего",
-		"NOT_SPAM": "Не спам",
-		"PASSWORD": "Пароль",
-		"REPLY_TO": "Ответить-на",
-		"SAVE": "Сохранить",
-		"SEARCH": "Контакты не найдены",
-		"SPAM": "В спам",
-		"SUBJECT": "Тема",
-		"TEST": "Тест",
-		"TO": "Кому"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Логин",
-		"LABEL_SIGN_ME": "Запомнить меня",
-		"BUTTON_SIGN_IN": "Войти"
-	},
-	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт",
-		"BUTTON_SETTINGS": "Настройки",
-		"BUTTON_HELP": "Помощь"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобильная версия",
-		"BUTTON_DESKTOP_VERSION": "Полная версия"
-	},
-	"SEARCH": {
-		"TITLE_ADV": "Расширенный поиск писем",
-		"LABEL_ADV_TEXT": "Текст",
-		"LABEL_ADV_HAS_ATTACHMENT": "С файлами",
-		"LABEL_ADV_HAS_ATTACHMENTS": "С файлами",
-		"LABEL_ADV_FLAGGED": "Помеченные",
-		"LABEL_ADV_UNSEEN": "Непрочитанные",
-		"LABEL_ADV_DATE": "Дата",
-		"LABEL_ADV_DATE_ALL": "За все время",
-		"LABEL_ADV_DATE_3_DAYS": "За три дня",
-		"LABEL_ADV_DATE_7_DAYS": "За неделю",
-		"LABEL_ADV_DATE_MONTH": "За месяц",
-		"LABEL_ADV_DATE_3_MONTHS": "За 3 месяца",
-		"LABEL_ADV_DATE_6_MONTHS": "За полгода",
-		"LABEL_ADV_DATE_YEAR": "За год",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Полный экран",
-		"ZOOM": "Увеличить\/уменьшить",
-		"CLOSE": "Закрыть (Esc)",
-		"GALLERY_PREV": "Назад (Стрелка ←)",
-		"GALLERY_NEXT": "Вперед (Стрелка →)",
-		"GALLERY_COUNTER": "%curr% из %total%"
-	},
-	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Написать",
-		"BUTTON_NEW_MESSAGE": "Новое сообщение",
-		"INBOX_NAME": "Входящие",
-		"SENT_NAME": "Отправленные",
-		"DRAFTS_NAME": "Черновики",
-		"TRASH_NAME": "Корзина",
-		"ARCHIVE_NAME": "Архив"
-	},
-	"QUOTA": {
-		"TITLE": "Дисковая квота"
-	},
-	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "Обновить Список Писем",
-		"BUTTON_EMPTY_FOLDER": "Очистить всю папку",
-		"BUTTON_MULTY_FORWARD": "Переслать сообщения",
-		"BUTTON_DELETE_WITHOUT_MOVE": "Удалить мимо корзины",
-		"MENU_SET_SEEN": "Отметить как прочитанное",
-		"MENU_SET_ALL_SEEN": "Отметить все как прочитанные",
-		"MENU_UNSET_SEEN": "Отметить как непрочитанное",
-		"MENU_SET_FLAG": "Установить флаг",
-		"MENU_UNSET_FLAG": "Снять флаг",
-		"MENU_SELECT_ALL": "Все",
-		"MENU_SELECT_INVERT": "Инвентировать",
-		"MENU_SELECT_UNSEEN": "Непрочитанные",
-		"MENU_SELECT_SEEN": "Прочитанные",
-		"MENU_SELECT_FLAGGED": "Помеченные",
-		"MENU_SELECT_UNFLAGGED": "Без пометок",
-		"EMPTY_LIST": "В папке нет писем.",
-		"EMPTY_SEARCH_LIST": "Письма не найдены.",
-		"SEARCH_RESULT_FOR": "Результат поиска \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
-		"EMPTY_SUBJECT_TEXT": "(Без темы)",
-		"PUT_MESSAGE_HERE": "Киньте сообщение сюда, чтобы посмотреть его в списке",
-		"TODAY_AT": "сегодня в %TIME%",
-		"YESTERDAY_AT": "вчера в %TIME%",
-		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% новых сообщений!",
-		"QUOTA_SIZE": "Использовано <strong>%SIZE% (%PROC%%)<\/strong> из <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
-	},
-	"MESSAGE": {
-		"BUTTON_EDIT": "Редактировать",
-		"BUTTON_UNSUBSCRIBE": "Отписаться",
-		"BUTTON_REPLY": "Ответить на Письмо",
-		"BUTTON_REPLY_ALL": "Ответить Всем",
-		"BUTTON_FORWARD": "Переслать",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "Переслать как файл",
-		"BUTTON_EDIT_AS_NEW": "Редактировать как новое",
-		"BUTTON_SHOW_IMAGES": "Показать внешние изображения в письме",
-		"BUTTON_NOTIFY_READ_RECEIPT": "Уведомить отправителя о прочтении этого сообщения.",
-		"BUTTON_IN_NEW_WINDOW": "В отдельном окне",
-		"BUTTON_THREAD_LIST": "Список",
-		"BUTTON_THREAD_PREV": "Предыдущее",
-		"BUTTON_THREAD_NEXT": "Следующее",
-		"BUTTON_THREAD_MORE": "Больше сообщений",
-		"MENU_HEADERS": "Просмотреть заголовки",
-		"MENU_VIEW_ORIGINAL": "Просмотреть оригинал",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "Скачать как .eml файл",
-		"MENU_FILTER_SIMILAR": "Фильтровать похожие",
-		"MENU_PRINT": "Распечатать",
-		"EMPTY_SUBJECT_TEXT": "(Без темы)",
-		"LABEL_DATE": "Дата",
-		"LABEL_FROM_SHORT": "от",
-		"LABEL_TO_SHORT": "кому",
-		"PRINT_LABEL_ATTACHMENTS": "Файлы",
-		"MESSAGE_VIEW_DESC": "Выберите сообщение для просмотра.",
-		"MESSAGE_VIEW_MOVE_DESC": "Выберите имя папки в левой панели, чтобы переместить сообщение.",
-		"LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
-	},
-	"READ_RECEIPT": {
-		"SUBJECT": "Уведомление о прочтении письма - %SUBJECT%",
-		"BODY": "Это уведомление о прочтении для сообщения, которое вы отправили в адрес %READ-RECEIPT%.\n\nПримечание: Это уведомление о прочтении означает лишь то, что сообщение было отображено на машине получателя.\nОно не гарантирует того, что получатель прочёл или понял содержимое сообщения.\n"
-	},
-	"SUGGESTIONS": {
-		"SEARCHING_DESC": "Поиск..."
-	},
-	"CONTACTS": {
-		"BUTTON_ADD_CONTACT": "Добавить контакт",
-		"BUTTON_CREATE_CONTACT": "Сохранить",
-		"BUTTON_UPDATE_CONTACT": "Обновить",
-		"BUTTON_IMPORT": "Импорт (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "Экспорт (vcf, vCard)",
-		"BUTTON_EXPORT_CSV": "Экспорт (csv)",
-		"ERROR_IMPORT_FILE": "Ошибка импорта (Неправильный формат файла)",
-		"EMPTY_LIST": "Нет контактов",
-		"EMPTY_SEARCH": "Контакты не найдены",
-		"CLEAR_SEARCH": "Очистить поиск",
-		"CONTACT_VIEW_DESC": "Выберите контакт для просмотра.",
-		"LABEL_PHONE": "Телефон",
-		"LABEL_WEB": "Сайт",
-		"LABEL_BIRTHDAY": "День рождения",
-		"LINK_ADD_EMAIL": "Добавьте адрес электронной почты",
-		"LINK_ADD_PHONE": "Добавьте телефон",
-		"LINK_BIRTHDAY": "День рождения",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Введите полное имя",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Введите имя",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Введите фамилию",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Введите ник",
-		"LABEL_READ_ONLY": "Только чтение",
-		"LABEL_SHARE": "Поделиться",
-		"ADD_MENU_LABEL": "Добавить",
-		"ADD_MENU_NICKNAME": "Ник",
-		"ADD_MENU_NOTES": "Примечания",
-		"ADD_MENU_PHONE": "Телефон",
-		"ADD_MENU_URL": "Сайт",
-		"ADD_MENU_ADDRESS": "Адрес",
-		"ADD_MENU_BIRTHDAY": "День рождения",
-		"ADD_MENU_TAGS": "Тэги",
-		"BUTTON_SHARE_ALL": "Всем",
-		"BUTTON_SYNC": "Синхронизация (CardDAV)"
-	},
-	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "Показать все поля",
-		"BUTTON_SEND": "Отправить",
-		"BUTTON_MINIMIZE": "Minimize",
-		"SAVED_TIME": "Сохранено в %TIME%",
-		"SAVED_ERROR_ON_SEND": "Сообщение было отправлено, но не было сохранено",
-		"DISCARD_UNSAVED_DATA": "Discard unsaved data?",
-		"ATTACH_FILES": "Прикрепить файлы",
-		"ATTACH_DROP_FILES_DESC": "Поместите файлы сюда",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% написал",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Пересланное сообщение -------",
-		"FORWARD_MESSAGE_TOP_SENT": "Отправлено",
-		"EMPTY_TO_ERROR_DESC": "Укажите как минимум одного получателя",
-		"NO_ATTACHMENTS_HERE_DESC": "Прикреплённые файлы отсутствуют.",
-		"ATTACHMENTS_ERROR_DESC": "Внимание! Не все прикреплённые файлы были загружены.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Не все прикреплённые файлы были загружены",
-		"BUTTON_REQUEST_READ_RECEIPT": "Запрос о прочтении письма",
-		"BUTTON_MARK_AS_IMPORTANT": "Отметить как важное",
-		"BUTTON_REQUEST_DSN": "Запросить уведомление о доставке"
-	},
-	"POPUPS_ASK": {
-		"BUTTON_YES": "Да",
-		"BUTTON_NO": "Нет",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?",
-		"DESC_WANT_DELETE_MESSAGES": "Вы уверены, что хотите удалить сообщение(я)?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Выберите язык"
-	},
-	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Добавить ещё аккаунт?",
-		"BUTTON_ADD_ACCOUNT": "Добавить",
-		"TITLE_UPDATE_ACCOUNT": "Обновить аккаунт?",
-		"BUTTON_UPDATE_ACCOUNT": "Обновить"
-	},
-	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Добавить Профиль?",
-		"TITLE_UPDATE_IDENTITY": "Обновить Профиль?",
-		"BUTTON_ADD_IDENTITY": "Добавить",
-		"BUTTON_UPDATE_IDENTITY": "Обновить",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Вставлять подпись перед отцитированным текстом в ответах"
-	},
-	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Создать папку?",
-		"LABEL_PARENT": "Родительская папка",
-		"BUTTON_CREATE": "Создать",
-		"TITLE_CREATING_PROCESS": "Cоздание папки"
-	},
-	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "Очистить папку от писем?",
-		"DANGER_DESC_WARNING": "Внимание!",
-		"DANGER_DESC_HTML_1": "Данное действие приведет к полному удалению всех писем из папки <strong>%FOLDER%<\/strong>.",
-		"DANGER_DESC_HTML_2": "После начала очистки, процесс <strong style=\"color:red\">нельзя<\/strong> будет остановить или отменить.",
-		"TITLE_CLEARING_PROCESS": "Очистка папки..."
-	},
-	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "Импорт OpenPGP ключа",
-		"POPUP_IMPORT_BUTTON": "Импорт",
-		"POPUP_VIEW_TITLE": "Просмотр OpenPGP ключа",
-		"POPUP_VIEW_BUTTON": "Выбрать",
-		"POPUP_GENERATE_TITLE": "Генерация OpenPGP ключа",
-		"POPUP_GENERATE_BUTTON": "Создать",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Подпись",
-		"LABEL_ENCRYPT": "Шифрование",
-		"BUTTON_DECRYPT": "Расшифровать",
-		"BUTTON_VERIFY": "Verify",
-		"SIGNED_MESSAGE": "OpenPGP подписанное сообщение",
-		"ENCRYPTED_MESSAGE": "OpenPGP шифрованное сообщение",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Подтвержденная сигнатура для %USER%",
-		"ERROR": "OpenPGP ошибка: %ERROR%"
-	},
-	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Создать фильтр?",
-		"TITLE_EDIT_FILTER": "Обновить фильтр?",
-		"LEGEND_CONDITIONS": "Правила",
-		"LEGEND_ACTIONS": "Действия",
-		"BUTTON_ADD_CONDITION": "Добавить правило",
-		"SELECT_ACTION_MOVE_TO": "Переместить в",
-		"SELECT_ACTION_FORWARD_TO": "Переслать на",
-		"SELECT_ACTION_REJECT": "Не принимать",
-		"SELECT_ACTION_VACATION_MESSAGE": "Автоответчик",
-		"SELECT_ACTION_DISCARD": "Уничтожить",
-		"SELECT_FIELD_RECIPIENTS": "Получатели (To или CC)",
-		"SELECT_FIELD_HEADER": "Заголовок",
-		"SELECT_FIELD_BODY": "Body",
-		"SELECT_FIELD_SIZE": "Размер",
-		"SELECT_TYPE_CONTAINS": "Содержит",
-		"SELECT_TYPE_NOT_CONTAINS": "Не содержит",
-		"SELECT_TYPE_MATCHES": "Содержит (поддерживаются * и ?)",
-		"SELECT_TYPE_NOT_MATCHES": "Не содержит (поддерживаются * и ?)",
-		"SELECT_TYPE_REGEXP": "Regexp",
-		"SELECT_TYPE_NOT_REGEXP": "Не Regexp",
-		"SELECT_TYPE_EQUAL_TO": "Совпадает с",
-		"SELECT_TYPE_NOT_EQUAL_TO": "Не совпадает с",
-		"SELECT_TYPE_OVER": "Больше",
-		"SELECT_TYPE_UNDER": "Меньше",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "Подходит под хотя бы одно из нижеперечисленных правил",
-		"SELECT_MATCH_ALL": "Подходит под все нижеперечисленные правила",
-		"MARK_AS_READ_LABEL": "Отметить как прочитанное",
-		"REPLY_INTERVAL_LABEL": "Отвечать каждые (в днях)",
-		"KEEP_LABEL": "Сохранить копию",
-		"STOP_LABEL": "Не преращать обработку правил",
-		"VACATION_SUBJECT_LABEL": "Тема (необязательно)",
-		"VACATION_MESSAGE_LABEL": "Сообщение",
-		"VACATION_RECIPIENTS_LABEL": "Получатели (через запятую)",
-		"REJECT_MESSAGE_LABEL": "Причина (будет послана отправителю)",
-		"ALL_INCOMING_MESSAGES_DESC": "Все входящие сообщения"
-	},
-	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
-	},
-	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Выберите системые папки",
-		"SELECT_CHOOSE_ONE": "Еще не выбрана",
-		"SELECT_UNUSE_NAME": "Не использовать",
-		"NOTIFICATION_SENT": "Вы еще не выбрали системную папку \"Отправленные\", в которую складываются все сообщения после отправки.\nЕсли вы не хотите сохранять отправленные письма, пожалуйста, выберите пункт \"Не использовать\".\n",
-		"NOTIFICATION_DRAFTS": "Вы еще не выбрали системную папку \"Черновики\", в которую складываются все сохраненные сообщения.",
-		"NOTIFICATION_SPAM": "Вы еще не выбрали системную папку \"Спам\", в которую складываются все спамовые сообщения.\nЕсли же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\".\n",
-		"NOTIFICATION_TRASH": "Вы еще не выбрали системную папку \"Удаленные\", в которую складываются все сообщения после удаления.\nЕсли же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\".\n",
-		"NOTIFICATION_ARCHIVE": "Вы еще не выбрали системную папку \"Архив\", в которую складываются все сообщения после архивации."
-	},
-	"TITLES": {
-		"MAILBOX": "Почта",
-		"SETTINGS": "Настройки"
-	},
-	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "Файл не загрузился полностью",
-		"ERROR_NO_FILE_UPLOADED": "Файл не был загружен",
-		"ERROR_MISSING_TEMP_FOLDER": "Ошибка при сохранении файла",
-		"ERROR_ON_SAVING_FILE": "Ошибка при сохранении файла",
-		"ERROR_FILE_TYPE": "Неверный тип файла",
-		"ERROR_UNKNOWN": "Ошибка загрузки файла"
-	},
-	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
-	},
-	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Персональные",
-		"LABEL_GENERAL_NAME": "Основные",
-		"LABEL_CONTACTS_NAME": "Контакты",
-		"LABEL_FOLDERS_NAME": "Папки",
-		"LABEL_ACCOUNTS_NAME": "Аккаунты",
-		"LABEL_FILTERS_NAME": "Фильтры",
-		"LABEL_SECURITY_NAME": "Безопасность",
-		"LABEL_THEMES_NAME": "Темы"
-	},
-	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Фильтры",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
-		"SUBNAME_MOVE_TO": "Переместить в \"%FOLDER%\"",
-		"SUBNAME_FORWARD_TO": "Переслать на \"%EMAIL%\"",
-		"SUBNAME_REJECT": "Не принимать",
-		"SUBNAME_VACATION_MESSAGE": "Сообщение автоответчика",
-		"SUBNAME_DISCARD": "Уничтожить",
-		"LOADING_PROCESS": "Обновление списка фильтров"
-	},
-	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "Безопасность",
-		"LABEL_AUTOLOGOUT": "Автоматический выход",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Никогда",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% минут(ы)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% час(ы)"
-	},
-	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Основные Настройки",
-		"LABEL_LANGUAGE": "Язык",
-		"LABEL_IDENTITY": "Профиль",
-		"LABEL_LAYOUT": "Разметка",
-		"LABEL_LAYOUT_NO_SPLIT": "Одна панель",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
-		"LABEL_EDITOR": "Редактор текста по умолчанию",
-		"LABEL_EDITOR_HTML": "Форматированный",
-		"LABEL_EDITOR_PLAIN": "Простой",
-		"LABEL_EDITOR_HTML_FORCED": "Форматированный (форсированный)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Простой (форсированный)",
-		"LABEL_VIEW_OPTIONS": "Отображение",
-		"LABEL_USE_PREVIEW_PANE": "Использовать трехколоночный режим отображения",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
-		"LABEL_USE_THREADS": "Сворачивать письма в переписках",
-		"LABEL_REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
-		"LABEL_SHOW_IMAGES": "Показывать внешние изображения в теле письма без предупреждения",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Cообщений на одной странице",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Уведомления",
-		"LABEL_SOUND_NOTIFICATION": "Звуковые уведомления",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)"
-	},
-	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
-		"LEGEND_CONTACTS_SYNC": "Синхронизация (CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "Включить синхронизация",
-		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
-		"LABEL_CONTACTS_SYNC_AB_URL": "Адресная книга (URL)",
-		"LABEL_CONTACTS_SYNC_USER": "Пользователь",
-		"SYNC_NO": "Нет",
-		"SYNC_YES": "Да",
-		"SYNC_READ": "Read only"
-	},
-	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "Темы Оформления",
-		"LEGEND_THEMES_CUSTOM": "Настройка Пользовательской Темы",
-		"LABEL_CUSTOM_TYPE": "Тип Темы",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Светлая",
-		"LABEL_CUSTOM_TYPE_DARK": "Темная",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Картинка на фоне",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Загрузить фоновую картинку (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
-		"ERROR_FILE_TYPE_ERROR": "Неверный тип файла (только JPG и PNG)",
-		"ERROR_UNKNOWN": "Ошибка загрузки файла"
-	},
-	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "Список Папок",
-		"BUTTON_CREATE": "Создать Папку",
-		"BUTTON_SYSTEM": "Системые папки",
-		"BUTTON_SUBSCRIBE": "Подписаться",
-		"BUTTON_UNSUBSCRIBE": "Отписаться",
-		"LOADING_PROCESS": "Обновление списка папок",
-		"CREATING_PROCESS": "Cоздание папки",
-		"DELETING_PROCESS": "Удаление папки",
-		"RENAMING_PROCESS": "Переименование папки",
-		"TO_MANY_FOLDERS_DESC_1": "У вас слишком много папок!",
-		"TO_MANY_FOLDERS_DESC_2": "Мы показали только часть из них, чтобы избежать проблем с производительностью.",
-		"HELP_DELETE_FOLDER": "Удалить папку",
-		"HELP_SHOW_HIDE_FOLDER": "Показывать\/прятать папку",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Проверять\/не проверять новые сообщения",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
-	},
-	"SETTINGS_ACCOUNTS": {
-		"LEGEND_ACCOUNTS": "Список Аккаунтов",
-		"LEGEND_IDENTITIES": "Персоны",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Аккаунты и персоны",
-		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт",
-		"BUTTON_ADD_IDENTITY": "Добавить персону",
-		"LOADING_PROCESS": "Обновление списка аккаунтов",
-		"DEFAULT_IDENTITY_LABEL": "основной"
-	},
-	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "Ипортировать ключ",
-		"BUTTON_GENERATE_KEY_PAIR": "Новый ключ",
-		"TITLE_PRIVATE": "Приватный",
-		"TITLE_PUBLIC": "Публичный",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
-	},
-	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "Сочетания клавиш",
-		"TAB_MAILBOX": "Почта",
-		"TAB_MESSAGE_LIST": "Список сообщений",
-		"TAB_MESSAGE_VIEW": "Просмотр сообщения",
-		"TAB_COMPOSE": "Написание письма",
-		"LABEL_OPEN_USER_DROPDOWN": "Открыть выпадающий список пользователя",
-		"LABEL_REPLY": "Ответить",
-		"LABEL_REPLY_ALL": "Ответить всем",
-		"LABEL_FORWARD": "Переслать",
-		"LABEL_FORWARD_MULTIPLY": "Переслать все выбранные сообщения",
-		"LABEL_HELP": "Помощь",
-		"LABEL_CHECK_ALL": "Выбрать все сообщения",
-		"LABEL_DELETE": "Удалить",
-		"LABEL_OPEN_THREAD": "Open selected thread",
-		"LABEL_MOVE": "Переместить",
-		"LABEL_READ": "Пометить выбранные письма прочитанными",
-		"LABEL_UNREAD": "Пометить выбранные письма непрочитанными",
-		"LABEL_IMPORTANT": "Пометить выбранные письма как важные",
-		"LABEL_CANCEL_SEARCH": "Отменить поиск",
-		"LABEL_FULLSCREEN_ENTER": "Полноэкранный режим",
-		"LABEL_VIEW_MESSAGE_ENTER": "Просмотр сообщения",
-		"LABEL_SWITCH_TO_MESSAGE": "Переключить фокус на выбранное сообщение",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключить фокус на список папок",
-		"LABEL_FULLSCREEN_TOGGLE": "Переключить полноэкранный режим",
-		"LABEL_BLOCKQUOTES_TOGGLE": "Переключение видимости цитат в письме",
-		"LABEL_THREAD_NEXT": "Следующее сообщение в цепочке",
-		"LABEL_THREAD_PREV": "Предыдущее сообщение в цепочке",
-		"LABEL_PRINT": "Распечатать",
-		"LABEL_EXIT_FULLSCREEN": "Выйти из полноэкранного режима",
-		"LABEL_CLOSE_MESSAGE": "Закрыть сообщение",
-		"LABEL_SWITCH_TO_LIST": "Переключить фокус на список писем",
-		"LABEL_OPEN_COMPOSE_POPUP": "Написать письмо",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Минимизировать окно",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Выбрать отправителя",
-		"LABEL_SAVE_MESSAGE": "Сохранить сообщение",
-		"LABEL_SEND_MESSAGE": "Отправить сообщение",
-		"LABEL_CLOSE_COMPOSE": "Закрыть сообщение"
-	},
-	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Неверный токен запроса",
-		"AUTH_ERROR": "Не удалось авторизоваться",
-		"CONNECTION_ERROR": "Ошибка соединения с сервером.",
-		"DOMAIN_ALREADY_EXISTS": "Домен уже существует",
-		"DOMAIN_NOT_ALLOWED": "Данный домен не разрешен",
-		"ACCOUNT_NOT_ALLOWED": "Данный аккаунт не разрешен",
-		"CONTACTS_SYNC_ERROR": "Ошибка синхронизации контактов",
-		"CANT_GET_MESSAGE_LIST": "Не могу получить список писем",
-		"CANT_GET_MESSAGE": "Не могу получить письмо",
-		"CANT_DELETE_MESSAGE": "Не могу удалить письмо",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Не могу переместить письмо",
-		"CANT_SAVE_MESSAGE": "Не могу сохранить письмо",
-		"CANT_SEND_MESSAGE": "Не могу отправить письмо",
-		"INVALID_RECIPIENTS": "Проверьте правильность ввода всех адресов.",
-		"CANT_SAVE_FILTERS": "Не могу сохранить фильтры",
-		"CANT_GET_FILTERS": "Не могу загрузить фильтры",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Фильтры неправильны",
-		"CANT_CREATE_FOLDER": "Не могу создать папку",
-		"CANT_RENAME_FOLDER": "Не могу переименовать папку",
-		"CANT_DELETE_FOLDER": "Не могу удалить папку",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Не могу удалить непустую папку",
-		"CANT_SUBSCRIBE_FOLDER": "Не могу подписать папку",
-		"CANT_UNSUBSCRIBE_FOLDER": "Не могу отписать папку",
-		"DEMO_SEND_MESSAGE_ERROR": "Демо аккаунту отправка писем  на внешние почтовые адреса запрещена!",
-		"DEMO_ACCOUNT_ERROR": "По соображениям безопасности данный аккаунт не может выполнить это действие.",
-		"ACCOUNT_ALREADY_EXISTS": "Аккаунт уже добавлен",
-		"ACCOUNT_DOES_NOT_EXIST": "Аккаунт не существует",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Ошибка доступа к почтовому серверу",
-		"INVALID_INPUT_ARGUMENT": "Неверный параметр",
-		"UNKNOWN_ERROR": "Неизвестная ошибка"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json b/snappymail/v/0.0.0/app/localization/ru/admin.json
similarity index 62%
rename from snappymail/v/0.0.0/app/localization/ru-RU/admin.json
rename to snappymail/v/0.0.0/app/localization/ru/admin.json
index af5bcefd5..79507ecf5 100644
--- a/snappymail/v/0.0.0/app/localization/ru-RU/admin.json
+++ b/snappymail/v/0.0.0/app/localization/ru/admin.json
@@ -1,53 +1,59 @@
 {
 	"GLOBAL": {
+		"ADD": "Добавить",
+		"CLOSE": "Закрыть",
 		"SAVE": "Сохранить",
-		"UPDATE": "Обновить"
+		"TEST": "Тест",
+		"UPDATE": "Обновить",
+		"USERNAME": "Имя пользователя",
+		"PASSWORD": "Пароль",
+		"CANCEL": "Отменить",
+		"SEARCH": "Поиск",
+		"YES": "Да",
+		"NO": "Нет"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Логин",
-		"LABEL_PASSWORD": "Пароль",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Войти в админ панель"
 	},
 	"TOP_PANEL": {
-		"LABEL_ADMIN_PANEL": "Админка"
+		"LABEL_ADMIN_PANEL": "Панель управления администратора"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Основные",
-		"LABEL_LOGIN_NAME": "Логин",
-		"LABEL_BRANDING_NAME": "Брендинг",
-		"LABEL_CONTACTS_NAME": "Контакты",
-		"LABEL_DOMAINS_NAME": "Домены",
-		"LABEL_SECURITY_NAME": "Безопасность",
-		"LABEL_PACKAGES_NAME": "Пакеты",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "О Программе"
+		"GENERAL": "Основные",
+		"LOGIN": "Логин",
+		"BRANDING": "Брендинг",
+		"CONTACTS": "Контакты",
+		"DOMAINS": "Домены",
+		"SECURITY": "Безопасность",
+		"PACKAGES": "Плагины",
+		"CONFIG": "Файл конфигурации",
+		"ABOUT": "О Программе"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Интерфейс",
 		"LABEL_LANGUAGE": "Язык",
-		"LABEL_LANGUAGE_ADMIN": "Язык (Админ)",
-		"LABEL_THEME": "Тема",
+		"LABEL_LANGUAGE_ADMIN": "Язык (Панели Администратора)",
+		"LABEL_THEME": "Темы",
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Разрешить выбор языка на экране настроек",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Разрешить выбор темы на экране настроек",
-		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Allow background selection on settings screen",
-		"LABEL_NEW_FOLDER_MOVE": "Новая кнопка \"переместить в папку\"",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Разрешить выбор фона на экране настроек",
 		"LABEL_SHOW_THUMBNAILS": "Показывать миниатюры (для вложений)",
 		"LEGEND_MAIN": "Основное",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Предельный размер вложений",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Разрешить дополнительные аккаунты",
 		"LABEL_ALLOW_IDENTITIES": "Разрешить множественные профили",
-		"ALERT_DATA_ACCESS": "Папка данных RainLoop доступна. Пожалуйста, настройте свой веб-сервер так, чтобы скрыть папку данных с внешнего доступа. Подробнее здесь:",
+		"ALERT_DATA_ACCESS": "Папка данных SnappyMail доступна. Пожалуйста, настройте свой веб-сервер так, чтобы скрыть папку данных с внешнего доступа. Подробнее здесь:",
 		"ALERT_WARNING": "Внимание!",
 		"HTML_ALERT_WEAK_PASSWORD": "Вы используете пароль администратора по умолчанию.\n<br>\nПо соображениям безопасности, пожалуйста,\n<strong><a href=\"#\/security\">измените пароль<\/a><\/strong> прямо сейчас.\n"
 	},
 	"TAB_LOGIN": {
-		"LEGEND_LOGIN_SCREEN": "Cтраница Входа",
+		"LEGEND_LOGIN_SCREEN": "Страница Входа",
 		"LABEL_DEFAULT_DOMAIN": "Основной домен",
 		"LABEL_DETERMINE_USER_DOMAIN": "Пытаться определить домен пользователя",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Разрешить выбор языка на странице входа",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Пытаться определить язык пользователя",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Пытаться определить язык пользователя"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Брендинг",
@@ -64,32 +70,31 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Пользователь",
 		"LABEL_STORAGE_PASSWORD": "Пароль",
-		"BUTTON_TEST": "Тест",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Внимание!",
+		"SUGGESTIONS_LIMIT": "Лимит предложений",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Не используйте этот тип базы данных с большим числом активных пользователей.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ваша система не поддерживает контакты.\n<br>\nВам необходимо установить или включить <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> расширения на вашем сервере.\n"
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "Домены",
 		"BUTTON_ADD_DOMAIN": "Добавить домен",
-		"BUTTON_ADD_ALIAS": "Добавить Алиас",
+		"BUTTON_ADD_ALIAS": "Добавить псевдоним",
 		"DELETE_ARE_YOU_SURE": "Вы уверены?",
 		"HTML_DOMAINS_HELPER": "Список доменов к которым разрешен доступ.\n<br>\nНажмите на имя, чтобы настроить домен.\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Безопасность",
 		"LABEL_USE_IMAGE_PROXY": "Использовать локальный прокси для внешних изображений",
-		"LABEL_ALLOW_OPEN_PGP": "Разрешить OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Показать PHP информацию",
-		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Учетные данные для доступа к панели администратора",
 		"LABEL_CURRENT_PASSWORD": "Текущий пароль",
-		"LABEL_NEW_LOGIN": "Новый логин",
 		"LABEL_NEW_PASSWORD": "Новый пароль",
 		"LABEL_REPEAT_PASSWORD": "Повторить пароль",
-		"BUTTON_UPDATE_PASSWORD": "Обновить пароль",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Требовать проверку SSL сертификата для IMAP и SMTP",
-		"LABEL_ALLOW_SELF_SIGNED": "Разрешить cамоподписанные сертификаты"
+		"LABEL_REQUIRE_VERIFICATION": "Требовать проверку SSL сертификата для",
+		"CRYPTO": "Шифрование",
+		"LABEL_ALLOW_SELF_SIGNED": "Разрешить самоподписанные сертификаты"
 	},
 	"TAB_PACKAGES": {
 		"LABEL_ENABLE_PLUGINS": "Включить плагины",
@@ -103,59 +108,50 @@
 		"LABEL_TAG_HINT": "Простой, современный и быстрый веб-клиент электронной почты\n",
 		"LABEL_ALL_RIGHTS_RESERVED": "Все права защищены.",
 		"HINT_READ_CHANGE_LOG": "Пожалуйста, ознакомьтесь с изменениями перед обновлением.\n",
-		"HINT_IS_UP_TO_DATE": "Версия RainLoop актуальна.",
+		"HINT_IS_UP_TO_DATE": "Версия SnappyMail актуальна.",
 		"HTML_NEW_VERSION": "Новая <b>%VERSION%<\/b> версия доступна.",
 		"LABEL_UPDATING": "Обновление",
 		"LABEL_CHECKING": "Проверка",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "Релизы"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
-		"TITLE_ADD_DOMAIN_ALIAS": "Добавить Алиас",
-		"LABEL_ALIAS": "Алиас",
-		"LABEL_DOMAIN": "Домен",
-		"BUTTON_CLOSE": "Закрыть",
-		"BUTTON_ADD": "Добавить"
+		"TITLE_ADD_DOMAIN_ALIAS": "Добавить псевдоним",
+		"LABEL_ALIAS": "Псевдоним",
+		"LABEL_DOMAIN": "Домен"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Добавить домен",
 		"TITLE_ADD_DOMAIN_WITH_NAME": "Добавить домен \"%NAME%\"",
 		"TITLE_EDIT_DOMAIN": "Редактировать домен \"%NAME%\"",
 		"LABEL_NAME": "Имя",
-		"NAME_HELPER": "wildcard supported",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
+		"NAME_HELPER": "шаблоны поддерживаются",
 		"LABEL_SERVER": "Сервер",
 		"LABEL_PORT": "Порт",
 		"LABEL_SECURE": "Безопасность",
-		"LABEL_WHITE_LIST": "Белый список",
+		"TIMEOUT": "Тайм-аут",
+		"DISABLE_CAPABILITIES": "Отключить функции",
+		"LIMITS": "Лимиты",
+		"FOLDERS": "Папки",
+		"MESSAGES": "Сообщения",
 		"SECURE_OPTION_NONE": "Нет",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
-		"LABEL_ALLOW_SIEVE_SCRIPTS": "Разрешить sieve скрипты",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Разрешить Sieve сценарии",
 		"LABEL_USE_SHORT_LOGIN": "Использовать короткий логин",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Использовать аутентификацию",
-		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_SET_SENDER": "Использовать логин в качестве отправителя",
+		"LABEL_AUTH_PLAIN_LINE": "Принудительный вход командой AUTH PLAIN",
 		"LABEL_USE_PHP_MAIL": "Использовать mail() функцию",
-		"BUTTON_TEST": "Тест",
 		"BUTTON_WHITE_LIST": "Белый список",
-		"BUTTON_SIEVE_CONFIGURATION": "настройки Sieve",
-		"BUTTON_BACK_TO_IMAP": "Назад к IMAP настройкам",
-		"BUTTON_BACK": "Назад",
-		"BUTTON_CLOSE": "Закрыть",
-		"BUTTON_ADD": "Добавить",
-		"BUTTON_UPDATE": "Обновить",
-		"NEW_DOMAIN_DESC": "Эта конфигурация позволит вам работать <br>с <i>%NAME%<\/i> адресами.",
-		"WHITE_LIST_ALERT": "Список пользователей домена к которым разрешен доступ.\nИспользуйте пробел в качестве разделителя.\n"
+		"NEW_DOMAIN_DESC": "Эта конфигурация позволит вам работать с <strong>%NAME%<\/strong> адресами.",
+		"WHITE_LIST_ALERT": "Список пользователей домена к которым разрешен доступ.\nИспользуйте пробел в качестве разделителя.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Плагин",
-		"DESC_NOTHING_TO_CONFIGURE": "Без настроек",
-		"BUTTON_CLOSE": "Закрыть"
+		"DESC_NOTHING_TO_CONFIGURE": "Без настроек"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "unstable",
 		"WARNING": "Внимание!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Неизвестная ошибка"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Неверный токен запроса",
-		"AUTH_ERROR": "Не удалось авторизоваться",
-		"DOMAIN_ALREADY_EXISTS": "Домен уже существует",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Не могу сохранить настройки",
-		"CANT_INSTALL_PACKAGE": "Ошибка установки пакета",
-		"CANT_DELETE_PACKAGE": "Ошибка удаления пакета",
-		"INVALID_PLUGIN_PACKAGE": "Ошибка пакета плагина",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Для работы плагина необходима полная поддержка сервера",
-		"UNKNOWN_ERROR": "Неизвестная ошибка"
+		"RequestError": "Запрос не выполнен",
+		"RequestAborted": "Запрос прерван",
+		"RequestTimeout": "Истекло время запроса",
+		"InvalidToken": "Неверный токен запроса",
+		"AuthError": "Не удалось авторизоваться",
+		"DomainAlreadyExists": "Домен уже существует",
+		"CantSavePluginSettings": "Не могу сохранить настройки",
+		"CantInstallPackage": "Ошибка установки плагина",
+		"CantDeletePackage": "Ошибка удаления плагина",
+		"InvalidPluginPackage": "Ошибка пакета плагина",
+		"UnsupportedPluginPackage": "Для работы плагина необходима полная поддержка сервера",
+		"UnknownError": "Неизвестная ошибка"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/ru/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ru-RU/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/ru/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/ru-RU/static.json b/snappymail/v/0.0.0/app/localization/ru/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/ru-RU/static.json
rename to snappymail/v/0.0.0/app/localization/ru/static.json
diff --git a/snappymail/v/0.0.0/app/localization/ru/user.json b/snappymail/v/0.0.0/app/localization/ru/user.json
new file mode 100644
index 000000000..48d9ea398
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/ru/user.json
@@ -0,0 +1,651 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "В архив",
+		"ARE_YOU_SURE": "Вы уверены?",
+		"BACK": "Назад",
+		"BCC": "Скрытая",
+		"CANCEL": "Отменить",
+		"CC": "Копия",
+		"CLEAR": "Очистить",
+		"CLOSE": "Закрыть (Esc)",
+		"CONTACTS": "Контакты",
+		"DELETE": "Удалить",
+		"UNDELETE": "Восстановить",
+		"DONE": "Завершить",
+		"EMAIL": "Почта",
+		"FROM": "От",
+		"LOADING": "Загрузка...",
+		"LOGOUT": "Выйти",
+		"MORE": "Еще",
+		"MOVE_TO": "Переместить в",
+		"COPY_TO": "Скопировать в",
+		"NAME": "Имя",
+		"NONE": "Ничего",
+		"TO_SPAM": "Переместить сообщение(-я) в Спам",
+		"NOT_SPAM": "Не спам",
+		"USERNAME": "Имя пользователя",
+		"PASSWORD": "Пароль",
+		"REMEMBER": "Запомнить",
+		"REMEMBER_FOR_SESSION": "Запомнить Временное",
+		"REMEMBER_PERMANENT": "Запомнить Навсегда",
+		"REPLY_TO": "Ответить-на",
+		"SAVE": "Сохранить",
+		"SAVE_CHANGES": "Сохранить изменения?",
+		"SEARCH": "Поиск",
+		"SPAM": "Спам",
+		"SUBJECT": "Тема",
+		"TEST": "Тест",
+		"TO": "Кому",
+		"SERVER_MESSAGE": "Сообщение сервера",
+		"YES": "Да",
+		"NO": "Нет",
+		"INACTIVE": "Неактивно",
+		"DEFAULT": "По умолчанию",
+		"HELP": "Помощь",
+		"TEXT": "Текст",
+		"ATTACHMENTS": "Файлы"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Логин",
+		"LABEL_SIGN_ME": "Запомнить меня",
+		"BUTTON_SIGN_IN": "Войти"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Расширенный поиск писем",
+		"TEXT": "Текст",
+		"HAS_ATTACHMENT": "С файлами",
+		"FLAGGED": "Помеченные",
+		"UNSEEN": "Непрочитанные",
+		"DATE": "Дата",
+		"DATE_ALL": "За всё время",
+		"BEFORE_3_DAYS": "Старше 3 дней",
+		"BEFORE_7_DAYS": "Старше недели",
+		"BEFORE_MONTH": "Старше месяца",
+		"BEFORE_3_MONTHS": "Старше 3 месяцев",
+		"BEFORE_6_MONTHS": "Старше полугода",
+		"BEFORE_YEAR": "Старше года",
+		"SINCE_3_DAYS": "За три дня",
+		"SINCE_7_DAYS": "За неделю",
+		"SINCE_MONTH": "За месяц",
+		"SINCE_3_MONTHS": "За 3 месяца",
+		"SINCE_6_MONTHS": "За полгода",
+		"SINCE_YEAR": "За год",
+		"SUBFOLDERS": "Подпапки",
+		"SUBFOLDERS_NONE": "Ничего",
+		"SUBFOLDERS_SUBTREE": "Все",
+		"SUBFOLDERS_SUBTREE_ONE": "Один уровень",
+		"REPLIED": "Ответил",
+		"KEYWORD": "Ключевое слово"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Написать",
+		"BUTTON_NEW_MESSAGE": "Новое сообщение",
+		"INBOX_NAME": "Входящие",
+		"SENT_NAME": "Отправленные",
+		"DRAFTS_NAME": "Черновики",
+		"TRASH_NAME": "Корзина",
+		"ARCHIVE_NAME": "Архив"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Обновить Список Писем",
+		"BUTTON_EMPTY_FOLDER": "Очистить всю папку",
+		"BUTTON_MULTY_FORWARD": "Переслать сообщения",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Удалить мимо корзины",
+		"MENU_SET_SEEN": "Отметить как прочитанное",
+		"MENU_SET_ALL_SEEN": "Отметить все как прочитанные",
+		"MENU_UNSET_SEEN": "Отметить как непрочитанное",
+		"MENU_SET_FLAG": "Установить флаг",
+		"MENU_UNSET_FLAG": "Снять флаг",
+		"MENU_SELECT_ALL": "Выбрать все",
+		"MENU_SELECT_INVERT": "Инвертировать",
+		"MENU_SELECT_UNSEEN": "Непрочитанные",
+		"MENU_SELECT_SEEN": "Прочитанные",
+		"MENU_SELECT_FLAGGED": "Помеченные",
+		"MENU_SELECT_UNFLAGGED": "Без пометок",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Скачать все вложения",
+		"EMPTY_LIST": "В папке нет писем.",
+		"EMPTY_SEARCH_LIST": "Письма не найдены.",
+		"SEARCH_RESULT_FOR": "Результат поиска \"%SEARCH%\"",
+		"BACK_TO_MESSAGE_LIST": "Вернуться к списку писем",
+		"PUT_MESSAGE_HERE": "Киньте сообщение сюда, чтобы посмотреть его в списке",
+		"TODAY_AT": "сегодня в %TIME%",
+		"YESTERDAY_AT": "вчера в %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% новых сообщений!",
+		"QUOTA_SIZE": "Использовано <strong>%SIZE% (%PROC%%)<\/strong> из <strong>%LIMIT%<\/strong>",
+		"SORT": "Сортировка",
+		"NO_SORT": "Почтовый сервер не поддерживает сортировку",
+		"SORT_ARRIVAL_ASC": "Получено (по возрастанию)",
+		"SORT_ARRIVAL_DESC": "Получено (по убыванию)",
+		"SORT_DATE_ASC": "Дата по возрастанию",
+		"SORT_DATE_DESC": "Дата по убыванию",
+		"SORT_SIZE_ASC": "Размер по возрастанию",
+		"SORT_SIZE_DESC": "Размер по убыванию",
+		"SORT_SUBJECT_ASC": "Тема А-Я",
+		"SORT_SUBJECT_DESC": "Тема Я-А",
+		"SORT_FROM_ASC": "От А-Я",
+		"SORT_FROM_DESC": "От Я-А"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Редактировать",
+		"BUTTON_UNSUBSCRIBE": "Отписаться",
+		"BUTTON_REPLY": "Ответить на Письмо",
+		"BUTTON_REPLY_ALL": "Ответить Всем",
+		"BUTTON_FORWARD": "Переслать",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Переслать как файл",
+		"BUTTON_EDIT_AS_NEW": "Редактировать как новое",
+		"BUTTON_SHOW_IMAGES": "Показать внешние изображения в письме",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Уведомить отправителя о прочтении этого сообщения.",
+		"BUTTON_IN_NEW_WINDOW": "В отдельном окне",
+		"BUTTON_THREAD_LIST": "Список",
+		"BUTTON_THREAD_PREV": "Предыдущее",
+		"BUTTON_THREAD_NEXT": "Следующее",
+		"BUTTON_THREAD_MORE": "Больше сообщений",
+		"MENU_HEADERS": "Просмотреть заголовки",
+		"MENU_VIEW_ORIGINAL": "Просмотреть оригинал",
+		"HTML_VIEW": "Просмотр сообщения в HTML",
+		"PLAIN_VIEW": "Просмотр простого текстового сообщения",
+		"SWAP_COLORS": "Переключить цвет фона по умолчанию",
+		"MENU_DOWNLOAD_ORIGINAL": "Скачать как .eml файл",
+		"MENU_FILTER_SIMILAR": "Фильтровать похожие",
+		"MENU_PRINT": "Распечатать",
+		"EMPTY_SUBJECT_TEXT": "(Без темы)",
+		"LABEL_DATE": "Дата",
+		"LABEL_FROM_SHORT": "От",
+		"LABEL_TO_SHORT": "Кому",
+		"PRINT_LABEL_ATTACHMENTS": "Файлы",
+		"MESSAGE_VIEW_DESC": "Выберите сообщение для просмотра.",
+		"MESSAGE_VIEW_MOVE_DESC": "Выберите имя папки в левой панели, чтобы переместить сообщение.",
+		"LINK_DOWNLOAD_AS_ZIP": "Сохранить как zip",
+		"SPAM_SCORE": "Оценка спама",
+		"HAS_VIRUS_WARNING": "ВНИМАНИЕ: Обнаружен вирус!",
+		"TAGS": "Метки",
+		"NEW_TAG": "Новая метка",
+		"ENABLE_TRACKING_LINKS": "Включить отслеживание ссылок",
+		"TRACKING_ENABLED": "Теперь клики по ссылкам отслеживаются!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Важное",
+		"$todo": "Сделать",
+		"$label1": "Важное",
+		"$label2": "Работа",
+		"$label3": "Личное",
+		"$label4": "Сделать",
+		"$label5": "Позже"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Уведомление о прочтении письма - %SUBJECT%",
+		"BODY": "Это уведомление о прочтении для сообщения, которое вы отправили в адрес %READ-RECEIPT%.\n\nПримечание: Это уведомление о прочтении означает лишь то, что сообщение было отображено на машине получателя.\nОно не гарантирует того, что получатель прочёл или понял содержимое сообщения.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Поиск..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Контакт",
+		"TAB_LOCATIONS": "Местоположение",
+		"TAB_BUSINESS": "Организация",
+		"LABEL_ORGANIZATION": "Компания",
+		"LABEL_DEPARTMENT": "Отдел",
+		"LABEL_TITLE": "Название",
+		"TAB_CRYPTO": "Шифрование",
+		"ASK": "Спросить",
+		"NEVER": "Никогда",
+		"ALWAYS": "Всегда",
+		"ALWAYS_IF_POSSIBLE": "По возможности",
+		"BUTTON_ADD_CONTACT": "Добавить контакт",
+		"BUTTON_CREATE_CONTACT": "Сохранить",
+		"BUTTON_IMPORT": "Импорт (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Экспорт (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Экспорт (csv)",
+		"ERROR_IMPORT_FILE": "Ошибка импорта (Неправильный формат файла)",
+		"EMPTY_LIST": "Нет контактов",
+		"EMPTY_SEARCH": "Контакты не найдены",
+		"CLEAR_SEARCH": "Очистить поиск",
+		"CONTACT_VIEW_DESC": "Выберите контакт для просмотра.",
+		"LABEL_BIRTHDAY": "День рождения",
+		"DISPLAY_NAME": "Полное имя",
+		"LAST_NAME": "Имя",
+		"FIRST_NAME": "Фамилию",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Ник",
+		"LABEL_READ_ONLY": "Только чтение",
+		"ADD_MENU_LABEL": "Добавить",
+		"ADD_MENU_NICKNAME": "Ник",
+		"ADD_MENU_NOTE": "Примечания",
+		"ADD_MENU_PHONE": "Телефон",
+		"ADD_MENU_URL": "Сайт",
+		"ADD_MENU_ADDRESS": "Адрес",
+		"ADD_MENU_BIRTHDAY": "День рождения",
+		"ADD_MENU_TAGS": "Теги",
+		"BUTTON_SHARE_ALL": "Всем",
+		"BUTTON_SYNC": "Синхронизация (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Показать все поля",
+		"BUTTON_SEND": "Отправить",
+		"BUTTON_MINIMIZE": "Свернуть",
+		"SAVED_TIME": "Сохранено в %TIME%",
+		"SAVED_ERROR_ON_SEND": "Сообщение было отправлено, но не было сохранено",
+		"DISCARD_UNSAVED_DATA": "Удалить несохраненные данные?",
+		"ATTACH_FILES": "Прикрепить файлы",
+		"ATTACH_DROP_FILES_DESC": "Поместите файлы сюда",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% написал",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Пересланное сообщение -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Отправлено",
+		"EMPTY_TO_ERROR_DESC": "Укажите как минимум одного получателя",
+		"NO_ATTACHMENTS_HERE_DESC": "Прикреплённые файлы отсутствуют.",
+		"ATTACHMENTS_ERROR_DESC": "Внимание! Не все прикреплённые файлы были загружены.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Не все прикреплённые файлы были загружены",
+		"ALLOW_SPELLCHECK": "Включить проверку орфографии в браузере",
+		"ALLOW_DRAFT_AUTOSAVE": "Автоматически сохранять черновик",
+		"BUTTON_REQUEST_READ_RECEIPT": "Запрос о прочтении письма",
+		"BUTTON_MARK_AS_IMPORTANT": "Отметить как важное",
+		"BUTTON_REQUEST_DSN": "Запросить уведомление о доставке",
+		"BUTTON_REQUIRE_TLS": "Требовать безопасную доставку",
+		"ERROR_EMPTY_BODY": "Тело письма отсутствует"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Вы уверены, что хотите выйти?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Вы уверены, что хотите закрыть это окно?",
+		"DESC_WANT_DELETE_MESSAGES": "Вы уверены, что хотите удалить сообщение(-я)?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Выберите язык"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Добавить ещё аккаунт",
+		"BUTTON_ADD_ACCOUNT": "Добавить",
+		"TITLE_UPDATE_ACCOUNT": "Обновить аккаунт"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Добавить Профиль",
+		"TITLE_UPDATE_IDENTITY": "Обновить Профиль",
+		"LABEL": "Label",
+		"BUTTON_ADD_IDENTITY": "Добавить",
+		"SIGNATURE": "Signature",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Вставлять подпись перед цитированием текста в ответах"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Создать папку",
+		"LABEL_PARENT": "Родительская папка",
+		"BUTTON_CREATE": "Создать",
+		"TITLE_CREATING_PROCESS": "Создание папки"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Очистить папку от писем?",
+		"DANGER_DESC_WARNING": "Внимание!",
+		"DANGER_DESC_HTML_1": "Данное действие приведет к полному удалению всех писем из папки <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_2": "После начала очистки, процесс <strong style=\"color:red\">нельзя<\/strong> будет остановить или отменить.",
+		"TITLE_CLEARING_PROCESS": "Очистка папки..."
+	},
+	"CRYPTO": {
+		"SIGN": "Подпись",
+		"ENCRYPT": "Шифрование",
+		"DECRYPT": "Расшифровать",
+		"VERIFY": "Проверить",
+		"GOOD_SIGNATURE": "Подтвержденная сигнатура для %USER%",
+		"ERROR": "%TYPE% ошибка: %ERROR%",
+		"CREATE_SELF_SIGNED": "Создать самоподписанный",
+		"VALID_UNTIL": "Действителен до",
+		"PRIVATE_KEY": "Закрытый ключ (PK)",
+		"CHANGE_PASS": "Изменить парольную фразу",
+		"CURRENT_PASS": "Текущая парольная фраза",
+		"NEW_PASS": "Новая парольная фраза",
+		"ASK_CRYPTKEY_PASS": "Ваша парольная фраза была изменена. Введите вашу старую фразу для расшифровки данных"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Импорт OpenPGP ключа",
+		"POPUP_IMPORT_BUTTON": "Импорт",
+		"POPUP_VIEW_TITLE": "Просмотр OpenPGP ключа",
+		"POPUP_VIEW_BUTTON": "Выбрать",
+		"POPUP_GENERATE_TITLE": "Генерация OpenPGP ключа",
+		"POPUP_GENERATE_BUTTON": "Создать",
+		"LABEL_KEY_TYPE": "Тип",
+		"SIGNED_MESSAGE": "OpenPGP подписанное сообщение",
+		"ENCRYPTED_MESSAGE": "OpenPGP шифрованное сообщение",
+		"STORE_IN_GNUPG": "Хранение на сервере в GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Хранение открытого ключа на сервере в GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Хранение закрытого ключа на сервере в GnuPG",
+		"BACKUP_ON_SERVER": "Хранить (с шифрованием) на сервере",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Хранить открытый ключ на сервере",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Хранить закрытый ключ на сервере"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Импорт сертификата S\/MIME",
+		"CERTIFICATE": "Сертификат",
+		"CERTIFICATES": "Сертификаты S\/MIME",
+		"SIGNED_MESSAGE": "S\/MIME подписанное сообщение",
+		"ENCRYPTED_MESSAGE": "S\/MIME шифрованное сообщение",
+		"PRIVATE_KEY_OF": "S\/MIME приватный ключ для %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Создать фильтр",
+		"TITLE_EDIT_FILTER": "Обновить фильтр",
+		"LEGEND_CONDITIONS": "Правила",
+		"LEGEND_ACTIONS": "Действия",
+		"BUTTON_ADD_CONDITION": "Добавить правило",
+		"SELECT_ACTION_MOVE_TO": "Переместить в",
+		"SELECT_ACTION_FORWARD_TO": "Переслать на",
+		"SELECT_ACTION_REJECT": "Не принимать",
+		"SELECT_ACTION_VACATION_MESSAGE": "Автоответчик",
+		"SELECT_ACTION_DISCARD": "Уничтожить",
+		"SELECT_FIELD_RECIPIENTS": "Получатели (To или CC)",
+		"SELECT_FIELD_HEADER": "Заголовок",
+		"SELECT_FIELD_BODY": "Тело",
+		"SELECT_FIELD_SIZE": "Размер",
+		"SELECT_TYPE_CONTAINS": "Содержит",
+		"SELECT_TYPE_NOT_CONTAINS": "Не содержит",
+		"SELECT_TYPE_MATCHES": "Содержит (поддерживаются * и ?)",
+		"SELECT_TYPE_NOT_MATCHES": "Не содержит (поддерживаются * и ?)",
+		"SELECT_TYPE_REGEXP": "Regexp",
+		"SELECT_TYPE_NOT_REGEXP": "Не Regexp",
+		"SELECT_TYPE_EQUAL_TO": "Совпадает с",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Не совпадает с",
+		"SELECT_TYPE_OVER": "Больше",
+		"SELECT_TYPE_UNDER": "Меньше",
+		"SELECT_TYPE_TEXT": "Текст",
+		"SELECT_TYPE_RAW": "Необработанные данные",
+		"SELECT_MATCH_ANY": "Подходит под хотя бы одно из нижеперечисленных правил",
+		"SELECT_MATCH_ALL": "Подходит под все нижеперечисленные правила",
+		"MARK_AS_READ_LABEL": "Отметить как прочитанное",
+		"REPLY_INTERVAL_LABEL": "Отвечать каждые (в днях)",
+		"KEEP_LABEL": "Сохранить копию",
+		"STOP_LABEL": "Остановить дальнейшую обработку правил",
+		"VACATION_SUBJECT_LABEL": "Тема (необязательно)",
+		"VACATION_MESSAGE_LABEL": "Сообщение",
+		"VACATION_RECIPIENTS_LABEL": "Получатели (через запятую)",
+		"REJECT_MESSAGE_LABEL": "Причина (будет послана отправителю)",
+		"ALL_INCOMING_MESSAGES_DESC": "Все входящие сообщения"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Создать сценарий",
+		"TITLE_EDIT": "Редактировать сценарий",
+		"BUTTON_ADD_FILTER": "Добавить фильтр",
+		"BUTTON_RAW_SCRIPT": "Использовать собственный сценарий",
+		"CAPABILITY_LABEL": "Возможности",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Эти изменения необходимо сохранить на сервере."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Выберите системные папки",
+		"SELECT_CHOOSE_ONE": "Еще не выбрана",
+		"SELECT_UNUSE_NAME": "Не использовать",
+		"NOTIFICATION_SENT": "Вы еще не выбрали системную папку \"Отправленные\", в которую складываются все сообщения после отправки.\nЕсли вы не хотите сохранять отправленные письма, пожалуйста, выберите пункт \"Не использовать\".\n",
+		"NOTIFICATION_DRAFTS": "Вы еще не выбрали системную папку \"Черновики\", в которую складываются все сохраненные сообщения.",
+		"NOTIFICATION_SPAM": "Вы еще не выбрали системную папку \"Спам\", в которую складываются все спам-сообщения.\nЕсли же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\".\n",
+		"NOTIFICATION_TRASH": "Вы еще не выбрали системную папку \"Удаленные\", в которую складываются все сообщения после удаления.\nЕсли же вы хотите удалять письма сразу, пожалуйста, выберите пункт \"Не использовать\".\n",
+		"NOTIFICATION_ARCHIVE": "Вы еще не выбрали системную папку \"Архив\", в которую складываются все сообщения после архивации."
+	},
+	"TITLES": {
+		"MAILBOX": "Почта",
+		"SETTINGS": "Настройки"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Файл не загрузился полностью",
+		"ERROR_NO_FILE_UPLOADED": "Файл не был загружен",
+		"ERROR_MISSING_TEMP_FOLDER": "Ошибка при сохранении файла",
+		"ERROR_ON_SAVING_FILE": "Ошибка при сохранении файла",
+		"ERROR_FILE_TYPE": "Неверный тип файла",
+		"ERROR_UNKNOWN": "Ошибка загрузки файла"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Шрифт",
+		"FONTSIZE": "Размер шрифта",
+		"DIR": "Направление текста",
+		"DIR_LTR": "Слева направо",
+		"DIR_RTL": "Справа налево",
+		"DIR_AUTO": "Автоматически",
+		"TEXTCOLOR": "Цвет текста",
+		"BACKGROUNDCOLOR": "Цвет фона",
+		"BOLD": "Жирный",
+		"ITALIC": "Курсив",
+		"UNDERLINE": "Подчеркнутый",
+		"STRIKE": "Зачеркнутый",
+		"SUB": "Подстрочный индекс",
+		"SUP": "Надстрочный индекс",
+		"OL": "Упорядоченный список",
+		"UL": "Неупорядоченный список",
+		"QUOTE": "Блок-цитата",
+		"INDENTDECREASE": "Уменьшить отступ",
+		"INDENTINCREASE": "Увеличить отступ",
+		"LINK": "Ссылка",
+		"IMAGEURL": "URL-адрес изображения",
+		"IMAGEUPLOAD": "Выбрать на устройстве",
+		"UNDO": "Отменить",
+		"REDO": "Повторить",
+		"REMOVESTYLE": "Очистить стиль"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Основные",
+		"CONTACTS": "Контакты",
+		"FOLDERS": "Папки",
+		"ACCOUNTS": "Аккаунты",
+		"FILTERS": "Фильтры",
+		"SECURITY": "Безопасность",
+		"THEMES": "Темы"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Простой",
+		"ADVANCED": "Расширенный",
+		"BUTTON_ADD_SCRIPT": "Добавить Скрипт",
+		"SUBNAME_MOVE_TO": "Переместить в \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Переслать на \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Не принимать",
+		"SUBNAME_VACATION_MESSAGE": "Сообщение автоответчика",
+		"SUBNAME_DISCARD": "Уничтожить"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Безопасность",
+		"LABEL_AUTOLOGOUT": "Автоматический выход",
+		"FORGET_KEY_PASS": "Забыть парольную фразу закрытого ключа",
+		"NEVER": "Никогда",
+		"LABEL_STORED_PASS": "Remembered Passphrase"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Язык",
+		"HOUR_FORMAT": "Формат времени",
+		"IDENTITY": "Профиль",
+		"LAYOUT": "Разметка",
+		"LAYOUT_NO_SPLIT": "Одна панель",
+		"LAYOUT_VERTICAL_SPLIT": "Вертикальные панели",
+		"LAYOUT_HORIZONTAL_SPLIT": "Горизонтальные панели",
+		"SHOW_NEXT_MESSAGE": "Перейти к следующему сообщению после удаления\/перемещения текущего",
+		"EDITOR": "Редактор текста по умолчанию",
+		"EDITOR_HTML": "Форматированный",
+		"EDITOR_PLAIN": "Простой",
+		"VIEW_OPTIONS": "Отображение",
+		"USE_PREVIEW_PANE": "Использовать трёхколоночный режим отображения",
+		"HIDE_DELETED_MESSAGES": "Скрыть сообщения, помеченные для удаления",
+		"USE_CHECKBOXES_IN_LIST": "Показывать чекбоксы в списках",
+		"USE_THREADS": "Сворачивать письма в переписках",
+		"THREAD_ALGORITHM": "Группировка по беседам",
+		"REPLY_SAME_FOLDER": "Помещать ответы в ту же папку, где находится оригинал",
+		"PREFER_HTML": "Предпочитать HTML обычному тексту",
+		"PREFER_HTML_INFO": "Сообщения иногда приходят в обоих форматах. Этот параметр определяет, хотите ли вы, чтобы отображалась HTML-часть или обычный текст.",
+		"REMOVE_COLORS": "Удалить цвет фона и текста из тела сообщения",
+		"ALLOW_STYLES": "Разрешить <style> CSS",
+		"MESSAGE_PER_PAGE": "Сообщений на одной странице",
+		"CHECK_MAIL_INTERVAL": "Интервал проверки почты",
+		"MARK_MESSAGE_READ_AFTER": "Отметить сообщение как прочитанное после",
+		"MSG_DEFAULT_ACTION": "Действие по умолчанию",
+		"SECONDS": "Секунд",
+		"MINUTES": "Минут",
+		"NOTIFICATIONS": "Уведомления",
+		"SOUND_NOTIFICATION": "Звуковые уведомления",
+		"CHROME_NOTIFICATION_DESC": "Показывать уведомления о новых сообщениях в всплывающих подсказках",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Блокировано браузером)",
+		"COLLAPSE_BLOCKQUOTES": "Сворачивать блок с процитированным текстом",
+		"MAX_QUOTE_LEVEL": "Максимальный уровень отображения процитированного текста",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Показывать вложения в списке",
+		"LIST_SIMPLE_ATTACHMENTS": "Простой список вложений",
+		"LIST_MESSAGES_GROUPED": "Группировка списка сообщений (при сортировке по дате или отправителю)",
+		"EXTERNAL_IMAGES": "Внешние изображения",
+		"IMAGES_OPTION_ASK": "Всегда спрашивать",
+		"IMAGES_OPTION_WHITELIST": "Белый список или спрашивать",
+		"IMAGES_OPTION_ALWAYS": "Показать всегда",
+		"IMAGES_WHITELIST": "Форматы из белого списка",
+		"MESSAGE_POPUP_WINDOW": "Всплывающее окно в новом окне вместо вкладки",
+		"MAILTO": "Установить в качестве обработчика ссылок 'mailto:' по умолчанию",
+		"HTML_TO_MD": "Преобразование HTML в Markdown вместо обычного текста"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Автоматически добавлять получателей писем в адресную книгу",
+		"LEGEND_CONTACTS_SYNC": "Синхронизация (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Включить синхронизация",
+		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Адресная книга (URL)",
+		"LABEL_CONTACTS_SYNC_USER": "Пользователь",
+		"SYNC_READ": "Только чтение"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Темы Оформления",
+		"LABEL_BACKGROUND": "Картинка на фоне",
+		"LABEL_FONTS": "Шрифты",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Загрузить фоновую картинку (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Файл слишком большой",
+		"ERROR_FILE_TYPE_ERROR": "Неверный тип файла (только JPG и PNG)",
+		"ERROR_UNKNOWN": "Ошибка загрузки файла"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Список Папок",
+		"BUTTON_CREATE": "Создать Папку",
+		"BUTTON_SYSTEM": "Системные папки",
+		"BUTTON_SUBSCRIBE": "Подписаться",
+		"BUTTON_UNSUBSCRIBE": "Отписаться",
+		"LOADING_PROCESS": "Обновление списка папок",
+		"CREATING_PROCESS": "Создание папки",
+		"DELETING_PROCESS": "Удаление папки",
+		"RENAMING_PROCESS": "Переименование папки",
+		"TO_MANY_FOLDERS_DESC_1": "У вас слишком много папок!",
+		"TO_MANY_FOLDERS_DESC_2": "Мы показали только часть из них, чтобы избежать проблем с производительностью.",
+		"HELP_DELETE_FOLDER": "Удалить папку",
+		"HELP_SHOW_HIDE_FOLDER": "Показывать\/прятать папку",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Проверять новые сообщения",
+		"HIDE_UNSUBSCRIBED": "Скрыть папки, на которые нет подписки",
+		"UNHIDE_KOLAB_FOLDERS": "Показывать папки Kolab",
+		"TYPE_CALENDAR": "Календарь",
+		"TYPE_CONFIGURATION": "Конфигурация",
+		"TYPE_CONTACTS": "Контакты",
+		"TYPE_FILES": "Файлы",
+		"TYPE_JOURNAL": "Журнал",
+		"TYPE_NOTES": "Записки",
+		"TYPE_TASKS": "Задачи"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Список Аккаунтов",
+		"LEGEND_IDENTITIES": "Персоны",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Аккаунты и персоны",
+		"BUTTON_ADD_ACCOUNT": "Добавить ещё аккаунт",
+		"BUTTON_ADD_IDENTITY": "Добавить персону",
+		"LOADING_PROCESS": "Обновление списка аккаунтов",
+		"SHOW_UNREAD": "Количество непрочитанных сообщений"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Импортировать ключ",
+		"BUTTON_GENERATE_KEY_PAIR": "Новый ключ",
+		"IMPORT_FROM_SERVER": "Импортировать с сервера",
+		"TITLE_PRIVATE": "Приватный",
+		"TITLE_PUBLIC": "Публичный",
+		"GET_MAILVELOPE": "Получить дополнение для браузера Mailvelope."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Сочетания клавиш",
+		"TAB_MAILBOX": "Почта",
+		"TAB_MESSAGE_LIST": "Список сообщений",
+		"TAB_MESSAGE_VIEW": "Просмотр сообщения",
+		"TAB_COMPOSE": "Написание письма",
+		"LABEL_OPEN_USER_DROPDOWN": "Открыть выпадающий список пользователя",
+		"LABEL_REPLY": "Ответить",
+		"LABEL_REPLY_ALL": "Ответить всем",
+		"LABEL_FORWARD": "Переслать",
+		"LABEL_FORWARD_MULTIPLY": "Переслать все выбранные сообщения",
+		"LABEL_CHECK_ALL": "Выбрать все сообщения",
+		"LABEL_DELETE": "Удалить",
+		"LABEL_OPEN_THREAD": "Открыть выбранную ветку",
+		"LABEL_MOVE": "Переместить",
+		"LABEL_READ": "Пометить выбранные письма прочитанными",
+		"LABEL_UNREAD": "Пометить выбранные письма непрочитанными",
+		"LABEL_IMPORTANT": "Пометить выбранные письма как важные",
+		"LABEL_CANCEL_SEARCH": "Отменить поиск",
+		"LABEL_FULLSCREEN_ENTER": "Полноэкранный режим",
+		"LABEL_VIEW_MESSAGE_ENTER": "Просмотр сообщения",
+		"LABEL_SWITCH_TO_MESSAGE": "Переключить фокус на выбранное сообщение",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключить фокус на список папок",
+		"LABEL_FULLSCREEN_TOGGLE": "Переключить полноэкранный режим",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Переключение видимости цитат в письме",
+		"LABEL_THREAD_NEXT": "Следующее сообщение в цепочке",
+		"LABEL_THREAD_PREV": "Предыдущее сообщение в цепочке",
+		"LABEL_EXIT_FULLSCREEN": "Выйти из полноэкранного режима",
+		"LABEL_CLOSE_MESSAGE": "Закрыть сообщение",
+		"LABEL_SWITCH_TO_LIST": "Переключить фокус на список писем",
+		"LABEL_OPEN_COMPOSE_POPUP": "Написать письмо",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Минимизировать окно",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Выбрать отправителя",
+		"LABEL_SAVE_MESSAGE": "Сохранить сообщение",
+		"LABEL_SEND_MESSAGE": "Отправить сообщение",
+		"LABEL_CLOSE_COMPOSE": "Закрыть сообщение"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Запрос не выполнен",
+		"RequestAborted": "Запрос прерван",
+		"RequestTimeout": "Истекло время запроса",
+		"InvalidToken": "Неверный токен запроса",
+		"AuthError": "Не удалось авторизоваться",
+		"ConnectionError": "Ошибка соединения с сервером.",
+		"DomainAlreadyExists": "Домен уже существует",
+		"DomainNotAllowed": "Данный домен не разрешен",
+		"AccountNotAllowed": "Данный аккаунт не разрешен",
+		"CryptKeyError": "Ваша парольная фраза была изменена",
+		"ContactsSyncError": "Ошибка синхронизации контактов",
+		"CantGetMessageList": "Не могу получить список писем",
+		"CantGetMessage": "Не могу получить письмо",
+		"CantDeleteMessage": "Не могу удалить письмо",
+		"CantCopyMessage": "Не могу скопировать сообщение",
+		"CantMoveMessage": "Не могу переместить письмо",
+		"CantSaveMessage": "Не могу сохранить письмо",
+		"CantSendMessage": "Не могу отправить письмо",
+		"InvalidRecipients": "Проверьте правильность ввода всех адресов.",
+		"CantSaveFilters": "Не могу сохранить фильтры",
+		"CantGetFilters": "Не могу загрузить фильтры",
+		"CantActivateFiltersScript": "Не могу активировать сценарий фильтров",
+		"CantDeleteFiltersScript": "Не могу удалить сценарий фильтров",
+		"FiltersAreNotCorrect": "Фильтры неправильны",
+		"CantCreateFolder": "Не могу создать папку",
+		"CantRenameFolder": "Не могу переименовать папку",
+		"CantDeleteFolder": "Не могу удалить папку",
+		"CantDeleteNonEmptyFolder": "Не могу удалить непустую папку",
+		"CantSubscribeFolder": "Не могу подписать папку",
+		"CantUnsubscribeFolder": "Не могу отписать папку",
+		"DemoSendMessageError": "Демо аккаунту отправка писем  на внешние почтовые адреса запрещена!",
+		"DemoAccountError": "По соображениям безопасности данный аккаунт не может выполнить это действие.",
+		"AccountAlreadyExists": "Аккаунт уже добавлен",
+		"AccountDoesNotExist": "Аккаунт не существует",
+		"AccountSwitchFailed": "Не удалось переключиться на учетную запись \"%EMAIL%\"",
+		"MailServerError": "Ошибка доступа к почтовому серверу",
+		"InvalidInputArgument": "Неверный параметр",
+		"UnknownError": "Неизвестная ошибка"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json b/snappymail/v/0.0.0/app/localization/sk/admin.json
similarity index 71%
rename from snappymail/v/0.0.0/app/localization/sk-SK/admin.json
rename to snappymail/v/0.0.0/app/localization/sk/admin.json
index 605805b2c..a05ef0891 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sk/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Pridať",
+		"CLOSE": "Zatvoriť",
 		"SAVE": "Uložiť",
-		"UPDATE": "Aktualizovať"
+		"TEST": "Test",
+		"UPDATE": "Aktualizovať",
+		"USERNAME": "Používateľské men",
+		"PASSWORD": "Heslo",
+		"CANCEL": "Zrušiť",
+		"SEARCH": "Nenašli sa žiadne kontakty",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prihlasovanie",
-		"LABEL_PASSWORD": "Heslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prihlásiť sa do admin panelu"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Admin Panel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Všeobecné",
-		"LABEL_LOGIN_NAME": "Používateľské meno",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_DOMAINS_NAME": "Domény",
-		"LABEL_SECURITY_NAME": "Zabezpečenie",
-		"LABEL_PACKAGES_NAME": "Balíčky",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "O programe"
+		"GENERAL": "Všeobecné",
+		"LOGIN": "Používateľské meno",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontakty",
+		"DOMAINS": "Domény",
+		"SECURITY": "Zabezpečenie",
+		"PACKAGES": "Balíčky",
+		"CONFIG": "Config",
+		"ABOUT": "O programe"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Rozhranie",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Povoliť výber jazyka v nastaveniach",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Povoliť výber témy v nastaveniach",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Povoliť výber pozadia v nastaveniach",
-		"LABEL_NEW_FOLDER_MOVE": "New \"move to folder\" button",
 		"LABEL_SHOW_THUMBNAILS": "Zobraziť náhľady (prílohy)",
 		"LEGEND_MAIN": "Všeobecné",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Maximálna veľkosť prílohy",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Predvolená doména",
 		"LABEL_DETERMINE_USER_DOMAIN": "Pokúsiť sa určiť doménu používateľa",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Povoliť výber jazyka na prihlasovacej obrazovke",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Pokúsiť sa určiť používateľov jazyk",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Pokúsiť sa určiť používateľov jazyk"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Vlastné označenie",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Užívateľ",
 		"LABEL_STORAGE_PASSWORD": "Heslo",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Notice!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Nepoužívajte tento typ databázy, ak máte veľký počet aktívnych používateľov.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Your system doesn't support contacts.\n<br>\nYou need to install or enable <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> extension on your server.\n"
 	},
@@ -74,21 +81,19 @@
 		"BUTTON_ADD_DOMAIN": "Pridať doménu",
 		"BUTTON_ADD_ALIAS": "Pridať alias",
 		"DELETE_ARE_YOU_SURE": "Ste si istí?",
-		"HTML_DOMAINS_HELPER": "List of domains webmail is allowed to access.\n<br>\nClick on the name to configure the domain.\n"
+		"HTML_DOMAINS_HELPER": "List of domains that are allowed.\n<br>\nClick on the name to configure the domain.\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Bezpečnosť",
 		"LABEL_USE_IMAGE_PROXY": "Use local proxy for external images",
-		"LABEL_ALLOW_OPEN_PGP": "Povoliť OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Zobraziť informácie o PHP",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Admin Panel Access Credentials",
 		"LABEL_CURRENT_PASSWORD": "Súčasné heslo",
-		"LABEL_NEW_LOGIN": "Nový login",
 		"LABEL_NEW_PASSWORD": "Nové heslo",
 		"LABEL_REPEAT_PASSWORD": "Opakovať",
-		"BUTTON_UPDATE_PASSWORD": "Zmeniť heslo",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Require verification of SSL certificate used",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Allow self signed certificates"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Jednoduchý, moderný a rýchly webmail klient",
 		"LABEL_ALL_RIGHTS_RESERVED": "Všetky práva vyhradené.",
 		"HINT_READ_CHANGE_LOG": "Prosím prečítajte si zoznam zmien pred aktualizáciou.",
-		"HINT_IS_UP_TO_DATE": "RainLoop je aktuálny.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail je aktuálny.",
 		"HTML_NEW_VERSION": "Dostupná nová <b>%VERSION%<\/b> verzia.",
 		"LABEL_UPDATING": "Aktualizujem",
 		"LABEL_CHECKING": "Kontrolujem aktualizácie",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Pridať alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Doména",
-		"BUTTON_CLOSE": "Zatvoriť",
-		"BUTTON_ADD": "Pridať"
+		"LABEL_DOMAIN": "Doména"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Pridať doménu",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Upraviť doménu \"%NAME%\"",
 		"LABEL_NAME": "Meno",
 		"NAME_HELPER": "wildcard supported",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Bezpečné",
-		"LABEL_WHITE_LIST": "Zoznam povolených",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Žiadne",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Povoliť Sieve skripty",
 		"LABEL_USE_SHORT_LOGIN": "Použiť skrátené prihlásenie",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Použiť overenie",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Použiť php mail() funkciu",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Zoznam povolených",
-		"BUTTON_SIEVE_CONFIGURATION": "Nastavenia Sieve",
-		"BUTTON_BACK_TO_IMAP": "Späť do IMAP nastavení",
-		"BUTTON_BACK": "Späť",
-		"BUTTON_CLOSE": "Zatvoriť",
-		"BUTTON_ADD": "Pridať",
-		"BUTTON_UPDATE": "Aktualizovať",
-		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work <br>with <i>%NAME%<\/i> email addresses.",
-		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n"
+		"NEW_DOMAIN_DESC": "This domain configuration will allow you to work with <strong>%NAME%<\/strong> email addresses.",
+		"WHITE_LIST_ALERT": "List of domain users webmail is allowed to access.\nUse a space as delimiter.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Doplnok",
-		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure",
-		"BUTTON_CLOSE": "Zatvoriť"
+		"DESC_NOTHING_TO_CONFIGURE": "Nothing to configure"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Are you sure you want to close this window?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilné",
 		"WARNING": "Upozornenie!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Neznáma chyba"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neplatný token",
-		"AUTH_ERROR": "Overenie zlyhalo",
-		"DOMAIN_ALREADY_EXISTS": "Táto Doména už existuje",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Nastavenia sa nepodarilo uložiť",
-		"CANT_INSTALL_PACKAGE": "Inštalácia balíčka zlyhala",
-		"CANT_DELETE_PACKAGE": "Odstránenie balíčka zlyhalo",
-		"INVALID_PLUGIN_PACKAGE": "Invalid plugin package",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Unsupported plugin package",
-		"UNKNOWN_ERROR": "Neznáma chyba"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neplatný token",
+		"AuthError": "Overenie zlyhalo",
+		"DomainAlreadyExists": "Táto Doména už existuje",
+		"CantSavePluginSettings": "Nastavenia sa nepodarilo uložiť",
+		"CantInstallPackage": "Inštalácia balíčka zlyhala",
+		"CantDeletePackage": "Odstránenie balíčka zlyhalo",
+		"InvalidPluginPackage": "Invalid plugin package",
+		"UnsupportedPluginPackage": "Unsupported plugin package",
+		"UnknownError": "Neznáma chyba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/sk/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sk-SK/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/sk/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/static.json b/snappymail/v/0.0.0/app/localization/sk/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sk-SK/static.json
rename to snappymail/v/0.0.0/app/localization/sk/static.json
diff --git a/snappymail/v/0.0.0/app/localization/sk-SK/user.json b/snappymail/v/0.0.0/app/localization/sk/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/sk-SK/user.json
rename to snappymail/v/0.0.0/app/localization/sk/user.json
index 7957d2a20..2ebe077b3 100644
--- a/snappymail/v/0.0.0/app/localization/sk-SK/user.json
+++ b/snappymail/v/0.0.0/app/localization/sk/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Archivácia",
 		"ARE_YOU_SURE": "Ste si istý?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Zatvoriť (Esc)",
 		"CONTACTS": "Adresár",
 		"DELETE": "Odstrániť",
+		"UNDELETE": "Undelete",
 		"DONE": "Done",
 		"EMAIL": "Email",
 		"FROM": "Odosielateľ",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Odhlásiť",
 		"MORE": "Viac",
 		"MOVE_TO": "Presunúť do",
+		"COPY_TO": "Kopírovať do",
 		"NAME": "Prijaté",
 		"NONE": "Žiadny",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Nie je spam",
+		"USERNAME": "Používateľské men",
 		"PASSWORD": "Heslo",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Adresa pre odpoveď",
 		"SAVE": "Uložiť",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Nenašli sa žiadne kontakty",
 		"SPAM": "Spam",
 		"SUBJECT": "Predmet",
 		"TEST": "Test",
-		"TO": "Príjemca"
+		"TO": "Príjemca",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Áno",
+		"NO": "Nie",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Pomoc",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Prílohy"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Používateľské meno",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Prihlásiť sa"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Pridať účet",
-		"BUTTON_SETTINGS": "Nastavenia",
-		"BUTTON_HELP": "Pomoc"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Verzia pre mobil",
-		"BUTTON_DESKTOP_VERSION": "Verzia pre desktop"
+		"BUTTON_ADD_ACCOUNT": "Pridať účet"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Rozšírené hľadanie",
-		"LABEL_ADV_TEXT": "Text",
-		"LABEL_ADV_HAS_ATTACHMENT": "S prílohou",
-		"LABEL_ADV_HAS_ATTACHMENTS": "S prílohami",
-		"LABEL_ADV_FLAGGED": "Označené hviezdičkou",
-		"LABEL_ADV_UNSEEN": "Neprečítané",
-		"LABEL_ADV_DATE": "Dátum",
-		"LABEL_ADV_DATE_ALL": "Kedykoľvek",
-		"LABEL_ADV_DATE_3_DAYS": "Nie staršie ako 3 dni",
-		"LABEL_ADV_DATE_7_DAYS": "Nie staršie ako týždeň",
-		"LABEL_ADV_DATE_MONTH": "Nie staršie ako mesiac",
-		"LABEL_ADV_DATE_3_MONTHS": "Nie staršie ako 3 mesiace",
-		"LABEL_ADV_DATE_6_MONTHS": "Nie staršie ako 6 mesiacov",
-		"LABEL_ADV_DATE_YEAR": "Nie staršie ako 1 rok",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Prepnúť na celú obrazovku",
-		"ZOOM": "Zoom",
-		"CLOSE": "Zatvoriť (Esc)",
-		"GALLERY_PREV": "Predchádzajúci (šípka vľavo)",
-		"GALLERY_NEXT": "Nasledujúci (šípka vpravo)",
-		"GALLERY_COUNTER": "%curr% z %total%"
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "S prílohou",
+		"FLAGGED": "Označené hviezdičkou",
+		"UNSEEN": "Neprečítané",
+		"DATE": "Dátum",
+		"DATE_ALL": "Kedykoľvek",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Nie staršie ako 3 dni",
+		"SINCE_7_DAYS": "Nie staršie ako týždeň",
+		"SINCE_MONTH": "Nie staršie ako mesiac",
+		"SINCE_3_MONTHS": "Nie staršie ako 3 mesiace",
+		"SINCE_6_MONTHS": "Nie staršie ako 6 mesiacov",
+		"SINCE_YEAR": "Nie staršie ako 1 rok",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Odpovedané",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Vytvoriť",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Kôš",
 		"ARCHIVE_NAME": "Archív"
 	},
-	"QUOTA": {
-		"TITLE": "Spotreba kvóty"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Znovu načítať zoznam správ",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Prečítané",
 		"MENU_SELECT_FLAGGED": "Označené",
 		"MENU_SELECT_UNFLAGGED": "Neoznačené",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Zoznam je prázdny.",
 		"EMPTY_SEARCH_LIST": "Vášmu vyhľadávaniu nezodpovedajú žiadne správy.",
 		"SEARCH_RESULT_FOR": "Výsledky vyhľadávania pre \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "späť do zoznamu správ",
-		"EMPTY_SUBJECT_TEXT": "(Bez predmetu)",
 		"PUT_MESSAGE_HERE": "Pusťte správu tu pre jej zobrazenie v zozname",
 		"TODAY_AT": "dnes o %TIME%",
 		"YESTERDAY_AT": "včera o %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Máte %COUNT% nových správ!",
 		"QUOTA_SIZE": "Používate <strong>%SIZE% (%PROC%%)<\/strong> z vašich <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Zobraziť zdroj",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Prevziať ako súbor .eml",
 		"MENU_FILTER_SIMILAR": "Filtrovať správy ako táto",
 		"MENU_PRINT": "Tlačiť",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Zvoľte cieľ kliknutím na názov priečinka v ľavom stĺpci.",
 		"LINK_DOWNLOAD_AS_ZIP": "Prevziať ako zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Potvrdenie o doručení (zobrazené) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Hľadám..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Pridať kontakt",
 		"BUTTON_CREATE_CONTACT": "Vytvoriť",
-		"BUTTON_UPDATE_CONTACT": "Aktualizovať",
 		"BUTTON_IMPORT": "Importovať (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exportovať (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Export (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Nenašli sa žiadne kontakty",
 		"CLEAR_SEARCH": "Zrušiť vyhľadávanie",
 		"CONTACT_VIEW_DESC": "Zvoľte kontakt zo zoznamu pre jeho zobrazenie tu.",
-		"LABEL_PHONE": "Telefón",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Dátum narodenia",
-		"LINK_ADD_EMAIL": "Pridať emailovú adresu",
-		"LINK_ADD_PHONE": "Pridať telefón",
-		"LINK_BIRTHDAY": "Dátum narodenia",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Zadajte Zobrazované meno",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Zadajte priezvisko",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Zadajte meno",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Zadajte prezývku",
+		"DISPLAY_NAME": "Zobrazované meno",
+		"LAST_NAME": "Priezvisko",
+		"FIRST_NAME": "Meno",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Prezývku",
 		"LABEL_READ_ONLY": "Len pre čítanie",
-		"LABEL_SHARE": "Zdielať",
 		"ADD_MENU_LABEL": "Pridať",
 		"ADD_MENU_NICKNAME": "Prezývka",
-		"ADD_MENU_NOTES": "Poznámky",
+		"ADD_MENU_NOTE": "Poznámky",
 		"ADD_MENU_PHONE": "Telefón",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adresa",
 		"ADD_MENU_BIRTHDAY": "Dátum narodenia",
 		"ADD_MENU_TAGS": "Značky",
 		"BUTTON_SHARE_ALL": "Všetko",
-		"BUTTON_SYNC": "Synchronizácia (CardDAV)"
+		"BUTTON_SYNC": "Synchronizácia (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "zobraziť všetky polia",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Žiadne prílohy.",
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Nie všetky prílohy boli nahraté.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Nie všetky prílohy boli už nahraté na server.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept.",
 		"BUTTON_REQUEST_READ_RECEIPT": "Vyžiadať potvrdenie o prečítaní",
 		"BUTTON_MARK_AS_IMPORTANT": "Označiť ako dôležité",
-		"BUTTON_REQUEST_DSN": "Vyžiadať potvrdenie o doručení"
+		"BUTTON_REQUEST_DSN": "Vyžiadať potvrdenie o doručení",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Áno",
-		"BUTTON_NO": "Nie",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Ste si istý že chcete zatvoriť toto okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Ste si istý že chcete odstrániť tieto správy?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Zvoľte jazyk"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Pridať účet?",
+		"TITLE_ADD_ACCOUNT": "Pridať účet",
 		"BUTTON_ADD_ACCOUNT": "Pridať",
-		"TITLE_UPDATE_ACCOUNT": "Upraviť účet?",
-		"BUTTON_UPDATE_ACCOUNT": "Upraviť"
+		"TITLE_UPDATE_ACCOUNT": "Upraviť účet"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Pridať identitu?",
-		"TITLE_UPDATE_IDENTITY": "Upraviť identitu?",
+		"TITLE_ADD_IDENTITY": "Pridať identitu",
+		"TITLE_UPDATE_IDENTITY": "Upraviť identitu",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Pridať",
-		"BUTTON_UPDATE_IDENTITY": "Upraviť",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "V odpovediach vložiť tento podpis nad citovaný text"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Vytvoriť priečinok?",
+		"TITLE_CREATE_FOLDER": "Vytvoriť priečinok",
 		"LABEL_PARENT": "Nadradený priečinok",
 		"BUTTON_CREATE": "Vytvoriť",
 		"TITLE_CREATING_PROCESS": "Vytváram priečinok"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Tento proces nie je možné prerušiť.",
 		"TITLE_CLEARING_PROCESS": "Odstraňujem priečinok..."
 	},
+	"CRYPTO": {
+		"SIGN": "Sign",
+		"ENCRYPT": "Encrypt",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Good signature from %USER%",
+		"ERROR": "%TYPE% error: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Importovať kľúč OpenPGP",
 		"POPUP_IMPORT_BUTTON": "Import",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Generate OpenPGP keys",
 		"POPUP_GENERATE_BUTTON": "Generate",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Sign",
-		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Správa podpísaná s OpenPGP",
 		"ENCRYPTED_MESSAGE": "Správa šifrovaná s OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Správa podpísaná s S\/MIME",
+		"ENCRYPTED_MESSAGE": "Správa šifrovaná s S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
+		"TITLE_CREATE_FILTER": "Create a filter",
+		"TITLE_EDIT_FILTER": "Update filter",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Add a Condition",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Označiť ako prečítané",
 		"REPLY_INTERVAL_LABEL": "Interval odpovede (v dňoch)",
 		"KEEP_LABEL": "Ponechať",
-		"STOP_LABEL": "Pokračovať vo vykonávaní pravidiel",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Predmet (voliteľne)",
 		"VACATION_MESSAGE_LABEL": "Správa",
 		"VACATION_RECIPIENTS_LABEL": "Adresáti (oddelení čiarkou)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Nastala neznáma chyba pri nahrávaní"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Osobné",
-		"LABEL_GENERAL_NAME": "Všeobecné",
-		"LABEL_CONTACTS_NAME": "Kontakty",
-		"LABEL_FOLDERS_NAME": "Priečinky",
-		"LABEL_ACCOUNTS_NAME": "Účty",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "Zabezpečenie",
-		"LABEL_THEMES_NAME": "Motívy"
+		"GENERAL": "Všeobecné",
+		"CONTACTS": "Kontakty",
+		"FOLDERS": "Priečinky",
+		"ACCOUNTS": "Účty",
+		"FILTERS": "Filters",
+		"SECURITY": "Zabezpečenie",
+		"THEMES": "Motívy"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtre",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hodín"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Všeobecné",
-		"LABEL_LANGUAGE": "Jazyk",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Predvolený editor správ",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Text",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "Možnosti zobrazenia",
-		"LABEL_USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname",
-		"LABEL_USE_THREADS": "Zobraziť ako konverzácie",
-		"LABEL_REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
-		"LABEL_SHOW_IMAGES": "Vždy zobrazovať obrázky v tele správy",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Správ na stranu",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Jazyk",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Predvolený editor správ",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Text",
+		"VIEW_OPTIONS": "Možnosti zobrazenia",
+		"USE_PREVIEW_PANE": "Používať panel rýchleho zobrazenia",
+		"HIDE_DELETED_MESSAGES": "Skryť správy označené na odstránenie",
+		"USE_CHECKBOXES_IN_LIST": "Zobrazenie zaštkrtávacích políčok v zozname",
+		"USE_THREADS": "Zobraziť ako konverzácie",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Umiestňovať odpovede do priečinka so správou ktorej sa týkajú",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Správ na stranu",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Notifikácie",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Notifikácie",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Zobrazovať upozornenia na nové správy",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zablokované prehliadačom)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Automaticky pridávať príjemcov správ do Adresára",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Addressbook URL",
 		"LABEL_CONTACTS_SYNC_USER": "User",
-		"SYNC_NO": "Nie",
-		"SYNC_YES": "Áno",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Motívy",
-		"LEGEND_THEMES_CUSTOM": "Správa vlastného motívu",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Svetlý",
-		"LABEL_CUSTOM_TYPE_DARK": "Tmavý",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Pozadie",
+		"LABEL_BACKGROUND": "Pozadie",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Nahrať obrázok pozadia (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Súbor je príliš veľký",
 		"ERROR_FILE_TYPE_ERROR": "Nesprávny typ súboru (JPG and PNG only)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Pridať účet",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Aktualizácia zoznamu účtov",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Import Key",
 		"BUTTON_GENERATE_KEY_PAIR": "Generate Keys",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automaticky uložiť koncept.",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Reply All",
 		"LABEL_FORWARD": "Forward",
 		"LABEL_FORWARD_MULTIPLY": "Forward (multiply)",
-		"LABEL_HELP": "Help",
 		"LABEL_CHECK_ALL": "Select all messages",
 		"LABEL_DELETE": "Delete",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Print",
 		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
 		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
 		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Close compose"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neplatný token",
-		"AUTH_ERROR": "Overenie zlyhalo",
-		"CONNECTION_ERROR": "Nepodarilo sa pripojiť k serveru",
-		"DOMAIN_ALREADY_EXISTS": "Táto Doména už existuje",
-		"DOMAIN_NOT_ALLOWED": "Doména nie je povolená",
-		"ACCOUNT_NOT_ALLOWED": "Účet nie je povolený",
-		"CONTACTS_SYNC_ERROR": "Contacts synchronization error",
-		"CANT_GET_MESSAGE_LIST": "Chyba pri vytváraní zoznamu správ.",
-		"CANT_GET_MESSAGE": "Správu sa nepodarilo načítať",
-		"CANT_DELETE_MESSAGE": "Správu sa nepodarilo odstrániť",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Správu sa nepodarilo presunúť",
-		"CANT_SAVE_MESSAGE": "Správu sa nepodarilo uložiť",
-		"CANT_SEND_MESSAGE": "Správu sa nepodarilo odoslať",
-		"INVALID_RECIPIENTS": "Neplatný príjemcovia",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Priečinok sa nepodarilo vytvoriť",
-		"CANT_RENAME_FOLDER": "Priečinok sa nepodarilo premenovať",
-		"CANT_DELETE_FOLDER": "Priečinok sa nepodarilo odstrániť",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Nemôžem odstrániť neprázdny priečinok",
-		"CANT_SUBSCRIBE_FOLDER": "Can't subscribe folder",
-		"CANT_UNSUBSCRIBE_FOLDER": "Can't unsubscribe folder",
-		"DEMO_SEND_MESSAGE_ERROR": "For security purposes, this demo account is not allowed to send messages to external e-mail addresses!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "účet už existuje",
-		"ACCOUNT_DOES_NOT_EXIST": "Účet neexistuje",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Nastala chyba počas prístupu na poštový server",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Neznáma chyba"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neplatný token",
+		"AuthError": "Overenie zlyhalo",
+		"ConnectionError": "Nepodarilo sa pripojiť k serveru",
+		"DomainAlreadyExists": "Táto Doména už existuje",
+		"DomainNotAllowed": "Doména nie je povolená",
+		"AccountNotAllowed": "Účet nie je povolený",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Contacts synchronization error",
+		"CantGetMessageList": "Chyba pri vytváraní zoznamu správ.",
+		"CantGetMessage": "Správu sa nepodarilo načítať",
+		"CantDeleteMessage": "Správu sa nepodarilo odstrániť",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Správu sa nepodarilo presunúť",
+		"CantSaveMessage": "Správu sa nepodarilo uložiť",
+		"CantSendMessage": "Správu sa nepodarilo odoslať",
+		"InvalidRecipients": "Neplatný príjemcovia",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Priečinok sa nepodarilo vytvoriť",
+		"CantRenameFolder": "Priečinok sa nepodarilo premenovať",
+		"CantDeleteFolder": "Priečinok sa nepodarilo odstrániť",
+		"CantDeleteNonEmptyFolder": "Nemôžem odstrániť neprázdny priečinok",
+		"CantSubscribeFolder": "Can't subscribe folder",
+		"CantUnsubscribeFolder": "Can't unsubscribe folder",
+		"DemoSendMessageError": "For security purposes, this demo account is not allowed to send messages to external e-mail addresses!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "účet už existuje",
+		"AccountDoesNotExist": "Účet neexistuje",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Nastala chyba počas prístupu na poštový server",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Neznáma chyba"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json b/snappymail/v/0.0.0/app/localization/sl/admin.json
similarity index 71%
rename from snappymail/v/0.0.0/app/localization/sl-SI/admin.json
rename to snappymail/v/0.0.0/app/localization/sl/admin.json
index 3e75c931e..65a6c2ea3 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sl/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Dodaj",
+		"CLOSE": "Zapri",
 		"SAVE": "Shrani",
-		"UPDATE": "Posodobi"
+		"TEST": "Preizkus",
+		"UPDATE": "Posodobi",
+		"USERNAME": "Uporabniško ime",
+		"PASSWORD": "Geslo",
+		"CANCEL": "Prekliči",
+		"SEARCH": "Ni ujemajočih stikov",
+		"YES": "Yes",
+		"NO": "No"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prijava",
-		"LABEL_PASSWORD": "Geslo",
 		"LABEL_TOTP": "TOTP code",
 		"BUTTON_LOGIN": "Prijava v administracijsko ploščo"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Administracijska plošča"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Splošno",
-		"LABEL_LOGIN_NAME": "Prijava",
-		"LABEL_BRANDING_NAME": "Prilagoditev",
-		"LABEL_CONTACTS_NAME": "Stiki",
-		"LABEL_DOMAINS_NAME": "Domene",
-		"LABEL_SECURITY_NAME": "Varnost",
-		"LABEL_PACKAGES_NAME": "Paketi",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Več o"
+		"GENERAL": "Splošno",
+		"LOGIN": "Prijava",
+		"BRANDING": "Prilagoditev",
+		"CONTACTS": "Stiki",
+		"DOMAINS": "Domene",
+		"SECURITY": "Varnost",
+		"PACKAGES": "Paketi",
+		"CONFIG": "Config",
+		"ABOUT": "Več o"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Vmesnik",
@@ -31,13 +39,12 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Dovoli izbor jezika v nastavitvah",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Dovoli izbor teme v nastavitvah",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Dovoli izbor ozadja v nastavitvah",
-		"LABEL_NEW_FOLDER_MOVE": "Novi gumb \"Premakni v mapo\"",
 		"LABEL_SHOW_THUMBNAILS": "Pokaži predoglede (priloge)",
 		"LEGEND_MAIN": "Glavno",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Omejitev velikosti prilog",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Dovoli dodatne račune",
 		"LABEL_ALLOW_IDENTITIES": "Dovoli več identitet",
-		"ALERT_DATA_ACCESS": "Mapa z RainLoop podatki je prosto ogledljiva. Prosimo, nastavite strežnik, da skrije mapo pred zunanjimi dostopi. Preberite več tukaj:",
+		"ALERT_DATA_ACCESS": "Mapa z SnappyMail podatki je prosto ogledljiva. Prosimo, nastavite strežnik, da skrije mapo pred zunanjimi dostopi. Preberite več tukaj:",
 		"ALERT_WARNING": "Pozor!",
 		"HTML_ALERT_WEAK_PASSWORD": "V uporabi je privzeto geslo administratorja\n<br>\nIz varnostnih razlogov\n<strong><a href=\"#\/security\">spremenite<\/a><\/strong>\ngeslo v nekaj drugega.\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Privzeta domena",
 		"LABEL_DETERMINE_USER_DOMAIN": "Poskusi ugotoviti domeno uporabnika",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Dovoli izbor jezika na prijavnem zaslonu",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Poskusi ugotoviti jezik uporabnika",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Poskusi ugotoviti jezik uporabnika"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Prilagoditev",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Ime podatkovnega vira (DSN)",
 		"LABEL_STORAGE_USER": "Uporabnik",
 		"LABEL_STORAGE_PASSWORD": "Geslo",
-		"BUTTON_TEST": "Preizkus",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Obvestilo!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Ta tip podatkovne baze ni priporočljiv za večje število uporabnikov.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Sistem ne podpira stikov.\n<br>\nNamestite ali omogočite <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> razširitev na strežniku.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Varnost",
 		"LABEL_USE_IMAGE_PROXY": "Uporabni lokalni posredniški strežnik za zunanje slike",
-		"LABEL_ALLOW_OPEN_PGP": "Dovoli OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Prikaz PHP informacij",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Prijavni podatki za administracijsko ploščo",
 		"LABEL_CURRENT_PASSWORD": "Trenutno geslo",
-		"LABEL_NEW_LOGIN": "Novo uporabniško ime",
 		"LABEL_NEW_PASSWORD": "Novo geslo",
 		"LABEL_REPEAT_PASSWORD": "Ponovno",
-		"BUTTON_UPDATE_PASSWORD": "Posodobi geslo",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Obvezno overjanje uporabljenega SSL certifikata (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Obvezno overjanje uporabljenega SSL certifikata",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Dovoli samopodpisane certifikate"
 	},
 	"TAB_PACKAGES": {
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Dodajanje domene",
 		"LABEL_ALIAS": "Vzdevek",
-		"LABEL_DOMAIN": "Domena",
-		"BUTTON_CLOSE": "Zapri",
-		"BUTTON_ADD": "Dodaj"
+		"LABEL_DOMAIN": "Domena"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Dodajanje domene",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Urejanje domene \"%NAME%\"",
 		"LABEL_NAME": "Ime",
 		"NAME_HELPER": "podpora za nadomestne znake",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Strežnik",
 		"LABEL_PORT": "Vrata",
 		"LABEL_SECURE": "Varno",
-		"LABEL_WHITE_LIST": "Bela lista",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Nobeno",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Dovoljene sieve skripte",
 		"LABEL_USE_SHORT_LOGIN": "Uporaba uporabniškega imena brez domene",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Uporaba overjanja",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Uporaba php mail() funkcije",
-		"BUTTON_TEST": "Preizkus",
 		"BUTTON_WHITE_LIST": "Dodaj na belo listo",
-		"BUTTON_SIEVE_CONFIGURATION": "Konfiguriraj Sieve",
-		"BUTTON_BACK_TO_IMAP": "Nazaj na nastavitve IMAP",
-		"BUTTON_BACK": "Nazaj",
-		"BUTTON_CLOSE": "Zapri",
-		"BUTTON_ADD": "Dodaj",
-		"BUTTON_UPDATE": "Posodobi",
-		"NEW_DOMAIN_DESC": "Ta konfiguiracija domene bo omogočala delo <br>z <i>%NAME%<\/i> e-naslovi.",
-		"WHITE_LIST_ALERT": "Seznam uporabnikov domene, do katerih je omogočen dostop.\nUporabnike ločite s presledkom.\n"
+		"NEW_DOMAIN_DESC": "Ta konfiguiracija domene bo omogočala delo z <strong>%NAME%<\/strong> e-naslovi.",
+		"WHITE_LIST_ALERT": "Seznam uporabnikov domene, do katerih je omogočen dostop.\nUporabnike ločite s presledkom.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Vtičnik",
-		"DESC_NOTHING_TO_CONFIGURE": "Ni nastavitev za spreminjati",
-		"BUTTON_CLOSE": "Zapri"
+		"DESC_NOTHING_TO_CONFIGURE": "Ni nastavitev za spreminjati"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Yes",
-		"BUTTON_NO": "No",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Želite zapreti to okno?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "nestabilno",
 		"WARNING": "Pozor!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Neznana napaka"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neveljaven žeton",
-		"AUTH_ERROR": "Spodletelo overjanje",
-		"DOMAIN_ALREADY_EXISTS": "Domena že obstaja",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Ni mogoče shraniti nastavitev",
-		"CANT_INSTALL_PACKAGE": "Neuspešna namestitev paketa",
-		"CANT_DELETE_PACKAGE": "Neuspešno odstranjevanje paketa",
-		"INVALID_PLUGIN_PACKAGE": "Neveljaven paket vtičnika",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Nepodprt paket vtičnika",
-		"UNKNOWN_ERROR": "Neznana napaka"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neveljaven žeton",
+		"AuthError": "Spodletelo overjanje",
+		"DomainAlreadyExists": "Domena že obstaja",
+		"CantSavePluginSettings": "Ni mogoče shraniti nastavitev",
+		"CantInstallPackage": "Neuspešna namestitev paketa",
+		"CantDeletePackage": "Neuspešno odstranjevanje paketa",
+		"InvalidPluginPackage": "Neveljaven paket vtičnika",
+		"UnsupportedPluginPackage": "Nepodprt paket vtičnika",
+		"UnknownError": "Neznana napaka"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/sl/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sl-SI/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/sl/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/static.json b/snappymail/v/0.0.0/app/localization/sl/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sl-SI/static.json
rename to snappymail/v/0.0.0/app/localization/sl/static.json
diff --git a/snappymail/v/0.0.0/app/localization/sl-SI/user.json b/snappymail/v/0.0.0/app/localization/sl/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/sl-SI/user.json
rename to snappymail/v/0.0.0/app/localization/sl/user.json
index befc692bd..75ded310e 100644
--- a/snappymail/v/0.0.0/app/localization/sl-SI/user.json
+++ b/snappymail/v/0.0.0/app/localization/sl/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arhiviranje",
 		"ARE_YOU_SURE": "Ste prepričani?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Zapri (Esc)",
 		"CONTACTS": "Stiki",
 		"DELETE": "Izbriši",
+		"UNDELETE": "Undelete",
 		"DONE": "Končaj",
 		"EMAIL": "E-pošta",
 		"FROM": "Od",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Odjavi",
 		"MORE": "Več",
 		"MOVE_TO": "Premakni v",
+		"COPY_TO": "Kopiraj v",
 		"NAME": "Prejeto",
 		"NONE": "Nobeno",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Ni vsiljena pošta",
+		"USERNAME": "Uporabniško ime",
 		"PASSWORD": "Geslo",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Odgovor na",
 		"SAVE": "Shrani",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Ni ujemajočih stikov",
 		"SPAM": "Vsiljena pošta",
 		"SUBJECT": "Zadeva",
 		"TEST": "Preizkusi",
-		"TO": "Za"
+		"TO": "Za",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Da",
+		"NO": "Ne",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "privzeto",
+		"HELP": "Pomoč",
+		"TEXT": "Besedilo",
+		"ATTACHMENTS": "Priloge"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Prijava",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Prijavi se"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Dodaj račun",
-		"BUTTON_SETTINGS": "Nastavitve",
-		"BUTTON_HELP": "Pomoč"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilna različica",
-		"BUTTON_DESKTOP_VERSION": "Namizna različica"
+		"BUTTON_ADD_ACCOUNT": "Dodaj račun"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Napredno iskanje",
-		"LABEL_ADV_TEXT": "Besedilo",
-		"LABEL_ADV_HAS_ATTACHMENT": "Ima prilogo",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Ima prilogi\/-e",
-		"LABEL_ADV_FLAGGED": "Z zvezdico",
-		"LABEL_ADV_UNSEEN": "Neprebrano",
-		"LABEL_ADV_DATE": "Datum",
-		"LABEL_ADV_DATE_ALL": "Vsa",
-		"LABEL_ADV_DATE_3_DAYS": "Do 3 dni nazaj",
-		"LABEL_ADV_DATE_7_DAYS": "Do 1 tedna nazaj",
-		"LABEL_ADV_DATE_MONTH": "Do 1  meseca nazaj",
-		"LABEL_ADV_DATE_3_MONTHS": "Do 3 mesecev nazaj",
-		"LABEL_ADV_DATE_6_MONTHS": "Do 6 mesecev nazaj",
-		"LABEL_ADV_DATE_YEAR": "Do 1 leta nazaj",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Preklopi celozaslonski pogled",
-		"ZOOM": "Približaj\/oddalji",
-		"CLOSE": "Zapri (Esc)",
-		"GALLERY_PREV": "Nazaj (puščica levo)",
-		"GALLERY_NEXT": "Naprej (puščica desno)",
-		"GALLERY_COUNTER": "%curr% od %total%"
+		"TEXT": "Besedilo",
+		"HAS_ATTACHMENT": "Ima prilogo",
+		"FLAGGED": "Z zvezdico",
+		"UNSEEN": "Neprebrano",
+		"DATE": "Datum",
+		"DATE_ALL": "Vsa",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Do 3 dni nazaj",
+		"SINCE_7_DAYS": "Do 1 tedna nazaj",
+		"SINCE_MONTH": "Do 1  meseca nazaj",
+		"SINCE_3_MONTHS": "Do 3 mesecev nazaj",
+		"SINCE_6_MONTHS": "Do 6 mesecev nazaj",
+		"SINCE_YEAR": "Do 1 leta nazaj",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Odgovoril",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Sestavi",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Smeti",
 		"ARCHIVE_NAME": "Arhiv"
 	},
-	"QUOTA": {
-		"TITLE": "Poraba prostora"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Ponovno naloži seznam sporočil",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Prebrana",
 		"MENU_SELECT_FLAGGED": "Z zvezdico",
 		"MENU_SELECT_UNFLAGGED": "Brez zvezdice",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Prazen seznam.",
 		"EMPTY_SEARCH_LIST": "Brez ujemanj.",
 		"SEARCH_RESULT_FOR": "Ujemanja za \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "nazaj na seznam sporočil",
-		"EMPTY_SUBJECT_TEXT": "(Brez zadeve)",
 		"PUT_MESSAGE_HERE": "Spustite sporočilo tu za ogled na seznamu",
 		"TODAY_AT": "danes ob %TIME%",
 		"YESTERDAY_AT": "včeraj ob %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Imate %COUNT% novih sporočil!",
 		"QUOTA_SIZE": "Uporabljenih <strong>%SIZE% (%PROC%%)<\/strong> od <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Pokaži izvorno",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Prenesi kot .eml datoteko",
 		"MENU_FILTER_SIMILAR": "Filtriraj sporočila, kot je to",
 		"MENU_PRINT": "Natisni",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Za izbor cilja kliknite na ime mape na levi strani.",
 		"LINK_DOWNLOAD_AS_ZIP": "Prenesi kot .zip datoteko",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Povratno poročilo (prikazano) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Iskanje..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Dodaj stik",
 		"BUTTON_CREATE_CONTACT": "Ustvari",
-		"BUTTON_UPDATE_CONTACT": "Posodobi",
 		"BUTTON_IMPORT": "Uvozi (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Izvozi (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Izvozi (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Ni ujemajočih stikov",
 		"CLEAR_SEARCH": "Počisti iskalne kriterije",
 		"CONTACT_VIEW_DESC": "Izberite stik s seznama za ogled.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Splet",
 		"LABEL_BIRTHDAY": "Rojstni dan",
-		"LINK_ADD_EMAIL": "Dodaj e-poštni naslov",
-		"LINK_ADD_PHONE": "Dodaj telefon",
-		"LINK_BIRTHDAY": "Rojstni dan",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Vnos prikaznega imena",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Vnos priimka",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Vnos imena",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Vnos vzdevka",
+		"DISPLAY_NAME": "Prikaznega imena",
+		"LAST_NAME": "Priimka",
+		"FIRST_NAME": "Imena",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Vzdevka",
 		"LABEL_READ_ONLY": "Samo za branje",
-		"LABEL_SHARE": "Deljenje",
 		"ADD_MENU_LABEL": "Dodajanje",
 		"ADD_MENU_NICKNAME": "Vzdevek",
-		"ADD_MENU_NOTES": "Zapiski",
+		"ADD_MENU_NOTE": "Zapiski",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Naslov",
 		"ADD_MENU_BIRTHDAY": "Rojstni dan",
 		"ADD_MENU_TAGS": "Značke",
 		"BUTTON_SHARE_ALL": "Vse",
-		"BUTTON_SYNC": "Sinhronizacija (CardDAV)"
+		"BUTTON_SYNC": "Sinhronizacija (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "prikaz vseh polj",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Ni prilog.",
 		"ATTACHMENTS_ERROR_DESC": "Pozor! Priloge niso bile vse naložene.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Priloge še niso bile naložene v celoti.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek",
 		"BUTTON_REQUEST_READ_RECEIPT": "Zahtevaj potrdilo o branju",
 		"BUTTON_MARK_AS_IMPORTANT": "Označi kot pomembno",
-		"BUTTON_REQUEST_DSN": "Zahtevaj potrdilo o dostavi"
+		"BUTTON_REQUEST_DSN": "Zahtevaj potrdilo o dostavi",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Da",
-		"BUTTON_NO": "Ne",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Želite zapreti to okno?",
 		"DESC_WANT_DELETE_MESSAGES": "Želite izbrisati sporočilo\/-a?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Izberite jezik"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Dodam račun?",
+		"TITLE_ADD_ACCOUNT": "Dodam račun",
 		"BUTTON_ADD_ACCOUNT": "Dodaj",
-		"TITLE_UPDATE_ACCOUNT": "Posodobim račun?",
-		"BUTTON_UPDATE_ACCOUNT": "Posodobi"
+		"TITLE_UPDATE_ACCOUNT": "Posodobim račun"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Dodam identiteto?",
-		"TITLE_UPDATE_IDENTITY": "Posodobim identiteto?",
+		"TITLE_ADD_IDENTITY": "Dodam identiteto",
+		"TITLE_UPDATE_IDENTITY": "Posodobim identiteto",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Dodaj",
-		"BUTTON_UPDATE_IDENTITY": "Posodobi",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Vstavi ta podpis pred citirano besedilo v odgovorih"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Ustvarim mapo?",
+		"TITLE_CREATE_FOLDER": "Ustvarim mapo",
 		"LABEL_PARENT": "Nadrejena mapa",
 		"BUTTON_CREATE": "Ustvari",
 		"TITLE_CREATING_PROCESS": "Ustvarjam mapo"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Tega postopka ne bo mogoče preklicati ali zaustaviti.",
 		"TITLE_CLEARING_PROCESS": "Čistim mapo."
 	},
+	"CRYPTO": {
+		"SIGN": "Podpis",
+		"ENCRYPT": "Šifriranje",
+		"DECRYPT": "Dešifriraj",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Dober podpis od %USER%",
+		"ERROR": "%TYPE% napaka: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Uvoz OpenPGP ključa",
 		"POPUP_IMPORT_BUTTON": "Uvozi",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Generiraj OpenPGP ključe",
 		"POPUP_GENERATE_BUTTON": "Generiraj",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Podpis",
-		"LABEL_ENCRYPT": "Šifriranje",
-		"BUTTON_DECRYPT": "Dešifriraj",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "Sporočilo, podpisano z OpenPGP",
 		"ENCRYPTED_MESSAGE": "Sporočilo, šifrirano z OpenPGP",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Dober podpis od %USER%",
-		"ERROR": "OpenPGP napaka: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Sporočilo, podpisano z S\/MIME",
+		"ENCRYPTED_MESSAGE": "Sporočilo, šifrirano z S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Ustvarim filter?",
-		"TITLE_EDIT_FILTER": "Posodobim filter?",
+		"TITLE_CREATE_FILTER": "Ustvarim filter",
+		"TITLE_EDIT_FILTER": "Posodobim filter",
 		"LEGEND_CONDITIONS": "Pogoji",
 		"LEGEND_ACTIONS": "Dejanja",
 		"BUTTON_ADD_CONDITION": "Dodaj pogoj",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Označi kot prebrano",
 		"REPLY_INTERVAL_LABEL": "Interval odgovorov (dnevi)",
 		"KEEP_LABEL": "Obdrži",
-		"STOP_LABEL": "Ne prenehaj z obdelovanjem pravil",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Zadeva (izbirno)",
 		"VACATION_MESSAGE_LABEL": "Sporočilo",
 		"VACATION_RECIPIENTS_LABEL": "Prejemniki (ločeni z vejico)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Neznana napaka pri nalaganju datoteke"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> Navadno besedilo"
+		"PLAIN": "HTML <-> Navadno besedilo",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Osebno",
-		"LABEL_GENERAL_NAME": "Splošno",
-		"LABEL_CONTACTS_NAME": "Stiki",
-		"LABEL_FOLDERS_NAME": "Mape",
-		"LABEL_ACCOUNTS_NAME": "Računi",
-		"LABEL_FILTERS_NAME": "Filtri",
-		"LABEL_SECURITY_NAME": "Varnost",
-		"LABEL_THEMES_NAME": "Teme"
+		"GENERAL": "Splošno",
+		"CONTACTS": "Stiki",
+		"FOLDERS": "Mape",
+		"ACCOUNTS": "Računi",
+		"FILTERS": "Filtri",
+		"SECURITY": "Varnost",
+		"THEMES": "Teme"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filtri",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Premakni v \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Posreduj na \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Zavrni",
 		"SUBNAME_VACATION_MESSAGE": "Sporočilo odsotnosti",
-		"SUBNAME_DISCARD": "Zavrzi",
-		"LOADING_PROCESS": "Posodabljanje seznama filtrov"
+		"SUBNAME_DISCARD": "Zavrzi"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Varnost",
 		"LABEL_AUTOLOGOUT": "Samodejna odjava",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Nikoli",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minut",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% ur"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Nikoli"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Splošno",
-		"LABEL_LANGUAGE": "Jezik",
-		"LABEL_IDENTITY": "Identiteta",
-		"LABEL_LAYOUT": "Postavitev",
-		"LABEL_LAYOUT_NO_SPLIT": "Brez razdelitve",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
-		"LABEL_EDITOR": "Privzeta vrsta besedila",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Navadno besedilo",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (obvezno)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Navadno besedilo (obvezno)",
-		"LABEL_VIEW_OPTIONS": "Možnosti ogleda",
-		"LABEL_USE_PREVIEW_PANE": "Uporabi polje za predogled",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor",
-		"LABEL_USE_THREADS": "Uporabi niti",
-		"LABEL_REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
-		"LABEL_SHOW_IMAGES": "Vedno prikaži zunanje slike v telesu sporočila",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Sporočil na strani",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Jezik",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identiteta",
+		"LAYOUT": "Postavitev",
+		"LAYOUT_NO_SPLIT": "Brez razdelitve",
+		"LAYOUT_VERTICAL_SPLIT": "Navpično razdeljeno",
+		"LAYOUT_HORIZONTAL_SPLIT": "Vodoravno razdeljeno",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Privzeta vrsta besedila",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Navadno besedilo",
+		"VIEW_OPTIONS": "Možnosti ogleda",
+		"USE_PREVIEW_PANE": "Uporabi polje za predogled",
+		"HIDE_DELETED_MESSAGES": "Skrij sporočila, označena za brisanje",
+		"USE_CHECKBOXES_IN_LIST": "Na seznamu pokaži kvadratke za izbor",
+		"USE_THREADS": "Uporabi niti",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Shrani odgovore v mapo sporočila, na katerega se odgovarja",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Sporočil na strani",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Obvestila",
-		"LABEL_SOUND_NOTIFICATION": "Zvočno obvestilo",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Obvestila",
+		"SOUND_NOTIFICATION": "Zvočno obvestilo",
+		"CHROME_NOTIFICATION_DESC": "Prikaži obvestila ob novih sporočilih",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Zavrnil brskalnik)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Samodejno dodaj prejemnike v imenik",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Strežnik",
 		"LABEL_CONTACTS_SYNC_AB_URL": "URL imenika",
 		"LABEL_CONTACTS_SYNC_USER": "Uporabnik",
-		"SYNC_NO": "Ne",
-		"SYNC_YES": "Da",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teme",
-		"LEGEND_THEMES_CUSTOM": "Prilagojena konfiguracija teme",
-		"LABEL_CUSTOM_TYPE": "Tip",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Svetla",
-		"LABEL_CUSTOM_TYPE_DARK": "Temna",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Ozadje",
+		"LABEL_BACKGROUND": "Ozadje",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Naloži sliko ozadja (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Prevelika datoteka",
 		"ERROR_FILE_TYPE_ERROR": "Neveljaven tip datoteke (samo JPG in PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Prikazanih je le del, da se izognemo tehničnim težavam.",
 		"HELP_DELETE_FOLDER": "Izbriši mapo",
 		"HELP_SHOW_HIDE_FOLDER": "Prikaži\/skrij mapo",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Preverjaj\/ne preverjaj za nova sporočila",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Preverjaj za nova sporočila",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Dodaj račun",
 		"BUTTON_ADD_IDENTITY": "Dodaj identiteto",
 		"LOADING_PROCESS": "Posodabljanje...",
-		"DEFAULT_IDENTITY_LABEL": "privzeto"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Uvozi ključ",
 		"BUTTON_GENERATE_KEY_PAIR": "Generiraj ključe",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Zasebni",
 		"TITLE_PUBLIC": "Javni",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Samodejno shrani osnutek",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Odgovori vsem",
 		"LABEL_FORWARD": "Posreduj",
 		"LABEL_FORWARD_MULTIPLY": "Posreduj kot prilogo\/-e",
-		"LABEL_HELP": "Pomoč",
 		"LABEL_CHECK_ALL": "Izberi vsa sporočila",
 		"LABEL_DELETE": "Izbriši",
 		"LABEL_OPEN_THREAD": "Odpri izbrano nit",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Preklopi bločne citate v sporočilu",
 		"LABEL_THREAD_NEXT": "Naslednje sporočilo v niti",
 		"LABEL_THREAD_PREV": "Prejšnje sporočilo v niti",
-		"LABEL_PRINT": "Natisni",
 		"LABEL_EXIT_FULLSCREEN": "Izhod iz celozaslonskega načina",
 		"LABEL_CLOSE_MESSAGE": "Zapri sporočilo (brez polja za predogled)",
 		"LABEL_SWITCH_TO_LIST": "Osredotoči na seznam sporočil",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Zapri sestavljanje"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Neveljaven žeton",
-		"AUTH_ERROR": "Spodletelo overjanje",
-		"CONNECTION_ERROR": "Ni mogoče vzpostaviti povezave s strežnikom",
-		"DOMAIN_ALREADY_EXISTS": "Domena že obstaja",
-		"DOMAIN_NOT_ALLOWED": "Domena ni dovoljena",
-		"ACCOUNT_NOT_ALLOWED": "Račun ni dovoljen",
-		"CONTACTS_SYNC_ERROR": "Napaka sinhronizacije stikov",
-		"CANT_GET_MESSAGE_LIST": "Ni mogoče pridobiti seznama sporočil",
-		"CANT_GET_MESSAGE": "Ni mogoče pridobiti sporočila",
-		"CANT_DELETE_MESSAGE": "Ni mogoče izbrisati sporočila",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Ni mogoče premakniti sporočila",
-		"CANT_SAVE_MESSAGE": "Ni mogoče shraniti sporočila",
-		"CANT_SEND_MESSAGE": "Ni mogoče poslati sporočila",
-		"INVALID_RECIPIENTS": "Neveljavni prejemniki",
-		"CANT_SAVE_FILTERS": "Ni mogoče shraniti filtrov",
-		"CANT_GET_FILTERS": "Ni mogoče pridobiti filtrov",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filtri so nepravilni",
-		"CANT_CREATE_FOLDER": "Ni mogoče ustvariti mape",
-		"CANT_RENAME_FOLDER": "Ni mogoče preimenovati mape",
-		"CANT_DELETE_FOLDER": "Ni mogoče izbrisati mape",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Ni mogoče izbrisati neprazne mape",
-		"CANT_SUBSCRIBE_FOLDER": "Ni mogoče slediti mapi",
-		"CANT_UNSUBSCRIBE_FOLDER": "Ni mogoče prenehati slediti mapi",
-		"DEMO_SEND_MESSAGE_ERROR": "Iz varnostnih razlogov ta račun ne sme pošiljati pošte na zunanje e-naslove!",
-		"DEMO_ACCOUNT_ERROR": "Iz varnostnih razlogov ta račun ne sme izvršiti tega dejanja!",
-		"ACCOUNT_ALREADY_EXISTS": "Račun že obstaja",
-		"ACCOUNT_DOES_NOT_EXIST": "Račun ne obstaja",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Napaka pri dostopu do poštnega strežnika",
-		"INVALID_INPUT_ARGUMENT": "Neveljaven vhodni argument",
-		"UNKNOWN_ERROR": "Neznana napaka"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Neveljaven žeton",
+		"AuthError": "Spodletelo overjanje",
+		"ConnectionError": "Ni mogoče vzpostaviti povezave s strežnikom",
+		"DomainAlreadyExists": "Domena že obstaja",
+		"DomainNotAllowed": "Domena ni dovoljena",
+		"AccountNotAllowed": "Račun ni dovoljen",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Napaka sinhronizacije stikov",
+		"CantGetMessageList": "Ni mogoče pridobiti seznama sporočil",
+		"CantGetMessage": "Ni mogoče pridobiti sporočila",
+		"CantDeleteMessage": "Ni mogoče izbrisati sporočila",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Ni mogoče premakniti sporočila",
+		"CantSaveMessage": "Ni mogoče shraniti sporočila",
+		"CantSendMessage": "Ni mogoče poslati sporočila",
+		"InvalidRecipients": "Neveljavni prejemniki",
+		"CantSaveFilters": "Ni mogoče shraniti filtrov",
+		"CantGetFilters": "Ni mogoče pridobiti filtrov",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filtri so nepravilni",
+		"CantCreateFolder": "Ni mogoče ustvariti mape",
+		"CantRenameFolder": "Ni mogoče preimenovati mape",
+		"CantDeleteFolder": "Ni mogoče izbrisati mape",
+		"CantDeleteNonEmptyFolder": "Ni mogoče izbrisati neprazne mape",
+		"CantSubscribeFolder": "Ni mogoče slediti mapi",
+		"CantUnsubscribeFolder": "Ni mogoče prenehati slediti mapi",
+		"DemoSendMessageError": "Iz varnostnih razlogov ta račun ne sme pošiljati pošte na zunanje e-naslove!",
+		"DemoAccountError": "Iz varnostnih razlogov ta račun ne sme izvršiti tega dejanja!",
+		"AccountAlreadyExists": "Račun že obstaja",
+		"AccountDoesNotExist": "Račun ne obstaja",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Napaka pri dostopu do poštnega strežnika",
+		"InvalidInputArgument": "Neveljaven vhodni argument",
+		"UnknownError": "Neznana napaka"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json b/snappymail/v/0.0.0/app/localization/sv/admin.json
similarity index 70%
rename from snappymail/v/0.0.0/app/localization/sv-SE/admin.json
rename to snappymail/v/0.0.0/app/localization/sv/admin.json
index ed8bbfea1..3b084df1e 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/admin.json
+++ b/snappymail/v/0.0.0/app/localization/sv/admin.json
@@ -1,11 +1,19 @@
 {
 	"GLOBAL": {
+		"ADD": "Lägg till",
+		"CLOSE": "Stäng",
 		"SAVE": "Spara",
-		"UPDATE": "Uppdatera"
+		"TEST": "Test",
+		"UPDATE": "Uppdatera",
+		"USERNAME": "Användarnamn",
+		"PASSWORD": "Lösenord",
+		"CANCEL": "Avbryt",
+		"SEARCH": "Inga kontakter funna",
+		"YES": "Ja",
+		"NO": "Nej"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Logga in",
-		"LABEL_PASSWORD": "Lösenord",
 		"LABEL_TOTP": "TOTP-kod",
 		"BUTTON_LOGIN": "Logga in till admin-panelen"
 	},
@@ -13,15 +21,15 @@
 		"LABEL_ADMIN_PANEL": "Adminpanel"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "Allmän",
-		"LABEL_LOGIN_NAME": "Logga in",
-		"LABEL_BRANDING_NAME": "Branding",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_DOMAINS_NAME": "Domäner",
-		"LABEL_SECURITY_NAME": "Säkerhet",
-		"LABEL_PACKAGES_NAME": "Tillägg",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "Om"
+		"GENERAL": "Allmän",
+		"LOGIN": "Logga in",
+		"BRANDING": "Branding",
+		"CONTACTS": "Kontakter",
+		"DOMAINS": "Domäner",
+		"SECURITY": "Säkerhet",
+		"PACKAGES": "Tillägg",
+		"CONFIG": "Config",
+		"ABOUT": "Om"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "Gränssnitt",
@@ -31,13 +39,12 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Tillåt språkändringar på konfigurationspanelen ",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Tillåt tema val på konfigurationspanelen",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Tillåt bakgrundsändringar på konfigurationspanelen",
-		"LABEL_NEW_FOLDER_MOVE": "Ny \"Flytta mapp\" knapp",
 		"LABEL_SHOW_THUMBNAILS": "Visa miniatyrer (bilagor)",
 		"LEGEND_MAIN": "Huvud",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "Bilagor storlek",
 		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Tillåt ytterligare konton",
 		"LABEL_ALLOW_IDENTITIES": "Tillåt multiidentiteter",
-		"ALERT_DATA_ACCESS": "RainLoops datamapp är åtkomstbar. Var vänlig konfigurera din webb-server för att förhindra extern åtkomst och synlighet. Läs mer här: ",
+		"ALERT_DATA_ACCESS": "SnappyMails datamapp är åtkomstbar. Var vänlig konfigurera din webb-server för att förhindra extern åtkomst och synlighet. Läs mer här: ",
 		"ALERT_WARNING": "Varning!",
 		"HTML_ALERT_WEAK_PASSWORD": "Du använder standardlösenord.\n<br>\nFör säkerhetsskäl\n<strong><a href=\"#\/security\">ändra<\/a><\/strong>\nlösenord till något annat\n"
 	},
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "Standarddomän",
 		"LABEL_DETERMINE_USER_DOMAIN": "Försök att bestämma användardomän",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Tillåt språkändringar på inloggningsskärmen",
-		"LABEL_DETERMINE_USER_LANGUAGE": "Försök att bestämma användarens språk",
-		"LABEL_HIDE_SUBMIT_BUTTON": "Hide the 'Sign In' button"
+		"LABEL_DETERMINE_USER_LANGUAGE": "Försök att bestämma användarens språk"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Branding",
@@ -64,8 +70,9 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "Användare",
 		"LABEL_STORAGE_PASSWORD": "Lösenord",
-		"BUTTON_TEST": "Test",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
 		"ALERT_NOTICE": "Notis",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Använd inte denna typ av databas med ett stort antal aktiva användare.",
 		"HTML_ALERT_DOES_NOT_SUPPORTED": "Systemet stöder inte kontakter\n<br>\nDu behöver installera eller aktivera <strong>SUB (SQLite\/MySQL\/PostgreSQL)<\/strong> förlängning på server.\n"
 	},
@@ -79,16 +86,14 @@
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "Säkerhet",
 		"LABEL_USE_IMAGE_PROXY": "Använd lokal proxy för externa bilder",
-		"LABEL_ALLOW_OPEN_PGP": "Tillåt OpenPGP",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
 		"LABEL_SHOW_PHP_INFO": "Visa PHP-information",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Administrativsuppgifter",
 		"LABEL_CURRENT_PASSWORD": "Nuvarande lösenord",
-		"LABEL_NEW_LOGIN": "Ny inloggning",
 		"LABEL_NEW_PASSWORD": "Nytt lösenord",
 		"LABEL_REPEAT_PASSWORD": "Upprepa",
-		"BUTTON_UPDATE_PASSWORD": "Uppdatera lösenord",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "Kräver verifiering av SSL-certifikat som används (IMAP\/SMTP)",
+		"LABEL_REQUIRE_VERIFICATION": "Kräver verifiering av SSL-certifikat som används",
+		"CRYPTO": "Crypto",
 		"LABEL_ALLOW_SELF_SIGNED": "Låt självsignerade certifikat"
 	},
 	"TAB_PACKAGES": {
@@ -103,7 +108,7 @@
 		"LABEL_TAG_HINT": "Enkel, modern & snabb e-postklient",
 		"LABEL_ALL_RIGHTS_RESERVED": "Alla rättigheter förbehållna.",
 		"HINT_READ_CHANGE_LOG": "Vänligen läs ändringsloggen innan du uppdaterar.",
-		"HINT_IS_UP_TO_DATE": "RainLoop är aktuell.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail är aktuell.",
 		"HTML_NEW_VERSION": "Ny <b>%VERSION%<\/b> version är tillgänglig",
 		"LABEL_UPDATING": "Uppdaterar",
 		"LABEL_CHECKING": "Letar efter uppdaterar",
@@ -112,9 +117,7 @@
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "Lägg till Alias",
 		"LABEL_ALIAS": "Alias",
-		"LABEL_DOMAIN": "Domän",
-		"BUTTON_CLOSE": "Stäng",
-		"BUTTON_ADD": "Lägg till"
+		"LABEL_DOMAIN": "Domän"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "Lägg till domän",
@@ -122,40 +125,33 @@
 		"TITLE_EDIT_DOMAIN": "Ändra domän \"%NAME%\"",
 		"LABEL_NAME": "Namn",
 		"NAME_HELPER": "jokertecken stöds",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "Server",
 		"LABEL_PORT": "Port",
 		"LABEL_SECURE": "Säkerhet",
-		"LABEL_WHITE_LIST": "Vitlista",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
 		"SECURE_OPTION_NONE": "Ingen",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "StartTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "Tillåta sikt skript",
 		"LABEL_USE_SHORT_LOGIN": "Använda korta inloggning",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
 		"LABEL_USE_AUTH": "Använd autentisering",
 		"LABEL_SET_SENDER": "Use login as sender",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
 		"LABEL_USE_PHP_MAIL": "Använd php mail() funktionen",
-		"BUTTON_TEST": "Test",
 		"BUTTON_WHITE_LIST": "Vitlista",
-		"BUTTON_SIEVE_CONFIGURATION": "sil-konfiguration",
-		"BUTTON_BACK_TO_IMAP": "Tillbaka till IMAP inställningar",
-		"BUTTON_BACK": "Tillbaka",
-		"BUTTON_CLOSE": "Stäng",
-		"BUTTON_ADD": "Lägg till",
-		"BUTTON_UPDATE": "Uppdatera",
-		"NEW_DOMAIN_DESC": "Denna domän konfiguration gör att du kan arbeta <br>med <i>%NAME%<\/ i> e-postadresser.",
-		"WHITE_LIST_ALERT": "Lista över domänanvändare som tillåts.\nAnvända ett utrymme som avgränsare.\n"
+		"NEW_DOMAIN_DESC": "Denna domän konfiguration gör att du kan arbeta med <strong>%NAME%<\/strong> e-postadresser.",
+		"WHITE_LIST_ALERT": "Lista över domänanvändare som tillåts.\nAnvända ett utrymme som avgränsare.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "Tillägget",
-		"DESC_NOTHING_TO_CONFIGURE": "Inget att konfigurera",
-		"BUTTON_CLOSE": "Stäng"
+		"DESC_NOTHING_TO_CONFIGURE": "Inget att konfigurera"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nej",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Är du säker på att du vill stänga sidan?"
 	},
 	"POPUPS_LANGUAGES": {
@@ -163,7 +159,6 @@
 	},
 	"HINTS": {
 		"BETA": "beta",
-		"UNSTABLE": "instabil",
 		"WARNING": "Varning!"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "Okänt fel"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "ogiltiga symboler",
-		"AUTH_ERROR": "Autentisering misslyckades",
-		"DOMAIN_ALREADY_EXISTS": "Domänen finns redan",
-		"CANT_SAVE_PLUGIN_SETTINGS": "Kan inte spara inställningarna",
-		"CANT_INSTALL_PACKAGE": "Det gick inte att installera tillägget",
-		"CANT_DELETE_PACKAGE": "Det gick inte att ta bort tillägget",
-		"INVALID_PLUGIN_PACKAGE": "Ogiltigt tilläggspaket",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "Tillägg som inte stöds",
-		"UNKNOWN_ERROR": "Okänt fel"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "ogiltiga symboler",
+		"AuthError": "Autentisering misslyckades",
+		"DomainAlreadyExists": "Domänen finns redan",
+		"CantSavePluginSettings": "Kan inte spara inställningarna",
+		"CantInstallPackage": "Det gick inte att installera tillägget",
+		"CantDeletePackage": "Det gick inte att ta bort tillägget",
+		"InvalidPluginPackage": "Ogiltigt tilläggspaket",
+		"UnsupportedPluginPackage": "Tillägg som inte stöds",
+		"UnknownError": "Okänt fel"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/sv/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sv-SE/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/sv/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/static.json b/snappymail/v/0.0.0/app/localization/sv/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/sv-SE/static.json
rename to snappymail/v/0.0.0/app/localization/sv/static.json
diff --git a/snappymail/v/0.0.0/app/localization/sv-SE/user.json b/snappymail/v/0.0.0/app/localization/sv/user.json
similarity index 59%
rename from snappymail/v/0.0.0/app/localization/sv-SE/user.json
rename to snappymail/v/0.0.0/app/localization/sv/user.json
index b26b104de..961aa9d14 100644
--- a/snappymail/v/0.0.0/app/localization/sv-SE/user.json
+++ b/snappymail/v/0.0.0/app/localization/sv/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arkiv",
 		"ARE_YOU_SURE": "Är du säker?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Stäng (Esc)",
 		"CONTACTS": "Kontakter",
 		"DELETE": "Ta bort",
+		"UNDELETE": "Undelete",
 		"DONE": "Klar",
 		"EMAIL": "E-post",
 		"FROM": "Från",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Logga ut",
 		"MORE": "Mer",
 		"MOVE_TO": "Flytta till",
+		"COPY_TO": "Kopia till",
 		"NAME": "Inkorg",
 		"NONE": "Ingen",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Inte spam",
+		"USERNAME": "Användarnamn",
 		"PASSWORD": "Lösenord",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Svara till",
 		"SAVE": "Spara",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Inga kontakter funna",
 		"SPAM": "Spam",
 		"SUBJECT": "Ämne",
 		"TEST": "Test",
-		"TO": "Till"
+		"TO": "Till",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Ja",
+		"NO": "Nej",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "standard",
+		"HELP": "Hjälp",
+		"TEXT": "Text",
+		"ATTACHMENTS": "Bilagor"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Användarnamn",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Logga in"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Lägg till konto",
-		"BUTTON_SETTINGS": "Inställningar",
-		"BUTTON_HELP": "Hjälp"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobilversion",
-		"BUTTON_DESKTOP_VERSION": "Datorversion"
+		"BUTTON_ADD_ACCOUNT": "Lägg till konto"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Avancerad sök",
-		"LABEL_ADV_TEXT": "Text",
-		"LABEL_ADV_HAS_ATTACHMENT": "Har bilaga",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Har bilagor",
-		"LABEL_ADV_FLAGGED": "Flaggad",
-		"LABEL_ADV_UNSEEN": "Oläst",
-		"LABEL_ADV_DATE": "Datum",
-		"LABEL_ADV_DATE_ALL": "Alla",
-		"LABEL_ADV_DATE_3_DAYS": "Upp till 3 dagar gammalt",
-		"LABEL_ADV_DATE_7_DAYS": "Upp till 1 vecka gammalt",
-		"LABEL_ADV_DATE_MONTH": "Upp till 1 månad gammalt",
-		"LABEL_ADV_DATE_3_MONTHS": "Upp till 3 månader gammalt",
-		"LABEL_ADV_DATE_6_MONTHS": "Upp till 6 månader gammalt",
-		"LABEL_ADV_DATE_YEAR": "Upp till 1 år gammalt",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Växla fullskärmsläge",
-		"ZOOM": "Zooma in\/ut",
-		"CLOSE": "Stäng (Esc)",
-		"GALLERY_PREV": "Föregående (Vänster pil knapp)",
-		"GALLERY_NEXT": "Nästa (Höger pil knapp)",
-		"GALLERY_COUNTER": "%curr% av %total%"
+		"TEXT": "Text",
+		"HAS_ATTACHMENT": "Har bilaga",
+		"FLAGGED": "Flaggad",
+		"UNSEEN": "Oläst",
+		"DATE": "Datum",
+		"DATE_ALL": "Alla",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Upp till 3 dagar gammalt",
+		"SINCE_7_DAYS": "Upp till 1 vecka gammalt",
+		"SINCE_MONTH": "Upp till 1 månad gammalt",
+		"SINCE_3_MONTHS": "Upp till 3 månader gammalt",
+		"SINCE_6_MONTHS": "Upp till 6 månader gammalt",
+		"SINCE_YEAR": "Upp till 1 år gammalt",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "Svarade",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Skriv nytt",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Papperskorg",
 		"ARCHIVE_NAME": "Arkiv"
 	},
-	"QUOTA": {
-		"TITLE": "Kvotanvändning"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Ladda meddelandelista",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Läst",
 		"MENU_SELECT_FLAGGED": "Flaggad",
 		"MENU_SELECT_UNFLAGGED": "Avflaggad",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Tom lista",
 		"EMPTY_SEARCH_LIST": "Inga meddelanden matchar din sökning.",
 		"SEARCH_RESULT_FOR": "Sök resultat för \"%SEARCH%\"",
 		"BACK_TO_MESSAGE_LIST": "Tillbaka till meddelanden",
-		"EMPTY_SUBJECT_TEXT": "(Inget ämne)",
 		"PUT_MESSAGE_HERE": "Släpp meddelandet för att se det i listan",
 		"TODAY_AT": "idag kl %TIME%",
 		"YESTERDAY_AT": "igår kl %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Du har %COUNT% nya meddelanden!",
 		"QUOTA_SIZE": "Använder <strong>%SIZE% (%PROC%%)<\/strong> av dina <strong>%LIMIT%<\/strong>",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Visa källa",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": "Ladda ner som .eml fil",
 		"MENU_FILTER_SIMILAR": "Filtrera meddelanden som detta",
 		"MENU_PRINT": "Skriv ut",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Klicka på mapp till vänster för att välja mål mapp.",
 		"LINK_DOWNLOAD_AS_ZIP": "Ladda ner som ZIP-fil",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "VARNING: virus upptäckt"
+		"HAS_VIRUS_WARNING": "VARNING: virus upptäckt",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Mottagar kvitto (visad) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Söker..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Lägg till",
 		"BUTTON_CREATE_CONTACT": "Ny",
-		"BUTTON_UPDATE_CONTACT": "Uppdatera",
 		"BUTTON_IMPORT": "Importera (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Exportera (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Exportera (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Inga kontakter funna",
 		"CLEAR_SEARCH": "Nollställ sök",
 		"CONTACT_VIEW_DESC": "Välj kontakt i listan för att visa här.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Födelsedag",
-		"LINK_ADD_EMAIL": "Lägg till epostadress",
-		"LINK_ADD_PHONE": "Lägg till telefonnummer",
-		"LINK_BIRTHDAY": "Födelsedag",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Ange visningsnamn",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Ange efternamn",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Ange förnamn",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Ange smeknamn",
+		"DISPLAY_NAME": "Visningsnamn",
+		"LAST_NAME": "Efternamn",
+		"FIRST_NAME": "Förnamn",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Smeknamn",
 		"LABEL_READ_ONLY": "Endast läs",
-		"LABEL_SHARE": "Dela",
 		"ADD_MENU_LABEL": "Lägg till...",
 		"ADD_MENU_NICKNAME": "Smeknamn",
-		"ADD_MENU_NOTES": "Anteckning",
+		"ADD_MENU_NOTE": "Anteckning",
 		"ADD_MENU_PHONE": "Telefon",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adress",
 		"ADD_MENU_BIRTHDAY": "Födelsedag",
 		"ADD_MENU_TAGS": "Taggar",
 		"BUTTON_SHARE_ALL": "Alla",
-		"BUTTON_SYNC": "Synkronisering (CardDAV)"
+		"BUTTON_SYNC": "Synkronisering (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "visa alla fält",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "Inga filer är ännu valda",
 		"ATTACHMENTS_ERROR_DESC": "Varning! Inte alla bilagor har överförts.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Alla bilagor är inte uppladddade än",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt",
 		"BUTTON_REQUEST_READ_RECEIPT": "Begär mottagningskvitto",
 		"BUTTON_MARK_AS_IMPORTANT": "Markera som viktigt",
-		"BUTTON_REQUEST_DSN": "Begär ett leveranskvitto"
+		"BUTTON_REQUEST_DSN": "Begär ett leveranskvitto",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Ja",
-		"BUTTON_NO": "Nej",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Vill du stänga detta fönster?",
 		"DESC_WANT_DELETE_MESSAGES": "Är du säker att du vill ta bort meddelandet?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Välj språk"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Lägg till konto?",
+		"TITLE_ADD_ACCOUNT": "Lägg till konto",
 		"BUTTON_ADD_ACCOUNT": "Lägg till",
-		"TITLE_UPDATE_ACCOUNT": "Uppdatera konto?",
-		"BUTTON_UPDATE_ACCOUNT": "Uppdatera"
+		"TITLE_UPDATE_ACCOUNT": "Uppdatera konto"
 	},
 	"POPUPS_IDENTITY": {
 		"TITLE_ADD_IDENTITY": "Lägg till identitet",
 		"TITLE_UPDATE_IDENTITY": "Uppdatera identitet",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Lägg till",
-		"BUTTON_UPDATE_IDENTITY": "Uppdatera",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Sätt denna signatur före citerad text i svar"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Skapa mapp?",
+		"TITLE_CREATE_FOLDER": "Skapa mapp",
 		"LABEL_PARENT": "Överliggande mapp",
 		"BUTTON_CREATE": "Skapa",
 		"TITLE_CREATING_PROCESS": "Skapar mapp"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "När detta är startat kan det inte avbrytas.",
 		"TITLE_CLEARING_PROCESS": "Rensar mappen..."
 	},
+	"CRYPTO": {
+		"SIGN": "Signera",
+		"ENCRYPT": "Kryptera",
+		"DECRYPT": "Avkryptera",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Godkänd signatur för %USER%",
+		"ERROR": "%TYPE%-fel: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "Import av OpenPGP-nyckel",
 		"POPUP_IMPORT_BUTTON": "Importera",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "Skapa OpenPGP-nycklar",
 		"POPUP_GENERATE_BUTTON": "Skapa",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Signera",
-		"LABEL_ENCRYPT": "Kryptera",
-		"BUTTON_DECRYPT": "Avkryptera",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP-signerat meddelande",
 		"ENCRYPTED_MESSAGE": "OpenPGP-krypterat meddelande",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Godkänd signatur för %USER%",
-		"ERROR": "OpenPGP-fel: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME-signerat meddelande",
+		"ENCRYPTED_MESSAGE": "S\/MIME-krypterat meddelande",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Skapa ett filter?",
-		"TITLE_EDIT_FILTER": "Uppdatera filter?",
+		"TITLE_CREATE_FILTER": "Skapa ett filter",
+		"TITLE_EDIT_FILTER": "Uppdatera filter",
 		"LEGEND_CONDITIONS": "Villkor",
 		"LEGEND_ACTIONS": "Handlingar",
 		"BUTTON_ADD_CONDITION": "Lägg till ett villkor",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Markera som läst",
 		"REPLY_INTERVAL_LABEL": "Svarsintervall (dagar)",
 		"KEEP_LABEL": "Behåll",
-		"STOP_LABEL": "Sluta inte bearbeta andra regler",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Ämne (valfritt)",
 		"VACATION_MESSAGE_LABEL": "Meddelande",
 		"VACATION_RECIPIENTS_LABEL": "Mottagare (kommaseparerade)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Okänt uppladdingsfel"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> TEXT",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Personligt",
-		"LABEL_GENERAL_NAME": "Allmänt",
-		"LABEL_CONTACTS_NAME": "Kontakter",
-		"LABEL_FOLDERS_NAME": "Mappar",
-		"LABEL_ACCOUNTS_NAME": "Konton",
-		"LABEL_FILTERS_NAME": "Filter",
-		"LABEL_SECURITY_NAME": "Säkerhet",
-		"LABEL_THEMES_NAME": "Teman"
+		"GENERAL": "Allmänt",
+		"CONTACTS": "Kontakter",
+		"FOLDERS": "Mappar",
+		"ACCOUNTS": "Konton",
+		"FILTERS": "Filter",
+		"SECURITY": "Säkerhet",
+		"THEMES": "Teman"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filter",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Flytta till \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Vidarebefordra till \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Avvisa",
 		"SUBNAME_VACATION_MESSAGE": "semestermeddelande",
-		"SUBNAME_DISCARD": "Kassera",
-		"LOADING_PROCESS": "Uppdaterar filter listan"
+		"SUBNAME_DISCARD": "Kassera"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Säkerhet",
 		"LABEL_AUTOLOGOUT": "Automatisk utloggning",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Aldrig",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minut(er)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% timme\/timmar"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Aldrig"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Allmänt",
-		"LABEL_LANGUAGE": "Språk",
-		"LABEL_IDENTITY": "Identitet",
-		"LABEL_LAYOUT": "Stil",
-		"LABEL_LAYOUT_NO_SPLIT": "Utan delad vy",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
-		"LABEL_EDITOR": "Textredigerare",
-		"LABEL_EDITOR_HTML": "HTML",
-		"LABEL_EDITOR_PLAIN": "Oformaterad text",
-		"LABEL_EDITOR_HTML_FORCED": "HTML (tvinga)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Oformaterad text (tvinga)",
-		"LABEL_VIEW_OPTIONS": "Visa alternativ",
-		"LABEL_USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan",
-		"LABEL_USE_THREADS": "Använd trådar",
-		"LABEL_REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
-		"LABEL_SHOW_IMAGES": "Visa alltid bilder i mail",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Meddelanden per sida",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Markera meddelandet som läst efter",
+		"LANGUAGE": "Språk",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identitet",
+		"LAYOUT": "Stil",
+		"LAYOUT_NO_SPLIT": "Utan delad vy",
+		"LAYOUT_VERTICAL_SPLIT": "Vertikalt delad vy",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horisontellt delad vy",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Textredigerare",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "Oformaterad text",
+		"VIEW_OPTIONS": "Visa alternativ",
+		"USE_PREVIEW_PANE": "Avänd förhandsgranskningsfönster",
+		"HIDE_DELETED_MESSAGES": "Dölj meddelanden som är markerade för radering",
+		"USE_CHECKBOXES_IN_LIST": "Visa kryssrutor i listan",
+		"USE_THREADS": "Använd trådar",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Placera svar i samma mapp som mottagna meddelandet",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Meddelanden per sida",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Markera meddelandet som läst efter",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "sekunder",
-		"LABEL_NOTIFICATIONS": "Aviseringar",
-		"LABEL_SOUND_NOTIFICATION": "Ljudnotifikation",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Aviseringar",
+		"SOUND_NOTIFICATION": "Ljudnotifikation",
+		"CHROME_NOTIFICATION_DESC": "Visa nya meddelande-aviseringar som popup-fönster",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Blockat av webbläsaren)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Lägg till mottagare automatiskt i din adressbok",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Server",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adressboks-URL",
 		"LABEL_CONTACTS_SYNC_USER": "Användare",
-		"SYNC_NO": "Nej",
-		"SYNC_YES": "Ja",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Teman",
-		"LEGEND_THEMES_CUSTOM": "Anpassad temakonfiguration",
-		"LABEL_CUSTOM_TYPE": "Typ",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Ljus",
-		"LABEL_CUSTOM_TYPE_DARK": "Mörk",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Bakgrund",
+		"LABEL_BACKGROUND": "Bakgrund",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Ladda upp bakgrundsbild (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Filen är för stor",
 		"ERROR_FILE_TYPE_ERROR": "Ogiltig fil typ (endast JPG och PNG)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "Vi har visat endast en del av dem, för att undvika prestandaproblem.",
 		"HELP_DELETE_FOLDER": "Ta bort mapp",
 		"HELP_SHOW_HIDE_FOLDER": "Visa\/dölj mapp",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrollera\/inte söka efter nya meddelanden",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Kontrollera efter nya meddelanden",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Kalender",
 		"TYPE_CONFIGURATION": "Konfiguration",
 		"TYPE_CONTACTS": "Kontakter",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Lägg till konto",
 		"BUTTON_ADD_IDENTITY": "Lägg till identitet",
 		"LOADING_PROCESS": "Uppdaterar kontolista",
-		"DEFAULT_IDENTITY_LABEL": "standard"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Importera nyckel",
 		"BUTTON_GENERATE_KEY_PAIR": "Skapa nycklar",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Privat",
 		"TITLE_PUBLIC": "Publik",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Spara utkast automatiskt",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Svara alla",
 		"LABEL_FORWARD": "Vidarebefordra",
 		"LABEL_FORWARD_MULTIPLY": "Vidarebefordra som bilaga(or)",
-		"LABEL_HELP": "Hjälp",
 		"LABEL_CHECK_ALL": "Kontrollera alla meddelanden",
 		"LABEL_DELETE": "Ta bort",
 		"LABEL_OPEN_THREAD": "Öppna valda trådar",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Växla meddelandecitat",
 		"LABEL_THREAD_NEXT": "Nästa meddelande i tråden",
 		"LABEL_THREAD_PREV": "Föregående meddelande i tråden",
-		"LABEL_PRINT": "Skriv ut",
 		"LABEL_EXIT_FULLSCREEN": "Avsluta fullskärmsläge",
 		"LABEL_CLOSE_MESSAGE": "Stäng meddelande (ingen förhandsgranskningslayout)",
 		"LABEL_SWITCH_TO_LIST": "Växla fokus tillbaka till meddelandelistan",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Stäng fönster"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Ogiltigt tecken",
-		"AUTH_ERROR": "Autentisering misslyckades",
-		"CONNECTION_ERROR": "Kan inte ansluta till servern",
-		"DOMAIN_ALREADY_EXISTS": "Domänen finns redan",
-		"DOMAIN_NOT_ALLOWED": "Domän är inte tillåtet",
-		"ACCOUNT_NOT_ALLOWED": "Konto är inte tillåtet",
-		"CONTACTS_SYNC_ERROR": "Kontakt-synkroniseringsfel",
-		"CANT_GET_MESSAGE_LIST": "Kan inte hämta meddelandelista",
-		"CANT_GET_MESSAGE": "Kan inte hämta meddelande",
-		"CANT_DELETE_MESSAGE": "Kan inte ta bort meddelande",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Kan inte flytta meddelande",
-		"CANT_SAVE_MESSAGE": "Kan inte spara meddelande",
-		"CANT_SEND_MESSAGE": "Kan inte skicka meddelande",
-		"INVALID_RECIPIENTS": "Ogiltig mottagare",
-		"CANT_SAVE_FILTERS": "Kan inte spara filter",
-		"CANT_GET_FILTERS": "Kan inte ta emot filter",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filter är inte korrekt",
-		"CANT_CREATE_FOLDER": "Kan inte skapa mapp",
-		"CANT_RENAME_FOLDER": "Kan inte byta namn på mapp",
-		"CANT_DELETE_FOLDER": "Kan inte ta bort mapp",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Kan inte ta bort mapp med innehåll",
-		"CANT_SUBSCRIBE_FOLDER": "Kan inte prenumerera på mapp",
-		"CANT_UNSUBSCRIBE_FOLDER": "Kan inte avprenumerera på mapp",
-		"DEMO_SEND_MESSAGE_ERROR": "Av säkerhets skäl kan inte detta demo-konto skicka epost till externa adressater!",
-		"DEMO_ACCOUNT_ERROR": "Av säkerhetsskäl är det här kontot inte tillåtet för denna åtgärd!",
-		"ACCOUNT_ALREADY_EXISTS": "Kontot finns redan",
-		"ACCOUNT_DOES_NOT_EXIST": "Kontot finns inte",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Ett fel har inträffat vid anslutning till epostservern",
-		"INVALID_INPUT_ARGUMENT": "Ogiltigt argument",
-		"UNKNOWN_ERROR": "Okänt fel"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Ogiltigt tecken",
+		"AuthError": "Autentisering misslyckades",
+		"ConnectionError": "Kan inte ansluta till servern",
+		"DomainAlreadyExists": "Domänen finns redan",
+		"DomainNotAllowed": "Domän är inte tillåtet",
+		"AccountNotAllowed": "Konto är inte tillåtet",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kontakt-synkroniseringsfel",
+		"CantGetMessageList": "Kan inte hämta meddelandelista",
+		"CantGetMessage": "Kan inte hämta meddelande",
+		"CantDeleteMessage": "Kan inte ta bort meddelande",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Kan inte flytta meddelande",
+		"CantSaveMessage": "Kan inte spara meddelande",
+		"CantSendMessage": "Kan inte skicka meddelande",
+		"InvalidRecipients": "Ogiltig mottagare",
+		"CantSaveFilters": "Kan inte spara filter",
+		"CantGetFilters": "Kan inte ta emot filter",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filter är inte korrekt",
+		"CantCreateFolder": "Kan inte skapa mapp",
+		"CantRenameFolder": "Kan inte byta namn på mapp",
+		"CantDeleteFolder": "Kan inte ta bort mapp",
+		"CantDeleteNonEmptyFolder": "Kan inte ta bort mapp med innehåll",
+		"CantSubscribeFolder": "Kan inte prenumerera på mapp",
+		"CantUnsubscribeFolder": "Kan inte avprenumerera på mapp",
+		"DemoSendMessageError": "Av säkerhets skäl kan inte detta demo-konto skicka epost till externa adressater!",
+		"DemoAccountError": "Av säkerhetsskäl är det här kontot inte tillåtet för denna åtgärd!",
+		"AccountAlreadyExists": "Kontot finns redan",
+		"AccountDoesNotExist": "Kontot finns inte",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Ett fel har inträffat vid anslutning till epostservern",
+		"InvalidInputArgument": "Ogiltigt argument",
+		"UnknownError": "Okänt fel"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/tr/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/tr-TR/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/tr/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/static.json b/snappymail/v/0.0.0/app/localization/tr/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/tr-TR/static.json
rename to snappymail/v/0.0.0/app/localization/tr/static.json
diff --git a/snappymail/v/0.0.0/app/localization/tr-TR/user.json b/snappymail/v/0.0.0/app/localization/tr/user.json
similarity index 60%
rename from snappymail/v/0.0.0/app/localization/tr-TR/user.json
rename to snappymail/v/0.0.0/app/localization/tr/user.json
index b18310800..b248cc4d1 100644
--- a/snappymail/v/0.0.0/app/localization/tr-TR/user.json
+++ b/snappymail/v/0.0.0/app/localization/tr/user.json
@@ -1,4 +1,5 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "Arşivleme",
 		"ARE_YOU_SURE": "Eminmisiniz?",
@@ -10,6 +11,7 @@
 		"CLOSE": "Kapat (Esc)",
 		"CONTACTS": "Kişi Listesi",
 		"DELETE": "Sil",
+		"UNDELETE": "Undelete",
 		"DONE": "Done",
 		"EMAIL": "E-Posta",
 		"FROM": "Kimden",
@@ -17,17 +19,30 @@
 		"LOGOUT": "Çıkış",
 		"MORE": "devamı",
 		"MOVE_TO": "Taşı",
+		"COPY_TO": "Kopyala",
 		"NAME": "Gelen Kutusu",
 		"NONE": "None",
+		"TO_SPAM": "Move message(s) to Spam",
 		"NOT_SPAM": "Spam Değil",
+		"USERNAME": "Kullanıcı adı",
 		"PASSWORD": "Şifre",
+		"REMEMBER": "Remember",
 		"REPLY_TO": "Reply-To",
 		"SAVE": "Kaydet",
+		"SAVE_CHANGES": "Save changes?",
 		"SEARCH": "Kişi bulunamadı",
 		"SPAM": "Spam",
 		"SUBJECT": "Konu",
 		"TEST": "Test",
-		"TO": "Kime"
+		"TO": "Kime",
+		"SERVER_MESSAGE": "Server message",
+		"YES": "Evet",
+		"NO": "Hayır",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "default",
+		"HELP": "Yardım",
+		"TEXT": "Metin",
+		"ATTACHMENTS": "Ekler"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "Giriş",
@@ -35,41 +50,34 @@
 		"BUTTON_SIGN_IN": "Giriş Yap"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Hesap Ekle",
-		"BUTTON_SETTINGS": "Ayarlar",
-		"BUTTON_HELP": "Yardım"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobil versiyonu",
-		"BUTTON_DESKTOP_VERSION": "Masaüstü versiyonu"
+		"BUTTON_ADD_ACCOUNT": "Hesap Ekle"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "Detaylı Arama",
-		"LABEL_ADV_TEXT": "Metin",
-		"LABEL_ADV_HAS_ATTACHMENT": "Eki",
-		"LABEL_ADV_HAS_ATTACHMENTS": "Ekleri",
-		"LABEL_ADV_FLAGGED": "İşaretli",
-		"LABEL_ADV_UNSEEN": "Görünmeyen",
-		"LABEL_ADV_DATE": "Tarih",
-		"LABEL_ADV_DATE_ALL": "Hepsi",
-		"LABEL_ADV_DATE_3_DAYS": "3 gün önceki",
-		"LABEL_ADV_DATE_7_DAYS": "1 hafta önceki",
-		"LABEL_ADV_DATE_MONTH": "1 ay önceki",
-		"LABEL_ADV_DATE_3_MONTHS": "3 ay önceki",
-		"LABEL_ADV_DATE_6_MONTHS": "6 ay önceki",
-		"LABEL_ADV_DATE_YEAR": "1 yıl önceki",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Yakınlaştır\/Uzaklaştır",
-		"CLOSE": "Kapat (Esc)",
-		"GALLERY_PREV": "Önceki (Sol yön tuşu)",
-		"GALLERY_NEXT": "Sonraki (Sağ yön tuşu)",
-		"GALLERY_COUNTER": "%curr% of %total%"
+		"TEXT": "Metin",
+		"HAS_ATTACHMENT": "Eki",
+		"FLAGGED": "İşaretli",
+		"UNSEEN": "Görünmeyen",
+		"DATE": "Tarih",
+		"DATE_ALL": "Hepsi",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "3 gün önceki",
+		"SINCE_7_DAYS": "1 hafta önceki",
+		"SINCE_MONTH": "1 ay önceki",
+		"SINCE_3_MONTHS": "3 ay önceki",
+		"SINCE_6_MONTHS": "6 ay önceki",
+		"SINCE_YEAR": "1 yıl önceki",
+		"SUBFOLDERS": "Subfolders",
+		"SUBFOLDERS_NONE": "None",
+		"SUBFOLDERS_SUBTREE": "All",
+		"SUBFOLDERS_SUBTREE_ONE": "One level",
+		"REPLIED": "cevaplandı",
+		"KEYWORD": "Tag"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "Yaz",
@@ -80,8 +88,19 @@
 		"TRASH_NAME": "Çöp Kutusu",
 		"ARCHIVE_NAME": "Arşiv"
 	},
-	"QUOTA": {
-		"TITLE": "Kota Kullanımı"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
 		"BUTTON_RELOAD": "Mesaj Listesini Yenile",
@@ -99,17 +118,20 @@
 		"MENU_SELECT_SEEN": "Oku",
 		"MENU_SELECT_FLAGGED": "İşaretlenmiş",
 		"MENU_SELECT_UNFLAGGED": "İşaretlenmemiş",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
 		"EMPTY_LIST": "Herhangi Bir Sonuç Bulunamadı.",
 		"EMPTY_SEARCH_LIST": "Arama sonuçlarına uyan herhangi bir mesaj bulunamadı.",
 		"SEARCH_RESULT_FOR": "\"%SEARCH%\" için arama sonuçları",
 		"BACK_TO_MESSAGE_LIST": "mesaj listesine geri dön",
-		"EMPTY_SUBJECT_TEXT": "(Konu Yok)",
 		"PUT_MESSAGE_HERE": "Listede görüntülemek istediğiniz mesajı buraya sürükleyin.",
 		"TODAY_AT": "bugün %TIME%",
 		"YESTERDAY_AT": "dün %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "Toplam %COUNT% yeni mesajınız var!",
 		"QUOTA_SIZE": "Size ayrılan <strong>%LIMIT%<\/strong>'dan <strong>%SIZE% (%PROC%%)<\/strong> kullanıyorsunuz",
 		"SORT": "Sort",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "Date ascending",
 		"SORT_DATE_DESC": "Date descending",
 		"SORT_SIZE_ASC": "Size ascending",
@@ -138,6 +160,7 @@
 		"MENU_VIEW_ORIGINAL": "Kaynağı görüntüle",
 		"HTML_VIEW": "View HTML message",
 		"PLAIN_VIEW": "View plain text message",
+		"SWAP_COLORS": "Swap default (background)color",
 		"MENU_DOWNLOAD_ORIGINAL": ".eml dosyası olarak indir",
 		"MENU_FILTER_SIMILAR": "Bunun gibi iletileri filtrele",
 		"MENU_PRINT": "yazdır",
@@ -150,7 +173,20 @@
 		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
 		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
 		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"HAS_VIRUS_WARNING": "WARNING: virus detected",
+		"TAGS": "Tags",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Important",
+		"$todo": "To Do",
+		"$label1": "Important",
+		"$label2": "Work",
+		"$label3": "Personal",
+		"$label4": "To Do",
+		"$label5": "Later"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
@@ -160,9 +196,19 @@
 		"SEARCHING_DESC": "Aranıyor..."
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
 		"BUTTON_ADD_CONTACT": "Ekle",
 		"BUTTON_CREATE_CONTACT": "Oluştur",
-		"BUTTON_UPDATE_CONTACT": "Güncelle",
 		"BUTTON_IMPORT": "İçe Aktar (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "Dışa Aktar (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "Dışa Aktar (csv)",
@@ -171,28 +217,26 @@
 		"EMPTY_SEARCH": "Kişi bulunamadı",
 		"CLEAR_SEARCH": "Aramayı temizle",
 		"CONTACT_VIEW_DESC": "Görüntülemek istediğiniz kişiyi listeden seçin.",
-		"LABEL_PHONE": "Telefon",
-		"LABEL_WEB": "Web",
 		"LABEL_BIRTHDAY": "Doğum Günü",
-		"LINK_ADD_EMAIL": "Bir e-posta adresi ekleyin",
-		"LINK_ADD_PHONE": "Bir telefon numarası ekleyin",
-		"LINK_BIRTHDAY": "Doğrum Günü",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Görüntülenecek Ad",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Soyadını yazın",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Adı yazın",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Nickname yazın",
+		"DISPLAY_NAME": "Görüntülenecek Ad",
+		"LAST_NAME": "Soyadını",
+		"FIRST_NAME": "Adı",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
 		"LABEL_READ_ONLY": "Sadece Okunabilir",
-		"LABEL_SHARE": "paylaş",
 		"ADD_MENU_LABEL": "Ekle",
 		"ADD_MENU_NICKNAME": "Nickname",
-		"ADD_MENU_NOTES": "Notlar",
+		"ADD_MENU_NOTE": "Notlar",
 		"ADD_MENU_PHONE": "Gsm",
 		"ADD_MENU_URL": "URL",
 		"ADD_MENU_ADDRESS": "Adres",
 		"ADD_MENU_BIRTHDAY": "Doğum Günü",
 		"ADD_MENU_TAGS": "Etiketler",
 		"BUTTON_SHARE_ALL": "Herkes",
-		"BUTTON_SYNC": "Senkronize Et (CardDAV)"
+		"BUTTON_SYNC": "Senkronize Et (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "tüm alanları görüntüle",
@@ -210,13 +254,16 @@
 		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
 		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"BUTTON_REQUEST_READ_RECEIPT": "Okundu bilgisi iste",
 		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
+		"BUTTON_REQUEST_DSN": "Request a delivery receipt",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "Evet",
-		"BUTTON_NO": "Hayır",
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
 		"DESC_WANT_CLOSE_THIS_WINDOW": "Bu pencereyi kapatmak istediğinizden emin misiniz?",
 		"DESC_WANT_DELETE_MESSAGES": "Mesaj(ları) silmek istediğinizden emin misiniz?"
 	},
@@ -224,20 +271,20 @@
 		"TITLE_LANGUAGES": "Dil Seçimi"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Hesap Ekle?",
+		"TITLE_ADD_ACCOUNT": "Hesap Ekle",
 		"BUTTON_ADD_ACCOUNT": "Ekle",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_UPDATE_ACCOUNT": "Update Account"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Kimlik Ekle?",
-		"TITLE_UPDATE_IDENTITY": "Kimlik Güncelle?",
+		"TITLE_ADD_IDENTITY": "Kimlik Ekle",
+		"TITLE_UPDATE_IDENTITY": "Kimlik Güncelle",
+		"LABEL": "Label",
 		"BUTTON_ADD_IDENTITY": "Ekle",
-		"BUTTON_UPDATE_IDENTITY": "Güncelle",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Klasör Oluştur?",
+		"TITLE_CREATE_FOLDER": "Klasör Oluştur",
 		"LABEL_PARENT": "Üst Klasör",
 		"BUTTON_CREATE": "Oluştur",
 		"TITLE_CREATING_PROCESS": "Klasör Oluştur"
@@ -249,6 +296,21 @@
 		"DANGER_DESC_HTML_2": "Bu işlem bir kez başladıktan sonra, işlem durdurulamaz veya iptal edilemez.",
 		"TITLE_CLEARING_PROCESS": "Klasör temizleniyor..."
 	},
+	"CRYPTO": {
+		"SIGN": "Giriş Yap",
+		"ENCRYPT": "Şifrele",
+		"DECRYPT": "Decrypt",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "Geçerli imza %USER%",
+		"ERROR": "%TYPE% hatası: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "OpenPGP key'i içe aktar",
 		"POPUP_IMPORT_BUTTON": "İçe aktar",
@@ -257,20 +319,26 @@
 		"POPUP_GENERATE_TITLE": "OpenPGP key'leri Oluştur",
 		"POPUP_GENERATE_BUTTON": "Oluştur",
 		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Giriş Yap",
-		"LABEL_ENCRYPT": "Şifrele",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
 		"SIGNED_MESSAGE": "OpenPGP imzalı mesaj",
 		"ENCRYPTED_MESSAGE": "OpenPGP şifreli mesaj",
 		"STORE_IN_GNUPG": "Store on server in GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
 		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Geçerli imza %USER%",
-		"ERROR": "OpenPGP hatası: %ERROR%"
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "S\/MIME imzalı mesaj",
+		"ENCRYPTED_MESSAGE": "S\/MIME şifreli mesaj",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
+		"TITLE_CREATE_FILTER": "Create a filter",
+		"TITLE_EDIT_FILTER": "Update filter",
 		"LEGEND_CONDITIONS": "Conditions",
 		"LEGEND_ACTIONS": "Actions",
 		"BUTTON_ADD_CONDITION": "Add a Condition",
@@ -300,7 +368,7 @@
 		"MARK_AS_READ_LABEL": "Okundu olarak işaretle",
 		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
 		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
+		"STOP_LABEL": "Stop further processing of rules",
 		"VACATION_SUBJECT_LABEL": "Konu (Opsiyonel)",
 		"VACATION_MESSAGE_LABEL": "Mesaj",
 		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
@@ -339,64 +407,106 @@
 		"ERROR_UNKNOWN": "Bilinmeyen bir dosya yükleme bir hatası oluştu"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> Yazi Formati"
+		"PLAIN": "HTML <-> Yazi Formati",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Kişisel",
-		"LABEL_GENERAL_NAME": "Genel",
-		"LABEL_CONTACTS_NAME": "Kişi Listesi",
-		"LABEL_FOLDERS_NAME": "Klasörler",
-		"LABEL_ACCOUNTS_NAME": "Hesaplar",
-		"LABEL_FILTERS_NAME": "Filtreler",
-		"LABEL_SECURITY_NAME": "Güvenlik",
-		"LABEL_THEMES_NAME": "Temalar"
+		"GENERAL": "Genel",
+		"CONTACTS": "Kişi Listesi",
+		"FOLDERS": "Klasörler",
+		"ACCOUNTS": "Hesaplar",
+		"FILTERS": "Filtreler",
+		"SECURITY": "Güvenlik",
+		"THEMES": "Temalar"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
+		"SIMPLE": "Simple",
+		"ADVANCED": "Advanced",
 		"BUTTON_ADD_SCRIPT": "Add a Script",
 		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
 		"SUBNAME_REJECT": "Reject",
 		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SUBNAME_DISCARD": "Discard"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "Security",
 		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% saat"
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Never"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Genel",
-		"LABEL_LANGUAGE": "Dil",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Varsayılan text editör",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Düz",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "Ayarları görüntüle",
-		"LABEL_USE_PREVIEW_PANE": "Önizleme bölmesini kullanın",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster",
-		"LABEL_USE_THREADS": "Konuları kullanın",
-		"LABEL_REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
-		"LABEL_SHOW_IMAGES": "Herzaman gelen maillerdeki resimleri görüntüle.",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Messages on page",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"LANGUAGE": "Dil",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Identity",
+		"LAYOUT": "Layout",
+		"LAYOUT_NO_SPLIT": "No Split",
+		"LAYOUT_VERTICAL_SPLIT": "Vertical Split",
+		"LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Varsayılan text editör",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "Düz",
+		"VIEW_OPTIONS": "Ayarları görüntüle",
+		"USE_PREVIEW_PANE": "Önizleme bölmesini kullanın",
+		"HIDE_DELETED_MESSAGES": "Silinmek üzere işaretlenen mesajları gizle",
+		"USE_CHECKBOXES_IN_LIST": "Listede ekran onay kutularını göster",
+		"USE_THREADS": "Konuları kullanın",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Klasördeki cevapları mesajlarda göster",
+		"PREFER_HTML": "Prefer HTML to plain text",
+		"PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
+		"REMOVE_COLORS": "Remove background and text colors from message body",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Messages on page",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Mark message as read after",
+		"MSG_DEFAULT_ACTION": "Default action",
 		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Bildirimler",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)"
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Bildirimler",
+		"SOUND_NOTIFICATION": "Sound notification",
+		"CHROME_NOTIFICATION_DESC": "Yeni mesajları pop-up ile göster",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Tarayıcınız tarafından engellendi)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
 		"LABEL_CONTACTS_AUTOSAVE": "Otomatik olarak adres defterinize alıcıyı ekle",
@@ -405,17 +515,12 @@
 		"LABEL_CONTACTS_SYNC_SERVER": "Sunucu",
 		"LABEL_CONTACTS_SYNC_AB_URL": "Adres Defteri URL",
 		"LABEL_CONTACTS_SYNC_USER": "Kullanıcı Adı",
-		"SYNC_NO": "Hayır",
-		"SYNC_YES": "Evet",
 		"SYNC_READ": "Read only"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "Temalar",
-		"LEGEND_THEMES_CUSTOM": "Özel Tema Yapılandırması",
-		"LABEL_CUSTOM_TYPE": "Tip",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Aydınlık",
-		"LABEL_CUSTOM_TYPE_DARK": "Koyu",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Arka Plan",
+		"LABEL_BACKGROUND": "Arka Plan",
+		"LABEL_FONTS": "Fonts",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Arka Plan Resmi Yükleyin(JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "Dosya çok büyük (1MB+)",
 		"ERROR_FILE_TYPE_ERROR": "Geçersiz dosya tipi (sadece JPG ve PNG kabul edilir)",
@@ -435,8 +540,9 @@
 		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
 		"HELP_DELETE_FOLDER": "Delete folder",
 		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Check for new messages",
 		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
 		"TYPE_CALENDAR": "Calendar",
 		"TYPE_CONFIGURATION": "Configuration",
 		"TYPE_CONTACTS": "Contacts",
@@ -452,14 +558,14 @@
 		"BUTTON_ADD_ACCOUNT": "Hesap Ekle",
 		"BUTTON_ADD_IDENTITY": "Add an Identity",
 		"LOADING_PROCESS": "Hesap listesi güncelleniyor",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"SHOW_UNREAD": "Show unread messages count"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "Key İçe Aktar",
 		"BUTTON_GENERATE_KEY_PAIR": "Key Oluştur",
+		"IMPORT_FROM_SERVER": "Import from server",
 		"TITLE_PRIVATE": "Private",
 		"TITLE_PUBLIC": "Public",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
 		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
 	},
 	"SHORTCUTS_HELP": {
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "Tümünü Yanıtla",
 		"LABEL_FORWARD": "Yönlendir",
 		"LABEL_FORWARD_MULTIPLY": "Yönlendir (çoklu)",
-		"LABEL_HELP": "Yardım",
 		"LABEL_CHECK_ALL": "Tüm mesajları seç",
 		"LABEL_DELETE": "Sil",
 		"LABEL_OPEN_THREAD": "Open selected thread",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "Alıntılanan metni aç kapat",
 		"LABEL_THREAD_NEXT": "Next message in thread",
 		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Yazdır",
 		"LABEL_EXIT_FULLSCREEN": "Tam ekran modundan çık",
 		"LABEL_CLOSE_MESSAGE": "Mesajı kapat (önizleme bölmedüzen taslağı bulunamadı)",
 		"LABEL_SWITCH_TO_LIST": "Görüntülenen'den mesaj listesine geri dön",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "Oluşturulanı Kapat"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Geçersiz token",
-		"AUTH_ERROR": "Kimlik doğrulama başarısız oldu",
-		"CONNECTION_ERROR": "Sunucuya bağlanılamadı",
-		"DOMAIN_ALREADY_EXISTS": "Alanadı bulunuyor",
-		"DOMAIN_NOT_ALLOWED": "Alan Adına izin verilmemiş",
-		"ACCOUNT_NOT_ALLOWED": "Hesaba izin verilmemiş",
-		"CONTACTS_SYNC_ERROR": "Kişi listesi senkronizasyon hatası",
-		"CANT_GET_MESSAGE_LIST": "Mesaj listesi alınamadı",
-		"CANT_GET_MESSAGE": "Mesaj alınamadı",
-		"CANT_DELETE_MESSAGE": "Mesaj silinemedi",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Mesaj taşınamadı",
-		"CANT_SAVE_MESSAGE": "Mesaj kaydedilemedi",
-		"CANT_SEND_MESSAGE": "Mesaj gönderilemedi",
-		"INVALID_RECIPIENTS": "Geçersiz alıcılar",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Klasör oluşturulamadı",
-		"CANT_RENAME_FOLDER": "Klasör oluşturulamadı",
-		"CANT_DELETE_FOLDER": "Klasör silimedi",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Boş olmayan dizin silinemedi",
-		"CANT_SUBSCRIBE_FOLDER": "Klasöre abone olunamadı",
-		"CANT_UNSUBSCRIBE_FOLDER": "Klasör Aboneliğinden çıkılamadı",
-		"DEMO_SEND_MESSAGE_ERROR": "Güvenlik amacıyla, bu demo hesabı harici e-posta adreslerine mesaj göndermek için izin verilmez!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "Hesap zaten var",
-		"ACCOUNT_DOES_NOT_EXIST": "Account doesn't exist",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Posta sunucusuna erişirken bir hata oluştu",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Bilinmeyen Hata"
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Geçersiz token",
+		"AuthError": "Kimlik doğrulama başarısız oldu",
+		"ConnectionError": "Sunucuya bağlanılamadı",
+		"DomainAlreadyExists": "Alanadı bulunuyor",
+		"DomainNotAllowed": "Alan Adına izin verilmemiş",
+		"AccountNotAllowed": "Hesaba izin verilmemiş",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Kişi listesi senkronizasyon hatası",
+		"CantGetMessageList": "Mesaj listesi alınamadı",
+		"CantGetMessage": "Mesaj alınamadı",
+		"CantDeleteMessage": "Mesaj silinemedi",
+		"CantCopyMessage": "Can't copy message",
+		"CantMoveMessage": "Mesaj taşınamadı",
+		"CantSaveMessage": "Mesaj kaydedilemedi",
+		"CantSendMessage": "Mesaj gönderilemedi",
+		"InvalidRecipients": "Geçersiz alıcılar",
+		"CantSaveFilters": "Can't save filters",
+		"CantGetFilters": "Can't get filters",
+		"CantActivateFiltersScript": "Can't activate filters script",
+		"CantDeleteFiltersScript": "Can't delete filters script",
+		"FiltersAreNotCorrect": "Filters are not correct",
+		"CantCreateFolder": "Klasör oluşturulamadı",
+		"CantRenameFolder": "Klasör oluşturulamadı",
+		"CantDeleteFolder": "Klasör silimedi",
+		"CantDeleteNonEmptyFolder": "Boş olmayan dizin silinemedi",
+		"CantSubscribeFolder": "Klasöre abone olunamadı",
+		"CantUnsubscribeFolder": "Klasör Aboneliğinden çıkılamadı",
+		"DemoSendMessageError": "Güvenlik amacıyla, bu demo hesabı harici e-posta adreslerine mesaj göndermek için izin verilmez!",
+		"DemoAccountError": "For security purposes, this account is not allowed for this action!",
+		"AccountAlreadyExists": "Hesap zaten var",
+		"AccountDoesNotExist": "Account doesn't exist",
+		"AccountSwitchFailed": "Switch to account \"%EMAIL%\" failed",
+		"MailServerError": "Posta sunucusuna erişirken bir hata oluştu",
+		"InvalidInputArgument": "Invalid input argument",
+		"UnknownError": "Bilinmeyen Hata"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/user.json b/snappymail/v/0.0.0/app/localization/uk-UA/user.json
deleted file mode 100644
index 955e1e1d5..000000000
--- a/snappymail/v/0.0.0/app/localization/uk-UA/user.json
+++ /dev/null
@@ -1,540 +0,0 @@
-{
-	"GLOBAL": {
-		"TO_ARCHIVE": "Архівування",
-		"ARE_YOU_SURE": "Ви впевнені?",
-		"BACK": "Назад",
-		"BCC": "Прихована",
-		"CANCEL": "Відмінити",
-		"CC": "Копія",
-		"CLEAR": "Очистити",
-		"CLOSE": "Закрити (Esc)",
-		"CONTACTS": "Контакти",
-		"DELETE": "Видалити",
-		"DONE": "Зроблено",
-		"EMAIL": "Пошта",
-		"FROM": "Від",
-		"LOADING": "Завантаження...",
-		"LOGOUT": "Вийти",
-		"MORE": "Ще",
-		"MOVE_TO": "Перемістити",
-		"NAME": "Вхідні",
-		"NONE": "None",
-		"NOT_SPAM": "Не спам",
-		"PASSWORD": "Пароль",
-		"REPLY_TO": "Reply-To",
-		"SAVE": "Зберегти",
-		"SEARCH": "Контакти не знайдено",
-		"SPAM": "В спам",
-		"SUBJECT": "Тема",
-		"TEST": "Тест",
-		"TO": "Кому"
-	},
-	"LOGIN": {
-		"LABEL_LOGIN": "Логін",
-		"LABEL_SIGN_ME": "Запам'ятати мене",
-		"BUTTON_SIGN_IN": "Увійти"
-	},
-	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт",
-		"BUTTON_SETTINGS": "Налаштування",
-		"BUTTON_HELP": "Допомога"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Мобільна версія",
-		"BUTTON_DESKTOP_VERSION": "Повна версія"
-	},
-	"SEARCH": {
-		"TITLE_ADV": "Розширений пошук листів",
-		"LABEL_ADV_TEXT": "Текст",
-		"LABEL_ADV_HAS_ATTACHMENT": "З файлами",
-		"LABEL_ADV_HAS_ATTACHMENTS": "З файлами",
-		"LABEL_ADV_FLAGGED": "Відмічені",
-		"LABEL_ADV_UNSEEN": "Непрочитані",
-		"LABEL_ADV_DATE": "Дата",
-		"LABEL_ADV_DATE_ALL": "За весь час",
-		"LABEL_ADV_DATE_3_DAYS": "За три дні",
-		"LABEL_ADV_DATE_7_DAYS": "За тиждень",
-		"LABEL_ADV_DATE_MONTH": "За місяць",
-		"LABEL_ADV_DATE_3_MONTHS": "За 3 місяці",
-		"LABEL_ADV_DATE_6_MONTHS": "За півроку",
-		"LABEL_ADV_DATE_YEAR": "За рік",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "Закрити (Esc)",
-		"GALLERY_PREV": "Назад (Стрілка ←)",
-		"GALLERY_NEXT": "Вперед (Стрілка →)",
-		"GALLERY_COUNTER": "%curr% з %total%"
-	},
-	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "Написати",
-		"BUTTON_NEW_MESSAGE": "New message",
-		"INBOX_NAME": "Вхідні",
-		"SENT_NAME": "Вихідні",
-		"DRAFTS_NAME": "Чорновики",
-		"TRASH_NAME": "Кошик",
-		"ARCHIVE_NAME": "Архів"
-	},
-	"QUOTA": {
-		"TITLE": "Дискова квота"
-	},
-	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "Оновити список листів",
-		"BUTTON_EMPTY_FOLDER": "Очистити всю папку",
-		"BUTTON_MULTY_FORWARD": "Переслати як вкладення",
-		"BUTTON_DELETE_WITHOUT_MOVE": "Видалити повз кошик",
-		"MENU_SET_SEEN": "Відмітити як прочитане",
-		"MENU_SET_ALL_SEEN": "Відмітити всі як прочитані",
-		"MENU_UNSET_SEEN": "Відмітити як непрочитане",
-		"MENU_SET_FLAG": "Встановити флаг",
-		"MENU_UNSET_FLAG": "Зняти флаг",
-		"MENU_SELECT_ALL": "Все",
-		"MENU_SELECT_INVERT": "Інвертувати",
-		"MENU_SELECT_UNSEEN": "Непрочитані",
-		"MENU_SELECT_SEEN": "Прочитані",
-		"MENU_SELECT_FLAGGED": "Відмічені",
-		"MENU_SELECT_UNFLAGGED": "Без поміток",
-		"EMPTY_LIST": "В папці немає листів.",
-		"EMPTY_SEARCH_LIST": "Листи не знайдено.",
-		"SEARCH_RESULT_FOR": "Результат пошуку \"%SEARCH%\"",
-		"BACK_TO_MESSAGE_LIST": "повернутись до списку листів",
-		"EMPTY_SUBJECT_TEXT": "(Без теми)",
-		"PUT_MESSAGE_HERE": "Киньте повідомлення сюди, щоб подивитися його в списку",
-		"TODAY_AT": "сьогодні в %TIME%",
-		"YESTERDAY_AT": "вчора в %TIME%",
-		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% нових повідомлень!",
-		"QUOTA_SIZE": "Використано <strong>%SIZE% (%PROC%%)<\/strong> з <strong>%LIMIT%<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
-	},
-	"MESSAGE": {
-		"BUTTON_EDIT": "Редагувати",
-		"BUTTON_UNSUBSCRIBE": "Unsubscribe from this list",
-		"BUTTON_REPLY": "Відповісти на Листа",
-		"BUTTON_REPLY_ALL": "Відповісти Всім",
-		"BUTTON_FORWARD": "Переслати",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "Переслати як файл",
-		"BUTTON_EDIT_AS_NEW": "Редагувати як нове",
-		"BUTTON_SHOW_IMAGES": "Показати зовнішні зображення в листі",
-		"BUTTON_NOTIFY_READ_RECEIPT": "Сповістити відправника про прочитання цього повідомлення.",
-		"BUTTON_IN_NEW_WINDOW": "В окремому вікні",
-		"BUTTON_THREAD_LIST": "Листування",
-		"BUTTON_THREAD_PREV": "Попереднє",
-		"BUTTON_THREAD_NEXT": "Наступне",
-		"BUTTON_THREAD_MORE": "ще листи",
-		"MENU_HEADERS": "Подивитися заголовки",
-		"MENU_VIEW_ORIGINAL": "Подивитися оригінал",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "Завантажити як .eml файл",
-		"MENU_FILTER_SIMILAR": "Фільтрувати схожі",
-		"MENU_PRINT": "Надрукувати",
-		"EMPTY_SUBJECT_TEXT": "(Без теми)",
-		"LABEL_DATE": "Дата",
-		"LABEL_FROM_SHORT": "від",
-		"LABEL_TO_SHORT": "кому",
-		"PRINT_LABEL_ATTACHMENTS": "Файли",
-		"MESSAGE_VIEW_DESC": "Виберіть повідомлення для перегляду.",
-		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
-	},
-	"READ_RECEIPT": {
-		"SUBJECT": "Сповіщення про прочитання цього повідомлення - %SUBJECT%",
-		"BODY": "Це сповіщення про прочитання для повідомлення, яке ви надіслали в адресу %READ-RECEIPT%.\n\nПримітка: Це сповіщення про прочитання означає лише, що повідомлення було відображено на машину отримувача.\nВоно не гарантує, що отримувач прочитав чи зрозумів зміст повідомлення.\n"
-	},
-	"SUGGESTIONS": {
-		"SEARCHING_DESC": "Пошук..."
-	},
-	"CONTACTS": {
-		"BUTTON_ADD_CONTACT": "Додати контакт",
-		"BUTTON_CREATE_CONTACT": "Зберегти",
-		"BUTTON_UPDATE_CONTACT": "Оновити",
-		"BUTTON_IMPORT": "Імпорт (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "Експорт (vcf, vCard)",
-		"BUTTON_EXPORT_CSV": "Експорт (csv)",
-		"ERROR_IMPORT_FILE": "Помилка імпорту (Неправильний формат файлу)",
-		"EMPTY_LIST": "Немає контактів",
-		"EMPTY_SEARCH": "Контакти не знайдено",
-		"CLEAR_SEARCH": "Очистити пошук",
-		"CONTACT_VIEW_DESC": "Виберіть контакт для перегляду.",
-		"LABEL_PHONE": "Телефон",
-		"LABEL_WEB": "Сайт",
-		"LABEL_BIRTHDAY": "День нарождення",
-		"LINK_ADD_EMAIL": "Додайте адресу електронної пошти",
-		"LINK_ADD_PHONE": "Додайте телефон",
-		"LINK_BIRTHDAY": "День народження",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "Введіть повне ім'я",
-		"PLACEHOLDER_ENTER_LAST_NAME": "Введіть ім'я",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "Введіть прізвище",
-		"PLACEHOLDER_ENTER_NICK_NAME": "Введіть нік",
-		"LABEL_READ_ONLY": "Тільки читання",
-		"LABEL_SHARE": "Поділитися",
-		"ADD_MENU_LABEL": "Додати",
-		"ADD_MENU_NICKNAME": "Нік",
-		"ADD_MENU_NOTES": "Примітки",
-		"ADD_MENU_PHONE": "Телефон",
-		"ADD_MENU_URL": "Сайт",
-		"ADD_MENU_ADDRESS": "Адреса",
-		"ADD_MENU_BIRTHDAY": "День народження",
-		"ADD_MENU_TAGS": "Теги",
-		"BUTTON_SHARE_ALL": "Всім",
-		"BUTTON_SYNC": "Синхронизація (CardDAV)"
-	},
-	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "Показати всі поля",
-		"BUTTON_SEND": "Надіслати",
-		"BUTTON_MINIMIZE": "Minimize",
-		"SAVED_TIME": "Збережено в %TIME%",
-		"SAVED_ERROR_ON_SEND": "Повідомлення було надіслано, але не збережено",
-		"DISCARD_UNSAVED_DATA": "Discard unsaved data?",
-		"ATTACH_FILES": "Додати файли",
-		"ATTACH_DROP_FILES_DESC": "Помістити файли сюди",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% написав",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- Переслане повідомлення -------",
-		"FORWARD_MESSAGE_TOP_SENT": "Надіслано",
-		"EMPTY_TO_ERROR_DESC": "Вкажіть як мінімум одного отримувача",
-		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
-		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
-		"BUTTON_REQUEST_READ_RECEIPT": "Запит про прочитання листа",
-		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
-	},
-	"POPUPS_ASK": {
-		"BUTTON_YES": "Так",
-		"BUTTON_NO": "Ні",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?",
-		"DESC_WANT_DELETE_MESSAGES": "Ви впевнені, що хочете видалити повідомлення?"
-	},
-	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "Виберіть мову"
-	},
-	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "Додати ще акаунт?",
-		"BUTTON_ADD_ACCOUNT": "Додати",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
-	},
-	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "Додати Профіль?",
-		"TITLE_UPDATE_IDENTITY": "Оновити Профіль?",
-		"BUTTON_ADD_IDENTITY": "Додати",
-		"BUTTON_UPDATE_IDENTITY": "Оновити",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
-	},
-	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "Створити теку?",
-		"LABEL_PARENT": "Батьківська тека",
-		"BUTTON_CREATE": "Створити",
-		"TITLE_CREATING_PROCESS": "Створення теки"
-	},
-	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "Очистити теку від листів?",
-		"DANGER_DESC_WARNING": "Увага!",
-		"DANGER_DESC_HTML_1": "Ця дія призведе до повного видалення всіх листів з теки <strong>%FOLDER%<\/strong>.",
-		"DANGER_DESC_HTML_2": "Після початку очищення, процес <strong style=\"color:red\">неможливо<\/strong> буде зупинити чи відмінити.",
-		"TITLE_CLEARING_PROCESS": "Очищення теки..."
-	},
-	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "Імпорт OpenPGP ключа",
-		"POPUP_IMPORT_BUTTON": "Імпорт",
-		"POPUP_VIEW_TITLE": "Перегляд OpenPGP ключа",
-		"POPUP_VIEW_BUTTON": "Вибрати",
-		"POPUP_GENERATE_TITLE": "Генерація OpenPGP ключа",
-		"POPUP_GENERATE_BUTTON": "Створити",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Підпис",
-		"LABEL_ENCRYPT": "Шифрування",
-		"BUTTON_DECRYPT": "Дешифрувати",
-		"BUTTON_VERIFY": "Verify",
-		"SIGNED_MESSAGE": "OpenPGP підписане повідомлення",
-		"ENCRYPTED_MESSAGE": "OpenPGP шифроване повідомлення",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Підтверджена сигнатура для %USER%",
-		"ERROR": "OpenPGP помилка: %ERROR%"
-	},
-	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Створити фільтер?",
-		"TITLE_EDIT_FILTER": "Оновити фільтер?",
-		"LEGEND_CONDITIONS": "Умови",
-		"LEGEND_ACTIONS": "Дії",
-		"BUTTON_ADD_CONDITION": "Додати умову",
-		"SELECT_ACTION_MOVE_TO": "Перемістити в",
-		"SELECT_ACTION_FORWARD_TO": "Переслати до",
-		"SELECT_ACTION_REJECT": "Відклонити",
-		"SELECT_ACTION_VACATION_MESSAGE": "Повідомлення про відпустку",
-		"SELECT_ACTION_DISCARD": "Відклонити",
-		"SELECT_FIELD_RECIPIENTS": "Отримувачі (To or CC)",
-		"SELECT_FIELD_HEADER": "Заголовок",
-		"SELECT_FIELD_BODY": "Body",
-		"SELECT_FIELD_SIZE": "Розмір",
-		"SELECT_TYPE_CONTAINS": "Містить",
-		"SELECT_TYPE_NOT_CONTAINS": "Не містить",
-		"SELECT_TYPE_MATCHES": "Matches (* and ? supported)",
-		"SELECT_TYPE_NOT_MATCHES": "Not Matches (* and ? supported)",
-		"SELECT_TYPE_REGEXP": "Regexp",
-		"SELECT_TYPE_NOT_REGEXP": "Not Regexp",
-		"SELECT_TYPE_EQUAL_TO": "Дорівнює",
-		"SELECT_TYPE_NOT_EQUAL_TO": "Не дорівнює",
-		"SELECT_TYPE_OVER": "Over",
-		"SELECT_TYPE_UNDER": "Under",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "Matching any of the following rules",
-		"SELECT_MATCH_ALL": "Matching all of the following rules",
-		"MARK_AS_READ_LABEL": "Mark as read",
-		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
-		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
-		"VACATION_SUBJECT_LABEL": "Тема (не обов'язково)",
-		"VACATION_MESSAGE_LABEL": "Повідомлення",
-		"VACATION_RECIPIENTS_LABEL": "Отримувачі (розділяти комами)",
-		"REJECT_MESSAGE_LABEL": "Відклонити повідомлення",
-		"ALL_INCOMING_MESSAGES_DESC": "Всі повідомлення, що надійшли"
-	},
-	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
-	},
-	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "Виберіть системні теки",
-		"SELECT_CHOOSE_ONE": "Ще не вибрано",
-		"SELECT_UNUSE_NAME": "Не використовувати",
-		"NOTIFICATION_SENT": "Ви ще не обрали системну теку \"Вихідні\", в яку складаються всі повідомлення післе надсилання.\nЯкщо ви не хочете зберігати вихідні листи, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_DRAFTS": "Ви ще не обрали системну теку \"Чорновики\", в яку складаються всі збережені повідомлення.",
-		"NOTIFICATION_SPAM": "Ви ще не обрали системну теку \"Спам\", в яку складаються всі спам повідомлення.\nЯкщо ви не хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_TRASH": "Ви ще не обрали системну теку \"Удаленные\", в яку складаються всі повідомлення після видалення.\nЯкщо ви не хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
-		"NOTIFICATION_ARCHIVE": "Ви ще не обрали системну теку \"Архив\", в яку складаються всі повідомлення після архівації."
-	},
-	"TITLES": {
-		"MAILBOX": "Пошта",
-		"SETTINGS": "Налаштування"
-	},
-	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "Файл не завантажився повністю",
-		"ERROR_NO_FILE_UPLOADED": "Файл не було завантажено",
-		"ERROR_MISSING_TEMP_FOLDER": "Помилка при збереженні файлу",
-		"ERROR_ON_SAVING_FILE": "Помилка при збереженні файлу",
-		"ERROR_FILE_TYPE": "Неправильний тип файлу",
-		"ERROR_UNKNOWN": "Помилка завантаження файлу"
-	},
-	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
-	},
-	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "Персональні",
-		"LABEL_GENERAL_NAME": "Основні",
-		"LABEL_CONTACTS_NAME": "Контакти",
-		"LABEL_FOLDERS_NAME": "Теки",
-		"LABEL_ACCOUNTS_NAME": "Акаунти",
-		"LABEL_FILTERS_NAME": "Фильтры",
-		"LABEL_SECURITY_NAME": "Безпека",
-		"LABEL_THEMES_NAME": "Теми"
-	},
-	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
-		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
-		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
-		"SUBNAME_REJECT": "Reject",
-		"SUBNAME_VACATION_MESSAGE": "Повідомлення про відпустку",
-		"SUBNAME_DISCARD": "Відклонити",
-		"LOADING_PROCESS": "Updating filter list"
-	},
-	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "Безпека",
-		"LABEL_AUTOLOGOUT": "Автовихід",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Ніколи",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
-	},
-	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "Основні налаштування",
-		"LABEL_LANGUAGE": "Мова",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "Редактор тексту за змовчуванням",
-		"LABEL_EDITOR_HTML": "Форматований",
-		"LABEL_EDITOR_PLAIN": "Простий",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "Відображення",
-		"LABEL_USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
-		"LABEL_USE_THREADS": "Згортати листи у листуваннях",
-		"LABEL_REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж теку, де знаходиться оригінал",
-		"LABEL_SHOW_IMAGES": "Показувати зовнішні зображення в тілі листа без попередження",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "Сповіщення",
-		"LABEL_SOUND_NOTIFICATION": "Звукове сповіщення",
-		"LABEL_CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)"
-	},
-	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",
-		"LEGEND_CONTACTS_SYNC": "Синхронізація (CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "Увімкнути синхронизацію",
-		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
-		"LABEL_CONTACTS_SYNC_AB_URL": "Адресна книга (URL)",
-		"LABEL_CONTACTS_SYNC_USER": "Користувач",
-		"SYNC_NO": "Ні",
-		"SYNC_YES": "Так",
-		"SYNC_READ": "Read only"
-	},
-	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "Теми Оформлення",
-		"LEGEND_THEMES_CUSTOM": "Налаштування Користувацької Теми",
-		"LABEL_CUSTOM_TYPE": "Тип Теми",
-		"LABEL_CUSTOM_TYPE_LIGHT": "Світла",
-		"LABEL_CUSTOM_TYPE_DARK": "Темна",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "Картинка на фоні",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Завантажити фонову картинку (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
-		"ERROR_FILE_TYPE_ERROR": "Невірний тип файлу (тільки JPG и PNG)",
-		"ERROR_UNKNOWN": "Помилка завантаження файлу"
-	},
-	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "Список Тек",
-		"BUTTON_CREATE": "Створити Теку",
-		"BUTTON_SYSTEM": "Системні теки",
-		"BUTTON_SUBSCRIBE": "Підписатися",
-		"BUTTON_UNSUBSCRIBE": "Відписатися",
-		"LOADING_PROCESS": "Оновлення списку тек",
-		"CREATING_PROCESS": "Створення теки",
-		"DELETING_PROCESS": "Видалення теки",
-		"RENAMING_PROCESS": "Перейменування теки",
-		"TO_MANY_FOLDERS_DESC_1": "You have too many folders!",
-		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
-		"HELP_DELETE_FOLDER": "Видалити теку",
-		"HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати теку",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
-	},
-	"SETTINGS_ACCOUNTS": {
-		"LEGEND_ACCOUNTS": "Список акаунтів",
-		"LEGEND_IDENTITIES": "Identities",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Accounts and Identities",
-		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт",
-		"BUTTON_ADD_IDENTITY": "Add an Identity",
-		"LOADING_PROCESS": "Оновлення списку акаунтів",
-		"DEFAULT_IDENTITY_LABEL": "default"
-	},
-	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "Імпортувати ключ",
-		"BUTTON_GENERATE_KEY_PAIR": "Новий ключ",
-		"TITLE_PRIVATE": "Приватний",
-		"TITLE_PUBLIC": "Публічний",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
-	},
-	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "Сполучення клавіш",
-		"TAB_MAILBOX": "Пошта",
-		"TAB_MESSAGE_LIST": "Список повідомлень",
-		"TAB_MESSAGE_VIEW": "Перегляд повідомлень",
-		"TAB_COMPOSE": "Написанні повідомлення",
-		"LABEL_OPEN_USER_DROPDOWN": "Відкрити випадаючий список користувача",
-		"LABEL_REPLY": "Відповісти",
-		"LABEL_REPLY_ALL": "Відповісти всім",
-		"LABEL_FORWARD": "Переслати",
-		"LABEL_FORWARD_MULTIPLY": "Переслати всі вибрані повідомлення",
-		"LABEL_HELP": "Допомога",
-		"LABEL_CHECK_ALL": "Вибрати всі повідомлення",
-		"LABEL_DELETE": "Видалити",
-		"LABEL_OPEN_THREAD": "Відкрити відмічене листування",
-		"LABEL_MOVE": "Перемістити",
-		"LABEL_READ": "Відмітити вибрані листи прочитаними",
-		"LABEL_UNREAD": "Відмітити вибрані листи непрочитаними",
-		"LABEL_IMPORTANT": "Відпітити вибрані листи як важливі",
-		"LABEL_CANCEL_SEARCH": "Відмінити пошук",
-		"LABEL_FULLSCREEN_ENTER": "Повноекранний режим",
-		"LABEL_VIEW_MESSAGE_ENTER": "Перегляд повідомлення",
-		"LABEL_SWITCH_TO_MESSAGE": "Переключити фокус на вибране повідомлення",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключити фокус на список тек",
-		"LABEL_FULLSCREEN_TOGGLE": "Переключити повноекранний режим",
-		"LABEL_BLOCKQUOTES_TOGGLE": "Перемикання видимості цитат у листі",
-		"LABEL_THREAD_NEXT": "Наступний лист у листуванні",
-		"LABEL_THREAD_PREV": "Попередній лист у листуванні",
-		"LABEL_PRINT": "Надрукувати",
-		"LABEL_EXIT_FULLSCREEN": "Вийти з повноекранного режиму",
-		"LABEL_CLOSE_MESSAGE": "Закрити повідомлення",
-		"LABEL_SWITCH_TO_LIST": "Переключити фокус на список листів",
-		"LABEL_OPEN_COMPOSE_POPUP": "Написати листа",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Вибрати відправника",
-		"LABEL_SAVE_MESSAGE": "Зберегти повідомлення",
-		"LABEL_SEND_MESSAGE": "Надіслати повідомлення",
-		"LABEL_CLOSE_COMPOSE": "Закрити повідомлення"
-	},
-	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "Невірний токен запиту",
-		"AUTH_ERROR": "Не вдалося авторизуватися",
-		"CONNECTION_ERROR": "Помилка з'єднання з сервером.",
-		"DOMAIN_ALREADY_EXISTS": "Домен вже існує",
-		"DOMAIN_NOT_ALLOWED": "Цей домен заборонений",
-		"ACCOUNT_NOT_ALLOWED": "Цей акаунт заборонений",
-		"CONTACTS_SYNC_ERROR": "Помилка синхронізації контактів",
-		"CANT_GET_MESSAGE_LIST": "Не можу отримати список листів",
-		"CANT_GET_MESSAGE": "Не можу отримати листа",
-		"CANT_DELETE_MESSAGE": "Не можу видалити листа",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "Не можу перемістити листа",
-		"CANT_SAVE_MESSAGE": "Не можу зберегти листа",
-		"CANT_SEND_MESSAGE": "Не можу відправити листа",
-		"INVALID_RECIPIENTS": "Перевірити правильність вводу всіх адрес.",
-		"CANT_SAVE_FILTERS": "Не можу зберегти фільтри",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "Не можу створити теку",
-		"CANT_RENAME_FOLDER": "Не можу перейменувати теку",
-		"CANT_DELETE_FOLDER": "Не можу видалити теку",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "Не можу видалити не порожню теку",
-		"CANT_SUBSCRIBE_FOLDER": "Не можу підписати теку",
-		"CANT_UNSUBSCRIBE_FOLDER": "Не можу відписати теку",
-		"DEMO_SEND_MESSAGE_ERROR": "Демо акаунту надсилання листів на зовнішні поштові адреси заборонена!",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "акаунт вже додано",
-		"ACCOUNT_DOES_NOT_EXIST": "Account doesn't exist",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "Помилка доступу до поштового серверу",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "Невідома помилка"
-	}
-}
diff --git a/snappymail/v/0.0.0/app/localization/uk/admin.json b/snappymail/v/0.0.0/app/localization/uk/admin.json
new file mode 100644
index 000000000..d32964f95
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/uk/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Додати",
+		"CLOSE": "Закрити",
+		"SAVE": "Зберегти",
+		"TEST": "Тест",
+		"UPDATE": "Оновити",
+		"USERNAME": "Ім'я користувача",
+		"PASSWORD": "Пароль",
+		"CANCEL": "Скасувати",
+		"SEARCH": "Пошук",
+		"YES": "Так",
+		"NO": "Ні"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Логін",
+		"LABEL_TOTP": "Код підтвердження TOTP",
+		"BUTTON_LOGIN": "Увійти в панель адміністратора"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Панель управління адміністратора"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Загальні",
+		"LOGIN": "Вхід",
+		"BRANDING": "Брендінг",
+		"CONTACTS": "Контакти",
+		"DOMAINS": "Домени",
+		"SECURITY": "Безпека",
+		"PACKAGES": "Плагіни",
+		"CONFIG": "Файл конфігурації",
+		"ABOUT": "Про програму"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Інтерфейс",
+		"LABEL_LANGUAGE": "Мова",
+		"LABEL_LANGUAGE_ADMIN": "Мова (Панелі Адміністратора)",
+		"LABEL_THEME": "Тема за замовчуванням",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Дозволити користувачу вибір мови",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Дозволити користувачу вибір теми",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Дозволити користувачу вибір фону",
+		"LABEL_SHOW_THUMBNAILS": "Показувати мініатюри (для вкладень)",
+		"LEGEND_MAIN": "Основне",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Ліміт розміру вкладень",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Дозволити додаткові облікові записи",
+		"LABEL_ALLOW_IDENTITIES": "Дозволити кілька варіантів відправника",
+		"ALERT_DATA_ACCESS": "Папка даних SnappyMail доступна. Будь ласка, налаштуйте свій веб-сервер так, щоб приховати папку даних із зовнішнього доступу. Детальніше тут:",
+		"ALERT_WARNING": "Увага!",
+		"HTML_ALERT_WEAK_PASSWORD": "Ви використовуєте стандартний пароль адміністратора.\n<br>\nЗ міркувань безпеки, будь ласка,\n<strong><a href=\"#\/security\">змініть пароль<\/a><\/strong> просто зараз.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Сторінка Входу",
+		"LABEL_DEFAULT_DOMAIN": "Основний домен",
+		"LABEL_DETERMINE_USER_DOMAIN": "Намагатися визначити домен користувача",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Дозволити вибір мови на сторінці входу",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Намагатися визначити мову користувача"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Брендінг",
+		"LABEL_PAGE_TITLE": "Назва сторінки (Title)",
+		"LABEL_LOADING_DESCRIPTION": "Назва при завантаженні та на сторінці входу",
+		"LABEL_FAVICON_URL": "Значок (favicon)"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Контакти",
+		"LEGEND_STORAGE": "Сховище (СУБД)",
+		"LABEL_ENABLE_CONTACTS": "Увімкнути контакти",
+		"LABEL_ALLOW_SYNC": "Дозволити синхронізацію контактів (із зовнішнім CardDAV сервером)",
+		"LABEL_STORAGE_TYPE": "Тип",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Користувач",
+		"LABEL_STORAGE_PASSWORD": "Пароль",
+		"SQLITE_GLOBAL": "Використати глобальну БД для всіх, замість окремого для кожного облікового запису",
+		"ALERT_NOTICE": "Увага!",
+		"SUGGESTIONS_LIMIT": "Ліміт пропозицій",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Не використовуйте цей тип бази даних з великою кількістю активних користувачів.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Ваша система не підтримує контактів.\n<br>\nВам необхідно встановити чи увімкнути <strong>СУБД (SQLite \/ MySQL \/ PostgreSQL)<\/strong> PHP-розширення на вашому сервері.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Домени",
+		"BUTTON_ADD_DOMAIN": "Додати домен",
+		"BUTTON_ADD_ALIAS": "Додати аліас",
+		"DELETE_ARE_YOU_SURE": "Ви впевнені?",
+		"HTML_DOMAINS_HELPER": "Список доменів до яких дозволено доступ.\n<br>\nНатисніть на ім'я, щоб настроїти домен.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "Безпека",
+		"LABEL_USE_IMAGE_PROXY": "Використовувати локальний проксі для зовнішніх зображень",
+		"LABEL_AUTO_VERIFY": "Перевіряти підписи автоматично",
+		"LABEL_SHOW_PHP_INFO": "Показати PHP інформацію",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Облікові дані для доступу до панелі адміністратора",
+		"LABEL_CURRENT_PASSWORD": "Поточний пароль",
+		"LABEL_NEW_PASSWORD": "Новий пароль",
+		"LABEL_REPEAT_PASSWORD": "Повторити пароль",
+		"LABEL_REQUIRE_VERIFICATION": "Вимагати перевірку SSL сертифікату",
+		"CRYPTO": "Шифрування",
+		"LABEL_ALLOW_SELF_SIGNED": "Дозволити самопідписані сертифікати"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Увімкнути плагіни",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Є оновлення для наступних плагінів",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Доступні плагіни",
+		"LEGEND_INSTALLED_PACKAGES": "Встановлені плагіни",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Наразі не вдається отримати доступ до сховища пакетів."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Про програму",
+		"LABEL_TAG_HINT": "Простий, сучасний та швидкий веб-клієнт електронної пошти\n",
+		"LABEL_ALL_RIGHTS_RESERVED": "Всі права захищені.",
+		"HINT_READ_CHANGE_LOG": "Будь ласка, ознайомтеся зі змінами перед оновленням.\n",
+		"HINT_IS_UP_TO_DATE": "Версія SnappyMail актуальна.",
+		"HTML_NEW_VERSION": "Нова <b>%VERSION%<\/b> версія доступна.",
+		"LABEL_UPDATING": "Оновлення",
+		"LABEL_CHECKING": "Перевірка",
+		"BUTTON_RELEASES": "Релізи"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Додати аліас",
+		"LABEL_ALIAS": "Аліас",
+		"LABEL_DOMAIN": "Домен"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Додати домен",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Додати домен \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Редагувати домен \"%NAME%\"",
+		"LABEL_NAME": "Імя",
+		"NAME_HELPER": "підтримуються шаблони",
+		"LABEL_SERVER": "Сервер",
+		"LABEL_PORT": "Порт",
+		"LABEL_SECURE": "Безпека",
+		"TIMEOUT": "Тайм-аут",
+		"DISABLE_CAPABILITIES": "Вимкнути функції",
+		"LIMITS": "Ліміти",
+		"FOLDERS": "Папки",
+		"MESSAGES": "Листи",
+		"SECURE_OPTION_NONE": "Немає",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Дозволити Sieve скрипти",
+		"LABEL_USE_SHORT_LOGIN": "Використовувати короткий логін",
+		"LABEL_LOWERCASE_LOGIN": "Логін у нижньому регістрі (незалежно від регістру)",
+		"LABEL_USE_AUTH": "Використовувати автентифікацію",
+		"LABEL_SET_SENDER": "Використовувати логін як відправника",
+		"LABEL_AUTH_PLAIN_LINE": "Примусовий вхід командою AUTH PLAIN",
+		"LABEL_USE_PHP_MAIL": "Використовувати mail() функцію",
+		"BUTTON_WHITE_LIST": "Білий список",
+		"NEW_DOMAIN_DESC": "Ця конфігурація дозволить вам працювати з <strong>%NAME%<\/strong> адресами.",
+		"WHITE_LIST_ALERT": "Список користувачів домену, до яких дозволено доступ.\nВикористовуйте пробіл як роздільник.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Плагін",
+		"DESC_NOTHING_TO_CONFIGURE": "Нічого налаштовувати"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Виберіть мову"
+	},
+	"HINTS": {
+		"BETA": "beta",
+		"WARNING": "Увага!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Домен вже існує",
+		"UNKNOWN_ERROR": "Невідома помилка"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Запит не виконано",
+		"RequestAborted": "Запит перерваний",
+		"RequestTimeout": "Минув час запиту",
+		"InvalidToken": "Невірний токен запиту",
+		"AuthError": "Не вдалося авторизуватись",
+		"DomainAlreadyExists": "Домен вже існує",
+		"CantSavePluginSettings": "Не можу зберегти налаштування",
+		"CantInstallPackage": "Помилка встановлення плагіна",
+		"CantDeletePackage": "Помилка видалення плагіна",
+		"InvalidPluginPackage": "Помилка пакета плагіна",
+		"UnsupportedPluginPackage": "Для роботи плагіна потрібна повна підтримка сервера",
+		"UnknownError": "Невідома помилка"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/uk/relativetimeformat.js
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/uk-UA/relativetimeformat.js
rename to snappymail/v/0.0.0/app/localization/uk/relativetimeformat.js
diff --git a/snappymail/v/0.0.0/app/localization/uk-UA/static.json b/snappymail/v/0.0.0/app/localization/uk/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/uk-UA/static.json
rename to snappymail/v/0.0.0/app/localization/uk/static.json
diff --git a/snappymail/v/0.0.0/app/localization/uk/user.json b/snappymail/v/0.0.0/app/localization/uk/user.json
new file mode 100644
index 000000000..2247fe49f
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/uk/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "Архівування",
+		"ARE_YOU_SURE": "Ви впевнені?",
+		"BACK": "Назад",
+		"BCC": "Прихована копія",
+		"CANCEL": "Відмінити",
+		"CC": "Копія",
+		"CLEAR": "Очистити",
+		"CLOSE": "Закрити (Esc)",
+		"CONTACTS": "Контакти",
+		"DELETE": "Видалити",
+		"UNDELETE": "Відновити",
+		"DONE": "Зроблено",
+		"EMAIL": "Пошта",
+		"FROM": "Від",
+		"LOADING": "Завантаження...",
+		"LOGOUT": "Вийти",
+		"MORE": "Ще",
+		"MOVE_TO": "Перемістити",
+		"COPY_TO": "Копіювати в",
+		"NAME": "Ім'я",
+		"NONE": "Нічого",
+		"TO_SPAM": "Перемістити повідомлення у спам",
+		"NOT_SPAM": "Не спам",
+		"USERNAME": "Ім'я користувача",
+		"PASSWORD": "Пароль",
+		"REMEMBER": "Запам'ятати",
+		"REPLY_TO": "Відповідь сюди",
+		"SAVE": "Зберегти",
+		"SAVE_CHANGES": "Зберегти зміни?",
+		"SEARCH": "Пошук",
+		"SPAM": "Спам",
+		"SUBJECT": "Тема",
+		"TEST": "Тест",
+		"TO": "Кому",
+		"SERVER_MESSAGE": "Повідомлення сервера",
+		"YES": "Так",
+		"NO": "Ні",
+		"INACTIVE": "Не активне",
+		"DEFAULT": "за замовчуванням",
+		"HELP": "Допомога",
+		"TEXT": "Текст",
+		"ATTACHMENTS": "Файли"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Логін",
+		"LABEL_SIGN_ME": "Запам'ятати мене",
+		"BUTTON_SIGN_IN": "Увійти"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Розширений пошук листів",
+		"TEXT": "Текст",
+		"HAS_ATTACHMENT": "З файлами",
+		"FLAGGED": "Із зірочкою",
+		"UNSEEN": "Непрочитані",
+		"DATE": "Дата",
+		"DATE_ALL": "За весь час",
+		"BEFORE_3_DAYS": "Старше 3 днів",
+		"BEFORE_7_DAYS": "Старше 1 тижня",
+		"BEFORE_MONTH": "Старше 1 місяця",
+		"BEFORE_3_MONTHS": "Старше 3 місяців",
+		"BEFORE_6_MONTHS": "Старше 6 місяців",
+		"BEFORE_YEAR": "Старше 1 року",
+		"SINCE_3_DAYS": "За три дні",
+		"SINCE_7_DAYS": "За тиждень",
+		"SINCE_MONTH": "За місяць",
+		"SINCE_3_MONTHS": "За 3 місяці",
+		"SINCE_6_MONTHS": "За півроку",
+		"SINCE_YEAR": "За рік",
+		"SUBFOLDERS": "Підпапки",
+		"SUBFOLDERS_NONE": "Нічого",
+		"SUBFOLDERS_SUBTREE": "Усі",
+		"SUBFOLDERS_SUBTREE_ONE": "Один рівень",
+		"REPLIED": "Відповів",
+		"KEYWORD": "Тег"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Написати",
+		"BUTTON_NEW_MESSAGE": "Новий лист",
+		"INBOX_NAME": "Вхідні",
+		"SENT_NAME": "Вихідні",
+		"DRAFTS_NAME": "Чернетки",
+		"TRASH_NAME": "Кошик",
+		"ARCHIVE_NAME": "Архів"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Права",
+		"ACL_A": "Адмініструвати",
+		"ACL_E": "Видалити",
+		"ACL_I": "Вставте повідомлення",
+		"ACL_K": "Створити вкладені папки",
+		"ACL_L": "Показати повідомлення",
+		"ACL_P": "Надіслати лист",
+		"ACL_R": "Виберіть папку",
+		"ACL_S": "\\ПЕРЕГЛЯНУТИ тег",
+		"ACL_T": "\\ВИДАЛЕНО тег",
+		"ACL_W": "Інші теги",
+		"ACL_X": "Видалити\/Перейменувати папку"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Оновити список листів",
+		"BUTTON_EMPTY_FOLDER": "Очистити всю папку",
+		"BUTTON_MULTY_FORWARD": "Переслати як вкладення",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Видалити повз кошик",
+		"MENU_SET_SEEN": "Відмітити як прочитане",
+		"MENU_SET_ALL_SEEN": "Відмітити всі як прочитані",
+		"MENU_UNSET_SEEN": "Відмітити як непрочитане",
+		"MENU_SET_FLAG": "Встановити зірочку",
+		"MENU_UNSET_FLAG": "Зняти зірочку",
+		"MENU_SELECT_ALL": "Все",
+		"MENU_SELECT_INVERT": "Інвертувати",
+		"MENU_SELECT_UNSEEN": "Непрочитані",
+		"MENU_SELECT_SEEN": "Прочитані",
+		"MENU_SELECT_FLAGGED": "Із Зірочкою",
+		"MENU_SELECT_UNFLAGGED": "Без зірочки",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Завантажити всі вкладення",
+		"EMPTY_LIST": "В папці немає листів.",
+		"EMPTY_SEARCH_LIST": "Листи не знайдено.",
+		"SEARCH_RESULT_FOR": "Результат пошуку \"%SEARCH%\"",
+		"BACK_TO_MESSAGE_LIST": "повернутись до списку листів",
+		"PUT_MESSAGE_HERE": "Киньте повідомлення сюди, щоб подивитися його в списку",
+		"TODAY_AT": "сьогодні в %TIME%",
+		"YESTERDAY_AT": "вчора в %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "У вас %COUNT% нових повідомлень!",
+		"QUOTA_SIZE": "Використано <strong>%SIZE% (%PROC%%)<\/strong> з <strong>%LIMIT%<\/strong>",
+		"SORT": "Сортувати",
+		"NO_SORT": "Поштовий сервер не підтримує сортування",
+		"SORT_ARRIVAL_ASC": "Доставлено спершу старі",
+		"SORT_ARRIVAL_DESC": "Доставлено спершу нові",
+		"SORT_DATE_ASC": "Дата спершу старі",
+		"SORT_DATE_DESC": "Дата спершу нові",
+		"SORT_SIZE_ASC": "Розмір за зростанням",
+		"SORT_SIZE_DESC": "Розмір за спаданням",
+		"SORT_SUBJECT_ASC": "Тема А-Я",
+		"SORT_SUBJECT_DESC": "Тема Я-А",
+		"SORT_FROM_ASC": "Відправник А-Я",
+		"SORT_FROM_DESC": "Відправник Я-A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Редагувати",
+		"BUTTON_UNSUBSCRIBE": "Відписатися",
+		"BUTTON_REPLY": "Відповісти на Листа",
+		"BUTTON_REPLY_ALL": "Відповісти Всім",
+		"BUTTON_FORWARD": "Переслати",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Переслати як файл",
+		"BUTTON_EDIT_AS_NEW": "Редагувати як нове",
+		"BUTTON_SHOW_IMAGES": "Показати зовнішні зображення в листі",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Сповістити відправника про прочитання цього повідомлення.",
+		"BUTTON_IN_NEW_WINDOW": "В окремому вікні",
+		"BUTTON_THREAD_LIST": "Листування",
+		"BUTTON_THREAD_PREV": "Попереднє",
+		"BUTTON_THREAD_NEXT": "Наступне",
+		"BUTTON_THREAD_MORE": "ще листи",
+		"MENU_HEADERS": "Подивитися заголовки",
+		"MENU_VIEW_ORIGINAL": "Подивитися оригінал",
+		"HTML_VIEW": "Переглянути HTML версію",
+		"PLAIN_VIEW": "Переглянути текстову версію",
+		"SWAP_COLORS": "Змінити стандартний (фоновий) колір",
+		"MENU_DOWNLOAD_ORIGINAL": "Завантажити як .eml файл",
+		"MENU_FILTER_SIMILAR": "Фільтрувати схожі",
+		"MENU_PRINT": "Надрукувати",
+		"EMPTY_SUBJECT_TEXT": "(Без теми)",
+		"LABEL_DATE": "Дата",
+		"LABEL_FROM_SHORT": "від",
+		"LABEL_TO_SHORT": "кому",
+		"PRINT_LABEL_ATTACHMENTS": "Файли",
+		"MESSAGE_VIEW_DESC": "Виберіть повідомлення для перегляду.",
+		"MESSAGE_VIEW_MOVE_DESC": "Клікніть на папку на лівій панелі, щоб вибрати місце призначення.",
+		"LINK_DOWNLOAD_AS_ZIP": "Завантажити як zip",
+		"SPAM_SCORE": "Оцінка спаму",
+		"HAS_VIRUS_WARNING": "ПОПЕРЕДЖЕННЯ: виявлено вірус",
+		"TAGS": "Теги",
+		"NEW_TAG": "Новий тег",
+		"ENABLE_TRACKING_LINKS": "Увімкнути відстеження посилань",
+		"TRACKING_ENABLED": "Посилання тепер відстежуються при натисканні!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Важливе",
+		"$todo": "Зробити",
+		"$label1": "Важливе",
+		"$label2": "Робота",
+		"$label3": "Особисте",
+		"$label4": "Зробити",
+		"$label5": "Пізніше"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Сповіщення про прочитання цього повідомлення - %SUBJECT%",
+		"BODY": "Це сповіщення про прочитання для повідомлення, яке ви надіслали в адресу %READ-RECEIPT%.\n\nПримітка: Це сповіщення про прочитання означає лише, що повідомлення було відображено на машину отримувача.\nВоно не гарантує, що отримувач прочитав чи зрозумів зміст повідомлення.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Пошук..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Контакт",
+		"TAB_LOCATIONS": "Розташування",
+		"TAB_BUSINESS": "Організація",
+		"LABEL_ORGANIZATION": "Компанія",
+		"LABEL_DEPARTMENT": "Департамент",
+		"LABEL_TITLE": "Назва",
+		"TAB_CRYPTO": "Шифрування",
+		"ASK": "Запитувати",
+		"NEVER": "Ніколи",
+		"ALWAYS": "Завжди",
+		"ALWAYS_IF_POSSIBLE": "Завжди якщо можливо",
+		"BUTTON_ADD_CONTACT": "Додати контакт",
+		"BUTTON_CREATE_CONTACT": "Зберегти",
+		"BUTTON_IMPORT": "Імпорт (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Експорт (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Експорт (csv)",
+		"ERROR_IMPORT_FILE": "Помилка імпорту (Неправильний формат файлу)",
+		"EMPTY_LIST": "Немає контактів",
+		"EMPTY_SEARCH": "Контакти не знайдено",
+		"CLEAR_SEARCH": "Очистити пошук",
+		"CONTACT_VIEW_DESC": "Виберіть контакт для перегляду.",
+		"LABEL_BIRTHDAY": "День нарождення",
+		"DISPLAY_NAME": "Повне ім'я",
+		"LAST_NAME": "Ім'я",
+		"FIRST_NAME": "Прізвище",
+		"MIDDLE_NAME": "По батькові",
+		"NAME_PREFIX": "Префікс імені",
+		"NAME_SUFFIX": "Суфікс імені",
+		"NICK_NAME": "Нік",
+		"LABEL_READ_ONLY": "Тільки читання",
+		"ADD_MENU_LABEL": "Додати",
+		"ADD_MENU_NICKNAME": "Нік",
+		"ADD_MENU_NOTE": "Примітки",
+		"ADD_MENU_PHONE": "Телефон",
+		"ADD_MENU_URL": "Сайт",
+		"ADD_MENU_ADDRESS": "Адреса",
+		"ADD_MENU_BIRTHDAY": "День народження",
+		"ADD_MENU_TAGS": "Теги",
+		"BUTTON_SHARE_ALL": "Всім",
+		"BUTTON_SYNC": "Синхронизація (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Надіслати на всі контактні email"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "Показати всі поля",
+		"BUTTON_SEND": "Надіслати",
+		"BUTTON_MINIMIZE": "Згорнути",
+		"SAVED_TIME": "Збережено в %TIME%",
+		"SAVED_ERROR_ON_SEND": "Повідомлення було надіслано, але не збережено",
+		"DISCARD_UNSAVED_DATA": "Видалити незбережені дані?",
+		"ATTACH_FILES": "Додати файли",
+		"ATTACH_DROP_FILES_DESC": "Помістити файли сюди",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% написав",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Переслане повідомлення -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Надіслано",
+		"EMPTY_TO_ERROR_DESC": "Вкажіть як мінімум одного отримувача",
+		"NO_ATTACHMENTS_HERE_DESC": "Тут немає вкладень.",
+		"ATTACHMENTS_ERROR_DESC": "УВАГА! Не всі вкладення завантажено.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Ще не всі вкладені файли завантажено",
+		"ALLOW_SPELLCHECK": "Увімкнути перевірку правопису в браузері",
+		"ALLOW_DRAFT_AUTOSAVE": "Автоматично зберігати чернетку",
+		"BUTTON_REQUEST_READ_RECEIPT": "Запит про прочитання листа",
+		"BUTTON_MARK_AS_IMPORTANT": "Позначити як важливе",
+		"BUTTON_REQUEST_DSN": "Запитати звіт про доставку",
+		"BUTTON_REQUIRE_TLS": "Вимагати захищеної доставки",
+		"ERROR_EMPTY_BODY": "Повідомлення порожнє"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Ви впевнені, що бажаєте вийти?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Ви впевнені, що хочете закрити це вікно?",
+		"DESC_WANT_DELETE_MESSAGES": "Ви впевнені, що хочете видалити повідомлення?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Виберіть мову"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Додати ще акаунт",
+		"BUTTON_ADD_ACCOUNT": "Додати",
+		"TITLE_UPDATE_ACCOUNT": "Оновити акаунт"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Додати відправника",
+		"TITLE_UPDATE_IDENTITY": "Оновити відправника",
+		"LABEL": "Внутрішня назва",
+		"BUTTON_ADD_IDENTITY": "Додати",
+		"SIGNATURE": "Підпис",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Вставляти підпис перед цитованим текстом у відповідях"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Створити папку",
+		"LABEL_PARENT": "Батьківська папка",
+		"BUTTON_CREATE": "Створити",
+		"TITLE_CREATING_PROCESS": "Створення папки"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Очистити папку від листів?",
+		"DANGER_DESC_WARNING": "Увага!",
+		"DANGER_DESC_HTML_1": "Ця дія призведе до повного видалення всіх листів з папки <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_2": "Після початку очищення, процес <strong style=\"color:red\">неможливо<\/strong> буде зупинити чи відмінити.",
+		"TITLE_CLEARING_PROCESS": "Очищення папки..."
+	},
+	"CRYPTO": {
+		"SIGN": "Підпис",
+		"ENCRYPT": "Шифрування",
+		"DECRYPT": "Дешифрувати",
+		"VERIFY": "Перевірити",
+		"GOOD_SIGNATURE": "Підтверджена сигнатура для %USER%",
+		"ERROR": "%TYPE% помилка: %ERROR%",
+		"CREATE_SELF_SIGNED": "Створити самопідписаний",
+		"VALID_UNTIL": "Дійсний до",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Змінити пароль",
+		"CURRENT_PASS": "Поточна пароль",
+		"NEW_PASS": "Новий пароль",
+		"ASK_CRYPTKEY_PASS": "Ваш пароль змінено. Щоб розшифрувати дані, введіть старий пароль"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Імпорт OpenPGP ключа",
+		"POPUP_IMPORT_BUTTON": "Імпорт",
+		"POPUP_VIEW_TITLE": "Перегляд OpenPGP ключа",
+		"POPUP_VIEW_BUTTON": "Вибрати",
+		"POPUP_GENERATE_TITLE": "Генерація OpenPGP ключа",
+		"POPUP_GENERATE_BUTTON": "Створити",
+		"LABEL_KEY_TYPE": "Type",
+		"SIGNED_MESSAGE": "OpenPGP підписане повідомлення",
+		"ENCRYPTED_MESSAGE": "OpenPGP шифроване повідомлення",
+		"STORE_IN_GNUPG": "Зберігати на сервері в GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Зберігайте public key на сервері в GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Зберігайте private key на сервері в GnuPG",
+		"BACKUP_ON_SERVER": "Зберігати (зашифроване) на сервері",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Бекап public key на сервері",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Бекап private key на сервері"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Імпорт S\/MIME сертифікат",
+		"CERTIFICATE": "Сертифікат",
+		"CERTIFICATES": "S\/MIME Сертифікати",
+		"SIGNED_MESSAGE": "S\/MIME підписане повідомлення",
+		"ENCRYPTED_MESSAGE": "S\/MIME шифроване повідомлення",
+		"PRIVATE_KEY_OF": "S\/MIME private key з %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Створити фільтер",
+		"TITLE_EDIT_FILTER": "Оновити фільтер",
+		"LEGEND_CONDITIONS": "Умови",
+		"LEGEND_ACTIONS": "Дії",
+		"BUTTON_ADD_CONDITION": "Додати умову",
+		"SELECT_ACTION_MOVE_TO": "Перемістити в",
+		"SELECT_ACTION_FORWARD_TO": "Переслати до",
+		"SELECT_ACTION_REJECT": "Відклонити",
+		"SELECT_ACTION_VACATION_MESSAGE": "Повідомлення про відпустку",
+		"SELECT_ACTION_DISCARD": "Відклонити",
+		"SELECT_FIELD_RECIPIENTS": "Отримувачі (To or CC)",
+		"SELECT_FIELD_HEADER": "Заголовок",
+		"SELECT_FIELD_BODY": "Тіло",
+		"SELECT_FIELD_SIZE": "Розмір",
+		"SELECT_TYPE_CONTAINS": "Містить",
+		"SELECT_TYPE_NOT_CONTAINS": "Не містить",
+		"SELECT_TYPE_MATCHES": "Збіги (* та ? підтримуються)",
+		"SELECT_TYPE_NOT_MATCHES": "Заперечення збігів (* та ? підтримуються)",
+		"SELECT_TYPE_REGEXP": "Регулярний вираз",
+		"SELECT_TYPE_NOT_REGEXP": "Не регулярний вираз",
+		"SELECT_TYPE_EQUAL_TO": "Дорівнює",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Не дорівнює",
+		"SELECT_TYPE_OVER": "Більше",
+		"SELECT_TYPE_UNDER": "Менше",
+		"SELECT_TYPE_TEXT": "Текст",
+		"SELECT_TYPE_RAW": "Raw",
+		"SELECT_MATCH_ANY": "Відповідає будь-якому з наступних правил",
+		"SELECT_MATCH_ALL": "Відповідає усім наступним правилам",
+		"MARK_AS_READ_LABEL": "Позначити як прочитане",
+		"REPLY_INTERVAL_LABEL": "Інтервал відповідей (днів)",
+		"KEEP_LABEL": "Тримати",
+		"STOP_LABEL": "Зупинити подальшу обробку правил",
+		"VACATION_SUBJECT_LABEL": "Тема (не обов'язково)",
+		"VACATION_MESSAGE_LABEL": "Повідомлення",
+		"VACATION_RECIPIENTS_LABEL": "Отримувачі (розділяти комами)",
+		"REJECT_MESSAGE_LABEL": "Відклонити повідомлення",
+		"ALL_INCOMING_MESSAGES_DESC": "Всі повідомлення, що надійшли"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Створити скрипт",
+		"TITLE_EDIT": "Редагувати скрипт",
+		"BUTTON_ADD_FILTER": "Додати фільтр",
+		"BUTTON_RAW_SCRIPT": "Використати користувацький скрипт",
+		"CAPABILITY_LABEL": "Можливості",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Ці зміни потрібно зберегти на сервері."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Виберіть системні папки",
+		"SELECT_CHOOSE_ONE": "Ще не вибрано",
+		"SELECT_UNUSE_NAME": "Не використовувати",
+		"NOTIFICATION_SENT": "Ви ще не обрали системну папку \"Вихідні\", в яку складаються всі повідомлення післе надсилання.\nЯкщо ви не хочете зберігати вихідні листи, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_DRAFTS": "Ви ще не обрали системну папку \"Чернетки\", в яку складаються всі збережені повідомлення.",
+		"NOTIFICATION_SPAM": "Ви ще не обрали системну папку \"Спам\", в яку складаються всі спам повідомлення.\nЯкщо ви хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_TRASH": "Ви ще не обрали системну папку \"Кошик\", в яку складаються всі повідомлення після видалення.\nЯкщо ви хочете видаляти листи одразу, будь ласка, виберіть пункт \"Не використовувати\".\n",
+		"NOTIFICATION_ARCHIVE": "Ви ще не обрали системну папку \"Архів\", в яку складаються всі повідомлення після архівації."
+	},
+	"TITLES": {
+		"MAILBOX": "Пошта",
+		"SETTINGS": "Налаштування"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Файл не завантажився повністю",
+		"ERROR_NO_FILE_UPLOADED": "Файл не було завантажено",
+		"ERROR_MISSING_TEMP_FOLDER": "Помилка при збереженні файлу",
+		"ERROR_ON_SAVING_FILE": "Помилка при збереженні файлу",
+		"ERROR_FILE_TYPE": "Неправильний тип файлу",
+		"ERROR_UNKNOWN": "Помилка завантаження файлу"
+	},
+	"EDITOR": {
+		"PLAIN": "HTML <-> ТЕКСТ",
+		"SOURCE": "HTML <-> ДЖЕРЕЛО",
+		"FONTFAMILY": "Сімейство шрифтів",
+		"FONTSIZE": "Розмір шрифту",
+		"DIR": "Напрямок тексту",
+		"DIR_LTR": "Зліва направо",
+		"DIR_RTL": "Справа наліво",
+		"DIR_AUTO": "Автоматично",
+		"TEXTCOLOR": "Колір тексту",
+		"BACKGROUNDCOLOR": "Колір фону",
+		"BOLD": "Жирний",
+		"ITALIC": "Курсив",
+		"UNDERLINE": "Підкреслений",
+		"STRIKE": "Закреслений",
+		"SUB": "Нижній індекс",
+		"SUP": "Верхній індекс",
+		"OL": "Нумерований список",
+		"UL": "Маркований список",
+		"QUOTE": "Блок цитати",
+		"INDENTDECREASE": "Зменшити відступ",
+		"INDENTINCREASE": "Збільшити відступ",
+		"LINK": "Посилання",
+		"IMAGEURL": "URL зображення",
+		"IMAGEUPLOAD": "Вибір зображення",
+		"UNDO": "Скасувати",
+		"REDO": "Повторити",
+		"REMOVESTYLE": "Видалити стиль"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Основні",
+		"CONTACTS": "Контакти",
+		"FOLDERS": "Папки",
+		"ACCOUNTS": "Акаунти",
+		"FILTERS": "Фільтри",
+		"SECURITY": "Безпека",
+		"THEMES": "Теми"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Прості",
+		"ADVANCED": "Розширені",
+		"BUTTON_ADD_SCRIPT": "Додати скрипт",
+		"SUBNAME_MOVE_TO": "Перемістити до \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Переслати на \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Відхилити",
+		"SUBNAME_VACATION_MESSAGE": "Повідомлення автовідповідача",
+		"SUBNAME_DISCARD": "Знищити"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "Безпека",
+		"LABEL_AUTOLOGOUT": "Автовихід",
+		"FORGET_KEY_PASS": "Забувати пароль private key",
+		"NEVER": "Ніколи"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Мова",
+		"HOUR_FORMAT": "Формат часу",
+		"IDENTITY": "Акаунт",
+		"LAYOUT": "Макет",
+		"LAYOUT_NO_SPLIT": "Список листів",
+		"LAYOUT_VERTICAL_SPLIT": "Список з вертикальним переглядом",
+		"LAYOUT_HORIZONTAL_SPLIT": "Список з горизонтальним переглядом",
+		"SHOW_NEXT_MESSAGE": "Перейти до наступного повідомлення після видалення\/переміщення поточного",
+		"EDITOR": "Редактор тексту за змовчуванням",
+		"EDITOR_HTML": "Форматований",
+		"EDITOR_PLAIN": "Простий",
+		"VIEW_OPTIONS": "Відображення",
+		"USE_PREVIEW_PANE": "Використовувати трьохколонний режим відображення",
+		"HIDE_DELETED_MESSAGES": "Приховати повідомлення, позначені для видалення",
+		"USE_CHECKBOXES_IN_LIST": "Показувати чекбокси у списках",
+		"USE_THREADS": "Згортати листи у листуваннях",
+		"THREAD_ALGORITHM": "У вигляді розмови",
+		"REPLY_SAME_FOLDER": "Поміщати відповіді в ту ж папку, де знаходиться оригінал",
+		"PREFER_HTML": "Перважати HTML над звичайним текстом",
+		"PREFER_HTML_INFO": "Повідомлення іноді надходять в обох форматах. Цей параметр визначає, чи ви хочете, щоб відображалася HTML-частина чи звичайний текст.",
+		"REMOVE_COLORS": "Видалити кольори фону та тексту з тіла повідомлення",
+		"ALLOW_STYLES": "Дозволити <style> CSS",
+		"MESSAGE_PER_PAGE": "Повідомлень на одній сторінці",
+		"CHECK_MAIL_INTERVAL": "Інтервал перевірки повідомлень",
+		"MARK_MESSAGE_READ_AFTER": "Позначити повідомлення як прочитане після",
+		"MSG_DEFAULT_ACTION": "Дія за замовчуванням",
+		"SECONDS": "секунд",
+		"MINUTES": "хвилин",
+		"NOTIFICATIONS": "Сповіщення",
+		"SOUND_NOTIFICATION": "Звукове сповіщення",
+		"CHROME_NOTIFICATION_DESC": "Показувати сповіщення про нові повідомлення у підказках",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Заблоковано браузером)",
+		"COLLAPSE_BLOCKQUOTES": "Згорнути цитований текст",
+		"MAX_QUOTE_LEVEL": "Максимальний видимий рівень цитованого тексту",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Показати вбудовані вкладення у списку",
+		"LIST_SIMPLE_ATTACHMENTS": "Простий список вкладень",
+		"LIST_MESSAGES_GROUPED": "Показувати повідомлення групами (якщо сортування за датою або відправником)",
+		"EXTERNAL_IMAGES": "Зовнішні зображення",
+		"IMAGES_OPTION_ASK": "Завжди запитувати",
+		"IMAGES_OPTION_WHITELIST": "Білий список чи запитувати",
+		"IMAGES_OPTION_ALWAYS": "Завжди показувати",
+		"IMAGES_WHITELIST": "Білий список зображень",
+		"MESSAGE_POPUP_WINDOW": "Popup в новому вікні замісь нової вкладки",
+		"MAILTO": "Зареєструвати як обробник посилань типу 'mailto:'",
+		"HTML_TO_MD": "Перетворити HTML на MD (Markdown) замість простого тексту"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Автоматично додавати отримувачів у адресну книгу",
+		"LEGEND_CONTACTS_SYNC": "Синхронізація (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Увімкнути синхронизацію",
+		"LABEL_CONTACTS_SYNC_SERVER": "Сервер",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Адресна книга (URL)",
+		"LABEL_CONTACTS_SYNC_USER": "Користувач",
+		"SYNC_READ": "Тільки для читання"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Теми Оформлення",
+		"LABEL_BACKGROUND": "Зображення на фоні",
+		"LABEL_FONTS": "Шрифти",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Завантажити фонове зображення (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Файл надто великий",
+		"ERROR_FILE_TYPE_ERROR": "Невірний тип файлу (тільки JPG и PNG)",
+		"ERROR_UNKNOWN": "Помилка завантаження файлу"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Список Папок",
+		"BUTTON_CREATE": "Створити папку",
+		"BUTTON_SYSTEM": "Системні папки",
+		"BUTTON_SUBSCRIBE": "Підписатися",
+		"BUTTON_UNSUBSCRIBE": "Відписатися",
+		"LOADING_PROCESS": "Оновлення списку папок",
+		"CREATING_PROCESS": "Створення папки",
+		"DELETING_PROCESS": "Видалення папки",
+		"RENAMING_PROCESS": "Перейменування папки",
+		"TO_MANY_FOLDERS_DESC_1": "У вас занадто багато папок!",
+		"TO_MANY_FOLDERS_DESC_2": "Ми показали лише частину з них, щоб уникнути проблем з продуктивністю.",
+		"HELP_DELETE_FOLDER": "Видалити папку",
+		"HELP_SHOW_HIDE_FOLDER": "Відобразити\/приховати папку",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Перевірте наявність нових повідомлень",
+		"HIDE_UNSUBSCRIBED": "Приховати папки, на які не підписано",
+		"UNHIDE_KOLAB_FOLDERS": "Показати папки Kolab",
+		"TYPE_CALENDAR": "Календар",
+		"TYPE_CONFIGURATION": "Конфігурація",
+		"TYPE_CONTACTS": "Контакти",
+		"TYPE_FILES": "Файли",
+		"TYPE_JOURNAL": "Журнал",
+		"TYPE_NOTES": "Нотатки",
+		"TYPE_TASKS": "Завдання"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Список акаунтів",
+		"LEGEND_IDENTITIES": "Список відправників",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Акаунти та відправники",
+		"BUTTON_ADD_ACCOUNT": "Додати ще акаунт",
+		"BUTTON_ADD_IDENTITY": "Додати відправника",
+		"LOADING_PROCESS": "Оновлення списку акаунтів",
+		"SHOW_UNREAD": "Показати кількість непрочитаних повідомлень"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Імпортувати ключ",
+		"BUTTON_GENERATE_KEY_PAIR": "Новий ключ",
+		"IMPORT_FROM_SERVER": "Імпортувати з сервера",
+		"TITLE_PRIVATE": "Приватний",
+		"TITLE_PUBLIC": "Публічний",
+		"GET_MAILVELOPE": "Отримати Mailvelope розширення для браузера."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Сполучення клавіш",
+		"TAB_MAILBOX": "Пошта",
+		"TAB_MESSAGE_LIST": "Список повідомлень",
+		"TAB_MESSAGE_VIEW": "Перегляд повідомлень",
+		"TAB_COMPOSE": "Написанні повідомлення",
+		"LABEL_OPEN_USER_DROPDOWN": "Відкрити випадаючий список користувача",
+		"LABEL_REPLY": "Відповісти",
+		"LABEL_REPLY_ALL": "Відповісти всім",
+		"LABEL_FORWARD": "Переслати",
+		"LABEL_FORWARD_MULTIPLY": "Переслати всі вибрані повідомлення",
+		"LABEL_CHECK_ALL": "Вибрати всі повідомлення",
+		"LABEL_DELETE": "Видалити",
+		"LABEL_OPEN_THREAD": "Відкрити відмічене листування",
+		"LABEL_MOVE": "Перемістити",
+		"LABEL_READ": "Відмітити вибрані листи прочитаними",
+		"LABEL_UNREAD": "Відмітити вибрані листи непрочитаними",
+		"LABEL_IMPORTANT": "Відпітити вибрані листи як важливі",
+		"LABEL_CANCEL_SEARCH": "Відмінити пошук",
+		"LABEL_FULLSCREEN_ENTER": "Повноекранний режим",
+		"LABEL_VIEW_MESSAGE_ENTER": "Перегляд повідомлення",
+		"LABEL_SWITCH_TO_MESSAGE": "Переключити фокус на вибране повідомлення",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Переключити фокус на список папок",
+		"LABEL_FULLSCREEN_TOGGLE": "Переключити повноекранний режим",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Перемикання видимості цитат у листі",
+		"LABEL_THREAD_NEXT": "Наступний лист у листуванні",
+		"LABEL_THREAD_PREV": "Попередній лист у листуванні",
+		"LABEL_EXIT_FULLSCREEN": "Вийти з повноекранного режиму",
+		"LABEL_CLOSE_MESSAGE": "Закрити повідомлення",
+		"LABEL_SWITCH_TO_LIST": "Переключити фокус на список листів",
+		"LABEL_OPEN_COMPOSE_POPUP": "Написати листа",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Згорнути вікно",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Вибрати відправника",
+		"LABEL_SAVE_MESSAGE": "Зберегти повідомлення",
+		"LABEL_SEND_MESSAGE": "Надіслати повідомлення",
+		"LABEL_CLOSE_COMPOSE": "Закрити повідомлення"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Запит не вдалий",
+		"RequestAborted": "Запит скасовано",
+		"RequestTimeout": "Час очікування запиту минув",
+		"InvalidToken": "Невірний токен запиту",
+		"AuthError": "Не вдалося авторизуватися",
+		"ConnectionError": "Помилка з'єднання з сервером.",
+		"DomainAlreadyExists": "Домен вже існує",
+		"DomainNotAllowed": "Цей домен заборонений",
+		"AccountNotAllowed": "Цей акаунт заборонений",
+		"CryptKeyError": "Ваш пароль був змінений",
+		"ContactsSyncError": "Помилка синхронізації контактів",
+		"CantGetMessageList": "Не можу отримати список листів",
+		"CantGetMessage": "Не можу отримати листа",
+		"CantDeleteMessage": "Не можу видалити листа",
+		"CantCopyMessage": "Не можу скопіювати повідомлення",
+		"CantMoveMessage": "Не можу перемістити листа",
+		"CantSaveMessage": "Не можу зберегти листа",
+		"CantSendMessage": "Не можу відправити листа",
+		"InvalidRecipients": "Перевірити правильність вводу всіх адрес.",
+		"CantSaveFilters": "Не можу зберегти фільтри",
+		"CantGetFilters": "Не можу отримати фільтри",
+		"CantActivateFiltersScript": "Не можу активувати скрипт фільру",
+		"CantDeleteFiltersScript": "Не можу видалити скрипт фільтру",
+		"FiltersAreNotCorrect": "Фільтри неправильні",
+		"CantCreateFolder": "Не можу створити папку",
+		"CantRenameFolder": "Не можу перейменувати папку",
+		"CantDeleteFolder": "Не можу видалити папку",
+		"CantDeleteNonEmptyFolder": "Не можу видалити не порожню папку",
+		"CantSubscribeFolder": "Не можу підписати папку",
+		"CantUnsubscribeFolder": "Не можу відписати папку",
+		"DemoSendMessageError": "Демо акаунту надсилання листів на зовнішні поштові адреси заборонена!",
+		"DemoAccountError": "З міркувань безпеки цей обліковий запис заборонено для цієї дії!",
+		"AccountAlreadyExists": "акаунт вже додано",
+		"AccountDoesNotExist": "Акаунт не існує",
+		"AccountSwitchFailed": "Перемикання на акаунт \"%EMAIL%\" не вдало",
+		"MailServerError": "Помилка доступу до поштового серверу",
+		"InvalidInputArgument": "Неправильний параметр",
+		"UnknownError": "Невідома помилка"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/vi/admin.json b/snappymail/v/0.0.0/app/localization/vi/admin.json
new file mode 100644
index 000000000..d5bdeb839
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/vi/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "Thêm vào",
+		"CLOSE": "Đóng",
+		"SAVE": "Lưu",
+		"TEST": "Thử",
+		"UPDATE": "Cập nhật",
+		"USERNAME": "Tên tài khoản",
+		"PASSWORD": "Mật khẩu",
+		"CANCEL": "Hủy",
+		"SEARCH": "Tìm kiếm",
+		"YES": "Ok",
+		"NO": "Không"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Đăng nhập",
+		"LABEL_TOTP": "Mã TOTP",
+		"BUTTON_LOGIN": "Đăng nhập vào bảng quản trị"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "Bảng quản trị"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "Tổng quan",
+		"LOGIN": "Đăng nhập",
+		"BRANDING": "Thương hiệu",
+		"CONTACTS": "Danh bạ",
+		"DOMAINS": "Tên miền",
+		"SECURITY": "An ninh",
+		"PACKAGES": "Tiện ích mở rộng",
+		"CONFIG": "Thiết lập",
+		"ABOUT": "Giới thiệu"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "Giao diện",
+		"LABEL_LANGUAGE": "Ngôn ngữ",
+		"LABEL_LANGUAGE_ADMIN": "Ngôn ngữ (admin)",
+		"LABEL_THEME": "Phông nền",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "Cho phép lựa chọn ngôn ngữ trên màn hình cài đặt",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "Cho phép lựa chọn phông nền trên màn hình cài đặt",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "Cho phép lựa chọn hình nền trên màn hình cài đặt ",
+		"LABEL_SHOW_THUMBNAILS": "Hiển thị ảnh thu gọn (trong phần đính kèm)",
+		"LEGEND_MAIN": "Phần chính",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "Giới hạn dung lượng đính kèm",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "Cho phép đăng nhập nhiều tài khoản",
+		"LABEL_ALLOW_IDENTITIES": "Cho phép sử dụng nhiều tên gọi",
+		"ALERT_DATA_ACCESS": "Thư mục dữ liệu hiện có thể truy cập. Xin hãy thiết lập máy chủ web của bạn để bảo vệ thư mục dữ liệu khỏi sự truy cập từ bên ngoài. Bạn có thể đọc thêm ở đây:",
+		"ALERT_WARNING": "Cảnh báo!",
+		"HTML_ALERT_WEAK_PASSWORD": "Bạn đang sử dụng mật khẩu admin cài sẵn.\n<br>\nVì lý do an ninh xin hãy \n<strong><a href=\"#\/security\">đổi<\/a><\/strong>\nmật khẩu khác ngay bây giờ.\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "Màn hình đăng nhập",
+		"LABEL_DEFAULT_DOMAIN": "Tên miền mặc định",
+		"LABEL_DETERMINE_USER_DOMAIN": "Hãy cài đặt tên miền người dùng",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "Cho phép lựa chọn ngôn ngữ trên màn hình đăng nhập",
+		"LABEL_DETERMINE_USER_LANGUAGE": "Hãy cài đặt ngôn ngữ người dùng"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Thương hiệu",
+		"LABEL_PAGE_TITLE": "Tiêu đề trang",
+		"LABEL_LOADING_DESCRIPTION": "Đang tải mô tả",
+		"LABEL_FAVICON_URL": "Hình favicon"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "Danh bạ",
+		"LEGEND_STORAGE": "Lưu trữ (PDO)",
+		"LABEL_ENABLE_CONTACTS": "Bật danh bạ",
+		"LABEL_ALLOW_SYNC": "Cho phép đồng bộ hóa danh bạ (với máy chủ CardDAV ngoài)",
+		"LABEL_STORAGE_TYPE": "Loại lưu trữ",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "Người dùng",
+		"LABEL_STORAGE_PASSWORD": "Mật khẩu",
+		"SQLITE_GLOBAL": "Use a global DB instead of per account",
+		"ALERT_NOTICE": "Chú ý!",
+		"SUGGESTIONS_LIMIT": "Suggestions limit",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "Đừng nên sử dụng loại cơ sở dữ liệu này với lượng lớn người dùng mail đang hoạt động.",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "Hệ thống của bạn không hỗ trợ chế độ danh bạ.\n<br>\nBạn cần cài đặt hoặc bật lên tiện ích mở rộng <strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> trên máy chủ của bạn.\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "Tên miền",
+		"BUTTON_ADD_DOMAIN": "Thêm tên miền",
+		"BUTTON_ADD_ALIAS": "Thêm biệt danh khác",
+		"DELETE_ARE_YOU_SURE": "Bạn chắc chắn chứ?",
+		"HTML_DOMAINS_HELPER": "Danh sách những tên miền webmail được phép truy cập.\n<br>\nHãy nhấp vào tên để thiết lập tên miền.\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "An ninh",
+		"LABEL_USE_IMAGE_PROXY": "Sử dụng proxy tại máy chủ cho những hình ảnh tải ngoài về",
+		"LABEL_AUTO_VERIFY": "Verify signatures automatically",
+		"LABEL_SHOW_PHP_INFO": "Hiển thị thông tin PHP",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "Thông tin truy cập bảng quản trị",
+		"LABEL_CURRENT_PASSWORD": "Mật khẩu hiện tại",
+		"LABEL_NEW_PASSWORD": "Mật khẩu mới",
+		"LABEL_REPEAT_PASSWORD": "Lập lại mật khẩu",
+		"LABEL_REQUIRE_VERIFICATION": "Yêu cầu xác minh chứng chỉ SSL được dùng",
+		"CRYPTO": "Crypto",
+		"LABEL_ALLOW_SELF_SIGNED": "Cho phép chứng chỉ tự ký"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "Bật tiện ích mở rộng",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "Có cập nhật mới",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "Có sẵn để cài đặt",
+		"LEGEND_INSTALLED_PACKAGES": "Tiện ích mở rộng đã cài đặt",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "Không thể truy cập vào thư mục hiện giờ."
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "Giới thiệu",
+		"LABEL_TAG_HINT": "Trình duyệt mail trên web đơn giản, hiện đại & nhanh chóng",
+		"LABEL_ALL_RIGHTS_RESERVED": "Toàn Quyền Được Bảo Lưu",
+		"HINT_READ_CHANGE_LOG": "Xin xem nhật ký về những thay đổi trước khi cập nhật.",
+		"HINT_IS_UP_TO_DATE": "SnappyMail đã cập nhật phiên bản mới nhất.",
+		"HTML_NEW_VERSION": "Đã có phiên bản <b>%VERSION%<\/b> mới.",
+		"LABEL_UPDATING": "Đang cập nhật",
+		"LABEL_CHECKING": "Đang kiểm tra bản cập nhật mới",
+		"BUTTON_RELEASES": "Những phiên bản trước đã phát hành"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "Thêm biệt danh khác",
+		"LABEL_ALIAS": "Biệt danh",
+		"LABEL_DOMAIN": "Tên miền"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "Thêm tên miền",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "Thêm tên miền \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "Chỉnh sửa tên miền \"%NAME%\"",
+		"LABEL_NAME": "Tên",
+		"NAME_HELPER": "Có hỗ trợ wildcard",
+		"LABEL_SERVER": "Máy chủ",
+		"LABEL_PORT": "Cổng",
+		"LABEL_SECURE": "An ninh",
+		"TIMEOUT": "Timeout",
+		"DISABLE_CAPABILITIES": "Disable capabilities",
+		"LIMITS": "Limits",
+		"FOLDERS": "Folders",
+		"MESSAGES": "Messages",
+		"SECURE_OPTION_NONE": "Không có",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "Cho phép script của sieve",
+		"LABEL_USE_SHORT_LOGIN": "Dùng đăng nhập ngắn",
+		"LABEL_LOWERCASE_LOGIN": "Lowercase login (case-insensitive)",
+		"LABEL_USE_AUTH": "Dùng xác minh",
+		"LABEL_SET_SENDER": "Dùng tên đăng nhập là email người dùng",
+		"LABEL_AUTH_PLAIN_LINE": "Force single command AUTH PLAIN login",
+		"LABEL_USE_PHP_MAIL": "Dùng phương trình php mail()",
+		"BUTTON_WHITE_LIST": "Danh sách trắng",
+		"NEW_DOMAIN_DESC": "Thiết lập tên miền cho phép bạn thao tác với với địa chỉ email của <strong>%NAME%<\/strong>.",
+		"WHITE_LIST_ALERT": "Danh sách những người dùng tên miền mà webmail được quyền truy cập.\nSử dụng dấu cách làm dấu phân cách mỗi tên.\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "Tiện ích mở rộng",
+		"DESC_NOTHING_TO_CONFIGURE": "Không có gì để thiết lập"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Bạn có chắc chắn muốn đóng cửa sổ này?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Chọn ngôn ngữ"
+	},
+	"HINTS": {
+		"BETA": "đang thử nghiệm",
+		"WARNING": "Cảnh báo!"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "Tên miền đã tồn tại",
+		"UNKNOWN_ERROR": "Lỗi chưa xác định"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Token không hợp lệ",
+		"AuthError": "Xác minh thất bại",
+		"DomainAlreadyExists": "Tên miền đã tồn tại",
+		"CantSavePluginSettings": "Không thể lưu cài đặt",
+		"CantInstallPackage": "Không thể cài đặt tiện ích mở rộng",
+		"CantDeletePackage": "Không thể xóa bỏ tiện ích mở rộng",
+		"InvalidPluginPackage": "Gói tiện ích mở rộng không đúng",
+		"UnsupportedPluginPackage": "Gói tiện ích mở rộng chưa được hỗ trợ",
+		"UnknownError": "Lỗi chưa xác định"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/vi/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/vi/relativetimeformat.js
new file mode 100644
index 000000000..200450bd6
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/vi/relativetimeformat.js
@@ -0,0 +1,76 @@
+{
+	long: {
+		year: {
+			past: {
+				one: "{0} năm trước",
+				other: "{0} năm trước"
+			},
+			future: {
+				one: "trong {0} năm",
+				other: "trong {0} năm"
+			}
+		},
+		month: {
+			past: {
+				one: "{0} tháng trước",
+				other: "{0} tháng trước"
+			},
+			future: {
+				one: "trong {0} tháng",
+				other: "trong {0} tháng"
+			}
+		},
+		week: {
+			past: {
+				one: "{0} tuần trước",
+				other: "{0} tuần trước"
+			},
+			future: {
+				one: "trong {0} tuần",
+				other: "trong {0} tuần"
+			}
+		},
+		day: {
+			past: {
+				one: "{0} ngày trước",
+				other: "{0} ngày trước"
+			},
+			future: {
+				one: "trong {0} ngày",
+				other: "trong {0} ngày"
+			}
+		},
+		hour: {
+			past: {
+				one: "{0} tiếng trước",
+				other: "{0} tiếng trước"
+			},
+			future: {
+				one: "trong {0} tiếng",
+				other: "trong {0} tiếng"
+			}
+		},
+		minute: {
+			past: {
+				one: "{0} phút trước",
+				other: "{0} phút trước"
+			},
+			future: {
+				one: "trong {0} phút",
+				other: "trong {0} phút"
+			}
+		},
+		second: {
+			past: {
+				one: "{0} giây trước",
+				other: "{0} giây trước"
+			},
+			future: {
+				one: "trong {0} giây",
+				other: "trong {0} giây"
+			}
+		}
+	},
+	/* 'zero', 'one', 'two', 'few', 'many', 'other' */
+	plural: n => 1 == n ? 'one' : 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/vi/static.json b/snappymail/v/0.0.0/app/localization/vi/static.json
new file mode 100644
index 000000000..7df150469
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/vi/static.json
@@ -0,0 +1,9 @@
+{
+	"BACK_LINK": "Tải lại",
+	"NO_SCRIPT_TITLE": "Chế độ hỗ trợ JavaScript cần được bật cho ứng dụng này.",
+	"NO_SCRIPT_DESC": "Trình duyệt của bạn đang không hỗ trợ JavaScript.\nXin hãy bật chế độ hỗ trợ JavaScript trong cài đặt trình duyệt của bạn và thử lại.\n",
+	"NO_COOKIE_TITLE": "Chức năng hỗ trợ cookie cần được bật cho ứng dụng này.",
+	"NO_COOKIE_DESC": "Trình duyệt của bạn đang không hỗ trợ cookie.\nXin hãy bật chế độ hỗ trợ cookie trong cài đặt trình duyệt của bạn và thử lại.\n",
+	"BAD_BROWSER_TITLE": "Trình duyệt của bạn đã quá cũ và hiện không còn được hỗ trợ.",
+	"BAD_BROWSER_DESC": "Để sử dụng tất cả những tính năng cho ứng dụng này,\nhãy tải và cài đặt một trong những trình duyệt sau:\n"
+}
diff --git a/snappymail/v/0.0.0/app/localization/vi/user.json b/snappymail/v/0.0.0/app/localization/vi/user.json
new file mode 100644
index 000000000..4454aa542
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/vi/user.json
@@ -0,0 +1,648 @@
+{
+	"LANG_DIR": "ltr",
+	"GLOBAL": {
+		"TO_ARCHIVE": "Cho vào kho lưu trữ",
+		"ARE_YOU_SURE": "Bạn chắc chắn chứ?",
+		"BACK": "Trở về",
+		"BCC": "Bcc",
+		"CANCEL": "Hủy",
+		"CC": "Cc",
+		"CLEAR": "Xóa",
+		"CLOSE": "Đóng",
+		"CONTACTS": "Danh bạ",
+		"DELETE": "Xóa",
+		"UNDELETE": "Undelete",
+		"DONE": "Đã xong",
+		"EMAIL": "Email",
+		"FROM": "Đến từ",
+		"LOADING": "Đang tải",
+		"LOGOUT": "Đăng xuất",
+		"MORE": "More",
+		"MOVE_TO": "Chuyển đến",
+		"COPY_TO": "Sao chép vào",
+		"NAME": "Tên gọi",
+		"NONE": "Trống",
+		"TO_SPAM": "Move message(s) to Spam",
+		"NOT_SPAM": "Không phải thư rác",
+		"USERNAME": "Tên tài khoản",
+		"PASSWORD": "Mật khẩu",
+		"REMEMBER": "Remember",
+		"REPLY_TO": "Nhận thư phản hồi về",
+		"SAVE": "Lưu",
+		"SAVE_CHANGES": "Save changes?",
+		"SEARCH": "Tìm kiếm",
+		"SPAM": "Thư rác",
+		"SUBJECT": "Tiêu đề",
+		"TEST": "Thử nghiệm",
+		"TO": "Gửi đến",
+		"SERVER_MESSAGE": "Tin nhắn từ máy chủ",
+		"YES": "Ok",
+		"NO": "Không",
+		"INACTIVE": "Inactive",
+		"DEFAULT": "mặc định",
+		"HELP": "Hỗ trợ",
+		"TEXT": "Nội dung trong mail",
+		"ATTACHMENTS": "Phần đính kèm"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "Đăng nhập",
+		"LABEL_SIGN_ME": "Nhớ tên tôi",
+		"BUTTON_SIGN_IN": "Đăng nhập"
+	},
+	"TOP_TOOLBAR": {
+		"BUTTON_ADD_ACCOUNT": "Thêm tài khoản"
+	},
+	"SEARCH": {
+		"TITLE_ADV": "Tìm kiếm nâng cao",
+		"TEXT": "Nội dung trong mail",
+		"HAS_ATTACHMENT": "Có đính kèm",
+		"FLAGGED": "Được đánh dấu sao",
+		"UNSEEN": "Chưa được xem",
+		"DATE": "Ngày",
+		"DATE_ALL": "Tất cả",
+		"BEFORE_3_DAYS": "Older then 3 days",
+		"BEFORE_7_DAYS": "Older then 1 week",
+		"BEFORE_MONTH": "Older then 1 month",
+		"BEFORE_3_MONTHS": "Older then 3 months",
+		"BEFORE_6_MONTHS": "Older then 6 months",
+		"BEFORE_YEAR": "Older then 1 year",
+		"SINCE_3_DAYS": "Khoảng 3 ngày trước",
+		"SINCE_7_DAYS": "Khoảng 1 tuần trước",
+		"SINCE_MONTH": "Khoảng 1 tháng trước",
+		"SINCE_3_MONTHS": "Khoảng 3 tháng trước",
+		"SINCE_6_MONTHS": "Khoảng 6 tháng trước",
+		"SINCE_YEAR": "Khoảng 1 năm trước",
+		"SUBFOLDERS": "Thư mục con",
+		"SUBFOLDERS_NONE": "Trống",
+		"SUBFOLDERS_SUBTREE": "Tất cả",
+		"SUBFOLDERS_SUBTREE_ONE": "Một cấp độ",
+		"REPLIED": "Đã trả lời",
+		"KEYWORD": "Tag"
+	},
+	"FOLDER_LIST": {
+		"BUTTON_COMPOSE": "Viết thư",
+		"BUTTON_NEW_MESSAGE": "Viết thư mới",
+		"INBOX_NAME": "Hộp thư",
+		"SENT_NAME": "Thư đã gửi",
+		"DRAFTS_NAME": "Thư nháp",
+		"TRASH_NAME": "Thùng rác",
+		"ARCHIVE_NAME": "Kho lưu trữ"
+	},
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
+	},
+	"MESSAGE_LIST": {
+		"BUTTON_RELOAD": "Tải lại danh sách thư",
+		"BUTTON_EMPTY_FOLDER": "Xóa trống thư mục",
+		"BUTTON_MULTY_FORWARD": "Chuyển tiếp dưới dạng đính kèm",
+		"BUTTON_DELETE_WITHOUT_MOVE": "Xóa vĩnh viễn",
+		"MENU_SET_SEEN": "Đánh dấu đã đọc",
+		"MENU_SET_ALL_SEEN": "Đánh dấu tất cả đã đọc",
+		"MENU_UNSET_SEEN": "Đánh dấu chưa đọc",
+		"MENU_SET_FLAG": "Đánh dấu sao",
+		"MENU_UNSET_FLAG": "Bỏ đánh dấu sao",
+		"MENU_SELECT_ALL": "Tất cả",
+		"MENU_SELECT_INVERT": "Đảo ngược lại thao tác",
+		"MENU_SELECT_UNSEEN": "Chưa đọc",
+		"MENU_SELECT_SEEN": "Đã đọc",
+		"MENU_SELECT_FLAGGED": "Được đánh dấu sao",
+		"MENU_SELECT_UNFLAGGED": "Không được đánh dấu sao",
+		"DOWNLOAD_ALL_ATTACHMENTS": "Download all attachments",
+		"EMPTY_LIST": "Danh sách trống.",
+		"EMPTY_SEARCH_LIST": "Không tìm thấy thư trùng khớp.",
+		"SEARCH_RESULT_FOR": "Kết quả tìm kiếm cho \"%SEARCH%\"",
+		"BACK_TO_MESSAGE_LIST": "trở về danh sách thư",
+		"PUT_MESSAGE_HERE": "Bỏ thư vào đây để xem nó trong danh sách",
+		"TODAY_AT": "hôm nay lúc %TIME%",
+		"YESTERDAY_AT": "hôm qua lúc %TIME%",
+		"NEW_MESSAGE_NOTIFICATION": "Bạn có %COUNT% thư mới!",
+		"QUOTA_SIZE": "Đang sử dụng <strong>%SIZE% (%PROC%%)<\/strong> trong mức <strong>%LIMIT%<\/strong> của bạn",
+		"SORT": "Sắp xếp thư",
+		"NO_SORT": "Mail server does not support sorting",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "Thư mới hiện trước",
+		"SORT_DATE_DESC": "Thư cũ hiện trước",
+		"SORT_SIZE_ASC": "Kích cỡ thư nhỏ đến lớn",
+		"SORT_SIZE_DESC": "Kích cỡ thư lớn đến nhỏ ",
+		"SORT_SUBJECT_ASC": "Tiêu đề thư từ A đến Z",
+		"SORT_SUBJECT_DESC": "Tiêu đề thư từ Z đến A",
+		"SORT_FROM_ASC": "Từ A đến Z",
+		"SORT_FROM_DESC": "Từ Z đến A"
+	},
+	"MESSAGE": {
+		"BUTTON_EDIT": "Chỉnh sửa",
+		"BUTTON_UNSUBSCRIBE": "Bỏ theo dõi danh sách này",
+		"BUTTON_REPLY": "Phản hồi",
+		"BUTTON_REPLY_ALL": "Phản hồi tất cả",
+		"BUTTON_FORWARD": "Chuyển tiếp",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "Chuyển tiếp dưới dạng đính kèm",
+		"BUTTON_EDIT_AS_NEW": "Chỉnh sửa như một thư mới",
+		"BUTTON_SHOW_IMAGES": "Hiển thị hình ảnh ngoài gửi vào trong thư",
+		"BUTTON_NOTIFY_READ_RECEIPT": "Người gửi đã yêu cầu nhận thông báo khi bạn đọc thư này.",
+		"BUTTON_IN_NEW_WINDOW": "Xem trong một trang khác",
+		"BUTTON_THREAD_LIST": "Danh sách chuỗi hội thoại",
+		"BUTTON_THREAD_PREV": "Phần trước",
+		"BUTTON_THREAD_NEXT": "Phần sau",
+		"BUTTON_THREAD_MORE": "Hiện thêm thư",
+		"MENU_HEADERS": "Hiển thị phần đầu thư",
+		"MENU_VIEW_ORIGINAL": "Hiển thị nguồn",
+		"HTML_VIEW": "Xem thư dạng HTML",
+		"PLAIN_VIEW": "Xem thư dạng văn bản thuần",
+		"SWAP_COLORS": "Swap default (background)color",
+		"MENU_DOWNLOAD_ORIGINAL": "Tải xuống dưới dạng tập tin .eml",
+		"MENU_FILTER_SIMILAR": "Lọc ra những thư dạng này",
+		"MENU_PRINT": "In",
+		"EMPTY_SUBJECT_TEXT": "(Chưa có tiêu đề)",
+		"LABEL_DATE": "Ngày",
+		"LABEL_FROM_SHORT": "đến từ",
+		"LABEL_TO_SHORT": "gửi đến",
+		"PRINT_LABEL_ATTACHMENTS": "Phần đính kèm",
+		"MESSAGE_VIEW_DESC": "Chọn bất kỳ thư nào trong danh sách để xem nó ở đây.",
+		"MESSAGE_VIEW_MOVE_DESC": "Bấm vào tên thư mục ở góc trái màn hình để chọn mục bạn muốn vào xem.",
+		"LINK_DOWNLOAD_AS_ZIP": "Tải xuống dạng zip",
+		"SPAM_SCORE": "Điểm số thư rác",
+		"HAS_VIRUS_WARNING": "BÁO ĐỘNG ĐỎ: phát hiện có virut trong thư",
+		"TAGS": "Thẻ",
+		"NEW_TAG": "New tag",
+		"ENABLE_TRACKING_LINKS": "Enable tracking links",
+		"TRACKING_ENABLED": "Links are now tracked when clicked!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "Quan trọng",
+		"$todo": "Cần làm",
+		"$label1": "Quan trọng",
+		"$label2": "Công việc",
+		"$label3": "Cá nhân",
+		"$label4": "Cần làm",
+		"$label5": "Để sau"
+	},
+	"READ_RECEIPT": {
+		"SUBJECT": "Thông báo thư đã được gửi thành công - %SUBJECT%",
+		"BODY": "Đây là một thông báo cho thư bạn đã gửi đến %READ-RECEIPT%.\n\nXin lưu ý là: \"Thông báo thư đã gửi này ghi nhận là thư của bạn đã được hiển thị lên bên trên máy tính của người nhận thư.\"\nNhưng không hoàn toàn đảm bảo rằng liệu người nhận đã xem qua hay hiểu nội dung trong thư hay chưa.\n"
+	},
+	"SUGGESTIONS": {
+		"SEARCHING_DESC": "Đang tìm kiếm..."
+	},
+	"CONTACTS": {
+		"TAB_CONTACT": "Contact",
+		"TAB_LOCATIONS": "Locations",
+		"TAB_BUSINESS": "Business",
+		"LABEL_ORGANIZATION": "Organization",
+		"LABEL_DEPARTMENT": "Department",
+		"LABEL_TITLE": "Title",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "Ask",
+		"NEVER": "Never",
+		"ALWAYS": "Always",
+		"ALWAYS_IF_POSSIBLE": "Always if possible",
+		"BUTTON_ADD_CONTACT": "Thêm liên hệ mới",
+		"BUTTON_CREATE_CONTACT": "Tạo",
+		"BUTTON_IMPORT": "Nhập thông tin (csv, vcf, vCard)",
+		"BUTTON_EXPORT_VCARD": "Xuất thông tin (vcf, vCard)",
+		"BUTTON_EXPORT_CSV": "Xuất (csv)",
+		"ERROR_IMPORT_FILE": "Lỗi nhập thông tin (định dạng tập tin không hợp lệ)",
+		"EMPTY_LIST": "Không có liên hệ nào ở đây",
+		"EMPTY_SEARCH": "Không tìm kiếm được liên hệ nào",
+		"CLEAR_SEARCH": "Xóa bỏ tìm kiếm",
+		"CONTACT_VIEW_DESC": "Chọn một tên liên hệ trong danh sách để hiển thị chi tiết ở đây.",
+		"LABEL_BIRTHDAY": "Ngày sinh",
+		"DISPLAY_NAME": "Tên hiển thị",
+		"LAST_NAME": "Họ",
+		"FIRST_NAME": "Tên",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "Nickname",
+		"LABEL_READ_ONLY": "Chỉ cho phép đọc",
+		"ADD_MENU_LABEL": "Thêm vào",
+		"ADD_MENU_NICKNAME": "Nickname",
+		"ADD_MENU_NOTE": "Ghi chú",
+		"ADD_MENU_PHONE": "SĐT",
+		"ADD_MENU_URL": "Đường link",
+		"ADD_MENU_ADDRESS": "Địa chỉ",
+		"ADD_MENU_BIRTHDAY": "Ngày sinh",
+		"ADD_MENU_TAGS": "Thẻ",
+		"BUTTON_SHARE_ALL": "Tất cả mọi người",
+		"BUTTON_SYNC": "Đồng bộ hóa (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
+	},
+	"COMPOSE": {
+		"LINK_SHOW_INPUTS": "hiển thị tất cả mục nhập thông tin",
+		"BUTTON_SEND": "Gửi",
+		"BUTTON_MINIMIZE": "Thu nhỏ lại",
+		"SAVED_TIME": "Đã lưu vào lúc %TIME%",
+		"SAVED_ERROR_ON_SEND": "Thư đã được gửi nhưng chưa được lưu vào thư mục Thư đã gửi",
+		"DISCARD_UNSAVED_DATA": "Loại bỏ những dữ liệu chưa được lưu?",
+		"ATTACH_FILES": "Đính kèm tập tin",
+		"ATTACH_DROP_FILES_DESC": "Bỏ tập tin vào đây",
+		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% đã viết là",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- Thư được chuyển tiếp -------",
+		"FORWARD_MESSAGE_TOP_SENT": "Đã gửi",
+		"EMPTY_TO_ERROR_DESC": "Xin chọn ít nhất một người để nhận thư",
+		"NO_ATTACHMENTS_HERE_DESC": "Không có tập tin đính kèm.",
+		"ATTACHMENTS_ERROR_DESC": "Cảnh báo! Các tập tin đính kèm chưa được tải lên hết.",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Các tập tin đính kèm chưa được tải lên hết.",
+		"ALLOW_SPELLCHECK": "Enable browser spelling checker",
+		"ALLOW_DRAFT_AUTOSAVE": "Tự động lưu nháp",
+		"BUTTON_REQUEST_READ_RECEIPT": "Yêu cầu thông báo khi người nhận đã đọc thư",
+		"BUTTON_MARK_AS_IMPORTANT": "Đánh dấu thư quan trọng",
+		"BUTTON_REQUEST_DSN": "Yêu cầu thông báo thư đã gửi thành công",
+		"BUTTON_REQUIRE_TLS": "Require secure delivery",
+		"ERROR_EMPTY_BODY": "Message body is empty"
+	},
+	"POPUPS_ASK": {
+		"EXIT_ARE_YOU_SURE": "Are you sure you want to exit?",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "Bạn có chắc muốn đóng bảng này chứ?",
+		"DESC_WANT_DELETE_MESSAGES": "Bạn có chắc muốn xóa thư này chứ?"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "Chọn ngôn ngữ"
+	},
+	"POPUPS_ADD_ACCOUNT": {
+		"TITLE_ADD_ACCOUNT": "Thêm tài khoản",
+		"BUTTON_ADD_ACCOUNT": "Thêm vào",
+		"TITLE_UPDATE_ACCOUNT": "Cập nhật tài khoản"
+	},
+	"POPUPS_IDENTITY": {
+		"TITLE_ADD_IDENTITY": "Thêm tên gọi mới",
+		"TITLE_UPDATE_IDENTITY": "Cập nhật tên gọi",
+		"LABEL": "Label",
+		"BUTTON_ADD_IDENTITY": "Thêm vào",
+		"SIGNATURE": "Signature",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "Thêm chữ ký cuối thư này vào trước phần văn bản trích dẫn trong thư phản hồi"
+	},
+	"POPUPS_CREATE_FOLDER": {
+		"TITLE_CREATE_FOLDER": "Tạo một thư mục mới",
+		"LABEL_PARENT": "Thư mục chính",
+		"BUTTON_CREATE": "Tạo",
+		"TITLE_CREATING_PROCESS": "Đang tạo một thư mục"
+	},
+	"POPUPS_CLEAR_FOLDER": {
+		"TITLE_CLEAR_FOLDER": "Xóa hết thư trong thư mục này?",
+		"DANGER_DESC_WARNING": "Cảnh báo!",
+		"DANGER_DESC_HTML_1": "Thao tác này sẽ xóa hết tất cả những thư đang có trong thư mục <strong>%FOLDER%<\/strong>.",
+		"DANGER_DESC_HTML_2": "Một khi bắt đầu, quá trình xóa này sẽ không thể ngưng giữa chừng hay hủy bỏ.",
+		"TITLE_CLEARING_PROCESS": "Đang xóa thư mục..."
+	},
+	"CRYPTO": {
+		"SIGN": "Ký xác nhận",
+		"ENCRYPT": "Mã hóa",
+		"DECRYPT": "Gỡ mã hóa",
+		"VERIFY": "Xác minh",
+		"GOOD_SIGNATURE": "Chữ ký ổn từ %USER%",
+		"ERROR": "Lỗi %TYPE%: %ERROR%",
+		"CREATE_SELF_SIGNED": "Create self-signed",
+		"VALID_UNTIL": "Valid until",
+		"PRIVATE_KEY": "Private key",
+		"CHANGE_PASS": "Change passphrase",
+		"CURRENT_PASS": "Current passphrase",
+		"NEW_PASS": "New passphrase",
+		"ASK_CRYPTKEY_PASS": "Your login passphrase has changed. Please fill in your old login passphrase to decrypt data"
+	},
+	"OPENPGP": {
+		"POPUP_IMPORT_TITLE": "Nhập mật mã OpenPGP",
+		"POPUP_IMPORT_BUTTON": "Nhập",
+		"POPUP_VIEW_TITLE": "Xem mật mã OpenPGP",
+		"POPUP_VIEW_BUTTON": "Chọn",
+		"POPUP_GENERATE_TITLE": "Tạo một đôi mật mã OpenPGP",
+		"POPUP_GENERATE_BUTTON": "Tạo",
+		"LABEL_KEY_TYPE": "Loại",
+		"SIGNED_MESSAGE": "Thư đã được ký xác nhận bằng mã OpenPGP",
+		"ENCRYPTED_MESSAGE": "Thư đã được mã hóa bởi OpenPGP",
+		"STORE_IN_GNUPG": "Lưu trữ trên máy chủ trong GnuPG",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "Store public key on server in GnuPG",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "Store private key on server in GnuPG",
+		"BACKUP_ON_SERVER": "Lưu trữ (đã được mã hóa) trên máy chủ",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "Backup public key on server",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "Backup private key on server"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "Import S\/MIME certificate",
+		"CERTIFICATE": "Certificate",
+		"CERTIFICATES": "S\/MIME Certificates",
+		"SIGNED_MESSAGE": "Thư đã được ký xác nhận bằng mã S\/MIME",
+		"ENCRYPTED_MESSAGE": "Thư đã được mã hóa bởi S\/MIME",
+		"PRIVATE_KEY_OF": "S\/MIME private key of %EMAIL%"
+	},
+	"POPUPS_FILTER": {
+		"TITLE_CREATE_FILTER": "Tạo một tấm lọc mới",
+		"TITLE_EDIT_FILTER": "Cập nhật tấm lọc thư",
+		"LEGEND_CONDITIONS": "Điều kiện",
+		"LEGEND_ACTIONS": "Thao tác xử lý",
+		"BUTTON_ADD_CONDITION": "Thêm một điều kiện",
+		"SELECT_ACTION_MOVE_TO": "Chuyển đến",
+		"SELECT_ACTION_FORWARD_TO": "Chuyển tiếp cho",
+		"SELECT_ACTION_REJECT": "Từ chối",
+		"SELECT_ACTION_VACATION_MESSAGE": "Thư thông báo bạn đang nghỉ lễ",
+		"SELECT_ACTION_DISCARD": "Loại bỏ",
+		"SELECT_FIELD_RECIPIENTS": "Người nhận (Gửi đến trực tiếp hay CC bản sao thư)",
+		"SELECT_FIELD_HEADER": "Phần đầu",
+		"SELECT_FIELD_BODY": "Phần thân",
+		"SELECT_FIELD_SIZE": "Kích cỡ",
+		"SELECT_TYPE_CONTAINS": "Có chứa",
+		"SELECT_TYPE_NOT_CONTAINS": "Không chứa",
+		"SELECT_TYPE_MATCHES": "Trùng khớp với (* và ? đều được hỗ trợ)",
+		"SELECT_TYPE_NOT_MATCHES": "Không trùng với (* và ? đều được hỗ trợ)",
+		"SELECT_TYPE_REGEXP": "Biểu thức chính quy (Regexp)",
+		"SELECT_TYPE_NOT_REGEXP": "Không phải biểu thức chính quy (Regexp)",
+		"SELECT_TYPE_EQUAL_TO": "Giống với",
+		"SELECT_TYPE_NOT_EQUAL_TO": "Không giống với",
+		"SELECT_TYPE_OVER": "Hơn",
+		"SELECT_TYPE_UNDER": "Dưới",
+		"SELECT_TYPE_TEXT": "Văn bản",
+		"SELECT_TYPE_RAW": "Dạng thuần",
+		"SELECT_MATCH_ANY": "Trùng khớp với BẤT KỲ quy định đặt ra bên dưới",
+		"SELECT_MATCH_ALL": "Trùng khớp với TẤT CẢ quy định đặt ra bên dưới",
+		"MARK_AS_READ_LABEL": "Đánh dấu đã đọc",
+		"REPLY_INTERVAL_LABEL": "Khoảng cách phản hồi (ngày)",
+		"KEEP_LABEL": "Giữ lại",
+		"STOP_LABEL": "Stop further processing of rules",
+		"VACATION_SUBJECT_LABEL": "Tiêu đề thư (không bắt buộc)",
+		"VACATION_MESSAGE_LABEL": "Nội dung thư thông báo bạn đang nghỉ lễ",
+		"VACATION_RECIPIENTS_LABEL": "Người nhận (phân ra bởi dấu phẩy)",
+		"REJECT_MESSAGE_LABEL": "Thông báo từ chối nhận thư",
+		"ALL_INCOMING_MESSAGES_DESC": "Tất cả những thư gửi đến"
+	},
+	"POPUPS_SIEVE_SCRIPT": {
+		"TITLE_CREATE": "Tạo Script",
+		"TITLE_EDIT": "Chỉnh sửa Script",
+		"BUTTON_ADD_FILTER": "Thêm một tấm lọc",
+		"BUTTON_RAW_SCRIPT": "Dùng Script tùy chỉnh của người dùng",
+		"CAPABILITY_LABEL": "Khả năng",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "Những thay đổi này cần được lưu vào máy chủ."
+	},
+	"POPUPS_SYSTEM_FOLDERS": {
+		"TITLE_SYSTEM_FOLDERS": "Chọn thư mục trên hệ thống",
+		"SELECT_CHOOSE_ONE": "Chọn một thư mục",
+		"SELECT_UNUSE_NAME": "Không dùng thư mục này",
+		"NOTIFICATION_SENT": "Bạn vẫn chưa chọn thư mục hệ thống cho phần \"Thư đã gửi\" nơi mà những bức thư đã gửi được lưu vào.\nNếu bạn không muốn lưu lại thư đã gửi, xin hãy chọn \"Không dùng thư mục này\"\n",
+		"NOTIFICATION_DRAFTS": "Bạn vẫn chưa chọn thư mục hệ thống cho mục \"Thư nháp\" nơi mà những bản nháp sẽ được lưu lại lúc bạn viết thư.",
+		"NOTIFICATION_SPAM": "Bạn vẫn chưa chọn thư mục hệ thống \"Thư rác\" nơi mà những bức thư rác sẽ được lưu vào.\nNếu bạn muốn xóa hẳn những bức thư rác này, xin hãy chọn \"Không dùng thư mục này\"\n",
+		"NOTIFICATION_TRASH": "Bạn vẫn chưa chọn thư mục hệ thống \"Thùng rác\" nơi mà những bức thư bạn xóa đi sẽ được bỏ vào.\nNếu bạn muốn xóa hẳn những bức thư này, xin hãy chọn \"Không dùng thư mục này\"\n",
+		"NOTIFICATION_ARCHIVE": "Bạn vẫn chưa chọn thư mục hệ thống \"Kho lưu trữ\" nơi mà những bức thư được lưu kho sẽ được đưa vào."
+	},
+	"TITLES": {
+		"MAILBOX": "Hộp thư",
+		"SETTINGS": "Cài đặt"
+	},
+	"UPLOAD": {
+		"ERROR_FILE_IS_TOO_BIG": "Tập tin quá lớn",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "Tập tin chỉ được tải lên một phần vì một lỗi chưa xác định",
+		"ERROR_NO_FILE_UPLOADED": "Không có tập tin nào được tải lên",
+		"ERROR_MISSING_TEMP_FOLDER": "Tập tin tạm thời đang bị thiếu",
+		"ERROR_ON_SAVING_FILE": "Bị một lỗi chưa xác định khi tải tập tin lên",
+		"ERROR_FILE_TYPE": "Dạng tập tin không hợp lệ",
+		"ERROR_UNKNOWN": "Bị một lỗi chưa xác định khi tải tập tin lên"
+	},
+	"EDITOR": {
+		"PLAIN": "DẠNG HTML <-> DẠNG CHỮ VIẾT THƯỜNG",
+		"SOURCE": "HTML <-> SOURCE",
+		"FONTFAMILY": "Font family",
+		"FONTSIZE": "Font size",
+		"DIR": "Text direction",
+		"DIR_LTR": "Left to right",
+		"DIR_RTL": "Right to left",
+		"DIR_AUTO": "Automatic",
+		"TEXTCOLOR": "Text color",
+		"BACKGROUNDCOLOR": "Background color",
+		"BOLD": "Bold",
+		"ITALIC": "Italic",
+		"UNDERLINE": "Underline",
+		"STRIKE": "Strikethrough",
+		"SUB": "Subscript",
+		"SUP": "Superscript",
+		"OL": "Ordered list",
+		"UL": "Unordered list",
+		"QUOTE": "Blockquote",
+		"INDENTDECREASE": "Decrease indent",
+		"INDENTINCREASE": "Increase indent",
+		"LINK": "Link",
+		"IMAGEURL": "Image URL",
+		"IMAGEUPLOAD": "Image select",
+		"UNDO": "Undo",
+		"REDO": "Redo",
+		"REMOVESTYLE": "Remove style"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "General",
+		"CONTACTS": "Contacts",
+		"FOLDERS": "Folders",
+		"ACCOUNTS": "Accounts",
+		"FILTERS": "Filters",
+		"SECURITY": "Security",
+		"THEMES": "Themes"
+	},
+	"SETTINGS_FILTERS": {
+		"SIMPLE": "Đơn giản",
+		"ADVANCED": "Kỹ càng",
+		"BUTTON_ADD_SCRIPT": "Thêm vào một Script",
+		"SUBNAME_MOVE_TO": "Chuyển đến \"%FOLDER%\"",
+		"SUBNAME_FORWARD_TO": "Chuyển tiếp đến \"%EMAIL%\"",
+		"SUBNAME_REJECT": "Từ chối",
+		"SUBNAME_VACATION_MESSAGE": "Thư thông báo bạn đang nghỉ lễ",
+		"SUBNAME_DISCARD": "Loại bỏ"
+	},
+	"SETTINGS_SECURITY": {
+		"LEGEND_SECURITY": "An ninh",
+		"LABEL_AUTOLOGOUT": "Tự động đăng xuất",
+		"FORGET_KEY_PASS": "Forget private key passphrase",
+		"NEVER": "Không tự động đăng xuất"
+	},
+	"SETTINGS_GENERAL": {
+		"LANGUAGE": "Ngôn ngữ",
+		"HOUR_FORMAT": "Hour format",
+		"IDENTITY": "Tên gọi",
+		"LAYOUT": "Bố cục",
+		"LAYOUT_NO_SPLIT": "Không phân màn hình",
+		"LAYOUT_VERTICAL_SPLIT": "Phân dọc màn hình",
+		"LAYOUT_HORIZONTAL_SPLIT": "Phân ngang màn hình",
+		"SHOW_NEXT_MESSAGE": "Show next message when (re)move current message",
+		"EDITOR": "Chỉnh dạng văn bản mặc định",
+		"EDITOR_HTML": "Dạng Html",
+		"EDITOR_PLAIN": "Dạng chữ viết thường",
+		"VIEW_OPTIONS": "Xem những lựa chọn",
+		"USE_PREVIEW_PANE": "Dùng bảng xem trước thư",
+		"HIDE_DELETED_MESSAGES": "Ẩn các tin nhắn được đánh dấu để xóa",
+		"USE_CHECKBOXES_IN_LIST": "Hiển thị ô đánh dấu dưới dạng danh sách",
+		"USE_THREADS": "Nối thư qua lại cùng một tiêu đề thành một chuỗi hội thoại",
+		"THREAD_ALGORITHM": "Threads algorithm",
+		"REPLY_SAME_FOLDER": "Đặt thư phản hồi gửi đi vào chung thư mục của bức thư nhận được",
+		"PREFER_HTML": "Nghiêng về lựa chọn HTML hơn dạng chữ viết thường",
+		"PREFER_HTML_INFO": "Đôi lúc thư nhận được sẽ ở cả hai dạng. Lựa chọn này cho phép bạn chỉnh phần HTML hay phần chữ viết thường trong thư bạn muốn hiển thị lên.",
+		"REMOVE_COLORS": "Loại bỏ hình nền và màu chữ trong phần thân của thư",
+		"ALLOW_STYLES": "Allow <style> CSS",
+		"MESSAGE_PER_PAGE": "Số thư hiển thị trên trang",
+		"CHECK_MAIL_INTERVAL": "Check mail interval",
+		"MARK_MESSAGE_READ_AFTER": "Đánh dấu thư là để đọc sau",
+		"MSG_DEFAULT_ACTION": "Default action",
+		"SECONDS": "giây",
+		"MINUTES": "minutes",
+		"NOTIFICATIONS": "Thông báo",
+		"SOUND_NOTIFICATION": "Thông báo âm thanh",
+		"CHROME_NOTIFICATION_DESC": "Hiện thị thông báo nẩy lên nhanh khi có thư mới",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(Đang bị chặn bởi trình duyệt web)",
+		"COLLAPSE_BLOCKQUOTES": "Collapse quoted text",
+		"MAX_QUOTE_LEVEL": "Maximum visible quoted text levels",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "Show inline attachments in list",
+		"LIST_SIMPLE_ATTACHMENTS": "Simple attachments list",
+		"LIST_MESSAGES_GROUPED": "List messages grouped (when sorting by date or from)",
+		"EXTERNAL_IMAGES": "External images",
+		"IMAGES_OPTION_ASK": "Always ask",
+		"IMAGES_OPTION_WHITELIST": "Whitelist or ask",
+		"IMAGES_OPTION_ALWAYS": "Show always",
+		"IMAGES_WHITELIST": "Images whitelist",
+		"MESSAGE_POPUP_WINDOW": "Popup in new window instead of tab",
+		"MAILTO": "Register as 'mailto:' links handler",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
+	},
+	"SETTINGS_CONTACTS": {
+		"LABEL_CONTACTS_AUTOSAVE": "Tự động thêm người nhận thư vào sổ địa chỉ của bạn",
+		"LEGEND_CONTACTS_SYNC": "Đồng bộ hóa từ xa (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "Bật chế độ đồng bộ hóa từ xa",
+		"LABEL_CONTACTS_SYNC_SERVER": "Máy chủ",
+		"LABEL_CONTACTS_SYNC_AB_URL": "Đường link của sổ địa chỉ",
+		"LABEL_CONTACTS_SYNC_USER": "Người dùng",
+		"SYNC_READ": "Chỉ cho phép đọc"
+	},
+	"SETTINGS_THEMES": {
+		"LEGEND_THEMES": "Phông nền",
+		"LABEL_BACKGROUND": "Hình nền",
+		"LABEL_FONTS": "Fonts",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "Tải hình nền lên (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "Tập tin hình ảnh quá lớn",
+		"ERROR_FILE_TYPE_ERROR": "Định dạng tập tin hình ảnh không hợp lệ (chỉ tải lên được JPG và PNG)",
+		"ERROR_UNKNOWN": "Bị một lỗi chưa xác định khi tải tập tin lên"
+	},
+	"SETTINGS_FOLDERS": {
+		"LEGEND_FOLDERS": "Danh sách thư mục",
+		"BUTTON_CREATE": "Tạo thư mục",
+		"BUTTON_SYSTEM": "Thư mục hệ thống",
+		"BUTTON_SUBSCRIBE": "Theo dõi",
+		"BUTTON_UNSUBSCRIBE": "Bỏ theo dõi",
+		"LOADING_PROCESS": "Đang cập nhật danh sách thư mục",
+		"CREATING_PROCESS": "Đang tạo thư mục",
+		"DELETING_PROCESS": "Đang xóa thư mục",
+		"RENAMING_PROCESS": "Đang đổi tên thư mục",
+		"TO_MANY_FOLDERS_DESC_1": "Bạn đã tạo quá nhiều thư mục rồi!",
+		"TO_MANY_FOLDERS_DESC_2": "Chúng tôi chỉ hiển thị một vài trong số đó, để tránh vấn đề hiệu năng sử dụng.",
+		"HELP_DELETE_FOLDER": "Xóa thư mục",
+		"HELP_SHOW_HIDE_FOLDER": "Hiển thị\/ẩn đi thư mục",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "Kiểm tra xem có thư mới không",
+		"HIDE_UNSUBSCRIBED": "Ẩn đi những thư mục đã bỏ theo dõi",
+		"UNHIDE_KOLAB_FOLDERS": "Unhide Kolab folders",
+		"TYPE_CALENDAR": "Lịch",
+		"TYPE_CONFIGURATION": "Cấu hình",
+		"TYPE_CONTACTS": "Danh bạ",
+		"TYPE_FILES": "Tập tin",
+		"TYPE_JOURNAL": "Nhật ký",
+		"TYPE_NOTES": "Ghi chú",
+		"TYPE_TASKS": "Tác vụ nhỏ"
+	},
+	"SETTINGS_ACCOUNTS": {
+		"LEGEND_ACCOUNTS": "Tài khoản",
+		"LEGEND_IDENTITIES": "Tên gọi",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Tài khoản và Tên gọi",
+		"BUTTON_ADD_ACCOUNT": "Thêm một tài khoản",
+		"BUTTON_ADD_IDENTITY": "Thêm một tên gọi",
+		"LOADING_PROCESS": "Đang cập nhật...",
+		"SHOW_UNREAD": "Show unread messages count"
+	},
+	"SETTINGS_OPENPGP": {
+		"BUTTON_IMPORT_KEY": "Nhập mật mã",
+		"BUTTON_GENERATE_KEY_PAIR": "Tạo một đôi mật mã",
+		"IMPORT_FROM_SERVER": "Import from server",
+		"TITLE_PRIVATE": "Mã lưu riêng",
+		"TITLE_PUBLIC": "Mã chia sẻ công cộng",
+		"GET_MAILVELOPE": "Tải về tiện ích trình duyệt cài thêm tên Mailvelope."
+	},
+	"SHORTCUTS_HELP": {
+		"LEGEND_SHORTCUTS_HELP": "Hỗ trợ phím tắt",
+		"TAB_MAILBOX": "Hộp thư",
+		"TAB_MESSAGE_LIST": "Danh sách thư",
+		"TAB_MESSAGE_VIEW": "Chế độ xem thư",
+		"TAB_COMPOSE": "Viết thư",
+		"LABEL_OPEN_USER_DROPDOWN": "Mở phần menu người dùng",
+		"LABEL_REPLY": "Phản hồi",
+		"LABEL_REPLY_ALL": "Phản hồi tất cả",
+		"LABEL_FORWARD": "Chuyển tiếp",
+		"LABEL_FORWARD_MULTIPLY": "Chuyển tiếp dưới dạng đính kèm",
+		"LABEL_CHECK_ALL": "Chọn tất cả thư",
+		"LABEL_DELETE": "Xóa",
+		"LABEL_OPEN_THREAD": "Mở chuỗi hội thoại được chọn",
+		"LABEL_MOVE": "Di chuyển",
+		"LABEL_READ": "Đánh dấu đã đọc những thư được chọn",
+		"LABEL_UNREAD": "Đánh dấu chưa đọc những thư được chọn",
+		"LABEL_IMPORTANT": "Quan trọng, đánh dấu sao những thư được chọn",
+		"LABEL_CANCEL_SEARCH": "Thoát chế độ tìm kiếm",
+		"LABEL_FULLSCREEN_ENTER": "Xem toàn màn hình (Kèm theo bố cục bảng xem trước thư)",
+		"LABEL_VIEW_MESSAGE_ENTER": "Xem thư (Không kèm theo bố cục bảng xem trước thư)",
+		"LABEL_SWITCH_TO_MESSAGE": "Di chuyển sự chú ý đến thư được chọn",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "Di chuyển sự chú ý đến danh sách thư mục",
+		"LABEL_FULLSCREEN_TOGGLE": "Bật\/tắt chế độ xem toàn màn hình",
+		"LABEL_BLOCKQUOTES_TOGGLE": "Bật\/tắt phần trích dẫn văn bản trong thư (blockquotes)",
+		"LABEL_THREAD_NEXT": "Thư tiếp theo trong chuỗi",
+		"LABEL_THREAD_PREV": "Thư trước ở trong chuỗi",
+		"LABEL_EXIT_FULLSCREEN": "Thoát chế độ xem toàn màn hình",
+		"LABEL_CLOSE_MESSAGE": "Đóng thư (Không kèm bố cục bảng xem trước)",
+		"LABEL_SWITCH_TO_LIST": "Di chuyển sự chú ý đến danh sách thư",
+		"LABEL_OPEN_COMPOSE_POPUP": "Mở bảng viết thư nhanh",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "Thu nhỏ lại bảng viết thư nhanh",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Mở phần menu tên gọi",
+		"LABEL_SAVE_MESSAGE": "Lưu thư lại",
+		"LABEL_SEND_MESSAGE": "Gửi thư",
+		"LABEL_CLOSE_COMPOSE": "Đóng bảng viết thư"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "Request failed",
+		"RequestAborted": "Request is aborted",
+		"RequestTimeout": "Request timed out",
+		"InvalidToken": "Token không hợp lệ",
+		"AuthError": "Xác minh thất bại",
+		"ConnectionError": "Không thể kết nối với máy chủ",
+		"DomainAlreadyExists": "Tên miền đã tồn tại",
+		"DomainNotAllowed": "Tên miền không được cho phép truy cập",
+		"AccountNotAllowed": "Tài khoản không được cho phép truy cập",
+		"CryptKeyError": "Your login passphrase has changed",
+		"ContactsSyncError": "Lỗi đồng bộ danh bạ",
+		"CantGetMessageList": "Không thể lấy được danh sách thư",
+		"CantGetMessage": "Không lấy được thư",
+		"CantDeleteMessage": "Không thể xóa được thư",
+		"CantCopyMessage": "Không copy được thư",
+		"CantMoveMessage": "Không di chuyển được thư",
+		"CantSaveMessage": "Không lưu được thư",
+		"CantSendMessage": "Không gửi được thư",
+		"InvalidRecipients": "Người nhận thư không hợp lệ",
+		"CantSaveFilters": "Không thể lưu những tấm lọc thư",
+		"CantGetFilters": "Không thể lấy về những tấm lọc thư",
+		"CantActivateFiltersScript": "Không thể kích hoạt script lọc thư",
+		"CantDeleteFiltersScript": "Không thể xóa script lọc thư",
+		"FiltersAreNotCorrect": "Tấm lọc thư chưa đúng",
+		"CantCreateFolder": "Không thể tạo thư mục",
+		"CantRenameFolder": "Không thể đổi tên thư mục",
+		"CantDeleteFolder": "Không thể xóa thư mục",
+		"CantDeleteNonEmptyFolder": "Không thể xóa thư mục đang chứa dữ liệu",
+		"CantSubscribeFolder": "Không thể theo dõi thư mục",
+		"CantUnsubscribeFolder": "Không thể bỏ theo dõi thư mục",
+		"DemoSendMessageError": "Vì lý do an ninh, tài khoản này không được phép gửi thư ra cho những địa chỉ email bên ngoài!",
+		"DemoAccountError": "Vì lý do an ninh, tài khoản này không được phép thực hiện hành động này!",
+		"AccountAlreadyExists": "Tài khoản đã tồn tại",
+		"AccountDoesNotExist": "Tài khoản không tồn tại",
+		"AccountSwitchFailed": "Không chuyển sang được tài khoản \"%EMAIL%\"",
+		"MailServerError": "Có lỗi xảy ra khi truy cập vào máy chủ quản lý mail",
+		"InvalidInputArgument": "Thông tin nhập vào không hợp lệ",
+		"UnknownError": "Lỗi chưa xác định"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/zh-CN/relativetimeformat.js
deleted file mode 100644
index dde375bc8..000000000
--- a/snappymail/v/0.0.0/app/localization/zh-CN/relativetimeformat.js
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-	long: {
-		year: {
-			past: {
-				one: "{0} 年前",
-				other: "{0} 年前"
-			},
-			future: {
-				one: "{0} 年后",
-				other: "{0} 年后"
-			}
-		},
-		month: {
-			past: {
-				one: "{0} 个月前",
-				other: "{0} 个月前"
-			},
-			future: {
-				one: "{0} 个月后",
-				other: "{0} 个月后"
-			}
-		},
-		week: {
-			past: {
-				one: "{0} 周前",
-				other: "{0} 周前"
-			},
-			future: {
-				one: "{0} 周后",
-				other: "{0} 周后"
-			}
-		},
-		day: {
-			past: {
-				one: "{0} 天前",
-				other: "{0} 天前"
-			},
-			future: {
-				one: "{0} 天后",
-				other: "{0} 天后"
-			}
-		},
-		hour: {
-			past: {
-				one: "{0} 小时前",
-				other: "{0} 小时前"
-			},
-			future: {
-				one: "{0} 小时后",
-				other: "{0} 小时后"
-			}
-		},
-		minute: {
-			past: {
-				one: "{0} 分钟前",
-				other: "{0} 分钟前"
-			},
-			future: {
-				one: "{0} 分钟后",
-				other: "{0} 分钟后"
-			}
-		},
-		second: {
-			past: {
-				one: "{0} 秒前",
-				other: "{0} 秒前"
-			},
-			future: {
-				one: "{0} 秒后",
-				other: "{0} 秒后"
-			}
-		}
-	},
-	plural: n => 1 == n ? 'one' : 'other'
-}
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/admin.json b/snappymail/v/0.0.0/app/localization/zh-TW/admin.json
new file mode 100644
index 000000000..2f3ef94e6
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/admin.json
@@ -0,0 +1,182 @@
+{
+	"GLOBAL": {
+		"ADD": "新增",
+		"CLOSE": "關閉",
+		"SAVE": "儲存",
+		"TEST": "測試",
+		"UPDATE": "更新",
+		"USERNAME": "使用者名稱",
+		"PASSWORD": "密碼",
+		"CANCEL": "取消",
+		"SEARCH": "搜尋",
+		"YES": "是",
+		"NO": "否"
+	},
+	"LOGIN": {
+		"LABEL_LOGIN": "登入",
+		"LABEL_TOTP": "TOTP 密碼",
+		"BUTTON_LOGIN": "登入到控制面板"
+	},
+	"TOP_PANEL": {
+		"LABEL_ADMIN_PANEL": "控制面板"
+	},
+	"SETTINGS_LABELS": {
+		"GENERAL": "常規",
+		"LOGIN": "登入",
+		"BRANDING": "Logo",
+		"CONTACTS": "聯絡人",
+		"DOMAINS": "域名",
+		"SECURITY": "安全",
+		"PACKAGES": "外掛包",
+		"CONFIG": "配置",
+		"ABOUT": "關於"
+	},
+	"TAB_GENERAL": {
+		"LEGEND_INTERFACE": "介面",
+		"LABEL_LANGUAGE": "語言",
+		"LABEL_LANGUAGE_ADMIN": "語言(後臺)",
+		"LABEL_THEME": "主題",
+		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "允許在設定介面中選擇語言",
+		"LABEL_ALLOW_THEMES_ON_SETTINGS": "允許在設定介面中選擇主題",
+		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "允許在設定介面中選擇背景",
+		"LABEL_SHOW_THUMBNAILS": "顯示縮圖(附件)",
+		"LEGEND_MAIN": "主要設定",
+		"LABEL_ATTACHMENT_SIZE_LIMIT": "附件大小限制",
+		"LABEL_ALLOW_ADDITIONAL_ACCOUNTS": "允許額外的賬戶",
+		"LABEL_ALLOW_IDENTITIES": "允許多重身份",
+		"ALERT_DATA_ACCESS": "資料資料夾可被訪問。請配置您的 Web 伺服器以阻止從外部訪問資料資料夾。獲取更多幫助：",
+		"ALERT_WARNING": "警告！",
+		"HTML_ALERT_WEAK_PASSWORD": "您正在使用預設的管理員密碼\n<br>\n安全起見，請立即將密碼\n<strong><a href=\"#\/security\">更改<\/a><\/strong>\n為其他的字串。\n"
+	},
+	"TAB_LOGIN": {
+		"LEGEND_LOGIN_SCREEN": "登入介面",
+		"LABEL_DEFAULT_DOMAIN": "預設域名",
+		"LABEL_DETERMINE_USER_DOMAIN": "嘗試判斷使用者使用的域名",
+		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允許在登入介面選擇語言",
+		"LABEL_DETERMINE_USER_LANGUAGE": "嘗試判斷使用者使用語言"
+	},
+	"TAB_BRANDING": {
+		"LEGEND_BRANDING": "Logo",
+		"LABEL_PAGE_TITLE": "頁面標題",
+		"LABEL_LOADING_DESCRIPTION": "載入介面文字",
+		"LABEL_FAVICON_URL": "網站圖示"
+	},
+	"TAB_CONTACTS": {
+		"LEGEND_CONTACTS": "聯絡人",
+		"LEGEND_STORAGE": "儲存(PDO)",
+		"LABEL_ENABLE_CONTACTS": "啟用聯絡人",
+		"LABEL_ALLOW_SYNC": "允許同步聯絡人(依靠外部CardDAV伺服器)",
+		"LABEL_STORAGE_TYPE": "型別",
+		"LABEL_STORAGE_DSN": "Dsn",
+		"LABEL_STORAGE_USER": "使用者",
+		"LABEL_STORAGE_PASSWORD": "密碼",
+		"SQLITE_GLOBAL": "使用全域性資料庫替代各賬號的資料庫",
+		"ALERT_NOTICE": "提示!",
+		"SUGGESTIONS_LIMIT": "建議數量上限",
+		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活躍使用者，請不要選擇此資料庫型別。",
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "您的系統不支援聯絡人\n<br>\n您需要在您的伺服器上安裝或啟用<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 元件。\n"
+	},
+	"TAB_DOMAINS": {
+		"LEGEND_DOMAINS": "域名",
+		"BUTTON_ADD_DOMAIN": "新增域名",
+		"BUTTON_ADD_ALIAS": "新增別名",
+		"DELETE_ARE_YOU_SURE": "您確定嗎？",
+		"HTML_DOMAINS_HELPER": "允許訪問的域名列表。\n<br>\n點選域名進行設定。\n"
+	},
+	"TAB_SECURITY": {
+		"LEGEND_SECURITY": "安全",
+		"LABEL_USE_IMAGE_PROXY": "對外部圖片使用本地代理",
+		"LABEL_AUTO_VERIFY": "自動驗證簽名",
+		"LABEL_SHOW_PHP_INFO": "顯示 PHP 資訊",
+		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理員面板訪問憑據",
+		"LABEL_CURRENT_PASSWORD": "當前密碼",
+		"LABEL_NEW_PASSWORD": "新密碼",
+		"LABEL_REPEAT_PASSWORD": "重複輸入新密碼",
+		"LABEL_REQUIRE_VERIFICATION": "要求驗證 SSL 證書",
+		"CRYPTO": "加密",
+		"LABEL_ALLOW_SELF_SIGNED": "允許自簽名證書"
+	},
+	"TAB_PACKAGES": {
+		"LABEL_ENABLE_PLUGINS": "啟用外掛",
+		"LEGEND_AVAILABLE_FOR_UPDATE": "有更新可用",
+		"LEGEND_AVAILABLE_FOR_INSTALLATION": "可用於安裝",
+		"LEGEND_INSTALLED_PACKAGES": "已安裝的外掛包",
+		"ALERT_CANNOT_ACCESS_REPOSITORY": "目前無法訪問外掛倉庫"
+	},
+	"TAB_ABOUT": {
+		"LEGEND_ABOUT": "關於",
+		"LABEL_TAG_HINT": "簡潔、現代化、快速的網頁郵件客戶端",
+		"LABEL_ALL_RIGHTS_RESERVED": "保留所有權利",
+		"HINT_READ_CHANGE_LOG": "請在更新前閱讀更新日誌",
+		"HINT_IS_UP_TO_DATE": "SnappyMail已是最新版本",
+		"HTML_NEW_VERSION": "有新的<b>%VERSION%<\/b> 版本可用.",
+		"LABEL_UPDATING": "更新中",
+		"LABEL_CHECKING": "檢查更新",
+		"BUTTON_RELEASES": "發行版"
+	},
+	"POPUPS_DOMAIN_ALIAS": {
+		"TITLE_ADD_DOMAIN_ALIAS": "新增別名",
+		"LABEL_ALIAS": "別名",
+		"LABEL_DOMAIN": "域名"
+	},
+	"POPUPS_DOMAIN": {
+		"TITLE_ADD_DOMAIN": "新增域名",
+		"TITLE_ADD_DOMAIN_WITH_NAME": "新增域名 \"%NAME%\"",
+		"TITLE_EDIT_DOMAIN": "編輯域名 \"%NAME%\"",
+		"LABEL_NAME": "名字",
+		"NAME_HELPER": "支援萬用字元",
+		"LABEL_SERVER": "伺服器",
+		"LABEL_PORT": "埠",
+		"LABEL_SECURE": "加密",
+		"TIMEOUT": "超時",
+		"DISABLE_CAPABILITIES": "禁用能力",
+		"LIMITS": "限制",
+		"FOLDERS": "資料夾",
+		"MESSAGES": "訊息",
+		"SECURE_OPTION_NONE": "無",
+		"LABEL_ALLOW_SIEVE_SCRIPTS": "可使用篩選指令碼",
+		"LABEL_USE_SHORT_LOGIN": "使用短使用者名稱登入",
+		"LABEL_LOWERCASE_LOGIN": "小寫登入 (大小寫敏感)",
+		"LABEL_USE_AUTH": "使用驗證",
+		"LABEL_SET_SENDER": "使用登入名作為發件人",
+		"LABEL_AUTH_PLAIN_LINE": "強制單一 AUTH PLAIN 命令登入",
+		"LABEL_USE_PHP_MAIL": "使用 php mail() 函式",
+		"BUTTON_WHITE_LIST": "白名單",
+		"NEW_DOMAIN_DESC": "此域名配置將允許您和<strong>%NAME%<\/strong>電子郵件地址一起工作.",
+		"WHITE_LIST_ALERT": "允許訪問的域使用者；使用空格分隔。\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
+	},
+	"POPUPS_PLUGIN": {
+		"TITLE_PLUGIN": "外掛",
+		"DESC_NOTHING_TO_CONFIGURE": "無可用配置"
+	},
+	"POPUPS_ASK": {
+		"DESC_WANT_CLOSE_THIS_WINDOW": "您確定要關閉此視窗嗎？"
+	},
+	"POPUPS_LANGUAGES": {
+		"TITLE_LANGUAGES": "選擇您的語言"
+	},
+	"HINTS": {
+		"BETA": "測試版本",
+		"WARNING": "警告"
+	},
+	"ERRORS": {
+		"DOMAIN_ALREADY_EXISTS": "域名已經存在",
+		"UNKNOWN_ERROR": "未知錯誤"
+	},
+	"NOTIFICATIONS": {
+		"RequestError": "請求失敗",
+		"RequestAborted": "請求中止",
+		"RequestTimeout": "請求超時",
+		"InvalidToken": "標記無效",
+		"AuthError": "驗證失敗",
+		"DomainAlreadyExists": "域名已經存在",
+		"CantSavePluginSettings": "無法儲存設定",
+		"CantInstallPackage": "安裝外掛包失敗",
+		"CantDeletePackage": "移除外掛包失敗",
+		"InvalidPluginPackage": "無效外掛包",
+		"UnsupportedPluginPackage": "不支援的外掛包",
+		"UnknownError": "未知錯誤"
+	}
+}
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/zh-TW/relativetimeformat.js
index 207f0cf1b..b92c49da0 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/relativetimeformat.js
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/relativetimeformat.js
@@ -1,31 +1,31 @@
 {
 	year: {
-		past: "{0}年前",
-		future: "{0}年后"
+		past: "{0} 年前",
+		future: "{0} 年後"
 	},
 	month: {
-		past: "{0}个月前",
-		future: "{0}个月后"
+		past: "{0} 個月前",
+		future: "{0} 個月後"
 	},
 	week: {
-		past: "{0}周前",
-		future: "{0}周后"
+		past: "{0} 週前",
+		future: "{0} 週後"
 	},
 	day: {
-		past: "{0}天前",
-		future: "{0}天后"
+		past: "{0} 天前",
+		future: "{0} 天後"
 	},
 	hour: {
-		past: "{0}小时前",
-		future: "{0}小时后"
+		past: "{0} 小時前",
+		future: "{0} 小時後"
 	},
 	minute: {
-		past: "{0}分钟前",
-		future: "{0}分钟后"
+		past: "{0} 分鐘前",
+		future: "{0} 分鐘後"
 	},
 	second: {
-		past: "{0}秒钟前",
-		future: "{0}秒钟后"
+		past: "{0} 秒前",
+		future: "{0} 秒後"
 	},
-	plural: n => 1 == n ? 'one' : 'other'
+	plural: n => 'other'
 }
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/static.json b/snappymail/v/0.0.0/app/localization/zh-TW/static.json
index 8740e4e88..19c0b3643 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/static.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/static.json
@@ -1,9 +1,9 @@
 {
 	"BACK_LINK": "重新載入",
-	"NO_SCRIPT_TITLE": "JavaScript 需要啟用！",
-	"NO_SCRIPT_DESC": "您的瀏覽器不支持JavaScript。\n請啟用瀏覽器的JavaScript支持並重試。\n",
-	"NO_COOKIE_TITLE": "Cookies 需要啟用！",
-	"NO_COOKIE_DESC": "您的瀏覽器不支持Cookies。\n請啟用瀏覽器的Cookies支持並重試。\n",
-	"BAD_BROWSER_TITLE": "您的瀏覽器過時了",
-	"BAD_BROWSER_DESC": "為了使用所有特性，\n下載並安裝其中一款瀏覽器：\n"
+	"NO_SCRIPT_TITLE": "此應用程式需要 JavaScript。",
+	"NO_SCRIPT_DESC": "此瀏覽器不支援 JavaScript。\n請啟用瀏覽器的 JavaScript，然後重新嘗試。\n",
+	"NO_COOKIE_TITLE": "此應用程式需要 Cookies。",
+	"NO_COOKIE_DESC": "此瀏覽器不支援 Cookies。\n請啟用瀏覽器的 Cookies，然後重新嘗試。\n",
+	"BAD_BROWSER_TITLE": "此瀏覽器已過時",
+	"BAD_BROWSER_DESC": "為使應用程式的全部功能執行正常，\n請下載並安裝下列其中一款瀏覽器：\n"
 }
diff --git a/snappymail/v/0.0.0/app/localization/zh-TW/user.json b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
index bc9b6ffeb..3e2590676 100644
--- a/snappymail/v/0.0.0/app/localization/zh-TW/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh-TW/user.json
@@ -1,540 +1,648 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
 		"TO_ARCHIVE": "封存",
-		"ARE_YOU_SURE": "確定?",
+		"ARE_YOU_SURE": "是否確定？",
 		"BACK": "返回",
-		"BCC": "密件複本",
+		"BCC": "密件副本",
 		"CANCEL": "取消",
-		"CC": "複本",
-		"CLEAR": "清理",
-		"CLOSE": "關閉 (Esc)",
+		"CC": "副本",
+		"CLEAR": "清除",
+		"CLOSE": "關閉",
 		"CONTACTS": "連絡人",
-		"DELETE": "已刪除郵件",
-		"DONE": "Done",
-		"EMAIL": "郵件",
-		"FROM": "發送自",
-		"LOADING": "載入...",
-		"LOGOUT": "註銷",
+		"DELETE": "刪除",
+		"UNDELETE": "撤銷刪除",
+		"DONE": "完成",
+		"EMAIL": "電子郵件",
+		"FROM": "寄件者",
+		"LOADING": "正在載入…",
+		"LOGOUT": "登出",
 		"MORE": "更多",
 		"MOVE_TO": "移至",
-		"NAME": "收件箱",
-		"NONE": "None",
-		"NOT_SPAM": "Not Spam",
+		"COPY_TO": "复制到",
+		"NAME": "名稱",
+		"NONE": "無",
+		"TO_SPAM": "移動郵件至垃圾郵件",
+		"NOT_SPAM": "非垃圾郵件",
+		"USERNAME": "使用者名稱",
 		"PASSWORD": "密碼",
-		"REPLY_TO": "Reply-To",
-		"SAVE": "保存",
-		"SEARCH": "沒找到連絡人",
+		"REMEMBER": "記住",
+		"REPLY_TO": "回覆",
+		"SAVE": "儲存",
+		"SAVE_CHANGES": "是否要儲存變更？",
+		"SEARCH": "搜尋",
 		"SPAM": "垃圾郵件",
-		"SUBJECT": "主題",
+		"SUBJECT": "主旨",
 		"TEST": "測試",
-		"TO": "發送到"
+		"TO": "收件者",
+		"SERVER_MESSAGE": "伺服器郵件",
+		"YES": "是",
+		"NO": "否",
+		"INACTIVE": "閒置中",
+		"DEFAULT": "預設",
+		"HELP": "協助",
+		"TEXT": "內文",
+		"ATTACHMENTS": "附件"
 	},
 	"LOGIN": {
-		"LABEL_LOGIN": "登錄",
+		"LABEL_LOGIN": "登入",
 		"LABEL_SIGN_ME": "記住我",
 		"BUTTON_SIGN_IN": "登入"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "添加帳戶",
-		"BUTTON_SETTINGS": "設置",
-		"BUTTON_HELP": "Help"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "Mobile version",
-		"BUTTON_DESKTOP_VERSION": "Desktop version"
+		"BUTTON_ADD_ACCOUNT": "新增帳戶"
 	},
 	"SEARCH": {
-		"TITLE_ADV": "高級搜索",
-		"LABEL_ADV_TEXT": "內容",
-		"LABEL_ADV_HAS_ATTACHMENT": "有附件",
-		"LABEL_ADV_HAS_ATTACHMENTS": "有附件",
-		"LABEL_ADV_FLAGGED": "標記",
-		"LABEL_ADV_UNSEEN": "Unseen",
-		"LABEL_ADV_DATE": "日期",
-		"LABEL_ADV_DATE_ALL": "所有郵件",
-		"LABEL_ADV_DATE_3_DAYS": "3天以內",
-		"LABEL_ADV_DATE_7_DAYS": "1周以內",
-		"LABEL_ADV_DATE_MONTH": "1月以內",
-		"LABEL_ADV_DATE_3_MONTHS": "3月以內",
-		"LABEL_ADV_DATE_6_MONTHS": "半年以內",
-		"LABEL_ADV_DATE_YEAR": "1年以內",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "Toggle fullscreen",
-		"ZOOM": "Zoom in\/out",
-		"CLOSE": "關閉 (Esc)",
-		"GALLERY_PREV": "向前 (Left arrow key)",
-		"GALLERY_NEXT": "向後 (Right arrow key)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
+		"TITLE_ADV": "進階搜尋",
+		"TEXT": "內文",
+		"HAS_ATTACHMENT": "有附件",
+		"FLAGGED": "已加星號",
+		"UNSEEN": "未讀取",
+		"DATE": "日期",
+		"DATE_ALL": "全部",
+		"BEFORE_3_DAYS": "三天以外",
+		"BEFORE_7_DAYS": "一週以外",
+		"BEFORE_MONTH": "一個月以外",
+		"BEFORE_3_MONTHS": "三個月以外",
+		"BEFORE_6_MONTHS": "半年以外",
+		"BEFORE_YEAR": "一年以外",
+		"SINCE_3_DAYS": "三天以內",
+		"SINCE_7_DAYS": "一週以內",
+		"SINCE_MONTH": "一個月以內",
+		"SINCE_3_MONTHS": "三個月以內",
+		"SINCE_6_MONTHS": "半年以內",
+		"SINCE_YEAR": "一年以內",
+		"SUBFOLDERS": "子資料夾",
+		"SUBFOLDERS_NONE": "無",
+		"SUBFOLDERS_SUBTREE": "全部",
+		"SUBFOLDERS_SUBTREE_ONE": "一層",
+		"REPLIED": "已回答",
+		"KEYWORD": "標記"
 	},
 	"FOLDER_LIST": {
-		"BUTTON_COMPOSE": "寫郵件",
-		"BUTTON_NEW_MESSAGE": "New message",
-		"INBOX_NAME": "收件箱",
-		"SENT_NAME": "已發郵件",
+		"BUTTON_COMPOSE": "撰寫",
+		"BUTTON_NEW_MESSAGE": "新郵件",
+		"INBOX_NAME": "收件匣",
+		"SENT_NAME": "寄件備份",
 		"DRAFTS_NAME": "草稿",
-		"TRASH_NAME": "已刪除郵件",
-		"ARCHIVE_NAME": "存檔"
+		"TRASH_NAME": "垃圾桶",
+		"ARCHIVE_NAME": "封存"
 	},
-	"QUOTA": {
-		"TITLE": "存儲空間使用量"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "重新載入郵寄清單",
-		"BUTTON_EMPTY_FOLDER": "清空資料夾",
-		"BUTTON_MULTY_FORWARD": "轉發郵件",
+		"BUTTON_RELOAD": "重新載入郵件清單",
+		"BUTTON_EMPTY_FOLDER": "清除資料夾",
+		"BUTTON_MULTY_FORWARD": "以附件方式轉寄",
 		"BUTTON_DELETE_WITHOUT_MOVE": "永久刪除",
-		"MENU_SET_SEEN": "標記為已讀",
-		"MENU_SET_ALL_SEEN": "標記全部為已讀",
-		"MENU_UNSET_SEEN": "標記為未讀",
-		"MENU_SET_FLAG": "加注星標",
-		"MENU_UNSET_FLAG": "移除星標",
+		"MENU_SET_SEEN": "標示為已讀取",
+		"MENU_SET_ALL_SEEN": "全部標示為已讀取",
+		"MENU_UNSET_SEEN": "標示為未讀取",
+		"MENU_SET_FLAG": "加入星號",
+		"MENU_UNSET_FLAG": "移除星號",
 		"MENU_SELECT_ALL": "全部",
 		"MENU_SELECT_INVERT": "選擇",
 		"MENU_SELECT_UNSEEN": "未讀",
-		"MENU_SELECT_SEEN": "已讀",
-		"MENU_SELECT_FLAGGED": "已加星標",
-		"MENU_SELECT_UNFLAGGED": "未加星標",
-		"EMPTY_LIST": "空列表。",
-		"EMPTY_SEARCH_LIST": "未找到您想要的。",
-		"SEARCH_RESULT_FOR": "搜索 \"%SEARCH%\" 的結果",
-		"BACK_TO_MESSAGE_LIST": "back to message list",
-		"EMPTY_SUBJECT_TEXT": "(無主題)",
-		"PUT_MESSAGE_HERE": "在這裡查看郵件",
-		"TODAY_AT": "今日於 %TIME%",
+		"MENU_SELECT_SEEN": "全部",
+		"MENU_SELECT_FLAGGED": "已加星號",
+		"MENU_SELECT_UNFLAGGED": "移除星號",
+		"DOWNLOAD_ALL_ATTACHMENTS": "下載全部附件",
+		"EMPTY_LIST": "空的清單。",
+		"EMPTY_SEARCH_LIST": "沒有郵件符合您的搜尋。",
+		"SEARCH_RESULT_FOR": "搜尋「%SEARCH%」的結果",
+		"BACK_TO_MESSAGE_LIST": "返回郵件清單",
+		"PUT_MESSAGE_HERE": "將郵件放置在這裡以在清單中檢視",
+		"TODAY_AT": "今天 %TIME%",
 		"YESTERDAY_AT": "昨天 %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "您有 %COUNT% 封新郵件！",
-		"QUOTA_SIZE": "使用了<strong>%LIMIT%<\/strong> 存儲空間中的<strong>%SIZE% (%PROC%%)<\/strong>",
-		"SORT": "Sort",
-		"SORT_DATE_ASC": "Date ascending",
-		"SORT_DATE_DESC": "Date descending",
-		"SORT_SIZE_ASC": "Size ascending",
-		"SORT_SIZE_DESC": "Size descending",
-		"SORT_SUBJECT_ASC": "Subject A-Z",
-		"SORT_SUBJECT_DESC": "Subject Z-A",
-		"SORT_FROM_ASC": "From A-Z",
-		"SORT_FROM_DESC": "From Z-A"
+		"QUOTA_SIZE": "已使用  <strong>%LIMIT%<\/strong> 中的 <strong>%SIZE% (%PROC%%)<\/strong> 儲存空間",
+		"SORT": "排序",
+		"NO_SORT": "郵件伺服器不支援排序",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
+		"SORT_DATE_ASC": "日期遞增",
+		"SORT_DATE_DESC": "日期遞減",
+		"SORT_SIZE_ASC": "大小遞增",
+		"SORT_SIZE_DESC": "大小遞減",
+		"SORT_SUBJECT_ASC": "主旨 (A 到 Z)",
+		"SORT_SUBJECT_DESC": "主旨 (Z 到 A)",
+		"SORT_FROM_ASC": "寄件者 (A 到 Z)",
+		"SORT_FROM_DESC": "寄件者 (Z 到 A)"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "編輯",
-		"BUTTON_UNSUBSCRIBE": "Unsubscribe from this list",
-		"BUTTON_REPLY": "回復",
-		"BUTTON_REPLY_ALL": "全部回復",
+		"BUTTON_UNSUBSCRIBE": "取消訂閱此清單",
+		"BUTTON_REPLY": "回覆",
+		"BUTTON_REPLY_ALL": "全部回覆",
 		"BUTTON_FORWARD": "轉發",
-		"BUTTON_FORWARD_AS_ATTACHMENT": "帶附件轉發",
-		"BUTTON_EDIT_AS_NEW": "Edit as New",
+		"BUTTON_FORWARD_AS_ATTACHMENT": "以附件方式轉寄",
+		"BUTTON_EDIT_AS_NEW": "在新撰寫中編輯",
 		"BUTTON_SHOW_IMAGES": "顯示外部圖片",
-		"BUTTON_NOTIFY_READ_RECEIPT": "The sender has asked to be notified when you read this message.",
-		"BUTTON_IN_NEW_WINDOW": "在新窗口中查看",
-		"BUTTON_THREAD_LIST": "Thread list",
-		"BUTTON_THREAD_PREV": "Previous",
-		"BUTTON_THREAD_NEXT": "Next",
-		"BUTTON_THREAD_MORE": "More messages",
+		"BUTTON_NOTIFY_READ_RECEIPT": "寄件者要求在您閱讀郵件時得到通知。",
+		"BUTTON_IN_NEW_WINDOW": "在另一個視窗中檢視",
+		"BUTTON_THREAD_LIST": "對話清單",
+		"BUTTON_THREAD_PREV": "上一個",
+		"BUTTON_THREAD_NEXT": "下一個",
+		"BUTTON_THREAD_MORE": "更多郵件",
 		"MENU_HEADERS": "顯示詳細資訊",
 		"MENU_VIEW_ORIGINAL": "顯示原始內容",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "作為 .eml 文件下載",
-		"MENU_FILTER_SIMILAR": "過濾郵件如此",
+		"HTML_VIEW": "檢視 HTML 郵件",
+		"PLAIN_VIEW": "檢視純文字郵件",
+		"SWAP_COLORS": "Swap default (background)color",
+		"MENU_DOWNLOAD_ORIGINAL": "下載為 .eml 檔案",
+		"MENU_FILTER_SIMILAR": "篩選這類郵件",
 		"MENU_PRINT": "列印郵件",
-		"EMPTY_SUBJECT_TEXT": "(無主題)",
+		"EMPTY_SUBJECT_TEXT": "(無主旨)",
 		"LABEL_DATE": "日期",
-		"LABEL_FROM_SHORT": "from",
-		"LABEL_TO_SHORT": "to",
+		"LABEL_FROM_SHORT": "寄件者",
+		"LABEL_TO_SHORT": "收件者",
 		"PRINT_LABEL_ATTACHMENTS": "附件",
-		"MESSAGE_VIEW_DESC": "在此查看列表中選中的郵件。",
-		"MESSAGE_VIEW_MOVE_DESC": "Click folder name in the left panel to select the destination.",
-		"LINK_DOWNLOAD_AS_ZIP": "Download as zip",
-		"SPAM_SCORE": "Spam Score",
-		"HAS_VIRUS_WARNING": "WARNING: virus detected"
+		"MESSAGE_VIEW_DESC": "選取任一郵件以在此清單中檢視。",
+		"MESSAGE_VIEW_MOVE_DESC": "在左面板點選資料夾名稱以選取目的地。",
+		"LINK_DOWNLOAD_AS_ZIP": "下載為 ZIP",
+		"SPAM_SCORE": "垃圾郵件計分",
+		"HAS_VIRUS_WARNING": "警告: 已偵測到病毒",
+		"TAGS": "標籤",
+		"NEW_TAG": "新增標籤",
+		"ENABLE_TRACKING_LINKS": "啓用跟蹤鏈接",
+		"TRACKING_ENABLED": "點擊鏈接時會被追蹤！"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "重要",
+		"$todo": "待辦事項",
+		"$label1": "重要",
+		"$label2": "工作",
+		"$label3": "個人",
+		"$label4": "待辦事項",
+		"$label5": "稍後"
 	},
 	"READ_RECEIPT": {
-		"SUBJECT": "Return Receipt (displayed) - %SUBJECT%",
-		"BODY": "This is a Return Receipt for the mail that you sent to %READ-RECEIPT%.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer.\nThere is no guarantee that the recipient has read or understood the message contents.\n"
+		"SUBJECT": "回條 (已顯示) - %SUBJECT%",
+		"BODY": "這是您寄到 %READ-RECEIPT% 的郵件回條。\n\n注意: 這份回條僅能認知到郵件已在收件者的電腦中顯示。\n無法確認收件者已閱讀或瞭解信中的內容\n"
 	},
 	"SUGGESTIONS": {
-		"SEARCHING_DESC": "搜索中..."
+		"SEARCHING_DESC": "正在搜尋…"
 	},
 	"CONTACTS": {
-		"BUTTON_ADD_CONTACT": "添加連絡人",
-		"BUTTON_CREATE_CONTACT": "新增連絡人",
-		"BUTTON_UPDATE_CONTACT": "更新連絡人",
-		"BUTTON_IMPORT": "導入 (csv, vcf, vCard)",
+		"TAB_CONTACT": "聯絡人",
+		"TAB_LOCATIONS": "地點",
+		"TAB_BUSINESS": "商務",
+		"LABEL_ORGANIZATION": "組織",
+		"LABEL_DEPARTMENT": "部門",
+		"LABEL_TITLE": "標題",
+		"TAB_CRYPTO": "Crypto",
+		"ASK": "詢問",
+		"NEVER": "永不",
+		"ALWAYS": "永遠",
+		"ALWAYS_IF_POSSIBLE": "可能的話永遠",
+		"BUTTON_ADD_CONTACT": "新增連絡人",
+		"BUTTON_CREATE_CONTACT": "建立",
+		"BUTTON_IMPORT": "匯入 (csv, vcf, vCard)",
 		"BUTTON_EXPORT_VCARD": "匯出 (vcf, vCard)",
 		"BUTTON_EXPORT_CSV": "匯出 (csv)",
-		"ERROR_IMPORT_FILE": "導入錯誤 (invalid file format)",
-		"EMPTY_LIST": "暫無連絡人",
-		"EMPTY_SEARCH": "沒找到連絡人",
-		"CLEAR_SEARCH": "清除搜索",
-		"CONTACT_VIEW_DESC": "在此查看在列表中選中的連絡人。",
-		"LABEL_PHONE": "電話",
-		"LABEL_WEB": "網站",
+		"ERROR_IMPORT_FILE": "匯入錯誤 (無效的檔案格式)",
+		"EMPTY_LIST": "沒有連絡人",
+		"EMPTY_SEARCH": "找不到連絡人",
+		"CLEAR_SEARCH": "清除搜尋",
+		"CONTACT_VIEW_DESC": "選取聯絡人以在清單中檢視。",
 		"LABEL_BIRTHDAY": "生日",
-		"LINK_ADD_EMAIL": "添加 Email 地址",
-		"LINK_ADD_PHONE": "添加電話",
-		"LINK_BIRTHDAY": "生日",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "顯示名稱",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名",
-		"PLACEHOLDER_ENTER_NICK_NAME": "昵稱",
-		"LABEL_READ_ONLY": "Read only",
-		"LABEL_SHARE": "分享",
-		"ADD_MENU_LABEL": "添加",
+		"DISPLAY_NAME": "顯示名稱",
+		"LAST_NAME": "姓",
+		"FIRST_NAME": "名",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "暱稱",
+		"LABEL_READ_ONLY": "唯讀",
+		"ADD_MENU_LABEL": "新增",
 		"ADD_MENU_NICKNAME": "暱稱",
-		"ADD_MENU_NOTES": "Notes",
+		"ADD_MENU_NOTE": "備註",
 		"ADD_MENU_PHONE": "電話",
 		"ADD_MENU_URL": "網址",
 		"ADD_MENU_ADDRESS": "地址",
 		"ADD_MENU_BIRTHDAY": "生日",
-		"ADD_MENU_TAGS": "Tags",
+		"ADD_MENU_TAGS": "標籤",
 		"BUTTON_SHARE_ALL": "所有人",
-		"BUTTON_SYNC": "同步 (CardDAV)"
+		"BUTTON_SYNC": "同步 (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "Send to all contact emails"
 	},
 	"COMPOSE": {
-		"LINK_SHOW_INPUTS": "顯示所有資訊",
-		"BUTTON_SEND": "發送",
-		"BUTTON_MINIMIZE": "Minimize",
-		"SAVED_TIME": "保存於 %TIME%",
-		"SAVED_ERROR_ON_SEND": "郵件已發送但並未保存在已發郵寄清單中。",
-		"DISCARD_UNSAVED_DATA": "Discard unsaved data?",
-		"ATTACH_FILES": "添加附件",
-		"ATTACH_DROP_FILES_DESC": "拖動文件至此",
-		"REPLY_MESSAGE_TITLE": "%DATETIME%, %EMAIL% 寫到",
-		"FORWARD_MESSAGE_TOP_TITLE": "-------- 轉發郵件 -------",
-		"FORWARD_MESSAGE_TOP_SENT": "發送",
-		"EMPTY_TO_ERROR_DESC": "請至少選擇一位接收人",
-		"NO_ATTACHMENTS_HERE_DESC": "No attachments here.",
-		"ATTACHMENTS_ERROR_DESC": "Warning! Not all attachments have been uploaded.",
-		"ATTACHMENTS_UPLOAD_ERROR_DESC": "Not all attachments have been uploaded yet",
-		"BUTTON_REQUEST_READ_RECEIPT": "Request a read receipt",
-		"BUTTON_MARK_AS_IMPORTANT": "Mark as important",
-		"BUTTON_REQUEST_DSN": "Request a delivery receipt"
+		"LINK_SHOW_INPUTS": "顯示所有欄位",
+		"BUTTON_SEND": "傳送",
+		"BUTTON_MINIMIZE": "最小化",
+		"SAVED_TIME": "儲存於 %TIME%",
+		"SAVED_ERROR_ON_SEND": "已傳送郵件，但未儲存寄件備份中。",
+		"DISCARD_UNSAVED_DATA": "捨棄未儲存的資料？",
+		"ATTACH_FILES": "附加檔案",
+		"ATTACH_DROP_FILES_DESC": "將檔案放置在這裡",
+		"REPLY_MESSAGE_TITLE": "於 %DATETIME%，%EMAIL% 寫到",
+		"FORWARD_MESSAGE_TOP_TITLE": "-------- 轉寄郵件 -------",
+		"FORWARD_MESSAGE_TOP_SENT": "已傳送",
+		"EMPTY_TO_ERROR_DESC": "請至少指定一位收件者",
+		"NO_ATTACHMENTS_HERE_DESC": "沒有附加檔案",
+		"ATTACHMENTS_ERROR_DESC": "警告! 並非全部附件皆已上傳完畢。",
+		"ATTACHMENTS_UPLOAD_ERROR_DESC": "並非全部附件皆已上傳完畢",
+		"ALLOW_SPELLCHECK": "啟用瀏覽器拼字檢查程式",
+		"ALLOW_DRAFT_AUTOSAVE": "自動儲存草稿",
+		"BUTTON_REQUEST_READ_RECEIPT": "請求已讀回條",
+		"BUTTON_MARK_AS_IMPORTANT": "標示為重要",
+		"BUTTON_REQUEST_DSN": "請求送達回條",
+		"BUTTON_REQUIRE_TLS": "需要安全傳遞",
+		"ERROR_EMPTY_BODY": "郵件內文為空"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "是",
-		"BUTTON_NO": "否",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "你確定要關閉此窗口嗎?",
-		"DESC_WANT_DELETE_MESSAGES": "你確定你要刪除這條消息嗎?"
+		"EXIT_ARE_YOU_SURE": "是否確定要結束？",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "是否確定要關閉視窗？",
+		"DESC_WANT_DELETE_MESSAGES": "是否確定要刪除郵件？"
 	},
 	"POPUPS_LANGUAGES": {
-		"TITLE_LANGUAGES": "選擇語言"
+		"TITLE_LANGUAGES": "選取語言"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "添加帳戶?",
-		"BUTTON_ADD_ACCOUNT": "添加",
-		"TITLE_UPDATE_ACCOUNT": "Update Account?",
-		"BUTTON_UPDATE_ACCOUNT": "Update"
+		"TITLE_ADD_ACCOUNT": "是否要新增帳戶",
+		"BUTTON_ADD_ACCOUNT": "新增",
+		"TITLE_UPDATE_ACCOUNT": "是否要更新帳戶"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "添加簽名?",
-		"TITLE_UPDATE_IDENTITY": "更新簽名?",
-		"BUTTON_ADD_IDENTITY": "添加",
-		"BUTTON_UPDATE_IDENTITY": "更新",
-		"LABEL_SIGNATURE_INSERT_BEFORE": "Insert this signature before quoted text in replies"
+		"TITLE_ADD_IDENTITY": "是否要新增識別檔",
+		"TITLE_UPDATE_IDENTITY": "是否要更新識別檔",
+		"LABEL": "標簽",
+		"BUTTON_ADD_IDENTITY": "新增",
+		"SIGNATURE": "簽名",
+		"LABEL_SIGNATURE_INSERT_BEFORE": "在回覆引用的訊息前插入此簽名"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "創建資料夾?",
+		"TITLE_CREATE_FOLDER": "是否要建立資料夾",
 		"LABEL_PARENT": "父資料夾",
-		"BUTTON_CREATE": "創建",
-		"TITLE_CREATING_PROCESS": "資料夾創建中"
+		"BUTTON_CREATE": "建立",
+		"TITLE_CREATING_PROCESS": "正在建立資料夾"
 	},
 	"POPUPS_CLEAR_FOLDER": {
-		"TITLE_CLEAR_FOLDER": "清理資料夾中所有郵件?",
+		"TITLE_CLEAR_FOLDER": "是否要清除資料夾中的全部郵件？",
 		"DANGER_DESC_WARNING": "警告！",
-		"DANGER_DESC_HTML_1": "此操作將完全刪除資料夾 <strong>%FOLDER%<\/strong> 中的所有郵件！",
-		"DANGER_DESC_HTML_2": "一旦操作執行，不可中斷和撤銷！",
-		"TITLE_CLEARING_PROCESS": "資料夾清理中..."
+		"DANGER_DESC_HTML_1": "此操作將完全刪除資料夾「<strong>%FOLDER%<\/strong>」中的所有郵件。",
+		"DANGER_DESC_HTML_2": "一旦執行操作，就無法中斷或取消。",
+		"TITLE_CLEARING_PROCESS": "正在清除資料夾…"
+	},
+	"CRYPTO": {
+		"SIGN": "簽署",
+		"ENCRYPT": "加密",
+		"DECRYPT": "解密",
+		"VERIFY": "驗證",
+		"GOOD_SIGNATURE": "來自「%USER%」的良好簽署",
+		"ERROR": "%TYPE% 錯誤: %ERROR%",
+		"CREATE_SELF_SIGNED": "創建自簽署",
+		"VALID_UNTIL": "有效期至",
+		"PRIVATE_KEY": "私鑰",
+		"CHANGE_PASS": "改變密碼",
+		"CURRENT_PASS": "現有密碼",
+		"NEW_PASS": "新密碼",
+		"ASK_CRYPTKEY_PASS": "台端之登入密碼業已改變。請鍵入舊密碼，以便解鎖資料。"
 	},
 	"OPENPGP": {
-		"POPUP_IMPORT_TITLE": "導入 OpenPGP 密鑰",
-		"POPUP_IMPORT_BUTTON": "導入",
-		"POPUP_VIEW_TITLE": "查看 OpenPGP 密鑰",
-		"POPUP_VIEW_BUTTON": "選擇",
-		"POPUP_GENERATE_TITLE": "生成 OpenPGP 密鑰",
-		"POPUP_GENERATE_BUTTON": "生成",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "Sign",
-		"LABEL_ENCRYPT": "Encrypt",
-		"BUTTON_DECRYPT": "Decrypt",
-		"BUTTON_VERIFY": "Verify",
-		"SIGNED_MESSAGE": "OpenPGP signed message",
-		"ENCRYPTED_MESSAGE": "OpenPGP encrypted message",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "Good signature from %USER%",
-		"ERROR": "OpenPGP error: %ERROR%"
+		"POPUP_IMPORT_TITLE": "匯入 OpenPGP 金鑰",
+		"POPUP_IMPORT_BUTTON": "匯入",
+		"POPUP_VIEW_TITLE": "檢視 OpenPGP 金鑰",
+		"POPUP_VIEW_BUTTON": "選取",
+		"POPUP_GENERATE_TITLE": "產生 OpenPGP 金鑰",
+		"POPUP_GENERATE_BUTTON": "產生",
+		"LABEL_KEY_TYPE": "類型",
+		"SIGNED_MESSAGE": "已透過 OpenPGP 簽署郵件",
+		"ENCRYPTED_MESSAGE": "已透過 OpenPGP 加密郵件",
+		"STORE_IN_GNUPG": "以 GnuPG 儲存在伺服器上",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "以 GnuPG 儲存公鑰在伺服器上",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "以 GnuPG 儲存私鑰在伺服器上",
+		"BACKUP_ON_SERVER": "在伺服器中儲存 (已加密)",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "在伺服器中儲存公鑰",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "在伺服器中儲存私鑰"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "匯入 S\/MIME 證書",
+		"CERTIFICATE": "證書",
+		"CERTIFICATES": "S\/MIME 證書",
+		"SIGNED_MESSAGE": "已透過 S\/MIME 簽署郵件",
+		"ENCRYPTED_MESSAGE": "已透過 S\/MIME 加密郵件",
+		"PRIVATE_KEY_OF": "%EMAIL% 的 S\/MIME 私鑰"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "Create a filter?",
-		"TITLE_EDIT_FILTER": "Update filter?",
-		"LEGEND_CONDITIONS": "Conditions",
-		"LEGEND_ACTIONS": "Actions",
-		"BUTTON_ADD_CONDITION": "Add a Condition",
-		"SELECT_ACTION_MOVE_TO": "Move to",
-		"SELECT_ACTION_FORWARD_TO": "Forward to",
-		"SELECT_ACTION_REJECT": "Reject",
-		"SELECT_ACTION_VACATION_MESSAGE": "Vacation message",
-		"SELECT_ACTION_DISCARD": "Discard",
-		"SELECT_FIELD_RECIPIENTS": "Recipients (To or CC)",
-		"SELECT_FIELD_HEADER": "Header",
-		"SELECT_FIELD_BODY": "Body",
-		"SELECT_FIELD_SIZE": "Size",
-		"SELECT_TYPE_CONTAINS": "Contains",
-		"SELECT_TYPE_NOT_CONTAINS": "Not Contains",
-		"SELECT_TYPE_MATCHES": "Matches (* and ? supported)",
-		"SELECT_TYPE_NOT_MATCHES": "Not Matches (* and ? supported)",
+		"TITLE_CREATE_FILTER": "是否要建立篩選器",
+		"TITLE_EDIT_FILTER": "是否要更新篩選器",
+		"LEGEND_CONDITIONS": "條件",
+		"LEGEND_ACTIONS": "操作",
+		"BUTTON_ADD_CONDITION": "新增條件",
+		"SELECT_ACTION_MOVE_TO": "移至",
+		"SELECT_ACTION_FORWARD_TO": "轉寄至",
+		"SELECT_ACTION_REJECT": "拒絕",
+		"SELECT_ACTION_VACATION_MESSAGE": "休假訊息",
+		"SELECT_ACTION_DISCARD": "捨棄",
+		"SELECT_FIELD_RECIPIENTS": "收件人 (收件者或副本)",
+		"SELECT_FIELD_HEADER": "標題",
+		"SELECT_FIELD_BODY": "內文",
+		"SELECT_FIELD_SIZE": "大小",
+		"SELECT_TYPE_CONTAINS": "包含",
+		"SELECT_TYPE_NOT_CONTAINS": "不包含",
+		"SELECT_TYPE_MATCHES": "相符 (支援 * 和 ?)",
+		"SELECT_TYPE_NOT_MATCHES": "不相符 (支援 * 和 ?)",
 		"SELECT_TYPE_REGEXP": "Regexp",
-		"SELECT_TYPE_NOT_REGEXP": "Not Regexp",
-		"SELECT_TYPE_EQUAL_TO": "Equal To",
-		"SELECT_TYPE_NOT_EQUAL_TO": "Not Equal To",
-		"SELECT_TYPE_OVER": "Over",
-		"SELECT_TYPE_UNDER": "Under",
-		"SELECT_TYPE_TEXT": "Text",
-		"SELECT_TYPE_RAW": "Raw",
-		"SELECT_MATCH_ANY": "Matching any of the following rules",
-		"SELECT_MATCH_ALL": "Matching all of the following rules",
-		"MARK_AS_READ_LABEL": "Mark as read",
-		"REPLY_INTERVAL_LABEL": "Reply interval (days)",
-		"KEEP_LABEL": "Keep",
-		"STOP_LABEL": "Don't stop processing rules",
-		"VACATION_SUBJECT_LABEL": "Subject (optional)",
-		"VACATION_MESSAGE_LABEL": "Message",
-		"VACATION_RECIPIENTS_LABEL": "Recipients (comma separated)",
-		"REJECT_MESSAGE_LABEL": "Reject message",
-		"ALL_INCOMING_MESSAGES_DESC": "All incoming messages"
+		"SELECT_TYPE_NOT_REGEXP": "不是 Regexp",
+		"SELECT_TYPE_EQUAL_TO": "等於",
+		"SELECT_TYPE_NOT_EQUAL_TO": "不等於",
+		"SELECT_TYPE_OVER": "大於",
+		"SELECT_TYPE_UNDER": "小於",
+		"SELECT_TYPE_TEXT": "文字",
+		"SELECT_TYPE_RAW": "原始",
+		"SELECT_MATCH_ANY": "比對下列任一規則",
+		"SELECT_MATCH_ALL": "比對下列全部規則",
+		"MARK_AS_READ_LABEL": "標記為已讀取",
+		"REPLY_INTERVAL_LABEL": "回覆間隔 (日)",
+		"KEEP_LABEL": "保留",
+		"STOP_LABEL": "停止進一步處理規則",
+		"VACATION_SUBJECT_LABEL": "主旨 (可選)",
+		"VACATION_MESSAGE_LABEL": "郵件",
+		"VACATION_RECIPIENTS_LABEL": "收件人 (逗點分隔)",
+		"REJECT_MESSAGE_LABEL": "拒絕郵件",
+		"ALL_INCOMING_MESSAGES_DESC": "全部內送郵件"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
-		"BUTTON_ADD_FILTER": "Add a Filter",
-		"BUTTON_RAW_SCRIPT": "Use Custom User Script",
-		"CAPABILITY_LABEL": "Capabilities",
-		"CHANGES_NEED_TO_BE_SAVED_DESC": "These changes need to be saved to the server."
+		"TITLE_CREATE": "建立指令檔",
+		"TITLE_EDIT": "編輯指令檔",
+		"BUTTON_ADD_FILTER": "新增篩選器",
+		"BUTTON_RAW_SCRIPT": "使用自訂使用者指令檔",
+		"CAPABILITY_LABEL": "功能",
+		"CHANGES_NEED_TO_BE_SAVED_DESC": "這些變更需要儲存於伺服器。"
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
-		"TITLE_SYSTEM_FOLDERS": "選擇系統資料夾",
-		"SELECT_CHOOSE_ONE": "選擇一個",
+		"TITLE_SYSTEM_FOLDERS": "選取系統資料夾",
+		"SELECT_CHOOSE_ONE": "選取一項",
 		"SELECT_UNUSE_NAME": "不使用",
-		"NOTIFICATION_SENT": "您沒有選擇 已發郵件 資料夾來存儲已發送郵件。\n如果您不希望保存已發郵件，請選擇 不使用 選項。\n",
-		"NOTIFICATION_DRAFTS": "您沒有選擇 草稿 資料夾來存儲郵件草稿。",
-		"NOTIFICATION_SPAM": "您沒有選擇 垃圾郵件 資料夾來存儲垃圾郵件。\n如果您希望永久刪除郵件，請選擇 不使用 選項。\n",
-		"NOTIFICATION_TRASH": "您沒有選擇 已刪除郵件 資料夾來存儲垃圾郵件。\n如果您希望永久刪除郵件，請選擇 不使用 選項。\n",
-		"NOTIFICATION_ARCHIVE": "You haven't selected \"Archive\" system folder achived messages are placed to.\n"
+		"NOTIFICATION_SENT": "尚未選取「寄件備份」系統資料夾以在寄件後存放郵件。\n如果不希望儲存寄件備份，請選取 [不使用] 選項。\n",
+		"NOTIFICATION_DRAFTS": "尚未選取「草稿」系統資料夾以在撰寫時存放草稿。",
+		"NOTIFICATION_SPAM": "尚未選取「垃圾郵件」系統資料夾以存放垃圾郵件。\n如果希望永久刪除郵件，請選取 [不使用] 選項。\n",
+		"NOTIFICATION_TRASH": "尚未選取「垃圾桶」系統資料夾以存放已刪除的郵件。\n如果希望永久刪除郵件，請選取 [不使用] 選項。\n",
+		"NOTIFICATION_ARCHIVE": "尚未選取「封存」系統資料夾以存放封存郵件。\n"
 	},
 	"TITLES": {
-		"MAILBOX": "郵箱",
-		"SETTINGS": "設置"
+		"MAILBOX": "信箱",
+		"SETTINGS": "設定"
 	},
 	"UPLOAD": {
-		"ERROR_FILE_IS_TOO_BIG": "文件太大",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "遭遇未知錯誤，檔無法上傳",
-		"ERROR_NO_FILE_UPLOADED": "沒有檔上傳",
-		"ERROR_MISSING_TEMP_FOLDER": "暫存檔案丟失",
-		"ERROR_ON_SAVING_FILE": "遭遇未知錯誤",
-		"ERROR_FILE_TYPE": "無效檔案類型",
-		"ERROR_UNKNOWN": "未知檔上傳錯誤"
+		"ERROR_FILE_IS_TOO_BIG": "檔案太大",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "僅上傳部分檔案，因為發生未知的錯誤。",
+		"ERROR_NO_FILE_UPLOADED": "沒有已上傳的檔案",
+		"ERROR_MISSING_TEMP_FOLDER": "找不到暫存檔案",
+		"ERROR_ON_SAVING_FILE": "發生未知的檔案上傳錯誤",
+		"ERROR_FILE_TYPE": "檔案類型無效",
+		"ERROR_UNKNOWN": "發生未知的檔案上傳錯誤"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> 純文字",
+		"SOURCE": "HTML <-> 原始碼",
+		"FONTFAMILY": "字型家族",
+		"FONTSIZE": "字型大小",
+		"DIR": "文字方向",
+		"DIR_LTR": "從左至右",
+		"DIR_RTL": "從右至左",
+		"DIR_AUTO": "自動",
+		"TEXTCOLOR": "文字色彩",
+		"BACKGROUNDCOLOR": "背景色彩",
+		"BOLD": "粗體",
+		"ITALIC": "斜體",
+		"UNDERLINE": "底線",
+		"STRIKE": "刪除線",
+		"SUB": "下標",
+		"SUP": "上標",
+		"OL": "排序清單",
+		"UL": "取消排序清單",
+		"QUOTE": "引言區塊",
+		"INDENTDECREASE": "減少縮排",
+		"INDENTINCREASE": "增加縮排",
+		"LINK": "連結",
+		"IMAGEURL": "圖片 URL",
+		"IMAGEUPLOAD": "圖片選取",
+		"UNDO": "復原",
+		"REDO": "取消復原",
+		"REMOVESTYLE": "移除格式"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "個人",
-		"LABEL_GENERAL_NAME": "一般設置",
-		"LABEL_CONTACTS_NAME": "連絡人",
-		"LABEL_FOLDERS_NAME": "資料夾",
-		"LABEL_ACCOUNTS_NAME": "帳戶",
-		"LABEL_FILTERS_NAME": "Filters",
-		"LABEL_SECURITY_NAME": "安全",
-		"LABEL_THEMES_NAME": "主題"
+		"GENERAL": "一般設定",
+		"CONTACTS": "連絡人",
+		"FOLDERS": "資料夾",
+		"ACCOUNTS": "帳戶",
+		"FILTERS": "篩選器",
+		"SECURITY": "安全性",
+		"THEMES": "佈景主題"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "Filters",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
-		"SUBNAME_MOVE_TO": "Move to \"%FOLDER%\"",
-		"SUBNAME_FORWARD_TO": "Forward to \"%EMAIL%\"",
-		"SUBNAME_REJECT": "Reject",
-		"SUBNAME_VACATION_MESSAGE": "Vacation message",
-		"SUBNAME_DISCARD": "Discard",
-		"LOADING_PROCESS": "Updating filter list"
+		"SIMPLE": "簡易",
+		"ADVANCED": "進階",
+		"BUTTON_ADD_SCRIPT": "新增指令檔",
+		"SUBNAME_MOVE_TO": "移至「%FOLDER%」",
+		"SUBNAME_FORWARD_TO": "轉寄至「%EMAIL%」",
+		"SUBNAME_REJECT": "拒絕",
+		"SUBNAME_VACATION_MESSAGE": "休假訊息",
+		"SUBNAME_DISCARD": "捨棄"
 	},
 	"SETTINGS_SECURITY": {
-		"LEGEND_SECURITY": "Security",
-		"LABEL_AUTOLOGOUT": "Auto Logout",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "Never",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% minute(s)",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% hour(s)"
+		"LEGEND_SECURITY": "安全性",
+		"LABEL_AUTOLOGOUT": "自動登出",
+		"FORGET_KEY_PASS": "忘記私鑰密碼",
+		"NEVER": "永不"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "一般設置",
-		"LABEL_LANGUAGE": "語言",
-		"LABEL_IDENTITY": "Identity",
-		"LABEL_LAYOUT": "Layout",
-		"LABEL_LAYOUT_NO_SPLIT": "No Split",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "Vertical Split",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "Horizontal Split",
-		"LABEL_EDITOR": "默認格式",
-		"LABEL_EDITOR_HTML": "Html",
-		"LABEL_EDITOR_PLAIN": "Plain",
-		"LABEL_EDITOR_HTML_FORCED": "Html (forced)",
-		"LABEL_EDITOR_PLAIN_FORCED": "Plain (forced)",
-		"LABEL_VIEW_OPTIONS": "視圖選項",
-		"LABEL_USE_PREVIEW_PANE": "使用預覽",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "清單中顯示多選框",
-		"LABEL_USE_THREADS": "使用對話",
-		"LABEL_REPLY_SAME_FOLDER": "將回復的郵件放置到其回復的郵件所在資料夾",
-		"LABEL_SHOW_IMAGES": "總是顯示外部圖片資訊",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "Remove background and text colors from message body",
-		"LABEL_MESSAGE_PER_PAGE": "封郵件每頁",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "Mark message as read after",
-		"SECONDS": "seconds",
-		"LABEL_NOTIFICATIONS": "通知",
-		"LABEL_SOUND_NOTIFICATION": "Sound notification",
-		"LABEL_CHROME_NOTIFICATION_DESC": "顯示新郵件彈窗",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(被瀏覽器阻止)"
+		"LANGUAGE": "語言",
+		"HOUR_FORMAT": "小時格式",
+		"IDENTITY": "識別檔",
+		"LAYOUT": "版面配置",
+		"LAYOUT_NO_SPLIT": "不分割",
+		"LAYOUT_VERTICAL_SPLIT": "垂直分割",
+		"LAYOUT_HORIZONTAL_SPLIT": "水平分割",
+		"SHOW_NEXT_MESSAGE": "當移動或移除目前郵件時，顯示下一個郵件",
+		"EDITOR": "預設文字編輯器",
+		"EDITOR_HTML": "HTML",
+		"EDITOR_PLAIN": "純文字",
+		"VIEW_OPTIONS": "檢視選項",
+		"USE_PREVIEW_PANE": "使用預覽窗格",
+		"HIDE_DELETED_MESSAGES": "隱藏標示為已刪除的郵件",
+		"USE_CHECKBOXES_IN_LIST": "在清單中顯示核取方塊",
+		"USE_THREADS": "使用對話",
+		"THREAD_ALGORITHM": "對話演算法",
+		"REPLY_SAME_FOLDER": "放置回覆的郵件在其所在資料夾",
+		"PREFER_HTML": "偏好 HTML",
+		"PREFER_HTML_INFO": "部分郵件會有兩種格式。此選項旨在設定郵件應優先顯示 HTML 格式，或純文字格式。",
+		"REMOVE_COLORS": "從郵件內文中移除背景和文字顏色",
+		"ALLOW_STYLES": "允許 <style> CSS",
+		"MESSAGE_PER_PAGE": "僅檢視一封郵件",
+		"CHECK_MAIL_INTERVAL": "檢查郵件間隔",
+		"MARK_MESSAGE_READ_AFTER": "在閱讀郵件後標記為已讀取",
+		"MSG_DEFAULT_ACTION": "預設操作",
+		"SECONDS": "秒",
+		"MINUTES": "分",
+		"NOTIFICATIONS": "通知",
+		"SOUND_NOTIFICATION": "通知音效",
+		"CHROME_NOTIFICATION_DESC": "顯示新郵件通知快顯",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(遭瀏覽器封鎖)",
+		"COLLAPSE_BLOCKQUOTES": "摺疊引文",
+		"MAX_QUOTE_LEVEL": "最大化顯示引文",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "在清單中顯示內嵌附件",
+		"LIST_SIMPLE_ATTACHMENTS": "簡易附件清單",
+		"LIST_MESSAGES_GROUPED": "郵件清單已分組 (當以日期或寄件者排序)",
+		"EXTERNAL_IMAGES": "外部圖片",
+		"IMAGES_OPTION_ASK": "每次都要詢問",
+		"IMAGES_OPTION_WHITELIST": "白名單或詢問",
+		"IMAGES_OPTION_ALWAYS": "永遠顯示",
+		"IMAGES_WHITELIST": "圖片白名單",
+		"MESSAGE_POPUP_WINDOW": "在新彈出窗口而非分頁中打開",
+		"MAILTO": "注冊成 mailto: 連結處理器",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "自動添加到你的位址簿",
-		"LEGEND_CONTACTS_SYNC": "遠程同步(CardDAV)",
-		"LABEL_CONTACTS_SYNC_ENABLE": "啟用遠程同步",
+		"LABEL_CONTACTS_AUTOSAVE": "自動新增收件者至通訊錄",
+		"LEGEND_CONTACTS_SYNC": "遠端同步 (CardDAV)",
+		"LABEL_CONTACTS_SYNC_ENABLE": "啟用遠端同步",
 		"LABEL_CONTACTS_SYNC_SERVER": "伺服器",
-		"LABEL_CONTACTS_SYNC_AB_URL": "地址簿URL",
-		"LABEL_CONTACTS_SYNC_USER": "用戶名",
-		"SYNC_NO": "否",
-		"SYNC_YES": "是",
-		"SYNC_READ": "Read only"
+		"LABEL_CONTACTS_SYNC_AB_URL": "通訊錄 URL",
+		"LABEL_CONTACTS_SYNC_USER": "使用者名稱",
+		"SYNC_READ": "唯讀"
 	},
 	"SETTINGS_THEMES": {
-		"LEGEND_THEMES": "主題",
-		"LEGEND_THEMES_CUSTOM": "自訂主題設置",
-		"LABEL_CUSTOM_TYPE": "類型",
-		"LABEL_CUSTOM_TYPE_LIGHT": "明亮",
-		"LABEL_CUSTOM_TYPE_DARK": "暗沉",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
-		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "上傳背景 (JPG, PNG)",
-		"ERROR_FILE_IS_TOO_BIG": "文件太大",
-		"ERROR_FILE_TYPE_ERROR": "無效類型 (只支援JPG和PNG)",
-		"ERROR_UNKNOWN": "上傳時發生未知錯誤"
+		"LEGEND_THEMES": "佈景主題",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "字型",
+		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "上傳背景圖片 (JPG, PNG)",
+		"ERROR_FILE_IS_TOO_BIG": "檔案太大",
+		"ERROR_FILE_TYPE_ERROR": "類型無效 (僅支援 JPG 和 PNG)",
+		"ERROR_UNKNOWN": "發生未知的檔案上傳錯誤"
 	},
 	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "資料夾",
-		"BUTTON_CREATE": "新建資料夾",
-		"BUTTON_SYSTEM": "System Folders",
+		"LEGEND_FOLDERS": "資料夾清單",
+		"BUTTON_CREATE": "新增資料夾",
+		"BUTTON_SYSTEM": "系統資料夾",
 		"BUTTON_SUBSCRIBE": "訂閱",
 		"BUTTON_UNSUBSCRIBE": "取消訂閱",
-		"LOADING_PROCESS": "資料夾清單更新",
-		"CREATING_PROCESS": "資料夾創建中",
-		"DELETING_PROCESS": "資料夾刪除中",
-		"RENAMING_PROCESS": "資料夾重命名",
-		"TO_MANY_FOLDERS_DESC_1": "You have too many folders!",
-		"TO_MANY_FOLDERS_DESC_2": "We have shown only a part of them, to avoid performance problems.",
-		"HELP_DELETE_FOLDER": "Delete folder",
-		"HELP_SHOW_HIDE_FOLDER": "Show\/hide folder",
-		"HELP_CHECK_FOR_NEW_MESSAGES": "Check\/don't check for new messages",
-		"HIDE_UNSUBSCRIBED": "Hide unsubscribed folders",
-		"TYPE_CALENDAR": "Calendar",
-		"TYPE_CONFIGURATION": "Configuration",
-		"TYPE_CONTACTS": "Contacts",
-		"TYPE_FILES": "Files",
-		"TYPE_JOURNAL": "Journal",
-		"TYPE_NOTES": "Notes",
-		"TYPE_TASKS": "Tasks"
+		"LOADING_PROCESS": "正在更新資料夾清單",
+		"CREATING_PROCESS": "正在建立資料夾",
+		"DELETING_PROCESS": "正在刪除資料夾",
+		"RENAMING_PROCESS": "正在重新命名資料夾",
+		"TO_MANY_FOLDERS_DESC_1": "已建立過多資料夾！",
+		"TO_MANY_FOLDERS_DESC_2": "僅顯示部分資料夾，以避免性能問題。",
+		"HELP_DELETE_FOLDER": "刪除資料夾",
+		"HELP_SHOW_HIDE_FOLDER": "顯示\/隱藏資料夾",
+		"HELP_CHECK_FOR_NEW_MESSAGES": "檢查新郵件",
+		"HIDE_UNSUBSCRIBED": "隱藏取消訂閱的資料夾",
+		"UNHIDE_KOLAB_FOLDERS": "取消隱藏 Kolab 資料夾",
+		"TYPE_CALENDAR": "日曆",
+		"TYPE_CONFIGURATION": "設定",
+		"TYPE_CONTACTS": "聯絡人",
+		"TYPE_FILES": "檔案",
+		"TYPE_JOURNAL": "日誌",
+		"TYPE_NOTES": "筆記",
+		"TYPE_TASKS": "待辦事項"
 	},
 	"SETTINGS_ACCOUNTS": {
 		"LEGEND_ACCOUNTS": "帳戶列表",
-		"LEGEND_IDENTITIES": "Identities",
-		"LEGEND_ACCOUNTS_AND_IDENTITIES": "Accounts and Identities",
-		"BUTTON_ADD_ACCOUNT": "添加一個帳戶",
-		"BUTTON_ADD_IDENTITY": "Add an Identity",
-		"LOADING_PROCESS": "更新帳戶列表中",
-		"DEFAULT_IDENTITY_LABEL": "default"
+		"LEGEND_IDENTITIES": "識別",
+		"LEGEND_ACCOUNTS_AND_IDENTITIES": "帳戶和識別",
+		"BUTTON_ADD_ACCOUNT": "新增帳戶",
+		"BUTTON_ADD_IDENTITY": "新增識別檔",
+		"LOADING_PROCESS": "正在更新…",
+		"SHOW_UNREAD": "顯示未讀郵件數"
 	},
 	"SETTINGS_OPENPGP": {
-		"BUTTON_IMPORT_KEY": "導入 Key",
-		"BUTTON_GENERATE_KEY_PAIR": "生成 密鑰",
-		"TITLE_PRIVATE": "私有",
+		"BUTTON_IMPORT_KEY": "匯入金鑰",
+		"BUTTON_GENERATE_KEY_PAIR": "產生密鑰",
+		"IMPORT_FROM_SERVER": "從伺服器匯入",
+		"TITLE_PRIVATE": "私密",
 		"TITLE_PUBLIC": "公開",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "Automatically save draft",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "取得 Mailvelope 瀏覽器擴充功能"
 	},
 	"SHORTCUTS_HELP": {
-		"LEGEND_SHORTCUTS_HELP": "Keyboard shortcuts help",
-		"TAB_MAILBOX": "Mailbox",
-		"TAB_MESSAGE_LIST": "Message list",
-		"TAB_MESSAGE_VIEW": "Message view",
-		"TAB_COMPOSE": "Compose",
-		"LABEL_OPEN_USER_DROPDOWN": "Open user dropdown",
-		"LABEL_REPLY": "回復",
-		"LABEL_REPLY_ALL": "回復所有",
-		"LABEL_FORWARD": "Forward",
-		"LABEL_FORWARD_MULTIPLY": "Forward (multiply)",
-		"LABEL_HELP": "幫助",
-		"LABEL_CHECK_ALL": "檢查所有消息",
+		"LEGEND_SHORTCUTS_HELP": "鍵盤快速鍵協助",
+		"TAB_MAILBOX": "信箱",
+		"TAB_MESSAGE_LIST": "郵件清單",
+		"TAB_MESSAGE_VIEW": "檢視郵件",
+		"TAB_COMPOSE": "撰寫",
+		"LABEL_OPEN_USER_DROPDOWN": "開啟使用者下拉清單",
+		"LABEL_REPLY": "回覆",
+		"LABEL_REPLY_ALL": "全部回覆",
+		"LABEL_FORWARD": "轉寄",
+		"LABEL_FORWARD_MULTIPLY": "以附件方式轉寄",
+		"LABEL_CHECK_ALL": "選取全部郵件",
 		"LABEL_DELETE": "刪除",
-		"LABEL_OPEN_THREAD": "Open selected thread",
+		"LABEL_OPEN_THREAD": "開啟已選取的對話",
 		"LABEL_MOVE": "移動",
-		"LABEL_READ": "Read selected messages",
-		"LABEL_UNREAD": "Unread selected messages",
-		"LABEL_IMPORTANT": "Important, flag selected messages",
-		"LABEL_CANCEL_SEARCH": "Cancel search",
-		"LABEL_FULLSCREEN_ENTER": "Fullscreen (Preview pane layout)",
-		"LABEL_VIEW_MESSAGE_ENTER": "View message (No preview pane layout)",
-		"LABEL_SWITCH_TO_MESSAGE": "Switch focus to selected message",
-		"LABEL_SWITCH_TO_FOLDER_LIST": "Switch focus to folder list",
-		"LABEL_FULLSCREEN_TOGGLE": "Toggle fullscreen mode",
-		"LABEL_BLOCKQUOTES_TOGGLE": "Toggle message blockquotes",
-		"LABEL_THREAD_NEXT": "Next message in thread",
-		"LABEL_THREAD_PREV": "Previous message in thread",
-		"LABEL_PRINT": "Print",
-		"LABEL_EXIT_FULLSCREEN": "Exit fullscreen mode",
-		"LABEL_CLOSE_MESSAGE": "Close message (No preview pane layout)",
-		"LABEL_SWITCH_TO_LIST": "Switch focus back to message list",
-		"LABEL_OPEN_COMPOSE_POPUP": "Open compose popup",
-		"LABEL_MINIMIZE_COMPOSE_POPUP": "Minimize compose popup",
-		"LABEL_OPEN_IDENTITIES_DROPDOWN": "Open identities dropdown",
-		"LABEL_SAVE_MESSAGE": "Save message",
-		"LABEL_SEND_MESSAGE": "Send message",
-		"LABEL_CLOSE_COMPOSE": "Close compose"
+		"LABEL_READ": "讀取已選取的郵件",
+		"LABEL_UNREAD": "取消已讀選取的郵件",
+		"LABEL_IMPORTANT": "請注意，將加入星號至所選郵件",
+		"LABEL_CANCEL_SEARCH": "取消搜尋",
+		"LABEL_FULLSCREEN_ENTER": "全螢幕 (預覽窗格版面配置)",
+		"LABEL_VIEW_MESSAGE_ENTER": "顯示郵件 (不預覽窗格版面配置)",
+		"LABEL_SWITCH_TO_MESSAGE": "切換選取的所選郵件",
+		"LABEL_SWITCH_TO_FOLDER_LIST": "切換選取的資料夾清單",
+		"LABEL_FULLSCREEN_TOGGLE": "切換至全螢幕模式",
+		"LABEL_BLOCKQUOTES_TOGGLE": "切換至郵件區塊引述",
+		"LABEL_THREAD_NEXT": "在對話中顯示下一個郵件",
+		"LABEL_THREAD_PREV": "在對話中顯示上一個郵件",
+		"LABEL_EXIT_FULLSCREEN": "離開全螢幕模式",
+		"LABEL_CLOSE_MESSAGE": "關閉郵件 (不預覽窗格版面配置)",
+		"LABEL_SWITCH_TO_LIST": "切換反向選取由件清單",
+		"LABEL_OPEN_COMPOSE_POPUP": "開啟撰寫快顯",
+		"LABEL_MINIMIZE_COMPOSE_POPUP": "最小化撰寫快顯",
+		"LABEL_OPEN_IDENTITIES_DROPDOWN": "開啟識別下拉清單",
+		"LABEL_SAVE_MESSAGE": "儲存郵件",
+		"LABEL_SEND_MESSAGE": "傳送郵件",
+		"LABEL_CLOSE_COMPOSE": "關閉撰寫"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "無效標記",
-		"AUTH_ERROR": "認證失敗",
-		"CONNECTION_ERROR": "無法連接伺服器",
-		"DOMAIN_ALREADY_EXISTS": "域已經存在",
-		"DOMAIN_NOT_ALLOWED": "無法連接到該域或者未輸入域",
-		"ACCOUNT_NOT_ALLOWED": "帳戶不允許",
-		"CONTACTS_SYNC_ERROR": "連絡人同步錯誤",
-		"CANT_GET_MESSAGE_LIST": "無法獲取郵寄清單",
-		"CANT_GET_MESSAGE": "無法獲取郵件",
-		"CANT_DELETE_MESSAGE": "無法刪除郵件",
-		"CANT_COPY_MESSAGE": "Can't copy message",
-		"CANT_MOVE_MESSAGE": "無法移動郵件",
-		"CANT_SAVE_MESSAGE": "無法保存郵件",
-		"CANT_SEND_MESSAGE": "無法發送郵件",
-		"INVALID_RECIPIENTS": "無效接收人",
-		"CANT_SAVE_FILTERS": "Can't save filters",
-		"CANT_GET_FILTERS": "Can't get filters",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "Filters are not correct",
-		"CANT_CREATE_FOLDER": "無法創建資料夾",
-		"CANT_RENAME_FOLDER": "無法重命名資料夾",
-		"CANT_DELETE_FOLDER": "無法刪除資料夾",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "無法刪除非空資料夾",
-		"CANT_SUBSCRIBE_FOLDER": "無法訂閱資料夾",
-		"CANT_UNSUBSCRIBE_FOLDER": "無法取消訂閱資料夾",
-		"DEMO_SEND_MESSAGE_ERROR": "出於安全考慮，測試帳號無法發送外部郵件。",
-		"DEMO_ACCOUNT_ERROR": "For security purposes, this account is not allowed for this action!",
-		"ACCOUNT_ALREADY_EXISTS": "帳戶已存在",
-		"ACCOUNT_DOES_NOT_EXIST": "Account doesn't exist",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "訪問郵件伺服器遇到錯誤。",
-		"INVALID_INPUT_ARGUMENT": "Invalid input argument",
-		"UNKNOWN_ERROR": "未知錯誤"
+		"RequestError": "請求失敗",
+		"RequestAborted": "已中止請求",
+		"RequestTimeout": "請求逾時",
+		"InvalidToken": "標記無效",
+		"AuthError": "驗證失敗",
+		"ConnectionError": "無法連線至伺服器",
+		"DomainAlreadyExists": "域名已經存在",
+		"DomainNotAllowed": "不可使用該域名",
+		"AccountNotAllowed": "不可使用該帳戶",
+		"CryptKeyError": "登入密碼已改變",
+		"ContactsSyncError": "連絡人同步錯誤",
+		"CantGetMessageList": "無法取得郵件清單",
+		"CantGetMessage": "無法取得郵件",
+		"CantDeleteMessage": "無法刪除郵件",
+		"CantCopyMessage": "無法複製郵件",
+		"CantMoveMessage": "無法移動郵件",
+		"CantSaveMessage": "無法儲存郵件",
+		"CantSendMessage": "無法傳送郵件",
+		"InvalidRecipients": "收件人無效",
+		"CantSaveFilters": "無法儲存篩選器",
+		"CantGetFilters": "無法取得篩選器",
+		"CantActivateFiltersScript": "無法啟用篩選器指令檔",
+		"CantDeleteFiltersScript": "無法刪除篩選器指令檔",
+		"FiltersAreNotCorrect": "篩選器不正確",
+		"CantCreateFolder": "無法新增資料夾",
+		"CantRenameFolder": "無法重新命名資料夾",
+		"CantDeleteFolder": "無法刪除資料夾",
+		"CantDeleteNonEmptyFolder": "無法刪除非空資料夾",
+		"CantSubscribeFolder": "無法訂閱資料夾",
+		"CantUnsubscribeFolder": "無法取消訂閱資料夾",
+		"DemoSendMessageError": "基於安全性考量，此帳戶不允許傳送郵件至外部電子郵件地址。",
+		"DemoAccountError": "基於安全性考量，此帳戶不允許執行此操作！",
+		"AccountAlreadyExists": "帳戶已經存在",
+		"AccountDoesNotExist": "帳戶不存在",
+		"AccountSwitchFailed": "切換至「%EMAIL%」帳戶時失敗",
+		"MailServerError": "存取郵件伺服器時發生錯誤。",
+		"InvalidInputArgument": "輸入引數無效",
+		"UnknownError": "未知錯誤"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json b/snappymail/v/0.0.0/app/localization/zh/admin.json
similarity index 66%
rename from snappymail/v/0.0.0/app/localization/zh-CN/admin.json
rename to snappymail/v/0.0.0/app/localization/zh/admin.json
index 1d8501628..36d58430f 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/admin.json
+++ b/snappymail/v/0.0.0/app/localization/zh/admin.json
@@ -1,27 +1,35 @@
 {
 	"GLOBAL": {
+		"ADD": "添加",
+		"CLOSE": "关闭",
 		"SAVE": "保存",
-		"UPDATE": "更新"
+		"TEST": "测试",
+		"UPDATE": "更新",
+		"USERNAME": "用户名",
+		"PASSWORD": "密码",
+		"CANCEL": "取消",
+		"SEARCH": "搜索",
+		"YES": "是",
+		"NO": "否"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
-		"LABEL_PASSWORD": "密码",
-		"LABEL_TOTP": "TOTP代碼",
+		"LABEL_TOTP": "TOTP 密码",
 		"BUTTON_LOGIN": "登录到控制面板"
 	},
 	"TOP_PANEL": {
 		"LABEL_ADMIN_PANEL": "控制面板"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_GENERAL_NAME": "常规",
-		"LABEL_LOGIN_NAME": "登录",
-		"LABEL_BRANDING_NAME": "Logo",
-		"LABEL_CONTACTS_NAME": "联系人",
-		"LABEL_DOMAINS_NAME": "域名",
-		"LABEL_SECURITY_NAME": "安全",
-		"LABEL_PACKAGES_NAME": "插件包",
-		"LABEL_CONFIG_NAME": "Config",
-		"LABEL_ABOUT_NAME": "关于"
+		"GENERAL": "常规",
+		"LOGIN": "登录",
+		"BRANDING": "Logo",
+		"CONTACTS": "联系人",
+		"DOMAINS": "域名",
+		"SECURITY": "安全",
+		"PACKAGES": "插件包",
+		"CONFIG": "配置",
+		"ABOUT": "关于"
 	},
 	"TAB_GENERAL": {
 		"LEGEND_INTERFACE": "界面",
@@ -31,7 +39,6 @@
 		"LABEL_ALLOW_LANGUAGES_ON_SETTINGS": "允许在设置界面中选择语言",
 		"LABEL_ALLOW_THEMES_ON_SETTINGS": "允许在设置界面中选择主题",
 		"LABEL_ALLOW_BACKGROUND_ON_SETTINGS": "允许在设置界面中选择背景",
-		"LABEL_NEW_FOLDER_MOVE": "使用新的“移动”按钮样式",
 		"LABEL_SHOW_THUMBNAILS": "显示缩略图(附件)",
 		"LEGEND_MAIN": "主要设置",
 		"LABEL_ATTACHMENT_SIZE_LIMIT": "附件大小限制",
@@ -46,8 +53,7 @@
 		"LABEL_DEFAULT_DOMAIN": "默认域名",
 		"LABEL_DETERMINE_USER_DOMAIN": "尝试判断用户使用的域名",
 		"LABEL_ALLOW_LANGUAGES_ON_LOGIN": "允许在登录界面选择语言",
-		"LABEL_DETERMINE_USER_LANGUAGE": "尝试判断用户使用语言",
-		"LABEL_HIDE_SUBMIT_BUTTON": "隐藏“登录”按钮"
+		"LABEL_DETERMINE_USER_LANGUAGE": "尝试判断用户使用语言"
 	},
 	"TAB_BRANDING": {
 		"LEGEND_BRANDING": "Logo",
@@ -64,31 +70,30 @@
 		"LABEL_STORAGE_DSN": "Dsn",
 		"LABEL_STORAGE_USER": "用户",
 		"LABEL_STORAGE_PASSWORD": "密码",
-		"BUTTON_TEST": "测试",
+		"SQLITE_GLOBAL": "使用全局数据库替代各账号的数据库",
 		"ALERT_NOTICE": "提示!",
+		"SUGGESTIONS_LIMIT": "建议数量上限",
 		"HTML_ALERT_DO_NOT_USE_THIS_DATABASE": "如果有大量的活跃用户，请不要选择此数据库类型。",
-		"HTML_ALERT_DOES_NOT_SUPPORTED": "你的系统不支持联系人\n<br>\n你需要在你的服务器上安装或启用<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 组件。\n"
+		"HTML_ALERT_DOES_NOT_SUPPORTED": "您的系统不支持联系人\n<br>\n您需要在您的服务器上安装或启用<strong>PDO (SQLite \/ MySQL \/ PostgreSQL)<\/strong> 组件。\n"
 	},
 	"TAB_DOMAINS": {
 		"LEGEND_DOMAINS": "域名",
 		"BUTTON_ADD_DOMAIN": "添加域名",
 		"BUTTON_ADD_ALIAS": "添加别名",
-		"DELETE_ARE_YOU_SURE": "你确定吗？",
-		"HTML_DOMAINS_HELPER": "允许访问的域名。\n<br>\n点击域名进行设置。\n"
+		"DELETE_ARE_YOU_SURE": "您确定吗？",
+		"HTML_DOMAINS_HELPER": "允许访问的域名列表。\n<br>\n点击域名进行设置。\n"
 	},
 	"TAB_SECURITY": {
 		"LEGEND_SECURITY": "安全",
 		"LABEL_USE_IMAGE_PROXY": "对外部图片使用本地代理",
-		"LABEL_ALLOW_OPEN_PGP": "允许使用 OpenPGP",
+		"LABEL_AUTO_VERIFY": "自动验证签名",
 		"LABEL_SHOW_PHP_INFO": "显示 PHP 信息",
 		"LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS": "管理员面板访问凭据",
 		"LABEL_CURRENT_PASSWORD": "当前密码",
-		"LABEL_NEW_LOGIN": "新的登录用户名",
 		"LABEL_NEW_PASSWORD": "新密码",
 		"LABEL_REPEAT_PASSWORD": "重复输入新密码",
-		"BUTTON_UPDATE_PASSWORD": "更新密码",
-		"LEGEND_SSL": "SSL",
-		"LABEL_REQUIRE_VERIFICATION": "要求验证 SSL 证书（IMAP\/SMTP）",
+		"LABEL_REQUIRE_VERIFICATION": "要求验证 SSL 证书",
+		"CRYPTO": "加密",
 		"LABEL_ALLOW_SELF_SIGNED": "允许自签名证书"
 	},
 	"TAB_PACKAGES": {
@@ -103,18 +108,16 @@
 		"LABEL_TAG_HINT": "简洁、现代化、快速的网页邮件客户端",
 		"LABEL_ALL_RIGHTS_RESERVED": "保留所有权利",
 		"HINT_READ_CHANGE_LOG": "请在更新前阅读更新日志",
-		"HINT_IS_UP_TO_DATE": "RainLoop已经是最新版本的",
+		"HINT_IS_UP_TO_DATE": "SnappyMail已经是最新版本的",
 		"HTML_NEW_VERSION": "有新的<b>%VERSION%<\/b> 版本可用.",
 		"LABEL_UPDATING": "更新中",
 		"LABEL_CHECKING": "检查更新",
-		"BUTTON_RELEASES": "Releases"
+		"BUTTON_RELEASES": "发行版"
 	},
 	"POPUPS_DOMAIN_ALIAS": {
 		"TITLE_ADD_DOMAIN_ALIAS": "添加别名",
 		"LABEL_ALIAS": "别名",
-		"LABEL_DOMAIN": "域名",
-		"BUTTON_CLOSE": "关闭",
-		"BUTTON_ADD": "添加"
+		"LABEL_DOMAIN": "域名"
 	},
 	"POPUPS_DOMAIN": {
 		"TITLE_ADD_DOMAIN": "添加域名",
@@ -122,48 +125,40 @@
 		"TITLE_EDIT_DOMAIN": "编辑域名 \"%NAME%\"",
 		"LABEL_NAME": "名字",
 		"NAME_HELPER": "支持通配符",
-		"LABEL_IMAP": "IMAP",
-		"LABEL_SMTP": "SMTP",
-		"LABEL_SIEVE": "SIEVE",
 		"LABEL_SERVER": "服务器",
 		"LABEL_PORT": "端口",
 		"LABEL_SECURE": "加密",
-		"LABEL_WHITE_LIST": "白名单",
+		"TIMEOUT": "超时",
+		"DISABLE_CAPABILITIES": "禁用能力",
+		"LIMITS": "限制",
+		"FOLDERS": "文件夹",
+		"MESSAGES": "消息",
 		"SECURE_OPTION_NONE": "无",
-		"SECURE_OPTION_SSL": "SSL\/TLS",
-		"SECURE_OPTION_STARTTLS": "STARTTLS",
 		"LABEL_ALLOW_SIEVE_SCRIPTS": "可使用筛选脚本",
 		"LABEL_USE_SHORT_LOGIN": "使用短用户名登录",
+		"LABEL_LOWERCASE_LOGIN": "小写登录 (大小写敏感)",
 		"LABEL_USE_AUTH": "使用认证",
 		"LABEL_SET_SENDER": "使用登录名作为发件人",
+		"LABEL_AUTH_PLAIN_LINE": "强制单一 AUTH PLAIN 命令登录",
 		"LABEL_USE_PHP_MAIL": "使用 php mail() 函数",
-		"BUTTON_TEST": "测试",
 		"BUTTON_WHITE_LIST": "白名单",
-		"BUTTON_SIEVE_CONFIGURATION": "筛选设置",
-		"BUTTON_BACK_TO_IMAP": "回到 IMAP 设置",
-		"BUTTON_BACK": "返回",
-		"BUTTON_CLOSE": "关闭",
-		"BUTTON_ADD": "添加",
-		"BUTTON_UPDATE": "更新",
-		"NEW_DOMAIN_DESC": "此域名配置将允许你<br>和<i>%NAME%<\/i>电子邮件地址一起工作.",
-		"WHITE_LIST_ALERT": "允许访问的域用户；使用空格分隔。\n"
+		"NEW_DOMAIN_DESC": "此域名配置将允许您和<strong>%NAME%<\/strong>电子邮件地址一起工作.",
+		"WHITE_LIST_ALERT": "允许访问的域用户；使用空格分隔。\n",
+		"VALID_SPAM_HEADERS": "Valid SPAM headers",
+		"VALID_VIRUS_HEADERS": "Valid virus headers"
 	},
 	"POPUPS_PLUGIN": {
 		"TITLE_PLUGIN": "插件",
-		"DESC_NOTHING_TO_CONFIGURE": "无可用配置",
-		"BUTTON_CLOSE": "关闭"
+		"DESC_NOTHING_TO_CONFIGURE": "无可用配置"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "是",
-		"BUTTON_NO": "否",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "你确定要关闭此窗口吗？"
+		"DESC_WANT_CLOSE_THIS_WINDOW": "您确定要关闭此窗口吗？"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "选择您的语言"
 	},
 	"HINTS": {
 		"BETA": "测试版本",
-		"UNSTABLE": "不稳定版本",
 		"WARNING": "警告"
 	},
 	"ERRORS": {
@@ -171,14 +166,17 @@
 		"UNKNOWN_ERROR": "未知错误"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "无效标记",
-		"AUTH_ERROR": "认证失败",
-		"DOMAIN_ALREADY_EXISTS": "域名已经存在",
-		"CANT_SAVE_PLUGIN_SETTINGS": "无法保存设置",
-		"CANT_INSTALL_PACKAGE": "安装插件包失败",
-		"CANT_DELETE_PACKAGE": "移除插件包失败",
-		"INVALID_PLUGIN_PACKAGE": "无效插件包",
-		"UNSUPPORTED_PLUGIN_PACKAGE": "不支持的插件包",
-		"UNKNOWN_ERROR": "未知错误"
+		"RequestError": "请求失败",
+		"RequestAborted": "请求中止",
+		"RequestTimeout": "请求超时",
+		"InvalidToken": "无效标记",
+		"AuthError": "认证失败",
+		"DomainAlreadyExists": "域名已经存在",
+		"CantSavePluginSettings": "无法保存设置",
+		"CantInstallPackage": "安装插件包失败",
+		"CantDeletePackage": "移除插件包失败",
+		"InvalidPluginPackage": "无效插件包",
+		"UnsupportedPluginPackage": "不支持的插件包",
+		"UnknownError": "未知错误"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/localization/zh/relativetimeformat.js b/snappymail/v/0.0.0/app/localization/zh/relativetimeformat.js
new file mode 100644
index 000000000..42f18e646
--- /dev/null
+++ b/snappymail/v/0.0.0/app/localization/zh/relativetimeformat.js
@@ -0,0 +1,31 @@
+{
+	year: {
+		past: "{0} 年前",
+		future: "{0} 年后"
+	},
+	month: {
+		past: "{0} 个月前",
+		future: "{0} 个月后"
+	},
+	week: {
+		past: "{0} 周前",
+		future: "{0} 周后"
+	},
+	day: {
+		past: "{0} 天前",
+		future: "{0} 天后"
+	},
+	hour: {
+		past: "{0} 小时前",
+		future: "{0} 小时后"
+	},
+	minute: {
+		past: "{0} 分钟前",
+		future: "{0} 分钟后"
+	},
+	second: {
+		past: "{0} 秒前",
+		future: "{0} 秒后"
+	},
+	plural: n => 'other'
+}
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/static.json b/snappymail/v/0.0.0/app/localization/zh/static.json
similarity index 100%
rename from snappymail/v/0.0.0/app/localization/zh-CN/static.json
rename to snappymail/v/0.0.0/app/localization/zh/static.json
diff --git a/snappymail/v/0.0.0/app/localization/zh-CN/user.json b/snappymail/v/0.0.0/app/localization/zh/user.json
similarity index 54%
rename from snappymail/v/0.0.0/app/localization/zh-CN/user.json
rename to snappymail/v/0.0.0/app/localization/zh/user.json
index 9ae4680ad..5ad081b45 100644
--- a/snappymail/v/0.0.0/app/localization/zh-CN/user.json
+++ b/snappymail/v/0.0.0/app/localization/zh/user.json
@@ -1,33 +1,48 @@
 {
+	"LANG_DIR": "ltr",
 	"GLOBAL": {
-		"TO_ARCHIVE": "存檔",
-		"ARE_YOU_SURE": "确定？",
+		"TO_ARCHIVE": "存档",
+		"ARE_YOU_SURE": "您是否确定？",
 		"BACK": "返回",
 		"BCC": "密送",
 		"CANCEL": "取消",
 		"CC": "抄送",
-		"CLEAR": "取消",
+		"CLEAR": "清除",
 		"CLOSE": "关闭",
 		"CONTACTS": "联系人",
 		"DELETE": "删除",
+		"UNDELETE": "撤销删除",
 		"DONE": "完成",
 		"EMAIL": "邮箱",
-		"FROM": "发送自",
+		"FROM": "发件人",
 		"LOADING": "加载中",
 		"LOGOUT": "注销",
 		"MORE": "更多",
 		"MOVE_TO": "移至",
+		"COPY_TO": "复制到",
 		"NAME": "名称",
 		"NONE": "无",
-		"NOT_SPAM": "这不是垃圾邮件",
+		"TO_SPAM": "移动到垃圾邮件",
+		"NOT_SPAM": "非垃圾邮件",
+		"USERNAME": "用户名",
 		"PASSWORD": "密码",
+		"REMEMBER": "记住",
 		"REPLY_TO": "回复",
 		"SAVE": "保存",
+		"SAVE_CHANGES": "是否保存修改？",
 		"SEARCH": "搜索",
-		"SPAM": "这是垃圾邮件",
+		"SPAM": "垃圾邮件",
 		"SUBJECT": "主题",
 		"TEST": "测试",
-		"TO": "发送到"
+		"TO": "收件人",
+		"SERVER_MESSAGE": "服务器信息",
+		"YES": "是",
+		"NO": "否",
+		"INACTIVE": "不生效",
+		"DEFAULT": "默认",
+		"HELP": "帮助",
+		"TEXT": "内容",
+		"ATTACHMENTS": "附件"
 	},
 	"LOGIN": {
 		"LABEL_LOGIN": "登录",
@@ -35,56 +50,60 @@
 		"BUTTON_SIGN_IN": "登录"
 	},
 	"TOP_TOOLBAR": {
-		"BUTTON_ADD_ACCOUNT": "添加账户",
-		"BUTTON_SETTINGS": "设置",
-		"BUTTON_HELP": "帮助"
-	},
-	"MOBILE": {
-		"BUTTON_MOBILE_VERSION": "移动端版本",
-		"BUTTON_DESKTOP_VERSION": "桌面端版本"
+		"BUTTON_ADD_ACCOUNT": "添加账户"
 	},
 	"SEARCH": {
 		"TITLE_ADV": "高级搜索",
-		"LABEL_ADV_TEXT": "内容",
-		"LABEL_ADV_HAS_ATTACHMENT": "有附件",
-		"LABEL_ADV_HAS_ATTACHMENTS": "有附件",
-		"LABEL_ADV_FLAGGED": "标记",
-		"LABEL_ADV_UNSEEN": "不可见",
-		"LABEL_ADV_DATE": "日期",
-		"LABEL_ADV_DATE_ALL": "所有邮件",
-		"LABEL_ADV_DATE_3_DAYS": "3天以内",
-		"LABEL_ADV_DATE_7_DAYS": "1周以内",
-		"LABEL_ADV_DATE_MONTH": "1个月以内",
-		"LABEL_ADV_DATE_3_MONTHS": "3个月以内",
-		"LABEL_ADV_DATE_6_MONTHS": "半年以内",
-		"LABEL_ADV_DATE_YEAR": "1年以内",
-		"LABEL_ADV_SUBFOLDERS": "Subfolders",
-		"LABEL_ADV_SUBFOLDERS_NONE": "None",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE": "All",
-		"LABEL_ADV_SUBFOLDERS_SUBTREE_ONE": "One level"
-	},
-	"PREVIEW_POPUP": {
-		"FULLSCREEN": "切换全屏",
-		"ZOOM": "放大\/缩小",
-		"CLOSE": "关闭 (Esc)",
-		"GALLERY_PREV": "向前 (左箭头键)",
-		"GALLERY_NEXT": "向后 (右箭头键)",
-		"GALLERY_COUNTER": "%curr% \/ %total%"
+		"TEXT": "内容",
+		"HAS_ATTACHMENT": "有附件",
+		"FLAGGED": "标记",
+		"UNSEEN": "不可见",
+		"DATE": "日期",
+		"DATE_ALL": "所有邮件",
+		"BEFORE_3_DAYS": "3天以外",
+		"BEFORE_7_DAYS": "1周以外",
+		"BEFORE_MONTH": "1个月以外",
+		"BEFORE_3_MONTHS": "3个月以外",
+		"BEFORE_6_MONTHS": "半年以外",
+		"BEFORE_YEAR": "1年以外",
+		"SINCE_3_DAYS": "3天以内",
+		"SINCE_7_DAYS": "1周以内",
+		"SINCE_MONTH": "1个月以内",
+		"SINCE_3_MONTHS": "3个月以内",
+		"SINCE_6_MONTHS": "半年以内",
+		"SINCE_YEAR": "1年以内",
+		"SUBFOLDERS": "子文件夹",
+		"SUBFOLDERS_NONE": "无",
+		"SUBFOLDERS_SUBTREE": "全部",
+		"SUBFOLDERS_SUBTREE_ONE": "一级",
+		"REPLIED": "已回复",
+		"KEYWORD": "标签"
 	},
 	"FOLDER_LIST": {
 		"BUTTON_COMPOSE": "写邮件",
 		"BUTTON_NEW_MESSAGE": "新邮件",
 		"INBOX_NAME": "收件箱",
-		"SENT_NAME": "已发邮件",
+		"SENT_NAME": "已发送邮件",
 		"DRAFTS_NAME": "草稿",
 		"TRASH_NAME": "已删除邮件",
 		"ARCHIVE_NAME": "存档"
 	},
-	"QUOTA": {
-		"TITLE": "存储空间使用量"
+	"IMAP": {
+		"ACL_RIGHTS": "Rights",
+		"ACL_A": "Administer",
+		"ACL_E": "Expunge",
+		"ACL_I": "Insert messages",
+		"ACL_K": "Create sub-folders",
+		"ACL_L": "Show messages",
+		"ACL_P": "Send mail",
+		"ACL_R": "Select folder",
+		"ACL_S": "\\SEEN tag",
+		"ACL_T": "\\DELETED tag",
+		"ACL_W": "Other tags",
+		"ACL_X": "Delete\/Rename folder"
 	},
 	"MESSAGE_LIST": {
-		"BUTTON_RELOAD": "刷新",
+		"BUTTON_RELOAD": "刷新消息列表",
 		"BUTTON_EMPTY_FOLDER": "清空文件夹",
 		"BUTTON_MULTY_FORWARD": "作为附件转发",
 		"BUTTON_DELETE_WITHOUT_MOVE": "永久删除",
@@ -93,31 +112,34 @@
 		"MENU_UNSET_SEEN": "标记为未读",
 		"MENU_SET_FLAG": "加注星标",
 		"MENU_UNSET_FLAG": "移除星标",
-		"MENU_SELECT_ALL": "全部",
-		"MENU_SELECT_INVERT": "反选",
+		"MENU_SELECT_ALL": "全部选择",
+		"MENU_SELECT_INVERT": "反向选择",
 		"MENU_SELECT_UNSEEN": "未读",
 		"MENU_SELECT_SEEN": "已读",
 		"MENU_SELECT_FLAGGED": "已加星标",
 		"MENU_SELECT_UNFLAGGED": "未加星标",
+		"DOWNLOAD_ALL_ATTACHMENTS": "下载所有附件",
 		"EMPTY_LIST": "空列表。",
-		"EMPTY_SEARCH_LIST": "未找到您想要的。",
+		"EMPTY_SEARCH_LIST": "未找到您搜索的消息。",
 		"SEARCH_RESULT_FOR": "搜索 \"%SEARCH%\" 的结果",
 		"BACK_TO_MESSAGE_LIST": "回到信息列表",
-		"EMPTY_SUBJECT_TEXT": "(无主题)",
 		"PUT_MESSAGE_HERE": "在这里查看邮件",
 		"TODAY_AT": "今日于 %TIME%",
 		"YESTERDAY_AT": "昨天 %TIME%",
 		"NEW_MESSAGE_NOTIFICATION": "您有 %COUNT% 封新邮件！",
 		"QUOTA_SIZE": "使用了 <strong>%LIMIT%<\/strong> 存储空间中的<strong>%SIZE% (%PROC%%)<\/strong>",
 		"SORT": "排序",
+		"NO_SORT": "邮件服务器不支持排序",
+		"SORT_ARRIVAL_ASC": "Arrived ascending",
+		"SORT_ARRIVAL_DESC": "Arrived descending",
 		"SORT_DATE_ASC": "日期升序",
 		"SORT_DATE_DESC": "日期降序",
-		"SORT_SIZE_ASC": "大小递增",
-		"SORT_SIZE_DESC": "大小递减",
+		"SORT_SIZE_ASC": "大小升序",
+		"SORT_SIZE_DESC": "大小降序",
 		"SORT_SUBJECT_ASC": "主题 A-Z",
 		"SORT_SUBJECT_DESC": "主题 Z-A",
-		"SORT_FROM_ASC": "发送自 A-Z",
-		"SORT_FROM_DESC": "发送自 Z-A"
+		"SORT_FROM_ASC": "发件人 A-Z",
+		"SORT_FROM_DESC": "发件人 Z-A"
 	},
 	"MESSAGE": {
 		"BUTTON_EDIT": "编辑",
@@ -136,9 +158,10 @@
 		"BUTTON_THREAD_MORE": "更多信息",
 		"MENU_HEADERS": "显示详细信息",
 		"MENU_VIEW_ORIGINAL": "显示原始内容",
-		"HTML_VIEW": "View HTML message",
-		"PLAIN_VIEW": "View plain text message",
-		"MENU_DOWNLOAD_ORIGINAL": "作为 .eml 文件下载",
+		"HTML_VIEW": "显示 HTML 消息",
+		"PLAIN_VIEW": "显示纯文本消息",
+		"SWAP_COLORS": "切换默认 (背景)颜色",
+		"MENU_DOWNLOAD_ORIGINAL": "下载为 .eml 文件",
 		"MENU_FILTER_SIMILAR": "筛选类似邮件",
 		"MENU_PRINT": "打印邮件",
 		"EMPTY_SUBJECT_TEXT": "（无主题）",
@@ -148,9 +171,22 @@
 		"PRINT_LABEL_ATTACHMENTS": "附件",
 		"MESSAGE_VIEW_DESC": "在此查看列表中选中的邮件。",
 		"MESSAGE_VIEW_MOVE_DESC": "点击左侧面板的文件夹作为目的地",
-		"LINK_DOWNLOAD_AS_ZIP": "下载为zip压缩包",
+		"LINK_DOWNLOAD_AS_ZIP": "下载为 zip 压缩包",
 		"SPAM_SCORE": "垃圾邮件分数",
-		"HAS_VIRUS_WARNING": "警告：检测到病毒"
+		"HAS_VIRUS_WARNING": "警告：检测到病毒",
+		"TAGS": "标签",
+		"NEW_TAG": "新标签",
+		"ENABLE_TRACKING_LINKS": "启用追踪链接",
+		"TRACKING_ENABLED": "链接点击后将会被追踪!"
+	},
+	"MESSAGE_TAGS": {
+		"$important": "重要",
+		"$todo": "待办",
+		"$label1": "重要",
+		"$label2": "工作",
+		"$label3": "个人",
+		"$label4": "待办",
+		"$label5": "稍后"
 	},
 	"READ_RECEIPT": {
 		"SUBJECT": "送达回执 - %SUBJECT%",
@@ -160,39 +196,47 @@
 		"SEARCHING_DESC": "搜索中……"
 	},
 	"CONTACTS": {
+		"TAB_CONTACT": "联系人",
+		"TAB_LOCATIONS": "位置",
+		"TAB_BUSINESS": "商业",
+		"LABEL_ORGANIZATION": "组织",
+		"LABEL_DEPARTMENT": "部门",
+		"LABEL_TITLE": "头衔",
+		"TAB_CRYPTO": "加密",
+		"ASK": "询问",
+		"NEVER": "从不",
+		"ALWAYS": "总是",
+		"ALWAYS_IF_POSSIBLE": "总是 (如果可能)",
 		"BUTTON_ADD_CONTACT": "添加联系人",
 		"BUTTON_CREATE_CONTACT": "新增联系人",
-		"BUTTON_UPDATE_CONTACT": "更新联系人",
-		"BUTTON_IMPORT": "导入 (csv, vcf, vCard)",
-		"BUTTON_EXPORT_VCARD": "导出 (vcf, vCard)",
+		"BUTTON_IMPORT": "导入 (csv、vcf、vCard)",
+		"BUTTON_EXPORT_VCARD": "导出 (vcf、vCard)",
 		"BUTTON_EXPORT_CSV": "导出 (csv)",
 		"ERROR_IMPORT_FILE": "导入错误 (无效文件格式）",
 		"EMPTY_LIST": "暂无联系人",
 		"EMPTY_SEARCH": "没找到联系人",
 		"CLEAR_SEARCH": "清除搜索",
 		"CONTACT_VIEW_DESC": "在此查看在列表中选中的联系人。",
-		"LABEL_PHONE": "电话",
-		"LABEL_WEB": "网站",
 		"LABEL_BIRTHDAY": "生日",
-		"LINK_ADD_EMAIL": "添加 Email 地址",
-		"LINK_ADD_PHONE": "添加电话",
-		"LINK_BIRTHDAY": "生日",
-		"PLACEHOLDER_ENTER_DISPLAY_NAME": "显示名称",
-		"PLACEHOLDER_ENTER_LAST_NAME": "姓",
-		"PLACEHOLDER_ENTER_FIRST_NAME": "名",
-		"PLACEHOLDER_ENTER_NICK_NAME": "昵称",
+		"DISPLAY_NAME": "显示名称",
+		"LAST_NAME": "姓",
+		"FIRST_NAME": "名",
+		"MIDDLE_NAME": "Middle name",
+		"NAME_PREFIX": "Name prefix",
+		"NAME_SUFFIX": "Name suffix",
+		"NICK_NAME": "昵称",
 		"LABEL_READ_ONLY": "只读",
-		"LABEL_SHARE": "分享",
 		"ADD_MENU_LABEL": "添加",
 		"ADD_MENU_NICKNAME": "昵称",
-		"ADD_MENU_NOTES": "笔记",
+		"ADD_MENU_NOTE": "注释",
 		"ADD_MENU_PHONE": "电话",
 		"ADD_MENU_URL": "网址",
 		"ADD_MENU_ADDRESS": "地址",
 		"ADD_MENU_BIRTHDAY": "生日",
 		"ADD_MENU_TAGS": "标签",
 		"BUTTON_SHARE_ALL": "所有人",
-		"BUTTON_SYNC": "同步 (CardDAV)"
+		"BUTTON_SYNC": "同步 (CardDAV)",
+		"SEND_TO_ALL_CONTACT_EMAILS": "发送到所有联系人邮箱"
 	},
 	"COMPOSE": {
 		"LINK_SHOW_INPUTS": "显示所有信息",
@@ -210,34 +254,37 @@
 		"NO_ATTACHMENTS_HERE_DESC": "无附件。",
 		"ATTACHMENTS_ERROR_DESC": "注意！还有正在上传的附件。",
 		"ATTACHMENTS_UPLOAD_ERROR_DESC": "还有附件正在上传。",
+		"ALLOW_SPELLCHECK": "启用浏览器拼写检查器",
+		"ALLOW_DRAFT_AUTOSAVE": "自动保存草稿",
 		"BUTTON_REQUEST_READ_RECEIPT": "要求已读回执",
 		"BUTTON_MARK_AS_IMPORTANT": "标记为“重要”",
-		"BUTTON_REQUEST_DSN": "要求送达回执"
+		"BUTTON_REQUEST_DSN": "要求送达回执",
+		"BUTTON_REQUIRE_TLS": "要求安全送达",
+		"ERROR_EMPTY_BODY": "消息内容为空"
 	},
 	"POPUPS_ASK": {
-		"BUTTON_YES": "是",
-		"BUTTON_NO": "否",
-		"DESC_WANT_CLOSE_THIS_WINDOW": "你确定要关闭此窗口吗？",
-		"DESC_WANT_DELETE_MESSAGES": "你确定你要删除这条消息吗？"
+		"EXIT_ARE_YOU_SURE": "您确定要退出吗？",
+		"DESC_WANT_CLOSE_THIS_WINDOW": "您确定要关闭此窗口吗？",
+		"DESC_WANT_DELETE_MESSAGES": "您确定要删除这条消息吗？"
 	},
 	"POPUPS_LANGUAGES": {
 		"TITLE_LANGUAGES": "选择语言"
 	},
 	"POPUPS_ADD_ACCOUNT": {
-		"TITLE_ADD_ACCOUNT": "添加账户？",
+		"TITLE_ADD_ACCOUNT": "添加账户",
 		"BUTTON_ADD_ACCOUNT": "添加",
-		"TITLE_UPDATE_ACCOUNT": "更新账户？",
-		"BUTTON_UPDATE_ACCOUNT": "更新"
+		"TITLE_UPDATE_ACCOUNT": "更新账户"
 	},
 	"POPUPS_IDENTITY": {
-		"TITLE_ADD_IDENTITY": "添加身份？",
-		"TITLE_UPDATE_IDENTITY": "更新身份？",
+		"TITLE_ADD_IDENTITY": "添加身份",
+		"TITLE_UPDATE_IDENTITY": "更新身份",
+		"LABEL": "",
 		"BUTTON_ADD_IDENTITY": "添加",
-		"BUTTON_UPDATE_IDENTITY": "更新",
+		"SIGNATURE": "Signature",
 		"LABEL_SIGNATURE_INSERT_BEFORE": "在回信中插入签名再引用来信"
 	},
 	"POPUPS_CREATE_FOLDER": {
-		"TITLE_CREATE_FOLDER": "创建文件夹？",
+		"TITLE_CREATE_FOLDER": "创建文件夹",
 		"LABEL_PARENT": "父文件夹",
 		"BUTTON_CREATE": "创建",
 		"TITLE_CREATING_PROCESS": "文件夹创建中"
@@ -247,7 +294,22 @@
 		"DANGER_DESC_WARNING": "警告！",
 		"DANGER_DESC_HTML_1": "此操作将完全删除文件夹 <strong>%FOLDER%<\/strong> 中的所有邮件！",
 		"DANGER_DESC_HTML_2": "一旦操作执行，将不可中断和撤销！",
-		"TITLE_CLEARING_PROCESS": "文件夹清理中..."
+		"TITLE_CLEARING_PROCESS": "文件夹清理中…"
+	},
+	"CRYPTO": {
+		"SIGN": "签名",
+		"ENCRYPT": "加密",
+		"DECRYPT": "解密",
+		"VERIFY": "Verify",
+		"GOOD_SIGNATURE": "来自 %USER% 的可用签名",
+		"ERROR": "%TYPE% 错误： %ERROR%",
+		"CREATE_SELF_SIGNED": "创建自签名的",
+		"VALID_UNTIL": "有效期至",
+		"PRIVATE_KEY": "私钥",
+		"CHANGE_PASS": "修改密码",
+		"CURRENT_PASS": "当前密码",
+		"NEW_PASS": "新密码",
+		"ASK_CRYPTKEY_PASS": "您的密码已更改。请输入您的旧登录密码解密数据"
 	},
 	"OPENPGP": {
 		"POPUP_IMPORT_TITLE": "导入 OpenPGP 密钥",
@@ -256,21 +318,27 @@
 		"POPUP_VIEW_BUTTON": "选择",
 		"POPUP_GENERATE_TITLE": "生成 OpenPGP 密钥",
 		"POPUP_GENERATE_BUTTON": "生成",
-		"LABEL_KEY_TYPE": "Type",
-		"LABEL_SIGN": "签名",
-		"LABEL_ENCRYPT": "加密",
-		"BUTTON_DECRYPT": "解密",
-		"BUTTON_VERIFY": "Verify",
+		"LABEL_KEY_TYPE": "类型",
 		"SIGNED_MESSAGE": "由 OpenPGP 签名",
 		"ENCRYPTED_MESSAGE": "由 OpenPGP 加密",
-		"STORE_IN_GNUPG": "Store on server in GnuPG",
-		"BACKUP_ON_SERVER": "Store (encrypted) on server",
-		"GOOD_SIGNATURE": "来自 %USER% 的可用签名",
-		"ERROR": "OpenPGP 错误： %ERROR%"
+		"STORE_IN_GNUPG": "以 GnuPG 存储在服务器",
+		"STORE_PUBLIC_KEY_IN_GNUPG": "将公钥存储在 GnuPG 的服务器上",
+		"STORE_PRIVATE_KEY_IN_GNUPG": "将私钥存储在 GnuPG 的服务器上",
+		"BACKUP_ON_SERVER": "加密存储在服务器",
+		"BACKUP_PUBLIC_KEY_ON_SERVER": "在服务器上备份公钥",
+		"BACKUP_PRIVATE_KEY_ON_SERVER": "在服务器上备份私钥"
+	},
+	"SMIME": {
+		"POPUP_IMPORT_TITLE": "导入 S\/MIME 证书",
+		"CERTIFICATE": "证书",
+		"CERTIFICATES": "S\/MIME 证书",
+		"SIGNED_MESSAGE": "由 S\/MIME 签名",
+		"ENCRYPTED_MESSAGE": "由 S\/MIME 加密",
+		"PRIVATE_KEY_OF": "%EMAIL% 的 S\/MIME 私钥"
 	},
 	"POPUPS_FILTER": {
-		"TITLE_CREATE_FILTER": "创建筛选条件？",
-		"TITLE_EDIT_FILTER": "更新筛选条件？",
+		"TITLE_CREATE_FILTER": "创建筛选条件",
+		"TITLE_EDIT_FILTER": "更新筛选条件",
 		"LEGEND_CONDITIONS": "条件",
 		"LEGEND_ACTIONS": "操作",
 		"BUTTON_ADD_CONDITION": "添加条件",
@@ -293,14 +361,14 @@
 		"SELECT_TYPE_NOT_EQUAL_TO": "不等于",
 		"SELECT_TYPE_OVER": "超过",
 		"SELECT_TYPE_UNDER": "不超过",
-		"SELECT_TYPE_TEXT": "Text",
+		"SELECT_TYPE_TEXT": "文本",
 		"SELECT_TYPE_RAW": "源文件",
 		"SELECT_MATCH_ANY": "满足下列任何条件",
 		"SELECT_MATCH_ALL": "满足下列所有条件",
 		"MARK_AS_READ_LABEL": "标记为已读",
 		"REPLY_INTERVAL_LABEL": "答复间隔 (天) ",
 		"KEEP_LABEL": "保留邮件",
-		"STOP_LABEL": "继续匹配其他规则",
+		"STOP_LABEL": "停止处理更多规则",
 		"VACATION_SUBJECT_LABEL": "主题 (可选)",
 		"VACATION_MESSAGE_LABEL": "内容",
 		"VACATION_RECIPIENTS_LABEL": "收件人 (半角逗号“,”分隔)",
@@ -308,11 +376,11 @@
 		"ALL_INCOMING_MESSAGES_DESC": "所有来信"
 	},
 	"POPUPS_SIEVE_SCRIPT": {
-		"TITLE_CREATE": "Create Script",
-		"TITLE_EDIT": "Edit Script",
+		"TITLE_CREATE": "创建脚本",
+		"TITLE_EDIT": "编辑脚本",
 		"BUTTON_ADD_FILTER": "添加筛选条件",
 		"BUTTON_RAW_SCRIPT": "使用自定义脚本",
-		"CAPABILITY_LABEL": "Capability",
+		"CAPABILITY_LABEL": "能力",
 		"CHANGES_NEED_TO_BE_SAVED_DESC": "这些更改需要保存。"
 	},
 	"POPUPS_SYSTEM_FOLDERS": {
@@ -331,7 +399,7 @@
 	},
 	"UPLOAD": {
 		"ERROR_FILE_IS_TOO_BIG": "文件太大",
-		"ERROR_FILE_PARTIALLY_UPLOADED": "遭遇未知错误，文件部分上传",
+		"ERROR_FILE_PARTIALLY_UPLOADED": "由于未知错误，文件部分上传",
 		"ERROR_NO_FILE_UPLOADED": "没有文件上传",
 		"ERROR_MISSING_TEMP_FOLDER": "临时文件丢失",
 		"ERROR_ON_SAVING_FILE": "遭遇未知错误",
@@ -339,90 +407,127 @@
 		"ERROR_UNKNOWN": "未知上传文件错误"
 	},
 	"EDITOR": {
-		"TEXT_SWITCHER_PLAINT_TEXT": "HTML <-> TEXT"
+		"PLAIN": "HTML <-> 纯文本",
+		"SOURCE": "HTML <-> 源代码",
+		"FONTFAMILY": "字体",
+		"FONTSIZE": "字号",
+		"DIR": "文本方向",
+		"DIR_LTR": "从左到右",
+		"DIR_RTL": "从右到左",
+		"DIR_AUTO": "自动",
+		"TEXTCOLOR": "字体颜色",
+		"BACKGROUNDCOLOR": "背景颜色",
+		"BOLD": "加粗",
+		"ITALIC": "倾斜",
+		"UNDERLINE": "下划线",
+		"STRIKE": "删除线",
+		"SUB": "下标",
+		"SUP": "上标",
+		"OL": "有序列表",
+		"UL": "无序列表",
+		"QUOTE": "引用文字",
+		"INDENTDECREASE": "减少缩进",
+		"INDENTINCREASE": "增加缩进",
+		"LINK": "链接",
+		"IMAGEURL": "图片 URL",
+		"IMAGEUPLOAD": "选择图片",
+		"UNDO": "撤销",
+		"REDO": "重做",
+		"REMOVESTYLE": "移除样式"
 	},
 	"SETTINGS_LABELS": {
-		"LABEL_PERSONAL_NAME": "个人",
-		"LABEL_GENERAL_NAME": "一般设置",
-		"LABEL_CONTACTS_NAME": "联系人",
-		"LABEL_FOLDERS_NAME": "文件夹",
-		"LABEL_ACCOUNTS_NAME": "账户",
-		"LABEL_FILTERS_NAME": "筛选条件",
-		"LABEL_SECURITY_NAME": "安全",
-		"LABEL_THEMES_NAME": "主题"
+		"GENERAL": "常规",
+		"CONTACTS": "联系人",
+		"FOLDERS": "文件夹",
+		"ACCOUNTS": "账户",
+		"FILTERS": "筛选器",
+		"SECURITY": "安全",
+		"THEMES": "主题"
 	},
 	"SETTINGS_FILTERS": {
-		"LEGEND_FILTERS": "筛选器",
-		"BUTTON_ADD_SCRIPT": "Add a Script",
+		"SIMPLE": "简单",
+		"ADVANCED": "高级",
+		"BUTTON_ADD_SCRIPT": "添加脚本",
 		"SUBNAME_MOVE_TO": "移动到 \"%FOLDER%\"",
 		"SUBNAME_FORWARD_TO": "转发到 \"%EMAIL%\"",
 		"SUBNAME_REJECT": "拒绝",
 		"SUBNAME_VACATION_MESSAGE": "假期自动回复",
-		"SUBNAME_DISCARD": "取消",
-		"LOADING_PROCESS": "正在更新筛选规则列表"
+		"SUBNAME_DISCARD": "取消"
 	},
 	"SETTINGS_SECURITY": {
 		"LEGEND_SECURITY": "安全",
 		"LABEL_AUTOLOGOUT": "自动登出",
-		"AUTOLOGIN_NEVER_OPTION_NAME": "从不",
-		"AUTOLOGIN_MINUTES_OPTION_NAME": "%MINUTES% 分钟",
-		"AUTOLOGIN_HOURS_OPTION_NAME": "%HOURS% 小时"
+		"FORGET_KEY_PASS": "忘记私钥密码",
+		"NEVER": "从不"
 	},
 	"SETTINGS_GENERAL": {
-		"LEGEND_GENERAL": "一般设置",
-		"LABEL_LANGUAGE": "语言",
-		"LABEL_IDENTITY": "身份",
-		"LABEL_LAYOUT": "布局",
-		"LABEL_LAYOUT_NO_SPLIT": "不分隔",
-		"LABEL_LAYOUT_VERTICAL_SPLIT": "垂直分隔",
-		"LABEL_LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
-		"LABEL_EDITOR": "默认格式",
-		"LABEL_EDITOR_HTML": "html文本",
-		"LABEL_EDITOR_PLAIN": "普通文本",
-		"LABEL_EDITOR_HTML_FORCED": "强制HTML文本",
-		"LABEL_EDITOR_PLAIN_FORCED": "强制普通文本",
-		"LABEL_VIEW_OPTIONS": "视图选项",
-		"LABEL_USE_PREVIEW_PANE": "使用预览",
-		"LABEL_USE_CHECKBOXES_IN_LIST": "列表中显示多选框",
-		"LABEL_USE_THREADS": "使用对话",
-		"LABEL_REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
-		"LABEL_SHOW_IMAGES": "总是显示外部图片信息",
-		"LABEL_PREFER_HTML": "Prefer HTML to plain text",
-		"LABEL_PREFER_HTML_INFO": "Messages sometimes come in both formats. This option controls whether you want the HTML part or the plain text part to be displayed.",
-		"LABEL_REMOVE_COLORS": "从消息中删除背景和文本颜色",
-		"LABEL_MESSAGE_PER_PAGE": "封邮件每页",
-		"LABEL_MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
+		"LANGUAGE": "语言",
+		"HOUR_FORMAT": "小时格式",
+		"IDENTITY": "身份",
+		"LAYOUT": "布局",
+		"LAYOUT_NO_SPLIT": "不分隔",
+		"LAYOUT_VERTICAL_SPLIT": "垂直分隔",
+		"LAYOUT_HORIZONTAL_SPLIT": "水平分隔",
+		"SHOW_NEXT_MESSAGE": "删除或移动当前消息后显示下一条消息",
+		"EDITOR": "默认文本编辑器",
+		"EDITOR_HTML": "Html",
+		"EDITOR_PLAIN": "纯文本",
+		"VIEW_OPTIONS": "视图选项",
+		"USE_PREVIEW_PANE": "使用预览",
+		"HIDE_DELETED_MESSAGES": "隐藏标记为删除的消息",
+		"USE_CHECKBOXES_IN_LIST": "列表中显示多选框",
+		"USE_THREADS": "使用对话",
+		"THREAD_ALGORITHM": "会话算法",
+		"REPLY_SAME_FOLDER": "将回复的邮件置于被回复的邮件所在的文件夹",
+		"PREFER_HTML": "相比纯文本优先使用 HTML",
+		"PREFER_HTML_INFO": "消息有时以两种格式传送。该选项控制您希望显示 HTML 部分还是纯文本部分。",
+		"REMOVE_COLORS": "从消息中删除背景和文本颜色",
+		"ALLOW_STYLES": "允许 <style> CSS",
+		"MESSAGE_PER_PAGE": "每页消息数",
+		"CHECK_MAIL_INTERVAL": "邮件检查间隔",
+		"MARK_MESSAGE_READ_AFTER": "将消息标记为已读",
+		"MSG_DEFAULT_ACTION": "默认操作",
 		"SECONDS": "秒",
-		"LABEL_NOTIFICATIONS": "通知",
-		"LABEL_SOUND_NOTIFICATION": "提示音",
-		"LABEL_CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
-		"LABEL_CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)"
+		"MINUTES": "分",
+		"NOTIFICATIONS": "通知",
+		"SOUND_NOTIFICATION": "提示音",
+		"CHROME_NOTIFICATION_DESC": "显示新邮件弹窗",
+		"CHROME_NOTIFICATION_DESC_DENIED": "(被浏览器阻止)",
+		"COLLAPSE_BLOCKQUOTES": "折叠引用文本",
+		"MAX_QUOTE_LEVEL": "最多显示的引用文本层级",
+		"MIN_FONT_SIZE": "Minimum Font Size",
+		"LIST_INLINE_ATTACHMENTS": "在列表中显示内联附件",
+		"LIST_SIMPLE_ATTACHMENTS": "简洁附件列表",
+		"LIST_MESSAGES_GROUPED": "按分组显示消息 (按时间或发件人排序时)",
+		"EXTERNAL_IMAGES": "外部图片",
+		"IMAGES_OPTION_ASK": "总是询问",
+		"IMAGES_OPTION_WHITELIST": "白名单或询问",
+		"IMAGES_OPTION_ALWAYS": "总是显示",
+		"IMAGES_WHITELIST": "图片白名单",
+		"MESSAGE_POPUP_WINDOW": "弹出页面使用新窗口代替新选项卡",
+		"MAILTO": "注册成 mailto: 链接处理器",
+		"HTML_TO_MD": "Convert HTML to Markdown instead of plain text"
 	},
 	"SETTINGS_CONTACTS": {
-		"LABEL_CONTACTS_AUTOSAVE": "自动添加到你的地址簿",
+		"LABEL_CONTACTS_AUTOSAVE": "自动添加到您的地址簿",
 		"LEGEND_CONTACTS_SYNC": "远程同步(CardDAV)",
 		"LABEL_CONTACTS_SYNC_ENABLE": "启用远程同步",
 		"LABEL_CONTACTS_SYNC_SERVER": "服务器",
 		"LABEL_CONTACTS_SYNC_AB_URL": "地址簿 URL",
 		"LABEL_CONTACTS_SYNC_USER": "用户名",
-		"SYNC_NO": "否",
-		"SYNC_YES": "是",
-		"SYNC_READ": "Read only"
+		"SYNC_READ": "只读"
 	},
 	"SETTINGS_THEMES": {
 		"LEGEND_THEMES": "主题",
-		"LEGEND_THEMES_CUSTOM": "自定义主题设置",
-		"LABEL_CUSTOM_TYPE": "类型",
-		"LABEL_CUSTOM_TYPE_LIGHT": "明亮",
-		"LABEL_CUSTOM_TYPE_DARK": "暗沉",
-		"LABEL_CUSTOM_BACKGROUND_IMAGE": "背景",
+		"LABEL_BACKGROUND": "背景",
+		"LABEL_FONTS": "字体",
 		"BUTTON_UPLOAD_BACKGROUND_IMAGE": "上传背景 (JPG, PNG)",
 		"ERROR_FILE_IS_TOO_BIG": "文件过大",
 		"ERROR_FILE_TYPE_ERROR": "无效类型 (仅支持JPG和PNG)",
 		"ERROR_UNKNOWN": "上传时发生未知错误"
 	},
 	"SETTINGS_FOLDERS": {
-		"LEGEND_FOLDERS": "文件夹",
+		"LEGEND_FOLDERS": "文件夹列表",
 		"BUTTON_CREATE": "新建文件夹",
 		"BUTTON_SYSTEM": "系统文件夹",
 		"BUTTON_SUBSCRIBE": "订阅",
@@ -437,6 +542,7 @@
 		"HELP_SHOW_HIDE_FOLDER": "显示\/隐藏文件夹",
 		"HELP_CHECK_FOR_NEW_MESSAGES": "检查\/不检查新邮件",
 		"HIDE_UNSUBSCRIBED": "隐藏未订阅的文件夹",
+		"UNHIDE_KOLAB_FOLDERS": "取消隐藏 Kolab 文件夹",
 		"TYPE_CALENDAR": "日历",
 		"TYPE_CONFIGURATION": "配置",
 		"TYPE_CONTACTS": "联系人",
@@ -452,15 +558,15 @@
 		"BUTTON_ADD_ACCOUNT": "添加一个账户",
 		"BUTTON_ADD_IDENTITY": "添加一个身份",
 		"LOADING_PROCESS": "更新账户列表中",
-		"DEFAULT_IDENTITY_LABEL": "默认"
+		"SHOW_UNREAD": "显示未读消息数量"
 	},
 	"SETTINGS_OPENPGP": {
 		"BUTTON_IMPORT_KEY": "导入 密钥",
 		"BUTTON_GENERATE_KEY_PAIR": "生成 密钥",
+		"IMPORT_FROM_SERVER": "从服务器导入",
 		"TITLE_PRIVATE": "私有",
 		"TITLE_PUBLIC": "公开",
-		"LABEL_ALLOW_DRAFT_AUTOSAVE": "自动保存草稿",
-		"GET_MAILVELOPE": "Get Mailvelope browser add-on."
+		"GET_MAILVELOPE": "获取 Mailvelope 浏览器扩展。"
 	},
 	"SHORTCUTS_HELP": {
 		"LEGEND_SHORTCUTS_HELP": "快捷键说明",
@@ -473,7 +579,6 @@
 		"LABEL_REPLY_ALL": "回复所有",
 		"LABEL_FORWARD": "转发",
 		"LABEL_FORWARD_MULTIPLY": "作为附件转发",
-		"LABEL_HELP": "帮助",
 		"LABEL_CHECK_ALL": "选择所有消息",
 		"LABEL_DELETE": "删除",
 		"LABEL_OPEN_THREAD": "打开选定的邮件往来",
@@ -490,7 +595,6 @@
 		"LABEL_BLOCKQUOTES_TOGGLE": "消息块引用切换",
 		"LABEL_THREAD_NEXT": "下一封往来邮件",
 		"LABEL_THREAD_PREV": "上一封往来邮件",
-		"LABEL_PRINT": "打印",
 		"LABEL_EXIT_FULLSCREEN": "退出全屏模式",
 		"LABEL_CLOSE_MESSAGE": "关闭独立邮件阅读模式",
 		"LABEL_SWITCH_TO_LIST": "切换到邮件列表",
@@ -502,39 +606,43 @@
 		"LABEL_CLOSE_COMPOSE": "退出新邮件"
 	},
 	"NOTIFICATIONS": {
-		"INVALID_TOKEN": "无效标记",
-		"AUTH_ERROR": "认证失败",
-		"CONNECTION_ERROR": "无法连接至服务器",
-		"DOMAIN_ALREADY_EXISTS": "域已经存在",
-		"DOMAIN_NOT_ALLOWED": "不允许此域名",
-		"ACCOUNT_NOT_ALLOWED": "不允许此账户",
-		"CONTACTS_SYNC_ERROR": "联系人同步错误",
-		"CANT_GET_MESSAGE_LIST": "无法获取邮件列表",
-		"CANT_GET_MESSAGE": "无法获取邮件",
-		"CANT_DELETE_MESSAGE": "无法删除邮件",
-		"CANT_COPY_MESSAGE": "无法复制邮件",
-		"CANT_MOVE_MESSAGE": "无法移动邮件",
-		"CANT_SAVE_MESSAGE": "无法保存邮件",
-		"CANT_SEND_MESSAGE": "无法发送邮件",
-		"INVALID_RECIPIENTS": "无效接收人",
-		"CANT_SAVE_FILTERS": "无法保存筛选器规则",
-		"CANT_GET_FILTERS": "无法获取筛选器规则",
-		"CANT_ACTIVATE_FILTERS_SCRIPT": "Can't activate filters script",
-		"CANT_DELETE_FILTERS_SCRIPT": "Can't delete filters script",
-		"FILTERS_ARE_NOT_CORRECT": "不正确的筛选器规则",
-		"CANT_CREATE_FOLDER": "无法创建文件夹",
-		"CANT_RENAME_FOLDER": "无法重命名文件夹",
-		"CANT_DELETE_FOLDER": "无法删除文件夹",
-		"CANT_DELETE_NON_EMPTY_FOLDER": "无法删除非空文件夹",
-		"CANT_SUBSCRIBE_FOLDER": "无法订阅文件夹",
-		"CANT_UNSUBSCRIBE_FOLDER": "无法取消订阅文件夹",
-		"DEMO_SEND_MESSAGE_ERROR": "出于安全考虑，测试账号无法发送外部邮件。",
-		"DEMO_ACCOUNT_ERROR": "出于安全考虑，测试账号无法进行此操作！",
-		"ACCOUNT_ALREADY_EXISTS": "账户已存在",
-		"ACCOUNT_DOES_NOT_EXIST": "账户不存在",
-		"ACCOUNT_SWITCH_FAILED": "Switch to account \"%EMAIL%\" failed",
-		"MAIL_SERVER_ERROR": "访问邮件服务器遇到错误。",
-		"INVALID_INPUT_ARGUMENT": "无效的参数输入",
-		"UNKNOWN_ERROR": "未知错误"
+		"RequestError": "请求失败",
+		"RequestAborted": "请求中止",
+		"RequestTimeout": "请求超时",
+		"InvalidToken": "无效标记",
+		"AuthError": "认证失败",
+		"ConnectionError": "无法连接至服务器",
+		"DomainAlreadyExists": "域已经存在",
+		"DomainNotAllowed": "不允许此域名",
+		"AccountNotAllowed": "不允许此账户",
+		"CryptKeyError": "您的登录密码已更改",
+		"ContactsSyncError": "联系人同步错误",
+		"CantGetMessageList": "无法获取邮件列表",
+		"CantGetMessage": "无法获取邮件",
+		"CantDeleteMessage": "无法删除邮件",
+		"CantCopyMessage": "无法复制邮件",
+		"CantMoveMessage": "无法移动邮件",
+		"CantSaveMessage": "无法保存邮件",
+		"CantSendMessage": "无法发送邮件",
+		"InvalidRecipients": "无效接收人",
+		"CantSaveFilters": "无法保存筛选器规则",
+		"CantGetFilters": "无法获取筛选器规则",
+		"CantActivateFiltersScript": "无法激活过滤器脚本",
+		"CantDeleteFiltersScript": "无法删除过滤器脚本",
+		"FiltersAreNotCorrect": "不正确的筛选器规则",
+		"CantCreateFolder": "无法创建文件夹",
+		"CantRenameFolder": "无法重命名文件夹",
+		"CantDeleteFolder": "无法删除文件夹",
+		"CantDeleteNonEmptyFolder": "无法删除非空文件夹",
+		"CantSubscribeFolder": "无法订阅文件夹",
+		"CantUnsubscribeFolder": "无法取消订阅文件夹",
+		"DemoSendMessageError": "出于安全考虑，测试账号无法发送外部邮件。",
+		"DemoAccountError": "出于安全考虑，测试账号无法进行此操作！",
+		"AccountAlreadyExists": "账户已存在",
+		"AccountDoesNotExist": "账户不存在",
+		"AccountSwitchFailed": "切换到账户 \"%EMAIL%\" 失败",
+		"MailServerError": "访问邮件服务器遇到错误。",
+		"InvalidInputArgument": "无效的参数输入",
+		"UnknownError": "未知错误"
 	}
 }
diff --git a/snappymail/v/0.0.0/app/templates/BadBrowser.html b/snappymail/v/0.0.0/app/templates/BadBrowser.html
deleted file mode 100644
index 50dce0464..000000000
--- a/snappymail/v/0.0.0/app/templates/BadBrowser.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!DOCTYPE html>
-<html lang="en" dir="ltr">
-<head>
-	<meta charset="utf-8">
-	<meta name="robots" content="noindex, nofollow, noodp">
-	<title>{{ErrorTitle}}</title>
-	<style type="text/css">
-	html, body {
-		font-family: arial, sans-serif;
-		font-size: 14px;
-	}
-	.content {
-		position: absolute;
-		left: 50%;
-		top: 50%;
-		text-align: center;
-		width: 600px;
-		margin: -200px 0 0 -250px;
-		background: #FFF;
-		line-height: 150%;
-		border-bottom: 1px solid #E4E4E4;
-	}
-	.error-desc {
-		background-color: #eee;
-		padding: 10px;
-	}
-	a {
-		display: inline-block;
-		width: 150px;
-	}
-	</style>
-</head>
-<body class="content">
-	<h1>{{ErrorHeader}}</h1>
-	<br>
-	<div class="error-desc">
-		<p>{{ErrorDesc}}</p>
-		<a href="https://www.google.com/chrome/" target="_blank">Google Chrome</a>
-		<a href="https://www.microsoft.com/edge/" target="_blank">Microsoft Edge</a>
-		<a href="https://www.mozilla.org/firefox/" target="_blank">Mozilla Firefox</a>
-	</div>
-</body>
-</html>
diff --git a/snappymail/v/0.0.0/app/templates/Index.html b/snappymail/v/0.0.0/app/templates/Index.html
index 2d00b63b8..bd5c60d07 100644
--- a/snappymail/v/0.0.0/app/templates/Index.html
+++ b/snappymail/v/0.0.0/app/templates/Index.html
@@ -1,10 +1,6 @@
 <!DOCTYPE html>
 <html class="rl-started-trigger">
-
 <head>
-	<noscript>
-		<meta http-equiv="refresh" content="0; URL=./?/NoScript">
-	</noscript>
 	<meta charset="utf-8">
 	<meta name="viewport" content="width=device-width">
 	<meta name="apple-mobile-web-app-capable" content="yes">
@@ -15,17 +11,26 @@
 	<style id="app-boot-css">{{BaseAppBootCss}}</style>
 	<link type="text/css" rel="stylesheet" href="{{BaseAppMainCssLink}}">
 	<link rel="manifest" href="{{BaseAppManifestLink}}">
-	<style id="app-theme-style" data-href="{{BaseAppThemeCssLink}}">{{BaseAppThemeCss}}</style>
+	<link rel="icon" href="{{BaseFavIconSvg}}" type="image/svg+xml">
+	<style id="app-theme-style" data-name="{{BaseAppThemeName}}">{{BaseAppThemeCss}}</style>
 	{{BaseAppFaviconPngLinkTag}}
 	{{BaseAppFaviconTouchLinkTag}}
 </head>
-
-<body id="rl-app" data-admin='{{BaseAppAdmin}}'>
+<body id="rl-app" data-admin='{{BaseAppAdmin}}' spellcheck="false">
 	<div id="rl-loading">
 		<div id="rl-loading-desc">{{LoadingDescriptionEsc}}</div>
 		<i class="icon-spinner"></i>
+		<noscript><div class="error-desc">{{NO_SCRIPT_DESC}}</div></noscript>
+	</div>
+	<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.<br></div>
+	<div id="rl-BadBrowser" hidden="">
+		<h1>{{BAD_BROWSER_TITLE}}</h1>
+		<div class="error-desc">{{BAD_BROWSER_DESC}}</div>
+	</div>
+	<div id="rl-NoCookie" hidden="">
+		<h1>{{NO_COOKIE_TITLE}}</h1>
+		<div class="error-desc">{{NO_COOKIE_DESC}}</div>
 	</div>
-	<div id="rl-loading-error" hidden="">An error occurred.<br>Please refresh the page and try again.</div>
 	<div id="rl-content" hidden="">
 		<div id="rl-left"></div>
 		<div id="rl-right"></div>
@@ -34,5 +39,4 @@
 	{{BaseTemplates}}
 	<script nonce="" type="text/javascript">{{BaseAppBootScript}}{{BaseLanguage}}</script>
 </body>
-
 </html>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
index 1476d7e69..658f14d27 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminLogin.html
@@ -1,33 +1,33 @@
+<div class="descWrapper" data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></div>
 <div class="alert" data-bind="hidden: !submitError()">
-	<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: submitError"></span>
 </div>
-<form action="#/" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
+<form action="#/" spellcheck="false" method="POST" data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
 	<div class="controls" data-bind="css: {'error': loginError}">
 		<span class="fontastic">👤</span>
 		<input name="Login" required="" type="text" class="input-block-level"
-			autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autofocus="" autocomplete="username" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: login, disable: submitRequest"
 			data-i18n="[placeholder]LOGIN/LABEL_LOGIN">
 	</div>
 	<div class="controls" data-bind="css: {'error': passwordError}">
 		<span class="fontastic">🔑</span>
 		<input name="Password" required="" type="password" class="input-block-level"
-			autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: password, disable: submitRequest"
-			data-i18n="[placeholder]LOGIN/LABEL_PASSWORD">
+			data-i18n="[placeholder]GLOBAL/PASSWORD">
 	</div>
 	<div class="controls">
 		<span class="fontastic">⏱</span>
 		<input name="TOTP" type="text" pattern="[0-9]*" inputmode="numeric" class="input-block-level"
-			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="one-time-code" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: totp, disable: submitRequest"
 			data-i18n="[placeholder]LOGIN/LABEL_TOTP">
-		<button class="fontastic" data-bind="command: submitCommand" data-i18n="[title]LOGIN/BUTTON_LOGIN">❯</button>
 	</div>
 	<div id="plugin-Login-BottomControlGroup"></div>
-	<div class="controls" data-bind="hidden: hideSubmitButton">
-		<button class="btn btn-large btn-block"
+	<div class="controls">
+		<button class="btn btn-large buttonLogin"
 			data-bind="command: submitCommand"
 			data-i18n="LOGIN/BUTTON_LOGIN"></button>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
index b261adad7..4eb307041 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminPane.html
@@ -1,6 +1,5 @@
 <div class="b-toolbar g-ui-user-select-none">
-	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a>
 	<h4>SnappyMail - <span data-i18n="TOP_PANEL/LABEL_ADMIN_PANEL"></span></h4>
 	<a class="btn btn-logout fontastic" data-bind="click: logoutClick">⏻</a>
 </div>
-<div id="rl-settings-subscreen"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
index 6f7a08741..b83ea9345 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsAbout.html
@@ -4,7 +4,7 @@
 		<div class="span4">
 			<div class="rl-logo"></div>
 			<div>
-				2022 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
+				2024 © <span data-i18n="TAB_ABOUT/LABEL_ALL_RIGHTS_RESERVED"></span>
 				<br>
 				<a class="g-ui-link" href="https://snappymail.eu/" target="_blank" style="padding-left: 0">https://snappymail.eu/</a>
 			</div>
@@ -12,9 +12,16 @@
 		<div class="span6">
 			<h1 style="margin-bottom: 0;">SnappyMail</h1>
 			<h4 style="margin-top: 0;" data-bind="text: version"></h4>
-			<h4 style="color: #aaa; font-weight: normal;">An advanced fork of <a class="g-ui-link" href="https://www.rainloop.net/" target="_blank">RainLoop</a></h4>
+			<h4 style="color: #aaa; font-weight: normal;">An advanced fork of RainLoop</h4>
 			<h4 style="color: #aaa; font-weight: normal;" data-i18n="TAB_ABOUT/LABEL_TAG_HINT"></h4>
 
+			<a class="btn" target="_blank" href="https://github.com/sponsors/the-djmaze">
+				<svg aria-hidden="true" height="16" viewBox="0 0 16 16" version="1.1" width="16" data-view-component="true">
+					<path stroke="#db61a2" fill="#db61a2" d="m8 14.25.345.666a.75.75 0 0 1-.69 0l-.008-.004-.018-.01a7.152 7.152 0 0 1-.31-.17 22.055 22.055 0 0 1-3.434-2.414C2.045 10.731 0 8.35 0 5.5 0 2.836 2.086 1 4.25 1 5.797 1 7.153 1.802 8 3.02 8.847 1.802 10.203 1 11.75 1 13.914 1 16 2.836 16 5.5c0 2.85-2.045 5.231-3.885 6.818a22.066 22.066 0 0 1-3.744 2.584l-.018.01-.006.003h-.002ZM4.25 2.5c-1.336 0-2.75 1.164-2.75 3 0 2.15 1.58 4.144 3.365 5.682A20.58 20.58 0 0 0 8 13.393a20.58 20.58 0 0 0 3.135-2.211C12.92 9.644 14.5 7.65 14.5 5.5c0-1.836-1.414-3-2.75-3-1.373 0-2.609.986-3.029 2.456a.749.749 0 0 1-1.442 0C6.859 3.486 5.623 2.5 4.25 2.5Z"></path>
+				</svg>
+				<span style="margin-left:0.25rem">Sponsor</span>
+			</a>
+
 			<div>
 				<hr>
 				<div data-bind="visible: 'error' === statusType()">
@@ -27,14 +34,15 @@
 					<br />
 					<span data-bind="if: coreWarning">
 						<br />
-						<i class="icon-warning" style="color: red"></i>
+						<i class="fontastic" style="color:red">⚠</i>
 						<b data-i18n="HINTS/WARNING"></b>
 						<span data-i18n="TAB_ABOUT/HINT_READ_CHANGE_LOG"></span>
 						<br />
 					</span>
 					<br />
 					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases" target="_blank" data-i18n="TAB_ABOUT/BUTTON_RELEASES"></a>
-					<a class="btn" data-bind="visible: coreUpdatable(), click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" data-bind="visible: coreUpdatable, click: updateCoreData" data-i18n="GLOBAL/UPDATE"></a>
+					<a class="btn" href="https://github.com/the-djmaze/snappymail/releases/latest" data-bind="visible: !coreUpdatable()" data-i18n="GLOBAL/UPDATE"></a>
 				</div>
 				<div data-bind="visible: 'up-to-date' === statusType()">
 					<i style="color: green">✔</i>
@@ -50,7 +58,29 @@
 				</div>
 			</div>
 
-			<h3>PHP optional extensions</h3>
+			<h3>System</h3>
+			<table class="table table-hover table-bordered"><tbody>
+				<tr>
+					<td>Average load past minute</td>
+					<td data-bind="text: load1"></td>
+				</tr>
+				<tr>
+					<td>Average load past 5 minutes</td>
+					<td data-bind="text: load5"></td>
+				</tr>
+				<tr>
+					<td>Average load past 15 minutes</td>
+					<td data-bind="text: load15"></td>
+				</tr>
+			</tbody>
+			</table>
+
+			<h3>PHP</h3>
+			<div data-bind="hidden: php64" class="alert">
+				<i class="fontastic" style="color:red">⚠</i>
+				PHP is running in 32bit mode. <a href="https://github.com/the-djmaze/snappymail/issues/830#issuecomment-1372112793">read here</a>
+			</div>
+
 			<table class="table table-hover table-bordered"><thead><tr>
 				<th>Extension</th>
 				<th>Loaded</th>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
index 13bd4ec70..e8796ab6a 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsBranding.html
@@ -2,36 +2,14 @@
 	<div class="legend" data-i18n="TAB_BRANDING/LEGEND_BRANDING"></div>
 	<div class="control-group">
 		<label data-i18n="TAB_BRANDING/LABEL_PAGE_TITLE"></label>
-		<div data-bind="component: {
-			name: 'Input',
-			params: {
-				value: title,
-				trigger: titleTrigger,
-				size: 5
-			}
-		}"></div>
+		<input class="span5" type="text" autocorrect="off" data-bind="textInput: title, saveTrigger: titleTrigger">
 	</div>
 	<div class="control-group">
 		<label data-i18n="TAB_BRANDING/LABEL_LOADING_DESCRIPTION"></label>
-		<div data-bind="component: {
-			name: 'Input',
-			params: {
-				value: loadingDescription,
-				trigger: loadingDescriptionTrigger,
-				size: 5
-			}
-		}"></div>
+		<input class="span5" type="text" autocorrect="off" data-bind="textInput: loadingDescription, saveTrigger: loadingDescriptionTrigger">
 	</div>
 	<div class="control-group">
 		<label data-i18n="TAB_BRANDING/LABEL_FAVICON_URL"></label>
-		<div data-bind="component: {
-			name: 'Input',
-			params: {
-				value: faviconUrl,
-				trigger: faviconUrlTrigger,
-				placeholder: 'https://',
-				size: 5
-			}
-		}"></div>
+		<input class="span5" type="text" placeholder="https://" autocorrect="off" data-bind="textInput: faviconUrl, saveTrigger: faviconUrlTrigger">
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
index c1d13ec87..623557f84 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsConfig.html
@@ -1,5 +1,6 @@
 <div class="legend">application.ini</div>
-<form method="POST" data-bind="submit: saveConfig">
+<form method="POST" data-bind="submit: saveConfig" spellcheck="false" autocomplete="off" autocapitalize="none">
+<input type="search" data-bind="textInput: search" data-i18n="[placeholder]GLOBAL/SEARCH">
 <table class="table table-hover table-bordered">
 	<!-- ko foreach: config -->
 	<tbody>
@@ -9,10 +10,13 @@
 			<td data-bind="text: name"></td>
 			<td>
 				<!-- ko if: 'checkbox' == type -->
-				<input type="checkbox" data-bind="attr: {name: key, checked: value}" readonly="">
+				<input type="checkbox" data-bind="attr: {name: key, checked: value}">
 				<!-- /ko -->
-				<!-- ko if: 'checkbox' != type -->
-				<input data-bind="attr: {name: key, type: type}, value: value" readonly="">
+				<!-- ko if: options -->
+				<select data-bind="attr: {name: key}, options: options, value: value"></select>
+				<!-- /ko -->
+				<!-- ko if: 'checkbox' != type && !options -->
+				<input data-bind="attr: {name: key, type: type}, value: value" autocorrect="off">
 				<!-- /ko -->
 				<em data-bind="text: comment, visible: comment"></em>
 			</td>
@@ -21,7 +25,5 @@
 	</tbody>
 	<!-- /ko -->
 </table>
-<!--
-<button data-i18n="GLOBAL/SAVE"></button>
--->
+<button class="btn" data-i18n="GLOBAL/SAVE" data-bind="css:{'btn-success':saved()},attr:{'data-icon':saved()?'✔':'💾'}"></button>
 </form>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
index a040100a9..10d342652 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsContacts.html
@@ -4,7 +4,7 @@
 		<div data-i18n="[html]TAB_CONTACTS/HTML_ALERT_DOES_NOT_SUPPORTED"></div>
 	</div>
 </div>
-<div class="form-horizontal" data-bind="visible: contactsSupported">
+<form class="form-horizontal" spellcheck="false" data-bind="visible: contactsSupported">
 	<div class="legend" data-i18n="TAB_CONTACTS/LEGEND_CONTACTS"></div>
 	<div class="control-group">
 		<div>
@@ -18,8 +18,16 @@
 			}"></div>
 		</div>
 	</div>
-</div>
-<div class="form-horizontal" data-bind="visible: contactsSupported">
+	<div class="control-group">
+		<label data-i18n="TAB_CONTACTS/SUGGESTIONS_LIMIT"></label>
+		<div>
+			<input type="number" min="5" max="50" step="1" class="span1" data-bind="textInput: contactsSuggestionsLimit">
+			&nbsp;
+			<span data-bind="saveTrigger: contactsSuggestionsLimitTrigger"></span>
+		</div>
+	</div>
+</form>
+<form class="form-horizontal" spellcheck="false" data-bind="visible: contactsSupported">
 	<div class="legend" data-i18n="TAB_CONTACTS/LEGEND_STORAGE"></div>
 	<div class="control-group">
 		<label data-i18n="TAB_CONTACTS/LABEL_STORAGE_TYPE"></label>
@@ -38,46 +46,70 @@
 		<div class="control-group">
 			<label data-i18n="TAB_CONTACTS/LABEL_STORAGE_DSN"></label>
 			<div>
-				<input type="text" class="span6" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="text" class="span6" autocomplete="off" autocorrect="off" autocapitalize="off"
 					data-bind="value: contactsPdoDsn, saveTrigger: contactsPdoDsnTrigger" placeholder="mysql:host=127.0.0.1;port=3306;dbname=snappymail">
 			</div>
 		</div>
 		<div class="control-group">
 			<label data-i18n="TAB_CONTACTS/LABEL_STORAGE_USER"></label>
 			<div>
-				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
 					data-bind="value: contactsPdoUser, saveTrigger: contactsPdoUserTrigger">
 			</div>
 		</div>
 		<div class="control-group">
 			<label data-i18n="TAB_CONTACTS/LABEL_STORAGE_PASSWORD"></label>
 			<div>
-				<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+				<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
 					data-bind="value: contactsPdoPassword, saveTrigger: contactsPdoPasswordTrigger">
 			</div>
 		</div>
-		<div class="control-group">
-			<label></label>
-			<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
-				<i class="fontastic" data-bind="css: {'icon-spinner': testing()}">ℹ</i>
-				<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
-			</a>
+
+		<div data-bind="visible: 'mysql' === contactsPdoType()">
+			<div class="control-group">
+				<label>SSL CA</label>
+				<div>
+					<textarea placeholder="PEM formatted" data-bind="value: contactsMySQLSSLCA, saveTrigger: contactsMySQLSSLCATrigger"></textarea>
+				</div>
+			</div>
+			<div class="control-group">
+				<label></label>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: { value: contactsMySQLSSLVerify, label: 'VERIFY SERVER CERT' }
+				}"></div>
+			</div>
+			<div class="control-group">
+				<label>SSL CIPHER</label>
+				<div>
+					<input type="text" placeholder="HIGH" data-bind="value: contactsMySQLSSLCiphers, saveTrigger: contactsMySQLSSLCiphersTrigger">
+				</div>
+			</div>
 		</div>
 	</div>
 	<div data-bind="visible: 'sqlite' === contactsPdoType()">
 		<div class="control-group">
+			<label></label>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: { value: contactsSQLiteGlobal, label: 'TAB_CONTACTS/SQLITE_GLOBAL' }
+			}"></div>
+		</div>
+		<div class="control-group" data-bind="visible: contactsSQLiteGlobal">
 			<div class="alert">
 				<h4 data-i18n="TAB_CONTACTS/ALERT_NOTICE"></h4>
 				<div data-i18n="[html]TAB_CONTACTS/HTML_ALERT_DO_NOT_USE_THIS_DATABASE"></div>
 			</div>
 		</div>
+	</div>
+	<div data-bind="visible: contactsPdoType">
 		<div class="control-group">
 			<label></label>
 			<a class="btn" data-bind="command: testContactsCommand, css: { 'btn-success': testContactsSuccess, 'btn-danger': testContactsError }">
 				<i class="fontastic" data-bind="css: {'icon-spinner': testing()}">ℹ</i>
-				<span data-i18n="TAB_CONTACTS/BUTTON_TEST"></span>
+				<span data-i18n="GLOBAL/TEST"></span>
 			</a>
 		</div>
 	</div>
 	<div class="alert span8" data-bind="text: testContactsErrorMessage, visible: '' !== testContactsErrorMessage()"></div>
-</div>
+</form>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
index bc2ebd538..bb17ba8da 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsDomains.html
@@ -2,11 +2,7 @@
 	<span data-i18n="TAB_DOMAINS/LEGEND_DOMAINS"></span>
 	<i class="icon-spinner" style="margin: 5px" data-bind="visible: domains.loading"></i>
 </div>
-<a class="btn" data-bind="click: createDomain" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></a>
-&nbsp;&nbsp;
-<a class="btn" data-bind="click: createDomainAlias" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></a>
-<br>
-<br>
+
 <p data-i18n="[html]TAB_DOMAINS/HTML_DOMAINS_HELPER"></p>
 <table class="table table-hover b-admin-domains-list-table" data-bind="i18nUpdate: domains">
 	<colgroup>
@@ -31,4 +27,16 @@
 			<td class="disabled-domain fontastic" data-bind="click: function (oDomain) { $root.disableDomain(oDomain); }, text: disabled() ? '☐' : '☑'"></td>
 		</tr>
 	</tbody>
+	<tfoot>
+		<tr><td colspan="4" style="text-align:right">
+			<a class="btn" data-bind="click: createDomain" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_DOMAIN"></a>
+			&nbsp;&nbsp;
+			<a class="btn" data-bind="click: createDomainAlias" data-icon="✚" data-i18n="TAB_DOMAINS/BUTTON_ADD_ALIAS"></a>
+		</td></tr>
+	</tfoot>
 </table>
+
+<div>
+	<input data-i18n="[placeholder]GLOBAL/USERNAME" data-bind="textInput: username">
+	<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: testUsername"></button>
+</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
index 2d4f30a3b..e31f81108 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsGeneral.html
@@ -8,11 +8,9 @@
 <div class="row" data-bind="visible: dataFolderAccess">
 	<div class="alert alert-error span8" style="margin-top: 10px;">
 		<h4 data-i18n="TAB_GENERAL/ALERT_WARNING"></h4>
-		<br>
-		<span data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></span>
-		&nbsp;
-		<a href="https://www.rainloop.net/docs/installation/#notice"
-			target="_blank"><strong>https://www.rainloop.net/docs/installation</strong></a>
+		<div data-i18n="TAB_GENERAL/ALERT_DATA_ACCESS"></div>
+		<a href="https://github.com/the-djmaze/snappymail/wiki/Installation-instructions#secure-data-folder"
+			target="_blank"><strong>https://github.com/the-djmaze/snappymail/wiki/Installation-instructions</strong></a>
 	</div>
 </div>
 <div class="form-horizontal">
@@ -68,13 +66,6 @@
 					value: capaUserBackground
 				}
 			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'TAB_GENERAL/LABEL_NEW_FOLDER_MOVE',
-					value: newMoveToFolder
-				}
-			}"></div>
 		</div>
 	</div>
 	<div class="control-group">
@@ -97,7 +88,7 @@
 			<br>
 			<br>
 			<div class="alert alert-info">
-				<b>PHP:</b>&nbsp;<!-- ko text: uploadDataDesc --><!-- /ko -->
+				<b>PHP: </b><!-- ko text: uploadDataDesc --><!-- /ko -->
 			</div>
 		</div>
 	</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
index 4f0aa2f20..0add30ff6 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/AdminSettingsLogin.html
@@ -2,14 +2,7 @@
 	<div class="legend" data-i18n="TAB_LOGIN/LEGEND_LOGIN_SCREEN"></div>
 	<div class="control-group">
 		<label data-i18n="TAB_LOGIN/LABEL_DEFAULT_DOMAIN"></label>
-		<div data-bind="component: {
-			name: 'Input',
-			params: {
-				value: loginDefaultDomain,
-				trigger: loginDefaultDomainTrigger,
-				size: 3
-			}
-		}"></div>
+		<input class="span3" type="text" spellcheck="false" autocomplete="off" autocapitalize="none" autocorrect="off" data-bind="textInput: loginDefaultDomain, saveTrigger: loginDefaultDomainTrigger">
 	</div>
 	<div class="control-group">
 		<div>
@@ -17,7 +10,6 @@
 				name: 'Checkbox',
 				params: { value: determineUserDomain, label: 'TAB_LOGIN/LABEL_DETERMINE_USER_DOMAIN' }
 			}"></div>
-			<br>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: { value: allowLanguagesOnLogin, label: 'TAB_LOGIN/LABEL_ALLOW_LANGUAGES_ON_LOGIN' }
@@ -26,11 +18,6 @@
 				name: 'Checkbox',
 				params: { enable: allowLanguagesOnLogin, value: determineUserLanguage, label: 'TAB_LOGIN/LABEL_DETERMINE_USER_LANGUAGE' }
 			}"></div>
-			<br>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: { value: hideSubmitButton, label: 'TAB_LOGIN/LABEL_HIDE_SUBMIT_BUTTON' }
-			}"></div>
 		</div>
 	</div>
 </div>
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 b56b24597..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
@@ -1,5 +1,5 @@
 <div class="legend">
-	<span data-i18n="SETTINGS_LABELS/LABEL_PACKAGES_NAME"></span>
+	<span data-i18n="SETTINGS_LABELS/PACKAGES"></span>
 	<i class="icon-spinner" style="margin: 5px" data-bind="visible: packages.loading"></i>
 </div>
 
@@ -15,20 +15,23 @@
 
 <div data-bind="component: {
 	name: 'Checkbox',
-	params: { value: enabledPlugins, label: 'TAB_PACKAGES/LABEL_ENABLE_PLUGINS' }
+	params: { value: pluginsEnable, label: 'TAB_PACKAGES/LABEL_ENABLE_PLUGINS' }
 }"></div>
 
 <br>
 
+<input type="search" data-bind="textInput: search" data-i18n="[placeholder]GLOBAL/SEARCH">
+<br>
+
 <div data-bind="visible: packagesUpdate().length">
 	<div class="legend">
-		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>&nbsp;
+		<span data-i18n="TAB_PACKAGES/LEGEND_AVAILABLE_FOR_UPDATE"></span>
 		(<span data-bind="text: packagesUpdate().length"></span>)
 	</div>
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesUpdate} }"></div>
 </div>
 
-<div id="packages-installed" data-bind="visible: packagesCurrent().length, css: {'disabled': !enabledPlugins()}">
+<div id="packages-installed" data-bind="visible: packagesCurrent().length, css: {'disabled': !pluginsEnable()}">
 	<div class="legend" data-i18n="TAB_PACKAGES/LEGEND_INSTALLED_PACKAGES"></div>
 	<div data-bind="template: { name: 'AdminSettingsPackagesTable', data: {f: packagesCurrent} }"></div>
 </div>
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 38ae29e2b..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,35 +1,36 @@
-	<label data-bind="text: Label, visible: 5 !== Type"></label>
-	<!-- ko if: 0 === Type -->
-		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+	<label data-bind="text: label, visible: 5 !== type"></label>
+	<!-- ko if: 0 === type -->
+		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
 			data-bind="value: value, attr: {placeholder: placeholder}">
 	<!-- /ko -->
-	<!-- ko if: 1 === Type -->
+	<!-- ko if: 1 === type -->
 		<input type="number" step="1"
 			data-bind="value: value, attr: {placeholder: placeholder}">
 	<!-- /ko -->
-	<!-- ko if: 3 === Type -->
-		<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+	<!-- ko if: 3 === type -->
+		<input type="password" autocomplete="off" autocorrect="off" autocapitalize="off"
 			data-bind="value: value, attr: {placeholder: placeholder}">
 	<!-- /ko -->
-	<!-- ko if: 2 === Type -->
-		<div data-bind="component: {
-			name: 'TextArea',
-			params: { value: value, placeholder: placeholder }
-		}"></div>
+	<!-- ko if: 2 === type -->
+		<textarea rows="5" autocomplete="off" autocorrect="off" autocapitalize="off"
+			data-bind="value: value, attr: {placeholder: placeholder }"></textarea>
 	<!-- /ko -->
-	<!-- ko if: 4 === Type -->
-		<select data-bind="options: Default, value: value"></select>
+	<!-- ko if: 4 === type -->
+		<select data-bind="options: options, value: value"></select>
 	<!-- /ko -->
-	<!-- ko if: 5 === Type -->
+	<!-- ko if: 5 === type -->
 		<div data-bind="component: {
 			name: 'Checkbox',
-			params: { value: value, label: Label }
+			params: { value: value, label: label }
 		}"></div>
 	<!-- /ko -->
-	<!-- ko if: 6 === Type -->
+	<!-- ko if: 6 === type -->
 		<input type="url"
 			data-bind="value: value, attr: {placeholder: placeholder}">
 	<!-- /ko -->
-	<!-- ko if: '' !== Desc -->
-	<span tabindex="0" class="help-block"><span data-bind="text: Desc"></span></span>
+	<!-- ko if: 8 === type -->
+		<select data-bind="options: options, optionsText: 'name', optionsValue: 'id', value: value"></select>
+	<!-- /ko -->
+	<!-- ko if: '' !== desc -->
+	<span tabindex="0" class="help-block"><span data-bind="text: desc"></span></span>
 	<!-- /ko -->
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 d670d3152..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,81 +1,79 @@
 <div class="legend" data-i18n="TAB_SECURITY/LEGEND_SECURITY"></div>
+<div class="form-horizontal">
+	<div class="control-group">
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'TAB_SECURITY/LABEL_USE_IMAGE_PROXY',
+				value: proxyExternalImages
+			}
+		}"></div>
+	</div>
+</div>
+<div class="legend" data-i18n="TAB_SECURITY/CRYPTO"></div>
 <div class="form-horizontal">
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					value: useLocalProxyForExternalImages,
-					label: 'TAB_SECURITY/LABEL_USE_IMAGE_PROXY'
+					label: gnuPGversion,
+					value: capaGnuPG
 				}
 			}"></div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					value: capaOpenPGP,
-					label: 'TAB_SECURITY/LABEL_ALLOW_OPEN_PGP',
-					inline: true
+					label: 'OpenPGP.js',
+					value: capaOpenPGP
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'TAB_SECURITY/LABEL_AUTO_VERIFY',
+					value: autoVerifySignatures
 				}
 			}"></div>
 		</div>
 	</div>
 </div>
-<div class="form-horizontal">
+<form class="form-horizontal" spellcheck="false">
 	<div class="legend" data-i18n="TAB_SECURITY/LEGEND_ADMIN_PANEL_ACCESS_CREDENTIALS"></div>
+	<div class="control-group" data-bind="css: {'error': adminLoginError}">
+		<label data-i18n="GLOBAL/USERNAME"></label>
+		<input type="text" autocomplete="username" autocorrect="off" autocapitalize="off"
+			data-bind="textInput: adminLogin">
+	</div>
 	<div class="control-group">
 		<label data-i18n="TAB_SECURITY/LABEL_CURRENT_PASSWORD"></label>
-		<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: adminPassword">
 	</div>
-	<div class="control-group" data-bind="css: {'error': adminLoginError}">
-		<label data-i18n="TAB_SECURITY/LABEL_NEW_LOGIN"></label>
-		<input type="text" autocomplete="username" autocorrect="off" autocapitalize="off" spellcheck="false"
-			data-bind="textInput: adminLogin">
-	</div>
 	<div class="control-group" data-bind="css: {'error': adminPasswordNewError}">
 		<label data-i18n="TAB_SECURITY/LABEL_NEW_PASSWORD"></label>
-		<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: adminPasswordNew">
 	</div>
 	<div class="control-group" data-bind="css: {'error': adminPasswordNewError}">
 		<label data-i18n="TAB_SECURITY/LABEL_REPEAT_PASSWORD"></label>
-		<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="password" autocomplete="new-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: adminPasswordNew2">
 	</div>
 	<div class="control-group">
 		<label data-i18n="LOGIN/LABEL_TOTP"></label>
-		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
 			pattern="[A-Z2-7]{16,}"
 			data-bind="textInput: adminTOTP">
+		<button type="button" data-bind="visible:!adminTOTP(), click:generateTOTP">Generate</button>
 	</div>
 	<div class="control-group">
-		<a class="btn" data-bind="command: saveNewAdminPasswordCommand, css: { 'btn-success': adminPasswordUpdateSuccess, 'btn-danger': adminPasswordUpdateError }"
-			data-icon="🔑" data-i18n="TAB_SECURITY/BUTTON_UPDATE_PASSWORD"></a>
+		<label></label>
+		<pre data-bind="text: viewQRCode" style="font-family:var(--fontMono);font-size:11px;letter-spacing:-1px;line-height:1;"></pre>
 	</div>
-</div>
-<div class="form-horizontal">
-	<div class="legend" data-i18n="TAB_SECURITY/LEGEND_SSL"></div>
 	<div class="control-group">
-		<div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					value: verifySslCertificate,
-					label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION',
-					inline: true
-				}
-			}"></div>
-			&nbsp;&nbsp;
-			<span style="color:red">(<span data-i18n="HINTS/UNSTABLE"></span>)</span>
-			<br>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					enable: verifySslCertificate,
-					value: allowSelfSigned,
-					label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED'
-				}
-			}"></div>
-		</div>
+		<label></label>
+		<a class="btn" data-bind="command: saveAdminUserCommand, css: { 'btn-success': saveSuccess, 'btn-danger': saveError }"
+			data-icon="🔑" data-i18n="GLOBAL/SAVE"></a>
 	</div>
-</div>
+</form>
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 ec24f31bd..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
@@ -2,109 +2,199 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-bind="text: headerText"></h3>
 </header>
-<div class="modal-body">
-	<div class="row" data-bind="visible: !edit()" style="margin-bottom: 20px;">
+<form class="modal-body" action="#/" spellcheck="false" onsubmit="return false;">
+	<div class="row" data-bind="hidden: edit" style="margin-bottom: 20px;">
 		<div class="span5">
 			<span data-i18n="POPUPS_DOMAIN/LABEL_NAME"></span>
-			&nbsp;
-			<span style="color: #aaa">(<span data-i18n="POPUPS_DOMAIN/NAME_HELPER"></span>)</span>
+			<span style="opacity:0.7"> (<span data-i18n="POPUPS_DOMAIN/NAME_HELPER"></span>)</span>
 			<br>
-			<input type="text" class="span4" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			<input name="Name" type="text" class="span4" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
 				data-bind="textInput: name">
-			<div class="alert-error" data-bind="visible: '' !== savingError(), text: savingError"></div>
+			<div class="alert-error" data-bind="visible: savingError, text: savingError"></div>
+			<button class="btn" type="button" data-bind="click: autoconfig">
+				<i class="fontastic" data-bind="css: {'icon-spinner': detectingConfig()}">⚙</i>
+				autoconfig
+			</button>
 		</div>
-		<div class="span5 domain-desc" data-bind="visible: '' !== domainDesc(), html: domainDesc"></div>
+		<div class="span5 alert-info domain-desc" data-bind="visible: domainDesc, html: domainDesc"></div>
 	</div>
 
-	<form class="form-horizontal domain-form" action="#/" onsubmit="return false;">
+	<div class="form-horizontal domain-form">
 		<div class="tabs">
 
-			<input type="radio" name="helptabs" id="tab-help1" checked>
-			<label for="tab-help1" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }, tooltipErrorTip: testingImapErrorDesc"
-				data-i18n="POPUPS_DOMAIN/LABEL_IMAP"></label>
+			<input type="radio" name="tabs" id="tab-imap" checked>
+			<label for="tab-imap" role="tab" tabindex="0"
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingImapError }"
+				>IMAP</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="false">
+				<div class="alert alert-error" data-bind="visible: testingImapError, text: testingImapError"></div>
 				<div class="row">
-					<div class="span3">
+					<div class="span">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 						<br>
-						<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+						<input name="IMAP[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 							data-bind="textInput: imapHost, hasfocus: imapHostFocus">
 					</div>
-					<div class="span2">
+					<div class="span">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 						<br>
-						<select class="span2" data-bind="value: imapSecure">
+						<select name="IMAP[type]" class="span2" data-bind="value: imapType">
 							<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-							<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-							<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+							<option value="1">SSL/TLS</option>
+							<option value="2">STARTTLS</option>
 						</select>
 					</div>
-					<div class="span2">
+					<div class="span">
 						<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 						<br>
-						<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-							style="width:6em" data-bind="textInput: imapPort">
+						<input name="IMAP[port]" type="number" style="width:6em" data-bind="textInput: imapPort">
+					</div>
+					<div class="span">
+						<span data-i18n="POPUPS_DOMAIN/TIMEOUT"></span>
+						<br>
+						<input name="IMAP[timeout]" type="number" min="5" step="1" style="width:6em" data-bind="textInput: imapTimeout">
 					</div>
 				</div>
 				<br>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-						value: imapShortLogin,
-						inline: true
+						value: imapShortLogin
 					}
 				}"></div>
-				&nbsp;&nbsp;
-				<span style="color: #aaa">(user@domain.com → user)</span>
+				<span style="opacity:0.7"> (user@example.com → user)</span>
+				<br>
+				<div style="display: inline-block;" data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'POPUPS_DOMAIN/LABEL_LOWERCASE_LOGIN',
+						value: imapLowerLogin
+					}
+				}"></div>
+				<span style="opacity:0.7"> (USER@example.com → user@example.com)</span>
+
+				<h4>SSL/TLS</h4>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						value: imapSslVerify_peer,
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						enable: imapSslVerify_peer,
+						value: imapSslAllow_self_signed,
+						label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED'
+					}
+				}"></div>
+
+				<h4>
+					<span data-i18n="POPUPS_DOMAIN/DISABLE_CAPABILITIES"></span>
+					<a style="margin-left:0.5em" href="https://github.com/the-djmaze/snappymail/wiki/IMAP-capabilities" target="_blank">ⓘ</a>
+				</h4>
+
+				<div data-bind="foreach: imapCapabilities" style="columns: 16em auto">
+					<div>
+						<label class="e-component e-checkbox material-design">
+							<div>
+								<input type="checkbox" data-bind="checked: $parent.imapDisabled_capabilities,  value: $data"/>
+								<div role="checkbox"></div>
+							</div>
+							<span data-bind="text: $data"></span>
+						</label>
+					</div>
+				</div>
+
+				<h4 data-i18n="POPUPS_DOMAIN/LIMITS"></h4>
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/MESSAGES"></label>
+					<input name="IMAP[message_list_limit]" type="number" min="0" step="1" class="span2" data-bind="textInput: imapMessage_list_limit">
+				</div>
+<!--
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/FOLDERS"></label>
+					<input name="IMAP[folder_list_limit]" type="number" min="0" step="1" class="span1" data-bind="textInput: imapFolder_list_limit">
+				</div>
+
+        "use_expunge_all_on_delete": false,
+        "fast_simple_search": true,
+        "force_select": false,
+        "message_all_headers": false,
+				<div class="control-group">
+					<label>Search filter</label>
+					<input name="IMAP[search_filter]" type="text" class="span3" data-bind="textInput: imapSearch_filter">
+				</div>
+-->
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/VALID_SPAM_HEADERS"></label>
+					<input name="IMAP[spam_headers]" type="text" class="span3" data-bind="textInput: imapSpam_headers" title="rspamd,spamassassin,bogofilter">
+				</div>
+				<div class="control-group">
+					<label data-i18n="POPUPS_DOMAIN/VALID_VIRUS_HEADERS"></label>
+					<input name="IMAP[virus_headers]" type="text" class="span3" data-bind="textInput: imapVirus_headers" title="rspamd,clamav">
+				</div>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help2">
-			<label for="tab-help2" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }, tooltipErrorTip: testingSmtpErrorDesc"
-				data-i18n="POPUPS_DOMAIN/LABEL_SMTP"></label>
+			<input type="radio" name="tabs" id="tab-smtp">
+			<label for="tab-smtp" role="tab" tabindex="0"
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSmtpError }"
+				>SMTP</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
-				<div data-bind="visible: !smtpPhpMail()">
+				<div class="alert alert-error" data-bind="visible: testingSmtpError, text: testingSmtpError"></div>
+				<div data-bind="visible: !smtpUsePhpMail()">
 					<div class="row">
-						<div class="span3">
+						<div class="span">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 							<br>
-							<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							<input name="SMTP[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 								data-bind="textInput: smtpHost, hasfocus: smtpHostFocus">
 						</div>
-						<div class="span2">
+						<div class="span">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 							<br>
-							<select class="span2" data-bind="value: smtpSecure">
+							<select name="SMTP[type]" class="span2" data-bind="value: smtpType">
 								<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-								<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-								<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+								<option value="1">SSL/TLS</option>
+								<option value="2">STARTTLS</option>
 							</select>
 						</div>
-						<div class="span2">
+						<div class="span">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 							<br>
-							<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-								style="width:6em" data-bind="textInput: smtpPort">
+							<input name="SMTP[port]" type="number" style="width:6em" data-bind="textInput: smtpPort">
+						</div>
+						<div class="span">
+							<span data-i18n="POPUPS_DOMAIN/TIMEOUT"></span>
+							<br>
+							<input name="SMTP[timeout]" type="number" min="5" step="1" style="width:6em" data-bind="textInput: smtpTimeout">
 						</div>
 					</div>
 					<br>
-					<div data-bind="component: {
+					<div style="display: inline-block;" data-bind="component: {
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_USE_SHORT_LOGIN',
-							value: smtpShortLogin,
-							inline: true
+							value: smtpShortLogin
 						}
 					}"></div>
-					&nbsp;&nbsp;
-					<span style="color: #aaa">(user@domain.com → user)</span>
+					<span style="opacity:0.7"> (user@example.com → user)</span>
+					<br>
+					<div style="display: inline-block;" data-bind="component: {
+						name: 'Checkbox',
+						params: {
+							label: 'POPUPS_DOMAIN/LABEL_LOWERCASE_LOGIN',
+							value: smtpLowerLogin
+						}
+					}"></div>
+					<span style="opacity:0.7"> (USER@example.com → user@example.com)</span>
 					<div data-bind="component: {
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_USE_AUTH',
-							value: smtpAuth
+							value: smtpUseAuth
 						}
 					}"></div>
 					<br>
@@ -113,89 +203,120 @@
 					name: 'Checkbox',
 					params: {
 						label: 'POPUPS_DOMAIN/LABEL_SET_SENDER',
-						value: smtpSetSender,
-						inline: true
+						value: smtpSetSender
 					}
 				}"></div>
-				<br>
 				<div data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'POPUPS_DOMAIN/LABEL_USE_PHP_MAIL',
-						value: smtpPhpMail,
-						inline: true
+						label: 'POPUPS_DOMAIN/LABEL_AUTH_PLAIN_LINE',
+						value: smtpAuthPlainLine
+					}
+				}"></div>
+				<div style="display: inline-block;" data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'POPUPS_DOMAIN/LABEL_USE_PHP_MAIL',
+						value: smtpUsePhpMail
+					}
+				}"></div>
+				<span style="color:red"> (<span data-i18n="HINTS/BETA"></span>)</span>
+
+				<h4>SSL/TLS</h4>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						value: smtpSslVerify_peer,
+						label: 'TAB_SECURITY/LABEL_REQUIRE_VERIFICATION'
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						enable: smtpSslVerify_peer,
+						value: smtpSslAllow_self_signed,
+						label: 'TAB_SECURITY/LABEL_ALLOW_SELF_SIGNED'
 					}
 				}"></div>
-				&nbsp;&nbsp;
-				<span style="color:red">(<span data-i18n="HINTS/BETA"></span>)</span>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help3">
-			<label for="tab-help3" role="tab" tabindex="0"
-				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSieveError }, tooltipErrorTip: testingSieveErrorDesc">
+			<input type="radio" name="tabs" id="tab-sieve">
+			<label for="tab-sieve" role="tab" tabindex="0"
+				data-bind="css: { 'testing-done': testingDone, 'testing-error': testingSieveError }">
 				<i class="icon-filter"></i>
-				<span data-i18n="POPUPS_DOMAIN/LABEL_SIEVE"></span>
+				SIEVE
 			</label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
+				<div class="alert alert-error" data-bind="visible: testingSieveError, text: testingSieveError"></div>
 				<div class="row">
 					<div class="span5" data-bind="component: {
 						name: 'Checkbox',
 						params: {
 							label: 'POPUPS_DOMAIN/LABEL_ALLOW_SIEVE_SCRIPTS',
-							value: useSieve
+							value: sieveEnabled
 						}
 					}"></div>
 				</div>
-				<div data-bind="visible: useSieve">
+				<div data-bind="visible: sieveEnabled">
 					<div class="row">
-						<div class="span3">
+						<div class="span">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SERVER"></span>
 							<br>
-							<input type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+							<input name="Sieve[host]" type="text" class="span3" autocomplete="off" autocorrect="off" autocapitalize="off"
 								data-bind="textInput: sieveHost, hasfocus: sieveHostFocus">
 						</div>
-						<div class="span2">
+						<div class="span">
 							<span data-i18n="POPUPS_DOMAIN/LABEL_SECURE"></span>
 							<br>
-							<select class="span2" data-bind="value: sieveSecure">
+							<select name="Sieve[type]" class="span2" data-bind="value: sieveType">
 								<option value="0" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_NONE"></option>
-								<option value="1" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_SSL"></option>
-								<option value="2" data-i18n="POPUPS_DOMAIN/SECURE_OPTION_STARTTLS"></option>
+								<option value="1">SSL/TLS</option>
+								<option value="2">STARTTLS</option>
 							</select>
 						</div>
-						<div class="span2">
-							<span data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
+						<div class="span">
+							<span name="Sieve[port]" data-i18n="POPUPS_DOMAIN/LABEL_PORT"></span>
 							<br>
-							<input type="number" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-								style="width:6em" data-bind="textInput: sievePort">
+							<input type="number" style="width:6em" data-bind="textInput: sievePort">
+						</div>
+						<div class="span">
+							<span data-i18n="POPUPS_DOMAIN/TIMEOUT"></span>
+							<br>
+							<input name="Sieve[timeout]" type="number" min="5" step="1"  style="width:6em" data-bind="textInput: sieveTimeout">
 						</div>
 					</div>
+
+					<h4 data-i18n="LOGIN/LABEL_LOGIN"></h4>
+					<div data-bind="component: {
+						name: 'Checkbox',
+						params: {
+							value: sieveAuthLiteral,
+							label: 'Use LITERAL+'
+						}
+					}"></div>
 				</div>
 			</div>
 
-			<input type="radio" name="helptabs" id="tab-help4">
-			<label for="tab-help4" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
+			<input type="radio" name="tabs" id="tab-whitelist">
+			<label for="tab-whitelist" role="tab" tabindex="0" data-icon="👥" data-i18n="POPUPS_DOMAIN/BUTTON_WHITE_LIST"></label>
 			<div class="tab-content" role="tabpanel" aria-hidden="true">
 				<div class="alert" data-i18n="POPUPS_DOMAIN/WHITE_LIST_ALERT"></div>
-				<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1"></textarea>
+				<textarea class="input-xxlarge" style="width: 100%" rows="8" data-bind="value: whiteList" tabindex="-1" placeholder="@example.com&#10;user@example.org&#10;username"></textarea>
 			</div>
 		</div>
-	</form>
-</div>
+	</div>
+</form>
 <footer>
 	<a class="btn" data-bind="command: testConnectionCommand, css: {
 	   'btn-success': testingDone() && !testingImapError() && !testingSmtpError(),
 	   'btn-danger': testingDone() && (testingImapError() || testingSmtpError()) }">
 		<i class="fontastic" data-bind="css: {'icon-spinner': testing()}">ℹ</i>
-		<span data-i18n="POPUPS_DOMAIN/BUTTON_TEST"></span>
+		<span data-i18n="GLOBAL/TEST"></span>
 	</a>
-	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_DOMAIN/BUTTON_CLOSE"></a>
-	<a class="btn" data-bind="command: createOrAddCommand, visible: edit()">
+	<a class="btn buttonClose" data-bind="click: close, visible: edit()" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close, visible: !edit()" data-icon="✖" data-i18n="GLOBAL/CANCEL"></a>
+	<a class="btn" data-bind="command: createOrAddCommand">
 		<i class="fontastic" data-bind="css: {'icon-spinner': saving()}">✔</i>
-		<span data-i18n="POPUPS_DOMAIN/BUTTON_UPDATE"></span>
-	</a>
-	<a class="btn" data-bind="command: createOrAddCommand, visible: !edit()">
-		<i class="fontastic" data-bind="css: {'icon-spinner': saving()}">✚</i>
-		<span data-i18n="POPUPS_DOMAIN/BUTTON_ADD"></span>
+		<span data-i18n="GLOBAL/SAVE"></span>
 	</a>
 </footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
index 384e114dd..2aa6cc0be 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsDomainAlias.html
@@ -2,17 +2,11 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_DOMAIN_ALIAS/TITLE_ADD_DOMAIN_ALIAS"></h3>
 </header>
-<div class="modal-body">
+<form id="DomainAlias" class="modal-body" spellcheck="false" autocomplete="off" autocapitalize="none" data-bind="submit: createCommand" >
 	<div class="control-group" data-bind="css: {error: '' !== savingError()}">
 		<label data-i18n="POPUPS_DOMAIN_ALIAS/LABEL_ALIAS"></label>
 		<div>
-			<div data-bind="component: {
-				name: 'Input',
-				params: {
-					value: name,
-					size: 4
-				}
-			}"></div>
+			<input class="span4" type="text" autocorrect="off" data-bind="textInput: name">
 			<div class="alert-error" data-bind="visible: '' !== savingError(), text: savingError"></div>
 		</div>
 	</div>
@@ -29,12 +23,12 @@
 			}
 		}"></div>
 	</div>
-</div>
+</form>
 <footer>
-	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_CLOSE"></a>
-	<a class="btn" data-bind="command: createCommand">
+	<button class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></button>
+	<button class="btn" data-bind="command: createCommand">
 		<i class="fontastic" data-bind="visible: !saving()">✚</i>
 		<i class="icon-spinner" data-bind="visible: saving"></i>
-		<span data-i18n="POPUPS_DOMAIN_ALIAS/BUTTON_ADD"></span>
-	</a>
+		<span data-i18n="GLOBAL/ADD"></span>
+	</button>
 </footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
index c993dd3b9..6d9a1090d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Admin/PopupsPlugin.html
@@ -2,34 +2,51 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h4>
 		<span data-i18n="POPUPS_PLUGIN/TITLE_PLUGIN"></span>
-		&nbsp;
 		"<span data-bind="text: name"></span>"
 	</h4>
 	<span data-bind="visible: hasReadme, text: readme"></span>
 </header>
 <div class="modal-body">
-	<form class="form-horizontal plugin-form" action="#/" onsubmit="return false;">
-		<div class="alert alert-info" data-bind="visible: !hasConfiguration()" data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></div>
-		<div class="alert" data-bind="visible: '' !== saveError()">
-			<a href="#" class="close" data-bind="click: function () { saveError('') }">×</a>
-			<span data-bind="text: saveError"></span>
-		</div>
-		<div data-bind="foreach: config, visible: hasConfiguration">
-			<!-- ko if: 7 == Type -->
-			<details open="">
-				<summary class="legend" data-bind="text: Label"></summary>
-				<div data-bind="foreach: config">
-					<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+	<div class="tabs">
+		<input type="radio" name="tabs" id="tab-extension-config" checked>
+		<label for="tab-extension-config" role="tab" tabindex="0">Config</label>
+		<div class="tab-content" role="tabpanel" aria-hidden="false">
+			<form class="form-horizontal plugin-form" action="#/" spellcheck="false" onsubmit="return false;">
+				<div class="alert alert-info" data-bind="visible: !hasConfiguration()" data-i18n="POPUPS_PLUGIN/DESC_NOTHING_TO_CONFIGURE"></div>
+				<div class="alert" data-bind="visible: '' !== saveError()">
+					<a href="#" class="close" data-bind="click: hideError">×</a>
+					<span data-bind="text: saveError"></span>
 				</div>
-			</details>
-			<!-- /ko -->
-			<!-- ko if: 7 != Type -->
-			<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
-			<!-- /ko -->
+				<div data-bind="foreach: config, visible: hasConfiguration">
+					<!-- ko if: 7 == type -->
+					<details open="">
+						<summary class="legend" data-bind="text: label"></summary>
+						<div data-bind="foreach: config">
+							<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+						</div>
+					</details>
+					<!-- /ko -->
+					<!-- ko if: 7 != type -->
+					<div class="control-group" data-bind="template: { name: 'AdminSettingsPluginProperty' }"></div>
+					<!-- /ko -->
+				</div>
+			</form>
 		</div>
-	</form>
+
+		<input type="radio" name="tabs" id="tab-extension-info">
+		<label for="tab-extension-info" role="tab" tabindex="0">Info</label>
+		<div class="tab-content" role="tabpanel" aria-hidden="true"><tbody>
+			<table><tbody>
+				<tr><td>Author</td><td data-bind="text: author"></td></tr>
+				<tr><td>Website</td><td><a data-bind="attr:{href: url}, text: url"></a></td></tr>
+				<tr><td>Version</td><td data-bind="text: version"></td></tr>
+				<tr><td>Date</td><td data-bind="text: released"></td></tr>
+			</tbody>
+			</table>
+		</div>
+	</div>
 </div>
 <footer>
-	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="POPUPS_PLUGIN/BUTTON_CLOSE"></a>
+	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
 	<a class="btn" data-bind="command: saveCommand, visible: hasConfiguration" data-icon="✔" data-i18n="GLOBAL/SAVE"></a>
 </footer>
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 @@
 <nav class="e-paginator g-ui-user-select-none" data-bind="foreach: $data">
-	<a data-bind="css: { 'current': current, 'custom': custom }, title: title, text: name"></a>
+	<a data-bind="css: { 'current': current }, attr: { title: title }, text: name"></a>
 </nav>
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 68781b61e..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
@@ -1,13 +1,34 @@
 <div class="modal-body">
 	<div data-bind="html: askDesc"></div>
-	<form class="form-horizontal" data-bind="visible: askPass, submit: yesClick" style="margin: 2em 0 0">
-	<div class="control-group">
+	<form class="form-horizontal" data-bind="visible: askPass() || askUsername(), submit: yesClick" style="margin: 2em 0 0" id="AskForm">
+	<div class="control-group" data-bind="visible: askUsername">
+		<label data-i18n="GLOBAL/USERNAME"></label>
+		<input type="text" data-bind="value: username">
+	</div>
+	<div class="control-group" data-bind="visible: askPass">
 		<label data-i18n="GLOBAL/PASSWORD"></label>
 		<input type="password" data-bind="value: passphrase">
+	</div>
+		<div class="control-group" style="display: inline-flex; align-items: start;flex-direction: column;">
+		<div data-bind="visible: askRemeber, component: {
+		name: 'Checkbox',
+		params: {
+			label: 'GLOBAL/REMEMBER_FOR_SESSION',
+			value: remember,
+			enable: !rememberPermanent()
+		}
+}"></div>
+			<div data-bind="visible: askRememberPermanent, component: {
+		name: 'Checkbox',
+		params: {
+			label: 'GLOBAL/REMEMBER_PERMANENT',
+			value: rememberPermanent
+		}
+	}"></div>
 	</div>
 	</form>
 </div>
 <footer>
-	<button class="btn buttonYes" data-bind="click: yesClick, text: yesButton" data-icon="✔"></button>
+	<button class="btn buttonYes" form="AskForm" data-bind="click: yesClick, text: yesButton" data-icon="✔"></button>
 	<button class="btn buttonNo" data-bind="click: noClick, text: noButton" data-icon="✖"></button>
 </footer>
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 @@
 </header>
 <div class="modal-body" style="min-height: 150px;" data-bind="foreach: languages">
 	<label data-bind="click: function () { $root.changeLanguage(key); }, css: {'selected': selected, 'user': user},
-		attr: { title: $root.languageTooltipName(key) },
+		attr: { title: title },
 		text: fullName">
 	</label>
 </div>
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 35ed4f803..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,6 +1,9 @@
-<div class="e-component e-checkbox" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': !enable() }">
-	<i role="checkbox" class="e-checkbox-icon fontastic" data-bind="text: value() ? '☑' : '☐'"></i>
-<!-- ko if: labeled -->
+<label class="e-component e-checkbox material-design" data-bind="css: { 'disabled': !enable() }">
+	<div>
+		<input type="checkbox" value="1" data-bind="checked: value, enable: enable, attr: {name: name}"/>
+		<div role="checkbox"></div>
+	</div>
+<!-- ko if: label -->
 	<span data-bind="attr: {'data-i18n': label}"></span>
 <!-- /ko -->
-</div>
+</label>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html b/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
deleted file mode 100644
index a8c4016b4..000000000
--- a/snappymail/v/0.0.0/app/templates/Views/Components/CheckboxMaterialDesign.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="e-component e-checkbox material-design" tabindex="0" data-bind="click: click, onSpace: click, css: { 'disabled': !enable() }">
-	<div role="checkbox">
-		<div data-bind="css: {'checked': value()}"></div>
-	</div>
-<!-- ko if: labeled -->
-	<span data-bind="attr: {'data-i18n': label}"></span>
-<!-- /ko -->
-</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Input.html b/snappymail/v/0.0.0/app/templates/Views/Components/Input.html
deleted file mode 100644
index 762b6aa4f..000000000
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Input.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-	data-bind="textInput: value, attr: {'placeholder': placeholder}, enable: enable, css: className">
-<!-- ko if: labeled -->
-	&nbsp;
-	<span data-bind="attr: {'data-i18n': label}"></span>
-<!-- /ko -->
-<!-- ko if: trigger -->
-	<span data-bind="saveTrigger: trigger"></span>
-<!-- /ko -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/Select.html b/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
index ee7e90619..609c0708d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
+++ b/snappymail/v/0.0.0/app/templates/Views/Components/Select.html
@@ -1,7 +1,7 @@
-<div class="e-component e-select">
-	<select data-bind="options: options, value: value, enable: enable, optionsText: optionsText, optionsValue: optionsValue,
-		optionsCaption: optionsCaption, css: className, optionsAfterRender: defaultOptionsAfterRender"></select>
-	<!-- ko if: labeled -->
+<div class="e-component">
+	<select data-bind="options: options, value: value, optionsText: optionsText, optionsValue: optionsValue,
+		css: className, optionsAfterRender: defaultOptionsAfterRender"></select>
+	<!-- ko if: label -->
 	<span data-bind="attr: {'data-i18n': label}"></span>
 	<!-- /ko -->
 	<!-- ko if: trigger -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html b/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html
deleted file mode 100644
index 59e805444..000000000
--- a/snappymail/v/0.0.0/app/templates/Views/Components/TextArea.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<textarea rows="5" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-	data-bind="value: value, enable: enable, attr: { 'placeholder': placeholder, 'rows': rows, 'spellcheck': spellcheck ? 'true' : 'false' }, css: className"></textarea>
-<!-- ko if: trigger -->
-	<span data-bind="saveTrigger: trigger"></span>
-<!-- /ko -->
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 ccf974189..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
@@ -1,46 +1,45 @@
 <div class="descWrapper" data-bind="visible: '' !== loadingDesc, text: loadingDesc"></div>
 <div class="alert" data-bind="hidden: !submitError()" hidden="">
-	<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: submitError"></span>
-	<p data-bind="visible: '' !== submitErrorAddidional(), text: submitErrorAddidional"></p>
+	<p data-bind="visible: '' !== submitErrorAdditional()">
+		<span data-i18n="GLOBAL/SERVER_MESSAGE"></span>:
+		<!-- ko text: submitErrorAdditional --><!-- /ko -->
+	</p>
 </div>
-<form action="#/"
+<form action="#/"  spellcheck="false" method="POST"
 	data-bind="submit: submitForm, css: {'errorAnimated': formError, 'submitting': submitRequest()}">
 	<div class="controls" data-bind="css: {'error': emailError}">
 		<span class="fontastic">✉</span>
 		<input name="Email" required="" type="text" class="input-block-level" pattern="[^@\s]+(@[^\s]+)?" inputmode="email"
-			autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autofocus="" autocomplete="email" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: email, disable: submitRequest"
 			data-i18n="[placeholder]GLOBAL/EMAIL">
 	</div>
 	<div class="controls" data-bind="css: {'error': passwordError}">
 		<span class="fontastic">🔑</span>
 		<input name="Password" required="" type="password" class="input-block-level"
-			autocomplete="current-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			data-bind="textInput: password, disable: submitRequest"
 			data-i18n="[placeholder]GLOBAL/PASSWORD">
-		<button class="fontastic" data-bind="command: submitCommand, visible: '' !== password()" data-i18n="[title]LOGIN/BUTTON_SIGN_IN">❯</button>
 	</div>
 	<div id="plugin-Login-BottomControlGroup"></div>
-	<div class="controls" data-bind="hidden: hideSubmitButton">
-		<button class="btn btn-large btn-block buttonLogin"
-			data-bind="command: submitCommand"
-			data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
-	</div>
-	<div style="display: flex">
-		<div class="signMeLabel" data-bind="visible: signMeVisibility, component: {
-			name: 'CheckboxSimple',
-			params: {
-				label: 'LOGIN/LABEL_SIGN_ME',
-				value: signMe
-			}
-		}"></div>
+	<div class="controls" style="display: flex">
+		<div class="e-checkbox" tabindex="0" data-bind="toggle: signMe">
+			<i role="checkbox" class="fontastic" data-bind="text: signMe() ? '☑' : '☐'"></i>
+			<span data-i18n="LOGIN/LABEL_SIGN_ME"></span>
+		</div>
 		<div class="language-buttons">
-			<a href="#" tabindex="-1" class="language-button fontastic"
+			<a href="#" class="language-button fontastic"
 				data-bind="visible: allowLanguagesOnLogin, click: selectLanguage, css: { 'icon-spinner' : langRequest }"
 				data-i18n="[title]POPUPS_LANGUAGES/TITLE_LANGUAGES">
 				🌍
 			</a>
 		</div>
 	</div>
+	<div>
+		<button class="btn btn-large buttonLogin"
+			data-bind="command: submitCommand"
+			data-i18n="LOGIN/BUTTON_SIGN_IN"></button>
+	</div>
 </form>
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 e6259868d..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 @@
-<div class="b-folders g-ui-user-select-none" data-bind="css: {'single-root-inbox': foldersListWithSingleInboxRootFolder}">
-	<div class="b-toolbar btn-toolbar hide-mobile">
+<div class="b-folders g-ui-user-select-none">
+	<div class="b-toolbar btn-toolbar">
 		<a class="btn buttonCompose" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 			<i class="icon-paper-plane"></i>
 			<span class="buttonComposeText" data-i18n="FOLDER_LIST/BUTTON_NEW_MESSAGE"></span>
@@ -7,11 +7,11 @@
 		<a class="btn buttonContacts fontastic" data-bind="visible: allowContacts, click: contactsClick" data-i18n="[title]GLOBAL/CONTACTS">📇</a>
 	</div>
 	<div class="b-content">
-		<ul class="b-folders-system" data-bind="foreach: folderListSystem">
+		<ul class="b-folders-system" data-bind="foreach: systemFolders">
 			<li>
 				<a data-bind="dropmessages: $data,
 					css: { 'selected': selected, 'selectable': selectable, 'anim-action-class': actionBlink, 'is-flagged': isFlagged },
-					attr: { 'data-unread': printableUnreadCount }">
+					attr: { 'data-icon': icon, 'data-unread': unreadCount }">
 					<!-- ko text: localName --><!-- /ko -->
 					<!-- ko if: isInbox -->
 					<span class="flag-icon fontastic"></span>
@@ -20,21 +20,24 @@
 			</li>
 		</ul>
 		<hr>
-		<ul class="b-folders-user" data-bind="template: { name: 'MailFolderListItem', foreach: folderListVisible }"></ul>
+		<div class="search-input-wrp" data-bind="visible: foldersFilterVisible">
+			<input type="search" id="folderSearchInput" data-bind="textInput: foldersFilter" data-i18n="[placeholder]GLOBAL/SEARCH">
+			<a data-bind="click: clearFolderSearch, visible: foldersFilter">✕</a>
+		</div>
+		<div class="e-checkbox" tabindex="0" data-bind="toggle: filterUnseen">
+			<i role="checkbox" class="fontastic" data-bind="text: filterUnseen() ? '☑' : '☐'"></i>
+			<span data-i18n="SEARCH/UNSEEN"></span>
+		</div>
+		<ul class="b-folders-user" data-bind="css: {unreadOnly: filterUnseen}, template: { name: 'MailFolderListItem', foreach: folderListVisible }"></ul>
 		<div class="move-action-content-wrapper" data-bind="visible: moveAction"></div>
 	</div>
-	<div class="b-content show-on-panel-disabled" data-bind="click: leftPanelDisabled.toggle()"></div>
-	<div class="b-footer btn-toolbar hide-mobile">
+	<div class="b-footer btn-toolbar">
 		<div class="btn-group">
-			<a class="btn buttonResize" data-bind="click: leftPanelDisabled.toggle()">
-				<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
-			</a>
+			<a class="btn fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a>
 		</div>
 		<div class="btn-group hide-on-panel-disabled">
-			<a class="btn" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER">
-				<i data-bind="css: {'icon-folder-add': !foldersChanging(), 'icon-spinner': foldersChanging()}"></i>
-			</a>
-			<a class="btn fontastic" data-bind="click: configureFolders">⚙</a>
+			<a class="btn icon-folder-add" data-bind="click: createFolder" data-i18n="[title]POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></a>
+			<a class="btn fontastic" data-bind="click: configureFolders" data-i18n="[title]SETTINGS_LABELS/FOLDERS">⚙</a>
 		</div>
 	</div>
 </div>
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 3bf8984dd..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 @@
-<!-- ko if: visible -->
 <li>
 	<a data-bind="dropmessages: $data,
-	   css: { 'selected': selected() && !isSystemFolder(), 'system': isSystemFolder, 'selectable': canBeSelected, 'hidden' : hidden, 'unread-sub': hasSubscribedUnreadMessagesSubfolders, 'anim-action-class': actionBlink },
-	   attr: { 'data-unread': printableUnreadCount }">
+	   css: { 'selected': selected() && !isSystemFolder(), 'system': isSystemFolder, 'selectable': canBeSelected, 'unread-sub': hasUnreadInSub, 'anim-action-class': actionBlink },
+	   attr: { 'data-unread': unreadCount, href: href }">
 		<i data-bind="css: collapsedCss()"></i>
 		<!-- ko text: name --><!-- /ko -->
 	</a>
-	<!-- ko if: subFolders.length -->
-	<ul data-bind="template: { name: 'MailFolderListItem', foreach: subFolders }, css: { 'collapsed': collapsed() }"></ul>
+	<!-- ko if: hasVisibleSubfolders -->
+	<ul data-bind="template: { name: 'MailFolderListItem', foreach: visibleSubfolders }, css: { 'collapsed': collapsed() }"></ul>
 	<!-- /ko -->
 </li>
-<!-- /ko -->
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 7d35eb900..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,81 +1,100 @@
-<div class="btn-toolbar">
-	<!-- ko if: isMobile() -->
-	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
-	<a class="btn buttonCompose" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}, visible: mobileCheckedStateHide()" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
+<div class="btn-toolbar" data-bind="css: {'hasChecked':checkAll}">
+	<a class="btn btn-thin fontastic toggleLeft"></a>
+	<a class="btn buttonCompose onCheckedHide" data-bind="click: composeClick, css: {'btn-warning': composeInEdit, 'btn-success': !composeInEdit()}" data-i18n="[title]FOLDER_LIST/BUTTON_NEW_MESSAGE">
 		<i class="icon-paper-plane"></i>
 	</a>
-	<!-- /ko -->
-	<a class="btn" data-bind="click: reload, visible: mobileCheckedStateHide()" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
+	<a class="btn onCheckedHide" data-bind="click: reload" data-i18n="[title]MESSAGE_LIST/BUTTON_RELOAD">
 		<i class="icon-spinner not-animated"></i>
 	</a>
-	<!-- ko if: !newMoveToFolder -->
-	<div class="btn-group dropdown hide-mobile" data-bind="registerBootstrapDropdown: true, openDropdownTrigger: moveDropdownTrigger">
-		<a id="move-dropdown-id" href="#" tabindex="-1" class="btn dropdown-toggle buttonMove" data-bind="command: moveCommand" data-i18n="[title]GLOBAL/MOVE_TO">
-			<i class="icon-copy visible-on-ctrl-btn"></i>
-			<i class="fontastic hidden-on-ctrl-btn">📁</i>
-			<span class="caret"></span>
-		</a>
-		<ul class="dropdown-menu" role="menu" aria-labelledby="move-dropdown-id" role="menu" data-bind="foreach: folderMenuForMove">
-			<li role="presentation" data-bind="css: { 'disabled': disabled }, click: function (mdata, oEvent) { if (!disabled) $root.moveSelectedMessagesToFolder(id, oEvent && !!oEvent.ctrlKey); }">
-				<a href="#" tabindex="-1" data-bind="text: name"></a>
-			</li>
-		</ul>
-	</div>
-	<!-- /ko -->
-	<!-- ko if: newMoveToFolder -->
-	<div class="btn-group" data-bind="visible: mobileCheckedStateShow()">
-		<a id="move-dropdown-id" href="#" tabindex="-1" class="btn buttonMove" data-bind="command: moveNewCommand" data-i18n="[title]GLOBAL/MOVE_TO">
-			<i class="icon-copy visible-on-ctrl-btn"></i>
-			<i class="fontastic hidden-on-ctrl-btn">📁</i>
-		</a>
-	</div>
-	<!-- /ko -->
-	<div class="btn-group" data-bind="visible: mobileCheckedStateShow()">
-		<a class="btn fontastic" data-bind="visible: isArchiveVisible, command: archiveCommand" data-i18n="[title]GLOBAL/TO_ARCHIVE">🗄</a>
-		<a class="btn fontastic" data-bind="visible: isSpamVisible, command: spamCommand" data-i18n="[title]GLOBAL/SPAM">⚠</a>
-		<a class="btn" data-bind="visible: isUnSpamVisible, command: notSpamCommand" data-i18n="[title]GLOBAL/NOT_SPAM">
+	<a href="#" tabindex="-1" class="btn onCheckedShow" data-bind="command: moveCommand" data-i18n="[title]GLOBAL/MOVE_TO">
+		<i class="icon-copy visible-on-ctrl-btn"></i>
+		<i class="fontastic hidden-on-ctrl-btn">📁</i>
+	</a>
+	<div class="btn-group onCheckedShow">
+		<a class="btn fontastic" data-bind="visible: archiveAllowed, command: archiveCommand" data-i18n="[title]GLOBAL/TO_ARCHIVE">🗄</a>
+		<a class="btn fontastic" data-bind="visible: canMarkAsSpam, command: spamCommand" data-i18n="[title]GLOBAL/TO_SPAM">⚠</a>
+		<a class="btn" data-bind="visible: isSpamFolder, command: notSpamCommand" data-i18n="[title]GLOBAL/NOT_SPAM">
 			<i class="icon-check-mark-circle-two"></i>
 		</a>
 		<a class="btn fontastic" data-bind="command: deleteCommand" data-i18n="[title]GLOBAL/DELETE">🗑</a>
+<!--
+		<a class="btn fontastic" data-bind="command: undeleteCommand, hidden: hideDeleted" data-i18n="[title]GLOBAL/UNDELETE" style="transform:rotate(-180deg)">🗑</a>
+-->
 	</div>
-	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, openDropdownTrigger: moreDropdownTrigger">
+	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true">
 		<a id="more-list-dropdown-id" class="btn dropdown-toggle fontastic" href="#" tabindex="-1" data-i18n="[title]GLOBAL/MORE">☰</a>
-		<ul class="dropdown-menu" role="menu" aria-labelledby="more-list-dropdown-id">
-			<li role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
+		<menu class="dropdown-menu" role="menu" aria-labelledby="more-list-dropdown-id">
+			<li role="presentation" data-bind="click: listUnsetSeen, css: {'disabled': !messageList.hasCheckedOrSelected()}">
 				<a href="#" tabindex="-1" data-icon="" data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></a>
 			</li>
-			<li role="presentation" data-bind="click: listSetSeen, css: {'disabled': !hasCheckedOrSelectedLines()}">
+			<li role="presentation" data-bind="click: listSetSeen, css: {'disabled': !messageList.hasCheckedOrSelected()}">
 				<a href="#" tabindex="-1" data-icon="" data-i18n="MESSAGE_LIST/MENU_SET_SEEN"></a>
 			</li>
-			<li role="presentation" data-bind="click: listSetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
+			<li role="presentation" data-bind="click: listSetFlags, css: {'disabled': !messageList.hasCheckedOrSelected()}">
 				<a href="#" tabindex="-1" data-icon="★" data-i18n="MESSAGE_LIST/MENU_SET_FLAG"></a>
 			</li>
-			<li role="presentation" data-bind="click: listUnsetFlags, css: {'disabled': !hasCheckedOrSelectedLines()}">
+			<li role="presentation" data-bind="click: listUnsetFlags, css: {'disabled': !messageList.hasCheckedOrSelected()}">
 				<a href="#" tabindex="-1" data-icon="☆" data-i18n="MESSAGE_LIST/MENU_UNSET_FLAG"></a>
 			</li>
-			<li role="presentation" data-bind="click: listSetAllSeen, css: {'disabled': !hasMessages()}">
+			<li role="presentation" data-bind="click: listSetAllSeen, css: {'disabled': !messageList().length}">
 				<a href="#" tabindex="-1" data-icon="" data-i18n="MESSAGE_LIST/MENU_SET_ALL_SEEN"></a>
 			</li>
-			<li class="dividerbar" role="presentation" data-bind="command: multyForwardCommand">
+			<li class="dividerbar" role="presentation" data-bind="command: forwardCommand">
 				<a href="#" tabindex="-1" data-icon="↞" data-i18n="MESSAGE_LIST/BUTTON_MULTY_FORWARD"></a>
 			</li>
-			<li class="dividerbar" role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
+			<li role="presentation" data-bind="command: downloadAttachCommand, visible: downloadAsZipAllowed">
+				<a href="#" tabindex="-1" data-icon="📦" data-i18n="MESSAGE_LIST/DOWNLOAD_ALL_ATTACHMENTS"></a>
+			</li>
+			<li role="presentation" data-bind="command: downloadZipCommand, visible: downloadAsZipAllowed">
+				<a href="#" tabindex="-1" data-icon="💾" data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></a>
+			</li>
+			<li class="dividerbar" role="presentation" data-bind="command: moveCommand">
+				<a href="#" tabindex="-1" data-icon="📁" data-i18n="GLOBAL/MOVE_TO"></a>
+			</li>
+			<li class="presentation" role="presentation" data-bind="command: copyCommand">
+				<a href="#" tabindex="-1" data-icon="&#xE068;" data-i18n="GLOBAL/COPY_TO"></a>
+			</li>
+			<li role="presentation" data-bind="visible: archiveAllowed, command: archiveCommand">
+				<a href="#" tabindex="-1" data-icon="🗄" data-i18n="GLOBAL/TO_ARCHIVE">🗄</a>
+			</li>
+			<li role="presentation" data-bind="visible: canMarkAsSpam, command: spamCommand">
+				<a href="#" tabindex="-1" data-icon="⚠" data-i18n="GLOBAL/SPAM"></a>
+			</li>
+			<li role="presentation" data-bind="visible: isSpamFolder, command: notSpamCommand">
+				<a href="#" tabindex="-1" data-icon="" data-i18n="GLOBAL/NOT_SPAM"></a>
+			</li>
+			<li role="presentation" data-bind="command: deleteCommand">
+				<a href="#" tabindex="-1" data-icon="🗑" data-i18n="GLOBAL/DELETE"></a>
+			</li>
+			<li role="presentation" data-bind="command: undeleteCommand, hidden: hideDeleted">
+				<a href="#" tabindex="-1" data-icon="🗑" data-i18n="GLOBAL/UNDELETE" class="rotate"></a>
+			</li>
+			<li role="presentation" data-bind="visible: allowDangerousActions, command: deleteWithoutMoveCommand">
 				<a href="#" tabindex="-1" data-icon="🗑" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></a>
 			</li>
 			<li role="presentation" data-bind="visible: allowDangerousActions, click: clear">
 				<a href="#" tabindex="-1" data-icon="🔥" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER"></a>
 			</li>
-		</ul>
+		</menu>
 	</div>
-	<div class="btn-group dropdown sortFolder" data-bind="visible: sortSupported() && mobileCheckedStateHide(), registerBootstrapDropdown: true, openDropdownTrigger: sortDropdownTrigger">
+	<div class="btn-group dropdown onCheckedHide" data-bind="visible: !sortSupported()">
+		<div id="no-sort-list" class="btn fontastic" data-i18n="[title]MESSAGE_LIST/NO_SORT">✖⬇</div>
+	</div>
+	<div class="btn-group dropdown onCheckedHide" data-bind="visible: sortSupported(), registerBootstrapDropdown: true">
 		<a id="sort-list-dropdown-id" class="btn dropdown-toggle fontastic" href="#" tabindex="-1" data-i18n="[title]MESSAGE_LIST/SORT" data-bind="text: sortText">⬇</a>
-		<ul class="dropdown-menu" role="menu" aria-labelledby="sort-list-dropdown-id">
+		<menu class="dropdown-menu" role="menu" aria-labelledby="sort-list-dropdown-id">
 			<li role="presentation" data-sort="" data-bind="click: changeSort">
 				<a href="#" tabindex="-1" data-icon="📅⬇" data-i18n="MESSAGE_LIST/SORT_DATE_DESC"></a>
 			</li>
 			<li role="presentation" data-sort="DATE" data-bind="click: changeSort">
 				<a href="#" tabindex="-1" data-icon="📅⬆" data-i18n="MESSAGE_LIST/SORT_DATE_ASC"></a>
 			</li>
+			<li class="dividerbar" role="presentation" data-sort="FROM" data-bind="click: changeSort">
+				<a href="#" tabindex="-1" data-icon="@⬇" data-i18n="MESSAGE_LIST/SORT_FROM_ASC"></a>
+			</li>
+			<li role="presentation" data-sort="REVERSE FROM" data-bind="click: changeSort">
+				<a href="#" tabindex="-1" data-icon="@⬆" data-i18n="MESSAGE_LIST/SORT_FROM_DESC"></a>
+			</li>
 			<li class="dividerbar" role="presentation" data-sort="REVERSE SIZE" data-bind="click: changeSort">
 				<a href="#" tabindex="-1" data-icon="✉⬇" data-i18n="MESSAGE_LIST/SORT_SIZE_DESC"></a>
 			</li>
@@ -88,81 +107,85 @@
 			<li role="presentation" data-sort="REVERSE SUBJECT" data-bind="click: changeSort">
 				<a href="#" tabindex="-1" data-icon="𝐒⬆" data-i18n="MESSAGE_LIST/SORT_SUBJECT_DESC"></a>
 			</li>
-			<li class="dividerbar" role="presentation" data-sort="FROM" data-bind="click: changeSort">
-				<a href="#" tabindex="-1" data-icon="@⬇" data-i18n="MESSAGE_LIST/SORT_FROM_ASC"></a>
+			<li class="dividerbar" role="presentation" data-sort="REVERSE ARRIVAL" data-bind="click: changeSort">
+				<a href="#" tabindex="-1" data-icon="📨⬇" data-i18n="MESSAGE_LIST/SORT_ARRIVAL_DESC"></a>
 			</li>
-			<li role="presentation" data-sort="REVERSE FROM" data-bind="click: changeSort">
-				<a href="#" tabindex="-1" data-icon="@⬆" data-i18n="MESSAGE_LIST/SORT_FROM_DESC"></a>
+			<li role="presentation" data-sort="ARRIVAL" data-bind="click: changeSort">
+				<a href="#" tabindex="-1" data-icon="📨⬆" data-i18n="MESSAGE_LIST/SORT_ARRIVAL_ASC"></a>
 			</li>
-		</ul>
+		</menu>
 	</div>
 </div>
 
 <div class="messageList g-ui-user-select-none" data-bind="css: {'hideMessageListCheckbox': !useCheckboxesInList() }">
 	<div class="second-toolbar thm-message-list-top-toolbar">
 		<i class="checkboxCheckAll fontastic" data-bind="text: checkAll() ? (isIncompleteChecked() ? '▣' : '☑') : '☐'"></i>
-		<!-- ko if: allowSearch -->
 		<div class="search-input-wrp">
-			<input type="search" class="inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="textInput: inputProxyMessageListSearch, hasfocus: inputMessageListSearchFocus">
+			<input type="search" class="inputSearch" tabindex="-1" placeholder="Search" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="textInput: inputSearch, hasfocus: focusSearch">
 			<a class="closeSearch" data-bind="click: cancelSearch, visible: messageListSearchDesc()">×</a>
 		</div>
-		<a class="btn buttonMoreSearch" data-bind="visible: allowSearchAdv, click: advancedSearchClick">▼</a>
-		<!-- /ko -->
+		<a class="btn buttonMoreSearch" data-bind="click: advancedSearchClick">▼</a>
 	</div>
-	<div class="b-content" data-bind="initDom: dragOverBodyArea">
-		<div class="listThreadUidDesc" data-bind="visible: messageListThreadUid(), click: cancelThreadUid"
+	<div class="b-content">
+		<div class="listThreadUidDesc" data-bind="visible: messageList.threadUid(), click: cancelThreadUid"
 			data-icon="⬅" data-i18n="MESSAGE_LIST/BACK_TO_MESSAGE_LIST"></div>
 		<div class="listSearchDesc" data-bind="visible: messageListSearchDesc(), text: messageListSearchDesc"></div>
-		<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && !messageListError() && !popupVisibility(), 'dragOverEnter': dragOverEnter }, initDom: dragOverArea"
+		<div class="listDragOver" data-bind="css: {'viewAppendArea': dragOver() && !messageList.error() && !popupVisibility(), 'dragOverEnter': dragOverEnter }"
 			data-icon="⬇" data-i18n="MESSAGE_LIST/PUT_MESSAGE_HERE"></div>
 		<div class="listClear" data-bind="visible: clearListIsVisible()">
 			<a href="#" class="g-ui-link" data-i18n="MESSAGE_LIST/BUTTON_EMPTY_FOLDER" data-bind="click: clear"></a>
 		</div>
-		<div class="listError error" data-bind="visible: !dragOver() && messageListError(), text: messageListError"></div>
+		<div class="listError error" data-bind="visible: !dragOver() && messageList.error(), text: messageList.error"></div>
 		<div class="listEmptyMessage" data-bind="visible: listEmptyMessage(), text: listEmptyMessage()"></div>
 		<div class="listLoading" data-bind="visible: !dragOver() && !messageList().length &&
-			messageListIsLoading() && !messageListError()">
+			messageList.isLoading() && !messageList.error()">
 			<i class="icon-spinner"></i>
 			<span data-i18n="GLOBAL/LOADING"></span>
 		</div>
-		<div data-bind="dragmessages: getDragData">
-			<div class="messageListPlace" data-bind="foreach: messageList">
 
-				<div class="messageListItem" data-bind="css: lineAsCss()">
+		<!-- ko if: listGrouped -->
+		<div class="messageListPlace" data-bind="dragmessages: 1, i18nUpdate: groupedList, foreach: groupedList" draggable="true">
+			<div class="groupLabel" data-bind="text: label, click: $root.groupSearch" data-i18n="[title]GLOBAL/SEARCH"></div>
+			<!-- ko foreach: messages -->
+			<div class="messageListItem" data-bind="css: lineAsCss(), attr: {title: preview}">
+				<div class="messageCheckbox">
 					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-
+				</div><div>
 					<div class="flagParent fontastic"></div>
-
-					<div class="senderParent actionHandle" data-bind="attr: {'title': senderClearEmailsString}">
-						<!-- ko if: isAnswered --><i class="replyFlag fontastic">←</i><!-- /ko -->
-						<!-- ko if: isForwarded --><i class="forwardFlag fontastic">→</i><!-- /ko -->
-						<!-- ko text: senderEmailsString --><!-- /ko -->
-					</div>
-
-					<div class="attachmentParent actionHandle">
+					<div class="senderParent" data-bind="attr: {title: senderClearEmailsString}, text: senderEmailsString"></div>
+					<div class="subjectParent" data-bind="text: subject"></div>
+					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
+					<div class="attachmentParent">
 						<i data-bind="css: attachmentIconClass"></i>
 					</div>
-
-					<div class="subjectParent actionHandle">
-						<!-- ko if: isImportant --><b class="importantMark">!</b><!-- /ko -->
-						<!-- ko text: subject || $root.emptySubjectValue --><!-- /ko -->
-					</div>
-
-					<div class="sizeParent actionHandle" data-bind="text: friendlySize()"></div>
-
-					<div class="threads-len" data-bind="visible: 1 < threadsLen()">
-						<span>
-							<!-- ko text: threadsLen --><!-- /ko -->
-							›
-						</span>
-					</div>
-
-					<time class="actionHandle" data-moment-format="SHORT" data-moment-format-title="FULL" data-bind="moment: dateTimeStampInUTC"></time>
+					<div class="sizeParent" data-bind="text: friendlySize()"></div>
+					<time data-bind="attr:{'data-time-format':$root.timeFormat()}, time: dateTimestamp"></time>
+				</div>
+			</div>
+			<!-- /ko -->
+		</div>
+		<!-- /ko -->
+		<!-- ko ifnot: listGrouped -->
+		<div class="messageListPlace" data-bind="dragmessages: 1, foreach: messageList" draggable="true">
+			<div class="messageListItem" data-bind="css: lineAsCss(), attr:{title:preview}">
+				<div class="messageCheckbox">
+					<div class="checkboxMessage fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
+				</div><div data-bind="attr:{style:indent()}, css:{reply:indent()}">
+					<div class="flagParent fontastic"></div>
+					<div class="senderParent" data-bind="attr: {title: senderClearEmailsString}, text: senderEmailsString"></div>
+					<div class="subjectParent" data-bind="text: subject"></div>
+					<div class="threads-len" data-bind="visible: 1 < threadsLen(), text: threadsLenText(), attr: {'data-unseen': threadUnseenLen() || null}"></div>
+					<div class="attachmentParent">
+						<i data-bind="css: attachmentIconClass"></i>
+					</div>
+					<div class="sizeParent" data-bind="text: friendlySize()"></div>
+					<time data-time-format="AUTO" data-bind="time: dateTimestamp"></time>
 				</div>
-
 			</div>
 		</div>
-		<div id="messagesDragImage"><span class="text"></span>&nbsp;<i class="icon-mail"></i></div>
+		<!-- /ko -->
+
+		<div id="messagesDragImage"><span class="text"></span>&nbsp;<span class="fontastic">✉</span></div>
 	</div>
 	<div class="b-footer thm-message-list-bottom-toolbar">
 		<!-- ko if: userUsageProc() -->
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 fb751826a..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,196 +1,204 @@
-<div class="messageView">
-	<div class="toolbar top-toolbar g-ui-user-select-none">
-		<div class="messageButtons btn-toolbar">
-			<div class="btn-group" data-i18n="[title]GLOBAL/CLOSE">
-				<a class="btn buttonClose fontastic" data-bind="click: closeMessage">✖</a>
-			</div>
-			<div class="btn-group" data-bind="visible: isDraftFolder()" data-i18n="[title]MESSAGE/BUTTON_EDIT">
-				<a class="btn btn-success buttonEdit fontastic" data-bind="command: messageEditCommand">🖉</a>
-			</div>
-			<div class="btn-group">
-				<a class="btn fontastic" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled(), command: archiveCommand" data-i18n="[title]GLOBAL/TO_ARCHIVE">🗄</a>
-				<a class="btn fontastic" data-bind="visible: !isDraftFolder() && !isSentFolder() && !isSpamFolder() && !isSpamDisabled(), command: spamCommand" data-i18n="[title]GLOBAL/SPAM">⚠</a>
-				<a class="btn" data-bind="visible: !isDraftFolder() && !isSentFolder() && isSpamFolder() && !isSpamDisabled(), command: notSpamCommand" data-i18n="[title]GLOBAL/NOT_SPAM">
-					<i class="icon-check-mark-circle-two"></i>
-				</a>
-				<a class="btn fontastic" data-bind="command: deleteCommand" data-i18n="[title]GLOBAL/DELETE">🗑</a>
-			</div>
-			<div class="btn-group">
-				<a class="btn btn-thin buttonUp fontastic" data-bind="command: goUpCommand">❮</a>
-				<a class="btn btn-thin buttonDown fontastic" data-bind="command: goDownCommand">❯</a>
-			</div>
-		</div>
+<div class="top-toolbar g-ui-user-select-none btn-toolbar">
+	<div class="btn-group" data-i18n="[title]GLOBAL/CLOSE">
+		<a class="btn buttonClose fontastic" data-bind="click: closeMessage">✖</a>
 	</div>
-	<div class="b-content">
-		<div class="b-message-view-backdrop" data-bind="visible: moveAction">
-			<div class="backdrop-message" data-icon="📁" data-i18n="MESSAGE/MESSAGE_VIEW_MOVE_DESC"></div>
-		</div>
-		<div class="b-message-view-checked-helper" data-bind="visible: !message() && '' === messageError() && hasCheckedMessages()">
-			<span data-bind="text: printableCheckedMessageCount()"></span>
-			<i class="fontastic">✉</i>
-		</div>
+	<div class="btn-group" data-bind="visible: isDraftFolder()" data-i18n="[title]MESSAGE/BUTTON_EDIT">
+		<a class="btn btn-success buttonEdit fontastic" data-bind="command: editCommand">🖉</a>
+	</div>
+	<div class="btn-group">
+		<a class="btn fontastic" data-bind="visible: archiveAllowed, command: archiveCommand" data-i18n="[title]GLOBAL/TO_ARCHIVE">🗄</a>
+		<a class="btn fontastic" data-bind="visible: canMarkAsSpam , command: spamCommand" data-i18n="[title]GLOBAL/TO_SPAM">⚠</a>
+		<a class="btn" data-bind="visible: isSpamFolder, command: notSpamCommand" data-i18n="[title]GLOBAL/NOT_SPAM">
+			<i class="icon-check-mark-circle-two"></i>
+		</a>
+		<a class="btn fontastic" data-bind="visible: !canBeUndeleted(), command: deleteCommand" data-i18n="[title]GLOBAL/DELETE">🗑</a>
+		<a class="btn fontastic" data-bind="visible: canBeUndeleted, command: undeleteCommand" data-i18n="[title]GLOBAL/UNDELETE"><div class=btn-rotate>🗑</div></a>
+	</div>
+	<div class="btn-group">
+		<a class="btn btn-thin buttonUp fontastic" data-bind="command: goUpCommand">❮</a>
+		<a class="btn btn-thin buttonDown fontastic" data-bind="command: goDownCommand">❯</a>
+	</div>
+</div>
+<div class="messageView">
+	<div class="b-message-view-backdrop" data-bind="visible: moveAction">
+		<div class="backdrop-message" data-icon="📁" data-i18n="MESSAGE/MESSAGE_VIEW_MOVE_DESC"></div>
+	</div>
+	<div class="b-message-view-checked-helper" data-bind="visible: !message() && '' === messageError() && hasCheckedMessages(), text: printableCheckedMessageCount()"></div>
 
-		<div class="b-message-view-desc error" data-bind="visible: !message() && '' !== messageError() && !hasCheckedMessages(), text: messageError()">
-		</div>
+	<div class="b-message-view-desc error" data-bind="visible: !message() && '' !== messageError() && !hasCheckedMessages(), text: messageError()">
+	</div>
 
-		<div class="b-message-view-desc" data-i18n="MESSAGE/MESSAGE_VIEW_DESC" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
-		</div>
+	<div class="b-message-view-desc" data-i18n="MESSAGE/MESSAGE_VIEW_DESC" data-bind="visible: !message() && '' === messageError() && !hasCheckedMessages()">
+	</div>
 
-		<!-- ko if: message -->
-		<div class="b-message" data-bind="i18nUpdate: message">
-			<div class="message-fixed-button-toolbar">
-				<div class="btn-group" style="margin-right: -8px">
+	<div class="b-message" data-bind="visible: message, i18nUpdate: message, css: message()?.lineAsCss(0)">
+		<div class="message-fixed-button-toolbar">
+			<a class="btn btn-success buttonEdit fontastic hide-mobile" data-bind="visible: isDraftFolder(), command: editCommand">🖉</a>
+			<div class="btn-group" style="margin-right: -8px; display: inline;">
+				<span data-bind="visible: canBeRepliedOrForwarded">
 					<a class="btn btn-thin btn-transparent buttonReply fontastic"
-						data-bind="visible: 1 == lastReplyAction(), command: replyCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY">←</a>
+						data-bind="visible: 1 == msgDefaultAction(), command: replyCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY">←</a>
 					<a class="btn btn-thin btn-transparent buttonReplyAll fontastic"
-						data-bind="visible: 2 == lastReplyAction(), command: replyAllCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY_ALL">↞</a>
-					<a class="btn btn-thin btn-transparent buttonForward fontastic"
-						data-bind="visible: 3 == lastReplyAction(), command: forwardCommand" data-i18n="[title]MESSAGE/BUTTON_FORWARD">→</a>
-					<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
-						<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="more-view-dropdown-id" href="#" tabindex="-1">☰</a>
-						<ul class="dropdown-menu right-edge" role="menu" aria-labelledby="more-view-dropdown-id">
-							<div data-bind="visible: !isDraftFolder()">
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: replyCommand" data-icon="←" data-i18n="MESSAGE/BUTTON_REPLY"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: replyAllCommand" data-icon="↞" data-i18n="MESSAGE/BUTTON_REPLY_ALL"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: forwardCommand" data-icon="→" data-i18n="MESSAGE/BUTTON_FORWARD"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: editAsNewCommand" data-icon="🖉" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: forwardAsAttachmentCommand" data-icon="→" data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></a>
-								</li>
-							</div>
-							<div class="dividerbar">
-								<li role="presentation" data-bind="visible: !isDraftFolder() && !isArchiveFolder() && !isArchiveDisabled()">
-									<a href="#" tabindex="-1" data-bind="command: archiveCommand" data-icon="🗄" data-i18n="GLOBAL/TO_ARCHIVE"></a>
-								</li>
-								<li role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && !isSpamFolder() && !isSpamDisabled()">
-									<a href="#" tabindex="-1" data-bind="command: spamCommand" data-icon="⚠" data-i18n="GLOBAL/SPAM"></a>
-								</li>
-								<li role="presentation" data-bind="visible: !isDraftFolder() && !isSentFolder() && isSpamFolder() && !isSpamDisabled()">
-									<a href="#" tabindex="-1" data-bind="command: notSpamCommand">
-										<i class="icon-check-mark-circle-two"></i>
-										<span data-i18n="GLOBAL/NOT_SPAM"></span>
-									</a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: deleteCommand" data-icon="🗑" data-i18n="GLOBAL/DELETE"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="command: deleteWithoutMoveCommand" data-icon="🗑" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></a>
-								</li>
-								<li class="dividerbar" role="presentation" data-bind="visible: message().hasUnsubsribeLinks()">
-									<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: message().getFirstUnsubsribeLink() }" data-icon="✖" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></a>
-								</li>
-							</div>
-							<div data-bind="visible: allowMessageActions, with: message" class="dividerbar">
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="click: printMessage" data-icon="🖨" data-i18n="MESSAGE/MENU_PRINT"></a>
-								</li>
-								<li role="presentation">
-									<a href="#" tabindex="-1" data-bind="click: popupMessage">
-										<i class="icon-popup"></i>
-										<span data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></span>
-									</a>
-								</li>
-								<li role="presentation" data-bind="visible: html() && !isHtml()">
-									<a href="#" tabindex="-1" data-bind="click: viewHtml" data-icon="👁" data-i18n="MESSAGE/HTML_VIEW"></a>
-								</li>
-								<li role="presentation" data-bind="visible: plain() && isHtml()">
-									<a href="#" tabindex="-1" data-bind="click: viewPlain" data-icon="👁" data-i18n="MESSAGE/PLAIN_VIEW"></a>
-								</li>
-								<li class="dividerbar" role="presentation">
-									<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: viewLink() }">
-										<i class="icon-file-code"></i>
-										<span data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
-									</a>
-								</li>
-								<li role="presentation">
-									<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: downloadLink() }" data-icon="📥" data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></a>
-								</li>
-							</div>
-						</ul>
-					</div>
-				</div>
-
-				<div class="btn-group hide-mobile" data-bind="visible: isDraftFolder()" data-i18n="[title]MESSAGE/BUTTON_EDIT" style="margin-right: 5px">
-					<a class="btn btn-success buttonEdit fontastic" data-bind="command: messageEditCommand">🖉</a>
+						data-bind="visible: 2 == msgDefaultAction(), command: replyAllCommand" data-i18n="[title]MESSAGE/BUTTON_REPLY_ALL">↞</a>
+				</span>
+				<div class="btn-group" data-bind="registerBootstrapDropdown: true, initDom: actionsMenu" style="display: inline-block">
+					<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="more-view-dropdown-id" href="#" tabindex="-1">☰</a>
+					<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="more-view-dropdown-id">
+						<div data-bind="visible: !isDraftFolder()">
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: replyCommand" data-icon="←" data-i18n="MESSAGE/BUTTON_REPLY"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: replyAllCommand" data-icon="↞" data-i18n="MESSAGE/BUTTON_REPLY_ALL"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: forwardCommand" data-icon="→" data-i18n="MESSAGE/BUTTON_FORWARD"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: forwardAsAttachmentCommand" data-icon="⥅" data-i18n="MESSAGE/BUTTON_FORWARD_AS_ATTACHMENT"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: editAsNewCommand" data-icon="🖉" data-i18n="MESSAGE/BUTTON_EDIT_AS_NEW"></a>
+							</li>
+						</div>
+						<div class="dividerbar">
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="click: setUnseen" data-icon=" " data-i18n="MESSAGE_LIST/MENU_UNSET_SEEN"></a>
+							</li>
+							<li role="presentation" data-bind="visible: archiveAllowed">
+								<a href="#" tabindex="-1" data-bind="command: archiveCommand" data-icon="🗄" data-i18n="GLOBAL/TO_ARCHIVE"></a>
+							</li>
+							<li role="presentation" data-bind="visible: canMarkAsSpam">
+								<a href="#" tabindex="-1" data-bind="command: spamCommand" data-icon="⚠" data-i18n="GLOBAL/TO_SPAM"></a>
+							</li>
+							<li role="presentation" data-bind="visible: isSpamFolder">
+								<a href="#" tabindex="-1" data-bind="command: notSpamCommand">
+									<i class="icon-check-mark-circle-two"></i>
+									<span data-i18n="GLOBAL/NOT_SPAM"></span>
+								</a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: moveCommand" data-icon="📁" data-i18n="GLOBAL/MOVE_TO"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: copyCommand" data-icon="&#xE068;" data-i18n="GLOBAL/COPY_TO"></a>
+							</li>
+							<li role="presentation" data-bind="visible: !canBeUndeleted()">
+								<a href="#" tabindex="-1" data-bind="command: deleteCommand" data-icon="🗑" data-i18n="GLOBAL/DELETE"></a>
+							</li>
+							<li role="presentation" data-bind="visible: canBeUndeleted">
+								<a href="#" tabindex="-1" data-bind="command: undeleteCommand" data-icon="🗑" data-i18n="GLOBAL/UNDELETE" class="rotate"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="command: deleteWithoutMoveCommand" data-icon="🗑" data-i18n="MESSAGE_LIST/BUTTON_DELETE_WITHOUT_MOVE"></a>
+							</li>
+							<li class="dividerbar" role="presentation" data-bind="visible: firstUnsubsribeLink">
+								<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: firstUnsubsribeLink }" data-icon="✖" data-i18n="MESSAGE/BUTTON_UNSUBSCRIBE"></a>
+							</li>
+						</div>
+						<div data-bind="with: message" class="dividerbar">
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="click: printMessage" data-icon="🖨" data-i18n="MESSAGE/MENU_PRINT"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="click: $root.toggleFullScreen">
+									<i data-bind="css: { 'icon-arrows-out': !$root.fullScreenMode(), 'icon-arrows-in': $root.fullScreenMode }"></i>
+									<span data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_TOGGLE"></span>
+								</a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="click: popupMessage" data-icon="⧉" data-i18n="MESSAGE/BUTTON_IN_NEW_WINDOW"></a>
+							</li>
+							<li role="presentation" data-bind="visible: html() && !isHtml()">
+								<a href="#" tabindex="-1" data-bind="click: viewHtml" data-icon="👁" data-i18n="MESSAGE/HTML_VIEW"></a>
+							</li>
+							<li role="presentation" data-bind="visible: isHtml()">
+								<a href="#" tabindex="-1" data-bind="click: viewPlain" data-icon="👁" data-i18n="MESSAGE/PLAIN_VIEW"></a>
+							</li>
+							<li role="presentation">
+								<a href="#" tabindex="-1" data-bind="click: swapColors" data-icon="🎨" data-i18n="MESSAGE/SWAP_COLORS"></a>
+							</li>
+							<li class="dividerbar" role="presentation">
+								<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: viewRaw() }">
+									<i class="icon-file-code"></i>
+									<span data-i18n="MESSAGE/MENU_VIEW_ORIGINAL"></span>
+								</a>
+							</li>
+							<li role="presentation">
+								<a target="_blank" href="#" tabindex="-1" data-bind="attr: { href: downloadLink() }" data-icon="📥" data-i18n="MESSAGE/MENU_DOWNLOAD_ORIGINAL"></a>
+							</li>
+						</div>
+					</menu>
 				</div>
 			</div>
+		</div>
 
-			<div class="messageItemHeader" data-bind="css: {'emptySubject': '' === message().subject()}">
-				<div class="subjectParent">
-					<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: function() { showFullInfo(!showFullInfo()); }">ℹ</span>
-					<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {'flagOn': message().isFlagged(), 'flagOff': !message().isFlagged()}"></span>
-					<b style="color: red; margin-right: 5px" data-bind="visible: message().isImportant()">!</b>
-					<span class="subject" data-bind="hidden: !message().subject(), text: message().subject, title: message().subject, event: { 'dblclick': toggleFullScreen }"></span>
-					<span class="emptySubjectText" data-i18n="MESSAGE/EMPTY_SUBJECT_TEXT" data-bind="hidden: message().subject(), event: { 'dblclick': toggleFullScreen }"></span>
-					<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
-				</div>
-				<div data-bind="hidden: showFullInfo(), event: { 'dblclick': toggleFullScreen }">
-					<div class="informationShort">
-						<span class="from" data-bind="html: viewFromShort, title: message().fromToLine()"></span>
-						<i data-bind="visible: viewFromDkimVisibility, css: viewFromDkimStatusIconClass, title: viewFromDkimStatusTitle"></i>
-						<div data-bind="visible: 0 < message().dateTimeStampInUTC()">
-							(<time class="date" data-moment-format="FULL" data-bind="moment: message().dateTimeStampInUTC()"></time>)
-						</div>
-					</div>
+		<div class="messageItemHeader" data-bind="if: message, i18nUpdate: message">
+			<div class="subjectParent">
+				<span class="infoParent g-ui-user-select-none fontastic" data-bind="click: toggleFullInfo">ℹ</span>
+				<span class="flagParent g-ui-user-select-none flagOff fontastic" data-bind="text: message().isFlagged() ? '★' : '☆', css: {flagOn: message().isFlagged(), flagOff: !message().isFlagged()}"></span>
+				<span class="subject" data-bind="text: message().subject"></span>
+				<a href="#" class="close" data-bind="click: closeMessage" style="margin-top: -8px;">×</a>
+			</div>
+			<div class="informationShort">
+				<span class="from" data-bind="html: viewFromShort, attr:{ title: message().from }"></span>
+				<i class="fontastic" data-bind="text: dkimIcon, css: dkimIconClass, attr:{ title: dkimTitle }"></i>
+				<i class="fontastic" data-bind="text: dmarcIcon, css: dmarcIconClass, attr:{ title: dmarcTitle }"></i>
+				<i class="fontastic" data-bind="text: spfIcon, css: spfIconClass, attr:{ title: spfTitle }"></i>
+			</div>
+		</div>
+		<div id="messageItem">
+			<div class="messageItemHeader" data-bind="if: message, i18nUpdate: message">
+				<div data-bind="hidden: showFullInfo">
+					<time class="date" data-time-format="FULL" data-bind="visible: 0 < message().dateTimestamp(), time: message().dateTimestamp()"></time>
 					<div class="informationShortWrp">
-						<div class="informationShort" data-bind="visible: message().toToLine()">
+						<div class="informationShort" data-bind="visible: message().to.length">
 							<span data-i18n="GLOBAL/TO"></span>:
-							<span data-bind="text: message().toToLine()"></span>
+							<span data-bind="text: message().to"></span>
 						</div>
-						<div class="informationShort" data-bind="visible: message().ccToLine()">
+						<div class="informationShort" data-bind="visible: message().cc.length">
 							<span data-i18n="GLOBAL/CC"></span>:
-							<span data-bind="text: message().ccToLine()"></span>
+							<span data-bind="text: message().cc"></span>
 						</div>
 					</div>
-					<div class="informationShort" data-bind="visible: message().spamResult()">
+					<div class="informationShort" data-bind="visible: message().spamResult">
 						<span data-i18n="MESSAGE/SPAM_SCORE"></span>:
-						<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore(), title: message().spamStatus()"></meter>
+						<meter min="0" max="100" optimum="0" low="33" high="66" data-bind="value: message().spamScore, attr:{ title: message().spamStatus() }"></meter>
 					</div>
 				</div>
-				<div class="informationFull" data-bind="visible: showFullInfo(), with: message">
+				<div class="informationFull" data-bind="visible: showFullInfo, with: message">
 					<table>
-						<tr data-bind="visible: fromToLine()">
+						<tr data-bind="visible: from.length">
 							<td data-i18n="GLOBAL/FROM"></td>
-							<td><span data-bind="text: fromToLine(), title: fromToLine()"></span>
-								<i data-bind="visible: $parent.viewFromDkimVisibility, css: $parent.viewFromDkimStatusIconClass, title: $parent.viewFromDkimStatusTitle"></i>
-							</td>
+							<td data-bind="text: from"></td>
 						</tr>
-						<tr data-bind="visible: toToLine()">
+						<tr data-bind="visible: to.length">
 							<td data-i18n="GLOBAL/TO"></td>
-							<td data-bind="text: toToLine(), title: toToLine()"></td>
+							<td data-bind="text: to"></td>
 						</tr>
-						<tr data-bind="visible: ccToLine()">
+						<tr data-bind="visible: cc.length">
 							<td data-i18n="GLOBAL/CC"></td>
-							<td data-bind="text: ccToLine(), title: ccToLine()"></td>
+							<td data-bind="text: cc"></td>
 						</tr>
-						<tr data-bind="visible: bccToLine()">
+						<tr data-bind="visible: bcc.length">
 							<td data-i18n="GLOBAL/BCC"></td>
-							<td data-bind="text: bccToLine(), title: bccToLine()"></td>
+							<td data-bind="text: bcc"></td>
 						</tr>
-						<tr data-bind="visible: replyToToLine()">
+						<tr data-bind="visible: replyTo.length">
 							<td data-i18n="GLOBAL/REPLY_TO"></td>
-							<td data-bind="text: replyToToLine(), title: replyToToLine()"></td>
+							<td data-bind="text: replyTo"></td>
 						</tr>
-						<tr data-bind="visible: dateTimeStampInUTC">
+						<tr data-bind="visible: dateTimestamp">
 							<td data-i18n="MESSAGE/LABEL_DATE"></td>
 							<td>
-								<time data-moment-format="FULL" data-bind="moment: dateTimeStampInUTC()"></time>
+								<time data-time-format="FULL" data-bind="time: dateTimestamp"></time>
 								&nbsp;
-								(<time data-moment-format="FROMNOW" data-bind="moment: dateTimeStampInUTC()"></time>)
+								(<time data-time-format="FROMNOW" data-bind="time: dateTimestamp"></time>)
 							</td>
 						</tr>
-						<tr data-bind="visible: 0 < spamScore()">
-							<td data-i18n="MESSAGE/SPAM_SCORE"></td>
-							<td><span data-bind="text: spamScore(), title: spamStatus()"></span>%</td>
+						<tr data-bind="visible: spamResult">
+							<td data-i18n="GLOBAL/SPAM"></td>
+							<td data-bind="text: spamStatus()"></td>
 						</tr>
 						<tr data-bind="visible: friendlySize()">
 							<td data-i18n="POPUPS_FILTER/SELECT_FIELD_SIZE"></td>
@@ -198,59 +206,73 @@
 						</tr>
 					</table>
 				</div>
-				<div class="hasVirus" data-bind="visible: message().hasVirus()" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
-			</div>
-			<div id="messageItem" data-bind="css: message().lineAsCss()">
-				<div tabindex="0" data-bind="hasfocus: messageDomFocused">
-
-					<span class="buttonFull" data-bind="click: toggleFullScreen">
-						<i data-bind="css: { 'icon-arrows-out': !fullScreenMode(), 'icon-arrows-in': fullScreenMode }"></i>
-					</span>
-					<div class="loading" data-bind="visible: messageLoadingThrottle()">
-						<i class="icon-spinner"></i>
-						<span data-i18n="GLOBAL/LOADING"></span>
-					</div>
-
-					<div data-bind="visible: !messageLoadingThrottle()">
-						<div class="bodySubHeader">
-							<div class="showImages" data-bind="visible: message().hasImages(), click: showImages"
-								data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
-							<div class="readReceipt" data-bind="visible: !isDraftOrSentFolder() && '' !== message().readReceipt() && !message().isReadReceipt(), click: readReceipt"
-								data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
-							<div class="attachmentsPlace" data-bind="visible: message().hasAttachments(),
-								css: {'selection-mode' : showAttachmentControls, 'unselectedAttachmentsError': highlightUnselectedAttachments}">
-								<ul class="attachmentList" data-bind="foreach: message() ? message().attachments() : []">
-									<li class="attachmentItem" draggable="true"
-											data-bind="visible: !isLinked(), event: { 'dragstart': eventDragStart }, attr: { 'title': fileName }, css: {'checked': checked}">
-										<div class="attachmentIconParent" data-bind="css: { 'hasPreview': hasPreview(), 'hasPreplay': hasPreplay(), 'isImage': isImage() }">
-											<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
-											<div class="showPreview">
-												<a data-bind="css: {'attachmentImagePreview': isImage()}, attr: { 'title': fileName, 'href': linkPreviewMain() }" target="_blank">
-													<i class="iconMain" data-bind="css: iconClass()"></i>
-													<div class="iconBG" data-bind="attr: { 'style': linkThumbnailPreviewStyle() }"></div>
-													<div class="iconPreview fontastic">👁</div>
-												</a>
-											</div>
-											<div class="showPreplay">
-												<i class="iconMain" data-bind="css: iconClass()"></i>
-												<div class="iconPreview fontastic">▶</div>
-											</div>
-										</div>
-										<div class="attachmentNameParent">
-											<div style="white-space: nowrap; text-overflow: ellipsis; overflow: hidden;" class="attachmentName" data-bind="text: fileName"></div>
-											<div class="attachmentSize" data-bind="text: friendlySize"></div>
-										</div>
-										<div class="checkboxAttachment fontastic"
-												data-bind="visible: download, text: checked() ? '☑' : '☐',
-												click: function () { checked(!checked()); return false }"></div>
-									</li>
-								</ul>
-								<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls() && !showAttachmentControls(), click: function () { showAttachmentControls(true); showAttachmentControlsState(true); }">⚙</i>
+				<div class="hasVirus" data-bind="visible: message().hasVirus" data-i18n="MESSAGE/HAS_VIRUS_WARNING"></div>
+				<!-- ko if: tagsAllowed -->
+				<div class="messageTags">
+					<span data-i18n="MESSAGE/TAGS"></span>:
+					<span class="messageAssignedTags" data-bind="html: tagsToHTML"></span>
+					<div class="btn-group" data-bind="registerBootstrapDropdown: true" style="display: inline-block">
+						<a class="btn btn-thin btn-transparent dropdown-toggle fontastic" id="tags-dropdown-id" href="#" tabindex="-1">🏷</a>
+						<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="tags-dropdown-id">
+							<div data-bind="foreach: message().tagOptions()">
+								<li role="presentation">
+									<a href="#" tabindex="-1" data-icon="☐" data-bind="click: toggle, text: label, attr:{ title: value, class: css, 'data-icon': checked ? '☑' : '☐' }"></a>
+								</li>
 							</div>
+							<li role="presentation" class="dividerbar">
+								<a href="#" tabindex="-1" data-icon="✚" data-bind="click: newTag" data-i18n="MESSAGE/NEW_TAG"></a>
+							</li>
+						</menu>
+					</div>
+				</div>
+				<!-- /ko -->
+			</div>
+			<div tabindex="0" data-bind="hasfocus: messageDomFocused">
 
-							<div class="attachmentsControls"
-								data-bind="visible: showAttachmentControls() && message().hasAttachments()">
+				<div class="loading" data-bind="visible: messageLoadingThrottle">
+					<i class="icon-spinner"></i>
+					<span data-i18n="GLOBAL/LOADING"></span>
+				</div>
 
+				<div data-bind="hidden: messageLoadingThrottle">
+					<div class="bodySubHeader" data-bind="if: message, i18nUpdate: message">
+						<div class="readReceipt" data-bind="visible: askReadReceipt, click: readReceipt"
+							data-icon="✉" data-i18n="MESSAGE/BUTTON_NOTIFY_READ_RECEIPT"></div>
+						<details class="attachmentsPlace" data-bind="visible: hasAttachments, css: {'selection-mode' : showAttachmentControls}, attr: { open: hasAttachments }">
+							<summary data-i18n="MESSAGE/PRINT_LABEL_ATTACHMENTS"></summary>
+							<!-- ko ifnot: simpleAttachmentsList -->
+							<ul class="attachmentList" data-bind="foreach: listAttachments">
+								<li class="attachmentItem" draggable="true"
+										data-bind="event: { dragstart: eventDragStart }, attr: { title: fileName }, css: {checked: checked}">
+									<div class="attachmentIcon" data-bind="css: { hasPreview: hasPreview(), hasPreplay: hasPreplay(), isImage: isImage() }, attr: { style: thumbnailStyle() }">
+										<i class="hidePreview iconMain" data-bind="css: iconClass()"></i>
+										<div class="showPreview">
+											<a data-bind="css: {attachmentImagePreview: isImage()}, attr: { title: fileName, href: linkPreviewMain() }" target="_blank">
+												<i class="iconMain" data-bind="visible: !hasThumbnail(), css: iconClass()"></i>
+												<div class="iconPreview fontastic">👁</div>
+											</a>
+										</div>
+									</div>
+									<div class="attachmentNameParent">
+										<div class="attachmentName" data-bind="text: fileName"></div>
+										<div class="attachmentSize" data-bind="text: friendlySize()"></div>
+									</div>
+									<div class="checkboxAttachment fontastic"
+										data-bind="visible: download, text: checked() ? '☑' : '☐', click: toggleChecked"></div>
+								</li>
+							</ul>
+							<!-- /ko -->
+							<!-- ko if: simpleAttachmentsList -->
+							<ul class="attachmentListSimple" data-bind="foreach: listAttachments">
+								<li class="attachmentItem" data-bind="attr: { title: fileName }, css: {checked: checked}">
+									<span class="attachmentName" data-bind="text: fileName"></span>
+									<i class="checkboxAttachment fontastic"
+										data-bind="visible: download, text: checked() ? '☑' : '☐', click: toggleChecked"></i>
+								</li>
+							</ul>
+							<!-- /ko -->
+							<i class="fontastic controls-handle" data-bind="visible: allowAttachmentControls, click: toggleAttachmentControls">⚙</i>
+							<div class="attachmentsControls" data-bind="visible: showAttachmentControls">
 								<span data-bind="visible: downloadAsZipAllowed">
 									<i class="fontastic iconcolor-red" data-bind="visible: downloadAsZipError">✖</i>
 									<i class="icon-file-archive" data-bind="visible: !downloadAsZipError(),
@@ -258,26 +280,61 @@
 									<span class="g-ui-link" data-bind="click: downloadAsZip"
 										data-i18n="MESSAGE/LINK_DOWNLOAD_AS_ZIP"></span>
 								</span>
+							</div>
+						</details>
 
-								<a href="#" class="close" style="margin-right: 5px;"
-									data-bind="click: function () { showAttachmentControls(false); showAttachmentControlsState(false); }">×</a>
+						<div class="btn-toolbar showImages" data-bind="visible: message().hasImages()">
+							<div class="btn" data-bind="click: showImages" data-icon="🖼" data-i18n="MESSAGE/BUTTON_SHOW_IMAGES"></div>
+							<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, visible: showWhitelistOptions" style="display: inline-block">
+								<a class="btn dropdown-toggle" id="whitelist-dropdown-id" data-icon="🖼" href="#" tabindex="-1"><span data-i18n="SETTINGS_GENERAL/IMAGES_WHITELIST"></span> ▼</a>
+								<menu class="dropdown-menu" role="menu" aria-labelledby="whitelist-dropdown-id">
+									<!-- ko foreach: message().whitelistOptions() -->
+									<li role="presentation">
+										<a href="#" tabindex="-1" data-bind="click: $root.whitelistText, text: $data"></a>
+									</li>
+									<!-- /ko -->
+								</menu>
 							</div>
 						</div>
 
-						<div class="openpgp-control encrypted" data-bind="visible: message().pgpEncrypted(), css: {'success': message().pgpDecrypted()}">
-							<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
-							<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="OPENPGP/BUTTON_DECRYPT"></button>
-						</div>
-						<div class="openpgp-control signed" data-bind="visible: message().pgpSigned(), css: {'success': message().pgpVerified() && message().pgpVerified().success, 'error': message().pgpVerified() && !message().pgpVerified().success}">
-							<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
-							<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="OPENPGP/BUTTON_VERIFY"></button>
+						<div class="btn-toolbar" data-bind="visible: message().hasTracking()">
+							<div class="btn" data-bind="visible: !nowTracking(), click: showTracking" data-icon="🔗" data-i18n="MESSAGE/ENABLE_TRACKING_LINKS"></div>
+							<div class="alert" data-bind="visible: nowTracking" data-i18n="MESSAGE/TRACKING_ENABLED" style="margin:0"></div>
 						</div>
 
-						<div class="bodyText" data-bind="initDom: messagesBodiesDom"></div>
+						<div data-bind="visible: message().pgpEncrypted()">
+							<div class="crypto-control encrypted" data-bind="css: {success: message().pgpDecrypted()}">
+								<span data-icon="🔒" data-i18n="OPENPGP/ENCRYPTED_MESSAGE"></span>
+								<button class="btn" data-bind="visible: pgpSupported, click: pgpDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
+								<div class="alert-error" data-icon="⚠" data-bind="visible: message().pgpEncrypted()?.error, text: message().pgpEncrypted()?.error"></div>
+							</div>
+						</div>
+						<div data-bind="visible: message().pgpSigned()">
+							<div class="crypto-control signed" data-bind="css: {success: true === message().pgpSigned()?.success, error: false === message().pgpSigned()?.success}">
+								<span data-icon="✍" data-i18n="OPENPGP/SIGNED_MESSAGE"></span>
+								<button class="btn" data-bind="visible: pgpSupported, click: pgpVerify" data-i18n="CRYPTO/VERIFY"></button>
+								<div data-icon="⚠" data-bind="visible: message().pgpSigned()?.error, text: message().pgpSigned()?.error"></div>
+							</div>
+						</div>
+
+						<div data-bind="visible: message().smimeEncrypted()">
+							<div class="crypto-control encrypted" data-bind="css: {success: message().smimeDecrypted()}">
+								<span data-icon="🔒" data-i18n="SMIME/ENCRYPTED_MESSAGE"></span>
+								<button class="btn" data-bind="click: smimeDecrypt" data-i18n="CRYPTO/DECRYPT"></button>
+								<div class="alert-error" data-icon="⚠" data-bind="visible: message().smimeEncrypted()?.error, text: message().smimeEncrypted()?.error"></div>
+							</div>
+						</div>
+						<div data-bind="visible: message().smimeSigned()">
+							<div class="crypto-control signed" data-bind="css: {success: true === message().smimeSigned()?.success, error: false === message().smimeSigned()?.success}">
+								<span data-icon="✍" data-i18n="SMIME/SIGNED_MESSAGE"></span>
+								<button class="btn" data-bind="click: smimeVerify" data-i18n="CRYPTO/VERIFY"></button>
+							</div>
+						</div>
 					</div>
+
+					<div class="bodyText" dir="auto"></div>
 				</div>
 			</div>
 		</div>
-		<!-- /ko -->
 	</div>
 </div>
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 00edf9e5c..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
@@ -1,27 +1,29 @@
 <header>
 	<a href="#" class="close" data-bind="click: close">×</a>
-	<h3>
-		<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></span>
-		<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></span>
-	</h3>
+	<h3 data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_ADD_ACCOUNT"></h3>
+	<h3 data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/TITLE_UPDATE_ACCOUNT"></h3>
 </header>
-<form id="accountform" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
+<form id="accountform" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
 	<div class="alert" data-bind="visible: '' !== submitError()">
-		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<a href="#" class="close" data-bind="click: hideError">×</a>
 		<span data-bind="text: submitError"></span>
 		<div data-bind="visible: submitErrorAdditional, text: submitErrorAdditional"></div>
 	</div>
-	<div class="control-group" data-bind="css: {'error': emailError}">
+	<div class="control-group">
 		<label data-i18n="GLOBAL/EMAIL"></label>
 		<strong style="margin-top: 5px;" data-bind="visible: !isNew(), text: email"></strong>
-		<input type="email" class="input-xlarge"
-			autofocus="" autocorrect="off" autocapitalize="off" spellcheck="false"
-			data-bind="visible: isNew, textInput: email">
+		<input name="email" type="text" class="input-xlarge"
+			autofocus="" autocorrect="off" autocapitalize="off"
+			data-bind="visible: isNew, textInput: email, attr: {required: isNew}">
 	</div>
-	<div class="control-group" data-bind="css: {'error': passwordError}">
+	<div class="control-group">
 		<label data-i18n="GLOBAL/PASSWORD"></label>
-		<input type="password" class="input-xlarge" autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
-			required="" data-bind="value: password">
+		<input name="password" type="password" class="input-xlarge" autocomplete="new-password" autocorrect="off" autocapitalize="off"
+			data-bind="value: password, attr: {required:isNew}">
+	</div>
+	<div class="control-group">
+		<label data-i18n="GLOBAL/NAME"></label>
+		<input name="name" type="text" class="input-xlarge" data-bind="value: name">
 	</div>
 </form>
 <footer>
@@ -29,6 +31,6 @@
 		<i data-bind="visible: isNew, css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 		<span data-bind="visible: isNew" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_ADD_ACCOUNT"></span>
 		<i data-bind="visible: !isNew(), css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-		<span data-bind="visible: !isNew()" data-i18n="POPUPS_ADD_ACCOUNT/BUTTON_UPDATE_ACCOUNT"></span>
+		<span data-bind="visible: !isNew()" data-i18n="GLOBAL/SAVE"></span>
 	</button>
 </footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
index 4a8dd039e..c372c3a5d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsAdvancedSearch.html
@@ -2,82 +2,106 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="SEARCH/TITLE_ADV"></h3>
 </header>
-<form id="advancedsearchform" class="modal-body form-horizontal" action="#/" autocomplete="off" data-bind="submit: submitForm">
-	<div class="row">
-		<div class="span4">
-			<div class="control-group">
-				<label data-i18n="GLOBAL/FROM"></label>
-				<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: from">
-			</div>
-			<div class="control-group">
-				<label data-i18n="GLOBAL/TO"></label>
-				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: to">
-			</div>
-			<div class="control-group">
-				<label data-i18n="GLOBAL/SUBJECT"></label>
-				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: subject">
-			</div>
-			<div class="control-group">
-				<label data-i18n="SEARCH/LABEL_ADV_TEXT"></label>
-				<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="value: text">
-			</div>
+<form id="advancedsearchform" class="modal-body form-horizontal" action="#/" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
+	<div>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/FROM"></label>
+			<input type="text" autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
+				data-bind="value: from">
 		</div>
-		<div class="span4">
-			<div class="control-group">
-				<label data-i18n="SEARCH/LABEL_ADV_DATE"></label>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/TO"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
+				data-bind="value: to">
+		</div>
+		<div class="control-group">
+			<label data-i18n="GLOBAL/SUBJECT"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
+				data-bind="value: subject">
+		</div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/TEXT"></label>
+			<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
+				data-bind="value: text">
+		</div>
+		<!-- ko if: showKeywords -->
+		<div class="control-group">
+			<label data-i18n="SEARCH/KEYWORD"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: keywords,
+					value: keyword,
+					optionsText: 'label',
+					optionsValue: 'value'
+				}
+			}"></div>
+		</div>
+		<!-- /ko -->
+	</div>
+	<div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/DATE"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: selectedDates,
+					value: selectedDateValue,
+					optionsText: 'name',
+					optionsValue: 'id'
+				}
+			}"></div>
+		</div>
+		<div class="control-group">
+			<label data-i18n="SEARCH/REPLIED"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: repliedOptions,
+					value: repliedValue,
+					optionsText: 'name',
+					optionsValue: 'id'
+				}
+			}"></div>
+		</div>
+		<!-- ko if: showMultisearch -->
+		<div class="control-group">
+			<label data-i18n="SEARCH/SUBFOLDERS"></label>
+			<div data-bind="component: {
+				name: 'Select',
+				params: {
+					options: selectedTree,
+					value: selectedTreeValue,
+					optionsText: 'name',
+					optionsValue: 'id'
+				}
+			}"></div>
+		</div>
+		<!-- /ko -->
+		<div class="control-group">
+			<label></label>
+			<div>
 				<div data-bind="component: {
-					name: 'Select',
+					name: 'Checkbox',
 					params: {
-						options: selectedDates,
-						value: selectedDateValue,
-						optionsText: 'name',
-						optionsValue: 'id'
+						label: 'SEARCH/UNSEEN',
+						value: unseen
 					}
 				}"></div>
-			</div>
-			<!-- ko if: showMultisearch -->
-			<div class="control-group">
-				<label data-i18n="SEARCH/LABEL_ADV_SUBFOLDERS"></label>
 				<div data-bind="component: {
-					name: 'Select',
+					name: 'Checkbox',
 					params: {
-						options: selectedTree,
-						value: selectedTreeValue,
-						optionsText: 'name',
-						optionsValue: 'id'
+						label: 'SEARCH/FLAGGED',
+						value: starred
+					}
+				}"></div>
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'SEARCH/HAS_ATTACHMENT',
+						value: hasAttachment
 					}
 				}"></div>
-			</div>
-			<!-- /ko -->
-			<div class="control-group">
-				<label></label>
-				<div>
-					<div data-bind="component: {
-						name: 'Checkbox',
-						params: {
-							label: 'SEARCH/LABEL_ADV_UNSEEN',
-							value: unseen
-						}
-					}"></div>
-					<div data-bind="component: {
-						name: 'Checkbox',
-						params: {
-							label: 'SEARCH/LABEL_ADV_FLAGGED',
-							value: starred
-						}
-					}"></div>
-					<div data-bind="component: {
-						name: 'Checkbox',
-						params: {
-							label: 'SEARCH/LABEL_ADV_HAS_ATTACHMENT',
-							value: hasAttachment
-						}
-					}"></div>
-				</div>
 			</div>
 		</div>
 	</div>
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 9f17dd1c5..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 @@
-<header class="g-ui-user-select-none" data-bind="css: {'loading': saving() || sending()}">
+<header class="g-ui-user-select-none" data-bind="css: {loading: saving() || sending()}">
 	<a class="btn" data-bind="command: sendCommand, tooltipErrorTip: sendErrorDesc, css: {'btn-success': sendButtonSuccess, 'btn-danger': sendError, 'btn-warning': sendSuccessButSaveError }">
 		<i data-bind="css: {'icon-paper-plane': !sending(), 'icon-spinner': sending()}"></i>
 		<span class="hide-mobile" data-i18n="COMPOSE/BUTTON_SEND"></span>
@@ -12,52 +12,70 @@
 	<span class="saved-text hide-mobile" data-bind="text: savedTimeText"></span>
 
 	<div class="pull-right">
-		<a class="btn hide-mobile" data-i18n="GLOBAL/BCC" data-bind="visible: !showBcc(), click: function () { showBcc(true); }"></a>
-		<a class="btn hide-mobile" data-i18n="GLOBAL/CC" data-bind="visible: !showCc(), click: function () { showCc(true); }"></a>
+		<a class="btn hide-mobile" data-i18n="GLOBAL/BCC" data-bind="visible: !showBcc(), toggle: showBcc"></a>
+		<a class="btn hide-mobile" data-i18n="GLOBAL/CC" data-bind="visible: !showCc(), toggle: showCc"></a>
 		<a class="btn fontastic" data-bind="visible: allowContacts, command: contactsCommand" data-i18n="[title]GLOBAL/CONTACTS">📇</a>
 		<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true" style="display:inline-block;vertical-align:top">
 			<a class="btn dropdown-toggle fontastic">☰</a>
-			<ul class="dropdown-menu right-edge" role="menu">
-				<li data-bind="click: function () { showBcc(!showBcc()); }">
+			<menu class="dropdown-menu right-edge" role="menu">
+				<li data-bind="toggle: showBcc">
 					<a>
 						<i class="fontastic" data-bind="text: showBcc() ? '☑' : '☐'"></i>
 						<span data-i18n="GLOBAL/BCC"></span>
 					</a>
 				</li>
-				<li data-bind="click: function () { showCc(!showCc()); }">
+				<li data-bind="toggle: showCc">
 					<a>
 						<i class="fontastic" data-bind="text: showCc() ? '☑' : '☐'"></i>
 						<span data-i18n="GLOBAL/CC"></span>
 					</a>
 				</li>
-				<li data-bind="click: function () { showReplyTo(!showReplyTo()); }">
+				<li data-bind="toggle: showReplyTo">
 					<a>
 						<i class="fontastic" data-bind="text: showReplyTo() ? '☑' : '☐'"></i>
 						<span data-i18n="GLOBAL/REPLY_TO"></span>
 					</a>
 				</li>
-				<li data-bind="click: function () { requestReadReceipt(!requestReadReceipt()); }">
+				<li data-bind="toggle: requestReadReceipt">
 					<a>
 						<i class="fontastic" data-bind="text: requestReadReceipt() ? '☑' : '☐'"></i>
 						<span data-i18n="COMPOSE/BUTTON_REQUEST_READ_RECEIPT"></span>
 					</a>
 				</li>
-				<li data-bind="click: function () { requestDsn(!requestDsn()); }">
+				<li data-bind="toggle: requestDsn">
 					<a>
 						<i class="fontastic" data-bind="text: requestDsn() ? '☑' : '☐'"></i>
 						<span data-i18n="COMPOSE/BUTTON_REQUEST_DSN"></span>
 					</a>
 				</li>
-				<li data-bind="click: function () { markAsImportant(!markAsImportant()); }">
+				<li data-bind="toggle: requireTLS">
+					<a>
+						<i class="fontastic" data-bind="text: requireTLS() ? '☑' : '☐'"></i>
+						<span data-i18n="COMPOSE/BUTTON_REQUIRE_TLS"></span>
+					</a>
+				</li>
+				<li data-bind="toggle: markAsImportant">
 					<a>
 						<i class="fontastic" data-bind="text: markAsImportant() ? '☑' : '☐'"></i>
 						<span data-i18n="COMPOSE/BUTTON_MARK_AS_IMPORTANT"></span>
 					</a>
 				</li>
-			</ul>
+				<li data-bind="toggle: doSign, visible: canSign">
+					<a data-bind="attr:{title: signOptionsText}">
+						<i class="fontastic" data-bind="text: doSign() ? '☑' : '☐'"></i>
+						<span data-icon="✍" data-i18n="CRYPTO/SIGN"></span>
+					</a>
+				</li>
+				<li data-bind="toggle: doEncrypt, visible: canEncrypt">
+					<a data-bind="attr:{title: encryptOptionsText}">
+						<i class="fontastic" data-bind="text: doEncrypt() || 'mailvelope' == viewArea() ? '☑' : '☐'"></i>
+						<span data-icon="🔒" data-i18n="CRYPTO/ENCRYPT"></span>
+					</a>
+				</li>
+			</menu>
 		</div>
 		<a class="minimize-custom" data-bind="click: skipCommand" data-i18n="[title]COMPOSE/BUTTON_MINIMIZE"></a>
-		<a class="close" data-bind="click: tryToClosePopup" data-i18n="[title]GLOBAL/CANCEL">×</a>
+		<a class="close" data-bind="click: doClose" data-i18n="[title]GLOBAL/CANCEL">×</a>
 	</div>
 </header>
 <div class="modal-body">
@@ -66,15 +84,18 @@
 			<tr>
 				<td data-i18n="GLOBAL/FROM"></td>
 				<td>
-					<input type="text" data-bind="textInput: from" style="width:calc(100% - 20px)">
+					<!-- ko if: allowIdentities -->
+					<input type="text" data-bind="textInput: from" style="width:calc(100% - 2em)">
+					<!-- /ko -->
+					<span class="e-identity" data-bind="hidden: allowIdentities, text: from"></span>
 					<!-- ko if: 1 < identitiesOptions().length -->
-					<div class="dropdown" style="display:inline-block" data-bind="registerBootstrapDropdown: true, openDropdownTrigger: identitiesDropdownTrigger">
+					<div class="dropdown" style="display:inline-block" data-bind="registerBootstrapDropdown: true, initDom: identitiesMenu">
 						<a class="dropdown-toggle" href="#" tabindex="-1" id="identity-toggle" role="button"></a>
-						<ul class="dropdown-menu right-edge" role="menu" aria-labelledby="identity-toggle" data-bind="foreach: identitiesOptions">
+						<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="identity-toggle" data-bind="foreach: identitiesOptions">
 							<li role="presentation">
 								<a tabindex="-1" href="#" data-bind="click: function (oIdentity) { $root.selectIdentity(oIdentity); return true; }, text: optText"></a>
 							</li>
-						</ul>
+						</menu>
 					</div>
 					<!-- /ko -->
 				</td>
@@ -89,58 +110,41 @@
 				</td>
 			</tr>
 			<tr class="cc-row" data-bind="visible: showCc">
-				<td data-i18n="GLOBAL/CC"></div>
+				<td data-i18n="GLOBAL/CC"></td>
 				<td>
 					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: cc, autoCompleteSource: emailsSource">
 				</td>
 			</tr>
 			<tr class="bcc-row" data-bind="visible: showBcc">
-				<td data-i18n="GLOBAL/BCC"></div>
+				<td data-i18n="GLOBAL/BCC"></td>
 				<td>
 					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: bcc, autoCompleteSource: emailsSource">
 				</td>
 			</tr>
 			<tr class="reply-to-row" data-bind="visible: showReplyTo">
-				<td data-i18n="GLOBAL/REPLY_TO"></div>
+				<td data-i18n="GLOBAL/REPLY_TO"></td>
 				<td>
-					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: replyTo, autoCompleteSource: emailsSource">
+					<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" data-bind="emailsTags: replyTo">
 				</td>
 			</tr>
 			<tr>
-				<td data-i18n="GLOBAL/SUBJECT"></div>
+				<td data-i18n="GLOBAL/SUBJECT"></td>
 				<td>
-					<input type="text" size="70" autocomplete="off" data-bind="textInput: subject">
+					<input type="text" name="subject" autocomplete="off" data-bind="textInput: subject, attr:{spellcheck:allowSpellcheck()?'true':'false'}">
 				</td>
 			</tr>
 		</table>
 		<div style="display:flex">
-			<div class="btn-group" style="flex-grow:1" id="area-toggle">
-				<button type="button" class="btn" data-bind="click: bodyArea,
-					css: { 'active': 'body' == viewArea() }">
-					<i class="icon-file-text"></i>
-				</button>
-				<button type="button" class="btn" data-bind="click: attachmentsArea,
-					css: { 'btn-danger': attachmentsInErrorCount(), 'active': 'attachments' == viewArea() },
-					tooltipErrorTip: attachmentsErrorTooltip">
-					<span data-bind="visible: attachmentsCount()">
-						<b data-bind="text: attachmentsCount"></b>
-						&nbsp;&nbsp;
-					</span>
-					<i data-bind="css: { 'icon-attachment': !attachmentsInProcessCount(), 'icon-spinner': attachmentsInProcessCount()}"></i>
-				</button>
-				<button type="button" class="btn" data-bind="visible: canMailvelope, click: mailvelopeArea, css: { 'active': 'mailvelope' == viewArea() }">
-					<i class="mailvelope-icon"></i>
-				</button>
+			<div class="btn-group" style="flex-grow:1"></div>
+			<div class="btn-group">
+				<a class="btn fontastic" data-bind="toggle: doSign, visible: canSign, css: {'btn-success': doSign()}" data-i18n="[title]CRYPTO/SIGN">
+					✍
+				</a>
+				<a class="btn fontastic" data-bind="toggle: doEncrypt, visible: canEncrypt, css: {'btn-success': doEncrypt() || 'mailvelope' == viewArea()}" data-i18n="[title]CRYPTO/ENCRYPT">
+					🔒
+				</a>
 			</div>
 			<div class="btn-group">
-				<a class="btn" data-bind="click: togglePgpSign, visible: canPgpSign, css: {'btn-success': pgpSign()}">
-					<i class="fontastic" data-bind="text: pgpSign() ? '☑' : '☐'"></i>
-					<span data-i18n="OPENPGP/LABEL_SIGN"></span>
-				</a>
-				<a class="btn" data-bind="click: togglePgpEncrypt, visible: canPgpEncrypt, css: {'btn-success': pgpEncrypt() || 'mailvelope' == viewArea()}">
-					<i class="fontastic" data-bind="text: pgpEncrypt() || 'mailvelope' == viewArea() ? '☑' : '☐'"></i>
-					<span data-i18n="OPENPGP/LABEL_ENCRYPT"></span>
-				</a>
 				<a class="btn fontastic" style="padding-left: 10px; padding-right: 10px;" id="composeUploadButton"
 					data-bind="visible: addAttachmentEnabled()" data-i18n="[title]COMPOSE/ATTACH_FILES">
 					⁺📎
@@ -149,28 +153,64 @@
 		</div>
 	</div>
 
-	<div class="attachmentAreaParent" data-bind="visible: 'attachments' == viewArea()">
-		<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropVisible(), css: {'dragAndDropOver': dragAndDropOver}"
-			data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
-		<ul class="attachmentList" data-bind="foreach: attachments">
-			<li class="attachmentItem" data-bind="attr: { 'title': title }, css: { 'waiting': waiting, 'error': '' !== error() }">
-				<div class="attachmentIconParent">
-					<i class="iconMain" data-bind="css: iconClass(), visible: !uploading() || 0 === progress()"></i>
-					<div class="iconProgress" data-bind="attr: { 'style': progressStyle }, visible: uploading"></div>
-					<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
-				</div>
-				<div class="attachmentNameParent">
-					<a href="#" class="close pull-right" style="margin-top:-4px;" data-bind="click: cancel">×</a>
-					<div class="attachmentName" data-bind="text: fileName"></div>
-					<span class="attachmentSize" data-bind="text: friendlySize"></span>
-				</div>
-			</li>
-		</ul>
-		<div class="no-attachments-desc" data-bind="visible: 0 === attachments().length"
-			data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></div>
+	<div class="tabs">
+		<input type="radio" name="tabs" value="body" id="tab-body" data-bind="checked: viewArea">
+		<label for="tab-body"
+			role="tab"
+			aria-selected="true"
+			aria-controls="panel1"
+			tabindex="0">
+			<i class="icon-file-text"></i>
+			<span data-i18n="GLOBAL/TEXT"></span>
+		</label>
+		<div class="tab-content" role="tabpanel" aria-hidden="false" style="grid-column-end:4">
+			<div class="textAreaParent" data-bind="initDom: editorArea, attr:{spellcheck:allowSpellcheck()?'true':'false'}"></div>
+		</div>
+
+		<input type="radio" name="tabs" value="attachments" id="tab-attachments" data-bind="checked: viewArea">
+		<label for="tab-attachments"
+			role="tab"
+			aria-selected="false"
+			aria-controls="panel2"
+			tabindex="0"
+			data-bind="
+				css: { 'btn-danger': attachmentsInErrorCount() },
+				tooltipErrorTip: attachmentsErrorTooltip">
+			<b data-bind="visible: attachmentsCount, text: attachmentsCount"></b>
+			<i data-bind="css: { 'icon-attachment': !attachmentsInProcessCount(), 'icon-spinner': attachmentsInProcessCount()}"></i>
+			<span data-i18n="GLOBAL/ATTACHMENTS"></span>
+		</label>
+		<div class="tab-content attachmentAreaParent" role="tabpanel" aria-hidden="true" style="grid-column-end:4">
+			<div class="b-attachment-place" data-bind="visible: addAttachmentEnabled() && dragAndDropVisible(), css: {dragAndDropOver: dragAndDropOver}"
+				data-i18n="COMPOSE/ATTACH_DROP_FILES_DESC"></div>
+			<ul class="attachmentList" data-bind="foreach: attachments">
+				<li class="attachmentItem" data-bind="attr: { title: title }, css: { waiting: waiting, error: '' !== error() }">
+					<div class="attachmentIcon">
+						<i class="iconMain" data-bind="css: iconClass, visible: !uploading() || 0 === progress()"></i>
+						<div class="iconProgress" data-bind="attr: { style: progressStyle }, visible: uploading"></div>
+						<div class="iconBG" data-bind="text: progressText, visible: uploading"></div>
+					</div>
+					<div class="attachmentNameParent">
+						<a href="#" class="close pull-right" style="margin-top:-4px;" data-bind="click: cancel">×</a>
+						<div class="attachmentName" data-bind="text: fileName"></div>
+						<span class="attachmentSize" data-bind="text: friendlySize"></span>
+					</div>
+				</li>
+			</ul>
+			<div class="no-attachments-desc" data-bind="visible: 0 === attachments().length"
+				data-i18n="COMPOSE/NO_ATTACHMENTS_HERE_DESC"></div>
+		</div>
+
+		<input type="radio" name="tabs" value="mailvelope" id="tab-mailvelope" data-bind="checked: viewArea">
+		<label for="tab-mailvelope"
+			role="tab"
+			aria-selected="false"
+			aria-controls="panel3"
+			tabindex="0"
+			data-bind="visible: canMailvelope">
+			<i class="mailvelope-icon"></i>
+			<span>Mailvelope</span>
+		</label>
+		<div class="tab-content textAreaParent" id="mailvelope-editor" role="tabpanel" aria-hidden="true" style="grid-column-end:4" data-bind="visible: canMailvelope"></div>
 	</div>
-
-	<div class="textAreaParent" data-bind="visible: 'body' == viewArea(), initDom: editorArea"></div>
-
-	<div class="textAreaParent" id="mailvelope-editor" data-bind="visible: 'mailvelope' == viewArea()"></div>
 </div>
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 2d463b9ff..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
@@ -1,6 +1,6 @@
 <header class="b-header-toolbar g-ui-user-select-none">
 
-	<a href="#" class="close" data-bind="click: close">×</a>
+	<a href="#" class="close" data-bind="click: tryToClose">×</a>
 
 	<div class="btn-toolbar">
 
@@ -11,192 +11,324 @@
 		<a class="btn fontastic" data-bind="command: deleteCommand">🗑</a>
 
 		<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, visible: !contacts.importing() && !contacts.syncing()">
-			<a id="contacts-more-dropdown-id" class="btn dropdown-toggle fontastic" href="#" tabindex="-1">☰</a>
-			<ul class="dropdown-menu right-edge" role="menu" aria-labelledby="contacts-more-dropdown-id">
+			<a id="contacts-more-dropdown-id" class="btn dropdown-toggle fontastic" href="#">☰</a>
+			<menu class="dropdown-menu right-edge" role="menu" aria-labelledby="contacts-more-dropdown-id">
 				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="initDom: importUploaderButton">
+					<a href="#" data-bind="initDom: importButton">
 						<i data-bind="css: {'icon-import': !contacts.importing(), 'icon-spinner': contacts.importing}"></i>
 						<span data-i18n="CONTACTS/BUTTON_IMPORT"></span>
 					</a>
 				</li>
 				<li class="dividerbar" role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: exportCsv">
+					<a href="#" data-bind="click: exportCsv">
 						<i class="icon-export"></i>
 						<span data-i18n="CONTACTS/BUTTON_EXPORT_CSV"></span>
 					</a>
 				</li>
 				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: exportVcf">
+					<a href="#" data-bind="click: exportVcf">
 						<i class="icon-export"></i>
 						<span data-i18n="CONTACTS/BUTTON_EXPORT_VCARD"></span>
 					</a>
 				</li>
 				<li class="dividerbar" role="presentation" data-bind="visible: contactsSyncEnabled">
-					<a href="#" tabindex="-1" data-bind="command: syncCommand">
+					<a href="#" data-bind="command: syncCommand">
 						<i class="fontastic" data-bind="css: {'icon-spinner': contacts.syncing}">⇆</i>
 						<span data-i18n="CONTACTS/BUTTON_SYNC"></span>
 					</a>
 				</li>
-			</ul>
+			</menu>
 		</div>
 		<span data-bind="visible: contacts.importing() || contacts.syncing()" class="btn"><i class="icon-spinner"></i></span>
 	</div>
 </header>
 <div class="modal-body">
-	<div class="b-list-toolbar">
-		<input type="search" class="e-search" placeholder="Search" autofocus="" autocorrect="off" autocapitalize="off" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: search">
-	</div>
-	<div class="b-list-content g-ui-user-select-none" data-bind="css: {'hideContactListCheckbox': !useCheckboxesInList()}">
-		<div class="content">
-			<div class="listClear" data-bind="visible: viewClearSearch() && '' !== search()">
-				<span class="g-ui-link" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="click: clearSearch"></span>
-			</div>
-			<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()"
-				data-i18n="CONTACTS/EMPTY_LIST"></div>
-			<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
-				<i class="icon-spinner"></i>
-				<span data-i18n="GLOBAL/LOADING"></span>
-			</div>
-			<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()"
-				data-i18n="CONTACTS/EMPTY_SEARCH"></div>
-			<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: contacts().length">
-				<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
-					<div class="checkboxItem fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
-					<div class="nameParent actionHandle" data-bind="text: display"></div>
+	<div class="left">
+		<div class="b-list-toolbar">
+			<input type="search" class="e-search" placeholder="Search" autofocus="" autocorrect="off" autocapitalize="off" spellcheck="false" data-i18n="[placeholder]GLOBAL/SEARCH" data-bind="value: search">
+		</div>
+		<div class="b-list-content g-ui-user-select-none" data-bind="css: {'hideContactListCheckbox': !useCheckboxesInList()}">
+			<div class="content">
+				<div class="listClear" data-bind="visible: !!search()">
+					<span class="g-ui-link" data-i18n="CONTACTS/CLEAR_SEARCH" data-bind="click: clearSearch"></span>
+				</div>
+				<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()"
+					data-i18n="CONTACTS/EMPTY_LIST"></div>
+				<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
+					<i class="icon-spinner"></i>
+					<span data-i18n="GLOBAL/LOADING"></span>
+				</div>
+				<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()"
+					data-i18n="CONTACTS/EMPTY_SEARCH"></div>
+				<div class="e-contact-foreach g-ui-user-select-none" data-bind="foreach: contacts, visible: contacts().length">
+					<div class="e-contact-item g-ui-user-select-none" data-bind="css: lineAsCss()">
+						<div class="checkboxItem fontastic" data-bind="text: checked() ? '☑' : '☐'"></div>
+						<div class="nameParent" data-bind="text: display"></div>
+					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-	<div class="b-list-footer-toolbar thm-message-list-bottom-toolbar">
-		<div class="footer-pager">
-			<!-- ko template: { name: 'Paginator', data: contactsPaginator } --><!-- /ko -->
+		<div class="b-list-footer-toolbar">
+			<div class="footer-pager">
+				<!-- ko template: { name: 'Paginator', data: contactsPaginator } --><!-- /ko -->
+			</div>
 		</div>
 	</div>
-	<div class="b-view-content-toolbar btn-toolbar" data-bind="css: {'read-only': viewReadOnly}">
-		<div class="btn-group">
-			<button class="btn button-save-contact" data-bind="visible: !emptySelection(), command: saveCommand, css: {'dirty': watchDirty}">
-				<i data-bind="css: {'icon-ok': !viewSaving(), 'icon-spinner': viewSaving()}"></i>
-				<span data-i18n="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: '' === viewID()"></span>
-				<span data-i18n="CONTACTS/BUTTON_UPDATE_CONTACT" data-bind="visible: '' !== viewID()"></span>
-			</button>
-		</div>
-		<div class="btn-group dropdown" data-bind="visible: !emptySelection(), registerBootstrapDropdown: true">
-			<a id="button-add-prop-dropdown-id" href="#" tabindex="-1" class="btn dropdown-toggle">
-				<span data-i18n="CONTACTS/ADD_MENU_LABEL"></span>
-				<span class="caret"></span>
-			</a>
-			<ul class="dropdown-menu right-edge" style="text-align: left" tabindex="-1" role="menu" aria-labelledby="button-add-prop-dropdown-id">
-				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: addNewEmail">
-						<i class="icon-none"></i>
-						<span data-i18n="GLOBAL/EMAIL"></span>
-					</a>
-				</li>
-				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: addNewPhone">
-						<i class="icon-none"></i>
-						<span data-i18n="CONTACTS/ADD_MENU_PHONE"></span>
-					</a>
-				</li>
-				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: addNewWeb">
-						<i class="icon-none"></i>
-						<span data-i18n="CONTACTS/ADD_MENU_URL"></span>
-					</a>
-				</li>
-				<li class="dividerbar" role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: addNewNickname">
-						<i class="icon-none"></i>
-						<span data-i18n="CONTACTS/ADD_MENU_NICKNAME"></span>
-					</a>
-				</li>
+	<div class="right">
+		<form class="b-view-content" spellcheck="false" data-bind="css: {'read-only': contact() && contact().readOnly()}">
+			<div class="b-contact-view-desc" data-bind="visible: !contact()"
+				data-i18n="CONTACTS/CONTACT_VIEW_DESC"></div>
+			<div class="tabs" data-bind="visible: contact, i18nUpdate: contact">
+				<!-- ko with: contact -->
+				<input type="radio" name="contacttabs" id="tab-contact" checked>
+				<label for="tab-contact"
+					role="tab"
+					aria-selected="true"
+					aria-controls="panel1"
+					tabindex="0"
+					data-i18n="CONTACTS/TAB_CONTACT"></label>
+				<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+					<div class="control-group">
+						<label class="fontastic iconsize24">👤</label>
+						<div>
+							<div class="property-line" data-i18n="[title]CONTACTS/FIRST_NAME">
+								<span data-bind="text: givenName"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: givenName" data-i18n="[placeholder]CONTACTS/FIRST_NAME">
+							</div>
+							<div class="property-line" data-i18n="[title]CONTACTS/LAST_NAME">
+								<span data-bind="text: surName"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: surName" data-i18n="[placeholder]CONTACTS/LAST_NAME">
+							</div>
+							<div class="property-line" data-i18n="[title]CONTACTS/MIDDLE_NAME">
+								<span data-bind="text: middleName"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: middleName" data-i18n="[placeholder]CONTACTS/MIDDLE_NAME">
+							</div>
+							<div class="property-line" data-i18n="[title]CONTACTS/NAME_PREFIX">
+								<span data-bind="text: namePrefix"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: namePrefix" data-i18n="[placeholder]CONTACTS/NAME_PREFIX">
+							</div>
+							<div class="property-line" data-i18n="[title]CONTACTS/NAME_SUFFIX">
+								<span data-bind="text: nameSuffix"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: nameSuffix" data-i18n="[placeholder]CONTACTS/NAME_SUFFIX">
+							</div>
+							<hr>
+							<div class="property-line" data-bind="visible: null != nickname()" data-i18n="[title]CONTACTS/ADD_MENU_NICKNAME">
+								<span data-bind="text: nickname"></span>
+								<input type="text"
+									autocomplete="off" autocorrect="off" autocapitalize="off"
+									data-bind="textInput: nickname" data-i18n="[placeholder]CONTACTS/NICK_NAME">
+							</div>
+						</div>
+					</div>
+					<div class="control-group">
+						<label class="fontastic iconsize24" data-i18n="[title]GLOBAL/EMAIL">@</label>
+						<div>
+							<label class="e-component e-checkbox material-design">
+								<div>
+									<input type="checkbox" data-bind="checked: sendToAll"/>
+									<div role="checkbox"></div>
+								</div>
+								<span data-i18n="CONTACTS/SEND_TO_ALL_CONTACT_EMAILS"></span>
+							</label>
+
+							<div data-bind="foreach: email">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off"
+										data-bind="textInput: value">
+								</div>
+							</div>
+							<a href="#" class="btn fontastic" data-bind="visible: !readOnly(), click: addEmail">✚</a>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: tel().length">
+						<label class="fontastic iconsize24" data-i18n="[title]CONTACTS/ADD_MENU_PHONE">📞</label>
+						<div>
+							<div data-bind="foreach: tel">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text"
+										autocomplete="off" autocorrect="off" autocapitalize="off"
+										data-bind="textInput: value">
+								</div>
+							</div>
+							<a href="#" class="btn fontastic" data-bind="visible: !readOnly(), click: addTel">✚</a>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: url().length">
+						<label class="fontastic iconsize24" data-i18n="[title]CONTACTS/ADD_MENU_URL">🌍</label>
+						<div>
+							<div data-bind="foreach: url">
+								<div class="property-line">
+									<span data-bind="text: value"></span>
+									<input type="text" placeholder="https://"
+										autocomplete="off" autocorrect="off" autocapitalize="off"
+										data-bind="textInput: value">
+								</div>
+							</div>
+							<a href="#" class="btn fontastic" data-bind="visible: !readOnly(), click: addUrl">✚</a>
+						</div>
+					</div>
+					<div class="control-group" data-bind="visible: null != note()">
+						<label class="fontastic iconsize24" data-i18n="[title]CONTACTS/ADD_MENU_NOTE">🖉</label>
+						<div class="property-line">
+							<span data-bind="text: note"></span>
+							<input type="text"
+								autocomplete="off" autocorrect="off" autocapitalize="off"
+								data-bind="textInput: note">
+						</div>
+					</div>
+				</div>
 <!--
-				<li role="presentation">
-					<a href="#" tabindex="-1" data-bind="click: addNewAddress">
-						<span data-i18n="CONTACTS/ADD_MENU_ADDRESS"></span>
-					</a>
-				</li>-->
-			</ul>
-		</div>
-	</div>
-	<div class="b-view-content" data-bind="css: {'read-only': viewReadOnly}">
-		<div class="b-contact-view-desc" data-bind="visible: emptySelection"
-			data-i18n="CONTACTS/CONTACT_VIEW_DESC"></div>
-		<div data-bind="visible: !emptySelection()">
-			<div class="form-horizontal top-part">
-				<div class="control-group" data-bind="visible: !viewReadOnly() || contactHasValidName()">
-					<label class="fontastic iconsize24">👤</label>
-					<div>
-						<div data-bind="foreach: viewPropertiesNames">
-							<div class="property-line">
-								<span data-bind="text: value"></span>
-								<input type="text"
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}">
-							</div>
-						</div>
-						<div data-bind="visible: viewPropertiesOther().length, foreach: viewPropertiesOther">
-							<div class="property-line">
-								<!-- ko if: !largeValue() -->
-								<span data-bind="text: value"></span>
-								<input type="text"
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}">
-								<!-- /ko -->
-								<!-- ko if: largeValue -->
-								<span data-bind="text: value"></span>
-								<textarea
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup', attr: {'placeholder': placeholderValue}"></textarea>
-								<!-- /ko -->
-							</div>
+				<input type="radio" name="contacttabs" id="tab-contact-locations">
+				<label for="tab-contact-locations"
+					role="tab"
+					aria-selected="false"
+					aria-controls="panel2"
+					tabindex="0"
+					data-i18n="CONTACTS/TAB_LOCATIONS"></label>
+				<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+					<div data-bind="foreach: adr">
+						<div class="control-group">
+							<div data-bind="text: type"></div>
+							<div data-bind="text: street"></div>
+							<div data-bind="text: street_ext"></div>
+							<div data-bind="text: locality"></div>
+							<div data-bind="text: region"></div>
+							<div data-bind="text: postcode"></div>
+							<div data-bind="text: pobox"></div>
+							<div data-bind="text: country"></div>
+							<div data-bind="text: preferred"></div>
 						</div>
 					</div>
 				</div>
-				<div class="control-group" data-bind="visible: !viewReadOnly() || viewPropertiesEmails().length">
-					<label class="fontastic iconsize24" data-i18n="[title]GLOBAL/EMAIL">@</label>
-					<div>
-						<div data-bind="foreach: viewPropertiesEmails">
-							<div class="property-line">
-								<span data-bind="text: value"></span>
-								<input type="text"
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'">
-							</div>
-						</div>
-						<a href="#" class="g-ui-link add-link" data-bind="visible: !viewReadOnly(), click: addNewEmail" data-i18n="CONTACTS/LINK_ADD_EMAIL"></a>
-					</div>
-				</div>
-				<div class="control-group" data-bind="visible: viewPropertiesPhones().length">
-					<label class="fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_PHONE">📞</label>
-					<div>
-						<div data-bind="foreach: viewPropertiesPhones">
-							<div class="property-line">
-								<span data-bind="text: value"></span>
-								<input type="text"
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'">
-							</div>
-						</div>
-					</div>
-				</div>
-				<div class="control-group" data-bind="visible: viewPropertiesWeb().length">
-					<label class="fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_WEB">🌍</label>
-					<div>
-						<div data-bind="foreach: viewPropertiesWeb">
-							<div class="property-line">
-								<span data-bind="text: value"></span>
-								<input type="text" placeholder="https://"
-									autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-									data-bind="value: value, hasfocus: focused, valueUpdate: 'keyup'">
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-<!--
-			<div class="e-read-only-sign fontastic iconsize24" data-i18n="[title]CONTACTS/LABEL_READ_ONLY">🔒</div>
 -->
+				<input type="radio" name="contacttabs" id="tab-contact-business">
+				<label for="tab-contact-business"
+					role="tab"
+					aria-selected="false"
+					aria-controls="panel3"
+					tabindex="0"
+					data-i18n="CONTACTS/TAB_BUSINESS"></label>
+				<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+					<div class="control-group">
+						<label data-i18n="CONTACTS/LABEL_ORGANIZATION"></label>
+						<span data-bind="text: org"></span>
+						<input type="text"
+							autocomplete="off" autocorrect="off" autocapitalize="off"
+							data-bind="textInput: org">
+					</div>
+					<div class="control-group">
+						<label data-i18n="CONTACTS/LABEL_DEPARTMENT"></label>
+						<span data-bind="text: department"></span>
+						<input type="text"
+							autocomplete="off" autocorrect="off" autocapitalize="off"
+							data-bind="textInput: department">
+					</div>
+					<div class="control-group">
+						<label data-i18n="CONTACTS/LABEL_TITLE"></label>
+						<span data-bind="text: title"></span>
+						<input type="text"
+							autocomplete="off" autocorrect="off" autocapitalize="off"
+							data-bind="textInput: title">
+					</div>
+				</div>
+
+				<input type="radio" name="contacttabs" id="tab-contact-crypto">
+				<label for="tab-contact-crypto"
+					role="tab"
+					aria-selected="false"
+					aria-controls="panel4"
+					tabindex="0"
+					data-i18n="CONTACTS/TAB_CRYPTO"></label>
+				<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+					<div class="control-group">
+						<label data-i18n="CRYPTO/SIGN"></label>
+						<select name="x-crypto[signpref]" data-bind="value: signpref">
+							<option value="Ask" data-i18n="CONTACTS/ASK"></option>
+							<option value="Never" data-i18n="CONTACTS/NEVER"></option>
+							<option value="Always" data-i18n="CONTACTS/ALWAYS"></option>
+							<option value="IfPossible" data-i18n="CONTACTS/ALWAYS_IF_POSSIBLE"></option>
+						</select>
+					</div>
+					<div class="control-group">
+						<label data-i18n="CRYPTO/ENCRYPT"></label>
+						<select name="x-crypto[encryptpref]" data-bind="value: encryptpref">
+							<option value="Ask" data-i18n="CONTACTS/ASK"></option>
+							<option value="Never" data-i18n="CONTACTS/NEVER"></option>
+							<option value="Always" data-i18n="CONTACTS/ALWAYS"></option>
+							<option value="IfPossible" data-i18n="CONTACTS/ALWAYS_IF_POSSIBLE"></option>
+						</select>
+					</div>
+				</div>
+				<!-- /ko -->
+			</div>
+		</form>
+		<div class="b-view-content-toolbar btn-toolbar" data-bind="i18nUpdate: contact">
+			<!-- ko with: contact -->
+			<div class="btn-group">
+				<button class="btn button-save-contact" data-bind="visible: !readOnly(), command: $root.saveCommand">
+					<i data-bind="css: {'icon-ok': !$root.isSaving(), 'icon-spinner': $root.isSaving()}"></i>
+					<span data-i18n="CONTACTS/BUTTON_CREATE_CONTACT" data-bind="visible: !id()"></span>
+					<span data-i18n="GLOBAL/SAVE" data-bind="visible: id"></span>
+				</button>
+			</div>
+			<div class="btn-group dropdown" data-bind="visible: !readOnly(), registerBootstrapDropdown: true">
+				<a id="button-add-prop-dropdown-id" href="#" class="btn dropdown-toggle" data-i18n="CONTACTS/ADD_MENU_LABEL"></a>
+				<menu class="dropdown-menu right-edge" style="text-align: left" role="menu" aria-labelledby="button-add-prop-dropdown-id">
+					<li role="presentation" data-bind="visible: null == nickname()">
+						<a href="#" data-bind="click: addNickname">
+							<i class="icon-none"></i>
+							<span data-i18n="CONTACTS/ADD_MENU_NICKNAME"></span>
+						</a>
+					</li>
+					<li role="presentation">
+						<a href="#" data-bind="click: addEmail">
+							<i class="fontastic">@</i>
+							<span data-i18n="GLOBAL/EMAIL"></span>
+						</a>
+					</li>
+					<li role="presentation">
+						<a href="#" data-bind="click: addTel">
+							<i class="fontastic">📞</i>
+							<span data-i18n="CONTACTS/ADD_MENU_PHONE"></span>
+						</a>
+					</li>
+					<li role="presentation">
+						<a href="#" data-bind="click: addUrl">
+							<i class="fontastic">🌍</i>
+							<span data-i18n="CONTACTS/ADD_MENU_URL"></span>
+						</a>
+					</li>
+					<li role="presentation" data-bind="visible: null == note()">
+						<a href="#" data-bind="click: addNote">
+							<i class="fontastic">🖉</i>
+							<span data-i18n="CONTACTS/ADD_MENU_NOTE"></span>
+						</a>
+					</li>
+<!--
+					<li class="dividerbar" role="presentation">
+						<a href="#" data-bind="click: addNewAddress">
+							<span data-i18n="CONTACTS/ADD_MENU_ADDRESS"></span>
+						</a>
+					</li>-->
+				</menu>
+			</div>
+<!--
+			<div class="read-only-sign fontastic iconsize24" data-bind="visible: readOnly" data-i18n="[title]CONTACTS/LABEL_READ_ONLY">🔒</div>
+-->
+			<!-- /ko -->
 		</div>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
index a5e11b1bd..aecfb7189 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFilter.html
@@ -5,11 +5,11 @@
 		<span data-i18n="POPUPS_FILTER/TITLE_EDIT_FILTER" data-bind="visible: !isNew()"></span>
 	</h3>
 </header>
-<div class="modal-body" data-bind="with: filter">
+<form id="sieve-script-filter" class="modal-body" spellcheck="false" data-bind="submit: saveFilter, with: filter">
 	<div class="control-group" data-bind="css: {'error': nameError}">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: nameFocused"
-			autocorrect="off" autocapitalize="off" spellcheck="false"
+			data-bind="value: name"
+			autofocus="" autocorrect="off" autocapitalize="off"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>
 
@@ -22,9 +22,9 @@
 				data-i18n="POPUPS_FILTER/SELECT_MATCH_ALL"></option>
 		</select>
 	</div>
-	<div data-bind="visible: conditions().length, foreach: conditions">
+	<div data-bind="foreach: conditions">
 		<div class="control-group" data-bind="css: {'error': valueError}" style="display:flex">
-			<div style="flex-grow:1" data-bind="css: {'error': valueError}, template: {'name': template(), 'data': $data}"></div>
+			<div style="flex-grow:1" data-bind="css: {'error': valueError}, template: {name: template(), data: $data}"></div>
 			<span class="delete-action button-delete fontastic" style="margin-top: 5px;"
 				data-bind="click: function (oCondition) { $root.removeCondition(oCondition); }">🗑</span>
 		</div>
@@ -37,8 +37,8 @@
 
 	<div class="legend" data-i18n="POPUPS_FILTER/LEGEND_ACTIONS"></div>
 	<select class="span3" data-bind="options: $root.actionTypeOptions, value: actionType, optionsText: 'name', optionsValue: 'id'"></select>
-	<div data-bind="template: {'name': actionTemplate()}"></div>
-</div>
+	<div data-bind="template: {name: actionTemplate()}, i18nUpdate: actionTemplate"></div>
+</form>
 <footer>
-	<a class="btn buttonSave" data-bind="click: saveFilter" data-icon="✔" data-i18n="GLOBAL/DONE"></a>
+	<button class="btn buttonSave" form="sieve-script-filter" data-icon="✔" data-i18n="GLOBAL/DONE"></button>
 </footer>
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 @@
+<header>
+	<a href="#" class="close" data-bind="click: close">×</a>
+	<h3 data-bind="text: folder()?.fullName"></h3>
+</header>
+<form id="folderform" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
+	<div class="control-group" data-bind="if: editing">
+		<label data-i18n="POPUPS_CREATE_FOLDER/LABEL_PARENT"></label>
+		<select name="parent" data-bind="options: parentFolderSelectList, value: parentFolder,
+			optionsText: 'name', optionsValue: 'id', optionsAfterRender: defaultOptionsAfterRender"></select>
+	</div>
+	<div class="control-group" data-bind="if: editing">
+		<label data-i18n="GLOBAL/NAME"></label>
+		<input name="folder" type="text"
+			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			required="" data-bind="textInput: name">
+	</div>
+	<div data-bind="with: folder">
+		<!-- ko if: canBeSubscribed -->
+		<div class="control-group">
+			<label class="fontastic">👁</label>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					name: 'subscribe',
+					label: 'SETTINGS_FOLDERS/BUTTON_SUBSCRIBE',
+					value: isSubscribed
+				}
+			}"></div>
+		</div>
+		<!-- /ko -->
+		<div class="control-group">
+			<label data-i18n="POPUPS_FILTER/SELECT_FIELD_SIZE"></label>
+			<span data-bind="text: friendlySize"></span>
+		</div>
+		<div class="control-group">
+			<label data-i18n="MESSAGE_LIST/MENU_SELECT_UNSEEN"></label>
+			<span data-bind="text: unreadEmails"></span>
+			/ <span style="margin:0" data-bind="text: totalEmails"></span>
+		</div>
+		<!-- ko if: $root.displaySpecSetting() && canBeSelected() && isSubscribed() -->
+		<div class="control-group">
+			<label class="icon-check-mark-circle-two"></label>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					name: 'checkable',
+					label: 'SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES',
+					value: checkable
+				}
+			}"></div>
+		</div>
+		<!-- /ko -->
+		<!-- ko if: $root.showKolab -->
+		<div class="control-group">
+			<label>Kolab</label>
+			<select data-bind="options: $root.kolabTypeOptions, value: kolabType,
+				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
+		</div>
+		<!-- /ko -->
+	</div>
+	<div class="control-group" data-bind="if: ACLAllowed">
+		<label>ACL</label>
+		<div>
+			<table class="table table-hover" style="width:auto"><tbody>
+				<!-- ko foreach: folder()?.ACL -->
+				<tr>
+					<td data-bind="text: identifier"></td>
+					<td>
+						<button class="btn fontastic" data-bind="visible: mine, click: $root.editACL">👁</button>
+						<button class="btn fontastic" data-bind="visible: !mine(), click: $root.editACL">🖉</button>
+						<button class="btn fontastic" data-bind="visible: !mine(), click: $root.deleteACL">🗑</button>
+					</td>
+				</tr>
+				<!-- /ko -->
+				<tr data-bind="visible: adminACL"><td></td><td>
+					<button class="btn fontastic" data-bind="click: createACL">✚</button>
+				</td></tr>
+			</tbody></table>
+		</div>
+	</div>
+</form>
+<footer>
+	<button form="folderform" class="btn">
+		<i class="icon-folder-add"></i>
+		<span data-i18n="GLOBAL/SAVE"></span>
+	</button>
+</footer>
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 @@
+<header>
+	<a href="#" class="close" data-bind="click: close">×</a>
+	<h3>ACL: <span data-bind="text: folderName"></span></h3>
+</header>
+<form id="folderaclform" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
+	<div class="control-group">
+		<label data-i18n="GLOBAL/EMAIL"></label>
+		<input name="identifier" class="input-xlarge" autofocus=""
+			autocomplete="off" autocorrect="off" autocapitalize="off"
+			data-bind="visible: create, value: identifier" required="">
+		<span data-bind="visible: !create(), text: identifier"></span>
+	</div>
+	<div class="control-group">
+		<label data-i18n="IMAP/ACL_RIGHTS"></label>
+		<table class="table table-hover table-bordered" style="width:auto"><tbody>
+		<tr title="SETACL/DELETEACL/GETACL/LISTRIGHTS">
+			<td data-i18n="IMAP/ACL_A"></td>
+			<td><input type="checkbox" value="a" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="SELECT the mailbox, perform STATUS">
+			<td data-i18n="IMAP/ACL_R"></td>
+			<td><input type="checkbox" value="r" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="Mailbox is visible to LIST/LSUB commands, SUBSCRIBE mailbox">
+			<td data-i18n="IMAP/ACL_L"></td>
+			<td><input type="checkbox" value="l" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="perform APPEND, COPY into mailbox">
+			<td data-i18n="IMAP/ACL_I"></td>
+			<td><input type="checkbox" value="i" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="set or clear \SEEN flag via STORE, also set \SEEN during APPEND/COPY/FETCH BODY[...]">
+			<td data-i18n="IMAP/ACL_S"></td>
+			<td><input type="checkbox" value="s" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="set or clear \DELETED flag via STORE, set \DELETED flag during APPEND/COPY">
+			<td data-i18n="IMAP/ACL_T"></td>
+			<td><input type="checkbox" value="t" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+<!--
+		<tr title="STORE DELETED flag, perform EXPUNGE">
+			<td data-i18n="IMAP/ACL_T">Old</td>
+			<td><input type="checkbox" value="d" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+-->
+		<tr title="set or clear flags other than \SEEN and \DELETED via STORE, also set them during APPEND/COPY">
+			<td data-i18n="IMAP/ACL_W"></td>
+			<td><input type="checkbox" value="w" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="send mail to submission address for mailbox, not enforced by IMAP4 itself">
+			<td data-i18n="IMAP/ACL_P"></td>
+			<td><input type="checkbox" value="p" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="CREATE new sub-mailboxes in any implementation-defined hierarchy, parent mailbox for the new mailbox name in RENAME">
+			<td data-i18n="IMAP/ACL_K"></td>
+			<td><input type="checkbox" value="k" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+<!--
+		<tr title="CREATE new sub-mailboxes in any implementation-defined hierarchy">
+			<td data-i18n="IMAP/ACL_K">Old</td>
+			<td><input type="checkbox" value="c" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+-->
+		<tr title="DELETE mailbox, old mailbox name in RENAME">
+			<td data-i18n="IMAP/ACL_X"></td>
+			<td><input type="checkbox" value="x" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		<tr title="perform EXPUNGE and expunge as a part of CLOSE">
+			<td data-i18n="IMAP/ACL_E"></td>
+			<td><input type="checkbox" value="e" data-bind="checked: rights, disable: mine" /></td>
+		</tr>
+		</tbody></table>
+	</div>
+</form>
+<footer>
+	<button data-bind="visible: mine" form="folderaclform" class="btn" data-i18n="GLOBAL/CLOSE"></button>
+	<button data-bind="visible: !mine()" form="folderaclform" class="btn" data-i18n="GLOBAL/SAVE"></button>
+</footer>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
index d5f23ee4a..aedc87df8 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsFolderClear.html
@@ -1,23 +1,18 @@
 <header>
 	<a href="#" class="close" data-bind="click: close">×</a>
-	<h3>
-		<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="visible: !clearingProcess()"></span>
-		<span data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearingProcess"></span>
-	</h3>
+	<h3 data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEAR_FOLDER" data-bind="hidden: clearing"></h3>
+	<h3 data-i18n="POPUPS_CLEAR_FOLDER/TITLE_CLEARING_PROCESS" data-bind="visible: clearing"></h3>
 </header>
 <div class="modal-body">
 	<i class="fontastic" style="color:red">⚠</i>
-	&nbsp;&nbsp;
+	&nbsp;
 	<strong data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_WARNING"></strong>
-	<br>
-	<br>
-	<span data-bind="html: dangerDescHtml"></span>
-	<br>
+	<p data-bind="html: dangerDescHtml"></p>
 	<span data-i18n="[html]POPUPS_CLEAR_FOLDER/DANGER_DESC_HTML_2"></span>
 </div>
 <footer>
 	<a class="btn btn-danger" data-bind="command: clearCommand">
-		<i class="fontastic" data-bind="css: {'icon-spinner white': clearingProcess()}">🔥</i>
+		<i class="fontastic" data-bind="css: {'icon-spinner white': clearing}">🔥</i>
 		<span data-i18n="GLOBAL/CLEAR"></span>
 	</a>
 </footer>
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 351b4e0bd..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
@@ -2,23 +2,24 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="POPUPS_CREATE_FOLDER/TITLE_CREATE_FOLDER"></h3>
 </header>
-<form id="createfolderform" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
+<form id="createfolderform" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
 	<div class="control-group">
 		<label data-i18n="POPUPS_CREATE_FOLDER/LABEL_PARENT"></label>
-		<select data-bind="options: parentFolderSelectList, value: selectedParentValue,
+		<select name="parent" data-bind="options: parentFolderSelectList, value: parentFolder,
 			optionsText: 'name', optionsValue: 'id', optionsAfterRender: defaultOptionsAfterRender"></select>
 	</div>
 	<div class="control-group">
 		<label data-i18n="GLOBAL/NAME"></label>
-		<input type="text"
-			autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-			required="" pattern="^[^\\/]+$" data-bind="textInput: folderName">
+		<input name="folder" type="text"
+			autofocus="" autocomplete="off" autocorrect="off" autocapitalize="off"
+			required="" pattern="^[^\\/]+$" data-bind="textInput: name">
 	</div>
 	<div class="control-group" data-bind="component: {
 		name: 'Checkbox',
 		params: {
+			name: 'subscribe',
 			label: 'SETTINGS_FOLDERS/BUTTON_SUBSCRIBE',
-			value: folderSubscribe
+			value: subscribe
 		}
 	}"></div>
 </form>
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 @@
 	<div class="form-horizontal">
 		<div class="alert" data-bind="visible: '' !== notification()" data-bind="text: notification"></div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/SENT_NAME"></label>
+			<label data-icon="📧" data-i18n="FOLDER_LIST/SENT_NAME"></label>
 			<select data-bind="options: folderSelectList, value: sentFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/DRAFTS_NAME"></label>
+			<label data-icon="🗎" data-i18n="FOLDER_LIST/DRAFTS_NAME"></label>
 			<select data-bind="options: folderSelectList, value: draftsFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="GLOBAL/SPAM"></label>
+			<label data-icon="⚠" data-i18n="GLOBAL/SPAM"></label>
 			<select data-bind="options: folderSelectList, value: spamFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/TRASH_NAME"></label>
+			<label data-icon="🗑" data-i18n="FOLDER_LIST/TRASH_NAME"></label>
 			<select data-bind="options: folderSelectList, value: trashFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
 		<div class="control-group">
-			<label data-i18n="FOLDER_LIST/ARCHIVE_NAME"></label>
+			<label data-icon="🗄" data-i18n="FOLDER_LIST/ARCHIVE_NAME"></label>
 			<select data-bind="options: folderSelectList, value: archiveFolder,
 				optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 		</div>
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 19e717340..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,74 +1,145 @@
 <header class="g-ui-user-select-none">
-	<a href="#" class="close" data-bind="click: close">×</a>
-	<h3>
-		<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></span>
-		<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></span>
-	</h3>
+	<a href="#" class="close" data-bind="click: tryToClose">×</a>
+	<h3 data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/TITLE_ADD_IDENTITY"></h3>
+	<h3 data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/TITLE_UPDATE_IDENTITY"></h3>
 </header>
-<form id="identityform" class="modal-body" autocomplete="off" data-bind="submit: submitForm">
-	<div class="form-horizontal g-ui-user-select-none">
-		<div class="alert" data-bind="visible: '' !== submitError()">
-			<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
-			<span data-bind="text: submitError"></span>
-		</div>
-		<div class="control-group" data-bind="css: {'error': emailHasError}">
-			<label data-i18n="GLOBAL/EMAIL"></label>
-			<div>
-				<div class="textEmail" data-bind="text: email, visible: owner"></div>
-				<input type="email" class="input-xlarge" autofocus=""
-					autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-					data-bind="visible: !owner(), value: email, hasfocus: emailFocused">
+<form id="identityform" class="modal-body" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
+	<div class="alert" data-bind="visible: '' !== submitError()">
+		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<span data-bind="text: submitError"></span>
+	</div>
+
+	<div class="tabs" data-bind="with: identity">
+		<input type="radio" name="identitytabs" id="tab-identity" checked>
+		<label data-i18n="SETTINGS_LABELS/GENERAL" for="tab-identity" role="tab" aria-selected="true" aria-controls="panel1" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="control-group">
+				<label data-i18n="GLOBAL/NAME"></label>
+				<input name="Name" type="text" class="input-xlarge"
+					autocomplete="off" autocorrect="off" autocapitalize="off"
+					data-bind="value: name, hasfocus: $root.nameFocused">
+			</div>
+			<div class="control-group">
+				<label data-i18n="GLOBAL/EMAIL"></label>
+				<div>
+					<div class="textEmail" data-bind="text: email, visible: !id()"></div>
+					<input name="Email" type="email" class="input-xlarge" autofocus=""
+						autocomplete="off" autocorrect="off" autocapitalize="off"
+						data-bind="visible: id, value: email, attr: {required: !!id()}">
+				</div>
+			</div>
+			<div class="control-group">
+				<label data-i18n="POPUPS_IDENTITY/LABEL"></label>
+				<div>
+					<input name="Label" type="text" class="input-xlarge" autofocus=""
+						autocomplete="off" autocorrect="off" autocapitalize="off"
+						data-bind="value: label, hasfocus: $root.labelFocused">
+				</div>
 			</div>
 		</div>
-		<div class="control-group">
-			<label data-i18n="GLOBAL/NAME"></label>
-			<input type="text" class="input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-				data-bind="value: name">
+
+		<input type="radio" name="identitytabs" id="tab-identity-signature">
+		<label data-i18n="POPUPS_IDENTITY/SIGNATURE" for="tab-identity-signature" role="tab" aria-selected="false" aria-controls="panel2" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="e-signature-place" data-bind="editor: signature"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
+					value: signatureInsertBefore,
+					name: 'SignatureInsertBefore'
+				}
+			}"></div>
 		</div>
-		<div class="control-group" data-bind="visible: showReplyTo, css: {'error': replyToHasError}">
-			<label data-i18n="GLOBAL/REPLY_TO"></label>
-			<input type="text" class="inputReplyTo input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-				data-bind="value: replyTo, hasfocus: replyToFocused">
+
+		<input type="radio" name="identitytabs" id="tab-identity-crypto">
+		<label data-i18n="CONTACTS/TAB_CRYPTO" for="tab-identity-crypto" role="tab" aria-selected="false" aria-controls="panel3" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="control-group">
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'CRYPTO/SIGN',
+						value: pgpSign,
+						name: 'pgpSign'
+					}
+				}"></div>
+			</div>
+			<div class="control-group">
+				<div data-bind="component: {
+					name: 'Checkbox',
+					params: {
+						label: 'CRYPTO/ENCRYPT',
+						value: pgpEncrypt,
+						name: 'pgpEncrypt'
+					}
+				}"></div>
+			</div>
+<!--
+			<div class="control-group">
+				<label data-i18n="CRYPTO/ENCRYPT"></label>
+				<select name="PgpEncrypt" data-bind="value: pgpEncrypt">
+					<option value="Ask" data-i18n="CONTACTS/ASK"></option>
+					<option value="Never" data-i18n="CONTACTS/NEVER"></option>
+					<option value="Always" data-i18n="CONTACTS/ALWAYS"></option>
+					<option value="IfPossible" data-i18n="CONTACTS/ALWAYS_IF_POSSIBLE"></option>
+				</select>
+			</div>
+-->
+			<details>
+				<summary><strong>S/MIME</strong></summary>
+				<div class="control-group" data-bind="css: {'error': smimeKey() && !smimeKeyValid()}">
+					<label data-i18n="CRYPTO/PRIVATE_KEY"></label>
+					<textarea name="smimeKey" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeKey"></textarea>
+				</div>
+<!--				<div class="control-group" data-bind="visible:smimeKeyValid() && !smimeKeyEncrypted()"> -->
+				<div class="control-group" data-bind="visible:smimeKeyValid">
+					<label></label>
+					<button type="button" data-bind="click: $root.setSMimeKeyPass" data-i18n="CRYPTO/CHANGE_PASS"></button>
+				</div>
+				<div class="control-group" data-bind="css: {'error': smimeCertificate() && !smimeCertificateValid()}">
+					<label data-i18n="SMIME/CERTIFICATE"></label>
+					<textarea name="smimeCertificate" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeCertificate"></textarea>
+				</div>
+				<div class="control-group" data-bind="css: {'error': smimeCertificateChain() && !smimeCertificateChainValid()}">
+					<label data-i18n="SMIME/CERTIFICATECHAIN"></label>
+					<textarea name="smimeCertificateChain" class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: smimeCertificateChain"></textarea>
+				</div>
+				<div class="control-group" data-bind="hidden:smimeCertificate">
+					<label></label>
+					<button type="button" data-bind="click: $root.createSelfSigned" data-i18n="CRYPTO/CREATE_SELF_SIGNED"></button>
+				</div>
+			</details>
 		</div>
-		<div class="control-group" data-bind="visible: showBcc, css: {'error': bccHasError}">
-			<label data-i18n="GLOBAL/BCC"></label>
-			<input type="text" class="inputBcc input-xlarge"
-				autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-				data-bind="value: bcc, hasfocus: bccFocused">
-		</div>
-		<div class="control-group" data-bind="visible: !showReplyTo() || !showBcc()">
-			<div>
-				<span data-bind="visible: !showReplyTo()">
-					<span class="g-ui-link" data-i18n="GLOBAL/REPLY_TO"
-						data-bind="click: function () { showReplyTo(true); }"></span>
-					&nbsp;&nbsp;
-				</span>
-				<span data-bind="visible: !showBcc()">
-					<span class="g-ui-link" data-i18n="GLOBAL/BCC"
-						data-bind="click: function () { showBcc(true); }"></span>
-				</span>
+
+		<input type="radio" name="identitytabs" id="tab-identity-advanced">
+		<label data-i18n="SETTINGS_FILTERS/ADVANCED" for="tab-identity-advanced" role="tab" aria-selected="false" aria-controls="panel4" tabindex="0"></label>
+		<div class="form-horizontal tab-content" role="tabpanel" aria-hidden="false">
+			<div class="control-group">
+				<label data-i18n="GLOBAL/REPLY_TO"></label>
+				<input name="ReplyTo" type="email" class="inputReplyTo input-xlarge"
+					autocomplete="off" autocorrect="off" autocapitalize="off"
+					data-bind="value: replyTo">
+			</div>
+			<div class="control-group">
+				<label data-i18n="GLOBAL/BCC"></label>
+				<input name="Bcc" type="email" class="inputBcc input-xlarge"
+					autocomplete="off" autocorrect="off" autocapitalize="off"
+					data-bind="value: bcc">
+			</div>
+			<div class="control-group">
+				<label data-i18n="FOLDER_LIST/SENT_NAME"></label>
+				<select name="sentFolder" data-bind="options: $root.folderSelectList, value: sentFolder,
+					optionsText: 'name', optionsValue: 'id', optionsAfterRender: $root.defaultOptionsAfterRender"></select>
 			</div>
 		</div>
 	</div>
-	<hr>
-	<div class="control-group g-ui-user-select-none">
-		<div data-bind="component: {
-			name: 'Checkbox',
-			params: {
-				label: 'POPUPS_IDENTITY/LABEL_SIGNATURE_INSERT_BEFORE',
-				value: signatureInsertBefore
-			}
-		}"></div>
-	</div>
-	<div class="e-signature-place" data-bind="editor: signature"></div>
 </form>
 <footer>
 	<button form="identityform" class="btn buttonAddIdentity">
 		<i data-bind="visible: !edit(), css: {'icon-user-add': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
 		<span data-bind="visible: !edit()" data-i18n="POPUPS_IDENTITY/BUTTON_ADD_IDENTITY"></span>
 		<i data-bind="visible: edit, css: {'icon-ok': !submitRequest(), 'icon-spinner': submitRequest()}"></i>
-		<span data-bind="visible: edit" data-i18n="POPUPS_IDENTITY/BUTTON_UPDATE_IDENTITY"></span>
+		<span data-bind="visible: edit" data-i18n="GLOBAL/SAVE"></span>
 	</button>
 </footer>
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 83536a2ab..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 @@
 				<tr><td class="fontastic">↞</td><td data-i18n="SHORTCUTS_HELP/LABEL_REPLY_ALL"></td><td>A, Shift + Reply</td></tr>
 				<tr><td class="fontastic">→</td><td data-i18n="SHORTCUTS_HELP/LABEL_FORWARD"></td><td>F, Fwd</td></tr>
 				<tr><td class="fontastic">→</td><td data-i18n="SHORTCUTS_HELP/LABEL_FORWARD_MULTIPLY"></td><td>Shift + F, Shift + Fwd</td></tr>
-				<tr><td class="icon-help"></td><td data-i18n="SHORTCUTS_HELP/LABEL_HELP"></td><td>F1, Help</td></tr>
+				<tr><td class="icon-help"></td><td data-i18n="GLOBAL/HELP"></td><td>F1, Help</td></tr>
 			</tbody>
 			</table>
 		</div>
@@ -65,7 +65,7 @@
 			<tbody>
 				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_FULLSCREEN_TOGGLE"></td><td>Enter, Open</td></tr>
 				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_BLOCKQUOTES_TOGGLE"></td><td>B</td></tr>
-				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_PRINT"></td><td><!-- ko text: metaKey --><!-- /ko --> + P</td></tr>
+				<tr><td data-i18n="MESSAGE/SWAP_COLORS"></td><td>Shift + B</td></tr>
 				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_EXIT_FULLSCREEN"></td><td>Esc, Close</td></tr>
 				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_CLOSE_MESSAGE"></td><td>Esc, Close</td></tr>
 				<tr><td data-i18n="SHORTCUTS_HELP/LABEL_SWITCH_TO_LIST"></td><td>Shift + Tab, Esc</td></tr>
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 79a97d962..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
@@ -2,9 +2,9 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_GENERATE_TITLE"></h3>
 </header>
-<form id="openpgp-generate" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
+<form id="openpgp-generate" class="modal-body form-horizontal" autocomplete="off" spellcheck="false" data-bind="submit: submitForm">
 	<div class="alert" data-bind="visible: '' !== submitError()">
-		<a href="#" class="close" data-bind="click: function () { submitError('') }">×</a>
+		<a href="#" class="close" data-bind="click: hideError">×</a>
 		<span data-bind="text: submitError"></span>
 	</div>
 	<!-- Disable stupid browser password autofill -->
@@ -12,24 +12,19 @@
 	<div class="control-group" data-bind="css: {'error': emailError}">
 		<label data-i18n="GLOBAL/EMAIL"></label>
 		<input type="email" required="" class="input-xlarge"
-			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="off" autocorrect="off" autocapitalize="off"
 			list="emailaddresses" data-bind="value: email">
-		<datalist id="emailaddresses">
-			<!-- ko foreach: identities -->
-			<option data-bind="attr:{value:email}"></option>
-			<!-- /ko -->
-		</datalist>
 	</div>
 	<div class="control-group">
 		<label data-i18n="GLOBAL/NAME"></label>
 		<input type="text" required="" class="input-xlarge"
-			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="off" autocorrect="off" autocapitalize="off"
 			data-bind="value: name">
 	</div>
 	<div class="control-group">
 		<label data-i18n="GLOBAL/PASSWORD"></label>
 		<input type="password" required="" class="input-xlarge"
-			autocomplete="new-password" autocorrect="off" autocapitalize="off" spellcheck="false"
+			autocomplete="new-password" autocorrect="off" autocapitalize="off"
 			data-bind="value: password">
 	</div>
 	<div class="control-group">
@@ -40,7 +35,7 @@
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Backup public key on server',
+				label: 'OPENPGP/BACKUP_PUBLIC_KEY_ON_SERVER',
 				value: backupPublicKey
 			}
 		}"></div>
@@ -48,7 +43,7 @@
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Backup private key on server',
+				label: 'OPENPGP/BACKUP_PRIVATE_KEY_ON_SERVER',
 				value: backupPrivateKey
 			}
 		}"></div>
@@ -56,7 +51,7 @@
 		<div data-bind="visible: canGnuPG, component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store public key on server in GnuPG',
+				label: 'OPENPGP/STORE_PUBLIC_KEY_IN_GNUPG',
 				value: saveGnuPGPublic
 			}
 		}"></div>
@@ -64,11 +59,16 @@
 		<div data-bind="visible: canGnuPG, component: {
 			name: 'Checkbox',
 			params: {
-				label: 'Store private key on server in GnuPG',
+				label: 'OPENPGP/STORE_PRIVATE_KEY_IN_GNUPG',
 				value: saveGnuPGPrivate
 			}
 		}"></div>
 	</div>
+	<datalist id="emailaddresses">
+		<!-- ko foreach: identities -->
+		<option data-bind="attr:{value:email}"></option>
+		<!-- /ko -->
+	</datalist>
 </form>
 <footer>
 	<button class="btn" form="openpgp-generate">
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 @@
 	<a href="#" class="close" data-bind="click: close">×</a>
 	<h3 data-i18n="OPENPGP/POPUP_IMPORT_TITLE"></h3>
 </header>
-<form id="openpgp-import" class="modal-body form-horizontal" autocomplete="off" data-bind="submit: submitForm">
+<form id="openpgp-import" class="modal-body" autocomplete="off" data-bind="submit: submitForm">
 	<div class="alert"  data-bind="visible: keyError() && keyErrorMessage(), text: keyErrorMessage"></div>
+	<div class="control-group">
+		<!-- could be email or fingerprint -->
+		<input type="search" data-bind="textInput: search"/>
+		<button class="btn" type="button" data-bind="enable: search, click: searchPGP" data-i18n="GLOBAL/SEARCH"></button>
+	</div>
 	<div class="control-group" data-bind="css: {'error': keyError}">
-		<textarea class="inputKey input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
+		<textarea class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: key" required=""></textarea>
 	</div>
 	<div class="control-group">
-<!--
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
@@ -16,8 +20,6 @@
 				value: saveServer
 			}
 		}"></div>
-		<br>
--->
 		<div data-bind="visible: canGnuPG, component: {
 			name: 'Checkbox',
 			params: {
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
index 1445aad25..fdd7ecb81 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsOpenPgpKey.html
@@ -3,11 +3,7 @@
 	<h3 data-i18n="OPENPGP/POPUP_VIEW_TITLE"></h3>
 </header>
 <div class="modal-body">
-	<div class="form-horizontal">
-		<div class="control-group">
-			<pre class="key-viewer" data-bind="initDom: keyDom, text: key"></pre>
-		</div>
-	</div>
+	<pre data-bind="initDom: keyDom, text: key"></pre>
 </div>
 <footer>
 	<a class="btn buttonClose" data-bind="click: close" data-icon="✖" data-i18n="GLOBAL/CLOSE"></a>
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 @@
+<header>
+	<a href="#" class="close" data-bind="click: close">×</a>
+	<h3 data-i18n="SMIME/POPUP_IMPORT_TITLE"></h3>
+</header>
+<form id="smime-import" class="modal-body" autocomplete="off" data-bind="submit: submitForm">
+	<div class="alert"  data-bind="visible: pemError() && pemErrorMessage(), text: pemErrorMessage"></div>
+	<div class="control-group" data-bind="css: {'error': pemError}">
+		<textarea class="input-xxlarge" rows="14" autofocus="" autocomplete="off" data-bind="value: pem" required=""></textarea>
+	</div>
+</form>
+<footer>
+	<button class="btn" form="smime-import" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></button>
+</footer>
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 5c91db77a..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
@@ -7,12 +7,12 @@
 		<span data-bind="visible: exists">: <!-- ko text: name--><!-- /ko --></span>
 	</h3>
 </header>
-<div class="modal-body">
+<form class="modal-body" spellcheck="false">
 
 	<div class="control-group" data-bind="css: {'error': nameError}, hidden: exists">
 		<input type="text" class="span5"
-			data-bind="value: name, hasfocus: !exists()"
-			autocorrect="off" autocapitalize="off" spellcheck="false"
+			data-bind="value: name"
+			autocorrect="off" autocapitalize="off"
 			data-i18n="[placeholder]GLOBAL/NAME">
 	</div>
 
@@ -47,7 +47,7 @@
 				<col style="width: 140px">
 				<col style="width: 1em">
 			</colgroup>
-			<tbody data-bind="foreach: filters">
+			<tbody data-bind="foreach: filters, i18nUpdate: filters">
 				<tr class="filter-item" draggable="true" data-bind="sortableItem: { list: $parent.filters }">
 					<td class="fontastic" data-bind="click: function () { $parent.hasChanges(true); enabled(!enabled()); }, text: enabled() ? '☑' : '☐'"></td>
 					<td class="drag-wrapper fontastic drag-handle">⬍</td>
@@ -61,16 +61,16 @@
 							data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 					</td>
 					<td>
-						<span class="delete-filter fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">🗑</span>
+						<span class="delete-filter fontastic" data-bind="visible: !askDelete(), click: function (oFilter) { $root.filterForDeletion(oFilter); }">🗑</span>
 					</td>
 				</tr>
 			</tbody>
 		</table>
 		<a class="btn" data-bind="click: $root.addFilter" data-icon="✚" data-i18n="POPUPS_SIEVE_SCRIPT/BUTTON_ADD_FILTER"></a>
 	</div>
-</div>
+</form>
 <footer>
-	<a class="btn" data-bind="visible: $root.allowToggle, click: function() { $root.toggleFiltersRaw(); }, css: {'active': $root.rawActive }" data-i18n="[title]POPUPS_SIEVE_SCRIPT/BUTTON_RAW_SCRIPT">
+	<a class="btn" data-bind="visible: allowFilters(), click: function() { $root.toggleFiltersRaw(); }, css: {'active': $root.rawActive }" data-i18n="[title]POPUPS_SIEVE_SCRIPT/BUTTON_RAW_SCRIPT">
 		<i class="icon-file-code"></i>
 	</a>
 <!--
@@ -78,7 +78,7 @@
 		<span data-i18n="POPUPS_SIEVE_SCRIPT/VALIDATE"></span>
 	</a>
 -->
-	<a class="btn buttonSave" data-bind="visible: hasChanges, click: function() { $root.saveScript(); }, css: {'btn-danger': $root.saveError}">
+	<a class="btn buttonSave" data-bind="click: function() { $root.saveScript(); }, css: {'btn-danger': $root.saveError}">
 		<i class="fontastic" data-bind="css: {'icon-spinner': $root.saving}">💾</i>
 		<span data-i18n="GLOBAL/SAVE"></span>
 	</a>
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 c32d7a485..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
@@ -4,24 +4,34 @@
 		&nbsp;&nbsp;&nbsp;
 		<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 	</div>
+	<div data-bind="component: {
+		name: 'Checkbox',
+		params: {
+			label: 'SETTINGS_ACCOUNTS/SHOW_UNREAD',
+			value: showUnread
+		}
+	}"></div>
 	<a class="btn" data-bind="click: addNewAccount">
 		<i class="icon-user-add"></i>
 		<span data-i18n="SETTINGS_ACCOUNTS/BUTTON_ADD_ACCOUNT"></span>
 	</a>
 	<table class="table table-hover list-table accounts-list" data-bind="i18nUpdate: accounts">
-		<tbody>
-			<td></td>
-			<td colspan="3" data-bind="text: mainEmail"></td>
-		</tbody>
 		<tbody data-bind="foreach: accounts">
-			<!-- ko if:isAdditional -->
-			<tr draggable="true" data-bind="sortableItem: { list: $root.accounts, afterMove: $root.accountsAndIdentitiesAfterMove }">
+			<tr draggable="true" data-bind="attr: {draggable:isAdditional}, sortableItem: { list: $root.accounts, afterMove: $root.accountsAndIdentitiesAfterMove }">
+				<!-- ko if:!isAdditional() -->
+				<td></td>
+				<td colspan="3" data-bind="text: displayName"></td>
+				<!-- /ko -->
+				<!-- ko if:isAdditional -->
 				<td>
 					<i class="fontastic drag-handle">⬍</i>
 				</td>
 				<td class="e-action">
-					<span class="account-name" data-bind="text: email"></span>
+					<span class="account-name" data-bind="text: displayName"></span>
 				</td>
+<!--
+				<td><span class="icon-import" data-bind="click: importAll"></span></td>
+-->
 				<td>
 					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete}, click: function(oAccount) { $root.deleteAccount(oAccount); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
@@ -29,8 +39,8 @@
 				<td>
 					<span class="delete fontastic" data-bind="visible: !askDelete(), click: function (oAccount) { $root.accountForDeletion(oAccount); }">🗑</span>
 				</td>
+				<!-- /ko -->
 			</tr>
-			<!-- /ko -->
 		</tbody>
 	</table>
 </div>
@@ -42,21 +52,20 @@
 	</a>
 	<table class="table table-hover list-table identities-list" data-bind="i18nUpdate: identities">
 		<tbody data-bind="foreach: identities">
-			<tr draggable="true" data-bind="sortableItem: { list: $root.identities, afterMove: $root.accountsAndIdentitiesAfterMove }">
+			<tr draggable="true" data-bind="attr: {'data-identity-id': id}, sortableItem: { list: $root.identities, afterMove: $root.accountsAndIdentitiesAfterMove }">
 				<td>
 					<i class="fontastic drag-handle">⬍</i>
 				</td>
 				<td class="e-action">
-					<span class="identity-name" data-bind="text: formattedName()"></span>
-					&nbsp;&nbsp;
-					<span class="identity-default" data-bind="visible: 0 === $index()" data-i18n="SETTINGS_ACCOUNTS/DEFAULT_IDENTITY_LABEL"></span>
+					<span class="identity-name" data-bind="text: $data"></span>
+					<span class="identity-default" data-i18n="GLOBAL/DEFAULT"></span>
 				</td>
 				<td>
-					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: canBeDeleted, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
+					<a class="btn btn-small btn-danger button-confirm-delete" data-bind="visible: id, css: {'delete-access': askDelete}, click: function(oIdentity) { $root.deleteIdentity(oIdentity); }"
 						data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 				</td>
 				<td>
-					<span class="delete fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">🗑</span>
+					<span class="delete fontastic" data-bind="visible: !askDelete() && id(), click: function (oIdentity) { $root.identityForDeletion(oIdentity); }">🗑</span>
 				</td>
 			</tr>
 		</tbody>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
index 16519ca2f..73c091f9d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsContacts.html
@@ -10,7 +10,7 @@
 		}"></div>
 	</div>
 </div>
-<div class="form-horizontal" data-bind="visible: allowContactsSync">
+<form class="form-horizontal" spellcheck="false" data-bind="visible: allowContactsSync">
 	<div class="legend" data-i18n="SETTINGS_CONTACTS/LEGEND_CONTACTS_SYNC"></div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_ENABLE"></label>
@@ -31,7 +31,7 @@
 	</div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_CONTACTS/LABEL_CONTACTS_SYNC_USER"></label>
-		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
+		<input type="text" autocomplete="off" autocorrect="off" autocapitalize="off"
 			data-bind="value: syncUser">
 	</div>
 	<div class="control-group">
@@ -39,4 +39,9 @@
 		<input type="password" autocomplete="current-password" autocorrect="off" autocapitalize="off"
 			spellcheck="false" data-bind="value: syncPass">
 	</div>
-</div>
+	<div class="control-group" data-bind="hidden: !syncUrl()">
+		<label></label>
+		<button class="btn" data-i18n="GLOBAL/TEST" data-bind="click: test"></button>
+	</div>
+	<div class="alert alert-error" data-bind="visible: syncError, text: syncError"></div>
+</form>
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 c434133ec..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
@@ -1,11 +1,11 @@
 <div class="form-horizontal">
 	<div class="legend">
-		<span data-i18n="SETTINGS_FILTERS/LEGEND_FILTERS"></span>
+		<span data-i18n="SETTINGS_LABELS/FILTERS"></span>
 		&nbsp;&nbsp;&nbsp;
 		<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 	</div>
 </div>
-<div class="alert alert-error g-ui-user-select-none" data-bind="visible: serverError" data-icon="⚠" data-bind="text: serverErrorDesc"></div>
+<div class="alert alert-error g-ui-user-select-none" data-bind="visible: serverError, text: serverErrorDesc" data-icon="⚠"></div>
 <table class="table table-hover list-table g-ui-user-select-none">
 	<colgroup>
 		<col style="width: 30px">
@@ -13,20 +13,37 @@
 		<col style="width: 140px">
 		<col style="width: 1em">
 	</colgroup>
-	<tbody data-bind="foreach: scripts, i18nUpdate: scripts">
+	<tbody>
 		<tr class="script-item">
+			<td style="border:0" class="e-action fontastic" data-bind="click: disableScripts, text: hasActive() ? '○' : '⦿'"></td>
+			<td style="border:0" data-i18n="GLOBAL/INACTIVE">Inactive</td>
+			<td style="border:0"></td>
+			<td style="border:0"></td>
+		</tr>
+	</tbody>
+	<tbody data-bind="foreach: scripts, i18nUpdate: scripts">
+		<!-- ko if: allowFilters() -->
+		<tr class="script-item">
+			<td><div class="e-action fontastic" data-bind="visible: body, click: function (oScript) { $root.enableScript(oScript); }, text: active() ? '⦿' : '○'"></div></td>
+			<td class="e-action script-name" data-i18n="SETTINGS_FILTERS/SIMPLE" data-bind="attr:{title: name}"></td>
+			<td></td>
+			<td></td>
+		</tr>
+		<tr><th colspan="4" data-i18n="SETTINGS_FILTERS/ADVANCED"></th></tr>
+		<!-- /ko -->
+		<!-- ko if: !allowFilters() -->
+		<tr class="script-item">
+			<td><div class="e-action fontastic" data-bind="visible: body, click: function (oScript) { $root.enableScript(oScript); }, text: active() ? '⦿' : '○'"></div></td>
+			<td class="e-action script-name" data-bind="text: name"></td>
 			<td>
-				<span class="disabled-script fontastic" data-bind="click: function (oScript) { $root.toggleScript(oScript); }, text: active() ? '☑' : '☐'"></span>
-			</td>
-			<td class="e-action" class="script-name" data-bind="text: name()"></td>
-			<td>
-				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: function(oScript) { $root.deleteScript(oScript); }"
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete}, click: function(oScript) { $root.deleteScript(oScript); }"
 					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 			</td>
 			<td>
-				<span class="delete-script fontastic" data-bind="visible: !askDelete() && canBeDeleted(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
+				<span class="e-action fontastic" data-bind="visible: !askDelete() && !allowFilters(), click: function (oScript) { $root.scriptForDeletion(oScript); }">🗑</span>
 			</td>
 		</tr>
+		<!-- /ko -->
 	</tbody>
 </table>
 <a class="btn" data-bind="click: addScript" data-icon="✚" data-i18n="SETTINGS_FILTERS/BUTTON_ADD_SCRIPT"></a>
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
 		}
 	}"></div>
 </div>
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
 			}
 		}"></div>
 		<div data-bind="visible: $root.allowMarkAsRead, component: {
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/MARK_AS_READ_LABEL',
-				value: actionMarkAsRead
+				value: markAsRead
 			}
 		}"></div>
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/STOP_LABEL',
-				value: actionNoStop
+				value: stop
 			}
 		}"></div>
 	</div>
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
 			}
 		}"></div>
 		<div data-bind="component: {
 			name: 'Checkbox',
 			params: {
 				label: 'POPUPS_FILTER/STOP_LABEL',
-				value: actionNoStop
+				value: stop
 			}
 		}"></div>
 	</div>
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
 		}
 	}"></div>
 </div>
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
 			}
 		}"></div>
 	</div>
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 da2641990..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
@@ -13,7 +13,6 @@
 	<div>
 		<input type="text" class="span5" data-bind="value: actionValueFourth"
 			data-i18n="[placeholder]POPUPS_FILTER/VACATION_RECIPIENTS_LABEL">
-		<button class="btn setRecipientsBtn fontastic" data-bind="click: setRecipients">✚</button>
 	</div>
 </div>
 <div class="control-group" style="margin-bottom: 0">
@@ -29,7 +28,7 @@
 		name: 'Checkbox',
 		params: {
 			label: 'POPUPS_FILTER/STOP_LABEL',
-			value: actionNoStop
+			value: stop
 		}
 	}"></div>
 </div>
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 444a7233f..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,27 +1,20 @@
 <tr data-bind="css: { 'selectable': selectable, 'system': isSystemFolder }">
-	<td data-bind="css: 'deep-' + deep">
-		<span class="folder-name" data-bind="text: name, visible: !edited(), css: { 'can-be-edited': canBeEdited },
-			click: function (oFolder) { oFolder.canBeEdited() && $root.folderForEdit(oFolder); },
-			tooltipErrorTip: errorMsg"></span>
-		<input type="text"
-			autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false"
-			data-bind="value: nameForEdit, visible: edited, hasfocus: edited, onEnter: function () { $root.folderEditOnEnter($data); }">
-		&nbsp;
-		<span class="folder-system-name" data-bind="text: manageFolderSystemName, visible: isSystemFolder"></span>
+	<td data-bind="click: edit, css: 'deep-' + deep">
+		<span class="folder-name" data-bind="text: name, tooltipErrorTip: errorMsg"></span>
+		<span class="folder-system-name" data-bind="text: nameInfo, visible: isSystemFolder"></span>
+		<span class="folder-size" data-bind="text: friendlySize, visible: size"></span>
 	</td>
 	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_DELETE_FOLDER">
 		<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: $root.deleteFolder"
 			data-i18n="GLOBAL/ARE_YOU_SURE"></a>
 		<span class="e-action fontastic" data-bind="visible: canBeDeleted() && !askDelete(), click: $root.folderForDeletion">🗑</span>
 	</td>
-	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER">
-		<span class="e-action fontastic" data-bind="css: {'unsubscribed-folder':!subscribed()}, visible: canBeSubscribed(), click: $root.toggleFolderSubscription">👁</span>
+	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_SHOW_HIDE_FOLDER" data-bind="if: canBeSubscribed">
+		<span class="e-action fontastic" data-bind="css: {'unsubscribed-folder':!isSubscribed()}, click: $root.toggleFolderSubscription">👁</span>
 	</td>
 	<!-- ko if: $root.displaySpecSetting -->
-	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES">
-		<span class="e-action" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, visible: canBeSelected() && subscribed(), click: $root.toggleFolderCheckable">
-			<i class="icon-check-mark-circle-two"></i>
-		</span>
+	<td data-i18n="[title]SETTINGS_FOLDERS/HELP_CHECK_FOR_NEW_MESSAGES" data-bind="if: canBeSelected() && isSubscribed()">
+		<span class="e-action icon-check-mark-circle-two" data-bind="css: {'check-folder':checkable(), 'unchecked-folder':!checkable()}, click: $root.toggleFolderCheckable"></span>
 	</td>
 	<!-- /ko -->
 	<!-- ko if: $root.showKolab -->
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
index 164353a82..1548fdea4 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsFolders.html
@@ -3,6 +3,7 @@
 	&nbsp;&nbsp;&nbsp;
 	<i class="icon-spinner" style="margin-top: 5px" data-bind="visible: loading"></i>
 </div>
+
 <div style="margin-bottom:20px;" data-bind="component: {
 	name: 'Checkbox',
 	params: {
@@ -10,6 +11,17 @@
 		value: hideUnsubscribed
 	}
 }"></div>
+
+<!-- ko if: showKolab -->
+<div style="margin-bottom:20px;" data-bind="component: {
+	name: 'Checkbox',
+	params: {
+		label: 'SETTINGS_FOLDERS/UNHIDE_KOLAB_FOLDERS',
+		value: unhideKolabFolders
+	}
+}"></div>
+<!-- /ko -->
+
 <a class="btn" data-bind="click: createFolder">
 	<i class="icon-folder-add"></i>
 	<span data-i18n="SETTINGS_FOLDERS/BUTTON_CREATE"></span>
@@ -22,7 +34,7 @@
 	<span data-i18n="SETTINGS_FOLDERS/TO_MANY_FOLDERS_DESC_2"></span>
 </div>
 <div class="alert folders-list-error" data-bind="visible: '' !== folderListError()">
-	<a href="#" class="close" data-bind="click: function () { folderListError(''); }">×</a>
+	<a href="#" class="close" data-bind="click: hideError">×</a>
 	<span data-bind="text: folderListError"></span>
 </div>
 <table class="table table-hover list-table" data-bind="i18nUpdate: folderList">
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
index 2eca71179..5fe663658 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsGeneral.html
@@ -1,18 +1,30 @@
 <div class="form-horizontal">
-	<div class="legend" data-i18n="SETTINGS_GENERAL/LEGEND_GENERAL"></div>
+	<div class="legend" data-i18n="SETTINGS_LABELS/GENERAL"></div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_IDENTITY"></label>
+		<label data-i18n="SETTINGS_GENERAL/IDENTITY"></label>
 		<b class="editMainIdentity" data-bind="click: editMainIdentity, text: identityMainDesc"></b>
 	</div>
 	<div class="control-group" data-bind="visible: allowLanguagesOnSettings">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_LANGUAGE"></label>
+		<label data-i18n="SETTINGS_GENERAL/LANGUAGE"></label>
 		<div>
 			<span class="select" tabindex="0" data-bind="text: languageFullName, click: selectLanguage, onSpace: selectLanguage, onEnter: selectLanguage"></span>
 			<span data-bind="saveTrigger: languageTrigger"></span>
 		</div>
 	</div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_LAYOUT"></label>
+		<label data-i18n="SETTINGS_GENERAL/HOUR_FORMAT"></label>
+		<div>
+			<select data-bind="value: hourCycle">
+				<option value="" data-i18n="GLOBAL/DEFAULT">default</option>
+				<option value="h11">00:00 AM</option>
+				<option value="h12">12:00 AM</option>
+				<option value="h23">00:00 (24 hour)</option>
+				<option value="h24">24:00 (24 hour)</option>
+			</select>
+		</div>
+	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/LAYOUT"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
@@ -25,7 +37,203 @@
 		}"></div>
 	</div>
 	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_EDITOR"></label>
+		<label data-i18n="SETTINGS_GENERAL/CHECK_MAIL_INTERVAL"></label>
+		<div>
+			<input type="number" max="60" step="1" class="span1" data-bind="textInput: checkMailInterval, attr:{min:minRefreshInterval}">
+			<span data-i18n="SETTINGS_GENERAL/MINUTES"></span>
+			<span data-bind="saveTrigger: checkMailIntervalTrigger"></span>
+		</div>
+	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/HTML_TO_MD',
+					value: markdown
+				}
+			}"></div>
+		</div>
+	</div>
+
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_LIST"></div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MESSAGE_PER_PAGE"></label>
+		<div>
+			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
+			&nbsp;
+			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
+		</div>
+	</div>
+	<div class="control-group" data-bind="visible: sortSupported">
+		<label data-i18n="MESSAGE_LIST/SORT"></label>
+		<select data-bind="options: sortOptions, optionsText: 'text', optionsValue: 'value', value: defaultSort"></select>
+		<span data-bind="saveTrigger: defaultSortTrigger"></span>
+	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/HIDE_DELETED_MESSAGES',
+					value: hideDeleted
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/USE_CHECKBOXES_IN_LIST',
+					value: useCheckboxesInList
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LIST_MESSAGES_GROUPED',
+					value: listGrouped
+				}
+			}"></div>
+			<div data-bind="visible: threadsAllowed, component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/USE_THREADS',
+					value: useThreads
+				}
+			}"></div>
+		</div>
+	</div>
+	<div class="control-group" data-bind="visible: threadsAllowed() && useThreads()">
+		<label data-i18n="SETTINGS_GENERAL/THREAD_ALGORITHM"></label>
+		<select data-bind="options: threadAlgorithms, value: threadAlgorithm"></select>
+	</div>
+
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW"></div>
+	<div class="control-group">
+		<div data-bind="component: {
+			name: 'Checkbox',
+			params: {
+				label: 'SETTINGS_GENERAL/MARK_MESSAGE_READ_AFTER',
+				value: messageReadAuto
+			}
+		}"></div>
+		<div>
+			<input type="number" min="0" step="1" class="span1" data-bind="textInput: messageReadDelay">
+			&nbsp;
+			<span data-i18n="SETTINGS_GENERAL/SECONDS"></span>
+			<span data-bind="saveTrigger: messageReadDelayTrigger"></span>
+		</div>
+	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MSG_DEFAULT_ACTION"></label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: msgDefaultActions,
+				value: msgDefaultAction,
+				trigger: msgDefaultActionTrigger,
+				optionsText: 'name',
+				optionsValue: 'id'
+			}
+		}"></div>
+	</div>
+	<div class="control-group">
+		<div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/COLLAPSE_BLOCKQUOTES',
+					value: collapseBlockquotes
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LIST_INLINE_ATTACHMENTS',
+					value: listInlineAttachments
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/LIST_SIMPLE_ATTACHMENTS',
+					value: simpleAttachmentsList
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/REMOVE_COLORS',
+					value: removeColors
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/ALLOW_STYLES',
+					value: allowStyles
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/PREFER_HTML',
+					value: viewHTML
+				}
+			}"></div>
+			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/PREFER_HTML_INFO"></em>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/SHOW_NEXT_MESSAGE',
+					value: showNextMessage
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'SETTINGS_GENERAL/MESSAGE_POPUP_WINDOW',
+					value: messageNewWindow
+				}
+			}"></div>
+		</div>
+	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MIN_FONT_SIZE"></label>
+		<div>
+			<input type="number" min="0" step="1" class="span1" data-bind="textInput: minFontSize">
+			px&nbsp;
+			<span data-bind="saveTrigger: minFontSizeTrigger"></span>
+		</div>
+	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/MAX_QUOTE_LEVEL"></label>
+		<div>
+			<input type="number" min="0" step="1" class="span1" data-bind="textInput: maxBlockquotesLevel">
+			&nbsp;
+			<span data-bind="saveTrigger: maxBlockquotesLevelTrigger"></span>
+		</div>
+	</div>
+
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/EXTERNAL_IMAGES"></label>
+		<div>
+			<select data-bind="value: viewImages">
+				<option value="ask" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ASK"></option>
+				<option value="match" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_WHITELIST"></option>
+				<option value="always" data-i18n="SETTINGS_GENERAL/IMAGES_OPTION_ALWAYS"></option>
+			</select>
+		</div>
+	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/IMAGES_WHITELIST"></label>
+		<div>
+			<textarea data-bind="textInput: viewImagesWhitelist"></textarea>
+		</div>
+	</div>
+
+	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_COMPOSE"></div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_GENERAL/EDITOR"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
@@ -37,101 +245,105 @@
 			}
 		}"></div>
 	</div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_MESSAGE_PER_PAGE"></label>
-		<div>
-			<input type="number" min="10" max="50" step="1" class="span1" data-bind="textInput: messagesPerPage">
-			&nbsp;
-			<span data-bind="saveTrigger: messagesPerPageTrigger"></span>
-		</div>
+	<div class="control-group" data-bind="visible: hasWysiwygs">
+		<label>WYSIWYG</label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: wysiwygs,
+				value: editorWysiwyg,
+				trigger: editorWysiwygTrigger,
+				optionsText: 'name',
+				optionsValue: 'name'
+			}
+		}"></div>
 	</div>
+
 	<div class="control-group">
 		<div>
 			<div data-bind="component: {
 				name: 'Checkbox',
 				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_CHECKBOXES_IN_LIST',
-					value: useCheckboxesInList
-				}
-			}"></div>
-			<div data-bind="visible: threadsAllowed, component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_USE_THREADS',
-					value: useThreads
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_REPLY_SAME_FOLDER',
+					label: 'SETTINGS_GENERAL/REPLY_SAME_FOLDER',
 					value: replySameFolder
 				}
 			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_DRAFT_AUTOSAVE',
+					value: allowDraftAutosave
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUEST_READ_RECEIPT',
+					value: requestReadReceipt
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUEST_DSN',
+					value: requestDsn
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/BUTTON_REQUIRE_TLS',
+					value: requireTLS
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'CRYPTO/SIGN',
+					value: pgpSign
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'CRYPTO/ENCRYPT',
+					value: pgpEncrypt
+				}
+			}"></div>
+			<div data-bind="component: {
+				name: 'Checkbox',
+				params: {
+					label: 'COMPOSE/ALLOW_SPELLCHECK',
+					value: allowSpellcheck
+				}
+			}"></div>
 		</div>
 	</div>
 
-	<div class="legend" data-i18n="SHORTCUTS_HELP/TAB_MESSAGE_VIEW"></div>
-	<div class="control-group">
-		<label data-i18n="SETTINGS_GENERAL/LABEL_MARK_MESSAGE_READ_AFTER"></label>
-		<div>
-			<input type="number" min="0" step="1" class="span1" data-bind="textInput: messageReadDelay">
-			&nbsp;
-			<span data-i18n="SETTINGS_GENERAL/SECONDS"></span>
-			<span data-bind="saveTrigger: messageReadDelayTrigger"></span>
-		</div>
-	</div>
-	<div class="control-group">
-		<div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_SHOW_IMAGES',
-					value: showImages
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_REMOVE_COLORS',
-					value: removeColors
-				}
-			}"></div>
-			<div data-bind="component: {
-				name: 'Checkbox',
-				params: {
-					label: 'SETTINGS_GENERAL/LABEL_PREFER_HTML',
-					value: viewHTML
-				}
-			}"></div>
-			<em style="margin: 0 0 1em 2em;display: block;" data-i18n="SETTINGS_GENERAL/LABEL_PREFER_HTML_INFO"></em>
-		</div>
-	</div>
+	<button type="button" data-bind="visible: mailto, click: registerMailto" class="btn" data-i18n="SETTINGS_GENERAL/MAILTO"></button>
 
-	<div class="legend" data-i18n="SETTINGS_GENERAL/LABEL_NOTIFICATIONS"></div>
+	<div class="legend" data-i18n="SETTINGS_GENERAL/NOTIFICATIONS"></div>
 	<div class="control-group">
 		<div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC',
-						value: desktopNotification,
-						enable: isDesktopNotificationAllowed,
-						inline: true
+						label: 'SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC',
+						value: desktopNotifications,
+						enable: isDesktopNotificationAllowed
 					}
 				}"></div>
 				&nbsp;
-				<span data-bind="visible: !isDesktopNotificationAllowed()" style="color: #999" data-i18n="SETTINGS_GENERAL/LABEL_CHROME_NOTIFICATION_DESC_DENIED"></span>
+				<span data-bind="visible: !isDesktopNotificationAllowed()" style="color: #999" data-i18n="SETTINGS_GENERAL/CHROME_NOTIFICATION_DESC_DENIED"></span>
 				<span class="fontastic" data-bind="click: testSystemNotification" style="color:green;cursor:pointer">▶️</span>
 			</div>
 			<div>
-				<div data-bind="component: {
+				<div style="display: inline-block;" data-bind="component: {
 					name: 'Checkbox',
 					params: {
-						label: 'SETTINGS_GENERAL/LABEL_SOUND_NOTIFICATION',
-						value: soundNotification,
-						inline: true
+						label: 'SETTINGS_GENERAL/SOUND_NOTIFICATION',
+						value: soundNotification
 					}
 				}"></div>
 				&nbsp;
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 976990ae4..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,9 +1,7 @@
-<nav class="b-content" data-bind="foreach: menu">
+<div class="b-toolbar btn-toolbar">
+	<a class="btn btn-thin fontastic toggleLeft" data-bind="click: toggleLeftPanel"></a>
+	<a class="btn" data-bind="click: backToInbox" data-icon="⬅" data-i18n="GLOBAL/BACK"></a>
+</div>
+<nav data-bind="foreach: menu">
 	<a data-bind="css: {'selected': selected }, attr: { 'href': $root.link(route), 'data-i18n': label }"></a>
 </nav>
-<div class="b-content show-on-panel-disabled" data-bind="click: leftPanelDisabled.toggle()"></div>
-<div class="b-footer">
-	<a class="btn buttonResize" data-bind="click: leftPanelDisabled.toggle()">
-		<i data-bind="css: {'icon-resize-out': leftPanelDisabled(), 'icon-resize-in': !leftPanelDisabled()}"></i>
-	</a>
-</div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
index b1c7d424e..08a1805ff 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsPane.html
@@ -1,9 +1,3 @@
 <div class="btn-toolbar">
-	<!-- ko if: isMobile() -->
-	<div class="btn-group" style="margin-left: -1px">
-		<a class="btn btn-thin fontastic toggleLeft" data-bind="click: leftPanelDisabled.toggle, text: leftPanelDisabled() ? '❯' : '❮'">❮</a>
-	</div>
-	<!-- /ko -->
-	<a class="btn" data-bind="click: backToMailBoxClick" data-icon="⬅" data-i18n="GLOBAL/BACK"></a>
+	<a class="btn btn-thin fontastic toggleLeft"></a>
 </div>
-<div id="rl-settings-subscreen"></div>
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
index e91cc663c..26f160b65 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/SettingsSecurity.html
@@ -1,11 +1,10 @@
-<div class="form-horizontal" data-bind="visible: capaAutoLogout">
+<div class="form-horizontal">
 	<div class="legend" data-i18n="SETTINGS_SECURITY/LEGEND_SECURITY"></div>
 	<div class="control-group">
 		<label data-i18n="SETTINGS_SECURITY/LABEL_AUTOLOGOUT"></label>
 		<div data-bind="component: {
 			name: 'Select',
 			params: {
-				inline: true,
 				options: autoLogoutOptions,
 				value: autoLogout,
 				trigger: autoLogoutTrigger,
@@ -14,6 +13,19 @@
 			}
 		}"></div>
 	</div>
+	<div class="control-group">
+		<label data-i18n="SETTINGS_SECURITY/FORGET_KEY_PASS"></label>
+		<div data-bind="component: {
+			name: 'Select',
+			params: {
+				options: autoLogoutOptions,
+				value: keyPassForget,
+				trigger: keyPassForgetTrigger,
+				optionsText: 'name',
+				optionsValue: 'id'
+			}
+		}"></div>
+	</div>
 </div>
 
 <div class="legend">OpenPGP</div>
@@ -23,29 +35,16 @@
 <button class="btn" data-bind="click: generateOpenPgpKey" data-icon="🔑" data-i18n="SETTINGS_OPENPGP/BUTTON_GENERATE_KEY_PAIR"></button>
 <!-- /ko -->
 
-<br>
-<br>
-<div class="control-group">
-	<div data-bind="component: {
-		name: 'Checkbox',
-		params: {
-			label: 'SETTINGS_OPENPGP/LABEL_ALLOW_DRAFT_AUTOSAVE',
-			value: allowDraftAutosave
-		}
-	}"></div>
-</div>
-<br>
-
 <!-- ko if: canGnuPG -->
-<details>
-<summary class="legend">GnuPG</summary>
+<details style="margin:1em 0">
+<summary style="font-size:larger;font-weight:bold">GnuPG</summary>
 <table class="table table-hover list-table">
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
 	<tbody data-bind="foreach: gnupgPrivateKeys, i18nUpdate: gnupgPrivateKeys">
 		<tr>
 			<td data-bind="click: view">
-				<span data-bind="visible: can_sign" class="fontastic">✍</span>
-				<span data-bind="visible: can_decrypt" class="fontastic">🔓</span>
+				<span data-bind="visible: can_sign" class="fontastic" data-i18n="[title]CRYPTO/SIGN">✍</span>
+				<span data-bind="visible: can_decrypt" class="fontastic" data-i18n="[title]CRYPTO/DECRYPT">🔓</span>
 				<span class="key-id" data-bind="text: id"></span>
 				<!-- ko foreach: emails -->
 				<span class="key-user" data-bind="text: $data"></span>
@@ -59,13 +58,27 @@
 				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
 			</td>
 		</tr>
+		<tr data-bind="visible: hasStoredPass">
+			<td>
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<span>🔑</span><span class="key-user" data-i18n="SETTINGS_SECURITY/LABEL_STORED_PASS"></span>
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askForgetPass()}, click: forgetPass"
+					 data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askForgetPass(), click: openForPassForget">🗑</span>
+			</td>
+		</tr>
 	</tbody>
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: gnupgPublicKeys, i18nUpdate: gnupgPublicKeys">
 		<tr>
 			<td data-bind="click: view">
-				<span data-bind="visible: can_verify" class="fontastic">✔</span>
-				<span data-bind="visible: can_encrypt" class="fontastic">🔒</span>
+				<span data-bind="visible: can_verify" class="fontastic" data-i18n="[title]CRYPTO/VERIFY">✔</span>
+				<span data-bind="visible: can_encrypt" class="fontastic" data-i18n="[title]CRYPTO/ENCRYPT">🔒</span>
 				<span class="key-id" data-bind="text: id"></span>
 				<!-- ko foreach: emails -->
 				<span class="key-user" data-bind="text: $data"></span>
@@ -85,8 +98,8 @@
 <!-- /ko -->
 
 <!-- ko if: canOpenPGP -->
-<details>
-<summary class="legend">OpenPGP.js</summary>
+<details style="margin:1em 0">
+<summary style="font-size:larger;font-weight:bold">OpenPGP.js</summary>
 <table class="table table-hover list-table">
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PRIVATE">Private keys</th></tr></tbody>
 	<tbody data-bind="foreach: openpgpkeysPrivate, i18nUpdate: openpgpkeysPrivate">
@@ -106,6 +119,20 @@
 				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
 			</td>
 		</tr>
+		<tr data-bind="visible: hasStoredPass">
+			<td>
+				<span class="fontastic" data-i18n="[title]SETTINGS_OPENPGP/TITLE_PRIVATE">🔒</span>
+				<span class="key-id" data-bind="text: id"></span>
+				<span>🔑</span><span class="key-user" data-i18n="SETTINGS_SECURITY/LABEL_STORED_PASS"></span>
+			</td>
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askForgetPass()}, click: forgetPass"
+					 data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askForgetPass(), click: openForPassForget">🗑</span>
+			</td>
+		</tr>
 	</tbody>
 	<tbody><tr><th colspan="4" data-i18n="SETTINGS_OPENPGP/TITLE_PUBLIC">Public keys</th></tr></tbody>
 	<tbody data-bind="foreach: openpgpkeysPublic, i18nUpdate: openpgpkeysPublic">
@@ -127,11 +154,42 @@
 		</tr>
 	</tbody>
 </table>
+<button class="btn" data-bind="click: importToOpenPGP" data-i18n="SETTINGS_OPENPGP/IMPORT_FROM_SERVER"></button>
 </details>
 <!-- /ko -->
 
-<details>
-<summary class="legend">Mailvelope</summary>
+<details style="margin:1em 0">
+<summary style="font-size:larger;font-weight:bold">Mailvelope</summary>
 <a data-bind="visible: !canMailvelope" href="https://mailvelope.com/en/help" target="_blank" data-i18n="SETTINGS_OPENPGP/GET_MAILVELOPE"></a>
 <div id="mailvelope-settings" style="height:40em" data-bind="visible: canMailvelope"></div>
 </details>
+
+<details>
+<summary class="legend" data-i18n="SMIME/CERTIFICATES"></summary>
+<button class="btn" data-bind="click: importToSMime" data-icon="✚" data-i18n="OPENPGP/POPUP_IMPORT_BUTTON"></button>
+
+<table class="table table-hover list-table">
+	<tbody data-bind="foreach: smimeCertificates, i18nUpdate: smimeCertificates">
+		<tr>
+			<td>
+				<span data-bind="visible: smimesign" class="fontastic" data-i18n="[title]CRYPTO/VERIFY">✔</span>
+				<span data-bind="visible: smimeencrypt" class="fontastic" data-i18n="[title]CRYPTO/ENCRYPT">🔒</span>
+				<span class="key-name" data-bind="text: CN"></span>
+				<span class="key-user" data-bind="text: emailAddress"></span>
+				<br/>
+				<span data-i18n="CRYPTO/VALID_UNTIL"></span>:
+				<time data-time-format="FULL" data-bind="time:validTo_time_t"></time>
+			</td>
+<!-- TODO
+			<td>
+				<a class="btn btn-small btn-danger button-confirm-delete" data-bind="css: {'delete-access': askDelete()}, click: remove"
+					data-i18n="GLOBAL/ARE_YOU_SURE"></a>
+			</td>
+			<td>
+				<span class="delete-key fontastic" data-bind="visible: !askDelete(), click: openForDeletion">🗑</span>
+			</td>
+-->
+		</tr>
+	</tbody>
+</table>
+</details>
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 9eb279c1b..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
@@ -3,15 +3,48 @@
 	<span data-bind="saveTrigger: themeTrigger"></span>
 </div>
 <div data-bind="foreach: themesObjects">
-	<figure data-bind="click: function () { $root.theme(name); }, css: { 'selected': selected }">
+	<figure data-bind="click: $root.setTheme, css: { 'selected': selected }">
 		<figcaption data-bind="text: nameDisplay"></figcaption>
 		<img data-bind="attr: { 'src': themePreviewSrc }">
 	</figure>
 </div>
 <br>
 <br>
+<div class="form-horizontal">
+	<div class="legend" data-i18n="SETTINGS_THEMES/LABEL_FONTS"></div>
+	<div class="control-group">
+		<label>Sans-serif</label>
+		<select data-bind="value: fontSansSerif">
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
+			<option value="Arial">Arial</option>
+			<option value="Lucida">Lucida</option>
+			<option value="Tahoma">Tahoma</option>
+			<option value="Trebuchet">Trebuchet</option>
+			<option value="Verdana">Verdana</option>
+		</select>
+	</div>
+	<div class="control-group">
+		<label>Serif</label>
+		<select data-bind="value: fontSerif">
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
+			<option value="Times">Times</option>
+			<option value="Palatino">Palatino</option>
+			<option value="Georgia">Georgia</option>
+		</select>
+	</div>
+	<div class="control-group">
+		<label>Mono</label>
+		<select data-bind="value: fontMono">
+			<option value="" data-i18n="GLOBAL/DEFAULT"></option>
+			<option value="Courier">Courier</option>
+			<option value="Lucida">Lucida</option>
+		</select>
+	</div>
+</div>
+<br>
+<br>
 <div class="form-horizontal" data-bind="visible: background.enabled">
-	<div class="legend" data-i18n="SETTINGS_THEMES/LEGEND_THEMES_CUSTOM"></div>
+	<div class="legend" data-i18n="SETTINGS_THEMES/LABEL_BACKGROUND"></div>
 	<div class="control-group g-ui-user-select-none">
 		<div class="row" data-bind="visible: '' !== background.error()" style="margin-left: 0; margin-bottom: 10px;">
 			<div class="alert alert-error span6" data-bind="text: background.error" style="margin-left: 0"></div>
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 2a04d9b59..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,30 +4,23 @@
 		<div class="playIcon"><div></div></div>
 		<i class="stopIcon fontastic">⏸</i>
 	</div>
-	<div class="accountPlace hide-mobile" data-bind="text: emailTitle()"></div>
-	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, openDropdownTrigger: accountMenuDropdownTrigger">
+	<div class="btn-group dropdown" data-bind="registerBootstrapDropdown: true, initDom: accountMenu">
 		<a id="top-system-dropdown-id" href="#" tabindex="-1" class="btn single btn-block dropdown-toggle">
+			<span class="accountPlace hide-mobile" data-bind="text: accountName(), attr:{ title: accountEmail }"></span>
 			<i class="fontastic" data-bind="css: {'icon-spinner': accountsLoading()}">👤</i>
 <!--
 			<b data-bind="text: accountsUnreadCount, visible: 100 > accountsUnreadCount() && accountsUnreadCount()"></b>
 			<b data-bind="visible: 99 < accountsUnreadCount()">99+</b>
 			&nbsp;
 -->
-			<span class="caret"></span>
 		</a>
-		<ul class="dropdown-menu right-edge" tabindex="-1" role="menu" aria-labelledby="top-system-dropdown-id">
+		<menu class="dropdown-menu right-edge" tabindex="-1" role="menu" aria-labelledby="top-system-dropdown-id">
 
 			<!-- ko foreach: accounts -->
-				<li role="presentation">
-					<a class="account-item" href="#" data-bind="click: $root.accountClick">
-<!--						<b class="pull-right counter" data-bind="visible: count()">
-							<span data-bind="text: count, visible: 100 > count()"></span>
-							<span data-bind="visible: 99 < count()">99+</span>
-						</b>-->
-						<i class="fontastic" data-bind="text: $root.accountEmail() === email ? '✔' : '👤'"></i>
-						<span class="email-title" data-bind="text: email, attr: {title: email}"></span>
-					</a>
-				</li>
+			<li role="presentation">
+				<a class="email-title" href="#" data-bind="click: $root.accountClick, text: label(),
+					attr: {title: email, 'data-unread': unreadEmails, 'data-icon': $root.accountEmail() === email ? '✔' : '👤'}"></a>
+			</li>
 			<!-- /ko -->
 
 			<li class="dividerbar" role="presentation" data-bind="visible: allowAccounts">
@@ -37,21 +30,14 @@
 				<a href="#" tabindex="-1" data-bind="click: contactsClick" data-icon="📇" data-i18n="GLOBAL/CONTACTS"></a>
 			</li>
 			<li role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: settingsClick" data-icon="⚙" data-i18n="TOP_TOOLBAR/BUTTON_SETTINGS"></a>
+				<a href="#" tabindex="-1" data-bind="click: settingsClick" data-icon="⚙" data-i18n="TITLES/SETTINGS"></a>
 			</li>
 			<li role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: settingsHelp">
-					<i class="icon-help"></i>
-					<span data-i18n="TOP_TOOLBAR/BUTTON_HELP"></span>
-				</a>
+				<a href="#" tabindex="-1" data-bind="click: settingsHelp" data-icon="🛈" data-i18n="GLOBAL/HELP"></a>
 			</li>
 			<li class="dividerbar" role="presentation">
-				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="💻" class="show-mobile" data-i18n="MOBILE/BUTTON_DESKTOP_VERSION"></a>
-				<a href="#" tabindex="-1" data-bind="click: toggleLayout" data-icon="📱" class="hide-mobile" data-i18n="MOBILE/BUTTON_MOBILE_VERSION"></a>
-			</li>
-			<li role="presentation">
 				<a href="#" tabindex="-1" data-bind="click: logoutClick" data-icon="⏻" data-i18n="GLOBAL/LOGOUT"></a>
 			</li>
-		</ul>
+		</menu>
 	</div>
 </div>
diff --git a/snappymail/v/0.0.0/cpanel.php b/snappymail/v/0.0.0/cpanel.php
new file mode 100644
index 000000000..4159a4a2d
--- /dev/null
+++ b/snappymail/v/0.0.0/cpanel.php
@@ -0,0 +1,32 @@
+<?php
+
+// cPanel https://github.com/the-djmaze/snappymail/issues/697
+if (defined('APP_PLUGINS_PATH') && !empty($_ENV['CPANEL']) && !is_dir(APP_PLUGINS_PATH.'login-cpanel')) {
+	$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
+	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+
+	$oConfig = \RainLoop\Api::Config();
+	$oConfig->Set('plugins', 'enable', true);
+	$oConfig->Set('login', 'default_domain', 'cpanel');
+	$oConfig->Set('logs', 'path', $_ENV['HOME'] . '/logs/snappymail');
+	$oConfig->Set('cache', 'path', $_ENV['TMPDIR'] . '/snappymail');
+
+	\SnappyMail\Repository::installPackage('plugin', 'login-cpanel');
+	\SnappyMail\Repository::enablePackage('login-cpanel');
+
+	$sFile = APP_PRIVATE_DATA.'domains/cpanel.json';
+	if (!file_exists($sFile)) {
+		$config = json_decode(file_get_contents(__DIR__ . '/app/domains/default.json'), true);
+		$config['IMAP']['shortLogin'] = true;
+		$config['SMTP']['shortLogin'] = true;
+		file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
+	}
+
+//	\RainLoop\Api::Actions()->Plugins()->loadPlugin('login-cpanel');
+	if (!isset($_GET['installed'])) {
+		\header('Location: ?cPanelAutoLogin&installed');
+		exit;
+	}
+
+	$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
+}
diff --git a/snappymail/v/0.0.0/imapsync.php b/snappymail/v/0.0.0/imapsync.php
new file mode 100755
index 000000000..3fcc1012c
--- /dev/null
+++ b/snappymail/v/0.0.0/imapsync.php
@@ -0,0 +1,204 @@
+#!/usr/bin/php
+<?php
+/*
+https://imapsync.lamiral.info/README
+imapsync.php \
+  --host1 test1.snappymail.eu \
+  --user1 test1               \
+  --password1 "secret1"       \
+  --host2 test2.snappymail.eu \
+  --user2 test2               \
+  --password2 "secret2"
+*/
+
+use MailSo\Net\Enumerations\ConnectionSecurityType as SecurityType;
+
+if ('cli' !== PHP_SAPI || 4 > \count($_SERVER['argv']) || \in_array('--help', $_SERVER['argv'])) {
+echo 'OPTIONS
+
+    usage: imapsync.php [options]
+
+    The standard options are the six values forming the credentials. Three
+    values on each side are needed to login into the IMAP servers. These six
+    values are a hostname, a username, and a password, two times.
+
+  OPTIONS/credentials
+
+     --host1        : Source or "from" imap server.
+     --port1        : Port to connect on host1.
+                      Optional since default ports are the
+                      well known ports imap/143 or imaps/993.
+     --user1        : User to login on host1.
+     --password1    : Password of user1.
+
+     --host2        : "destination" imap server.
+     --port2        : Port to connect on host2. Optional
+     --user2        : User to login on host2.
+     --password2    : Password of user2.
+
+    If you don\'t pass the user1 password via --password1 then imapsync will
+    prompt to enter the password on the terminal. Same thing for user2 password.
+
+  OPTIONS/encryption
+
+     --nossl1       : Do not use a SSL connection on host1.
+     --ssl1         : Use a SSL connection on host1. On by default if possible.
+
+     --nossl2       : Do not use a SSL connection on host2.
+     --ssl2         : Use a SSL connection on host2. On by default if possible.
+
+     --notls1       : Do not use a TLS connection on host1.
+     --tls1         : Use a TLS connection on host1. On by default if possible.
+
+     --notls2       : Do not use a TLS connection on host2.
+     --tls2         : Use a TLS connection on host2. On by default if possible.
+
+  OPTIONS/folders
+
+     --rootfolder   : prepend this name to each target folder.
+                      Like "INBOX" becomes "test.INBOX"
+
+  OPTIONS/behavior
+
+     --timeout1     : Connection timeout in seconds for host1.
+                      Default is 300 and 0 means no timeout at all.
+     --timeout2     : Connection timeout in seconds for host2.
+                      Default is 300 and 0 means no timeout at all.
+
+     --justconnect  : Just connect to both servers and print useful information.
+
+     --justlogin    : Just login to both host1 and host2 with users
+                      credentials, then exit.
+
+     --help         : print this help.
+
+';
+	exit;
+}
+
+// php.net/getopt doesn't allow spaced values like `--host1 example.com`
+// and we also ask on the command line when value is empty
+function get_opt(string $short_options, array $long_options) {
+	$opts = [];
+	foreach ($long_options as $option) {
+		$key = \rtrim($option,':');
+		$arg = "--{$key}";
+		$optional = 2 === \substr_count($option, ':');
+		$required = 1 === \substr_count($option, ':');
+		foreach ($_SERVER['argv'] as $i => $v) {
+			if ($v === $arg) {
+				if ($required || $optional) {
+					$opts[$key] = '';
+					if (!empty($_SERVER['argv'][$i+1]) && '--' != \substr($_SERVER['argv'][$i+1], 0, 2)) {
+						$opts[$key] = $_SERVER['argv'][$i+1];
+					}
+				} else {
+					$opts[$key] = true;
+				}
+			} else if (($required || $optional) && 0 === \strpos($v, "{$arg}=")) {
+				$opts[$key] = \substr($v, 1+\strlen($arg));
+			}
+		}
+		// When empty, prompt on command line for value
+		if (($required && empty($opts[$key]))
+		 || ($optional && isset($opts[$key]) && !\strlen($opts[$key]))
+		) {
+			if (\is_callable('readline')) {
+				$opts[$key] = \readline("{$key}: ");
+			} else {
+				echo "{$key}: ";
+				$opts[$key] = \stream_get_line(STDIN, 1024, PHP_EOL);
+			}
+			if ($required && empty($opts[$key])) {
+				exit("Missing required argument {$arg}");
+			}
+		}
+	}
+	return $opts;
+}
+$options = get_opt('', [
+	// Source or "from" imap server.
+	'host1::',
+	'port1::',
+	'user1:',
+	'password1:',
+	'nossl1',
+	'ssl1',
+	'notls1',
+	'tls1',
+	'timeout1::',
+
+	// "destination" imap server.
+	'host2::',
+	'port2::',
+	'user2:',
+	'password2:',
+	'nossl2',
+	'ssl2',
+	'notls2',
+	'tls2',
+	'timeout2::',
+	'rootfolder::',
+
+	// global
+	'justconnect',
+	'justlogin'
+]);
+
+chdir(__DIR__);
+define('APP_VERSION', basename(__DIR__));
+$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+require __DIR__ . '/include.php';
+
+function getImapClient(int $host)
+{
+	global $options;
+
+	$type = SecurityType::AUTO_DETECT;
+	if (isset($options["tls{$host}"])) {
+		$type = SecurityType::STARTTLS;
+	} else if (isset($options["ssl{$host}"])) {
+		$type = SecurityType::SSL;
+	} else if (isset($options["notls{$host}"])) {
+		$type = SecurityType::NONE;
+	}
+	$ImapSettings = \MailSo\Imap\Settings::fromArray([
+		'host' => $options["host{$host}"] ?? 'localhost',
+		'port' => $options["port{$host}"] ?? 143,
+		'type' => $type,
+//		'sasl' => [],
+		'ssl' => []
+	]);
+	if (993 === $ImapSettings->port) {
+		$ImapSettings->type = SecurityType::SSL;
+	} else if (143 === $ImapSettings->port && SecurityType::SSL == $ImapSettings->type) {
+		$ImapSettings->port = 993;
+	}
+	if (isset($options["timeout{$host}"])) {
+		$ImapSettings->timeout = (int) $options["timeout{$host}"];
+	}
+	$ImapSettings->Login = $options["user{$host}"]; // convert to punycode?
+	$ImapSettings->Password = $options["password{$host}"];
+	$ImapSettings->useAuth = true;
+
+	$oImapClient = new \MailSo\Imap\ImapClient;
+//	$oAccount = new \RainLoop\Model\Account;
+	$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));
+	if (!isset($options['justconnect'])) {
+//		$oPlugins->RunHook('imap.before-login', array($oAccount, $oImapClient, $ImapSettings));
+		$oImapClient->Login($ImapSettings);
+//		$oPlugins->RunHook('imap.after-login', array($oAccount, $oImapClient, $bResult, $ImapSettings));
+	}
+	return $oImapClient;
+}
+
+$oSync = new \SnappyMail\Imap\Sync;
+$oSync->oImapSource = getImapClient(1);
+$oSync->oImapTarget = getImapClient(2);
+
+if (!isset($options['justconnect']) && !isset($options['justlogin'])) {
+	$oSync->import($options['rootfolder'] ?? '');
+}
diff --git a/snappymail/v/0.0.0/include.php b/snappymail/v/0.0.0/include.php
index e502ef467..724c81312 100644
--- a/snappymail/v/0.0.0/include.php
+++ b/snappymail/v/0.0.0/include.php
@@ -3,40 +3,20 @@ 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')) {
 	define('APP_VERSION', basename(__DIR__));
 }
+if (!defined('SNAPPYMAIL_DEV')) {
+	define('SNAPPYMAIL_DEV', '0.0.0' === APP_VERSION);
+}
 
 if (!defined('APP_INDEX_ROOT_PATH')) {
 	define('APP_INDEX_ROOT_PATH', dirname(dirname(dirname(__DIR__))) . DIRECTORY_SEPARATOR);
@@ -45,20 +25,17 @@ 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);
 
 date_default_timezone_set('UTC');
 
-define('APP_DUMMY', '********');
-
 $sCustomDataPath = '';
 $sCustomConfiguration = '';
 
-if (is_file(APP_INDEX_ROOT_PATH.'include.php'))
-{
+if (is_file(APP_INDEX_ROOT_PATH.'include.php')) {
 	include_once APP_INDEX_ROOT_PATH.'include.php';
 }
 
@@ -72,36 +49,56 @@ if (defined('MULTIDOMAIN')) {
 define('APP_PRIVATE_DATA_NAME', $sPrivateDataFolderInternalName ?: '_default_');
 unset($sPrivateDataFolderInternalName);
 
-defined('APP_USE_APCU_CACHE') || define('APP_USE_APCU_CACHE', true);
-
 if (!defined('APP_DATA_FOLDER_PATH')) {
-	$sCustomDataPath = function_exists('__get_custom_data_full_path') ? rtrim(trim(__get_custom_data_full_path()), '\\/') : $sCustomDataPath;
+	$sCustomDataPath = rtrim(trim(function_exists('__get_custom_data_full_path') ? __get_custom_data_full_path() : $sCustomDataPath), '\\/');
 	define('APP_DATA_FOLDER_PATH', strlen($sCustomDataPath) ? $sCustomDataPath.'/' : APP_INDEX_ROOT_PATH.'data/');
-	unset($sCustomDataPath);
 }
+unset($sCustomDataPath);
 
 if (!defined('APP_CONFIGURATION_NAME')) {
 	define('APP_CONFIGURATION_NAME', function_exists('__get_additional_configuration_name')
 		? trim(__get_additional_configuration_name()) : $sCustomConfiguration);
-	unset($sCustomConfiguration);
 }
+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/');
+
+	if (false === set_include_path(SNAPPYMAIL_LIBRARIES_PATH . PATH_SEPARATOR . get_include_path())) {
+		exit('set_include_path() failed. Probably due to Apache config using php_admin_value instead of php_value');
+	}
+
+	spl_autoload_extensions('.php');
+	/** lowercase autoloader */
+	spl_autoload_register();
+	/** case-sensitive autoloader */
+	spl_autoload_register(function($sClassName){
+		$file = SNAPPYMAIL_LIBRARIES_PATH . strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php';
+//		if ($file = stream_resolve_include_path(strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php')) {
+		if (is_file($file)) {
+			include_once $file;
+		}
+	});
+}
 
 // installation checking data folder
 if (APP_VERSION !== (is_file(APP_DATA_FOLDER_PATH.'INSTALLED') ? file_get_contents(APP_DATA_FOLDER_PATH.'INSTALLED') : '')
  || !is_dir(APP_PRIVATE_DATA))
 {
-	include APP_VERSION_ROOT_PATH.'setup.php';
+	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
@@ -122,51 +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 (!defined('RAINLOOP_APP_LIBRARIES_PATH')) {
-	define('RAINLOOP_APP_LIBRARIES_PATH', rtrim(realpath(__DIR__), '\\/').'/app/libraries/');
-
-	if (false === set_include_path(RAINLOOP_APP_LIBRARIES_PATH . PATH_SEPARATOR . get_include_path())) {
-		exit('set_include_path() failed. Probably due to Apache config using php_admin_value instead of php_value');
-	}
-
-	spl_autoload_extensions('.php');
-	/** lowercase autoloader */
-	spl_autoload_register();
-	/** case-sensitive autoloader */
-	spl_autoload_register(function($sClassName){
-		$file = RAINLOOP_APP_LIBRARIES_PATH . strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php';
-//		if ($file = stream_resolve_include_path(strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php')) {
-		if (is_file($file)) {
-			include_once $file;
-		}
-	});
-}
-
-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 c8186e54e..e02250ab3 100644
--- a/snappymail/v/0.0.0/setup.php
+++ b/snappymail/v/0.0.0/setup.php
@@ -1,63 +1,21 @@
 <?php
 
-if (defined('APP_VERSION'))
-{
-	if (PHP_VERSION_ID  < 70300)
-	{
-		echo '<p style="color: red">';
-		echo '[301] Your PHP version ('.PHP_VERSION.') is lower than the minimal required 7.3.0!';
-		echo '</p>';
-		exit(301);
-	}
+require_once __DIR__ . '/app/libraries/snappymail/integrity.php';
 
-	$aOptional = array(
-		'cURL' => extension_loaded('curl'),
-		'exif' => extension_loaded('exif'),
-		'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')
-	);
+$result = \SnappyMail\Integrity::phpVersion();
+if ($result) {
+	echo '<p style="color: red">[301] ' . $result . '</p>';
+	exit(301);
+}
 
-	$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')
-	);
-
-	if (in_array(false, $aRequirements))
-	{
-		echo '<p>[302] The following PHP extensions are not available in your PHP configuration!</p>';
-
-		echo '<ul>';
-		foreach ($aRequirements as $sKey => $bValue)
-		{
-			if (!$bValue)
-			{
-				echo '<li>'.$sKey.'</li>';
-			}
-		}
-		echo '</ul>';
-
-		exit(302);
-	}
+$result = \SnappyMail\Integrity::phpExtensions();
+if ($result) {
+	echo '<p>[302] The following PHP extensions are not available in your PHP configuration!</p>';
+	echo '<ul><li>' . \implode('</li>li><li>', $result) . '</li></ul>';
+	exit(302);
+}
 
+if (defined('APP_VERSION')) {
 	$sCheckName = 'delete_if_you_see_it_after_install';
 	$sCheckFolder = APP_DATA_FOLDER_PATH.$sCheckName;
 	$sCheckFilePath = APP_DATA_FOLDER_PATH.$sCheckName.'/'.$sCheckName.'.file';
@@ -65,13 +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 = '';
@@ -79,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);
 	}
 
@@ -112,18 +74,14 @@ if (defined('APP_VERSION'))
 	file_put_contents(APP_DATA_FOLDER_PATH.'INSTALLED', APP_VERSION);
 	file_put_contents(APP_DATA_FOLDER_PATH.'index.html', 'Forbidden');
 	file_put_contents(APP_DATA_FOLDER_PATH.'index.php', 'Forbidden');
-	if (!is_file(APP_DATA_FOLDER_PATH.'.htaccess') && is_file(APP_VERSION_ROOT_PATH.'app/.htaccess'))
-	{
-		copy(APP_VERSION_ROOT_PATH.'app/.htaccess', APP_DATA_FOLDER_PATH.'.htaccess');
+	if (!is_file(APP_DATA_FOLDER_PATH.'.htaccess') && is_file(__DIR__ . '/app/.htaccess')) {
+		copy(__DIR__ . '/app/.htaccess', APP_DATA_FOLDER_PATH.'.htaccess');
 	}
 
-	if (!is_dir(APP_PRIVATE_DATA))
-	{
+	if (!is_dir(APP_PRIVATE_DATA)) {
 		mkdir(APP_PRIVATE_DATA, 0700, true);
 		file_put_contents(APP_PRIVATE_DATA.'.htaccess', 'Require all denied');
-	}
-	else if (is_dir(APP_PRIVATE_DATA.'cache'))
-	{
+	} else if (is_dir(APP_PRIVATE_DATA.'cache')) {
 		foreach (new RecursiveIteratorIterator(
 			new RecursiveDirectoryIterator(APP_PRIVATE_DATA.'cache', FilesystemIterator::SKIP_DOTS),
 			RecursiveIteratorIterator::CHILD_FIRST) as $sName) {
@@ -132,32 +90,44 @@ if (defined('APP_VERSION'))
 		clearstatcache();
 	}
 
-	foreach (array('logs', 'cache', 'configs', 'domains', 'plugins', 'storage') as $sName)
-	{
-		if (!is_dir(APP_PRIVATE_DATA.$sName))
-		{
+	foreach (array('configs', 'domains', 'plugins', 'storage') as $sName) {
+		if (!is_dir(APP_PRIVATE_DATA.$sName)) {
 			mkdir(APP_PRIVATE_DATA.$sName, 0700, true);
 		}
 	}
 
-	if (!file_exists(APP_PRIVATE_DATA.'domains/disabled') && is_dir(APP_PRIVATE_DATA.'domains'))
-	{
-		$sFile = $sNewFile = '';
-		$aFiles = glob(APP_VERSION_ROOT_PATH.'app/domains/*');
-		if ($aFiles)
-		{
-			foreach ($aFiles as $sFile)
-			{
-				if (is_file($sFile))
-				{
+	if (!file_exists(APP_PRIVATE_DATA.'domains/disabled') && is_dir(APP_PRIVATE_DATA.'domains')) {
+		$aFiles = glob(__DIR__ . '/app/domains/*');
+		if ($aFiles) {
+			foreach ($aFiles as $sFile) {
+				if (is_file($sFile)) {
 					$sNewFile = APP_PRIVATE_DATA.'domains/'.basename($sFile);
-					if (!file_exists($sNewFile))
-					{
+					if (!file_exists($sNewFile)) {
 						copy($sFile, $sNewFile);
 					}
 				}
 			}
 		}
-		unset($aFiles, $sFile, $sNewFile);
+
+		$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);
+			$config['IMAP']['shortLogin'] = true;
+			$config['SMTP']['shortLogin'] = true;
+			file_put_contents($sFile, json_encode($config, JSON_PRETTY_PRINT));
+		}
 	}
+
+	if (defined('SNAPPYMAIL_UPDATE_PLUGINS')) {
+		// Update plugins
+		$asApi = !empty($_ENV['SNAPPYMAIL_INCLUDE_AS_API']);
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+		$aList = \SnappyMail\Repository::getEnabledPackagesNames();
+		foreach ($aList as $sId) {
+			\SnappyMail\Repository::installPackage('plugin', $sId);
+		}
+		$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = $asApi;
+	}
+
 }
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 @@
+<IfModule !LiteSpeed>
+	<IfModule mod_headers.c>
+		<IfModule mod_rewrite.c>
+			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]
+
+			<FilesMatch "\.(js|css)\.br$">
+				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
+			</FilesMatch>
+
+			<FilesMatch "\.(js|css)\.gz$">
+				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
+			</FilesMatch>
+
+			<FilesMatch "\.js\.(br|gz)$">
+				Header set Content-Type "application/javascript; charset=utf-8"
+				ForceType application/javascript
+			</FilesMatch>
+			<FilesMatch "\.css\.(br|gz)$">
+				Header set Content-Type "text/css; charset=utf-8"
+				ForceType text/css
+			</FilesMatch>
+		</IfModule>
+	</IfModule>
+</IfModule>
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/snappymail/v/0.0.0/static/favicon.png b/snappymail/v/0.0.0/static/favicon.png
new file mode 100644
index 000000000..78ab30b38
Binary files /dev/null and b/snappymail/v/0.0.0/static/favicon.png differ
diff --git a/snappymail/v/0.0.0/static/favicon.svg b/snappymail/v/0.0.0/static/favicon.svg
new file mode 100644
index 000000000..0d550c91a
--- /dev/null
+++ b/snappymail/v/0.0.0/static/favicon.svg
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg version="1.0" width="512pt" height="512pt" viewBox="0 0 512.000000 512.000000" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg">
+<style>path,rect{fill:#000000}@media(prefers-color-scheme:dark){path,rect{fill:#ffffff}rect{transform:scale(1,-1)}}</style>
+<g transform="translate(0.000000,512.000000) scale(0.100000,-0.100000)" stroke="none"><path d="M933 3908 c-150 -150 -276 -281 -279 -291 -5 -16 51 -77 272 -298 l279 -279 177 0 c98 0 178 3 178 7 0 4 -89 97 -197 206 -157 157 -195 200 -183 207 9 6 257 10 613 10 l597 0 0 134 c0 113 -2 135 -16 140 -9 3 -283 6 -610 6 -327 0 -594 3 -594 8 0 4 90 97 199 206 110 110 198 203 195 208 -3 4 -84 8 -181 8 l-176 0 -274 -272z"/><path d="M3560 4173 c0 -4 88 -96 196 -204 115 -115 194 -201 190 -208 -5 -8 -178 -11 -611 -11 -540 0 -603 -2 -609 -16 -3 -9 -6 -67 -6 -129 0 -103 2 -115 19 -125 13 -6 224 -10 615 -10 328 0 596 -3 596 -8 0 -4 -90 -97 -200 -207 -110 -110 -200 -203 -200 -207 0 -5 82 -8 182 -8 l182 0 285 286 285 285 -285 285 -284 284 -177 0 c-98 0 -178 -3 -178 -7z"/><path d="M640 2317 l0 -1163 28 -27 28 -27 1865 0 1865 0 27 28 27 28 0 1156 c0 636 -4 1159 -8 1162 -5 3 -41 -27 -80 -67 l-72 -72 -2 -1030 -3 -1030 -1755 0 -1755 0 -3 1030 -2 1030 -72 72 c-40 40 -76 73 -80 73 -5 0 -8 -523 -8 -1163z"/><path d="M1290 2972 c0 -4 84 -92 188 -195 l187 -187 895 0 895 0 188 188 c103 103 187 191 187 195 0 4 -75 7 -168 7 l-168 0 -69 -70 -69 -70 -796 0 -796 0 -69 70 -69 70 -168 0 c-93 0 -168 -3 -168 -8z"/><rect width="105.70417" height="113.39262" x="965.82471" y="-1995.0565" ry="0"/><rect width="105.70417" height="113.39262" x="968.17059" y="-1775.3387" ry="0"/><rect width="105.70417" height="113.39262" x="1544.7432" y="-1770.8339" ry="0"/><rect width="105.70417" height="113.39262" x="1201.2841" y="-2214.6541" ry="0"/><rect width="105.70417" height="113.39262" x="1529.8855" y="-2211.1558" ry="0"/><rect width="105.70417" height="113.39262" x="1766.1398" y="-2213.186" ry="0"/><rect width="105.70417" height="113.39262" x="1767.3953" y="-1976.6418" ry="0"/><rect width="105.70417" height="113.39262" x="2112.5291" y="-2219.311" ry="0"/><rect width="105.70417" height="113.39262" x="2677.8127" y="-2214.9653" ry="0"/><rect width="105.70417" height="113.39262" x="2672.6284" y="-1988.6554" ry="0"/><rect width="105.70417" height="113.39262" x="2673.4526" y="-1762.207" ry="0"/><rect width="105.70417" height="113.39262" x="2898.8728" y="-2216.2759" ry="0"/><rect width="105.70417" height="113.39262" x="3249.094" y="-2212.2566" ry="0"/><rect width="105.70417" height="113.39262" x="3251.0608" y="-1984.4783" ry="0"/><rect width="105.70417" height="113.39262" x="3251.5601" y="-1774.9227" ry="0"/><rect width="105.70417" height="113.39262" x="3470.1848" y="-2214.272" ry="0"/><rect width="105.70417" height="113.39262" x="3829.9443" y="-2215.0381" ry="0"/><rect width="105.70417" height="113.39262" x="4044.0989" y="-2214.53" ry="0"/><rect width="105.70417" height="113.39262" x="4041.5127" y="-1999.0615" ry="0"/><rect width="105.70417" height="113.39262" x="4043.4043" y="-1785.1989" ry="0"/><rect width="105.70417" height="113.39262" x="3830.5203" y="-1781.4473" ry="0"/></g>
+</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,<svg xmlns='http://www.w3.org/2000/svg' viewBox='3 3 18 18'><path d='M10,17L5,12L6.41,10.58L10,14.17L17.59,6.58L19,8M19,3H5C3.89,3 3,3.89 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5C21,3.89 20.1,3 19,3Z'></path></svg>");
+	-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,<svg height='29' width='64' fill-rule='evenodd' stroke-linecap='round' stroke-linejoin='round' version='1.1' xmlns='http://www.w3.org/2000/svg'><path d='m32.028 0c-6.6304 0-12.249 4.4952-13.991 10.564-1.5172-3.259-4.7762-5.5066-8.5971-5.5066-5.1694 0-9.4398 4.2704-9.4398 9.496s4.2704 9.4961 9.496 9.4961c3.7647 0 7.0799-2.2476 8.5971-5.5066 1.6856 6.0685 7.3046 10.564 13.935 10.564 6.5742 0 12.193-4.4389 13.991-10.451 1.5171 3.1466 4.7761 5.338 8.4846 5.338 5.2257 0 9.4961-4.2704 9.4961-9.4961s-4.2704-9.4398-9.4961-9.4398c-3.7085 0-6.9675 2.1914-8.4846 5.338-1.7981-5.9561-7.3608-10.395-13.991-10.395zm0 5.5628c5.0009 0 8.9903 3.9894 8.9903 8.9903s-3.9894 8.9904-8.9903 8.9904-8.9903-3.9895-8.9903-8.9904 3.9894-8.9903 8.9903-8.9903zm-22.532 5.057c2.1914 0 3.9333 1.7419 3.9333 3.9333s-1.7419 3.9333-3.9333 3.9333-3.9332-1.7419-3.9332-3.9333 1.7419-3.9333 3.9332-3.9333zm45.008 0c2.1915 0 3.9333 1.7419 3.9333 3.9333s-1.7418 3.9333-3.9333 3.9333-3.9332-1.7419-3.9332-3.9333c0.0562-2.1914 1.7418-3.9333 3.9332-3.9333z' fill-rule='nonzero'></path></svg>");
+	-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 2ea19b377..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,25 +125,12 @@ 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,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>");
-}
-
-hr {
-	border-color: #666;
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
 #messageItem .b-text-part blockquote,
diff --git a/snappymail/v/0.0.0/themes/SquaresDark/styles.css b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
index fca5157b3..a570ee3d8 100644
--- a/snappymail/v/0.0.0/themes/SquaresDark/styles.css
+++ b/snappymail/v/0.0.0/themes/SquaresDark/styles.css
@@ -1,9 +1,16 @@
 
 :root {
+	color-scheme: dark;
+
 	/* 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;
@@ -42,8 +49,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: #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 {
@@ -59,77 +81,24 @@
 }
 
 .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);
+	background-image: linear-gradient(to bottom,#444,#111) !important;
 }
 
 .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 {
 	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;
-}
-.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,
-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;
+	border-color: #333;
+	border-top-color: #ccc;
 }
 
 .messageListItem {
 	border-left-color: #111;
-    color: #EEE;
 }
 
 .table-hover tbody tr:hover td,
@@ -146,28 +115,15 @@ 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: #000;
-    border-color: #aaa;
-    color: #fff;
-}
 .select, select {
-    background-image: url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(255,255,255)'>▾</text></svg>");
-}
-
-hr {
-	border-color: #666;
+	background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoMjU1LDI1NSwyNTUpJz7ilr48L3RleHQ+PC9zdmc+);
 }
 
 #messageItem .b-text-part blockquote,
 .b-settings-general .editMainIdentity {
-    border-color: #999;
+	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 8e1cd8975..a6c95f7b5 100644
--- a/snappymail/v/0.0.0/themes/example.css
+++ b/snappymail/v/0.0.0/themes/example.css
@@ -1,36 +1,55 @@
 
 :root {
-/* MAIN */
+	color-scheme: light;
+
+	/* MAIN */
 	--main-color: #333;
 	--main-bg-color: #e3e3e3;
 	--main-bg-image: none; /* url("images/background.png"); */
 	--main-bg-size: auto;
 	--main-bg-repeat: repeat;
+	--main-font-size: 14px;
 	--link-color: #369;
+	--border-color: #ddd;
+	--border-radius: 5px;
+	--hr-color: #eee;
 
-/* LOADING */
+	--panel-bg-clr: #fff;
+
+	--warning-clr: #c09853;
+	--warning-bg-clr: #fcf8e3;
+	--warning-border-clr: #fbeed5;
+
+	--error-clr: #b94a48;
+	--error-bg-clr: #f2dede;
+	--error-border-clr: #eed3d7;
+
+	--info-clr: #3a87ad;
+	--info-bg-clr: #d9edf7;
+	--info-border-clr: #bce8f1;
+
+	/* LOADING */
 	--loading-color: #000;
 	--loading-text-shadow: none; /* 0px 1px 0px rgba(0, 0, 0, 0.5); */
 
-/* LOGIN */
+	/* LOGIN */
 	--login-color: #555;
 	--login-bg-color: #eee;
 	--login-box-shadow: none; /* 0px 2px 10px rgba(0,0,0,0.5) */
 	--login-border: 1px solid #ccc;
 	--login-border-radius: 7px;
-	--login-gradient-start: none; /* #f4f4f4 */
-	--login-gradient-end: none;   /* #dfdfdf */
 
 	--spinner-color: #fff;
 
-/* MENU */
+	/* MENU */
 	--dropdown-menu-color: #333;
 	--dropdown-menu-bg-color: #fff;
 	--dropdown-menu-hover-bg-color: #444;
 	--dropdown-menu-hover-color: #eee;
 	--dropdown-menu-disabled-color: #999;
+	--dropdown-menu-border-clr: rgba(0,0,0,.2);
 
-/* FOLDERS */
+	/* FOLDERS */
 	--folders-color: #333;
 	--folders-disabled-color: #666;
 	--folders-selected-color: #eee;
@@ -41,19 +60,48 @@
 	--folders-hover-bg-color: false;
 	--folders-drop-color: #eee;
 	--folders-drop-bg-color: #333;
+	--unread-count-color: #fff;
+	--unread-count-bg-color: #333;
 
-/* SETTINGS */
+	/* SETTINGS */
 	--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-list-toolbar-gradient-start: none; /* #f4f4f4 */
-	--message-list-toolbar-gradient-end: none;   /* #dfdfdf */
+	--message-header-bg-clr: #f8f8f8;
 
-/* MESSAGE */
-	--message-bg-color: #fff;
+	/* DIALOGS */
+	--dialog-clr: #333;
+	--dialog-bg-clr: #fff;
+	--dialog-border-clr: rgba(0,0,0,.3);
+	--dialog-border-radius: 6px;
+
+	/* FORMS */
+	--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;
+
+	--input-clr: #555;
+	--input-bg-clr: #fff;
+	--input-border-clr: #ccc;
+	--input-border-radius: 3px;
+	--input-focus-border-clr: #999;
+
+	/* TABLES */
+	--tr-hover-bg-clr: #f5f5f5;
+	--tr-odd-bg-clr: #f9f9f9; /* when striped */
+
+	/* TABS */
+	--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 bf8759635..000000000
--- a/tasks/assets.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
-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 2ddb6ca0d..3ad2894a3 100644
--- a/tasks/common.js
+++ b/tasks/common.js
@@ -1,17 +1,8 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
-const gulp = require('gulp');
+/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 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 aab20f878..02aa050a6 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -1,6 +1,5 @@
-/* SnappyMail Webmail (c) SnappyMail Team | Licensed under AGPL 3 */
+/* SnappyMail Webmail (c) SnappyMail Team | Licensed under MIT */
 const path = require('path');
-const { argv } = require('yargs');
 
 const config = {
 	head: {
@@ -15,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',
@@ -61,7 +55,6 @@ config.paths.js = {
 		name: 'libs.js',
 		src: [
 			'dev/prototype.js',
-			'dev/External/ifvisible.js',
 			'dev/dragdropgecko.js',
 			'dev/shortcuts.js',
 			'vendors/routes/hasher.js',
@@ -69,7 +62,10 @@ config.paths.js = {
 			'vendors/jua/jua.js',
 			'vendors/bootstrap/js/bootstrap.native.js',
 			'vendors/knockout/build/output/knockout-latest.js',
-			'vendors/squire/build/squire-raw.js',
+//			'vendors/knockout/build/output/knockout-latest.debug.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 62e05acc3..498130ea7 100644
--- a/tasks/css.js
+++ b/tasks/css.js
@@ -1,4 +1,4 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 const gulp = require('gulp');
 
 const concat = require('gulp-concat');
@@ -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 f1f565e87..a150487f2 100644
--- a/tasks/js.js
+++ b/tasks/js.js
@@ -1,8 +1,8 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+/* RainLoop Webmail (c) RainLoop Team | Licensed under MIT */
 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 ebf8407c3..b4cc1f37c 100644
--- a/tasks/rollup.js
+++ b/tasks/rollup.js
@@ -1,15 +1,14 @@
-/* SnappyMail Webmail (c) SnappyMail Team | Licensed under AGPL 3 */
+/* SnappyMail Webmail (c) SnappyMail Team | Licensed under AGPL v3 */
 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 c05cb916e..fbb8286a0 100644
--- a/tasks/vendors.js
+++ b/tasks/vendors.js
@@ -1,7 +1,5 @@
-/* RainLoop Webmail (c) RainLoop Team | Licensed under AGPL 3 */
+/* 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 @@
+<?php
+
+// Run with: php test/header-unfold.php
+// RFC 5322 unfolding keeps the folding whitespace; RFC 2047 drops only the
+// whitespace BETWEEN two encoded words. A plain word followed by a folded
+// encoded word lost its space: "de vos\r\n =?utf-8?Q?=C3=A9quipements?="
+// was shown as "voséquipements" (Symfony Mailer folds subjects this way).
+define('APP_VERSION', 'test');
+spl_autoload_register(static function (string $class): void {
+	if (str_starts_with($class, 'SnappyMail\\')) {
+		$file = dirname(__DIR__).'/snappymail/v/0.0.0/app/libraries/snappymail/'.strtolower(str_replace('\\', '/', substr($class, 11))).'.php';
+	} else {
+		$file = dirname(__DIR__).'/snappymail/v/0.0.0/app/libraries/'.str_replace('\\', '/', $class).'.php';
+	}
+	if (is_file($file)) {
+		require_once $file;
+	}
+});
+
+function check(bool $condition, string $message): void
+{
+	if (!$condition) {
+		throw new RuntimeException($message);
+	}
+}
+
+function subject(string $raw): string
+{
+	$headers = new \MailSo\Mime\HeaderCollection("Subject: {$raw}\r\nX-Next: 1\r\n");
+	return (string) $headers->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/test/sasl.php b/test/sasl.php
new file mode 100644
index 000000000..f36d238e4
--- /dev/null
+++ b/test/sasl.php
@@ -0,0 +1,25 @@
+<?php
+//$_ENV['SNAPPYMAIL_INCLUDE_AS_API'] = true;
+//require '../index.php';
+
+define('SNAPPYMAIL_LIBRARIES_PATH', dirname(__DIR__) . '/snappymail/v/0.0.0/app/libraries');
+if (false === set_include_path(SNAPPYMAIL_LIBRARIES_PATH . PATH_SEPARATOR . get_include_path())) {
+	exit('set_include_path() failed. Probably due to Apache config using php_admin_value instead of php_value');
+}
+spl_autoload_extensions('.php');
+/** lowercase autoloader */
+spl_autoload_register();
+/** case-sensitive autoloader */
+spl_autoload_register(function($sClassName){
+	$file = SNAPPYMAIL_LIBRARIES_PATH . strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php';
+//		if ($file = stream_resolve_include_path(strtr($sClassName, '\\', DIRECTORY_SEPARATOR) . '.php')) {
+	if (is_file($file)) {
+		include_once $file;
+	}
+});
+
+$LOGIN = new \SnappyMail\SASL\Login;
+$LOGIN->base64 = true;
+var_dump($LOGIN->authenticate('john', 'doe', 'VXNlcm5hbWU6'));
+var_dump($LOGIN->authenticate('john', 'doe', 'VXNlcm5hbWU6CG'));
+var_dump($LOGIN->authenticate('john', 'doe', 'UGFzc3dvcmQ6'));
diff --git a/vendors/bootstrap/js/bootstrap.native.js b/vendors/bootstrap/js/bootstrap.native.js
index 335daaf63..5a94d7722 100644
--- a/vendors/bootstrap/js/bootstrap.native.js
+++ b/vendors/bootstrap/js/bootstrap.native.js
@@ -5,7 +5,9 @@
 	*/
 
 (doc => {
-	const setFocus = element => element.focus ? element.focus() : element.setActive();
+	const
+		setFocus = element => element.focus ? element.focus() : element.setActive(),
+		isArrow = e => 'ArrowUp' === e.key || 'ArrowDown' === e.key;
 
 	this.BSN = {
 		Dropdown: function(toggleBtn) {
@@ -13,11 +15,11 @@
 			const self = this,
 				parent = toggleBtn.parentNode,
 				preventEmptyAnchor = e => {
-					const t = e.target, href = t.href || (t.parentNode && t.parentNode.href);
-					(href && href.slice(-1) === '#') && e.preventDefault();
+					const t = e.target;
+					('#' === (t.href || t.parentNode?.href)?.slice(-1)) && e.preventDefault();
 				},
 				open = bool => {
-					menu && menu.classList.toggle('show', bool);
+					menu?.classList.toggle('show', bool);
 					parent.classList.toggle('show', bool);
 					toggleBtn.setAttribute('aria-expanded', bool);
 					toggleBtn.open = bool;
@@ -28,14 +30,14 @@
 					}
 				},
 				toggleEvents = () => {
-					let action = (toggleBtn.open ? 'add' : 'remove') + 'EventListener';
+					const action = (toggleBtn.open ? 'add' : 'remove') + 'EventListener';
 					doc[action]('click',dismissHandler);
 					doc[action]('keydown',preventScroll);
 					doc[action]('keyup',keyHandler);
 					doc[action]('focus',dismissHandler);
 				},
 				dismissHandler = e => {
-					let eventTarget = e.target;
+					const eventTarget = e.target;
 					if ((!menu.contains(eventTarget) && !toggleBtn.contains(eventTarget)) || e.type !== 'focus') {
 						self.hide();
 						preventEmptyAnchor(e);
@@ -45,18 +47,19 @@
 					self.show();
 					preventEmptyAnchor(e);
 				},
-				preventScroll = e => (e.key === 'ArrowUp' || e.key === 'ArrowDown') && e.preventDefault(),
+				preventScroll = e => isArrow(e) && e.preventDefault(),
 				keyHandler = e => {
-					if (e.key === 'Escape') {
+					if ('Escape' === e.key) {
 						self.toggle();
-					} else if (e.key === 'ArrowUp' || e.key === 'ArrowDown') {
+					} else if (isArrow(e)) {
 						let activeItem = doc.activeElement,
 							isMenuButton = activeItem === toggleBtn,
 							idx = isMenuButton ? 0 : menuItems.indexOf(activeItem);
 						if (parent.contains(activeItem)) {
 							if (!isMenuButton) {
-								idx = e.key === 'ArrowUp' ? (idx > 1 ? idx-1 : 0)
-									: e.key === 'ArrowDown' ? (idx < menuItems.length-1 ? idx+1 : idx) : idx;
+								idx = 'ArrowUp' === e.key
+									? (idx > 1 ? idx-1 : 0)
+									: (idx < menuItems.length-1 ? idx+1 : idx);
 							}
 							menuItems[idx] && setFocus(menuItems[idx]);
 						} else {
diff --git a/vendors/bootstrap/less/alerts.less b/vendors/bootstrap/less/alerts.less
index 71fdbb110..124326743 100644
--- a/vendors/bootstrap/less/alerts.less
+++ b/vendors/bootstrap/less/alerts.less
@@ -8,14 +8,14 @@
 
 .alert {
   padding: 8px 35px 8px 14px;
-  margin-bottom: @baseLineHeight;
+  margin-bottom: 1.43em;
   text-shadow: 0 1px 0 rgba(255,255,255,.5);
-  background-color: @warningBackground;
-  border: 1px solid @warningBorder;
+  background-color: var(--warning-bg-clr, #fcf8e3);
+  border: 1px solid var(--warning-border-clr, #fbeed5);
   border-radius: 4px;
-  color: @warningText;
+  color: var(--warning-clr, #c09853);
   max-width: 800px;
-  min-height: @baseLineHeight;
+  min-height: 1.43em;
 }
 
 // Adjust close link position
@@ -23,7 +23,7 @@
   position: relative;
   top: -2px;
   right: -21px;
-  line-height: @baseLineHeight;
+  line-height: 1.43em;
 }
 
 
@@ -31,12 +31,24 @@
 // -------------------------
 
 .alert-error {
-  background-color: @errorBackground;
-  border-color: @errorBorder;
-  color: @errorText;
+  background-color: var(--error-bg-clr, #f2dede);
+  border-color: var(--error-border-clr, #eed3d7);
 }
 .alert-info {
-  background-color: @infoBackground;
-  border-color: @infoBorder;
-  color: @infoText;
+  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 662717884..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
@@ -54,9 +52,3 @@
 .btn-group > .btn.active {
   z-index: 2;
 }
-
-// Reposition the caret
-.btn .caret {
-  margin-top: 8px;
-  margin-left: 0;
-}
diff --git a/vendors/bootstrap/less/buttons.less b/vendors/bootstrap/less/buttons.less
index 3ca61afae..8bc88fd67 100644
--- a/vendors/bootstrap/less/buttons.less
+++ b/vendors/bootstrap/less/buttons.less
@@ -11,17 +11,16 @@
   border-radius: 3px;
 
   display: inline-block;
-  padding: 4px 13px;
-  line-height: @baseLineHeight;
+  padding: 0 12px;
+  line-height: 2em;
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
-  border: 1px solid @btnBorder;
-  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: @grayDark;
+  color: var(--btn-clr, #333);
   text-shadow: 0 -1px 0 rgba(0,0,0,.25);
-  background-color: @btnBackground;
+  background-color: var(--btn-bg-clr, #fff);
   text-decoration: none;
 
   // Hover state
@@ -74,10 +73,8 @@
 // Block button
 .btn-block {
   display: block;
-  width: 100%;
   padding-left: 0;
   padding-right: 0;
-  box-sizing: border-box;
 }
 
 
@@ -94,16 +91,16 @@
 // Warning appears are orange
 .btn-warning {
   color: #fff;
-  background-color: @btnWarningBackground;
+  background-color: #fbb450;
 }
 // Danger and error appear as red
 .btn-danger {
   color: #fff;
-  background-color: @btnDangerBackground;
+  background-color: var(--btn-danger-bg-clr, #ee5f5b);
 }
 // Success appears as green
 .btn-success {
-  background-color: @btnSuccessBackground;
+  background-color: var(--btn-success-bg-clr, #84AB04);
   color: #fff;
   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 d782c271b..476946d23 100644
--- a/vendors/bootstrap/less/close.less
+++ b/vendors/bootstrap/less/close.less
@@ -4,10 +4,10 @@
 
 
 .close {
-  float: right;
+  float: var(--right, right);
   font-size: 143%;
   font-weight: bold;
-  line-height: @baseLineHeight;
+  line-height: 1.43em;
   color: inherit;
   cursor: pointer;
   text-decoration: none;
diff --git a/vendors/bootstrap/less/code.less b/vendors/bootstrap/less/code.less
index 2b805dca3..bd4a8d94f 100644
--- a/vendors/bootstrap/less/code.less
+++ b/vendors/bootstrap/less/code.less
@@ -22,8 +22,8 @@ code {
 // Blocks of code
 pre {
   display: block;
-  padding: (@baseLineHeight / 2);
-  margin: 0 0 (@baseLineHeight / 2);
+  padding: 0.715em;
+  margin: 0 0 0.715em;
   white-space: pre-wrap;
   border: 1px solid rgba(0,0,0,.15);
   border-radius: 4px;
diff --git a/vendors/bootstrap/less/dropdowns.less b/vendors/bootstrap/less/dropdowns.less
index 5bba82d2b..c37f4a7dd 100644
--- a/vendors/bootstrap/less/dropdowns.less
+++ b/vendors/bootstrap/less/dropdowns.less
@@ -2,28 +2,11 @@
 // Dropdown menus
 // --------------------------------------------------
 
-
 // Use the .menu class on any <li> element within the topbar or ul.tabs and you'll get some superfancy dropdowns
 .dropdown {
   position: relative;
 }
 
-// Dropdown arrow/caret
-// --------------------
-.caret {
-  display: inline-block;
-  width: 0;
-  height: 0;
-  vertical-align: top;
-  border: 4px solid transparent;
-  border-top-color: @black;
-}
-
-// Place the caret
-.dropdown .caret {
-  margin-top: 8px;
-  margin-left: 2px;
-}
 
 // The dropdown menu (ul)
 // ----------------------
@@ -34,15 +17,15 @@
   position: absolute;
   top: 100%;
   left: 0;
-  z-index: @zindexDropdown;
+  z-index: 1000;
   display: none; // none by default, but block on "open" of the menu
   min-width: 160px;
   padding: 5px 0;
   margin: 2px 0 0; // override default ul
   list-style: none;
   color: var(--dropdown-menu-color, inherit);
-  background-color: var(--dropdown-menu-background-color, @dropdownBackground);
-  border: 1px solid @dropdownBorder;
+  background-color: var(--dropdown-menu-bg-color, #fff);
+  border: 1px solid var(--dropdown-menu-border-clr, rgba(0,0,0,.2));
   box-shadow: 0 1px 2px rgba(0,0,0,0.2);
   background-clip: padding-box;
 
@@ -55,7 +38,7 @@
   // Links within the dropdown menu
   a {
     background-color: var(--dropdown-menu-bg-color, #fff);
-    color: var(--dropdown-menu-color, @dropdownLinkColor);
+    color: var(--dropdown-menu-color, #333);
     display: block;
     padding: 3px 10px;
     text-decoration: none;
@@ -77,7 +60,7 @@
 // Gray out text and ensure the hover state remains gray
 .dropdown-menu .disabled > a,
 .dropdown-menu .disabled > a:hover {
-  color: @grayLight;
+  color: var(--dropdown-menu-disabled-color, #999);
   cursor: not-allowed;
   opacity: 0.5;
 }
diff --git a/vendors/bootstrap/less/forms.less b/vendors/bootstrap/less/forms.less
index 5b6ca6dd7..f9da001c0 100644
--- a/vendors/bootstrap/less/forms.less
+++ b/vendors/bootstrap/less/forms.less
@@ -8,14 +8,14 @@
 
 // Make all forms have space below them
 form {
-  margin: 0 0 @baseLineHeight;
+  margin: 0 0 1.43em;
 }
 
 // Identify controls by their labels
 label {
-  display: block;
+  display: inline-block;
   font-weight: normal;
-  line-height: @baseLineHeight;
+  line-height: 1.43em;
   margin-bottom: 5px;
 }
 
@@ -27,8 +27,8 @@ select,
 .select,
 textarea {
   font-family: inherit;
-  font-size: @baseFontSize;
-  line-height: @baseLineHeight;
+  font-size: var(--main-font-size, 14px);
+  line-height: 1.43em;
   margin: 0;
   text-transform: none;
 }
@@ -41,28 +41,34 @@ select,
 .select,
 textarea,
 input {
-  box-sizing: border-box;
   display: inline-block;
   padding: 4px 6px;
-  color: @gray;
-  border-radius: @inputBorderRadius;
+  color: var(--input-clr, #555);
+  border-radius: var(--input-border-radius, 3px);
+  width: 210px;
 }
 
 textarea,
 input {
-  background-color: @inputBackground;
-  border: 1px solid @inputBorder;
+  background-color: var(--input-bg-clr, #fff);
+  border: 1px solid var(--input-border-clr, #ccc);
   box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
   transition: border linear .2s, box-shadow linear .2s;
-  width: 210px;
 
   // Focus state
   &:focus {
-    border-color: darken(@inputBorder, 20%);
+    border-color: var(--input-focus-border-clr, #999);
     box-shadow: none;
   }
 }
 
+//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"],
 input[type="checkbox"] {
@@ -83,11 +89,10 @@ select, .select {
   // Safari requires -webkit-
   -webkit-appearance: none;
   appearance: none;
-  background: @inputBackground url("data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg' height='10px' width='15px'><text x='0' y='10' fill='rgb(85,85,85)'>▾</text></svg>") right center/1em no-repeat border-box;
-  border: 1px solid @inputBorder;
+  background: var(--input-bg-clr, #fff) url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0naHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmcnIGhlaWdodD0nMTBweCcgd2lkdGg9JzE1cHgnPjx0ZXh0IHg9JzAnIHk9JzEwJyBmaWxsPSdyZ2IoODUsODUsODUpJz7ilr48L3RleHQ+PC9zdmc+) right center/1em no-repeat border-box;
+  border: 1px solid var(--input-border-clr, #ccc);
   cursor: pointer;
   padding-right: 1.5em;
-  width: 223px; // default input width + 10px of padding that doesn't get applied
 }
 
 // Focus for select, file, radio, and checkbox
@@ -139,7 +144,22 @@ textarea[readonly] {
 
 // Error
 .control-group.error {
-  .formFieldState(@errorText, @errorText, @errorBackground);
+  > label {
+    color: var(--error-clr, #b94a48);
+  }
+  // Style inputs accordingly
+  input,
+  select,
+  textarea {
+    color: var(--error-clr, #b94a48);
+    border-color: var(--error-border-clr, #eed3d7);
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075); // Redeclare so transitions work
+    &:focus {
+      border-color: var(--error-clr, #b94a48);
+      // Write out in full since the lighten() function isn't easily escaped
+      box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px var(--error-border-clr, #eed3d7);
+    }
+  }
 }
 
 // HORIZONTAL FORMS
@@ -161,7 +181,7 @@ textarea[readonly] {
 
 // Margin to space out fieldsets
 .control-group {
-  margin-bottom: (@baseLineHeight / 2);
+  margin-bottom: 0.715em;
 }
 
 // Horizontal-specific styles
@@ -170,7 +190,7 @@ textarea[readonly] {
 .form-horizontal {
   // Increase spacing between groups
   .control-group {
-    margin-bottom: @baseLineHeight;
+    margin-bottom: 1.43em;
 
     > label {
       display: inline-block;
diff --git a/vendors/bootstrap/less/mixins.less b/vendors/bootstrap/less/mixins.less
index 6fa1e53de..8ecce7784 100644
--- a/vendors/bootstrap/less/mixins.less
+++ b/vendors/bootstrap/less/mixins.less
@@ -24,30 +24,6 @@
   display: block;
   width: 100%;
   min-height: 30px;        // Make inputs at least the height of their button counterpart
-  box-sizing: border-box; // Makes inputs behave like true block-level elements
-}
-
-
-
-// Mixin for form field states
-.formFieldState(@textColor: #555, @borderColor: #ccc, @backgroundColor: #f5f5f5) {
-  // Set the text color
-  > label {
-    color: @textColor;
-  }
-  // Style inputs accordingly
-  input,
-  select,
-  textarea {
-    color: @textColor;
-    border-color: @borderColor;
-    box-shadow: inset 0 1px 1px rgba(0,0,0,.075); // Redeclare so transitions work
-    &:focus {
-      border-color: darken(@borderColor, 10%);
-      // Write out in full since the lighten() function isn't easily escaped
-      box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 6px lighten(@borderColor, 20%);
-    }
-  }
 }
 
 
diff --git a/vendors/bootstrap/less/navs.less b/vendors/bootstrap/less/navs.less
deleted file mode 100644
index 66e1c3fde..000000000
--- a/vendors/bootstrap/less/navs.less
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Navs
-// --------------------------------------------------
-
-
-// BASE CLASS
-// ----------
-
-.nav {
-  margin-left: 0;
-  margin-bottom: @baseLineHeight;
-  list-style: none;
-}
-
-// Make links block level
-.nav > li > a {
-  display: block;
-}
-.nav > li > a:hover {
-  text-decoration: none;
-  background-color: @grayLighter;
-}
diff --git a/vendors/bootstrap/less/tables.less b/vendors/bootstrap/less/tables.less
index 3cc6408d0..d7815f708 100644
--- a/vendors/bootstrap/less/tables.less
+++ b/vendors/bootstrap/less/tables.less
@@ -9,19 +9,18 @@
 // table {
 .table {
   max-width: 100%;
-  background-color: @tableBackground;
   border-collapse: collapse;
   border-spacing: 0;
   width: 100%;
-  margin-bottom: @baseLineHeight;
+  margin-bottom: 1.43em;
   // Cells
   th,
   td {
     padding: 8px;
-    line-height: @baseLineHeight;
-    text-align: left;
+    line-height: 1.43em;
+    text-align: inherit;
     vertical-align: text-top;
-    border-top: 1px solid @tableBorder;
+    border-top: 1px solid var(--border-color, #ddd);
   }
   th {
     font-weight: bold;
@@ -45,12 +44,12 @@
 // ----------------
 
 .table-bordered {
-  border: 1px solid @tableBorder;
+  border: 1px solid var(--border-color, #ddd);
   border-collapse: separate; // Done so we can round those corners!
   border-radius: 4px;
   th + th,
   td + td {
-    border-left: 1px solid @tableBorder;
+    border-left: 1px solid var(--border-color, #ddd);
   }
   // Prevent a double border
   colgroup + thead tr:first-child th,
@@ -105,7 +104,7 @@
   tbody {
     tr:nth-child(odd) td,
     tr:nth-child(odd) th {
-      background-color: @tableBackgroundAccent;
+      background-color: var(--tr-odd-bg-clr, #f9f9f9);
     }
   }
 }
@@ -118,7 +117,7 @@
   tbody {
     tr:hover td,
     tr:hover th {
-      background-color: @tableBackgroundHover;
+      background-color: var(--tr-hover-bg-clr, #f5f5f5);
     }
   }
 }
diff --git a/vendors/bootstrap/less/type.less b/vendors/bootstrap/less/type.less
index aa77999a7..4c4d881a1 100644
--- a/vendors/bootstrap/less/type.less
+++ b/vendors/bootstrap/less/type.less
@@ -7,7 +7,7 @@
 // -------------------------
 
 p {
-  margin: (@baseLineHeight / 2) 0;
+  margin: 0.715em 0;
 }
 
 
@@ -33,15 +33,15 @@ cite {
 
 h1, h2, h3, h4, h5, h6 {
   line-height: 40px;
-  margin: (@baseLineHeight / 2) 0;
+  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; }
 
 
@@ -51,7 +51,7 @@ h4, h5, h6 { line-height: 20px; }
 // Unordered and Ordered lists
 ul, ol {
   padding: 0;
-  margin: 0 0 (@baseLineHeight / 2) 25px;
+  margin: 0 0 0.715em 25px;
 }
 ul ul,
 ul ol,
@@ -60,7 +60,7 @@ ol ul {
   margin-bottom: 0;
 }
 li {
-  line-height: @baseLineHeight;
+  line-height: 1.43em;
 }
 
 // MISC
@@ -68,29 +68,17 @@ li {
 
 // Horizontal rules
 hr {
-  margin: @baseLineHeight 0;
+  margin: 1.43em 0;
   border: 0;
-  border-bottom: 1px solid @hrBorder;
-  box-sizing: content-box;
+  border-bottom: 1px solid var(--hr-color, #eee);
   height: 0;
 }
 
-// Abbreviations and acronyms
-abbr[title] {
-  cursor: help;
-  border-bottom: 1px dotted @grayLight;
-  text-decoration: none;
-}
-
 // Blockquotes
 blockquote {
   padding: 0 0 0 15px;
-  margin: 0 0 @baseLineHeight;
-  border-left: 5px solid @grayLighter;
-  p {
-    margin-bottom: 0;
-    line-height: (@baseLineHeight * 1.25);
-  }
+  margin: 0 0 1.43em;
+  border-left: 5px solid var(--border-color, #ddd);
 }
 
 // Quotes
@@ -104,7 +92,7 @@ blockquote::after {
 // Addresses
 address {
   display: block;
-  margin-bottom: @baseLineHeight;
+  margin-bottom: 1.43em;
   font-style: normal;
-  line-height: @baseLineHeight;
+  line-height: 1.43em;
 }
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/bootstrap/less/variables.less b/vendors/bootstrap/less/variables.less
index 2feeafcf0..e3cfc008e 100644
--- a/vendors/bootstrap/less/variables.less
+++ b/vendors/bootstrap/less/variables.less
@@ -2,133 +2,9 @@
 // Variables
 // --------------------------------------------------
 
-
-// Global values
-// --------------------------------------------------
-
-
-// Grays
-// -------------------------
-@black:                 #000;
-@grayDark:              #333;
-@gray:                  #555;
-@grayLight:             #999;
-@grayLighter:           #eee;
-@white:                 #fff;
-
-
-// Scaffolding
-// -------------------------
-@textColor:             @grayDark;
-
-
-// Links
-// -------------------------
-@linkColor:             #08c;
-@linkColorHover:        darken(@linkColor, 15%);
-
-
-// Typography
-// -------------------------
-@baseFontSize:          14px;
-@baseLineHeight:        1.43em;
-
-// Tables
-// -------------------------
-@tableBackground:                   transparent; // overall background-color
-@tableBackgroundAccent:             #f9f9f9; // for striping
-@tableBackgroundHover:              #f5f5f5; // for hover
-@tableBorder:                       #ddd; // table and cell border
-
-
-// Buttons
-// -------------------------
-@btnBackground:                     @white;
-@btnBackgroundHighlight:            darken(@white, 10%);
-@btnBorder:                         #bbb;
-
-@btnPrimaryBackground:              @linkColor;
-@btnPrimaryBackgroundHighlight:     spin(@btnPrimaryBackground, 20%);
-
-@btnInfoBackground:                 #5bc0de;
-@btnInfoBackgroundHighlight:        #2f96b4;
-
-@btnSuccessBackground:              #84AB04;
-@btnSuccessBackgroundHighlight:     #51a351;
-
-@btnWarningBackground:              lighten(#f89406, 15%);
-@btnWarningBackgroundHighlight:     #f89406;
-
-@btnDangerBackground:               #ee5f5b;
-@btnDangerBackgroundHighlight:      #bd362f;
-
-
-// Forms
-// -------------------------
-@inputBackground:               @white;
-@inputBorder:                   #ccc;
-@inputBorderRadius:             3px;
-@formActionsBackground:         #f5f5f5;
-
-// Dropdowns
-// -------------------------
-@dropdownBackground:            @white;
-@dropdownBorder:                rgba(0,0,0,.2);
-@dropdownDividerTop:            #e5e5e5;
-@dropdownDividerBottom:         @white;
-
-@dropdownLinkColor:             @grayDark;
-
-@dropdownLinkColorHover:        @white;
-@dropdownLinkBackgroundHover:   @dropdownLinkBackgroundActive;
-
-@dropdownLinkColorActive:       @dropdownLinkColor;
-@dropdownLinkBackgroundActive:  @linkColor;
-
-
-
-// COMPONENT VARIABLES
-// --------------------------------------------------
-
-// Z-index master list
-// -------------------------
-// Used for a bird's eye view of components dependent on the z-axis
-// Try to avoid customizing these :)
-@zindexDropdown:          1000;
-@zindexPopover:           1010;
-@zindexTooltip:           1030;
-@zindexFixedNavbar:       1030;
-@zindexModal:             1101;
-
-
-// Hr border color
-// -------------------------
-@hrBorder:                @grayLighter;
-
-
-// Form states and alerts
-// -------------------------
-@warningText:             #c09853;
-@warningBackground:       #fcf8e3;
-@warningBorder:           darken(spin(@warningBackground, -10), 3%);
-
-@errorText:               #b94a48;
-@errorBackground:         #f2dede;
-@errorBorder:             darken(spin(@errorBackground, -10), 3%);
-
-@successText:             #468847;
-@successBackground:       #dff0d8;
-@successBorder:           darken(spin(@successBackground, -10), 5%);
-
-@infoText:                #3a87ad;
-@infoBackground:          #d9edf7;
-@infoBorder:              darken(spin(@infoBackground, -10), 7%);
-
-
 // GRID
 // --------------------------------------------------
 
-
 // Default 940px grid
 // -------------------------
 @gridColumns:             12;
diff --git a/vendors/fontastic/fonts/snappymail.woff b/vendors/fontastic/fonts/snappymail.woff
index 4ee416c82..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 e66aa6fa1..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 27bfeee6d..c93837357 100644
--- a/vendors/fontastic/styles.css
+++ b/vendors/fontastic/styles.css
@@ -38,61 +38,55 @@
   content: "\e005";
 }
 .icon-paper-plane::before {
-  content: "\e007";
+  content: "📧";
 }
 .icon-right-mini::before {
-  content: "\e01e"; /* › */
+  content: "›";
 }
 .icon-down-mini::before {
-  content: "\e01f"; /* › rotate 90 */
-}
-.icon-warning-alt::before {
-  content: "\e02a";
+  content: "⌄";
 }
 .icon-ok::before {
   content: "✔";
 }
 .icon-file::before {
-  content: "\e02f";
+  content: "🗎";
 }
 .icon-file-code::before {
   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: "\e034";
+  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";
 }
-.icon-popup::before {
-  content: "\e045";
-}
-.icon-mail::before {
-  content: "✉";
+.icon-lock::before {
+  content: "🔒";
 }
 .icon-filter::before {
   content: "\e061"; /* ⊆ */
@@ -106,15 +100,9 @@
 .icon-copy::before {
   content: "\e068";
 }
-.icon-help::before {
-  content: "\e06b";
-}
-.icon-resize-in::before {
-  content: "\e06c";
-}
-.icon-resize-out::before {
-  content: "⤢";
-}
 .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 387114205..84ff57a59 100644
--- a/vendors/jua/jua.js
+++ b/vendors/jua/jua.js
@@ -6,32 +6,28 @@
 		 * @param {*} aItems
 		 * @param {Function} fFileCallback
 		 * @param {number=} iLimit = 20
-		 * @param {Function=} fLimitCallback
 		 */
-		getDataFromFiles = (aItems, fFileCallback, iLimit, fLimitCallback) =>
+		getDataFromFiles = (aItems, fFileCallback, iLimit) =>
 		{
-			if (aItems && aItems.length)
+			if (aItems?.length)
 			{
 				let
 					oFile,
-					iInputLimit = iLimit,
-					bUseLimit = 0 < iLimit,
-					bCallLimit = !fLimitCallback
+					iCount = 0,
+					bCallLimit = false
 				;
 
 				[...aItems].forEach(oItem => {
-					if (oItem)
-					{
-						if (!bUseLimit || 0 <= --iLimit)
-						{
+					if (oItem) {
+						if (iLimit && iLimit < ++iCount) {
+							if (!bCallLimit) {
+								bCallLimit = true;
+//								fLimitCallback(iLimit);
+							}
+						} else {
 							oFile = getDataFromFile(oItem);
 							oFile && fFileCallback(oFile);
 						}
-						else if (bUseLimit && !bCallLimit)
-						{
-							bCallLimit = true;
-							fLimitCallback(iInputLimit);
-						}
 					}
 				});
 			}
@@ -48,23 +44,14 @@
 		{
 			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
 		},
 
-		eventContainsFiles = oEvent =>
-		{
-			try {
-				return oEvent.dataTransfer.types.includes('Files');
-			} catch (e) {
-				return false;
-			}
-		};
+		eventContainsFiles = oEvent => oEvent.dataTransfer.types.includes('Files');
 
 	class Queue extends Array
 	{
@@ -111,8 +98,7 @@
 				onDragEnter: null,
 				onDragLeave: null,
 				onBodyDragEnter: null,
-				onBodyDragLeave: null,
-				onLimitReached: null
+				onBodyDragLeave: null
 			};
 
 			self.oXhrs = {};
@@ -120,11 +106,13 @@
 			self.options = Object.assign({
 					action: '',
 					name: 'uploader',
-					hidden: {},
-					limit: 0
+					limit: 0,
+//					clickElement:
+//					dragAndDropElement:
 				}, options || {});
 			self.oQueue = new Queue();
 
+			// clickElement
 			if (el) {
 				el.style.position = 'relative';
 				el.style.overflow = 'hidden';
@@ -136,111 +124,58 @@
 			}
 
 			el = options.dragAndDropElement;
-			if (el)
-			{
-				let oBigDropZone = options.dragAndDropBodyElement || doc;
-
-				if (!options.disableDocumentDropPrevent)
-				{
-					doc.addEventListener('dragover', oEvent => {
-						if (eventContainsFiles(oEvent))
-						{
-							try
-							{
+			if (el) {
+				addEventListeners(doc, {
+					dragover: oEvent => {
+						if (eventContainsFiles(oEvent)) {
+							timerStop();
+							if (el.contains(oEvent.target)) {
+								oEvent.dataTransfer.dropEffect = 'copy';
+								oEvent.stopPropagation();
+							} else {
 								oEvent.dataTransfer.dropEffect = 'none';
-								oEvent.preventDefault();
-							}
-							catch (oExc) {
-								console.error(oExc);
 							}
+							oEvent.preventDefault();
 						}
-					});
-				}
-
-				if (oBigDropZone)
-				{
-					addEventListeners(oBigDropZone, {
-						dragover: () => timerStop(),
-						dragenter: oEvent => {
-							if (eventContainsFiles(oEvent))
-							{
-								timerStop();
-								oEvent.preventDefault();
-
-								self.runEvent('onBodyDragEnter', oEvent);
-							}
-						},
-						dragleave: oEvent =>
-							oEvent.dataTransfer && timerStart(() => self.runEvent('onBodyDragLeave', oEvent)),
-						drop: oEvent => {
-							if (oEvent.dataTransfer) {
-								let bFiles = eventContainsFiles(oEvent);
-								bFiles && oEvent.preventDefault();
-
-								self.runEvent('onBodyDragLeave', oEvent);
-
-								return !bFiles;
-							}
-
-							return false;
-						}
-					});
-				}
-
-				addEventListeners(el, {
+					},
 					dragenter: oEvent => {
 						if (eventContainsFiles(oEvent)) {
 							timerStop();
-
 							oEvent.preventDefault();
-							self.runEvent('onDragEnter', el, oEvent);
-						}
-					},
-					dragover: oEvent => {
-						if (eventContainsFiles(oEvent)) {
-							try
-							{
-								let sEffect = oEvent.dataTransfer.effectAllowed;
-
+							self.runEvent('onBodyDragEnter', oEvent);
+							if (el.contains(oEvent.target)) {
 								timerStop();
-
-								oEvent.dataTransfer.dropEffect = (sEffect === 'move' || sEffect === 'linkMove') ? 'move' : 'copy';
-
-								oEvent.stopPropagation();
-								oEvent.preventDefault();
-							}
-							catch (oExc) {
-								console.error(oExc);
+								self.runEvent('onDragEnter', el, oEvent);
 							}
 						}
 					},
 					dragleave: oEvent => {
-						if (oEvent.dataTransfer) {
+						if (eventContainsFiles(oEvent)) {
 							let oRelatedTarget = doc.elementFromPoint(oEvent.clientX, oEvent.clientY);
 							if (!oRelatedTarget || !el.contains(oRelatedTarget)) {
-								timerStop();
 								self.runEvent('onDragLeave', el, oEvent);
 							}
+							timerStart(() => self.runEvent('onBodyDragLeave', oEvent))
 						}
 					},
 					drop: oEvent => {
 						if (eventContainsFiles(oEvent)) {
+							timerStop();
 							oEvent.preventDefault();
-
-							getDataFromFiles(
-								oEvent.files || oEvent.dataTransfer.files,
-								oFile => {
-									if (oFile) {
-										self.addFile(oFile);
-										timerStop();
-									}
-								},
-								self.options.limit,
-								self.getEvent('onLimitReached')
-							);
+							if (el.contains(oEvent.target)) {
+								getDataFromFiles(
+									oEvent.files || oEvent.dataTransfer.files,
+									oFile => {
+										if (oFile) {
+											self.addFile(oFile);
+										}
+									},
+									self.options.limit
+								);
+							}
 						}
-
 						self.runEvent('onDragLeave', oEvent);
+						self.runEvent('onBodyDragLeave', oEvent);
 					}
 				});
 			}
@@ -261,7 +196,7 @@
 		 */
 		runEvent(sName, ...aArgs)
 		{
-			this.oEvents[sName] && this.oEvents[sName].apply(null, aArgs);
+			this.oEvents[sName]?.apply(null, aArgs);
 		}
 
 		/**
@@ -296,7 +231,7 @@
 		 */
 		uploadTask(sUid, oFileInfo)
 		{
-			if (false === this.oUids[sUid] || !oFileInfo || !oFileInfo['File'])
+			if (false === this.oUids[sUid] || !oFileInfo || !oFileInfo.file)
 			{
 				return false;
 			}
@@ -308,7 +243,6 @@
 					oXhr = new XMLHttpRequest(),
 					oFormData = new FormData(),
 					sAction = this.options.action,
-					aHidden = this.options.hidden,
 					fStartFunction = this.getEvent('onStart'),
 					fProgressFunction = this.getEvent('onProgress')
 				;
@@ -349,10 +283,7 @@
 
 				fStartFunction && fStartFunction(sUid);
 
-				oFormData.append(this.options.name, oFileInfo['File']);
-				Object.entries(aHidden).forEach(([key, value]) =>
-					oFormData.append(key, (typeof value === "function" ? value(oFileInfo) : value).toString())
-				);
+				oFormData.append(this.options.name, oFileInfo.file);
 
 				oXhr.send(oFormData);
 
@@ -392,18 +323,13 @@
 							self.generateNewInput(oClickElement);
 						}, 10);
 					};
-					if (oInput.files && oInput.files.length) {
-						getDataFromFiles(oInput.files, fFileCallback,
-							limit,
-							self.getEvent('onLimitReached')
-						);
+					if (oInput.files?.length) {
+						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/Gruntfile.js b/vendors/knockout/Gruntfile.js
index c5d7c0a70..079572796 100644
--- a/vendors/knockout/Gruntfile.js
+++ b/vendors/knockout/Gruntfile.js
@@ -63,8 +63,8 @@ module.exports = function(grunt) {
     function buildMin(output, done) {
         var cc = require('closure-compiler');
         var options = {
-			language_in:'ECMASCRIPT_2018',
-			language_out:'ECMASCRIPT_2018',
+			language_in:'ECMASCRIPT_2020',
+			language_out:'ECMASCRIPT_2020',
             compilation_level: 'ADVANCED_OPTIMIZATIONS',
             output_wrapper: '(()=>{%output%})();'
         };
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 581940cf6..71edd3e1f 100644
--- a/vendors/knockout/build/fragments/source-references.js
+++ b/vendors/knockout/build/fragments/source-references.js
@@ -1,14 +1,14 @@
 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',
     'src/utils.domNodeDisposal.js',
 //    'src/utils.domManipulation.js',
 //    'src/memoization.js',
-    'src/tasks.js',
+//    'src/tasks.js',
     'src/subscribables/extenders.js',
     'src/subscribables/subscribable.js',
     'src/subscribables/dependencyDetection.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 c0aba9e20..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,20 +23,21 @@ 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
         // we don't want the underlying collection to change while we're doing that.
         var nodesArray = [...nodes];
-        var templateDocument = (nodesArray[0] && nodesArray[0].ownerDocument) || document;
+        var templateDocument = nodesArray[0]?.ownerDocument || document;
 
         var container = templateDocument.createElement('div');
         nodesArray.forEach(node => container.append(ko.cleanNode(node)));
@@ -50,6 +50,7 @@ ko.utils = {
             : node => node.cloneNode(true)),
 
     setDomNodeChildren: (domNode, childNodes) => {
+//        domNode.replaceChildren(...childNodes);
         ko.utils.emptyDomNode(domNode);
         childNodes && domNode.append(...childNodes);
     },
@@ -108,8 +109,8 @@ ko.utils = {
         node.ownerDocument.documentElement.contains(node.nodeType !== 1 ? node.parentNode : node),
 
     triggerEvent: (element, eventType) => {
-        if (!(element && element.nodeType))
-            throw new Error("element must be a DOM node when calling triggerEvent");
+        if (!element?.nodeType)
+            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
 (() => {
 
@@ -134,13 +135,11 @@ ko.utils.domData = {
         if (dataStore.has(node)) {
             dataStore.get(node)[key] = value;
         } else {
-            let dataForNode = {};
-            dataForNode[key] = value;
-            dataStore.set(node, dataForNode);
+            dataStore.set(node, {[key]:value});
         }
         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),
@@ -198,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);
         },
 
@@ -233,94 +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.tasks = (() => {
-    var taskQueue = [],
-        taskQueueLength = 0,
-        nextHandle = 1,
-        nextIndexToProcess = 0,
-
-    // Chrome 27+, Firefox 14+, IE 11+, Opera 15+, Safari 6.1+
-    // From https://github.com/petkaantonov/bluebird * Copyright (c) 2014 Petka Antonov * License: MIT
-    scheduler = (callback => {
-        var div = document.createElement("div");
-        new MutationObserver(callback).observe(div, {attributes: true});
-        return () => div.classList.toggle("foo");
-    })(scheduledProcess);
-
-    function processTasks() {
-        if (taskQueueLength) {
-            // Each mark represents the end of a logical group of tasks and the number of these groups is
-            // limited to prevent unchecked recursion.
-            var mark = taskQueueLength, countMarks = 0;
-
-            // nextIndexToProcess keeps track of where we are in the queue; processTasks can be called recursively without issue
-            for (var task; nextIndexToProcess < taskQueueLength; ) {
-                if (task = taskQueue[nextIndexToProcess++]) {
-                    if (nextIndexToProcess > mark) {
-                        if (++countMarks >= 5000) {
-                            nextIndexToProcess = taskQueueLength;   // skip all tasks remaining in the queue since any of them could be causing the recursion
-                            setTimeout(() => {
-                                throw Error(`'Too much recursion' after processing ${countMarks} task groups.`)
-                            }, 0)
-                            break;
-                        }
-                        mark = taskQueueLength;
-                    }
-                    try {
-                        task();
-                    } catch (ex) {
-                        setTimeout(() => { throw ex }, 0);
-                    }
-                }
-            }
-        }
-    }
-
-    function scheduledProcess() {
-        processTasks();
-
-        // Reset the queue
-        nextIndexToProcess = taskQueueLength = taskQueue.length = 0;
-    }
-
-    var tasks = {
-        schedule: func => {
-            if (!taskQueueLength) {
-                scheduler(scheduledProcess);
-            }
-
-            taskQueue[taskQueueLength++] = func;
-            return nextHandle++;
-        },
-
-        cancel: handle => {
-            var index = handle - (nextHandle - taskQueueLength);
-            if (index >= nextIndexToProcess && index < taskQueueLength) {
-                taskQueue[index] = null;
-            }
-        }
-    };
-
-    return tasks;
-})();
-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" ?
@@ -329,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) {
@@ -354,8 +270,6 @@ function debounce(callback, timeout) {
     };
 }
 
-ko.exportSymbol('extenders', ko.extenders);
-
 class koSubscription
 {
     constructor (target, callback, disposeCallback) {
@@ -365,15 +279,13 @@ 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) {
-            if (self._domNodeDisposalCallback) {
-                ko.utils.domNodeDisposal.removeDisposeCallback(self._node, self._domNodeDisposalCallback);
-            }
+            self._domNodeDisposalCallback
+            && ko.utils.domNodeDisposal.removeDisposeCallback(self._node, self._domNodeDisposalCallback);
             self._isDisposed = true;
             self._disposeCallback();
 
@@ -384,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;
@@ -410,21 +326,18 @@ var ko_subscribable_fn = {
 
         var subscription = new koSubscription(self, boundCallback, () => {
             self._subscriptions.get(event).delete(subscription);
-            if (self.afterSubscriptionRemove)
-                self.afterSubscriptionRemove(event);
+            self.afterSubscriptionRemove?.(event);
         });
 
-        if (self.beforeSubscriptionAdd)
-            self.beforeSubscriptionAdd(event);
+        self.beforeSubscriptionAdd?.(event);
 
-        if (!self._subscriptions.has(event))
-            self._subscriptions.set(event, new Set);
+        self._subscriptions.has(event) || self._subscriptions.set(event, new Set);
         self._subscriptions.get(event).add(subscription);
 
         return subscription;
     },
 
-    notifySubscribers: function (valueToNotify, event) {
+    notifySubscribers(valueToNotify, event) {
         event = event || defaultEvent;
         if (event === defaultEvent) {
             this.updateVersion();
@@ -444,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';
@@ -464,13 +377,13 @@ var ko_subscribable_fn = {
         if (!self._origNotifySubscribers) {
             self._origNotifySubscribers = self.notifySubscribers;
             // Moved out of "limit" to avoid the extra closure
-            self.notifySubscribers = function(value, event) {
+            self.notifySubscribers = (value, event) => {
                 if (!event || event === defaultEvent) {
-                    this._limitChange(value);
-                } else if (event === 'beforeChange') {
-                    this._limitBeforeChange(value);
+                    self._limitChange(value);
+                } else if (event === beforeChange) {
+                    self._limitBeforeChange(value);
                 } else {
-                    this._origNotifySubscribers(value, event);
+                    self._origNotifySubscribers(value, event);
                 }
             }
         }
@@ -517,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;
                 }
@@ -541,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 =>
-    instance != null && typeof instance.subscribe == "function" && typeof instance.notifySubscribers == "function";
+    typeof instance?.['subscribe'] == "function" && typeof instance.notifySubscribers == "function";
 (() => {
 
-var outerFrames = [],
+let outerFrames = [],
     currentFrame,
     lastId = 0,
 
@@ -576,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 || []);
@@ -591,16 +498,17 @@ ko.dependencyDetection = {
         }
     },
 
-    getDependenciesCount: () => currentFrame && currentFrame.computed.getDependenciesCount(),
+    getDependenciesCount: () => currentFrame?.computed.getDependenciesCount(),
 
-    isInitial: () => currentFrame && currentFrame.isInitial,
+    isInitial: () => currentFrame?.isInitial,
 
-    computed: () => currentFrame && currentFrame.computed
+    computed: () => currentFrame?.computed
 };
 
 })();
 const observableLatestValue = Symbol('_latestValue'),
     length = 'length';
+//const IS_OBSERVABLE = Symbol('IS_OBSERVABLE');
 
 ko.observable = initialValue => {
     function observable() {
@@ -611,45 +519,42 @@ 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
         }
-        else {
-            // Read
-            ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
-            return observable[observableLatestValue];
-        }
+        // Read
+        ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
+        return observable[observableLatestValue];
     }
 
     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 && value.toJSON ? value.toJSON() : value;
+        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
@@ -659,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]) {
@@ -676,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)
@@ -706,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 => {
@@ -723,39 +627,32 @@ 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 (options && typeof options == "object") {
+    if (typeof options == "object") {
         ko.utils.extend(target.compareArrayOptions, options);
     }
     target.compareArrayOptions['sparse'] = true;
@@ -775,31 +672,44 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
 
     // Watch "subscribe" calls, and for array change events, ensure change tracking is enabled
     target.beforeSubscriptionAdd = event => {
-        if (underlyingBeforeSubscriptionAddFunction) {
-            underlyingBeforeSubscriptionAddFunction.call(target, event);
-        }
+        underlyingBeforeSubscriptionAddFunction?.call(target, event);
         if (event === arrayChangeEventName) {
             trackChanges();
         }
     };
     // Watch "dispose" calls, and for array change events, ensure change tracking is disabled when all are disposed
     target.afterSubscriptionRemove = event => {
-        if (underlyingAfterSubscriptionRemoveFunction) {
-            underlyingAfterSubscriptionRemoveFunction.call(target, event);
-        }
+        underlyingAfterSubscriptionRemoveFunction?.call(target, event);
         if (event === arrayChangeEventName && !target.hasSubscriptionsForEvent(arrayChangeEventName)) {
-            if (changeSubscription) {
-                changeSubscription.dispose();
-            }
-            if (spectateSubscription) {
-                spectateSubscription.dispose();
-            }
+            changeSubscription?.['dispose']();
+            spectateSubscription?.['dispose']();
             spectateSubscription = changeSubscription = null;
             trackingChanges = false;
             previousContents = undefined;
         }
     };
 
+    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);
+            }
+
+            // 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);
+            }
+        }
+    }
+
     function trackChanges() {
         if (trackingChanges) {
             // Whenever there's a new subscription and there are pending notifications, make sure all previous
@@ -811,34 +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);
-
-        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);
-                }
-
-                // Eliminate references to the old, removed items, so they can be GCed
-                previousContents = currentContents;
-                cachedDiff = null;
-                pendingChanges = 0;
-
-                if (changes && changes.length) {
-                    target.notifySubscribers(changes, arrayChangeEventName);
-                }
-            }
-        }
+        changeSubscription = target['subscribe'](notifyChanges);
     }
 
     function getChanges(previousContents, currentContents) {
@@ -862,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;
@@ -879,20 +767,19 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
             case 'pop':
                 offset = arrayLength - 1;
             case 'shift':
-                if (arrayLength) {
-                    pushDiff('deleted', rawArray[offset], offset);
-                }
+                arrayLength && pushDiff('deleted', rawArray[offset], offset);
                 break;
 
             case 'splice':
                 // Negative start index means 'from end of array'. After that we clamp to [0...arrayLength].
                 // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice
-                var startIndex = Math.min(Math.max(0, args[0] < 0 ? arrayLength + args[0] : args[0]), arrayLength),
-                    endDeleteIndex = argsLength === 1 ? arrayLength : Math.min(startIndex + (args[1] || 0), arrayLength),
-                    endAddIndex = startIndex + argsLength - 2,
+                var index = Math.min(Math.max(0, args[0] < 0 ? arrayLength + args[0] : args[0]), arrayLength),
+                    endDeleteIndex = argsLength === 1 ? arrayLength : Math.min(index + (args[1] || 0), arrayLength),
+                    endAddIndex = index + argsLength - 2,
                     endIndex = Math.max(endDeleteIndex, endAddIndex),
-                    additions = [], deletions = [];
-                for (let index = startIndex, argsIndex = 2; index < endIndex; ++index, ++argsIndex) {
+                    additions = [], deletions = [],
+                    argsIndex = 2;
+                for (; index < endIndex; ++index, ++argsIndex) {
                     if (index < endDeleteIndex)
                         deletions.push(pushDiff('deleted', rawArray[index], index));
                     if (index < endAddIndex)
@@ -934,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,
@@ -945,26 +832,25 @@ 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);
             return this; // Permits chained assignments
-        } else {
-            // Reading the value
-            state.isDisposed || ko.dependencyDetection.registerDependency(computedObservable);
-            if (state.isDirty || (state.isSleeping && computedObservable.haveDependenciesChanged())) {
-                computedObservable.evaluateImmediate();
-            }
-            return state.latestValue;
         }
+        // Reading the value
+        state.isDisposed || ko.dependencyDetection.registerDependency(computedObservable);
+        if (state.isDirty || (state.isSleeping && computedObservable.haveDependenciesChanged())) {
+            computedObservable.evaluateImmediate();
+        }
+        return state.latestValue;
     }
 
     computedObservable[computedState] = state;
     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);
@@ -973,8 +859,6 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
         state.pure = true;
         state.isSleeping = true;     // Starts off sleeping; will awake on the first subscription
         ko.utils.extend(computedObservable, pureComputedOverrides);
-    } else if (options['deferEvaluation']) {
-        ko.utils.extend(computedObservable, deferEvaluationOverrides);
     }
 
     if (state.disposeWhenNodeIsRemoved) {
@@ -992,16 +876,14 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
         }
     }
 
-    // Evaluate, unless sleeping or deferEvaluation is true
-    if (!state.isSleeping && !options['deferEvaluation']) {
-        computedObservable.evaluateImmediate();
-    }
+    // Evaluate, unless sleeping
+    state.isSleeping || computedObservable.evaluateImmediate();
 
     // Attach a DOM node disposal callback so that the computed will be proactively disposed as soon as the node is
     // 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']();
         });
     }
 
@@ -1010,9 +892,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
 
 // Utility function that disposes a given dependencyTracking entry
 function computedDisposeDependencyCallback(id, entryToDispose) {
-    if (entryToDispose !== null && entryToDispose.dispose) {
-        entryToDispose.dispose();
-    }
+    entryToDispose?.['dispose']?.();
 }
 
 // This function gets called each time a dependency is detected while evaluating a computed.
@@ -1059,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) =>
@@ -1071,7 +951,7 @@ var computedFn = {
 
         return dependentObservables;
     },
-    hasAncestorDependency: function (obs) {
+    hasAncestorDependency(obs) {
         if (!this[computedState].dependenciesCount) {
             return false;
         }
@@ -1079,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");
         }
@@ -1088,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)) {
@@ -1099,17 +979,17 @@ var computedFn = {
             }
         }
     },
-    markDirty: function () {
+    markDirty() {
         // Process "dirty" events if we can handle delayed notifications
-        if (this._evalDelayed && !this[computedState].isBeingEvaluated) {
-            this._evalDelayed(false /*isChange*/);
+        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();
@@ -1117,46 +997,37 @@ 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 && 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,
             changed = false;
 
-        if (state.isBeingEvaluated) {
-            // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
-            // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
-            // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
-            // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
-            return;
-        }
-
+        // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
+        // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
+        // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
+        // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
+        if (state.isBeingEvaluated
         // Do not evaluate (and possibly capture new dependencies) if disposed
-        if (state.isDisposed) {
+         || state.isDisposed) {
             return;
         }
 
-        if (state.disposeWhenNodeIsRemoved && !ko.utils.domNodeIsAttachedToDocument(state.disposeWhenNodeIsRemoved) || disposeWhen && disposeWhen()) {
+        if (state.disposeWhenNodeIsRemoved && !ko.utils.domNodeIsAttachedToDocument(state.disposeWhenNodeIsRemoved) || disposeWhen?.()) {
             // See comment above about suppressDisposalUntilDisposeWhenReturnsFalse
             if (!state.suppressDisposalUntilDisposeWhenReturnsFalse) {
-                computedObservable.dispose();
+                computedObservable['dispose']();
                 return;
             }
         } else {
@@ -1164,8 +1035,8 @@ var computedFn = {
             state.suppressDisposalUntilDisposeWhenReturnsFalse = false;
         }
 
-        state.isBeingEvaluated = true;
         try {
+            state.isBeingEvaluated = true;
             changed = this.evaluateImmediate_CallReadWithDependencyDetection(notifyChange);
         } finally {
             state.isBeingEvaluated = false;
@@ -1173,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).
@@ -1204,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);
@@ -1235,8 +1106,8 @@ var computedFn = {
 
         return changed;
     },
-    peek: function (evaluate) {
-        // By default, peek won't re-evaluate, except while the computed is sleeping or to get the initial value when "deferEvaluation" is set.
+    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];
         if ((state.isDirty && (evaluate || !state.dependenciesCount)) || (state.isSleeping && this.haveDependenciesChanged())) {
@@ -1244,38 +1115,39 @@ 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(this, limitFunction);
-        this._evalIfChanged = function () {
-            if (!this[computedState].isSleeping) {
-                if (this[computedState].isStale) {
-                    this.evaluateImmediate();
+        ko.subscribable['fn'].limit.call(self, limitFunction);
+        self._evalIfChanged = () => {
+            if (!self[computedState].isSleeping) {
+                if (self[computedState].isStale) {
+                    self.evaluateImmediate();
                 } else {
-                    this[computedState].isDirty = false;
+                    self[computedState].isDirty = false;
                 }
             }
-            return this[computedState].latestValue;
+            return self[computedState].latestValue;
         };
-        this._evalDelayed = function (isChange) {
-            this._limitBeforeChange(this[computedState].latestValue);
+        self._evalDelayed = isChange => {
+            self._limitBeforeChange(self[computedState].latestValue);
 
             // Mark as dirty
-            this[computedState].isDirty = true;
+            self[computedState].isDirty = true;
             if (isChange) {
-                this[computedState].isStale = true;
+                self[computedState].isStale = true;
             }
 
             // Pass the observable to the "limit" code, which will evaluate it when
             // it's time to do the notification.
-            this._limitChange(this, !isChange /* isDirty */);
+            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()
+                dependency['dispose']?.()
             );
         }
         if (state.disposeWhenNodeIsRemoved && state.domNodeDisposalCallback) {
@@ -1294,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];
@@ -1333,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.
@@ -1362,15 +1234,6 @@ var pureComputedOverrides = {
     }
 };
 
-var deferEvaluationOverrides = {
-    beforeSubscriptionAdd: function (event) {
-        // This will force a computed with deferEvaluation to evaluate when the first subscription is registered.
-        if (event == 'change' || event == 'beforeChange') {
-            this.peek();
-        }
-    }
-};
-
 // Note that for browsers that don't support proto assignment, the
 // inheritance chain is created manually in the ko.computed constructor
 Object.setPrototypeOf(computedFn, ko.subscribable['fn']);
@@ -1378,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') {
@@ -1392,83 +1254,87 @@ ko.pureComputed = (evaluatorFunctionOrOptions) => {
     evaluatorFunctionOrOptions['pure'] = true;
     return ko.computed(evaluatorFunctionOrOptions);
 };
-(() => {
-    var hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
 
-    // Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
-    // are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
-    // that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
-    ko.selectExtensions = {
-        readValue : element => {
-            switch (element.nodeName) {
-                case 'OPTION':
-                    if (element[hasDomDataExpandoProperty] === true)
-                        return ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey);
-                    return element.value;
-                case 'SELECT':
-                    return element.selectedIndex >= 0 ? ko.selectExtensions.readValue(element.options[element.selectedIndex]) : undefined;
-                default:
-                    return element.value;
-            }
-        },
+const hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
 
-        writeValue: (element, value, allowUnset) => {
-            switch (element.nodeName) {
-                case 'OPTION':
-                    if (typeof value === "string") {
-                        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);
-                        element[hasDomDataExpandoProperty] = true;
-
-                        // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
-                        element.value = typeof value === "number" ? value : "";
-                    }
-                    break;
-                case 'SELECT':
-                    // A blank string or null value will select the caption
-                    var selection = -1, noValue = ("" === value || null == value);
-                    for (var i = 0, n = element.options.length, optionValue; i < n; ++i) {
-                        optionValue = ko.selectExtensions.readValue(element.options[i]);
-                        // Include special check to handle selecting a caption with a blank string value
-                        if (optionValue == value || (optionValue === "" && noValue)) {
-                            selection = i;
-                            break;
-                        }
-                    }
-                    if (allowUnset || selection >= 0 || (noValue && element.size > 1)) {
-                        element.selectedIndex = selection;
-                    }
-                    break;
-                default:
-                    element.value = (value == null) ? "" : value;
-                    break;
-            }
+// Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
+// are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
+// that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
+ko.selectExtensions = {
+    readValue : element => {
+        switch (element.nodeName) {
+            case 'OPTION':
+                return (element[hasDomDataExpandoProperty] === true)
+                    ? ko.utils.domData.get(element, ko.bindingHandlers['options'].optionValueDomDataKey)
+                    : element.value;
+            case 'SELECT':
+                return element.selectedIndex >= 0
+                    ? ko.selectExtensions.readValue(element.options[element.selectedIndex])
+                    : undefined;
+            default:
+                return element.value;
         }
-    };
-})();
+    },
+
+    writeValue: (element, value) => {
+        switch (element.nodeName) {
+            case 'OPTION':
+                if (typeof value === "string") {
+                    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);
+                    element[hasDomDataExpandoProperty] = true;
+
+                    // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
+                    element.value = typeof value === "number" ? value : "";
+                }
+                break;
+            case 'SELECT':
+                // A blank string or null value will select the caption
+                var selection = -1, noValue = ("" === (value ?? "")),
+                    i = element.options.length, optionValue;
+                while (i--) {
+                    optionValue = ko.selectExtensions.readValue(element.options[i]);
+                    // Include special check to handle selecting a caption with a blank string value
+                    if (optionValue == value || (optionValue === "" && noValue)) {
+                        selection = i;
+                        break;
+                    }
+                }
+                if (selection >= 0 || (noValue && element.size > 1)) {
+                    element.selectedIndex = selection;
+                }
+                break;
+            default:
+                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).
     // This also will not properly handle nested brackets (e.g., obj1[obj2['prop']]; see #911).
-    var javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;
-
-    function getWriteableValue(expression) {
-        if (javaScriptReservedWords.includes(expression))
-            return false;
-        var match = expression.match(javaScriptAssignmentTarget);
-        return match === null ? false : match[1] ? ('Object(' + match[1] + ')' + match[2]) : expression;
-    }
+        javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i,
 
+        getWriteableValue = expression => {
+            if (javaScriptReservedWords.includes(expression))
+                return false;
+            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
 
-    var 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.
+        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.
         // Create the actual regular expression by or-ing the following regex strings. The order is important.
         bindingToken = RegExp([
             // These match strings, either with double quotes, single quotes, or backticks
@@ -1494,131 +1360,87 @@ ko.expressionRewriting = (() => {
 
         // Match end of previous token to determine whether a slash is a division or regex.
         divisionLookBehind = /[\])"'A-Za-z0-9_$]+$/,
-        keywordRegexLookBehind = {'in':1,'return':1,'typeof':1};
+        keywordRegexLookBehind = {'in':1,'return':1,'typeof':1},
 
-    function parseObjectLiteral(objectLiteralString) {
-        // Trim leading and trailing spaces from the string
-        var str = ko.utils.stringTrim(objectLiteralString);
+        preProcessBindings = bindingsStringOrKeyValueArray => {
+            // Trim leading and trailing spaces from the string
+            var str = ko.utils.stringTrim(bindingsStringOrKeyValueArray);
 
-        // Trim braces '{' surrounding the whole object literal
-        if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
+            // Trim braces '{' surrounding the whole object literal
+            if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
 
-        // Add a newline to correctly match a C++ style comment at the end of the string and
-        // add a comma so that we don't need a separate code block to deal with the last item
-        str += "\n,";
+            // Add a newline to correctly match a C++ style comment at the end of the string and
+            // add a comma so that we don't need a separate code block to deal with the last item
+            str += "\n,";
 
-        // Split into tokens
-        var result = [], toks = str.match(bindingToken), key, values = [], depth = 0;
+            // Split into tokens
+            var result = [], toks = str.match(bindingToken), key, values = [], depth = 0;
 
-        if (toks.length > 1) {
-            var i = 0, tok;
-            while ((tok = toks[i++])) {
-                var c = tok.charCodeAt(0);
-                // 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('')});
-                        key = depth = 0;
-                        values = [];
+            if (toks.length > 1) {
+                var i = 0, tok;
+                while ((tok = toks[i++])) {
+                    var c = tok.charCodeAt(0);
+                    // A comma signals the end of a key/value pair if depth is zero
+                    if (c === 44) { // ","
+                        if (depth <= 0) {
+                            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;
+                        }
+                    // Simply skip the colon that separates the name and value
+                    } else if (c === 58) { // ":"
+                        if (!depth && !key && values.length === 1) {
+                            key = values.pop();
+                            continue;
+                        }
+                    // Comments: skip them
+                    } else if (c === 47 && tok.length > 1 && (tok.charCodeAt(1) === 47 || tok.charCodeAt(1) === 42)) {  // "//" or "/*"
                         continue;
+                    // A set of slashes is initially matched as a regular expression, but could be division
+                    } else if (c === 47 && i && tok.length > 1) {  // "/"
+                        // Look at the end of the previous token to determine if the slash is actually division
+                        var match = toks[i-1].match(divisionLookBehind);
+                        if (match && !keywordRegexLookBehind[match[0]]) {
+                            // The slash is actually a division punctuator; re-parse the remainder of the string (not including the slash)
+                            str = str.slice(str.indexOf(tok) + 1);
+                            toks = str.match(bindingToken);
+                            i = -1;
+                            // Continue with just the slash
+                            tok = '/';
+                        }
+                    // Increment depth for parentheses, braces, and brackets so that interior commas are ignored
+                    } else if (c === 40 || c === 123 || c === 91) { // '(', '{', '['
+                        ++depth;
+                    } else if (c === 41 || c === 125 || c === 93) { // ')', '}', ']'
+                        --depth;
+                    // The key will be the first token; if it's a string, trim the quotes
+                    } else if (!key && !values.length && (c === 34 || c === 39)) { // '"', "'"
+                        tok = tok.slice(1, -1);
                     }
-                // Simply skip the colon that separates the name and value
-                } else if (c === 58) { // ":"
-                    if (!depth && !key && values.length === 1) {
-                        key = values.pop();
-                        continue;
-                    }
-                // Comments: skip them
-                } else if (c === 47 && tok.length > 1 && (tok.charCodeAt(1) === 47 || tok.charCodeAt(1) === 42)) {  // "//" or "/*"
-                    continue;
-                // A set of slashes is initially matched as a regular expression, but could be division
-                } else if (c === 47 && i && tok.length > 1) {  // "/"
-                    // Look at the end of the previous token to determine if the slash is actually division
-                    var match = toks[i-1].match(divisionLookBehind);
-                    if (match && !keywordRegexLookBehind[match[0]]) {
-                        // The slash is actually a division punctuator; re-parse the remainder of the string (not including the slash)
-                        str = str.slice(str.indexOf(tok) + 1);
-                        toks = str.match(bindingToken);
-                        i = -1;
-                        // Continue with just the slash
-                        tok = '/';
-                    }
-                // Increment depth for parentheses, braces, and brackets so that interior commas are ignored
-                } else if (c === 40 || c === 123 || c === 91) { // '(', '{', '['
-                    ++depth;
-                } else if (c === 41 || c === 125 || c === 93) { // ')', '}', ']'
-                    --depth;
-                // The key will be the first token; if it's a string, trim the quotes
-                } else if (!key && !values.length && (c === 34 || c === 39)) { // '"', "'"
-                    tok = tok.slice(1, -1);
+                    values.push(tok);
                 }
-                values.push(tok);
-            }
-            if (depth > 0) {
-                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.
-    var twoWayBindings = new Set;
-
-    function preProcessBindings(bindingsStringOrKeyValueArray, bindingOptions) {
-        bindingOptions = bindingOptions || {};
-
-        function processKeyValue(key, val) {
-            var writableVal;
-            function callPreprocessHook(obj) {
-                return (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}");
+                if (depth > 0) {
+                    throw Error("Unbalanced parentheses, braces, or brackets");
                 }
             }
-            // Values are wrapped in a function so that each value can be accessed independently
-            if (makeValueAccessors) {
-                val = 'function(){return ' + val + ' }';
-            }
-            resultStrings.push("'" + key + "':" + val);
-        }
 
-        var resultStrings = [],
-            propertyAccessorResultStrings = [],
-            makeValueAccessors = bindingOptions['valueAccessors'],
-            bindingParams = bindingOptions['bindingParams'],
-            keyValueArray = typeof bindingsStringOrKeyValueArray === "string" ?
-                parseObjectLiteral(bindingsStringOrKeyValueArray) : bindingsStringOrKeyValueArray;
+            result.push("'$data':()=>$data");
 
-        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.
@@ -1627,11 +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)) {
-                var propWriters = allBindings.get('_ko_property_writers');
-                if (propWriters && propWriters[key])
-                    propWriters[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);
             }
@@ -1681,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;
     }
 
@@ -1716,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 => {
@@ -1736,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;
         },
@@ -1763,343 +1583,324 @@ ko.expressionRewriting = (() => {
         }
     };
 })();
-(() => {
-    const defaultBindingAttributeName = "data-bind",
 
-        bindingCache = new Map,
+const defaultBindingAttributeName = "data-bind",
 
-        // The following function is only used internally by this default provider.
-        // It's not part of the interface definition for a general binding provider.
-        getBindingsString = node => {
-            switch (node.nodeType) {
-                case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
-                case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
+    bindingCache = new Map,
+
+    // The following function is only used internally by this default provider.
+    // It's not part of the interface definition for a general binding provider.
+    getBindingsString = node => {
+        switch (node.nodeType) {
+            case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
+            case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
+        }
+        return null;
+    };
+
+ko.bindingProvider = new class
+{
+    nodeHasBindings(node) {
+        switch (node.nodeType) {
+            case 1: // Element
+                return node.getAttribute(defaultBindingAttributeName) != null;
+            case 8: // Comment node
+                return ko.virtualElements.hasBindingValue(node);
+        }
+        return false;
+    }
+
+    getBindingAccessors(node, bindingContext) {
+        var bindingsString = getBindingsString(node);
+        if (bindingsString) {
+            try {
+                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) } }
+                    // 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,
+                    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;
+                throw ex;
             }
-            return null;
+        }
+        return null;
+    }
+};
+
+// Hide or don't minify context properties, see https://github.com/knockout/knockout/issues/2294
+const contextSubscribable = Symbol('_subscribable'),
+    contextAncestorBindingInfo = Symbol('_ancestorBindingInfo'),
+    contextDataDependency = Symbol('_dataDependency'),
+
+    inheritParentVm = {},
+
+    boundElementDomDataKey = ko.utils.domData.nextKey();
+
+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, extendCallback, options)
+    {
+        var self = this,
+            shouldInheritData = dataItemOrAccessor === inheritParentVm,
+            realDataItemOrAccessor = shouldInheritData ? undefined : dataItemOrAccessor,
+            isFunc = typeof(realDataItemOrAccessor) == "function" && !ko.isObservable(realDataItemOrAccessor),
+            subscribable,
+            dataDependency = options?.['dataDependency'],
+
+        // The binding context object includes static properties for the current, parent, and root view models.
+        // If a view model is actually stored in an observable, the corresponding binding context object, and
+        // any child contexts, must be updated when the view model is changed.
+        updateContext = () => {
+            // Most of the time, the context will directly get a view model object, but if a function is given,
+            // we call the function to retrieve the view model. If the function accesses any observables or returns
+            // an observable, the dependency is tracked, and those observables can later cause the binding
+            // context to be updated.
+            var dataItemOrObservable = isFunc ? realDataItemOrAccessor() : realDataItemOrAccessor,
+                dataItem = ko.utils.unwrapObservable(dataItemOrObservable);
+
+            if (parentContext) {
+                // Copy $root and any custom properties from the parent context
+                ko.utils.extend(self, parentContext);
+
+                // Copy Symbol properties
+                if (contextAncestorBindingInfo in parentContext) {
+                    self[contextAncestorBindingInfo] = parentContext[contextAncestorBindingInfo];
+                }
+            } else {
+                self['$root'] = dataItem;
+            }
+
+            self[contextSubscribable] = subscribable;
+
+            if (shouldInheritData) {
+                dataItem = self['$data'];
+            } else {
+                self['$data'] = 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.
+            extendCallback?.(self, parentContext, dataItem);
+
+            // When a "parent" context is given and we don't already have a dependency on its context, register a dependency on it.
+            // Thus whenever the parent context is updated, this context will also be updated.
+            if (parentContext?.[contextSubscribable] && !ko.dependencyDetection.computed().hasAncestorDependency(parentContext[contextSubscribable])) {
+                parentContext[contextSubscribable]();
+            }
+
+            if (dataDependency) {
+                self[contextDataDependency] = dataDependency;
+            }
+
+            return self['$data'];
         };
 
-    ko.bindingProvider = new class
-    {
-        nodeHasBindings(node) {
-            switch (node.nodeType) {
-                case 1: // Element
-                    return node.getAttribute(defaultBindingAttributeName) != null;
-                case 8: // Comment node
-                    return ko.virtualElements.hasBindingValue(node);
-                default: return false;
-            }
-        }
+        if (options?.['exportDependencies']) {
+            // The "exportDependencies" option means that the calling code will track any dependencies and re-create
+            // the binding context when they change.
+            updateContext();
+        } else {
+            subscribable = ko.pureComputed(updateContext);
+            subscribable.peek();
 
-        getBindingAccessors(node, bindingContext) {
-            var bindingsString = getBindingsString(node);
-            if (bindingsString) {
-                try {
-                    let options = { 'valueAccessors': true },
-                        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);
-                        bindingCache.set(cacheKey, bindingFunction);
-                    }
-                    return bindingFunction(bindingContext, node);
-                } catch (ex) {
-                    ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
-                        + "\nMessage: " + ex.message;
-                    throw ex;
-                }
-            }
-            return null;
-        }
-    };
-
-})();
-(() => {
-    // Hide or don't minify context properties, see https://github.com/knockout/knockout/issues/2294
-    var contextSubscribable = Symbol('_subscribable');
-    var contextAncestorBindingInfo = Symbol('_ancestorBindingInfo');
-    var contextDataDependency = Symbol('_dataDependency');
-
-    ko.bindingHandlers = {};
-
-    var inheritParentVm = {};
-
-    // 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)
-        {
-            // The binding context object includes static properties for the current, parent, and root view models.
-            // If a view model is actually stored in an observable, the corresponding binding context object, and
-            // any child contexts, must be updated when the view model is changed.
-            function updateContext() {
-                // Most of the time, the context will directly get a view model object, but if a function is given,
-                // we call the function to retrieve the view model. If the function accesses any observables or returns
-                // an observable, the dependency is tracked, and those observables can later cause the binding
-                // context to be updated.
-                var dataItemOrObservable = isFunc ? realDataItemOrAccessor() : realDataItemOrAccessor,
-                    dataItem = ko.utils.unwrapObservable(dataItemOrObservable);
-
-                if (parentContext) {
-                    // Copy $root and any custom properties from the parent context
-                    ko.utils.extend(self, parentContext);
-
-                    // Copy Symbol properties
-                    if (contextAncestorBindingInfo in parentContext) {
-                        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;
-
-                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.
-                if (extendCallback)
-                    extendCallback(self, parentContext, dataItem);
-
-                // When a "parent" context is given and we don't already have a dependency on its context, register a dependency on it.
-                // Thus whenever the parent context is updated, this context will also be updated.
-                if (parentContext && parentContext[contextSubscribable] && !ko.dependencyDetection.computed().hasAncestorDependency(parentContext[contextSubscribable])) {
-                    parentContext[contextSubscribable]();
-                }
-
-                if (dataDependency) {
-                    self[contextDataDependency] = dataDependency;
-                }
-
-                return self['$data'];
-            }
-
-            var self = this,
-                shouldInheritData = dataItemOrAccessor === inheritParentVm,
-                realDataItemOrAccessor = shouldInheritData ? undefined : dataItemOrAccessor,
-                isFunc = typeof(realDataItemOrAccessor) == "function" && !ko.isObservable(realDataItemOrAccessor),
-                subscribable,
-                dataDependency = options && options['dataDependency'];
-
-            if (options && options['exportDependencies']) {
-                // The "exportDependencies" option means that the calling code will track any dependencies and re-create
-                // the binding context when they change.
-                updateContext();
+            // At this point, the binding context has been initialized, and the "subscribable" computed observable is
+            // subscribed to any observables that were accessed in the process. If there is nothing to track, the
+            // computed will be inactive, and we can safely throw it away. If it's active, the computed is stored in
+            // the context object.
+            if (subscribable.isActive()) {
+                // Always notify because even if the model ($data) hasn't changed, other context properties might have changed
+                subscribable.equalityComparer = null;
             } else {
-                subscribable = ko.pureComputed(updateContext);
-                subscribable.peek();
+                self[contextSubscribable] = undefined;
+            }
+        }
+    }
 
-                // At this point, the binding context has been initialized, and the "subscribable" computed observable is
-                // subscribed to any observables that were accessed in the process. If there is nothing to track, the
-                // computed will be inactive, and we can safely throw it away. If it's active, the computed is stored in
-                // the context object.
-                if (subscribable.isActive()) {
-                    // Always notify because even if the model ($data) hasn't changed, other context properties might have changed
-                    subscribable.equalityComparer = null;
-                } else {
-                    self[contextSubscribable] = undefined;
+    // Extend the binding context hierarchy with a new view model object. If the parent context is watching
+    // any observables, the new child context will automatically get a dependency on the parent context.
+    // 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, options) {
+        return new ko.bindingContext(dataItemOrAccessor, this, (self, parentContext) => {
+            // Extend the context hierarchy by setting the appropriate pointers
+            self['$parent'] = parentContext['$data'];
+            options['extend']?.(self);
+        }, options);
+    }
+
+    // Extend the binding context with new custom properties. This doesn't change the context hierarchy.
+    // 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, self =>
+            ko.utils.extend(self, typeof(properties) == "function" ? properties(self) : properties)
+        , options);
+    }
+};
+
+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) {
+        this.node = node;
+        this.bindingInfo = bindingInfo;
+        this.asyncDescendants = new Set;
+        this.childrenComplete = false;
+
+        bindingInfo.asyncContext || ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
+
+        if (ancestorBindingInfo?.asyncContext) {
+            ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
+            this.ancestorBindingInfo = ancestorBindingInfo;
+        }
+    }
+    notifyAncestor() {
+        this.ancestorBindingInfo?.asyncContext?.descendantComplete(this.node);
+    }
+    descendantComplete(node) {
+        this.asyncDescendants.delete(node);
+        this.asyncDescendants.size || this.completeChildren?.();
+    }
+    completeChildren() {
+        this.childrenComplete = true;
+        if (this.bindingInfo.asyncContext && !this.asyncDescendants.size) {
+            this.bindingInfo.asyncContext = null;
+            ko.utils.domNodeDisposal.removeDisposeCallback(this.node, asyncContextDispose);
+            ko.bindingEvent.notify(this.node, ko.bindingEvent.descendantsComplete);
+            this.notifyAncestor();
+        }
+    }
+}
+
+ko.bindingEvent = {
+    childrenComplete: "childrenComplete",
+    descendantsComplete : "descendantsComplete",
+
+    subscribe: (node, event, callback, context, options) => {
+        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
+        if (!bindingInfo.eventSubscribable) {
+            bindingInfo.eventSubscribable = new ko.subscribable;
+        }
+        if (options?.['notifyImmediately'] && bindingInfo.notifiedEvents[event]) {
+            ko.dependencyDetection.ignore(callback, context, [node]);
+        }
+        return bindingInfo.eventSubscribable['subscribe'](callback, context, event);
+    },
+
+    notify: (node, event) => {
+        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
+        if (bindingInfo) {
+            bindingInfo.notifiedEvents[event] = true;
+            bindingInfo.eventSubscribable?.notifySubscribers(node, event);
+            if (event == ko.bindingEvent.childrenComplete) {
+                if (bindingInfo.asyncContext) {
+                    bindingInfo.asyncContext.completeChildren();
+                } 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 Error("descendantsComplete event not supported for bindings on this node");
                 }
             }
         }
+    },
 
-        // Extend the binding context hierarchy with a new view model object. If the parent context is watching
-        // any observables, the new child context will automatically get a dependency on the parent context.
-        // 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'];
-            }
+    startPossiblyAsyncContentBinding: (node, bindingContext) => {
+        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
 
-            return new ko.bindingContext(dataItemOrAccessor, this, dataItemAlias, (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);
+        if (!bindingInfo.asyncContext) {
+            bindingInfo.asyncContext = new AsyncCompleteContext(node, bindingInfo, bindingContext[contextAncestorBindingInfo]);
         }
 
-        // Extend the binding context with new custom properties. This doesn't change the context hierarchy.
-        // 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 =>
-                ko.utils.extend(self, typeof(properties) == "function" ? properties(self) : properties)
-            , options);
+        // If the provided context was already extended with this node's binding info, just return the extended context
+        if (bindingContext[contextAncestorBindingInfo] == bindingInfo) {
+            return bindingContext;
         }
-    };
 
-    var boundElementDomDataKey = ko.utils.domData.nextKey();
-
-    function asyncContextDispose(node) {
-        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey),
-            asyncContext = bindingInfo && bindingInfo.asyncContext;
-        if (asyncContext) {
-            bindingInfo.asyncContext = null;
-            asyncContext.notifyAncestor();
-        }
+        return bindingContext['extend'](ctx => {
+            ctx[contextAncestorBindingInfo] = bindingInfo;
+        });
     }
+};
 
-    class AsyncCompleteContext {
-        constructor(node, bindingInfo, ancestorBindingInfo) {
-            this.node = node;
-            this.bindingInfo = bindingInfo;
-            this.asyncDescendants = new Set;
-            this.childrenComplete = false;
+const applyBindingsToDescendantsInternal = (bindingContext, elementOrVirtualElement) => {
+    var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
 
-            if (!bindingInfo.asyncContext) {
-                ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
-            }
-
-            if (ancestorBindingInfo && ancestorBindingInfo.asyncContext) {
-                ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
-                this.ancestorBindingInfo = ancestorBindingInfo;
-            }
-        }
-        notifyAncestor() {
-            if (this.ancestorBindingInfo && this.ancestorBindingInfo.asyncContext) {
-                this.ancestorBindingInfo.asyncContext.descendantComplete(this.node);
-            }
-        }
-        descendantComplete(node) {
-            this.asyncDescendants.delete(node);
-            if (!this.asyncDescendants.size && this.childrenComplete) {
-                this.completeChildren();
-            }
-        }
-        completeChildren() {
-            this.childrenComplete = true;
-            if (this.bindingInfo.asyncContext && !this.asyncDescendants.size) {
-                this.bindingInfo.asyncContext = null;
-                ko.utils.domNodeDisposal.removeDisposeCallback(this.node, asyncContextDispose);
-                ko.bindingEvent.notify(this.node, ko.bindingEvent.descendantsComplete);
-                this.notifyAncestor();
-            }
-        }
+    while (currentChild = nextInQueue) {
+        // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
+        nextInQueue = ko.virtualElements.nextSibling(currentChild);
+        applyBindingsToNodeAndDescendantsInternal(bindingContext, currentChild);
     }
+    ko.bindingEvent.notify(elementOrVirtualElement, ko.bindingEvent.childrenComplete);
+};
 
-    ko.bindingEvent = {
-        childrenComplete: "childrenComplete",
-        descendantsComplete : "descendantsComplete",
+const applyBindingsToNodeAndDescendantsInternal = (bindingContext, nodeVerified) => {
+    var bindingContextForDescendants = bindingContext;
 
-        subscribe: (node, event, callback, context, options) => {
-            var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-            if (!bindingInfo.eventSubscribable) {
-                bindingInfo.eventSubscribable = new ko.subscribable;
-            }
-            if (options && options['notifyImmediately'] && bindingInfo.notifiedEvents[event]) {
-                ko.dependencyDetection.ignore(callback, context, [node]);
-            }
-            return bindingInfo.eventSubscribable.subscribe(callback, context, event);
-        },
+    // 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 ((1 === nodeVerified.nodeType) || ko.bindingProvider.nodeHasBindings(nodeVerified))
+        bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext);
 
-        notify: (node, event) => {
-            var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
-            if (bindingInfo) {
-                bindingInfo.notifiedEvents[event] = true;
-                if (bindingInfo.eventSubscribable) {
-                    bindingInfo.eventSubscribable.notifySubscribers(node, event);
-                }
-                if (event == ko.bindingEvent.childrenComplete) {
-                    if (bindingInfo.asyncContext) {
-                        bindingInfo.asyncContext.completeChildren();
-                    } else if (bindingInfo.asyncContext === undefined && bindingInfo.eventSubscribable && 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");
-                    }
-                }
-            }
-        },
-
-        startPossiblyAsyncContentBinding: (node, bindingContext) => {
-            var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-
-            if (!bindingInfo.asyncContext) {
-                bindingInfo.asyncContext = new AsyncCompleteContext(node, bindingInfo, bindingContext[contextAncestorBindingInfo]);
-            }
-
-            // If the provided context was already extended with this node's binding info, just return the extended context
-            if (bindingContext[contextAncestorBindingInfo] == bindingInfo) {
-                return bindingContext;
-            }
-
-            return bindingContext['extend'](ctx => {
-                ctx[contextAncestorBindingInfo] = bindingInfo;
-            });
-        }
-    };
-
-    function validateThatBindingIsAllowedForVirtualElements(bindingName) {
-        var validator = ko.virtualElements.allowedBindings[bindingName];
-        if (!validator)
-            throw new Error("The binding '" + bindingName + "' cannot be used with virtual elements")
+    // Don't want bindings that operate on text nodes to mutate <script> and <textarea> contents,
+    // because it's unexpected and a potential XSS issue.
+    // Also bindings should not operate on <template> elements since this breaks in Internet Explorer
+    // and because such elements' contents are always intended to be bound in a different context
+    // from where they appear in the document.
+    if (bindingContextForDescendants && !nodeVerified.matches?.('SCRIPT,TEXTAREA,TEMPLATE')) {
+        applyBindingsToDescendantsInternal(bindingContextForDescendants, nodeVerified);
     }
+};
 
-    function applyBindingsToDescendantsInternal(bindingContext, elementOrVirtualElement) {
-        var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
-
-        while (currentChild = nextInQueue) {
-            // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
-            nextInQueue = ko.virtualElements.nextSibling(currentChild);
-            applyBindingsToNodeAndDescendantsInternal(bindingContext, currentChild);
-        }
-        ko.bindingEvent.notify(elementOrVirtualElement, ko.bindingEvent.childrenComplete);
-    }
-
-    function 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)
-        var shouldApplyBindings = isElement || ko.bindingProvider.nodeHasBindings(nodeVerified);
-        if (shouldApplyBindings)
-            bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext)['bindingContextForDescendants'];
-
-        // Don't want bindings that operate on text nodes to mutate <script> and <textarea> contents,
-        // because it's unexpected and a potential XSS issue.
-        // Also bindings should not operate on <template> elements since this breaks in Internet Explorer
-        // and because such elements' contents are always intended to be bound in a different context
-        // from where they appear in the document.
-        if (bindingContextForDescendants && nodeVerified.matches && !nodeVerified.matches('SCRIPT,TEXTAREA,TEMPLATE')) {
-            applyBindingsToDescendantsInternal(bindingContextForDescendants, nodeVerified);
-        }
-    }
-
-    function topologicalSortBindings(bindings) {
-        // Depth-first sort
-        var result = [],                // The list of key/handler pairs that we will return
-            bindingsConsidered = {},    // A temporary record of which bindings are already in 'result'
-            cyclicDependencyStack = []; // Keeps track of a depth-search so that, if there's a cycle, we know which bindings caused it
-        ko.utils.objectForEach(bindings, function pushBinding(bindingKey) {
+const topologicalSortBindings = bindings => {
+    // Depth-first sort
+    var result = [],                // The list of key/handler pairs that we will return
+        bindingsConsidered = {},    // A temporary record of which bindings are already in 'result'
+        cyclicDependencyStack = [], // Keeps track of a depth-search so that, if there's a cycle, we know which bindings caused it
+        pushBinding = bindingKey => {
             if (!bindingsConsidered[bindingKey]) {
                 var binding = ko.bindingHandlers[bindingKey];
                 if (binding) {
@@ -2121,211 +1922,182 @@ ko.expressionRewriting = (() => {
                 }
                 bindingsConsidered[bindingKey] = true;
             }
-        });
+        };
+    ko.utils.objectForEach(bindings, pushBinding);
 
-        return result;
+    return result;
+};
+
+const applyBindingsToNodeInternal = (node, sourceBindings, bindingContext) => {
+    var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
+
+    // Prevent multiple applyBindings calls for the same node, except when a binding value is specified
+    var alreadyBound = bindingInfo.alreadyBound;
+    if (!sourceBindings) {
+        if (alreadyBound) {
+            throw Error("You cannot apply bindings multiple times to the same element.");
+        }
+        bindingInfo.alreadyBound = true;
+    }
+    if (!alreadyBound) {
+        bindingInfo.context = bindingContext;
+    }
+    if (!bindingInfo.notifiedEvents) {
+        bindingInfo.notifiedEvents = {};
     }
 
-    function applyBindingsToNodeInternal(node, sourceBindings, bindingContext) {
-        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-
-        // Prevent multiple applyBindings calls for the same node, except when a binding value is specified
-        var alreadyBound = bindingInfo.alreadyBound;
-        if (!sourceBindings) {
-            if (alreadyBound) {
-                throw Error("You cannot apply bindings multiple times to the same element.");
-            }
-            bindingInfo.alreadyBound = true;
-        }
-        if (!alreadyBound) {
-            bindingInfo.context = bindingContext;
-        }
-        if (!bindingInfo.notifiedEvents) {
-            bindingInfo.notifiedEvents = {};
-        }
-
-        // Use bindings if given, otherwise fall back on asking the bindings provider to give us some bindings
-        var bindings;
-        if (sourceBindings && typeof sourceBindings !== 'function') {
-            bindings = sourceBindings;
-        } else {
-            // Get the binding from the provider within a computed observable so that we can update the bindings whenever
-            // the binding context is updated or if the binding provider accesses observables.
-            var bindingsUpdater = ko.computed(
-                () => {
-                    bindings = sourceBindings ? sourceBindings(bindingContext, node) : ko.bindingProvider.getBindingAccessors(node, bindingContext);
-                    // Register a dependency on the binding context to support observable view models.
-                    if (bindings) {
-                        if (bindingContext[contextSubscribable]) {
-                            bindingContext[contextSubscribable]();
-                        }
-                        if (bindingContext[contextDataDependency]) {
-                            bindingContext[contextDataDependency]();
-                        }
-                    }
-                    return bindings;
-                },
-                { disposeWhenNodeIsRemoved: node }
-            );
-
-            if (!bindings || !bindingsUpdater.isActive())
-                bindingsUpdater = null;
-        }
-
-        var contextToExtend = bindingContext;
-        var bindingHandlerThatControlsDescendantBindings;
-        if (bindings) {
-            // Return the value accessor for a given binding. When bindings are static (won't be updated because of a binding
-            // context update), just return the value accessor from the binding. Otherwise, return a function that always gets
-            // the latest binding value and registers a dependency on the binding updater.
-            var getValueAccessor = bindingsUpdater
-                ? bindingKey => () => bindingsUpdater()[bindingKey]()
-                : bindingKey => bindings[bindingKey];
-
-            // Use of allBindings as a function is deprecated and removed
-            // The following is the 3.x allBindings API
-            var allBindings = {
-                'get': key => bindings[key] && getValueAccessor(key)(),
-                'has': key => key in bindings
-            };
-
-            if (ko.bindingEvent.childrenComplete in bindings) {
-                ko.bindingEvent.subscribe(node, ko.bindingEvent.childrenComplete, () => {
-                    var callback = bindings[ko.bindingEvent.childrenComplete]();
-                    if (callback) {
-                        var nodes = ko.virtualElements.childNodes(node);
-                        if (nodes.length) {
-                            callback(nodes, ko.dataFor(nodes[0]));
-                        }
-                    }
-                });
-            }
-
-            if (ko.bindingEvent.descendantsComplete in bindings) {
-                contextToExtend = ko.bindingEvent.startPossiblyAsyncContentBinding(node, bindingContext);
-                ko.bindingEvent.subscribe(node, ko.bindingEvent.descendantsComplete, () => {
-                    var callback = bindings[ko.bindingEvent.descendantsComplete]();
-                    if (callback && ko.virtualElements.firstChild(node)) {
-                        callback(node);
-                    }
-                });
-            }
-
-            // First put the bindings into the right order
-            // Go through the sorted bindings, calling init and update for each
-            topologicalSortBindings(bindings).forEach(bindingKeyAndHandler => {
-                // Note that topologicalSortBindings has already filtered out any nonexistent binding handlers,
-                // so bindingKeyAndHandler.handler will always be nonnull.
-                var handlerInitFn = bindingKeyAndHandler.handler["init"],
-                    handlerUpdateFn = bindingKeyAndHandler.handler["update"],
-                    bindingKey = bindingKeyAndHandler.key;
-
-                if (node.nodeType === 8) {
-                    validateThatBindingIsAllowedForVirtualElements(bindingKey);
+    // Use bindings if given, otherwise fall back on asking the bindings provider to give us some bindings
+    var bindings, bindingsUpdater;
+    if (sourceBindings && typeof sourceBindings !== 'function') {
+        bindings = sourceBindings;
+    } else {
+        // Get the binding from the provider within a computed observable so that we can update the bindings whenever
+        // the binding context is updated or if the binding provider accesses observables.
+        bindingsUpdater = ko.computed(
+            () => {
+                bindings = sourceBindings ? sourceBindings(bindingContext, node) : ko.bindingProvider.getBindingAccessors(node, bindingContext);
+                // Register a dependency on the binding context to support observable view models.
+                if (bindings) {
+                    bindingContext[contextSubscribable]?.();
+                    bindingContext[contextDataDependency]?.();
                 }
+                return bindings;
+            },
+            { disposeWhenNodeIsRemoved: node }
+        );
 
-                try {
-                    // Run init, ignoring any dependencies
-                    if (typeof handlerInitFn == "function") {
-                        ko.dependencyDetection.ignore(() => {
-                            var initResult = handlerInitFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend);
+        if (!bindings || !bindingsUpdater.isActive())
+            bindingsUpdater = null;
+    }
 
-                            // If this binding handler claims to control descendant bindings, make a note of this
-                            if (initResult && initResult['controlsDescendantBindings']) {
-                                if (bindingHandlerThatControlsDescendantBindings !== undefined)
-                                    throw new Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
-                                bindingHandlerThatControlsDescendantBindings = bindingKey;
-                            }
-                        });
-                    }
+    var contextToExtend = bindingContext;
+    var bindingHandlerThatControlsDescendantBindings;
+    if (bindings) {
+        // Return the value accessor for a given binding. When bindings are static (won't be updated because of a binding
+        // context update), just return the value accessor from the binding. Otherwise, return a function that always gets
+        // the latest binding value and registers a dependency on the binding updater.
+        var getValueAccessor = bindingsUpdater
+            ? bindingKey => () => bindingsUpdater()[bindingKey]()
+            : bindingKey => bindings[bindingKey];
 
-                    // Run update in its own computed wrapper
-                    if (typeof handlerUpdateFn == "function") {
-                        ko.computed(
-                            () => handlerUpdateFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend),
-                            { disposeWhenNodeIsRemoved: node }
-                        );
-                    }
-                } catch (ex) {
-                    ex.message = "Unable to process binding \"" + bindingKey + ": " + bindings[bindingKey] + "\"\nMessage: " + ex.message;
-                    throw ex;
+        // Use of allBindings as a function is deprecated and removed
+        // The following is the 3.x allBindings API
+        var allBindings = {
+            'get': key => bindings[key] && getValueAccessor(key)(),
+            'has': key => key in bindings
+        };
+
+        if (ko.bindingEvent.childrenComplete in bindings) {
+            ko.bindingEvent.subscribe(node, ko.bindingEvent.childrenComplete, () => {
+                var callback = bindings[ko.bindingEvent.childrenComplete]();
+                if (callback) {
+                    var nodes = ko.virtualElements.childNodes(node);
+                    nodes.length && callback(nodes, ko['dataFor'](nodes[0]));
                 }
             });
         }
 
-        var shouldBindDescendants = bindingHandlerThatControlsDescendantBindings === undefined;
-        return {
-            'shouldBindDescendants': shouldBindDescendants,
-            'bindingContextForDescendants': shouldBindDescendants && contextToExtend
-        };
-    }
-
-    ko.storedBindingContextForNode = node => {
-        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
-        return bindingInfo && bindingInfo.context;
-    }
-
-    function getBindingContext(viewModelOrBindingContext, extendContextCallback) {
-        return viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
-            ? viewModelOrBindingContext
-            : new ko.bindingContext(viewModelOrBindingContext, undefined, undefined, extendContextCallback);
-    }
-
-    ko.applyBindingAccessorsToNode = (node, bindings, viewModelOrBindingContext) =>
-        applyBindingsToNodeInternal(node, bindings, getBindingContext(viewModelOrBindingContext));
-
-    ko.applyBindingsToDescendants = (viewModelOrBindingContext, rootNode) => {
-        if (rootNode.nodeType === 1 || rootNode.nodeType === 8)
-            applyBindingsToDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
-    };
-
-    ko.applyBindings = function (viewModelOrBindingContext, rootNode, extendContextCallback) {
-        if (arguments.length < 2) {
-            rootNode = document.body;
-            if (!rootNode) {
-                throw Error("ko.applyBindings: could not find document.body; has the document been loaded?");
-            }
-        } else if (!rootNode || (rootNode.nodeType !== 1 && rootNode.nodeType !== 8)) {
-            throw Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");
+        if (ko.bindingEvent.descendantsComplete in bindings) {
+            contextToExtend = ko.bindingEvent.startPossiblyAsyncContentBinding(node, bindingContext);
+            ko.bindingEvent.subscribe(node, ko.bindingEvent.descendantsComplete, () => {
+                var callback = bindings[ko.bindingEvent.descendantsComplete]();
+                if (callback && ko.virtualElements.firstChild(node)) {
+                    callback(node);
+                }
+            });
         }
 
-        applyBindingsToNodeAndDescendantsInternal(getBindingContext(viewModelOrBindingContext, extendContextCallback), rootNode);
-    };
+        // First put the bindings into the right order
+        // Go through the sorted bindings, calling init and update for each
+        topologicalSortBindings(bindings).forEach(bindingKeyAndHandler => {
+            // Note that topologicalSortBindings has already filtered out any nonexistent binding handlers,
+            // so bindingKeyAndHandler.handler will always be nonnull.
+            var handlerInitFn = bindingKeyAndHandler.handler["init"],
+                handlerUpdateFn = bindingKeyAndHandler.handler["update"],
+                bindingKey = bindingKeyAndHandler.key;
 
-    // Retrieving binding context from arbitrary nodes
-    ko.dataFor = node => {
-        // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
-        var context = node && [1,8].includes(node.nodeType) && ko.storedBindingContextForNode(node);
-        return context ? context['$data'] : undefined;
-    };
+            // COMMENT_NODE
+            if (node.nodeType === 8 && !ko.virtualElements.allowedBindings[bindingKey]) {
+                throw Error("The binding '" + bindingKey + "' cannot be used with comment nodes");
+            }
 
-    ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
-    ko.exportSymbol('applyBindings', ko.applyBindings);
-    ko.exportSymbol('applyBindingAccessorsToNode', ko.applyBindingAccessorsToNode);
-    ko.exportSymbol('dataFor', ko.dataFor);
-})();
+            try {
+                // Run init, ignoring any dependencies
+                if (typeof handlerInitFn == "function") {
+                    ko.dependencyDetection.ignore(() => {
+                        var initResult = handlerInitFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend);
+
+                        // If this binding handler claims to control descendant bindings, make a note of this
+                        if (initResult && initResult['controlsDescendantBindings']) {
+                            if (bindingHandlerThatControlsDescendantBindings !== undefined)
+                                throw Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
+                            bindingHandlerThatControlsDescendantBindings = bindingKey;
+                        }
+                    });
+                }
+
+                // Run update in its own computed wrapper
+                if (typeof handlerUpdateFn == "function") {
+                    ko.computed(
+                        () => handlerUpdateFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend),
+                        { disposeWhenNodeIsRemoved: node }
+                    );
+                }
+            } catch (ex) {
+                ex.message = "Unable to process binding \"" + bindingKey + ": " + bindings[bindingKey] + "\"\nMessage: " + ex.message;
+                throw ex;
+            }
+        });
+    }
+
+    return bindingHandlerThatControlsDescendantBindings === undefined && contextToExtend;
+};
+
+ko.storedBindingContextForNode = node =>
+    ko.utils.domData.get(node, boundElementDomDataKey)?.context;
+
+const getBindingContext = (viewModelOrBindingContext) =>
+    viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
+        ? viewModelOrBindingContext
+        : new ko.bindingContext(viewModelOrBindingContext);
+
+ko['applyBindingAccessorsToNode'] = (node, bindings, viewModelOrBindingContext) =>
+    applyBindingsToNodeInternal(node, bindings, getBindingContext(viewModelOrBindingContext));
+
+ko.applyBindingsToDescendants = (viewModelOrBindingContext, rootNode) =>
+    (rootNode.nodeType === 1 || rootNode.nodeType === 8)
+    && applyBindingsToDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
+
+ko.applyBindings = (viewModelOrBindingContext, rootNode) =>
+    applyBindingsToNodeAndDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
+
+// Retrieving binding context from arbitrary nodes
+ko['dataFor'] = node =>
+    // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
+    ([1,8].includes(node?.nodeType) && ko.storedBindingContextForNode(node))?.['$data'];
+
+ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
+//ko.exportSymbol('applyBindings', ko.applyBindings);
 (() => {
     var loadingSubscribablesCache = Object.create(null), // Tracks component loads that are currently in flight
-        loadedDefinitionsCache = Object.create(null);    // Tracks component loads that have already completed
+        loadedDefinitionsCache = new Map();    // Tracks component loads that have already completed
 
-    ko.components = {
+    ko['components'] = {
         get: (componentName, callback) => {
-            var cachedDefinition = loadedDefinitionsCache[componentName];
-            if (cachedDefinition) {
-                ko.tasks.schedule(() => callback(cachedDefinition.definition) );
+            if (loadedDefinitionsCache.has(componentName)) {
+                callback(loadedDefinitionsCache.get(componentName));
             } else {
                 // Join the loading process that is already underway, or start a new one.
-                var subscribable = loadingSubscribablesCache[componentName],
-                    completedAsync;
+                var subscribable = loadingSubscribablesCache[componentName];
                 if (subscribable) {
-                    subscribable.subscribe(callback);
+                    subscribable['subscribe'](callback);
                 } else {
                     // It's not started loading yet. Start loading, and when it's done, move it to loadedDefinitionsCache.
                     subscribable = loadingSubscribablesCache[componentName] = new ko.subscribable();
-                    subscribable.subscribe(callback);
+                    subscribable['subscribe'](callback);
 
-                    beginLoadingComponent(componentName, definition => {
-                        loadedDefinitionsCache[componentName] = { definition: definition };
+                    loadComponent(componentName, definition => {
+                        loadedDefinitionsCache.set(componentName, definition);
                         delete loadingSubscribablesCache[componentName];
 
                         // For API consistency, all loads complete asynchronously. However we want to avoid
@@ -2334,29 +2106,19 @@ ko.expressionRewriting = (() => {
                         //
                         // You can bypass the 'always asynchronous' feature by putting the synchronous:true
                         // flag on your component configuration when you register it.
-                        if (completedAsync) {
-                            // Note that notifySubscribers ignores any dependencies read within the callback.
-                            // See comment in loaderRegistryBehaviors.js for reasoning
-                            subscribable.notifySubscribers(definition);
-                        } else {
-                            ko.tasks.schedule(() => subscribable.notifySubscribers(definition));
-                        }
+                        subscribable.notifySubscribers(definition);
                     });
-                    completedAsync = true;
                 }
             }
         },
 
-        clearCachedDefinition: componentName =>
-            delete loadedDefinitionsCache[componentName],
-
-        register: (componentName, config) => {
+        'register': (componentName, config) => {
             if (!config) {
-                throw new Error('Invalid configuration for ' + componentName);
+                throw Error('Invalid configuration for ' + componentName);
             }
 
             if (defaultConfigRegistry[componentName]) {
-                throw new Error('Component ' + componentName + ' is already registered');
+                throw Error('Component ' + componentName + ' is already registered');
             }
 
             defaultConfigRegistry[componentName] = config;
@@ -2373,73 +2135,53 @@ ko.expressionRewriting = (() => {
     // 1. To supply configuration objects from some other source (e.g., conventions)
     // 2. Or, to resolve configuration objects by loading viewmodels/templates via arbitrary logic.
 
-    var defaultConfigRegistry = Object.create(null);
-    var createViewModelKey = 'createViewModel';
+    var defaultConfigRegistry = Object.create(null),
+        createViewModelKey = 'createViewModel',
+        throwError = (componentName, message) => { throw Error(`Component '${componentName}': ${message}`) },
 
-    // Takes a config object of the form { template: ..., viewModel: ... }, and asynchronously convert it
-    // into the standard component definition format:
-    //    { template: <ArrayOfDomNodes>, createViewModel: function(params, componentInfo) { ... } }.
-    // Since both template and viewModel may need to be resolved asynchronously, both tasks are performed
-    // in parallel, and the results joined when both are ready. We don't depend on any promises infrastructure,
-    // so this is implemented manually below.
-    function loadComponent(componentName, callback) {
-        var result = {},
-            config = defaultConfigRegistry[componentName] || {},
-            templateConfig = config['template'],
-            viewModelConfig = config['viewModel'];
+        // Takes a config object of the form { template: ..., viewModel: ... }, and asynchronously convert it
+        // into the standard component definition format:
+        //    { template: <ArrayOfDomNodes>, createViewModel: function(params, componentInfo) { ... } }.
+        // Since both template and viewModel may need to be resolved asynchronously, both tasks are performed
+        // in parallel, and the results joined when both are ready. We don't depend on any promises infrastructure,
+        // so this is implemented manually below.
+        loadComponent = (componentName, callback) => {
+            // Try the candidates
+            var result = {},
+                config = defaultConfigRegistry[componentName] || {},
+                templateConfig = config['template'],
+                viewModelConfig = config['viewModel'];
 
-        if (templateConfig) {
-            if (!templateConfig['element']) {
-                throwError(componentName, 'Unknown template value: ' + templateConfig);
+            if (templateConfig) {
+                if (!templateConfig['element']) {
+                    throwError(componentName, 'Unknown template value: ' + templateConfig);
+                }
+                // Element ID - find it, then copy its child nodes
+                var element = templateConfig['element'];
+                var elemInstance = document.getElementById(element);
+                if (!elemInstance) {
+                    throwError(componentName, 'Cannot find element with ID ' + element);
+                }
+                if (!elemInstance.matches('TEMPLATE')) {
+                    throwError(componentName, 'Template Source Element not a <template>');
+                }
+                // For browsers with proper <template> element support (i.e., where the .content property
+                // gives a document fragment), use that document fragment.
+                result['template'] = ko.utils.cloneNodes(elemInstance.content.childNodes);
             }
-            // Element ID - find it, then copy its child nodes
-            var element = templateConfig['element'];
-            var elemInstance = document.getElementById(element);
-            if (!elemInstance) {
-                throwError(componentName, 'Cannot find element with ID ' + element);
+
+            if (viewModelConfig) {
+                if (typeof viewModelConfig[createViewModelKey] !== 'function') {
+                    throwError(componentName, 'Unknown viewModel value: ' + viewModelConfig);
+                }
+                // Already a factory function - use it as-is
+                result[createViewModelKey] = viewModelConfig[createViewModelKey];
             }
-            if (!elemInstance.matches('TEMPLATE')) {
-                throwError(componentName, 'Template Source Element not a <template>');
-            }
-            // For browsers with proper <template> element support (i.e., where the .content property
-            // gives a document fragment), use that document fragment.
-            result['template'] = ko.utils.cloneNodes(elemInstance.content.childNodes);
-        }
 
-        if (viewModelConfig) {
-            if (typeof viewModelConfig[createViewModelKey] !== 'function') {
-                throwError(componentName, 'Unknown viewModel value: ' + viewModelConfig);
-            }
-            // Already a factory function - use it as-is
-            result[createViewModelKey] = viewModelConfig[createViewModelKey];
-        }
-
-        if (result['template'] && result[createViewModelKey]) {
-            callback(result);
-        } else {
-            callback(null);
-        }
-    }
-
-    function throwError(componentName, message) {
-        throw new Error(`Component '${componentName}': ${message}`)
-    }
-
-    function beginLoadingComponent(componentName, callback) {
-        // Try the candidates
-        var found = false;
-        loadComponent(componentName, result => {
-            // This candidate returned a value. Use it.
-            (found = result != null) && callback(result);
-        });
-        if (!found) {
-            // No candidates returned a value
-            callback(null);
-        }
-    }
-
-    ko.exportSymbol('components', ko.components);
-    ko.exportSymbol('components.register', ko.components.register);
+            // Did candidate return a value?
+            var found = (result['template'] && result[createViewModelKey]);
+            callback(found ? result : null);
+        };
 })();
 (() => {
     var componentLoadingOperationUniqueId = 0;
@@ -2448,21 +2190,15 @@ ko.expressionRewriting = (() => {
         'init': (element, valueAccessor, ignored1, ignored2, bindingContext) => {
             var currentViewModel,
                 currentLoadingOperationId,
-                afterRenderSub,
                 disposeAssociatedComponentViewModel = () => {
                     var currentViewModelDispose = currentViewModel && currentViewModel['dispose'];
                     if (typeof currentViewModelDispose === 'function') {
                         currentViewModelDispose.call(currentViewModel);
                     }
-                    if (afterRenderSub) {
-                        afterRenderSub.dispose();
-                    }
-                    afterRenderSub = null;
                     currentViewModel = null;
                     // Any in-flight loading operation is no longer relevant, so make sure we ignore its completion
                     currentLoadingOperationId = null;
-                },
-                originalChildNodes = [...ko.virtualElements.childNodes(element)];
+                };
 
             ko.virtualElements.emptyNode(element);
             ko.utils.domNodeDisposal.addDisposeCallback(element, disposeAssociatedComponentViewModel);
@@ -2477,13 +2213,13 @@ ko.expressionRewriting = (() => {
                 }
 
                 if (!componentName) {
-                    throw new Error('No component name specified');
+                    throw Error('No component name specified');
                 }
 
                 var asyncContext = ko.bindingEvent.startPossiblyAsyncContentBinding(element, bindingContext);
 
                 var loadingOperationId = currentLoadingOperationId = ++componentLoadingOperationUniqueId;
-                ko.components.get(componentName, componentDefinition => {
+                ko['components'].get(componentName, componentDefinition => {
                     // If this is the current load operation for this element
                     if (currentLoadingOperationId === loadingOperationId) {
                         // Clean up previous state
@@ -2491,25 +2227,19 @@ ko.expressionRewriting = (() => {
 
                         // Instantiate and bind new component. Implicitly this cleans any old DOM nodes.
                         if (!componentDefinition) {
-                            throw new Error('Unknown component \'' + componentName + '\'');
+                            throw Error('Unknown component \'' + componentName + '\'');
                         }
                         // cloneTemplateIntoElement
                         var template = componentDefinition['template'];
                         if (!template) {
-                            throw new Error('Component \'' + componentName + '\' has no template');
+                            throw Error('Component \'' + componentName + '\' has no template');
                         }
                         ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(template));
 
                         currentViewModel = componentDefinition['createViewModel'](componentParams, {
-                            'element': element,
-                            'templateNodes': originalChildNodes
+                            'element': element
                         });
-                        ko.applyBindingsToDescendants(asyncContext['createChildContext'](currentViewModel, {
-                                'extend': ctx => {
-                                    ctx['$component'] = currentViewModel;
-                                    ctx['$componentTemplateNodes'] = originalChildNodes;
-                                }
-                            }), element);
+                        ko.applyBindingsToDescendants(asyncContext['createChildContext'](currentViewModel, {}), element);
                     }
                 });
             }, { disposeWhenNodeIsRemoved: element });
@@ -2539,35 +2269,141 @@ ko.bindingHandlers['attr'] = {
                 namespace ? element.removeAttributeNS(namespace, attrName) : element.removeAttribute(attrName);
             } else {
                 attrValue = attrValue.toString();
-            }
-
-            if (!toRemove) {
                 namespace ? element.setAttributeNS(namespace, attrName, attrValue) : element.setAttribute(attrName, attrValue);
             }
-
-            // Treat "name" specially - although you can think of it as an attribute, it also needs
-            // special handling on older versions of IE (https://github.com/SteveSanderson/knockout/pull/333)
-            // Deliberately being case-sensitive here because XHTML would regard "Name" as a different thing
-            // entirely, and there's no strong reason to allow for such casing in HTML.
-            if (attrName === "name") {
-                element.name = toRemove ? "" : attrValue;
-            }
         });
     }
 };
-var classesWrittenByBindingKey = '__ko__cssValue',
-    toggleClasses = (node, classNames, force) => {
-        if (classNames) {
-            classNames.split(/\s+/).forEach(className =>
-                node.classList.toggle(className, force)
-            );
+(()=>{
+
+ko.bindingHandlers['checked'] = {
+    'after': ['value', 'attr'],
+    'init'(element, valueAccessor, allBindings) {
+        var isCheckbox = element.type == "checkbox",
+            isRadio = element.type == "radio";
+
+        // Only bind to check boxes and radio buttons
+        if (isCheckbox || isRadio) {
+            const checkedValue = ko.pureComputed(()=>{
+                // Treat "value" like "checkedValue" when it is included with "checked" binding
+                if (allBindings['has']('checkedValue')) {
+                    return ko.utils.unwrapObservable(allBindings.get('checkedValue'));
+                }
+                if (useElementValue) {
+                    return allBindings['has']('value')
+                        ? ko.utils.unwrapObservable(allBindings.get('value'))
+                        : element.value;
+                }
+            });
+
+            var updateModel = () => {
+                // When we're first setting up this computed, don't change any model state.
+                if (ko.dependencyDetection.isInitial()) {
+                    return;
+                }
+
+                // This updates the model value from the view value.
+                // It runs in response to DOM events (click) and changes in checkedValue.
+                var isChecked = element.checked,
+                    elemValue = checkedValue();
+
+                // We can ignore unchecked radio buttons, because some other radio
+                // button will be checked, and that one can take care of updating state.
+                // Also ignore value changes to an already unchecked checkbox.
+                if (!isChecked && (isRadio || ko.dependencyDetection.getDependenciesCount())) {
+                    return;
+                }
+
+                var modelValue = ko.dependencyDetection.ignore(valueAccessor);
+                if (valueIsArray) {
+                    var writableValue = rawValueIsNonArrayObservable ? modelValue.peek() : modelValue,
+                        saveOldValue = oldElemValue;
+                    oldElemValue = elemValue;
+
+                    if (saveOldValue !== elemValue) {
+                        // When we're responding to the checkedValue changing, and the element is
+                        // currently checked, replace the old elem value with the new elem value
+                        // in the model array.
+                        if (isChecked) {
+                            writableValue.push(elemValue);
+                            writableValue.remove(saveOldValue);
+                        }
+                    } else {
+                        // When we're responding to the user having checked/unchecked a checkbox,
+                        // add/remove the element value to the model array.
+                        isChecked ? writableValue.push(elemValue) : writableValue.remove(elemValue);
+                    }
+
+                    if (rawValueIsNonArrayObservable && ko.isWriteableObservable(modelValue)) {
+                        modelValue(writableValue);
+                    }
+                } else {
+                    if (isCheckbox) {
+                        if (elemValue === undefined) {
+                            elemValue = isChecked;
+                        } else if (!isChecked) {
+                            elemValue = undefined;
+                        }
+                    }
+                    ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'checked', elemValue, true);
+                }
+            }
+
+            var rawValue = valueAccessor(),
+                valueIsArray = isCheckbox && (ko.utils.unwrapObservable(rawValue) instanceof Array),
+                rawValueIsNonArrayObservable = !(valueIsArray && rawValue.push && rawValue.splice),
+                useElementValue = isRadio || valueIsArray,
+                oldElemValue = valueIsArray ? checkedValue() : undefined;
+
+            // Set up two computeds to update the binding:
+
+            // The first responds to changes in the checkedValue value and to element clicks
+            ko.computed(updateModel, null, { disposeWhenNodeIsRemoved: element });
+            element.addEventListener("click", updateModel);
+
+            // The second responds to changes in the model value (the one associated with the checked binding)
+            ko.computed(() => {
+                // This updates the view value from the model value.
+                // It runs in response to changes in the bound (checked) value.
+                var modelValue = ko.utils.unwrapObservable(valueAccessor()),
+                    elemValue = checkedValue();
+
+                if (valueIsArray) {
+                    // When a checkbox is bound to an array, being checked represents its value being present in that array
+                    element.checked = modelValue.includes(elemValue);
+                    oldElemValue = elemValue;
+                } else if (isCheckbox && elemValue === undefined) {
+                    // When a checkbox is bound to any other value (not an array) and "checkedValue" is not defined,
+                    // being checked represents the value being trueish
+                    element.checked = !!modelValue;
+                } else {
+                    // Otherwise, being checked means that the checkbox or radio button's value corresponds to the model value
+                    element.checked = (checkedValue() === modelValue);
+                }
+            }, null, { disposeWhenNodeIsRemoved: element });
+
+            rawValue = undefined;
         }
-    };
+    }
+};
+
+ko.bindingHandlers['checkedValue'] = {
+    'update'(element, valueAccessor) {
+        element.value = ko.utils.unwrapObservable(valueAccessor());
+    }
+};
+
+})();
+var classesWrittenByBindingKey = '__ko__cssValue',
+    toggleClasses = (node, classNames, force) =>
+        classNames && classNames.split(/\s+/).forEach(className =>
+            node.classList.toggle(className, force)
+        );
 
 ko.bindingHandlers['css'] = {
     'update': (element, valueAccessor) => {
         var value = ko.utils.unwrapObservable(valueAccessor());
-        if (value !== null && typeof value == "object") {
+        if (typeof value == "object") {
             ko.utils.objectForEach(value, (className, shouldHaveClass) => {
                 shouldHaveClass = ko.utils.unwrapObservable(shouldHaveClass);
                 toggleClasses(element, className, !!shouldHaveClass);
@@ -2585,7 +2421,7 @@ ko.bindingHandlers['enable'] = {
         var value = ko.utils.unwrapObservable(valueAccessor());
         if (value && element.disabled)
             element.removeAttribute("disabled");
-        else if ((!value) && (!element.disabled))
+        else if (!value && !element.disabled)
             element.disabled = true;
     }
 };
@@ -2598,35 +2434,30 @@ ko.bindingHandlers['disable'] = {
 // e.g. click:handler instead of the usual full-length event:{click:handler}
 function makeEventHandlerShortcut(eventName) {
     ko.bindingHandlers[eventName] = {
-        'init': function(element, valueAccessor, allBindings, viewModel, bindingContext) {
-            var newValueAccessor = () => {
-                return {
-                    [eventName]: valueAccessor()
-                };
-            };
-            return ko.bindingHandlers['event']['init'].call(this, element, newValueAccessor, allBindings, viewModel, bindingContext);
+        'init'(element, valueAccessor, allBindings, viewModel, bindingContext) {
+            return ko.bindingHandlers['event']['init'].call(this, element,
+                () => ({[eventName]: valueAccessor()}), // newValueAccessor
+                allBindings, viewModel, bindingContext);
         }
     }
 }
 
 ko.bindingHandlers['event'] = {
-    'init' : (element, valueAccessor, allBindings, viewModel, bindingContext) => {
-        var eventsToHandle = valueAccessor() || {};
-        ko.utils.objectForEach(eventsToHandle, eventName => {
+    'init'(element, valueAccessor, allBindings, viewModel, bindingContext) {
+        ko.utils.objectForEach(valueAccessor() || {}, eventName => {
             if (typeof eventName == "string") {
-                element.addEventListener(eventName, function (event) {
-                    var handlerReturnValue;
-                    var handlerFunction = valueAccessor()[eventName];
-                    if (!handlerFunction)
-                        return;
-
-                    try {
-                        viewModel = bindingContext['$data'];
-                        // Take all the event args, and prefix with the viewmodel
-                        handlerReturnValue = handlerFunction.apply(viewModel, [viewModel, ...arguments]);
-                    } finally {
-                        if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                            event.preventDefault();
+                element.addEventListener(eventName, (...args) => {
+                    var handlerReturnValue,
+                        handlerFunction = valueAccessor()[eventName];
+                    if (handlerFunction) {
+                        try {
+                            viewModel = bindingContext['$data'];
+                            // Take all the event args, and prefix with the viewmodel
+                            handlerReturnValue = handlerFunction.apply(viewModel, [viewModel, ...args]);
+                        } finally {
+                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                                args[0].preventDefault();
+                            }
                         }
                     }
                 });
@@ -2635,39 +2466,35 @@ ko.bindingHandlers['event'] = {
     }
 };
 // "foreach: someExpression" is equivalent to "template: { foreach: someExpression }"
-// "foreach: { data: someExpression, afterAdd: myfn }" is equivalent to "template: { foreach: someExpression, afterAdd: myfn }"
-ko.bindingHandlers['foreach'] = {
-    makeTemplateValueAccessor: valueAccessor => {
-        return () => {
-            var modelValue = valueAccessor(),
-                // Unwrap without setting a dependency here
-                unwrappedValue = ko.isObservable(modelValue) ? modelValue.peek() : modelValue;
+// "foreach: { data: someExpression }" is equivalent to "template: { foreach: someExpression }"
+const makeTemplateValueAccessor = valueAccessor =>
+    () => {
+        var modelValue = valueAccessor(),
+            // Unwrap without setting a dependency here
+            unwrappedValue = ko.isObservable(modelValue) ? modelValue.peek() : modelValue;
 
-            // If unwrappedValue is the array, pass in the wrapped value on its own
-            // The value will be unwrapped and tracked within the template binding
-            // (See https://github.com/SteveSanderson/knockout/issues/523)
-            if ((!unwrappedValue) || typeof unwrappedValue.length == "number")
-                return { 'foreach': modelValue };
+        // If unwrappedValue is the array, pass in the wrapped value on its own
+        // The value will be unwrapped and tracked within the template binding
+        // (See https://github.com/SteveSanderson/knockout/issues/523)
+        if ((!unwrappedValue) || Array.isArray(unwrappedValue))
+            return { 'foreach': modelValue };
 
-            // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
-            ko.utils.unwrapObservable(modelValue);
-            return {
-                'foreach': unwrappedValue['data'],
-                'as': unwrappedValue['as'],
-                'beforeRemove': unwrappedValue['beforeRemove']
-            };
+        // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
+        ko.utils.unwrapObservable(modelValue);
+        return {
+            'foreach': unwrappedValue['data']
         };
-    },
+    };
+ko.bindingHandlers['foreach'] = {
     'init': (element, valueAccessor) =>
-        ko.bindingHandlers['template']['init'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor))
+        ko.bindingHandlers['template']['init'](element, makeTemplateValueAccessor(valueAccessor))
     ,
     'update': (element, valueAccessor, allBindings, viewModel, bindingContext) =>
-        ko.bindingHandlers['template']['update'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor), allBindings, viewModel, bindingContext)
+        ko.bindingHandlers['template']['update'](element, makeTemplateValueAccessor(valueAccessor), allBindings, viewModel, bindingContext)
 };
-ko.expressionRewriting.bindingRewriteValidators['foreach'] = false; // Can't rewrite control flow bindings
 ko.virtualElements.allowedBindings['foreach'] = true;
-var hasfocusUpdatingProperty = '__ko_hasfocusUpdating';
-var hasfocusLastValue = '__ko_hasfocusLastValue';
+const hasfocusUpdatingProperty = '__ko_hasfocusUpdating',
+    hasfocusLastValue = '__ko_hasfocusLastValue';
 ko.bindingHandlers['hasfocus'] = {
     'init': (element, valueAccessor, allBindings) => {
         var handleElementFocusChange = isFocused => {
@@ -2679,8 +2506,7 @@ ko.bindingHandlers['hasfocus'] = {
             // Discussion at https://github.com/SteveSanderson/knockout/pull/352
             element[hasfocusUpdatingProperty] = true;
             isFocused = (element.ownerDocument.activeElement === element);
-            var modelValue = valueAccessor();
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'hasfocus', isFocused, true);
+            ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'hasfocus', isFocused, true);
 
             //cache the latest value, so we can avoid unnecessarily calling focus/blur in the update function
             element[hasfocusLastValue] = isFocused;
@@ -2689,13 +2515,10 @@ ko.bindingHandlers['hasfocus'] = {
         var handleElementFocusIn = handleElementFocusChange.bind(null, true);
         var handleElementFocusOut = handleElementFocusChange.bind(null, false);
 
-        var registerEventHandler = (event, handler) =>
-            element.addEventListener(event, handler);
-
-        registerEventHandler("focus", handleElementFocusIn);
-        registerEventHandler("focusin", handleElementFocusIn);
-        registerEventHandler("blur",  handleElementFocusOut);
-        registerEventHandler("focusout",  handleElementFocusOut);
+        element.addEventListener("focus", handleElementFocusIn);
+        element.addEventListener("focusin", handleElementFocusIn);
+        element.addEventListener("blur",  handleElementFocusOut);
+        element.addEventListener("focusout",  handleElementFocusOut);
 
         // Assume element is not focused (prevents "blur" being called initially)
         element[hasfocusLastValue] = false;
@@ -2708,12 +2531,11 @@ ko.bindingHandlers['hasfocus'] = {
         }
     }
 };
-ko.expressionRewriting.twoWayBindings.add('hasfocus');
 ko.bindingHandlers['html'] = {
-    'init': () => {
+    'init': () => (
         // Prevent binding on the dynamically-injected HTML (as developers are unlikely to expect that, and it has security implications)
-        return { 'controlsDescendantBindings': true };
-    },
+        { 'controlsDescendantBindings': true }
+    ),
     'update': (element, valueAccessor) => {
         // setHtml will unwrap the value if needed
         ko.utils.emptyDomNode(element);
@@ -2728,7 +2550,7 @@ ko.bindingHandlers['html'] = {
         }
     }
 };
-(function () {
+(() => {
 
 // Makes a binding like with or if
 function makeWithIfBinding(bindingKey, isWith, isNot) {
@@ -2737,8 +2559,7 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
             var savedNodes, contextOptions = {}, needAsyncContext;
 
             if (isWith) {
-                var as = allBindings.get('as');
-                contextOptions = { 'as': as, 'exportDependencies': true };
+                contextOptions = { 'exportDependencies': true };
             }
 
             needAsyncContext = allBindings['has'](ko.bindingEvent.descendantsComplete);
@@ -2756,13 +2577,12 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
                 if (shouldDisplay) {
                     contextOptions['dataDependency'] = ko.dependencyDetection.computed();
 
-                    if (isWith) {
-                        childContext = bindingContext['createChildContext'](typeof value == "function" ? value : valueAccessor, contextOptions);
-                    } else if (ko.dependencyDetection.getDependenciesCount()) {
-                        childContext = bindingContext['extend'](null, contextOptions);
-                    } else {
-                        childContext = bindingContext;
-                    }
+                    childContext = isWith
+                        ? bindingContext['createChildContext'](typeof value == "function" ? value : valueAccessor, contextOptions)
+                        : (ko.dependencyDetection.getDependenciesCount()
+                            ? bindingContext['extend'](null, contextOptions)
+                            : bindingContext
+                        );
                 }
 
                 // Save a copy of the inner nodes on the initial update, but only if we have dependencies.
@@ -2771,9 +2591,7 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
                 }
 
                 if (shouldDisplay) {
-                    if (!isInitial) {
-                        ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(savedNodes));
-                    }
+                    isInitial || ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(savedNodes));
 
                     ko.applyBindingsToDescendants(childContext, element);
                 } else {
@@ -2787,7 +2605,6 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
             return { 'controlsDescendantBindings': true };
         }
     };
-    ko.expressionRewriting.bindingRewriteValidators[bindingKey] = false; // Can't rewrite control flow bindings
     ko.virtualElements.allowedBindings[bindingKey] = true;
 }
 
@@ -2801,81 +2618,82 @@ var captionPlaceholder = {};
 ko.bindingHandlers['options'] = {
     'init': element => {
         if (!element.matches("SELECT"))
-            throw new Error("options binding applies only to SELECT elements");
+            throw Error("options binding applies only to SELECT elements");
 
         // Remove all existing <option>s.
-        while (element.length > 0) {
-            element.remove(0);
+        let l = element.length;
+        while (l--) {
+            element.remove(l);
         }
 
         // Ensures that the binding processor doesn't try to bind the options
         return { 'controlsDescendantBindings': true };
     },
     'update': (element, valueAccessor, allBindings) => {
-        function selectedOptions() {
-            return Array.from(element.options).filter(node => node.selected);
-        }
 
         var selectWasPreviouslyEmpty = element.length == 0,
             multiple = element.multiple,
             previousScrollTop = (!selectWasPreviouslyEmpty && multiple) ? element.scrollTop : null,
             unwrappedArray = ko.utils.unwrapObservable(valueAccessor()),
-            valueAllowUnset = allBindings.get('valueAllowUnset') && allBindings['has']('value'),
             arrayToDomNodeChildrenOptions = {},
-            captionValue,
             filteredArray,
-            previousSelectedValues = [];
+            previousSelectedValues = [],
 
-        if (!valueAllowUnset) {
-            if (multiple) {
-                previousSelectedValues = selectedOptions().map(ko.selectExtensions.readValue);
-            } else if (element.selectedIndex >= 0) {
-                previousSelectedValues.push(ko.selectExtensions.readValue(element.options[element.selectedIndex]));
-            }
+            selectedOptions = () => Array.from(element.options).filter(node => node.selected),
+
+            applyToObject = (object, predicate, defaultValue) => {
+                var predicateType = typeof predicate;
+                if (predicateType == "function")    // Given a function; run it against the data value
+                    return predicate(object);
+                else if (predicateType == "string") // Given a string; treat it as a property name on the data value
+                    return object[predicate];
+                                                    // Given no optionsText arg; use the data value itself
+                    return defaultValue;
+            },
+
+            setSelectionCallback = (arrayEntry, newOptions) => {
+                if (previousSelectedValues.length) {
+                    // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
+                    // That's why we first added them without selection. Now it's time to set the selection.
+                    var isSelected = previousSelectedValues.includes(ko.selectExtensions.readValue(newOptions[0]));
+                    newOptions[0].selected = isSelected;
+
+                    // If this option was changed from being selected during a single-item update, notify the change
+                    if (itemUpdate && !isSelected) {
+                        ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
+                    }
+                }
+            };
+
+        if (multiple) {
+            previousSelectedValues = selectedOptions().map(ko.selectExtensions.readValue);
+        } else if (element.selectedIndex >= 0) {
+            previousSelectedValues.push(ko.selectExtensions.readValue(element.options[element.selectedIndex]));
         }
 
         if (unwrappedArray) {
-            if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
+            if (!Array.isArray(unwrappedArray)) // Coerce single value into array
                 unwrappedArray = [unwrappedArray];
 
             // Filter out any entries marked as destroyed
-            filteredArray = unwrappedArray.filter(item => item || item == null);
-
-            // If caption is included, add it to the array
-            if (allBindings['has']('optionsCaption')) {
-                captionValue = ko.utils.unwrapObservable(allBindings.get('optionsCaption'));
-                // If caption value is null or undefined, don't show a caption
-                if (captionValue !== null && captionValue !== undefined) {
-                    filteredArray.unshift(captionPlaceholder);
-                }
-            }
+            filteredArray = unwrappedArray.filter(item => item ?? 1);
         } else {
             // If a falsy value is provided (e.g. null), we'll simply empty the select element
         }
 
-        function applyToObject(object, predicate, defaultValue) {
-            var predicateType = typeof predicate;
-            if (predicateType == "function")    // Given a function; run it against the data value
-                return predicate(object);
-            else if (predicateType == "string") // Given a string; treat it as a property name on the data value
-                return object[predicate];
-            else                                // Given no optionsText arg; use the data value itself
-                return defaultValue;
-        }
-
         // The following functions can run at two different times:
         // The first is when the whole array is being updated directly from this binding handler.
         // The second is when an observable value for a specific array entry is updated.
         // oldOptions will be empty in the first case, but will be filled with the previously generated option in the second.
-        var itemUpdate = false;
-        function optionForArrayItem(arrayEntry, index, oldOptions) {
+        var itemUpdate = false,
+        optionForArrayItem = (arrayEntry, index, oldOptions) => {
             if (oldOptions.length) {
-                previousSelectedValues = !valueAllowUnset && oldOptions[0].selected ? [ ko.selectExtensions.readValue(oldOptions[0]) ] : [];
+                previousSelectedValues = oldOptions[0].selected ? [ ko.selectExtensions.readValue(oldOptions[0]) ] : [];
                 itemUpdate = true;
             }
             var option = element.ownerDocument.createElement("option");
             if (arrayEntry === captionPlaceholder) {
-                ko.utils.setTextContent(option, allBindings.get('optionsCaption'));
+                ko.utils.setTextContent(option);
                 ko.selectExtensions.writeValue(option, undefined);
             } else {
                 // Apply a value to the option element
@@ -2887,28 +2705,7 @@ ko.bindingHandlers['options'] = {
                 ko.utils.setTextContent(option, optionText);
             }
             return [option];
-        }
-
-        // By using a beforeRemove callback, we delay the removal until after new items are added. This fixes a selection
-        // problem in IE<=8 and Firefox. See https://github.com/knockout/knockout/issues/1208
-        arrayToDomNodeChildrenOptions['beforeRemove'] = option => element.removeChild(option);
-
-        function setSelectionCallback(arrayEntry, newOptions) {
-            if (itemUpdate && valueAllowUnset) {
-                // The model value is authoritative, so make sure its value is the one selected
-                ko.bindingEvent.notify(element, ko.bindingEvent.childrenComplete);
-            } else if (previousSelectedValues.length) {
-                // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
-                // That's why we first added them without selection. Now it's time to set the selection.
-                var isSelected = previousSelectedValues.includes(ko.selectExtensions.readValue(newOptions[0]));
-                newOptions[0].selected = isSelected;
-
-                // If this option was changed from being selected during a single-item update, notify the change
-                if (itemUpdate && !isSelected) {
-                    ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
-                }
-            }
-        }
+        };
 
         var callback = setSelectionCallback;
         if (allBindings['has']('optionsAfterRender') && typeof allBindings.get('optionsAfterRender') == "function") {
@@ -2920,30 +2717,26 @@ ko.bindingHandlers['options'] = {
 
         ko.utils.setDomNodeChildrenFromArrayMapping(element, filteredArray, optionForArrayItem, arrayToDomNodeChildrenOptions, callback);
 
-        if (!valueAllowUnset) {
-            // Determine if the selection has changed as a result of updating the options list
-            var selectionChanged;
-            if (multiple) {
-                // For a multiple-select box, compare the new selection count to the previous one
-                // But if nothing was selected before, the selection can't have changed
-                selectionChanged = previousSelectedValues.length && selectedOptions().length < previousSelectedValues.length;
-            } else {
-                // For a single-select box, compare the current value to the previous value
-                // But if nothing was selected before or nothing is selected now, just look for a change in selection
-                selectionChanged = (previousSelectedValues.length && element.selectedIndex >= 0)
-                    ? (ko.selectExtensions.readValue(element.options[element.selectedIndex]) !== previousSelectedValues[0])
-                    : (previousSelectedValues.length || element.selectedIndex >= 0);
-            }
-
-            // Ensure consistency between model value and selected option.
-            // If the dropdown was changed so that selection is no longer the same,
-            // notify the value or selectedOptions binding.
-            if (selectionChanged) {
-                ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
-            }
+        // Determine if the selection has changed as a result of updating the options list
+        var selectionChanged, prevLength = previousSelectedValues.length;
+        if (multiple) {
+            // For a multiple-select box, compare the new selection count to the previous one
+            // But if nothing was selected before, the selection can't have changed
+            selectionChanged = prevLength && selectedOptions().length < prevLength;
+        } else {
+            // For a single-select box, compare the current value to the previous value
+            // But if nothing was selected before or nothing is selected now, just look for a change in selection
+            selectionChanged = (prevLength && element.selectedIndex >= 0)
+                ? (ko.selectExtensions.readValue(element.options[element.selectedIndex]) !== previousSelectedValues[0])
+                : (prevLength || element.selectedIndex >= 0);
         }
 
-        if (valueAllowUnset || ko.dependencyDetection.isInitial()) {
+        // Ensure consistency between model value and selected option.
+        // If the dropdown was changed so that selection is no longer the same,
+        // notify the value or selectedOptions binding.
+        selectionChanged && ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
+
+        if (ko.dependencyDetection.isInitial()) {
             ko.bindingEvent.notify(element, ko.bindingEvent.childrenComplete);
         }
 
@@ -2954,8 +2747,7 @@ ko.bindingHandlers['options'] = {
 ko.bindingHandlers['options'].optionValueDomDataKey = ko.utils.domData.nextKey();
 ko.bindingHandlers['style'] = {
     'update': (element, valueAccessor) => {
-        var value = ko.utils.unwrapObservable(valueAccessor() || {});
-        ko.utils.objectForEach(value, (styleName, styleValue) => {
+        ko.utils.objectForEach(ko.utils.unwrapObservable(valueAccessor() || {}), (styleName, styleValue) => {
             styleValue = ko.utils.unwrapObservable(styleValue);
 
             if (styleValue == null || styleValue === false) {
@@ -2982,28 +2774,25 @@ ko.bindingHandlers['style'] = {
 ko.bindingHandlers['submit'] = {
     'init': (element, valueAccessor, allBindings, viewModel, bindingContext) => {
         if (typeof valueAccessor() != "function")
-            throw new Error("The value for a submit binding must be a function");
+            throw Error("The value for a submit binding must be a function");
         element.addEventListener("submit", event => {
             var handlerReturnValue;
             var value = valueAccessor();
             try { handlerReturnValue = value.call(bindingContext['$data'], element); }
             finally {
                 if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                    if (event.preventDefault)
-                        event.preventDefault();
-                    else
-                        event.returnValue = false;
+                    event.preventDefault();
                 }
             }
         });
     }
 };
 ko.bindingHandlers['text'] = {
-    'init': () => {
+    'init': () => (
         // Prevent binding on the dynamically-injected text node (as developers are unlikely to expect that, and it has security implications).
         // It should also make things faster, as we no longer have to consider whether the text node might be bindable.
-        return { 'controlsDescendantBindings': true };
-    },
+        { 'controlsDescendantBindings': true }
+    ),
     'update': (element, valueAccessor) => {
         if (8 === element.nodeType) {
             element.text || element.after(element.text = document.createTextNode(''));
@@ -3020,24 +2809,20 @@ ko.bindingHandlers['textInput'] = {
             timeoutHandle,
             elementValueBeforeEvent;
 
-        var updateModel = event => {
+        var updateModel = () => {
             clearTimeout(timeoutHandle);
             elementValueBeforeEvent = timeoutHandle = undefined;
 
             var elementValue = element.value;
-            if (previousElementValue !== elementValue) {
+            if (element.checkValidity() && previousElementValue !== elementValue) {
                 // Provide a way for tests to know exactly which event was processed
                 previousElementValue = elementValue;
-                ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'textInput', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'textInput', elementValue);
             }
         };
 
         var updateView = () => {
-            var modelValue = ko.utils.unwrapObservable(valueAccessor());
-
-            if (modelValue == null) {
-                modelValue = '';
-            }
+            var modelValue = ko.utils.unwrapObservable(valueAccessor()) ?? '';
 
             if (elementValueBeforeEvent !== undefined && modelValue === elementValueBeforeEvent) {
                 setTimeout(updateView, 4);
@@ -3060,19 +2845,9 @@ ko.bindingHandlers['textInput'] = {
         // Bind to the change event so that we can catch programmatic updates of the value that fire this event.
         onEvent('change', updateModel);
 
-        // To deal with browsers that don't notify any kind of event for some changes (IE, Safari, etc.)
-        onEvent('blur', updateModel);
-
         ko.computed(updateView, { disposeWhenNodeIsRemoved: element });
     }
 };
-ko.expressionRewriting.twoWayBindings.add('textInput');
-
-// textinput is an alias for textInput
-ko.bindingHandlers['textinput'] = {
-    // preprocess is the only way to set up a full alias
-    'preprocess': (value, name, addBinding) => addBinding('textInput', value)
-};
 ko.bindingHandlers['value'] = {
     'init': (element, valueAccessor, allBindings) => {
         var isSelectElement = element.matches("SELECT"),
@@ -3080,15 +2855,23 @@ ko.bindingHandlers['value'] = {
 
         // If the value binding is placed on a radio/checkbox, then just pass through to checkedValue and quit
         if (isInputElement && (element.type == "checkbox" || element.type == "radio")) {
-            ko.applyBindingAccessorsToNode(element, { 'checkedValue': valueAccessor });
+            ko['applyBindingAccessorsToNode'](element, { 'checkedValue': valueAccessor });
             return;
         }
 
-        var eventsToCatch = new Set;
-        var requestedEventsToCatch = allBindings.get("valueUpdate");
-        var elementValueBeforeEvent = null;
-        var registerEventHandler = (event, handler) =>
-            element.addEventListener(event, handler);
+        var eventsToCatch = new Set,
+            requestedEventsToCatch = allBindings.get("valueUpdate"),
+            elementValueBeforeEvent = null,
+            updateFromModel,
+            registerEventHandler = (event, handler) =>
+                element.addEventListener(event, handler),
+
+            valueUpdateHandler = () => {
+                elementValueBeforeEvent = null;
+                var modelValue = valueAccessor();
+                var elementValue = ko.selectExtensions.readValue(element);
+                ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'value', elementValue);
+            };
 
         if (requestedEventsToCatch) {
             // Allow both individual event names, and arrays of event names
@@ -3100,13 +2883,6 @@ ko.bindingHandlers['value'] = {
             eventsToCatch.delete("change");  // We'll subscribe to "change" events later
         }
 
-        var valueUpdateHandler = () => {
-            elementValueBeforeEvent = null;
-            var modelValue = valueAccessor();
-            var elementValue = ko.selectExtensions.readValue(element);
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'value', elementValue);
-        }
-
         eventsToCatch.forEach(eventName => {
             // The syntax "after<eventname>" means "run the handler asynchronously after the event"
             // This is useful, for example, to catch "keydown" events after the browser has updated the control
@@ -3129,8 +2905,6 @@ ko.bindingHandlers['value'] = {
             registerEventHandler(eventName, handler);
         });
 
-        var updateFromModel;
-
         if (isInputElement && element.type == "file") {
             // For file input elements, can only write the empty string
             updateFromModel = () => {
@@ -3155,9 +2929,8 @@ ko.bindingHandlers['value'] = {
 
                 if (valueHasChanged || elementValue === undefined) {
                     if (isSelectElement) {
-                        var allowUnset = allBindings.get('valueAllowUnset');
-                        ko.selectExtensions.writeValue(element, newValue, allowUnset);
-                        if (!allowUnset && newValue !== ko.selectExtensions.readValue(element)) {
+                        ko.selectExtensions.writeValue(element, newValue);
+                        if (newValue !== ko.selectExtensions.readValue(element)) {
                             // If you try to set a model value that can't be represented in an already-populated dropdown, reject that change,
                             // because you're not allowed to have a model value that disagrees with a visible UI selection.
                             ko.dependencyDetection.ignore(valueUpdateHandler);
@@ -3171,7 +2944,7 @@ ko.bindingHandlers['value'] = {
 
         if (isSelectElement) {
             var updateFromModelComputed;
-            ko.bindingEvent.subscribe(element, ko.bindingEvent.childrenComplete, () => {
+            ko.bindingEvent['subscribe'](element, ko.bindingEvent.childrenComplete, () => {
                 if (!updateFromModelComputed) {
                     registerEventHandler("change", valueUpdateHandler);
                     updateFromModelComputed = ko.computed(updateFromModel, { disposeWhenNodeIsRemoved: element });
@@ -3188,7 +2961,6 @@ ko.bindingHandlers['value'] = {
     },
     'update': () => {} // Keep for backwards compatibility with code that may have wrapped value binding
 };
-ko.expressionRewriting.twoWayBindings.add('value');
 ko.bindingHandlers['visible'] = {
     'update': (element, valueAccessor) => {
         var value = ko.utils.unwrapObservable(valueAccessor());
@@ -3265,7 +3037,7 @@ makeEventHandlerShortcut('click');
     };
 })();
 (() => {
-    var renderTemplateSource = templateSource => {
+    const renderTemplateSource = templateSource => {
             var templateNodes = templateSource.nodes ? templateSource.nodes() : null;
             return templateNodes
                 ? [...templateNodes.cloneNode(true).childNodes]
@@ -3278,14 +3050,14 @@ makeEventHandlerShortcut('click');
                 templateDocument = templateDocument || document;
                 var elem = templateDocument.getElementById(template);
                 if (!elem)
-                    throw new Error("Cannot find template with ID " + template);
+                    throw Error("Cannot find template with ID " + template);
                 return new ko.templateSources.domElement(elem);
             }
             if ([1,8].includes(template.nodeType)) {
                 // Anonymous template
                 return new ko.templateSources.anonymousTemplate(template);
             }
-            throw new Error("Unknown template type: " + template);
+            throw Error("Unknown template type: " + template);
         },
 
         invokeForEachNodeInContinuousRange = (firstNode, lastNode, action) => {
@@ -3294,173 +3066,150 @@ makeEventHandlerShortcut('click');
                 nextInQueue = ko.virtualElements.nextSibling(node);
                 action(node, nextInQueue);
             }
-        };
+        },
 
-    function activateBindingsOnContinuousNodeArray(continuousNodeArray, bindingContext) {
-        // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
-        // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
-        // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
-        // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
-        // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
+        activateBindingsOnContinuousNodeArray = (continuousNodeArray, bindingContext) => {
+            // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
+            // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
+            // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
+            // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
+            // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
 
-        if (continuousNodeArray.length) {
-            var firstNode = continuousNodeArray[0],
-                lastNode = continuousNodeArray[continuousNodeArray.length - 1],
-                parentNode = firstNode.parentNode;
+            if (continuousNodeArray.length) {
+                var firstNode = continuousNodeArray[0],
+                    lastNode = continuousNodeArray[continuousNodeArray.length - 1],
+                    parentNode = firstNode.parentNode;
 
-            // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
-            // whereas a regular applyBindings won't introduce new memoized nodes
-            invokeForEachNodeInContinuousRange(firstNode, lastNode, node => {
-                if (node.nodeType === 1 || node.nodeType === 8)
-                    ko.applyBindings(bindingContext, node);
-            });
+                // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
+                // whereas a regular applyBindings won't introduce new memoized nodes
+                invokeForEachNodeInContinuousRange(firstNode, lastNode, node =>
+                    (node.nodeType === 1 || node.nodeType === 8) && ko.applyBindings(bindingContext, node)
+                );
 
-            // Make sure any changes done by applyBindings or unmemoize are reflected in the array
-            ko.utils.fixUpContinuousNodeArray(continuousNodeArray, parentNode);
-        }
-    }
+                // Make sure any changes done by applyBindings or unmemoize are reflected in the array
+                ko.utils.fixUpContinuousNodeArray(continuousNodeArray, parentNode);
+            }
+        },
 
-    function getFirstNodeFromPossibleArray(nodeOrNodeArray) {
-        return nodeOrNodeArray.nodeType ? nodeOrNodeArray
-                                        : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
-                                        : null;
-    }
+        getFirstNodeFromPossibleArray = (nodeOrNodeArray) => {
+            return nodeOrNodeArray.nodeType ? nodeOrNodeArray
+                                            : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
+                                            : null;
+        },
 
-    function executeTemplate(targetNodeOrNodeArray, renderMode, template, bindingContext) {
-        var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
-        var templateDocument = (firstTargetNode || template || {}).ownerDocument;
+        executeTemplate = (targetNodeOrNodeArray, replaceChildren, template, bindingContext) => {
+            var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+            var templateDocument = (firstTargetNode || template || {}).ownerDocument;
 
-        var renderedNodesArray = renderTemplateSource(makeTemplateSource(template, templateDocument));
+            var renderedNodesArray = renderTemplateSource(makeTemplateSource(template, templateDocument));
 
-        // Loosely check result is an array of DOM nodes
-        if ((typeof renderedNodesArray.length != "number") || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
-            throw new Error("Template engine must return an array of DOM nodes");
+            // Loosely check result is an array of DOM nodes
+            if (!Array.isArray(renderedNodesArray) || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
+                throw Error("Template engine must return an array of DOM nodes");
 
-        var haveAddedNodesToParent = false;
-        switch (renderMode) {
-            case "replaceChildren":
+            if (replaceChildren) {
                 ko.virtualElements.setDomNodeChildren(targetNodeOrNodeArray, renderedNodesArray);
-                haveAddedNodesToParent = true;
-                break;
-            case "ignoreTargetNode": break;
-            default:
-                throw new Error("Unknown renderMode: " + renderMode);
-        }
-
-        if (haveAddedNodesToParent) {
-            activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
-            if (renderMode == "replaceChildren") {
+                activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
                 ko.bindingEvent.notify(targetNodeOrNodeArray, ko.bindingEvent.childrenComplete);
             }
-        }
 
-        return renderedNodesArray;
-    }
+            return renderedNodesArray;
+        },
 
-    function resolveTemplateName(template, data, context) {
-        // The template can be specified as:
-        if (ko.isObservable(template)) {
-            // 1. An observable, with string value
-            return template();
-        }
-        // 2. A function of (data, context) returning a string ELSE 3. A string
-        return (typeof template === 'function') ? template(data, context) : template;
-    }
+        resolveTemplateName = (template, data, context) => {
+            // The template can be specified as:
+            if (ko.isObservable(template)) {
+                // 1. An observable, with string value
+                return template();
+            }
+            // 2. A function of (data, context) returning a string ELSE 3. A string
+            return (typeof template === 'function') ? template(data, context) : template;
+        },
 
-    ko.renderTemplate = function (template, dataOrBindingContext, options, targetNodeOrNodeArray, renderMode) {
-        options = options || {};
-        renderMode = renderMode || "replaceChildren";
+        renderTemplate = (template, dataOrBindingContext, options, targetNodeOrNodeArray) => {
+            options = options || {};
 
-        if (targetNodeOrNodeArray) {
-            var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+            if (targetNodeOrNodeArray) {
+                var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
 
-            var whenToDispose = () => (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); // Passive disposal (on next evaluation)
+                var whenToDispose = () => (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); // Passive disposal (on next evaluation)
 
-            return ko.computed( // So the DOM is automatically updated when any dependency changes
-                () => {
-                    // Ensure we've got a proper binding context to work with
-                    var bindingContext = (dataOrBindingContext && (dataOrBindingContext instanceof ko.bindingContext))
-                        ? dataOrBindingContext
-                        : new ko.bindingContext(dataOrBindingContext, null, null, null, { "exportDependencies": true });
+                return ko.computed( // So the DOM is automatically updated when any dependency changes
+                    () => {
+                        // Ensure we've got a proper binding context to work with
+                        var bindingContext = (dataOrBindingContext instanceof ko.bindingContext)
+                            ? dataOrBindingContext
+                            : new ko.bindingContext(dataOrBindingContext, null, null, { "exportDependencies": true });
 
-                    var templateName = resolveTemplateName(template, bindingContext['$data'], bindingContext);
-                    executeTemplate(targetNodeOrNodeArray, renderMode, templateName, bindingContext, options);
-                },
-                { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: firstTargetNode }
-            );
-        } else {
-            console.log('no targetNodeOrNodeArray');
-        }
-    };
+                        var templateName = resolveTemplateName(template, bindingContext['$data'], bindingContext);
+                        executeTemplate(targetNodeOrNodeArray, true, templateName, bindingContext, options);
+                    },
+                    { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: firstTargetNode }
+                );
+            } else {
+                console.log('no targetNodeOrNodeArray');
+            }
+        },
 
-    ko.renderTemplateForEach = (template, arrayOrObservableArray, options, targetNode, parentBindingContext) => {
-        // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
-        // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
-        var arrayItemContext, asName = options['as'];
+        renderTemplateForEach = (template, arrayOrObservableArray, options, targetNode, parentBindingContext) => {
+            // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
+            // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
+            var arrayItemContext;
 
-        // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
-        var executeTemplateForArrayItem = (arrayValue, index) => {
-            // Support selecting template as a function of the data being rendered
-            arrayItemContext = parentBindingContext['createChildContext'](arrayValue, {
-                'as': asName,
-                'extend': context => {
-                    context['$index'] = index;
-                    if (asName) {
-                        context[asName + "Index"] = index;
-                    }
-                }
-            });
+            // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
+            var executeTemplateForArrayItem = (arrayValue, index) => {
+                // Support selecting template as a function of the data being rendered
+                arrayItemContext = parentBindingContext['createChildContext'](arrayValue, {
+                    'extend': context => context['$index'] = index
+                });
 
-            var templateName = resolveTemplateName(template, arrayValue, arrayItemContext);
-            return executeTemplate(targetNode, "ignoreTargetNode", templateName, arrayItemContext, options);
-        };
+                var templateName = resolveTemplateName(template, arrayValue, arrayItemContext);
+                return executeTemplate(targetNode, false, templateName, arrayItemContext, options);
+            };
 
-        // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
-        var activateBindingsCallback = (arrayValue, addedNodesArray) => {
-            activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
+            // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
+            var activateBindingsCallback = (arrayValue, addedNodesArray) => {
+                activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
 
-            // release the "cache" variable, so that it can be collected by
-            // the GC when its value isn't used from within the bindings anymore.
-            arrayItemContext = null;
-        };
+                // release the "cache" variable, so that it can be collected by
+                // the GC when its value isn't used from within the bindings anymore.
+                arrayItemContext = null;
+            };
 
-        var setDomNodeChildrenFromArrayMapping = function (newArray, changeList) {
-            // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
-            // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
-            ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, newArray, executeTemplateForArrayItem, options, activateBindingsCallback, changeList]);
-            ko.bindingEvent.notify(targetNode, ko.bindingEvent.childrenComplete);
-        };
+            var setDomNodeChildrenFromArrayMapping = (newArray, changeList) => {
+                // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
+                // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
+                ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, newArray, executeTemplateForArrayItem, options, activateBindingsCallback, changeList]);
+                ko.bindingEvent.notify(targetNode, ko.bindingEvent.childrenComplete);
+            };
 
-        if (!options['beforeRemove'] && ko.isObservableArray(arrayOrObservableArray)) {
-            setDomNodeChildrenFromArrayMapping(arrayOrObservableArray.peek());
+            if (ko['isObservableArray'](arrayOrObservableArray)) {
+                setDomNodeChildrenFromArrayMapping(arrayOrObservableArray.peek());
 
-            var subscription = arrayOrObservableArray.subscribe(changeList => {
-                setDomNodeChildrenFromArrayMapping(arrayOrObservableArray(), changeList);
-            }, null, "arrayChange");
-            subscription.disposeWhenNodeIsRemoved(targetNode);
+                var subscription = arrayOrObservableArray['subscribe'](changeList => {
+                    setDomNodeChildrenFromArrayMapping(arrayOrObservableArray(), changeList);
+                }, null, "arrayChange");
+                subscription.disposeWhenNodeIsRemoved(targetNode);
 
-            return subscription;
-        } else {
+                return subscription;
+            }
             return ko.computed(() => {
                 var unwrappedArray = ko.utils.unwrapObservable(arrayOrObservableArray) || [];
-                if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
+                if (!Array.isArray(unwrappedArray)) // Coerce single value into array
                     unwrappedArray = [unwrappedArray];
 
                 setDomNodeChildrenFromArrayMapping(unwrappedArray);
 
             }, { disposeWhenNodeIsRemoved: targetNode });
-        }
-    };
+        },
 
-    var templateComputedDomDataKey = ko.utils.domData.nextKey();
-    function disposeOldComputedAndStoreNewOne(element, newComputed) {
-        var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
-        if (oldComputed && (typeof(oldComputed.dispose) == 'function'))
-            oldComputed.dispose();
-        ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && (!newComputed.isActive || newComputed.isActive())) ? newComputed : undefined);
-    }
+        templateComputedDomDataKey = ko.utils.domData.nextKey(),
+        disposeOldComputedAndStoreNewOne = (element, newComputed) => {
+            var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
+            oldComputed?.['dispose']?.();
+            ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && (!newComputed.isActive || newComputed.isActive())) ? newComputed : undefined);
+        };
 
-    var cleanContainerDomDataKey = ko.utils.domData.nextKey();
     ko.bindingHandlers['template'] = {
         'init': (element, valueAccessor) => {
             // Support anonymous templates
@@ -3468,33 +3217,14 @@ makeEventHandlerShortcut('click');
             if (typeof bindingValue == "string" || 'name' in bindingValue) {
                 // It's a named template - clear the element
                 ko.virtualElements.emptyNode(element);
-            } else if ('nodes' in bindingValue) {
-                // We've been given an array of DOM nodes. Save them as the template source.
-                // There is no known use case for the node array being an observable array (if the output
-                // varies, put that behavior *into* your template - that's what templates are for), and
-                // the implementation would be a mess, so assert that it's not observable.
-                var nodes = bindingValue['nodes'] || [];
-                if (ko.isObservable(nodes)) {
-                    throw new Error('The "nodes" option must be a plain, non-observable array.');
-                }
-
-                // If the nodes are already attached to a KO-generated container, we reuse that container without moving the
-                // elements to a new one (we check only the first node, as the nodes are always moved together)
-                let container = nodes[0] && nodes[0].parentNode;
-                if (!container || !ko.utils.domData.get(container, cleanContainerDomDataKey)) {
-                    container = ko.utils.moveCleanedNodesToContainerElement(nodes);
-                    ko.utils.domData.set(container, cleanContainerDomDataKey, true);
-                }
-
-                new ko.templateSources.anonymousTemplate(element).nodes(container);
             } else {
                 // It's an anonymous template - store the element contents, then clear the element
                 var templateNodes = ko.virtualElements.childNodes(element);
-                if (templateNodes.length > 0) {
+                if (templateNodes.length) {
                     let container = ko.utils.moveCleanedNodesToContainerElement(templateNodes); // This also removes the nodes from their current parent
                     new ko.templateSources.anonymousTemplate(element).nodes(container);
                 } else {
-                    throw new Error("Anonymous template defined, but no template content was provided");
+                    throw Error("Anonymous template defined, but no template content was provided");
                 }
             }
             return { 'controlsDescendantBindings': true };
@@ -3511,23 +3241,14 @@ makeEventHandlerShortcut('click');
                 options = {};
             } else {
                 template = 'name' in options ? options['name'] : element;
-
-                // Support "if"/"ifnot" conditions
-                if ('if' in options)
-                    shouldDisplay = ko.utils.unwrapObservable(options['if']);
-                if (shouldDisplay && 'ifnot' in options)
-                    shouldDisplay = !ko.utils.unwrapObservable(options['ifnot']);
-
-                // Don't show anything if an empty name is given (see #2446)
-                if (shouldDisplay && !template) {
-                    shouldDisplay = false;
-                }
             }
 
+            // Don't show anything if an empty name is given (see #2446)
+            shouldDisplay = !!template;
+
             if ('foreach' in options) {
                 // Render once for each data point (treating data set as empty if shouldDisplay==false)
-                var dataArray = (shouldDisplay && options['foreach']) || [];
-                templateComputed = ko.renderTemplateForEach(template, dataArray, options, element, bindingContext);
+                templateComputed = renderTemplateForEach(template, (shouldDisplay && options['foreach']) || [], options, element, bindingContext);
             } else if (!shouldDisplay) {
                 ko.virtualElements.emptyNode(element);
             } else {
@@ -3535,11 +3256,10 @@ makeEventHandlerShortcut('click');
                 var innerBindingContext = bindingContext;
                 if ('data' in options) {
                     innerBindingContext = bindingContext['createChildContext'](options['data'], {
-                        'as': options['as'],
                         'exportDependencies': true
                     });
                 }
-                templateComputed = ko.renderTemplate(template, innerBindingContext, options, element);
+                templateComputed = renderTemplate(template, innerBindingContext, options, element);
             }
 
             // It only makes sense to have a single template computed per element (otherwise which one should have its output displayed?)
@@ -3547,69 +3267,42 @@ makeEventHandlerShortcut('click');
         }
     };
 
-    // Anonymous templates can't be rewritten. Give a nice error message if you try to do it.
-    ko.expressionRewriting.bindingRewriteValidators['template'] = bindingValue => {
-        var parsedBindingValue = ko.expressionRewriting.parseObjectLiteral(bindingValue);
-
-        if ((parsedBindingValue.length == 1) && parsedBindingValue[0]['unknown'])
-            return null; // It looks like a string literal, not an object literal, so treat it as a named template (which is allowed for rewriting)
-
-        if (ko.expressionRewriting.keyValueArrayContainsKey(parsedBindingValue, "name"))
-            return null; // Named templates can be rewritten, so return "no error"
-        return "This template engine does not support anonymous templates nested within its templates";
-    };
-
     ko.virtualElements.allowedBindings['template'] = true;
 })();
 // Go through the items that have been added and deleted and try to find matches between them.
 ko.utils.findMovesInArrayComparison = (left, right, limitFailedCompares) => {
-    if (left.length && right.length) {
-        var failedCompares, l, r, leftItem, rightItem;
-        for (failedCompares = l = 0; (!limitFailedCompares || failedCompares < limitFailedCompares) && (leftItem = left[l]); ++l) {
-            for (r = 0; rightItem = right[r]; ++r) {
-                if (leftItem['value'] === rightItem['value']) {
-                    leftItem['moved'] = rightItem['index'];
-                    rightItem['moved'] = leftItem['index'];
-                    right.splice(r, 1);         // This item is marked as moved; so remove it from right list
-                    failedCompares = r = 0;     // Reset failed compares count because we're checking for consecutive failures
-                    break;
-                }
-            }
-            failedCompares += r;
+    var failedCompares = 0, r, l = right.length;
+    l && left.every(leftItem => {
+        r = right.findIndex(rightItem => leftItem['value'] === rightItem['value']);
+        if (r >= 0) {
+            leftItem['moved'] = right[r]['index'];
+            right[r]['moved'] = leftItem['index'];
+            right.splice(r, 1);         // This item is marked as moved; so remove it from right list
+//            right[r] = null;
+            failedCompares = r = 0;     // Reset failed compares count because we're checking for consecutive failures
+            --l;
         }
-    }
+        failedCompares += l;
+        return l && (!limitFailedCompares || failedCompares < limitFailedCompares);
+    });
 };
 
 ko.utils.compareArrays = (() => {
-    var statusNotInOld = 'added', statusNotInNew = 'deleted';
+    var statusNotInOld = 'added', statusNotInNew = 'deleted',
 
-    // Simple calculation based on Levenshtein distance.
-    function compareArrays(oldArray, newArray, options) {
-        // For backward compatibility, if the third arg is actually a bool, interpret
-        // it as the old parameter 'dontLimitMoves'. Newer code should use { dontLimitMoves: true }.
-        options = (typeof options === 'boolean') ? { 'dontLimitMoves': options } : (options || {});
-        oldArray = oldArray || [];
-        newArray = newArray || [];
-
-        if (oldArray.length < newArray.length)
-            return compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, options);
-        else
-            return compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, options);
-    }
-
-    function compareSmallArrayToBigArray(smlArray, bigArray, statusNotInSml, statusNotInBig, options) {
+    compareSmallArrayToBigArray = (smlArray, bigArray, statusNotInSml, statusNotInBig, options) => {
         var myMin = Math.min,
             myMax = Math.max,
             editDistanceMatrix = [],
-            smlIndex, smlIndexMax = smlArray.length,
+            smlIndex = -1, smlIndexMax = smlArray.length,
             bigIndex, bigIndexMax = bigArray.length,
             compareRange = (bigIndexMax - smlIndexMax) || 1,
             maxDistance = smlIndexMax + bigIndexMax + 1,
-            thisRow, lastRow,
+            thisRow, prevRow,
             bigIndexMaxForRow, bigIndexMinForRow;
 
-        for (smlIndex = 0; smlIndex <= smlIndexMax; smlIndex++) {
-            lastRow = thisRow;
+        while (++smlIndex <= smlIndexMax) {
+            prevRow = thisRow;
             editDistanceMatrix.push(thisRow = []);
             bigIndexMaxForRow = myMin(bigIndexMax, smlIndex + compareRange);
             bigIndexMinForRow = myMax(0, smlIndex - 1);
@@ -3619,9 +3312,9 @@ ko.utils.compareArrays = (() => {
                 else if (!smlIndex)  // Top row - transform empty array into new array via additions
                     thisRow[bigIndex] = bigIndex + 1;
                 else if (smlArray[smlIndex - 1] === bigArray[bigIndex - 1])
-                    thisRow[bigIndex] = lastRow[bigIndex - 1];                  // copy value (no edit)
+                    thisRow[bigIndex] = prevRow[bigIndex - 1];                  // copy value (no edit)
                 else {
-                    var northDistance = lastRow[bigIndex] || maxDistance;       // not in big (deletion)
+                    var northDistance = prevRow[bigIndex] || maxDistance;       // not in big (deletion)
                     var westDistance = thisRow[bigIndex - 1] || maxDistance;    // not in small (addition)
                     thisRow[bigIndex] = myMin(northDistance, westDistance) + 1;
                 }
@@ -3629,7 +3322,9 @@ ko.utils.compareArrays = (() => {
         }
 
         var editScript = [], meMinusOne, notInSml = [], notInBig = [];
-        for (smlIndex = smlIndexMax, bigIndex = bigIndexMax; smlIndex || bigIndex;) {
+        smlIndex = smlIndexMax;
+        bigIndex = bigIndexMax
+        while (smlIndex || bigIndex) {
             meMinusOne = editDistanceMatrix[smlIndex][bigIndex] - 1;
             if (bigIndex && meMinusOne === editDistanceMatrix[smlIndex][bigIndex-1]) {
                 notInSml.push(editScript[editScript.length] = {     // added
@@ -3654,12 +3349,20 @@ ko.utils.compareArrays = (() => {
 
         // Set a limit on the number of consecutive non-matching comparisons; having it a multiple of
         // smlIndexMax keeps the time complexity of this algorithm linear.
-        ko.utils.findMovesInArrayComparison(notInBig, notInSml, !options['dontLimitMoves'] && smlIndexMax * 10);
+        ko.utils.findMovesInArrayComparison(notInBig, notInSml, smlIndexMax * 10);
 
         return editScript.reverse();
-    }
+    };
 
-    return compareArrays;
+    // Simple calculation based on Levenshtein distance.
+    return (oldArray, newArray, options) => {
+        oldArray = oldArray || [];
+        newArray = newArray || [];
+
+        return (oldArray.length < newArray.length)
+            ? compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, options)
+            : compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, options);
+    };
 })();
 (() => {
     // Objective:
@@ -3683,13 +3386,9 @@ ko.utils.compareArrays = (() => {
                 var nodesToReplaceArray = mappedNodes.nodeType ? [mappedNodes] : mappedNodes;
                 if (nodesToReplaceArray.length > 0) {
                     var insertionPoint = nodesToReplaceArray[0],
-                        parent = insertionPoint.parentNode,
-                        i, j;
-                    for (i = 0, j = newMappedNodes.length; i < j; i++)
-                        parent.insertBefore(newMappedNodes[i], insertionPoint);
-                    for (i = 0, j = nodesToReplaceArray.length; i < j; i++) {
-                        ko.removeNode(nodesToReplaceArray[i]);
-                    }
+                        parent = insertionPoint.parentNode;
+                    newMappedNodes.forEach(node => parent.insertBefore(node, insertionPoint));
+                    nodesToReplaceArray.forEach(node => ko.removeNode(node));
                 }
                 if (callbackAfterAddingNodes)
                     ko.dependencyDetection.ignore(callbackAfterAddingNodes, null, [valueToMap, newMappedNodes, index]);
@@ -3699,8 +3398,14 @@ ko.utils.compareArrays = (() => {
             // of which nodes would be deleted if valueToMap was itself later removed
             mappedNodes.length = 0;
             mappedNodes.push(...newMappedNodes);
-        }, { disposeWhenNodeIsRemoved: containerNode, disposeWhen: ()=>!!mappedNodes.find(ko.utils.domNodeIsAttachedToDocument) });
-        return { mappedNodes : mappedNodes, dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined) };
+        }, {
+            disposeWhenNodeIsRemoved: containerNode,
+            disposeWhen: ()=>!!mappedNodes.find(ko.utils.domNodeIsAttachedToDocument)
+        });
+        return {
+            mappedNodes : mappedNodes,
+            dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined)
+        };
     }
 
     var lastMappingResultDomDataKey = ko.utils.domData.nextKey(),
@@ -3708,59 +3413,52 @@ ko.utils.compareArrays = (() => {
 
     ko.utils.setDomNodeChildrenFromArrayMapping = (domNode, array, mapping, options, callbackAfterAddingNodes, editScript) => {
         array = array || [];
-        if (typeof array.length == "undefined") // Coerce single value into array
+        if (!Array.isArray(array)) // Coerce single value into array
             array = [array];
 
         options = options || {};
-        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey);
-        var isFirstExecution = !lastMappingResult;
+        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey),
+            isFirstExecution = !lastMappingResult,
 
-        // Build the new mapping result
-        var newMappingResult = [];
-        var lastMappingResultIndex = 0;
-        var currentArrayIndex = 0;
+            // Build the new mapping result
+            newMappingResult = [],
+            lastMappingResultIndex = 0,
+            currentArrayIndex = 0,
 
-        var nodesToDelete = [];
-        var itemsToMoveFirstIndexes = [];
-        var itemsForBeforeRemoveCallbacks = [];
-        var mapData;
-        var countWaitingForRemove = 0;
+            nodesToDelete = [],
+            itemsToMoveFirstIndexes = [],
+            itemsForBeforeRemoveCallbacks = [],
+            mapData,
+            countWaitingForRemove = 0,
 
-        function itemAdded(value) {
-            mapData = { arrayEntry: value, indexObservable: ko.observable(currentArrayIndex++) };
-            newMappingResult.push(mapData);
-        }
+            itemAdded = value => {
+                mapData = { arrayEntry: value, indexObservable: ko.observable(currentArrayIndex++) };
+                newMappingResult.push(mapData);
+            },
 
-        function itemMovedOrRetained(oldPosition) {
-            mapData = lastMappingResult[oldPosition];
-            // Since updating the index might change the nodes, do so before calling fixUpContinuousNodeArray
-            mapData.indexObservable(currentArrayIndex++);
-            ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode);
-            newMappingResult.push(mapData);
-        }
-
-        function callCallback(callback, items) {
-            if (callback) {
-                for (var i = 0, n = items.length; i < n; i++) {
-                    items[i] && items[i].mappedNodes.forEach(node => callback(node, i, items[i].arrayEntry));
-                }
-            }
-        }
+            itemMovedOrRetained = oldPosition => {
+                mapData = lastMappingResult[oldPosition];
+                // Since updating the index might change the nodes, do so before calling fixUpContinuousNodeArray
+                mapData.indexObservable(currentArrayIndex++);
+                ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode);
+                newMappingResult.push(mapData);
+            };
 
         if (isFirstExecution) {
             array.forEach(itemAdded);
         } else {
             if (!editScript || (lastMappingResult && lastMappingResult['_countWaitingForRemove'])) {
                 // Compare the provided array against the previous one
-                var lastArray = Array.prototype.map.call(lastMappingResult, x => x.arrayEntry),
-                    compareOptions = {
-                        'dontLimitMoves': options['dontLimitMoves'],
+                editScript = ko.utils.compareArrays(
+                    Array.prototype.map.call(lastMappingResult, x => x.arrayEntry),
+                    array,
+                    {
                         'sparse': true
-                    };
-                editScript = ko.utils.compareArrays(lastArray, array, compareOptions);
+                    });
             }
 
-            for (let i = 0, editScriptItem, movedIndex, itemIndex; editScriptItem = editScript[i]; i++) {
+            let movedIndex, itemIndex;
+            editScript.forEach(editScriptItem => {
                 movedIndex = editScriptItem['moved'];
                 itemIndex = editScriptItem['index'];
                 switch (editScriptItem['status']) {
@@ -3773,21 +3471,12 @@ ko.utils.compareArrays = (() => {
 
                             // Stop tracking changes to the mapping for these nodes
                             if (mapData.dependentObservable) {
-                                mapData.dependentObservable.dispose();
+                                mapData.dependentObservable['dispose']();
                                 mapData.dependentObservable = undefined;
                             }
 
                             // Queue these nodes for later removal
                             if (ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode).length) {
-                                if (options['beforeRemove']) {
-                                    newMappingResult.push(mapData);
-                                    countWaitingForRemove++;
-                                    if (mapData.arrayEntry === deletedItemDummyValue) {
-                                        mapData = null;
-                                    } else {
-                                        itemsForBeforeRemoveCallbacks[mapData.indexObservable.peek()] = mapData;
-                                    }
-                                }
                                 if (mapData) {
                                     nodesToDelete.push.apply(nodesToDelete, mapData.mappedNodes);
                                 }
@@ -3808,7 +3497,7 @@ ko.utils.compareArrays = (() => {
                         }
                         break;
                 }
-            }
+            });
 
             while (currentArrayIndex < array.length) {
                 itemMovedOrRetained(lastMappingResultIndex++);
@@ -3822,10 +3511,14 @@ ko.utils.compareArrays = (() => {
         // Store a copy of the array items we just considered so we can difference it next time
         ko.utils.domData.set(domNode, lastMappingResultDomDataKey, newMappingResult);
 
-        // Next remove nodes for deleted items (or just clean if there's a beforeRemove callback)
-        nodesToDelete.forEach(options['beforeRemove'] ? ko.cleanNode : ko.removeNode);
+        // Next remove nodes for deleted items
+        nodesToDelete.forEach(ko.removeNode);
 
-        var i, j, lastNode, nodeToInsert, mappedNodes, activeElement;
+        var i, lastNode, mappedNodes, activeElement,
+            insertNode = nodeToInsert => {
+                ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
+                lastNode = nodeToInsert;
+            };
 
         // Since most browsers remove the focus from an element when it's moved to another location,
         // save the focused element and try to restore it later.
@@ -3833,30 +3526,27 @@ ko.utils.compareArrays = (() => {
 
         // Try to reduce overall moved nodes by first moving the ones that were marked as moved by the edit script
         if (itemsToMoveFirstIndexes.length) {
-            while ((i = itemsToMoveFirstIndexes.shift()) != undefined) {
+            while ((i = itemsToMoveFirstIndexes.shift()) != null) {
                 mapData = newMappingResult[i];
-                for (lastNode = undefined; i; ) {
-                    if ((mappedNodes = newMappingResult[--i].mappedNodes) && mappedNodes.length) {
+                while (i--) {
+                    mappedNodes = newMappingResult[i].mappedNodes;
+                    if (mappedNodes?.length) {
                         lastNode = mappedNodes[mappedNodes.length - 1];
                         break;
                     }
                 }
-                for (j = 0; nodeToInsert = mapData.mappedNodes[j]; lastNode = nodeToInsert, j++) {
-                    ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
-                }
+                mapData.mappedNodes.forEach(insertNode);
             }
         }
 
-        // Next add/reorder the remaining items (will include deleted items if there's a beforeRemove callback)
-        for (i = 0; mapData = newMappingResult[i]; i++) {
+        // Next add/reorder the remaining items
+        newMappingResult.forEach(mapData => {
             // Get nodes for newly added items
-            if (!mapData.mappedNodes)
-                ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
+            mapData.mappedNodes
+            || ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
 
             // Put nodes in the right place if they aren't there already
-            for (j = 0; nodeToInsert = mapData.mappedNodes[j]; lastNode = nodeToInsert, j++) {
-                ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
-            }
+            mapData.mappedNodes.forEach(insertNode);
 
             // Run the callbacks for newly added nodes (for example, to apply bindings, etc.)
             if (!mapData.initialized && callbackAfterAddingNodes) {
@@ -3864,29 +3554,18 @@ ko.utils.compareArrays = (() => {
                 mapData.initialized = true;
                 lastNode = mapData.mappedNodes[mapData.mappedNodes.length - 1];     // get the last node again since it may have been changed by a preprocessor
             }
-        }
+        });
 
         // Restore the focused element if it had lost focus
-        if (activeElement && domNode.ownerDocument.activeElement != activeElement) {
-            activeElement.focus();
+        if (domNode.ownerDocument.activeElement != activeElement) {
+            activeElement?.focus();
         }
 
-        // If there's a beforeRemove callback, call it after reordering.
-        // Note that we assume that the beforeRemove callback will usually be used to remove the nodes using
-        // some sort of animation, which is why we first reorder the nodes that will be removed. If the
-        // callback instead removes the nodes right away, it would be more efficient to skip reordering them.
-        // Perhaps we'll make that change in the future if this scenario becomes more common.
-        callCallback(options['beforeRemove'], itemsForBeforeRemoveCallbacks);
-
         // Replace the stored values of deleted items with a dummy value. This provides two benefits: it marks this item
-        // as already "removed" so we won't call beforeRemove for it again, and it ensures that the item won't match up
+        // as already "removed", and it ensures that the item won't match up
         // with an actual item in the array and appear as "retained" or "moved".
-        for (i = 0; i < itemsForBeforeRemoveCallbacks.length; ++i) {
-            if (itemsForBeforeRemoveCallbacks[i]) {
-                itemsForBeforeRemoveCallbacks[i].arrayEntry = deletedItemDummyValue;
-            }
-        }
+        itemsForBeforeRemoveCallbacks.forEach(callback => callback && (callback.arrayEntry = deletedItemDummyValue));
     }
 })();
-	window['ko'] = koExports;
+    window['ko'] = ko;
 })(this);
diff --git a/vendors/knockout/build/output/knockout-latest.js b/vendors/knockout/build/output/knockout-latest.js
index 69f1d86c0..e8985c5b2 100644
--- a/vendors/knockout/build/output/knockout-latest.js
+++ b/vendors/knockout/build/output/knockout-latest.js
@@ -4,72 +4,64 @@
  * License: MIT (http://www.opensource.org/licenses/mit-license.php)
  */
 
-(T=>{function O(a,c){return null===a||U[typeof a]?a===c:!1}function V(a,c){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},c))}}function W(a,c){var d;return()=>{clearTimeout(d);d=setTimeout(a,c)}}function X(a,c){null!==c&&c.o&&c.o()}function Y(a,c){var d=this.Zb,g=d[A];g.X||(this.Ta&&this.za[c]?(d.sb(c,a,this.za[c]),this.za[c]=null,--this.Ta):g.u[c]||d.sb(c,a,g.v?{T:a}:d.Qb(a)),a.ja&&a.Vb())}var L=T.document,P={},b="undefined"!==typeof P?P:{};b.m=(a,c)=>{a=a.split(".");for(var d=b,g=
-0,k=a.length-1;g<k;g++)d=d[a[g]];d[a[k]]=c};b.fa=(a,c,d)=>{a[c]=d};b.m("version","3.5.1-sm");b.a={extend:(a,c)=>c?Object.assign(a,c):a,L:(a,c)=>a&&Object.entries(a).forEach(d=>c(d[0],d[1])),Xa:a=>[...a.childNodes].forEach(c=>b.removeNode(c)),Jb:a=>{a=[...a];var c=(a[0]&&a[0].ownerDocument||L).createElement("div");a.forEach(d=>c.append(b.ca(d)));return c},ya:(a,c)=>Array.prototype.map.call(a,c?d=>b.ca(d.cloneNode(!0)):d=>d.cloneNode(!0)),ua:(a,c)=>{b.a.Xa(a);c&&a.append(...c)},Aa:(a,c)=>{if(a.length){for(c=
-8===c.nodeType&&c.parentNode||c;a.length&&a[0].parentNode!==c;)a.splice(0,1);for(;1<a.length&&a[a.length-1].parentNode!==c;)--a.length;if(1<a.length){c=a[0];var d=a[a.length-1];for(a.length=0;c!==d;)a.push(c),c=c.nextSibling;a.push(d)}}return a},Pb:a=>null==a?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,""),Wa:a=>a.ownerDocument.documentElement.contains(1!==a.nodeType?a.parentNode:a),Sb:(a,c)=>{if(!a||!a.nodeType)throw Error("element must be a DOM node when calling triggerEvent");
-a.dispatchEvent(new Event(c))},f:a=>b.O(a)?a():a,gb:(a,c)=>a.textContent=b.a.f(c)||""};b.m("utils",b.a);b.m("unwrap",b.a.f);(()=>{let a=0,c="__ko__"+Date.now(),d=new WeakMap;b.a.c={get:(g,k)=>(d.get(g)||{})[k],set:(g,k,t)=>{if(d.has(g))d.get(g)[k]=t;else{let e={};e[k]=t;d.set(g,e)}return t},Za:function(g,k,t){return this.get(g,k)||this.set(g,k,t)},clear:g=>d.delete(g),V:()=>a++ +c}})();b.a.I=(()=>{var a=b.a.c.V(),c={1:1,8:1,9:1},d={1:1,9:1};const g=(e,f)=>{var h=b.a.c.get(e,a);f&&!h&&(h=new Set,b.a.c.set(e,
-a,h));return h},k=e=>{var f=g(e);f&&(new Set(f)).forEach(h=>h(e));b.a.c.clear(e);d[e.nodeType]&&t(e.childNodes,!0)},t=(e,f)=>{for(var h=[],r,p=0;p<e.length;p++)if(!f||8===e[p].nodeType)if(k(h[h.length]=r=e[p]),e[p]!==r)for(;p--&&!h.includes(e[p]););};return{ma:(e,f)=>{if("function"!=typeof f)throw Error("Callback must be a function");g(e,1).add(f)},fb:(e,f)=>{var h=g(e);h&&(h.delete(f),h.size||b.a.c.set(e,a,null))},ca:e=>{b.l.N(()=>{c[e.nodeType]&&(k(e),d[e.nodeType]&&t(e.getElementsByTagName("*")))});
-return e},removeNode:e=>{b.ca(e);e.parentNode&&e.parentNode.removeChild(e)}}})();b.ca=b.a.I.ca;b.removeNode=b.a.I.removeNode;b.m("utils.domNodeDisposal",b.a.I);b.m("utils.domNodeDisposal.addDisposeCallback",b.a.I.ma);b.Rb=(()=>{function a(){if(g)for(var f=g,h=0,r;t<g;)if(r=d[t++]){if(t>f){if(5E3<=++h){t=g;setTimeout(()=>{throw Error(`'Too much recursion' after processing ${h} task groups.`);},0);break}f=g}try{r()}catch(p){setTimeout(()=>{throw p;},0)}}}function c(){a();t=g=d.length=0}var d=[],g=0,
-k=1,t=0,e=(f=>{var h=L.createElement("div");(new MutationObserver(f)).observe(h,{attributes:!0});return()=>h.classList.toggle("foo")})(c);return{Nb:f=>{g||e(c);d[g++]=f;return k++},cancel:f=>{f-=k-g;f>=t&&f<g&&(d[f]=null)}}})();b.Ya={debounce:(a,c)=>a.Ha(d=>W(d,c)),rateLimit:(a,c)=>{if("number"==typeof c)var d=c;else{d=c.timeout;var g=c.method}var k="function"==typeof g?g:V;a.Ha(t=>k(t,d,c))},notify:(a,c)=>{a.ra="always"==c?null:O}};var U={undefined:1,"boolean":1,number:1,string:1};b.m("extenders",
-b.Ya);class Z{constructor(a,c,d){this.T=a;this.mb=c;this.oa=d;this.Na=!1;this.C=this.W=null;b.fa(this,"dispose",this.o)}o(){this.Na||(this.C&&b.a.I.fb(this.W,this.C),this.Na=!0,this.oa(),this.T=this.mb=this.oa=this.W=this.C=null)}i(a){this.W=a;b.a.I.ma(a,this.C=this.o.bind(this))}}b.R=function(){Object.setPrototypeOf(this,H);H.Ea(this)};var H={Ea:a=>{a.S=new Map;a.S.set("change",new Set);a.rb=1},subscribe:function(a,c,d){var g=this;d=d||"change";var k=new Z(g,c?a.bind(c):a,()=>{g.S.get(d).delete(k);
-g.wa&&g.wa(d)});g.na&&g.na(d);g.S.has(d)||g.S.set(d,new Set);g.S.get(d).add(k);return k},s:function(a,c){c=c||"change";"change"===c&&this.Ka();if(this.sa(c)){c="change"===c&&this.Tb||new Set(this.S.get(c));try{b.l.wb(),c.forEach(d=>{d.Na||d.mb(a)})}finally{b.l.end()}}},Ca:function(){return this.rb},ec:function(a){return this.Ca()!==a},Ka:function(){++this.rb},Ha:function(a){var c=this,d=b.O(c),g,k,t,e,f;c.va||(c.va=c.s,c.s=function(r,p){p&&"change"!==p?"beforeChange"===p?this.ob(r):this.va(r,p):this.pb(r)});
-var h=a(()=>{c.ja=!1;d&&e===c&&(e=c.nb?c.nb():c());var r=k||f&&c.Ga(t,e);f=k=g=!1;r&&c.va(t=e)});c.pb=(r,p)=>{p&&c.ja||(f=!p);c.Tb=new Set(c.S.get("change"));c.ja=g=!0;e=r;h()};c.ob=r=>{g||(t=r,c.va(r,"beforeChange"))};c.qb=()=>{f=!0};c.Vb=()=>{c.Ga(t,c.G(!0))&&(k=!0)}},sa:function(a){return(this.S.get(a)||[]).size},Ga:function(a,c){return!this.ra||!this.ra(a,c)},toString:()=>"[object Object]",extend:function(a){var c=this;a&&b.a.L(a,(d,g)=>{d=b.Ya[d];"function"==typeof d&&(c=d(c,g)||c)});return c}};
-b.fa(H,"init",H.Ea);b.fa(H,"subscribe",H.subscribe);b.fa(H,"extend",H.extend);Object.setPrototypeOf(H,Function.prototype);b.R.fn=H;b.ic=a=>null!=a&&"function"==typeof a.subscribe&&"function"==typeof a.s;(()=>{var a=[],c,d=0;b.l={wb:g=>{a.push(c);c=g},end:()=>c=a.pop(),Mb:g=>{if(c){if(!b.ic(g))throw Error("Only subscribable things can act as dependencies");c.Xb.call(c.Yb,g,g.Ub||(g.Ub=++d))}},N:(g,k,t)=>{try{return a.push(c),c=void 0,g.apply(k,t||[])}finally{c=a.pop()}},Ba:()=>c&&c.j.Ba(),ab:()=>c&&
-c.ab,j:()=>c&&c.j}})();const G=Symbol("_latestValue");b.Z=a=>{function c(){if(0<arguments.length)return c.Ga(c[G],arguments[0])&&(c.kb(),c[G]=arguments[0],c.La()),this;b.l.Mb(c);return c[G]}c[G]=a;Object.defineProperty(c,"length",{get:()=>null==c[G]?void 0:c[G].length});b.R.fn.Ea(c);Object.setPrototypeOf(c,J);return c};var J={toJSON:function(){let a=this[G];return a&&a.toJSON?a.toJSON():a},ra:O,G:function(){return this[G]},La:function(){this.s(this[G],"spectate");this.s(this[G])},kb:function(){this.s(this[G],
-"beforeChange")}};Object.setPrototypeOf(J,b.R.fn);var K=b.Z.C="__ko_proto__";J[K]=b.Z;b.O=a=>{if((a="function"==typeof a&&a[K])&&a!==J[K]&&a!==b.j.fn[K])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};b.jc=a=>"function"==typeof a&&(a[K]===J[K]||a[K]===b.j.fn[K]&&a.fc);b.m("observable",b.Z);b.m("isObservable",b.O);b.m("observable.fn",J);b.fa(J,"valueHasMutated",J.La);b.ha=a=>{a=a||[];if("object"!=typeof a||!("length"in a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
-a=b.Z(a);Object.setPrototypeOf(a,b.ha.fn);return a.extend({trackArrayChanges:!0})};b.ha.fn={remove:function(a){for(var c=this.G(),d=!1,g="function"!=typeof a||b.O(a)?e=>e===a:a,k=c.length;k--;){var t=c[k];if(g(t)){if(c[k]!==t)throw Error("Array modified during remove; cannot remove item");d||this.kb();d=!0;c.splice(k,1)}}d&&this.La()}};Object.setPrototypeOf(b.ha.fn,b.Z.fn);Object.getOwnPropertyNames(Array.prototype).forEach(a=>{"function"===typeof Array.prototype[a]&&"constructor"!=a&&("copyWithin fill pop push reverse shift sort splice unshift".split(" ").includes(a)?
-b.ha.fn[a]=function(...c){var d=this.G();this.kb();this.yb(d,a,c);c=d[a](...c);this.La();return c===d?this:c}:b.ha.fn[a]=function(...c){return this()[a](...c)})});b.Hb=a=>b.O(a)&&"function"==typeof a.remove&&"function"==typeof a.push;b.m("observableArray",b.ha);b.m("isObservableArray",b.Hb);b.Ya.trackArrayChanges=(a,c)=>{function d(){function q(){if(f){var l=[].concat(a.G()||[]);if(a.sa("arrayChange")){if(!k||1<f)k=b.a.zb(h,l,a.Qa);var n=k}h=l;k=null;f=0;n&&n.length&&a.s(n,"arrayChange")}}g?q():(g=
-!0,e=a.subscribe(()=>++f,null,"spectate"),h=[].concat(a.G()||[]),k=null,t=a.subscribe(q))}a.Qa={};c&&"object"==typeof c&&b.a.extend(a.Qa,c);a.Qa.sparse=!0;if(!a.yb){var g=!1,k=null,t,e,f=0,h,r=a.na,p=a.wa;a.na=q=>{r&&r.call(a,q);"arrayChange"===q&&d()};a.wa=q=>{p&&p.call(a,q);"arrayChange"!==q||a.sa("arrayChange")||(t&&t.o(),e&&e.o(),e=t=null,g=!1,h=void 0)};a.yb=(q,l,n)=>{function m(E,C,z){return u[u.length]={status:E,value:C,index:z}}if(g&&!f){var u=[],w=q.length,v=n.length,y=0;switch(l){case "push":y=
-w;case "unshift":for(q=0;q<v;q++)m("added",n[q],y+q);break;case "pop":y=w-1;case "shift":w&&m("deleted",q[y],y);break;case "splice":y=Math.min(Math.max(0,0>n[0]?w+n[0]:n[0]),w);w=1===v?w:Math.min(y+(n[1]||0),w);v=y+v-2;l=Math.max(w,v);var x=[],B=[];for(let E=y,C=2;E<l;++E,++C)E<w&&B.push(m("deleted",q[E],E)),E<v&&x.push(m("added",n[C],E));b.a.Eb(B,x);break;default:return}k=u}}}};var A=Symbol("_state");b.j=(a,c)=>{function d(){if(0<arguments.length){if("function"!==typeof g)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.");
-g(...arguments);return this}k.X||b.l.Mb(d);(k.U||k.v&&d.ta())&&d.P();return k.J}"object"===typeof a?c=a:(c=c||{},a&&(c.read=a));if("function"!=typeof c.read)throw Error("Pass a function that returns the value of the ko.computed");var g=c.write,k={J:void 0,Y:!0,U:!0,Fa:!1,ib:!1,X:!1,eb:!1,v:!1,Lb:c.read,i:c.disposeWhenNodeIsRemoved||c.i||null,pa:c.disposeWhen||c.pa,Va:null,u:{},H:0,Db:null};d[A]=k;d.fc="function"===typeof g;b.R.fn.Ea(d);Object.setPrototypeOf(d,M);c.pure?(k.eb=!0,k.v=!0,b.a.extend(d,
-aa)):c.deferEvaluation&&b.a.extend(d,ba);k.i&&(k.ib=!0,k.i.nodeType||(k.i=null));k.v||c.deferEvaluation||d.P();k.i&&d.ga()&&b.a.I.ma(k.i,k.Va=()=>{d.o()});return d};var M={ra:O,Ba:function(){return this[A].H},cc:function(){var a=[];b.a.L(this[A].u,(c,d)=>a[d.ka]=d.T);return a},$a:function(a){if(!this[A].H)return!1;var c=this.cc();return c.includes(a)||!!c.find(d=>d.$a&&d.$a(a))},sb:function(a,c,d){if(this[A].eb&&c===this)throw Error("A 'pure' computed must not be called recursively");this[A].u[a]=
-d;d.ka=this[A].H++;d.la=c.Ca()},ta:function(){var a,c=this[A].u;for(a in c)if(Object.prototype.hasOwnProperty.call(c,a)){var d=c[a];if(this.ia&&d.T.ja||d.T.ec(d.la))return!0}},uc:function(){this.ia&&!this[A].Fa&&this.ia(!1)},ga:function(){var a=this[A];return a.U||0<a.H},vc:function(){this.ja?this[A].U&&(this[A].Y=!0):this.Cb()},Qb:function(a){return a.subscribe(this.Cb,this)},Cb:function(){var a=this,c=a.throttleEvaluation;c&&0<=c?(clearTimeout(this[A].Db),this[A].Db=setTimeout(()=>a.P(!0),c)):a.ia?
-a.ia(!0):a.P(!0)},P:function(a){var c=this[A],d=c.pa,g=!1;if(!c.Fa&&!c.X){if(c.i&&!b.a.Wa(c.i)||d&&d()){if(!c.ib){this.o();return}}else c.ib=!1;c.Fa=!0;try{g=this.ac(a)}finally{c.Fa=!1}return g}},ac:function(a){var c=this[A],d=c.eb?void 0:!c.H;var g={Zb:this,za:c.u,Ta:c.H};b.l.wb({Yb:g,Xb:Y,j:this,ab:d});c.u={};c.H=0;a:{try{var k=c.Lb();break a}finally{b.l.end(),g.Ta&&!c.v&&b.a.L(g.za,X),c.Y=c.U=!1}k=void 0}c.H?g=this.Ga(c.J,k):(this.o(),g=!0);g&&(c.v?this.Ka():this.s(c.J,"beforeChange"),c.J=k,this.s(c.J,
-"spectate"),!c.v&&a&&this.s(c.J),this.qb&&this.qb());d&&this.s(c.J,"awake");return g},G:function(a){var c=this[A];(c.U&&(a||!c.H)||c.v&&this.ta())&&this.P();return c.J},Ha:function(a){b.R.fn.Ha.call(this,a);this.nb=function(){this[A].v||(this[A].Y?this.P():this[A].U=!1);return this[A].J};this.ia=function(c){this.ob(this[A].J);this[A].U=!0;c&&(this[A].Y=!0);this.pb(this,!c)}},o:function(){var a=this[A];!a.v&&a.u&&b.a.L(a.u,(c,d)=>d.o&&d.o());a.i&&a.Va&&b.a.I.fb(a.i,a.Va);a.u=void 0;a.H=0;a.X=!0;a.Y=
-!1;a.U=!1;a.v=!1;a.i=void 0;a.pa=void 0;a.Lb=void 0}},aa={na:function(a){var c=this,d=c[A];if(!d.X&&d.v&&"change"==a){d.v=!1;if(d.Y||c.ta())d.u=null,d.H=0,c.P()&&c.Ka();else{var g=[];b.a.L(d.u,(k,t)=>g[t.ka]=k);g.forEach((k,t)=>{var e=d.u[k],f=c.Qb(e.T);f.ka=t;f.la=e.la;d.u[k]=f});c.ta()&&c.P()&&c.Ka()}d.X||c.s(d.J,"awake")}},wa:function(a){var c=this[A];c.X||"change"!=a||this.sa("change")||(b.a.L(c.u,(d,g)=>{g.o&&(c.u[d]={T:g.T,ka:g.ka,la:g.la},g.o())}),c.v=!0,this.s(void 0,"asleep"))},Ca:function(){var a=
-this[A];a.v&&(a.Y||this.ta())&&this.P();return b.R.fn.Ca.call(this)}},ba={na:function(a){"change"!=a&&"beforeChange"!=a||this.G()}};Object.setPrototypeOf(M,b.R.fn);var Q=b.Z.C;M[Q]=b.j;b.m("computed",b.j);b.m("isComputed",a=>"function"==typeof a&&a[Q]===M[Q]);b.m("computed.fn",M);b.fa(M,"dispose",M.o);b.oc=a=>{if("function"===typeof a)return b.j(a,{pure:!0});a={...a,pure:!0};return b.j(a)};(()=>{b.A={M:a=>{switch(a.nodeName){case "OPTION":return!0===a.__ko__hasDomDataOptionValue__?b.a.c.get(a,b.b.options.cb):
-a.value;case "SELECT":return 0<=a.selectedIndex?b.A.M(a.options[a.selectedIndex]):void 0;default:return a.value}},Ma:(a,c,d)=>{switch(a.nodeName){case "OPTION":"string"===typeof c?(b.a.c.set(a,b.b.options.cb,void 0),delete a.__ko__hasDomDataOptionValue__,a.value=c):(b.a.c.set(a,b.b.options.cb,c),a.__ko__hasDomDataOptionValue__=!0,a.value="number"===typeof c?c:"");break;case "SELECT":for(var g=-1,k=""===c||null==c,t=0,e=a.options.length,f;t<e;++t)if(f=b.A.M(a.options[t]),f==c||""===f&&k){g=t;break}if(d||
-0<=g||k&&1<a.size)a.selectedIndex=g;break;default:a.value=null==c?"":c}}}})();b.F=(()=>{function a(f){f=b.a.Pb(f);123===f.charCodeAt(0)&&(f=f.slice(1,-1));f+="\n,";var h=[],r=f.match(g),p=[],q=0;if(1<r.length){for(var l=0,n;n=r[l++];){var m=n.charCodeAt(0);if(44===m){if(0>=q){h.push(u&&p.length?{key:u,value:p.join("")}:{unknown:u||p.join("")});var u=q=0;p=[];continue}}else if(58===m){if(!q&&!u&&1===p.length){u=p.pop();continue}}else if(47===m&&1<n.length&&(47===n.charCodeAt(1)||42===n.charCodeAt(1)))continue;
-else 47===m&&l&&1<n.length?(m=r[l-1].match(k))&&!t[m[0]]&&(f=f.slice(f.indexOf(n)+1),r=f.match(g),l=-1,n="/"):40===m||123===m||91===m?++q:41===m||125===m||93===m?--q:u||p.length||34!==m&&39!==m||(n=n.slice(1,-1));p.push(n)}if(0<q)throw Error("Unbalanced parentheses, braces, or brackets");}return h}var c=["true","false","null","undefined"],d=/^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i,g=/"(?:\\.|[^"])*"|'(?:\\.|[^'])*'|`(?:\\.|[^`])*`|\/\*(?:[^*]|\*+[^*/])*\*+\/|\/\/.*\n|\/(?:\\.|[^/])+\/w*|[^\s:,/][^,"'`{}()/:[\]]*[^\s,"'`{}()/:[\]]|[^\s]/g,
-k=/[\])"'A-Za-z0-9_$]+$/,t={"in":1,"return":1,"typeof":1},e=new Set;return{Pa:[],jb:e,mc:a,nc:function(f,h){function r(m,u){if(!n){var w=b.b[m];if(w&&w.preprocess&&!(u=w.preprocess(u,m,r)))return;if(w=e.has(m)){var v=u;c.includes(v)?v=!1:(w=v.match(d),v=null===w?!1:w[1]?"Object("+w[1]+")"+w[2]:v);w=v}w&&q.push("'"+m+"':function(_z){"+v+"=_z}")}l&&(u="function(){return "+u+" }");p.push("'"+m+"':"+u)}h=h||{};var p=[],q=[],l=h.valueAccessors,n=h.bindingParams;("string"===typeof f?a(f):f).forEach(m=>
-r(m.key||m.unknown,m.value));q.length&&r("_ko_property_writers","{"+q.join(",")+" }");return p.join(",")},kc:(f,h)=>-1<f.findIndex(r=>r.key==h),lb:(f,h,r,p,q)=>{if(f&&b.O(f))!b.jc(f)||q&&f.G()===p||f(p);else if((f=h.get("_ko_property_writers"))&&f[r])f[r](p)}}})();(()=>{function a(e){return 8==e.nodeType&&g.test(e.nodeValue)}function c(e){return 8==e.nodeType&&k.test(e.nodeValue)}function d(e,f){for(var h=e,r=1,p=[];h=h.nextSibling;){if(c(h)&&(b.a.c.set(h,t,!0),!--r))return p;p.push(h);a(h)&&++r}if(!f)throw Error("Cannot find closing comment tag to match: "+
-e.nodeValue);return null}var g=/^\s*ko(?:\s+([\s\S]+))?\s*$/,k=/^\s*\/ko\s*$/,t="__ko_matchedEndComment__";b.h={$:{},childNodes:e=>a(e)?d(e):e.childNodes,qa:e=>{a(e)?(e=d(e))&&[...e].forEach(f=>b.removeNode(f)):b.a.Xa(e)},ua:(e,f)=>{a(e)?(b.h.qa(e),e.after(...f)):b.a.ua(e,f)},prepend:(e,f)=>{a(e)?e.nextSibling.before(f):e.prepend(f)},Gb:(e,f,h)=>{h?h.after(f):b.h.prepend(e,f)},firstChild:e=>{if(a(e))return e=e.nextSibling,!e||c(e)?null:e;let f=e.firstChild;if(f&&c(f))throw Error("Found invalid end comment, as the first child of "+
-e);return f},nextSibling:e=>{if(a(e)){var f=d(e,void 0);e=f?(f.length?f[f.length-1]:e).nextSibling:null}if((f=e.nextSibling)&&c(f)){if(c(f)&&!b.a.c.get(f,t))throw Error("Found end comment without a matching opening comment, as child of "+e);return null}return f},dc:a,sc:e=>(e=e.nodeValue.match(g))?e[1]:null}})();(()=>{const a=new Map;b.xb=new class{lc(c){switch(c.nodeType){case 1:return null!=c.getAttribute("data-bind");case 8:return b.h.dc(c);default:return!1}}bc(c,d){a:{switch(c.nodeType){case 1:var g=
-c.getAttribute("data-bind");break a;case 8:g=b.h.sc(c);break a}g=null}if(g)try{let t={valueAccessors:!0},e=a.get(g);if(!e){var k="with($context){with($data||{}){return{"+b.F.nc(g,t)+"}}}";e=new Function("$context","$element",k);a.set(g,e)}return e(d,c)}catch(t){throw t.message="Unable to parse bindings.\nBindings value: "+g+"\nMessage: "+t.message,t;}return null}}})();(()=>{function a(l){var n=(l=b.a.c.get(l,p))&&l.D;n&&(l.D=null,n.Kb())}function c(l,n){for(var m,u=b.h.firstChild(n);m=u;)u=b.h.nextSibling(m),
-d(l,m);b.g.notify(n,b.g.B)}function d(l,n){var m=l;if(1===n.nodeType||b.xb.lc(n))m=k(n,null,l).bindingContextForDescendants;m&&n.matches&&!n.matches("SCRIPT,TEXTAREA,TEMPLATE")&&c(m,n)}function g(l){var n=[],m={},u=[];b.a.L(l,function y(v){if(!m[v]){var x=b.b[v];x&&(x.after&&(u.push(v),x.after.forEach(B=>{if(l[B]){if(u.includes(B))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+u.join(", "));y(B)}}),u.length--),n.push({key:v,Fb:x}));m[v]=!0}});return n}
-function k(l,n,m){var u=b.a.c.Za(l,p,{}),w=u.Wb;if(!n){if(w)throw Error("You cannot apply bindings multiple times to the same element.");u.Wb=!0}w||(u.context=m);u.bb||(u.bb={});if(n&&"function"!==typeof n)var v=n;else{var y=b.j(()=>{if(v=n?n(m,l):b.xb.bc(l,m)){if(m[e])m[e]();if(m[h])m[h]()}return v},{i:l});v&&y.ga()||(y=null)}var x=m,B;if(v){var E=y?z=>()=>y()[z]():z=>v[z],C={get:z=>v[z]&&E(z)(),has:z=>z in v};b.g.B in v&&b.g.subscribe(l,b.g.B,()=>{var z=v[b.g.B]();if(z){var D=b.h.childNodes(l);
-D.length&&z(D,b.Bb(D[0]))}});b.g.da in v&&(x=b.g.hb(l,m),b.g.subscribe(l,b.g.da,()=>{var z=v[b.g.da]();z&&b.h.firstChild(l)&&z(l)}));g(v).forEach(z=>{var D=z.Fb.init,F=z.Fb.update,I=z.key;if(8===l.nodeType&&!b.h.$[I])throw Error("The binding '"+I+"' cannot be used with virtual elements");try{"function"==typeof D&&b.l.N(()=>{var N=D(l,E(I),C,x.$data,x);if(N&&N.controlsDescendantBindings){if(void 0!==B)throw Error("Multiple bindings ("+B+" and "+I+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
-B=I}}),"function"==typeof F&&b.j(()=>F(l,E(I),C,x.$data,x),{i:l})}catch(N){throw N.message='Unable to process binding "'+I+": "+v[I]+'"\nMessage: '+N.message,N;}})}u=void 0===B;return{shouldBindDescendants:u,bindingContextForDescendants:u&&x}}function t(l,n){return l&&l instanceof b.ba?l:new b.ba(l,void 0,void 0,n)}var e=Symbol("_subscribable"),f=Symbol("_ancestorBindingInfo"),h=Symbol("_dataDependency");b.b={};var r={};b.ba=class{constructor(l,n,m,u,w){function v(){var D=E?B():B,F=b.a.f(D);n?(b.a.extend(y,
-n),f in n&&(y[f]=n[f])):(y.$parents=[],y.$root=F,y.ko=b);y[e]=z;x?F=y.$data:(y.$rawData=D,y.$data=F);m&&(y[m]=F);u&&u(y,n,F);if(n&&n[e]&&!b.l.j().$a(n[e]))n[e]();C&&(y[h]=C);return y.$data}var y=this,x=l===r,B=x?void 0:l,E="function"==typeof B&&!b.O(B),C=w&&w.dataDependency;if(w&&w.exportDependencies)v();else{var z=b.oc(v);z.G();z.ga()?z.ra=null:y[e]=void 0}}["createChildContext"](l,n,m,u){!u&&n&&"object"==typeof n&&(u=n,n=u.as,m=u.extend);return new b.ba(l,this,n,(w,v)=>{w.$parentContext=v;w.$parent=
-v.$data;w.$parents=(v.$parents||[]).slice(0);w.$parents.unshift(w.$parent);m&&m(w)},u)}["extend"](l,n){return new b.ba(r,this,null,m=>b.a.extend(m,"function"==typeof l?l(m):l),n)}};var p=b.a.c.V();class q{constructor(l,n,m){this.C=l;this.oa=n;this.xa=new Set;this.B=!1;n.D||b.a.I.ma(l,a);m&&m.D&&(m.D.xa.add(l),this.W=m)}Kb(){this.W&&this.W.D&&this.W.D.$b(this.C)}$b(l){this.xa.delete(l);!this.xa.size&&this.B&&this.Ab()}Ab(){this.B=!0;this.oa.D&&!this.xa.size&&(this.oa.D=null,b.a.I.fb(this.C,a),b.g.notify(this.C,
-b.g.da),this.Kb())}}b.g={B:"childrenComplete",da:"descendantsComplete",subscribe:(l,n,m,u,w)=>{var v=b.a.c.Za(l,p,{});v.ea||(v.ea=new b.R);w&&w.notifyImmediately&&v.bb[n]&&b.l.N(m,u,[l]);return v.ea.subscribe(m,u,n)},notify:(l,n)=>{var m=b.a.c.get(l,p);if(m&&(m.bb[n]=!0,m.ea&&m.ea.s(l,n),n==b.g.B))if(m.D)m.D.Ab();else if(void 0===m.D&&m.ea&&m.ea.sa(b.g.da))throw Error("descendantsComplete event not supported for bindings on this node");},hb:(l,n)=>{var m=b.a.c.Za(l,p,{});m.D||(m.D=new q(l,m,n[f]));
-return n[f]==m?n:n.extend(u=>{u[f]=m})}};b.rc=l=>(l=b.a.c.get(l,p))&&l.context;b.tb=(l,n,m)=>k(l,n,t(m));b.vb=(l,n)=>{1!==n.nodeType&&8!==n.nodeType||c(t(l),n)};b.ub=function(l,n,m){if(2>arguments.length){if(n=L.body,!n)throw Error("ko.applyBindings: could not find document.body; has the document been loaded?");}else if(!n||1!==n.nodeType&&8!==n.nodeType)throw Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");d(t(l,m),n)};b.Bb=l=>(l=l&&[1,
-8].includes(l.nodeType)&&b.rc(l))?l.$data:void 0;b.m("bindingHandlers",b.b);b.m("applyBindings",b.ub);b.m("applyBindingAccessorsToNode",b.tb);b.m("dataFor",b.Bb)})();(()=>{function a(f,h){var r={},p=t[f]||{},q=p.template;p=p.viewModel;if(q){q.element||c(f,"Unknown template value: "+q);q=q.element;var l=L.getElementById(q);l||c(f,"Cannot find element with ID "+q);l.matches("TEMPLATE")||c(f,"Template Source Element not a <template>");r.template=b.a.ya(l.content.childNodes)}p&&("function"!==typeof p[e]&&
-c(f,"Unknown viewModel value: "+p),r[e]=p[e]);r.template&&r[e]?h(r):h(null)}function c(f,h){throw Error(`Component '${f}': ${h}`);}function d(f,h){var r=!1;a(f,p=>{(r=null!=p)&&h(p)});r||h(null)}var g=Object.create(null),k=Object.create(null);b.Ra={get:(f,h)=>{var r=k[f];if(r)b.Rb.Nb(()=>h(r.definition));else{var p=g[f];if(p)p.subscribe(h);else{p=g[f]=new b.R;p.subscribe(h);d(f,l=>{k[f]={definition:l};delete g[f];q?p.s(l):b.Rb.Nb(()=>p.s(l))});var q=!0}}},tc:f=>delete k[f],register:(f,h)=>{if(!h)throw Error("Invalid configuration for "+
-f);if(t[f])throw Error("Component "+f+" is already registered");t[f]=h}};var t=Object.create(null),e="createViewModel";b.m("components",b.Ra);b.m("components.register",b.Ra.register)})();(()=>{var a=0;b.b.component={init:(c,d,g,k,t)=>{var e,f,h,r=()=>{var q=e&&e.dispose;"function"===typeof q&&q.call(e);h&&h.o();f=e=h=null},p=[...b.h.childNodes(c)];b.h.qa(c);b.a.I.ma(c,r);b.j(()=>{var q=b.a.f(d());if("string"!==typeof q){var l=b.a.f(q.params);q=b.a.f(q.name)}if(!q)throw Error("No component name specified");
-var n=b.g.hb(c,t),m=f=++a;b.Ra.get(q,u=>{if(f===m){r();if(!u)throw Error("Unknown component '"+q+"'");var w=u.template;if(!w)throw Error("Component '"+q+"' has no template");b.h.ua(c,b.a.ya(w));e=u.createViewModel(l,{element:c,templateNodes:p});b.vb(n.createChildContext(e,{extend:v=>{v.$component=e;v.$componentTemplateNodes=p}}),c)}})},{i:c});return{controlsDescendantBindings:!0}}};b.h.$.component=!0})();b.b.attr={update:(a,c)=>{c=b.a.f(c())||{};b.a.L(c,function(d,g){g=b.a.f(g);var k=d.indexOf(":");
-k="lookupNamespaceURI"in a&&0<k&&a.lookupNamespaceURI(d.slice(0,k));var t=!1===g||null==g;t?k?a.removeAttributeNS(k,d):a.removeAttribute(d):g=g.toString();t||(k?a.setAttributeNS(k,d,g):a.setAttribute(d,g));"name"===d&&(a.name=t?"":g)})}};var R=(a,c,d)=>{c&&c.split(/\s+/).forEach(g=>a.classList.toggle(g,d))};b.b.css={update:(a,c)=>{c=b.a.f(c());null!==c&&"object"==typeof c?b.a.L(c,(d,g)=>{g=b.a.f(g);R(a,d,!!g)}):(c=b.a.Pb(c),R(a,a.__ko__cssValue,!1),a.__ko__cssValue=c,R(a,c,!0))}};b.b.enable={update:(a,
-c)=>{(c=b.a.f(c()))&&a.disabled?a.removeAttribute("disabled"):c||a.disabled||(a.disabled=!0)}};b.b.disable={update:(a,c)=>b.b.enable.update(a,()=>!b.a.f(c()))};b.b.event={init:(a,c,d,g,k)=>{d=c()||{};b.a.L(d,t=>{"string"==typeof t&&a.addEventListener(t,function(e){var f=c()[t];if(f)try{g=k.$data;var h=f.apply(g,[g,...arguments])}finally{!0!==h&&e.preventDefault()}})})}};b.b.foreach={Ib:a=>()=>{var c=a(),d=b.O(c)?c.G():c;if(!d||"number"==typeof d.length)return{foreach:c};b.a.f(c);return{foreach:d.data,
-as:d.as,beforeRemove:d.beforeRemove}},init:(a,c)=>b.b.template.init(a,b.b.foreach.Ib(c)),update:(a,c,d,g,k)=>b.b.template.update(a,b.b.foreach.Ib(c),d,g,k)};b.F.Pa.foreach=!1;b.h.$.foreach=!0;b.b.hasfocus={init:(a,c,d)=>{var g=t=>{a.__ko_hasfocusUpdating=!0;t=a.ownerDocument.activeElement===a;var e=c();b.F.lb(e,d,"hasfocus",t,!0);a.__ko_hasfocusLastValue=t;a.__ko_hasfocusUpdating=!1},k=g.bind(null,!0);g=g.bind(null,!1);a.addEventListener("focus",k);a.addEventListener("focusin",k);a.addEventListener("blur",
-g);a.addEventListener("focusout",g);a.__ko_hasfocusLastValue=!1},update:(a,c)=>{c=!!b.a.f(c());a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===c||(c?a.focus():a.blur())}};b.F.jb.add("hasfocus");b.b.html={init:()=>({controlsDescendantBindings:!0}),update:(a,c)=>{b.a.Xa(a);c=b.a.f(c());if(null!=c){const d=L.createElement("template");d.innerHTML="string"!=typeof c?c.toString():c;a.appendChild(d.content)}}};(function(){function a(c,d,g){b.b[c]={init:(k,t,e,f,h)=>{var r,p={};d&&(p={as:e.get("as"),
-exportDependencies:!0});var q=e.has(b.g.da);b.j(()=>{var l=b.a.f(t()),n=!g!==!l,m=!r;q&&(h=b.g.hb(k,h));if(n){p.dataDependency=b.l.j();var u=d?h.createChildContext("function"==typeof l?l:t,p):b.l.Ba()?h.extend(null,p):h}m&&b.l.Ba()&&(r=b.a.ya(b.h.childNodes(k),!0));n?(m||b.h.ua(k,b.a.ya(r)),b.vb(u,k)):(b.h.qa(k),b.g.notify(k,b.g.B))},{i:k});return{controlsDescendantBindings:!0}}};b.F.Pa[c]=!1;b.h.$[c]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var S={};b.b.options={init:a=>{if(!a.matches("SELECT"))throw Error("options binding applies only to SELECT elements");
-for(;0<a.length;)a.remove(0);return{controlsDescendantBindings:!0}},update:(a,c,d)=>{function g(){return Array.from(a.options).filter(m=>m.selected)}function k(m,u,w){var v=typeof u;return"function"==v?u(m):"string"==v?m[u]:w}function t(m,u){l&&r?b.g.notify(a,b.g.B):p.length&&(m=p.includes(b.A.M(u[0])),u[0].selected=m,l&&!m&&b.l.N(b.a.Sb,null,[a,"change"]))}var e=a.multiple,f=0!=a.length&&e?a.scrollTop:null,h=b.a.f(c()),r=d.get("valueAllowUnset")&&d.has("value");c={};var p=[];r||(e?p=g().map(b.A.M):
-0<=a.selectedIndex&&p.push(b.A.M(a.options[a.selectedIndex])));if(h){"undefined"==typeof h.length&&(h=[h]);var q=h.filter(m=>m||null==m);d.has("optionsCaption")&&(h=b.a.f(d.get("optionsCaption")),null!==h&&void 0!==h&&q.unshift(S))}var l=!1;c.beforeRemove=m=>a.removeChild(m);h=t;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(h=(m,u)=>{t(m,u);b.l.N(d.get("optionsAfterRender"),null,[u[0],m!==S?m:void 0])});b.a.Ob(a,q,function(m,u,w){w.length&&(p=!r&&w[0].selected?[b.A.M(w[0])]:
-[],l=!0);u=a.ownerDocument.createElement("option");m===S?(b.a.gb(u,d.get("optionsCaption")),b.A.Ma(u,void 0)):(w=k(m,d.get("optionsValue"),m),b.A.Ma(u,b.a.f(w)),m=k(m,d.get("optionsText"),w),b.a.gb(u,m));return[u]},c,h);if(!r){var n;e?n=p.length&&g().length<p.length:n=p.length&&0<=a.selectedIndex?b.A.M(a.options[a.selectedIndex])!==p[0]:p.length||0<=a.selectedIndex;n&&b.l.N(b.a.Sb,null,[a,"change"])}(r||b.l.ab())&&b.g.notify(a,b.g.B);f&&20<Math.abs(f-a.scrollTop)&&(a.scrollTop=f)}};b.b.options.cb=
-b.a.c.V();b.b.style={update:(a,c)=>{c=b.a.f(c()||{});b.a.L(c,(d,g)=>{g=b.a.f(g);if(null==g||!1===g)g="";if(/^--/.test(d))a.style.setProperty(d,g);else{d=d.replace(/-(\w)/g,(t,e)=>e.toUpperCase());var k=a.style[d];a.style[d]=g;g===k||a.style[d]!=k||isNaN(g)||(a.style[d]=g+"px")}})}};b.b.submit={init:(a,c,d,g,k)=>{if("function"!=typeof c())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",t=>{var e=c();try{var f=e.call(k.$data,a)}finally{!0!==f&&(t.preventDefault?
-t.preventDefault():t.returnValue=!1)}})}};b.b.text={init:()=>({controlsDescendantBindings:!0}),update:(a,c)=>{8===a.nodeType&&(a.text||a.after(a.text=L.createTextNode("")),a=a.text);b.a.gb(a,c())}};b.h.$.text=!0;b.b.textInput={init:(a,c,d)=>{var g=a.value,k,t,e=()=>{clearTimeout(k);t=k=void 0;var h=a.value;g!==h&&(g=h,b.F.lb(c(),d,"textInput",h))},f=()=>{var h=b.a.f(c());null==h&&(h="");void 0!==t&&h===t?setTimeout(f,4):a.value!==h&&(a.value=h,g=a.value)};a.addEventListener("input",e);a.addEventListener("change",
-e);a.addEventListener("blur",e);b.j(f,{i:a})}};b.F.jb.add("textInput");b.b.textinput={preprocess:(a,c,d)=>d("textInput",a)};b.b.value={init:(a,c,d)=>{var g=a.matches("SELECT"),k=a.matches("INPUT");if(!k||"checkbox"!=a.type&&"radio"!=a.type){var t=new Set,e=d.get("valueUpdate"),f=null;e&&("string"==typeof e?t.add(e):e.forEach(q=>t.add(q)),t.delete("change"));var h=()=>{f=null;var q=c(),l=b.A.M(a);b.F.lb(q,d,"value",l)};t.forEach(q=>{var l=h;(q||"").startsWith("after")&&(l=()=>{f=b.A.M(a);setTimeout(h,
-0)},q=q.slice(5));a.addEventListener(q,l)});var r=k&&"file"==a.type?()=>{var q=b.a.f(c());null==q||""===q?a.value="":b.l.N(h)}:()=>{var q=b.a.f(c()),l=b.A.M(a);if(null!==f&&q===f)setTimeout(r,0);else if(q!==l||void 0===l)g?(l=d.get("valueAllowUnset"),b.A.Ma(a,q,l),l||q===b.A.M(a)||b.l.N(h)):b.A.Ma(a,q)};if(g){var p;b.g.subscribe(a,b.g.B,()=>{p?d.get("valueAllowUnset")?r():h():(a.addEventListener("change",h),p=b.j(r,{i:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",h),b.j(r,{i:a})}else b.tb(a,
-{checkedValue:c})},update:()=>{}};b.F.jb.add("value");b.b.visible={update:(a,c)=>{c=b.a.f(c());var d="none"!=a.style.display;c&&!d?a.style.display="":d&&!c&&(a.style.display="none")}};b.b.hidden={update:(a,c)=>a.hidden=!!b.a.f(c())};(function(a){b.b[a]={init:function(c,d,g,k,t){return b.b.event.init.call(this,c,()=>({[a]:d()}),g,k,t)}}})("click");(()=>{let a=b.a.c.V();class c{constructor(g){this.Ua=g}Ia(...g){let k=this.Ua;if(!g.length)return b.a.c.get(k,a)||(11===this.C?k.content:1===this.C?k:void 0);
-b.a.c.set(k,a,g[0])}}class d extends c{constructor(g){super(g);g&&(this.C=g.matches("TEMPLATE")&&g.content?g.content.nodeType:1)}}b.Ja={Ua:d,Oa:c}})();(()=>{function a(e,f){if(e.length){var h=e[0],r=h.parentNode;g(h,e[e.length-1],p=>{1!==p.nodeType&&8!==p.nodeType||b.ub(f,p)});b.a.Aa(e,r)}}function c(e,f,h,r){var p=(e&&(e.nodeType?e:0<e.length?e[0]:null)||h||{}).ownerDocument;if("string"==typeof h){p=p||L;p=p.getElementById(h);if(!p)throw Error("Cannot find template with ID "+h);h=new b.Ja.Ua(p)}else if([1,
-8].includes(h.nodeType))h=new b.Ja.Oa(h);else throw Error("Unknown template type: "+h);h=(h=h.Ia?h.Ia():null)?[...h.cloneNode(!0).childNodes]:null;if("number"!=typeof h.length||0<h.length&&"number"!=typeof h[0].nodeType)throw Error("Template engine must return an array of DOM nodes");p=!1;switch(f){case "replaceChildren":b.h.ua(e,h);p=!0;break;case "ignoreTargetNode":break;default:throw Error("Unknown renderMode: "+f);}p&&(a(h,r),"replaceChildren"==f&&b.g.notify(e,b.g.B));return h}function d(e,f,
-h){return b.O(e)?e():"function"===typeof e?e(f,h):e}var g=(e,f,h)=>{var r;for(f=b.h.nextSibling(f);e&&(r=e)!==f;)e=b.h.nextSibling(r),h(r,e)};b.pc=function(e,f,h,r){h=h||{};var p=p||"replaceChildren";if(r){var q=r.nodeType?r:0<r.length?r[0]:null;return b.j(()=>{var l=f&&f instanceof b.ba?f:new b.ba(f,null,null,null,{exportDependencies:!0}),n=d(e,l.$data,l);c(r,p,n,l,h)},{pa:()=>!q||!b.a.Wa(q),i:q})}console.log("no targetNodeOrNodeArray")};b.qc=(e,f,h,r,p)=>{function q(v,y){b.l.N(b.a.Ob,null,[r,v,
-m,h,u,y]);b.g.notify(r,b.g.B)}var l,n=h.as,m=(v,y)=>{l=p.createChildContext(v,{as:n,extend:x=>{x.$index=y;n&&(x[n+"Index"]=y)}});v=d(e,v,l);return c(r,"ignoreTargetNode",v,l,h)},u=(v,y)=>{a(y,l);l=null};if(!h.beforeRemove&&b.Hb(f)){q(f.G());var w=f.subscribe(v=>{q(f(),v)},null,"arrayChange");w.i(r);return w}return b.j(()=>{var v=b.a.f(f)||[];"undefined"==typeof v.length&&(v=[v]);q(v)},{i:r})};var k=b.a.c.V(),t=b.a.c.V();b.b.template={init:(e,f)=>{f=b.a.f(f());if("string"==typeof f||"name"in f)b.h.qa(e);
-else if("nodes"in f){f=f.nodes||[];if(b.O(f))throw Error('The "nodes" option must be a plain, non-observable array.');let h=f[0]&&f[0].parentNode;h&&b.a.c.get(h,t)||(h=b.a.Jb(f),b.a.c.set(h,t,!0));(new b.Ja.Oa(e)).Ia(h)}else if(f=b.h.childNodes(e),0<f.length)f=b.a.Jb(f),(new b.Ja.Oa(e)).Ia(f);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(e,f,h,r,p)=>{var q=f();f=b.a.f(q);h=!0;r=null;"string"==typeof f?f={}:(q="name"in
-f?f.name:e,"if"in f&&(h=b.a.f(f["if"])),h&&"ifnot"in f&&(h=!b.a.f(f.ifnot)),h&&!q&&(h=!1));"foreach"in f?r=b.qc(q,h&&f.foreach||[],f,e,p):h?(h=p,"data"in f&&(h=p.createChildContext(f.data,{as:f.as,exportDependencies:!0})),r=b.pc(q,h,f,e)):b.h.qa(e);p=r;(f=b.a.c.get(e,k))&&"function"==typeof f.o&&f.o();b.a.c.set(e,k,!p||p.ga&&!p.ga()?void 0:p)}};b.F.Pa.template=e=>{e=b.F.mc(e);return 1==e.length&&e[0].unknown||b.F.kc(e,"name")?null:"This template engine does not support anonymous templates nested within its templates"};
-b.h.$.template=!0})();b.a.Eb=(a,c,d)=>{if(a.length&&c.length){var g,k,t,e,f;for(g=k=0;(!d||g<d)&&(e=a[k]);++k){for(t=0;f=c[t];++t)if(e.value===f.value){e.moved=f.index;f.moved=e.index;c.splice(t,1);g=t=0;break}g+=t}}};b.a.zb=(()=>{function a(c,d,g,k,t){var e=Math.min,f=Math.max,h=[],r,p=c.length,q,l=d.length,n=l-p||1,m=p+l+1,u;for(r=0;r<=p;r++){var w=u;h.push(u=[]);var v=e(l,r+n);for(q=f(0,r-1);q<=v;q++)u[q]=q?r?c[r-1]===d[q-1]?w[q-1]:e(w[q]||m,u[q-1]||m)+1:q+1:r+1}e=[];f=[];n=[];r=p;for(q=l;r||q;)l=
-h[r][q]-1,q&&l===h[r][q-1]?f.push(e[e.length]={status:g,value:d[--q],index:q}):r&&l===h[r-1][q]?n.push(e[e.length]={status:k,value:c[--r],index:r}):(--q,--r,t.sparse||e.push({status:"retained",value:d[q]}));b.a.Eb(n,f,!t.dontLimitMoves&&10*p);return e.reverse()}return function(c,d,g){g="boolean"===typeof g?{dontLimitMoves:g}:g||{};c=c||[];d=d||[];return c.length<d.length?a(c,d,"added","deleted",g):a(d,c,"deleted","added",g)}})();(()=>{function a(g,k,t,e,f){var h=[],r=b.j(()=>{var p=k(t,f,b.a.Aa(h,
-g))||[];if(0<h.length){var q=h.nodeType?[h]:h;if(0<q.length){var l=q[0],n=l.parentNode,m;var u=0;for(m=p.length;u<m;u++)n.insertBefore(p[u],l);u=0;for(m=q.length;u<m;u++)b.removeNode(q[u])}e&&b.l.N(e,null,[t,p,f])}h.length=0;h.push(...p)},{i:g,pa:()=>!!h.find(b.a.Wa)});return{K:h,Sa:r.ga()?r:void 0}}var c=b.a.c.V(),d=b.a.c.V();b.a.Ob=(g,k,t,e,f,h)=>{function r(C){x={aa:C,Da:b.Z(m++)};l.push(x)}function p(C){x=q[C];x.Da(m++);b.a.Aa(x.K,g);l.push(x)}k=k||[];"undefined"==typeof k.length&&(k=[k]);e=e||
-{};var q=b.a.c.get(g,c),l=[],n=0,m=0,u=[],w=[],v=[],y=0;if(q){if(!h||q&&q._countWaitingForRemove)h=Array.prototype.map.call(q,C=>C.aa),h=b.a.zb(h,k,{dontLimitMoves:e.dontLimitMoves,sparse:!0});for(let C=0,z,D,F;z=h[C];C++)switch(D=z.moved,F=z.index,z.status){case "deleted":for(;n<F;)p(n++);if(void 0===D){var x=q[n];x.Sa&&(x.Sa.o(),x.Sa=void 0);b.a.Aa(x.K,g).length&&(e.beforeRemove&&(l.push(x),y++,x.aa===d?x=null:v[x.Da.G()]=x),x&&u.push.apply(u,x.K))}n++;break;case "added":for(;m<F;)p(n++);void 0!==
-D?(w.push(l.length),p(D)):r(z.value)}for(;m<k.length;)p(n++);l._countWaitingForRemove=y}else k.forEach(r);b.a.c.set(g,c,l);u.forEach(e.beforeRemove?b.ca:b.removeNode);var B,E;y=g.ownerDocument.activeElement;if(w.length)for(;void 0!=(k=w.shift());){x=l[k];for(B=void 0;k;)if((E=l[--k].K)&&E.length){B=E[E.length-1];break}for(n=0;u=x.K[n];B=u,n++)b.h.Gb(g,u,B)}for(k=0;x=l[k];k++){x.K||b.a.extend(x,a(g,t,x.aa,f,x.Da));for(n=0;u=x.K[n];B=u,n++)b.h.Gb(g,u,B);!x.hc&&f&&(f(x.aa,x.K,x.Da),x.hc=!0,B=x.K[x.K.length-
-1])}y&&g.ownerDocument.activeElement!=y&&y.focus();(function(C,z){if(C)for(var D=0,F=z.length;D<F;D++)z[D]&&z[D].K.forEach(I=>C(I,D,z[D].aa))})(e.beforeRemove,v);for(k=0;k<v.length;++k)v[k]&&(v[k].aa=d)}})();T.ko=P})(this);
+(Q=>{function L(a,b){return a===b&&a!==Object(a)}function ba(a,b){var d;return()=>{d||(d=setTimeout(()=>{d=0;a()},b))}}function ca(a,b){var d;return()=>{clearTimeout(d);d=setTimeout(a,b)}}function da(a,b){b?.dispose?.()}function ea(a,b){var d=this.Mb,e=d[x];e.X||(this.Na&&this.wa[b]?(d.lb(b,a,this.wa[b]),this.wa[b]=null,--this.Na):e.v[b]||d.lb(b,a,e.A?{S:a}:d.Db(a)),a.ea&&a.Hb())}var J=Q.document;const c={W:(a,b)=>{a=a.split(".");for(var d=c,e=0,g=a.length-1;e<g;e++)d=d[a[e]];d[a[g]]=b},g:{extend:(a,
+b)=>b?Object.assign(a,b):a,K:(a,b)=>a&&Object.entries(a).forEach(d=>b(d[0],d[1])),Ra:a=>[...a.childNodes].forEach(b=>c.removeNode(b)),Xb:a=>{a=[...a];var b=(a[0]?.ownerDocument||J).createElement("div");a.forEach(d=>b.append(c.ia(d)));return b},va:(a,b)=>Array.prototype.map.call(a,b?d=>c.ia(d.cloneNode(!0)):d=>d.cloneNode(!0)),qa:(a,b)=>{c.g.Ra(a);b&&a.append(...b)},ya:(a,b)=>{if(a.length){for(b=8===b.nodeType&&b.parentNode||b;a.length&&a[0].parentNode!==b;)a.splice(0,1);for(;1<a.length&&a[a.length-
+1].parentNode!==b;)--a.length;if(1<a.length){b=a[0];var d=a[a.length-1];for(a.length=0;b!==d;)a.push(b),b=b.nextSibling;a.push(d)}}return a},Cb:a=>null==a?"":a.trim?a.trim():a.toString().replace(/^[\s\xa0]+|[\s\xa0]+$/g,""),Qa:a=>a.ownerDocument.documentElement.contains(1!==a.nodeType?a.parentNode:a),Eb:(a,b)=>{if(!a?.nodeType)throw Error("element must be a DOM node when calling triggerEvent");a.dispatchEvent(new Event(b))},h:a=>c.V(a)?a():a,$a:(a,b)=>a.textContent=c.g.h(b)}};c.W("unwrap",c.g.h);
+(()=>{let a=0,b="__ko__"+Date.now(),d=new WeakMap;c.g.l={get:(e,g)=>(d.get(e)||{})[g],set:(e,g,m)=>{d.has(e)?d.get(e)[g]=m:d.set(e,{[g]:m});return m},Sa(e,g,m){return this.get(e,g)||this.set(e,g,m)},clear:e=>d.delete(e),Z:()=>a++ +b}})();c.g.N=(()=>{var a=c.g.l.Z(),b={1:1,8:1,9:1},d={1:1,9:1};const e=(f,h)=>{var k=c.g.l.get(f,a);h&&!k&&(k=new Set,c.g.l.set(f,a,k));return k},g=f=>{var h=e(f);h&&(new Set(h)).forEach(k=>k(f));c.g.l.clear(f);d[f.nodeType]&&m(f.childNodes,!0)},m=(f,h)=>{for(var k=[],l,
+p=0;p<f.length;p++)if(!h||8===f[p].nodeType)if(g(k[k.length]=l=f[p]),f[p]!==l)for(;p--&&!k.includes(f[p]););};return{ha:(f,h)=>{if("function"!=typeof h)throw Error("Callback must be a function");e(f,1).add(h)},Za:(f,h)=>{var k=e(f);k&&(k.delete(h),k.size||c.g.l.set(f,a,null))},ia:f=>{c.u.I(()=>{b[f.nodeType]&&(g(f),d[f.nodeType]&&m(f.getElementsByTagName("*")))});return f},removeNode:f=>{c.ia(f);f.parentNode&&f.parentNode.removeChild(f)}}})();c.ia=c.g.N.ia;c.removeNode=c.g.N.removeNode;c.W("addDisposeCallback",
+c.g.N.ha);c.extenders={debounce:(a,b)=>a.Ea(d=>ca(d,b)),rateLimit:(a,b)=>a.Ea(d=>ba(d,b)),notify:(a,b)=>{a.la="always"==b?null:L}};class fa{constructor(a,b,d){this.S=a;this.fb=b;this.Aa=d;this.Ia=!1;this.H=this.da=null}dispose(){this.Ia||(this.H&&c.g.N.Za(this.da,this.H),this.Ia=!0,this.Aa(),this.S=this.fb=this.Aa=this.da=this.H=null)}o(a){this.da=a;c.g.N.ha(a,this.H=this.dispose.bind(this))}}c.P=function(){Object.setPrototypeOf(this,M);M.init(this)};var M={init:a=>{a.R=new Map;a.R.set("change",new Set);
+a.kb=1},subscribe:function(a,b,d){var e=this;d=d||"change";var g=new fa(e,b?a.bind(b):a,()=>{e.R.get(d).delete(g);e.Ja?.(d)});e.Ka?.(d);e.R.has(d)||e.R.set(d,new Set);e.R.get(d).add(g);return g},B(a,b){b=b||"change";"change"===b&&this.Fa();if(this.oa(b)){b="change"===b&&this.Fb||new Set(this.R.get(b));try{c.u.ob(),b.forEach(d=>{d.Ia||d.fb(a)})}finally{c.u.end()}}},za(){return this.kb},Sb(a){return this.za()!==a},Fa(){++this.kb},Ea(a){var b=this,d=c.V(b),e,g,m,f,h;b.sa||(b.sa=b.B,b.B=(l,p)=>{p&&"change"!==
+p?"beforeChange"===p?b.hb(l):b.sa(l,p):b.ib(l)});var k=a(()=>{b.ea=!1;d&&f===b&&(f=b.gb?b.gb():b());var l=g||h&&b.Ca(m,f);h=g=e=!1;l&&b.sa(m=f)});b.ib=(l,p)=>{p&&b.ea||(h=!p);b.Fb=new Set(b.R.get("change"));b.ea=e=!0;f=l;k()};b.hb=l=>{e||(m=l,b.sa(l,"beforeChange"))};b.jb=()=>{h=!0};b.Hb=()=>{b.Ca(m,b.L(!0))&&(g=!0)}},oa(a){return(this.R.get(a)||[]).size},Ca(a,b){return!this.la||!this.la(a,b)},toString:()=>"[object Object]",extend:function(a){var b=this;a&&c.g.K(a,(d,e)=>{d=c.extenders[d];"function"==
+typeof d&&(b=d(b,e)||b)});return b}};c.P.fn=Object.setPrototypeOf(M,Function.prototype);c.Wb=a=>"function"==typeof a?.subscribe&&"function"==typeof a.B;(()=>{let a=[],b,d=0;c.u={ob:e=>{a.push(b);b=e},end:()=>b=a.pop(),Ab:e=>{if(b){if(!c.Wb(e))throw Error("Only subscribable things can act as dependencies");b.Kb.call(b.Lb,e,e.Gb||(e.Gb=++d))}},I(e,g,m){try{return a.push(b),b=void 0,e.apply(g,m||[])}finally{b=a.pop()}},na:()=>b?.m.na(),Da:()=>b?.Da,m:()=>b?.m}})();const A=Symbol("_latestValue");c.$=
+a=>{function b(){if(0<arguments.length)return b.Ca(b[A],arguments[0])&&(b.eb(),b[A]=arguments[0],b.valueHasMutated()),this;c.u.Ab(b);return b[A]}b[A]=a;Object.defineProperty(b,"length",{get:()=>b[A]?.length});c.P.fn.init(b);return Object.setPrototypeOf(b,E)};var E={toJSON:function(){let a=this[A];return a?.toJSON?.()||a},la:L,L(){return this[A]},valueHasMutated:function(){this.B(this[A],"spectate");this.B(this[A])},eb(){this.B(this[A],"beforeChange")}};Object.setPrototypeOf(E,c.P.fn);var D=c.$.$b=
+"__ko_proto__";E[D]=c.$;c.V=a=>{if((a="function"==typeof a&&a[D])&&a!==E[D]&&a!==c.m.fn[D])throw Error("Invalid object that looks like an observable; possibly from another Knockout instance");return!!a};c.wb=a=>"function"==typeof a&&(a[D]===E[D]||a[D]===c.m.fn[D]&&a.Tb);c.W("observable",c.$);c.W("isObservable",c.V);c.W("observable.fn",E);c.observableArray=a=>{a=a||[];if(!Array.isArray(a))throw Error("The argument passed when initializing an observable array must be an array, or null, or undefined.");
+return Object.setPrototypeOf(c.$(a),c.observableArray.fn).extend({trackArrayChanges:!0})};const R=Symbol("IS_OBSERVABLE_ARRAY");c.observableArray.fn=Object.setPrototypeOf({[R]:1,remove:function(a){for(var b=this.L(),d=!1,e="function"!=typeof a||c.V(a)?f=>f===a:a,g=b.length;g--;){var m=b[g];if(e(m)){if(b[g]!==m)throw Error("Array modified during remove; cannot remove item");d||this.eb();d=!0;b.splice(g,1)}}d&&this.valueHasMutated()}},c.$.fn);Object.getOwnPropertyNames(Array.prototype).forEach(a=>{"function"===
+typeof Array.prototype[a]&&"constructor"!=a&&("copyWithin fill pop push reverse shift sort splice unshift".split(" ").includes(a)?c.observableArray.fn[a]=function(...b){var d=this.L();this.eb();this.qb(d,a,b);b=d[a](...b);this.valueHasMutated();return b===d?this:b}:c.observableArray.fn[a]=function(...b){return this()[a](...b)})});c.isObservableArray=a=>!(!a||!a[R]);c.extenders.trackArrayChanges=(a,b)=>{function d(){if(k){var q=[].concat(a.L()||[]);if(a.oa("arrayChange")){if(!m||1<k)m=c.g.rb(l,q,a.La);
+var r=m}l=q;m=null;k=0;r?.length&&a.B(r,"arrayChange")}}function e(){g?d():(g=!0,h=a.subscribe(()=>++k,null,"spectate"),l=[].concat(a.L()||[]),m=null,f=a.subscribe(d))}a.La={};"object"==typeof b&&c.g.extend(a.La,b);a.La.sparse=!0;if(!a.qb){var g=!1,m=null,f,h,k=0,l,p=a.Ka,n=a.Ja;a.Ka=q=>{p?.call(a,q);"arrayChange"===q&&e()};a.Ja=q=>{n?.call(a,q);"arrayChange"!==q||a.oa("arrayChange")||(f?.dispose(),h?.dispose(),h=f=null,g=!1,l=void 0)};a.qb=(q,r,t)=>{if(g&&!k){var u=[],z=q.length,w=t.length,y=0,B=
+(ha,ia,ja)=>u[u.length]={status:ha,value:ia,index:ja};switch(r){case "push":y=z;case "unshift":for(q=0;q<w;++q)B("added",t[q],y+q);break;case "pop":y=z-1;case "shift":z&&B("deleted",q[y],y);break;case "splice":y=Math.min(Math.max(0,0>t[0]?z+t[0]:t[0]),z);z=1===w?z:Math.min(y+(t[1]||0),z);w=y+w-2;r=Math.max(z,w);for(var v=[],F=[],C=2;y<r;++y,++C)y<z&&F.push(B("deleted",q[y],y)),y<w&&v.push(B("added",t[C],y));c.g.ub(F,v);break;default:return}m=u}}}};var x=Symbol("_state");c.m=(a,b)=>{function d(){if(0<
+arguments.length){if("function"!==typeof e)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.");e(...arguments);return this}g.X||c.u.Ab(d);(g.U||g.A&&d.pa())&&d.T();return g.J}"object"===typeof a?b=a:(b=b||{},a&&(b.read=a));if("function"!=typeof b.read)throw Error("Pass a function that returns the value of the ko.computed");var e=b.write,g={J:void 0,Y:!0,U:!0,Ba:!1,bb:!1,X:!1,Ya:!1,A:!1,zb:b.read,
+o:b.o||null,ja:b.ja,Pa:null,v:{},G:0,cc:null};d[x]=g;d.Tb="function"===typeof e;c.P.fn.init(d);Object.setPrototypeOf(d,K);b.pure&&(g.Ya=!0,g.A=!0,c.g.extend(d,ka));g.o&&(g.bb=!0,g.o.nodeType||(g.o=null));g.A||d.T();g.o&&d.isActive()&&c.g.N.ha(g.o,g.Pa=()=>{d.dispose()});return d};var K={la:L,na(){return this[x].G},Qb(){var a=[];c.g.K(this[x].v,(b,d)=>a[d.fa]=d.S);return a},Ta(a){if(!this[x].G)return!1;var b=this.Qb();return b.includes(a)||!!b.find(d=>d.Ta&&d.Ta(a))},lb(a,b,d){if(this[x].Ya&&b===this)throw Error("A 'pure' computed must not be called recursively");
+this[x].v[a]=d;d.fa=this[x].G++;d.ga=b.za()},pa(){var a,b=this[x].v;for(a in b)if(Object.prototype.hasOwnProperty.call(b,a)){var d=b[a];if(this.ra&&d.S.ea||d.S.Sb(d.ga))return!0}},ec(){this[x].Ba||this.ra?.(!1)},isActive(){var a=this[x];return a.U||0<a.G},fc(){this.ea?this[x].U&&(this[x].Y=!0):this.tb()},Db(a){return a.subscribe(this.tb,this)},tb(){this.ra?this.ra(!0):this.T(!0)},T(a){var b=this[x],d=b.ja,e=!1;if(!b.Ba&&!b.X){if(b.o&&!c.g.Qa(b.o)||d?.()){if(!b.bb){this.dispose();return}}else b.bb=
+!1;try{b.Ba=!0,e=this.Ob(a)}finally{b.Ba=!1}return e}},Ob(a){var b=this[x],d=b.Ya?void 0:!b.G;var e={Mb:this,wa:b.v,Na:b.G};c.u.ob({Lb:e,Kb:ea,m:this,Da:d});b.v={};b.G=0;a:{try{var g=b.zb();break a}finally{c.u.end(),e.Na&&!b.A&&c.g.K(e.wa,da),b.Y=b.U=!1}g=void 0}b.G?e=this.Ca(b.J,g):(this.dispose(),e=!0);e&&(b.A?this.Fa():this.B(b.J,"beforeChange"),b.J=g,this.B(b.J,"spectate"),!b.A&&a&&this.B(b.J),this.jb&&this.jb());d&&this.B(b.J,"awake");return e},L(a){var b=this[x];(b.U&&(a||!b.G)||b.A&&this.pa())&&
+this.T();return b.J},Ea(a){var b=this;c.P.fn.Ea.call(b,a);b.gb=()=>{b[x].A||(b[x].Y?b.T():b[x].U=!1);return b[x].J};b.ra=d=>{b.hb(b[x].J);b[x].U=!0;d&&(b[x].Y=!0);b.ib(b,!d)}},dispose:function(){var a=this[x];!a.A&&a.v&&c.g.K(a.v,(b,d)=>d.dispose?.());a.o&&a.Pa&&c.g.N.Za(a.o,a.Pa);a.v=void 0;a.G=0;a.X=!0;a.Y=!1;a.U=!1;a.A=!1;a.o=void 0;a.ja=void 0;a.zb=void 0}},ka={Ka(a){var b=this,d=b[x];if(!d.X&&d.A&&"change"==a){d.A=!1;if(d.Y||b.pa())d.v=null,d.G=0,b.T()&&b.Fa();else{var e=[];c.g.K(d.v,(g,m)=>
+e[m.fa]=g);e.forEach((g,m)=>{var f=d.v[g],h=b.Db(f.S);h.fa=m;h.ga=f.ga;d.v[g]=h});b.pa()&&b.T()&&b.Fa()}d.X||b.B(d.J,"awake")}},Ja(a){var b=this[x];b.X||"change"!=a||this.oa("change")||(c.g.K(b.v,(d,e)=>{e.dispose&&(b.v[d]={S:e.S,fa:e.fa,ga:e.ga},e.dispose())}),b.A=!0,this.B(void 0,"asleep"))},za(){var a=this[x];a.A&&(a.Y||this.pa())&&this.T();return c.P.fn.za.call(this)}};Object.setPrototypeOf(K,c.P.fn);var N=c.$.$b;K[N]=c.m;c.m.fn=K;c.W("computed",c.m);c.isComputed=a=>"function"==typeof a&&a[N]===
+K[N];c.yb=a=>{if("function"===typeof a)return c.m(a,{pure:!0});a={...a,pure:!0};return c.m(a)};c.C={M:a=>{switch(a.nodeName){case "OPTION":return!0===a.__ko__hasDomDataOptionValue__?c.g.l.get(a,c.i.options.Xa):a.value;case "SELECT":return 0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex]):void 0;default:return a.value}},Ga:(a,b)=>{switch(a.nodeName){case "OPTION":"string"===typeof b?(c.g.l.set(a,c.i.options.Xa,void 0),delete a.__ko__hasDomDataOptionValue__,a.value=b):(c.g.l.set(a,c.i.options.Xa,
+b),a.__ko__hasDomDataOptionValue__=!0,a.value="number"===typeof b?b:"");break;case "SELECT":for(var d=-1,e=""===(b??""),g=a.options.length,m;g--;)if(m=c.C.M(a.options[g]),m==b||""===m&&e){d=g;break}if(0<=d||e&&1<a.size)a.selectedIndex=d;break;default:a.value=b??""}}};c.ma=(()=>{var a=RegExp("\"(?:\\\\.|[^\"])*\"|'(?:\\\\.|[^'])*'|`(?:\\\\.|[^`])*`|/\\*(?:[^*]|\\*+[^*/])*\\*+/|//.*\n|/(?:\\\\.|[^/])+/w*|[^\\s:,/][^,\"'`{}()/:[\\]]*[^\\s,\"'`{}()/:[\\]]|[^\\s]","g"),b=/[\])"'A-Za-z0-9_$]+$/,d={"in":1,
+"return":1,"typeof":1};return{Zb:e=>{e=c.g.Cb(e);123===e.charCodeAt(0)&&(e=e.slice(1,-1));e+="\n,";var g=[],m=e.match(a),f=[],h=0;if(1<m.length){for(var k=0,l;l=m[k++];){var p=l.charCodeAt(0);if(44===p){if(0>=h){n&&f.length&&g.push("'"+n+"':()=>("+f.join("")+")");var n=h=0;f=[];continue}}else if(58===p){if(!h&&!n&&1===f.length){n=f.pop();continue}}else if(47===p&&1<l.length&&(47===l.charCodeAt(1)||42===l.charCodeAt(1)))continue;else 47===p&&k&&1<l.length?(p=m[k-1].match(b))&&!d[p[0]]&&(e=e.slice(e.indexOf(l)+
+1),m=e.match(a),k=-1,l="/"):40===p||123===p||91===p?++h:41===p||125===p||93===p?--h:n||f.length||34!==p&&39!==p||(l=l.slice(1,-1));f.push(l)}if(0<h)throw Error("Unbalanced parentheses, braces, or brackets");}g.push("'$data':()=>$data");return g.join(",")},dc:(e,g)=>-1<e.findIndex(m=>m.key==g),Ha:(e,g,m,f,h,k)=>{g&&c.V(g)?!c.wb(g)||k&&g.L()===h||g(h):(console.log(`"${f}" should contain observable in ${e.outerHTML.replace(/>.+/,">")}`),m.get("$data")[f]=h)}}})();(()=>{function a(f){return 8==f.nodeType&&
+e.test(f.nodeValue)}function b(f){return 8==f.nodeType&&g.test(f.nodeValue)}function d(f,h){for(var k=f,l=1,p=[];k=k.nextSibling;){if(b(k)&&(c.g.l.set(k,m,!0),!--l))return p;p.push(k);a(k)&&++l}if(!h)throw Error("Cannot find closing comment tag to match: "+f.nodeValue);return null}var e=/^\s*ko(?:\s+([\s\S]+))?\s*$/,g=/^\s*\/ko\s*$/,m="__ko_matchedEndComment__";c.s={aa:{},childNodes:f=>a(f)?d(f):f.childNodes,ka:f=>{a(f)?(f=d(f))&&[...f].forEach(h=>c.removeNode(h)):c.g.Ra(f)},qa:(f,h)=>{a(f)?(c.s.ka(f),
+f.after(...h)):c.g.qa(f,h)},Vb:(f,h,k)=>{k?k.after(h):a(f)?f.nextSibling.before(h):f.prepend(h)},firstChild:f=>{if(a(f))return f=f.nextSibling,!f||b(f)?null:f;let h=f.firstChild;if(h&&b(h))throw Error("Found invalid end comment, as the first child of "+f);return h},nextSibling:f=>{if(a(f)){var h=d(f,void 0);f=h?(h.length?h[h.length-1]:f).nextSibling:null}if((h=f.nextSibling)&&b(h)){if(b(h)&&!c.g.l.get(h,m))throw Error("Found end comment without a matching opening comment, as child of "+f);return null}return h},
+Rb:a,bc:f=>(f=f.nodeValue.match(e))?f[1]:null}})();const S=new Map,la=a=>{switch(a.nodeType){case 1:return a.getAttribute("data-bind");case 8:return c.s.bc(a)}return null};c.pb=new class{Yb(a){switch(a.nodeType){case 1:return null!=a.getAttribute("data-bind");case 8:return c.s.Rb(a)}return!1}Pb(a,b){if(a=la(a))try{let d=S.get(a);d||(d=new Function("$context","with($context){return{"+c.ma.Zb(a)+"}}"),S.set(a,d));b=new Proxy(b,{has:()=>!0,get:(e,g)=>Reflect.has(e.$data,g)?e.$data[g]:e[g]});return d(b)}catch(d){throw d.message=
+"Unable to parse bindings.\nBindings value: "+a+"\nMessage: "+d.message,d;}return null}};const G=Symbol("_subscribable"),H=Symbol("_ancestorBindingInfo"),T=Symbol("_dataDependency"),U={},I=c.g.l.Z();c.i={};c.ba=class{constructor(a,b,d,e){var g=this,m=a===U,f=m?void 0:a,h="function"==typeof f&&!c.V(f),k=e?.dataDependency;a=()=>{var p=h?f():f;p=c.g.h(p);b?(c.g.extend(g,b),H in b&&(g[H]=b[H])):g.$root=p;g[G]=l;m?p=g.$data:g.$data=p;d?.(g,b,p);if(b?.[G]&&!c.u.m().Ta(b[G]))b[G]();k&&(g[T]=k);return g.$data};
+if(e?.exportDependencies)a();else{var l=c.yb(a);l.L();l.isActive()?l.la=null:g[G]=void 0}}createChildContext(a,b){return new c.ba(a,this,(d,e)=>{d.$parent=e.$data;b.extend?.(d)},b)}extend(a,b){return new c.ba(U,this,d=>c.g.extend(d,"function"==typeof a?a(d):a),b)}};const V=a=>{a=c.g.l.get(a,I);var b=a?.D;b&&(a.D=null,b.xb())};class ma{constructor(a,b,d){this.H=a;this.da=b;this.ua=new Set;this.F=!1;b.D||c.g.N.ha(a,V);d?.D&&(d.D.ua.add(a),this.Aa=d)}xb(){this.Aa?.D?.Nb(this.H)}Nb(a){this.ua.delete(a);
+this.ua.size||this.sb?.()}sb(){this.F=!0;this.da.D&&!this.ua.size&&(this.da.D=null,c.g.N.Za(this.H,V),c.j.notify(this.H,c.j.ca),this.xb())}}c.j={F:"childrenComplete",ca:"descendantsComplete",subscribe:(a,b,d,e,g)=>{var m=c.g.l.Sa(a,I,{});m.xa||(m.xa=new c.P);g?.notifyImmediately&&m.Wa[b]&&c.u.I(d,e,[a]);return m.xa.subscribe(d,e,b)},notify:(a,b)=>{var d=c.g.l.get(a,I);if(d&&(d.Wa[b]=!0,d.xa?.B(a,b),b==c.j.F))if(d.D)d.D.sb();else if(void 0===d.D&&d.xa?.oa(c.j.ca))throw Error("descendantsComplete event not supported for bindings on this node");
+},ab:(a,b)=>{var d=c.g.l.Sa(a,I,{});d.D||(d.D=new ma(a,d,b[H]));return b[H]==d?b:b.extend(e=>{e[H]=d})}};const X=(a,b)=>{for(var d,e=c.s.firstChild(b);d=e;)e=c.s.nextSibling(d),W(a,d);c.j.notify(b,c.j.F)},W=(a,b)=>{var d=a;if(1===b.nodeType||c.pb.Yb(b))d=Y(b,null,a);d&&!b.matches?.("SCRIPT,TEXTAREA,TEMPLATE")&&X(d,b)},na=a=>{var b=[],d={},e=[],g=m=>{if(!d[m]){var f=c.i[m];f&&(f.after&&(e.push(m),f.after.forEach(h=>{if(a[h]){if(e.includes(h))throw Error("Cannot combine the following bindings, because they have a cyclic dependency: "+
+e.join(", "));g(h)}}),e.length--),b.push({key:m,vb:f}));d[m]=!0}};c.g.K(a,g);return b},Y=(a,b,d)=>{var e=c.g.l.Sa(a,I,{}),g=e.Ib;if(!b){if(g)throw Error("You cannot apply bindings multiple times to the same element.");e.Ib=!0}g||(e.context=d);e.Wa||(e.Wa={});if(b&&"function"!==typeof b)var m=b;else{var f=c.m(()=>{if(m=b?b(d,a):c.pb.Pb(a,d))d[G]?.(),d[T]?.();return m},{o:a});m&&f.isActive()||(f=null)}var h=d,k;if(m){var l=f?n=>()=>f()[n]():n=>m[n],p={get:n=>m[n]&&l(n)(),has:n=>n in m};c.j.F in m&&
+c.j.subscribe(a,c.j.F,()=>{var n=m[c.j.F]();if(n){var q=c.s.childNodes(a);q.length&&n(q,c.dataFor(q[0]))}});c.j.ca in m&&(h=c.j.ab(a,d),c.j.subscribe(a,c.j.ca,()=>{var n=m[c.j.ca]();n&&c.s.firstChild(a)&&n(a)}));na(m).forEach(n=>{var q=n.vb.init,r=n.vb.update,t=n.key;if(8===a.nodeType&&!c.s.aa[t])throw Error("The binding '"+t+"' cannot be used with comment nodes");try{"function"==typeof q&&c.u.I(()=>{var u=q(a,l(t),p,h.$data,h);if(u&&u.controlsDescendantBindings){if(void 0!==k)throw Error("Multiple bindings ("+
+k+" and "+t+") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");k=t}}),"function"==typeof r&&c.m(()=>r(a,l(t),p,h.$data,h),{o:a})}catch(u){throw u.message='Unable to process binding "'+t+": "+m[t]+'"\nMessage: '+u.message,u;}})}return void 0===k&&h};c.ac=a=>c.g.l.get(a,I)?.context;const O=a=>a&&a instanceof c.ba?a:new c.ba(a);c.applyBindingAccessorsToNode=(a,b,d)=>Y(a,b,O(d));c.nb=(a,b)=>{1!==b.nodeType&&8!==b.nodeType||X(O(a),
+b)};c.Jb=(a,b)=>W(O(a),b);c.dataFor=a=>([1,8].includes(a?.nodeType)&&c.ac(a))?.$data;c.W("bindingHandlers",c.i);(()=>{var a=Object.create(null),b=new Map;c.components={get:(m,f)=>{if(b.has(m))f(b.get(m));else{var h=a[m];h?h.subscribe(f):(h=a[m]=new c.P,h.subscribe(f),g(m,k=>{b.set(m,k);delete a[m];h.B(k)}))}},register:(m,f)=>{if(!f)throw Error("Invalid configuration for "+m);if(d[m])throw Error("Component "+m+" is already registered");d[m]=f}};var d=Object.create(null),e=(m,f)=>{throw Error(`Component '${m}': ${f}`);
+},g=(m,f)=>{var h={},k=d[m]||{},l=k.template;k=k.viewModel;if(l){l.element||e(m,"Unknown template value: "+l);l=l.element;var p=J.getElementById(l);p||e(m,"Cannot find element with ID "+l);p.matches("TEMPLATE")||e(m,"Template Source Element not a <template>");h.template=c.g.va(p.content.childNodes)}k&&("function"!==typeof k.createViewModel&&e(m,"Unknown viewModel value: "+k),h.createViewModel=k.createViewModel);f(h.template&&h.createViewModel?h:null)}})();(()=>{var a=0;c.i.component={init:(b,d,e,
+g,m)=>{var f,h,k=()=>{var l=f&&f.dispose;"function"===typeof l&&l.call(f);h=f=null};c.s.ka(b);c.g.N.ha(b,k);c.m(()=>{var l=c.g.h(d());if("string"!==typeof l){var p=c.g.h(l.params);l=c.g.h(l.name)}if(!l)throw Error("No component name specified");var n=c.j.ab(b,m),q=h=++a;c.components.get(l,r=>{if(h===q){k();if(!r)throw Error("Unknown component '"+l+"'");var t=r.template;if(!t)throw Error("Component '"+l+"' has no template");c.s.qa(b,c.g.va(t));f=r.createViewModel(p,{element:b});c.nb(n.createChildContext(f,
+{}),b)}})},{o:b});return{controlsDescendantBindings:!0}}};c.s.aa.component=!0})();c.i.attr={update:(a,b)=>{b=c.g.h(b())||{};c.g.K(b,function(d,e){e=c.g.h(e);var g=d.indexOf(":");g="lookupNamespaceURI"in a&&0<g&&a.lookupNamespaceURI(d.slice(0,g));!1===e||null==e?g?a.removeAttributeNS(g,d):a.removeAttribute(d):(e=e.toString(),g?a.setAttributeNS(g,d,e):a.setAttribute(d,e))})}};(()=>{c.i.checked={after:["value","attr"],init:function(a,b,d){var e="checkbox"==a.type,g="radio"==a.type;if(e||g){const n=c.yb(()=>
+{if(d.has("checkedValue"))return c.g.h(d.get("checkedValue"));if(l)return d.has("value")?c.g.h(d.get("value")):a.value});var m=()=>{if(!c.u.Da()){var q=a.checked,r=n();if(q||!g&&!c.u.na()){var t=c.u.I(b);if(h){var u=k?t.L():t,z=p;p=r;z!==r?q&&(u.push(r),u.remove(z)):q?u.push(r):u.remove(r);k&&c.wb(t)&&t(u)}else e&&(void 0===r?r=q:q||(r=void 0)),c.ma.Ha(a,t,d,"checked",r,!0)}}},f=b(),h=e&&c.g.h(f)instanceof Array,k=!(h&&f.push&&f.splice),l=g||h,p=h?n():void 0;c.m(m,null,{o:a});a.addEventListener("click",
+m);c.m(()=>{var q=c.g.h(b()),r=n();h?(a.checked=q.includes(r),p=r):a.checked=e&&void 0===r?!!q:n()===q},null,{o:a});f=void 0}}};c.i.checkedValue={update:function(a,b){a.value=c.g.h(b())}}})();var P=(a,b,d)=>b&&b.split(/\s+/).forEach(e=>a.classList.toggle(e,d));c.i.css={update:(a,b)=>{b=c.g.h(b());"object"==typeof b?c.g.K(b,(d,e)=>{e=c.g.h(e);P(a,d,!!e)}):(b=c.g.Cb(b),P(a,a.__ko__cssValue,!1),a.__ko__cssValue=b,P(a,b,!0))}};c.i.enable={update:(a,b)=>{(b=c.g.h(b()))&&a.disabled?a.removeAttribute("disabled"):
+b||a.disabled||(a.disabled=!0)}};c.i.disable={update:(a,b)=>c.i.enable.update(a,()=>!c.g.h(b()))};c.i.event={init:function(a,b,d,e,g){c.g.K(b()||{},m=>{"string"==typeof m&&a.addEventListener(m,(...f)=>{var h=b()[m];if(h)try{e=g.$data;var k=h.apply(e,[e,...f])}finally{!0!==k&&f[0].preventDefault()}})})}};const Z=a=>()=>{var b=a(),d=c.V(b)?b.L():b;if(!d||Array.isArray(d))return{foreach:b};c.g.h(b);return{foreach:d.data}};c.i.foreach={init:(a,b)=>c.i.template.init(a,Z(b)),update:(a,b,d,e,g)=>c.i.template.update(a,
+Z(b),d,e,g)};c.s.aa.foreach=!0;c.i.hasfocus={init:(a,b,d)=>{var e=m=>{a.__ko_hasfocusUpdating=!0;m=a.ownerDocument.activeElement===a;c.ma.Ha(a,b(),d,"hasfocus",m,!0);a.__ko_hasfocusLastValue=m;a.__ko_hasfocusUpdating=!1},g=e.bind(null,!0);e=e.bind(null,!1);a.addEventListener("focus",g);a.addEventListener("focusin",g);a.addEventListener("blur",e);a.addEventListener("focusout",e);a.__ko_hasfocusLastValue=!1},update:(a,b)=>{b=!!c.g.h(b());a.__ko_hasfocusUpdating||a.__ko_hasfocusLastValue===b||(b?a.focus():
+a.blur())}};c.i.html={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{c.g.Ra(a);b=c.g.h(b());if(null!=b){const d=J.createElement("template");d.innerHTML="string"!=typeof b?b.toString():b;a.appendChild(d.content)}}};(()=>{function a(b,d,e){c.i[b]={init:(g,m,f,h,k)=>{var l,p={};d&&(p={exportDependencies:!0});var n=f.has(c.j.ca);c.m(()=>{var q=c.g.h(m()),r=!e!==!q,t=!l;n&&(k=c.j.ab(g,k));if(r){p.dataDependency=c.u.m();var u=d?k.createChildContext("function"==typeof q?q:m,p):c.u.na()?k.extend(null,
+p):k}t&&c.u.na()&&(l=c.g.va(c.s.childNodes(g),!0));r?(t||c.s.qa(g,c.g.va(l)),c.nb(u,g)):(c.s.ka(g),c.j.notify(g,c.j.F))},{o:g});return{controlsDescendantBindings:!0}}};c.s.aa[b]=!0}a("if");a("ifnot",!1,!0);a("with",!0)})();var aa={};c.i.options={init:a=>{if(!a.matches("SELECT"))throw Error("options binding applies only to SELECT elements");let b=a.length;for(;b--;)a.remove(b);return{controlsDescendantBindings:!0}},update:(a,b,d)=>{var e=a.multiple,g=0!=a.length&&e?a.scrollTop:null,m=c.g.h(b()),f=
+[];b=()=>Array.from(a.options).filter(n=>n.selected);var h=(n,q,r)=>{var t=typeof q;return"function"==t?q(n):"string"==t?n[q]:r},k=(n,q)=>{f.length&&(n=f.includes(c.C.M(q[0])),q[0].selected=n,p&&!n&&c.u.I(c.g.Eb,null,[a,"change"]))};e?f=b().map(c.C.M):0<=a.selectedIndex&&f.push(c.C.M(a.options[a.selectedIndex]));if(m){Array.isArray(m)||(m=[m]);var l=m.filter(n=>n??1)}var p=!1;m=k;d.has("optionsAfterRender")&&"function"==typeof d.get("optionsAfterRender")&&(m=(n,q)=>{k(n,q);c.u.I(d.get("optionsAfterRender"),
+null,[q[0],n!==aa?n:void 0])});c.g.Bb(a,l,(n,q,r)=>{r.length&&(f=r[0].selected?[c.C.M(r[0])]:[],p=!0);q=a.ownerDocument.createElement("option");n===aa?(c.g.$a(q),c.C.Ga(q,void 0)):(r=h(n,d.get("optionsValue"),n),c.C.Ga(q,c.g.h(r)),n=h(n,d.get("optionsText"),r),c.g.$a(q,n));return[q]},{},m);l=f.length;(e?l&&b().length<l:l&&0<=a.selectedIndex?c.C.M(a.options[a.selectedIndex])!==f[0]:l||0<=a.selectedIndex)&&c.u.I(c.g.Eb,null,[a,"change"]);c.u.Da()&&c.j.notify(a,c.j.F);g&&20<Math.abs(g-a.scrollTop)&&
+(a.scrollTop=g)}};c.i.options.Xa=c.g.l.Z();c.i.style={update:(a,b)=>{c.g.K(c.g.h(b()||{}),(d,e)=>{e=c.g.h(e);if(null==e||!1===e)e="";if(/^--/.test(d))a.style.setProperty(d,e);else{d=d.replace(/-(\w)/g,(m,f)=>f.toUpperCase());var g=a.style[d];a.style[d]=e;e===g||a.style[d]!=g||isNaN(e)||(a.style[d]=e+"px")}})}};c.i.submit={init:(a,b,d,e,g)=>{if("function"!=typeof b())throw Error("The value for a submit binding must be a function");a.addEventListener("submit",m=>{var f=b();try{var h=f.call(g.$data,
+a)}finally{!0!==h&&m.preventDefault()}})}};c.i.text={init:()=>({controlsDescendantBindings:!0}),update:(a,b)=>{8===a.nodeType&&(a.text||a.after(a.text=J.createTextNode("")),a=a.text);c.g.$a(a,b())}};c.s.aa.text=!0;c.i.textInput={init:(a,b,d)=>{var e=a.value,g,m,f=()=>{clearTimeout(g);m=g=void 0;var k=a.value;a.checkValidity()&&e!==k&&(e=k,c.ma.Ha(a,b(),d,"textInput",k))},h=()=>{var k=c.g.h(b())??"";void 0!==m&&k===m?setTimeout(h,4):a.value!==k&&(a.value=k,e=a.value)};a.addEventListener("input",f);
+a.addEventListener("change",f);c.m(h,{o:a})}};c.i.value={init:(a,b,d)=>{var e=a.matches("SELECT"),g=a.matches("INPUT");if(!g||"checkbox"!=a.type&&"radio"!=a.type){var m=new Set,f=d.get("valueUpdate"),h=null,k=()=>{h=null;var n=b(),q=c.C.M(a);c.ma.Ha(a,n,d,"value",q)};f&&("string"==typeof f?m.add(f):f.forEach(n=>m.add(n)),m.delete("change"));m.forEach(n=>{var q=k;(n||"").startsWith("after")&&(q=()=>{h=c.C.M(a);setTimeout(k,0)},n=n.slice(5));a.addEventListener(n,q)});var l=g&&"file"==a.type?()=>{var n=
+c.g.h(b());null==n||""===n?a.value="":c.u.I(k)}:()=>{var n=c.g.h(b()),q=c.C.M(a);if(null!==h&&n===h)setTimeout(l,0);else if(n!==q||void 0===q)e?(c.C.Ga(a,n),n!==c.C.M(a)&&c.u.I(k)):c.C.Ga(a,n)};if(e){var p;c.j.subscribe(a,c.j.F,()=>{p?d.get("valueAllowUnset")?l():k():(a.addEventListener("change",k),p=c.m(l,{o:a}))},null,{notifyImmediately:!0})}else a.addEventListener("change",k),c.m(l,{o:a})}else c.applyBindingAccessorsToNode(a,{checkedValue:b})},update:()=>{}};c.i.visible={update:(a,b)=>{b=c.g.h(b());
+var d="none"!=a.style.display;b&&!d?a.style.display="":d&&!b&&(a.style.display="none")}};c.i.hidden={update:(a,b)=>a.hidden=!!c.g.h(b())};(function(a){c.i[a]={init:function(b,d,e,g,m){return c.i.event.init.call(this,b,()=>({[a]:d()}),e,g,m)}}})("click");(()=>{let a=c.g.l.Z();class b{constructor(e){this.Oa=e}Va(...e){let g=this.Oa;if(!e.length)return c.g.l.get(g,a)||(11===this.H?g.content:1===this.H?g:void 0);c.g.l.set(g,a,e[0])}}class d extends b{constructor(e){super(e);e&&(this.H=e.matches("TEMPLATE")&&
+e.content?e.content.nodeType:1)}}c.cb={Oa:d,mb:b}})();(()=>{const a=(h,k,l)=>{var p;for(k=c.s.nextSibling(k);h&&(p=h)!==k;)h=c.s.nextSibling(p),l(p,h)},b=(h,k)=>{if(h.length){var l=h[0],p=l.parentNode;a(l,h[h.length-1],n=>(1===n.nodeType||8===n.nodeType)&&c.Jb(k,n));c.g.ya(h,p)}},d=(h,k,l,p)=>{var n=(h&&(h.nodeType?h:0<h.length?h[0]:null)||l||{}).ownerDocument;if("string"==typeof l){n=n||J;n=n.getElementById(l);if(!n)throw Error("Cannot find template with ID "+l);l=new c.cb.Oa(n)}else if([1,8].includes(l.nodeType))l=
+new c.cb.mb(l);else throw Error("Unknown template type: "+l);l=(l=l.Va?l.Va():null)?[...l.cloneNode(!0).childNodes]:null;if(!Array.isArray(l)||0<l.length&&"number"!=typeof l[0].nodeType)throw Error("Template engine must return an array of DOM nodes");k&&(c.s.qa(h,l),b(l,p),c.j.notify(h,c.j.F));return l},e=(h,k,l)=>c.V(h)?h():"function"===typeof h?h(k,l):h,g=(h,k,l,p)=>{l=l||{};if(p){var n=p.nodeType?p:0<p.length?p[0]:null;return c.m(()=>{var q=k instanceof c.ba?k:new c.ba(k,null,null,{exportDependencies:!0}),
+r=e(h,q.$data,q);d(p,!0,r,q,l)},{ja:()=>!n||!c.g.Qa(n),o:n})}console.log("no targetNodeOrNodeArray")},m=(h,k,l,p,n)=>{var q,r=(w,y)=>{q=n.createChildContext(w,{extend:B=>B.$index=y});w=e(h,w,q);return d(p,!1,w,q,l)},t=(w,y)=>{b(y,q);q=null},u=(w,y)=>{c.u.I(c.g.Bb,null,[p,w,r,l,t,y]);c.j.notify(p,c.j.F)};if(c.isObservableArray(k)){u(k.L());var z=k.subscribe(w=>{u(k(),w)},null,"arrayChange");z.o(p);return z}return c.m(()=>{var w=c.g.h(k)||[];Array.isArray(w)||(w=[w]);u(w)},{o:p})},f=c.g.l.Z();c.i.template=
+{init:(h,k)=>{k=c.g.h(k());if("string"==typeof k||"name"in k)c.s.ka(h);else if(k=c.s.childNodes(h),k.length)k=c.g.Xb(k),(new c.cb.mb(h)).Va(k);else throw Error("Anonymous template defined, but no template content was provided");return{controlsDescendantBindings:!0}},update:(h,k,l,p,n)=>{p=k();k=c.g.h(p);l=null;"string"==typeof k?k={}:p="name"in k?k.name:h;var q=!!p;"foreach"in k?l=m(p,q&&k.foreach||[],k,h,n):q?(l=n,"data"in k&&(l=n.createChildContext(k.data,{exportDependencies:!0})),l=g(p,l,k,h)):
+c.s.ka(h);n=l;c.g.l.get(h,f)?.dispose?.();c.g.l.set(h,f,!n||n.isActive&&!n.isActive()?void 0:n)}};c.s.aa.template=!0})();c.g.ub=(a,b,d)=>{var e=0,g,m=b.length;m&&a.every(f=>{g=b.findIndex(h=>f.value===h.value);0<=g&&(f.moved=b[g].index,b[g].moved=f.index,b.splice(g,1),e=g=0,--m);e+=m;return m&&(!d||e<d)})};c.g.rb=(()=>{var a=(b,d,e,g,m)=>{for(var f=Math.min,h=Math.max,k=[],l=-1,p=b.length,n,q=d.length,r=q-p||1,t=p+q+1,u,z,w;++l<=p;)for(z=u,k.push(u=[]),w=f(q,l+r),n=h(0,l-1);n<=w;n++)u[n]=n?l?b[l-
+1]===d[n-1]?z[n-1]:f(z[n]||t,u[n-1]||t)+1:n+1:l+1;f=[];h=[];r=[];l=p;for(n=q;l||n;)q=k[l][n]-1,n&&q===k[l][n-1]?h.push(f[f.length]={status:e,value:d[--n],index:n}):l&&q===k[l-1][n]?r.push(f[f.length]={status:g,value:b[--l],index:l}):(--n,--l,m.sparse||f.push({status:"retained",value:d[n]}));c.g.ub(r,h,10*p);return f.reverse()};return(b,d,e)=>{b=b||[];d=d||[];return b.length<d.length?a(b,d,"added","deleted",e):a(d,b,"deleted","added",e)}})();(()=>{function a(e,g,m,f,h){var k=[],l=c.m(()=>{var p=g(m,
+h,c.g.ya(k,e))||[];if(0<k.length){var n=k.nodeType?[k]:k;if(0<n.length){var q=n[0],r=q.parentNode;p.forEach(t=>r.insertBefore(t,q));n.forEach(t=>c.removeNode(t))}f&&c.u.I(f,null,[m,p,h])}k.length=0;k.push(...p)},{o:e,ja:()=>!!k.find(c.g.Qa)});return{O:k,Ma:l.isActive()?l:void 0}}var b=c.g.l.Z(),d=c.g.l.Z();c.g.Bb=(e,g,m,f,h,k)=>{g=g||[];Array.isArray(g)||(g=[g]);var l=c.g.l.get(e,b),p=[],n=0,q=0,r=[],t=[],u,z=v=>{u={ta:v,Ua:c.$(q++)};p.push(u)},w=v=>{u=l[v];u.Ua(q++);c.g.ya(u.O,e);p.push(u)};if(l){if(!k||
+l&&l._countWaitingForRemove)k=c.g.rb(Array.prototype.map.call(l,C=>C.ta),g,{sparse:!0});let v,F;for(k.forEach(C=>{v=C.moved;F=C.index;switch(C.status){case "deleted":for(;n<F;)w(n++);void 0===v&&(u=l[n],u.Ma&&(u.Ma.dispose(),u.Ma=void 0),c.g.ya(u.O,e).length&&u&&r.push.apply(r,u.O));n++;break;case "added":for(;q<F;)w(n++);void 0!==v?(t.push(p.length),w(v)):z(C.value)}});q<g.length;)w(n++);p._countWaitingForRemove=0}else g.forEach(z);c.g.l.set(e,b,p);r.forEach(c.removeNode);var y=v=>{c.s.Vb(e,v,B);
+B=v};k=e.ownerDocument.activeElement;if(t.length)for(;null!=(g=t.shift());){for(u=p[g];g--;)if(f=p[g].O,f?.length){var B=f[f.length-1];break}u.O.forEach(y)}p.forEach(v=>{v.O||c.g.extend(v,a(e,m,v.ta,h,v.Ua));v.O.forEach(y);!v.Ub&&h&&(h(v.ta,v.O,v.Ua),v.Ub=!0,B=v.O[v.O.length-1])});e.ownerDocument.activeElement!=k&&k?.focus();[].forEach(v=>v&&(v.ta=d))}})();Q.ko=c})(this);
diff --git a/vendors/knockout/package.json b/vendors/knockout/package.json
index 2ac5a7884..1fa14d2f8 100644
--- a/vendors/knockout/package.json
+++ b/vendors/knockout/package.json
@@ -20,10 +20,10 @@
     "preprocess": "build/build.sh",
     "html": "spec/runner.html?src=build/output/knockout-latest.js&testling=true",
     "browsers": [
-      "chrome/69..latest",
-      "firefox/69..latest",
-      "safari/12..latest",
-      "opera/56..latest"
+      "chrome/80..latest",
+      "firefox/78..latest",
+      "safari/13..latest",
+      "opera/67..latest"
     ]
   },
   "licenses": [
@@ -33,11 +33,11 @@
     }
   ],
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-cli": "~0.1.0"
+    "grunt": "^1.5.3",
+    "grunt-cli": "^1.4.3"
   },
   "dependencies": {
-    "closure-compiler": "^0.2.12",
-    "google-closure-compiler": "^20200830.0.0"
+    "closure-compiler": "0.2.12",
+    "google-closure-compiler": "^20220905.0.0"
   }
 }
diff --git a/vendors/knockout/src/binding/bindingAttributeSyntax.js b/vendors/knockout/src/binding/bindingAttributeSyntax.js
index 114eb6f34..894a8dd38 100644
--- a/vendors/knockout/src/binding/bindingAttributeSyntax.js
+++ b/vendors/knockout/src/binding/bindingAttributeSyntax.js
@@ -1,285 +1,247 @@
-(() => {
-    // Hide or don't minify context properties, see https://github.com/knockout/knockout/issues/2294
-    var contextSubscribable = Symbol('_subscribable');
-    var contextAncestorBindingInfo = Symbol('_ancestorBindingInfo');
-    var contextDataDependency = Symbol('_dataDependency');
 
-    ko.bindingHandlers = {};
+// Hide or don't minify context properties, see https://github.com/knockout/knockout/issues/2294
+const contextSubscribable = Symbol('_subscribable'),
+    contextAncestorBindingInfo = Symbol('_ancestorBindingInfo'),
+    contextDataDependency = Symbol('_dataDependency'),
 
-    var inheritParentVm = {};
+    inheritParentVm = {},
 
-    // 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)
-        {
-            // The binding context object includes static properties for the current, parent, and root view models.
-            // If a view model is actually stored in an observable, the corresponding binding context object, and
-            // any child contexts, must be updated when the view model is changed.
-            function updateContext() {
-                // Most of the time, the context will directly get a view model object, but if a function is given,
-                // we call the function to retrieve the view model. If the function accesses any observables or returns
-                // an observable, the dependency is tracked, and those observables can later cause the binding
-                // context to be updated.
-                var dataItemOrObservable = isFunc ? realDataItemOrAccessor() : realDataItemOrAccessor,
-                    dataItem = ko.utils.unwrapObservable(dataItemOrObservable);
+    boundElementDomDataKey = ko.utils.domData.nextKey();
 
-                if (parentContext) {
-                    // Copy $root and any custom properties from the parent context
-                    ko.utils.extend(self, parentContext);
+ko.bindingHandlers = {};
 
-                    // Copy Symbol properties
-                    if (contextAncestorBindingInfo in parentContext) {
-                        self[contextAncestorBindingInfo] = parentContext[contextAncestorBindingInfo];
-                    }
-                } else {
-                    self['$parents'] = [];
-                    self['$root'] = dataItem;
+// 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, extendCallback, options)
+    {
+        var self = this,
+            shouldInheritData = dataItemOrAccessor === inheritParentVm,
+            realDataItemOrAccessor = shouldInheritData ? undefined : dataItemOrAccessor,
+            isFunc = typeof(realDataItemOrAccessor) == "function" && !ko.isObservable(realDataItemOrAccessor),
+            subscribable,
+            dataDependency = options?.['dataDependency'],
 
-                    // 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;
+        // The binding context object includes static properties for the current, parent, and root view models.
+        // If a view model is actually stored in an observable, the corresponding binding context object, and
+        // any child contexts, must be updated when the view model is changed.
+        updateContext = () => {
+            // Most of the time, the context will directly get a view model object, but if a function is given,
+            // we call the function to retrieve the view model. If the function accesses any observables or returns
+            // an observable, the dependency is tracked, and those observables can later cause the binding
+            // context to be updated.
+            var dataItemOrObservable = isFunc ? realDataItemOrAccessor() : realDataItemOrAccessor,
+                dataItem = ko.utils.unwrapObservable(dataItemOrObservable);
+
+            if (parentContext) {
+                // Copy $root and any custom properties from the parent context
+                ko.utils.extend(self, parentContext);
+
+                // Copy Symbol properties
+                if (contextAncestorBindingInfo in parentContext) {
+                    self[contextAncestorBindingInfo] = parentContext[contextAncestorBindingInfo];
                 }
-
-                self[contextSubscribable] = subscribable;
-
-                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.
-                if (extendCallback)
-                    extendCallback(self, parentContext, dataItem);
-
-                // When a "parent" context is given and we don't already have a dependency on its context, register a dependency on it.
-                // Thus whenever the parent context is updated, this context will also be updated.
-                if (parentContext && parentContext[contextSubscribable] && !ko.dependencyDetection.computed().hasAncestorDependency(parentContext[contextSubscribable])) {
-                    parentContext[contextSubscribable]();
-                }
-
-                if (dataDependency) {
-                    self[contextDataDependency] = dataDependency;
-                }
-
-                return self['$data'];
-            }
-
-            var self = this,
-                shouldInheritData = dataItemOrAccessor === inheritParentVm,
-                realDataItemOrAccessor = shouldInheritData ? undefined : dataItemOrAccessor,
-                isFunc = typeof(realDataItemOrAccessor) == "function" && !ko.isObservable(realDataItemOrAccessor),
-                subscribable,
-                dataDependency = options && options['dataDependency'];
-
-            if (options && options['exportDependencies']) {
-                // The "exportDependencies" option means that the calling code will track any dependencies and re-create
-                // the binding context when they change.
-                updateContext();
             } else {
-                subscribable = ko.pureComputed(updateContext);
-                subscribable.peek();
+                self['$root'] = dataItem;
+            }
 
-                // At this point, the binding context has been initialized, and the "subscribable" computed observable is
-                // subscribed to any observables that were accessed in the process. If there is nothing to track, the
-                // computed will be inactive, and we can safely throw it away. If it's active, the computed is stored in
-                // the context object.
-                if (subscribable.isActive()) {
-                    // Always notify because even if the model ($data) hasn't changed, other context properties might have changed
-                    subscribable.equalityComparer = null;
-                } else {
-                    self[contextSubscribable] = undefined;
+            self[contextSubscribable] = subscribable;
+
+            if (shouldInheritData) {
+                dataItem = self['$data'];
+            } else {
+                self['$data'] = 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.
+            extendCallback?.(self, parentContext, dataItem);
+
+            // When a "parent" context is given and we don't already have a dependency on its context, register a dependency on it.
+            // Thus whenever the parent context is updated, this context will also be updated.
+            if (parentContext?.[contextSubscribable] && !ko.dependencyDetection.computed().hasAncestorDependency(parentContext[contextSubscribable])) {
+                parentContext[contextSubscribable]();
+            }
+
+            if (dataDependency) {
+                self[contextDataDependency] = dataDependency;
+            }
+
+            return self['$data'];
+        };
+
+        if (options?.['exportDependencies']) {
+            // The "exportDependencies" option means that the calling code will track any dependencies and re-create
+            // the binding context when they change.
+            updateContext();
+        } else {
+            subscribable = ko.pureComputed(updateContext);
+            subscribable.peek();
+
+            // At this point, the binding context has been initialized, and the "subscribable" computed observable is
+            // subscribed to any observables that were accessed in the process. If there is nothing to track, the
+            // computed will be inactive, and we can safely throw it away. If it's active, the computed is stored in
+            // the context object.
+            if (subscribable.isActive()) {
+                // Always notify because even if the model ($data) hasn't changed, other context properties might have changed
+                subscribable.equalityComparer = null;
+            } else {
+                self[contextSubscribable] = undefined;
+            }
+        }
+    }
+
+    // Extend the binding context hierarchy with a new view model object. If the parent context is watching
+    // any observables, the new child context will automatically get a dependency on the parent context.
+    // 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, options) {
+        return new ko.bindingContext(dataItemOrAccessor, this, (self, parentContext) => {
+            // Extend the context hierarchy by setting the appropriate pointers
+            self['$parent'] = parentContext['$data'];
+            options['extend']?.(self);
+        }, options);
+    }
+
+    // Extend the binding context with new custom properties. This doesn't change the context hierarchy.
+    // 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, self =>
+            ko.utils.extend(self, typeof(properties) == "function" ? properties(self) : properties)
+        , options);
+    }
+};
+
+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) {
+        this.node = node;
+        this.bindingInfo = bindingInfo;
+        this.asyncDescendants = new Set;
+        this.childrenComplete = false;
+
+        bindingInfo.asyncContext || ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
+
+        if (ancestorBindingInfo?.asyncContext) {
+            ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
+            this.ancestorBindingInfo = ancestorBindingInfo;
+        }
+    }
+    notifyAncestor() {
+        this.ancestorBindingInfo?.asyncContext?.descendantComplete(this.node);
+    }
+    descendantComplete(node) {
+        this.asyncDescendants.delete(node);
+        this.asyncDescendants.size || this.completeChildren?.();
+    }
+    completeChildren() {
+        this.childrenComplete = true;
+        if (this.bindingInfo.asyncContext && !this.asyncDescendants.size) {
+            this.bindingInfo.asyncContext = null;
+            ko.utils.domNodeDisposal.removeDisposeCallback(this.node, asyncContextDispose);
+            ko.bindingEvent.notify(this.node, ko.bindingEvent.descendantsComplete);
+            this.notifyAncestor();
+        }
+    }
+}
+
+ko.bindingEvent = {
+    childrenComplete: "childrenComplete",
+    descendantsComplete : "descendantsComplete",
+
+    subscribe: (node, event, callback, context, options) => {
+        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
+        if (!bindingInfo.eventSubscribable) {
+            bindingInfo.eventSubscribable = new ko.subscribable;
+        }
+        if (options?.['notifyImmediately'] && bindingInfo.notifiedEvents[event]) {
+            ko.dependencyDetection.ignore(callback, context, [node]);
+        }
+        return bindingInfo.eventSubscribable['subscribe'](callback, context, event);
+    },
+
+    notify: (node, event) => {
+        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
+        if (bindingInfo) {
+            bindingInfo.notifiedEvents[event] = true;
+            bindingInfo.eventSubscribable?.notifySubscribers(node, event);
+            if (event == ko.bindingEvent.childrenComplete) {
+                if (bindingInfo.asyncContext) {
+                    bindingInfo.asyncContext.completeChildren();
+                } 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 Error("descendantsComplete event not supported for bindings on this node");
                 }
             }
         }
+    },
 
-        // Extend the binding context hierarchy with a new view model object. If the parent context is watching
-        // any observables, the new child context will automatically get a dependency on the parent context.
-        // 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'];
-            }
+    startPossiblyAsyncContentBinding: (node, bindingContext) => {
+        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
 
-            return new ko.bindingContext(dataItemOrAccessor, this, dataItemAlias, (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);
+        if (!bindingInfo.asyncContext) {
+            bindingInfo.asyncContext = new AsyncCompleteContext(node, bindingInfo, bindingContext[contextAncestorBindingInfo]);
         }
 
-        // Extend the binding context with new custom properties. This doesn't change the context hierarchy.
-        // 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 =>
-                ko.utils.extend(self, typeof(properties) == "function" ? properties(self) : properties)
-            , options);
+        // If the provided context was already extended with this node's binding info, just return the extended context
+        if (bindingContext[contextAncestorBindingInfo] == bindingInfo) {
+            return bindingContext;
         }
-    };
 
-    var boundElementDomDataKey = ko.utils.domData.nextKey();
-
-    function asyncContextDispose(node) {
-        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey),
-            asyncContext = bindingInfo && bindingInfo.asyncContext;
-        if (asyncContext) {
-            bindingInfo.asyncContext = null;
-            asyncContext.notifyAncestor();
-        }
+        return bindingContext['extend'](ctx => {
+            ctx[contextAncestorBindingInfo] = bindingInfo;
+        });
     }
+};
 
-    class AsyncCompleteContext {
-        constructor(node, bindingInfo, ancestorBindingInfo) {
-            this.node = node;
-            this.bindingInfo = bindingInfo;
-            this.asyncDescendants = new Set;
-            this.childrenComplete = false;
+const applyBindingsToDescendantsInternal = (bindingContext, elementOrVirtualElement) => {
+    var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
 
-            if (!bindingInfo.asyncContext) {
-                ko.utils.domNodeDisposal.addDisposeCallback(node, asyncContextDispose);
-            }
-
-            if (ancestorBindingInfo && ancestorBindingInfo.asyncContext) {
-                ancestorBindingInfo.asyncContext.asyncDescendants.add(node);
-                this.ancestorBindingInfo = ancestorBindingInfo;
-            }
-        }
-        notifyAncestor() {
-            if (this.ancestorBindingInfo && this.ancestorBindingInfo.asyncContext) {
-                this.ancestorBindingInfo.asyncContext.descendantComplete(this.node);
-            }
-        }
-        descendantComplete(node) {
-            this.asyncDescendants.delete(node);
-            if (!this.asyncDescendants.size && this.childrenComplete) {
-                this.completeChildren();
-            }
-        }
-        completeChildren() {
-            this.childrenComplete = true;
-            if (this.bindingInfo.asyncContext && !this.asyncDescendants.size) {
-                this.bindingInfo.asyncContext = null;
-                ko.utils.domNodeDisposal.removeDisposeCallback(this.node, asyncContextDispose);
-                ko.bindingEvent.notify(this.node, ko.bindingEvent.descendantsComplete);
-                this.notifyAncestor();
-            }
-        }
+    while (currentChild = nextInQueue) {
+        // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
+        nextInQueue = ko.virtualElements.nextSibling(currentChild);
+        applyBindingsToNodeAndDescendantsInternal(bindingContext, currentChild);
     }
+    ko.bindingEvent.notify(elementOrVirtualElement, ko.bindingEvent.childrenComplete);
+};
 
-    ko.bindingEvent = {
-        childrenComplete: "childrenComplete",
-        descendantsComplete : "descendantsComplete",
+const applyBindingsToNodeAndDescendantsInternal = (bindingContext, nodeVerified) => {
+    var bindingContextForDescendants = bindingContext;
 
-        subscribe: (node, event, callback, context, options) => {
-            var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-            if (!bindingInfo.eventSubscribable) {
-                bindingInfo.eventSubscribable = new ko.subscribable;
-            }
-            if (options && options['notifyImmediately'] && bindingInfo.notifiedEvents[event]) {
-                ko.dependencyDetection.ignore(callback, context, [node]);
-            }
-            return bindingInfo.eventSubscribable.subscribe(callback, context, event);
-        },
+    // 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 ((1 === nodeVerified.nodeType) || ko.bindingProvider.nodeHasBindings(nodeVerified))
+        bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext);
 
-        notify: (node, event) => {
-            var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
-            if (bindingInfo) {
-                bindingInfo.notifiedEvents[event] = true;
-                if (bindingInfo.eventSubscribable) {
-                    bindingInfo.eventSubscribable.notifySubscribers(node, event);
-                }
-                if (event == ko.bindingEvent.childrenComplete) {
-                    if (bindingInfo.asyncContext) {
-                        bindingInfo.asyncContext.completeChildren();
-                    } else if (bindingInfo.asyncContext === undefined && bindingInfo.eventSubscribable && 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");
-                    }
-                }
-            }
-        },
-
-        startPossiblyAsyncContentBinding: (node, bindingContext) => {
-            var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-
-            if (!bindingInfo.asyncContext) {
-                bindingInfo.asyncContext = new AsyncCompleteContext(node, bindingInfo, bindingContext[contextAncestorBindingInfo]);
-            }
-
-            // If the provided context was already extended with this node's binding info, just return the extended context
-            if (bindingContext[contextAncestorBindingInfo] == bindingInfo) {
-                return bindingContext;
-            }
-
-            return bindingContext['extend'](ctx => {
-                ctx[contextAncestorBindingInfo] = bindingInfo;
-            });
-        }
-    };
-
-    function validateThatBindingIsAllowedForVirtualElements(bindingName) {
-        var validator = ko.virtualElements.allowedBindings[bindingName];
-        if (!validator)
-            throw new Error("The binding '" + bindingName + "' cannot be used with virtual elements")
+    // Don't want bindings that operate on text nodes to mutate <script> and <textarea> contents,
+    // because it's unexpected and a potential XSS issue.
+    // Also bindings should not operate on <template> elements since this breaks in Internet Explorer
+    // and because such elements' contents are always intended to be bound in a different context
+    // from where they appear in the document.
+    if (bindingContextForDescendants && !nodeVerified.matches?.('SCRIPT,TEXTAREA,TEMPLATE')) {
+        applyBindingsToDescendantsInternal(bindingContextForDescendants, nodeVerified);
     }
+};
 
-    function applyBindingsToDescendantsInternal(bindingContext, elementOrVirtualElement) {
-        var currentChild, nextInQueue = ko.virtualElements.firstChild(elementOrVirtualElement);
-
-        while (currentChild = nextInQueue) {
-            // Keep a record of the next child *before* applying bindings, in case the binding removes the current child from its position
-            nextInQueue = ko.virtualElements.nextSibling(currentChild);
-            applyBindingsToNodeAndDescendantsInternal(bindingContext, currentChild);
-        }
-        ko.bindingEvent.notify(elementOrVirtualElement, ko.bindingEvent.childrenComplete);
-    }
-
-    function 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)
-        var shouldApplyBindings = isElement || ko.bindingProvider.nodeHasBindings(nodeVerified);
-        if (shouldApplyBindings)
-            bindingContextForDescendants = applyBindingsToNodeInternal(nodeVerified, null, bindingContext)['bindingContextForDescendants'];
-
-        // Don't want bindings that operate on text nodes to mutate <script> and <textarea> contents,
-        // because it's unexpected and a potential XSS issue.
-        // Also bindings should not operate on <template> elements since this breaks in Internet Explorer
-        // and because such elements' contents are always intended to be bound in a different context
-        // from where they appear in the document.
-        if (bindingContextForDescendants && nodeVerified.matches && !nodeVerified.matches('SCRIPT,TEXTAREA,TEMPLATE')) {
-            applyBindingsToDescendantsInternal(bindingContextForDescendants, nodeVerified);
-        }
-    }
-
-    function topologicalSortBindings(bindings) {
-        // Depth-first sort
-        var result = [],                // The list of key/handler pairs that we will return
-            bindingsConsidered = {},    // A temporary record of which bindings are already in 'result'
-            cyclicDependencyStack = []; // Keeps track of a depth-search so that, if there's a cycle, we know which bindings caused it
-        ko.utils.objectForEach(bindings, function pushBinding(bindingKey) {
+const topologicalSortBindings = bindings => {
+    // Depth-first sort
+    var result = [],                // The list of key/handler pairs that we will return
+        bindingsConsidered = {},    // A temporary record of which bindings are already in 'result'
+        cyclicDependencyStack = [], // Keeps track of a depth-search so that, if there's a cycle, we know which bindings caused it
+        pushBinding = bindingKey => {
             if (!bindingsConsidered[bindingKey]) {
                 var binding = ko.bindingHandlers[bindingKey];
                 if (binding) {
@@ -301,186 +263,159 @@
                 }
                 bindingsConsidered[bindingKey] = true;
             }
-        });
+        };
+    ko.utils.objectForEach(bindings, pushBinding);
 
-        return result;
+    return result;
+};
+
+const applyBindingsToNodeInternal = (node, sourceBindings, bindingContext) => {
+    var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
+
+    // Prevent multiple applyBindings calls for the same node, except when a binding value is specified
+    var alreadyBound = bindingInfo.alreadyBound;
+    if (!sourceBindings) {
+        if (alreadyBound) {
+            throw Error("You cannot apply bindings multiple times to the same element.");
+        }
+        bindingInfo.alreadyBound = true;
+    }
+    if (!alreadyBound) {
+        bindingInfo.context = bindingContext;
+    }
+    if (!bindingInfo.notifiedEvents) {
+        bindingInfo.notifiedEvents = {};
     }
 
-    function applyBindingsToNodeInternal(node, sourceBindings, bindingContext) {
-        var bindingInfo = ko.utils.domData.getOrSet(node, boundElementDomDataKey, {});
-
-        // Prevent multiple applyBindings calls for the same node, except when a binding value is specified
-        var alreadyBound = bindingInfo.alreadyBound;
-        if (!sourceBindings) {
-            if (alreadyBound) {
-                throw Error("You cannot apply bindings multiple times to the same element.");
-            }
-            bindingInfo.alreadyBound = true;
-        }
-        if (!alreadyBound) {
-            bindingInfo.context = bindingContext;
-        }
-        if (!bindingInfo.notifiedEvents) {
-            bindingInfo.notifiedEvents = {};
-        }
-
-        // Use bindings if given, otherwise fall back on asking the bindings provider to give us some bindings
-        var bindings;
-        if (sourceBindings && typeof sourceBindings !== 'function') {
-            bindings = sourceBindings;
-        } else {
-            // Get the binding from the provider within a computed observable so that we can update the bindings whenever
-            // the binding context is updated or if the binding provider accesses observables.
-            var bindingsUpdater = ko.computed(
-                () => {
-                    bindings = sourceBindings ? sourceBindings(bindingContext, node) : ko.bindingProvider.getBindingAccessors(node, bindingContext);
-                    // Register a dependency on the binding context to support observable view models.
-                    if (bindings) {
-                        if (bindingContext[contextSubscribable]) {
-                            bindingContext[contextSubscribable]();
-                        }
-                        if (bindingContext[contextDataDependency]) {
-                            bindingContext[contextDataDependency]();
-                        }
-                    }
-                    return bindings;
-                },
-                { disposeWhenNodeIsRemoved: node }
-            );
-
-            if (!bindings || !bindingsUpdater.isActive())
-                bindingsUpdater = null;
-        }
-
-        var contextToExtend = bindingContext;
-        var bindingHandlerThatControlsDescendantBindings;
-        if (bindings) {
-            // Return the value accessor for a given binding. When bindings are static (won't be updated because of a binding
-            // context update), just return the value accessor from the binding. Otherwise, return a function that always gets
-            // the latest binding value and registers a dependency on the binding updater.
-            var getValueAccessor = bindingsUpdater
-                ? bindingKey => () => bindingsUpdater()[bindingKey]()
-                : bindingKey => bindings[bindingKey];
-
-            // Use of allBindings as a function is deprecated and removed
-            // The following is the 3.x allBindings API
-            var allBindings = {
-                'get': key => bindings[key] && getValueAccessor(key)(),
-                'has': key => key in bindings
-            };
-
-            if (ko.bindingEvent.childrenComplete in bindings) {
-                ko.bindingEvent.subscribe(node, ko.bindingEvent.childrenComplete, () => {
-                    var callback = bindings[ko.bindingEvent.childrenComplete]();
-                    if (callback) {
-                        var nodes = ko.virtualElements.childNodes(node);
-                        if (nodes.length) {
-                            callback(nodes, ko.dataFor(nodes[0]));
-                        }
-                    }
-                });
-            }
-
-            if (ko.bindingEvent.descendantsComplete in bindings) {
-                contextToExtend = ko.bindingEvent.startPossiblyAsyncContentBinding(node, bindingContext);
-                ko.bindingEvent.subscribe(node, ko.bindingEvent.descendantsComplete, () => {
-                    var callback = bindings[ko.bindingEvent.descendantsComplete]();
-                    if (callback && ko.virtualElements.firstChild(node)) {
-                        callback(node);
-                    }
-                });
-            }
-
-            // First put the bindings into the right order
-            // Go through the sorted bindings, calling init and update for each
-            topologicalSortBindings(bindings).forEach(bindingKeyAndHandler => {
-                // Note that topologicalSortBindings has already filtered out any nonexistent binding handlers,
-                // so bindingKeyAndHandler.handler will always be nonnull.
-                var handlerInitFn = bindingKeyAndHandler.handler["init"],
-                    handlerUpdateFn = bindingKeyAndHandler.handler["update"],
-                    bindingKey = bindingKeyAndHandler.key;
-
-                if (node.nodeType === 8) {
-                    validateThatBindingIsAllowedForVirtualElements(bindingKey);
+    // Use bindings if given, otherwise fall back on asking the bindings provider to give us some bindings
+    var bindings, bindingsUpdater;
+    if (sourceBindings && typeof sourceBindings !== 'function') {
+        bindings = sourceBindings;
+    } else {
+        // Get the binding from the provider within a computed observable so that we can update the bindings whenever
+        // the binding context is updated or if the binding provider accesses observables.
+        bindingsUpdater = ko.computed(
+            () => {
+                bindings = sourceBindings ? sourceBindings(bindingContext, node) : ko.bindingProvider.getBindingAccessors(node, bindingContext);
+                // Register a dependency on the binding context to support observable view models.
+                if (bindings) {
+                    bindingContext[contextSubscribable]?.();
+                    bindingContext[contextDataDependency]?.();
                 }
+                return bindings;
+            },
+            { disposeWhenNodeIsRemoved: node }
+        );
 
-                try {
-                    // Run init, ignoring any dependencies
-                    if (typeof handlerInitFn == "function") {
-                        ko.dependencyDetection.ignore(() => {
-                            var initResult = handlerInitFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend);
+        if (!bindings || !bindingsUpdater.isActive())
+            bindingsUpdater = null;
+    }
 
-                            // If this binding handler claims to control descendant bindings, make a note of this
-                            if (initResult && initResult['controlsDescendantBindings']) {
-                                if (bindingHandlerThatControlsDescendantBindings !== undefined)
-                                    throw new Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
-                                bindingHandlerThatControlsDescendantBindings = bindingKey;
-                            }
-                        });
-                    }
+    var contextToExtend = bindingContext;
+    var bindingHandlerThatControlsDescendantBindings;
+    if (bindings) {
+        // Return the value accessor for a given binding. When bindings are static (won't be updated because of a binding
+        // context update), just return the value accessor from the binding. Otherwise, return a function that always gets
+        // the latest binding value and registers a dependency on the binding updater.
+        var getValueAccessor = bindingsUpdater
+            ? bindingKey => () => bindingsUpdater()[bindingKey]()
+            : bindingKey => bindings[bindingKey];
 
-                    // Run update in its own computed wrapper
-                    if (typeof handlerUpdateFn == "function") {
-                        ko.computed(
-                            () => handlerUpdateFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend),
-                            { disposeWhenNodeIsRemoved: node }
-                        );
-                    }
-                } catch (ex) {
-                    ex.message = "Unable to process binding \"" + bindingKey + ": " + bindings[bindingKey] + "\"\nMessage: " + ex.message;
-                    throw ex;
+        // Use of allBindings as a function is deprecated and removed
+        // The following is the 3.x allBindings API
+        var allBindings = {
+            'get': key => bindings[key] && getValueAccessor(key)(),
+            'has': key => key in bindings
+        };
+
+        if (ko.bindingEvent.childrenComplete in bindings) {
+            ko.bindingEvent.subscribe(node, ko.bindingEvent.childrenComplete, () => {
+                var callback = bindings[ko.bindingEvent.childrenComplete]();
+                if (callback) {
+                    var nodes = ko.virtualElements.childNodes(node);
+                    nodes.length && callback(nodes, ko['dataFor'](nodes[0]));
                 }
             });
         }
 
-        var shouldBindDescendants = bindingHandlerThatControlsDescendantBindings === undefined;
-        return {
-            'shouldBindDescendants': shouldBindDescendants,
-            'bindingContextForDescendants': shouldBindDescendants && contextToExtend
-        };
-    }
-
-    ko.storedBindingContextForNode = node => {
-        var bindingInfo = ko.utils.domData.get(node, boundElementDomDataKey);
-        return bindingInfo && bindingInfo.context;
-    }
-
-    function getBindingContext(viewModelOrBindingContext, extendContextCallback) {
-        return viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
-            ? viewModelOrBindingContext
-            : new ko.bindingContext(viewModelOrBindingContext, undefined, undefined, extendContextCallback);
-    }
-
-    ko.applyBindingAccessorsToNode = (node, bindings, viewModelOrBindingContext) =>
-        applyBindingsToNodeInternal(node, bindings, getBindingContext(viewModelOrBindingContext));
-
-    ko.applyBindingsToDescendants = (viewModelOrBindingContext, rootNode) => {
-        if (rootNode.nodeType === 1 || rootNode.nodeType === 8)
-            applyBindingsToDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
-    };
-
-    ko.applyBindings = function (viewModelOrBindingContext, rootNode, extendContextCallback) {
-        if (arguments.length < 2) {
-            rootNode = document.body;
-            if (!rootNode) {
-                throw Error("ko.applyBindings: could not find document.body; has the document been loaded?");
-            }
-        } else if (!rootNode || (rootNode.nodeType !== 1 && rootNode.nodeType !== 8)) {
-            throw Error("ko.applyBindings: first parameter should be your view model; second parameter should be a DOM node");
+        if (ko.bindingEvent.descendantsComplete in bindings) {
+            contextToExtend = ko.bindingEvent.startPossiblyAsyncContentBinding(node, bindingContext);
+            ko.bindingEvent.subscribe(node, ko.bindingEvent.descendantsComplete, () => {
+                var callback = bindings[ko.bindingEvent.descendantsComplete]();
+                if (callback && ko.virtualElements.firstChild(node)) {
+                    callback(node);
+                }
+            });
         }
 
-        applyBindingsToNodeAndDescendantsInternal(getBindingContext(viewModelOrBindingContext, extendContextCallback), rootNode);
-    };
+        // First put the bindings into the right order
+        // Go through the sorted bindings, calling init and update for each
+        topologicalSortBindings(bindings).forEach(bindingKeyAndHandler => {
+            // Note that topologicalSortBindings has already filtered out any nonexistent binding handlers,
+            // so bindingKeyAndHandler.handler will always be nonnull.
+            var handlerInitFn = bindingKeyAndHandler.handler["init"],
+                handlerUpdateFn = bindingKeyAndHandler.handler["update"],
+                bindingKey = bindingKeyAndHandler.key;
 
-    // Retrieving binding context from arbitrary nodes
-    ko.dataFor = node => {
-        // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
-        var context = node && [1,8].includes(node.nodeType) && ko.storedBindingContextForNode(node);
-        return context ? context['$data'] : undefined;
-    };
+            // COMMENT_NODE
+            if (node.nodeType === 8 && !ko.virtualElements.allowedBindings[bindingKey]) {
+                throw Error("The binding '" + bindingKey + "' cannot be used with comment nodes");
+            }
 
-    ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
-    ko.exportSymbol('applyBindings', ko.applyBindings);
-    ko.exportSymbol('applyBindingAccessorsToNode', ko.applyBindingAccessorsToNode);
-    ko.exportSymbol('dataFor', ko.dataFor);
-})();
+            try {
+                // Run init, ignoring any dependencies
+                if (typeof handlerInitFn == "function") {
+                    ko.dependencyDetection.ignore(() => {
+                        var initResult = handlerInitFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend);
+
+                        // If this binding handler claims to control descendant bindings, make a note of this
+                        if (initResult && initResult['controlsDescendantBindings']) {
+                            if (bindingHandlerThatControlsDescendantBindings !== undefined)
+                                throw Error("Multiple bindings (" + bindingHandlerThatControlsDescendantBindings + " and " + bindingKey + ") are trying to control descendant bindings of the same element. You cannot use these bindings together on the same element.");
+                            bindingHandlerThatControlsDescendantBindings = bindingKey;
+                        }
+                    });
+                }
+
+                // Run update in its own computed wrapper
+                if (typeof handlerUpdateFn == "function") {
+                    ko.computed(
+                        () => handlerUpdateFn(node, getValueAccessor(bindingKey), allBindings, contextToExtend['$data'], contextToExtend),
+                        { disposeWhenNodeIsRemoved: node }
+                    );
+                }
+            } catch (ex) {
+                ex.message = "Unable to process binding \"" + bindingKey + ": " + bindings[bindingKey] + "\"\nMessage: " + ex.message;
+                throw ex;
+            }
+        });
+    }
+
+    return bindingHandlerThatControlsDescendantBindings === undefined && contextToExtend;
+};
+
+ko.storedBindingContextForNode = node =>
+    ko.utils.domData.get(node, boundElementDomDataKey)?.context;
+
+const getBindingContext = (viewModelOrBindingContext) =>
+    viewModelOrBindingContext && (viewModelOrBindingContext instanceof ko.bindingContext)
+        ? viewModelOrBindingContext
+        : new ko.bindingContext(viewModelOrBindingContext);
+
+ko['applyBindingAccessorsToNode'] = (node, bindings, viewModelOrBindingContext) =>
+    applyBindingsToNodeInternal(node, bindings, getBindingContext(viewModelOrBindingContext));
+
+ko.applyBindingsToDescendants = (viewModelOrBindingContext, rootNode) =>
+    (rootNode.nodeType === 1 || rootNode.nodeType === 8)
+    && applyBindingsToDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
+
+ko.applyBindings = (viewModelOrBindingContext, rootNode) =>
+    applyBindingsToNodeAndDescendantsInternal(getBindingContext(viewModelOrBindingContext), rootNode);
+
+// Retrieving binding context from arbitrary nodes
+ko['dataFor'] = node =>
+    // We can only do something meaningful for elements and comment nodes (in particular, not text nodes, as IE can't store domdata for them)
+    ([1,8].includes(node?.nodeType) && ko.storedBindingContextForNode(node))?.['$data'];
+
+ko.exportSymbol('bindingHandlers', ko.bindingHandlers);
+//ko.exportSymbol('applyBindings', ko.applyBindings);
diff --git a/vendors/knockout/src/binding/bindingProvider.js b/vendors/knockout/src/binding/bindingProvider.js
index 591b3df22..371712f4e 100644
--- a/vendors/knockout/src/binding/bindingProvider.js
+++ b/vendors/knockout/src/binding/bindingProvider.js
@@ -1,55 +1,74 @@
-(() => {
-    const defaultBindingAttributeName = "data-bind",
 
-        bindingCache = new Map,
+const defaultBindingAttributeName = "data-bind",
 
-        // The following function is only used internally by this default provider.
-        // It's not part of the interface definition for a general binding provider.
-        getBindingsString = node => {
-            switch (node.nodeType) {
-                case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
-                case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
-            }
-            return null;
-        };
+    bindingCache = new Map,
 
-    ko.bindingProvider = new class
-    {
-        nodeHasBindings(node) {
-            switch (node.nodeType) {
-                case 1: // Element
-                    return node.getAttribute(defaultBindingAttributeName) != null;
-                case 8: // Comment node
-                    return ko.virtualElements.hasBindingValue(node);
-                default: return false;
-            }
-        }
-
-        getBindingAccessors(node, bindingContext) {
-            var bindingsString = getBindingsString(node);
-            if (bindingsString) {
-                try {
-                    let options = { 'valueAccessors': true },
-                        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);
-                        bindingCache.set(cacheKey, bindingFunction);
-                    }
-                    return bindingFunction(bindingContext, node);
-                } catch (ex) {
-                    ex.message = "Unable to parse bindings.\nBindings value: " + bindingsString
-                        + "\nMessage: " + ex.message;
-                    throw ex;
-                }
-            }
-            return null;
+    // The following function is only used internally by this default provider.
+    // It's not part of the interface definition for a general binding provider.
+    getBindingsString = node => {
+        switch (node.nodeType) {
+            case 1: return node.getAttribute(defaultBindingAttributeName);   // Element
+            case 8: return ko.virtualElements.virtualNodeBindingValue(node); // Comment node
         }
+        return null;
     };
 
-})();
+ko.bindingProvider = new class
+{
+    nodeHasBindings(node) {
+        switch (node.nodeType) {
+            case 1: // Element
+                return node.getAttribute(defaultBindingAttributeName) != null;
+            case 8: // Comment node
+                return ko.virtualElements.hasBindingValue(node);
+        }
+        return false;
+    }
+
+    getBindingAccessors(node, bindingContext) {
+        var bindingsString = getBindingsString(node);
+        if (bindingsString) {
+            try {
+                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) } }
+                    // 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,
+                    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;
+                throw ex;
+            }
+        }
+        return null;
+    }
+};
diff --git a/vendors/knockout/src/binding/defaultBindings/attr.js b/vendors/knockout/src/binding/defaultBindings/attr.js
index 260ab15e1..a44d4a374 100644
--- a/vendors/knockout/src/binding/defaultBindings/attr.js
+++ b/vendors/knockout/src/binding/defaultBindings/attr.js
@@ -16,19 +16,8 @@ ko.bindingHandlers['attr'] = {
                 namespace ? element.removeAttributeNS(namespace, attrName) : element.removeAttribute(attrName);
             } else {
                 attrValue = attrValue.toString();
-            }
-
-            if (!toRemove) {
                 namespace ? element.setAttributeNS(namespace, attrName, attrValue) : element.setAttribute(attrName, attrValue);
             }
-
-            // Treat "name" specially - although you can think of it as an attribute, it also needs
-            // special handling on older versions of IE (https://github.com/SteveSanderson/knockout/pull/333)
-            // Deliberately being case-sensitive here because XHTML would regard "Name" as a different thing
-            // entirely, and there's no strong reason to allow for such casing in HTML.
-            if (attrName === "name") {
-                element.name = toRemove ? "" : attrValue;
-            }
         });
     }
 };
diff --git a/vendors/knockout/src/binding/defaultBindings/checked.js b/vendors/knockout/src/binding/defaultBindings/checked.js
new file mode 100644
index 000000000..864dc3fd8
--- /dev/null
+++ b/vendors/knockout/src/binding/defaultBindings/checked.js
@@ -0,0 +1,120 @@
+(()=>{
+
+ko.bindingHandlers['checked'] = {
+    'after': ['value', 'attr'],
+    'init'(element, valueAccessor, allBindings) {
+        var isCheckbox = element.type == "checkbox",
+            isRadio = element.type == "radio";
+
+        // Only bind to check boxes and radio buttons
+        if (isCheckbox || isRadio) {
+            const checkedValue = ko.pureComputed(()=>{
+                // Treat "value" like "checkedValue" when it is included with "checked" binding
+                if (allBindings['has']('checkedValue')) {
+                    return ko.utils.unwrapObservable(allBindings.get('checkedValue'));
+                }
+                if (useElementValue) {
+                    return allBindings['has']('value')
+                        ? ko.utils.unwrapObservable(allBindings.get('value'))
+                        : element.value;
+                }
+            });
+
+            var updateModel = () => {
+                // When we're first setting up this computed, don't change any model state.
+                if (ko.dependencyDetection.isInitial()) {
+                    return;
+                }
+
+                // This updates the model value from the view value.
+                // It runs in response to DOM events (click) and changes in checkedValue.
+                var isChecked = element.checked,
+                    elemValue = checkedValue();
+
+                // We can ignore unchecked radio buttons, because some other radio
+                // button will be checked, and that one can take care of updating state.
+                // Also ignore value changes to an already unchecked checkbox.
+                if (!isChecked && (isRadio || ko.dependencyDetection.getDependenciesCount())) {
+                    return;
+                }
+
+                var modelValue = ko.dependencyDetection.ignore(valueAccessor);
+                if (valueIsArray) {
+                    var writableValue = rawValueIsNonArrayObservable ? modelValue.peek() : modelValue,
+                        saveOldValue = oldElemValue;
+                    oldElemValue = elemValue;
+
+                    if (saveOldValue !== elemValue) {
+                        // When we're responding to the checkedValue changing, and the element is
+                        // currently checked, replace the old elem value with the new elem value
+                        // in the model array.
+                        if (isChecked) {
+                            writableValue.push(elemValue);
+                            writableValue.remove(saveOldValue);
+                        }
+                    } else {
+                        // When we're responding to the user having checked/unchecked a checkbox,
+                        // add/remove the element value to the model array.
+                        isChecked ? writableValue.push(elemValue) : writableValue.remove(elemValue);
+                    }
+
+                    if (rawValueIsNonArrayObservable && ko.isWriteableObservable(modelValue)) {
+                        modelValue(writableValue);
+                    }
+                } else {
+                    if (isCheckbox) {
+                        if (elemValue === undefined) {
+                            elemValue = isChecked;
+                        } else if (!isChecked) {
+                            elemValue = undefined;
+                        }
+                    }
+                    ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'checked', elemValue, true);
+                }
+            }
+
+            var rawValue = valueAccessor(),
+                valueIsArray = isCheckbox && (ko.utils.unwrapObservable(rawValue) instanceof Array),
+                rawValueIsNonArrayObservable = !(valueIsArray && rawValue.push && rawValue.splice),
+                useElementValue = isRadio || valueIsArray,
+                oldElemValue = valueIsArray ? checkedValue() : undefined;
+
+            // Set up two computeds to update the binding:
+
+            // The first responds to changes in the checkedValue value and to element clicks
+            ko.computed(updateModel, null, { disposeWhenNodeIsRemoved: element });
+            element.addEventListener("click", updateModel);
+
+            // The second responds to changes in the model value (the one associated with the checked binding)
+            ko.computed(() => {
+                // This updates the view value from the model value.
+                // It runs in response to changes in the bound (checked) value.
+                var modelValue = ko.utils.unwrapObservable(valueAccessor()),
+                    elemValue = checkedValue();
+
+                if (valueIsArray) {
+                    // When a checkbox is bound to an array, being checked represents its value being present in that array
+                    element.checked = modelValue.includes(elemValue);
+                    oldElemValue = elemValue;
+                } else if (isCheckbox && elemValue === undefined) {
+                    // When a checkbox is bound to any other value (not an array) and "checkedValue" is not defined,
+                    // being checked represents the value being trueish
+                    element.checked = !!modelValue;
+                } else {
+                    // Otherwise, being checked means that the checkbox or radio button's value corresponds to the model value
+                    element.checked = (checkedValue() === modelValue);
+                }
+            }, null, { disposeWhenNodeIsRemoved: element });
+
+            rawValue = undefined;
+        }
+    }
+};
+
+ko.bindingHandlers['checkedValue'] = {
+    'update'(element, valueAccessor) {
+        element.value = ko.utils.unwrapObservable(valueAccessor());
+    }
+};
+
+})();
diff --git a/vendors/knockout/src/binding/defaultBindings/css.js b/vendors/knockout/src/binding/defaultBindings/css.js
index b7627d6ad..1b5067fcc 100644
--- a/vendors/knockout/src/binding/defaultBindings/css.js
+++ b/vendors/knockout/src/binding/defaultBindings/css.js
@@ -1,16 +1,13 @@
 var classesWrittenByBindingKey = '__ko__cssValue',
-    toggleClasses = (node, classNames, force) => {
-        if (classNames) {
-            classNames.split(/\s+/).forEach(className =>
-                node.classList.toggle(className, force)
-            );
-        }
-    };
+    toggleClasses = (node, classNames, force) =>
+        classNames && classNames.split(/\s+/).forEach(className =>
+            node.classList.toggle(className, force)
+        );
 
 ko.bindingHandlers['css'] = {
     'update': (element, valueAccessor) => {
         var value = ko.utils.unwrapObservable(valueAccessor());
-        if (value !== null && typeof value == "object") {
+        if (typeof value == "object") {
             ko.utils.objectForEach(value, (className, shouldHaveClass) => {
                 shouldHaveClass = ko.utils.unwrapObservable(shouldHaveClass);
                 toggleClasses(element, className, !!shouldHaveClass);
diff --git a/vendors/knockout/src/binding/defaultBindings/enableDisable.js b/vendors/knockout/src/binding/defaultBindings/enableDisable.js
index a3a00ebe1..59020d352 100644
--- a/vendors/knockout/src/binding/defaultBindings/enableDisable.js
+++ b/vendors/knockout/src/binding/defaultBindings/enableDisable.js
@@ -3,7 +3,7 @@ ko.bindingHandlers['enable'] = {
         var value = ko.utils.unwrapObservable(valueAccessor());
         if (value && element.disabled)
             element.removeAttribute("disabled");
-        else if ((!value) && (!element.disabled))
+        else if (!value && !element.disabled)
             element.disabled = true;
     }
 };
diff --git a/vendors/knockout/src/binding/defaultBindings/event.js b/vendors/knockout/src/binding/defaultBindings/event.js
index 010661ead..74768981e 100644
--- a/vendors/knockout/src/binding/defaultBindings/event.js
+++ b/vendors/knockout/src/binding/defaultBindings/event.js
@@ -2,35 +2,30 @@
 // e.g. click:handler instead of the usual full-length event:{click:handler}
 function makeEventHandlerShortcut(eventName) {
     ko.bindingHandlers[eventName] = {
-        'init': function(element, valueAccessor, allBindings, viewModel, bindingContext) {
-            var newValueAccessor = () => {
-                return {
-                    [eventName]: valueAccessor()
-                };
-            };
-            return ko.bindingHandlers['event']['init'].call(this, element, newValueAccessor, allBindings, viewModel, bindingContext);
+        'init'(element, valueAccessor, allBindings, viewModel, bindingContext) {
+            return ko.bindingHandlers['event']['init'].call(this, element,
+                () => ({[eventName]: valueAccessor()}), // newValueAccessor
+                allBindings, viewModel, bindingContext);
         }
     }
 }
 
 ko.bindingHandlers['event'] = {
-    'init' : (element, valueAccessor, allBindings, viewModel, bindingContext) => {
-        var eventsToHandle = valueAccessor() || {};
-        ko.utils.objectForEach(eventsToHandle, eventName => {
+    'init'(element, valueAccessor, allBindings, viewModel, bindingContext) {
+        ko.utils.objectForEach(valueAccessor() || {}, eventName => {
             if (typeof eventName == "string") {
-                element.addEventListener(eventName, function (event) {
-                    var handlerReturnValue;
-                    var handlerFunction = valueAccessor()[eventName];
-                    if (!handlerFunction)
-                        return;
-
-                    try {
-                        viewModel = bindingContext['$data'];
-                        // Take all the event args, and prefix with the viewmodel
-                        handlerReturnValue = handlerFunction.apply(viewModel, [viewModel, ...arguments]);
-                    } finally {
-                        if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                            event.preventDefault();
+                element.addEventListener(eventName, (...args) => {
+                    var handlerReturnValue,
+                        handlerFunction = valueAccessor()[eventName];
+                    if (handlerFunction) {
+                        try {
+                            viewModel = bindingContext['$data'];
+                            // Take all the event args, and prefix with the viewmodel
+                            handlerReturnValue = handlerFunction.apply(viewModel, [viewModel, ...args]);
+                        } finally {
+                            if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
+                                args[0].preventDefault();
+                            }
                         }
                     }
                 });
diff --git a/vendors/knockout/src/binding/defaultBindings/foreach.js b/vendors/knockout/src/binding/defaultBindings/foreach.js
index 5277c730b..6e62a1ac5 100644
--- a/vendors/knockout/src/binding/defaultBindings/foreach.js
+++ b/vendors/knockout/src/binding/defaultBindings/foreach.js
@@ -1,32 +1,28 @@
 // "foreach: someExpression" is equivalent to "template: { foreach: someExpression }"
-// "foreach: { data: someExpression, afterAdd: myfn }" is equivalent to "template: { foreach: someExpression, afterAdd: myfn }"
-ko.bindingHandlers['foreach'] = {
-    makeTemplateValueAccessor: valueAccessor => {
-        return () => {
-            var modelValue = valueAccessor(),
-                // Unwrap without setting a dependency here
-                unwrappedValue = ko.isObservable(modelValue) ? modelValue.peek() : modelValue;
+// "foreach: { data: someExpression }" is equivalent to "template: { foreach: someExpression }"
+const makeTemplateValueAccessor = valueAccessor =>
+    () => {
+        var modelValue = valueAccessor(),
+            // Unwrap without setting a dependency here
+            unwrappedValue = ko.isObservable(modelValue) ? modelValue.peek() : modelValue;
 
-            // If unwrappedValue is the array, pass in the wrapped value on its own
-            // The value will be unwrapped and tracked within the template binding
-            // (See https://github.com/SteveSanderson/knockout/issues/523)
-            if ((!unwrappedValue) || typeof unwrappedValue.length == "number")
-                return { 'foreach': modelValue };
+        // If unwrappedValue is the array, pass in the wrapped value on its own
+        // The value will be unwrapped and tracked within the template binding
+        // (See https://github.com/SteveSanderson/knockout/issues/523)
+        if ((!unwrappedValue) || Array.isArray(unwrappedValue))
+            return { 'foreach': modelValue };
 
-            // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
-            ko.utils.unwrapObservable(modelValue);
-            return {
-                'foreach': unwrappedValue['data'],
-                'as': unwrappedValue['as'],
-                'beforeRemove': unwrappedValue['beforeRemove']
-            };
+        // If unwrappedValue.data is the array, preserve all relevant options and unwrap again value so we get updates
+        ko.utils.unwrapObservable(modelValue);
+        return {
+            'foreach': unwrappedValue['data']
         };
-    },
+    };
+ko.bindingHandlers['foreach'] = {
     'init': (element, valueAccessor) =>
-        ko.bindingHandlers['template']['init'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor))
+        ko.bindingHandlers['template']['init'](element, makeTemplateValueAccessor(valueAccessor))
     ,
     'update': (element, valueAccessor, allBindings, viewModel, bindingContext) =>
-        ko.bindingHandlers['template']['update'](element, ko.bindingHandlers['foreach'].makeTemplateValueAccessor(valueAccessor), allBindings, viewModel, bindingContext)
+        ko.bindingHandlers['template']['update'](element, makeTemplateValueAccessor(valueAccessor), allBindings, viewModel, bindingContext)
 };
-ko.expressionRewriting.bindingRewriteValidators['foreach'] = false; // Can't rewrite control flow bindings
 ko.virtualElements.allowedBindings['foreach'] = true;
diff --git a/vendors/knockout/src/binding/defaultBindings/hasfocus.js b/vendors/knockout/src/binding/defaultBindings/hasfocus.js
index aa2321983..6805d894d 100644
--- a/vendors/knockout/src/binding/defaultBindings/hasfocus.js
+++ b/vendors/knockout/src/binding/defaultBindings/hasfocus.js
@@ -1,5 +1,5 @@
-var hasfocusUpdatingProperty = '__ko_hasfocusUpdating';
-var hasfocusLastValue = '__ko_hasfocusLastValue';
+const hasfocusUpdatingProperty = '__ko_hasfocusUpdating',
+    hasfocusLastValue = '__ko_hasfocusLastValue';
 ko.bindingHandlers['hasfocus'] = {
     'init': (element, valueAccessor, allBindings) => {
         var handleElementFocusChange = isFocused => {
@@ -11,8 +11,7 @@ ko.bindingHandlers['hasfocus'] = {
             // Discussion at https://github.com/SteveSanderson/knockout/pull/352
             element[hasfocusUpdatingProperty] = true;
             isFocused = (element.ownerDocument.activeElement === element);
-            var modelValue = valueAccessor();
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'hasfocus', isFocused, true);
+            ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'hasfocus', isFocused, true);
 
             //cache the latest value, so we can avoid unnecessarily calling focus/blur in the update function
             element[hasfocusLastValue] = isFocused;
@@ -21,13 +20,10 @@ ko.bindingHandlers['hasfocus'] = {
         var handleElementFocusIn = handleElementFocusChange.bind(null, true);
         var handleElementFocusOut = handleElementFocusChange.bind(null, false);
 
-        var registerEventHandler = (event, handler) =>
-            element.addEventListener(event, handler);
-
-        registerEventHandler("focus", handleElementFocusIn);
-        registerEventHandler("focusin", handleElementFocusIn);
-        registerEventHandler("blur",  handleElementFocusOut);
-        registerEventHandler("focusout",  handleElementFocusOut);
+        element.addEventListener("focus", handleElementFocusIn);
+        element.addEventListener("focusin", handleElementFocusIn);
+        element.addEventListener("blur",  handleElementFocusOut);
+        element.addEventListener("focusout",  handleElementFocusOut);
 
         // Assume element is not focused (prevents "blur" being called initially)
         element[hasfocusLastValue] = false;
@@ -40,4 +36,3 @@ ko.bindingHandlers['hasfocus'] = {
         }
     }
 };
-ko.expressionRewriting.twoWayBindings.add('hasfocus');
diff --git a/vendors/knockout/src/binding/defaultBindings/html.js b/vendors/knockout/src/binding/defaultBindings/html.js
index 13f731c18..f27e64d6e 100644
--- a/vendors/knockout/src/binding/defaultBindings/html.js
+++ b/vendors/knockout/src/binding/defaultBindings/html.js
@@ -1,8 +1,8 @@
 ko.bindingHandlers['html'] = {
-    'init': () => {
+    'init': () => (
         // Prevent binding on the dynamically-injected HTML (as developers are unlikely to expect that, and it has security implications)
-        return { 'controlsDescendantBindings': true };
-    },
+        { 'controlsDescendantBindings': true }
+    ),
     'update': (element, valueAccessor) => {
         // setHtml will unwrap the value if needed
         ko.utils.emptyDomNode(element);
diff --git a/vendors/knockout/src/binding/defaultBindings/ifIfnotWith.js b/vendors/knockout/src/binding/defaultBindings/ifIfnotWith.js
index b870997d6..c124b250e 100644
--- a/vendors/knockout/src/binding/defaultBindings/ifIfnotWith.js
+++ b/vendors/knockout/src/binding/defaultBindings/ifIfnotWith.js
@@ -1,4 +1,4 @@
-(function () {
+(() => {
 
 // Makes a binding like with or if
 function makeWithIfBinding(bindingKey, isWith, isNot) {
@@ -7,8 +7,7 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
             var savedNodes, contextOptions = {}, needAsyncContext;
 
             if (isWith) {
-                var as = allBindings.get('as');
-                contextOptions = { 'as': as, 'exportDependencies': true };
+                contextOptions = { 'exportDependencies': true };
             }
 
             needAsyncContext = allBindings['has'](ko.bindingEvent.descendantsComplete);
@@ -26,13 +25,12 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
                 if (shouldDisplay) {
                     contextOptions['dataDependency'] = ko.dependencyDetection.computed();
 
-                    if (isWith) {
-                        childContext = bindingContext['createChildContext'](typeof value == "function" ? value : valueAccessor, contextOptions);
-                    } else if (ko.dependencyDetection.getDependenciesCount()) {
-                        childContext = bindingContext['extend'](null, contextOptions);
-                    } else {
-                        childContext = bindingContext;
-                    }
+                    childContext = isWith
+                        ? bindingContext['createChildContext'](typeof value == "function" ? value : valueAccessor, contextOptions)
+                        : (ko.dependencyDetection.getDependenciesCount()
+                            ? bindingContext['extend'](null, contextOptions)
+                            : bindingContext
+                        );
                 }
 
                 // Save a copy of the inner nodes on the initial update, but only if we have dependencies.
@@ -41,9 +39,7 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
                 }
 
                 if (shouldDisplay) {
-                    if (!isInitial) {
-                        ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(savedNodes));
-                    }
+                    isInitial || ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(savedNodes));
 
                     ko.applyBindingsToDescendants(childContext, element);
                 } else {
@@ -57,7 +53,6 @@ function makeWithIfBinding(bindingKey, isWith, isNot) {
             return { 'controlsDescendantBindings': true };
         }
     };
-    ko.expressionRewriting.bindingRewriteValidators[bindingKey] = false; // Can't rewrite control flow bindings
     ko.virtualElements.allowedBindings[bindingKey] = true;
 }
 
diff --git a/vendors/knockout/src/binding/defaultBindings/options.js b/vendors/knockout/src/binding/defaultBindings/options.js
index cd9a78716..e017ac3cb 100644
--- a/vendors/knockout/src/binding/defaultBindings/options.js
+++ b/vendors/knockout/src/binding/defaultBindings/options.js
@@ -2,81 +2,82 @@ var captionPlaceholder = {};
 ko.bindingHandlers['options'] = {
     'init': element => {
         if (!element.matches("SELECT"))
-            throw new Error("options binding applies only to SELECT elements");
+            throw Error("options binding applies only to SELECT elements");
 
         // Remove all existing <option>s.
-        while (element.length > 0) {
-            element.remove(0);
+        let l = element.length;
+        while (l--) {
+            element.remove(l);
         }
 
         // Ensures that the binding processor doesn't try to bind the options
         return { 'controlsDescendantBindings': true };
     },
     'update': (element, valueAccessor, allBindings) => {
-        function selectedOptions() {
-            return Array.from(element.options).filter(node => node.selected);
-        }
 
         var selectWasPreviouslyEmpty = element.length == 0,
             multiple = element.multiple,
             previousScrollTop = (!selectWasPreviouslyEmpty && multiple) ? element.scrollTop : null,
             unwrappedArray = ko.utils.unwrapObservable(valueAccessor()),
-            valueAllowUnset = allBindings.get('valueAllowUnset') && allBindings['has']('value'),
             arrayToDomNodeChildrenOptions = {},
-            captionValue,
             filteredArray,
-            previousSelectedValues = [];
+            previousSelectedValues = [],
 
-        if (!valueAllowUnset) {
-            if (multiple) {
-                previousSelectedValues = selectedOptions().map(ko.selectExtensions.readValue);
-            } else if (element.selectedIndex >= 0) {
-                previousSelectedValues.push(ko.selectExtensions.readValue(element.options[element.selectedIndex]));
-            }
+            selectedOptions = () => Array.from(element.options).filter(node => node.selected),
+
+            applyToObject = (object, predicate, defaultValue) => {
+                var predicateType = typeof predicate;
+                if (predicateType == "function")    // Given a function; run it against the data value
+                    return predicate(object);
+                else if (predicateType == "string") // Given a string; treat it as a property name on the data value
+                    return object[predicate];
+                                                    // Given no optionsText arg; use the data value itself
+                    return defaultValue;
+            },
+
+            setSelectionCallback = (arrayEntry, newOptions) => {
+                if (previousSelectedValues.length) {
+                    // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
+                    // That's why we first added them without selection. Now it's time to set the selection.
+                    var isSelected = previousSelectedValues.includes(ko.selectExtensions.readValue(newOptions[0]));
+                    newOptions[0].selected = isSelected;
+
+                    // If this option was changed from being selected during a single-item update, notify the change
+                    if (itemUpdate && !isSelected) {
+                        ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
+                    }
+                }
+            };
+
+        if (multiple) {
+            previousSelectedValues = selectedOptions().map(ko.selectExtensions.readValue);
+        } else if (element.selectedIndex >= 0) {
+            previousSelectedValues.push(ko.selectExtensions.readValue(element.options[element.selectedIndex]));
         }
 
         if (unwrappedArray) {
-            if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
+            if (!Array.isArray(unwrappedArray)) // Coerce single value into array
                 unwrappedArray = [unwrappedArray];
 
             // Filter out any entries marked as destroyed
-            filteredArray = unwrappedArray.filter(item => item || item == null);
-
-            // If caption is included, add it to the array
-            if (allBindings['has']('optionsCaption')) {
-                captionValue = ko.utils.unwrapObservable(allBindings.get('optionsCaption'));
-                // If caption value is null or undefined, don't show a caption
-                if (captionValue !== null && captionValue !== undefined) {
-                    filteredArray.unshift(captionPlaceholder);
-                }
-            }
+            filteredArray = unwrappedArray.filter(item => item ?? 1);
         } else {
             // If a falsy value is provided (e.g. null), we'll simply empty the select element
         }
 
-        function applyToObject(object, predicate, defaultValue) {
-            var predicateType = typeof predicate;
-            if (predicateType == "function")    // Given a function; run it against the data value
-                return predicate(object);
-            else if (predicateType == "string") // Given a string; treat it as a property name on the data value
-                return object[predicate];
-            else                                // Given no optionsText arg; use the data value itself
-                return defaultValue;
-        }
-
         // The following functions can run at two different times:
         // The first is when the whole array is being updated directly from this binding handler.
         // The second is when an observable value for a specific array entry is updated.
         // oldOptions will be empty in the first case, but will be filled with the previously generated option in the second.
-        var itemUpdate = false;
-        function optionForArrayItem(arrayEntry, index, oldOptions) {
+        var itemUpdate = false,
+        optionForArrayItem = (arrayEntry, index, oldOptions) => {
             if (oldOptions.length) {
-                previousSelectedValues = !valueAllowUnset && oldOptions[0].selected ? [ ko.selectExtensions.readValue(oldOptions[0]) ] : [];
+                previousSelectedValues = oldOptions[0].selected ? [ ko.selectExtensions.readValue(oldOptions[0]) ] : [];
                 itemUpdate = true;
             }
             var option = element.ownerDocument.createElement("option");
             if (arrayEntry === captionPlaceholder) {
-                ko.utils.setTextContent(option, allBindings.get('optionsCaption'));
+                ko.utils.setTextContent(option);
                 ko.selectExtensions.writeValue(option, undefined);
             } else {
                 // Apply a value to the option element
@@ -88,28 +89,7 @@ ko.bindingHandlers['options'] = {
                 ko.utils.setTextContent(option, optionText);
             }
             return [option];
-        }
-
-        // By using a beforeRemove callback, we delay the removal until after new items are added. This fixes a selection
-        // problem in IE<=8 and Firefox. See https://github.com/knockout/knockout/issues/1208
-        arrayToDomNodeChildrenOptions['beforeRemove'] = option => element.removeChild(option);
-
-        function setSelectionCallback(arrayEntry, newOptions) {
-            if (itemUpdate && valueAllowUnset) {
-                // The model value is authoritative, so make sure its value is the one selected
-                ko.bindingEvent.notify(element, ko.bindingEvent.childrenComplete);
-            } else if (previousSelectedValues.length) {
-                // IE6 doesn't like us to assign selection to OPTION nodes before they're added to the document.
-                // That's why we first added them without selection. Now it's time to set the selection.
-                var isSelected = previousSelectedValues.includes(ko.selectExtensions.readValue(newOptions[0]));
-                newOptions[0].selected = isSelected;
-
-                // If this option was changed from being selected during a single-item update, notify the change
-                if (itemUpdate && !isSelected) {
-                    ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
-                }
-            }
-        }
+        };
 
         var callback = setSelectionCallback;
         if (allBindings['has']('optionsAfterRender') && typeof allBindings.get('optionsAfterRender') == "function") {
@@ -121,30 +101,26 @@ ko.bindingHandlers['options'] = {
 
         ko.utils.setDomNodeChildrenFromArrayMapping(element, filteredArray, optionForArrayItem, arrayToDomNodeChildrenOptions, callback);
 
-        if (!valueAllowUnset) {
-            // Determine if the selection has changed as a result of updating the options list
-            var selectionChanged;
-            if (multiple) {
-                // For a multiple-select box, compare the new selection count to the previous one
-                // But if nothing was selected before, the selection can't have changed
-                selectionChanged = previousSelectedValues.length && selectedOptions().length < previousSelectedValues.length;
-            } else {
-                // For a single-select box, compare the current value to the previous value
-                // But if nothing was selected before or nothing is selected now, just look for a change in selection
-                selectionChanged = (previousSelectedValues.length && element.selectedIndex >= 0)
-                    ? (ko.selectExtensions.readValue(element.options[element.selectedIndex]) !== previousSelectedValues[0])
-                    : (previousSelectedValues.length || element.selectedIndex >= 0);
-            }
-
-            // Ensure consistency between model value and selected option.
-            // If the dropdown was changed so that selection is no longer the same,
-            // notify the value or selectedOptions binding.
-            if (selectionChanged) {
-                ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
-            }
+        // Determine if the selection has changed as a result of updating the options list
+        var selectionChanged, prevLength = previousSelectedValues.length;
+        if (multiple) {
+            // For a multiple-select box, compare the new selection count to the previous one
+            // But if nothing was selected before, the selection can't have changed
+            selectionChanged = prevLength && selectedOptions().length < prevLength;
+        } else {
+            // For a single-select box, compare the current value to the previous value
+            // But if nothing was selected before or nothing is selected now, just look for a change in selection
+            selectionChanged = (prevLength && element.selectedIndex >= 0)
+                ? (ko.selectExtensions.readValue(element.options[element.selectedIndex]) !== previousSelectedValues[0])
+                : (prevLength || element.selectedIndex >= 0);
         }
 
-        if (valueAllowUnset || ko.dependencyDetection.isInitial()) {
+        // Ensure consistency between model value and selected option.
+        // If the dropdown was changed so that selection is no longer the same,
+        // notify the value or selectedOptions binding.
+        selectionChanged && ko.dependencyDetection.ignore(ko.utils.triggerEvent, null, [element, "change"]);
+
+        if (ko.dependencyDetection.isInitial()) {
             ko.bindingEvent.notify(element, ko.bindingEvent.childrenComplete);
         }
 
diff --git a/vendors/knockout/src/binding/defaultBindings/style.js b/vendors/knockout/src/binding/defaultBindings/style.js
index 9e765d5b1..3cee5a796 100644
--- a/vendors/knockout/src/binding/defaultBindings/style.js
+++ b/vendors/knockout/src/binding/defaultBindings/style.js
@@ -1,7 +1,6 @@
 ko.bindingHandlers['style'] = {
     'update': (element, valueAccessor) => {
-        var value = ko.utils.unwrapObservable(valueAccessor() || {});
-        ko.utils.objectForEach(value, (styleName, styleValue) => {
+        ko.utils.objectForEach(ko.utils.unwrapObservable(valueAccessor() || {}), (styleName, styleValue) => {
             styleValue = ko.utils.unwrapObservable(styleValue);
 
             if (styleValue == null || styleValue === false) {
diff --git a/vendors/knockout/src/binding/defaultBindings/submit.js b/vendors/knockout/src/binding/defaultBindings/submit.js
index ee744745a..89c43d323 100644
--- a/vendors/knockout/src/binding/defaultBindings/submit.js
+++ b/vendors/knockout/src/binding/defaultBindings/submit.js
@@ -1,17 +1,14 @@
 ko.bindingHandlers['submit'] = {
     'init': (element, valueAccessor, allBindings, viewModel, bindingContext) => {
         if (typeof valueAccessor() != "function")
-            throw new Error("The value for a submit binding must be a function");
+            throw Error("The value for a submit binding must be a function");
         element.addEventListener("submit", event => {
             var handlerReturnValue;
             var value = valueAccessor();
             try { handlerReturnValue = value.call(bindingContext['$data'], element); }
             finally {
                 if (handlerReturnValue !== true) { // Normally we want to prevent default action. Developer can override this be explicitly returning true.
-                    if (event.preventDefault)
-                        event.preventDefault();
-                    else
-                        event.returnValue = false;
+                    event.preventDefault();
                 }
             }
         });
diff --git a/vendors/knockout/src/binding/defaultBindings/text.js b/vendors/knockout/src/binding/defaultBindings/text.js
index 75fdf1510..cdbb72f9e 100644
--- a/vendors/knockout/src/binding/defaultBindings/text.js
+++ b/vendors/knockout/src/binding/defaultBindings/text.js
@@ -1,9 +1,9 @@
 ko.bindingHandlers['text'] = {
-    'init': () => {
+    'init': () => (
         // Prevent binding on the dynamically-injected text node (as developers are unlikely to expect that, and it has security implications).
         // It should also make things faster, as we no longer have to consider whether the text node might be bindable.
-        return { 'controlsDescendantBindings': true };
-    },
+        { 'controlsDescendantBindings': true }
+    ),
     'update': (element, valueAccessor) => {
         if (8 === element.nodeType) {
             element.text || element.after(element.text = document.createTextNode(''));
diff --git a/vendors/knockout/src/binding/defaultBindings/textInput.js b/vendors/knockout/src/binding/defaultBindings/textInput.js
index b1d9bb1b1..0199080f2 100644
--- a/vendors/knockout/src/binding/defaultBindings/textInput.js
+++ b/vendors/knockout/src/binding/defaultBindings/textInput.js
@@ -5,24 +5,20 @@ ko.bindingHandlers['textInput'] = {
             timeoutHandle,
             elementValueBeforeEvent;
 
-        var updateModel = event => {
+        var updateModel = () => {
             clearTimeout(timeoutHandle);
             elementValueBeforeEvent = timeoutHandle = undefined;
 
             var elementValue = element.value;
-            if (previousElementValue !== elementValue) {
+            if (element.checkValidity() && previousElementValue !== elementValue) {
                 // Provide a way for tests to know exactly which event was processed
                 previousElementValue = elementValue;
-                ko.expressionRewriting.writeValueToProperty(valueAccessor(), allBindings, 'textInput', elementValue);
+                ko.expressionRewriting.writeValueToProperty(element, valueAccessor(), allBindings, 'textInput', elementValue);
             }
         };
 
         var updateView = () => {
-            var modelValue = ko.utils.unwrapObservable(valueAccessor());
-
-            if (modelValue == null) {
-                modelValue = '';
-            }
+            var modelValue = ko.utils.unwrapObservable(valueAccessor()) ?? '';
 
             if (elementValueBeforeEvent !== undefined && modelValue === elementValueBeforeEvent) {
                 setTimeout(updateView, 4);
@@ -45,16 +41,6 @@ ko.bindingHandlers['textInput'] = {
         // Bind to the change event so that we can catch programmatic updates of the value that fire this event.
         onEvent('change', updateModel);
 
-        // To deal with browsers that don't notify any kind of event for some changes (IE, Safari, etc.)
-        onEvent('blur', updateModel);
-
         ko.computed(updateView, { disposeWhenNodeIsRemoved: element });
     }
 };
-ko.expressionRewriting.twoWayBindings.add('textInput');
-
-// textinput is an alias for textInput
-ko.bindingHandlers['textinput'] = {
-    // preprocess is the only way to set up a full alias
-    'preprocess': (value, name, addBinding) => addBinding('textInput', value)
-};
diff --git a/vendors/knockout/src/binding/defaultBindings/value.js b/vendors/knockout/src/binding/defaultBindings/value.js
index 41fadebbd..136ae90f6 100644
--- a/vendors/knockout/src/binding/defaultBindings/value.js
+++ b/vendors/knockout/src/binding/defaultBindings/value.js
@@ -5,15 +5,23 @@ ko.bindingHandlers['value'] = {
 
         // If the value binding is placed on a radio/checkbox, then just pass through to checkedValue and quit
         if (isInputElement && (element.type == "checkbox" || element.type == "radio")) {
-            ko.applyBindingAccessorsToNode(element, { 'checkedValue': valueAccessor });
+            ko['applyBindingAccessorsToNode'](element, { 'checkedValue': valueAccessor });
             return;
         }
 
-        var eventsToCatch = new Set;
-        var requestedEventsToCatch = allBindings.get("valueUpdate");
-        var elementValueBeforeEvent = null;
-        var registerEventHandler = (event, handler) =>
-            element.addEventListener(event, handler);
+        var eventsToCatch = new Set,
+            requestedEventsToCatch = allBindings.get("valueUpdate"),
+            elementValueBeforeEvent = null,
+            updateFromModel,
+            registerEventHandler = (event, handler) =>
+                element.addEventListener(event, handler),
+
+            valueUpdateHandler = () => {
+                elementValueBeforeEvent = null;
+                var modelValue = valueAccessor();
+                var elementValue = ko.selectExtensions.readValue(element);
+                ko.expressionRewriting.writeValueToProperty(element, modelValue, allBindings, 'value', elementValue);
+            };
 
         if (requestedEventsToCatch) {
             // Allow both individual event names, and arrays of event names
@@ -25,13 +33,6 @@ ko.bindingHandlers['value'] = {
             eventsToCatch.delete("change");  // We'll subscribe to "change" events later
         }
 
-        var valueUpdateHandler = () => {
-            elementValueBeforeEvent = null;
-            var modelValue = valueAccessor();
-            var elementValue = ko.selectExtensions.readValue(element);
-            ko.expressionRewriting.writeValueToProperty(modelValue, allBindings, 'value', elementValue);
-        }
-
         eventsToCatch.forEach(eventName => {
             // The syntax "after<eventname>" means "run the handler asynchronously after the event"
             // This is useful, for example, to catch "keydown" events after the browser has updated the control
@@ -54,8 +55,6 @@ ko.bindingHandlers['value'] = {
             registerEventHandler(eventName, handler);
         });
 
-        var updateFromModel;
-
         if (isInputElement && element.type == "file") {
             // For file input elements, can only write the empty string
             updateFromModel = () => {
@@ -80,9 +79,8 @@ ko.bindingHandlers['value'] = {
 
                 if (valueHasChanged || elementValue === undefined) {
                     if (isSelectElement) {
-                        var allowUnset = allBindings.get('valueAllowUnset');
-                        ko.selectExtensions.writeValue(element, newValue, allowUnset);
-                        if (!allowUnset && newValue !== ko.selectExtensions.readValue(element)) {
+                        ko.selectExtensions.writeValue(element, newValue);
+                        if (newValue !== ko.selectExtensions.readValue(element)) {
                             // If you try to set a model value that can't be represented in an already-populated dropdown, reject that change,
                             // because you're not allowed to have a model value that disagrees with a visible UI selection.
                             ko.dependencyDetection.ignore(valueUpdateHandler);
@@ -96,7 +94,7 @@ ko.bindingHandlers['value'] = {
 
         if (isSelectElement) {
             var updateFromModelComputed;
-            ko.bindingEvent.subscribe(element, ko.bindingEvent.childrenComplete, () => {
+            ko.bindingEvent['subscribe'](element, ko.bindingEvent.childrenComplete, () => {
                 if (!updateFromModelComputed) {
                     registerEventHandler("change", valueUpdateHandler);
                     updateFromModelComputed = ko.computed(updateFromModel, { disposeWhenNodeIsRemoved: element });
@@ -113,4 +111,3 @@ ko.bindingHandlers['value'] = {
     },
     'update': () => {} // Keep for backwards compatibility with code that may have wrapped value binding
 };
-ko.expressionRewriting.twoWayBindings.add('value');
diff --git a/vendors/knockout/src/binding/editDetection/arrayToDomNodeChildren.js b/vendors/knockout/src/binding/editDetection/arrayToDomNodeChildren.js
index cf5a004d3..d36029667 100644
--- a/vendors/knockout/src/binding/editDetection/arrayToDomNodeChildren.js
+++ b/vendors/knockout/src/binding/editDetection/arrayToDomNodeChildren.js
@@ -20,13 +20,9 @@
                 var nodesToReplaceArray = mappedNodes.nodeType ? [mappedNodes] : mappedNodes;
                 if (nodesToReplaceArray.length > 0) {
                     var insertionPoint = nodesToReplaceArray[0],
-                        parent = insertionPoint.parentNode,
-                        i, j;
-                    for (i = 0, j = newMappedNodes.length; i < j; i++)
-                        parent.insertBefore(newMappedNodes[i], insertionPoint);
-                    for (i = 0, j = nodesToReplaceArray.length; i < j; i++) {
-                        ko.removeNode(nodesToReplaceArray[i]);
-                    }
+                        parent = insertionPoint.parentNode;
+                    newMappedNodes.forEach(node => parent.insertBefore(node, insertionPoint));
+                    nodesToReplaceArray.forEach(node => ko.removeNode(node));
                 }
                 if (callbackAfterAddingNodes)
                     ko.dependencyDetection.ignore(callbackAfterAddingNodes, null, [valueToMap, newMappedNodes, index]);
@@ -36,8 +32,14 @@
             // of which nodes would be deleted if valueToMap was itself later removed
             mappedNodes.length = 0;
             mappedNodes.push(...newMappedNodes);
-        }, { disposeWhenNodeIsRemoved: containerNode, disposeWhen: ()=>!!mappedNodes.find(ko.utils.domNodeIsAttachedToDocument) });
-        return { mappedNodes : mappedNodes, dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined) };
+        }, {
+            disposeWhenNodeIsRemoved: containerNode,
+            disposeWhen: ()=>!!mappedNodes.find(ko.utils.domNodeIsAttachedToDocument)
+        });
+        return {
+            mappedNodes : mappedNodes,
+            dependentObservable : (dependentObservable.isActive() ? dependentObservable : undefined)
+        };
     }
 
     var lastMappingResultDomDataKey = ko.utils.domData.nextKey(),
@@ -45,59 +47,52 @@
 
     ko.utils.setDomNodeChildrenFromArrayMapping = (domNode, array, mapping, options, callbackAfterAddingNodes, editScript) => {
         array = array || [];
-        if (typeof array.length == "undefined") // Coerce single value into array
+        if (!Array.isArray(array)) // Coerce single value into array
             array = [array];
 
         options = options || {};
-        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey);
-        var isFirstExecution = !lastMappingResult;
+        var lastMappingResult = ko.utils.domData.get(domNode, lastMappingResultDomDataKey),
+            isFirstExecution = !lastMappingResult,
 
-        // Build the new mapping result
-        var newMappingResult = [];
-        var lastMappingResultIndex = 0;
-        var currentArrayIndex = 0;
+            // Build the new mapping result
+            newMappingResult = [],
+            lastMappingResultIndex = 0,
+            currentArrayIndex = 0,
 
-        var nodesToDelete = [];
-        var itemsToMoveFirstIndexes = [];
-        var itemsForBeforeRemoveCallbacks = [];
-        var mapData;
-        var countWaitingForRemove = 0;
+            nodesToDelete = [],
+            itemsToMoveFirstIndexes = [],
+            itemsForBeforeRemoveCallbacks = [],
+            mapData,
+            countWaitingForRemove = 0,
 
-        function itemAdded(value) {
-            mapData = { arrayEntry: value, indexObservable: ko.observable(currentArrayIndex++) };
-            newMappingResult.push(mapData);
-        }
+            itemAdded = value => {
+                mapData = { arrayEntry: value, indexObservable: ko.observable(currentArrayIndex++) };
+                newMappingResult.push(mapData);
+            },
 
-        function itemMovedOrRetained(oldPosition) {
-            mapData = lastMappingResult[oldPosition];
-            // Since updating the index might change the nodes, do so before calling fixUpContinuousNodeArray
-            mapData.indexObservable(currentArrayIndex++);
-            ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode);
-            newMappingResult.push(mapData);
-        }
-
-        function callCallback(callback, items) {
-            if (callback) {
-                for (var i = 0, n = items.length; i < n; i++) {
-                    items[i] && items[i].mappedNodes.forEach(node => callback(node, i, items[i].arrayEntry));
-                }
-            }
-        }
+            itemMovedOrRetained = oldPosition => {
+                mapData = lastMappingResult[oldPosition];
+                // Since updating the index might change the nodes, do so before calling fixUpContinuousNodeArray
+                mapData.indexObservable(currentArrayIndex++);
+                ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode);
+                newMappingResult.push(mapData);
+            };
 
         if (isFirstExecution) {
             array.forEach(itemAdded);
         } else {
             if (!editScript || (lastMappingResult && lastMappingResult['_countWaitingForRemove'])) {
                 // Compare the provided array against the previous one
-                var lastArray = Array.prototype.map.call(lastMappingResult, x => x.arrayEntry),
-                    compareOptions = {
-                        'dontLimitMoves': options['dontLimitMoves'],
+                editScript = ko.utils.compareArrays(
+                    Array.prototype.map.call(lastMappingResult, x => x.arrayEntry),
+                    array,
+                    {
                         'sparse': true
-                    };
-                editScript = ko.utils.compareArrays(lastArray, array, compareOptions);
+                    });
             }
 
-            for (let i = 0, editScriptItem, movedIndex, itemIndex; editScriptItem = editScript[i]; i++) {
+            let movedIndex, itemIndex;
+            editScript.forEach(editScriptItem => {
                 movedIndex = editScriptItem['moved'];
                 itemIndex = editScriptItem['index'];
                 switch (editScriptItem['status']) {
@@ -110,21 +105,12 @@
 
                             // Stop tracking changes to the mapping for these nodes
                             if (mapData.dependentObservable) {
-                                mapData.dependentObservable.dispose();
+                                mapData.dependentObservable['dispose']();
                                 mapData.dependentObservable = undefined;
                             }
 
                             // Queue these nodes for later removal
                             if (ko.utils.fixUpContinuousNodeArray(mapData.mappedNodes, domNode).length) {
-                                if (options['beforeRemove']) {
-                                    newMappingResult.push(mapData);
-                                    countWaitingForRemove++;
-                                    if (mapData.arrayEntry === deletedItemDummyValue) {
-                                        mapData = null;
-                                    } else {
-                                        itemsForBeforeRemoveCallbacks[mapData.indexObservable.peek()] = mapData;
-                                    }
-                                }
                                 if (mapData) {
                                     nodesToDelete.push.apply(nodesToDelete, mapData.mappedNodes);
                                 }
@@ -145,7 +131,7 @@
                         }
                         break;
                 }
-            }
+            });
 
             while (currentArrayIndex < array.length) {
                 itemMovedOrRetained(lastMappingResultIndex++);
@@ -159,10 +145,14 @@
         // Store a copy of the array items we just considered so we can difference it next time
         ko.utils.domData.set(domNode, lastMappingResultDomDataKey, newMappingResult);
 
-        // Next remove nodes for deleted items (or just clean if there's a beforeRemove callback)
-        nodesToDelete.forEach(options['beforeRemove'] ? ko.cleanNode : ko.removeNode);
+        // Next remove nodes for deleted items
+        nodesToDelete.forEach(ko.removeNode);
 
-        var i, j, lastNode, nodeToInsert, mappedNodes, activeElement;
+        var i, lastNode, mappedNodes, activeElement,
+            insertNode = nodeToInsert => {
+                ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
+                lastNode = nodeToInsert;
+            };
 
         // Since most browsers remove the focus from an element when it's moved to another location,
         // save the focused element and try to restore it later.
@@ -170,30 +160,27 @@
 
         // Try to reduce overall moved nodes by first moving the ones that were marked as moved by the edit script
         if (itemsToMoveFirstIndexes.length) {
-            while ((i = itemsToMoveFirstIndexes.shift()) != undefined) {
+            while ((i = itemsToMoveFirstIndexes.shift()) != null) {
                 mapData = newMappingResult[i];
-                for (lastNode = undefined; i; ) {
-                    if ((mappedNodes = newMappingResult[--i].mappedNodes) && mappedNodes.length) {
+                while (i--) {
+                    mappedNodes = newMappingResult[i].mappedNodes;
+                    if (mappedNodes?.length) {
                         lastNode = mappedNodes[mappedNodes.length - 1];
                         break;
                     }
                 }
-                for (j = 0; nodeToInsert = mapData.mappedNodes[j]; lastNode = nodeToInsert, j++) {
-                    ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
-                }
+                mapData.mappedNodes.forEach(insertNode);
             }
         }
 
-        // Next add/reorder the remaining items (will include deleted items if there's a beforeRemove callback)
-        for (i = 0; mapData = newMappingResult[i]; i++) {
+        // Next add/reorder the remaining items
+        newMappingResult.forEach(mapData => {
             // Get nodes for newly added items
-            if (!mapData.mappedNodes)
-                ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
+            mapData.mappedNodes
+            || ko.utils.extend(mapData, mapNodeAndRefreshWhenChanged(domNode, mapping, mapData.arrayEntry, callbackAfterAddingNodes, mapData.indexObservable));
 
             // Put nodes in the right place if they aren't there already
-            for (j = 0; nodeToInsert = mapData.mappedNodes[j]; lastNode = nodeToInsert, j++) {
-                ko.virtualElements.insertAfter(domNode, nodeToInsert, lastNode);
-            }
+            mapData.mappedNodes.forEach(insertNode);
 
             // Run the callbacks for newly added nodes (for example, to apply bindings, etc.)
             if (!mapData.initialized && callbackAfterAddingNodes) {
@@ -201,27 +188,16 @@
                 mapData.initialized = true;
                 lastNode = mapData.mappedNodes[mapData.mappedNodes.length - 1];     // get the last node again since it may have been changed by a preprocessor
             }
-        }
+        });
 
         // Restore the focused element if it had lost focus
-        if (activeElement && domNode.ownerDocument.activeElement != activeElement) {
-            activeElement.focus();
+        if (domNode.ownerDocument.activeElement != activeElement) {
+            activeElement?.focus();
         }
 
-        // If there's a beforeRemove callback, call it after reordering.
-        // Note that we assume that the beforeRemove callback will usually be used to remove the nodes using
-        // some sort of animation, which is why we first reorder the nodes that will be removed. If the
-        // callback instead removes the nodes right away, it would be more efficient to skip reordering them.
-        // Perhaps we'll make that change in the future if this scenario becomes more common.
-        callCallback(options['beforeRemove'], itemsForBeforeRemoveCallbacks);
-
         // Replace the stored values of deleted items with a dummy value. This provides two benefits: it marks this item
-        // as already "removed" so we won't call beforeRemove for it again, and it ensures that the item won't match up
+        // as already "removed", and it ensures that the item won't match up
         // with an actual item in the array and appear as "retained" or "moved".
-        for (i = 0; i < itemsForBeforeRemoveCallbacks.length; ++i) {
-            if (itemsForBeforeRemoveCallbacks[i]) {
-                itemsForBeforeRemoveCallbacks[i].arrayEntry = deletedItemDummyValue;
-            }
-        }
+        itemsForBeforeRemoveCallbacks.forEach(callback => callback && (callback.arrayEntry = deletedItemDummyValue));
     }
 })();
diff --git a/vendors/knockout/src/binding/editDetection/compareArrays.js b/vendors/knockout/src/binding/editDetection/compareArrays.js
index 0ef9943ba..a9085f6bc 100644
--- a/vendors/knockout/src/binding/editDetection/compareArrays.js
+++ b/vendors/knockout/src/binding/editDetection/compareArrays.js
@@ -1,52 +1,37 @@
 // Go through the items that have been added and deleted and try to find matches between them.
 ko.utils.findMovesInArrayComparison = (left, right, limitFailedCompares) => {
-    if (left.length && right.length) {
-        var failedCompares, l, r, leftItem, rightItem;
-        for (failedCompares = l = 0; (!limitFailedCompares || failedCompares < limitFailedCompares) && (leftItem = left[l]); ++l) {
-            for (r = 0; rightItem = right[r]; ++r) {
-                if (leftItem['value'] === rightItem['value']) {
-                    leftItem['moved'] = rightItem['index'];
-                    rightItem['moved'] = leftItem['index'];
-                    right.splice(r, 1);         // This item is marked as moved; so remove it from right list
-                    failedCompares = r = 0;     // Reset failed compares count because we're checking for consecutive failures
-                    break;
-                }
-            }
-            failedCompares += r;
+    var failedCompares = 0, r, l = right.length;
+    l && left.every(leftItem => {
+        r = right.findIndex(rightItem => leftItem['value'] === rightItem['value']);
+        if (r >= 0) {
+            leftItem['moved'] = right[r]['index'];
+            right[r]['moved'] = leftItem['index'];
+            right.splice(r, 1);         // This item is marked as moved; so remove it from right list
+//            right[r] = null;
+            failedCompares = r = 0;     // Reset failed compares count because we're checking for consecutive failures
+            --l;
         }
-    }
+        failedCompares += l;
+        return l && (!limitFailedCompares || failedCompares < limitFailedCompares);
+    });
 };
 
 ko.utils.compareArrays = (() => {
-    var statusNotInOld = 'added', statusNotInNew = 'deleted';
+    var statusNotInOld = 'added', statusNotInNew = 'deleted',
 
-    // Simple calculation based on Levenshtein distance.
-    function compareArrays(oldArray, newArray, options) {
-        // For backward compatibility, if the third arg is actually a bool, interpret
-        // it as the old parameter 'dontLimitMoves'. Newer code should use { dontLimitMoves: true }.
-        options = (typeof options === 'boolean') ? { 'dontLimitMoves': options } : (options || {});
-        oldArray = oldArray || [];
-        newArray = newArray || [];
-
-        if (oldArray.length < newArray.length)
-            return compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, options);
-        else
-            return compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, options);
-    }
-
-    function compareSmallArrayToBigArray(smlArray, bigArray, statusNotInSml, statusNotInBig, options) {
+    compareSmallArrayToBigArray = (smlArray, bigArray, statusNotInSml, statusNotInBig, options) => {
         var myMin = Math.min,
             myMax = Math.max,
             editDistanceMatrix = [],
-            smlIndex, smlIndexMax = smlArray.length,
+            smlIndex = -1, smlIndexMax = smlArray.length,
             bigIndex, bigIndexMax = bigArray.length,
             compareRange = (bigIndexMax - smlIndexMax) || 1,
             maxDistance = smlIndexMax + bigIndexMax + 1,
-            thisRow, lastRow,
+            thisRow, prevRow,
             bigIndexMaxForRow, bigIndexMinForRow;
 
-        for (smlIndex = 0; smlIndex <= smlIndexMax; smlIndex++) {
-            lastRow = thisRow;
+        while (++smlIndex <= smlIndexMax) {
+            prevRow = thisRow;
             editDistanceMatrix.push(thisRow = []);
             bigIndexMaxForRow = myMin(bigIndexMax, smlIndex + compareRange);
             bigIndexMinForRow = myMax(0, smlIndex - 1);
@@ -56,9 +41,9 @@ ko.utils.compareArrays = (() => {
                 else if (!smlIndex)  // Top row - transform empty array into new array via additions
                     thisRow[bigIndex] = bigIndex + 1;
                 else if (smlArray[smlIndex - 1] === bigArray[bigIndex - 1])
-                    thisRow[bigIndex] = lastRow[bigIndex - 1];                  // copy value (no edit)
+                    thisRow[bigIndex] = prevRow[bigIndex - 1];                  // copy value (no edit)
                 else {
-                    var northDistance = lastRow[bigIndex] || maxDistance;       // not in big (deletion)
+                    var northDistance = prevRow[bigIndex] || maxDistance;       // not in big (deletion)
                     var westDistance = thisRow[bigIndex - 1] || maxDistance;    // not in small (addition)
                     thisRow[bigIndex] = myMin(northDistance, westDistance) + 1;
                 }
@@ -66,7 +51,9 @@ ko.utils.compareArrays = (() => {
         }
 
         var editScript = [], meMinusOne, notInSml = [], notInBig = [];
-        for (smlIndex = smlIndexMax, bigIndex = bigIndexMax; smlIndex || bigIndex;) {
+        smlIndex = smlIndexMax;
+        bigIndex = bigIndexMax
+        while (smlIndex || bigIndex) {
             meMinusOne = editDistanceMatrix[smlIndex][bigIndex] - 1;
             if (bigIndex && meMinusOne === editDistanceMatrix[smlIndex][bigIndex-1]) {
                 notInSml.push(editScript[editScript.length] = {     // added
@@ -91,10 +78,18 @@ ko.utils.compareArrays = (() => {
 
         // Set a limit on the number of consecutive non-matching comparisons; having it a multiple of
         // smlIndexMax keeps the time complexity of this algorithm linear.
-        ko.utils.findMovesInArrayComparison(notInBig, notInSml, !options['dontLimitMoves'] && smlIndexMax * 10);
+        ko.utils.findMovesInArrayComparison(notInBig, notInSml, smlIndexMax * 10);
 
         return editScript.reverse();
-    }
+    };
 
-    return compareArrays;
+    // Simple calculation based on Levenshtein distance.
+    return (oldArray, newArray, options) => {
+        oldArray = oldArray || [];
+        newArray = newArray || [];
+
+        return (oldArray.length < newArray.length)
+            ? compareSmallArrayToBigArray(oldArray, newArray, statusNotInOld, statusNotInNew, options)
+            : compareSmallArrayToBigArray(newArray, oldArray, statusNotInNew, statusNotInOld, options);
+    };
 })();
diff --git a/vendors/knockout/src/binding/expressionRewriting.js b/vendors/knockout/src/binding/expressionRewriting.js
index be488398e..9cbc1753d 100644
--- a/vendors/knockout/src/binding/expressionRewriting.js
+++ b/vendors/knockout/src/binding/expressionRewriting.js
@@ -1,21 +1,23 @@
 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).
     // This also will not properly handle nested brackets (e.g., obj1[obj2['prop']]; see #911).
-    var javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i;
-
-    function getWriteableValue(expression) {
-        if (javaScriptReservedWords.includes(expression))
-            return false;
-        var match = expression.match(javaScriptAssignmentTarget);
-        return match === null ? false : match[1] ? ('Object(' + match[1] + ')' + match[2]) : expression;
-    }
+        javaScriptAssignmentTarget = /^(?:[$_a-z][$\w]*|(.+)(\.\s*[$_a-z][$\w]*|\[.+\]))$/i,
 
+        getWriteableValue = expression => {
+            if (javaScriptReservedWords.includes(expression))
+                return false;
+            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
 
-    var 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.
+        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.
         // Create the actual regular expression by or-ing the following regex strings. The order is important.
         bindingToken = RegExp([
             // These match strings, either with double quotes, single quotes, or backticks
@@ -41,131 +43,87 @@ ko.expressionRewriting = (() => {
 
         // Match end of previous token to determine whether a slash is a division or regex.
         divisionLookBehind = /[\])"'A-Za-z0-9_$]+$/,
-        keywordRegexLookBehind = {'in':1,'return':1,'typeof':1};
+        keywordRegexLookBehind = {'in':1,'return':1,'typeof':1},
 
-    function parseObjectLiteral(objectLiteralString) {
-        // Trim leading and trailing spaces from the string
-        var str = ko.utils.stringTrim(objectLiteralString);
+        preProcessBindings = bindingsStringOrKeyValueArray => {
+            // Trim leading and trailing spaces from the string
+            var str = ko.utils.stringTrim(bindingsStringOrKeyValueArray);
 
-        // Trim braces '{' surrounding the whole object literal
-        if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
+            // Trim braces '{' surrounding the whole object literal
+            if (str.charCodeAt(0) === 123) str = str.slice(1, -1);
 
-        // Add a newline to correctly match a C++ style comment at the end of the string and
-        // add a comma so that we don't need a separate code block to deal with the last item
-        str += "\n,";
+            // Add a newline to correctly match a C++ style comment at the end of the string and
+            // add a comma so that we don't need a separate code block to deal with the last item
+            str += "\n,";
 
-        // Split into tokens
-        var result = [], toks = str.match(bindingToken), key, values = [], depth = 0;
+            // Split into tokens
+            var result = [], toks = str.match(bindingToken), key, values = [], depth = 0;
 
-        if (toks.length > 1) {
-            var i = 0, tok;
-            while ((tok = toks[i++])) {
-                var c = tok.charCodeAt(0);
-                // 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('')});
-                        key = depth = 0;
-                        values = [];
+            if (toks.length > 1) {
+                var i = 0, tok;
+                while ((tok = toks[i++])) {
+                    var c = tok.charCodeAt(0);
+                    // A comma signals the end of a key/value pair if depth is zero
+                    if (c === 44) { // ","
+                        if (depth <= 0) {
+                            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;
+                        }
+                    // Simply skip the colon that separates the name and value
+                    } else if (c === 58) { // ":"
+                        if (!depth && !key && values.length === 1) {
+                            key = values.pop();
+                            continue;
+                        }
+                    // Comments: skip them
+                    } else if (c === 47 && tok.length > 1 && (tok.charCodeAt(1) === 47 || tok.charCodeAt(1) === 42)) {  // "//" or "/*"
                         continue;
+                    // A set of slashes is initially matched as a regular expression, but could be division
+                    } else if (c === 47 && i && tok.length > 1) {  // "/"
+                        // Look at the end of the previous token to determine if the slash is actually division
+                        var match = toks[i-1].match(divisionLookBehind);
+                        if (match && !keywordRegexLookBehind[match[0]]) {
+                            // The slash is actually a division punctuator; re-parse the remainder of the string (not including the slash)
+                            str = str.slice(str.indexOf(tok) + 1);
+                            toks = str.match(bindingToken);
+                            i = -1;
+                            // Continue with just the slash
+                            tok = '/';
+                        }
+                    // Increment depth for parentheses, braces, and brackets so that interior commas are ignored
+                    } else if (c === 40 || c === 123 || c === 91) { // '(', '{', '['
+                        ++depth;
+                    } else if (c === 41 || c === 125 || c === 93) { // ')', '}', ']'
+                        --depth;
+                    // The key will be the first token; if it's a string, trim the quotes
+                    } else if (!key && !values.length && (c === 34 || c === 39)) { // '"', "'"
+                        tok = tok.slice(1, -1);
                     }
-                // Simply skip the colon that separates the name and value
-                } else if (c === 58) { // ":"
-                    if (!depth && !key && values.length === 1) {
-                        key = values.pop();
-                        continue;
-                    }
-                // Comments: skip them
-                } else if (c === 47 && tok.length > 1 && (tok.charCodeAt(1) === 47 || tok.charCodeAt(1) === 42)) {  // "//" or "/*"
-                    continue;
-                // A set of slashes is initially matched as a regular expression, but could be division
-                } else if (c === 47 && i && tok.length > 1) {  // "/"
-                    // Look at the end of the previous token to determine if the slash is actually division
-                    var match = toks[i-1].match(divisionLookBehind);
-                    if (match && !keywordRegexLookBehind[match[0]]) {
-                        // The slash is actually a division punctuator; re-parse the remainder of the string (not including the slash)
-                        str = str.slice(str.indexOf(tok) + 1);
-                        toks = str.match(bindingToken);
-                        i = -1;
-                        // Continue with just the slash
-                        tok = '/';
-                    }
-                // Increment depth for parentheses, braces, and brackets so that interior commas are ignored
-                } else if (c === 40 || c === 123 || c === 91) { // '(', '{', '['
-                    ++depth;
-                } else if (c === 41 || c === 125 || c === 93) { // ')', '}', ']'
-                    --depth;
-                // The key will be the first token; if it's a string, trim the quotes
-                } else if (!key && !values.length && (c === 34 || c === 39)) { // '"', "'"
-                    tok = tok.slice(1, -1);
+                    values.push(tok);
                 }
-                values.push(tok);
-            }
-            if (depth > 0) {
-                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.
-    var twoWayBindings = new Set;
-
-    function preProcessBindings(bindingsStringOrKeyValueArray, bindingOptions) {
-        bindingOptions = bindingOptions || {};
-
-        function processKeyValue(key, val) {
-            var writableVal;
-            function callPreprocessHook(obj) {
-                return (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}");
+                if (depth > 0) {
+                    throw Error("Unbalanced parentheses, braces, or brackets");
                 }
             }
-            // Values are wrapped in a function so that each value can be accessed independently
-            if (makeValueAccessors) {
-                val = 'function(){return ' + val + ' }';
-            }
-            resultStrings.push("'" + key + "':" + val);
-        }
 
-        var resultStrings = [],
-            propertyAccessorResultStrings = [],
-            makeValueAccessors = bindingOptions['valueAccessors'],
-            bindingParams = bindingOptions['bindingParams'],
-            keyValueArray = typeof bindingsStringOrKeyValueArray === "string" ?
-                parseObjectLiteral(bindingsStringOrKeyValueArray) : bindingsStringOrKeyValueArray;
+            result.push("'$data':()=>$data");
 
-        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.
@@ -174,11 +132,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)) {
-                var propWriters = allBindings.get('_ko_property_writers');
-                if (propWriters && propWriters[key])
-                    propWriters[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);
             }
diff --git a/vendors/knockout/src/binding/selectExtensions.js b/vendors/knockout/src/binding/selectExtensions.js
index b10e1bf32..1b8993df8 100644
--- a/vendors/knockout/src/binding/selectExtensions.js
+++ b/vendors/knockout/src/binding/selectExtensions.js
@@ -1,59 +1,61 @@
-(() => {
-    var hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
 
-    // Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
-    // are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
-    // that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
-    ko.selectExtensions = {
-        readValue : element => {
-            switch (element.nodeName) {
-                case 'OPTION':
-                    if (element[hasDomDataExpandoProperty] === true)
-                        return ko.utils.domData.get(element, ko.bindingHandlers.options.optionValueDomDataKey);
-                    return element.value;
-                case 'SELECT':
-                    return element.selectedIndex >= 0 ? ko.selectExtensions.readValue(element.options[element.selectedIndex]) : undefined;
-                default:
-                    return element.value;
-            }
-        },
+const hasDomDataExpandoProperty = '__ko__hasDomDataOptionValue__';
 
-        writeValue: (element, value, allowUnset) => {
-            switch (element.nodeName) {
-                case 'OPTION':
-                    if (typeof value === "string") {
-                        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);
-                        element[hasDomDataExpandoProperty] = true;
-
-                        // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
-                        element.value = typeof value === "number" ? value : "";
-                    }
-                    break;
-                case 'SELECT':
-                    // A blank string or null value will select the caption
-                    var selection = -1, noValue = ("" === value || null == value);
-                    for (var i = 0, n = element.options.length, optionValue; i < n; ++i) {
-                        optionValue = ko.selectExtensions.readValue(element.options[i]);
-                        // Include special check to handle selecting a caption with a blank string value
-                        if (optionValue == value || (optionValue === "" && noValue)) {
-                            selection = i;
-                            break;
-                        }
-                    }
-                    if (allowUnset || selection >= 0 || (noValue && element.size > 1)) {
-                        element.selectedIndex = selection;
-                    }
-                    break;
-                default:
-                    element.value = (value == null) ? "" : value;
-                    break;
-            }
+// Normally, SELECT elements and their OPTIONs can only take value of type 'string' (because the values
+// are stored on DOM attributes). ko.selectExtensions provides a way for SELECTs/OPTIONs to have values
+// that are arbitrary objects. This is very convenient when implementing things like cascading dropdowns.
+ko.selectExtensions = {
+    readValue : element => {
+        switch (element.nodeName) {
+            case 'OPTION':
+                return (element[hasDomDataExpandoProperty] === true)
+                    ? ko.utils.domData.get(element, ko.bindingHandlers['options'].optionValueDomDataKey)
+                    : element.value;
+            case 'SELECT':
+                return element.selectedIndex >= 0
+                    ? ko.selectExtensions.readValue(element.options[element.selectedIndex])
+                    : undefined;
+            default:
+                return element.value;
         }
-    };
-})();
+    },
+
+    writeValue: (element, value) => {
+        switch (element.nodeName) {
+            case 'OPTION':
+                if (typeof value === "string") {
+                    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);
+                    element[hasDomDataExpandoProperty] = true;
+
+                    // Special treatment of numbers is just for backward compatibility. KO 1.2.1 wrote numerical values to element.value.
+                    element.value = typeof value === "number" ? value : "";
+                }
+                break;
+            case 'SELECT':
+                // A blank string or null value will select the caption
+                var selection = -1, noValue = ("" === (value ?? "")),
+                    i = element.options.length, optionValue;
+                while (i--) {
+                    optionValue = ko.selectExtensions.readValue(element.options[i]);
+                    // Include special check to handle selecting a caption with a blank string value
+                    if (optionValue == value || (optionValue === "" && noValue)) {
+                        selection = i;
+                        break;
+                    }
+                }
+                if (selection >= 0 || (noValue && element.size > 1)) {
+                    element.selectedIndex = selection;
+                }
+                break;
+            default:
+                element.value = value ?? "";
+                break;
+        }
+    }
+};
diff --git a/vendors/knockout/src/components/componentBinding.js b/vendors/knockout/src/components/componentBinding.js
index 75ca55c97..44cbf10fa 100644
--- a/vendors/knockout/src/components/componentBinding.js
+++ b/vendors/knockout/src/components/componentBinding.js
@@ -5,21 +5,15 @@
         'init': (element, valueAccessor, ignored1, ignored2, bindingContext) => {
             var currentViewModel,
                 currentLoadingOperationId,
-                afterRenderSub,
                 disposeAssociatedComponentViewModel = () => {
                     var currentViewModelDispose = currentViewModel && currentViewModel['dispose'];
                     if (typeof currentViewModelDispose === 'function') {
                         currentViewModelDispose.call(currentViewModel);
                     }
-                    if (afterRenderSub) {
-                        afterRenderSub.dispose();
-                    }
-                    afterRenderSub = null;
                     currentViewModel = null;
                     // Any in-flight loading operation is no longer relevant, so make sure we ignore its completion
                     currentLoadingOperationId = null;
-                },
-                originalChildNodes = [...ko.virtualElements.childNodes(element)];
+                };
 
             ko.virtualElements.emptyNode(element);
             ko.utils.domNodeDisposal.addDisposeCallback(element, disposeAssociatedComponentViewModel);
@@ -34,13 +28,13 @@
                 }
 
                 if (!componentName) {
-                    throw new Error('No component name specified');
+                    throw Error('No component name specified');
                 }
 
                 var asyncContext = ko.bindingEvent.startPossiblyAsyncContentBinding(element, bindingContext);
 
                 var loadingOperationId = currentLoadingOperationId = ++componentLoadingOperationUniqueId;
-                ko.components.get(componentName, componentDefinition => {
+                ko['components'].get(componentName, componentDefinition => {
                     // If this is the current load operation for this element
                     if (currentLoadingOperationId === loadingOperationId) {
                         // Clean up previous state
@@ -48,25 +42,19 @@
 
                         // Instantiate and bind new component. Implicitly this cleans any old DOM nodes.
                         if (!componentDefinition) {
-                            throw new Error('Unknown component \'' + componentName + '\'');
+                            throw Error('Unknown component \'' + componentName + '\'');
                         }
                         // cloneTemplateIntoElement
                         var template = componentDefinition['template'];
                         if (!template) {
-                            throw new Error('Component \'' + componentName + '\' has no template');
+                            throw Error('Component \'' + componentName + '\' has no template');
                         }
                         ko.virtualElements.setDomNodeChildren(element, ko.utils.cloneNodes(template));
 
                         currentViewModel = componentDefinition['createViewModel'](componentParams, {
-                            'element': element,
-                            'templateNodes': originalChildNodes
+                            'element': element
                         });
-                        ko.applyBindingsToDescendants(asyncContext['createChildContext'](currentViewModel, {
-                                'extend': ctx => {
-                                    ctx['$component'] = currentViewModel;
-                                    ctx['$componentTemplateNodes'] = originalChildNodes;
-                                }
-                            }), element);
+                        ko.applyBindingsToDescendants(asyncContext['createChildContext'](currentViewModel, {}), element);
                     }
                 });
             }, { disposeWhenNodeIsRemoved: element });
diff --git a/vendors/knockout/src/components/loaderRegistry.js b/vendors/knockout/src/components/loaderRegistry.js
index 11cffed2c..d50049207 100644
--- a/vendors/knockout/src/components/loaderRegistry.js
+++ b/vendors/knockout/src/components/loaderRegistry.js
@@ -1,25 +1,23 @@
 (() => {
     var loadingSubscribablesCache = Object.create(null), // Tracks component loads that are currently in flight
-        loadedDefinitionsCache = Object.create(null);    // Tracks component loads that have already completed
+        loadedDefinitionsCache = new Map();    // Tracks component loads that have already completed
 
-    ko.components = {
+    ko['components'] = {
         get: (componentName, callback) => {
-            var cachedDefinition = loadedDefinitionsCache[componentName];
-            if (cachedDefinition) {
-                ko.tasks.schedule(() => callback(cachedDefinition.definition) );
+            if (loadedDefinitionsCache.has(componentName)) {
+                callback(loadedDefinitionsCache.get(componentName));
             } else {
                 // Join the loading process that is already underway, or start a new one.
-                var subscribable = loadingSubscribablesCache[componentName],
-                    completedAsync;
+                var subscribable = loadingSubscribablesCache[componentName];
                 if (subscribable) {
-                    subscribable.subscribe(callback);
+                    subscribable['subscribe'](callback);
                 } else {
                     // It's not started loading yet. Start loading, and when it's done, move it to loadedDefinitionsCache.
                     subscribable = loadingSubscribablesCache[componentName] = new ko.subscribable();
-                    subscribable.subscribe(callback);
+                    subscribable['subscribe'](callback);
 
-                    beginLoadingComponent(componentName, definition => {
-                        loadedDefinitionsCache[componentName] = { definition: definition };
+                    loadComponent(componentName, definition => {
+                        loadedDefinitionsCache.set(componentName, definition);
                         delete loadingSubscribablesCache[componentName];
 
                         // For API consistency, all loads complete asynchronously. However we want to avoid
@@ -28,29 +26,19 @@
                         //
                         // You can bypass the 'always asynchronous' feature by putting the synchronous:true
                         // flag on your component configuration when you register it.
-                        if (completedAsync) {
-                            // Note that notifySubscribers ignores any dependencies read within the callback.
-                            // See comment in loaderRegistryBehaviors.js for reasoning
-                            subscribable.notifySubscribers(definition);
-                        } else {
-                            ko.tasks.schedule(() => subscribable.notifySubscribers(definition));
-                        }
+                        subscribable.notifySubscribers(definition);
                     });
-                    completedAsync = true;
                 }
             }
         },
 
-        clearCachedDefinition: componentName =>
-            delete loadedDefinitionsCache[componentName],
-
-        register: (componentName, config) => {
+        'register': (componentName, config) => {
             if (!config) {
-                throw new Error('Invalid configuration for ' + componentName);
+                throw Error('Invalid configuration for ' + componentName);
             }
 
             if (defaultConfigRegistry[componentName]) {
-                throw new Error('Component ' + componentName + ' is already registered');
+                throw Error('Component ' + componentName + ' is already registered');
             }
 
             defaultConfigRegistry[componentName] = config;
@@ -67,71 +55,51 @@
     // 1. To supply configuration objects from some other source (e.g., conventions)
     // 2. Or, to resolve configuration objects by loading viewmodels/templates via arbitrary logic.
 
-    var defaultConfigRegistry = Object.create(null);
-    var createViewModelKey = 'createViewModel';
+    var defaultConfigRegistry = Object.create(null),
+        createViewModelKey = 'createViewModel',
+        throwError = (componentName, message) => { throw Error(`Component '${componentName}': ${message}`) },
 
-    // Takes a config object of the form { template: ..., viewModel: ... }, and asynchronously convert it
-    // into the standard component definition format:
-    //    { template: <ArrayOfDomNodes>, createViewModel: function(params, componentInfo) { ... } }.
-    // Since both template and viewModel may need to be resolved asynchronously, both tasks are performed
-    // in parallel, and the results joined when both are ready. We don't depend on any promises infrastructure,
-    // so this is implemented manually below.
-    function loadComponent(componentName, callback) {
-        var result = {},
-            config = defaultConfigRegistry[componentName] || {},
-            templateConfig = config['template'],
-            viewModelConfig = config['viewModel'];
+        // Takes a config object of the form { template: ..., viewModel: ... }, and asynchronously convert it
+        // into the standard component definition format:
+        //    { template: <ArrayOfDomNodes>, createViewModel: function(params, componentInfo) { ... } }.
+        // Since both template and viewModel may need to be resolved asynchronously, both tasks are performed
+        // in parallel, and the results joined when both are ready. We don't depend on any promises infrastructure,
+        // so this is implemented manually below.
+        loadComponent = (componentName, callback) => {
+            // Try the candidates
+            var result = {},
+                config = defaultConfigRegistry[componentName] || {},
+                templateConfig = config['template'],
+                viewModelConfig = config['viewModel'];
 
-        if (templateConfig) {
-            if (!templateConfig['element']) {
-                throwError(componentName, 'Unknown template value: ' + templateConfig);
+            if (templateConfig) {
+                if (!templateConfig['element']) {
+                    throwError(componentName, 'Unknown template value: ' + templateConfig);
+                }
+                // Element ID - find it, then copy its child nodes
+                var element = templateConfig['element'];
+                var elemInstance = document.getElementById(element);
+                if (!elemInstance) {
+                    throwError(componentName, 'Cannot find element with ID ' + element);
+                }
+                if (!elemInstance.matches('TEMPLATE')) {
+                    throwError(componentName, 'Template Source Element not a <template>');
+                }
+                // For browsers with proper <template> element support (i.e., where the .content property
+                // gives a document fragment), use that document fragment.
+                result['template'] = ko.utils.cloneNodes(elemInstance.content.childNodes);
             }
-            // Element ID - find it, then copy its child nodes
-            var element = templateConfig['element'];
-            var elemInstance = document.getElementById(element);
-            if (!elemInstance) {
-                throwError(componentName, 'Cannot find element with ID ' + element);
+
+            if (viewModelConfig) {
+                if (typeof viewModelConfig[createViewModelKey] !== 'function') {
+                    throwError(componentName, 'Unknown viewModel value: ' + viewModelConfig);
+                }
+                // Already a factory function - use it as-is
+                result[createViewModelKey] = viewModelConfig[createViewModelKey];
             }
-            if (!elemInstance.matches('TEMPLATE')) {
-                throwError(componentName, 'Template Source Element not a <template>');
-            }
-            // For browsers with proper <template> element support (i.e., where the .content property
-            // gives a document fragment), use that document fragment.
-            result['template'] = ko.utils.cloneNodes(elemInstance.content.childNodes);
-        }
 
-        if (viewModelConfig) {
-            if (typeof viewModelConfig[createViewModelKey] !== 'function') {
-                throwError(componentName, 'Unknown viewModel value: ' + viewModelConfig);
-            }
-            // Already a factory function - use it as-is
-            result[createViewModelKey] = viewModelConfig[createViewModelKey];
-        }
-
-        if (result['template'] && result[createViewModelKey]) {
-            callback(result);
-        } else {
-            callback(null);
-        }
-    }
-
-    function throwError(componentName, message) {
-        throw new Error(`Component '${componentName}': ${message}`)
-    }
-
-    function beginLoadingComponent(componentName, callback) {
-        // Try the candidates
-        var found = false;
-        loadComponent(componentName, result => {
-            // This candidate returned a value. Use it.
-            (found = result != null) && callback(result);
-        });
-        if (!found) {
-            // No candidates returned a value
-            callback(null);
-        }
-    }
-
-    ko.exportSymbol('components', ko.components);
-    ko.exportSymbol('components.register', ko.components.register);
+            // Did candidate return a value?
+            var found = (result['template'] && result[createViewModelKey]);
+            callback(found ? result : null);
+        };
 })();
diff --git a/vendors/knockout/src/google-closure-compiler-utils.js b/vendors/knockout/src/google-closure-compiler-utils.js
index db4aa749d..1567d99e3 100644
--- a/vendors/knockout/src/google-closure-compiler-utils.js
+++ b/vendors/knockout/src/google-closure-compiler-utils.js
@@ -10,4 +10,3 @@ ko.exportSymbol = (koPath, object) => {
         target = target[tokens[i]];
     target[tokens[l]] = object;
 };
-ko.exportProperty = (owner, publicName, object) => owner[publicName] = object;
diff --git a/vendors/knockout/src/namespace.js b/vendors/knockout/src/namespace.js
index ff46d12a3..11851c27d 100644
--- a/vendors/knockout/src/namespace.js
+++ b/vendors/knockout/src/namespace.js
@@ -1,3 +1,3 @@
 // 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 = {};
diff --git a/vendors/knockout/src/subscribables/dependencyDetection.js b/vendors/knockout/src/subscribables/dependencyDetection.js
index 5a3c7af8f..1949a3106 100644
--- a/vendors/knockout/src/subscribables/dependencyDetection.js
+++ b/vendors/knockout/src/subscribables/dependencyDetection.js
@@ -1,6 +1,6 @@
 (() => {
 
-var outerFrames = [],
+let outerFrames = [],
     currentFrame,
     lastId = 0,
 
@@ -19,13 +19,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 || []);
@@ -34,11 +34,11 @@ ko.dependencyDetection = {
         }
     },
 
-    getDependenciesCount: () => currentFrame && currentFrame.computed.getDependenciesCount(),
+    getDependenciesCount: () => currentFrame?.computed.getDependenciesCount(),
 
-    isInitial: () => currentFrame && currentFrame.isInitial,
+    isInitial: () => currentFrame?.isInitial,
 
-    computed: () => currentFrame && currentFrame.computed
+    computed: () => currentFrame?.computed
 };
 
 })();
diff --git a/vendors/knockout/src/subscribables/dependentObservable.js b/vendors/knockout/src/subscribables/dependentObservable.js
index ea1489009..a4eb9fa29 100644
--- a/vendors/knockout/src/subscribables/dependentObservable.js
+++ b/vendors/knockout/src/subscribables/dependentObservable.js
@@ -25,8 +25,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,
@@ -36,26 +36,25 @@ 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);
             return this; // Permits chained assignments
-        } else {
-            // Reading the value
-            state.isDisposed || ko.dependencyDetection.registerDependency(computedObservable);
-            if (state.isDirty || (state.isSleeping && computedObservable.haveDependenciesChanged())) {
-                computedObservable.evaluateImmediate();
-            }
-            return state.latestValue;
         }
+        // Reading the value
+        state.isDisposed || ko.dependencyDetection.registerDependency(computedObservable);
+        if (state.isDirty || (state.isSleeping && computedObservable.haveDependenciesChanged())) {
+            computedObservable.evaluateImmediate();
+        }
+        return state.latestValue;
     }
 
     computedObservable[computedState] = state;
     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);
@@ -64,8 +63,6 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
         state.pure = true;
         state.isSleeping = true;     // Starts off sleeping; will awake on the first subscription
         ko.utils.extend(computedObservable, pureComputedOverrides);
-    } else if (options['deferEvaluation']) {
-        ko.utils.extend(computedObservable, deferEvaluationOverrides);
     }
 
     if (state.disposeWhenNodeIsRemoved) {
@@ -83,16 +80,14 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
         }
     }
 
-    // Evaluate, unless sleeping or deferEvaluation is true
-    if (!state.isSleeping && !options['deferEvaluation']) {
-        computedObservable.evaluateImmediate();
-    }
+    // Evaluate, unless sleeping
+    state.isSleeping || computedObservable.evaluateImmediate();
 
     // Attach a DOM node disposal callback so that the computed will be proactively disposed as soon as the node is
     // 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']();
         });
     }
 
@@ -101,9 +96,7 @@ ko.computed = (evaluatorFunctionOrOptions, options) => {
 
 // Utility function that disposes a given dependencyTracking entry
 function computedDisposeDependencyCallback(id, entryToDispose) {
-    if (entryToDispose !== null && entryToDispose.dispose) {
-        entryToDispose.dispose();
-    }
+    entryToDispose?.['dispose']?.();
 }
 
 // This function gets called each time a dependency is detected while evaluating a computed.
@@ -150,10 +143,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) =>
@@ -162,7 +155,7 @@ var computedFn = {
 
         return dependentObservables;
     },
-    hasAncestorDependency: function (obs) {
+    hasAncestorDependency(obs) {
         if (!this[computedState].dependenciesCount) {
             return false;
         }
@@ -170,7 +163,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");
         }
@@ -179,7 +172,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)) {
@@ -190,17 +183,17 @@ var computedFn = {
             }
         }
     },
-    markDirty: function () {
+    markDirty() {
         // Process "dirty" events if we can handle delayed notifications
-        if (this._evalDelayed && !this[computedState].isBeingEvaluated) {
-            this._evalDelayed(false /*isChange*/);
+        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();
@@ -208,46 +201,37 @@ 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 && 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,
             changed = false;
 
-        if (state.isBeingEvaluated) {
-            // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
-            // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
-            // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
-            // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
-            return;
-        }
-
+        // If the evaluation of a ko.computed causes side effects, it's possible that it will trigger its own re-evaluation.
+        // This is not desirable (it's hard for a developer to realise a chain of dependencies might cause this, and they almost
+        // certainly didn't intend infinite re-evaluations). So, for predictability, we simply prevent ko.computeds from causing
+        // their own re-evaluation. Further discussion at https://github.com/SteveSanderson/knockout/pull/387
+        if (state.isBeingEvaluated
         // Do not evaluate (and possibly capture new dependencies) if disposed
-        if (state.isDisposed) {
+         || state.isDisposed) {
             return;
         }
 
-        if (state.disposeWhenNodeIsRemoved && !ko.utils.domNodeIsAttachedToDocument(state.disposeWhenNodeIsRemoved) || disposeWhen && disposeWhen()) {
+        if (state.disposeWhenNodeIsRemoved && !ko.utils.domNodeIsAttachedToDocument(state.disposeWhenNodeIsRemoved) || disposeWhen?.()) {
             // See comment above about suppressDisposalUntilDisposeWhenReturnsFalse
             if (!state.suppressDisposalUntilDisposeWhenReturnsFalse) {
-                computedObservable.dispose();
+                computedObservable['dispose']();
                 return;
             }
         } else {
@@ -255,8 +239,8 @@ var computedFn = {
             state.suppressDisposalUntilDisposeWhenReturnsFalse = false;
         }
 
-        state.isBeingEvaluated = true;
         try {
+            state.isBeingEvaluated = true;
             changed = this.evaluateImmediate_CallReadWithDependencyDetection(notifyChange);
         } finally {
             state.isBeingEvaluated = false;
@@ -264,7 +248,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).
@@ -295,7 +279,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);
@@ -326,8 +310,8 @@ var computedFn = {
 
         return changed;
     },
-    peek: function (evaluate) {
-        // By default, peek won't re-evaluate, except while the computed is sleeping or to get the initial value when "deferEvaluation" is set.
+    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];
         if ((state.isDirty && (evaluate || !state.dependenciesCount)) || (state.isSleeping && this.haveDependenciesChanged())) {
@@ -335,38 +319,39 @@ 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(this, limitFunction);
-        this._evalIfChanged = function () {
-            if (!this[computedState].isSleeping) {
-                if (this[computedState].isStale) {
-                    this.evaluateImmediate();
+        ko.subscribable['fn'].limit.call(self, limitFunction);
+        self._evalIfChanged = () => {
+            if (!self[computedState].isSleeping) {
+                if (self[computedState].isStale) {
+                    self.evaluateImmediate();
                 } else {
-                    this[computedState].isDirty = false;
+                    self[computedState].isDirty = false;
                 }
             }
-            return this[computedState].latestValue;
+            return self[computedState].latestValue;
         };
-        this._evalDelayed = function (isChange) {
-            this._limitBeforeChange(this[computedState].latestValue);
+        self._evalDelayed = isChange => {
+            self._limitBeforeChange(self[computedState].latestValue);
 
             // Mark as dirty
-            this[computedState].isDirty = true;
+            self[computedState].isDirty = true;
             if (isChange) {
-                this[computedState].isStale = true;
+                self[computedState].isStale = true;
             }
 
             // Pass the observable to the "limit" code, which will evaluate it when
             // it's time to do the notification.
-            this._limitChange(this, !isChange /* isDirty */);
+            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()
+                dependency['dispose']?.()
             );
         }
         if (state.disposeWhenNodeIsRemoved && state.domNodeDisposalCallback) {
@@ -385,7 +370,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];
@@ -424,24 +409,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.
@@ -453,15 +438,6 @@ var pureComputedOverrides = {
     }
 };
 
-var deferEvaluationOverrides = {
-    beforeSubscriptionAdd: function (event) {
-        // This will force a computed with deferEvaluation to evaluate when the first subscription is registered.
-        if (event == 'change' || event == 'beforeChange') {
-            this.peek();
-        }
-    }
-};
-
 // Note that for browsers that don't support proto assignment, the
 // inheritance chain is created manually in the ko.computed constructor
 Object.setPrototypeOf(computedFn, ko.subscribable['fn']);
@@ -469,11 +445,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') {
diff --git a/vendors/knockout/src/subscribables/extenders.js b/vendors/knockout/src/subscribables/extenders.js
index 5375a601b..f11a01c6d 100644
--- a/vendors/knockout/src/subscribables/extenders.js
+++ b/vendors/knockout/src/subscribables/extenders.js
@@ -1,19 +1,7 @@
-ko.extenders = {
+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" ?
@@ -22,9 +10,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) {
@@ -46,5 +33,3 @@ function debounce(callback, timeout) {
         timeoutInstance = setTimeout(callback, timeout);
     };
 }
-
-ko.exportSymbol('extenders', ko.extenders);
diff --git a/vendors/knockout/src/subscribables/observable.js b/vendors/knockout/src/subscribables/observable.js
index d4789c922..21a360bc0 100644
--- a/vendors/knockout/src/subscribables/observable.js
+++ b/vendors/knockout/src/subscribables/observable.js
@@ -1,5 +1,6 @@
 const observableLatestValue = Symbol('_latestValue'),
     length = 'length';
+//const IS_OBSERVABLE = Symbol('IS_OBSERVABLE');
 
 ko.observable = initialValue => {
     function observable() {
@@ -10,45 +11,42 @@ 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
         }
-        else {
-            // Read
-            ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
-            return observable[observableLatestValue];
-        }
+        // Read
+        ko.dependencyDetection.registerDependency(observable); // The caller only needs to be notified of changes if they did a "read" operation
+        return observable[observableLatestValue];
     }
 
     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 && value.toJSON ? value.toJSON() : value;
+        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
@@ -58,6 +56,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]) {
@@ -75,4 +74,3 @@ ko.isWriteableObservable = instance => {
 ko.exportSymbol('observable', ko.observable);
 ko.exportSymbol('isObservable', ko.isObservable);
 ko.exportSymbol('observable.fn', observableFn);
-ko.exportProperty(observableFn, 'valueHasMutated', observableFn.valueHasMutated);
diff --git a/vendors/knockout/src/subscribables/observableArray.changeTracking.js b/vendors/knockout/src/subscribables/observableArray.changeTracking.js
index f79a0961f..10da15c77 100644
--- a/vendors/knockout/src/subscribables/observableArray.changeTracking.js
+++ b/vendors/knockout/src/subscribables/observableArray.changeTracking.js
@@ -1,8 +1,8 @@
 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 (options && typeof options == "object") {
+    if (typeof options == "object") {
         ko.utils.extend(target.compareArrayOptions, options);
     }
     target.compareArrayOptions['sparse'] = true;
@@ -22,31 +22,44 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
 
     // Watch "subscribe" calls, and for array change events, ensure change tracking is enabled
     target.beforeSubscriptionAdd = event => {
-        if (underlyingBeforeSubscriptionAddFunction) {
-            underlyingBeforeSubscriptionAddFunction.call(target, event);
-        }
+        underlyingBeforeSubscriptionAddFunction?.call(target, event);
         if (event === arrayChangeEventName) {
             trackChanges();
         }
     };
     // Watch "dispose" calls, and for array change events, ensure change tracking is disabled when all are disposed
     target.afterSubscriptionRemove = event => {
-        if (underlyingAfterSubscriptionRemoveFunction) {
-            underlyingAfterSubscriptionRemoveFunction.call(target, event);
-        }
+        underlyingAfterSubscriptionRemoveFunction?.call(target, event);
         if (event === arrayChangeEventName && !target.hasSubscriptionsForEvent(arrayChangeEventName)) {
-            if (changeSubscription) {
-                changeSubscription.dispose();
-            }
-            if (spectateSubscription) {
-                spectateSubscription.dispose();
-            }
+            changeSubscription?.['dispose']();
+            spectateSubscription?.['dispose']();
             spectateSubscription = changeSubscription = null;
             trackingChanges = false;
             previousContents = undefined;
         }
     };
 
+    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);
+            }
+
+            // 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);
+            }
+        }
+    }
+
     function trackChanges() {
         if (trackingChanges) {
             // Whenever there's a new subscription and there are pending notifications, make sure all previous
@@ -58,34 +71,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);
-
-        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);
-                }
-
-                // Eliminate references to the old, removed items, so they can be GCed
-                previousContents = currentContents;
-                cachedDiff = null;
-                pendingChanges = 0;
-
-                if (changes && changes.length) {
-                    target.notifySubscribers(changes, arrayChangeEventName);
-                }
-            }
-        }
+        changeSubscription = target['subscribe'](notifyChanges);
     }
 
     function getChanges(previousContents, currentContents) {
@@ -109,16 +101,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;
@@ -126,20 +117,19 @@ ko.extenders['trackArrayChanges'] = (target, options) => {
             case 'pop':
                 offset = arrayLength - 1;
             case 'shift':
-                if (arrayLength) {
-                    pushDiff('deleted', rawArray[offset], offset);
-                }
+                arrayLength && pushDiff('deleted', rawArray[offset], offset);
                 break;
 
             case 'splice':
                 // Negative start index means 'from end of array'. After that we clamp to [0...arrayLength].
                 // See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice
-                var startIndex = Math.min(Math.max(0, args[0] < 0 ? arrayLength + args[0] : args[0]), arrayLength),
-                    endDeleteIndex = argsLength === 1 ? arrayLength : Math.min(startIndex + (args[1] || 0), arrayLength),
-                    endAddIndex = startIndex + argsLength - 2,
+                var index = Math.min(Math.max(0, args[0] < 0 ? arrayLength + args[0] : args[0]), arrayLength),
+                    endDeleteIndex = argsLength === 1 ? arrayLength : Math.min(index + (args[1] || 0), arrayLength),
+                    endAddIndex = index + argsLength - 2,
                     endIndex = Math.max(endDeleteIndex, endAddIndex),
-                    additions = [], deletions = [];
-                for (let index = startIndex, argsIndex = 2; index < endIndex; ++index, ++argsIndex) {
+                    additions = [], deletions = [],
+                    argsIndex = 2;
+                for (; index < endIndex; ++index, ++argsIndex) {
                     if (index < endDeleteIndex)
                         deletions.push(pushDiff('deleted', rawArray[index], index));
                     if (index < endAddIndex)
diff --git a/vendors/knockout/src/subscribables/observableArray.js b/vendors/knockout/src/subscribables/observableArray.js
index 76a0ea89f..1c7faf161 100644
--- a/vendors/knockout/src/subscribables/observableArray.js
+++ b/vendors/knockout/src/subscribables/observableArray.js
@@ -1,16 +1,19 @@
-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)
@@ -27,13 +30,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 => {
@@ -44,31 +43,24 @@ 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]);
diff --git a/vendors/knockout/src/subscribables/subscribable.js b/vendors/knockout/src/subscribables/subscribable.js
index a80867669..370600811 100644
--- a/vendors/knockout/src/subscribables/subscribable.js
+++ b/vendors/knockout/src/subscribables/subscribable.js
@@ -8,15 +8,13 @@ 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) {
-            if (self._domNodeDisposalCallback) {
-                ko.utils.domNodeDisposal.removeDisposeCallback(self._node, self._domNodeDisposalCallback);
-            }
+            self._domNodeDisposalCallback
+            && ko.utils.domNodeDisposal.removeDisposeCallback(self._node, self._domNodeDisposalCallback);
             self._isDisposed = true;
             self._disposeCallback();
 
@@ -27,25 +25,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;
@@ -53,21 +55,18 @@ var ko_subscribable_fn = {
 
         var subscription = new koSubscription(self, boundCallback, () => {
             self._subscriptions.get(event).delete(subscription);
-            if (self.afterSubscriptionRemove)
-                self.afterSubscriptionRemove(event);
+            self.afterSubscriptionRemove?.(event);
         });
 
-        if (self.beforeSubscriptionAdd)
-            self.beforeSubscriptionAdd(event);
+        self.beforeSubscriptionAdd?.(event);
 
-        if (!self._subscriptions.has(event))
-            self._subscriptions.set(event, new Set);
+        self._subscriptions.has(event) || self._subscriptions.set(event, new Set);
         self._subscriptions.get(event).add(subscription);
 
         return subscription;
     },
 
-    notifySubscribers: function (valueToNotify, event) {
+    notifySubscribers(valueToNotify, event) {
         event = event || defaultEvent;
         if (event === defaultEvent) {
             this.updateVersion();
@@ -87,19 +86,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';
@@ -107,13 +106,13 @@ var ko_subscribable_fn = {
         if (!self._origNotifySubscribers) {
             self._origNotifySubscribers = self.notifySubscribers;
             // Moved out of "limit" to avoid the extra closure
-            self.notifySubscribers = function(value, event) {
+            self.notifySubscribers = (value, event) => {
                 if (!event || event === defaultEvent) {
-                    this._limitChange(value);
-                } else if (event === 'beforeChange') {
-                    this._limitBeforeChange(value);
+                    self._limitChange(value);
+                } else if (event === beforeChange) {
+                    self._limitBeforeChange(value);
                 } else {
-                    this._origNotifySubscribers(value, event);
+                    self._origNotifySubscribers(value, event);
                 }
             }
         }
@@ -160,21 +159,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;
                 }
@@ -184,17 +183,11 @@ 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 =>
-    instance != null && typeof instance.subscribe == "function" && typeof instance.notifySubscribers == "function";
+    typeof instance?.['subscribe'] == "function" && typeof instance.notifySubscribers == "function";
diff --git a/vendors/knockout/src/tasks.js b/vendors/knockout/src/tasks.js
index 76282d7a7..60a28fbef 100644
--- a/vendors/knockout/src/tasks.js
+++ b/vendors/knockout/src/tasks.js
@@ -1,18 +1,9 @@
 ko.tasks = (() => {
     var taskQueue = [],
         taskQueueLength = 0,
-        nextHandle = 1,
         nextIndexToProcess = 0,
 
-    // Chrome 27+, Firefox 14+, IE 11+, Opera 15+, Safari 6.1+
-    // From https://github.com/petkaantonov/bluebird * Copyright (c) 2014 Petka Antonov * License: MIT
-    scheduler = (callback => {
-        var div = document.createElement("div");
-        new MutationObserver(callback).observe(div, {attributes: true});
-        return () => div.classList.toggle("foo");
-    })(scheduledProcess);
-
-    function processTasks() {
+    processTasks = () => {
         if (taskQueueLength) {
             // Each mark represents the end of a logical group of tasks and the number of these groups is
             // limited to prevent unchecked recursion.
@@ -39,32 +30,28 @@ ko.tasks = (() => {
                 }
             }
         }
-    }
+    },
 
-    function scheduledProcess() {
+    scheduledProcess = () => {
         processTasks();
 
         // Reset the queue
         nextIndexToProcess = taskQueueLength = taskQueue.length = 0;
-    }
+    },
 
-    var tasks = {
+    // Chrome 27+, Firefox 14+, IE 11+, Opera 15+, Safari 6.1+
+    // From https://github.com/petkaantonov/bluebird * Copyright (c) 2014 Petka Antonov * License: MIT
+    scheduler = (callback => {
+        var div = document.createElement("div");
+        new MutationObserver(callback).observe(div, {attributes: true});
+        return () => div.classList.toggle("foo");
+    })(scheduledProcess);
+
+    return {
         schedule: func => {
-            if (!taskQueueLength) {
-                scheduler(scheduledProcess);
-            }
+            taskQueueLength || scheduler(scheduledProcess);
 
             taskQueue[taskQueueLength++] = func;
-            return nextHandle++;
-        },
-
-        cancel: handle => {
-            var index = handle - (nextHandle - taskQueueLength);
-            if (index >= nextIndexToProcess && index < taskQueueLength) {
-                taskQueue[index] = null;
-            }
         }
     };
-
-    return tasks;
 })();
diff --git a/vendors/knockout/src/templating/templating.js b/vendors/knockout/src/templating/templating.js
index e8aa8d1f9..4d4c1b2fd 100644
--- a/vendors/knockout/src/templating/templating.js
+++ b/vendors/knockout/src/templating/templating.js
@@ -1,5 +1,5 @@
 (() => {
-    var renderTemplateSource = templateSource => {
+    const renderTemplateSource = templateSource => {
             var templateNodes = templateSource.nodes ? templateSource.nodes() : null;
             return templateNodes
                 ? [...templateNodes.cloneNode(true).childNodes]
@@ -12,14 +12,14 @@
                 templateDocument = templateDocument || document;
                 var elem = templateDocument.getElementById(template);
                 if (!elem)
-                    throw new Error("Cannot find template with ID " + template);
+                    throw Error("Cannot find template with ID " + template);
                 return new ko.templateSources.domElement(elem);
             }
             if ([1,8].includes(template.nodeType)) {
                 // Anonymous template
                 return new ko.templateSources.anonymousTemplate(template);
             }
-            throw new Error("Unknown template type: " + template);
+            throw Error("Unknown template type: " + template);
         },
 
         invokeForEachNodeInContinuousRange = (firstNode, lastNode, action) => {
@@ -28,173 +28,150 @@
                 nextInQueue = ko.virtualElements.nextSibling(node);
                 action(node, nextInQueue);
             }
-        };
+        },
 
-    function activateBindingsOnContinuousNodeArray(continuousNodeArray, bindingContext) {
-        // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
-        // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
-        // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
-        // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
-        // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
+        activateBindingsOnContinuousNodeArray = (continuousNodeArray, bindingContext) => {
+            // To be used on any nodes that have been rendered by a template and have been inserted into some parent element
+            // Walks through continuousNodeArray (which *must* be continuous, i.e., an uninterrupted sequence of sibling nodes, because
+            // the algorithm for walking them relies on this), and for each top-level item in the virtual-element sense,
+            // (1) Does a regular "applyBindings" to associate bindingContext with this node and to activate any non-memoized bindings
+            // (2) Unmemoizes any memos in the DOM subtree (e.g., to activate bindings that had been memoized during template rewriting)
 
-        if (continuousNodeArray.length) {
-            var firstNode = continuousNodeArray[0],
-                lastNode = continuousNodeArray[continuousNodeArray.length - 1],
-                parentNode = firstNode.parentNode;
+            if (continuousNodeArray.length) {
+                var firstNode = continuousNodeArray[0],
+                    lastNode = continuousNodeArray[continuousNodeArray.length - 1],
+                    parentNode = firstNode.parentNode;
 
-            // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
-            // whereas a regular applyBindings won't introduce new memoized nodes
-            invokeForEachNodeInContinuousRange(firstNode, lastNode, node => {
-                if (node.nodeType === 1 || node.nodeType === 8)
-                    ko.applyBindings(bindingContext, node);
-            });
+                // Need to applyBindings *before* unmemoziation, because unmemoization might introduce extra nodes (that we don't want to re-bind)
+                // whereas a regular applyBindings won't introduce new memoized nodes
+                invokeForEachNodeInContinuousRange(firstNode, lastNode, node =>
+                    (node.nodeType === 1 || node.nodeType === 8) && ko.applyBindings(bindingContext, node)
+                );
 
-            // Make sure any changes done by applyBindings or unmemoize are reflected in the array
-            ko.utils.fixUpContinuousNodeArray(continuousNodeArray, parentNode);
-        }
-    }
+                // Make sure any changes done by applyBindings or unmemoize are reflected in the array
+                ko.utils.fixUpContinuousNodeArray(continuousNodeArray, parentNode);
+            }
+        },
 
-    function getFirstNodeFromPossibleArray(nodeOrNodeArray) {
-        return nodeOrNodeArray.nodeType ? nodeOrNodeArray
-                                        : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
-                                        : null;
-    }
+        getFirstNodeFromPossibleArray = (nodeOrNodeArray) => {
+            return nodeOrNodeArray.nodeType ? nodeOrNodeArray
+                                            : nodeOrNodeArray.length > 0 ? nodeOrNodeArray[0]
+                                            : null;
+        },
 
-    function executeTemplate(targetNodeOrNodeArray, renderMode, template, bindingContext) {
-        var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
-        var templateDocument = (firstTargetNode || template || {}).ownerDocument;
+        executeTemplate = (targetNodeOrNodeArray, replaceChildren, template, bindingContext) => {
+            var firstTargetNode = targetNodeOrNodeArray && getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+            var templateDocument = (firstTargetNode || template || {}).ownerDocument;
 
-        var renderedNodesArray = renderTemplateSource(makeTemplateSource(template, templateDocument));
+            var renderedNodesArray = renderTemplateSource(makeTemplateSource(template, templateDocument));
 
-        // Loosely check result is an array of DOM nodes
-        if ((typeof renderedNodesArray.length != "number") || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
-            throw new Error("Template engine must return an array of DOM nodes");
+            // Loosely check result is an array of DOM nodes
+            if (!Array.isArray(renderedNodesArray) || (renderedNodesArray.length > 0 && typeof renderedNodesArray[0].nodeType != "number"))
+                throw Error("Template engine must return an array of DOM nodes");
 
-        var haveAddedNodesToParent = false;
-        switch (renderMode) {
-            case "replaceChildren":
+            if (replaceChildren) {
                 ko.virtualElements.setDomNodeChildren(targetNodeOrNodeArray, renderedNodesArray);
-                haveAddedNodesToParent = true;
-                break;
-            case "ignoreTargetNode": break;
-            default:
-                throw new Error("Unknown renderMode: " + renderMode);
-        }
-
-        if (haveAddedNodesToParent) {
-            activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
-            if (renderMode == "replaceChildren") {
+                activateBindingsOnContinuousNodeArray(renderedNodesArray, bindingContext);
                 ko.bindingEvent.notify(targetNodeOrNodeArray, ko.bindingEvent.childrenComplete);
             }
-        }
 
-        return renderedNodesArray;
-    }
+            return renderedNodesArray;
+        },
 
-    function resolveTemplateName(template, data, context) {
-        // The template can be specified as:
-        if (ko.isObservable(template)) {
-            // 1. An observable, with string value
-            return template();
-        }
-        // 2. A function of (data, context) returning a string ELSE 3. A string
-        return (typeof template === 'function') ? template(data, context) : template;
-    }
+        resolveTemplateName = (template, data, context) => {
+            // The template can be specified as:
+            if (ko.isObservable(template)) {
+                // 1. An observable, with string value
+                return template();
+            }
+            // 2. A function of (data, context) returning a string ELSE 3. A string
+            return (typeof template === 'function') ? template(data, context) : template;
+        },
 
-    ko.renderTemplate = function (template, dataOrBindingContext, options, targetNodeOrNodeArray, renderMode) {
-        options = options || {};
-        renderMode = renderMode || "replaceChildren";
+        renderTemplate = (template, dataOrBindingContext, options, targetNodeOrNodeArray) => {
+            options = options || {};
 
-        if (targetNodeOrNodeArray) {
-            var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
+            if (targetNodeOrNodeArray) {
+                var firstTargetNode = getFirstNodeFromPossibleArray(targetNodeOrNodeArray);
 
-            var whenToDispose = () => (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); // Passive disposal (on next evaluation)
+                var whenToDispose = () => (!firstTargetNode) || !ko.utils.domNodeIsAttachedToDocument(firstTargetNode); // Passive disposal (on next evaluation)
 
-            return ko.computed( // So the DOM is automatically updated when any dependency changes
-                () => {
-                    // Ensure we've got a proper binding context to work with
-                    var bindingContext = (dataOrBindingContext && (dataOrBindingContext instanceof ko.bindingContext))
-                        ? dataOrBindingContext
-                        : new ko.bindingContext(dataOrBindingContext, null, null, null, { "exportDependencies": true });
+                return ko.computed( // So the DOM is automatically updated when any dependency changes
+                    () => {
+                        // Ensure we've got a proper binding context to work with
+                        var bindingContext = (dataOrBindingContext instanceof ko.bindingContext)
+                            ? dataOrBindingContext
+                            : new ko.bindingContext(dataOrBindingContext, null, null, { "exportDependencies": true });
 
-                    var templateName = resolveTemplateName(template, bindingContext['$data'], bindingContext);
-                    executeTemplate(targetNodeOrNodeArray, renderMode, templateName, bindingContext, options);
-                },
-                { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: firstTargetNode }
-            );
-        } else {
-            console.log('no targetNodeOrNodeArray');
-        }
-    };
+                        var templateName = resolveTemplateName(template, bindingContext['$data'], bindingContext);
+                        executeTemplate(targetNodeOrNodeArray, true, templateName, bindingContext, options);
+                    },
+                    { disposeWhen: whenToDispose, disposeWhenNodeIsRemoved: firstTargetNode }
+                );
+            } else {
+                console.log('no targetNodeOrNodeArray');
+            }
+        },
 
-    ko.renderTemplateForEach = (template, arrayOrObservableArray, options, targetNode, parentBindingContext) => {
-        // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
-        // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
-        var arrayItemContext, asName = options['as'];
+        renderTemplateForEach = (template, arrayOrObservableArray, options, targetNode, parentBindingContext) => {
+            // Since setDomNodeChildrenFromArrayMapping always calls executeTemplateForArrayItem and then
+            // activateBindingsCallback for added items, we can store the binding context in the former to use in the latter.
+            var arrayItemContext;
 
-        // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
-        var executeTemplateForArrayItem = (arrayValue, index) => {
-            // Support selecting template as a function of the data being rendered
-            arrayItemContext = parentBindingContext['createChildContext'](arrayValue, {
-                'as': asName,
-                'extend': context => {
-                    context['$index'] = index;
-                    if (asName) {
-                        context[asName + "Index"] = index;
-                    }
-                }
-            });
+            // This will be called by setDomNodeChildrenFromArrayMapping to get the nodes to add to targetNode
+            var executeTemplateForArrayItem = (arrayValue, index) => {
+                // Support selecting template as a function of the data being rendered
+                arrayItemContext = parentBindingContext['createChildContext'](arrayValue, {
+                    'extend': context => context['$index'] = index
+                });
 
-            var templateName = resolveTemplateName(template, arrayValue, arrayItemContext);
-            return executeTemplate(targetNode, "ignoreTargetNode", templateName, arrayItemContext, options);
-        };
+                var templateName = resolveTemplateName(template, arrayValue, arrayItemContext);
+                return executeTemplate(targetNode, false, templateName, arrayItemContext, options);
+            };
 
-        // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
-        var activateBindingsCallback = (arrayValue, addedNodesArray) => {
-            activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
+            // This will be called whenever setDomNodeChildrenFromArrayMapping has added nodes to targetNode
+            var activateBindingsCallback = (arrayValue, addedNodesArray) => {
+                activateBindingsOnContinuousNodeArray(addedNodesArray, arrayItemContext);
 
-            // release the "cache" variable, so that it can be collected by
-            // the GC when its value isn't used from within the bindings anymore.
-            arrayItemContext = null;
-        };
+                // release the "cache" variable, so that it can be collected by
+                // the GC when its value isn't used from within the bindings anymore.
+                arrayItemContext = null;
+            };
 
-        var setDomNodeChildrenFromArrayMapping = function (newArray, changeList) {
-            // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
-            // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
-            ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, newArray, executeTemplateForArrayItem, options, activateBindingsCallback, changeList]);
-            ko.bindingEvent.notify(targetNode, ko.bindingEvent.childrenComplete);
-        };
+            var setDomNodeChildrenFromArrayMapping = (newArray, changeList) => {
+                // Call setDomNodeChildrenFromArrayMapping, ignoring any observables unwrapped within (most likely from a callback function).
+                // If the array items are observables, though, they will be unwrapped in executeTemplateForArrayItem and managed within setDomNodeChildrenFromArrayMapping.
+                ko.dependencyDetection.ignore(ko.utils.setDomNodeChildrenFromArrayMapping, null, [targetNode, newArray, executeTemplateForArrayItem, options, activateBindingsCallback, changeList]);
+                ko.bindingEvent.notify(targetNode, ko.bindingEvent.childrenComplete);
+            };
 
-        if (!options['beforeRemove'] && ko.isObservableArray(arrayOrObservableArray)) {
-            setDomNodeChildrenFromArrayMapping(arrayOrObservableArray.peek());
+            if (ko['isObservableArray'](arrayOrObservableArray)) {
+                setDomNodeChildrenFromArrayMapping(arrayOrObservableArray.peek());
 
-            var subscription = arrayOrObservableArray.subscribe(changeList => {
-                setDomNodeChildrenFromArrayMapping(arrayOrObservableArray(), changeList);
-            }, null, "arrayChange");
-            subscription.disposeWhenNodeIsRemoved(targetNode);
+                var subscription = arrayOrObservableArray['subscribe'](changeList => {
+                    setDomNodeChildrenFromArrayMapping(arrayOrObservableArray(), changeList);
+                }, null, "arrayChange");
+                subscription.disposeWhenNodeIsRemoved(targetNode);
 
-            return subscription;
-        } else {
+                return subscription;
+            }
             return ko.computed(() => {
                 var unwrappedArray = ko.utils.unwrapObservable(arrayOrObservableArray) || [];
-                if (typeof unwrappedArray.length == "undefined") // Coerce single value into array
+                if (!Array.isArray(unwrappedArray)) // Coerce single value into array
                     unwrappedArray = [unwrappedArray];
 
                 setDomNodeChildrenFromArrayMapping(unwrappedArray);
 
             }, { disposeWhenNodeIsRemoved: targetNode });
-        }
-    };
+        },
 
-    var templateComputedDomDataKey = ko.utils.domData.nextKey();
-    function disposeOldComputedAndStoreNewOne(element, newComputed) {
-        var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
-        if (oldComputed && (typeof(oldComputed.dispose) == 'function'))
-            oldComputed.dispose();
-        ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && (!newComputed.isActive || newComputed.isActive())) ? newComputed : undefined);
-    }
+        templateComputedDomDataKey = ko.utils.domData.nextKey(),
+        disposeOldComputedAndStoreNewOne = (element, newComputed) => {
+            var oldComputed = ko.utils.domData.get(element, templateComputedDomDataKey);
+            oldComputed?.['dispose']?.();
+            ko.utils.domData.set(element, templateComputedDomDataKey, (newComputed && (!newComputed.isActive || newComputed.isActive())) ? newComputed : undefined);
+        };
 
-    var cleanContainerDomDataKey = ko.utils.domData.nextKey();
     ko.bindingHandlers['template'] = {
         'init': (element, valueAccessor) => {
             // Support anonymous templates
@@ -202,33 +179,14 @@
             if (typeof bindingValue == "string" || 'name' in bindingValue) {
                 // It's a named template - clear the element
                 ko.virtualElements.emptyNode(element);
-            } else if ('nodes' in bindingValue) {
-                // We've been given an array of DOM nodes. Save them as the template source.
-                // There is no known use case for the node array being an observable array (if the output
-                // varies, put that behavior *into* your template - that's what templates are for), and
-                // the implementation would be a mess, so assert that it's not observable.
-                var nodes = bindingValue['nodes'] || [];
-                if (ko.isObservable(nodes)) {
-                    throw new Error('The "nodes" option must be a plain, non-observable array.');
-                }
-
-                // If the nodes are already attached to a KO-generated container, we reuse that container without moving the
-                // elements to a new one (we check only the first node, as the nodes are always moved together)
-                let container = nodes[0] && nodes[0].parentNode;
-                if (!container || !ko.utils.domData.get(container, cleanContainerDomDataKey)) {
-                    container = ko.utils.moveCleanedNodesToContainerElement(nodes);
-                    ko.utils.domData.set(container, cleanContainerDomDataKey, true);
-                }
-
-                new ko.templateSources.anonymousTemplate(element).nodes(container);
             } else {
                 // It's an anonymous template - store the element contents, then clear the element
                 var templateNodes = ko.virtualElements.childNodes(element);
-                if (templateNodes.length > 0) {
+                if (templateNodes.length) {
                     let container = ko.utils.moveCleanedNodesToContainerElement(templateNodes); // This also removes the nodes from their current parent
                     new ko.templateSources.anonymousTemplate(element).nodes(container);
                 } else {
-                    throw new Error("Anonymous template defined, but no template content was provided");
+                    throw Error("Anonymous template defined, but no template content was provided");
                 }
             }
             return { 'controlsDescendantBindings': true };
@@ -245,23 +203,14 @@
                 options = {};
             } else {
                 template = 'name' in options ? options['name'] : element;
-
-                // Support "if"/"ifnot" conditions
-                if ('if' in options)
-                    shouldDisplay = ko.utils.unwrapObservable(options['if']);
-                if (shouldDisplay && 'ifnot' in options)
-                    shouldDisplay = !ko.utils.unwrapObservable(options['ifnot']);
-
-                // Don't show anything if an empty name is given (see #2446)
-                if (shouldDisplay && !template) {
-                    shouldDisplay = false;
-                }
             }
 
+            // Don't show anything if an empty name is given (see #2446)
+            shouldDisplay = !!template;
+
             if ('foreach' in options) {
                 // Render once for each data point (treating data set as empty if shouldDisplay==false)
-                var dataArray = (shouldDisplay && options['foreach']) || [];
-                templateComputed = ko.renderTemplateForEach(template, dataArray, options, element, bindingContext);
+                templateComputed = renderTemplateForEach(template, (shouldDisplay && options['foreach']) || [], options, element, bindingContext);
             } else if (!shouldDisplay) {
                 ko.virtualElements.emptyNode(element);
             } else {
@@ -269,11 +218,10 @@
                 var innerBindingContext = bindingContext;
                 if ('data' in options) {
                     innerBindingContext = bindingContext['createChildContext'](options['data'], {
-                        'as': options['as'],
                         'exportDependencies': true
                     });
                 }
-                templateComputed = ko.renderTemplate(template, innerBindingContext, options, element);
+                templateComputed = renderTemplate(template, innerBindingContext, options, element);
             }
 
             // It only makes sense to have a single template computed per element (otherwise which one should have its output displayed?)
@@ -281,17 +229,5 @@
         }
     };
 
-    // Anonymous templates can't be rewritten. Give a nice error message if you try to do it.
-    ko.expressionRewriting.bindingRewriteValidators['template'] = bindingValue => {
-        var parsedBindingValue = ko.expressionRewriting.parseObjectLiteral(bindingValue);
-
-        if ((parsedBindingValue.length == 1) && parsedBindingValue[0]['unknown'])
-            return null; // It looks like a string literal, not an object literal, so treat it as a named template (which is allowed for rewriting)
-
-        if (ko.expressionRewriting.keyValueArrayContainsKey(parsedBindingValue, "name"))
-            return null; // Named templates can be rewritten, so return "no error"
-        return "This template engine does not support anonymous templates nested within its templates";
-    };
-
     ko.virtualElements.allowedBindings['template'] = true;
 })();
diff --git a/vendors/knockout/src/utils.domData.js b/vendors/knockout/src/utils.domData.js
index 2d1a6d604..254702ab7 100644
--- a/vendors/knockout/src/utils.domData.js
+++ b/vendors/knockout/src/utils.domData.js
@@ -10,13 +10,11 @@ ko.utils.domData = {
         if (dataStore.has(node)) {
             dataStore.get(node)[key] = value;
         } else {
-            let dataForNode = {};
-            dataForNode[key] = value;
-            dataStore.set(node, dataForNode);
+            dataStore.set(node, {[key]:value});
         }
         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),
diff --git a/vendors/knockout/src/utils.domNodeDisposal.js b/vendors/knockout/src/utils.domNodeDisposal.js
index cb1902eca..92a7adfa8 100644
--- a/vendors/knockout/src/utils.domNodeDisposal.js
+++ b/vendors/knockout/src/utils.domNodeDisposal.js
@@ -47,7 +47,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);
         },
 
@@ -82,5 +82,5 @@ 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.exportSymbol('utils.domNodeDisposal', ko.utils.domNodeDisposal);
+ko.exportSymbol('addDisposeCallback', ko.utils.domNodeDisposal.addDisposeCallback);
diff --git a/vendors/knockout/src/utils.js b/vendors/knockout/src/utils.js
index 73999ec87..ce58dc9e5 100644
--- a/vendors/knockout/src/utils.js
+++ b/vendors/knockout/src/utils.js
@@ -4,12 +4,15 @@ ko.utils = {
     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
         // we don't want the underlying collection to change while we're doing that.
         var nodesArray = [...nodes];
-        var templateDocument = (nodesArray[0] && nodesArray[0].ownerDocument) || document;
+        var templateDocument = nodesArray[0]?.ownerDocument || document;
 
         var container = templateDocument.createElement('div');
         nodesArray.forEach(node => container.append(ko.cleanNode(node)));
@@ -22,6 +25,7 @@ ko.utils = {
             : node => node.cloneNode(true)),
 
     setDomNodeChildren: (domNode, childNodes) => {
+//        domNode.replaceChildren(...childNodes);
         ko.utils.emptyDomNode(domNode);
         childNodes && domNode.append(...childNodes);
     },
@@ -80,8 +84,8 @@ ko.utils = {
         node.ownerDocument.documentElement.contains(node.nodeType !== 1 ? node.parentNode : node),
 
     triggerEvent: (element, eventType) => {
-        if (!(element && element.nodeType))
-            throw new Error("element must be a DOM node when calling triggerEvent");
+        if (!element?.nodeType)
+            throw Error("element must be a DOM node when calling triggerEvent");
 
         element.dispatchEvent(new Event(eventType));
     },
@@ -89,8 +93,8 @@ 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
diff --git a/vendors/knockout/src/version.js b/vendors/knockout/src/version.js
index 9ce4dce44..324d9111c 100644
--- a/vendors/knockout/src/version.js
+++ b/vendors/knockout/src/version.js
@@ -1 +1 @@
-ko.exportSymbol('version', "##VERSION##");
+ko['version'] = "##VERSION##";
diff --git a/vendors/knockout/src/virtualElements.js b/vendors/knockout/src/virtualElements.js
index 4560773e9..a32807fd0 100644
--- a/vendors/knockout/src/virtualElements.js
+++ b/vendors/knockout/src/virtualElements.js
@@ -41,7 +41,7 @@
                 ++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;
     }
 
@@ -76,17 +76,15 @@
                 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 => {
@@ -96,7 +94,7 @@
             }
             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;
         },
diff --git a/vendors/marked/marked.js b/vendors/marked/marked.js
new file mode 100644
index 000000000..46ed21302
--- /dev/null
+++ b/vendors/marked/marked.js
@@ -0,0 +1,2483 @@
+/*eslint max-len: "off"*/
+/*eslint no-control-regex: "off"*/
+/**
+ * marked v14.0.0 - a markdown parser
+ * Copyright (c) 2011-2024, Christopher Jeffrey. (MIT Licensed)
+ * https://github.com/markedjs/marked
+ *
+ * modified for SnappyMail
+ */
+
+const marked = (() => {
+
+	/**
+	 * Gets the original marked default options.
+	 */
+	const _getDefaults = () => ({
+		async: false,
+		breaks: false,
+		extensions: null,
+		gfm: true,
+		hooks: null,
+		pedantic: false,
+		renderer: null,
+		silent: false,
+		tokenizer: null,
+		walkTokens: null,
+	});
+	var exports_defaults = _getDefaults();
+
+	/**
+	 * Helpers
+	 */
+	const escapeTest = /[&<>"']/;
+	const escapeReplace = new RegExp(escapeTest.source, 'g');
+	const escapeTestNoEncode = /[<>"']|&(?!(#\d{1,7}|#[Xx][a-fA-F0-9]{1,6}|\w+);)/;
+	const escapeReplaceNoEncode = new RegExp(escapeTestNoEncode.source, 'g');
+	const escapeReplacements = {
+		'&': '&amp;',
+		'<': '&lt;',
+		'>': '&gt;',
+		'"': '&quot;',
+		"'": '&#39;',
+	};
+	const getEscapeReplacement = (ch) => escapeReplacements[ch];
+	const escape$1 = (html, encode) => {
+		if (encode) {
+			if (escapeTest.test(html)) {
+				return html.replace(escapeReplace, getEscapeReplacement);
+			}
+		}
+		else {
+			if (escapeTestNoEncode.test(html)) {
+				return html.replace(escapeReplaceNoEncode, getEscapeReplacement);
+			}
+		}
+		return html;
+	};
+	const caret = /(^|[^[])\^/g;
+	const edit = (regex, opt) => {
+		let source = typeof regex === 'string' ? regex : regex.source;
+		opt = opt || '';
+		const obj = {
+			replace: (name, val) => {
+				let valSource = typeof val === 'string' ? val : val.source;
+				valSource = valSource.replace(caret, '$1');
+				source = source.replace(name, valSource);
+				return obj;
+			},
+			getRegex: () => {
+				return new RegExp(source, opt);
+			},
+		};
+		return obj;
+	};
+	const cleanUrl = (href) => {
+		try {
+			href = encodeURI(href).replace(/%25/g, '%');
+		}
+		catch {
+			return null;
+		}
+		return href;
+	};
+	const noopTest = { exec: () => null };
+	const splitCells = (tableRow, count) => {
+		// ensure that every cell-delimiting pipe has a space
+		// before it to distinguish it from an escaped pipe
+		const row = tableRow.replace(/\|/g, (match, offset, str) => {
+			let escaped = false;
+			let curr = offset;
+			while (--curr >= 0 && str[curr] === '\\')
+				escaped = !escaped;
+			if (escaped) {
+				// odd number of slashes means | is escaped
+				// so we leave it alone
+				return '|';
+			}
+			else {
+				// add space before unescaped |
+				return ' |';
+			}
+		}), cells = row.split(/ \|/);
+		let i = 0;
+		// First/last cell in a row cannot be empty if it has no leading/trailing pipe
+		if (!cells[0].trim()) {
+			cells.shift();
+		}
+		if (cells.length > 0 && !cells[cells.length - 1].trim()) {
+			cells.pop();
+		}
+		if (count) {
+			if (cells.length > count) {
+				cells.splice(count);
+			}
+			else {
+				while (cells.length < count)
+					cells.push('');
+			}
+		}
+		for (; i < cells.length; i++) {
+			// leading or trailing whitespace is ignored per the gfm spec
+			cells[i] = cells[i].trim().replace(/\\\|/g, '|');
+		}
+		return cells;
+	};
+	/**
+	 * Remove trailing 'c's. Equivalent to str.replace(/c*$/, '').
+	 * /c*$/ is vulnerable to REDOS.
+	 *
+	 * @param str
+	 * @param c
+	 * @param invert Remove suffix of non-c chars instead. Default falsey.
+	 */
+	const rtrim = (str, c, invert) => {
+		const l = str.length;
+		if (l === 0) {
+			return '';
+		}
+		// Length of suffix matching the invert condition.
+		let suffLen = 0;
+		// Step left until we fail to match the invert condition.
+		while (suffLen < l) {
+			const currChar = str.charAt(l - suffLen - 1);
+			if (currChar === c && !invert) {
+				suffLen++;
+			}
+			else if (currChar !== c && invert) {
+				suffLen++;
+			}
+			else {
+				break;
+			}
+		}
+		return str.slice(0, l - suffLen);
+	};
+	const findClosingBracket = (str, b) => {
+		if (str.indexOf(b[1]) === -1) {
+			return -1;
+		}
+		let level = 0;
+		for (let i = 0; i < str.length; i++) {
+			if (str[i] === '\\') {
+				i++;
+			}
+			else if (str[i] === b[0]) {
+				level++;
+			}
+			else if (str[i] === b[1]) {
+				level--;
+				if (level < 0) {
+					return i;
+				}
+			}
+		}
+		return -1;
+	};
+
+	const outputLink = (cap, link, raw, lexer) => {
+		const href = link.href;
+		const title = link.title ? escape$1(link.title) : null;
+		const text = cap[1].replace(/\\([[\]])/g, '$1');
+		if (cap[0].charAt(0) !== '!') {
+			lexer.state.inLink = true;
+			const token = {
+				type: 'link',
+				raw,
+				href,
+				title,
+				text,
+				tokens: lexer.inlineTokens(text),
+			};
+			lexer.state.inLink = false;
+			return token;
+		}
+		return {
+			type: 'image',
+			raw,
+			href,
+			title,
+			text: escape$1(text),
+		};
+	};
+	const indentCodeCompensation = (raw, text) => {
+		const matchIndentToCode = raw.match(/^(\s+)(?:```)/);
+		if (matchIndentToCode === null) {
+			return text;
+		}
+		const indentToCode = matchIndentToCode[1];
+		return text
+			.split('\n')
+			.map(node => {
+			const matchIndentInNode = node.match(/^\s+/);
+			if (matchIndentInNode === null) {
+				return node;
+			}
+			const [indentInNode] = matchIndentInNode;
+			if (indentInNode.length >= indentToCode.length) {
+				return node.slice(indentToCode.length);
+			}
+			return node;
+		})
+			.join('\n');
+	};
+
+	/**
+	 * Tokenizer
+	 */
+	class _Tokenizer {
+		constructor(options) {
+			this.options = options || exports_defaults;
+//			this.rules; // set by the lexer
+//			this.lexer; // set by the lexer
+		}
+		space(src) {
+			const cap = this.rules.block.newline.exec(src);
+			if (cap && cap[0].length > 0) {
+				return {
+					type: 'space',
+					raw: cap[0],
+				};
+			}
+		}
+		code(src) {
+			const cap = this.rules.block.code.exec(src);
+			if (cap) {
+				const text = cap[0].replace(/^ {1,4}/gm, '');
+				return {
+					type: 'code',
+					raw: cap[0],
+					codeBlockStyle: 'indented',
+					text: !this.options.pedantic
+						? rtrim(text, '\n')
+						: text,
+				};
+			}
+		}
+		fences(src) {
+			const cap = this.rules.block.fences.exec(src);
+			if (cap) {
+				const raw = cap[0];
+				const text = indentCodeCompensation(raw, cap[3] || '');
+				return {
+					type: 'code',
+					raw,
+					lang: cap[2] ? cap[2].trim().replace(this.rules.inline.anyPunctuation, '$1') : cap[2],
+					text,
+				};
+			}
+		}
+		heading(src) {
+			const cap = this.rules.block.heading.exec(src);
+			if (cap) {
+				let text = cap[2].trim();
+				// remove trailing #s
+				if (/#$/.test(text)) {
+					const trimmed = rtrim(text, '#');
+					if (this.options.pedantic) {
+						text = trimmed.trim();
+					}
+					else if (!trimmed || / $/.test(trimmed)) {
+						// CommonMark requires space before trailing #s
+						text = trimmed.trim();
+					}
+				}
+				return {
+					type: 'heading',
+					raw: cap[0],
+					depth: cap[1].length,
+					text,
+					tokens: this.lexer.inline(text),
+				};
+			}
+		}
+		hr(src) {
+			const cap = this.rules.block.hr.exec(src);
+			if (cap) {
+				return {
+					type: 'hr',
+					raw: rtrim(cap[0], '\n'),
+				};
+			}
+		}
+		blockquote(src) {
+			const cap = this.rules.block.blockquote.exec(src);
+			if (cap) {
+				let lines = rtrim(cap[0], '\n').split('\n');
+				let raw = '';
+				let text = '';
+				const tokens = [];
+				while (lines.length > 0) {
+					let inBlockquote = false;
+					const currentLines = [];
+					let i;
+					for (i = 0; i < lines.length; i++) {
+						// get lines up to a continuation
+						if (/^ {0,3}>/.test(lines[i])) {
+							currentLines.push(lines[i]);
+							inBlockquote = true;
+						}
+						else if (!inBlockquote) {
+							currentLines.push(lines[i]);
+						}
+						else {
+							break;
+						}
+					}
+					lines = lines.slice(i);
+					const currentRaw = currentLines.join('\n');
+					const currentText = currentRaw
+						// precede setext continuation with 4 spaces so it isn't a setext
+						.replace(/\n {0,3}((?:=+|-+) *)(?=\n|$)/g, '\n    $1')
+						.replace(/^ {0,3}>[ \t]?/gm, '');
+					raw = raw ? `${raw}\n${currentRaw}` : currentRaw;
+					text = text ? `${text}\n${currentText}` : currentText;
+					// parse blockquote lines as top level tokens
+					// merge paragraphs if this is a continuation
+					const top = this.lexer.state.top;
+					this.lexer.state.top = true;
+					this.lexer.blockTokens(currentText, tokens, true);
+					this.lexer.state.top = top;
+					// if there is no continuation then we are done
+					if (lines.length === 0) {
+						break;
+					}
+					const lastToken = tokens[tokens.length - 1];
+					if (lastToken?.type === 'code') {
+						// blockquote continuation cannot be preceded by a code block
+						break;
+					}
+					else if (lastToken?.type === 'blockquote') {
+						// include continuation in nested blockquote
+						const oldToken = lastToken;
+						const newText = oldToken.raw + '\n' + lines.join('\n');
+						const newToken = this.blockquote(newText);
+						tokens[tokens.length - 1] = newToken;
+						raw = raw.substring(0, raw.length - oldToken.raw.length) + newToken.raw;
+						text = text.substring(0, text.length - oldToken.text.length) + newToken.text;
+						break;
+					}
+					else if (lastToken?.type === 'list') {
+						// include continuation in nested list
+						const oldToken = lastToken;
+						const newText = oldToken.raw + '\n' + lines.join('\n');
+						const newToken = this.list(newText);
+						tokens[tokens.length - 1] = newToken;
+						raw = raw.substring(0, raw.length - lastToken.raw.length) + newToken.raw;
+						text = text.substring(0, text.length - oldToken.raw.length) + newToken.raw;
+						lines = newText.substring(tokens[tokens.length - 1].raw.length).split('\n');
+						continue;
+					}
+				}
+				return {
+					type: 'blockquote',
+					raw,
+					tokens,
+					text,
+				};
+			}
+		}
+		list(src) {
+			let cap = this.rules.block.list.exec(src);
+			if (cap) {
+				let bull = cap[1].trim();
+				const isordered = bull.length > 1;
+				const list = {
+					type: 'list',
+					raw: '',
+					ordered: isordered,
+					start: isordered ? +bull.slice(0, -1) : '',
+					loose: false,
+					items: [],
+				};
+				bull = isordered ? `\\d{1,9}\\${bull.slice(-1)}` : `\\${bull}`;
+				if (this.options.pedantic) {
+					bull = isordered ? bull : '[*+-]';
+				}
+				// Get next list item
+				const itemRegex = new RegExp(`^( {0,3}${bull})((?:[\t ][^\\n]*)?(?:\\n|$))`);
+				let endsWithBlankLine = false;
+				// Check if current bullet point can start a new List Item
+				while (src) {
+					let endEarly = false;
+					let raw = '';
+					let itemContents = '';
+					if (!(cap = itemRegex.exec(src))) {
+						break;
+					}
+					if (this.rules.block.hr.test(src)) { // End list if bullet was actually HR (possibly move into itemRegex?)
+						break;
+					}
+					raw = cap[0];
+					src = src.substring(raw.length);
+					let line = cap[2].split('\n', 1)[0].replace(/^\t+/, (t) => ' '.repeat(3 * t.length));
+					let nextLine = src.split('\n', 1)[0];
+					let blankLine = !line.trim();
+					let indent = 0;
+					if (this.options.pedantic) {
+						indent = 2;
+						itemContents = line.trimStart();
+					}
+					else if (blankLine) {
+						indent = cap[1].length + 1;
+					}
+					else {
+						indent = cap[2].search(/[^ ]/); // Find first non-space char
+						indent = indent > 4 ? 1 : indent; // Treat indented code blocks (> 4 spaces) as having only 1 indent
+						itemContents = line.slice(indent);
+						indent += cap[1].length;
+					}
+					if (blankLine && /^ *$/.test(nextLine)) { // Items begin with at most one blank line
+						raw += nextLine + '\n';
+						src = src.substring(nextLine.length + 1);
+						endEarly = true;
+					}
+					if (!endEarly) {
+						const nextBulletRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:[*+-]|\\d{1,9}[.)])((?:[ \t][^\\n]*)?(?:\\n|$))`);
+						const hrRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}((?:- *){3,}|(?:_ *){3,}|(?:\\* *){3,})(?:\\n+|$)`);
+						const fencesBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}(?:\`\`\`|~~~)`); //`
+						const headingBeginRegex = new RegExp(`^ {0,${Math.min(3, indent - 1)}}#`);
+						// Check if following lines should be included in List Item
+						while (src) {
+							const rawLine = src.split('\n', 1)[0];
+							nextLine = rawLine;
+							// Re-align to follow commonmark nesting rules
+							if (this.options.pedantic) {
+								nextLine = nextLine.replace(/^ {1,4}(?=( {4})*[^ ])/g, '  ');
+							}
+							// End list item if found code fences
+							if (fencesBeginRegex.test(nextLine)) {
+								break;
+							}
+							// End list item if found start of new heading
+							if (headingBeginRegex.test(nextLine)) {
+								break;
+							}
+							// End list item if found start of new bullet
+							if (nextBulletRegex.test(nextLine)) {
+								break;
+							}
+							// Horizontal rule found
+							if (hrRegex.test(src)) {
+								break;
+							}
+							if (nextLine.search(/[^ ]/) >= indent || !nextLine.trim()) { // Dedent if possible
+								itemContents += '\n' + nextLine.slice(indent);
+							}
+							else {
+								// not enough indentation
+								if (blankLine) {
+									break;
+								}
+								// paragraph continuation unless last line was a different block level element
+								if (line.search(/[^ ]/) >= 4) { // indented code block
+									break;
+								}
+								if (fencesBeginRegex.test(line)) {
+									break;
+								}
+								if (headingBeginRegex.test(line)) {
+									break;
+								}
+								if (hrRegex.test(line)) {
+									break;
+								}
+								itemContents += '\n' + nextLine;
+							}
+							if (!blankLine && !nextLine.trim()) { // Check if current line is blank
+								blankLine = true;
+							}
+							raw += rawLine + '\n';
+							src = src.substring(rawLine.length + 1);
+							line = nextLine.slice(indent);
+						}
+					}
+					if (!list.loose) {
+						// If the previous item ended with a blank line, the list is loose
+						if (endsWithBlankLine) {
+							list.loose = true;
+						}
+						else if (/\n *\n *$/.test(raw)) {
+							endsWithBlankLine = true;
+						}
+					}
+					let istask = null;
+					let ischecked;
+					// Check for task list items
+					if (this.options.gfm) {
+						istask = /^\[[ xX]\] /.exec(itemContents);
+						if (istask) {
+							ischecked = istask[0] !== '[ ] ';
+							itemContents = itemContents.replace(/^\[[ xX]\] +/, '');
+						}
+					}
+					list.items.push({
+						type: 'list_item',
+						raw,
+						task: !!istask,
+						checked: ischecked,
+						loose: false,
+						text: itemContents,
+						tokens: [],
+					});
+					list.raw += raw;
+				}
+				// Do not consume newlines at end of final item. Alternatively, make itemRegex *start* with any newlines to simplify/speed up endsWithBlankLine logic
+				list.items[list.items.length - 1].raw = list.items[list.items.length - 1].raw.trimEnd();
+				list.items[list.items.length - 1].text = list.items[list.items.length - 1].text.trimEnd();
+				list.raw = list.raw.trimEnd();
+				// Item child tokens handled here at end because we needed to have the final item to trim it first
+				for (let i = 0; i < list.items.length; i++) {
+					this.lexer.state.top = false;
+					list.items[i].tokens = this.lexer.blockTokens(list.items[i].text, []);
+					if (!list.loose) {
+						// Check if list should be loose
+						const spacers = list.items[i].tokens.filter(t => t.type === 'space');
+						const hasMultipleLineBreaks = spacers.length > 0 && spacers.some(t => /\n.*\n/.test(t.raw));
+						list.loose = hasMultipleLineBreaks;
+					}
+				}
+				// Set all items to loose if list is loose
+				if (list.loose) {
+					for (let i = 0; i < list.items.length; i++) {
+						list.items[i].loose = true;
+					}
+				}
+				return list;
+			}
+		}
+		html(src) {
+			const cap = this.rules.block.html.exec(src);
+			if (cap) {
+				const token = {
+					type: 'html',
+					block: true,
+					raw: cap[0],
+					pre: cap[1] === 'pre' || cap[1] === 'script' || cap[1] === 'style',
+					text: cap[0],
+				};
+				return token;
+			}
+		}
+		def(src) {
+			const cap = this.rules.block.def.exec(src);
+			if (cap) {
+				const tag = cap[1].toLowerCase().replace(/\s+/g, ' ');
+				const href = cap[2] ? cap[2].replace(/^<(.*)>$/, '$1').replace(this.rules.inline.anyPunctuation, '$1') : '';
+				const title = cap[3] ? cap[3].substring(1, cap[3].length - 1).replace(this.rules.inline.anyPunctuation, '$1') : cap[3];
+				return {
+					type: 'def',
+					tag,
+					raw: cap[0],
+					href,
+					title,
+				};
+			}
+		}
+		table(src) {
+			const cap = this.rules.block.table.exec(src);
+			if (!cap) {
+				return;
+			}
+			if (!/[:|]/.test(cap[2])) {
+				// delimiter row must have a pipe (|) or colon (:) otherwise it is a setext heading
+				return;
+			}
+			const headers = splitCells(cap[1]);
+			const aligns = cap[2].replace(/^\||\| *$/g, '').split('|');
+			const rows = cap[3] && cap[3].trim() ? cap[3].replace(/\n[ \t]*$/, '').split('\n') : [];
+			const item = {
+				type: 'table',
+				raw: cap[0],
+				header: [],
+				align: [],
+				rows: [],
+			};
+			if (headers.length !== aligns.length) {
+				// header and align columns must be equal, rows can be different.
+				return;
+			}
+			for (const align of aligns) {
+				if (/^ *-+: *$/.test(align)) {
+					item.align.push('right');
+				}
+				else if (/^ *:-+: *$/.test(align)) {
+					item.align.push('center');
+				}
+				else if (/^ *:-+ *$/.test(align)) {
+					item.align.push('left');
+				}
+				else {
+					item.align.push(null);
+				}
+			}
+			for (let i = 0; i < headers.length; i++) {
+				item.header.push({
+					text: headers[i],
+					tokens: this.lexer.inline(headers[i]),
+					header: true,
+					align: item.align[i],
+				});
+			}
+			for (const row of rows) {
+				item.rows.push(splitCells(row, item.header.length).map((cell, i) => {
+					return {
+						text: cell,
+						tokens: this.lexer.inline(cell),
+						header: false,
+						align: item.align[i],
+					};
+				}));
+			}
+			return item;
+		}
+		lheading(src) {
+			const cap = this.rules.block.lheading.exec(src);
+			if (cap) {
+				return {
+					type: 'heading',
+					raw: cap[0],
+					depth: cap[2].charAt(0) === '=' ? 1 : 2,
+					text: cap[1],
+					tokens: this.lexer.inline(cap[1]),
+				};
+			}
+		}
+		paragraph(src) {
+			const cap = this.rules.block.paragraph.exec(src);
+			if (cap) {
+				const text = cap[1].charAt(cap[1].length - 1) === '\n'
+					? cap[1].slice(0, -1)
+					: cap[1];
+				return {
+					type: 'paragraph',
+					raw: cap[0],
+					text,
+					tokens: this.lexer.inline(text),
+				};
+			}
+		}
+		text(src) {
+			const cap = this.rules.block.text.exec(src);
+			if (cap) {
+				return {
+					type: 'text',
+					raw: cap[0],
+					text: cap[0],
+					tokens: this.lexer.inline(cap[0]),
+				};
+			}
+		}
+		escape(src) {
+			const cap = this.rules.inline.escape.exec(src);
+			if (cap) {
+				return {
+					type: 'escape',
+					raw: cap[0],
+					text: escape$1(cap[1]),
+				};
+			}
+		}
+		tag(src) {
+			const cap = this.rules.inline.tag.exec(src);
+			if (cap) {
+				if (!this.lexer.state.inLink && /^<a /i.test(cap[0])) {
+					this.lexer.state.inLink = true;
+				}
+				else if (this.lexer.state.inLink && /^<\/a>/i.test(cap[0])) {
+					this.lexer.state.inLink = false;
+				}
+				if (!this.lexer.state.inRawBlock && /^<(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+					this.lexer.state.inRawBlock = true;
+				}
+				else if (this.lexer.state.inRawBlock && /^<\/(pre|code|kbd|script)(\s|>)/i.test(cap[0])) {
+					this.lexer.state.inRawBlock = false;
+				}
+				return {
+					type: 'html',
+					raw: cap[0],
+					inLink: this.lexer.state.inLink,
+					inRawBlock: this.lexer.state.inRawBlock,
+					block: false,
+					text: cap[0],
+				};
+			}
+		}
+		link(src) {
+			const cap = this.rules.inline.link.exec(src);
+			if (cap) {
+				const trimmedUrl = cap[2].trim();
+				if (!this.options.pedantic && /^</.test(trimmedUrl)) {
+					// commonmark requires matching angle brackets
+					if (!(/>$/.test(trimmedUrl))) {
+						return;
+					}
+					// ending angle bracket cannot be escaped
+					const rtrimSlash = rtrim(trimmedUrl.slice(0, -1), '\\');
+					if ((trimmedUrl.length - rtrimSlash.length) % 2 === 0) {
+						return;
+					}
+				}
+				else {
+					// find closing parenthesis
+					const lastParenIndex = findClosingBracket(cap[2], '()');
+					if (lastParenIndex > -1) {
+						const start = cap[0].indexOf('!') === 0 ? 5 : 4;
+						const linkLen = start + cap[1].length + lastParenIndex;
+						cap[2] = cap[2].substring(0, lastParenIndex);
+						cap[0] = cap[0].substring(0, linkLen).trim();
+						cap[3] = '';
+					}
+				}
+				let href = cap[2];
+				let title = '';
+				if (this.options.pedantic) {
+					// split pedantic href and title
+					const link = /^([^'"]*[^\s])\s+(['"])(.*)\2/.exec(href);
+					if (link) {
+						href = link[1];
+						title = link[3];
+					}
+				}
+				else {
+					title = cap[3] ? cap[3].slice(1, -1) : '';
+				}
+				href = href.trim();
+				if (/^</.test(href)) {
+					if (this.options.pedantic && !(/>$/.test(trimmedUrl))) {
+						// pedantic allows starting angle bracket without ending angle bracket
+						href = href.slice(1);
+					}
+					else {
+						href = href.slice(1, -1);
+					}
+				}
+				return outputLink(cap, {
+					href: href ? href.replace(this.rules.inline.anyPunctuation, '$1') : href,
+					title: title ? title.replace(this.rules.inline.anyPunctuation, '$1') : title,
+				}, cap[0], this.lexer);
+			}
+		}
+		reflink(src, links) {
+			let cap;
+			if ((cap = this.rules.inline.reflink.exec(src))
+				|| (cap = this.rules.inline.nolink.exec(src))) {
+				const linkString = (cap[2] || cap[1]).replace(/\s+/g, ' ');
+				const link = links[linkString.toLowerCase()];
+				if (!link) {
+					const text = cap[0].charAt(0);
+					return {
+						type: 'text',
+						raw: text,
+						text,
+					};
+				}
+				return outputLink(cap, link, cap[0], this.lexer);
+			}
+		}
+		emStrong(src, maskedSrc, prevChar = '') {
+			let match = this.rules.inline.emStrongLDelim.exec(src);
+			if (!match)
+				return;
+			// _ can't be between two alphanumerics. \p{L}\p{N} includes non-english alphabet/numbers as well
+			if (match[3] && prevChar.match(/[\p{L}\p{N}]/u))
+				return;
+			const nextChar = match[1] || match[2] || '';
+			if (!nextChar || !prevChar || this.rules.inline.punctuation.exec(prevChar)) {
+				// unicode Regex counts emoji as 1 char; spread into array for proper count (used multiple times below)
+				const lLength = [...match[0]].length - 1;
+				let rDelim, rLength, delimTotal = lLength, midDelimTotal = 0;
+				const endReg = match[0][0] === '*' ? this.rules.inline.emStrongRDelimAst : this.rules.inline.emStrongRDelimUnd;
+				endReg.lastIndex = 0;
+				// Clip maskedSrc to same section of string as src (move to lexer?)
+				maskedSrc = maskedSrc.slice(-1 * src.length + lLength);
+				while ((match = endReg.exec(maskedSrc)) != null) {
+					rDelim = match[1] || match[2] || match[3] || match[4] || match[5] || match[6];
+					if (!rDelim)
+						continue; // skip single * in __abc*abc__
+					rLength = [...rDelim].length;
+					if (match[3] || match[4]) { // found another Left Delim
+						delimTotal += rLength;
+						continue;
+					}
+					else if (match[5] || match[6]) { // either Left or Right Delim
+						if (lLength % 3 && !((lLength + rLength) % 3)) {
+							midDelimTotal += rLength;
+							continue; // CommonMark Emphasis Rules 9-10
+						}
+					}
+					delimTotal -= rLength;
+					if (delimTotal > 0)
+						continue; // Haven't found enough closing delimiters
+					// Remove extra characters. *a*** -> *a*
+					rLength = Math.min(rLength, rLength + delimTotal + midDelimTotal);
+					// char length can be >1 for unicode characters;
+					const lastCharLength = [...match[0]][0].length;
+					const raw = src.slice(0, lLength + match.index + lastCharLength + rLength);
+					// Create `em` if smallest delimiter has odd char count. *a***
+					if (Math.min(lLength, rLength) % 2) {
+						const text = raw.slice(1, -1);
+						return {
+							type: 'em',
+							raw,
+							text,
+							tokens: this.lexer.inlineTokens(text),
+						};
+					}
+					// Create 'strong' if smallest delimiter has even char count. **a***
+					const text = raw.slice(2, -2);
+					return {
+						type: 'strong',
+						raw,
+						text,
+						tokens: this.lexer.inlineTokens(text),
+					};
+				}
+			}
+		}
+		codespan(src) {
+			const cap = this.rules.inline.code.exec(src);
+			if (cap) {
+				let text = cap[2].replace(/\n/g, ' ');
+				const hasNonSpaceChars = /[^ ]/.test(text);
+				const hasSpaceCharsOnBothEnds = /^ /.test(text) && / $/.test(text);
+				if (hasNonSpaceChars && hasSpaceCharsOnBothEnds) {
+					text = text.substring(1, text.length - 1);
+				}
+				text = escape$1(text, true);
+				return {
+					type: 'codespan',
+					raw: cap[0],
+					text,
+				};
+			}
+		}
+		br(src) {
+			const cap = this.rules.inline.br.exec(src);
+			if (cap) {
+				return {
+					type: 'br',
+					raw: cap[0],
+				};
+			}
+		}
+		del(src) {
+			const cap = this.rules.inline.del.exec(src);
+			if (cap) {
+				return {
+					type: 'del',
+					raw: cap[0],
+					text: cap[2],
+					tokens: this.lexer.inlineTokens(cap[2]),
+				};
+			}
+		}
+		autolink(src) {
+			const cap = this.rules.inline.autolink.exec(src);
+			if (cap) {
+				let text, href;
+				if (cap[2] === '@') {
+					text = escape$1(cap[1]);
+					href = 'mailto:' + text;
+				}
+				else {
+					text = escape$1(cap[1]);
+					href = text;
+				}
+				return {
+					type: 'link',
+					raw: cap[0],
+					text,
+					href,
+					tokens: [
+						{
+							type: 'text',
+							raw: text,
+							text,
+						},
+					],
+				};
+			}
+		}
+		url(src) {
+			let cap;
+			if (cap = this.rules.inline.url.exec(src)) {
+				let text, href;
+				if (cap[2] === '@') {
+					text = escape$1(cap[0]);
+					href = 'mailto:' + text;
+				}
+				else {
+					// do extended autolink path validation
+					let prevCapZero;
+					do {
+						prevCapZero = cap[0];
+						cap[0] = this.rules.inline._backpedal.exec(cap[0])?.[0] ?? '';
+					} while (prevCapZero !== cap[0]);
+					text = escape$1(cap[0]);
+					if (cap[1] === 'www.') {
+						href = 'http://' + cap[0];
+					}
+					else {
+						href = cap[0];
+					}
+				}
+				return {
+					type: 'link',
+					raw: cap[0],
+					text,
+					href,
+					tokens: [
+						{
+							type: 'text',
+							raw: text,
+							text,
+						},
+					],
+				};
+			}
+		}
+		inlineText(src) {
+			const cap = this.rules.inline.text.exec(src);
+			if (cap) {
+				let text;
+				if (this.lexer.state.inRawBlock) {
+					text = cap[0];
+				}
+				else {
+					text = escape$1(cap[0]);
+				}
+				return {
+					type: 'text',
+					raw: cap[0],
+					text,
+				};
+			}
+		}
+	}
+
+	/**
+	 * Block-Level Grammar
+	 */
+	const newline = /^(?: *(?:\n|$))+/;
+	const blockCode = /^( {4}[^\n]+(?:\n(?: *(?:\n|$))*)?)+/;
+	const fences = /^ {0,3}(`{3,}(?=[^`\n]*(?:\n|$))|~{3,})([^\n]*)(?:\n|$)(?:|([\s\S]*?)(?:\n|$))(?: {0,3}\1[~`]* *(?=\n|$)|$)/;
+	const hr = /^ {0,3}((?:-[\t ]*){3,}|(?:_[ \t]*){3,}|(?:\*[ \t]*){3,})(?:\n+|$)/;
+	const heading = /^ {0,3}(#{1,6})(?=\s|$)(.*)(?:\n+|$)/;
+	const bullet = /(?:[*+-]|\d{1,9}[.)])/;
+	const lheading = edit(/^(?!bull |blockCode|fences|blockquote|heading|html)((?:.|\n(?!\s*?\n|bull |blockCode|fences|blockquote|heading|html))+?)\n {0,3}(=+|-+) *(?:\n+|$)/)
+		.replace(/bull/g, bullet) // lists can interrupt
+		.replace(/blockCode/g, / {4}/) // indented code blocks can interrupt
+		.replace(/fences/g, / {0,3}(?:`{3,}|~{3,})/) // fenced code blocks can interrupt
+		.replace(/blockquote/g, / {0,3}>/) // blockquote can interrupt
+		.replace(/heading/g, / {0,3}#{1,6}/) // ATX heading can interrupt
+		.replace(/html/g, / {0,3}<[^\n>]+>\n/) // block html can interrupt
+		.getRegex();
+	const _paragraph = /^([^\n]+(?:\n(?!hr|heading|lheading|blockquote|fences|list|html|table| +\n)[^\n]+)*)/;
+	const blockText = /^[^\n]+/;
+	const _blockLabel = /(?!\s*\])(?:\\.|[^[\]\\])+/;
+	const def = edit(/^ {0,3}\[(label)\]: *(?:\n *)?([^<\s][^\s]*|<.*?>)(?:(?: +(?:\n *)?| *\n *)(title))? *(?:\n+|$)/)
+		.replace('label', _blockLabel)
+		.replace('title', /(?:"(?:\\"?|[^"\\])*"|'[^'\n]*(?:\n[^'\n]+)*\n?'|\([^()]*\))/)
+		.getRegex();
+	const list = edit(/^( {0,3}bull)([ \t][^\n]+?)?(?:\n|$)/)
+		.replace(/bull/g, bullet)
+		.getRegex();
+	const _tag = 'address|article|aside|base|basefont|blockquote|body|caption'
+		+ '|center|col|colgroup|dd|details|dialog|dir|div|dl|dt|fieldset|figcaption'
+		+ '|figure|footer|form|frame|frameset|h[1-6]|head|header|hr|html|iframe'
+		+ '|legend|li|link|main|menu|menuitem|meta|nav|noframes|ol|optgroup|option'
+		+ '|p|param|search|section|summary|table|tbody|td|tfoot|th|thead|title'
+		+ '|tr|track|ul';
+	const _comment = /<!--(?:-?>|[\s\S]*?(?:-->|$))/;
+	const html = edit('^ {0,3}(?:' // optional indentation
+		+ '<(script|pre|style|textarea)[\\s>][\\s\\S]*?(?:</\\1>[^\\n]*\\n+|$)' // (1)
+		+ '|comment[^\\n]*(\\n+|$)' // (2)
+		+ '|<\\?[\\s\\S]*?(?:\\?>\\n*|$)' // (3)
+		+ '|<![A-Z][\\s\\S]*?(?:>\\n*|$)' // (4)
+		+ '|<!\\[CDATA\\[[\\s\\S]*?(?:\\]\\]>\\n*|$)' // (5)
+		+ '|</?(tag)(?: +|\\n|/?>)[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (6)
+		+ '|<(?!script|pre|style|textarea)([a-z][\\w-]*)(?:attribute)*? */?>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) open tag
+		+ '|</(?!script|pre|style|textarea)[a-z][\\w-]*\\s*>(?=[ \\t]*(?:\\n|$))[\\s\\S]*?(?:(?:\\n *)+\\n|$)' // (7) closing tag
+		+ ')', 'i')
+		.replace('comment', _comment)
+		.replace('tag', _tag)
+		.replace('attribute', / +[a-zA-Z:_][\w.:-]*(?: *= *"[^"\n]*"| *= *'[^'\n]*'| *= *[^\s"'=<>`]+)?/)
+		.getRegex();
+	const paragraph = edit(_paragraph)
+		.replace('hr', hr)
+		.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+		.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+		.replace('|table', '')
+		.replace('blockquote', ' {0,3}>')
+		.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+		.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+		.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+		.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+		.getRegex();
+	const blockquote = edit(/^( {0,3}> ?(paragraph|[^\n]*)(?:\n|$))+/)
+		.replace('paragraph', paragraph)
+		.getRegex();
+	/**
+	 * Normal Block Grammar
+	 */
+	const blockNormal = {
+		blockquote,
+		code: blockCode,
+		def,
+		fences,
+		heading,
+		hr,
+		html,
+		lheading,
+		list,
+		newline,
+		paragraph,
+		table: noopTest,
+		text: blockText,
+	};
+	/**
+	 * GFM Block Grammar
+	 */
+	const gfmTable = edit('^ *([^\\n ].*)\\n' // Header
+		+ ' {0,3}((?:\\| *)?:?-+:? *(?:\\| *:?-+:? *)*(?:\\| *)?)' // Align
+		+ '(?:\\n((?:(?! *\\n|hr|heading|blockquote|code|fences|list|html).*(?:\\n|$))*)\\n*|$)') // Cells
+		.replace('hr', hr)
+		.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+		.replace('blockquote', ' {0,3}>')
+		.replace('code', ' {4}[^\\n]')
+		.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+		.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+		.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+		.replace('tag', _tag) // tables can be interrupted by type (6) html blocks
+		.getRegex();
+	const blockGfm = {
+		...blockNormal,
+		table: gfmTable,
+		paragraph: edit(_paragraph)
+			.replace('hr', hr)
+			.replace('heading', ' {0,3}#{1,6}(?:\\s|$)')
+			.replace('|lheading', '') // setext headings don't interrupt commonmark paragraphs
+			.replace('table', gfmTable) // interrupt paragraphs with table
+			.replace('blockquote', ' {0,3}>')
+			.replace('fences', ' {0,3}(?:`{3,}(?=[^`\\n]*\\n)|~{3,})[^\\n]*\\n')
+			.replace('list', ' {0,3}(?:[*+-]|1[.)]) ') // only lists starting from 1 can interrupt
+			.replace('html', '</?(?:tag)(?: +|\\n|/?>)|<(?:script|pre|style|textarea|!--)')
+			.replace('tag', _tag) // pars can be interrupted by type (6) html blocks
+			.getRegex(),
+	};
+	/**
+	 * Pedantic grammar (original John Gruber's loose markdown specification)
+	 */
+	const blockPedantic = {
+		...blockNormal,
+		html: edit('^ *(?:comment *(?:\\n|\\s*$)'
+			+ '|<(tag)[\\s\\S]+?</\\1> *(?:\\n{2,}|\\s*$)' // closed tag
+			+ '|<tag(?:"[^"]*"|\'[^\']*\'|\\s[^\'"/>\\s]*)*?/?> *(?:\\n{2,}|\\s*$))')
+			.replace('comment', _comment)
+			.replace(/tag/g, '(?!(?:'
+			+ 'a|em|strong|small|s|cite|q|dfn|abbr|data|time|code|var|samp|kbd|sub'
+			+ '|sup|i|b|u|mark|ruby|rt|rp|bdi|bdo|span|br|wbr|ins|del|img)'
+			+ '\\b)\\w+(?!:|[^\\w\\s@]*@)\\b')
+			.getRegex(),
+		def: /^ *\[([^\]]+)\]: *<?([^\s>]+)>?(?: +(["(][^\n]+[")]))? *(?:\n+|$)/,
+		heading: /^(#{1,6})(.*)(?:\n+|$)/,
+		fences: noopTest, // fences not supported
+		lheading: /^(.+?)\n {0,3}(=+|-+) *(?:\n+|$)/,
+		paragraph: edit(_paragraph)
+			.replace('hr', hr)
+			.replace('heading', ' *#{1,6} *[^\n]')
+			.replace('lheading', lheading)
+			.replace('|table', '')
+			.replace('blockquote', ' {0,3}>')
+			.replace('|fences', '')
+			.replace('|list', '')
+			.replace('|html', '')
+			.replace('|tag', '')
+			.getRegex(),
+	};
+	/**
+	 * Inline-Level Grammar
+	 */
+	const escape = /^\\([!"#$%&'()*+,\-./:;<=>?@[\]\\^_`{|}~])/;
+	const inlineCode = /^(`+)([^`]|[^`][\s\S]*?[^`])\1(?!`)/;
+	const br = /^( {2,}|\\)\n(?!\s*$)/;
+	const inlineText = /^(`+|[^`])(?:(?= {2,}\n)|[\s\S]*?(?:(?=[\\<![`*_]|\b_|$)|[^ ](?= {2,}\n)))/;
+	// list of unicode punctuation marks, plus any missing characters from CommonMark spec
+	const _punctuation = '\\p{P}\\p{S}';
+	const punctuation = edit(/^((?![*_])[\spunctuation])/, 'u')
+		.replace(/punctuation/g, _punctuation).getRegex();
+	// sequences em should skip over [title](link), `code`, <html>
+	const blockSkip = /\[[^[\]]*?\]\([^()]*?\)|`[^`]*?`|<[^<>]*?>/g;
+	const emStrongLDelim = edit(/^(?:\*+(?:((?!\*)[punct])|[^\s*]))|^_+(?:((?!_)[punct])|([^\s_]))/, 'u')
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const emStrongRDelimAst = edit('^[^_*]*?__[^_*]*?\\*[^_*]*?(?=__)' // Skip orphan inside strong
+		+ '|[^*]+(?=[^*])' // Consume to delim
+		+ '|(?!\\*)[punct](\\*+)(?=[\\s]|$)' // (1) #*** can only be a Right Delimiter
+		+ '|[^punct\\s](\\*+)(?!\\*)(?=[punct\\s]|$)' // (2) a***#, a*** can only be a Right Delimiter
+		+ '|(?!\\*)[punct\\s](\\*+)(?=[^punct\\s])' // (3) #***a, ***a can only be Left Delimiter
+		+ '|[\\s](\\*+)(?!\\*)(?=[punct])' // (4) ***# can only be Left Delimiter
+		+ '|(?!\\*)[punct](\\*+)(?!\\*)(?=[punct])' // (5) #***# can be either Left or Right Delimiter
+		+ '|[^punct\\s](\\*+)(?=[^punct\\s])', 'gu') // (6) a***a can be either Left or Right Delimiter
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	// (6) Not allowed for _
+	const emStrongRDelimUnd = edit('^[^_*]*?\\*\\*[^_*]*?_[^_*]*?(?=\\*\\*)' // Skip orphan inside strong
+		+ '|[^_]+(?=[^_])' // Consume to delim
+		+ '|(?!_)[punct](_+)(?=[\\s]|$)' // (1) #___ can only be a Right Delimiter
+		+ '|[^punct\\s](_+)(?!_)(?=[punct\\s]|$)' // (2) a___#, a___ can only be a Right Delimiter
+		+ '|(?!_)[punct\\s](_+)(?=[^punct\\s])' // (3) #___a, ___a can only be Left Delimiter
+		+ '|[\\s](_+)(?!_)(?=[punct])' // (4) ___# can only be Left Delimiter
+		+ '|(?!_)[punct](_+)(?!_)(?=[punct])', 'gu') // (5) #___# can be either Left or Right Delimiter
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const anyPunctuation = edit(/\\([punct])/, 'gu')
+		.replace(/punct/g, _punctuation)
+		.getRegex();
+	const autolink = edit(/^<(scheme:[^\s\x00-\x1f<>]*|email)>/)
+		.replace('scheme', /[a-zA-Z][a-zA-Z0-9+.-]{1,31}/)
+		.replace('email', /[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+(@)[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)+(?![-_])/)
+		.getRegex();
+	const _inlineComment = edit(_comment).replace('(?:-->|$)', '-->').getRegex();
+	const tag = edit('^comment'
+		+ '|^</[a-zA-Z][\\w:-]*\\s*>' // self-closing tag
+		+ '|^<[a-zA-Z][\\w-]*(?:attribute)*?\\s*/?>' // open tag
+		+ '|^<\\?[\\s\\S]*?\\?>' // processing instruction, e.g. <?php ?>
+		+ '|^<![a-zA-Z]+\\s[\\s\\S]*?>' // declaration, e.g. <!DOCTYPE html>
+		+ '|^<!\\[CDATA\\[[\\s\\S]*?\\]\\]>') // CDATA section
+		.replace('comment', _inlineComment)
+		.replace('attribute', /\s+[a-zA-Z:_][\w.:-]*(?:\s*=\s*"[^"]*"|\s*=\s*'[^']*'|\s*=\s*[^\s"'=<>`]+)?/)
+		.getRegex();
+	const _inlineLabel = /(?:\[(?:\\.|[^[\]\\])*\]|\\.|`[^`]*`|[^[\]\\`])*?/;
+	const link = edit(/^!?\[(label)\]\(\s*(href)(?:\s+(title))?\s*\)/)
+		.replace('label', _inlineLabel)
+		.replace('href', /<(?:\\.|[^\n<>\\])+>|[^\s\x00-\x1f]*/)
+		.replace('title', /"(?:\\"?|[^"\\])*"|'(?:\\'?|[^'\\])*'|\((?:\\\)?|[^)\\])*\)/)
+		.getRegex();
+	const reflink = edit(/^!?\[(label)\]\[(ref)\]/)
+		.replace('label', _inlineLabel)
+		.replace('ref', _blockLabel)
+		.getRegex();
+	const nolink = edit(/^!?\[(ref)\](?:\[\])?/)
+		.replace('ref', _blockLabel)
+		.getRegex();
+	const reflinkSearch = edit('reflink|nolink(?!\\()', 'g')
+		.replace('reflink', reflink)
+		.replace('nolink', nolink)
+		.getRegex();
+	/**
+	 * Normal Inline Grammar
+	 */
+	const inlineNormal = {
+		_backpedal: noopTest, // only used for GFM url
+		anyPunctuation,
+		autolink,
+		blockSkip,
+		br,
+		code: inlineCode,
+		del: noopTest,
+		emStrongLDelim,
+		emStrongRDelimAst,
+		emStrongRDelimUnd,
+		escape,
+		link,
+		nolink,
+		punctuation,
+		reflink,
+		reflinkSearch,
+		tag,
+		text: inlineText,
+		url: noopTest,
+	};
+	/**
+	 * Pedantic Inline Grammar
+	 */
+	const inlinePedantic = {
+		...inlineNormal,
+		link: edit(/^!?\[(label)\]\((.*?)\)/)
+			.replace('label', _inlineLabel)
+			.getRegex(),
+		reflink: edit(/^!?\[(label)\]\s*\[([^\]]*)\]/)
+			.replace('label', _inlineLabel)
+			.getRegex(),
+	};
+	/**
+	 * GFM Inline Grammar
+	 */
+	const inlineGfm = {
+		...inlineNormal,
+		escape: edit(escape).replace('])', '~|])').getRegex(),
+		url: edit(/^((?:ftp|https?):\/\/|www\.)(?:[a-zA-Z0-9-]+\.?)+[^\s<]*|^email/, 'i')
+			.replace('email', /[A-Za-z0-9._+-]+(@)[a-zA-Z0-9-_]+(?:\.[a-zA-Z0-9-_]*[a-zA-Z0-9])+(?![-_])/)
+			.getRegex(),
+		_backpedal: /(?:[^?!.,:;*_'"~()&]+|\([^)]*\)|&(?![a-zA-Z0-9]+;$)|[?!.,:;*_'"~)]+(?!$))+/,
+		del: /^(~~?)(?=[^\s~])([\s\S]*?[^\s~])\1(?=[^~]|$)/,
+		text: /^([`~]+|[^`~])(?:(?= {2,}\n)|(?=[a-zA-Z0-9.!#$%&'*+/=?_`{|}~-]+@)|[\s\S]*?(?:(?=[\\<![`*~_]|\b_|https?:\/\/|ftp:\/\/|www\.|$)|[^ ](?= {2,}\n)|[^a-zA-Z0-9.!#$%&'*+/=?_`{|}~-](?=[a-zA-Z0-9.!#$%&'*+/=?_`{|}~-]+@)))/,
+	};
+	/**
+	 * GFM + Line Breaks Inline Grammar
+	 */
+	const inlineBreaks = {
+		...inlineGfm,
+		br: edit(br).replace('{2,}', '*').getRegex(),
+		text: edit(inlineGfm.text)
+			.replace('\\b_', '\\b_| {2,}\\n')
+			.replace(/\{2,\}/g, '*')
+			.getRegex(),
+	};
+	/**
+	 * exports
+	 */
+	const block = {
+		normal: blockNormal,
+		gfm: blockGfm,
+		pedantic: blockPedantic,
+	};
+	const inline = {
+		normal: inlineNormal,
+		gfm: inlineGfm,
+		breaks: inlineBreaks,
+		pedantic: inlinePedantic,
+	};
+
+	/**
+	 * Block Lexer
+	 */
+	class _Lexer {
+		constructor(options) {
+			// TokenList cannot be created in one go
+			this.tokens = [];
+			this.tokens.links = Object.create(null);
+			this.options = options || exports_defaults;
+			this.options.tokenizer = this.options.tokenizer || new _Tokenizer();
+			this.tokenizer = this.options.tokenizer;
+			this.tokenizer.options = this.options;
+			this.tokenizer.lexer = this;
+			this.inlineQueue = [];
+			this.state = {
+				inLink: false,
+				inRawBlock: false,
+				top: true,
+			};
+			const rules = {
+				block: block.normal,
+				inline: inline.normal,
+			};
+			if (this.options.pedantic) {
+				rules.block = block.pedantic;
+				rules.inline = inline.pedantic;
+			}
+			else if (this.options.gfm) {
+				rules.block = block.gfm;
+				if (this.options.breaks) {
+					rules.inline = inline.breaks;
+				}
+				else {
+					rules.inline = inline.gfm;
+				}
+			}
+			this.tokenizer.rules = rules;
+		}
+		/**
+		 * Expose Rules
+		 */
+		static get rules() {
+			return {
+				block,
+				inline,
+			};
+		}
+		/**
+		 * Static Lex Method
+		 */
+		static lex(src, options) {
+			const lexer = new _Lexer(options);
+			return lexer.lex(src);
+		}
+		/**
+		 * Static Lex Inline Method
+		 */
+		static lexInline(src, options) {
+			const lexer = new _Lexer(options);
+			return lexer.inlineTokens(src);
+		}
+		/**
+		 * Preprocessing
+		 */
+		lex(src) {
+			src = src
+				.replace(/\r\n|\r/g, '\n');
+			this.blockTokens(src, this.tokens);
+			for (let i = 0; i < this.inlineQueue.length; i++) {
+				const next = this.inlineQueue[i];
+				this.inlineTokens(next.src, next.tokens);
+			}
+			this.inlineQueue = [];
+			return this.tokens;
+		}
+		blockTokens(src, tokens = [], lastParagraphClipped = false) {
+			if (this.options.pedantic) {
+				src = src.replace(/\t/g, '    ').replace(/^ +$/gm, '');
+			}
+			else {
+				src = src.replace(/^( *)(\t+)/gm, (_, leading, tabs) => {
+					return leading + '    '.repeat(tabs.length);
+				});
+			}
+			let token;
+			let lastToken;
+			let cutSrc;
+			while (src) {
+				if (this.options.extensions
+					&& this.options.extensions.block
+					&& this.options.extensions.block.some((extTokenizer) => {
+						if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+							src = src.substring(token.raw.length);
+							tokens.push(token);
+							return true;
+						}
+						return false;
+					})) {
+					continue;
+				}
+				// newline
+				if (token = this.tokenizer.space(src)) {
+					src = src.substring(token.raw.length);
+					if (token.raw.length === 1 && tokens.length > 0) {
+						// if there's a single \n as a spacer, it's terminating the last line,
+						// so move it there so that we don't get unnecessary paragraph tags
+						tokens[tokens.length - 1].raw += '\n';
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// code
+				if (token = this.tokenizer.code(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					// An indented code block cannot interrupt a paragraph.
+					if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// fences
+				if (token = this.tokenizer.fences(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// heading
+				if (token = this.tokenizer.heading(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// hr
+				if (token = this.tokenizer.hr(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// blockquote
+				if (token = this.tokenizer.blockquote(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// list
+				if (token = this.tokenizer.list(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// html
+				if (token = this.tokenizer.html(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// def
+				if (token = this.tokenizer.def(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && (lastToken.type === 'paragraph' || lastToken.type === 'text')) {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.raw;
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else if (!this.tokens.links[token.tag]) {
+						this.tokens.links[token.tag] = {
+							href: token.href,
+							title: token.title,
+						};
+					}
+					continue;
+				}
+				// table (gfm)
+				if (token = this.tokenizer.table(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// lheading
+				if (token = this.tokenizer.lheading(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// top-level paragraph
+				// prevent paragraph consuming extensions by clipping 'src' to extension start
+				cutSrc = src;
+				if (this.options.extensions && this.options.extensions.startBlock) {
+					let startIndex = Infinity;
+					const tempSrc = src.slice(1);
+					let tempStart;
+					this.options.extensions.startBlock.forEach((getStartIndex) => {
+						tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+						if (typeof tempStart === 'number' && tempStart >= 0) {
+							startIndex = Math.min(startIndex, tempStart);
+						}
+					});
+					if (startIndex < Infinity && startIndex >= 0) {
+						cutSrc = src.substring(0, startIndex + 1);
+					}
+				}
+				if (this.state.top && (token = this.tokenizer.paragraph(cutSrc))) {
+					lastToken = tokens[tokens.length - 1];
+					if (lastParagraphClipped && lastToken?.type === 'paragraph') {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue.pop();
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					lastParagraphClipped = (cutSrc.length !== src.length);
+					src = src.substring(token.raw.length);
+					continue;
+				}
+				// text
+				if (token = this.tokenizer.text(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && lastToken.type === 'text') {
+						lastToken.raw += '\n' + token.raw;
+						lastToken.text += '\n' + token.text;
+						this.inlineQueue.pop();
+						this.inlineQueue[this.inlineQueue.length - 1].src = lastToken.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				if (src) {
+					const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+					if (this.options.silent) {
+						console.error(errMsg);
+						break;
+					}
+					else {
+						throw new Error(errMsg);
+					}
+				}
+			}
+			this.state.top = true;
+			return tokens;
+		}
+		inline(src, tokens = []) {
+			this.inlineQueue.push({ src, tokens });
+			return tokens;
+		}
+		/**
+		 * Lexing/Compiling
+		 */
+		inlineTokens(src, tokens = []) {
+			let token, lastToken, cutSrc;
+			// String with links masked to avoid interference with em and strong
+			let maskedSrc = src;
+			let match;
+			let keepPrevChar, prevChar;
+			// Mask out reflinks
+			if (this.tokens.links) {
+				const links = Object.keys(this.tokens.links);
+				if (links.length > 0) {
+					while ((match = this.tokenizer.rules.inline.reflinkSearch.exec(maskedSrc)) != null) {
+						if (links.includes(match[0].slice(match[0].lastIndexOf('[') + 1, -1))) {
+							maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.reflinkSearch.lastIndex);
+						}
+					}
+				}
+			}
+			// Mask out other blocks
+			while ((match = this.tokenizer.rules.inline.blockSkip.exec(maskedSrc)) != null) {
+				maskedSrc = maskedSrc.slice(0, match.index) + '[' + 'a'.repeat(match[0].length - 2) + ']' + maskedSrc.slice(this.tokenizer.rules.inline.blockSkip.lastIndex);
+			}
+			// Mask out escaped characters
+			while ((match = this.tokenizer.rules.inline.anyPunctuation.exec(maskedSrc)) != null) {
+				maskedSrc = maskedSrc.slice(0, match.index) + '++' + maskedSrc.slice(this.tokenizer.rules.inline.anyPunctuation.lastIndex);
+			}
+			while (src) {
+				if (!keepPrevChar) {
+					prevChar = '';
+				}
+				keepPrevChar = false;
+				// extensions
+				if (this.options.extensions
+					&& this.options.extensions.inline
+					&& this.options.extensions.inline.some((extTokenizer) => {
+						if (token = extTokenizer.call({ lexer: this }, src, tokens)) {
+							src = src.substring(token.raw.length);
+							tokens.push(token);
+							return true;
+						}
+						return false;
+					})) {
+					continue;
+				}
+				// escape
+				if (token = this.tokenizer.escape(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// tag
+				if (token = this.tokenizer.tag(src)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// link
+				if (token = this.tokenizer.link(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// reflink, nolink
+				if (token = this.tokenizer.reflink(src, this.tokens.links)) {
+					src = src.substring(token.raw.length);
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && token.type === 'text' && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				// em & strong
+				if (token = this.tokenizer.emStrong(src, maskedSrc, prevChar)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// code
+				if (token = this.tokenizer.codespan(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// br
+				if (token = this.tokenizer.br(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// del (gfm)
+				if (token = this.tokenizer.del(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// autolink
+				if (token = this.tokenizer.autolink(src)) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// url (gfm)
+				if (!this.state.inLink && (token = this.tokenizer.url(src))) {
+					src = src.substring(token.raw.length);
+					tokens.push(token);
+					continue;
+				}
+				// text
+				// prevent inlineText consuming extensions by clipping 'src' to extension start
+				cutSrc = src;
+				if (this.options.extensions && this.options.extensions.startInline) {
+					let startIndex = Infinity;
+					const tempSrc = src.slice(1);
+					let tempStart;
+					this.options.extensions.startInline.forEach((getStartIndex) => {
+						tempStart = getStartIndex.call({ lexer: this }, tempSrc);
+						if (typeof tempStart === 'number' && tempStart >= 0) {
+							startIndex = Math.min(startIndex, tempStart);
+						}
+					});
+					if (startIndex < Infinity && startIndex >= 0) {
+						cutSrc = src.substring(0, startIndex + 1);
+					}
+				}
+				if (token = this.tokenizer.inlineText(cutSrc)) {
+					src = src.substring(token.raw.length);
+					if (token.raw.slice(-1) !== '_') { // Track prevChar before string of ____ started
+						prevChar = token.raw.slice(-1);
+					}
+					keepPrevChar = true;
+					lastToken = tokens[tokens.length - 1];
+					if (lastToken && lastToken.type === 'text') {
+						lastToken.raw += token.raw;
+						lastToken.text += token.text;
+					}
+					else {
+						tokens.push(token);
+					}
+					continue;
+				}
+				if (src) {
+					const errMsg = 'Infinite loop on byte: ' + src.charCodeAt(0);
+					if (this.options.silent) {
+						console.error(errMsg);
+						break;
+					}
+					else {
+						throw new Error(errMsg);
+					}
+				}
+			}
+			return tokens;
+		}
+	}
+
+	/**
+	 * Renderer
+	 */
+	class _Renderer {
+		constructor(options) {
+			this.options = options || exports_defaults;
+//			this.parser = null; // set by the parser
+		}
+		space() {
+			return '';
+		}
+		code({ text, lang, escaped }) {
+			const langString = (lang || '').match(/^\S*/)?.[0];
+			const code = text.replace(/\n$/, '') + '\n';
+			if (!langString) {
+				return '<pre><code>'
+					+ (escaped ? code : escape$1(code, true))
+					+ '</code></pre>\n';
+			}
+			return '<pre><code class="language-'
+				+ escape$1(langString)
+				+ '">'
+				+ (escaped ? code : escape$1(code, true))
+				+ '</code></pre>\n';
+		}
+		blockquote({ tokens }) {
+			const body = this.parser.parse(tokens);
+			return `<blockquote>\n${body}</blockquote>\n`;
+		}
+		html({ text }) {
+			return text;
+		}
+		heading({ tokens, depth }) {
+			return `<h${depth}>${this.parser.parseInline(tokens)}</h${depth}>\n`;
+		}
+		hr() {
+			return '<hr>\n';
+		}
+		list(token) {
+			const ordered = token.ordered;
+			const start = token.start;
+			let body = '';
+			for (let j = 0; j < token.items.length; j++) {
+				const item = token.items[j];
+				body += this.listitem(item);
+			}
+			const type = ordered ? 'ol' : 'ul';
+			const startAttr = (ordered && start !== 1) ? (' start="' + start + '"') : '';
+			return '<' + type + startAttr + '>\n' + body + '</' + type + '>\n';
+		}
+		listitem(item) {
+			let itemBody = '';
+			if (item.task) {
+				const checkbox = this.checkbox({ checked: !!item.checked });
+				if (item.loose) {
+					if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
+						item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
+						if (item.tokens[0].tokens && item.tokens[0].tokens.length > 0 && item.tokens[0].tokens[0].type === 'text') {
+							item.tokens[0].tokens[0].text = checkbox + ' ' + item.tokens[0].tokens[0].text;
+						}
+					}
+					else {
+						item.tokens.unshift({
+							type: 'text',
+							raw: checkbox + ' ',
+							text: checkbox + ' ',
+						});
+					}
+				}
+				else {
+					itemBody += checkbox + ' ';
+				}
+			}
+			itemBody += this.parser.parse(item.tokens, !!item.loose);
+			return `<li>${itemBody}</li>\n`;
+		}
+		checkbox({ checked }) {
+			return '<input '
+				+ (checked ? 'checked="" ' : '')
+				+ 'disabled="" type="checkbox">';
+		}
+		paragraph({ tokens }) {
+			return `<p>${this.parser.parseInline(tokens)}</p>\n`;
+		}
+		table(token) {
+			let header = '';
+			// header
+			let cell = '';
+			for (let j = 0; j < token.header.length; j++) {
+				cell += this.tablecell(token.header[j]);
+			}
+			header += this.tablerow({ text: cell });
+			let body = '';
+			for (let j = 0; j < token.rows.length; j++) {
+				const row = token.rows[j];
+				cell = '';
+				for (let k = 0; k < row.length; k++) {
+					cell += this.tablecell(row[k]);
+				}
+				body += this.tablerow({ text: cell });
+			}
+			if (body)
+				body = `<tbody>${body}</tbody>`;
+			return '<table>\n'
+				+ '<thead>\n'
+				+ header
+				+ '</thead>\n'
+				+ body
+				+ '</table>\n';
+		}
+		tablerow({ text }) {
+			return `<tr>\n${text}</tr>\n`;
+		}
+		tablecell(token) {
+			const content = this.parser.parseInline(token.tokens);
+			const type = token.header ? 'th' : 'td';
+			const tag = token.align
+				? `<${type} align="${token.align}">`
+				: `<${type}>`;
+			return tag + content + `</${type}>\n`;
+		}
+		/**
+		 * span level renderer
+		 */
+		strong({ tokens }) {
+			return `<strong>${this.parser.parseInline(tokens)}</strong>`;
+		}
+		em({ tokens }) {
+			return `<em>${this.parser.parseInline(tokens)}</em>`;
+		}
+		codespan({ text }) {
+			return `<code>${text}</code>`;
+		}
+		br() {
+			return '<br>';
+		}
+		del({ tokens }) {
+			return `<del>${this.parser.parseInline(tokens)}</del>`;
+		}
+		link({ href, title, tokens }) {
+			const text = this.parser.parseInline(tokens);
+			const cleanHref = cleanUrl(href);
+			if (cleanHref === null) {
+				return text;
+			}
+			href = cleanHref;
+			let out = '<a href="' + href + '"';
+			if (title) {
+				out += ' title="' + title + '"';
+			}
+			out += '>' + text + '</a>';
+			return out;
+		}
+		image({ href, title, text }) {
+			const cleanHref = cleanUrl(href);
+			if (cleanHref === null) {
+				return text;
+			}
+			href = cleanHref;
+			let out = `<img src="${href}" alt="${text}"`;
+			if (title) {
+				out += ` title="${title}"`;
+			}
+			out += '>';
+			return out;
+		}
+		text(token) {
+			return 'tokens' in token && token.tokens ? this.parser.parseInline(token.tokens) : token.text;
+		}
+	}
+
+	/**
+	 * TextRenderer
+	 * returns only the textual part of the token
+	 */
+	class _TextRenderer {
+		// no need for block level renderers
+		strong({ text }) {
+			return text;
+		}
+		em({ text }) {
+			return text;
+		}
+		codespan({ text }) {
+			return text;
+		}
+		del({ text }) {
+			return text;
+		}
+		html({ text }) {
+			return text;
+		}
+		text({ text }) {
+			return text;
+		}
+		link({ text }) {
+			return '' + text;
+		}
+		image({ text }) {
+			return '' + text;
+		}
+		br() {
+			return '';
+		}
+	}
+
+	/**
+	 * Parsing & Compiling
+	 */
+	class _Parser {
+		constructor(options) {
+			this.options = options || exports_defaults;
+			this.options.renderer = this.options.renderer || new _Renderer();
+			this.renderer = this.options.renderer;
+			this.renderer.options = this.options;
+			this.renderer.parser = this;
+			this.textRenderer = new _TextRenderer();
+		}
+		/**
+		 * Static Parse Method
+		 */
+		static parse(tokens, options) {
+			const parser = new _Parser(options);
+			return parser.parse(tokens);
+		}
+		/**
+		 * Static Parse Inline Method
+		 */
+		static parseInline(tokens, options) {
+			const parser = new _Parser(options);
+			return parser.parseInline(tokens);
+		}
+		/**
+		 * Parse Loop
+		 */
+		parse(tokens, top = true) {
+			let out = '';
+			for (let i = 0; i < tokens.length; i++) {
+				const anyToken = tokens[i];
+				// Run any renderer extensions
+				if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+					const genericToken = anyToken;
+					const ret = this.options.extensions.renderers[genericToken.type].call({ parser: this }, genericToken);
+					if (ret !== false || !['space', 'hr', 'heading', 'code', 'table', 'blockquote', 'list', 'html', 'paragraph', 'text'].includes(genericToken.type)) {
+						out += ret || '';
+						continue;
+					}
+				}
+				const token = anyToken;
+				switch (token.type) {
+					case 'space': {
+						out += this.renderer.space(token);
+						continue;
+					}
+					case 'hr': {
+						out += this.renderer.hr(token);
+						continue;
+					}
+					case 'heading': {
+						out += this.renderer.heading(token);
+						continue;
+					}
+					case 'code': {
+						out += this.renderer.code(token);
+						continue;
+					}
+					case 'table': {
+						out += this.renderer.table(token);
+						continue;
+					}
+					case 'blockquote': {
+						out += this.renderer.blockquote(token);
+						continue;
+					}
+					case 'list': {
+						out += this.renderer.list(token);
+						continue;
+					}
+					case 'html': {
+						out += this.renderer.html(token);
+						continue;
+					}
+					case 'paragraph': {
+						out += this.renderer.paragraph(token);
+						continue;
+					}
+					case 'text': {
+						let textToken = token;
+						let body = this.renderer.text(textToken);
+						while (i + 1 < tokens.length && tokens[i + 1].type === 'text') {
+							textToken = tokens[++i];
+							body += '\n' + this.renderer.text(textToken);
+						}
+						if (top) {
+							out += this.renderer.paragraph({
+								type: 'paragraph',
+								raw: body,
+								text: body,
+								tokens: [{ type: 'text', raw: body, text: body }],
+							});
+						}
+						else {
+							out += body;
+						}
+						continue;
+					}
+					default: {
+						const errMsg = 'Token with "' + token.type + '" type was not found.';
+						if (this.options.silent) {
+							console.error(errMsg);
+							return '';
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+			}
+			return out;
+		}
+		/**
+		 * Parse Inline Tokens
+		 */
+		parseInline(tokens, renderer) {
+			renderer = renderer || this.renderer;
+			let out = '';
+			for (let i = 0; i < tokens.length; i++) {
+				const anyToken = tokens[i];
+				// Run any renderer extensions
+				if (this.options.extensions && this.options.extensions.renderers && this.options.extensions.renderers[anyToken.type]) {
+					const ret = this.options.extensions.renderers[anyToken.type].call({ parser: this }, anyToken);
+					if (ret !== false || !['escape', 'html', 'link', 'image', 'strong', 'em', 'codespan', 'br', 'del', 'text'].includes(anyToken.type)) {
+						out += ret || '';
+						continue;
+					}
+				}
+				const token = anyToken;
+				switch (token.type) {
+					case 'escape': {
+						out += renderer.text(token);
+						break;
+					}
+					case 'html': {
+						out += renderer.html(token);
+						break;
+					}
+					case 'link': {
+						out += renderer.link(token);
+						break;
+					}
+					case 'image': {
+						out += renderer.image(token);
+						break;
+					}
+					case 'strong': {
+						out += renderer.strong(token);
+						break;
+					}
+					case 'em': {
+						out += renderer.em(token);
+						break;
+					}
+					case 'codespan': {
+						out += renderer.codespan(token);
+						break;
+					}
+					case 'br': {
+						out += renderer.br(token);
+						break;
+					}
+					case 'del': {
+						out += renderer.del(token);
+						break;
+					}
+					case 'text': {
+						out += renderer.text(token);
+						break;
+					}
+					default: {
+						const errMsg = 'Token with "' + token.type + '" type was not found.';
+						if (this.options.silent) {
+							console.error(errMsg);
+							return '';
+						}
+						else {
+							throw new Error(errMsg);
+						}
+					}
+				}
+			}
+			return out;
+		}
+	}
+
+	class _Hooks {
+		constructor(options) {
+			this.options = options || exports_defaults;
+		}
+		static passThroughHooks = new Set([
+			'preprocess',
+			'postprocess',
+			'processAllTokens',
+		]);
+		/**
+		 * Process markdown before marked
+		 */
+		preprocess(markdown) {
+			return markdown;
+		}
+		/**
+		 * Process HTML after marked is finished
+		 */
+		postprocess(html) {
+			return html;
+		}
+		/**
+		 * Process all tokens before walk tokens
+		 */
+		processAllTokens(tokens) {
+			return tokens;
+		}
+	}
+
+	class Marked {
+		constructor(...args) {
+			this.defaults = _getDefaults();
+			this.options = this.setOptions;
+			this.parse = this.parseMarkdown(_Lexer.lex, _Parser.parse);
+			this.parseInline = this.parseMarkdown(_Lexer.lexInline, _Parser.parseInline);
+			this.Parser = _Parser;
+			this.Renderer = _Renderer;
+			this.TextRenderer = _TextRenderer;
+			this.Lexer = _Lexer;
+			this.Tokenizer = _Tokenizer;
+			this.Hooks = _Hooks;
+			this.use(...args);
+		}
+		/**
+		 * Run callback for every token
+		 */
+		walkTokens(tokens, callback) {
+			let values = [];
+			for (const token of tokens) {
+				values = values.concat(callback.call(this, token));
+				switch (token.type) {
+					case 'table': {
+						const tableToken = token;
+						for (const cell of tableToken.header) {
+							values = values.concat(this.walkTokens(cell.tokens, callback));
+						}
+						for (const row of tableToken.rows) {
+							for (const cell of row) {
+								values = values.concat(this.walkTokens(cell.tokens, callback));
+							}
+						}
+						break;
+					}
+					case 'list': {
+						const listToken = token;
+						values = values.concat(this.walkTokens(listToken.items, callback));
+						break;
+					}
+					default: {
+						const genericToken = token;
+						if (this.defaults.extensions?.childTokens?.[genericToken.type]) {
+							this.defaults.extensions.childTokens[genericToken.type].forEach((childTokens) => {
+								const tokens = genericToken[childTokens].flat(Infinity);
+								values = values.concat(this.walkTokens(tokens, callback));
+							});
+						}
+						else if (genericToken.tokens) {
+							values = values.concat(this.walkTokens(genericToken.tokens, callback));
+						}
+					}
+				}
+			}
+			return values;
+		}
+		use(...args) {
+			const extensions = this.defaults.extensions || { renderers: {}, childTokens: {} };
+			args.forEach((pack) => {
+				// copy options to new object
+				const opts = { ...pack };
+				// set async to true if it was set to true before
+				opts.async = this.defaults.async || opts.async || false;
+				// ==-- Parse "addon" extensions --== //
+				if (pack.extensions) {
+					pack.extensions.forEach((ext) => {
+						if (!ext.name) {
+							throw new Error('extension name required');
+						}
+						if ('renderer' in ext) { // Renderer extensions
+							const prevRenderer = extensions.renderers[ext.name];
+							if (prevRenderer) {
+								// Replace extension with func to run new extension but fall back if false
+								extensions.renderers[ext.name] = function (...args) {
+									let ret = ext.renderer.apply(this, args);
+									if (ret === false) {
+										ret = prevRenderer.apply(this, args);
+									}
+									return ret;
+								};
+							}
+							else {
+								extensions.renderers[ext.name] = ext.renderer;
+							}
+						}
+						if ('tokenizer' in ext) { // Tokenizer Extensions
+							if (!ext.level || (ext.level !== 'block' && ext.level !== 'inline')) {
+								throw new Error("extension level must be 'block' or 'inline'");
+							}
+							const extLevel = extensions[ext.level];
+							if (extLevel) {
+								extLevel.unshift(ext.tokenizer);
+							}
+							else {
+								extensions[ext.level] = [ext.tokenizer];
+							}
+							if (ext.start) { // Function to check for start of token
+								if (ext.level === 'block') {
+									if (extensions.startBlock) {
+										extensions.startBlock.push(ext.start);
+									}
+									else {
+										extensions.startBlock = [ext.start];
+									}
+								}
+								else if (ext.level === 'inline') {
+									if (extensions.startInline) {
+										extensions.startInline.push(ext.start);
+									}
+									else {
+										extensions.startInline = [ext.start];
+									}
+								}
+							}
+						}
+						if ('childTokens' in ext && ext.childTokens) { // Child tokens to be visited by walkTokens
+							extensions.childTokens[ext.name] = ext.childTokens;
+						}
+					});
+					opts.extensions = extensions;
+				}
+				// ==-- Parse "overwrite" extensions --== //
+				if (pack.renderer) {
+					const renderer = this.defaults.renderer || new _Renderer(this.defaults);
+					for (const prop in pack.renderer) {
+						if (!(prop in renderer)) {
+							throw new Error(`renderer '${prop}' does not exist`);
+						}
+						if (['options', 'parser'].includes(prop)) {
+							// ignore options property
+							continue;
+						}
+						const rendererProp = prop;
+						const rendererFunc = pack.renderer[rendererProp];
+						const prevRenderer = renderer[rendererProp];
+						// Replace renderer with func to run extension, but fall back if false
+						renderer[rendererProp] = (...args) => {
+							let ret = rendererFunc.apply(renderer, args);
+							if (ret === false) {
+								ret = prevRenderer.apply(renderer, args);
+							}
+							return ret || '';
+						};
+					}
+					opts.renderer = renderer;
+				}
+				if (pack.tokenizer) {
+					const tokenizer = this.defaults.tokenizer || new _Tokenizer(this.defaults);
+					for (const prop in pack.tokenizer) {
+						if (!(prop in tokenizer)) {
+							throw new Error(`tokenizer '${prop}' does not exist`);
+						}
+						if (['options', 'rules', 'lexer'].includes(prop)) {
+							// ignore options, rules, and lexer properties
+							continue;
+						}
+						const tokenizerProp = prop;
+						const tokenizerFunc = pack.tokenizer[tokenizerProp];
+						const prevTokenizer = tokenizer[tokenizerProp];
+						// Replace tokenizer with func to run extension, but fall back if false
+						// @ts-expect-error cannot type tokenizer function dynamically
+						tokenizer[tokenizerProp] = (...args) => {
+							let ret = tokenizerFunc.apply(tokenizer, args);
+							if (ret === false) {
+								ret = prevTokenizer.apply(tokenizer, args);
+							}
+							return ret;
+						};
+					}
+					opts.tokenizer = tokenizer;
+				}
+				// ==-- Parse Hooks extensions --== //
+				if (pack.hooks) {
+					const hooks = this.defaults.hooks || new _Hooks();
+					for (const prop in pack.hooks) {
+						if (!(prop in hooks)) {
+							throw new Error(`hook '${prop}' does not exist`);
+						}
+						if (prop === 'options') {
+							// ignore options property
+							continue;
+						}
+						const hooksProp = prop;
+						const hooksFunc = pack.hooks[hooksProp];
+						const prevHook = hooks[hooksProp];
+						if (_Hooks.passThroughHooks.has(prop)) {
+							// @ts-expect-error cannot type hook function dynamically
+							hooks[hooksProp] = (arg) => {
+								if (this.defaults.async) {
+									return Promise.resolve(hooksFunc.call(hooks, arg)).then(ret => {
+										return prevHook.call(hooks, ret);
+									});
+								}
+								const ret = hooksFunc.call(hooks, arg);
+								return prevHook.call(hooks, ret);
+							};
+						}
+						else {
+							// @ts-expect-error cannot type hook function dynamically
+							hooks[hooksProp] = (...args) => {
+								let ret = hooksFunc.apply(hooks, args);
+								if (ret === false) {
+									ret = prevHook.apply(hooks, args);
+								}
+								return ret;
+							};
+						}
+					}
+					opts.hooks = hooks;
+				}
+				// ==-- Parse WalkTokens extensions --== //
+				if (pack.walkTokens) {
+					const walkTokens = this.defaults.walkTokens;
+					const packWalktokens = pack.walkTokens;
+					opts.walkTokens = function (token) {
+						let values = [];
+						values.push(packWalktokens.call(this, token));
+						if (walkTokens) {
+							values = values.concat(walkTokens.call(this, token));
+						}
+						return values;
+					};
+				}
+				this.defaults = { ...this.defaults, ...opts };
+			});
+			return this;
+		}
+		setOptions(opt) {
+			this.defaults = { ...this.defaults, ...opt };
+			return this;
+		}
+		lexer(src, options) {
+			return _Lexer.lex(src, options ?? this.defaults);
+		}
+		parser(tokens, options) {
+			return _Parser.parse(tokens, options ?? this.defaults);
+		}
+		parseMarkdown(lexer, parser) {
+			// eslint-disable-next-line
+			const parse = (src, options) => {
+				const origOpt = { ...options };
+				const opt = { ...this.defaults, ...origOpt };
+				const throwError = this.onError(!!opt.silent, !!opt.async);
+				// throw error if an extension set async to true but parse was called with async: false
+				if (this.defaults.async === true && origOpt.async === false) {
+					return throwError(new Error('marked(): The async option was set to true by an extension. Remove async: false from the parse options object to return a Promise.'));
+				}
+				// throw error in case of non string input
+				if (typeof src === 'undefined' || src === null) {
+					return throwError(new Error('marked(): input parameter is undefined or null'));
+				}
+				if (typeof src !== 'string') {
+					return throwError(new Error('marked(): input parameter is of type '
+						+ Object.prototype.toString.call(src) + ', string expected'));
+				}
+				if (opt.hooks) {
+					opt.hooks.options = opt;
+				}
+				if (opt.async) {
+					return Promise.resolve(opt.hooks ? opt.hooks.preprocess(src) : src)
+						.then(src => lexer(src, opt))
+						.then(tokens => opt.hooks ? opt.hooks.processAllTokens(tokens) : tokens)
+						.then(tokens => opt.walkTokens ? Promise.all(this.walkTokens(tokens, opt.walkTokens)).then(() => tokens) : tokens)
+						.then(tokens => parser(tokens, opt))
+						.then(html => opt.hooks ? opt.hooks.postprocess(html) : html)
+						.catch(throwError);
+				}
+				try {
+					if (opt.hooks) {
+						src = opt.hooks.preprocess(src);
+					}
+					let tokens = lexer(src, opt);
+					if (opt.hooks) {
+						tokens = opt.hooks.processAllTokens(tokens);
+					}
+					if (opt.walkTokens) {
+						this.walkTokens(tokens, opt.walkTokens);
+					}
+					let html = parser(tokens, opt);
+					if (opt.hooks) {
+						html = opt.hooks.postprocess(html);
+					}
+					return html;
+				}
+				catch (e) {
+					return throwError(e);
+				}
+			};
+			return parse;
+		}
+		onError(silent, async) {
+			return (e) => {
+				e.message += '\nPlease report this to https://github.com/markedjs/marked.';
+				if (silent) {
+					const msg = '<p>An error occurred:</p><pre>'
+						+ escape$1(e.message + '', true)
+						+ '</pre>';
+					if (async) {
+						return Promise.resolve(msg);
+					}
+					return msg;
+				}
+				if (async) {
+					return Promise.reject(e);
+				}
+				throw e;
+			};
+		}
+	}
+
+	const markedInstance = new Marked();
+/*
+	function changeDefaults(newDefaults) {
+		exports_defaults = newDefaults;
+	}
+
+	function marked(src, opt) {
+		return markedInstance.parse(src, opt);
+	}
+	/**
+	 * Sets the default options.
+	 *
+	 * @param options Hash of options
+	 * /
+	marked.options =
+		marked.setOptions = (options) => {
+			markedInstance.setOptions(options);
+			marked.defaults = markedInstance.defaults;
+			changeDefaults(marked.defaults);
+			return marked;
+		};
+	/**
+	 * Gets the original marked default options.
+	 * /
+	marked.defaults = exports_defaults;
+	/**
+	 * Run callback for every token
+	 * /
+	marked.walkTokens = (tokens, callback) => markedInstance.walkTokens(tokens, callback);
+	/**
+	 * Expose
+	 * /
+	marked.Parser = _Parser;
+	marked.parser = _Parser.parse;
+	marked.Renderer = _Renderer;
+	marked.TextRenderer = _TextRenderer;
+	marked.Lexer = _Lexer;
+	marked.lexer = _Lexer.lex;
+	marked.Tokenizer = _Tokenizer;
+	marked.Hooks = _Hooks;
+	marked.parse = marked;
+*/
+
+	return {
+/*
+		Hooks: _Hooks,
+		Lexer: _Lexer,
+		Marked: Marked,
+		Parser: _Parser,
+		Renderer: _Renderer,
+		TextRenderer: _TextRenderer,
+		Tokenizer: _Tokenizer,
+		getDefaults: _getDefaults,
+		lexer: _Lexer.lex,
+		marked: marked,
+		options: marked.options,
+*/
+		parse: (src, opt) => markedInstance.parse(src, opt),
+/*
+		/**
+		 * Compiles markdown to HTML without enclosing `p` tag.
+		 *
+		 * @param src String of markdown source to be compiled
+		 * @param options Hash of options
+		 * @return String of compiled HTML
+		 * /
+		parseInline: markedInstance.parseInline,
+		parser: _Parser.parse,
+		setOptions: marked.setOptions,
+		/**
+		 * Use Extension
+		 * /
+		use: (...args) => {
+			markedInstance.use(...args);
+			marked.defaults = markedInstance.defaults;
+			changeDefaults(marked.defaults);
+			return marked;
+		},
+		walkTokens: marked.walkTokens
+*/
+	};
+})();
diff --git a/vendors/mathiasbynens/punycode.js b/vendors/mathiasbynens/punycode.js
new file mode 100644
index 000000000..7afa38258
--- /dev/null
+++ b/vendors/mathiasbynens/punycode.js
@@ -0,0 +1,395 @@
+/**
+ * Modified version of https://github.com/mathiasbynens/punycode.js
+ */
+
+(() => {
+
+'use strict';
+
+const
+	/** Highest positive signed 32-bit float value */
+	maxInt = 2147483647, // aka. 0x7FFFFFFF or 2^31-1
+
+	/** Bootstring parameters */
+	base = 36,
+	tMin = 1,
+	tMax = 26,
+	skew = 38,
+	damp = 700,
+	initialBias = 72,
+	initialN = 128, // 0x80
+	delimiter = '-', // '\x2D'
+
+	/** Regular expressions */
+	regexPunycode = /^xn--/,
+	regexNonASCII = /[^\0-\x7F]/, // Note: U+007F DEL is excluded too.
+	regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g, // RFC 3490 separators
+
+	/** Error messages */
+	errors = {
+		'overflow': 'Overflow: input needs wider integers to process',
+		'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
+		'invalid-input': 'Invalid input'
+	},
+
+	/** Convenience shortcuts */
+	baseMinusTMin = base - tMin,
+	floor = Math.floor,
+	stringFromCharCode = String.fromCharCode,
+
+	/*--------------------------------------------------------------------------*/
+
+	/**
+	 * A generic error utility function.
+	 * @private
+	 * @param {String} type The error type.
+	 * @returns {Error} Throws a `RangeError` with the applicable error message.
+	 */
+	error = type => {
+		throw new RangeError(errors[type])
+	},
+
+	/**
+	 * A simple `Array#map`-like wrapper to work with domain name strings or email
+	 * addresses.
+	 * @private
+	 * @param {String} domain The domain name or email address.
+	 * @param {Function} callback The function that gets called for every
+	 * character.
+	 * @returns {String} A new string of characters returned by the callback
+	 * function.
+	 */
+	mapDomain = (domain, callback) => {
+		// In email addresses, only the domain name should be punycoded.
+		// Leave the local part (i.e. everything up to `@`) intact.
+		const parts = (domain || '').split('@');
+		parts.push(
+			parts.pop()
+			.split(regexSeparators)
+			.map(label => callback(label))
+			.join('.')
+		);
+		return parts.join('@');
+	},
+
+	/**
+	 * Creates an array containing the numeric code points of each Unicode
+	 * character in the string. While JavaScript uses UCS-2 internally,
+	 * this function will convert a pair of surrogate halves (each of which
+	 * UCS-2 exposes as separate characters) into a single code point,
+	 * matching UTF-16.
+	 * @see <https://mathiasbynens.be/notes/javascript-encoding>
+	 * @name decode
+	 * @param {String} string The Unicode input string (UCS-2).
+	 * @returns {Array} The new array of code points.
+	 */
+	ucs2decode = string => {
+		const output = [];
+		let counter = 0;
+		const length = string.length;
+		while (counter < length) {
+			const value = string.charCodeAt(counter++);
+			if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
+				// It's a high surrogate, and there is a next character.
+				const extra = string.charCodeAt(counter++);
+				if ((extra & 0xFC00) == 0xDC00) { // Low surrogate.
+					output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
+				} else {
+					// It's an unmatched surrogate; only append this code unit, in case the
+					// next code unit is the high surrogate of a surrogate pair.
+					output.push(value);
+					counter--;
+				}
+			} else {
+				output.push(value);
+			}
+		}
+		return output;
+	},
+
+	/**
+	 * Converts a basic code point into a digit/integer.
+	 * @see `digitToBasic()`
+	 * @private
+	 * @param {Number} codePoint The basic numeric code point value.
+	 * @returns {Number} The numeric value of a basic code point (for use in
+	 * representing integers) in the range `0` to `base - 1`, or `base` if
+	 * the code point does not represent a value.
+	 */
+	basicToDigit = codePoint => {
+		if (codePoint >= 0x30 && codePoint < 0x3A) {
+			return 26 + (codePoint - 0x30);
+		}
+		if (codePoint >= 0x41 && codePoint < 0x5B) {
+			return codePoint - 0x41;
+		}
+		if (codePoint >= 0x61 && codePoint < 0x7B) {
+			return codePoint - 0x61;
+		}
+		return base;
+	},
+
+	/**
+	 * Converts a digit/integer into a basic code point.
+	 * @see `basicToDigit()`
+	 * @private
+	 * @param {Number} digit The numeric value of a basic code point.
+	 * @returns {Number} The basic code point whose value (when used for
+	 * representing integers) is `digit`, which needs to be in the range
+	 * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
+	 * used; else, the lowercase form is used. The behavior is undefined
+	 * if `flag` is non-zero and `digit` has no uppercase form.
+	 */
+	digitToBasic = (digit, flag) =>
+		//  0..25 map to ASCII a..z or A..Z
+		// 26..35 map to ASCII 0..9
+		digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5),
+
+	/**
+	 * Bias adaptation function as per section 3.4 of RFC 3492.
+	 * https://tools.ietf.org/html/rfc3492#section-3.4
+	 * @private
+	 */
+	adapt = (delta, numPoints, firstTime) => {
+		let k = 0;
+		delta = firstTime ? floor(delta / damp) : delta >> 1;
+		delta += floor(delta / numPoints);
+		for (/* no initialization */; delta > baseMinusTMin * tMax >> 1; k += base) {
+			delta = floor(delta / baseMinusTMin);
+		}
+		return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
+	},
+
+	/**
+	 * Converts a Punycode string of ASCII-only symbols to a string of Unicode
+	 * symbols.
+	 * @memberOf punycode
+	 * @param {String} input The Punycode string of ASCII-only symbols.
+	 * @returns {String} The resulting string of Unicode symbols.
+	 */
+	decode = input => {
+		// Don't use UCS-2.
+		const output = [];
+		const inputLength = input.length;
+		let i = 0;
+		let n = initialN;
+		let bias = initialBias;
+
+		// Handle the basic code points: let `basic` be the number of input code
+		// points before the last delimiter, or `0` if there is none, then copy
+		// the first basic code points to the output.
+
+		let basic = input.lastIndexOf(delimiter);
+		if (basic < 0) {
+			basic = 0;
+		}
+
+		for (let j = 0; j < basic; ++j) {
+			// if it's not a basic code point
+			if (input.charCodeAt(j) >= 0x80) {
+				error('not-basic');
+			}
+			output.push(input.charCodeAt(j));
+		}
+
+		// Main decoding loop: start just after the last delimiter if any basic code
+		// points were copied; start at the beginning otherwise.
+
+		for (let index = basic > 0 ? basic + 1 : 0; index < inputLength; /* no final expression */) {
+
+			// `index` is the index of the next character to be consumed.
+			// Decode a generalized variable-length integer into `delta`,
+			// which gets added to `i`. The overflow checking is easier
+			// if we increase `i` as we go, then subtract off its starting
+			// value at the end to obtain `delta`.
+			const oldi = i;
+			for (let w = 1, k = base; /* no condition */; k += base) {
+
+				if (index >= inputLength) {
+					error('invalid-input');
+				}
+
+				const digit = basicToDigit(input.charCodeAt(index++));
+
+				if (digit >= base) {
+					error('invalid-input');
+				}
+				if (digit > floor((maxInt - i) / w)) {
+					error('overflow');
+				}
+
+				i += digit * w;
+				const t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+
+				if (digit < t) {
+					break;
+				}
+
+				const baseMinusT = base - t;
+				if (w > floor(maxInt / baseMinusT)) {
+					error('overflow');
+				}
+
+				w *= baseMinusT;
+
+			}
+
+			const out = output.length + 1;
+			bias = adapt(i - oldi, out, oldi == 0);
+
+			// `i` was supposed to wrap around from `out` to `0`,
+			// incrementing `n` each time, so we'll fix that now:
+			if (floor(i / out) > maxInt - n) {
+				error('overflow');
+			}
+
+			n += floor(i / out);
+			i %= out;
+
+			// Insert `n` at position `i` of the output.
+			output.splice(i++, 0, n);
+
+		}
+
+		return String.fromCodePoint(...output);
+	},
+
+	/**
+	 * Converts a string of Unicode symbols (e.g. a domain name label) to a
+	 * Punycode string of ASCII-only symbols.
+	 * @memberOf punycode
+	 * @param {String} input The string of Unicode symbols.
+	 * @returns {String} The resulting Punycode string of ASCII-only symbols.
+	 */
+	encode = input => {
+		const output = [];
+
+		// Convert the input in UCS-2 to an array of Unicode code points.
+		input = ucs2decode(input);
+
+		// Cache the length.
+		const inputLength = input.length;
+
+		// Initialize the state.
+		let n = initialN;
+		let delta = 0;
+		let bias = initialBias;
+
+		// Handle the basic code points.
+		for (const currentValue of input) {
+			if (currentValue < 0x80) {
+				output.push(stringFromCharCode(currentValue));
+			}
+		}
+
+		const basicLength = output.length;
+		let handledCPCount = basicLength;
+
+		// `handledCPCount` is the number of code points that have been handled;
+		// `basicLength` is the number of basic code points.
+
+		// Finish the basic string with a delimiter unless it's empty.
+		if (basicLength) {
+			output.push(delimiter);
+		}
+
+		// Main encoding loop:
+		while (handledCPCount < inputLength) {
+
+			// All non-basic code points < n have been handled already. Find the next
+			// larger one:
+			let m = maxInt;
+			for (const currentValue of input) {
+				if (currentValue >= n && currentValue < m) {
+					m = currentValue;
+				}
+			}
+
+			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
+			// but guard against overflow.
+			const handledCPCountPlusOne = handledCPCount + 1;
+			if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
+				error('overflow');
+			}
+
+			delta += (m - n) * handledCPCountPlusOne;
+			n = m;
+
+			for (const currentValue of input) {
+				if (currentValue < n && ++delta > maxInt) {
+					error('overflow');
+				}
+				if (currentValue === n) {
+					// Represent delta as a generalized variable-length integer.
+					let q = delta;
+					for (let k = base; /* no condition */; k += base) {
+						const t = k <= bias ? tMin : (k >= bias + tMax ? tMax : k - bias);
+						if (q < t) {
+							break;
+						}
+						const qMinusT = q - t;
+						const baseMinusT = base - t;
+						output.push(
+							stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0))
+						);
+						q = floor(qMinusT / baseMinusT);
+					}
+
+					output.push(stringFromCharCode(digitToBasic(q, 0)));
+					bias = adapt(delta, handledCPCountPlusOne, handledCPCount === basicLength);
+					delta = 0;
+					++handledCPCount;
+				}
+			}
+
+			++delta;
+			++n;
+
+		}
+		return output.join('');
+	};
+
+	/*--------------------------------------------------------------------------*/
+
+	/** Define the public API */
+	window.IDN = {
+		/**
+		 * A string representing the current Punycode.js version number.
+		 * @memberOf punycode
+		 * @type String
+		 */
+		version: '2.3.1',
+
+		/**
+		 * Converts a Punycode string representing a domain name or an email address
+		 * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
+		 * it doesn't matter if you call it on a string that has already been
+		 * converted to Unicode.
+		 * @memberOf punycode
+		 * @param {String} input The Punycoded domain name or email address to
+		 * convert to Unicode.
+		 * @returns {String} The Unicode representation of the given Punycode
+		 * string.
+		 */
+		toUnicode: input => mapDomain(
+			input,
+			string => regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string
+		),
+
+		/**
+		 * Converts a Unicode string representing a domain name or an email address to
+		 * Punycode. Only the non-ASCII parts of the domain name will be converted,
+		 * i.e. it doesn't matter if you call it with a domain that's already in
+		 * ASCII.
+		 * @memberOf punycode
+		 * @param {String} input The domain name or email address to convert, as a
+		 * Unicode string.
+		 * @returns {String} The Punycode representation of the given domain name or
+		 * email address.
+		 */
+		toASCII: input => mapDomain(
+			input,
+			string => (regexNonASCII.test(string) ? 'xn--' + encode(string) : string).toLowerCase()
+		)
+	};
+})();
diff --git a/vendors/openpgp-5/README.md b/vendors/openpgp-5/README.md
index 144cbf416..1f719ee4e 100644
--- a/vendors/openpgp-5/README.md
+++ b/vendors/openpgp-5/README.md
@@ -75,7 +75,7 @@ library to convert back and forth between them.
 
 * If the user's browser supports [native WebCrypto](https://caniuse.com/#feat=cryptography) via the `window.crypto.subtle` API, this will be used. Under Node.js the native [crypto module](https://nodejs.org/api/crypto.html#crypto_crypto) is used.
 
-* The library implements the [IETF proposal](https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-10) for authenticated encryption using native AES-EAX, OCB, or GCM. This makes symmetric encryption up to 30x faster on supported platforms. Since the specification has not been finalized and other OpenPGP implementations haven't adopted it yet, the feature is currently behind a flag. **Note: activating this setting can break compatibility with other OpenPGP implementations, and also with future versions of OpenPGP.js. Don't use it with messages you want to store on disk or in a database.** You can enable it by setting `openpgp.config.aeadProtect = true`.
+* The library implements the [RFC4880bis proposal](https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-10) for authenticated encryption using native AES-EAX, OCB, or GCM. This makes symmetric encryption up to 30x faster on supported platforms. Since the specification has not been finalized and other OpenPGP implementations haven't adopted it yet, the feature is currently behind a flag. **Note: activating this setting can break compatibility with other OpenPGP implementations, and also with future versions of OpenPGP.js. Don't use it with messages you want to store on disk or in a database.** You can enable it by setting `openpgp.config.aeadProtect = true`.
 
   You can change the AEAD mode by setting one of the following options:
 
@@ -172,6 +172,16 @@ import * as openpgp from './openpgp.min.mjs';
 
 To offload cryptographic operations off the main thread, you can implement a Web Worker in your application and load OpenPGP.js from there. For an example Worker implementation, see `test/worker/worker_example.js`.
 
+#### TypeScript
+
+Since TS is not fully integrated in the library, TS-only dependencies are currently listed as `devDependencies`, so to compile the project you’ll need to add `@openpgp/web-stream-tools` manually (NB: only versions below v0.12 are compatible with OpenPGP.js v5):
+
+```sh
+npm install --save-dev @openpgp/web-stream-tools@0.0.11-patch-0
+```
+
+If you notice missing or incorrect type definitions, feel free to open a PR.
+
 ### Examples
 
 Here are some examples of how to use OpenPGP.js v5. For more elaborate examples and working code, please check out the [public API unit tests](https://github.com/openpgpjs/openpgpjs/blob/main/test/general/openpgp.js). If you're upgrading from v4 it might help to check out the [changelog](https://github.com/openpgpjs/openpgpjs/wiki/V5-Changelog) and [documentation](https://github.com/openpgpjs/openpgpjs#documentation).
diff --git a/vendors/openpgp-5/dist/openpgp.js b/vendors/openpgp-5/dist/openpgp.js
index 2c59e4e4e..6eb7d9e01 100644
--- a/vendors/openpgp-5/dist/openpgp.js
+++ b/vendors/openpgp-5/dist/openpgp.js
@@ -1,4 +1,4 @@
-/*! OpenPGP.js v5.2.1 - 2022-03-30 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
+/*! OpenPGP.js v5.11.1 - 2024-03-15 - this is LGPL licensed code, see LICENSE/our website https://openpgpjs.org/ for more information. */
 var openpgp = (function (exports) {
   'use strict';
 
@@ -160,7 +160,7 @@ var openpgp = (function (exports) {
     let totalLength = 0;
     for (let i = 0; i < arrays.length; i++) {
       if (!isUint8Array(arrays[i])) {
-        throw new Error('concatUint8Array: Data must be in the form of a Uint8Array');
+        throw Error('concatUint8Array: Data must be in the form of a Uint8Array');
       }
 
       totalLength += arrays[i].length;
@@ -793,7 +793,7 @@ var openpgp = (function (exports) {
    */
   function tee(input) {
     if (isArrayStream(input)) {
-      throw new Error('ArrayStream cannot be tee()d, use clone() instead');
+      throw Error('ArrayStream cannot be tee()d, use clone() instead');
     }
     if (isStream(input)) {
       const teed = toStream(input).tee();
@@ -892,7 +892,7 @@ var openpgp = (function (exports) {
    */
   function slice(input, begin=0, end=Infinity) {
     if (isArrayStream(input)) {
-      throw new Error('Not implemented');
+      throw Error('Not implemented');
     }
     if (isStream(input)) {
       if (begin >= 0 && end >= 0) {
@@ -1021,7 +1021,7 @@ var openpgp = (function (exports) {
      */
     constructor(n) {
       if (n === undefined) {
-        throw new Error('Invalid BigInteger input');
+        throw Error('Invalid BigInteger input');
       }
 
       if (n instanceof Uint8Array) {
@@ -1187,7 +1187,7 @@ var openpgp = (function (exports) {
     modInv(n) {
       const { gcd, x } = this._egcd(n);
       if (!gcd.isOne()) {
-        throw new Error('Inverse does not exist');
+        throw Error('Inverse does not exist');
       }
       return x.add(n).mod(n);
     }
@@ -1367,7 +1367,7 @@ var openpgp = (function (exports) {
       const number = Number(this.value);
       if (number > Number.MAX_SAFE_INTEGER) {
         // We throw and error to conform with the bn.js implementation
-        throw new Error('Number can only safely store up to 53 bits');
+        throw Error('Number can only safely store up to 53 bits');
       }
       return number;
     }
@@ -1452,8 +1452,10 @@ var openpgp = (function (exports) {
     }
   }
 
+  const detectBigInt = () => typeof BigInt !== 'undefined';
+
   async function getBigInteger() {
-    if (util.detectBigInt()) {
+    if (detectBigInt()) {
       return BigInteger$1;
     } else {
       const { default: BigInteger } = await Promise.resolve().then(function () { return bn_interface; });
@@ -1461,617 +1463,6 @@ var openpgp = (function (exports) {
     }
   }
 
-  // GPG4Browsers - An OpenPGP implementation in javascript
-
-  const util = {
-    isString: data => null != data && (typeof data === 'string' || Object.prototype.isPrototypeOf.call(data, String)),
-
-    isArray: data => Array.isArray(data),
-
-    isUint8Array: isUint8Array,
-
-    isStream: isStream,
-
-    readNumber(bytes) {
-      let n = 0;
-      for (let i = 0; i < bytes.length; i++) {
-        n += (256 ** i) * bytes[bytes.length - 1 - i];
-      }
-      return n;
-    },
-
-    writeNumber(n, bytes) {
-      const b = new Uint8Array(bytes);
-      for (let i = 0; i < bytes; i++) {
-        b[i] = (n >> (8 * (bytes - i - 1))) & 0xFF;
-      }
-
-      return b;
-    },
-
-    readDate: bytes => new Date(util.readNumber(bytes) * 1000),
-
-    writeDate: time => util.writeNumber(Math.floor(time.getTime() / 1000), 4),
-
-    normalizeDate: (time = Date.now()) =>
-      time === null || time === Infinity ? time : new Date(Math.floor(+time / 1000) * 1000),
-
-    /**
-     * Read one MPI from bytes in input
-     * @param {Uint8Array} bytes - Input data to parse
-     * @returns {Uint8Array} Parsed MPI.
-     */
-    readMPI(bytes) {
-      const bits = (bytes[0] << 8) | bytes[1];
-      const bytelen = (bits + 7) >>> 3;
-      return bytes.subarray(2, 2 + bytelen);
-    },
-
-    /**
-     * Left-pad Uint8Array to length by adding 0x0 bytes
-     * @param {Uint8Array} bytes - Data to pad
-     * @param {Number} length - Padded length
-     * @returns {Uint8Array} Padded bytes.
-     */
-    leftPad(bytes, length) {
-      const padded = new Uint8Array(length);
-      padded.set(bytes, length - bytes.length);
-      return padded;
-    },
-
-    /**
-     * Convert a Uint8Array to an MPI-formatted Uint8Array.
-     * @param {Uint8Array} bin - An array of 8-bit integers to convert
-     * @returns {Uint8Array} MPI-formatted Uint8Array.
-     */
-    uint8ArrayToMPI(bin) {
-      const bitSize = util.uint8ArrayBitLength(bin);
-      if (bitSize === 0) {
-        throw new Error('Zero MPI');
-      }
-      const stripped = bin.subarray(bin.length - Math.ceil(bitSize / 8));
-      const prefix = new Uint8Array([(bitSize & 0xFF00) >> 8, bitSize & 0xFF]);
-      return util.concatUint8Array([prefix, stripped]);
-    },
-
-    /**
-     * Return bit length of the input data
-     * @param {Uint8Array} bin input data (big endian)
-     * @returns bit length
-     */
-    uint8ArrayBitLength(bin) {
-      let i; // index of leading non-zero byte
-      for (i = 0; i < bin.length; i++) if (bin[i] !== 0) break;
-      if (i === bin.length) {
-        return 0;
-      }
-      const stripped = bin.subarray(i);
-      return (stripped.length - 1) * 8 + util.nbits(stripped[0]);
-    },
-
-    /**
-     * Convert a hex string to an array of 8-bit integers
-     * @param {String} hex - A hex string to convert
-     * @returns {Uint8Array} An array of 8-bit integers.
-     */
-    hexToUint8Array(hex) {
-      const result = new Uint8Array(hex.length >> 1);
-      for (let k = 0; k < hex.length >> 1; k++) {
-        result[k] = parseInt(hex.substr(k << 1, 2), 16);
-      }
-      return result;
-    },
-
-    /**
-     * Convert an array of 8-bit integers to a hex string
-     * @param {Uint8Array} bytes - Array of 8-bit integers to convert
-     * @returns {String} Hexadecimal representation of the array.
-     */
-    uint8ArrayToHex(bytes) {
-      const r = [];
-      const e = bytes.length;
-      let c = 0;
-      let h;
-      while (c < e) {
-        h = bytes[c++].toString(16);
-        while (h.length < 2) {
-          h = '0' + h;
-        }
-        r.push('' + h);
-      }
-      return r.join('');
-    },
-
-    /**
-     * Convert a string to an array of 8-bit integers
-     * @param {String} str - String to convert
-     * @returns {Uint8Array} An array of 8-bit integers.
-     */
-    stringToUint8Array: str =>
-      transform(str, str => {
-        if (!util.isString(str)) {
-          throw new Error('stringToUint8Array: Data must be in the form of a string');
-        }
-
-        const result = new Uint8Array(str.length);
-        for (let i = 0; i < str.length; i++) {
-          result[i] = str.charCodeAt(i);
-        }
-        return result;
-      }),
-
-    /**
-     * Convert an array of 8-bit integers to a string
-     * @param {Uint8Array} bytes - An array of 8-bit integers to convert
-     * @returns {String} String representation of the array.
-     */
-    uint8ArrayToString(bytes) {
-      bytes = new Uint8Array(bytes);
-      const result = [];
-      const bs = 1 << 14;
-      const j = bytes.length;
-
-      for (let i = 0; i < j; i += bs) {
-        result.push(String.fromCharCode.apply(String, bytes.subarray(i, i + bs < j ? i + bs : j)));
-      }
-      return result.join('');
-    },
-
-    /**
-     * Convert a native javascript string to a Uint8Array of utf8 bytes
-     * @param {String|ReadableStream} str - The string to convert
-     * @returns {Uint8Array|ReadableStream} A valid squence of utf8 bytes.
-     */
-    encodeUTF8(str) {
-      const encoder = new TextEncoder('utf-8');
-      // eslint-disable-next-line no-inner-declarations
-      function process(value, lastChunk = false) {
-        return encoder.encode(value, { stream: !lastChunk });
-      }
-      return transform(str, process, () => process('', true));
-    },
-
-    /**
-     * Convert a Uint8Array of utf8 bytes to a native javascript string
-     * @param {Uint8Array|ReadableStream} utf8 - A valid squence of utf8 bytes
-     * @returns {String|ReadableStream} A native javascript string.
-     */
-    decodeUTF8(utf8) {
-      const decoder = new TextDecoder('utf-8');
-      // eslint-disable-next-line no-inner-declarations
-      function process(value, lastChunk = false) {
-        return decoder.decode(value, { stream: !lastChunk });
-      }
-      return transform(utf8, process, () => process(new Uint8Array(), true));
-    },
-
-    /**
-     * Concat a list of Uint8Arrays, Strings or Streams
-     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
-     * @param {Array<Uint8Array|String|ReadableStream>} Array - Of Uint8Arrays/Strings/Streams to concatenate
-     * @returns {Uint8Array|String|ReadableStream} Concatenated array.
-     */
-    concat: concat,
-
-    /**
-     * Concat Uint8Arrays
-     * @param {Array<Uint8Array>} Array - Of Uint8Arrays to concatenate
-     * @returns {Uint8Array} Concatenated array.
-     */
-    concatUint8Array: concatUint8Array,
-
-    /**
-     * Check Uint8Array equality
-     * @param {Uint8Array} array1 - First array
-     * @param {Uint8Array} array2 - Second array
-     * @returns {Boolean} Equality.
-     */
-    equalsUint8Array(array1, array2) {
-      if (!util.isUint8Array(array1) || !util.isUint8Array(array2)) {
-        throw new Error('Data must be in the form of a Uint8Array');
-      }
-
-      if (array1.length !== array2.length) {
-        return false;
-      }
-
-      for (let i = 0; i < array1.length; i++) {
-        if (array1[i] !== array2[i]) {
-          return false;
-        }
-      }
-      return true;
-    },
-
-    /**
-     * Calculates a 16bit sum of a Uint8Array by adding each character
-     * codes modulus 65535
-     * @param {Uint8Array} Uint8Array - To create a sum of
-     * @returns {Uint8Array} 2 bytes containing the sum of all charcodes % 65535.
-     */
-    writeChecksum(text) {
-      let s = 0;
-      for (let i = 0; i < text.length; i++) {
-        s = (s + text[i]) & 0xFFFF;
-      }
-      return util.writeNumber(s, 2);
-    },
-
-    // returns bit length of the integer x
-    nbits(x) {
-      let r = 1;
-      let t = x >>> 16;
-      if (t !== 0) {
-        x = t;
-        r += 16;
-      }
-      t = x >> 8;
-      if (t !== 0) {
-        x = t;
-        r += 8;
-      }
-      t = x >> 4;
-      if (t !== 0) {
-        x = t;
-        r += 4;
-      }
-      t = x >> 2;
-      if (t !== 0) {
-        x = t;
-        r += 2;
-      }
-      t = x >> 1;
-      if (t !== 0) {
-        x = t;
-        r += 1;
-      }
-      return r;
-    },
-
-    /**
-     * If S[1] == 0, then double(S) == (S[2..128] || 0);
-     * otherwise, double(S) == (S[2..128] || 0) xor
-     * (zeros(120) || 10000111).
-     *
-     * Both OCB and EAX (through CMAC) require this function to be constant-time.
-     *
-     * @param {Uint8Array} data
-     */
-    double(data) {
-      const doubleVar = new Uint8Array(data.length);
-      const last = data.length - 1;
-      for (let i = 0; i < last; i++) {
-        doubleVar[i] = (data[i] << 1) ^ (data[i + 1] >> 7);
-      }
-      doubleVar[last] = (data[last] << 1) ^ ((data[0] >> 7) * 0x87);
-      return doubleVar;
-    },
-
-    /**
-     * Shift a Uint8Array to the right by n bits
-     * @param {Uint8Array} array - The array to shift
-     * @param {Integer} bits - Amount of bits to shift (MUST be smaller
-     * than 8)
-     * @returns {String} Resulting array.
-     */
-    shiftRight(array, bits) {
-      if (bits) {
-        for (let i = array.length - 1; i >= 0; i--) {
-          array[i] >>= bits;
-          if (i > 0) {
-            array[i] |= (array[i - 1] << (8 - bits));
-          }
-        }
-      }
-      return array;
-    },
-
-    /**
-     * Get native Web Cryptography api, only the current version of the spec.
-     * @returns {Object} The SubtleCrypto api or 'undefined'.
-     */
-    getWebCrypto: () => crypto.subtle,
-
-    /**
-     * Detect native BigInt support
-     */
-    detectBigInt: () => typeof BigInt !== 'undefined',
-
-    /**
-     * Get BigInteger class
-     * It wraps the native BigInt type if it's available
-     * Otherwise it relies on bn.js
-     * @returns {BigInteger}
-     * @async
-     */
-    getBigInteger,
-
-    getHardwareConcurrency: () => navigator.hardwareConcurrency || 1,
-
-    isEmailAddress(data) {
-      if (!util.isString(data)) {
-        return false;
-      }
-      const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+([a-zA-Z]{2,}|xn--[a-zA-Z\-0-9]+)))$/;
-      return re.test(data);
-    },
-
-    /**
-     * Normalize line endings to <CR><LF>
-     * Support any encoding where CR=0x0D, LF=0x0A
-     */
-    canonicalizeEOL(data) {
-      const CR = 13;
-      const LF = 10;
-      let carryOverCR = false;
-
-      return transform(data, bytes => {
-        if (carryOverCR) {
-          bytes = util.concatUint8Array([new Uint8Array([CR]), bytes]);
-        }
-
-        if (bytes[bytes.length - 1] === CR) {
-          carryOverCR = true;
-          bytes = bytes.subarray(0, -1);
-        } else {
-          carryOverCR = false;
-        }
-
-        let index;
-        const indices = [];
-        for (let i = 0; ; i = index) {
-          index = bytes.indexOf(LF, i) + 1;
-          if (index) {
-            if (bytes[index - 2] !== CR) indices.push(index);
-          } else {
-            break;
-          }
-        }
-        if (!indices.length) {
-          return bytes;
-        }
-
-        const normalized = new Uint8Array(bytes.length + indices.length);
-        let j = 0;
-        for (let i = 0; i < indices.length; i++) {
-          const sub = bytes.subarray(indices[i - 1] || 0, indices[i]);
-          normalized.set(sub, j);
-          j += sub.length;
-          normalized[j - 1] = CR;
-          normalized[j] = LF;
-          j++;
-        }
-        normalized.set(bytes.subarray(indices[indices.length - 1] || 0), j);
-        return normalized;
-      }, () => (carryOverCR ? new Uint8Array([CR]) : undefined));
-    },
-
-    /**
-     * Convert line endings from canonicalized <CR><LF> to native <LF>
-     * Support any encoding where CR=0x0D, LF=0x0A
-     */
-    nativeEOL(data) {
-      const CR = 13;
-      const LF = 10;
-      let carryOverCR = false;
-
-      return transform(data, bytes => {
-        if (carryOverCR && bytes[0] !== LF) {
-          bytes = util.concatUint8Array([new Uint8Array([CR]), bytes]);
-        } else {
-          bytes = new Uint8Array(bytes); // Don't mutate passed bytes
-        }
-
-        if (bytes[bytes.length - 1] === CR) {
-          carryOverCR = true;
-          bytes = bytes.subarray(0, -1);
-        } else {
-          carryOverCR = false;
-        }
-
-        let index;
-        let j = 0;
-        for (let i = 0; i !== bytes.length; i = index) {
-          index = bytes.indexOf(CR, i) + 1;
-          if (!index) index = bytes.length;
-          const last = index - (bytes[index] === LF ? 1 : 0);
-          if (i) bytes.copyWithin(j, i, last);
-          j += last - i;
-        }
-        return bytes.subarray(0, j);
-      }, () => (carryOverCR ? new Uint8Array([CR]) : undefined));
-    },
-
-    /**
-     * Remove trailing spaces and tabs from each line
-     */
-    removeTrailingSpaces(text) {
-      return text.split('\n').map(line => {
-        let i = line.length - 1;
-        for (; i >= 0 && (line[i] === ' ' || line[i] === '\t'); i--);
-        return line.substr(0, i + 1);
-      }).join('\n');
-    },
-
-    wrapError(message, error) {
-      if (!error) {
-        return new Error(message);
-      }
-
-      // update error message
-      try {
-        error.message = message + ': ' + error.message;
-      } catch (e) {}
-
-      return error;
-    },
-
-    /**
-     * Map allowed packet tags to corresponding classes
-     * Meant to be used to format `allowedPacket` for Packetlist.read
-     * @param {Array<Object>} allowedClasses
-     * @returns {Object} map from enum.packet to corresponding *Packet class
-     */
-    constructAllowedPackets(allowedClasses) {
-      const map = {};
-      allowedClasses.forEach(PacketClass => {
-        if (!PacketClass.tag) {
-          throw new Error('Invalid input: expected a packet class');
-        }
-        map[PacketClass.tag] = PacketClass;
-      });
-      return map;
-    },
-
-    /**
-     * Return a Promise that will resolve as soon as one of the promises in input resolves
-     * or will reject if all input promises all rejected
-     * (similar to Promise.any, but with slightly different error handling)
-     * @param {Array<Promise>} promises
-     * @return {Promise<Any>} Promise resolving to the result of the fastest fulfilled promise
-     *                          or rejected with the Error of the last resolved Promise (if all promises are rejected)
-     */
-    anyPromise(promises) {
-      return new Promise(async (resolve, reject) => {
-        let exception;
-        await Promise.all(promises.map(async promise => {
-          try {
-            resolve(await promise);
-          } catch (e) {
-            exception = e;
-          }
-        }));
-        reject(exception);
-      });
-    },
-
-    /**
-     * Return either `a` or `b` based on `cond`, in algorithmic constant time.
-     * @param {Boolean} cond
-     * @param {Uint8Array} a
-     * @param {Uint8Array} b
-     * @returns `a` if `cond` is true, `b` otherwise
-     */
-    selectUint8Array(cond, a, b) {
-      const length = Math.max(a.length, b.length);
-      const result = new Uint8Array(length);
-      let end = 0;
-      for (let i = 0; i < result.length; i++) {
-        result[i] = (a[i] & (256 - cond)) | (b[i] & (255 + cond));
-        end += (cond & i < a.length) | ((1 - cond) & i < b.length);
-      }
-      return result.subarray(0, end);
-    },
-    /**
-     * Return either `a` or `b` based on `cond`, in algorithmic constant time.
-     * NB: it only supports `a, b` with values between 0-255.
-     * @param {Boolean} cond
-     * @param {Uint8} a
-     * @param {Uint8} b
-     * @returns `a` if `cond` is true, `b` otherwise
-     */
-    selectUint8: (cond, a, b) => (a & (256 - cond)) | (b & (255 + cond))
-  };
-
-  /* OpenPGP radix-64/base64 string encoding/decoding
-   * Copyright 2005 Herbert Hanewinkel, www.haneWIN.de
-   * version 1.0, check www.haneWIN.de for the latest version
-   *
-   * This software is provided as-is, without express or implied warranty.
-   * Permission to use, copy, modify, distribute or sell this software, with or
-   * without fee, for any purpose and by any individual or organization, is hereby
-   * granted, provided that the above copyright notice and this paragraph appear
-   * in all copies. Distribution as a part of an application or binary must
-   * include the above copyright notice in the documentation and/or other materials
-   * provided with the application or distribution.
-   */
-
-  let encodeChunk = buf => btoa(util.uint8ArrayToString(buf));
-  let decodeChunk = str => util.stringToUint8Array(atob(str));
-
-  /**
-   * Convert binary array to radix-64
-   * @param {Uint8Array | ReadableStream<Uint8Array>} data - Uint8Array to convert
-   * @returns {String | ReadableStream<String>} Radix-64 version of input string.
-   * @static
-   */
-  function encode$1(data) {
-    let buf = new Uint8Array();
-    return transform(data, value => {
-      buf = util.concatUint8Array([buf, value]);
-      const r = [];
-      const bytesPerLine = 45; // 60 chars per line * (3 bytes / 4 chars of base64).
-      const lines = Math.floor(buf.length / bytesPerLine);
-      const bytes = lines * bytesPerLine;
-      const encoded = encodeChunk(buf.subarray(0, bytes));
-      for (let i = 0; i < lines; i++) {
-        r.push(encoded.substr(i * 60, 60));
-        r.push('\n');
-      }
-      buf = buf.subarray(bytes);
-      return r.join('');
-    }, () => (buf.length ? encodeChunk(buf) + '\n' : ''));
-  }
-
-  /**
-   * Convert radix-64 to binary array
-   * @param {String | ReadableStream<String>} data - Radix-64 string to convert
-   * @returns {Uint8Array | ReadableStream<Uint8Array>} Binary array version of input string.
-   * @static
-   */
-  function decode$2(data) {
-    let buf = '';
-    return transform(data, value => {
-      buf += value;
-
-      // Count how many whitespace characters there are in buf
-      let spaces = 0;
-      const spacechars = [' ', '\t', '\r', '\n'];
-      for (let i = 0; i < spacechars.length; i++) {
-        const spacechar = spacechars[i];
-        for (let pos = buf.indexOf(spacechar); pos !== -1; pos = buf.indexOf(spacechar, pos + 1)) {
-          spaces++;
-        }
-      }
-
-      // Backtrack until we have 4n non-whitespace characters
-      // that we can safely base64-decode
-      let length = buf.length;
-      for (; length > 0 && (length - spaces) % 4 !== 0; length--) {
-        if (spacechars.includes(buf[length])) spaces--;
-      }
-
-      const decoded = decodeChunk(buf.substr(0, length));
-      buf = buf.substr(length);
-      return decoded;
-    }, () => decodeChunk(buf));
-  }
-
-  /**
-   * Convert a Base-64 encoded string an array of 8-bit integer
-   *
-   * Note: accepts both Radix-64 and URL-safe strings
-   * @param {String} base64 - Base-64 encoded string to convert
-   * @returns {Uint8Array} An array of 8-bit integers.
-   */
-  function b64ToUint8Array(base64) {
-    return decode$2(base64.replace(/-/g, '+').replace(/_/g, '/'));
-  }
-
-  /**
-   * Convert an array of 8-bit integer to a Base-64 encoded string
-   * @param {Uint8Array} bytes - An array of 8-bit integers to convert
-   * @param {bool} url - If true, output is URL-safe
-   * @returns {String} Base-64 encoded string.
-   */
-  function uint8ArrayToB64(bytes, url) {
-    let encoded = encode$1(bytes).replace(/[\r\n]/g, '');
-    if (url) {
-      encoded = encoded.replace(/[+]/g, '-').replace(/[/]/g, '_').replace(/[=]/g, '');
-    }
-    return encoded;
-  }
-
   /**
    * @module enums
    */
@@ -2117,17 +1508,21 @@ var openpgp = (function (exports) {
       '2b8104000a':   'secp256k1',
       '2B8104000A':   'secp256k1',
 
-      /** Ed25519 */
+      /** Ed25519 - deprecated by crypto-refresh (replaced by standaone Ed25519 algo) */
+      'ed25519Legacy':          'ed25519',
       'ED25519':                'ed25519',
+      /** @deprecated use `ed25519Legacy` instead */
       'ed25519':                'ed25519',
       'Ed25519':                'ed25519',
       '1.3.6.1.4.1.11591.15.1': 'ed25519',
       '2b06010401da470f01':     'ed25519',
       '2B06010401DA470F01':     'ed25519',
 
-      /** Curve25519 */
+      /** Curve25519 - deprecated by crypto-refresh (replaced by standaone X25519 algo) */
+      'curve25519Legacy':       'curve25519',
       'X25519':                 'curve25519',
       'cv25519':                'curve25519',
+      /** @deprecated use `curve25519Legacy` instead */
       'curve25519':             'curve25519',
       'Curve25519':             'curve25519',
       '1.3.6.1.4.1.3029.1.5.1': 'curve25519',
@@ -2164,7 +1559,7 @@ var openpgp = (function (exports) {
       gnu: 101
     },
 
-    /** {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-9.1|RFC4880bis-04, section 9.1}
+    /** {@link https://tools.ietf.org/html/draft-ietf-openpgp-crypto-refresh-08.html#section-9.1|crypto-refresh RFC, section 9.1}
      * @enum {Integer}
      * @readonly
      */
@@ -2183,13 +1578,25 @@ var openpgp = (function (exports) {
       ecdh: 18,
       /** ECDSA (Sign only) [RFC6637] */
       ecdsa: 19,
-      /** EdDSA (Sign only)
+      /** EdDSA (Sign only) - deprecated by crypto-refresh (replaced by `ed25519` identifier below)
        * [{@link https://tools.ietf.org/html/draft-koch-eddsa-for-openpgp-04|Draft RFC}] */
+      eddsaLegacy: 22, // NB: this is declared before `eddsa` to translate 22 to 'eddsa' for backwards compatibility
+      /** @deprecated use `eddsaLegacy` instead */
+      ed25519Legacy: 22,
+      /** @deprecated use `eddsaLegacy` instead */
       eddsa: 22,
       /** Reserved for AEDH */
       aedh: 23,
       /** Reserved for AEDSA */
-      aedsa: 24
+      aedsa: 24,
+      /** X25519 (Encrypt only) */
+      x25519: 25,
+      /** X448 (Encrypt only) */
+      x448: 26,
+      /** Ed25519 (Sign only) */
+      ed25519: 27,
+      /** Ed448 (Sign only) */
+      ed448: 28
     },
 
     /** {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC4880, section 9.2}
@@ -2538,7 +1945,7 @@ var openpgp = (function (exports) {
         return type[e];
       }
 
-      throw new Error('Invalid enum value.');
+      throw Error('Invalid enum value.');
     },
 
     /**
@@ -2560,13 +1967,623 @@ var openpgp = (function (exports) {
         return type[byValue][e];
       }
 
-      throw new Error('Invalid enum value.');
+      throw Error('Invalid enum value.');
     }
   };
 
   // GPG4Browsers - An OpenPGP implementation in javascript
 
-  var defaultConfig = {
+  const util = {
+    isString: data => typeof data === 'string' || data instanceof String,
+
+    isArray: data => Array.isArray(data),
+
+    isUint8Array: isUint8Array,
+
+    isStream: isStream,
+
+    readNumber(bytes) {
+      let n = 0;
+      for (let i = 0; i < bytes.length; i++) {
+        n += (256 ** i) * bytes[bytes.length - 1 - i];
+      }
+      return n;
+    },
+
+    writeNumber(n, bytes) {
+      const b = new Uint8Array(bytes);
+      for (let i = 0; i < bytes; i++) {
+        b[i] = (n >> (8 * (bytes - i - 1))) & 0xFF;
+      }
+
+      return b;
+    },
+
+    readDate: bytes => new Date(util.readNumber(bytes) * 1000),
+
+    writeDate: time => util.writeNumber(Math.floor(time.getTime() / 1000), 4),
+
+    normalizeDate: (time = Date.now()) =>
+      time === null || time === Infinity ? time : new Date(Math.floor(+time / 1000) * 1000),
+
+    /**
+     * Read one MPI from bytes in input
+     * @param {Uint8Array} bytes - Input data to parse
+     * @returns {Uint8Array} Parsed MPI.
+     */
+    readMPI(bytes) {
+      const bits = (bytes[0] << 8) | bytes[1];
+      const bytelen = (bits + 7) >>> 3;
+      return bytes.subarray(2, 2 + bytelen);
+    },
+
+    /**
+     * Left-pad Uint8Array to length by adding 0x0 bytes
+     * @param {Uint8Array} bytes - Data to pad
+     * @param {Number} length - Padded length
+     * @returns {Uint8Array} Padded bytes.
+     */
+    leftPad(bytes, length) {
+      const padded = new Uint8Array(length);
+      padded.set(bytes, length - bytes.length);
+      return padded;
+    },
+
+    /**
+     * Convert a Uint8Array to an MPI-formatted Uint8Array.
+     * @param {Uint8Array} bin - An array of 8-bit integers to convert
+     * @returns {Uint8Array} MPI-formatted Uint8Array.
+     */
+    uint8ArrayToMPI(bin) {
+      const bitSize = util.uint8ArrayBitLength(bin);
+      if (bitSize === 0) {
+        throw Error('Zero MPI');
+      }
+      const stripped = bin.subarray(bin.length - Math.ceil(bitSize / 8));
+      const prefix = new Uint8Array([(bitSize & 0xFF00) >> 8, bitSize & 0xFF]);
+      return util.concatUint8Array([prefix, stripped]);
+    },
+
+    /**
+     * Return bit length of the input data
+     * @param {Uint8Array} bin input data (big endian)
+     * @returns bit length
+     */
+    uint8ArrayBitLength(bin) {
+      let i; // index of leading non-zero byte
+      for (i = 0; i < bin.length; i++) if (bin[i] !== 0) break;
+      if (i === bin.length) {
+        return 0;
+      }
+      const stripped = bin.subarray(i);
+      return (stripped.length - 1) * 8 + util.nbits(stripped[0]);
+    },
+
+    /**
+     * Convert a hex string to an array of 8-bit integers
+     * @param {String} hex - A hex string to convert
+     * @returns {Uint8Array} An array of 8-bit integers.
+     */
+    hexToUint8Array(hex) {
+      const result = new Uint8Array(hex.length >> 1);
+      for (let k = 0; k < hex.length >> 1; k++) {
+        result[k] = parseInt(hex.substr(k << 1, 2), 16);
+      }
+      return result;
+    },
+
+    /**
+     * Convert an array of 8-bit integers to a hex string
+     * @param {Uint8Array} bytes - Array of 8-bit integers to convert
+     * @returns {String} Hexadecimal representation of the array.
+     */
+    uint8ArrayToHex(bytes) {
+      const r = [];
+      const e = bytes.length;
+      let c = 0;
+      let h;
+      while (c < e) {
+        h = bytes[c++].toString(16);
+        while (h.length < 2) {
+          h = '0' + h;
+        }
+        r.push('' + h);
+      }
+      return r.join('');
+    },
+
+    /**
+     * Convert a string to an array of 8-bit integers
+     * @param {String} str - String to convert
+     * @returns {Uint8Array} An array of 8-bit integers.
+     */
+    stringToUint8Array: str =>
+      transform(str, str => {
+        if (!util.isString(str)) {
+          throw Error('stringToUint8Array: Data must be in the form of a string');
+        }
+
+        const result = new Uint8Array(str.length);
+        for (let i = 0; i < str.length; i++) {
+          result[i] = str.charCodeAt(i);
+        }
+        return result;
+      }),
+
+    /**
+     * Convert an array of 8-bit integers to a string
+     * @param {Uint8Array} bytes - An array of 8-bit integers to convert
+     * @returns {String} String representation of the array.
+     */
+    uint8ArrayToString(bytes) {
+      bytes = new Uint8Array(bytes);
+      const result = [];
+      const bs = 1 << 14;
+      const j = bytes.length;
+
+      for (let i = 0; i < j; i += bs) {
+        result.push(String.fromCharCode.apply(String, bytes.subarray(i, i + bs < j ? i + bs : j)));
+      }
+      return result.join('');
+    },
+
+    /**
+     * Convert a native javascript string to a Uint8Array of utf8 bytes
+     * @param {String|ReadableStream} str - The string to convert
+     * @returns {Uint8Array|ReadableStream} A valid squence of utf8 bytes.
+     */
+    encodeUTF8(str) {
+      const encoder = new TextEncoder('utf-8');
+      // eslint-disable-next-line no-inner-declarations
+      function process(value, lastChunk = false) {
+        return encoder.encode(value, { stream: !lastChunk });
+      }
+      return transform(str, process, () => process('', true));
+    },
+
+    /**
+     * Convert a Uint8Array of utf8 bytes to a native javascript string
+     * @param {Uint8Array|ReadableStream} utf8 - A valid squence of utf8 bytes
+     * @returns {String|ReadableStream} A native javascript string.
+     */
+    decodeUTF8(utf8) {
+      const decoder = new TextDecoder('utf-8');
+      // eslint-disable-next-line no-inner-declarations
+      function process(value, lastChunk = false) {
+        return decoder.decode(value, { stream: !lastChunk });
+      }
+      return transform(utf8, process, () => process(new Uint8Array(), true));
+    },
+
+    /**
+     * Concat a list of Uint8Arrays, Strings or Streams
+     * The caller must not mix Uint8Arrays with Strings, but may mix Streams with non-Streams.
+     * @param {Array<Uint8Array|String|ReadableStream>} Array - Of Uint8Arrays/Strings/Streams to concatenate
+     * @returns {Uint8Array|String|ReadableStream} Concatenated array.
+     */
+    concat: concat,
+
+    /**
+     * Concat Uint8Arrays
+     * @param {Array<Uint8Array>} Array - Of Uint8Arrays to concatenate
+     * @returns {Uint8Array} Concatenated array.
+     */
+    concatUint8Array: concatUint8Array,
+
+    /**
+     * Check Uint8Array equality
+     * @param {Uint8Array} array1 - First array
+     * @param {Uint8Array} array2 - Second array
+     * @returns {Boolean} Equality.
+     */
+    equalsUint8Array(array1, array2) {
+      if (!util.isUint8Array(array1) || !util.isUint8Array(array2)) {
+        throw Error('Data must be in the form of a Uint8Array');
+      }
+
+      if (array1.length !== array2.length) {
+        return false;
+      }
+
+      for (let i = 0; i < array1.length; i++) {
+        if (array1[i] !== array2[i]) {
+          return false;
+        }
+      }
+      return true;
+    },
+
+    /**
+     * Calculates a 16bit sum of a Uint8Array by adding each character
+     * codes modulus 65535
+     * @param {Uint8Array} Uint8Array - To create a sum of
+     * @returns {Uint8Array} 2 bytes containing the sum of all charcodes % 65535.
+     */
+    writeChecksum(text) {
+      let s = 0;
+      for (let i = 0; i < text.length; i++) {
+        s = (s + text[i]) & 0xFFFF;
+      }
+      return util.writeNumber(s, 2);
+    },
+
+    // returns bit length of the integer x
+    nbits(x) {
+      let r = 1;
+      let t = x >>> 16;
+      if (t !== 0) {
+        x = t;
+        r += 16;
+      }
+      t = x >> 8;
+      if (t !== 0) {
+        x = t;
+        r += 8;
+      }
+      t = x >> 4;
+      if (t !== 0) {
+        x = t;
+        r += 4;
+      }
+      t = x >> 2;
+      if (t !== 0) {
+        x = t;
+        r += 2;
+      }
+      t = x >> 1;
+      if (t !== 0) {
+        x = t;
+        r += 1;
+      }
+      return r;
+    },
+
+    /**
+     * If S[1] == 0, then double(S) == (S[2..128] || 0);
+     * otherwise, double(S) == (S[2..128] || 0) xor
+     * (zeros(120) || 10000111).
+     *
+     * Both OCB and EAX (through CMAC) require this function to be constant-time.
+     *
+     * @param {Uint8Array} data
+     */
+    double(data) {
+      const doubleVar = new Uint8Array(data.length);
+      const last = data.length - 1;
+      for (let i = 0; i < last; i++) {
+        doubleVar[i] = (data[i] << 1) ^ (data[i + 1] >> 7);
+      }
+      doubleVar[last] = (data[last] << 1) ^ ((data[0] >> 7) * 0x87);
+      return doubleVar;
+    },
+
+    /**
+     * Shift a Uint8Array to the right by n bits
+     * @param {Uint8Array} array - The array to shift
+     * @param {Integer} bits - Amount of bits to shift (MUST be smaller
+     * than 8)
+     * @returns {String} Resulting array.
+     */
+    shiftRight(array, bits) {
+      if (bits) {
+        for (let i = array.length - 1; i >= 0; i--) {
+          array[i] >>= bits;
+          if (i > 0) {
+            array[i] |= (array[i - 1] << (8 - bits));
+          }
+        }
+      }
+      return array;
+    },
+
+    /**
+     * Get native Web Cryptography api, only the current version of the spec.
+     * @returns {Object} The SubtleCrypto api or 'undefined'.
+     */
+    getWebCrypto: () => crypto.subtle,
+
+    /**
+     * Get BigInteger class
+     * It wraps the native BigInt type if it's available
+     * Otherwise it relies on bn.js
+     * @returns {BigInteger}
+     * @async
+     */
+    getBigInteger,
+
+    getHardwareConcurrency: () => navigator.hardwareConcurrency || 1,
+
+    isEmailAddress(data) {
+      if (!util.isString(data)) {
+        return false;
+      }
+      const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+([a-zA-Z]{2,}[0-9]*|xn--[a-zA-Z\-0-9]+)))$/;
+      return re.test(data);
+    },
+
+    /**
+     * Normalize line endings to <CR><LF>
+     * Support any encoding where CR=0x0D, LF=0x0A
+     */
+    canonicalizeEOL(data) {
+      const CR = 13;
+      const LF = 10;
+      let carryOverCR = false;
+
+      return transform(data, bytes => {
+        if (carryOverCR) {
+          bytes = util.concatUint8Array([new Uint8Array([CR]), bytes]);
+        }
+
+        if (bytes[bytes.length - 1] === CR) {
+          carryOverCR = true;
+          bytes = bytes.subarray(0, -1);
+        } else {
+          carryOverCR = false;
+        }
+
+        let index;
+        const indices = [];
+        for (let i = 0; ; i = index) {
+          index = bytes.indexOf(LF, i) + 1;
+          if (index) {
+            if (bytes[index - 2] !== CR) indices.push(index);
+          } else {
+            break;
+          }
+        }
+        if (!indices.length) {
+          return bytes;
+        }
+
+        const normalized = new Uint8Array(bytes.length + indices.length);
+        let j = 0;
+        for (let i = 0; i < indices.length; i++) {
+          const sub = bytes.subarray(indices[i - 1] || 0, indices[i]);
+          normalized.set(sub, j);
+          j += sub.length;
+          normalized[j - 1] = CR;
+          normalized[j] = LF;
+          j++;
+        }
+        normalized.set(bytes.subarray(indices[indices.length - 1] || 0), j);
+        return normalized;
+      }, () => (carryOverCR ? new Uint8Array([CR]) : undefined));
+    },
+
+    /**
+     * Convert line endings from canonicalized <CR><LF> to native <LF>
+     * Support any encoding where CR=0x0D, LF=0x0A
+     */
+    nativeEOL(data) {
+      const CR = 13;
+      const LF = 10;
+      let carryOverCR = false;
+
+      return transform(data, bytes => {
+        if (carryOverCR && bytes[0] !== LF) {
+          bytes = util.concatUint8Array([new Uint8Array([CR]), bytes]);
+        } else {
+          bytes = new Uint8Array(bytes); // Don't mutate passed bytes
+        }
+
+        if (bytes[bytes.length - 1] === CR) {
+          carryOverCR = true;
+          bytes = bytes.subarray(0, -1);
+        } else {
+          carryOverCR = false;
+        }
+
+        let index;
+        let j = 0;
+        for (let i = 0; i !== bytes.length; i = index) {
+          index = bytes.indexOf(CR, i) + 1;
+          if (!index) index = bytes.length;
+          const last = index - (bytes[index] === LF ? 1 : 0);
+          if (i) bytes.copyWithin(j, i, last);
+          j += last - i;
+        }
+        return bytes.subarray(0, j);
+      }, () => (carryOverCR ? new Uint8Array([CR]) : undefined));
+    },
+
+    /**
+     * Remove trailing spaces, carriage returns and tabs from each line
+     */
+    removeTrailingSpaces(text) {
+      return text.split('\n').map(line => {
+        let i = line.length - 1;
+        for (; i >= 0 && (line[i] === ' ' || line[i] === '\t' || line[i] === '\r'); i--);
+        return line.substr(0, i + 1);
+      }).join('\n');
+    },
+
+    wrapError(message, error) {
+      if (!error) {
+        return Error(message);
+      }
+
+      // update error message
+      try {
+        error.message = message + ': ' + error.message;
+      } catch (e) {}
+
+      return error;
+    },
+
+    /**
+     * Map allowed packet tags to corresponding classes
+     * Meant to be used to format `allowedPacket` for Packetlist.read
+     * @param {Array<Object>} allowedClasses
+     * @returns {Object} map from enum.packet to corresponding *Packet class
+     */
+    constructAllowedPackets(allowedClasses) {
+      const map = {};
+      allowedClasses.forEach(PacketClass => {
+        if (!PacketClass.tag) {
+          throw Error('Invalid input: expected a packet class');
+        }
+        map[PacketClass.tag] = PacketClass;
+      });
+      return map;
+    },
+
+    /**
+     * Return a Promise that will resolve as soon as one of the promises in input resolves
+     * or will reject if all input promises all rejected
+     * (similar to Promise.any, but with slightly different error handling)
+     * @param {Array<Promise>} promises
+     * @return {Promise<Any>} Promise resolving to the result of the fastest fulfilled promise
+     *                          or rejected with the Error of the last resolved Promise (if all promises are rejected)
+     */
+    anyPromise(promises) {
+      return new Promise(async (resolve, reject) => {
+        let exception;
+        await Promise.all(promises.map(async promise => {
+          try {
+            resolve(await promise);
+          } catch (e) {
+            exception = e;
+          }
+        }));
+        reject(exception);
+      });
+    },
+
+    /**
+     * Return either `a` or `b` based on `cond`, in algorithmic constant time.
+     * @param {Boolean} cond
+     * @param {Uint8Array} a
+     * @param {Uint8Array} b
+     * @returns `a` if `cond` is true, `b` otherwise
+     */
+    selectUint8Array(cond, a, b) {
+      const length = Math.max(a.length, b.length);
+      const result = new Uint8Array(length);
+      let end = 0;
+      for (let i = 0; i < result.length; i++) {
+        result[i] = (a[i] & (256 - cond)) | (b[i] & (255 + cond));
+        end += (cond & i < a.length) | ((1 - cond) & i < b.length);
+      }
+      return result.subarray(0, end);
+    },
+    /**
+     * Return either `a` or `b` based on `cond`, in algorithmic constant time.
+     * NB: it only supports `a, b` with values between 0-255.
+     * @param {Boolean} cond
+     * @param {Uint8} a
+     * @param {Uint8} b
+     * @returns `a` if `cond` is true, `b` otherwise
+     */
+    selectUint8: (cond, a, b) => (a & (256 - cond)) | (b & (255 + cond)),
+    /**
+     * @param {module:enums.symmetric} cipherAlgo
+     */
+    isAES: cipherAlgo => cipherAlgo === enums.symmetric.aes128 || cipherAlgo === enums.symmetric.aes192 || cipherAlgo === enums.symmetric.aes256
+  };
+
+  /* OpenPGP radix-64/base64 string encoding/decoding
+   * Copyright 2005 Herbert Hanewinkel, www.haneWIN.de
+   * version 1.0, check www.haneWIN.de for the latest version
+   *
+   * This software is provided as-is, without express or implied warranty.
+   * Permission to use, copy, modify, distribute or sell this software, with or
+   * without fee, for any purpose and by any individual or organization, is hereby
+   * granted, provided that the above copyright notice and this paragraph appear
+   * in all copies. Distribution as a part of an application or binary must
+   * include the above copyright notice in the documentation and/or other materials
+   * provided with the application or distribution.
+   */
+
+  let encodeChunk = buf => btoa(util.uint8ArrayToString(buf));
+  let decodeChunk = str => util.stringToUint8Array(atob(str));
+
+  /**
+   * Convert binary array to radix-64
+   * @param {Uint8Array | ReadableStream<Uint8Array>} data - Uint8Array to convert
+   * @returns {String | ReadableStream<String>} Radix-64 version of input string.
+   * @static
+   */
+  function encode$1(data) {
+    let buf = new Uint8Array();
+    return transform(data, value => {
+      buf = util.concatUint8Array([buf, value]);
+      const r = [];
+      const bytesPerLine = 45; // 60 chars per line * (3 bytes / 4 chars of base64).
+      const lines = Math.floor(buf.length / bytesPerLine);
+      const bytes = lines * bytesPerLine;
+      const encoded = encodeChunk(buf.subarray(0, bytes));
+      for (let i = 0; i < lines; i++) {
+        r.push(encoded.substr(i * 60, 60));
+        r.push('\n');
+      }
+      buf = buf.subarray(bytes);
+      return r.join('');
+    }, () => (buf.length ? encodeChunk(buf) + '\n' : ''));
+  }
+
+  /**
+   * Convert radix-64 to binary array
+   * @param {String | ReadableStream<String>} data - Radix-64 string to convert
+   * @returns {Uint8Array | ReadableStream<Uint8Array>} Binary array version of input string.
+   * @static
+   */
+  function decode$2(data) {
+    let buf = '';
+    return transform(data, value => {
+      buf += value;
+
+      // Count how many whitespace characters there are in buf
+      let spaces = 0;
+      const spacechars = [' ', '\t', '\r', '\n'];
+      for (let i = 0; i < spacechars.length; i++) {
+        const spacechar = spacechars[i];
+        for (let pos = buf.indexOf(spacechar); pos !== -1; pos = buf.indexOf(spacechar, pos + 1)) {
+          spaces++;
+        }
+      }
+
+      // Backtrack until we have 4n non-whitespace characters
+      // that we can safely base64-decode
+      let length = buf.length;
+      for (; length > 0 && (length - spaces) % 4 !== 0; length--) {
+        if (spacechars.includes(buf[length])) spaces--;
+      }
+
+      const decoded = decodeChunk(buf.substr(0, length));
+      buf = buf.substr(length);
+      return decoded;
+    }, () => decodeChunk(buf));
+  }
+
+  /**
+   * Convert a Base-64 encoded string an array of 8-bit integer
+   *
+   * Note: accepts both Radix-64 and URL-safe strings
+   * @param {String} base64 - Base-64 encoded string to convert
+   * @returns {Uint8Array} An array of 8-bit integers.
+   */
+  function b64ToUint8Array(base64) {
+    return decode$2(base64.replace(/-/g, '+').replace(/_/g, '/'));
+  }
+
+  /**
+   * Convert an array of 8-bit integer to a Base-64 encoded string
+   * @param {Uint8Array} bytes - An array of 8-bit integers to convert
+   * @param {bool} url - If true, output is URL-safe
+   * @returns {String} Base-64 encoded string.
+   */
+  function uint8ArrayToB64(bytes, url) {
+    let encoded = encode$1(bytes).replace(/[\r\n]/g, '');
+    if (url) {
+      encoded = encoded.replace(/[+]/g, '-').replace(/[/]/g, '_').replace(/[=]/g, '');
+    }
+    return encoded;
+  }
+
+  // GPG4Browsers - An OpenPGP implementation in javascript
+
+  var config = {
     /**
      * @memberof module:config
      * @property {Integer} preferredHashAlgorithm Default hash algorithm {@link module:enums.hash}
@@ -2637,7 +2654,10 @@ var openpgp = (function (exports) {
      */
     allowUnauthenticatedMessages: false,
     /**
-     * Allow streaming unauthenticated data before its integrity has been checked.
+     * Allow streaming unauthenticated data before its integrity has been checked. This would allow the application to
+     * process large streams while limiting memory usage by releasing the decrypted chunks as soon as possible
+     * and deferring checking their integrity until the decrypted stream has been read in full.
+     *
      * This setting is **insecure** if the partially decrypted message is processed further or displayed to the user.
      * @memberof module:config
      * @property {Boolean} allowUnauthenticatedStream
@@ -2719,6 +2739,14 @@ var openpgp = (function (exports) {
      * @property {Boolean} ignoreMalformedPackets Ignore malformed packets on parsing instead of throwing an error
      */
     ignoreMalformedPackets: false,
+    /**
+     * Parsing of packets is normally restricted to a predefined set of packets. For example a Sym. Encrypted Integrity Protected Data Packet can only
+     * contain a certain set of packets including LiteralDataPacket. With this setting we can allow additional packets, which is probably not advisable
+     * as a global config setting, but can be used for specific function calls (e.g. decrypt method of Message).
+     * @memberof module:config
+     * @property {Array} additionalAllowedPackets Allow additional packets on parsing. Defined as array of packet classes, e.g. [PublicKeyPacket]
+     */
+    additionalAllowedPackets: [],
     /**
      * @memberof module:config
      * @property {Boolean} showVersion Whether to include {@link module:config/config.versionString} in armored messages
@@ -2733,7 +2761,7 @@ var openpgp = (function (exports) {
      * @memberof module:config
      * @property {String} versionString A version string to be included in armored messages
      */
-    versionString: 'OpenPGP.js 5.2.1',
+    versionString: 'OpenPGP.js 5.11.1',
     /**
      * @memberof module:config
      * @property {String} commentString A comment string to be included in armored messages
@@ -2752,7 +2780,7 @@ var openpgp = (function (exports) {
      * @memberof module:config
      * @property {Array} knownNotations
      */
-    knownNotations: ['preferred-email-encoding@pgp.com', 'pka-address@gnupg.org'],
+    knownNotations: [],
     /**
      * Whether to use the indutny/elliptic library for curves (other than Curve25519) that are not supported by the available native crypto API.
      * When false, certain standard curves will not be supported (depending on the platform).
@@ -2784,9 +2812,15 @@ var openpgp = (function (exports) {
      * @memberof module:config
      * @property {Set<String>} rejectCurves {@link module:enums.curve}
      */
-    rejectCurves: new Set([enums.curve.brainpoolP256r1, enums.curve.brainpoolP384r1, enums.curve.brainpoolP512r1, enums.curve.secp256k1])
+    rejectCurves: new Set([enums.curve.secp256k1])
   };
 
+  /**
+   * @fileoverview This object contains global configuration values.
+   * @see module:config/config
+   * @module config
+   */
+
   // GPG4Browsers - An OpenPGP implementation in javascript
 
   /**
@@ -2807,7 +2841,7 @@ var openpgp = (function (exports) {
     const header = text.match(reHeader);
 
     if (!header) {
-      throw new Error('Unknown ASCII armor type');
+      throw Error('Unknown ASCII armor type');
     }
 
     // BEGIN PGP MESSAGE, PART X/Y
@@ -2950,18 +2984,20 @@ var openpgp = (function (exports) {
   }
 
   /**
-   * Verify armored headers. RFC4880, section 6.3: "OpenPGP should consider improperly formatted
-   * Armor Headers to be corruption of the ASCII Armor."
+   * Verify armored headers. crypto-refresh-06, section 6.2:
+   * "An OpenPGP implementation may consider improperly formatted Armor
+   * Headers to be corruption of the ASCII Armor, but SHOULD make an
+   * effort to recover."
    * @private
    * @param {Array<String>} headers - Armor headers
    */
   function verifyHeaders$1(headers) {
     for (let i = 0; i < headers.length; i++) {
       if (!/^([^\s:]|[^\s:][^:]*[^\s:]): .+$/.test(headers[i])) {
-        throw new Error('Improperly formatted armor header: ' + headers[i]);
+        throw Error('Improperly formatted armor header: ' + headers[i]);
       }
       if (!/^(Version|Comment|MessageID|Hash|Charset): .+$/.test(headers[i])) {
-        console.error(new Error('Unknown header: ' + headers[i]));
+        console.error(Error('Unknown header: ' + headers[i]));
       }
     }
   }
@@ -2996,7 +3032,8 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  function unarmor(input, config = defaultConfig) {
+  function unarmor(input, config$1 = config) {
+    // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve, reject) => {
       try {
         const reSplit = /^-----[^-]+-----$/m;
@@ -3015,7 +3052,7 @@ var openpgp = (function (exports) {
             while (true) {
               let line = await reader.readLine();
               if (line === undefined) {
-                throw new Error('Misformed armored text');
+                throw Error('Misformed armored text');
               }
               // remove trailing whitespace at end of lines
               line = util.removeTrailingSpaces(line.replace(/[\r\n]/g, ''));
@@ -3025,7 +3062,7 @@ var openpgp = (function (exports) {
                 }
               } else if (!headersDone) {
                 if (reSplit.test(line)) {
-                  reject(new Error('Mandatory blank line missing between armor headers and armor data'));
+                  reject(Error('Mandatory blank line missing between armor headers and armor data'));
                 }
                 if (!reEmptyLine.test(line)) {
                   lastHeaders.push(line);
@@ -3060,7 +3097,7 @@ var openpgp = (function (exports) {
               await writer.ready;
               const { done, value } = await reader.read();
               if (done) {
-                throw new Error('Misformed armored text');
+                throw Error('Misformed armored text');
               }
               const line = value + '';
               if (line.indexOf('=') === -1 && line.indexOf('-') === -1) {
@@ -3072,7 +3109,7 @@ var openpgp = (function (exports) {
                 remainder = util.removeTrailingSpaces(remainder.replace(/\r/g, ''));
                 const parts = remainder.split(reSplit);
                 if (parts.length === 1) {
-                  throw new Error('Misformed armored text');
+                  throw Error('Misformed armored text');
                 }
                 const split = splitChecksum(parts[0].slice(0, -1));
                 checksum = split.checksum;
@@ -3095,8 +3132,8 @@ var openpgp = (function (exports) {
           const writer = getWriter(writable);
           try {
             const checksumVerifiedString = (await checksumVerified).replace('\n', '');
-            if (checksum !== checksumVerifiedString && (checksum || config.checksumRequired)) {
-              throw new Error('Ascii armor integrity check failed');
+            if (checksum !== checksumVerifiedString && (checksum || config$1.checksumRequired)) {
+              throw Error('Ascii armor integrity check failed');
             }
             await writer.ready;
             await writer.close();
@@ -3126,7 +3163,7 @@ var openpgp = (function (exports) {
    * @returns {String | ReadableStream<String>} Armored text.
    * @static
    */
-  function armor(messageType, body, partIndex, partTotal, customComment, config = defaultConfig) {
+  function armor(messageType, body, partIndex, partTotal, customComment, config$1 = config) {
     let text;
     let hash;
     if (messageType === enums.armor.signed) {
@@ -3139,52 +3176,52 @@ var openpgp = (function (exports) {
     switch (messageType) {
       case enums.armor.multipartSection:
         result.push('-----BEGIN PGP MESSAGE, PART ' + partIndex + '/' + partTotal + '-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP MESSAGE, PART ' + partIndex + '/' + partTotal + '-----\n');
         break;
       case enums.armor.multipartLast:
         result.push('-----BEGIN PGP MESSAGE, PART ' + partIndex + '-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP MESSAGE, PART ' + partIndex + '-----\n');
         break;
       case enums.armor.signed:
-        result.push('\n-----BEGIN PGP SIGNED MESSAGE-----\n');
+        result.push('-----BEGIN PGP SIGNED MESSAGE-----\n');
         result.push('Hash: ' + hash + '\n\n');
         result.push(text.replace(/^-/mg, '- -'));
         result.push('\n-----BEGIN PGP SIGNATURE-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP SIGNATURE-----\n');
         break;
       case enums.armor.message:
         result.push('-----BEGIN PGP MESSAGE-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP MESSAGE-----\n');
         break;
       case enums.armor.publicKey:
         result.push('-----BEGIN PGP PUBLIC KEY BLOCK-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP PUBLIC KEY BLOCK-----\n');
         break;
       case enums.armor.privateKey:
         result.push('-----BEGIN PGP PRIVATE KEY BLOCK-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP PRIVATE KEY BLOCK-----\n');
         break;
       case enums.armor.signature:
         result.push('-----BEGIN PGP SIGNATURE-----\n');
-        result.push(addheader(customComment, config));
+        result.push(addheader(customComment, config$1));
         result.push(encode$1(body));
         result.push('=', getCheckSum(bodyClone));
         result.push('-----END PGP SIGNATURE-----\n');
@@ -3216,6 +3253,7 @@ var openpgp = (function (exports) {
      */
     read(bytes) {
       this.bytes = util.uint8ArrayToString(bytes.subarray(0, 8));
+      return this.bytes.length;
     }
 
     /**
@@ -4227,7 +4265,7 @@ var openpgp = (function (exports) {
   function _heap_init(heap, heapSize) {
       const size = heap ? heap.byteLength : heapSize || 65536;
       if (size & 0xfff || size <= 0)
-          throw new Error('heap size must be a positive integer and a multiple of 4096');
+          throw Error('heap size must be a positive integer and a multiple of 4096');
       heap = heap || new Uint8Array(new ArrayBuffer(size));
       return heap;
   }
@@ -4904,7 +4942,7 @@ var openpgp = (function (exports) {
     } else if (padLength === 8) {
       return message;
     } else {
-      throw new Error('des: invalid padding');
+      throw Error('des: invalid padding');
     }
 
     const paddedMessage = new Uint8Array(message.length + padLength);
@@ -4928,7 +4966,7 @@ var openpgp = (function (exports) {
     } else if (!padding) { // null padding
       pad = 0;
     } else {
-      throw new Error('des: invalid padding');
+      throw Error('des: invalid padding');
     }
 
     if (!padLength) {
@@ -5014,7 +5052,7 @@ var openpgp = (function (exports) {
       if (key.length === this.KeySize) {
         this.keySchedule(key);
       } else {
-        throw new Error('CAST-128: keys must be 16 bytes');
+        throw Error('CAST-128: keys must be 16 bytes');
       }
       return true;
     };
@@ -6409,7 +6447,7 @@ var openpgp = (function (exports) {
    * @throws {Error}
    */
   const idea = function() {
-    throw new Error('IDEA symmetric-key algorithm not implemented');
+    throw Error('IDEA symmetric-key algorithm not implemented');
   };
 
   var cipher = /*#__PURE__*/Object.freeze({
@@ -8244,12 +8282,12 @@ var openpgp = (function (exports) {
 
   function assert$a(val, msg) {
     if (!val)
-      throw new Error(msg || 'Assertion failed');
+      throw Error(msg || 'Assertion failed');
   }
 
   assert$a.equal = function assertEqual(l, r, msg) {
     if (l != r)
-      throw new Error(msg || ('Assertion failed: ' + l + ' != ' + r));
+      throw Error(msg || ('Assertion failed: ' + l + ' != ' + r));
   };
 
   var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
@@ -8259,7 +8297,7 @@ var openpgp = (function (exports) {
   }
 
   function commonjsRequire () {
-  	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
+  	throw Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
   }
 
   var inherits_browser = createCommonjsModule(function (module) {
@@ -9576,15 +9614,15 @@ var openpgp = (function (exports) {
    * @private
    */
 
-  const webCrypto$8 = util.getWebCrypto();
+  const webCrypto$9 = util.getWebCrypto();
 
   function hashjsHash(hash, webCryptoHash) {
-    return async function(data, config = defaultConfig) {
+    return async function(data, config$1 = config) {
       if (isArrayStream(data)) {
         data = await readToEnd(data);
       }
-      if (!util.isStream(data) && webCrypto$8 && webCryptoHash && data.length >= config.minBytesForWebCrypto) {
-        return new Uint8Array(await webCrypto$8.digest(webCryptoHash, data));
+      if (!util.isStream(data) && webCrypto$9 && webCryptoHash && data.length >= config$1.minBytesForWebCrypto) {
+        return new Uint8Array(await webCrypto$9.digest(webCryptoHash, data));
       }
       const hashInstance = hash();
       return transform(data, value => {
@@ -9594,7 +9632,7 @@ var openpgp = (function (exports) {
   }
 
   function asmcryptoHash(hash, webCryptoHash) {
-    return async function(data, config = defaultConfig) {
+    return async function(data, config$1 = config) {
       if (isArrayStream(data)) {
         data = await readToEnd(data);
       }
@@ -9603,8 +9641,8 @@ var openpgp = (function (exports) {
         return transform(data, value => {
           hashInstance.process(value);
         }, () => hashInstance.finish().result);
-      } else if (webCrypto$8 && webCryptoHash && data.length >= config.minBytesForWebCrypto) {
-        return new Uint8Array(await webCrypto$8.digest(webCryptoHash, data));
+      } else if (webCrypto$9 && webCryptoHash && data.length >= config$1.minBytesForWebCrypto) {
+        return new Uint8Array(await webCrypto$9.digest(webCryptoHash, data));
       } else {
         return hash.bytes(data);
       }
@@ -9661,7 +9699,7 @@ var openpgp = (function (exports) {
         case enums.hash.sha224:
           return this.sha224(data);
         default:
-          throw new Error('Invalid hash function.');
+          throw Error('Invalid hash function.');
       }
     },
 
@@ -9686,7 +9724,7 @@ var openpgp = (function (exports) {
         case enums.hash.sha224:
           return 28;
         default:
-          throw new Error('Invalid hash algorithm.');
+          throw Error('Invalid hash algorithm.');
       }
     }
   };
@@ -9714,6 +9752,1058 @@ var openpgp = (function (exports) {
       }
   }
 
+  /**
+   * Get implementation of the given cipher
+   * @param {enums.symmetric} algo
+   * @returns {Object}
+   * @throws {Error} on invalid algo
+   */
+  function getCipher(algo) {
+    const algoName = enums.read(enums.symmetric, algo);
+    return cipher[algoName];
+  }
+
+  // Modified by ProtonTech AG
+
+  const webCrypto$8 = util.getWebCrypto();
+
+  /**
+   * CFB encryption
+   * @param {enums.symmetric} algo - block cipher algorithm
+   * @param {Uint8Array} key
+   * @param {MaybeStream<Uint8Array>} plaintext
+   * @param {Uint8Array} iv
+   * @param {Object} config - full configuration, defaults to openpgp.config
+   * @returns MaybeStream<Uint8Array>
+   */
+  async function encrypt$5(algo, key, plaintext, iv, config) {
+    enums.read(enums.symmetric, algo);
+    if (util.isAES(algo)) {
+      return aesEncrypt(algo, key, plaintext, iv, config);
+    }
+
+    const Cipher = getCipher(algo);
+    const cipherfn = new Cipher(key);
+    const block_size = cipherfn.blockSize;
+
+    const blockc = iv.slice();
+    let pt = new Uint8Array();
+    const process = chunk => {
+      if (chunk) {
+        pt = util.concatUint8Array([pt, chunk]);
+      }
+      const ciphertext = new Uint8Array(pt.length);
+      let i;
+      let j = 0;
+      while (chunk ? pt.length >= block_size : pt.length) {
+        const encblock = cipherfn.encrypt(blockc);
+        for (i = 0; i < block_size; i++) {
+          blockc[i] = pt[i] ^ encblock[i];
+          ciphertext[j++] = blockc[i];
+        }
+        pt = pt.subarray(block_size);
+      }
+      return ciphertext.subarray(0, j);
+    };
+    return transform(plaintext, process, process);
+  }
+
+  /**
+   * CFB decryption
+   * @param {enums.symmetric} algo - block cipher algorithm
+   * @param {Uint8Array} key
+   * @param {MaybeStream<Uint8Array>} ciphertext
+   * @param {Uint8Array} iv
+   * @returns MaybeStream<Uint8Array>
+   */
+  async function decrypt$5(algo, key, ciphertext, iv) {
+    enums.read(enums.symmetric, algo);
+    if (util.isAES(algo)) {
+      return aesDecrypt(algo, key, ciphertext, iv);
+    }
+
+    const Cipher = getCipher(algo);
+    const cipherfn = new Cipher(key);
+    const block_size = cipherfn.blockSize;
+
+    let blockp = iv;
+    let ct = new Uint8Array();
+    const process = chunk => {
+      if (chunk) {
+        ct = util.concatUint8Array([ct, chunk]);
+      }
+      const plaintext = new Uint8Array(ct.length);
+      let i;
+      let j = 0;
+      while (chunk ? ct.length >= block_size : ct.length) {
+        const decblock = cipherfn.encrypt(blockp);
+        blockp = ct.subarray(0, block_size);
+        for (i = 0; i < block_size; i++) {
+          plaintext[j++] = blockp[i] ^ decblock[i];
+        }
+        ct = ct.subarray(block_size);
+      }
+      return plaintext.subarray(0, j);
+    };
+    return transform(ciphertext, process, process);
+  }
+
+  function aesEncrypt(algo, key, pt, iv, config) {
+    if (
+      util.getWebCrypto() &&
+      key.length !== 24 && // Chrome doesn't support 192 bit keys, see https://www.chromium.org/blink/webcrypto#TOC-AES-support
+      !util.isStream(pt) &&
+      pt.length >= 3000 * config.minBytesForWebCrypto // Default to a 3MB minimum. Chrome is pretty slow for small messages, see: https://bugs.chromium.org/p/chromium/issues/detail?id=701188#c2
+    ) { // Web Crypto
+      return webEncrypt(algo, key, pt, iv);
+    }
+    // asm.js fallback
+    const cfb = new AES_CFB(key, iv);
+    return transform(pt, value => cfb.aes.AES_Encrypt_process(value), () => cfb.aes.AES_Encrypt_finish());
+  }
+
+  function aesDecrypt(algo, key, ct, iv) {
+    if (util.isStream(ct)) {
+      const cfb = new AES_CFB(key, iv);
+      return transform(ct, value => cfb.aes.AES_Decrypt_process(value), () => cfb.aes.AES_Decrypt_finish());
+    }
+    return AES_CFB.decrypt(ct, key, iv);
+  }
+
+  function xorMut$1(a, b) {
+    for (let i = 0; i < a.length; i++) {
+      a[i] = a[i] ^ b[i];
+    }
+  }
+
+  async function webEncrypt(algo, key, pt, iv) {
+    const ALGO = 'AES-CBC';
+    const _key = await webCrypto$8.importKey('raw', key, { name: ALGO }, false, ['encrypt']);
+    const { blockSize } = getCipher(algo);
+    const cbc_pt = util.concatUint8Array([new Uint8Array(blockSize), pt]);
+    const ct = new Uint8Array(await webCrypto$8.encrypt({ name: ALGO, iv }, _key, cbc_pt)).subarray(0, pt.length);
+    xorMut$1(ct, pt);
+    return ct;
+  }
+
+  var cfb = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    encrypt: encrypt$5,
+    decrypt: decrypt$5
+  });
+
+  class AES_CTR {
+      static encrypt(data, key, nonce) {
+          return new AES_CTR(key, nonce).encrypt(data);
+      }
+      static decrypt(data, key, nonce) {
+          return new AES_CTR(key, nonce).encrypt(data);
+      }
+      constructor(key, nonce, aes) {
+          this.aes = aes ? aes : new AES(key, undefined, false, 'CTR');
+          delete this.aes.padding;
+          this.AES_CTR_set_options(nonce);
+      }
+      encrypt(data) {
+          const r1 = this.aes.AES_Encrypt_process(data);
+          const r2 = this.aes.AES_Encrypt_finish();
+          return joinBytes(r1, r2);
+      }
+      decrypt(data) {
+          const r1 = this.aes.AES_Encrypt_process(data);
+          const r2 = this.aes.AES_Encrypt_finish();
+          return joinBytes(r1, r2);
+      }
+      AES_CTR_set_options(nonce, counter, size) {
+          let { asm } = this.aes.acquire_asm();
+          if (size !== undefined) {
+              if (size < 8 || size > 48)
+                  throw new IllegalArgumentError('illegal counter size');
+              let mask = Math.pow(2, size) - 1;
+              asm.set_mask(0, 0, (mask / 0x100000000) | 0, mask | 0);
+          }
+          else {
+              size = 48;
+              asm.set_mask(0, 0, 0xffff, 0xffffffff);
+          }
+          if (nonce !== undefined) {
+              let len = nonce.length;
+              if (!len || len > 16)
+                  throw new IllegalArgumentError('illegal nonce size');
+              let view = new DataView(new ArrayBuffer(16));
+              new Uint8Array(view.buffer).set(nonce);
+              asm.set_nonce(view.getUint32(0), view.getUint32(4), view.getUint32(8), view.getUint32(12));
+          }
+          else {
+              throw Error('nonce is required');
+          }
+          if (counter !== undefined) {
+              if (counter < 0 || counter >= Math.pow(2, size))
+                  throw new IllegalArgumentError('illegal counter value');
+              asm.set_counter(0, 0, (counter / 0x100000000) | 0, counter | 0);
+          }
+      }
+  }
+
+  class AES_CBC {
+      static encrypt(data, key, padding = true, iv) {
+          return new AES_CBC(key, iv, padding).encrypt(data);
+      }
+      static decrypt(data, key, padding = true, iv) {
+          return new AES_CBC(key, iv, padding).decrypt(data);
+      }
+      constructor(key, iv, padding = true, aes) {
+          this.aes = aes ? aes : new AES(key, iv, padding, 'CBC');
+      }
+      encrypt(data) {
+          const r1 = this.aes.AES_Encrypt_process(data);
+          const r2 = this.aes.AES_Encrypt_finish();
+          return joinBytes(r1, r2);
+      }
+      decrypt(data) {
+          const r1 = this.aes.AES_Decrypt_process(data);
+          const r2 = this.aes.AES_Decrypt_finish();
+          return joinBytes(r1, r2);
+      }
+  }
+
+  /**
+   * @fileoverview This module implements AES-CMAC on top of
+   * native AES-CBC using either the WebCrypto API or Node.js' crypto API.
+   * @module crypto/cmac
+   * @private
+   */
+
+  const webCrypto$7 = util.getWebCrypto();
+
+
+  /**
+   * This implementation of CMAC is based on the description of OMAC in
+   * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
+   * document:
+   *
+   * We have made a small modification to the OMAC algorithm as it was
+   * originally presented, changing one of its two constants.
+   * Specifically, the constant 4 at line 85 was the constant 1/2 (the
+   * multiplicative inverse of 2) in the original definition of OMAC [14].
+   * The OMAC authors indicate that they will promulgate this modification
+   * [15], which slightly simplifies implementations.
+   */
+
+  const blockLength$3 = 16;
+
+
+  /**
+   * xor `padding` into the end of `data`. This function implements "the
+   * operation xor→ [which] xors the shorter string into the end of longer
+   * one". Since data is always as least as long as padding, we can
+   * simplify the implementation.
+   * @param {Uint8Array} data
+   * @param {Uint8Array} padding
+   */
+  function rightXORMut(data, padding) {
+    const offset = data.length - blockLength$3;
+    for (let i = 0; i < blockLength$3; i++) {
+      data[i + offset] ^= padding[i];
+    }
+    return data;
+  }
+
+  function pad(data, padding, padding2) {
+    // if |M| in {n, 2n, 3n, ...}
+    if (data.length && data.length % blockLength$3 === 0) {
+      // then return M xor→ B,
+      return rightXORMut(data, padding);
+    }
+    // else return (M || 10^(n−1−(|M| mod n))) xor→ P
+    const padded = new Uint8Array(data.length + (blockLength$3 - (data.length % blockLength$3)));
+    padded.set(data);
+    padded[data.length] = 0b10000000;
+    return rightXORMut(padded, padding2);
+  }
+
+  const zeroBlock$1 = new Uint8Array(blockLength$3);
+
+  async function CMAC(key) {
+    const cbc = await CBC(key);
+
+    // L ← E_K(0^n); B ← 2L; P ← 4L
+    const padding = util.double(await cbc(zeroBlock$1));
+    const padding2 = util.double(padding);
+
+    return async function(data) {
+      // return CBC_K(pad(M; B, P))
+      return (await cbc(pad(data, padding, padding2))).subarray(-blockLength$3);
+    };
+  }
+
+  async function CBC(key) {
+    if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto/#aes-support
+      key = await webCrypto$7.importKey('raw', key, { name: 'AES-CBC', length: key.length * 8 }, false, ['encrypt']);
+      return async function(pt) {
+        const ct = await webCrypto$7.encrypt({ name: 'AES-CBC', iv: zeroBlock$1, length: blockLength$3 * 8 }, key, pt);
+        return new Uint8Array(ct).subarray(0, ct.byteLength - blockLength$3);
+      };
+    }
+    // asm.js fallback
+    return async function(pt) {
+      return AES_CBC.encrypt(pt, key, false, zeroBlock$1);
+    };
+  }
+
+  // OpenPGP.js - An OpenPGP implementation in javascript
+
+  const webCrypto$6 = util.getWebCrypto();
+
+
+  const blockLength$2 = 16;
+  const ivLength$2 = blockLength$2;
+  const tagLength$2 = blockLength$2;
+
+  const zero$2 = new Uint8Array(blockLength$2);
+  const one$1 = new Uint8Array(blockLength$2); one$1[blockLength$2 - 1] = 1;
+  const two = new Uint8Array(blockLength$2); two[blockLength$2 - 1] = 2;
+
+  async function OMAC(key) {
+    const cmac = await CMAC(key);
+    return function(t, message) {
+      return cmac(util.concatUint8Array([t, message]));
+    };
+  }
+
+  async function CTR(key) {
+    if (
+      util.getWebCrypto() &&
+      key.length !== 24 // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support
+    ) {
+      key = await webCrypto$6.importKey('raw', key, { name: 'AES-CTR', length: key.length * 8 }, false, ['encrypt']);
+      return async function(pt, iv) {
+        const ct = await webCrypto$6.encrypt({ name: 'AES-CTR', counter: iv, length: blockLength$2 * 8 }, key, pt);
+        return new Uint8Array(ct);
+      };
+    }
+    // asm.js fallback
+    return async function(pt, iv) {
+      return AES_CTR.encrypt(pt, key, iv);
+    };
+  }
+
+
+  /**
+   * Class to en/decrypt using EAX mode.
+   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
+   * @param {Uint8Array} key - The encryption key
+   */
+  async function EAX(cipher, key) {
+    if (cipher !== enums.symmetric.aes128 &&
+      cipher !== enums.symmetric.aes192 &&
+      cipher !== enums.symmetric.aes256) {
+      throw Error('EAX mode supports only AES cipher');
+    }
+
+    const [
+      omac,
+      ctr
+    ] = await Promise.all([
+      OMAC(key),
+      CTR(key)
+    ]);
+
+    return {
+      /**
+       * Encrypt plaintext input.
+       * @param {Uint8Array} plaintext - The cleartext input to be encrypted
+       * @param {Uint8Array} nonce - The nonce (16 bytes)
+       * @param {Uint8Array} adata - Associated data to sign
+       * @returns {Promise<Uint8Array>} The ciphertext output.
+       */
+      encrypt: async function(plaintext, nonce, adata) {
+        const [
+          omacNonce,
+          omacAdata
+        ] = await Promise.all([
+          omac(zero$2, nonce),
+          omac(one$1, adata)
+        ]);
+        const ciphered = await ctr(plaintext, omacNonce);
+        const omacCiphered = await omac(two, ciphered);
+        const tag = omacCiphered; // Assumes that omac(*).length === tagLength.
+        for (let i = 0; i < tagLength$2; i++) {
+          tag[i] ^= omacAdata[i] ^ omacNonce[i];
+        }
+        return util.concatUint8Array([ciphered, tag]);
+      },
+
+      /**
+       * Decrypt ciphertext input.
+       * @param {Uint8Array} ciphertext - The ciphertext input to be decrypted
+       * @param {Uint8Array} nonce - The nonce (16 bytes)
+       * @param {Uint8Array} adata - Associated data to verify
+       * @returns {Promise<Uint8Array>} The plaintext output.
+       */
+      decrypt: async function(ciphertext, nonce, adata) {
+        if (ciphertext.length < tagLength$2) throw Error('Invalid EAX ciphertext');
+        const ciphered = ciphertext.subarray(0, -tagLength$2);
+        const ctTag = ciphertext.subarray(-tagLength$2);
+        const [
+          omacNonce,
+          omacAdata,
+          omacCiphered
+        ] = await Promise.all([
+          omac(zero$2, nonce),
+          omac(one$1, adata),
+          omac(two, ciphered)
+        ]);
+        const tag = omacCiphered; // Assumes that omac(*).length === tagLength.
+        for (let i = 0; i < tagLength$2; i++) {
+          tag[i] ^= omacAdata[i] ^ omacNonce[i];
+        }
+        if (!util.equalsUint8Array(ctTag, tag)) throw Error('Authentication tag mismatch');
+        const plaintext = await ctr(ciphered, omacNonce);
+        return plaintext;
+      }
+    };
+  }
+
+
+  /**
+   * Get EAX nonce as defined by {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.1|RFC4880bis-04, section 5.16.1}.
+   * @param {Uint8Array} iv - The initialization vector (16 bytes)
+   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
+   */
+  EAX.getNonce = function(iv, chunkIndex) {
+    const nonce = iv.slice();
+    for (let i = 0; i < chunkIndex.length; i++) {
+      nonce[8 + i] ^= chunkIndex[i];
+    }
+    return nonce;
+  };
+
+  EAX.blockLength = blockLength$2;
+  EAX.ivLength = ivLength$2;
+  EAX.tagLength = tagLength$2;
+
+  // OpenPGP.js - An OpenPGP implementation in javascript
+
+  const blockLength$1 = 16;
+  const ivLength$1 = 15;
+
+  // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.2:
+  // While OCB [RFC7253] allows the authentication tag length to be of any
+  // number up to 128 bits long, this document requires a fixed
+  // authentication tag length of 128 bits (16 octets) for simplicity.
+  const tagLength$1 = 16;
+
+
+  function ntz(n) {
+    let ntz = 0;
+    for (let i = 1; (n & i) === 0; i <<= 1) {
+      ntz++;
+    }
+    return ntz;
+  }
+
+  function xorMut(S, T) {
+    for (let i = 0; i < S.length; i++) {
+      S[i] ^= T[i];
+    }
+    return S;
+  }
+
+  function xor(S, T) {
+    return xorMut(S.slice(), T);
+  }
+
+  const zeroBlock = new Uint8Array(blockLength$1);
+  const one = new Uint8Array([1]);
+
+  /**
+   * Class to en/decrypt using OCB mode.
+   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
+   * @param {Uint8Array} key - The encryption key
+   */
+  async function OCB(cipher$1, key) {
+
+    let maxNtz = 0;
+    let encipher;
+    let decipher;
+    let mask;
+
+    constructKeyVariables(cipher$1, key);
+
+    function constructKeyVariables(cipher$1, key) {
+      const cipherName = enums.read(enums.symmetric, cipher$1);
+      const aes = new cipher[cipherName](key);
+      encipher = aes.encrypt.bind(aes);
+      decipher = aes.decrypt.bind(aes);
+
+      const mask_x = encipher(zeroBlock);
+      const mask_$ = util.double(mask_x);
+      mask = [];
+      mask[0] = util.double(mask_$);
+
+
+      mask.x = mask_x;
+      mask.$ = mask_$;
+    }
+
+    function extendKeyVariables(text, adata) {
+      const newMaxNtz = util.nbits(Math.max(text.length, adata.length) / blockLength$1 | 0) - 1;
+      for (let i = maxNtz + 1; i <= newMaxNtz; i++) {
+        mask[i] = util.double(mask[i - 1]);
+      }
+      maxNtz = newMaxNtz;
+    }
+
+    function hash(adata) {
+      if (!adata.length) {
+        // Fast path
+        return zeroBlock;
+      }
+
+      //
+      // Consider A as a sequence of 128-bit blocks
+      //
+      const m = adata.length / blockLength$1 | 0;
+
+      const offset = new Uint8Array(blockLength$1);
+      const sum = new Uint8Array(blockLength$1);
+      for (let i = 0; i < m; i++) {
+        xorMut(offset, mask[ntz(i + 1)]);
+        xorMut(sum, encipher(xor(offset, adata)));
+        adata = adata.subarray(blockLength$1);
+      }
+
+      //
+      // Process any final partial block; compute final hash value
+      //
+      if (adata.length) {
+        xorMut(offset, mask.x);
+
+        const cipherInput = new Uint8Array(blockLength$1);
+        cipherInput.set(adata, 0);
+        cipherInput[adata.length] = 0b10000000;
+        xorMut(cipherInput, offset);
+
+        xorMut(sum, encipher(cipherInput));
+      }
+
+      return sum;
+    }
+
+    /**
+     * Encrypt/decrypt data.
+     * @param {encipher|decipher} fn - Encryption/decryption block cipher function
+     * @param {Uint8Array} text - The cleartext or ciphertext (without tag) input
+     * @param {Uint8Array} nonce - The nonce (15 bytes)
+     * @param {Uint8Array} adata - Associated data to sign
+     * @returns {Promise<Uint8Array>} The ciphertext or plaintext output, with tag appended in both cases.
+     */
+    function crypt(fn, text, nonce, adata) {
+      //
+      // Consider P as a sequence of 128-bit blocks
+      //
+      const m = text.length / blockLength$1 | 0;
+
+      //
+      // Key-dependent variables
+      //
+      extendKeyVariables(text, adata);
+
+      //
+      // Nonce-dependent and per-encryption variables
+      //
+      //    Nonce = num2str(TAGLEN mod 128,7) || zeros(120-bitlen(N)) || 1 || N
+      // Note: We assume here that tagLength mod 16 == 0.
+      const paddedNonce = util.concatUint8Array([zeroBlock.subarray(0, ivLength$1 - nonce.length), one, nonce]);
+      //    bottom = str2num(Nonce[123..128])
+      const bottom = paddedNonce[blockLength$1 - 1] & 0b111111;
+      //    Ktop = ENCIPHER(K, Nonce[1..122] || zeros(6))
+      paddedNonce[blockLength$1 - 1] &= 0b11000000;
+      const kTop = encipher(paddedNonce);
+      //    Stretch = Ktop || (Ktop[1..64] xor Ktop[9..72])
+      const stretched = util.concatUint8Array([kTop, xor(kTop.subarray(0, 8), kTop.subarray(1, 9))]);
+      //    Offset_0 = Stretch[1+bottom..128+bottom]
+      const offset = util.shiftRight(stretched.subarray(0 + (bottom >> 3), 17 + (bottom >> 3)), 8 - (bottom & 7)).subarray(1);
+      //    Checksum_0 = zeros(128)
+      const checksum = new Uint8Array(blockLength$1);
+
+      const ct = new Uint8Array(text.length + tagLength$1);
+
+      //
+      // Process any whole blocks
+      //
+      let i;
+      let pos = 0;
+      for (i = 0; i < m; i++) {
+        // Offset_i = Offset_{i-1} xor L_{ntz(i)}
+        xorMut(offset, mask[ntz(i + 1)]);
+        // C_i = Offset_i xor ENCIPHER(K, P_i xor Offset_i)
+        // P_i = Offset_i xor DECIPHER(K, C_i xor Offset_i)
+        ct.set(xorMut(fn(xor(offset, text)), offset), pos);
+        // Checksum_i = Checksum_{i-1} xor P_i
+        xorMut(checksum, fn === encipher ? text : ct.subarray(pos));
+
+        text = text.subarray(blockLength$1);
+        pos += blockLength$1;
+      }
+
+      //
+      // Process any final partial block and compute raw tag
+      //
+      if (text.length) {
+        // Offset_* = Offset_m xor L_*
+        xorMut(offset, mask.x);
+        // Pad = ENCIPHER(K, Offset_*)
+        const padding = encipher(offset);
+        // C_* = P_* xor Pad[1..bitlen(P_*)]
+        ct.set(xor(text, padding), pos);
+
+        // Checksum_* = Checksum_m xor (P_* || 1 || new Uint8Array(127-bitlen(P_*)))
+        const xorInput = new Uint8Array(blockLength$1);
+        xorInput.set(fn === encipher ? text : ct.subarray(pos, -tagLength$1), 0);
+        xorInput[text.length] = 0b10000000;
+        xorMut(checksum, xorInput);
+        pos += text.length;
+      }
+      // Tag = ENCIPHER(K, Checksum_* xor Offset_* xor L_$) xor HASH(K,A)
+      const tag = xorMut(encipher(xorMut(xorMut(checksum, offset), mask.$)), hash(adata));
+
+      //
+      // Assemble ciphertext
+      //
+      // C = C_1 || C_2 || ... || C_m || C_* || Tag[1..TAGLEN]
+      ct.set(tag, pos);
+      return ct;
+    }
+
+
+    return {
+      /**
+       * Encrypt plaintext input.
+       * @param {Uint8Array} plaintext - The cleartext input to be encrypted
+       * @param {Uint8Array} nonce - The nonce (15 bytes)
+       * @param {Uint8Array} adata - Associated data to sign
+       * @returns {Promise<Uint8Array>} The ciphertext output.
+       */
+      encrypt: async function(plaintext, nonce, adata) {
+        return crypt(encipher, plaintext, nonce, adata);
+      },
+
+      /**
+       * Decrypt ciphertext input.
+       * @param {Uint8Array} ciphertext - The ciphertext input to be decrypted
+       * @param {Uint8Array} nonce - The nonce (15 bytes)
+       * @param {Uint8Array} adata - Associated data to sign
+       * @returns {Promise<Uint8Array>} The ciphertext output.
+       */
+      decrypt: async function(ciphertext, nonce, adata) {
+        if (ciphertext.length < tagLength$1) throw Error('Invalid OCB ciphertext');
+
+        const tag = ciphertext.subarray(-tagLength$1);
+        ciphertext = ciphertext.subarray(0, -tagLength$1);
+
+        const crypted = crypt(decipher, ciphertext, nonce, adata);
+        // if (Tag[1..TAGLEN] == T)
+        if (util.equalsUint8Array(tag, crypted.subarray(-tagLength$1))) {
+          return crypted.subarray(0, -tagLength$1);
+        }
+        throw Error('Authentication tag mismatch');
+      }
+    };
+  }
+
+
+  /**
+   * Get OCB nonce as defined by {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.2|RFC4880bis-04, section 5.16.2}.
+   * @param {Uint8Array} iv - The initialization vector (15 bytes)
+   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
+   */
+  OCB.getNonce = function(iv, chunkIndex) {
+    const nonce = iv.slice();
+    for (let i = 0; i < chunkIndex.length; i++) {
+      nonce[7 + i] ^= chunkIndex[i];
+    }
+    return nonce;
+  };
+
+  OCB.blockLength = blockLength$1;
+  OCB.ivLength = ivLength$1;
+  OCB.tagLength = tagLength$1;
+
+  const _AES_GCM_data_maxLength = 68719476704; // 2^36 - 2^5
+  class AES_GCM {
+      constructor(key, nonce, adata, tagSize = 16, aes) {
+          this.tagSize = tagSize;
+          this.gamma0 = 0;
+          this.counter = 1;
+          this.aes = aes ? aes : new AES(key, undefined, false, 'CTR');
+          let { asm, heap } = this.aes.acquire_asm();
+          // Init GCM
+          asm.gcm_init();
+          // Tag size
+          if (this.tagSize < 4 || this.tagSize > 16)
+              throw new IllegalArgumentError('illegal tagSize value');
+          // Nonce
+          const noncelen = nonce.length || 0;
+          const noncebuf = new Uint8Array(16);
+          if (noncelen !== 12) {
+              this._gcm_mac_process(nonce);
+              heap[0] = 0;
+              heap[1] = 0;
+              heap[2] = 0;
+              heap[3] = 0;
+              heap[4] = 0;
+              heap[5] = 0;
+              heap[6] = 0;
+              heap[7] = 0;
+              heap[8] = 0;
+              heap[9] = 0;
+              heap[10] = 0;
+              heap[11] = noncelen >>> 29;
+              heap[12] = (noncelen >>> 21) & 255;
+              heap[13] = (noncelen >>> 13) & 255;
+              heap[14] = (noncelen >>> 5) & 255;
+              heap[15] = (noncelen << 3) & 255;
+              asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
+              asm.get_iv(AES_asm.HEAP_DATA);
+              asm.set_iv(0, 0, 0, 0);
+              noncebuf.set(heap.subarray(0, 16));
+          }
+          else {
+              noncebuf.set(nonce);
+              noncebuf[15] = 1;
+          }
+          const nonceview = new DataView(noncebuf.buffer);
+          this.gamma0 = nonceview.getUint32(12);
+          asm.set_nonce(nonceview.getUint32(0), nonceview.getUint32(4), nonceview.getUint32(8), 0);
+          asm.set_mask(0, 0, 0, 0xffffffff);
+          // Associated data
+          if (adata !== undefined) {
+              if (adata.length > _AES_GCM_data_maxLength)
+                  throw new IllegalArgumentError('illegal adata length');
+              if (adata.length) {
+                  this.adata = adata;
+                  this._gcm_mac_process(adata);
+              }
+              else {
+                  this.adata = undefined;
+              }
+          }
+          else {
+              this.adata = undefined;
+          }
+          // Counter
+          if (this.counter < 1 || this.counter > 0xffffffff)
+              throw new RangeError('counter must be a positive 32-bit integer');
+          asm.set_counter(0, 0, 0, (this.gamma0 + this.counter) | 0);
+      }
+      static encrypt(cleartext, key, nonce, adata, tagsize) {
+          return new AES_GCM(key, nonce, adata, tagsize).encrypt(cleartext);
+      }
+      static decrypt(ciphertext, key, nonce, adata, tagsize) {
+          return new AES_GCM(key, nonce, adata, tagsize).decrypt(ciphertext);
+      }
+      encrypt(data) {
+          return this.AES_GCM_encrypt(data);
+      }
+      decrypt(data) {
+          return this.AES_GCM_decrypt(data);
+      }
+      AES_GCM_Encrypt_process(data) {
+          let dpos = 0;
+          let dlen = data.length || 0;
+          let { asm, heap } = this.aes.acquire_asm();
+          let counter = this.counter;
+          let pos = this.aes.pos;
+          let len = this.aes.len;
+          let rpos = 0;
+          let rlen = (len + dlen) & -16;
+          let wlen = 0;
+          if (((counter - 1) << 4) + len + dlen > _AES_GCM_data_maxLength)
+              throw new RangeError('counter overflow');
+          const result = new Uint8Array(rlen);
+          while (dlen > 0) {
+              wlen = _heap_write(heap, pos + len, data, dpos, dlen);
+              len += wlen;
+              dpos += wlen;
+              dlen -= wlen;
+              wlen = asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA + pos, len);
+              wlen = asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, wlen);
+              if (wlen)
+                  result.set(heap.subarray(pos, pos + wlen), rpos);
+              counter += wlen >>> 4;
+              rpos += wlen;
+              if (wlen < len) {
+                  pos += wlen;
+                  len -= wlen;
+              }
+              else {
+                  pos = 0;
+                  len = 0;
+              }
+          }
+          this.counter = counter;
+          this.aes.pos = pos;
+          this.aes.len = len;
+          return result;
+      }
+      AES_GCM_Encrypt_finish() {
+          let { asm, heap } = this.aes.acquire_asm();
+          let counter = this.counter;
+          let tagSize = this.tagSize;
+          let adata = this.adata;
+          let pos = this.aes.pos;
+          let len = this.aes.len;
+          const result = new Uint8Array(len + tagSize);
+          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA + pos, (len + 15) & -16);
+          if (len)
+              result.set(heap.subarray(pos, pos + len));
+          let i = len;
+          for (; i & 15; i++)
+              heap[pos + i] = 0;
+          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, i);
+          const alen = adata !== undefined ? adata.length : 0;
+          const clen = ((counter - 1) << 4) + len;
+          heap[0] = 0;
+          heap[1] = 0;
+          heap[2] = 0;
+          heap[3] = alen >>> 29;
+          heap[4] = alen >>> 21;
+          heap[5] = (alen >>> 13) & 255;
+          heap[6] = (alen >>> 5) & 255;
+          heap[7] = (alen << 3) & 255;
+          heap[8] = heap[9] = heap[10] = 0;
+          heap[11] = clen >>> 29;
+          heap[12] = (clen >>> 21) & 255;
+          heap[13] = (clen >>> 13) & 255;
+          heap[14] = (clen >>> 5) & 255;
+          heap[15] = (clen << 3) & 255;
+          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
+          asm.get_iv(AES_asm.HEAP_DATA);
+          asm.set_counter(0, 0, 0, this.gamma0);
+          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA, 16);
+          result.set(heap.subarray(0, tagSize), len);
+          this.counter = 1;
+          this.aes.pos = 0;
+          this.aes.len = 0;
+          return result;
+      }
+      AES_GCM_Decrypt_process(data) {
+          let dpos = 0;
+          let dlen = data.length || 0;
+          let { asm, heap } = this.aes.acquire_asm();
+          let counter = this.counter;
+          let tagSize = this.tagSize;
+          let pos = this.aes.pos;
+          let len = this.aes.len;
+          let rpos = 0;
+          let rlen = len + dlen > tagSize ? (len + dlen - tagSize) & -16 : 0;
+          let tlen = len + dlen - rlen;
+          let wlen = 0;
+          if (((counter - 1) << 4) + len + dlen > _AES_GCM_data_maxLength)
+              throw new RangeError('counter overflow');
+          const result = new Uint8Array(rlen);
+          while (dlen > tlen) {
+              wlen = _heap_write(heap, pos + len, data, dpos, dlen - tlen);
+              len += wlen;
+              dpos += wlen;
+              dlen -= wlen;
+              wlen = asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, wlen);
+              wlen = asm.cipher(AES_asm.DEC.CTR, AES_asm.HEAP_DATA + pos, wlen);
+              if (wlen)
+                  result.set(heap.subarray(pos, pos + wlen), rpos);
+              counter += wlen >>> 4;
+              rpos += wlen;
+              pos = 0;
+              len = 0;
+          }
+          if (dlen > 0) {
+              len += _heap_write(heap, 0, data, dpos, dlen);
+          }
+          this.counter = counter;
+          this.aes.pos = pos;
+          this.aes.len = len;
+          return result;
+      }
+      AES_GCM_Decrypt_finish() {
+          let { asm, heap } = this.aes.acquire_asm();
+          let tagSize = this.tagSize;
+          let adata = this.adata;
+          let counter = this.counter;
+          let pos = this.aes.pos;
+          let len = this.aes.len;
+          let rlen = len - tagSize;
+          if (len < tagSize)
+              throw new IllegalStateError('authentication tag not found');
+          const result = new Uint8Array(rlen);
+          const atag = new Uint8Array(heap.subarray(pos + rlen, pos + len));
+          let i = rlen;
+          for (; i & 15; i++)
+              heap[pos + i] = 0;
+          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, i);
+          asm.cipher(AES_asm.DEC.CTR, AES_asm.HEAP_DATA + pos, i);
+          if (rlen)
+              result.set(heap.subarray(pos, pos + rlen));
+          const alen = adata !== undefined ? adata.length : 0;
+          const clen = ((counter - 1) << 4) + len - tagSize;
+          heap[0] = 0;
+          heap[1] = 0;
+          heap[2] = 0;
+          heap[3] = alen >>> 29;
+          heap[4] = alen >>> 21;
+          heap[5] = (alen >>> 13) & 255;
+          heap[6] = (alen >>> 5) & 255;
+          heap[7] = (alen << 3) & 255;
+          heap[8] = heap[9] = heap[10] = 0;
+          heap[11] = clen >>> 29;
+          heap[12] = (clen >>> 21) & 255;
+          heap[13] = (clen >>> 13) & 255;
+          heap[14] = (clen >>> 5) & 255;
+          heap[15] = (clen << 3) & 255;
+          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
+          asm.get_iv(AES_asm.HEAP_DATA);
+          asm.set_counter(0, 0, 0, this.gamma0);
+          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA, 16);
+          let acheck = 0;
+          for (let i = 0; i < tagSize; ++i)
+              acheck |= atag[i] ^ heap[i];
+          if (acheck)
+              throw new SecurityError('data integrity check failed');
+          this.counter = 1;
+          this.aes.pos = 0;
+          this.aes.len = 0;
+          return result;
+      }
+      AES_GCM_decrypt(data) {
+          const result1 = this.AES_GCM_Decrypt_process(data);
+          const result2 = this.AES_GCM_Decrypt_finish();
+          const result = new Uint8Array(result1.length + result2.length);
+          if (result1.length)
+              result.set(result1);
+          if (result2.length)
+              result.set(result2, result1.length);
+          return result;
+      }
+      AES_GCM_encrypt(data) {
+          const result1 = this.AES_GCM_Encrypt_process(data);
+          const result2 = this.AES_GCM_Encrypt_finish();
+          const result = new Uint8Array(result1.length + result2.length);
+          if (result1.length)
+              result.set(result1);
+          if (result2.length)
+              result.set(result2, result1.length);
+          return result;
+      }
+      _gcm_mac_process(data) {
+          let { asm, heap } = this.aes.acquire_asm();
+          let dpos = 0;
+          let dlen = data.length || 0;
+          let wlen = 0;
+          while (dlen > 0) {
+              wlen = _heap_write(heap, 0, data, dpos, dlen);
+              dpos += wlen;
+              dlen -= wlen;
+              while (wlen & 15)
+                  heap[wlen++] = 0;
+              asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, wlen);
+          }
+      }
+  }
+
+  // OpenPGP.js - An OpenPGP implementation in javascript
+
+  const webCrypto$5 = util.getWebCrypto();
+
+  const blockLength = 16;
+  const ivLength = 12; // size of the IV in bytes
+  const tagLength = 16; // size of the tag in bytes
+  const ALGO = 'AES-GCM';
+
+  /**
+   * Class to en/decrypt using GCM mode.
+   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
+   * @param {Uint8Array} key - The encryption key
+   */
+  async function GCM(cipher, key) {
+    if (cipher !== enums.symmetric.aes128 &&
+      cipher !== enums.symmetric.aes192 &&
+      cipher !== enums.symmetric.aes256) {
+      throw Error('GCM mode supports only AES cipher');
+    }
+
+    if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support
+      const _key = await webCrypto$5.importKey('raw', key, { name: ALGO }, false, ['encrypt', 'decrypt']);
+
+      return {
+        encrypt: async function(pt, iv, adata = new Uint8Array()) {
+          if (!pt.length) { // iOS does not support GCM-en/decrypting empty messages
+            return AES_GCM.encrypt(pt, key, iv, adata);
+          }
+          const ct = await webCrypto$5.encrypt({ name: ALGO, iv, additionalData: adata, tagLength: tagLength * 8 }, _key, pt);
+          return new Uint8Array(ct);
+        },
+
+        decrypt: async function(ct, iv, adata = new Uint8Array()) {
+          if (ct.length === tagLength) { // iOS does not support GCM-en/decrypting empty messages
+            return AES_GCM.decrypt(ct, key, iv, adata);
+          }
+          const pt = await webCrypto$5.decrypt({ name: ALGO, iv, additionalData: adata, tagLength: tagLength * 8 }, _key, ct);
+          return new Uint8Array(pt);
+        }
+      };
+    }
+
+    return {
+      encrypt: async function(pt, iv, adata) {
+        return AES_GCM.encrypt(pt, key, iv, adata);
+      },
+
+      decrypt: async function(ct, iv, adata) {
+        return AES_GCM.decrypt(ct, key, iv, adata);
+      }
+    };
+  }
+
+
+  /**
+   * Get GCM nonce. Note: this operation is not defined by the standard.
+   * A future version of the standard may define GCM mode differently,
+   * hopefully under a different ID (we use Private/Experimental algorithm
+   * ID 100) so that we can maintain backwards compatibility.
+   * @param {Uint8Array} iv - The initialization vector (12 bytes)
+   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
+   */
+  GCM.getNonce = function(iv, chunkIndex) {
+    const nonce = iv.slice();
+    for (let i = 0; i < chunkIndex.length; i++) {
+      nonce[4 + i] ^= chunkIndex[i];
+    }
+    return nonce;
+  };
+
+  GCM.blockLength = blockLength;
+  GCM.ivLength = ivLength;
+  GCM.tagLength = tagLength;
+
+  /**
+   * @fileoverview Cipher modes
+   * @module crypto/mode
+   * @private
+   */
+
+  var mode = {
+    /** @see module:crypto/mode/cfb */
+    cfb: cfb,
+    /** @see module:crypto/mode/gcm */
+    gcm: GCM,
+    experimentalGCM: GCM,
+    /** @see module:crypto/mode/eax */
+    eax: EAX,
+    /** @see module:crypto/mode/ocb */
+    ocb: OCB
+  };
+
   var naclFastLight = createCommonjsModule(function (module) {
   /*jshint bitwise: false*/
 
@@ -9732,7 +10822,7 @@ var openpgp = (function (exports) {
   };
 
   //  Pluggable, initialized in high-level API below.
-  var randombytes = function(/* x, n */) { throw new Error('no PRNG'); };
+  var randombytes = function(/* x, n */) { throw Error('no PRNG'); };
 
   var _9 = new Uint8Array(32); _9[0] = 9;
 
@@ -10533,8 +11623,8 @@ var openpgp = (function (exports) {
 
   nacl.scalarMult = function(n, p) {
     checkArrayTypes(n, p);
-    if (n.length !== crypto_scalarmult_SCALARBYTES) throw new Error('bad n size');
-    if (p.length !== crypto_scalarmult_BYTES) throw new Error('bad p size');
+    if (n.length !== crypto_scalarmult_SCALARBYTES) throw Error('bad n size');
+    if (p.length !== crypto_scalarmult_BYTES) throw Error('bad p size');
     var q = new Uint8Array(crypto_scalarmult_BYTES);
     crypto_scalarmult(q, n, p);
     return q;
@@ -10552,7 +11642,7 @@ var openpgp = (function (exports) {
   nacl.box.keyPair.fromSecretKey = function(secretKey) {
     checkArrayTypes(secretKey);
     if (secretKey.length !== crypto_box_SECRETKEYBYTES)
-      throw new Error('bad secret key size');
+      throw Error('bad secret key size');
     var pk = new Uint8Array(crypto_box_PUBLICKEYBYTES);
     crypto_scalarmult_base(pk, secretKey);
     return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
@@ -10561,7 +11651,7 @@ var openpgp = (function (exports) {
   nacl.sign = function(msg, secretKey) {
     checkArrayTypes(msg, secretKey);
     if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
-      throw new Error('bad secret key size');
+      throw Error('bad secret key size');
     var signedMsg = new Uint8Array(crypto_sign_BYTES+msg.length);
     crypto_sign(signedMsg, msg, msg.length, secretKey);
     return signedMsg;
@@ -10577,9 +11667,9 @@ var openpgp = (function (exports) {
   nacl.sign.detached.verify = function(msg, sig, publicKey) {
     checkArrayTypes(msg, sig, publicKey);
     if (sig.length !== crypto_sign_BYTES)
-      throw new Error('bad signature size');
+      throw Error('bad signature size');
     if (publicKey.length !== crypto_sign_PUBLICKEYBYTES)
-      throw new Error('bad public key size');
+      throw Error('bad public key size');
     var sm = new Uint8Array(crypto_sign_BYTES + msg.length);
     var m = new Uint8Array(crypto_sign_BYTES + msg.length);
     var i;
@@ -10598,7 +11688,7 @@ var openpgp = (function (exports) {
   nacl.sign.keyPair.fromSecretKey = function(secretKey) {
     checkArrayTypes(secretKey);
     if (secretKey.length !== crypto_sign_SECRETKEYBYTES)
-      throw new Error('bad secret key size');
+      throw Error('bad secret key size');
     var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
     for (var i = 0; i < pk.length; i++) pk[i] = secretKey[32+i];
     return {publicKey: pk, secretKey: new Uint8Array(secretKey)};
@@ -10607,7 +11697,7 @@ var openpgp = (function (exports) {
   nacl.sign.keyPair.fromSeed = function(seed) {
     checkArrayTypes(seed);
     if (seed.length !== crypto_sign_SEEDBYTES)
-      throw new Error('bad seed size');
+      throw Error('bad seed size');
     var pk = new Uint8Array(crypto_sign_PUBLICKEYBYTES);
     var sk = new Uint8Array(crypto_sign_SECRETKEYBYTES);
     for (var i = 0; i < 32; i++) sk[i] = seed[i];
@@ -10652,87 +11742,17 @@ var openpgp = (function (exports) {
 
   // GPG4Browsers - An OpenPGP implementation in javascript
 
-  /**
-   * Buffer for secure random numbers
-   */
-  class RandomBuffer {
-    constructor() {
-      this.buffer = null;
-      this.size = null;
-      this.callback = null;
-    }
-
-    /**
-     * Initialize buffer
-     * @param {Integer} size - size of buffer
-     */
-    init(size, callback) {
-      this.buffer = new Uint8Array(size);
-      this.size = 0;
-      this.callback = callback;
-    }
-
-    /**
-     * Concat array of secure random numbers to buffer
-     * @param {Uint8Array} buf
-     */
-    set(buf) {
-      if (!this.buffer) {
-        throw new Error('RandomBuffer is not initialized');
-      }
-      if (!(buf instanceof Uint8Array)) {
-        throw new Error('Invalid type: buf not an Uint8Array');
-      }
-      const freeSpace = this.buffer.length - this.size;
-      if (buf.length > freeSpace) {
-        buf = buf.subarray(0, freeSpace);
-      }
-      // set buf with offset old size of buffer
-      this.buffer.set(buf, this.size);
-      this.size += buf.length;
-    }
-
-    /**
-     * Take numbers out of buffer and copy to array
-     * @param {Uint8Array} buf - The destination array
-     */
-    async get(buf) {
-      if (!this.buffer) {
-        throw new Error('RandomBuffer is not initialized');
-      }
-      if (!(buf instanceof Uint8Array)) {
-        throw new Error('Invalid type: buf not an Uint8Array');
-      }
-      if (this.size < buf.length) {
-        if (!this.callback) {
-          throw new Error('Random number buffer depleted');
-        }
-        // Wait for random bytes from main context, then try again
-        await this.callback();
-        return this.get(buf);
-      }
-      for (let i = 0; i < buf.length; i++) {
-        buf[i] = this.buffer[--this.size];
-        // clear buffer value
-        this.buffer[this.size] = 0;
-      }
-    }
-  }
-
   /**
    * Retrieve secure random byte array of the specified length
    * @param {Integer} length - Length in bytes to generate
-   * @returns {Promise<Uint8Array>} Random byte array.
-   * @async
+   * @returns {Uint8Array} Random byte array.
    */
-  async function getRandomBytes(length) {
+  function getRandomBytes(length) {
     const buf = new Uint8Array(length);
     if (typeof crypto !== 'undefined' && crypto.getRandomValues) {
       crypto.getRandomValues(buf);
-    } else if (randomBuffer.buffer) {
-      await randomBuffer.get(buf);
     } else {
-      throw new Error('No secure random number generator available.');
+      throw Error('No secure random number generator available.');
     }
     return buf;
   }
@@ -10748,7 +11768,7 @@ var openpgp = (function (exports) {
     const BigInteger = await util.getBigInteger();
 
     if (max.lt(min)) {
-      throw new Error('Illegal parameter value: max <= min');
+      throw Error('Illegal parameter value: max <= min');
     }
 
     const modulus = max.sub(min);
@@ -10761,13 +11781,10 @@ var openpgp = (function (exports) {
     return r.mod(modulus).add(min);
   }
 
-  const randomBuffer = new RandomBuffer();
-
   var random = /*#__PURE__*/Object.freeze({
     __proto__: null,
     getRandomBytes: getRandomBytes,
-    getRandomBigInteger: getRandomBigInteger,
-    randomBuffer: randomBuffer
+    getRandomBigInteger: getRandomBigInteger
   });
 
   // OpenPGP.js - An OpenPGP implementation in javascript
@@ -11043,14 +12060,13 @@ var openpgp = (function (exports) {
    * Create padding with secure random data
    * @private
    * @param {Integer} length - Length of the padding in bytes
-   * @returns {Promise<Uint8Array>} Random padding.
-   * @async
+   * @returns {Uint8Array} Random padding.
    */
-  async function getPKCS1Padding(length) {
+  function getPKCS1Padding(length) {
     const result = new Uint8Array(length);
     let count = 0;
     while (count < length) {
-      const randomBytes = await getRandomBytes(length - count);
+      const randomBytes = getRandomBytes(length - count);
       for (let i = 0; i < randomBytes.length; i++) {
         if (randomBytes[i] !== 0) {
           result[count++] = randomBytes[i];
@@ -11065,18 +12081,17 @@ var openpgp = (function (exports) {
    * @see {@link https://tools.ietf.org/html/rfc4880#section-13.1.1|RFC 4880 13.1.1}
    * @param {Uint8Array} message - Message to be encoded
    * @param {Integer} keyLength - The length in octets of the key modulus
-   * @returns {Promise<Uint8Array>} EME-PKCS1 padded message.
-   * @async
+   * @returns {Uint8Array} EME-PKCS1 padded message.
    */
-  async function emeEncode(message, keyLength) {
+  function emeEncode(message, keyLength) {
     const mLength = message.length;
     // length checking
     if (mLength > keyLength - 11) {
-      throw new Error('Message too long');
+      throw Error('Message too long');
     }
     // Generate an octet string PS of length k - mLen - 3 consisting of
     // pseudo-randomly generated nonzero octets
-    const PS = await getPKCS1Padding(keyLength - mLength - 3);
+    const PS = getPKCS1Padding(keyLength - mLength - 3);
     // Concatenate PS, the message M, and other padding to form an
     // encoded message EM of length k octets as EM = 0x00 || 0x02 || PS || 0x00 || M.
     const encoded = new Uint8Array(keyLength);
@@ -11117,7 +12132,7 @@ var openpgp = (function (exports) {
       return payload;
     }
 
-    throw new Error('Decryption error');
+    throw Error('Decryption error');
   }
 
   /**
@@ -11131,7 +12146,7 @@ var openpgp = (function (exports) {
   async function emsaEncode(algo, hashed, emLen) {
     let i;
     if (hashed.length !== hash.getHashByteLength(algo)) {
-      throw new Error('Invalid hash length');
+      throw Error('Invalid hash length');
     }
     // produce an ASN.1 DER value for the hash function used.
     // Let T be the full hash prefix
@@ -11142,7 +12157,7 @@ var openpgp = (function (exports) {
     // and let tLen be the length in octets prefix and hashed data
     const tLen = hashPrefix.length + hashed.length;
     if (emLen < tLen + 11) {
-      throw new Error('Intended encoded message length too short');
+      throw Error('Intended encoded message length too short');
     }
     // an octet string PS consisting of emLen - tLen - 3 octets with hexadecimal value 0xFF
     // The length of PS will be at least 8 octets
@@ -11167,7 +12182,7 @@ var openpgp = (function (exports) {
 
   // GPG4Browsers - An OpenPGP implementation in javascript
 
-  const webCrypto$7 = util.getWebCrypto();
+  const webCrypto$4 = util.getWebCrypto();
 
   /** Create signature
    * @param {module:enums.hash} hashAlgo - Hash algorithm
@@ -11182,7 +12197,7 @@ var openpgp = (function (exports) {
    * @returns {Promise<Uint8Array>} RSA Signature.
    * @async
    */
-  async function sign$5(hashAlgo, data, n, e, d, p, q, u, hashed) {
+  async function sign$6(hashAlgo, data, n, e, d, p, q, u, hashed) {
     if (data && !util.isStream(data)) {
       if (util.getWebCrypto()) {
         try {
@@ -11206,7 +12221,7 @@ var openpgp = (function (exports) {
    * @returns {Boolean}
    * @async
    */
-  async function verify$5(hashAlgo, data, s, n, e, hashed) {
+  async function verify$6(hashAlgo, data, s, n, e, hashed) {
     if (data && !util.isStream(data)) {
       if (util.getWebCrypto()) {
         try {
@@ -11263,7 +12278,7 @@ var openpgp = (function (exports) {
    *                                  RSA private prime p, RSA private prime q, u = p ** -1 mod q
    * @async
    */
-  async function generate$2(bits, e) {
+  async function generate$4(bits, e) {
     const BigInteger = await util.getBigInteger();
 
     e = new BigInteger(e);
@@ -11278,11 +12293,11 @@ var openpgp = (function (exports) {
           name: 'SHA-1' // not required for actual RSA keys, but for crypto api 'sign' and 'verify'
         }
       };
-      const keyPair = await webCrypto$7.generateKey(keyGenOpt, true, ['sign', 'verify']);
+      const keyPair = await webCrypto$4.generateKey(keyGenOpt, true, ['sign', 'verify']);
 
       // export the generated keys as JsonWebKey (JWK)
       // https://tools.ietf.org/html/draft-ietf-jose-json-web-key-33
-      const jwk = await webCrypto$7.exportKey('jwk', keyPair.privateKey);
+      const jwk = await webCrypto$4.exportKey('jwk', keyPair.privateKey);
       // map JWK parameters to corresponding OpenPGP names
       return {
         n: b64ToUint8Array(jwk.n),
@@ -11337,7 +12352,7 @@ var openpgp = (function (exports) {
    * @returns {Promise<Boolean>} Whether params are valid.
    * @async
    */
-  async function validateParams$6(n, e, d, p, q, u) {
+  async function validateParams$8(n, e, d, p, q, u) {
     const BigInteger = await util.getBigInteger();
     n = new BigInteger(n);
     p = new BigInteger(p);
@@ -11382,7 +12397,7 @@ var openpgp = (function (exports) {
     const m = new BigInteger(await emsaEncode(hashAlgo, hashed, n.byteLength()));
     d = new BigInteger(d);
     if (m.gte(n)) {
-      throw new Error('Message size cannot exceed modulus size');
+      throw Error('Message size cannot exceed modulus size');
     }
     return m.modExp(d, n).toUint8Array('be', n.byteLength());
   }
@@ -11400,8 +12415,8 @@ var openpgp = (function (exports) {
       name: 'RSASSA-PKCS1-v1_5',
       hash: { name: hashName }
     };
-    const key = await webCrypto$7.importKey('jwk', jwk, algo, false, ['sign']);
-    return new Uint8Array(await webCrypto$7.sign('RSASSA-PKCS1-v1_5', key, data));
+    const key = await webCrypto$4.importKey('jwk', jwk, algo, false, ['sign']);
+    return new Uint8Array(await webCrypto$4.sign('RSASSA-PKCS1-v1_5', key, data));
   }
 
   async function bnVerify(hashAlgo, s, n, e, hashed) {
@@ -11410,7 +12425,7 @@ var openpgp = (function (exports) {
     s = new BigInteger(s);
     e = new BigInteger(e);
     if (s.gte(n)) {
-      throw new Error('Signature size cannot exceed modulus size');
+      throw Error('Signature size cannot exceed modulus size');
     }
     const EM1 = s.modExp(e, n).toUint8Array('be', n.byteLength());
     const EM2 = await emsaEncode(hashAlgo, hashed, n.byteLength());
@@ -11419,20 +12434,20 @@ var openpgp = (function (exports) {
 
   async function webVerify$1(hashName, data, s, n, e) {
     const jwk = publicToJWK(n, e);
-    const key = await webCrypto$7.importKey('jwk', jwk, {
+    const key = await webCrypto$4.importKey('jwk', jwk, {
       name: 'RSASSA-PKCS1-v1_5',
       hash: { name:  hashName }
     }, false, ['verify']);
-    return webCrypto$7.verify('RSASSA-PKCS1-v1_5', key, s, data);
+    return webCrypto$4.verify('RSASSA-PKCS1-v1_5', key, s, data);
   }
 
   async function bnEncrypt(data, n, e) {
     const BigInteger = await util.getBigInteger();
     n = new BigInteger(n);
-    data = new BigInteger(await emeEncode(data, n.byteLength()));
+    data = new BigInteger(emeEncode(data, n.byteLength()));
     e = new BigInteger(e);
     if (data.gte(n)) {
-      throw new Error('Message size cannot exceed modulus size');
+      throw Error('Message size cannot exceed modulus size');
     }
     return data.modExp(e, n).toUint8Array('be', n.byteLength());
   }
@@ -11447,7 +12462,7 @@ var openpgp = (function (exports) {
     q = new BigInteger(q);
     u = new BigInteger(u);
     if (data.gte(n)) {
-      throw new Error('Data too large.');
+      throw Error('Data too large.');
     }
     const dq = d.mod(q.dec()); // d mod (q-1)
     const dp = d.mod(p.dec()); // d mod (p-1)
@@ -11522,12 +12537,12 @@ var openpgp = (function (exports) {
 
   var rsa = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    sign: sign$5,
-    verify: verify$5,
+    sign: sign$6,
+    verify: verify$6,
     encrypt: encrypt$4,
     decrypt: decrypt$4,
-    generate: generate$2,
-    validateParams: validateParams$6
+    generate: generate$4,
+    validateParams: validateParams$8
   });
 
   // GPG4Browsers - An OpenPGP implementation in javascript
@@ -11548,7 +12563,7 @@ var openpgp = (function (exports) {
     g = new BigInteger(g);
     y = new BigInteger(y);
 
-    const padded = await emeEncode(data, p.byteLength());
+    const padded = emeEncode(data, p.byteLength());
     const m = new BigInteger(padded);
 
     // OpenPGP uses a "special" version of ElGamal where g is generator of the full group Z/pZ*
@@ -11592,7 +12607,7 @@ var openpgp = (function (exports) {
    * @returns {Promise<Boolean>} Whether params are valid.
    * @async
    */
-  async function validateParams$5(p, g, y, x) {
+  async function validateParams$7(p, g, y, x) {
     const BigInteger = await util.getBigInteger();
     p = new BigInteger(p);
     g = new BigInteger(g);
@@ -11657,7 +12672,7 @@ var openpgp = (function (exports) {
     __proto__: null,
     encrypt: encrypt$3,
     decrypt: decrypt$3,
-    validateParams: validateParams$5
+    validateParams: validateParams$7
   });
 
   // OpenPGP.js - An OpenPGP implementation in javascript
@@ -11671,7 +12686,7 @@ var openpgp = (function (exports) {
         oid = new Uint8Array(oid);
         if (oid[0] === 0x06) { // DER encoded oid byte array
           if (oid[1] !== oid.length - 2) {
-            throw new Error('Length mismatch in DER encoded oid');
+            throw Error('Length mismatch in DER encoded oid');
           }
           oid = oid.subarray(2);
         }
@@ -11694,7 +12709,7 @@ var openpgp = (function (exports) {
           return 1 + this.oid.length;
         }
       }
-      throw new Error('Invalid oid');
+      throw Error('Invalid oid');
     }
 
     /**
@@ -11722,7 +12737,7 @@ var openpgp = (function (exports) {
       if (enums.curve[hex]) {
         return enums.write(enums.curve, hex);
       } else {
-        throw new Error('Unknown curve object identifier.');
+        throw Error('Unknown curve object identifier.');
       }
     }
   }
@@ -11737,22 +12752,319 @@ var openpgp = (function (exports) {
   function keyFromPublic(indutnyCurve, pub) {
     const keyPair = indutnyCurve.keyPair({ pub: pub });
     if (keyPair.validate().result !== true) {
-      throw new Error('Invalid elliptic public key');
+      throw Error('Invalid elliptic public key');
     }
     return keyPair;
   }
 
   async function getIndutnyCurve(name) {
-    if (!defaultConfig.useIndutnyElliptic) {
-      throw new Error('This curve is only supported in the full build of OpenPGP.js');
+    if (!config.useIndutnyElliptic) {
+      throw Error('This curve is only supported in the full build of OpenPGP.js');
     }
     const { default: elliptic$1 } = await Promise.resolve().then(function () { return elliptic; });
     return new elliptic$1.ec(name);
   }
 
+  // GPG4Browsers - An OpenPGP implementation in javascript
+
+  function readSimpleLength(bytes) {
+    let len = 0;
+    let offset;
+    const type = bytes[0];
+
+
+    if (type < 192) {
+      [len] = bytes;
+      offset = 1;
+    } else if (type < 255) {
+      len = ((bytes[0] - 192) << 8) + (bytes[1]) + 192;
+      offset = 2;
+    } else if (type === 255) {
+      len = util.readNumber(bytes.subarray(1, 1 + 4));
+      offset = 5;
+    }
+
+    return {
+      len: len,
+      offset: offset
+    };
+  }
+
+  /**
+   * Encodes a given integer of length to the openpgp length specifier to a
+   * string
+   *
+   * @param {Integer} length - The length to encode
+   * @returns {Uint8Array} String with openpgp length representation.
+   */
+  function writeSimpleLength(length) {
+    if (length < 192) {
+      return new Uint8Array([length]);
+    } else if (length > 191 && length < 8384) {
+      /*
+        * let a = (total data packet length) - 192 let bc = two octet
+        * representation of a let d = b + 192
+        */
+      return new Uint8Array([((length - 192) >> 8) + 192, (length - 192) & 0xFF]);
+    }
+    return util.concatUint8Array([new Uint8Array([255]), util.writeNumber(length, 4)]);
+  }
+
+  function writePartialLength(power) {
+    if (power < 0 || power > 30) {
+      throw Error('Partial Length power must be between 1 and 30');
+    }
+    return new Uint8Array([224 + power]);
+  }
+
+  function writeTag(tag_type) {
+    /* we're only generating v4 packet headers here */
+    return new Uint8Array([0xC0 | tag_type]);
+  }
+
+  /**
+   * Writes a packet header version 4 with the given tag_type and length to a
+   * string
+   *
+   * @param {Integer} tag_type - Tag type
+   * @param {Integer} length - Length of the payload
+   * @returns {String} String of the header.
+   */
+  function writeHeader(tag_type, length) {
+    /* we're only generating v4 packet headers here */
+    return util.concatUint8Array([writeTag(tag_type), writeSimpleLength(length)]);
+  }
+
+  /**
+   * Whether the packet type supports partial lengths per RFC4880
+   * @param {Integer} tag - Tag type
+   * @returns {Boolean} String of the header.
+   */
+  function supportsStreaming(tag) {
+    return [
+      enums.packet.literalData,
+      enums.packet.compressedData,
+      enums.packet.symmetricallyEncryptedData,
+      enums.packet.symEncryptedIntegrityProtectedData,
+      enums.packet.aeadEncryptedData
+    ].includes(tag);
+  }
+
+  /**
+   * Generic static Packet Parser function
+   *
+   * @param {Uint8Array | ReadableStream<Uint8Array>} input - Input stream as string
+   * @param {Function} callback - Function to call with the parsed packet
+   * @returns {Boolean} Returns false if the stream was empty and parsing is done, and true otherwise.
+   */
+  async function readPackets(input, callback) {
+    const reader = getReader(input);
+    let writer;
+    let callbackReturned;
+    try {
+      const peekedBytes = await reader.peekBytes(2);
+      // some sanity checks
+      if (!peekedBytes || peekedBytes.length < 2 || (peekedBytes[0] & 0x80) === 0) {
+        throw Error('Error during parsing. This message / key probably does not conform to a valid OpenPGP format.');
+      }
+      const headerByte = await reader.readByte();
+      let tag = -1;
+      let format = -1;
+      let packetLength;
+
+      format = 0; // 0 = old format; 1 = new format
+      if ((headerByte & 0x40) !== 0) {
+        format = 1;
+      }
+
+      let packetLengthType;
+      if (format) {
+        // new format header
+        tag = headerByte & 0x3F; // bit 5-0
+      } else {
+        // old format header
+        tag = (headerByte & 0x3F) >> 2; // bit 5-2
+        packetLengthType = headerByte & 0x03; // bit 1-0
+      }
+
+      const packetSupportsStreaming = supportsStreaming(tag);
+      let packet = null;
+      if (packetSupportsStreaming) {
+        if (util.isStream(input) === 'array') {
+          const arrayStream = new ArrayStream();
+          writer = getWriter(arrayStream);
+          packet = arrayStream;
+        } else {
+          const transform = new TransformStream$1();
+          writer = getWriter(transform.writable);
+          packet = transform.readable;
+        }
+        // eslint-disable-next-line callback-return
+        callbackReturned = callback({ tag, packet });
+      } else {
+        packet = [];
+      }
+
+      let wasPartialLength;
+      do {
+        if (!format) {
+          // 4.2.1. Old Format Packet Lengths
+          switch (packetLengthType) {
+            case 0:
+              // The packet has a one-octet length. The header is 2 octets
+              // long.
+              packetLength = await reader.readByte();
+              break;
+            case 1:
+              // The packet has a two-octet length. The header is 3 octets
+              // long.
+              packetLength = (await reader.readByte() << 8) | await reader.readByte();
+              break;
+            case 2:
+              // The packet has a four-octet length. The header is 5
+              // octets long.
+              packetLength = (await reader.readByte() << 24) | (await reader.readByte() << 16) | (await reader.readByte() <<
+                8) | await reader.readByte();
+              break;
+            default:
+              // 3 - The packet is of indeterminate length. The header is 1
+              // octet long, and the implementation must determine how long
+              // the packet is. If the packet is in a file, this means that
+              // the packet extends until the end of the file. In general,
+              // an implementation SHOULD NOT use indeterminate-length
+              // packets except where the end of the data will be clear
+              // from the context, and even then it is better to use a
+              // definite length, or a new format header. The new format
+              // headers described below have a mechanism for precisely
+              // encoding data of indeterminate length.
+              packetLength = Infinity;
+              break;
+          }
+        } else { // 4.2.2. New Format Packet Lengths
+          // 4.2.2.1. One-Octet Lengths
+          const lengthByte = await reader.readByte();
+          wasPartialLength = false;
+          if (lengthByte < 192) {
+            packetLength = lengthByte;
+            // 4.2.2.2. Two-Octet Lengths
+          } else if (lengthByte >= 192 && lengthByte < 224) {
+            packetLength = ((lengthByte - 192) << 8) + (await reader.readByte()) + 192;
+            // 4.2.2.4. Partial Body Lengths
+          } else if (lengthByte > 223 && lengthByte < 255) {
+            packetLength = 1 << (lengthByte & 0x1F);
+            wasPartialLength = true;
+            if (!packetSupportsStreaming) {
+              throw new TypeError('This packet type does not support partial lengths.');
+            }
+            // 4.2.2.3. Five-Octet Lengths
+          } else {
+            packetLength = (await reader.readByte() << 24) | (await reader.readByte() << 16) | (await reader.readByte() <<
+              8) | await reader.readByte();
+          }
+        }
+        if (packetLength > 0) {
+          let bytesRead = 0;
+          while (true) {
+            if (writer) await writer.ready;
+            const { done, value } = await reader.read();
+            if (done) {
+              if (packetLength === Infinity) break;
+              throw Error('Unexpected end of packet');
+            }
+            const chunk = packetLength === Infinity ? value : value.subarray(0, packetLength - bytesRead);
+            if (writer) await writer.write(chunk);
+            else packet.push(chunk);
+            bytesRead += value.length;
+            if (bytesRead >= packetLength) {
+              reader.unshift(value.subarray(packetLength - bytesRead + value.length));
+              break;
+            }
+          }
+        }
+      } while (wasPartialLength);
+
+      // If this was not a packet that "supports streaming", we peek to check
+      // whether it is the last packet in the message. We peek 2 bytes instead
+      // of 1 because the beginning of this function also peeks 2 bytes, and we
+      // want to cut a `subarray` of the correct length into `web-stream-tools`'
+      // `externalBuffer` as a tiny optimization here.
+      //
+      // If it *was* a streaming packet (i.e. the data packets), we peek at the
+      // entire remainder of the stream, in order to forward errors in the
+      // remainder of the stream to the packet data. (Note that this means we
+      // read/peek at all signature packets before closing the literal data
+      // packet, for example.) This forwards MDC errors to the literal data
+      // stream, for example, so that they don't get lost / forgotten on
+      // decryptedMessage.packets.stream, which we never look at.
+      //
+      // An example of what we do when stream-parsing a message containing
+      // [ one-pass signature packet, literal data packet, signature packet ]:
+      // 1. Read the one-pass signature packet
+      // 2. Peek 2 bytes of the literal data packet
+      // 3. Parse the one-pass signature packet
+      //
+      // 4. Read the literal data packet, simultaneously stream-parsing it
+      // 5. Peek until the end of the message
+      // 6. Finish parsing the literal data packet
+      //
+      // 7. Read the signature packet again (we already peeked at it in step 5)
+      // 8. Peek at the end of the stream again (`peekBytes` returns undefined)
+      // 9. Parse the signature packet
+      //
+      // Note that this means that if there's an error in the very end of the
+      // stream, such as an MDC error, we throw in step 5 instead of in step 8
+      // (or never), which is the point of this exercise.
+      const nextPacket = await reader.peekBytes(packetSupportsStreaming ? Infinity : 2);
+      if (writer) {
+        await writer.ready;
+        await writer.close();
+      } else {
+        packet = util.concatUint8Array(packet);
+        // eslint-disable-next-line callback-return
+        await callback({ tag, packet });
+      }
+      return !nextPacket || !nextPacket.length;
+    } catch (e) {
+      if (writer) {
+        await writer.abort(e);
+        return true;
+      } else {
+        throw e;
+      }
+    } finally {
+      if (writer) {
+        await callbackReturned;
+      }
+      reader.releaseLock();
+    }
+  }
+
+  class UnsupportedError extends Error {
+    constructor(...params) {
+      super(...params);
+
+      if (Error.captureStackTrace) {
+        Error.captureStackTrace(this, UnsupportedError);
+      }
+
+      this.name = 'UnsupportedError';
+    }
+  }
+
+  class UnparseablePacket {
+    constructor(tag, rawContent) {
+      this.tag = tag;
+      this.rawContent = rawContent;
+    }
+
+    write() {
+      return this.rawContent;
+    }
+  }
+
   // OpenPGP.js - An OpenPGP implementation in javascript
 
-  const webCrypto$6 = util.getWebCrypto();
+  const webCrypto$3 = util.getWebCrypto();
 
   const webCurves = {
     'p256': 'P-256',
@@ -11797,7 +13109,7 @@ var openpgp = (function (exports) {
     },
     ed25519: {
       oid: [0x06, 0x09, 0x2B, 0x06, 0x01, 0x04, 0x01, 0xDA, 0x47, 0x0F, 0x01],
-      keyType: enums.publicKey.eddsa,
+      keyType: enums.publicKey.eddsaLegacy,
       hash: enums.hash.sha512,
       payloadSize: 32
     },
@@ -11831,7 +13143,7 @@ var openpgp = (function (exports) {
     }
   };
 
-  class Curve {
+  class CurveWithOID {
     constructor(oidOrName, params) {
       try {
         if (util.isArray(oidOrName) ||
@@ -11846,7 +13158,7 @@ var openpgp = (function (exports) {
         // by curve name or oid string
         this.name = enums.write(enums.curve, oidOrName);
       } catch (err) {
-        throw new Error('Not valid curve');
+        throw new UnsupportedError('Unknown curve');
       }
       params = params || curves[this.name];
 
@@ -11877,7 +13189,7 @@ var openpgp = (function (exports) {
             break;
           }
         case 'curve25519': {
-          const privateKey = await getRandomBytes(32);
+          const privateKey = getRandomBytes(32);
           privateKey[0] = (privateKey[0] & 127) | 64;
           privateKey[31] &= 248;
           const secretKey = privateKey.slice().reverse();
@@ -11886,7 +13198,7 @@ var openpgp = (function (exports) {
           return { publicKey, privateKey };
         }
         case 'ed25519': {
-          const privateKey = await getRandomBytes(32);
+          const privateKey = getRandomBytes(32);
           const keyPair = naclFastLight.sign.keyPair.fromSeed(privateKey);
           const publicKey = util.concatUint8Array([new Uint8Array([0x40]), keyPair.publicKey]);
           return { publicKey, privateKey };
@@ -11894,16 +13206,16 @@ var openpgp = (function (exports) {
       }
       const indutnyCurve = await getIndutnyCurve(this.name);
       keyPair = await indutnyCurve.genKeyPair({
-        entropy: util.uint8ArrayToString(await getRandomBytes(32))
+        entropy: util.uint8ArrayToString(getRandomBytes(32))
       });
       return { publicKey: new Uint8Array(keyPair.getPublic('array', false)), privateKey: keyPair.getPrivate().toArrayLike(Uint8Array) };
     }
   }
 
-  async function generate$1(curve) {
+  async function generate$3(curve) {
     const BigInteger = await util.getBigInteger();
 
-    curve = new Curve(curve);
+    curve = new CurveWithOID(curve);
     const keyPair = await curve.genKeyPair();
     const Q = new BigInteger(keyPair.publicKey).toUint8Array();
     const secret = new BigInteger(keyPair.privateKey).toUint8Array('be', curve.payloadSize);
@@ -11921,7 +13233,7 @@ var openpgp = (function (exports) {
    * @param {module:type/oid} oid - curve oid
    * @returns {enums.hash} hash algorithm
    */
-  function getPreferredHashAlgo$1(oid) {
+  function getPreferredHashAlgo$2(oid) {
     return curves[enums.write(enums.curve, oid.toHex())].hash;
   }
 
@@ -11996,10 +13308,10 @@ var openpgp = (function (exports) {
 
   async function webGenKeyPair(name) {
     // Note: keys generated with ECDSA and ECDH are structurally equivalent
-    const webCryptoKey = await webCrypto$6.generateKey({ name: 'ECDSA', namedCurve: webCurves[name] }, true, ['sign', 'verify']);
+    const webCryptoKey = await webCrypto$3.generateKey({ name: 'ECDSA', namedCurve: webCurves[name] }, true, ['sign', 'verify']);
 
-    const privateKey = await webCrypto$6.exportKey('jwk', webCryptoKey.privateKey);
-    const publicKey = await webCrypto$6.exportKey('jwk', webCryptoKey.publicKey);
+    const privateKey = await webCrypto$3.exportKey('jwk', webCryptoKey.privateKey);
+    const publicKey = await webCrypto$3.exportKey('jwk', webCryptoKey.publicKey);
 
     return {
       publicKey: jwkToRawPublic(publicKey),
@@ -12066,7 +13378,7 @@ var openpgp = (function (exports) {
 
   // OpenPGP.js - An OpenPGP implementation in javascript
 
-  const webCrypto$5 = util.getWebCrypto();
+  const webCrypto$2 = util.getWebCrypto();
 
   /**
    * Sign a message using the provided key
@@ -12082,8 +13394,8 @@ var openpgp = (function (exports) {
    * }>} Signature of the message
    * @async
    */
-  async function sign$4(oid, hashAlgo, message, publicKey, privateKey, hashed) {
-    const curve = new Curve(oid);
+  async function sign$5(oid, hashAlgo, message, publicKey, privateKey, hashed) {
+    const curve = new CurveWithOID(oid);
     if (message && !util.isStream(message)) {
       const keyPair = { publicKey, privateKey };
       switch (curve.type) {
@@ -12120,8 +13432,8 @@ var openpgp = (function (exports) {
    * @returns {Boolean}
    * @async
    */
-  async function verify$4(oid, hashAlgo, signature, message, publicKey, hashed) {
-    const curve = new Curve(oid);
+  async function verify$5(oid, hashAlgo, signature, message, publicKey, hashed) {
+    const curve = new CurveWithOID(oid);
     if (message && !util.isStream(message)) {
       switch (curve.type) {
         case 'web':
@@ -12152,8 +13464,8 @@ var openpgp = (function (exports) {
    * @returns {Promise<Boolean>} Whether params are valid.
    * @async
    */
-  async function validateParams$4(oid, Q, d) {
-    const curve = new Curve(oid);
+  async function validateParams$6(oid, Q, d) {
+    const curve = new CurveWithOID(oid);
     // Reject curves x25519 and ed25519
     if (curve.keyType !== enums.publicKey.ecdsa) {
       return false;
@@ -12167,8 +13479,8 @@ var openpgp = (function (exports) {
         const hashAlgo = enums.hash.sha256;
         const hashed = await hash.digest(hashAlgo, message);
         try {
-          const signature = await sign$4(oid, hashAlgo, message, Q, d, hashed);
-          return await verify$4(oid, hashAlgo, signature, message, Q, hashed);
+          const signature = await sign$5(oid, hashAlgo, message, Q, d, hashed);
+          return await verify$5(oid, hashAlgo, signature, message, Q, hashed);
         } catch (err) {
           return false;
         }
@@ -12204,7 +13516,7 @@ var openpgp = (function (exports) {
   async function webSign(curve, hashAlgo, message, keyPair) {
     const len = curve.payloadSize;
     const jwk = privateToJWK(curve.payloadSize, webCurves[curve.name], keyPair.publicKey, keyPair.privateKey);
-    const key = await webCrypto$5.importKey(
+    const key = await webCrypto$2.importKey(
       'jwk',
       jwk,
       {
@@ -12216,7 +13528,7 @@ var openpgp = (function (exports) {
       ['sign']
     );
 
-    const signature = new Uint8Array(await webCrypto$5.sign(
+    const signature = new Uint8Array(await webCrypto$2.sign(
       {
         'name': 'ECDSA',
         'namedCurve': webCurves[curve.name],
@@ -12234,7 +13546,7 @@ var openpgp = (function (exports) {
 
   async function webVerify(curve, hashAlgo, { r, s }, message, publicKey) {
     const jwk = rawPublicToJWK(curve.payloadSize, webCurves[curve.name], publicKey);
-    const key = await webCrypto$5.importKey(
+    const key = await webCrypto$2.importKey(
       'jwk',
       jwk,
       {
@@ -12248,7 +13560,7 @@ var openpgp = (function (exports) {
 
     const signature = util.concatUint8Array([r, s]).buffer;
 
-    return webCrypto$5.verify(
+    return webCrypto$2.verify(
       {
         'name': 'ECDSA',
         'namedCurve': webCurves[curve.name],
@@ -12265,9 +13577,9 @@ var openpgp = (function (exports) {
 
   var ecdsa = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    sign: sign$4,
-    verify: verify$4,
-    validateParams: validateParams$4
+    sign: sign$5,
+    verify: verify$5,
+    validateParams: validateParams$6
   });
 
   // OpenPGP.js - An OpenPGP implementation in javascript
@@ -12275,7 +13587,7 @@ var openpgp = (function (exports) {
   naclFastLight.hash = bytes => new Uint8Array(_512().update(bytes).digest());
 
   /**
-   * Sign a message using the provided key
+   * Sign a message using the provided legacy EdDSA key
    * @param {module:type/oid} oid - Elliptic curve object identifier
    * @param {module:enums.hash} hashAlgo - Hash algorithm used to sign (must be sha256 or stronger)
    * @param {Uint8Array} message - Message to sign
@@ -12288,10 +13600,10 @@ var openpgp = (function (exports) {
    * }>} Signature of the message
    * @async
    */
-  async function sign$3(oid, hashAlgo, message, publicKey, privateKey, hashed) {
+  async function sign$4(oid, hashAlgo, message, publicKey, privateKey, hashed) {
     if (hash.getHashByteLength(hashAlgo) < hash.getHashByteLength(enums.hash.sha256)) {
       // see https://tools.ietf.org/id/draft-ietf-openpgp-rfc4880bis-10.html#section-15-7.2
-      throw new Error('Hash algorithm too weak: sha256 or stronger is required for EdDSA.');
+      throw Error('Hash algorithm too weak for EdDSA.');
     }
     const secretKey = util.concatUint8Array([privateKey, publicKey.subarray(1)]);
     const signature = naclFastLight.sign.detached(hashed, secretKey);
@@ -12303,7 +13615,7 @@ var openpgp = (function (exports) {
   }
 
   /**
-   * Verifies if a signature is valid for a message
+   * Verifies if a legacy EdDSA signature is valid for a message
    * @param {module:type/oid} oid - Elliptic curve object identifier
    * @param {module:enums.hash} hashAlgo - Hash algorithm used in the signature
    * @param  {{r: Uint8Array,
@@ -12314,19 +13626,22 @@ var openpgp = (function (exports) {
    * @returns {Boolean}
    * @async
    */
-  async function verify$3(oid, hashAlgo, { r, s }, m, publicKey, hashed) {
+  async function verify$4(oid, hashAlgo, { r, s }, m, publicKey, hashed) {
+    if (hash.getHashByteLength(hashAlgo) < hash.getHashByteLength(enums.hash.sha256)) {
+      throw Error('Hash algorithm too weak for EdDSA.');
+    }
     const signature = util.concatUint8Array([r, s]);
     return naclFastLight.sign.detached.verify(hashed, signature, publicKey.subarray(1));
   }
   /**
-   * Validate EdDSA parameters
+   * Validate legacy EdDSA parameters
    * @param {module:type/oid} oid - Elliptic curve object identifier
    * @param {Uint8Array} Q - EdDSA public point
    * @param {Uint8Array} k - EdDSA secret seed
    * @returns {Promise<Boolean>} Whether params are valid.
    * @async
    */
-  async function validateParams$3(oid, Q, k) {
+  async function validateParams$5(oid, Q, k) {
     // Check whether the given curve is supported
     if (oid.getName() !== 'ed25519') {
       return false;
@@ -12339,13 +13654,133 @@ var openpgp = (function (exports) {
     const { publicKey } = naclFastLight.sign.keyPair.fromSeed(k);
     const dG = new Uint8Array([0x40, ...publicKey]); // Add public key prefix
     return util.equalsUint8Array(Q, dG);
+
+  }
+
+  var eddsa_legacy = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    sign: sign$4,
+    verify: verify$4,
+    validateParams: validateParams$5
+  });
+
+  // OpenPGP.js - An OpenPGP implementation in javascript
+
+  naclFastLight.hash = bytes => new Uint8Array(_512().update(bytes).digest());
+
+  /**
+   * Generate (non-legacy) EdDSA key
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @returns {Promise<{ A: Uint8Array, seed: Uint8Array }>}
+   */
+  async function generate$2(algo) {
+    switch (algo) {
+      case enums.publicKey.ed25519: {
+        const seed = getRandomBytes(32);
+        const { publicKey: A } = naclFastLight.sign.keyPair.fromSeed(seed);
+        return { A, seed };
+      }
+      default:
+        throw Error('Unsupported EdDSA algorithm');
+    }
+  }
+
+  /**
+   * Sign a message using the provided key
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @param {module:enums.hash} hashAlgo - Hash algorithm used to sign (must be sha256 or stronger)
+   * @param {Uint8Array} message - Message to sign
+   * @param {Uint8Array} publicKey - Public key
+   * @param {Uint8Array} privateKey - Private key used to sign the message
+   * @param {Uint8Array} hashed - The hashed message
+   * @returns {Promise<{
+   *   RS: Uint8Array
+   * }>} Signature of the message
+   * @async
+   */
+  async function sign$3(algo, hashAlgo, message, publicKey, privateKey, hashed) {
+    if (hash.getHashByteLength(hashAlgo) < hash.getHashByteLength(getPreferredHashAlgo$1(algo))) {
+      throw Error('Hash algorithm too weak for EdDSA.');
+    }
+    switch (algo) {
+      case enums.publicKey.ed25519: {
+        const secretKey = util.concatUint8Array([privateKey, publicKey]);
+        const signature = naclFastLight.sign.detached(hashed, secretKey);
+        return { RS: signature };
+      }
+      case enums.publicKey.ed448:
+      default:
+        throw Error('Unsupported EdDSA algorithm');
+    }
+
+  }
+
+  /**
+   * Verifies if a signature is valid for a message
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @param {module:enums.hash} hashAlgo - Hash algorithm used in the signature
+   * @param  {{ RS: Uint8Array }} signature Signature to verify the message
+   * @param {Uint8Array} m - Message to verify
+   * @param {Uint8Array} publicKey - Public key used to verify the message
+   * @param {Uint8Array} hashed - The hashed message
+   * @returns {Boolean}
+   * @async
+   */
+  async function verify$3(algo, hashAlgo, { RS }, m, publicKey, hashed) {
+    if (hash.getHashByteLength(hashAlgo) < hash.getHashByteLength(getPreferredHashAlgo$1(algo))) {
+      throw Error('Hash algorithm too weak for EdDSA.');
+    }
+    switch (algo) {
+      case enums.publicKey.ed25519: {
+        return naclFastLight.sign.detached.verify(hashed, RS, publicKey);
+      }
+      case enums.publicKey.ed448:
+      default:
+        throw Error('Unsupported EdDSA algorithm');
+    }
+  }
+  /**
+   * Validate (non-legacy) EdDSA parameters
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @param {Uint8Array} A - EdDSA public point
+   * @param {Uint8Array} seed - EdDSA secret seed
+   * @param {Uint8Array} oid - (legacy only) EdDSA OID
+   * @returns {Promise<Boolean>} Whether params are valid.
+   * @async
+   */
+  async function validateParams$4(algo, A, seed) {
+    switch (algo) {
+      case enums.publicKey.ed25519: {
+        /**
+         * Derive public point A' from private key
+         * and expect A == A'
+         */
+        const { publicKey } = naclFastLight.sign.keyPair.fromSeed(seed);
+        return util.equalsUint8Array(A, publicKey);
+      }
+
+      case enums.publicKey.ed448: // unsupported
+      default:
+        return false;
+    }
+  }
+
+  function getPreferredHashAlgo$1(algo) {
+    switch (algo) {
+      case enums.publicKey.ed25519:
+        return enums.hash.sha256;
+      default:
+        throw Error('Unknown EdDSA algo');
+    }
   }
 
   var eddsa$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
+    generate: generate$2,
     sign: sign$3,
     verify: verify$3,
-    validateParams: validateParams$3
+    validateParams: validateParams$4,
+    getPreferredHashAlgo: getPreferredHashAlgo$1
   });
 
   // OpenPGP.js - An OpenPGP implementation in javascript
@@ -12427,7 +13862,7 @@ var openpgp = (function (exports) {
     if (A[0] === IV[0] && A[1] === IV[1]) {
       return pack(R);
     }
-    throw new Error('Key Data Integrity failed');
+    throw Error('Key Data Integrity failed');
   }
 
   function createArrayBuffer(data) {
@@ -12515,7 +13950,7 @@ var openpgp = (function (exports) {
         }
       }
     }
-    throw new Error('Invalid padding');
+    throw Error('Invalid padding');
   }
 
   var pkcs5 = /*#__PURE__*/Object.freeze({
@@ -12526,7 +13961,7 @@ var openpgp = (function (exports) {
 
   // OpenPGP.js - An OpenPGP implementation in javascript
 
-  const webCrypto$4 = util.getWebCrypto();
+  const webCrypto$1 = util.getWebCrypto();
 
   /**
    * Validate ECDH parameters
@@ -12536,7 +13971,7 @@ var openpgp = (function (exports) {
    * @returns {Promise<Boolean>} Whether params are valid.
    * @async
    */
-  async function validateParams$2(oid, Q, d) {
+  async function validateParams$3(oid, Q, d) {
     return validateStandardParams(enums.publicKey.ecdh, oid, Q, d);
   }
 
@@ -12578,7 +14013,7 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE ephemeral key and secret from public key
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} Q - Recipient public key
    * @returns {Promise<{publicKey: Uint8Array, sharedKey: Uint8Array}>}
    * @async
@@ -12586,7 +14021,7 @@ var openpgp = (function (exports) {
   async function genPublicEphemeralKey(curve, Q) {
     switch (curve.type) {
       case 'curve25519': {
-        const d = await getRandomBytes(32);
+        const d = getRandomBytes(32);
         const { secretKey, sharedKey } = await genPrivateEphemeralKey(curve, Q, null, d);
         let { publicKey } = naclFastLight.box.keyPair.fromSecretKey(secretKey);
         publicKey = util.concatUint8Array([new Uint8Array([0x40]), publicKey]);
@@ -12619,7 +14054,7 @@ var openpgp = (function (exports) {
   async function encrypt$2(oid, kdfParams, data, Q, fingerprint) {
     const m = encode(data);
 
-    const curve = new Curve(oid);
+    const curve = new CurveWithOID(oid);
     const { publicKey, sharedKey } = await genPublicEphemeralKey(curve, Q);
     const param = buildEcdhParam(enums.publicKey.ecdh, oid, kdfParams, fingerprint);
     const { keySize } = getCipher(kdfParams.cipher);
@@ -12631,7 +14066,7 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE secret from private key and public part of ephemeral key
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} V - Public part of ephemeral key
    * @param {Uint8Array} Q - Recipient public key
    * @param {Uint8Array} d - Recipient private key
@@ -12677,7 +14112,7 @@ var openpgp = (function (exports) {
    * @async
    */
   async function decrypt$2(oid, kdfParams, V, C, Q, d, fingerprint) {
-    const curve = new Curve(oid);
+    const curve = new CurveWithOID(oid);
     const { sharedKey } = await genPrivateEphemeralKey(curve, V, Q, d);
     const param = buildEcdhParam(enums.publicKey.ecdh, oid, kdfParams, fingerprint);
     const { keySize } = getCipher(kdfParams.cipher);
@@ -12697,7 +14132,7 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE secret from private key and public part of ephemeral key using webCrypto
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} V - Public part of ephemeral key
    * @param {Uint8Array} Q - Recipient public key
    * @param {Uint8Array} d - Recipient private key
@@ -12706,7 +14141,7 @@ var openpgp = (function (exports) {
    */
   async function webPrivateEphemeralKey(curve, V, Q, d) {
     const recipient = privateToJWK(curve.payloadSize, curve.web.web, Q, d);
-    let privateKey = webCrypto$4.importKey(
+    let privateKey = webCrypto$1.importKey(
       'jwk',
       recipient,
       {
@@ -12717,7 +14152,7 @@ var openpgp = (function (exports) {
       ['deriveKey', 'deriveBits']
     );
     const jwk = rawPublicToJWK(curve.payloadSize, curve.web.web, V);
-    let sender = webCrypto$4.importKey(
+    let sender = webCrypto$1.importKey(
       'jwk',
       jwk,
       {
@@ -12728,7 +14163,7 @@ var openpgp = (function (exports) {
       []
     );
     [privateKey, sender] = await Promise.all([privateKey, sender]);
-    let S = webCrypto$4.deriveBits(
+    let S = webCrypto$1.deriveBits(
       {
         name: 'ECDH',
         namedCurve: curve.web.web,
@@ -12737,7 +14172,7 @@ var openpgp = (function (exports) {
       privateKey,
       curve.web.sharedSize
     );
-    let secret = webCrypto$4.exportKey(
+    let secret = webCrypto$1.exportKey(
       'jwk',
       privateKey
     );
@@ -12750,14 +14185,14 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE ephemeral key and secret from public key using webCrypto
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} Q - Recipient public key
    * @returns {Promise<{publicKey: Uint8Array, sharedKey: Uint8Array}>}
    * @async
    */
   async function webPublicEphemeralKey(curve, Q) {
     const jwk = rawPublicToJWK(curve.payloadSize, curve.web.web, Q);
-    let keyPair = webCrypto$4.generateKey(
+    let keyPair = webCrypto$1.generateKey(
       {
         name: 'ECDH',
         namedCurve: curve.web.web
@@ -12765,7 +14200,7 @@ var openpgp = (function (exports) {
       true,
       ['deriveKey', 'deriveBits']
     );
-    let recipient = webCrypto$4.importKey(
+    let recipient = webCrypto$1.importKey(
       'jwk',
       jwk,
       {
@@ -12776,7 +14211,7 @@ var openpgp = (function (exports) {
       []
     );
     [keyPair, recipient] = await Promise.all([keyPair, recipient]);
-    let s = webCrypto$4.deriveBits(
+    let s = webCrypto$1.deriveBits(
       {
         name: 'ECDH',
         namedCurve: curve.web.web,
@@ -12785,7 +14220,7 @@ var openpgp = (function (exports) {
       keyPair.privateKey,
       curve.web.sharedSize
     );
-    let p = webCrypto$4.exportKey(
+    let p = webCrypto$1.exportKey(
       'jwk',
       keyPair.publicKey
     );
@@ -12798,7 +14233,7 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE secret from private key and public part of ephemeral key using indutny/elliptic
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} V - Public part of ephemeral key
    * @param {Uint8Array} d - Recipient private key
    * @returns {Promise<{secretKey: Uint8Array, sharedKey: Uint8Array}>}
@@ -12818,7 +14253,7 @@ var openpgp = (function (exports) {
   /**
    * Generate ECDHE ephemeral key and secret from public key using indutny/elliptic
    *
-   * @param {Curve} curve - Elliptic curve object
+   * @param {CurveWithOID} curve - Elliptic curve object
    * @param {Uint8Array} Q - Recipient public key
    * @returns {Promise<{publicKey: Uint8Array, sharedKey: Uint8Array}>}
    * @async
@@ -12837,21 +14272,168 @@ var openpgp = (function (exports) {
 
   var ecdh = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    validateParams: validateParams$2,
+    validateParams: validateParams$3,
     encrypt: encrypt$2,
     decrypt: decrypt$2
   });
 
+  /**
+   * @fileoverview This module implements HKDF using either the WebCrypto API or Node.js' crypto API.
+   * @module crypto/hkdf
+   * @private
+   */
+
+  const webCrypto = util.getWebCrypto();
+
+  async function HKDF(hashAlgo, inputKey, salt, info, outLen) {
+    const hash = enums.read(enums.webHash, hashAlgo);
+    if (!hash) throw Error('Hash algo not supported with HKDF');
+
+    if (webCrypto) {
+      const crypto = webCrypto;
+      const importedKey = await crypto.importKey('raw', inputKey, 'HKDF', false, ['deriveBits']);
+      const bits = await crypto.deriveBits({ name: 'HKDF', hash, salt, info }, importedKey, outLen * 8);
+      return new Uint8Array(bits);
+    }
+
+    throw Error('No HKDF implementation available');
+  }
+
+  /**
+   * @fileoverview Key encryption and decryption for RFC 6637 ECDH
+   * @module crypto/public_key/elliptic/ecdh
+   * @private
+   */
+
+  const HKDF_INFO = {
+    x25519: util.encodeUTF8('OpenPGP X25519')
+  };
+
+  /**
+   * Generate ECDH key for Montgomery curves
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @returns {Promise<{ A: Uint8Array, k: Uint8Array }>}
+   */
+  async function generate$1(algo) {
+    switch (algo) {
+      case enums.publicKey.x25519: {
+        // k stays in little-endian, unlike legacy ECDH over curve25519
+        const k = getRandomBytes(32);
+        const { publicKey: A } = naclFastLight.box.keyPair.fromSecretKey(k);
+        return { A, k };
+      }
+      default:
+        throw Error('Unsupported ECDH algorithm');
+    }
+  }
+
+  /**
+  * Validate ECDH parameters
+  * @param {module:enums.publicKey} algo - Algorithm identifier
+  * @param {Uint8Array} A - ECDH public point
+  * @param {Uint8Array} k - ECDH secret scalar
+  * @returns {Promise<Boolean>} Whether params are valid.
+  * @async
+  */
+  async function validateParams$2(algo, A, k) {
+    switch (algo) {
+      case enums.publicKey.x25519: {
+        /**
+         * Derive public point A' from private key
+         * and expect A == A'
+         */
+        const { publicKey } = naclFastLight.box.keyPair.fromSecretKey(k);
+        return util.equalsUint8Array(A, publicKey);
+      }
+
+      default:
+        return false;
+    }
+  }
+
+  /**
+   * Wrap and encrypt a session key
+   *
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @param {Uint8Array} data - session key data to be encrypted
+   * @param {Uint8Array} recipientA - Recipient public key (K_B)
+   * @returns {Promise<{
+   *  ephemeralPublicKey: Uint8Array,
+   * wrappedKey: Uint8Array
+   * }>} ephemeral public key (K_A) and encrypted key
+   * @async
+   */
+  async function encrypt$1(algo, data, recipientA) {
+    switch (algo) {
+      case enums.publicKey.x25519: {
+        const ephemeralSecretKey = getRandomBytes(32);
+        const sharedSecret = naclFastLight.scalarMult(ephemeralSecretKey, recipientA);
+        const { publicKey: ephemeralPublicKey } = naclFastLight.box.keyPair.fromSecretKey(ephemeralSecretKey);
+        const hkdfInput = util.concatUint8Array([
+          ephemeralPublicKey,
+          recipientA,
+          sharedSecret
+        ]);
+        const { keySize } = getCipher(enums.symmetric.aes128);
+        const encryptionKey = await HKDF(enums.hash.sha256, hkdfInput, new Uint8Array(), HKDF_INFO.x25519, keySize);
+        const wrappedKey = wrap(encryptionKey, data);
+        return { ephemeralPublicKey, wrappedKey };
+      }
+
+      default:
+        throw Error('Unsupported ECDH algorithm');
+    }
+  }
+
+  /**
+   * Decrypt and unwrap the session key
+   *
+   * @param {module:enums.publicKey} algo - Algorithm identifier
+   * @param {Uint8Array} ephemeralPublicKey - (K_A)
+   * @param {Uint8Array} wrappedKey,
+   * @param {Uint8Array} A - Recipient public key (K_b), needed for KDF
+   * @param {Uint8Array} k - Recipient secret key (b)
+   * @returns {Promise<Uint8Array>} decrypted session key data
+   * @async
+   */
+  async function decrypt$1(algo, ephemeralPublicKey, wrappedKey, A, k) {
+    switch (algo) {
+      case enums.publicKey.x25519: {
+        const sharedSecret = naclFastLight.scalarMult(k, ephemeralPublicKey);
+        const hkdfInput = util.concatUint8Array([
+          ephemeralPublicKey,
+          A,
+          sharedSecret
+        ]);
+        const { keySize } = getCipher(enums.symmetric.aes128);
+        const encryptionKey = await HKDF(enums.hash.sha256, hkdfInput, new Uint8Array(), HKDF_INFO.x25519, keySize);
+        return unwrap(encryptionKey, wrappedKey);
+      }
+      default:
+        throw Error('Unsupported ECDH algorithm');
+    }
+  }
+
+  var ecdh_x = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    generate: generate$1,
+    validateParams: validateParams$2,
+    encrypt: encrypt$1,
+    decrypt: decrypt$1
+  });
+
   // OpenPGP.js - An OpenPGP implementation in javascript
 
   var elliptic$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
-    Curve: Curve,
+    CurveWithOID: CurveWithOID,
     ecdh: ecdh,
+    ecdhX: ecdh_x,
     ecdsa: ecdsa,
+    eddsaLegacy: eddsa_legacy,
     eddsa: eddsa$1,
-    generate: generate$1,
-    getPreferredHashAlgo: getPreferredHashAlgo$1
+    generate: generate$3,
+    getPreferredHashAlgo: getPreferredHashAlgo$2
   });
 
   // GPG4Browsers - An OpenPGP implementation in javascript
@@ -13054,39 +14636,211 @@ var openpgp = (function (exports) {
     nacl: naclFastLight
   };
 
+  /**
+   * @fileoverview Provides functions for asymmetric signing and signature verification
+   * @module crypto/signature
+   * @private
+   */
+
+  /**
+   * Parse signature in binary form to get the parameters.
+   * The returned values are only padded for EdDSA, since in the other cases their expected length
+   * depends on the key params, hence we delegate the padding to the signature verification function.
+   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+   * See {@link https://tools.ietf.org/html/rfc4880#section-5.2.2|RFC 4880 5.2.2.}
+   * @param {module:enums.publicKey} algo - Public key algorithm
+   * @param {Uint8Array} signature - Data for which the signature was created
+   * @returns {Promise<Object>} True if signature is valid.
+   * @async
+   */
+  function parseSignatureParams(algo, signature) {
+    let read = 0;
+    switch (algo) {
+      // Algorithm-Specific Fields for RSA signatures:
+      // -  MPI of RSA signature value m**d mod n.
+      case enums.publicKey.rsaEncryptSign:
+      case enums.publicKey.rsaEncrypt:
+      case enums.publicKey.rsaSign: {
+        const s = util.readMPI(signature.subarray(read));
+        // The signature needs to be the same length as the public key modulo n.
+        // We pad s on signature verification, where we have access to n.
+        return { s };
+      }
+      // Algorithm-Specific Fields for DSA or ECDSA signatures:
+      // -  MPI of DSA or ECDSA value r.
+      // -  MPI of DSA or ECDSA value s.
+      case enums.publicKey.dsa:
+      case enums.publicKey.ecdsa:
+      {
+        const r = util.readMPI(signature.subarray(read)); read += r.length + 2;
+        const s = util.readMPI(signature.subarray(read));
+        return { r, s };
+      }
+      // Algorithm-Specific Fields for legacy EdDSA signatures:
+      // -  MPI of an EC point r.
+      // -  EdDSA value s, in MPI, in the little endian representation
+      case enums.publicKey.eddsaLegacy: {
+        // When parsing little-endian MPI data, we always need to left-pad it, as done with big-endian values:
+        // https://www.ietf.org/archive/id/draft-ietf-openpgp-rfc4880bis-10.html#section-3.2-9
+        let r = util.readMPI(signature.subarray(read)); read += r.length + 2;
+        r = util.leftPad(r, 32);
+        let s = util.readMPI(signature.subarray(read));
+        s = util.leftPad(s, 32);
+        return { r, s };
+      }
+      // Algorithm-Specific Fields for Ed25519 signatures:
+      // - 64 octets of the native signature
+      case enums.publicKey.ed25519: {
+        const RS = signature.subarray(read, read + 64); read += RS.length;
+        return { RS };
+      }
+      default:
+        throw new UnsupportedError('Unknown signature algorithm.');
+    }
+  }
+
+  /**
+   * Verifies the signature provided for data using specified algorithms and public key parameters.
+   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+   * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+   * for public key and hash algorithms.
+   * @param {module:enums.publicKey} algo - Public key algorithm
+   * @param {module:enums.hash} hashAlgo - Hash algorithm
+   * @param {Object} signature - Named algorithm-specific signature parameters
+   * @param {Object} publicParams - Algorithm-specific public key parameters
+   * @param {Uint8Array} data - Data for which the signature was created
+   * @param {Uint8Array} hashed - The hashed data
+   * @returns {Promise<Boolean>} True if signature is valid.
+   * @async
+   */
+  async function verify$1(algo, hashAlgo, signature, publicParams, data, hashed) {
+    switch (algo) {
+      case enums.publicKey.rsaEncryptSign:
+      case enums.publicKey.rsaEncrypt:
+      case enums.publicKey.rsaSign: {
+        const { n, e } = publicParams;
+        const s = util.leftPad(signature.s, n.length); // padding needed for webcrypto and node crypto
+        return publicKey.rsa.verify(hashAlgo, data, s, n, e, hashed);
+      }
+      case enums.publicKey.dsa: {
+        const { g, p, q, y } = publicParams;
+        const { r, s } = signature; // no need to pad, since we always handle them as BigIntegers
+        return publicKey.dsa.verify(hashAlgo, r, s, hashed, g, p, q, y);
+      }
+      case enums.publicKey.ecdsa: {
+        const { oid, Q } = publicParams;
+        const curveSize = new publicKey.elliptic.CurveWithOID(oid).payloadSize;
+        // padding needed for webcrypto
+        const r = util.leftPad(signature.r, curveSize);
+        const s = util.leftPad(signature.s, curveSize);
+        return publicKey.elliptic.ecdsa.verify(oid, hashAlgo, { r, s }, data, Q, hashed);
+      }
+      case enums.publicKey.eddsaLegacy: {
+        const { oid, Q } = publicParams;
+        // signature already padded on parsing
+        return publicKey.elliptic.eddsaLegacy.verify(oid, hashAlgo, signature, data, Q, hashed);
+      }
+      case enums.publicKey.ed25519: {
+        const { A } = publicParams;
+        return publicKey.elliptic.eddsa.verify(algo, hashAlgo, signature, data, A, hashed);
+      }
+      default:
+        throw Error('Unknown signature algorithm.');
+    }
+  }
+
+  /**
+   * Creates a signature on data using specified algorithms and private key parameters.
+   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
+   * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
+   * for public key and hash algorithms.
+   * @param {module:enums.publicKey} algo - Public key algorithm
+   * @param {module:enums.hash} hashAlgo - Hash algorithm
+   * @param {Object} publicKeyParams - Algorithm-specific public and private key parameters
+   * @param {Object} privateKeyParams - Algorithm-specific public and private key parameters
+   * @param {Uint8Array} data - Data to be signed
+   * @param {Uint8Array} hashed - The hashed data
+   * @returns {Promise<Object>} Signature                      Object containing named signature parameters.
+   * @async
+   */
+  async function sign$1(algo, hashAlgo, publicKeyParams, privateKeyParams, data, hashed) {
+    if (!publicKeyParams || !privateKeyParams) {
+      throw Error('Missing key parameters');
+    }
+    switch (algo) {
+      case enums.publicKey.rsaEncryptSign:
+      case enums.publicKey.rsaEncrypt:
+      case enums.publicKey.rsaSign: {
+        const { n, e } = publicKeyParams;
+        const { d, p, q, u } = privateKeyParams;
+        const s = await publicKey.rsa.sign(hashAlgo, data, n, e, d, p, q, u, hashed);
+        return { s };
+      }
+      case enums.publicKey.dsa: {
+        const { g, p, q } = publicKeyParams;
+        const { x } = privateKeyParams;
+        return publicKey.dsa.sign(hashAlgo, hashed, g, p, q, x);
+      }
+      case enums.publicKey.elgamal: {
+        throw Error('Signing with Elgamal is not defined in the OpenPGP standard.');
+      }
+      case enums.publicKey.ecdsa: {
+        const { oid, Q } = publicKeyParams;
+        const { d } = privateKeyParams;
+        return publicKey.elliptic.ecdsa.sign(oid, hashAlgo, data, Q, d, hashed);
+      }
+      case enums.publicKey.eddsaLegacy: {
+        const { oid, Q } = publicKeyParams;
+        const { seed } = privateKeyParams;
+        return publicKey.elliptic.eddsaLegacy.sign(oid, hashAlgo, data, Q, seed, hashed);
+      }
+      case enums.publicKey.ed25519: {
+        const { A } = publicKeyParams;
+        const { seed } = privateKeyParams;
+        return publicKey.elliptic.eddsa.sign(algo, hashAlgo, data, A, seed, hashed);
+      }
+      default:
+        throw Error('Unknown signature algorithm.');
+    }
+  }
+
+  var signature$2 = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    parseSignatureParams: parseSignatureParams,
+    verify: verify$1,
+    sign: sign$1
+  });
+
   // OpenPGP.js - An OpenPGP implementation in javascript
 
   class ECDHSymmetricKey {
     constructor(data) {
-      if (typeof data === 'undefined') {
-        data = new Uint8Array([]);
-      } else if (util.isString(data)) {
-        data = util.stringToUint8Array(data);
-      } else {
-        data = new Uint8Array(data);
+      if (data) {
+        this.data = data;
       }
-      this.data = data;
     }
 
     /**
-     * Read an ECDHSymmetricKey from an Uint8Array
-     * @param {Uint8Array} input - Where to read the encoded symmetric key from
+     * Read an ECDHSymmetricKey from an Uint8Array:
+     * - 1 octect for the length `l`
+     * - `l` octects of encoded session key data
+     * @param {Uint8Array} bytes
      * @returns {Number} Number of read bytes.
      */
-    read(input) {
-      if (input.length >= 1) {
-        const length = input[0];
-        if (input.length >= 1 + length) {
-          this.data = input.subarray(1, 1 + length);
+    read(bytes) {
+      if (bytes.length >= 1) {
+        const length = bytes[0];
+        if (bytes.length >= 1 + length) {
+          this.data = bytes.subarray(1, 1 + length);
           return 1 + this.data.length;
         }
       }
-      throw new Error('Invalid symmetric key');
+      throw Error('Invalid symmetric key');
     }
 
     /**
      * Write an ECDHSymmetricKey as an Uint8Array
-     * @returns  {Uint8Array}  An array containing the value
+     * @returns  {Uint8Array} Serialised data
      */
     write() {
       return util.concatUint8Array([new Uint8Array([this.data.length]), this.data]);
@@ -13094,21 +14848,6 @@ var openpgp = (function (exports) {
   }
 
   // OpenPGP.js - An OpenPGP implementation in javascript
-  // Copyright (C) 2015-2016 Decentral
-  //
-  // This library is free software; you can redistribute it and/or
-  // modify it under the terms of the GNU Lesser General Public
-  // License as published by the Free Software Foundation; either
-  // version 3.0 of the License, or (at your option) any later version.
-  //
-  // This library is distributed in the hope that it will be useful,
-  // but WITHOUT ANY WARRANTY; without even the implied warranty of
-  // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  // Lesser General Public License for more details.
-  //
-  // You should have received a copy of the GNU Lesser General Public
-  // License along with this library; if not, write to the Free Software
-  // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
   /**
    * Implementation of type KDF parameters
@@ -13145,7 +14884,7 @@ var openpgp = (function (exports) {
      */
     read(input) {
       if (input.length < 4 || input[0] !== 3 || input[1] !== 1) {
-        throw new Error('Cannot read KDFParams');
+        throw new UnsupportedError('Cannot read KDFParams');
       }
       this.hash = input[2];
       this.cipher = input[3];
@@ -13161,20 +14900,65 @@ var openpgp = (function (exports) {
     }
   }
 
+  /**
+   * Encoded symmetric key for x25519 and x448
+   * The payload format varies for v3 and v6 PKESK:
+   * the former includes an algorithm byte preceeding the encrypted session key.
+   *
+   * @module type/x25519x448_symkey
+   */
+
+  class ECDHXSymmetricKey {
+    static fromObject({ wrappedKey, algorithm }) {
+      const instance = new ECDHXSymmetricKey();
+      instance.wrappedKey = wrappedKey;
+      instance.algorithm = algorithm;
+      return instance;
+    }
+
+    /**
+     * - 1 octect for the length `l`
+     * - `l` octects of encoded session key data (with optional leading algorithm byte)
+     * @param {Uint8Array} bytes
+     * @returns {Number} Number of read bytes.
+     */
+    read(bytes) {
+      let read = 0;
+      let followLength = bytes[read++];
+      this.algorithm = followLength % 2 ? bytes[read++] : null; // session key size is always even
+      followLength -= followLength % 2;
+      this.wrappedKey = bytes.subarray(read, read + followLength); read += followLength;
+    }
+
+    /**
+     * Write an MontgomerySymmetricKey as an Uint8Array
+     * @returns  {Uint8Array} Serialised data
+     */
+    write() {
+      return util.concatUint8Array([
+        this.algorithm ?
+          new Uint8Array([this.wrappedKey.length + 1, this.algorithm]) :
+          new Uint8Array([this.wrappedKey.length]),
+        this.wrappedKey
+      ]);
+    }
+  }
+
   // GPG4Browsers - An OpenPGP implementation in javascript
 
   /**
    * Encrypts data using specified algorithm and public key parameters.
    * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1} for public key algorithms.
-   * @param {module:enums.publicKey} algo - Public key algorithm
+   * @param {module:enums.publicKey} keyAlgo - Public key algorithm
+   * @param {module:enums.symmetric} symmetricAlgo - Cipher algorithm
    * @param {Object} publicParams - Algorithm-specific public key parameters
-   * @param {Uint8Array} data - Data to be encrypted
+   * @param {Uint8Array} data - Session key data to be encrypted
    * @param {Uint8Array} fingerprint - Recipient fingerprint
    * @returns {Promise<Object>} Encrypted session key parameters.
    * @async
    */
-  async function publicKeyEncrypt(algo, publicParams, data, fingerprint) {
-    switch (algo) {
+  async function publicKeyEncrypt(keyAlgo, symmetricAlgo, publicParams, data, fingerprint) {
+    switch (keyAlgo) {
       case enums.publicKey.rsaEncrypt:
       case enums.publicKey.rsaEncryptSign: {
         const { n, e } = publicParams;
@@ -13191,6 +14975,17 @@ var openpgp = (function (exports) {
           oid, kdfParams, data, Q, fingerprint);
         return { V, C: new ECDHSymmetricKey(C) };
       }
+      case enums.publicKey.x25519: {
+        if (!util.isAES(symmetricAlgo)) {
+          // see https://gitlab.com/openpgp-wg/rfc4880bis/-/merge_requests/276
+          throw Error('X25519 keys can only encrypt AES session keys');
+        }
+        const { A } = publicParams;
+        const { ephemeralPublicKey, wrappedKey } = await publicKey.elliptic.ecdhX.encrypt(
+          keyAlgo, data, A);
+        const C = ECDHXSymmetricKey.fromObject({ algorithm: symmetricAlgo, wrappedKey });
+        return { ephemeralPublicKey, C };
+      }
       default:
         return [];
     }
@@ -13232,8 +15027,18 @@ var openpgp = (function (exports) {
         return publicKey.elliptic.ecdh.decrypt(
           oid, kdfParams, V, C.data, Q, d, fingerprint);
       }
+      case enums.publicKey.x25519: {
+        const { A } = publicKeyParams;
+        const { k } = privateKeyParams;
+        const { ephemeralPublicKey, C } = sessionKeyParams;
+        if (!util.isAES(C.algorithm)) {
+          throw Error('AES session key expected');
+        }
+        return publicKey.elliptic.ecdhX.decrypt(
+          algo, ephemeralPublicKey, C.wrappedKey, A, k);
+      }
       default:
-        throw new Error('Invalid public key encryption algorithm.');
+        throw Error('Unknown public key encryption algorithm.');
     }
   }
 
@@ -13268,23 +15073,31 @@ var openpgp = (function (exports) {
       }
       case enums.publicKey.ecdsa: {
         const oid = new OID(); read += oid.read(bytes);
+        checkSupportedCurve(oid);
         const Q = util.readMPI(bytes.subarray(read)); read += Q.length + 2;
         return { read: read, publicParams: { oid, Q } };
       }
-      case enums.publicKey.eddsa: {
+      case enums.publicKey.eddsaLegacy: {
         const oid = new OID(); read += oid.read(bytes);
+        checkSupportedCurve(oid);
         let Q = util.readMPI(bytes.subarray(read)); read += Q.length + 2;
         Q = util.leftPad(Q, 33);
         return { read: read, publicParams: { oid, Q } };
       }
       case enums.publicKey.ecdh: {
         const oid = new OID(); read += oid.read(bytes);
+        checkSupportedCurve(oid);
         const Q = util.readMPI(bytes.subarray(read)); read += Q.length + 2;
         const kdfParams = new KDFParams(); read += kdfParams.read(bytes.subarray(read));
         return { read: read, publicParams: { oid, Q, kdfParams } };
       }
+      case enums.publicKey.ed25519:
+      case enums.publicKey.x25519: {
+        const A = bytes.subarray(read, read + 32); read += A.length;
+        return { read, publicParams: { A } };
+      }
       default:
-        throw new Error('Invalid public key encryption algorithm.');
+        throw new UnsupportedError('Unknown public key encryption algorithm.');
     }
   }
 
@@ -13314,18 +15127,27 @@ var openpgp = (function (exports) {
       }
       case enums.publicKey.ecdsa:
       case enums.publicKey.ecdh: {
-        const curve = new Curve(publicParams.oid);
+        const curve = new CurveWithOID(publicParams.oid);
         let d = util.readMPI(bytes.subarray(read)); read += d.length + 2;
         d = util.leftPad(d, curve.payloadSize);
         return { read, privateParams: { d } };
       }
-      case enums.publicKey.eddsa: {
+      case enums.publicKey.eddsaLegacy: {
+        const curve = new CurveWithOID(publicParams.oid);
         let seed = util.readMPI(bytes.subarray(read)); read += seed.length + 2;
-        seed = util.leftPad(seed, 32);
+        seed = util.leftPad(seed, curve.payloadSize);
         return { read, privateParams: { seed } };
       }
+      case enums.publicKey.ed25519: {
+        const seed = bytes.subarray(read, read + 32); read += seed.length;
+        return { read, privateParams: { seed } };
+      }
+      case enums.publicKey.x25519: {
+        const k = bytes.subarray(read, read + 32); read += k.length;
+        return { read, privateParams: { k } };
+      }
       default:
-        throw new Error('Invalid public key encryption algorithm.');
+        throw new UnsupportedError('Unknown public key encryption algorithm.');
     }
   }
 
@@ -13361,8 +15183,18 @@ var openpgp = (function (exports) {
         const C = new ECDHSymmetricKey(); C.read(bytes.subarray(read));
         return { V, C };
       }
+      //   Algorithm-Specific Fields for X25519 encrypted session keys:
+      //       - 32 octets representing an ephemeral X25519 public key.
+      //       - A one-octet size of the following fields.
+      //       - The one-octet algorithm identifier, if it was passed (in the case of a v3 PKESK packet).
+      //       - The encrypted session key.
+      case enums.publicKey.x25519: {
+        const ephemeralPublicKey = bytes.subarray(read, read + 32); read += ephemeralPublicKey.length;
+        const C = new ECDHXSymmetricKey(); C.read(bytes.subarray(read));
+        return { ephemeralPublicKey, C };
+      }
       default:
-        throw new Error('Invalid public key encryption algorithm.');
+        throw new UnsupportedError('Unknown public key encryption algorithm.');
     }
   }
 
@@ -13373,9 +15205,12 @@ var openpgp = (function (exports) {
    * @returns {Uint8Array} The array containing the MPIs.
    */
   function serializeParams(algo, params) {
+    // Some algorithms do not rely on MPIs to store the binary params
+    const algosWithNativeRepresentation = new Set([enums.publicKey.ed25519, enums.publicKey.x25519]);
     const orderedParams = Object.keys(params).map(name => {
       const param = params[name];
-      return util.isUint8Array(param) ? util.uint8ArrayToMPI(param) : param.write();
+      if (!util.isUint8Array(param)) return param.write();
+      return algosWithNativeRepresentation.has(algo) ? param : util.uint8ArrayToMPI(param);
     });
     return util.concatUint8Array(orderedParams);
   }
@@ -13403,7 +15238,7 @@ var openpgp = (function (exports) {
           privateParams: { d: secret },
           publicParams: { oid: new OID(oid), Q }
         }));
-      case enums.publicKey.eddsa:
+      case enums.publicKey.eddsaLegacy:
         return publicKey.elliptic.generate(oid).then(({ oid, Q, secret }) => ({
           privateParams: { seed: secret },
           publicParams: { oid: new OID(oid), Q }
@@ -13417,11 +15252,21 @@ var openpgp = (function (exports) {
             kdfParams: new KDFParams({ hash, cipher })
           }
         }));
+      case enums.publicKey.ed25519:
+        return publicKey.elliptic.eddsa.generate(algo).then(({ A, seed }) => ({
+          privateParams: { seed },
+          publicParams: { A }
+        }));
+      case enums.publicKey.x25519:
+        return publicKey.elliptic.ecdhX.generate(algo).then(({ A, k }) => ({
+          privateParams: { k },
+          publicParams: { A }
+        }));
       case enums.publicKey.dsa:
       case enums.publicKey.elgamal:
-        throw new Error('Unsupported algorithm for key generation.');
+        throw Error('Unsupported algorithm for key generation.');
       default:
-        throw new Error('Invalid public key algorithm.');
+        throw Error('Unknown public key algorithm.');
     }
   }
 
@@ -13435,7 +15280,7 @@ var openpgp = (function (exports) {
    */
   async function validateParams(algo, publicParams, privateParams) {
     if (!publicParams || !privateParams) {
-      throw new Error('Missing key parameters');
+      throw Error('Missing key parameters');
     }
     switch (algo) {
       case enums.publicKey.rsaEncrypt:
@@ -13462,13 +15307,23 @@ var openpgp = (function (exports) {
         const { d } = privateParams;
         return algoModule.validateParams(oid, Q, d);
       }
-      case enums.publicKey.eddsa: {
-        const { oid, Q } = publicParams;
+      case enums.publicKey.eddsaLegacy: {
+        const { Q, oid } = publicParams;
         const { seed } = privateParams;
-        return publicKey.elliptic.eddsa.validateParams(oid, Q, seed);
+        return publicKey.elliptic.eddsaLegacy.validateParams(oid, Q, seed);
+      }
+      case enums.publicKey.ed25519: {
+        const { A } = publicParams;
+        const { seed } = privateParams;
+        return publicKey.elliptic.eddsa.validateParams(algo, A, seed);
+      }
+      case enums.publicKey.x25519: {
+        const { A } = publicParams;
+        const { k } = privateParams;
+        return publicKey.elliptic.ecdhX.validateParams(algo, A, k);
       }
       default:
-        throw new Error('Invalid public key algorithm.');
+        throw Error('Unknown public key algorithm.');
     }
   }
 
@@ -13490,8 +15345,7 @@ var openpgp = (function (exports) {
    * Generating a session key for the specified symmetric algorithm
    * See {@link https://tools.ietf.org/html/rfc4880#section-9.2|RFC 4880 9.2} for algorithms.
    * @param {module:enums.symmetric} algo - Symmetric encryption algorithm
-   * @returns {Promise<Uint8Array>} Random bytes as a string to be used as a key.
-   * @async
+   * @returns {Uint8Array} Random bytes as a string to be used as a key.
    */
   function generateSessionKey$1(algo) {
     const { keySize } = getCipher(algo);
@@ -13510,14 +15364,33 @@ var openpgp = (function (exports) {
   }
 
   /**
-   * Get implementation of the given cipher
-   * @param {enums.symmetric} algo
-   * @returns {Object}
-   * @throws {Error} on invalid algo
+   * Check whether the given curve OID is supported
+   * @param {module:type/oid} oid - EC object identifier
+   * @throws {UnsupportedError} if curve is not supported
    */
-  function getCipher(algo) {
-    const algoName = enums.read(enums.symmetric, algo);
-    return cipher[algoName];
+  function checkSupportedCurve(oid) {
+    try {
+      oid.getName();
+    } catch (e) {
+      throw new UnsupportedError('Unknown curve OID');
+    }
+  }
+
+  /**
+   * Get preferred hash algo for a given elliptic algo
+   * @param {module:enums.publicKey} algo - alrogithm identifier
+   * @param {module:type/oid} [oid] - curve OID if needed by algo
+   */
+  function getPreferredCurveHashAlgo(algo, oid) {
+    switch (algo) {
+      case enums.publicKey.ecdsa:
+      case enums.publicKey.eddsaLegacy:
+        return publicKey.elliptic.getPreferredHashAlgo(oid);
+      case enums.publicKey.ed25519:
+        return publicKey.elliptic.eddsa.getPreferredHashAlgo(algo);
+      default:
+        throw Error('Unknown elliptic signing algo');
+    }
   }
 
   var crypto$2 = /*#__PURE__*/Object.freeze({
@@ -13533,1206 +15406,8 @@ var openpgp = (function (exports) {
     getPrefixRandom: getPrefixRandom,
     generateSessionKey: generateSessionKey$1,
     getAEADMode: getAEADMode,
-    getCipher: getCipher
-  });
-
-  // Modified by ProtonTech AG
-
-  const webCrypto$3 = util.getWebCrypto();
-
-  /**
-   * CFB encryption
-   * @param {enums.symmetric} algo - block cipher algorithm
-   * @param {Uint8Array} key
-   * @param {MaybeStream<Uint8Array>} plaintext
-   * @param {Uint8Array} iv
-   * @param {Object} config - full configuration, defaults to openpgp.config
-   * @returns MaybeStream<Uint8Array>
-   */
-  async function encrypt$1(algo, key, plaintext, iv, config) {
-    const algoName = enums.read(enums.symmetric, algo);
-    if (algoName.substr(0, 3) === 'aes') {
-      return aesEncrypt(algo, key, plaintext, iv, config);
-    }
-
-    const cipherfn = new cipher[algoName](key);
-    const block_size = cipherfn.blockSize;
-
-    const blockc = iv.slice();
-    let pt = new Uint8Array();
-    const process = chunk => {
-      if (chunk) {
-        pt = util.concatUint8Array([pt, chunk]);
-      }
-      const ciphertext = new Uint8Array(pt.length);
-      let i;
-      let j = 0;
-      while (chunk ? pt.length >= block_size : pt.length) {
-        const encblock = cipherfn.encrypt(blockc);
-        for (i = 0; i < block_size; i++) {
-          blockc[i] = pt[i] ^ encblock[i];
-          ciphertext[j++] = blockc[i];
-        }
-        pt = pt.subarray(block_size);
-      }
-      return ciphertext.subarray(0, j);
-    };
-    return transform(plaintext, process, process);
-  }
-
-  /**
-   * CFB decryption
-   * @param {enums.symmetric} algo - block cipher algorithm
-   * @param {Uint8Array} key
-   * @param {MaybeStream<Uint8Array>} ciphertext
-   * @param {Uint8Array} iv
-   * @returns MaybeStream<Uint8Array>
-   */
-  async function decrypt$1(algo, key, ciphertext, iv) {
-    const algoName = enums.read(enums.symmetric, algo);
-    if (algoName.substr(0, 3) === 'aes') {
-      return aesDecrypt(algo, key, ciphertext, iv);
-    }
-
-    const cipherfn = new cipher[algoName](key);
-    const block_size = cipherfn.blockSize;
-
-    let blockp = iv;
-    let ct = new Uint8Array();
-    const process = chunk => {
-      if (chunk) {
-        ct = util.concatUint8Array([ct, chunk]);
-      }
-      const plaintext = new Uint8Array(ct.length);
-      let i;
-      let j = 0;
-      while (chunk ? ct.length >= block_size : ct.length) {
-        const decblock = cipherfn.encrypt(blockp);
-        blockp = ct;
-        for (i = 0; i < block_size; i++) {
-          plaintext[j++] = blockp[i] ^ decblock[i];
-        }
-        ct = ct.subarray(block_size);
-      }
-      return plaintext.subarray(0, j);
-    };
-    return transform(ciphertext, process, process);
-  }
-
-  function aesEncrypt(algo, key, pt, iv, config) {
-    if (
-      util.getWebCrypto() &&
-      key.length !== 24 && // Chrome doesn't support 192 bit keys, see https://www.chromium.org/blink/webcrypto#TOC-AES-support
-      !util.isStream(pt) &&
-      pt.length >= 3000 * config.minBytesForWebCrypto // Default to a 3MB minimum. Chrome is pretty slow for small messages, see: https://bugs.chromium.org/p/chromium/issues/detail?id=701188#c2
-    ) { // Web Crypto
-      return webEncrypt(algo, key, pt, iv);
-    }
-    // asm.js fallback
-    const cfb = new AES_CFB(key, iv);
-    return transform(pt, value => cfb.aes.AES_Encrypt_process(value), () => cfb.aes.AES_Encrypt_finish());
-  }
-
-  function aesDecrypt(algo, key, ct, iv) {
-    if (util.isStream(ct)) {
-      const cfb = new AES_CFB(key, iv);
-      return transform(ct, value => cfb.aes.AES_Decrypt_process(value), () => cfb.aes.AES_Decrypt_finish());
-    }
-    return AES_CFB.decrypt(ct, key, iv);
-  }
-
-  function xorMut$1(a, b) {
-    for (let i = 0; i < a.length; i++) {
-      a[i] = a[i] ^ b[i];
-    }
-  }
-
-  async function webEncrypt(algo, key, pt, iv) {
-    const ALGO = 'AES-CBC';
-    const _key = await webCrypto$3.importKey('raw', key, { name: ALGO }, false, ['encrypt']);
-    const { blockSize } = getCipher(algo);
-    const cbc_pt = util.concatUint8Array([new Uint8Array(blockSize), pt]);
-    const ct = new Uint8Array(await webCrypto$3.encrypt({ name: ALGO, iv }, _key, cbc_pt)).subarray(0, pt.length);
-    xorMut$1(ct, pt);
-    return ct;
-  }
-
-  var cfb = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    encrypt: encrypt$1,
-    decrypt: decrypt$1
-  });
-
-  class AES_CTR {
-      static encrypt(data, key, nonce) {
-          return new AES_CTR(key, nonce).encrypt(data);
-      }
-      static decrypt(data, key, nonce) {
-          return new AES_CTR(key, nonce).encrypt(data);
-      }
-      constructor(key, nonce, aes) {
-          this.aes = aes ? aes : new AES(key, undefined, false, 'CTR');
-          delete this.aes.padding;
-          this.AES_CTR_set_options(nonce);
-      }
-      encrypt(data) {
-          const r1 = this.aes.AES_Encrypt_process(data);
-          const r2 = this.aes.AES_Encrypt_finish();
-          return joinBytes(r1, r2);
-      }
-      decrypt(data) {
-          const r1 = this.aes.AES_Encrypt_process(data);
-          const r2 = this.aes.AES_Encrypt_finish();
-          return joinBytes(r1, r2);
-      }
-      AES_CTR_set_options(nonce, counter, size) {
-          let { asm } = this.aes.acquire_asm();
-          if (size !== undefined) {
-              if (size < 8 || size > 48)
-                  throw new IllegalArgumentError('illegal counter size');
-              let mask = Math.pow(2, size) - 1;
-              asm.set_mask(0, 0, (mask / 0x100000000) | 0, mask | 0);
-          }
-          else {
-              size = 48;
-              asm.set_mask(0, 0, 0xffff, 0xffffffff);
-          }
-          if (nonce !== undefined) {
-              let len = nonce.length;
-              if (!len || len > 16)
-                  throw new IllegalArgumentError('illegal nonce size');
-              let view = new DataView(new ArrayBuffer(16));
-              new Uint8Array(view.buffer).set(nonce);
-              asm.set_nonce(view.getUint32(0), view.getUint32(4), view.getUint32(8), view.getUint32(12));
-          }
-          else {
-              throw new Error('nonce is required');
-          }
-          if (counter !== undefined) {
-              if (counter < 0 || counter >= Math.pow(2, size))
-                  throw new IllegalArgumentError('illegal counter value');
-              asm.set_counter(0, 0, (counter / 0x100000000) | 0, counter | 0);
-          }
-      }
-  }
-
-  class AES_CBC {
-      static encrypt(data, key, padding = true, iv) {
-          return new AES_CBC(key, iv, padding).encrypt(data);
-      }
-      static decrypt(data, key, padding = true, iv) {
-          return new AES_CBC(key, iv, padding).decrypt(data);
-      }
-      constructor(key, iv, padding = true, aes) {
-          this.aes = aes ? aes : new AES(key, iv, padding, 'CBC');
-      }
-      encrypt(data) {
-          const r1 = this.aes.AES_Encrypt_process(data);
-          const r2 = this.aes.AES_Encrypt_finish();
-          return joinBytes(r1, r2);
-      }
-      decrypt(data) {
-          const r1 = this.aes.AES_Decrypt_process(data);
-          const r2 = this.aes.AES_Decrypt_finish();
-          return joinBytes(r1, r2);
-      }
-  }
-
-  /**
-   * @fileoverview This module implements AES-CMAC on top of
-   * native AES-CBC using either the WebCrypto API or Node.js' crypto API.
-   * @module crypto/cmac
-   * @private
-   */
-
-  const webCrypto$2 = util.getWebCrypto();
-
-
-  /**
-   * This implementation of CMAC is based on the description of OMAC in
-   * http://web.cs.ucdavis.edu/~rogaway/papers/eax.pdf. As per that
-   * document:
-   *
-   * We have made a small modification to the OMAC algorithm as it was
-   * originally presented, changing one of its two constants.
-   * Specifically, the constant 4 at line 85 was the constant 1/2 (the
-   * multiplicative inverse of 2) in the original definition of OMAC [14].
-   * The OMAC authors indicate that they will promulgate this modification
-   * [15], which slightly simplifies implementations.
-   */
-
-  const blockLength$3 = 16;
-
-
-  /**
-   * xor `padding` into the end of `data`. This function implements "the
-   * operation xor→ [which] xors the shorter string into the end of longer
-   * one". Since data is always as least as long as padding, we can
-   * simplify the implementation.
-   * @param {Uint8Array} data
-   * @param {Uint8Array} padding
-   */
-  function rightXORMut(data, padding) {
-    const offset = data.length - blockLength$3;
-    for (let i = 0; i < blockLength$3; i++) {
-      data[i + offset] ^= padding[i];
-    }
-    return data;
-  }
-
-  function pad(data, padding, padding2) {
-    // if |M| in {n, 2n, 3n, ...}
-    if (data.length && data.length % blockLength$3 === 0) {
-      // then return M xor→ B,
-      return rightXORMut(data, padding);
-    }
-    // else return (M || 10^(n−1−(|M| mod n))) xor→ P
-    const padded = new Uint8Array(data.length + (blockLength$3 - data.length % blockLength$3));
-    padded.set(data);
-    padded[data.length] = 0b10000000;
-    return rightXORMut(padded, padding2);
-  }
-
-  const zeroBlock$1 = new Uint8Array(blockLength$3);
-
-  async function CMAC(key) {
-    const cbc = await CBC(key);
-
-    // L ← E_K(0^n); B ← 2L; P ← 4L
-    const padding = util.double(await cbc(zeroBlock$1));
-    const padding2 = util.double(padding);
-
-    return async function(data) {
-      // return CBC_K(pad(M; B, P))
-      return (await cbc(pad(data, padding, padding2))).subarray(-blockLength$3);
-    };
-  }
-
-  async function CBC(key) {
-    if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto/#aes-support
-      key = await webCrypto$2.importKey('raw', key, { name: 'AES-CBC', length: key.length * 8 }, false, ['encrypt']);
-      return async function(pt) {
-        const ct = await webCrypto$2.encrypt({ name: 'AES-CBC', iv: zeroBlock$1, length: blockLength$3 * 8 }, key, pt);
-        return new Uint8Array(ct).subarray(0, ct.byteLength - blockLength$3);
-      };
-    }
-    // asm.js fallback
-    return async function(pt) {
-      return AES_CBC.encrypt(pt, key, false, zeroBlock$1);
-    };
-  }
-
-  // OpenPGP.js - An OpenPGP implementation in javascript
-
-  const webCrypto$1 = util.getWebCrypto();
-
-
-  const blockLength$2 = 16;
-  const ivLength$2 = blockLength$2;
-  const tagLength$2 = blockLength$2;
-
-  const zero$2 = new Uint8Array(blockLength$2);
-  const one$1 = new Uint8Array(blockLength$2); one$1[blockLength$2 - 1] = 1;
-  const two = new Uint8Array(blockLength$2); two[blockLength$2 - 1] = 2;
-
-  async function OMAC(key) {
-    const cmac = await CMAC(key);
-    return function(t, message) {
-      return cmac(util.concatUint8Array([t, message]));
-    };
-  }
-
-  async function CTR(key) {
-    if (
-      util.getWebCrypto() &&
-      key.length !== 24 // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support
-    ) {
-      key = await webCrypto$1.importKey('raw', key, { name: 'AES-CTR', length: key.length * 8 }, false, ['encrypt']);
-      return async function(pt, iv) {
-        const ct = await webCrypto$1.encrypt({ name: 'AES-CTR', counter: iv, length: blockLength$2 * 8 }, key, pt);
-        return new Uint8Array(ct);
-      };
-    }
-    // asm.js fallback
-    return async function(pt, iv) {
-      return AES_CTR.encrypt(pt, key, iv);
-    };
-  }
-
-
-  /**
-   * Class to en/decrypt using EAX mode.
-   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
-   * @param {Uint8Array} key - The encryption key
-   */
-  async function EAX(cipher, key) {
-    if (cipher !== enums.symmetric.aes128 &&
-      cipher !== enums.symmetric.aes192 &&
-      cipher !== enums.symmetric.aes256) {
-      throw new Error('EAX mode supports only AES cipher');
-    }
-
-    const [
-      omac,
-      ctr
-    ] = await Promise.all([
-      OMAC(key),
-      CTR(key)
-    ]);
-
-    return {
-      /**
-       * Encrypt plaintext input.
-       * @param {Uint8Array} plaintext - The cleartext input to be encrypted
-       * @param {Uint8Array} nonce - The nonce (16 bytes)
-       * @param {Uint8Array} adata - Associated data to sign
-       * @returns {Promise<Uint8Array>} The ciphertext output.
-       */
-      encrypt: async function(plaintext, nonce, adata) {
-        const [
-          omacNonce,
-          omacAdata
-        ] = await Promise.all([
-          omac(zero$2, nonce),
-          omac(one$1, adata)
-        ]);
-        const ciphered = await ctr(plaintext, omacNonce);
-        const omacCiphered = await omac(two, ciphered);
-        const tag = omacCiphered; // Assumes that omac(*).length === tagLength.
-        for (let i = 0; i < tagLength$2; i++) {
-          tag[i] ^= omacAdata[i] ^ omacNonce[i];
-        }
-        return util.concatUint8Array([ciphered, tag]);
-      },
-
-      /**
-       * Decrypt ciphertext input.
-       * @param {Uint8Array} ciphertext - The ciphertext input to be decrypted
-       * @param {Uint8Array} nonce - The nonce (16 bytes)
-       * @param {Uint8Array} adata - Associated data to verify
-       * @returns {Promise<Uint8Array>} The plaintext output.
-       */
-      decrypt: async function(ciphertext, nonce, adata) {
-        if (ciphertext.length < tagLength$2) throw new Error('Invalid EAX ciphertext');
-        const ciphered = ciphertext.subarray(0, -tagLength$2);
-        const ctTag = ciphertext.subarray(-tagLength$2);
-        const [
-          omacNonce,
-          omacAdata,
-          omacCiphered
-        ] = await Promise.all([
-          omac(zero$2, nonce),
-          omac(one$1, adata),
-          omac(two, ciphered)
-        ]);
-        const tag = omacCiphered; // Assumes that omac(*).length === tagLength.
-        for (let i = 0; i < tagLength$2; i++) {
-          tag[i] ^= omacAdata[i] ^ omacNonce[i];
-        }
-        if (!util.equalsUint8Array(ctTag, tag)) throw new Error('Authentication tag mismatch');
-        const plaintext = await ctr(ciphered, omacNonce);
-        return plaintext;
-      }
-    };
-  }
-
-
-  /**
-   * Get EAX nonce as defined by {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.1|RFC4880bis-04, section 5.16.1}.
-   * @param {Uint8Array} iv - The initialization vector (16 bytes)
-   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
-   */
-  EAX.getNonce = function(iv, chunkIndex) {
-    const nonce = iv.slice();
-    for (let i = 0; i < chunkIndex.length; i++) {
-      nonce[8 + i] ^= chunkIndex[i];
-    }
-    return nonce;
-  };
-
-  EAX.blockLength = blockLength$2;
-  EAX.ivLength = ivLength$2;
-  EAX.tagLength = tagLength$2;
-
-  // OpenPGP.js - An OpenPGP implementation in javascript
-
-  const blockLength$1 = 16;
-  const ivLength$1 = 15;
-
-  // https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.2:
-  // While OCB [RFC7253] allows the authentication tag length to be of any
-  // number up to 128 bits long, this document requires a fixed
-  // authentication tag length of 128 bits (16 octets) for simplicity.
-  const tagLength$1 = 16;
-
-
-  function ntz(n) {
-    let ntz = 0;
-    for (let i = 1; (n & i) === 0; i <<= 1) {
-      ntz++;
-    }
-    return ntz;
-  }
-
-  function xorMut(S, T) {
-    for (let i = 0; i < S.length; i++) {
-      S[i] ^= T[i];
-    }
-    return S;
-  }
-
-  function xor(S, T) {
-    return xorMut(S.slice(), T);
-  }
-
-  const zeroBlock = new Uint8Array(blockLength$1);
-  const one = new Uint8Array([1]);
-
-  /**
-   * Class to en/decrypt using OCB mode.
-   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
-   * @param {Uint8Array} key - The encryption key
-   */
-  async function OCB(cipher$1, key) {
-
-    let maxNtz = 0;
-    let encipher;
-    let decipher;
-    let mask;
-
-    constructKeyVariables(cipher$1, key);
-
-    function constructKeyVariables(cipher$1, key) {
-      const cipherName = enums.read(enums.symmetric, cipher$1);
-      const aes = new cipher[cipherName](key);
-      encipher = aes.encrypt.bind(aes);
-      decipher = aes.decrypt.bind(aes);
-
-      const mask_x = encipher(zeroBlock);
-      const mask_$ = util.double(mask_x);
-      mask = [];
-      mask[0] = util.double(mask_$);
-
-
-      mask.x = mask_x;
-      mask.$ = mask_$;
-    }
-
-    function extendKeyVariables(text, adata) {
-      const newMaxNtz = util.nbits(Math.max(text.length, adata.length) / blockLength$1 | 0) - 1;
-      for (let i = maxNtz + 1; i <= newMaxNtz; i++) {
-        mask[i] = util.double(mask[i - 1]);
-      }
-      maxNtz = newMaxNtz;
-    }
-
-    function hash(adata) {
-      if (!adata.length) {
-        // Fast path
-        return zeroBlock;
-      }
-
-      //
-      // Consider A as a sequence of 128-bit blocks
-      //
-      const m = adata.length / blockLength$1 | 0;
-
-      const offset = new Uint8Array(blockLength$1);
-      const sum = new Uint8Array(blockLength$1);
-      for (let i = 0; i < m; i++) {
-        xorMut(offset, mask[ntz(i + 1)]);
-        xorMut(sum, encipher(xor(offset, adata)));
-        adata = adata.subarray(blockLength$1);
-      }
-
-      //
-      // Process any final partial block; compute final hash value
-      //
-      if (adata.length) {
-        xorMut(offset, mask.x);
-
-        const cipherInput = new Uint8Array(blockLength$1);
-        cipherInput.set(adata, 0);
-        cipherInput[adata.length] = 0b10000000;
-        xorMut(cipherInput, offset);
-
-        xorMut(sum, encipher(cipherInput));
-      }
-
-      return sum;
-    }
-
-    /**
-     * Encrypt/decrypt data.
-     * @param {encipher|decipher} fn - Encryption/decryption block cipher function
-     * @param {Uint8Array} text - The cleartext or ciphertext (without tag) input
-     * @param {Uint8Array} nonce - The nonce (15 bytes)
-     * @param {Uint8Array} adata - Associated data to sign
-     * @returns {Promise<Uint8Array>} The ciphertext or plaintext output, with tag appended in both cases.
-     */
-    function crypt(fn, text, nonce, adata) {
-      //
-      // Consider P as a sequence of 128-bit blocks
-      //
-      const m = text.length / blockLength$1 | 0;
-
-      //
-      // Key-dependent variables
-      //
-      extendKeyVariables(text, adata);
-
-      //
-      // Nonce-dependent and per-encryption variables
-      //
-      //    Nonce = num2str(TAGLEN mod 128,7) || zeros(120-bitlen(N)) || 1 || N
-      // Note: We assume here that tagLength mod 16 == 0.
-      const paddedNonce = util.concatUint8Array([zeroBlock.subarray(0, ivLength$1 - nonce.length), one, nonce]);
-      //    bottom = str2num(Nonce[123..128])
-      const bottom = paddedNonce[blockLength$1 - 1] & 0b111111;
-      //    Ktop = ENCIPHER(K, Nonce[1..122] || zeros(6))
-      paddedNonce[blockLength$1 - 1] &= 0b11000000;
-      const kTop = encipher(paddedNonce);
-      //    Stretch = Ktop || (Ktop[1..64] xor Ktop[9..72])
-      const stretched = util.concatUint8Array([kTop, xor(kTop.subarray(0, 8), kTop.subarray(1, 9))]);
-      //    Offset_0 = Stretch[1+bottom..128+bottom]
-      const offset = util.shiftRight(stretched.subarray(0 + (bottom >> 3), 17 + (bottom >> 3)), 8 - (bottom & 7)).subarray(1);
-      //    Checksum_0 = zeros(128)
-      const checksum = new Uint8Array(blockLength$1);
-
-      const ct = new Uint8Array(text.length + tagLength$1);
-
-      //
-      // Process any whole blocks
-      //
-      let i;
-      let pos = 0;
-      for (i = 0; i < m; i++) {
-        // Offset_i = Offset_{i-1} xor L_{ntz(i)}
-        xorMut(offset, mask[ntz(i + 1)]);
-        // C_i = Offset_i xor ENCIPHER(K, P_i xor Offset_i)
-        // P_i = Offset_i xor DECIPHER(K, C_i xor Offset_i)
-        ct.set(xorMut(fn(xor(offset, text)), offset), pos);
-        // Checksum_i = Checksum_{i-1} xor P_i
-        xorMut(checksum, fn === encipher ? text : ct.subarray(pos));
-
-        text = text.subarray(blockLength$1);
-        pos += blockLength$1;
-      }
-
-      //
-      // Process any final partial block and compute raw tag
-      //
-      if (text.length) {
-        // Offset_* = Offset_m xor L_*
-        xorMut(offset, mask.x);
-        // Pad = ENCIPHER(K, Offset_*)
-        const padding = encipher(offset);
-        // C_* = P_* xor Pad[1..bitlen(P_*)]
-        ct.set(xor(text, padding), pos);
-
-        // Checksum_* = Checksum_m xor (P_* || 1 || new Uint8Array(127-bitlen(P_*)))
-        const xorInput = new Uint8Array(blockLength$1);
-        xorInput.set(fn === encipher ? text : ct.subarray(pos, -tagLength$1), 0);
-        xorInput[text.length] = 0b10000000;
-        xorMut(checksum, xorInput);
-        pos += text.length;
-      }
-      // Tag = ENCIPHER(K, Checksum_* xor Offset_* xor L_$) xor HASH(K,A)
-      const tag = xorMut(encipher(xorMut(xorMut(checksum, offset), mask.$)), hash(adata));
-
-      //
-      // Assemble ciphertext
-      //
-      // C = C_1 || C_2 || ... || C_m || C_* || Tag[1..TAGLEN]
-      ct.set(tag, pos);
-      return ct;
-    }
-
-
-    return {
-      /**
-       * Encrypt plaintext input.
-       * @param {Uint8Array} plaintext - The cleartext input to be encrypted
-       * @param {Uint8Array} nonce - The nonce (15 bytes)
-       * @param {Uint8Array} adata - Associated data to sign
-       * @returns {Promise<Uint8Array>} The ciphertext output.
-       */
-      encrypt: async function(plaintext, nonce, adata) {
-        return crypt(encipher, plaintext, nonce, adata);
-      },
-
-      /**
-       * Decrypt ciphertext input.
-       * @param {Uint8Array} ciphertext - The ciphertext input to be decrypted
-       * @param {Uint8Array} nonce - The nonce (15 bytes)
-       * @param {Uint8Array} adata - Associated data to sign
-       * @returns {Promise<Uint8Array>} The ciphertext output.
-       */
-      decrypt: async function(ciphertext, nonce, adata) {
-        if (ciphertext.length < tagLength$1) throw new Error('Invalid OCB ciphertext');
-
-        const tag = ciphertext.subarray(-tagLength$1);
-        ciphertext = ciphertext.subarray(0, -tagLength$1);
-
-        const crypted = crypt(decipher, ciphertext, nonce, adata);
-        // if (Tag[1..TAGLEN] == T)
-        if (util.equalsUint8Array(tag, crypted.subarray(-tagLength$1))) {
-          return crypted.subarray(0, -tagLength$1);
-        }
-        throw new Error('Authentication tag mismatch');
-      }
-    };
-  }
-
-
-  /**
-   * Get OCB nonce as defined by {@link https://tools.ietf.org/html/draft-ietf-openpgp-rfc4880bis-04#section-5.16.2|RFC4880bis-04, section 5.16.2}.
-   * @param {Uint8Array} iv - The initialization vector (15 bytes)
-   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
-   */
-  OCB.getNonce = function(iv, chunkIndex) {
-    const nonce = iv.slice();
-    for (let i = 0; i < chunkIndex.length; i++) {
-      nonce[7 + i] ^= chunkIndex[i];
-    }
-    return nonce;
-  };
-
-  OCB.blockLength = blockLength$1;
-  OCB.ivLength = ivLength$1;
-  OCB.tagLength = tagLength$1;
-
-  const _AES_GCM_data_maxLength = 68719476704; // 2^36 - 2^5
-  class AES_GCM {
-      constructor(key, nonce, adata, tagSize = 16, aes) {
-          this.tagSize = tagSize;
-          this.gamma0 = 0;
-          this.counter = 1;
-          this.aes = aes ? aes : new AES(key, undefined, false, 'CTR');
-          let { asm, heap } = this.aes.acquire_asm();
-          // Init GCM
-          asm.gcm_init();
-          // Tag size
-          if (this.tagSize < 4 || this.tagSize > 16)
-              throw new IllegalArgumentError('illegal tagSize value');
-          // Nonce
-          const noncelen = nonce.length || 0;
-          const noncebuf = new Uint8Array(16);
-          if (noncelen !== 12) {
-              this._gcm_mac_process(nonce);
-              heap[0] = 0;
-              heap[1] = 0;
-              heap[2] = 0;
-              heap[3] = 0;
-              heap[4] = 0;
-              heap[5] = 0;
-              heap[6] = 0;
-              heap[7] = 0;
-              heap[8] = 0;
-              heap[9] = 0;
-              heap[10] = 0;
-              heap[11] = noncelen >>> 29;
-              heap[12] = (noncelen >>> 21) & 255;
-              heap[13] = (noncelen >>> 13) & 255;
-              heap[14] = (noncelen >>> 5) & 255;
-              heap[15] = (noncelen << 3) & 255;
-              asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
-              asm.get_iv(AES_asm.HEAP_DATA);
-              asm.set_iv(0, 0, 0, 0);
-              noncebuf.set(heap.subarray(0, 16));
-          }
-          else {
-              noncebuf.set(nonce);
-              noncebuf[15] = 1;
-          }
-          const nonceview = new DataView(noncebuf.buffer);
-          this.gamma0 = nonceview.getUint32(12);
-          asm.set_nonce(nonceview.getUint32(0), nonceview.getUint32(4), nonceview.getUint32(8), 0);
-          asm.set_mask(0, 0, 0, 0xffffffff);
-          // Associated data
-          if (adata !== undefined) {
-              if (adata.length > _AES_GCM_data_maxLength)
-                  throw new IllegalArgumentError('illegal adata length');
-              if (adata.length) {
-                  this.adata = adata;
-                  this._gcm_mac_process(adata);
-              }
-              else {
-                  this.adata = undefined;
-              }
-          }
-          else {
-              this.adata = undefined;
-          }
-          // Counter
-          if (this.counter < 1 || this.counter > 0xffffffff)
-              throw new RangeError('counter must be a positive 32-bit integer');
-          asm.set_counter(0, 0, 0, (this.gamma0 + this.counter) | 0);
-      }
-      static encrypt(cleartext, key, nonce, adata, tagsize) {
-          return new AES_GCM(key, nonce, adata, tagsize).encrypt(cleartext);
-      }
-      static decrypt(ciphertext, key, nonce, adata, tagsize) {
-          return new AES_GCM(key, nonce, adata, tagsize).decrypt(ciphertext);
-      }
-      encrypt(data) {
-          return this.AES_GCM_encrypt(data);
-      }
-      decrypt(data) {
-          return this.AES_GCM_decrypt(data);
-      }
-      AES_GCM_Encrypt_process(data) {
-          let dpos = 0;
-          let dlen = data.length || 0;
-          let { asm, heap } = this.aes.acquire_asm();
-          let counter = this.counter;
-          let pos = this.aes.pos;
-          let len = this.aes.len;
-          let rpos = 0;
-          let rlen = (len + dlen) & -16;
-          let wlen = 0;
-          if (((counter - 1) << 4) + len + dlen > _AES_GCM_data_maxLength)
-              throw new RangeError('counter overflow');
-          const result = new Uint8Array(rlen);
-          while (dlen > 0) {
-              wlen = _heap_write(heap, pos + len, data, dpos, dlen);
-              len += wlen;
-              dpos += wlen;
-              dlen -= wlen;
-              wlen = asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA + pos, len);
-              wlen = asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, wlen);
-              if (wlen)
-                  result.set(heap.subarray(pos, pos + wlen), rpos);
-              counter += wlen >>> 4;
-              rpos += wlen;
-              if (wlen < len) {
-                  pos += wlen;
-                  len -= wlen;
-              }
-              else {
-                  pos = 0;
-                  len = 0;
-              }
-          }
-          this.counter = counter;
-          this.aes.pos = pos;
-          this.aes.len = len;
-          return result;
-      }
-      AES_GCM_Encrypt_finish() {
-          let { asm, heap } = this.aes.acquire_asm();
-          let counter = this.counter;
-          let tagSize = this.tagSize;
-          let adata = this.adata;
-          let pos = this.aes.pos;
-          let len = this.aes.len;
-          const result = new Uint8Array(len + tagSize);
-          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA + pos, (len + 15) & -16);
-          if (len)
-              result.set(heap.subarray(pos, pos + len));
-          let i = len;
-          for (; i & 15; i++)
-              heap[pos + i] = 0;
-          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, i);
-          const alen = adata !== undefined ? adata.length : 0;
-          const clen = ((counter - 1) << 4) + len;
-          heap[0] = 0;
-          heap[1] = 0;
-          heap[2] = 0;
-          heap[3] = alen >>> 29;
-          heap[4] = alen >>> 21;
-          heap[5] = (alen >>> 13) & 255;
-          heap[6] = (alen >>> 5) & 255;
-          heap[7] = (alen << 3) & 255;
-          heap[8] = heap[9] = heap[10] = 0;
-          heap[11] = clen >>> 29;
-          heap[12] = (clen >>> 21) & 255;
-          heap[13] = (clen >>> 13) & 255;
-          heap[14] = (clen >>> 5) & 255;
-          heap[15] = (clen << 3) & 255;
-          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
-          asm.get_iv(AES_asm.HEAP_DATA);
-          asm.set_counter(0, 0, 0, this.gamma0);
-          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA, 16);
-          result.set(heap.subarray(0, tagSize), len);
-          this.counter = 1;
-          this.aes.pos = 0;
-          this.aes.len = 0;
-          return result;
-      }
-      AES_GCM_Decrypt_process(data) {
-          let dpos = 0;
-          let dlen = data.length || 0;
-          let { asm, heap } = this.aes.acquire_asm();
-          let counter = this.counter;
-          let tagSize = this.tagSize;
-          let pos = this.aes.pos;
-          let len = this.aes.len;
-          let rpos = 0;
-          let rlen = len + dlen > tagSize ? (len + dlen - tagSize) & -16 : 0;
-          let tlen = len + dlen - rlen;
-          let wlen = 0;
-          if (((counter - 1) << 4) + len + dlen > _AES_GCM_data_maxLength)
-              throw new RangeError('counter overflow');
-          const result = new Uint8Array(rlen);
-          while (dlen > tlen) {
-              wlen = _heap_write(heap, pos + len, data, dpos, dlen - tlen);
-              len += wlen;
-              dpos += wlen;
-              dlen -= wlen;
-              wlen = asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, wlen);
-              wlen = asm.cipher(AES_asm.DEC.CTR, AES_asm.HEAP_DATA + pos, wlen);
-              if (wlen)
-                  result.set(heap.subarray(pos, pos + wlen), rpos);
-              counter += wlen >>> 4;
-              rpos += wlen;
-              pos = 0;
-              len = 0;
-          }
-          if (dlen > 0) {
-              len += _heap_write(heap, 0, data, dpos, dlen);
-          }
-          this.counter = counter;
-          this.aes.pos = pos;
-          this.aes.len = len;
-          return result;
-      }
-      AES_GCM_Decrypt_finish() {
-          let { asm, heap } = this.aes.acquire_asm();
-          let tagSize = this.tagSize;
-          let adata = this.adata;
-          let counter = this.counter;
-          let pos = this.aes.pos;
-          let len = this.aes.len;
-          let rlen = len - tagSize;
-          if (len < tagSize)
-              throw new IllegalStateError('authentication tag not found');
-          const result = new Uint8Array(rlen);
-          const atag = new Uint8Array(heap.subarray(pos + rlen, pos + len));
-          let i = rlen;
-          for (; i & 15; i++)
-              heap[pos + i] = 0;
-          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA + pos, i);
-          asm.cipher(AES_asm.DEC.CTR, AES_asm.HEAP_DATA + pos, i);
-          if (rlen)
-              result.set(heap.subarray(pos, pos + rlen));
-          const alen = adata !== undefined ? adata.length : 0;
-          const clen = ((counter - 1) << 4) + len - tagSize;
-          heap[0] = 0;
-          heap[1] = 0;
-          heap[2] = 0;
-          heap[3] = alen >>> 29;
-          heap[4] = alen >>> 21;
-          heap[5] = (alen >>> 13) & 255;
-          heap[6] = (alen >>> 5) & 255;
-          heap[7] = (alen << 3) & 255;
-          heap[8] = heap[9] = heap[10] = 0;
-          heap[11] = clen >>> 29;
-          heap[12] = (clen >>> 21) & 255;
-          heap[13] = (clen >>> 13) & 255;
-          heap[14] = (clen >>> 5) & 255;
-          heap[15] = (clen << 3) & 255;
-          asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, 16);
-          asm.get_iv(AES_asm.HEAP_DATA);
-          asm.set_counter(0, 0, 0, this.gamma0);
-          asm.cipher(AES_asm.ENC.CTR, AES_asm.HEAP_DATA, 16);
-          let acheck = 0;
-          for (let i = 0; i < tagSize; ++i)
-              acheck |= atag[i] ^ heap[i];
-          if (acheck)
-              throw new SecurityError('data integrity check failed');
-          this.counter = 1;
-          this.aes.pos = 0;
-          this.aes.len = 0;
-          return result;
-      }
-      AES_GCM_decrypt(data) {
-          const result1 = this.AES_GCM_Decrypt_process(data);
-          const result2 = this.AES_GCM_Decrypt_finish();
-          const result = new Uint8Array(result1.length + result2.length);
-          if (result1.length)
-              result.set(result1);
-          if (result2.length)
-              result.set(result2, result1.length);
-          return result;
-      }
-      AES_GCM_encrypt(data) {
-          const result1 = this.AES_GCM_Encrypt_process(data);
-          const result2 = this.AES_GCM_Encrypt_finish();
-          const result = new Uint8Array(result1.length + result2.length);
-          if (result1.length)
-              result.set(result1);
-          if (result2.length)
-              result.set(result2, result1.length);
-          return result;
-      }
-      _gcm_mac_process(data) {
-          let { asm, heap } = this.aes.acquire_asm();
-          let dpos = 0;
-          let dlen = data.length || 0;
-          let wlen = 0;
-          while (dlen > 0) {
-              wlen = _heap_write(heap, 0, data, dpos, dlen);
-              dpos += wlen;
-              dlen -= wlen;
-              while (wlen & 15)
-                  heap[wlen++] = 0;
-              asm.mac(AES_asm.MAC.GCM, AES_asm.HEAP_DATA, wlen);
-          }
-      }
-  }
-
-  // OpenPGP.js - An OpenPGP implementation in javascript
-
-  const webCrypto = util.getWebCrypto();
-
-  const blockLength = 16;
-  const ivLength = 12; // size of the IV in bytes
-  const tagLength = 16; // size of the tag in bytes
-  const ALGO = 'AES-GCM';
-
-  /**
-   * Class to en/decrypt using GCM mode.
-   * @param {enums.symmetric} cipher - The symmetric cipher algorithm to use
-   * @param {Uint8Array} key - The encryption key
-   */
-  async function GCM(cipher, key) {
-    if (cipher !== enums.symmetric.aes128 &&
-      cipher !== enums.symmetric.aes192 &&
-      cipher !== enums.symmetric.aes256) {
-      throw new Error('GCM mode supports only AES cipher');
-    }
-
-    if (util.getWebCrypto() && key.length !== 24) { // WebCrypto (no 192 bit support) see: https://www.chromium.org/blink/webcrypto#TOC-AES-support
-      const _key = await webCrypto.importKey('raw', key, { name: ALGO }, false, ['encrypt', 'decrypt']);
-
-      return {
-        encrypt: async function(pt, iv, adata = new Uint8Array()) {
-          if (!pt.length) { // iOS does not support GCM-en/decrypting empty messages
-            return AES_GCM.encrypt(pt, key, iv, adata);
-          }
-          const ct = await webCrypto.encrypt({ name: ALGO, iv, additionalData: adata, tagLength: tagLength * 8 }, _key, pt);
-          return new Uint8Array(ct);
-        },
-
-        decrypt: async function(ct, iv, adata = new Uint8Array()) {
-          if (ct.length === tagLength) { // iOS does not support GCM-en/decrypting empty messages
-            return AES_GCM.decrypt(ct, key, iv, adata);
-          }
-          const pt = await webCrypto.decrypt({ name: ALGO, iv, additionalData: adata, tagLength: tagLength * 8 }, _key, ct);
-          return new Uint8Array(pt);
-        }
-      };
-    }
-
-    return {
-      encrypt: async function(pt, iv, adata) {
-        return AES_GCM.encrypt(pt, key, iv, adata);
-      },
-
-      decrypt: async function(ct, iv, adata) {
-        return AES_GCM.decrypt(ct, key, iv, adata);
-      }
-    };
-  }
-
-
-  /**
-   * Get GCM nonce. Note: this operation is not defined by the standard.
-   * A future version of the standard may define GCM mode differently,
-   * hopefully under a different ID (we use Private/Experimental algorithm
-   * ID 100) so that we can maintain backwards compatibility.
-   * @param {Uint8Array} iv - The initialization vector (12 bytes)
-   * @param {Uint8Array} chunkIndex - The chunk index (8 bytes)
-   */
-  GCM.getNonce = function(iv, chunkIndex) {
-    const nonce = iv.slice();
-    for (let i = 0; i < chunkIndex.length; i++) {
-      nonce[4 + i] ^= chunkIndex[i];
-    }
-    return nonce;
-  };
-
-  GCM.blockLength = blockLength;
-  GCM.ivLength = ivLength;
-  GCM.tagLength = tagLength;
-
-  /**
-   * @fileoverview Cipher modes
-   * @module crypto/mode
-   * @private
-   */
-
-  var mode = {
-    /** @see module:crypto/mode/cfb */
-    cfb: cfb,
-    /** @see module:crypto/mode/gcm */
-    gcm: GCM,
-    experimentalGCM: GCM,
-    /** @see module:crypto/mode/eax */
-    eax: EAX,
-    /** @see module:crypto/mode/ocb */
-    ocb: OCB
-  };
-
-  /**
-   * @fileoverview Provides functions for asymmetric signing and signature verification
-   * @module crypto/signature
-   * @private
-   */
-
-  /**
-   * Parse signature in binary form to get the parameters.
-   * The returned values are only padded for EdDSA, since in the other cases their expected length
-   * depends on the key params, hence we delegate the padding to the signature verification function.
-   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-   * See {@link https://tools.ietf.org/html/rfc4880#section-5.2.2|RFC 4880 5.2.2.}
-   * @param {module:enums.publicKey} algo - Public key algorithm
-   * @param {Uint8Array} signature - Data for which the signature was created
-   * @returns {Promise<Object>} True if signature is valid.
-   * @async
-   */
-  function parseSignatureParams(algo, signature) {
-    let read = 0;
-    switch (algo) {
-      // Algorithm-Specific Fields for RSA signatures:
-      // -  MPI of RSA signature value m**d mod n.
-      case enums.publicKey.rsaEncryptSign:
-      case enums.publicKey.rsaEncrypt:
-      case enums.publicKey.rsaSign: {
-        const s = util.readMPI(signature.subarray(read));
-        // The signature needs to be the same length as the public key modulo n.
-        // We pad s on signature verification, where we have access to n.
-        return { s };
-      }
-      // Algorithm-Specific Fields for DSA or ECDSA signatures:
-      // -  MPI of DSA or ECDSA value r.
-      // -  MPI of DSA or ECDSA value s.
-      case enums.publicKey.dsa:
-      case enums.publicKey.ecdsa:
-      {
-        const r = util.readMPI(signature.subarray(read)); read += r.length + 2;
-        const s = util.readMPI(signature.subarray(read));
-        return { r, s };
-      }
-      // Algorithm-Specific Fields for EdDSA signatures:
-      // -  MPI of an EC point r.
-      // -  EdDSA value s, in MPI, in the little endian representation
-      case enums.publicKey.eddsa: {
-        // When parsing little-endian MPI data, we always need to left-pad it, as done with big-endian values:
-        // https://www.ietf.org/archive/id/draft-ietf-openpgp-rfc4880bis-10.html#section-3.2-9
-        let r = util.readMPI(signature.subarray(read)); read += r.length + 2;
-        r = util.leftPad(r, 32);
-        let s = util.readMPI(signature.subarray(read));
-        s = util.leftPad(s, 32);
-        return { r, s };
-      }
-      default:
-        throw new Error('Invalid signature algorithm.');
-    }
-  }
-
-  /**
-   * Verifies the signature provided for data using specified algorithms and public key parameters.
-   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-   * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-   * for public key and hash algorithms.
-   * @param {module:enums.publicKey} algo - Public key algorithm
-   * @param {module:enums.hash} hashAlgo - Hash algorithm
-   * @param {Object} signature - Named algorithm-specific signature parameters
-   * @param {Object} publicParams - Algorithm-specific public key parameters
-   * @param {Uint8Array} data - Data for which the signature was created
-   * @param {Uint8Array} hashed - The hashed data
-   * @returns {Promise<Boolean>} True if signature is valid.
-   * @async
-   */
-  async function verify$1(algo, hashAlgo, signature, publicParams, data, hashed) {
-    switch (algo) {
-      case enums.publicKey.rsaEncryptSign:
-      case enums.publicKey.rsaEncrypt:
-      case enums.publicKey.rsaSign: {
-        const { n, e } = publicParams;
-        const s = util.leftPad(signature.s, n.length); // padding needed for webcrypto and node crypto
-        return publicKey.rsa.verify(hashAlgo, data, s, n, e, hashed);
-      }
-      case enums.publicKey.dsa: {
-        const { g, p, q, y } = publicParams;
-        const { r, s } = signature; // no need to pad, since we always handle them as BigIntegers
-        return publicKey.dsa.verify(hashAlgo, r, s, hashed, g, p, q, y);
-      }
-      case enums.publicKey.ecdsa: {
-        const { oid, Q } = publicParams;
-        const curveSize = new publicKey.elliptic.Curve(oid).payloadSize;
-        // padding needed for webcrypto
-        const r = util.leftPad(signature.r, curveSize);
-        const s = util.leftPad(signature.s, curveSize);
-        return publicKey.elliptic.ecdsa.verify(oid, hashAlgo, { r, s }, data, Q, hashed);
-      }
-      case enums.publicKey.eddsa: {
-        const { oid, Q } = publicParams;
-        // signature already padded on parsing
-        return publicKey.elliptic.eddsa.verify(oid, hashAlgo, signature, data, Q, hashed);
-      }
-      default:
-        throw new Error('Invalid signature algorithm.');
-    }
-  }
-
-  /**
-   * Creates a signature on data using specified algorithms and private key parameters.
-   * See {@link https://tools.ietf.org/html/rfc4880#section-9.1|RFC 4880 9.1}
-   * and {@link https://tools.ietf.org/html/rfc4880#section-9.4|RFC 4880 9.4}
-   * for public key and hash algorithms.
-   * @param {module:enums.publicKey} algo - Public key algorithm
-   * @param {module:enums.hash} hashAlgo - Hash algorithm
-   * @param {Object} publicKeyParams - Algorithm-specific public and private key parameters
-   * @param {Object} privateKeyParams - Algorithm-specific public and private key parameters
-   * @param {Uint8Array} data - Data to be signed
-   * @param {Uint8Array} hashed - The hashed data
-   * @returns {Promise<Object>} Signature                      Object containing named signature parameters.
-   * @async
-   */
-  async function sign$1(algo, hashAlgo, publicKeyParams, privateKeyParams, data, hashed) {
-    if (!publicKeyParams || !privateKeyParams) {
-      throw new Error('Missing key parameters');
-    }
-    switch (algo) {
-      case enums.publicKey.rsaEncryptSign:
-      case enums.publicKey.rsaEncrypt:
-      case enums.publicKey.rsaSign: {
-        const { n, e } = publicKeyParams;
-        const { d, p, q, u } = privateKeyParams;
-        const s = await publicKey.rsa.sign(hashAlgo, data, n, e, d, p, q, u, hashed);
-        return { s };
-      }
-      case enums.publicKey.dsa: {
-        const { g, p, q } = publicKeyParams;
-        const { x } = privateKeyParams;
-        return publicKey.dsa.sign(hashAlgo, hashed, g, p, q, x);
-      }
-      case enums.publicKey.elgamal: {
-        throw new Error('Signing with Elgamal is not defined in the OpenPGP standard.');
-      }
-      case enums.publicKey.ecdsa: {
-        const { oid, Q } = publicKeyParams;
-        const { d } = privateKeyParams;
-        return publicKey.elliptic.ecdsa.sign(oid, hashAlgo, data, Q, d, hashed);
-      }
-      case enums.publicKey.eddsa: {
-        const { oid, Q } = publicKeyParams;
-        const { seed } = privateKeyParams;
-        return publicKey.elliptic.eddsa.sign(oid, hashAlgo, data, Q, seed, hashed);
-      }
-      default:
-        throw new Error('Invalid signature algorithm.');
-    }
-  }
-
-  var signature$2 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    parseSignatureParams: parseSignatureParams,
-    verify: verify$1,
-    sign: sign$1
+    getCipher: getCipher,
+    getPreferredCurveHashAlgo: getPreferredCurveHashAlgo
   });
 
   /**
@@ -16676,7 +17351,7 @@ var openpgp = (function (exports) {
         //  s->block_start >= (long)s->w_size, "slide too late");
         //      if (!(s.strstart < s.w_size + (s.w_size - MIN_LOOKAHEAD) ||
         //        s.block_start >= s.w_size)) {
-        //        throw  new Error("slide too late");
+        //        throw  Error("slide too late");
         //      }
 
         fill_window(s);
@@ -16690,7 +17365,7 @@ var openpgp = (function (exports) {
         /* flush the current block */
       }
       //Assert(s->block_start >= 0L, "block gone");
-      //    if (s.block_start < 0) throw new Error("block gone");
+      //    if (s.block_start < 0) throw Error("block gone");
 
       s.strstart += s.lookahead;
       s.lookahead = 0;
@@ -17863,7 +18538,7 @@ var openpgp = (function (exports) {
       }
     }
     //Assert(strm->avail_out > 0, "bug2");
-    //if (strm.avail_out <= 0) { throw new Error("bug2");}
+    //if (strm.avail_out <= 0) { throw Error("bug2");}
 
     if (flush !== Z_FINISH) { return Z_OK; }
     if (s.wrap <= 0) { return Z_STREAM_END; }
@@ -18234,7 +18909,7 @@ var openpgp = (function (exports) {
    * deflate.push(chunk1, false);
    * deflate.push(chunk2, true);  // true -> last chunk
    *
-   * if (deflate.err) { throw new Error(deflate.err); }
+   * if (deflate.err) { throw Error(deflate.err); }
    *
    * console.log(deflate.result);
    * ```
@@ -18280,7 +18955,7 @@ var openpgp = (function (exports) {
       );
 
       if (status !== Z_OK) {
-        throw new Error(msg[status]);
+        throw Error(msg[status]);
       }
 
       if (opt.header) {
@@ -18302,7 +18977,7 @@ var openpgp = (function (exports) {
         status = deflateSetDictionary(this.strm, dict);
 
         if (status !== Z_OK) {
-          throw new Error(msg[status]);
+          throw Error(msg[status]);
         }
 
         this._dict_set = true;
@@ -20680,7 +21355,7 @@ var openpgp = (function (exports) {
    * inflate.push(chunk1, false);
    * inflate.push(chunk2, true);  // true -> last chunk
    *
-   * if (inflate.err) { throw new Error(inflate.err); }
+   * if (inflate.err) { throw Error(inflate.err); }
    *
    * console.log(inflate.result);
    * ```
@@ -20732,7 +21407,7 @@ var openpgp = (function (exports) {
       );
 
       if (status !== Z_OK) {
-        throw new Error(msg[status]);
+        throw Error(msg[status]);
       }
 
       this.header = new GZheader();
@@ -20750,7 +21425,7 @@ var openpgp = (function (exports) {
         if (opt.raw) { //In raw mode we need to set the dictionary early
           status = inflateSetDictionary(this.strm, opt.dictionary);
           if (status !== Z_OK) {
-            throw new Error(msg[status]);
+            throw Error(msg[status]);
           }
         }
       }
@@ -21009,7 +21684,7 @@ var openpgp = (function (exports) {
   // input streams //////////////
   /** Returns the next byte, or -1 for EOF. */
   Stream.prototype.readByte = function() {
-    throw new Error("abstract method readByte() not implemented");
+    throw Error("abstract method readByte() not implemented");
   };
   /** Attempts to fill the buffer; returns number of bytes read, or
    *  -1 for EOF. */
@@ -21026,12 +21701,12 @@ var openpgp = (function (exports) {
     return bytesRead;
   };
   Stream.prototype.seek = function(new_pos) {
-    throw new Error("abstract method seek() not implemented");
+    throw Error("abstract method seek() not implemented");
   };
 
   // output streams ///////////
   Stream.prototype.writeByte = function(_byte) {
-    throw new Error("abstract method readByte() not implemented");
+    throw Error("abstract method readByte() not implemented");
   };
   Stream.prototype.write = function(buffer, bufOffset, length) {
     var i;
@@ -21899,290 +22574,6 @@ var openpgp = (function (exports) {
 
   // GPG4Browsers - An OpenPGP implementation in javascript
 
-  function readSimpleLength(bytes) {
-    let len = 0;
-    let offset;
-    const type = bytes[0];
-
-
-    if (type < 192) {
-      [len] = bytes;
-      offset = 1;
-    } else if (type < 255) {
-      len = ((bytes[0] - 192) << 8) + (bytes[1]) + 192;
-      offset = 2;
-    } else if (type === 255) {
-      len = util.readNumber(bytes.subarray(1, 1 + 4));
-      offset = 5;
-    }
-
-    return {
-      len: len,
-      offset: offset
-    };
-  }
-
-  /**
-   * Encodes a given integer of length to the openpgp length specifier to a
-   * string
-   *
-   * @param {Integer} length - The length to encode
-   * @returns {Uint8Array} String with openpgp length representation.
-   */
-  function writeSimpleLength(length) {
-    if (length < 192) {
-      return new Uint8Array([length]);
-    } else if (length > 191 && length < 8384) {
-      /*
-        * let a = (total data packet length) - 192 let bc = two octet
-        * representation of a let d = b + 192
-        */
-      return new Uint8Array([((length - 192) >> 8) + 192, (length - 192) & 0xFF]);
-    }
-    return util.concatUint8Array([new Uint8Array([255]), util.writeNumber(length, 4)]);
-  }
-
-  function writePartialLength(power) {
-    if (power < 0 || power > 30) {
-      throw new Error('Partial Length power must be between 1 and 30');
-    }
-    return new Uint8Array([224 + power]);
-  }
-
-  function writeTag(tag_type) {
-    /* we're only generating v4 packet headers here */
-    return new Uint8Array([0xC0 | tag_type]);
-  }
-
-  /**
-   * Writes a packet header version 4 with the given tag_type and length to a
-   * string
-   *
-   * @param {Integer} tag_type - Tag type
-   * @param {Integer} length - Length of the payload
-   * @returns {String} String of the header.
-   */
-  function writeHeader(tag_type, length) {
-    /* we're only generating v4 packet headers here */
-    return util.concatUint8Array([writeTag(tag_type), writeSimpleLength(length)]);
-  }
-
-  /**
-   * Whether the packet type supports partial lengths per RFC4880
-   * @param {Integer} tag - Tag type
-   * @returns {Boolean} String of the header.
-   */
-  function supportsStreaming(tag) {
-    return [
-      enums.packet.literalData,
-      enums.packet.compressedData,
-      enums.packet.symmetricallyEncryptedData,
-      enums.packet.symEncryptedIntegrityProtectedData,
-      enums.packet.aeadEncryptedData
-    ].includes(tag);
-  }
-
-  /**
-   * Generic static Packet Parser function
-   *
-   * @param {Uint8Array | ReadableStream<Uint8Array>} input - Input stream as string
-   * @param {Function} callback - Function to call with the parsed packet
-   * @returns {Boolean} Returns false if the stream was empty and parsing is done, and true otherwise.
-   */
-  async function readPackets(input, callback) {
-    const reader = getReader(input);
-    let writer;
-    let callbackReturned;
-    try {
-      const peekedBytes = await reader.peekBytes(2);
-      // some sanity checks
-      if (!peekedBytes || peekedBytes.length < 2 || (peekedBytes[0] & 0x80) === 0) {
-        throw new Error('Error during parsing. This message / key probably does not conform to a valid OpenPGP format.');
-      }
-      const headerByte = await reader.readByte();
-      let tag = -1;
-      let format = -1;
-      let packetLength;
-
-      format = 0; // 0 = old format; 1 = new format
-      if ((headerByte & 0x40) !== 0) {
-        format = 1;
-      }
-
-      let packetLengthType;
-      if (format) {
-        // new format header
-        tag = headerByte & 0x3F; // bit 5-0
-      } else {
-        // old format header
-        tag = (headerByte & 0x3F) >> 2; // bit 5-2
-        packetLengthType = headerByte & 0x03; // bit 1-0
-      }
-
-      const packetSupportsStreaming = supportsStreaming(tag);
-      let packet = null;
-      if (packetSupportsStreaming) {
-        if (util.isStream(input) === 'array') {
-          const arrayStream = new ArrayStream();
-          writer = getWriter(arrayStream);
-          packet = arrayStream;
-        } else {
-          const transform = new TransformStream$1();
-          writer = getWriter(transform.writable);
-          packet = transform.readable;
-        }
-        callbackReturned = callback({ tag, packet });
-      } else {
-        packet = [];
-      }
-
-      let wasPartialLength;
-      do {
-        if (!format) {
-          // 4.2.1. Old Format Packet Lengths
-          switch (packetLengthType) {
-            case 0:
-              // The packet has a one-octet length. The header is 2 octets
-              // long.
-              packetLength = await reader.readByte();
-              break;
-            case 1:
-              // The packet has a two-octet length. The header is 3 octets
-              // long.
-              packetLength = (await reader.readByte() << 8) | await reader.readByte();
-              break;
-            case 2:
-              // The packet has a four-octet length. The header is 5
-              // octets long.
-              packetLength = (await reader.readByte() << 24) | (await reader.readByte() << 16) | (await reader.readByte() <<
-                8) | await reader.readByte();
-              break;
-            default:
-              // 3 - The packet is of indeterminate length. The header is 1
-              // octet long, and the implementation must determine how long
-              // the packet is. If the packet is in a file, this means that
-              // the packet extends until the end of the file. In general,
-              // an implementation SHOULD NOT use indeterminate-length
-              // packets except where the end of the data will be clear
-              // from the context, and even then it is better to use a
-              // definite length, or a new format header. The new format
-              // headers described below have a mechanism for precisely
-              // encoding data of indeterminate length.
-              packetLength = Infinity;
-              break;
-          }
-        } else { // 4.2.2. New Format Packet Lengths
-          // 4.2.2.1. One-Octet Lengths
-          const lengthByte = await reader.readByte();
-          wasPartialLength = false;
-          if (lengthByte < 192) {
-            packetLength = lengthByte;
-            // 4.2.2.2. Two-Octet Lengths
-          } else if (lengthByte >= 192 && lengthByte < 224) {
-            packetLength = ((lengthByte - 192) << 8) + (await reader.readByte()) + 192;
-            // 4.2.2.4. Partial Body Lengths
-          } else if (lengthByte > 223 && lengthByte < 255) {
-            packetLength = 1 << (lengthByte & 0x1F);
-            wasPartialLength = true;
-            if (!packetSupportsStreaming) {
-              throw new TypeError('This packet type does not support partial lengths.');
-            }
-            // 4.2.2.3. Five-Octet Lengths
-          } else {
-            packetLength = (await reader.readByte() << 24) | (await reader.readByte() << 16) | (await reader.readByte() <<
-              8) | await reader.readByte();
-          }
-        }
-        if (packetLength > 0) {
-          let bytesRead = 0;
-          while (true) {
-            if (writer) await writer.ready;
-            const { done, value } = await reader.read();
-            if (done) {
-              if (packetLength === Infinity) break;
-              throw new Error('Unexpected end of packet');
-            }
-            const chunk = packetLength === Infinity ? value : value.subarray(0, packetLength - bytesRead);
-            if (writer) await writer.write(chunk);
-            else packet.push(chunk);
-            bytesRead += value.length;
-            if (bytesRead >= packetLength) {
-              reader.unshift(value.subarray(packetLength - bytesRead + value.length));
-              break;
-            }
-          }
-        }
-      } while (wasPartialLength);
-
-      // If this was not a packet that "supports streaming", we peek to check
-      // whether it is the last packet in the message. We peek 2 bytes instead
-      // of 1 because the beginning of this function also peeks 2 bytes, and we
-      // want to cut a `subarray` of the correct length into `web-stream-tools`'
-      // `externalBuffer` as a tiny optimization here.
-      //
-      // If it *was* a streaming packet (i.e. the data packets), we peek at the
-      // entire remainder of the stream, in order to forward errors in the
-      // remainder of the stream to the packet data. (Note that this means we
-      // read/peek at all signature packets before closing the literal data
-      // packet, for example.) This forwards MDC errors to the literal data
-      // stream, for example, so that they don't get lost / forgotten on
-      // decryptedMessage.packets.stream, which we never look at.
-      //
-      // An example of what we do when stream-parsing a message containing
-      // [ one-pass signature packet, literal data packet, signature packet ]:
-      // 1. Read the one-pass signature packet
-      // 2. Peek 2 bytes of the literal data packet
-      // 3. Parse the one-pass signature packet
-      //
-      // 4. Read the literal data packet, simultaneously stream-parsing it
-      // 5. Peek until the end of the message
-      // 6. Finish parsing the literal data packet
-      //
-      // 7. Read the signature packet again (we already peeked at it in step 5)
-      // 8. Peek at the end of the stream again (`peekBytes` returns undefined)
-      // 9. Parse the signature packet
-      //
-      // Note that this means that if there's an error in the very end of the
-      // stream, such as an MDC error, we throw in step 5 instead of in step 8
-      // (or never), which is the point of this exercise.
-      const nextPacket = await reader.peekBytes(packetSupportsStreaming ? Infinity : 2);
-      if (writer) {
-        await writer.ready;
-        await writer.close();
-      } else {
-        packet = util.concatUint8Array(packet);
-        await callback({ tag, packet });
-      }
-      return !nextPacket || !nextPacket.length;
-    } catch (e) {
-      if (writer) {
-        await writer.abort(e);
-        return true;
-      } else {
-        throw e;
-      }
-    } finally {
-      if (writer) {
-        await callbackReturned;
-      }
-      reader.releaseLock();
-    }
-  }
-
-  class UnsupportedError extends Error {
-    constructor(...params) {
-      super(...params);
-
-      if (Error.captureStackTrace) {
-        Error.captureStackTrace(this, UnsupportedError);
-      }
-
-      this.name = 'UnsupportedError';
-    }
-  }
-
-  // GPG4Browsers - An OpenPGP implementation in javascript
-
   // Symbol to store cryptographic validity of the signature, to avoid recomputing multiple times on verification.
   const verified = Symbol('verified');
 
@@ -22281,7 +22672,7 @@ var openpgp = (function (exports) {
       // hashed subpackets
       i += this.readSubPackets(bytes.subarray(i, bytes.length), true);
       if (!this.created) {
-        throw new Error('Missing signature creation time subpacket.');
+        throw Error('Missing signature creation time subpacket.');
       }
 
       // A V4 signature hashes the packet body
@@ -22348,6 +22739,11 @@ var openpgp = (function (exports) {
       // Add hashed subpackets
       arr.push(this.writeHashedSubPackets());
 
+      // Remove unhashed subpackets, in case some allowed unhashed
+      // subpackets existed, in order not to duplicate them (in both
+      // the hashed and unhashed subpackets) when re-signing.
+      this.unhashedSubpackets = [];
+
       this.signatureData = util.concat(arr);
 
       const toHash = this.toHash(this.signatureType, data, detached);
@@ -22379,93 +22775,107 @@ var openpgp = (function (exports) {
       const arr = [];
       let bytes;
       if (this.created === null) {
-        throw new Error('Missing signature creation time');
+        throw Error('Missing signature creation time');
       }
-      arr.push(writeSubPacket(sub.signatureCreationTime, util.writeDate(this.created)));
+      arr.push(writeSubPacket(sub.signatureCreationTime, true, util.writeDate(this.created)));
       if (this.signatureExpirationTime !== null) {
-        arr.push(writeSubPacket(sub.signatureExpirationTime, util.writeNumber(this.signatureExpirationTime, 4)));
+        arr.push(writeSubPacket(sub.signatureExpirationTime, true, util.writeNumber(this.signatureExpirationTime, 4)));
       }
       if (this.exportable !== null) {
-        arr.push(writeSubPacket(sub.exportableCertification, new Uint8Array([this.exportable ? 1 : 0])));
+        arr.push(writeSubPacket(sub.exportableCertification, true, new Uint8Array([this.exportable ? 1 : 0])));
       }
       if (this.trustLevel !== null) {
         bytes = new Uint8Array([this.trustLevel, this.trustAmount]);
-        arr.push(writeSubPacket(sub.trustSignature, bytes));
+        arr.push(writeSubPacket(sub.trustSignature, true, bytes));
       }
       if (this.regularExpression !== null) {
-        arr.push(writeSubPacket(sub.regularExpression, this.regularExpression));
+        arr.push(writeSubPacket(sub.regularExpression, true, this.regularExpression));
       }
       if (this.revocable !== null) {
-        arr.push(writeSubPacket(sub.revocable, new Uint8Array([this.revocable ? 1 : 0])));
+        arr.push(writeSubPacket(sub.revocable, true, new Uint8Array([this.revocable ? 1 : 0])));
       }
       if (this.keyExpirationTime !== null) {
-        arr.push(writeSubPacket(sub.keyExpirationTime, util.writeNumber(this.keyExpirationTime, 4)));
+        arr.push(writeSubPacket(sub.keyExpirationTime, true, util.writeNumber(this.keyExpirationTime, 4)));
       }
       if (this.preferredSymmetricAlgorithms !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.preferredSymmetricAlgorithms));
-        arr.push(writeSubPacket(sub.preferredSymmetricAlgorithms, bytes));
+        arr.push(writeSubPacket(sub.preferredSymmetricAlgorithms, false, bytes));
       }
       if (this.revocationKeyClass !== null) {
         bytes = new Uint8Array([this.revocationKeyClass, this.revocationKeyAlgorithm]);
         bytes = util.concat([bytes, this.revocationKeyFingerprint]);
-        arr.push(writeSubPacket(sub.revocationKey, bytes));
+        arr.push(writeSubPacket(sub.revocationKey, false, bytes));
       }
-      this.rawNotations.forEach(([{ name, value, humanReadable }]) => {
+      if (!this.issuerKeyID.isNull() && this.issuerKeyVersion !== 5) {
+        // If the version of [the] key is greater than 4, this subpacket
+        // MUST NOT be included in the signature.
+        arr.push(writeSubPacket(sub.issuer, true, this.issuerKeyID.write()));
+      }
+      this.rawNotations.forEach(({ name, value, humanReadable, critical }) => {
         bytes = [new Uint8Array([humanReadable ? 0x80 : 0, 0, 0, 0])];
+        const encodedName = util.encodeUTF8(name);
         // 2 octets of name length
-        bytes.push(util.writeNumber(name.length, 2));
+        bytes.push(util.writeNumber(encodedName.length, 2));
         // 2 octets of value length
         bytes.push(util.writeNumber(value.length, 2));
-        bytes.push(util.stringToUint8Array(name));
+        bytes.push(encodedName);
         bytes.push(value);
         bytes = util.concat(bytes);
-        arr.push(writeSubPacket(sub.notationData, bytes));
+        arr.push(writeSubPacket(sub.notationData, critical, bytes));
       });
       if (this.preferredHashAlgorithms !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.preferredHashAlgorithms));
-        arr.push(writeSubPacket(sub.preferredHashAlgorithms, bytes));
+        arr.push(writeSubPacket(sub.preferredHashAlgorithms, false, bytes));
       }
       if (this.preferredCompressionAlgorithms !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.preferredCompressionAlgorithms));
-        arr.push(writeSubPacket(sub.preferredCompressionAlgorithms, bytes));
+        arr.push(writeSubPacket(sub.preferredCompressionAlgorithms, false, bytes));
       }
       if (this.keyServerPreferences !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.keyServerPreferences));
-        arr.push(writeSubPacket(sub.keyServerPreferences, bytes));
+        arr.push(writeSubPacket(sub.keyServerPreferences, false, bytes));
       }
       if (this.preferredKeyServer !== null) {
-        arr.push(writeSubPacket(sub.preferredKeyServer, util.stringToUint8Array(this.preferredKeyServer)));
+        arr.push(writeSubPacket(sub.preferredKeyServer, false, util.encodeUTF8(this.preferredKeyServer)));
       }
       if (this.isPrimaryUserID !== null) {
-        arr.push(writeSubPacket(sub.primaryUserID, new Uint8Array([this.isPrimaryUserID ? 1 : 0])));
+        arr.push(writeSubPacket(sub.primaryUserID, false, new Uint8Array([this.isPrimaryUserID ? 1 : 0])));
       }
       if (this.policyURI !== null) {
-        arr.push(writeSubPacket(sub.policyURI, util.stringToUint8Array(this.policyURI)));
+        arr.push(writeSubPacket(sub.policyURI, false, util.encodeUTF8(this.policyURI)));
       }
       if (this.keyFlags !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.keyFlags));
-        arr.push(writeSubPacket(sub.keyFlags, bytes));
+        arr.push(writeSubPacket(sub.keyFlags, true, bytes));
       }
       if (this.signersUserID !== null) {
-        arr.push(writeSubPacket(sub.signersUserID, util.stringToUint8Array(this.signersUserID)));
+        arr.push(writeSubPacket(sub.signersUserID, false, util.encodeUTF8(this.signersUserID)));
       }
       if (this.reasonForRevocationFlag !== null) {
         bytes = util.stringToUint8Array(String.fromCharCode(this.reasonForRevocationFlag) + this.reasonForRevocationString);
-        arr.push(writeSubPacket(sub.reasonForRevocation, bytes));
+        arr.push(writeSubPacket(sub.reasonForRevocation, true, bytes));
       }
       if (this.features !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.features));
-        arr.push(writeSubPacket(sub.features, bytes));
+        arr.push(writeSubPacket(sub.features, false, bytes));
       }
       if (this.signatureTargetPublicKeyAlgorithm !== null) {
         bytes = [new Uint8Array([this.signatureTargetPublicKeyAlgorithm, this.signatureTargetHashAlgorithm])];
         bytes.push(util.stringToUint8Array(this.signatureTargetHash));
         bytes = util.concat(bytes);
-        arr.push(writeSubPacket(sub.signatureTarget, bytes));
+        arr.push(writeSubPacket(sub.signatureTarget, true, bytes));
+      }
+      if (this.embeddedSignature !== null) {
+        arr.push(writeSubPacket(sub.embeddedSignature, true, this.embeddedSignature.write()));
+      }
+      if (this.issuerFingerprint !== null) {
+        bytes = [new Uint8Array([this.issuerKeyVersion]), this.issuerFingerprint];
+        bytes = util.concat(bytes);
+        arr.push(writeSubPacket(sub.issuerFingerprint, this.version === 5, bytes));
       }
       if (this.preferredAEADAlgorithms !== null) {
         bytes = util.stringToUint8Array(util.uint8ArrayToString(this.preferredAEADAlgorithms));
-        arr.push(writeSubPacket(sub.preferredAEADAlgorithms, bytes));
+        arr.push(writeSubPacket(sub.preferredAEADAlgorithms, false, bytes));
       }
 
       const result = util.concat(arr);
@@ -22475,26 +22885,11 @@ var openpgp = (function (exports) {
     }
 
     /**
-     * Creates Uint8Array of bytes of Issuer and Embedded Signature subpackets
+     * Creates an Uint8Array containing the unhashed subpackets
      * @returns {Uint8Array} Subpacket data.
      */
     writeUnhashedSubPackets() {
-      const sub = enums.signatureSubpacket;
       const arr = [];
-      let bytes;
-      if (!this.issuerKeyID.isNull() && this.issuerKeyVersion !== 5) {
-        // If the version of [the] key is greater than 4, this subpacket
-        // MUST NOT be included in the signature.
-        arr.push(writeSubPacket(sub.issuer, this.issuerKeyID.write()));
-      }
-      if (this.embeddedSignature !== null) {
-        arr.push(writeSubPacket(sub.embeddedSignature, this.embeddedSignature.write()));
-      }
-      if (this.issuerFingerprint !== null) {
-        bytes = [new Uint8Array([this.issuerKeyVersion]), this.issuerFingerprint];
-        bytes = util.concat(bytes);
-        arr.push(writeSubPacket(sub.issuerFingerprint, bytes));
-      }
       this.unhashedSubpackets.forEach(data => {
         arr.push(writeSimpleLength(data.length));
         arr.push(data);
@@ -22511,12 +22906,14 @@ var openpgp = (function (exports) {
       let mypos = 0;
 
       // The leftmost bit denotes a "critical" packet
-      const critical = bytes[mypos] & 0x80;
+      const critical = !!(bytes[mypos] & 0x80);
       const type = bytes[mypos] & 0x7F;
 
-      if (!hashed && !allowedUnhashedSubpackets.has(type)) {
+      if (!hashed) {
         this.unhashedSubpackets.push(bytes.subarray(mypos, bytes.length));
-        return;
+        if (!allowedUnhashedSubpackets.has(type)) {
+          return;
+        }
       }
 
       mypos++;
@@ -22592,13 +22989,13 @@ var openpgp = (function (exports) {
           const n = util.readNumber(bytes.subarray(mypos, mypos + 2));
           mypos += 2;
 
-          const name = util.uint8ArrayToString(bytes.subarray(mypos, mypos + m));
+          const name = util.decodeUTF8(bytes.subarray(mypos, mypos + m));
           const value = bytes.subarray(mypos + m, mypos + m + n);
 
           this.rawNotations.push({ name, humanReadable, value, critical });
 
           if (humanReadable) {
-            this.notations[name] = util.uint8ArrayToString(value);
+            this.notations[name] = util.decodeUTF8(value);
           }
           break;
         }
@@ -22616,7 +23013,7 @@ var openpgp = (function (exports) {
           break;
         case enums.signatureSubpacket.preferredKeyServer:
           // Preferred Key Server
-          this.preferredKeyServer = util.uint8ArrayToString(bytes.subarray(mypos, bytes.length));
+          this.preferredKeyServer = util.decodeUTF8(bytes.subarray(mypos, bytes.length));
           break;
         case enums.signatureSubpacket.primaryUserID:
           // Primary User ID
@@ -22624,7 +23021,7 @@ var openpgp = (function (exports) {
           break;
         case enums.signatureSubpacket.policyURI:
           // Policy URI
-          this.policyURI = util.uint8ArrayToString(bytes.subarray(mypos, bytes.length));
+          this.policyURI = util.decodeUTF8(bytes.subarray(mypos, bytes.length));
           break;
         case enums.signatureSubpacket.keyFlags:
           // Key Flags
@@ -22632,12 +23029,12 @@ var openpgp = (function (exports) {
           break;
         case enums.signatureSubpacket.signersUserID:
           // Signer's User ID
-          this.signersUserID = util.uint8ArrayToString(bytes.subarray(mypos, bytes.length));
+          this.signersUserID = util.decodeUTF8(bytes.subarray(mypos, bytes.length));
           break;
         case enums.signatureSubpacket.reasonForRevocation:
           // Reason for Revocation
           this.reasonForRevocationFlag = bytes[mypos++];
-          this.reasonForRevocationString = util.uint8ArrayToString(bytes.subarray(mypos, bytes.length));
+          this.reasonForRevocationString = util.decodeUTF8(bytes.subarray(mypos, bytes.length));
           break;
         case enums.signatureSubpacket.features:
           // Features
@@ -22674,7 +23071,7 @@ var openpgp = (function (exports) {
           this.preferredAEADAlgorithms = [...bytes.subarray(mypos, bytes.length)];
           break;
         default: {
-          const err = new Error(`Unknown signature subpacket type ${type}`);
+          const err = Error(`Unknown signature subpacket type ${type}`);
           if (critical) {
             throw err;
           } else {
@@ -22737,7 +23134,7 @@ var openpgp = (function (exports) {
             tag = 0xD1;
             packet = data.userAttribute;
           } else {
-            throw new Error('Either a userID or userAttribute packet needs to be ' +
+            throw Error('Either a userID or userAttribute packet needs to be ' +
               'supplied for certification.');
           }
 
@@ -22757,7 +23154,7 @@ var openpgp = (function (exports) {
 
         case t.key:
           if (data.key === undefined) {
-            throw new Error('Key packet is required for this signature.');
+            throw Error('Key packet is required for this signature.');
           }
           return data.key.writeForHash(this.version);
 
@@ -22766,9 +23163,9 @@ var openpgp = (function (exports) {
         case t.timestamp:
           return new Uint8Array(0);
         case t.thirdParty:
-          throw new Error('Not implemented');
+          throw Error('Not implemented');
         default:
-          throw new Error('Unknown signature type.');
+          throw Error('Unknown signature type.');
       }
     }
 
@@ -22819,12 +23216,12 @@ var openpgp = (function (exports) {
      * @throws {Error} if signature validation failed
      * @async
      */
-    async verify(key, signatureType, data, date = new Date(), detached = false, config = defaultConfig) {
+    async verify(key, signatureType, data, date = new Date(), detached = false, config$1 = config) {
       if (!this.issuerKeyID.equals(key.getKeyID())) {
-        throw new Error('Signature was not issued by the given public key');
+        throw Error('Signature was not issued by the given public key');
       }
       if (this.publicKeyAlgorithm !== key.algorithm) {
-        throw new Error('Public key algorithm used to sign signature does not match issuer key algorithm.');
+        throw Error('Public key algorithm used to sign signature does not match issuer key algorithm.');
       }
 
       const isMessageSignature = signatureType === enums.signature.binary || signatureType === enums.signature.text;
@@ -22843,7 +23240,7 @@ var openpgp = (function (exports) {
         hash = await readToEnd(hash);
         if (this.signedHashValue[0] !== hash[0] ||
             this.signedHashValue[1] !== hash[1]) {
-          throw new Error('Signed digest did not match');
+          throw Error('Signed digest did not match');
         }
 
         this.params = await this.params;
@@ -22854,31 +23251,31 @@ var openpgp = (function (exports) {
         );
 
         if (!this[verified]) {
-          throw new Error('Signature verification failed');
+          throw Error('Signature verification failed');
         }
       }
 
       const normDate = util.normalizeDate(date);
       if (normDate && this.created > normDate) {
-        throw new Error('Signature creation time is in the future');
+        throw Error('Signature creation time is in the future');
       }
       if (normDate && normDate >= this.getExpirationTime()) {
-        throw new Error('Signature is expired');
+        throw Error('Signature is expired');
       }
-      if (config.rejectHashAlgorithms.has(this.hashAlgorithm)) {
-        throw new Error('Insecure hash algorithm: ' + enums.read(enums.hash, this.hashAlgorithm).toUpperCase());
+      if (config$1.rejectHashAlgorithms.has(this.hashAlgorithm)) {
+        throw Error('Insecure hash algorithm: ' + enums.read(enums.hash, this.hashAlgorithm).toUpperCase());
       }
-      if (config.rejectMessageHashAlgorithms.has(this.hashAlgorithm) &&
+      if (config$1.rejectMessageHashAlgorithms.has(this.hashAlgorithm) &&
         [enums.signature.binary, enums.signature.text].includes(this.signatureType)) {
-        throw new Error('Insecure message hash algorithm: ' + enums.read(enums.hash, this.hashAlgorithm).toUpperCase());
+        throw Error('Insecure message hash algorithm: ' + enums.read(enums.hash, this.hashAlgorithm).toUpperCase());
       }
       this.rawNotations.forEach(({ name, critical }) => {
-        if (critical && (config.knownNotations.indexOf(name) < 0)) {
-          throw new Error(`Unknown critical notation: ${name}`);
+        if (critical && (config$1.knownNotations.indexOf(name) < 0)) {
+          throw Error(`Unknown critical notation: ${name}`);
         }
       });
       if (this.revocationKeyClass !== null) {
-        throw new Error('This key is intended to be revoked with an authorized key, which OpenPGP.js does not support.');
+        throw Error('This key is intended to be revoked with an authorized key, which OpenPGP.js does not support.');
       }
     }
 
@@ -22905,18 +23302,19 @@ var openpgp = (function (exports) {
   }
 
   /**
-   * Creates a string representation of a sub signature packet
+   * Creates a Uint8Array representation of a sub signature packet
    * @see {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.1|RFC4880 5.2.3.1}
    * @see {@link https://tools.ietf.org/html/rfc4880#section-5.2.3.2|RFC4880 5.2.3.2}
    * @param {Integer} type - Subpacket signature type.
+   * @param {Boolean} critical - Whether the subpacket should be critical.
    * @param {String} data - Data to be included
-   * @returns {String} A string-representation of a sub signature packet.
+   * @returns {Uint8Array} The signature subpacket.
    * @private
    */
-  function writeSubPacket(type, data) {
+  function writeSubPacket(type, critical, data) {
     const arr = [];
     arr.push(writeSimpleLength(data.length + 1));
-    arr.push(new Uint8Array([type]));
+    arr.push(new Uint8Array([(critical ? 0x80 : 0) | type]));
     arr.push(data);
     return util.concat(arr);
   }
@@ -23028,7 +23426,7 @@ var openpgp = (function (exports) {
     async verify() {
       const correspondingSig = await this.correspondingSig;
       if (!correspondingSig || correspondingSig.constructor.tag !== enums.packet.signature) {
-        throw new Error('Corresponding signature packet missing');
+        throw Error('Corresponding signature packet missing');
       }
       if (
         correspondingSig.signatureType !== this.signatureType ||
@@ -23036,7 +23434,7 @@ var openpgp = (function (exports) {
         correspondingSig.publicKeyAlgorithm !== this.publicKeyAlgorithm ||
         !correspondingSig.issuerKeyID.equals(this.issuerKeyID)
       ) {
-        throw new Error('Corresponding signature packet does not match one-pass signature packet');
+        throw Error('Corresponding signature packet does not match one-pass signature packet');
       }
       correspondingSig.hashed = this.hashed;
       return correspondingSig.verify.apply(correspondingSig, arguments);
@@ -23064,7 +23462,7 @@ var openpgp = (function (exports) {
       } catch (e) {
         throw new UnsupportedError(`Unknown packet type with tag: ${tag}`);
       }
-      throw new Error(`Packet not allowed in this context: ${packetType}`);
+      throw Error(`Packet not allowed in this context: ${packetType}`);
     }
     return new allowedPackets[tag]();
   }
@@ -23086,9 +23484,9 @@ var openpgp = (function (exports) {
      * @throws on parsing errors
      * @async
      */
-    static async fromBinary(bytes, allowedPackets, config = defaultConfig) {
+    static async fromBinary(bytes, allowedPackets, config$1 = config) {
       const packets = new PacketList();
-      await packets.read(bytes, allowedPackets, config);
+      await packets.read(bytes, allowedPackets, config$1);
       return packets;
     }
 
@@ -23100,7 +23498,10 @@ var openpgp = (function (exports) {
      * @throws on parsing errors
      * @async
      */
-    async read(bytes, allowedPackets, config = defaultConfig) {
+    async read(bytes, allowedPackets, config$1 = config) {
+      if (config$1.additionalAllowedPackets.length) {
+        allowedPackets = { ...allowedPackets, ...util.constructAllowedPackets(config$1.additionalAllowedPackets) };
+      }
       this.stream = transformPair(bytes, async (readable, writable) => {
         const writer = getWriter(writable);
         try {
@@ -23117,16 +23518,19 @@ var openpgp = (function (exports) {
                 const packet = newPacketFromTag(parsed.tag, allowedPackets);
                 packet.packets = new PacketList();
                 packet.fromStream = util.isStream(parsed.packet);
-                await packet.read(parsed.packet, config);
+                await packet.read(parsed.packet, config$1);
                 await writer.write(packet);
               } catch (e) {
-                const throwUnsupportedError = !config.ignoreUnsupportedPackets && e instanceof UnsupportedError;
-                const throwMalformedError = !config.ignoreMalformedPackets && !(e instanceof UnsupportedError);
+                const throwUnsupportedError = !config$1.ignoreUnsupportedPackets && e instanceof UnsupportedError;
+                const throwMalformedError = !config$1.ignoreMalformedPackets && !(e instanceof UnsupportedError);
                 if (throwUnsupportedError || throwMalformedError || supportsStreaming(parsed.tag)) {
                   // The packets that support streaming are the ones that contain message data.
                   // Those are also the ones we want to be more strict about and throw on parse errors
                   // (since we likely cannot process the message without these packets anyway).
                   await writer.abort(e);
+                } else {
+                  const unparsedPacket = new UnparseablePacket(parsed.tag, parsed.packet);
+                  await writer.write(unparsedPacket);
                 }
                 console.error(e);
               }
@@ -23167,12 +23571,13 @@ var openpgp = (function (exports) {
       const arr = [];
 
       for (let i = 0; i < this.length; i++) {
+        const tag = this[i] instanceof UnparseablePacket ? this[i].tag : this[i].constructor.tag;
         const packetbytes = this[i].write();
         if (util.isStream(packetbytes) && supportsStreaming(this[i].constructor.tag)) {
           let buffer = [];
           let bufferLength = 0;
           const minLength = 512;
-          arr.push(writeTag(this[i].constructor.tag));
+          arr.push(writeTag(tag));
           arr.push(transform(packetbytes, value => {
             buffer.push(value);
             bufferLength += value.length;
@@ -23190,9 +23595,9 @@ var openpgp = (function (exports) {
             let length = 0;
             arr.push(transform(clone(packetbytes), value => {
               length += value.length;
-            }, () => writeHeader(this[i].constructor.tag, length)));
+            }, () => writeHeader(tag, length)));
           } else {
-            arr.push(writeHeader(this[i].constructor.tag, packetbytes.length));
+            arr.push(writeHeader(tag, packetbytes.length));
           }
           arr.push(packetbytes);
         }
@@ -23274,7 +23679,7 @@ var openpgp = (function (exports) {
     /**
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(config = defaultConfig) {
+    constructor(config$1 = config) {
       /**
        * List of packets
        * @type {PacketList}
@@ -23284,7 +23689,7 @@ var openpgp = (function (exports) {
        * Compression algorithm
        * @type {enums.compression}
        */
-      this.algorithm = config.preferredCompressionAlgorithm;
+      this.algorithm = config$1.preferredCompressionAlgorithm;
 
       /**
        * Compressed packet data
@@ -23295,7 +23700,7 @@ var openpgp = (function (exports) {
       /**
        * zip/zlib compression level, between 1 and 9
        */
-      this.deflateLevel = config.deflateLevel;
+      this.deflateLevel = config$1.deflateLevel;
     }
 
     /**
@@ -23303,7 +23708,7 @@ var openpgp = (function (exports) {
      * @param {Uint8Array | ReadableStream<Uint8Array>} bytes - Payload of a tag 8 packet
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    async read(bytes, config = defaultConfig) {
+    async read(bytes, config$1 = config) {
       await parse(bytes, async reader => {
 
         // One octet that gives the algorithm used to compress the packet.
@@ -23312,7 +23717,7 @@ var openpgp = (function (exports) {
         // Compressed data, which makes up the remainder of the packet.
         this.compressed = reader.remainder();
 
-        await this.decompress(config);
+        await this.decompress(config$1);
       });
     }
 
@@ -23335,14 +23740,14 @@ var openpgp = (function (exports) {
      * read by read_packet
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    async decompress(config = defaultConfig) {
+    async decompress(config$1 = config) {
       const compressionName = enums.read(enums.compression, this.algorithm);
       const decompressionFn = decompress_fns[compressionName];
       if (!decompressionFn) {
-        throw new Error(`${compressionName} decompression not supported`);
+        throw Error(`${compressionName} decompression not supported`);
       }
 
-      this.packets = await PacketList.fromBinary(decompressionFn(this.compressed), allowedPackets$5, config);
+      this.packets = await PacketList.fromBinary(decompressionFn(this.compressed), allowedPackets$5, config$1);
     }
 
     /**
@@ -23352,7 +23757,7 @@ var openpgp = (function (exports) {
       const compressionName = enums.read(enums.compression, this.algorithm);
       const compressionFn = compress_fns[compressionName];
       if (!compressionFn) {
-        throw new Error(`${compressionName} compression not supported`);
+        throw Error(`${compressionName} compression not supported`);
       }
 
       this.compressed = compressionFn(this.packets.write(), this.deflateLevel);
@@ -23466,7 +23871,7 @@ var openpgp = (function (exports) {
      * @throws {Error} on encryption failure
      * @async
      */
-    async encrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async encrypt(sessionKeyAlgorithm, key, config$1 = config) {
       const { blockSize } = mod.getCipher(sessionKeyAlgorithm);
 
       let bytes = this.packets.write();
@@ -23478,7 +23883,7 @@ var openpgp = (function (exports) {
       const hash = await mod.hash.sha1(passiveClone(tohash));
       const plaintext = util.concat([tohash, hash]);
 
-      this.encrypted = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, plaintext, new Uint8Array(blockSize), config);
+      this.encrypted = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, plaintext, new Uint8Array(blockSize), config$1);
       return true;
     }
 
@@ -23491,7 +23896,7 @@ var openpgp = (function (exports) {
      * @throws {Error} on decryption failure
      * @async
      */
-    async decrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async decrypt(sessionKeyAlgorithm, key, config$1 = config) {
       const { blockSize } = mod.getCipher(sessionKeyAlgorithm);
       let encrypted = clone(this.encrypted);
       if (isArrayStream(encrypted)) encrypted = await readToEnd(encrypted);
@@ -23506,17 +23911,17 @@ var openpgp = (function (exports) {
         readToEnd(realHash)
       ]).then(([hash, mdc]) => {
         if (!util.equalsUint8Array(hash, mdc)) {
-          throw new Error('Modification detected.');
+          throw Error('Modification detected.');
         }
         return new Uint8Array();
       });
       const bytes = slice(tohash, blockSize + 2); // Remove random prefix
       let packetbytes = slice(bytes, 0, -2); // Remove MDC packet
       packetbytes = concat([packetbytes, fromAsync(() => verifyHash)]);
-      if (!util.isStream(encrypted) || !config.allowUnauthenticatedStream) {
+      if (!util.isStream(encrypted) || !config$1.allowUnauthenticatedStream) {
         packetbytes = await readToEnd(packetbytes);
       }
-      this.packets = await PacketList.fromBinary(packetbytes, allowedPackets$4, config);
+      this.packets = await PacketList.fromBinary(packetbytes, allowedPackets$4, config$1);
       return true;
     }
   }
@@ -23594,11 +23999,11 @@ var openpgp = (function (exports) {
      * @throws {Error} if decryption was not successful
      * @async
      */
-    async decrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async decrypt(sessionKeyAlgorithm, key, config$1 = config) {
       this.packets = await PacketList.fromBinary(
         await this.crypt('decrypt', key, clone(this.encrypted)),
         allowedPackets$3,
-        config
+        config$1
       );
     }
 
@@ -23610,12 +24015,12 @@ var openpgp = (function (exports) {
      * @throws {Error} if encryption was not successful
      * @async
      */
-    async encrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async encrypt(sessionKeyAlgorithm, key, config$1 = config) {
       this.cipherAlgorithm = sessionKeyAlgorithm;
 
       const { ivLength } = mod.getAEADMode(this.aeadAlgorithm);
-      this.iv = await mod.random.getRandomBytes(ivLength); // generate new random IV
-      this.chunkSizeByte = config.aeadChunkSizeByte;
+      this.iv = mod.random.getRandomBytes(ivLength); // generate new random IV
+      this.chunkSizeByte = config$1.aeadChunkSizeByte;
       const data = this.packets.write();
       this.encrypted = await this.crypt('encrypt', key, data);
     }
@@ -23748,13 +24153,17 @@ var openpgp = (function (exports) {
      * @param {Uint8Array} bytes - Payload of a tag 1 packet
      */
     read(bytes) {
-      this.version = bytes[0];
+      let i = 0;
+      this.version = bytes[i++];
       if (this.version !== VERSION) {
         throw new UnsupportedError(`Version ${this.version} of the PKESK packet is unsupported.`);
       }
-      this.publicKeyID.read(bytes.subarray(1, bytes.length));
-      this.publicKeyAlgorithm = bytes[9];
-      this.encrypted = mod.parseEncSessionKeyParams(this.publicKeyAlgorithm, bytes.subarray(10));
+      i += this.publicKeyID.read(bytes.subarray(i));
+      this.publicKeyAlgorithm = bytes[i++];
+      this.encrypted = mod.parseEncSessionKeyParams(this.publicKeyAlgorithm, bytes.subarray(i), this.version);
+      if (this.publicKeyAlgorithm === enums.publicKey.x25519) {
+        this.sessionKeyAlgorithm = enums.write(enums.symmetric, this.encrypted.C.algorithm);
+      }
     }
 
     /**
@@ -23780,14 +24189,10 @@ var openpgp = (function (exports) {
      * @async
      */
     async encrypt(key) {
-      const data = util.concatUint8Array([
-        new Uint8Array([enums.write(enums.symmetric, this.sessionKeyAlgorithm)]),
-        this.sessionKey,
-        util.writeChecksum(this.sessionKey)
-      ]);
       const algo = enums.write(enums.publicKey, this.publicKeyAlgorithm);
+      const encoded = encodeSessionKey(this.version, algo, this.sessionKeyAlgorithm, this.sessionKey);
       this.encrypted = await mod.publicKeyEncrypt(
-        algo, key.publicParams, data, key.getFingerprintBytes());
+        algo, this.sessionKeyAlgorithm, key.publicParams, encoded, key.getFingerprintBytes());
     }
 
     /**
@@ -23801,37 +24206,87 @@ var openpgp = (function (exports) {
     async decrypt(key, randomSessionKey) {
       // check that session key algo matches the secret key algo
       if (this.publicKeyAlgorithm !== key.algorithm) {
-        throw new Error('Decryption error');
+        throw Error('Decryption error');
       }
 
-      const randomPayload = randomSessionKey ? util.concatUint8Array([
-        new Uint8Array([randomSessionKey.sessionKeyAlgorithm]),
-        randomSessionKey.sessionKey,
-        util.writeChecksum(randomSessionKey.sessionKey)
-      ]) : null;
-      const decoded = await mod.publicKeyDecrypt(this.publicKeyAlgorithm, key.publicParams, key.privateParams, this.encrypted, key.getFingerprintBytes(), randomPayload);
-      const symmetricAlgoByte = decoded[0];
-      const sessionKey = decoded.subarray(1, decoded.length - 2);
-      const checksum = decoded.subarray(decoded.length - 2);
-      const computedChecksum = util.writeChecksum(sessionKey);
-      const isValidChecksum = computedChecksum[0] === checksum[0] & computedChecksum[1] === checksum[1];
+      const randomPayload = randomSessionKey ?
+        encodeSessionKey(this.version, this.publicKeyAlgorithm, randomSessionKey.sessionKeyAlgorithm, randomSessionKey.sessionKey) :
+        null;
+      const decryptedData = await mod.publicKeyDecrypt(this.publicKeyAlgorithm, key.publicParams, key.privateParams, this.encrypted, key.getFingerprintBytes(), randomPayload);
 
-      if (randomSessionKey) {
-        // We must not leak info about the validity of the decrypted checksum or cipher algo.
-        // The decrypted session key must be of the same algo and size as the random session key, otherwise we discard it and use the random data.
-        const isValidPayload = isValidChecksum & symmetricAlgoByte === randomSessionKey.sessionKeyAlgorithm & sessionKey.length === randomSessionKey.sessionKey.length;
-        this.sessionKeyAlgorithm = util.selectUint8(isValidPayload, symmetricAlgoByte, randomSessionKey.sessionKeyAlgorithm);
-        this.sessionKey = util.selectUint8Array(isValidPayload, sessionKey, randomSessionKey.sessionKey);
+      const { sessionKey, sessionKeyAlgorithm } = decodeSessionKey(this.version, this.publicKeyAlgorithm, decryptedData, randomSessionKey);
 
-      } else {
-        const isValidPayload = isValidChecksum && enums.read(enums.symmetric, symmetricAlgoByte);
-        if (isValidPayload) {
-          this.sessionKey = sessionKey;
-          this.sessionKeyAlgorithm = symmetricAlgoByte;
+      // v3 Montgomery curves have cleartext cipher algo
+      if (this.publicKeyAlgorithm !== enums.publicKey.x25519) {
+        this.sessionKeyAlgorithm = sessionKeyAlgorithm;
+      }
+      this.sessionKey = sessionKey;
+    }
+  }
+
+
+  function encodeSessionKey(version, keyAlgo, cipherAlgo, sessionKeyData) {
+    switch (keyAlgo) {
+      case enums.publicKey.rsaEncrypt:
+      case enums.publicKey.rsaEncryptSign:
+      case enums.publicKey.elgamal:
+      case enums.publicKey.ecdh: {
+        // add checksum
+        return util.concatUint8Array([
+          new Uint8Array([cipherAlgo]),
+          sessionKeyData,
+          util.writeChecksum(sessionKeyData.subarray(sessionKeyData.length % 8))
+        ]);
+      }
+      case enums.publicKey.x25519:
+        return sessionKeyData;
+      default:
+        throw Error('Unsupported public key algorithm');
+    }
+  }
+
+
+  function decodeSessionKey(version, keyAlgo, decryptedData, randomSessionKey) {
+    switch (keyAlgo) {
+      case enums.publicKey.rsaEncrypt:
+      case enums.publicKey.rsaEncryptSign:
+      case enums.publicKey.elgamal:
+      case enums.publicKey.ecdh: {
+        // verify checksum in constant time
+        const result = decryptedData.subarray(0, decryptedData.length - 2);
+        const checksum = decryptedData.subarray(decryptedData.length - 2);
+        const computedChecksum = util.writeChecksum(result.subarray(result.length % 8));
+        const isValidChecksum = computedChecksum[0] === checksum[0] & computedChecksum[1] === checksum[1];
+        const decryptedSessionKey = { sessionKeyAlgorithm: result[0], sessionKey: result.subarray(1) };
+        if (randomSessionKey) {
+          // We must not leak info about the validity of the decrypted checksum or cipher algo.
+          // The decrypted session key must be of the same algo and size as the random session key, otherwise we discard it and use the random data.
+          const isValidPayload = isValidChecksum &
+            decryptedSessionKey.sessionKeyAlgorithm === randomSessionKey.sessionKeyAlgorithm &
+            decryptedSessionKey.sessionKey.length === randomSessionKey.sessionKey.length;
+          return {
+            sessionKey: util.selectUint8Array(isValidPayload, decryptedSessionKey.sessionKey, randomSessionKey.sessionKey),
+            sessionKeyAlgorithm: util.selectUint8(
+              isValidPayload,
+              decryptedSessionKey.sessionKeyAlgorithm,
+              randomSessionKey.sessionKeyAlgorithm
+            )
+          };
         } else {
-          throw new Error('Decryption error');
+          const isValidPayload = isValidChecksum && enums.read(enums.symmetric, decryptedSessionKey.sessionKeyAlgorithm);
+          if (isValidPayload) {
+            return decryptedSessionKey;
+          } else {
+            throw Error('Decryption error');
+          }
         }
       }
+      case enums.publicKey.x25519:
+        return {
+          sessionKey: decryptedData
+        };
+      default:
+        throw Error('Unsupported public key algorithm');
     }
   }
 
@@ -23841,7 +24296,7 @@ var openpgp = (function (exports) {
     /**
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(config = defaultConfig) {
+    constructor(config$1 = config) {
       /**
        * Hash function identifier, or 0 for gnu-dummy keys
        * @type {module:enums.hash | 0}
@@ -23853,7 +24308,7 @@ var openpgp = (function (exports) {
        */
       this.type = 'iterated';
       /** @type {Integer} */
-      this.c = config.s2kIterationCountByte;
+      this.c = config$1.s2kIterationCountByte;
       /** Eight bytes of salt in a binary string.
        * @type {Uint8Array}
        */
@@ -23874,7 +24329,11 @@ var openpgp = (function (exports) {
      */
     read(bytes) {
       let i = 0;
-      this.type = enums.read(enums.s2k, bytes[i++]);
+      try {
+        this.type = enums.read(enums.s2k, bytes[i++]);
+      } catch (err) {
+        throw new UnsupportedError('Unknown S2K type.');
+      }
       this.algorithm = bytes[i++];
 
       switch (this.type) {
@@ -23902,15 +24361,15 @@ var openpgp = (function (exports) {
               this.type = 'gnu-dummy';
               // GnuPG extension mode 1001 -- don't write secret key at all
             } else {
-              throw new Error('Unknown s2k gnu protection mode.');
+              throw new UnsupportedError('Unknown s2k gnu protection mode.');
             }
           } else {
-            throw new Error('Unknown s2k type.');
+            throw new UnsupportedError('Unknown s2k type.');
           }
           break;
 
         default:
-          throw new Error('Unknown s2k type.');
+          throw new UnsupportedError('Unknown s2k type.'); // unreachable
       }
 
       return i;
@@ -23937,9 +24396,9 @@ var openpgp = (function (exports) {
           arr.push(new Uint8Array([this.c]));
           break;
         case 'gnu':
-          throw new Error('GNU s2k type not supported.');
+          throw Error('GNU s2k type not supported.');
         default:
-          throw new Error('Unknown s2k type.');
+          throw Error('Unknown s2k type.');
       }
 
       return util.concatUint8Array(arr);
@@ -23981,9 +24440,9 @@ var openpgp = (function (exports) {
             break;
           }
           case 'gnu':
-            throw new Error('GNU s2k type not supported.');
+            throw Error('GNU s2k type not supported.');
           default:
-            throw new Error('Unknown s2k type.');
+            throw Error('Unknown s2k type.');
         }
         const result = await mod.hash.digest(this.algorithm, toHash);
         arr.push(result);
@@ -24018,8 +24477,8 @@ var openpgp = (function (exports) {
     /**
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(config = defaultConfig) {
-      this.version = config.aeadProtect ? 5 : 4;
+    constructor(config$1 = config) {
+      this.version = config$1.aeadProtect ? 5 : 4;
       this.sessionKey = null;
       /**
        * Algorithm to encrypt the session key with
@@ -24035,7 +24494,7 @@ var openpgp = (function (exports) {
        * AEAD mode to encrypt the session key with (if AEAD protection is enabled)
        * @type {enums.aead}
        */
-      this.aeadAlgorithm = enums.write(enums.aead, config.preferredAEADAlgorithm);
+      this.aeadAlgorithm = enums.write(enums.aead, config$1.preferredAEADAlgorithm);
       this.encrypted = null;
       this.s2k = null;
       this.iv = null;
@@ -24146,26 +24605,26 @@ var openpgp = (function (exports) {
      * @throws {Error} if encryption was not successful
      * @async
      */
-    async encrypt(passphrase, config = defaultConfig) {
+    async encrypt(passphrase, config$1 = config) {
       const algo = this.sessionKeyEncryptionAlgorithm !== null ?
         this.sessionKeyEncryptionAlgorithm :
         this.sessionKeyAlgorithm;
 
       this.sessionKeyEncryptionAlgorithm = algo;
 
-      this.s2k = new S2K(config);
-      this.s2k.salt = await mod.random.getRandomBytes(8);
+      this.s2k = new S2K(config$1);
+      this.s2k.salt = mod.random.getRandomBytes(8);
 
       const { blockSize, keySize } = mod.getCipher(algo);
       const encryptionKey = await this.s2k.produceKey(passphrase, keySize);
 
       if (this.sessionKey === null) {
-        this.sessionKey = await mod.generateSessionKey(this.sessionKeyAlgorithm);
+        this.sessionKey = mod.generateSessionKey(this.sessionKeyAlgorithm);
       }
 
       if (this.version === 5) {
         const mode = mod.getAEADMode(this.aeadAlgorithm);
-        this.iv = await mod.random.getRandomBytes(mode.ivLength); // generate new random IV
+        this.iv = mod.random.getRandomBytes(mode.ivLength); // generate new random IV
         const associatedData = new Uint8Array([0xC0 | SymEncryptedSessionKeyPacket.tag, this.version, this.sessionKeyEncryptionAlgorithm, this.aeadAlgorithm]);
         const modeInstance = await mode(algo, encryptionKey);
         this.encrypted = await modeInstance.encrypt(this.sessionKey, this.iv, associatedData);
@@ -24174,7 +24633,7 @@ var openpgp = (function (exports) {
           new Uint8Array([this.sessionKeyAlgorithm]),
           this.sessionKey
         ]);
-        this.encrypted = await mod.mode.cfb.encrypt(algo, encryptionKey, toEncrypt, new Uint8Array(blockSize), config);
+        this.encrypted = await mod.mode.cfb.encrypt(algo, encryptionKey, toEncrypt, new Uint8Array(blockSize), config$1);
       }
     }
   }
@@ -24201,12 +24660,12 @@ var openpgp = (function (exports) {
      * @param {Date} [date] - Creation date
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(date = new Date(), config = defaultConfig) {
+    constructor(date = new Date(), config$1 = config) {
       /**
        * Packet version
        * @type {Integer}
        */
-      this.version = config.v5Keys ? 5 : 4;
+      this.version = config$1.v5Keys ? 5 : 4;
       /**
        * Key creation date.
        * @type {Date}
@@ -24282,13 +24741,9 @@ var openpgp = (function (exports) {
         }
 
         // - A series of values comprising the key material.
-        try {
-          const { read, publicParams } = mod.parsePublicKeyParams(this.algorithm, bytes.subarray(pos));
-          this.publicParams = publicParams;
-          pos += read;
-        } catch (err) {
-          throw new Error('Error reading MPIs');
-        }
+        const { read, publicParams } = mod.parsePublicKeyParams(this.algorithm, bytes.subarray(pos));
+        this.publicParams = publicParams;
+        pos += read;
 
         // we set the fingerprint and keyID already to make it possible to put together the key packets directly in the Key constructor
         await this.computeFingerprintAndKeyID();
@@ -24369,7 +24824,7 @@ var openpgp = (function (exports) {
       } else if (this.version === 4) {
         this.keyID.read(this.fingerprint.subarray(12, 20));
       } else {
-        throw new Error('Unsupported key version');
+        throw Error('Unsupported key version');
       }
     }
 
@@ -24384,7 +24839,7 @@ var openpgp = (function (exports) {
       } else if (this.version === 4) {
         this.fingerprint = await mod.hash.sha1(toHash);
       } else {
-        throw new Error('Unsupported key version');
+        throw Error('Unsupported key version');
       }
     }
 
@@ -24423,7 +24878,7 @@ var openpgp = (function (exports) {
       const modulo = this.publicParams.n || this.publicParams.p;
       if (modulo) {
         result.bits = util.uint8ArrayBitLength(modulo);
-      } else {
+      } else if (this.publicParams.oid) {
         result.curve = this.publicParams.oid.getName();
       }
       return result;
@@ -24497,10 +24952,10 @@ var openpgp = (function (exports) {
      * @throws {Error} if decryption was not successful
      * @async
      */
-    async decrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async decrypt(sessionKeyAlgorithm, key, config$1 = config) {
       // If MDC errors are not being ignored, all missing MDC packets in symmetrically encrypted data should throw an error
-      if (!config.allowUnauthenticatedMessages) {
-        throw new Error('Message is not authenticated.');
+      if (!config$1.allowUnauthenticatedMessages) {
+        throw Error('Message is not authenticated.');
       }
 
       const { blockSize } = mod.getCipher(sessionKeyAlgorithm);
@@ -24510,7 +24965,7 @@ var openpgp = (function (exports) {
         encrypted.subarray(2, blockSize + 2)
       );
 
-      this.packets = await PacketList.fromBinary(decrypted, allowedPackets$2, config);
+      this.packets = await PacketList.fromBinary(decrypted, allowedPackets$2, config$1);
     }
 
     /**
@@ -24522,13 +24977,13 @@ var openpgp = (function (exports) {
      * @throws {Error} if encryption was not successful
      * @async
      */
-    async encrypt(sessionKeyAlgorithm, key, config = defaultConfig) {
+    async encrypt(sessionKeyAlgorithm, key, config$1 = config) {
       const data = this.packets.write();
       const { blockSize } = mod.getCipher(sessionKeyAlgorithm);
 
       const prefix = await mod.getPrefixRandom(sessionKeyAlgorithm);
-      const FRE = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, prefix, new Uint8Array(blockSize), config);
-      const ciphertext = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, data, FRE.subarray(2), config);
+      const FRE = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, prefix, new Uint8Array(blockSize), config$1);
+      const ciphertext = await mod.mode.cfb.encrypt(sessionKeyAlgorithm, key, data, FRE.subarray(2), config$1);
       this.encrypted = util.concat([FRE, ciphertext]);
     }
   }
@@ -24707,8 +25162,8 @@ var openpgp = (function (exports) {
      * @param {Date} [date] - Creation date
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(date = new Date(), config = defaultConfig) {
-      super(date, config);
+    constructor(date = new Date(), config$1 = config) {
+      super(date, config$1);
       /**
        * Secret-key data
        */
@@ -24755,6 +25210,7 @@ var openpgp = (function (exports) {
     async read(bytes) {
       // - A Public-Key or Public-Subkey packet, as described above.
       let i = await this.readPublicKey(bytes);
+      const startOfSecretKeyData = i;
 
       // - One octet indicating string-to-key usage conventions.  Zero
       //   indicates that the secret-key data is not encrypted.  255 or 254
@@ -24768,40 +25224,47 @@ var openpgp = (function (exports) {
         i++;
       }
 
-      // - [Optional] If string-to-key usage octet was 255, 254, or 253, a
-      //   one-octet symmetric encryption algorithm.
-      if (this.s2kUsage === 255 || this.s2kUsage === 254 || this.s2kUsage === 253) {
-        this.symmetric = bytes[i++];
-
-        // - [Optional] If string-to-key usage octet was 253, a one-octet
-        //   AEAD algorithm.
-        if (this.s2kUsage === 253) {
-          this.aead = bytes[i++];
-        }
-
+      try {
         // - [Optional] If string-to-key usage octet was 255, 254, or 253, a
-        //   string-to-key specifier.  The length of the string-to-key
-        //   specifier is implied by its type, as described above.
-        this.s2k = new S2K();
-        i += this.s2k.read(bytes.subarray(i, bytes.length));
+        //   one-octet symmetric encryption algorithm.
+        if (this.s2kUsage === 255 || this.s2kUsage === 254 || this.s2kUsage === 253) {
+          this.symmetric = bytes[i++];
 
-        if (this.s2k.type === 'gnu-dummy') {
-          return;
+          // - [Optional] If string-to-key usage octet was 253, a one-octet
+          //   AEAD algorithm.
+          if (this.s2kUsage === 253) {
+            this.aead = bytes[i++];
+          }
+
+          // - [Optional] If string-to-key usage octet was 255, 254, or 253, a
+          //   string-to-key specifier.  The length of the string-to-key
+          //   specifier is implied by its type, as described above.
+          this.s2k = new S2K();
+          i += this.s2k.read(bytes.subarray(i, bytes.length));
+
+          if (this.s2k.type === 'gnu-dummy') {
+            return;
+          }
+        } else if (this.s2kUsage) {
+          this.symmetric = this.s2kUsage;
         }
-      } else if (this.s2kUsage) {
-        this.symmetric = this.s2kUsage;
-      }
 
-      // - [Optional] If secret data is encrypted (string-to-key usage octet
-      //   not zero), an Initial Vector (IV) of the same length as the
-      //   cipher's block size.
-      if (this.s2kUsage) {
-        this.iv = bytes.subarray(
-          i,
-          i + mod.getCipher(this.symmetric).blockSize
-        );
+        // - [Optional] If secret data is encrypted (string-to-key usage octet
+        //   not zero), an Initial Vector (IV) of the same length as the
+        //   cipher's block size.
+        if (this.s2kUsage) {
+          this.iv = bytes.subarray(
+            i,
+            i + mod.getCipher(this.symmetric).blockSize
+          );
 
-        i += this.iv.length;
+          i += this.iv.length;
+        }
+      } catch (e) {
+        // if the s2k is unsupported, we still want to support encrypting and verifying with the given key
+        if (!this.s2kUsage) throw e; // always throw for decrypted keys
+        this.unparseableKeyMaterial = bytes.subarray(startOfSecretKeyData);
+        this.isEncrypted = true;
       }
 
       // - Only for a version 5 packet, a four-octet scalar octet count for
@@ -24819,13 +25282,15 @@ var openpgp = (function (exports) {
       if (!this.isEncrypted) {
         const cleartext = this.keyMaterial.subarray(0, -2);
         if (!util.equalsUint8Array(util.writeChecksum(cleartext), this.keyMaterial.subarray(-2))) {
-          throw new Error('Key checksum mismatch');
+          throw Error('Key checksum mismatch');
         }
         try {
           const { privateParams } = mod.parsePrivateKeyParams(this.algorithm, cleartext, this.publicParams);
           this.privateParams = privateParams;
         } catch (err) {
-          throw new Error('Error reading MPIs');
+          if (err instanceof UnsupportedError) throw err;
+          // avoid throwing potentially sensitive errors
+          throw Error('Error reading MPIs');
         }
       }
     }
@@ -24835,8 +25300,15 @@ var openpgp = (function (exports) {
      * @returns {Uint8Array} A string of bytes containing the secret key OpenPGP packet.
      */
     write() {
-      const arr = [this.writePublicKey()];
+      const serializedPublicKey = this.writePublicKey();
+      if (this.unparseableKeyMaterial) {
+        return util.concatUint8Array([
+          serializedPublicKey,
+          this.unparseableKeyMaterial
+        ]);
+      }
 
+      const arr = [serializedPublicKey];
       arr.push(new Uint8Array([this.s2kUsage]));
 
       const optionalFieldsArr = [];
@@ -24896,6 +25368,18 @@ var openpgp = (function (exports) {
       return this.isEncrypted === false;
     }
 
+    /**
+     * Check whether the key includes secret key material.
+     * Some secret keys do not include it, and can thus only be used
+     * for public-key operations (encryption and verification).
+     * Such keys are:
+     * - GNU-dummy keys, where the secret material has been stripped away
+     * - encrypted keys with unsupported S2K or cipher
+     */
+    isMissingSecretKeyMaterial() {
+      return this.unparseableKeyMaterial !== undefined || this.isDummy();
+    }
+
     /**
      * Check whether this is a gnu-dummy key
      * @returns {Boolean}
@@ -24909,16 +25393,17 @@ var openpgp = (function (exports) {
      * The resulting key cannot be used for signing/decrypting but can still verify signatures.
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    makeDummy(config = defaultConfig) {
+    makeDummy(config$1 = config) {
       if (this.isDummy()) {
         return;
       }
       if (this.isDecrypted()) {
         this.clearPrivateParams();
       }
+      delete this.unparseableKeyMaterial;
       this.isEncrypted = null;
       this.keyMaterial = null;
-      this.s2k = new S2K(config);
+      this.s2k = new S2K(config$1);
       this.s2k.algorithm = 0;
       this.s2k.c = 0;
       this.s2k.type = 'gnu-dummy';
@@ -24936,29 +25421,29 @@ var openpgp = (function (exports) {
      * @throws {Error} if encryption was not successful
      * @async
      */
-    async encrypt(passphrase, config = defaultConfig) {
+    async encrypt(passphrase, config$1 = config) {
       if (this.isDummy()) {
         return;
       }
 
       if (!this.isDecrypted()) {
-        throw new Error('Key packet is already encrypted');
+        throw Error('Key packet is already encrypted');
       }
 
       if (!passphrase) {
-        throw new Error('A non-empty passphrase is required for key encryption.');
+        throw Error('A non-empty passphrase is required for key encryption.');
       }
 
-      this.s2k = new S2K(config);
-      this.s2k.salt = await mod.random.getRandomBytes(8);
+      this.s2k = new S2K(config$1);
+      this.s2k.salt = mod.random.getRandomBytes(8);
       const cleartext = mod.serializeParams(this.algorithm, this.privateParams);
       this.symmetric = enums.symmetric.aes256;
       const key = await produceEncryptionKey(this.s2k, passphrase, this.symmetric);
 
       const { blockSize } = mod.getCipher(this.symmetric);
-      this.iv = await mod.random.getRandomBytes(blockSize);
+      this.iv = mod.random.getRandomBytes(blockSize);
 
-      if (config.aeadProtect) {
+      if (config$1.aeadProtect) {
         this.s2kUsage = 253;
         this.aead = enums.aead.eax;
         const mode = mod.getAEADMode(this.aead);
@@ -24968,8 +25453,8 @@ var openpgp = (function (exports) {
         this.s2kUsage = 254;
         this.keyMaterial = await mod.mode.cfb.encrypt(this.symmetric, key, util.concatUint8Array([
           cleartext,
-          await mod.hash.sha1(cleartext, config)
-        ]), this.iv, config);
+          await mod.hash.sha1(cleartext, config$1)
+        ]), this.iv, config$1);
       }
     }
 
@@ -24987,17 +25472,21 @@ var openpgp = (function (exports) {
         return false;
       }
 
+      if (this.unparseableKeyMaterial) {
+        throw Error('Key packet cannot be decrypted: unsupported S2K or cipher algo');
+      }
+
       if (this.isDecrypted()) {
-        throw new Error('Key packet is already decrypted.');
+        throw Error('Key packet is already decrypted.');
       }
 
       let key;
       if (this.s2kUsage === 254 || this.s2kUsage === 253) {
         key = await produceEncryptionKey(this.s2k, passphrase, this.symmetric);
       } else if (this.s2kUsage === 255) {
-        throw new Error('Encrypted private key is authenticated using an insecure two-byte hash');
+        throw Error('Encrypted private key is authenticated using an insecure two-byte hash');
       } else {
-        throw new Error('Private key is encrypted using an insecure S2K function: unsalted MD5');
+        throw Error('Private key is encrypted using an insecure S2K function: unsalted MD5');
       }
 
       let cleartext;
@@ -25008,7 +25497,7 @@ var openpgp = (function (exports) {
           cleartext = await modeInstance.decrypt(this.keyMaterial, this.iv.subarray(0, mode.ivLength), new Uint8Array());
         } catch (err) {
           if (err.message === 'Authentication tag mismatch') {
-            throw new Error('Incorrect key passphrase: ' + err.message);
+            throw Error('Incorrect key passphrase: ' + err.message);
           }
           throw err;
         }
@@ -25019,7 +25508,7 @@ var openpgp = (function (exports) {
         const hash = await mod.hash.sha1(cleartext);
 
         if (!util.equalsUint8Array(hash, cleartextWithHash.subarray(-20))) {
-          throw new Error('Incorrect key passphrase');
+          throw Error('Incorrect key passphrase');
         }
       }
 
@@ -25027,7 +25516,7 @@ var openpgp = (function (exports) {
         const { privateParams } = mod.parsePrivateKeyParams(this.algorithm, cleartext, this.publicParams);
         this.privateParams = privateParams;
       } catch (err) {
-        throw new Error('Error reading MPIs');
+        throw Error('Error reading MPIs');
       }
       this.isEncrypted = false;
       this.keyMaterial = null;
@@ -25045,7 +25534,7 @@ var openpgp = (function (exports) {
       }
 
       if (!this.isDecrypted()) {
-        throw new Error('Key is not decrypted');
+        throw Error('Key is not decrypted');
       }
 
       let validParams;
@@ -25056,7 +25545,7 @@ var openpgp = (function (exports) {
         validParams = false;
       }
       if (!validParams) {
-        throw new Error('Key is invalid');
+        throw Error('Key is invalid');
       }
     }
 
@@ -25071,7 +25560,7 @@ var openpgp = (function (exports) {
      * Clear private key parameters
      */
     clearPrivateParams() {
-      if (this.isDummy()) {
+      if (this.isMissingSecretKeyMaterial()) {
         return;
       }
 
@@ -26218,7 +26707,7 @@ var openpgp = (function (exports) {
         (userID.name && !util.isString(userID.name)) ||
         (userID.email && !util.isEmailAddress(userID.email)) ||
         (userID.comment && !util.isString(userID.comment))) {
-        throw new Error('Invalid user ID format');
+        throw Error('Invalid user ID format');
       }
       const packet = new UserIDPacket();
       Object.assign(packet, userID);
@@ -26234,10 +26723,10 @@ var openpgp = (function (exports) {
      * Parsing function for a user id packet (tag 13).
      * @param {Uint8Array} input - Payload of a tag 13 packet
      */
-    read(bytes, config = defaultConfig) {
+    read(bytes, config$1 = config) {
       const userID = util.decodeUTF8(bytes);
-      if (userID.length > config.maxUserIDLength) {
-        throw new Error('User ID string is too long');
+      if (userID.length > config$1.maxUserIDLength) {
+        throw Error('User ID string is too long');
       }
       try {
         const { name, address: email, comments } = emailAddresses.parseOneAddress({ input: userID, atInDisplayName: true });
@@ -26277,8 +26766,8 @@ var openpgp = (function (exports) {
      * @param {Date} [date] - Creation date
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    constructor(date = new Date(), config = defaultConfig) {
-      super(date, config);
+    constructor(date = new Date(), config$1 = config) {
+      super(date, config$1);
     }
   }
 
@@ -26344,8 +26833,8 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {ReadableStream<String>} ASCII armor.
      */
-    armor(config = defaultConfig) {
-      return armor(enums.armor.signature, this.write(), undefined, undefined, undefined, config);
+    armor(config$1 = config) {
+      return armor(enums.armor.signature, this.write(), undefined, undefined, undefined, config$1);
     }
 
     /**
@@ -26367,28 +26856,28 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readSignature({ armoredSignature, binarySignature, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readSignature({ armoredSignature, binarySignature, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     let input = armoredSignature || binarySignature;
     if (!input) {
-      throw new Error('readSignature: must pass options object containing `armoredSignature` or `binarySignature`');
+      throw Error('readSignature: must pass options object containing `armoredSignature` or `binarySignature`');
     }
     if (armoredSignature && !util.isString(armoredSignature)) {
-      throw new Error('readSignature: options.armoredSignature must be a string');
+      throw Error('readSignature: options.armoredSignature must be a string');
     }
     if (binarySignature && !util.isUint8Array(binarySignature)) {
-      throw new Error('readSignature: options.binarySignature must be a Uint8Array');
+      throw Error('readSignature: options.binarySignature must be a Uint8Array');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (armoredSignature) {
-      const { type, data } = await unarmor(input, config);
+      const { type, data } = await unarmor(input, config$1);
       if (type !== enums.armor.signature) {
-        throw new Error('Armored text not of type signature');
+        throw Error('Armored text not of type signature');
       }
       input = data;
     }
-    const packetlist = await PacketList.fromBinary(input, allowedPackets$1, config);
+    const packetlist = await PacketList.fromBinary(input, allowedPackets$1, config$1);
     return new Signature$2(packetlist);
   }
 
@@ -26444,8 +26933,8 @@ var openpgp = (function (exports) {
       throw util.wrapError(
         `Could not find valid ${enums.read(enums.signature, signatureType)} signature in key ${publicKey.getKeyID().toHex()}`
           .replace('certGeneric ', 'self-')
-          .replace(/([a-z])([A-Z])/g, (_, $1, $2) => $1 + ' ' + $2.toLowerCase())
-        , exception);
+          .replace(/([a-z])([A-Z])/g, (_, $1, $2) => $1 + ' ' + $2.toLowerCase()),
+        exception);
     }
     return latestValid;
   }
@@ -26470,23 +26959,20 @@ var openpgp = (function (exports) {
     const dataToSign = {};
     dataToSign.key = primaryKey;
     dataToSign.bind = subkey;
-    const subkeySignaturePacket = new SignaturePacket();
-    subkeySignaturePacket.signatureType = enums.signature.subkeyBinding;
-    subkeySignaturePacket.publicKeyAlgorithm = primaryKey.algorithm;
-    subkeySignaturePacket.hashAlgorithm = await getPreferredHashAlgo(null, subkey, undefined, undefined, config);
+    const signatureProperties = { signatureType: enums.signature.subkeyBinding };
     if (options.sign) {
-      subkeySignaturePacket.keyFlags = [enums.keyFlags.signData];
-      subkeySignaturePacket.embeddedSignature = await createSignaturePacket(dataToSign, null, subkey, {
+      signatureProperties.keyFlags = [enums.keyFlags.signData];
+      signatureProperties.embeddedSignature = await createSignaturePacket(dataToSign, null, subkey, {
         signatureType: enums.signature.keyBinding
-      }, options.date, undefined, undefined, config);
+      }, options.date, undefined, undefined, undefined, config);
     } else {
-      subkeySignaturePacket.keyFlags = [enums.keyFlags.encryptCommunication | enums.keyFlags.encryptStorage];
+      signatureProperties.keyFlags = [enums.keyFlags.encryptCommunication | enums.keyFlags.encryptStorage];
     }
     if (options.keyExpirationTime > 0) {
-      subkeySignaturePacket.keyExpirationTime = options.keyExpirationTime;
-      subkeySignaturePacket.keyNeverExpires = false;
+      signatureProperties.keyExpirationTime = options.keyExpirationTime;
+      signatureProperties.keyNeverExpires = false;
     }
-    await subkeySignaturePacket.sign(primaryKey, dataToSign, options.date);
+    const subkeySignaturePacket = await createSignaturePacket(dataToSign, null, primaryKey, signatureProperties, options.date, undefined, undefined, undefined, config);
     return subkeySignaturePacket;
   }
 
@@ -26511,17 +26997,11 @@ var openpgp = (function (exports) {
           prefAlgo : hashAlgo;
       }
     }
-    switch (Object.getPrototypeOf(keyPacket)) {
-      case SecretKeyPacket.prototype:
-      case PublicKeyPacket.prototype:
-      case SecretSubkeyPacket.prototype:
-      case PublicSubkeyPacket.prototype:
-        switch (keyPacket.algorithm) {
-          case enums.publicKey.ecdh:
-          case enums.publicKey.ecdsa:
-          case enums.publicKey.eddsa:
-            prefAlgo = mod.publicKey.elliptic.getPreferredHashAlgo(keyPacket.publicParams.oid);
-        }
+    switch (keyPacket.algorithm) {
+      case enums.publicKey.ecdsa:
+      case enums.publicKey.eddsaLegacy:
+      case enums.publicKey.ed25519:
+        prefAlgo = mod.getPreferredCurveHashAlgo(keyPacket.algorithm, keyPacket.publicParams.oid);
     }
     return mod.hash.getHashByteLength(hashAlgo) <= mod.hash.getHashByteLength(prefAlgo) ?
       prefAlgo : hashAlgo;
@@ -26537,16 +27017,16 @@ var openpgp = (function (exports) {
    * @returns {Promise<module:enums.symmetric|aead|compression>} Preferred algorithm
    * @async
    */
-  async function getPreferredAlgo(type, keys = [], date = new Date(), userIDs = [], config = defaultConfig) {
+  async function getPreferredAlgo(type, keys = [], date = new Date(), userIDs = [], config$1 = config) {
     const defaultAlgo = { // these are all must-implement in rfc4880bis
       'symmetric': enums.symmetric.aes128,
       'aead': enums.aead.eax,
       'compression': enums.compression.uncompressed
     }[type];
     const preferredSenderAlgo = {
-      'symmetric': config.preferredSymmetricAlgorithm,
-      'aead': config.preferredAEADAlgorithm,
-      'compression': config.preferredCompressionAlgorithm
+      'symmetric': config$1.preferredSymmetricAlgorithm,
+      'aead': config$1.preferredAEADAlgorithm,
+      'compression': config$1.preferredCompressionAlgorithm
     }[type];
     const prefPropertyName = {
       'symmetric': 'preferredSymmetricAlgorithms',
@@ -26558,7 +27038,7 @@ var openpgp = (function (exports) {
     // otherwise we use the default algo
     // if no keys are available, preferredSenderAlgo is returned
     const senderAlgoSupport = await Promise.all(keys.map(async function(key, i) {
-      const primaryUser = await key.getPrimaryUser(date, userIDs[i], config);
+      const primaryUser = await key.getPrimaryUser(date, userIDs[i], config$1);
       const recipientPrefs = primaryUser.selfCertification[prefPropertyName];
       return !!recipientPrefs && recipientPrefs.indexOf(preferredSenderAlgo) >= 0;
     }));
@@ -26574,21 +27054,23 @@ var openpgp = (function (exports) {
    * @param {Object} [signatureProperties] - Properties to write on the signature packet before signing
    * @param {Date} [date] - Override the creationtime of the signature
    * @param {Object} [userID] - User ID
+   * @param {Array} [notations] - Notation Data to add to the signature, e.g. [{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]
    * @param {Object} [detached] - Whether to create a detached signature packet
    * @param {Object} config - full configuration
    * @returns {Promise<SignaturePacket>} Signature packet.
    */
-  async function createSignaturePacket(dataToSign, privateKey, signingKeyPacket, signatureProperties, date, userID, detached = false, config) {
+  async function createSignaturePacket(dataToSign, privateKey, signingKeyPacket, signatureProperties, date, userID, notations = [], detached = false, config) {
     if (signingKeyPacket.isDummy()) {
-      throw new Error('Cannot sign with a gnu-dummy key.');
+      throw Error('Cannot sign with a gnu-dummy key.');
     }
     if (!signingKeyPacket.isDecrypted()) {
-      throw new Error('Signing key is not decrypted.');
+      throw Error('Signing key is not decrypted.');
     }
     const signaturePacket = new SignaturePacket();
     Object.assign(signaturePacket, signatureProperties);
     signaturePacket.publicKeyAlgorithm = signingKeyPacket.algorithm;
     signaturePacket.hashAlgorithm = await getPreferredHashAlgo(privateKey, signingKeyPacket, date, userID, config);
+    signaturePacket.rawNotations = notations;
     await signaturePacket.sign(signingKeyPacket, dataToSign, date, detached);
     return signaturePacket;
   }
@@ -26694,11 +27176,11 @@ var openpgp = (function (exports) {
    * @returns {Promise<Boolean>}
    * @async
    */
-  async function isAEADSupported(keys, date = new Date(), userIDs = [], config = defaultConfig) {
+  async function isAEADSupported(keys, date = new Date(), userIDs = [], config$1 = config) {
     let supported = true;
     // TODO replace when Promise.some or Promise.any are implemented
     await Promise.all(keys.map(async function(key, i) {
-      const primaryUser = await key.getPrimaryUser(date, userIDs[i], config);
+      const primaryUser = await key.getPrimaryUser(date, userIDs[i], config$1);
       if (!primaryUser.selfCertification.features ||
           !(primaryUser.selfCertification.features[0] & enums.features.aead)) {
         supported = false;
@@ -26722,13 +27204,13 @@ var openpgp = (function (exports) {
         try {
           options.curve = enums.write(enums.curve, options.curve);
         } catch (e) {
-          throw new Error('Invalid curve');
+          throw Error('Unknown curve');
         }
-        if (options.curve === enums.curve.ed25519 || options.curve === enums.curve.curve25519) {
-          options.curve = options.sign ? enums.curve.ed25519 : enums.curve.curve25519;
+        if (options.curve === enums.curve.ed25519Legacy || options.curve === enums.curve.curve25519Legacy) {
+          options.curve = options.sign ? enums.curve.ed25519Legacy : enums.curve.curve25519Legacy;
         }
         if (options.sign) {
-          options.algorithm = options.curve === enums.curve.ed25519 ? enums.publicKey.eddsa : enums.publicKey.ecdsa;
+          options.algorithm = options.curve === enums.curve.ed25519Legacy ? enums.publicKey.eddsaLegacy : enums.publicKey.ecdsa;
         } else {
           options.algorithm = enums.publicKey.ecdh;
         }
@@ -26737,7 +27219,7 @@ var openpgp = (function (exports) {
         options.algorithm = enums.publicKey.rsaEncryptSign;
         break;
       default:
-        throw new Error(`Unsupported key type ${options.type}`);
+        throw Error(`Unsupported key type ${options.type}`);
     }
     return options;
   }
@@ -26747,6 +27229,7 @@ var openpgp = (function (exports) {
     return keyAlgo !== enums.publicKey.rsaEncrypt &&
       keyAlgo !== enums.publicKey.elgamal &&
       keyAlgo !== enums.publicKey.ecdh &&
+      keyAlgo !== enums.publicKey.x25519 &&
       (!signature.keyFlags ||
         (signature.keyFlags[0] & enums.keyFlags.signData) !== 0);
   }
@@ -26756,7 +27239,8 @@ var openpgp = (function (exports) {
     return keyAlgo !== enums.publicKey.dsa &&
       keyAlgo !== enums.publicKey.rsaSign &&
       keyAlgo !== enums.publicKey.ecdsa &&
-      keyAlgo !== enums.publicKey.eddsa &&
+      keyAlgo !== enums.publicKey.eddsaLegacy &&
+      keyAlgo !== enums.publicKey.ed25519 &&
       (!signature.keyFlags ||
         (signature.keyFlags[0] & enums.keyFlags.encryptCommunication) !== 0 ||
         (signature.keyFlags[0] & enums.keyFlags.encryptStorage) !== 0);
@@ -26784,21 +27268,21 @@ var openpgp = (function (exports) {
     const keyAlgo = enums.write(enums.publicKey, keyPacket.algorithm);
     const algoInfo = keyPacket.getAlgorithmInfo();
     if (config.rejectPublicKeyAlgorithms.has(keyAlgo)) {
-      throw new Error(`${algoInfo.algorithm} keys are considered too weak.`);
+      throw Error(`${algoInfo.algorithm} keys are considered too weak.`);
     }
     switch (keyAlgo) {
       case enums.publicKey.rsaEncryptSign:
       case enums.publicKey.rsaSign:
       case enums.publicKey.rsaEncrypt:
         if (algoInfo.bits < config.minRSABits) {
-          throw new Error(`RSA keys shorter than ${config.minRSABits} bits are considered too weak.`);
+          throw Error(`RSA keys shorter than ${config.minRSABits} bits are considered too weak.`);
         }
         break;
       case enums.publicKey.ecdsa:
-      case enums.publicKey.eddsa:
+      case enums.publicKey.eddsaLegacy:
       case enums.publicKey.ecdh:
         if (config.rejectCurves.has(algoInfo.curve)) {
-          throw new Error(`Support for ${algoInfo.algorithm} keys using curve ${algoInfo.curve} is disabled.`);
+          throw Error(`Support for ${algoInfo.algorithm} keys using curve ${algoInfo.curve} is disabled.`);
         }
         break;
     }
@@ -26867,17 +27351,17 @@ var openpgp = (function (exports) {
       const user = new User(dataToSign.userID || dataToSign.userAttribute, this.mainKey);
       user.otherCertifications = await Promise.all(signingKeys.map(async function(privateKey) {
         if (!privateKey.isPrivate()) {
-          throw new Error('Need private key for signing');
+          throw Error('Need private key for signing');
         }
         if (privateKey.hasSameFingerprintAs(primaryKey)) {
-          throw new Error("The user's own key can only be used for self-certifications");
+          throw Error("The user's own key can only be used for self-certifications");
         }
         const signingKey = await privateKey.getSigningKey(undefined, date, undefined, config);
         return createSignaturePacket(dataToSign, privateKey, signingKey.keyPacket, {
           // Most OpenPGP implementations use generic certification (0x10)
           signatureType: enums.signature.certGeneric,
           keyFlags: [enums.keyFlags.certifyKeys | enums.keyFlags.signData]
-        }, date, undefined, undefined, config);
+        }, date, undefined, undefined, undefined, config);
       }));
       await user.update(this, date, config);
       return user;
@@ -26895,13 +27379,13 @@ var openpgp = (function (exports) {
      * @returns {Promise<Boolean>} True if the certificate is revoked.
      * @async
      */
-    async isRevoked(certificate, keyPacket, date = new Date(), config) {
+    async isRevoked(certificate, keyPacket, date = new Date(), config$1 = config) {
       const primaryKey = this.mainKey.keyPacket;
       return isDataRevoked(primaryKey, enums.signature.certRevocation, {
         key: primaryKey,
         userID: this.userID,
         userAttribute: this.userAttribute
-      }, this.revocationSignatures, certificate, keyPacket, date, config);
+      }, this.revocationSignatures, certificate, keyPacket, date, config$1);
     }
 
     /**
@@ -26930,7 +27414,7 @@ var openpgp = (function (exports) {
       await Promise.all(issuerKeys.map(async key => {
         const signingKey = await key.getSigningKey(issuerKeyID, certificate.created, undefined, config);
         if (certificate.revoked || await that.isRevoked(certificate, signingKey.keyPacket, date, config)) {
-          throw new Error('User certificate is revoked');
+          throw Error('User certificate is revoked');
         }
         try {
           await certificate.verify(signingKey.keyPacket, enums.signature.certGeneric, dataToVerify, date, undefined, config);
@@ -26973,7 +27457,7 @@ var openpgp = (function (exports) {
      */
     async verify(date = new Date(), config) {
       if (!this.selfCertifications.length) {
-        throw new Error('No self-certifications found');
+        throw Error('No self-certifications found');
       }
       const that = this;
       const primaryKey = this.mainKey.keyPacket;
@@ -26988,7 +27472,7 @@ var openpgp = (function (exports) {
         try {
           const selfCertification = this.selfCertifications[i];
           if (selfCertification.revoked || await that.isRevoked(selfCertification, undefined, date, config)) {
-            throw new Error('Self-certification is revoked');
+            throw Error('Self-certification is revoked');
           }
           try {
             await selfCertification.verify(primaryKey, enums.signature.certGeneric, dataToVerify, date, undefined, config);
@@ -27034,6 +27518,41 @@ var openpgp = (function (exports) {
         return isDataRevoked(primaryKey, enums.signature.certRevocation, dataToVerify, [srcRevSig], undefined, undefined, date, config);
       });
     }
+
+    /**
+     * Revokes the user
+     * @param {SecretKeyPacket} primaryKey - decrypted private primary key for revocation
+     * @param {Object} reasonForRevocation - optional, object indicating the reason for revocation
+     * @param  {module:enums.reasonForRevocation} reasonForRevocation.flag optional, flag indicating the reason for revocation
+     * @param  {String} reasonForRevocation.string optional, string explaining the reason for revocation
+     * @param {Date} date - optional, override the creationtime of the revocation signature
+     * @param {Object} [config] - Full configuration, defaults to openpgp.config
+     * @returns {Promise<User>} New user with revocation signature.
+     * @async
+     */
+    async revoke(
+      primaryKey,
+      {
+        flag: reasonForRevocationFlag = enums.reasonForRevocation.noReason,
+        string: reasonForRevocationString = ''
+      } = {},
+      date = new Date(),
+      config$1 = config
+    ) {
+      const dataToSign = {
+        userID: this.userID,
+        userAttribute: this.userAttribute,
+        key: primaryKey
+      };
+      const user = new User(dataToSign.userID || dataToSign.userAttribute, this.mainKey);
+      user.revocationSignatures.push(await createSignaturePacket(dataToSign, null, primaryKey, {
+        signatureType: enums.signature.certRevocation,
+        reasonForRevocationFlag: enums.write(enums.reasonForRevocation, reasonForRevocationFlag),
+        reasonForRevocationString
+      }, date, undefined, undefined, false, config$1));
+      await user.update(this);
+      return user;
+    }
   }
 
   /**
@@ -27097,13 +27616,13 @@ var openpgp = (function (exports) {
      * @returns {Promise<Boolean>} True if the binding signature is revoked.
      * @async
      */
-    async isRevoked(signature, key, date = new Date(), config = defaultConfig) {
+    async isRevoked(signature, key, date = new Date(), config$1 = config) {
       const primaryKey = this.mainKey.keyPacket;
       return isDataRevoked(
         primaryKey, enums.signature.subkeyRevocation, {
           key: primaryKey,
           bind: this.keyPacket
-        }, this.revocationSignatures, signature, key, date, config
+        }, this.revocationSignatures, signature, key, date, config$1
       );
     }
 
@@ -27116,18 +27635,18 @@ var openpgp = (function (exports) {
      * @throws {Error}           if the subkey is invalid.
      * @async
      */
-    async verify(date = new Date(), config = defaultConfig) {
+    async verify(date = new Date(), config$1 = config) {
       const primaryKey = this.mainKey.keyPacket;
       const dataToVerify = { key: primaryKey, bind: this.keyPacket };
       // check subkey binding signatures
-      const bindingSignature = await getLatestValidSignature(this.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config);
+      const bindingSignature = await getLatestValidSignature(this.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config$1);
       // check binding signature is not revoked
-      if (bindingSignature.revoked || await this.isRevoked(bindingSignature, null, date, config)) {
-        throw new Error('Subkey is revoked');
+      if (bindingSignature.revoked || await this.isRevoked(bindingSignature, null, date, config$1)) {
+        throw Error('Subkey is revoked');
       }
       // check for expiration time
       if (isDataExpired(this.keyPacket, bindingSignature, date)) {
-        throw new Error('Subkey is expired');
+        throw Error('Subkey is expired');
       }
       return bindingSignature;
     }
@@ -27140,12 +27659,12 @@ var openpgp = (function (exports) {
      * @returns {Promise<Date | Infinity | null>}
      * @async
      */
-    async getExpirationTime(date = new Date(), config = defaultConfig) {
+    async getExpirationTime(date = new Date(), config$1 = config) {
       const primaryKey = this.mainKey.keyPacket;
       const dataToVerify = { key: primaryKey, bind: this.keyPacket };
       let bindingSignature;
       try {
-        bindingSignature = await getLatestValidSignature(this.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config);
+        bindingSignature = await getLatestValidSignature(this.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config$1);
       } catch (e) {
         return null;
       }
@@ -27162,10 +27681,10 @@ var openpgp = (function (exports) {
      * @throws {Error} if update failed
      * @async
      */
-    async update(subkey, date = new Date(), config = defaultConfig) {
+    async update(subkey, date = new Date(), config$1 = config) {
       const primaryKey = this.mainKey.keyPacket;
       if (!this.hasSameFingerprintAs(subkey)) {
-        throw new Error('Subkey update method: fingerprints of subkeys not equal');
+        throw Error('Subkey update method: fingerprints of subkeys not equal');
       }
       // key packet
       if (this.keyPacket.constructor.tag === enums.packet.publicSubkey &&
@@ -27185,7 +27704,7 @@ var openpgp = (function (exports) {
           }
         }
         try {
-          await srcBindSig.verify(primaryKey, enums.signature.subkeyBinding, dataToVerify, date, undefined, config);
+          await srcBindSig.verify(primaryKey, enums.signature.subkeyBinding, dataToVerify, date, undefined, config$1);
           return true;
         } catch (e) {
           return false;
@@ -27193,7 +27712,7 @@ var openpgp = (function (exports) {
       });
       // revocation signatures
       await mergeSignatures(subkey, this, 'revocationSignatures', date, function(srcRevSig) {
-        return isDataRevoked(primaryKey, enums.signature.subkeyRevocation, dataToVerify, [srcRevSig], undefined, undefined, date, config);
+        return isDataRevoked(primaryKey, enums.signature.subkeyRevocation, dataToVerify, [srcRevSig], undefined, undefined, date, config$1);
       });
     }
 
@@ -27215,7 +27734,7 @@ var openpgp = (function (exports) {
         string: reasonForRevocationString = ''
       } = {},
       date = new Date(),
-      config = defaultConfig
+      config$1 = config
     ) {
       const dataToSign = { key: primaryKey, bind: this.keyPacket };
       const subkey = new Subkey(this.keyPacket, this.mainKey);
@@ -27223,7 +27742,7 @@ var openpgp = (function (exports) {
         signatureType: enums.signature.subkeyRevocation,
         reasonForRevocationFlag: enums.write(enums.reasonForRevocation, reasonForRevocationFlag),
         reasonForRevocationString
-      }, date, undefined, false, config));
+      }, date, undefined, undefined, false, config$1));
       await subkey.update(this);
       return subkey;
     }
@@ -27244,6 +27763,11 @@ var openpgp = (function (exports) {
 
   // A key revocation certificate can contain the following packets
   const allowedRevocationPackets = /*#__PURE__*/ util.constructAllowedPackets([SignaturePacket]);
+  const mainKeyPacketTags = new Set([enums.packet.publicKey, enums.packet.privateKey]);
+  const keyPacketTags = new Set([
+    enums.packet.publicKey, enums.packet.privateKey,
+    enums.packet.publicSubkey, enums.packet.privateSubkey
+  ]);
 
   /**
    * Abstract class that represents an OpenPGP key. Must contain a primary key.
@@ -27264,21 +27788,42 @@ var openpgp = (function (exports) {
       let user;
       let primaryKeyID;
       let subkey;
+      let ignoreUntil;
+
       for (const packet of packetlist) {
+
+        if (packet instanceof UnparseablePacket) {
+          const isUnparseableKeyPacket = keyPacketTags.has(packet.tag);
+          if (isUnparseableKeyPacket && !ignoreUntil) {
+            // Since non-key packets apply to the preceding key packet, if a (sub)key is Unparseable we must
+            // discard all non-key packets that follow, until another (sub)key packet is found.
+            if (mainKeyPacketTags.has(packet.tag)) {
+              ignoreUntil = mainKeyPacketTags;
+            } else {
+              ignoreUntil = keyPacketTags;
+            }
+          }
+          continue;
+        }
+
         const tag = packet.constructor.tag;
+        if (ignoreUntil) {
+          if (!ignoreUntil.has(tag)) continue;
+          ignoreUntil = null;
+        }
         if (disallowedPackets.has(tag)) {
-          throw new Error(`Unexpected packet type: ${tag}`);
+          throw Error(`Unexpected packet type: ${tag}`);
         }
         switch (tag) {
           case enums.packet.publicKey:
           case enums.packet.secretKey:
             if (this.keyPacket) {
-              throw new Error('Key block contains multiple keys');
+              throw Error('Key block contains multiple keys');
             }
             this.keyPacket = packet;
             primaryKeyID = this.getKeyID();
             if (!primaryKeyID) {
-              throw new Error('Missing Key ID');
+              throw Error('Missing Key ID');
             }
             break;
           case enums.packet.userID:
@@ -27356,13 +27901,13 @@ var openpgp = (function (exports) {
     }
 
     /**
-     * Clones the key object
-     * @param {Boolean} [deep=false] Whether to return a deep clone
+     * Clones the key object. The copy is shallow, as it references the same packet objects as the original. However, if the top-level API is used, the two key instances are effectively independent.
+     * @param {Boolean} [clonePrivateParams=false] Only relevant for private keys: whether the secret key paramenters should be deeply copied. This is needed if e.g. `encrypt()` is to be called either on the clone or the original key.
      * @returns {Promise<Key>} Clone of the key.
      */
-    clone(deep = false) {
+    clone(clonePrivateParams = false) {
       const key = new this.constructor(this.toPacketList());
-      if (deep) {
+      if (clonePrivateParams) {
         key.getKeys().forEach(k => {
           // shallow clone the key packets
           k.keyPacket = Object.create(
@@ -27444,30 +27989,30 @@ var openpgp = (function (exports) {
      * @throws if no valid signing key was found
      * @async
      */
-    async getSigningKey(keyID = null, date = new Date(), userID = {}, config = defaultConfig) {
-      await this.verifyPrimaryKey(date, userID, config);
+    async getSigningKey(keyID = null, date = new Date(), userID = {}, config$1 = config) {
+      await this.verifyPrimaryKey(date, userID, config$1);
       const primaryKey = this.keyPacket;
       const subkeys = this.subkeys.slice().sort((a, b) => b.keyPacket.created - a.keyPacket.created);
       let exception;
       for (const subkey of subkeys) {
         if (!keyID || subkey.getKeyID().equals(keyID)) {
           try {
-            await subkey.verify(date, config);
+            await subkey.verify(date, config$1);
             const dataToVerify = { key: primaryKey, bind: subkey.keyPacket };
             const bindingSignature = await getLatestValidSignature(
-              subkey.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config
+              subkey.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config$1
             );
             if (!isValidSigningKeyPacket(subkey.keyPacket, bindingSignature)) {
               continue;
             }
             if (!bindingSignature.embeddedSignature) {
-              throw new Error('Missing embedded signature');
+              throw Error('Missing embedded signature');
             }
             // verify embedded signature
             await getLatestValidSignature(
-              [bindingSignature.embeddedSignature], subkey.keyPacket, enums.signature.keyBinding, dataToVerify, date, config
+              [bindingSignature.embeddedSignature], subkey.keyPacket, enums.signature.keyBinding, dataToVerify, date, config$1
             );
-            checkKeyRequirements(subkey.keyPacket, config);
+            checkKeyRequirements(subkey.keyPacket, config$1);
             return subkey;
           } catch (e) {
             exception = e;
@@ -27476,10 +28021,10 @@ var openpgp = (function (exports) {
       }
 
       try {
-        const primaryUser = await this.getPrimaryUser(date, userID, config);
+        const primaryUser = await this.getPrimaryUser(date, userID, config$1);
         if ((!keyID || primaryKey.getKeyID().equals(keyID)) &&
-            isValidSigningKeyPacket(primaryKey, primaryUser.selfCertification, config)) {
-          checkKeyRequirements(primaryKey, config);
+            isValidSigningKeyPacket(primaryKey, primaryUser.selfCertification, config$1)) {
+          checkKeyRequirements(primaryKey, config$1);
           return this;
         }
       } catch (e) {
@@ -27498,8 +28043,8 @@ var openpgp = (function (exports) {
      * @throws if no valid encryption key was found
      * @async
      */
-    async getEncryptionKey(keyID, date = new Date(), userID = {}, config = defaultConfig) {
-      await this.verifyPrimaryKey(date, userID, config);
+    async getEncryptionKey(keyID, date = new Date(), userID = {}, config$1 = config) {
+      await this.verifyPrimaryKey(date, userID, config$1);
       const primaryKey = this.keyPacket;
       // V4: by convention subkeys are preferred for encryption service
       const subkeys = this.subkeys.slice().sort((a, b) => b.keyPacket.created - a.keyPacket.created);
@@ -27507,11 +28052,11 @@ var openpgp = (function (exports) {
       for (const subkey of subkeys) {
         if (!keyID || subkey.getKeyID().equals(keyID)) {
           try {
-            await subkey.verify(date, config);
+            await subkey.verify(date, config$1);
             const dataToVerify = { key: primaryKey, bind: subkey.keyPacket };
-            const bindingSignature = await getLatestValidSignature(subkey.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config);
+            const bindingSignature = await getLatestValidSignature(subkey.bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config$1);
             if (isValidEncryptionKeyPacket(subkey.keyPacket, bindingSignature)) {
-              checkKeyRequirements(subkey.keyPacket, config);
+              checkKeyRequirements(subkey.keyPacket, config$1);
               return subkey;
             }
           } catch (e) {
@@ -27522,10 +28067,10 @@ var openpgp = (function (exports) {
 
       try {
         // if no valid subkey for encryption, evaluate primary key
-        const primaryUser = await this.getPrimaryUser(date, userID, config);
+        const primaryUser = await this.getPrimaryUser(date, userID, config$1);
         if ((!keyID || primaryKey.getKeyID().equals(keyID)) &&
             isValidEncryptionKeyPacket(primaryKey, primaryUser.selfCertification)) {
-          checkKeyRequirements(primaryKey, config);
+          checkKeyRequirements(primaryKey, config$1);
           return this;
         }
       } catch (e) {
@@ -27546,9 +28091,9 @@ var openpgp = (function (exports) {
      * @returns {Promise<Boolean>} True if the certificate is revoked.
      * @async
      */
-    async isRevoked(signature, key, date = new Date(), config = defaultConfig) {
+    async isRevoked(signature, key, date = new Date(), config$1 = config) {
       return isDataRevoked(
-        this.keyPacket, enums.signature.keyRevocation, { key: this.keyPacket }, this.revocationSignatures, signature, key, date, config
+        this.keyPacket, enums.signature.keyRevocation, { key: this.keyPacket }, this.revocationSignatures, signature, key, date, config$1
       );
     }
 
@@ -27561,25 +28106,25 @@ var openpgp = (function (exports) {
      * @throws {Error} If key verification failed
      * @async
      */
-    async verifyPrimaryKey(date = new Date(), userID = {}, config = defaultConfig) {
+    async verifyPrimaryKey(date = new Date(), userID = {}, config$1 = config) {
       const primaryKey = this.keyPacket;
       // check for key revocation signatures
-      if (await this.isRevoked(null, null, date, config)) {
-        throw new Error('Primary key is revoked');
+      if (await this.isRevoked(null, null, date, config$1)) {
+        throw Error('Primary key is revoked');
       }
       // check for valid, unrevoked, unexpired self signature
-      const { selfCertification } = await this.getPrimaryUser(date, userID, config);
+      const { selfCertification } = await this.getPrimaryUser(date, userID, config$1);
       // check for expiration time in binding signatures
       if (isDataExpired(primaryKey, selfCertification, date)) {
-        throw new Error('Primary key is expired');
+        throw Error('Primary key is expired');
       }
       // check for expiration time in direct signatures
       const directSignature = await getLatestValidSignature(
-        this.directSignatures, primaryKey, enums.signature.key, { key: primaryKey }, date, config
+        this.directSignatures, primaryKey, enums.signature.key, { key: primaryKey }, date, config$1
       ).catch(() => {}); // invalid signatures are discarded, to avoid breaking the key
 
       if (directSignature && isDataExpired(primaryKey, directSignature, date)) {
-        throw new Error('Primary key is expired');
+        throw Error('Primary key is expired');
       }
     }
 
@@ -27591,14 +28136,14 @@ var openpgp = (function (exports) {
      * @returns {Promise<Date | Infinity | null>}
      * @async
      */
-    async getExpirationTime(userID, config = defaultConfig) {
+    async getExpirationTime(userID, config$1 = config) {
       let primaryKeyExpiry;
       try {
-        const { selfCertification } = await this.getPrimaryUser(null, userID, config);
+        const { selfCertification } = await this.getPrimaryUser(null, userID, config$1);
         const selfSigKeyExpiry = getKeyExpirationTime(this.keyPacket, selfCertification);
         const selfSigExpiry = selfCertification.getExpirationTime();
         const directSignature = await getLatestValidSignature(
-          this.directSignatures, this.keyPacket, enums.signature.key, { key: this.keyPacket }, null, config
+          this.directSignatures, this.keyPacket, enums.signature.key, { key: this.keyPacket }, null, config$1
         ).catch(() => {});
         if (directSignature) {
           const directSigKeyExpiry = getKeyExpirationTime(this.keyPacket, directSignature);
@@ -27629,7 +28174,7 @@ var openpgp = (function (exports) {
      * }>} The primary user and the self signature
      * @async
      */
-    async getPrimaryUser(date = new Date(), userID = {}, config = defaultConfig) {
+    async getPrimaryUser(date = new Date(), userID = {}, config$1 = config) {
       const primaryKey = this.keyPacket;
       const users = [];
       let exception;
@@ -27644,20 +28189,20 @@ var openpgp = (function (exports) {
             (userID.email !== undefined && user.userID.email !== userID.email) ||
             (userID.comment !== undefined && user.userID.comment !== userID.comment)
           ) {
-            throw new Error('Could not find user that matches that user ID');
+            throw Error('Could not find user that matches that user ID');
           }
           const dataToVerify = { userID: user.userID, key: primaryKey };
-          const selfCertification = await getLatestValidSignature(user.selfCertifications, primaryKey, enums.signature.certGeneric, dataToVerify, date, config);
+          const selfCertification = await getLatestValidSignature(user.selfCertifications, primaryKey, enums.signature.certGeneric, dataToVerify, date, config$1);
           users.push({ index: i, user, selfCertification });
         } catch (e) {
           exception = e;
         }
       }
       if (!users.length) {
-        throw exception || new Error('Could not find primary user');
+        throw exception || Error('Could not find primary user');
       }
       await Promise.all(users.map(async function (a) {
-        return a.user.revoked || a.user.isRevoked(a.selfCertification, null, date, config);
+        return a.selfCertification.revoked || a.user.isRevoked(a.selfCertification, null, date, config$1);
       }));
       // sort by primary user flag and signature creation time
       const primaryUser = users.sort(function(a, b) {
@@ -27666,8 +28211,8 @@ var openpgp = (function (exports) {
         return B.revoked - A.revoked || A.isPrimaryUserID - B.isPrimaryUserID || A.created - B.created;
       }).pop();
       const { user, selfCertification: cert } = primaryUser;
-      if (cert.revoked || await user.isRevoked(cert, null, date, config)) {
-        throw new Error('Primary user is revoked');
+      if (cert.revoked || await user.isRevoked(cert, null, date, config$1)) {
+        throw Error('Primary user is revoked');
       }
       return primaryUser;
     }
@@ -27685,9 +28230,9 @@ var openpgp = (function (exports) {
      * @returns {Promise<Key>} updated key
      * @async
      */
-    async update(sourceKey, date = new Date(), config = defaultConfig) {
+    async update(sourceKey, date = new Date(), config$1 = config) {
       if (!this.hasSameFingerprintAs(sourceKey)) {
-        throw new Error('Primary key fingerprints must be equal to update the key');
+        throw Error('Primary key fingerprints must be equal to update the key');
       }
       if (!this.isPrivate() && sourceKey.isPrivate()) {
         // check for equal subkey packets
@@ -27698,10 +28243,10 @@ var openpgp = (function (exports) {
                 });
               }));
         if (!equal) {
-          throw new Error('Cannot update public key with private key if subkeys mismatch');
+          throw Error('Cannot update public key with private key if subkeys mismatch');
         }
 
-        return sourceKey.update(this, config);
+        return sourceKey.update(this, config$1);
       }
       // from here on, either:
       // - destination key is private, source key is public
@@ -27710,7 +28255,7 @@ var openpgp = (function (exports) {
       const updatedKey = this.clone();
       // revocation signatures
       await mergeSignatures(sourceKey, updatedKey, 'revocationSignatures', date, srcRevSig => {
-        return isDataRevoked(updatedKey.keyPacket, enums.signature.keyRevocation, updatedKey, [srcRevSig], null, sourceKey.keyPacket, date, config);
+        return isDataRevoked(updatedKey.keyPacket, enums.signature.keyRevocation, updatedKey, [srcRevSig], null, sourceKey.keyPacket, date, config$1);
       });
       // direct signatures
       await mergeSignatures(sourceKey, updatedKey, 'directSignatures', date);
@@ -27724,7 +28269,7 @@ var openpgp = (function (exports) {
         ));
         if (usersToUpdate.length > 0) {
           await Promise.all(
-            usersToUpdate.map(userToUpdate => userToUpdate.update(srcUser, date, config))
+            usersToUpdate.map(userToUpdate => userToUpdate.update(srcUser, date, config$1))
           );
         } else {
           const newUser = srcUser.clone();
@@ -27740,7 +28285,7 @@ var openpgp = (function (exports) {
         ));
         if (subkeysToUpdate.length > 0) {
           await Promise.all(
-            subkeysToUpdate.map(subkeyToUpdate => subkeyToUpdate.update(srcSubkey, date, config))
+            subkeysToUpdate.map(subkeyToUpdate => subkeyToUpdate.update(srcSubkey, date, config$1))
           );
         } else {
           const newSubkey = srcSubkey.clone();
@@ -27760,9 +28305,9 @@ var openpgp = (function (exports) {
      * @returns {Promise<String>} Armored revocation certificate.
      * @async
      */
-    async getRevocationCertificate(date = new Date(), config = defaultConfig) {
+    async getRevocationCertificate(date = new Date(), config$1 = config) {
       const dataToVerify = { key: this.keyPacket };
-      const revocationSignature = await getLatestValidSignature(this.revocationSignatures, this.keyPacket, enums.signature.keyRevocation, dataToVerify, date, config);
+      const revocationSignature = await getLatestValidSignature(this.revocationSignatures, this.keyPacket, enums.signature.keyRevocation, dataToVerify, date, config$1);
       const packetlist = new PacketList();
       packetlist.push(revocationSignature);
       return armor(enums.armor.publicKey, packetlist.write(), null, null, 'This is a revocation certificate');
@@ -27778,18 +28323,18 @@ var openpgp = (function (exports) {
      * @returns {Promise<Key>} Revoked key.
      * @async
      */
-    async applyRevocationCertificate(revocationCertificate, date = new Date(), config = defaultConfig) {
-      const input = await unarmor(revocationCertificate, config);
-      const packetlist = await PacketList.fromBinary(input.data, allowedRevocationPackets, config);
+    async applyRevocationCertificate(revocationCertificate, date = new Date(), config$1 = config) {
+      const input = await unarmor(revocationCertificate, config$1);
+      const packetlist = await PacketList.fromBinary(input.data, allowedRevocationPackets, config$1);
       const revocationSignature = packetlist.findPacket(enums.packet.signature);
       if (!revocationSignature || revocationSignature.signatureType !== enums.signature.keyRevocation) {
-        throw new Error('Could not find revocation signature packet');
+        throw Error('Could not find revocation signature packet');
       }
       if (!revocationSignature.issuerKeyID.equals(this.getKeyID())) {
-        throw new Error('Revocation signature does not match key');
+        throw Error('Revocation signature does not match key');
       }
       try {
-        await revocationSignature.verify(this.keyPacket, enums.signature.keyRevocation, { key: this.keyPacket }, date, undefined, config);
+        await revocationSignature.verify(this.keyPacket, enums.signature.keyRevocation, { key: this.keyPacket }, date, undefined, config$1);
       } catch (e) {
         throw util.wrapError('Could not verify revocation signature', e);
       }
@@ -27807,9 +28352,9 @@ var openpgp = (function (exports) {
      * @returns {Promise<Key>} Key with new certificate signature.
      * @async
      */
-    async signPrimaryUser(privateKeys, date, userID, config = defaultConfig) {
-      const { index, user } = await this.getPrimaryUser(date, userID, config);
-      const userSign = await user.certify(privateKeys, date, config);
+    async signPrimaryUser(privateKeys, date, userID, config$1 = config) {
+      const { index, user } = await this.getPrimaryUser(date, userID, config$1);
+      const userSign = await user.certify(privateKeys, date, config$1);
       const key = this.clone();
       key.users[index] = userSign;
       return key;
@@ -27823,10 +28368,10 @@ var openpgp = (function (exports) {
      * @returns {Promise<Key>} Key with new certificate signature.
      * @async
      */
-    async signAllUsers(privateKeys, date = new Date(), config = defaultConfig) {
+    async signAllUsers(privateKeys, date = new Date(), config$1 = config) {
       const key = this.clone();
       key.users = await Promise.all(this.users.map(function(user) {
-        return user.certify(privateKeys, date, config);
+        return user.certify(privateKeys, date, config$1);
       }));
       return key;
     }
@@ -27846,12 +28391,12 @@ var openpgp = (function (exports) {
      *      Signature validity is null if the verification keys do not correspond to the certificate.
      * @async
      */
-    async verifyPrimaryUser(verificationKeys, date = new Date(), userID, config = defaultConfig) {
+    async verifyPrimaryUser(verificationKeys, date = new Date(), userID, config$1 = config) {
       const primaryKey = this.keyPacket;
-      const { user } = await this.getPrimaryUser(date, userID, config);
+      const { user } = await this.getPrimaryUser(date, userID, config$1);
       const results = verificationKeys ?
-        await user.verifyAllCertifications(verificationKeys, date, config) :
-        [{ keyID: primaryKey.getKeyID(), valid: await user.verify(date, config).catch(() => false) }];
+        await user.verifyAllCertifications(verificationKeys, date, config$1) :
+        [{ keyID: primaryKey.getKeyID(), valid: await user.verify(date, config$1).catch(() => false) }];
       return results;
     }
 
@@ -27870,17 +28415,18 @@ var openpgp = (function (exports) {
      *      Signature validity is null if the verification keys do not correspond to the certificate.
      * @async
      */
-    async verifyAllUsers(verificationKeys, date = new Date(), config = defaultConfig) {
+    async verifyAllUsers(verificationKeys, date = new Date(), config$1 = config) {
       const primaryKey = this.keyPacket;
       const results = [];
       await Promise.all(this.users.map(async user => {
         const signatures = verificationKeys ?
-          await user.verifyAllCertifications(verificationKeys, date, config) :
-          [{ keyID: primaryKey.getKeyID(), valid: await user.verify(date, config).catch(() => false) }];
+          await user.verifyAllCertifications(verificationKeys, date, config$1) :
+          [{ keyID: primaryKey.getKeyID(), valid: await user.verify(date, config$1).catch(() => false) }];
 
         results.push(...signatures.map(
           signature => ({
-            userID: user.userID.userID,
+            userID: user.userID ? user.userID.userID : null,
+            userAttribute: user.userAttribute,
             keyID: signature.keyID,
             valid: signature.valid
           }))
@@ -27895,24 +28441,6 @@ var openpgp = (function (exports) {
     Subkey.prototype[name];
   });
 
-  /**
-   * Creates a PublicKey or PrivateKey depending on the packetlist in input
-   * @param {PacketList} - packets to parse
-   * @return {Key} parsed key
-   * @throws if no key packet was found
-   */
-  function createKey(packetlist) {
-    for (const packet of packetlist) {
-      switch (packet.constructor.tag) {
-        case enums.packet.secretKey:
-          return new PrivateKey(packetlist);
-        case enums.packet.publicKey:
-          return new PublicKey(packetlist);
-      }
-    }
-    throw new Error('No key packet found');
-  }
-
   // This library is free software; you can redistribute it and/or
 
   /**
@@ -27932,7 +28460,7 @@ var openpgp = (function (exports) {
       if (packetlist) {
         this.packetListToStructure(packetlist, new Set([enums.packet.secretKey, enums.packet.secretSubkey]));
         if (!this.keyPacket) {
-          throw new Error('Invalid key: missing public-key packet');
+          throw Error('Invalid key: missing public-key packet');
         }
       }
     }
@@ -27958,8 +28486,8 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {ReadableStream<String>} ASCII armor.
      */
-    armor(config = defaultConfig) {
-      return armor(enums.armor.publicKey, this.toPacketList().write(), undefined, undefined, undefined, config);
+    armor(config$1 = config) {
+      return armor(enums.armor.publicKey, this.toPacketList().write(), undefined, undefined, undefined, config$1);
     }
   }
 
@@ -27974,7 +28502,7 @@ var openpgp = (function (exports) {
       super();
       this.packetListToStructure(packetlist, new Set([enums.packet.publicKey, enums.packet.publicSubkey]));
       if (!this.keyPacket) {
-        throw new Error('Invalid key: missing private-key packet');
+        throw Error('Invalid key: missing private-key packet');
       }
     }
 
@@ -28017,8 +28545,8 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {ReadableStream<String>} ASCII armor.
      */
-    armor(config = defaultConfig) {
-      return armor(enums.armor.privateKey, this.toPacketList().write(), undefined, undefined, undefined, config);
+    armor(config$1 = config) {
+      return armor(enums.armor.privateKey, this.toPacketList().write(), undefined, undefined, undefined, config$1);
     }
 
     /**
@@ -28031,15 +28559,15 @@ var openpgp = (function (exports) {
      * @returns {Promise<Array<Key|Subkey>>} Array of decryption keys.
      * @async
      */
-    async getDecryptionKeys(keyID, date = new Date(), userID = {}, config = defaultConfig) {
+    async getDecryptionKeys(keyID, date = new Date(), userID = {}, config$1 = config) {
       const primaryKey = this.keyPacket;
       const keys = [];
       for (let i = 0; i < this.subkeys.length; i++) {
         if (!keyID || this.subkeys[i].getKeyID().equals(keyID, true)) {
           try {
             const dataToVerify = { key: primaryKey, bind: this.subkeys[i].keyPacket };
-            const bindingSignature = await getLatestValidSignature(this.subkeys[i].bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config);
-            if (isValidDecryptionKeyPacket(bindingSignature, config)) {
+            const bindingSignature = await getLatestValidSignature(this.subkeys[i].bindingSignatures, primaryKey, enums.signature.subkeyBinding, dataToVerify, date, config$1);
+            if (isValidDecryptionKeyPacket(bindingSignature, config$1)) {
               keys.push(this.subkeys[i]);
             }
           } catch (e) {}
@@ -28047,9 +28575,9 @@ var openpgp = (function (exports) {
       }
 
       // evaluate primary key
-      const primaryUser = await this.getPrimaryUser(date, userID, config);
+      const primaryUser = await this.getPrimaryUser(date, userID, config$1);
       if ((!keyID || primaryKey.getKeyID().equals(keyID, true)) &&
-          isValidDecryptionKeyPacket(primaryUser.selfCertification, config)) {
+          isValidDecryptionKeyPacket(primaryUser.selfCertification, config$1)) {
         keys.push(this);
       }
 
@@ -28074,9 +28602,9 @@ var openpgp = (function (exports) {
      * @throws {Error} if validation was not successful and the key cannot be trusted
      * @async
      */
-    async validate(config = defaultConfig) {
+    async validate(config$1 = config) {
       if (!this.isPrivate()) {
-        throw new Error('Cannot validate a public key');
+        throw Error('Cannot validate a public key');
       }
 
       let signingKeyPacket;
@@ -28087,7 +28615,7 @@ var openpgp = (function (exports) {
          * It is enough to validate any signing keys
          * since its binding signatures are also checked
          */
-        const signingKey = await this.getSigningKey(null, null, undefined, { ...config, rejectPublicKeyAlgorithms: new Set(), minRSABits: 0 });
+        const signingKey = await this.getSigningKey(null, null, undefined, { ...config$1, rejectPublicKeyAlgorithms: new Set(), minRSABits: 0 });
         // This could again be a dummy key
         if (signingKey && !signingKey.keyPacket.isDummy()) {
           signingKeyPacket = signingKey.keyPacket;
@@ -28100,7 +28628,7 @@ var openpgp = (function (exports) {
         const keys = this.getKeys();
         const allDummies = keys.map(key => key.keyPacket.isDummy()).every(Boolean);
         if (allDummies) {
-          throw new Error('Cannot validate an all-gnu-dummy key');
+          throw Error('Cannot validate an all-gnu-dummy key');
         }
 
         return Promise.all(keys.map(async key => key.keyPacket.validate()));
@@ -28134,10 +28662,10 @@ var openpgp = (function (exports) {
         string: reasonForRevocationString = ''
       } = {},
       date = new Date(),
-      config = defaultConfig
+      config$1 = config
     ) {
       if (!this.isPrivate()) {
-        throw new Error('Need private key for revoking');
+        throw Error('Need private key for revoking');
       }
       const dataToSign = { key: this.keyPacket };
       const key = this.clone();
@@ -28145,7 +28673,7 @@ var openpgp = (function (exports) {
         signatureType: enums.signature.keyRevocation,
         reasonForRevocationFlag: enums.write(enums.reasonForRevocation, reasonForRevocationFlag),
         reasonForRevocationString
-      }, date, undefined, undefined, config));
+      }, date, undefined, undefined, undefined, config$1));
       return key;
     }
 
@@ -28164,19 +28692,19 @@ var openpgp = (function (exports) {
      * @async
      */
     async addSubkey(options = {}) {
-      const config = { ...defaultConfig, ...options.config };
+      const config$1 = { ...config, ...options.config };
       if (options.passphrase) {
-        throw new Error('Subkey could not be encrypted here, please encrypt whole key');
+        throw Error('Subkey could not be encrypted here, please encrypt whole key');
       }
-      if (options.rsaBits < config.minRSABits) {
-        throw new Error(`rsaBits should be at least ${config.minRSABits}, got: ${options.rsaBits}`);
+      if (options.rsaBits < config$1.minRSABits) {
+        throw Error(`rsaBits should be at least ${config$1.minRSABits}, got: ${options.rsaBits}`);
       }
       const secretKeyPacket = this.keyPacket;
       if (secretKeyPacket.isDummy()) {
-        throw new Error('Cannot add subkey to gnu-dummy primary key');
+        throw Error('Cannot add subkey to gnu-dummy primary key');
       }
       if (!secretKeyPacket.isDecrypted()) {
-        throw new Error('Key is not decrypted');
+        throw Error('Key is not decrypted');
       }
       const defaultOptions = secretKeyPacket.getAlgorithmInfo();
       defaultOptions.type = defaultOptions.curve ? 'ecc' : 'rsa'; // DSA keys default to RSA
@@ -28184,8 +28712,8 @@ var openpgp = (function (exports) {
       defaultOptions.curve = defaultOptions.curve || 'curve25519';
       options = sanitizeKeyOptions(options, defaultOptions);
       const keyPacket = await generateSecretSubkey(options);
-      checkKeyRequirements(keyPacket, config);
-      const bindingSignature = await createBindingSignature(keyPacket, secretKeyPacket, options, config);
+      checkKeyRequirements(keyPacket, config$1);
+      const bindingSignature = await createBindingSignature(keyPacket, secretKeyPacket, options, config$1);
       const packetList = this.toPacketList();
       packetList.push(keyPacket, bindingSignature);
       return new PrivateKey(packetList);
@@ -28205,6 +28733,25 @@ var openpgp = (function (exports) {
     SignaturePacket
   ]);
 
+  /**
+   * Creates a PublicKey or PrivateKey depending on the packetlist in input
+   * @param {PacketList} - packets to parse
+   * @return {Key} parsed key
+   * @throws if no key packet was found
+   */
+  function createKey(packetlist) {
+    for (const packet of packetlist) {
+      switch (packet.constructor.tag) {
+        case enums.packet.secretKey:
+          return new PrivateKey(packetlist);
+        case enums.packet.publicKey:
+          return new PublicKey(packetlist);
+      }
+    }
+    throw Error('No key packet found');
+  }
+
+
   /**
    * Generates a new OpenPGP key. Supports RSA and ECC keys.
    * By default, primary and subkeys will be of same type.
@@ -28257,16 +28804,16 @@ var openpgp = (function (exports) {
     const { privateKey } = options;
 
     if (!privateKey.isPrivate()) {
-      throw new Error('Cannot reformat a public key');
+      throw Error('Cannot reformat a public key');
     }
 
     if (privateKey.keyPacket.isDummy()) {
-      throw new Error('Cannot reformat a gnu-dummy primary key');
+      throw Error('Cannot reformat a gnu-dummy primary key');
     }
 
     const isDecrypted = privateKey.getKeys().every(({ keyPacket }) => keyPacket.isDecrypted());
     if (!isDecrypted) {
-      throw new Error('Key is not decrypted');
+      throw Error('Key is not decrypted');
     }
 
     const secretKeyPacket = privateKey.keyPacket;
@@ -28286,7 +28833,7 @@ var openpgp = (function (exports) {
 
     const secretSubkeyPackets = privateKey.subkeys.map(subkey => subkey.keyPacket);
     if (options.subkeys.length !== secretSubkeyPackets.length) {
-      throw new Error('Number of subkey options does not match number of subkeys');
+      throw Error('Number of subkey options does not match number of subkeys');
     }
 
     options.subkeys = options.subkeys.map(subkeyOptions => sanitize(subkeyOptions, options));
@@ -28339,50 +28886,50 @@ var openpgp = (function (exports) {
       const dataToSign = {};
       dataToSign.userID = userIDPacket;
       dataToSign.key = secretKeyPacket;
-      const signaturePacket = new SignaturePacket();
-      signaturePacket.signatureType = enums.signature.certGeneric;
-      signaturePacket.publicKeyAlgorithm = secretKeyPacket.algorithm;
-      signaturePacket.hashAlgorithm = await getPreferredHashAlgo(null, secretKeyPacket, undefined, undefined, config);
-      signaturePacket.keyFlags = [enums.keyFlags.certifyKeys | enums.keyFlags.signData];
-      signaturePacket.preferredSymmetricAlgorithms = createPreferredAlgos([
+
+      const signatureProperties = {};
+      signatureProperties.signatureType = enums.signature.certGeneric;
+      signatureProperties.keyFlags = [enums.keyFlags.certifyKeys | enums.keyFlags.signData];
+      signatureProperties.preferredSymmetricAlgorithms = createPreferredAlgos([
         // prefer aes256, aes128, then aes192 (no WebCrypto support: https://www.chromium.org/blink/webcrypto#TOC-AES-support)
         enums.symmetric.aes256,
         enums.symmetric.aes128,
         enums.symmetric.aes192
       ], config.preferredSymmetricAlgorithm);
       if (config.aeadProtect) {
-        signaturePacket.preferredAEADAlgorithms = createPreferredAlgos([
+        signatureProperties.preferredAEADAlgorithms = createPreferredAlgos([
           enums.aead.eax,
           enums.aead.ocb
         ], config.preferredAEADAlgorithm);
       }
-      signaturePacket.preferredHashAlgorithms = createPreferredAlgos([
+      signatureProperties.preferredHashAlgorithms = createPreferredAlgos([
         // prefer fast asm.js implementations (SHA-256)
         enums.hash.sha256,
         enums.hash.sha512
       ], config.preferredHashAlgorithm);
-      signaturePacket.preferredCompressionAlgorithms = createPreferredAlgos([
+      signatureProperties.preferredCompressionAlgorithms = createPreferredAlgos([
         enums.compression.zlib,
         enums.compression.zip,
         enums.compression.uncompressed
       ], config.preferredCompressionAlgorithm);
       if (index === 0) {
-        signaturePacket.isPrimaryUserID = true;
+        signatureProperties.isPrimaryUserID = true;
       }
       // integrity protection always enabled
-      signaturePacket.features = [0];
-      signaturePacket.features[0] |= enums.features.modificationDetection;
+      signatureProperties.features = [0];
+      signatureProperties.features[0] |= enums.features.modificationDetection;
       if (config.aeadProtect) {
-        signaturePacket.features[0] |= enums.features.aead;
+        signatureProperties.features[0] |= enums.features.aead;
       }
       if (config.v5Keys) {
-        signaturePacket.features[0] |= enums.features.v5Keys;
+        signatureProperties.features[0] |= enums.features.v5Keys;
       }
       if (options.keyExpirationTime > 0) {
-        signaturePacket.keyExpirationTime = options.keyExpirationTime;
-        signaturePacket.keyNeverExpires = false;
+        signatureProperties.keyExpirationTime = options.keyExpirationTime;
+        signatureProperties.keyNeverExpires = false;
       }
-      await signaturePacket.sign(secretKeyPacket, dataToSign, options.date);
+
+      const signaturePacket = await createSignaturePacket(dataToSign, null, secretKeyPacket, signatureProperties, options.date, undefined, undefined, undefined, config);
 
       return { userIDPacket, signaturePacket };
     })).then(list => {
@@ -28410,7 +28957,7 @@ var openpgp = (function (exports) {
       signatureType: enums.signature.keyRevocation,
       reasonForRevocationFlag: enums.reasonForRevocation.noReason,
       reasonForRevocationString: ''
-    }, options.date, undefined, undefined, config));
+    }, options.date, undefined, undefined, undefined, config));
 
     if (options.passphrase) {
       secretKeyPacket.clearPrivateParams();
@@ -28436,30 +28983,30 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readKey({ armoredKey, binaryKey, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readKey({ armoredKey, binaryKey, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     if (!armoredKey && !binaryKey) {
-      throw new Error('readKey: must pass options object containing `armoredKey` or `binaryKey`');
+      throw Error('readKey: must pass options object containing `armoredKey` or `binaryKey`');
     }
     if (armoredKey && !util.isString(armoredKey)) {
-      throw new Error('readKey: options.armoredKey must be a string');
+      throw Error('readKey: options.armoredKey must be a string');
     }
     if (binaryKey && !util.isUint8Array(binaryKey)) {
-      throw new Error('readKey: options.binaryKey must be a Uint8Array');
+      throw Error('readKey: options.binaryKey must be a Uint8Array');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     let input;
     if (armoredKey) {
-      const { type, data } = await unarmor(armoredKey, config);
+      const { type, data } = await unarmor(armoredKey, config$1);
       if (!(type === enums.armor.publicKey || type === enums.armor.privateKey)) {
-        throw new Error('Armored text not of type key');
+        throw Error('Armored text not of type key');
       }
       input = data;
     } else {
       input = binaryKey;
     }
-    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config);
+    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config$1);
     return createKey(packetlist);
   }
 
@@ -28473,30 +29020,30 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readPrivateKey({ armoredKey, binaryKey, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readPrivateKey({ armoredKey, binaryKey, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     if (!armoredKey && !binaryKey) {
-      throw new Error('readPrivateKey: must pass options object containing `armoredKey` or `binaryKey`');
+      throw Error('readPrivateKey: must pass options object containing `armoredKey` or `binaryKey`');
     }
     if (armoredKey && !util.isString(armoredKey)) {
-      throw new Error('readPrivateKey: options.armoredKey must be a string');
+      throw Error('readPrivateKey: options.armoredKey must be a string');
     }
     if (binaryKey && !util.isUint8Array(binaryKey)) {
-      throw new Error('readPrivateKey: options.binaryKey must be a Uint8Array');
+      throw Error('readPrivateKey: options.binaryKey must be a Uint8Array');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     let input;
     if (armoredKey) {
-      const { type, data } = await unarmor(armoredKey, config);
+      const { type, data } = await unarmor(armoredKey, config$1);
       if (!(type === enums.armor.privateKey)) {
-        throw new Error('Armored text not of type private key');
+        throw Error('Armored text not of type private key');
       }
       input = data;
     } else {
       input = binaryKey;
     }
-    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config);
+    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config$1);
     return new PrivateKey(packetlist);
   }
 
@@ -28510,32 +29057,32 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readKeys({ armoredKeys, binaryKeys, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readKeys({ armoredKeys, binaryKeys, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     let input = armoredKeys || binaryKeys;
     if (!input) {
-      throw new Error('readKeys: must pass options object containing `armoredKeys` or `binaryKeys`');
+      throw Error('readKeys: must pass options object containing `armoredKeys` or `binaryKeys`');
     }
     if (armoredKeys && !util.isString(armoredKeys)) {
-      throw new Error('readKeys: options.armoredKeys must be a string');
+      throw Error('readKeys: options.armoredKeys must be a string');
     }
     if (binaryKeys && !util.isUint8Array(binaryKeys)) {
-      throw new Error('readKeys: options.binaryKeys must be a Uint8Array');
+      throw Error('readKeys: options.binaryKeys must be a Uint8Array');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (armoredKeys) {
-      const { type, data } = await unarmor(armoredKeys, config);
+      const { type, data } = await unarmor(armoredKeys, config$1);
       if (type !== enums.armor.publicKey && type !== enums.armor.privateKey) {
-        throw new Error('Armored text not of type key');
+        throw Error('Armored text not of type key');
       }
       input = data;
     }
     const keys = [];
-    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config);
+    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config$1);
     const keyIndex = packetlist.indexOfTag(enums.packet.publicKey, enums.packet.secretKey);
     if (keyIndex.length === 0) {
-      throw new Error('No key packet found');
+      throw Error('No key packet found');
     }
     for (let i = 0; i < keyIndex.length; i++) {
       const oneKeyList = packetlist.slice(keyIndex[i], keyIndex[i + 1]);
@@ -28555,30 +29102,30 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readPrivateKeys({ armoredKeys, binaryKeys, config }) {
-    config = { ...defaultConfig, ...config };
+  async function readPrivateKeys({ armoredKeys, binaryKeys, config: config$1 }) {
+    config$1 = { ...config, ...config$1 };
     let input = armoredKeys || binaryKeys;
     if (!input) {
-      throw new Error('readPrivateKeys: must pass options object containing `armoredKeys` or `binaryKeys`');
+      throw Error('readPrivateKeys: must pass options object containing `armoredKeys` or `binaryKeys`');
     }
     if (armoredKeys && !util.isString(armoredKeys)) {
-      throw new Error('readPrivateKeys: options.armoredKeys must be a string');
+      throw Error('readPrivateKeys: options.armoredKeys must be a string');
     }
     if (binaryKeys && !util.isUint8Array(binaryKeys)) {
-      throw new Error('readPrivateKeys: options.binaryKeys must be a Uint8Array');
+      throw Error('readPrivateKeys: options.binaryKeys must be a Uint8Array');
     }
     if (armoredKeys) {
-      const { type, data } = await unarmor(armoredKeys, config);
+      const { type, data } = await unarmor(armoredKeys, config$1);
       if (type !== enums.armor.privateKey) {
-        throw new Error('Armored text not of type private key');
+        throw Error('Armored text not of type private key');
       }
       input = data;
     }
     const keys = [];
-    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config);
+    const packetlist = await PacketList.fromBinary(input, allowedKeyPackets, config$1);
     const keyIndex = packetlist.indexOfTag(enums.packet.secretKey);
     if (keyIndex.length === 0) {
-      throw new Error('No secret key packet found');
+      throw Error('No secret key packet found');
     }
     for (let i = 0; i < keyIndex.length; i++) {
       const oneKeyList = packetlist.slice(keyIndex[i], keyIndex[i + 1]);
@@ -28659,8 +29206,8 @@ var openpgp = (function (exports) {
      * @returns {Promise<Message>} New message with decrypted content.
      * @async
      */
-    async decrypt(decryptionKeys, passwords, sessionKeys, date = new Date(), config = defaultConfig) {
-      const sessionKeyObjects = sessionKeys || await this.decryptSessionKeys(decryptionKeys, passwords, date, config);
+    async decrypt(decryptionKeys, passwords, sessionKeys, date = new Date(), config$1 = config) {
+      const sessionKeyObjects = sessionKeys || await this.decryptSessionKeys(decryptionKeys, passwords, date, config$1);
 
       const symEncryptedPacketlist = this.packets.filterByTag(
         enums.packet.symmetricallyEncryptedData,
@@ -28669,19 +29216,19 @@ var openpgp = (function (exports) {
       );
 
       if (symEncryptedPacketlist.length === 0) {
-        return this;
+        throw Error('No encrypted data found');
       }
 
       const symEncryptedPacket = symEncryptedPacketlist[0];
       let exception = null;
       const decryptedPromise = Promise.all(sessionKeyObjects.map(async ({ algorithm: algorithmName, data }) => {
         if (!util.isUint8Array(data) || !util.isString(algorithmName)) {
-          throw new Error('Invalid session key for decryption.');
+          throw Error('Invalid session key for decryption.');
         }
 
         try {
           const algo = enums.write(enums.symmetric, algorithmName);
-          await symEncryptedPacket.decrypt(algo, data, config);
+          await symEncryptedPacket.decrypt(algo, data, config$1);
         } catch (e) {
           console.error(e);
           exception = e;
@@ -28693,7 +29240,7 @@ var openpgp = (function (exports) {
       await decryptedPromise;
 
       if (!symEncryptedPacket.packets || !symEncryptedPacket.packets.length) {
-        throw exception || new Error('Decryption failed.');
+        throw exception || Error('Decryption failed.');
       }
 
       const resultMsg = new Message(symEncryptedPacket.packets);
@@ -28714,19 +29261,19 @@ var openpgp = (function (exports) {
      * }>>} array of object with potential sessionKey, algorithm pairs
      * @async
      */
-    async decryptSessionKeys(decryptionKeys, passwords, date = new Date(), config = defaultConfig) {
+    async decryptSessionKeys(decryptionKeys, passwords, date = new Date(), config$1 = config) {
       let decryptedSessionKeyPackets = [];
 
       let exception;
       if (passwords) {
         const skeskPackets = this.packets.filterByTag(enums.packet.symEncryptedSessionKey);
         if (skeskPackets.length === 0) {
-          throw new Error('No symmetrically encrypted session key packet found.');
+          throw Error('No symmetrically encrypted session key packet found.');
         }
         await Promise.all(passwords.map(async function(password, i) {
           let packets;
           if (i) {
-            packets = await PacketList.fromBinary(skeskPackets.write(), allowedSymSessionKeyPackets, config);
+            packets = await PacketList.fromBinary(skeskPackets.write(), allowedSymSessionKeyPackets, config$1);
           } else {
             packets = skeskPackets;
           }
@@ -28742,7 +29289,7 @@ var openpgp = (function (exports) {
       } else if (decryptionKeys) {
         const pkeskPackets = this.packets.filterByTag(enums.packet.publicKeyEncryptedSessionKey);
         if (pkeskPackets.length === 0) {
-          throw new Error('No public key encrypted session key packet found.');
+          throw Error('No public key encrypted session key packet found.');
         }
         await Promise.all(pkeskPackets.map(async function(pkeskPacket) {
           await Promise.all(decryptionKeys.map(async function(decryptionKey) {
@@ -28753,24 +29300,24 @@ var openpgp = (function (exports) {
               enums.symmetric.cast5 // Golang OpenPGP fallback
             ];
             try {
-              const primaryUser = await decryptionKey.getPrimaryUser(date, undefined, config); // TODO: Pass userID from somewhere.
+              const primaryUser = await decryptionKey.getPrimaryUser(date, undefined, config$1); // TODO: Pass userID from somewhere.
               if (primaryUser.selfCertification.preferredSymmetricAlgorithms) {
                 algos = algos.concat(primaryUser.selfCertification.preferredSymmetricAlgorithms);
               }
             } catch (e) {}
 
             // do not check key expiration to allow decryption of old messages
-            const decryptionKeyPackets = (await decryptionKey.getDecryptionKeys(pkeskPacket.publicKeyID, null, undefined, config)).map(key => key.keyPacket);
+            const decryptionKeyPackets = (await decryptionKey.getDecryptionKeys(pkeskPacket.publicKeyID, null, undefined, config$1)).map(key => key.keyPacket);
             await Promise.all(decryptionKeyPackets.map(async function(decryptionKeyPacket) {
               if (!decryptionKeyPacket || decryptionKeyPacket.isDummy()) {
                 return;
               }
               if (!decryptionKeyPacket.isDecrypted()) {
-                throw new Error('Decryption key is not decrypted.');
+                throw Error('Decryption key is not decrypted.');
               }
 
               // To hinder CCA attacks against PKCS1, we carry out a constant-time decryption flow if the `constantTimePKCS1Decryption` config option is set.
-              const doConstantTimeDecryption = config.constantTimePKCS1Decryption && (
+              const doConstantTimeDecryption = config$1.constantTimePKCS1Decryption && (
                 pkeskPacket.publicKeyAlgorithm === enums.publicKey.rsaEncrypt ||
                 pkeskPacket.publicKeyAlgorithm === enums.publicKey.rsaEncryptSign ||
                 pkeskPacket.publicKeyAlgorithm === enums.publicKey.rsaSign ||
@@ -28789,12 +29336,12 @@ var openpgp = (function (exports) {
                 // NB: as a result, if the data is encrypted with a non-suported cipher, decryption will always fail.
 
                 const serialisedPKESK = pkeskPacket.write(); // make copies to be able to decrypt the PKESK packet multiple times
-                await Promise.all(Array.from(config.constantTimePKCS1DecryptionSupportedSymmetricAlgorithms).map(async sessionKeyAlgorithm => {
+                await Promise.all(Array.from(config$1.constantTimePKCS1DecryptionSupportedSymmetricAlgorithms).map(async sessionKeyAlgorithm => {
                   const pkeskPacketCopy = new PublicKeyEncryptedSessionKeyPacket();
                   pkeskPacketCopy.read(serialisedPKESK);
                   const randomSessionKey = {
                     sessionKeyAlgorithm,
-                    sessionKey: await mod.generateSessionKey(sessionKeyAlgorithm)
+                    sessionKey: mod.generateSessionKey(sessionKeyAlgorithm)
                   };
                   try {
                     await pkeskPacketCopy.decrypt(decryptionKeyPacket, randomSessionKey);
@@ -28810,7 +29357,7 @@ var openpgp = (function (exports) {
                 try {
                   await pkeskPacket.decrypt(decryptionKeyPacket);
                   if (!algos.includes(enums.write(enums.symmetric, pkeskPacket.sessionKeyAlgorithm))) {
-                    throw new Error('A non-preferred symmetric algorithm was used.');
+                    throw Error('A non-preferred symmetric algorithm was used.');
                   }
                   decryptedSessionKeyPackets.push(pkeskPacket);
                 } catch (err) {
@@ -28824,7 +29371,7 @@ var openpgp = (function (exports) {
           pkeskPacket.encrypted = null;
         }));
       } else {
-        throw new Error('No key or password specified.');
+        throw Error('No key or password specified.');
       }
 
       if (decryptedSessionKeyPackets.length > 0) {
@@ -28846,7 +29393,7 @@ var openpgp = (function (exports) {
           algorithm: enums.read(enums.symmetric, packet.sessionKeyAlgorithm)
         }));
       }
-      throw exception || new Error('Session key decryption failed.');
+      throw exception || Error('Session key decryption failed.');
     }
 
     /**
@@ -28891,14 +29438,23 @@ var openpgp = (function (exports) {
      * @returns {Promise<{ data: Uint8Array, algorithm: String, aeadAlgorithm: undefined|String }>} Object with session key data and algorithms.
      * @async
      */
-    static async generateSessionKey(encryptionKeys = [], date = new Date(), userIDs = [], config = defaultConfig) {
-      const algo = await getPreferredAlgo('symmetric', encryptionKeys, date, userIDs, config);
+    static async generateSessionKey(encryptionKeys = [], date = new Date(), userIDs = [], config$1 = config) {
+      const algo = await getPreferredAlgo('symmetric', encryptionKeys, date, userIDs, config$1);
       const algorithmName = enums.read(enums.symmetric, algo);
-      const aeadAlgorithmName = config.aeadProtect && await isAEADSupported(encryptionKeys, date, userIDs, config) ?
-        enums.read(enums.aead, await getPreferredAlgo('aead', encryptionKeys, date, userIDs, config)) :
+      const aeadAlgorithmName = config$1.aeadProtect && await isAEADSupported(encryptionKeys, date, userIDs, config$1) ?
+        enums.read(enums.aead, await getPreferredAlgo('aead', encryptionKeys, date, userIDs, config$1)) :
         undefined;
 
-      const sessionKeyData = await mod.generateSessionKey(algo);
+      await Promise.all(encryptionKeys.map(key => key.getEncryptionKey()
+        .catch(() => null) // ignore key strength requirements
+        .then(maybeKey => {
+          if (maybeKey && (maybeKey.keyPacket.algorithm === enums.publicKey.x25519) && !util.isAES(algo)) {
+            throw Error('Could not generate a session key compatible with the given `encryptionKeys`: X22519 keys can only be used to encrypt AES session keys; change `config.preferredSymmetricAlgorithm` accordingly.');
+          }
+        })
+      ));
+
+      const sessionKeyData = mod.generateSessionKey(algo);
       return { data: sessionKeyData, algorithm: algorithmName, aeadAlgorithm: aeadAlgorithmName };
     }
 
@@ -28915,22 +29471,22 @@ var openpgp = (function (exports) {
      * @returns {Promise<Message>} New message with encrypted content.
      * @async
      */
-    async encrypt(encryptionKeys, passwords, sessionKey, wildcard = false, encryptionKeyIDs = [], date = new Date(), userIDs = [], config = defaultConfig) {
+    async encrypt(encryptionKeys, passwords, sessionKey, wildcard = false, encryptionKeyIDs = [], date = new Date(), userIDs = [], config$1 = config) {
       if (sessionKey) {
         if (!util.isUint8Array(sessionKey.data) || !util.isString(sessionKey.algorithm)) {
-          throw new Error('Invalid session key for encryption.');
+          throw Error('Invalid session key for encryption.');
         }
       } else if (encryptionKeys && encryptionKeys.length) {
-        sessionKey = await Message.generateSessionKey(encryptionKeys, date, userIDs, config);
+        sessionKey = await Message.generateSessionKey(encryptionKeys, date, userIDs, config$1);
       } else if (passwords && passwords.length) {
-        sessionKey = await Message.generateSessionKey(undefined, undefined, undefined, config);
+        sessionKey = await Message.generateSessionKey(undefined, undefined, undefined, config$1);
       } else {
-        throw new Error('No keys, passwords, or session key provided.');
+        throw Error('No keys, passwords, or session key provided.');
       }
 
       const { data: sessionKeyData, algorithm: algorithmName, aeadAlgorithm: aeadAlgorithmName } = sessionKey;
 
-      const msg = await Message.encryptSessionKey(sessionKeyData, algorithmName, aeadAlgorithmName, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, userIDs, config);
+      const msg = await Message.encryptSessionKey(sessionKeyData, algorithmName, aeadAlgorithmName, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, userIDs, config$1);
 
       let symEncryptedPacket;
       if (aeadAlgorithmName) {
@@ -28942,7 +29498,7 @@ var openpgp = (function (exports) {
       symEncryptedPacket.packets = this.packets;
 
       const algorithm = enums.write(enums.symmetric, algorithmName);
-      await symEncryptedPacket.encrypt(algorithm, sessionKeyData, config);
+      await symEncryptedPacket.encrypt(algorithm, sessionKeyData, config$1);
 
       msg.packets.push(symEncryptedPacket);
       symEncryptedPacket.packets = new PacketList(); // remove packets after encryption
@@ -28964,14 +29520,14 @@ var openpgp = (function (exports) {
      * @returns {Promise<Message>} New message with encrypted content.
      * @async
      */
-    static async encryptSessionKey(sessionKey, algorithmName, aeadAlgorithmName, encryptionKeys, passwords, wildcard = false, encryptionKeyIDs = [], date = new Date(), userIDs = [], config = defaultConfig) {
+    static async encryptSessionKey(sessionKey, algorithmName, aeadAlgorithmName, encryptionKeys, passwords, wildcard = false, encryptionKeyIDs = [], date = new Date(), userIDs = [], config$1 = config) {
       const packetlist = new PacketList();
       const algorithm = enums.write(enums.symmetric, algorithmName);
       const aeadAlgorithm = aeadAlgorithmName && enums.write(enums.aead, aeadAlgorithmName);
 
       if (encryptionKeys) {
         const results = await Promise.all(encryptionKeys.map(async function(primaryKey, i) {
-          const encryptionKey = await primaryKey.getEncryptionKey(encryptionKeyIDs[i], date, userIDs, config);
+          const encryptionKey = await primaryKey.getEncryptionKey(encryptionKeyIDs[i], date, userIDs, config$1);
           const pkESKeyPacket = new PublicKeyEncryptedSessionKeyPacket();
           pkESKeyPacket.publicKeyID = wildcard ? KeyID.wildcard() : encryptionKey.getKeyID();
           pkESKeyPacket.publicKeyAlgorithm = encryptionKey.keyPacket.algorithm;
@@ -28996,15 +29552,15 @@ var openpgp = (function (exports) {
         const sum = (accumulator, currentValue) => accumulator + currentValue;
 
         const encryptPassword = async function(sessionKey, algorithm, aeadAlgorithm, password) {
-          const symEncryptedSessionKeyPacket = new SymEncryptedSessionKeyPacket(config);
+          const symEncryptedSessionKeyPacket = new SymEncryptedSessionKeyPacket(config$1);
           symEncryptedSessionKeyPacket.sessionKey = sessionKey;
           symEncryptedSessionKeyPacket.sessionKeyAlgorithm = algorithm;
           if (aeadAlgorithm) {
             symEncryptedSessionKeyPacket.aeadAlgorithm = aeadAlgorithm;
           }
-          await symEncryptedSessionKeyPacket.encrypt(password, config);
+          await symEncryptedSessionKeyPacket.encrypt(password, config$1);
 
-          if (config.passwordCollisionCheck) {
+          if (config$1.passwordCollisionCheck) {
             const results = await Promise.all(passwords.map(pwd => testDecrypt(symEncryptedSessionKeyPacket, pwd)));
             if (results.reduce(sum) !== 1) {
               return encryptPassword(sessionKey, algorithm, password);
@@ -29029,16 +29585,17 @@ var openpgp = (function (exports) {
      * @param {Array<module:type/keyid~KeyID>} [signingKeyIDs] - Array of key IDs to use for signing. Each signingKeyIDs[i] corresponds to signingKeys[i]
      * @param {Date} [date] - Override the creation time of the signature
      * @param {Array} [userIDs] - User IDs to sign with, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
+     * @param {Array} [notations] - Notation Data to add to the signatures, e.g. [{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {Promise<Message>} New message with signed content.
      * @async
      */
-    async sign(signingKeys = [], signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], config = defaultConfig) {
+    async sign(signingKeys = [], signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], notations = [], config$1 = config) {
       const packetlist = new PacketList();
 
       const literalDataPacket = this.packets.findPacket(enums.packet.literalData);
       if (!literalDataPacket) {
-        throw new Error('No literal data packet to sign.');
+        throw Error('No literal data packet to sign.');
       }
 
       let i;
@@ -29065,13 +29622,13 @@ var openpgp = (function (exports) {
 
       await Promise.all(Array.from(signingKeys).reverse().map(async function (primaryKey, i) {
         if (!primaryKey.isPrivate()) {
-          throw new Error('Need private key for signing');
+          throw Error('Need private key for signing');
         }
         const signingKeyID = signingKeyIDs[signingKeys.length - 1 - i];
-        const signingKey = await primaryKey.getSigningKey(signingKeyID, date, userIDs, config);
+        const signingKey = await primaryKey.getSigningKey(signingKeyID, date, userIDs, config$1);
         const onePassSig = new OnePassSignaturePacket();
         onePassSig.signatureType = signatureType;
-        onePassSig.hashAlgorithm = await getPreferredHashAlgo(primaryKey, signingKey.keyPacket, date, userIDs, config);
+        onePassSig.hashAlgorithm = await getPreferredHashAlgo(primaryKey, signingKey.keyPacket, date, userIDs, config$1);
         onePassSig.publicKeyAlgorithm = signingKey.keyPacket.algorithm;
         onePassSig.issuerKeyID = signingKey.getKeyID();
         if (i === signingKeys.length - 1) {
@@ -29083,7 +29640,7 @@ var openpgp = (function (exports) {
       });
 
       packetlist.push(literalDataPacket);
-      packetlist.push(...(await createSignaturePackets(literalDataPacket, signingKeys, signature, signingKeyIDs, date, userIDs, false, config)));
+      packetlist.push(...(await createSignaturePackets(literalDataPacket, signingKeys, signature, signingKeyIDs, date, userIDs, notations, false, config$1)));
 
       return new Message(packetlist);
     }
@@ -29094,12 +29651,12 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {Message} New message with compressed content.
      */
-    compress(algo, config = defaultConfig) {
+    compress(algo, config$1 = config) {
       if (algo === enums.compression.uncompressed) {
         return this;
       }
 
-      const compressed = new CompressedDataPacket(config);
+      const compressed = new CompressedDataPacket(config$1);
       compressed.algorithm = algo;
       compressed.packets = this.packets;
 
@@ -29116,16 +29673,17 @@ var openpgp = (function (exports) {
      * @param {Array<module:type/keyid~KeyID>} [signingKeyIDs] - Array of key IDs to use for signing. Each signingKeyIDs[i] corresponds to signingKeys[i]
      * @param {Date} [date] - Override the creation time of the signature
      * @param {Array} [userIDs] - User IDs to sign with, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
+     * @param {Array} [notations] - Notation Data to add to the signatures, e.g. [{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {Promise<Signature>} New detached signature of message content.
      * @async
      */
-    async signDetached(signingKeys = [], signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], config = defaultConfig) {
+    async signDetached(signingKeys = [], signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], notations = [], config$1 = config) {
       const literalDataPacket = this.packets.findPacket(enums.packet.literalData);
       if (!literalDataPacket) {
-        throw new Error('No literal data packet to sign.');
+        throw Error('No literal data packet to sign.');
       }
-      return new Signature$2(await createSignaturePackets(literalDataPacket, signingKeys, signature, signingKeyIDs, date, userIDs, true, config));
+      return new Signature$2(await createSignaturePackets(literalDataPacket, signingKeys, signature, signingKeyIDs, date, userIDs, notations, true, config$1));
     }
 
     /**
@@ -29140,11 +29698,11 @@ var openpgp = (function (exports) {
      * }>>} List of signer's keyID and validity of signatures.
      * @async
      */
-    async verify(verificationKeys, date = new Date(), config = defaultConfig) {
+    async verify(verificationKeys, date = new Date(), config$1 = config) {
       const msg = this.unwrapCompressed();
       const literalDataList = msg.packets.filterByTag(enums.packet.literalData);
       if (literalDataList.length !== 1) {
-        throw new Error('Can only verify message with one literal data packet.');
+        throw Error('Can only verify message with one literal data packet.');
       }
       if (isArrayStream(msg.packets.stream)) {
         msg.packets.push(...await readToEnd(msg.packets.stream, _ => _ || []));
@@ -29179,9 +29737,9 @@ var openpgp = (function (exports) {
             await writer.abort(e);
           }
         });
-        return createVerificationObjects(onePassSigList, literalDataList, verificationKeys, date, false, config);
+        return createVerificationObjects(onePassSigList, literalDataList, verificationKeys, date, false, config$1);
       }
-      return createVerificationObjects(signatureList, literalDataList, verificationKeys, date, false, config);
+      return createVerificationObjects(signatureList, literalDataList, verificationKeys, date, false, config$1);
     }
 
     /**
@@ -29197,14 +29755,14 @@ var openpgp = (function (exports) {
      * }>>} List of signer's keyID and validity of signature.
      * @async
      */
-    verifyDetached(signature, verificationKeys, date = new Date(), config = defaultConfig) {
+    verifyDetached(signature, verificationKeys, date = new Date(), config$1 = config) {
       const msg = this.unwrapCompressed();
       const literalDataList = msg.packets.filterByTag(enums.packet.literalData);
       if (literalDataList.length !== 1) {
-        throw new Error('Can only verify message with one literal data packet.');
+        throw Error('Can only verify message with one literal data packet.');
       }
-      const signatureList = signature.packets;
-      return createVerificationObjects(signatureList, literalDataList, verificationKeys, date, true, config);
+      const signatureList = signature.packets.filterByTag(enums.packet.signature); // drop UnparsablePackets
+      return createVerificationObjects(signatureList, literalDataList, verificationKeys, date, true, config$1);
     }
 
     /**
@@ -29224,11 +29782,11 @@ var openpgp = (function (exports) {
      * @param {String|Uint8Array} detachedSignature - The detached ASCII-armored or Uint8Array PGP signature
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      */
-    async appendSignature(detachedSignature, config = defaultConfig) {
+    async appendSignature(detachedSignature, config$1 = config) {
       await this.packets.read(
         util.isUint8Array(detachedSignature) ? detachedSignature : (await unarmor(detachedSignature)).data,
         allowedDetachedSignaturePackets,
-        config
+        config$1
       );
     }
 
@@ -29245,8 +29803,8 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {ReadableStream<String>} ASCII armor.
      */
-    armor(config = defaultConfig) {
-      return armor(enums.armor.message, this.write(), null, null, null, config);
+    armor(config$1 = config) {
+      return armor(enums.armor.message, this.write(), null, null, null, config$1);
     }
   }
 
@@ -29258,13 +29816,14 @@ var openpgp = (function (exports) {
    * @param {Array<module:type/keyid~KeyID>} [signingKeyIDs] - Array of key IDs to use for signing. Each signingKeyIDs[i] corresponds to signingKeys[i]
    * @param {Date} [date] - Override the creationtime of the signature
    * @param {Array} [userIDs] - User IDs to sign with, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
+   * @param {Array} [notations] - Notation Data to add to the signatures, e.g. [{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]
    * @param {Boolean} [detached] - Whether to create detached signature packets
    * @param {Object} [config] - Full configuration, defaults to openpgp.config
    * @returns {Promise<PacketList>} List of signature packets.
    * @async
    * @private
    */
-  async function createSignaturePackets(literalDataPacket, signingKeys, signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], detached = false, config = defaultConfig) {
+  async function createSignaturePackets(literalDataPacket, signingKeys, signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], notations = [], detached = false, config$1 = config) {
     const packetlist = new PacketList();
 
     // If data packet was created from Uint8Array, use binary, otherwise use text
@@ -29274,10 +29833,10 @@ var openpgp = (function (exports) {
     await Promise.all(signingKeys.map(async (primaryKey, i) => {
       const userID = userIDs[i];
       if (!primaryKey.isPrivate()) {
-        throw new Error('Need private key for signing');
+        throw Error('Need private key for signing');
       }
-      const signingKey = await primaryKey.getSigningKey(signingKeyIDs[i], date, userID, config);
-      return createSignaturePacket(literalDataPacket, primaryKey, signingKey.keyPacket, { signatureType }, date, userID, detached, config);
+      const signingKey = await primaryKey.getSigningKey(signingKeyIDs[i], date, userID, config$1);
+      return createSignaturePacket(literalDataPacket, primaryKey, signingKey.keyPacket, { signatureType }, date, userID, notations, detached, config$1);
     })).then(signatureList => {
       packetlist.push(...signatureList);
     });
@@ -29305,7 +29864,7 @@ var openpgp = (function (exports) {
    * @async
    * @private
    */
-  async function createVerificationObject(signature, literalDataList, verificationKeys, date = new Date(), detached = false, config = defaultConfig) {
+  async function createVerificationObject(signature, literalDataList, verificationKeys, date = new Date(), detached = false, config$1 = config) {
     let primaryKey;
     let unverifiedSigningKey;
 
@@ -29325,25 +29884,25 @@ var openpgp = (function (exports) {
       keyID: signature.issuerKeyID,
       verified: (async () => {
         if (!unverifiedSigningKey) {
-          throw new Error(`Could not find signing key with key ID ${signature.issuerKeyID.toHex()}`);
+          throw Error(`Could not find signing key with key ID ${signature.issuerKeyID.toHex()}`);
         }
 
-        await signature.verify(unverifiedSigningKey.keyPacket, signature.signatureType, literalDataList[0], date, detached, config);
+        await signature.verify(unverifiedSigningKey.keyPacket, signature.signatureType, literalDataList[0], date, detached, config$1);
         const signaturePacket = await signaturePacketPromise;
         if (unverifiedSigningKey.getCreationTime() > signaturePacket.created) {
-          throw new Error('Key is newer than the signature');
+          throw Error('Key is newer than the signature');
         }
         // We pass the signature creation time to check whether the key was expired at the time of signing.
         // We check this after signature verification because for streamed one-pass signatures, the creation time is not available before
         try {
-          await primaryKey.getSigningKey(unverifiedSigningKey.getKeyID(), signaturePacket.created, undefined, config);
+          await primaryKey.getSigningKey(unverifiedSigningKey.getKeyID(), signaturePacket.created, undefined, config$1);
         } catch (e) {
           // If a key was reformatted then the self-signatures of the signing key might be in the future compared to the message signature,
           // making the key invalid at the time of signing.
           // However, if the key is valid at the given `date`, we still allow using it provided the relevant `config` setting is enabled.
           // Note: we do not support the edge case of a key that was reformatted and it has expired.
-          if (config.allowInsecureVerificationWithReformattedKeys && e.message.match(/Signature creation time is in the future/)) {
-            await primaryKey.getSigningKey(unverifiedSigningKey.getKeyID(), date, undefined, config);
+          if (config$1.allowInsecureVerificationWithReformattedKeys && e.message.match(/Signature creation time is in the future/)) {
+            await primaryKey.getSigningKey(unverifiedSigningKey.getKeyID(), date, undefined, config$1);
           } else {
             throw e;
           }
@@ -29385,11 +29944,11 @@ var openpgp = (function (exports) {
    * @async
    * @private
    */
-  async function createVerificationObjects(signatureList, literalDataList, verificationKeys, date = new Date(), detached = false, config = defaultConfig) {
+  async function createVerificationObjects(signatureList, literalDataList, verificationKeys, date = new Date(), detached = false, config$1 = config) {
     return Promise.all(signatureList.filter(function(signature) {
       return ['text', 'binary'].includes(enums.read(enums.signature, signature.signatureType));
     }).map(async function(signature) {
-      return createVerificationObject(signature, literalDataList, verificationKeys, date, detached, config);
+      return createVerificationObject(signature, literalDataList, verificationKeys, date, detached, config$1);
     }));
   }
 
@@ -29403,19 +29962,19 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readMessage({ armoredMessage, binaryMessage, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readMessage({ armoredMessage, binaryMessage, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     let input = armoredMessage || binaryMessage;
     if (!input) {
-      throw new Error('readMessage: must pass options object containing `armoredMessage` or `binaryMessage`');
+      throw Error('readMessage: must pass options object containing `armoredMessage` or `binaryMessage`');
     }
     if (armoredMessage && !util.isString(armoredMessage) && !util.isStream(armoredMessage)) {
-      throw new Error('readMessage: options.armoredMessage must be a string or stream');
+      throw Error('readMessage: options.armoredMessage must be a string or stream');
     }
     if (binaryMessage && !util.isUint8Array(binaryMessage) && !util.isStream(binaryMessage)) {
-      throw new Error('readMessage: options.binaryMessage must be a Uint8Array or stream');
+      throw Error('readMessage: options.binaryMessage must be a Uint8Array or stream');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     const streamType = util.isStream(input);
     if (streamType) {
@@ -29423,13 +29982,13 @@ var openpgp = (function (exports) {
       input = toStream(input);
     }
     if (armoredMessage) {
-      const { type, data } = await unarmor(input, config);
+      const { type, data } = await unarmor(input, config$1);
       if (type !== enums.armor.message) {
-        throw new Error('Armored text not of type message');
+        throw Error('Armored text not of type message');
       }
       input = data;
     }
-    const packetlist = await PacketList.fromBinary(input, allowedMessagePackets, config);
+    const packetlist = await PacketList.fromBinary(input, allowedMessagePackets, config$1);
     const message = new Message(packetlist);
     message.fromStream = streamType;
     return message;
@@ -29450,15 +30009,15 @@ var openpgp = (function (exports) {
   async function createMessage({ text, binary, filename, date = new Date(), format = text !== undefined ? 'utf8' : 'binary', ...rest }) {
     let input = text !== undefined ? text : binary;
     if (input === undefined) {
-      throw new Error('createMessage: must pass options object containing `text` or `binary`');
+      throw Error('createMessage: must pass options object containing `text` or `binary`');
     }
     if (text && !util.isString(text) && !util.isStream(text)) {
-      throw new Error('createMessage: options.text must be a string or stream');
+      throw Error('createMessage: options.text must be a string or stream');
     }
     if (binary && !util.isUint8Array(binary) && !util.isStream(binary)) {
-      throw new Error('createMessage: options.binary must be a Uint8Array or stream');
+      throw Error('createMessage: options.binary must be a Uint8Array or stream');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     const streamType = util.isStream(input);
     if (streamType) {
@@ -29496,10 +30055,10 @@ var openpgp = (function (exports) {
      * @param {Signature} signature - The detached signature or an empty signature for unsigned messages
      */
     constructor(text, signature) {
-      // normalize EOL to canonical form <CR><LF>
+      // remove trailing whitespace and normalize EOL to canonical form <CR><LF>
       this.text = util.removeTrailingSpaces(text).replace(/\r?\n/g, '\r\n');
       if (signature && !(signature instanceof Signature$2)) {
-        throw new Error('Invalid signature input');
+        throw Error('Invalid signature input');
       }
       this.signature = signature || new Signature$2(new PacketList());
     }
@@ -29524,14 +30083,15 @@ var openpgp = (function (exports) {
      * @param {Array<module:type/keyid~KeyID>} [signingKeyIDs] - Array of key IDs to use for signing. Each signingKeyIDs[i] corresponds to privateKeys[i]
      * @param {Date} [date] - The creation time of the signature that should be created
      * @param {Array} [userIDs] - User IDs to sign with, e.g. [{ name:'Steve Sender', email:'steve@openpgp.org' }]
+     * @param {Array} [notations] - Notation Data to add to the signatures, e.g. [{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {Promise<CleartextMessage>} New cleartext message with signed content.
      * @async
      */
-    async sign(privateKeys, signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], config = defaultConfig) {
+    async sign(privateKeys, signature = null, signingKeyIDs = [], date = new Date(), userIDs = [], notations = [], config$1 = config) {
       const literalDataPacket = new LiteralDataPacket();
       literalDataPacket.setText(this.text);
-      const newSignature = new Signature$2(await createSignaturePackets(literalDataPacket, privateKeys, signature, signingKeyIDs, date, userIDs, true, config));
+      const newSignature = new Signature$2(await createSignaturePackets(literalDataPacket, privateKeys, signature, signingKeyIDs, date, userIDs, notations, true, config$1));
       return new CleartextMessage(this.text, newSignature);
     }
 
@@ -29547,12 +30107,12 @@ var openpgp = (function (exports) {
      * }>>} List of signer's keyID and validity of signature.
      * @async
      */
-    verify(keys, date = new Date(), config = defaultConfig) {
-      const signatureList = this.signature.packets;
+    verify(keys, date = new Date(), config$1 = config) {
+      const signatureList = this.signature.packets.filterByTag(enums.packet.signature); // drop UnparsablePackets
       const literalDataPacket = new LiteralDataPacket();
       // we assume that cleartext signature is generated based on UTF8 cleartext
       literalDataPacket.setText(this.text);
-      return createVerificationObjects(signatureList, [literalDataPacket], keys, date, true, config);
+      return createVerificationObjects(signatureList, [literalDataPacket], keys, date, true, config$1);
     }
 
     /**
@@ -29569,7 +30129,7 @@ var openpgp = (function (exports) {
      * @param {Object} [config] - Full configuration, defaults to openpgp.config
      * @returns {String | ReadableStream<String>} ASCII armor.
      */
-    armor(config = defaultConfig) {
+    armor(config$1 = config) {
       let hashes = this.signature.packets.map(function(packet) {
         return enums.read(enums.hash, packet.hashAlgorithm).toUpperCase();
       });
@@ -29579,7 +30139,7 @@ var openpgp = (function (exports) {
         text: this.text,
         data: this.signature.packets.write()
       };
-      return armor(enums.armor.signed, body, undefined, undefined, undefined, config);
+      return armor(enums.armor.signed, body, undefined, undefined, undefined, config$1);
     }
   }
 
@@ -29592,21 +30152,21 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function readCleartextMessage({ cleartextMessage, config, ...rest }) {
-    config = { ...defaultConfig, ...config };
+  async function readCleartextMessage({ cleartextMessage, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 };
     if (!cleartextMessage) {
-      throw new Error('readCleartextMessage: must pass options object containing `cleartextMessage`');
+      throw Error('readCleartextMessage: must pass options object containing `cleartextMessage`');
     }
     if (!util.isString(cleartextMessage)) {
-      throw new Error('readCleartextMessage: options.cleartextMessage must be a string');
+      throw Error('readCleartextMessage: options.cleartextMessage must be a string');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     const input = await unarmor(cleartextMessage);
     if (input.type !== enums.armor.signed) {
-      throw new Error('No cleartext signed message.');
+      throw Error('No cleartext signed message.');
     }
-    const packetlist = await PacketList.fromBinary(input.data, allowedPackets, config);
+    const packetlist = await PacketList.fromBinary(input.data, allowedPackets, config$1);
     verifyHeaders(input.headers, packetlist);
     const signature = new Signature$2(packetlist);
     return new CleartextMessage(input.text, signature);
@@ -29633,7 +30193,7 @@ var openpgp = (function (exports) {
     let oneHeader = null;
     let hashAlgos = [];
     headers.forEach(function(header) {
-      oneHeader = header.match(/Hash: (.+)/); // get header value
+      oneHeader = header.match(/^Hash: (.+)$/); // get header value
       if (oneHeader) {
         oneHeader = oneHeader[1].replace(/\s/g, ''); // remove whitespace
         oneHeader = oneHeader.split(',');
@@ -29642,19 +30202,19 @@ var openpgp = (function (exports) {
           try {
             return enums.write(enums.hash, hash);
           } catch (e) {
-            throw new Error('Unknown hash algorithm in armor header: ' + hash);
+            throw Error('Unknown hash algorithm in armor header: ' + hash);
           }
         });
         hashAlgos = hashAlgos.concat(oneHeader);
       } else {
-        throw new Error('Only "Hash" header allowed in cleartext signed message');
+        throw Error('Only "Hash" header allowed in cleartext signed message');
       }
     });
 
     if (!hashAlgos.length && !checkHashAlgos([enums.hash.md5])) {
-      throw new Error('If no "Hash" header in cleartext signed message, then only MD5 signatures allowed');
+      throw Error('If no "Hash" header in cleartext signed message, then only MD5 signatures allowed');
     } else if (hashAlgos.length && !checkHashAlgos(hashAlgos)) {
-      throw new Error('Hash algorithm mismatch in armor header and signature');
+      throw Error('Hash algorithm mismatch in armor header and signature');
     }
   }
 
@@ -29667,12 +30227,12 @@ var openpgp = (function (exports) {
    */
   async function createCleartextMessage({ text, ...rest }) {
     if (!text) {
-      throw new Error('createCleartextMessage: must pass options object containing `text`');
+      throw Error('createCleartextMessage: must pass options object containing `text`');
     }
     if (!util.isString(text)) {
-      throw new Error('createCleartextMessage: options.text must be a string');
+      throw Error('createCleartextMessage: options.text must be a string');
     }
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     return new CleartextMessage(text);
   }
@@ -29709,27 +30269,27 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function generateKey({ userIDs = [], passphrase, type = 'ecc', rsaBits = 4096, curve = 'curve25519', keyExpirationTime = 0, date = new Date(), subkeys = [{}], format = 'armored', config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function generateKey({ userIDs = [], passphrase, type = 'ecc', rsaBits = 4096, curve = 'curve25519', keyExpirationTime = 0, date = new Date(), subkeys = [{}], format = 'armored', config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     userIDs = toArray(userIDs);
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (userIDs.length === 0) {
-      throw new Error('UserIDs are required for key generation');
+      throw Error('UserIDs are required for key generation');
     }
-    if (type === 'rsa' && rsaBits < config.minRSABits) {
-      throw new Error(`rsaBits should be at least ${config.minRSABits}, got: ${rsaBits}`);
+    if (type === 'rsa' && rsaBits < config$1.minRSABits) {
+      throw Error(`rsaBits should be at least ${config$1.minRSABits}, got: ${rsaBits}`);
     }
 
     const options = { userIDs, passphrase, type, rsaBits, curve, keyExpirationTime, date, subkeys };
 
     try {
-      const { key, revocationCertificate } = await generate(options, config);
-      key.getKeys().forEach(({ keyPacket }) => checkKeyRequirements(keyPacket, config));
+      const { key, revocationCertificate } = await generate(options, config$1);
+      key.getKeys().forEach(({ keyPacket }) => checkKeyRequirements(keyPacket, config$1));
 
       return {
-        privateKey: formatObject(key, format, config),
-        publicKey: formatObject(key.toPublic(), format, config),
+        privateKey: formatObject(key, format, config$1),
+        publicKey: formatObject(key.toPublic(), format, config$1),
         revocationCertificate
       };
     } catch (err) {
@@ -29753,22 +30313,22 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function reformatKey({ privateKey, userIDs = [], passphrase, keyExpirationTime = 0, date, format = 'armored', config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function reformatKey({ privateKey, userIDs = [], passphrase, keyExpirationTime = 0, date, format = 'armored', config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     userIDs = toArray(userIDs);
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (userIDs.length === 0) {
-      throw new Error('UserIDs are required for key reformat');
+      throw Error('UserIDs are required for key reformat');
     }
     const options = { privateKey, userIDs, passphrase, keyExpirationTime, date };
 
     try {
-      const { key: reformattedKey, revocationCertificate } = await reformat(options, config);
+      const { key: reformattedKey, revocationCertificate } = await reformat(options, config$1);
 
       return {
-        privateKey: formatObject(reformattedKey, format, config),
-        publicKey: formatObject(reformattedKey.toPublic(), format, config),
+        privateKey: formatObject(reformattedKey, format, config$1),
+        publicKey: formatObject(reformattedKey.toPublic(), format, config$1),
         revocationCertificate
       };
     } catch (err) {
@@ -29794,21 +30354,21 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function revokeKey({ key, revocationCertificate, reasonForRevocation, date = new Date(), format = 'armored', config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+  async function revokeKey({ key, revocationCertificate, reasonForRevocation, date = new Date(), format = 'armored', config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     try {
       const revokedKey = revocationCertificate ?
-        await key.applyRevocationCertificate(revocationCertificate, date, config) :
-        await key.revoke(reasonForRevocation, date, config);
+        await key.applyRevocationCertificate(revocationCertificate, date, config$1) :
+        await key.revoke(reasonForRevocation, date, config$1);
 
       return revokedKey.isPrivate() ? {
-        privateKey: formatObject(revokedKey, format, config),
-        publicKey: formatObject(revokedKey.toPublic(), format, config)
+        privateKey: formatObject(revokedKey, format, config$1),
+        publicKey: formatObject(revokedKey.toPublic(), format, config$1)
       } : {
         privateKey: null,
-        publicKey: formatObject(revokedKey, format, config)
+        publicKey: formatObject(revokedKey, format, config$1)
       };
     } catch (err) {
       throw util.wrapError('Error revoking key', err);
@@ -29825,12 +30385,12 @@ var openpgp = (function (exports) {
    * @returns {Promise<PrivateKey>} The unlocked key object.
    * @async
    */
-  async function decryptKey({ privateKey, passphrase, config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+  async function decryptKey({ privateKey, passphrase, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (!privateKey.isPrivate()) {
-      throw new Error('Cannot decrypt a public key');
+      throw Error('Cannot decrypt a public key');
     }
     const clonedPrivateKey = privateKey.clone(true);
     const passphrases = util.isArray(passphrase) ? passphrase : [passphrase];
@@ -29841,7 +30401,7 @@ var openpgp = (function (exports) {
         util.anyPromise(passphrases.map(passphrase => key.keyPacket.decrypt(passphrase)))
       )));
 
-      await clonedPrivateKey.validate(config);
+      await clonedPrivateKey.validate(config$1);
       return clonedPrivateKey;
     } catch (err) {
       clonedPrivateKey.clearPrivateParams();
@@ -29859,25 +30419,25 @@ var openpgp = (function (exports) {
    * @returns {Promise<PrivateKey>} The locked key object.
    * @async
    */
-  async function encryptKey({ privateKey, passphrase, config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+  async function encryptKey({ privateKey, passphrase, config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (!privateKey.isPrivate()) {
-      throw new Error('Cannot encrypt a public key');
+      throw Error('Cannot encrypt a public key');
     }
     const clonedPrivateKey = privateKey.clone(true);
 
     const keys = clonedPrivateKey.getKeys();
     const passphrases = util.isArray(passphrase) ? passphrase : new Array(keys.length).fill(passphrase);
     if (passphrases.length !== keys.length) {
-      throw new Error('Invalid number of passphrases given for key encryption');
+      throw Error('Invalid number of passphrases given for key encryption');
     }
 
     try {
       await Promise.all(keys.map(async (key, i) => {
         const { keyPacket } = key;
-        await keyPacket.encrypt(passphrases[i], config);
+        await keyPacket.encrypt(passphrases[i], config$1);
         keyPacket.clearPrivateParams();
       }));
       return clonedPrivateKey;
@@ -29896,7 +30456,7 @@ var openpgp = (function (exports) {
 
 
   /**
-   * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys` or `passwords`
+   * Encrypts a message using public keys, passwords or both at once. At least one of `encryptionKeys`, `passwords` or `sessionKeys`
    *   must be specified. If signing keys are specified, those will be used to sign the message.
    * @param {Object} options
    * @param {Message} options.message - Message to be encrypted as created by {@link createMessage}
@@ -29912,23 +30472,24 @@ var openpgp = (function (exports) {
    * @param {Date} [options.date=current date] - Override the creation date of the message signature
    * @param {Object|Object[]} [options.signingUserIDs=primary user IDs] - Array of user IDs to sign with, one per key in `signingKeys`, e.g. `[{ name: 'Steve Sender', email: 'steve@openpgp.org' }]`
    * @param {Object|Object[]} [options.encryptionUserIDs=primary user IDs] - Array of user IDs to encrypt for, one per key in `encryptionKeys`, e.g. `[{ name: 'Robert Receiver', email: 'robert@openpgp.org' }]`
+   * @param {Object|Object[]} [options.signatureNotations=[]] - Array of notations to add to the signatures, e.g. `[{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]`
    * @param {Object} [options.config] - Custom configuration settings to overwrite those in [config]{@link module:config}
    * @returns {Promise<MaybeStream<String>|MaybeStream<Uint8Array>>} Encrypted message (string if `armor` was true, the default; Uint8Array if `armor` was false).
    * @async
    * @static
    */
-  async function encrypt({ message, encryptionKeys, signingKeys, passwords, sessionKey, format = 'armored', signature = null, wildcard = false, signingKeyIDs = [], encryptionKeyIDs = [], date = new Date(), signingUserIDs = [], encryptionUserIDs = [], config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function encrypt({ message, encryptionKeys, signingKeys, passwords, sessionKey, format = 'armored', signature = null, wildcard = false, signingKeyIDs = [], encryptionKeyIDs = [], date = new Date(), signingUserIDs = [], encryptionUserIDs = [], signatureNotations = [], config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkMessage(message); checkOutputMessageFormat(format);
     encryptionKeys = toArray(encryptionKeys); signingKeys = toArray(signingKeys); passwords = toArray(passwords);
-    signingKeyIDs = toArray(signingKeyIDs); encryptionKeyIDs = toArray(encryptionKeyIDs); signingUserIDs = toArray(signingUserIDs); encryptionUserIDs = toArray(encryptionUserIDs);
+    signingKeyIDs = toArray(signingKeyIDs); encryptionKeyIDs = toArray(encryptionKeyIDs); signingUserIDs = toArray(signingUserIDs); encryptionUserIDs = toArray(encryptionUserIDs); signatureNotations = toArray(signatureNotations);
     if (rest.detached) {
-      throw new Error("The `detached` option has been removed from openpgp.encrypt, separately call openpgp.sign instead. Don't forget to remove the `privateKeys` option as well.");
+      throw Error("The `detached` option has been removed from openpgp.encrypt, separately call openpgp.sign instead. Don't forget to remove the `privateKeys` option as well.");
     }
-    if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encrypt, pass `encryptionKeys` instead');
-    if (rest.privateKeys) throw new Error('The `privateKeys` option has been removed from openpgp.encrypt, pass `signingKeys` instead');
-    if (rest.armor !== undefined) throw new Error('The `armor` option has been removed from openpgp.encrypt, pass `format` instead.');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.publicKeys) throw Error('The `publicKeys` option has been removed from openpgp.encrypt, pass `encryptionKeys` instead');
+    if (rest.privateKeys) throw Error('The `privateKeys` option has been removed from openpgp.encrypt, pass `signingKeys` instead');
+    if (rest.armor !== undefined) throw Error('The `armor` option has been removed from openpgp.encrypt, pass `format` instead.');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     if (!signingKeys) {
       signingKeys = [];
@@ -29936,17 +30497,17 @@ var openpgp = (function (exports) {
     const streaming = message.fromStream;
     try {
       if (signingKeys.length || signature) { // sign the message only if signing keys or signature is specified
-        message = await message.sign(signingKeys, signature, signingKeyIDs, date, signingUserIDs, config);
+        message = await message.sign(signingKeys, signature, signingKeyIDs, date, signingUserIDs, signatureNotations, config$1);
       }
       message = message.compress(
-        await getPreferredAlgo('compression', encryptionKeys, date, encryptionUserIDs, config),
-        config
+        await getPreferredAlgo('compression', encryptionKeys, date, encryptionUserIDs, config$1),
+        config$1
       );
-      message = await message.encrypt(encryptionKeys, passwords, sessionKey, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config);
+      message = await message.encrypt(encryptionKeys, passwords, sessionKey, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config$1);
       if (format === 'object') return message;
       // serialize data
       const armor = format === 'armored';
-      const data = armor ? message.armor(config) : message.write();
+      const data = armor ? message.armor(config$1) : message.write();
       return convertStream(data, streaming, armor ? 'utf8' : 'binary');
     } catch (err) {
       throw util.wrapError('Error encrypting message', err);
@@ -29986,30 +30547,30 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function decrypt({ message, decryptionKeys, passwords, sessionKeys, verificationKeys, expectSigned = false, format = 'utf8', signature = null, date = new Date(), config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function decrypt({ message, decryptionKeys, passwords, sessionKeys, verificationKeys, expectSigned = false, format = 'utf8', signature = null, date = new Date(), config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkMessage(message); verificationKeys = toArray(verificationKeys); decryptionKeys = toArray(decryptionKeys); passwords = toArray(passwords); sessionKeys = toArray(sessionKeys);
-    if (rest.privateKeys) throw new Error('The `privateKeys` option has been removed from openpgp.decrypt, pass `decryptionKeys` instead');
-    if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.decrypt, pass `verificationKeys` instead');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.privateKeys) throw Error('The `privateKeys` option has been removed from openpgp.decrypt, pass `decryptionKeys` instead');
+    if (rest.publicKeys) throw Error('The `publicKeys` option has been removed from openpgp.decrypt, pass `verificationKeys` instead');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     try {
-      const decrypted = await message.decrypt(decryptionKeys, passwords, sessionKeys, date, config);
+      const decrypted = await message.decrypt(decryptionKeys, passwords, sessionKeys, date, config$1);
       if (!verificationKeys) {
         verificationKeys = [];
       }
 
       const result = {};
-      result.signatures = signature ? await decrypted.verifyDetached(signature, verificationKeys, date, config) : await decrypted.verify(verificationKeys, date, config);
+      result.signatures = signature ? await decrypted.verifyDetached(signature, verificationKeys, date, config$1) : await decrypted.verify(verificationKeys, date, config$1);
       result.data = format === 'binary' ? decrypted.getLiteralData() : decrypted.getText();
       result.filename = decrypted.getFilename();
       linkStreams(result, message);
       if (expectSigned) {
         if (verificationKeys.length === 0) {
-          throw new Error('Verification keys are required to verify message signatures');
+          throw Error('Verification keys are required to verify message signatures');
         }
         if (result.signatures.length === 0) {
-          throw new Error('Message is not signed');
+          throw Error('Message is not signed');
         }
         result.data = concat([
           result.data,
@@ -30043,38 +30604,39 @@ var openpgp = (function (exports) {
    * @param {KeyID|KeyID[]} [options.signingKeyIDs=latest-created valid signing (sub)keys] - Array of key IDs to use for signing. Each signingKeyIDs[i] corresponds to signingKeys[i]
    * @param {Date} [options.date=current date] - Override the creation date of the signature
    * @param {Object|Object[]} [options.signingUserIDs=primary user IDs] - Array of user IDs to sign with, one per key in `signingKeys`, e.g. `[{ name: 'Steve Sender', email: 'steve@openpgp.org' }]`
+   * @param {Object|Object[]} [options.signatureNotations=[]] - Array of notations to add to the signatures, e.g. `[{ name: 'test@example.org', value: new TextEncoder().encode('test'), humanReadable: true, critical: false }]`
    * @param {Object} [options.config] - Custom configuration settings to overwrite those in [config]{@link module:config}
    * @returns {Promise<MaybeStream<String|Uint8Array>>} Signed message (string if `armor` was true, the default; Uint8Array if `armor` was false).
    * @async
    * @static
    */
-  async function sign({ message, signingKeys, format = 'armored', detached = false, signingKeyIDs = [], date = new Date(), signingUserIDs = [], config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function sign({ message, signingKeys, format = 'armored', detached = false, signingKeyIDs = [], date = new Date(), signingUserIDs = [], signatureNotations = [], config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkCleartextOrMessage(message); checkOutputMessageFormat(format);
-    signingKeys = toArray(signingKeys); signingKeyIDs = toArray(signingKeyIDs); signingUserIDs = toArray(signingUserIDs);
+    signingKeys = toArray(signingKeys); signingKeyIDs = toArray(signingKeyIDs); signingUserIDs = toArray(signingUserIDs); signatureNotations = toArray(signatureNotations);
 
-    if (rest.privateKeys) throw new Error('The `privateKeys` option has been removed from openpgp.sign, pass `signingKeys` instead');
-    if (rest.armor !== undefined) throw new Error('The `armor` option has been removed from openpgp.sign, pass `format` instead.');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.privateKeys) throw Error('The `privateKeys` option has been removed from openpgp.sign, pass `signingKeys` instead');
+    if (rest.armor !== undefined) throw Error('The `armor` option has been removed from openpgp.sign, pass `format` instead.');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
-    if (message instanceof CleartextMessage && format === 'binary') throw new Error('Cannot return signed cleartext message in binary format');
-    if (message instanceof CleartextMessage && detached) throw new Error('Cannot detach-sign a cleartext message');
+    if (message instanceof CleartextMessage && format === 'binary') throw Error('Cannot return signed cleartext message in binary format');
+    if (message instanceof CleartextMessage && detached) throw Error('Cannot detach-sign a cleartext message');
 
     if (!signingKeys || signingKeys.length === 0) {
-      throw new Error('No signing keys provided');
+      throw Error('No signing keys provided');
     }
 
     try {
       let signature;
       if (detached) {
-        signature = await message.signDetached(signingKeys, undefined, signingKeyIDs, date, signingUserIDs, config);
+        signature = await message.signDetached(signingKeys, undefined, signingKeyIDs, date, signingUserIDs, signatureNotations, config$1);
       } else {
-        signature = await message.sign(signingKeys, undefined, signingKeyIDs, date, signingUserIDs, config);
+        signature = await message.sign(signingKeys, undefined, signingKeyIDs, date, signingUserIDs, signatureNotations, config$1);
       }
       if (format === 'object') return signature;
 
       const armor = format === 'armored';
-      signature = armor ? signature.armor(config) : signature.write();
+      signature = armor ? signature.armor(config$1) : signature.write();
       if (detached) {
         signature = transformPair(message.packets.write(), async (readable, writable) => {
           await Promise.all([
@@ -30117,27 +30679,27 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function verify({ message, verificationKeys, expectSigned = false, format = 'utf8', signature = null, date = new Date(), config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function verify({ message, verificationKeys, expectSigned = false, format = 'utf8', signature = null, date = new Date(), config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkCleartextOrMessage(message); verificationKeys = toArray(verificationKeys);
-    if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.verify, pass `verificationKeys` instead');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.publicKeys) throw Error('The `publicKeys` option has been removed from openpgp.verify, pass `verificationKeys` instead');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
-    if (message instanceof CleartextMessage && format === 'binary') throw new Error("Can't return cleartext message data as binary");
-    if (message instanceof CleartextMessage && signature) throw new Error("Can't verify detached cleartext signature");
+    if (message instanceof CleartextMessage && format === 'binary') throw Error("Can't return cleartext message data as binary");
+    if (message instanceof CleartextMessage && signature) throw Error("Can't verify detached cleartext signature");
 
     try {
       const result = {};
       if (signature) {
-        result.signatures = await message.verifyDetached(signature, verificationKeys, date, config);
+        result.signatures = await message.verifyDetached(signature, verificationKeys, date, config$1);
       } else {
-        result.signatures = await message.verify(verificationKeys, date, config);
+        result.signatures = await message.verify(verificationKeys, date, config$1);
       }
       result.data = format === 'binary' ? message.getLiteralData() : message.getText();
       if (message.fromStream) linkStreams(result, message);
       if (expectSigned) {
         if (result.signatures.length === 0) {
-          throw new Error('Message is not signed');
+          throw Error('Message is not signed');
         }
         result.data = concat([
           result.data,
@@ -30161,9 +30723,9 @@ var openpgp = (function (exports) {
   ///////////////////////////////////////////////
 
   /**
-   * Generate a new session key object, taking the algorithm preferences of the passed public keys into account.
+   * Generate a new session key object, taking the algorithm preferences of the passed public keys into account, if any.
    * @param {Object} options
-   * @param {PublicKey|PublicKey[]} options.encryptionKeys - Array of public keys or single key used to select algorithm preferences for
+   * @param {PublicKey|PublicKey[]} [options.encryptionKeys] - Array of public keys or single key used to select algorithm preferences for. If no keys are given, the algorithm will be [config.preferredSymmetricAlgorithm]{@link module:config.preferredSymmetricAlgorithm}
    * @param {Date} [options.date=current date] - Date to select algorithm preferences at
    * @param {Object|Object[]} [options.encryptionUserIDs=primary user IDs] - User IDs to select algorithm preferences for
    * @param {Object} [options.config] - Custom configuration settings to overwrite those in [config]{@link module:config}
@@ -30171,14 +30733,14 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function generateSessionKey({ encryptionKeys, date = new Date(), encryptionUserIDs = [], config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function generateSessionKey({ encryptionKeys, date = new Date(), encryptionUserIDs = [], config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     encryptionKeys = toArray(encryptionKeys); encryptionUserIDs = toArray(encryptionUserIDs);
-    if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.generateSessionKey, pass `encryptionKeys` instead');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.publicKeys) throw Error('The `publicKeys` option has been removed from openpgp.generateSessionKey, pass `encryptionKeys` instead');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     try {
-      const sessionKeys = await Message.generateSessionKey(encryptionKeys, date, encryptionUserIDs, config);
+      const sessionKeys = await Message.generateSessionKey(encryptionKeys, date, encryptionUserIDs, config$1);
       return sessionKeys;
     } catch (err) {
       throw util.wrapError('Error generating session key', err);
@@ -30204,16 +30766,20 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function encryptSessionKey({ data, algorithm, aeadAlgorithm, encryptionKeys, passwords, format = 'armored', wildcard = false, encryptionKeyIDs = [], date = new Date(), encryptionUserIDs = [], config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function encryptSessionKey({ data, algorithm, aeadAlgorithm, encryptionKeys, passwords, format = 'armored', wildcard = false, encryptionKeyIDs = [], date = new Date(), encryptionUserIDs = [], config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkBinary(data); checkString(algorithm, 'algorithm'); checkOutputMessageFormat(format);
     encryptionKeys = toArray(encryptionKeys); passwords = toArray(passwords); encryptionKeyIDs = toArray(encryptionKeyIDs); encryptionUserIDs = toArray(encryptionUserIDs);
-    if (rest.publicKeys) throw new Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.publicKeys) throw Error('The `publicKeys` option has been removed from openpgp.encryptSessionKey, pass `encryptionKeys` instead');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
+
+    if ((!encryptionKeys || encryptionKeys.length === 0) && (!passwords || passwords.length === 0)) {
+      throw Error('No encryption keys or passwords provided.');
+    }
 
     try {
-      const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config);
-      return formatObject(message, format, config);
+      const message = await Message.encryptSessionKey(data, algorithm, aeadAlgorithm, encryptionKeys, passwords, wildcard, encryptionKeyIDs, date, encryptionUserIDs, config$1);
+      return formatObject(message, format, config$1);
     } catch (err) {
       throw util.wrapError('Error encrypting session key', err);
     }
@@ -30234,14 +30800,14 @@ var openpgp = (function (exports) {
    * @async
    * @static
    */
-  async function decryptSessionKeys({ message, decryptionKeys, passwords, date = new Date(), config, ...rest }) {
-    config = { ...defaultConfig, ...config }; checkConfig(config);
+  async function decryptSessionKeys({ message, decryptionKeys, passwords, date = new Date(), config: config$1, ...rest }) {
+    config$1 = { ...config, ...config$1 }; checkConfig(config$1);
     checkMessage(message); decryptionKeys = toArray(decryptionKeys); passwords = toArray(passwords);
-    if (rest.privateKeys) throw new Error('The `privateKeys` option has been removed from openpgp.decryptSessionKeys, pass `decryptionKeys` instead');
-    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw new Error(`Unknown option: ${unknownOptions.join(', ')}`);
+    if (rest.privateKeys) throw Error('The `privateKeys` option has been removed from openpgp.decryptSessionKeys, pass `decryptionKeys` instead');
+    const unknownOptions = Object.keys(rest); if (unknownOptions.length > 0) throw Error(`Unknown option: ${unknownOptions.join(', ')}`);
 
     try {
-      const sessionKeys = await message.decryptSessionKeys(decryptionKeys, passwords, date, config);
+      const sessionKeys = await message.decryptSessionKeys(decryptionKeys, passwords, date, config$1);
       return sessionKeys;
     } catch (err) {
       throw util.wrapError('Error decrypting session keys', err);
@@ -30262,36 +30828,36 @@ var openpgp = (function (exports) {
    */
   function checkString(data, name) {
     if (!util.isString(data)) {
-      throw new Error('Parameter [' + (name || 'data') + '] must be of type String');
+      throw Error('Parameter [' + (name || 'data') + '] must be of type String');
     }
   }
   function checkBinary(data, name) {
     if (!util.isUint8Array(data)) {
-      throw new Error('Parameter [' + (name || 'data') + '] must be of type Uint8Array');
+      throw Error('Parameter [' + (name || 'data') + '] must be of type Uint8Array');
     }
   }
   function checkMessage(message) {
     if (!(message instanceof Message)) {
-      throw new Error('Parameter [message] needs to be of type Message');
+      throw Error('Parameter [message] needs to be of type Message');
     }
   }
   function checkCleartextOrMessage(message) {
     if (!(message instanceof CleartextMessage) && !(message instanceof Message)) {
-      throw new Error('Parameter [message] needs to be of type Message or CleartextMessage');
+      throw Error('Parameter [message] needs to be of type Message or CleartextMessage');
     }
   }
   function checkOutputMessageFormat(format) {
     if (format !== 'armored' && format !== 'binary' && format !== 'object') {
-      throw new Error(`Unsupported format ${format}`);
+      throw Error(`Unsupported format ${format}`);
     }
   }
-  const defaultConfigPropsCount = Object.keys(defaultConfig).length;
-  function checkConfig(config) {
-    const inputConfigProps = Object.keys(config);
+  const defaultConfigPropsCount = Object.keys(config).length;
+  function checkConfig(config$1) {
+    const inputConfigProps = Object.keys(config$1);
     if (inputConfigProps.length !== defaultConfigPropsCount) {
       for (const inputProp of inputConfigProps) {
-        if (defaultConfig[inputProp] === undefined) {
-          throw new Error(`Unknown config property: ${inputProp}`);
+        if (config[inputProp] === undefined) {
+          throw Error(`Unknown config property: ${inputProp}`);
         }
       }
     }
@@ -30370,7 +30936,7 @@ var openpgp = (function (exports) {
       case 'binary':
         return object.write();
       default:
-        throw new Error(`Unsupported format ${format}`);
+        throw Error(`Unsupported format ${format}`);
     }
   }
 
@@ -34790,7 +35356,7 @@ var openpgp = (function (exports) {
 
     // Utils
     function assert (val, msg) {
-      if (!val) throw new Error(msg || 'Assertion failed');
+      if (!val) throw Error(msg || 'Assertion failed');
     }
 
     // Could use `inherits` module, but don't want to move from single file
@@ -37914,7 +38480,7 @@ var openpgp = (function (exports) {
       } else if (name === 'p25519') {
         prime = new P25519();
       } else {
-        throw new Error('Unknown prime ' + name);
+        throw Error('Unknown prime ' + name);
       }
       primes[name] = prime;
 
@@ -38252,7 +38818,7 @@ var openpgp = (function (exports) {
      */
     constructor(n) {
       if (n === undefined) {
-        throw new Error('Invalid BigInteger input');
+        throw Error('Invalid BigInteger input');
       }
 
       this.value = new BN(n);
@@ -38396,7 +38962,7 @@ var openpgp = (function (exports) {
     modInv(n) {
       // invm returns a wrong result if the inverse does not exist
       if (!this.gcd(n).isOne()) {
-        throw new Error('Inverse does not exist');
+        throw Error('Inverse does not exist');
       }
       return new BigInteger(this.value.invm(n.value));
     }
@@ -38801,7 +39367,7 @@ var openpgp = (function (exports) {
     } else if (typeof window === 'object') {
       // Old junk
       Rand.prototype._rand = function() {
-        throw new Error('Not implemented yet');
+        throw Error('Not implemented yet');
       };
     }
   } else {
@@ -38809,7 +39375,7 @@ var openpgp = (function (exports) {
     try {
       var crypto$1 = void('crypto');
       if (typeof crypto$1.randomBytes !== 'function')
-        throw new Error('Not supported');
+        throw Error('Not supported');
 
       Rand.prototype._rand = function _rand(n) {
         return crypto$1.randomBytes(n);
@@ -38857,11 +39423,11 @@ var openpgp = (function (exports) {
   var base = BaseCurve;
 
   BaseCurve.prototype.point = function point() {
-    throw new Error('Not implemented');
+    throw Error('Not implemented');
   };
 
   BaseCurve.prototype.validate = function validate() {
-    throw new Error('Not implemented');
+    throw Error('Not implemented');
   };
 
   BaseCurve.prototype._fixedNafMul = function _fixedNafMul(p, k) {
@@ -39070,7 +39636,7 @@ var openpgp = (function (exports) {
   BaseCurve.BasePoint = BasePoint;
 
   BasePoint.prototype.eq = function eq(/*other*/) {
-    throw new Error('Not implemented');
+    throw Error('Not implemented');
   };
 
   BasePoint.prototype.validate = function validate() {
@@ -39098,7 +39664,7 @@ var openpgp = (function (exports) {
                 bytes.length - 1 === len) {
       return this.pointFromX(bytes.slice(1, 1 + len), bytes[0] === 0x03);
     }
-    throw new Error('Unknown point format');
+    throw Error('Unknown point format');
   };
 
   BasePoint.prototype.encodeCompressed = function encodeCompressed(enc) {
@@ -39377,7 +39943,7 @@ var openpgp = (function (exports) {
     var y2 = x.redSqr().redMul(x).redIAdd(x.redMul(this.a)).redIAdd(this.b);
     var y = y2.redSqrt();
     if (y.redSqr().redSub(y2).cmp(this.zero) !== 0)
-      throw new Error('invalid point');
+      throw Error('invalid point');
 
     // XXX Is there any way to tell if the number is odd without converting it
     // to non-red form?
@@ -40169,7 +40735,7 @@ var openpgp = (function (exports) {
     if (bytes.length === 33 && bytes[0] === 0x40)
       bytes = bytes.slice(1, 33).reverse(); // point must be little-endian
     if (bytes.length !== 32)
-      throw new Error('Unknown point compression format');
+      throw Error('Unknown point compression format');
     return this.point(bytes, 1);
   };
 
@@ -40235,7 +40801,7 @@ var openpgp = (function (exports) {
   };
 
   Point$1.prototype.add = function add() {
-    throw new Error('Not supported on Montgomery curve');
+    throw Error('Not supported on Montgomery curve');
   };
 
   Point$1.prototype.diffAdd = function diffAdd(p, diff) {
@@ -40289,11 +40855,11 @@ var openpgp = (function (exports) {
   };
 
   Point$1.prototype.mulAdd = function mulAdd() {
-    throw new Error('Not supported on Montgomery curve');
+    throw Error('Not supported on Montgomery curve');
   };
 
   Point$1.prototype.jumlAdd = function jumlAdd() {
-    throw new Error('Not supported on Montgomery curve');
+    throw Error('Not supported on Montgomery curve');
   };
 
   Point$1.prototype.eq = function eq(other) {
@@ -40367,7 +40933,7 @@ var openpgp = (function (exports) {
     var y2 = rhs.redMul(lhs.redInvm());
     var y = y2.redSqrt();
     if (y.redSqr().redSub(y2).cmp(this.zero) !== 0)
-      throw new Error('invalid point');
+      throw Error('invalid point');
 
     var isOdd = y.fromRed().isOdd();
     if (odd && !isOdd || !odd && isOdd)
@@ -40389,14 +40955,14 @@ var openpgp = (function (exports) {
 
     if (x2.cmp(this.zero) === 0) {
       if (odd)
-        throw new Error('invalid point');
+        throw Error('invalid point');
       else
         return this.point(this.zero, y);
     }
 
     var x = x2.redSqrt();
     if (x.redSqr().redSub(x2).cmp(this.zero) !== 0)
-      throw new Error('invalid point');
+      throw Error('invalid point');
 
     if (x.fromRed().isOdd() !== odd)
       x = x.redNeg();
@@ -41693,7 +42259,7 @@ var openpgp = (function (exports) {
       this.curve = new curve_1.edwards(options);
     else if (options.type === 'mont')
       this.curve = new curve_1.mont(options);
-    else throw new Error('Unknown curve type.');
+    else throw Error('Unknown curve type.');
     this.g = this.curve.g;
     this.n = this.curve.n;
     this.hash = options.hash;
@@ -42029,7 +42595,7 @@ var openpgp = (function (exports) {
 
   HmacDRBG.prototype.generate = function generate(len, enc, add, addEnc) {
     if (this._reseed > this.reseedInterval)
-      throw new Error('Reseed is required');
+      throw Error('Reseed is required');
 
     // Optional encoding
     if (typeof enc !== 'string') {
@@ -42530,7 +43096,7 @@ var openpgp = (function (exports) {
     var isYOdd = j & 1;
     var isSecondKey = j >> 1;
     if (r.cmp(this.curve.p.umod(this.curve.n)) >= 0 && isSecondKey)
-      throw new Error('Unable to find sencond key candinate');
+      throw Error('Unable to find sencond key candinate');
 
     // 1.1. Let x = r + jn.
     if (isSecondKey)
@@ -42563,7 +43129,7 @@ var openpgp = (function (exports) {
       if (Qprime.eq(Q))
         return i;
     }
-    throw new Error('Unable to find valid recovery factor');
+    throw Error('Unable to find valid recovery factor');
   };
 
   var assert$2 = utils_1.assert;
@@ -42591,7 +43157,7 @@ var openpgp = (function (exports) {
           this._pubBytes[0] === 0x40)
         this._pubBytes = this._pubBytes.slice(1, 33);
       if (this._pubBytes && this._pubBytes.length !== 32)
-        throw new Error('Unknown point compression format');
+        throw Error('Unknown point compression format');
     }
   }
 
@@ -42906,10 +43472,11 @@ var openpgp = (function (exports) {
   exports.SymEncryptedSessionKeyPacket = SymEncryptedSessionKeyPacket;
   exports.SymmetricallyEncryptedDataPacket = SymmetricallyEncryptedDataPacket;
   exports.TrustPacket = TrustPacket;
+  exports.UnparseablePacket = UnparseablePacket;
   exports.UserAttributePacket = UserAttributePacket;
   exports.UserIDPacket = UserIDPacket;
   exports.armor = armor;
-  exports.config = defaultConfig;
+  exports.config = config;
   exports.createCleartextMessage = createCleartextMessage;
   exports.createMessage = createMessage;
   exports.decrypt = decrypt;
diff --git a/vendors/routes/crossroads.js b/vendors/routes/crossroads.js
index 3b388198f..84223a2df 100644
--- a/vendors/routes/crossroads.js
+++ b/vendors/routes/crossroads.js
@@ -34,7 +34,7 @@
             while (n--) {
                 route = routes[n];
                 if ((!i || route.greedy) && route.match(request)) {
-                    route.callback && route.callback(...route._getParamsArray(request));
+                    route.callback?.(...route._getParamsArray(request));
                     ++i;
                 }
             }
@@ -68,14 +68,14 @@
                 var val = values[key],
                     isValid = false;
                 if (key === 'normalize_'
-                 || (val == null && this._optionalParamsIds && this._optionalParamsIds.indexOf(key) !== -1)) {
+                 || (val == null && this._optionalParamsIds?.includes(key))) {
                     isValid = true;
                 }
                 else if (validationRule instanceof RegExp) {
                     isValid = validationRule.test(val);
                 }
                 else if (Array.isArray(validationRule)) {
-                    isValid = validationRule.indexOf(val) !== -1;
+                    isValid = validationRule.includes(val);
                 }
                 else if (isFunction(validationRule)) {
                     isValid = validationRule(val, request, values);
@@ -133,7 +133,7 @@
 
         captureVals = (regex, pattern) => {
             var vals = [], match;
-            while (match = regex.exec(pattern)) {
+            while ((match = regex.exec(pattern))) {
                 vals.push(match[1]);
             }
             return vals;
@@ -141,9 +141,7 @@
 
         getParamValues = (request, regexp) => {
             var vals = regexp.exec(request);
-            if (vals) {
-                vals.shift();
-            }
+            vals?.shift();
             return vals;
         },
         compilePattern = pattern => {
diff --git a/vendors/routes/hasher.js b/vendors/routes/hasher.js
index 402fe8b70..c35956f65 100644
--- a/vendors/routes/hasher.js
+++ b/vendors/routes/hasher.js
@@ -14,12 +14,12 @@
     const
     _hashValRegexp = /#(.*)$/,
     _hashRegexp = /^[#/]+/,
-    _hashTrim = /^\/|\$/g,
-    _trimHash = hash => hash ? hash.replace(_hashTrim, '') : '',
+    _hashTrim = /^\/+/g,
+    _trimHash = hash => hash?.replace(_hashTrim, '') || '',
     _getWindowHash = () => {
         //parsed full URL instead of getting window.location.hash because Firefox decode hash value (and all the other browsers don't)
         var result = _hashValRegexp.exec( location.href );
-        return (result && result[1]) ? decodeURIComponent(result[1]) : '';
+        return result?.[1] ? decodeURIComponent(result[1]) : '';
     },
     _registerChange = newHash => {
         if (_hash !== newHash) {
diff --git a/vendors/squire/README.md b/vendors/squire/README.md
deleted file mode 100644
index 2ce7b803d..000000000
--- a/vendors/squire/README.md
+++ /dev/null
@@ -1,501 +0,0 @@
-Squire
-======
-
-Squire is an HTML5 rich text editor, which provides powerful cross-browser normalisation in a flexible lightweight package (only 16.5KB of JS after minification and gzip, with no dependencies!).
-
-It was designed to handle email composition for the [Fastmail](https://www.fastmail.com) web app. The most important consequence of this (and where Squire differs from most other modern rich text editors) is that it must handle arbitrary HTML, because it may be used to forward or quote emails from third-parties and must be able to preserve their HTML without breaking the formatting. This means that it can't use a more structured (but limited) internal data model (as most other modern HTML editors do) and the HTML remains the source-of-truth. The other consequence is excellent handling of multiple levels of blockquotes.
-
-Squire was designed to be integrated with your own UI framework, and so does not provide its own UI toolbar, widgets or overlays. Instead, you get a component you can insert in place of a `<textarea>` and manipulate programatically, allowing you to integrate seamlessly with the rest of your application and lose the bloat of having two UI toolkits loaded.
-
-Squire supports all reasonably recent, and even moderately old, browsers (even IE11, although this is not tested much these days).
-
-In addition to its use at [Fastmail](https://www.fastmail.com), it is also currently used in production at [ProtonMail](https://protonmail.com/), [SnappyMail](https://github.com/the-djmaze/snappymail), [StartMail](https://startmail.com/), [Tutanota](https://tutanota.com), [Zoho Mail](https://www.zoho.com/mail/) and [Superhuman](https://superhuman.com/), as well as other non-mail apps including [Google Earth](https://www.google.com/earth/) (drop me a line if you're using Squire elsewhere, I'm always interested to hear about it!).
-
-An example UI integration can be tried at http://neilj.github.io/Squire/. Please note though, this is an out-of-date version of Squire and a slightly buggy implementation written by an intern many years ago. For a demo of the latest version with a production-level UI integration, [sign up for a free Fastmail trial](https://www.fastmail.com/signup/) :). There's also a very bare-bones integration in the repo; just clone it and open `Demo.html`. If you are reporting a bug, please report the steps to reproduce using `Demo.html`, to make sure it's not a bug in your integration.
-
-Installation and usage
-----------------------
-
-1. Copy the contents of the `build/` directory onto your server.
-2. Edit the `<style>` block in document.html to add the default styles you
-   would like the editor to use (or link to an external stylesheet).
-3. In your application, instead of a `<textarea>`, use an
-   `<iframe src="path/to/document.html">`.
-4. In your JS, attach an event listener to the [`load` event](https://developer.mozilla.org/en-US/docs/Web/Events/load) of the iframe. When
-   this fires you can grab a reference to the editor object through
-   `iframe.contentWindow.editor`.
-5. Use the API below with the `editor` object to set and get data and integrate
-   with your application or framework.
-
-### Using Squire without an iframe.
-
-Squire can also be used without an iframe for the document. To use it this way:
-
-1. Add a `<script>` tag to load in `build/squire.js` (or `squire-raw.js` for the debuggable unminified version).
-2. Get a reference to the DOM node in the document that you want to make into the rich textarea, e.g. `node = document.getElementById( 'editor-div' )`.
-3. Call `editor = new Squire( node )`. This will instantiate a new Squire instance. Please note, this will remove any current children of the node; you must use the `setHTML` command after initialising to set any content.
-
-You can have multiple squire instances in a single page without issue. If you are using the editor as part of a long lived single-page app, be sure to call `editor.destroy()` once you have finished using an instance to ensure it doesn't leak resources.
-
-### Security
-
-Malicious HTML can be a source of XSS and other security issues. I highly recommended you use [DOMPurify](https://github.com/cure53/DOMPurify) with Squire to prevent these security issues. If DOMPurify is included in the page (with the standard global variable), Squire will automatically sanitise any HTML passed in via `setHTML` or `insertHTML` (which includes HTML the user pastes from the clipboard).
-
-You can override this by setting properties on the config object (the second argument passed to the constructor, see below). The properties are:
-
-* **isSetHTMLSanitized**: `Boolean`
-  Should the HTML passed via calls to `setHTML` be passed to the sanitizer? If your app always sanitizes the HTML in some other way before calling this, you may wish to set this to `false` to avoid the overhead.
-* **isInsertedHTMLSanitized**: `Boolean` (defaults to `true`) – Should the HTML passed via calls to `insertHTML` be passed to the sanitizer? This includes when the user pastes from the clipboard. Since you cannot control what other apps put on the clipboard, it is highly recommended you do not set this to `false`.
-* **sanitizeToDOMFragment**: `(html: String, isPaste: Boolean, self: Squire) -> DOMFragment`
-  A custom sanitization function. This will be called instead of the default call to DOMPurify to sanitize the potentially dangerous HTML. It is passed three arguments: the first is the string of HTML, the second is a boolean indicating if this content has come from the clipboard, rather than an explicit call by your own code, the third is the squire instance. It must return a DOM Fragment node belonging to the same document as the editor's root node, with the contents being clean DOM nodes to set/insert.
-
-Advanced usage
---------------
-
-Squire provides an engine that handles the heavy work for you, making it easy to add extra features. With the `changeFormat` method you can easily add or remove any inline formatting you wish. And the `modifyBlocks` method can be used to make complicated block-level changes in a relatively easy manner.
-
-If you load the library into a top-level document (rather than an iframe), or load it in an iframe without the `data-squireinit="true"` attribute on its `<html>` element, it will not turn the page into an editable document, but will instead add a constructor named `Squire` to the global scope.
-
-You can also require the NPM package [squire-rte](https://www.npmjs.com/package/squire-rte) to import `Squire` in a modular program without adding names to the global namespace.
-
-Call `new Squire( document )`, with the `document` from an iframe to instantiate multiple rich text areas on the same page efficiently. Note, for compatibility with all browsers (particularly Firefox), you MUST wait for the iframe's `onload` event to fire before instantiating Squire.
-
-If you need more commands than in the simple API, I suggest you check out the source code (it's not very long), and see how a lot of the other API methods are implemented in terms of these two methods.
-
-The general philosophy of Squire is to allow the browser to do as much as it can (which unfortunately is not very much), but take control anywhere it deviates from what is required, or there are significant cross-browser differences. As such, the [`document.execCommand`](https://developer.mozilla.org/en-US/docs/Web/API/Document/execCommand) method is not used at all; instead all formatting is done via custom functions, and certain keys, such as 'enter' and 'backspace' are handled by the editor.
-
-### Setting the default block style
-
-By default, the editor will use a `<div>` for blank lines, as most users have been conditioned by Microsoft Word to expect <kbd>Enter</kbd> to act like pressing <kbd>return</kbd> on a typewriter. If you would like to use `<p>` tags (or anything else) for the default block type instead, you can pass a config object as the second parameter to the squire constructor. You can also
-pass a set of attributes to apply to each default block:
-
-    var editor = new Squire( document, {
-        blockTag: 'P',
-        blockAttributes: { style: 'font-size: 16px;' }
-    })
-
-If using the simple setup, call `editor.setConfig(…);` with your
-config object instead. Be sure to do this *before* calling `editor.setHTML()`.
-
-### Determining button state
-
-If you are adding a UI to Squire, you'll probably want to show a button in different states depending on whether a particular style is active in the current selection or not. For example, a "Bold" button would be in a depressed state if the text under the cursor is already bold.
-
-The efficient way to determine the state for most buttons is to monitor the "pathChange" event in the editor, and determine the state from the new path. If the selection goes across nodes, you will need to call the `hasFormat` method for each of your buttons to determine whether the styles are active. See the `getPath` and `hasFormat` documentation for more information.
-
-License
--------
-
-Squire is released under the MIT license. See LICENSE for full license.
-
-API
----
-
-### addEventListener
-
-Attach an event listener to the editor. The handler can be either a function or an object with a `handleEvent` method. This function or method will be called whenever the event fires, with an event object as the sole argument. The following events may be observed:
-
-* **focus**: The editor gained focus.
-* **blur**: The editor lost focus
-* **keydown**: Standard [DOM keydown event](https://developer.mozilla.org/en-US/docs/Web/Events/keydown).
-* **keypress**: Standard [DOM keypress event](https://developer.mozilla.org/en-US/docs/Web/Events/keypress).
-* **keyup**: Standard [DOM keyup event](https://developer.mozilla.org/en-US/docs/Web/Events/keyup).
-* **input**: The user inserted, deleted or changed the style of some text; in other words, the result for `editor.getHTML()` will have changed.
-* **pathChange**: The path (see getPath documentation) to the cursor has changed. The new path is available as the `path` property on the event object.
-* **select**: The user selected some text.
-* **cursor**: The user cleared their selection or moved the cursor to a
-  different position.
-* **undoStateChange**: The availability of undo and/or redo has changed. The event object has two boolean properties, `canUndo` and `canRedo` to let you know the new state.
-* **willPaste**: The user is pasting content into the document. The content that will be inserted is available as either the `fragment` property on the event object, or the `text` property for plain text being inserted into a `<pre>`. You can modify this text/fragment in your event handler to change what will be pasted. You can also call the `preventDefault` on the event object to cancel the paste operation.
-
-The method takes two arguments:
-
-* **type**: The event to listen for. e.g. 'focus'.
-* **handler**: The callback function to invoke
-
-Returns self (the Squire instance).
-
-### removeEventListener
-
-Remove an event listener attached via the addEventListener method.
-
-The method takes two arguments:
-
-* **type**: The event type the handler was registered for.
-* **handler**: The handler to remove.
-
-Returns self (the Squire instance).
-
-### setKeyHandler
-
-Adds or removes a keyboard shortcut. You can use this to override the default keyboard shortcuts (e.g. Ctrl-B for bold – see the bottom of KeyHandlers.js for the list).
-
-This method takes two arguments:
-
-* **key**: The key to handle, including any modifiers in alphabetical order. e.g. `"alt-ctrl-meta-shift-enter"`
-* **fn**: The function to be called when this key is pressed, or `null` if removing a key handler. The function will be passed three arguments when called:
-  * **self**: A reference to the Squire instance.
-  * **event**: The key event object.
-  * **range**: A Range object representing the current selection.
-
-Returns self (the Squire instance).
-
-### focus
-
-Focuses the editor.
-
-The method takes no arguments.
-
-Returns self (the Squire instance).
-
-### blur
-
-Removes focus from the editor.
-
-The method takes no arguments.
-
-Returns self (the Squire instance).
-
-### getDocument
-
-Returns the `document` object of the editable area. May be useful to do transformations outside the realm of the API.
-
-### getHTML
-
-Returns the HTML value of the editor in its current state. This value is equivalent to the contents of the `<body>` tag and does not include any surrounding boilerplate.
-
-### setHTML
-
-Sets the HTML value for the editor. The value supplied should not contain `<body>` tags or anything outside of that.
-
-The method takes one argument:
-
-* **html**: The html to set.
-
-Returns self (the Squire instance).
-
-### getSelectedText
-
-Returns the text currently selected in the editor.
-
-### insertImage
-
-Inserts an image at the current cursor location.
-
-The method takes two arguments:
-
-* **src**: The source path for the image.
-* **attributes**: (optional) An object containing other attributes to set on the `<img>` node. e.g. `{ class: 'class-name' }`. Any `src` attribute will be overwritten by the url given as the first argument.
-
-Returns a reference to the newly inserted image element.
-
-### insertHTML
-
-Inserts an HTML fragment at the current cursor location, or replaces the selection if selected. The value supplied should not contain `<body>` tags or anything outside of that.
-
-The method takes one argument:
-
-* **html**: The html to insert.
-
-Returns self (the Squire instance).
-
-### getPath
-
-Returns the path through the DOM tree from the `<body>` element to the current current cursor position. This is a string consisting of the tag, id, class, font, and color names in CSS format. For example `BODY>BLOCKQUOTE>DIV#id>STRONG>SPAN.font[fontFamily=Arial,sans-serif]>EM`. If a selection has been made, so different parts of the selection may have different paths, the value will be `(selection)`. The path is useful for efficiently determining the current formatting for bold, italic, underline etc, and thus determining button state. If a selection has been made, you can has the `hasFormat` method instead to get the current state for the properties you care about.
-
-### getFontInfo
-
-Returns an object containing the active font family, size, colour and background colour for the the current cursor position, if any are set. The property names are respectively `family`, `size`, `color` and `backgroundColor`. It looks at style attributes to detect this, so will not detect `<FONT>` tags or non-inline styles. If a selection across multiple elements has been made, it will return an empty object.
-
-### createRange
-
-Creates a range in the document belonging to the editor. Takes 4 arguments, matching the [W3C Range properties](https://developer.mozilla.org/en-US/docs/Web/API/Range) they set:
-
-* **startContainer**
-* **startOffset**
-* **endContainer** (optional; if not collapsed)
-* **endOffset** (optional; if not collapsed)
-
-### getCursorPosition
-
-Returns a bounding client rect (top/left/right/bottom properties relative to
-the viewport) for the current selection/cursor.
-
-### getSelection
-
-Returns a [W3C Range object](https://developer.mozilla.org/en-US/docs/Web/API/Range) representing the current selection/cursor position.
-
-### setSelection
-
-Changes the current selection/cursor position.
-
-The method takes one argument:
-
-* **range**: The [W3C Range object](https://developer.mozilla.org/en-US/docs/Web/API/Range) representing the desired selection.
-
-Returns self (the Squire instance).
-
-### moveCursorToStart
-
-Removes any current selection and moves the cursor to the very beginning of the
-document.
-
-Returns self (the Squire instance).
-
-### moveCursorToEnd
-
-Removes any current selection and moves the cursor to the very end of the
-document.
-
-Returns self (the Squire instance).
-
-### saveUndoState
-
-Saves an undo checkpoint with the current editor state. Methods that modify the
-state (e.g. bold/setHighlightColour/modifyBlocks) will automatically save undo
-checkpoints; you only need this method if you want to modify the DOM outside of
-one of these methods, and you want to save an undo checkpoint first.
-
-Returns self (the Squire instance).
-
-### undo
-
-Undoes the most recent change.
-
-Returns self (the Squire instance).
-
-### redo
-
-If the user has just undone a change, this will reapply that change.
-
-Returns self (the Squire instance).
-
-### hasFormat
-
-Queries the editor for whether a particular format is applied anywhere in the current selection.
-
-The method takes two arguments:
-
-* **tag**: The tag of the format
-* **attributes**: (optional) Any attributes the format.
-
-Returns `true` if the entire selection is contained within an element with the specified tag and attributes, otherwise returns `false`.
-
-### bold
-
-Makes any non-bold currently selected text bold (by wrapping it in a `<b>` tag).
-
-Returns self (the Squire instance).
-
-### italic
-
-Makes any non-italic currently selected text italic (by wrapping it in an `<i>` tag).
-
-Returns self (the Squire instance).
-
-### underline
-
-Makes any non-underlined currently selected text underlined (by wrapping it in a `<u>` tag).
-
-Returns self (the Squire instance).
-
-### removeBold
-
-Removes any bold formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### removeItalic
-
-Removes any italic formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### removeUnderline
-
-Removes any underline formatting from the selected text.
-
-Returns self (the Squire instance).
-
-### makeLink
-
-Makes the currently selected text a link. If no text is selected, the URL or email will be inserted as text at the current cursor point and made into a link.
-
-This method takes two arguments:
-
-* **url**: The url or email to link to.
-* **attributes**: (optional) An object containing other attributes to set on the `<a>` node. e.g. `{ target: '_blank' }`. Any `href` attribute will be overwritten by the url given as the first argument.
-
-Returns self (the Squire instance).
-
-### removeLink
-
-Removes any link that is currently at least partially selected.
-
-Returns self (the Squire instance).
-
-### setFontFace
-
-Sets the font face for the selected text.
-
-This method takes one argument:
-
-* **font**: A comma-separated list of fonts (in order of preference) to set.
-
-Returns self (the Squire instance).
-
-### setFontSize
-
-Sets the font size for the selected text.
-
-This method takes one argument:
-
-* **size**: A size to set. Any CSS [length value](https://developer.mozilla.org/en-US/docs/Web/CSS/length) or [absolute-size value](https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_values_syntax#syntax-absolute-size) is accepted, e.g. '13px', or 'small'.
-
-Returns self (the Squire instance).
-
-### setTextColour
-
-Sets the colour of the selected text.
-
-This method takes one argument:
-
-* **colour**: The colour to set. Any [CSS colour value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value) is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
-
-Returns self (the Squire instance).
-
-### setHighlightColour
-
-Sets the colour of the background of the selected text.
-
-This method takes one argument:
-
-* **colour**: The colour to set. Any [CSS colour value](https://developer.mozilla.org/en-US/docs/Web/CSS/color_value) is accepted, e.g. '#f00', or 'hsl(0,0,0)'.
-
-Returns self (the Squire instance).
-
-### setTextAlignment
-
-Sets the text alignment in all blocks at least partially contained by the selection.
-
-This method takes one argument:
-
-* **alignment**: The direction to align to. Can be 'left', 'right', 'center' or 'justify'.
-
-Returns self (the Squire instance).
-
-### setTextDirection
-
-Sets the text direction in all blocks at least partially contained by the selection.
-
-This method takes one argument:
-
-* **direction**: The text direction. Can be 'ltr' or 'rtl'.
-
-Returns self (the Squire instance).
-
-### forEachBlock
-
-Executes a function on each block in the current selection, or until the function returns a truthy value.
-
-This method takes two arguments:
-
-* **fn** The function to execute on each block node at least partially contained in the current selection. The function will be called with the block node as the only argument.
-* **mutates** A boolean indicating whether your function may modify anything in the document in any way.
-
-Returns self (the Squire instance).
-
-### modifyBlocks
-
-Extracts a portion of the DOM tree (up to the block boundaries of the current selection), modifies it and then reinserts it and merges the edges. See the code for examples if you're interested in using this function.
-
-This method takes one argument:
-
-* **modify** The function to apply to the extracted DOM tree; gets a document fragment as a sole argument. `this` is bound to the Squire instance. Should return the node or fragment to be reinserted in the DOM.
-
-Returns self (the Squire instance).
-
-### increaseQuoteLevel
-
-Increases by 1 the quote level (number of `<blockquote>` tags wrapping) all blocks at least partially selected.
-
-Returns self (the Squire instance).
-
-### decreaseQuoteLevel
-
-Decreases by 1 the quote level (number of `<blockquote>` tags wrapping) all blocks at least partially selected.
-
-Returns self (the Squire instance).
-
-### makeUnorderedList
-
-Changes all at-least-partially selected blocks to be part of an unordered list.
-
-Returns self (the Squire instance).
-
-### makeOrderedList
-
-Changes all at-least-partially selected blocks to be part of an ordered list.
-
-Returns self (the Squire instance).
-
-### removeList
-
-Changes any at-least-partially selected blocks which are part of a list to no longer be part of a list.
-
-Returns self (the Squire instance).
-
-### increaseListLevel
-
-Increases by 1 the nesting level of any at-least-partially selected blocks which are part of a list.
-
-Returns self (the Squire instance).
-
-### decreaseListLevel
-
-Decreases by 1 the nesting level of any at-least-partially selected blocks which are part of a list.
-
-Returns self (the Squire instance).
-
-### code
-
-If no selection, or selection across blocks, converts the block to a `<pre>` to format the text as fixed-width. If a selection within a single block is present, wraps that in `<code>` tags for inline formatting instead.
-
-Returns self (the Squire instance).
-
-### removeCode
-
-If inside a `<pre>`, converts that to the default block type instead. Otherwise, removes any `<code>` tags.
-
-Returns self (the Squire instance).
-
-### toggleCode
-
-If inside a `<pre>` or `<code>`, calls `removeCode()`, otherwise callse `code()`.
-
-Returns self (the Squire instance).
-
-### removeAllFormatting
-
-Removes all formatting from the selection. Block elements (list items, table cells, etc.) are kept as separate blocks.
-
-Returns self (the Squire instance).
-
-### changeFormat
-
-Change the **inline** formatting of the current selection. This is a high-level method which is used to implement the bold, italic etc. helper methods. THIS METHOD IS ONLY FOR USE WITH INLINE TAGS, NOT BLOCK TAGS. It takes 4 arguments:
-
-1. An object describing the formatting to add, or `null` if you only wish to remove formatting. If supplied, this object should have a `tag` property with the string name of the tag to wrap around the selected text (e.g. `"STRONG"`) and optionally an `attributes` property, consisting of an object of attributes to apply to the tag (e.g. `{"class": "bold"}`).
-2. An object describing the formatting to remove, in the same format as the object given to add formatting, or `null` if you only wish to add formatting.
-3. A Range object with the range to apply the formatting changes to (or `null`/omit to apply to current selection).
-4. A boolean (defaults to `false` if omitted). If `true`, any formatting nodes that cover at least part of the selected range will be removed entirely (so will potentially be removed from text outside the selected range as well). If `false`, the formatting nodes will continue to apply to any text outside the selection. This is useful, for example, when removing links. If any of the text in the selection is part of a link, the whole link is removed, rather than the link continuing to apply to bits of text outside the selection.
-
-### modifyDocument
-
-Takes in a function that can modify the document without the modifications being treated as input.
-
-This is useful when the document needs to be changed programmatically, but those changes should not raise input events or modify the undo state.
-
-### linkRegExp
-
-This is the regular expression used to automatically mark up links when inserting HTML or after pressing space. You can change it if you want to use a custom regular expression for detecting links, or set to `null` to turn off link detection.
diff --git a/vendors/squire/build/squire-raw.js b/vendors/squire/build/squire-raw.js
deleted file mode 100644
index ee818474d..000000000
--- a/vendors/squire/build/squire-raw.js
+++ /dev/null
@@ -1,3933 +0,0 @@
-/* Copyright © 2011-2015 by Neil Jenkins. MIT Licensed. */
-/* eslint max-len: 0 */
-
-/**
-	TODO: modifyBlocks function doesn't work very good.
-	For example you have: UL > LI > [cursor here in text]
-	Then create blockquote at cursor, the result is: BLOCKQUOTE > UL > LI
-	not UL > LI > BLOCKQUOTE
-*/
-
-( doc => {
-
-const
-	DOCUMENT_POSITION_PRECEDING = 2, // Node.DOCUMENT_POSITION_PRECEDING
-	ELEMENT_NODE = 1,                // Node.ELEMENT_NODE,
-	TEXT_NODE = 3,                   // Node.TEXT_NODE,
-	DOCUMENT_FRAGMENT_NODE = 11,     // Node.DOCUMENT_FRAGMENT_NODE,
-	SHOW_ELEMENT = 1,                // NodeFilter.SHOW_ELEMENT,
-	SHOW_TEXT = 4,                   // NodeFilter.SHOW_TEXT,
-	SHOW_ELEMENT_OR_TEXT = 5,
-
-	START_TO_START = 0, // Range.START_TO_START
-	START_TO_END = 1,   // Range.START_TO_END
-	END_TO_END = 2,     // Range.END_TO_END
-	END_TO_START = 3,   // Range.END_TO_START
-
-	ZWS = '\u200B',
-	NBSP = '\u00A0',
-
-	win = doc.defaultView,
-
-	ua = navigator.userAgent,
-
-	isMac = /Mac OS X/.test( ua ),
-	isIOS = /iP(?:ad|hone|od)/.test( ua ) || ( isMac && !!navigator.maxTouchPoints ),
-
-	isWebKit = /WebKit\//.test( ua ),
-
-	ctrlKey = isMac ? 'meta-' : 'ctrl-',
-	osKey = isMac ? 'metaKey' : 'ctrlKey',
-
-	// Use [^ \t\r\n] instead of \S so that nbsp does not count as white-space
-	notWS = /[^ \t\r\n]/,
-
-	indexOf = (array, value) => Array.prototype.indexOf.call(array, value),
-
-	filterAccept = NodeFilter.FILTER_ACCEPT,
-
-	typeToBitArray = {
-		// ELEMENT_NODE
-		1: 1,
-		// ATTRIBUTE_NODE
-		2: 2,
-		// TEXT_NODE
-		3: 4,
-		// COMMENT_NODE
-		8: 128,
-		// DOCUMENT_NODE
-		9: 256,
-		// DOCUMENT_FRAGMENT_NODE
-		11: 1024
-	},
-
-	inlineNodeNames = /^(?:#text|A|ABBR|ACRONYM|B|BR|BD[IO]|CITE|CODE|DATA|DEL|DFN|EM|FONT|HR|I|IMG|INPUT|INS|KBD|Q|RP|RT|RUBY|S|SAMP|SMALL|SPAN|STR(IKE|ONG)|SU[BP]|TIME|U|VAR|WBR)$/,
-//	phrasingElements = 'ABBR,AUDIO,B,BDO,BR,BUTTON,CANVAS,CITE,CODE,COMMAND,DATA,DATALIST,DFN,EM,EMBED,I,IFRAME,IMG,INPUT,KBD,KEYGEN,LABEL,MARK,MATH,METER,NOSCRIPT,OBJECT,OUTPUT,PROGRESS,Q,RUBY,SAMP,SCRIPT,SELECT,SMALL,SPAN,STRONG,SUB,SUP,SVG,TEXTAREA,TIME,VAR,VIDEO,WBR',
-
-	leafNodeNames = {
-		BR: 1,
-		HR: 1,
-		IMG: 1
-	},
-
-	UNKNOWN = 0,
-	INLINE = 1,
-	BLOCK = 2,
-	CONTAINER = 3,
-
-	isLeaf = node => node.nodeType === ELEMENT_NODE && !!leafNodeNames[ node.nodeName ],
-
-	getNodeCategory = node => {
-		switch ( node.nodeType ) {
-		case TEXT_NODE:
-			return INLINE;
-		case ELEMENT_NODE:
-		case DOCUMENT_FRAGMENT_NODE:
-			if ( nodeCategoryCache.has( node ) ) {
-				return nodeCategoryCache.get( node );
-			}
-			break;
-		default:
-			return UNKNOWN;
-		}
-
-		let nodeCategory;
-		if ( !Array.prototype.every.call( node.childNodes, isInline ) ) {
-			// Malformed HTML can have block tags inside inline tags. Need to treat
-			// these as containers rather than inline. See #239.
-			nodeCategory = CONTAINER;
-		} else if ( inlineNodeNames.test( node.nodeName ) ) {
-			nodeCategory = INLINE;
-		} else /*if ( blockElementNames.test( node.nodeName ) )*/ {
-			nodeCategory = BLOCK;
-		}
-		nodeCategoryCache.set( node, nodeCategory );
-		return nodeCategory;
-	},
-	isInline = node => getNodeCategory( node ) === INLINE,
-	isBlock = node => getNodeCategory( node ) === BLOCK,
-	isContainer = node => getNodeCategory( node ) === CONTAINER,
-	createTreeWalker = (root, whatToShow, filter) => doc.createTreeWalker( root, whatToShow, filter ? {
-			acceptNode: node => filter(node) ? filterAccept : NodeFilter.FILTER_SKIP
-		} : null
-	),
-	getBlockWalker = ( node, root ) => {
-		let walker = createTreeWalker( root, SHOW_ELEMENT, isBlock );
-		walker.currentNode = node;
-		return walker;
-	},
-	getPreviousBlock = ( node, root ) => {
-//		node = getClosest( node, root, blockElementNames );
-		node = getBlockWalker( node, root ).previousNode();
-		return node !== root ? node : null;
-	},
-	getNextBlock = ( node, root ) => {
-//		node = getClosest( node, root, blockElementNames );
-		node = getBlockWalker( node, root ).nextNode();
-		return node !== root ? node : null;
-	},
-
-	isEmptyBlock = block => !block.textContent && !block.querySelector( 'IMG' ),
-
-	areAlike = ( node, node2 ) => {
-		return !isLeaf( node ) && (
-			node.nodeType === node2.nodeType &&
-			node.nodeName === node2.nodeName &&
-			node.nodeName !== 'A' &&
-			node.className === node2.className &&
-			( ( !node.style && !node2.style ) ||
-			  node.style.cssText === node2.style.cssText )
-		);
-	},
-	hasTagAttributes = ( node, tag, attributes ) => {
-		return node.nodeName === tag && Object.entries(attributes).every(([k,v]) => node.getAttribute(k) === v);
-	},
-	getClosest = ( node, root, selector ) => {
-		node = (!node || node.closest ? node : node.parentElement);
-		node = node && node.closest(selector);
-		return (node && root.contains(node)) ? node : null;
-	},
-	getNearest = ( node, root, tag, attributes ) => {
-		while ( node && node !== root ) {
-			if ( hasTagAttributes( node, tag, attributes ) ) {
-				return node;
-			}
-			node = node.parentNode;
-		}
-		return null;
-	},
-
-	getPath = ( node, root, config ) => {
-		let path = '', style;
-		if ( node && node !== root ) {
-			path = getPath( node.parentNode, root, config );
-			if ( node.nodeType === ELEMENT_NODE ) {
-				path += ( path ? '>' : '' ) + node.nodeName;
-				if ( node.id ) {
-					path += '#' + node.id;
-				}
-				if ( node.classList.length ) {
-					path += '.' + [...node.classList].sort().join( '.' );
-				}
-				if ( node.dir ) {
-					path += '[dir=' + node.dir + ']';
-				}
-				if ( style = node.style.cssText ) {
-					path += '[style=' + style + ']';
-				}
-			}
-		}
-		return path;
-	},
-
-	getLength = node => {
-		let nodeType = node.nodeType;
-		return nodeType === ELEMENT_NODE || nodeType === DOCUMENT_FRAGMENT_NODE ?
-			node.childNodes.length : node.length || 0;
-	},
-
-	detach = node => {
-//		node.remove();
-		let parent = node.parentNode;
-		parent && parent.removeChild( node );
-		return node;
-	},
-
-	empty = node => {
-		let frag = doc.createDocumentFragment(),
-			childNodes = node.childNodes;
-		childNodes && frag.append( ...childNodes );
-		return frag;
-	},
-
-	setStyle = ( node, style ) => {
-		if (typeof style === 'object') {
-			Object.entries(style).forEach(([k,v]) => node.style[k] = v);
-		} else if ( style !== undefined ) {
-			node.setAttribute( 'style', style );
-		}
-	},
-
-	createElement = ( tag, props, children ) => {
-		let el = doc.createElement( tag );
-		if ( props instanceof Array ) {
-			children = props;
-			props = null;
-		}
-		props && Object.entries(props).forEach(([k,v]) => {
-			if ('style' === k) {
-				setStyle( el, v );
-			} else if ( v !== undefined ) {
-				el.setAttribute( k, v );
-			}
-		});
-		children && el.append( ...children );
-		return el;
-	},
-
-	fixCursor = ( node, root ) => {
-		// In Webkit and Gecko, block level elements are collapsed and
-		// unfocusable if they have no content (:empty). To remedy this, a <BR> must be
-		// inserted. In Opera and IE, we just need a textnode in order for the
-		// cursor to appear.
-		let self = root.__squire__;
-		let originalNode = node;
-		let fixer, child;
-
-		if ( node === root ) {
-			if ( !( child = node.firstChild ) || child.nodeName === 'BR' ) {
-				fixer = self.createDefaultBlock();
-				if ( child ) {
-					child.replaceWith( fixer );
-				}
-				else {
-					node.append( fixer );
-				}
-				node = fixer;
-				fixer = null;
-			}
-		}
-
-		if ( node.nodeType === TEXT_NODE ) {
-			return originalNode;
-		}
-
-		if ( isInline( node ) ) {
-			child = node.firstChild;
-			while ( isWebKit && child &&
-					child.nodeType === TEXT_NODE && !child.data ) {
-				child.remove(  );
-				child = node.firstChild;
-			}
-			if ( !child ) {
-				fixer = self._addZWS();
-			}
-//		} else if ( !node.querySelector( 'BR' ) ) {
-//		} else if ( !node.innerText.trim().length ) {
-		} else if ( node.matches( ':empty' ) ) {
-			fixer = createElement( 'BR' );
-			while ( ( child = node.lastElementChild ) && !isInline( child ) ) {
-				node = child;
-			}
-		}
-		if ( fixer ) {
-			try {
-				node.append( fixer );
-			} catch ( error ) {
-				didError({
-					name: 'Squire: fixCursor – ' + error,
-					message: 'Parent: ' + node.nodeName + '/' + node.innerHTML +
-						' appendChild: ' + fixer.nodeName
-				});
-			}
-		}
-
-		return originalNode;
-	},
-
-	// Recursively examine container nodes and wrap any inline children.
-	fixContainer = ( container, root ) => {
-		let children = container.childNodes;
-		let wrapper = null;
-		let i = 0, l = children.length, child, isBR;
-
-		for ( ; i < l; ++i ) {
-			child = children[i];
-			isBR = child.nodeName === 'BR';
-			if ( !isBR && isInline( child )
-//			 && (root.__squire__._config.blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
-			) {
-				if ( !wrapper ) {
-					 wrapper = createElement( 'div' );
-				}
-				wrapper.append( child );
-				--i;
-				--l;
-			} else if ( isBR || wrapper ) {
-				if ( !wrapper ) {
-					wrapper = createElement( 'div' );
-				}
-				fixCursor( wrapper, root );
-				if ( isBR ) {
-					child.replaceWith( wrapper );
-				} else {
-					child.before( wrapper  );
-					++i;
-					++l;
-				}
-				wrapper = null;
-			}
-			if ( isContainer( child ) ) {
-				fixContainer( child, root );
-			}
-		}
-/*
-		// Not live
-		[...container.children].forEach(child => {
-			isBR = child.nodeName === 'BR';
-			if ( !isBR && isInline( child )
-//			 && (root.__squire__._config.blockTag !== 'DIV' || (child.matches && !child.matches(phrasingElements)))
-			) {
-				if ( !wrapper ) {
-					 wrapper = createElement( 'div' );
-				}
-				wrapper.append( child );
-			} else if ( isBR || wrapper ) {
-				if ( !wrapper ) {
-					wrapper = createElement( 'div' );
-				}
-				fixCursor( wrapper, root );
-				if ( isBR ) {
-					child.replaceWith( wrapper );
-				} else {
-					child.before( wrapper  );
-				}
-				wrapper = null;
-			}
-			if ( isContainer( child ) ) {
-				fixContainer( child, root );
-			}
-		});
-*/
-		if ( wrapper ) {
-			container.append( fixCursor( wrapper, root ) );
-		}
-		return container;
-	},
-
-	split = ( node, offset, stopNode, root ) => {
-		let nodeType = node.nodeType,
-			parent, clone, next;
-		if ( nodeType === TEXT_NODE && node !== stopNode ) {
-			return split(
-				node.parentNode, node.splitText( offset ), stopNode, root );
-		}
-		if ( nodeType === ELEMENT_NODE ) {
-			if ( typeof( offset ) === 'number' ) {
-				offset = offset < node.childNodes.length ?
-					node.childNodes[ offset ] : null;
-			}
-			if ( node === stopNode ) {
-				return offset;
-			}
-
-			// Clone node without children
-			parent = node.parentNode;
-			clone = node.cloneNode( false );
-
-			// Add right-hand siblings to the clone
-			while ( offset ) {
-				next = offset.nextSibling;
-				clone.append( offset );
-				offset = next;
-			}
-
-			// Maintain li numbering if inside a quote.
-			if ( node.nodeName === 'OL' &&
-					getClosest( node, root, 'BLOCKQUOTE' ) ) {
-				clone.start = ( +node.start || 1 ) + node.childNodes.length - 1;
-			}
-
-			// DO NOT NORMALISE. This may undo the fixCursor() call
-			// of a node lower down the tree!
-
-			// We need something in the element in order for the cursor to appear.
-			fixCursor( node, root );
-			fixCursor( clone, root );
-
-			// Inject clone after original node
-			node.after( clone );
-
-			// Keep on splitting up the tree
-			return split( parent, clone, stopNode, root );
-		}
-		return offset;
-	},
-
-	_mergeInlines = ( node, fakeRange ) => {
-		let children = node.childNodes,
-			l = children.length,
-			frags = [],
-			child, prev;
-		while ( l-- ) {
-			child = children[l];
-			prev = l && children[ l - 1 ];
-			if ( l && isInline( child ) && areAlike( child, prev ) &&
-					!leafNodeNames[ child.nodeName ] ) {
-				if ( fakeRange.startContainer === child ) {
-					fakeRange.startContainer = prev;
-					fakeRange.startOffset += getLength( prev );
-				}
-				if ( fakeRange.endContainer === child ) {
-					fakeRange.endContainer = prev;
-					fakeRange.endOffset += getLength( prev );
-				}
-				if ( fakeRange.startContainer === node ) {
-					if ( fakeRange.startOffset > l ) {
-						--fakeRange.startOffset;
-					}
-					else if ( fakeRange.startOffset === l ) {
-						fakeRange.startContainer = prev;
-						fakeRange.startOffset = getLength( prev );
-					}
-				}
-				if ( fakeRange.endContainer === node ) {
-					if ( fakeRange.endOffset > l ) {
-						--fakeRange.endOffset;
-					}
-					else if ( fakeRange.endOffset === l ) {
-						fakeRange.endContainer = prev;
-						fakeRange.endOffset = getLength( prev );
-					}
-				}
-				detach( child );
-				if ( child.nodeType === TEXT_NODE ) {
-					prev.appendData( child.data );
-				}
-				else {
-					frags.push( empty( child ) );
-				}
-			}
-			else if ( child.nodeType === ELEMENT_NODE ) {
-				child.append(...frags.reverse());
-				frags = [];
-				_mergeInlines( child, fakeRange );
-			}
-		}
-	},
-
-	mergeInlines = ( node, range ) => {
-		if ( node.nodeType === TEXT_NODE ) {
-			node = node.parentNode;
-		}
-		if ( node.nodeType === ELEMENT_NODE ) {
-			let fakeRange = {
-				startContainer: range.startContainer,
-				startOffset: range.startOffset,
-				endContainer: range.endContainer,
-				endOffset: range.endOffset
-			};
-			_mergeInlines( node, fakeRange );
-			range.setStart( fakeRange.startContainer, fakeRange.startOffset );
-			range.setEnd( fakeRange.endContainer, fakeRange.endOffset );
-		}
-	},
-
-	mergeWithBlock = ( block, next, range, root ) => {
-		let container = next;
-		let parent, last, offset;
-		while ( ( parent = container.parentNode ) &&
-				parent !== root &&
-				parent.nodeType === ELEMENT_NODE &&
-				parent.childNodes.length === 1 ) {
-			container = parent;
-		}
-		detach( container );
-
-		offset = block.childNodes.length;
-
-		// Remove extra <BR> fixer if present.
-		last = block.lastChild;
-		if ( last && last.nodeName === 'BR' ) {
-			last.remove(  );
-			--offset;
-		}
-
-		block.append( empty( next ) );
-
-		range.setStart( block, offset );
-		range.collapse( true );
-		mergeInlines( block, range );
-	},
-
-	mergeContainers = ( node, root ) => {
-		let prev = node.previousSibling,
-			first = node.firstChild,
-			isListItem = ( node.nodeName === 'LI' ),
-			needsFix, block;
-
-		// Do not merge LIs, unless it only contains a UL
-		if ( isListItem && ( !first || !/^[OU]L$/.test( first.nodeName ) ) ) {
-			return;
-		}
-
-		if ( prev && areAlike( prev, node ) ) {
-			if ( !isContainer( prev ) ) {
-				if ( !isListItem ) {
-					return;
-				}
-				block = createElement( 'DIV' );
-				block.append( empty( prev ) );
-				prev.append( block );
-			}
-			detach( node );
-			needsFix = !isContainer( node );
-			prev.append( empty( node ) );
-			if ( needsFix ) {
-				fixContainer( prev, root );
-			}
-			if ( first ) {
-				mergeContainers( first, root );
-			}
-		} else if ( isListItem ) {
-			prev = createElement( 'DIV' );
-			node.insertBefore( prev, first );
-			fixCursor( prev, root );
-		}
-	},
-
-	getNodeBefore = ( node, offset ) => {
-		let children = node.childNodes;
-		while ( offset && node.nodeType === ELEMENT_NODE ) {
-			node = children[ offset - 1 ];
-			children = node.childNodes;
-			offset = children.length;
-		}
-		return node;
-	},
-
-	getNodeAfter = ( node, offset ) => {
-		if ( node.nodeType === ELEMENT_NODE ) {
-			let children = node.childNodes;
-			if ( offset < children.length ) {
-				node = children[ offset ];
-			} else {
-				while ( node && !node.nextSibling ) {
-					node = node.parentNode;
-				}
-				if ( node ) { node = node.nextSibling; }
-			}
-		}
-		return node;
-	},
-
-	insertNodeInRange = ( range, node ) => {
-		// Insert at start.
-		let startContainer = range.startContainer,
-			startOffset = range.startOffset,
-			endContainer = range.endContainer,
-			endOffset = range.endOffset,
-			parent, children, childCount, afterSplit;
-
-		// If part way through a text node, split it.
-		if ( startContainer.nodeType === TEXT_NODE ) {
-			parent = startContainer.parentNode;
-			children = parent.childNodes;
-			if ( startOffset === startContainer.length ) {
-				startOffset = indexOf( children, startContainer ) + 1;
-				if ( range.collapsed ) {
-					endContainer = parent;
-					endOffset = startOffset;
-				}
-			} else {
-				if ( startOffset ) {
-					afterSplit = startContainer.splitText( startOffset );
-					if ( endContainer === startContainer ) {
-						endOffset -= startOffset;
-						endContainer = afterSplit;
-					}
-					else if ( endContainer === parent ) {
-						++endOffset;
-					}
-					startContainer = afterSplit;
-				}
-				startOffset = indexOf( children, startContainer );
-			}
-			startContainer = parent;
-		} else {
-			children = startContainer.childNodes;
-		}
-
-		childCount = children.length;
-
-		if ( startOffset === childCount ) {
-			startContainer.append( node );
-		} else {
-			startContainer.insertBefore( node, children[ startOffset ] );
-		}
-
-		if ( startContainer === endContainer ) {
-			endOffset += children.length - childCount;
-		}
-
-		range.setStart( startContainer, startOffset );
-		range.setEnd( endContainer, endOffset );
-	},
-
-	extractContentsOfRange = ( range, common, root ) => {
-		let startContainer = range.startContainer,
-			startOffset = range.startOffset,
-			endContainer = range.endContainer,
-			endOffset = range.endOffset;
-
-		if ( !common ) {
-			common = range.commonAncestorContainer;
-		}
-
-		if ( common.nodeType === TEXT_NODE ) {
-			common = common.parentNode;
-		}
-
-		let endNode = split( endContainer, endOffset, common, root ),
-			startNode = split( startContainer, startOffset, common, root ),
-			frag = doc.createDocumentFragment(),
-			next, before, after, beforeText, afterText;
-
-		// End node will be null if at end of child nodes list.
-		while ( startNode !== endNode ) {
-			next = startNode.nextSibling;
-			frag.append( startNode );
-			startNode = next;
-		}
-
-		startContainer = common;
-		startOffset = endNode ?
-			indexOf( common.childNodes, endNode ) :
-			common.childNodes.length;
-
-		// Merge text nodes if adjacent. IE10 in particular will not focus
-		// between two text nodes
-		after = common.childNodes[ startOffset ];
-		before = after && after.previousSibling;
-		if ( before &&
-				before.nodeType === TEXT_NODE &&
-				after.nodeType === TEXT_NODE ) {
-			startContainer = before;
-			startOffset = before.length;
-			beforeText = before.data;
-			afterText = after.data;
-
-			// If we now have two adjacent spaces, the second one needs to become
-			// a nbsp, otherwise the browser will swallow it due to HTML whitespace
-			// collapsing.
-			if ( beforeText.charAt( beforeText.length - 1 ) === ' ' &&
-					afterText.charAt( 0 ) === ' ' ) {
-				afterText = NBSP + afterText.slice( 1 ); // nbsp
-			}
-			before.appendData( afterText );
-			detach( after );
-		}
-
-		range.setStart( startContainer, startOffset );
-		range.collapse( true );
-
-		fixCursor( common, root );
-
-		return frag;
-	},
-
-	deleteContentsOfRange = ( range, root ) => {
-		let startBlock = getStartBlockOfRange( range, root );
-		let endBlock = getEndBlockOfRange( range, root );
-		let needsMerge = ( startBlock !== endBlock );
-		let frag, child;
-
-		// Move boundaries up as much as possible without exiting block,
-		// to reduce need to split.
-		moveRangeBoundariesDownTree( range );
-		moveRangeBoundariesUpTree( range, startBlock, endBlock, root );
-
-		// Remove selected range
-		frag = extractContentsOfRange( range, null, root );
-
-		// Move boundaries back down tree as far as possible.
-		moveRangeBoundariesDownTree( range );
-
-		// If we split into two different blocks, merge the blocks.
-		if ( needsMerge ) {
-			// endBlock will have been split, so need to refetch
-			endBlock = getEndBlockOfRange( range, root );
-			if ( startBlock && endBlock && startBlock !== endBlock ) {
-				mergeWithBlock( startBlock, endBlock, range, root );
-			}
-		}
-
-		// Ensure block has necessary children
-		if ( startBlock ) {
-			fixCursor( startBlock, root );
-		}
-
-		// Ensure root has a block-level element in it.
-		child = root.firstChild;
-		if ( child && child.nodeName !== 'BR' ) {
-			range.collapse( true );
-		} else {
-			fixCursor( root, root );
-			range.selectNodeContents( root.firstChild );
-		}
-		return frag;
-	},
-
-	// Contents of range will be deleted.
-	// After method, range will be around inserted content
-	insertTreeFragmentIntoRange = ( range, frag, root ) => {
-		let firstInFragIsInline = frag.firstChild && isInline( frag.firstChild );
-		let node, block, blockContentsAfterSplit, stopPoint, container, offset;
-		let replaceBlock, firstBlockInFrag, nodeAfterSplit, nodeBeforeSplit;
-		let tempRange;
-
-		// Fixup content: ensure no top-level inline, and add cursor fix elements.
-		fixContainer( frag, root );
-		node = frag;
-		while ( ( node = getNextBlock( node, root ) ) ) {
-			fixCursor( node, root );
-		}
-
-		// Delete any selected content.
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
-		}
-
-		// Move range down into text nodes.
-		moveRangeBoundariesDownTree( range );
-		range.collapse( false ); // collapse to end
-
-		// Where will we split up to? First blockquote parent, otherwise root.
-		stopPoint = getClosest( range.endContainer, root, 'BLOCKQUOTE' ) || root;
-
-		// Merge the contents of the first block in the frag with the focused block.
-		// If there are contents in the block after the focus point, collect this
-		// up to insert in the last block later. This preserves the style that was
-		// present in this bit of the page.
-		//
-		// If the block being inserted into is empty though, replace it instead of
-		// merging if the fragment had block contents.
-		// e.g. <blockquote><p>Foo</p></blockquote>
-		// This seems a reasonable approximation of user intent.
-
-		block = getStartBlockOfRange( range, root );
-		firstBlockInFrag = getNextBlock( frag, frag );
-		replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock( block );
-		if ( block && firstBlockInFrag && !replaceBlock &&
-				// Don't merge table cells or PRE elements into block
-				!getClosest( firstBlockInFrag, frag, 'PRE,TABLE' ) ) {
-			moveRangeBoundariesUpTree( range, block, block, root );
-			range.collapse( true ); // collapse to start
-			container = range.endContainer;
-			offset = range.endOffset;
-			// Remove trailing <br> – we don't want this considered content to be
-			// inserted again later
-			cleanupBRs( block, root, false );
-			if ( isInline( container ) ) {
-				// Split up to block parent.
-				nodeAfterSplit = split(
-					container, offset, getPreviousBlock( container, root ), root );
-				container = nodeAfterSplit.parentNode;
-				offset = indexOf( container.childNodes, nodeAfterSplit );
-			}
-			if ( /*isBlock( container ) && */offset !== getLength( container ) ) {
-				// Collect any inline contents of the block after the range point
-				blockContentsAfterSplit = doc.createDocumentFragment();
-				while ( ( node = container.childNodes[ offset ] ) ) {
-					blockContentsAfterSplit.append( node );
-				}
-			}
-			// And merge the first block in.
-			mergeWithBlock( container, firstBlockInFrag, range, root );
-
-			// And where we will insert
-			offset = indexOf( container.parentNode.childNodes, container ) + 1;
-			container = container.parentNode;
-			range.setEnd( container, offset );
-		}
-
-		// Is there still any content in the fragment?
-		if ( getLength( frag ) ) {
-			if ( replaceBlock ) {
-				range.setEndBefore( block );
-				range.collapse( false );
-				detach( block );
-			}
-			moveRangeBoundariesUpTree( range, stopPoint, stopPoint, root );
-			// Now split after block up to blockquote (if a parent) or root
-			nodeAfterSplit = split(
-				range.endContainer, range.endOffset, stopPoint, root );
-			nodeBeforeSplit = nodeAfterSplit ?
-				nodeAfterSplit.previousSibling :
-				stopPoint.lastChild;
-			stopPoint.insertBefore( frag, nodeAfterSplit );
-			if ( nodeAfterSplit ) {
-				range.setEndBefore( nodeAfterSplit );
-			} else {
-				range.setEnd( stopPoint, getLength( stopPoint ) );
-			}
-			block = getEndBlockOfRange( range, root );
-
-			// Get a reference that won't be invalidated if we merge containers.
-			moveRangeBoundariesDownTree( range );
-			container = range.endContainer;
-			offset = range.endOffset;
-
-			// Merge inserted containers with edges of split
-			if ( nodeAfterSplit && isContainer( nodeAfterSplit ) ) {
-				mergeContainers( nodeAfterSplit, root );
-			}
-			nodeAfterSplit = nodeBeforeSplit && nodeBeforeSplit.nextSibling;
-			if ( nodeAfterSplit && isContainer( nodeAfterSplit ) ) {
-				mergeContainers( nodeAfterSplit, root );
-			}
-			range.setEnd( container, offset );
-		}
-
-		// Insert inline content saved from before.
-		if ( blockContentsAfterSplit ) {
-			tempRange = range.cloneRange();
-			mergeWithBlock( block, blockContentsAfterSplit, tempRange, root );
-			range.setEnd( tempRange.endContainer, tempRange.endOffset );
-		}
-		moveRangeBoundariesDownTree( range );
-	},
-
-	isNodeContainedInRange = ( range, node, partial = true ) => {
-		let nodeRange = doc.createRange();
-
-		nodeRange.selectNode( node );
-
-		return partial
-			// Node must not finish before range starts or start after range finishes.
-			? range.compareBoundaryPoints( END_TO_START, nodeRange ) < 0
-				&& range.compareBoundaryPoints( START_TO_END, nodeRange ) > 0
-			// Node must start after range starts and finish before range finishes
-			: range.compareBoundaryPoints( START_TO_START, nodeRange ) < 1
-				&& range.compareBoundaryPoints( END_TO_END, nodeRange ) > -1;
-	},
-
-	moveRangeBoundariesDownTree = range => {
-		let startContainer = range.startContainer,
-			startOffset = range.startOffset,
-			endContainer = range.endContainer,
-			endOffset = range.endOffset,
-			maySkipBR = true,
-			child;
-
-		while ( startContainer.nodeType !== TEXT_NODE ) {
-			child = startContainer.childNodes[ startOffset ];
-			if ( !child || isLeaf( child ) ) {
-				break;
-			}
-			startContainer = child;
-			startOffset = 0;
-		}
-		if ( endOffset ) {
-			while ( endContainer.nodeType !== TEXT_NODE ) {
-				child = endContainer.childNodes[ endOffset - 1 ];
-				if ( !child || isLeaf( child ) ) {
-					if ( maySkipBR && child && child.nodeName === 'BR' ) {
-						--endOffset;
-						maySkipBR = false;
-						continue;
-					}
-					break;
-				}
-				endContainer = child;
-				endOffset = getLength( endContainer );
-			}
-		} else {
-			while ( endContainer.nodeType !== TEXT_NODE ) {
-				child = endContainer.firstChild;
-				if ( !child || isLeaf( child ) ) {
-					break;
-				}
-				endContainer = child;
-			}
-		}
-
-		// If collapsed, this algorithm finds the nearest text node positions
-		// *outside* the range rather than inside, but also it flips which is
-		// assigned to which.
-		if ( range.collapsed ) {
-			range.setStart( endContainer, endOffset );
-			range.setEnd( startContainer, startOffset );
-		} else {
-			range.setStart( startContainer, startOffset );
-			range.setEnd( endContainer, endOffset );
-		}
-	},
-
-	moveRangeBoundariesUpTree = ( range, startMax, endMax, root ) => {
-		let startContainer = range.startContainer;
-		let startOffset = range.startOffset;
-		let endContainer = range.endContainer;
-		let endOffset = range.endOffset;
-		let maySkipBR = true;
-		let parent;
-
-		if ( !startMax ) {
-			startMax = range.commonAncestorContainer;
-		}
-		if ( !endMax ) {
-			endMax = startMax;
-		}
-
-		while ( !startOffset &&
-				startContainer !== startMax &&
-				startContainer !== root ) {
-			parent = startContainer.parentNode;
-			startOffset = indexOf( parent.childNodes, startContainer );
-			startContainer = parent;
-		}
-
-		while ( endContainer !== endMax && endContainer !== root ) {
-			if ( maySkipBR &&
-					endContainer.nodeType !== TEXT_NODE &&
-					endContainer.childNodes[ endOffset ] &&
-					endContainer.childNodes[ endOffset ].nodeName === 'BR' ) {
-				++endOffset;
-				maySkipBR = false;
-			}
-			if ( endOffset !== getLength( endContainer ) ) {
-				break;
-			}
-			parent = endContainer.parentNode;
-			endOffset = indexOf( parent.childNodes, endContainer ) + 1;
-			endContainer = parent;
-		}
-
-		range.setStart( startContainer, startOffset );
-		range.setEnd( endContainer, endOffset );
-	},
-
-	moveRangeBoundaryOutOf = ( range, nodeName, root ) => {
-		let parent = getClosest( range.endContainer, root, 'A' );
-		if ( parent ) {
-			let clone = range.cloneRange();
-			parent = parent.parentNode;
-			moveRangeBoundariesUpTree( clone, parent, parent, root );
-			if ( clone.endContainer === parent ) {
-				range.setStart( clone.endContainer, clone.endOffset );
-				range.setEnd( clone.endContainer, clone.endOffset );
-			}
-		}
-		return range;
-	},
-
-	// Returns the first block at least partially contained by the range,
-	// or null if no block is contained by the range.
-	getStartBlockOfRange = ( range, root ) => {
-		let container = range.startContainer,
-			block;
-
-		// If inline, get the containing block.
-		if ( isInline( container ) ) {
-			block = getPreviousBlock( container, root );
-		} else if ( container !== root && isBlock( container ) ) {
-			block = container;
-		} else {
-			block = getNextBlock( getNodeBefore( container, range.startOffset ), root );
-		}
-		// Check the block actually intersects the range
-		return block && isNodeContainedInRange( range, block ) ? block : null;
-	},
-
-	// Returns the last block at least partially contained by the range,
-	// or null if no block is contained by the range.
-	getEndBlockOfRange = ( range, root ) => {
-		let container = range.endContainer,
-			block, child;
-
-		// If inline, get the containing block.
-		if ( isInline( container ) ) {
-			block = getPreviousBlock( container, root );
-		} else if ( container !== root && isBlock( container ) ) {
-			block = container;
-		} else {
-			block = getNodeAfter( container, range.endOffset );
-			if ( !block || !root.contains( block ) ) {
-				block = root;
-				while ( child = block.lastChild ) {
-					block = child;
-				}
-			}
-			block = getPreviousBlock( block, root );
-		}
-		// Check the block actually intersects the range
-		return block && isNodeContainedInRange( range, block ) ? block : null;
-	},
-
-	newContentWalker = root => createTreeWalker( root,
-		SHOW_ELEMENT_OR_TEXT,
-		node => node.nodeType === TEXT_NODE ? notWS.test( node.data ) : node.nodeName === 'IMG'
-	),
-
-	rangeDoesStartAtBlockBoundary = ( range, root ) => {
-		let startContainer = range.startContainer;
-		let startOffset = range.startOffset;
-		let nodeAfterCursor;
-
-		// If in the middle or end of a text node, we're not at the boundary.
-		if ( startContainer.nodeType === TEXT_NODE ) {
-			if ( startOffset ) {
-				return false;
-			}
-			nodeAfterCursor = startContainer;
-		} else {
-			nodeAfterCursor = getNodeAfter( startContainer, startOffset );
-			if ( nodeAfterCursor && !root.contains( nodeAfterCursor ) ) {
-				nodeAfterCursor = null;
-			}
-			// The cursor was right at the end of the document
-			if ( !nodeAfterCursor ) {
-				nodeAfterCursor = getNodeBefore( startContainer, startOffset );
-				if ( nodeAfterCursor.nodeType === TEXT_NODE &&
-						nodeAfterCursor.length ) {
-					return false;
-				}
-			}
-		}
-
-		// Otherwise, look for any previous content in the same block.
-		contentWalker = newContentWalker(getStartBlockOfRange( range, root ));
-		contentWalker.currentNode = nodeAfterCursor;
-
-		return !contentWalker.previousNode();
-	},
-
-	rangeDoesEndAtBlockBoundary = ( range, root ) => {
-		let endContainer = range.endContainer,
-			endOffset = range.endOffset,
-			length;
-
-		// Otherwise, look for any further content in the same block.
-		contentWalker = newContentWalker(getStartBlockOfRange( range, root ));
-
-		// If in a text node with content, and not at the end, we're not
-		// at the boundary
-		if ( endContainer.nodeType === TEXT_NODE ) {
-			length = endContainer.data.length;
-			if ( length && endOffset < length ) {
-				return false;
-			}
-			contentWalker.currentNode = endContainer;
-		} else {
-			contentWalker.currentNode = getNodeBefore( endContainer, endOffset );
-		}
-
-		return !contentWalker.nextNode();
-	},
-
-	expandRangeToBlockBoundaries = ( range, root ) => {
-		let start = getStartBlockOfRange( range, root ),
-			end = getEndBlockOfRange( range, root );
-
-		if ( start && end ) {
-			range.setStart( start, 0 );
-			range.setEnd( end, end.childNodes.length );
-//			parent = start.parentNode;
-//			range.setStart( parent, indexOf( parent.childNodes, start ) );
-//			parent = end.parentNode;
-//			range.setEnd( parent, indexOf( parent.childNodes, end ) + 1 );
-		}
-	},
-
-	didError = error => console.error( error ),
-
-	createRange = ( range, startOffset, endContainer, endOffset ) => {
-		if ( range instanceof Range ) {
-			return range.cloneRange();
-		}
-		let domRange = doc.createRange();
-		domRange.setStart( range, startOffset );
-		if ( endContainer ) {
-			domRange.setEnd( endContainer, endOffset );
-		} else {
-			domRange.setEnd( range, startOffset );
-		}
-		return domRange;
-	},
-
-	mapKeyTo = method => ( self, event ) => {
-		event.preventDefault();
-		self[ method ]();
-	},
-
-	mapKeyToFormat = ( tag, remove ) => {
-		return ( self, event ) => {
-			event.preventDefault();
-			self.toggleTag(tag, remove);
-		};
-	},
-
-	// If you delete the content inside a span with a font styling, Webkit will
-	// replace it with a <font> tag (!). If you delete all the text inside a
-	// link in Opera, it won't delete the link. Let's make things consistent. If
-	// you delete all text inside an inline tag, remove the inline tag.
-	afterDelete = ( self, range ) => {
-		try {
-			if ( !range ) { range = self.getSelection(); }
-			let node = range.startContainer,
-				parent;
-			// Climb the tree from the focus point while we are inside an empty
-			// inline element
-			if ( node.nodeType === TEXT_NODE ) {
-				node = node.parentNode;
-			}
-			parent = node;
-			while ( isInline( parent ) &&
-					( !parent.textContent || parent.textContent === ZWS ) ) {
-				node = parent;
-				parent = node.parentNode;
-			}
-			// If focused in empty inline element
-			if ( node !== parent ) {
-				// Move focus to just before empty inline(s)
-				range.setStart( parent,
-					indexOf( parent.childNodes, node ) );
-				range.collapse( true );
-				// Remove empty inline(s)
-				node.remove(  );
-				// Fix cursor in block
-				if ( !isBlock( parent ) ) {
-					parent = getPreviousBlock( parent, self._root );
-				}
-				fixCursor( parent, self._root );
-				// Move cursor into text node
-				moveRangeBoundariesDownTree( range );
-			}
-			// If you delete the last character in the sole <div> in Chrome,
-			// it removes the div and replaces it with just a <br> inside the
-			// root. Detach the <br>; the _ensureBottomLine call will insert a new
-			// block.
-			if ( node === self._root &&
-					( node = node.firstChild ) && node.nodeName === 'BR' ) {
-				detach( node );
-			}
-			self._ensureBottomLine();
-			self.setSelection( range );
-			self._updatePath( range, true );
-		} catch ( error ) {
-			didError( error );
-		}
-	},
-
-	detachUneditableNode = ( node, root ) => {
-		let parent;
-		while (( parent = node.parentNode )) {
-			if ( parent === root || parent.isContentEditable ) {
-				break;
-			}
-			node = parent;
-		}
-		detach( node );
-	},
-
-	handleEnter = ( self, shiftKey, range ) => {
-		let root = self._root;
-		let block, parent, node, offset, nodeAfterSplit;
-
-		// Save undo checkpoint and add any links in the preceding section.
-		// Remove any zws so we don't think there's content in an empty
-		// block.
-		self._recordUndoState( range, false );
-		if ( self._config.addLinks ) {
-			addLinks( range.startContainer, root, self );
-		}
-		self._removeZWS();
-		self._getRangeAndRemoveBookmark( range );
-
-		// Selected text is overwritten, therefore delete the contents
-		// to collapse selection.
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
-		}
-
-		block = getStartBlockOfRange( range, root );
-
-		// Inside a PRE, insert literal newline, unless on blank line.
-		if ( block && ( parent = getClosest( block, root, 'PRE' ) ) ) {
-			moveRangeBoundariesDownTree( range );
-			node = range.startContainer;
-			offset = range.startOffset;
-			if ( node.nodeType !== TEXT_NODE ) {
-				node = doc.createTextNode( '' );
-				parent.insertBefore( node, parent.firstChild );
-			}
-			// If blank line: split and insert default block
-			if ( !shiftKey &&
-					( node.data.charAt( offset - 1 ) === '\n' ||
-						rangeDoesStartAtBlockBoundary( range, root ) ) &&
-					( node.data.charAt( offset ) === '\n' ||
-						rangeDoesEndAtBlockBoundary( range, root ) ) ) {
-				node.deleteData( offset && offset - 1, offset ? 2 : 1 );
-				nodeAfterSplit =
-					split( node, offset && offset - 1, root, root );
-				node = nodeAfterSplit.previousSibling;
-				if ( !node.textContent ) {
-					detach( node );
-				}
-				node = self.createDefaultBlock();
-				nodeAfterSplit.before( node );
-				if ( !nodeAfterSplit.textContent ) {
-					detach( nodeAfterSplit );
-				}
-				range.setStart( node, 0 );
-			} else {
-				node.insertData( offset, '\n' );
-				fixCursor( parent, root );
-				// Firefox bug: if you set the selection in the text node after
-				// the new line, it draws the cursor before the line break still
-				// but if you set the selection to the equivalent position
-				// in the parent, it works.
-				if ( node.length === offset + 1 ) {
-					range.setStartAfter( node );
-				} else {
-					range.setStart( node, offset + 1 );
-				}
-			}
-			range.collapse( true );
-			self.setSelection( range );
-			self._updatePath( range, true );
-			self._docWasChanged();
-			return;
-		}
-
-		// If this is a malformed bit of document or in a table;
-		// just play it safe and insert a <br>.
-		if ( !block || shiftKey || /^T[HD]$/.test( block.nodeName ) ) {
-			// If inside an <a>, move focus out
-			moveRangeBoundaryOutOf( range, 'A', root );
-			insertNodeInRange( range, createElement( 'BR' ) );
-			range.collapse( false );
-			self.setSelection( range );
-			self._updatePath( range, true );
-			return;
-		}
-
-		// If in a list, we'll split the LI instead.
-		block = getClosest( block, root, 'LI' ) || block;
-
-		if ( isEmptyBlock( block ) && ( parent = getClosest( block, root, 'UL,OL,BLOCKQUOTE' ) ) ) {
-			return 'BLOCKQUOTE' === parent.nodeName
-				// Break blockquote
-				? self.modifyBlocks( (/* frag */) => self.createDefaultBlock( createBookmarkNodes( self ) ), range )
-				// Break list
-				: self.decreaseListLevel( range );
-		}
-
-		// Otherwise, split at cursor point.
-		nodeAfterSplit = splitBlock( self, block,
-			range.startContainer, range.startOffset );
-
-		// Clean up any empty inlines if we hit enter at the beginning of the block
-		removeZWS( block );
-		removeEmptyInlines( block );
-		fixCursor( block, root );
-
-		// Focus cursor
-		// If there's a <b>/<i> etc. at the beginning of the split
-		// make sure we focus inside it.
-		while ( nodeAfterSplit.nodeType === ELEMENT_NODE ) {
-			let child = nodeAfterSplit.firstChild,
-				next;
-
-			// Don't continue links over a block break; unlikely to be the
-			// desired outcome.
-			if ( nodeAfterSplit.nodeName === 'A' &&
-					( !nodeAfterSplit.textContent ||
-						nodeAfterSplit.textContent === ZWS ) ) {
-				child = doc.createTextNode( '' );
-				nodeAfterSplit.replaceWith( child );
-				nodeAfterSplit = child;
-				break;
-			}
-
-			while ( child && child.nodeType === TEXT_NODE && !child.data ) {
-				next = child.nextSibling;
-				if ( !next || next.nodeName === 'BR' ) {
-					break;
-				}
-				detach( child );
-				child = next;
-			}
-
-			// 'BR's essentially don't count; they're a browser hack.
-			// If you try to select the contents of a 'BR', FF will not let
-			// you type anything!
-			if ( !child || child.nodeName === 'BR' ||
-					child.nodeType === TEXT_NODE ) {
-				break;
-			}
-			nodeAfterSplit = child;
-		}
-		range = createRange( nodeAfterSplit, 0 );
-		self.setSelection( range );
-		self._updatePath( range, true );
-	},
-
-
-	changeIndentationLevel = direction => ( self, event ) => {
-		event.preventDefault();
-		self.changeIndentationLevel(direction);
-	},
-
-	toggleList = ( type, methodIfNotInList ) => ( self, event ) => {
-		event.preventDefault();
-		let parent = self.getSelectionClosest('UL,OL');
-		if (parent && type == parent.nodeName) {
-			self.removeList();
-		} else {
-			self[ methodIfNotInList ]();
-		}
-	},
-
-	fontSizes = {
-		1: 'x-small',
-		2: 'small',
-		3: 'medium',
-		4: 'large',
-		5: 'x-large',
-		6: 'xx-large',
-		7: 'xxx-large',
-		'-1': 'smaller',
-		'+1': 'larger'
-	},
-
-	styleToSemantic = {
-		fontWeight: {
-			regexp: /^bold|^700/i,
-			replace: () => createElement( 'B' )
-		},
-		fontStyle: {
-			regexp: /^italic/i,
-			replace: () => createElement( 'I' )
-		},
-		fontFamily: {
-			regexp: notWS,
-			replace: ( doc, family ) => createElement( 'SPAN', {
-				style: 'font-family:' + family
-			})
-		},
-		fontSize: {
-			regexp: notWS,
-			replace: ( doc, size ) => createElement( 'SPAN', {
-				style: 'font-size:' + size
-			})
-		},
-		textDecoration: {
-			regexp: /^underline/i,
-			replace: () => createElement( 'U' )
-		}
-	/*
-		textDecoration: {
-			regexp: /^line-through/i,
-			replace: doc => createElement( 'S' )
-		}
-	*/
-	},
-
-	replaceWithTag = tag => node => {
-		let el = createElement( tag );
-		Array.prototype.forEach.call( node.attributes, attr => el.setAttribute( attr.name, attr.value ) );
-		node.replaceWith( el );
-		el.append( empty( node ) );
-		return el;
-	},
-
-	replaceStyles = node => {
-		let style = node.style;
-		let css, newTreeBottom, newTreeTop, el;
-
-		Object.entries(styleToSemantic).forEach(([attr,converter])=>{
-			css = style[ attr ];
-			if ( css && converter.regexp.test( css ) ) {
-				el = converter.replace( doc, css );
-				if ( el.nodeName === node.nodeName &&
-						el.className === node.className ) {
-					return;
-				}
-				if ( !newTreeTop ) {
-					newTreeTop = el;
-				}
-				if ( newTreeBottom ) {
-					newTreeBottom.append( el );
-				}
-				newTreeBottom = el;
-				node.style[ attr ] = '';
-			}
-		});
-
-		if ( newTreeTop ) {
-			newTreeBottom.append( empty( node ) );
-			node.append( newTreeTop );
-		}
-
-		return newTreeBottom || node;
-	},
-
-	stylesRewriters = {
-		SPAN: replaceStyles,
-		STRONG: replaceWithTag( 'B' ),
-		EM: replaceWithTag( 'I' ),
-		INS: replaceWithTag( 'U' ),
-		STRIKE: replaceWithTag( 'S' ),
-		FONT: node => {
-			let face = node.face,
-				size = node.size,
-				color = node.color,
-				newTag = createElement( 'SPAN' ),
-				css = newTag.style;
-			if ( face ) {
-				css.fontFamily = face;
-			}
-			if ( size ) {
-				css.fontSize = fontSizes[ size ];
-			}
-			if ( color && /^#?([\dA-F]{3}){1,2}$/i.test( color ) ) {
-				if ( color.charAt( 0 ) !== '#' ) {
-					color = '#' + color;
-				}
-				css.color = color;
-			}
-			node.replaceWith( newTag );
-			newTag.append( empty( node ) );
-			return newTag;
-		},
-	//	KBD:
-	//	VAR:
-	//	CODE:
-	//	SAMP:
-		TT: node => {
-			let el = createElement( 'SPAN', {
-				style: 'font-family:menlo,consolas,"courier new",monospace'
-			});
-			node.replaceWith( el );
-			el.append( empty( node ) );
-			return el;
-		}
-	},
-
-	allowedBlock = /^(?:A(?:DDRESS|RTICLE|SIDE|UDIO)|BLOCKQUOTE|CAPTION|D(?:[DLT]|IV)|F(?:IGURE|IGCAPTION|OOTER)|H[1-6]|HEADER|L(?:ABEL|EGEND|I)|O(?:L|UTPUT)|P(?:RE)?|SECTION|T(?:ABLE|BODY|D|FOOT|H|HEAD|R)|COL(?:GROUP)?|UL)$/,
-
-	blacklist = /^(?:HEAD|META|STYLE)/,
-
-	// Previous node in post-order.
-	previousPONode = walker => {
-		let current = walker.currentNode,
-			root = walker.root,
-			nodeType = walker.nodeType, // whatToShow?
-			filter = walker.filter,
-			node;
-		while ( current ) {
-			node = current.lastChild;
-			while ( !node && current && current !== root) {
-				node = current.previousSibling;
-				if ( !node ) { current = current.parentNode; }
-			}
-			if ( node && ( typeToBitArray[ node.nodeType ] & nodeType ) && filter( node ) ) {
-				walker.currentNode = node;
-				return node;
-			}
-			current = node;
-		}
-		return null;
-	},
-
-	/*
-		Two purposes:
-
-		1. Remove nodes we don't want, such as weird <o:p> tags, comment nodes
-		   and whitespace nodes.
-		2. Convert inline tags into our preferred format.
-	*/
-	cleanTree = ( node, config, preserveWS ) => {
-		let children = node.childNodes,
-			nonInlineParent, i, l, child, nodeName, nodeType, childLength,
-			startsWithWS, endsWithWS, data, sibling;
-
-		nonInlineParent = node;
-		while ( isInline( nonInlineParent ) ) {
-			nonInlineParent = nonInlineParent.parentNode;
-		}
-		let walker = createTreeWalker( nonInlineParent, SHOW_ELEMENT_OR_TEXT );
-
-		for ( i = 0, l = children.length; i < l; ++i ) {
-			child = children[i];
-			nodeName = child.nodeName;
-			nodeType = child.nodeType;
-			if ( nodeType === ELEMENT_NODE ) {
-				childLength = child.childNodes.length;
-				if ( stylesRewriters[ nodeName ] ) {
-					child = stylesRewriters[ nodeName ]( child );
-				} else if ( blacklist.test( nodeName ) ) {
-					child.remove(  );
-					--i;
-					--l;
-					continue;
-				} else if ( !allowedBlock.test( nodeName ) && !isInline( child ) ) {
-					--i;
-					l += childLength - 1;
-					child.replaceWith( empty( child ) );
-					continue;
-				}
-				if ( childLength ) {
-					cleanTree( child, config,
-						preserveWS || ( nodeName === 'PRE' ) );
-				}
-			} else {
-				if ( nodeType === TEXT_NODE ) {
-					data = child.data;
-					startsWithWS = !notWS.test( data.charAt( 0 ) );
-					endsWithWS = !notWS.test( data.charAt( data.length - 1 ) );
-					if ( preserveWS || ( !startsWithWS && !endsWithWS ) ) {
-						continue;
-					}
-					// Iterate through the nodes; if we hit some other content
-					// before the start of a new block we don't trim
-					if ( startsWithWS ) {
-						walker.currentNode = child;
-						while ( sibling = previousPONode(walker) ) {
-							nodeName = sibling.nodeName;
-							if ( nodeName === 'IMG' ||
-									( nodeName === '#text' &&
-										notWS.test( sibling.data ) ) ) {
-								break;
-							}
-							if ( !isInline( sibling ) ) {
-								sibling = null;
-								break;
-							}
-						}
-						data = data.replace( /^[ \r\n]+/g, sibling ? ' ' : '' );
-					}
-					if ( endsWithWS ) {
-						walker.currentNode = child;
-						while ( sibling = walker.nextNode() ) {
-							if ( nodeName === 'IMG' ||
-									( nodeName === '#text' &&
-										notWS.test( sibling.data ) ) ) {
-								break;
-							}
-							if ( !isInline( sibling ) ) {
-								sibling = null;
-								break;
-							}
-						}
-						data = data.replace( /[ \r\n]+$/g, sibling ? ' ' : '' );
-					}
-					if ( data ) {
-						child.data = data;
-						continue;
-					}
-				}
-				child.remove(  );
-				--i;
-				--l;
-			}
-		}
-		return node;
-	},
-
-	// ---
-
-	removeEmptyInlines = node => {
-		let children = node.childNodes,
-			l = children.length,
-			child;
-		while ( l-- ) {
-			child = children[l];
-			if ( child.nodeType === ELEMENT_NODE && !isLeaf( child ) ) {
-				removeEmptyInlines( child );
-				if ( isInline( child ) && !child.firstChild ) {
-					child.remove(  );
-				}
-			} else if ( child.nodeType === TEXT_NODE && !child.data ) {
-				child.remove(  );
-			}
-		}
-	},
-
-	// ---
-
-	notWSTextNode = node => node.nodeType === ELEMENT_NODE ? node.nodeName === 'BR' : notWS.test( node.data ),
-	isLineBreak = ( br, isLBIfEmptyBlock ) => {
-		let block = br.parentNode;
-		let walker;
-		while ( isInline( block ) ) {
-			block = block.parentNode;
-		}
-		walker = createTreeWalker( block, SHOW_ELEMENT_OR_TEXT, notWSTextNode );
-		walker.currentNode = br;
-		return !!walker.nextNode() ||
-			( isLBIfEmptyBlock && !walker.previousNode() );
-	},
-
-	// <br> elements are treated specially, and differently depending on the
-	// browser, when in rich text editor mode. When adding HTML from external
-	// sources, we must remove them, replacing the ones that actually affect
-	// line breaks by wrapping the inline text in a <div>. Browsers that want <br>
-	// elements at the end of each block will then have them added back in a later
-	// fixCursor method call.
-	cleanupBRs = ( node, root, keepForBlankLine ) => {
-		let brs = node.querySelectorAll( 'BR' );
-		let l = brs.length;
-		let br, parent;
-		while ( l-- ) {
-			br = brs[l];
-			// Cleanup may have removed it
-			parent = br.parentNode;
-			if ( !parent ) { continue; }
-			// If it doesn't break a line, just remove it; it's not doing
-			// anything useful. We'll add it back later if required by the
-			// browser. If it breaks a line, wrap the content in div tags
-			// and replace the brs.
-			if ( !isLineBreak( br, keepForBlankLine ) ) {
-				detach( br );
-			} else if ( !isInline( parent ) ) {
-				fixContainer( parent, root );
-			}
-		}
-	},
-
-	// The (non-standard but supported enough) innerText property is based on the
-	// render tree in Firefox and possibly other browsers, so we must insert the
-	// DOM node into the document to ensure the text part is correct.
-	setClipboardData =
-			( event, contents, root ) => {
-		let clipboardData = event.clipboardData;
-		let body = doc.body;
-		let node = createElement( 'div' );
-		let html, text;
-
-		node.append( contents );
-
-		html = node.innerHTML;
-
-		// Firefox will add an extra new line for BRs at the end of block when
-		// calculating innerText, even though they don't actually affect
-		// display, so we need to remove them first.
-		cleanupBRs( node, root, true );
-		node.setAttribute( 'style',
-			'position:fixed;overflow:hidden;bottom:100%;right:100%;' );
-		body.append( node );
-		text = node.innerText || node.textContent;
-		text = text.replace( NBSP, ' ' ); // Replace nbsp with regular space
-		node.remove(  );
-
-		if ( text !== html ) {
-			clipboardData.setData( 'text/html', html );
-		}
-		clipboardData.setData( 'text/plain', text );
-		event.preventDefault();
-	},
-
-	mergeObjects = ( base, extras, mayOverride ) => {
-		base = base || {};
-		extras && Object.entries(extras).forEach(([prop,value])=>{
-			if ( mayOverride || !( prop in base ) ) {
-				base[ prop ] = ( value && value.constructor === Object ) ?
-					mergeObjects( base[ prop ], value, mayOverride ) :
-					value;
-			}
-		});
-		return base;
-	},
-
-	// --- Events ---
-
-	// Subscribing to these events won't automatically add a listener to the
-	// document node, since these events are fired in a custom manner by the
-	// editor code.
-	customEvents = {
-		pathChange: 1, select: 1, input: 1, undoStateChange: 1
-	},
-
-	// --- Workaround for browsers that can't focus empty text nodes ---
-
-	// WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=15256
-
-	// Walk down the tree starting at the root and remove any ZWS. If the node only
-	// contained ZWS space then remove it too. We may want to keep one ZWS node at
-	// the bottom of the tree so the block can be selected. Define that node as the
-	// keepNode.
-	removeZWS = ( root, keepNode ) => {
-		let walker = createTreeWalker( root, SHOW_TEXT );
-		let parent, node, index;
-		while ( node = walker.nextNode() ) {
-			while ( ( index = node.data.indexOf( ZWS ) ) > -1  &&
-					( !keepNode || node.parentNode !== keepNode ) ) {
-				if ( node.length === 1 ) {
-					do {
-						parent = node.parentNode;
-						node.remove(  );
-						node = parent;
-						walker.currentNode = parent;
-					} while ( isInline( node ) && !getLength( node ) );
-					break;
-				} else {
-					node.deleteData( index, 1 );
-				}
-			}
-		}
-	},
-
-	// --- Bookmarking ---
-
-	startSelectionId = 'squire-selection-start',
-	endSelectionId = 'squire-selection-end',
-
-	createBookmarkNodes = () => [
-		createElement( 'INPUT', {
-			id: startSelectionId,
-			type: 'hidden'
-		}),
-		createElement( 'INPUT', {
-			id: endSelectionId,
-			type: 'hidden'
-		})
-	],
-
-	// --- Block formatting ---
-
-	tagAfterSplit = {
-		DT:  'DD',
-		DD:  'DT',
-		LI:  'LI',
-		PRE: 'PRE'
-	},
-
-	splitBlock = ( self, block, node, offset ) => {
-		let splitTag = tagAfterSplit[ block.nodeName ] || self._config.blockTag,
-			nodeAfterSplit = split( node, offset, block.parentNode, self._root );
-
-		// Make sure the new node is the correct type.
-		if ( !hasTagAttributes( nodeAfterSplit, splitTag, {} ) ) {
-			block = createElement( splitTag );
-			if ( nodeAfterSplit.dir ) {
-				block.dir = nodeAfterSplit.dir;
-			}
-			nodeAfterSplit.replaceWith( block );
-			block.append( empty( nodeAfterSplit ) );
-			nodeAfterSplit = block;
-		}
-		return nodeAfterSplit;
-	},
-
-	getListSelection = ( range, root ) => {
-		// Get start+end li in single common ancestor
-		let list = range.commonAncestorContainer;
-		let startLi = range.startContainer;
-		let endLi = range.endContainer;
-		while ( list && list !== root && !/^[OU]L$/.test( list.nodeName ) ) {
-			list = list.parentNode;
-		}
-		if ( !list || list === root ) {
-			return null;
-		}
-		if ( startLi === list ) {
-			startLi = startLi.childNodes[ range.startOffset ];
-		}
-		if ( endLi === list ) {
-			endLi = endLi.childNodes[ range.endOffset ];
-		}
-		while ( startLi && startLi.parentNode !== list ) {
-			startLi = startLi.parentNode;
-		}
-		while ( endLi && endLi.parentNode !== list ) {
-			endLi = endLi.parentNode;
-		}
-		return [ list, startLi, endLi ];
-	},
-
-	makeList = ( self, frag, type ) => {
-		let walker = getBlockWalker( frag, self._root ),
-			node, tag, prev, newLi;
-
-		while ( node = walker.nextNode() ) {
-			if ( node.parentNode.nodeName === 'LI' ) {
-				node = node.parentNode;
-				walker.currentNode = node.lastChild;
-			}
-			if ( node.nodeName !== 'LI' ) {
-				newLi = createElement( 'LI' );
-				if ( node.dir ) {
-					newLi.dir = node.dir;
-				}
-
-				// Have we replaced the previous block with a new <ul>/<ol>?
-				if ( ( prev = node.previousSibling ) && prev.nodeName === type ) {
-					prev.append( newLi );
-					detach( node );
-				}
-				// Otherwise, replace this block with the <ul>/<ol>
-				else {
-					node.replaceWith(
-						createElement( type, null, [
-							newLi
-						])
-					);
-				}
-				newLi.append( empty( node ) );
-				walker.currentNode = newLi;
-			} else {
-				node = node.parentNode;
-				tag = node.nodeName;
-				if ( tag !== type && ( /^[OU]L$/.test( tag ) ) ) {
-					node.replaceWith(
-						createElement( type, null, [ empty( node ) ] )
-					);
-				}
-			}
-		}
-
-		return frag;
-	},
-
-	linkRegExp = /\b(?:((?:(?:ht|f)tps?:\/\/|www\d{0,3}[.]|[a-z0-9][a-z0-9.-]*[.][a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w-]+\.)+[a-z]{2,}\b(?:[?][^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()[\]{};:'".,<>«»“”‘’]+)*)?))/i,
-
-	addLinks = ( frag, root ) => {
-		let walker = createTreeWalker( frag, SHOW_TEXT, node => !getClosest( node, root, 'A' ) );
-		let node, data, parent, match, index, endIndex, child;
-		while (( node = walker.nextNode() )) {
-			data = node.data;
-			parent = node.parentNode;
-			while (( match = linkRegExp.exec( data ) )) {
-				index = match.index;
-				endIndex = index + match[0].length;
-				if ( index ) {
-					child = doc.createTextNode( data.slice( 0, index ) );
-					parent.insertBefore( child, node );
-				}
-				child = createElement( 'A', mergeObjects({
-					href: match[1] ?
-						/^(?:ht|f)tps?:/i.test( match[1] ) ?
-							match[1] :
-							'http://' + match[1] :
-						'mailto:' + match[0]
-				}, null, false ));
-				child.textContent = data.slice( index, endIndex );
-				parent.insertBefore( child, node );
-				node.data = data = data.slice( endIndex );
-			}
-		}
-	},
-
-	escapeHTML = text => text.replace( '&', '&amp;' )
-	   .replace( '<', '&lt;' )
-	   .replace( '>', '&gt;' )
-	   .replace( '"', '&quot;' );
-
-let contentWalker,
-	nodeCategoryCache = new WeakMap();
-
-function onKey ( event ) {
-	if ( event.defaultPrevented ) {
-		return;
-	}
-
-	let key = event.key.toLowerCase(),
-		modifiers = '',
-		range = this.getSelection();
-
-	// We need to apply the backspace/delete handlers regardless of
-	// control key modifiers.
-	if ( key !== 'backspace' && key !== 'delete' ) {
-		if ( event.altKey  ) { modifiers += 'alt-'; }
-		if ( event[osKey] ) { modifiers += ctrlKey; }
-		if ( event.shiftKey ) { modifiers += 'shift-'; }
-	}
-
-	key = modifiers + key;
-
-	if ( this._keyHandlers[ key ] ) {
-		this._keyHandlers[ key ]( this, event, range );
-	// !event.isComposing stops us from blatting Kana-Kanji conversion in Safari
-	} else if ( !range.collapsed && !event.isComposing &&
-			!event[osKey] &&
-			key.length === 1 ) {
-		// Record undo checkpoint.
-		this.saveUndoState( range );
-		// Delete the selection
-		deleteContentsOfRange( range, this._root );
-		this._ensureBottomLine();
-		this.setSelection( range );
-		this._updatePath( range, true );
-	}
-}
-
-function onCut ( event ) {
-	let range = this.getSelection();
-	let root = this._root;
-	let self = this;
-	let startBlock, endBlock, copyRoot, contents, parent, newContents;
-
-	// Nothing to do
-	if ( range.collapsed ) {
-		event.preventDefault();
-		return;
-	}
-
-	// Save undo checkpoint
-	this.saveUndoState( range );
-
-	// Edge only seems to support setting plain text as of 2016-03-11.
-	if ( event.clipboardData ) {
-		// Clipboard content should include all parents within block, or all
-		// parents up to root if selection across blocks
-		startBlock = getStartBlockOfRange( range, root );
-		endBlock = getEndBlockOfRange( range, root );
-		copyRoot = ( ( startBlock === endBlock ) && startBlock ) || root;
-		// Extract the contents
-		contents = deleteContentsOfRange( range, root );
-		// Add any other parents not in extracted content, up to copy root
-		parent = range.commonAncestorContainer;
-		if ( parent.nodeType === TEXT_NODE ) {
-			parent = parent.parentNode;
-		}
-		while ( parent && parent !== copyRoot ) {
-			newContents = parent.cloneNode( false );
-			newContents.append( contents );
-			contents = newContents;
-			parent = parent.parentNode;
-		}
-		// Set clipboard data
-		setClipboardData( event, contents, root );
-	} else {
-		setTimeout( () => {
-			try {
-				// If all content removed, ensure div at start of root.
-				self._ensureBottomLine();
-			} catch ( error ) {
-				didError( error );
-			}
-		}, 0 );
-	}
-
-	this.setSelection( range );
-}
-
-function onCopy ( event ) {
-	// Edge only seems to support setting plain text as of 2016-03-11.
-	if ( event.clipboardData ) {
-		let range = this.getSelection(), root = this._root,
-			// Clipboard content should include all parents within block, or all
-			// parents up to root if selection across blocks
-			startBlock = getStartBlockOfRange( range, root ),
-			endBlock = getEndBlockOfRange( range, root ),
-			copyRoot = ( ( startBlock === endBlock ) && startBlock ) || root,
-			contents, parent, newContents;
-		// Clone range to mutate, then move up as high as possible without
-		// passing the copy root node.
-		range = range.cloneRange();
-		moveRangeBoundariesDownTree( range );
-		moveRangeBoundariesUpTree( range, copyRoot, copyRoot, root );
-		// Extract the contents
-		contents = range.cloneContents();
-		// Add any other parents not in extracted content, up to copy root
-		parent = range.commonAncestorContainer;
-		if ( parent.nodeType === TEXT_NODE ) {
-			parent = parent.parentNode;
-		}
-		while ( parent && parent !== copyRoot ) {
-			newContents = parent.cloneNode( false );
-			newContents.append( contents );
-			contents = newContents;
-			parent = parent.parentNode;
-		}
-		// Set clipboard data
-		setClipboardData( event, contents, root );
-	}
-}
-
-function onPaste ( event ) {
-	let clipboardData = event.clipboardData;
-	let items = clipboardData && clipboardData.items;
-	let imageItem = null;
-	let plainItem = null;
-	let htmlItem = null;
-	let self = this;
-	let type;
-
-	// Current HTML5 Clipboard interface
-	// ---------------------------------
-	// https://html.spec.whatwg.org/multipage/interaction.html
-	if ( items ) {
-		[...items].forEach(item => {
-			type = item.type;
-			if ( type === 'text/html' ) {
-				htmlItem = item;
-			// iOS copy URL gives you type text/uri-list which is just a list
-			// of 1 or more URLs separated by new lines. Can just treat as
-			// plain text.
-			} else if ( type === 'text/plain' || type === 'text/uri-list' ) {
-				plainItem = item;
-			} else if ( item.kind === 'file' && /^image\/(png|jpeg|webp)/.test( type ) ) {
-				imageItem = item;
-			}
-		});
-		if (htmlItem || plainItem || imageItem) {
-			event.preventDefault();
-			if ( htmlItem && ( !self.isShiftDown || !plainItem ) ) {
-				htmlItem.getAsString( html => self.insertHTML( html, true ) );
-			} else if ( plainItem ) {
-				plainItem.getAsString( text => self.insertPlainText( text, true ) );
-			} else if ( imageItem ) {
-				let reader = new FileReader();
-				reader.onload = event =>
-					self.insertHTML( '<img src="'+event.target.result+'">', true );
-				reader.readAsDataURL(imageItem.getAsFile());
-			}
-		}
-	}
-}
-
-// On Windows you can drag an drop text. We can't handle this ourselves, because
-// as far as I can see, there's no way to get the drop insertion point. So just
-// save an undo state and hope for the best.
-function onDrop ( event ) {
-	let types = event.dataTransfer.types;
-	if ( types.includes('text/plain') || types.includes('text/html') ) {
-		this.saveUndoState();
-	}
-}
-
-let keyHandlers = {
-	// This song and dance is to force iOS to do enable the shift key
-	// automatically on enter. When you do the DOM split manipulation yourself,
-	// WebKit doesn't reset the IME state and so presents auto-complete options
-	// as though you were continuing to type on the previous line, and doesn't
-	// auto-enable the shift key. The old trick of blurring and focussing
-	// again no longer works in iOS 13, and I tried various execCommand options
-	// but they didn't seem to do anything. The only solution I've found is to
-	// let iOS handle the enter key, then after it's done that reset the HTML
-	// to what it was before and handle it properly in Squire; the IME state of
-	// course doesn't reset so you end up in the correct state!
-	enter: isIOS ? ( self, event, range ) => {
-		self._saveRangeToBookmark( range );
-		let html = self._getHTML();
-		let restoreAndDoEnter = () => {
-			self.removeEventListener( 'keyup', restoreAndDoEnter );
-			self._setHTML( html );
-			range = self._getRangeAndRemoveBookmark();
-			// Ignore the shift key on iOS, as this is for auto-capitalisation.
-			handleEnter( self, false, range );
-		};
-		self.addEventListener( 'keyup', restoreAndDoEnter );
-	} : ( self, event, range ) => {
-		event.preventDefault();
-		handleEnter( self, event.shiftKey, range );
-	},
-
-	'shift-enter': ( self, event, range ) => self._keyHandlers.enter( self, event, range ),
-
-	backspace: ( self, event, range ) => {
-		let root = self._root;
-		self._removeZWS();
-		// Record undo checkpoint.
-		self.saveUndoState( range );
-		// If not collapsed, delete contents
-		if ( !range.collapsed ) {
-			event.preventDefault();
-			deleteContentsOfRange( range, root );
-			afterDelete( self, range );
-		}
-		// If at beginning of block, merge with previous
-		else if ( rangeDoesStartAtBlockBoundary( range, root ) ) {
-			event.preventDefault();
-			let current = getStartBlockOfRange( range, root );
-			let previous;
-			if ( !current ) {
-				return;
-			}
-			// In case inline data has somehow got between blocks.
-			fixContainer( current.parentNode, root );
-			// Now get previous block
-			previous = getPreviousBlock( current, root );
-			// Must not be at the very beginning of the text area.
-			if ( previous ) {
-				// If not editable, just delete whole block.
-				if ( !previous.isContentEditable ) {
-					detachUneditableNode( previous, root );
-					return;
-				}
-				// Otherwise merge.
-				mergeWithBlock( previous, current, range, root );
-				// If deleted line between containers, merge newly adjacent
-				// containers.
-				current = previous.parentNode;
-				while ( current !== root && !current.nextSibling ) {
-					current = current.parentNode;
-				}
-				if ( current !== root && ( current = current.nextSibling ) ) {
-					mergeContainers( current, root );
-				}
-				self.setSelection( range );
-			}
-			// If at very beginning of text area, allow backspace
-			// to break lists/blockquote.
-			else if ( current ) {
-				let parent = getClosest( current, root, 'UL,OL,BLOCKQUOTE' );
-				if (parent) {
-					return ( 'BLOCKQUOTE' === parent.nodeName )
-						// Break blockquote
-						? self.decreaseQuoteLevel( range )
-						// Break list
-						: self.decreaseListLevel( range );
-				}
-				self.setSelection( range );
-				self._updatePath( range, true );
-			}
-		}
-		// Otherwise, leave to browser but check afterwards whether it has
-		// left behind an empty inline tag.
-		else {
-			self.setSelection( range );
-			setTimeout( () => afterDelete( self ), 0 );
-		}
-	},
-	'delete': ( self, event, range ) => {
-		let root = self._root;
-		let current, next, originalRange,
-			cursorContainer, cursorOffset, nodeAfterCursor;
-		self._removeZWS();
-		// Record undo checkpoint.
-		self.saveUndoState( range );
-		// If not collapsed, delete contents
-		if ( !range.collapsed ) {
-			event.preventDefault();
-			deleteContentsOfRange( range, root );
-			afterDelete( self, range );
-		}
-		// If at end of block, merge next into this block
-		else if ( rangeDoesEndAtBlockBoundary( range, root ) ) {
-			event.preventDefault();
-			current = getStartBlockOfRange( range, root );
-			if ( !current ) {
-				return;
-			}
-			// In case inline data has somehow got between blocks.
-			fixContainer( current.parentNode, root );
-			// Now get next block
-			next = getNextBlock( current, root );
-			// Must not be at the very end of the text area.
-			if ( next ) {
-				// If not editable, just delete whole block.
-				if ( !next.isContentEditable ) {
-					detachUneditableNode( next, root );
-					return;
-				}
-				// Otherwise merge.
-				mergeWithBlock( current, next, range, root );
-				// If deleted line between containers, merge newly adjacent
-				// containers.
-				next = current.parentNode;
-				while ( next !== root && !next.nextSibling ) {
-					next = next.parentNode;
-				}
-				if ( next !== root && ( next = next.nextSibling ) ) {
-					mergeContainers( next, root );
-				}
-				self.setSelection( range );
-				self._updatePath( range, true );
-			}
-		}
-		// Otherwise, leave to browser but check afterwards whether it has
-		// left behind an empty inline tag.
-		else {
-			// But first check if the cursor is just before an IMG tag. If so,
-			// delete it ourselves, because the browser won't if it is not
-			// inline.
-			originalRange = range.cloneRange();
-			moveRangeBoundariesUpTree( range, root, root, root );
-			cursorContainer = range.endContainer;
-			cursorOffset = range.endOffset;
-			if ( cursorContainer.nodeType === ELEMENT_NODE ) {
-				nodeAfterCursor = cursorContainer.childNodes[ cursorOffset ];
-				if ( nodeAfterCursor && nodeAfterCursor.nodeName === 'IMG' ) {
-					event.preventDefault();
-					detach( nodeAfterCursor );
-					moveRangeBoundariesDownTree( range );
-					afterDelete( self, range );
-					return;
-				}
-			}
-			self.setSelection( originalRange );
-			setTimeout( () => afterDelete( self ), 0 );
-		}
-	},
-	tab: ( self, event, range ) => {
-		let root = self._root;
-		let node, parent;
-		self._removeZWS();
-		// If no selection and at start of block
-		if ( range.collapsed && rangeDoesStartAtBlockBoundary( range, root ) ) {
-			node = getStartBlockOfRange( range, root );
-			// Iterate through the block's parents
-			while ( ( parent = node.parentNode ) ) {
-				// If we find a UL or OL (so are in a list, node must be an LI)
-				if ( parent.nodeName === 'UL' || parent.nodeName === 'OL' ) {
-					// Then increase the list level
-					event.preventDefault();
-					self.increaseListLevel( range );
-					break;
-				}
-				node = parent;
-			}
-		}
-	},
-	'shift-tab': ( self, event, range ) => {
-		let root = self._root;
-		let node;
-		self._removeZWS();
-		// If no selection and at start of block
-		if ( range.collapsed && rangeDoesStartAtBlockBoundary( range, root ) ) {
-			// Break list
-			node = range.startContainer;
-			if ( getClosest( node, root, 'UL,OL' ) ) {
-				event.preventDefault();
-				self.decreaseListLevel( range );
-			}
-		}
-	},
-	space: ( self, _, range ) => {
-		let node;
-		let root = self._root;
-		self._recordUndoState( range, false );
-		if ( self._config.addLinks ) {
-			addLinks( range.startContainer, root, self );
-		}
-		self._getRangeAndRemoveBookmark( range );
-
-		// If the cursor is at the end of a link (<a>foo|</a>) then move it
-		// outside of the link (<a>foo</a>|) so that the space is not part of
-		// the link text.
-		node = range.endContainer;
-		if ( range.collapsed && range.endOffset === getLength( node ) ) {
-			do {
-				if ( node.nodeName === 'A' ) {
-					range.setStartAfter( node );
-					break;
-				}
-			} while ( !node.nextSibling &&
-				( node = node.parentNode ) && node !== root );
-		}
-		// Delete the selection if not collapsed
-		if ( !range.collapsed ) {
-			deleteContentsOfRange( range, root );
-			self._ensureBottomLine();
-			self.setSelection( range );
-			self._updatePath( range, true );
-		}
-
-		self.setSelection( range );
-	},
-	arrowleft: self => self._removeZWS(),
-	arrowright: self => self._removeZWS()
-};
-
-// System standard for page up/down on Mac is to just scroll, not move the
-// cursor. On Linux/Windows, it should move the cursor, but some browsers don't
-// implement this natively. Override to support it.
-function _moveCursorTo( self, toStart ) {
-	let root = self._root,
-		range = createRange( root, toStart ? 0 : root.childNodes.length );
-	moveRangeBoundariesDownTree( range );
-	self.setSelection( range );
-	return self;
-}
-if ( !isMac ) {
-	keyHandlers.pageup = self => _moveCursorTo( self, true );
-	keyHandlers.pagedown = self => _moveCursorTo( self, false );
-}
-
-keyHandlers[ ctrlKey + 'b' ] = mapKeyToFormat( 'B' );
-keyHandlers[ ctrlKey + 'i' ] = mapKeyToFormat( 'I' );
-keyHandlers[ ctrlKey + 'u' ] = mapKeyToFormat( 'U' );
-keyHandlers[ ctrlKey + 'shift-7' ] = mapKeyToFormat( 'S' );
-keyHandlers[ ctrlKey + 'shift-5' ] = mapKeyToFormat( 'SUB', 'SUP' );
-keyHandlers[ ctrlKey + 'shift-6' ] = mapKeyToFormat( 'SUP', 'SUB' );
-keyHandlers[ ctrlKey + 'shift-8' ] = toggleList( 'UL', 'makeUnorderedList' );
-keyHandlers[ ctrlKey + 'shift-9' ] = toggleList( 'OL', 'makeOrderedList' );
-keyHandlers[ ctrlKey + '[' ] = changeIndentationLevel( 'decrease' );
-keyHandlers[ ctrlKey + ']' ] = changeIndentationLevel( 'increase' );
-keyHandlers[ ctrlKey + 'd' ] = mapKeyTo( 'toggleCode' );
-keyHandlers[ ctrlKey + 'y' ] = mapKeyTo( 'redo' );
-keyHandlers[ 'redo' ] = mapKeyTo( 'redo' );
-keyHandlers[ ctrlKey + 'z' ] = mapKeyTo( 'undo' );
-keyHandlers[ 'undo' ] = mapKeyTo( 'undo' );
-keyHandlers[ ctrlKey + 'shift-z' ] = mapKeyTo( 'redo' );
-
-class EditStack extends Array
-{
-	constructor(squire) {
-		super();
-		this.squire = squire;
-		this.index = -1;
-		this.inUndoState = false;
-
-		this.threshold = -1; // -1 means no threshold
-		this.limit = -1; // -1 means no limit
-	}
-
-	clear() {
-		this.index = -1;
-		this.length = 0;
-	}
-
-	stateChanged ( /*canUndo, canRedo*/ ) {
-		this.squire.fireEvent( 'undoStateChange', {
-			canUndo: this.index > 0,
-			canRedo: this.index + 1 < this.length
-		});
-		this.squire.fireEvent( 'input' );
-	}
-
-	docWasChanged () {
-		if ( this.inUndoState ) {
-			this.inUndoState = false;
-			this.stateChanged ( /*true, false*/ );
-		} else
-			this.squire.fireEvent( 'input' );
-	}
-
-	// Leaves bookmark
-	recordUndoState ( range, replace ) {
-		replace = replace !== false && this.inUndoState;
-		// Don't record if we're already in an undo state
-		if ( !this.inUndoState || replace ) {
-			// Advance pointer to new position
-			let undoIndex = this.index;
-			let undoThreshold = this.threshold;
-			let undoLimit = this.limit;
-			let squire = this.squire;
-			let html;
-
-			if ( !replace ) {
-				++undoIndex;
-			}
-			undoIndex = Math.max(0, undoIndex);
-
-			// Truncate stack if longer (i.e. if has been previously undone)
-			this.length = Math.min(undoIndex + 1, this.length);
-
-			// Get data
-			if ( range ) {
-				squire._saveRangeToBookmark( range );
-			}
-			html = squire._getHTML();
-
-			// If this document is above the configured size threshold,
-			// limit the number of saved undo states.
-			// Threshold is in bytes, JS uses 2 bytes per character
-			if ( undoThreshold > -1 && html.length * 2 > undoThreshold
-			 && undoLimit > -1 && undoIndex > undoLimit ) {
-				this.splice( 0, undoIndex - undoLimit );
-			}
-
-			// Save data
-			this[ undoIndex ] = html;
-			this.index = undoIndex;
-			this.inUndoState = true;
-		}
-	}
-
-	saveUndoState ( range ) {
-		let squire = this.squire;
-		if ( range === undefined ) {
-			range = squire.getSelection();
-		}
-		this.recordUndoState( range );
-		squire._getRangeAndRemoveBookmark( range );
-	}
-
-	undo () {
-		let squire = this.squire,
-			undoIndex = this.index - 1;
-		// Sanity check: must not be at beginning of the history stack
-		if ( undoIndex >= 0 || !this.inUndoState ) {
-			// Make sure any changes since last checkpoint are saved.
-			this.recordUndoState( squire.getSelection(), false );
-			this.index = undoIndex;
-			squire._setHTML( this[ undoIndex ] );
-			let range = squire._getRangeAndRemoveBookmark();
-			if ( range ) {
-				squire.setSelection( range );
-			}
-			this.inUndoState = true;
-			this.stateChanged ( /*undoIndex > 0, true*/ );
-		}
-	}
-
-	redo () {
-		// Sanity check: must not be at end of stack and must be in an undo state.
-		let squire = this.squire,
-			undoIndex = this.index + 1;
-		if ( undoIndex < this.length && this.inUndoState ) {
-			this.index = undoIndex;
-			squire._setHTML( this[ undoIndex ] );
-			let range = squire._getRangeAndRemoveBookmark();
-			if ( range ) {
-				squire.setSelection( range );
-			}
-			this.stateChanged ( /*true, undoIndex + 1 < this.length*/ );
-		}
-	}
-}
-
-class Squire
-{
-	constructor (root, config) {
-		this._root = root;
-
-		this._events = {};
-
-		this._isFocused = false;
-		this._lastRange = null;
-
-		this._hasZWS = false;
-
-		this._lastAnchorNode = null;
-		this._lastFocusNode = null;
-		this._path = '';
-
-		let _willUpdatePath;
-		const selectionchange = () => {
-			if (root.contains(doc.activeElement)) {
-				if ( this._isFocused && !_willUpdatePath ) {
-					_willUpdatePath = setTimeout( () => {
-						_willUpdatePath = 0;
-						this._updatePath( this.getSelection() );
-					}, 0 );
-				}
-			} else {
-				this.removeEventListener('selectionchange', selectionchange);
-			}
-		};
-		this.addEventListener('selectstart', () => this.addEventListener('selectionchange', selectionchange));
-
-		this.editStack = new EditStack(this);
-		this._ignoreChange = false;
-		this._ignoreAllChanges = false;
-
-		this._mutation = new MutationObserver( ()=>this._docWasChanged() );
-		this._mutation.observe( root, {
-			childList: true,
-			attributes: true,
-			characterData: true,
-			subtree: true
-		});
-
-		// On blur, restore focus except if the user taps or clicks to focus a
-		// specific point. Can't actually use click event because focus happens
-		// before click, so use mousedown/touchstart
-		this._restoreSelection = false;
-		// https://caniuse.com/mdn-api_document_pointerup_event
-		this.addEventListener( 'blur', () => this._restoreSelection = true )
-			.addEventListener( 'pointerdown mousedown touchstart', () => this._restoreSelection = false )
-			.addEventListener( 'focus', () => this._restoreSelection && this.setSelection( this._lastRange ) )
-			.addEventListener( 'cut', onCut )
-			.addEventListener( 'copy', onCopy )
-			// Need to monitor for shift key like this, as event.shiftKey is not available in paste event.
-			.addEventListener( 'keydown keyup', event => this.isShiftDown = event.shiftKey )
-			.addEventListener( 'paste', onPaste )
-			.addEventListener( 'drop', onDrop )
-			.addEventListener( 'keydown', onKey )
-			.addEventListener( 'pointerup keyup mouseup touchend', ()=>this.getSelection() );
-
-		// Add key handlers
-		this._keyHandlers = Object.create( keyHandlers );
-
-		// Override default properties
-		this.setConfig( config );
-
-		root.setAttribute( 'contenteditable', 'true' );
-		// Grammarly breaks the editor, *sigh*
-		root.setAttribute( 'data-gramm', 'false' );
-
-		// Remove Firefox's built-in controls
-		try {
-			doc.execCommand( 'enableObjectResizing', false, 'false' );
-			doc.execCommand( 'enableInlineTableEditing', false, 'false' );
-		} catch ( error ) {}
-
-		root.__squire__ = this;
-
-		// Need to register instance before calling setHTML, so that the fixCursor
-		// function can lookup any default block tag options set.
-		this.setHTML( '' );
-	}
-
-	setConfig ( config ) {
-		config = mergeObjects({
-			blockTag: 'DIV',
-			addLinks: true
-		}, config, true );
-
-		if ( typeof config.sanitizeToDOMFragment !== 'function' ) {
-			config.sanitizeToDOMFragment = null;
-		}
-
-		// Users may specify block tag in lower case
-		config.blockTag = config.blockTag.toUpperCase();
-
-		this._config = config;
-
-		return this;
-	}
-
-	createDefaultBlock ( children ) {
-		let config = this._config;
-		return fixCursor(
-			createElement( config.blockTag, null, children ),
-			this._root
-		);
-	}
-
-	getRoot () {
-		return this._root;
-	}
-
-	// --- Events ---
-
-	fireEvent ( type, event ) {
-		let handlers = this._events[ type ];
-		let isFocused, l, obj;
-		// UI code, especially modal views, may be monitoring for focus events and
-		// immediately removing focus. In certain conditions, this can cause the
-		// focus event to fire after the blur event, which can cause an infinite
-		// loop. So we detect whether we're actually focused/blurred before firing.
-		if ( /^(?:focus|blur)/.test( type ) ) {
-			isFocused = this._root === doc.activeElement;
-			if ( type === 'focus' ) {
-				if ( !isFocused || this._isFocused ) {
-					return this;
-				}
-				this._isFocused = true;
-			} else {
-				if ( isFocused || !this._isFocused ) {
-					return this;
-				}
-				this._isFocused = false;
-			}
-		}
-		if ( handlers ) {
-			if ( !event ) {
-				event = {};
-			}
-			if ( event.type !== type ) {
-				event.type = type;
-			}
-			// Clone handlers array, so any handlers added/removed do not affect it.
-			handlers = handlers.slice();
-			l = handlers.length;
-			while ( l-- ) {
-				obj = handlers[l];
-				try {
-					if ( obj.handleEvent ) {
-						obj.handleEvent( event );
-					} else {
-						obj.call( this, event );
-					}
-				} catch ( error ) {
-					error.details = 'Squire: fireEvent error. Event type: ' + type;
-					didError( error );
-				}
-			}
-		}
-		return this;
-	}
-
-	handleEvent ( event ) {
-		this.fireEvent( event.type, event );
-	}
-
-	addEventListener ( type, fn ) {
-		type.split(/\s+/).forEach(type=>{
-			let handlers = this._events[ type ],
-				target = this._root;
-			if ( !fn ) {
-				didError({
-					name: 'Squire: addEventListener with null or undefined fn',
-					message: 'Event type: ' + type
-				});
-				return this;
-			}
-			if ( !handlers ) {
-				handlers = this._events[ type ] = [];
-				if ( !customEvents[ type ] ) {
-					if ( type === 'selectionchange' ) {
-						target = doc;
-					}
-					target.addEventListener( type, this, {capture:true,passive:'touchstart'===type} );
-				}
-			}
-			handlers.push( fn );
-		});
-		return this;
-	}
-
-	removeEventListener ( type, fn ) {
-		let handlers = this._events[ type ];
-		let target = this._root;
-		let l;
-		if ( handlers ) {
-			if ( fn ) {
-				l = handlers.length;
-				while ( l-- ) {
-					if ( handlers[l] === fn ) {
-						handlers.splice( l, 1 );
-					}
-				}
-			} else {
-				handlers.length = 0;
-			}
-			if ( !handlers.length ) {
-				delete this._events[ type ];
-				if ( !customEvents[ type ] ) {
-					if ( type === 'selectionchange' ) {
-						target = doc;
-					}
-					target.removeEventListener( type, this, true );
-				}
-			}
-		}
-		return this;
-	}
-
-	// --- Selection and Path ---
-
-	setSelection ( range ) {
-		if ( range ) {
-			this._lastRange = range;
-			// If we're setting selection, that automatically, and synchronously, // triggers a focus event. So just store the selection and mark it as
-			// needing restore on focus.
-			if ( this._isFocused ) {
-				// iOS bug: if you don't focus the iframe before setting the
-				// selection, you can end up in a state where you type but the input
-				// doesn't get directed into the contenteditable area but is instead
-				// lost in a black hole. Very strange.
-				if ( isIOS ) {
-					win.focus();
-				}
-				let sel = win.getSelection();
-				if ( sel && sel.setBaseAndExtent ) {
-					sel.setBaseAndExtent(
-						range.startContainer,
-						range.startOffset,
-						range.endContainer,
-						range.endOffset,
-					);
-				} else if ( sel ) {
-					// This is just for IE11
-					sel.removeAllRanges();
-					sel.addRange( range );
-				}
-			} else {
-				this._restoreSelection = true;
-			}
-		}
-		return this;
-	}
-
-	getSelection () {
-		let sel = win.getSelection();
-		let root = this._root;
-		let range, startContainer, endContainer, node;
-		// If not focused, always rely on cached range; another function may
-		// have set it but the DOM is not modified until focus again
-		if ( this._isFocused && sel && sel.rangeCount ) {
-			range = sel.getRangeAt( 0 ).cloneRange();
-			startContainer = range.startContainer;
-			endContainer = range.endContainer;
-			// FF can return the range as being inside an <img>. WTF?
-			if ( startContainer && isLeaf( startContainer ) ) {
-				range.setStartBefore( startContainer );
-			}
-			if ( endContainer && isLeaf( endContainer ) ) {
-				range.setEndBefore( endContainer );
-			}
-		}
-		if ( range && root.contains( range.commonAncestorContainer ) ) {
-			this._lastRange = range;
-		} else {
-			range = this._lastRange;
-			node = range.commonAncestorContainer;
-			// Check the editor is in the live document; if not, the range has
-			// probably been rewritten by the browser and is bogus
-			if ( !doc.contains( node ) ) {
-				range = null;
-			}
-		}
-		return range || createRange( root.firstChild, 0 );
-	}
-
-	getSelectionClosest (selector) {
-		let range = this.getSelection();
-		return range && getClosest(range.commonAncestorContainer, this._root, selector);
-	}
-
-	getPath () {
-		return this._path;
-	}
-
-	// --- Workaround for browsers that can't focus empty text nodes ---
-
-	// WebKit bug: https://bugs.webkit.org/show_bug.cgi?id=15256
-
-	_addZWS () {
-		this._hasZWS = isWebKit;
-		return doc.createTextNode( isWebKit ? ZWS : '' );
-	}
-	_removeZWS () {
-		if ( this._hasZWS ) {
-			removeZWS( this._root );
-			this._hasZWS = false;
-		}
-	}
-
-	// --- Path change events ---
-
-	_updatePath ( range, force ) {
-		if ( !range ) {
-			return;
-		}
-		let anchor = range.startContainer,
-			focus = range.endContainer,
-			newPath;
-		if ( force || anchor !== this._lastAnchorNode ||
-				focus !== this._lastFocusNode ) {
-			this._lastAnchorNode = anchor;
-			this._lastFocusNode = focus;
-			newPath = ( anchor && focus ) ? ( anchor === focus ) ?
-				getPath( focus, this._root, this._config ) : '(selection)' : '';
-			if ( this._path !== newPath ) {
-				this._path = newPath;
-				this.fireEvent( 'pathChange', { path: newPath } );
-			}
-		}
-		this.fireEvent( range.collapsed ? 'cursor' : 'select', {
-			range: range
-		});
-	}
-
-	// --- Focus ---
-
-	focus () {
-		this._root.focus({ preventScroll: true });
-		return this;
-	}
-
-	blur () {
-		this._root.blur();
-		return this;
-	}
-
-	// --- Bookmarking ---
-
-	_saveRangeToBookmark ( range ) {
-		let [startNode, endNode] = createBookmarkNodes(this),
-			temp;
-
-		insertNodeInRange( range, startNode );
-		range.collapse( false );
-		insertNodeInRange( range, endNode );
-
-		// In a collapsed range, the start is sometimes inserted after the end!
-		if ( startNode.compareDocumentPosition( endNode ) &
-				DOCUMENT_POSITION_PRECEDING ) {
-			startNode.id = endSelectionId;
-			endNode.id = startSelectionId;
-			temp = startNode;
-			startNode = endNode;
-			endNode = temp;
-		}
-
-		range.setStartAfter( startNode );
-		range.setEndBefore( endNode );
-	}
-
-	_getRangeAndRemoveBookmark ( range ) {
-		let root = this._root,
-			start = root.querySelector( '#' + startSelectionId ),
-			end = root.querySelector( '#' + endSelectionId );
-
-		if ( start && end ) {
-			let startContainer = start.parentNode,
-				endContainer = end.parentNode,
-				startOffset = indexOf( startContainer.childNodes, start ),
-				endOffset = indexOf( endContainer.childNodes, end );
-
-			if ( startContainer === endContainer ) {
-				--endOffset;
-			}
-
-			detach( start );
-			detach( end );
-
-			if ( !range ) {
-				range = doc.createRange();
-			}
-			range.setStart( startContainer, startOffset );
-			range.setEnd( endContainer, endOffset );
-
-			// Merge any text nodes we split
-			mergeInlines( startContainer, range );
-			if ( startContainer !== endContainer ) {
-				mergeInlines( endContainer, range );
-			}
-
-			// If we didn't split a text node, we should move into any adjacent
-			// text node to current selection point
-			if ( range.collapsed ) {
-				startContainer = range.startContainer;
-				if ( startContainer.nodeType === TEXT_NODE ) {
-					endContainer = startContainer.childNodes[ range.startOffset ];
-					if ( !endContainer || endContainer.nodeType !== TEXT_NODE ) {
-						endContainer =
-							startContainer.childNodes[ range.startOffset - 1 ];
-					}
-					if ( endContainer && endContainer.nodeType === TEXT_NODE ) {
-						range.setStart( endContainer, 0 );
-						range.collapse( true );
-					}
-				}
-			}
-		}
-		return range || null;
-	}
-
-	// --- Undo ---
-
-	_docWasChanged () {
-		nodeCategoryCache = new WeakMap();
-		if ( !this._ignoreAllChanges ) {
-			if ( this._ignoreChange ) {
-				this._ignoreChange = false;
-			} else {
-				this.editStack.docWasChanged();
-			}
-		}
-	}
-
-	_recordUndoState ( range, replace ) {
-		this.editStack.recordUndoState( range, replace );
-	}
-
-	saveUndoState ( range ) {
-		this.editStack.saveUndoState( range );
-	}
-
-	undo () {
-		this.editStack.undo();
-	}
-
-	redo () {
-		this.editStack.redo();
-	}
-
-	// --- Inline formatting ---
-
-	// Looks for matching tag and attributes, so won't work
-	// if <strong> instead of <b> etc.
-	hasFormat ( tag, attributes, range ) {
-		// 1. Normalise the arguments and get selection
-		tag = tag.toUpperCase();
-		if ( !attributes ) { attributes = {}; }
-		if ( !range && !( range = this.getSelection() ) ) {
-			return false;
-		}
-
-		// Sanitize range to prevent weird IE artifacts
-		if ( !range.collapsed &&
-				range.startContainer.nodeType === TEXT_NODE &&
-				range.startOffset === range.startContainer.length &&
-				range.startContainer.nextSibling ) {
-			range.setStartBefore( range.startContainer.nextSibling );
-		}
-		if ( !range.collapsed &&
-				range.endContainer.nodeType === TEXT_NODE &&
-				range.endOffset === 0 &&
-				range.endContainer.previousSibling ) {
-			range.setEndAfter( range.endContainer.previousSibling );
-		}
-
-		// If the common ancestor is inside the tag we require, we definitely
-		// have the format.
-		let root = this._root;
-		let common = range.commonAncestorContainer;
-		let walker, node;
-		if ( getNearest( common, root, tag, attributes ) ) {
-			return true;
-		}
-
-		// If common ancestor is a text node and doesn't have the format, we
-		// definitely don't have it.
-		if ( common.nodeType === TEXT_NODE ) {
-			return false;
-		}
-
-		// Otherwise, check each text node at least partially contained within
-		// the selection and make sure all of them have the format we want.
-		walker = createTreeWalker( common, SHOW_TEXT, node => isNodeContainedInRange( range, node ) );
-
-		let seenNode = false;
-		while ( node = walker.nextNode() ) {
-			if ( !getNearest( node, root, tag, attributes ) ) {
-				return false;
-			}
-			seenNode = true;
-		}
-
-		return seenNode;
-	}
-
-	// Extracts the font-family and font-size (if any) of the element
-	// holding the cursor. If there's a selection, returns an empty object.
-	getFontInfo ( range ) {
-		let fontInfo = {
-			color: undefined,
-			backgroundColor: undefined,
-			family: undefined,
-			size: undefined
-		};
-		let seenAttributes = 0;
-		let element, style, attr;
-
-		if ( !range && !( range = this.getSelection() ) ) {
-			return fontInfo;
-		}
-
-		element = range.commonAncestorContainer;
-		if ( range.collapsed || element.nodeType === TEXT_NODE ) {
-			if ( element.nodeType === TEXT_NODE ) {
-				element = element.parentNode;
-			}
-			while ( seenAttributes < 4 && element ) {
-				if ( style = element.style ) {
-					if ( !fontInfo.color && ( attr = style.color ) ) {
-						fontInfo.color = attr;
-						++seenAttributes;
-					}
-					if ( !fontInfo.backgroundColor &&
-							( attr = style.backgroundColor ) ) {
-						fontInfo.backgroundColor = attr;
-						++seenAttributes;
-					}
-					if ( !fontInfo.family && ( attr = style.fontFamily ) ) {
-						fontInfo.family = attr;
-						++seenAttributes;
-					}
-					if ( !fontInfo.size && ( attr = style.fontSize ) ) {
-						fontInfo.size = attr;
-						++seenAttributes;
-					}
-				}
-				element = element.parentNode;
-			}
-		}
-		return fontInfo;
-	}
-
-	_addFormat ( tag, attributes, range ) {
-		// If the range is collapsed we simply insert the node by wrapping
-		// it round the range and focus it.
-		let root = this._root;
-		let el, walker, startContainer, endContainer, startOffset, endOffset,
-			node, needsFormat, block;
-
-		if ( range.collapsed ) {
-			el = fixCursor( createElement( tag, attributes ), root );
-			insertNodeInRange( range, el );
-			range.setStart( el.firstChild, el.firstChild.length );
-			range.collapse( true );
-
-			// Clean up any previous formats that may have been set on this block
-			// that are unused.
-			block = el;
-			while ( isInline( block ) ) {
-				block = block.parentNode;
-			}
-			removeZWS( block, el );
-		}
-		// Otherwise we find all the textnodes in the range (splitting
-		// partially selected nodes) and if they're not already formatted
-		// correctly we wrap them in the appropriate tag.
-		else {
-			// Create an iterator to walk over all the text nodes under this
-			// ancestor which are in the range and not already formatted
-			// correctly.
-			//
-			// In Blink/WebKit, empty blocks may have no text nodes, just a <br>.
-			// Therefore we wrap this in the tag as well, as this will then cause it
-			// to apply when the user types something in the block, which is
-			// presumably what was intended.
-			//
-			// IMG tags are included because we may want to create a link around
-			// them, and adding other styles is harmless.
-			walker = createTreeWalker(
-				range.commonAncestorContainer,
-				SHOW_ELEMENT_OR_TEXT,
-				node => ( node.nodeType === TEXT_NODE ||
-							node.nodeName === 'BR' ||
-							node.nodeName === 'IMG'
-						) && isNodeContainedInRange( range, node )
-			);
-
-			// Start at the beginning node of the range and iterate through
-			// all the nodes in the range that need formatting.
-			startContainer = range.startContainer;
-			startOffset = range.startOffset;
-			endContainer = range.endContainer;
-			endOffset = range.endOffset;
-
-			// Make sure we start with a valid node.
-			walker.currentNode = startContainer;
-			if ( filterAccept != walker.filter.acceptNode( startContainer ) ) {
-				startContainer = walker.nextNode();
-				startOffset = 0;
-			}
-
-			// If there are no interesting nodes in the selection, abort
-			if ( !startContainer ) {
-				return range;
-			}
-
-			do {
-				node = walker.currentNode;
-				needsFormat = !getNearest( node, root, tag, attributes );
-				if ( needsFormat ) {
-					// <br> can never be a container node, so must have a text node
-					// if node == (end|start)Container
-					if ( node === endContainer && node.length > endOffset ) {
-						node.splitText( endOffset );
-					}
-					if ( node === startContainer && startOffset ) {
-						node = node.splitText( startOffset );
-						if ( endContainer === startContainer ) {
-							endContainer = node;
-							endOffset -= startOffset;
-						}
-						startContainer = node;
-						startOffset = 0;
-					}
-					el = createElement( tag, attributes );
-					node.replaceWith( el );
-					el.append( node );
-				}
-			} while ( walker.nextNode() );
-
-			// If we don't finish inside a text node, offset may have changed.
-			if ( endContainer.nodeType !== TEXT_NODE ) {
-				if ( node.nodeType === TEXT_NODE ) {
-					endContainer = node;
-					endOffset = node.length;
-				} else {
-					// If <br>, we must have just wrapped it, so it must have only
-					// one child
-					endContainer = node.parentNode;
-					endOffset = 1;
-				}
-			}
-
-			// Now set the selection to as it was before
-			range = createRange(
-				startContainer, startOffset, endContainer, endOffset );
-		}
-		return range;
-	}
-
-	_removeFormat ( tag, attributes, range, partial ) {
-		// Add bookmark
-		this._saveRangeToBookmark( range );
-
-		// We need a node in the selection to break the surrounding
-		// formatted text.
-		let fixer;
-		if ( range.collapsed ) {
-			fixer = this._addZWS();
-			insertNodeInRange( range, fixer );
-		}
-
-		// Find block-level ancestor of selection
-		let root = range.commonAncestorContainer;
-		while ( isInline( root ) ) {
-			root = root.parentNode;
-		}
-
-		// Find text nodes inside formatTags that are not in selection and
-		// add an extra tag with the same formatting.
-		let startContainer = range.startContainer,
-			startOffset = range.startOffset,
-			endContainer = range.endContainer,
-			endOffset = range.endOffset,
-			toWrap = [],
-			examineNode = ( node, exemplar ) => {
-				// If the node is completely contained by the range then
-				// we're going to remove all formatting so ignore it.
-				if ( isNodeContainedInRange( range, node, false ) ) {
-					return;
-				}
-
-				let isText = ( node.nodeType === TEXT_NODE ),
-					child, next;
-
-				// If not at least partially contained, wrap entire contents
-				// in a clone of the tag we're removing and we're done.
-				if ( !isNodeContainedInRange( range, node ) ) {
-					// Ignore bookmarks and empty text nodes
-					if ( node.nodeName !== 'INPUT' &&
-							( !isText || node.data ) ) {
-						toWrap.push([ exemplar, node ]);
-					}
-					return;
-				}
-
-				// Split any partially selected text nodes.
-				if ( isText ) {
-					if ( node === endContainer && endOffset !== node.length ) {
-						toWrap.push([ exemplar, node.splitText( endOffset ) ]);
-					}
-					if ( node === startContainer && startOffset ) {
-						node.splitText( startOffset );
-						toWrap.push([ exemplar, node ]);
-					}
-				}
-				// If not a text node, recurse onto all children.
-				// Beware, the tree may be rewritten with each call
-				// to examineNode, hence find the next sibling first.
-				else {
-					for ( child = node.firstChild; child; child = next ) {
-						next = child.nextSibling;
-						examineNode( child, exemplar );
-					}
-				}
-			},
-			formatTags = Array.prototype.filter.call(
-				root.getElementsByTagName( tag ),
-				el => isNodeContainedInRange( range, el ) && hasTagAttributes( el, tag, attributes )
-			);
-
-		if ( !partial ) {
-			formatTags.forEach( node => examineNode( node, node ) );
-		}
-
-		// Now wrap unselected nodes in the tag
-		toWrap.forEach( item => {
-			// [ exemplar, node ] tuple
-			let el = item[0].cloneNode( false ),
-				node = item[1];
-			node.replaceWith( el );
-			el.append( node );
-		});
-		// and remove old formatting tags.
-		formatTags.forEach( el => el.replaceWith( empty( el ) ) );
-
-		// Merge adjacent inlines:
-		this._getRangeAndRemoveBookmark( range );
-		if ( fixer ) {
-			range.collapse( false );
-		}
-		mergeInlines( root, range );
-
-		return range;
-	}
-
-	toggleTag ( name, remove ) {
-		let range = this.getSelection();
-		if ( this.hasFormat( name, null, range ) ) {
-			this.changeFormat ( null, { tag: name }, range );
-		} else {
-			this.changeFormat ( { tag: name }, remove ? { tag: remove } : null, range );
-		}
-	}
-
-	changeFormat ( add, remove, range, partial ) {
-		// Normalise the arguments and get selection
-		if ( !range && !( range = this.getSelection() ) ) {
-			return this;
-		}
-
-		// Save undo checkpoint
-		this.saveUndoState( range );
-
-		if ( remove ) {
-			range = this._removeFormat( remove.tag.toUpperCase(),
-				remove.attributes || {}, range, partial );
-		}
-
-		if ( add ) {
-			range = this._addFormat( add.tag.toUpperCase(),
-				add.attributes || {}, range );
-		}
-
-		this.setSelection( range );
-		this._updatePath( range, true );
-
-		return this;
-	}
-
-	// --- Block formatting ---
-
-	forEachBlock ( fn, range ) {
-		if ( !range && !( range = this.getSelection() ) ) {
-			return this;
-		}
-
-		// Save undo checkpoint
-		this.saveUndoState( range );
-
-		let root = this._root;
-		let start = getStartBlockOfRange( range, root );
-		let end = getEndBlockOfRange( range, root );
-		if ( start && end ) {
-			do {
-				if ( fn( start ) || start === end ) { break; }
-			} while ( start = getNextBlock( start, root ) );
-		}
-
-		this.setSelection( range );
-
-		// Path may have changed
-		this._updatePath( range, true );
-
-		return this;
-	}
-
-	modifyBlocks ( modify, range ) {
-		if ( !range && !( range = this.getSelection() ) ) {
-			return this;
-		}
-
-		// 1. Save undo checkpoint and bookmark selection
-		this._recordUndoState( range );
-
-		let root = this._root;
-		let frag;
-
-		// 2. Expand range to block boundaries
-		expandRangeToBlockBoundaries( range, root );
-
-		// 3. Remove range.
-		moveRangeBoundariesUpTree( range, root, root, root );
-		frag = extractContentsOfRange( range, root, root );
-
-		// 4. Modify tree of fragment and reinsert.
-		insertNodeInRange( range, modify.call( this, frag ) );
-
-		// 5. Merge containers at edges
-		if ( range.endOffset < range.endContainer.childNodes.length ) {
-			mergeContainers( range.endContainer.childNodes[ range.endOffset ], root );
-		}
-		mergeContainers( range.startContainer.childNodes[ range.startOffset ], root );
-
-		// 6. Restore selection
-		this._getRangeAndRemoveBookmark( range );
-		this.setSelection( range );
-		this._updatePath( range, true );
-
-		return this;
-	}
-
-	increaseListLevel ( range ) {
-		if ( !range && !( range = this.getSelection() ) ) {
-			return this.focus();
-		}
-
-		let root = this._root;
-		let listSelection = getListSelection( range, root );
-		if ( !listSelection ) {
-			return this.focus();
-		}
-
-		let list = listSelection[0];
-		let startLi = listSelection[1];
-		let endLi = listSelection[2];
-		if ( !startLi || startLi === list.firstChild ) {
-			return this.focus();
-		}
-
-		// Save undo checkpoint and bookmark selection
-		this._recordUndoState( range );
-
-		// Increase list depth
-		let type = list.nodeName;
-		let newParent = startLi.previousSibling;
-		let next;
-		if ( newParent.nodeName !== type ) {
-			newParent = createElement( type );
-			startLi.before( newParent );
-		}
-		do {
-			next = startLi === endLi ? null : startLi.nextSibling;
-			newParent.append( startLi );
-		} while ( ( startLi = next ) );
-		next = newParent.nextSibling;
-		if ( next ) {
-			mergeContainers( next, root );
-		}
-
-		// Restore selection
-		this._getRangeAndRemoveBookmark( range );
-		this.setSelection( range );
-		this._updatePath( range, true );
-
-		return this.focus();
-	}
-
-	decreaseListLevel ( range ) {
-		if ( !range && !( range = this.getSelection() ) ) {
-			return this.focus();
-		}
-
-		let root = this._root;
-		let listSelection = getListSelection( range, root );
-		if ( !listSelection ) {
-			return this.focus();
-		}
-
-		let list = listSelection[0];
-		let startLi = listSelection[1];
-		let endLi = listSelection[2];
-		let newParent, next, insertBefore, makeNotList;
-		if ( !startLi ) {
-			startLi = list.firstChild;
-		}
-		if ( !endLi ) {
-			endLi = list.lastChild;
-		}
-
-		// Save undo checkpoint and bookmark selection
-		this._recordUndoState( range );
-
-		if ( startLi ) {
-			// Find the new parent list node
-			newParent = list.parentNode;
-
-			// Split list if necesary
-			insertBefore = !endLi.nextSibling ?
-				list.nextSibling :
-				split( list, endLi.nextSibling, newParent, root );
-
-			if ( newParent !== root && newParent.nodeName === 'LI' ) {
-				newParent = newParent.parentNode;
-				while ( insertBefore ) {
-					next = insertBefore.nextSibling;
-					endLi.append( insertBefore );
-					insertBefore = next;
-				}
-				insertBefore = list.parentNode.nextSibling;
-			}
-
-			makeNotList = !/^[OU]L$/.test( newParent.nodeName );
-			do {
-				next = startLi === endLi ? null : startLi.nextSibling;
-				startLi.remove(  );
-				if ( makeNotList && startLi.nodeName === 'LI' ) {
-					startLi = this.createDefaultBlock([ empty( startLi ) ]);
-				}
-				newParent.insertBefore( startLi, insertBefore );
-			} while (( startLi = next ));
-		}
-
-		if ( !list.firstChild ) {
-			detach( list );
-		}
-
-		if ( insertBefore ) {
-			mergeContainers( insertBefore, root );
-		}
-
-		// Restore selection
-		this._getRangeAndRemoveBookmark( range );
-		this.setSelection( range );
-		this._updatePath( range, true );
-
-		return this.focus();
-	}
-
-	_ensureBottomLine () {
-		let root = this._root;
-		let last = root.lastElementChild;
-		if ( !last ||
-				last.nodeName !== this._config.blockTag || !isBlock( last ) ) {
-			root.append( this.createDefaultBlock() );
-		}
-	}
-
-	// --- Get/Set data ---
-
-	_getHTML () {
-		return this._root.innerHTML;
-	}
-
-	_setHTML ( html ) {
-		let root = this._root;
-		let node = root;
-		let sanitizeToDOMFragment = this._config.sanitizeToDOMFragment;
-		if ( sanitizeToDOMFragment ) {
-			empty( node );
-			node.appendChild( sanitizeToDOMFragment( html, false, this ) );
-		} else {
-			node.innerHTML = html;
-		}
-		do {
-			fixCursor( node, root );
-		} while ( node = getNextBlock( node, root ) );
-		this._ignoreChange = true;
-	}
-
-	getHTML ( withBookMark ) {
-		let html, range;
-		if ( withBookMark && ( range = this.getSelection() ) ) {
-			this._saveRangeToBookmark( range );
-		}
-		html = this._getHTML().replace( /\u200B/g, '' );
-		if ( range ) {
-			this._getRangeAndRemoveBookmark( range );
-		}
-		return html;
-	}
-
-	setHTML ( html ) {
-		let config = this._config;
-		let sanitizeToDOMFragment = config.sanitizeToDOMFragment;
-		let root = this._root;
-		let div, frag, child;
-
-		// Parse HTML into DOM tree
-		if ( sanitizeToDOMFragment ) {
-			frag = sanitizeToDOMFragment( html, false, this );
-		} else {
-			div = createElement( 'DIV' );
-			div.innerHTML = html;
-			frag = doc.createDocumentFragment();
-			frag.append( empty( div ) );
-		}
-
-		cleanTree( frag, config );
-		cleanupBRs( frag, root, false );
-
-		fixContainer( frag, root );
-
-		// Fix cursor
-		let node, walker = getBlockWalker( frag, root );
-		while ( (node = walker.nextNode()) && node !== root ) {
-			fixCursor( node, root );
-		}
-
-		// Don't fire an input event
-		this._ignoreChange = true;
-
-		// Remove existing root children
-		while ( child = root.lastChild ) {
-			child.remove(  );
-		}
-
-		// And insert new content
-		root.append( frag );
-		fixCursor( root, root );
-
-		// Reset the undo stack
-		this.editStack.clear();
-
-		// Record undo state
-		let range = this._getRangeAndRemoveBookmark() ||
-			createRange( root.firstChild, 0 );
-		this.saveUndoState( range );
-		// IE will also set focus when selecting text so don't use
-		// setSelection. Instead, just store it in lastSelection, so if
-		// anything calls getSelection before first focus, we have a range
-		// to return.
-		this._lastRange = range;
-		this._restoreSelection = true;
-		this._updatePath( range, true );
-
-		return this;
-	}
-
-	insertElement ( el, range ) {
-		if ( !range ) {
-			range = this.getSelection();
-		}
-		range.collapse( true );
-		if ( isInline( el ) ) {
-			insertNodeInRange( range, el );
-			range.setStartAfter( el );
-		} else {
-			// Get containing block node.
-			let root = this._root;
-			let splitNode = getStartBlockOfRange( range, root ) || root;
-			let parent, nodeAfterSplit;
-			// While at end of container node, move up DOM tree.
-			while ( splitNode !== root && !splitNode.nextSibling ) {
-				splitNode = splitNode.parentNode;
-			}
-			// If in the middle of a container node, split up to root.
-			if ( splitNode !== root ) {
-				parent = splitNode.parentNode;
-				nodeAfterSplit = split( parent, splitNode.nextSibling, root, root );
-			}
-			if ( nodeAfterSplit ) {
-				nodeAfterSplit.before( el );
-			} else {
-				root.append( el );
-				// Insert blank line below block.
-				nodeAfterSplit = this.createDefaultBlock();
-				root.append( nodeAfterSplit );
-			}
-			range.setStart( nodeAfterSplit, 0 );
-			range.setEnd( nodeAfterSplit, 0 );
-			moveRangeBoundariesDownTree( range );
-		}
-		this.focus();
-		this.setSelection( range );
-		this._updatePath( range );
-
-		return this;
-	}
-
-	insertImage ( src, attributes ) {
-		let img = createElement( 'IMG', mergeObjects({
-			src: src
-		}, attributes, true ));
-		this.insertElement( img );
-		return img;
-	}
-
-	// Insert HTML at the cursor location. If the selection is not collapsed
-	// insertTreeFragmentIntoRange will delete the selection so that it is replaced
-	// by the html being inserted.
-	insertHTML ( html, isPaste ) {
-		let config = this._config;
-		let sanitizeToDOMFragment = config.sanitizeToDOMFragment;
-		let range = this.getSelection();
-		let startFragmentIndex, endFragmentIndex;
-		let div, frag, root, node, event;
-
-		// Edge doesn't just copy the fragment, but includes the surrounding guff
-		// including the full <head> of the page. Need to strip this out.
-		if ( isPaste ) {
-			startFragmentIndex = html.indexOf( '<!--StartFragment-->' );
-			endFragmentIndex = html.lastIndexOf( '<!--EndFragment-->' );
-			if ( startFragmentIndex > -1 && endFragmentIndex > -1 ) {
-				html = html.slice( startFragmentIndex + 20, endFragmentIndex );
-			}
-		}
-		if ( sanitizeToDOMFragment ) {
-			frag = sanitizeToDOMFragment( html, isPaste, this );
-		} else {
-			// Wrap with <tr> if html contains dangling <td> tags
-			if ( /<\/td>((?!<\/tr>)[\s\S])*$/i.test( html ) ) {
-				html = '<TR>' + html + '</TR>';
-			}
-			// Wrap with <table> if html contains dangling <tr> tags
-			if ( /<\/tr>((?!<\/table>)[\s\S])*$/i.test( html ) ) {
-				html = '<TABLE>' + html + '</TABLE>';
-			}
-			// Parse HTML into DOM tree
-			div = createElement( 'DIV' );
-			div.innerHTML = html;
-			frag = doc.createDocumentFragment();
-			frag.append( empty( div ) );
-		}
-
-		// Record undo checkpoint
-		this.saveUndoState( range );
-
-		try {
-			root = this._root;
-			node = frag;
-			event = {
-				fragment: frag,
-				preventDefault: function () {
-					this.defaultPrevented = true;
-				},
-				defaultPrevented: false
-			};
-
-			addLinks( frag, frag, this );
-			cleanTree( frag, config );
-			cleanupBRs( frag, root, false );
-			removeEmptyInlines( frag );
-			frag.normalize();
-
-			while ( node = getNextBlock( node, frag ) ) {
-				fixCursor( node, root );
-			}
-
-			if ( isPaste ) {
-				this.fireEvent( 'willPaste', event );
-			}
-
-			if ( !event.defaultPrevented ) {
-				insertTreeFragmentIntoRange( range, event.fragment, root );
-				range.collapse( false );
-
-				// After inserting the fragment, check whether the cursor is inside
-				// an <a> element and if so if there is an equivalent cursor
-				// position after the <a> element. If there is, move it there.
-				moveRangeBoundaryOutOf( range, 'A', root );
-
-				this._ensureBottomLine();
-			}
-
-			this.setSelection( range );
-			this._updatePath( range, true );
-			// Safari sometimes loses focus after paste. Weird.
-			if ( isPaste ) {
-				this.focus();
-			}
-		} catch ( error ) {
-			didError( error );
-		}
-		return this;
-	}
-
-	insertPlainText ( plainText, isPaste ) {
-		let range = this.getSelection();
-		if ( range.collapsed &&
-				getClosest( range.startContainer, this._root, 'PRE' ) ) {
-			let node = range.startContainer;
-			let offset = range.startOffset;
-			let text, event;
-			if ( !node || node.nodeType !== TEXT_NODE ) {
-				text = doc.createTextNode( '' );
-				node && node.childNodes[ offset ].before( text );
-				node = text;
-				offset = 0;
-			}
-			event = {
-				text: plainText,
-				preventDefault: function () {
-					this.defaultPrevented = true;
-				},
-				defaultPrevented: false
-			};
-			if ( isPaste ) {
-				this.fireEvent( 'willPaste', event );
-			}
-
-			if ( !event.defaultPrevented ) {
-				plainText = event.text;
-				node.insertData( offset, plainText );
-				range.setStart( node, offset + plainText.length );
-				range.collapse( true );
-			}
-			this.setSelection( range );
-			return this;
-		}
-		let lines = plainText.split( '\n' );
-		let config = this._config;
-		let tag = config.blockTag;
-		let closeBlock  = '</' + tag + '>';
-		let openBlock = '<' + tag + '>';
-		let i, l, line;
-
-		for ( i = 0, l = lines.length; i < l; ++i ) {
-			line = lines[i];
-			line = escapeHTML( line ).replace( / (?= )/g, '&nbsp;' );
-			// We don't wrap the first line in the block, so if it gets inserted
-			// into a blank line it keeps that line's formatting.
-			// Wrap each line in <div></div>
-			if ( i ) {
-				line = openBlock + ( line || '<BR>' ) + closeBlock;
-			}
-			lines[i] = line;
-		}
-		return this.insertHTML( lines.join( '' ), isPaste );
-	}
-
-	// --- Formatting ---
-
-	makeLink ( url, attributes ) {
-		let range = this.getSelection();
-		if ( range.collapsed ) {
-			let protocolEnd = url.indexOf( ':' ) + 1;
-			if ( protocolEnd ) {
-				while ( url[ protocolEnd ] === '/' ) { ++protocolEnd; }
-			}
-			insertNodeInRange(
-				range,
-				doc.createTextNode( url.slice( protocolEnd ) )
-			);
-		}
-		attributes = mergeObjects(
-			mergeObjects({
-				href: url
-			}, attributes, true ),
-			null,
-			false
-		);
-
-		this.changeFormat({
-			tag: 'A',
-			attributes: attributes
-		}, {
-			tag: 'A'
-		}, range );
-		return this.focus();
-	}
-
-	removeLink () {
-		this.changeFormat( null, {
-			tag: 'A'
-		}, this.getSelection(), true );
-		return this.focus();
-	}
-
-	setStyle ( style ) {
-		let range = this.getSelection();
-		let start = range ? range.startContainer : 0;
-		let end = range ? range.endContainer : 0;
-		// When the selection is all the text inside an element, set style on the element itself
-		if ( start && TEXT_NODE === start.nodeType && 0 === range.startOffset && start === end && end.length === range.endOffset ) {
-			this.saveUndoState( range );
-			setStyle( start.parentNode, style );
-			this.setSelection( range );
-			this._updatePath( range, true );
-		}
-		// Else create a span element
-		else {
-			this.changeFormat({
-				tag: 'SPAN',
-				attributes: {
-					style: style
-				}
-			}, null, range);
-		}
-		return this.focus();
-	}
-
-	// ---
-
-	code () {
-		let range = this.getSelection();
-		if ( range.collapsed || isContainer( range.commonAncestorContainer ) ) {
-			this.modifyBlocks( frag => {
-				let root = this._root;
-				let output = doc.createDocumentFragment();
-				let walker = getBlockWalker( frag, root );
-				let node;
-				// 1. Extract inline content; drop all blocks and contains.
-				while (( node = walker.nextNode() )) {
-					// 2. Replace <br> with \n in content
-					let nodes = node.querySelectorAll( 'BR' );
-					let l = nodes.length;
-					let br;
-
-					while ( l-- ) {
-						br = nodes[l];
-						if ( !isLineBreak( br, false ) ) {
-							detach( br );
-						} else {
-							br.replaceWith( doc.createTextNode( '\n' ) );
-						}
-					}
-					// 3. Remove <code>; its format clashes with <pre>
-					nodes = node.querySelectorAll( 'CODE' );
-					l = nodes.length;
-					while ( l-- ) {
-						detach( nodes[l] );
-					}
-					if ( output.childNodes.length ) {
-						output.append( doc.createTextNode( '\n' ) );
-					}
-					output.append( empty( node ) );
-				}
-				// 4. Replace nbsp with regular sp
-				walker = createTreeWalker( output, SHOW_TEXT );
-				while (( node = walker.nextNode() )) {
-					node.data = node.data.replace( NBSP, ' ' ); // nbsp -> sp
-				}
-				output.normalize();
-				return fixCursor( createElement( 'PRE',
-					null, [
-						output
-					]), root );
-			}, range );
-		} else {
-			this.changeFormat({
-				tag: 'CODE'
-			}, null, range );
-		}
-		return this.focus();
-	}
-
-	removeCode () {
-		let range = this.getSelection();
-		let ancestor = range.commonAncestorContainer;
-		let inPre = getClosest( ancestor, this._root, 'PRE' );
-		if ( inPre ) {
-			this.modifyBlocks( frag => {
-				let root = this._root;
-				let pres = frag.querySelectorAll( 'PRE' );
-				let l = pres.length;
-				let pre, walker, node, value, contents, index;
-				while ( l-- ) {
-					pre = pres[l];
-					walker = createTreeWalker( pre, SHOW_TEXT );
-					while (( node = walker.nextNode() )) {
-						value = node.data;
-						value = value.replace( / (?= )/g, NBSP ); // sp -> nbsp
-						contents = doc.createDocumentFragment();
-						while (( index = value.indexOf( '\n' ) ) > -1 ) {
-							contents.append(
-								doc.createTextNode( value.slice( 0, index ) )
-							);
-							contents.append( createElement( 'BR' ) );
-							value = value.slice( index + 1 );
-						}
-						node.before( contents );
-						node.data = value;
-					}
-					fixContainer( pre, root );
-					pre.replaceWith( empty( pre ) );
-				}
-				return frag;
-			}, range );
-		} else {
-			this.changeFormat( null, { tag: 'CODE' }, range );
-		}
-		return this.focus();
-	}
-
-	toggleCode () {
-		if ( this.hasFormat( 'PRE' ) || this.hasFormat( 'CODE' ) ) {
-			this.removeCode();
-		} else {
-			this.code();
-		}
-		return this;
-	}
-
-	// ---
-
-	changeIndentationLevel (direction) {
-		let parent = this.getSelectionClosest('UL,OL,BLOCKQUOTE');
-		if (parent || 'increase' === direction) {
-			let method = ( !parent || 'BLOCKQUOTE' === parent.nodeName ) ? 'Quote' : 'List';
-			this[ direction + method + 'Level' ]();
-		}
-	}
-
-	increaseQuoteLevel ( range ) {
-		this.modifyBlocks(
-			frag => createElement( 'BLOCKQUOTE', null, [ frag ]),
-			range
-		);
-		return this.focus();
-	}
-
-	decreaseQuoteLevel ( range ) {
-		this.modifyBlocks(
-			frag => {
-				var blockquotes = frag.querySelectorAll( 'blockquote' );
-				Array.prototype.filter.call( blockquotes, el =>
-					!getClosest( el.parentNode, frag, 'BLOCKQUOTE' )
-				).forEach( el => el.replaceWith( empty( el ) ) );
-				return frag;
-			},
-			range
-		);
-		return this.focus();
-	}
-
-	makeUnorderedList () {
-		this.modifyBlocks( frag => makeList( this, frag, 'UL' ) );
-		return this.focus();
-	}
-
-	makeOrderedList () {
-		this.modifyBlocks( frag => makeList( this, frag, 'OL' ) );
-		return this.focus();
-	}
-
-	removeList () {
-		this.modifyBlocks( frag => {
-			let lists = frag.querySelectorAll( 'UL, OL' ),
-				items =  frag.querySelectorAll( 'LI' ),
-				root = this._root,
-				i, l, list, listFrag, item;
-			for ( i = 0, l = lists.length; i < l; ++i ) {
-				list = lists[i];
-				listFrag = empty( list );
-				fixContainer( listFrag, root );
-				list.replaceWith( listFrag );
-			}
-
-			for ( i = 0, l = items.length; i < l; ++i ) {
-				item = items[i];
-				if ( isBlock( item ) ) {
-					item.replaceWith(
-						this.createDefaultBlock([ empty( item ) ])
-					);
-				} else {
-					fixContainer( item, root );
-					item.replaceWith( empty( item ) );
-				}
-			}
-
-			return frag;
-		});
-		return this.focus();
-	}
-
-	bold () { this.toggleTag( 'B' ); }
-	italic () { this.toggleTag( 'I' ); }
-	underline () { this.toggleTag( 'U' ); }
-	strikethrough () { this.toggleTag( 'S' ); }
-	subscript () { this.toggleTag( 'SUB', 'SUP' ); }
-	superscript () { this.toggleTag( 'SUP', 'SUB' ); }
-}
-
-win.Squire = Squire;
-
-})( document );
diff --git a/vendors/squire2/dist/squire-raw.js b/vendors/squire2/dist/squire-raw.js
new file mode 100644
index 000000000..d0449d88f
--- /dev/null
+++ b/vendors/squire2/dist/squire-raw.js
@@ -0,0 +1,3841 @@
+"use strict";
+(() => {
+  // source/node/TreeIterator.ts
+  var SHOW_ELEMENT = 1;
+  var SHOW_TEXT = 4;
+  var SHOW_ELEMENT_OR_TEXT = 5;
+
+  // source/node/TreeWalker.ts
+  var FILTER_ACCEPT = NodeFilter.FILTER_ACCEPT;
+  TreeWalker.prototype.previousPONode = function() {
+    const root = this.root;
+    let current = this.currentNode;
+    let node;
+    while (true) {
+      node = current.lastChild;
+      while (!node && current) {
+        if (current === root) {
+          break;
+        }
+        node = current.previousSibling;
+        if (!node) {
+          current = current.parentNode;
+        }
+      }
+      if (!node) {
+        return null;
+      }
+      const nodeType = node.nodeType;
+      const nodeFilterType = nodeType === Node.ELEMENT_NODE ? NodeFilter.SHOW_ELEMENT : nodeType === Node.TEXT_NODE ? NodeFilter.SHOW_TEXT : 0;
+      if (!!(nodeFilterType & this.whatToShow) && FILTER_ACCEPT === this.filter.acceptNode(node)) {
+        this.currentNode = node;
+        return node;
+      }
+      current = node;
+    }
+  };
+  var createTreeWalker = (root, whatToShow, filter) => document.createTreeWalker(
+    root,
+    whatToShow,
+    {
+      acceptNode: (node) => !filter || filter(node) ? FILTER_ACCEPT : NodeFilter.FILTER_SKIP
+    }
+  );
+
+  // source/Constants.ts
+  var ELEMENT_NODE = 1;
+  var TEXT_NODE = 3;
+  var COMMENT_NODE = 8;
+  var DOCUMENT_FRAGMENT_NODE = 11;
+  var ZWS = "\u200B";
+  var ua = navigator.userAgent;
+  var isMac = /Mac OS X/.test(ua);
+  var isWin = /Windows NT/.test(ua);
+  var isIOS = /iP(?:ad|hone)/.test(ua) || isMac && !!navigator.maxTouchPoints;
+  var isAndroid = /Android/.test(ua);
+  var isWebKit = /WebKit\//.test(ua);
+  var ctrlKey = isMac || isIOS ? "Meta-" : "Ctrl-";
+  var cantFocusEmptyTextNodes = isWebKit;
+  var notWS = /[^ \t\r\n\u200B]/;
+
+  // source/node/Category.ts
+  var inlineNodeNames = /^(?:#text|A(?:BBR|CRONYM)?|B(?:R|D[IO])?|C(?:ITE|ODE)|D(?:ATA|EL|FN)|EM|FONT|HR|I(?:MG|NS)?|KBD|Q|R(?:P|T|UBY)|S(?:AMP|MALL|PAN|TR(?:IKE|ONG)|U[BP])?|TIME|U|VAR|WBR)$/;
+  var leafNodeNames = /* @__PURE__ */ new Set(["BR", "HR", "IMG"]);
+  var UNKNOWN = 0;
+  var INLINE = 1;
+  var BLOCK = 2;
+  var CONTAINER = 3;
+  var cache = /* @__PURE__ */ new WeakMap();
+  var resetNodeCategoryCache = () => {
+    cache = /* @__PURE__ */ new WeakMap();
+  };
+  var isLeaf = (node) => leafNodeNames.has(node.nodeName);
+  var getNodeCategory = (node) => {
+    switch (node.nodeType) {
+      case COMMENT_NODE:
+      case TEXT_NODE:
+        return INLINE;
+      case ELEMENT_NODE:
+      case DOCUMENT_FRAGMENT_NODE:
+        if (cache.has(node)) {
+          return cache.get(node);
+        }
+        break;
+      default:
+        return UNKNOWN;
+    }
+    let nodeCategory;
+    if (!Array.from(node.childNodes).every(isInline)) {
+      nodeCategory = CONTAINER;
+    } else if (inlineNodeNames.test(node.nodeName)) {
+      nodeCategory = INLINE;
+    } else {
+      nodeCategory = BLOCK;
+    }
+    cache.set(node, nodeCategory);
+    return nodeCategory;
+  };
+  var isInline = (node) => getNodeCategory(node) === INLINE;
+  var isBlock = (node) => getNodeCategory(node) === BLOCK;
+  var isContainer = (node) => getNodeCategory(node) === CONTAINER;
+
+  // source/node/Node.ts
+  var createElement = (tag, props, children) => {
+    const el = document.createElement(tag);
+    if (props instanceof Array) {
+      children = props;
+      props = null;
+    }
+    setAttributes(el, props);
+    children && el.append(...children);
+    return el;
+  };
+  var areAlike = (node, node2) => {
+    if (isLeaf(node)) {
+      return false;
+    }
+    if (node.nodeType !== node2.nodeType || node.nodeName !== node2.nodeName) {
+      return false;
+    }
+    if (node instanceof HTMLElement && node2 instanceof HTMLElement) {
+      return node.nodeName !== "A" && node.className === node2.className && node.style.cssText === node2.style.cssText;
+    }
+    return true;
+  };
+  var hasTagAttributes = (node, tag, attributes) => {
+    if (node.nodeName !== tag) {
+      return false;
+    }
+    for (const attr in attributes) {
+      if (!("getAttribute" in node) || node.getAttribute(attr) !== attributes[attr]) {
+        return false;
+      }
+    }
+    return true;
+  };
+  var getNearest = (node, root, tag, attributes) => {
+    while (node && node !== root) {
+      if (hasTagAttributes(node, tag, attributes)) {
+        return node;
+      }
+      node = node.parentNode;
+    }
+    return null;
+  };
+  var getNodeBeforeOffset = (node, offset) => {
+    let children = node.childNodes;
+    while (offset && node instanceof Element) {
+      node = children[offset - 1];
+      children = node.childNodes;
+      offset = children.length;
+    }
+    return node;
+  };
+  var getNodeAfterOffset = (node, offset) => {
+    let returnNode = node;
+    if (returnNode instanceof Element) {
+      const children = returnNode.childNodes;
+      if (offset < children.length) {
+        returnNode = children[offset];
+      } else {
+        while (returnNode && !returnNode.nextSibling) {
+          returnNode = returnNode.parentNode;
+        }
+        if (returnNode) {
+          returnNode = returnNode.nextSibling;
+        }
+      }
+    }
+    return returnNode;
+  };
+  var getLength = (node) => node instanceof Element || node instanceof DocumentFragment ? node.childNodes.length : node instanceof CharacterData ? node.length : 0;
+  var empty = (node) => {
+    const frag = document.createDocumentFragment();
+    frag.append(...node.childNodes);
+    return frag;
+  };
+  var detach = (node) => {
+    node.parentNode?.removeChild(node);
+    return node;
+  };
+  var replaceWith = (node, node2) => node.parentNode?.replaceChild(node2, node);
+  var getClosest = (node, root, selector) => {
+    node = (node && !node.closest ? node.parentElement : node)?.closest(selector);
+    return node && root.contains(node) ? node : null;
+  };
+  var setAttributes = (node, props) => {
+    props && Object.entries(props).forEach(([k, v]) => {
+      if (null == v) {
+        node.removeAttribute(k);
+      } else if ("style" === k && typeof v === "object") {
+        Object.entries(v).forEach(([k2, v2]) => node.style[k2] = v2);
+      } else {
+        node.setAttribute(k, v);
+      }
+    });
+  };
+
+  // source/node/Whitespace.ts
+  var notWSTextNode = (node) => node instanceof Element ? node.nodeName === "BR" : (
+    // okay if data is 'undefined' here.
+    notWS.test(node.data)
+  );
+  var isLineBreak = (br) => {
+    let block = br.parentNode;
+    while (isInline(block)) {
+      block = block.parentNode;
+    }
+    const walker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      notWSTextNode
+    );
+    walker.currentNode = br;
+    return !!walker.nextNode();
+  };
+  var removeZWS = (root, keepNode) => {
+    const walker = createTreeWalker(root, SHOW_TEXT);
+    let textNode;
+    let index;
+    while (textNode = walker.nextNode()) {
+      while ((index = textNode.data.indexOf(ZWS)) > -1 && // eslint-disable-next-line no-unmodified-loop-condition
+      (!keepNode || textNode.parentNode !== keepNode)) {
+        if (textNode.length === 1) {
+          let node = textNode;
+          let parent = node.parentNode;
+          while (parent) {
+            parent.removeChild(node);
+            walker.currentNode = parent;
+            if (!isInline(parent) || getLength(parent)) {
+              break;
+            }
+            node = parent;
+            parent = node.parentNode;
+          }
+          break;
+        } else {
+          textNode.deleteData(index, 1);
+        }
+      }
+    }
+  };
+
+  // source/range/Boundaries.ts
+  var START_TO_START = 0;
+  var END_TO_END = 2;
+  var isNodeContainedInRange = (range, node, partial) => {
+    if (partial) {
+      return range.intersectsNode(node);
+    } else {
+      const nodeRange = document.createRange();
+      nodeRange.selectNode(node);
+      const nodeStartAfterStart = range.compareBoundaryPoints(START_TO_START, nodeRange) < 1;
+      const nodeEndBeforeEnd = range.compareBoundaryPoints(END_TO_END, nodeRange) > -1;
+      return nodeStartAfterStart && nodeEndBeforeEnd;
+    }
+  };
+  var canDescendInto = (node) => node instanceof Text || node.nodeType === ELEMENT_NODE && !isLeaf(node);
+  var moveRangeBoundariesDownTree = (range) => {
+    let { startContainer, startOffset, endContainer, endOffset } = range;
+    while (!(startContainer instanceof Text)) {
+      let child = startContainer.childNodes[startOffset];
+      if (!child || !canDescendInto(child)) {
+        if (startOffset) {
+          child = startContainer.childNodes[startOffset - 1];
+          if (child instanceof Text) {
+            let textChild = child;
+            let prev;
+            while (!textChild.length && (prev = textChild.previousSibling) && prev instanceof Text) {
+              textChild.remove();
+              textChild = prev;
+            }
+            startContainer = textChild;
+            startOffset = textChild.length;
+          }
+        }
+        break;
+      }
+      startContainer = child;
+      startOffset = 0;
+    }
+    if (endOffset) {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.childNodes[endOffset - 1];
+        if (!child || !canDescendInto(child)) {
+          if (child && child.nodeName === "BR" && !isLineBreak(child)) {
+            --endOffset;
+            continue;
+          }
+          break;
+        }
+        endContainer = child;
+        endOffset = getLength(endContainer);
+      }
+    } else {
+      while (!(endContainer instanceof Text)) {
+        const child = endContainer.firstChild;
+        if (!child || !canDescendInto(child)) {
+          break;
+        }
+        endContainer = child;
+      }
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundariesUpTree = (range, startMax, endMax, root) => {
+    let startContainer = range.startContainer;
+    let startOffset = range.startOffset;
+    let endContainer = range.endContainer;
+    let endOffset = range.endOffset;
+    let parent;
+    if (!startMax) {
+      startMax = range.commonAncestorContainer;
+    }
+    if (!endMax) {
+      endMax = startMax;
+    }
+    while (!startOffset && startContainer !== startMax && startContainer !== root) {
+      parent = startContainer.parentNode;
+      startOffset = Array.from(parent.childNodes).indexOf(
+        startContainer
+      );
+      startContainer = parent;
+    }
+    while (true) {
+      if (endContainer === endMax || endContainer === root) {
+        break;
+      }
+      if (endContainer.nodeType !== TEXT_NODE && endContainer.childNodes[endOffset] && endContainer.childNodes[endOffset].nodeName === "BR" && !isLineBreak(endContainer.childNodes[endOffset])) {
+        ++endOffset;
+      }
+      if (endOffset !== getLength(endContainer)) {
+        break;
+      }
+      parent = endContainer.parentNode;
+      endOffset = Array.from(parent.childNodes).indexOf(endContainer) + 1;
+      endContainer = parent;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var moveRangeBoundaryOutOf = (range, tag, root) => {
+    let parent = getClosest(range.endContainer, root, tag);
+    if (parent && (parent = parent.parentNode)) {
+      const clone = range.cloneRange();
+      moveRangeBoundariesUpTree(clone, parent, parent, root);
+      if (clone.endContainer === parent) {
+        range.setStart(clone.endContainer, clone.endOffset);
+        range.setEnd(clone.endContainer, clone.endOffset);
+      }
+    }
+    return range;
+  };
+
+  // source/Clean.ts
+  var styleToSemantic = {
+    "font-weight": {
+      regexp: /^bold|^700/i,
+      replace() {
+        return createElement("B");
+      }
+    },
+    "font-style": {
+      regexp: /^italic/i,
+      replace() {
+        return createElement("I");
+      }
+    },
+    "font-family": {
+      regexp: notWS,
+      replace(classNames, family) {
+        return createElement("SPAN", {
+          class: classNames.fontFamily,
+          style: { fontFamily: family }
+        });
+      }
+    },
+    "font-size": {
+      regexp: notWS,
+      replace(classNames, size) {
+        return createElement("SPAN", {
+          class: classNames.fontSize,
+          style: { fontSize: size }
+        });
+      }
+    },
+    "text-decoration": {
+      regexp: /^underline/i,
+      replace() {
+        return createElement("U");
+      }
+    }
+  };
+  var replaceStyles = (node, _, config) => {
+    const style = node.style;
+    let newTreeBottom;
+    let newTreeTop;
+    for (const attr in styleToSemantic) {
+      const converter = styleToSemantic[attr];
+      const css = style.getPropertyValue(attr);
+      if (css && converter.regexp.test(css)) {
+        const el = converter.replace(config.classNames, css);
+        if (el.nodeName === node.nodeName && el.className === node.className) {
+          continue;
+        }
+        if (!newTreeTop) {
+          newTreeTop = el;
+        }
+        if (newTreeBottom) {
+          newTreeBottom.append(el);
+        }
+        newTreeBottom = el;
+        node.style.removeProperty(attr);
+      }
+    }
+    if (newTreeTop && newTreeBottom) {
+      newTreeBottom.append(empty(node));
+      if (node.style.cssText) {
+        node.append(newTreeTop);
+      } else {
+        replaceWith(node, newTreeTop);
+      }
+    }
+    return newTreeBottom || node;
+  };
+  var replaceWithTag = (tag) => {
+    return (node, parent) => {
+      const el = createElement(tag);
+      const attributes = node.attributes;
+      for (let i = 0, l = attributes.length; i < l; ++i) {
+        const attribute = attributes[i];
+        el.setAttribute(attribute.name, attribute.value);
+      }
+      parent.replaceChild(el, node);
+      el.append(empty(node));
+      return el;
+    };
+  };
+  var fontSizes = {
+    "1": "x-small",
+    "2": "small",
+    "3": "medium",
+    "4": "large",
+    "5": "x-large",
+    "6": "xx-large",
+    "7": "xxx-large",
+    "-1": "smaller",
+    "+1": "larger"
+  };
+  var stylesRewriters = {
+    STRONG: replaceWithTag("B"),
+    EM: replaceWithTag("I"),
+    INS: replaceWithTag("U"),
+    STRIKE: replaceWithTag("S"),
+    SPAN: replaceStyles,
+    FONT: (node, parent, config) => {
+      const font = node;
+      const face = font.face;
+      const size = font.size;
+      let color = font.color;
+      let newTag = createElement("SPAN");
+      let css = newTag.style;
+      newTag.style.cssText = node.style.cssText;
+      if (face) {
+        css.fontFamily = face;
+      }
+      if (size) {
+        css.fontSize = fontSizes[size];
+      }
+      if (color && /^#?([\dA-F]{3}){1,2}$/i.test(color)) {
+        if (color.charAt(0) !== "#") {
+          color = "#" + color;
+        }
+        css.color = color;
+      }
+      replaceWith(node, newTag);
+      newTag.append(empty(node));
+      return newTag;
+    },
+    TT: (node, parent, config) => {
+      const el = createElement("SPAN", {
+        class: config.classNames.fontFamily,
+        style: 'font-family:menlo,consolas,"courier new",monospace'
+      });
+      replaceWith(node, el);
+      el.append(empty(node));
+      return el;
+    }
+  };
+  var allowedBlock = /^(?:A(?:DDRESS|RTICLE|SIDE|UDIO)|BLOCKQUOTE|CAPTION|D(?:[DLT]|IV)|F(?:IGURE|IGCAPTION|OOTER)|H[1-6]|HEADER|L(?:ABEL|EGEND|I)|O(?:L|UTPUT)|P(?:RE)?|SECTION|T(?:ABLE|BODY|D|FOOT|H|HEAD|R)|COL(?:GROUP)?|UL)$/;
+  var blacklist = /* @__PURE__ */ new Set(["HEAD", "META", "STYLE"]);
+  var cleanTree = (node, config, preserveWS) => {
+    const children = node.childNodes;
+    let nonInlineParent = node;
+    while (isInline(nonInlineParent)) {
+      nonInlineParent = nonInlineParent.parentNode;
+    }
+    const walker = createTreeWalker(
+      nonInlineParent,
+      SHOW_ELEMENT_OR_TEXT
+    );
+    let i = children.length;
+    while (i--) {
+      let child = children[i];
+      const nodeName = child.nodeName;
+      if (child instanceof HTMLElement) {
+        const childLength = child.childNodes.length;
+        if (stylesRewriters[nodeName]) {
+          child = stylesRewriters[nodeName](child, node, config);
+        } else if (blacklist.has(nodeName)) {
+          child.remove();
+          continue;
+        } else if (!allowedBlock.test(nodeName) && !isInline(child)) {
+          i += childLength;
+          replaceWith(child, empty(child));
+          continue;
+        }
+        if (childLength) {
+          cleanTree(child, config, preserveWS || nodeName === "PRE");
+        }
+      }
+    }
+    return node;
+  };
+  var removeEmptyInlines = (node) => {
+    const children = node.childNodes;
+    let l = children.length;
+    while (l--) {
+      const child = children[l];
+      if (child instanceof Element && !isLeaf(child)) {
+        removeEmptyInlines(child);
+        if (isInline(child) && !child.firstChild) {
+          node.removeChild(child);
+        }
+      } else if (child instanceof Text && !child.length) {
+        node.removeChild(child);
+      }
+    }
+  };
+  var cleanupBRs = (node) => {
+    const brs = node.querySelectorAll("BR:last-child");
+    let l = brs.length;
+    while (l--) {
+      const br = brs[l], parent = br.parentElement;
+      if (!br.nextSibling && 1 === parent.children.length && parent.textContent.trim().length) {
+        br.remove();
+      }
+    }
+  };
+  var escapeHTML = (text) => {
+    return text.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+  };
+
+  // source/node/MergeSplit.ts
+  var fixCursor = (node) => {
+    if ((node instanceof Element || node instanceof DocumentFragment) && !isInline(node) && !node.children.length && !node.textContent.length) {
+      node.appendChild(createElement("BR"));
+    }
+    return node;
+  };
+  var fixContainer = (container) => {
+    let wrapper = null;
+    if (/^(?:TABLE|TBODY|TR|TH|TD|P)/.test(container.nodeName)) {
+      return container;
+    }
+    [...container.childNodes].forEach((child) => {
+      if (isInline(child)) {
+        wrapper || (wrapper = createElement("DIV"));
+        wrapper.append(child);
+      } else if (wrapper) {
+        (wrapper.children.length || wrapper.textContent.trim().length) && container.insertBefore(wrapper, child);
+        wrapper = null;
+      }
+    });
+    wrapper && container.append(fixCursor(wrapper));
+    return container;
+  };
+  var split = (node, offset, stopNode, root) => {
+    if (!stopNode.contains(node)) {
+      throw new Error("split: stopNode does not contain node");
+    }
+    if (node instanceof Text && node !== stopNode) {
+      if (typeof offset !== "number") {
+        throw new Error("Offset must be a number to split text node!");
+      }
+      if (!node.parentNode) {
+        throw new Error("Cannot split text node with no parent!");
+      }
+      return split(node.parentNode, node.splitText(offset), stopNode, root);
+    }
+    let nodeAfterSplit = typeof offset === "number" ? offset < node.childNodes.length ? node.childNodes[offset] : null : offset;
+    const parent = node.parentNode;
+    if (!parent || node === stopNode || !(node instanceof Element)) {
+      return nodeAfterSplit;
+    }
+    const clone = node.cloneNode(false);
+    while (nodeAfterSplit) {
+      const next = nodeAfterSplit.nextSibling;
+      clone.append(nodeAfterSplit);
+      nodeAfterSplit = next;
+    }
+    if (node instanceof HTMLOListElement && getClosest(node, root, "BLOCKQUOTE")) {
+      clone.start = (+node.start || 1) + node.childNodes.length - 1;
+    }
+    fixCursor(node);
+    fixCursor(clone);
+    node.after(clone);
+    return split(parent, clone, stopNode, root);
+  };
+  var _mergeInlines = (node, fakeRange) => {
+    const children = node.childNodes;
+    let l = children.length;
+    const frags = [];
+    while (l--) {
+      const child = children[l];
+      const prev = l ? children[l - 1] : null;
+      if (prev && isInline(child) && areAlike(child, prev)) {
+        if (fakeRange.startContainer === child) {
+          fakeRange.startContainer = prev;
+          fakeRange.startOffset += getLength(prev);
+        }
+        if (fakeRange.endContainer === child) {
+          fakeRange.endContainer = prev;
+          fakeRange.endOffset += getLength(prev);
+        }
+        if (fakeRange.startContainer === node) {
+          if (fakeRange.startOffset > l) {
+            --fakeRange.startOffset;
+          } else if (fakeRange.startOffset === l) {
+            fakeRange.startContainer = prev;
+            fakeRange.startOffset = getLength(prev);
+          }
+        }
+        if (fakeRange.endContainer === node) {
+          if (fakeRange.endOffset > l) {
+            --fakeRange.endOffset;
+          } else if (fakeRange.endOffset === l) {
+            fakeRange.endContainer = prev;
+            fakeRange.endOffset = getLength(prev);
+          }
+        }
+        detach(child);
+        if (child instanceof Text) {
+          prev.appendData(child.data);
+        } else {
+          frags.push(empty(child));
+        }
+      } else if (child instanceof Element) {
+        let frag;
+        while (frag = frags.pop()) {
+          child.append(frag);
+        }
+        _mergeInlines(child, fakeRange);
+      }
+    }
+  };
+  var mergeInlines = (node, range) => {
+    const element = node instanceof Text ? node.parentNode : node;
+    if (element instanceof Element) {
+      const fakeRange = {
+        startContainer: range.startContainer,
+        startOffset: range.startOffset,
+        endContainer: range.endContainer,
+        endOffset: range.endOffset
+      };
+      _mergeInlines(element, fakeRange);
+      range.setStart(fakeRange.startContainer, fakeRange.startOffset);
+      range.setEnd(fakeRange.endContainer, fakeRange.endOffset);
+    }
+  };
+  var mergeWithBlock = (block, next, range, root) => {
+    let container = next;
+    let parent;
+    let offset;
+    while ((parent = container.parentNode) && parent !== root && parent instanceof Element && parent.childNodes.length === 1) {
+      container = parent;
+    }
+    detach(container);
+    offset = block.childNodes.length;
+    const last = block.lastChild;
+    if (last && last.nodeName === "BR") {
+      last.remove();
+      --offset;
+    }
+    block.append(empty(next));
+    range.setStart(block, offset);
+    range.collapse(true);
+    mergeInlines(block, range);
+  };
+  var mergeContainers = (node, root) => {
+    const prev = node.previousSibling;
+    const first = node.firstChild;
+    const isListItem = node.nodeName === "LI";
+    if (isListItem && (!first || !/^[OU]L$/.test(first.nodeName))) {
+      return;
+    }
+    if (prev && areAlike(prev, node)) {
+      if (!isContainer(prev)) {
+        if (!isListItem) {
+          return;
+        }
+        const block = createElement("DIV");
+        block.append(empty(prev));
+        prev.append(block);
+      }
+      detach(node);
+      const needsFix = !isContainer(node);
+      prev.append(empty(node));
+      needsFix && fixContainer(prev);
+      first && mergeContainers(first, root);
+    } else if (isListItem) {
+      const block = createElement("DIV");
+      node.insertBefore(block, first);
+      fixCursor(block);
+    }
+  };
+
+  // source/node/Block.ts
+  var getBlockWalker = (node, root) => {
+    const walker = createTreeWalker(root, SHOW_ELEMENT, isBlock);
+    walker.currentNode = node;
+    return walker;
+  };
+  var getPreviousBlock = (node, root) => {
+    const block = getBlockWalker(node, root).previousNode();
+    return block !== root ? block : null;
+  };
+  var getNextBlock = (node, root) => {
+    const block = getBlockWalker(node, root).nextNode();
+    return block !== root ? block : null;
+  };
+  var isEmptyBlock = (block) => {
+    return !block.textContent && !block.querySelector("IMG");
+  };
+
+  // source/range/Block.ts
+  var getStartBlockOfRange = (range, root) => {
+    const container = range.startContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      const node = getNodeBeforeOffset(container, range.startOffset);
+      block = getNextBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var getEndBlockOfRange = (range, root) => {
+    const container = range.endContainer;
+    let block;
+    if (isInline(container)) {
+      block = getPreviousBlock(container, root);
+    } else if (container !== root && container instanceof HTMLElement && isBlock(container)) {
+      block = container;
+    } else {
+      let node = getNodeAfterOffset(container, range.endOffset);
+      if (!node || !root.contains(node)) {
+        node = root;
+        let child;
+        while (child = node.lastChild) {
+          node = child;
+        }
+      }
+      block = getPreviousBlock(node, root);
+    }
+    return block && isNodeContainedInRange(range, block, true) ? block : null;
+  };
+  var isContent = (node) => {
+    return node instanceof Text ? notWS.test(node.data) : node.nodeName === "IMG";
+  };
+  var rangeDoesStartAtBlockBoundary = (range, root) => {
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let nodeAfterCursor;
+    if (startContainer instanceof Text) {
+      const text = startContainer.data;
+      for (let i = startOffset; i > 0; --i) {
+        if (text.charAt(i - 1) !== ZWS) {
+          return false;
+        }
+      }
+      nodeAfterCursor = startContainer;
+    } else {
+      nodeAfterCursor = getNodeAfterOffset(startContainer, startOffset);
+      if (nodeAfterCursor && !root.contains(nodeAfterCursor)) {
+        nodeAfterCursor = null;
+      }
+      if (!nodeAfterCursor) {
+        nodeAfterCursor = getNodeBeforeOffset(startContainer, startOffset);
+        if (nodeAfterCursor instanceof Text && nodeAfterCursor.length) {
+          return false;
+        }
+      }
+    }
+    const block = getStartBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = nodeAfterCursor;
+    return !contentWalker.previousNode();
+  };
+  var rangeDoesEndAtBlockBoundary = (range, root) => {
+    const endContainer = range.endContainer;
+    const endOffset = range.endOffset;
+    let currentNode;
+    if (endContainer instanceof Text) {
+      const text = endContainer.data;
+      const length = text.length;
+      for (let i = endOffset; i < length; ++i) {
+        if (text.charAt(i) !== ZWS) {
+          return false;
+        }
+      }
+      currentNode = endContainer;
+    } else {
+      currentNode = getNodeBeforeOffset(endContainer, endOffset);
+    }
+    const block = getEndBlockOfRange(range, root);
+    if (!block) {
+      return false;
+    }
+    const contentWalker = createTreeWalker(
+      block,
+      SHOW_ELEMENT_OR_TEXT,
+      isContent
+    );
+    contentWalker.currentNode = currentNode;
+    return !contentWalker.nextNode();
+  };
+  var expandRangeToBlockBoundaries = (range, root) => {
+    const start = getStartBlockOfRange(range, root);
+    const end = getEndBlockOfRange(range, root);
+    let parent;
+    if (start && end) {
+      parent = start.parentNode;
+      range.setStart(parent, Array.from(parent.childNodes).indexOf(start));
+      parent = end.parentNode;
+      range.setEnd(parent, Array.from(parent.childNodes).indexOf(end) + 1);
+    }
+  };
+
+  // source/range/InsertDelete.ts
+  function createRange(startContainer, startOffset, endContainer, endOffset) {
+    const range = document.createRange();
+    range.setStart(startContainer, startOffset);
+    if (endContainer && typeof endOffset === "number") {
+      range.setEnd(endContainer, endOffset);
+    } else {
+      range.setEnd(startContainer, startOffset);
+    }
+    return range;
+  }
+  var insertNodeInRange = (range, node) => {
+    let { startContainer, startOffset, endContainer, endOffset } = range;
+    let children;
+    if (startContainer instanceof Text) {
+      const parent = startContainer.parentNode;
+      children = parent.childNodes;
+      if (startOffset === startContainer.length) {
+        startOffset = Array.from(children).indexOf(startContainer) + 1;
+        if (range.collapsed) {
+          endContainer = parent;
+          endOffset = startOffset;
+        }
+      } else {
+        if (startOffset) {
+          const afterSplit = startContainer.splitText(startOffset);
+          if (endContainer === startContainer) {
+            endOffset -= startOffset;
+            endContainer = afterSplit;
+          } else if (endContainer === parent) {
+            ++endOffset;
+          }
+          startContainer = afterSplit;
+        }
+        startOffset = Array.from(children).indexOf(
+          startContainer
+        );
+      }
+      startContainer = parent;
+    } else {
+      children = startContainer.childNodes;
+    }
+    const childCount = children.length;
+    if (startOffset === childCount) {
+      startContainer.append(node);
+    } else {
+      startContainer.insertBefore(node, children[startOffset]);
+    }
+    if (startContainer === endContainer) {
+      endOffset += children.length - childCount;
+    }
+    range.setStart(startContainer, startOffset);
+    range.setEnd(endContainer, endOffset);
+  };
+  var extractContentsOfRange = (range, common, root) => {
+    const frag = document.createDocumentFragment();
+    if (range.collapsed) {
+      return frag;
+    }
+    if (!common) {
+      common = range.commonAncestorContainer;
+    }
+    if (common instanceof Text) {
+      common = common.parentNode;
+    }
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    let endContainer = split(range.endContainer, range.endOffset, common, root);
+    let endOffset = 0;
+    let node = split(startContainer, startOffset, common, root);
+    while (node && node !== endContainer) {
+      const next = node.nextSibling;
+      frag.append(node);
+      node = next;
+    }
+    node = endContainer && endContainer.previousSibling;
+    if (node && node instanceof Text && endContainer instanceof Text) {
+      endOffset = node.length;
+      node.appendData(endContainer.data);
+      detach(endContainer);
+      endContainer = node;
+    }
+    range.setStart(startContainer, startOffset);
+    if (endContainer) {
+      range.setEnd(endContainer, endOffset);
+    } else {
+      range.setEnd(common, common.childNodes.length);
+    }
+    fixCursor(common);
+    return frag;
+  };
+  var getAdjacentInlineNode = (iterator, method, node) => {
+    iterator.currentNode = node;
+    let nextNode;
+    while (nextNode = iterator[method]()) {
+      if (nextNode instanceof Text || isLeaf(nextNode)) {
+        return nextNode;
+      }
+      if (!isInline(nextNode)) {
+        return null;
+      }
+    }
+    return null;
+  };
+  var deleteContentsOfRange = (range, root) => {
+    const startBlock = getStartBlockOfRange(range, root);
+    let endBlock = getEndBlockOfRange(range, root);
+    const needsMerge = startBlock !== endBlock;
+    if (startBlock && endBlock) {
+      moveRangeBoundariesDownTree(range);
+      moveRangeBoundariesUpTree(range, startBlock, endBlock, root);
+    }
+    const frag = extractContentsOfRange(range, null, root);
+    moveRangeBoundariesDownTree(range);
+    if (needsMerge) {
+      endBlock = getEndBlockOfRange(range, root);
+      if (startBlock && endBlock && startBlock !== endBlock) {
+        mergeWithBlock(startBlock, endBlock, range, root);
+      }
+    }
+    if (startBlock) {
+      fixCursor(startBlock);
+    }
+    const child = root.firstChild;
+    if (!child || child.nodeName === "BR") {
+      fixCursor(root);
+      if (root.firstChild) {
+        range.selectNodeContents(root.firstChild);
+      }
+    }
+    range.collapse(true);
+    const startContainer = range.startContainer;
+    const startOffset = range.startOffset;
+    const iterator = createTreeWalker(root, SHOW_ELEMENT_OR_TEXT);
+    let afterNode = startContainer;
+    let afterOffset = startOffset;
+    if (!(afterNode instanceof Text) || afterOffset === afterNode.length) {
+      afterNode = getAdjacentInlineNode(iterator, "nextNode", afterNode);
+      afterOffset = 0;
+    }
+    let beforeNode = startContainer;
+    let beforeOffset = startOffset - 1;
+    if (!(beforeNode instanceof Text) || beforeOffset === -1) {
+      beforeNode = getAdjacentInlineNode(
+        iterator,
+        "previousPONode",
+        afterNode || (startContainer instanceof Text ? startContainer : startContainer.childNodes[startOffset] || startContainer)
+      );
+      if (beforeNode instanceof Text) {
+        beforeOffset = beforeNode.length;
+      }
+    }
+    let node = null;
+    let offset = 0;
+    if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " && rangeDoesStartAtBlockBoundary(range, root)) {
+      node = afterNode;
+      offset = afterOffset;
+    } else if (beforeNode instanceof Text && beforeNode.data.charAt(beforeOffset) === " ") {
+      if (afterNode instanceof Text && afterNode.data.charAt(afterOffset) === " " || rangeDoesEndAtBlockBoundary(range, root)) {
+        node = beforeNode;
+        offset = beforeOffset;
+      }
+    }
+    if (node) {
+      node.replaceData(offset, 1, "\xA0");
+    }
+    range.setStart(startContainer, startOffset);
+    range.collapse(true);
+    return frag;
+  };
+  var insertTreeFragmentIntoRange = (range, frag, root) => {
+    const firstInFragIsInline = frag.firstChild && isInline(frag.firstChild);
+    let node;
+    fixContainer(frag);
+    node = frag;
+    while (node = getNextBlock(node, root)) {
+      fixCursor(node);
+    }
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+    }
+    moveRangeBoundariesDownTree(range);
+    range.collapse(false);
+    let stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
+    let block = getStartBlockOfRange(range, root);
+    let blockContentsAfterSplit = null;
+    const firstBlockInFrag = getNextBlock(frag, frag);
+    const replaceBlock = !firstInFragIsInline && !!block && isEmptyBlock(block);
+    if (block && firstBlockInFrag && !replaceBlock && // Don't merge table cells or PRE elements into block
+    !getClosest(firstBlockInFrag, frag, "PRE") && !getClosest(firstBlockInFrag, frag, "TABLE")) {
+      moveRangeBoundariesUpTree(range, block, block, root);
+      range.collapse(true);
+      let container = range.endContainer;
+      let offset = range.endOffset;
+      cleanupBRs(block);
+      if (isInline(container)) {
+        const nodeAfterSplit = split(
+          container,
+          offset,
+          getPreviousBlock(container, root) || root,
+          root
+        );
+        container = nodeAfterSplit.parentNode;
+        offset = Array.from(container.childNodes).indexOf(
+          nodeAfterSplit
+        );
+      }
+      if (
+        /*isBlock( container ) && */
+        offset !== getLength(container)
+      ) {
+        blockContentsAfterSplit = document.createDocumentFragment();
+        while (node = container.childNodes[offset]) {
+          blockContentsAfterSplit.append(node);
+        }
+      }
+      mergeWithBlock(container, firstBlockInFrag, range, root);
+      if (container === root) {
+        range.setEnd(root, getLength(root));
+      } else {
+        offset = Array.from(container.parentNode.childNodes).indexOf(
+          container
+        ) + 1;
+        container = container.parentNode;
+        range.setEnd(container, offset);
+      }
+    }
+    if (getLength(frag)) {
+      if (replaceBlock && block) {
+        range.setEndBefore(block);
+        range.collapse(false);
+        detach(block);
+      }
+      if (!stopPoint.contains(range.endContainer)) {
+        if (!root.contains(range.endContainer)) {
+          range.setEnd(root, getLength(root));
+          range.collapse(false);
+        }
+        stopPoint = getClosest(range.endContainer, root, "BLOCKQUOTE") || root;
+      }
+      moveRangeBoundariesUpTree(range, stopPoint, stopPoint, root);
+      let nodeAfterSplit = split(
+        range.endContainer,
+        range.endOffset,
+        stopPoint,
+        root
+      );
+      const nodeBeforeSplit = nodeAfterSplit ? nodeAfterSplit.previousSibling : stopPoint.lastChild;
+      stopPoint.insertBefore(frag, nodeAfterSplit);
+      if (nodeAfterSplit) {
+        range.setEndBefore(nodeAfterSplit);
+      } else {
+        range.setEnd(stopPoint, getLength(stopPoint));
+      }
+      block = getEndBlockOfRange(range, root);
+      moveRangeBoundariesDownTree(range);
+      const container = range.endContainer;
+      const offset = range.endOffset;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      nodeAfterSplit = nodeBeforeSplit && nodeBeforeSplit.nextSibling;
+      if (nodeAfterSplit && isContainer(nodeAfterSplit)) {
+        mergeContainers(nodeAfterSplit, root);
+      }
+      range.setEnd(container, offset);
+    }
+    if (blockContentsAfterSplit && block) {
+      const tempRange = range.cloneRange();
+      fixCursor(blockContentsAfterSplit);
+      mergeWithBlock(block, blockContentsAfterSplit, tempRange, root);
+      range.setEnd(tempRange.endContainer, tempRange.endOffset);
+    }
+    moveRangeBoundariesDownTree(range);
+  };
+
+  // source/range/Contents.ts
+  var getTextContentsOfRange = (range) => {
+    if (range.collapsed) {
+      return "";
+    }
+    const startContainer = range.startContainer;
+    const endContainer = range.endContainer;
+    const walker = createTreeWalker(
+      range.commonAncestorContainer,
+      SHOW_ELEMENT_OR_TEXT,
+      (node2) => {
+        return isNodeContainedInRange(range, node2, true);
+      }
+    );
+    walker.currentNode = startContainer;
+    let node = startContainer;
+    let textContent = "";
+    let addedTextInBlock = false;
+    let value;
+    if (!(node instanceof Element) && !(node instanceof Text) || FILTER_ACCEPT !== walker.filter.acceptNode(node)) {
+      node = walker.nextNode();
+    }
+    while (node) {
+      if (node instanceof Text) {
+        value = node.data;
+        if (value && /\S/.test(value)) {
+          if (node === endContainer) {
+            value = value.slice(0, range.endOffset);
+          }
+          if (node === startContainer) {
+            value = value.slice(range.startOffset);
+          }
+          textContent += value;
+          addedTextInBlock = true;
+        }
+      } else if (node.nodeName === "BR" || addedTextInBlock && !isInline(node)) {
+        textContent += "\n";
+        addedTextInBlock = false;
+      }
+      node = walker.nextNode();
+    }
+    textContent = textContent.replace(/ /g, " ");
+    return textContent;
+  };
+
+  // source/Clipboard.ts
+  var indexOf = Array.prototype.indexOf;
+  var extractRange = (range, root, removeRangeFromDocument, toCleanHTML, toPlainText) => {
+    let text = toPlainText ? "" : getTextContentsOfRange(range);
+    const startBlock = getStartBlockOfRange(range, root);
+    const endBlock = getEndBlockOfRange(range, root);
+    let parent = range.commonAncestorContainer;
+    let copyRoot = root;
+    if (startBlock === endBlock && startBlock?.contains(parent)) {
+      copyRoot = startBlock;
+    }
+    let contents;
+    if (removeRangeFromDocument) {
+      contents = deleteContentsOfRange(range, root);
+      if (!parent.isConnected) {
+        parent = range.commonAncestorContainer;
+      }
+    } else {
+      contents = range.cloneContents();
+    }
+    while (parent && !(parent instanceof Element)) {
+      parent = parent.parentNode;
+    }
+    while (parent && parent !== copyRoot) {
+      const newContents = parent.cloneNode(false);
+      newContents.append(contents);
+      contents = newContents;
+      parent = parent.parentNode;
+    }
+    let html;
+    if (contents.childNodes.length === 1 && contents.childNodes[0] instanceof Text) {
+      text = contents.childNodes[0].data.replace(/ /g, " ");
+      html = void 0;
+    } else {
+      const node = createElement("DIV");
+      node.append(contents);
+      html = node.innerHTML;
+      if (toCleanHTML) {
+        html = toCleanHTML(html);
+      }
+    }
+    if (toPlainText && html !== void 0) {
+      text = toPlainText(html);
+    }
+    if (text === html) {
+      html = void 0;
+    }
+    if (isWin) {
+      text = text.replace(/\r?\n/g, "\r\n");
+    }
+    if (html) {
+      html = "<!-- squire -->" + html;
+    }
+    return [text, html];
+  };
+  var extractRangeToClipboard = (event, range, root, removeRangeFromDocument, toCleanHTML, toPlainText, plainTextOnly) => {
+    const clipboardData = event.clipboardData;
+    if (!clipboardData) {
+      return false;
+    }
+    let [text, html] = extractRange(
+      range,
+      root,
+      removeRangeFromDocument,
+      toCleanHTML,
+      toPlainText
+    );
+    event.preventDefault();
+    if (!plainTextOnly && html) {
+      clipboardData.setData("text/html", html);
+    }
+    clipboardData.setData("text/plain", text);
+    return true;
+  };
+  var _onCut = function(event) {
+    const range = this.getSelection();
+    const root = this._root;
+    if (range.collapsed) {
+      event.preventDefault();
+      return;
+    }
+    this.saveUndoState(range);
+    const handled = extractRangeToClipboard(
+      event,
+      range,
+      root,
+      true,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+    if (!handled) {
+      setTimeout(() => {
+        try {
+          this._ensureBottomLine();
+        } catch (error) {
+          this._config.didError(error);
+        }
+      }, 0);
+    }
+    this.setSelection(range);
+  };
+  var _onCopy = function(event) {
+    extractRangeToClipboard(
+      event,
+      this.getSelection(),
+      this._root,
+      false,
+      this._config.willCutCopy,
+      this._config.toPlainText,
+      false
+    );
+  };
+  var _monitorShiftKey = function(event) {
+    this._isShiftDown = event.shiftKey;
+  };
+  var _onPaste = function(event) {
+    const clipboardData = event.clipboardData;
+    const items = clipboardData.items;
+    const choosePlain = this._isShiftDown || !!getNearest(
+      this.getSelection().commonAncestorContainer,
+      this._root,
+      "PRE"
+    );
+    let hasRTF = false;
+    let hasImage = false;
+    let plainItem = null;
+    let htmlItem = null;
+    let l = items.length;
+    while (l--) {
+      const item = items[l];
+      const type = item.type;
+      if (type === "text/html") {
+        htmlItem = item;
+      } else if (type === "text/plain" || type === "text/uri-list") {
+        plainItem = item;
+      } else if (type === "text/rtf") {
+        hasRTF = true;
+      } else if (/^image\/.*/.test(type)) {
+        hasImage = true;
+      }
+    }
+    if (hasImage && !(hasRTF && htmlItem) && !plainItem) {
+      event.preventDefault();
+      this.fireEvent("pasteImage", {
+        clipboardData
+      });
+      return;
+    }
+    event.preventDefault();
+    if (htmlItem && (!choosePlain || !plainItem)) {
+      htmlItem.getAsString((html) => {
+        this.insertHTML(html, true);
+      });
+    } else if (plainItem) {
+      plainItem.getAsString((text) => {
+        const range = this.getSelection();
+        if (!range.collapsed && notWS.test(range.toString())) {
+          const match = this.linkRegExp.exec(text);
+          const isLink = !!match && match[0].length === text.length;
+          if (isLink) {
+            const href = match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0];
+            this.makeLink(href);
+            return;
+          }
+        }
+        this.insertPlainText(text, true);
+      });
+    }
+  };
+  var _onDragStart = function() {
+    const range = this.getSelection();
+    if (range && !range.collapsed && this._root.contains(range.commonAncestorContainer)) {
+      this._dragRange = range.cloneRange();
+    } else {
+      this._dragRange = null;
+    }
+  };
+  var _onDragEnd = function() {
+    this._dragRange = null;
+  };
+  var getCaretRangeFromPoint = (x, y, root) => {
+    let range = null;
+    const doc = document;
+    if (doc.caretPositionFromPoint) {
+      const pos = doc.caretPositionFromPoint(x, y);
+      if (pos) {
+        range = document.createRange();
+        range.setStart(pos.offsetNode, pos.offset);
+        range.collapse(true);
+      }
+    } else if (doc.caretRangeFromPoint) {
+      range = doc.caretRangeFromPoint(x, y);
+    }
+    if (range && !root.contains(range.commonAncestorContainer)) {
+      return null;
+    }
+    return range;
+  };
+  var pointIsWithinRange = (point, source) => {
+    return point.compareBoundaryPoints(Range.START_TO_START, source) >= 0 && point.compareBoundaryPoints(Range.END_TO_END, source) <= 0;
+  };
+  var _onDrop = function(event) {
+    const dataTransfer = event.dataTransfer;
+    if (!dataTransfer) {
+      return;
+    }
+    const types = dataTransfer.types;
+    let hasPlain = false;
+    let hasHTML = false;
+    for (let i = 0, l = types.length; i < l; i += 1) {
+      switch (types[i]) {
+        case "text/plain":
+          hasPlain = true;
+          break;
+        case "text/html":
+          hasHTML = true;
+          break;
+      }
+    }
+    if (!hasPlain && !hasHTML) {
+      return;
+    }
+    event.preventDefault();
+    const root = this._root;
+    let dropRange = getCaretRangeFromPoint(event.clientX, event.clientY, root);
+    const dragRange = this._dragRange;
+    this._dragRange = null;
+    if (!dropRange) {
+      return;
+    }
+    let text, html;
+    if (dragRange) {
+      if (pointIsWithinRange(dropRange, dragRange)) {
+        return;
+      }
+      this._recordUndoState(dragRange, this._isInUndoState);
+      const bookmark = document.createComment("");
+      dropRange.insertNode(bookmark);
+      this._getRangeAndRemoveBookmark(dragRange);
+      [text, html] = extractRange(
+        dragRange,
+        root,
+        dataTransfer.dropEffect !== "copy",
+        this._config.willCutCopy,
+        this._config.toPlainText
+      );
+      bookmark.replaceWith(
+        createElement("INPUT", {
+          id: this.startSelectionId,
+          type: "hidden"
+        }),
+        createElement("INPUT", {
+          id: this.endSelectionId,
+          type: "hidden"
+        })
+      );
+      this._getRangeAndRemoveBookmark(dropRange);
+      resetNodeCategoryCache();
+    } else {
+      this.saveUndoState(dropRange);
+      if (hasHTML) {
+        html = dataTransfer.getData("text/html");
+      } else {
+        text = dataTransfer.getData("text/plain");
+      }
+    }
+    this.setSelection(dropRange);
+    if (html !== void 0) {
+      this.insertHTML(html, true);
+    } else if (text !== void 0) {
+      this.insertPlainText(text, true);
+    }
+  };
+
+  // source/keyboard/KeyHelpers.ts
+  var afterDelete = (self, range) => {
+    try {
+      if (!range) {
+        range = self.getSelection();
+      }
+      let node = range.startContainer;
+      if (node instanceof Text) {
+        node = node.parentNode;
+      }
+      let parent = node;
+      while (isInline(parent) && (!parent.textContent || parent.textContent === ZWS)) {
+        node = parent;
+        parent = node.parentNode;
+      }
+      if (node !== parent) {
+        range.setStart(
+          parent,
+          Array.from(parent.childNodes).indexOf(node)
+        );
+        range.collapse(true);
+        parent.removeChild(node);
+        if (!isBlock(parent)) {
+          parent = getPreviousBlock(parent, self._root) || self._root;
+        }
+        fixCursor(parent);
+        moveRangeBoundariesDownTree(range);
+      }
+      if (node === self._root && (node = node.firstChild) && node.nodeName === "BR") {
+        detach(node);
+      }
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } catch (error) {
+      self._config.didError(error);
+    }
+  };
+  var detachUneditableNode = (node, root) => {
+    let parent;
+    while (parent = node.parentNode) {
+      if (parent === root || parent.isContentEditable) {
+        break;
+      }
+      node = parent;
+    }
+    detach(node);
+  };
+  var linkifyText = (self, textNode, offset) => {
+    if (getClosest(textNode, self._root, "A")) {
+      return;
+    }
+    const data = textNode.data || "";
+    const searchFrom = Math.max(
+      data.lastIndexOf(" ", offset - 1),
+      data.lastIndexOf("\xA0", offset - 1)
+    ) + 1;
+    const searchText = data.slice(searchFrom, offset);
+    const match = self.linkRegExp.exec(searchText);
+    if (match) {
+      const selection = self.getSelection();
+      self._docWasChanged();
+      self._recordUndoState(selection);
+      self._getRangeAndRemoveBookmark(selection);
+      const index = searchFrom + match.index;
+      const endIndex = index + match[0].length;
+      const needsSelectionUpdate = selection.startContainer === textNode;
+      const newSelectionOffset = selection.startOffset - endIndex;
+      if (index) {
+        textNode = textNode.splitText(index);
+      }
+      const defaultAttributes = self._config.tagAttributes.a;
+      const link = createElement(
+        "A",
+        Object.assign(
+          {
+            href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+          },
+          defaultAttributes
+        )
+      );
+      link.textContent = data.slice(index, endIndex);
+      textNode.parentNode.insertBefore(link, textNode);
+      textNode.data = data.slice(endIndex);
+      if (needsSelectionUpdate) {
+        selection.setStart(textNode, newSelectionOffset);
+        selection.setEnd(textNode, newSelectionOffset);
+      }
+      self.setSelection(selection);
+    }
+  };
+
+  // source/keyboard/Backspace.ts
+  var Backspace = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesStartAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      const startBlock = getStartBlockOfRange(range, root);
+      if (!startBlock) {
+        return;
+      }
+      let current = startBlock;
+      fixContainer(current.parentNode);
+      const previous = getPreviousBlock(current, root);
+      if (previous) {
+        if (!previous.isContentEditable) {
+          detachUneditableNode(previous, root);
+          return;
+        }
+        mergeWithBlock(previous, current, range, root);
+        current = previous.parentNode;
+        while (current !== root && !current.nextSibling) {
+          current = current.parentNode;
+        }
+        if (current !== root && (current = current.nextSibling)) {
+          mergeContainers(current, root);
+        }
+        self.setSelection(range);
+      } else if (current) {
+        if (getClosest(current, root, "UL") || getClosest(current, root, "OL")) {
+          self.decreaseListLevel(range);
+          return;
+        } else if (getClosest(current, root, "BLOCKQUOTE")) {
+          self.removeQuote(range);
+          return;
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      moveRangeBoundariesDownTree(range);
+      const text = range.startContainer;
+      const offset = range.startOffset;
+      const a = text.parentNode;
+      if (text instanceof Text && a instanceof HTMLAnchorElement && offset && a.href.includes(text.data)) {
+        text.deleteData(offset - 1, 1);
+        self.setSelection(range);
+        self.removeLink();
+        event.preventDefault();
+      } else {
+        self.setSelection(range);
+        setTimeout(() => {
+          afterDelete(self);
+        }, 0);
+      }
+    }
+  };
+
+  // source/keyboard/Delete.ts
+  var Delete = (self, event, range) => {
+    const root = self._root;
+    let current;
+    let next;
+    let originalRange;
+    let cursorContainer;
+    let cursorOffset;
+    let nodeAfterCursor;
+    self._removeZWS();
+    self.saveUndoState(range);
+    if (!range.collapsed) {
+      event.preventDefault();
+      deleteContentsOfRange(range, root);
+      afterDelete(self, range);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      event.preventDefault();
+      current = getStartBlockOfRange(range, root);
+      if (!current) {
+        return;
+      }
+      fixContainer(current.parentNode);
+      next = getNextBlock(current, root);
+      if (next) {
+        if (!next.isContentEditable) {
+          detachUneditableNode(next, root);
+          return;
+        }
+        mergeWithBlock(current, next, range, root);
+        next = current.parentNode;
+        while (next !== root && !next.nextSibling) {
+          next = next.parentNode;
+        }
+        if (next !== root && (next = next.nextSibling)) {
+          mergeContainers(next, root);
+        }
+        self.setSelection(range);
+        self._updatePath(range, true);
+      }
+    } else {
+      originalRange = range.cloneRange();
+      moveRangeBoundariesUpTree(range, root, root, root);
+      cursorContainer = range.endContainer;
+      cursorOffset = range.endOffset;
+      if (cursorContainer instanceof Element) {
+        nodeAfterCursor = cursorContainer.childNodes[cursorOffset];
+        if (nodeAfterCursor && nodeAfterCursor.nodeName === "IMG") {
+          event.preventDefault();
+          detach(nodeAfterCursor);
+          moveRangeBoundariesDownTree(range);
+          afterDelete(self, range);
+          return;
+        }
+      }
+      self.setSelection(originalRange);
+      setTimeout(() => {
+        afterDelete(self);
+      }, 0);
+    }
+  };
+
+  // source/keyboard/Tab.ts
+  var Tab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      getClosest(range.startContainer, root, "UL,OL,BLOCKQUOTE") && self.changeIndentationLevel("increase") && event.preventDefault();
+    }
+  };
+  var ShiftTab = (self, event, range) => {
+    const root = self._root;
+    self._removeZWS();
+    if (range.collapsed && rangeDoesStartAtBlockBoundary(range, root)) {
+      decreaseLevel(self, range, range.startContainer) && event.preventDefault();
+    }
+  };
+
+  // source/keyboard/Space.ts
+  var Space = (self, event, range) => {
+    let node;
+    const root = self._root;
+    self._recordUndoState(range);
+    self._getRangeAndRemoveBookmark(range);
+    if (!range.collapsed) {
+      deleteContentsOfRange(range, root);
+      self._ensureBottomLine();
+      self.setSelection(range);
+      self._updatePath(range, true);
+    } else if (rangeDoesEndAtBlockBoundary(range, root)) {
+      const block = getStartBlockOfRange(range, root);
+      if (block && block.nodeName !== "PRE") {
+        const text = block.textContent?.trimEnd().replace(ZWS, "");
+        if (text === "*" || text === "1.") {
+          event.preventDefault();
+          self.insertPlainText(" ", false);
+          self._docWasChanged();
+          self.saveUndoState(range);
+          const walker = createTreeWalker(block, SHOW_TEXT);
+          let textNode;
+          while (textNode = walker.nextNode()) {
+            detach(textNode);
+          }
+          if (text === "*") {
+            self.makeUnorderedList();
+          } else {
+            self.makeOrderedList();
+          }
+          return;
+        }
+      }
+    }
+    node = range.endContainer;
+    if (range.endOffset === getLength(node)) {
+      do {
+        if (node.nodeName === "A") {
+          range.setStartAfter(node);
+          break;
+        }
+      } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+    }
+    if (self._config.addLinks) {
+      const linkRange = range.cloneRange();
+      moveRangeBoundariesDownTree(linkRange);
+      const textNode = linkRange.startContainer;
+      const offset = linkRange.startOffset;
+      setTimeout(() => {
+        linkifyText(self, textNode, offset);
+      }, 0);
+    }
+    self.setSelection(range);
+  };
+
+  // source/keyboard/KeyHandlers.ts
+  var _onKey = function(event) {
+    if (event.defaultPrevented || event.isComposing) {
+      return;
+    }
+    let key = event.key;
+    let modifiers = "";
+    const code = event.code;
+    if (/^Digit\d$/.test(code)) {
+      key = code.slice(-1);
+    }
+    if (key !== "Backspace" && key !== "Delete") {
+      if (event.altKey) {
+        modifiers += "Alt-";
+      }
+      if (event.ctrlKey) {
+        modifiers += "Ctrl-";
+      }
+      if (event.metaKey) {
+        modifiers += "Meta-";
+      }
+      if (event.shiftKey) {
+        modifiers += "Shift-";
+      }
+    }
+    if (isWin && event.shiftKey && key === "Delete") {
+      modifiers += "Shift-";
+    }
+    key = modifiers + key;
+    const range = this.getSelection();
+    const handler = this._keyHandlers[key];
+    if (handler) {
+      handler(this, event, range);
+    } else if (!range.collapsed && !event.ctrlKey && !event.metaKey && key.length === 1) {
+      this.saveUndoState(range);
+      deleteContentsOfRange(range, this._root);
+      this._ensureBottomLine();
+      this.setSelection(range);
+      this._updatePath(range, true);
+    }
+  };
+  var keyHandlers = {
+    "Backspace": Backspace,
+    "Delete": Delete,
+    "Tab": Tab,
+    "Shift-Tab": ShiftTab,
+    " ": Space,
+    "ArrowLeft"(self) {
+      self._removeZWS();
+    },
+    "ArrowRight"(self, event, range) {
+      self._removeZWS();
+      const root = self.getRoot();
+      if (rangeDoesEndAtBlockBoundary(range, root)) {
+        moveRangeBoundariesDownTree(range);
+        let node = range.endContainer;
+        do {
+          if (node.nodeName === "CODE") {
+            let next = node.nextSibling;
+            if (!(next instanceof Text) || next.length === 0) {
+              const textNode = document.createTextNode("\xA0");
+              node.parentNode.insertBefore(textNode, next);
+              next = textNode;
+            }
+            range.setStart(next, 1);
+            self.setSelection(range);
+            event.preventDefault();
+            break;
+          }
+        } while (!node.nextSibling && (node = node.parentNode) && node !== root);
+      }
+    }
+  };
+  if (!isMac && !isIOS) {
+    keyHandlers.PageUp = (self) => {
+      self.moveCursorToStart();
+    };
+    keyHandlers.PageDown = (self) => {
+      self.moveCursorToEnd();
+    };
+  }
+  var mapKeyToFormat = (tag, remove) => {
+    remove = remove || null;
+    return (self, event) => {
+      event.preventDefault();
+      const range = self.getSelection();
+      if (self.hasFormat(tag, null, range)) {
+        self.changeFormat(null, { tag }, range);
+      } else {
+        self.changeFormat({ tag }, remove, range);
+      }
+    };
+  };
+  keyHandlers[ctrlKey + "b"] = mapKeyToFormat("B");
+  keyHandlers[ctrlKey + "i"] = mapKeyToFormat("I");
+  keyHandlers[ctrlKey + "u"] = mapKeyToFormat("U");
+  keyHandlers[ctrlKey + "Shift-7"] = mapKeyToFormat("S");
+  keyHandlers[ctrlKey + "Shift-5"] = mapKeyToFormat("SUB", { tag: "SUP" });
+  keyHandlers[ctrlKey + "Shift-6"] = mapKeyToFormat("SUP", { tag: "SUB" });
+  keyHandlers[ctrlKey + "Shift-8"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (!/(?:^|>)UL/.test(path)) {
+      self.makeUnorderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "Shift-9"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (!/(?:^|>)OL/.test(path)) {
+      self.makeOrderedList();
+    } else {
+      self.removeList();
+    }
+  };
+  keyHandlers[ctrlKey + "["] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.decreaseQuoteLevel();
+    } else {
+      self.decreaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "]"] = (self, event) => {
+    event.preventDefault();
+    const path = self.getPath();
+    if (/(?:^|>)BLOCKQUOTE/.test(path) || !/(?:^|>)[OU]L/.test(path)) {
+      self.increaseQuoteLevel();
+    } else {
+      self.increaseListLevel();
+    }
+  };
+  keyHandlers[ctrlKey + "d"] = (self, event) => {
+    event.preventDefault();
+    self.toggleCode();
+  };
+  keyHandlers[ctrlKey + "z"] = (self, event) => {
+    event.preventDefault();
+    self.undo();
+  };
+  keyHandlers[ctrlKey + "y"] = // Depending on platform, the Shift may cause the key to come through as
+  // upper case, but sometimes not. Just add both as shortcuts — the browser
+  // will only ever fire one or the other.
+  keyHandlers[ctrlKey + "Shift-z"] = keyHandlers[ctrlKey + "Shift-Z"] = (self, event) => {
+    event.preventDefault();
+    self.redo();
+  };
+
+  // source/Editor.ts
+  var Squire = class {
+    //    _imageResizer: ImageResizer;
+    constructor(root, config) {
+      /**
+       * Subscribing to these events won't automatically add a listener to the
+       * document node, since these events are fired in a custom manner by the
+       * editor code.
+       */
+      this.customEvents = /* @__PURE__ */ new Set([
+        "pathChange",
+        "select",
+        "input",
+        "pasteImage",
+        "undoStateChange"
+      ]);
+      // ---
+      this.startSelectionId = "squire-selection-start";
+      this.endSelectionId = "squire-selection-end";
+      /*
+      linkRegExp = new RegExp(
+          // Only look on boundaries
+          '\\b(?:' +
+          // Capture group 1: URLs
+          '(' +
+              // Add links to URLS
+              // Starts with:
+              '(?:' +
+                  // http(s):// or ftp://
+                  '(?:ht|f)tps?:\\/\\/' +
+                  // or
+                  '|' +
+                  // www.
+                  'www\\d{0,3}[.]' +
+                  // or
+                  '|' +
+                  // foo90.com/
+                  '[a-z0-9][a-z0-9.\\-]*[.][a-z]{2,}\\/' +
+              ')' +
+              // Then we get one or more:
+              '(?:' +
+                  // Run of non-spaces, non ()<>
+                  '[^\\s()<>]+' +
+                  // or
+                  '|' +
+                  // balanced parentheses (one level deep only)
+                  '\\([^\\s()<>]+\\)' +
+              ')+' +
+              // And we finish with
+              '(?:' +
+                  // Not a space or punctuation character
+                  '[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]' +
+                  // or
+                  '|' +
+                  // Balanced parentheses.
+                  '\\([^\\s()<>]+\\)' +
+              ')' +
+          // Capture group 2: Emails
+          ')|(' +
+              // Add links to emails
+              '[\\w\\-.%+]+@(?:[\\w\\-]+\\.)+[a-z]{2,}\\b' +
+              // Allow query parameters in the mailto: style
+              '(?:' +
+                  '[?][^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+' +
+                  '(?:&[^&?\\s]+=[^\\s?&`!()\\[\\]{};:\'".,<>«»“”‘’]+)*' +
+              ')?' +
+          '))',
+          'i'
+      );
+      */
+      this.linkRegExp = /\b(?:((?:(?:ht|f)tps?:\/\/|www\d{0,3}[.]|[a-z0-9][a-z0-9.\-]*[.][a-z]{2,}\/)(?:[^\s()<>]+|\([^\s()<>]+\))+(?:[^\s?&`!()\[\]{};:'".,<>«»“”‘’]|\([^\s()<>]+\)))|([\w\-.%+]+@(?:[\w\-]+\.)+[a-z]{2,}\b(?:[?][^&?\s]+=[^\s?&`!()\[\]{};:'".,<>«»“”‘’]+(?:&[^&?\s]+=[^\s?&`!()\[\]{};:'".,<>«»“”‘’]+)*)?))/i;
+      this.tagAfterSplit = {
+        DT: "DD",
+        DD: "DT",
+        LI: "LI",
+        PRE: "PRE"
+      };
+      this._root = root;
+      this._config = this._makeConfig(config);
+      this._isFocused = false;
+      this._lastSelection = createRange(root, 0);
+      this._willRestoreSelection = false;
+      this._mayHaveZWS = false;
+      this._lastAnchorNode = null;
+      this._lastFocusNode = null;
+      this._lastPathRange = null;
+      this._path = "";
+      this._events = /* @__PURE__ */ new Map();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+      this._isInUndoState = false;
+      this._ignoreChange = false;
+      this._ignoreAllChanges = false;
+      this.addEventListener("selectionchange", this._updatePathOnEvent);
+      this.addEventListener("blur", this._enableRestoreSelection);
+      this.addEventListener("mousedown", this._disableRestoreSelection);
+      this.addEventListener("touchstart", this._disableRestoreSelection);
+      this.addEventListener("focus", this._restoreSelection);
+      this.addEventListener("blur", this._removeZWS);
+      this._isShiftDown = false;
+      this.addEventListener("cut", _onCut);
+      this.addEventListener("copy", _onCopy);
+      this.addEventListener("paste", _onPaste);
+      this._dragRange = null;
+      this.addEventListener("dragstart", _onDragStart);
+      this.addEventListener("dragend", _onDragEnd);
+      this.addEventListener("drop", _onDrop);
+      this.addEventListener(
+        "keydown",
+        _monitorShiftKey
+      );
+      this.addEventListener("keyup", _monitorShiftKey);
+      this.addEventListener("keydown", _onKey);
+      this._keyHandlers = Object.create(keyHandlers);
+      const mutation = new MutationObserver(() => this._docWasChanged());
+      mutation.observe(root, {
+        childList: true,
+        attributes: true,
+        characterData: true,
+        subtree: true
+      });
+      this._mutation = mutation;
+      root.setAttribute("contenteditable", "true");
+      this.addEventListener(
+        "beforeinput",
+        this._beforeInput
+      );
+      this.setHTML("");
+    }
+    destroy() {
+      this._events.forEach((_, type) => {
+        this.removeEventListener(type);
+      });
+      this._mutation.disconnect();
+      this._undoIndex = -1;
+      this._undoStack = [];
+      this._undoStackLength = 0;
+    }
+    _makeConfig(userConfig) {
+      const config = {
+        blockTag: "DIV",
+        classNames: {
+          color: "color",
+          fontFamily: "font",
+          fontSize: "size",
+          highlight: "highlight"
+        },
+        undo: {
+          documentSizeThreshold: -1,
+          // -1 means no threshold
+          undoLimit: -1
+          // -1 means no limit
+        },
+        addLinks: true,
+        willCutCopy: null,
+        toPlainText: null,
+        sanitizeToDOMFragment: (html) => {
+          const frag = DOMPurify.sanitize(html, {
+            ALLOW_UNKNOWN_PROTOCOLS: true,
+            WHOLE_DOCUMENT: false,
+            RETURN_DOM: true,
+            RETURN_DOM_FRAGMENT: true,
+            FORCE_BODY: false
+          });
+          return frag ? document.importNode(frag, true) : document.createDocumentFragment();
+        },
+        didError: (error) => console.log(error)
+      };
+      if (userConfig) {
+        Object.assign(config, userConfig);
+        config.blockTag = config.blockTag.toUpperCase();
+      }
+      return config;
+    }
+    setKeyHandler(key, fn) {
+      this._keyHandlers[key] = fn;
+      return this;
+    }
+    _beforeInput(event) {
+      switch (event.inputType) {
+        case "insertLineBreak":
+          event.preventDefault();
+          this.splitBlock(true);
+          break;
+        case "insertParagraph":
+          event.preventDefault();
+          this.splitBlock(false);
+          break;
+        case "insertOrderedList":
+          event.preventDefault();
+          this.makeOrderedList();
+          break;
+        case "insertUnoderedList":
+          event.preventDefault();
+          this.makeUnorderedList();
+          break;
+        case "historyUndo":
+          event.preventDefault();
+          this.undo();
+          break;
+        case "historyRedo":
+          event.preventDefault();
+          this.redo();
+          break;
+        case "formatBold":
+          event.preventDefault();
+          this.bold();
+          break;
+        case "formatItalic":
+          event.preventDefault();
+          this.italic();
+          break;
+        case "formatUnderline":
+          event.preventDefault();
+          this.underline();
+          break;
+        case "formatStrikeThrough":
+          event.preventDefault();
+          this.strikethrough();
+          break;
+        case "formatSuperscript":
+          event.preventDefault();
+          this.superscript();
+          break;
+        case "formatSubscript":
+          event.preventDefault();
+          this.subscript();
+          break;
+        case "formatJustifyFull":
+        case "formatJustifyCenter":
+        case "formatJustifyRight":
+        case "formatJustifyLeft": {
+          event.preventDefault();
+          let alignment = event.inputType.slice(13).toLowerCase();
+          if (alignment === "full") {
+            alignment = "justify";
+          }
+          this.setTextAlignment(alignment);
+          break;
+        }
+        case "formatRemove":
+          event.preventDefault();
+          this.setStyle();
+          break;
+        case "formatSetBlockTextDirection": {
+          event.preventDefault();
+          let dir = event.data;
+          if (dir === "null") {
+            dir = null;
+          }
+          this.setTextDirection(dir);
+          break;
+        }
+        case "formatBackColor":
+          event.preventDefault();
+          this.setStyle({ backgroundColor: event.data });
+          break;
+        case "formatFontColor":
+          event.preventDefault();
+          this.setStyle({ color: event.data });
+          break;
+        case "formatFontName":
+          event.preventDefault();
+          this.setStyle({ fontFamily: event.data });
+          break;
+      }
+    }
+    // --- Events
+    handleEvent(event) {
+      this.fireEvent(event.type, event);
+    }
+    fireEvent(type, detail) {
+      let handlers = this._events.get(type);
+      if (/^(?:focus|blur)/.test(type)) {
+        const isFocused = this._root === document.activeElement;
+        if (type === "focus") {
+          if (!isFocused || this._isFocused) {
+            return this;
+          }
+          this._isFocused = true;
+        } else {
+          if (isFocused || !this._isFocused) {
+            return this;
+          }
+          this._isFocused = false;
+        }
+      }
+      if (handlers) {
+        const event = detail instanceof Event ? detail : new CustomEvent(type, {
+          detail
+        });
+        handlers = handlers.slice();
+        for (const handler of handlers) {
+          try {
+            if ("handleEvent" in handler) {
+              handler.handleEvent(event);
+            } else {
+              handler.call(this, event);
+            }
+          } catch (error) {
+            this._config.didError(error);
+          }
+        }
+      }
+      return this;
+    }
+    addEventListener(type, fn) {
+      let handlers = this._events.get(type);
+      let target = this._root;
+      if (!handlers) {
+        handlers = [];
+        this._events.set(type, handlers);
+        if (!this.customEvents.has(type)) {
+          if (type === "selectionchange") {
+            target = document;
+          }
+          target.addEventListener(type, this, true);
+        }
+      }
+      handlers.push(fn);
+      return this;
+    }
+    removeEventListener(type, fn) {
+      const handlers = this._events.get(type);
+      let target = this._root;
+      if (handlers) {
+        if (fn) {
+          let l = handlers.length;
+          while (l--) {
+            if (handlers[l] === fn) {
+              handlers.splice(l, 1);
+            }
+          }
+        } else {
+          handlers.length = 0;
+        }
+        if (!handlers.length) {
+          this._events.delete(type);
+          if (!this.customEvents.has(type)) {
+            if (type === "selectionchange") {
+              target = document;
+            }
+            target.removeEventListener(type, this, true);
+          }
+        }
+      }
+      return this;
+    }
+    // --- Focus
+    focus() {
+      this._root.focus({ preventScroll: true });
+      return this;
+    }
+    blur() {
+      this._root.blur();
+      return this;
+    }
+    // --- Selection and bookmarking
+    _enableRestoreSelection() {
+      this._willRestoreSelection = true;
+    }
+    _disableRestoreSelection() {
+      this._willRestoreSelection = false;
+    }
+    _restoreSelection() {
+      if (this._willRestoreSelection) {
+        this.setSelection(this._lastSelection);
+      }
+    }
+    // ---
+    _removeZWS() {
+      if (!this._mayHaveZWS) {
+        return;
+      }
+      removeZWS(this._root);
+      this._mayHaveZWS = false;
+    }
+    _saveRangeToBookmark(range) {
+      let startNode = createElement("INPUT", {
+        id: this.startSelectionId,
+        type: "hidden"
+      });
+      let endNode = createElement("INPUT", {
+        id: this.endSelectionId,
+        type: "hidden"
+      });
+      let temp;
+      insertNodeInRange(range, startNode);
+      range.collapse(false);
+      insertNodeInRange(range, endNode);
+      if (startNode.compareDocumentPosition(endNode) & Node.DOCUMENT_POSITION_PRECEDING) {
+        startNode.id = this.endSelectionId;
+        endNode.id = this.startSelectionId;
+        temp = startNode;
+        startNode = endNode;
+        endNode = temp;
+      }
+      range.setStartAfter(startNode);
+      range.setEndBefore(endNode);
+    }
+    _getRangeAndRemoveBookmark(range) {
+      const root = this._root;
+      const starts = root.querySelectorAll("#" + this.startSelectionId);
+      const ends = root.querySelectorAll("#" + this.endSelectionId);
+      const start = starts[0];
+      const end = ends[0];
+      if (start && end && !!(start.compareDocumentPosition(end) & Node.DOCUMENT_POSITION_FOLLOWING)) {
+        let startContainer = start.parentNode;
+        let endContainer = end.parentNode;
+        const startOffset = Array.from(startContainer.childNodes).indexOf(
+          start
+        );
+        let endOffset = Array.from(endContainer.childNodes).indexOf(end);
+        if (startContainer === endContainer) {
+          --endOffset;
+        }
+        start.remove();
+        end.remove();
+        if (!range) {
+          range = document.createRange();
+        }
+        range.setStart(startContainer, startOffset);
+        range.setEnd(endContainer, endOffset);
+        mergeInlines(startContainer, range);
+        if (startContainer !== endContainer) {
+          mergeInlines(endContainer, range);
+        }
+        if (range.collapsed) {
+          startContainer = range.startContainer;
+          if (startContainer instanceof Text) {
+            endContainer = startContainer.childNodes[range.startOffset];
+            if (!endContainer || !(endContainer instanceof Text)) {
+              endContainer = startContainer.childNodes[range.startOffset - 1];
+            }
+            if (endContainer && endContainer instanceof Text) {
+              range.setStart(endContainer, 0);
+              range.collapse(true);
+            }
+          }
+        }
+      }
+      for (let i = 0; i < starts.length; i += 1) {
+        starts[i].remove();
+      }
+      for (let i = 0; i < ends.length; i += 1) {
+        ends[i].remove();
+      }
+      return range || null;
+    }
+    getSelection() {
+      const selection = window.getSelection();
+      const root = this._root;
+      let range = null;
+      if (this._isFocused && selection && selection.rangeCount) {
+        range = selection.getRangeAt(0).cloneRange();
+        const startContainer = range.startContainer;
+        const endContainer = range.endContainer;
+        if (startContainer && isLeaf(startContainer)) {
+          range.setStartBefore(startContainer);
+        }
+        if (endContainer && isLeaf(endContainer)) {
+          range.setEndBefore(endContainer);
+        }
+      }
+      if (range && root.contains(range.commonAncestorContainer)) {
+        this._lastSelection = range;
+      } else {
+        range = this._lastSelection;
+        if (!document.contains(range.commonAncestorContainer)) {
+          range = null;
+        }
+      }
+      return range || createRange(root.firstElementChild || root, 0);
+    }
+    setSelection(range) {
+      this._lastSelection = range;
+      if (!this._isFocused) {
+        this._enableRestoreSelection();
+      } else {
+        const selection = window.getSelection();
+        if (selection) {
+          if ("setBaseAndExtent" in Selection.prototype) {
+            selection.setBaseAndExtent(
+              range.startContainer,
+              range.startOffset,
+              range.endContainer,
+              range.endOffset
+            );
+          } else {
+            selection.removeAllRanges();
+            selection.addRange(range);
+          }
+        }
+      }
+      return this;
+    }
+    // ---
+    _moveCursorTo(toStart) {
+      const root = this._root;
+      const range = createRange(root, toStart ? 0 : root.childNodes.length);
+      moveRangeBoundariesDownTree(range);
+      this.setSelection(range);
+      return this;
+    }
+    moveCursorToStart() {
+      return this._moveCursorTo(true);
+    }
+    moveCursorToEnd() {
+      return this._moveCursorTo(false);
+    }
+    // ---
+    getCursorPosition() {
+      const range = this.getSelection();
+      let rect = range.getBoundingClientRect();
+      if (rect && !rect.top) {
+        this._ignoreChange = true;
+        const node = createElement("SPAN");
+        node.textContent = ZWS;
+        insertNodeInRange(range, node);
+        rect = node.getBoundingClientRect();
+        const parent = node.parentNode;
+        parent.removeChild(node);
+        mergeInlines(parent, range);
+      }
+      return rect;
+    }
+    // --- Path
+    getPath() {
+      return this._path;
+    }
+    _updatePathOnEvent() {
+      if (this._isFocused) {
+        const lastPathRange = this._lastPathRange;
+        const selection = this.getSelection();
+        if (!lastPathRange || !lastPathRange.commonAncestorContainer.isConnected || selection.compareBoundaryPoints(
+          0,
+          // Range.START_TO_START,
+          lastPathRange
+        ) !== 0 || selection.compareBoundaryPoints(
+          2,
+          //Range.END_TO_END
+          lastPathRange
+        ) !== 0) {
+          this._updatePath(selection);
+        }
+      }
+    }
+    _updatePath(range, force) {
+      this._lastPathRange = range.cloneRange();
+      const anchor = range.startContainer;
+      const focus = range.endContainer;
+      let newPath;
+      if (force || anchor !== this._lastAnchorNode || focus !== this._lastFocusNode) {
+        this._lastAnchorNode = anchor;
+        this._lastFocusNode = focus;
+        newPath = anchor && focus ? anchor === focus ? this._getPath(focus) : "(selection)" : "";
+        if (this._path !== newPath || anchor !== focus) {
+          this._path = newPath;
+          this.fireEvent("pathChange", {
+            path: newPath
+          });
+        }
+      }
+      this.fireEvent(range.collapsed ? "cursor" : "select", {
+        range
+      });
+    }
+    _getPath(node) {
+      const root = this._root;
+      const config = this._config;
+      let path = "";
+      if (node && node !== root) {
+        const parent = node.parentNode;
+        path = parent ? this._getPath(parent) : "";
+        if (node instanceof HTMLElement) {
+          const id = node.id;
+          const classList = node.classList;
+          const classNames = Array.from(classList).sort();
+          const dir = node.dir;
+          const styleNames = config.classNames;
+          path += (path ? ">" : "") + node.nodeName;
+          if (id) {
+            path += "#" + id;
+          }
+          if (classNames.length) {
+            path += ".";
+            path += classNames.join(".");
+          }
+          if (dir) {
+            path += "[dir=" + dir + "]";
+          }
+          if (classList.contains(styleNames.highlight)) {
+            path += "[backgroundColor=" + node.style.backgroundColor.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.color)) {
+            path += "[color=" + node.style.color.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontFamily)) {
+            path += "[fontFamily=" + node.style.fontFamily.replace(/ /g, "") + "]";
+          }
+          if (classList.contains(styleNames.fontSize)) {
+            path += "[fontSize=" + node.style.fontSize + "]";
+          }
+        }
+      }
+      return path;
+    }
+    // --- History
+    modifyDocument(modificationFn) {
+      const mutation = this._mutation;
+      if (mutation) {
+        if (mutation.takeRecords().length) {
+          this._docWasChanged();
+        }
+        mutation.disconnect();
+      }
+      this._ignoreAllChanges = true;
+      modificationFn();
+      this._ignoreAllChanges = false;
+      if (mutation) {
+        mutation.observe(this._root, {
+          childList: true,
+          attributes: true,
+          characterData: true,
+          subtree: true
+        });
+        this._ignoreChange = false;
+      }
+      return this;
+    }
+    _docWasChanged() {
+      resetNodeCategoryCache();
+      this._mayHaveZWS = true;
+      if (this._ignoreAllChanges) {
+        return;
+      }
+      if (this._ignoreChange) {
+        this._ignoreChange = false;
+        return;
+      }
+      if (this._isInUndoState) {
+        this._isInUndoState = false;
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: false
+        });
+      }
+      this.fireEvent("input");
+    }
+    /**
+     * Leaves bookmark.
+     */
+    _recordUndoState(range, replace) {
+      const isInUndoState = this._isInUndoState;
+      if (!isInUndoState || replace) {
+        let undoIndex = this._undoIndex + 1;
+        const undoStack = this._undoStack;
+        const undoConfig = this._config.undo;
+        const undoThreshold = undoConfig.documentSizeThreshold;
+        const undoLimit = undoConfig.undoLimit;
+        if (undoIndex < this._undoStackLength) {
+          undoStack.length = this._undoStackLength = undoIndex;
+        }
+        if (range) {
+          this._saveRangeToBookmark(range);
+        }
+        if (isInUndoState) {
+          return this;
+        }
+        const html = this._getRawHTML();
+        if (replace) {
+          --undoIndex;
+        }
+        if (undoThreshold > -1 && html.length * 2 > undoThreshold) {
+          if (undoLimit > -1 && undoIndex > undoLimit) {
+            undoStack.splice(0, undoIndex - undoLimit);
+            undoIndex = undoLimit;
+            this._undoStackLength = undoLimit;
+          }
+        }
+        undoStack[undoIndex] = html;
+        this._undoIndex = undoIndex;
+        ++this._undoStackLength;
+        this._isInUndoState = true;
+      }
+      return this;
+    }
+    saveUndoState(range) {
+      let rangeIsFromSelection = false;
+      if (!range) {
+        range = this.getSelection();
+        rangeIsFromSelection = true;
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      this._getRangeAndRemoveBookmark(range);
+      if (rangeIsFromSelection) {
+        this.setSelection(range);
+      }
+      return this;
+    }
+    undo() {
+      if (this._undoIndex !== 0 || !this._isInUndoState) {
+        this._recordUndoState(this.getSelection(), false);
+        --this._undoIndex;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this._isInUndoState = true;
+        this.fireEvent("undoStateChange", {
+          canUndo: this._undoIndex !== 0,
+          canRedo: true
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    redo() {
+      const undoIndex = this._undoIndex;
+      const undoStackLength = this._undoStackLength;
+      if (undoIndex + 1 < undoStackLength && this._isInUndoState) {
+        ++this._undoIndex;
+        this._setRawHTML(this._undoStack[this._undoIndex]);
+        const range = this._getRangeAndRemoveBookmark();
+        if (range) {
+          this.setSelection(range);
+        }
+        this.fireEvent("undoStateChange", {
+          canUndo: true,
+          canRedo: undoIndex + 2 < undoStackLength
+        });
+        this.fireEvent("input");
+      }
+      return this.focus();
+    }
+    // --- Get and set data
+    getRoot() {
+      return this._root;
+    }
+    _getRawHTML() {
+      return this._root.innerHTML;
+    }
+    _setRawHTML(html) {
+      if (html !== void 0) {
+        const root = this._root;
+        let node = root;
+        root.innerHTML = html;
+        do {
+          fixCursor(node);
+        } while (node = getNextBlock(node, root));
+        this._ignoreChange = true;
+      }
+      return this;
+    }
+    getHTML(withBookmark) {
+      let range;
+      let html = "";
+      this.modifyDocument(() => {
+        if (withBookmark) {
+          range = this.getSelection();
+          this._saveRangeToBookmark(range);
+        }
+        const resizeContainer = this._root.querySelector(
+          ".squire-image-resize-container"
+        );
+        if (resizeContainer) {
+          resizeContainer.remove();
+        }
+        html = this._getRawHTML().replace(/\u200B/g, "");
+        if (resizeContainer) {
+          this._root.append(resizeContainer);
+        }
+        if (withBookmark) {
+          this._getRangeAndRemoveBookmark(range);
+        }
+      });
+      return html;
+    }
+    setHTML(html) {
+      const frag = this._config.sanitizeToDOMFragment(html, this);
+      const root = this._root;
+      cleanTree(frag, this._config);
+      cleanupBRs(frag);
+      fixContainer(frag);
+      let node = frag;
+      let child = node.firstChild;
+      if (!child || child.nodeName === "BR") {
+        const block = this.createDefaultBlock();
+        if (child) {
+          node.replaceChild(block, child);
+        } else {
+          node.append(block);
+        }
+      } else {
+        while (node = getNextBlock(node, root)) {
+          fixCursor(node);
+        }
+      }
+      this._ignoreChange = true;
+      while (child = root.lastChild) {
+        root.removeChild(child);
+      }
+      root.append(frag);
+      this._undoIndex = -1;
+      this._undoStack.length = 0;
+      this._undoStackLength = 0;
+      this._isInUndoState = false;
+      const range = this._getRangeAndRemoveBookmark() || createRange(root.firstElementChild || root, 0);
+      this.saveUndoState(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    /**
+     * Insert HTML at the cursor location. If the selection is not collapsed
+     * insertTreeFragmentIntoRange will delete the selection so that it is
+     * replaced by the html being inserted.
+     */
+    insertHTML(html, isPaste) {
+      const config = this._config;
+      let frag = config.sanitizeToDOMFragment(html, this);
+      const range = this.getSelection();
+      this.saveUndoState(range);
+      try {
+        const root = this._root;
+        if (config.addLinks) {
+          this.addDetectedLinks(frag, frag);
+        }
+        cleanTree(frag, this._config);
+        cleanupBRs(frag);
+        removeEmptyInlines(frag);
+        frag.normalize();
+        let node = frag;
+        while (node = getNextBlock(node, frag)) {
+          fixCursor(node);
+        }
+        let doInsert = true;
+        if (isPaste) {
+          const event = new CustomEvent("willPaste", {
+            cancelable: true,
+            detail: {
+              html,
+              fragment: frag
+            }
+          });
+          this.fireEvent("willPaste", event);
+          frag = event.detail.fragment;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          insertTreeFragmentIntoRange(range, frag, root);
+          range.collapse(false);
+          moveRangeBoundaryOutOf(range, "A", root);
+          this._ensureBottomLine();
+        }
+        this.setSelection(range);
+        this._updatePath(range, true);
+        if (isPaste) {
+          this.focus();
+        }
+      } catch (error) {
+        this._config.didError(error);
+      }
+      return this;
+    }
+    insertElement(el, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      range.collapse(true);
+      if (isInline(el)) {
+        insertNodeInRange(range, el);
+        range.setStartAfter(el);
+      } else {
+        const root = this._root;
+        const startNode = getStartBlockOfRange(
+          range,
+          root
+        );
+        let splitNode = startNode || root;
+        let nodeAfterSplit = null;
+        while (splitNode !== root && !splitNode.nextSibling) {
+          splitNode = splitNode.parentNode;
+        }
+        if (splitNode !== root) {
+          const parent = splitNode.parentNode;
+          nodeAfterSplit = split(
+            parent,
+            splitNode.nextSibling,
+            root,
+            root
+          );
+        }
+        if (startNode && isEmptyBlock(startNode)) {
+          detach(startNode);
+        }
+        root.insertBefore(el, nodeAfterSplit);
+        const blankLine = this.createDefaultBlock();
+        root.insertBefore(blankLine, nodeAfterSplit);
+        range.setStart(blankLine, 0);
+        range.setEnd(blankLine, 0);
+        moveRangeBoundariesDownTree(range);
+      }
+      this.focus();
+      this.setSelection(range);
+      this._updatePath(range);
+      return this;
+    }
+    insertImage(src, attributes) {
+      const img = createElement(
+        "IMG",
+        Object.assign(
+          {
+            src
+          },
+          attributes
+        )
+      );
+      this.insertElement(img);
+      return img;
+    }
+    insertPlainText(plainText, isPaste) {
+      const range = this.getSelection();
+      if (range.collapsed && getClosest(range.startContainer, this._root, "PRE")) {
+        let doInsert = true;
+        if (isPaste) {
+          const event = new CustomEvent("willPaste", {
+            cancelable: true,
+            detail: {
+              text: plainText
+            }
+          });
+          this.fireEvent("willPaste", event);
+          plainText = event.detail.text;
+          doInsert = !event.defaultPrevented;
+        }
+        if (doInsert) {
+          this.saveUndoState(range);
+          const startContainer = range.startContainer;
+          let offset = range.startOffset;
+          let textNode;
+          if (startContainer instanceof Text) {
+            textNode = startContainer;
+          } else {
+            let nodeBeforeCursor = offset ? startContainer.childNodes[offset - 1] : null;
+            if (nodeBeforeCursor instanceof Text) {
+              textNode = nodeBeforeCursor;
+              offset = textNode.length;
+            } else {
+              const text = document.createTextNode("");
+              startContainer.insertBefore(
+                text,
+                startContainer.childNodes[offset]
+              );
+              textNode = text;
+              offset = 0;
+            }
+          }
+          textNode.insertData(offset, plainText);
+          range.setStart(textNode, offset + plainText.length);
+          range.collapse(true);
+        }
+        this.setSelection(range);
+        return this;
+      }
+      const lines = plainText.split("\n");
+      const config = this._config;
+      const tag = config.blockTag;
+      const closeBlock = "</" + tag + ">";
+      const openBlock = "<" + tag + ">";
+      for (let i = 0, l = lines.length; i < l; ++i) {
+        let line = lines[i];
+        line = escapeHTML(line).replace(/ (?=(?: |$))/g, "&nbsp;");
+        if (i) {
+          line = openBlock + (line || "<BR>") + closeBlock;
+        }
+        lines[i] = line;
+      }
+      return this.insertHTML(lines.join(""), isPaste);
+    }
+    getSelectedText(range) {
+      return getTextContentsOfRange(range || this.getSelection());
+    }
+    // --- Inline formatting
+    /**
+     * Extracts the font-family and font-size (if any) of the element
+     * holding the cursor. If there's a selection, returns an empty object.
+     */
+    getFontInfo(range) {
+      const fontInfo = {
+        color: void 0,
+        backgroundColor: void 0,
+        fontFamily: void 0,
+        fontSize: void 0
+      };
+      if (!range) {
+        range = this.getSelection();
+      }
+      moveRangeBoundariesDownTree(range);
+      let seenAttributes = 0;
+      let element = range.commonAncestorContainer;
+      if (range.collapsed || element instanceof Text) {
+        if (element instanceof Text) {
+          element = element.parentNode;
+        }
+        while (seenAttributes < 4 && element) {
+          const style = element.style;
+          if (style) {
+            const color = style.color;
+            if (!fontInfo.color && color) {
+              fontInfo.color = color;
+              ++seenAttributes;
+            }
+            const backgroundColor = style.backgroundColor;
+            if (!fontInfo.backgroundColor && backgroundColor) {
+              fontInfo.backgroundColor = backgroundColor;
+              ++seenAttributes;
+            }
+            const fontFamily = style.fontFamily;
+            if (!fontInfo.fontFamily && fontFamily) {
+              fontInfo.fontFamily = fontFamily;
+              ++seenAttributes;
+            }
+            const fontSize = style.fontSize;
+            if (!fontInfo.fontSize && fontSize) {
+              fontInfo.fontSize = fontSize;
+              ++seenAttributes;
+            }
+          }
+          element = element.parentNode;
+        }
+      }
+      return fontInfo;
+    }
+    /**
+     * Looks for matching tag and attributes, so won't work if <strong>
+     * instead of <b> etc.
+     */
+    hasFormat(tag, attributes, range) {
+      tag = tag.toUpperCase();
+      attributes || (attributes = {});
+      range || (range = this.getSelection());
+      if (!range.collapsed && range.startContainer instanceof Text && range.startOffset === range.startContainer.length && range.startContainer.nextSibling) {
+        range.setStartBefore(range.startContainer.nextSibling);
+      }
+      if (!range.collapsed && range.endContainer instanceof Text && range.endOffset === 0 && range.endContainer.previousSibling) {
+        range.setEndAfter(range.endContainer.previousSibling);
+      }
+      const root = this._root;
+      const common = range.commonAncestorContainer;
+      if (getNearest(common, root, tag, attributes)) {
+        return true;
+      }
+      if (common instanceof Text) {
+        return false;
+      }
+      const walker = createTreeWalker(
+        common,
+        SHOW_TEXT,
+        (node2) => isNodeContainedInRange(range, node2, true)
+      );
+      let seenNode = false;
+      let node;
+      while (node = walker.nextNode()) {
+        if (!getNearest(node, root, tag, attributes)) {
+          return false;
+        }
+        seenNode = true;
+      }
+      return seenNode;
+    }
+    changeFormat(add, remove, range, partial) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this.saveUndoState(range);
+      if (remove) {
+        range = this._removeFormat(
+          remove.tag.toUpperCase(),
+          remove.attributes || {},
+          range,
+          partial
+        );
+      }
+      if (add) {
+        range = this._addFormat(
+          add.tag.toUpperCase(),
+          add.attributes || {},
+          range
+        );
+      }
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _addFormat(tag, attributes, range) {
+      const root = this._root;
+      if (range.collapsed) {
+        const el = fixCursor(createElement(tag, attributes));
+        insertNodeInRange(range, el);
+        const focusNode = el.firstChild || el;
+        const focusOffset = focusNode instanceof Text ? focusNode.length : 0;
+        range.setStart(focusNode, focusOffset);
+        range.collapse(true);
+        let block = el;
+        while (isInline(block)) {
+          block = block.parentNode;
+        }
+        removeZWS(block, el);
+      } else {
+        const walker = createTreeWalker(
+          range.commonAncestorContainer,
+          SHOW_ELEMENT_OR_TEXT,
+          (node) => {
+            return (node instanceof Text || node.nodeName === "BR" || node.nodeName === "IMG") && isNodeContainedInRange(range, node, true);
+          }
+        );
+        let { startContainer, startOffset, endContainer, endOffset } = range;
+        walker.currentNode = startContainer;
+        if (!(startContainer instanceof Element) && !(startContainer instanceof Text) || FILTER_ACCEPT !== walker.filter.acceptNode(startContainer)) {
+          const next = walker.nextNode();
+          if (!next) {
+            return range;
+          }
+          startContainer = next;
+          startOffset = 0;
+        }
+        do {
+          let node = walker.currentNode;
+          const needsFormat = !getNearest(node, root, tag, attributes);
+          if (needsFormat) {
+            if (node === endContainer && node.length > endOffset) {
+              node.splitText(endOffset);
+            }
+            if (node === startContainer && startOffset) {
+              node = node.splitText(startOffset);
+              if (endContainer === startContainer) {
+                endContainer = node;
+                endOffset -= startOffset;
+              } else if (endContainer === startContainer.parentNode) {
+                ++endOffset;
+              }
+              startContainer = node;
+              startOffset = 0;
+            }
+            const el = createElement(tag, attributes);
+            replaceWith(node, el);
+            el.append(node);
+          }
+        } while (walker.nextNode());
+        range = createRange(
+          startContainer,
+          startOffset,
+          endContainer,
+          endOffset
+        );
+      }
+      return range;
+    }
+    _removeFormat(tag, attributes, range, partial) {
+      this._saveRangeToBookmark(range);
+      let fixer;
+      if (range.collapsed) {
+        if (cantFocusEmptyTextNodes) {
+          fixer = document.createTextNode(ZWS);
+        } else {
+          fixer = document.createTextNode("");
+        }
+        insertNodeInRange(range, fixer);
+      }
+      let root = range.commonAncestorContainer;
+      while (isInline(root)) {
+        root = root.parentNode;
+      }
+      const startContainer = range.startContainer;
+      const startOffset = range.startOffset;
+      const endContainer = range.endContainer;
+      const endOffset = range.endOffset;
+      const toWrap = [];
+      const examineNode = (node, exemplar) => {
+        if (isNodeContainedInRange(range, node, false)) {
+          return;
+        }
+        let child;
+        let next;
+        if (!isNodeContainedInRange(range, node, true)) {
+          if (!(node instanceof HTMLInputElement) && (!(node instanceof Text) || node.data)) {
+            toWrap.push([exemplar, node]);
+          }
+          return;
+        }
+        if (node instanceof Text) {
+          if (node === endContainer && endOffset !== node.length) {
+            toWrap.push([exemplar, node.splitText(endOffset)]);
+          }
+          if (node === startContainer && startOffset) {
+            node.splitText(startOffset);
+            toWrap.push([exemplar, node]);
+          }
+        } else {
+          for (child = node.firstChild; child; child = next) {
+            next = child.nextSibling;
+            examineNode(child, exemplar);
+          }
+        }
+      };
+      const formatTags = Array.from(
+        root.getElementsByTagName(tag)
+      ).filter((el) => {
+        return isNodeContainedInRange(range, el, true) && hasTagAttributes(el, tag, attributes);
+      });
+      partial || formatTags.forEach((node) => examineNode(node, node));
+      toWrap.forEach(([el, node]) => {
+        el = el.cloneNode(false);
+        replaceWith(node, el);
+        el.append(node);
+      });
+      formatTags.forEach((el) => replaceWith(el, empty(el)));
+      if (cantFocusEmptyTextNodes && fixer) {
+        fixer = fixer.parentNode;
+        let block = fixer;
+        while (block && isInline(block)) {
+          block = block.parentNode;
+        }
+        block && removeZWS(block, fixer);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      fixer && range.collapse(false);
+      mergeInlines(root, range);
+      return range;
+    }
+    // ---
+    bold() {
+      this.toggleTag("B");
+    }
+    italic() {
+      this.toggleTag("I");
+    }
+    underline() {
+      this.toggleTag("U");
+    }
+    strikethrough() {
+      this.toggleTag("S");
+    }
+    subscript() {
+      this.toggleTag("SUB", "SUP");
+    }
+    superscript() {
+      this.toggleTag("SUP", "SUB");
+    }
+    // ---
+    makeLink(url, attributes) {
+      const range = this.getSelection();
+      if (range.collapsed) {
+        let protocolEnd = url.indexOf(":") + 1;
+        if (protocolEnd) {
+          while (url[protocolEnd] === "/") {
+            ++protocolEnd;
+          }
+        }
+        insertNodeInRange(
+          range,
+          document.createTextNode(url.slice(protocolEnd))
+        );
+      }
+      attributes = Object.assign(
+        {
+          href: url
+        },
+        attributes
+      );
+      return this.changeFormat(
+        {
+          tag: "A",
+          attributes
+        },
+        {
+          tag: "A"
+        },
+        range
+      );
+    }
+    removeLink() {
+      return this.changeFormat(
+        null,
+        {
+          tag: "A"
+        },
+        this.getSelection(),
+        true
+      );
+    }
+    addDetectedLinks(searchInNode, root) {
+      const walker = createTreeWalker(
+        searchInNode,
+        SHOW_TEXT,
+        (node2) => !getClosest(node2, root || this._root, "A")
+      );
+      const linkRegExp = this.linkRegExp;
+      let node;
+      while (node = walker.nextNode()) {
+        const parent = node.parentNode;
+        let data = node.data;
+        let match;
+        while (match = linkRegExp.exec(data)) {
+          const index = match.index;
+          const endIndex = index + match[0].length;
+          if (index) {
+            parent.insertBefore(
+              document.createTextNode(data.slice(0, index)),
+              node
+            );
+          }
+          const child = createElement(
+            "A",
+            {
+              href: match[1] ? /^(?:ht|f)tps?:/i.test(match[1]) ? match[1] : "http://" + match[1] : "mailto:" + match[0]
+            }
+          );
+          child.textContent = data.slice(index, endIndex);
+          parent.insertBefore(child, node);
+          node.data = data = data.slice(endIndex);
+        }
+      }
+      return this;
+    }
+    // --- Block formatting
+    _ensureBottomLine() {
+      const root = this._root;
+      let last = root;
+      do {
+        last = last.lastElementChild;
+      } while (last && isContainer(last));
+      if (!last || !isBlock(last)) {
+        root.append(this.createDefaultBlock());
+      }
+    }
+    createDefaultBlock(children) {
+      const config = this._config;
+      return fixCursor(
+        createElement(config.blockTag, null, children)
+      );
+    }
+    splitBlock(lineBreakOnly, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      let block;
+      let parent;
+      let node;
+      let nodeAfterSplit;
+      this._recordUndoState(range);
+      this._removeZWS();
+      this._getRangeAndRemoveBookmark(range);
+      if (!range.collapsed) {
+        deleteContentsOfRange(range, root);
+      }
+      if (this._config.addLinks) {
+        moveRangeBoundariesDownTree(range);
+        const textNode = range.startContainer;
+        const offset2 = range.startOffset;
+        setTimeout(() => {
+          linkifyText(this, textNode, offset2);
+        }, 0);
+      }
+      block = getStartBlockOfRange(range, root);
+      if (block && (parent = getClosest(block, root, "PRE"))) {
+        moveRangeBoundariesDownTree(range);
+        node = range.startContainer;
+        let offset2 = range.startOffset;
+        if (!(node instanceof Text)) {
+          node = document.createTextNode("");
+          parent.insertBefore(node, parent.firstChild);
+          offset2 = 0;
+        }
+        if (!lineBreakOnly && node instanceof Text && (node.data.charAt(offset2 - 1) === "\n" || rangeDoesStartAtBlockBoundary(range, root)) && (node.data.charAt(offset2) === "\n" || rangeDoesEndAtBlockBoundary(range, root))) {
+          node.deleteData(offset2 && offset2 - 1, offset2 ? 2 : 1);
+          nodeAfterSplit = split(
+            node,
+            offset2 && offset2 - 1,
+            root,
+            root
+          );
+          node = nodeAfterSplit.previousSibling;
+          if (!node.textContent) {
+            detach(node);
+          }
+          node = this.createDefaultBlock();
+          nodeAfterSplit.parentNode.insertBefore(node, nodeAfterSplit);
+          if (!nodeAfterSplit.textContent) {
+            detach(nodeAfterSplit);
+          }
+          range.setStart(node, 0);
+        } else {
+          node.insertData(offset2, "\n");
+          if (!node.nextSibling) {
+            parent.append(createElement("BR"));
+          }
+          if (node.length === offset2 + 1) {
+            range.setStartAfter(node);
+          } else {
+            range.setStart(node, offset2 + 1);
+          }
+        }
+        range.collapse(true);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        this._docWasChanged();
+        return this;
+      }
+      if (!block || lineBreakOnly || /^T[HD]$/.test(block.nodeName)) {
+        moveRangeBoundaryOutOf(range, "A", root);
+        insertNodeInRange(range, createElement("BR"));
+        range.collapse(false);
+        this.setSelection(range);
+        this._updatePath(range, true);
+        return this;
+      }
+      if (parent = getClosest(block, root, "LI")) {
+        block = parent;
+      }
+      if (isEmptyBlock(block)) {
+        if (getClosest(block, root, "UL") || getClosest(block, root, "OL")) {
+          this.decreaseListLevel(range);
+          return this;
+        } else if (getClosest(block, root, "BLOCKQUOTE")) {
+          this.replaceWithBlankLine(range);
+          return this;
+        }
+      }
+      node = range.startContainer;
+      const offset = range.startOffset;
+      let splitTag = this.tagAfterSplit[block.nodeName] || this._config.blockTag;
+      nodeAfterSplit = split(
+        node,
+        offset,
+        block.parentNode,
+        this._root
+      );
+      if (!hasTagAttributes(nodeAfterSplit, splitTag)) {
+        block = createElement(splitTag);
+        if (nodeAfterSplit.dir) {
+          block.dir = nodeAfterSplit.dir;
+        }
+        replaceWith(nodeAfterSplit, block);
+        block.append(empty(nodeAfterSplit));
+        nodeAfterSplit = block;
+      }
+      removeZWS(block);
+      removeEmptyInlines(block);
+      fixCursor(block);
+      while (nodeAfterSplit instanceof Element) {
+        let child = nodeAfterSplit.firstChild;
+        let next;
+        if (nodeAfterSplit.nodeName === "A" && (!nodeAfterSplit.textContent || nodeAfterSplit.textContent === ZWS)) {
+          child = document.createTextNode("");
+          replaceWith(nodeAfterSplit, child);
+          nodeAfterSplit = child;
+          break;
+        }
+        while (child && child instanceof Text && !child.length) {
+          next = child.nextSibling;
+          if (!next || next.nodeName === "BR") {
+            break;
+          }
+          detach(child);
+          child = next;
+        }
+        if (!child || child.nodeName === "BR" || child instanceof Text) {
+          break;
+        }
+        nodeAfterSplit = child;
+      }
+      range = createRange(nodeAfterSplit, 0);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    forEachBlock(fn, mutates, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      if (mutates) {
+        this.saveUndoState(range);
+      }
+      const root = this._root;
+      let start = getStartBlockOfRange(range, root);
+      const end = getEndBlockOfRange(range, root);
+      if (start && end) {
+        do {
+          if (fn(start) || start === end) {
+            break;
+          }
+        } while (start = getNextBlock(start, root));
+      }
+      if (mutates) {
+        this.setSelection(range);
+        this._updatePath(range, true);
+      }
+      return this;
+    }
+    modifyBlocks(modify, range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const root = this._root;
+      expandRangeToBlockBoundaries(range, root);
+      moveRangeBoundariesUpTree(range, root, root, root);
+      const frag = extractContentsOfRange(range, root, root);
+      if (!range.collapsed) {
+        let node = range.endContainer;
+        if (node === root) {
+          range.collapse(false);
+        } else {
+          while (node.parentNode !== root) {
+            node = node.parentNode;
+          }
+          range.setStartBefore(node);
+          range.collapse(true);
+        }
+      }
+      insertNodeInRange(range, modify.call(this, frag));
+      if (range.endOffset < range.endContainer.childNodes.length) {
+        mergeContainers(
+          range.endContainer.childNodes[range.endOffset],
+          root
+        );
+      }
+      mergeContainers(
+        range.startContainer.childNodes[range.startOffset],
+        root
+      );
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this;
+    }
+    // ---
+    setTextAlignment(alignment) {
+      this.forEachBlock((block) => {
+        const className = block.className.split(/\s+/).filter((klass) => {
+          return !!klass && !/^align/.test(klass);
+        }).join(" ");
+        if (alignment) {
+          block.className = className + " align-" + alignment;
+          block.style.textAlign = alignment;
+        } else {
+          block.className = className;
+          block.style.textAlign = "";
+        }
+      }, true);
+      return this.focus();
+    }
+    setTextDirection(direction) {
+      this.forEachBlock((block) => {
+        if (direction) {
+          block.dir = direction;
+        } else {
+          block.removeAttribute("dir");
+        }
+      }, true);
+      return this.focus();
+    }
+    // ---
+    _getListSelection(range, root) {
+      let list = range.commonAncestorContainer;
+      let startLi = range.startContainer;
+      let endLi = range.endContainer;
+      while (list && list !== root && !/^[OU]L$/.test(list.nodeName)) {
+        list = list.parentNode;
+      }
+      if (!list || list === root) {
+        return null;
+      }
+      if (startLi === list) {
+        startLi = startLi.childNodes[range.startOffset];
+      }
+      if (endLi === list) {
+        endLi = endLi.childNodes[range.endOffset];
+      }
+      while (startLi && startLi.parentNode !== list) {
+        startLi = startLi.parentNode;
+      }
+      while (endLi && endLi.parentNode !== list) {
+        endLi = endLi.parentNode;
+      }
+      return [list, startLi, endLi];
+    }
+    increaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi || startLi === list.firstChild) {
+        return this.focus();
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      const type = list.nodeName;
+      let newParent = startLi.previousSibling;
+      let next;
+      if (newParent.nodeName !== type) {
+        newParent = createElement(type);
+        list.insertBefore(newParent, startLi);
+      }
+      do {
+        next = startLi === endLi ? null : startLi.nextSibling;
+        newParent.append(startLi);
+      } while (startLi = next);
+      next = newParent.nextSibling;
+      if (next) {
+        mergeContainers(next, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    decreaseListLevel(range) {
+      if (!range) {
+        range = this.getSelection();
+      }
+      const root = this._root;
+      const listSelection = this._getListSelection(range, root);
+      if (!listSelection) {
+        return this.focus();
+      }
+      let [list, startLi, endLi] = listSelection;
+      if (!startLi) {
+        startLi = list.firstChild;
+      }
+      if (!endLi) {
+        endLi = list.lastChild;
+      }
+      this._recordUndoState(range, this._isInUndoState);
+      let next;
+      let insertBefore = null;
+      if (startLi) {
+        let newParent = list.parentNode;
+        insertBefore = !endLi.nextSibling ? list.nextSibling : split(list, endLi.nextSibling, newParent, root);
+        if (newParent !== root && newParent.nodeName === "LI") {
+          newParent = newParent.parentNode;
+          while (insertBefore) {
+            next = insertBefore.nextSibling;
+            endLi.append(insertBefore);
+            insertBefore = next;
+          }
+          insertBefore = list.parentNode.nextSibling;
+        }
+        const makeNotList = !/^[OU]L$/.test(newParent.nodeName);
+        do {
+          next = startLi === endLi ? null : startLi.nextSibling;
+          list.removeChild(startLi);
+          if (makeNotList && startLi.nodeName === "LI") {
+            startLi = this.createDefaultBlock([empty(startLi)]);
+          }
+          newParent.insertBefore(startLi, insertBefore);
+        } while (startLi = next);
+      }
+      if (!list.firstChild) {
+        detach(list);
+      }
+      if (insertBefore) {
+        mergeContainers(insertBefore, root);
+      }
+      this._getRangeAndRemoveBookmark(range);
+      this.setSelection(range);
+      this._updatePath(range, true);
+      return this.focus();
+    }
+    _makeList(frag, type) {
+      const walker = getBlockWalker(frag, this._root);
+      let node;
+      while (node = walker.nextNode()) {
+        if (node.parentNode instanceof HTMLLIElement) {
+          node = node.parentNode;
+          walker.currentNode = node.lastChild;
+        }
+        if (!(node instanceof HTMLLIElement)) {
+          const newLi = createElement("LI");
+          if (node.dir) {
+            newLi.dir = node.dir;
+          }
+          const prev = node.previousSibling;
+          if (prev && prev.nodeName === type) {
+            prev.append(newLi);
+            detach(node);
+          } else {
+            replaceWith(node, createElement(type, null, [newLi]));
+          }
+          newLi.append(empty(node));
+          walker.currentNode = newLi;
+        } else {
+          node = node.parentNode;
+          const tag = node.nodeName;
+          if (tag !== type && /^[OU]L$/.test(tag)) {
+            replaceWith(
+              node,
+              createElement(type, null, [empty(node)])
+            );
+          }
+        }
+      }
+      return frag;
+    }
+    makeUnorderedList() {
+      this.modifyBlocks((frag) => this._makeList(frag, "UL"));
+      return this.focus();
+    }
+    makeOrderedList() {
+      this.modifyBlocks((frag) => this._makeList(frag, "OL"));
+      return this.focus();
+    }
+    removeList() {
+      this.modifyBlocks((frag) => {
+        const lists = frag.querySelectorAll("UL, OL");
+        const items = frag.querySelectorAll("LI");
+        const root = this._root;
+        for (let i = 0, l = lists.length; i < l; ++i) {
+          const list = lists[i];
+          const listFrag = empty(list);
+          fixContainer(listFrag);
+          replaceWith(list, listFrag);
+        }
+        for (let i = 0, l = items.length; i < l; ++i) {
+          const item = items[i];
+          if (isBlock(item)) {
+            replaceWith(item, this.createDefaultBlock([empty(item)]));
+          } else {
+            fixContainer(item);
+            replaceWith(item, empty(item));
+          }
+        }
+        return frag;
+      });
+      return this.focus();
+    }
+    // ---
+    increaseQuoteLevel(range) {
+      this.modifyBlocks(
+        (frag) => createElement(
+          "BLOCKQUOTE",
+          null,
+          [frag]
+        ),
+        range
+      );
+      return this.focus();
+    }
+    decreaseQuoteLevel(range) {
+      this.modifyBlocks((frag) => {
+        Array.from(frag.querySelectorAll("blockquote")).filter((el) => {
+          return !getClosest(el.parentNode, frag, "BLOCKQUOTE");
+        }).forEach((el) => {
+          replaceWith(el, empty(el));
+        });
+        return frag;
+      }, range);
+      return this.focus();
+    }
+    removeQuote(range) {
+      this.modifyBlocks((frag) => {
+        Array.from(frag.querySelectorAll("blockquote")).forEach(
+          (el) => {
+            replaceWith(el, empty(el));
+          }
+        );
+        return frag;
+      }, range);
+      return this.focus();
+    }
+    replaceWithBlankLine(range) {
+      this.modifyBlocks(
+        () => this.createDefaultBlock([
+          createElement("INPUT", {
+            id: this.startSelectionId,
+            type: "hidden"
+          }),
+          createElement("INPUT", {
+            id: this.endSelectionId,
+            type: "hidden"
+          })
+        ]),
+        range
+      );
+      return this.focus();
+    }
+    // ---
+    code() {
+      const range = this.getSelection();
+      if (range.collapsed || isContainer(range.commonAncestorContainer)) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const output = document.createDocumentFragment();
+          const blockWalker = getBlockWalker(frag, root);
+          let node;
+          while (node = blockWalker.nextNode()) {
+            let nodes = node.querySelectorAll("BR");
+            const brBreaksLine = [];
+            let l = nodes.length;
+            for (let i = 0; i < l; ++i) {
+              brBreaksLine[i] = isLineBreak(nodes[i]);
+            }
+            while (l--) {
+              const br = nodes[l];
+              if (!brBreaksLine[l]) {
+                detach(br);
+              } else {
+                replaceWith(br, document.createTextNode("\n"));
+              }
+            }
+            nodes = node.querySelectorAll("CODE");
+            l = nodes.length;
+            while (l--) {
+              replaceWith(nodes[l], empty(nodes[l]));
+            }
+            if (output.childNodes.length) {
+              output.append(document.createTextNode("\n"));
+            }
+            output.append(empty(node));
+          }
+          const textWalker = createTreeWalker(output, SHOW_TEXT);
+          while (node = textWalker.nextNode()) {
+            node.data = node.data.replace(/ /g, " ");
+          }
+          output.normalize();
+          return fixCursor(
+            createElement("PRE", null, [
+              output
+            ])
+          );
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(
+          {
+            tag: "CODE",
+            attributes: null
+          },
+          null,
+          range
+        );
+      }
+      return this;
+    }
+    removeCode() {
+      const range = this.getSelection();
+      const ancestor = range.commonAncestorContainer;
+      const inPre = getClosest(ancestor, this._root, "PRE");
+      if (inPre) {
+        this.modifyBlocks((frag) => {
+          const root = this._root;
+          const pres = frag.querySelectorAll("PRE");
+          let l = pres.length;
+          while (l--) {
+            const pre = pres[l];
+            const walker = createTreeWalker(pre, SHOW_TEXT);
+            let node;
+            while (node = walker.nextNode()) {
+              let value = node.data;
+              value = value.replace(/ (?= )/g, "\xA0");
+              const contents = document.createDocumentFragment();
+              let index;
+              while ((index = value.indexOf("\n")) > -1) {
+                contents.append(
+                  document.createTextNode(value.slice(0, index))
+                );
+                contents.append(createElement("BR"));
+                value = value.slice(index + 1);
+              }
+              node.parentNode.insertBefore(contents, node);
+              node.data = value;
+            }
+            fixContainer(pre);
+            replaceWith(pre, empty(pre));
+          }
+          return frag;
+        }, range);
+        this.focus();
+      } else {
+        this.changeFormat(null, { tag: "CODE" }, range);
+      }
+      return this;
+    }
+    toggleCode() {
+      if (this.hasFormat("PRE") || this.hasFormat("CODE")) {
+        this.removeCode();
+      } else {
+        this.code();
+      }
+      return this;
+    }
+    /**
+     * SnappyMail
+     */
+    changeIndentationLevel(direction) {
+      let parent = this.getSelectionClosest("UL,OL,BLOCKQUOTE");
+      if (parent || "increase" === direction) {
+        direction += !parent || "BLOCKQUOTE" === parent.nodeName ? "Quote" : "List";
+        return this[direction + "Level"]();
+      }
+    }
+    getSelectionClosest(selector) {
+      return getClosest(this.getSelection().commonAncestorContainer, this._root, selector);
+    }
+    setAttribute(name, value) {
+      let range = this.getSelection();
+      let start = range?.startContainer || {};
+      let end = range?.endContainer || {};
+      if ("dir" == name || start instanceof Text && 0 === range.startOffset && start === end && end.length === range.endOffset) {
+        this._recordUndoState(range);
+        setAttributes(start.parentNode, { [name]: value });
+        this._docWasChanged();
+      } else if (null == value) {
+        this._recordUndoState(range);
+        let node = getClosest(range.commonAncestorContainer, this._root, "*");
+        range.collapsed ? setAttributes(node, { [name]: value }) : node.querySelectorAll("*").forEach((el) => setAttributes(el, { [name]: value }));
+        this._docWasChanged();
+      } else {
+        this.changeFormat({
+          tag: "SPAN",
+          attributes: { [name]: value }
+        }, null, range);
+      }
+      return this.focus();
+    }
+    setStyle(style) {
+      this.setAttribute("style", style);
+    }
+    toggleTag(name, remove) {
+      let range = this.getSelection();
+      if (this.hasFormat(name, null, range)) {
+        this.changeFormat(null, { tag: name }, range);
+      } else {
+        this.changeFormat({ tag: name }, remove ? { tag: remove } : null, range);
+      }
+    }
+    setRange(range) {
+      this.setSelection(range);
+      this._updatePath(range, true);
+    }
+    setConfig(config) {
+      this._config = mergeObjects({
+        addLinks: true
+      }, config, true);
+      return this;
+    }
+  };
+
+  // source/Legacy.ts
+  window.Squire = Squire;
+})();
diff --git a/vendors/turndown/turndown.js b/vendors/turndown/turndown.js
new file mode 100644
index 000000000..3b6d3f6e8
--- /dev/null
+++ b/vendors/turndown/turndown.js
@@ -0,0 +1,863 @@
+/**
+ * https://github.com/mixmark-io/turndown
+ * v7.2.0 modified by SnappyMail to be ES2020
+ */
+
+const TurndownService = (() => {
+
+  const repeat = (character, count) => Array(count + 1).join(character),
+
+  trimLeadingNewlines = string => string.replace(/^\n*/, ''),
+
+  trimTrailingNewlines = string => {
+    // avoid match-at-end regexp bottleneck, see #370
+    var indexEnd = string.length;
+    while (indexEnd > 0 && string[indexEnd - 1] === '\n') indexEnd--;
+    return string.substring(0, indexEnd)
+  },
+
+  blockElements = [
+    'ADDRESS', 'ARTICLE', 'ASIDE', 'AUDIO', 'BLOCKQUOTE', 'BODY', 'CANVAS',
+    'CENTER', 'DD', 'DIR', 'DIV', 'DL', 'DT', 'FIELDSET', 'FIGCAPTION', 'FIGURE',
+    'FOOTER', 'FORM', 'FRAMESET', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'HEADER',
+    'HGROUP', 'HR', 'HTML', 'ISINDEX', 'LI', 'MAIN', 'MENU', 'NAV', 'NOFRAMES',
+    'NOSCRIPT', 'OL', 'OUTPUT', 'P', 'PRE', 'SECTION', 'TABLE', 'TBODY', 'TD',
+    'TFOOT', 'TH', 'THEAD', 'TR', 'UL'
+  ],
+
+  isBlock = node => is(node, blockElements),
+
+  voidElements = [
+    'AREA', 'BASE', 'BR', 'COL', 'COMMAND', 'EMBED', 'HR', 'IMG', 'INPUT',
+    'KEYGEN', 'LINK', 'META', 'PARAM', 'SOURCE', 'TRACK', 'WBR'
+  ],
+
+  isVoid = node => is(node, voidElements),
+
+  hasVoid = node => has(node, voidElements),
+
+  meaningfulWhenBlankElements = [
+    'A', 'TABLE', 'THEAD', 'TBODY', 'TFOOT', 'TH', 'TD', 'IFRAME', 'SCRIPT',
+    'AUDIO', 'VIDEO'
+  ],
+
+  isMeaningfulWhenBlank = node => is(node, meaningfulWhenBlankElements),
+
+  hasMeaningfulWhenBlank = node => has(node, meaningfulWhenBlankElements),
+
+  is = (node, tagNames) => tagNames.indexOf(node.nodeName) >= 0,
+
+  has = (node, tagNames) =>
+    (
+      node.getElementsByTagName &&
+      tagNames.some(tagName => node.getElementsByTagName(tagName).length)
+    ),
+
+  rules = {
+
+    paragraph: {
+      filter: 'p',
+
+      replacement: content => '\n\n' + content + '\n\n'
+    },
+
+    lineBreak: {
+      filter: 'br',
+
+      replacement: (content, node, options) => options.br + '\n'
+    },
+
+    heading: {
+      filter: ['h1', 'h2', 'h3', 'h4', 'h5', 'h6'],
+
+      replacement: (content, node, options) => {
+        var hLevel = Number(node.nodeName.charAt(1));
+
+        if (options.headingStyle === 'setext' && hLevel < 3) {
+          var underline = repeat((hLevel === 1 ? '=' : '-'), content.length);
+          return '\n\n' + content + '\n' + underline + '\n\n'
+        }
+        return '\n\n' + repeat('#', hLevel) + ' ' + content + '\n\n'
+      }
+    },
+
+    blockquote: {
+      filter: 'blockquote',
+
+      replacement: (content) => {
+        content = content.replace(/^\n+|\n+$/g, '');
+        content = content.replace(/^/gm, '> ');
+        return '\n\n' + content + '\n\n'
+      }
+    },
+
+    list: {
+      filter: ['ul', 'ol'],
+
+      replacement: (content, node) => {
+        var parent = node.parentNode;
+        if (parent.nodeName === 'LI' && parent.lastElementChild === node) {
+          return '\n' + content
+        }
+        return '\n\n' + content + '\n\n'
+      }
+    },
+
+    listItem: {
+      filter: 'li',
+
+      replacement: (content, node, options) => {
+        content = content
+          .replace(/^\n+/, '') // remove leading newlines
+          .replace(/\n+$/, '\n') // replace trailing newlines with just a single one
+          .replace(/\n/gm, '\n    '); // indent
+        var prefix = options.bulletListMarker + '   ';
+        var parent = node.parentNode;
+        if (parent.nodeName === 'OL') {
+          var start = parent.getAttribute('start');
+          var index = Array.prototype.indexOf.call(parent.children, node);
+          prefix = (start ? Number(start) + index : index + 1) + '.  ';
+        }
+        return (
+          prefix + content + (node.nextSibling && !/\n$/.test(content) ? '\n' : '')
+        )
+      }
+    },
+
+    indentedCodeBlock: {
+      filter: (node, options) =>
+        (
+          options.codeBlockStyle === 'indented' &&
+          node.nodeName === 'PRE' &&
+          node.firstChild &&
+          node.firstChild.nodeName === 'CODE'
+        )
+      ,
+
+      replacement: (content, node) =>
+        (
+          '\n\n    ' +
+          node.firstChild.textContent.replace(/\n/g, '\n    ') +
+          '\n\n'
+        )
+    },
+
+    fencedCodeBlock: {
+      filter: (node, options) =>
+        (
+          options.codeBlockStyle === 'fenced' &&
+          node.nodeName === 'PRE' &&
+          node.firstChild &&
+          node.firstChild.nodeName === 'CODE'
+        )
+      ,
+
+      replacement: (content, node, options) => {
+        var className = node.firstChild.getAttribute('class') || '';
+        var language = (className.match(/language-(\S+)/) || [null, ''])[1];
+        var code = node.firstChild.textContent;
+
+        var fenceChar = options.fence.charAt(0);
+        var fenceSize = 3;
+        var fenceInCodeRegex = new RegExp('^' + fenceChar + '{3,}', 'gm');
+
+        var match;
+        while ((match = fenceInCodeRegex.exec(code))) {
+          if (match[0].length >= fenceSize) {
+            fenceSize = match[0].length + 1;
+          }
+        }
+
+        var fence = repeat(fenceChar, fenceSize);
+
+        return (
+          '\n\n' + fence + language + '\n' +
+          code.replace(/\n$/, '') +
+          '\n' + fence + '\n\n'
+        )
+      }
+    },
+
+    horizontalRule: {
+      filter: 'hr',
+
+      replacement: (content, node, options) => '\n\n' + options.hr + '\n\n'
+    },
+
+    inlineLink: {
+      filter: (node, options) =>
+        (
+          options.linkStyle === 'inlined' &&
+          node.nodeName === 'A' &&
+          node.getAttribute('href')
+        )
+      ,
+
+      replacement: (content, node) => {
+        var href = node.getAttribute('href');
+        if (href) href = href.replace(/([()])/g, '\\$1');
+        var title = cleanAttribute(node.getAttribute('title'));
+        if (title) title = ' "' + title.replace(/"/g, '\\"') + '"';
+        return '[' + content + '](' + href + title + ')'
+      }
+    },
+
+    referenceLink: {
+      filter: (node, options) =>
+        (
+          options.linkStyle === 'referenced' &&
+          node.nodeName === 'A' &&
+          node.getAttribute('href')
+        )
+      ,
+
+      replacement(content, node, options) {
+        var href = node.getAttribute('href');
+        var title = cleanAttribute(node.getAttribute('title'));
+        if (title) title = ' "' + title + '"';
+        var replacement;
+        var reference;
+
+        switch (options.linkReferenceStyle) {
+          case 'collapsed':
+            replacement = '[' + content + '][]';
+            reference = '[' + content + ']: ' + href + title;
+            break
+          case 'shortcut':
+            replacement = '[' + content + ']';
+            reference = '[' + content + ']: ' + href + title;
+            break
+          default:
+            var id = this.references.length + 1;
+            replacement = '[' + content + '][' + id + ']';
+            reference = '[' + id + ']: ' + href + title;
+        }
+
+        this.references.push(reference);
+        return replacement
+      },
+
+      references: [],
+
+      append() {
+        var references = '';
+        if (this.references.length) {
+          references = '\n\n' + this.references.join('\n') + '\n\n';
+          this.references = []; // Reset references
+        }
+        return references
+      }
+    },
+
+    emphasis: {
+      filter: ['em', 'i'],
+
+      replacement: (content, node, options) => {
+        if (!content.trim()) return ''
+        return options.emDelimiter + content + options.emDelimiter
+      }
+    },
+
+    strong: {
+      filter: ['strong', 'b'],
+
+      replacement: (content, node, options) => {
+        if (!content.trim()) return ''
+        return options.strongDelimiter + content + options.strongDelimiter
+      }
+    },
+
+    code: {
+      filter: (node) => {
+        var hasSiblings = node.previousSibling || node.nextSibling;
+        var isCodeBlock = node.parentNode.nodeName === 'PRE' && !hasSiblings;
+
+        return node.nodeName === 'CODE' && !isCodeBlock
+      },
+
+      replacement: (content) => {
+        if (!content) return ''
+        content = content.replace(/\r?\n|\r/g, ' ');
+
+        var extraSpace = /^`|^ .*?[^ ].* $|`$/.test(content) ? ' ' : '';
+        var delimiter = '`';
+        var matches = content.match(/`+/gm) || [];
+        while (matches.indexOf(delimiter) !== -1) delimiter = delimiter + '`';
+
+        return delimiter + extraSpace + content + extraSpace + delimiter
+      }
+    },
+
+    image: {
+      filter: 'img',
+
+      replacement: (content, node) => {
+        var alt = cleanAttribute(node.getAttribute('alt'));
+        var src = node.getAttribute('src') || '';
+        var title = cleanAttribute(node.getAttribute('title'));
+        var titlePart = title ? ' "' + title + '"' : '';
+        return src ? '![' + alt + ']' + '(' + src + titlePart + ')' : ''
+      }
+    },
+
+    style: {
+      filter: 'style',
+      replacement: () => ''
+    }
+  },
+
+  cleanAttribute = (attribute) => attribute ? attribute.replace(/(\n+\s*)+/g, '\n') : '';
+
+  /**
+   * Manages a collection of rules used to convert HTML to Markdown
+   */
+
+  class Rules
+  {
+    constructor(options) {
+      this.options = options;
+      this._keep = [];
+      this._remove = [];
+
+      this.blankRule = {
+        replacement: options.blankReplacement
+      };
+
+      this.keepReplacement = options.keepReplacement;
+
+      this.defaultRule = {
+        replacement: options.defaultReplacement
+      };
+
+      this.array = [];
+      for (var key in options.rules) this.array.push(options.rules[key]);
+    }
+
+    add(key, rule) {
+      this.array.unshift(rule);
+    }
+
+    keep(filter) {
+      this._keep.unshift({
+        filter: filter,
+        replacement: this.keepReplacement
+      });
+    }
+
+    remove(filter) {
+      this._remove.unshift({
+        filter: filter,
+        replacement: () => ''
+      });
+    }
+
+    forNode(node) {
+      if (node.isBlank) return this.blankRule
+      return findRule(this.array, node, this.options)
+        || findRule(this._keep, node, this.options)
+        || findRule(this._remove, node, this.options)
+        || this.defaultRule
+    }
+
+    forEach(fn) {
+      for (var i = 0; i < this.array.length; i++) fn(this.array[i], i);
+    }
+  }
+
+  const findRule = (rules, node, options) => {
+    for (var i = 0; i < rules.length; i++) {
+      var rule = rules[i];
+      if (filterValue(rule, node, options)) return rule
+    }
+    return void 0
+  },
+
+  filterValue = (rule, node, options) => {
+    var filter = rule.filter;
+    if (typeof filter === 'string') {
+      return (filter === node.nodeName.toLowerCase())
+    } else if (Array.isArray(filter)) {
+      return (filter.indexOf(node.nodeName.toLowerCase()) > -1)
+    } else if (typeof filter === 'function') {
+      return !!filter.call(rule, node, options)
+    }
+    throw new TypeError('`filter` needs to be a string, array, or function')
+  },
+
+  /**
+   * The collapseWhitespace function is adapted from collapse-whitespace
+   * by Luc Thevenard.
+   *
+   * The MIT License (MIT)
+   *
+   * Copyright (c) 2014 Luc Thevenard <lucthevenard@gmail.com>
+   *
+   * Permission is hereby granted, free of charge, to any person obtaining a copy
+   * of this software and associated documentation files (the "Software"), to deal
+   * in the Software without restriction, including without limitation the rights
+   * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+   * copies of the Software, and to permit persons to whom the Software is
+   * furnished to do so, subject to the following conditions:
+   *
+   * The above copyright notice and this permission notice shall be included in
+   * all copies or substantial portions of the Software.
+   *
+   * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+   * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+   * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+   * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+   * THE SOFTWARE.
+   */
+
+  /**
+   * collapseWhitespace(options) removes extraneous whitespace from an the given element.
+   *
+   * @param {Object} options
+   */
+  collapseWhitespace = (options) => {
+    var element = options.element;
+    var isBlock = options.isBlock;
+    var isVoid = options.isVoid;
+    var isPre = options.isPre || ((node) => node.nodeName === 'PRE');
+
+    if (!element.firstChild || isPre(element)) return
+
+    var prevText = null;
+    var keepLeadingWs = false;
+
+    var prev = null;
+    var node = next(prev, element, isPre);
+
+    while (node !== element) {
+      if (node.nodeType === 3 || node.nodeType === 4) { // Node.TEXT_NODE or Node.CDATA_SECTION_NODE
+        var text = node.data.replace(/[ \r\n\t]+/g, ' ');
+
+        if ((!prevText || / $/.test(prevText.data)) &&
+            !keepLeadingWs && text[0] === ' ') {
+          text = text.substr(1);
+        }
+
+        // `text` might be empty at this point.
+        if (!text) {
+          node = remove(node);
+          continue
+        }
+
+        node.data = text;
+
+        prevText = node;
+      } else if (node.nodeType === 1) { // Node.ELEMENT_NODE
+        if (isBlock(node) || node.nodeName === 'BR') {
+          if (prevText) {
+            prevText.data = prevText.data.replace(/ $/, '');
+          }
+
+          prevText = null;
+          keepLeadingWs = false;
+        } else if (isVoid(node) || isPre(node)) {
+          // Avoid trimming space around non-block, non-BR void elements and inline PRE.
+          prevText = null;
+          keepLeadingWs = true;
+        } else if (prevText) {
+          // Drop protection if set previously.
+          keepLeadingWs = false;
+        }
+      } else {
+        node = remove(node);
+        continue
+      }
+
+      var nextNode = next(prev, node, isPre);
+      prev = node;
+      node = nextNode;
+    }
+
+    if (prevText) {
+      prevText.data = prevText.data.replace(/ $/, '');
+      if (!prevText.data) {
+        remove(prevText);
+      }
+    }
+  },
+
+  /**
+   * remove(node) removes the given node from the DOM and returns the
+   * next node in the sequence.
+   *
+   * @param {Node} node
+   * @return {Node} node
+   */
+  remove = (node) => {
+    var next = node.nextSibling || node.parentNode;
+
+    node.parentNode.removeChild(node);
+
+    return next
+  },
+
+  /**
+   * next(prev, current, isPre) returns the next node in the sequence, given the
+   * current and previous nodes.
+   *
+   * @param {Node} prev
+   * @param {Node} current
+   * @param {Function} isPre
+   * @return {Node}
+   */
+  next = (prev, current, isPre) => {
+    if ((prev && prev.parentNode === current) || isPre(current)) {
+      return current.nextSibling || current.parentNode
+    }
+
+    return current.firstChild || current.nextSibling || current.parentNode
+  },
+
+  /*
+   * Parsing HTML strings
+   */
+
+  RootNode = (input, options) => {
+    var root;
+    if (typeof input === 'string') {
+      var doc = htmlParser().parseFromString(
+        // DOM parsers arrange elements in the <head> and <body>.
+        // Wrapping in a custom element ensures elements are reliably arranged in
+        // a single element.
+        '<x-turndown id="turndown-root">' + input + '</x-turndown>',
+        'text/html'
+      );
+      root = doc.getElementById('turndown-root');
+    } else {
+      root = input.cloneNode(true);
+    }
+    collapseWhitespace({
+      element: root,
+      isBlock: isBlock,
+      isVoid: isVoid,
+      isPre: options.preformattedCode ? isPreOrCode : null
+    });
+
+    return root
+  };
+
+  var _htmlParser;
+  const htmlParser = () => {
+    _htmlParser = _htmlParser || new DOMParser();
+    return _htmlParser
+  },
+
+  isPreOrCode = (node) => node.nodeName === 'PRE' || node.nodeName === 'CODE',
+
+  Node = (node, options) => {
+    node.isBlock = isBlock(node);
+    node.isCode = node.nodeName === 'CODE' || node.parentNode.isCode;
+    node.isBlank = isBlank(node);
+    node.flankingWhitespace = flankingWhitespace(node, options);
+    return node
+  },
+
+  isBlank = (node) =>
+    (
+      !isVoid(node) &&
+      !isMeaningfulWhenBlank(node) &&
+      /^\s*$/i.test(node.textContent) &&
+      !hasVoid(node) &&
+      !hasMeaningfulWhenBlank(node)
+    )
+  ,
+
+  flankingWhitespace = (node, options) => {
+    if (node.isBlock || (options.preformattedCode && node.isCode)) {
+      return { leading: '', trailing: '' }
+    }
+
+    var edges = edgeWhitespace(node.textContent);
+
+    // abandon leading ASCII WS if left-flanked by ASCII WS
+    if (edges.leadingAscii && isFlankedByWhitespace('left', node, options)) {
+      edges.leading = edges.leadingNonAscii;
+    }
+
+    // abandon trailing ASCII WS if right-flanked by ASCII WS
+    if (edges.trailingAscii && isFlankedByWhitespace('right', node, options)) {
+      edges.trailing = edges.trailingNonAscii;
+    }
+
+    return { leading: edges.leading, trailing: edges.trailing }
+  },
+
+  edgeWhitespace = (string) => {
+    var m = string.match(/^(([ \t\r\n]*)(\s*))(?:(?=\S)[\s\S]*\S)?((\s*?)([ \t\r\n]*))$/);
+    return {
+      leading: m[1], // whole string for whitespace-only strings
+      leadingAscii: m[2],
+      leadingNonAscii: m[3],
+      trailing: m[4], // empty for whitespace-only strings
+      trailingNonAscii: m[5],
+      trailingAscii: m[6]
+    }
+  },
+
+  isFlankedByWhitespace = (side, node, options) => {
+    var sibling;
+    var regExp;
+    var isFlanked;
+
+    if (side === 'left') {
+      sibling = node.previousSibling;
+      regExp = / $/;
+    } else {
+      sibling = node.nextSibling;
+      regExp = /^ /;
+    }
+
+    if (sibling) {
+      if (sibling.nodeType === 3) {
+        isFlanked = regExp.test(sibling.nodeValue);
+      } else if (options.preformattedCode && sibling.nodeName === 'CODE') {
+        isFlanked = false;
+      } else if (sibling.nodeType === 1 && !isBlock(sibling)) {
+        isFlanked = regExp.test(sibling.textContent);
+      }
+    }
+    return isFlanked
+  },
+
+  reduce = Array.prototype.reduce,
+  escapes = [
+    [/\\/g, '\\\\'],
+    [/\*/g, '\\*'],
+    [/^-/g, '\\-'],
+    [/^\+ /g, '\\+ '],
+    [/^(=+)/g, '\\$1'],
+    [/^(#{1,6}) /g, '\\$1 '],
+    [/`/g, '\\`'],
+    [/^~~~/g, '\\~~~'],
+    [/\[/g, '\\['],
+    [/\]/g, '\\]'],
+    [/^>/g, '\\>'],
+    [/_/g, '\\_'],
+    [/^(\d+)\. /g, '$1\\. ']
+  ];
+
+  class TurndownService
+  {
+    constructor(options) {
+      this.options = Object.assign({
+        rules: rules,
+        headingStyle: 'setext',
+        hr: '* * *',
+        bulletListMarker: '*',
+        codeBlockStyle: 'indented',
+        fence: '```',
+        emDelimiter: '_',
+        strongDelimiter: '**',
+        linkStyle: 'inlined',
+        linkReferenceStyle: 'full',
+        br: '  ',
+        preformattedCode: false,
+        blankReplacement: (content, node) => node.isBlock ? '\n\n' : '',
+        keepReplacement: (content, node) => node.isBlock ? '\n\n' + node.outerHTML + '\n\n' : node.outerHTML,
+        defaultReplacement: (content, node) => node.isBlock ? '\n\n' + content + '\n\n' : content
+      }, options);
+      this.rules = new Rules(this.options);
+    }
+
+    /**
+     * The entry point for converting a string or DOM node to Markdown
+     * @public
+     * @param {String|HTMLElement} input The string or DOM node to convert
+     * @returns A Markdown representation of the input
+     * @type String
+     */
+
+    turndown(input) {
+      if (!canConvert(input)) {
+        throw new TypeError(
+          input + ' is not a string, or an element/document/fragment node.'
+        )
+      }
+
+      if (input === '') return ''
+
+      var output = this.process(RootNode(input, this.options));
+      return this.postProcess(output)
+    }
+
+    /**
+     * Add one or more plugins
+     * @public
+     * @param {Function|Array} plugin The plugin or array of plugins to add
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    use(plugin) {
+      if (Array.isArray(plugin)) {
+        for (var i = 0; i < plugin.length; i++) this.use(plugin[i]);
+      } else if (typeof plugin === 'function') {
+        plugin(this);
+      } else {
+        throw new TypeError('plugin must be a Function or an Array of Functions')
+      }
+      return this
+    }
+
+    /**
+     * Adds a rule
+     * @public
+     * @param {String} key The unique key of the rule
+     * @param {Object} rule The rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    addRule(key, rule) {
+      this.rules.add(key, rule);
+      return this
+    }
+
+    /**
+     * Keep a node (as HTML) that matches the filter
+     * @public
+     * @param {String|Array|Function} filter The unique key of the rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    keep(filter) {
+      this.rules.keep(filter);
+      return this
+    }
+
+    /**
+     * Remove a node that matches the filter
+     * @public
+     * @param {String|Array|Function} filter The unique key of the rule
+     * @returns The Turndown instance for chaining
+     * @type Object
+     */
+
+    remove(filter) {
+      this.rules.remove(filter);
+      return this
+    }
+
+    /**
+     * Escapes Markdown syntax
+     * @public
+     * @param {String} string The string to escape
+     * @returns A string with Markdown syntax escaped
+     * @type String
+     */
+
+    escape(string) {
+      return escapes.reduce((accumulator, escape) => accumulator.replace(escape[0], escape[1]), string)
+    }
+
+    /**
+     * Reduces a DOM node down to its Markdown string equivalent
+     * @private
+     * @param {HTMLElement} parentNode The node to convert
+     * @returns A Markdown representation of the node
+     * @type String
+     */
+
+    process(parentNode) {
+      var self = this;
+      return reduce.call(parentNode.childNodes, (output, node) => {
+        node = Node(node, self.options);
+
+        var replacement = '';
+        if (node.nodeType === 3) {
+          replacement = node.isCode ? node.nodeValue : self.escape(node.nodeValue);
+        } else if (node.nodeType === 1) {
+          replacement = self.replacementForNode(node);
+        }
+
+        return join(output, replacement)
+      }, '')
+    }
+
+    /**
+     * Appends strings as each rule requires and trims the output
+     * @private
+     * @param {String} output The conversion output
+     * @returns A trimmed version of the ouput
+     * @type String
+     */
+
+    postProcess(output) {
+      var self = this;
+      this.rules.forEach((rule) => {
+        if (typeof rule.append === 'function') {
+          output = join(output, rule.append(self.options));
+        }
+      });
+
+      return output.replace(/^[\t\r\n]+/, '').replace(/[\t\r\n\s]+$/, '')
+    }
+
+    /**
+     * Converts an element node to its Markdown equivalent
+     * @private
+     * @param {HTMLElement} node The node to convert
+     * @returns A Markdown representation of the node
+     * @type String
+     */
+
+    replacementForNode(node) {
+      var rule = this.rules.forNode(node);
+      var content = this.process(node);
+      var whitespace = node.flankingWhitespace;
+      if (whitespace.leading || whitespace.trailing) content = content.trim();
+      return (
+        whitespace.leading +
+        rule.replacement(content, node, this.options) +
+        whitespace.trailing
+      )
+    }
+  }
+
+  /**
+   * Joins replacement to the current output with appropriate number of new lines
+   * @private
+   * @param {String} output The current conversion output
+   * @param {String} replacement The string to append to the output
+   * @returns Joined output
+   * @type String
+   */
+
+  const join = (output, replacement) => {
+    var s1 = trimTrailingNewlines(output);
+    var s2 = trimLeadingNewlines(replacement);
+    var nls = Math.max(output.length - s1.length, replacement.length - s2.length);
+    var separator = '\n\n'.substring(0, nls);
+
+    return s1 + separator + s2
+  },
+
+  /**
+   * Determines whether an input can be converted
+   * @private
+   * @param {String|HTMLElement} input Describe this parameter
+   * @returns Describe what it returns
+   * @type String|Object|Array|Boolean|Number
+   */
+
+  canConvert = (input) =>
+    (
+      input != null && (
+        typeof input === 'string' ||
+        (input.nodeType && (
+          input.nodeType === 1 || input.nodeType === 9 || input.nodeType === 11
+        ))
+      )
+    )
+  ;
+
+  return TurndownService;
+
+})();
diff --git a/yarn.lock b/yarn.lock
index a479114a6..c2e7e0c48 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4,119 +4,96 @@
 
 "@babel/code-frame@7.12.11":
   version "7.12.11"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
   integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
   dependencies:
     "@babel/highlight" "^7.10.4"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"
-  integrity sha512-iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg==
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.29.7.tgz#f2fbbfea87c44a21590ec515b778b2c26d8866e7"
+  integrity sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==
   dependencies:
-    "@babel/highlight" "^7.16.7"
-
-"@babel/generator@^7.16.8":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"
-  integrity sha512-1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw==
-  dependencies:
-    "@babel/types" "^7.16.8"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-environment-visitor@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.7.tgz"
-  integrity sha512-SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-function-name@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"
-  integrity sha512-QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.16.7"
-    "@babel/template" "^7.16.7"
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-get-function-arity@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"
-  integrity sha512-flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-hoist-variables@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"
-  integrity sha512-m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-split-export-declaration@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"
-  integrity sha512-xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw==
-  dependencies:
-    "@babel/types" "^7.16.7"
-
-"@babel/helper-validator-identifier@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"
-  integrity sha512-hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw==
-
-"@babel/highlight@^7.10.4", "@babel/highlight@^7.16.7":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"
-  integrity sha512-5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    chalk "^2.0.0"
+    "@babel/helper-validator-identifier" "^7.29.7"
     js-tokens "^4.0.0"
+    picocolors "^1.1.1"
 
-"@babel/parser@^7.16.10", "@babel/parser@^7.16.7", "@babel/parser@^7.7.0":
-  version "7.16.12"
-  resolved "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"
-  integrity sha512-VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A==
-
-"@babel/template@^7.16.7":
-  version "7.16.7"
-  resolved "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"
-  integrity sha512-I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w==
+"@babel/generator@^7.29.8":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.29.8.tgz#4b0b887885422643339e09022148a4c4ebaa4979"
+  integrity sha512-gZbepsdh3WDtgZKWL+vTPh71LSBrm/Y4/QDZBVCcYfmeTEEuoOYwlSy+G1StfJg+/Zy550u/3TATbm7qDbbMtg==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/parser" "^7.16.7"
-    "@babel/types" "^7.16.7"
+    "@babel/parser" "^7.29.8"
+    "@babel/types" "^7.29.8"
+    "@jridgewell/gen-mapping" "^0.3.12"
+    "@jridgewell/trace-mapping" "^0.3.28"
+    jsesc "^3.0.2"
+
+"@babel/helper-globals@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-globals/-/helper-globals-7.29.7.tgz#f04a96fbd8473241b1079243f5b3f03a3010ab7b"
+  integrity sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==
+
+"@babel/helper-string-parser@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz#7f0871d99824d23137d60f86fcf6130fd5a1b51f"
+  integrity sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==
+
+"@babel/helper-validator-identifier@^7.25.9", "@babel/helper-validator-identifier@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz#bd87084ced0c796ec46bda492de6e83d29e89fc2"
+  integrity sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==
+
+"@babel/highlight@^7.10.4":
+  version "7.25.9"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.25.9.tgz#8141ce68fc73757946f983b343f1231f4691acc6"
+  integrity sha512-llL88JShoCsth8fF8R4SJnIn+WLvR6ccFxu1H3FlMhDontdcmZWf2HgIZ7AIqV3Xcck1idlohrN4EUBQz6klbw==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.25.9"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+    picocolors "^1.0.0"
+
+"@babel/parser@^7.29.7", "@babel/parser@^7.29.8", "@babel/parser@^7.29.9", "@babel/parser@^7.7.0":
+  version "7.29.9"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.29.9.tgz#e7ee0a24f752c5296c6455855ccb72662e67ea96"
+  integrity sha512-CjXrNHTnvqBVqHgdBysY3vk2T8tpJHb5/RMeHJBTyVa9xgugCB0CJTx/3oO8RV2QRQP391RWpB7D6hLjm8V9uA==
+  dependencies:
+    "@babel/types" "^7.29.8"
+
+"@babel/template@^7.29.7":
+  version "7.29.7"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.29.7.tgz#4d9d4004f645cdd304de958c725162784ecac700"
+  integrity sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==
+  dependencies:
+    "@babel/code-frame" "^7.29.7"
+    "@babel/parser" "^7.29.7"
+    "@babel/types" "^7.29.7"
 
 "@babel/traverse@^7.7.0":
-  version "7.16.10"
-  resolved "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"
-  integrity sha512-yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw==
+  version "7.29.10"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.29.10.tgz#08ab387639b4a67304511259c7da6cf23a82e91c"
+  integrity sha512-B3lYAs2nkKskbgQ1nfy8Ma9ao9Q1rntTAQHrzzyDuj+TSO+X3le6PfWwqDvodsb+OumE10eMFfuMCTQSQ5iuIQ==
   dependencies:
-    "@babel/code-frame" "^7.16.7"
-    "@babel/generator" "^7.16.8"
-    "@babel/helper-environment-visitor" "^7.16.7"
-    "@babel/helper-function-name" "^7.16.7"
-    "@babel/helper-hoist-variables" "^7.16.7"
-    "@babel/helper-split-export-declaration" "^7.16.7"
-    "@babel/parser" "^7.16.10"
-    "@babel/types" "^7.16.8"
-    debug "^4.1.0"
-    globals "^11.1.0"
+    "@babel/code-frame" "^7.29.7"
+    "@babel/generator" "^7.29.8"
+    "@babel/helper-globals" "^7.29.7"
+    "@babel/parser" "^7.29.9"
+    "@babel/template" "^7.29.7"
+    "@babel/types" "^7.29.8"
+    debug "^4.3.1"
 
-"@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.7.0":
-  version "7.16.8"
-  resolved "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"
-  integrity sha512-smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg==
+"@babel/types@^7.29.7", "@babel/types@^7.29.8", "@babel/types@^7.7.0":
+  version "7.29.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.29.8.tgz#1229eef31d85156d70fa3f4cd859376d0eaf6863"
+  integrity sha512-Vj1jF3cPfxg7OAfoI7QnVKLoILlm2JF9pnVHrX8qx7AHMiYWT+NDAA7jChlNgRS4WTLc/fD1lXLmPixluj+3Gg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.16.7"
-    to-fast-properties "^2.0.0"
+    "@babel/helper-string-parser" "^7.29.7"
+    "@babel/helper-validator-identifier" "^7.29.7"
 
 "@eslint/eslintrc@^0.4.3":
   version "0.4.3"
-  resolved "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
   integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
   dependencies:
     ajv "^6.12.4"
@@ -129,9 +106,21 @@
     minimatch "^3.0.4"
     strip-json-comments "^3.1.1"
 
+"@gulpjs/messages@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@gulpjs/messages/-/messages-1.1.0.tgz#94e70978ff676ade541faab459c37ae0c7095e5a"
+  integrity sha512-Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==
+
+"@gulpjs/to-absolute-glob@^4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz#1fc2460d3953e1d9b9f2dfdb4bcc99da4710c021"
+  integrity sha512-kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==
+  dependencies:
+    is-negated-glob "^1.0.0"
+
 "@humanwhocodes/config-array@^0.5.0":
   version "0.5.0"
-  resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
   integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
   dependencies:
     "@humanwhocodes/object-schema" "^1.2.0"
@@ -140,12 +129,46 @@
 
 "@humanwhocodes/object-schema@^1.2.0":
   version "1.2.1"
-  resolved "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45"
   integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==
 
+"@jridgewell/gen-mapping@^0.3.12", "@jridgewell/gen-mapping@^0.3.5":
+  version "0.3.13"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz#6342a19f44347518c93e43b1ac69deb3c4656a1f"
+  integrity sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==
+  dependencies:
+    "@jridgewell/sourcemap-codec" "^1.5.0"
+    "@jridgewell/trace-mapping" "^0.3.24"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz#7a0ee601f60f99a20c7c7c5ff0c80388c1189bd6"
+  integrity sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==
+
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.11"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.11.tgz#b21835cbd36db656b857c2ad02ebd413cc13a9ba"
+  integrity sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.5"
+    "@jridgewell/trace-mapping" "^0.3.25"
+
+"@jridgewell/sourcemap-codec@^1.4.14", "@jridgewell/sourcemap-codec@^1.5.0":
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz#f4c663e862f06dc98ca4d453862c46902789a18d"
+  integrity sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==
+
+"@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.28":
+  version "0.3.31"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz#db15d6781c931f3a251a3dac39501c98a6082fd0"
+  integrity sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
   integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
   dependencies:
     "@nodelib/fs.stat" "2.0.5"
@@ -153,40 +176,49 @@
 
 "@nodelib/fs.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
   version "2.0.5"
-  resolved "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
   integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3":
   version "1.2.8"
-  resolved "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
   integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
     "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
 "@rollup/plugin-node-resolve@^13.1.3":
-  version "13.1.3"
-  resolved "https://registry.npmjs.org/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.1.3.tgz"
-  integrity sha512-BdxNk+LtmElRo5d06MGY4zoepyrXX1tkzX2hrnPEZ53k78GuOMWLqmJDGIIOPwVRIFZrLQOo+Yr6KtCuLIA0AQ==
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c"
+  integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
-    builtin-modules "^3.1.0"
     deepmerge "^4.2.2"
+    is-builtin-module "^3.1.0"
     is-module "^1.0.0"
     resolve "^1.19.0"
 
 "@rollup/plugin-replace@^3.0.1":
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-3.0.1.tgz"
-  integrity sha512-989J5oRzf3mm0pO/0djTijdfEh9U3n63BIXN5X7T4U9BP+fN4oxQ6DvDuBvFaHA6scaHQRclqmKQEkBhB7k7Hg==
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-replace/-/plugin-replace-3.1.0.tgz#d31e3a90c6b47064f3c9f2ce0ded5bcf0d3b82f6"
+  integrity sha512-pA3XRUrSKybVYqmH5TqWNZpGxF+VV+1GrYchKgCNIj2vsSOX7CVm2RCtx8p2nrC7xvkziYyK+lSi74T93MU3YA==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     magic-string "^0.25.7"
 
+"@rollup/plugin-terser@^1.0.2":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-terser/-/plugin-terser-1.0.2.tgz#3686f1685669819874956b4bdb965cf21d9eb2d5"
+  integrity sha512-+UihHnuLnQDQ/9wog7ym+7oawCXkjTIo0WwkK7s//0mkktTN0VhYk6fGVxH+NtGzW064w5RCGgreMDxRVhHCzw==
+  dependencies:
+    serialize-javascript "^7.0.3"
+    smob "^1.0.0"
+    terser "^5.49.2"
+
 "@rollup/pluginutils@^3.1.0":
   version "3.1.0"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
   integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
   dependencies:
     "@types/estree" "0.0.39"
@@ -194,75 +226,82 @@
     picomatch "^2.2.2"
 
 "@rollup/pluginutils@^4.0.0":
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.1.2.tgz"
-  integrity sha512-ROn4qvkxP9SyPeHaf7uQC/GPFY6L/OWy9+bd9AwcjOAWQwxRscoEyAUD8qCY5o5iL4jqQwoLk2kaTKJPb/HwzQ==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-4.2.1.tgz#e6c6c3aba0744edce3fb2074922d3776c0af2a6d"
+  integrity sha512-iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==
   dependencies:
     estree-walker "^2.0.1"
     picomatch "^2.2.2"
 
 "@types/estree@*":
-  version "0.0.50"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.50.tgz"
-  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.9.tgz#cf3f0e876d7bee15a93ab925b82bf570a3904a24"
+  integrity sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==
 
 "@types/estree@0.0.39":
   version "0.0.39"
-  resolved "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@types/expect@^1.20.4":
   version "1.20.4"
-  resolved "https://registry.npmjs.org/@types/expect/-/expect-1.20.4.tgz"
+  resolved "https://registry.yarnpkg.com/@types/expect/-/expect-1.20.4.tgz#8288e51737bf7e3ab5d7c77bfa695883745264e5"
   integrity sha512-Q5Vn3yjTDyCMV50TB6VRIbQNxSE4OmZR86VSbGaNpfUolm0iePBB4KdEEHmxoY5sT2+2DIvXW0rvMDP2nHZ4Mg==
 
 "@types/minimatch@^3.0.3":
   version "3.0.5"
-  resolved "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
   integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
-"@types/node@*", "@types/node@^14.14.41":
-  version "14.18.9"
-  resolved "https://registry.npmjs.org/@types/node/-/node-14.18.9.tgz"
-  integrity sha512-j11XSuRuAlft6vLDEX4RvhqC0KxNxx6QIyMXNb0vHHSNPXTPeiy3algESWmOOIzEtiEL0qiowPU3ewW9hHVa7Q==
+"@types/node@*":
+  version "26.6.5"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-26.6.5.tgz#cb35209e7767c503551b5fa42a48231c7441d979"
+  integrity sha512-uMzsv9stDdofIZBx4UGh4Z9ZgXnGC9seRDscilBcTHAeOFk67MZg/k9bWVfO+bk4qZmG+l52hRnLwUiH2LnJTg==
+  dependencies:
+    undici-types "~8.9.0"
 
 "@types/resolve@1.17.1":
   version "1.17.1"
-  resolved "https://registry.npmjs.org/@types/resolve/-/resolve-1.17.1.tgz"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
   integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
   dependencies:
     "@types/node" "*"
 
 "@types/vinyl@^2.0.4":
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/@types/vinyl/-/vinyl-2.0.6.tgz"
-  integrity sha512-ayJ0iOCDNHnKpKTgBG6Q6JOnHTj9zFta+3j2b8Ejza0e4cvRyMn0ZoLEmbPrTHe5YYRlDYPvPWVdV4cTaRyH7g==
+  version "2.0.12"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.12.tgz#17642ca9a8ae10f3db018e9f885da4188db4c6e6"
+  integrity sha512-Sr2fYMBUVGYq8kj3UthXFAu5UN6ZW+rYr4NACjZQJvHvj+c8lYv0CahmZ2P/r7iUkN44gGUBwqxZkrKXYPb7cw==
   dependencies:
     "@types/expect" "^1.20.4"
     "@types/node" "*"
 
 acorn-jsx@^5.2.0, acorn-jsx@^5.3.1:
   version "5.3.2"
-  resolved "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
   integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
 
 acorn@^7.1.1, acorn@^7.4.0:
   version "7.4.1"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
+acorn@^8.15.0:
+  version "8.19.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.19.0.tgz#6b26fd97ce1cc9dc50bdf7ad305e9f1384d4f28a"
+  integrity sha512-oJlA3XiRm7Cyk6qFD2Jn8ak9B7jSy0qy00ADO3+8dpT0LSjFihQYv4C02LFCSYJV3Q37xYwwRy5m+IpIiUzqWw==
+
 aggregate-error@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz#92670ff50f5359bdb7a3e0d40d0ec30c5737687a"
   integrity sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==
   dependencies:
     clean-stack "^2.0.0"
     indent-string "^4.0.0"
 
 ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
-  version "6.12.6"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
-  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  version "6.15.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.15.0.tgz#07e982c74626167aa7a2495c53817892d7139492"
+  integrity sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==
   dependencies:
     fast-deep-equal "^3.1.1"
     fast-json-stable-stringify "^2.0.0"
@@ -270,250 +309,206 @@ ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.4:
     uri-js "^4.2.2"
 
 ajv@^8.0.1:
-  version "8.9.0"
-  resolved "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"
-  integrity sha512-qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ==
+  version "8.20.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.20.0.tgz#304b3636add88ba7d936760dd50ece006dea95f9"
+  integrity sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==
   dependencies:
-    fast-deep-equal "^3.1.1"
+    fast-deep-equal "^3.1.3"
+    fast-uri "^3.0.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
-    uri-js "^4.2.2"
 
 ansi-colors@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
   integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
   dependencies:
     ansi-wrap "^0.1.0"
 
 ansi-colors@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"
-  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.3.tgz#37611340eb2243e70cc604cad35d63270d48781b"
+  integrity sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==
+
+ansi-cyan@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
+  integrity sha512-eCjan3AVo/SxZ0/MyIYRtkpxIu/H3xZN7URr1vXVrISxeyz8fUFz0FJziamK4sS8I+t35y4rHg1b2PklyBe/7A==
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-escapes@^4.2.1:
   version "4.3.2"
-  resolved "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
   integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
     type-fest "^0.21.3"
 
 ansi-gray@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
+  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
+  integrity sha512-HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==
   dependencies:
     ansi-wrap "0.1.0"
 
-ansi-regex@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"
-  integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
+ansi-red@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
+  integrity sha512-ewaIr5y+9CUTGFwZfpECUbFlGcC0GCw1oqR9RI6h1gQCd9Aj2GxSckCnPsVJnmfMZbwFYE+leZGASgkWl06Jow==
+  dependencies:
+    ansi-wrap "0.1.0"
 
 ansi-regex@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz"
-  integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.1.tgz#164daac87ab2d6f6db3a29875e2d1766582dabed"
+  integrity sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==
 
 ansi-regex@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
   integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
 
-ansi-styles@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz"
-  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=
-
 ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
   dependencies:
     color-convert "^1.9.0"
 
 ansi-styles@^4.0.0, ansi-styles@^4.1.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
   integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
   dependencies:
     color-convert "^2.0.1"
 
 ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
+  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
+  integrity sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==
 
-anymatch@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz"
-  integrity sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==
+anymatch@^3.1.3, anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
   dependencies:
-    micromatch "^3.1.4"
-    normalize-path "^2.1.1"
-
-append-buffer@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/append-buffer/-/append-buffer-1.0.2.tgz"
-  integrity sha1-2CIM9GYIFSXv6lBhTz3mUU36WPE=
-  dependencies:
-    buffer-equal "^1.0.0"
-
-archy@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz"
-  integrity sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
 
 argparse@^1.0.7:
   version "1.0.10"
-  resolved "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
   dependencies:
     sprintf-js "~1.0.2"
 
+arr-diff@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
+  integrity sha512-OQwDZUqYaQwyyhDJHThmzId8daf4/RFNLaeh3AevmSeZ5Y7ug4Ga/yKc6l6kTZOBW781rCj103ZuTh8GAsB3+Q==
+  dependencies:
+    arr-flatten "^1.0.1"
+    array-slice "^0.2.3"
+
 arr-diff@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz"
-  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==
 
-arr-filter@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/arr-filter/-/arr-filter-1.1.2.tgz"
-  integrity sha1-Q/3d0JHo7xGqTEXZzcGOLf8XEe4=
-  dependencies:
-    make-iterator "^1.0.0"
-
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.0.1:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-arr-map@^2.0.0, arr-map@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/arr-map/-/arr-map-2.0.2.tgz"
-  integrity sha1-Onc0X/wc814qkYJWAfnljy4kysQ=
-  dependencies:
-    make-iterator "^1.0.0"
+arr-union@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
+  integrity sha512-t5db90jq+qdgk8aFnxEkjqta0B/GHrM1pxzuuZz2zWsOXc5nKu3t+76s/PQBA8FTcM/ipspIH9jWG4OxCBc2eA==
 
 arr-union@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz"
-  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
-
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==
 
 array-differ@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-3.0.0.tgz#3cbb3d0f316810eafcc47624734237d6aee4ae6b"
   integrity sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==
 
-array-each@^1.0.0, array-each@^1.0.1:
+array-each@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz"
-  integrity sha1-p5SvDAWrF1KEbudTofIRoFugxE8=
+  resolved "https://registry.yarnpkg.com/array-each/-/array-each-1.0.1.tgz#a794af0c05ab1752846ee753a1f211a05ba0c44f"
+  integrity sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==
 
-array-initial@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/array-initial/-/array-initial-1.1.0.tgz"
-  integrity sha1-L6dLJnOTccOUe9enrcc74zSz15U=
-  dependencies:
-    array-slice "^1.0.0"
-    is-number "^4.0.0"
-
-array-last@^1.1.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/array-last/-/array-last-1.3.0.tgz"
-  integrity sha512-eOCut5rXlI6aCOS7Z7kCplKRKyiFQ6dHFBem4PwlwKeNFk2/XxTrhRh5T9PyaEWGy/NHTZWbY+nsZlNFJu9rYg==
-  dependencies:
-    is-number "^4.0.0"
+array-slice@^0.2.3:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
+  integrity sha512-rlVfZW/1Ph2SNySXwR9QYkChp8EkOEiTMO5Vwx60usw04i4nWemkm9RXmQqgkQFaLHsqLuADvjp6IfgL9l2M8Q==
 
 array-slice@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/array-slice/-/array-slice-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-1.1.0.tgz#e368ea15f89bc7069f7ffb89aec3a6c7d4ac22d4"
   integrity sha512-B1qMD3RBP7O8o0H2KbrXDyB0IccejMF15+87Lvlor12ONPRHP6gTjXMNkt/d3ZuOGbAe66hFmaCfECI24Ufp6w==
 
-array-sort@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/array-sort/-/array-sort-1.0.0.tgz"
-  integrity sha512-ihLeJkonmdiAsD7vpgN3CRcx2J2S0TiYW+IS/5zHBI7mKUq3ySvBdzzBfD236ubDBQFiiyG3SWCPc+msQ9KoYg==
-  dependencies:
-    default-compare "^1.0.0"
-    get-value "^2.0.6"
-    kind-of "^5.0.2"
-
 array-union@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d"
   integrity sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==
 
-array-uniq@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz"
-  integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
-
-array-unique@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz"
-  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
-
 arrify@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-2.0.1.tgz#c9655e9331e0abcd588d2a7cad7e9956f66701fa"
   integrity sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==
 
 assign-symbols@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz"
-  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==
 
 astral-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
 astral-regex@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
   integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
 
-async-done@^1.2.0, async-done@^1.2.2:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/async-done/-/async-done-1.3.2.tgz"
-  integrity sha512-uYkTP8dw2og1tu1nmza1n1CMW0qb8gWWlwqMmLb7MhBVs4BXrFziT6HXUd+/RlRA/i4H9AkofYloUbs1fwMqlw==
+async-done@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/async-done/-/async-done-2.0.0.tgz#f1ec5df738c6383a52b0a30d0902fd897329c15a"
+  integrity sha512-j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==
   dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.2"
-    process-nextick-args "^2.0.0"
-    stream-exhaust "^1.0.1"
+    end-of-stream "^1.4.4"
+    once "^1.4.0"
+    stream-exhaust "^1.0.2"
 
-async-each@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz"
-  integrity sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==
-
-async-settle@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/async-settle/-/async-settle-1.0.0.tgz"
-  integrity sha1-HQqRS7Aldb7IqPOnTlCA9yssDGs=
+async-settle@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/async-settle/-/async-settle-2.0.0.tgz#c695ad14e070f6a755d019d32d6eb38029020287"
+  integrity sha512-Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==
   dependencies:
-    async-done "^1.2.2"
+    async-done "^2.0.0"
 
 async@^3.2.0:
-  version "3.2.3"
-  resolved "https://registry.npmjs.org/async/-/async-3.2.3.tgz"
-  integrity sha512-spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g==
+  version "3.2.6"
+  resolved "https://registry.yarnpkg.com/async/-/async-3.2.6.tgz#1b0728e14929d51b85b449b7f06e27c1145e38ce"
+  integrity sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==
 
 atob@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
-babel-eslint@10.1.0:
+b4a@^1.6.4:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.9.0.tgz#6336313b6e76b299c397afa68676ec6ebc788845"
+  integrity sha512-dpfcF9fDNR6++cthXR67iyhgqWy9CBouAvIWhIntzBG6cvK/cnIPiZQjBwi/ZqjjBEDGfoNDtmB0kTjroOJ3pQ==
+
+babel-eslint@^10.1.0:
   version "10.1.0"
-  resolved "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz#6968e568a910b78fb3779cdd8b6ac2f479943232"
   integrity sha512-ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg==
   dependencies:
     "@babel/code-frame" "^7.0.0"
@@ -523,178 +518,99 @@ babel-eslint@10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-bach@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/bach/-/bach-1.2.0.tgz"
-  integrity sha1-Szzpa/JxNPeaG0FKUcFONMO9mIA=
+bach@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/bach/-/bach-2.0.1.tgz#45a3a3cbf7dbba3132087185c60357482b988972"
+  integrity sha512-A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==
   dependencies:
-    arr-filter "^1.1.1"
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    array-each "^1.0.0"
-    array-initial "^1.0.0"
-    array-last "^1.1.1"
-    async-done "^1.2.2"
-    async-settle "^1.0.0"
-    now-and-later "^2.0.0"
+    async-done "^2.0.0"
+    async-settle "^2.0.0"
+    now-and-later "^3.0.0"
 
 balanced-match@^1.0.0:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
-base@^0.11.1:
-  version "0.11.2"
-  resolved "https://registry.npmjs.org/base/-/base-0.11.2.tgz"
-  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
-  dependencies:
-    cache-base "^1.0.1"
-    class-utils "^0.3.5"
-    component-emitter "^1.2.1"
-    define-property "^1.0.0"
-    isobject "^3.0.1"
-    mixin-deep "^1.2.0"
-    pascalcase "^0.1.1"
+bare-events@^2.7.0:
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.9.2.tgz#01d377b64c3c7167b28b52da7add3221aecf2d7f"
+  integrity sha512-AIPKioV7/Y/8KfZ3AAhjPJxLLbY49S64Ym5DakZlUg75qQiTgUq9hEJoEwa4eUezPUlXRy/i5NpsKvo9jgKmoA==
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
+base64-js@^1.3.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
+  integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
 
-binary-extensions@^1.0.0:
-  version "1.13.1"
-  resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz"
-  integrity sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==
+binary-extensions@^2.0.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.3.0.tgz#f6e14a97858d327252200242d4ccfe522c445522"
+  integrity sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==
 
 binaryextensions@^2.2.0:
   version "2.3.0"
-  resolved "https://registry.npmjs.org/binaryextensions/-/binaryextensions-2.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.3.0.tgz#1d269cbf7e6243ea886aa41453c3651ccbe13c22"
   integrity sha512-nAihlQsYGyc5Bwq6+EsubvANYGExeJKHDO3RjnvwU042fawQTQfM3Kxn7IHUXQOz4bzfwsGYYHGSvXyW4zOGLg==
 
-bindings@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df"
-  integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==
+bl@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-5.1.0.tgz#183715f678c7188ecef9fe475d90209400624273"
+  integrity sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==
   dependencies:
-    file-uri-to-path "1.0.0"
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^3.4.0"
 
 brace-expansion@^1.1.7:
-  version "1.1.11"
-  resolved "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"
-  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  version "1.1.21"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.21.tgz#edf4fab5c64d051aea5a8def49aba1c7522279f3"
+  integrity sha512-9zeA+KLZNNzglF2TPKRQEDyx6Yby7daAkuy8MiPzpXPsYDWi/DRM8jmwUDxokQjYqBpv5DgPiwD4h4ZZSy1Ujw==
   dependencies:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^2.3.1, braces@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz"
-  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
+braces@^3.0.3, braces@~3.0.2:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    arr-flatten "^1.1.0"
-    array-unique "^0.3.2"
-    extend-shallow "^2.0.1"
-    fill-range "^4.0.0"
-    isobject "^3.0.1"
-    repeat-element "^1.1.2"
-    snapdragon "^0.8.1"
-    snapdragon-node "^2.0.1"
-    split-string "^3.0.2"
-    to-regex "^3.0.1"
-
-braces@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
-  dependencies:
-    fill-range "^7.0.1"
-
-brotli-size@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/brotli-size/-/brotli-size-4.0.0.tgz"
-  integrity sha512-uA9fOtlTRC0iqKfzff1W34DXUA3GyVqbUaeo3Rw3d4gd1eavKVCETXrn3NzO74W+UVkG3UHu8WxUi+XvKI/huA==
-  dependencies:
-    duplexer "0.1.1"
-
-buffer-equal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.0.tgz"
-  integrity sha1-WWFrSYME1Var1GaWayLu2j7KX74=
+    fill-range "^7.1.1"
 
 buffer-from@^1.0.0:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-builtin-modules@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.2.0.tgz"
-  integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA==
-
-cache-base@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz"
-  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+buffer@^6.0.3:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-6.0.3.tgz#2ace578459cc8fbe2a70aaa8f52ee63b6a74c6c6"
+  integrity sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==
   dependencies:
-    collection-visit "^1.0.0"
-    component-emitter "^1.2.1"
-    get-value "^2.0.6"
-    has-value "^1.0.0"
-    isobject "^3.0.1"
-    set-value "^2.0.0"
-    to-object-path "^0.3.0"
-    union-value "^1.0.0"
-    unset-value "^1.0.0"
+    base64-js "^1.3.1"
+    ieee754 "^1.2.1"
 
-call-bind@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"
-  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
-  dependencies:
-    function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
 
 callsites@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camel-case@3.0.x:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz"
-  integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=
-  dependencies:
-    no-case "^2.2.0"
-    upper-case "^1.1.1"
-
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
-chalk@^1.0.0:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz"
-  integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
-  dependencies:
-    ansi-styles "^2.2.1"
-    escape-string-regexp "^1.0.2"
-    has-ansi "^2.0.0"
-    strip-ansi "^3.0.0"
-    supports-color "^2.0.0"
-
-chalk@^2.0.0, chalk@^2.1.0:
+chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.2:
   version "2.4.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.2:
   version "4.1.2"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
   integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
@@ -702,239 +618,156 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
 
 chardet@^0.7.0:
   version "0.7.0"
-  resolved "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz"
+  resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
   integrity sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==
 
-chokidar@^2.0.0:
-  version "2.1.8"
-  resolved "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz"
-  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+chokidar@^3.5.3:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.6.0.tgz#197c6cc669ef2a8dc5e7b4d97ee4e092c3eb0d5b"
+  integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
   dependencies:
-    anymatch "^2.0.0"
-    async-each "^1.0.1"
-    braces "^2.3.2"
-    glob-parent "^3.1.0"
-    inherits "^2.0.3"
-    is-binary-path "^1.0.0"
-    is-glob "^4.0.0"
-    normalize-path "^3.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.2.1"
-    upath "^1.1.1"
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "^1.2.7"
+    fsevents "~2.3.2"
 
-class-utils@^0.3.5:
-  version "0.3.6"
-  resolved "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz"
-  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
-  dependencies:
-    arr-union "^3.1.0"
-    define-property "^0.2.5"
-    isobject "^3.0.0"
-    static-extend "^0.1.1"
-
-clean-css@4.2.3, clean-css@4.2.x:
+clean-css@4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78"
   integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA==
   dependencies:
     source-map "~0.6.0"
 
 clean-stack@^2.0.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
   integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
 
 cli-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
   integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
   dependencies:
     restore-cursor "^3.1.0"
 
 cli-width@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"
-  integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wrap-ansi "^2.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
 
 clone-buffer@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz"
-  integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg=
-
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+  integrity sha512-KLLTJWrvwIP+OPfMn0x2PheDEP20RPUcGXj/ERegTgdmPEZylALQldygiqrPPu8P45uNuPs7ckmReLY6v/iA5g==
 
 clone-stats@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz"
-  integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+  integrity sha512-au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==
 
-clone@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-clone@^2.1.1:
+clone@^2.1.1, clone@^2.1.2:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz"
-  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==
 
 cloneable-readable@^1.0.0:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec"
   integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ==
   dependencies:
     inherits "^2.0.1"
     process-nextick-args "^2.0.0"
     readable-stream "^2.3.5"
 
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
-collection-map@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-map/-/collection-map-1.0.0.tgz"
-  integrity sha1-rqDwb40mx4DCt1SUOFVEsiVa8Yw=
-  dependencies:
-    arr-map "^2.0.2"
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-collection-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz"
-  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
-  dependencies:
-    map-visit "^1.0.0"
-    object-visit "^1.0.0"
-
 color-convert@^1.9.0:
   version "1.9.3"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
   dependencies:
     color-name "1.1.3"
 
 color-convert@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
   integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
   dependencies:
     color-name "~1.1.4"
 
 color-name@1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
-  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
 color-name@~1.1.4:
   version "1.1.4"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
 color-support@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-commander@2.17.x:
-  version "2.17.1"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz"
-  integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
-
 commander@^2.20.0:
   version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@~2.19.0:
-  version "2.19.0"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.19.0.tgz"
-  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
-
-component-emitter@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz"
-  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
-
 concat-map@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"
-  integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
 
-concat-stream@^1.6.0:
-  version "1.6.2"
-  resolved "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz"
-  integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
-  dependencies:
-    buffer-from "^1.0.0"
-    inherits "^2.0.3"
-    readable-stream "^2.2.2"
-    typedarray "^0.0.6"
-
-concat-with-sourcemaps@^1.0.0, concat-with-sourcemaps@^1.1.0:
+concat-with-sourcemaps@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e"
   integrity sha512-4gEjHJFT9e+2W/77h/DS5SGUgwDaOwprX8L/gl5+3ixnzkVJJsZWDSelmN3Oilw3LNDZjZV0yqH1hLG3k6nghg==
   dependencies:
     source-map "^0.6.1"
 
-convert-source-map@^1.5.0:
-  version "1.8.0"
-  resolved "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz"
-  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
-  dependencies:
-    safe-buffer "~5.1.1"
+convert-source-map@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-2.0.0.tgz#4b560f649fc4e918dd0ab75cf4961e8bc882d82a"
+  integrity sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==
 
-copy-anything@^2.0.1:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/copy-anything/-/copy-anything-2.0.6.tgz"
-  integrity sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==
+copy-anything@^3.0.5:
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/copy-anything/-/copy-anything-3.0.5.tgz#2d92dce8c498f790fa7ad16b01a1ae5a45b020a0"
+  integrity sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==
   dependencies:
-    is-what "^3.14.1"
+    is-what "^4.1.8"
 
-copy-descriptor@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz"
-  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
-
-copy-props@^2.0.1:
-  version "2.0.5"
-  resolved "https://registry.npmjs.org/copy-props/-/copy-props-2.0.5.tgz"
-  integrity sha512-XBlx8HSqrT0ObQwmSzM7WE5k8FxTV75h1DX1Z3n6NhQ/UYYAvInWYmG06vFt7hQZArE2fuO62aihiWIVQwh1sw==
+copy-props@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/copy-props/-/copy-props-4.0.0.tgz#01d249198b8c2e4d8a5e87b90c9630f52c99a9c9"
+  integrity sha512-bVWtw1wQLzzKiYROtvNlbJgxgBYt2bMJpkCbKmXM3xyijvcjjWXEk5nyrrT3bgJ7ODb19ZohE2T0Y3FgNPyoTw==
   dependencies:
-    each-props "^1.3.2"
+    each-props "^3.0.0"
     is-plain-object "^5.0.0"
 
-core-js@3.16.3:
-  version "3.16.3"
-  resolved "https://registry.npmjs.org/core-js/-/core-js-3.16.3.tgz"
-  integrity sha512-lM3GftxzHNtPNUJg0v4pC2RC6puwMd6VZA7vXUczi+SKmCWSf4JwO89VJGMqbzmB7jlK7B5hr3S64PqwFL49cA==
-
 core-util-is@~1.0.0:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85"
   integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==
 
 cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.6.tgz#30d0efa0712ddb7eb5a76e1e8721bffafa6b5d57"
+  integrity sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -943,9 +776,9 @@ cross-spawn@^6.0.5:
     which "^1.2.9"
 
 cross-spawn@^7.0.2:
-  version "7.0.3"
-  resolved "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
@@ -953,21 +786,21 @@ cross-spawn@^7.0.2:
 
 css-parse@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/css-parse/-/css-parse-2.0.0.tgz"
-  integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q=
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4"
+  integrity sha512-UNIFik2RgSbiTwIW1IsFwXWn6vs+bYdq83LKTSOsx7NJR7WII9dxewkHLltfTLVppoUApHV0118a4RZRI9FLwA==
   dependencies:
     css "^2.0.0"
 
 css-stringify@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/css-stringify/-/css-stringify-2.0.0.tgz"
-  integrity sha1-LvM9z0mMPT7oK9c9CgGsKGKM0Po=
+  resolved "https://registry.yarnpkg.com/css-stringify/-/css-stringify-2.0.0.tgz#2ef33dcf498c3d3ee82bd73d0a01ac28628cd0fa"
+  integrity sha512-ojAQfb3tnNEoNgZ3xhfJewI54h9n4QcTxAsaaaPGAnGe09PRrwU+D6aitH1NU6o0r94qiWBHHdoFpDVlRgDcew==
   dependencies:
     css "^2.0.0"
 
 css@^2.0.0:
   version "2.2.4"
-  resolved "https://registry.npmjs.org/css/-/css-2.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/css/-/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929"
   integrity sha512-oUnjmWpy0niI3x/mPL8dVEI1l7MnG3+HHyRPHf+YFSbK+svOhXpmSOcDURUh2aOCgl2grzrOPt1nHLuCVFULLw==
   dependencies:
     inherits "^2.0.3"
@@ -975,105 +808,46 @@ css@^2.0.0:
     source-map-resolve "^0.5.2"
     urix "^0.1.0"
 
-d@1, d@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/d/-/d-1.0.1.tgz"
-  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
-  dependencies:
-    es5-ext "^0.10.50"
-    type "^1.0.1"
-
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
-debug@^2.2.0, debug@^2.3.3:
+debug@2:
   version "2.6.9"
-  resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
 debug@^3.2.6:
   version "3.2.7"
-  resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
-  version "4.3.3"
-  resolved "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"
-  integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==
+debug@^4.0.1, debug@^4.1.1, debug@^4.3.1:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.3.tgz#c6ae432d9bd9662582fce08709b038c58e9e3d6a"
+  integrity sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==
   dependencies:
-    ms "2.1.2"
-
-decamelize@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"
-  integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
+    ms "^2.1.3"
 
 decode-uri-component@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"
-  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
 
 deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz"
+  resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.4.tgz#a6f2dce612fadd2ef1f519b73551f17e85199831"
   integrity sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==
 
 deepmerge@^4.2.2:
-  version "4.2.2"
-  resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz"
-  integrity sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==
-
-default-compare@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/default-compare/-/default-compare-1.0.0.tgz"
-  integrity sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==
-  dependencies:
-    kind-of "^5.0.2"
-
-default-resolution@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/default-resolution/-/default-resolution-2.0.0.tgz"
-  integrity sha1-vLgrqnKtebQmp2cy8aga1t8m1oQ=
-
-define-properties@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"
-  integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
-  dependencies:
-    object-keys "^1.0.12"
-
-define-property@^0.2.5:
-  version "0.2.5"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"
-  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
-  dependencies:
-    is-descriptor "^0.1.0"
-
-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"
-  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
-  dependencies:
-    is-descriptor "^1.0.0"
-
-define-property@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz"
-  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
-  dependencies:
-    is-descriptor "^1.0.2"
-    isobject "^3.0.1"
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
 
 del@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/del/-/del-6.0.0.tgz"
-  integrity sha512-1shh9DQ23L16oXSZKB2JxpL7iMy2E0S9d517ptA1P8iw0alkPtQcrKH7ru31rYtKwF499HkTu+DRzq3TCKDFRQ==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/del/-/del-6.1.1.tgz#3b70314f1ec0aa325c6b14eb36b95786671edb7a"
+  integrity sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==
   dependencies:
     globby "^11.0.1"
     graceful-fs "^4.2.4"
@@ -1086,145 +860,91 @@ del@^6.0.0:
 
 detect-file@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz"
-  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==
 
 dir-glob@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f"
   integrity sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==
   dependencies:
     path-type "^4.0.0"
 
 doctrine@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
   integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
   dependencies:
     esutils "^2.0.2"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
-  dependencies:
-    readable-stream "~1.1.9"
-
-duplexer@0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"
-  integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
-
-duplexer@^0.1.2:
+duplexer@^0.1.1:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6"
   integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==
 
-duplexify@^3.6.0:
-  version "3.7.1"
-  resolved "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz"
-  integrity sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==
+each-props@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/each-props/-/each-props-3.0.0.tgz#a88fb17634a4828307610ec68269fba2f7280cd8"
+  integrity sha512-IYf1hpuWrdzse/s/YJOrFmU15lyhSzxelNVAHTEG3DtP4QsLTWZUzcUL3HMXmKQxXpa4EIrBPpwRgj0aehdvAw==
   dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-each-props@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/each-props/-/each-props-1.3.2.tgz"
-  integrity sha512-vV0Hem3zAGkJAyU7JSjixeU66rwdynTAa1vofCrSA5fEln+m67Az9CcnkVD776/fsN/UjIWmBDoNRS6t6G9RfA==
-  dependencies:
-    is-plain-object "^2.0.1"
+    is-plain-object "^5.0.0"
     object.defaults "^1.1.0"
 
 emoji-regex@^7.0.1:
   version "7.0.3"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
 emoji-regex@^8.0.0:
   version "8.0.0"
-  resolved "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
   integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
 
-end-of-stream@^1.0.0, end-of-stream@^1.1.0:
-  version "1.4.4"
-  resolved "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"
-  integrity sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==
+end-of-stream@^1.4.4:
+  version "1.4.5"
+  resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
+  integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
   dependencies:
     once "^1.4.0"
 
 enquirer@^2.3.5:
-  version "2.3.6"
-  resolved "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"
-  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.4.1.tgz#93334b3fbd74fc7097b224ab4a8fb7e40bf4ae56"
+  integrity sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==
   dependencies:
     ansi-colors "^4.1.1"
+    strip-ansi "^6.0.1"
 
 errno@^0.1.1:
   version "0.1.8"
-  resolved "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz"
+  resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f"
   integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz"
-  integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
-  dependencies:
-    is-arrayish "^0.2.1"
+es-errors@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
+  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
 
-es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50:
-  version "0.10.53"
-  resolved "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz"
-  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
-  dependencies:
-    es6-iterator "~2.0.3"
-    es6-symbol "~3.1.3"
-    next-tick "~1.0.0"
+escalade@^3.1.1:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.2.0.tgz#011a3f69856ba189dffa7dc8fcce99d2a87903e5"
+  integrity sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==
 
-es6-iterator@^2.0.1, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz"
-  integrity sha1-p96IkUGgWpSwhUQDstCg+/qY87c=
-  dependencies:
-    d "1"
-    es5-ext "^0.10.35"
-    es6-symbol "^3.1.1"
-
-es6-symbol@^3.1.1, es6-symbol@~3.1.3:
-  version "3.1.3"
-  resolved "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.3.tgz"
-  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
-  dependencies:
-    d "^1.0.1"
-    ext "^1.1.2"
-
-es6-weak-map@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz"
-  integrity sha512-p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==
-  dependencies:
-    d "1"
-    es5-ext "^0.10.46"
-    es6-iterator "^2.0.3"
-    es6-symbol "^3.1.1"
-
-escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
+escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"
-  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
 
 escape-string-regexp@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
   integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
 
 eslint-scope@^5.0.0, eslint-scope@^5.1.1:
   version "5.1.1"
-  resolved "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
   dependencies:
     esrecurse "^4.3.0"
@@ -1232,31 +952,74 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1:
 
 eslint-utils@^1.4.3:
   version "1.4.3"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
   integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
 eslint-utils@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
   integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
 eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
   integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
 
 eslint-visitor-keys@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
   integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
 
-eslint@7.32.0:
+eslint@^6.0.0:
+  version "6.8.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb"
+  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.10.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.14"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.3"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+eslint@^7.32.0:
   version "7.32.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.32.0.tgz#c6d328a14be3fb08c8d1d21e12c02fdb7a2a812d"
   integrity sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==
   dependencies:
     "@babel/code-frame" "7.12.11"
@@ -1300,52 +1063,9 @@ eslint@7.32.0:
     text-table "^0.2.0"
     v8-compile-cache "^2.0.3"
 
-eslint@^6.0.0:
-  version "6.8.0"
-  resolved "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz"
-  integrity sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==
-  dependencies:
-    "@babel/code-frame" "^7.0.0"
-    ajv "^6.10.0"
-    chalk "^2.1.0"
-    cross-spawn "^6.0.5"
-    debug "^4.0.1"
-    doctrine "^3.0.0"
-    eslint-scope "^5.0.0"
-    eslint-utils "^1.4.3"
-    eslint-visitor-keys "^1.1.0"
-    espree "^6.1.2"
-    esquery "^1.0.1"
-    esutils "^2.0.2"
-    file-entry-cache "^5.0.1"
-    functional-red-black-tree "^1.0.1"
-    glob-parent "^5.0.0"
-    globals "^12.1.0"
-    ignore "^4.0.6"
-    import-fresh "^3.0.0"
-    imurmurhash "^0.1.4"
-    inquirer "^7.0.0"
-    is-glob "^4.0.0"
-    js-yaml "^3.13.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.14"
-    minimatch "^3.0.4"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.3"
-    progress "^2.0.0"
-    regexpp "^2.0.1"
-    semver "^6.1.2"
-    strip-ansi "^5.2.0"
-    strip-json-comments "^3.0.1"
-    table "^5.2.3"
-    text-table "^0.2.0"
-    v8-compile-cache "^2.0.3"
-
 espree@^6.1.2:
   version "6.2.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.2.1.tgz#77fc72e1fd744a2052c20f38a5b575832e82734a"
   integrity sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==
   dependencies:
     acorn "^7.1.1"
@@ -1354,7 +1074,7 @@ espree@^6.1.2:
 
 espree@^7.3.0, espree@^7.3.1:
   version "7.3.1"
-  resolved "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
   integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
   dependencies:
     acorn "^7.4.0"
@@ -1363,126 +1083,94 @@ espree@^7.3.0, espree@^7.3.1:
 
 esprima@^4.0.0:
   version "4.0.1"
-  resolved "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
 esquery@^1.0.1, esquery@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/esquery/-/esquery-1.4.0.tgz"
-  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.7.0.tgz#08d048f261f0ddedb5bae95f46809463d9c9496d"
+  integrity sha512-Ap6G0WQwcU/LHsvLwON1fAQX9Zp0A2Y6Y/cJBl9r/JbW90Zyg4/zbG6zzKa2OTALELarYHmKu0GhpM5EO+7T0g==
   dependencies:
     estraverse "^5.1.0"
 
 esrecurse@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
   integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
   dependencies:
     estraverse "^5.2.0"
 
 estraverse@^4.1.1:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
 estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.3.0"
-  resolved "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
   integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
 
-estree-walker@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-0.2.1.tgz"
-  integrity sha1-va/oCVOD2EFNXcLs9MkXO225QS4=
-
 estree-walker@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
   integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
 
 estree-walker@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
   integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
 
 esutils@^2.0.2:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
   integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
-expand-brackets@^2.1.4:
-  version "2.1.4"
-  resolved "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"
-  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+events-universal@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/events-universal/-/events-universal-1.0.1.tgz#b56a84fd611b6610e0a2d0f09f80fdf931e2dfe6"
+  integrity sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==
   dependencies:
-    debug "^2.3.3"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    posix-character-classes "^0.1.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
+    bare-events "^2.7.0"
 
 expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"
-  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==
   dependencies:
     homedir-polyfill "^1.0.1"
 
-ext@^1.1.2:
-  version "1.6.0"
-  resolved "https://registry.npmjs.org/ext/-/ext-1.6.0.tgz"
-  integrity sha512-sdBImtzkq2HpkdRLtlLWDa6w4DX22ijZLKx8BMPUuKe1c5lbN6xwQDQCxSfxBQnHZ13ls/FH0MQZx/q/gr6FQg==
+extend-shallow@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
+  integrity sha512-L7AGmkO6jhDkEBBGWlLtftA80Xq8DipnrRPr0pyi7GQLXkaq9JYA4xF4z6qnadIC6euiTDKco0cGSU9muw+WTw==
   dependencies:
-    type "^2.5.0"
+    kind-of "^1.1.0"
 
-extend-shallow@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"
-  integrity sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=
-  dependencies:
-    is-extendable "^0.1.0"
-
-extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+extend-shallow@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"
-  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==
   dependencies:
     assign-symbols "^1.0.0"
     is-extendable "^1.0.1"
 
-extend@^3.0.0:
+extend@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
 
 external-editor@^3.0.3:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
   integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
   dependencies:
     chardet "^0.7.0"
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
-extglob@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz"
-  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
-  dependencies:
-    array-unique "^0.3.2"
-    define-property "^1.0.0"
-    expand-brackets "^2.1.4"
-    extend-shallow "^2.0.1"
-    fragment-cache "^0.2.1"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
-fancy-log@^1.1.0, fancy-log@^1.3.2, fancy-log@^1.3.3:
+fancy-log@^1.3.2, fancy-log@^1.3.3:
   version "1.3.3"
-  resolved "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz"
+  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
   integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
   dependencies:
     ansi-gray "^0.1.1"
@@ -1492,137 +1180,116 @@ fancy-log@^1.1.0, fancy-log@^1.3.2, fancy-log@^1.3.3:
 
 fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
-  resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
+fast-fifo@^1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
+  integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
+
 fast-glob@^3.2.9:
-  version "3.2.11"
-  resolved "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"
-  integrity sha512-xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew==
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.3.tgz#d06d585ce8dba90a16b0505c543c3ccfb3aeb818"
+  integrity sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
     glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.4"
+    micromatch "^4.0.8"
 
 fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@^1.0.0:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"
-  integrity sha1-5qdUzI8V5YmHqpy9J69m/W9OWvk=
-
 fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
-  resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"
-  integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
+  integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
-fastq@^1.6.0:
-  version "1.13.0"
-  resolved "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz"
-  integrity sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==
+fast-levenshtein@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-3.0.0.tgz#37b899ae47e1090e40e3fd2318e4d5f0142ca912"
+  integrity sha512-hKKNajm46uNmTlhHSyZkmToAc56uZJwYq7yrciZjqOxnlfQwERDQJmHPUp7m1m9wx8vgOe8IaCKZ5Kv2k1DdCQ==
+  dependencies:
+    fastest-levenshtein "^1.0.7"
+
+fast-uri@^3.0.1:
+  version "3.1.9"
+  resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.1.9.tgz#f1deba822b1d6ac79da2f860e872a63470cff203"
+  integrity sha512-hS/0Wt3Ya043oKXs0sIxrMpKQITXhMLIrVAKKXi4gozGC9v7YRWVnXIZzjNPTO02M9BdxLCWqK1yRXgNziVyJQ==
+
+fastest-levenshtein@^1.0.7:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
+fastq@^1.13.0, fastq@^1.6.0:
+  version "1.20.3"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.20.3.tgz#7ab8731e647b56abcfeee997dae333ca3ee1d04d"
+  integrity sha512-XKv5nnLs6nLF71NgiKJLIZFLkPyIEuOselLG7ujZnGrRfQK8HpvY+WqKhAJUAdLomwVHErVS4LfxFlPq0/FTAw==
   dependencies:
     reusify "^1.0.4"
 
 figures@^3.0.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af"
   integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==
   dependencies:
     escape-string-regexp "^1.0.5"
 
 file-entry-cache@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
   integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
   dependencies:
     flat-cache "^2.0.1"
 
 file-entry-cache@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
   integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
   dependencies:
     flat-cache "^3.0.4"
 
-file-uri-to-path@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
-  integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==
-
-fill-range@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"
-  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-    to-regex-range "^2.1.0"
-
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
+findup-sync@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-5.0.0.tgz#54380ad965a7edca00cc8f63113559aadc541bd2"
+  integrity sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==
   dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
+    detect-file "^1.0.0"
+    is-glob "^4.0.3"
+    micromatch "^4.0.4"
+    resolve-dir "^1.0.1"
 
-findup-sync@^2.0.0:
+fined@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz"
-  integrity sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^3.1.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-findup-sync@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz"
-  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
-  dependencies:
-    detect-file "^1.0.0"
-    is-glob "^4.0.0"
-    micromatch "^3.0.4"
-    resolve-dir "^1.0.1"
-
-fined@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/fined/-/fined-1.2.0.tgz"
-  integrity sha512-ZYDqPLGxDkDhDZBjZBb+oD1+j0rA4E0pXY50eplAAOPg2N/gUBSSk5IM1/QhPfyVo19lJ+CvXpqfvk+b2p/8Ng==
+  resolved "https://registry.yarnpkg.com/fined/-/fined-2.0.0.tgz#6846563ed96879ce6de6c85c715c42250f8d8089"
+  integrity sha512-OFRzsL6ZMHz5s0JrsEr+TpdGNCtrVtnuG3x1yzGNiQHT0yaDnXAj8V/lWcpJVrnoDpcwXcASxAZYbuXda2Y82A==
   dependencies:
     expand-tilde "^2.0.2"
-    is-plain-object "^2.0.3"
+    is-plain-object "^5.0.0"
     object.defaults "^1.1.0"
-    object.pick "^1.2.0"
-    parse-filepath "^1.0.1"
+    object.pick "^1.3.0"
+    parse-filepath "^1.0.2"
 
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-flagged-respawn@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/flagged-respawn/-/flagged-respawn-1.0.1.tgz"
-  integrity sha512-lNaHNVymajmk0OJMBn8fVUAU1BtDeKIqKoVhk4xAALB57aALg6b4W0MfJ/cUE0g9YBXy5XhSlPIpYIJ7HaY/3Q==
+flagged-respawn@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-2.0.0.tgz#abf39719dcfe1ac06c86c9466081c541c682987b"
+  integrity sha512-Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==
 
 flat-cache@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
   integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
   dependencies:
     flatted "^2.0.0"
@@ -1630,169 +1297,120 @@ flat-cache@^2.0.1:
     write "1.0.3"
 
 flat-cache@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz"
-  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.2.0.tgz#2c0c2d5040c99b1632771a9d105725c0115363ee"
+  integrity sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==
   dependencies:
-    flatted "^3.1.0"
+    flatted "^3.2.9"
+    keyv "^4.5.3"
     rimraf "^3.0.2"
 
 flatted@^2.0.0:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flatted@^3.1.0:
-  version "3.2.5"
-  resolved "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"
-  integrity sha512-WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg==
+flatted@^3.2.9:
+  version "3.4.4"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.4.tgz#aeeca2a506303f0cee61c59e6c9f2a88d2f29fc6"
+  integrity sha512-5+ybhBZANEJxaH3X5evAFatUxLfEHSr7n6kYJ+1Qd0mUqr4eu9gIf6GDbWHf8RJijHrjjO8G+la14SlL2SeS1Q==
 
-flush-write-stream@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz"
-  integrity sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^2.3.6"
-
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"
-  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
+  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
+  integrity sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==
 
 for-own@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz"
-  integrity sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=
+  resolved "https://registry.yarnpkg.com/for-own/-/for-own-1.0.0.tgz#c63332f415cedc4b04dbfe70cf836494c53cb44b"
+  integrity sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==
   dependencies:
     for-in "^1.0.1"
 
-fragment-cache@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"
-  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+fs-mkdirp-stream@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz#1e82575c4023929ad35cf69269f84f1a8c973aa7"
+  integrity sha512-UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==
   dependencies:
-    map-cache "^0.2.2"
-
-fs-mkdirp-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-1.0.0.tgz"
-  integrity sha1-C3gV/DIBxqaeFNuYzgmMFpNSWes=
-  dependencies:
-    graceful-fs "^4.1.11"
-    through2 "^2.0.3"
+    graceful-fs "^4.2.8"
+    streamx "^2.12.0"
 
 fs.realpath@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
-  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
-
-fs@^0.0.1-security:
-  version "0.0.1-security"
-  resolved "https://registry.npmjs.org/fs/-/fs-0.0.1-security.tgz"
-  integrity sha1-invTcYa23d84E/I4WLV+yq9eQdQ=
-
-fsevents@^1.2.7:
-  version "1.2.13"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38"
-  integrity sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==
-  dependencies:
-    bindings "^1.5.0"
-    nan "^2.12.1"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
 fsevents@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
-  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
 
-function-bind@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"
-  integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
 
 functional-red-black-tree@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"
-  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g==
 
-get-caller-file@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz"
-  integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.0.2:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"
-  integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
-  dependencies:
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-
-get-value@^2.0.3, get-value@^2.0.6:
-  version "2.0.6"
-  resolved "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"
-  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
-
-glob-parent@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"
-  integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
-  dependencies:
-    is-glob "^3.1.0"
-    path-dirname "^1.0.0"
-
-glob-parent@^5.0.0, glob-parent@^5.1.2:
+glob-parent@^5.0.0, glob-parent@^5.1.2, glob-parent@~5.1.2:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
   integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
   dependencies:
     is-glob "^4.0.1"
 
-glob-stream@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/glob-stream/-/glob-stream-6.1.0.tgz"
-  integrity sha1-cEXJlBOz65SIjYOrRtC0BMx73eQ=
+glob-parent@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3"
+  integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==
   dependencies:
-    extend "^3.0.0"
-    glob "^7.1.1"
-    glob-parent "^3.1.0"
-    is-negated-glob "^1.0.0"
-    ordered-read-streams "^1.0.0"
-    pumpify "^1.3.5"
-    readable-stream "^2.1.5"
-    remove-trailing-separator "^1.0.1"
-    to-absolute-glob "^2.0.0"
-    unique-stream "^2.0.2"
+    is-glob "^4.0.3"
 
-glob-watcher@^5.0.3:
-  version "5.0.5"
-  resolved "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz"
-  integrity sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==
+glob-stream@^8.0.3:
+  version "8.0.4"
+  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-8.0.4.tgz#32f8c8c07903f755e4946c05cc3ca8e2a10f04b3"
+  integrity sha512-7uzFVQ1ZUBr0nYexxubOvocZXQ4HcHv6WO3TOiYUPaCda7BASuKgOw/NB4Pc9gHM3tK0Jrekq7el8pKhb8kx5w==
   dependencies:
-    anymatch "^2.0.0"
-    async-done "^1.2.0"
-    chokidar "^2.0.0"
+    "@gulpjs/to-absolute-glob" "^4.0.0"
+    anymatch "^3.1.3"
+    fastq "^1.13.0"
+    glob-parent "^6.0.2"
+    is-glob "^4.0.3"
     is-negated-glob "^1.0.0"
-    just-debounce "^1.0.0"
     normalize-path "^3.0.0"
-    object.defaults "^1.1.0"
+    streamx "^2.12.5"
 
-glob@^7.1.1, glob@^7.1.3:
-  version "7.2.0"
-  resolved "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"
-  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+glob-watcher@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/glob-watcher/-/glob-watcher-6.0.0.tgz#8565341978a92233fb3881b8857b4d1e9c6bf080"
+  integrity sha512-wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==
+  dependencies:
+    async-done "^2.0.0"
+    chokidar "^3.5.3"
+
+glob@^7.1.3:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
     inherits "2"
-    minimatch "^3.0.4"
+    minimatch "^3.1.1"
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
 global-modules@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
   integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
   dependencies:
     global-prefix "^1.0.1"
@@ -1801,8 +1419,8 @@ global-modules@^1.0.0:
 
 global-prefix@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"
-  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==
   dependencies:
     expand-tilde "^2.0.2"
     homedir-polyfill "^1.0.1"
@@ -1810,28 +1428,23 @@ global-prefix@^1.0.1:
     is-windows "^1.0.1"
     which "^1.2.14"
 
-globals@^11.1.0:
-  version "11.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz"
-  integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
-
 globals@^12.1.0:
   version "12.4.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8"
   integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==
   dependencies:
     type-fest "^0.8.1"
 
 globals@^13.6.0, globals@^13.9.0:
-  version "13.12.0"
-  resolved "https://registry.npmjs.org/globals/-/globals-13.12.0.tgz"
-  integrity sha512-uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg==
+  version "13.24.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.24.0.tgz#8432a19d78ce0c1e833949c36adb345400bb1171"
+  integrity sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==
   dependencies:
     type-fest "^0.20.2"
 
 globby@^11.0.1:
   version "11.1.0"
-  resolved "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b"
   integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==
   dependencies:
     array-union "^2.1.0"
@@ -1841,37 +1454,46 @@ globby@^11.0.1:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
+glogg@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/glogg/-/glogg-2.2.0.tgz#956ceb855a05a2aa1fa668d748f2be8e7361c11c"
+  integrity sha512-eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==
   dependencies:
-    sparkles "^1.0.0"
+    sparkles "^2.1.0"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.4:
-  version "4.2.9"
-  resolved "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"
-  integrity sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==
+graceful-fs@^4.1.2, graceful-fs@^4.2.10, graceful-fs@^4.2.11, graceful-fs@^4.2.4, graceful-fs@^4.2.8:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
 
 group-css-media-queries@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz"
-  integrity sha1-jlTLMcxFqcXgjrg4lAuKKAONcXU=
+  resolved "https://registry.yarnpkg.com/group-css-media-queries/-/group-css-media-queries-1.4.1.tgz#8e54cb31cc45a9c5e08eb838940b8a28038d7175"
+  integrity sha512-i7GUeETF5bLjrVZCrz1ZwtJdfi3XnPe6UWgTufKDuetBi4V1HDfvY1La5DAqeJzBqOz6DXipRqtK5UYeYzCNpA==
   dependencies:
     css-parse "^2.0.0"
     css-stringify "^2.0.0"
 
-gulp-cached@1.1.1:
+gulp-append-prepend@^1.0.9:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/gulp-append-prepend/-/gulp-append-prepend-1.0.9.tgz#e2732a36b2019356718966013e681c8ba57d3675"
+  integrity sha512-IUHAd9NHNpQWj0dA8GTEkgUlrgEhTZVe5T6AuEAAMlMSIMdxDZlCQj7zSKDL69nMJpsvgtgosAG4+n6zlhv27Q==
+  dependencies:
+    plugin-error "^1.0.1"
+    read-file "^0.2.0"
+    through2 "^2.0.1"
+
+gulp-cached@^1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/gulp-cached/-/gulp-cached-1.1.1.tgz"
-  integrity sha1-/nzU+H83YB5gc8/t7lwr2vi2rM4=
+  resolved "https://registry.yarnpkg.com/gulp-cached/-/gulp-cached-1.1.1.tgz#fe7cd4f87f37601e6073cfedee5c2bdaf8b6acce"
+  integrity sha512-OEGsICR6Vmx0VK3nhpy5MGPzAjeDYC3+NKxNtJAu4DW8L15oy8tCe2WuD6HDEj9BsbSopnOBiXPK95YHvO0DpA==
   dependencies:
     lodash.defaults "^4.2.0"
     through2 "^2.0.1"
 
-gulp-clean-css@4.3.0:
+gulp-clean-css@^4.3.0:
   version "4.3.0"
-  resolved "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-clean-css/-/gulp-clean-css-4.3.0.tgz#5b1e73f2fca46703eb636014cdd4553cea65146d"
   integrity sha512-mGyeT3qqFXTy61j0zOIciS4MkYziF2U594t2Vs9rUnpkEHqfu6aDITMp8xOvZcvdX61Uz3y1mVERRYmjzQF5fg==
   dependencies:
     clean-css "4.2.3"
@@ -1879,59 +1501,53 @@ gulp-clean-css@4.3.0:
     through2 "3.0.1"
     vinyl-sourcemaps-apply "0.2.1"
 
-gulp-cli@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz"
-  integrity sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==
+gulp-cli@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-cli/-/gulp-cli-3.1.0.tgz#92590e9b209142b176c95ad5c7066d2592017268"
+  integrity sha512-zZzwlmEsTfXcxRKiCHsdyjZZnFvXWM4v1NqBJSYbuApkvVKivjcmOS2qruAJ+PkEHLFavcDKH40DPc1+t12a9Q==
   dependencies:
-    ansi-colors "^1.0.1"
-    archy "^1.0.0"
-    array-sort "^1.0.0"
-    color-support "^1.1.3"
-    concat-stream "^1.6.0"
-    copy-props "^2.0.1"
-    fancy-log "^1.3.2"
-    gulplog "^1.0.0"
-    interpret "^1.4.0"
-    isobject "^3.0.1"
-    liftoff "^3.1.0"
-    matchdep "^2.0.0"
-    mute-stdout "^1.0.0"
-    pretty-hrtime "^1.0.0"
-    replace-homedir "^1.0.0"
-    semver-greatest-satisfied-range "^1.1.0"
-    v8flags "^3.2.0"
-    yargs "^7.1.0"
+    "@gulpjs/messages" "^1.1.0"
+    chalk "^4.1.2"
+    copy-props "^4.0.0"
+    gulplog "^2.2.0"
+    interpret "^3.1.1"
+    liftoff "^5.0.1"
+    mute-stdout "^2.0.0"
+    replace-homedir "^2.0.0"
+    semver-greatest-satisfied-range "^2.0.0"
+    string-width "^4.2.3"
+    v8flags "^4.0.0"
+    yargs "^16.2.0"
 
 gulp-concat@^2.6.1:
   version "2.6.1"
-  resolved "https://registry.npmjs.org/gulp-concat/-/gulp-concat-2.6.1.tgz"
-  integrity sha1-Yz0WyV2IUEYorQJmVmPO5aR5M1M=
+  resolved "https://registry.yarnpkg.com/gulp-concat/-/gulp-concat-2.6.1.tgz#633d16c95d88504628ad02665663cee5a4793353"
+  integrity sha512-a2scActrQrDBpBbR3WUZGyGS1JEPLg5PZJdIa7/Bi3GuKAmPYDK6SFhy/NZq5R8KsKKFvtfR0fakbUCcKGCCjg==
   dependencies:
     concat-with-sourcemaps "^1.0.0"
     through2 "^2.0.0"
     vinyl "^2.0.0"
 
-gulp-eol@0.2.0:
+gulp-eol@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/gulp-eol/-/gulp-eol-0.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-eol/-/gulp-eol-0.2.0.tgz#f0afe3bbffedbe9d191a76ac2dfbfa2167e9d33e"
   integrity sha512-YaUQld+7A3h1iOHs7XTdEboYUg8GjA+3DmWtgvZ9sb1r0tDpB27cTtgaoD83oTm9Mp2Hmwge6AQMqPxwUjQ/xA==
   dependencies:
     plugin-error "~1.0"
     through2 "~0.4"
 
-gulp-eslint@6.0.0:
+gulp-eslint@^6.0.0:
   version "6.0.0"
-  resolved "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-6.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-eslint/-/gulp-eslint-6.0.0.tgz#7d402bb45f8a67652b868277011812057370a832"
   integrity sha512-dCVPSh1sA+UVhn7JSQt7KEb4An2sQNbOdB3PA8UCfxsoPlAKjJHxYHGXdXC7eb+V1FAnilSFFqslPrq037l1ig==
   dependencies:
     eslint "^6.0.0"
     fancy-log "^1.3.2"
     plugin-error "^1.0.1"
 
-gulp-expect-file@2.0.0:
+gulp-expect-file@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/gulp-expect-file/-/gulp-expect-file-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-expect-file/-/gulp-expect-file-2.0.0.tgz#4715365d9e2ca12d40d06dda0b227251e3e055f2"
   integrity sha512-VLBvmSoF85dQ71tQngx1GfAcJ0s9g50dcjrlX4eyZbF9sAEoGU8F04JtXXU6rBcGDAHXUs4+n1HUs0lgHKyW1Q==
   dependencies:
     ansi-colors "^4.1.1"
@@ -1942,38 +1558,27 @@ gulp-expect-file@2.0.0:
     through2 "^4.0.2"
     vinyl "^2.2.1"
 
-gulp-filter@7.0.0:
-  version "7.0.0"
-  resolved "https://registry.npmjs.org/gulp-filter/-/gulp-filter-7.0.0.tgz"
-  integrity sha512-ZGWtJo0j1mHfP77tVuhyqem4MRA5NfNRjoVe6VAkLGeQQ/QGo2VsFwp7zfPTGDsd1rwzBmoDHhxpE6f5B3Zuaw==
+gulp-filter@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-filter/-/gulp-filter-6.0.0.tgz#9d69a408f1a9f60534264fb14464841f1b1746c2"
+  integrity sha512-veQFW93kf6jBdWdF/RxMEIlDK2mkjHyPftM381DID2C9ImTVngwYpyyThxm4/EpgcNOT37BLefzMOjEKbyYg0Q==
   dependencies:
-    multimatch "^5.0.0"
+    multimatch "^4.0.0"
     plugin-error "^1.0.1"
     streamfilter "^3.0.0"
-    to-absolute-glob "^2.0.2"
 
 gulp-group-css-media-queries@^1.2.2:
   version "1.2.2"
-  resolved "https://registry.npmjs.org/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-group-css-media-queries/-/gulp-group-css-media-queries-1.2.2.tgz#c0436b9474086cbe1ab3eb5bc1a3afef4d6b37d6"
   integrity sha512-uOs8aJ5TV12aRstfc6pn107edDT2XSY7KNAU721Dz+gKHu/AUIlAaOdFdo9n/eHWqfb9QWMArrM8fiPOCqZPGg==
   dependencies:
     group-css-media-queries "^1.4.1"
     plugin-error "^1.0.1"
     through2 "^2.0.3"
 
-gulp-header@2.0.9:
-  version "2.0.9"
-  resolved "https://registry.npmjs.org/gulp-header/-/gulp-header-2.0.9.tgz"
-  integrity sha512-LMGiBx+qH8giwrOuuZXSGvswcIUh0OiioNkUpLhNyvaC6/Ga8X6cfAeme2L5PqsbXMhL8o8b/OmVqIQdxprhcQ==
-  dependencies:
-    concat-with-sourcemaps "^1.1.0"
-    lodash.template "^4.5.0"
-    map-stream "0.0.7"
-    through2 "^2.0.0"
-
-gulp-less@5.0.0:
+gulp-less@^5.0.0:
   version "5.0.0"
-  resolved "https://registry.npmjs.org/gulp-less/-/gulp-less-5.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-less/-/gulp-less-5.0.0.tgz#edafce75e9202fd62c9f653fb57b8d0d9fd731e5"
   integrity sha512-W2I3TewO/By6UZsM/wJG3pyK5M6J0NYmJAAhwYXQHR+38S0iDtZasmUgFCH3CQj+pQYw/PAIzxvFvwtEXz1HhQ==
   dependencies:
     less "^3.7.1 || ^4.0.0"
@@ -1983,17 +1588,17 @@ gulp-less@5.0.0:
     through2 "^4.0.0"
     vinyl-sourcemaps-apply "^0.2.0"
 
-gulp-rename@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/gulp-rename/-/gulp-rename-2.0.0.tgz"
-  integrity sha512-97Vba4KBzbYmR5VBs9mWmK+HwIf5mj+/zioxfZhOKeXtx5ZjBk57KFlePf5nxq9QsTtFl0ejnHE3zTC9MHXqyQ==
+gulp-rename@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-2.1.0.tgz#3a9900f81f3a8338409ea5ea542affc25080d9f4"
+  integrity sha512-dGuzuH8jQGqCMqC544IEPhs5+O2l+IkdoSZsgd4kY97M1CxQeI3qrmweQBIrxLBbjbe/8uEWK8HHcNBc3OCy4g==
 
-gulp-replace@1.1.3:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/gulp-replace/-/gulp-replace-1.1.3.tgz"
-  integrity sha512-HcPHpWY4XdF8zxYkDODHnG2+7a3nD/Y8Mfu3aBgMiCFDW3X2GiOKXllsAmILcxe3KZT2BXoN18WrpEFm48KfLQ==
+gulp-replace@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/gulp-replace/-/gulp-replace-1.1.4.tgz#06a0e9ee36f30e343c1e0a2dd760ec32c8a3d3b2"
+  integrity sha512-SVSF7ikuWKhpAW4l4wapAqPPSToJoiNKsbDoUnRrSgwZHH7lH8pbPeQj1aOVYQrbZKhfSVBxVW+Py7vtulRktw==
   dependencies:
-    "@types/node" "^14.14.41"
+    "@types/node" "*"
     "@types/vinyl" "^2.0.4"
     istextorbinary "^3.0.0"
     replacestream "^4.0.3"
@@ -2001,7 +1606,7 @@ gulp-replace@1.1.3:
 
 gulp-rollup-2@^1.2.1:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/gulp-rollup-2/-/gulp-rollup-2-1.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/gulp-rollup-2/-/gulp-rollup-2-1.3.1.tgz#bbe1a8725ccaa4fc270627b298d1072d960fbe0c"
   integrity sha512-sKkHsbhmcFBorQ3AHUME8Kifj3Ud7d6BwUMntCigolJQxzbXH8Ja688WRc3dolSlcp31cIWTtJf9r+090gC+Ew==
   dependencies:
     njfs "^1.2.5"
@@ -2011,248 +1616,146 @@ gulp-rollup-2@^1.2.1:
     vinyl "^2.2.1"
     vinyl-sourcemaps-apply "^0.2.1"
 
-gulp-size@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/gulp-size/-/gulp-size-4.0.1.tgz"
-  integrity sha512-yNf5uGUKe2YAMZwHDFgnkp2o9fLp3WLUMZ+Gd23IIbav0TAVsr5Ek6So8gwjlSimPwR2p05Gg7zsjASYXZtt3g==
+gulp-size@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/gulp-size/-/gulp-size-3.0.0.tgz#cb1ac8e6ba83dede52430c47fd039324f003ff82"
+  integrity sha512-FbTYVVjp0Fcx19M7s/e84Kp35rrbRZLAfLR6XUM9Z04/uxv089vbcN9CwaSmC2tI+awfVx2xfiRcIlnmsxyQBg==
   dependencies:
-    brotli-size "^4.0.0"
-    chalk "^4.1.1"
-    fancy-log "^1.3.3"
-    gzip-size "^6.0.0"
-    plugin-error "^1.0.1"
-    pretty-bytes "^5.6.0"
+    chalk "^2.3.0"
+    fancy-log "^1.3.2"
+    gzip-size "^4.1.0"
+    plugin-error "^0.1.2"
+    pretty-bytes "^4.0.2"
     stream-counter "^1.0.0"
-    through2 "^4.0.2"
+    through2 "^2.0.0"
 
-gulp-stripbom@1.0.5:
-  version "1.0.5"
-  resolved "https://registry.npmjs.org/gulp-stripbom/-/gulp-stripbom-1.0.5.tgz"
-  integrity sha512-0mThhGKerVFgXVPM6BSlleXym+K0Txkzx+CMaOmpMjScm1UZ4FIvuQiAQme0oYm3lhMwrbDQkiDtYbuve64l0Q==
-  dependencies:
-    ansi-colors "^4.1.1"
-    fancy-log "^1.3.3"
-    log-symbols "^1.0.0"
-    plugin-error "^1.0.1"
-    strip-bom "^1.0.0"
-    through2 "^0.5.1"
-
-gulp-terser@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/gulp-terser/-/gulp-terser-2.0.1.tgz"
-  integrity sha512-XCrnCXP8ovNpgLK9McJIXlgm0j3W2TsiWu7K9y3m+Sn5XZgUzi6U8MPHtS3NdLMic9poCj695N0ARJ2B6atypw==
+gulp-terser@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/gulp-terser/-/gulp-terser-2.1.0.tgz#149b693a1adbde922807b60b844bb7351dafbde1"
+  integrity sha512-lQ3+JUdHDVISAlUIUSZ/G9Dz/rBQHxOiYDQ70IVWFQeh4b33TC1MCIU+K18w07PS3rq/CVc34aQO4SUbdaNMPQ==
   dependencies:
     plugin-error "^1.0.1"
-    terser "5.4.0"
+    terser "^5.9.0"
     through2 "^4.0.2"
     vinyl-sourcemaps-apply "^0.2.1"
 
-gulp-util@3.0.8:
-  version "3.0.8"
-  resolved "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
+gulp@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/gulp/-/gulp-5.0.1.tgz#c43f37aa34569e101fb6da4e0b464677305acd36"
+  integrity sha512-PErok3DZSA5WGMd6XXV3IRNO0mlB+wW3OzhFJLEec1jSERg2j1bxJ6e5Fh6N6fn3FH2T9AP4UYNb/pYlADB9sA==
   dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
+    glob-watcher "^6.0.0"
+    gulp-cli "^3.1.0"
+    undertaker "^2.0.0"
+    vinyl-fs "^4.0.2"
 
-gulp@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz"
-  integrity sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==
+gulplog@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-2.2.0.tgz#71adf43ea5cd07c23ded0fb8af4a844b67c63be8"
+  integrity sha512-V2FaKiOhpR3DRXZuYdRLn/qiY0yI5XmqbTKrYbdemJ+xOh2d2MOweI/XFgMzd/9+1twdvMwllnZbWZNJ+BOm4A==
   dependencies:
-    glob-watcher "^5.0.3"
-    gulp-cli "^2.2.0"
-    undertaker "^1.2.1"
-    vinyl-fs "^3.0.0"
+    glogg "^2.2.0"
 
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
+gzip-size@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-4.1.0.tgz#8ae096257eabe7d69c45be2b67c448124ffb517c"
+  integrity sha512-1g6EPVvIHuPmpAdBBpsIVYLgjzGV/QqcFRJXpMyrqEWG10JhOaTjQeCcjMDyX0Iqfm/Q5M9twR/mbDk5f5MqkA==
   dependencies:
-    glogg "^1.0.0"
-
-gzip-size@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz"
-  integrity sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==
-  dependencies:
-    duplexer "^0.1.2"
-
-has-ansi@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"
-  integrity sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=
-  dependencies:
-    ansi-regex "^2.0.0"
+    duplexer "^0.1.1"
+    pify "^3.0.0"
 
 has-flag@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"
-  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
 
 has-flag@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
+hasown@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.4.tgz#8c62d8cb90beb2aad5d0a5b67581ad9854c3f003"
+  integrity sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==
   dependencies:
-    sparkles "^1.0.0"
-
-has-symbols@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"
-  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
-
-has-value@^0.3.1:
-  version "0.3.1"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"
-  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
-  dependencies:
-    get-value "^2.0.3"
-    has-values "^0.1.4"
-    isobject "^2.0.0"
-
-has-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"
-  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
-  dependencies:
-    get-value "^2.0.6"
-    has-values "^1.0.0"
-    isobject "^3.0.0"
-
-has-values@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"
-  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
-
-has-values@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"
-  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
-  dependencies:
-    is-number "^3.0.0"
-    kind-of "^4.0.0"
-
-has@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz"
-  integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
-  dependencies:
-    function-bind "^1.1.1"
-
-he@1.2.x:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/he/-/he-1.2.0.tgz"
-  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+    function-bind "^1.1.2"
 
 homedir-polyfill@^1.0.1:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz#743298cef4e5af3e194161fbadcc2151d3a058e8"
   integrity sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==
   dependencies:
     parse-passwd "^1.0.0"
 
-hosted-git-info@^2.1.4:
-  version "2.8.9"
-  resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz"
-  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
-
-html-minifier@^3.0.2:
-  version "3.5.21"
-  resolved "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.21.tgz"
-  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
-  dependencies:
-    camel-case "3.0.x"
-    clean-css "4.2.x"
-    commander "2.17.x"
-    he "1.2.x"
-    param-case "2.1.x"
-    relateurl "0.2.x"
-    uglify-js "3.4.x"
-
 iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+iconv-lite@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+ieee754@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore@^4.0.6:
   version "4.0.6"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
   integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
 
 ignore@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz"
-  integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ==
-
-image-size@~0.5.0:
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz"
-  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^3.0.0, import-fresh@^3.2.1:
-  version "3.3.0"
-  resolved "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz"
-  integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.1.tgz#9cecb56503c0ada1f2741dbbd6546e4b13b57ccf"
+  integrity sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==
   dependencies:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
 imurmurhash@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"
-  integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
+  resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
+  integrity sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==
 
 indent-string@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
   integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
 
 inflight@^1.0.4:
   version "1.0.6"
-  resolved "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"
-  integrity sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
   dependencies:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@^2.0.3, inherits@^2.0.4, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
   integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
 
 ini@^1.3.4:
   version "1.3.8"
-  resolved "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz"
+  resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.8.tgz#a29da425b48806f34767a4efce397269af28432c"
   integrity sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==
 
 inquirer@^7.0.0:
   version "7.3.3"
-  resolved "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz#04d176b2af04afc157a83fd7c100e98ee0aad003"
   integrity sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==
   dependencies:
     ansi-escapes "^4.2.1"
@@ -2269,715 +1772,368 @@ inquirer@^7.0.0:
     strip-ansi "^6.0.0"
     through "^2.3.6"
 
-interpret@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/interpret/-/interpret-1.4.0.tgz"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
-invert-kv@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"
-  integrity sha1-EEqOSqym09jNFXqO+L+rLXo//bY=
+interpret@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-3.1.1.tgz#5be0ceed67ca79c6c4bc5cf0d7ee843dcea110c4"
+  integrity sha512-6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==
 
 is-absolute@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
   integrity sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==
   dependencies:
     is-relative "^1.0.0"
     is-windows "^1.0.1"
 
-is-accessor-descriptor@^0.1.6:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"
-  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
   dependencies:
-    kind-of "^3.0.2"
+    binary-extensions "^2.0.0"
 
-is-accessor-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz"
-  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+is-builtin-module@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
   dependencies:
-    kind-of "^6.0.0"
+    builtin-modules "^3.3.0"
 
-is-arrayish@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"
-  integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
-
-is-binary-path@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"
-  integrity sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=
+is-core-module@^2.17.0:
+  version "2.17.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.17.0.tgz#75c1c76236c9f7e38ddbfff292e127dc13b21027"
+  integrity sha512-J/vG0zBCbIKOQFfufSwyXdMrsohyJIUNkrnmo6WZGzoM7tr/lsbfW5b2BvisL6zsyMzK9UxV9L6c7AoFbyXHOA==
   dependencies:
-    binary-extensions "^1.0.0"
-
-is-buffer@^1.1.5:
-  version "1.1.6"
-  resolved "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz"
-  integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
-
-is-core-module@^2.8.1:
-  version "2.8.1"
-  resolved "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"
-  integrity sha512-SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA==
-  dependencies:
-    has "^1.0.3"
-
-is-data-descriptor@^0.1.4:
-  version "0.1.4"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"
-  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-data-descriptor@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz"
-  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
-  dependencies:
-    kind-of "^6.0.0"
-
-is-descriptor@^0.1.0:
-  version "0.1.6"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz"
-  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
-  dependencies:
-    is-accessor-descriptor "^0.1.6"
-    is-data-descriptor "^0.1.4"
-    kind-of "^5.0.0"
-
-is-descriptor@^1.0.0, is-descriptor@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz"
-  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
-  dependencies:
-    is-accessor-descriptor "^1.0.0"
-    is-data-descriptor "^1.0.0"
-    kind-of "^6.0.2"
-
-is-extendable@^0.1.0, is-extendable@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"
-  integrity sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=
+    hasown "^2.0.4"
 
 is-extendable@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-1.0.1.tgz#a7470f9e426733d81bd81e1155264e3a3507cab4"
   integrity sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^2.1.0, is-extglob@^2.1.1:
+is-extglob@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"
-  integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
 
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"
-  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
+  integrity sha512-VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w==
 
 is-fullwidth-code-point@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
-is-glob@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"
-  integrity sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=
-  dependencies:
-    is-extglob "^2.1.0"
-
-is-glob@^4.0.0, is-glob@^4.0.1:
+is-glob@^4.0.0, is-glob@^4.0.1, is-glob@^4.0.3, is-glob@~4.0.1:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
   integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
   dependencies:
     is-extglob "^2.1.1"
 
 is-module@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-module/-/is-module-1.0.0.tgz"
-  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
 
 is-negated-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz"
-  integrity sha1-aRC8pdqMleeEtXUbl2z1oQ/uNtI=
-
-is-number@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"
-  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
-  dependencies:
-    kind-of "^3.0.2"
-
-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
+  resolved "https://registry.yarnpkg.com/is-negated-glob/-/is-negated-glob-1.0.0.tgz#6910bca5da8c95e784b5751b976cf5a10fee36d2"
+  integrity sha512-czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==
 
 is-number@^7.0.0:
   version "7.0.0"
-  resolved "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
 is-path-cwd@^2.2.0:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-2.2.0.tgz#67d43b82664a7b5191fd9119127eb300048a9fdb"
   integrity sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==
 
 is-path-inside@^3.0.2:
   version "3.0.3"
-  resolved "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/is-path-inside/-/is-path-inside-3.0.3.tgz#d231362e53a07ff2b0e0ea7fed049161ffd16283"
   integrity sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==
 
-is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
+is-plain-object@^2.0.4:
   version "2.0.4"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
   dependencies:
     isobject "^3.0.1"
 
 is-plain-object@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
-  integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-5.1.0.tgz#22ed7b5e856bb57966348e5b9468dada42be87f4"
+  integrity sha512-bUi/yjmtKYcRVUtWRGr0UA6xEFh2I6zWUwMrUXB3s7bmYCaZ8a+0ZsTRkrawh/mzlSD1Y0Ph8bp/U+TvBpWDNw==
 
 is-reference@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
     "@types/estree" "*"
 
 is-relative@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
   integrity sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==
   dependencies:
     is-unc-path "^1.0.0"
 
 is-unc-path@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
   integrity sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==
   dependencies:
     unc-path-regex "^0.1.2"
 
-is-utf8@^0.2.0, is-utf8@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-valid-glob@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz"
-  integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao=
+  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa"
+  integrity sha512-AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==
 
-is-what@^3.14.1:
-  version "3.14.1"
-  resolved "https://registry.npmjs.org/is-what/-/is-what-3.14.1.tgz"
-  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
+is-what@^4.1.8:
+  version "4.1.16"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-4.1.16.tgz#1ad860a19da8b4895ad5495da3182ce2acdd7a6f"
+  integrity sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==
 
-is-windows@^1.0.1, is-windows@^1.0.2:
+is-windows@^1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
 
 isarray@0.0.1:
   version "0.0.1"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
+  integrity sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ==
 
-isarray@1.0.0, isarray@~1.0.0:
+isarray@~1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"
-  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==
 
 isexe@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"
-  integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=
-
-isobject@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"
-  integrity sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=
-  dependencies:
-    isarray "1.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
 
 isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"
-  integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
 
 istextorbinary@^3.0.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/istextorbinary/-/istextorbinary-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/istextorbinary/-/istextorbinary-3.3.0.tgz#06b1c57d948da11461bd237c00ce09e9902964f2"
   integrity sha512-Tvq1W6NAcZeJ8op+Hq7tdZ434rqnMx4CCZ7H0ff83uEloDvVbqAwaMTZcafKGJT0VHkYzuXUiCY4hlXQg6WfoQ==
   dependencies:
     binaryextensions "^2.2.0"
     textextensions "^3.2.0"
 
-jest-worker@^26.2.1:
-  version "26.6.2"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
-  dependencies:
-    "@types/node" "*"
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
 js-tokens@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
 js-yaml@^3.13.1:
-  version "3.14.1"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz"
-  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.15.2.tgz#3f83823ac6be17f570f23b2ecdef3777ff5ea364"
+  integrity sha512-6EuL879VkRA+1Cz578mKMiKvjPNEuk6+r1JaFzoSWejZmtf7xWbIyw1e3KkxlkzTIt9Taw6JBhEppG7utc1P+w==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-jsesc@^2.5.1:
-  version "2.5.2"
-  resolved "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz"
-  integrity sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==
+jsesc@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-3.1.0.tgz#74d335a234f67ed19907fdadfac7ccf9d409825d"
+  integrity sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==
+
+json-buffer@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.1.tgz#9338802a30d3b6605fbe0613e094008ca8c05a13"
+  integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==
 
 json-schema-traverse@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
   integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
 
 json-schema-traverse@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"
   integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==
 
 json-stable-stringify-without-jsonify@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==
 
-just-debounce@^1.0.0:
+keyv@^4.5.3:
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-4.5.4.tgz#a879a99e29452f942439f2a405e3af8b31d4de93"
+  integrity sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==
+  dependencies:
+    json-buffer "3.0.1"
+
+kind-of@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/just-debounce/-/just-debounce-1.1.0.tgz"
-  integrity sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
+  integrity sha512-aUH6ElPnMGon2/YkxRIigV32MOpTVcoXQ1Oo8aYn40s+sJ3j+0gFZsT8HKDcxNy7Fi9zuquWtGaGAahOdv5p/g==
 
-kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"
-  integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
-  dependencies:
-    is-buffer "^1.1.5"
+last-run@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/last-run/-/last-run-2.0.0.tgz#f82dcfbfce6e63d041bd83d64c82e34cdba6572e"
+  integrity sha512-j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==
 
-kind-of@^4.0.0:
+lead@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"
-  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
-  dependencies:
-    is-buffer "^1.1.5"
-
-kind-of@^5.0.0, kind-of@^5.0.2:
-  version "5.1.0"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz"
-  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
-
-kind-of@^6.0.0, kind-of@^6.0.2:
-  version "6.0.3"
-  resolved "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz"
-  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
-
-last-run@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/last-run/-/last-run-1.1.1.tgz"
-  integrity sha1-RblpQsF7HHnHchmCWbqUO+v4yls=
-  dependencies:
-    default-resolution "^2.0.0"
-    es6-weak-map "^2.0.1"
-
-lazystream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"
-  integrity sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==
-  dependencies:
-    readable-stream "^2.0.5"
-
-lcid@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"
-  integrity sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=
-  dependencies:
-    invert-kv "^1.0.0"
-
-lead@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/lead/-/lead-1.0.0.tgz"
-  integrity sha1-bxT5mje+Op3XhPVJVpDlkDRm7kI=
-  dependencies:
-    flush-write-stream "^1.0.2"
+  resolved "https://registry.yarnpkg.com/lead/-/lead-4.0.0.tgz#5317a49effb0e7ec3a0c8fb9c1b24fb716aab939"
+  integrity sha512-DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==
 
 "less@^3.7.1 || ^4.0.0":
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/less/-/less-4.1.2.tgz"
-  integrity sha512-EoQp/Et7OSOVu0aJknJOtlXZsnr8XE8KwuzTHOLeVSEx8pVWUICc8Q0VYRHgzyjX78nMEyC/oztWFbgyhtNfDA==
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/less/-/less-4.9.1.tgz#5a873974b8e66dec7d4f04243bf1c8a5beef9de7"
+  integrity sha512-orp15PfJvvNDIqJdVWzMI9Sjpjp3VTiw3sfvbB+67LlISTEn8uVT2EdYSuyl02BLvaftv6sdk9Umnxmm5rckmg==
   dependencies:
-    copy-anything "^2.0.1"
+    copy-anything "^3.0.5"
     parse-node-version "^1.0.1"
-    tslib "^2.3.0"
   optionalDependencies:
     errno "^0.1.1"
     graceful-fs "^4.1.2"
-    image-size "~0.5.0"
-    make-dir "^2.1.0"
+    make-dir "^5.1.0"
     mime "^1.4.1"
-    needle "^2.5.2"
+    needle "^3.1.0"
+    probe-image-size "^7.2.3"
     source-map "~0.6.0"
 
 levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"
-  integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
+  integrity sha512-0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==
   dependencies:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
 levn@^0.4.1:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
   integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
   dependencies:
     prelude-ls "^1.2.1"
     type-check "~0.4.0"
 
-liftoff@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz"
-  integrity sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==
+liftoff@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-5.0.1.tgz#e2329e7f1e19e98c8dba71185f2078e6dbbc5c1f"
+  integrity sha512-wwLXMbuxSF8gMvubFcFRp56lkFV69twvbU5vDPbaw+Q+/rF8j0HKjGbIdlSi+LuJm9jf7k9PB+nTxnsLMPcv2Q==
   dependencies:
-    extend "^3.0.0"
-    findup-sync "^3.0.0"
-    fined "^1.0.1"
-    flagged-respawn "^1.0.0"
-    is-plain-object "^2.0.4"
-    object.map "^1.0.0"
-    rechoir "^0.6.2"
-    resolve "^1.1.7"
-
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
-
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
+    extend "^3.0.2"
+    findup-sync "^5.0.0"
+    fined "^2.0.0"
+    flagged-respawn "^2.0.0"
+    is-plain-object "^5.0.0"
+    rechoir "^0.8.0"
+    resolve "^1.20.0"
 
 lodash.defaults@^4.2.0:
   version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"
-  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
-
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
+  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
+  integrity sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==
 
 lodash.merge@^4.6.2:
   version "4.6.2"
-  resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
 
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
-  dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
-
-lodash.template@^4.5.0:
-  version "4.5.0"
-  resolved "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz"
-  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-
 lodash.truncate@^4.4.2:
   version "4.4.2"
-  resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"
-  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==
 
 lodash@^4.17.14, lodash@^4.17.19:
-  version "4.17.21"
-  resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz"
-  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
-
-log-symbols@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/log-symbols/-/log-symbols-1.0.2.tgz"
-  integrity sha1-N2/3tY6jCGoPCfrMdGF+ylAeGhg=
-  dependencies:
-    chalk "^1.0.0"
-
-lower-case@^1.1.1:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz"
-  integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw=
-
-lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
+  version "4.18.1"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
+  integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
 
 magic-string@^0.25.7:
-  version "0.25.7"
-  resolved "https://registry.npmjs.org/magic-string/-/magic-string-0.25.7.tgz"
-  integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
   dependencies:
-    sourcemap-codec "^1.4.4"
+    sourcemap-codec "^1.4.8"
 
-make-dir@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"
-  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
-  dependencies:
-    pify "^4.0.1"
-    semver "^5.6.0"
+make-dir@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-5.1.0.tgz#59b2d9acf7ffa543d14238617a697458fa8dd5c9"
+  integrity sha512-IfpFq6UM39dUNiphpA6uDezNx/AvWyhwfICWPR3t1VspkgkMZrL+Rk1RbN1bx+aeNYwOrqGJgEgV3yotk+ZUVw==
 
-make-iterator@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/make-iterator/-/make-iterator-1.0.1.tgz"
-  integrity sha512-pxiuXh0iVEq7VM7KMIhs5gxsfxCux2URptUQaXo4iZZJxBAzTPOLE2BumO5dbfVYq/hBJFBR/a1mFDmOx5AGmw==
-  dependencies:
-    kind-of "^6.0.2"
-
-map-cache@^0.2.0, map-cache@^0.2.2:
+map-cache@^0.2.0:
   version "0.2.2"
-  resolved "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"
-  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
-
-map-stream@0.0.7:
-  version "0.0.7"
-  resolved "https://registry.npmjs.org/map-stream/-/map-stream-0.0.7.tgz"
-  integrity sha1-ih8HiW2CsQkmvTdEokIACfiJdKg=
-
-map-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"
-  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
-  dependencies:
-    object-visit "^1.0.0"
-
-matchdep@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz"
-  integrity sha1-xvNINKDY28OzfCfui7yyfHd1WC4=
-  dependencies:
-    findup-sync "^2.0.0"
-    micromatch "^3.0.4"
-    resolve "^1.4.0"
-    stack-trace "0.0.10"
-
-merge-stream@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz"
-  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==
 
 merge2@^1.3.0, merge2@^1.4.1:
   version "1.4.1"
-  resolved "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae"
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
-micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
-  version "3.1.10"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz"
-  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
+micromatch@^4.0.4, micromatch@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    braces "^2.3.1"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    extglob "^2.0.4"
-    fragment-cache "^0.2.1"
-    kind-of "^6.0.2"
-    nanomatch "^1.2.9"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.2"
-
-micromatch@^4.0.4:
-  version "4.0.4"
-  resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"
-  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
-  dependencies:
-    braces "^3.0.1"
-    picomatch "^2.2.3"
+    braces "^3.0.3"
+    picomatch "^2.3.1"
 
 mime@^1.4.1:
   version "1.6.0"
-  resolved "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
-minimatch@^3.0.2, minimatch@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+minimatch@^3.0.4, minimatch@^3.1.1:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.5.tgz#580c88f8d5445f2bd6aa8f3cadefa0de79fbd69e"
+  integrity sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimist@^1.1.0, minimist@^1.2.5:
-  version "1.2.5"
-  resolved "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"
-  integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
-
-mixin-deep@^1.2.0:
-  version "1.3.2"
-  resolved "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz"
-  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
-  dependencies:
-    for-in "^1.0.2"
-    is-extendable "^1.0.1"
+minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
 
 mkdirp@^0.5.1:
-  version "0.5.5"
-  resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz"
-  integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
   dependencies:
-    minimist "^1.2.5"
+    minimist "^1.2.6"
 
 ms@2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.2, ms@^2.1.1:
-  version "2.1.2"
-  resolved "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
-  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+ms@^2.1.1, ms@^2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
-multimatch@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz"
-  integrity sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==
+multimatch@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/multimatch/-/multimatch-4.0.0.tgz#8c3c0f6e3e8449ada0af3dd29efb491a375191b3"
+  integrity sha512-lDmx79y1z6i7RNx0ZGCPq1bzJ6ZoDDKbvh7jxr9SJcWLkShMzXrHbYVpTdnhNM5MXpDUxCQ4DgqVttVXlBgiBQ==
   dependencies:
     "@types/minimatch" "^3.0.3"
     array-differ "^3.0.0"
@@ -2985,216 +2141,109 @@ multimatch@^5.0.0:
     arrify "^2.0.1"
     minimatch "^3.0.4"
 
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
-mute-stdout@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/mute-stdout/-/mute-stdout-1.0.1.tgz"
-  integrity sha512-kDcwXR4PS7caBpuRYYBUz9iVixUk3anO3f5OYFiIPwK/20vCzKCHyKoulbiDY1S53zD2bxUpxN/IJ+TnXjfvxg==
+mute-stdout@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/mute-stdout/-/mute-stdout-2.0.0.tgz#c6a9b4b6185d3b7f70d3ffcb734cbfc8b0f38761"
+  integrity sha512-32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==
 
 mute-stream@0.0.8:
   version "0.0.8"
-  resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
   integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
 
-nan@^2.12.1:
-  version "2.15.0"
-  resolved "https://registry.yarnpkg.com/nan/-/nan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee"
-  integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ==
-
-nanomatch@^1.2.9:
-  version "1.2.13"
-  resolved "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz"
-  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
-  dependencies:
-    arr-diff "^4.0.0"
-    array-unique "^0.3.2"
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    fragment-cache "^0.2.1"
-    is-windows "^1.0.2"
-    kind-of "^6.0.2"
-    object.pick "^1.3.0"
-    regex-not "^1.0.0"
-    snapdragon "^0.8.1"
-    to-regex "^3.0.1"
-
 natural-compare@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz"
-  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==
 
 needle@^2.5.2:
   version "2.9.1"
-  resolved "https://registry.npmjs.org/needle/-/needle-2.9.1.tgz"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.9.1.tgz#22d1dffbe3490c2b83e301f7709b6736cd8f2684"
   integrity sha512-6R9fqJ5Zcmf+uYaFgdIHmLwNldn5HbK8L5ybn7Uz+ylX/rnOsSp1AHcvQSrCaFN+qNM1wpymHqD7mVasEOlHGQ==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-next-tick@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz"
-  integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
+needle@^3.1.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-3.5.0.tgz#aa2023642cb41b11a11babb733fd8fa952919112"
+  integrity sha512-jaQyPKKk2YokHrEg+vFDYxXIHTCBgiZwSHOoVx/8V3GIBS8/VN6NdVRmg8q1ERtPkMvmOvebsgga4sAj5hls/w==
+  dependencies:
+    iconv-lite "^0.6.3"
+    sax "^1.2.4"
 
 nice-try@^1.0.4:
   version "1.0.5"
-  resolved "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/nice-try/-/nice-try-1.0.5.tgz#a3378a7696ce7d223e88fc9b764bd7ef1089e366"
   integrity sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==
 
 njfs@^1.2.5:
   version "1.2.5"
-  resolved "https://registry.npmjs.org/njfs/-/njfs-1.2.5.tgz"
+  resolved "https://registry.yarnpkg.com/njfs/-/njfs-1.2.5.tgz#082938e9fbf07044572e31c8624a81d9988b517a"
   integrity sha512-Vnl1VDjSo7fO3RHAO5N9QrsyWaIpSTxHSwVoQOcepYAx3Lt+2JD/tUwgEJHfh1QqBjyy/H9WS5L79+hL+l99ug==
 
-no-case@^2.2.0:
-  version "2.3.2"
-  resolved "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz"
-  integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==
-  dependencies:
-    lower-case "^1.1.1"
-
-normalize-package-data@^2.3.2:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz"
-  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
-  dependencies:
-    hosted-git-info "^2.1.4"
-    resolve "^1.10.0"
-    semver "2 || 3 || 4 || 5"
-    validate-npm-package-license "^3.0.1"
-
-normalize-path@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
-
-normalize-path@^3.0.0:
+normalize-path@3.0.0, normalize-path@^3.0.0, normalize-path@~3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
   integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
-now-and-later@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/now-and-later/-/now-and-later-2.0.1.tgz"
-  integrity sha512-KGvQ0cB70AQfg107Xvs/Fbu+dGmZoTRJp2TaPwcwQm3/7PteUyN2BCgk8KBMPGBUXZdVwyWS8fDCGFygBm19UQ==
-  dependencies:
-    once "^1.3.2"
-
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
-object-assign@^3.0.0:
+now-and-later@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
+  resolved "https://registry.yarnpkg.com/now-and-later/-/now-and-later-3.0.0.tgz#cdc045dc5b894b35793cf276cc3206077bb7302d"
+  integrity sha512-pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==
+  dependencies:
+    once "^1.4.0"
 
 object-assign@^4.0.1:
   version "4.1.1"
-  resolved "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"
-  integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
-
-object-copy@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"
-  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
-  dependencies:
-    copy-descriptor "^0.1.0"
-    define-property "^0.2.5"
-    kind-of "^3.0.3"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
 
 object-hash@^2.1.1:
   version "2.2.0"
-  resolved "https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-2.2.0.tgz#5ad518581eefc443bd763472b8ff2e9c2c0d54a5"
   integrity sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw==
 
-object-keys@^1.0.12, object-keys@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz"
-  integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
-
 object-keys@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/object-keys/-/object-keys-0.4.0.tgz"
-  integrity sha1-KKaq50KN0sOpLz2V8hM13SBOAzY=
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336"
+  integrity sha512-ncrLw+X55z7bkl5PnUvHwFK9FcGuFYo9gtjws2XtSzL+aZ8tm830P60WJ0dSmFVaSalWieW5MD7kEdnXda9yJw==
 
-object-visit@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"
-  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
-  dependencies:
-    isobject "^3.0.0"
-
-object.assign@^4.0.4, object.assign@^4.1.0:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"
-  integrity sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==
-  dependencies:
-    call-bind "^1.0.0"
-    define-properties "^1.1.3"
-    has-symbols "^1.0.1"
-    object-keys "^1.1.1"
-
-object.defaults@^1.0.0, object.defaults@^1.1.0:
+object.defaults@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz"
-  integrity sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=
+  resolved "https://registry.yarnpkg.com/object.defaults/-/object.defaults-1.1.0.tgz#3a7f868334b407dea06da16d88d5cd29e435fecf"
+  integrity sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==
   dependencies:
     array-each "^1.0.1"
     array-slice "^1.0.0"
     for-own "^1.0.0"
     isobject "^3.0.0"
 
-object.map@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz"
-  integrity sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-object.pick@^1.2.0, object.pick@^1.3.0:
+object.pick@^1.3.0:
   version "1.3.0"
-  resolved "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"
-  integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
+  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
+  integrity sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==
   dependencies:
     isobject "^3.0.1"
 
-object.reduce@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/object.reduce/-/object.reduce-1.0.1.tgz"
-  integrity sha1-b+NI8qx/oPlcpiEiZZkJaCW7A60=
-  dependencies:
-    for-own "^1.0.0"
-    make-iterator "^1.0.0"
-
-once@^1.3.0, once@^1.3.1, once@^1.3.2, once@^1.4.0:
+once@^1.3.0, once@^1.4.0:
   version "1.4.0"
-  resolved "https://registry.npmjs.org/once/-/once-1.4.0.tgz"
-  integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
   dependencies:
     wrappy "1"
 
 onetime@^5.1.0:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e"
   integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==
   dependencies:
     mimic-fn "^2.1.0"
 
 optionator@^0.8.3:
   version "0.8.3"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
   dependencies:
     deep-is "~0.1.3"
@@ -3205,176 +2254,110 @@ optionator@^0.8.3:
     word-wrap "~1.2.3"
 
 optionator@^0.9.1:
-  version "0.9.1"
-  resolved "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz"
-  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  version "0.9.4"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.4.tgz#7ea1c1a5d91d764fb282139c88fe11e182a3a734"
+  integrity sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==
   dependencies:
     deep-is "^0.1.3"
     fast-levenshtein "^2.0.6"
     levn "^0.4.1"
     prelude-ls "^1.2.1"
     type-check "^0.4.0"
-    word-wrap "^1.2.3"
-
-ordered-read-streams@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-1.0.1.tgz"
-  integrity sha1-d8DLN8QVJdZBZtmQ/61+xqDhNj4=
-  dependencies:
-    readable-stream "^2.0.1"
-
-os-locale@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"
-  integrity sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=
-  dependencies:
-    lcid "^1.0.0"
+    word-wrap "^1.2.5"
 
 os-tmpdir@~1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"
-  integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
+  resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
+  integrity sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==
 
 p-map@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-4.0.0.tgz#bb2f95a5eda2ec168ec9274e06a747c3e2904d2b"
   integrity sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==
   dependencies:
     aggregate-error "^3.0.0"
 
-param-case@2.1.x:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz"
-  integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc=
-  dependencies:
-    no-case "^2.2.0"
-
 parent-module@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
   integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
   dependencies:
     callsites "^3.0.0"
 
-parse-filepath@^1.0.1:
+parse-filepath@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz"
-  integrity sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=
+  resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
+  integrity sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==
   dependencies:
     is-absolute "^1.0.0"
     map-cache "^0.2.0"
     path-root "^0.1.1"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-node-version@^1.0.0, parse-node-version@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.1.tgz#e2b5dbede00e7fa9bc363607f53327e8b073189b"
   integrity sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==
 
 parse-passwd@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"
-  integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
-
-pascalcase@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"
-  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-
-path-dirname@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"
-  integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
-
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
+  resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
+  integrity sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==
 
 path-is-absolute@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"
-  integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
 
 path-key@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"
-  integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
+  integrity sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==
 
 path-key@^3.1.0:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.7:
   version "1.0.7"
-  resolved "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
   integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-root-regex@^0.1.0:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz"
-  integrity sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=
+  resolved "https://registry.yarnpkg.com/path-root-regex/-/path-root-regex-0.1.2.tgz#bfccdc8df5b12dc52c8b43ec38d18d72c04ba96d"
+  integrity sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==
 
 path-root@^0.1.1:
   version "0.1.1"
-  resolved "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz"
-  integrity sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=
+  resolved "https://registry.yarnpkg.com/path-root/-/path-root-0.1.1.tgz#9a4a6814cac1c0cd73360a95f32083c8ea4745b7"
+  integrity sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==
   dependencies:
     path-root-regex "^0.1.0"
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b"
   integrity sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==
 
-picomatch@^2.2.2, picomatch@^2.2.3:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"
-  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+picocolors@^1.0.0, picocolors@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
+  integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
 
-pify@^2.0.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"
-  integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.2.tgz#5a942915e26b372dc0f0e6753149a16e6b1c5601"
+  integrity sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==
 
-pify@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"
-  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
-
-pinkie-promise@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"
-  integrity sha1-ITXW36ejWMBprJsXh3YogihFD/o=
-  dependencies:
-    pinkie "^2.0.0"
-
-pinkie@^2.0.0:
-  version "2.0.4"
-  resolved "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"
-  integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
+pify@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
+  integrity sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==
 
 plugin-error@1.0.1, plugin-error@^1.0.0, plugin-error@^1.0.1, plugin-error@~1.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-1.0.1.tgz#77016bd8919d0ac377fdcdd0322328953ca5781c"
   integrity sha512-L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA==
   dependencies:
     ansi-colors "^1.0.1"
@@ -3382,101 +2365,84 @@ plugin-error@1.0.1, plugin-error@^1.0.0, plugin-error@^1.0.1, plugin-error@~1.0:
     arr-union "^3.1.0"
     extend-shallow "^3.0.2"
 
-posix-character-classes@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"
-  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
+plugin-error@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
+  integrity sha512-WzZHcm4+GO34sjFMxQMqZbsz3xiNEgonCskQ9v+IroMmYgk/tas8dG+Hr2D6IbRPybZ12oWpzE/w3cGJ6FJzOw==
+  dependencies:
+    ansi-cyan "^0.1.1"
+    ansi-red "^0.1.1"
+    arr-diff "^1.0.1"
+    arr-union "^2.0.1"
+    extend-shallow "^1.1.2"
 
 prelude-ls@^1.2.1:
   version "1.2.1"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
   integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 prelude-ls@~1.1.2:
   version "1.1.2"
-  resolved "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"
-  integrity sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
+  integrity sha512-ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==
 
-pretty-bytes@^5.6.0:
-  version "5.6.0"
-  resolved "https://registry.npmjs.org/pretty-bytes/-/pretty-bytes-5.6.0.tgz"
-  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+  integrity sha512-yJAF+AjbHKlxQ8eezMd/34Mnj/YTQ3i6kLzvVsH4l/BfIFtp444n0wVbnsn66JimZ9uBofv815aRp1zCppxlWw==
 
-pretty-hrtime@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz"
-  integrity sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=
+probe-image-size@^7.2.3:
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/probe-image-size/-/probe-image-size-7.4.0.tgz#c189ae04e9aad1e3fa3a0998a956a7e9aab7f66d"
+  integrity sha512-cdEprVtZxV+awMde9X+4jILBFYh4CARxVrQaMl4wY4YcPWbul9jntXrIW95NInBDyJwcVUP3U0T6yukN8rMBaQ==
+  dependencies:
+    lodash.merge "^4.6.2"
+    needle "^2.5.2"
+    stream-parser "~0.3.1"
 
 process-nextick-args@^2.0.0, process-nextick-args@~2.0.0:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
 progress@^2.0.0:
   version "2.0.3"
-  resolved "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
 prr@~1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"
-  integrity sha1-0/wRS6BplaRexok/SEzrHXj19HY=
-
-pump@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz"
-  integrity sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==
-  dependencies:
-    end-of-stream "^1.1.0"
-    once "^1.3.1"
-
-pumpify@^1.3.5:
-  version "1.5.1"
-  resolved "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz"
-  integrity sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==
-  dependencies:
-    duplexify "^3.6.0"
-    inherits "^2.0.3"
-    pump "^2.0.0"
+  resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
+  integrity sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==
 
 punycode@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz"
-  integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
 queue-microtask@^1.2.2:
   version "1.2.3"
-  resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
+read-file@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/read-file/-/read-file-0.2.0.tgz#70c6baf8842ec7d1540f981fd0e6aed4c81bd545"
+  integrity sha512-na/zgd5KplGlR+io+ygXQMIoDfX/Y0bNS5+P2TOXOTk5plquOVd0snudCd30hZJAsnVK2rxuxUP2z0CN+Aw1lQ==
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
+"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.0.6, readable-stream@^3.4.0:
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
+  integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
   dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
+    inherits "^2.0.3"
+    string_decoder "^1.1.1"
+    util-deprecate "^1.0.1"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
-"readable-stream@2 || 3", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.5, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.5, readable-stream@^2.3.6, readable-stream@~2.3.6:
-  version "2.3.7"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"
-  integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+readable-stream@^2.0.2, readable-stream@^2.3.5, readable-stream@~2.3.6:
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
+  integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
@@ -3486,133 +2452,63 @@ read-pkg@^1.0.0:
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@3, readable-stream@^3.0.6:
-  version "3.6.0"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"
-  integrity sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
-  dependencies:
-    inherits "^2.0.3"
-    string_decoder "^1.1.1"
-    util-deprecate "^1.0.1"
-
 readable-stream@~1.0.17:
   version "1.0.34"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
+  integrity sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.1"
     isarray "0.0.1"
     string_decoder "~0.10.x"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    picomatch "^2.2.1"
 
-readdirp@^2.2.1:
-  version "2.2.1"
-  resolved "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz"
-  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
+rechoir@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.8.0.tgz#49f866e0d32146142da3ad8f0eff352b3215ff22"
+  integrity sha512-/vxpCXddiX8NGfGO/mTafwjq4aFa/71pvamip0++IQk3zG8cbCj0fifNPrjjF1XMXUne91jL9OoxmdykoEtifQ==
   dependencies:
-    graceful-fs "^4.1.11"
-    micromatch "^3.1.10"
-    readable-stream "^2.0.2"
-
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
-regex-not@^1.0.0, regex-not@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz"
-  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
-  dependencies:
-    extend-shallow "^3.0.2"
-    safe-regex "^1.1.0"
+    resolve "^1.20.0"
 
 regexpp@^2.0.1:
   version "2.0.1"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
   integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
 
 regexpp@^3.1.0:
   version "3.2.0"
-  resolved "https://registry.npmjs.org/regexpp/-/regexpp-3.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
   integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
 
-relateurl@0.2.x:
-  version "0.2.7"
-  resolved "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"
-  integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=
-
-remove-bom-buffer@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/remove-bom-buffer/-/remove-bom-buffer-3.0.0.tgz"
-  integrity sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==
-  dependencies:
-    is-buffer "^1.1.5"
-    is-utf8 "^0.2.1"
-
-remove-bom-stream@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/remove-bom-stream/-/remove-bom-stream-1.2.0.tgz"
-  integrity sha1-BfGlk/FuQuH7kOv1nejlaVJflSM=
-  dependencies:
-    remove-bom-buffer "^3.0.0"
-    safe-buffer "^5.1.0"
-    through2 "^2.0.3"
-
 remove-trailing-separator@^1.0.1, remove-trailing-separator@^1.1.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
-repeat-element@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz"
-  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
-
-repeat-string@^1.6.1:
-  version "1.6.1"
-  resolved "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"
-  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
-
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+  integrity sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==
 
 replace-ext@^1.0.0:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a"
   integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==
 
 replace-ext@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-2.0.0.tgz#9471c213d22e1bcc26717cd6e50881d88f812b06"
   integrity sha512-UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==
 
-replace-homedir@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/replace-homedir/-/replace-homedir-1.0.0.tgz"
-  integrity sha1-6H9tUTuSjd6AgmDBK+f+xv9ueYw=
-  dependencies:
-    homedir-polyfill "^1.0.1"
-    is-absolute "^1.0.0"
-    remove-trailing-separator "^1.1.0"
+replace-homedir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/replace-homedir/-/replace-homedir-2.0.0.tgz#245bd9c909275e0beee75eae85bb40780cd61903"
+  integrity sha512-bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==
 
 replacestream@^4.0.3:
   version "4.0.3"
-  resolved "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/replacestream/-/replacestream-4.0.3.tgz#3ee5798092be364b1cdb1484308492cb3dff2f36"
   integrity sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==
   dependencies:
     escape-string-regexp "^1.0.3"
@@ -3621,88 +2517,79 @@ replacestream@^4.0.3:
 
 require-directory@^2.1.1:
   version "2.1.1"
-  resolved "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"
-  integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
 
 require-from-string@^2.0.2:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
   integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
 
-require-main-filename@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"
-  integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
-
 resolve-dir@^1.0.0, resolve-dir@^1.0.1:
   version "1.0.1"
-  resolved "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"
-  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==
   dependencies:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
 resolve-from@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
-resolve-options@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/resolve-options/-/resolve-options-1.1.0.tgz"
-  integrity sha1-MrueOcBtZzONyTeMDW1gdFZq0TE=
+resolve-options@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-options/-/resolve-options-2.0.0.tgz#a1a57a9949db549dd075de3f5550675f02f1e4c5"
+  integrity sha512-/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==
   dependencies:
-    value-or-function "^3.0.0"
+    value-or-function "^4.0.0"
 
 resolve-url@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"
-  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==
 
-resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.19.0, resolve@^1.4.0:
-  version "1.22.0"
-  resolved "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"
-  integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==
+resolve@^1.12.0, resolve@^1.19.0, resolve@^1.20.0:
+  version "1.22.13"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.13.tgz#d542f97758d768f36091251a6b07540b4343f7b5"
+  integrity sha512-Dj/cW9zBV2aRj6XzCxuGIs3ESZKv02jixne3q6jFZYZ3/Tg09gHHviSMDL4kObh9pqSahdRHEnDoaP2gn8YLhA==
   dependencies:
-    is-core-module "^2.8.1"
+    es-errors "^1.3.0"
+    is-core-module "^2.17.0"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
 restore-cursor@^3.1.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
   integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
   dependencies:
     onetime "^5.1.0"
     signal-exit "^3.0.2"
 
-ret@~0.1.10:
-  version "0.1.15"
-  resolved "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz"
-  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
-
 reusify@^1.0.4:
-  version "1.0.4"
-  resolved "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz"
-  integrity sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/reusify/-/reusify-1.1.0.tgz#0fe13b9522e1473f51b558ee796e08f11f9b489f"
+  integrity sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==
 
 rimraf@2.6.3:
   version "2.6.3"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
 rimraf@^3.0.2:
   version "3.0.2"
-  resolved "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
   integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
   dependencies:
     glob "^7.1.3"
 
 rollup-plugin-external-globals@^0.6.1:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.6.1.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-external-globals/-/rollup-plugin-external-globals-0.6.1.tgz#861c260b5727144e0fd1b424b103f9f0282fc365"
   integrity sha512-mlp3KNa5sE4Sp9UUR2rjBrxjG79OyZAh/QC18RHIjM+iYkbBwNXSo8DHRMZWtzJTrH8GxQ+SJvCTN3i14uMXIA==
   dependencies:
     "@rollup/pluginutils" "^4.0.0"
@@ -3710,168 +2597,121 @@ rollup-plugin-external-globals@^0.6.1:
     is-reference "^1.2.1"
     magic-string "^0.25.7"
 
-rollup-plugin-html@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.npmjs.org/rollup-plugin-html/-/rollup-plugin-html-0.2.1.tgz"
-  integrity sha1-oYYuyoeuVLZ3aJ0NQTORHoImRj0=
-  dependencies:
-    html-minifier "^3.0.2"
-    rollup-pluginutils "^1.5.0"
-
 rollup-plugin-includepaths@^0.2.4:
   version "0.2.4"
-  resolved "https://registry.npmjs.org/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-includepaths/-/rollup-plugin-includepaths-0.2.4.tgz#eb21d2d05ad410856a7c2f0612a85983fd11cc62"
   integrity sha512-iZen+XKVExeCzk7jeSZPJKL7B67slZNr8GXSC5ROBXtDGXDBH8wdjMfdNW5hf9kPt+tHyIvWh3wlE9bPrZL24g==
 
-rollup-plugin-terser@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz"
-  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
-  dependencies:
-    "@babel/code-frame" "^7.10.4"
-    jest-worker "^26.2.1"
-    serialize-javascript "^4.0.0"
-    terser "^5.0.0"
-
-rollup-pluginutils@^1.5.0:
-  version "1.5.2"
-  resolved "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz"
-  integrity sha1-HhVud4+UtyVb+hs9AXi+j1xVJAg=
-  dependencies:
-    estree-walker "^0.2.1"
-    minimatch "^3.0.2"
-
-rollup@2.56.3, rollup@^2.41.4:
-  version "2.56.3"
-  resolved "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz"
-  integrity sha512-Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==
+rollup@^2.41.4, rollup@^2.56.3:
+  version "2.80.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.80.0.tgz#a82efc15b748e986a7c76f0f771221b1fa108a2c"
+  integrity sha512-cIFJOD1DESzpjOBl763Kp1AH7UE/0fcdHe6rZXUdQ9c50uvgigvW97u3IcSeBwOkgqL/PXPBktBCh0KEu5L8XQ==
   optionalDependencies:
     fsevents "~2.3.2"
 
 run-async@^2.4.0:
   version "2.4.1"
-  resolved "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
 
 run-parallel@^1.1.9:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee"
   integrity sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==
   dependencies:
     queue-microtask "^1.2.2"
 
 rxjs@^6.6.0:
   version "6.6.7"
-  resolved "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.1.0, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
-  resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-regex@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"
-  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
-  dependencies:
-    ret "~0.1.10"
+safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
-"safer-buffer@>= 2.1.2 < 3":
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
   version "2.1.2"
-  resolved "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 sax@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz"
-  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.6.1.tgz#4c23cf608c0b693ab54b4b5888e92cfe977b9843"
+  integrity sha512-42tBVwLWnaQvW5zc4HbZrTuWccECCZfBi92FDuwtqxasH+JbPB3/FOKb1m222K42R4WxuxzzMsTswfzgtSu64Q==
 
-semver-greatest-satisfied-range@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-1.1.0.tgz"
-  integrity sha1-E+jCZYq5aRywzXEJMkAoDTb3els=
+semver-greatest-satisfied-range@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/semver-greatest-satisfied-range/-/semver-greatest-satisfied-range-2.0.0.tgz#4b62942a7a1ccbdb252e5329677c003bac546fe7"
+  integrity sha512-lH3f6kMbwyANB7HuOWRMlLCa2itaCrZJ+SAqqkSZrZKO/cAsk2EOyaKHUtNkVLFyFW9pct22SFesFp3Z7zpA0g==
   dependencies:
-    sver-compat "^1.5.0"
+    sver "^1.8.3"
 
-"semver@2 || 3 || 4 || 5", semver@^5.5.0, semver@^5.6.0:
-  version "5.7.1"
-  resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
-  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+semver@^5.5.0:
+  version "5.7.2"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8"
+  integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==
 
-semver@^6.1.2:
-  version "6.3.0"
-  resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
-  integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
+semver@^6.1.2, semver@^6.3.0:
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
+  integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.2.1:
-  version "7.3.5"
-  resolved "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"
-  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
-  dependencies:
-    lru-cache "^6.0.0"
+  version "7.8.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.8.5.tgz#39b646037dd50c14fb451e7e4cac58ed8b863f69"
+  integrity sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==
 
-serialize-javascript@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz"
-  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
-  dependencies:
-    randombytes "^2.1.0"
-
-set-blocking@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"
-  integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
-
-set-value@^2.0.0, set-value@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz"
-  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
-  dependencies:
-    extend-shallow "^2.0.1"
-    is-extendable "^0.1.1"
-    is-plain-object "^2.0.3"
-    split-string "^3.0.1"
+serialize-javascript@^7.0.3:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-7.1.3.tgz#c8f3a5355d5c52d76f4d61389172747a71f22ef6"
+  integrity sha512-kYEnegpAxWFjUw3dSYdSM9zVlTrsxDbsSkq/qd3B7VanqyJ+JdDy6qVyuqVGBhSfuD/rLZQEKuXsO5KZFCrVYQ==
 
 shebang-command@^1.2.0:
   version "1.2.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"
-  integrity sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
+  integrity sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==
   dependencies:
     shebang-regex "^1.0.0"
 
 shebang-command@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
   integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
   dependencies:
     shebang-regex "^3.0.0"
 
 shebang-regex@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"
-  integrity sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-1.0.0.tgz#da42f49740c0b42db2ca9728571cb190c98efea3"
+  integrity sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==
 
 shebang-regex@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
 signal-exit@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.6.tgz"
-  integrity sha512-sDl4qMFpijcGw22U5w63KmD3cZJfBuFlVNbVMKje2keoKML7X2UzWbc4XrmEbDwg0NXJc3yv4/ox7b+JWb57kQ==
+  version "3.0.7"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
+  integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==
 
 slash@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
 slice-ansi@^2.1.0:
   version "2.1.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
   integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
   dependencies:
     ansi-styles "^3.2.0"
@@ -3880,46 +2720,21 @@ slice-ansi@^2.1.0:
 
 slice-ansi@^4.0.0:
   version "4.0.0"
-  resolved "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
   integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
   dependencies:
     ansi-styles "^4.0.0"
     astral-regex "^2.0.0"
     is-fullwidth-code-point "^3.0.0"
 
-snapdragon-node@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz"
-  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
-  dependencies:
-    define-property "^1.0.0"
-    isobject "^3.0.0"
-    snapdragon-util "^3.0.1"
+smob@^1.0.0:
+  version "1.6.2"
+  resolved "https://registry.yarnpkg.com/smob/-/smob-1.6.2.tgz#190b94c25530c631a7ccc63de0d4c0087222d21d"
+  integrity sha512-RQsvleCbF8cVHEv+xuDGaA4pOizFqJ0GgjtMSRo6oP8pnN7WsigHgVGey6aILRBKv4W2YOMHLqbKdnB6hpB9fw==
 
-snapdragon-util@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz"
-  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
-  dependencies:
-    kind-of "^3.2.0"
-
-snapdragon@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz"
-  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
-  dependencies:
-    base "^0.11.1"
-    debug "^2.2.0"
-    define-property "^0.2.5"
-    extend-shallow "^2.0.1"
-    map-cache "^0.2.2"
-    source-map "^0.5.6"
-    source-map-resolve "^0.5.0"
-    use "^3.1.0"
-
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
+source-map-resolve@^0.5.2:
   version "0.5.3"
-  resolved "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a"
   integrity sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==
   dependencies:
     atob "^2.1.2"
@@ -3928,9 +2743,9 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@~0.5.19:
+source-map-support@~0.5.20:
   version "0.5.21"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
   integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
   dependencies:
     buffer-from "^1.0.0"
@@ -3938,222 +2753,159 @@ source-map-support@~0.5.19:
 
 source-map-url@^0.4.0:
   version "0.4.1"
-  resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
   integrity sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==
 
-source-map@^0.5.0, source-map@^0.5.1, source-map@^0.5.6:
+source-map@^0.5.1:
   version "0.5.7"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
-  integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
+  integrity sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, source-map@~0.6.1:
+source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0:
   version "0.6.1"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@~0.7.2:
-  version "0.7.3"
-  resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"
-  integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
-
-sourcemap-codec@^1.4.4:
+sourcemap-codec@^1.4.8:
   version "1.4.8"
-  resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
-spdx-correct@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz"
-  integrity sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==
-  dependencies:
-    spdx-expression-parse "^3.0.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-exceptions@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"
-  integrity sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==
-
-spdx-expression-parse@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"
-  integrity sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==
-  dependencies:
-    spdx-exceptions "^2.1.0"
-    spdx-license-ids "^3.0.0"
-
-spdx-license-ids@^3.0.0:
-  version "3.0.11"
-  resolved "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.11.tgz"
-  integrity sha512-Ctl2BrFiM0X3MANYgj3CkygxhRmr9mi6xhejbdO960nF6EDJApTYpn0BQnDKlnNBULKiCN1n3w9EBkHK8ZWg+g==
-
-split-string@^3.0.1, split-string@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz"
-  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
-  dependencies:
-    extend-shallow "^3.0.0"
+sparkles@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-2.1.0.tgz#8ad4e8cecba7e568bba660c39b6db46625ecf1ad"
+  integrity sha512-r7iW1bDw8R/cFifrD3JnQJX0K1jqT0kprL48BiBpLZLJPmAm34zsVBsK5lc7HirZYZqMW65dOXZgbAGt/I6frg==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"
-  integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
+  integrity sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==
 
-stack-trace@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
-  integrity sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=
-
-static-extend@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"
-  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+stream-composer@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/stream-composer/-/stream-composer-1.0.2.tgz#7ee61ca1587bf5f31b2e29aa2093cbf11442d152"
+  integrity sha512-bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==
   dependencies:
-    define-property "^0.2.5"
-    object-copy "^0.1.0"
+    streamx "^2.13.2"
 
 stream-counter@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/stream-counter/-/stream-counter-1.0.0.tgz"
-  integrity sha1-kc8lac5NxQYf6816yyY5SloRR1E=
+  resolved "https://registry.yarnpkg.com/stream-counter/-/stream-counter-1.0.0.tgz#91cf2569ce4dc5061febcd7acb26394a5a114751"
+  integrity sha512-4nfHc1016AhNOs0CFDR3S0FNeqnYbT7xZ408coajcx2Msj8malNNjvFHzWYIfIAXNK5i0eaKIVfgBYPOkyOTIg==
 
-stream-exhaust@^1.0.1:
+stream-exhaust@^1.0.2:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/stream-exhaust/-/stream-exhaust-1.0.2.tgz#acdac8da59ef2bc1e17a2c0ccf6c320d120e555d"
   integrity sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==
 
-stream-shift@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.1.tgz"
-  integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==
+stream-parser@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  integrity sha512-bJ/HgKq41nlKvlhccD5kaCr/P+Hu0wPNKPJOH7en+YrJu/9EgqUF+88w5Jb6KNcjOFMhfX4B2asfeAtIGuHObQ==
+  dependencies:
+    debug "2"
 
 streamfilter@^3.0.0:
   version "3.0.0"
-  resolved "https://registry.npmjs.org/streamfilter/-/streamfilter-3.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/streamfilter/-/streamfilter-3.0.0.tgz#8c61b08179a6c336c6efccc5df30861b7a9675e7"
   integrity sha512-kvKNfXCmUyC8lAXSSHCIXBUlo/lhsLcCU/OmzACZYpRUdtKIH68xYhm/+HI15jFJYtNJGYtCgn2wmIiExY1VwA==
   dependencies:
     readable-stream "^3.0.6"
 
-string-width@^1.0.1, string-width@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
+streamx@^2.12.0, streamx@^2.12.5, streamx@^2.13.2, streamx@^2.14.0:
+  version "2.28.1"
+  resolved "https://registry.yarnpkg.com/streamx/-/streamx-2.28.1.tgz#376cd42a089505a69bec0efdb5189aa45586141f"
+  integrity sha512-zEzXb0s5Cds7tqMH6rhZ05lcJydCWiQPEwiNngVqzsxCc962vLY4Uw+mW7od8kDH258k2Uz/JrOkdIAAhSh9VA==
   dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
+    events-universal "^1.0.0"
+    fast-fifo "^1.3.2"
+    text-decoder "^1.1.0"
 
 string-width@^3.0.0:
   version "3.1.0"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
   integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
   dependencies:
     emoji-regex "^7.0.1"
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string-width@^4.1.0, string-width@^4.2.3:
+string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
-  resolved "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.1"
 
-string_decoder@^1.1.1, string_decoder@~1.1.1:
+string_decoder@^1.1.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
+  integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
+  dependencies:
+    safe-buffer "~5.2.0"
+
+string_decoder@~0.10.x:
+  version "0.10.31"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
+  integrity sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ==
+
+string_decoder@~1.1.1:
   version "1.1.1"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
   dependencies:
     safe-buffer "~5.1.0"
 
-string_decoder@~0.10.x:
-  version "0.10.31"
-  resolved "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"
-  integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
-
-strip-ansi@^3.0.0, strip-ansi@^3.0.1:
-  version "3.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"
-  integrity sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=
-  dependencies:
-    ansi-regex "^2.0.0"
-
 strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
   dependencies:
     ansi-regex "^4.1.0"
 
 strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
-  resolved "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
     ansi-regex "^5.0.1"
 
-strip-bom@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"
-  integrity sha1-hbiGLzhEtabV7IRnqTWYFzo295Q=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    is-utf8 "^0.2.0"
-
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-json-comments@^3.0.1, strip-json-comments@^3.1.0, strip-json-comments@^3.1.1:
   version "3.1.1"
-  resolved "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
   integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-supports-color@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
-  integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
-
 supports-color@^5.3.0:
   version "5.5.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
 supports-preserve-symlinks-flag@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
   integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
 
-sver-compat@^1.5.0:
-  version "1.5.0"
-  resolved "https://registry.npmjs.org/sver-compat/-/sver-compat-1.5.0.tgz"
-  integrity sha1-PPh9/rTQe0o/FIJ7wYaz/QxkXNg=
-  dependencies:
-    es6-iterator "^2.0.1"
-    es6-symbol "^3.1.1"
+sver@^1.8.3:
+  version "1.8.4"
+  resolved "https://registry.yarnpkg.com/sver/-/sver-1.8.4.tgz#9bd6f6265263f01aab152df935dc7a554c15673f"
+  integrity sha512-71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==
+  optionalDependencies:
+    semver "^6.3.0"
 
 table@^5.2.3:
   version "5.4.6"
-  resolved "https://registry.npmjs.org/table/-/table-5.4.6.tgz"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
   integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
   dependencies:
     ajv "^6.10.2"
@@ -4162,9 +2914,9 @@ table@^5.2.3:
     string-width "^3.0.0"
 
 table@^6.0.9:
-  version "6.8.0"
-  resolved "https://registry.npmjs.org/table/-/table-6.8.0.tgz"
-  integrity sha512-s/fitrbVeEyHKFa7mFdkuQMWlH1Wgw/yEXMt5xACT4ZpzWFluehAxRtUUQKPuWhaLAWhFcVx6w3oC8VKaUfPGA==
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.9.0.tgz#50040afa6264141c7566b3b81d4d82c47a8668f5"
+  integrity sha512-9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==
   dependencies:
     ajv "^8.0.1"
     lodash.truncate "^4.4.2"
@@ -4172,51 +2924,50 @@ table@^6.0.9:
     string-width "^4.2.3"
     strip-ansi "^6.0.1"
 
-terser@5.4.0, terser@^5.0.0:
-  version "5.4.0"
-  resolved "https://registry.npmjs.org/terser/-/terser-5.4.0.tgz"
-  integrity sha512-3dZunFLbCJis9TAF2VnX+VrQLctRUmt1p3W2kCsJuZE4ZgWqh//+1MZ62EanewrqKoUf4zIaDGZAvml4UDc0OQ==
+teex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/teex/-/teex-1.0.1.tgz#b8fa7245ef8e8effa8078281946c85ab780a0b12"
+  integrity sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==
   dependencies:
+    streamx "^2.12.5"
+
+terser@^5.49.2, terser@^5.9.0:
+  version "5.51.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.51.2.tgz#555912425a7f2ff7737425c3718fa76c7069f6ef"
+  integrity sha512-bWnjSNscmuI+GJze6ZupnHP8G/cTcsJF+bXCeQknk2SHQsgbNJnLrqiH9jZ2W4STPVXH2mDKKRX3iwPhc9Cn/Q==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.15.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
+    source-map-support "~0.5.20"
+
+text-decoder@^1.1.0:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/text-decoder/-/text-decoder-1.2.7.tgz#5d073a9a74b9c0a9d28dfadcab96b604af57d8ba"
+  integrity sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==
+  dependencies:
+    b4a "^1.6.4"
 
 text-table@^0.2.0:
   version "0.2.0"
-  resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
-  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==
 
 textextensions@^3.2.0:
   version "3.3.0"
-  resolved "https://registry.npmjs.org/textextensions/-/textextensions-3.3.0.tgz"
+  resolved "https://registry.yarnpkg.com/textextensions/-/textextensions-3.3.0.tgz#03530d5287b86773c08b77458589148870cc71d3"
   integrity sha512-mk82dS8eRABNbeVJrEiN5/UMSCliINAuz8mkUwH4SwslkNP//gbEzlWNS5au0z5Dpx40SQxzqZevZkn+WYJ9Dw==
 
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/through2-filter/-/through2-filter-3.0.0.tgz"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
 through2@3.0.1:
   version "3.0.1"
-  resolved "https://registry.npmjs.org/through2/-/through2-3.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.1.tgz#39276e713c3302edf9e388dd9c812dd3b825bd5a"
   integrity sha512-M96dvTalPT3YbYLaKaCuwu+j06D/8Jfib0o/PxbVt6Amhv3dUAtW6rTV1jPgJSBG83I/e04Y6xkVdVhSRhi0ww==
   dependencies:
     readable-stream "2 || 3"
 
-through2@^0.5.1:
-  version "0.5.1"
-  resolved "https://registry.npmjs.org/through2/-/through2-0.5.1.tgz"
-  integrity sha1-390BLrnHAOIyP9M084rGIqs3Lac=
-  dependencies:
-    readable-stream "~1.0.17"
-    xtend "~3.0.0"
-
-through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
+through2@^2.0.0, through2@^2.0.1, through2@^2.0.3:
   version "2.0.5"
-  resolved "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
   dependencies:
     readable-stream "~2.3.6"
@@ -4224,314 +2975,191 @@ through2@^2.0.0, through2@^2.0.1, through2@^2.0.3, through2@~2.0.0:
 
 through2@^4.0.0, through2@^4.0.2:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
   integrity sha512-iOqSav00cVxEEICeD7TjLB1sueEL+81Wpzp2bY17uZjZN0pWZPuo4suZ/61VujxmqSGFfgOcNuTZ85QJwNZQpw==
   dependencies:
     readable-stream "3"
 
 through2@~0.4:
   version "0.4.2"
-  resolved "https://registry.npmjs.org/through2/-/through2-0.4.2.tgz"
-  integrity sha1-2/WGYDEVHsg1K7bE22SiKSqEC5s=
+  resolved "https://registry.yarnpkg.com/through2/-/through2-0.4.2.tgz#dbf5866031151ec8352bb6c4db64a2292a840b9b"
+  integrity sha512-45Llu+EwHKtAZYTPPVn3XZHBgakWMN3rokhEv5hu596XP+cNgplMg+Gj+1nmAvj+L0K7+N49zBKx5rah5u0QIQ==
   dependencies:
     readable-stream "~1.0.17"
     xtend "~2.1.1"
 
 through@^2.3.6:
   version "2.3.8"
-  resolved "https://registry.npmjs.org/through/-/through-2.3.8.tgz"
-  integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
+  resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
+  integrity sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==
 
 time-stamp@^1.0.0:
   version "1.1.0"
-  resolved "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
+  integrity sha512-gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==
 
 tmp@^0.0.33:
   version "0.0.33"
-  resolved "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
   integrity sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-absolute-glob@^2.0.0, to-absolute-glob@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-2.0.2.tgz"
-  integrity sha1-GGX0PZ50sIItufFFt4z/fQ98hJs=
-  dependencies:
-    is-absolute "^1.0.0"
-    is-negated-glob "^1.0.0"
-
-to-fast-properties@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"
-  integrity sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=
-
-to-object-path@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"
-  integrity sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=
-  dependencies:
-    kind-of "^3.0.2"
-
-to-regex-range@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"
-  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
-  dependencies:
-    is-number "^3.0.0"
-    repeat-string "^1.6.1"
-
 to-regex-range@^5.0.1:
   version "5.0.1"
-  resolved "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
   integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
   dependencies:
     is-number "^7.0.0"
 
-to-regex@^3.0.1, to-regex@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz"
-  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+to-through@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/to-through/-/to-through-3.0.0.tgz#bf4956eaca5a0476474850a53672bed6906ace54"
+  integrity sha512-y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==
   dependencies:
-    define-property "^2.0.2"
-    extend-shallow "^3.0.2"
-    regex-not "^1.0.2"
-    safe-regex "^1.1.0"
-
-to-through@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.npmjs.org/to-through/-/to-through-2.0.0.tgz"
-  integrity sha1-/JKtq6ByZHvAtn1rA2ZKoZUJOvY=
-  dependencies:
-    through2 "^2.0.3"
+    streamx "^2.12.5"
 
 tslib@^1.9.0:
   version "1.14.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.3.0:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz"
-  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
-
 type-check@^0.4.0, type-check@~0.4.0:
   version "0.4.0"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
   integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
   dependencies:
     prelude-ls "^1.2.1"
 
 type-check@~0.3.2:
   version "0.3.2"
-  resolved "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"
-  integrity sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72"
+  integrity sha512-ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==
   dependencies:
     prelude-ls "~1.1.2"
 
 type-fest@^0.20.2:
   version "0.20.2"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
   integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
 
 type-fest@^0.21.3:
   version "0.21.3"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
   integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
 
 type-fest@^0.8.1:
   version "0.8.1"
-  resolved "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
   integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
 
-type@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/type/-/type-1.2.0.tgz"
-  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
-
-type@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.npmjs.org/type/-/type-2.5.0.tgz"
-  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
-
-typedarray@^0.0.6:
-  version "0.0.6"
-  resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"
-  integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
-
-uglify-js@3.4.x:
-  version "3.4.10"
-  resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.10.tgz"
-  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
-  dependencies:
-    commander "~2.19.0"
-    source-map "~0.6.1"
-
 unc-path-regex@^0.1.2:
   version "0.1.2"
-  resolved "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz"
-  integrity sha1-5z3T17DXxe2G+6xrCufYxqadUPo=
+  resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"
+  integrity sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==
 
-undertaker-registry@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-1.0.1.tgz"
-  integrity sha1-XkvaMI5KiirlhPm5pDWaSZglzFA=
+undertaker-registry@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/undertaker-registry/-/undertaker-registry-2.0.0.tgz#d434246e398444740dd7fe4c9543e402ad99e4ca"
+  integrity sha512-+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==
 
-undertaker@^1.2.1:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"
-  integrity sha512-/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg==
+undertaker@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/undertaker/-/undertaker-2.0.0.tgz#fe4d40dc71823ce5a80f1ecc63ec8b88ad40b54a"
+  integrity sha512-tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==
   dependencies:
-    arr-flatten "^1.0.1"
-    arr-map "^2.0.0"
-    bach "^1.0.0"
-    collection-map "^1.0.0"
-    es6-weak-map "^2.0.1"
-    fast-levenshtein "^1.0.0"
-    last-run "^1.1.0"
-    object.defaults "^1.0.0"
-    object.reduce "^1.0.0"
-    undertaker-registry "^1.0.0"
+    bach "^2.0.1"
+    fast-levenshtein "^3.0.0"
+    last-run "^2.0.0"
+    undertaker-registry "^2.0.0"
 
-union-value@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz"
-  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
-  dependencies:
-    arr-union "^3.1.0"
-    get-value "^2.0.6"
-    is-extendable "^0.1.1"
-    set-value "^2.0.1"
-
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.npmjs.org/unique-stream/-/unique-stream-2.3.1.tgz"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
-unset-value@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"
-  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
-  dependencies:
-    has-value "^0.3.1"
-    isobject "^3.0.0"
-
-upath@^1.1.1:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz"
-  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
-
-upper-case@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz"
-  integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
+undici-types@~8.9.0:
+  version "8.9.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-8.9.0.tgz#e240d97c8b5d85e5347ce73d25865c7906c1ec9f"
+  integrity sha512-KTDyRTYX8sWmKXAikPHHSyc63CRPETMctyjKFupcC6OBLXT3xsN0e9aF7m+mIXutFWpUXuedtowG7iLOzp0kQg==
 
 uri-js@^4.2.2:
   version "4.4.1"
-  resolved "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
   integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
   dependencies:
     punycode "^2.1.0"
 
 urix@^0.1.0:
   version "0.1.0"
-  resolved "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"
-  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-
-use@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.npmjs.org/use/-/use-3.1.1.tgz"
-  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
-  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
 v8-compile-cache@^2.0.3:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"
-  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz#cdada8bec61e15865f05d097c5f4fd30e94dc128"
+  integrity sha512-ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==
 
-v8flags@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz"
-  integrity sha512-mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==
+v8flags@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/v8flags/-/v8flags-4.0.1.tgz#98fe6c4308317c5f394d85a435eb192490f7e132"
+  integrity sha512-fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==
+
+value-or-function@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/value-or-function/-/value-or-function-4.0.0.tgz#70836b6a876a010dc3a2b884e7902e9db064378d"
+  integrity sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==
+
+vinyl-contents@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-contents/-/vinyl-contents-2.0.0.tgz#cc2ba4db3a36658d069249e9e36d9e2b41935d89"
+  integrity sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==
   dependencies:
-    homedir-polyfill "^1.0.1"
+    bl "^5.0.0"
+    vinyl "^3.0.0"
 
-validate-npm-package-license@^3.0.1:
-  version "3.0.4"
-  resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz"
-  integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==
+vinyl-fs@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-4.0.2.tgz#d46557653e4a7109f29d626a9cf478680c7f8c70"
+  integrity sha512-XRFwBLLTl8lRAOYiBqxY279wY46tVxLaRhSwo3GzKEuLz1giffsOquWWboD/haGf5lx+JyTigCFfe7DWHoARIA==
   dependencies:
-    spdx-correct "^3.0.0"
-    spdx-expression-parse "^3.0.0"
-
-value-or-function@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/value-or-function/-/value-or-function-3.0.0.tgz"
-  integrity sha1-HCQ6ULWVwb5Up1S/7OhWO5/42BM=
-
-vinyl-fs@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-3.0.3.tgz"
-  integrity sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==
-  dependencies:
-    fs-mkdirp-stream "^1.0.0"
-    glob-stream "^6.1.0"
-    graceful-fs "^4.0.0"
+    fs-mkdirp-stream "^2.0.1"
+    glob-stream "^8.0.3"
+    graceful-fs "^4.2.11"
+    iconv-lite "^0.6.3"
     is-valid-glob "^1.0.0"
-    lazystream "^1.0.0"
-    lead "^1.0.0"
-    object.assign "^4.0.4"
-    pumpify "^1.3.5"
-    readable-stream "^2.3.3"
-    remove-bom-buffer "^3.0.0"
-    remove-bom-stream "^1.2.0"
-    resolve-options "^1.1.0"
-    through2 "^2.0.0"
-    to-through "^2.0.0"
-    value-or-function "^3.0.0"
-    vinyl "^2.0.0"
-    vinyl-sourcemap "^1.1.0"
+    lead "^4.0.0"
+    normalize-path "3.0.0"
+    resolve-options "^2.0.0"
+    stream-composer "^1.0.2"
+    streamx "^2.14.0"
+    to-through "^3.0.0"
+    value-or-function "^4.0.0"
+    vinyl "^3.0.1"
+    vinyl-sourcemap "^2.0.0"
 
-vinyl-sourcemap@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-1.1.0.tgz"
-  integrity sha1-kqgAWTo4cDqM2xHYswCtS+Y7PhY=
+vinyl-sourcemap@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz#422f410a0ea97cb54cebd698d56a06d7a22e0277"
+  integrity sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==
   dependencies:
-    append-buffer "^1.0.2"
-    convert-source-map "^1.5.0"
-    graceful-fs "^4.1.6"
-    normalize-path "^2.1.1"
-    now-and-later "^2.0.0"
-    remove-bom-buffer "^3.0.0"
-    vinyl "^2.0.0"
+    convert-source-map "^2.0.0"
+    graceful-fs "^4.2.10"
+    now-and-later "^3.0.0"
+    streamx "^2.12.5"
+    vinyl "^3.0.0"
+    vinyl-contents "^2.0.0"
 
 vinyl-sourcemaps-apply@0.2.1, vinyl-sourcemaps-apply@^0.2.0, vinyl-sourcemaps-apply@^0.2.1:
   version "0.2.1"
-  resolved "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"
-  integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU=
+  resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705"
+  integrity sha512-+oDh3KYZBoZC8hfocrbrxbLUeaYtQK7J5WU5Br9VqWqmCll3tFJqKp97GC9GmMsVIL0qnx2DgEDVxdo5EZ5sSw==
   dependencies:
     source-map "^0.5.1"
 
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
 vinyl@^2.0.0, vinyl@^2.2.1:
   version "2.2.1"
-  resolved "https://registry.npmjs.org/vinyl/-/vinyl-2.2.1.tgz"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"
   integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw==
   dependencies:
     clone "^2.1.1"
@@ -4541,105 +3169,92 @@ vinyl@^2.0.0, vinyl@^2.2.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
+vinyl@^3.0.0, vinyl@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-3.0.1.tgz#5f5ff85255bda2b5da25e4b3bd80b3fc077fb5a9"
+  integrity sha512-0QwqXteBNXgnLCdWdvPQBX6FXRHtIH3VhJPTd5Lwn28tJXc34YqSCWUmkOvtJHBmB3gGoPtrOKk3Ts8/kEZ9aA==
+  dependencies:
+    clone "^2.1.2"
+    remove-trailing-separator "^1.1.0"
+    replace-ext "^2.0.0"
+    teex "^1.0.1"
 
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
   dependencies:
     isexe "^2.0.0"
 
 which@^2.0.1:
   version "2.0.2"
-  resolved "https://registry.npmjs.org/which/-/which-2.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
   integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
   dependencies:
     isexe "^2.0.0"
 
-word-wrap@^1.2.3, word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+word-wrap@^1.2.5, word-wrap@~1.2.3:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
 
-wrap-ansi@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"
-  integrity sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
   dependencies:
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
 
 wrappy@1:
   version "1.0.2"
-  resolved "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"
-  integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
 
 write@1.0.3:
   version "1.0.3"
-  resolved "https://registry.npmjs.org/write/-/write-1.0.3.tgz"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
   integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
   dependencies:
     mkdirp "^0.5.1"
 
 xtend@~2.1.1:
   version "2.1.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-2.1.2.tgz"
-  integrity sha1-bv7MKk2tjmlixJAbM3znuoe10os=
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"
+  integrity sha512-vMNKzr2rHP9Dp/e1NQFnLQlwlhp9L/LfvnsVdHxN1f+uggyVI3i08uD14GPvCToPkdsRfyPqIyYGmIk58V98ZQ==
   dependencies:
     object-keys "~0.4.0"
 
-xtend@~3.0.0:
-  version "3.0.0"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"
-  integrity sha1-XM50B7r2Qsunvs2laBEcST9ZZlo=
-
-xtend@~4.0.0, xtend@~4.0.1:
+xtend@~4.0.1:
   version "4.0.2"
-  resolved "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.1:
-  version "3.2.2"
-  resolved "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz"
-  integrity sha512-uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==
-
-yallist@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz"
-  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yargs-parser@>=5.0.0-security.0:
-  version "21.0.0"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.0.0.tgz"
-  integrity sha512-z9kApYUOCwoeZ78rfRYYWdiU/iNL6mwwYlkkZfJoyMR1xps+NEBX5X7XmRpxkZHhXJ6+Ey00IwKxBBSW9FIjyA==
+  version "22.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-22.0.0.tgz#87b82094051b0567717346ecd00fd14804b357c8"
+  integrity sha512-rwu/ClNdSMpkSrUb+d6BRsSkLUq1fmfsY6TOpYzTwvwkg1/NRG85KBy3kq++A8LKQwX6lsu+aWad+2khvuXrqw==
 
-yargs-parser@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/yargs-parser/-/yargs-parser-5.0.1.tgz"
-  integrity sha512-wpav5XYiddjXxirPoCTUPbqM0PXvJ9hiBMvuJgInvo4/lAOTZzUprArw17q2O1P2+GHhbBr18/iQwjL5Z9BqfA==
-  dependencies:
-    camelcase "^3.0.0"
-    object.assign "^4.1.0"
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
-yargs@^7.1.0:
-  version "7.1.2"
-  resolved "https://registry.npmjs.org/yargs/-/yargs-7.1.2.tgz"
-  integrity sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==
+yargs@^16.2.0:
+  version "16.2.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.2.tgz#c56731dca0d2788ae0866dd3c83907d6bab85f7d"
+  integrity sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"